Index: vendor.c
===================================================================
--- vendor.c	(revision 23708)
+++ vendor.c	(revision 23709)
@@ -49,7 +49,6 @@
 #include "hid_cfg.h"
 #include "vendor_conf.h"
 #include "compat_misc.h"
-#include "compat_nls.h"
 #include "obj_pstk_inlines.h"
 #include "event.h"
 #include "macro.h"
@@ -146,11 +145,11 @@
 	PCB_ACT_MAY_CONVARG(1, FGW_STR, LoadVendorFrom, fname = argv[1].val.str);
 
 	if (!fname || !*fname) {
-		fname = pcb_gui->fileselect(_("Load Vendor Resource File..."),
-														_("Picks a vendor resource file to load.\n"
+		fname = pcb_gui->fileselect("Load Vendor Resource File...",
+														"Picks a vendor resource file to load.\n"
 															"This file can contain drc settings for a\n"
 															"particular vendor as well as a list of\n"
-															"predefined drills which are allowed."), default_file, ".res", "vendor", PCB_HID_FSD_READ, NULL);
+															"predefined drills which are allowed.", default_file, ".res", "vendor", PCB_HID_FSD_READ, NULL);
 		if (fname == NULL) {
 			PCB_ACT_IRES(1);
 			return 0;
@@ -170,7 +169,7 @@
 	/* load the resource file */
 	doc = pcb_hid_cfg_load_lht(fname);
 	if (doc == NULL) {
-		pcb_message(PCB_MSG_ERROR, _("Could not load vendor resource file \"%s\"\n"), fname);
+		pcb_message(PCB_MSG_ERROR, "Could not load vendor resource file \"%s\"\n", fname);
 		PCB_ACT_IRES(1);
 		return 0;
 	}
@@ -208,7 +207,7 @@
 			rounding_method = CLOSEST;
 		}
 		else {
-			pcb_message(PCB_MSG_ERROR, _("\"%s\" is not a valid rounding type.  Defaulting to up\n"), sval);
+			pcb_message(PCB_MSG_ERROR, "\"%s\" is not a valid rounding type.  Defaulting to up\n", sval);
 			rounding_method = ROUND_UP;
 		}
 	}
@@ -228,49 +227,49 @@
 			}
 		}
 		else
-			pcb_message(PCB_MSG_ERROR, _("Broken drillmap: /drillmap should be a list\n"));
+			pcb_message(PCB_MSG_ERROR, "Broken drillmap: /drillmap should be a list\n");
 	}
 	else
-		pcb_message(PCB_MSG_ERROR, _("No drillmap resource found\n"));
+		pcb_message(PCB_MSG_ERROR, "No drillmap resource found\n");
 
 	sval = pcb_hid_cfg_text_value(doc, "/drc/copper_space");
 	if (sval != NULL) {
 		load_meta_coord("design/bloat", floor(sf * atof(sval) + 0.5));
-		pcb_message(PCB_MSG_INFO, _("Set DRC minimum copper spacing to %ml mils\n"), conf_core.design.bloat);
+		pcb_message(PCB_MSG_INFO, "Set DRC minimum copper spacing to %ml mils\n", conf_core.design.bloat);
 	}
 
 	sval = pcb_hid_cfg_text_value(doc, "/drc/copper_overlap");
 	if (sval != NULL) {
 		load_meta_coord("design/shrink", floor(sf * atof(sval) + 0.5));
-		pcb_message(PCB_MSG_INFO, _("Set DRC minimum copper overlap to %ml mils\n"), conf_core.design.shrink);
+		pcb_message(PCB_MSG_INFO, "Set DRC minimum copper overlap to %ml mils\n", conf_core.design.shrink);
 	}
 
 	sval = pcb_hid_cfg_text_value(doc, "/drc/copper_width");
 	if (sval != NULL) {
 		load_meta_coord("design/min_wid", floor(sf * atof(sval) + 0.5));
-		pcb_message(PCB_MSG_INFO, _("Set DRC minimum copper spacing to %ml mils\n"), conf_core.design.min_wid);
+		pcb_message(PCB_MSG_INFO, "Set DRC minimum copper spacing to %ml mils\n", conf_core.design.min_wid);
 	}
 
 	sval = pcb_hid_cfg_text_value(doc, "/drc/silk_width");
 	if (sval != NULL) {
 		load_meta_coord("design/min_slk", floor(sf * atof(sval) + 0.5));
-		pcb_message(PCB_MSG_INFO, _("Set DRC minimum silk width to %ml mils\n"), conf_core.design.min_slk);
+		pcb_message(PCB_MSG_INFO, "Set DRC minimum silk width to %ml mils\n", conf_core.design.min_slk);
 	}
 
 	sval = pcb_hid_cfg_text_value(doc, "/drc/min_drill");
 	if (sval != NULL) {
 		load_meta_coord("design/min_drill", floor(sf * atof(sval) + 0.5));
-		pcb_message(PCB_MSG_INFO, _("Set DRC minimum drill diameter to %ml mils\n"), conf_core.design.min_drill);
+		pcb_message(PCB_MSG_INFO, "Set DRC minimum drill diameter to %ml mils\n", conf_core.design.min_drill);
 	}
 
 	sval = pcb_hid_cfg_text_value(doc, "/drc/min_ring");
 	if (sval != NULL) {
 		load_meta_coord("design/min_ring", floor(sf * atof(sval) + 0.5));
-		pcb_message(PCB_MSG_INFO, _("Set DRC minimum annular ring to %ml mils\n"), conf_core.design.min_ring);
+		pcb_message(PCB_MSG_INFO, "Set DRC minimum annular ring to %ml mils\n", conf_core.design.min_ring);
 	}
 
-	pcb_message(PCB_MSG_INFO, _("Loaded %d vendor drills from %s\n"), n_vendor_drills, fname);
-	pcb_message(PCB_MSG_INFO, _("Loaded %d RefDes skips, %d Value skips, %d Descr skips\n"), n_refdes, n_value, n_descr);
+	pcb_message(PCB_MSG_INFO, "Loaded %d vendor drills from %s\n", n_vendor_drills, fname);
+	pcb_message(PCB_MSG_INFO, "Loaded %d RefDes skips, %d Value skips, %d Descr skips\n", n_refdes, n_value, n_descr);
 
 	conf_set(CFR_DESIGN, "plugins/vendor/enable", -1, "0", POL_OVERWRITE);
 
@@ -297,10 +296,10 @@
 		if (pcb_chg_obj_2nd_size(PCB_OBJ_PSTK, pstk, pstk, pstk, target, pcb_true, pcb_false))
 			res = 1;
 		else {
-			pcb_message(PCB_MSG_WARNING, _
-				("Padstack at %ml, %ml not changed.  Possible reasons:\n"
+			pcb_message(PCB_MSG_WARNING,
+				"Padstack at %ml, %ml not changed.  Possible reasons:\n"
 				 "\t- pad size too small\n"
-				 "\t- new size would be too large or too small\n"), pstk->x, pstk->y);
+				 "\t- new size would be too large or too small\n", pstk->x, pstk->y);
 		}
 	}
 	return res;
@@ -342,13 +341,13 @@
 		}
 		PCB_END_LOOP;
 
-		pcb_message(PCB_MSG_INFO, _("Updated %ld drill sizes out of %ld total\n"), (long)changed, (long)tot);
+		pcb_message(PCB_MSG_INFO, "Updated %ld drill sizes out of %ld total\n", (long)changed, (long)tot);
 
 		/* Update the current Via */
 		if (conf_core.design.via_drilling_hole != vendorDrillMap(conf_core.design.via_drilling_hole)) {
 			changed++;
 			conf_setf(CFR_DESIGN, "design/via_drilling_hole", -1, "%$mm", vendorDrillMap(conf_core.design.via_drilling_hole));
-			pcb_message(PCB_MSG_INFO, _("Adjusted active via hole size to be %ml mils\n"), conf_core.design.via_drilling_hole);
+			pcb_message(PCB_MSG_INFO, "Adjusted active via hole size to be %ml mils\n", conf_core.design.via_drilling_hole);
 		}
 
 		/* and update the vias for the various routing styles */
@@ -356,13 +355,13 @@
 			if (PCB->RouteStyle.array[i].Hole != vendorDrillMap(PCB->RouteStyle.array[i].Hole)) {
 				changed++;
 				PCB->RouteStyle.array[i].Hole = vendorDrillMap(PCB->RouteStyle.array[i].Hole);
-				pcb_message(PCB_MSG_INFO, _
-								("Adjusted %s routing style hole size to be %ml mils\n"),
+				pcb_message(PCB_MSG_INFO,
+								"Adjusted %s routing style hole size to be %ml mils\n",
 								PCB->RouteStyle.array[i].name, PCB->RouteStyle.array[i].Hole);
 				if (PCB->RouteStyle.array[i].Diameter < PCB->RouteStyle.array[i].Hole + PCB_MIN_PINORVIACOPPER) {
 					PCB->RouteStyle.array[i].Diameter = PCB->RouteStyle.array[i].Hole + PCB_MIN_PINORVIACOPPER;
-					pcb_message(PCB_MSG_INFO, _
-									("Increased %s routing style via diameter to %ml mils\n"),
+					pcb_message(PCB_MSG_INFO,
+									"Increased %s routing style via diameter to %ml mils\n",
 									PCB->RouteStyle.array[i].name, PCB->RouteStyle.array[i].Diameter);
 				}
 			}
@@ -407,8 +406,8 @@
 
 	/* are we larger than the largest drill? */
 	if (in > vendor_drills[n_vendor_drills - 1]) {
-		pcb_message(PCB_MSG_ERROR, _("Vendor drill list does not contain a drill >= %ml mil\n"
-							"Using %ml mil instead.\n"), in, vendor_drills[n_vendor_drills - 1]);
+		pcb_message(PCB_MSG_ERROR, "Vendor drill list does not contain a drill >= %ml mil\n"
+							"Using %ml mil instead.\n", in, vendor_drills[n_vendor_drills - 1]);
 		cached_map = vendor_drills[n_vendor_drills - 1];
 		return vendor_drills[n_vendor_drills - 1];
 	}
@@ -546,7 +545,7 @@
 	for (i = 0; i < n_refdes; i++) {
 		if ((PCB_NSTRCMP(PCB_UNKNOWN(subc->refdes), ignore_refdes[i]) == 0)
 				|| rematch(ignore_refdes[i], PCB_UNKNOWN(subc->refdes))) {
-			pcb_message(PCB_MSG_INFO, _("Vendor mapping skipped because refdes = %s matches %s\n"), PCB_UNKNOWN(subc->refdes), ignore_refdes[i]);
+			pcb_message(PCB_MSG_INFO, "Vendor mapping skipped because refdes = %s matches %s\n", PCB_UNKNOWN(subc->refdes), ignore_refdes[i]);
 			noskip = 0;
 		}
 	}
@@ -555,7 +554,7 @@
 		for (i = 0; i < n_value; i++) {
 			if ((PCB_NSTRCMP(PCB_UNKNOWN(vl), ignore_value[i]) == 0)
 					|| rematch(ignore_value[i], PCB_UNKNOWN(vl))) {
-				pcb_message(PCB_MSG_INFO, _("Vendor mapping skipped because value = %s matches %s\n"), PCB_UNKNOWN(vl), ignore_value[i]);
+				pcb_message(PCB_MSG_INFO, "Vendor mapping skipped because value = %s matches %s\n", PCB_UNKNOWN(vl), ignore_value[i]);
 				noskip = 0;
 			}
 		}
@@ -566,8 +565,8 @@
 		for (i = 0; i < n_descr; i++) {
 			if ((PCB_NSTRCMP(PCB_UNKNOWN(fp), ignore_descr[i]) == 0)
 					|| rematch(ignore_descr[i], PCB_UNKNOWN(fp))) {
-				pcb_message(PCB_MSG_INFO, _
-								("Vendor mapping skipped because descr = %s matches %s\n"),
+				pcb_message(PCB_MSG_INFO,
+								"Vendor mapping skipped because descr = %s matches %s\n",
 								PCB_UNKNOWN(fp), ignore_descr[i]);
 				noskip = 0;
 			}
@@ -575,7 +574,7 @@
 	}
 
 	if (noskip && PCB_FLAG_TEST(PCB_FLAG_LOCK, subc)) {
-		pcb_message(PCB_MSG_INFO, _("Vendor mapping skipped because element %s is locked\n"), PCB_UNKNOWN(subc->refdes));
+		pcb_message(PCB_MSG_INFO, "Vendor mapping skipped because element %s is locked\n", PCB_UNKNOWN(subc->refdes));
 		noskip = 0;
 	}
 
@@ -593,7 +592,7 @@
 	/* compile the regular expression */
 	regex = re_sei_comp(re);
 	if (re_sei_errno(regex) != 0) {
-		pcb_message(PCB_MSG_ERROR, _("regexp error: %s\n"), re_error_str(re_sei_errno(regex)));
+		pcb_message(PCB_MSG_ERROR, "regexp error: %s\n", re_error_str(re_sei_errno(regex)));
 		re_sei_free(regex);
 		return pcb_false;
 	}