diff options
| -rwxr-xr-x | source3/locale/net/genmsg | 2 | ||||
| -rw-r--r-- | source3/utils/net_rpc_join.c | 32 |
2 files changed, 19 insertions, 15 deletions
diff --git a/source3/locale/net/genmsg b/source3/locale/net/genmsg index 2e0769ecea..0e82d47959 100755 --- a/source3/locale/net/genmsg +++ b/source3/locale/net/genmsg @@ -30,7 +30,7 @@ FILES=`add_basedir_to_filelist ../../utils net.c net_ads.c net_ads_gpo.c \ net_afs.c net_cache.c net_conf.c net_dom.c net_eventlog.c net_file.c \ net_group.c net_groupmap.c net_help.c net_help_common.c net_idmap.c \ net_join.c net_lookup.c net_lua.c net_rap.c net_registry.c \ - net_registry_util.c net_rpc.c net_rpc_audit.c` + net_registry_util.c net_rpc.c net_rpc_audit.c net_rpc_join.c` LANGS="af ar bg bn bs ca cs cy da de el en_GB en_US es et fi fr gl gu he hi hr hu id it ja ka km ko lo lt mk mr nb nl pa pl pt_BR pt ro ru si sk sl sr diff --git a/source3/utils/net_rpc_join.c b/source3/utils/net_rpc_join.c index ed0311317d..f55f8f1047 100644 --- a/source3/utils/net_rpc_join.c +++ b/source3/utils/net_rpc_join.c @@ -285,16 +285,17 @@ int net_rpc_join_newstyle(struct net_context *c, int argc, const char **argv) &access_granted, &user_rid); - if (!NT_STATUS_IS_OK(result) && + if (!NT_STATUS_IS_OK(result) && !NT_STATUS_EQUAL(result, NT_STATUS_USER_EXISTS)) { - d_fprintf(stderr, "Creation of workstation account failed\n"); + d_fprintf(stderr,_("Creation of workstation account failed\n")); /* If NT_STATUS_ACCESS_DENIED then we have a valid username/password combo but the user does not have administrator access. */ if (NT_STATUS_V(result) == NT_STATUS_V(NT_STATUS_ACCESS_DENIED)) - d_fprintf(stderr, "User specified does not have administrator privileges\n"); + d_fprintf(stderr, _("User specified does not have " + "administrator privileges\n")); goto done; } @@ -399,8 +400,9 @@ int net_rpc_join_newstyle(struct net_context *c, int argc, const char **argv) if ( NT_STATUS_EQUAL(result, NT_STATUS_ACCESS_DENIED) && (sec_channel_type == SEC_CHAN_BDC) ) { - d_fprintf(stderr, "Please make sure that no computer account\n" - "named like this machine (%s) exists in the domain\n", + d_fprintf(stderr, _("Please make sure that no computer " + "account\nnamed like this machine " + "(%s) exists in the domain\n"), global_myname()); } @@ -426,8 +428,10 @@ int net_rpc_join_newstyle(struct net_context *c, int argc, const char **argv) if ( NT_STATUS_EQUAL(result, NT_STATUS_ACCESS_DENIED) && (sec_channel_type == SEC_CHAN_BDC) ) { - d_fprintf(stderr, "Please make sure that no computer account\n" - "named like this machine (%s) exists in the domain\n", + d_fprintf(stderr, _("Please make sure that no " + "computer account\nnamed " + "like this machine (%s) " + "exists in the domain\n"), global_myname()); } @@ -461,9 +465,9 @@ done: if (domain) { if (retval != 0) { - fprintf(stderr,"Unable to join domain %s.\n",domain); + fprintf(stderr,_("Unable to join domain %s.\n"),domain); } else { - printf("Joined domain %s.\n",domain); + printf(_("Joined domain %s.\n"),domain); } } @@ -485,20 +489,20 @@ int net_rpc_testjoin(struct net_context *c, int argc, const char **argv) NTSTATUS nt_status; if (c->display_usage) { - d_printf("Usage\n" - "net rpc testjoin\n" - " Test if a join is OK\n"); + d_printf(_("Usage\n" + "net rpc testjoin\n" + " Test if a join is OK\n")); return 0; } /* Display success or failure */ nt_status = net_rpc_join_ok(c, c->opt_target_workgroup, NULL, NULL); if (!NT_STATUS_IS_OK(nt_status)) { - fprintf(stderr,"Join to domain '%s' is not valid: %s\n", + fprintf(stderr, _("Join to domain '%s' is not valid: %s\n"), c->opt_target_workgroup, nt_errstr(nt_status)); return -1; } - printf("Join to '%s' is OK\n", c->opt_target_workgroup); + printf(_("Join to '%s' is OK\n"), c->opt_target_workgroup); return 0; } |