Hi,
Attached patches gettextize a few messages that were missed, rephrases
a few things in the new findmnt man page and elsewhere, and spells the
plural of UUID consistently as UUIDs (as is most common, instead of as
UUID's, which looks like the possessive form).
A few clarifications of some of the changes:
"%s -V" is gettextized even though it does not contain anything translatable
simply to allow translators to realign the entire help text and not only the other
parts.
In the man page of findmnt, all sentences have been doublespaced, because
that is what 'man' does by default when a line ends in a period.
The message "error stopping service: \"%s\"\n" has been changed to
"error at stopping service \"%s\n" because the first could be interpreted as
saying that an error is stopping the service, and that %s is the error.
The message "%s umounted\n" has been spell-corrected and amplified to
"%s has been unmounted\n", because the first could be interpreted as
saying that %s was already unmounted.
Ah, and in findmnt.c, are you sure you want to gettextize the two strings
"forward" and "backward"? Since the man page says only those two are
possible, and does not tell the user to use localized versions of those strings.
The fourth patch therefore ungettextizes them and fixes a spello.
Regards,
Benno
--
http://www.fastmail.fm - Email service worth paying for. Try it for free
From 67e56c6f63af048cc0b1f7e18342c6a8970e004a Mon Sep 17 00:00:00 2001
From: Benno Schulenberg <bensberg@xxxxxxxxxxxxx>
Date: Thu, 10 Jun 2010 14:04:26 +0200
Subject: [PATCH 1/4] uuidd: spell the plural of "UUID" consistently as "UUIDs"
Signed-off-by: Benno Schulenberg <bensberg@xxxxxxxxxxxxx>
---
misc-utils/uuidd.8 | 6 +++---
misc-utils/uuidd.c | 6 +++---
misc-utils/uuidgen.1 | 4 ++--
shlibs/uuid/man/uuid_generate.3 | 2 +-
shlibs/uuid/src/compare.c | 4 ++--
shlibs/uuid/src/pack.c | 2 +-
6 files changed, 12 insertions(+), 12 deletions(-)
diff --git a/misc-utils/uuidd.8 b/misc-utils/uuidd.8
index 33e650f..9c3b54d 100644
--- a/misc-utils/uuidd.8
+++ b/misc-utils/uuidd.8
@@ -27,9 +27,9 @@ uuidd \- UUID generation daemon
The
.B uuidd
daemon is used by the UUID library to generate
-universally unique identifiers (UUIDs), especially time-based UUID's
+universally unique identifiers (UUIDs), especially time-based UUIDs
in a secure and guaranteed-unique fashion, even in the face of large
-numbers of threads trying to grab UUID's running on different CPU's.
+numbers of threads trying to grab UUIDs running on different CPUs.
.SH OPTIONS
.TP
.B \-d
@@ -44,7 +44,7 @@ If a currently uuidd daemon is running, kill it.
When issuing a test request to a running uuidd, request a bulk response
of
.I number
-UUID's.
+UUIDs.
.TP
.BI \-p " pidfile"
Specify the pathname where the pid file should be written. By default,
diff --git a/misc-utils/uuidd.c b/misc-utils/uuidd.c
index 74bab69..a6d2f69 100644
--- a/misc-utils/uuidd.c
+++ b/misc-utils/uuidd.c
@@ -412,7 +412,7 @@ static void server_loop(const char *socket_path, const char *pidfile_path,
uuid__generate_random((unsigned char *) reply_buf +
sizeof(num), &num);
if (debug) {
- printf(_("Generated %d UUID's:\n"), num);
+ printf(_("Generated %d UUIDs:\n"), num);
for (i=0, cp=reply_buf+sizeof(num);
i < num; i++, cp+=16) {
uuid_unparse((unsigned char *)cp, str);
@@ -531,9 +531,9 @@ int main(int argc, char **argv)
uuid_unparse((unsigned char *) buf, str);
- printf(_("%s and subsequent %d UUID's\n"), str, num);
+ printf(_("%s and subsequent %d UUIDs\n"), str, num);
} else {
- printf(_("List of UUID's:\n"));
+ printf(_("List of UUIDs:\n"));
cp = buf + 4;
if (ret != (int) (sizeof(num) + num*sizeof(uu)))
goto unexpected_size;
diff --git a/misc-utils/uuidgen.1 b/misc-utils/uuidgen.1
index 18e33de..32c98f1 100644
--- a/misc-utils/uuidgen.1
+++ b/misc-utils/uuidgen.1
@@ -22,9 +22,9 @@ all UUIDs created on the local system,
and among UUIDs created on other systems in the past
and in the future.
.PP
-There are two types of UUID's which
+There are two types of UUIDs which
.B uuidgen
-can generate: time-based UUID's and random-based UUID's. By
+can generate: time-based UUIDs and random-based UUIDs. By
default
.B uuidgen
will generate a random-based UUID if a high-quality random number
diff --git a/shlibs/uuid/man/uuid_generate.3 b/shlibs/uuid/man/uuid_generate.3
index 11f48ff..e1b8143 100644
--- a/shlibs/uuid/man/uuid_generate.3
+++ b/shlibs/uuid/man/uuid_generate.3
@@ -59,7 +59,7 @@ a high-quality random number generator (i.e.,
.IR /dev/urandom )
is not available, in which case a pseudo-random
generator will be subsituted. Note that the use of a pseudo-random
-generator may compromise the uniqueness of UUID's
+generator may compromise the uniqueness of UUIDs
generated in this fashion.
.sp
The
diff --git a/shlibs/uuid/src/compare.c b/shlibs/uuid/src/compare.c
index f28a726..8f3437a 100644
--- a/shlibs/uuid/src/compare.c
+++ b/shlibs/uuid/src/compare.c
@@ -1,7 +1,7 @@
/*
- * compare.c --- compare whether or not two UUID's are the same
+ * compare.c --- compare whether or not two UUIDs are the same
*
- * Returns 0 if the two UUID's are different, and 1 if they are the same.
+ * Returns 0 if the two UUIDs are different, and 1 if they are the same.
*
* Copyright (C) 1996, 1997 Theodore Ts'o.
*
diff --git a/shlibs/uuid/src/pack.c b/shlibs/uuid/src/pack.c
index 097516d..6e12476 100644
--- a/shlibs/uuid/src/pack.c
+++ b/shlibs/uuid/src/pack.c
@@ -1,5 +1,5 @@
/*
- * Internal routine for packing UUID's
+ * Internal routine for packing UUIDs
*
* Copyright (C) 1996, 1997 Theodore Ts'o.
*
--
1.6.3.3
From 7e11c4c840e543462a2afc60568467cc3207787f Mon Sep 17 00:00:00 2001
From: Benno Schulenberg <bensberg@xxxxxxxxxxxxx>
Date: Thu, 10 Jun 2010 14:27:34 +0200
Subject: [PATCH 2/4] textual: fix typos, and rephrase some things for clarity
Signed-off-by: Benno Schulenberg <bensberg@xxxxxxxxxxxxx>
---
login-utils/simpleinit.c | 4 +-
misc-utils/findmnt.8 | 50 +++++++++++++++++++++++-----------------------
misc-utils/namei.1 | 28 ++++++++++++------------
misc-utils/uuidd.8 | 6 ++--
misc-utils/wipefs.c | 10 ++++----
mount/umount.c | 10 ++++----
sys-utils/lscpu.c | 2 +-
7 files changed, 55 insertions(+), 55 deletions(-)
diff --git a/login-utils/simpleinit.c b/login-utils/simpleinit.c
index cc844c9..8cff848 100644
--- a/login-utils/simpleinit.c
+++ b/login-utils/simpleinit.c
@@ -935,7 +935,7 @@ static void process_command (const struct command_struct *command)
execlp (get_path (victim->first_service->name),
victim->first_service->name, "stop", NULL);
snprintf (txt, sizeof(txt),
- _("error stopping service: \"%s\"\n"),
+ _("error at stopping service \"%s\"\n"),
victim->first_service->name);
err (txt);
_exit (SIG_NOT_STOPPED);
@@ -1067,7 +1067,7 @@ static int run_command (const char *file, const char *name, pid_t pid)
for (i = 1; i < NSIG; i++) signal (i, SIG_DFL);
execlp (get_path (file), service->name, "start", NULL);
snprintf (txt, sizeof(txt),
- _("error running programme: \"%s\"\n"), service->name);
+ _("error at starting service \"%s\"\n"), service->name);
err (txt);
_exit (SIG_FAILED);
break;
diff --git a/misc-utils/findmnt.8 b/misc-utils/findmnt.8
index 1765472..e1cb8ff 100644
--- a/misc-utils/findmnt.8
+++ b/misc-utils/findmnt.8
@@ -18,9 +18,9 @@ findmnt \- find a filesystem
.IR mountpoint
.SH DESCRIPTION
.B findmnt
-will list all mounted filesytems or search for a filesystem. The
+will list all mounted filesytems or search for a filesystem. The
.B findmnt
-is able to search in
+command is able to search in
.IR /etc/fstab ,
.IR /etc/mtab
or
@@ -29,9 +29,9 @@ If
.IR device
or
.IR mountpoint
-is not given, all filesystems are show.
+is not given, all filesystems are shown.
.PP
-The command prints all mounted filesystems in tree-like format by default.
+The command prints all mounted filesystems in the tree-like format by default.
.SH OPTIONS
.IP "\fB\-h, \-\-help\fP"
Print help and exit.
@@ -46,11 +46,11 @@ The output is in the list format (see --list).
.IP "\fB\-k, \-\-kernel\fP"
Search in
.IR /proc/self/mountinfo .
-The output is in the tree-like format. This is the default.
+The output is in the tree-like format. This is the default.
.IP "\fB\-c, \-\-canonicalize\fP"
Canonicalize all printed paths.
.IP "\fB\-d, \-\-direction \fIword\fP"
-Search direction -
+The search direction -
.IR forward
or
.IR backward .
@@ -59,34 +59,34 @@ Convert all tags (LABEL or UUID) to the device names.
.IP "\fB\-f, \-\-first-only\fP"
Print the first matching filesystem only.
.IP "\fB\-i, \-\-invert\fP"
-Invert sense of matching.
+Invert the sense of matching.
.IP "\fB\-l, \-\-list\fP"
-Use list output format.
+Use the list output format.
.IP "\fB\-n, \-\-noheadings\fP"
-Do not print header line.
+Do not print a header line.
.IP "\fB\-u, \-\-notruncate\fP"
-Do not truncate text in columns. The default is not truncate
+Do not truncate text in columns. The default is to not truncate the
.BR TARGET ,
.BR SOURCE ,
.BR UUID
and
.BR LABEL
-columns. This option disables text truncation in the all others columns.
+columns. This option disables text truncation also in all other columns.
.IP "\fB\-O, \-\-options \fIlist\fP"
-Used to limit the set of printed filesystems. More than one option
-may be specified in a comma separated list. The
+Used to limit the set of printed filesystems. More than one option
+may be specified in a comma-separated list. The
.B \-t
and
.B \-O
-options are cumulative in effect. It is different from
+options are cumulative in effect. It is different from
.B \-t
in that each option is matched exactly; a leading
.I no
at the beginning
-of one option does not negate the rest. For more details see
+of one option does not negate the rest. For more details see
.BR mount (8).
.IP "\fB\-o, \-\-output \fIlist\fP"
-Define output columns. Currently are supported
+Define output columns. Currently supported are
.BR SOURCE ,
.BR TARGET ,
.BR FSTYPE ,
@@ -106,19 +106,19 @@ options are not specified.
.IP "\fB\-r, \-\-raw\fP"
Use raw output format.
.IP "\fB\-a, \-\-ascii\fP"
-Use ascii chars for tree formatting.
+Use ascii characters for tree formatting.
.IP "\fB\-t, \-\-types \fIlist\fP"
-Used to limit the set of printed filesystems. More than one type may be
-specified in a comma separated list. The list of filesystem types can be
+Used to limit the set of printed filesystems. More than one type may be
+specified in a comma-separated list. The list of filesystem types can be
prefixed with
.I no
-to specify the filesystem types on which no action should be taken. For
+to specify the filesystem types on which no action should be taken. For
more details see
.BR mount (8).
.IP "\fB\-S, \-\-source \fIspec\fP"
-Explicitly define mount source. Supported are device, LABEL= or UUID=.
+Explicitly define the mount source. Supported are device, LABEL= or UUID=.
.IP "\fB\-T, \-\-target \fIdir\fP"
-Explicitly define mount target (mountpoint directory).
+Explicitly define the mount target (mountpoint directory).
.SH EXAMPLES
.IP "\fBfindmnt \-\-fstab \-t nfs\fP"
Prints all nfs filesystems defined in
@@ -126,18 +126,18 @@ Prints all nfs filesystems defined in
.IP "\fBfindmnt \-\-fstab /mnt/foo\fP"
Prints all
.IR /etc/fstab
-filesystems where mountpoint directory is /mnt/foo. It also prints bind mounts where /mnt/foo
+filesystems where the mountpoint directory is /mnt/foo. It also prints bind mounts where /mnt/foo
is a source.
.IP "\fBfindmnt \-\-fstab --target /mnt/foo\fP"
Prints all
.IR /etc/fstab
-filesystems where mountpoint directory is /mnt/foo.
+filesystems where the mountpoint directory is /mnt/foo.
.IP "\fBfindmnt --fstab --evaluate\fP"
Prints all
.IR /etc/fstab
filesystems and converts LABEL= and UUID= tags to the real device names.
.IP "\fBfindmnt -n --raw --evaluate --output=target LABEL=/boot
-Prints only mountpoint where is mounted filesystem with a label "/boot".
+Prints only the mountpoint where the filesystem with label "/boot" is mounted.
.SH AUTHORS
.nf
Karel Zak <kzak@xxxxxxxxxx>
diff --git a/misc-utils/namei.1 b/misc-utils/namei.1
index a54fa8a..fc10781 100644
--- a/misc-utils/namei.1
+++ b/misc-utils/namei.1
@@ -9,26 +9,26 @@ namei - follow a pathname until a terminal point is found
.RI [ options ]
.IR pathname ...
.SH DESCRIPTION
-.B Namei
+.B namei
uses its arguments as pathnames to any type
of Unix file (symlinks, files, directories, and so forth).
-.B Namei
-then follows each pathname until a terminal
-point is found (a file, directory, char device, etc).
-If it finds a symbolic link, we show the link, and start
+.B namei
+then follows each pathname until an endpoint
+is found (a file, a directory, a device node, etc).
+If it finds a symbolic link, it shows the link, and starts
following it, indenting the output to show the context.
.PP
-This program is useful for finding a "too many levels of
+This program is useful for finding "too many levels of
symbolic links" problems.
.PP
-For each line output,
+For each line of output,
.B namei
-outputs a the following characters to identify the file types found:
+uses the following characters to identify the file type found:
.LP
.nf
- f: = the pathname we are currently trying to resolve
+ f: = the pathname currently being resolved
d = directory
- l = symbolic link (both the link and it's contents are output)
+ l = symbolic link (both the link and its contents are output)
s = socket
b = block device
c = character device
@@ -37,12 +37,12 @@ outputs a the following characters to identify the file types found:
? = an error of some kind
.fi
.PP
-.B Namei
+.B namei
prints an informative message when
the maximum number of symbolic links this system can have has been exceeded.
.SH OPTIONS
.IP "\fB\-l, \-\-long\fP"
-Use a long listing format (same as -m -o -v).
+Use the long listing format (same as -m -o -v).
.IP "\fB\-m, \-\-modes\fP"
Show the mode bits of each file type in the style of ls(1),
for example 'rwxr-xr-x'.
@@ -51,9 +51,9 @@ Show owner and group name of each file.
.IP "\fB\-n, \-\-nosymlinks\fP"
Don't follow symlinks.
.IP "\fB\-v, \-\-vertical\fP"
-Vertical align of modes and owners.
+Vertically align the modes and owners.
.IP "\fB\-x, \-\-mountpoints\fP"
-Show mount point directories with a 'D', rather than a 'd'.
+Show mountpoint directories with a 'D' rather than a 'd'.
.SH AUTHOR
The original
.B namei
diff --git a/misc-utils/uuidd.8 b/misc-utils/uuidd.8
index 9c3b54d..adb8028 100644
--- a/misc-utils/uuidd.8
+++ b/misc-utils/uuidd.8
@@ -27,9 +27,9 @@ uuidd \- UUID generation daemon
The
.B uuidd
daemon is used by the UUID library to generate
-universally unique identifiers (UUIDs), especially time-based UUIDs
+universally unique identifiers (UUIDs), especially time-based UUIDs,
in a secure and guaranteed-unique fashion, even in the face of large
-numbers of threads trying to grab UUIDs running on different CPUs.
+numbers of threads running on different CPUs trying to grab UUIDs.
.SH OPTIONS
.TP
.B \-d
@@ -38,7 +38,7 @@ Run
in debugging mode. This prevents uuidd from running as a daemon.
.TP
.B \-k
-If a currently uuidd daemon is running, kill it.
+If currently a uuidd daemon is running, kill it.
.TP
.BI \-n " number"
When issuing a test request to a running uuidd, request a bulk response
diff --git a/misc-utils/wipefs.c b/misc-utils/wipefs.c
index 4d85050..aa4b696 100644
--- a/misc-utils/wipefs.c
+++ b/misc-utils/wipefs.c
@@ -256,8 +256,8 @@ do_wipe_offset(int fd, struct wipe_desc *wp, const char *fname, int noact)
size_t len;
if (!wp->type) {
- warnx(_("can't found a magic string at offset "
- "0x%jx - ignore."), wp->offset);
+ warnx(_("no magic string found at offset "
+ "0x%jx -- ignored"), wp->offset);
return 0;
}
@@ -309,7 +309,7 @@ strtoll_offset(const char *str)
uintmax_t sz;
if (strtosize(str, &sz))
- errx(EXIT_FAILURE, _("invalid offset '%s' value specified"), str);
+ errx(EXIT_FAILURE, _("invalid offset value '%s' specified"), str);
return sz;
}
@@ -322,8 +322,8 @@ usage(FILE *out)
fprintf(out, _(
" -a, --all wipe all magic strings (BE CAREFUL!)\n"
- " -h, --help this help\n"
- " -n, --no-act everything to be done except for the write() call\n"
+ " -h, --help show this help text\n"
+ " -n, --no-act do everything except the actual write() call\n"
" -o, --offset <num> offset to erase, in bytes\n"
" -p, --parsable print out in parsable instead of printable format\n"));
diff --git a/mount/umount.c b/mount/umount.c
index 75507b7..5bd5360 100644
--- a/mount/umount.c
+++ b/mount/umount.c
@@ -275,7 +275,7 @@ umount_one (const char *spec, const char *node, const char *type,
if (res >= 0) {
/* Umount succeeded */
if (verbose)
- printf (_("%s umounted\n"), spec);
+ printf (_("%s has been unmounted\n"), spec);
/* Free any loop devices that we allocated ourselves */
if (mc) {
@@ -490,13 +490,13 @@ umount_file (char *arg) {
int ok;
if (!*arg) { /* "" would be expanded to `pwd` */
- die(2, _("Cannot umount \"\"\n"));
+ die(2, _("Cannot unmount \"\"\n"));
return 0;
}
file = canonicalize(arg); /* mtab paths are canonicalized */
if (verbose > 1)
- printf(_("Trying to umount %s\n"), file);
+ printf(_("Trying to unmount %s\n"), file);
mc = getmntdirbackward(file, NULL);
if (!mc) {
@@ -514,8 +514,8 @@ umount_file (char *arg) {
if (strcmp(file, mc1->m.mnt_fsname)) {
/* Something was stacked over `file' on the
same mount point. */
- die(EX_FAIL, _("umount: cannot umount %s -- %s is "
- "mounted over it on the same point."),
+ die(EX_FAIL, _("umount: cannot unmount %s -- %s is "
+ "mounted over it on the same point"),
file, mc1->m.mnt_fsname);
}
}
diff --git a/sys-utils/lscpu.c b/sys-utils/lscpu.c
index 6b786e8..780f1d6 100644
--- a/sys-utils/lscpu.c
+++ b/sys-utils/lscpu.c
@@ -362,7 +362,7 @@ read_basicinfo(struct lscpu_desc *desc)
/* the root is '/' so we are working with data from the current kernel */
maxcpus = get_max_number_of_cpus();
else
- /* we are reading some /sys snapshot instead the real /sys,
+ /* we are reading some /sys snapshot instead of the real /sys,
* let's use any crazy number... */
maxcpus = desc->ncpus > 2048 ? desc->ncpus : 2048;
}
--
1.6.3.3
From f2a85468422f3fc19d28b05611be398ced18f88a Mon Sep 17 00:00:00 2001
From: Benno Schulenberg <bensberg@xxxxxxxxxxxxx>
Date: Thu, 10 Jun 2010 14:29:27 +0200
Subject: [PATCH 3/4] messages: gettextize a few skipped or forgotten ones
Signed-off-by: Benno Schulenberg <bensberg@xxxxxxxxxxxxx>
---
disk-utils/blockdev.c | 4 ++--
disk-utils/mkfs.minix.c | 2 +-
misc-utils/uuidd.c | 6 +++---
mount/swapon.c | 6 +++---
sys-utils/lscpu.c | 2 +-
sys-utils/tunelp.c | 6 +++---
6 files changed, 13 insertions(+), 13 deletions(-)
diff --git a/disk-utils/blockdev.c b/disk-utils/blockdev.c
index eeaf2f5..cf594d1 100644
--- a/disk-utils/blockdev.c
+++ b/disk-utils/blockdev.c
@@ -177,7 +177,7 @@ usage(void) {
int i;
fputc('\n', stderr);
fprintf(stderr, _("Usage:\n"));
- fprintf(stderr, " %s -V\n", progname);
+ fprintf(stderr, _(" %s -V\n"), progname);
fprintf(stderr, _(" %s --report [devices]\n"), progname);
fprintf(stderr, _(" %s [-v|-q] commands devices\n"), progname);
fputc('\n', stderr);
@@ -235,7 +235,7 @@ main(int argc, char **argv) {
/* -V not together with commands */
if (!strcmp(argv[1], "-V") || !strcmp(argv[1], "--version")) {
- printf("%s (%s)\n", progname, PACKAGE_STRING);
+ printf(_("%s (%s)\n"), progname, PACKAGE_STRING);
exit(0);
}
diff --git a/disk-utils/mkfs.minix.c b/disk-utils/mkfs.minix.c
index c52afbd..5f01f2b 100644
--- a/disk-utils/mkfs.minix.c
+++ b/disk-utils/mkfs.minix.c
@@ -149,7 +149,7 @@ die(char *str) {
static void
usage(void) {
- fprintf(stderr, "%s (%s)\n", program_name, PACKAGE_STRING);
+ fprintf(stderr, _("%s (%s)\n"), program_name, PACKAGE_STRING);
fprintf(stderr,
_("Usage: %s [-c | -l filename] [-nXX] [-iXX] /dev/name [blocks]\n"),
program_name);
diff --git a/misc-utils/uuidd.c b/misc-utils/uuidd.c
index a6d2f69..716a582 100644
--- a/misc-utils/uuidd.c
+++ b/misc-utils/uuidd.c
@@ -241,7 +241,7 @@ static void server_loop(const char *socket_path, const char *pidfile_path,
fd_pidfile = open(pidfile_path, O_CREAT | O_RDWR, 0664);
if (fd_pidfile < 0) {
if (!quiet)
- fprintf(stderr, "Failed to open/create %s: %s\n",
+ fprintf(stderr, _("Failed to open/create %s: %s\n"),
pidfile_path, strerror(errno));
exit(1);
}
@@ -258,7 +258,7 @@ static void server_loop(const char *socket_path, const char *pidfile_path,
if ((errno == EAGAIN) || (errno == EINTR))
continue;
if (!quiet)
- fprintf(stderr, "Failed to lock %s: %s\n",
+ fprintf(stderr, _("Failed to lock %s: %s\n"),
pidfile_path, strerror(errno));
exit(1);
}
@@ -359,7 +359,7 @@ static void server_loop(const char *socket_path, const char *pidfile_path,
printf(_("operation %d, incoming num = %d\n"),
op, num);
} else if (debug)
- printf("operation %d\n", op);
+ printf(_("operation %d\n"), op);
switch(op) {
case UUIDD_OP_GETPID:
diff --git a/mount/swapon.c b/mount/swapon.c
index 4ee3c2f..c700655 100644
--- a/mount/swapon.c
+++ b/mount/swapon.c
@@ -425,7 +425,7 @@ swapon_checks(const char *special)
unsigned long long swapsize =
swap_get_size(hdr, special, pagesize);
if (verbose)
- warnx("%s: pagesize=%d, swapsize=%llu, devsize=%llu",
+ warnx(_("%s: pagesize=%d, swapsize=%llu, devsize=%llu"),
special, pagesize, swapsize, devsize);
if (swapsize > devsize) {
@@ -663,7 +663,7 @@ main_swapon(int argc, char *argv[]) {
++verbose;
break;
case 'V': /* version */
- printf("%s: (%s)\n", progname, PACKAGE_STRING);
+ printf(_("%s (%s)\n"), progname, PACKAGE_STRING);
exit(0);
case 0:
break;
@@ -715,7 +715,7 @@ main_swapoff(int argc, char *argv[]) {
++verbose;
break;
case 'V': /* version */
- printf("%s (%s)\n", progname, PACKAGE_STRING);
+ printf(_("%s (%s)\n"), progname, PACKAGE_STRING);
exit(0);
case 'L':
addl(optarg);
diff --git a/sys-utils/lscpu.c b/sys-utils/lscpu.c
index 780f1d6..72d1054 100644
--- a/sys-utils/lscpu.c
+++ b/sys-utils/lscpu.c
@@ -735,7 +735,7 @@ print_readable(struct lscpu_desc *desc)
char buf[512];
int i;
- print_s("Architecture:", desc->arch);
+ print_s(_("Architecture:"), desc->arch);
if (desc->mode & (MODE_REAL | MODE_TRANSPARENT | MODE_LONG)) {
char buf[64], *p = buf;
diff --git a/sys-utils/tunelp.c b/sys-utils/tunelp.c
index 619cf42..cdcdcb8 100644
--- a/sys-utils/tunelp.c
+++ b/sys-utils/tunelp.c
@@ -81,7 +81,7 @@ print_usage(char *progname) {
static void
print_version(char *progname) {
- printf("%s (%s)\n", progname, PACKAGE_STRING);
+ printf(_("%s (%s)\n"), progname, PACKAGE_STRING);
}
static void *
@@ -256,7 +256,7 @@ main (int argc, char ** argv) {
status = 0xdeadbeef;
retval = ioctl(fd, LPGETSTATUS - offset, &status);
if (retval < 0)
- perror("LPGETSTATUS error");
+ perror(_("LPGETSTATUS error"));
else {
if (status == 0xdeadbeef) /* a few 1.1.7x kernels will do this */
status = retval;
@@ -271,7 +271,7 @@ main (int argc, char ** argv) {
} else
#endif /* LPGETSTATUS */
if (ioctl(fd, cmds->op - offset, cmds->val) < 0) {
- perror("tunelp: ioctl");
+ perror(_("tunelp: ioctl failed"));
}
cmdst = cmds;
cmds = cmds->next;
--
1.6.3.3
From 3afc8c146dde5f78adacae9db2ea4bbced5701b7 Mon Sep 17 00:00:00 2001
From: Benno Schulenberg <bensberg@xxxxxxxxxxxxx>
Date: Thu, 10 Jun 2010 15:05:52 +0200
Subject: [PATCH 4/4] findmnt: ungettextize the directions and fix spelling
Signed-off-by: Benno Schulenberg <bensberg@xxxxxxxxxxxxx>
---
misc-utils/findmnt.c | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/misc-utils/findmnt.c b/misc-utils/findmnt.c
index c207432..7f166c8 100644
--- a/misc-utils/findmnt.c
+++ b/misc-utils/findmnt.c
@@ -555,13 +555,13 @@ int main(int argc, char *argv[])
flags |= FL_CANONICALIZE;
break;
case 'd':
- if (!strcmp(optarg, _("forward")))
+ if (!strcmp(optarg, "forward"))
direction = MNT_ITER_FORWARD;
- else if (!strcmp(optarg, _("backward")))
+ else if (!strcmp(optarg, "backward"))
direction = MNT_ITER_BACKWARD;
else
errx(EXIT_FAILURE,
- _("uknown direction '%s')"), optarg);
+ _("unknown direction '%s')"), optarg);
break;
case 'e':
flags |= FL_EVALUATE;
--
1.6.3.3
