From 64fefaf5bffdd4041190f1e5ed4b5d0100638c0d Mon Sep 17 00:00:00 2001 From: Pedro Ribeiro Date: Fri, 3 Oct 2008 09:13:20 +0200 Subject: [PATCH] login-utils: several strings without gettext calls Signed-off-by: Pedro Ribeiro Signed-off-by: Karel Zak --- login-utils/agetty.c | 12 +++++++----- login-utils/checktty.c | 9 +++++---- login-utils/chfn.c | 8 ++++---- login-utils/simpleinit.c | 6 +++--- 4 files changed, 19 insertions(+), 16 deletions(-) diff --git a/login-utils/agetty.c b/login-utils/agetty.c index 02de349b..10162273 100644 --- a/login-utils/agetty.c +++ b/login-utils/agetty.c @@ -891,11 +891,13 @@ do_prompt(op, tp) case 'd': case 't': { - char *weekday[] = { "Sun", "Mon", "Tue", "Wed", "Thu", - "Fri", "Sat" }; - char *month[] = { "Jan", "Feb", "Mar", "Apr", "May", - "Jun", "Jul", "Aug", "Sep", "Oct", - "Nov", "Dec" }; + char *weekday[] = { N_("Sun"), N_("Mon"), N_("Tue"), + N_("Wed"), N_("Thu"), N_("Fri"), + N_("Sat") }; + char *month[] = { N_("Jan"), N_("Feb"), N_("Mar"), + N_("Apr"), N_("May"), N_("Jun"), + N_("Jul"), N_("Aug"), N_("Sep"), + N_("Oct"), N_("Nov"), N_("Dec") }; time_t now; struct tm *tm; diff --git a/login-utils/checktty.c b/login-utils/checktty.c index c28ee833..b79f7bd6 100644 --- a/login-utils/checktty.c +++ b/login-utils/checktty.c @@ -316,7 +316,7 @@ main(int argc, char **argv) for (item = alist; item->range; item++) { - printf("hnmatch() on %-30s <-- %-15s: ", item->range, item->ip); + printf(_("hnmatch() on %-30s <-- %-15s: "), item->range, item->ip); if (getaddrinfo(item->ip, NULL, &hints, &info)==0 && info) { if (info->ai_family == AF_INET) { @@ -334,17 +334,18 @@ main(int argc, char **argv) hostfamily = info->ai_family; freeaddrinfo(info); printf("%s\n", hnmatch("dummy", item->range) ? - "match" : "mismatch"); + _("match") : _("mismatch")); } else - printf("getaddrinfo() failed\n"); + printf(_("getaddrinfo() failed\n")); } return 0; } #endif /* MAIN_TEST_CHECKTTY */ -static char *wdays[] = { "sun", "mon", "tue", "wed", "thu", "fri", "sat" }; +static char *wdays[] = { N_("sun"), N_("mon"), N_("tue"), N_("wed"), + N_("thu"), N_("fri"), N_("sat") }; /* example timespecs: diff --git a/login-utils/chfn.c b/login-utils/chfn.c index 3ca190f1..bab3939c 100644 --- a/login-utils/chfn.c +++ b/login-utils/chfn.c @@ -374,10 +374,10 @@ static void ask_info (oldfp, newfp) struct finfo *oldfp; struct finfo *newfp; { - newfp->full_name = prompt ("Name", oldfp->full_name); - newfp->office = prompt ("Office", oldfp->office); - newfp->office_phone = prompt ("Office Phone", oldfp->office_phone); - newfp->home_phone = prompt ("Home Phone", oldfp->home_phone); + newfp->full_name = prompt (_("Name"), oldfp->full_name); + newfp->office = prompt (_("Office"), oldfp->office); + newfp->office_phone = prompt (_("Office Phone"), oldfp->office_phone); + newfp->home_phone = prompt (_("Home Phone"), oldfp->home_phone); printf ("\n"); } diff --git a/login-utils/simpleinit.c b/login-utils/simpleinit.c index 739306cf..1e7ba282 100644 --- a/login-utils/simpleinit.c +++ b/login-utils/simpleinit.c @@ -337,12 +337,12 @@ static int check_single_ok (void) for (i = 0; i < MAXTRIES; i++) { - pass = getpass (_ ("Password: ") ); + pass = getpass (_("Password: ") ); if (pass == NULL) continue; if ( !strcmp (crypt (pass, rootpass), rootpass) ) return 1; - puts (_ ("\nWrong password.\n") ); + puts (_("\nWrong password.\n") ); } return 0; } @@ -944,7 +944,7 @@ static void process_command (const struct command_struct *command) while (waitpid (pid, &ival, 0) != pid) /* Nothing */; if ( WIFEXITED (ival) && (WEXITSTATUS (ival) == 0) ) { - sprintf (txt, "Stopped service: %s\n", + sprintf (txt, _("Stopped service: %s\n"), victim->first_service->name); remove_entry (&available_list, victim); free (victim); -- 2.39.5