Paste number 158047: leftover i18n

Paste number 158047: leftover i18n
Pasted by: phf
When:3 years, 5 months ago
Share:Tweet this! | http://paste.lisp.org/+3DY7
Channel:None
Paste contents:
Raw Source | XML | Display As
diff -ur mpi2/errors.c mpi/errors.c
--- mpi2/errors.c	2015-10-31 12:54:12.000000000 -0400
+++ mpi/errors.c	2015-10-31 20:50:24.000000000 -0400
@@ -49,65 +49,65 @@
     switch( err ) {
       case -1:		p = "eof"; break;
       case 0:		p = "okay"; break;
-      X(GENERAL,	N_("general error"))
-      X(UNKNOWN_PACKET, N_("unknown packet type"))
-      X(UNKNOWN_VERSION,N_("unknown version"))
-      X(PUBKEY_ALGO    ,N_("unknown pubkey algorithm"))
-      X(DIGEST_ALGO    ,N_("unknown digest algorithm"))
-      X(BAD_PUBKEY     ,N_("bad public key"))
-      X(BAD_SECKEY     ,N_("bad secret key"))
-      X(BAD_SIGN       ,N_("bad signature"))
-      X(CHECKSUM   ,	N_("checksum error"))
-      X(BAD_PASS     ,	N_("bad passphrase"))
-      X(NO_PUBKEY      ,N_("public key not found"))
-      X(CIPHER_ALGO    ,N_("unknown cipher algorithm"))
-      X(KEYRING_OPEN   ,N_("can't open the keyring"))
-      X(INVALID_PACKET ,N_("invalid packet"))
-      X(INVALID_ARMOR  ,N_("invalid armor"))
-      X(NO_USER_ID     ,N_("no such user id"))
-      X(NO_SECKEY      ,N_("secret key not available"))
-      X(WRONG_SECKEY   ,N_("wrong secret key used"))
-      X(UNSUPPORTED    ,N_("not supported"))
-      X(BAD_KEY        ,N_("bad key"))
-      X(READ_FILE      ,N_("file read error"))
-      X(WRITE_FILE     ,N_("file write error"))
-      X(COMPR_ALGO     ,N_("unknown compress algorithm"))
-      X(OPEN_FILE      ,N_("file open error"))
-      X(CREATE_FILE    ,N_("file create error"))
-      X(PASSPHRASE     ,N_("invalid passphrase"))
-      X(NI_PUBKEY      ,N_("unimplemented pubkey algorithm"))
-      X(NI_CIPHER      ,N_("unimplemented cipher algorithm"))
-      X(SIG_CLASS      ,N_("unknown signature class"))
-      X(TRUSTDB        ,N_("trust database error"))
-      X(BAD_MPI        ,N_("bad MPI"))
-      X(RESOURCE_LIMIT ,N_("resource limit"))
-      X(INV_KEYRING    ,N_("invalid keyring"))
-      X(BAD_CERT       ,N_("bad certificate"))
-      X(INV_USER_ID    ,N_("malformed user id"))
-      X(CLOSE_FILE     ,N_("file close error"))
-      X(RENAME_FILE    ,N_("file rename error"))
-      X(DELETE_FILE    ,N_("file delete error"))
-      X(UNEXPECTED     ,N_("unexpected data"))
-      X(TIME_CONFLICT  ,N_("timestamp conflict"))
-      X(WR_PUBKEY_ALGO ,N_("unusable pubkey algorithm"))
-      X(FILE_EXISTS    ,N_("file exists"))
-      X(WEAK_KEY       ,N_("weak key"))
-      X(INV_ARG        ,N_("invalid argument"))
-      X(BAD_URI        ,N_("bad URI"))
-      X(INVALID_URI    ,N_("unsupported URI"))
-      X(NETWORK        ,N_("network error"))
+      X(GENERAL,	"general error")
+      X(UNKNOWN_PACKET, "unknown packet type")
+      X(UNKNOWN_VERSION,"unknown version")
+      X(PUBKEY_ALGO    ,"unknown pubkey algorithm")
+      X(DIGEST_ALGO    ,"unknown digest algorithm")
+      X(BAD_PUBKEY     ,"bad public key")
+      X(BAD_SECKEY     ,"bad secret key")
+      X(BAD_SIGN       ,"bad signature")
+      X(CHECKSUM       ,"checksum error")
+      X(BAD_PASS       ,"bad passphrase")
+      X(NO_PUBKEY      ,"public key not found")
+      X(CIPHER_ALGO    ,"unknown cipher algorithm")
+      X(KEYRING_OPEN   ,"can't open the keyring")
+      X(INVALID_PACKET ,"invalid packet")
+      X(INVALID_ARMOR  ,"invalid armor")
+      X(NO_USER_ID     ,"no such user id")
+      X(NO_SECKEY      ,"secret key not available")
+      X(WRONG_SECKEY   ,"wrong secret key used")
+      X(UNSUPPORTED    ,"not supported")
+      X(BAD_KEY        ,"bad key")
+      X(READ_FILE      ,"file read error")
+      X(WRITE_FILE     ,"file write error")
+      X(COMPR_ALGO     ,"unknown compress algorithm")
+      X(OPEN_FILE      ,"file open error")
+      X(CREATE_FILE    ,"file create error")
+      X(PASSPHRASE     ,"invalid passphrase")
+      X(NI_PUBKEY      ,"unimplemented pubkey algorithm")
+      X(NI_CIPHER      ,"unimplemented cipher algorithm")
+      X(SIG_CLASS      ,"unknown signature class")
+      X(TRUSTDB        ,"trust database error")
+      X(BAD_MPI        ,"bad MPI")
+      X(RESOURCE_LIMIT ,"resource limit")
+      X(INV_KEYRING    ,"invalid keyring")
+      X(BAD_CERT       ,"bad certificate")
+      X(INV_USER_ID    ,"malformed user id")
+      X(CLOSE_FILE     ,"file close error")
+      X(RENAME_FILE    ,"file rename error")
+      X(DELETE_FILE    ,"file delete error")
+      X(UNEXPECTED     ,"unexpected data")
+      X(TIME_CONFLICT  ,"timestamp conflict")
+      X(WR_PUBKEY_ALGO ,"unusable pubkey algorithm")
+      X(FILE_EXISTS    ,"file exists")
+      X(WEAK_KEY       ,"weak key")
+      X(INV_ARG        ,"invalid argument")
+      X(BAD_URI        ,"bad URI")
+      X(INVALID_URI    ,"unsupported URI")
+      X(NETWORK        ,"network error")
       X(SELFTEST_FAILED,"selftest failed")
-      X(NOT_ENCRYPTED  ,N_("not encrypted"))
-      X(NOT_PROCESSED  ,N_("not processed"))
+      X(NOT_ENCRYPTED  ,"not encrypted")
+      X(NOT_PROCESSED  ,"not processed")
       /* the key cannot be used for a specific usage */
-      X(UNU_PUBKEY     ,N_("unusable public key"))
-      X(UNU_SECKEY     ,N_("unusable secret key"))
-      X(KEYSERVER      ,N_("keyserver error"))
-      X(CANCELED       ,N_("canceled"))
-      X(NO_CARD        ,N_("no card"))
-      X(NO_DATA        ,N_("no data"))
+      X(UNU_PUBKEY     ,"unusable public key")
+      X(UNU_SECKEY     ,"unusable secret key")
+      X(KEYSERVER      ,"keyserver error")
+      X(CANCELED       ,"canceled")
+      X(NO_CARD        ,"no card")
+      X(NO_DATA        ,"no data")
       default: p = buf; sprintf(buf, "g10err=%d", err); break;
     }
 #undef X
-    return _(p);
+    return p;
 }
diff -ur mpi2/logger.c mpi/logger.c
--- mpi2/logger.c	2015-10-31 12:54:27.000000000 -0400
+++ mpi/logger.c	2015-10-31 20:53:24.000000000 -0400
@@ -152,10 +152,10 @@
     if(strict)
       {
 	errorcount++;
-	g10_log_print_prefix(_("ERROR: "));
+	g10_log_print_prefix("ERROR: ");
       }
     else
-      g10_log_print_prefix(_("WARNING: "));
+      g10_log_print_prefix("WARNING: ");
 
     va_start( arg_ptr, fmt ) ;
     vfprintf(logfp,fmt,arg_ptr) ;
@@ -218,13 +218,13 @@
 void
 g10_log_bug0( const char *file, int line, const char *func )
 {
-    log_bug(_("... this is a bug (%s:%d:%s)\n"), file, line, func );
+    log_bug("... this is a bug (%s:%d:%s)\n", file, line, func );
 }
 #else
 void
 g10_log_bug0( const char *file, int line )
 {
-    log_bug(_("you found a bug ... (%s:%d)\n"), file, line);
+    log_bug("you found a bug ... (%s:%d)\n", file, line);
 }
 #endif
 
diff -ur mpi2/secmem.c mpi/secmem.c
--- mpi2/secmem.c	2015-10-31 12:54:37.000000000 -0400
+++ mpi/secmem.c	2015-10-31 20:56:54.000000000 -0400
@@ -92,9 +92,9 @@
 {
   if (!no_warning)
     {
-      log_info(_("WARNING: using insecure memory!\n"));
-      log_info(_("please see http://www.gnupg.org/faq.html"
-		 " for more information\n"));
+      log_info("WARNING: using insecure memory!\n");
+      log_info("please see http://www.gnupg.org/faq.html"
+               " for more information\n");
     }
 }
 
@@ -351,8 +351,8 @@
 
     if( !pool_okay ) {
 	log_info(
-	 _("operation is not possible without initialized secure memory\n"));
-	log_info(_("(you may have used the wrong program for this task)\n"));
+         "operation is not possible without initialized secure memory\n");
+	log_info("(you may have used the wrong program for this task)\n");
 	exit(2);
     }
     if( show_warning && !suspend_warning ) {

This paste has no annotations.

Colorize as:
Show Line Numbers

Lisppaste pastes can be made by anyone at any time. Imagine a fearsomely comprehensive disclaimer of liability. Now fear, comprehensively.