From f220a93c6fb0fd7435a50aba72b58ffdd2e7949a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Matthias=20A=C3=9Fhauer?= <mha1993@live.de>
Date: Sat, 28 Sep 2019 09:31:58 +0200
Subject: [PATCH] pre-translate-po: handle pretty formats (except format)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
'format' takes a translatable parameter.
Signed-off-by: Matthias A횩hauer <mha1993@live.de>
---
po/documentation.de.po | 29 ++++++++++++++---------------
po/documentation.es_MX.po | 28 ++++++++++++++--------------
po/documentation.fr.po | 14 +++++++-------
po/documentation.nb_NO.po | 28 ++++++++++++++--------------
po/documentation.pot | 28 ++++++++++++++--------------
po/documentation.pt_BR.po | 28 ++++++++++++++--------------
po/documentation.pt_PT.po | 28 ++++++++++++++--------------
po/documentation.ru.po | 28 ++++++++++++++--------------
po/documentation.zh_HANT.po | 28 ++++++++++++++--------------
scripts/pre-translate-po | 2 +-
10 files changed, 120 insertions(+), 121 deletions(-)
diff --git a/po/documentation.de.po b/po/documentation.de.po
index 147f71e..f5120bd 100644
--- a/po/documentation.de.po
+++ b/po/documentation.de.po
@@ -57126,9 +57126,9 @@ msgstr ""
#. type: Plain text
#: en/pretty-formats.txt:22
-#, priority:260
+#, ignore-same, priority:260
msgid "'oneline'"
-msgstr ""
+msgstr "'oneline'"
#. type: Plain text
#: en/pretty-formats.txt:24
@@ -57144,10 +57144,9 @@ msgstr ""
#. type: Plain text
#: en/pretty-formats.txt:28
-#, fuzzy, priority:260
-#| msgid "'show'"
+#, ignore-same, priority:260
msgid "'short'"
-msgstr "'show'"
+msgstr "'short'"
#. type: Plain text
#: en/pretty-formats.txt:31
@@ -57165,9 +57164,9 @@ msgstr ""
#. type: Plain text
#: en/pretty-formats.txt:35
-#, priority:260
+#, ignore-same, priority:260
msgid "'medium'"
-msgstr ""
+msgstr "'medium'"
#. type: Plain text
#: en/pretty-formats.txt:39
@@ -57187,9 +57186,9 @@ msgstr "Unterdr체cke die zusammenfassende Nachricht 체ber die Eintragung."
#. type: Plain text
#: en/pretty-formats.txt:45
-#, priority:260
+#, ignore-same, priority:260
msgid "'full'"
-msgstr ""
+msgstr "'full'"
#. type: Plain text
#: en/pretty-formats.txt:49
@@ -57202,9 +57201,9 @@ msgstr ""
#. type: Plain text
#: en/pretty-formats.txt:55
-#, priority:260
+#, ignore-same, priority:260
msgid "'fuller'"
-msgstr ""
+msgstr "'fuller'"
#. type: Plain text
#: en/pretty-formats.txt:61
@@ -57219,9 +57218,9 @@ msgstr ""
#. type: Plain text
#: en/pretty-formats.txt:67
-#, priority:260
+#, ignore-same, priority:260
msgid "'email'"
-msgstr ""
+msgstr "'email'"
#. type: Plain text
#: en/pretty-formats.txt:72
@@ -57235,9 +57234,9 @@ msgstr ""
#. type: Plain text
#: en/pretty-formats.txt:76
-#, priority:260
+#, ignore-same, priority:260
msgid "'raw'"
-msgstr ""
+msgstr "'raw'"
#. type: Plain text
#: en/pretty-formats.txt:86
diff --git a/po/documentation.es_MX.po b/po/documentation.es_MX.po
index 44b90d7..a29965b 100644
--- a/po/documentation.es_MX.po
+++ b/po/documentation.es_MX.po
@@ -56090,9 +56090,9 @@ msgstr ""
#. type: Plain text
#: en/pretty-formats.txt:22
-#, priority:260
+#, ignore-same, priority:260
msgid "'oneline'"
-msgstr ""
+msgstr "'oneline'"
#. type: Plain text
#: en/pretty-formats.txt:24
@@ -56108,9 +56108,9 @@ msgstr ""
#. type: Plain text
#: en/pretty-formats.txt:28
-#, priority:260
+#, ignore-same, priority:260
msgid "'short'"
-msgstr ""
+msgstr "'short'"
#. type: Plain text
#: en/pretty-formats.txt:31
@@ -56128,9 +56128,9 @@ msgstr ""
#. type: Plain text
#: en/pretty-formats.txt:35
-#, priority:260
+#, ignore-same, priority:260
msgid "'medium'"
-msgstr ""
+msgstr "'medium'"
#. type: Plain text
#: en/pretty-formats.txt:39
@@ -56149,9 +56149,9 @@ msgstr ""
#. type: Plain text
#: en/pretty-formats.txt:45
-#, priority:260
+#, ignore-same, priority:260
msgid "'full'"
-msgstr ""
+msgstr "'full'"
#. type: Plain text
#: en/pretty-formats.txt:49
@@ -56164,9 +56164,9 @@ msgstr ""
#. type: Plain text
#: en/pretty-formats.txt:55
-#, priority:260
+#, ignore-same, priority:260
msgid "'fuller'"
-msgstr ""
+msgstr "'fuller'"
#. type: Plain text
#: en/pretty-formats.txt:61
@@ -56181,9 +56181,9 @@ msgstr ""
#. type: Plain text
#: en/pretty-formats.txt:67
-#, priority:260
+#, ignore-same, priority:260
msgid "'email'"
-msgstr ""
+msgstr "'email'"
#. type: Plain text
#: en/pretty-formats.txt:72
@@ -56197,9 +56197,9 @@ msgstr ""
#. type: Plain text
#: en/pretty-formats.txt:76
-#, priority:260
+#, ignore-same, priority:260
msgid "'raw'"
-msgstr ""
+msgstr "'raw'"
#. type: Plain text
#: en/pretty-formats.txt:86
diff --git a/po/documentation.fr.po b/po/documentation.fr.po
index 26f5048..b72f5b5 100644
--- a/po/documentation.fr.po
+++ b/po/documentation.fr.po
@@ -56752,7 +56752,7 @@ msgstr ""
#. type: Plain text
#: en/pretty-formats.txt:22
-#, priority:260
+#, ignore-same, priority:260
msgid "'oneline'"
msgstr "'oneline'"
@@ -56770,7 +56770,7 @@ msgstr "C'est con챌u pour 챗tre aussi compact que possible."
#. type: Plain text
#: en/pretty-formats.txt:28
-#, priority:260
+#, ignore-same, priority:260
msgid "'short'"
msgstr "'short'"
@@ -56792,7 +56792,7 @@ msgstr "<ligne de titre>\n"
#. type: Plain text
#: en/pretty-formats.txt:35
-#, priority:260
+#, ignore-same, priority:260
msgid "'medium'"
msgstr "'medium'"
@@ -56816,7 +56816,7 @@ msgstr "<message de validation complet>"
#. type: Plain text
#: en/pretty-formats.txt:45
-#, priority:260
+#, ignore-same, priority:260
msgid "'full'"
msgstr "'full'"
@@ -56834,7 +56834,7 @@ msgstr ""
#. type: Plain text
#: en/pretty-formats.txt:55
-#, priority:260
+#, ignore-same, priority:260
msgid "'fuller'"
msgstr "'fuller'"
@@ -56856,7 +56856,7 @@ msgstr ""
#. type: Plain text
#: en/pretty-formats.txt:67
-#, priority:260
+#, ignore-same, priority:260
msgid "'email'"
msgstr "'email'"
@@ -56876,7 +56876,7 @@ msgstr ""
#. type: Plain text
#: en/pretty-formats.txt:76
-#, priority:260
+#, ignore-same, priority:260
msgid "'raw'"
msgstr "'raw'"
diff --git a/po/documentation.nb_NO.po b/po/documentation.nb_NO.po
index 1e378da..b1e74ce 100644
--- a/po/documentation.nb_NO.po
+++ b/po/documentation.nb_NO.po
@@ -56036,9 +56036,9 @@ msgstr ""
#. type: Plain text
#: en/pretty-formats.txt:22
-#, priority:260
+#, ignore-same, priority:260
msgid "'oneline'"
-msgstr ""
+msgstr "'oneline'"
#. type: Plain text
#: en/pretty-formats.txt:24
@@ -56054,9 +56054,9 @@ msgstr ""
#. type: Plain text
#: en/pretty-formats.txt:28
-#, priority:260
+#, ignore-same, priority:260
msgid "'short'"
-msgstr ""
+msgstr "'short'"
#. type: Plain text
#: en/pretty-formats.txt:31
@@ -56074,9 +56074,9 @@ msgstr ""
#. type: Plain text
#: en/pretty-formats.txt:35
-#, priority:260
+#, ignore-same, priority:260
msgid "'medium'"
-msgstr ""
+msgstr "'medium'"
#. type: Plain text
#: en/pretty-formats.txt:39
@@ -56095,9 +56095,9 @@ msgstr ""
#. type: Plain text
#: en/pretty-formats.txt:45
-#, priority:260
+#, ignore-same, priority:260
msgid "'full'"
-msgstr ""
+msgstr "'full'"
#. type: Plain text
#: en/pretty-formats.txt:49
@@ -56110,9 +56110,9 @@ msgstr ""
#. type: Plain text
#: en/pretty-formats.txt:55
-#, priority:260
+#, ignore-same, priority:260
msgid "'fuller'"
-msgstr ""
+msgstr "'fuller'"
#. type: Plain text
#: en/pretty-formats.txt:61
@@ -56127,9 +56127,9 @@ msgstr ""
#. type: Plain text
#: en/pretty-formats.txt:67
-#, priority:260
+#, ignore-same, priority:260
msgid "'email'"
-msgstr ""
+msgstr "'email'"
#. type: Plain text
#: en/pretty-formats.txt:72
@@ -56143,9 +56143,9 @@ msgstr ""
#. type: Plain text
#: en/pretty-formats.txt:76
-#, priority:260
+#, ignore-same, priority:260
msgid "'raw'"
-msgstr ""
+msgstr "'raw'"
#. type: Plain text
#: en/pretty-formats.txt:86
diff --git a/po/documentation.pot b/po/documentation.pot
index a077b72..1a15cc3 100644
--- a/po/documentation.pot
+++ b/po/documentation.pot
@@ -56027,9 +56027,9 @@ msgstr ""
#. type: Plain text
#: en/pretty-formats.txt:22
-#, priority:260
+#, ignore-same, priority:260
msgid "'oneline'"
-msgstr ""
+msgstr "'oneline'"
#. type: Plain text
#: en/pretty-formats.txt:24
@@ -56045,9 +56045,9 @@ msgstr ""
#. type: Plain text
#: en/pretty-formats.txt:28
-#, priority:260
+#, ignore-same, priority:260
msgid "'short'"
-msgstr ""
+msgstr "'short'"
#. type: Plain text
#: en/pretty-formats.txt:31
@@ -56065,9 +56065,9 @@ msgstr ""
#. type: Plain text
#: en/pretty-formats.txt:35
-#, priority:260
+#, ignore-same, priority:260
msgid "'medium'"
-msgstr ""
+msgstr "'medium'"
#. type: Plain text
#: en/pretty-formats.txt:39
@@ -56086,9 +56086,9 @@ msgstr ""
#. type: Plain text
#: en/pretty-formats.txt:45
-#, priority:260
+#, ignore-same, priority:260
msgid "'full'"
-msgstr ""
+msgstr "'full'"
#. type: Plain text
#: en/pretty-formats.txt:49
@@ -56101,9 +56101,9 @@ msgstr ""
#. type: Plain text
#: en/pretty-formats.txt:55
-#, priority:260
+#, ignore-same, priority:260
msgid "'fuller'"
-msgstr ""
+msgstr "'fuller'"
#. type: Plain text
#: en/pretty-formats.txt:61
@@ -56118,9 +56118,9 @@ msgstr ""
#. type: Plain text
#: en/pretty-formats.txt:67
-#, priority:260
+#, ignore-same, priority:260
msgid "'email'"
-msgstr ""
+msgstr "'email'"
#. type: Plain text
#: en/pretty-formats.txt:72
@@ -56134,9 +56134,9 @@ msgstr ""
#. type: Plain text
#: en/pretty-formats.txt:76
-#, priority:260
+#, ignore-same, priority:260
msgid "'raw'"
-msgstr ""
+msgstr "'raw'"
#. type: Plain text
#: en/pretty-formats.txt:86
diff --git a/po/documentation.pt_BR.po b/po/documentation.pt_BR.po
index 4c60c2c..6610fe6 100644
--- a/po/documentation.pt_BR.po
+++ b/po/documentation.pt_BR.po
@@ -56474,9 +56474,9 @@ msgstr ""
#. type: Plain text
#: en/pretty-formats.txt:22
-#, priority:260
+#, ignore-same, priority:260
msgid "'oneline'"
-msgstr ""
+msgstr "'oneline'"
#. type: Plain text
#: en/pretty-formats.txt:24
@@ -56492,9 +56492,9 @@ msgstr ""
#. type: Plain text
#: en/pretty-formats.txt:28
-#, priority:260
+#, ignore-same, priority:260
msgid "'short'"
-msgstr ""
+msgstr "'short'"
#. type: Plain text
#: en/pretty-formats.txt:31
@@ -56512,9 +56512,9 @@ msgstr ""
#. type: Plain text
#: en/pretty-formats.txt:35
-#, priority:260
+#, ignore-same, priority:260
msgid "'medium'"
-msgstr ""
+msgstr "'medium'"
#. type: Plain text
#: en/pretty-formats.txt:39
@@ -56533,9 +56533,9 @@ msgstr ""
#. type: Plain text
#: en/pretty-formats.txt:45
-#, priority:260
+#, ignore-same, priority:260
msgid "'full'"
-msgstr ""
+msgstr "'full'"
#. type: Plain text
#: en/pretty-formats.txt:49
@@ -56548,9 +56548,9 @@ msgstr ""
#. type: Plain text
#: en/pretty-formats.txt:55
-#, priority:260
+#, ignore-same, priority:260
msgid "'fuller'"
-msgstr ""
+msgstr "'fuller'"
#. type: Plain text
#: en/pretty-formats.txt:61
@@ -56565,9 +56565,9 @@ msgstr ""
#. type: Plain text
#: en/pretty-formats.txt:67
-#, priority:260
+#, ignore-same, priority:260
msgid "'email'"
-msgstr ""
+msgstr "'email'"
#. type: Plain text
#: en/pretty-formats.txt:72
@@ -56581,9 +56581,9 @@ msgstr ""
#. type: Plain text
#: en/pretty-formats.txt:76
-#, priority:260
+#, ignore-same, priority:260
msgid "'raw'"
-msgstr ""
+msgstr "'raw'"
#. type: Plain text
#: en/pretty-formats.txt:86
diff --git a/po/documentation.pt_PT.po b/po/documentation.pt_PT.po
index 27af5e8..72cadc6 100644
--- a/po/documentation.pt_PT.po
+++ b/po/documentation.pt_PT.po
@@ -56026,9 +56026,9 @@ msgstr ""
#. type: Plain text
#: en/pretty-formats.txt:22
-#, priority:260
+#, ignore-same, priority:260
msgid "'oneline'"
-msgstr ""
+msgstr "'oneline'"
#. type: Plain text
#: en/pretty-formats.txt:24
@@ -56044,9 +56044,9 @@ msgstr ""
#. type: Plain text
#: en/pretty-formats.txt:28
-#, priority:260
+#, ignore-same, priority:260
msgid "'short'"
-msgstr ""
+msgstr "'short'"
#. type: Plain text
#: en/pretty-formats.txt:31
@@ -56064,9 +56064,9 @@ msgstr ""
#. type: Plain text
#: en/pretty-formats.txt:35
-#, priority:260
+#, ignore-same, priority:260
msgid "'medium'"
-msgstr ""
+msgstr "'medium'"
#. type: Plain text
#: en/pretty-formats.txt:39
@@ -56085,9 +56085,9 @@ msgstr ""
#. type: Plain text
#: en/pretty-formats.txt:45
-#, priority:260
+#, ignore-same, priority:260
msgid "'full'"
-msgstr ""
+msgstr "'full'"
#. type: Plain text
#: en/pretty-formats.txt:49
@@ -56100,9 +56100,9 @@ msgstr ""
#. type: Plain text
#: en/pretty-formats.txt:55
-#, priority:260
+#, ignore-same, priority:260
msgid "'fuller'"
-msgstr ""
+msgstr "'fuller'"
#. type: Plain text
#: en/pretty-formats.txt:61
@@ -56117,9 +56117,9 @@ msgstr ""
#. type: Plain text
#: en/pretty-formats.txt:67
-#, priority:260
+#, ignore-same, priority:260
msgid "'email'"
-msgstr ""
+msgstr "'email'"
#. type: Plain text
#: en/pretty-formats.txt:72
@@ -56133,9 +56133,9 @@ msgstr ""
#. type: Plain text
#: en/pretty-formats.txt:76
-#, priority:260
+#, ignore-same, priority:260
msgid "'raw'"
-msgstr ""
+msgstr "'raw'"
#. type: Plain text
#: en/pretty-formats.txt:86
diff --git a/po/documentation.ru.po b/po/documentation.ru.po
index 7a9e6b6..ea726d1 100644
--- a/po/documentation.ru.po
+++ b/po/documentation.ru.po
@@ -56055,9 +56055,9 @@ msgstr ""
#. type: Plain text
#: en/pretty-formats.txt:22
-#, priority:260
+#, ignore-same, priority:260
msgid "'oneline'"
-msgstr ""
+msgstr "'oneline'"
#. type: Plain text
#: en/pretty-formats.txt:24
@@ -56073,9 +56073,9 @@ msgstr ""
#. type: Plain text
#: en/pretty-formats.txt:28
-#, priority:260
+#, ignore-same, priority:260
msgid "'short'"
-msgstr ""
+msgstr "'short'"
#. type: Plain text
#: en/pretty-formats.txt:31
@@ -56093,9 +56093,9 @@ msgstr ""
#. type: Plain text
#: en/pretty-formats.txt:35
-#, priority:260
+#, ignore-same, priority:260
msgid "'medium'"
-msgstr ""
+msgstr "'medium'"
#. type: Plain text
#: en/pretty-formats.txt:39
@@ -56114,9 +56114,9 @@ msgstr ""
#. type: Plain text
#: en/pretty-formats.txt:45
-#, priority:260
+#, ignore-same, priority:260
msgid "'full'"
-msgstr ""
+msgstr "'full'"
#. type: Plain text
#: en/pretty-formats.txt:49
@@ -56129,9 +56129,9 @@ msgstr ""
#. type: Plain text
#: en/pretty-formats.txt:55
-#, priority:260
+#, ignore-same, priority:260
msgid "'fuller'"
-msgstr ""
+msgstr "'fuller'"
#. type: Plain text
#: en/pretty-formats.txt:61
@@ -56146,9 +56146,9 @@ msgstr ""
#. type: Plain text
#: en/pretty-formats.txt:67
-#, priority:260
+#, ignore-same, priority:260
msgid "'email'"
-msgstr ""
+msgstr "'email'"
#. type: Plain text
#: en/pretty-formats.txt:72
@@ -56162,9 +56162,9 @@ msgstr ""
#. type: Plain text
#: en/pretty-formats.txt:76
-#, priority:260
+#, ignore-same, priority:260
msgid "'raw'"
-msgstr ""
+msgstr "'raw'"
#. type: Plain text
#: en/pretty-formats.txt:86
diff --git a/po/documentation.zh_HANT.po b/po/documentation.zh_HANT.po
index 6500c0b..397c9e1 100644
--- a/po/documentation.zh_HANT.po
+++ b/po/documentation.zh_HANT.po
@@ -54709,9 +54709,9 @@ msgstr ""
#. type: Plain text
#: en/pretty-formats.txt:22
-#, priority:260
+#, ignore-same, priority:260
msgid "'oneline'"
-msgstr ""
+msgstr "'oneline'"
#. type: Plain text
#: en/pretty-formats.txt:24
@@ -54727,9 +54727,9 @@ msgstr ""
#. type: Plain text
#: en/pretty-formats.txt:28
-#, priority:260
+#, ignore-same, priority:260
msgid "'short'"
-msgstr ""
+msgstr "'short'"
#. type: Plain text
#: en/pretty-formats.txt:31
@@ -54747,9 +54747,9 @@ msgstr ""
#. type: Plain text
#: en/pretty-formats.txt:35
-#, priority:260
+#, ignore-same, priority:260
msgid "'medium'"
-msgstr ""
+msgstr "'medium'"
#. type: Plain text
#: en/pretty-formats.txt:39
@@ -54768,9 +54768,9 @@ msgstr ""
#. type: Plain text
#: en/pretty-formats.txt:45
-#, priority:260
+#, ignore-same, priority:260
msgid "'full'"
-msgstr ""
+msgstr "'full'"
#. type: Plain text
#: en/pretty-formats.txt:49
@@ -54783,9 +54783,9 @@ msgstr ""
#. type: Plain text
#: en/pretty-formats.txt:55
-#, priority:260
+#, ignore-same, priority:260
msgid "'fuller'"
-msgstr ""
+msgstr "'fuller'"
#. type: Plain text
#: en/pretty-formats.txt:61
@@ -54800,9 +54800,9 @@ msgstr ""
#. type: Plain text
#: en/pretty-formats.txt:67
-#, priority:260
+#, ignore-same, priority:260
msgid "'email'"
-msgstr ""
+msgstr "'email'"
#. type: Plain text
#: en/pretty-formats.txt:72
@@ -54816,9 +54816,9 @@ msgstr ""
#. type: Plain text
#: en/pretty-formats.txt:76
-#, priority:260
+#, ignore-same, priority:260
msgid "'raw'"
-msgstr ""
+msgstr "'raw'"
#. type: Plain text
#: en/pretty-formats.txt:86
diff --git a/scripts/pre-translate-po b/scripts/pre-translate-po
index 77bbe10..a19ea46 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-_]+`|(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')
+ quoted_re = re.compile(r'`[a-zA-Z-_]+`|\'(oneline|short|medium|full(er)?|email|raw)\'|(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')
env_var_re = re.compile(r'`?GIT_[A-Z_\d]+`?')
if not d is None:
po_file=polib.pofile(d)
--
GitLab