From: Junio C Hamano <gitster@pobox.com>
Date: Thu, 6 Nov 2025 23:17:01 +0000 (-0800)
Subject: Merge branch 'cc/fast-import-export-i18n-cleanup'
X-Git-Tag: v2.52.0-rc2~5
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e569dced68a486b38b14cdd2e3e0b34d21752a18;p=thirdparty%2Fgit.git

Merge branch 'cc/fast-import-export-i18n-cleanup'

Messages from fast-import/export are now marked for i18n.

* cc/fast-import-export-i18n-cleanup:
  gpg-interface: mark a string for translation
  fast-import: mark strings for translation
  fast-export: mark strings for translation
  gpg-interface: use left shift to define GPG_VERIFY_*
  gpg-interface: simplify ssh fingerprint parsing
---

e569dced68a486b38b14cdd2e3e0b34d21752a18
diff --cc builtin/fast-export.c
index 7adbc55f0d,f9a03261e2..0421360ab7
--- a/builtin/fast-export.c
+++ b/builtin/fast-export.c
@@@ -931,15 -932,16 +932,15 @@@ static void handle_tag(const char *name
  
  	/* handle signed tags */
  	if (message) {
 -		const char *signature = strstr(message,
 -					       "\n-----BEGIN PGP SIGNATURE-----\n");
 -		if (signature)
 +		size_t sig_offset = parse_signed_buffer(message, message_size);
 +		if (sig_offset < message_size)
  			switch (signed_tag_mode) {
  			case SIGN_ABORT:
- 				die("encountered signed tag %s; use "
- 				    "--signed-tags=<mode> to handle it",
+ 				die(_("encountered signed tag %s; use "
+ 				      "--signed-tags=<mode> to handle it"),
  				    oid_to_hex(&tag->object.oid));
  			case SIGN_WARN_VERBATIM:
- 				warning("exporting signed tag %s",
+ 				warning(_("exporting signed tag %s"),
  					oid_to_hex(&tag->object.oid));
  				/* fallthru */
  			case SIGN_VERBATIM: