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

diff --cc builtin/fast-export.c
index 7adbc55f0dccb1878071aeb8af45f9b39ce3bf4c,f9a03261e253345947443167ac87dc0031a87e3a..0421360ab7d7d6c36ce08fb6ff060a92f9eced59
--- 1/builtin/fast-export.c
--- 2/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:

diff --cc builtin/fast-import.c
Simple merge

diff --cc gpg-interface.c
Simple merge