The branch, master has been updated via bd3c922... s3/net: split up some printable stings to ease i18n via c3ef7a3... s3/i18n/de: improve some German translations via fb7a462... Ñ3/i18n/de: fix typo from f299915... testprogs: add tests for GetPrinterData{Ex} and EnumPrinterDataEx.
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master - Log ----------------------------------------------------------------- commit bd3c922e2bc1a163efc1d8c9cb59578bebb79616 Author: Björn Jacke <b...@sernet.de> Date: Mon Jan 18 23:39:19 2010 +0100 s3/net: split up some printable stings to ease i18n If we put strings like "Usage:" into separate _() macros and not the whole "Usage:..." string we can cover much more messages by only one single translation. The drawback is that the message in the sources looks less pretty. commit c3ef7a3d96763719de1df679d50fb8a00d1f7391 Author: Björn Jacke <b...@sernet.de> Date: Mon Jan 18 23:25:41 2010 +0100 s3/i18n/de: improve some German translations commit fb7a4621134b9054f33ccb48d7d8c1e4e4960b9a Author: Björn Jacke <b...@sernet.de> Date: Mon Jan 18 22:07:55 2010 +0100 Ñ3/i18n/de: fix typo ----------------------------------------------------------------------- Summary of changes: source3/locale/pam_winbind/de.po | 12 ++-- source3/utils/net.c | 8 +- source3/utils/net_ads.c | 95 ++++++++++---------- source3/utils/net_ads_gpo.c | 34 ++++---- source3/utils/net_afs.c | 4 +- source3/utils/net_cache.c | 21 +++-- source3/utils/net_conf.c | 26 +++--- source3/utils/net_dom.c | 6 +- source3/utils/net_eventlog.c | 6 +- source3/utils/net_groupmap.c | 30 +++--- source3/utils/net_idmap.c | 21 +++-- source3/utils/net_lookup.c | 8 +- source3/utils/net_rap.c | 8 +- source3/utils/net_registry.c | 28 +++--- source3/utils/net_rpc.c | 180 +++++++++++++++++++------------------- source3/utils/net_rpc_audit.c | 20 ++-- source3/utils/net_rpc_registry.c | 30 +++--- source3/utils/net_rpc_rights.c | 20 ++-- source3/utils/net_rpc_samsync.c | 12 ++-- source3/utils/net_rpc_service.c | 50 +++++----- source3/utils/net_rpc_sh_acct.c | 4 +- source3/utils/net_rpc_shell.c | 4 +- source3/utils/net_sam.c | 52 ++++++------ source3/utils/net_status.c | 8 +- source3/utils/net_time.c | 12 ++-- source3/utils/net_util.c | 4 +- 26 files changed, 353 insertions(+), 350 deletions(-) Changeset truncated at 500 lines: diff --git a/source3/locale/pam_winbind/de.po b/source3/locale/pam_winbind/de.po index 5a7223d..da93166 100644 --- a/source3/locale/pam_winbind/de.po +++ b/source3/locale/pam_winbind/de.po @@ -49,7 +49,7 @@ msgstr "Ihr Passwort ist abgelaufen" #: ../../nsswitch/pam_winbind.c:595 msgid "You need to change your password now" -msgstr "Sie müssen Ihr Passwort unmittelbar ändern" +msgstr "Sie müssen Ihr Passwort jetzt ändern" #: ../../nsswitch/pam_winbind.c:597 msgid "You are not allowed to logon from this workstation" @@ -102,14 +102,14 @@ msgstr "Kulanzanmeldung. Bitte ändern sie ihr Passwort sobald sie wieder online #: ../../nsswitch/pam_winbind.c:1263 msgid "Domain Controller unreachable, using cached credentials instead. Network resources may be unavailable" -msgstr "Domänen-Controller unerreichbar. Anmeldung erfolgte mit gespeicherten Anmeldedaten. Netzwerk Ressourcen können momentan nicht verfügbar sein" +msgstr "Domänen-Controller unerreichbar. Anmeldung erfolgte mit gespeicherten Anmeldedaten. Netzwerk-Ressourcen können momentan nicht verfügbar sein" #: ../../nsswitch/pam_winbind.c:1288 msgid "" "Failed to establish your Kerberos Ticket cache due time differences\n" "with the domain controller. Please verify the system time.\n" msgstr "" -"Anforderung eines Kerberos Tickets aufgrund Zeitunterscheid zum \n" +"Anforderung eines Kerberos-Tickets wegen Zeitunterschied zum \n" "Domänen-Controller fehlgeschlagen. Bitte überprüfen Sie die Systemzeit.\n" #: ../../nsswitch/pam_winbind.c:1356 @@ -119,7 +119,7 @@ msgstr "Ihr Passwort " #: ../../nsswitch/pam_winbind.c:1363 #, c-format msgid "must be at least %d characters; " -msgstr "muà mindestens %d Zeichen lang sein; " +msgstr "muss mindestens %d Zeichen lang sein; " #: ../../nsswitch/pam_winbind.c:1372 #, c-format @@ -128,7 +128,7 @@ msgstr "kann keines der %d vorherigen Passwörter enthalten; " #: ../../nsswitch/pam_winbind.c:1382 msgid "must contain capitals, numerals or punctuation; and cannot contain your account or full name; " -msgstr "muà GroÃbuchstaben, Ziffern oder Punktzeichen enthalten; kann nicht den Benutzer- oder vollen Namen enthalten; " +msgstr "muss GroÃbuchstaben, Ziffern oder Punktzeichen enthalten; kann nicht den Benutzer- oder vollen Namen enthalten; " #: ../../nsswitch/pam_winbind.c:1392 msgid "Please type a different password. Type a password which meets these requirements in both text boxes." @@ -137,7 +137,7 @@ msgstr "Bitte wählen Sie ein anderes Passwort. Geben Sie ein geeignetes Passwor #: ../../nsswitch/pam_winbind.c:1419 #, c-format msgid "Creating directory: %s failed: %s" -msgstr "Anlegen des Verzeichnis: %s fehlgeschlagen: %s" +msgstr "Anlegen des Verzeichnisses: %s fehlgeschlagen: %s" #: ../../nsswitch/pam_winbind.c:1877 msgid "Password does not meet complexity requirements" diff --git a/source3/utils/net.c b/source3/utils/net.c index e8920e0..c0bffe2 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_ads.c b/source3/utils/net_ads.c index 8e644bb..90f5ca4 100644 --- a/source3/utils/net_ads.c +++ b/source3/utils/net_ads.c @@ -128,9 +128,9 @@ static int net_ads_lookup(struct net_context *c, int argc, const char **argv) int ret; if (c->display_usage) { - d_printf(_("Usage:\n" + d_printf(_("Usage:\n"), "net ads lookup\n" - " Find the ADS DC using CLDAP lookup.\n")); + " ",_("Find the ADS DC using CLDAP lookup.\n")); return 0; } @@ -158,9 +158,10 @@ static int net_ads_info(struct net_context *c, int argc, const char **argv) char addr[INET6_ADDRSTRLEN]; if (c->display_usage) { - d_printf(_("Usage:\n" - "net ads info\n" - " Display information about an Active Directory " + d_printf(_("Usage:\n"), + "net ads info\n", + " ", + _("Display information about an Active Directory " "server.\n")); return 0; } @@ -372,9 +373,9 @@ static int net_ads_workgroup(struct net_context *c, int argc, const char **argv) struct NETLOGON_SAM_LOGON_RESPONSE_EX reply; if (c->display_usage) { - d_printf(_("Usage:\n" + d_printf(_("Usage:\n"), "net ads workgroup\n" - " Print the workgroup name\n")); + " ",_("Print the workgroup name\n")); return 0; } @@ -697,9 +698,9 @@ int net_ads_user(struct net_context *c, int argc, const char **argv) if (argc == 0) { if (c->display_usage) { - d_printf(_("Usage:\n" + d_printf(_("Usage:\n"), "net ads user\n" - " List AD users\n")); + " ",_("List AD users\n")); net_display_usage_from_functable(func); return 0; } @@ -848,9 +849,9 @@ int net_ads_group(struct net_context *c, int argc, const char **argv) if (argc == 0) { if (c->display_usage) { - d_printf(_("Usage:\n" + d_printf(_("Usage:\n"), "net ads group\n" - " List AD groups\n")); + " ", _("List AD groups\n")); net_display_usage_from_functable(func); return 0; } @@ -882,9 +883,9 @@ static int net_ads_status(struct net_context *c, int argc, const char **argv) LDAPMessage *res; if (c->display_usage) { - d_printf(_("Usage:\n" + d_printf(_("Usage:\n"), "net ads status\n" - " Display machine account details\n")); + " ",_("Display machine account details\n")); return 0; } @@ -924,9 +925,9 @@ static int net_ads_leave(struct net_context *c, int argc, const char **argv) WERROR werr; if (c->display_usage) { - d_printf(_("Usage:\n" + d_printf(_("Usage:\n"), "net ads leave\n" - " Leave an AD domain\n")); + " ", _("Leave an AD domain\n")); return 0; } @@ -1037,9 +1038,9 @@ int net_ads_testjoin(struct net_context *c, int argc, const char **argv) use_in_memory_ccache(); if (c->display_usage) { - d_printf(_("Usage:\n" + d_printf(_("Usage:\n"), "net ads testjoin\n" - " Test if the existing join is ok\n")); + " ", _("Test if the existing join is ok\n")); return 0; } @@ -1416,9 +1417,9 @@ static int net_ads_dns_register(struct net_context *c, int argc, const char **ar #endif if (argc > 0 || c->display_usage) { - d_printf(_("Usage:\n" + d_printf(_("Usage:\n"), "net ads dns register\n" - " Register hostname with DNS\n")); + " ", _("Register hostname with DNS\n")); return -1; } @@ -1468,8 +1469,8 @@ static int net_ads_dns_gethostbyname(struct net_context *c, int argc, const char #endif if (argc != 2 || c->display_usage) { - d_printf(_("Usage:\n" - "net ads dns gethostbyname <server> <name>\n" + d_printf(_("Usage:\n"), + _("net ads dns gethostbyname <server> <name>\n"), " Look up hostname from the AD\n" " server\tName server to use\n" " name\tName to look up\n")); @@ -1538,9 +1539,9 @@ static int net_ads_printer_search(struct net_context *c, int argc, const char ** LDAPMessage *res = NULL; if (c->display_usage) { - d_printf(_("Usage:\n" + d_printf(_("Usage:\n"), "net ads printer search\n" - " List printers in the AD\n")); + " ", _("List printers in the AD\n")); return 0; } @@ -1578,8 +1579,8 @@ static int net_ads_printer_info(struct net_context *c, int argc, const char **ar LDAPMessage *res = NULL; if (c->display_usage) { - d_printf(_("Usage:\n" - "net ads printer info [printername [servername]]\n" + d_printf(_("Usage:\n"), + _("net ads printer info [printername [servername]]\n" " Display printer info from AD\n" " printername\tPrinter name or wildcard\n" " servername\tName of the print server\n")); @@ -1642,8 +1643,8 @@ static int net_ads_printer_publish(struct net_context *c, int argc, const char * LDAPMessage *res = NULL; if (argc < 1 || c->display_usage) { - d_printf(_("Usage:\n" - "net ads printer publish <printername> [servername]\n" + d_printf(_("Usage:\n"), + _("net ads printer publish <printername> [servername]\n" " Publish printer in AD\n" " printername\tName of the printer\n" " servername\tName of the print server\n")); @@ -1768,8 +1769,8 @@ static int net_ads_printer_remove(struct net_context *c, int argc, const char ** LDAPMessage *res = NULL; if (argc < 1 || c->display_usage) { - d_printf(_("Usage:\n" - "net ads printer remove <printername> [servername]\n" + d_printf(_("Usage:\n"), + _("net ads printer remove <printername> [servername]\n" " Remove a printer from the AD\n" " printername\tName of the printer\n" " servername\tName of the print server\n")); @@ -1871,8 +1872,8 @@ static int net_ads_password(struct net_context *c, int argc, const char **argv) ADS_STATUS ret; if (c->display_usage) { - d_printf(_("Usage:\n" - "net ads password <username>\n" + d_printf(_("Usage:\n"), + _("net ads password <username>\n" " Change password for user\n" " username\tName of user to change password for\n")); return 0; @@ -1954,9 +1955,9 @@ int net_ads_changetrustpw(struct net_context *c, int argc, const char **argv) ADS_STATUS ret; if (c->display_usage) { - d_printf(_("Usage:\n" + d_printf(_("Usage:\n"), "net ads changetrustpw\n" - " Change the machine account's trust password\n")); + " ", _("Change the machine account's trust password\n")); return 0; } @@ -2195,9 +2196,9 @@ static int net_ads_keytab_flush(struct net_context *c, int argc, const char **ar ADS_STRUCT *ads; if (c->display_usage) { - d_printf(_("Usage:\n" + d_printf(_("Usage:\n"), "net ads keytab flush\n" - " Delete the whole keytab\n")); + " ", _("Delete the whole keytab\n")); return 0; } @@ -2216,8 +2217,8 @@ static int net_ads_keytab_add(struct net_context *c, int argc, const char **argv ADS_STRUCT *ads; if (c->display_usage) { - d_printf(_("Usage:\n" - "net ads keytab add <principal> [principal ...]\n" + d_printf(_("Usage:\n"), + _("net ads keytab add <principal> [principal ...]\n" " Add principals to local keytab\n" " principal\tKerberos principal to add to " "keytab\n")); @@ -2241,9 +2242,9 @@ static int net_ads_keytab_create(struct net_context *c, int argc, const char **a int ret; if (c->display_usage) { - d_printf(_("Usage:\n" + d_printf(_("Usage:\n"), "net ads keytab create\n" - " Create new default keytab\n")); + " ", _("Create new default keytab\n")); return 0; } @@ -2260,8 +2261,8 @@ static int net_ads_keytab_list(struct net_context *c, int argc, const char **arg const char *keytab = NULL; if (c->display_usage) { - d_printf(_("Usage:\n" - "net ads keytab list [keytab]\n" + d_printf(_("Usage:\n"), + _("net ads keytab list [keytab]\n" " List a local keytab\n" " keytab\tKeytab to list\n")); return 0; @@ -2326,9 +2327,9 @@ static int net_ads_kerberos_renew(struct net_context *c, int argc, const char ** int ret = -1; if (c->display_usage) { - d_printf(_("Usage:\n" + d_printf(_("Usage:\n"), "net ads kerberos renew\n" - " Renew TGT from existing credential cache\n")); + " ", _("Renew TGT from existing credential cache\n")); return 0; } @@ -2350,9 +2351,9 @@ static int net_ads_kerberos_pac(struct net_context *c, int argc, const char **ar const char *impersonate_princ_s = NULL; if (c->display_usage) { - d_printf(_("Usage:\n" + d_printf(_("Usage:\n"), "net ads kerberos pac\n" - " Dump the Kerberos PAC\n")); + " ", _("Dump the Kerberos PAC\n")); return 0; } @@ -2405,9 +2406,9 @@ static int net_ads_kerberos_kinit(struct net_context *c, int argc, const char ** NTSTATUS status; if (c->display_usage) { - d_printf(_("Usage:\n" + d_printf(_("Usage:\n"), "net ads kerberos kinit\n" - " Get Ticket Granting Ticket (TGT) for the user\n")); + " ", _("Get Ticket Granting Ticket (TGT) for the user\n")); return 0; } diff --git a/source3/utils/net_ads_gpo.c b/source3/utils/net_ads_gpo.c index 5f8921a..2203f36 100644 --- a/source3/utils/net_ads_gpo.c +++ b/source3/utils/net_ads_gpo.c @@ -37,9 +37,9 @@ static int net_ads_gpo_refresh(struct net_context *c, int argc, const char **arg struct nt_user_token *token = NULL; if (argc < 1 || c->display_usage) { - d_printf(_("Usage:\n" - "net ads gpo refresh <username|machinename>\n" - " Lists all GPOs assigned to an account and " + d_printf(_("Usage:\n"), + _("net ads gpo refresh <username|machinename>\n"), + _(" Lists all GPOs assigned to an account and " "downloads them\n" " username\tUser to refresh GPOs for\n" " machinename\tMachine to refresh GPOs for\n")); @@ -223,9 +223,9 @@ static int net_ads_gpo_list_all(struct net_context *c, int argc, const char **ar }; if (c->display_usage) { - d_printf(_("Usage:\n" + d_printf(_("Usage:\n"), "net ads gpo listall\n" - " List all GPOs on the DC\n")); + " ", _("List all GPOs on the DC\n")); return 0; } @@ -297,9 +297,9 @@ static int net_ads_gpo_list(struct net_context *c, int argc, const char **argv) struct nt_user_token *token = NULL; if (argc < 1 || c->display_usage) { - d_printf(_("Usage:\n" - "net ads gpo list <username|machinename>\n" - " Lists all GPOs for machine/user\n" + d_printf(_("Usage:\n"), + _("net ads gpo list <username|machinename>\n"), + _(" Lists all GPOs for machine/user\n" " username\tUser to list GPOs for\n" " machinename\tMachine to list GPOs for\n")); return -1; @@ -448,9 +448,9 @@ static int net_ads_gpo_link_get(struct net_context *c, int argc, const char **ar struct GP_LINK gp_link; if (argc < 1 || c->display_usage) { - d_printf(_("Usage:\n" - "net ads gpo linkget <container>\n" - " Lists gPLink of a containter\n" + d_printf(_("Usage:\n"), + _("net ads gpo linkget <container>\n"), + _(" Lists gPLink of a containter\n" " container\tContainer to get link for\n")); return -1; } @@ -489,9 +489,9 @@ static int net_ads_gpo_link_add(struct net_context *c, int argc, const char **ar TALLOC_CTX *mem_ctx; if (argc < 2 || c->display_usage) { - d_printf(_("Usage:\n" - "net ads gpo linkadd <linkdn> <gpodn> [options]\n" - " Link a container to a GPO\n" + d_printf(_("Usage:\n"), + _("net ads gpo linkadd <linkdn> <gpodn> [options]\n"), + _(" Link a container to a GPO\n" " linkdn\tContainer to link to a GPO\n" " gpodn\tGPO to link container to\n")); d_printf(_("note: DNs must be provided properly escaped.\n" @@ -576,9 +576,9 @@ static int net_ads_gpo_get_gpo(struct net_context *c, int argc, const char **arg struct GROUP_POLICY_OBJECT gpo; if (argc < 1 || c->display_usage) { - d_printf(_("Usage:\n" - "net ads gpo getgpo <gpo>\n" - " List speciefied GPO\n" + d_printf(_("Usage:\n"), + _("net ads gpo getgpo <gpo>\n"), + _(" List speciefied GPO\n" " gpo\t\tGPO to list\n")); return -1; } diff --git a/source3/utils/net_afs.c b/source3/utils/net_afs.c index 043be17..1d17348 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 <keyfile> cell'\n")); + d_printf(_("usage:")," net afs key <keyfile> cell\n"); return -1; } @@ -68,7 +68,7 @@ int net_afs_impersonate(struct net_context *c, int argc, char *token; if (argc != 2) { - fprintf(stderr, _("Usage: net afs impersonate <user> <cell>\n")); + fprintf(stderr, _("Usage:")," net afs impersonate <user> <cell>\n"); exit(1); } diff --git a/source3/utils/net_cache.c b/source3/utils/net_cache.c index 9630637..41bf7ef 100644 --- a/source3/utils/net_cache.c +++ b/source3/utils/net_cache.c @@ -155,7 +155,8 @@ static int net_cache_add(struct net_context *c, int argc, const char **argv) time_t timeout; if (argc < 3 || c->display_usage) { - d_printf(_("\nUsage:\nnet cache add <key string> <data string> " + d_printf("\n",_("Usage:\n"), + _("net cache add <key string> <data string> " "<timeout>\n")); return -1; } @@ -192,7 +193,7 @@ static int net_cache_del(struct net_context *c, int argc, const char **argv) const char *keystr = argv[0]; if (argc < 1 || c->display_usage) { - d_printf(_("\nUsage: net cache del <key string>\n")); + d_printf("\n",_("Usage:"), _(" net cache del <key string>\n")); return -1; } @@ -220,7 +221,7 @@ static int net_cache_get(struct net_context *c, int argc, const char **argv) time_t timeout; -- Samba Shared Repository