diff --git a/jtag/ChangeLog b/jtag/ChangeLog
index 6599a033..94103f81 100644
--- a/jtag/ChangeLog
+++ b/jtag/ChangeLog
@@ -1,3 +1,11 @@
+2003-02-21  Marcel Telka  <marcel@telka.sk>
+
+	* src/help.c (help): Marked translatable strings.
+	* src/jtag.c (jtag_parse_line): Ditto.
+	(jtag_parse_file): Ditto.
+	(main): Ditto.
+	* po/POTFILES.in: Added src/help.c and src/jtag.c.
+
 2003-02-21  Marcel Telka  <marcel@telka.sk>
 
 	* src/jtag.c (main): Added conditional compilation for l10n.
diff --git a/jtag/po/.cvsignore b/jtag/po/.cvsignore
index dc2af364..40ae1a1b 100644
--- a/jtag/po/.cvsignore
+++ b/jtag/po/.cvsignore
@@ -9,3 +9,6 @@ en@quot.header
 insert-header.sin
 quot.sed
 remove-potcdate.sin
+remove-potcdate.sed
+jtag.pot
+messages.mo
diff --git a/jtag/po/POTFILES.in b/jtag/po/POTFILES.in
index fbbab2d1..a8b69cdb 100644
--- a/jtag/po/POTFILES.in
+++ b/jtag/po/POTFILES.in
@@ -1 +1,4 @@
 # $Id$
+
+src/help.c
+src/jtag.c
diff --git a/jtag/src/help.c b/jtag/src/help.c
index cd66b07b..8bb66dff 100644
--- a/jtag/src/help.c
+++ b/jtag/src/help.c
@@ -27,6 +27,9 @@
 #endif
 
 #include "gettext.h"
+#define	_(s)		gettext(s)
+#define	N_(s)		gettext_noop(s)
+#define	P_(s,p,n)	ngettext(s,p,n)
 
 #include <stdio.h>
 #include <string.h>
@@ -39,7 +42,7 @@ help( const char *cmd )
 {
 	if (!cmd)
 		printf(
-			"Command list:\n"
+			_("Command list:\n"
 			"\n"
 			"quit          exit from %s\n"
 			"help          display this help\n"
@@ -58,21 +61,21 @@ help( const char *cmd )
 			"get           get external signal value\n"
 			"script        run command sequence from external file\n"
 			"\n"
-			"Type \"help COMMAND\" for details about particular command.\n", PACKAGE
+			"Type \"help COMMAND\" for details about particular command.\n"), PACKAGE
 		);
 	else if (strcmp( cmd, "quit" ) == 0)
 		printf(
-			"Usage: quit\n"
-			"Exit from %s.\n", PACKAGE
+			_("Usage: %s\n"
+			"Exit from %s.\n"), "quit", PACKAGE
 		);
 	else if (strcmp( cmd, "help" ) == 0)
 		printf(
-			"Usage: help [COMMAND]\n"
-			"Print short help for COMMAND, or list of available commands.\n"
+			_("Usage: %s [COMMAND]\n"
+			"Print short help for COMMAND, or list of available commands.\n"), "help"
 		);
 	else if (strcmp( cmd, "frequency" ) == 0)
 		printf(
-			"Usage: frequency FREQ\n"
+			_("Usage: %s FREQ\n"
 			"Change TCK frequency to FREQ.\n"
 			"\n"
 			"FREQ is in hertz. It's a maximum TCK frequency for JTAG interface.\n"
@@ -81,35 +84,35 @@ help( const char *cmd )
 			"adapter.\n"
 			"\n"
 			"FREQ must be an unsigned integer. Minimum allowed frequency is 1 Hz.\n"
-			"Use 0 for FREQ to disable frequency limit.\n"
+			"Use 0 for FREQ to disable frequency limit.\n"), "frequency"
 		);
 	else if (strcmp( cmd, "cable" ) == 0) {
 		int i;
 
 		printf(
-			"Usage: cable parallel PORTADDR CABLE\n"
+			_("Usage: %s PORTADDR CABLE\n"
 			"Select JTAG cable connected to parallel port.\n"
 			"\n"
 			"PORTADDR   parallel port address (e.g. 0x378)\n"
 			"CABLE      cable type\n"
 			"\n"
 			"List of supported cables:\n"
-			"none          No cable connected\n"
+			"none          No cable connected\n"), "cable parallel"
 		);
 
 		for (i = 0; cable_drivers[i]; i++)
 			printf( "%-14s%s\n", cable_drivers[i]->name, cable_drivers[i]->description );
 	} else if (strcmp( cmd, "detect" ) == 0)
 		printf(
-			"Usage: detect\n"
+			_("Usage: %s\n"
 			"Detect parts on the JTAG chain.\n"
 			"\n"
 			"Output from this command is a list of the detected parts.\n"
-			"If no parts are detected other commands may not work properly.\n"
+			"If no parts are detected other commands may not work properly.\n"), "detect"
 		);
 	else if (strcmp( cmd, "discovery" ) == 0)
 		printf(
-			"Usage: discovery FILENAME\n"
+			_("Usage: %s FILENAME\n"
 			"Discovery unknown parts in the JTAG chain.\n"
 			"\n"
 			"Detail output (report) is directed to the FILENAME.\n"
@@ -120,50 +123,50 @@ help( const char *cmd )
 			" 3. DR (data register) length for all possible instructions\n"
 			"\n"
 			"Warning: This may be dangerous for some parts (especially, if the\n"
-			"part doesn't have TRST signal).\n"
+			"part doesn't have TRST signal).\n"), "discovery"
 		);
 	else if (strcmp( cmd, "print" ) == 0)
 		printf(
-			"Usage: print\n"
+			_("Usage: %s\n"
 			"Display JTAG chain status.\n"
 			"\n"
 			"Display list of the parts connected to the JTAG chain including\n"
-			"part number and current (active) instruction and data register.\n"
+			"part number and current (active) instruction and data register.\n"), "print"
 		);
 	else if (strcmp( cmd, "instruction" ) == 0)
 		printf(
-			"Usage: instruction PART INSTRUCTION\n"
+			_("Usage: %s PART INSTRUCTION\n"
 			"Change active INSTRUCTION for a PART.\n"
 			"\n"
 			"PART          part number (see print command)\n"
-			"INSTRUCTION   instruction name (e.g. BYPASS)\n"
+			"INSTRUCTION   instruction name (e.g. BYPASS)\n"), "instruction"
 		);
 	else if (strcmp( cmd, "shift" ) == 0)
 		printf(
-			"Usage: shift ir\n"
-			"Usage: shift dr\n"
-			"Shift instruction or data register through JTAG chain.\n"
+			_("Usage: %s\n"
+			"Usage: %s\n"
+			"Shift instruction or data register through JTAG chain.\n"), "shift ir", "shift dr"
 		);
 	else if (strcmp( cmd, "dr" ) == 0)
 		printf(
-			"Usage: dr PART [DIR]\n"
+			_("Usage: %s PART [DIR]\n"
 			"Display input or output data register content.\n"
 			"\n"
 			"PART          part number (see print command)\n"
 			"DIR           requested data register; possible values: 'in' for\n"
-			"                input and 'out' for output; default is 'out'\n"
+			"                input and 'out' for output; default is 'out'\n"), "dr"
 		);
 	else if (strcmp( cmd, "detectflash" ) == 0)
 		printf(
-			"Usage: detectflash\n"
+			_("Usage: %s\n"
 			"Detect flash memory type connected to part.\n"
 			"\n"
 			"Only detects flash connected to part 0. Part 0 must support\n"
-			"bus operations.\n"
+			"bus operations.\n"), "detectflash"
 		);
 	else if (strcmp( cmd, "readmem" ) == 0)
 		printf(
-			"Usage: readmem ADDR LEN FILENAME\n"
+			_("Usage: %s ADDR LEN FILENAME\n"
 			"Copy device memory content starting with ADDR to FILENAME file.\n"
 			"\n"
 			"ADDR       start address of the copied memory area\n"
@@ -172,12 +175,13 @@ help( const char *cmd )
 			"\n"
 			"ADDR and LEN could be in decimal or hexadecimal (prefixed with 0x) form.\n"
 			"\n"
-			"readmem works only with part 0. Part 0 must support bus operations.\n"
+			"`%s' command works only with part 0. Part 0 must support bus operations.\n"),
+			"readmem", "readmem"
 		);
 	else if (strcmp( cmd, "flashmem" ) == 0) {
  	        int i;
 		printf(
-			"Usage: flashmem ADDR FILENAME\n"
+			_("Usage: %s ADDR FILENAME\n"
 			"Usage: flashmem msbin FILENAME\n"
 			"Program FILENAME content to flash memory.\n"
 			"\n"
@@ -187,37 +191,37 @@ help( const char *cmd )
 			"\n"
 			"ADDR could be in decimal or hexadecimal (prefixed with 0x) form.\n"
 			"\n"
-			"flashmem works only with part 0. Part 0 must support bus operations.\n"
-			"Supported Flash Memories\n"
+			"`%s' command works only with part 0. Part 0 must support bus operations.\n"
+			"Supported Flash Memories\n"), "flashmem", "flashmem"
 		);
 		for (i = 0; flash_drivers[i]; i++)
 			printf( "%s\n     %s\n", flash_drivers[i]->name, flash_drivers[i]->description );
 	} else if (strcmp( cmd, "get" ) == 0)
 		printf(
-			"Usage: get signal PART SIGNAL\n"
+			_("Usage: %s PART SIGNAL\n"
 			"Get signal state from output BSR (Boundary Scan Register).\n"
 			"\n"
 			"PART          part number (see print command)\n"
-			"SIGNAL        signal name (from JTAG declaration file)\n"
+			"SIGNAL        signal name (from JTAG declaration file)\n"), "get signal"
 		);
 	else if (strcmp( cmd, "set" ) == 0)
 		printf(
-			"Usage: set signal PART SIGNAL DIR [DATA]\n"
+			_("Usage: %s PART SIGNAL DIR [DATA]\n"
 			"Set signal state in input BSR (Boundary Scan Register).\n"
 			"\n"
 			"PART          part number (see print command)\n"
 			"SIGNAL        signal name (from JTAG declaration file)\n"
 			"DIR           requested signal direction; possible values: 'in' or 'out'\n"
 			"DATA          desired output signal value ('0' or '1');  used only if DIR\n"
-			"                is 'out'\n"
+			"                is 'out'\n"), "set signal"
 		);
 	else if (strcmp( cmd, "script" ) == 0)
 		printf(
-			"Usage: script FILENAME\n"
+			_("Usage: %s FILENAME\n"
 			"Run command sequence from external FILENAME.\n"
 			"\n"
-			"FILENAME      Name of the file with commands\n"
+			"FILENAME      Name of the file with commands\n"), "script"
 		);
 	else
-		printf( "Invalid command.\n" );
+		printf( _("Invalid command.\n") );
 }
diff --git a/jtag/src/jtag.c b/jtag/src/jtag.c
index 5fc574e5..c93a86b6 100644
--- a/jtag/src/jtag.c
+++ b/jtag/src/jtag.c
@@ -27,6 +27,9 @@
 #endif
 
 #include "gettext.h"
+#define	_(s)		gettext(s)
+#define	N_(s)		gettext_noop(s)
+#define	P_(s,p,n)	ngettext(s,p,n)
 
 #include <stdio.h>
 #include <stdlib.h>
@@ -159,7 +162,7 @@ jtag_parse_line( char *line )
 
 		if (strcmp( t, "quit" ) == 0) {
 			if (get_token( NULL )) {
-				printf( "quit: syntax error\n\nType \"help\" for help.\n\n" );
+				printf( _("quit: syntax error\n\nType \"help\" for help.\n\n") );
 				return 1;
 			}
 			return 0;
@@ -168,7 +171,7 @@ jtag_parse_line( char *line )
 		if (strcmp( t, "help" ) == 0) {
 			t = get_token( NULL );
 			if (get_token( NULL ))
-				printf( "help: Syntax error!\n" );
+				printf( _("help: Syntax error!\n") );
 			else
 				help( t );
 			return 1;
@@ -179,20 +182,20 @@ jtag_parse_line( char *line )
 
 			t = get_token( NULL );
 			if (!t) {
-				printf( "Missing argument(s)\n" );
+				printf( _("Missing argument(s)\n") );
 				return 1;
 			}
 			if ((sscanf( t, "0x%x", &freq ) != 1) && (sscanf( t, "%u", &freq ) != 1)) {
-				printf( "syntax error\n" );
+				printf( _("syntax error\n") );
 				return 1;
 			}
 
 			if (get_token( NULL )) {
-				printf( "frequency: syntax error\n" );
+				printf( _("frequency: syntax error\n") );
 				return 1;
 			}
 
-			printf( "Setting TCK frequency to %u Hz\n", freq );
+			printf( _("Setting TCK frequency to %u Hz\n"), freq );
 			frequency = freq;
 
 			return 1;
@@ -204,37 +207,37 @@ jtag_parse_line( char *line )
 
 			t = get_token( NULL );
 			if (!t) {
-				printf( "Missing argument(s)\n" );
+				printf( _("Missing argument(s)\n") );
 				return 1;
 			}
 			if (strcmp( t, "parallel" ) != 0) {
-				printf( "syntax error!\n" );
+				printf( _("syntax error!\n") );
 				return 1;
 			}
 
 			t = get_token( NULL );
 			if (!t) {
-				printf( "Missing argument(s)\n" );
+				printf( _("Missing argument(s)\n") );
 				return 1;
 			}
 			if ((sscanf( t, "0x%x", &port ) != 1) && (sscanf( t, "%d", &port ) != 1)) {
-				printf( "syntax error\n" );
+				printf( _("syntax error\n") );
 				return 1;
 			}
 
 			t = get_token( NULL );
 			if (!t) {
-				printf( "Missing argument(s)\n" );
+				printf( _("Missing argument(s)\n") );
 				return 1;
 			}
 
 			if (get_token( NULL )) {
-				printf( "syntax error!\n" );
+				printf( _("syntax error!\n") );
 				return 1;
 			}
 
 			if (strcmp( t, "none" ) == 0) {
-				printf( "Changed cable to 'none'\n" );
+				printf( _("Changed cable to 'none'\n") );
 				cable = NULL;
 				return 1;
 			}
@@ -244,14 +247,14 @@ jtag_parse_line( char *line )
 					break;
 
 			if (!cable_drivers[i]) {
-				printf( "Unknown cable: %s\n", t );
+				printf( _("Unknown cable: %s\n"), t );
 				return 1;
 			}
 
 			cable = cable_drivers[i];
-			printf( "Initializing %s on parallel port at 0x%x\n", cable->description, port );
+			printf( _("Initializing %s on parallel port at 0x%x\n"), cable->description, port );
 			if (!cable->init( port )) {
-				printf( "Error: Cable driver initialization failed!\n" );
+				printf( _("Error: Cable driver initialization failed!\n") );
 				cable = NULL;
 				return 1;
 			}
@@ -265,17 +268,17 @@ jtag_parse_line( char *line )
 
 		if (strcmp( t, "discovery" ) == 0) {
 			if (!cable) {
-				printf( "Error: Cable not configured. Use 'cable' command first!\n" );
+				printf( _("Error: Cable not configured. Use 'cable' command first!\n") );
 				return 1;
 			}
 
 			t = get_token( NULL );
 			if (!t) {
-				printf( "discovery: missing filename\n" );
+				printf( _("discovery: missing filename\n") );
 				return 1;
 			}
 			if (get_token( NULL )) {
-				printf( "syntax error!\n" );
+				printf( _("syntax error!\n") );
 				return 1;
 			}
 			discovery( t );
@@ -284,12 +287,12 @@ jtag_parse_line( char *line )
 
 		if (strcmp( t, "detect" ) == 0) {
 			if (!cable) {
-				printf( "Error: Cable not configured. Use 'cable' command first!\n" );
+				printf( _("Error: Cable not configured. Use 'cable' command first!\n") );
 				return 1;
 			}
 
 			if (get_token( NULL )) {
-				printf( "detect: syntax error\n" );
+				printf( _("detect: syntax error\n") );
 				return 1;
 			}
 
@@ -320,23 +323,23 @@ jtag_parse_line( char *line )
 			uint32_t addr = 0;
 
 			if (!cable) {
-				printf( "Error: Cable not configured. Use 'cable' command first!\n" );
+				printf( _("Error: Cable not configured. Use 'cable' command first!\n") );
 				return 1;
 			}
 
 			if (!ps) {
-				printf( "Run \"detect\" first.\n" );
+				printf( _("Run \"detect\" first.\n") );
 				return 1;
 			}
 
 			t = get_token( NULL );
 			if (!t) {
-				printf( "flashmem: Missing argument(s)\n" );
+				printf( _("flashmem: Missing argument(s)\n") );
 				return 1;
 			}
 			if (strcmp( t, "msbin" ) != 0) {
 				if ((sscanf( t, "0x%x", &addr ) != 1) && (sscanf( t, "%d", &addr ) != 1)) {
-					printf( "error\n" );
+					printf( _("error\n") );
 					return 1;
 				}
 				printf( "0x%08X\n", addr );
@@ -345,16 +348,16 @@ jtag_parse_line( char *line )
 			/* filename */
 			t = get_token( NULL );
 			if (!t) {
-				printf( "flashmem: missing filename\n" );
+				printf( _("flashmem: missing filename\n") );
 				return 1;
 			}
 			if (get_token( NULL )) {
-				printf( "syntax error!\n" );
+				printf( _("syntax error!\n") );
 				return 1;
 			}
 			f = fopen( t, "r" );
 			if (!f) {
-				printf( "Unable to open file `%s'!\n", t );
+				printf( _("Unable to open file `%s'!\n"), t );
 				return 1;
 			}
 			if (msbin) 
@@ -371,49 +374,49 @@ jtag_parse_line( char *line )
 			uint32_t len = 0;
 
 			if (!cable) {
-				printf( "Error: Cable not configured. Use 'cable' command first!\n" );
+				printf( _("Error: Cable not configured. Use 'cable' command first!\n") );
 				return 1;
 			}
 
 			if (!ps) {
-				printf( "Run \"detect\" first.\n" );
+				printf( _("Run \"detect\" first.\n") );
 				return 1;
 			}
 
 			t = get_token( NULL );
 			if (!t) {
-				printf( "flashmem: Missing argument(s)\n" );
+				printf( _("flashmem: Missing argument(s)\n") );
 				return 1;
 			}
 			if ((sscanf( t, "0x%x", &addr ) != 1) && (sscanf( t, "%d", &addr ) != 1)) {
-				printf( "syntax error\n" );
+				printf( _("syntax error\n") );
 				return 1;
 			}
 
 			t = get_token( NULL );
 			if (!t) {
-				printf( "flashmem: Missing argument(s)\n" );
+				printf( _("flashmem: Missing argument(s)\n") );
 				return 1;
 			}
 			if ((sscanf( t, "0x%x", &len ) != 1) && (sscanf( t, "%d", &len ) != 1)) {
-				printf( "syntax error\n" );
+				printf( _("syntax error\n") );
 				return 1;
 			}
 
 			/* filename */
 			t = get_token( NULL );
 			if (!t) {
-				printf( "flashmem: missing filename\n" );
+				printf( _("flashmem: missing filename\n") );
 				return 1;
 			}
 			if (get_token( NULL )) {
-				printf( "syntax error!\n" );
+				printf( _("syntax error!\n") );
 				return 1;
 			}
 
 			f = fopen( t, "w" );
 			if (!f) {
-				printf( "Unable to create file `%s'!\n", t );
+				printf( _("Unable to create file `%s'!\n"), t );
 				return 1;
 			}
 			readmem( ps, f, addr, len );
@@ -424,17 +427,17 @@ jtag_parse_line( char *line )
 
 		if (strcmp( t, "detectflash" ) == 0) {
 			if (get_token( NULL )) {
-				printf( "detectflash: syntax error\n" );
+				printf( _("detectflash: syntax error\n") );
 				return 1;
 			}
 
 			if (!cable) {
-				printf( "Error: Cable not configured. Use 'cable' command first!\n" );
+				printf( _("Error: Cable not configured. Use 'cable' command first!\n") );
 				return 1;
 			}
 
 			if (!ps) {
-				printf( "Run \"detect\" first.\n" );
+				printf( _("Run \"detect\" first.\n") );
 				return 1;
 			}
 
@@ -444,12 +447,12 @@ jtag_parse_line( char *line )
 
 		if (strcmp( t, "print" ) == 0) {
 			if (get_token( NULL )) {
-				printf( "print: syntax error\n" );
+				printf( _("print: syntax error\n") );
 				return 1;
 			}
 
 			if (!cable) {
-				printf( "Error: Cable not configured. Use 'cable' command first!\n" );
+				printf( _("Error: Cable not configured. Use 'cable' command first!\n") );
 				return 1;
 			}
 
@@ -461,53 +464,53 @@ jtag_parse_line( char *line )
 			int n;
 
 			if (!cable) {
-				printf( "Error: Cable not configured. Use 'cable' command first!\n" );
+				printf( _("Error: Cable not configured. Use 'cable' command first!\n") );
 				return 1;
 			}
 
 			if (!ps) {
-				printf( "Run \"detect\" first.\n" );
+				printf( _("Run \"detect\" first.\n") );
 				return 1;
 			}
 
 			t = get_token( NULL );
 			if (!t) {
-				printf( "instruction: syntax error\n" );
+				printf( _("instruction: syntax error\n") );
 				return 1;
 			}
 
 			n = strtol( t, &t, 10 );
 			if (t && *t) {
-				printf( "instruction: syntax error\n" );
+				printf( _("instruction: syntax error\n") );
 				return 1;
 			}
 
 			if ((n < 0) || (n >= ps->len)) {
-				printf( "instruction: invalid part number\n" );
+				printf( _("instruction: invalid part number\n") );
 				return 1;
 			}
 
 			t = get_token( NULL );
 			if (!t) {
-				printf( "instruction: missing instruction name\n" );
+				printf( _("instruction: missing instruction name\n") );
 				return 1;
 			}
 
 			if (get_token( NULL )) {
-				printf( "instruction: syntax error\n" );
+				printf( _("instruction: syntax error\n") );
 				return 1;
 			}
 
 			part_set_instruction( ps->parts[n], t );
 			if (ps->parts[n]->active_instruction == NULL)
-				printf( "instruction: unknown instruction %s\n", t );
+				printf( _("instruction: unknown instruction %s\n"), t );
 
 			return 1;
 		}
 
 		if (strcmp( t, "shift" ) == 0) {
 			if (!cable) {
-				printf( "Error: Cable not configured. Use 'cable' command first!\n" );
+				printf( _("Error: Cable not configured. Use 'cable' command first!\n") );
 				return 1;
 			}
 
@@ -523,7 +526,7 @@ jtag_parse_line( char *line )
 				return 1;
 			}
 
-			printf( "shift: syntax error\n" );
+			printf( _("shift: syntax error\n") );
 			return 1;
 		}
 
@@ -533,29 +536,29 @@ jtag_parse_line( char *line )
 			tap_register *r;
 
 			if (!cable) {
-				printf( "Error: Cable not configured. Use 'cable' command first!\n" );
+				printf( _("Error: Cable not configured. Use 'cable' command first!\n") );
 				return 1;
 			}
 
 			if (!ps) {
-				printf( "Run \"detect\" first.\n" );
+				printf( _("Run \"detect\" first.\n") );
 				return 1;
 			}
 
 			t = get_token( NULL );
 			if (!t) {
-				printf( "dr: syntax error\n" );
+				printf( _("dr: syntax error\n") );
 				return 1;
 			}
 
 			n = strtol( t, &t, 10 );
 			if (t && *t) {
-				printf( "dr: syntax error\n" );
+				printf( _("dr: syntax error\n") );
 				return 1;
 			}
 			
 			if ((n < 0) || (n >= ps->len)) {
-				printf( "dr: invalid part number\n" );
+				printf( _("dr: invalid part number\n") );
 				return 1;
 			}
 
@@ -568,12 +571,12 @@ jtag_parse_line( char *line )
 				else if (strcmp( t, "out" ) == 0)
 					dir = 1;
 				else {
-					printf( "dr: syntax error\n" );
+					printf( _("dr: syntax error\n") );
 					return 1;
 				}
 
 				if (get_token( NULL )) {
-					printf( "dr: syntax error\n" );
+					printf( _("dr: syntax error\n") );
 					return 1;
 				}
 			}
@@ -594,46 +597,46 @@ jtag_parse_line( char *line )
 			char *s;
 
 			if (!cable) {
-				printf( "Error: Cable not configured. Use 'cable' command first!\n" );
+				printf( _("Error: Cable not configured. Use 'cable' command first!\n") );
 				return 1;
 			}
 
 			if (!ps) {
-				printf( "Run \"detect\" first.\n" );
+				printf( _("Run \"detect\" first.\n") );
 				return 1;
 			}
 
 			t = get_token( NULL );
 			if (!t || strcmp( t, "signal" ) != 0) {
-				printf( "set: syntax error\n" );
+				printf( _("set: syntax error\n") );
 				return 1;
 			}
 
 			t = get_token( NULL );
 			if (!t) {
-				printf( "set: syntax error\n" );
+				printf( _("set: syntax error\n") );
 				return 1;
 			}
 			n = strtol( t, &t, 10 );
 			if (t && *t) {
-				printf( "set: syntax error\n" );
+				printf( _("set: syntax error\n") );
 				return 1;
 			}
 
 			if ((n < 0) || (n >= ps->len)) {
-				printf( "set: invalid part number\n" );
+				printf( _("set: invalid part number\n") );
 				return 1;
 			}
 
 			s = get_token( NULL );		/* signal name */
 			if (!s) {
-				printf( "set: syntax error\n" );
+				printf( _("set: syntax error\n") );
 				return 1;
 			}
 
 			t = get_token( NULL );		/* direction */
 			if (!t || (strcmp( t, "in" ) != 0 && strcmp( t, "out" ) != 0)) {
-				printf( "set: syntax error\n" );
+				printf( _("set: syntax error\n") );
 				return 1;
 			}
 
@@ -641,24 +644,24 @@ jtag_parse_line( char *line )
 			if (dir) {
 				t = get_token( NULL );
 				if (!t) {
-					printf( "set: syntax error\n" );
+					printf( _("set: syntax error\n") );
 					return 1;
 				}
 				data = strtol( t, &t, 10 );
 				if (t && *t) {
-					printf( "set: syntax error\n" );
+					printf( _("set: syntax error\n") );
 					return 1;
 				}
 
 				if ((data < 0) || (data > 1)) {
-					printf( "set: invalid data value\n" );
+					printf( _("set: invalid data value\n") );
 					return 1;
 				}
 			} else
 				data = 0;
 
 			if (get_token( NULL )) {
-				printf( "set: syntax error\n" );
+				printf( _("set: syntax error\n") );
 				return 1;
 			}
 
@@ -672,46 +675,46 @@ jtag_parse_line( char *line )
 			int data;
 
 			if (!cable) {
-				printf( "Error: Cable not configured. Use 'cable' command first!\n" );
+				printf( _("Error: Cable not configured. Use 'cable' command first!\n") );
 				return 1;
 			}
 
 			if (!ps) {
-				printf( "Run \"detect\" first.\n" );
+				printf( _("Run \"detect\" first.\n") );
 				return 1;
 			}
 
 			t = get_token( NULL );
 			if (!t || strcmp( t, "signal" ) != 0) {
-				printf( "get: syntax error\n" );
+				printf( _("get: syntax error\n") );
 				return 1;
 			}
 
 			t = get_token( NULL );
 			if (!t) {
-				printf( "get: syntax error\n" );
+				printf( _("get: syntax error\n") );
 				return 1;
 			}
 			n = strtol( t, &t, 10 );
 			if (t && *t) {
-				printf( "get: syntax error\n" );
+				printf( _("get: syntax error\n") );
 				return 1;
 			}
 
 			if ((n < 0) || (n >= ps->len)) {
-				printf( "get: invalid part number\n" );
+				printf( _("get: invalid part number\n") );
 				return 1;
 			}
 
 			t = get_token( NULL );		/* signal name */
 			if (!t || get_token( NULL )) {
-				printf( "get: syntax error\n" );
+				printf( _("get: syntax error\n") );
 				return 1;
 			}
 
 			data = part_get_signal( ps->parts[n], t );
 			if (data != -1)
-				printf( "%s = %d\n", t, data );
+				printf( _("%s = %d\n"), t, data );
 
 			return 1;
 		}
@@ -719,11 +722,11 @@ jtag_parse_line( char *line )
 		if (strcmp( t, "script" ) == 0) {
 			t = get_token( NULL );          /* filename */
 			if (!t) {
-				printf( "script: missing filename\n" );
+				printf( _("script: missing filename\n") );
 				return 1;
 			}
 			if (get_token( NULL )) {
-				printf( "script: syntax error\n" );
+				printf( _("script: syntax error\n") );
 				return 1;
 			}
 
@@ -732,7 +735,7 @@ jtag_parse_line( char *line )
 			return 1;
 		}
 
-		printf( "%s: unknown command\n", t );
+		printf( _("%s: unknown command\n"), t );
 
 	return 1;
 }
@@ -766,7 +769,7 @@ jtag_parse_file( const char *filename )
 
 	f = fopen( filename, "r" );
 	if (!f) {
-		printf( "Unable to open file `%s'!\n", filename);
+		printf( _("Unable to open file `%s'!\n"), filename);
 		return 1;
 	}
 
@@ -815,15 +818,15 @@ main( void )
 #endif /* ENABLE_NLS */
 
 	printf(
-			"%s\n"
+			_("%s\n"
 			"Copyright (C) 2002, 2003 ETC s.r.o.\n"
 			"%s is free software, covered by the GNU General Public License, and you are\n"
 			"welcome to change it and/or distribute copies of it under certain conditions.\n"
-			"There is absolutely no warranty for %s.\n\n", PACKAGE_STRING, PACKAGE, PACKAGE
+			"There is absolutely no warranty for %s.\n\n"), PACKAGE_STRING, PACKAGE, PACKAGE
 	);
 
-	printf( "Warning: %s may damage your hardware! Type \"quit\" for exit!\n\n", PACKAGE );
-	printf( "Type \"help\" for help.\n\n" );
+	printf( _("Warning: %s may damage your hardware! Type \"quit\" for exit!\n\n"), PACKAGE );
+	printf( _("Type \"help\" for help.\n\n") );
 
 	/* Create ~/.jtag */
 	jtag_create_jtagdir();