mark more translatable strings

diff --git a/libraries/libldif/line64.c b/libraries/libldif/line64.c
index 646418c87b177585e4c87811b0db990e50cedab7..c3775a7bd21f8af9744a27eb786a6f71aab52571 100644 (file)
--- a/libraries/libldif/line64.c
+++ b/libraries/libldif/line64.c
@@ -89,7 +89,7 @@ ldif_parse_line(
 
        if( freeme == NULL ) {
                ber_pvt_log_printf( LDAP_DEBUG_ANY, ldif_debug,
-                       "ldif_parse_line: line malloc failed\n");
+                       _("ldif_parse_line: line malloc failed\n"));
                return( -1 );
        }
 
@@ -99,7 +99,7 @@ ldif_parse_line(
 
        if ( s == NULL ) {
                ber_pvt_log_printf( LDAP_DEBUG_PARSE, ldif_debug,
-                       "ldif_parse_line: missing ':' after %s\n",
+                       _("ldif_parse_line: missing ':' after %s\n"),
                        type );
                ber_memfree( freeme );
                return( -1 );
@@ -142,7 +142,7 @@ ldif_parse_line(
                if ( *s == '\0' ) {
                        /* no value is present, error out */
                        ber_pvt_log_printf( LDAP_DEBUG_PARSE, ldif_debug,
-                               "ldif_parse_line: %s missing base64 value\n", type );
+                               _("ldif_parse_line: %s missing base64 value\n"), type );
                        ber_memfree( freeme );
                        return( -1 );
                }
@@ -155,8 +155,8 @@ ldif_parse_line(
                                if ( p[i] != '=' && (p[i] & 0x80 ||
                                    b642nib[ p[i] & 0x7f ] > 0x3f) ) {
                                        ber_pvt_log_printf( LDAP_DEBUG_ANY, ldif_debug,
-                                               "ldif_parse_line: %s: invalid base64 encoding"
-                                               " char (%c) 0x%x\n",
+                                               _("ldif_parse_line: %s: invalid base64 encoding"
+                                               " char (%c) 0x%x\n"),
                                            type, p[i], p[i] );
                                        ber_memfree( freeme );
                                        return( -1 );
@@ -194,14 +194,14 @@ ldif_parse_line(
                if ( *s == '\0' ) {
                        /* no value is present, error out */
                        ber_pvt_log_printf( LDAP_DEBUG_PARSE, ldif_debug,
-                               "ldif_parse_line: %s missing URL value\n", type );
+                               _("ldif_parse_line: %s missing URL value\n"), type );
                        ber_memfree( freeme );
                        return( -1 );
                }
 
                if( ldif_fetch_url( s, &value, &vlen ) ) {
                        ber_pvt_log_printf( LDAP_DEBUG_ANY, ldif_debug,
-                               "ldif_parse_line: %s: URL \"%s\" fetch failed\n",
+                               _("ldif_parse_line: %s: URL \"%s\" fetch failed\n"),
                                type, s );
                        ber_memfree( freeme );
                        return( -1 );
@@ -216,7 +216,7 @@ ldif_parse_line(
 
        if( type == NULL ) {
                ber_pvt_log_printf( LDAP_DEBUG_ANY, ldif_debug,
-                       "ldif_parse_line: type malloc failed\n");
+                       _("ldif_parse_line: type malloc failed\n"));
                if( url ) ber_memfree( value );
                ber_memfree( freeme );
                return( -1 );
@@ -226,7 +226,7 @@ ldif_parse_line(
                p = ber_memalloc( vlen + 1 );
                if( p == NULL ) {
                        ber_pvt_log_printf( LDAP_DEBUG_ANY, ldif_debug,
-                               "ldif_parse_line: value malloc failed\n");
+                               _("ldif_parse_line: value malloc failed\n"));
                        ber_memfree( type );
                        ber_memfree( freeme );
                        return( -1 );
@@ -523,7 +523,7 @@ ldif_put(
 
     if ( buf == NULL ) {
                ber_pvt_log_printf( LDAP_DEBUG_ANY, ldif_debug,
-                       "ldif_type_and_value: malloc failed!" );
+                       _("ldif_type_and_value: malloc failed!"));
                return NULL;
     }
 

diff --git a/libraries/liblutil/getopt.c b/libraries/liblutil/getopt.c
index 1727aaf64166c5c02ac5251f5d261b6215884c90..788bc30833fd12404ad6b54cabe6ea80227df1df 100644 (file)
--- a/libraries/liblutil/getopt.c
+++ b/libraries/liblutil/getopt.c
@@ -90,7 +90,7 @@ printf("DF_TRACE_DEBUG:       int getopt () in getopt.c\n");
        optopt = (int) c;
        if (c == arg || (cp = strchr(opts,c)) == NULL)
        {
-               ERR(argv,": illegal option--",c);
+               ERR(argv,_(": illegal option--"),c);
                if (argv[optind][++sp] == eos)
                {
                        optind++;
@@ -104,7 +104,7 @@ printf("DF_TRACE_DEBUG:     int getopt () in getopt.c\n");
                        optarg = &argv[optind++][sp + 1];
                else if (++optind >= argc)
                {
-                       ERR(argv,": option requires an argument--",c);
+                       ERR(argv,_(": option requires an argument--"),c);
                        sp = 1;
                        return error;
                }

diff --git a/libraries/liblutil/getpass.c b/libraries/liblutil/getpass.c
index da404df6f4a7a4fbd0fe807ebd5d15c130d1d7ca..50f6d6de8b4d3dce0ebdc2268df86fb85afc11ff 100644 (file)
--- a/libraries/liblutil/getpass.c
+++ b/libraries/liblutil/getpass.c
@@ -50,7 +50,7 @@ lutil_getpass( const char *prompt )
        static char buf[256];
        int i, c;
 
-       if( prompt == NULL ) prompt = "Password: ";
+       if( prompt == NULL ) prompt = _("Password: ");
 
 #ifdef DEBUG
        if (debug & D_TRACE)
@@ -76,7 +76,7 @@ lutil_getpass( const char *prompt )
        FILE *fi;
        RETSIGTYPE (*sig)( int sig );
 
-       if( prompt == NULL ) prompt = "Password: ";
+       if( prompt == NULL ) prompt = _("Password: ");
 
 #ifdef DEBUG
        if (debug & D_TRACE)

diff --git a/libraries/liblutil/passfile.c b/libraries/liblutil/passfile.c
index a42eaddb2ebdc9beb82c5a923021540bfb9602d1..dd80397c9e514e0e80f3f779002f98705fedc01f 100644 (file)
--- a/libraries/liblutil/passfile.c
+++ b/libraries/liblutil/passfile.c
@@ -42,8 +42,8 @@ lutil_get_filed_password(
                struct stat sb;
                if ( fstat( fileno( f ), &sb ) == 0 ) {
                        if( sb.st_mode & 006 ) {
-                               fprintf( stderr,
-                                       "Warning: Password file %s is publicly readable/writeable\n",
+                               fprintf( stderr, _("Warning: Password file %s"
+                                       " is publicly readable/writeable\n"),
                                        filename );
                        }
 

diff --git a/libraries/liblutil/sasl.c b/libraries/liblutil/sasl.c
index 9e522dece0e4ecee9e56ab8e65a577c9a010fac4..88e2eedd4592937fc7d7aac007688556b95ad264 100644 (file)
--- a/libraries/liblutil/sasl.c
+++ b/libraries/liblutil/sasl.c
@@ -138,16 +138,16 @@ static int interaction(
 
        if( challenge ) {
                if( interact->challenge ) {
-                       fprintf( stderr, "Challenge: %s\n", interact->challenge );
+                       fprintf( stderr, _("Challenge: %s\n"), interact->challenge );
                }
        }
 
        if( dflt ) {
-               fprintf( stderr, "Default: %s\n", dflt );
+               fprintf( stderr, _("Default: %s\n"), dflt );
        }
 
        snprintf( input, sizeof input, "%s: ",
-               interact->prompt ? interact->prompt : "Interact" );
+               interact->prompt ? interact->prompt : _("Interact") );
 
        if( noecho ) {
                interact->result = (char *) getpassphrase( input );
@@ -207,7 +207,7 @@ int lutil_sasl_interact(
        if( ld == NULL ) return LDAP_PARAM_ERROR;
 
        if( flags == LDAP_SASL_INTERACTIVE ) {
-               fputs( "SASL Interaction\n", stderr );
+               fputs( _("SASL Interaction\n"), stderr );
        }
 
        while( interact->id != SASL_CB_LIST_END ) {