diff options
author | Chuck Lever <chuck.lever@oracle.com> | 2007-08-03 13:23:29 -0400 |
---|---|---|
committer | Neil Brown <neilb@suse.de> | 2007-08-04 08:27:39 +1000 |
commit | 53a9b4a2ea971d5718ccfcc2f2825ff9af81cd23 (patch) | |
tree | f47a54c21336589b8cc3db3e6c28b70790e2a6a4 /utils/mount/mount.c | |
parent | 9b640cdaa36e25e0f6e14a7a53237488717d4187 (diff) | |
download | nfs-utils-53a9b4a2ea971d5718ccfcc2f2825ff9af81cd23.tar.gz nfs-utils-53a9b4a2ea971d5718ccfcc2f2825ff9af81cd23.tar.xz nfs-utils-53a9b4a2ea971d5718ccfcc2f2825ff9af81cd23.zip |
mount.nfs: Support double-wide characters in printed strings
Previous NLS changes missed a spot or two. This patch tries to get
most of them, but probably misses a few more.
In errors.c:mount_errors() I've removed a period at the end of the error
messages; this is consistent with other error messages I've examined.
Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
Signed-off-by: Neil Brown <neilb@suse.de>
Diffstat (limited to 'utils/mount/mount.c')
-rw-r--r-- | utils/mount/mount.c | 35 |
1 files changed, 17 insertions, 18 deletions
diff --git a/utils/mount/mount.c b/utils/mount/mount.c index d6d527c..a7ad035 100644 --- a/utils/mount/mount.c +++ b/utils/mount/mount.c @@ -174,14 +174,13 @@ static void discover_nfs_mount_data_version(void) static void print_one(char *spec, char *node, char *type, char *opts) { - if (verbose) { - printf("%s on %s type %s", spec, node, type); + if (!verbose) + return; - if (opts != NULL) - printf(" (%s)", opts); - - printf("\n"); - } + if (opts) + printf(_("%s on %s type %s (%s)\n"), spec, node, type, opts); + else + printf(_("%s on %s type %s\n"), spec, node, type); } /* @@ -268,18 +267,18 @@ fail_unlock: void mount_usage(void) { - printf("usage: %s remotetarget dir [-rvVwfnh] [-o nfsoptions]\n", + printf(_("usage: %s remotetarget dir [-rvVwfnh] [-o nfsoptions]\n"), progname); - printf("options:\n"); - printf("\t-r\t\tMount file system readonly\n"); - printf("\t-v\t\tVerbose\n"); - printf("\t-V\t\tPrint version\n"); - printf("\t-w\t\tMount file system read-write\n"); - printf("\t-f\t\tFake mount, do not actually mount\n"); - printf("\t-n\t\tDo not update /etc/mtab\n"); - printf("\t-s\t\tTolerate sloppy mount options rather than failing.\n"); - printf("\t-h\t\tPrint this help\n"); - printf("\tnfsoptions\tRefer to mount.nfs(8) or nfs(5)\n\n"); + printf(_("options:\n")); + printf(_("\t-r\t\tMount file system readonly\n")); + printf(_("\t-v\t\tVerbose\n")); + printf(_("\t-V\t\tPrint version\n")); + printf(_("\t-w\t\tMount file system read-write\n")); + printf(_("\t-f\t\tFake mount, do not actually mount\n")); + printf(_("\t-n\t\tDo not update /etc/mtab\n")); + printf(_("\t-s\t\tTolerate sloppy mount options rather than failing.\n")); + printf(_("\t-h\t\tPrint this help\n")); + printf(_("\tnfsoptions\tRefer to mount.nfs(8) or nfs(5)\n\n")); } static void parse_opt(const char *opt, int *mask, char *extra_opts, int len) |