Index: trunk/src/actions.c
===================================================================
--- trunk/src/actions.c	(revision 23700)
+++ trunk/src/actions.c	(revision 23701)
@@ -42,7 +42,6 @@
 #include "event.h"
 #include "actions.h"
 #include "compat_misc.h"
-#include "compat_nls.h"
 #include "funchash.h"
 #include "layer.h"
 
Index: trunk/src/buffer.c
===================================================================
--- trunk/src/buffer.c	(revision 23700)
+++ trunk/src/buffer.c	(revision 23701)
@@ -44,7 +44,6 @@
 #include "undo.h"
 #include "funchash_core.h"
 #include "compat_misc.h"
-#include "compat_nls.h"
 #include "obj_arc_op.h"
 #include "obj_line_op.h"
 #include "obj_text_op.h"
Index: trunk/src/change.c
===================================================================
--- trunk/src/change.c	(revision 23700)
+++ trunk/src/change.c	(revision 23701)
@@ -38,7 +38,6 @@
 #include "select.h"
 #include "undo.h"
 #include "actions.h"
-#include "compat_nls.h"
 #include "macro.h"
 #include "obj_pstk_op.h"
 #include "obj_subc_parent.h"
Index: trunk/src/change_act.c
===================================================================
--- trunk/src/change_act.c	(revision 23700)
+++ trunk/src/change_act.c	(revision 23701)
@@ -50,7 +50,6 @@
 #include "undo.h"
 #include "event.h"
 #include "compat_misc.h"
-#include "compat_nls.h"
 #include "obj_rat_draw.h"
 #include "data_it.h"
 #include "macro.h"
Index: trunk/src/compat_fs.c
===================================================================
--- trunk/src/compat_fs.c	(revision 23700)
+++ trunk/src/compat_fs.c	(revision 23701)
@@ -48,7 +48,6 @@
 #include <assert.h>
 #include "compat_fs.h"
 #include "compat_misc.h"
-#include "compat_nls.h"
 #include "globalconst.h"
 #include "safe_fs.h"
 
Index: trunk/src/crosshair.c
===================================================================
--- trunk/src/crosshair.c	(revision 23700)
+++ trunk/src/crosshair.c	(revision 23701)
@@ -40,7 +40,6 @@
 #include "actions.h"
 #include "hid_inlines.h"
 #include "compat_misc.h"
-#include "compat_nls.h"
 #include "vtonpoint.h"
 #include "find.h"
 #include "undo.h"
Index: trunk/src/file_act.c
===================================================================
--- trunk/src/file_act.c	(revision 23700)
+++ trunk/src/file_act.c	(revision 23701)
@@ -47,7 +47,6 @@
 #include "search.h"
 #include "actions.h"
 #include "compat_misc.h"
-#include "compat_nls.h"
 #include "hid_init.h"
 #include "layer_vis.h"
 #include "safe_fs.h"
Index: trunk/src/font.c
===================================================================
--- trunk/src/font.c	(revision 23700)
+++ trunk/src/font.c	(revision 23701)
@@ -40,7 +40,6 @@
 #include "error.h"
 #include "plug_io.h"
 #include "paths.h"
-#include "compat_nls.h"
 #include "compat_misc.h"
 #include "event.h"
 #include "build_run.h"
Index: trunk/src/gui_act.c
===================================================================
--- trunk/src/gui_act.c	(revision 23700)
+++ trunk/src/gui_act.c	(revision 23701)
@@ -49,7 +49,6 @@
 #include "stub_stroke.h"
 #include "actions.h"
 #include "hid_init.h"
-#include "compat_nls.h"
 #include "compat_misc.h"
 #include "event.h"
 #include "layer.h"
Index: trunk/src/hid_nogui.c
===================================================================
--- trunk/src/hid_nogui.c	(revision 23700)
+++ trunk/src/hid_nogui.c	(revision 23701)
@@ -37,7 +37,6 @@
 #include "actions.h"
 #include "hid.h"
 #include "compat_misc.h"
-#include "compat_nls.h"
 #include "conf_core.h"
 
 /* This is the "gui" that is installed at startup, and is used when
Index: trunk/src/main.c
===================================================================
--- trunk/src/main.c	(revision 23700)
+++ trunk/src/main.c	(revision 23701)
@@ -73,7 +73,6 @@
 #include "actions.h"
 #include "hid_init.h"
 #include "compat_misc.h"
-#include "compat_nls.h"
 
 /* ----------------------------------------------------------------------
  * initialize signal and error handlers
Index: trunk/src/main_act.c
===================================================================
--- trunk/src/main_act.c	(revision 23700)
+++ trunk/src/main_act.c	(revision 23701)
@@ -40,7 +40,6 @@
 #include "config.h"
 
 #include "undo.h"
-#include "compat_nls.h"
 #include "change.h"
 #include "board.h"
 #include "data.h"
Index: trunk/src/netlist_act.c
===================================================================
--- trunk/src/netlist_act.c	(revision 23700)
+++ trunk/src/netlist_act.c	(revision 23701)
@@ -42,7 +42,6 @@
 #include "error.h"
 #include "plug_io.h"
 #include "actions.h"
-#include "compat_nls.h"
 #include "compat_misc.h"
 #include "netlist2.h"
 #include "data_it.h"
Index: trunk/src/obj_arc.c
===================================================================
--- trunk/src/obj_arc.c	(revision 23700)
+++ trunk/src/obj_arc.c	(revision 23701)
@@ -30,7 +30,6 @@
 
 
 #include "config.h"
-#include "compat_nls.h"
 #include "board.h"
 #include "data.h"
 #include "polygon.h"
Index: trunk/src/obj_line.c
===================================================================
--- trunk/src/obj_line.c	(revision 23700)
+++ trunk/src/obj_line.c	(revision 23701)
@@ -38,7 +38,6 @@
 #include "search.h"
 #include "polygon.h"
 #include "conf_core.h"
-#include "compat_nls.h"
 #include "compat_misc.h"
 #include "rotate.h"
 #include "hid_inlines.h"
Index: trunk/src/obj_poly.c
===================================================================
--- trunk/src/obj_poly.c	(revision 23700)
+++ trunk/src/obj_poly.c	(revision 23701)
@@ -33,7 +33,6 @@
 
 #include "board.h"
 #include "data.h"
-#include "compat_nls.h"
 #include "undo.h"
 #include "polygon.h"
 #include "polygon_offs.h"
Index: trunk/src/obj_text.c
===================================================================
--- trunk/src/obj_text.c	(revision 23700)
+++ trunk/src/obj_text.c	(revision 23701)
@@ -35,7 +35,6 @@
 #include "board.h"
 #include "data.h"
 #include "compat_misc.h"
-#include "compat_nls.h"
 #include "hid_inlines.h"
 #include "undo.h"
 #include "polygon.h"
Index: trunk/src/object_act.c
===================================================================
--- trunk/src/object_act.c	(revision 23700)
+++ trunk/src/object_act.c	(revision 23701)
@@ -48,7 +48,6 @@
 #include "move.h"
 #include "remove.h"
 #include "compat_misc.h"
-#include "compat_nls.h"
 #include "layer_vis.h"
 #include "operation.h"
 #include "obj_pstk.h"
Index: trunk/src/pcb-printf.c
===================================================================
--- trunk/src/pcb-printf.c	(revision 23700)
+++ trunk/src/pcb-printf.c	(revision 23701)
@@ -41,7 +41,6 @@
 #include <math.h>
 #include "config.h"
 #include "pcb-printf.h"
-#include "compat_nls.h"
 
 const char *pcb_printf_slot[PCB_PRINTF_SLOT_max] =
 {
Index: trunk/src/plug_io.c
===================================================================
--- trunk/src/plug_io.c	(revision 23700)
+++ trunk/src/plug_io.c	(revision 23701)
@@ -62,7 +62,6 @@
 #include "compat_misc.h"
 #include "route_style.h"
 #include "compat_fs.h"
-#include "compat_nls.h"
 #include "compat_lrealpath.h"
 #include "layer_vis.h"
 #include "safe_fs.h"
Index: trunk/src/polygon.c
===================================================================
--- trunk/src/polygon.c	(revision 23700)
+++ trunk/src/polygon.c	(revision 23701)
@@ -48,7 +48,6 @@
 #include "thermal.h"
 #include "undo.h"
 #include "layer.h"
-#include "compat_nls.h"
 #include "obj_poly_draw.h"
 #include "polygon_selfi.h"
 #include "event.h"
Index: trunk/src/polygon_act.c
===================================================================
--- trunk/src/polygon_act.c	(revision 23700)
+++ trunk/src/polygon_act.c	(revision 23701)
@@ -43,7 +43,6 @@
 #include "draw.h"
 #include "search.h"
 #include "crosshair.h"
-#include "compat_nls.h"
 #include "tool.h"
 #include "actions.h"
 
Index: trunk/src/rats_act.c
===================================================================
--- trunk/src/rats_act.c	(revision 23700)
+++ trunk/src/rats_act.c	(revision 23701)
@@ -41,7 +41,6 @@
 #include "find.h"
 #include "remove.h"
 #include "funchash_core.h"
-#include "compat_nls.h"
 #include "obj_rat.h"
 #include "actions.h"
 #include "netlist2.h"
Index: trunk/src/rats_patch.c
===================================================================
--- trunk/src/rats_patch.c	(revision 23700)
+++ trunk/src/rats_patch.c	(revision 23701)
@@ -34,7 +34,6 @@
 #include "error.h"
 #include "move.h"
 #include "compat_misc.h"
-#include "compat_nls.h"
 #include "safe_fs.h"
 #include "funchash_core.h"
 #include "search.h"
Index: trunk/src/rotate.c
===================================================================
--- trunk/src/rotate.c	(revision 23700)
+++ trunk/src/rotate.c	(revision 23701)
@@ -40,7 +40,6 @@
 #include "undo.h"
 #include "event.h"
 #include "conf_core.h"
-#include "compat_nls.h"
 #include "obj_arc_op.h"
 #include "obj_line_op.h"
 #include "obj_poly_op.h"
Index: trunk/src/route_style.c
===================================================================
--- trunk/src/route_style.c	(revision 23700)
+++ trunk/src/route_style.c	(revision 23701)
@@ -37,7 +37,6 @@
 #include "board.h"
 #include "funchash_core.h"
 #include "conf_core.h"
-#include "compat_nls.h"
 
 pcb_route_style_t pcb_custom_route_style;
 
Index: trunk/src/select.c
===================================================================
--- trunk/src/select.c	(revision 23700)
+++ trunk/src/select.c	(revision 23701)
@@ -44,7 +44,6 @@
 #include "undo.h"
 #include "find.h"
 #include "compat_misc.h"
-#include "compat_nls.h"
 
 #include "obj_arc_draw.h"
 #include "obj_line_draw.h"
Index: trunk/src/select_act.c
===================================================================
--- trunk/src/select_act.c	(revision 23700)
+++ trunk/src/select_act.c	(revision 23701)
@@ -48,7 +48,6 @@
 #include "grid.h"
 #include "hid_attrib.h"
 #include "compat_misc.h"
-#include "compat_nls.h"
 #include "actions.h"
 
 
Index: trunk/src/tool.c
===================================================================
--- trunk/src/tool.c	(revision 23700)
+++ trunk/src/tool.c	(revision 23701)
@@ -31,7 +31,6 @@
 #include "board.h"
 #include "conf_core.h"
 #include "crosshair.h"
-#include "compat_nls.h"
 #include "data.h"
 #include "draw.h"
 #include "error.h"
Index: trunk/src/tool_insert.c
===================================================================
--- trunk/src/tool_insert.c	(revision 23700)
+++ trunk/src/tool_insert.c	(revision 23701)
@@ -35,7 +35,6 @@
 #include "config.h"
 
 #include "board.h"
-#include "compat_nls.h"
 #include "crosshair.h"
 #include "insert.h"
 #include "polygon.h"
Index: trunk/src/tool_move.c
===================================================================
--- trunk/src/tool_move.c	(revision 23700)
+++ trunk/src/tool_move.c	(revision 23701)
@@ -35,7 +35,6 @@
 #include "config.h"
 
 #include "board.h"
-#include "compat_nls.h"
 #include "move.h"
 #include "crosshair.h"
 #include "search.h"
Index: trunk/src/tool_polyhole.c
===================================================================
--- trunk/src/tool_polyhole.c	(revision 23700)
+++ trunk/src/tool_polyhole.c	(revision 23701)
@@ -35,7 +35,6 @@
 #include "config.h"
 #include "conf_core.h"
 
-#include "compat_nls.h"
 #include "crosshair.h"
 #include "actions.h"
 #include "polygon.h"
Index: trunk/src/tool_remove.c
===================================================================
--- trunk/src/tool_remove.c	(revision 23700)
+++ trunk/src/tool_remove.c	(revision 23701)
@@ -35,7 +35,6 @@
 #include "config.h"
 
 #include "board.h"
-#include "compat_nls.h"
 #include "event.h"
 #include "actions.h"
 #include "undo.h"
Index: trunk/src/tool_text.c
===================================================================
--- trunk/src/tool_text.c	(revision 23700)
+++ trunk/src/tool_text.c	(revision 23701)
@@ -36,7 +36,6 @@
 #include "conf_core.h"
 
 #include "board.h"
-#include "compat_nls.h"
 #include "data.h"
 #include "draw.h"
 #include "actions.h"
Index: trunk/src/tool_via.c
===================================================================
--- trunk/src/tool_via.c	(revision 23700)
+++ trunk/src/tool_via.c	(revision 23701)
@@ -37,7 +37,6 @@
 
 #include "board.h"
 #include "change.h"
-#include "compat_nls.h"
 #include "hid_inlines.h"
 #include "data.h"
 #include "draw.h"
Index: trunk/src/undo.c
===================================================================
--- trunk/src/undo.c	(revision 23700)
+++ trunk/src/undo.c	(revision 23701)
@@ -63,7 +63,6 @@
 #include "flag_str.h"
 #include "conf_core.h"
 #include "compat_misc.h"
-#include "compat_nls.h"
 
 #include "obj_poly_draw.h"
 
Index: trunk/src/undo_old.c
===================================================================
--- trunk/src/undo_old.c	(revision 23700)
+++ trunk/src/undo_old.c	(revision 23701)
@@ -63,7 +63,6 @@
 #include "flag_str.h"
 #include "conf_core.h"
 #include "compat_misc.h"
-#include "compat_nls.h"
 #include "netlist2.h"
 
 #include "obj_poly_draw.h"
Index: trunk/src/unit.c
===================================================================
--- trunk/src/unit.c	(revision 23700)
+++ trunk/src/unit.c	(revision 23701)
@@ -36,7 +36,6 @@
 #include <string.h>
 #include <ctype.h>
 #include "compat_misc.h"
-#include "compat_nls.h"
 #include "unit.h"
 
 /* Helper macros for tables */
@@ -94,7 +93,7 @@
 	int i;
 	for (i = 0; i < N_UNITS; ++i) {
 		pcb_units[i].index = i;
-		pcb_units[i].in_suffix = _(pcb_units[i].suffix);
+		pcb_units[i].in_suffix = pcb_units[i].suffix;
 	}
 }