From 6b3492de3cd2c74f6b4aef86ade4f749fe194edf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Matthias=20A=C3=9Fhauer?= <mha1993@live.de>
Date: Sat, 16 Nov 2019 11:11:04 +0100
Subject: [PATCH] pre-translate-po: handle --exec=<git-upload-archive>
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Eventhough --exec takes a parameter, that parameter is named after a git command
and shouldn't be translated.

Signed-off-by: Matthias A횩hauer <mha1993@live.de>
---
 po/documentation.de.po         | 4 ++--
 po/documentation.es_MX.po      | 4 ++--
 po/documentation.fr.po         | 2 +-
 po/documentation.hu.po         | 4 ++--
 po/documentation.id.po         | 4 ++--
 po/documentation.nb_NO.po      | 4 ++--
 po/documentation.nl.po         | 4 ++--
 po/documentation.pl.po         | 4 ++--
 po/documentation.pt_BR.po      | 4 ++--
 po/documentation.pt_PT.po      | 4 ++--
 po/documentation.ru.po         | 4 ++--
 po/documentation.tr.po         | 4 ++--
 po/documentation.zh_HANS-CN.po | 4 ++--
 po/documentation.zh_HANT.po    | 4 ++--
 scripts/pre-translate-po       | 2 +-
 15 files changed, 28 insertions(+), 28 deletions(-)

diff --git a/po/documentation.de.po b/po/documentation.de.po
index f9aff37..146cd89 100644
--- a/po/documentation.de.po
+++ b/po/documentation.de.po
@@ -7684,9 +7684,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/git-archive.txt:73
-#, fuzzy, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
 msgid "--exec=<git-upload-archive>"
-msgstr "-u <upload-pack>"
+msgstr "--exec=<git-upload-archive>"
 
 #. type: Plain text
 #: en/git-archive.txt:76
diff --git a/po/documentation.es_MX.po b/po/documentation.es_MX.po
index 0ee86da..a5adf6c 100644
--- a/po/documentation.es_MX.po
+++ b/po/documentation.es_MX.po
@@ -7640,9 +7640,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/git-archive.txt:73
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
 msgid "--exec=<git-upload-archive>"
-msgstr ""
+msgstr "--exec=<git-upload-archive>"
 
 #. type: Plain text
 #: en/git-archive.txt:76
diff --git a/po/documentation.fr.po b/po/documentation.fr.po
index c51c9f4..a00dd86 100644
--- a/po/documentation.fr.po
+++ b/po/documentation.fr.po
@@ -7819,7 +7819,7 @@ msgstr ""
 
 #. type: Labeled list
 #: en/git-archive.txt:73
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
 msgid "--exec=<git-upload-archive>"
 msgstr "--exec=<git-upload-archive>"
 
diff --git a/po/documentation.hu.po b/po/documentation.hu.po
index 5593cb7..28a2f17 100644
--- a/po/documentation.hu.po
+++ b/po/documentation.hu.po
@@ -7633,9 +7633,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/git-archive.txt:73
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
 msgid "--exec=<git-upload-archive>"
-msgstr ""
+msgstr "--exec=<git-upload-archive>"
 
 #. type: Plain text
 #: en/git-archive.txt:76
diff --git a/po/documentation.id.po b/po/documentation.id.po
index 3b33fdb..1dcb22a 100644
--- a/po/documentation.id.po
+++ b/po/documentation.id.po
@@ -7633,9 +7633,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/git-archive.txt:73
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
 msgid "--exec=<git-upload-archive>"
-msgstr ""
+msgstr "--exec=<git-upload-archive>"
 
 #. type: Plain text
 #: en/git-archive.txt:76
diff --git a/po/documentation.nb_NO.po b/po/documentation.nb_NO.po
index 91da9fe..f70e6fc 100644
--- a/po/documentation.nb_NO.po
+++ b/po/documentation.nb_NO.po
@@ -7634,9 +7634,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/git-archive.txt:73
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
 msgid "--exec=<git-upload-archive>"
-msgstr ""
+msgstr "--exec=<git-upload-archive>"
 
 #. type: Plain text
 #: en/git-archive.txt:76
diff --git a/po/documentation.nl.po b/po/documentation.nl.po
index 54e894d..db62c26 100644
--- a/po/documentation.nl.po
+++ b/po/documentation.nl.po
@@ -7633,9 +7633,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/git-archive.txt:73
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
 msgid "--exec=<git-upload-archive>"
-msgstr ""
+msgstr "--exec=<git-upload-archive>"
 
 #. type: Plain text
 #: en/git-archive.txt:76
diff --git a/po/documentation.pl.po b/po/documentation.pl.po
index 928d79a..d385730 100644
--- a/po/documentation.pl.po
+++ b/po/documentation.pl.po
@@ -7633,9 +7633,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/git-archive.txt:73
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
 msgid "--exec=<git-upload-archive>"
-msgstr ""
+msgstr "--exec=<git-upload-archive>"
 
 #. type: Plain text
 #: en/git-archive.txt:76
diff --git a/po/documentation.pt_BR.po b/po/documentation.pt_BR.po
index 20b5f06..0318bb4 100644
--- a/po/documentation.pt_BR.po
+++ b/po/documentation.pt_BR.po
@@ -7871,9 +7871,9 @@ msgstr "Em vez de criar um arquivo tar do reposit처rio local, recupere um arquiv
 
 #. type: Labeled list
 #: en/git-archive.txt:73
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
 msgid "--exec=<git-upload-archive>"
-msgstr "--exec=<git-upload-de-arquivo>"
+msgstr "--exec=<git-upload-archive>"
 
 #. type: Plain text
 #: en/git-archive.txt:76
diff --git a/po/documentation.pt_PT.po b/po/documentation.pt_PT.po
index 18d4c62..a4ff18d 100644
--- a/po/documentation.pt_PT.po
+++ b/po/documentation.pt_PT.po
@@ -7633,9 +7633,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/git-archive.txt:73
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
 msgid "--exec=<git-upload-archive>"
-msgstr ""
+msgstr "--exec=<git-upload-archive>"
 
 #. type: Plain text
 #: en/git-archive.txt:76
diff --git a/po/documentation.ru.po b/po/documentation.ru.po
index 9cf0e0f..777a885 100644
--- a/po/documentation.ru.po
+++ b/po/documentation.ru.po
@@ -7647,9 +7647,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/git-archive.txt:73
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
 msgid "--exec=<git-upload-archive>"
-msgstr ""
+msgstr "--exec=<git-upload-archive>"
 
 #. type: Plain text
 #: en/git-archive.txt:76
diff --git a/po/documentation.tr.po b/po/documentation.tr.po
index 5e25abf..e8f3a97 100644
--- a/po/documentation.tr.po
+++ b/po/documentation.tr.po
@@ -7635,9 +7635,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/git-archive.txt:73
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
 msgid "--exec=<git-upload-archive>"
-msgstr ""
+msgstr "--exec=<git-upload-archive>"
 
 #. type: Plain text
 #: en/git-archive.txt:76
diff --git a/po/documentation.zh_HANS-CN.po b/po/documentation.zh_HANS-CN.po
index 94c06ff..6b873d2 100644
--- a/po/documentation.zh_HANS-CN.po
+++ b/po/documentation.zh_HANS-CN.po
@@ -7637,9 +7637,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/git-archive.txt:73
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
 msgid "--exec=<git-upload-archive>"
-msgstr ""
+msgstr "--exec=<git-upload-archive>"
 
 #. type: Plain text
 #: en/git-archive.txt:76
diff --git a/po/documentation.zh_HANT.po b/po/documentation.zh_HANT.po
index 3331cdd..d837037 100644
--- a/po/documentation.zh_HANT.po
+++ b/po/documentation.zh_HANT.po
@@ -7637,9 +7637,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/git-archive.txt:73
-#, no-wrap, priority:100
+#, ignore-same, no-wrap, priority:100
 msgid "--exec=<git-upload-archive>"
-msgstr ""
+msgstr "--exec=<git-upload-archive>"
 
 #. type: Plain text
 #: en/git-archive.txt:76
diff --git a/scripts/pre-translate-po b/scripts/pre-translate-po
index dd2e2fe..93f321c 100755
--- a/scripts/pre-translate-po
+++ b/scripts/pre-translate-po
@@ -6,7 +6,7 @@ import sys
 
 def main (f, d=None):
     po = polib.pofile(f, wrapwidth=0)
-    option_re = re.compile(r'-[-a-z0-9[\]]+')
+    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')
     env_var_re = re.compile(r'`?GIT_[A-Z_\d]+`?')
-- 
GitLab