Index: trunk/src/actions.c
===================================================================
--- trunk/src/actions.c	(revision 23692)
+++ trunk/src/actions.c	(revision 23693)
@@ -90,7 +90,7 @@
 		int len;
 
 		if (check_action_name(a[i].name)) {
-			pcb_message(PCB_MSG_ERROR, _("ERROR! Invalid action name, " "action \"%s\" not registered.\n"), a[i].name);
+			pcb_message(PCB_MSG_ERROR, "ERROR! Invalid action name, " "action \"%s\" not registered.\n", a[i].name);
 			continue;
 		}
 		len = strlen(a[i].name);
@@ -418,8 +418,8 @@
 		sp++;
 	}
 	else if (require_parens) {
-		pcb_message(PCB_MSG_ERROR, _("Syntax error: %s\n"), rstr);
-		pcb_message(PCB_MSG_ERROR, _("    expected: Action(arg1, arg2)"));
+		pcb_message(PCB_MSG_ERROR, "Syntax error: %s\n", rstr);
+		pcb_message(PCB_MSG_ERROR, "    expected: Action(arg1, arg2)");
 		retcode = 1;
 		goto cleanup;
 	}
Index: trunk/src/main.c
===================================================================
--- trunk/src/main.c	(revision 23692)
+++ trunk/src/main.c	(revision 23693)
@@ -628,11 +628,11 @@
 		pcb_event(PCB_EVENT_LIBRARY_CHANGED, NULL);
 
 	if (conf_core.rc.script_filename) {
-		pcb_message(PCB_MSG_INFO, _("Executing startup script file %s\n"), conf_core.rc.script_filename);
+		pcb_message(PCB_MSG_INFO, "Executing startup script file %s\n", conf_core.rc.script_filename);
 		pcb_actionl("ExecuteFile", conf_core.rc.script_filename, NULL);
 	}
 	if (conf_core.rc.action_string) {
-		pcb_message(PCB_MSG_INFO, _("Executing startup action %s\n"), conf_core.rc.action_string);
+		pcb_message(PCB_MSG_INFO, "Executing startup action %s\n", conf_core.rc.action_string);
 		pcb_parse_actions(conf_core.rc.action_string);
 	}
 
Index: trunk/src/obj_text.c
===================================================================
--- trunk/src/obj_text.c	(revision 23692)
+++ trunk/src/obj_text.c	(revision 23693)
@@ -650,7 +650,7 @@
 void *pcb_textop_move_to_layer(pcb_opctx_t *ctx, pcb_layer_t * layer, pcb_text_t * text)
 {
 	if (PCB_FLAG_TEST(PCB_FLAG_LOCK, text)) {
-		pcb_message(PCB_MSG_WARNING, _("Sorry, the object is locked\n"));
+		pcb_message(PCB_MSG_WARNING, "Sorry, the object is locked\n");
 		return NULL;
 	}
 	if (ctx->move.dst_layer != layer) {
Index: trunk/src/plug_io.c
===================================================================
--- trunk/src/plug_io.c	(revision 23692)
+++ trunk/src/plug_io.c	(revision 23693)
@@ -523,7 +523,7 @@
 		/* enable default font if necessary */
 		if (!PCB->fontkit.valid) {
 			if ((require_font) && (!PCB->is_footprint))
-				pcb_message(PCB_MSG_WARNING, _("File '%s' has no font information, using default font\n"), new_filename);
+				pcb_message(PCB_MSG_WARNING, "File '%s' has no font information, using default font\n", new_filename);
 			PCB->fontkit.valid = pcb_true;
 		}
 
@@ -610,7 +610,7 @@
 	if (Filename && *Filename) {
 		if (!stat(Filename, &buffer) && Confirm) {
 			const char *all_ok = "all ok";
-			sprintf(message, _("File '%s' exists, use anyway?"), Filename);
+			sprintf(message, "File '%s' exists, use anyway?", Filename);
 			if (WasAllButton)
 				*WasAllButton = pcb_false;
 			if (WasCancelButton)
@@ -645,8 +645,8 @@
 	pcb_bool result;									/* not used */
 
 	/* CheckAndOpenFile deals with the case where fname already exists */
-	fname = pcb_gui->fileselect(_("Save Connection Data As ..."),
-													_("Choose a file to save all connection data to."), default_file, ".net", "connection_data", 0, NULL);
+	fname = pcb_gui->fileselect("Save Connection Data As ...",
+													"Choose a file to save all connection data to.", default_file, ".net", "connection_data", 0, NULL);
 	if (fname == NULL)
 		return NULL;
 
@@ -783,7 +783,7 @@
 	if (PCB && PCB->Changed && (conf_core.rc.emergency_name != NULL) && (*conf_core.rc.emergency_name != '\0')) {
 		const char *fmt = conf_core.rc.emergency_format == NULL ? DEFAULT_EMERGENCY_FMT : conf_core.rc.emergency_format;
 		sprintf(filename, conf_core.rc.emergency_name, (long int)pcb_getpid());
-		pcb_message(PCB_MSG_INFO, _("Trying to save your layout in '%s'\n"), filename);
+		pcb_message(PCB_MSG_INFO, "Trying to save your layout in '%s'\n", filename);
 		pcb_write_pcb_file(filename, pcb_true, fmt, pcb_true, pcb_false);
 	}
 }
Index: trunk/src/tool_via.c
===================================================================
--- trunk/src/tool_via.c	(revision 23692)
+++ trunk/src/tool_via.c	(revision 23693)
@@ -54,7 +54,7 @@
 {
 
 	if (!PCB->pstk_on) {
-		pcb_message(PCB_MSG_WARNING, _("You must turn via visibility on before\n" "you can place vias\n"));
+		pcb_message(PCB_MSG_WARNING, "You must turn via visibility on before\nyou can place vias\n");
 		return;
 	}
 
Index: trunk/src/undo.c
===================================================================
--- trunk/src/undo.c	(revision 23692)
+++ trunk/src/undo.c	(revision 23693)
@@ -87,18 +87,18 @@
 	pcb_undo_and_draw = draw;
 
 	if (pcb_uundo.num_undo == 0) {
-		pcb_message(PCB_MSG_INFO, _("Nothing to undo - buffer is empty\n"));
+		pcb_message(PCB_MSG_INFO, "Nothing to undo - buffer is empty\n");
 		return -1;
 	}
 
 	if (pcb_uundo.serial == 0) {
-		pcb_message(PCB_MSG_ERROR, _("ERROR: Attempt to pcb_undo() with Serial == 0\n" "       Please save your work and report this bug.\n"));
+		pcb_message(PCB_MSG_ERROR, "ERROR: Attempt to pcb_undo() with Serial == 0\n       Please save your work and report this bug.\n");
 		return -1;
 	}
 
 	if ((pcb_uundo.tail != NULL) && (pcb_uundo.tail->serial > pcb_uundo.serial)) {
-		pcb_message(PCB_MSG_ERROR, _("ERROR: Bad undo serial number %d in undo stack - expecting %d or lower\n"
-							"       Please save your work and report this bug.\n"), pcb_uundo.tail->serial, pcb_uundo.serial);
+		pcb_message(PCB_MSG_ERROR, "ERROR: Bad undo serial number %d in undo stack - expecting %d or lower\n"
+							"       Please save your work and report this bug.\n", pcb_uundo.tail->serial, pcb_uundo.serial);
 
 	/* It is likely that the serial number got corrupted through some bad
 		 * use of the pcb_undo_save_serial() / pcb_undo_restore_serial() APIs.