diff --git a/po/documentation.de.po b/po/documentation.de.po
index 147f71e19a63513491dbbd3b4fe654d1c481c28e..f5120bdb796bb88b424793cf638b0e36fc3ae3ec 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 44b90d7a698c2b5078d630fab37049be6f316605..a29965ba6b4169df0ee7459d225d627ca4561343 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 26f5048ade1eb90a4240b88b81e1d3863adfc18f..b72f5b5917e70e018bf7fc281f03555bd25cc61c 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 1e378da447ec88f45389b5ed9238a41c32114ead..b1e74ced4cc28d1f367298c9381597d5119e37eb 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 a077b72da2b8c5a5e7d0501b82c23688c48e34d4..1a15cc3dfe28ad17304622726945ee269ec465c3 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 4c60c2c74c6f107fbfd3074a0666d30a1e01a5cd..6610fe66874ce18e26442f525a1dafc40532ecc8 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 27af5e872f51f5587381371fd370e9bd6689715b..72cadc64c0c390c33db812a7ad87c6fabb7a3311 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 7a9e6b637ade8a14949b1a43e9615d4d34ce5d89..ea726d1ffd70594f0cc7ec7c0fea332a94dd91d8 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 6500c0bd44e5ddd0884a2ba7fadcd0727c2d72fe..397c9e1f43e90bf6dcea50cdbe2fb8ac1c5a454f 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 77bbe10ce1d83c7bb94f43245464944e5ec0c0b7..a19ea465a9355d45a3d0a39884fb69074ecaf1c7 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)