Attachment 160 Details for Bug 413 – patch to update the calling _( )

[patch] patch to update the calling _( )

bug413-1.patch (text/plain), 21.68 KB, created by TAKAHASHI Motonobu on 2003-09-22 13:18:53 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: TAKAHASHI Motonobu

Created: 2003-09-22 13:18:53 UTC

Size: 21.68 KB

patch

obsolete

>--- web/swat.c.org	Thu Aug 28 00:27:16 2003
>+++ web/swat.c	Tue Sep 23 03:41:54 2003
>@@ -261,7 +261,7 @@
> 		break;
> 
> 	case P_INTEGER:
>-		d_printf("<input type=text size=8 name=\"parm_%s\" value=%d>", make_parm_name(parm->label), *(int *)ptr);
>+		d_printf("<input type=text size=8 name=\"parm_%s\" value=\"%d\">", make_parm_name(parm->label), *(int *)ptr);
> 		d_printf("<input type=button value=\"%s\" onClick=\"swatform.parm_%s.value=\'%d\'\">",
> 			_("Set Default"), make_parm_name(parm->label),(int)(parm->def.ivalue));
> 		break;
>@@ -519,10 +519,10 @@
>  ****************************************************************************/
> static void ViewModeBoxes(int mode)
> {
>-	d_printf("<p>%s\n", _("Current View Is:&nbsp \n"));
>-	d_printf("<input type=radio name=\"ViewMode\" value=0 %s>Basic\n", (mode == 0) ? "checked" : "");
>-	d_printf("<input type=radio name=\"ViewMode\" value=1 %s>Advanced\n", (mode == 1) ? "checked" : "");
>-	d_printf("<br>%s\n", _("Change View To:&nbsp"));
>+	d_printf("<p>%s:&nbsp;\n", _("Current View Is"));
>+	d_printf("<input type=radio name=\"ViewMode\" value=0 %s>%s\n", ((mode == 0) ? "checked" : ""), _("Basic"));
>+	d_printf("<input type=radio name=\"ViewMode\" value=1 %s>%s\n", ((mode == 1) ? "checked" : ""), _("Advanced"));
>+	d_printf("<br>%s:&nbsp;\n", _("Change View To"));
> 	d_printf("<input type=submit name=\"BasicMode\" value=\"%s\">\n", _("Basic"));
> 	d_printf("<input type=submit name=\"AdvMode\" value=\"%s\">\n", _("Advanced"));
> 	d_printf("</p><br>\n");
>@@ -572,7 +572,7 @@
> 	/* Here we first set and commit all the parameters that were selected
>  	   in the previous screen. */
> 
>-	d_printf("<H2>Wizard Parameter Edit Page</H2>\n");
>+	d_printf("<H2>%s</H2>\n", _("Wizard Parameter Edit Page"));
> 
> 	if (cgi_variable("Commit")) {
> 		commit_parameters(GLOBAL_SECTION_SNUM);
>@@ -601,7 +601,7 @@
> {
> 	commit_parameters(GLOBAL_SECTION_SNUM);
> 	save_reload(0);
>-	d_printf("<H2>Note: smb.conf %s</H2>\n", _("file has been read and rewritten"));
>+	d_printf("<H2>%s</H2>\n", _("Note: smb.conf file has been read and rewritten"));
> }
> 
> /****************************************************************************
>@@ -709,35 +709,36 @@
> 	role = lp_server_role();
> 	
> 	/* Here we go ... */
>-	d_printf("<H2>Samba Configuration Wizard</H2>\n");
>+	d_printf("<H2>%s</H2>\n", _("Samba Configuration Wizard"));
> 	d_printf("<form method=post action=wizard>\n");
> 
> 	if (have_write_access) {
>-		d_printf(_("The \"Rewrite smb.conf file\" button will clear the smb.conf file of all default values and of comments.\n"));
>-		d_printf(_("The same will happen if you press the commit button."));
>+		d_printf(_("The \"Rewrite smb.conf file\" button will clear the smb.conf file of all default values and of comments.<br>\n"));
>+		d_printf("%s", _("The same will happen if you press the commit button."));
> 		d_printf("<br><br>");
> 		d_printf("<center>");
>-		d_printf("<input type=submit name=\"Rewrite\" value=%s> &nbsp;&nbsp;",_("Rewrite smb.conf file"));
>-		d_printf("<input type=submit name=\"Commit\" value=%s> &nbsp;&nbsp;",_("Commit"));
>-		d_printf("<input type=submit name=\"GetWizardParams\" value=%s>", _("Edit Parameter Values"));
>-		d_printf("</center>");
>+		d_printf("<input type=submit name=\"Rewrite\" value=\"%s\"> &nbsp;&nbsp;",_("Rewrite smb.conf file"));
>+		d_printf("<input type=submit name=\"Commit\" value=\"%s\"> &nbsp;&nbsp;",_("Commit"));
>+		d_printf("<input type=submit name=\"GetWizardParams\" value=\"%s\">", _("Edit Parameter Values"));
>+		d_printf("</center>\n");
> 	}
> 
> 	d_printf("<hr>");
> 	d_printf("<center><table border=0>");
>-	d_printf("<tr><td><b>%s</b></td>\n", "Server Type:&nbsp;");
>-	d_printf("<td><input type=radio name=\"ServerType\" value=0 %s> Stand Alone&nbsp;</td>", (role == ROLE_STANDALONE) ? "checked" : "");
>-	d_printf("<td><input type=radio name=\"ServerType\" value=1 %s> Domain Member&nbsp;</td>", (role == ROLE_DOMAIN_MEMBER) ? "checked" : ""); 
>-	d_printf("<td><input type=radio name=\"ServerType\" value=2 %s> Domain Controller&nbsp;</td>", (role == ROLE_DOMAIN_PDC) ? "checked" : "");
>-	d_printf("</tr>");
>+	d_printf("<tr><td><b>%s:&nbsp;</b></td>\n", _("Server Type"));
>+	d_printf("<td><input type=radio name=\"ServerType\" value=0 %s> %s&nbsp;</td>", ((role == ROLE_STANDALONE) ? "checked" : ""), _("Stand Alone"));
>+	d_printf("<td><input type=radio name=\"ServerType\" value=1 %s> %s&nbsp;</td>", ((role == ROLE_DOMAIN_MEMBER) ? "checked" : ""), _("Domain Member")); 
>+	d_printf("<td><input type=radio name=\"ServerType\" value=2 %s> %s&nbsp;</td>", ((role == ROLE_DOMAIN_PDC) ? "checked" : ""), _("Domain Controller"));
>+	d_printf("</tr>\n");
> 	if (role == ROLE_DOMAIN_BDC) {
>-		d_printf("<tr><td></td><td colspan=3><font color=\"#ff0000\">Unusual Type in smb.conf - Please Select New Mode</font></td></tr>");
>+		d_printf("<tr><td></td><td colspan=3><font color=\"#ff0000\">%s</font></td></tr>\n", _("Unusual Type in smb.conf - Please Select New Mode"));
> 	}
>-	d_printf("<tr><td><b>%s</b></td>\n", "Configure WINS As:&nbsp;");
>-	d_printf("<td><input type=radio name=\"WINSType\" value=0 %s> Not Used&nbsp;</td>", (winstype == 0) ? "checked" : "");
>-	d_printf("<td><input type=radio name=\"WINSType\" value=1 %s> Server for client use&nbsp;</td>", (winstype == 1) ? "checked" : "");
>-	d_printf("<td><input type=radio name=\"WINSType\" value=2 %s> Client of another WINS server&nbsp;</td>", (winstype == 2) ? "checked" : "");
>-	d_printf("<tr><td></td><td></td><td></td><td>Remote WINS Server&nbsp;<input type=text size=\"16\" name=\"WINSAddr\" value=\"");
>+	d_printf("<tr><td><b>%s:&nbsp;</b></td>\n", _("Configure WINS As"));
>+	d_printf("<td><input type=radio name=\"WINSType\" value=\"0\" %s> %s&nbsp;</td>", ((winstype == 0) ? "checked" : ""), _("Not Used"));
>+	d_printf("<td><input type=radio name=\"WINSType\" value=\"1\" %s> %s&nbsp;</td>", ((winstype == 1) ? "checked" : ""), _("Server for client use"));
>+	d_printf("<td><input type=radio name=\"WINSType\" value=\"2\" %s> %s&nbsp;</td>", ((winstype == 2) ? "checked" : ""), _("Client of another WINS server"));
>+	d_printf("</tr>\n");
>+	d_printf("<tr><td></td><td></td><td></td><td>%s&nbsp;<input type=text size=\"16\" name=\"WINSAddr\" value=\"", _("Remote WINS Server"));
> 	
> 	/* Print out the list of wins servers */
> 	if(lp_wins_server_list()) {
>@@ -746,28 +747,28 @@
> 		for(i = 0; wins_servers[i]; i++) d_printf("%s ", wins_servers[i]);
> 	}
> 	
>-	d_printf("\"></td></tr>");
>+	d_printf("\"></td></tr>\n");
> 	if (winstype == 3) {
>-		d_printf("<tr><td></td><td colspan=3><font color=\"#ff0000\">Error: WINS Server Mode and WINS Support both set in smb.conf</font></td></tr>");
>-		d_printf("<tr><td></td><td colspan=3><font color=\"#ff0000\">Please Select desired WINS mode above.</font></td></tr>");
>+		d_printf("<tr><td></td><td colspan=3><font color=\"#ff0000\">%s</font></td></tr>\n", _("Error: WINS Server Mode and WINS Support both set in smb.conf"));
>+		d_printf("<tr><td></td><td colspan=3><font color=\"#ff0000\">%s</font></td></tr>\n", _("Please Select desired WINS mode above."));
> 	}
>-	d_printf("</tr>");
>-	d_printf("<tr><td><b>%s</b></td>\n","Expose Home Directories:&nbsp;");
>-	d_printf("<td><input type=radio name=\"HomeExpo\" value=1 %s> Yes</td>", (have_home == -1) ? "" : "checked ");
>-	d_printf("<td><input type=radio name=\"HomeExpo\" value=0 %s> No</td>", (have_home == -1 ) ? "checked" : "");
>-	d_printf("<td></td></tr>");
>+	d_printf("</tr>\n");
>+	d_printf("<tr><td><b>%s:&nbsp;</b></td>\n", _("Expose Home Directories"));
>+	d_printf("<td><input type=radio name=\"HomeExpo\" value=\"1\" %s> Yes</td>", (have_home == -1) ? "" : "checked ");
>+	d_printf("<td><input type=radio name=\"HomeExpo\" value=\"0\" %s> No</td>", (have_home == -1 ) ? "checked" : "");
>+	d_printf("<td></td></tr>\n");
> 	
> 	/* Enable this when we are ready ....
>-	 * d_printf("<tr><td><b>%s</b></td>\n","Is Print Server:&nbsp;");
>-	 * d_printf("<td><input type=radio name=\"PtrSvr\" value=1 %s> Yes</td>");
>-	 * d_printf("<td><input type=radio name=\"PtrSvr\" value=0 %s> No</td>");
>-	 * d_printf("<td></td></tr>");
>+	 * d_printf("<tr><td><b>%s:&nbsp;</b></td>\n", _("Is Print Server"));
>+	 * d_printf("<td><input type=radio name=\"PtrSvr\" value=\"1\" %s> Yes</td>");
>+	 * d_printf("<td><input type=radio name=\"PtrSvr\" value=\"0\" %s> No</td>");
>+	 * d_printf("<td></td></tr>\n");
> 	 */
> 	
> 	d_printf("</table></center>");
> 	d_printf("<hr>");
> 
>-	d_printf(_("The above configuration options will set multiple parameters and will generally assist with rapid Samba deployment.\n"));
>+	d_printf("%s%s\n", _("The above configuration options will set multiple parameters"), _("and will generally assist with rapid Samba deployment."));
> 	d_printf("</form>\n");
> }
> 
>@@ -937,7 +938,7 @@
> 	pstring msg_str;
> 
> 	if (demo_mode) {
>-		d_printf("%s<p>", _("password change in demo mode rejected\n"));
>+		d_printf("%s\n<p>", _("password change in demo mode rejected"));
> 		return False;
> 	}
> 	
>@@ -976,7 +977,7 @@
> 
> 	/* Make sure users name has been specified */
> 	if (strlen(cgi_variable(SWAT_USER)) == 0) {
>-		d_printf("<p>%s", _(" Must specify \"User Name\" \n"));
>+		d_printf("<p>%s\n", _(" Must specify \"User Name\" "));
> 		return;
> 	}
> 
>@@ -992,26 +993,26 @@
> 		 */
> 		if (((!am_root()) && (strlen( cgi_variable(OLD_PSWD)) <= 0)) ||
> 		    ((cgi_variable(CHG_R_PASSWD_FLAG)) &&  (strlen( cgi_variable(OLD_PSWD)) <= 0))) {
>-			d_printf("<p>%s", _(" Must specify \"Old Password\" \n"));
>+			d_printf("<p>%s\n", _(" Must specify \"Old Password\" "));
> 			return;
> 		}
> 
> 		/* If changing a users password on a remote hosts we have to know what host */
> 		if ((cgi_variable(CHG_R_PASSWD_FLAG)) && (strlen( cgi_variable(RHOST)) <= 0)) {
>-			d_printf("<p>%s", _(" Must specify \"Remote Machine\" \n"));
>+			d_printf("<p>%s\n", _(" Must specify \"Remote Machine\" "));
> 			return;
> 		}
> 
> 		/* Make sure new passwords have been specified */
> 		if ((strlen( cgi_variable(NEW_PSWD)) <= 0) ||
> 		    (strlen( cgi_variable(NEW2_PSWD)) <= 0)) {
>-			d_printf("<p>%s", _(" Must specify \"New, and Re-typed Passwords\" \n"));
>+			d_printf("<p>%s\n", _(" Must specify \"New, and Re-typed Passwords\" "));
> 			return;
> 		}
> 
> 		/* Make sure new passwords was typed correctly twice */
> 		if (strcmp(cgi_variable(NEW_PSWD), cgi_variable(NEW2_PSWD)) != 0) {
>-			d_printf("<p>%s", _(" Re-typed password didn't match new password\n"));
>+			d_printf("<p>%s\n", _(" Re-typed password didn't match new password"));
> 			return;
> 		}
> 	}
>@@ -1176,7 +1177,7 @@
>         d_printf(_("Printer names marked with [*] in the Choose Printer drop-down box "));
>         d_printf(_("are autoloaded printers from "));
>         d_printf("<A HREF=\"/swat/help/smb.conf.5.html#printcapname\" target=\"docs\">%s</A>\n", _("Printcap Name"));
>-        d_printf(_("Attempting to delete these printers from SWAT will have no effect.\n"));
>+        d_printf("%s\n", _("Attempting to delete these printers from SWAT will have no effect."));
> 
> 	if (cgi_variable("Commit") && snum >= 0) {
> 		commit_parameters(snum);
>@@ -1222,8 +1223,8 @@
> 			break;
> 	}
> 	d_printf("<table>\n");
>-	d_printf("<tr><td><input type=submit name=selectshare value=\"%s\"></td>\n", _("Choose Printer"));
>-	d_printf("<td><select name=share>\n");
>+	d_printf("<tr><td><input type=submit name=\"selectshare\" value=\"%s\"></td>\n", _("Choose Printer"));
>+	d_printf("<td><select name=\"share\">\n");
> 	if (snum < 0 || !lp_print_ok(snum))
> 		d_printf("<option value=\" \"> \n");
> 	for (i=0;i<lp_numservices();i++) {
>@@ -1248,8 +1249,8 @@
> 
> 	if (have_write_access) {
> 		d_printf("<table>\n");
>-		d_printf("<tr><td><input type=submit name=createshare value=\"%s\"></td>\n", _("Create Printer"));
>-		d_printf("<td><input type=text size=30 name=newshare></td></tr>\n");
>+		d_printf("<tr><td><input type=submit name=\"createshare\" value=\"%s\"></td>\n", _("Create Printer"));
>+		d_printf("<td><input type=text size=30 name=\"newshare\"></td></tr>\n");
> 		d_printf("</table>");
> 	}
> 
>--- web/statuspage.c.org	Thu Aug 28 00:27:16 2003
>+++ web/statuspage.c	Tue Sep 23 02:37:49 2003
>@@ -120,9 +120,9 @@
> 
> 	d_printf("<td>");
> 	switch (e->share_mode&0xF) {
>-	case 0: d_printf("RDONLY     "); break;
>-	case 1: d_printf("WRONLY     "); break;
>-	case 2: d_printf("RDWR       "); break;
>+	case 0: d_printf("%s", _("RDONLY     ")); break;
>+	case 1: d_printf("%s", _("WRONLY     ")); break;
>+	case 2: d_printf("%s", _("RDWR       ")); break;
> 	}
> 	d_printf("</td>");
> 
>@@ -297,6 +297,10 @@
> 		PID_or_Machine = 1;
> 	}
> 
>+	if (cgi_variable("show_pid_in_col_1")) {
>+		PID_or_Machine = 0;
>+	}
>+
> 	tdb = tdb_open_log(lock_path("connections.tdb"), 0, TDB_DEFAULT, O_RDONLY, 0);
> 	if (tdb) tdb_traverse(tdb, traverse_fn1, NULL);
>  
>@@ -307,14 +311,14 @@
> 	d_printf("<FORM method=post>\n");
> 
> 	if (!autorefresh) {
>-		d_printf("<input type=submit value=\"%s\" name=autorefresh>\n", _("Auto Refresh"));
>+		d_printf("<input type=submit value=\"%s\" name=\"autorefresh\">\n", _("Auto Refresh"));
> 		d_printf("<br>%s", _("Refresh Interval: "));
>-		d_printf("<input type=text size=2 name=\"refresh_interval\" value=%d>\n", 
>+		d_printf("<input type=text size=2 name=\"refresh_interval\" value=\"%d\">\n", 
> 		       refresh_interval);
> 	} else {
>-		d_printf("<input type=submit value=\"%s\" name=norefresh>\n", _("Stop Refreshing"));
>+		d_printf("<input type=submit value=\"%s\" name=\"norefresh\">\n", _("Stop Refreshing"));
> 		d_printf("<br>%s%d\n", _("Refresh Interval: "), refresh_interval);
>-		d_printf("<input type=hidden name=refresh value=1>\n");
>+		d_printf("<input type=hidden name=\"refresh\" value=\"1\">\n");
> 	}
> 
> 	d_printf("<p>\n");
>@@ -418,8 +422,8 @@
> 
> 	if (tdb) tdb_close(tdb);
> 
>-	d_printf("<br><input type=submit name=\"show_client_in_col_1\" value=\"Show Client in col 1\">\n");
>-	d_printf("<input type=submit name=\"show_pid_in_col_1\" value=\"Show PID in col 1\">\n");
>+	d_printf("<br><input type=submit name=\"show_client_in_col_1\" value=\"%s\">\n", _("Show Client in col 1"));
>+	d_printf("<input type=submit name=\"show_pid_in_col_1\" value=\"%s\">\n", _("Show PID in col 1"));
> 
> 	d_printf("</FORM>\n");
> 
>--- include/intl.h.org	Tue Sep 23 04:09:39 2003
>+++ include/intl.h	Tue Sep 23 04:09:20 2003
>@@ -22,3 +22,4 @@
> /* ideally we would have a static mapping, but that precludes
>    dynamic loading. This is a reasonable compromise */
> #define _(x) lang_msg_rotate(x)
>+#define N_(x) (x)
>--- param/loadparm.c.org	Sat Sep 13 16:20:42 2003
>+++ param/loadparm.c	Tue Sep 23 04:10:24 2003
>@@ -750,7 +750,7 @@
>  */
> 
> static struct parm_struct parm_table[] = {
>-	{"Base Options", P_SEP, P_SEPARATOR}, 
>+	{N_("Base Options"), P_SEP, P_SEPARATOR}, 
> 
> 	{"dos charset", P_STRING, P_GLOBAL, &Globals.dos_charset, handle_charset, NULL, FLAG_ADVANCED}, 
> 	{"unix charset", P_STRING, P_GLOBAL, &Globals.unix_charset, handle_charset, NULL, FLAG_ADVANCED}, 
>@@ -769,7 +769,7 @@
> 	{"interfaces", P_LIST, P_GLOBAL, &Globals.szInterfaces, NULL, NULL, FLAG_BASIC | FLAG_ADVANCED | FLAG_WIZARD}, 
> 	{"bind interfaces only", P_BOOL, P_GLOBAL, &Globals.bBindInterfacesOnly, NULL, NULL, FLAG_ADVANCED | FLAG_WIZARD}, 
> 
>-	{"Security Options", P_SEP, P_SEPARATOR}, 
>+	{N_("Security Options"), P_SEP, P_SEPARATOR}, 
> 
> 	{"security", P_ENUM, P_GLOBAL, &Globals.security, NULL, enum_security, FLAG_BASIC | FLAG_ADVANCED | FLAG_WIZARD}, 
> 	{"auth methods", P_LIST, P_GLOBAL, &Globals.AuthMethods, NULL, NULL, FLAG_ADVANCED}, 
>@@ -853,7 +853,7 @@
> 	{"deny hosts", P_LIST, P_LOCAL, &sDefault.szHostsdeny, NULL, NULL, FLAG_HIDE}, 
> 	{"preload modules", P_LIST, P_GLOBAL, &Globals.szPreloadModules, NULL, NULL, FLAG_ADVANCED | FLAG_GLOBAL}, 
> 
>-	{"Logging Options", P_SEP, P_SEPARATOR}, 
>+	{N_("Logging Options"), P_SEP, P_SEPARATOR}, 
> 
> 	{"log level", P_STRING, P_GLOBAL, &Globals.szLogLevel, handle_debug_list, NULL, FLAG_ADVANCED}, 
> 	{"debuglevel", P_STRING, P_GLOBAL, &Globals.szLogLevel, handle_debug_list, NULL, FLAG_HIDE}, 
>@@ -868,7 +868,7 @@
> 	{"debug pid", P_BOOL, P_GLOBAL, &Globals.bDebugPid, NULL, NULL, FLAG_ADVANCED}, 
> 	{"debug uid", P_BOOL, P_GLOBAL, &Globals.bDebugUid, NULL, NULL, FLAG_ADVANCED}, 
> 
>-	{"Protocol Options", P_SEP, P_SEPARATOR}, 
>+	{N_("Protocol Options"), P_SEP, P_SEPARATOR}, 
> 
> 	{"smb ports", P_STRING, P_GLOBAL, &Globals.smb_ports, NULL, NULL, FLAG_ADVANCED}, 
> 	{"protocol", P_ENUM, P_GLOBAL, &Globals.maxprotocol, NULL, enum_protocol, FLAG_ADVANCED}, 
>@@ -904,7 +904,7 @@
> 	{"server signing", P_ENUM, P_GLOBAL, &Globals.server_signing, NULL, enum_smb_signing_vals, FLAG_ADVANCED}, 
> 	{"client use spnego", P_BOOL, P_GLOBAL, &Globals.bClientUseSpnego, NULL, NULL, FLAG_ADVANCED}, 
> 
>-	{"Tuning Options", P_SEP, P_SEPARATOR}, 
>+	{N_("Tuning Options"), P_SEP, P_SEPARATOR}, 
> 
> 	{"block size", P_INTEGER, P_LOCAL, &sDefault.iBlock_size, NULL, NULL, FLAG_ADVANCED | FLAG_SHARE | FLAG_GLOBAL}, 
> 	{"change notify timeout", P_INTEGER, P_GLOBAL, &Globals.change_notify_timeout, NULL, NULL, FLAG_ADVANCED}, 
>@@ -933,7 +933,7 @@
> 
> 	{"name cache timeout", P_INTEGER, P_GLOBAL, &Globals.name_cache_timeout, NULL, NULL, FLAG_ADVANCED}, 
> 
>-	{"Printing Options", P_SEP, P_SEPARATOR}, 
>+	{N_("Printing Options"), P_SEP, P_SEPARATOR}, 
> 
> 	{"max reported print jobs", P_INTEGER, P_LOCAL, &sDefault.iMaxReportedPrintJobs, NULL, NULL, FLAG_ADVANCED | FLAG_PRINT}, 
> 	{"max print jobs", P_INTEGER, P_LOCAL, &sDefault.iMaxPrintJobs, NULL, NULL, FLAG_ADVANCED | FLAG_PRINT}, 
>@@ -963,7 +963,7 @@
> 	{"use client driver", P_BOOL, P_LOCAL, &sDefault.bUseClientDriver, NULL, NULL, FLAG_ADVANCED | FLAG_PRINT}, 
> 	{"default devmode", P_BOOL, P_LOCAL, &sDefault.bDefaultDevmode, NULL, NULL, FLAG_ADVANCED | FLAG_PRINT}, 
> 
>-	{"Filename Handling", P_SEP, P_SEPARATOR}, 
>+	{N_("Filename Handling"), P_SEP, P_SEPARATOR}, 
> 	{"mangling method", P_STRING, P_GLOBAL, &Globals.szManglingMethod, NULL, NULL, FLAG_ADVANCED}, 
> 	{"mangle prefix", P_INTEGER, P_GLOBAL, &Globals.mangle_prefix, NULL, NULL, FLAG_ADVANCED}, 
> 
>@@ -990,11 +990,11 @@
> 	{"mangled map", P_STRING, P_LOCAL, &sDefault.szMangledMap, NULL, NULL, FLAG_ADVANCED | FLAG_SHARE | FLAG_GLOBAL}, 
> 	{"stat cache", P_BOOL, P_GLOBAL, &Globals.bStatCache, NULL, NULL, FLAG_ADVANCED}, 
> 
>-	{"Domain Options", P_SEP, P_SEPARATOR}, 
>+	{N_("Domain Options"), P_SEP, P_SEPARATOR}, 
> 
> 	{"machine password timeout", P_INTEGER, P_GLOBAL, &Globals.machine_password_timeout, NULL, NULL, FLAG_ADVANCED | FLAG_WIZARD}, 
> 
>-	{"Logon Options", P_SEP, P_SEPARATOR}, 
>+	{N_("Logon Options"), P_SEP, P_SEPARATOR}, 
> 
> 	{"add user script", P_STRING, P_GLOBAL, &Globals.szAddUserScript, NULL, NULL, FLAG_ADVANCED}, 
> 	{"delete user script", P_STRING, P_GLOBAL, &Globals.szDelUserScript, NULL, NULL, FLAG_ADVANCED}, 
>@@ -1013,7 +1013,7 @@
> 	{"logon home", P_STRING, P_GLOBAL, &Globals.szLogonHome, NULL, NULL, FLAG_ADVANCED}, 
> 	{"domain logons", P_BOOL, P_GLOBAL, &Globals.bDomainLogons, NULL, NULL, FLAG_ADVANCED}, 
> 
>-	{"Browse Options", P_SEP, P_SEPARATOR}, 
>+	{N_("Browse Options"), P_SEP, P_SEPARATOR}, 
> 
> 	{"os level", P_INTEGER, P_GLOBAL, &Globals.os_level, NULL, NULL, FLAG_BASIC | FLAG_ADVANCED}, 
> 	{"lm announce", P_ENUM, P_GLOBAL, &Globals.lm_announce, NULL, enum_bool_auto, FLAG_ADVANCED}, 
>@@ -1027,7 +1027,7 @@
> 	{"browsable", P_BOOL, P_LOCAL, &sDefault.bBrowseable, NULL, NULL, FLAG_HIDE}, 
> 	{"enhanced browsing", P_BOOL, P_GLOBAL, &Globals.enhanced_browsing, NULL, NULL, FLAG_ADVANCED}, 
> 
>-	{"WINS Options", P_SEP, P_SEPARATOR}, 
>+	{N_("WINS Options"), P_SEP, P_SEPARATOR}, 
> 
> 	{"dns proxy", P_BOOL, P_GLOBAL, &Globals.bDNSproxy, NULL, NULL, FLAG_ADVANCED}, 
> 	{"wins proxy", P_BOOL, P_GLOBAL, &Globals.bWINSproxy, NULL, NULL, FLAG_ADVANCED}, 
>@@ -1037,7 +1037,7 @@
> 	{"wins hook", P_STRING, P_GLOBAL, &Globals.szWINSHook, NULL, NULL, FLAG_ADVANCED}, 
> 	{"wins partners", P_STRING, P_GLOBAL, &Globals.szWINSPartners, NULL, NULL, FLAG_ADVANCED | FLAG_WIZARD}, 
> 
>-	{"Locking Options", P_SEP, P_SEPARATOR}, 
>+	{N_("Locking Options"), P_SEP, P_SEPARATOR}, 
> 
> 	{"blocking locks", P_BOOL, P_LOCAL, &sDefault.bBlockingLocks, NULL, NULL, FLAG_ADVANCED | FLAG_SHARE | FLAG_GLOBAL}, 
> 	{"csc policy", P_ENUM, P_LOCAL, &sDefault.iCSCPolicy, NULL, enum_csc_policy, FLAG_ADVANCED | FLAG_SHARE | FLAG_GLOBAL}, 
>@@ -1055,7 +1055,7 @@
> 	{"strict locking", P_BOOL, P_LOCAL, &sDefault.bStrictLocking, NULL, NULL, FLAG_ADVANCED | FLAG_SHARE | FLAG_GLOBAL}, 
> 	{"share modes", P_BOOL, P_LOCAL,  &sDefault.bShareModes, NULL, NULL, FLAG_ADVANCED | FLAG_SHARE | FLAG_GLOBAL}, 
> 
>-	{"Ldap Options", P_SEP, P_SEPARATOR}, 
>+	{N_("Ldap Options"), P_SEP, P_SEPARATOR}, 
> 
> #ifdef WITH_LDAP_SAMCONFIG
> 	{"ldap server", P_STRING, P_GLOBAL, &Globals.szLdapServer, NULL, NULL, FLAG_ADVANCED}, 
>@@ -1072,7 +1072,7 @@
> 	{"ldap passwd sync", P_ENUM, P_GLOBAL, &Globals.ldap_passwd_sync, NULL, enum_ldap_passwd_sync, FLAG_ADVANCED}, 
> 	{"ldap delete dn", P_BOOL, P_GLOBAL, &Globals.ldap_delete_dn, NULL, NULL, FLAG_ADVANCED}, 
> 
>-	{"Miscellaneous Options", P_SEP, P_SEPARATOR}, 
>+	{N_("Miscellaneous Options"), P_SEP, P_SEPARATOR}, 
> 	{"add share command", P_STRING, P_GLOBAL, &Globals.szAddShareCommand, NULL, NULL, FLAG_ADVANCED}, 
> 	{"change share command", P_STRING, P_GLOBAL, &Globals.szChangeShareCommand, NULL, NULL, FLAG_ADVANCED}, 
> 	{"delete share command", P_STRING, P_GLOBAL, &Globals.szDeleteShareCommand, NULL, NULL, FLAG_ADVANCED}, 
>@@ -1132,7 +1132,7 @@
> 	{"panic action", P_STRING, P_GLOBAL, &Globals.szPanicAction, NULL, NULL, FLAG_ADVANCED}, 
> 	{"hide local users", P_BOOL, P_GLOBAL, &Globals.bHideLocalUsers, NULL, NULL, FLAG_ADVANCED}, 
> 
>-	{"VFS module options", P_SEP, P_SEPARATOR}, 
>+	{N_("VFS module options"), P_SEP, P_SEPARATOR}, 
> 
> 	{"vfs objects", P_LIST, P_LOCAL, &sDefault.szVfsObjects, NULL, NULL, FLAG_ADVANCED | FLAG_SHARE}, 
> 	{"vfs object", P_LIST, P_LOCAL, &sDefault.szVfsObjects, NULL, NULL, FLAG_HIDE}, 
>@@ -1142,7 +1142,7 @@
> 	{"msdfs proxy", P_STRING, P_LOCAL, &sDefault.szMSDfsProxy, NULL, NULL, FLAG_ADVANCED | FLAG_SHARE}, 
> 	{"host msdfs", P_BOOL, P_GLOBAL, &Globals.bHostMSDfs, NULL, NULL, FLAG_ADVANCED}, 
> 
>-	{"Winbind options", P_SEP, P_SEPARATOR}, 
>+	{N_("Winbind options"), P_SEP, P_SEPARATOR}, 
> 
> 	{"enable rid algorithm", P_BOOL, P_GLOBAL, &Globals.bEnableRidAlgorithm, NULL, NULL, FLAG_DEPRECATED}, 
> 	{"idmap backend", P_STRING, P_GLOBAL, &Globals.szIdmapBackend, NULL, NULL, FLAG_ADVANCED},

Actions: View

Attachments on bug 413: 159 | 160 | 176 | 179