From: Kai Blin Date: Tue, 19 Jan 2010 08:23:42 +0000 (+0100) Subject: s3 net/i18n: Use only one spelling for "Usage:" X-Git-Tag: samba-3.5.0rc2~53 X-Git-Url: http://git.samba.org/?p=samba.git;a=commitdiff_plain;h=a94daecc47ab74dcf6d9970e6ec676af261f0bf7 s3 net/i18n: Use only one spelling for "Usage:" (cherry picked from commit 09bc13728fc76cf784914a4066c793c297e50cff) Part 6/9 of a fix for bug #7039 (German translation of net is not complete). (cherry picked from commit 611df88507ca2d69f258ea804e2b4fc4ebe420e3) --- diff --git a/source3/utils/net.c b/source3/utils/net.c index c0bffe27f90..7f20a258a7d 100644 --- a/source3/utils/net.c +++ b/source3/utils/net.c @@ -277,7 +277,7 @@ static int net_setlocalsid(struct net_context *c, int argc, const char **argv) || (strncmp(argv[0], "S-1-5-21-", strlen("S-1-5-21-")) != 0) || (!string_to_sid(&sid, argv[0])) || (sid.num_auths != 4)) { - d_printf(_("usage:")," net setlocalsid S-1-5-21-x-y-z\n"); + d_printf(_("Usage:")," net setlocalsid S-1-5-21-x-y-z\n"); return 1; } @@ -297,7 +297,7 @@ static int net_setdomainsid(struct net_context *c, int argc, const char **argv) || (strncmp(argv[0], "S-1-5-21-", strlen("S-1-5-21-")) != 0) || (!string_to_sid(&sid, argv[0])) || (sid.num_auths != 4)) { - d_printf(_("usage:")," net setdomainsid S-1-5-21-x-y-z\n"); + d_printf(_("Usage:")," net setdomainsid S-1-5-21-x-y-z\n"); return 1; } @@ -315,7 +315,7 @@ static int net_getdomainsid(struct net_context *c, int argc, const char **argv) fstring sid_str; if (argc > 0) { - d_printf(_("usage:")," net getdomainsid\n"); + d_printf(_("Usage:")," net getdomainsid\n"); return 1; } @@ -399,7 +399,7 @@ static int net_maxrid(struct net_context *c, int argc, const char **argv) uint32 rid; if (argc != 0) { - d_fprintf(stderr, _("usage:")," net maxrid\n"); + d_fprintf(stderr, _("Usage:")," net maxrid\n"); return 1; } diff --git a/source3/utils/net_afs.c b/source3/utils/net_afs.c index 1d17348b456..6aea513300b 100644 --- a/source3/utils/net_afs.c +++ b/source3/utils/net_afs.c @@ -35,7 +35,7 @@ int net_afs_key(struct net_context *c, int argc, const char **argv) struct afs_keyfile keyfile; if (argc != 2) { - d_printf(_("usage:")," net afs key cell\n"); + d_printf(_("Usage:")," net afs key cell\n"); return -1; } diff --git a/source3/utils/net_conf.c b/source3/utils/net_conf.c index 9a83b46212a..74c72a5292d 100644 --- a/source3/utils/net_conf.c +++ b/source3/utils/net_conf.c @@ -94,7 +94,7 @@ static int net_conf_addshare_usage(struct net_context *c, int argc, static int net_conf_delshare_usage(struct net_context *c, int argc, const char **argv) { - d_printf(_("Usage: "), _(" net conf delshare \n")); + d_printf(_("Usage:"), _(" net conf delshare \n")); return -1; } diff --git a/source3/utils/net_eventlog.c b/source3/utils/net_eventlog.c index 2cbb82f9285..99ecd43c2a8 100644 --- a/source3/utils/net_eventlog.c +++ b/source3/utils/net_eventlog.c @@ -43,7 +43,7 @@ static int net_eventlog_dump(struct net_context *c, int argc, char *s; if (argc < 1 || c->display_usage) { - d_fprintf(stderr, _("usage:")," net eventlog dump \n"); + d_fprintf(stderr, _("Usage:")," net eventlog dump \n"); goto done; } @@ -99,7 +99,7 @@ static int net_eventlog_import(struct net_context *c, int argc, if (argc < 2 || c->display_usage) { d_fprintf(stderr, - _("usage:")," net eventlog import \n"); + _("Usage:")," net eventlog import \n"); goto done; } @@ -194,7 +194,7 @@ static int net_eventlog_export(struct net_context *c, int argc, if (argc < 2 || c->display_usage) { d_fprintf(stderr, - _("usage:")," net eventlog export \n"); + _("Usage:")," net eventlog export \n"); goto done; } diff --git a/source3/utils/net_groupmap.c b/source3/utils/net_groupmap.c index 4974d2975f3..72dcfc3dac9 100644 --- a/source3/utils/net_groupmap.c +++ b/source3/utils/net_groupmap.c @@ -192,7 +192,7 @@ static int net_groupmap_add(struct net_context *c, int argc, const char **argv) name_type = "domain group"; if (c->display_usage) { - d_printf(_("Usage\n"),"%s\n", add_usage_str); + d_printf(_("Usage:\n"),"%s\n", add_usage_str); return 0; } diff --git a/source3/utils/net_idmap.c b/source3/utils/net_idmap.c index 7ad655bd4ec..d1400db5536 100644 --- a/source3/utils/net_idmap.c +++ b/source3/utils/net_idmap.c @@ -337,7 +337,7 @@ static int net_idmap_aclmapset(struct net_context *c, int argc, const char **arg NTSTATUS status; if (argc != 3 || c->display_usage) { - d_fprintf(stderr, _("usage:")," net idmap aclmapset " + d_fprintf(stderr, _("Usage:")," net idmap aclmapset " " \n"); return -1; } diff --git a/source3/utils/net_registry.c b/source3/utils/net_registry.c index 9d953f3e24a..3958d2165d1 100644 --- a/source3/utils/net_registry.c +++ b/source3/utils/net_registry.c @@ -276,7 +276,7 @@ static int net_registry_getvalue_internal(struct net_context *c, int argc, TALLOC_CTX *ctx = talloc_stackframe(); if (argc != 2 || c->display_usage) { - d_fprintf(stderr, _("usage:"),_(" net rpc registry getvalue " + d_fprintf(stderr, _("Usage:"),_(" net rpc registry getvalue " "\n")); goto done; } @@ -325,7 +325,7 @@ static int net_registry_setvalue(struct net_context *c, int argc, TALLOC_CTX *ctx = talloc_stackframe(); if (argc < 4 || c->display_usage) { - d_fprintf(stderr, _("usage:"),_(" net rpc registry setvalue " + d_fprintf(stderr, _("Usage:"),_(" net rpc registry setvalue " " []+\n")); goto done; } @@ -380,7 +380,7 @@ static int net_registry_deletevalue(struct net_context *c, int argc, int ret = -1; if (argc != 2 || c->display_usage) { - d_fprintf(stderr, _("usage:"),_(" net rpc registry deletevalue " + d_fprintf(stderr, _("Usage:"),_(" net rpc registry deletevalue " "\n")); goto done; } diff --git a/source3/utils/net_rpc.c b/source3/utils/net_rpc.c index 82827295a29..d351a244127 100644 --- a/source3/utils/net_rpc.c +++ b/source3/utils/net_rpc.c @@ -1033,7 +1033,7 @@ static NTSTATUS rpc_sh_handle_user(struct net_context *c, enum lsa_SidType type; if (argc == 0) { - d_fprintf(stderr, _("usage:")," %s \n"), ctx->whoami; + d_fprintf(stderr, _("Usage:")," %s \n"), ctx->whoami; return NT_STATUS_INVALID_PARAMETER; } @@ -1114,7 +1114,7 @@ static NTSTATUS rpc_sh_user_show_internals(struct net_context *c, union samr_UserInfo *info = NULL; if (argc != 0) { - d_fprintf(stderr, _("usage:")," %s show \n"),ctx->whoami; + d_fprintf(stderr, _("Usage:")," %s show \n"),ctx->whoami; return NT_STATUS_INVALID_PARAMETER; } @@ -1167,7 +1167,7 @@ static NTSTATUS rpc_sh_user_str_edit_internals(struct net_context *c, union samr_UserInfo *info = NULL; if (argc > 1) { - d_fprintf(stderr, _("usage:")," %s [new value|NULL]\n", + d_fprintf(stderr, _("Usage:")," %s [new value|NULL]\n", ctx->whoami); return NT_STATUS_INVALID_PARAMETER; } @@ -1258,7 +1258,7 @@ static NTSTATUS rpc_sh_user_flag_edit_internals(struct net_context *c, !strequal(argv[0], "no"))) { /* TRANSATORS: The yes|no here are program keywords. Please do not translate. */ - d_fprintf(stderr, _("usage: %s [yes|no]\n"), + d_fprintf(stderr, _("Usage: %s [yes|no]\n"), ctx->whoami); return NT_STATUS_INVALID_PARAMETER; } @@ -3047,7 +3047,7 @@ static int rpc_share_list(struct net_context *c, int argc, const char **argv) uint32_t i, level = 1; if (c->display_usage) { - d_printf(_("Usage\n"), + d_printf(_("Usage:\n"), "net rpc share list\n" " ",_("List shares on remote server\n")); return 0; @@ -4680,7 +4680,7 @@ static NTSTATUS rpc_sh_share_add(struct net_context *c, struct SHARE_INFO_2 i2; if ((argc < 2) || (argc > 3)) { - d_fprintf(stderr, _("usage: %s [comment]\n"), + d_fprintf(stderr, _("Usage: %s [comment]\n"), ctx->whoami); return NT_STATUS_INVALID_PARAMETER; } @@ -4709,7 +4709,7 @@ static NTSTATUS rpc_sh_share_delete(struct net_context *c, int argc, const char **argv) { if (argc != 1) { - d_fprintf(stderr, _("usage:")," %s \n", ctx->whoami); + d_fprintf(stderr, _("Usage:")," %s \n", ctx->whoami); return NT_STATUS_INVALID_PARAMETER; } @@ -4727,7 +4727,7 @@ static NTSTATUS rpc_sh_share_info(struct net_context *c, NTSTATUS status; if (argc != 1) { - d_fprintf(stderr, _("usage: %s \n"), ctx->whoami); + d_fprintf(stderr, _("Usage: %s \n"), ctx->whoami); return NT_STATUS_INVALID_PARAMETER; } diff --git a/source3/utils/net_rpc_registry.c b/source3/utils/net_rpc_registry.c index dc3d54999c0..8fc22fbcfaa 100644 --- a/source3/utils/net_rpc_registry.c +++ b/source3/utils/net_rpc_registry.c @@ -471,7 +471,7 @@ static int rpc_registry_setvalue(struct net_context *c, int argc, const char **argv ) { if (argc < 4 || c->display_usage) { - d_fprintf(stderr, _("usage:"),_(" net rpc registry setvalue " + d_fprintf(stderr, _("Usage:"),_(" net rpc registry setvalue " " []+\n")); return -1; } @@ -524,7 +524,7 @@ static int rpc_registry_deletevalue(struct net_context *c, int argc, const char **argv ) { if (argc != 2 || c->display_usage) { - d_fprintf(stderr, _("usage:"),_(" net rpc registry deletevalue " + d_fprintf(stderr, _("Usage:"),_(" net rpc registry deletevalue " "\n")); return -1; } @@ -639,7 +639,7 @@ static int rpc_registry_getvalue(struct net_context *c, int argc, const char **argv) { if (argc != 2 || c->display_usage) { - d_fprintf(stderr, _("usage:"),_(" net rpc registry getvalue " + d_fprintf(stderr, _("Usage:"),_(" net rpc registry getvalue " "\n")); return -1; } @@ -666,7 +666,7 @@ static int rpc_registry_getvalueraw(struct net_context *c, int argc, const char **argv) { if (argc != 2 || c->display_usage) { - d_fprintf(stderr, _("usage:"),_(" net rpc registry getvalue " + d_fprintf(stderr, _("Usage:"),_(" net rpc registry getvalue " "\n")); return -1; } @@ -740,7 +740,7 @@ static int rpc_registry_createkey(struct net_context *c, int argc, { if (argc != 1 || c->display_usage) { d_fprintf(stderr, - _("usage:"),_(" net rpc registry createkey \n")); + _("Usage:"),_(" net rpc registry createkey \n")); return -1; } @@ -790,7 +790,7 @@ static int rpc_registry_deletekey(struct net_context *c, int argc, const char ** { if (argc != 1 || c->display_usage) { d_fprintf(stderr, - _("usage:"),_(" net rpc registry deletekey \n")); + _("Usage:"),_(" net rpc registry deletekey \n")); return -1; } diff --git a/source3/utils/net_rpc_sh_acct.c b/source3/utils/net_rpc_sh_acct.c index 2f0b0ea7647..4289c27183c 100644 --- a/source3/utils/net_rpc_sh_acct.c +++ b/source3/utils/net_rpc_sh_acct.c @@ -155,7 +155,7 @@ static int account_show(struct net_context *c, int argc, const char **argv) { if (argc != 0) { - d_fprintf(stderr, _("usage:")," %s\n"), ctx->whoami; + d_fprintf(stderr, _("Usage:")," %s\n"), ctx->whoami; return -1; } @@ -226,7 +226,7 @@ static int account_set_badpw(struct net_context *c, int argc, const char **argv) { if (argc != 1) { - d_fprintf(stderr, _("usage:")," %s \n"), ctx->whoami; + d_fprintf(stderr, _("Usage:")," %s \n"), ctx->whoami; return -1; } @@ -256,7 +256,7 @@ static int account_set_lockduration(struct net_context *c, int argc, const char **argv) { if (argc != 1) { - d_fprintf(stderr, _("usage: %s \n"), ctx->whoami); + d_fprintf(stderr, _("Usage: %s \n"), ctx->whoami); return -1; } @@ -286,7 +286,7 @@ static int account_set_resetduration(struct net_context *c, int argc, const char **argv) { if (argc != 1) { - d_fprintf(stderr, _("usage: %s \n"), ctx->whoami); + d_fprintf(stderr, _("Usage: %s \n"), ctx->whoami); return -1; } @@ -316,7 +316,7 @@ static int account_set_minpwage(struct net_context *c, int argc, const char **argv) { if (argc != 1) { - d_fprintf(stderr, _("usage: %s \n"), ctx->whoami); + d_fprintf(stderr, _("Usage: %s \n"), ctx->whoami); return -1; } @@ -346,7 +346,7 @@ static int account_set_maxpwage(struct net_context *c, int argc, const char **argv) { if (argc != 1) { - d_fprintf(stderr, _("usage: %s \n"), ctx->whoami); + d_fprintf(stderr, _("Usage: %s \n"), ctx->whoami); return -1; } @@ -376,7 +376,7 @@ static int account_set_minpwlen(struct net_context *c, int argc, const char **argv) { if (argc != 1) { - d_fprintf(stderr, _("usage: %s \n"), ctx->whoami); + d_fprintf(stderr, _("Usage: %s \n"), ctx->whoami); return -1; } @@ -406,7 +406,7 @@ static int account_set_pwhistlen(struct net_context *c, int argc, const char **argv) { if (argc != 1) { - d_fprintf(stderr, _("usage: %s \n"), ctx->whoami); + d_fprintf(stderr, _("Usage: %s \n"), ctx->whoami); return -1; } diff --git a/source3/utils/net_sam.c b/source3/utils/net_sam.c index c3b328bae53..006d01e4226 100644 --- a/source3/utils/net_sam.c +++ b/source3/utils/net_sam.c @@ -37,7 +37,7 @@ static int net_sam_userset(struct net_context *c, int argc, const char **argv, NTSTATUS status; if (argc != 2 || c->display_usage) { - d_fprintf(stderr, _("usage:"),_(" net sam set %s \n"), + d_fprintf(stderr, _("Usage:"),_(" net sam set %s \n"), field); return -1; } @@ -142,7 +142,7 @@ static int net_sam_set_userflag(struct net_context *c, int argc, if ((argc != 2) || c->display_usage || (!strequal(argv[1], "yes") && !strequal(argv[1], "no"))) { - d_fprintf(stderr, _("usage:"),_(" net sam set %s [yes|no]\n"), + d_fprintf(stderr, _("Usage:"),_(" net sam set %s [yes|no]\n"), field); return -1; } @@ -234,7 +234,7 @@ static int net_sam_set_pwdmustchangenow(struct net_context *c, int argc, (!strequal(argv[1], "yes") && !strequal(argv[1], "no"))) { d_fprintf(stderr, - _("usage:"),_(" net sam set pwdmustchangenow " + _("Usage:"),_(" net sam set pwdmustchangenow " "[yes|no]\n")); return -1; } @@ -297,7 +297,7 @@ static int net_sam_set_comment(struct net_context *c, int argc, NTSTATUS status; if (argc != 2 || c->display_usage) { - d_fprintf(stderr, _("usage:"),_(" net sam set comment " + d_fprintf(stderr, _("Usage:"),_(" net sam set comment " "\n")); return -1; } @@ -461,7 +461,7 @@ static int net_sam_policy_set(struct net_context *c, int argc, const char **argv char *endptr; if (argc != 2 || c->display_usage) { - d_fprintf(stderr, _("usage:"),_(" net sam policy set " + d_fprintf(stderr, _("Usage:"),_(" net sam policy set " "\"\" \n")); return -1; } @@ -527,7 +527,7 @@ static int net_sam_policy_show(struct net_context *c, int argc, const char **arg enum pdb_policy_type field; if (argc != 1 || c->display_usage) { - d_fprintf(stderr, _("usage:"),_(" net sam policy show" + d_fprintf(stderr, _("Usage:"),_(" net sam policy show" " \"\" \n")); return -1; } @@ -631,7 +631,7 @@ static int net_sam_rights_list(struct net_context *c, int argc, SE_PRIV mask; if (argc > 1 || c->display_usage) { - d_fprintf(stderr, _("usage:"), + d_fprintf(stderr, _("Usage:"), _(" net sam rights list [privilege name]\n")); return -1; } @@ -687,7 +687,7 @@ static int net_sam_rights_grant(struct net_context *c, int argc, int i; if (argc < 2 || c->display_usage) { - d_fprintf(stderr, _("usage:"),_(" net sam rights grant " + d_fprintf(stderr, _("Usage:"),_(" net sam rights grant " " ...\n")); return -1; } @@ -725,7 +725,7 @@ static int net_sam_rights_revoke(struct net_context *c, int argc, int i; if (argc < 2 || c->display_usage) { - d_fprintf(stderr, _("usage:"),_(" net sam rights revoke " + d_fprintf(stderr, _("Usage:"),_(" net sam rights revoke " "\n")); return -1; } @@ -852,7 +852,7 @@ static int net_sam_mapunixgroup(struct net_context *c, int argc, const char **ar struct group *grp; if (argc != 1 || c->display_usage) { - d_fprintf(stderr, _("usage:"),_(" net sam mapunixgroup \n")); + d_fprintf(stderr, _("Usage:"),_(" net sam mapunixgroup \n")); return -1; } @@ -914,7 +914,7 @@ static int net_sam_unmapunixgroup(struct net_context *c, int argc, const char ** struct group *grp; if (argc != 1 || c->display_usage) { - d_fprintf(stderr, _("usage:"),_(" net sam unmapunixgroup \n")); + d_fprintf(stderr, _("Usage:"),_(" net sam unmapunixgroup \n")); return -1; } @@ -950,7 +950,7 @@ static int net_sam_createdomaingroup(struct net_context *c, int argc, if (argc != 1 || c->display_usage) { d_fprintf(stderr, - _("usage:"),_(" net sam createdomaingroup \n")); + _("Usage:"),_(" net sam createdomaingroup \n")); return -1; } @@ -981,7 +981,7 @@ static int net_sam_deletedomaingroup(struct net_context *c, int argc, NTSTATUS status; if (argc != 1 || c->display_usage) { - d_fprintf(stderr,_("usage:"),_(" net sam deletelocalgroup \n")); + d_fprintf(stderr,_("Usage:"),_(" net sam deletelocalgroup \n")); return -1; } @@ -1022,7 +1022,7 @@ static int net_sam_createlocalgroup(struct net_context *c, int argc, const char uint32 rid; if (argc != 1 || c->display_usage) { - d_fprintf(stderr,_("usage:"),_(" net sam createlocalgroup \n")); + d_fprintf(stderr,_("Usage:"),_(" net sam createlocalgroup \n")); return -1; } @@ -1057,7 +1057,7 @@ static int net_sam_deletelocalgroup(struct net_context *c, int argc, const char NTSTATUS status; if (argc != 1 || c->display_usage) { - d_fprintf(stderr,_("usage:"),_(" net sam deletelocalgroup \n")); + d_fprintf(stderr,_("Usage:"),_(" net sam deletelocalgroup \n")); return -1; } @@ -1100,7 +1100,7 @@ static int net_sam_createbuiltingroup(struct net_context *c, int argc, const cha if (argc != 1 || c->display_usage) { d_fprintf(stderr, - _("usage:"),_(" net sam createbuiltingroup \n")); + _("Usage:"),_(" net sam createbuiltingroup \n")); return -1; } @@ -1152,7 +1152,7 @@ static int net_sam_addmem(struct net_context *c, int argc, const char **argv) NTSTATUS status; if (argc != 2 || c->display_usage) { - d_fprintf(stderr,_("usage:"),_(" net sam addmem \n")); + d_fprintf(stderr,_("Usage:"),_(" net sam addmem \n")); return -1; } @@ -1239,7 +1239,7 @@ static int net_sam_delmem(struct net_context *c, int argc, const char **argv) NTSTATUS status; if (argc != 2 || c->display_usage) { - d_fprintf(stderr,_("usage:"),_(" net sam delmem \n")); + d_fprintf(stderr,_("Usage:"),_(" net sam delmem \n")); return -1; } @@ -1311,7 +1311,7 @@ static int net_sam_listmem(struct net_context *c, int argc, const char **argv) NTSTATUS status; if (argc != 1 || c->display_usage) { - d_fprintf(stderr, _("usage:"),_(" net sam listmem \n")); + d_fprintf(stderr, _("Usage:"),_(" net sam listmem \n")); return -1; } @@ -1385,7 +1385,7 @@ static int net_sam_do_list(struct net_context *c, int argc, const char **argv, if ((argc > 1) || c->display_usage || ((argc == 1) && !strequal(argv[0], "verbose"))) { - d_fprintf(stderr,_("usage:"),_(" net sam list %s [verbose]\n"), what); + d_fprintf(stderr,_("Usage:"),_(" net sam list %s [verbose]\n"), what); return -1; } @@ -1518,7 +1518,7 @@ static int net_sam_show(struct net_context *c, int argc, const char **argv) const char *dom, *name; if (argc != 1 || c->display_usage) { - d_fprintf(stderr, _("usage:"),_(" net sam show \n")); + d_fprintf(stderr, _("Usage:"),_(" net sam show \n")); return -1; }