Package: shadow Version: 4.0.3 Author: Guillem Jover Status: applied Debbug: 266281 Description: Some strings missing gettext tags. diff -Naur shadow-4.0.3/libmisc/obscure.c shadow-4.0.3.intl/libmisc/obscure.c --- shadow-4.0.3/libmisc/obscure.c 1999-03-07 20:14:40.000000000 +0100 +++ shadow-4.0.3.intl/libmisc/obscure.c 2004-08-16 05:26:05.000000000 +0200 @@ -161,7 +161,7 @@ #endif if (strcmp(new, old) == 0) - return "no change"; + return _("no change"); newmono = str_lower(xstrdup(new)); oldmono = str_lower(xstrdup(old)); @@ -170,19 +170,19 @@ strcat (wrapped, oldmono); if (palindrome(oldmono, newmono)) - msg = "a palindrome"; + msg = _("a palindrome"); if (!msg && strcmp(oldmono, newmono) == 0) - msg = "case changes only"; + msg = _("case changes only"); if (!msg && similar(oldmono, newmono)) - msg = "too similar"; + msg = _("too similar"); if (!msg && simple(old, new)) - msg = "too simple"; + msg = _("too simple"); if (!msg && strstr(wrapped, newmono)) - msg = "rotated"; + msg = _("rotated"); #ifdef HAVE_LIBCRACK /* @@ -223,7 +223,7 @@ #endif if ( newlen < getdef_num("PASS_MIN_LEN", 0) ) - return "too short"; + return _("too short"); /* * Remaining checks are optional. diff -Naur shadow-4.0.3/libmisc/pam_pass.c shadow-4.0.3.intl/libmisc/pam_pass.c --- shadow-4.0.3/libmisc/pam_pass.c 2004-08-16 07:03:09.000000000 +0200 +++ shadow-4.0.3.intl/libmisc/pam_pass.c 2004-08-16 05:26:37.000000000 +0200 @@ -51,7 +51,7 @@ exit(10); /* XXX */ } - fputs("passwd: password updated successfully\n", stderr); + fputs(_("passwd: password updated successfully\n"), stderr); pam_end(pamh, PAM_SUCCESS); } #else /* !USE_PAM */ diff -Naur shadow-4.0.3/libmisc/utmp.c shadow-4.0.3.intl/libmisc/utmp.c --- shadow-4.0.3/libmisc/utmp.c 2004-08-16 07:03:09.000000000 +0200 +++ shadow-4.0.3.intl/libmisc/utmp.c 2004-08-16 05:45:11.000000000 +0200 @@ -54,9 +54,9 @@ extern void endutent(); #define NO_UTENT \ - "No utmp entry. You must exec \"login\" from the lowest level \"sh\"" + _("No utmp entry. You must exec \"login\" from the lowest level \"sh\"") #define NO_TTY \ - "Unable to determine your tty name." + _("Unable to determine your tty name.") /* * checkutmp - see if utmp file is correct for this process diff -Naur shadow-4.0.3/src/chage.c shadow-4.0.3.intl/src/chage.c --- shadow-4.0.3/src/chage.c 2004-08-16 07:03:10.000000000 +0200 +++ shadow-4.0.3.intl/src/chage.c 2004-08-16 05:55:59.000000000 +0200 @@ -586,7 +586,7 @@ } if (lflg && (setgid (getgid ()) || setuid (ruid))) { - fprintf (stderr, "%s: failed to drop privileges (%s)\n", + fprintf (stderr, _("%s: failed to drop privileges (%s)\n"), Prog, strerror (errno)); exit (1); } diff -Naur shadow-4.0.3/src/cppw.c shadow-4.0.3.intl/src/cppw.c --- shadow-4.0.3/src/cppw.c 2004-08-16 07:03:10.000000000 +0200 +++ shadow-4.0.3.intl/src/cppw.c 2004-08-16 07:06:51.000000000 +0200 @@ -97,7 +97,7 @@ if (filelocked) (*unlock)(); if (msg) fprintf(stderr, "%s: %s", progname, msg); if (syserr) fprintf(stderr, ": %s", strerror(err)); - fprintf(stderr, "\n%s: %s is unchanged\n", progname, filename); + fprintf(stderr, _("\n%s: %s is unchanged\n"), progname, filename); exit(ret); } @@ -114,14 +114,14 @@ filenewname = filenew; if (access(file, F_OK)) cppwexit(file, 1, 1); - if (!file_lock()) cppwexit("Couldn't lock file", errno, 5); + if (!file_lock()) cppwexit(_("Couldn't lock file"), errno, 5); filelocked = 1; /* file to copy has same owners, perm */ if (stat(file, &st1)) cppwexit(file, 1, 1); if (!(f = fopen(in_file, "r"))) cppwexit(file, 1, 1); if (create_backup_file(f, filenew, &st1)) - cppwexit("Couldn't make backup", errno, 1); + cppwexit(_("Couldn't make backup"), errno, 1); /* XXX - here we should check filenew for errors; if there are any, fail w/ an appropriate error code and let the user manually fix @@ -129,7 +129,7 @@ stolen from '--marekm's comment) */ if (rename(filenew, file) == -1) { - fprintf(stderr, "%s: can't copy %s: %s)\n", + fprintf(stderr, _("%s: can't copy %s: (%s)\n"), progname, filenew, strerror(errno)); cppwexit(0,0,1); } @@ -148,6 +148,10 @@ int e = 1; int do_cppw; + setlocale (LC_ALL, ""); + bindtextdomain (PACKAGE, LOCALEDIR); + textdomain (PACKAGE); + progname = ((c = strrchr(*argv, '/')) ? c+1 : *argv); do_cppw = (strcmp(progname, "cpgr") != 0); @@ -165,16 +169,16 @@ case 'h': e = 0; default: - printf("Usage:\n\ + printf(_("Usage:\n\ `cppw ' copys over /etc/passwd `cppw -s ' copys over /etc/shadow\n\ `cpgr ' copys over /etc/group `cpgr -s ' copys over /etc/gshadow\n\ -"); +")); exit(e); } } if (optind >= argc) { - cppwexit ("missing file argument, -h for usage",0,1); + cppwexit (_("missing file argument, -h for usage"),0,1); } in_file = argv[argc - 1]; diff -Naur shadow-4.0.3/src/login.c shadow-4.0.3.intl/src/login.c --- shadow-4.0.3/src/login.c 2004-08-16 07:03:10.000000000 +0200 +++ shadow-4.0.3.intl/src/login.c 2004-08-16 06:30:54.000000000 +0200 @@ -719,7 +719,7 @@ retcode = pam_start ("login", username, &conv, &pamh); if (retcode != PAM_SUCCESS) { fprintf (stderr, - "login: PAM Failure, aborting: %s\n", + _("login: PAM Failure, aborting: %s\n"), pam_strerror (pamh, retcode)); syslog (LOG_ERR, "Couldn't initialize PAM: %s", pam_strerror (pamh, retcode)); @@ -748,11 +748,11 @@ if (!gethostname (hostn, sizeof (hostn))) snprintf (login_prompt, sizeof (login_prompt), - "%s login: ", hostn); + _("%s login: "), hostn); else snprintf (login_prompt, sizeof (login_prompt), - "login: "); + _("login: ")); retcode = pam_set_item (pamh, PAM_USER_PROMPT, @@ -841,7 +841,7 @@ if (!failed) break; - fprintf(stderr,"Login incorrect\n\n"); + fprintf(stderr, _("Login incorrect\n\n")); #ifndef USE_PAM if (pwd && getdef_bool("FAILLOG_ENAB")) failure (pwent.pw_uid, tty, &faillog); @@ -1309,7 +1309,7 @@ if (child < 0) { /* error in fork() */ fprintf (stderr, - "login: failure forking: %s", + _("login: failure forking: %s"), strerror (errno)); PAM_END; exit (0); diff -Naur shadow-4.0.3/src/logoutd.c shadow-4.0.3.intl/src/logoutd.c --- shadow-4.0.3/src/logoutd.c 2002-01-05 16:41:43.000000000 +0100 +++ shadow-4.0.3.intl/src/logoutd.c 2004-08-16 06:32:31.000000000 +0200 @@ -48,7 +48,7 @@ static char *Prog; #ifndef DEFAULT_HUP_MESG -#define DEFAULT_HUP_MESG "login time exceeded\r\n" +#define DEFAULT_HUP_MESG _("login time exceeded\r\n") #endif #ifndef HUP_MESG_FILE diff -Naur shadow-4.0.3/src/newgrp.c shadow-4.0.3.intl/src/newgrp.c --- shadow-4.0.3/src/newgrp.c 2004-08-16 07:03:10.000000000 +0200 +++ shadow-4.0.3.intl/src/newgrp.c 2004-08-16 06:36:06.000000000 +0200 @@ -431,7 +431,7 @@ child = fork (); if (child < 0) { /* error in fork() */ - fprintf (stderr, "%s: failure forking: %s", + fprintf (stderr, _("%s: failure forking: %s"), is_newgrp ? "newgrp" : "sg", strerror (errno)); exit (1); diff -Naur shadow-4.0.3/src/su.c shadow-4.0.3.intl/src/su.c --- shadow-4.0.3/src/su.c 2004-08-16 07:03:10.000000000 +0200 +++ shadow-4.0.3.intl/src/su.c 2004-08-16 06:41:52.000000000 +0200 @@ -585,7 +585,7 @@ ret = pam_get_item(pamh, PAM_USER, (const void **) &tmp_name); if (ret != PAM_SUCCESS) { SYSLOG((LOG_ERR, "pam_get_item: internal PAM error\n")); - fprintf(stderr, "%s: Internal PAM error retrieving username\n", Prog); + fprintf(stderr, _("%s: Internal PAM error retrieving username\n"), Prog); pam_end(pamh, ret); su_failure(tty); } diff -Naur shadow-4.0.3/src/useradd.c shadow-4.0.3.intl/src/useradd.c --- shadow-4.0.3/src/useradd.c 2004-08-16 07:03:10.000000000 +0200 +++ shadow-4.0.3.intl/src/useradd.c 2004-08-16 06:46:03.000000000 +0200 @@ -904,7 +904,7 @@ ngrp->gr_mem = add_list (ngrp->gr_mem, user_name); if (!gr_update (ngrp)) { fprintf (stderr, - "%s: error adding new group entry\n", + _("%s: error adding new group entry\n"), Prog); fail_exit (E_GRP_UPDATE); } @@ -915,7 +915,7 @@ if (!gr_dbm_update (ngrp)) { fprintf (stderr, - "%s: cannot add new dbm group entry\n", + _("%s: cannot add new dbm group entry\n"), Prog); fail_exit (E_GRP_UPDATE); } else