X-Git-Url: http://git.jankratochvil.net/?p=mdsms.git;a=blobdiff_plain;f=mdsms.c;h=932dc490f6cbc8e7d265e2555988b513ed8c5843;hp=24de2032ca171188d34f89af30edf9c1a07d9a0a;hb=0dbec2d4713c86e1af1b09e95903bb3c2f925eac;hpb=105a34a1ed2524b6f305d3f701a4e0f5f7df8141

diff --git a/mdsms.c b/mdsms.c
index 24de203..932dc49 100644
--- a/mdsms.c
+++ b/mdsms.c
@@ -56,6 +56,9 @@ static char rcsid[] ATTR_UNUSED = "$Id$";
 #ifdef HAVE_SYS_POLL_H
 #include <sys/poll.h>
 #endif
+#ifdef HAVE_LOCALE_H
+#include <locale.h>
+#endif
 
 #ifdef HAVE_GETOPT_LONG
 #include <getopt.h>
@@ -83,7 +86,7 @@ static char rcsid[] ATTR_UNUSED = "$Id$";
 #define d7(n1,n2,n3,n4,n5,n6,n7)    dB((dO,n1,n2,n3,n4,n5,n6,n7   ))
 #define d8(n1,n2,n3,n4,n5,n6,n7,n8) dB((dO,n1,n2,n3,n4,n5,n6,n7,n8))
 
-static const char version[]="This is Mobile Device SMS tool (" PACKAGE " " VERSION ")\n";
+static const char version[]="Mobile Device SMS tool (" PACKAGE " " VERSION ")\n";
 
 static int verbose
 #ifdef DEBUG
@@ -93,9 +96,29 @@ static int verbose
 static char *pname;
 static int dis_cleanup=0,devfd=-1;
 
-static char *phone,*device,*logname,*lockfile,*smsc,*maxretry,*readtime,*chartime,*cmdtime,*baud,*restore;
+static char *phone,*device,*logname,*lockfile,*smsmode,*pdusmscmode,*smsc,*maxretry,*readtime,*chartime,*cmdtime,*baud,*restore;
 static int readbody;
 static long maxretryn=DEF_MAXRETRY,readtimen=-1,chartimen=DEF_CHARTIME,cmdtimen=DEF_CMDTIME,baudn=DEF_BAUD;
+#ifdef HAVE_CRTSCTS
+static int handshake_rtscts;
+static unsigned handshake_stamp;
+#else
+#define handshake_rtscts (0)
+#endif
+static enum {
+	FSM_AUTO=0,
+	FSM_PDU,
+	FSM_TEXT
+	} force_smsmode=FSM_AUTO;
+static enum {
+	FPSM_AUTO=0,
+	FPSM_COUNT_IN,
+	FPSM_COUNT_OUT,
+	FPSM_NONE
+	} force_pdusmscmode=FPSM_AUTO,
+#define FPSM_MIN (FPSM_COUNT_IN)
+#define FPSM_MAX (FPSM_NONE)
+		try_pdusmscmode=FPSM_MIN;
 static size_t bodylen;
 /* --send / --send-mobildock / --receive specific */
 static char *body;
@@ -141,7 +164,7 @@ char host[LINE_MAX];
 	if (!logf) return;
 	if (mypid==-1) {
 		mypid=getpid();
-		if (gethostname(host,sizeof(host))) strcpy(host,"<ERROR>");
+		if (gethostname(host,sizeof(host))) strcpy(host,_("<ERROR>"));
 		}
 	time(&stamp);
 	ctm=ctime(&stamp);
@@ -188,7 +211,7 @@ char fatal,pm;
 static void chk(const void *p)
 {
 	if (p) return;
-	error("!Virtual memory exhausted");
+	error(_("!Virtual memory exhausted"));
 }
 
 static char *devcmd(const char *term,const char *catch,const char *send,...) ATTR_PRINTFORMAT(3,4);
@@ -200,7 +223,7 @@ static void unlockdevice(int hard)
 	if (!hard && locked>1) { locked--; return; }
 	d2("Removing lockfile \"%s\"\n",lockreal);
 	if (unlink(lockreal))
-		error("^Error removing my device lockfile \"%s\"",lockreal);
+		error(_("^Error removing my device lockfile \"%s\""),lockreal);
 	locked=0;
 }
 
@@ -217,7 +240,7 @@ char *cmd=restore;
 		}
 	if (restios_yes) {
 		if (tcsetattr(devfd,TCSANOW,&restios))
-			error("^Error restoring termios for device");
+			error(_("^Error restoring termios for device"));
 		restios_yes=0;
 		}
 	unlockdevice(1);
@@ -227,16 +250,18 @@ char *cmd=restore;
 
 static void usage(void)
 {
-	fprintf(stderr,"\
+	fprintf(stderr,_("\
 \n\
 %s\
 \n\
-Usage: " PACKAGE " [-c|--config <cfgfile>] [-d|--device <device>]\n\
-             {--send | --send-mobildock | --receive | --logo-send}\n\
-             [-L|--log <file>] [-b|--baud <rate>]\n\
-             [-l|--lockfile <lock>] [-s|--smsc <smsc #>] [-m|--maxretry <#>]\n\
+Usage: %s [-c|--config <cfgfile>] [-d|--device <device>]\n\
+             [-L|--log <file>] [-l|--lockfile <lock>]\n\
+             [-b|--baud <rate>] [-x|--xonxoff] [-C|--rtscts]\n\
+             [-M|--smsmode <mode>] [-P|--pdusmscmode <mode>]\n\
+             [-s|--smsc <smsc #>] [-m|--maxretry <#>]\n\
              [-r|--readtime <sec>] [-t|--chartime <msec>] [-T|--cmdtime <msec>]\n\
              [-v|--verbose] [-h|--help] [-V|--version]\n\
+             {--send | --send-mobildock | --receive | --logo-send}\n\
   --send / --send-mobildock:\n\
              [-f|--file] <dest. phone> <msg text|msg filename>\n\
   --receive:\n\
@@ -247,16 +272,21 @@ Usage: " PACKAGE " [-c|--config <cfgfile>] [-d|--device <device>]\n\
              <dest. phone> <ring filename>\n\
 \n\
  -c, --config\tRead this additional config file\n\
-\t\t(def. \"" CONFIG_MAIN "\" and \"$HOME" CONFIG_HOME "\")\n\
- -d, --device\tMobile on this serial device (def. \"" DEF_DEVICE "\")\n\
- -L, --log\tLog all important messages to this file (def. \"" DEF_LOGNAME "\")\n\
- -b, --baud\tSet baudrate, 2400-57600 supported (def. %d)\n\
+\t\t(def. \"%s\" and \"$HOME%s\")\n\
+ -d, --device\tMobile on this serial device (def. \"%s\")\n\
+ -L, --log\tLog all important messages to this file (def. \"%s\")\n\
  -l, --lockfile\tLock serial port by this file, \"%%s\" is basename of device\n\
 \t\t(def. \"%s\")\n\
+ -b, --baud\tSet baudrate, 2400-57600 supported (def. %d)\n\
+ -x, --xonxoff\tUse XON/XOFF (AKA software) serial port handshaking - default\n\
+ -C, --rtscts\tUse RTS/CTS (AKA hardware) serial port handshaking%s\n\
+ -M, --smsmode\tForce SMS as: \"pdu\" or 0: PDU mode, \"text\" or 1: text mode\n\
+ -P, --pdusmscmode\tForce PDU as: \"count-in\", \"count-out\", \"none\"\n\
  -s, --smsc\tUse this SMS Center number (def. query from mobile)\n\
  -m, --maxretry\tMaximum retries of any command before giving up (def. %d)\n\
  -r, --readtime\tSeconds for maximum wait time for response\n\
-\t\t(def. %ds standard, %ds for MobilDock modes, multiplied %dx for long cmds)\n\
+\t\t(def. %ds standard, %ds for MobilDock modes,\n\
+\t\t multiplied %dx for long cmds)\n\
  -t, --chartime\tMilliseconds between each char (def. %dms)\n\
  -T, --cmdtime\tMilliseconds before each whole AT command (def. %dms)\n\
  -v, --verbose\tIncrease verbosity level, more \"-v\"s give more messages\n\
@@ -269,17 +299,25 @@ Usage: " PACKAGE " [-c|--config <cfgfile>] [-d|--device <device>]\n\
  <command name>\tProgram to run on receive, message will be on stdin\n\
 \t\tFollowing substitutes are recognized:\n\
 \t\t%%p - source phone number\n\
-\t\t%%T - timestamp from SMSC as number of seconds from 1970\n\
-\t\t%%t - ctime(3) style timestamp (e.g. \"Wed Jun 30 21:49:08 1993\")\n\
+\t\t%%T - timestamp from SMSC as # of seconds from 1970 (-1 if invalid)\n\
+\t\t%%t - ctime(3) style timestamp (e.g. \"Wed Jun 30 21:49:08 1993\"),\n\
+\t\t     empty string if invalid\n\
+\t\t%%s - originating SMSC number, if available (else empty)\n\
 --logo-send:\n\
  <GSMnet id>\t* Oper. logo: Enter custom network code MccMnc, e.g. 23002\n\
-\t\t* Oper. logo: Specify \"" WORD_NET "\" to read network code from NOL file\n\
-\t\t* Group gfx : Specify \"" WORD_GROUP "\" to send logo as group graphics\n\
+\t\t* Oper. logo: Specify \"%s\" to read network code from NOL file\n\
+\t\t* Group gfx : Specify \"%s\" to send logo as group graphics\n\
 \n\
 You may need to use the following line to catch all of this help text:\n\
 ./mdsms 2>&1|more\n\
-\n",version,DEF_BAUD,DEF_LOCKFILE,DEF_MAXRETRY,
-DEF_READTIME,DEF_READTIME_MOBILDOCK,EXT_READTIME,DEF_CHARTIME,DEF_CMDTIME);
+\n"),version,PACKAGE,CONFIG_MAIN,CONFIG_HOME,DEF_DEVICE,DEF_LOGNAME,DEF_LOCKFILE,DEF_BAUD,
+#ifdef HAVE_CRTSCTS
+		"",
+#else
+		_("\n\t\t(Not supported on this platform!)"),
+#endif
+DEF_MAXRETRY,DEF_READTIME,DEF_READTIME_MOBILDOCK,EXT_READTIME,DEF_CHARTIME,DEF_CMDTIME,
+WORD_NET,WORD_GROUP);
 	exit(EXIT_FAILURE);
 }
 
@@ -296,20 +334,25 @@ static const struct option longopts[]={
 {"recv"          ,0,0,MODE_RECEIVE},
 {"logo"          ,0,0,MODE_LOGO_SEND},
 {"ring"          ,0,0,MODE_RING_SEND},
-{"config"  ,1,0,'c'},
-{"device"  ,1,0,'d'},
-{"log"     ,1,0,'L'},
-{"baud"    ,1,0,'b'},
-{"lockfile",1,0,'l'},
-{"smsc"    ,1,0,'s'},
-{"maxretry",1,0,'m'},
-{"readtime",1,0,'r'},
-{"chartime",1,0,'t'},
-{"cmdtime" ,1,0,'T'},
-{"file"    ,0,0,'f'},
-{"verbose" ,0,0,'v'},
-{"help"    ,0,0,'h'},
-{"version" ,0,0,'V'}};
+{"config"      ,1,0,'c'},
+{"device"      ,1,0,'d'},
+{"log"         ,1,0,'L'},
+{"lockfile"    ,1,0,'l'},
+{"baud"        ,1,0,'b'},
+{"xonxoff"     ,0,0,'x'},
+{"rtscts"      ,0,0,'C'},
+{"smsmode"     ,1,0,'M'},
+{"pdusmscmode" ,1,0,'P'},
+{"smsc"        ,1,0,'s'},
+{"maxretry"    ,1,0,'m'},
+{"readtime"    ,1,0,'r'},
+{"chartime"    ,1,0,'t'},
+{"cmdtime"     ,1,0,'T'},
+{"file"        ,0,0,'f'},
+{"verbose"     ,0,0,'v'},
+{"help"        ,0,0,'h'},
+{"version"     ,0,0,'V'},
+{NULL          ,0,0,0  }};
 
 static void processargs(int argp,char **args,const char *from);
 
@@ -319,7 +362,7 @@ static unsigned cfgstacki=0;
 static void chkfclose(FILE *f,const char *fname)
 {
 	if (fclose(f))
-		error("^Error closing \"%s\"",fname);
+		error(_("^Error closing \"%s\""),fname);
 }
 
 static long getfilesize(FILE *f,const char *fname)
@@ -327,9 +370,9 @@ static long getfilesize(FILE *f,const char *fname)
 long size;
 
 	if (fseek(f,0,SEEK_END))
-		error("^Error seeking to end of \"%s\"",fname);
+		error(_("^Error seeking to end of \"%s\""),fname);
 	if ((size=ftell(f))<0)
-		size=-1,error("^Error measuring \"%s\"",fname);
+		size=-1,error(_("^Error measuring length of \"%s\""),fname);
 	rewind(f);
 	return(size);
 }
@@ -345,22 +388,22 @@ long size;
 static unsigned tot=0;
 
 	if (tot++>=MAXCFGNUM) {
-		if (tot==MAXCFGNUM+1) error("Too many config files to read, max is %d, break-out",MAXCFGNUM);
+		if (tot==MAXCFGNUM+1) error(_("Too many config files to read, max is %d, break-out"),MAXCFGNUM);
 		return;
 		}
 	if (!(f=fopen(fname,"rt"))) {
-		if (!quiet) error("^Can't open config file \"%s\" for r/o",fname);
+		if (!quiet) error(_("^Can't open config file \"%s\" for r/o"),fname);
 		return;
 		}
 		
-	if (verbose>=2) error(".Reading config file \"%s\"",fname);
+	if (verbose>=2) error(_(".Reading config file \"%s\""),fname);
 	if ((size=getfilesize(f,fname))==-1) size=0;
 	if (size>MAXCONFIG) 
-		error("File \"%s\" is too long, read only %d bytes",fname,MAXCONFIG);
+		error(_("File \"%s\" is too long, read only %d bytes"),fname,MAXCONFIG);
 	chk(buf=malloc((size?size:MAXCONFIG)+1));
 	got=fread(buf,1,(size?size:MAXCONFIG),f);
 	if (size && got!=size)
-		error("File \"%s\" read error, got only %u bytes of %ld",fname,got,size);
+		error(_("File \"%s\" read error, got only %u bytes of %ld"),fname,got,size);
 	chkfclose(f,fname);
 	buf[got]='\0';
 	args[0]=pname;
@@ -371,13 +414,13 @@ char c=*s;
 			if (!blank) {
 				*d='\0';
 				blank=1;
-				if (verbose>=2) error("\nConfig \"%s\": arg#%d: %s",fname,argp-1,args[argp-1]);
+				if (verbose>=2) error(_("\nConfig \"%s\": arg#%d: %s"),fname,argp-1,args[argp-1]);
 				}
 			continue;
 			}
 		if (blank) {
 			if (argp>=NELEM(args)-1) {
-				error("Too many arguments in \"%s\", from offset %d ignored",fname,s-buf);
+				error(_("Too many arguments in \"%s\", from offset %d ignored"),fname,s-buf);
 				break;
 				}
 			args[argp++]=s;
@@ -505,15 +548,17 @@ static struct {
 	char **const var;
 	unsigned stamp;
 	} optset[]={
-		{ 'd',&device   },
-		{ 'L',&logname  },
-		{ 'b',&baud     },
-		{ 'l',&lockfile },
-		{ 's',&smsc     },
-		{ 'm',&maxretry },
-		{ 'r',&readtime },
-		{ 't',&chartime },
-		{ 'T',&cmdtime  },
+		{ 'd',&device       },
+		{ 'L',&logname      },
+		{ 'l',&lockfile     },
+		{ 'b',&baud         },
+		{ 'M',&smsmode      },
+		{ 'P',&pdusmscmode  },
+		{ 's',&smsc         },
+		{ 'm',&maxretry     },
+		{ 'r',&readtime     },
+		{ 't',&chartime     },
+		{ 'T',&cmdtime      },
 	};
 
 static void processargs(int argp,char **args,const char *from)
@@ -524,15 +569,15 @@ int i;
 
 	seq++;
 	optarg=NULL; optind=0; /* FIXME: Possible portability problem. */
-	while ((optc=getopt_long(argp,args,"c:d:L:b:l:s:m:r:t:T:fvhV",longopts,NULL))!=EOF) switch (optc) {
+	while ((optc=getopt_long(argp,args,"c:d:L:l:b:xCM:P:s:m:r:t:T:fvhV",longopts,NULL))!=EOF) switch (optc) {
 		case 'c':
 			if (cfgstacki>=NELEM(cfgstack)) {
-				error("Looping (%d) during attempt to read config file \"%s\", break-out",NELEM(cfgstack),from);
+				error(_("Looping (%d) during attempt to read config file \"%s\", break-out"),NELEM(cfgstack),from);
 				break;
 				}
 			chk(cfgstack[cfgstacki++]=strdup(optarg));
 			break;
-		case 'd': case 'L': case 'b': case 'l': case 's': case 'm': case 'r': case 't': case 'T':
+		case 'd': case 'L': case 'b': case 'l': case 'M': case 'P': case 's': case 'm': case 'r': case 't': case 'T':
 			for (i=0;i<NELEM(optset);i++)
 				if (optset[i].c==optc) {
 					if (optset[i].stamp && optset[i].stamp!=seq) {
@@ -546,6 +591,16 @@ int i;
 					}
 			assert(i<NELEM(optset));
 			break;
+		case 'x': case 'C':
+#ifdef HAVE_CRTSCTS
+			if (handshake_stamp && handshake_stamp!=seq) break;
+			handshake_rtscts=(optc=='C');
+			handshake_stamp=seq;
+#else
+			if (optc=='C')
+				error(_("!RTS/CTS handshake NOT supported on this platform! Occured during parsing option %d from \"%s\""),optind-1,from);
+#endif
+			break;
 		case MODE_SEND:
 		case MODE_SEND_MOBILDOCK:
 		case MODE_RECEIVE:
@@ -566,7 +621,7 @@ int i;
 			exit(EXIT_FAILURE);
 		default:
 			if (optc!='h')
-				error("\nLast getopt(3) error occured during parsing option %d from \"%s\"! Follows help:",optind-1,from);
+				error(_("\nLast getopt(3) error occured during parsing option %d from \"%s\"! Follows help:"),optind-1,from);
 			usage();
 			break;
 		}
@@ -587,13 +642,13 @@ static const struct nullcheck {
 	const char *name;
 	} nullcheck[]={
 		{&phone,MODE_BIT(MODE_SEND)|MODE_BIT(MODE_SEND_MOBILDOCK)|MODE_BIT(MODE_LOGO_SEND),
-			"destination phone number"},
-		{&logoname,MODE_BIT(MODE_LOGO_SEND),"logo filename"},
-		{&ringname,MODE_BIT(MODE_RING_SEND),"ring filename"},
-		{&body,MODE_BIT(MODE_RECEIVE),"body text"}, /* we allow empty bodies for SENDs */
+			N_("destination phone number")},
+		{&logoname,MODE_BIT(MODE_LOGO_SEND),N_("logo filename")},
+		{&ringname,MODE_BIT(MODE_RING_SEND),N_("ring filename")},
+		{&body,MODE_BIT(MODE_RECEIVE),N_("body text")}, /* we allow empty bodies for SENDs */
 #if 0
-		{&gsmnet,"GSM operator network code",MODE_LOGO_SEND},
-		{&device,"device for communication",0},
+		{&gsmnet,MODE_BIT(MODE_LOGO_SEND),N_("GSM operator network code")},
+		{&device,0,N_("device for communication")},
 #endif
 	};
 static char **emptycheck[]={&logname,&smsc,&logoname,&gsmnet};
@@ -613,7 +668,7 @@ static inline void cmdline_done(void)
 {
 char *s;
 	while ((s=nextargstack())) {
-		error("\nExcessive option %d from \"%s\" ignored: %s",
+		error(_("\nExcessive option %d from \"%s\" ignored: %s"),
 			lastargstack_index,lastargstack_from,s);
 		free(s);
 		}
@@ -627,12 +682,12 @@ static char err[LINE_MAX];
 
 	for (s=s1=(phone+(*phone=='+'));*s && s-s1<MAXNUMLEN;s++)
 		if (!isdigit(*s)) {
-			VARPRINTF2(err,"Invalid digit '%c' in phone number - at offset %d",
+			VARPRINTF2(err,_("Invalid digit '%c' in phone number - at offset %d"),
 				*s,s-phone);
 			return(err);
 			}
 	if (!*s) return(NULL);
-	VARPRINTF2(err,"Phone number too long (%d), max. %d digits allowed",
+	VARPRINTF2(err,_("Phone number too long (%d), max. %d digits allowed"),
 		strlen(s1),MAXNUMLEN);
 	return(err);
 }
@@ -643,7 +698,7 @@ static void cmdline_phone(void)
 char *s;
 
 		if ((s=check_phone(phone)))
-			error("!%s in option %d from \"%s\": %s",
+			error(_("!%s in option %d from \"%s\": %s"),
 					s,lastargstack_index,lastargstack_from,phone);
 		}
 }
@@ -656,9 +711,9 @@ char *s;
 		body=glueargstack(&bodylen," ");
 		for (s=body;(s=strchr(s,'%'));s++)
 			switch (*++s) {
-				case 'p': case 'T': case 't': break;
+				case 'p': case 'T': case 't': case 's': break;
 				default:
-					error("Unknown formatsymbol '%c', use (\"%%%%%c\" to fix it) at pos %d in: %s",
+					error(_("Unknown formatsymbol '%c' (use \"%%%%%c\" to fix it) at pos %d in: %s"),
 						*s,*s,s-body,body);
 				}
 		}
@@ -685,20 +740,20 @@ char *s,*d,e=0;
 			for (d=s=gsmnet;*s;s++) {
 				if (isdigit(*s)) { *d++=*s; continue; }
 				if (isspace(*s)) continue;
-				error("\nInvalid characted '%c' in GSMnet at offs %d: %s",
+				error(_("\nInvalid characted '%c' in GSMnet at offs %d: %s"),
 					*s,s-gsmnet,ogsmnet);
 				e=1;
 				break;
 				}
 			if ((d-gsmnet)!=5) {
-				error("\nGSMnet is required to have exactly 5 digits or to be\n\
-either \"" WORD_NET "\" or \"" WORD_GROUP "\", but found length %d: %s",
-					d-gsmnet,ogsmnet);
+				error(_("\nGSMnet is required to have exactly 5 digits or to be\n\
+either \"%s\" or \"%s\", but found length %d: %s"),
+					WORD_NET,WORD_GROUP,d-gsmnet,ogsmnet);
 				e=1;
 				}
 			if (!e) *d='\0';
 			else {
-				error("\nGSMnet option %d from \"%s\" rejected due to previous errors: %s",
+				error(_("\nGSMnet option %d from \"%s\" rejected due to previous errors: %s"),
 					lastargstack_index,lastargstack_from,ogsmnet);
 				free(gsmnet);
 				gsmnet=NULL;
@@ -716,7 +771,7 @@ static inline void cmdline_ring_send(void)
 static void lockclose(int fd)
 {
 	if (close(fd))
-		error("Error closing lockfile \"%s\"",lockreal);
+		error(_("Error closing lockfile \"%s\""),lockreal);
 }
 
 static inline int lockdevice(int attempt)
@@ -735,12 +790,12 @@ pid_t pid;
 recheck:
 		if (delay) sleep(delay);
 		delay=DEVLOCK_PERIOD;
-		if (verbose>=3) error(".Checking the lockfile \"%s\"..",lockreal);
+		if (verbose>=3) error(_(".Checking the lockfile \"%s\".."),lockreal);
 		if ((fd=open(lockreal,O_RDONLY))==-1) break;
 		if ((got=read(fd,buf,sizeof(buf)-1))<=0) {
 isempty:
 			if (empty>=DEVLOCK_MAXEMPTY) {
-				error(".Lockfile \"%s\" is still not valid, removing it",lockreal);
+				error(_(".Lockfile \"%s\" is still not valid, removing it"),lockreal);
 				goto remove;
 				}
 			empty++;
@@ -752,27 +807,27 @@ isempty:
 		empty=0;
 		errno=0;
 		if (kill(pid,0) && errno!=ESRCH && errno!=EPERM)
-			error("^Error during checking consciousness of PID %d",pid);
+			error(_("^Error during checking consciousness of PID %d"),pid);
 		if (errno!=ESRCH) {
 			if (attempt) return(0);
 			continue;
 			}
-		error(".Lockfile \"%s\" is stale (PID %d), removing it",lockreal,pid);
+		error(_(".Lockfile \"%s\" is stale (PID %d), removing it"),lockreal,pid);
 remove:
 		lockclose(fd);
 		if (unlink(lockreal))
-			error("^Error removing foreign lockfile \"%s\"",lockreal);
+			error(_("^Error removing foreign lockfile \"%s\""),lockreal);
 		break;
 		}
 	errno=0;
 	if ((fd=open(lockreal,O_WRONLY|O_CREAT|O_EXCL,0644))==-1) {
 		if (errno==EEXIST) goto recheck;
-		error("^!Error creating lockfile \"%s\"",lockreal);
+		error(_("^!Error creating lockfile \"%s\""),lockreal);
 		}
 	locked=1;
 	got=VARPRINTF(buf,"%010d\n",getpid()); assert(got==11);
 	if (write(fd,buf,got)!=got)
-		error("^!Error writing data to lockfile \"%s\"",lockreal);
+		error(_("^!Error writing data to lockfile \"%s\""),lockreal);
 	lockclose(fd);
 	return((locked=1));
 }
@@ -792,7 +847,7 @@ static void sigalarm(int signo)
 {
 	setalarm();
 	wasalarm=1;
-	if (verbose>=1) error("Timed out");
+	if (verbose>=1) error(_("Timed out"));
 }
 
 static void blocking(char yes)
@@ -800,14 +855,15 @@ static void blocking(char yes)
 static char state=-1;
 	if (state==yes) return;
 	if (fcntl(devfd,F_SETFL,(yes?0:O_NONBLOCK)))
-		error("^!fcntl() on device for %sblocking mode",(yes?"":"non-"));
+		error(_("^!fcntl() on device for %s mode"),(yes?_("blocking"):_("non-blocking")));
 	state=yes;
 }
 
-static const char *record;
+static const char *record,*recordend;
 static char *catchdata;
 static size_t catchdatal,catchdatasiz;
 
+static char *reform(const char *s,int slot);
 static void catched(const char *end,char edata)
 {
 size_t len;
@@ -825,15 +881,16 @@ const char *p;
 		memcpy(catchdata+catchdatal,record,len);
 		catchdatal+=len;
 		}
-	record=(p?NULL:end);
+	record   =(p?NULL:end);
+	recordend=(p?p   :end);
 	assert(catchdatal<=catchdatasiz);
 }
 
 static int retrycnt=0;
 static void retrying(void)
 {
-	if (maxretryn>=0 && ++retrycnt>maxretryn) error("!Maximum command retry count (%ld) exceeded",maxretryn);
-	if (verbose>=2) error(".Retrying phase, %d out of %ld..",retrycnt,maxretryn);
+	if (maxretryn>=0 && ++retrycnt>=maxretryn) error(_("!Maximum command retry count (%ld) exceeded"),maxretryn);
+	if (verbose>=2) error(_(".Retrying phase, %d out of %ld.."),retrycnt,maxretryn);
 }
 
 static char *reform(const char *s,int slot)
@@ -846,7 +903,7 @@ char c,*d;
 struct formslot *fs;
 
 	assert(slot>=0 && slot<NELEM(arr));
-	if (!s) return("<unset>");
+	if (!s) return(_("<unset>"));
 	if (!(fs=&arr[slot])->s)
 		chk(fs->s=malloc(fs->l=LINE_MAX));
 	d=fs->s;
@@ -882,21 +939,27 @@ static size_t bufl;
 ssize_t got;
 char *hit,*s;
 va_list ap;
-char errout,extend,noconvcr,edata;
+char errout,extend,catch_any,edata;
 long alarmtime;
 const char *osend;
 static const char emptystring[]="";
+size_t discard;
 
 	if (!term) term="\nOK\n";
 	if (!strcmp(send," ")) send=NULL; /* GCC formatstring-check workaround */
+	if (verbose>=2) error(_(".devcmd(sendfmt=%s,term=%s,catch=%s)"),
+		reform(send,0),reform(term,1),reform(catch,2));
 	if (!(osend=send)) send="";
-	if ((noconvcr=(catch && *catch=='@'))) catch++;
+	if ((catch_any=(catch && !strcmp(catch,"@")))) catch=NULL;
 	if ((errout=(*send=='!'))) send++;
 	errout|=(maxretryn==-1);
 	if ((extend=(*send=='~'))) send++;
 	alarmtime=readtimen*(extend?EXT_READTIME:1);
-	d8("devcmd(), alarmtime=%ld, errout=%d, extend=%d, noconvcr=%d, osend=%p, bufl=%d, buf: %s\n",
-		alarmtime,errout,extend,noconvcr,osend,bufl,reform(buf,0));
+	buf[bufl]='\0'; /* for d8() below */
+	d8("devcmd(), alarmtime=%ld, errout=%d, extend=%d, catch_any=%d, osend=%p, bufl=%d, buf: %s\n",
+		alarmtime,errout,extend,catch_any,osend,bufl,reform(buf,0));
+	assert(!catch || !strchr(catch,'\r')); /* we are no longer supporting 'noconvcr'! */
+	assert(!term  || !strchr(term ,'\r'));
 	if (0) {
 err:
 		alarm(0);
@@ -910,29 +973,28 @@ err:
 		va_start(ap,send);
 		l=VARVPRINTF(buf,send,ap); bufl=l+(!!osend);
 		va_end(ap);
-		if (bufl>=sizeof(buf)-1) error("!Command too big (%d>%d)",bufl,sizeof(buf)-1);
-		if (verbose>=2) error(".devcmd(send=%s,term=%s,catch=%s,timeout=%ld)",
-			reform(buf,0),reform(term,1),reform(catch,2),alarmtime);
+		if (bufl>=sizeof(buf)-1) error(_("!Command too big (%d>%d)"),bufl,sizeof(buf)-1);
+		if (verbose>=2) error(_(".devcmd formatted send=%s%s"),reform(buf,0),(osend?"+\"\\r\"":""));
 		if (osend) buf[l]='\r';
 		for (offs=0,got=0;offs<bufl;offs++) {
 			alarm(MAXSENDTIME);
 			usleep((offs?chartimen:cmdtimen)*1000);
 			if (!offs && tcflush(devfd,TCIOFLUSH))
-				error("^Error flushing I/O queue of device");
+				error(_("^Error flushing I/O queue of device"));
 			if (write(devfd,buf+offs,1)!=1) break;
 			got++;
 			if (tcdrain(devfd))
-				error("^Error forcing output of char at pos %d of cmd %s",offs,reform(buf,0));
+				error(_("^Error forcing output of char at pos %d of cmd %s"),offs,reform(buf,0));
 			}
 		alarm(0);
 		if (got!=bufl) {
-			error("^Wrote only %d of %d bytes of command",got,bufl);
+			error(_("^Wrote only %d of %d bytes of command"),got,bufl);
 			goto err;
 			}
 		}
 
 	if (!(terml=strlen(term))) {
-		assert(!catch);
+		assert(!catch); assert(!catch_any);
 		return(NULL);
 		}
 	if (catch) {
@@ -941,13 +1003,12 @@ err:
 		}
 	else fragl=terml;
 	fragl=MAX(fragl,MAX(strlen(ERROR_SUBSTR1),strlen(ERROR_SUBSTR2)));
-	record=NULL;
+	record=recordend=NULL;
 	wasalarm=0;
 	alarm(alarmtime);
-	edata=(noconvcr?'\r':'\n');
+	edata='\n';
 	if (!osend) {
-		got=bufl;
-		bufl=0;
+		/* "bufl" important */
 		goto skipread;
 		}
 	for (;;) {
@@ -960,53 +1021,62 @@ err:
 			got=read(devfd,buf+bufl,1);
 			}
 		if (got<=0) {
-			if (wasalarm) error("Maximum response timeout (%lds) exceeded",alarmtime);
-			else error("^Couldn't read device data (ret=%d)",got);
+			if (wasalarm) error(_("Maximum response timeout (%lds) exceeded"),alarmtime);
+			else error(_("^Couldn't read device data (ret=%d)"),got);
 			goto err;
 			}
-skipread:
 		bufl2=bufl+got;
 		buf[bufl2]='\0';
 		s=buf+bufl;
 		while (buf+bufl2>s && (s=memchr(s,'\0',buf+bufl2-s))) *s++=REPL_NULLCHAR;
 		if (verbose>=3)
-			error("\nGot chunk of data from device: %s",reform(buf+bufl,0));
-		if (!noconvcr) {
+			error(_("\nGot chunk of data from device: %s"),reform(buf+bufl,0));
+		/* convert CR */ {
 			s=buf+bufl;
 			while (buf+bufl2>s && (s=memchr(s,'\r',buf+bufl2-s))) *s++='\n';
 			}
 		bufl=bufl2;
+skipread:
 		catched(buf+bufl,edata); assert(!record || record==buf+bufl);
 		assert(bufl<sizeof(buf)-1);
 		buf[bufl]='\0';
 		assert(strlen(buf)==bufl);
 		/* d3(">%s|%s<\n",buf,term); */
 		if (strstr(buf,ERROR_SUBSTR1) || strstr(buf,ERROR_SUBSTR2)) {
-			error("Found ERROR response on command %s",reform(send,0));
+			error(_("Found ERROR response on command %s"),reform(send,0));
 			goto err;
 			}
-		if (catch && !record && bufl>=catchl && (hit=strstr(buf,catch))) {
+/* "record" may get NULLed here after successful 'catch'
+ * but "recordend" will never be NULLed
+ */
+		if (catch && !recordend && bufl>=catchl && (hit=strstr(buf,catch))) {
 			record=hit+catchl;
 			catched(buf+bufl,edata); assert(!record || record==buf+bufl);
 			}
-		if (         bufl>= terml && (hit=strstr(buf,term))) {
+		if (catch_any && !recordend && buf[discard=strspn(buf,"\n" /* accept */)]) {
+			record=buf+discard;
+			catched(buf+bufl,edata); assert(!record || record==buf+bufl);
+			}
+		if (((!catch && !catch_any) || catchdatal) && bufl>= terml
+		    && (hit=strstr((recordend?recordend:buf),term))) {
 			memmove(buf,hit+terml,(bufl2=(buf+bufl)-(hit+terml))); bufl=bufl2;
 			break;
 			}
 		if (bufl<fragl) continue;
-		memmove(buf,buf+bufl-(fragl-1),(bufl2=fragl-1)); bufl=bufl2;
-		if (record) record=buf+fragl-1;
+		memmove(buf,buf+bufl-(fragl-1),(bufl2=fragl-1));
+		if (record   ) record-=bufl-bufl2;
+		if (recordend) recordend-=bufl-bufl2;
+		bufl=bufl2;
 		}
 	alarm(0);
 	if (!catchdatal) {
-		if (!catch) return("");
-		error("Data requested on command %s but no found after term %s",reform(send,0),reform(term,1));
-		goto err;
+		assert(!catch && !catch_any);
+		return("");
 		}
-	assert(!!catch);
+	assert(!!catch || catch_any);
 	record=emptystring;
 	catched(record+1,edata);
-	if (verbose>=2) error(".Returning data %s for cmd %s",reform(catchdata,0),reform(send,1));
+	if (verbose>=2) error(_(".Returning data %s for cmd %s"),reform(catchdata,0),reform(send,1));
 	return(catchdata);
 }
 
@@ -1020,7 +1090,7 @@ unsigned char n;
 	*++d=(plus?ADDR_INT:ADDR_NAT);
 	while (*addr) {
 		if (*addr<'0' || *addr>'9')
-			error("!Error during conversion of number at: %s",addr);
+			error(_("!Error during conversion of number at: %s"),addr);
 		tot++;
 		n=(*addr++)-'0';
 		if ((flip=!flip)) *++d=0xF0|n;
@@ -1053,37 +1123,39 @@ static inline void textconv(char *d,unsigned char *s,size_t len)
 static inline void smscset(void)
 {
 char *s,*t,*e,*serr;
-long l;
 unsigned char bin[2+(MAXNUMLEN+1)/2];
 
 	if (smsc) devcmd(NULL,NULL,"\r\nAT+CSCA=\"%s\"",smsc);
 	s=devcmd(NULL,"\n+CSCA:","\r\nAT+CSCA?");
 	while (isspace(*s)) s++;
 	if (!*s || !strcmp(s,"EMPTY"))
-		error("!No SMS set in mobile station found, please use option \"-s\"");
-	if (verbose>=1) error("\nFound default SMSC in mobile: %s",s);
-	if (*s!='"') error("!No left-quote found in: %s",s);
-	if (!(t=strrchr(s+1,'"'))) error("!No right-quote found in: %s",s);
-	if (s+1==t)
-		error("!No SMS set in mobile station found, please use option \"-s\"");
+		error(_("!No SMSC set in mobile station found, please use option \"-s\""));
+	if (verbose>=1) error(_("\nFound default SMSC in mobile: %s"),s);
+	if (*s++!='"') error(_("!No left-quote found in: %s"),s);
+	if (!(t=strrchr(s,'"'))) error(_("!No right-quote found in: %s"),s);
+	if (s==t)
+		error(_("!No SMS set in mobile station found, please use option \"-s\""));
 	e=t++;
 	while (isspace(*t)) t++;
-	if (*t++!=',') error("!No comma found after quotes in: %s",s);
-	while (isspace(*t)) t++;
-	l=strtol(t,&serr,10);
-	if ((l!=ADDR_NAT && l!=ADDR_INT) || (serr && *serr))
-		error("!Type parse error in: %s",s);
-	if (l==ADDR_NAT || s[1]=='+') s++;
-	else *s='+';
+	if (*t) {
+long l;
+
+		if (*t++!=',') error(_("!No comma found after quotes in: %s"),s);
+		while (isspace(*t)) t++;
+		l=strtol(t,&serr,10);
+		if ((l!=ADDR_NAT && l!=ADDR_INT) || (serr && *serr))
+			error(_("!Type parse error in: %s"),s);
+		if (l==ADDR_INT && *s!='+') *--s='+';
+		}
 	*e='\0';
-	if (verbose>=2) error("\nDecoded SMSC address: %s",s);
+	if (verbose>=2) error(_("\nDecoded SMSC address: %s"),s);
 	if (!NEED_PDUSMSC()) return;
 	chk(finalsmsc=strdup(s));
 	bin[0]=1+(prepaddr(bin,finalsmsc)+1)/2;
 	textconv(pdusmsc,bin,bin[0]+1);
 }
 
-static inline unsigned char charconv(char c,size_t offs)
+static inline unsigned char charconv_send(char c,size_t offs)
 {
 	switch (c) {
 		case '@': return(0);
@@ -1094,12 +1166,23 @@ static inline unsigned char charconv(char c,size_t offs)
 		}
 #if 0
 	if ((c>='A' && c<='Z') || (c>='a' && c<='z') || (c>='0' && c<='9')) return(c);
-	error("Can't convert character '%c' (0x%02X) at offs %d (0-based), substituted '?'",
+	error(_("Can't convert character '%c' (0x%02X) at offs %d (0-based), substituted '?'"),
 		c,(unsigned char)c,offs);
 	return('?');
 #endif
 }
 
+static inline unsigned char charconv_recv(char c,size_t offs)
+{ /* FIXME: unify with charconv_send() */
+	switch (c) {
+		case 0: return('@');
+		case 2: return('$');
+		default:
+			return(c);
+		}
+/* strict checking not done, see charconv_send */
+}
+
 /* Logo format shamelessly stolen from GNokii-0.3.0: http://www.gnokii.org/
  * Beware - Nokia Smart Messaging specification 1.0.0 and 2.0.0 is incompatible
  * with Nokia current product line implementation
@@ -1121,7 +1204,7 @@ struct hexdata *hd;
 	hd->next=NULL;
 	hexdatatail=&hd->next;
 	textconv(hd->data,bin,w);
-	if (verbose>=2) error("\nWill send hexdata: %s",hd->data);
+	if (verbose>=2) error(_("\nWill send hexdata: %s"),hd->data);
 }
 
 static inline void logoread(void)
@@ -1143,48 +1226,48 @@ int sizex,sizey,bit;
 #define WORD(n) (((unsigned char)buf[(n)])|(((unsigned char)buf[(n)+1])<<8))
 
 	if (!(f=fopen(logoname,"rb")))
-		error("^!Cannot open logo file \"%s\" for r/o",logoname);
+		error(_("^!Cannot open logo file \"%s\" for r/o"),logoname);
 	got=fread(buf,1,sizeof(buf),f);
 	chkfclose(f,logoname);
 	     if (got>=20 && !memcmp(buf,"NOL",4)) {
 		VARPRINTF2(gsmnetf,"%03.3u%02.2u",WORD(6),WORD(8));
 		assert(strlen(gsmnetf)==5);
 		r=10;
-		if (verbose>=1) error(".Reading NOL file \"%s\", GSMnet \"%s\", word@4=%d..",
+		if (verbose>=1) error(_(".Reading NOL file \"%s\", GSMnet \"%s\", word@4=%d.."),
 			logoname,gsmnetf,WORD(4));
 		}
 	else if (got>=16 && !memcmp(buf,"NGG",4)) {
 		r=6;
-		if (verbose>=1) error(".Reading NGG file \"%s\", word@4=%d..",
+		if (verbose>=1) error(_(".Reading NGG file \"%s\", word@4=%d.."),
 			logoname,WORD(4));
 		}
-	else error("!Unknown file format of logo file \"%s\"",logoname);
+	else error(_("!Unknown file format of logo file \"%s\""),logoname);
 	if (gsmnet && !strtrycasecmp(gsmnet,WORD_NET)) {
-		if (!*gsmnetf) error("!NOL network code detection requested but NOL file not loaded, please specify network code");
+		if (!*gsmnetf) error(_("!NOL network code detection requested but NOL file not loaded, please specify network code"));
 		gsmnet=gsmnetf;
 		}
 	if (!gsmnet || !strtrycasecmp(gsmnet,WORD_GROUP) || !*gsmnet) {
-		error("\nSending logo as: group graphics");
+		error(_("\nSending logo as: group graphics"));
 		gsmnet=NULL;
 		}
 	else {
-		error("\nSending logo as: operator logo for \"%s\"",gsmnet);
+		error(_("\nSending logo as: operator logo for \"%s\""),gsmnet);
 		bin[4]=0x82; /* dest port 0x1582 */
 		}
 	
 	sizex=WORD(r); sizey=WORD(r+2);
-	if (verbose>=2) error(".Magic words: @+4=%d, @+6=%d, @+8=%d",
+	if (verbose>=2) error(_(".Magic words: @+4=%d, @+6=%d, @+8=%d"),
 			WORD(r+4),WORD(r+6),WORD(r+8));
 	r+=10;
 	if (sizex<1 || sizex>255
-	 || sizey<1 || sizey>255) error("!Invalid size: %dx%d",sizex,sizey);
+	 || sizey<1 || sizey>255) error(_("!Invalid size: %dx%d"),sizex,sizey);
 	chars=((bits=sizex*sizey)+7)/8;
-	if (r+bits>got) error("!Logo file \"%s\" too short - actual=%d, need(%dx%d)=%d",
+	if (r+bits>got) error(_("!Logo file \"%s\" too short - actual=%d, need(%dx%d)=%d"),
 		logoname,got,sizex,sizey,r+chars);
 	else if (r+bits<got)
-		if (verbose>=1) error("Ignoring trailing garbage in \"%s\", used only %d bytes",logoname,r+bits);
+		if (verbose>=1) error(_("Ignoring trailing garbage in \"%s\", used only %d bytes"),logoname,r+bits);
 	if ((got=(7+(gsmnet?3:0)+4+chars))>140)
-		error("!SMS size would be %d bytes but 140 is maximum",got);
+		error(_("!SMS size would be %d bytes but 140 is maximum"),got);
 	w=7;
 	if (gsmnet) {
 		bin[w++]=((gsmnet[1]&0x0F)<<4)|(gsmnet[0]&0x0F);
@@ -1198,7 +1281,7 @@ int sizex,sizey,bit;
 		bin[w]=0;
 		for (bit=0x80;(bits>0) && (bit>0);bits--,bit>>=1) {
 			if (buf[r]!='0' && buf[r]!='1')
-				error("!Invalid character (neither '0' nor '1')in logo file \"%s\" at offset 0x%X",
+				error(_("!Invalid character (neither '0' nor '1') in logo file \"%s\" at offset 0x%X"),
 					logoname,r);
 			if (buf[r++]=='1') bin[w]|=bit;
 			}
@@ -1238,45 +1321,45 @@ long size;
 
 #define WORD(n) (((unsigned char)buf[(n)])|(((unsigned char)buf[(n)+1])<<8))
 
-	if (!(f=fopen(logoname,"rb")))
-		error("^!Cannot open logo file \"%s\" for r/o",logoname);
-	if ((size=getfilesize(f,logoname))==-1)
-		error("!File size is essential to continue operation");
+	if (!(f=fopen(ringname,"rb")))
+		error(_("^!Cannot open ring file \"%s\" for r/o"),ringname);
+	if ((size=getfilesize(f,ringname))==-1)
+		error(_("!File size determination is essential to continue operation"));
 	if (size<0x103)
-		error("!File \"%s\" size %ld too small (must >=0x103)! Is it .000 file?",
-			logoname,size);
+		error(_("!File \"%s\" size %ld too small (must >=0x103)! Is it .000 file?"),
+			ringname,size);
 	if (fseek(f,0x100,SEEK_SET))
-		error("^Seeking error on \"%s\", ignoring",logoname);
+		error(_("^Seeking error on \"%s\", ignoring"),ringname);
 	size-=0x100;
 	if (size<=BIN1_PAYLOAD) {
 		if ((got=fread(bin1+7,1,size,f))!=size)
-			error("^Read error on \"%s\", wanted %ld, got %d",logoname,size,got);
-		error("\nSending ring tone \"%s\" as single SMS (size %ld, max %d)",
+			error(_("^Read error on \"%s\", wanted %ld, got %d"),ringname,size,got);
+		error(_("\nSending ring tone \"%s\" as single SMS (size %ld, max %d)"),
 			ringname,size,BIN1_PAYLOAD);
 		nokiaprep(bin1,7+size);
 		}
 	else {
 		totn=(size+BINN_PAYLOAD-1)/BINN_PAYLOAD;
 		if (totn>0xFF)
-			error("!File size %ld too large for multi-SMS ring upload (max=%d)",
+			error(_("!File size %ld too large even for multi-SMS ring upload (max=%d)"),
 				size,BINN_PAYLOAD*0xFF);
 		binn[10]=totn;
 		if (verbose>=1)
-			error("\nSending ring tone \"%s\" as %d multi-SMSes (size %ld, max %d, frag %d)",
+			error(_("\nSending ring tone \"%s\" as %d multi-SMSes (size %ld, max %d, frag %d)"),
 				ringname,totn,size,BIN1_PAYLOAD,BINN_PAYLOAD);
 		binn[9]=time(NULL)&0x100; /* rand() would be better but it is a compatibility pain */
 		if (verbose>=1)
-			error("\nUsing unique multi-SMS ID 0x%02X",(unsigned)binn[9]);
+			error(_("\nUsing unique multi-SMS ID 0x%02X"),(unsigned)binn[9]);
 		for (fragn=1;fragn<=totn;fragn++) {
 			binn[11]=fragn;
 			want=MIN(size,BINN_PAYLOAD);
 			if ((got=fread(binn+12,1,want,f))!=want)
-				error("^Read error on \"%s\", wanted %d, got %d",logoname,want,got);
+				error(_("^Read error on \"%s\", wanted %d, got %d"),ringname,want,got);
 			nokiaprep(binn,12+want);
 			size-=want;
 			}
 		}
-	chkfclose(f,logoname);
+	chkfclose(f,ringname);
 #undef WORD
 }
 
@@ -1297,7 +1380,7 @@ size_t offs=0;
 	*d++=PDU_DCS;
 	*d++=PDU_VP;
 	if (bodylen>MAXBODYLEN) {
-		error("Body too large (%d>%d), cut",bodylen,MAXBODYLEN);
+		error(_("Body too large (%d>%d), cut"),bodylen,MAXBODYLEN);
 		body[(bodylen=MAXBODYLEN)]='\0';
 		}
 	bodyr=body;
@@ -1306,7 +1389,7 @@ size_t offs=0;
 	while (bodylen || inb) {
 		if (!inb) {
 			assert(bodylen>0); assert(!!*body);
-			inreg=charconv(*bodyr++,offs++);
+			inreg=charconv_send(*bodyr++,offs++);
 			bodylen--;
 			inb=7;
 			}
@@ -1344,16 +1427,16 @@ char *finame;
 	readbody=0;
 	if (!finame) {
 		if (verbose>=1)
-			error("\nPlease enter the SMS text body, end with EOF (ctrl-D):");
+			error(_("\nPlease enter the SMS text body, end with EOF (ctrl-D):"));
 		}
 	else {
 		if (!(fin=fopen(finame,"rt")))
-			error("^!Can't open data file \"%s\" for r/o",finame);
+			error(_("^!Can't open data file \"%s\" for r/o"),finame);
 		}
 	chk(body=malloc(BODYLOAD));
 	bodylen=fread(body,1,BODYLOAD,fin);
 	if (bodylen==-1)
-		error("^!Error reading stream \"%s\"",(finame?finame:"<stdin>"));
+		error(_("^!Error reading stream \"%s\""),(finame?finame:_("<stdin>")));
 	if (finame) {
 		chkfclose(fin,finame);
 		free(finame);
@@ -1381,7 +1464,7 @@ retry:
 #else /* HAVE_POLL */
 #ifdef HAVE_FD_SETSIZE
 	if (devfd>=FD_SETSIZE)
-		error("!Device file descriptor %d can't fit in select() FD_SETSIZE (%d)",
+		error(_("!Device file descriptor %d can't fit in select() FD_SETSIZE (%d)"),
 			devfd,FD_SETSIZE);
 #endif /* HAVE_FD_SETSIZE */
 	FD_ZERO(&rfds); FD_SET(devfd,&rfds);
@@ -1390,14 +1473,14 @@ retry:
 #endif /* HAVE_POLL */
 	if (immed && i==0) return(0);
 	if (i!=1)
-		error("^Failed (retval %d) while waiting for data, ignoring",i);
+		error(_("^Failed (retval %d) while waiting for data, ignoring"),i);
 
 #ifdef HAVE_POLL
 	if (ufd.revents&(POLLERR|POLLHUP))
 #else /* HAVE_POLL */
 	if (FD_ISSET(devfd,&xfds))
 #endif /* HAVE_POLL */
-		error("^Error while waiting for data, ignoring");
+		error(_("^Error while waiting for data, ignoring"));
 
 #ifdef HAVE_POLL
 	if (!(ufd.revents&POLLIN))
@@ -1405,7 +1488,7 @@ retry:
 	if (!(FD_ISSET(devfd,&rfds)))
 #endif /* HAVE_POLL */
 		{
-		error("^No data input after waited for data, retrying");
+		error(_("^No data input after waited for data, retrying"));
 		goto retry;
 		}
 	return(1);
@@ -1424,41 +1507,37 @@ const char *sf,*ss;
 				break;
 			case '9':
 				if (isdigit(cs)) break;
-				subp="digit";
+				subp=_("digit");
 				break;
 			case '+':
 				if (cs=='+' || cs=='-') break;
-				subp="+/- sign";
+				subp=_("+/- sign");
 				break;
 			default:
 				if (cf==cs) break;
 				VARPRINTF(sub,"'%c'",cf); subp=sub;
 			}
 		if (!subp) continue;
-		VARPRINTF5(err,"Expected %s, found '%c' at pos %d of string [%s], formatstring [%s]",
+		VARPRINTF5(err,_("Expected %s, found '%c' at pos %d of string [%s], formatstring [%s]"),
 			subp,cs,ss-string,string,fmt);
 		return(err);
 		}
 	if (*sf) {
-		VARPRINTF2(err,"String too short for format, string [%s], formatstring [%s]",
+		VARPRINTF2(err,_("String too short for format, string [%s], formatstring [%s]"),
 			string,fmt);
 		return(err);
 		}
 	if (*ss) {
-		VARPRINTF2(err,"Trailing garbage in string [%s], formatstring [%s]",
+		VARPRINTF2(err,_("Trailing garbage in string [%s], formatstring [%s]"),
 			string,fmt);
 		return(err);
 		}
 	return(NULL);
 }
 
-static char *receive_number;
+static char *receive_number,*receive_smsc;
 static time_t receive_time;
 
-/* +CMT: "+420602431329",,"99/10/25,03:21:03-00" */
-static int receive_headerparse(char *buf)
-{
-char *s,*s1,*err;
 struct tm tm;
 static const struct {
 	off_t strpos;
@@ -1467,60 +1546,77 @@ static const struct {
 	const char *name;
 	} timeparse[]={
 #define TP_ENT(a,b,c,d,e) { a,offsetof(struct tm,b),c,d,e }
-		TP_ENT( 3,tm_year,0,99,"year"),
-		TP_ENT( 6,tm_mon ,1,12,"month"),
-		TP_ENT( 9,tm_mday,1,31,"day of month"),
-		TP_ENT(12,tm_hour,0,23,"hour"),
-		TP_ENT(15,tm_min ,0,59,"minute"),
-		TP_ENT(18,tm_sec ,0,59,"second"),
+		TP_ENT( 3,tm_year,0,99,N_("year")),
+		TP_ENT( 6,tm_mon ,1,12,N_("month")),
+		TP_ENT( 9,tm_mday,1,31,N_("day of month")),
+		TP_ENT(12,tm_hour,0,23,N_("hour")),
+		TP_ENT(15,tm_min ,0,59,N_("minute")),
+		TP_ENT(18,tm_sec ,0,59,N_("second")),
 		/* Time zone ignored */
 		};
-int i,val;
+#define GETTIME(i) (*(int *)(((char *)&tm)+timeparse[(i)].tmpos))
+
+static void maketime(const char *string)
+{
+int val;
+int i;
+
+	for (i=0;i<NELEM(timeparse);i++) {
+		val=GETTIME(i);
+		if (val<timeparse[i].min || val>timeparse[i].max) {
+			error(_("Weird value of %s, is %d but expected %d..%d, setting to %d"),
+				_(timeparse[i].name),val,timeparse[i].min,timeparse[i].max,timeparse[i].min);
+			GETTIME(i)=timeparse[i].min;
+			}
+		}
+	if (tm.tm_year<70) tm.tm_year+=100;
+	tm.tm_mon--;
+	d7("mktime(y%dm%dd%dh%dm%ds%d)\n",
+		tm.tm_year,tm.tm_mon,tm.tm_mday,tm.tm_hour,tm.tm_min,tm.tm_sec);
+	tm.tm_isdst=-1; /* "timezone" info not available */
+	if ((receive_time=mktime(&tm))==-1)
+		error(_("^mktime(3) failed for %s"),string);
+}
+
+/* +CMT: "+420602431329",,"99/10/25,03:21:03-00" */
+static int receive_headerparse(char *buf)
+{
+char *s,*s1,*err;
+int i;
 
-#define DIGIT2(s) (((s)[0]-'0')*10+((s)[1]-'0'))
+#define DIGIT2ASC(s) (((s)[0]-'0')*10+((s)[1]-'0'))
 
 	for (s=buf;*s==' ';s++);
 	if (*s++!='"') {
-		error("Cannot find initial '\"' in CMT header: %s",buf);
+		error(_("Cannot find initial '\"' in CMT header: %s"),buf);
 		return(0);
 		}
 	for (s1=s;*s && *s!='"';s++);
 	if (!*s) {
-		error("Only one '\"' found in CMT header: %s",buf);
+		error(_("Only one '\"' found in CMT header: %s"),buf);
 		return(0);
 		}
+	free(receive_smsc); receive_smsc=NULL;
 	free(receive_number);
 	chk(receive_number=malloc(s-s1+1));
 	memcpy(receive_number,s1,s-s1); receive_number[s-s1]='\0';
 	s++;
 	if ((err=check_phone(receive_number)) ||
 	    (err=check_format(",,\"99/99/99,99:99:99+99\"",s))) {
-		error("%s in CMT header: %s",err,buf);
+		error(_("%s in CMT header: %s"),err,buf);
 		return(0);
 		}
 	memset(&tm,0,sizeof(tm)); /* may be redundant */
-	for (i=0;i<NELEM(timeparse);i++) {
-		val=DIGIT2(s+timeparse[i].strpos);
-		if (val<timeparse[i].min || val>timeparse[i].max) {
-			error("Weird value of %s, is %d but expected %d..%d, setting to %d",
-				timeparse[i].name,val,timeparse[i].min,timeparse[i].max,timeparse[i].min);
-			val=timeparse[i].min;
-			}
-		*(int *)(((char *)&tm)+timeparse[i].tmpos)=val;
-		}
+	for (i=0;i<NELEM(timeparse);i++)
+		GETTIME(i)=DIGIT2ASC(s+timeparse[i].strpos);
 	if (tm.tm_year<70) tm.tm_year+=100;
 	tm.tm_mon--;
-	d7("mktime(y%dm%dd%dh%dm%ds%d)\n",
-		tm.tm_year,tm.tm_mon,tm.tm_mday,tm.tm_hour,tm.tm_min,tm.tm_sec);
-	if ((receive_time=mktime(&tm))==-1) {
-		error("^mktime(3) failed for %s",s+2);
-		return(0);
-		}
+	maketime(s+2);
 	return(1);
-#undef DIGIT2
+#undef DIGIT2ASC
 }
 
-static void receive_accept(char *bodyline)
+static void receive_text(char *bodyline)
 {
 char *buf,*s,*s1,*s2,*s3;
 pid_t pid;
@@ -1528,7 +1624,7 @@ char tbuf[32];
 int i;
 FILE *f;
 
-	d2("receive_accept: %s\n",bodyline);
+	d2("receive_text: %s\n",bodyline);
 #if RECEIVE_TEST
 	pid=0;
 #else
@@ -1536,7 +1632,7 @@ FILE *f;
 #endif
 	if (pid>0) return; /* parent context */
 	if (pid==-1) {
-		error("Can't fork(2), process spawning may block receive");
+		error(_("Can't fork(2), process spawning may block receive"));
 		}
 	else { /* child process */
 		dis_cleanup=1;
@@ -1545,7 +1641,7 @@ FILE *f;
 		s1=s;
 		do {
 			s1=strchr(s1+(s1!=s),'%');
-			} while (s1 && s1[1]!='p' && s1[1]!='T' && s1[1]!='t');
+			} while (s1 && s1[1]!='p' && s1[1]!='T' && s1[1]!='t' && s1[1]!='s');
 		if (!s1) {
 			pushargstack_one(s,0);
 			break;
@@ -1563,31 +1659,201 @@ FILE *f;
 				pushargstack_one(tbuf,0);
 				break;
 			case 't':
+				if (receive_time==-1) break;
 				if (!(s2=ctime(&receive_time))) {
-					error("Failing ctime(3), ignoring substitution");
+					error(_("Failing ctime(3), ignoring substitution"));
 					break;
 					}
 				if ((s3=strchr(s2,'\n'))) *s3='\0';
 				pushargstack_one(s2,0);
 				break;
+			case 's':
+				if (receive_smsc) pushargstack_one(receive_smsc,0);
+				break;
 			default: assert(0);
 			}
 		}
 	buf=glueargstack(NULL,NULL); assert(buf);
 	if (!(f=popen(buf,"w"))) {
-		error("^Failing spawn of receive command: %s",buf);
+		error(_("^Failing spawn of receive command: %s"),buf);
 		goto err;
 		}
 	if (fputs(bodyline,f)<0 || putc('\n',f)!='\n')
-		error("^Failing write to child receive command: %s",buf);
+		error(_("^Failing write to child receive command: %s"),buf);
 	if ((i=pclose(f)))
-		error("^Spawned receive command failure (code %d): %s",i,buf);
+		error(_("^Spawned receive command failure (code %d): %s"),i,buf);
 err:
 	free(buf);
 	if (pid==-1) return;
 	exit(EXIT_SUCCESS); /* cleanup() has been disabled */
 }
 
+static inline unsigned char fromhex(unsigned c)
+{
+	c&=0xDF;
+	return(c<'A'?c-('0'&0xDF):(c-('A'&0xDF))+0xA);
+}
+
+static int teldecode(char *text,unsigned char *bin,size_t digits)
+{
+unsigned char b;
+int r=0,i;
+
+	for (i=0;i<digits;text++,i++) {
+		if (!(i&1)) b=*bin;
+		else b=(*bin++)>>4;
+		b&=0x0F;
+		if (b<=0x09)
+			*text=b+'0';
+		else {
+			*text='?';
+			r++;
+			}
+		}
+	*text='\0';
+	return(r);
+}
+
+static void sctsparse(unsigned char *bin,const char *pduline,int offs)
+{
+#define DIGIT2BIN(v) (((v)&0x0F)*10+(((v)>>4)&0x0F))
+int i;
+
+	receive_time=-1;
+	memset(&tm,0,sizeof(tm)); /* may be redundant */
+	for (i=0;i<NELEM(timeparse);offs++,i++) {
+		if ((*bin&0x0F)>0x09 || (*bin&0xF0)>0x90) {
+			error(_("Invalid value of \"%s\" at offset %d in: %s"),
+				timeparse[i].name,offs,pduline);
+			return;
+			}
+		GETTIME(i)=DIGIT2BIN(*bin);
+		bin++;
+		}
+	maketime(pduline);
+
+#undef DIGIT2BIN
+}
+
+static void receive_pdu(char *pduline)
+{
+unsigned char pdu[140+0x100],*pdup,*pdue,oalen,inreg;
+char text[160+1],*textp,*s,*pdulinescan;
+size_t pdulinel=strlen(pduline),want;
+size_t udl,udlb;
+int inb,outb,xb;
+
+	d2("receive_pdu: %s\n",pduline);
+	if (pdulinel>2*sizeof(pdu))
+		{ error(_("PDU too long (%d/2) to be valid: %s"),pdulinel,pduline); return; }
+	if (pdulinel&1)
+		{ error(_("PDU length odd (%d): %s"),pdulinel,pduline); return; }
+	if (pdulinel<2*13)
+		{ error(_("PDU length %d too small (min. 2*%d): %s"),pdulinel,13,pduline); return; }
+	for (pdup=pdu,pdulinescan=pduline;*pdulinescan;pdulinescan+=2) {
+		if (!isxdigit(pdulinescan[0]) || !(isxdigit(pdulinescan[1])))
+		{ error(_("Invalid hex byte: %c%c on byte %d in: %s"),
+			pdulinescan[0],pdulinescan[1],pdup-pdu,pduline); return; }
+		*pdup++=(fromhex(pdulinescan[0])<<4)|fromhex(pdulinescan[1]);
+		}
+	pdue=pdup;
+	free(receive_smsc);
+	if (*pdu<=1) {
+		receive_smsc=NULL;
+		}
+	else {
+		if (*pdu>10)
+			{ error(_("SMSC length too large (%d, max. %d): %s"),*pdu,10,pduline); return; }
+		chk(receive_smsc=malloc(1+2*(*pdu)+1));
+		s=receive_smsc;
+		if (pdu[1]==ADDR_INT) *s++='+';
+		else {
+			if (pdu[1]!=ADDR_NAT)
+				error(_("Unknown address type 0x%02X of %s, ignoring in PDU: %s"),pdu[1],_("SMSC"),pduline); return;
+			}
+		if (teldecode(s,pdu+2,2*(*pdu-1)-((pdu[1+(*pdu)]&0xF0)==0xF0)))
+			error(_("Some digits unrecognized in %s \"%s\", ignoring in PDU: %s"),_("SMSC"),receive_smsc,pduline);
+		}
+	pdup=pdu+1+(*pdu);
+	if (*pdup&0x03) /* PDU type */
+		error(_("Unrecognized PDU type 0x%02X at offset %d, dropping: %s"),*pdup,pdup-pdu,pduline);
+	pdup++;
+	free(receive_number);
+	if ((oalen=*pdup++)>2*0x10) /* OA len */
+		{ error(_("Originating number too large (0x%X, max. 2*0x%X): %s"),oalen,0x10,pduline); return; }
+	if (pdup+(want=1+(oalen+1)/2+10)>pdue)
+		{ error(_("PDU length too short (want %d, is %d): %s"),(pdup-pdu)+want,pdue-pdu,pduline); return; }
+	chk(receive_number=malloc(1+2*(*pdup)+1));
+	s=receive_number;
+	if (*pdup==ADDR_INT) *s++='+';
+	else {
+		if (*pdup!=ADDR_NAT)
+			error(_("Unknown address type 0x%02X of %s, ignoring in PDU: %s"),*pdup,_("originating number"),pduline); return;
+		}
+	pdup++;
+	if (teldecode(s,pdup,oalen))
+		error(_("Some digits unrecognized in %s \"%s\", ignoring in PDU at offset %d: %s"),
+			_("originating number"),receive_number,pdup-pdu,pduline);
+	pdup+=(oalen+1)/2;
+	if (*pdup) /* PID */
+		error(_("PID number %02X unsupported, ignoring: %s"),*pdup,pduline);
+	pdup++;
+	if (*pdup) { /* DCS */
+		if ((*pdup&0xF4)==0xF4)
+			{ error(_("DCS 0x%02X indicates 8-bit data, unsupported, dropping: %s"),*pdup,pduline); return; }
+		error(_("DCS 0x%02X unsupported, will attempt decoding: %s"),*pdup,pduline);
+		}
+	pdup++;
+	sctsparse(pdup,pduline,pdup-pdu);
+	pdup+=7;
+	/* UDL */
+	udl=*pdup++;
+	if (pdue-pdup>140) {
+		error(_("PDU data (%d) exceed maximum length of %d bytes, cut: %s"),
+			pdue-pdup,140,pduline);
+		pdue=pdup+140;
+		}
+	udlb=(udl*7+7)/8;
+	if (pdup+udlb>pdue) {
+size_t udl1,udlb1;
+
+		udlb1=pdue-pdup;
+		udl1=(udlb1*8)/7;
+		error(_("PDU data length (%d/7->%d/8) longer than data (%d), cut to %d/7->%d/8: %s"),
+			udl,udlb,pdue-pdup,udl1,udlb1,pduline);
+		udl=udl1; udlb=udlb1;
+		}
+	else
+		assert(pdup+udlb==pdue); /* should be checked by 'PDU length too short' above */
+	textp=text;
+	inb=outb=0;
+	inreg=0; /* GCC happiness */
+	while (udl) {
+		if (!inb) {
+			inreg=*pdup++;
+			inb=8;
+			}
+		if (!outb) {
+			assert(textp<text+160);
+			*textp=0x00;
+			outb=7;
+			}
+		xb=MIN(inb,outb);
+#if 0
+		d4("inb=%d,outb=%d,xb=%d\n",inb,outb,xb);
+#endif
+		*textp|=((inreg>>(unsigned)(8-inb))&((1<<xb)-1))<<(unsigned)(7-outb);
+		inb-=xb; outb-=xb;
+		if (!outb) {
+			*textp=charconv_recv(*textp,textp-text);
+			textp++;
+			udl--;
+			}
+		}
+	*textp=0;
+	receive_text(text);
+}
+
 static struct {
 	char **sp;
 	long *ip;
@@ -1603,16 +1869,26 @@ static struct {
 int main(int argc,char **argv)
 {
 char *s;
-int i;
+int i,cmgf=-1 /* GCC happiness */;
 unsigned fatal=0;
 speed_t portbaud=0 /* GCC happiness */;
 enum modenum argsmode;
+unsigned parts=0;
 
 	if ((s=strrchr((pname=*argv),'/'))) pname=s+1;
+
+#ifdef ENABLE_NLS
+	/* Initialize the i18n stuff */
+	bindtextdomain(PACKAGE,LOCALEDIR);
+	if (!setlocale(LC_ALL,""))
+		error("Locale not supported by C library");
+	textdomain(PACKAGE);
+#endif
+
 #ifdef HAVE_ATEXIT
 	atexit(cleanup);
 #else
-	error("atexit(3) not available at compilation time, device cleanup may be missed");
+	error(_("atexit(3) not available at compilation time, device cleanup may be missed"));
 #endif
 	signal(SIGTERM,(RETSIGTYPE (*)(int))cleanup);
 	signal(SIGQUIT,(RETSIGTYPE (*)(int))cleanup);
@@ -1630,7 +1906,7 @@ enum modenum argsmode;
 		break;
 		}
 	argsmode=mode;
-	processargs(argc,argv,"<command-line>");
+	processargs(argc,argv,_("<command-line>"));
 	if ((s=getenv("HOME"))) {
 size_t l=strlen(s);
 char *buf=malloc(l+50);
@@ -1643,14 +1919,14 @@ char *buf=malloc(l+50);
 	readfile(CONFIG_MAIN,1);
 	if (verbose>=1) {
 		if (argsmode)
-			error(".Detected mode \"%s\" from my program name \"%s\"",MODE_NAME(argsmode),pname);
+			error(_(".Detected mode \"%s\" from my program name \"%s\""),MODE_NAME(argsmode),pname);
 		else
-			error(".Automatic mode detection unsuccessul for my progam name \"%s\"",pname);
+			error(_(".Automatic mode detection unsuccessul for my progam name \"%s\""),pname);
 		}
 
 	if (!mode)
-		error("!Operation mode unset, use --send or similiar command, see help (-h)");
-	error(".Running program in mode \"%s\"",MODE_NAME(mode));
+		error(_("!Operation mode unset, use --send or similiar command, see help (-h)"));
+	error(_(".Running program in mode \"%s\""),MODE_NAME(mode));
 	switch (mode) {
 
 		case MODE_SEND:           /* FALLTHRU */
@@ -1666,10 +1942,10 @@ const struct nullcheck *n=nullcheck+i;
 
 		if (*n->var) continue;
 		if (n->reqd && !(MODE_BIT(mode)&n->reqd)) continue;
-		error("Missing parameter \"%s\"",n->name);
+		error(_("Missing parameter \"%s\""),_(n->name));
 		fatal++;
 		}
-	if (fatal) error("!Previous error%s considered unrecoverable",(fatal==1?"":"s"));
+	if (fatal) error(_("!Previous %s considered unrecoverable"),(fatal==1?_("error"):_("errors")));
 	emptyclean();
 	if (!logname) logname=DEF_LOGNAME;
 	if (!lockfile) lockfile=DEF_LOCKFILE;
@@ -1680,7 +1956,7 @@ char *serr;
 		if (!*numarg[i].sp) continue;
 		*numarg[i].ip=strtol(*numarg[i].sp,&serr,0);
 		if (*numarg[i].ip<0 || *numarg[i].ip>=LONG_MAX || !serr || *serr)
-			error("!Number parse error for parameter \"%s\" of \"%s\" at: %s",
+			error(_("!Number parse error for parameter \"%s\" of \"%s\" at: %s"),
 				numarg[i].msg,*numarg[i].sp,serr);
 		}
 	if (readtimen==-1)
@@ -1701,16 +1977,16 @@ size_t l=strlen(device);
 		s++;
 		if (*s=='%') continue;
 		if (*s=='s') {
-			if (i) error("!Only one \"%%s\" permitted in lockfile format-string");
+			if (i) error(_("!Only one \"%%s\" permitted in lockfile format-string"));
 			i=1; continue;
 			}
-		error("!Invalid format-character '%c' in lockfile format-string, only \"%%s\" allowed",*s);
+		error(_("!Invalid format-character '%c' in lockfile format-string, only \"%%s\" allowed"),*s);
 		}
 	
 	if (*logname) {
 		if (!(logf=fopen(logname,"a")))
-			error("^!Error opening log \"%s\" for append",logname);
-		logmsg("Starting up: " PACKAGE " " VERSION);
+			error(_("^!Error opening log \"%s\" for append"),logname);
+		logmsg(_("Starting up: %s"),PACKAGE " " VERSION);
 		}
 
 	switch (mode) {
@@ -1729,7 +2005,26 @@ size_t l=strlen(device);
 		default: assert(0);
 		}
 	if (readbody)
-		error("Warning: -f / --file is forbidden with mode \"%s\"",MODE_NAME(mode));
+		error(_("Warning: -f / --file is forbidden with mode \"%s\""),MODE_NAME(mode));
+	if (smsmode) {
+		     if (!strcmp(smsmode,"pdu" ) || !strcmp(smsmode,"0"))
+			force_smsmode=FSM_PDU ;
+		else if (!strcmp(smsmode,"text") || !strcmp(smsmode,"1"))
+			force_smsmode=FSM_TEXT;
+		else
+			error(_("!Unrecognized %s argument \"%s\", supported only: %s"),"-M/--smsmode",smsmode,"pdu/0/text/1");
+		}
+	if (pdusmscmode) {
+		     if (!strcmp(pdusmscmode,"count-in"))
+			force_pdusmscmode=FPSM_COUNT_IN;
+		else if (!strcmp(pdusmscmode,"count-out"))
+			force_pdusmscmode=FPSM_COUNT_OUT;
+		else if (!strcmp(pdusmscmode,"none"))
+			force_pdusmscmode=FPSM_NONE;
+		else
+			error(_("!Unrecognized %s argument \"%s\", supported only: %s"),"-P/--pdusmscmode",pdusmscmode,"count-in/count-out/none");
+		try_pdusmscmode=force_pdusmscmode;
+		}
 
 	switch (baudn) {
 		case  2400: portbaud= B2400; break;
@@ -1739,43 +2034,43 @@ size_t l=strlen(device);
 		case 38400: portbaud=B38400; break;
 		case 57600: portbaud=B57600; break;
 		default:
-			error("!Specified baudrate %ld is not supported",baudn);
+			error(_("!Specified baudrate %ld is not supported"),baudn);
 		}
-	if (verbose>=2) error(".Will use baudrate %ld with hexval 0x%X",baudn,portbaud);
+	if (verbose>=2) error(_(".Will use baudrate %ld with hexval 0x%X"),baudn,portbaud);
 		
 	if (lockfile && *lockfile && VARPRINTF(lockreal,lockfile,devicename)>0) {
 time_t start,end;
-		if (verbose>=1) error(".Locking device \"%s\" by \"%s\"..",device,lockreal);
+		if (verbose>=1) error(_(".Locking device \"%s\" by \"%s\".."),device,lockreal);
 		time(&start);
 		lockdevice(0);
 		time(&end);
 		if ((end-=start)>LOCKREPORT)
-			logmsg("Device lock succeeded after %ld seconds",(long)end);
+			logmsg(_("Device lock succeeded after %ld seconds"),(long)end);
 		}
-	if (verbose>=1) error(".Opening device \"%s\"..",device);
+	if (verbose>=1) error(_(".Opening device \"%s\".."),device);
 	if ((devfd=open(device,O_RDWR|O_NDELAY))<0)
-		error("^!Cannot open device \"%s\" for r/w access",device);
+		error(_("^!Cannot open device \"%s\" for r/w access"),device);
 	
 	if (tcgetattr(devfd,&restios))
-		error("^Unable to get termios settings");
+		error(_("^Unable to get termios settings"));
 	else {
 		restios.c_cflag=(restios.c_cflag&~(CBAUD|CBAUDEX))|B0|HUPCL;
 		restios_yes=1;
 		}
-	tios.c_iflag=IGNBRK|IGNPAR|IXON|IXOFF;
+	tios.c_iflag=IGNBRK|IGNPAR|(handshake_rtscts ? 0 : IXON|IXOFF);
 	tios.c_oflag=0;
-	tios.c_cflag=CS8|CREAD|CLOCAL|HUPCL|portbaud;
+	tios.c_cflag=CS8|CREAD|CLOCAL|HUPCL|portbaud|(handshake_rtscts ? CRTSCTS : 0);
 	tios.c_lflag=IEXTEN|NOFLSH;
 	memset(tios.c_cc,_POSIX_VDISABLE,sizeof(tios.c_cc));
 	tios.c_cc[VTIME]=0;
 	tios.c_cc[VMIN ]=1;
 	    cfsetispeed(&tios,portbaud);
 	if (cfsetospeed(&tios,portbaud)|cfsetispeed(&tios,portbaud))
-		error("^Error setting termios baudrate on device");
+		error(_("^Error setting termios baudrate on device"));
 	if (tcflush(devfd,TCIOFLUSH))
-		error("^Error flushing termios (TCIOFLUSH) on device");
+		error(_("^Error flushing termios (TCIOFLUSH) on device"));
 	if (tcsetattr(devfd,TCSANOW,&tios))
-		error("^!Unable to set initial termios device settings");
+		error(_("^!Unable to set initial termios device settings"));
 
 	setalarm();
 
@@ -1783,20 +2078,45 @@ retryall:
 		devcmd("",NULL,"\r\nAT\033\032"); /* ESCAPE, CTRL-Z */
 		devcmd(NULL,NULL,"\r\nAT");
 		smscset();
+		if (mode==MODE_SEND || mode==MODE_RECEIVE) {
+			cmgf=-1;
+			do {
+				/* condition is _negative_ here: */
+				if (force_smsmode==FSM_TEXT || !devcmd(NULL,NULL,"!\r\nAT+CMGF=0")) {
+					if (force_smsmode==FSM_PDU || !devcmd(NULL,NULL,"!\r\nAT+CMGF=1"))
+						{ retrying(); continue; }
+		/* CMGF=1 */
+					if (verbose>=1)
+						error(_(".Using AT+CMGF=1 (text mode).."));
+					cmgf=1;
+					}
+				else {
+		/* CMGF=0 */
+					if (verbose>=1)
+						error(_(".Using AT+CMGF=0 (PDU mode).."));
+					cmgf=0;
+					}
+				} while (cmgf==-1);
+			}
 		switch (mode) {
 			case MODE_SEND:
-retrysendcmgf:
-				if (!devcmd(NULL,NULL,"!\r\nAT+CMGF=0")) {
-					if (!devcmd(NULL,NULL,"!\r\nAT+CMGF=1"))
-						{ retrying(); goto retrysendcmgf; }
-		/* CMGF=1 */
+				if (cmgf) {
 					devcmd("\n> ",NULL,"\r\nAT+CMGS=\"%s\"",phone);
 					s=devcmd(NULL,"\n+CMGS:","!~%s\032",body);
 					}
 				else {
-		/* CMGF=0 */
-					devcmd("\n> ",NULL,"\r\nAT+CMGS=%d",(strlen(pdusmsc)+strlen(pdudata))/2);
-					s=devcmd(NULL,"\n+CMGS:","!~%s%s\032",pdusmsc,pdudata);
+					devcmd("\n> ",NULL,"\r\nAT+CMGS=%d",(
+							(try_pdusmscmode==FPSM_COUNT_IN ? strlen(pdusmsc) : 0)
+							+strlen(pdudata))/2);
+					s=devcmd(NULL,"\n+CMGS:","!~%s%s\032",
+							(try_pdusmscmode!=FPSM_NONE ? pdusmsc : ""),
+							pdudata);
+					if (!s && force_pdusmscmode==FPSM_AUTO) {
+						if (FPSM_MAX==try_pdusmscmode++)
+							try_pdusmscmode=FPSM_MIN;
+						else
+							retrycnt--;
+						}
 					}
 				break;
 			case MODE_LOGO_SEND:
@@ -1805,22 +2125,22 @@ struct hexdata *hd;
 
 				restore="\r\nAT+CSMP=17,,0,0";
 				devcmd(NULL,NULL,"\r\nAT+CSMP=81,,0,245");
-				devcmd("\n> ",NULL,"\r\nAT+CMGS=\"%s\"",phone);
 				while ((hd=hexdata)) {
+					devcmd("\n> ",NULL,"\r\nAT+CMGS=\"%s\"",phone);
 					if (!(s=devcmd(NULL,"\n+CMGS:","!~%s\032",hd->data))) break;
-					hexdata=hd->next;
+					if ((hexdata=hd->next)) pushargstack_one(s,0);
 					free(hd);
+					parts++;
 					}
 				} break;
 			case MODE_RECEIVE:
-				devcmd(NULL,NULL,"\r\nAT+CMGF=1");
 				restore="\r\nAT+CNMI=,0";
-				devcmd(NULL,NULL,"\r\nAT+CSDH=0");
 				devcmd(NULL,NULL,"\r\nAT+CNMI=,2");
+				devcmd(NULL,NULL,"\r\nAT+CSDH=0");
 				unlockdevice(0);
 				/* Never bail-out when we got up to this point */
 				if (maxretryn!=-1 && verbose>=1)
-					error(".Initialization successful, infinite retry count set");
+					error(_(".Initialization successful, infinite retry count set"));
 				maxretryn=-1;
 #if RECEIVE_TEST
 		receive_headerparse(" \"+420602123456\",,\"99/10/25,03:21:03-00\"");
@@ -1830,22 +2150,23 @@ struct hexdata *hd;
 				datawait(0);
 				if (!lockdevice(1)) {
 					if (verbose>=1)
-						error(".Dialout detected, waiting for lock..");
+						error(_(".Dialout detected, waiting for lock.."));
 					lockdevice(0);
 					goto retryall;
 					}
 				d1("Lock-device succeeded\n");
 				do {
 					d1("Reading a message for us...\n");
-					if (!(s=devcmd("\r","@+CMT:"," ")))
+					if (!(s=devcmd("\n","+CMT:"," ")))
 						goto retryall;
-					if (!(i=receive_headerparse(s)))
-						error("Receive-header parsing failed on: %s",s);
-					if (!(s=devcmd("\r","@\n"," ")))
-						goto retryall;
-					if (i) receive_accept(s);
-					if (!devcmd("\n",NULL," ")) /* eat last '\n' */
+					if (cmgf && !(i=receive_headerparse(s)))
+						error(_("Receive-header parsing failed on: %s"),s);
+					if (!(s=devcmd("\n","@"," ")))
 						goto retryall;
+					if (cmgf) {
+						if (i) receive_text(s);
+						}
+					else receive_pdu(s);
 					} while (datawait(1));
 				goto retryall;
 				break;
@@ -1853,10 +2174,13 @@ struct hexdata *hd;
 			}
 		if (!s) { retrying(); goto retryall; }
 
-	while (isspace(*s)) s++;
-	if (verbose>=1) error("\nMessage successfuly sent with MR: %s",s);
+	pushargstack_one(s,0); s=NULL;
+	if (verbose>=1) while ((s=nextargstack())) {
+		while (isspace(*s)) s++;
+		error(_("\nMessage successfuly sent with MR (Message Reference): %s"),s);
+		}
 	devcmd(NULL,NULL,"\r\nAT");
 
-	logmsg("SMS sent (after %d retries), message reference: %s",retrycnt,s);
+	logmsg(_("SMS sent (after %d retries), %d part(s)"),retrycnt,parts);
 	return(EXIT_SUCCESS);
 }