* keyedit.c, keylist.c, keyserver.c, mainproc.c: Reduce the many
authorDavid Shaw <dshaw@jabberwocky.com>
Wed, 29 Sep 2004 17:41:58 +0000 (17:41 +0000)
committerDavid Shaw <dshaw@jabberwocky.com>
Wed, 29 Sep 2004 17:41:58 +0000 (17:41 +0000)
variations of "revoked" ("revoked", "[revoked]", " [revoked]", "[revoked]
") "and" expired down to two to simplify translation.

g10/ChangeLog
g10/keyedit.c
g10/keylist.c
g10/keyserver.c
g10/mainproc.c

index 59e830b..0ab869c 100644 (file)
@@ -1,3 +1,9 @@
+2004-09-29  David Shaw  <dshaw@jabberwocky.com>
+
+       * keyedit.c, keylist.c, keyserver.c, mainproc.c: Reduce the many
+       variations of "revoked" ("revoked", "[revoked]", " [revoked]",
+       "[revoked] ") "and" expired down to two to simplify translation.
+
 2004-09-28  David Shaw  <dshaw@jabberwocky.com>
 
        * keyedit.c (print_and_check_one_sig): Account for the extra space
index f4f4de1..0144b1e 100644 (file)
@@ -2237,11 +2237,11 @@ show_key_with_all_names( KBNODE keyblock, int only_marked, int with_revoker,
            tty_printf(_("created: %s"),datestr_from_pk(pk));
            tty_printf("  ");
            if(pk->is_revoked)
-             tty_printf(_("revoked: %s"),revokestr_from_pk(pk));
+             tty_printf("%s: %s",_("revoked"),revokestr_from_pk(pk));
            else if(pk->has_expired)
-             tty_printf(_("expired: %s"),expirestr_from_pk(pk));
+             tty_printf("%s: %s",_("expired"),expirestr_from_pk(pk));
            else
-             tty_printf(_("expires: %s"),expirestr_from_pk(pk));
+             tty_printf("%s: %s",_("expires"),expirestr_from_pk(pk));
            tty_printf("  ");
             tty_printf(_("usage: %s"),usagestr_from_pk(pk));
            tty_printf("\n");
@@ -2292,7 +2292,7 @@ show_key_with_all_names( KBNODE keyblock, int only_marked, int with_revoker,
                       keystr_from_sk(sk));
            tty_printf(_("created: %s"),datestr_from_sk(sk));
            tty_printf("  ");
-           tty_printf(_("expires: %s"),expirestr_from_sk(sk));
+           tty_printf("%s: %s",_("expires"),expirestr_from_sk(sk));
            tty_printf("\n");
             if (sk->is_protected && sk->protect.s2k.mode == 1002)
               {
@@ -2418,7 +2418,7 @@ show_basic_key_info ( KBNODE keyblock )
                       keystr_from_pk(pk));
          tty_printf(_("created: %s"),datestr_from_pk(pk));
          tty_printf("  ");
-         tty_printf(_("expires: %s"),expirestr_from_pk(pk));
+         tty_printf("%s: %s",_("expires"),expirestr_from_pk(pk));
           tty_printf("\n");
           print_fingerprint ( pk, NULL, 3 );
           tty_printf("\n");
@@ -2433,7 +2433,7 @@ show_basic_key_info ( KBNODE keyblock )
                      keystr_from_sk(sk));
          tty_printf(_("created: %s"),datestr_from_sk(sk));
          tty_printf("  ");
-         tty_printf(_("expires: %s"),expirestr_from_sk(sk));
+         tty_printf("%s: %s",_("expires"),expirestr_from_sk(sk));
           tty_printf("\n");
           print_fingerprint (NULL, sk, 3 );
           tty_printf("\n");
@@ -2450,9 +2450,9 @@ show_basic_key_info ( KBNODE keyblock )
      
           tty_printf ("     ");
           if (uid->is_revoked)
-            tty_printf (_("[revoked] "));
+            tty_printf("[%s] ",_("revoked"));
           else if ( uid->is_expired )
-            tty_printf (_("[expired] "));
+            tty_printf("[%s] ",_("expired"));
           tty_print_utf8_string (uid->name, uid->len);
           tty_printf ("\n");
         }
index cb38026..df1b896 100644 (file)
@@ -668,9 +668,9 @@ list_keyblock_print ( KBNODE keyblock, int secret, int fpr, void *opaque )
               keystr_from_sk(sk),datestr_from_sk( sk ));
 
        if(sk->has_expired)
-         printf(_(" [expired: %s]"), expirestr_from_sk( sk ) );
+         printf(" [%s: %s]",_("expired"),expirestr_from_sk( sk ) );
        else if(sk->expiredate )
-         printf(_(" [expires: %s]"), expirestr_from_sk( sk ) );
+         printf(" [%s: %s]",_("expires"),expirestr_from_sk( sk ) );
 
        printf("\n");
       }
@@ -689,11 +689,11 @@ list_keyblock_print ( KBNODE keyblock, int secret, int fpr, void *opaque )
           is room in the new format, so why not? */
 
        if(pk->is_revoked)
-         printf(_(" [revoked: %s]"), revokestr_from_pk( pk ) );
+         printf(" [%s: %s]",_("revoked"),revokestr_from_pk( pk ) );
        else if(pk->has_expired)
-         printf(_(" [expired: %s]"), expirestr_from_pk( pk ) );
+         printf(" [%s: %s]",_("expired"),expirestr_from_pk( pk ) );
        else if(pk->expiredate)
-         printf(_(" [expires: %s]"), expirestr_from_pk( pk ) );
+         printf(" [%s: %s]",_("expires"),expirestr_from_pk( pk ) );
 
 #if 0
        /* I need to think about this some more.  It's easy enough to
@@ -787,11 +787,11 @@ list_keyblock_print ( KBNODE keyblock, int secret, int fpr, void *opaque )
                   nbits_from_pk( pk2 ),pubkey_letter( pk2->pubkey_algo ),
                   keystr_from_pk(pk2),datestr_from_pk(pk2));
            if( pk2->is_revoked )
-             printf(_(" [revoked: %s]"), revokestr_from_pk(pk2));
+             printf(" [%s: %s]",_("revoked"),revokestr_from_pk(pk2));
            else if( pk2->has_expired )
-             printf(_(" [expired: %s]"), expirestr_from_pk( pk2 ) );
+             printf(" [%s: %s]",_("expired"),expirestr_from_pk(pk2));
            else if( pk2->expiredate )
-             printf(_(" [expires: %s]"), expirestr_from_pk( pk2 ) );
+             printf(" [%s: %s]",_("expires"),expirestr_from_pk(pk2));
             putchar('\n');
            if( fpr > 1 )
              print_fingerprint( pk2, NULL, 0 );
@@ -817,7 +817,7 @@ list_keyblock_print ( KBNODE keyblock, int secret, int fpr, void *opaque )
                   nbits_from_sk( sk2 ),pubkey_letter( sk2->pubkey_algo ),
                   keystr_from_sk(sk2),datestr_from_sk( sk2 ) );
             if( sk2->expiredate )
-             printf(_(" [expires: %s]"), expirestr_from_sk( sk2 ) );
+             printf(" [%s: %s]",_("expires"), expirestr_from_sk( sk2 ) );
            putchar('\n');
            if( fpr > 1 )
               {
index e299203..1c7270d 100644 (file)
@@ -361,17 +361,20 @@ print_keyrec(int number,struct keyrec *keyrec)
     }
 
   if(keyrec->createtime>0)
-    printf(", created %s",strtimestamp(keyrec->createtime));
+    {
+      printf(", ");
+      printf(_("created: %s"),strtimestamp(keyrec->createtime));
+    }
 
   if(keyrec->expiretime>0)
-    printf(", expires %s",strtimestamp(keyrec->expiretime));
+    printf(", %s: %s",_("expires"),strtimestamp(keyrec->expiretime));
 
   if(keyrec->flags&1)
-    printf(" (%s)",("revoked"));
+    printf(" (%s)",_("revoked"));
   if(keyrec->flags&2)
-    printf(" (%s)",("disabled"));
+    printf(" (%s)",_("disabled"));
   if(keyrec->flags&4)
-    printf(" (%s)",("expired"));
+    printf(" (%s)",_("expired"));
 
   printf("\n");
 }
index f373de7..b288958 100644 (file)
@@ -927,9 +927,9 @@ list_node( CTX c, KBNODE node )
          {
            /* of subkey */
            if( pk->is_revoked )
-             printf(" %s",_("[revoked] "));
+             printf(" [%s]",_("revoked"));
            else if( pk->expiredate )
-             printf(_(" [expires: %s]"), expirestr_from_pk( pk ) );
+             printf(" [%s:%s]",_("expires"), expirestr_from_pk( pk ) );
          }
 
        if( !any )