Improve translatability of crypt-gpgme. Closes: #2020.

diff --git a/crypt-gpgme.c b/crypt-gpgme.c
index 33e34a5a30d39f0651fff8fae959809701c266af..54773b69007cdde206a33dcf8e0f71ed8ef57938 100644 (file)
--- a/crypt-gpgme.c
+++ b/crypt-gpgme.c
@@ -2952,7 +2952,7 @@ static void print_key_info (gpgme_key_t key, FILE *fp)
         continue;
 
       s = uid->uid;
-      fprintf (fp, "%s ......: ", idx ? _(" aka") :_("Name"));
+      fputs (idx ? _(" aka ......: ") :_("Name ......: "), fp);
       if (uid->invalid)
         {
           fputs (_("[Invalid]"), fp);
@@ -2975,7 +2975,7 @@ static void print_key_info (gpgme_key_t key, FILE *fp)
 #else
       strftime (shortbuf, sizeof shortbuf, "%c", tm);
 #endif
-      fprintf (fp, "Valid From : %s\n", shortbuf);
+      fprintf (fp, _("Valid From : %s\n"), shortbuf);
     }
   
   if (key->subkeys && (key->subkeys->expires > 0))
@@ -2988,7 +2988,7 @@ static void print_key_info (gpgme_key_t key, FILE *fp)
 #else
       strftime (shortbuf, sizeof shortbuf, "%c", tm);
 #endif
-      fprintf (fp, "Valid To ..: %s\n", shortbuf);
+      fprintf (fp, _("Valid To ..: %s\n"), shortbuf);
     }
 
   if (key->subkeys)
@@ -3001,25 +3001,25 @@ static void print_key_info (gpgme_key_t key, FILE *fp)
   if (key->subkeys)
     aval = key->subkeys->length;
 
-  fprintf (fp, "Key Type ..: %s, %lu bit %s\n", s2, aval, s);
+  fprintf (fp, _("Key Type ..: %s, %lu bit %s\n"), s2, aval, s);
 
-  fprintf (fp, "Key Usage .: ");
+  fprintf (fp, _("Key Usage .: "));
   delim = "";
 
   if (key_check_cap (key, KEY_CAP_CAN_ENCRYPT))
     {
       fprintf (fp, "%s%s", delim, _("encryption"));
-      delim = ", ";
+      delim = _(", ");
     }
   if (key_check_cap (key, KEY_CAP_CAN_SIGN))
     {
       fprintf (fp, "%s%s", delim, _("signing"));
-      delim = ", ";
+      delim = _(", ");
     }
   if (key_check_cap (key, KEY_CAP_CAN_CERTIFY))
     {
       fprintf (fp, "%s%s", delim, _("certification"));
-      delim = ", ";
+      delim = _(", ");
     }
   putc ('\n', fp);
 
@@ -3058,7 +3058,7 @@ static void print_key_info (gpgme_key_t key, FILE *fp)
     {
       s = key->issuer_serial;
       if (s)
-       fprintf (fp, "Serial-No .: 0x%s\n", s);
+       fprintf (fp, _("Serial-No .: 0x%s\n"), s);
     }
 
   if (key->issuer_name)
@@ -3066,7 +3066,7 @@ static void print_key_info (gpgme_key_t key, FILE *fp)
       s = key->issuer_name;
       if (s)
        {
-         fprintf (fp, "Issued By .: ");
+         fprintf (fp, _("Issued By .: "));
          parse_and_print_user_id (fp, s);
          putc ('\n', fp);
        }
@@ -3085,7 +3085,7 @@ static void print_key_info (gpgme_key_t key, FILE *fp)
           putc ('\n', fp);
           if ( strlen (s) == 16)
             s += 8; /* display only the short keyID */
-          fprintf (fp, "Subkey ....: 0x%s", s);
+          fprintf (fp, _("Subkey ....: 0x%s"), s);
          if (subkey->revoked)
             {
               putc (' ', fp);
@@ -3118,7 +3118,7 @@ static void print_key_info (gpgme_key_t key, FILE *fp)
 #else
               strftime (shortbuf, sizeof shortbuf, "%c", tm);
 #endif
-              fprintf (fp, "Valid From : %s\n", shortbuf);
+              fprintf (fp, _("Valid From : %s\n"), shortbuf);
             }
 
          if (subkey->expires > 0)
@@ -3131,7 +3131,7 @@ static void print_key_info (gpgme_key_t key, FILE *fp)
 #else
               strftime (shortbuf, sizeof shortbuf, "%c", tm);
 #endif
-              fprintf (fp, "Valid To ..: %s\n", shortbuf);
+              fprintf (fp, _("Valid To ..: %s\n"), shortbuf);
             }
 
          if (subkey)
@@ -3144,25 +3144,25 @@ static void print_key_info (gpgme_key_t key, FILE *fp)
          else
            aval = 0;
 
-          fprintf (fp, "Key Type ..: %s, %lu bit %s\n", "PGP", aval, s);
+          fprintf (fp, _("Key Type ..: %s, %lu bit %s\n"), "PGP", aval, s);
 
-          fprintf (fp, "Key Usage .: ");
+          fprintf (fp, _("Key Usage .: "));
           delim = "";
 
          if (subkey->can_encrypt)
             {
               fprintf (fp, "%s%s", delim, _("encryption"));
-              delim = ", ";
+              delim = _(", ");
             }
           if (subkey->can_sign)
             {
               fprintf (fp, "%s%s", delim, _("signing"));
-              delim = ", ";
+              delim = _(", ");
             }
           if (subkey->can_certify)
             {
               fprintf (fp, "%s%s", delim, _("certification"));
-              delim = ", ";
+              delim = _(", ");
             }
           putc ('\n', fp);
         }