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.

1 files changed, 48 insertions, 47 deletions

diff --git a/source3/utils/net_ads.c b/source3/utils/net_ads.c
index 8e644bb6b2..90f5ca4f8a 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;
 	}