Index: trunk/src_plugins/autoplace/action.c =================================================================== --- trunk/src_plugins/autoplace/action.c (revision 23708) +++ trunk/src_plugins/autoplace/action.c (revision 23709) @@ -36,7 +36,6 @@ #include "autoplace.h" #include "plugins.h" #include "actions.h" -#include "compat_nls.h" #include "board.h" #include "event.h" Index: trunk/src_plugins/autoplace/autoplace.c =================================================================== --- trunk/src_plugins/autoplace/autoplace.c (revision 23708) +++ trunk/src_plugins/autoplace/autoplace.c (revision 23709) @@ -52,7 +52,6 @@ #include "autoplace.h" #include "box.h" #include "compat_misc.h" -#include "compat_nls.h" #include "data.h" #include "draw.h" #include "error.h" @@ -730,7 +729,7 @@ Selected = collectSelectedSubcircuits(); if (vtp0_len(&Selected) == 0) { - pcb_message(PCB_MSG_ERROR, _("No subcircuits selected to autoplace.\n")); + pcb_message(PCB_MSG_ERROR, "No subcircuits selected to autoplace.\n"); goto done; } Index: trunk/src_plugins/autoroute/autoroute.c =================================================================== --- trunk/src_plugins/autoroute/autoroute.c (revision 23708) +++ trunk/src_plugins/autoroute/autoroute.c (revision 23709) @@ -83,7 +83,6 @@ #include "vector.h" #include "pcb-printf.h" #include "layer.h" -#include "compat_nls.h" #include #include "layer.h" @@ -4376,7 +4375,7 @@ * to route a net from a particular starting point, but perfectly * able to route it from some other. */ percent = calculate_progress(this_heap_item, this_heap_size, &ras); - request_cancel = pcb_hid_progress(percent * 100., 100, _("Autorouting tracks")); + request_cancel = pcb_hid_progress(percent * 100., 100, "Autorouting tracks"); if (request_cancel) { ras.total_nets_routed = 0; ras.conflict_subnets = 0; Index: trunk/src_plugins/fp_fs/fp_fs.c =================================================================== --- trunk/src_plugins/fp_fs/fp_fs.c (revision 23708) +++ trunk/src_plugins/fp_fs/fp_fs.c (revision 23709) @@ -44,7 +44,6 @@ #include "error.h" #include "conf.h" #include "conf_core.h" -#include "compat_nls.h" #include "macro.h" #include "safe_fs.h" @@ -122,7 +121,7 @@ /* Cache old dir, then cd into subdir because stat is given relative file names. */ memset(olddir, 0, sizeof olddir); if (pcb_get_wd(olddir) == NULL) { - pcb_message(PCB_MSG_ERROR, _("fp_fs_list(): Could not determine initial working directory\n")); + pcb_message(PCB_MSG_ERROR, "fp_fs_list(): Could not determine initial working directory\n"); return 0; } @@ -138,7 +137,7 @@ /* Determine subdir's abs path */ if (pcb_get_wd(new_subdir) == NULL) { - pcb_message(PCB_MSG_ERROR, _("fp_fs_list(): Could not determine new working directory\n")); + pcb_message(PCB_MSG_ERROR, "fp_fs_list(): Could not determine new working directory\n"); if (chdir(olddir)) pcb_chdir_error_message(olddir); return 0; Index: trunk/src_plugins/lib_gtk_hid/actions.c =================================================================== --- trunk/src_plugins/lib_gtk_hid/actions.c (revision 23708) +++ trunk/src_plugins/lib_gtk_hid/actions.c (revision 23709) @@ -37,7 +37,6 @@ #include "change.h" #include "hid_attrib.h" #include "../src/actions.h" -#include "compat_nls.h" #include "compat_misc.h" #include "../src_plugins/lib_gtk_common/act_fileio.h" Index: trunk/src_plugins/renumber/renumber.c =================================================================== --- trunk/src_plugins/renumber/renumber.c (revision 23708) +++ trunk/src_plugins/renumber/renumber.c (revision 23709) @@ -42,7 +42,6 @@ #include "actions.h" #include "conf_core.h" #include "compat_misc.h" -#include "compat_nls.h" #include "netlist2.h" #include "safe_fs.h" #include "macro.h" @@ -90,10 +89,10 @@ * We deal with the case where name already exists in this * function so the GUI doesn't need to deal with it */ - name = pcb_gui->fileselect(_("Save Renumber Annotation File As ..."), - _("Choose a file to record the renumbering to.\n" + name = pcb_gui->fileselect("Save Renumber Annotation File As ...", + "Choose a file to record the renumbering to.\n" "This file may be used to back annotate the\n" - "change to the schematics.\n"), default_file, ".eco", "eco", 0, NULL); + "change to the schematics.\n", default_file, ".eco", "eco", 0, NULL); free_name = pcb_true; } @@ -118,7 +117,7 @@ } if ((out = pcb_fopen(name, "w")) == NULL) { - pcb_message(PCB_MSG_ERROR, _("Could not open %s\n"), name); + pcb_message(PCB_MSG_ERROR, "Could not open %s\n", name); if (free_name && name) free((char*)name); PCB_ACT_IRES(1); Index: trunk/src_plugins/report/report.c =================================================================== --- trunk/src_plugins/report/report.c (revision 23708) +++ trunk/src_plugins/report/report.c (revision 23709) @@ -56,7 +56,6 @@ #include "misc_util.h" #include "report_conf.h" #include "compat_misc.h" -#include "compat_nls.h" #include "layer.h" #include "obj_term.h" #include "obj_pstk.h" @@ -398,7 +397,7 @@ } if ((report == NULL) || (*report == '\0')) { - pcb_message(PCB_MSG_INFO, _("Nothing found to report on\n")); + pcb_message(PCB_MSG_INFO, "Nothing found to report on\n"); PCB_ACT_IRES(1); return 0; } Index: trunk/src_plugins/serpentine/serpentine.c =================================================================== --- trunk/src_plugins/serpentine/serpentine.c (revision 23708) +++ trunk/src_plugins/serpentine/serpentine.c (revision 23709) @@ -47,7 +47,6 @@ #include "plugins.h" #include "actions.h" #include "serpentine_conf.h" -#include "compat_nls.h" #include "layer.h" #include "route.h" @@ -322,7 +321,7 @@ pcb_crosshair.AttachedObject.State = PCB_CH_STATE_SECOND; } else - pcb_message(PCB_MSG_WARNING, _("Serpentines can be only drawn onto a line\n")); + pcb_message(PCB_MSG_WARNING, "Serpentines can be only drawn onto a line\n"); break; case PCB_CH_STATE_SECOND: Index: trunk/src_plugins/sketch_route/sketch_route.c =================================================================== --- trunk/src_plugins/sketch_route/sketch_route.c (revision 23708) +++ trunk/src_plugins/sketch_route/sketch_route.c (revision 23709) @@ -35,7 +35,6 @@ #include "plugins.h" #include "actions.h" #include "board.h" -#include "compat_nls.h" #include "conf_core.h" #include "data.h" #include "event.h" @@ -1038,7 +1037,7 @@ pcb_crosshair.AttachedObject.State = PCB_CH_STATE_SECOND; } else - pcb_message(PCB_MSG_WARNING, _("Sketch lines can be only drawn from a terminal\n")); + pcb_message(PCB_MSG_WARNING, "Sketch lines can be only drawn from a terminal\n"); } break; @@ -1055,14 +1054,14 @@ pcb_crosshair.AttachedObject.Type = PCB_OBJ_VOID; pcb_crosshair.AttachedObject.State = PCB_CH_STATE_FIRST; } else { - pcb_message(PCB_MSG_WARNING, _("Cannot finish placing wire at this terminal\n")); - pcb_message(PCB_MSG_WARNING, _("(the terminal does not belong to the routed net or is the starting terminal)\n")); + pcb_message(PCB_MSG_WARNING, "Cannot finish placing wire at this terminal\n"); + pcb_message(PCB_MSG_WARNING, "(the terminal does not belong to the routed net or is the starting terminal)\n"); } break; } } if (attached_path_next_point(NULL) == pcb_false) - pcb_message(PCB_MSG_WARNING, _("Cannot route the wire this way\n")); + pcb_message(PCB_MSG_WARNING, "Cannot route the wire this way\n"); break; } Index: trunk/src_plugins/smartdisperse/smartdisperse.c =================================================================== --- trunk/src_plugins/smartdisperse/smartdisperse.c (revision 23708) +++ trunk/src_plugins/smartdisperse/smartdisperse.c (revision 23709) @@ -31,7 +31,6 @@ #include "draw.h" #include "plugins.h" #include "actions.h" -#include "compat_nls.h" #include "obj_subc.h" #include "obj_subc_parent.h" #include "obj_term.h" Index: trunk/src_plugins/vendordrill/vendor.c =================================================================== --- trunk/src_plugins/vendordrill/vendor.c (revision 23708) +++ trunk/src_plugins/vendordrill/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; }