From 196c4a52734d81a01ed4d3448c43ea93dbd46813 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Matthias=20A=C3=9Fhauer?= <mha1993@live.de>
Date: Sat, 5 Oct 2019 14:57:30 +0200
Subject: [PATCH] pre-translate-po: handle git-worktree subcommands
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Matthias A횩hauer <mha1993@live.de>
---
 po/documentation.de.po      | 27 ++++++++++++---------------
 po/documentation.es_MX.po   | 24 ++++++++++++------------
 po/documentation.fr.po      | 22 +++++++++++-----------
 po/documentation.nb_NO.po   | 24 ++++++++++++------------
 po/documentation.pot        | 24 ++++++++++++------------
 po/documentation.pt_BR.po   | 24 ++++++++++++------------
 po/documentation.pt_PT.po   | 24 ++++++++++++------------
 po/documentation.ru.po      | 24 ++++++++++++------------
 po/documentation.zh_HANT.po | 24 ++++++++++++------------
 scripts/pre-translate-po    |  2 +-
 10 files changed, 108 insertions(+), 111 deletions(-)

diff --git a/po/documentation.de.po b/po/documentation.de.po
index 8a52c80..5f590cb 100644
--- a/po/documentation.de.po
+++ b/po/documentation.de.po
@@ -33348,10 +33348,9 @@ msgstr "COMMANDS"
 
 #. type: Labeled list
 #: en/git-notes.txt:56 en/git-worktree.txt:81
-#, fuzzy, no-wrap, priority:240
-#| msgid "--list"
+#, ignore-same, no-wrap, priority:240
 msgid "list"
-msgstr "--list"
+msgstr "list"
 
 #. type: Plain text
 #: en/git-notes.txt:61
@@ -33461,9 +33460,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/git-notes.txt:112 en/git-worktree.txt:105
-#, fuzzy, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:240
 msgid "remove"
-msgstr "--remove"
+msgstr "remove"
 
 #. type: Plain text
 #: en/git-notes.txt:117
@@ -33473,10 +33472,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/git-notes.txt:118 en/git-worktree.txt:101
-#, fuzzy, no-wrap, priority:240
-#| msgid "'prune'"
+#, ignore-same, no-wrap, priority:240
 msgid "prune"
-msgstr "'prune'"
+msgstr "prune"
 
 #. type: Plain text
 #: en/git-notes.txt:120
@@ -55761,9 +55759,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/git-worktree.txt:88
-#, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:240
 msgid "lock"
-msgstr ""
+msgstr "lock"
 
 #. type: Plain text
 #: en/git-worktree.txt:95
@@ -55773,10 +55771,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/git-worktree.txt:96
-#, fuzzy, no-wrap, priority:240
-#| msgid "--move"
+#, ignore-same, no-wrap, priority:240
 msgid "move"
-msgstr "--move"
+msgstr "move"
 
 #. type: Plain text
 #: en/git-worktree.txt:100
@@ -55798,9 +55795,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/git-worktree.txt:112
-#, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:240
 msgid "unlock"
-msgstr ""
+msgstr "unlock"
 
 #. type: Plain text
 #: en/git-worktree.txt:115
diff --git a/po/documentation.es_MX.po b/po/documentation.es_MX.po
index 636897d..d8e4c91 100644
--- a/po/documentation.es_MX.po
+++ b/po/documentation.es_MX.po
@@ -32627,9 +32627,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/git-notes.txt:56 en/git-worktree.txt:81
-#, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:240
 msgid "list"
-msgstr ""
+msgstr "list"
 
 #. type: Plain text
 #: en/git-notes.txt:61
@@ -32735,9 +32735,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/git-notes.txt:112 en/git-worktree.txt:105
-#, fuzzy, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:240
 msgid "remove"
-msgstr "--remove"
+msgstr "remove"
 
 #. type: Plain text
 #: en/git-notes.txt:117
@@ -32747,9 +32747,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/git-notes.txt:118 en/git-worktree.txt:101
-#, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:240
 msgid "prune"
-msgstr ""
+msgstr "prune"
 
 #. type: Plain text
 #: en/git-notes.txt:120
@@ -54735,9 +54735,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/git-worktree.txt:88
-#, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:240
 msgid "lock"
-msgstr ""
+msgstr "lock"
 
 #. type: Plain text
 #: en/git-worktree.txt:95
@@ -54747,9 +54747,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/git-worktree.txt:96
-#, fuzzy, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:240
 msgid "move"
-msgstr "modo"
+msgstr "move"
 
 #. type: Plain text
 #: en/git-worktree.txt:100
@@ -54771,9 +54771,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/git-worktree.txt:112
-#, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:240
 msgid "unlock"
-msgstr ""
+msgstr "unlock"
 
 #. type: Plain text
 #: en/git-worktree.txt:115
diff --git a/po/documentation.fr.po b/po/documentation.fr.po
index 4ce1a96..5fa969e 100644
--- a/po/documentation.fr.po
+++ b/po/documentation.fr.po
@@ -32944,9 +32944,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/git-notes.txt:56 en/git-worktree.txt:81
-#, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:240
 msgid "list"
-msgstr ""
+msgstr "list"
 
 #. type: Plain text
 #: en/git-notes.txt:61
@@ -33052,9 +33052,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/git-notes.txt:112 en/git-worktree.txt:105
-#, fuzzy, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:240
 msgid "remove"
-msgstr "--remove"
+msgstr "remove"
 
 #. type: Plain text
 #: en/git-notes.txt:117
@@ -33064,9 +33064,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/git-notes.txt:118 en/git-worktree.txt:101
-#, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:240
 msgid "prune"
-msgstr ""
+msgstr "prune"
 
 #. type: Plain text
 #: en/git-notes.txt:120
@@ -55341,9 +55341,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/git-worktree.txt:88
-#, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:240
 msgid "lock"
-msgstr ""
+msgstr "lock"
 
 #. type: Plain text
 #: en/git-worktree.txt:95
@@ -55353,7 +55353,7 @@ msgstr ""
 
 #. type: Labeled list
 #: en/git-worktree.txt:96
-#, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:240
 msgid "move"
 msgstr "move"
 
@@ -55377,9 +55377,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/git-worktree.txt:112
-#, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:240
 msgid "unlock"
-msgstr ""
+msgstr "unlock"
 
 #. type: Plain text
 #: en/git-worktree.txt:115
diff --git a/po/documentation.nb_NO.po b/po/documentation.nb_NO.po
index fe4e593..a00c183 100644
--- a/po/documentation.nb_NO.po
+++ b/po/documentation.nb_NO.po
@@ -32579,9 +32579,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/git-notes.txt:56 en/git-worktree.txt:81
-#, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:240
 msgid "list"
-msgstr ""
+msgstr "list"
 
 #. type: Plain text
 #: en/git-notes.txt:61
@@ -32687,9 +32687,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/git-notes.txt:112 en/git-worktree.txt:105
-#, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:240
 msgid "remove"
-msgstr ""
+msgstr "remove"
 
 #. type: Plain text
 #: en/git-notes.txt:117
@@ -32699,9 +32699,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/git-notes.txt:118 en/git-worktree.txt:101
-#, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:240
 msgid "prune"
-msgstr ""
+msgstr "prune"
 
 #. type: Plain text
 #: en/git-notes.txt:120
@@ -54681,9 +54681,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/git-worktree.txt:88
-#, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:240
 msgid "lock"
-msgstr ""
+msgstr "lock"
 
 #. type: Plain text
 #: en/git-worktree.txt:95
@@ -54693,9 +54693,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/git-worktree.txt:96
-#, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:240
 msgid "move"
-msgstr ""
+msgstr "move"
 
 #. type: Plain text
 #: en/git-worktree.txt:100
@@ -54717,9 +54717,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/git-worktree.txt:112
-#, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:240
 msgid "unlock"
-msgstr ""
+msgstr "unlock"
 
 #. type: Plain text
 #: en/git-worktree.txt:115
diff --git a/po/documentation.pot b/po/documentation.pot
index 83baecd..18ab5aa 100644
--- a/po/documentation.pot
+++ b/po/documentation.pot
@@ -32578,9 +32578,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/git-notes.txt:56 en/git-worktree.txt:81
-#, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:240
 msgid "list"
-msgstr ""
+msgstr "list"
 
 #. type: Plain text
 #: en/git-notes.txt:61
@@ -32686,9 +32686,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/git-notes.txt:112 en/git-worktree.txt:105
-#, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:240
 msgid "remove"
-msgstr ""
+msgstr "remove"
 
 #. type: Plain text
 #: en/git-notes.txt:117
@@ -32698,9 +32698,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/git-notes.txt:118 en/git-worktree.txt:101
-#, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:240
 msgid "prune"
-msgstr ""
+msgstr "prune"
 
 #. type: Plain text
 #: en/git-notes.txt:120
@@ -54672,9 +54672,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/git-worktree.txt:88
-#, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:240
 msgid "lock"
-msgstr ""
+msgstr "lock"
 
 #. type: Plain text
 #: en/git-worktree.txt:95
@@ -54684,9 +54684,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/git-worktree.txt:96
-#, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:240
 msgid "move"
-msgstr ""
+msgstr "move"
 
 #. type: Plain text
 #: en/git-worktree.txt:100
@@ -54708,9 +54708,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/git-worktree.txt:112
-#, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:240
 msgid "unlock"
-msgstr ""
+msgstr "unlock"
 
 #. type: Plain text
 #: en/git-worktree.txt:115
diff --git a/po/documentation.pt_BR.po b/po/documentation.pt_BR.po
index 64ed669..3da6121 100644
--- a/po/documentation.pt_BR.po
+++ b/po/documentation.pt_BR.po
@@ -32950,9 +32950,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/git-notes.txt:56 en/git-worktree.txt:81
-#, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:240
 msgid "list"
-msgstr ""
+msgstr "list"
 
 #. type: Plain text
 #: en/git-notes.txt:61
@@ -33058,9 +33058,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/git-notes.txt:112 en/git-worktree.txt:105
-#, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:240
 msgid "remove"
-msgstr ""
+msgstr "remove"
 
 #. type: Plain text
 #: en/git-notes.txt:117
@@ -33070,9 +33070,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/git-notes.txt:118 en/git-worktree.txt:101
-#, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:240
 msgid "prune"
-msgstr ""
+msgstr "prune"
 
 #. type: Plain text
 #: en/git-notes.txt:120
@@ -55119,9 +55119,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/git-worktree.txt:88
-#, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:240
 msgid "lock"
-msgstr ""
+msgstr "lock"
 
 #. type: Plain text
 #: en/git-worktree.txt:95
@@ -55131,9 +55131,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/git-worktree.txt:96
-#, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:240
 msgid "move"
-msgstr ""
+msgstr "move"
 
 #. type: Plain text
 #: en/git-worktree.txt:100
@@ -55155,9 +55155,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/git-worktree.txt:112
-#, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:240
 msgid "unlock"
-msgstr ""
+msgstr "unlock"
 
 #. type: Plain text
 #: en/git-worktree.txt:115
diff --git a/po/documentation.pt_PT.po b/po/documentation.pt_PT.po
index cd51b79..900f75f 100644
--- a/po/documentation.pt_PT.po
+++ b/po/documentation.pt_PT.po
@@ -32577,9 +32577,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/git-notes.txt:56 en/git-worktree.txt:81
-#, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:240
 msgid "list"
-msgstr ""
+msgstr "list"
 
 #. type: Plain text
 #: en/git-notes.txt:61
@@ -32685,9 +32685,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/git-notes.txt:112 en/git-worktree.txt:105
-#, fuzzy, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:240
 msgid "remove"
-msgstr "--remove"
+msgstr "remove"
 
 #. type: Plain text
 #: en/git-notes.txt:117
@@ -32697,9 +32697,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/git-notes.txt:118 en/git-worktree.txt:101
-#, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:240
 msgid "prune"
-msgstr ""
+msgstr "prune"
 
 #. type: Plain text
 #: en/git-notes.txt:120
@@ -54671,9 +54671,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/git-worktree.txt:88
-#, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:240
 msgid "lock"
-msgstr ""
+msgstr "lock"
 
 #. type: Plain text
 #: en/git-worktree.txt:95
@@ -54683,9 +54683,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/git-worktree.txt:96
-#, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:240
 msgid "move"
-msgstr ""
+msgstr "move"
 
 #. type: Plain text
 #: en/git-worktree.txt:100
@@ -54707,9 +54707,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/git-worktree.txt:112
-#, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:240
 msgid "unlock"
-msgstr ""
+msgstr "unlock"
 
 #. type: Plain text
 #: en/git-worktree.txt:115
diff --git a/po/documentation.ru.po b/po/documentation.ru.po
index 8c01469..72496b0 100644
--- a/po/documentation.ru.po
+++ b/po/documentation.ru.po
@@ -32592,9 +32592,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/git-notes.txt:56 en/git-worktree.txt:81
-#, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:240
 msgid "list"
-msgstr ""
+msgstr "list"
 
 #. type: Plain text
 #: en/git-notes.txt:61
@@ -32700,9 +32700,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/git-notes.txt:112 en/git-worktree.txt:105
-#, fuzzy, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:240
 msgid "remove"
-msgstr "--remove"
+msgstr "remove"
 
 #. type: Plain text
 #: en/git-notes.txt:117
@@ -32712,9 +32712,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/git-notes.txt:118 en/git-worktree.txt:101
-#, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:240
 msgid "prune"
-msgstr ""
+msgstr "prune"
 
 #. type: Plain text
 #: en/git-notes.txt:120
@@ -54700,9 +54700,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/git-worktree.txt:88
-#, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:240
 msgid "lock"
-msgstr ""
+msgstr "lock"
 
 #. type: Plain text
 #: en/git-worktree.txt:95
@@ -54712,9 +54712,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/git-worktree.txt:96
-#, fuzzy, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:240
 msgid "move"
-msgstr "�筠菌龜劇"
+msgstr "move"
 
 #. type: Plain text
 #: en/git-worktree.txt:100
@@ -54736,9 +54736,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/git-worktree.txt:112
-#, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:240
 msgid "unlock"
-msgstr ""
+msgstr "unlock"
 
 #. type: Plain text
 #: en/git-worktree.txt:115
diff --git a/po/documentation.zh_HANT.po b/po/documentation.zh_HANT.po
index aa40f54..7341752 100644
--- a/po/documentation.zh_HANT.po
+++ b/po/documentation.zh_HANT.po
@@ -31956,9 +31956,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/git-notes.txt:56 en/git-worktree.txt:81
-#, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:240
 msgid "list"
-msgstr ""
+msgstr "list"
 
 #. type: Plain text
 #: en/git-notes.txt:61
@@ -32064,9 +32064,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/git-notes.txt:112 en/git-worktree.txt:105
-#, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:240
 msgid "remove"
-msgstr ""
+msgstr "remove"
 
 #. type: Plain text
 #: en/git-notes.txt:117
@@ -32076,9 +32076,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/git-notes.txt:118 en/git-worktree.txt:101
-#, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:240
 msgid "prune"
-msgstr ""
+msgstr "prune"
 
 #. type: Plain text
 #: en/git-notes.txt:120
@@ -53378,9 +53378,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/git-worktree.txt:88
-#, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:240
 msgid "lock"
-msgstr ""
+msgstr "lock"
 
 #. type: Plain text
 #: en/git-worktree.txt:95
@@ -53390,9 +53390,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/git-worktree.txt:96
-#, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:240
 msgid "move"
-msgstr ""
+msgstr "move"
 
 #. type: Plain text
 #: en/git-worktree.txt:100
@@ -53414,9 +53414,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/git-worktree.txt:112
-#, no-wrap, priority:240
+#, ignore-same, no-wrap, priority:240
 msgid "unlock"
-msgstr ""
+msgstr "unlock"
 
 #. type: Plain text
 #: en/git-worktree.txt:115
diff --git a/scripts/pre-translate-po b/scripts/pre-translate-po
index ac347c8..83fdf77 100755
--- a/scripts/pre-translate-po
+++ b/scripts/pre-translate-po
@@ -8,7 +8,7 @@ def main (f, d=None):
     po = polib.pofile(f, wrapwidth=0)
     option_re = re.compile(r'-[-a-z0-9[\]]+')
     linkgit_re = re.compile(r'((linkgit:)?(git[-a-z0-9[\]]+|mail)(\[[157]\]|\([157]\))(,|;)?(\n| )?)+')
-    quoted_re = re.compile(r'(`[a-zA-Z-_]+`(, )?)+|\'(oneline|short|medium|full(er)?|email|raw|(un)?set|unspecified)\'|(user|transfer|submodule|stash|status|splitIndex|showbranch|sendemail|repack|remote|receive|push|merge(tool)?|mailinfo|log|interactive|instaweb|i18n|help|gui|gitweb|fastimport|format|fetch|diff(tool)?|credential|commit|column|core|branch|apply|color|git-p4)\.[a-zA-Z_.]+|araxis|bc3?|codecompare|deltawalker|guiffy|meld|diff(use|merge)|(exam|g?vim|t?k|open|xx)?diff[23]?|(ec?|p4|s|tortoise|win)merge|update|create|delete|verify|option|resolve|recursive|octopus|ours|subtree|theirs|patience|diff-algorithm=\[[a-z\|]+\]|ignore-(space-change|all-space|(cr|space)-at-eol)|(no-)?renormalize|no-renames|no|default|plain|blocks|(dimmed-)?zebra|allow-indentation-change|color|porcelain|none')
+    quoted_re = re.compile(r'(`[a-zA-Z-_]+`(, )?)+|\'(oneline|short|medium|full(er)?|email|raw|(un)?set|unspecified)\'|(user|transfer|submodule|stash|status|splitIndex|showbranch|sendemail|repack|remote|receive|push|merge(tool)?|mailinfo|log|interactive|instaweb|i18n|help|gui|gitweb|fastimport|format|fetch|diff(tool)?|credential|commit|column|core|branch|apply|color|git-p4)\.[a-zA-Z_.]+|araxis|bc3?|codecompare|deltawalker|guiffy|meld|diff(use|merge)|(exam|g?vim|t?k|open|xx)?diff[23]?|(ec?|p4|s|tortoise|win)merge|update|create|delete|verify|option|resolve|recursive|octopus|ours|subtree|theirs|patience|diff-algorithm=\[[a-z\|]+\]|ignore-(space-change|all-space|(cr|space)-at-eol)|(no-)?renormalize|no-renames|no|default|plain|blocks|(dimmed-)?zebra|allow-indentation-change|color|porcelain|none|list|(un)?lock|(re)?move|prune')
     env_var_re = re.compile(r'`?GIT_[A-Z_\d]+`?')
     if not d is None:
             po_file=polib.pofile(d)
-- 
GitLab