From 7e8b22018bec9c42d0327d7c95d3990d292ee99a Mon Sep 17 00:00:00 2001
From: Erik Troan <ewt@redhat.com>
Date: Fri, 17 Jan 1997 00:24:36 +0000
Subject: [PATCH 001/667] Initial revision

---
 popt.c | 314 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 popt.h |  49 +++++++++
 2 files changed, 363 insertions(+)
 create mode 100644 popt.c
 create mode 100644 popt.h

diff --git a/popt.c b/popt.c
new file mode 100644
index 0000000..ed4510c
--- /dev/null
+++ b/popt.c
@@ -0,0 +1,314 @@
+#include <ctype.h>
+#include <stdlib.h>
+#include <string.h>
+
+#include "popt.h"
+
+struct optionStackEntry {
+    int argc;
+    char ** argv;
+    int next;
+    struct poptAlias * currAlias;
+};
+
+struct poptContext_s {
+    struct optionStackEntry optionStack[POPT_OPTION_DEPTH], * os;
+    char ** leftovers;
+    int numLeftovers;
+    int nextLeftover;
+    struct poptOption * options;
+    int restLeftover;
+    char * nextArg;
+    char * nextCharArg;
+    int aliasLocation;
+    struct poptAlias * aliases;
+    int numAliases;
+};
+
+poptContext poptGetContext(char * name ,int argc, char ** argv, 
+			   struct poptOption * options, int flags) {
+    poptContext con = malloc(sizeof(*con));
+    char * envName, * envValue, * chptr;
+    struct poptAlias alias;
+
+    con->os = con->optionStack;
+    con->os->argc = argc;
+    con->os->argv = argv;
+    con->os->currAlias = NULL;
+    con->os->next = 1;			/* skip argv[0] */
+
+    con->leftovers = malloc(sizeof(char *) * argc);
+    con->numLeftovers = 0;
+    con->nextLeftover = 0;
+    con->restLeftover = 0;
+    con->options = options;
+    con->nextCharArg = NULL;
+    con->nextArg = NULL;
+    con->aliases = NULL;
+    con->numAliases = 0;
+    con->aliasLocation = 0;
+
+    if (!name) return con;
+
+    envName = alloca(strlen(name) + 20);
+    strcpy(envName, name);
+    strcat(envName, "_POPT_ALIASES");
+
+    if ((envValue = getenv(envName))) {
+	envValue = strcpy(alloca(strlen(envValue) + 1), envValue);
+
+	while (envValue && *envValue) {
+	    chptr = strchr(envValue, '=');
+	    if (!chptr) {
+		envValue = strchr(envValue, '\n');
+		if (envValue) envValue++;
+		continue;
+	    }
+
+	    *chptr = '\0';
+	    alias.longName = envValue;
+	    envValue = chptr + 1;
+	    chptr = strchr(envValue, '\n');
+	    if (chptr) *chptr = '\0';
+
+	    poptParseArgvString(envValue, &alias.argc, &alias.argv);
+	    poptAddAlias(con, alias);
+
+	    if (chptr)
+		envValue = chptr + 1;
+	    else
+		envValue = NULL;
+	}
+    }
+
+    return con;
+}
+
+/* returns 'val' element, -1 on last item, POPT_ERROR_* on error */
+int poptGetNextOpt(poptContext con) {
+    char * optString, * chptr, * localOptString;
+    char * longArg = NULL;
+    char * origOptString;
+    struct poptOption * opt = con->options;
+    int done = 0;
+    int i;
+
+    while (!done) {
+	if (!con->nextCharArg) {
+	    while (con->os->next == con->os->argc && con->os > con->optionStack)
+		con->os--;
+	    if (con->os->next == con->os->argc)
+		return -1;
+		
+	    origOptString = con->os->argv[con->os->next++];
+
+	    if (con->restLeftover || *origOptString != '-') {
+		con->leftovers[con->numLeftovers++] = origOptString;
+		continue;
+	    }
+
+	    /* Make a copy we can hack at */
+	    localOptString = optString = 
+			strcpy(alloca(strlen(origOptString) + 1), 
+			origOptString);
+
+	    if (!optString[0])
+		return POPT_ERROR_BADOPT;
+
+	    if (optString[1] == '-' && !optString[2]) {
+		con->restLeftover = 1;
+		continue;
+	    } else if (optString[1] == '-') {
+		optString += 2;
+
+		if (!con->os->currAlias ||
+		    strcmp(con->os->currAlias->longName, optString)) {
+		    i = 0;
+		    while (i < con->numAliases &&
+			strcmp(con->aliases[i].longName, optString)) i++;
+
+		    if (i < con->numAliases) {
+			if ((con->os - con->optionStack) == POPT_OPTION_DEPTH)
+			    return POPT_ERROR_OPTSTOODEEP;
+
+			con->os++;
+			con->os->next = 0;
+			con->os->currAlias = con->aliases + i;
+			con->os->argc = con->os->currAlias->argc;
+			con->os->argv = con->os->currAlias->argv;
+			continue;
+		    }
+		}
+
+		chptr = optString;
+		while (*chptr && *chptr != '=') chptr++;
+		if (*chptr == '=') {
+		    longArg = origOptString + (chptr - localOptString);
+		    *chptr = '\0';
+		}
+
+		while (opt->longName || opt->shortName) {
+		    if (opt->longName && !strcmp(optString, opt->longName))
+			break;
+		    opt++;
+		}
+
+		if (!opt->longName && !opt->shortName) return POPT_ERROR_BADOPT;
+	    } else 
+		con->nextCharArg = origOptString + 1;
+	}
+
+	if (con->nextCharArg) {
+	    origOptString = con->nextCharArg;
+
+	    con->nextCharArg = NULL;
+
+	    while ((opt->longName || opt->shortName) && 
+		    *origOptString != opt->shortName) opt++;
+	    if (!opt->longName && !opt->shortName) return POPT_ERROR_BADOPT;
+
+	    origOptString++;
+	    if (*origOptString)
+		con->nextCharArg = origOptString;
+	}
+
+	if (opt->takesArg == POPT_ARG_YES) {
+	    if (longArg) {
+		con->nextArg = longArg;
+	    } else if (con->nextCharArg) {
+		con->nextArg = con->nextCharArg;
+		con->nextCharArg = NULL;
+	    } else { 
+		while (con->os->next == con->os->argc && 
+		       con->os > con->optionStack)
+		    con->os--;
+		if (con->os->next == con->os->argc)
+		    return POPT_ERROR_NOARG;
+
+		con->nextArg = con->os->argv[con->os->next++];
+	    }
+	}
+
+	if (opt->flag) *opt->flag = 1;
+
+	if (opt->val) done = 1;
+    }
+
+    return opt->val;
+}
+
+char * poptGetOptArg(poptContext con) {
+    char * ret = con->nextArg;
+    con->nextArg = NULL;
+    return ret;
+}
+
+char * poptGetArg(poptContext con) {
+    if (con->numLeftovers == con->nextLeftover) return NULL;
+    return (con->leftovers[con->nextLeftover++]);
+}
+
+char * poptPeekArg(poptContext con) {
+    if (con->numLeftovers == con->nextLeftover) return NULL;
+    return (con->leftovers[con->nextLeftover]);
+}
+
+char ** poptGetArgs(poptContext con) {
+    if (con->numLeftovers == con->nextLeftover) return NULL;
+    return (con->leftovers + con->nextLeftover);
+}
+
+void poptFreeContext(poptContext con) {
+    free(con->leftovers);
+    free(con);
+}
+
+int poptAddAlias(poptContext con, struct poptAlias newAlias) {
+    int aliasNum = con->numAliases++;
+    struct poptAlias * alias;
+
+    con->aliases = realloc(con->aliases, sizeof(newAlias) * con->numAliases);
+    alias = con->aliases + aliasNum;
+    
+    *alias = newAlias;
+
+    return 0;
+}
+
+int poptParseArgvString(char * s, int * argcPtr, char *** argvPtr) {
+    char * buf = strcpy(alloca(strlen(s) + 1), s);
+    char * bufStart = buf;
+    char * src, * dst;
+    char quote = '\0';
+    int argvAlloced = 5;
+    char ** argv = malloc(sizeof(*argv) * argvAlloced);
+    char ** argv2;
+    int argc = 0;
+    int i;
+
+    src = s;
+    dst = buf;
+    argv[argc] = buf;
+
+    memset(buf, '\0', strlen(s) + 1);
+
+    while (*src) {
+	if (isspace(*src)) {
+	    if (*argv[argc]) {
+		buf++, argc++;
+		if (argc == argvAlloced) {
+		    argvAlloced += 5;
+		    argv = realloc(argv, sizeof(*argv) * argvAlloced);
+		}
+		argv[argc] = buf;
+	    }
+	} else if (quote == *src) {
+	    quote = '\0';
+	} else if (quote) {
+	    if (*src == '\\') {
+		src++;
+		if (!*src) {
+		    free(argv);
+		    return POPT_ERROR_BADQUOTE;
+		}
+	    }
+	    *buf++ = *src;
+	} else switch (*src) {
+	  case '"':
+	  case '\'':
+	    quote = *src;
+	    break;
+	  case '\\':
+	    src++;
+	    if (!*src) {
+		free(argv);
+		return POPT_ERROR_BADQUOTE;
+	    }
+	    /* fallthrough */
+	  default:
+	    *buf++ = *src;
+	}
+
+	src++;
+    }
+
+    if (strlen(argv[argc])) {
+	argc++, buf++;
+    }
+
+    argv2 = (void * )dst = malloc(argc * sizeof(*argv) + (buf - bufStart));
+    dst += argc * sizeof(*argv);
+    memcpy(argv2, argv, argc * sizeof(*argv));
+    memcpy(dst, bufStart, buf - bufStart);
+
+    for (i = 0; i < argc; i++) {
+	argv2[i] = dst + (argv[i] - bufStart);
+    }
+
+    free(argv);
+
+    *argvPtr = argv2;
+    *argcPtr = argc;
+
+    return 0;
+}
diff --git a/popt.h b/popt.h
new file mode 100644
index 0000000..831974a
--- /dev/null
+++ b/popt.h
@@ -0,0 +1,49 @@
+#ifndef H_POPT
+#define H_POPT
+
+#define POPT_OPTION_DEPTH	10
+
+#define POPT_ARG_NONE		0
+#define POPT_ARG_YES		1
+
+#define POPT_ERROR_NOARG	-10
+#define POPT_ERROR_BADOPT	-11
+#define POPT_ERROR_BADALIAS	-12
+#define POPT_ERROR_OPTSTOODEEP	-13
+#define POPT_ERROR_UNEXPARG	-14
+#define POPT_ERROR_BADQUOTE	-15	/* only from poptParseArgString() */
+
+struct poptOption {
+    const char * longName;	/* may be NULL */
+    char shortName;		/* may be '\0' */
+    int takesArg;
+    int *flag;			/* may be NULL */
+    int val;			/* 0 means don't return, just update flag */
+};
+
+struct poptAlias {
+    const char * longName;
+    int argc;
+    char ** argv;
+};
+
+typedef struct poptContext_s * poptContext;
+
+poptContext poptGetContext(char * name, int argc, char ** argv, 
+			   struct poptOption * options, int flags);
+
+/* returns 'val' element, -1 on last item, POPT_ERROR_* on error */
+int poptGetNextOpt(poptContext con);
+/* returns NULL if no argument is available */
+char * poptGetOptArg(poptContext con);
+/* returns NULL if no more options are available */
+char * poptGetArg(poptContext con);
+char * poptPeekArg(poptContext con);
+char ** poptGetArgs(poptContext con);
+void poptFreeContext(poptContext con);
+int poptAddAlias(poptContext con, struct poptAlias alias);
+/* argv should be freed -- this allows ', ", and \ quoting, but ' is treated
+   the same as " and both may include \ quotes */
+int poptParseArgvString(char * s, int * argcPtr, char *** argvPtr);
+
+#endif
-- 
Gitee


From 74ba40674686379c285b4ed099136f50d2e05692 Mon Sep 17 00:00:00 2001
From: Erik Troan <ewt@redhat.com>
Date: Fri, 17 Jan 1997 21:58:27 +0000
Subject: [PATCH 002/667] 1) added parsing options for option args 2) added
 alias config files

---
 popt.c | 247 +++++++++++++++++++++++++++++++++++++++++++++------------
 popt.h |  14 +++-
 2 files changed, 208 insertions(+), 53 deletions(-)

diff --git a/popt.c b/popt.c
index ed4510c..2659dd2 100644
--- a/popt.c
+++ b/popt.c
@@ -1,6 +1,11 @@
+#include <errno.h>
 #include <ctype.h>
+#include <fcntl.h>
+#include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
+#include <sys/mman.h>
+#include <unistd.h>
 
 #include "popt.h"
 
@@ -20,7 +25,7 @@ struct poptContext_s {
     int restLeftover;
     char * nextArg;
     char * nextCharArg;
-    int aliasLocation;
+    char * appName;
     struct poptAlias * aliases;
     int numAliases;
 };
@@ -28,8 +33,6 @@ struct poptContext_s {
 poptContext poptGetContext(char * name ,int argc, char ** argv, 
 			   struct poptOption * options, int flags) {
     poptContext con = malloc(sizeof(*con));
-    char * envName, * envValue, * chptr;
-    struct poptAlias alias;
 
     con->os = con->optionStack;
     con->os->argc = argc;
@@ -46,42 +49,25 @@ poptContext poptGetContext(char * name ,int argc, char ** argv,
     con->nextArg = NULL;
     con->aliases = NULL;
     con->numAliases = 0;
-    con->aliasLocation = 0;
-
-    if (!name) return con;
-
-    envName = alloca(strlen(name) + 20);
-    strcpy(envName, name);
-    strcat(envName, "_POPT_ALIASES");
-
-    if ((envValue = getenv(envName))) {
-	envValue = strcpy(alloca(strlen(envValue) + 1), envValue);
-
-	while (envValue && *envValue) {
-	    chptr = strchr(envValue, '=');
-	    if (!chptr) {
-		envValue = strchr(envValue, '\n');
-		if (envValue) envValue++;
-		continue;
-	    }
-
-	    *chptr = '\0';
-	    alias.longName = envValue;
-	    envValue = chptr + 1;
-	    chptr = strchr(envValue, '\n');
-	    if (chptr) *chptr = '\0';
+    
+    if (!name)
+	con->appName = NULL;
+    else
+	con->appName = strcpy(malloc(strlen(name) + 1), name);
 
-	    poptParseArgvString(envValue, &alias.argc, &alias.argv);
-	    poptAddAlias(con, alias);
+    return con;
+}
 
-	    if (chptr)
-		envValue = chptr + 1;
-	    else
-		envValue = NULL;
-	}
-    }
+void poptResetContext(poptContext con) {
+    con->os = con->optionStack;
+    con->os->currAlias = NULL;
+    con->os->next = 1;			/* skip argv[0] */
 
-    return con;
+    con->numLeftovers = 0;
+    con->nextLeftover = 0;
+    con->restLeftover = 0;
+    con->nextCharArg = NULL;
+    con->nextArg = NULL;
 }
 
 /* returns 'val' element, -1 on last item, POPT_ERROR_* on error */
@@ -89,7 +75,7 @@ int poptGetNextOpt(poptContext con) {
     char * optString, * chptr, * localOptString;
     char * longArg = NULL;
     char * origOptString;
-    struct poptOption * opt = con->options;
+    struct poptOption * opt = NULL;
     int done = 0;
     int i;
 
@@ -147,6 +133,7 @@ int poptGetNextOpt(poptContext con) {
 		    *chptr = '\0';
 		}
 
+		opt = con->options;
 		while (opt->longName || opt->shortName) {
 		    if (opt->longName && !strcmp(optString, opt->longName))
 			break;
@@ -163,6 +150,7 @@ int poptGetNextOpt(poptContext con) {
 
 	    con->nextCharArg = NULL;
 
+	    opt = con->options;
 	    while ((opt->longName || opt->shortName) && 
 		    *origOptString != opt->shortName) opt++;
 	    if (!opt->longName && !opt->shortName) return POPT_ERROR_BADOPT;
@@ -172,7 +160,9 @@ int poptGetNextOpt(poptContext con) {
 		con->nextCharArg = origOptString;
 	}
 
-	if (opt->takesArg == POPT_ARG_YES) {
+	if (opt->arg && opt->argInfo == POPT_ARG_NONE) 
+	    *((int *)opt->arg) = 1;
+	else if (opt->argInfo != POPT_ARG_NONE) {
 	    if (longArg) {
 		con->nextArg = longArg;
 	    } else if (con->nextCharArg) {
@@ -187,9 +177,18 @@ int poptGetNextOpt(poptContext con) {
 
 		con->nextArg = con->os->argv[con->os->next++];
 	    }
-	}
 
-	if (opt->flag) *opt->flag = 1;
+	    if (opt->arg) {
+		switch (opt->argInfo) {
+		  case POPT_ARG_STRING:
+		    *((char **) opt->arg) = con->nextArg;
+		    break;
+		  default:
+		    printf("option type not implemented in popt\n");
+		    exit(1);
+		}
+	    }
+	}
 
 	if (opt->val) done = 1;
     }
@@ -220,6 +219,7 @@ char ** poptGetArgs(poptContext con) {
 
 void poptFreeContext(poptContext con) {
     free(con->leftovers);
+    if (con->appName) free(con->appName);
     free(con);
 }
 
@@ -231,6 +231,8 @@ int poptAddAlias(poptContext con, struct poptAlias newAlias) {
     alias = con->aliases + aliasNum;
     
     *alias = newAlias;
+    alias->longName = strcpy(malloc(strlen(alias->longName) + 1), 
+				alias->longName);
 
     return 0;
 }
@@ -253,16 +255,7 @@ int poptParseArgvString(char * s, int * argcPtr, char *** argvPtr) {
     memset(buf, '\0', strlen(s) + 1);
 
     while (*src) {
-	if (isspace(*src)) {
-	    if (*argv[argc]) {
-		buf++, argc++;
-		if (argc == argvAlloced) {
-		    argvAlloced += 5;
-		    argv = realloc(argv, sizeof(*argv) * argvAlloced);
-		}
-		argv[argc] = buf;
-	    }
-	} else if (quote == *src) {
+	if (quote == *src) {
 	    quote = '\0';
 	} else if (quote) {
 	    if (*src == '\\') {
@@ -271,8 +264,18 @@ int poptParseArgvString(char * s, int * argcPtr, char *** argvPtr) {
 		    free(argv);
 		    return POPT_ERROR_BADQUOTE;
 		}
+		if (*src != quote) *buf++ = '\\';
 	    }
 	    *buf++ = *src;
+	} else if (isspace(*src)) {
+	    if (*argv[argc]) {
+		buf++, argc++;
+		if (argc == argvAlloced) {
+		    argvAlloced += 5;
+		    argv = realloc(argv, sizeof(*argv) * argvAlloced);
+		}
+		argv[argc] = buf;
+	    }
 	} else switch (*src) {
 	  case '"':
 	  case '\'':
@@ -312,3 +315,147 @@ int poptParseArgvString(char * s, int * argcPtr, char *** argvPtr) {
 
     return 0;
 }
+
+static void configLine(poptContext con, char * line) {
+    int nameLength = strlen(con->appName);
+    char * opt;
+    struct poptAlias alias;
+    
+    if (strncmp(line, con->appName, nameLength)) return;
+    line += nameLength;
+    if (!*line || !isspace(*line)) return;
+    while (*line && isspace(*line)) line++;
+
+    if (!strncmp(line, "alias", 5)) {
+	line += 5;
+	if (!*line || !isspace(*line)) return;
+	while (*line && isspace(*line)) line++;
+	if (!*line) return;
+
+	opt = line;
+	while (*line && !isspace(*line)) line++;
+	if (!*line) return;
+	*line++ = '\0';
+	while (*line && isspace(*line)) line++;
+	if (!*line) return;
+
+	if (poptParseArgvString(line, &alias.argc, &alias.argv)) return;
+	alias.longName = opt;
+	
+	poptAddAlias(con, alias);
+    }
+}
+
+int poptReadConfigFile(poptContext con, char * fn) {
+    char * file, * chptr, * end;
+    char * buf, * dst;
+    int fd, rc;
+    int fileLength;
+
+    fd = open(fn, O_RDONLY);
+    if (fd < 0) {
+	if (errno == ENOENT)
+	    return 0;
+	else 
+	    return POPT_ERROR_ERRNO;
+    }
+
+    fileLength = lseek(fd, 0, SEEK_END);
+    lseek(fd, 0, 0);
+
+    file = mmap(NULL, fileLength, PROT_READ, MAP_PRIVATE, fd, 0);
+    if (file == (void *) -1) {
+	rc = errno;
+	close(fd);
+	errno = rc;
+	return POPT_ERROR_ERRNO;
+    }
+    close(fd);
+
+    dst = buf = alloca(fileLength + 1);
+
+    chptr = file;
+    end = (file + fileLength);
+    while (chptr < end) {
+	switch (*chptr) {
+	  case '\n':
+	    *dst = '\0';
+	    dst = buf;
+	    while (*dst && isspace(*dst)) dst++;
+	    if (*dst && *dst != '#') {
+		configLine(con, dst);
+	    }
+	    chptr++;
+	    break;
+	  case '\\':
+	    *dst++ = *chptr++;
+	    if (chptr < end) {
+		if (*chptr == '\n') 
+		    *(dst - 1) = *chptr++;
+		else
+		    *dst++ = *chptr++;
+	    }
+	    break;
+	  default:
+	    *dst++ = *chptr++;
+	}
+    }
+
+    return 0;
+}
+
+int poptReadDefaultConfig(poptContext con, int useEnv) {
+    char * envName, * envValue;
+    char * fn, * home, * chptr;
+    int rc;
+    struct poptAlias alias;
+
+    if (!con->appName) return 0;
+
+    rc = poptReadConfigFile(con, "/etc/popt");
+    if (rc) return rc;
+    if ((home = getenv("HOME"))) {
+	fn = alloca(strlen(home) + 20);
+	sprintf(fn, "%s/.popt", home);
+	rc = poptReadConfigFile(con, fn);
+	if (rc) return rc;
+    }
+
+    envName = alloca(strlen(con->appName) + 20);
+    strcpy(envName, con->appName);
+    chptr = envName;
+    while (*chptr) {
+	*chptr = toupper(*chptr);
+	chptr++;
+    }
+    strcat(envName, "_POPT_ALIASES");
+
+    if (useEnv && (envValue = getenv(envName))) {
+	envValue = strcpy(alloca(strlen(envValue) + 1), envValue);
+
+	while (envValue && *envValue) {
+	    chptr = strchr(envValue, '=');
+	    if (!chptr) {
+		envValue = strchr(envValue, '\n');
+		if (envValue) envValue++;
+		continue;
+	    }
+
+	    *chptr = '\0';
+	    alias.longName = envValue;
+	    envValue = chptr + 1;
+	    chptr = strchr(envValue, '\n');
+	    if (chptr) *chptr = '\0';
+
+	    poptParseArgvString(envValue, &alias.argc, &alias.argv);
+	    poptAddAlias(con, alias);
+
+	    if (chptr)
+		envValue = chptr + 1;
+	    else
+		envValue = NULL;
+	}
+    }
+
+    return 0;
+}
diff --git a/popt.h b/popt.h
index 831974a..fab92bc 100644
--- a/popt.h
+++ b/popt.h
@@ -4,7 +4,9 @@
 #define POPT_OPTION_DEPTH	10
 
 #define POPT_ARG_NONE		0
-#define POPT_ARG_YES		1
+#define POPT_ARG_STRING		1
+#define POPT_ARG_INT		2
+#define POPT_ARG_LONG		3
 
 #define POPT_ERROR_NOARG	-10
 #define POPT_ERROR_BADOPT	-11
@@ -12,12 +14,13 @@
 #define POPT_ERROR_OPTSTOODEEP	-13
 #define POPT_ERROR_UNEXPARG	-14
 #define POPT_ERROR_BADQUOTE	-15	/* only from poptParseArgString() */
+#define POPT_ERROR_ERRNO	-16	/* only from poptParseArgString() */
 
 struct poptOption {
     const char * longName;	/* may be NULL */
     char shortName;		/* may be '\0' */
-    int takesArg;
-    int *flag;			/* may be NULL */
+    int argInfo;
+    void * arg;			/* depends on argInfo */
     int val;			/* 0 means don't return, just update flag */
 };
 
@@ -31,6 +34,7 @@ typedef struct poptContext_s * poptContext;
 
 poptContext poptGetContext(char * name, int argc, char ** argv, 
 			   struct poptOption * options, int flags);
+void poptResetContext(poptContext con);
 
 /* returns 'val' element, -1 on last item, POPT_ERROR_* on error */
 int poptGetNextOpt(poptContext con);
@@ -42,6 +46,10 @@ char * poptPeekArg(poptContext con);
 char ** poptGetArgs(poptContext con);
 void poptFreeContext(poptContext con);
 int poptAddAlias(poptContext con, struct poptAlias alias);
+int poptReadConfigFile(poptContext con, char * fn);
+/* like above, but reads /etc/popt and $HOME/.popt along with environment 
+   vars */
+int poptReadDefaultConfig(poptContext con, int useEnv);
 /* argv should be freed -- this allows ', ", and \ quoting, but ' is treated
    the same as " and both may include \ quotes */
 int poptParseArgvString(char * s, int * argcPtr, char *** argvPtr);
-- 
Gitee


From 694c6c7e44a055c99476da3ebe99d47431901fb1 Mon Sep 17 00:00:00 2001
From: Erik Troan <ewt@redhat.com>
Date: Mon, 20 Jan 1997 22:16:31 +0000
Subject: [PATCH 003/667] added poptBadOption(), poptStrerror(), flags argument
 to poptAddAlias

---
 popt.c | 40 +++++++++++++++++++++++++++++++++++++---
 popt.h |  9 ++++++---
 2 files changed, 43 insertions(+), 6 deletions(-)

diff --git a/popt.c b/popt.c
index 2659dd2..930cc5e 100644
--- a/popt.c
+++ b/popt.c
@@ -223,7 +223,7 @@ void poptFreeContext(poptContext con) {
     free(con);
 }
 
-int poptAddAlias(poptContext con, struct poptAlias newAlias) {
+int poptAddAlias(poptContext con, struct poptAlias newAlias, int flags) {
     int aliasNum = con->numAliases++;
     struct poptAlias * alias;
 
@@ -342,7 +342,7 @@ static void configLine(poptContext con, char * line) {
 	if (poptParseArgvString(line, &alias.argc, &alias.argv)) return;
 	alias.longName = opt;
 	
-	poptAddAlias(con, alias);
+	poptAddAlias(con, alias, 0);
     }
 }
 
@@ -448,7 +448,7 @@ int poptReadDefaultConfig(poptContext con, int useEnv) {
 	    if (chptr) *chptr = '\0';
 
 	    poptParseArgvString(envValue, &alias.argc, &alias.argv);
-	    poptAddAlias(con, alias);
+	    poptAddAlias(con, alias, 0);
 
 	    if (chptr)
 		envValue = chptr + 1;
@@ -459,3 +459,37 @@ int poptReadDefaultConfig(poptContext con, int useEnv) {
 
     return 0;
 }
+
+char * poptBadOption(poptContext con, int flags) {
+    struct optionStackEntry * os;
+
+    if (flags & POPT_BADOPTION_NOALIAS)
+	os = con->optionStack;
+    else
+	os = con->os;
+
+    return os->argv[os->next - 1];
+}
+
+#define POPT_ERROR_NOARG	-10
+#define POPT_ERROR_BADOPT	-11
+#define POPT_ERROR_OPTSTOODEEP	-13
+#define POPT_ERROR_BADQUOTE	-15	/* only from poptParseArgString() */
+#define POPT_ERROR_ERRNO	-16	/* only from poptParseArgString() */
+
+const char * poptStrerror(const int error) {
+    switch (error) {
+      case POPT_ERROR_NOARG:
+	return "missing argument";
+      case POPT_ERROR_BADOPT:
+	return "unknown option";
+      case POPT_ERROR_OPTSTOODEEP:
+	return "aliases nested too deeply";
+      case POPT_ERROR_BADQUOTE:
+	return "error in paramter quoting";
+      case POPT_ERROR_ERRNO:
+	return strerror(errno);
+      default:
+	return "unknown error";
+    }
+}
diff --git a/popt.h b/popt.h
index fab92bc..1dc03b1 100644
--- a/popt.h
+++ b/popt.h
@@ -10,12 +10,12 @@
 
 #define POPT_ERROR_NOARG	-10
 #define POPT_ERROR_BADOPT	-11
-#define POPT_ERROR_BADALIAS	-12
 #define POPT_ERROR_OPTSTOODEEP	-13
-#define POPT_ERROR_UNEXPARG	-14
 #define POPT_ERROR_BADQUOTE	-15	/* only from poptParseArgString() */
 #define POPT_ERROR_ERRNO	-16	/* only from poptParseArgString() */
 
+#define POPT_BADOPTION_NOALIAS  (1 << 0)  /* don't go into an alias */
+
 struct poptOption {
     const char * longName;	/* may be NULL */
     char shortName;		/* may be '\0' */
@@ -44,8 +44,10 @@ char * poptGetOptArg(poptContext con);
 char * poptGetArg(poptContext con);
 char * poptPeekArg(poptContext con);
 char ** poptGetArgs(poptContext con);
+/* returns the option which caused the most recent error */
+char * poptBadOption(poptContext con, int flags);
 void poptFreeContext(poptContext con);
-int poptAddAlias(poptContext con, struct poptAlias alias);
+int poptAddAlias(poptContext con, struct poptAlias alias, int flags);
 int poptReadConfigFile(poptContext con, char * fn);
 /* like above, but reads /etc/popt and $HOME/.popt along with environment 
    vars */
@@ -53,5 +55,6 @@ int poptReadDefaultConfig(poptContext con, int useEnv);
 /* argv should be freed -- this allows ', ", and \ quoting, but ' is treated
    the same as " and both may include \ quotes */
 int poptParseArgvString(char * s, int * argcPtr, char *** argvPtr);
+const char * poptStrerror(const int error);
 
 #endif
-- 
Gitee


From 3f5d616eda11ce467738061b657045709a390b6e Mon Sep 17 00:00:00 2001
From: Erik Troan <ewt@redhat.com>
Date: Thu, 30 Jan 1997 20:04:11 +0000
Subject: [PATCH 004/667] NULL terminate result of poptGetArgs()

---
 popt.c | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/popt.c b/popt.c
index 930cc5e..281cd35 100644
--- a/popt.c
+++ b/popt.c
@@ -40,7 +40,7 @@ poptContext poptGetContext(char * name ,int argc, char ** argv,
     con->os->currAlias = NULL;
     con->os->next = 1;			/* skip argv[0] */
 
-    con->leftovers = malloc(sizeof(char *) * argc);
+    con->leftovers = malloc(sizeof(char *) * (argc + 1));
     con->numLeftovers = 0;
     con->nextLeftover = 0;
     con->restLeftover = 0;
@@ -214,6 +214,10 @@ char * poptPeekArg(poptContext con) {
 
 char ** poptGetArgs(poptContext con) {
     if (con->numLeftovers == con->nextLeftover) return NULL;
+
+    /* some apps like [like RPM ;-) ] need this NULL terminated */
+    con->leftovers[con->numLeftovers] = NULL;
+
     return (con->leftovers + con->nextLeftover);
 }
 
-- 
Gitee


From 75b0a8ff8f582c332d01b035b859ce9e4d7fce0e Mon Sep 17 00:00:00 2001
From: Erik Troan <ewt@redhat.com>
Date: Mon, 17 Feb 1997 20:20:59 +0000
Subject: [PATCH 005/667] 1) added poptStuffArgs() 2) added shortName to popt
 aliases

---
 popt.h | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/popt.h b/popt.h
index 1dc03b1..1b208d4 100644
--- a/popt.h
+++ b/popt.h
@@ -25,9 +25,10 @@ struct poptOption {
 };
 
 struct poptAlias {
-    const char * longName;
+    char * longName;		/* may be NULL */
+    char shortName;		/* may be '\0' */
     int argc;
-    char ** argv;
+    char ** argv;		/* must be free()able */
 };
 
 typedef struct poptContext_s * poptContext;
@@ -47,6 +48,7 @@ char ** poptGetArgs(poptContext con);
 /* returns the option which caused the most recent error */
 char * poptBadOption(poptContext con, int flags);
 void poptFreeContext(poptContext con);
+int poptStuffArgs(poptContext con, char ** argv);
 int poptAddAlias(poptContext con, struct poptAlias alias, int flags);
 int poptReadConfigFile(poptContext con, char * fn);
 /* like above, but reads /etc/popt and $HOME/.popt along with environment 
-- 
Gitee


From 0c818aaf7fa7c4d7029b3c22fa8bab8c4582ce94 Mon Sep 17 00:00:00 2001
From: Erik Troan <ewt@redhat.com>
Date: Mon, 17 Feb 1997 20:21:16 +0000
Subject: [PATCH 006/667] 1) added poptStuffArgs() 2) added character argument
 aliasing 3) aliases are searched for in reverse order

---
 popt.c | 157 +++++++++++++++++++++++++++++++++++++++++++--------------
 1 file changed, 119 insertions(+), 38 deletions(-)

diff --git a/popt.c b/popt.c
index 281cd35..d7005bf 100644
--- a/popt.c
+++ b/popt.c
@@ -13,6 +13,8 @@ struct optionStackEntry {
     int argc;
     char ** argv;
     int next;
+    char * nextArg;
+    char * nextCharArg;
     struct poptAlias * currAlias;
 };
 
@@ -23,8 +25,6 @@ struct poptContext_s {
     int nextLeftover;
     struct poptOption * options;
     int restLeftover;
-    char * nextArg;
-    char * nextCharArg;
     char * appName;
     struct poptAlias * aliases;
     int numAliases;
@@ -38,6 +38,8 @@ poptContext poptGetContext(char * name ,int argc, char ** argv,
     con->os->argc = argc;
     con->os->argv = argv;
     con->os->currAlias = NULL;
+    con->os->nextCharArg = NULL;
+    con->os->nextArg = NULL;
     con->os->next = 1;			/* skip argv[0] */
 
     con->leftovers = malloc(sizeof(char *) * (argc + 1));
@@ -45,8 +47,6 @@ poptContext poptGetContext(char * name ,int argc, char ** argv,
     con->nextLeftover = 0;
     con->restLeftover = 0;
     con->options = options;
-    con->nextCharArg = NULL;
-    con->nextArg = NULL;
     con->aliases = NULL;
     con->numAliases = 0;
     
@@ -61,13 +61,13 @@ poptContext poptGetContext(char * name ,int argc, char ** argv,
 void poptResetContext(poptContext con) {
     con->os = con->optionStack;
     con->os->currAlias = NULL;
+    con->os->nextCharArg = NULL;
+    con->os->nextArg = NULL;
     con->os->next = 1;			/* skip argv[0] */
 
     con->numLeftovers = 0;
     con->nextLeftover = 0;
     con->restLeftover = 0;
-    con->nextCharArg = NULL;
-    con->nextArg = NULL;
 }
 
 /* returns 'val' element, -1 on last item, POPT_ERROR_* on error */
@@ -80,11 +80,13 @@ int poptGetNextOpt(poptContext con) {
     int i;
 
     while (!done) {
-	if (!con->nextCharArg) {
-	    while (con->os->next == con->os->argc && con->os > con->optionStack)
-		con->os--;
-	    if (con->os->next == con->os->argc)
-		return -1;
+	while (!con->os->nextCharArg && con->os->next == con->os->argc 
+		&& con->os > con->optionStack)
+	    con->os--;
+	if (!con->os->nextCharArg && con->os->next == con->os->argc)
+	    return -1;
+
+	if (!con->os->nextCharArg) {
 		
 	    origOptString = con->os->argv[con->os->next++];
 
@@ -107,18 +109,20 @@ int poptGetNextOpt(poptContext con) {
 	    } else if (optString[1] == '-') {
 		optString += 2;
 
-		if (!con->os->currAlias ||
+		if (!con->os->currAlias || !con->os->currAlias->longName || 
 		    strcmp(con->os->currAlias->longName, optString)) {
-		    i = 0;
-		    while (i < con->numAliases &&
-			strcmp(con->aliases[i].longName, optString)) i++;
 
-		    if (i < con->numAliases) {
+		    i = con->numAliases - 1;
+		    while (i >= 0 && (!con->aliases[i].longName ||
+			strcmp(con->aliases[i].longName, optString))) i--;
+
+		    if (i >= 0) {
 			if ((con->os - con->optionStack) == POPT_OPTION_DEPTH)
 			    return POPT_ERROR_OPTSTOODEEP;
 
 			con->os++;
 			con->os->next = 0;
+			con->os->nextArg = con->os->nextCharArg = NULL;
 			con->os->currAlias = con->aliases + i;
 			con->os->argc = con->os->currAlias->argc;
 			con->os->argv = con->os->currAlias->argv;
@@ -142,13 +146,39 @@ int poptGetNextOpt(poptContext con) {
 
 		if (!opt->longName && !opt->shortName) return POPT_ERROR_BADOPT;
 	    } else 
-		con->nextCharArg = origOptString + 1;
+		con->os->nextCharArg = origOptString + 1;
 	}
 
-	if (con->nextCharArg) {
-	    origOptString = con->nextCharArg;
+	if (con->os->nextCharArg) {
+	    origOptString = con->os->nextCharArg;
+
+	    con->os->nextCharArg = NULL;
+
+	    if (!con->os->currAlias || *origOptString != 
+		con->os->currAlias->shortName) {
+
+		i = con->numAliases - 1;
+		while (i >= 0 &&
+		    con->aliases[i].shortName != *origOptString) i--;
+
+		if (i >= 0) {
+		    if ((con->os - con->optionStack) == POPT_OPTION_DEPTH)
+			return POPT_ERROR_OPTSTOODEEP;
 
-	    con->nextCharArg = NULL;
+		    /* We'll need this on the way out */
+		    origOptString++;
+		    if (*origOptString)
+			con->os->nextCharArg = origOptString;
+
+		    con->os++;
+		    con->os->next = 0;
+		    con->os->nextArg = con->os->nextCharArg = NULL;
+		    con->os->currAlias = con->aliases + i;
+		    con->os->argc = con->os->currAlias->argc;
+		    con->os->argv = con->os->currAlias->argv;
+		    continue;
+		}
+	    }
 
 	    opt = con->options;
 	    while ((opt->longName || opt->shortName) && 
@@ -157,17 +187,17 @@ int poptGetNextOpt(poptContext con) {
 
 	    origOptString++;
 	    if (*origOptString)
-		con->nextCharArg = origOptString;
+		con->os->nextCharArg = origOptString;
 	}
 
 	if (opt->arg && opt->argInfo == POPT_ARG_NONE) 
 	    *((int *)opt->arg) = 1;
 	else if (opt->argInfo != POPT_ARG_NONE) {
 	    if (longArg) {
-		con->nextArg = longArg;
-	    } else if (con->nextCharArg) {
-		con->nextArg = con->nextCharArg;
-		con->nextCharArg = NULL;
+		con->os->nextArg = longArg;
+	    } else if (con->os->nextCharArg) {
+		con->os->nextArg = con->os->nextCharArg;
+		con->os->nextCharArg = NULL;
 	    } else { 
 		while (con->os->next == con->os->argc && 
 		       con->os > con->optionStack)
@@ -175,13 +205,13 @@ int poptGetNextOpt(poptContext con) {
 		if (con->os->next == con->os->argc)
 		    return POPT_ERROR_NOARG;
 
-		con->nextArg = con->os->argv[con->os->next++];
+		con->os->nextArg = con->os->argv[con->os->next++];
 	    }
 
 	    if (opt->arg) {
 		switch (opt->argInfo) {
 		  case POPT_ARG_STRING:
-		    *((char **) opt->arg) = con->nextArg;
+		    *((char **) opt->arg) = con->os->nextArg;
 		    break;
 		  default:
 		    printf("option type not implemented in popt\n");
@@ -197,8 +227,8 @@ int poptGetNextOpt(poptContext con) {
 }
 
 char * poptGetOptArg(poptContext con) {
-    char * ret = con->nextArg;
-    con->nextArg = NULL;
+    char * ret = con->os->nextArg;
+    con->os->nextArg = NULL;
     return ret;
 }
 
@@ -222,8 +252,16 @@ char ** poptGetArgs(poptContext con) {
 }
 
 void poptFreeContext(poptContext con) {
+    int i;
+
+    for (i = 0; i < con->numAliases; i++) {
+	free(con->aliases[i].longName);
+	free(con->aliases[i].argv);
+    }
+
     free(con->leftovers);
     if (con->appName) free(con->appName);
+    if (con->aliases) free(con->aliases);
     free(con);
 }
 
@@ -235,8 +273,11 @@ int poptAddAlias(poptContext con, struct poptAlias newAlias, int flags) {
     alias = con->aliases + aliasNum;
     
     *alias = newAlias;
-    alias->longName = strcpy(malloc(strlen(alias->longName) + 1), 
-				alias->longName);
+    if (alias->longName)
+	alias->longName = strcpy(malloc(strlen(alias->longName) + 1), 
+				    alias->longName);
+    else
+	alias->longName = NULL;
 
     return 0;
 }
@@ -343,10 +384,19 @@ static void configLine(poptContext con, char * line) {
 	while (*line && isspace(*line)) line++;
 	if (!*line) return;
 
+	if (!strlen(opt)) return;
+
 	if (poptParseArgvString(line, &alias.argc, &alias.argv)) return;
-	alias.longName = opt;
-	
-	poptAddAlias(con, alias, 0);
+
+	if (opt[0] == '-' && opt[1] == '-') {
+	    alias.longName = opt + 2;
+	    alias.shortName = '\0';
+	    poptAddAlias(con, alias, 0);
+	} else if (opt[0] == '-' && !opt[2]) {
+	    alias.longName = NULL;
+	    alias.shortName = opt[1];
+	    poptAddAlias(con, alias, 0);
+	}
     }
 }
 
@@ -411,7 +461,7 @@ int poptReadConfigFile(poptContext con, char * fn) {
 int poptReadDefaultConfig(poptContext con, int useEnv) {
     char * envName, * envValue;
     char * fn, * home, * chptr;
-    int rc;
+    int rc, skip;
     struct poptAlias alias;
 
     if (!con->appName) return 0;
@@ -446,13 +496,26 @@ int poptReadDefaultConfig(poptContext con, int useEnv) {
 	    }
 
 	    *chptr = '\0';
-	    alias.longName = envValue;
+
+	    skip = 0;
+	    if (!strncmp(envValue, "--", 2)) {
+		alias.longName = envValue + 2;
+		alias.shortName = '\0';
+	    } else if (*envValue == '-' && strlen(envValue) == 2) {
+		alias.longName = NULL;	
+		alias.shortName = envValue[1];
+	    } else {
+		skip = 1;
+	    }
+
 	    envValue = chptr + 1;
 	    chptr = strchr(envValue, '\n');
 	    if (chptr) *chptr = '\0';
 
-	    poptParseArgvString(envValue, &alias.argc, &alias.argv);
-	    poptAddAlias(con, alias, 0);
+	    if (!skip) {
+		poptParseArgvString(envValue, &alias.argc, &alias.argv);
+		poptAddAlias(con, alias, 0);
+	    }
 
 	    if (chptr)
 		envValue = chptr + 1;
@@ -497,3 +560,21 @@ const char * poptStrerror(const int error) {
 	return "unknown error";
     }
 }
+
+int poptStuffArgs(poptContext con, char ** argv) {
+    int i;
+
+    if ((con->os - con->optionStack) == POPT_OPTION_DEPTH)
+	return POPT_ERROR_OPTSTOODEEP;
+
+    for (i = 0; argv[i]; i++);
+
+    con->os++;
+    con->os->next = 0;
+    con->os->nextArg = con->os->nextCharArg = NULL;
+    con->os->currAlias = NULL;
+    con->os->argc = i;
+    con->os->argv = argv;
+
+    return 0;
+}
-- 
Gitee


From 617dc05cc68244032e7d34992da8556393c85d92 Mon Sep 17 00:00:00 2001
From: Erik Troan <ewt@redhat.com>
Date: Tue, 4 Mar 1997 02:23:04 +0000
Subject: [PATCH 007/667] fixed POPT_OPTION_DEPTH checking

---
 popt.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/popt.c b/popt.c
index d7005bf..143c2e7 100644
--- a/popt.c
+++ b/popt.c
@@ -117,7 +117,8 @@ int poptGetNextOpt(poptContext con) {
 			strcmp(con->aliases[i].longName, optString))) i--;
 
 		    if (i >= 0) {
-			if ((con->os - con->optionStack) == POPT_OPTION_DEPTH)
+			if ((con->os - con->optionStack + 1) 
+				== POPT_OPTION_DEPTH)
 			    return POPT_ERROR_OPTSTOODEEP;
 
 			con->os++;
@@ -162,7 +163,7 @@ int poptGetNextOpt(poptContext con) {
 		    con->aliases[i].shortName != *origOptString) i--;
 
 		if (i >= 0) {
-		    if ((con->os - con->optionStack) == POPT_OPTION_DEPTH)
+		    if ((con->os - con->optionStack + 1) == POPT_OPTION_DEPTH)
 			return POPT_ERROR_OPTSTOODEEP;
 
 		    /* We'll need this on the way out */
-- 
Gitee


From 199cab32a901d1c2806bd090d83c25cf1cf6a142 Mon Sep 17 00:00:00 2001
From: Erik Troan <ewt@redhat.com>
Date: Wed, 7 May 1997 19:43:34 +0000
Subject: [PATCH 008/667] = didn't work w/ long arguments

---
 popt.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/popt.c b/popt.c
index 143c2e7..b9bac7e 100644
--- a/popt.c
+++ b/popt.c
@@ -134,7 +134,7 @@ int poptGetNextOpt(poptContext con) {
 		chptr = optString;
 		while (*chptr && *chptr != '=') chptr++;
 		if (*chptr == '=') {
-		    longArg = origOptString + (chptr - localOptString);
+		    longArg = origOptString + (chptr - localOptString) + 1;
 		    *chptr = '\0';
 		}
 
-- 
Gitee


From b36baa78a8676e6497e7a4e55955b5df994b4933 Mon Sep 17 00:00:00 2001
From: Erik Troan <ewt@redhat.com>
Date: Mon, 12 May 1997 13:28:24 +0000
Subject: [PATCH 009/667] Added includes of miscfn.h

---
 popt.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/popt.c b/popt.c
index b9bac7e..ffe026e 100644
--- a/popt.c
+++ b/popt.c
@@ -1,3 +1,4 @@
+#include "miscfn.h"
 #include <errno.h>
 #include <ctype.h>
 #include <fcntl.h>
-- 
Gitee


From e8bdc01ddcd7ad107e67d7f87219ae8966584ceb Mon Sep 17 00:00:00 2001
From: Erik Troan <ewt@redhat.com>
Date: Thu, 15 May 1997 14:08:57 +0000
Subject: [PATCH 010/667] Fix things up for SunOS

---
 popt.c | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/popt.c b/popt.c
index ffe026e..5c514be 100644
--- a/popt.c
+++ b/popt.c
@@ -271,7 +271,12 @@ int poptAddAlias(poptContext con, struct poptAlias newAlias, int flags) {
     int aliasNum = con->numAliases++;
     struct poptAlias * alias;
 
-    con->aliases = realloc(con->aliases, sizeof(newAlias) * con->numAliases);
+    /* SunOS won't realloc(NULL, ...) */
+    if (!con->aliases)
+	con->aliases = malloc(sizeof(newAlias) * con->numAliases);
+    else
+	con->aliases = realloc(con->aliases, 
+			       sizeof(newAlias) * con->numAliases);
     alias = con->aliases + aliasNum;
     
     *alias = newAlias;
-- 
Gitee


From c675f711d472bfa25c85dde535c9d3a7b30d3243 Mon Sep 17 00:00:00 2001
From: Erik Troan <ewt@redhat.com>
Date: Tue, 20 May 1997 15:57:52 +0000
Subject: [PATCH 011/667] Moved includes of miscfn.h to the top.

---
 popt.c | 1 -
 1 file changed, 1 deletion(-)

diff --git a/popt.c b/popt.c
index 5c514be..bc24b9b 100644
--- a/popt.c
+++ b/popt.c
@@ -1,4 +1,3 @@
-#include "miscfn.h"
 #include <errno.h>
 #include <ctype.h>
 #include <fcntl.h>
-- 
Gitee


From e4b589907baa172df13f535b98c3fce65cb15569 Mon Sep 17 00:00:00 2001
From: Erik Troan <ewt@redhat.com>
Date: Mon, 7 Jul 1997 22:22:51 +0000
Subject: [PATCH 012/667] 1) changed popt's ternary operator to work properly
 2) popt doesn't take \ at the end of a line as a newline 3) fixed --scripts
 in rpmpopt to take advantage of #1

---
 popt.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/popt.c b/popt.c
index bc24b9b..d4dee02 100644
--- a/popt.c
+++ b/popt.c
@@ -451,7 +451,8 @@ int poptReadConfigFile(poptContext con, char * fn) {
 	    *dst++ = *chptr++;
 	    if (chptr < end) {
 		if (*chptr == '\n') 
-		    *(dst - 1) = *chptr++;
+		    dst--, chptr++;	
+		    /* \ at the end of a line does not insert a \n */
 		else
 		    *dst++ = *chptr++;
 	    }
-- 
Gitee


From 63820e9b9f8b4d53d49d64b1194bf9508b8b18ed Mon Sep 17 00:00:00 2001
From: Erik Troan <ewt@redhat.com>
Date: Thu, 18 Sep 1997 01:54:30 +0000
Subject: [PATCH 013/667] added kickstart support for

	1) keymap
	2) swap
	3) lilo
	4) postinstall networking (preliminary)
	5) dependency resolution
---
 Makefile | 43 +++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 43 insertions(+)
 create mode 100644 Makefile

diff --git a/Makefile b/Makefile
new file mode 100644
index 0000000..cb61c22
--- /dev/null
+++ b/Makefile
@@ -0,0 +1,43 @@
+LIBOBJECTS = 	popt.o
+
+DEFCFLAGS=-O2
+
+SOURCES =$(subst .o,.c,$(LIBOBJECTS))
+LIBPOPT = libpopt.a
+INSTALL= @INSTALL@
+INSTALL_PROGRAM= @INSTALL_PROGRAM@
+INSTALL_DATA= @INSTALL_DATA@
+
+# -----------------------------------------------------------------------
+
+ifeq ($(CFLAGS),)
+CFLAGS=$(DEFCFLAGS)
+endif
+
+ifeq ($(RANLIB),)
+RANLIB=ranlib
+endif
+
+ifeq (.depend,$(wildcard .depend))
+TARGET=allprogs
+else
+TARGET=depend allprogs
+endif
+
+$(LIBPOPT): $(LIBPOPT)($(LIBOBJECTS))
+	$(RANLIB) $@
+
+distclean: clean
+
+clean:
+	rm -f *.a *.o *~ $(PROGS) test.out tagtable.c
+
+squeaky: clean
+	rm -f .depend
+
+depend:
+	$(CPP) $(CFLAGS) -M $(SOURCES) > .depend
+
+ifeq (.depend,$(wildcard .depend))
+include .depend
+endif
-- 
Gitee


From a5d04ee7d4cfa6e80937900ead41476d19e62a33 Mon Sep 17 00:00:00 2001
From: Erik Troan <ewt@redhat.com>
Date: Thu, 18 Sep 1997 16:39:46 +0000
Subject: [PATCH 014/667] 1) use Makefile.inc if it's present 2) added install
 rule

---
 Makefile | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/Makefile b/Makefile
index cb61c22..71c720c 100644
--- a/Makefile
+++ b/Makefile
@@ -4,9 +4,12 @@ DEFCFLAGS=-O2
 
 SOURCES =$(subst .o,.c,$(LIBOBJECTS))
 LIBPOPT = libpopt.a
-INSTALL= @INSTALL@
-INSTALL_PROGRAM= @INSTALL_PROGRAM@
-INSTALL_DATA= @INSTALL_DATA@
+LIBS=/usr/lib
+INCLUDE=/usr/include
+
+ifeq (../Makefile.inc,$(wildcard ../Makefile.inc))
+include ../Makefile.inc
+endif
 
 # -----------------------------------------------------------------------
 
@@ -38,6 +41,10 @@ squeaky: clean
 depend:
 	$(CPP) $(CFLAGS) -M $(SOURCES) > .depend
 
+install:
+	install -m 644 popt.h $(INCLUDE)/popt.h
+	install -m 644 $(LIBPOPT) $(LIBS)/$(LIBPOPT)
+
 ifeq (.depend,$(wildcard .depend))
 include .depend
 endif
-- 
Gitee


From 8c70bd8f634cd54e7a90b903f12e30649db7dedc Mon Sep 17 00:00:00 2001
From: Erik Troan <ewt@redhat.com>
Date: Thu, 18 Sep 1997 16:46:08 +0000
Subject: [PATCH 015/667] 1) allowed installation based on a PREFIX 2) added
 popt.spec

---
 Makefile  |  6 ++++--
 popt.spec | 33 +++++++++++++++++++++++++++++++++
 2 files changed, 37 insertions(+), 2 deletions(-)
 create mode 100644 popt.spec

diff --git a/Makefile b/Makefile
index 71c720c..4a6998d 100644
--- a/Makefile
+++ b/Makefile
@@ -42,8 +42,10 @@ depend:
 	$(CPP) $(CFLAGS) -M $(SOURCES) > .depend
 
 install:
-	install -m 644 popt.h $(INCLUDE)/popt.h
-	install -m 644 $(LIBPOPT) $(LIBS)/$(LIBPOPT)
+	mkdir -p $(PREFIX)/$(INCLUDE)
+	mkdir -p $(PREFIX)/$(LIBS)
+	install -m 644 popt.h $(PREFIX)/$(INCLUDE)/popt.h
+	install -m 644 $(LIBPOPT) $(PREFIX)/$(LIBS)/$(LIBPOPT)
 
 ifeq (.depend,$(wildcard .depend))
 include .depend
diff --git a/popt.spec b/popt.spec
new file mode 100644
index 0000000..738b3ce
--- /dev/null
+++ b/popt.spec
@@ -0,0 +1,33 @@
+Summary: C library for parsing command line parameters
+Name: popt
+Version: 1.0
+Release: 1
+Copyright: LGPL
+Group: Utilities/System
+Source: ftp://ftp.redhat.com/pub/redhat/code/popt/popt-1.0.tar.gz
+BuildRoot: /var/tmp/popt.root
+
+%description
+Popt is a C library for pasing command line parameters. It was heavily
+influenced by the getopt() and getopt_long() functions, but it allows
+more powerfull argument expansion. It can parse arbitrary argv[] style
+arrays and automatically set variables based on command line arguments.
+It also allows command line arguments to be aliased via configuration
+files and includes utility functions for parsing arbitrary strings into
+argv[] arrays using shell-like rules. 
+
+%prep
+%setup -n popt
+
+%build
+make CFLAGS="$RPM_OPT_FLAGS"
+
+%install
+make PREFIX=$RPM_BUILD_ROOT install
+
+%clean
+rm -rf $RPM_BUILD_ROOT
+
+%files
+%attr(0644, root, root) /usr/lib/libpopt.a
+%attr(0644, root, root) /usr/include/popt.h
-- 
Gitee


From 2de002533b94014fe7c55c90b7a3681e2d1a0d2c Mon Sep 17 00:00:00 2001
From: Erik Troan <ewt@redhat.com>
Date: Sun, 2 Nov 1997 16:12:55 +0000
Subject: [PATCH 016/667] implmented POPT_ARG_INT and POPT_ARG_LONG

---
 Makefile |  2 +-
 popt.c   | 21 +++++++++++++++++++++
 popt.h   |  2 ++
 3 files changed, 24 insertions(+), 1 deletion(-)

diff --git a/Makefile b/Makefile
index 4a6998d..b76b25e 100644
--- a/Makefile
+++ b/Makefile
@@ -1,6 +1,6 @@
 LIBOBJECTS = 	popt.o
 
-DEFCFLAGS=-O2
+DEFCFLAGS=-O2 -Wall
 
 SOURCES =$(subst .o,.c,$(LIBOBJECTS))
 LIBPOPT = libpopt.a
diff --git a/popt.c b/popt.c
index d4dee02..57b0041 100644
--- a/popt.c
+++ b/popt.c
@@ -1,6 +1,7 @@
 #include <errno.h>
 #include <ctype.h>
 #include <fcntl.h>
+#include <limits.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
@@ -75,6 +76,8 @@ int poptGetNextOpt(poptContext con) {
     char * optString, * chptr, * localOptString;
     char * longArg = NULL;
     char * origOptString;
+    long aLong;
+    char * end;
     struct poptOption * opt = NULL;
     int done = 0;
     int i;
@@ -214,6 +217,24 @@ int poptGetNextOpt(poptContext con) {
 		  case POPT_ARG_STRING:
 		    *((char **) opt->arg) = con->os->nextArg;
 		    break;
+
+		  case POPT_ARG_INT:
+		  case POPT_ARG_LONG:
+		    aLong = strtol(con->os->nextArg, &end, 0);
+		    if (*end) 
+			return POPT_ERROR_BADNUMBER;
+
+		    if (aLong == LONG_MIN || aLong == LONG_MAX)
+			return POPT_ERROR_OVERFLOW;
+		    if (opt->argInfo == POPT_ARG_LONG) {
+			*((long *) opt->arg) = aLong;
+		    } else {
+			if (aLong > INT_MAX || aLong < INT_MIN)
+			    return POPT_ERROR_OVERFLOW;
+			*((int *) opt->arg) =aLong;
+		    }
+		    break;
+
 		  default:
 		    printf("option type not implemented in popt\n");
 		    exit(1);
diff --git a/popt.h b/popt.h
index 1b208d4..0072e25 100644
--- a/popt.h
+++ b/popt.h
@@ -13,6 +13,8 @@
 #define POPT_ERROR_OPTSTOODEEP	-13
 #define POPT_ERROR_BADQUOTE	-15	/* only from poptParseArgString() */
 #define POPT_ERROR_ERRNO	-16	/* only from poptParseArgString() */
+#define POPT_ERROR_BADNUMBER	-17
+#define POPT_ERROR_OVERFLOW	-18
 
 #define POPT_BADOPTION_NOALIAS  (1 << 0)  /* don't go into an alias */
 
-- 
Gitee


From 5c71823b5d2cb92cc55451ae96ce865bb0b91fec Mon Sep 17 00:00:00 2001
From: Erik Troan <ewt@redhat.com>
Date: Sun, 2 Nov 1997 16:45:17 +0000
Subject: [PATCH 017/667] added error strings for BADNUMBER and OVERFLOW errors

---
 popt.c | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/popt.c b/popt.c
index 57b0041..ead28da 100644
--- a/popt.c
+++ b/popt.c
@@ -582,6 +582,10 @@ const char * poptStrerror(const int error) {
 	return "aliases nested too deeply";
       case POPT_ERROR_BADQUOTE:
 	return "error in paramter quoting";
+      case POPT_ERROR_BADNUMBER:
+	return "invalid numeric value";
+      case POPT_ERROR_OVERFLOW:
+	return "number too large or too small";
       case POPT_ERROR_ERRNO:
 	return strerror(errno);
       default:
-- 
Gitee


From c54c8b49db3c8cdb1d34a98f09d14f49161cbc71 Mon Sep 17 00:00:00 2001
From: Marc Ewing <marc@redhat.com>
Date: Sun, 2 Nov 1997 22:49:50 +0000
Subject: [PATCH 018/667] Added POPT_KEEP_FIRST to cause popt to *not* ignore
 first arg.

---
 popt.c | 8 +++++++-
 popt.h | 2 ++
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/popt.c b/popt.c
index ead28da..d75a5e1 100644
--- a/popt.c
+++ b/popt.c
@@ -29,6 +29,7 @@ struct poptContext_s {
     char * appName;
     struct poptAlias * aliases;
     int numAliases;
+    int flags;
 };
 
 poptContext poptGetContext(char * name ,int argc, char ** argv, 
@@ -41,7 +42,11 @@ poptContext poptGetContext(char * name ,int argc, char ** argv,
     con->os->currAlias = NULL;
     con->os->nextCharArg = NULL;
     con->os->nextArg = NULL;
-    con->os->next = 1;			/* skip argv[0] */
+
+    if (flags & POPT_KEEP_FIRST)
+	con->os->next = 0;			/* include argv[0] */
+    else
+	con->os->next = 1;			/* skip argv[0] */
 
     con->leftovers = malloc(sizeof(char *) * (argc + 1));
     con->numLeftovers = 0;
@@ -50,6 +55,7 @@ poptContext poptGetContext(char * name ,int argc, char ** argv,
     con->options = options;
     con->aliases = NULL;
     con->numAliases = 0;
+    con->flags = 0;
     
     if (!name)
 	con->appName = NULL;
diff --git a/popt.h b/popt.h
index 0072e25..c341a83 100644
--- a/popt.h
+++ b/popt.h
@@ -16,7 +16,9 @@
 #define POPT_ERROR_BADNUMBER	-17
 #define POPT_ERROR_OVERFLOW	-18
 
+/* context creation flags */
 #define POPT_BADOPTION_NOALIAS  (1 << 0)  /* don't go into an alias */
+#define POPT_KEEP_FIRST		(1 << 1)  /* pay attention to argv[0] */
 
 struct poptOption {
     const char * longName;	/* may be NULL */
-- 
Gitee


From 1dee613b9352747ef1d887be8597ab7e601400a7 Mon Sep 17 00:00:00 2001
From: Erik Troan <ewt@redhat.com>
Date: Wed, 11 Feb 1998 08:59:35 +0000
Subject: [PATCH 019/667] 1) added changes which let RPM build in a directory
 other then its source    directory 2) moved popt to autoconf

---
 Makefile => Makefile.in | 15 ++++++---------
 configure.in            |  8 ++++++++
 2 files changed, 14 insertions(+), 9 deletions(-)
 rename Makefile => Makefile.in (77%)
 create mode 100755 configure.in

diff --git a/Makefile b/Makefile.in
similarity index 77%
rename from Makefile
rename to Makefile.in
index b76b25e..a44efde 100644
--- a/Makefile
+++ b/Makefile.in
@@ -1,21 +1,18 @@
+srcdir = @srcdir@
+VPATH = $(srcdir)
+
 LIBOBJECTS = 	popt.o
 
-DEFCFLAGS=-O2 -Wall
+WARNINGS = -Wall -Wpointer-arith -Wstrict-prototypes -Wmissing-prototypes 
 
-SOURCES =$(subst .o,.c,$(LIBOBJECTS))
+SOURCES = $(addprefix $(srcdir)/,$(subst .o,.c,$(LIBOBJECTS)))
 LIBPOPT = libpopt.a
 LIBS=/usr/lib
 INCLUDE=/usr/include
 
-ifeq (../Makefile.inc,$(wildcard ../Makefile.inc))
-include ../Makefile.inc
-endif
-
 # -----------------------------------------------------------------------
 
-ifeq ($(CFLAGS),)
-CFLAGS=$(DEFCFLAGS)
-endif
+CFLAGS = @CFLAGS@ $(WARNINGS) $(OPTS)
 
 ifeq ($(RANLIB),)
 RANLIB=ranlib
diff --git a/configure.in b/configure.in
new file mode 100755
index 0000000..0b61225
--- /dev/null
+++ b/configure.in
@@ -0,0 +1,8 @@
+AC_INIT(popt.h)
+
+AC_PROG_CC
+AC_GCC_TRADITIONAL
+
+AC_CHECK_FUNCS(mmap)
+
+AC_OUTPUT(Makefile)
-- 
Gitee


From 502ce558e981d702d69c3ff35fcf93aca4878311 Mon Sep 17 00:00:00 2001
From: Erik Troan <ewt@redhat.com>
Date: Tue, 17 Feb 1998 16:46:13 +0000
Subject: [PATCH 020/667] 1) added autoconf for popt directory to make archive
 2) version 2.4.103

---
 Makefile.in  |  9 ++++++---
 configure.in |  2 ++
 popt.c       | 18 +++++++++++++++---
 popt.h       |  2 +-
 popt.spec    |  7 ++++---
 5 files changed, 28 insertions(+), 10 deletions(-)

diff --git a/Makefile.in b/Makefile.in
index a44efde..5c2a94a 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -7,12 +7,14 @@ WARNINGS = -Wall -Wpointer-arith -Wstrict-prototypes -Wmissing-prototypes
 
 SOURCES = $(addprefix $(srcdir)/,$(subst .o,.c,$(LIBOBJECTS)))
 LIBPOPT = libpopt.a
-LIBS=/usr/lib
-INCLUDE=/usr/include
+
+prefix=@prefix@
+LIBS=$(prefix)/lib
+INCLUDE=$(prefix)/include
 
 # -----------------------------------------------------------------------
 
-CFLAGS = @CFLAGS@ $(WARNINGS) $(OPTS)
+CFLAGS = @CFLAGS@ @DEFS@ $(WARNINGS) $(OPTS)
 
 ifeq ($(RANLIB),)
 RANLIB=ranlib
@@ -28,6 +30,7 @@ $(LIBPOPT): $(LIBPOPT)($(LIBOBJECTS))
 	$(RANLIB) $@
 
 distclean: clean
+	rm -f Makefile config.h config.cache config.status config.log
 
 clean:
 	rm -f *.a *.o *~ $(PROGS) test.out tagtable.c
diff --git a/configure.in b/configure.in
index 0b61225..a3eea0a 100755
--- a/configure.in
+++ b/configure.in
@@ -3,6 +3,8 @@ AC_INIT(popt.h)
 AC_PROG_CC
 AC_GCC_TRADITIONAL
 
+AC_CHECK_HEADER(unistd.h)
 AC_CHECK_FUNCS(mmap)
+AC_CHECK_FUNCS(strerror)
 
 AC_OUTPUT(Makefile)
diff --git a/popt.c b/popt.c
index d75a5e1..8029d60 100644
--- a/popt.c
+++ b/popt.c
@@ -24,7 +24,7 @@ struct poptContext_s {
     char ** leftovers;
     int numLeftovers;
     int nextLeftover;
-    struct poptOption * options;
+    const struct poptOption * options;
     int restLeftover;
     char * appName;
     struct poptAlias * aliases;
@@ -32,8 +32,20 @@ struct poptContext_s {
     int flags;
 };
 
+#ifndef HAVE_STRERROR
+static char * strerror(int errno) {
+    extern int sys_nerr;
+    extern char * sys_errlist[];
+
+    if ((0 <= errno) && (errno < sys_nerr))
+	return sys_errlist[errno];
+    else
+	return "unknown errno";
+}
+#endif
+
 poptContext poptGetContext(char * name ,int argc, char ** argv, 
-			   struct poptOption * options, int flags) {
+			   const struct poptOption * options, int flags) {
     poptContext con = malloc(sizeof(*con));
 
     con->os = con->optionStack;
@@ -84,7 +96,7 @@ int poptGetNextOpt(poptContext con) {
     char * origOptString;
     long aLong;
     char * end;
-    struct poptOption * opt = NULL;
+    const struct poptOption * opt = NULL;
     int done = 0;
     int i;
 
diff --git a/popt.h b/popt.h
index c341a83..2d9c525 100644
--- a/popt.h
+++ b/popt.h
@@ -38,7 +38,7 @@ struct poptAlias {
 typedef struct poptContext_s * poptContext;
 
 poptContext poptGetContext(char * name, int argc, char ** argv, 
-			   struct poptOption * options, int flags);
+			   const struct poptOption * options, int flags);
 void poptResetContext(poptContext con);
 
 /* returns 'val' element, -1 on last item, POPT_ERROR_* on error */
diff --git a/popt.spec b/popt.spec
index 738b3ce..7175dc4 100644
--- a/popt.spec
+++ b/popt.spec
@@ -1,10 +1,11 @@
 Summary: C library for parsing command line parameters
 Name: popt
-Version: 1.0
+%define version 1.1
+Version: %{version}
 Release: 1
 Copyright: LGPL
 Group: Utilities/System
-Source: ftp://ftp.redhat.com/pub/redhat/code/popt/popt-1.0.tar.gz
+Source: ftp://ftp.redhat.com/pub/redhat/code/popt/popt-%{version}.tar.gz
 BuildRoot: /var/tmp/popt.root
 
 %description
@@ -17,7 +18,7 @@ files and includes utility functions for parsing arbitrary strings into
 argv[] arrays using shell-like rules. 
 
 %prep
-%setup -n popt
+%setup
 
 %build
 make CFLAGS="$RPM_OPT_FLAGS"
-- 
Gitee


From f21b2d9f45410593392e52dad20dc447c78e99f1 Mon Sep 17 00:00:00 2001
From: Erik Troan <ewt@redhat.com>
Date: Wed, 4 Mar 1998 16:51:54 +0000
Subject: [PATCH 021/667] include alloca.h if present

---
 popt.c | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/popt.c b/popt.c
index 8029d60..2afffb9 100644
--- a/popt.c
+++ b/popt.c
@@ -8,6 +8,10 @@
 #include <sys/mman.h>
 #include <unistd.h>
 
+#if HAVE_ALLOCA_H
+# include <alloca.h>
+#endif
+
 #include "popt.h"
 
 struct optionStackEntry {
@@ -389,7 +393,8 @@ int poptParseArgvString(char * s, int * argcPtr, char *** argvPtr) {
 	argc++, buf++;
     }
 
-    argv2 = (void * )dst = malloc(argc * sizeof(*argv) + (buf - bufStart));
+    dst = malloc(argc * sizeof(*argv) + (buf - bufStart));
+    argv2 = (void *) dst;
     dst += argc * sizeof(*argv);
     memcpy(argv2, argv, argc * sizeof(*argv));
     memcpy(dst, bufStart, buf - bufStart);
-- 
Gitee


From 1053b884d0bf016d8bc2942acc6c1df0a2ba4ea0 Mon Sep 17 00:00:00 2001
From: Erik Troan <ewt@redhat.com>
Date: Wed, 4 Mar 1998 16:52:19 +0000
Subject: [PATCH 022/667] 1) check for alloca.h in configure.in 2) use more
 portable dependency scheme

---
 Makefile.in  | 27 ++++++++++++++++-----------
 configure.in | 21 ++++++++++++++++++++-
 2 files changed, 36 insertions(+), 12 deletions(-)

diff --git a/Makefile.in b/Makefile.in
index 5c2a94a..f250fa1 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -1,51 +1,56 @@
 srcdir = @srcdir@
-VPATH = $(srcdir)
+top_srcdir = @top_srcdir@
+VPATH = @srcdir
 
 LIBOBJECTS = 	popt.o
 
-WARNINGS = -Wall -Wpointer-arith -Wstrict-prototypes -Wmissing-prototypes 
-
 SOURCES = $(addprefix $(srcdir)/,$(subst .o,.c,$(LIBOBJECTS)))
 LIBPOPT = libpopt.a
 
+RANLIB=@RANLIB@
+INSTALL=@INSTALL@
+INSTALL_PREOGRAM=@INSTALL_PREOGRAM@
+INSTALL_DATA=@INSTALL_DATA@
 prefix=@prefix@
 LIBS=$(prefix)/lib
 INCLUDE=$(prefix)/include
 
 # -----------------------------------------------------------------------
 
-CFLAGS = @CFLAGS@ @DEFS@ $(WARNINGS) $(OPTS)
+CFLAGS = @CFLAGS@ @DEFS@ $(OPTS)
 
 ifeq ($(RANLIB),)
 RANLIB=ranlib
 endif
 
-ifeq (.depend,$(wildcard .depend))
+ifeq (.depend,$(wildcard .depend-done))
 TARGET=allprogs
 else
-TARGET=depend allprogs
+TARGET=@TARGET@
 endif
 
 $(LIBPOPT): $(LIBPOPT)($(LIBOBJECTS))
 	$(RANLIB) $@
 
 distclean: clean
-	rm -f Makefile config.h config.cache config.status config.log
+	rm -f Makefile .depend-done
 
 clean:
 	rm -f *.a *.o *~ $(PROGS) test.out tagtable.c
 
-squeaky: clean
+squeaky: distclean
 	rm -f .depend
 
 depend:
-	$(CPP) $(CFLAGS) -M $(SOURCES) > .depend
+	topdir_path=`( cd $(top_srcdir) && pwd )` ; \
+	    $(CPP) $(CFLAGS) -MM $(SOURCES) | \
+		sed s+$$topdir_path+$(top_srcdir)+g > .depend
 
 install:
 	mkdir -p $(PREFIX)/$(INCLUDE)
 	mkdir -p $(PREFIX)/$(LIBS)
-	install -m 644 popt.h $(PREFIX)/$(INCLUDE)/popt.h
-	install -m 644 $(LIBPOPT) $(PREFIX)/$(LIBS)/$(LIBPOPT)
+	$INSTALL_DATA) -m 644 popt.h $(PREFIX)/$(INCLUDE)/popt.h
+	$INSTALL_DATA) -m 644 $(LIBPOPT) $(PREFIX)/$(LIBS)/$(LIBPOPT)
 
 ifeq (.depend,$(wildcard .depend))
 include .depend
diff --git a/configure.in b/configure.in
index a3eea0a..1c1daa0 100755
--- a/configure.in
+++ b/configure.in
@@ -2,8 +2,27 @@ AC_INIT(popt.h)
 
 AC_PROG_CC
 AC_GCC_TRADITIONAL
+AC_PROG_RANLIB
+AC_PROG_INSTALL
 
-AC_CHECK_HEADER(unistd.h)
+dnl
+dnl if CC is gcc, we can rebuild the dependencies (since the depend rule
+dnl requires gcc).  If it's not, don't rebuild dependencies -- use what was
+dnl shipped with RPM.
+dnl
+if test X"$GCC" = Xyes ; then
+    TARGET="depend allprogs"
+else
+    TARGET="everything"
+    #
+    # let the Makefile know that we're done with `depend', since we don't
+    # have gcc we're not going to rebuild our dependencies at all.
+    #
+    echo > .depend-done
+fi
+AC_SUBST(TARGET)
+
+AC_CHECK_HEADERS(unistd.h alloca.h)
 AC_CHECK_FUNCS(mmap)
 AC_CHECK_FUNCS(strerror)
 
-- 
Gitee


From 5a519cad31e5b5b6f66aa7ad048ad0b489b7c951 Mon Sep 17 00:00:00 2001
From: Erik Troan <ewt@redhat.com>
Date: Thu, 5 Mar 1998 20:50:04 +0000
Subject: [PATCH 023/667] get CPP from autoconf

---
 Makefile.in | 1 +
 1 file changed, 1 insertion(+)

diff --git a/Makefile.in b/Makefile.in
index f250fa1..ed4ac49 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -14,6 +14,7 @@ INSTALL_DATA=@INSTALL_DATA@
 prefix=@prefix@
 LIBS=$(prefix)/lib
 INCLUDE=$(prefix)/include
+CPP=@CPP@
 
 # -----------------------------------------------------------------------
 
-- 
Gitee


From cef1780a01bb856ae9ea915e6dde42e172023761 Mon Sep 17 00:00:00 2001
From: Erik Troan <ewt@redhat.com>
Date: Mon, 23 Mar 1998 20:26:36 +0000
Subject: [PATCH 024/667] *** empty log message ***

---
 popt.ps | 7963 +++++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 7963 insertions(+)
 create mode 100644 popt.ps

diff --git a/popt.ps b/popt.ps
new file mode 100644
index 0000000..e744ac4
--- /dev/null
+++ b/popt.ps
@@ -0,0 +1,7963 @@
+%!PS-Adobe-2.0
+%%Creator: dvipsk 5.58f Copyright 1986, 1994 Radical Eye Software
+%%Title: book.dvi
+%%Pages: 11
+%%PageOrder: Ascend
+%%BoundingBox: 0 0 567 702
+%%DocumentFonts: ZapfDingbats Palatino-Bold Palatino-Roman
+%%+ StoneSans-Bold StoneSans Palatino-Italic PPCode
+%%+ StoneSans-SemiboldItalic StoneSans-Semibold PPCodeBold
+%%DocumentPaperSizes: Letter
+%%EndComments
+%DVIPSCommandLine: dvips -k -o "|./fixappendix book.ps" book.dvi
+%DVIPSParameters: dpi=600, comments removed
+%DVIPSSource:  TeX output 1998.03.23:1523
+%%BeginProcSet: tex.pro
+/TeXDict 250 dict def TeXDict begin /N{def}def /B{bind def}N /S{exch}N
+/X{S N}B /TR{translate}N /isls false N /vsize 11 72 mul N /hsize 8.5 72
+mul N /landplus90{false}def /@rigin{isls{[0 landplus90{1 -1}{-1 1}
+ifelse 0 0 0]concat}if 72 Resolution div 72 VResolution div neg scale
+isls{landplus90{VResolution 72 div vsize mul 0 exch}{Resolution -72 div
+hsize mul 0}ifelse TR}if Resolution VResolution vsize -72 div 1 add mul
+TR[matrix currentmatrix{dup dup round sub abs 0.00001 lt{round}if}
+forall round exch round exch]setmatrix}N /@landscape{/isls true N}B
+/@manualfeed{statusdict /manualfeed true put}B /@copies{/#copies X}B
+/FMat[1 0 0 -1 0 0]N /FBB[0 0 0 0]N /nn 0 N /IE 0 N /ctr 0 N /df-tail{
+/nn 8 dict N nn begin /FontType 3 N /FontMatrix fntrx N /FontBBox FBB N
+string /base X array /BitMaps X /BuildChar{CharBuilder}N /Encoding IE N
+end dup{/foo setfont}2 array copy cvx N load 0 nn put /ctr 0 N[}B /df{
+/sf 1 N /fntrx FMat N df-tail}B /dfs{div /sf X /fntrx[sf 0 0 sf neg 0 0]
+N df-tail}B /E{pop nn dup definefont setfont}B /ch-width{ch-data dup
+length 5 sub get}B /ch-height{ch-data dup length 4 sub get}B /ch-xoff{
+128 ch-data dup length 3 sub get sub}B /ch-yoff{ch-data dup length 2 sub
+get 127 sub}B /ch-dx{ch-data dup length 1 sub get}B /ch-image{ch-data
+dup type /stringtype ne{ctr get /ctr ctr 1 add N}if}B /id 0 N /rw 0 N
+/rc 0 N /gp 0 N /cp 0 N /G 0 N /sf 0 N /CharBuilder{save 3 1 roll S dup
+/base get 2 index get S /BitMaps get S get /ch-data X pop /ctr 0 N ch-dx
+0 ch-xoff ch-yoff ch-height sub ch-xoff ch-width add ch-yoff
+setcachedevice ch-width ch-height true[1 0 0 -1 -.1 ch-xoff sub ch-yoff
+.1 sub]{ch-image}imagemask restore}B /D{/cc X dup type /stringtype ne{]}
+if nn /base get cc ctr put nn /BitMaps get S ctr S sf 1 ne{dup dup
+length 1 sub dup 2 index S get sf div put}if put /ctr ctr 1 add N}B /I{
+cc 1 add D}B /bop{userdict /bop-hook known{bop-hook}if /SI save N @rigin
+0 0 moveto /V matrix currentmatrix dup 1 get dup mul exch 0 get dup mul
+add .99 lt{/QV}{/RV}ifelse load def pop pop}N /eop{SI restore userdict
+/eop-hook known{eop-hook}if showpage}N /@start{userdict /start-hook
+known{start-hook}if pop /VResolution X /Resolution X 1000 div /DVImag X
+/IE 256 array N 0 1 255{IE S 1 string dup 0 3 index put cvn put}for
+65781.76 div /vsize X 65781.76 div /hsize X}N /p{show}N /RMat[1 0 0 -1 0
+0]N /BDot 260 string N /rulex 0 N /ruley 0 N /v{/ruley X /rulex X V}B /V
+{}B /RV statusdict begin /product where{pop product dup length 7 ge{0 7
+getinterval dup(Display)eq exch 0 4 getinterval(NeXT)eq or}{pop false}
+ifelse}{false}ifelse end{{gsave TR -.1 .1 TR 1 1 scale rulex ruley false
+RMat{BDot}imagemask grestore}}{{gsave TR -.1 .1 TR rulex ruley scale 1 1
+false RMat{BDot}imagemask grestore}}ifelse B /QV{gsave newpath transform
+round exch round exch itransform moveto rulex 0 rlineto 0 ruley neg
+rlineto rulex neg 0 rlineto fill grestore}B /a{moveto}B /delta 0 N /tail
+{dup /delta X 0 rmoveto}B /M{S p delta add tail}B /b{S p tail}B /c{-4 M}
+B /d{-3 M}B /e{-2 M}B /f{-1 M}B /g{0 M}B /h{1 M}B /i{2 M}B /j{3 M}B /k{
+4 M}B /w{0 rmoveto}B /l{p -4 w}B /m{p -3 w}B /n{p -2 w}B /o{p -1 w}B /q{
+p 1 w}B /r{p 2 w}B /s{p 3 w}B /t{p 4 w}B /x{0 S rmoveto}B /y{3 2 roll p
+a}B /bos{/SS save N}B /eos{SS restore}B end
+%%EndProcSet
+%%BeginFont: Palatino-Bold
+% @@psencodingfile@{
+%   author = "S. Rahtz, P. MacKay, Alan Jeffrey, B. Horn, K. Berry",
+%   version = "0.6",
+%   date = "22 June 1996",
+%   filename = "8r.enc",
+%   email = "kb@@mail.tug.org",
+%   address = "135 Center Hill Rd. // Plymouth, MA 02360",
+%   codetable = "ISO/ASCII",
+%   checksum = "119     662    4424",
+%   docstring = "Encoding for TrueType or Type 1 fonts to be used with TeX."
+% @}
+% 
+% Idea is to have all the characters normally included in Type 1 fonts
+% available for typesetting. This is effectively the characters in Adobe
+% Standard Encoding + ISO Latin 1 + extra characters from Lucida.
+% 
+% Character code assignments were made as follows:
+% 
+% (1) the Windows ANSI characters are almost all in their Windows ANSI
+% positions, because some Windows users cannot easily reencode the
+% fonts, and it makes no difference on other systems. The only Windows
+% ANSI characters not available are those that make no sense for
+% typesetting -- rubout (127 decimal), nobreakspace (160), softhyphen
+% (173). quotesingle and grave are moved just because it's such an
+% irritation not having them in TeX positions.
+% 
+% (2) Remaining characters are assigned arbitrarily to the lower part
+% of the range, avoiding 0, 10 and 13 in case we meet dumb software.
+% 
+% (3) Y&Y Lucida Bright includes some extra text characters; in the
+% hopes that other PostScript fonts, perhaps created for public
+% consumption, will include them, they are included starting at 0x12.
+% 
+% (4) Remaining positions left undefined are for use in (hopefully)
+% upward-compatible revisions, if someday more characters are generally
+% available.
+% 
+% (5) hyphen appears twice for compatibility with both ASCII and Windows.
+% 
+/TeXBase1Encoding [
+% 0x00 (encoded characters from Adobe Standard not in Windows 3.1)
+  /.notdef /dotaccent /fi /fl
+  /fraction /hungarumlaut /Lslash /lslash
+  /ogonek /ring /.notdef
+  /breve /minus /.notdef 
+% These are the only two remaining unencoded characters, so may as
+% well include them.
+  /Zcaron /zcaron 
+% 0x10
+ /caron /dotlessi 
+% (unusual TeX characters available in, e.g., Lucida Bright)
+ /dotlessj /ff /ffi /ffl 
+ /.notdef /.notdef /.notdef /.notdef
+ /.notdef /.notdef /.notdef /.notdef
+ % very contentious; it's so painful not having quoteleft and quoteright
+ % at 96 and 145 that we move the things normally found there down to here.
+ /grave /quotesingle 
+% 0x20 (ASCII begins)
+ /space /exclam /quotedbl /numbersign
+ /dollar /percent /ampersand /quoteright
+ /parenleft /parenright /asterisk /plus /comma /hyphen /period /slash
+% 0x30
+ /zero /one /two /three /four /five /six /seven
+ /eight /nine /colon /semicolon /less /equal /greater /question
+% 0x40
+ /at /A /B /C /D /E /F /G /H /I /J /K /L /M /N /O
+% 0x50
+ /P /Q /R /S /T /U /V /W
+ /X /Y /Z /bracketleft /backslash /bracketright /asciicircum /underscore
+% 0x60
+ /quoteleft /a /b /c /d /e /f /g /h /i /j /k /l /m /n /o
+% 0x70
+ /p /q /r /s /t /u /v /w
+ /x /y /z /braceleft /bar /braceright /asciitilde
+ /.notdef % rubout; ASCII ends
+% 0x80
+ /.notdef /.notdef /quotesinglbase /florin
+ /quotedblbase /ellipsis /dagger /daggerdbl
+ /circumflex /perthousand /Scaron /guilsinglleft
+ /OE /.notdef /.notdef /.notdef
+% 0x90
+ /.notdef /.notdef /.notdef /quotedblleft
+ /quotedblright /bullet /endash /emdash
+ /tilde /trademark /scaron /guilsinglright
+ /oe /.notdef /.notdef /Ydieresis
+% 0xA0
+ /.notdef % nobreakspace
+ /exclamdown /cent /sterling
+ /currency /yen /brokenbar /section
+ /dieresis /copyright /ordfeminine /guillemotleft
+ /logicalnot
+ /hyphen % Y&Y (also at 45); Windows' softhyphen
+ /registered
+ /macron
+% 0xD0
+ /degree /plusminus /twosuperior /threesuperior
+ /acute /mu /paragraph /periodcentered
+ /cedilla /onesuperior /ordmasculine /guillemotright
+ /onequarter /onehalf /threequarters /questiondown
+% 0xC0
+ /Agrave /Aacute /Acircumflex /Atilde /Adieresis /Aring /AE /Ccedilla
+ /Egrave /Eacute /Ecircumflex /Edieresis
+ /Igrave /Iacute /Icircumflex /Idieresis
+% 0xD0
+ /Eth /Ntilde /Ograve /Oacute
+ /Ocircumflex /Otilde /Odieresis /multiply
+ /Oslash /Ugrave /Uacute /Ucircumflex
+ /Udieresis /Yacute /Thorn /germandbls
+% 0xE0
+ /agrave /aacute /acircumflex /atilde
+ /adieresis /aring /ae /ccedilla
+ /egrave /eacute /ecircumflex /edieresis
+ /igrave /iacute /icircumflex /idieresis
+% 0xF0
+ /eth /ntilde /ograve /oacute
+ /ocircumflex /otilde /odieresis /divide
+ /oslash /ugrave /uacute /ucircumflex
+ /udieresis /yacute /thorn /ydieresis
+] def
+%%EndFont
+%%BeginProcSet: stonesb.pfa
+11 dict begin
+/FontInfo 10 dict dup begin
+/version (001.002) readonly def
+/Notice (Copyright (c) 1987, 1990, 1992 Adobe Systems Incorporated.  All Rights Reserved.ITC Stone is a registered trademark of International Typeface Corporation.) readonly def
+/FullName (ITC Stone Sans Bold) readonly def
+/FamilyName (ITC Stone Sans) readonly def
+/Weight (Bold) readonly def
+/isFixedPitch false def
+/ItalicAngle 0 def
+/UnderlinePosition -100 def
+/UnderlineThickness 50 def
+end readonly def
+/FontName /StoneSans-Bold def
+/Encoding StandardEncoding def
+/PaintType 0 def
+/FontType 1 def
+/FontMatrix [0.001 0 0 0.001 0 0] readonly def
+/UniqueID 38782 def
+/FontBBox{-158 -250 1540 946}readonly def
+currentdict end
+currentfile eexec
+405149B573AEC9378BAE46685AAF7849E5C9A5C8C876748725589FB14A049808D39A75D55F6464
+11A9C3526F1887AA2BAE53EE4BA6377CB094098BB2590828DB96FFD3A289579524DBBC79D9597D
+47A79192E01C360F06B93BFF89A3C642BC410337D743499A7F8B1E476FA1BDB0B198F67CAE3F57
+49A1ACC4879F6EBCD84740D62C5248595B530E6C3D3CDC3AF54369EAFDEDCD9848E2D38CD091BF
+2ACAD10DF1C87872AABD086D60475ED6046E240F2232FE2F00259225931518B7B429137B14384D
+15F582467A818C20C1C6316C56736C19F1D7464231D69800D94CF5013DC237DA1EC16FD63D3154
+4FADF83F152D1496E3E1B50E657D51952A65DA2224AE3C290A948226F005C37ABA2F6CAA732367
+9D03A1F924A332FCF713C3AFF685DCD14F950A9F50F46939759F915F780F68EB1E8A2A6DD370DD
+DEF5A51652CD0C5DECBCC94396962904B19069ACAB227B6D4D14852A65362D2BFE3B3936D8AB3F
+2318A99A46913D868EDF1984F868785E3B1107643BC4E58206E8E5E71E5E13A822A289A7C7559E
+07BBD8822847C56EC0DDB12202633CACA990B5844B5253EBF7218C2C491211D1879A4F36BAD9B6
+9353D636506C52F24818E4464E02C41AAA17AF7BF09FBC37C335A7BCA40481C1371828D4ADE630
+8DF09DC08C641377295CD75485DC14732819C2DB21CC499733FECAE1CA94907A1F144F0EB9BFC2
+98E471AF304BC3628CD390202FFF59A7BD14D9F9CC99368826DE6446CD40A68ADEDBBE8C388798
+0FE574448B196E987C2A392DA865DA46E652AAC8F9A4826D5AD1776FE2E5D2DEEFA011507BE935
+9E19E2AF34643135691E3A221B4B0AB0D18DC3993F6465489CE5EFA0D2FEC087881927A434E51F
+99683AA0463697BB9614B6CF5247330BB7393F836A789A3774629B27E1F82AE4C01EDBE95C237A
+0EAC78A5A7FFCC2332DCDB725BDE9101A9DE53A6CCA64A98429471BA8018A3E3C2D287B6316FBF
+08C3D2BB5A611D1BE846B17C2F0CAAE2955BBA7EE4D84DBFA6BB5D54B5D90E23C21D34562144DA
+4F5A49E666C1E6F7F18B2B33B2BC4A7FE722440D272CE53354B39442F3BC89E5F939B7175448F0
+02D6A60BC297C770745222FDACC9D456B4F869E7BD4E802C01D517AD752BA533DF1ECF4F9A6CF0
+DE8306C55A90405F23D1834D76D2B4452E4504AA953A8B4DDA4F0C967329D922A68615B1B71F73
+E8BB682ECBE3C7417A218DC386B0095B38575EBBA55581F768BA5D5F203A7625FE78857EF2B919
+BAE4DE0116506FE2C476A6423414FEF5833DFE00D3EAD6C6B5F31625CD76FB0A49D04C1DD85A7E
+692BECE0CC32C9A8C04AC209B5D1D77B7BD213B71855FBE81F757F46127E7253823E732A609DCF
+16C79412D1F0A1517288A81B42165B47DA66ECA5E8E1F6A39A474486A3D4B669BC65CF63136AC9
+243E7A492CFE222CB4F55C2ED4BAA7556DEDAD425BD706AEED895EAC76704AF6366295EFB4A91B
+548C2176D4A30B1026489E70D8D981D110DE46E0D5DF3A287059220142DB0100092FBD9E16484B
+7CDFBAC2B595FD35359D65D5351D5AA1AF8EE94E6A259A568F3D6219F2538EB9E31E88D2A7D8B2
+15F88C581AFAAAE67AF587343AB6AB3636AE519CAB00CD0A79EAE4DBCB56E76E46F14DD7F03759
+D10A4F78BC714B60E3CC56BC04C4FE68C5549BC1A4577F2AF578F1441EEE9178E6788CE03EE16C
+8C3E80DEE3F0D016AC09B0B62B46EBE547F0C10466E8BC9C3AC235F91F599B244F8DAC3B9FA661
+8A09D9A62E9E904CCE33BB1DA1F6FC81E1F97A1C56A2107F721F837180DF24FF110C7AED628E7D
+0B465D5064A6DB0E178C400B65E23951E7562A8C890BAB0774C2ACCED07E487D54E688E5AF3546
+661B13336EB1A4EF484BFE4CAB61BFA47B7F232D46EFAF50D5E31A8305EF727DB091AB0B93430E
+61FB938F721390EE271D2BA5D8B33BAFD5CB3F24C7A4ADEFF6C0E42D93E1B9DABD25F891811A09
+457BC94E13F1B71F628969679740D91C1971598A1D4C248F840BBEF2BCF74FB1EAC6D3D58306DD
+607CAEB18A8B19EB775BCBC6602DED6DC273D4A0190EF8D30E05675BC7B3EE1F6D584311C681F0
+C9B7D60D25BECC3CA7BC83B17E7D42832D92CB66345668F455F86A39D59534B84967D5542D288B
+0018FA183A4271150F549D0532E692C31077ACD8F905293CC16C9901DEAAE6B326680A59493707
+895264F881D693BBCA955A6F03B58AE0D81540E26BC9A2104D4AB20C5CD1D4FA3DB09A38246425
+E5B1FE1EFBE6C32AF609EBE71CA5DE4E24D8CDCAF1C3C84359126DAA6AD0098BF74284455943F5
+115360799F10BDD657D00FFBC2039816785AD6E5EFA8444F3AEAA8DB52E2F3CBEA815C4EC09076
+1D03E87401317A12567DA35A9DED959746FD5613E1D7497D04F80CAA3463D3F3EB7912CCB6EF87
+8B487485A275D154E2549F3C424A730F66F66AC9E6FAE099E71504AD5B76B4F97C7BE15D70E4A4
+3CB01E09CD47F41BF047757436C886A36B9C5F2C51B161A397DFC5494C2ECB5A4CCCC075DBE2D2
+E37B22F14C3665182200830F6796C1C9841F24453286515E3F6B701EF8C0BE65B8305A3D2A0522
+CA5A30CFE5CBFC50A9B6E7D3925E532AB5A58D4C6CEA5FAE1C1EED2E39C815E64BCC96DE2AF85E
+F5BC1831EDA3B1BA541B7DB5EDF6E042246A8534353B20E99A0ADDB46B32AF11DEDC2FE1B32263
+F054E752F68427F5A1B71ED953FC272FDDEA55506CC8FDE8F35C619E37296048024FA6303A9FFE
+6C9BE3EDE4BE5794AD1A8E761B3CDF137C7A29C64D0D8EE1CF071F9096DEE843ED40F1D4A543A8
+CE28F7043D38A74E929EAEAB6BA95CDD17E51BDD77691F0846F9EEE48CD5CAF905CE0814F3C7DF
+A17F430384CF1B2004F31E07975CE4A6BC88CAD0A805CF89D167BDD15C9F0F8442166DE3DFA687
+5FC08A35D221A151698B803BD67064571AE57B67797B5F0618B6B8F3D14829B87ADA7838D65BCE
+D527CE2FF9984555B8A6B915A68263E64141408FCB7BBF1FF7B8C043705A8803ADB84397B861BD
+64A3A7BA781C44C847A68F1A9E8FF6ED7BE881B08C8ED3A2BAFAB919D7D36D36772DAAF812A74A
+EC368EA622DB6903CBA3134E755C63B0020EE72EA699A3975BA4B1CF7030E66B36BDE8A66BD0B2
+70C7A2EC084B8383D023269B931B9CA036FCA362A9DA6DC9DDDFC11F715B1F2A60098C56B6B68D
+52BAF33BF0AEE2D8551F0C8809342894F60D3490D9DAD1317AB2F70E313924E9D680C610D41CC3
+1924E1458AD220FFE0B384404DF3AA67E7305A0836C5C195513EC3D0686B368A65DD3DE9AEF5D4
+EA28376B4ACC1D00EB38F6D4EED7E025EE17A1D157C1E71879DE16BF46D58E1BB46B2CF9CBA082
+C0A94567A5C874E8E6477A3CD0D6E48F8CD4E4AC3730E33EC8079B4CCE0EBDDA5E48ED13626F90
+888A2892448DD075EA3A846D1C8E6E3F0FF03B8D63D04AEDFC659840A949275394EB21B85E544C
+28BF0C2AB7113EBE4A8A3D0579EF48C15D9D82A09E96347422073A45E3197490D59FE5E9818697
+065A419E95768DAF768E1D938414ECDE5159281F4BB35EED8D65D3651906217FFC08AFBB075474
+D0F6B7519CE3668090B115A350DC3E90DB350A290822405C7AD6713F3BC29FEE0A4E32F9C85FDB
+232A458F55DB1CA335FC94A472C390A322422CAD609443F5645E6C45238570B689A7AB307B63DB
+B598FCF2EB2A70F6C4C9CB5DC3076938C4D2C400930DC2625285EB4483294509A4B018002B8261
+AEF571B06D8E9BD86E8AA40CFED8E92D055D1F653FF68F2EDF9463796B070A2B366BA274A07CA8
+283B30CF79231CDDE4A2949F47D8C18C1583673FBC5AE18E0A54D32B095322CFF5DF3831F91068
+E9DC713EF1B280D41C4BBEFB26095FCD57A5FF745E0A24C037B8093FFF2E10DA7F6F6A481260D3
+237158CE50618A8BDB1CE1CF5551B4598917E4D40137E67993D96D75D6C3850D92D5373541D7E6
+5E7CCA1478A5F3D117AB8EF2F80F02489E7D9899A46B4B1C30E61D657AED848A144DC24F11A1F7
+18202029C81926AA76D9F7E4B8CDE38848E702EC6841115A0F585334F42445AEAAE787BF272A26
+3594E4F62358E7EDAAAA63028DE788724EE04D1751A59BD95D9DC2F2EDF0256CB44ED3E2210A9B
+AFE82833926ED6DABA60141D740DB0318FDD9A7D3B4CEC8F2C95E3FA6EF6013737F0B1D48D24D6
+FE389C2EF5BD12AD8C6D2ABAF9016EFC7DE8DBDA6FDA21727EF8E007B155D311D7B279757167F4
+D1B2473534C2408E402AA0504F853ACBBB5CEDE208137F2DA6C21230FE2715C45EF003AA9013F8
+54A5534F3AD3F8FF0550BAD3716449DFB3A6A4F460C72EFE3EC5AA220E902C3C9F062E8EB41069
+5B3D602545BBC24D616F0975B16E8C7D3415F792555367704B92CEC9BFD6A851C81F5D9714AF8B
+E6F8C992AB1C13D51F46C5E32F79731EA32D9C526D2AAA0A1584692A024E0F85BF9E1383CDA1C8
+FC6BE36CA3C12E4FF34F11BA62D9596B39836EB59B61BC5F5DA97D803215BA1D4343337FBB5D72
+0CDEA081EC40329FF31057BEA7698AE4DE1F0B75D4D9027F741F587B4B524EB12287DFD0B90AC4
+BEB27538A7855B7966576B68F1682B990CB5FF4BA294F278DC98956C58FACCBAF383B708FE4666
+52761E94BB3E5E65C7E904643D54C68920C0B1072B790AEF99229D1F7745CB403F07C023FA6A30
+E0A00D4ADE7051A8B59ADB29D44130AB03B7FB303650E9EF55C49978A94A583974B6B91A0A4065
+B47DBA34BCEDA19D44A3FD83E7FD23CBEB6D1699023B704B8C0E2FA801CE15A98ECDBB0498BBA2
+23B444C0A75E0E4DD995D40AA4F9F03C0AF85BC5742182D628B3C0D1F76A1A9C7E02CB2295CF26
+A2F73760BC472E2278CAE54D9762FA27A9246965326A0CDBCAE997608D0A1D5326E78B6780E15B
+AE688827665DD786E6275969448E303012486BCBE4130D848B46666D660D0793559AE3E984DDD1
+04C4D56A066787B4AA4E1DE8183B078A8DE42F0663D33D35BACB19A2D82A62C52BE6D3C6EA6C5E
+3DC9C49BB74FB1E430629F437DFE67DB4DAC73590258873B6D808E8DAD4FFFE660F09D5207AA7D
+7F45EEDE6ECC32EA8F8BAA075EF236C72F9759F44F59FDB478EB818768EF740B9C892398B35B89
+C6F44EFA1E3BAF384D4BEC68D817AE7C449DE061D53C7568F2714365D5C807298D6F72E4D5D8AD
+B87ACE19E4057E218811ED12F84906F4FF9BED46607263AF1CE4E4FC1A7D06D59725BFAF9B191C
+17D912C67726D88CE805ECF93081A1BEE281A0364EF0CEFBA92FCD6433B4A44AC83C44935901D9
+2E32184A31FE7661B7636B70FF62D97AE9D7440A3A612A68DFD7176445F07346FD25DA5D910070
+5B7AC6F906BCBCAFE2BB3A3E296D580660B5F7B2B829951D291A759CE5DABC47E9021C14AF80D4
+E259EE13169257EE24C0373A7CAC17B9549A3940FC658BC35FC6366C7A9EADFDB6FF15CFCE038D
+B5F1E0B2A33CB8C45D78CE03E8394E0EA9D67708C11F7E25ADA4298D5C89D977BF17555AC70570
+BE07815C8CD204E3CCCD3E89A6A4B9BB1A05FD6DD4A56DDC0AE56D7F58381246095E86245055B7
+762D09811480E9A1700FB390BBD45FD05F1054EE65A9FCA82B28F1453D719D8EA1E38E1475D94D
+3D1B16F65CC4582CC32CBF5B9DE90E96D92A39F667090B8B47E0EACBBE85F885FB55F83B19B030
+52D4ED552C1CA7780A4ABF0DB02F476D6A494B363998B4BE832CFDBDFB28E0D2F6DBDF04291E53
+F8CEE97D6057E668F359475FA575441BC77FA6FF3170621D1002B1AB40C155B8F40F74DC822B9A
+9CEEF7662C9CECE1082AE269953ACAE2E78E3EB011F721E6D65B897699DF6BE1D143989FE07BE9
+E1EEAC4A7FAB2BB88841E33E9AF0E109A186F72B6D958D2DBD92E070B61FA8AC9DE60D3B0BE089
+50C597D02551B3B10A0E52E40571BF6AF4047B1914FA5651EAF0DE0D332EE959F58F4DDE1D8D4D
+6D847DE50E4A47AC0C2EE73FB67CE7FA22F242D4E69EDF2CC050DADDB25F8959E9060AF0E2ABCD
+2E0225A1B9C4792EE988517B3A567DA09F3E12E052ECDC91A5737C44026513E46D7B0C7399B006
+B1505F3B7F41883A14BA5B180E80C63DD5D37EC5E90C38F46DC88F11FD5C1570455941949606CA
+598CA2010568DC0B49FE5E5EB5DFB7E3AF195A23F51F87F5898D10A34043F23409A95519356617
+073EC83CD312AF6961EEA40377EAB0B0C159C3906F0492E94414ABB8FF34F1FB6D33594DCB5A64
+FAA7A02C749799BC14552F205122E22208EDB633FA50311B398B98EFFC0FEB5CAE8B0953CD1D0F
+05701C2919D5DE58EEA2CA4AEDD06444915B16925504D159F050AAA203473C29805EDF5A71AAD2
+06C601266ED2B909E68887F94B7614E723950EA9818F7793040BB8F7E3500BE44898B92E1BDC97
+BCCF312D35A85E667669F15BDB42884E7A258C36C7CF4947852864FF46EFCD56817C58A7BDF29F
+3111A188A5F9F255FE04255B1427CCD9D0CAF6D9992C6FD493E11AAA81E13FC69C569A573A79CC
+D3D2859B051B7EC7CB55A2929E515FC15B08ADA50369C10808B83EFB6445B4E57E8BBBD75D6A6A
+62F722875C6A65BA355BF24CDDF4F5611D4918ED9DDC52E527C49A2843BA3646F37B0103ED0838
+5D68834783F29C21FC66F55A7B11CDD154810310CB0C05367D2F12D749F5BAFCA86AF16160E90E
+1E6609DBFEB302BB7393237731FF90EF555E1A194F88BB05FCEBB6B057372731CF1D14CB47E47B
+69A3E1158F1741DA4505541A832D0362CD4D16EC54BB16E40CC682CE6132E369C0BAA2ABD7A35F
+C27999881B02D9C22DFDD56CD7520CB83A8CFCB4A17DC799043F25D69BF3460DEEBF18C2579F05
+2B69B9FE5E6B7467A15DAC10F3D3500B7EB0D41E8CBB0D3DD7A69D28458373C681FA763BAFFC57
+24E1B59F21AA8830E7391E8BF8CD649F7F3826264914505A3B36705655AF3C3FF506332A43D753
+D15BF0A415D6C7F8F653EEC0A66840E7B9E78C8AB0556417071CADB861D9CE959CD4641EF2CDEA
+B450587752B4ABE8F1E61732C49C57241746E913B99D23568F627AA7A22B9D3372F24A9F1B8AC3
+427E598809084D4BCDCC8E29B975020E737FBDE1BE1AF74CD02BDD781388F39A189F6583075A57
+A5B21E1A5E93AD170C3767B543BFCC152E326B768D98BDDD403FCAC07EA395A019E645065B0DD8
+DDAD3398299AABE61D20D85E99FB81C63C15212B496A3E23F64F40ABE60BD8527F85A7890BB7C1
+A31F9FAD5776CBF852DDF9099630A0B110DD1FDB87FA074EC5493BB2188940F2979A01C1463ADE
+B688A3C3339293B0E1EA7FEB5203335D2558EBB8BDB65F13DC2EB8EDD6C2784D902D6B20135F7C
+88662991CDC91E2B9980FD68B17B62E44693984B766247A9F121A12E280AEC4D3C765F2857338C
+887102660537AE28EBC7771D402BE381E6AC75D071D6E66BD53CC02EC96851B7F6ECA7A9464834
+70F2AF182592F53FBCF7F3D0878E14BD3A7263346187FB3250F17266F11062BDE774AA3997E810
+2BA9C7BC37A0B69DCD788070725DE7D8DDE804B3B538024F2D67DF7B9E009A20C23FFA5B36CEF1
+F23D7A12F667A1750BBF2B222C8ED82498A9C644AAE7AC259840F3881747F2B4EADE7D961E74EE
+A17863B740E1A672F270972873EF3BCDA4294E7008AE3F470A89159005431D9CBD1BDEB0B34202
+41D418687BD044B9DEA09F4801BF1193B10A6B96478C938AA67CBE3580187F2CC2604912BE6AB1
+CC9D10E15DD2D02C55C6EF824E4E8DCD1C1F92871AAE4A33455F15D71B4359E15CFB29F8FFB1FD
+F088978B92B436A8F42CF8061DC98694A7627EA06872DD24FD5F6CAE4A09106B82AF6D0A4F131C
+1D25A062649FE8B6FA16929384D4C15C301875B05B78481391A497DEF3D6E24776985E7B9D0111
+8452B33EEE084A1A5CEB8866A8E7F7016D82D0588C9EC00671DB79F22BBC904204136F2A97B27D
+B1E20A571A89312F7F1FDAE1F9AA66EEB6C7B473FEC90FFE75EDCBB53CD4F4625D3E09C79AF8A9
+08279757AC4995AB575DC4762B33B6608A8A85D5EB39C52C1CA452047ED183A031142AE061D2C1
+1C8A8FAC48B5239D27E196AD19613158C2B24BF66EF5EB040C571B67791996F18E7C5E4125B9CB
+52591132501D4E3E9A43B111BE76EC06E70867494C4DD27C137E6BE35C32CAE9CA4F5CE3934ADA
+865F18C152697C6B1CF0604517AD8C6D2AF4CC00D3E354E2D285EE2F06237C9FCB02A3A4A60157
+CCB0A0F35915569AAA64A95C7DDA00EE2718E2C6072F7E5D88A88B57021DE4FEC39C4744600073
+B2D81A668109A6516670A1F3EF78BF46518E95D02243089D89A49FDD78A8EE183594EF936F71A1
+8FB5F93318602D6496FF35FFFF79FEAE2236386F07AA84300B067A9ED4FEBF51B69FDFBB973FCA
+62125FEE4463A06B8FFCF5C662984C1CD4CADECC275709268C4FFAE774E12B617973760E369D1B
+8C79F00471310EDBB3569022BE0FAA2E9DEB12E81C40A8ED3803FF3E400933B50905F3EB231547
+157887148738845667817FEBEB00D17698DBA9D1E236D596DDF3EBDF46A3346757CC012657D0E6
+A0DC78399FF4CA83B2545CF3E374F16DB2A5DC36B3DF9AE0FAFEDAC9379F0EEA3FA175CA0E9FD6
+2E11F10369B21FAB99D721EDA9B13519822DF999B512A8061582F7C0E836112D023C4617848C2C
+6F923F8BBE27017DE7CEAB3C857F6A151BD998266DF62D7885A3C38363F5986614191D68C29877
+567B1408D4DA1C5ADA91A75A1A5CB07C7D5843CF7246233BFB323FFF495EEAF72D96A8EDD8C320
+57674536B08E76040742EAF65EB0FEE50D4B0BFC661B1ED5A436D6601A813F360BC1A6C8D8DA34
+DD1560F864868C88A4B72C95C82A0328D416EA6A2A75E5F9AE658D6239E54E7866CF8C7E37F911
+7E9D940F1A2439924EA630C310416D1A1B95C3E8BCBD0F1DA6BB3F5AC9342FAD145EDD96C4250F
+89B5B5E5F1067D4B2E2E52A182FA383AD44BC4DECA1D2074BB6EB1DFBE7DF25AF3B0271B027B11
+BF4B0F1B56E834A0667A8B30C9B61E3B44283D571A11667A4DC10F7B6E3B334764CB10357090B2
+74F7BF6B9A19ECBAEAC0A942F95F82A604C50DD71F2CFE5B1B868E69C077CDDF5C8299CA6C1816
+93AB0E43F89ADBF3BB94E2E3CFB01DE47BEC9FAA59EDC5B6D50765B6EB09995755C6074C2106A6
+FB148FB983CFE06EB4EABE827F98CF158375A7C9C745D3F7907C6952D0CBF28F5F1DDDA31A8BC5
+5A24FA35E5584F61F4ACA25773D86C46B7A042BF003086D8879505FB4E4A88B37724276E5AEE09
+FD82429814C0B601CE29F7681BB3903E64619BA57D4C7399E3BB738105C6404165D1FF2E4DB654
+272C11185886B9F9CBB94FE1D1F7CCBA6E0E4944D6C59EAB5BE7F69FDC1496A779C63391E1FA6A
+38ACD11E86F688600FE1CB3984B527FD856DA02F8F0D1D247DCFC17221139C312498ACF8D9E812
+4A64A511ACB6501EADE9F8790D4F6E9C3B42BC04C23E6AD2A6E6A54178BC38DC684B00FB549A92
+81627056F46B6836A68898211876058394D5BB263201BC69E68F050DA038B7F86EECC117C37C74
+AAB0C9C4F8B4652E2F83F0927ADB2A7BE9033255C631956DDCB17DB2FE375D79BD810AC43A2FE0
+8B51D7BA961935B3D9BBC785B0DED68D84C90D3DC3B22541C2B3C1A53DE99DA16E6EC6D1476CBF
+5514E3BCAD427C9C8875AEC591BB5E21A2CA43C14051D72C18BED73612CE5B88A8A71C114A5623
+7FEFC54583A3041A6E871C8E7DCB4CC457BAE7390DE674992EF2E3DC5ACC808CEF1B6F3D58214C
+F5024417BD901343F2F096157CE31EC0EA6CBE808C8E508E6000F01670E552DE00A4EB4D7BD254
+F840CA6EE6C75BD96E944352D9AEDEE6941CE3EE8DA3E851D811309E3B5ECC610E98DDEE262473
+3D61DB9635312259CFDA8953DF4D01A9B857DB6532CED5DEF2ADB5830ACDAC3BDC89B95834255C
+4413100B19CF49A5475C5C985F82D1C43750E933C59CBC3F92F5785EB54339CF742F44A2B4D77F
+694592CE2F926DAFE1F3D2CE52F43C16A2331E027FF3E24C102D09411B578B143582B55103247F
+7866B1B87127763EAE9BA063746B785E392ED11E8D4A6C25AE39DA7AF6F12506BF9AFCAB89D77E
+14C6757A6E806C0F1A16A0E42EECDCE19996ADEDE43E477B84E503C7ADE84B1D79EAA8C3E0D4CF
+943416B55EACF4D3E62178A29486A8F3119072820F37B204A1BD4825E758650E4B06609B867CDF
+A36E50A8236CB9FC87FD813D8E847294B5B5DD63DB7A553917D58383EAF69BD096ED658536CA9C
+B83DA967ECC467E8329EBFC450FC86C960D23ABFE0A6698287A5405F54083D5C6A949F73C05ECB
+DF521BFD0A3583CD38AD7B2324FE57958212B44EC6CBCFBE6491D5F27F91A7C68BF7AE91239BC1
+06A37D144F728A9F9452A17C3E3C81501E6198BAE958E37C9B50C1AF27C18DFC14579772F9F876
+9D1C4BA1CE86A88B1EB0D5EA9F51DC08DDEB5737ACDD58D856698795B1B3EE25E7BDAC9E50C6C3
+D6CE65FB34AF4C93A49796324B7DB4410A50680392BFA5AADF234DF2586176BC99A04FBA7E2A07
+9F5F79C7D8AD68F93B2F3B7BEAEAC1CD4E4338A9CD0203D1E04BC0FC3165FCA4103EEB71DFD119
+50547340AC83605B885C2F2B235BB1FA1F8FA0CAC2EB64615DF5C24FB2CFA2554B7FC2C5CF7440
+3C5DCEFC22C719E98553B0ECA1D08481A130FDAB6199CFD5FCBF610D4E2F51A17632270A096A70
+F1ED2345E196844CAFAB1A979FA1CBA54518AFFB507C58E86E2CCA4178172B488D7AD610B532E7
+FB106F94E90C062FFD67FDD18A72B3F2652453807901737DB8859035884D289266E402BF8F4718
+53AAB6806BE1BC39FFD97552B02BB080926F9095D56F2EC2CB04980A76F6DED32B9F879034AE2C
+A622E0E2147E33584EDEA5D003AF751255B51959956D1E27CA108C6EDA9CF5CAF53CC464986123
+B9582D0176B6689904D5744B925F12AEE17492ED3FFF048E076119FD1F8FD2A4A1B70A6369312F
+64F44664D1AC519464A0F2ADF3018B39A88AF07C52B3CCBC9DEBD9937FB2330928C1E5FF56BD73
+C4EBB943A3003E42D913C15EFE52EC17F01C7F263F795462BE605A2910CEA79C6B72495CC58F81
+CE83297B2106319EC6097C38A7394378164B7735500453974ABA5E3BE04542893AE15CD5B34AD5
+032B8D1F2AB683C743B7DD3CEA1C39A0014E9264E7655651539003A2BDC587F31B62E3BE1B7F9D
+5F134AE76949F5AA629D5A63FC239920180246EA1FF6176DD482E33AD258B155D55CD66B44A281
+723CD3CCB66A362F11E4D58F9DD006CF1651D6AFD903AF87E72544CD3725670232D7DDA8AB193D
+2C08736A49D1FAAAE861A664A9DA429772947107F2917D7E7717A4535D464D34B3C65B1E77444A
+470EACA68E4DAB122420F01F8A7D213D0041908A864CAA6A621F14C14E407F0BC5CC70CF0BC4FC
+CD2FAF8CD0C5D5FB2080010E038C0F118D762C09898686D8DBFC29CCDD46F08EFD599328101BF5
+16A5736F20ADD4AC1C150BD3BEAD585D1D362261C735F24CFBBD4B64682E34926CB04F9D31E09C
+A6335AEB3C47DE39D1600D7F62213A71C74A0F81965DC5B1B3D7227636690B882F38126D901A9C
+E418BC6D3D923FBB801761FE7B81A55DE3F2E42688246A06441FAE14F23DDB993671901F97450C
+EA6DB10B0DB13A23CE0E21C27C1CD6AB524D25EFC13DAA450FD80BBDC6376065A14D749D48EE1E
+8C83B833B510027F9C89F7319B1509B699162B7F9C5B8A739ACC1006639C297C23B8A66213F47E
+A873F87F1CC19F581EC026DE584BC049C49BDCFE89C001504F41DE17D84F973826886F4E5246BF
+FB87ADF0726CEC7A4F167E0384B91526894C2D0090D38EAB1461C607EF359E74628854DEE1AEC0
+5DA8945995A3D68671E8BDD9946C222294B0C4680EF2FDC224A0C7AFA9E5466C7B1457CE3DC7B8
+7B0C3517DB833EDD302BACF3C37BAE4617BA6206D5D1C77DD53547A7BBE0C948D217246C294C70
+5B254A960CC5C2F5E35120036356D760452887237D70D1E2F3D6B64A0171FC578859ABB62C1444
+D3FE0719DD85E7A8812F7A5C0B8BEA7207E31C7C55280348172DC5EB275898044C00C2D92545A3
+362F7B42E073C75BF179D13B0BE76B4836D069FE01C287B367D02DDCEC9412C2FBEC3D4B327A10
+76586750C8994ACE0DE17327B01F74A3813D3EF9FBB9C9C5414F2E9CC1DD9D06297D174DFD2DE9
+CE7BC95F580B4F3F26832AEE535AC16A087A012DE47BCC692B7C05B6015CEE221323F7EAA191EB
+86FA94DBEACF0996A8C8D013301A7BF64C2436135C3CCF2294B1E2246184261B9A6BD2F4B98A91
+E41EEF9BD07018F5CB9B0060AA76651CE1405E08E455BA689CD2E6A3127007BB4B311C23804689
+ECF60DA7972373D96525042C360F5DE09DCFF940E72CD5DC0A9154B631AC1F2E38AA2B8551BBC9
+AD5CB74CD86F5388AA75B6D92B1E37A4F875A6714908377D78BC96DFAB7EBE047BE4D42C416FDE
+50A33FCA9E65600A2C7A7575D6059082C3FA0DF3C31E82D3FA3969CE43965EA49F0663CF2A2C71
+EE4AD5C7D853B52B6AA0F41AB3D47E510D8BF64AFB1E8B8F782C98CD287DEB9AFED39335520B72
+B8B5CFE2A6BB7C1AB0EB746ECF6F7AF86C183612B0DCD583FAC678D9602957E61C187F39B3A654
+B20C792BDA9D81FA974A9E8864C1A86F9AB72918FEBFE47516299AE1E9B27F46F3C2959C5AAAD0
+A5C3C3065114E89956F5FA36E16174470DB8DB2FE08396EA5ED7D50AF989D8D1433E0DE7115A41
+0115ADE0BA74E8A4DBCE3D9B87CA767AE380280D51FEA9A0F623AB175C3462B9482DF6D0BE8F8D
+420782DBA63D5F43966A88E3752B270048EAFE8BA291E70B8BDF8FB433A5A57C669B4F7D35C8D7
+3C52700DEFBD4CD42E1F2C8E442D19C030CB35AD66AEF7EF0233BB4E08FCB48C872399AF859938
+A02BE5F96391FC64E297AC790D70302D51979CF5459F4DF2A41B27592D0538DBAC394C37ECF0E2
+C116D0A2A2C6ADAB5B0542F86CE5436CF989A869566ADE4D764E423BE583ACB1278C7ED362C023
+F8AC485529006A1893DD5A98D050565543ED6A4F3B03092E27E8913765E5DEC1FFFBA80982340D
+AAADCA7A95A24EB5F392DA99FE3E6C34948DD4CBC469BF2B53A50F162D05963D73E79EC88A9D94
+052099431793CF8A0CCAEA5C95B17460616A13927532043BE9FA79FE0231D57FE861FC0D32DF90
+E9F3EA5D028E06281618E984A169F5006756341C1B2CCB9BB5C6CBD2EDF71A5244EE646DBECD26
+0F547B8CF03F2689EB7FADE56D3643AB8DC7B89A5194419818FB67DD5C66E7866EBB012C365E27
+BD4BEF4A6FA8ABE429BEE38715AF35AA3F2751E0FD980DCF6AF94A8CD6A7694B6FA71F2FC2FE61
+87884D029EA7BB951EC1FEC36C100395943C8A040E5F1325EF8EB668B08999F0431C2B36761FFA
+F6E21790E51113526B92DF76AB22B9761B11A0A6673C8E093ADBEFB1B18FB7CF80F43D1D38F176
+78597B4F6390764D60A1C797DC0926DD01B7D09448C671FA5B51B93A58640EEB62E80C4F3810E9
+9AC99950D8AE3189152BA0AC7D8FA8431DFF1EA3CD4FD07B272A563E67C3FDC3188BD621BCF0BE
+40AEE192A02BA5EC36C5A45E1E16097F4284B74AFCD8690B24ED8C14D25C7EDA7CB639043A2317
+8A58094733FE73887F7FBBC995150B6E54F5CADE65338A12A0F3824984F5B16AA0CBDFF330A408
+7116EFC179DD03CDFC2312EF49FCD501732875A961DFA75DF2AFEC0711DD8A215C69B9EFDE095E
+B03261C63C88B6C66C3DBEDA2223420713192FC38AF0DD9C4E42F3BAD9E1306AC8471AFAB8951C
+10CC3FA51E096AF28D73FAC5CFAF410F83EDC08F7AF86A280A23367743FECA7106EE0D460261C9
+AEDE826D3C1B16DBE4C0DE0EFF9F744CA26246DFF950B0FD6F14602503F58A4F3B776D94E3CF47
+CDA03C04D31E71BD0281C2A66F2D8021A5EB2500A70D73B55519AAB87DFD94143A623FB250D0CD
+31B38D8ED2C5EE5C5A78DB0220CC5A081003F68D8367F350115FDB24F2A191AFE85B9F8C9DA654
+84C3FDC994889F42D561638404CAF88B831E65D6D2623AA8E82A050DA727F886EAA7DBC4012ACA
+51FB15CC48016AAF9F82012ECC6B3A4B5C9F628795858DB725B8397722749C1BF0682683A8CD6C
+55185A30C3A219136C8530CC32C8E57CD3F66677549EF3A9C58B036C2CE21EA3AED58900230176
+8FA1CFEE2A5AF414A09F5DC3CA77C70AC15720BA08B5C498A5C6F6C521C36475DB6E7677819295
+AEEF95E2FC891E1C45CE729C8A1032E02201C1E112DBD74C3203E2FBE389322D266DC2EE15519D
+1E7F0907C615F228733D2427B55C0D3735AF25A15F0EB0A7F3374755454869CF8D825C98B8EFA2
+45A44FA726AC7FDCCA1B8585A6EE64897643137B6568C0D6EC985902C870783F2602D570176590
+0E79FC7BC5A40DC29E96FE65575CC63DF1E4F39425B0EC10CC37045A0B5FAED247C17EF9180492
+4C888A39DAA1D8F28F2A682A9A522D5B8AE6668C02E9E04E2FDD936E2A0CAD1DAC3CCD6E36F0AC
+1D26F9BB256A7ABDD0B532B7B487C1BCB93A6114821A1FC85EA6DAE4FA889F555680A9EB893B2B
+8E60F99734383EA0605A48A2BEA0752D0C7A42C36D0EC252A522E55361BE4409BEDBBC55004289
+ACEFC8E11CC989609521CF8F55612F25030C5A388340FCCA791F1E4C14F2AE3333581B0D81911A
+A06D22E43A5CD564E81EFC098F3D8DCD107DC84B27B6CAADBF6CEB735783CF453943F60897660C
+818E1457017A56512DAD80C6485F6749724B83DDDEEE0DC58A0FFF9EC71F0FCCD93DE9B2DF070C
+766CF1CD3062962CF1AE2299ECD90924A8D7C48641A0764D000DBCFCBEA3205DDFF6465C146EB2
+2E99078EA6CB6F62D687BD731E56EE7081570935FB43F39FEEE8F86EF910FF0B944CEA878990AC
+F46C486B976D8DFE8905BAC6F2B01C6954166F5086C44804C7FF640D689697E1BF6ECD2D6FF20B
+1C695C96C78B923630B8C2064F4CF574249BD8124985ECC0D762ED0BFB52E2042EB900010DAB18
+135274109FA10157710FF3B695FDA0211F2D7E4CF7EA38DBED585FD4A5A6D4FFF460FA2C22AB15
+052D40EF60A35F36265642502FD0C37A2681301C86081A4016E981E3F6A184A5133F4A196F35D6
+23440CFDEA99F58C51A974C15A3A6B96EFCA25D17B0081E6441AB2EDFA2548565B9E71642290BD
+7C1A7077DCB34616A8FFF35EE4EAE3627D2F1DAF52023E17B184EE4F74C2B6FBA63D21FA3433F1
+44B521564B81FC2B20D64236DE7FFC097835AC3F9E32362F04E3061DF88B6A9901C31840E31BC2
+C590706B4B734416543C3B2477E80DC0F4FE95187B36E5EBE02075350FFF86486C485443D48DCD
+1FF4AF1862403011EA630A04034E0A34AA7DCD1926A2A4A1B5160B78B313445161F0A5BA656D0B
+69A25F9CA32BADC2AB0A5076D4C6357C3903A4D45741D44A5E4000F85102FEFF45137595C438B2
+8FC2A5E5EC2A9DF3B48B08A99EC2EA715DE23C37AA603D9FC4FD76AAB1A3583263876544F7AFCB
+9B699CAA51755B1C4871A8746FFB6183339AD853C28CE7207E772F3286F801908795BD8C701030
+0AF15345F574684D87807A8D0BF7B015030E92116E5A09CDB315460BC3B598D59ED7F3B551C1F7
+C96152DFF7BC8FD356B2E391B0CB9270FAFB986E11C8EA2350B672BD6AA36F0967F57DFE98CEBF
+A9ABFBC7B5D2EEEE99539951699BF9EDC5CF21B4E7C66A92E1C48A0220A6DE1DC08435BE94B7EE
+92AD6D4822963FFF8156E9EDF524132C17FD236E35580DD6D81A201BF80F2D893C9D56B536F4CD
+2C063C0AA735CE8441017B49602753B776A28BA50E3342681C66A881BAED494C31D0657049E479
+1C0B18F7190B1CD4FFBD0A045C9704CAEA9292FBA6B62CFA2E5F8674BB14AF84CBCA42FF3DB5CB
+B5A37F20926B170667111616309E2B0A4494AB2F628C9FC0D626F02CC9AA894CD2E6C4FBE40727
+37168091AB9536E3EE6D0D73F551E30538D7BD7F914D9E816044B3C37BB37B22F0221AD5F715B6
+F1288D7E4DF2FE4DAF4C65D097B2A757F0EA97565B8437B42F866FCC1B6EFD2EFDE8AE9D88814B
+5BBDBABAAFB6067F1382ED5A59C803BE5A8F37DDA199177E1AD0EAA48E1249288B65D281DEB21C
+051FBEA7165AE5EE8DA9C35896B5008A683C96ACB41F891DAF6B07ABD8F8CE8C0B60F0244D4F47
+FC30F84AD079795E6C9CD35D5255C60E8E0FF736EE58BBBAC019DDF370992F98D0E595FA92E911
+7659B7667EBC12D2B01158E78231E68936AC8003A1B60B20A85E89F62546110E09A7514B447C74
+447D6C7707FEDA3636F3B00C470CE0D4A23336C56BB8B3532C3D7B9D7EE4A94684DD78B7462634
+1F9683AD4D80A358B684F522E84975D1396F0163A4858FA2C175421977E62EB51E7A733758B76C
+6F378BF235860E808D90433BFFDE01EF094803CDBE5853D6B7A4B30A85E83FEF5F4353FC1F8143
+E13A2556002169F86049446D92C54856D25A90F270EF963627BC7890A0156C21F3A2AFBDC45BD0
+0C7A4BCE6C04BBE19032C9CF72E26395D9A31E3C5DBD061C7108283830D4CB0CEE7D6DEFC0D642
+DE38333BB72132C9E956FD58DF4B48C74BAE5D8E9760ABEA97520994A6F98C42C01760011B19B9
+E3DC79789A9BE75052477C96F781D309C7CA44939A3D0A458EF25D5475F99380492E508CC36D4A
+2BB1AF87B8D7B062750D8FC1F87C774A4CD5EDFA0A7A04E7F9F273F90317E2B0174C398F3E583F
+085AB4E582008470352743572A76A6EAAA2DE3D0FB2517FAA832EEF087721D2092FA43C6165DAB
+F090F59BF9E1DF2EA4717211285B51C7CECF3EDB98B4F417CA0156888F4A95DE67B73219256EF5
+4F553038D4DBDC64DF7B704F2B8EA7A36EA5A4670E3A12CE6E2686DB8EE651C6F5F30871835304
+54CADA03630DBAB407B45723846C399A2E47C9F7EAC95C86F4AD2119D49B616D28205CB8817E47
+4A91CCB58629BC9B2DE0A143E3EA70DE2429FF83A2972ADF4B8CEE0DBF0B22BF47AAE643627DAA
+565FF473C4F1F7BDFD8D320ECE472352BF037152855FB9046705D8319D78C3E8D0D6A095565C4D
+AEB2C2A621EF81616FEA46CF8B51D0B23A9A47A9B6A7046EC2F52E1A9F1EA612576E6B026CDE02
+9CB1A0168DDE4A729DDBDB7D9DDD253500C644E0D4D680F37A079319BDEBFC9C247C675E8202D2
+B09669E3D90F6F2DFC7C6899E8FC9E48167D291BA9D0B33BA0F1F331AB6578734F2A4D27B9BE40
+93C1A1351F950E99A805E2F16C900C61B7A1FCB3B3B66F66C5D07402159BCDBD15F30C59917316
+255B77E0EBAA3B4F81D5AED438B32BF815C94772FDDA123EA4BDF29081422CA934A8BEFBA9FAC9
+3EBA6194265AC59FBE0B5BB3BB056E96055A961D5629D0CA88EE0A672B9946542CA1AE83F1BAD5
+BEEC57336E491E8067EF260EB8BDE634E8163D2A263BC815968DF9EB7770486519C13207E3ADA0
+09A7580055D7E04FB72AE364FA5144122CD7A50AAF1870571A0A7F19B52805956C78062B17FB71
+58A3193F7CEEA96A18A05F6AE2ED484820C402BD0DFDFAEA48238E37F428371FEF79A1B93F1F2B
+BC02F2FDAA126D8904E6E4CEEEADD7F6ED036A2E7D1B6F5DA7F598FDCC7AC7BB175DEC45D4FCDC
+4A86E2E3A9A51D00B33945DC7E38771532F3A75B9017AEBE1FDD745356EEB54C1C310EF6C1B85D
+B0D09B0C61BE3AAB080B58E279383D8627966802686283B507143022BA281165BD9955C833B1FC
+69A3A2071A5F5D664A2E7E9DBDC85B64A48684A2DC6EE9913B5633A98F19A546DCA6727361010F
+217E60ACD1946D0D1A2B0A31A6103D8E7438FAF554341192E2B33FC22C57757680B0C44147AA09
+27CB41E464E94E0E0DD8EBED1873F9FDCA312A4ABF1464822DE5E6CA723B8B2F3B23B7368B1DA2
+DADE8C2B58EF71B068BEBA33DED1B278D3B81D8AD44DFBAB72D4AADBCAC1D01FFA901CC3FDC56D
+DBEF40BDEC4BEAB64916F9CFDF21F5B118433B672BE308267F1A8AAE85EF280834FF8FC6138A2C
+41773FBA3761250AF744BA0686B6BE8DF369748CB2A30EC33448ACB1A704D1BA01C2365FB1207E
+98DEFDCC61CDA54B120A74061F8B3244D12F6B31BEFBE2AC4629E6B8009C8239D427DB2AC9CC5F
+70F54870D58C286C8DCE0DE89B6E2D0B6319AD1A10D91F13C8FE61D7A3B2E1EA19E38F12733BF5
+3732B4F3FC6A8E12FB01C0F03C38F645E81E64E163B4C3E3DB7B6DE0321E78726C0775E3AF0E65
+54B037B3192ABF1D688812BBBD4E643301BFBDFE27DE4C9CED8D9A705C94A22F599CD4AB72D512
+423B3D4396B42C901C42B958C46882672449440F0C78BB33236860770B96008D7863D374D05C79
+B221B20329064613A7B7FE1828E5A80EC45C64EB08563574F992B5673E53456CA3E8D4FDB81E15
+6A83869BA95C8A6E8EAB804438EB5BC5B6B73FD493E18E4C95E217B847E422A947D9ADB14FF0D2
+066F4325A50BA07F68802D86D51653B264832B4D6102107FE04994F8DB0464C37F3B0DC87D45AD
+FCBF95B1BB20620F07AE420AA66D7585EE84A3AB73FC8F1E5FAB3CF2FF384DA9669DA91B0132D6
+9BCA7BC21EB7AFD82902CCD9F642849B0AB620A90B3B57554A57C17EEF51A8312F428022D5EBE0
+F23B52C06A7C3F17D4BC56700C6701F2E003BD1343B416AE36CBE6D6D062EACAE4569FD55B59D1
+55EB2E0801D8C8212113A9BB7BA5BF4AE89D434B2B838C911D84540CAE1E2BC95DD28A278F3570
+404D91D3C18BE468E6F54BA6B84D6307A2DD5587DAD230AB2383E6957E9AC1A75EC6DB0835F248
+C9EE480318E1BFB00AB0ECBB1F160300E0B6B2C562D1B856F549275F98FE1480B9409A26BB55DD
+F5E67AEF16288B3F4C9FEA584A8AA61664B73BEE0A62A5D8BABF1844F97F7ABFB73B3CD19025F9
+FE7C089B9630BF55C22DD14849FB3543122CFB669B51533C29F78E51F53C494B2201CD5FDEA488
+F259C54F7912E765360A0D143B59F49B935006066209D11FF9F9541F11AE4F7C70ECC4FF78FE8E
+0205E1F97D90FAAAD7D12E239C009CB97B1AA7F707B7D018F12563CFF65AC2FB14D7EA63901062
+2D5E3D2A74CB8EFBCA34DB240D10C9FC1F2EDCD48CE098AF1FC01C3FB49A27957405DA89307A1E
+A877E1D4B0AFC98CE0235AC2C21D2D73B5DBAC68A0DD0796ACDA76A1928412EEA5053F1E2EC78C
+65D44277C258A9B211ECB8A3D49C34C89ADA99482ADD3FCF5AC7495AC483F92CC8074AF6B57972
+6B497D5A437E7D37B4CC7913FE23047D886152C041AE3B5D70063649C8AA7335AD3BFC105B9140
+C5C4BEF7DDA3156EB8841A07064AA2A0EA5E7E6828A66CB2284A6D5D4189B6DF9BE74555B881B6
+F826917B2D09DF633FCAFA52B6E3A8B0E670623AE825A746BB7EA9EF3F52EE05F0A7E870A61401
+96D50B0FE206436714B74DC7B3673D9356F885DAA7F79A73676912B84579F0F4978F327CCBE063
+D09D22DB01222AFB4434045C90A17D0B526657958070F7A6AB555961DB6D78F479331E37305D5A
+2072AE199C9C31B12DD61D10E31889E6DE5BFDBB51C90548BF7F501BD33DD33B5F679F8E846007
+BE09C39050AAF03464A57CA70FD083E2EDC2BAF5DD3E0CB375DD3A2782898273518D7AE09B5AFE
+27F2560FD76891282F7B68909C6FB9F549AB9B4E664CA259E0652E66CC58C250D285FD2535660D
+7C9F4EDCFD874F4AFDC67D1B909E0576D159DE69FBB4DA307FE37CCB01E7B7C6682872FAFFD590
+2F31BAC68E68CB3A03BB824B5F35616EC0EB43427BE7B3976906B6E72F9D70B8D69758D4D4ED1B
+D9AB405B0E9E32400EB6C5E7FB006997D5AC5265FB5571DE4D1E3E3123A725F37153C874439407
+8D1786B9C246339903DF1855649FF1B97C919A818A3C986AEF298F2C901F47C44E726BCDD16ADA
+2DE467F348F273364242E82E6C702C771B8B0612380BBDBE29760F190EA7EF8F1C2B9991B701DC
+2D1838AA8282856F3EFCEA274718A393B129C768D50D71B5849ECA68CB1316FA6D1B83CA9FFBAE
+C468178396258E077393F0EA6EFD239C554A72252290EC1CED243062B1C421473185D4E07FFBA4
+11A2AA16A0A64AA3550F97D778BD7FDA6962BDA0BD96F359ECEEDDA3506249FD0795EAD1B4A8D7
+68BFA198955F360BD1F57ED9D936E1A765EB2A13FD7392874D1AFB461600D077BEA83175F7BC4D
+732334CE6F0C8556414C35E3A8F2626ECD852399DFB783520F91807822F34BF1C99AC5A89594E5
+5CE25CA47D9AB411D74C489842C85109C12AB25B0105F6D816CD963AB532323F9239CB3861BA22
+B11139F35A4E9B843D2D9B832DC81CEBBB06405B0F6F19832E97EBD56B58739C83D2B015CED279
+276C9EAC0C1D92B10986ACB410A46D0C3BD16B34B4A48C8E2D5E47461959DB03D0F2D76A375535
+AE8818EAEDEC1EEAD181B1930C5828751FD1002A18087A03D2874E20EB7C49A02901C92973C235
+0901DBD7F2965BB17ED78F3CD12568AF15BF04C9D366380DC3C184A97E4A72E9F8CC02CFB7EE7F
+4956CA929A6E32AA2B2807AF372894AF2E9C37A372F51D9E45E68601FF6F06524210F0567B779C
+976618A30B59D269B808741DDA7B003659072374691101D3D09D505C60ACBAF7C122BF8FD6EAD5
+7328E60B69168080719B6DBFBE65A31C27FA3C456F3CFF4BECD6B32048CB20BE477BFD3371A014
+0C22AEFE9B13B0C7189ABFB43699E43E5B2D4AD7316012F759EE6CD498284C81AA5ABA819CF9F4
+C833C7F62B2AE7794FE888F0CE0F0D7FA21A6C6A8CDB1AAD802FE6D85777ADB6DC1CC95587F2FD
+A84AC265A1849F66873F14BE84753C499562579F2361751FB7AC809107F02CD3D953E47EEFEEDD
+38178FDA90A2FD01B7FAE52395B970AB7B4F923175FAE29828CFDD824E21CE9FCCBDB9DF984B1B
+F640D8995C1D32DC65AF28A899C5E97B828885704E68A0EAF6058191C1F6D7C6687F2019DE8A4F
+B5F65A0469BD823E77E6EF6DF177517AC774DFE568923C474C9E7C5FCEAA7EC1241960093ADC9F
+3ECEFA7B3344F5E064B8FF023E9E1DC18566CB1FF960DFBE470F4222210C5A41EC3E8D4C56CF9C
+B99E68CFB0A26D9D698DBBE95D407FBC77F9AB3E33B94DDD2299CBE40B0F208672AAFBC36ABF07
+F39ECEECE3A2AE0EDA34A78CB38993668B60909FF1A9FB10EE7416D9A16A7711B76B7BA03D010D
+AE04581FE01A379536E4A7C913B741E8A6135B6398300B22B8E07D3B14A93BA76195AC03A1EB1F
+E0FE1DCCCD048D16294F365178FA853BF76E7B92207DF27A4D1EE5873C9A40EBB42E18CB7DE812
+1BA54A479EC96A727EE581DE55F46F536CD947FED706B0C2CBCB2ED4C2399FC8D4B649CA5CB8DD
+6B3D8AD64D6BB395D945E133E24BA57377E4B82B77C729AC7D5EE9153B2E0C1AF4014CDA86476F
+EAF1E56B7D86421814071886EE30DD8E6EF3F31B0B179367F745A5291CC6300A535E82912E84B5
+27A283DD1363C8D6B52CB2FC2FEE59D9509395A38A46F235A1B433843A87C2F07A66BC120066AE
+CD6BC0936806051001BEED1A1359E626D77A9782412197DE172BA23D071E930D13E0DBCF59C3E6
+7967829F6C90B500D2D76AE3FB5E6C9240EEE88AFDE5F2CCB04B036B7C9FAAF679E65C8CC7C013
+339B56BE285D5F985408DAC02AEF10A865ED1FD34CFC03F087C175509B2EEFB3744C580B31B097
+328F360E99A480FBD7A877DDBE758E65749A753ED8801F6450488BB80C5303B05011EF5C6820F5
+008B71DA3E62761B559843C59ABB7E95E413688C40903538F452430B65BC1B9CFDC77051BAAE60
+9C413E0370E64B57C59E7E02B7B07768DA84326221C61E8ADC0B8F7E3B3F02897330F8397BA319
+94A075119999893505F5B665A93498E98C78EFA8AB7B267B99C7E070CE2D26929052498BE336BC
+EE7A81FD448572E302D1779B413A8AAAFC1D005461E3DD63B64ED694CEA82CA9618421FF465B84
+69739A5F2BDD2F80FDCC64A2A6B77B164E8F0490A3FE7197971C0E27BD1459C7CB756B5A3460DB
+F914C8736D7FD74A4371741F670840C7C154D70EBABB2B040DC864483CBA1AE8B630F38699BE8C
+0316BF5E25E81ACE6482B084E70F000D6121F280437EA0E43B3F14B5052A61BF06C3974E753FF7
+557E11F70D70FE2965238AF15DE3A4A9684271358E81347ACDE824480D51006211840661D48E0B
+758662086C5688065A7C5C03217124073495E3E7FED72383FCB8AA246F29739D3A83DAAF8CB964
+A023DFD131F022123BFCC782CC237CD7C8C0611AE1D8FD8CC15211FAEE13D69487F99695FC32FA
+2D2D0EEFA3671F58BE5A10517F787FFBA050B9410D0DE4E4AC2F671A23F1A3730F9E53CE1F073F
+F6D824FD4B742B8509CEC73A8BC3D7901981E5C4606E5DF31CC4208235FA0B0ED784D1B47172F5
+B8BE1AE460FE145F3DAD2835161C29694D087487DB7A23F81A21862609E7567CD922BC4390EB1A
+698F0719AB66EA001E88F9717765164FF582E75B934CF66EBC1921A00DFE652940500C4C58B89D
+B6A3485AD807B9053424966833847B9D9BB309530A81E1EA8180253E108E84EE70FFFE81880870
+EF69908DF92A48030BF62403067494C09D98A896240E848E3DC408FC45D237679F8C715BE9C031
+317DB88A8C1E3985580BEE4B9C1D2094CBB62FE6A5D6C5A37C38F80A410D267D2D0BD502F61C89
+E937C67F142AE87FDB1353CDF29106F432F9DA2410F69BC1B2A9F2F6E56F3BED2C37BAAC4A95BE
+7746A98BD9ADF3F42E81B77C72ABA739195A18852145964A18EEE242F1DB858FB978AEDDEDB5A0
+C735F127E6F26B414672D727FD01754D1F4E6F1F763F6F14380D83BF01BFC4E525A510579C5AB7
+3040F7EFB1BA7E0AF11D81483E295C467F57600D9CEB1C9036513A51DD2D23FE5B461B9A6118F6
+8B506BDD1357FDDB254DCBD2F288B4DE89C305E02B654EF11AA0A8DE529B093BDF75BBF495A574
+FE2273C98036E3D990956C3FB832D8A52E848645F1F3703A907BDFE522A0E40A46F62C661C0B75
+E9266C9DADD811EC8ED6D6751F1DFE4E327CDCB0B3962C6A2B6D5AA780A0FDE819C1870111F788
+018DD53F1A7728B430EAF1D959B3E1A51AF26CCFD26EAE9C4083AAAB283D1BDF94DBFE17255B53
+2EAAFE1A0B9FB9535C3A7612CED818685447D04AD983C299BE0FF10121CB167244AF833BFA84A5
+5853718D75FD51F83EEBB99840701579C8565588C0FB4291B9B5CDDF19AF7B1C6793D74B0DC80E
+468AB356715265055050F4AB55567C69BAFDD7E617E935BF6682F9E2C4CC243244CC2472670174
+6BA3E743A9603C43095BB8E6D98600717D452C5DADB237036889C9778F7BB8BB16D6C27B9D8447
+8E6905B517BBF627455CC21A52452D4D97BCE4CC389922DED1E950C66F833CA1EC4B135CA504A1
+F120995338D0C3A9A81BFC81D63FF9E6C53E4EF6A07C511214F5E4D7BB9DD6032454542AB649F7
+6FF1DA38FFF98F9D104F5E038C2074C2C4D972CF84D813C5D5136AFD204D10CBF2B5865040C03B
+1889ADFD00C8AE361254856476B81FF8704C94D6EDCE7E9C644AD69791D51978F1E18F7D43F320
+00F61B06835233F9EC73AA1EFBB134583C0B2DE39837A5A3B652829CE3E3C4FC29C17C37925658
+CAEEF53D597C675E609C19CB59A05224F47C77D799A7EC5BE0F8EE94271AB4E0B2C55737FE5E35
+6927DFAF2E79F815C2FCB98C194F27612684E4C335B8A95FD79EA9A5C59FCB761A0D85C3D1FE24
+1863FADCB7B832FFF9B3B892A1EE1F00BCBB5242035E40D678F8552AB46105370B5DDC49D30FF1
+E38C3878102499EA9789A5E17670117CD4448E5A04DA68E66705C1B5EFC74B50AB556700834255
+29029CA07D645BEF30A0B14E17398D5BF4FE90A819EA00B07FBDC8454F90220386799C89D3F556
+BD6B0DF31CE7EB6D637BAC5ECEF42D4CBE437CA8C3E9750CFD597CD5A66119AE45DE3418702EB4
+7CD7ECC900E2183E0D3C9C139B8A7551B9D5BDBB4AB17EED765D1CABFA4B3F5134378B30FDF696
+FE060B6D823A7F6D35B866527610B29B5E69D5711FC834E2C60C11857888EBE2AA9DCDB985AD5E
+44007AEB89E11DA08F666B0494ABBEE4C0348692A6A9902BB7E4D1474E48A410928D2155986968
+2B48BAAC10090F2F8585D46BB13612220241763766433A7F23599A462C5E39AEB8DB71299DC8EF
+A268EE3B0B8A522B5A08619483AAD6A04CF107E268DA6751AB04954241CAB87F679FCB04140D1A
+7B4E6EB6A75B76525A86A1E527CE56C546E6DE3F6C42C171537C8C86B046AFA338AA9A76C97FB1
+E7BFB161FA57EE38B3A75C23FDC4B49BBA3C34E3490A0A040E5569E2456AE40D28946784408E6F
+1C75D8BF81319E3D3A946B2867E884B58DCC97F846674AC93F2570126480A0932D1CC3DCB94EC6
+E91AE1DC4C442A56B15BFC0B22AE5E86A403CB8A2E7EAAAC996DA8F8DA5F7D145830C06A7B50E9
+913A8DAF63D596871C232EBAABFD6CBAFC9ADBEDED8C7662EB39BD306A9E38C9CF9F71FD718FAE
+D88B4409E64AFF7B6E07EAD81D3A50712193F9CC234303C55CFDFFB0A3A7829942C4FC55A89697
+79961AC53CF1FB2566A8510AD810989D6CF9067A4D72B20C0EB1E8F440394B71A083F864DEA2B0
+476B807459AEB77D0DC68454F226D04C3D4BEE54C9D1F7F9013A8AE01E37435CB90472F35786E6
+4FBB0771BDB2FCE0AD057F907DEDF18A9D8706A48A288D82A421D126DB42111C7BCA2333C7BA91
+0F79B673AC27DC2B1C0452621F0BC8EAF88C7EDDEE8EA88A31B3BD7AE509D68959102E9FF3CFA3
+CFE81BEDBCCDA6A742C3107D57FDC93D4EFB328C80A5F652B4C5B607A7D3685DA5FDD54F2F0D26
+F2B3D719858E3E902B7FB49E06B1B5DC7A3A3C2CE5DDC471816C739AFE8C5A617F6A109D6D412A
+299B78AF99707A66D58EC406155BF9E1340B0CDC7ECFB4FF1AD3DB0A0D0519FBB5EC6513F98011
+DE0C37C65E97CB7CC6D68C224B1D4AD96EA971270BC9C2306D0FBD61F579DB318289EDCCB6530C
+36834B3960DF38BCD0B7F7239E84A0A64EC64C1C6CCC087AB6858708687C8D008316863917306A
+9ECFBBF7261FCAE77E10AA18112EF3C463CD86A6B8CCBFF9E497C94D142F4441CD30DF0777A115
+6E396EE054B0C30021F3DD9B5CDAEC67564264F3AA2F12A5900F8DAD85542EAE0344B086A6F17D
+28C23FD9CA2FFB0E747B8F7B47AE99469E5AE89BC8D3AF806C37D3EBEE79828CEF262293650372
+83C96428B1A468653C1EC96A31FDE279681371C263AB5A18F0EA86E47111EF072C72AECAC25841
+3FD8E828F5CA38CC3FFFB847148C68DCCA9051CCC5A971C83F30987B874C66424FB910B5588196
+2671960A7A95A0D535D007980A56E5AB2A2CD05E994B2C71556F38964161D4965275E6712338C6
+14D4846FD86BFFAB7AE8D2BE1C58C259D46F7CD47DB33135B37E2CFFA757C976F8617B6BB007B4
+EC39B277958616DAD13C0C9FEFF88F4B0AE1DAF877D71081474DFA48F6F2577340A85EF71C4CD6
+8665D355229E84E308D762243BC0ED385F18AC14EB66FD31AB6F24FD75609F389B07C02FAA2F37
+6A8897C2869F0B4CF1607DE38FD41CFF171B0D4B39CE2A28B2C395A7FCE3E04F0D7AE6F0BB5D23
+9E620DDE79B2CFD5BDCB5540BBF3D2F7C5ABB1F4C376DB2D16BE823DEC48F64BF928EB89F1DFFB
+22845BF97740C01D56B321312F26CE890CFF8985D163F406268AE4318B103125089319287FB192
+3F9FAA877DC3ED863861ADCFCDAE7618FAFFAB358111DE8420A5B6E59CE6A1B487A5EDB28FA813
+6FC573077B8F36FB0017E3119B56023B2E0E0F28F4423C11A264B9BEA5E6446AF7E9099B14FECD
+B29A0F8884A8828087A60CFB69FBF6334C5C6E9D754EDD403BFE0075961AFF6E9745A047F6710E
+4D94E2C43318E6ED0AA680B707C768588A6716660CB66352C8F6E4B8009BB761611D755E72234B
+45BD35D84F57559441A571399830CE485008C2CD35C2F50BE38DE7443FE1862756E6577626E13F
+38B0CFB5E904C6A5117E36A7AEA41A0BDACC25B0DCA61381AAE1359A98D398B8C04ED3060F9E69
+A81640BEE6D2D97C3003069B763C1A024F476C8215576763F4C8EA61D5182AA3E34B03E814C8AA
+18A950C0F9F5E7212BB0823A697709DA6433E9E0FC8D86FFBCE94D8B0E249A605E4F3B38FC049F
+BBF400E9A320ECBE127AC50CAA9FB1F5AC1207A9E6E7BF44DC94D008709E696711B87EF745E17A
+8D5B38611D83E5E26D8720EEDF4AD6455E8794326E3DCCB04167935CB73984C72DCD036B24190F
+2B4FA6896E01B01777DC6032C7017132829FE9B370C49C25620600A999F87F1A7C7790D047D960
+4EC7A0746BFD0D85E02A626D15130921699A33ED39D18634F56FC81402E589E6644D605412E53A
+FB366D5A9977E2204FF7DC949FB7587E76950F0127CEFF8F3CADACD67D3D3B4430E375E80F3E17
+9C31E69D33F2034D62CEF97112A2230A4EAADCA36C7157C4894245C6D60753AAACEA6149F5646D
+BEA6DF57918E3CE20A184D65C22EF37E6C1C7B61845743CF8C52DE42D1216C22870C0E7AA2F5C1
+81F7A15DDC57020A30AFF8D4F6462B38DA7E72C1E29021F0277235F8A199089B5365E7E67E5B0A
+3FA6C22091BA0E96ECF49D7161D134B7FD1701350FBB2F99B54A51B418B567B5647D7F9AD7B4EE
+5DD670DF8469FC18774E8AB4D6EF4B4F5751CF01220AFA5C3DEFA5CFCC29F7C181B667FB9C8632
+5BF4BAC10AF238AB2D2A744A509427F654F9B85FC908FDDA60B31CC92E837A78D38684C84DF38B
+F014430BC49A304457B2E7D9B739B0902D6BEA0492D6C143B7DCB462BDA7DF0C54C3C76A52E355
+4F3A1749656D1520121948102ADE605E6597936D7CCCA51AB7D80A4DAAA09992B905A491099AC7
+120FEDA88CA561A199CAF3ECD6AEC7B99994A8416EEFBBF9A1BDCEC671A6B3FF8DEC59C9DFD795
+DDB249247B918BE637A204C275D43DB5506EE8DC787525B3E679CCCD3ED43B58096281E2BAB358
+C5303465E46DBEF697B5DD33EF8A648DD7053234A53B179539C455EB9E1A17B72F707FE30CB95D
+0C28911F8643389CC6995C58C6B83C88AFD3C594052F37367882C26A8936A479E426997D89FE0C
+3AB9091E480DAF918BC26A87CAEF7BD1C6582C73F75B85D59B708D9C76F953376341CBAFD20F1C
+8876F6EE538F61283D03FDABB3CB2888C5F3942A670517E8DDC98B6204397038B951E023B4651D
+8E3F19733C8D6610827348881B570571FA359C840568DEDBAFE941B9DC7DAD8C3E1B190606420E
+1DACF3965337C51A6BEAF2F2E5EC60CDF839E2DEC9B130C23BEE9F65B46626D20273A3A5BD39E3
+BB247B1DE1CF9295C409B91AF47B38D47200E0DCD317B4DE3ACD751E967AAF9DA7F6C026D01171
+3EE0F875EFD7B31B73ACD66C6B95948492B54A7B9865B3F32DD722913F3D9EFB40E4F03FF9E928
+AAE3AC1C4F239DD88BAD50A2BB442D1A0661B3F47CE2BCCF1A76A8604C7910873BDE2C2EFB4112
+60C98C75198EDF5846EF6EBC1BF94250D34F646A43D00E3A42ACC4E3E1A44A2B0B7FD74003C61F
+00ABC9114B6936A50C67544EF62FFB2F19CD1E5AC55EAEE547C46ED91A13C76025AA7AE95E0B0C
+4D2408E53D7EC48409D21B2DEBB04C7121487C50AC7FA8790A2ED577A9AB6E4063F1DB7BDC77BB
+4542EC15573C3F2E3CB767DE52DE2DCCE04F38A58F06F08F0A541A98D3538CB41AA5DAB04538DC
+EAD1BD6B41C71542ECD834F82184A7F51A4B50B595E50E04A5234094049F10A1E91BCA8C2F7BFA
+AB638BBADF6DD02D49B2CC406E9FD40B734BA772A0429BD99CCD01F112E1EE95CB7E9F48D5A9BA
+584636A03B52F94FBC0724A1ED0E5E0520E5BAA4301773EB98709AB035AF28D615230D3EE0DEDF
+CD33056CE8C22A1FC8B7B3C2256BF7B7C7C8D1CD669AB358E57A1F6A400D18FA59FD5DEB0C2601
+02C59112216BC6E8C0817EB5BE3420BA0C2A4363021E57FF83F09B5026526B949BFA3342A70DC8
+81DD588833BEA53E06D29254B4802018B002B06B63374A6C6F335562479D0347DC7C14E2E3872B
+4C4C55E198EA28B35A3B94CFA88DD3F52C3C192475B6C8B6968B49D2FB1623855E1D166294E1EA
+C8337B3DF9B1B3F28114286FA24C7A56731F05417C40872DF09C55C3E81D93C4DD017BAC9A2CB7
+4ABD13E9622D3C533EC60B4A6C03E253A3E586D831D70E47501A1B521E2DA5D67BB1949503CBC1
+693D693925130928BAEC639F80DB420DF10C8553385E79FF75D8BD970041474757184020FA03C7
+97ECE10C8B54E3AC56F330144F2253B816441D75D0EA55D7342E7CD74B3B5311896B43F4BD1DD3
+82A6A8A0C3799DF24BE4D658E6AA2AAC51215C3495A79CA323927A69034959CB01D5978EE1DA9F
+B298845A4A2B40EFDF7B85996094756C99DDA3C835EAC39826C048FFD5C5C582D8698188048254
+66387EC1CB16BC506533D624BF2333CA56C37295BBD41EA5C87DAEC80C3687C37BC3E514BCE48F
+B4AFE9BB5B16E36321B1C0A29A423AD9ADF15718BC946D720AF5C20C1922A68DA0F36838D02DBF
+7CF4D017BD2CBB96AB1B54BC8B75130109AB57CE4E13712CFB4FF099CBE8282C07D3C614179433
+B263696E7E3E4543E489A9BBDE0AEDE6EC0F1723214AC0C1C8F662DC05586E7564D405DDEA9BB0
+9D727AF5E75D7A5F970FB410E1DAD52BB13E79FBFD73340150E2FA08EBA94C59100D7CC76BE3DC
+5AF4C5811E175E4DA3C857320593C5E38D66E565F1C06FCFE9A1B8C885A01EC3021D4A2E6A7AEC
+24CF832A6E731732835FC0B67E4D726D8F22FBECE5AA64EF972407DB407EC9F9876AAFF2FCAC35
+4BAFE47FF75F06A17D2FC0B05A29ED963C73F0461AA599E0051E47F5854C974724A5A53B738908
+24D0B458A299A994807596DCEF07A1E40C5FE7557E9499D6BFF774B7916F04D584B818F0DA128A
+FF856B494385F9A9B2AEDC4680A6F972E2544CA24E95273D394FD5BE8D9083F9EA81A8FBF44EE2
+94771767D6FAE60617B8997417EC6BC796EB0209E6B8D878DACA641EC329B0AF94E303A0AD611D
+5E2C2C8C900857730D1EF11E218DF7F0EACF7E55F10B5F7C56E6AF414B060453C0EBE48118B964
+56D38C8A923F42AC5797F13C86955F7C1FFE29881AB82449377F3C8E9E08967B6F66FE925E9B7D
+474CF80BF4F9A24E41583484A0AEDB8EDB0075DD3B7569E3261A1706F8A95C6621C61EA99DC672
+7BF50CA75E34A612D004C7CB81941AA450FB826EF9A51AF8D3FA17DF1A184CEFAE33F9C7E63BD7
+04527954200FE436220F2CACF234BB088B5DEFB52B2449238C0875D395F8E22FEAEF096EDBF392
+AFD6FF6C07ED04288FB73C401E29AFC2A76D4C3D02C4F48955A8F32D323857333ABDF3022BAEA0
+AE6E4531C18ACF750416C54C834D25E246333C13456F2B866B958B929ABB8E497917622365B5E3
+86FF235574876767588CB24A8C06FE0D495AA32835CC6365A481788EA24972FB8BE12659ACD8F2
+287C231396647371351498647CEE9F62C2670E8EF48788530BB5B006D93A29CD4A2E354D2C85AA
+0AB2C800AAFC81F24C80A58C6FBBB89A887260D00C59EF402176C80DB3CF44B0A281BC6042BDC3
+3AEE88AD8A57674F65290386C73193346082F9477EB04A921B3EE960349BDAB9E5326B5C57E223
+527B1A3173183393ADF86267F127B52C49320B6ED36285E8ADAD07C0C91E479373698E709A1870
+C3B9F6655DF4E5B96E92D0E2F2A15C5D6F3D88ACAF6F95E9BCC52241799EB711DCE15A68DD5244
+6E832F500873B045AABAB816EB68FAA75E0E18B5F32002F283D6BE121582758CA59A65CA43C28A
+68BB9E407E8F767152A35E8A90E6A6DEECBEFEFA2CE779BCCB97862240FA72B92C2E3428294DC5
+4AD4F7C6611E2D6B25DB3EB4995E894D5A17863D4C88304E77EF696633AE6F224342D391F7E3D8
+2FDC24E2887F43F4834EBEC3F2B32AD1339995822553AC68FDA951DB4BC95B0355A996113E4800
+8A387EB8CDDA0C4D0B2409BF9CEE2B37E1F6F4B55E9BE2096B8DB5A617F1CFE12BF91A21BAC921
+453E42E4DD5ECB5A479078FF8688BCFF56A4CD5047ABE1BB4D3EAA9FA03CD48FB4A283FCE6FFF1
+1885DAE6AFBF1C72E8399988C0EE6010DC41DD596530FA76EAE5662CFFA35146A75E55444049DF
+1B20C6A99D838B6F8C411BA022D50ACC847EF94E52908E83B6293E719C43E2C42C953A7EB1395F
+D52AA1B6E66F7764B77CA3ED37C606EFB9317CD27929413345C76AEA4619C08A4A00EF770200B2
+6BE73815970961AF7F2F7914B64F84A1BD43F9D186ECEA8656B8EBDCC7EFA35AD35D5EBAB0CA02
+A199BF3F7514478D89EBA07B282F00B55BEA90D4E8543FEA7E6D489944054880B09EADA41DB4DB
+0659B8D96CED67C8A7C18DD5C41C50D8149E85A90CC1787E86375ECC386369420DE75AB44AEBC8
+A1D034DC8045479389E231882BE69C17EE57EABE00848F12D404E0C44340E21FCDA95E7A7515D6
+F606C600A488337B4FE30FDE40B19F3294A8102DBF57109F494C2459E9325766DC71375C418B11
+4B00620BB7E2B38CEFA679010069DB5C6B4CEB7D31716AC05E0AB8C411C89918A19F89578D7BC5
+10CA86BA996F4263D2B7C98AB5C8ADE8E7D5B96D467EA484958C8B514E175741AF715187F0E807
+B9C5B19B632BB42B745187681714526877EBFB568B3133F4C86EC3DE0C6D7DAE1660F1E1044521
+CEDE6B8ED3B03C16031A7DFC67C32C87FA83A5E29898375A5A5C3F208BB3CA718AD06D0E7BF2D1
+07E7F67DC639C5D956B79FB22BDC372846646F60760855A4F9F135F6CB1BB0EFEED0033B09FCF3
+A34E1AA76560F361157E0C2A1675BD94E0BDD1C7293E7699516A1304CD3A0DA5646ACCC954856B
+3A62D38EA879EB0B0726447D0E198535124551BF6F9821054D8B845C441A9C2481E1AC3E542AAA
+553691D7D6E4B303859A5086A7ADE18106F174745F38F6E3182F9260FE9E9C19EEF45359D6B9DF
+DD0031D1F87DA89151B1BE4AF54B6670EBD558BB318F2184ECEE9152ACA35E099940F094AA2AC7
+564835E69E5C9C47DC7D9625ACB1D4243FF1D993CF854639C126DD8CE21A0224119ACA731346A6
+4AC8C18AA22FB1A1968B0A6B05CF3A1D5B24D3EAA7C8D2376D422902643D3FAB3F8E7DC8B24161
+3DBABB170238A1A19B4C8A4703E2B0A2A033E71723F557C314DB42B159E784B1822BE1F990D167
+0E522B9FB1B3A602B10AE08A8E7E3B2CFE51236D76B744456E5A68995294758A42F1004E8863CA
+0D3AE455ECAD13501669A1DB41F7E853BB1531A4B949AA5BF0A5E478A5705D5EE45104760C727A
+068E7057A808DDA30CFBC03157E141AC5E9E0A315967C2117EEDB38F9C66A34E138B29E3DE6A03
+C34D0A37740DD04EF8F9D08E545FDEBC571043A02165E6086389DC7BA3BFFA52D94BD4C1A27B85
+9B8ECC67994EBD370270B5998B8F246EA4FE0EA6963AE3E3398845A62856068A8A878B6F894A7D
+28041BD30CF4F0BBB5053AA7DD86A2B94F3794C78F615C669274629F392FB2D320BB82EDA9845A
+66B0EF0384985B938FE8A3F47B00C2DC575949B8B932F3AF423E17F72BC3BB9B63A81945CA133B
+CDA5EBC9CB8B8B969ADB5CE60CA6F746C63DA5C516DB410F86DBF878902E753A338D3FB08C60E9
+41AC304DD767BF47D49BA7FBA110398BE21E0F9F01B6DF4CD3256A7803E5BA935DD6CDE11750D5
+DEE0607C14A9A4DD037B685F830094C5BACD2283D5854F5360ECC924108F4C129176AF6E624458
+BAC41E0436912CC5281EA94AF791219F1D04CA3069F30B50AE79BD8B8576B9AB76E6033787CE32
+3BD25240C00FA03FAA253BD83EFB8FECD2DC45C1FD7CC194FB61CBBEC88047CE8AEDDBD920666B
+C2676E21A3919986FD56AF5440280E7083F04987F0272BEECF8F3B5261007203702C9F82B640AD
+2E6ECF9D0BA81E5DAA95688D654873DC9177A2E7162DD21A7B40CB3C85AB49469ABF8F133F808B
+3C2DA2A5008E25A13A6D0E49FCFFC0C8D3E5A257A8C8D6B1124D7017CC0263CD94F50D32DAE125
+C66A0AA717839BDAFBE889083C01D5E41994B7CD52E63A5FBD4D89631A93B377040DAE99C5BDBF
+68C2142FFF3F2B53DD5E182FF6AD34A0BF6DF19F58E0584501239815495DAD144DCE748744899A
+656000E283A237E74ED58E2452F1B6E73A2DC626C3E52155036822984E5E72C667C2E3D790FFAB
+5C0A4AAE0325872AE9488437762F4C70BC0A369C091EAB8A3E8F404464B99D26D6C35B042E10D8
+97E029A10443074CF73949EAD0DCB7E0B8D39BF3806F39D3E3C204527C17198F21FC76FA5ABD6A
+BAFB21C942146413F03E0CDE247A8CCD7C726E993976F2D730E43054229A45C0FEC09DBCCA98FE
+C2C49B2C6B015D34881254CF11246521D785DA12C48A4731C3AF1353F99B0DB96953F5E42B3C37
+EA460876FD7EB036F7BC5D8630354CA18901C561A46A9E201C30E62F23F3F7B0DDDFF596E13D7E
+00D256E6833495BAFDE723AF59E70D841B5028261FAC723AE4E37ADACB02772DFD6321FEB65729
+D65CCD58B312FA68843ACFAB7EDD78D31ADDB734B647E87C7CE25A0436A0D49499FA272FCC88F2
+E0CE5D7382D8CBF7930467AA3C2B1BF67E683573DEB3EB57D9EEA5E185786DC9721A4B95ACF32F
+09D5AD2C06629198D15A74FD41D8972E1FD77CB71A933D235E37E893E0A4DE1D50717E125365A9
+CBC2B8291D7375AE2340833939BB0F139FA392F293472766A2ED405095BD990660CC6F40954E96
+71F9557D584266C6F3BF41F4FF6E0BB7ABEB272AF99D0A4438BDB4AF6789B90431B7DEDCCB0D5E
+35BF872600670B0F15C19F34BCBFC59C4A2BE3978F6A184DB4A4745B401BACB8C77DB62D3ABB85
+FDA212912325C55C5A6D33A24D76C7BF72A6A710DAA7392A7F7CB0A6339505AC935D346C9B5E2D
+D2E85608392B3A25237337EC8F5856BF3F3ED6E1514053F4FACD12A94DAFD1C12249A67E3F0805
+08CBE6916B2DF3D9478C737A141AF7C54E8832DE822817364EF3609658C65923ED666D86380B99
+ADF7EA02C9DAE111DCF399878CEA60F5D5B7C18D244AE76D6B978BA17DDB71D3DFC12252202B39
+6B03E36E376A54E1305A00D074419A8D04D53C3DA828A36C8F40C439CD7D58A48962E7BE992A9A
+A82EC8537B268AA13FD1B88275D87BF0244D7B61533B16730BB9EFA643A5B96C4E9C10755A85A4
+F4C71AC4C3DDD308DFFA066162B8B7F75F7BEC8DA40C5194B759736381349A621C407A34B9088E
+9EBE34650582CD758E269847328AC43EB79B5725FD7E516B8A974289D8C5BE90C301323DEEFCC0
+A18AF6632AA8B80C8D188CEC275A93F68CF87FB7C6C19BFF2C0703CFD15ECCA16160ACD6E3E16B
+00FBC27616CE003FF9A60569634DF6D43997A4DC23AFAA8C2CE9C446B673581FE9F30A9A2323E4
+C28C7C9FBA27A3B5EAFCCA82D85B05CDB6B39A7C6B3584F48F4E3A1F013ADE47023830E47ED8C9
+5CFF3F648C38BEA1AF9135E16C87A42311995E09E7FB51F06A87102BFA8263C32067B26B0941C8
+4F2F62035D58E9153D89D808AB71545A1BADAD1817D0DC2836C6204A0A0418A2D62EFC2FAA63C7
+A9D0A5CDAA5F0E491269B127B5C716C3D5CEE6BAE7FD8C4F86C0632AE757AEA55F15CC0F95D7CC
+C41EE9B1AD9349C4F81F0998ED10B1F686272E373860AC2EBB986C2558DE989DFAD95DBBF9EB54
+56384A0078C133E91AC9CF5365A1E733834B0701B4FE43964517F0AA1C011BB6A7029F8D5A2333
+B67DA3E019F0D8D7D533AD3291C2CBB1EE920E953128D06BBC517C518AE9A2DD49B933E915AEED
+9810C619035ABF9DC147F653ADB1268169002E032A42501200A685D19070F12F9137BB1D9F2A8A
+45C5B52F5577305AF94D9C511E5E82AC67A22164833471CBB8668DDC88D9C500917183C5E14A82
+F1D9A0AA3DF2D7BE4DE844BEDE55700A2478E121555C7F6529FFBB052026C80776B447F1F5BE0E
+85AAF2CF09BA3B0917252D68D671005D0FA328BD225553D98F2C476E080BE8E03AF4A7651563FB
+FE08C230F3A956F2FAF7ABF868C08CE33A7FEADBB8E6D6AF38A821CCD8B4EFFC02FE23A37C691F
+6927D45F5710DD5FAC7505FB3A0DC31C766842B482BB77DDB3990346F627E0E1657DA8ABC8EA77
+963D6CB838D9C4E58C943C3A272582B3E63771070A6F62BBE7A4B11B8CB550547E17ED5DE6EE16
+1BD9116CBA0E0EEE910F98948F740E7A5430176722BBCDC4AB66BD3541443B096063C839E53B05
+A55E72235BE223D286C4319FD5A516325C8BD480D1867F2013599844FD2478B3B52542815CE945
+FFC8FBEAAF9B072CB4988253EF70E42A1ED315FE2C7571367E5217ADF3AE4FB67575CF49B1A269
+15E653B5A86E3FAE1C7D04E1AC21CA5D7E7BDBEA0F58C9962B40A168FD7A24B4BF109645481EB1
+18D49BB99B3541756E0DAC0E2327D1FACAED9F7A7693FC1A15A5715F1FD1BFBCA7D232FCF9663F
+B0CB352570A5807D170E5B6C6727F7828F87FDC9D9301A842C53A38C62C804CBD611992B3A1C8E
+C7103E76294F7E6A50916B8CEA82BE5B7EB777AB2E7A8C955414C8C61EA330BD18C741D5EB6E15
+A6DA46B30345F4D56CEA595CC4838BBF99339BCE82582316847513CEF43B7DEAAA17C7F3DB82A1
+3471CE81BF7894721B80F8165BCC3F7601D5D3DF17D2F37C58C5E9D87F3990E838E55E8BFF7087
+BB79A1DFC321602B386F98D1D97CBB07F6D7B06F900A77E4847CCD689B23C277E6476300D4D9CE
+2B5BB5CA2062BFF0EF2BB3D4ABE2A9F990DCF74568D7CDB717E4CDB07B97614508EF34EE901BAB
+B477F75C41B2AAEA8F46B218DD0DE5BD82F1717F96E14ADF8D7366274F3C077681E0CF33ADD953
+8922D539077C56431909EE8C1EFF7467C9A5E215350278534E5A92C6BEC72D4C34D8D13CC545BE
+543BBC371443F2D346737A3C390A0F7E284D9C4669D374839D3ED8A4023F1F99FD93598755005B
+C2A34DFCC4D19CBD422ED4E857D419BE3B9E12E01D0327C51D3589E83325896018C9B0417FD876
+0AEBC5E0DC8367CBAB11B2989F4ECC1AEF87D935722912F180A70DFCE940DE3882A416E29BA14A
+9C86E77380CE464583F385FF16F7FBDB607AA7455DA70CD8A0D9714963BF791D2D5E2E550D10DD
+105F88DAB1BC1F688B1EE8B40151E533B6D56FAC3A4A98BAD8801864709AFF6DFB3D3EED5A532B
+83E91CD8125A7A7AB6668F066AB79683C6A3F129C5ADA9431B06ABF37A724380CEA251D67B5FD2
+B9C97334297B9DB8E85CBCCD13911AF8DC2415D1D8E7804838D3D03F9D143B923F5C5B58E28B74
+8238665065A15A54B43CE96089B8E7DB9069B2B53210F5A03D1ECD2F83E1044AA561AE65683A43
+9FFA3E1FB60C1CB64F32FA71E3FB557DF3CABD87FD2F945EB3C6960228808E1F77B23DF8C7B5B1
+889BB4C2738EE5D607759C33D5D6174194AA9F8F90D969EA3DAE834B381A2E08E5DC9EB540679F
+94D490F773A109D262E08CAE60E2E57690E8CF756F9AC112844CACE02AC96F51231FD83BB9FF70
+102FCFE3DCACC8BF9E99BD7A9C9CD9279B64B3602442624EFFA606326BF96DB9EEDD16A515452A
+7F25ED3E78ACE15FEA2CF9F1D3C6A0541D441A9D94ED9FBE947AF35B70B21CDBC02529C265072C
+99642EDC878D92A7664F37F5D9DC173F6C28F900586C48960241E2932F113984BA534FE2457F45
+16E7FEBC7A7673E8BCD4C8B05A8D9C738164A43DB7F581FAA8724D12035573BE800C032AADB23D
+9A277BEC387E29F201E5F4091A4DAA4792ABFFD65762E6637E355B8834791370DB79FFBAE99108
+92036B5713F64A2875092825616C64C6827BFC60F8C0D1EB0FAF0516348A7846B657C809030112
+1FE3B0F1EB992ABE73F0842A5EE10D6436447471044EB7D9247B169C3F7C37B5109A5E7650ADD1
+16E52C21022FC991756B93D210C65F5B7F67CD38B4863F90D3A1742875DF8E6B24D9E27D726521
+432CBD225E0DF36DC33B8E8BED9FE897E77098832B9156725DC38EE82595481A76D166B37055EE
+84EEF1899D249DE4280F7F15C76C044565949E9E4D438F327E05265E34FAF812E661770658F2F2
+BBBFCC933AEDAE7BE17A40880A153409C357F830F1F847D9111135468D7A36BCB1E69CCFF57E26
+20D97D988669D732A9A4F4ED0B1B6B542D729C9D2FE15DD8584ECD458A1305DC729C47714B6DA0
+33A0D0E221570397F61E67C056F66EF50BE591A6DC3E3246908B8EF4973F76C4403B17175B046D
+230F17B98A217D346F0796A77B6F19B4B0889F09A03B4F7BEF3B241218A85B5C34C4420B87F0E8
+AD942D0A232B66FBBE49D2864F7AC2E5652CCE91C0FA6FAE79971F2D00E972151B61191190F9E6
+9CC7A51B7777AF0EFCAE0B2FBB626235D0B942134A85ED0168D2E0E58654D94BCFAD1D0EAADC00
+11939052259F193324DBA479BF57AFDE05237A08444888F08F9BA119175C776402490DB29FA96E
+B0BDC684CAA8E0CB48ECC0F40A0C8F18E37ED04122007CE4E11E1FF389EBC7DE9F07888EC1DEB9
+A5C083E57830C1D303D03473CF649C83D03B17045F3B74A32458FB96C5856F02B72826B64D4866
+13C7F07D2A3441C71542ECC56D65F2A80B5744608D0DCDC14204BC00ED8EFB67F7C31794011C03
+93C64585EC8B7427B82467EA32A902FA1BDE691FC77CC61952C72F86B2FBA240D9D0CC565D8006
+4B0D9525CE09FBC1F7A6104EA5F5AF9CAC4A1C1892BF78ED5500FB5AFEC29532AE7ED991CEC28D
+F9B076E95C64B91E0D262D4EAFE1C27E244C36B527646652F54C23E3BE59E6A0A2B123BB3101FD
+D91BB2F3B313CA0B00B1132A3886172ADA0A234D805CD95B2D
+0000000000000000000000000000000000000000000000000000000000000000
+0000000000000000000000000000000000000000000000000000000000000000
+0000000000000000000000000000000000000000000000000000000000000000
+0000000000000000000000000000000000000000000000000000000000000000
+0000000000000000000000000000000000000000000000000000000000000000
+0000000000000000000000000000000000000000000000000000000000000000
+0000000000000000000000000000000000000000000000000000000000000000
+0000000000000000000000000000000000000000000000000000000000000000
+cleartomark
+%%EndProcSet
+%%BeginProcSet: stones.pfa
+11 dict begin
+/FontInfo 10 dict dup begin
+/version (001.002) readonly def
+/Notice (Copyright (c) 1987, 1990, 1992 Adobe Systems Incorporated.  All Rights Reserved.ITC Stone is a registered trademark of International Typeface Corporation.) readonly def
+/FullName (ITC Stone Sans) readonly def
+/FamilyName (ITC Stone Sans) readonly def
+/Weight (Medium) readonly def
+/isFixedPitch false def
+/ItalicAngle 0 def
+/UnderlinePosition -100 def
+/UnderlineThickness 50 def
+end readonly def
+/FontName /StoneSans def
+/Encoding StandardEncoding def
+/PaintType 0 def
+/FontType 1 def
+/FontMatrix [0.001 0 0 0.001 0 0] readonly def
+/UniqueID 38777 def
+/FontBBox{-179 -250 1297 943}readonly def
+currentdict end
+currentfile eexec
+EB7EEB89BB946F143739A83529DE3381F3784CC049D9A232E7E0884F0F277E8C6E6B0C95F5E3CD
+DFEFF2F460CE06E2FC85C687B2452F666493AB6C55A2075C61F4DAFFB054763B9492E624F5E4A3
+8F11E3BC76EDDAA5C228BCD20F1BF2283E8133F07F5AA91BFF96808985D8C1736E8BC758781338
+F12CC618819D476B7674CBF6A7B3F1025A7291C7C074B3055F282498484C6F0FF8F641D0CF6FF8
+8E1ABD832961B8995838C9C0F6BD075924512885439B9369B37ABD9F474BF8646BF9DAD5C5EC17
+79AB8DE82C3D098E6A6637D9B4CC7174ABDDEFBD3180F0E62E1E650CF2DADAA7C7A6B1991EF9C6
+B5046693AFD8B1CEC70D85407027864F714E599DF9E4E6776CF8467214DAB6902ED5B40FAE4244
+82ED45A7BECB26941727281F8E0B3C15EC045133440070AD72736F4D87A96335CCAF8E6AA38229
+8CB7EDA49F963A9E119CB70B9520E5D7AAEDD5498F0ED1C8B3902637E71734A7D7E2412D5EB792
+B7B60BA9355628BEE3DFDA5E93B3026EC2886D40B22685C8E9BE5E38DE31FAB551A978D095C55C
+E3FEC4D6ED65C708F3676F4CE5F83F614C02C8F109F1A7FE93C6030D303227AF0EF843C45F15B2
+2797852CFEA26D79AE2934E8B683732B306F9125ADAA1A802C8B82605D7395D0F22C77CD1B20E2
+02BC082015E293C8F1D8D78A0E4565540371EB3B51256BA7276B2FABA2CDF47D34C445D0255A4B
+23A88CB443B997813EACEBFF51F5B8C9B1B8EC5968A18CA26BDAE2F00AE034DDBE4DDD598ECE60
+52A9BAEC420FE278B08F64BEF1069BD1FD4AB8B2A13ED3DDCFF8076501BC8A0156715EC132F636
+711EE9D0D8C89C932EE5D16F8096A9C456DCE7F59517F85FA409B6110DFC22A2391A005492BFF0
+C8610A9204D39AEE51271D355CE201A5719842112C88632AFB097C368EAB897DC1957B02962E2B
+3E4732F6527C25BC76AC043B7300CB153F6971C0335FD3C6AE5AF7C5DA5621D03FAEFD3B8ADB98
+8272C6380708210BF140809E4A191193F3547B2E4D43D4E981F7140B94473B939BE458E3B69B89
+33ADBB82DA80BA01B2FF9878BE938D7E1E4A6E79B21C0B53EE510D6377E178E8E3556125E44D97
+32ECF7A7C591AD28B9C651629CC5A56BF611E2C2199DEC57D61C099E5DCEF5527B9B2299FA64DF
+B3410193B77CF603A073D0785E1BA9CB1E3F0AB8859A87278769BB6FCB0C01EBCB40F80BEEC4EE
+0283CB480E2B31863C2128ED5AA95944ED748805F9BBC70FA79F7A40C175F8A655C11C01FA9C2B
+9E0A6A8FE5AF5D6E342ED1504BC332EA0F1788081808AB8A493A078AECABABB7D0D7183AD0ABD6
+576119456D0B50B0AC6C6C3DDD44C64D4D11A76D2C3F5FC53E626B12E92D22B757E89749A1CE26
+2C81F7646D9F24EE0350C309C0D9A65D134FBD216D3ECEB54845BE6FA7D67E2DD6B1F1262AEEF0
+A134A6E639A2E3A6C8110004057BF9DA48728F50D486160122FB7DE6587D432589600363CB7620
+728E10405C9B5CD7520F43F6472F4CF71FDF8CD95E78950422DEA82BBAD2A37EFC01B77C2960ED
+9A6F213334183C34B5BC8F905BF35CA1604F593F1939B7582423B19864F33C720DE6D3B23B3D80
+674761CA59B1561F6094E433714EDB17523D29307950FE67B11FDE2AC1E48303DBFEF06EF1B00B
+57201D7C78CA9EC0797600215132ABC35FC81840920A311E8C7B3B191C20F76D668D0838E5A2BD
+713D8FEAB68CEAC365AFEB987480C5A742B3F85D2C6B3DDC46E2BC1C27B316F6C2E94489E6D6A8
+90A8C22B71A74B897210E143BFD17EFF558BB67EFD214F69BBA2A346AF95338409318A9C95D8F7
+76749854A7CC4AEF404CE41529C318C2165E2820DBA6B20E6C42318396522FAB8027289A93B316
+9FC3ECEAD61D09953D206A81630BF18B6F11E28C748F71B5FD105F913BE26FCE927F0611C7D202
+AABA714B47B754E8E8ACA58CFD7421C5B8793C83236D375EF5EC59BC71B5A63C2D4FD01AB72064
+634A3592BF1214E192F52389F6AB4A89DC4CBC1A9F4B267A0BCB6137487F813EEA0C6310CEECD7
+DAB781A8C18E08A1B20BD2CDF58DC72C9D57EC472254ABFB157EE54C969150DD97A30EC7A78B9C
+F8C163FA6185B1E399CFD0B9316B70FC11A152F71DC4B9C902BD05F1AA7A655ECB1E69FFBF7CED
+71B6640AA8C529AF822FD4D173CACF66DB19F35ABA3AEBCDDCEEEA061B06011553B86A129187F9
+26D18FD644660001C7C1EBB02C3344EF0E88F93ADC8F334EC4ABD15D45C33221A5BBEEC48A3213
+2BEC257F4A154E2B0401454138B8348C9B52789E1ECB5C01F7E8B0EAB2AF39B81FF4A7A0699643
+267D78C1B794243AE7E4A5E5972D2653BE8529FF3ADE15B8D2D9CEDB5B127E8EADD74D2E45FB4B
+4704B2BC7DC6B900A66B5F19F4A92DF92D3433A7104B869E31EED01101DAF9AD5E424A855CBD2A
+9F24042AEF767196166674AEA9B4D8B871F84EA776ECDF5F981AEBB58D139B33F188AB2A99B816
+1EFF8D88E6A57C45956E7ECDFAD1D35D6F51B3BD62F69E15FEA564355A05563A133DAE3E8251AD
+6BBE5C2E59CD006D8F87A51BCE072BC40098DE0BDC3078C1705CA2B52C7A3629762F5997C62EB7
+92AD52E5F51A035A947110B41DAF2C3D40F45E5C7CDE09B53880B161590B706DAFD3A98436F82E
+78E7F7C0DFCB6804B719EF0AE76637C38D02F8075DC63FD48D85AA8D6598DA1D489BDA2BD9137B
+56EFB6BB37221F73DE7BBF07A1E6D4657AC56EE2BCA53565ABB572C84A0D023AC945681EEE5B8F
+56679E554B713EF277D843CD9972AFE851D7A213824FEBCAEF2F159D1D944DEFD0C7F2FF014568
+5A0F7709376FA7755FA0E9E2EAF5827E2F23A452502F0C69C51A92BF01C3CCF947B5604164CEB0
+F6519224017D8F0AC8887C6E83F0FFCBD0DAA57523D209ECDC27C6CDC6A709D384AC24FA3350F2
+72593C5FC05FCFB4F2EB0D5424B958F3E5B83D2462C8E318A994B50C1E2AE1D0FF798837C6E5C8
+23D4D6F8D34043CFB2FE9A942711982BC114D1424B7E358F297B224DDCC63AB1303DC8675F12A7
+B38838D8F3495D20AF3D452026397A002E112B8266AA76AA4C8066DF43647FB2DBF74E8D371466
+EF6C05BB4CFF36C3B46D661BD0BEDCA753CB06DF07EC3E8F2F39488A87A77B9FD0DA47787D4E84
+3905DEAC2A83FEEFAA0C2F8A18D756855B3FF02188FDA6F555140E2235281F1EB0ED0E0F6F2645
+C36A423579A7ED352738AAD1B59FDC7262326E580D3926A6BCFB733DF70FE8A55CB948B7B9CA5D
+FD3ECA598D7238033216C0384018317592F26E170859177D6EC285D368A72620105C4F64753BB3
+CCDDF78133952448DDEAF1D99D413A3192556D5ECDA605FF75ED0635D5874F3DCCA46FCBBDCC46
+B883F716B6C444D78CE26DF742A90D9C8687F4C7B939F46ACCC4D9281C21DC00A5C744CCB54CE5
+9292129F027AE072B48AB2F550C1FA4B36B990180F6EB6EF887660D516A5AD905AAAD94C7E892C
+E8017CAB4108D1FF94010662DED658C6AB7B02600F84FE7D9907DB213C91C324B2515D831F99AE
+5A1E0B8521B9FED12309EA0E6AA13D1CD9A5D6A4943A26473AA23F175349490A4F9DA795ABEE16
+B14F8BAC8A2AD6C6646AE2B482B8B2DC016AB1429DAA697CB315CB15B587A1B4927F345C778631
+99DD342D2E85C218F741AB44B821978AC869DE25347886D163A80CCCE3EBB841B7D66F9F4E1706
+FA90DC2A261ED49D69AA21E95C4F20436359877F390E26ED8E7AFD37163201BE434B89AA7144B8
+3E8977D40D873C15FCD136E711B13292C8FA0B594598ECF8DFF5A696EE868754C626281444C30D
+3167DBF9B9440AE0DB8A937EA6A11834D4726A5C21388C9ABF54DA82FFEDA5B72FA53E6704C916
+387B8EC36085F419A3AC796D4CAF4C321EC5F5BED7612F5C8410F9F4C584E762C4FD61B36965DD
+6D3C4A58F15BFDF83C565F457F56DE3F8BFDE36CFE964A70E8E05D31A6CB87B03A4A8CED980551
+5BC7F8535D23CD753CF9D1CDF90A7142045E5CEEB9D8BC2A8EE2F4B7A49CF6D6A0FFA204BB5788
+F7AC5BA57985BEFAA983150974FC1048E824D87506B7874387FED6820F0E812FA536DF5AF4D780
+449BA54D1B2A4489E0F881557200C80A7E9605F750BFC92A30A38943FF6C4D3972797C97C9327E
+7E4D974D44044794B3667CEF0871CEE807C70C8A727DD93844B4EC636AF2208B1F4F40770F4519
+7C7C3BD36B0E1662FF507E6728E86D3599549839707397E1B6E837FB56E747DE68FF8CCABC8358
+95F95178428D165AFD9E63B4F33277731469C0F3BA2CF304EF696E73347CC336F538581E4E6FD3
+87FFB3A5160704577E0116E5327AF130219ADA85AC52CDE0884F0F73576F1504A020C752F8BF83
+8BCA1C6ED0B14B381FB02CCAE42C64A8A65A82B3C9EC9D8716C086121D8A6B18F0E411BFE177CF
+B18F9B9BCD53C2ACF975A1872CFACAE3089844A8A3B6AE02ED3DE4D2077C7C3776946E2A5D0D3D
+19072DBC148498F04F23F8B17F4B294EC939F36FDE1DE681453B77F7A1BFE2D7840A32481524AB
+3186B06CFEA6D7593557AAA640618F83D8C22F3E05645C4785AEA94A736AC92BA08902FCDD0895
+EBF975371EB7DF013A59E51E333727EA160B5FCCA003E27BE7CF665F4CA4BBE7B14FC75815E053
+20DCEAC6D032D7148B9DBEA9D62724B5C52D499900207DAAADC0AE9B2CCD81B4C99B901B3488BA
+0ECC27514A730AAB58A7A60937B55BE3D29F68B5B9C776DCBF4BC713FEA091BA6083CB20C9C0B0
+18D94C10122DD4CC7C042171B2554A84FD489009B86F080526B82073D98D1D36C411386242D600
+10A5844AF91DD3C955205AB0DFC8CAA1B29C0FBDB0EEBC69815D9D3C72B525582431C700F09579
+90FEC2A06E31679795FF0B0F83AAF834AA24862F0576D306FDC27F90330EB0430548D45EF75CF1
+859BA98439583F9FCDC02DA426C98955D6246E4D5F1471C4AC4FFB1947AC9FF7FC0CA41FBF01D2
+2B828CEAC7030A6F56F8B05764489653A77159ABA4DEE42B2110A6634DA1542188D5E577021950
+694B571AC3550E3BC2CB3A802A2E830A3B5C7DB77516BFAC3A7C827D79ABD75F10B7EA5BCA52B6
+90FD19E0426D2526FC591A3454266B4E38114D0F1651DDDE0995C4CE9A6DF8FB0EF02E74535C34
+F1F563EC948231CD159E2C172A8473E7C08BC59FF3D0810C0EC0D1D9D1038E882F05C7E3A0BE1E
+F98F9DD2A60AF98C2DBF32B9F5003FE3B09BA01A7744BFA8C369B7B7F73CA6915CDEEBA1D71F84
+9DF4DA23FE0195DFB6AA471EA109D6E4D7E801AC77CFF73F4ED589D00906AA0845B84D44D78188
+9B4B5B94758F013EA141171525AE140044C8DCDB37476BFAC92628FA17723CC434C822EF307BE2
+4D72955220B4DABF37959B46AD9C52FC0F5FB3DEC72BE5F5E5F0BC1CFFC09D8DEF5CC6BC94A456
+F37AAAD9A62E705B6DD844C564B2708BD8B7FE5F3C62104B349A2D88FC10EBC1D4900A5EF6C53F
+8C18250DBC4BC51173364B6033E1E5D3543AD95EDC3A07C60273E9B052C600431F63D1E4DE0BFC
+E860537BE0537A0A2C9BC539114BDDB5A3951437D8CCF457DD1EC0B0FFB7B9AFB2405AFFE33AA8
+5F33FD06CD72B382D0A6C6DB40BEDD3A16C68DB98AE6AD82CBB60D1BC20DA932BFA4FA70333459
+A28D3B99966B9B4F2E993E8DE780B890ABEA37F7143F9702E99E1F59F8EE27AB15CCCC0515A2A4
+7DFF56DD8C39E14425FBB2B33115D7865ADB66973CD14446E5350B281CA2D855D2312D3DF5F58E
+69858CBBB058096484ED8CA8DB534EF103834B8EF33834B8179D9A6143B88B244F5F8773728405
+8D35186A83A15CDC9CB32C8A5885B5EBA4F73B81EA4128D24481870B7223A0F0F2888E77DC01B0
+2AC8337846C2A5035724031D7437FD11806260C2BE7EF64409E7A75AD047F7AEB1CE3FCBD53DEB
+0F39BA5A63B6C0EF90C9A3D21683396A250BAA37ED3C81DBDFDB2253EC0B09A188D791168222B6
+6A05F00C133F4220239F65A88112717E8B318E905BF28D58ED1849084719F1FB0176D26C56AC81
+28680D1AD07D3EFC11925DC45CB786E53F135B7DBBF610554B6D9BC0BD36226E55C23FC87351A3
+3C2416C8F2817B3CA69FB0D332CED8C0E33C6F40DBF85DEED10A7E9E2948513F3190DEE93132D5
+32045CBFF6E43DA145CDE2D561E3BA078B72F950A8017025AA5F2FCEE08AB4E79D8D17D422C978
+1656988AD6205DE69035EDBE516D7E52A8249B4FED4E5D177D87188FE3515C51B09E8DA573FC1F
+86B3193EE935CE27E52131720D8264C580AC087218262B37A194EE8589B8AB308545C2E5AE23B1
+BE4EE3BC9E99C8890CD4A17CCCEB740F766D9195DFC958BC4CEBD291D04FE691DCC4BA7DC20CB6
+2938F0AA9C4A51FA7D6E213E1B36B0E319F1E98BBDF2999C9325EAEB86069F3158C2F2E79365F2
+28BEF0D90948D07E53B9C45F826F8A8783F49CF037D4CB2C92F2F6E66C104343A8995A86E3DC0A
+A9A62577FFDECFECA2D7D27833E903FB049B91783E41D35D216DF3697FF03B51EC3ACCA17E9187
+C372377490839E490136CB3343C87D5A04AD6C137A5FCEAA91FCBECA2629C132CB2BABE3909C70
+EC55A8FF1DDA05B8B2A0D2A51BC7411B6A6F35609E6EE0C607DCC6EAF95E43E62F1042DD0DAF91
+E9ABC212D2E2A8FEEAD0D310BC8DF43202891540BF07FCA2EAD1A24BCAE5E4A617E726AC4E9215
+E01F7EA2CF768B7158110E3D16010D27B952E88A32E445743C6BF5984970D518998221CC95A47A
+9F627AF0DE14793C97C1DE55B85A062816ADADF23CEBC43916B1C966EDAA1424B23A552E51504A
+08AFBB8182E9A11124E129244B19C7BAE1CAAE2CE34906075DBF74CC87E478272541DFFFCD32E3
+C07CF960F654F674459FB136FE6D18121FED87B90DC05C2478DBD121D3A48A687DA0BF5A882A00
+1490B83ABC932CC011E458D64A6E3D2CE0F5C9B1D69BC7DE68CA0DF317362FF81BD27F6FD9961F
+93D9B11499B8ECB95428EA007A4649B16033E8D591FFC7B4CB6EE07E6F70687996A3D2E85EDC31
+C1DEEB5D84C169079C16297540CA0CBA130924AA7CB75C357B592E08E47716205CEC9A0178F54C
+928A30CDF5F2E976FF0174012508F26EED03417E397332FD806E11B486649BF17F2EE9A0B860AB
+CA44C31784DF25B56825790847CB9411B2488FBAAF03B0B0FA2CC1B0C5D320B69FF98713A878AB
+3F656AB45FC561F61D0090301FE7CA7CEEE6B76E57AB223D13AFD584384D0BB5F07E6991551E1D
+2B3C5232039377A66F1143DAF25E823774B8689729176CE54F0D53AA21E7BF6457ABDA6710D593
+247E93A5CB23C24D53EB0D6C7FD73E94BA15B6D443B10A838D34D966AEAE81B8A20895E39B8198
+D07DF85FE9D0638B27454E54D849C83E31499C75B2D2E851D5B896608361FB5623FC0FA85C2630
+298B75D3BF1D53D7762119EDACC38EFAE4126DCF29B3D71C0EFC75AA2DF1E95672B6C7D1DF74F9
+388B7CD3CB21FA46F000E330D3A556326A6F37ACDE0045C0D8D00ABE8A868FB4DDC21C3DD9C7D6
+22F0B80165CC4D84227B7AE9927C936DF7FE8F893E319C45BB9F9DC5E61D37AEDF9E522CBBB20C
+2405A137842266B48F2BEDDCB9320664BDD6679B72030E1B01B5E6979C592D649CA2DA56C019BB
+09F6E139803AC012D3293B1E4CC91E86284AA6841B6B9EAD31D672714039D73336E02389732ABD
+ABB8C147DA9CF40711405A1328EE19E0E6E1EA65DFA8921994F2BF310FB85A08F4BAA7FC59DBDD
+350006200DF27C099F2229862CA5E9C0851BE4E32D00475F258334359010D8178CA4DBEE82232C
+D21C3CF666A0EBF4BD20300C0A70016807E42D15F9EE24A194ED04B4C6AED884DC7088B6E37851
+FAFD7ADFCF7FABB0E633946B9029160F10B62613289B8C46B2B74FDD47BD4F4E7B53E96DF8F9C3
+69925508D342E15A4D0943B22365B8D8F9CB8F5D00DE6A42FCF9FF43D364C02DFD2F44F72819E6
+16B788A4DCBEC1B5F9AEBDE4F38A254B4EEA4A34DCAEA85DCB7F9F2BF47BB87E9552402C372628
+956EE58A01E86BAE1E083D7129B7837D6E57B7DE8C179BDDE6524D9F75618725026854C0B1A18F
+A662CD6324285AF65E4D1F8665F1538F2D85FF7D502B3BFD4D310A3088A8EE6780D541D9AC4687
+31A27DD7DA80FEBB6F60C27BBCA02DC98AC540CF45E3B6D52DE46B7C6E98508DDDFCB020AC5533
+12F08C2ABF27B6C34AD9F841EB78373F2F367A28EE3E21D2BCFCE4C14C34C3638978C40B136AC5
+8D747EE06E197AB07ADF3709E73833BC786917D3EC0465EE48948E397F8F7256ED4D261794B28E
+39D6D4EFFCEE6DCF0C14256DF68026BAA0D50A737E303923E6D956DF3FCE2983FF443BC1EE1595
+EC57E86E3770F73B802A152FBCF6B4394EE2DB30DABA69F0124E6A74BFED7715E469150C2553D6
+4FCB56786D334F335F4EC6836A613A261529FA85B53469585A683BB9CCADC24AC57E35BBA6B086
+F3881161327906B185E958E700A70BE82627A8F4F49DA22024BD5F6D0EF3357EAC2414615D4ED2
+130D3D8DF23C52D2B57372BAA68BF1901B863E6A36EA23094971BCE262FDD5A68B0B20F0E9FE0B
+0DAE30CA56FAD94C9CE49875A4D06E774CDC46845866BCD61122887DB85B207E28803535687E39
+028F82D9439FB6B7F34FFF1BD8E3C8E1C7DF03DFF8E3C06028405F2E6AAF97A54075B2A1EBCE61
+3A5CF7C73042D74824A04D5B2066730348B07F188A8725EAB0F076BEF25DA8B82B36B061F866A7
+BF23E609780A8CA6C1E7A52AA2DF4D5EA22E6C6491B5C4A648F37838A7B1F7BDD98840653372A0
+86A7AFD56CE2B973B5FF224E34930ADFA3071DBD339618B245AD27BAFC805BF2A49A4E296F17D9
+EB25700F8E8F0C9E8548FABB23D2CD8CEBE8621DFB66115E60630A1FAE3897FD72269B27503841
+5943D7A2B5729A5DC87E2F8EC82586D2A2979033C3189EE5CECC97C276B751E7A269047C0B4731
+9E38C8A5EFCFB0BD90C545563971F7DDFB76C28DD5D297C7907D20C7D020F04557F557AD66E51F
+9D42F796736997BC648883144CDD9EB477431AB9583C58A94FB7395E5F7CC0FF9434A97F591580
+48509B7008168B6E877CBFE14083C1CC2B197CDCD93068D035102B025D52A8AA4721E019DD02A7
+993E5C74A64CC4D422DC03210A264F7356514F13B555C373566A5D78E627065AD36C26513246E0
+01C9C15952357A8D8E7581ECC8C0A86A880C73AC519BB10C1B9720DF6501FEFDCE55CB1CDBDFAD
+42C3F2148EA35861C391478B9A8D058FA121B4A2639E7A626550F6E18920DA07940F573AA299F7
+043F3ECBFC626C16BEF92D9346946A0E7BCAC528AE264EA379732957AC35E2C7DEFB417FDFBCF4
+B29CAAF11335C1BDAC50D95C0A3F06E367FA0CC48317ACD72DAA35A76CA3A1AC2975BA3E369015
+F4AB8CAAE9B804DC42B7E19EF9B73C3EF3968B4CBF4C7097A4ADDF8359DAB1C6E2C440788F8BCF
+D272D8366C232B70D50E209E766134F0C1F1ECDEF25E05200D9E66FD6D0E6A6DF5CD1A62A4E7FB
+DB54B495CDE5DB0FDA85EDA4D628374E0E6EA451EAE67459D92AC84E38FFB5156D1FC0ED264D9C
+05319276361F5192B3FE3AC052154E2425D77666E387B88841F2AB8062F98CC11AEE58717BE867
+6C26ED1D06839FB862D2D6F14217EDFC44D3628090D4E4AE6D8D08C2925DEC62CC2DEE4CDEDA65
+F1FCB22D50D5734956692CBBAF25A518D2112F54E6D38F9C2B9CD66A38BCA0E82AAE3DDE45C3AC
+E761B9A12B135772589E425A3B4E229E0E8249069328B6A222C46DAF4F7C61FDAC1967C7AF6E13
+C38293F4A0AE3DF700E40C2DE9F8BC802686F239F7F0C7B47E0261F4BE8B5C174EE86AFB248F08
+D0CD94578867F47316170A909C05019915343C6C4CE0C994AA105F70E58E576564A4B2B08944D3
+180CEBE66BE894C842C096F92CA53E6704C916387B8E374D1B71761F3930422B0DF8A4E24785C1
+4EEE920E3C8D697279814A6D0276FECD66EDF127411A07EF9D22EBAFE7AF43C6B6122CB0B14DDC
+D3367C8AAC559AF893AE9BB73F784BB10E6657F344AD69330C24A4E3C446E86E07F5B596D2C984
+4C24CBDF51CCAEEDD4D62FF48C7D9F74C90451FC90F485F2C2F6C125556A5992BAD8C87DFFDD9A
+7C092ADC9AC2220C0ECCBABA1B4C494A4DF40CE6BC412D37D27FAFC83F9554C664B7E15B2C4F9A
+6BCE172FFDC885C8D5A6E4309D47031CC1A57D15CF30F413C700445A1180587836396ECF7A4526
+BB0ACA51F2906CE146F8C84A1B1FE2454EDEE16570D594E79B894CFC3AB160A019E507347E763A
+B6CD3ADF46393E0579BA424DD850246B872E88169EFFD26E590A192EF3535DFFD7C547F2358042
+FC5C9838B3AED01F1096BBFA3565ABFFB6F13DA0880B562662EDDBD14FE710EDBE66A3EA1FD804
+85DA5390D3F9AA7D2FC7A6CE67AD78A181BB8524B7D2243A22D936D631FD3A38B6D7EE4210E3F9
+67E536D724B5E9506F2C2F8ED984D0A76B28CEF61809EF49D7C198BFEBBB91233026504A558CD4
+7B7985A1458B14A570F2B22B196AA0E939D5F8B4439C53D8C17864376C53751328E391BA09D254
+062AA26CBA634DAFD7EAB4A20697D9D66EF59A3718FF3BCA0A69A203EE0A70CC564264EBF4567A
+71A95898634CB768E85C1C94194E6C8B0320735DFDEC860D110A9E0F0F1D0B3528B24DE5C85021
+7F28D4203F560BD19DCF145E8A28F9064C2459D4FC80AAA81AE12DE4BE12420641D1F82D60416C
+DDCFE782984955A10B576FD1A38C1652431FBEA0F6A00C43DEF505B15777DBFFCDCDECBCB846AE
+5701D4F94CBD835CEB98BED6EE73E101CC55501637EF6009357709493A3B3A1092F0AC896369FB
+EEC887B2DC9CF507920634A6A7EA49C5D06D6A73D06FCD850B49375A0C6E94CDEACFE6A345D0F0
+2220E71FD289093B0301CE9D3A00062E1B16825F6B448E2B97631BF7EFE74AFF831571DD8C6D64
+340D2D74983EF1931B0E8B1D1914DBED22638B4202E414BDC090B26BF37E9900D8691CEE82BB15
+CB2FBD7D87120DC1BCE6086E6CBF6E5ECAA3B954D5FB14F987F178A4520F6C0BD631A3C9FC2D7A
+27A87FD6466C71F99093D457B237807480A0BBF9B3E9A932F2B54DDE064DF608855B57293344B6
+EE678188C820AA974CC93CDD19C2AFADAB7109CC357CFB633C3AC6E94C377604A97143B2C46E34
+EBA624F9E8D0EE2F70730931D18EF48BC2E9D89BCCEDF440AD21BA0ABBF07F1F3AEE91C680BB30
+35E117FEA187699C643279553652859B4E4F14F108EC17C13BC4F4F0F1A4F3EB8E107070EDD80B
+654968570D10DD96E3AF3D1CE7E91880119C0C13BA19596B2762F018E4B5131C929C7B210DA2FC
+16100FCD8CDA361DCF91C9431D15CDF19EA61912DB91001A0ABE636DBB31BAEDCB65F8D40C7435
+CE8A188169F00D5CCAB0750EA37D20F18386072B5E053DD1F2C1C815E50430D084D226E108C782
+2BE4025C7B6FAFA4492D1A6B9AEC8CCBAD96398A3A028181059DC32901D9B65A4CBC970C11DEA1
+4564C832F41C5C278D97AAE899FD1581F0295EA908CDC45FBFE469730F76A665705B3FA8AC301B
+4030ADC8B08206693ECCCE509FBC9C40163949E45D2E072BBDF6EC17B56E39B49C5565C4928833
+44F507E92684C64BE24D370FD1BCD2E804FC32C5DC3C6CD2D2C8C4221820E7DBF24285E0DF7663
+A348C7A90BBECBDEF321D9128DCFD1657680C06696084A2D1782CFA4F5F0A82CC85930147ABCF2
+60BC54181A50AB12BDF5249650415A26D09AA1F55A0BADF12B760A333D3D35F15DAE68BE585605
+76DA6E572711F09192B1C50572BEA623EC86E33D2D5158516099230EF8D4A03F4AE29CFE2E419D
+ABE89C2EFF27B79A0117615961F8475F9AD70D2CA6FFD2B8CB629A2166106159095FDA78878083
+38E349CEB72069DAC742FC81267347D088CF9D76C993FE7078C8FCF3672C5688C6F6CADD6C1818
+17EDC6FA67F1D8B6E428608B667BF69C7D3B3E06E762756CD9A205102729A62BD0D065790E4814
+A2BE825BBE29467CF13439AF8DDBD712CAED51AE8023EE2EF3E82A32211C152A3B00FB59E3AD06
+169117FA059995B85827C70736E5C5B92A7A050AF586E4274E2B8EB301B1A44A78BDFB7A1CD5BD
+20419B46A7BAC72D8B76AB79F43DDCF7388CE69953B07229CB08537841753A779F8DB35058BCB7
+9FE0B92C95EF2F5BB4FF92A17CCC17C7547EE812BE02DC87A97B70A07B47F25096CF7FB28EEA95
+93332D8FD4C05499C0F0B5DC16B60486C7945A24C8F5EF24ECF26BE37DC1BD16CE08D9F96BC485
+73C1D7A8872A390A4FD5E23765845C68ED59456D66EB4BE697F454B71BF6E976BFD7C7819BDFA1
+4D8DD7F777B499773AC457902DC130544A32957E723AAF0EE83D46DC6AC1578EE03C55B89F3FDB
+AF60C8ADB5CE10DAB600BDEFB5F793B0AD8A4757A65AA493BBBBB603CFDADB0878CD83043370B5
+7F1C19E02D5EC43D7F2128C8FC9B2AEC4C8CB386DAB602969A06ED499954C0FAAA273BE17C2C70
+59895A7961C9105FECDC152A1CDE6814EBA6E3BFBA8CE110393E1046FD51A103BE194F4B9B5BF7
+12396DBA012BDCA0ED38F61394BDA8862DCD70C820D301A400B57F10F1117A4B09373E9BF4A72B
+E6204C3F56CB9661CD175F72B2351A6CAA6401CB569CE3339429015AB1C6984F518C6C0D6064D7
+A3DAF6EEF949EC633A67070D58707D6E6E01F266D3F552B77721A0D59E8DDC86F98833009D7342
+8FD37CBB0DE9C894E99662819C196E8A9FDCCE47C4A4BA1F1ED1D90DC230A540B26C218B9B30E3
+8C226A23B28823DC6D84D49A6E346CB2F7F9F71FB106A5DFB36C16CDFF1D651A9756BB3B0F00EF
+0A70D28DEC781FED5AD41784469E88ECDB870CF88CE99FF8B8C99478300A31DE8105455CD5A6B7
+6A3DBB519C87C1B61B15EF254B3848288968789C1F5D479B10AD9272FB77435766BA40AC988913
+07D8A40C14ED0B782934491ACC82A284A886D204D45F1D571AD143ACA7C7481FCADC2366F8AA14
+DE19B82574B2FD9EED7153A5B47877D3D579C74F8B91D5155AF0F34882C9E2C7EB3206B1B41209
+9E776DDD4E2E24FDAA98557E7C87347F56E1B1D6DB7861848966B6D0DD232FC2CCF89EBA52600F
+20842317BBF4F8B44AC4ACBFE0A4B777228237E52D22DE4A3B8E3AD3F864567F785750B2064EAB
+FF9657B3622E5D39F6BADFCB6903DD7DA935018CB36C69456D2C82ED6954E406942D0EE310CA34
+803309603D77BD4BA248C02FCE335BA95DEA94FF84DD80542966C5000B610A55918AC2CA86D837
+0C9C9F4B541287555D3B123A27A83545DF28C7970FBBDB7D7214C727AE687D03485EA555B4BEDE
+C4588F41F1195BA7518C66FD454A95DA6BF1444C06BFEAA75470FC5A9196568A9FC73DB2849D98
+871CE0055312847F376D7C105B95FB41AAE629BFE241E52AB913BAA5A4F675CDF2564630041627
+E2A9D8CC14489083864E8121DDF31C6BE9E0C1F28F2E43716B48B2C850A6AE4DEFE4C72B43FFBC
+7ADC307437041F908763BC8762C735AD2854FC4964B8789ED825B468FA72D2AEA6E0FB487E67B0
+8C30119ADD2C0DEDB0739870EA020C3AEFCC306B4657EF727C7B9D44E9EFA9D1E94EF45F0432A0
+1CA34DF372D1286639D3D621BBEA0A279DE17FABACF7C3700EE0AB96B91E9C65D00307AF5B7D3C
+C5FE44E749CC99745EBC1DAD4EE4FA3209A8F6B79D51BCB14D16E716E57349CC7270F7563DD891
+1F61EA3D587E0A7AB6D5F52C51CEEE500E1A5B87E4698F85872A78D268DC589EDF2359559576BE
+6DFC17ACB3AF21CCEDDE9E2EAC577921D4B664CB3A9916214F14E0EE0A5A794F52AEB2A85C1FDC
+75448F6E8B28583C84995D2353459539FDBD3A78704047A9CA4F8BFEE8FC414E6BA85F0DF1D97D
+0234DCE2ED68EE0E96ED572B66D1DAFD2DD2F0FE7BECCB4C851298FDB9F894CAD858AF4968CF9B
+001FA15AE4C7E38FE246039FD834CCEFC94652ED013AE6D4FBF4A419C4D1AEE18AD681E8CC8672
+4B9EB1C5DB13E839B218BF6B71AEF9AB230D37D8494A69705C470ACB47875C3880946546A56944
+981602AC22B37947BCD1A3614F8695DE3147383302C0F1DBD3A41DAD361381E25F51C4922922E6
+4555CA63B2F506E4C1EA7FBCD707A1C2879EE4E9EC48C0AB93FA7C1C9D9940961B6EE73BA29D48
+07CDD8CFE05AAAE724AB718B2F0F3E6C50F5F53D9BA572FC14EC63878AECDAF990A7F50EBC31A7
+163A517F11721CC862F5156A689234860BA2CFF19D6FB30E6272F8AE9925CA6BA95F543233B63F
+2EE746EDD725F5F2F51516F1DF1439F9062A1B2B3204434F2C21888D38A4FF676A6B850E3A6817
+0491F5323116EA11BE10A0490470F592044CD42AEE17491F2574DC22932E7583190E93D182FD72
+5FD6EE01A63BCB014019A690277E8E422CFA4B0A50FAE072E36F4C6F14193D544FBE216A78A3A4
+689A4C6ECB8BB149CB8F6EB6DB0029409A48CB7B454FDD796D638A7EC743A15EB5EE65DD93D6A2
+3DFDA04B8B040B856B766FEA465E7ACD05CAA8A3F13BA4D2B04AE5539D424BFA34227090FD1831
+7EAAA83528B3D40E5C108E39EB2ECFF231DA14E9903EFECE80713FDBCBAC9077344FA86D7F7732
+535A26EBD89A80649B26F247C710D725361278E7731870095AAEBCE9B9C04A73698A28CE509F9D
+A1D88E9A8CECCD0203C3A3B8DBFC56063ECB17DAE60C26A80814F71FE12B23EB15BA5743B4F9E1
+24FCDC99D47D8A449A4E7BBE7DE8CA36D946756DD0B94438EE80A6743E683B57223EC6F2062B31
+042313ECE2A8E646361EE5E278EE597D79CD16DFDC24034C0F2E03C54DDA9132B37AD93D598651
+59DDA793C2CAFC765287F7B943191B068B520CFACC134F47D454121EF1753065678760D9A6B924
+C90D7C9D432967E4DE06BC5AEE12554DBCBE36619C0865B19C9E939F286677D4649C62DC79AAB5
+24AC9B6A8CCA66C46C8EE2E5DDD4E113B8BC0E356867B001AAD992F1C85940CB2573621C9986B6
+2E830E0823FA46FB64AE9EA7A67CEBF0B8AF5D3AD6AB366E52D60B5036222DF65F5078F70236A1
+25A65BFC345F6A400A81DEECD07183FB5D10A2640F6D21D98B8C2E0650C2DDB8AD539B7719D030
+B220B91E17FF3A5FFFDEE4D66D0C4586D9E4EDD15A64393DE612A8A2087991A726CBB59176AE3B
+D48C79F0D7C884E833DAB2944995098257F300D27C4504E3ADA71F4CD9C306D82FA15C11FC7098
+1ECDB59E8DC578788317BBCABEA79DA888290734DCEB8E5ED8F7D51C64104281EE00D95077D4A5
+8CE902A8D3DB6297CFBAB9B4E0EF77DB323E34A52B1A938CE951A1989640EA4935A471D10749EF
+728947386DA5EAA9BE0117E40CFCD805ADC01EF3B152819BCD332DFE5FACE16C23669371E61081
+94783614CD46A6885E543C00355B1B81AC917D05325FD395BF6195876D4F46CF739D7482657607
+C7AE98C7DE6D397F6055DF67F1884836E2D685C8064D834A7718EB41A843D994E070D5488E2842
+3A30068CDF01F84A34EA2C47A4341FA98C9011FAEE51CBD98DAB25C98B78C0957A0FFD022BCC97
+641F858DC445715AB461116AE956953F2048FB1A990D7752D3EF1CB67697583681F96B385FD870
+3CE35EEE611E80DFB0A992F87BEB5B724EAB130B2553F4B0599E795C4743AB312460B65CD53DFC
+648E853C032F0A9D760F241F6174710CD1602CD78DC405316B0DA43D5E2D4EADA1E3688F32C6B9
+4F02EE29ED79848C459891187432957A0F428D256E015E86C12E68696AFA4D890FB842254822E0
+79AA320BC1BD480C0A2F276D833FB3C9D8746B52EEF4D0DC0B63D01F61F9512C0DF6E911A4125A
+CEAEF49AC488F1A395843F760DF01838339AC5B53E760EBE256A04F092CCEBAFD9218ADD4169E1
+82D2F20753200859A776B236E6E5400C4255E7CDD22D1D6135480E16592FB680142E5ABB09BC0D
+7B643BBE0888EE5D5A0008815748B2356E717813AB3AEB20A58C291C4559083EA547E6BDA07521
+342AE1D489F0EC7E9AB4A24AA98CC448AF3A198910E46CF829CB35182DB53CC04EA000E05F44BB
+495A679736E1D3AD78859C18A9C82E9B6DA96ADF439DAC12269DE2B745841525C5B39DEF3FF4DE
+405C7FFA30C29BF9EA979B9741DD9C0720C25BE42DFF13BAD91327D15FCF90E7588201B64C2E73
+DE8138737F1B4740B3C54B78FB4580815C5D47AB1870A548DBC20D118F8A8A7EFA5D5383D7069F
+E0A3F7EDE43AF1E411F3E419F18F347ED5153D9B8AB2EB584DF2A8747060145C074CC2D308FEFB
+B63841EAFE56C905B4A4B13A9FE80E9CBDE42DFCEE6A3F5BC986C2C740401B450939A6EC44E58C
+CBA7955B7A29ED3DD28C7D63FBB04F8FC825A60C6399DA762D045C5182F240A8EE7AF4F4040390
+9942C8F533B3BC5C763B0DC95A834D1E5EF0F90BAD07EC07380E75A95F57B8C1C46A28ED6A455A
+3CDB05C56981DA10068EB0BD9EEF0B3B31A76F660E9D340D377B3D8B6068A7228F7386D8F0D410
+3701DDFCE5F678CBF6E70FDAABAF86B95E2A731487DF06B4D011E38120BECD6B8C9DAE22C98C39
+1FF8D019FAC578069F6F9EAEEBDDC67AABD4126764D16B89E4F8A99C93A961B93122A4D9B389AE
+1C664C3388E1E7F9071321F5A22D91802B5B96BB89AB7D0D853248B01EB77E52B26463AD317F78
+47C62881F21D2578CBB2855AA02A50BEF5579D09AAECAF59835E9E949245A1CF53983E67CD5F7F
+CA5DBA5F4BA741E7E49C406522C380A50A3633342042EC32F80CDCFD725C9072B271AC83722F73
+4B3A98F7C516C7CDA806A1FAF97CE46210C4153A844A352791E6AE594619F51C656CF07B783D61
+64BFFED8809A1E502A533CA3C12727FFF4852C098D1C2F0F925B3A029EFB6FFF80DAB8DCF7C9CA
+FA5F7D958A8504DBE2E7A2C3F261D736CD4894FE0009C6C24BC7F7A9EFD12E6AEB4D1A60AD6257
+4B8F8B7C54954ED1CAE95511F16886E5109A9933D84FF266EC4D94DA89619C82D376A63507CF4E
+233BC70BE0D660B6EB472F4EB6B8D85C96108C5D02D0D39A6D02429D60D010E1C13A81E1AB0012
+9FDDB1C0900EAD7845B30B1CC795520A343E0FAB8BCE4D9F642EC7F51846F5FF3B87EEC40423E1
+A91931FDF73BAFDF383E55B255566679979F37E256D606121F0C3116BEE00897A7C1C2980C785E
+A37E05F2E3070181F17D8DF9C1040221970F628202ADFBCEA6CCECDA61637E40ABAD6B0F639C21
+735298F35EABD37FAD3126247309EF9570AA4D7F2AFF959894C089D77878EB5D3705F8FCB748AC
+00CD77535B672FFD36E162D85370139C0F8E7645A665C1D23C6C45C0CA06A89F2CF2F23C27A5FD
+070F575439A5FF88D9235DF579D854962E025C347077256A5F4DD3C5FAE10A5C2801F93C08E022
+9600CE5CB001CBF71E813E116C56147304976CC25801BC0239EE6D12AF2D2A10E728A4BEC249E0
+BE5342272F6A508264226CA8479BD946E2BED405379D0748D4A707E0EFF6175D5E57117A04FD98
+C03405381AF44333FD7346DD7D46F71CF5AA1A87205EEF8D7B1CCE971F9BDDA467629BE1556CA4
+FE479DD77380F22E93685C12D641EC3227FA98C90D9265D7504B7CDB3CCD092F4AE0487E89CA75
+DC017DAF9C9C94778FDFC7CF2419D317AEF2D70857E527A5F49FA26FF3EE577A0A44EF541C7D64
+062F7DF3EFBBD0FD7BA63F5D4F1FFF4013F149215521F5E91092553F2973E0BE1AFF6B5876EE61
+3A081917A4198292455DF7A337954234E2A441275E5F4A47EB19B3362778BA70878847F478E341
+BE09257DD9823BB058512D588FA8266911C5846EA5AFC886549538721E4775EEB8354F64E20DAD
+4B9129C6E9370241408BA4AE1E09059A0F2C5E4443FAFFC762D2ED2CAC9F6EC244666212178440
+A2D3074A8B5DCBD810FAC51627A81FC9D40FC32581CC1BA438B50865050765EAAE1F1E99C1D89A
+A6CD3838A5459FBF8DEA20C9531801C037D5288F6CE19AB8073B5951D7699D3D3C7F937B5B521A
+35AE12791102871A0C27AAEF9631192182A5C40B9C83959A96207802DEE92611FF3778664DB1AD
+D309BFAF5EBAAE4B8A4FF008C0BE42F1151E9D1F460CCF018C42703E1A2836CCDABF26B4744DEF
+9E111C4FB81FE89B4B9BC15E2880857EB34B21952C55F8C62E8254EC300FCE1CD5D46657B902A1
+D81ACDAE92E4CCDBE4C39DF747BF9CF8B1CFA3314C453FDE23F52E3AB1AFD66AFE12F6DD53FC5A
+F236F1228EEC9DC8C8ADE81733D6BFABA66989EDC6762475F0E70228009D1301DD5AC6583BE108
+37D90EC1D0E4C543DDA6645969FF34C7BA21DF2AD3B9527EB104B70498EE9E61FFFB2FB3843404
+F8DC322C8946359464AC057370C76A90ED3C0254D38EFB516B8B99E1560857EBB5CB88566AD269
+56652F1D334F01FC8F018546A7F49FD17103BB5EF2A6A3B6C26F9CEBFFC7419D71F62AA5B222F9
+93EB5A227C73E310A3F34C19A3F7CE9A10536DE50BD81C4118222C163D0CEB8A16DF6B4EBF2B06
+840DED08106F28DF93E33AC2C4075B43723690F9C890D4F91CF5AC874B4CA7BCE2F2962E532526
+F4DAB744F83CF905AA4377BE6F05758EB44612BCBD52A5692B60BDE10586A1113005D915A74DFB
+5E419210B2E5A86E5814ED34D5DAED6EEC3802851169615B6A2744A5BCBA5B67E933FE2D3D7398
+056D7A316A4C7D0A7790405C7A3D0517E174831AA7983A87FBB4C5D24F2DFFBF8577A8B30A209B
+27466732F600B60FF503AE5BCEF08B29A9715EDD7EBC3DA4E15218B76D8FD60664B61E2B682B1F
+56CE4B5B13AC1B0EA4EDD6AD77244AB166ACC23B103790FCF32F41B7C1E15D786A85BD3B81A44D
+3774387CFBD41B43B4678AF42174ED76B9C70F4BC183D01C525ECA7560A7DC12E0804F8A6FCE05
+760361B90A156915EFB95CFC55AD4DF99D77A6537686A2A60D9F926DD9BA3FBD8B651D5B69BFD5
+ABED7D2C8B32539D75134615761FAF783A6EE4C31B47204808C9156A6EC2D70049DB35A7207447
+B346DA2435DBF46AF7B24C6E4BE1B75B30E5F68683A03052B05BB2DD75A5127CEC4FE11284F03C
+A9C4102A9BB0130EB99933A7479DB597960640A3EB90BF0EDF89D93A8B73921E9E7C4F782EDFB0
+7233772D2343D90E1E581FF20F5181C67E050A14AE40EFAA16FCD62FD9AAD419E301D6893E2291
+8BBA31345A9D947208EA23924B9257EE753A7104E41EA10D72B6E72E507053AE35BC20AE5F369E
+B0D780E537406780A55AE7C113A81F4E1008FAF276F598E276399B4DF11AFE51CF8D22A35B1BCD
+247DA70377CBF7A96E8DCEC19658F88D6A214D3FAD356BADC650A41B36F12B11EC9B149FB6A491
+10DEF203B8F8672FCBA317974F17EBAF2C81CB398A06B62F635EE010E194A38ED4AB30C7E7079C
+AD51EFBA8E069B811A35B459B3537D6801D747BFDEC5F89F465FD296CE396F8944922D5F82A12A
+ADFAE34B6D723828C8A30292E9E8AD8FB8D97ADBD9AB22E5E45523BDFF4C1723688163BC7ECDDF
+44052B696167C0ACA1B4A81135E0B837ACCD22DABB5DFE46765ED4BC0556B7FB27239812FD3089
+FA483EAE60C10CE6D3B8FB0AE33F07022F96E1B95DC818C67AEDA1D41BE11712548D0568A062B5
+26A4569B9BB5F6EAEC2D176F924ABFC9978E3AFC427EB2BA46C768F83E86F3B8178704E6AF4AD2
+EA4DF47E8989F327D85812790EA888CDC920D15B80E51F7CFC44A1189127D2C9468D50231CA805
+03DF2C2007EF27DA9C498C778F3837735EE5EDAC47F4A01C2A391BE023004156652349F062B1EB
+504E5ABC82282A423E47342002009770D646EA50F933F0BC5E6143FA4B1733DFC6DF6ED7DE6DD4
+FB8388C7CA81C9210EA0A98B0275B74A0E0F510C90DF71C93B3A9FDB6A86DFF2921382352C8FEE
+1A0A2E6003B005465C1F31B667F5BDD9ACE74531D0FDD56CEABBBF5E0A55633E28F750A7C2571D
+27FCBE1B01C387F6F36D225A30C68BD185843F487C2E98B5629A6287CBAF2267880B2F48596320
+D7A1EC87DCE5C5283E034AF582F592B7E0B185209AB07480A98E676603F7F92F96F9AE6EBE80A9
+5E625EF7F4B469458B2A7DAA4B8FAE9103652663F353C35F88FFFEC41296809D52104E1D629998
+735E1CA4D36442BB8BD6C02EE6E27374B25CBAE97051FDE7E3EB81EA7F6D8CBDDA45F29232456D
+C1C70B60869D63A509E9AA33DD00187BED5AA122AC8ACAE5B5A02C85A4C0B68193B2F4355EA779
+DF44F488272E92297DF1C8E7FAECC4EFB031E0232EC032F1ECD4F6C37B6707A28F1CF9A2683FC8
+3B9725F1948D020931065CB521B34934D2CEFE9458A1CC7EC5528A183F270AAC08CE8184B90482
+6221CBCA4DAFDCE880D391D6C4D8289BB45ECC73C94DEBAABBCFD529ED9B5FE55E5D6A48EB0969
+EA03E15B8D7DA8D54CB15E0370C8E39CB80158C6B7D40C2951D73345BF3D82E49C976A0E918B10
+1C22FFD551C685A3C7AD17DC9915A80815EB114550E9BADFAC2EAD17C29D0C834871CD88563F9C
+C2CD8B190D02EE346A82C537DF2999722584A95845BB367E4F7D675FD067DC42FED595473C9B55
+1911A54B14DD130BC7CAD78C469DBA966096FA69FB9027C1542B8B95BDA4FC22683DAF22C8EBA8
+E358929EAE6C198C7F9730C5D3BAD63196515C4BEAAD27C26844398BD64D750BB06A240397BC91
+492ACE0DA7F6050BBB15740DCBBFC2DC67CC740AE8EE915192715BD472A45BBF33AA5E3E93FE6F
+6C39E09D8EF3068D3E7D2BE768632B6C2F1F2B0F08844C5BD7AF2EFA6CED285646750F70EA819B
+18B0371B3DF7BC4DA2B90E8FFB9E3DC066B9ECDF01A02BDBD882AB88EFD7FCF2467D4B8CC32024
+1FD68C6C9742C5E250BA662A856DA7194C0ADE36BDFB36562C29132DED3BAA0A87A761669CE3B2
+56E11A6CC42BDC6F0AE09F87C0D7FE688EF8948F69210ACB148A93F59FC2EF5B21B8E81B71D185
+D37E0CF36B2F33BBD77CD36047E9988704B0629FCAA318000ADFC4B370FA5B218A161AE7A8D99B
+88907029BC83134CE9F92B21735BA15F0FE547EA79F5B2D8CC96D10E1B0373A13ED18500EEF460
+DDF2CAECB0F44A4F88A6090D660E879ACC03FD85B4909082DDFB7C90428E2A9FE8B60377DD1ECA
+3D0885C5400473CF212DFC2EF3099C73A37B3886DA8C139FBEFF84911687D1DA963D0E9690BEE3
+F191A5E1F7B9D3FEB0A497ACACE68D42660D94CEA5825A19B65C1A394CAAEB68BED5B886F94D70
+8407C6DFE818448A49AC3A9BE10C8991BFA5DA3C94BF608FECCC0606BF6AA0F1ED1AEFEEADF0A4
+D5226523C4C6A77F0FC9A6C7318826AB8FA286324228ABCD26D1DF2FFF1650BD71879AE5D92337
+EB6EABF9A599308899752219FF8C97CA72C11246DD111F348646F23A62980F6445DCCFE035AA4C
+5B2E973A787EF8EDA260BF8298794B76FEF7F6CF79DCA923F9ADC2B0524D9A2D4D4269EA709C39
+5D75E3F23F92FFDCF7E8BF8691D52DF133297E4AEB9B1668AC097409428411C7887427DE9C03AC
+1F229BB983325258E3D36E93D300F3A31E1B4861A1A31D61731359044FB1076E98C2CAF24C77D2
+459356156E1D9570D9B7F8ED30E14C95D8638AF5410EAE34C41A35E552802248DA923BEAA153B1
+4E62735BD5E09E23E5616F10F5B66FE1D238EA59E293F0459043E42538E17AEC76BB09C4A6353C
+30E4B756A89E40B9D9CA6FE1D40566769CC6FE3B14428997ED4A24B23961EF21A61D879A2967DA
+CFF909180F52604AF8C4BD47F6A9474C42A752861E832B7B93161BC1224B8673A53BDC7F663BCC
+DC71A9ACAA594486607C180C30384881C324554357685C149A0D96AF6A37E4E3D20D5021F11238
+1D4CB1F8674035071FC634638076C2480B0EACD306A62FD22EA859903F2F30F1F99C87F3245DFE
+A4AB5141D280C5EEAE69F44D47D359A011A1D01FE8BEAF3B43478F8B47A4F37508861A2DDD7708
+B9D4742B6FFA156B64EBC0CD8FF5624FB80902DCE59B7806A43C862006869D0CFCA3EB13473952
+492CFDADE1E458A55DB078B1EF58DC5D6C303EAAA415F43DE9F19A508147FABFFBFAB69862E527
+19523DF01BDF22CA779D587055D37539BBF8D8BD6853E4E699E65F7EC6E5D096601D09340BD116
+38544A45AD6E58663A1C495DCC1FA79C8351D69D298B498382AE4725F18F86F315C588BED8BFCC
+6655CF2E4ABB439281D199994BF21E47A2E84DBE37D3637DB32E961B5C40BEDB345C82197D324C
+350BC344F2EF90E6B496BDBC1BB4A359B70633B0A35076FB86BE1343CBD39E6DD77671AF671CF4
+364C1CD9BC7BC151FC0FEDB137911CA590F377B35990099AF3756C1FF218656D1769B2E5ADE7F7
+571E7132CFBEFB6F0BCD9F4164C33738CA62934E138EE5A5FA5E81C3C1E04D1C1ACCAEAD8D15AC
+4FCBB0FFEBE577342272A8BE5FDE606830C0289ADC41418C7282B0CB5234D8B75D668823A32B73
+E140228E8E803115DF38D1D6213718BFBFCB22B0405108A5C8BD3009D60BFEED1B15E7A5D21F11
+98F091E11B839C2BA809A22652F57B3007DEE6827AC22A96556394CF9051B91B1CC42A20EAFB8A
+2D3F95B7090DA79AA3F4342045EDE247AC63D8D8006FE4C2A617C9B0AEBF2753042473762E5050
+20627409AE8F975E0547C07D414105ABFEE496985C3423E1F3AC71076FAAD97783CA4250951AB3
+379B4562F2A7744F41FC40E045A796A3C756981D7F35A38B6A57C12B8F8772EF0753591C65F632
+729732EFE7F053C27A4DAC9907FEBA0403CE8A902F71A278DE9A5616463256914C1BD117A66B8D
+62928A00B7FBB66E33299D673B682BDB6A30790C2A2DD06F3D82E19CF49C1B9C676A4413CD4E70
+718F92FC0089A7257268F75CB3E53F8D4781C37E8D5E37D2C919C619A33B4C7141CA7107D1DAC7
+69016355C89C1DF2DB782723B71357CC0AF674F0F36E18485088AD08B8B995D5A9CDFD5070CEFE
+37424C2909A38BD66DBE6440396D02DC2980F1C013E9C2C161F927C7B803B34EB7C57FB2349FB2
+788515885B7B2E5BCC7001A108FBD473F34810C2774E5493501FA2882BA5985EA9AE84AD076807
+AEFEFC8081AC8B99F8837197EEBD2D734EF78086F020091F44045823CF70462A856C5921583DB6
+B209473494E78D1D81F285B850052B1784373DB62FA6CE8EDFB70EACE4C2A01CCA9BB86EC61E54
+5E4399466233F7714392F53EAF823788E7F475E066E718A3A54A81805058B31244739B9E3D5BAE
+D896901D9F014FF62728847AB719AD2CA332D98F99532D7A93C7030271F5BA5230095BEE8106A7
+D33D16D2D3BD76064AD26431922B7CF433BCF3AF02C53C59D39872478227E645828F2FF1C4B3B5
+9BED9F8061C74F79348AD639C4F3A67E27FF99959B909E3ADDDF985B719359F803938798E36DE5
+655448E65472CCE2D6A7537A5F855A5046C5D7C64D77F636E318592B3040981110E664FABB5FEE
+B9B14C48D74E7A4582274D3BE07E8D67C2F294D2591796A2880C3253060BA26AFF00C503D614DF
+72BF8B91E80E722C5F4F7496A17AD6B5357DE01C5AC8136A3F4B7F722D08EAFB3419CB76638A29
+BDF242BC6ED4FB7127D76F51B8E77850C77A3D9FFD94E814DD072C6AAE901F1CB99961E79324D4
+AD0D97CE00F7A4CDCCBFD7D5A9A82270B2FC7E88757747FEAFE917ACC9C07507F2C87530465B2F
+7BE3B62047F11EEB0FE7513C9A7ECBAEFDB678F295CBF7B55CDD07FDC11A9764A31C1A77887D3C
+F9C13DF7D987E725C4BD1E7F80A8438F54FC3668E2CCAE42A58A08354825BB87BD1424A1919973
+3B49B6A3A5467B3A99F70B63ED38549168DD5FEF0A6620BD5B8050968377C7ECC4DF6A43C852C5
+72339C0E54F99547240AAF9487B748CA87AB2278B162291991556DFDCB595C28DB05D6D5510824
+9613DCAD7144A1EC6DA259E16FDACE7122CE1A171FA0346A9155B25DCA8E6BA7300451891DC21C
+7DB92E3AD2183BB4DDA70C669F1F55FCC191B59823B017E55D15E9C0EB799BBADBB8935AD90CBD
+FBA156CB503A2333A4EBA92CA2DCE92C5B687A4E43F73BB7F09B62FA6BE7E1495318CE4E7BA343
+D08A7CB53E32B05F63D836D8B5629651AA4C2DC68AF2E13F49276450F66B56C1EF299604CF0933
+4C7B154C923D4107D055AC7EF0F28478FD06C54F663B170DD58A41F293904EC7AAF6C8E4DFDCC3
+7B08702BBD8FFB33B007044ACEE7ACE3464D5433A53AFB6B7EE754CED830A1C540EB5778C227C4
+5CC7BFB94850544DE6C0D1960874574284B1D0256BFB7E5483FDEDAF31ACF7822A2B9DD27EA1A2
+BA891D72C9AE28F074211D528758C6E168FBBB1274199289ACA037D1A641ADED7F300A4B27C954
+63BEF8A9BD49D496300655C1ACB70A2A3FF89E065BE79F5F292EC6F6BD6F8987B7A8E2F6642E91
+18ABAB71DC705981C30C51C7FE6A10828A8EFEFC43EFCBB6BCC5A8492E0169F03492968D7F0EA1
+C4339519EE36A1E91034670A85B193F5DB6037C59B5E46183FFE468BDCB794918BBC8AEB2BA715
+0908DA0B63653C0BDCCF80BB64F36D0E5E8D4685B80CFC7E3E6F4DA4FDD4BB8CA8DE4ABF16503B
+D9F6C3C3B6F8F9CB292C9DAEFCC68EFAB16388AFF922B32B5257B033C9D8FC078AD296D49CB8A3
+3A32AF01FC192BA792C3A15E6C5B7A4AFB1C2FB00DF18076229550ADD4A991037C5D91B7CFD4A3
+5D08E8FA85D16CC2C48F3F32BA894CCBA2C6A3F964BDCB8BC4FB9226C7F8899900C267C70E3ED3
+C0797FD7377D3044D43C0E8172BB0FB746A706296D70CD23A5CE25885158C83FA2C9F10AC1E0BD
+8C88DD6D581289CE14AA88B102A47D4E52546EC6FFE7E8450AFE3F01706B2E3AFDDCCE4DAAB431
+5638E28FA4668458CAB2466768C1F3F8881CEA9E9A7ED57AE7AFB53DC590E601AD11ECA0E5CB2E
+4BEA895F6271B875D09EDB9D5B8D92647B67954824F0AD4DF1CC9E82F97DB638BB17322EA26C6E
+C4A5E02433D11B6A37D2AC10DA6D1035B23F1C6C80B7C382F1EFAC4622C040D108EEE91C397CAC
+E1EDC761C1EBDAFFCD6127B48621E666A5A5C33A3BD4F559C7C2CA7FF3C4BDDB288A3043E09441
+D35CB54F1218FFC4097D1FA60911189496A16B40D34EDA64A9225EF00B875885127D2A441DECEC
+B2BF6F14F6A3815A780A4DFCB6227C7355B377EA61F928E94486CDC0D42EE92494D5063ABE2DCD
+4D29E8967835BE5894D38F09399E70418D21DBD8AC679367EA9DEFA70BAF625F94F56CCD1DA6DE
+ACF583E9763BCD0EBCD9EE5810CD9330FEAF5FE60BE3AF8A15A1D58CA2A9B0785BC09ABC53F86A
+66CCBD8815F3F8B9B18396B045DE3B4A00D59D47F52B52DE7A52AB26F5DDA05E3B9751EE11A6F7
+926654FC7F909EBB7423295385044B8C44A2032031D462049FFD77CA8F31787268F64FDF00397A
+A89494308AD9EF15DCEF55BA0C5AC4E4435A52D2225BFEB438C9230CC6912DB18FCD0A6D7D4C89
+BB6B69974B0CDC28D0974C94C05A611EECE866140A00F4BF9828C5363D9A6FA8FC974368370378
+2EEC189B4AB960A8BA75EF432D7F7B8051B2D012FF76F1A55BABA16DB9EE5C9BDD57DA9A87ACD1
+D1872EB5677A14CC20F83739D95AAD0B3F26506976B1C822AA8CB4A96960220CB2453DFBB6EE67
+67FC6C154EA927FA01E697D2FDE73F9840043480A584337E7F466F5248570841A7344A37232CBB
+F088ECBBBA9ADA89A8B8D00EA7AD8FA02A4F79AF21FB8FC487528E3F7B31F11C3F2646FD78155B
+FB10245978554D8C95BA599252815A4995A507026348758626CA386F31748F70C2DF1482B6C987
+5CB7546B3B1B756F3169EA3589A1D0A543FB165795234464243A6DE12AFA76D577EA55A4B764D0
+21BBB4F203ED66A4FEC3B51333A57776A2127DFC59EE28229200C9B93A1FD1E84B9D5BA8A22FC0
+24C844FF8351256EBDA28CD78C9DC782E5BB85D188B4FAE6A427C251BE2C794D8C77CA39296039
+9EBC8BE84DB9C78319BD38A441158A999A74B04C4C5246D6982EF7DCF8D8ADB304A8511267FFAC
+C1ABE46C9EE1CBCAD63665AC606CAC7D56E9BC3609B3EF72176B49B63C90A0130CD183B90A6A40
+796E4CB9091BBA0FFC8D0F8CF2B016800B1B439B5DB6FEA0C399F8C1A22B1896E0487A08476F65
+F505717AE2BCA312EC891BAF95B43F49C5F71C3BF4A8B3E0E37D93A70D06C2FBBBDD77E7A0637E
+BBDA27C27C539EA3AD7936E4544583DCCFBFAF737A61557B0FED52471B5A5733A1558C9B53FD57
+D361306945A6150D1C0FC5EDF521F17F4D724348D5EFB86E8FA808D2CF01977B431D3E9F4E8A3C
+CB1CCB4B1750CA2936A362A610B05C73E382D76118024E58ED512B212B1DABEECDA7196C75BDEF
+3049455278956F60FA00D450729CCD0F01B4A63AD30D92B0C14C158B183647B655AEDEA612CFA0
+BE89F79C22F1F2D6AAB20CC382355B1159D16B7C29EDBF06E6831B395EA7A4102C99E400F911A3
+F306589C5DE6C3FCCD402B4E25E85C65B301C396ADA09D6A4577F38D21EEA6FBA8D50B5FC31C95
+740A9A7446B9FCB5D37ADC301000AABC7D8EA8DD59A63DA0FA8F7038BB1D9B2948635424C80BD1
+CAFCB11FBB85497BC4C3BCAE2A24B9373CBD005681835D6FA7798A45FB01C51DB842B6D4737901
+8349AE7D8C5A4805028B1DB4F634869A3BCA06029E8BEA02832397627DDFE8BAA44B05D5EB55B9
+2655A387E3407308E34AD2038C78037995339E047D9310B8EEA85FE275636D6C5C19586701FA21
+EBB7434A4915CA71BB0E833C16712BC63DE98B5209B0A730180C5D6012FA81EAE001E1C1E14D80
+34CE642A31EFA12B3A15EA53BD89C492CD6670538B7BFDCC629ACBFCAEE4FC4CEA070CCFCB7560
+B4F933E3D9D259F70CC3697901929A1F1605EE8A0E01EE85D4FFFB167DE6D916F2630DEB8CF317
+F494C4CAC3EE73BE392EF96FBD232E4A776022EE04146552F0E1D66B4BC14302986FCEF76F1B7E
+196753A2B4BCA87F804896B7392FF8E5183448899617F020386E688E7E26286CE5D060B00B485D
+ED264D191A5B528A4E516832640354C31D61EC4F7FA70125B5C6349FDE30694E9504C0A080D252
+B922305874F39354A0FC1A196021E29C516D62A783AC2594C28F69F6803314F6745AE6685E381B
+FAF83F14B8464D7DA4198BE48E76011BE6B3171EAD370CA699E7076071B2FF1856F6BDC61F3F01
+034ADDDDF56CC4914AD74282859C632B9B14293CDBBD9FF8FD4403CFDB761D3CBEFF84391E3D5A
+06B5D932DEF0861EBE6DD885C9C31DA765FCF358847333C966FD39E5000E9835A35F3BA93FA20C
+4C459A8F4DAEDE2C99EFBA13EC0B82AB546CFDF7A97879642D97F69C21737B22283B636494C9EA
+129A161BD8C9DD565BFB2A35503B5BF8A95AA69627E2A1BBBBF5BBEAA74A58CCB11F7CFA420B5D
+70B3E392D54A52FE59EC9A3017BD2D83B4E90E24D9FCC6D816E975544B96BB1F4443CDB81918A7
+7FDDAB25D9BF72D20DE17689121EC5757BB18324AC0D5F324DBD89B72F2271FA362BC8CCACFECD
+CC25331BE8AB8FED46A6E691F3AA6B0701F582CA8753F648828CD3FAB6E43CC92A924F245FC608
+350F82CAFF77EC9E2E24F985436ECA4AD84EB24435A5C4B330198B23E825D1ECC7DC5582886E90
+D2EA7CBAC9037B11B156ADB8110B6FB795BFC6D397B39FF79D8FBBD42A00C6020C63B011CDE2DF
+269F4754E89CF3F18F2B9DEBE3850A86AAC0F5006B528CE30BFF055110D8AFA688BA3B9F0D24AE
+50143F09D6EE6926BFA2E460B5B3C486F3810C5CF68F67FE2A9DD7FE9B39BDBB24D6E59D12108C
+5016007BB9FC22791622C044132BE6BB8F7F9C278C755DEF004E310EACD8F39933A6DF56BEBC5F
+B72B4DC33EB255B645CEDFEDB900B6E8B1FAA4ED152222A3E6FEA8D8BFC7C477EF8D7557B70E48
+693F8C0DCD118EF544E782C23DD3AA3D66C90851AC05B5818831E3AAF1C4DE9529275DFACAF48A
+2A87BEBCF4EE948415341227461D8627D2187CC9184DD3343F554DEBB268B65AD8314996BCAD55
+F75B5983F62EFDF10C580AE478B6C3C92595490A9E3AF8D279246AFFFCA3F3F7E79FEDCB652CFC
+57CC31B89E18AA6C5F839DDC3ECCEA0264794CA316EEE24A93A25E2DD12F0115B6CB650227FB26
+30AF4CF55F7AE4701310E11636A39C9FD1D3436524C57AAF409D24276DCC0A5CBE47EAE624D814
+A3A094C5C960C3566778E850BA04CCB58E5016CBE399A201B788A448F9969CB1C89EBD958AD83E
+4E9E2001D5A7120E73DF0D722AA3DC1CD06F11B2F8E911B794E50B50FAA29B49AE01B5C361F08E
+27BFF8DBC16F4E4EC034B3AB15F06C08C9EF4B5B054327BB3A5D25E41F3EDD53E2FF4EF38413EC
+F5E693225C255A9E1F4060B1FFF8E38357D06549C517F458B62A8E123985988726DB8DE3C9DB37
+8480DF0D731B1009516437512F2C7F898628330B0B2B2960CF815AAD9171E8097C933EAFCA026B
+1EDA2FD5E1E5FEA1CD7604124234CD04F50AB59DBFF1318423E4FA6FCC6B7E91E4FBDA149404ED
+E8E13993F65F12ED80B63FB137717990F4502A61C00DABD9345E94F043133ABEE22D2B7FF0DF21
+C4195C3E2F7ABD639941E47882470A6CAAD0B4A8C96B4E4E1DB918B8A926AB40E1859D719FD381
+FDA3F1490076EAF5D17311CBB59A26D198CF036B5D6A551664E2C206C910F8A7369183BB95329C
+097A7DCB992507F479CF546D645D52F2BBB452EBCAB40FD4109464D160B97ACAF226DF763FB024
+9AC97B71F735CBFA56D2E6ACD7710CE9BC2189FE53F5BB41C58C0FF1A1C5442FDC76D21E6273F4
+1896D7394CEA6C7500950AB85FAC5C8D4CF1766680A0CFA243A00B7DE2D180DCD1417CF25D7A30
+5A1B17534FD1D8595FE704A36B402F868E534FE7CACAD039E13CFF4CE59D382C107FB9DD98623A
+0FC04F9337010031AA47B7938F111335EB68AFCC86E477D5E76A1E4758C7319938944850E71333
+0F20E9A9DF969173018CFF594871676420136BB1A3E0CC89C2327F68B0A487D95463D183ECCF07
+4BA6870EA9332FF8B264AA779650A00A04CD5D443CA09453DC961D3193BD222D1F80BA0B9C4162
+D20CB801B1D6E8DD3D97CF05B841BAB3DF22DDBB06DD6A682C6A1E3CE595A28CAAD9840757EC6F
+8BE66D6B9CA3F6EDD5BEB6324873C0EC7B8B108731F3E6BC6588D69E4C7573D47BBDD93D03E050
+076B9A0EEBD7C020BDC64127AB58424291B1BC70A9F3D326C67D93AD24F67CE9AE6BDC829D7DD1
+61EF3C1A47991F54A807C08AE0AF24D6B952E66CB8E9196EA00F3AFDCB1413A33763E24109759B
+CDB59C2257C2864C458719BE17D929911C7FD72148815791A12EC2D2A3DD6407330CE0B4DFC3A2
+440FF0D6974B92B81FBF04B0FC4E4429B009C388FA8FDEA029AAD70151F5BF76B13933D3F55B5A
+C00DFDCEA91ADC73D3DCEF29EC261E07B96421E64865FDE1F8EFB7B5AB1273D5C2BD5261ACEADD
+7851504D19A91F295D664B440AA61636B62D02A341CEF145920C396C42244CF13EBB21D4BC85D9
+95A57563CBA0D4D046AC0B0D1B40D1BCDB26E5AB86A1720005504BE3D73EE22018F3642B1D8CF6
+4596A15ABA888916E9F12BCB15EB823337DE90015FFF5D1B87DE84495F696BA7E1704B428133DB
+54916A4BB7E31BF36CC74AC1B1C1AACC176E44B45CE6864EBF724D28819CA80FCD1BCAC9C6E92C
+E62D304E2D18A3C882074DEAFEDF1C55104F629481E6E42EE45072BBAB3074EB5AA1D4958BFFB6
+E541FC1849E6F5402165F5C4F750F72CFD90BA03CCED7C5014745B0F9642E271FBF6645AF430D0
+E92984BB4F96C993E3186C0D8C2897B692C0A0D198FF9E44C648FC2723F8D8A547F7ED08E89E02
+C00D26A50BC8A1C714BDE534580176C7F5D3153514FCA23C2D9CF3B6EFF7CF683712BB7AB3C7D2
+A3E66427ED0B625C088A2A57EEAA2C467FAF0AC5728495451ACA08AE5506F5410411D2B0912D3A
+F6A391FC7A4D7108C1B2FF0D1F9D09C2396CA85ECB4885B386F5FF5061AB78D9D915B2D3AA05CC
+192CE2751B8E1C99B043B24950F25D58BE9377DC1B9198C5DFB5FD6A0B91EB90A5F01257ABB15D
+DE8B375B0DD55CB18B8A42594724844FBB89FCA2215536BD9CAD8661CA6C92E32AD432F581383A
+90CDE05F34FAA585FDE7DA42889EB34752AB26D21D13918BBADC23D9C35B88C6FDE31EAC2A4295
+F4159CE1CC942B9830129A1B9474F154A175F3A71D86F1BDB4BBF15066948984B4FE902C3F8F3C
+0A46E6A51D86054D683C0A11ED0F151F7905DE73C589339153E8B4708F6D94CE02581C837C41F2
+D65556F5A706C06FFAD43669CCDDB2FFFBE01DCD46380EDC16E08945EBD749AD2AEDD7CBC7C2E2
+E3E4F666AAAE7A718AB5FB6A67297D8F9FF768FD216E4DB4645383EC452F33C1043B23ED9783C5
+C76331017EDEA82E29CCA8F436DB73156A71333E8851CBCAF2A721B7A57800CD72AADF40B6620F
+B932435AFE3FE986720FE713D424A3F0E936168960E171B9B5B8721B699C39B70E42C8E0430E66
+9BDD2870B7C4C66440C106DBDBA7665838F9C6CF6746E15DB725F500AD3D3E2BA2C7997FF0D513
+C91BB5C4824D51B89E7FF3CE26EED35E9A2DDA7420026D89674F7D3184E6C76D4B6D32F28B170C
+A928B58CA925E69F04A22E85E1EBB862C5AB0996F05C62E6DA8DB0B6195B72D473EA23CB8F9900
+3C7F35D51D480D0547BABF993B9235493D447232B362D382FF92BA13559F69A7E95C17976A5A1A
+979EA687227BD969D06E73018FB097319FA62D7CEC8B04419DDB4435972382C04FF9C5705DFBA6
+548561D31CE00457559534E531377193169A844152CD042223B47B7166A6CEED2B746AC21251EB
+900F93FC6F625D8FDE6E1D5374950F4DDD817548EBDDEF20123FCED4C3DF7A7F7CE65E9B5FC3D4
+F079B281D7C03DCBE9B8D87935D42CAE3ECE54EEBE41C00CFC98E64780935AD675962BE9DD9905
+9BC1DB597DE778C168F4492C26167085032E511484ACE6FDC8CF885DE200FF0A990226D0640BF3
+D78F53576875200E856089B11A57A657D37E0BC5B6046670377114396B8C740B5C166E15ADD5F0
+9BDD0CC3BD11C342B69C2D90E5507D83D3F6FD3DC144A2D2C80A02F455143F15949B81374BD436
+0E3591F0EE260233F84B50CAAC5013D6AB612837119AC3ABB6B2DBF0ADC06EB4D4295E48F1B6DF
+60E6C98332A380BB997B769F7C699827A6EACB9E14B79CFBF83E11AA8B96A3EE90A2AED4035296
+05834F1489CCE75443E75382D1B413D8E0AB4F8AA7C69A3E499FC0077DFC9C8AE155F5EB403579
+B6293E80BE372197F33AE16B3F41F75FD0350E3267D963D7D39AAE9F6741EB1D242B3F9CB3997A
+0577421B816164A5259457F56724E7FD562AE67136D5BF75AAE92934F73240C98F289C566B8582
+EFFF34771E9A1C04FA01AA96C258A3C7055087721981F4343CB87F07FD49B9576C4F9429BCECA0
+20027987609F6A49D73984819C940AA1701A6C70086BDE720E1FCB0C6FFF14E15978E462A3D5AB
+4D0F222A990EFB6D09EC67B467EFC88275DF2598F595186DE91F398AD8CA3D232EE6FBBF2B9595
+0735E0F625B709CD4ED126C063894BFA5FAC4F4B7A8091FB9D94D294E3C284781482184D9AABD8
+1F723B1F9D8AB2C7157F8E4A636F253CCE3EAD18A0F7D8C38B76B88913B8E8DF121902BCA1EE8C
+4CA2B05EFB5FFD8C1EE4702885EBE96755A2D581378F71646886DC140216D13AD4C3B3F2C0D2CC
+D8DCD4D9EF6995135D6214EC4E3D653FEB11C22F5EBFF43EE55230A86B8E78E312B7ABAAB7B749
+F7C73718504B28687AEAF731FB83EA4C0B9B5477CC52A5D0BD4252FAB095F558553FAEA5784B94
+1683E0DDE43A3C7B19A6C8A4D39FDFBE50F967095B202F5A184244C31C2149E73CCE7E0D32FEE2
+58425D0BCEDF9BD2FC249608C6ECBAD4B7EAA64D7D01F333AE334D173E859F163396A88A1E09A3
+96F47A3FD445731F18EA7BD26C621E349E314159B99DC4432ABC9FC2E5CBD8E162D9CBFC7F5D8A
+90B7A195A7B517A91BD8AF517EB26A8EBFE30CE667BC376870E405F4DEEA3CF4331B1A89B142A1
+DDF343B52419528628040D173EB0828C7B00BA62BF5DE4956B23FE62F555DC6EADAFE18315F268
+15D3DE1AD5B9808F3A016DB66B1969992BE7CC676EDC26B87A11A89278A82DB04BF41CB21C805F
+2D2CBB9B4E781F6B4DC755880EF054C74870B847332B344DD056F1A3D7319162E782A625E1110A
+C80DE10CB26F7E670BF997EEEBC31C0DC875BA67BF7EE96C70347DFE02FC64F4F7632B2CD1D82D
+026A2D7C14536E7C8ADD18491CF2C03B94BDF4A54511B7C9A515F3EFBF120491113E7EB58FED08
+1F16BE32EE7D1BD64CD134834F206E636F9DA1DF7E393659821490E92A81CAD875736713D6EB26
+93E0906C4347699F5632A7D3FEE62C5BD09564AEBECC0A09500F1216B2BCC8D9ACCE85910BC406
+71670117EC279DD3AE212329B50E55DE1DFA4D34EEEB533AF5407331CE8FCB2D39F2DC59654FBB
+90A8145689145414A95951C2E41A64375B3B7C7EFE850FC152DB2226F511906CB01C4D487DC7D4
+667678482DA2A0B57728BBBE04FD7420C49289831DC8A627C82236B3764DCDA399D5C8EB0E0917
+0A1CA8E43B4CC2C0ABEC5B60A0AEE5DF738B76C08B354372BC28A1E398159B9B6863458EF40BDB
+810731A45996A64EC80889B94A12C6C5E3CFCE7FEE0931AD3BEAD31C60E07B73B1828C86916979
+54602AA6226A830902BBBCC8D25494A7B24A67CE2B258A8050B9659D3FBD3E3B0499A7FAD90851
+0DAA4E0A8FC39BA6A871905BEC3535032BD2FC641F53274ED8A47B8D8F693E722E28480B33AF79
+780F246979C0BA9112071E45C735AC38E0A2FAE61ED8CEC4813065EBD1EB31FB5F0DF37322B3C4
+79D6D8ABE7D3022E1B10991F9DB03D3394BD71AD7763D8A287A2F11A3F4CB87F0A4D1DFC11C936
+7769660BF060965154FBC0255D6CD41E77ABF528922809D141A80678B1F564850937342011C2CD
+A7193A4BDDCA3FB1773FECD40B37F367507EBE2C4F69778BDDE54DF9EF70583DC98F80EE984ECF
+29646467A48115B5B40DC2C725100A5BDCF8524EE61B841A45C1583236ED7BD97F37E0A9486902
+55A78A4563F25BBC1957E267BCC2932B59EE9F62FD7EC053041AE90A165E4DC412F3B5525932A0
+5D1B729EE049E95FD7DDFC41289ED305430CB9A0BA0E2983C4966AD1E4C634E67899C15CAE84D6
+C6A0C2D6A2742D741EE5FB897E004FA6AA48ABA7332FBDF0971A4148FE73AF6D4094889A87AB06
+FEFB97E11ED78C3FAD76376C3620DEEF80BBF7B286290165F59B78E21F96FC2EF036D65B01589C
+14DC300CA2BEF5E5C9414A4B7F4E2434DFCBAE0510C7CAAF5F86A917BDCC85A0C7D0BCA0ACEF48
+E54BE1D943324E826E1E9D3F0A54D36474F74300F94E0D7391A13884440915D1F91F5BAF310230
+9DC18A2A75E87DA722764E799A11CE89833205B9DFF25948E5D1F3A3CB1E611CE299DB7343F320
+00F26A10C4E6358358A5F655D15D381A6D98002D83DE29B1AC943A4C6F428D76E607702B7774CD
+DAA3ED711F352F5A65DF01BCB0B7B25CF801E24A4E3977840D0C6C42D71C75AAA00F265CD259B7
+CA0EC27CF0B120395152F29EC1734FE5F40AEB4BCCB6D9AA0C5D38FE7324FEECAC5013446EB3BC
+E7DD468047D0B7705FEC89870073E5EF829D4B782A8C67E134ACA1FD7FF4405E1D399F876F9361
+4EF88E2F65E13B1CCB0D9149C59129391843150AD4925CD95A3CD05787EDC236B5FB0072DDAB14
+A148053A4E06169980490BA0E5B8BD46DCCD063AEDF19BB4AC6F1396296435C49756D043B11CED
+CE66E71108FB6A5F297A476EF414AF75D812D4E4830A80894809235EF1C43528D0AFE3938728A9
+5685049D31548CB5FBE281C3501D050E8A3EA525A55506FFA31F0164919B30A9B4AFC70225048E
+93517E234B0D671A9F74AE8DD155D35DD72C6C8FD359B5023EF5BC74A59D159E26BA68F3D0D7D1
+D90F1B64A4CD270C1DB67832C814B44AAB2447DCB00F73C1DD5080C7616111ACB6289A0362B5FE
+C39B09D62F924A98C37F1C3D3D18B7018E6F6D6F851436AF6CEB6669143D30C85F958DB2747213
+77B5B73738F9442586008C38B843E9A567F7EA876A3A33E1827F12B67516AB2A678F131D8FAF62
+DF923BD6C4C5C2DE0B9B229541A02E9185AB6C7A56F4DCFB59128881D87C7A8866140AEF0C6C4A
+B253B190E048A310F524CE453EBA70D967627143843FC4D19E4E71CCFD3FA84B72C51BD211B2D6
+E96951EA3AA1E9B66E55E0117A43F0DF8E5CAAFAA6BFD38C71D68AEB84BE2AA3B8C0E451405836
+59703D79568B7DE8D955D1AF3146F514E5D87CCEE9F308ED802B49DAF342F8F4555309BDC09B3B
+9A1D13EF3FE6DB875B775AA3A27B2C1AAF68398D1D7EC8750B7BCEC2B76F27EB16F5E496DF2A24
+D14B6D6C3830616E326BD0C4500DB16474F5703C9556E760E93F7101E251D14F1E425BA8BB73BA
+12F576A778BDEF7742BEB228BAEE59D42E05656281C48E982FD069917825F2A06D917C39A6E990
+60B57037A8798A3C9BBF361C826F6D0E565CD4A465770908259DECA452D45922E87DBCF7CC9687
+AC7A2E57B39B9C916C00EEE3422B79529847A11ED8E3EA4BD652240339959B19961077219C7D3D
+7AA153CE334B9288A4CFC5BD378C8D1AB42E6DA7AFE9A3DA92832A235D615AADB414DF33A7880C
+4757587CCDC298137211644466C077618B6A8B54484D62400B9CFECBEAA1ABCDB7EE78022DF46B
+A3BF4E36DAD7520AC16DBBD895FAA89CE06A3FC283153CC862DF5419ACBC27DF53A1C32B4B50B9
+34DD753227AAD35DAC0F77855524BE8BA3C0C11511E9E85AC4DFC9F4BB97BDA77864B162DBBB36
+2A9C08B76048A88E88FFD0987CD09D166954C59CCB66AC61A651E42DA851D7D7273E60FA8DC330
+D11A6D8087CB2765AF085C09CE05CAE89B110C6AD2C452FD4ED326CB66A48E0F09CD6D0C5287DD
+DFEE9E7368BF41E1935DBA23267C999793F2EF9B8DF8260A73642F322E3BF0C79B1EB998076D09
+DE104F146E6EA6EFEFD842635631AB2AE364615CD32894CADDA2E679354BB4ADEDA35763FCB18A
+2FE174762D316F10790EA888CD76726DA3D13458E7A6689A149B5709B455866567712D21E5819C
+5A7B8C4FD95377A28B73033E10AC486C72076A616813F056B1B39CD9279B64B9A382B506F3F252
+FD0F5107B9CF36D78B5EF60DD9784CA70E0BDEEFF677F50F506EC83EF33F832344AFB67F9AB4D3
+3DB24BE3D7A00B8A60EECC7EB5FC913C05F641C71542ECC9229F67809B8AA0175EF31ECDF682DA
+393A9343FA19C4AAB52E8FD310F1A2EA4987EF6ECA0D6EAFA414545AF99376FB13BD744D1A2ECE
+30E2DD47B5878DE5E6312EA76D699AD6C217BADCF535B46E2EB7800A84D3083A6270BB2C5A5D1C
+0057B424531EB48EEB29E445B1BAB27637FD4955535F62A1ED59C807F3816D46A96AA3B0160190
+5FC7F23AF175CCDBAA060ED6CC1AAE155F18C0FA0D8439BDB73C35BF41571142F8C8A696787041
+99B302C49AF02C4CD929D2CA7F0403BCCB6BA8B3DD12B081A9610487436274F0AC8C21B722C539
+22611009B8581352D989EE065FB2D1A8191C1B0B712C702C4FB566A19F382B4AC8E840DC2DC456
+BD91F7BFE2F1EB225F6AE1562F6DE9D4D6D46BB2426126ABA9E7BBD21F158B3FA9A040A18528D5
+946E6C5B4322070B392403AF18CE0DE9CA09FFCED6F66F7C646C3DF14F5121B34E41DBBA653370
+5497A448C4115DF01E7DF753EF61D9B8618796AA26E0A8E783A6DF
+0000000000000000000000000000000000000000000000000000000000000000
+0000000000000000000000000000000000000000000000000000000000000000
+0000000000000000000000000000000000000000000000000000000000000000
+0000000000000000000000000000000000000000000000000000000000000000
+0000000000000000000000000000000000000000000000000000000000000000
+0000000000000000000000000000000000000000000000000000000000000000
+0000000000000000000000000000000000000000000000000000000000000000
+0000000000000000000000000000000000000000000000000000000000000000
+cleartomark
+%%EndProcSet
+%%BeginProcSet: ppcod.pfa
+
+
+
+% Generated by Fontographer 3.5
+
+% Copyright (c) 1987 Adobe Systems Incorporated.
+
+% ADL: 712 288 0
+
+
+%FontDirectory/PPCode known{/PPCode findfont dup/UniqueID known{dup
+
+%/UniqueID get 4303738 eq exch/FontType get 1 eq and}{pop false}ifelse
+
+%{save true}{false}ifelse}{false}ifelse
+
+17 dict begin
+
+/FontInfo 13 dict dup begin
+
+ /version(001.000)readonly def
+
+ /Notice(Copyright (c) 1987 Adobe Systems Incorporated.)readonly def
+
+ /FullName(PPCode)readonly def
+
+ /FamilyName(P)readonly def
+
+ /Weight(Medium)readonly def
+
+ /isFixedPitch false def
+
+ /ItalicAngle 0 def
+
+ /UnderlinePosition -90 def
+
+ /UnderlineThickness 36 def
+
+end readonly def
+
+/FontName /PPCode def
+
+/Encoding StandardEncoding def
+
+/PaintType 0 def
+
+/FontType 1 def
+
+/StrokeWidth 0 def
+
+/FontMatrix[0.001 0 0 0.001 0 0]readonly def
+
+/UniqueID 4303738 def
+
+/FontBBox{-1 -288 606 1046}readonly def
+
+currentdict end
+
+currentfile eexec
+
+D9D66F633B846A97B686A97E45A3D0AA0525392EECAC163E584A9104D99AD0BC1B1F3F7121D1D0
+
+F2C60DD206B0D3C8C450620B47320CA0AEB8937511E456AADE8E66B301B1E3E9DFE17E2F79ECFE
+
+A709FF3DAE19B4C169DF6773EDA414D02915A6F0FAF8B24FBB0777C697BE8A37D63A390AD9DAE4
+
+95BB7E626721FF2FD3FB147C80D22BEAC37C2624D818D58C8DF0209F5CE76ACDDE57A303D9042B
+
+F0A674D095697F925F532D1814BEA8F8A5B5223A32BC4A95402F2C843181758752FC330970E817
+
+3977418EB4F64FD5E455C3E4165C9AB3D8504D946F6B5C3F4929D463E1D6E6B5810DAD6C7A6529
+
+0CC6DB960A1F943400A8F6364DB3742BE96B5CB4B78CDC5634A9EB3C62FDC481C9C101E045C629
+
+3CD9D491B77482D32797F4CC0BFF20576C2605ECADADD775B2165FEF0FFA0F4D88522D1BFBB05F
+
+BC5062AF54BB3FE2C0B371E8C7BEA0C644A32A3DAFFBC08BB63A97C18A266B310B1C1B92094348
+
+60478D282D394123AE06D8EF457278BD26FD6EEF9B95B5CC7D31E1FE462D8A5FACAF5CE5F42B45
+
+E1395A3DC60F37F5CC752CD81906F28D3953D61F55075081E14745FDD659B5B0A271C8A423A0F6
+
+78B1CE24E573A24B10A5BC378A9E4410298EADD90C159525B358F72149D24291C923F2C91D77A1
+
+32347F5F471F1139B9938E880CC5B3409B33859FE870D28B882B96D8B537BF229EDAFDE8C3F6CE
+
+7CF51F18C5B50E315E93E4896B85D998A43D47BC2560160139FA04813B3CC5C4CAD527A8BF8A21
+
+751D1FF032610410865DC43C499080E3162C1BF74077F8FDD45418BA7D690C23FEBE5E9DBC7DFE
+
+0ABBA430AE206C166FDCCACEA3D4D346F919FF8293111FF626461C28A9EF2072B2957D98A12B7D
+
+4072EA28F07755AE9D83B5D86DF4B2EC81023BDB5DE262D1AF3FD844E9496FBFCB61DA20388909
+
+7CC13CA9BC695FF8EB10B59ADE5384D2FBE0E741F97DD10CFCF168DF343075F34F63C2582A53B9
+
+2CEAC572EDFFEF54B2F8FF5D617ACEDDE59046C4D2D7AAE0F147D8D2FC3769AE15904DEDE6CD4E
+
+1A944E5ABAB181450C36C74B93D8CFFEEB3B5876F9FA7B3530A0E6DF9670E2BA9CE7675F9F1346
+
+EF3F5D38202A50A8CD6AD203250F2932EFC08C8A4F7894A4DC1C80F2B2BB2C71682D218D1481B1
+
+18964F33B16F5BD3522D16F9F3739F063D8D05463037060433CE5F2F84231EBFD1A0524497555E
+
+41856D173C70AE0E3DB9E1BF4C2CCB9458B0C4FF393BF62FBE4E4E78C53F67629ED378ED695916
+
+52083BFD432D05F8FCEA0FAA5BC1B4CE9EF698EC2345871944DF7AA4C4FC3616AD44E9785E2B43
+
+B738159C84261FFD04ABAD0F82033F1D367737F04F70CB2812630D170A08E9D6976F134838E22B
+
+82DC60CB4B93215515DF5AE0BDD7D9F150B1364A49F886F7B196DD4A358715CAD8EC282F9062A0
+
+6D6F2CE0BE1FB718F4F0C0242416FDA7A9CFAD1A67001DF7AB7AC3840F776A47D0519A7116374A
+
+D7620CF527DE6343948A7CE6763311FCE7F3180304C3DF53CCE7DF85E9B21A8A56ED2CB0070C85
+
+56468DC6D6EC4758F34423F6AE9F1F973FEE394769B5ADA4A08C90AABD5D07E0F07E893580137D
+
+09CE94A6CF3B8CD2A650A6F8C42F33A5BF02A2F04CC0DA224FEEDFA59F313E8E5BA98A2B95C59E
+
+081047EA172DA8569345A62FC12ADE17DEE499CBE08ECD7B18A79553B3F391DD7C9699FF209B4B
+
+8174D217DEC328C0A8939197E6C40C6153F6A49E69AD7A7333386B30303FDAD868DB58A9E5A13C
+
+AC55EB76A2D241F93234508B436D0081783E64B9431260115720ECA10156AFC676E012A737EFA5
+
+0EDFEA396E2C125CDB78BEC266F894FE814DDFBD24F2D1DDD68A9773334FD39E7A72C023EBE0CC
+
+A6E5D6E0E3C67F3187B4FAB906302EB810BBC5ACDEBD482E00F281DAC4A87C83FDF08F2E15BD17
+
+8A77A4792F69C23486FED2344DF26043D76F4C9BBF54B2BF425180445D9563D99DD8FEE3F8D2C1
+
+A660AAEBA6E0ACFAB5CAFA7742ABF17244EC9BD43B74E64659D03369F252851340976AA18BEA26
+
+2B9287566460ED054923D82797A31C3E4BD14FCDF9F30C94B50364368C1BB18A10BCF47325D833
+
+F3DDD815725F628E9242CC62155550D54E1B698FE66DF29B79817757E02D05190CEA5B78C35D05
+
+FF87E5B2ACA9E7E91FD5233DAA7F5378919BD11028F25439E1E35A5DDDD8CE710F4DE16C1CC0CF
+
+FB1A9BB9F2B8635609DE6479E83BEE8FAA4DE3E28932BD18E07EDC326B1428901A77A3D23E8B72
+
+66796CDB8B5B180E779FDD9DB73AEE5F45F72FB55CEA6B9E52A2F72497A0D8C12C4E176060F398
+
+7584E5C0A8F6B74935349C153AFC56434F27F0E248CBF9E6009900A7B23315A0D835CA08DD3A34
+
+697F381E3DF8CE655DC3B2D383B002DEB4E87B0B7BE14130F54CC3B433CCCC9034E021709B6F7F
+
+8C25DAAE692BCB399595DCB00978FAE3454D48EA1052369B0FBB4B340D3AC6C3279AABC6526F99
+
+362C7693B0C0167A539CF4C8EE7C4B6FDBE6235D0669FF525E05E127A0E2FBEDAAFAA82E843EE9
+
+0CC32A9A80ED98542E23D7819F5551D8B065628D4532081B00B728CE2C67855045475D9D1432C1
+
+C83F12A3A628D302697B418D6699C9E4380704D05C0270A736015A59B2C4AF2EC384CF0F05496F
+
+01C977FD39C6E778F38D5E438DB5B6B05E333AA6F4D7DEECC6CB4B098E1E5138E9829D93B21F05
+
+FCD3B5A316BB3452C516B2B8935B1BE80E64A7A7227BE6AE842AF11BFAF372AE4E41F8D99D2810
+
+427F709B97E3CC0DE4C8CF59A4B59582F9B9385B4F8E822107A79CA447B9F885477DC4B65B7BAC
+
+30A40B5141A9A3FBAE99F68B27A3CECB7419103BADB770EF627B2AE0C4F6F368B1C5B9AEF0804C
+
+FECD822D6D8EDE9F42E17EE2A6D385FB06EB17C1DFFA25626E6699C4D3B791FD65F2EE5D69DFBF
+
+4CC6E06F7F4EDE642B163699B239830DE0D120E1F496F4026A31D469E86C35B01310D9B521F5D8
+
+614AD281F159E197F8A66C5325A2946216CCCA969C4F6D2FC05080BD50AC3D43026B89C2E640A3
+
+5964555A073495388D487E919C7A40086217B32FE8B5215A212204D44728E1F245C913806693C1
+
+CC8FED12BFAF14C4DE4DE0BA32D76AF52F6B316E9E64538A72BD461DD2E24158C75362031800CA
+
+20F70387543BCFCFEEF0D1B3E7E108E106D8B172B4BC40F83AE4D58CF8CCB1230D6981AF00A712
+
+9FA1ADDC1EEDF23A339DF93DF45A3FBD7829BD840CE86EA2CA24E020A0FDDC24664EA42BD15C32
+
+A2CD1D7C327CF329480B7211926FDF44FF1F73FD248D980956CE170271C77DEE57164BA2FED513
+
+5C3777E10956C9E382D02B888261BA22FBA3D5374BD2130013FF2EAFA4CE4C1235DD5128FDDAB1
+
+63059F4A7B911B96C587526533BE7255749EFB41AD032CC00CAA20C2531E4DC09EAC48AFBE0425
+
+431FC29CA48A3749AC9B012CBB209F77D931599EEC8645EF18793E79D35C63D4F1A7134284BE50
+
+00DFB32EAF9021D3C8DEC2B119E376B3F2E94731B23FDBF8BF6D36AD9174F56756B90207511267
+
+8DB30EF2F34F7921AEEB3A00B6EBE69D18F6D1D10C5B5F5CA5F37FEB97546191F17E1F897637D2
+
+9AC366148A9D7F09B0614F630F829F155ADDA8E704EC5C49F963BAE89A9A6611177655EB85D2CA
+
+0075DF5658FD68641AA7B31B8E1EEC8F715D6DE9D422274BCD8382082D625BC812F5DC3F86EC0A
+
+376BB596C233F01C6F54780909671694E902CC1B96EFB0AAF2B42BC8BCA01FF6DB2348EF7DAD3E
+
+7E9661189FC27D69122447BF81F9466A73EF04D4D4BA628B63BFB84AE88B472965ECAFDD34F7AF
+
+8BCA51077C2CF364F152A65347488BCB948F87E99E10F430B2B0964ED6114CB69AC8186E486D37
+
+6F57C438B8959C360FBC3550A3FC6B973B603F64D2EF99455C82E1107434A0EC3EE4E1FC1129A9
+
+FF12A23246B410C74E13FFB07DFB6A6227A73A0B6B4518A0BA2FB6007B21AA81A7EC747C525F2A
+
+8E6C2569A9E950E0BAA17A5C9D9A1E5155147EEA4DDE831AD8CF69C7814D76B503933D91AA93E9
+
+A97508AAF29839E177898D79BFD277005819AD87D9338CAF02ACAC44F891F92813E7DA69C82D7B
+
+6EA717564BCB1D470B090DDBB1EFB308613AD61F5D27338FDC8172B258009CB7A5FFB872E43C88
+
+20FC3B8DAE2EACF870D7C5A88D4261982800AAB36E94968A4C5C24EC5B0E538170E8C6F9AD61D3
+
+E6C713B6319E8DBE7074CC2228770AE51649228A9FC184AFC1BB7C67628FF30360459352EAD6B4
+
+A2A69A3D39182E56CBB2864A2C1180A7C777E7269C5743D5A739B53D3A2C5BBC9ABE8337C35679
+
+6BDA40101D11EEB43BB8EBFA73E4E7007A2EA443AFEDA678E1B14A2AA2AE6A06D12398E68D6371
+
+A457859C0FF25A81C5DEC3AF48272CC5FAC044AF2E71D510E5BAAAC8A50542D9379880AE7C9D2D
+
+1C822B5477DAF5150B84FB9A1A062C9AEF9C03F89E0269637F056BF65A92CEADE31F2E3D4C9589
+
+0701A4A064605CF79E933A85185B50D14A4766563A952D5A3C99C16CE7A50BA68CED98549DD395
+
+F6698BE4F7976AD5A00E737AA33CA51F4C7308B66B10BF636B3C4DC8866F1509B081B178059340
+
+BD9849AB487CAA004B8E60241125457C922340B1BC817885B703914B0FC58F1391016FE1E3DA04
+
+AB5F2056AE0DC8A681C8DE6CF5FA125D2C7F5967DE841F076AEE8791E6C17D7F698F2052A9C641
+
+04924F9FD85BBAF77D9EE8711F147D730A6F89DB2965CB450F0820402C2E52CB57977BA0A77E0B
+
+7682845F3E4266B77304F163AB2CFD49494917D2C5963A704CFE46C643EA7ECE441F82E272444A
+
+8242BFA6CB813B661CC9431DA9C1E1E9C6A861C6C0EB3053D1D62CB774209A7586F9694B558DCD
+
+625B55A0E9FBCE5C15A9A002BC9478908553E95302BAD1E4DC9C250AEF170495FC898FDEBA345B
+
+B4AF706334CEC5091F8AC4A23821D0FEDC6167A15F45633A30DDA88EC3C8C6E235A5A3C1BF1BBF
+
+03A896CD7804C297D6BAE134DFE4E388872A05B92034AE70DD0CEBCD571655B15078A2719AB32A
+
+528E613F2BE3D5AC5F3C938D23BA20DDFF1422560726B62BCB1B9EA09DA1A28EDB55F5CA2D4E05
+
+50E1231157A81978E7B05FCEBC855E54A936DD4053A42ABABF820E3E4D37278909ED49E49C6213
+
+9575862EDB983BE4EAFFA6B946CF4DE068FEB740927C19935D25DCB15E817847214774F290CF03
+
+E862E76335CD1CE46188CA3969F0B3F9F1DE174C9E480C4782CD5DD6DA4F19B51F5F09B78CCBD3
+
+D5AC80DE849278DD5A84BE0F9D67229113FC4BCC4829F89EF61E8EEB93D48F263098073996CE72
+
+05435589588FBDEA91C18F8BF53C81DCD10C74A6139B5A68ECE7ACD3A485723224DF00177B1D6C
+
+48D7D92D0A5A9E550D5E061765B49616C65305916E9C0C527F6A8EB6CE031EB88311A9686158AA
+
+B526BDC7B0ED01EF2E84E495D10A50C7BF87536C4D4BFAC22CF95C58462A7DEE8E671752E98429
+
+8DED64452AB8463A8D4D98CB7E2121DCE680D13CD52B4CADC738692F6C5C32AB378CB2FE4FFD68
+
+11B2F99A6D0BB9BDEBCDC827DD77603BA5814226F39DB9AA83AE2B91C0C6020E934190DC610136
+
+AC6CFC5B6B5E86A66DA2582406364FD1AFB14360CA16EBD4FEE6DD5B5C42E7ADCDE9B54661CD25
+
+1464D5C7F89B62C99EDAA697A96AE85C1D280BEA6F700110B2E39C0D09BD14A548D2978881EF1A
+
+38DAFB197BD78D62A17C343873F279EA84155D79E17887C8C56B8E7DED38D064EB811A953BECB0
+
+39C9EFA45424D6455B869EEA5A252D940CF0E43D5162EE408E75F2EF0BE2DFCEE6448DDA529BE7
+
+57CE4DE31B80A4676D23FC0E901B89CF02AA0562BE66185F91037B1B56809FF1046A6FC39C9B9B
+
+7EC27BA4ADF238760A575A472273BB64C5E2CB776207F00315B73534A539764009372A74CC7612
+
+9DA6188A383967DC1165C07C7B1F93B39C6C201449106A0EA1276634A6162AAFADD21C61C1D560
+
+1BAA67902785CB90C87B611D3A6A3B947013BAD8C60A3D4D339A3025BEC74B6DD387B7AFAB831A
+
+87B7A71A37D251523C48642B1D479D8368EB31F8BB8355EFCCE5DDD1323FC99A56B1089B752A13
+
+52770BC7E1821A398890B31650E8EE14B0D49BAA92458C15C2941E434787EC4BD034C40BB0E209
+
+6CB29B175387729ABF0962EBD02424F0BB509687B03A39A3BE9658761F0703C5D839B60C4F98FE
+
+FBFBAE07202E2CA22AAEE145DDC10409010E2A59B934401EAF67B8EB499ECB92B375CFE8D54125
+
+CB6B20C9968BAFC45D1A8BC65D98D7B702E624794EBA8C1EFC9433FF2BC3972F57D8FABF27CE44
+
+2FA32AB83AE5DBADAE01EDD183403D272AE3FCD75BCC750C90DF7D0B5255518AAB0C92D30A0164
+
+59D9821BD7E1D4C4F464E19B0AEB78276190D726C1D7674708D0A74CD05920C2A8FCCC8581FEB9
+
+998D735D811623780F129F0AAAF113F75EB28F383C9B8C0C7A2221C3A4BF641961F38DE9DABD33
+
+A803E9436E5B9842503581B3F5445AFA039CB10C936C8B0C08DD49BEAE1190AD611F3F23FA77BD
+
+71A80A1F91B7F3760F5FA35BCD76D8030FAC872C637217B07CAA452C72DE3F805F58820BF1ECCE
+
+231229FC5B68E5F1B20259DC92AF481FDA92D07F276077D783AA45349915B5F81C8C969739DB56
+
+F4522D02D547DC76240D69CCF2D684242020DE60ECA37D7E2846C5045F6B2D105B7D5A3CA5DE6E
+
+73A56715D5DE5F3EEE3559E657A5EA13C9716E3A7AC0DE25E1720D52ECE8A84D5D1AEA04DF0F7D
+
+D846549BAEB5C5032CF3C251A5A63A99DF1A33D0548A72735FD9DA8267BB4B57A5C58D4457BB12
+
+42B5152703E62B64C02AFA682C65C4112B2838D9BD8CEC6BD9D1BEA882E5090046E9F22087E6CA
+
+B69F5325F0C69A4874EE820D18B64DCCAADE6EDBA3AC758E54A7C9B6EDBC40550DBD4758017842
+
+1A8C5B6967D858DB9836184459E26340BCCA7636A84B7B3CC9596A907528455F4646B5BD789E94
+
+9DD0D1F40C0AF21E3971996FAAFFBCC14E19030924D0D38A948EA552971BA65045F2817564D593
+
+4C2990C6CCDE26329F23D8B369F3AAF74A125CA1FD552BC7122D21109FFB36CFE387F22CD09CD3
+
+CCD47EFDF7F671397CDFCB3F457B2E6FD2E2273AA268C4C394B36145131EF2D4D10729F64ABDC5
+
+EBC7B20BD072EC170432982280341735297A7CDDCBDEF8483F34AF7A797160402B10CCA1C78AE3
+
+9AB6170CF6DDA19EF0F22BEB283277E06544881B6B0D525936A84EE91FE0BA8C2985B6E32AF94E
+
+DF33E6CC70408F3BC67070A90E0641BC68B8CE8FDB46BDE2FE80BD7070F0A9505B0959B1509E84
+
+CC666CA7CE4EEB631B6E8D19816611B5ACE957E104CCF3439C2C27741CECA6F2956B0C5E0BD7C2
+
+B417C375B630D4CAEF428A88584A3D1962330A316B9058BB1324FCD908781ADB47B39425A9FEF7
+
+6ADAF499775F68F98F65EAF80BBC9D4015D05E816D2EF9A1FA91B01E05B69B9E1BF75130B4C7D9
+
+AB29D95C07A4C3F2DE00C7C2108F7BDD2F103D8A7BE02AFD12D1ED26A01AEF6B18CD6336765899
+
+805618E0405C18CE7F06EFD796EC9532ECAF6966F76EE335419454FF647FF14162CFE1ACEADC15
+
+A22FD4E6DC78A93D51A6076553C2D707399D27E5AF882813BD3248B9110ABA3CDE8D3E6BCD23F1
+
+DA141BE6D45A9E6E36FAE1DB0C0819270676536536EA13DA4F07D5BB6277F7E4C609E4E16E2EAC
+
+8806F28F4191E71096E2495E64DB238E20E0D1301B3F34D9FB4E6E6106C03B6240E10C0FD01B6C
+
+352E9BB9300C246D0C020F2B418D76A0456784E58A75AA5C725E5F9269392A90D185DBDB5CE2FE
+
+AE31ECDB3B63843AB2958241BBFEC3C04CE0AA147C504A45DBE05503DD493A03857BCD7E4B37AB
+
+E8572892AFF4E271F510C7E0649C58B3E3CF75B8C3BC08EB34AB5F765813E99F99ADE259C45327
+
+2672F9DC25F031797C4269E8CAECBC3E92D1A59FD1285B46500F9A2D679EBECE480945D79A50B9
+
+D5D1AE90727DDFD6F8C5EB03B2EA70C169828FC755BC4193CD027EB52EA2DC7AF09C0865695106
+
+5BD78AF57C289697655A3432A457792BBC88949C40F4BDC071793853F9E8777839C7D7F93639CF
+
+42F1E4520FCBCAEBC3BCC53C83334033C25E50C72A3BE0F337CD14996326C169B3921E3442CCDE
+
+1A444C94AC8D2ECE632908AED4A162A74021555CA73B235715B965CC867727E48C3B6B39B989E5
+
+33B92BAE40A0FADFC8BCE85D2A7EB6A1C4CEE21472345421F9B80C5EE641C91295448A51306CAA
+
+41916DE9DB4A78C7381067314A8B39B13F54022882286724BCA2C10687988E4C4DDBEF5E2D36F4
+
+36C9F6495E0D40AB6F35E7D0D5CB8C2A753B4C355D0CDADF49FBEEBA5239A90A56D826A9BE12BC
+
+62677F07CB1CA5AD3A8A39E10577E5FD95E82F2EECB4D4F7B55DFF835663822851B7B66FB4CA4C
+
+758763437BD7FFA955914B267C18A55D7C913C4B8BBACE885F5806BA7265167003198F3C3236CC
+
+982EBA78D01F4270AF563611B84C839F9F414A0FDB4CE0E3AC0A6629378741B5993B40CA190243
+
+C30C55759CD545B2843404994D02ED271D807B212D4D39067624C5685D04935F7C936EDC0D6F9D
+
+DA112228AF05097780EF6B3F7E3765B7D3B9D9B292400D7E931CF98B84E5AE51D6FD741E6F8401
+
+D026309DFA92510CD2254EB234E6B2A04AECDF39C03227D07096C4BEA57866D91099E8CF5F0E19
+
+A587A498D6BB3B492EDCE600E463A0B6CEDD0C33C270F99FF12906EED6625C61442D7AE3A8060D
+
+85121920E6B940EB9E55037F40D977C675DF6E825CE46FD9A1A3938D9A1476C0E0A575270004D0
+
+B56126C50A62FC211DE28D34C404BE017A823352676609A5000182EFC3DDA67D03A12CBB25C99A
+
+6182C6D3D92CBBB2F3B2D3F3B7FC90DF0C60144A233E71ED22D4113EFD9542081802AA7A678C9A
+
+F6811790ACB3654DFDF82714598756E365182A7BDEE311B7468FE07C2F9B829B65F287D55440FE
+
+32240CCE521E38D71999A84ABD6F6C1FAC23945BDE97D1B2EE8234A2A12F4F61AA9316C7949D74
+
+660C459E2AF21699FD334FB41D5A2CB869A45551BE062EF3363808ACA5B861C5CC05A0F74DC620
+
+B762CF1260100F7AF497555E3A387DA9B836F2B1FA44654CD5B9C3C6F11D5B5552E2D824B7B1ED
+
+9E2597B1849DFAC61041287E996855B0ECFD21EEF4A0AEDB4928569D34613C74B46D7F46B55ED7
+
+5532217BC77B1E075A4B5F782D2FE5748F12B50F7146AEF506A41A6A3364854D8AE4CA18448626
+
+6368E181874148970B89AF75967E61EA7212081F85AB17DFDEDC6F0FAF7F415B3CCDE75688E85C
+
+1DC939D767755DCBA622BDB3631E120BEFBA3733F8BDB0A9D4DF8737240385A6ED642A3B6BFCE2
+
+D3B06B16F994CE49BDDF355A5E8F28C4DCB6AFAF6354A97D490B54B8BFB9EE2CBF5AAE669E3149
+
+4461E70A60156764F25520EA13F12623F3280343822876660A7F6603B59AC39D425B38217AB4BD
+
+E12120EA6119F32E080CDE4AE8DFA21E23DBFAB037421B20C3A51F4AE2FB5DF4585ED289147427
+
+683F43ECC822E0688E6AB47619038D4B9404CBBD9324BF32773E8C95F9CDB0CD68748DF066970C
+
+AD2BF8E4424940CF6C6E41DF2BA07DF4085A0E6DA6080FD43FFEA0A71AA7D00169D8283C910BC6
+
+F00646DC8FA6522C85BF46A863836F64CE73A6FBC0538E30BE63930B0EC1E4AC40A1220A99640C
+
+39F811C42AB78325AF974A27A0C2A1A2785A36EC316048E56867A1F85F78B36171F126B77C114C
+
+B7A8E05AD92DC6860D5893964E898998C63836CB5CACE1EEA1C9C837A1E22AFDC4B35E149FB0E1
+
+BF248A25847604DD6961DF3AECD1A9F61C36E3E1E4AE1B9F28FAF351FDA113664BBFECE0B7C5E2
+
+3183F8425BE6906A56398E33913033E51E06408E001D9C862E36A93039AF47F5F301B6B5F3775B
+
+4B2D4258B866559001066C6EFC48C55F4C3F0CDDD8EF525EDFAD6FC06213819A9BAE2E5577D404
+
+6E4656BA2F34227C5E37F0D77E964779AFDBC6840616CF02936F281FD353F2A5D8E7814AC6B28A
+
+71BB57253F852810B7DDD5590A522C50B56BE251DC7641E0D1E271F8C4CCEBAB65B6E70F86A7C8
+
+32D55AA3E61DCAE504EC4ACDA7C274AFE9BC7E75610C861ACDDFA5DDC4E8EBCA24A771BF0CA3A9
+
+8B88A6ECE52EFA7C8D55CF0EE850A99C9239A4466B558B6D020FBEA8D22BC6AAE4292B90C9A983
+
+6F7F4C5A588E6CC3DA3313F5FEBD4E5D2F7E454EBCC9939742C67E7C01E510D507EC30C6E6D340
+
+510EFF3493B2209A7AC43B484921872315657D3BAF59CAE38DEA48F394E4DF3A8C930C61C54610
+
+300D66A423A4CE2392A7A422883EDF08766119C2D7B7C7384821BD6FCD1B77B1BEC14DB15F1087
+
+E89ADF4672311FF368EAB60CBB6ECEAD34A7507A781B1DAD557ED19C7A5B5E334851268DC21824
+
+53CFB7EF47D15BACA68453301E95125A5CD35FDFF1E6EDB85AE7C228180424A2842ED475B31AF6
+
+240A480B6F6D7D3652808F8872F859843843D862E81E3594AC3AF577E79F647322392E4E63CC08
+
+937C2976FF749E16C58DA39B9035D802D0F0A9D1DDAC1894FA71BA3E41849C133445191D41D25C
+
+B37A8337C876A5973EA13567389FF89C668E0D13E225964DDDC3DBC949B46E0E75A2BABB6E2AF4
+
+53F65ACDCD45A394BF20630802BD9B9418459BC7736E37244F9215F2D6F534FEEBB1F841962737
+
+D48DA7D6B30A71BC4173B6E00ADB4EFBA91CE6332CC517B39701E07670D3D1A9A86A7102E6A80D
+
+C1EC6CD644F5511D0938DA096F80B49CA3444C0D96DD79D3F8832D0410F0430128C6056DD09F34
+
+4CD7E8D743789BF3AEDB8181DEB1A211AA5320FCF790489732CE6A982B1403CC9E2AE6BB9AB5C6
+
+863C320929B3861AC1011FA62C44CA18B10CDD9DEDCEB73E9145B73C471C6F828DD188804F96EF
+
+DC3D226A2A5D7155F7F8BE7821DD39EF450B5DFB14DB6C4F568CADCFED8C702675BA1C04CE6D62
+
+839727FE6F8AEF59693BA38A2B900D0D02C56D2C632833D2D360ADE07ADCD4CBB620517D7D0B28
+
+E3462E6EE2D30856BDA53DF4D97FAB059B0657E815921ACB16E1AB6CC72FBAFB9290A1ED432A32
+
+CEF7D8CA1938582785D12C9D9B108DC564A9F80B8C75B5B02A1E1C9C5B793526CBBAB9042F479D
+
+AB1D9EE9C18184692C81AFE2CDEF26CA418800474E6B742BB45CF02ABCD86C52BE10C777DFF981
+
+464D624A7B6E455F6F8D5B7F84FABE288DE3FC4CE4A23766F3D771463AB1E555F2E1ECB61B6A2C
+
+987B43C53B636DD466B57EFAD09811C728ED313B950789B262A17EA932A745EF43A8EFDA16D05E
+
+9BE49D3B05D7EE630434645AD245BBB5600B8AACE3241F3706A3D5B9EFF0A793C56A8650EC4CC2
+
+55E4A001356BF728103F59890540DB9B3F2CACF788495F63BAF1D36B4FE10B86287F213695E48D
+
+5BE20EE7025222C8AEE4F5A17D7633232460621F7F395A225D994AFF8D06C8351FC83F0C7FBFEE
+
+32352C1A3E35651D219713019CBFF78EBC3B14C5C3E25695BC44582008FC053F6E7FA8359E8554
+
+A7C4EA90632259302ECFB9B5F1F9721A37EDE9B6ACE78BD7C68C73A960346D608CFF7152681EDA
+
+81656541AD4EF64B4B88FBE98106AFF6F2051A871F7AAC5337A8AA2A16F59B10447EADD084FB03
+
+C36E5F0A4781E4D83402944714F176FC9420E21EF3A28FE65CC9CACAE128401BAB4E3322D6301A
+
+18FEC595C05BBF5C44C65D027FC3698F66A07A567937123D59F16B9290B70B838FBD4C6D12C460
+
+69309881DDE50DE0224F10231A0FBBC19F57E7B6B288622F40676D53F4DAE27C6E30DD31759A32
+
+EC0315875DB779486C9B4F7336516C52C537F6F25950DC671AF3C749E2357A48E99D032DAC9F90
+
+25B162D672A01908842B28C2A9E8FB13BC5411CB1375A3B25871E7737C2B1FEE4D43949DB1567D
+
+E2AAE44C1505871690062358088294E4929D552847A6A94A075B7D0B89D7DBA645D26B86F7F7F6
+
+40D7AE4B47956DD5AA054DE194A5756B95122F182D1D02504BEDBEE0ACEDAFCA0DAD84092582FA
+
+0603F025240375B11E8C252A5417FA1AA4C96DD1C4A369C2E594B2089A3EFB9D936224DE25A421
+
+588718E6177C8E320679EA1C639ABD3E4BB653DC17AEE5264E991BFF63769A7C07EEF6B0E6C1A7
+
+371B889B8BDD14DA43EEB252FCD82555752C25DDE92DEA11E3100C8BBB0E2D8D38C29E7ED42338
+
+9811C21E4BD162FD75AB1A0E5A579352CFDE9CC8FCD3A4CC2B5C4D84CB5A6E2E52A52A3D8EF445
+
+37C6F812694DA5119CE9B78A2C5F12454B1BA8AD6BE5D2088906C3A11A4CA80B2120434E92B526
+
+173D07C530EAFF61A2712F7BCE3618197B8B6175CEAE93186B7308CAA90BD20054D9F48D13B40F
+
+2CB81A08D202195F3B03EB7E14A17F5415E44C981D47E4CEBD46FC2CE82B3D0F4EBD242985AE51
+
+0BB6F3C1A702E86ECD278CA322575D75ECD86898F013499D0A7FC1FC127A6A69463BC44097D47E
+
+8ABC50ED36E4EFECB6E5553C35CB6CF6BB4779CF22F5F6970F15F54159FE5BAD7D57B5DD5B5BA2
+
+B2E25069EE77B06977BEFF18D21594E6DDDE2D44C7DF12A80121FB9A23BFA16F4A7EC7AC2B2AA6
+
+DBC7515E18CE39BABC04ACB1CB8C0A01A3AF169181C47AACAA0F0D803EE4C40FF0C0FA10963102
+
+330F0BA056DEEA02A240568D8DFC3F01DBC42DA2AAD17CC9A5F1DF12DA33BF5CAF8B22BD521DE2
+
+EA2B831135417E80412B244644B0E6DA40DD3E5C2A283A75950F686167719EA69AE1DBB00D7356
+
+FAF3310D24066D4941EF70686DC859CD533BEAFE9D5BB4E470F38B09104FD6B63A1BC61CFB27B6
+
+710EF092DEAC78313249BF66608DB507F08D8B9CB55BBEE1CAF79C83D616648163D56DF637E506
+
+D06CB45CB70CDAB90CD87FED934E0AEADC8C56B70C687B44C30B84376A02C04870E0690F7F43C9
+
+6536324092C7F4CF7B64990EA4C5DB456FDD7346FCF55121A5265A4B3169FD5D8ADC14A175F75E
+
+F8E86DAF70FC4F1E7A03181ADC6F0F9CDE42DD2B4A853E81E9A40E17AE8B0B95FC60E635C7B460
+
+477B582E7F45B00D78A4703414A5AB2A33456DAB7247513CACC1370A02D3E0B1BBDF5991385FA2
+
+9E03F7CA21DC18DAF612FCAFA8E35DB3663850181E046954938715B24C4F3F569442B5814F22BE
+
+89C60D912408D5051FAB8C57722FF6942D045A2D62B2A696867DEF3915EE1973561E8ED1654B49
+
+3E99B2775605066B36BD156A1347E06B30DB129214BEBFEED880C0B58290C5F6295D243EC46C6E
+
+122F6E2EEF4C7DB5AD9EFA493CFB01173C8C92A76A5F900DF0203032C490208EE5E8C0088704A6
+
+BC1D69B4CD2FE122FD8DE579801B110C76FD8FAC88C24558B127BB90743DDE71FDE97B1DAC7B96
+
+4C4E5DD8EAD9F0E99D451ED92B4DDDF8B76643727F8D011F3E527A16A703CD8A597F18685AE00C
+
+D44944A77B69D092B3A61EC940DD8F64C1850AF7C8D17B690239707000BA1A0C0C1D23648838A2
+
+1C0BFF9240EBA6DB5832214ACC8CF022BAD305F6594A9C5B7FBFC3881958A170B0267870E4B831
+
+F68951BB9952F79107BCDF24BA4B41EE2FC31C07E4A4A7340B36B1CD121789D633AA958563B80F
+
+A6CB56F11EAC5B468839E95666A96B7DF9D3EB16F56D69BD3DD6DC6D34458B3D56D55EE9BB2E52
+
+EB357887DB2B8C12D064EF31E2B53EC48A4964FEF00DDF0CB26E6B2FFA5F5866649BC3415C0E65
+
+10C09814158C8B391B74A3D7A07EF7385193BCBAAF26ED086191FFB8328BF3511B4CD54C636877
+
+A916866174DF0260801639B3024B9C965116B2A68DEC8E171A620AB471F673391A31B081665F27
+
+826E9AC2A33DCB0565134E407C618715E146CECFD58EAF40D1575A805DF12B71AC3D3BBA4913CA
+
+D84185BB7FDB6A2EDC904EC0FE8D95255FC50174A506DF939FC0FE8C6DD4D27566C32569EA2339
+
+583D4FAA82E00FF9DB8D3235D00AC3C1AC58306D2E02D65D54DEE6DF6ECF33726E2444F60DBFA3
+
+DFF4F6FD4AE88376B507E721C9E9FE030D77B95AB29C6DB703FA45515A424B212ACF9D658D848D
+
+120883DEEE78345A35679BF82D7C26297259D8697A0C221E26C6EABF3A727D951221CEE74DFDF1
+
+5A33360DEA36DD0063515B5DD17C204E0F4D4935FD0BBEE775DBFFAE232AA018A04A5E59EC63DD
+
+DD0B8B11450FFF9DA0D4894778877E0C63C82489D3F7CF67B61EE08A61130FB77E15B50B7E87A4
+
+2F6F837D50FA3665528DF916B187B11955B0424A7603F1F6DC1E2BF41EAC6E98E9F0F5F44580A0
+
+AB8C649EDD4F960F4759CBC2995DB0C0E07A8F773EF9F58EA54429779B7D085FB46A519CA89BCB
+
+0340AF843ECB37A8208B7736AC27481172728C360DB17CFE81E3635794CA918C2BBD6654D2D4B7
+
+4006053EE17D1DD7EFB8EA882CD055BB5FC9BAAAEE63089A6F20BF88ED9EA643AC27DCE9BC1F1A
+
+B9F15B40172C7E4C0602D13D13216CF0F2D57E51B751AFCF8160835FD4E3D21A58898401425961
+
+69271E2DC95D72E6F075F413C96DB7DD17B3FF2608809D0877E212A7D1D17E74CB4FF48B65645C
+
+B8126D05AEBBF1A6EDC704787CCF57F9B7CACD75F748A5A6A1C4EC863CEEB2BB1D9A4A207B4E0B
+
+901060D0E3A9879970AE98464D8D67F9B4D7C6E582F030B8D8D62E15FDDBBA25CCA8A9EFBC02EF
+
+C304CAEE902670819463DCB0414B3D185AA6DD370B81CA9145C75AD4F7A47411F2BD0CA1507488
+
+117868458C0802010078CB4EC2BE0308C9DC22AEF5B2E9294EC00BB5568916164DA18CE69D170F
+
+A3641D29D0DFD08B5AF6E1F1951CD9257C0699B3FC1B6CC19422F433CEBCC7CC1E0D30CCA1C6F2
+
+D3FFB1384F5A1D32681A5DDF49933629F7B044E45DD748DE8509257E688F1CB637FB766269CBFE
+
+E206B2C1560CC3A84470CDCE8FA0C74274DF5094D413D5A51D1ABDFAA66D9C9DD627D72C29A9D2
+
+B0A3552789774110481FF3F7E0CB583C7AC5634F0922C53FD81601497E96B81008D9C5B49F4ED4
+
+01FC2CDC9744C2E31941BB1DA34F6F6CB63DC2C23A4BE17D3D13D413188A2AF77143021D376E61
+
+7EB1B2D30CF5A1C2C76EEDEBEB710C0C4158958C3D2BA289895F79E3DD45B030D90B12640961B5
+
+030D1FFC621B54A8693493B5FBDD1905132ED26F9799370A67B0D90F7F9DFB080E141F643936CF
+
+DA810EE85201704A15B92C4419D65C0BD1ADAC4F157958D52B528A84BCC69F57A25123A04D2202
+
+319067B8B8E80FEA80DDBA9FC075AEDC480E8209111F9444742A8707F576A7C7A1DDB894A33813
+
+C2D6FFA7B08E2DDC1309EE20B1D80BC387F9DF1BB786BF6E82640D775F084ABCB86C07DF15413A
+
+0475F26FF62960ADD1B94F20FFB2A908AAE2C79AC4EC3899425855D80262B2758E76A4488D3A47
+
+0058CE7BBBE7C991183499EBD2C550C2918EDAB5BD9D43273C44DD192024F73468BA0EAD2825D4
+
+99EFF4A9B1C2FC64AE2222A17116C1F8CD61622B08BD573036C48956C3513A6A3B9F066915378C
+
+2A41B3163689952847ADB7F624303785E9F61ADD7C2E647D2A171A5A0471E76C9C6DE4909B015E
+
+3BDFC9836DB884492F5C9CD77F5E29DBBC80F5B836684E82900FACC7A2CC1D20E6FEE60BEEAE93
+
+DB98DE238B66D13BDC858590654F960FD6AAA779F00DB7736C7F18808FFC167AE32421FB975E94
+
+7FC49A2320DDCC4B6841F54EA228A58383D420A25C21E85C99664C8BB20AAC66390BA46B49BA7C
+
+6834E8F18CB31FDB92FCACF11FF1A9C53F06D6992B06BF0C01DA2082E6EA705224841A7C6AD02B
+
+015C2AAD19C8BBF1AE2506B08D57CFBC0B291402BDA5C95693AD65902F96B910D465CB935CCAFA
+
+D731C9F30B40EC59AF12446C1800C80AC60F4D4CE68B8044B5725727B3089ABBC6E9631A4BA5F6
+
+589891A2085C74E31A4A2C4F057380016F5083AFAB6D089E4EDA177045BFDF1682E848BEEF2D1A
+
+FD4F8F9DF6831FCA22CD7C4A351CFE770635DA22FD11B3326FF9AA79DE76EAFE99B699FF1C73C7
+
+12EBFFC1D84B0142914E1DFE990605E73CEE7D0E88B0498604C17966FF23C922FE70C522036200
+
+F5BEA081CDF8BCA8559CB22F108DB527AB6ABAE1B452967E50F712CCCBD11250C55825741F4767
+
+043411EF4D02A1B26E633CBB09E0DC3E68FEA33A257C26BC022769F71F2667776A57887DDC05B0
+
+69C1424F908D8AF85968055739D0E766DA997B2E5C53B9022CFF01B004EB0FDD59BD59A030E6C8
+
+291EE9D771DABBD55EF78B6F2C46B77A7DAF429037B45535865C7F2147D604491D39647E4FCCA1
+
+B5668B1006B0C8F6214D7E5EB5519BE843927C3BE4C3C236F102A1A1EE8B82E5DF34BC8FFDACDB
+
+79B2DB91A52FEE4892F7F2452B903DD6361ECBAB07138F356959B832819C88ABE9A6B999BADA2E
+
+1A3C32B04F731E75C727472E231B1BD79E040BDB72175327250905570FCD9D9D71D627D7914AD4
+
+FA536AA6461D5F512E2E1EB7475AF6A83C10930568DF48BF2794490B1FD7269473E8E56DB81219
+
+5127ED78E500ABCA9D2603EB463248B1B3F6EE7E0C870083849AC7D83B848E819175C4075BDF51
+
+40901761E951EAD19DBE2AB491AD9EB5D124A20CBABBECF05FAC7AD608A1ACBCE7FD1C8848E614
+
+FC989A31D0010EC3A11CD6797EEE941D0546E0A594AAD95738EA0BD0BD7F55CDC0BF8DA082C0E8
+
+CEF349971D13CCE9246B74B6C552479B1E51C7B309AC025897E910B00746C1307BE2C531217E0E
+
+76CE8A47072D08CDA116B65E7568154BBD2D67F5723C187FD46E541977ABBA662BB08079D93BED
+
+78E924C2482B39861FBE1AD338DDF1364736B6030DB2FFF1E8965DD7631276D516A96DDFFC89DD
+
+2D3480422AFB31E9AB81EF1557AC5C723051096C41EA7D40BC7A1A2902E782DF8872DE2F27CC30
+
+0C645D4EF886716F2999815C1AF6372C359BF84C209C42B939185C6CBE14510B9DC029970BFDAD
+
+BFC7E2F4FB0F5060D69CFB0FF71026949BCC15FC179A4DC9BCA64CC4407B694EDBC54720323E4A
+
+271AD388529B07CF23B21886DE7D4CE721BDD11C18C8CD3D1D5261954840E2DEF872F0C711CBAE
+
+5155957BD2E9C4F927B7E8FC19B04608FD411C1301F46092A62F3F0A525436D9918AD9C47A7671
+
+F40AA31896C6DE827DC12FB7E7C7B5A9EAF931BEBF1A4AA4F28F9287C16AB78085A44C56338863
+
+92A9360C188383E33FF598CBCE34703AA4DB85B61B4B79D5387D5576128B22947976617B66FA9E
+
+C3D80E8A0EFE2570FB460060BDFBFD81FFA8A8986F56D26652AB29AD6EB2A4881FC48B023122C9
+
+22DAFA65337110C76490CE3F41BA4AA05F63C6FCB31AA5C399ED01FFF3948AB690BF01A3A1981C
+
+B120DD5BD1C45D2C57297689AEE480685BF23FEDBF665178A1BB54F9A5DA23F72314EC9FD0C697
+
+7CC96078461E48625C87A29D0D144E27A1D4D76E18024D0F6E90DBCEC4A13B7DB75A8E95E715DF
+
+3D73007071FB30FEE9F552D968BEA9B8FB822CCD6DD3383CA9A1E6FE8088C0DCEA9A5D38C0418E
+
+8868115A2BFE6D055580AFEFDF70D512C8488C3C1389F26ADFC767330451F77D20627F9563E919
+
+E5182ED2C8E07DA540EE2C6925D1E5C6AE5D10FAA84DFFE90AD8B882FDD431DDFE36B513614543
+
+18FB47C39FACA4D661785920A8BBEBBD72DBBCAAC1B66C944AEDA018BFF8F15CD5917BE4A1C799
+
+D7F96C69B5B79F11AA36ACFB9A39639D7506E18800A8612D1D2C918F3CD4B977C1FCF1771918CA
+
+7CE4E550A24DC0F9A45971B27AF2D68A8641A4A209B4FD72857710BE6066B5DAB23146AC868043
+
+A04E8152C51CB0FF7DFE41576CFB42998E63F793A33F1B61280BB61597C0E3B176DED299919E72
+
+F6F3FA4C138D20E40B91988EF9DFAF307064C9C307C9F4F2E9AA4D52154E7BDD6196987C6F6E88
+
+0543802347427FAD9EAF1C879928A5404DF240E865383DC007581DC29B28FC18F1E6BA840CB19F
+
+E639C67070A110B07DB6519A5A0729A7DE82A3CDDB03765E1A7C817EC62225A7D2850101E07D22
+
+9C7CBCE0B46A2B335CA90372DADCEE984BD75B0CEF13F1CF7237E15925C7B54B261236E2620874
+
+ACEFB5978C00E066A03A57816A73D8F559FBE006A944E0F026D8CCF319866693B4A62FF4810A2F
+
+D29AC35F429BA0438A7472DA76510937F799B42D962F3F196E15B2335996A92304C4BDDF7127EA
+
+2F09FB7C779525029B0EC86F86C7E415B81D5042714FDFBD2457FDBD5AC6C1D4382D593586E2E2
+
+AE9660529DD0FF72D2C77A9E4B76689F8EE5C9BA72D300271B8CB2BBB36F10F57309344C3114D2
+
+31762FC68BAA5C482B338F847E4EF63F50A9A71BBDD8214C67A9FDCD1CDE72CF070376D80B0BFC
+
+BEFBA9C930942D35E84CA28EA2857ADBA216D89775E45FFB47AC29B41138CA03BD79122A78B991
+
+431714404223B0D01EE8F13800C8346AFFFD8631D4CB1A6AF4653A68819FC2545591D8CBA85E3E
+
+620C816F89B8AA543923139859E0DCF0830C02BEA236E6AC40069CD4BCCED8885CDA68DBDB9071
+
+CE61C61718FE318090B0C2D6CD1058CF9F9A06B81D114215F15D3411327BD48AA846F18E33D9AD
+
+1425CA8487AFB33BF900B4AB8D9DAE545A4EF203F4844F7001C04EB3E5BBF668827A2D12BE4209
+
+31CDE4E81A3AE0501EE4E8E7DA116DB6441152FF89F045150D3EE7929D88E345102EA7F20E714A
+
+0405B415972B1650D5C9202066C813703D202469FD0ED3483875D2CD955E75A892991E446F1418
+
+5558431A076FF440F40CB59D0A9EE40687AEE1CC7336B9D7B9ABF172E4DC863F1591D4D24290AA
+
+8580AF3A3ED5B7E79D8FF6DAB6811B1027FDA887469877304EF1801E8186AF988D0CB892EFF7F0
+
+6A548FF6D5A5A382FFC1A338CFD62DEC1F389A01E26D0F0526AB2B15A7252F1EB03C188D0FE73B
+
+6F4524B4F437840704040AAEA38154526039EFDB651313EFEF1682FD844D6B8126844FD6A19587
+
+A134552833F7AA7E3681EEFFC2589677A4363E8E95469F3C6656E77CF69572D3408E9B6D8436F3
+
+CDB926A3A57EA54276050C4B3CD8964678667AC0785C9E900991117627D435FF038F799DE089E6
+
+DF28E2A40980D7F7256FAA2928EBA12A8D6FDD80551B0CF3AA442D840A11C951B444E519C19F2F
+
+D0F1DE472FAC0E2EA0BA899A3E70313D28B48A6AC362F9C7EA5D5ACF5D04376DE6C88436B760FE
+
+8BF694ECDD6C366AC31D34469000FBF31BAE9C14FB2030F15A2965B917021780EC469F00B0828B
+
+E2FB98E545B2E430921B855036CCFEC6EC9B4FF0EBB69A91495383154AB84F331A3213BDD95158
+
+20BEDEFF4975E076AA8BD9A4899B5BE7ADB271C17823B18488D7B387B1AFC7106C87D219DDF96A
+
+E866F1B06760765BB2AFDDD952FE0BCDBB6318345F8DAD1A782AA536F7148ADC2D3BF5EF6C6A62
+
+9DAC5A49BF18F9F21E9AD7DEBD237C229286FE2370560139569338D455D8D3A913D329E8072E63
+
+A07660176FBEFEB9D88FC1C2D9D76C51CD30781E4EE59F8BF4F436D9AA13A39CED387CB57324D7
+
+26ABDAEB30DB1B1E14769F5F4DC72ADC8BD757906FC443BF6DFDDDF2CDA866402363DFD9BE8B88
+
+A68DA3D0E0B3BAA404A97F551A0B6C90D349FB9F17DE955FF5FCF807C3889FE10DCA11AC73E855
+
+B7D92A26E64BE1971AB93582F7F53F1C7B1FE401D7F0EB0EB121266CFF5E23B3332D8B4102A4CE
+
+F30634C7107FF9780A8BFEFEB13FE5EA78D8E5C9E2E88E22353D24FC45889CA12FFA14D370900F
+
+257B14E761D49C74FC19B97412120E4BE4EAD094398E92BF1DEF4D34E1DC258A85BC623547B871
+
+04FBB02F402204024A66BF66EDA4DB5F667FDFD7C0CB6FFD799288DB110EA1FE7D7C3CF3A130B4
+
+29D2450D87507E68C68F2F130A3414B4478AFB1ED6BD55AF66EC53E627B0F27649D5C5AA59A791
+
+92DE139AAC89A378F0DA22A328BAED591D66035B958B33971B67D736B119732A5244562CE932AD
+
+36ED9C9BF9A0756DD63E909527114D58061879508B9C043A7018AC3F1BCFD070C7C6DB879CBC5F
+
+305BCB24C16F43D8E9B77B5D2A0D3737536E645049A64ED555C99909AF80F60B2F2307EC58EF91
+
+479E1C447A57EFA5AD0652F78F952E6508A768A88F8DDEC8549865B9266B54D03AFB1929F71DD5
+
+177D05DBDB4553A8C3EBA11F284D9F6C8A235372F75C9C06A1359733978AE5F9653F015741E648
+
+26EB92F4AE59D11405A59954475D559ACB8D098CD4C026A95D678AFD85A9F2031F6D242A285486
+
+1385CD2BED55B6E54261AD3A95C6AB4626FBC5D6C4F6A60992976D406FEECDB792211CA133C433
+
+28F8D43FAFAB9A4489DD1E1E8884B4BA0B258660FB8B8BEA218DE0A7D9E5DCEAE8BA1FFA236268
+
+7AE463303E16C6DBAD3E2FBDC0C904B83DBA9134B3C72EC1FCF6855C08E973E00BA8D37E864EF2
+
+0B6748A6625C854116C3E32D5B24F584963D5B492F6666A284D16A2F3E32E5D7792DCC1E5605B4
+
+CDBE4E0D62DFE84B351B24A509A5DC9D1C2132B81C682096DF4ED7CE6A3D6DC517C6FEE8103DA7
+
+3B5D841D2B4BBAADCD7D1316EAC6809F76B99FE16EA92272782AE3930F1A0052078D98AA17367E
+
+7041C383C730EE085D6089164AADC4637D3CC6A61F292E581DB0D37B7D1214A8F12852FFB636D7
+
+2F2FD9E6AB2AE1F967E2A750AC0AD364E64207669A2BAEBD191E494D1B087448F6DBD8B2293A27
+
+C115E34DEEF3DF79AE1AB33201E0AD653ACA72CC06AD15575314DE4B76009F761B8A1C6788A672
+
+2D20DE46026772117F42171B5D09E5414A54EA45D760DD3FD47FB5458A78E5FFC83B59AEE4F8C2
+
+4106E0D76B719F7C1295DCBC71AD46DEF7E2472BE922047D8B633D386102BCBA4964A90A5247C0
+
+D24CCA298D38A3C513D260EE4821B58391984253385BC61429658E328D86DC61B5FE047705C8DE
+
+C93170F92376BB4CE94B4C92B8CE638FEC140832DFD8583430EE39137342CA0F529737A8F9E184
+
+264AE2A1E172377E931C6A8C0141D36F6446011A9715D4B6BBE1DDCA53E3AC72A71F60ED86EC6C
+
+FDA227E05534991E76E9AA48522EA4261F4A5670276C8048A4AB9500719D92F04080D318B156FF
+
+FC216BC1BE00C8E3160752BF5B029BAA85780C51C4CA162C7840E74507D433CC9D71C62B4CAE14
+
+A3AB4ADB2729C7538B2ECBEC4E69A1F77903BBC68CFED0BE0DEE9C690E7CE74B5BB9C27A5F115D
+
+B17015C39A8E60435E00056879745A41552F95F7A540D535A02F29061AE5D30DDEB8D30D9FC2BE
+
+B04CD49DFD2363C4C7FE8384E90F98BA8C26381D9D3428029CBB9933AB471CEF18F3F8EE585309
+
+29731EB100908BBC1F074F399AA39CCF5D12DA38CA38F464C958887C155A4A77A002F91090DDA2
+
+00B815AD1E02C03F44844628BD703E2E0D6AB53C819373A94ADFFFA6579160E69AD0F1EC130930
+
+22F0B4D2F710CFB0F734B01F625E407F9F7E0F143131C1713D770144664EA989BE0B9ECC3B9FB1
+
+45C1043F02B481D8CABCF21DC134553FC4C1D4353E7180EA4CB1FCEABEF74D6FE5BBEAC7F30B08
+
+1D88EB0A0626622A557DF6E860E54537A8FE0D2ED0B974B994406AE52D47E94FB8E29EF6B02DD9
+
+4A37DC770DA855A59B74BAAE1685BA3EAE24FEF55B06A6036A3D4F5109F1ED4B59AA6218629C1F
+
+455145479611A2B9FA83A7AB1C8A80C5BAEDE37E7BE195C68E36FD18E20BEC787BB13B8E1C9806
+
+747D85C64A42181637E86CA28FF135CED22E4D4535CDE74E2AD4CA93F9A30E7940F28DB59AC1A4
+
+1F8CA12CB965E0BB5C45A5F1D0A5DBCDA210433733384A75CBA8EB93BCFF05AEE3444587FF31CF
+
+6495FF8CAB4CECA16FEB0C81EB48571D30040A90CC422043B8EA732A4DAFE4E552374153124B4E
+
+B3D35C56EE5B4A146111BBC6D9630DB2C9E04D26EBDADB46139C259319C7C9A750FF2945134676
+
+87DE68BAB7BA6DECA22FCAF2E5F20867A9C17AB3E3DCAC03A8DB896D2C0243E95652529875518C
+
+CE050A49DE34F59F3A3422C3C6E4A57FB343A0458858C6B676F920857EABD9941924C5710C6768
+
+C5A0081FB8F47E9BC9ECB701BF097F033C4AAC3E18B02EF9222867D25FDA8FD291F930D163F344
+
+5EE38B44FADC0E830F93560E1BA52EB9CE9B375E9F0DFD60627BFC8368BC0B7C4C443D8D91907E
+
+9FDCD0666EE6A9D9642809314652EFD4E5769A164B50DFF8486F208903CE4F5176C86C3642DB60
+
+AC3FA2DE9C104E36BB76D56DA593FB796036C17A04A65F2BE8BB9B37055DCD6F79E18AB00BDCBA
+
+AAF3FA95C49A84A69EF4C11D60658C35205D97D3AC3003B6592EE366A16AA0D1F9D32E9EEB5B88
+
+08AFD6123CF756C524E15C7E5DD0FE7CFEA135BE1BE85201EFEDF61F046C652A48D435A2F6024E
+
+A310E4FD3CBEE0A9C6B1CD02B1F3A1C8C973C5F281C86194501BD03EB5C3E2A30C9EBB8E4EFB16
+
+63EEDC0969C48C6724A5C126E05B9579C0310869DD1EC88A7BF8562EED99C57C115419E6599BA5
+
+8323324867E2BD6E972632380D2D271E332C52E1A87BB45C4F66C9F83693E6A9A25BC0B1BB7570
+
+18FEE261F8D4529D93F23289C0B75CFB0BB6A55545712C945707FBC29CBB70A4C9C3976C1DD0F6
+
+171E579A75FBAB3821A2C5DE45D8C17EA16FA4BE1069D7549E57E5922BFA18286A1BAAD644161A
+
+02AB843CD5626028C3E6A52BD3CDC7599627A49AD4880EA5AB56936656A87BADB828C6C9200E28
+
+270D8041269ED78A655718099F099E9F17FE27A71DF161D4F1606090F192E561ACA5F32B827854
+
+2611632F21CCEB3225334427D9EAF9AD3D9696AB3B0596598D2DA1912EADD2A7D0859AB26D6CFA
+
+2276B79C826353CAA0EA34F690D6396768EFA8BD8A65CAB43232723324CD05FC517F317D8C5E0C
+
+809FFE78C393F7E8BD88141D1AFAE885E02BB0203C7D726310F6EDDDE8B38C1FFFF342D4E81EFC
+
+1CC68D072F68A0FAC14BF5A90EB7F07604479489CC57209796969D62C92134B59ADF264EB1B158
+
+56AF2B32CC769ACA670351EAD8D3E59117E613A4FD5845C38AA0AD375196F2628920F299B94EC2
+
+363847CA4707A9506C8DE4EA9B0C38DA88567FCED40BC94E7465C39D3F627EF70429548C38C2E1
+
+F007005DFE7BAA7701B183A2CFDEB36CF84091242A3CDD8C5947513BCF7FAA462A92F1E84B3196
+
+E3CFB019320485FED7DB231ACBC56C0EEFCF344525F0DE150AA8933A4D1AEFC4C2699C4B1E5FBC
+
+15AA3A894023FD3F0C75D797E710FC1B41C48BAC6F5AA0BB2CB178B705C103B68F7E8436C4DD02
+
+F054C2B4B6C38736D99C5BD8C57AFAE676FC8B4F078DB83EE6FEA0C97BD434061BF572F6615B37
+
+419EF5250E32C4F0F48EE779E500E7E3C4D2AFF699A4077473A29CE8C2A2FB92646107576F42E4
+
+8DE1233ABA4720564DE68990425D6B4990FD198243277457A42693457CC7AAFB358184F6AAA4FA
+
+1FEBC93C5733812A1B308DA509F473760D1F2E846F8EB2D52FD55CB220F4C198204BD21EA2DF0B
+
+31434616F86D529DE5CBCAC53FDB7EEA6972691E9B8981521087C25F1574576BF799569E3699EB
+
+74618DDFCD5F01E6BAB0FF513EC7E2B3003006D96E4095EF5009044A5F1C3B006AEB4D15ECDE5D
+
+53C1C76D35D87AF201BB47C94DAB1BCC182C4F48747AA7E1ED991C4B62D9F9D08D4283EED5D288
+
+7EE21B7DE249F731509FB6B9089543F4791C41F3BC0EEFA197923DA86308DEC8D632BE0221294C
+
+A4AED2F61C297D167045E5E5A3012E223D6C348899712C550638351F12FEB3D67368959EAA8B00
+
+90996E39EDDC5B3B1684E2DF4DFCDBC89A6A6F9B0AFCCB2115217316A48812C168B243734B57B9
+
+CBD7F05A1CCE9E325F0FBDA791EAE7E666D1FD7F2D5F085165D2BB10387513ACF9A900F84934CE
+
+93A66CD1BED3F990714AD938BA8572A71E5B2557C294C1D1A20F27E51B355FB37112345DC33707
+
+73FE750D5C2330781E0A05636DF0F283046B973D1B124D92A21A3E0ACEA879849700D5901093F2
+
+7B3F90460D82194CDB01A2CF38FAEF964374EB11D0E150A2297D8CA4A5A5C55BEA93B00ECC919E
+
+7246C289404CAD3466EF6BF2810CF1EF740D285D3302B5B3363A607491871FCD181E8CED5C0C30
+
+19FA33F165CD9630D130917C2A246F2D5003657DBB2FA8A7E3FA840482CF21E574AB74B9EB5027
+
+387DA40FB3EBBA1894297CD356E20ACF7D956A3E142248A5899FE940A25BD5C812C0E8DC923EFE
+
+27E49644938E3BD99A086AD697F0AC758390B364B52C049BB1B32376F3AEFC15CB4DB333C148BE
+
+9CA5C18DB38B9EB1F39F07C3C2EAE2AFB0238F687583ED7FE04F55632541AC572E0BB7C7659AA3
+
+999D8CA12D6267FDB0F1CD720C174CC28EE37C78CD803B876B8168205F36687C12C0A2D35D1DE4
+
+B86F4E865A741E82EEA9C8E4383AEC599D1DB85C6BF3883C3218BBC0AB643CD51B8D51A34492F0
+
+CB4C1BA4781929C2784C11F84DE699B0C84C35A504C35E672E941F1D6BA54960F6C519F11028DD
+
+CF0E0991E18A77F772C43CE95BDEDDA9C8D85633EA60A7358E0645D4B64F751B11AE8AE27ECB17
+
+CB385DE259BA1FD78EA8A55DBFECC2670DA3C0140479B61ACD99A59ADC50849C6AA787C7A9B975
+
+D84E2A30529AB8FAE0995DD66BBB5C6053E3B96C567156A4696B1736C2F6E1834B8B8EE42CDB90
+
+315692D6BE299D714C6E43CE13DE4282B261C5188ED6C6D875B8D308D844152BEB15A3B15A8B6A
+
+924DCF7285FB858973671B972AEEE6774A57526F21FC7EED805693A007B2B43694D5D30C9DA604
+
+B3FA6278114DD98744698D885FF714743BBE7F81F2FBABE454BFFD74CB601AE106AAE61E099486
+
+1754E4CF312A1DDC7BD0F85D854D15FDBBF296317ABB0D0B2824CECE362E2137A2F5792279EF05
+
+D0FA6B7DDD4FEF69FFF97AD07FA95F3CB393C4B0DB2311596AB63974B6B761CC98407731AFF2DE
+
+1A522753315EDC07F72CC73BF7B55D769E024A09710F141A21BF94E9B71C8812CDD8C7F7C3AC60
+
+618ECCE4AC81F7D86B75E126736A904256F5558ECE41A471E8F77B5FBD1FE2FF4CF0FE56861223
+
+24C1D13CAF1576306ADCAC1927686139882609FCE3367171FBD0F017DCEDFC909B4039643C3FAE
+
+F5946EA31312460BAA458F5AC3A3E57E5247AA390ECA4F29EA32324F06AA3C376CB5C680DD16F3
+
+8434566DC54E7D4C6D6390124BB69EF6D9AB265D1ED2C68335870B09DF57C137E603A0F8D26E77
+
+A4B18B7E7225B0A92AF92C4F22D43AE053EECAEB3F8981A8ED13D504E6467D266BF7244C0A1A30
+
+A59700C1EB9E18131263AF51A9460C1B753316A1BC587FAFE3B5A7EC6E86626D5FBE6BA3113FAD
+
+E67631B83301424CA27AFC6164414F8262E3FE28270F8ADA96AF0232FFAFE64D37F510741EAB4C
+
+116E09780A2C64AB82C655B1EA221EEF257C667938E34A4F956B7DD951D10D2344D228DF2B59CB
+
+E9AB72822ACE270789F972426D56A03686EADE28431C07B3BD73F6BE22FDF7688E3B77128CF74F
+
+DE98734C3390EDB78740F24452ABC545AD08057CEF1323338C0CF3F0210A9D50CF7D4591D22DC4
+
+76E429B462B76E965583146684B0E2A8C6D40AC7F42D595478C94C01F9AFC8A1ADBE2D4B13E02D
+
+D52A19886A3978CCF3C9C9E391FD66039C5622839CC60120408839E5558136C57E4BEA2761F38A
+
+6D00F4951267377F369B7782C92D7BF00C6F812962F86BBDAA43DA7DF4680EE852F4EF9D82BB34
+
+5BC1F8F76A9B7C09820108BFE054C80AB56B88B438489D0CC0972081255C9EFACDAA08BC81E0B7
+
+E04C201A1212D597628BB82894EA711D739161E513994A67C0C63597117736CF1A9048D244E09D
+
+4804C10483D047433F0A69259DCF999558AFFB6739D372221E490EA8B106D0AFC78EAD9BD50E52
+
+FCDACA4C0F3ED13650B73EC4F8D0C6C4B0BE299B4AB253DD4ABCD28A96F762CE45787FEFA89D7D
+
+F5675D0DE092FA7097198538F031A75BFA2E91A64D1206AB59C5FDBC24C80FA54CD168E19541EF
+
+79736FC6D00896D75C64E79D93C6658A002A91B5BAC71583518C604973652220CF1CB626DAD853
+
+8C16645C699F5785A8626BF1A62FEAB57CB263881B102891B5D886B09F678AE801CBFFACA29067
+
+C1126BB0136ACDDE81D07F2F9199FE439D3553A8152E9E2C31EBA2E0754BBBA72DCF525A85B08F
+
+FC52CAB7135E2A3C849DFBCA86FA0C2217B9CFF755542FB4C145A561696D3561B5C53F570F617F
+
+60CBC31A1EE0F570099C4FC2C4703E1B2AE86C72A3EF8A138EE9CCAC2814533DA20E4AB5D170D9
+
+BB2A2A4FE1C14A95E18DBF3EFB0400A835EC1F50004CBDA8FFE73347027B9151C0E00111C3DB3B
+
+15447D000CB0E6FD0FE985AD70AE5243EC8DCCE1E5E70018087A36A725DE1A6B6EA02A9CC323CA
+
+943BCFC546B5FF43D3EC315817DD6593B6AC7C52035E06629509EBE7CF9B5F9B24E291C06952C8
+
+CC8AF9A5FEBDF8D16B22D7BB518E1191A1E0DBA68066F1CE159C5E7609EC3AC7F4A052EBE5E027
+
+07124CDF8418DB9C026563402764B44B0E8AF31F2BD60DA60E42C0B329EE32C0344D409E155FD9
+
+3A6F2995F965DF6855222AB0996B185DEC4790642BA10D3B97B1028D9AE6943B7DE5F2C7A9E15A
+
+D670FD350CB7A63316DF50950773AFBBF7F7BFC8BC910EF3A955708830C13C931E85CF7D165DAB
+
+7A927810963307FCC2254AC2CC9CE5B83293AFDFB9A5DD00800AC68B431C08B2E92BB2BFB6FF55
+
+6D70512CA099BF840CEE70CF163131BAFDC2D36F9089E090DC660A94F170C0ED6F5BB6EE2AD769
+
+BE951B40DC1E46180B2E557289C9F13CBD9D331F208462A20C269629AF7E181B9776335CD34A9E
+
+AB4B1D8196899BBBE946FD56C8180C42C178536E72A131A4D087ACD38B9662CF3E0BC2C04E9384
+
+8263F8D64EDC6B3C511C30EF4A782DA27E530F96AA0E1CA4D28EA1062FF4643065DDF958DD9124
+
+BD975D27D6BC79EA3A1963B9930B5DC0297AB9E3F02745BCFEBF83BB9DAB46E2D3423DEFBF0527
+
+7013D6FCD08EAA5407CCEE0F91B8D6B4DC89E3A467759B81C81379952E3621D57E86B79605EC10
+
+59A9D46BB301EBBECCCB615DF91D7A0A92B17EC4C8716C4F1E67DE7D069F7CA1E4566F6D9DB96A
+
+E3BAABFCB6E2DF6005182B7BBBA7F96F99315CA76E12497BB76B2C94B85543F7F1819D3F53F2CD
+
+B6DABCC5C8E7B80995DCD3D04A5F47EF30D725EB6158A7A32EC17D4970A1159455B23075774DBA
+
+95CF0DF8F15FCB4AADE80C8D0C92762597461A7B04384AC2556486B3A521B44718911083B06224
+
+3BD1D54A4C8CAB43D207FA4661AAC7CF4A0A421C01111A02AEAA3A98EAF39B15298EB75E16C3F6
+
+7BE08948F016C922EF7489B3369817780C7FBA1712B8F1260EFE02F0A7F112DD0E85C62026CF63
+
+C30633F1C55843AB7EBCC38F38E2517E35D257D7220BFF5BE2C6CCE34BB73EC225CAD182E702B3
+
+C03740D558DFCBC5FCED3DB10AEC7AF1E6AE84B54D5D4CA79F56DD690DAFC5AE7F9383EC2232D3
+
+4BBD2B125CB78E2B2012712B3C51849867665C98CA25F3E6B9E02EC89B5B376D7905F7302CD6E2
+
+8C33470C0B343160BF0F1B3A9CA0A47B6065B6537AFEBC1CBCEF795083CBC98CEAF9A60D9CEF8E
+
+E6F487CECD88484BB4F149807CC4B896F511C2C530EF292AA50A9D5E55C935209300AE63A15A7D
+
+7FDD1179B2F57525B70F6EF40036BD66B6C26A998077D5BB50BBC122B806D45AC248B52CAA6E4F
+
+B9E039E30BEB78CDADDE810534751F7A32356A51065CDE5424750CEA579D034A6C6CBCBA2B2638
+
+89B767879DAAA9923F0FA769ADB474373CF8EAEE7CB465F859DFE1E70085F5FC946C31354F1E24
+
+4F31C7E9B5F7903D92D73886ACAE7666F2CDD1CE3AAF67079DC4E919119230DA6B369AADDF240C
+
+E90DBCD8AB3972CE09E5710B95963C6A62EE56E09164EFA77ACA7E0EC5FCEF4D37A2DBC54A9783
+
+DB9E21045860D59321743522C7BDD14F073DD55B613F7F15065EF97456D1C930E6B8FB5D9EC44B
+
+1110AC075443459EF10C48EF8E4FAC4493BE949B75ED0EBBCCB03E091144C18F1EA0239F90FD71
+
+E24B2C06AF13BBDDCD58CEE4C5A2926C873099D187219D067FE727B61C1859716C3DF07CF14CE5
+
+7D6A7925E329840D68F0AD61DB3FEF91B20DA41EB6F28352A9C49F7A141C6F43056A6CFC254E4A
+
+47A3F967AF9714F52459C5039CE105795612155576BE080701A77F0026FDDB2DA5B7F82D1CAC32
+
+C4EF60268870566A6C3CCB2FCCF0E11AB60FD644DACA696895FFA2CF72270C190F482EAE5753B5
+
+BFCD1AD6E2E8B10535DA012954D085C9A14DE998985E08F17446D8159DF61E0CDA6435147D4B6D
+
+8A2D2B115F49D2E10ADDD4EB66CA42161A5E9005A736D954244AB3D6520741CF1E3AC63930F40B
+
+3048F7801E18AFE557DFBF50C6E2C10D4F285F05B2C2C574D327C43A91501E6ACA45048C0DBCCE
+
+E966C28ADE74E461BFF1CF584F406E32BA473E0742B4329A76663D92B680E80A4BAECACCA837A1
+
+8C98D88F12039D80E6A8B7B0B206BFF62B073AB5961BEE45DAADC5493193780DA81792BF4E76B0
+
+A5542E5C973919D0EE1DA1DE5A5FA269862BB0D4694652849B612681CDCC7505CAC95B8FD72E26
+
+51B7E4C955608060FD1B5E4F8AB8ABCA6809FFE151203A5CA905849F629BDDD14899A9BBE3B175
+
+8AFDBFBD82ECA5B35F2C2B35D5C267E82E009CDDC6BE35E99E7918A69F28D1B7738B93916FB7BE
+
+CACB82727E263453F41D1CAE5F38B6C3709F00DE49573135553DEF7699FA6F96416AD567D971B3
+
+1893714A09B5B356D44783393FA1DF7EC6FC33FE5018454EBBD5B2ACF6AA6080565FCE674F3DA1
+
+DBD77DABF0DC6B34E1949BA2C010C5481009DA4337F7383D269DED79711A08E787228E09F0C3DE
+
+98C0EF82715C4FABFBC760775BFD1CEC7CCC8163331341A7D08209D3EDE45D78AB2A05D5726E2B
+
+D669043E02AF274385E1613F6A42E7E9B94B7662A5904C2669C827272ABC96ABE376DF7094ED2C
+
+21EC501CC30E631B2CD3B0F4BAB8C3CF2025130A99B93C704DF2F015A46874B5BCC8E65619FA50
+
+0D1AE2BCBD4C27F92447CD9E423EC5B67E35DF04CE30ACD6628A13FA20C14B518DD0301D3BEADA
+
+0A9C14B8DCB278170C97E107B4BADBA1B25B17F268F8B52B89575627478E28EF59F2D856C8CAA6
+
+0376C53E95BA854FC059EA938575276CE4716B7A19CD980998AAA79EC8ED57D56EE2EA80D2AB7C
+
+9B18100DA2A7EFA70ED40A32AB292129D897ADCD1CEBF6B30BB768ACABACC480AD6BF1E701E332
+
+B1A9746CEDDD127441C695C3A424A6DD84BF684A90B027B68EFBDEC98AA5B9CD97FAFAAAFC195D
+
+DC5468876B28F56E2F3AAB74D97366441B28CBAC0D328EB8FD98DF06E9980E21CA7F62345F00D3
+
+8CA82A1CBFE954CF8C5C77017A5E5CB6ECED90222B5B15D5D7310B3E24A98A64644EEAE0B0CB22
+
+BDC7FCC983CA94104C3AFAE71A75A3510CED1C210379E289C721BD4EFF82673565275826A41EA5
+
+3008BD6C1882E9C82346DA91E8DDBF092E78BFC009A0BCB0097E977881BF3C81BB6DE2784AFEF9
+
+BB0FE52CA91CB1EBBF01024B1EF941144229B0127599284FBF6EA7809BF36FABACFABE3FBA41A6
+
+CCDEEA1FF6656805CD945439E36F771DBF56F85AC6C9759FD7741FCA38CC362811962882428A9A
+
+29F9E788312B6751E4CC6AF15CB517E8F17A320BA4335D4C869C76FCAE7BDE59334C72B578B055
+
+AF5850D19199F26388B46D9E9F2940DAC3D9A43F45C5F7643CBA2D391672509102A883AADB998D
+
+1CBCB888D5BB71D740582F7B2BE1EDE7D6EF4A914DDF5368D547DADA2BE55971619AFE8D3A6728
+
+8C8F0A7FE9EC44E4E016091F7B14F79E81A4CD8C2599F6AE776136D38222AF1F61E18BD8BD6D6D
+
+23191E2D3AA63217C913C8D62A0940516E70996A30473621B8A257465D1E6B2966BAD8B447FA8D
+
+8E2EC2BE15CFAC9637A5BE198D2EFE6D8C204CDDF85399B98CA6911C9C8ED5F248F06CC8E9C27B
+
+6EBCCC8B2E54C4D15CE46A6BF3812CBDD67FFE2C83370EE792FB17C63C4222FB5EA5C363C296C4
+
+F9D174E62A3E8B6B7FE35BF4663E3D83D921486909441F1FDC95990C9189837094455BFAD987D9
+
+220E44CBFF2E4968E3D7D1D77AFCE67966B8E9FD11E13A66DE61C5F23DD00C6C48AE0AD7DE4DEA
+
+0BBB2C604E443FB88448FB6FC61D8AEEBD52C4937F5D28F611A758C111D1D57CBC262DBD0BC8DF
+
+A11E299C28240EDA643CC06A101FC0E45A3518E34F8BEBC4964DD5A84679F1E4C0A29284FD2C9A
+
+87E7DC0D1F3DBF68EB177C9C1CD6781A23372D3FBE655CC4DFEAC5134DEEDCC6F330176765D791
+
+D495ACEE8CB6FC15ED913A28706B538D9F97E986BC628DEEB1EFC820936E431BD5D0914C1E08AF
+
+D179571600350488E4342F7277F789A7BDB974A3D06DD9ACF9BC645FD11C253A92773F95CDF4AF
+
+911A7DD810A717617CEF422F7E2079CA35D7996D5D52A50F220E9B26A65A0A17B7DA4A864FCC2C
+
+DDF5CC26FE1E551A202F625941BAA8093A40E42FEFFB17D0262277AB9A9E41723ABC73817FAB73
+
+A7B59E306C148E2E9865DCA0DE0A03E46EA6938B53E030694F02F1CE0F8AFF7A89FAE33C8C7EA4
+
+72AC3BA8680AC06E61C60026F1C589E8381B3A54A86155156D20332FF2E5573755F0B980967BB6
+
+BE86A858B6EC486862BA702AD117185081B22A0359C811CEFCE9718AC2C3512A65AC63281BC018
+
+88849D996D8E1AA12002732CDEF0B8CF3911F71D905D52D9BEECECFA4A2DF8290C8A47021A6FA1
+
+146FF38E6424E588B4B4E10031F60C512DF082F09B539C18D08F18A4239FA9B64848CE318B0F9C
+
+B9F6A28D6BF1E788C16D6A7FB9201642206044F470D2AEC35DE8562C17DD7F522AB733E796B870
+
+4E05485F865355E55EEECF60E4A2B4E4CFA8E9822685C87A60562AC1459E246C7DA17F174E9E07
+
+2101975144EE4F24CDE6ED9254FB8ADEB415F895D3A71C68972628B39A058803DB85F07BC492A4
+
+72283DD3D27DB2359F881E1038324B38FF7C4EEF91EF1A00B741B51158199736473984D2080099
+
+CE737B03325F39D77EE2D5E7BBF1301207FEB963EDD88B52EAE4920A0CB758FCDCAD0411200A46
+
+48E657C26A41E7577D7E876A6A9DE16B2879A6CC6DBF8940BA4CF861579586F7AB2381F1D24404
+
+90BFD3FF6747FA93F3DED4671AECDF1C40344E75BC741CA78A2079114C7A94ADC560264E79464A
+
+2DDBA4D4E7848A2553FDE1CB51F51F9E6F10AB1AC4AC4D2FDF5D492AB9B8B71C6834F0DC3B239B
+
+E38621785C63DF6038B74D7D537BCB41147EA857BBDBBA40EA5550EA85935456D4BC945C7F56EE
+
+D375E22086CACA75B3E199125114EE9FA656FF5E9029566A72E9BA4C2DB5B83A5CA6CF2E1368B9
+
+B8B2D0B1E2ED6EE8B6EC56E3518019D92B6C062A92F77C09CA192E1E527626EEC78E553876EFAA
+
+0CDF14EAF92512C71FF6F00BBC63D8BC5093C0C343B927A4F233C0A1ED7961426D7B0296698F72
+
+51C051E3F28231FD3021485E3D8228C86299064AB9DAD2E63E59B995A4C6FA0F453114E83232F5
+
+982866D16EA1F35437C64807F8A72FA8DCDA4DC33B31840EDE22CC80F9C32F08F11683EE696204
+
+457280B39A2891ACE3433CCEA80465F0C07BE27115473FBB411CCEB8E3E532E8125AEA0026CE4D
+
+9F5054D296974F2D0A93D2E6526E88C266A54E937097572F03B66DD7F1939A82A8F4775EAB1CB2
+
+47E9DFEAE00C8A859F39103B149CA33BC6F932103736E727420201F3D38959ABAED09D9D0BA171
+
+F16344A49320062D4B0C30B82434A6482E23B0455E822358C76941E2EC6A8F574755551A771786
+
+07011FA2F4D0FFA7ABCA64205B4301CC8C47B1CD035947BAC00C26C1255EC01A6D90C58F760EBE
+
+7D7B40DB25E978CD72CDB8CCD13255D5DEB867043AC221CD32D78F60F8D9ACFC95340546DD7B7E
+
+A6CCFA481052C58BB41B35DD03B8D1ACC9BD8BC0A8C80CA72D9617AA6A151715263574F9665D62
+
+998818D755CD50A2D92DF966C05D28EA03FB5AE5709B93498EF66EA2D96681003E9F3316200A12
+
+DA96964D6B0BB42077A5306B713C46349C18EE4228EC1A9C29C10BA58218DF587BD534F08C044D
+
+6F09A5F103648BEF06337D3834709A69818F3D6234ACCB4A068F96048819D1D7A023A56903F894
+
+D378281BFA2339FE1A7483B72BCA52F6305A74A1421162BBA1253634EB7450149DF2FE3E10C6FA
+
+1235C24F82DACBDAF11986D3657067ACE1A8E2DE104EB4E101B6491FBD67EC70551DA5694BD122
+
+E35443DF164D0BAC413DD3DC1787AB92FDEBF0806942163B26EB3D142B03EEF3581CD3C32E53C3
+
+57205AA5214D723E4CE6939A9A093329C535621AD0E903411F755E71536C7E37A63B9952A9ABE9
+
+E892ACDC24716EC93661BB9F5A327AD098464D92A180475EAE5F209F0EBDFD799F7E9827F657F4
+
+8D39787ABD496491C8893E1C0633E5AC2E4F75A5A960CD535F0FC96E8F4FE555795C96055E05F7
+
+A05E82F5376513452591618FBB94860D90C701BC8525AF9C1967D97B853BA4ED48D095E995F77B
+
+140C4E1569AE44DD12AABC68801C014987F88DCF2B0191AEABCED90CAC275BEA617387D0F7A1AE
+
+58FCDBAB5D752D318EA1482BF580F7EAFD882B6864BF03CB2E4D59C179A0146C1BBC701F78B715
+
+5F3222AD0C1E76868106DCCA0D5DB602D83CD2DC870EE6E41F5610835B8F2FE2EC730EF9DE0BBB
+
+FEF4308A9AA0392BF0DF1C92CDE4F4ADE95DA0D13951476559CD3B4B7DEA14DF44597A9969BEB5
+
+33D87C8C19518219C64767DDFA5FACF173D64CCF96A36F962D53EE1580B823AFCF9E6E290454FD
+
+1C6C31C45DDE4220F04F3D85343A2B34EFEA529364D6CFDE58A5F225F7EF5076EDC22350F86176
+
+60DC8F9D72E7EB826A5E83CD1B2F0DACDF0195C67D4EE726870111F1A8766D73FFC89440046421
+
+958479D56FD0C78CA5EA7801EB645E593229031821AAC4664B5C814A88F58DCBD1CD44F83364C2
+
+2FB9EBEEDA09F97539843F54DB7FFD4AB3216DF6AC305F5D80EC63250C33E403385AE009B5AF1F
+
+5D831549B2ADD5ED946A694091D140F2C024FEA22BEA365E7EF7FF6F60E5F3B3769B667D2EE5A3
+
+358DD5602BCE6196CF32EB0270990FA05D9523712ABC8D8D24B5DBC77F05F5AF74C174D375061E
+
+A5F97DA12FD34223D84D14B547EB49B40CACE1755A4B09AAAE1AC31C5F62B57911DA81BD2C3C47
+
+FADCD221D9D04C2B4947E665A2B3D2A207DCB35213374C103A910DF8505ACECB1CD8349CF17ACB
+
+5EA463F040ED7649C718CEC21C6C82BCA30EE6CEB79C0A6F1FDBE16BA09CFAC34F7333ED1D189C
+
+1C0D872FD3182F329AAE3DF72BA0A0CDBE264DAB1AA8199CF5BC15678DB215657925C69DE05327
+
+102970108B4A5C67C280FD6C50F731E89672BBA79AEEDD3E623745E576452EB6C15733EC62B3C8
+
+D3D56D6FA18B50A21F6F318C2C36B5178E2D7E438D6590DA1C8FCBFDE177AD48E6673E1DAD7B60
+
+F4438F1AB360F2D40F1A30A0F87D7BAF53E6EE78BBF5B5A9565CABAD7E825D03847430C6422E39
+
+9F0858019AEB3056F2294EE96E4E9F182EC45FFC4EA98E0D499987FF218DC95D051EB30D65B088
+
+9CACA6EC7CD83118AF21E4D77E2A25B21F721105960025213131BB9E0BCEFD8DD79ED1BC39B0B9
+
+07A4ED456A9C51DDE3430010EC11D39A5317451B3777CC60CA9E02A50D3F66054DD668D016CD47
+
+C80EDEFD4A2ABE850D4322243FAE5B169CDD09BD253F3F24AB0B69B2DBE9A79E76CD393B71B942
+
+67883E9306E4AC25FC7C9BF66DC685B51348B0382F971242A764758437675D706FDFD6C14C0F0D
+
+DED0A5AACC1A23CF11ACD2F3B3098B3D2B4F0D34B045D78F98874EB2CCB25115CC47672C970844
+
+24C65A68AFDA977DBA9E519F280C3245AF8E89D0A3AEF334480056A1F203E1BFA0208BABD9BBF5
+
+0423E569F49BF4AAB4425E9D7C3C1FF9DCF6E32E53F881F2F880E1C0336D953A0D068B7DA33E16
+
+3E35DA07B9B5A3B5B9CD266B61E1E4423311A03709840309FFDDDFF0D0035E2D4F5793E6E916F3
+
+DBBDEA8E86C8C7381C16CC6901BA6C0D06DD0FF643AE6B59CA5506793D2B012A19CDE7A0D8B81C
+
+2FACEAC32BB2380C115F9A50FEF2E60AF7590E42138599F6E7637902B10571C4159EEA7B058E4D
+
+7392531DD1B2A3B1A5BB178454CF365AEE4997DE8267DAB239A8DDF7AB69F92CE805B56C336860
+
+C26529AC6FB987488B844957870B40E2A8B3B29FC3FCAEF0B3A6C02570F8661F4E4E455AFA1AE2
+
+52316BECB2C88FD34CCD6F6EEC6B703FBFFF5BDC8BAF056E5590F16BF93564722741FFF344CC8C
+
+86A1DE8AFAA4E2F58B5FD916D163D287327553EC1012183C46DCD9200011053ED4DDF774036C1C
+
+5DCF958B8E09B86CAE24E44B4ABCCB05DCACA0CF4B81998FB73E4E43582D2F204CA8D97882DFCE
+
+EEEF643AA39B5D4C9EB3EC3886A9D54E6ADCC2549E53AEBA70CA4CFAB465EC0D336D15870A2738
+
+72810C24C079AAB893AC53C3A2B42F39A4935E10F1B3F299E9BB3486D00ED66A18F03BA2DCBB04
+
+30DEC8D40D0077686CCBE52FC550EA96DA10223D1F1F098449643364615AE98BC26DDAF2D02508
+
+F66AC81C781625A272BC836106422FBC3DA4AC1CBD775E4AC13382DC49FA54445D82E6A16BAF81
+
+4035BD2B0C9F7E5FCDD50E3B8BE0ECEE39C5B983DFE84645392C40EAFCAAE07C10E209FD228380
+
+5CAD7C989BDEE2B3287DB6D725838513F3F95E50D5A09FC34C62285C1AD743F0C9AD485861740F
+
+462AD426D6CC9741CD14D97DF79533032217E213C572AD9D6D2E179FB877FC5CCEE2D16DC40195
+
+E3C8779A89B3164BBEC207F44FF66518E48CF96BCCFAF7A18F5F7E0FBB94E8D4F5F5A74E95F299
+
+101632B5A24EE041175A0725D30CB9D6D5C57CF41465BD63ECB8A65C400445B095D14A1DF726E9
+
+E1FE72F5EB25F426132783984FBA2AAE965106728C99F6B1F7D7BAFCABE55F09C476DA10D2948E
+
+4CF07E65D4B78DA6F9E9BBB5921BD2E753B8B692C315FEB2A10CA117584A65B6162360CFDDCEF9
+
+17EBC862229E2EAA9097AECE9A591E9BADF8C69BC5EC02674D2B58B7BC7F5CFDFDCC7A337BE52F
+
+6CEFAAFDE5D1394A39B1C188F91ADE1ED940F539D5310EBB5F7E1B11E8F2B0522FC676AE772D90
+
+F55C3DB9589466717F3BB1AE6163CCDF77BC0FD61F8BECE7491C13FA6ED8FAB9E02E39E4B4CBB6
+
+3B15E5CCD4381B15899F601210A376C6246484B046B6EE619B43853D7AD133E4252662C6190E20
+
+76AD846146A03CACA144C018C937FDBACDCC6809952FFD94A6F8E0C8042EF060F4182FE779DB01
+
+CF8B80F3545122FF6DB429E6EAAD3BA9A9267A6227D337D60274AB361C082A551B0B7A32EA7C3A
+
+6E371EA6EA9479B4911D5841432E2F75BFF1099272955D7864DDBF4C88C29E33DBA0A90BFE33F4
+
+4EC5C60A07514E78F9A72F8127A3A9EC2B575BCDB2302B9AD6549862C2A1F4FA9925B484D2B1D1
+
+1D5E4600D97A1C64251D00F4DEB37BB96718226A9EFD6E6B07E5808E35E1D10065C6AF64BFDCA5
+
+D413AE31FD92905EF6A15753902837120A1F978EE341910665A15F4DBBD7C06888A11A0C640661
+
+0ACA8E025D381A8FE29323DA62A6D70E8ED434A48FFBDC96CC763664147C3DEEC58440854ADD44
+
+8C4F25033AAC3401589980C968B2AE1896B4C495EF798CB46403F21E1918F2D251666D43D09C9C
+
+3F1A65D08BC55771EB3E6E4082B7F9B42440794240B24AEC9F4B9ECA0D79219C53405917D48123
+
+69588C23133C985984EC4EA17BB0B85EEA7F629BC9E2E10A5E829E770B8810776779A33A833A4D
+
+DD24DE64AB6CD5A089A82E7F293A24874C8C4125CE45E86CE263ACBB108DEF685139208A592A27
+
+774F3D7B92250FEB4A22883CC403C4D97DBA67ED0CEFB246809BAAEF201A54F921D34D222C5685
+
+709ADBFC96A7774037AB2F2995B7C93D2308631281DEFDF6A657BAB09E193D0C9F759B03F3F50B
+
+4A5F4BF39F4118342F5186C4E9DE29DFFCB7A6D63E0C306777BB9243648A1BE25660F9184DF9DD
+
+32D1FBF11D09D09E71899538291790F889E5C7EA2328E5FFD88134D33719BFE0048B80E85C08A0
+
+BF0C513D3FF7B870A67E6D22A06C7BF15F832F01FD8A435074AAA1A3B40B4C4BD374C8F566CC5A
+
+6527A447B0B225C216FD16F4F7402140D09DA108C0FF3DA5B26012B83F1D7083FE273444DE9639
+
+089695BE2017631819961A63563DE94EAAA502461C10766A7CA9474A41E9297AF9C880DCA16E00
+
+1A98170D8D608B6325FE42699CCBFD934B87D2315047964FBF11FAD2FD8A289C11606C25E99022
+
+707C03B0945C407677A712635C3B50D7FFDD7A52DC849AC925D7A9DD636AEA9749678D6AB2274B
+
+6176548E3E7C34BB6CF289849EB77F7E1976291375F04B3FF3AA011F9A0B0A0EC8183A82581BDF
+
+BEA1BE4D6AC556AE8281216EA0A9CDE765E680BB4FCFC077194CEBFB76F60FC4DC37B77FAD7C46
+
+4741E63E673157435FB5DABD170198280A17F4864D92EB0412174427EB7B9CAEFFD7DAF34D2D75
+
+548D35E5783E5560DBBF5DBF736E1C10F24BE83F60A47615C4245A78395E0A83ED0A777DFEDD17
+
+25FF5734167784A1743238FBA588FF933E4ABE573BF17EBAC0132309E4587D242BAE716E093866
+
+5407784400508A0556CE0E23347CEA2BB550039E65E433F5E569D1BFEB47CD0068293924959911
+
+B00641A69EE50D6BACAB05452C6A193C02CC9B36B7FA312AB51794A639DD781F1C8B9E1C0AA995
+
+339C495588D88153661120A9ED50012A656ED0C9FF481639A51EA0A010B1561F92CAE1540C38FF
+
+DB9373A5C83643A135B6571D51287A31616F6AF105BD17C9B64B6A325C88F30E144DCB9D160F1C
+
+26E3DD65A6C3DC155052EBFF51B51381D022AB1DF1C2F34DCADC6561A251BACA0BA18C3B320FAC
+
+5275C70D1B5E13D5719A7BD7D1EAB3ED382EDC5CF062A063ADAEDDD15386BAFEDF60B935F948DE
+
+75064E94322F056395E95FB70980EF8C9ECD27B222A4990859A2B8FAC51F3DE1AC4BF7677CEE26
+
+03269DB448319257794B9AD5E708505D0DA7287D530DDA959E08CD84FB971B99B8D1968806E7B8
+
+B01F228A4E9A8934E661F403B63164A84713B901268C31A8062C005B00E63981E953FA3E6FA0F4
+
+78E9D0B3DDCAEBB0AA0FAE657BE30AEAC18BCE7C83C2C68B0E32CBB159CA25B799304773BF8940
+
+05FB893C1D6298A911B2DF1717A1B92CB7A2ED777070B8E293EEF4C7000E9E496A707000BA1A24
+
+BE0F784FA98BA543585845B09D855C3AEA622714083F0B1F0501AE74A849345CEE19E2B7CD6D07
+
+EA3681F07774F0F8442E7E38040E6E211D693944A30E27D6242181C2626AAA4A8F541215DB185D
+
+56384EB94AB0D4EDB49655D55DAB89F52663088884D24947CDCC0FD81A09AF0450C60FC665C736
+
+49DEE4922E00C3EE943A01FB05F2983367E6BFC4BC418D7A51E14527BD0F5A0A955C9426F0FD56
+
+08C00A464D1AB4B46969558626AF6ACE2D99EBED930628720BDAFDB59E8943B7C9598FF9478269
+
+49D586AAF14F169DFE8EC9DA41582FF4832FF01642BED1EF244D46C308D4687822ACBC3DEB2E11
+
+347473A74CFF5B58BA27D3D3D36AA3543F2DCA041D42B60D8C9D7483F13983B2E372078EBDADBA
+
+265C67A12243E49C35096198B50D1C5D45AAEEA72E4BC6EC92338E01CEB8491B4B72682C35AAFF
+
+935F8EA76C942EE4BBB31C8E45B17B829686C23D68F64442FA935DED175687B5C042857EA07651
+
+324871B7E8EDC589805DF972FBCF79E92AD1CAA1AC6335D91F0119CAB046620A802475FDC75E50
+
+1F2E6B77954BE3EA96F11E17565734A0EA702A4E8189D95795015F8B0F7E9CAC4492BF9B8D0102
+
+556851FD5C68E589F99FCF51B5EA0DBA3D3889EBB2013ADAB0355740C8750B18285328F01D2DBB
+
+1B0768C2F15134BD6D42D43E34A9F0A870636E26F2455E3ED900F66B8255F3AF0A6F221526C277
+
+50DCB86D5C2C9ED7C826B7EF29A11DFE45B0AACD6742081D2D80F769AB8B4638BA71BC4D987600
+
+DD4D04CC52BA26F407441E1ADDF4D7273A7516EE189A2567EC8E55D1D3019CF717FFC996557BC6
+
+1199BDD52F72EF3184698745427378A58C266FFAD746B397F0528C435DDFEE2C61C8E24C6FCBCB
+
+A30CA2C94A8A341E0B8879D6863C7A7FB805F12A2530BC9747B6BFA7EA057DA41AFCD8046ECF04
+
+6C2552DA5E419F15E60339A6EC547383C4B639FC7A7E086EA69BA499F5A953543CE620E159D1A9
+
+1BB2C6AD22D6F9770F9D2CF719D7AD68417C8F38E9C7911330ECA2E34F843BB97E69869316D993
+
+649F91694F8FB9696DF7531F7B3324F9D9BFB52EBC276320C5832ABD9D0A3DA94D8013DB90EA2D
+
+F35D0E1CB37CD7DB05FFC514F510EB8935BF55C0AF6440464BFEA1D92EC44A821DA822E3870538
+
+AECC146D3CDD5CDA324BD82CC9099C90F2D54CD124435E275AEBCCA0838C7FC25028D56DDBFABE
+
+30B0FBB1EB7C8BD6F948D5FA8C4FBA1C10121FB20F490A57C013C6541C56D0882A37339252274A
+
+B2777DCA09CEC4E499911DCE4532A6C4D35464CE5C15853DC1D29F02BBA5667B7AD3CB0518A908
+
+1960356181C42760C10CEDBB46417FE0CFE1B545CA8B129B67F9254683AB5F8F5684B50E702D0B
+
+A293258D81F07557E83F6EDCB5F50B0A9D57F6A802178896383EBB28D2749DB397CFEEA8B3AC7D
+
+1861D489E7D8E02B01B477429D28209A16487327DC3C532E35E4F4AB1D87A0E1A0F8402A067BBB
+
+30D4D992B5F2997445201C78DDBBB31806EE302E96E353DB30E79A341B38AF3242B3EC8701A381
+
+BD4EEDC5654231312D5D4D2555A2E8E2C2FB4C53679581B57EDB6F01C7AEDE0399C4CC5EFEC89D
+
+021301B96B168E3D3BA15E0A2C2516EDDF2E9B78BCE983C8200B18ADEC5CE6BFEA019397525779
+
+2378C8BF841BD3332096891A3F82DE8FD460F43DC75CCC596B82EDF546F8AC025ED30DA6EDDE44
+
+7EBE6A271739B51AAF5AF52460A86942D94F1D91816D2CFA059C04E3E73F278418492D54989EB7
+
+CE1FEC9D311AE6918035144F07BF987909D6BCC2ED889178EAB7F33F589A711CE4928297D9F378
+
+E50775202217EFCE83AA3C83B731C1F98CE4A78816E7F6D9EF2C58AD5CF26A4CDC84075EBF3A5F
+
+D978DAE6E50726670AA683FD3BD51D1F2A66A15D42E3788DF4C53F3CA6E2C59A0F2C1D6BAD369E
+
+2D468A8D5FB8D82C6B95E1DDC75071E563E9B43EB1F2F7B68D76D54E791D81BD11B0D4F88B4E24
+
+B8E08A04350D03F577E228D7319ABCDFA4A29A7FA9FB2D99C5450A69ECF4748F601F15FBD9ED84
+
+5AEFC029565FE3A98857F197E4B4A2C3C77121BA2D78527ADBC50120B99667816FAF5C65D2F0C1
+
+5901B2968DD2DCC5335BD5DC870E637EFCCF3726FBADCF98F72C143909109DB1B89017A026F455
+
+CD37D656C82A0CA07D5E9A31F28BB27E27C65B2B422BD9EC12FD0D6B5046CD8BC7D27604D3D146
+
+C23C4093F6DF9402D31758D677C6BB5BC1F59B0B8A69E295516C640722196052792DC40E4E3C48
+
+03267398D6144CB5C206999107D67F76794AF501D35B8B77482395F72790D788B076A417991BC0
+
+C4A3602F19F2C0431616901DBD72680A9591F30745A6D4F9A8D4B9D69116B4E8CBED2FB8F08243
+
+22156A60CE2FCA834B805E2F867BD06B69B566E09EF21C3B7C2B3E5BA34109C8B64F7B609DF6AF
+
+03C23CEEA4B8CB123BE7C9637AA4619C29348A1E71382C78A76B7D97E1C91E63278D257E2E2EAD
+
+8D16F62BE741D59EFFD606666ADB7BB0A319BBC9450C11EDEBE337C5E053CFC58112F8BE67EBC9
+
+D7E87A768516E1A971E419FD4903143B6E1B5F9CF4755B5B5B9EA2AF6652A376AAB6FD54DD08BD
+
+31D3DA9C0BA7C28801C048B43D4BB689B3E2A7BBCEE9E9D80D3BD78A7D4D94893379A7228EE5CC
+
+932330B51B0DAD909D06DF4B9FF925F875D4EE1EB2692ECF1A0024417273969913AD25DDB8ED11
+
+BA2401E5DA83EC452C78FC49E5BA3AF8EF0AAE2D55DBED6AB21B5C9358B1CE08A45E87C10C6F31
+
+801F823E6BA0AD8806065DECBFE00B9C9AA3F300B2765D4D4E9C5D2AE87AF05FAB207CB5A901D3
+
+DB5B284048A8AA2F0C8F50BC298356444D2672B6E11ADD136E4B6926F470763109FEF3AAF1E210
+
+895CBF77137A6142EEE9583D32C06BD780550212CC9BCA18B494A0B0A095F23E4EC2CA622CD565
+
+49ED8AE9A82B4E60FFD7C73F6D1C462094F4946E16418D023208D8BAF445E27C7ED9F39A7FC11B
+
+D4A58A0BC9967E1C581EC18F866F5AEB8698E710750FF4A0CD695C314CA2483BF3F5DF14888D57
+
+58758788F0D3D3AF357E04FC45DB58EDE15AD64C7F06364E1B2C64DC14CC0346AD2855780A8CE7
+
+FA539AF1728483FFCE82B389C546E554FE631406A791A01A1CF899555E34634B52F039AA95086E
+
+D64B50534DCA54012FDF867A4173D97D420E9F5C970642CB12A9FE90A975EE7C3D27C4357DB9E8
+
+DB9A9AF78DFC5C0543C926856BD4BDA98338875FD95ABADA260C21858B378D0391F6BBF15AB0BD
+
+7025E657588D9E6364DE1EFA088107828FA4250E53E7487F8BF891962F2783FE305002CED03D24
+
+CEFF5F6E9C3E3211E0D40FE7A9E83314FB9F72F1DAA7FD5B87E4475FE78F542CD22ACC4E40933C
+
+15CBF16B240040414AAFF829371A67B3F6DADCB7281410035E7024B56604356F8D24D879CF4B92
+
+C312CE5538C27D326D56CDA2DB52D7BFA0184EABC7C1160DCDE65444A1F3D29387A8E2C41B632E
+
+778813D3F1E335F8A04F277F1416DC304315958E3641A7D7E5ECC68CD3DD54043CAFACB9B307C9
+
+58D6239E6754920A0C80807835A2F137ACB3D1F828ECCBBDD9A55AFC646EF93EAC3AFF1136567E
+
+DA8F741E24604FD4322B20FBA39E03748BE0274DBC6AA8957D30D7853EB96A65A9878DD94E259C
+
+38C3A144E1269CACA56B0B956C5C40A6B596426F495E438ABF3A54B4BBF161299F594EC305F95E
+
+8BFF2FB788E066420B9C6EF72F6C28536D66E6F00309BB69E396FC864626E67E84D88DF4E74422
+
+A846C2987CC18E70A5B41E26B897F2DE79EFDA6CD99F594564DA946EC13972AB6F7DD737DBB14C
+
+940928E7839DFCC0352F7FF60574C4284398159E47D0487D2D94D21E92BA35BFF04FC74C43652B
+
+26405133714CA12AAF211EA2E7C397AF11E9D775C61462A742ECF9992B69FED0C152FED5AA9707
+
+2479F58F8D0E2829A1F79A52EC7A0DA312FAE6B2010BF70D0AF8CB998F626FD26FE3C53FE4DCEC
+
+916DF0E9FADFA2802ABE944F0BBFD166CD39EBAD3FA4CE2C9ABF007893699FF2C2106004F3F477
+
+242068A7FCCAE79B8795F7394102536DDEFC1CBD662514233B5DCEF1C3F715637BD695B1E07136
+
+E40007C7235CCDCA991BAF173D915D5C5F33C4FDF653D51166997B6A14E9D2F1BC288B34E44DDA
+
+A8DE55AA85627374988A08D965A3E1C8487C310AF32D2C0B8E5D377D4B6752954E4DEFE72FD701
+
+1615D7C3EA25A6733EF7EDEAABC9996D7F6C2DD3CA62A247E2E3DA8114AB3630AF8728A9854E84
+
+429A276126D18756E12454095E8D30BEE5D3327AED59C1BFFFCCAEBAB02444A38A89DE6DD3AD89
+
+4ED7E4A5C761C8BB77CA39F4CC3DA7A70852E27E88A4D6200E922AEF593F0912263CF4381A12EB
+
+D8F94AE22EABBD239EC5E7AF03EA9120F4DC2E8253D5551CCE8CA6336714F7B4A4C4B4CE565F71
+
+2685E13676A3B488311729432EF24CCF8BA48265ABEEDB2FBA53FF2087BB9CB9682E9DDC99918C
+
+008FB0EB28EB1B5D9FE67EA9D2D4FDE1A8FE1D87CB82F8125850A60D924161FDD4E7E7DA595430
+
+2339CF6C6194894845CE5ADBC97883CAD7D3695746856ACF2EFA21DA5EAD33D4FF8694298FF8A5
+
+AFE9CBB1C6FF1743179F3EE82ACE5AD2BF86489383A97F05FBB1809889D9EA33544C2632F33EC2
+
+7119B3670824332E7FBCF59C71C080A8E59A3ADCA3925C69D4BF18F1E2B1F7F9C184FAF7B47DF2
+
+1D7905B78EE91A8BD733D755A046626B2586516CD3527B6EC09A90784F5C22BE5465C24961E421
+
+B8F33A14F280CE7BB0B23F9702360F58C37EE4CA98ACB47E3EF8BB1A8A73F9B083586309407BC6
+
+1B34D67A54157E3728EDE5A6A9D2DA811BCA521D97C66FB44C7725B69AAC358528FBDB674B2555
+
+7F02DAA19EB4EFC71423C89F8277372B00DB45E783DB261BDE6A737F6972018E58FC36FAB72B82
+
+E4EB48BA45FBD6DA8078F758FDC1155C06BA7BB4969EB82A5EA607F257B0BB642B9235C414CBC9
+
+DC882E4B0012B9A6024B584FE68ABCB0F60C8BCCF8E181ACB7783DAEC99BC7A3A8AF028BDDCD0F
+
+410C945F07790C06EA63899F2012327AD160562DD0390DE564D90040AC3037598C4443F095FF6A
+
+3F5250D4BE09418EA43158B27661BC2500EA7BBF3B911C47FE854A819213813684DC597FE59AB3
+
+EDB4B29AE1E51AF8DF5A97EA5B2A385B0219CAA2413E77C8FFF0AC117AD07DDD1054474EF08CE2
+
+6986CB7DE00A01089347E16F36C06D6083642EBBDE402A98AB48F87177AF5F6B8F0234E33FC98B
+
+02E3C78C0813A74677AD524A329233A4C89A691D7569BC5E25C5E46D160FCC69D95A9B1BC47CC8
+
+06917EE441546FA3450A9B30CC4C4BB4E7CB461ECFEC7115891A252DEB29F206D1FB73309B5257
+
+6A9C1FFA48C81739167A93394604B1A91E86CBBB6D164E5D76545C75152DE2E0B4B09F65BEF3F3
+
+85B84F29FA7FD0C9434C93533D7ECC4DD8E1AEDAA8B1A231EFF6266B661EE5F4ECD4DEEB154FAD
+
+7026AC8FEE670838AC986D48ADBB160A873F9CC9F687F4F40A5B6A082710A63D10F92391F341D5
+
+11477AFC88994E4016BCF6D1E7600D55AED6E02BF01B5CCFBF0DEFBBBB697FEAB3C9B012882ABE
+
+E024332330DB02CE61EB5C43C5EBDF96FF799249BF64102FF670B8DBA29F4815C1A4FBCCF23B16
+
+5AD9E8E57F596A8BCF4C1DD10EE5A3DD10CA20B1675809A1D28AFF85A5C4E93D5020DC7A45A050
+
+C722AF53D42EEC29DFF0E924F8A54F75F9611D6DF05E1A436AC01BEC09DC0143156FFD47F32265
+
+9E0F6968FE2FD63074EE77BFE8A4A866132833930E128C91B1CCEEC71BC02BAE80DD2598452CB8
+
+4B0D756E8D0DDCA3F64D2E64AB21C482FFED6A859BC3B5D61F1DB812FEE1AF0D482239FCB8A4C9
+
+BEEF632069637AD48050DAE012F91AB4A244751403C980C50EE44BE38D33D766A2424268597BBE
+
+D36E39B595693EFA00CBB6482372B2C20ED89563983C6CEDD5D288196D49D8DFE4670C4B5F457C
+
+21CAF9D89CA7AC9E008B3F867763A0A23494D4F3DE229F983FC9A133525A5BA33BAB184B73AC44
+
+AD85102FF1AA6915D62EF10B992E9B7154A6DCCC474DF36FA6641FE747B1E80FEA80DDBA9FC008
+
+A71E1552A30F87956A6FE298D5737BCE285DAB1F746622B6140E56328DD0B343BB7F6EA4CB73A1
+
+AE1448CCD1BBD1AE7B9F5AEE2A96C55D4B511B2C3489D964F6CAFB705B1587192C1B93613DE261
+
+49F623A979B1FC8F840590CF22DA6BD562E61C116D6C5B5460029CB5F46C2663F814284F51C18C
+
+0AB1F994BEF08CC775B87E0660D8E396E48F754676836176B568034D26B5E32F9C00B5FC06CBE0
+
+0C1005957D22C75DE14C8A65707F8081A12955D4EA5663F6AB823ED3C709627777BB77AACF3E9F
+
+7D44303AE7931A01AC33464911946FA792706A38AAA64502526C06548D2226B10FC45AB3378EF8
+
+A2B7A9E7960E08D72EE08E71E63E149EA56A941ECCA938D7E0E4A9469B85FF3239F20E3FE90A9F
+
+359AAAB7623C8FA21BCED7B41D9397E7C97627C20E229F268D3FCBF543DEC734297153E916574C
+
+C4723CE548DF8CC187A5DF384484C81A921A90E91E6CCA0F9CB1127F03CBC0E018476242812FD4
+
+C75A24E675EAD79F6261504E71CCA3E5235FC7EB47982540AA5A754D1E29621369D1EA8EDF0BE0
+
+8D2094288D03D77CFEA85F04D17B3F41B07E6E576490BF131D3F78227D569F3691F0135FDD6FF2
+
+D2B212D7D41211A1B7EA2C9FE2D2FB79065DB5301498802B6E1E81944C5799AA78E3DC6FC71B99
+
+5A8C569501D4F24437DF3B510A238FBA8120AAFF58227285C6A10D0756F04E51710D34C5B3EC11
+
+632A86BDDDA8AA12A8C5F48948E367FE5EDCD3D8EB85E3D295602DE19BC1F5DAE96E1A7A9CE192
+
+F9F9DAD0B921A9572ED1D92DAA9AFACA5761879400FC1F11F3AC0C1D3EF9BE5EAE7F7BC963CC1F
+
+15A3D36B4A4B2725AA8DBC77C61905EA820AA3CC1EACAFB817CA530C32F6D281F0F9C45F18DE77
+
+09ABF3051B58B5B857350BCF7D83D621B89A6917F2D31FCCA33D7F849A78A02411A16805B542CB
+
+BB9ECA087CF320DC8A4E4EF6A1B1913A543E62D3611FD1194B019987FC1B454037C74773AA5DB8
+
+3A916AFBD587C03CAE2ED7BDE4A738706041B2D2332039A7DCAFCC47DABADFEAD27FCF70713DC1
+
+751AE3681267961EE2CCA1B21599C2BA3F3448DF4BD0BF6D01D8ED2B2B70E6A42586D985DFFD70
+
+A65B65AA2CE5AA16DB6F5B92284449BD7C72D802B384CB63EF7B7AE51ACF16BE575068005EA1C1
+
+2899873E9FA76CBB626632AF47AD7A0FB3AA6499DEFF547629910A1B30078F23C65396446C5399
+
+84BBD0E416430798CEF8196D093E31B5FA6650574F30D3FC479179F00A3507199BDE82BC7173B0
+
+4EC8015675AE42E92E0CC0EF7D9D809EDC6FDB103658DA78DED075FC61CD2CAE4EAFF1458F1261
+
+D9BE261642DF329C0B0DDB57103C38E823E3BF09C59881388AAF7E8E8BE4190B811CFF83AE84B9
+
+664ACB308AAEE24253DB0A595203BD305A19F2A41A054A616CF02850AD4D00045EC034792A7012
+
+6E7F10CD39C919C5E6B77B2F63108266AC3882B6FE5ACD730C4A79EB4549604D31B70BB81F9DA3
+
+B3D8BFAE1C2A7A000A5884CEC025FF417D20362A9374ECF40936E93EB77362CE66370F16927135
+
+74F60E956A69CFBB70BB59A0CC497BDCF9108748B54660ABAF3AF7BC57E70BAB19C4EC67381C0A
+
+36709042AFF9404CD6039CC2077C9BBA55249C65097978D20E5AE9CCE1A27A74752EBCD4C53546
+
+3C74B8D6EA187C2D575E89D5CF9038DABA4E5B6B240C5A826235FDAE0F22E8B4D29E4A8CDF4ED6
+
+A91876FF06F5A901B6F34C9C8132E27AC01B6B57AE1B312FC1C2780E9630286C933FC5AD84BCE2
+
+CFD3DCEA1C7F621A1C9695D65895C32F9226D14EF31B461FBB98D4ED3C2EE62477D665B99993A8
+
+0F42885A12E454CF8F45C96E002BADC7215DE3B1341C11DD5B78167D76D13546307B890F87A199
+
+FC2CDB95064BCED8FC5E0B502E7A589EA6CC36F2B935E05D6B4CBD38E0C3BB71441F05FD1F234C
+
+549054AF7FD8065277AFDB89149FDB6CF64A4E5375D3EA609D90D945E87A8A2AADF7D59667ADD8
+
+16E8C3D9F93B053488F4408177048EA77A05F8B383E249022ED3853D6FAFD875FA39759AD3BE7B
+
+EA6A28C49312D6820EF2BEAAEC2058CF9756C9EAE517FC06BFB98141266D70F1F651B90A069DEB
+
+3A2E6588D9BFCEB3F4B5A8E30C2E82829376BEC979A6BCF3E4DC69A6FE7BBBF05B6639B9719136
+
+1AAA099F4BC409C179E252452E8C802A1517D9C6FDA3FB306ECBBABB2DD07174484776687F4EBF
+
+9A09AB5F3216D9EB85508125B239FA22867D8C47D2919390E6F5606DC9DDAC2A2C4E445FA8FCF7
+
+4E73B06C6C88085B116EE2876E1DA820F2C4A2EC29E036068E5E52BD82FBEE47D671B040D75772
+
+A93314AF9297753A01212FD2A7624DF89A306A194125926626491A3AFB70CCA5ED0FB14F6169A7
+
+34FACC3D1BC693871985D51B09DA75DE927B0F5E5996BB3FE38532250D76A6B87678AF13331A0F
+
+F7A37700BAB3171C511DEC88E998D2500FE0D72D7E63DD35AFA982664065FD2FDC5998C9DF8E51
+
+69C3F035299A5D7C54490B175CA41E43883839A6C8DDEC8210CE131695777A606133E23D36E643
+
+330DE0D7205D53B88D6ECB5BE6D95790CC7EB7A33F545FA2B1B1FCD7E8878CD6CB5E042DEE4FE0
+
+879CBB8F0B21C155588B0672DC6C8F832648E299519258016319B3BE725D58684C4BE5D692FD50
+
+25891223A54FE34F10DE816C40E5B4947006ACD835DC01B2AF84BF4380A2D0D580AC3878F5D476
+
+DE2564F315213F7DCD6678524094E85CA49BA82499A5CD69B597871ECCFB05CCC4791B8BBBE45D
+
+E820E1F402885D947F1AE6225451E5C33C8E65F7D7714C6A6E59131E8599A4B16EBBEFD2A86FE8
+
+E26D9C76E35F85FD9F8DB6ED3760B12224ED38974CA38F894F0322CEF8634FCA6F4C5643B5EAA4
+
+D9E65274BB5A2A381DBE8A128BC88CB4F6E04C2C5C4425F347479D86164BAA3F19000505CBBD28
+
+B52CD3C8A33774F45999129F51A7BF18A54B71738C534C5FAAE501315EA5869C6D1CFC67D0AB9D
+
+584B40294425ABE35F2E923025A7227637876ED3B746B6674D52CC4DA679D5317DEF0ED57B3C4D
+
+930A96C0FB692DDD2CBCD113799FC4C80147197B7BC9F9514AA0A96E078C3601B32A9F690DC3AE
+
+70F481DD4968995AF645FC0E97AAA22C991AC11BF3A58DF46FF84CF8B76E248B23B9985038E737
+
+0FE65E0AE557865F0EEC63ED7F4A9641CF02810E34B87675FD08EBC880368491FC6C7D1C9BD273
+
+5544BDC95CE0DA3FF11BF88E9680A8C8F91EFD65FD04C0094DC94C29D006738CD340EAE0585F0E
+
+658DE2D9907218612B217228CDFB8FB489AEBF7D5C05C5962F67E0A39974C5665B332353FAE341
+
+9B105839849CDB843E908EF184D0DEA3F4B1C7669A97C035A86FBECF2D2DA905E683831319D626
+
+3895DDBE238CD5493C79F9EA19958545FBFF8B088E86F6D85BAB6CD7FA03CB86CB3AB905329B6B
+
+538456A1C68A260C137E497F2D7A627C38D57030271209DBE4BBF2A484745E6FCB9FA930ADBB61
+
+9F64118E77620925449DD6BFA4AD8838AF81BEDD3FE9D0C15E37BA48B33D6201C6710BCC3064B3
+
+16B535E07AFFD6065CD5A2739DFD061C1C464B4AC5526C4E93D4F32B1D09CA4200DACB79DC8DF2
+
+8AEA6C1E9BE2446222E8FE141786FE5146A30801C0449D9E7143226948863D5402710AFEC43F9C
+
+30D85915E0354B96E9BF438E62F9FC3E74B5599555D0C72481FCFBB5136D4C2E064F9079E72552
+
+15C9E4166EE130BAD8EA3159F1558E48A4D998DA8DA1B002C72EFC4F38E8DB7396DE031DE548F9
+
+76DE8E0C11AD4CD396D4A11C5B73C8E04FE0746AC300D2CD04D7E9CEDC1D78FB9E12A84EE2296D
+
+856B8908EAA722DBCD9C7E72A2EA45751FE235B48879BA76129F41231FF3B6A31AA51E0F8FBCD1
+
+65B88DBB7A353F0B04C55729BD3851A4FF32B75AED59CC9AD498511A6C105E49F0DFC5687E8291
+
+C30A6A826DFD3C09A0CA876B4BE48A222CECBBA390C5DD83BF51E6D1C72AE463ACA5AF5DE93DE2
+
+5727A4D70E7A267FB7A0C10D5EC341CDFADBD56905E74BB02F446F9198CC8DC903C51ABABE98F7
+
+6E75857E1D8F1220109A8BC565D2CEB7E3B809E16D89A83DCA2D9DE0A155522502FD36E9DD8CC9
+
+17540D4DEC8CE209F12C6D6078470A6E5D65DC685C30EA581E3AE53AFC872993940F0D0C89FFD4
+
+1F74A8FA730BBA82F0296A9A8F133810B4BDD8903E722C5F95A887B4131E8C6AFCD14F29FF4200
+
+6F04ACD0F2570C103F154DDD4A5CF09169AD56542855195091C05B71352134A655E6BC84F37643
+
+93A106057B73F58D8E7F99DC9B0B16E1BED4845CCFAE63250299F0B456BB2CC8B90999E6073C92
+
+A9EFD24BB2F239844E412A15C7780BE3A60FF2A686779440B11E9DE0C42547B3D89B055629C260
+
+DA798922BAA55FFFF2D1253A85DA9389C9284A2E47B61F9A5CBB20E9E3C906AA94B211677F0716
+
+707C28C39676943314E52FC250DE49E8A3DB1E042443B66568AA37D0709DF04EF1362E5B9BF083
+
+D59CD3BCDFF50BBB26B7C8CE35A8C4DE96F2E40DBD9D3CC04C39841844F30B31DD25829BEBB731
+
+8D2E1DB290960F54D1498095D20C6F05F7DB57A3A9FDCE5D154FFEBF36ED418BF5FC0965BF7BEB
+
+D16AA8DD31E562095B0CD721F8349C1476693D8EE368EE149C3D243698F54FBB5CF83F65A6F169
+
+3BF15017754259994C993C676D5D3B5E0E805ABD5B5175EC55C3D1AEE6EE769BB1C614426D3E2F
+
+2A3167EAF2B0AF5BB68F024C35125487C3AC670227FC4B781BE2C5DDB6310B59817ABD82D5EAFD
+
+5ADD7BA4EC0C89DBC68D03C12EFBFC051218179494B0B01DA523165717D1DEB70656C573BF7002
+
+A66CAE4E69B42AB76D22E6D5C2DA043103604F06A2945930F421AEF9BB28FF1067C297A6D10E56
+
+6208A1E001BC8E2514DC6A94B559039F10381A5B031CFC73B959FE1D270E07FBC2C4D2ACBE88A6
+
+88E1AA4D9F441B831B6E1E83ED4C1001B2F393264948235312E83F12FF24A33AA8A332292EBEF8
+
+95269B793562730486747AFB79938BA78BEF925CE4C994D1D58C5115296D27D7275BC4358A9DA8
+
+C8D521C2B55F5057C2854CBFAE0AD361AED083F8A63723F7E535C84FE255043984D5AC389F6550
+
+20A3FBAE4883366AFFB9DC7D37F4BE42A3A40AA747721D763F3E8209385F823AC1D7076DB81C8A
+
+00A33998CBB2E574D9C65563E4C24429DFFC0B992BF3477A90891AD6C67BF26AC0DA33ED3A26BF
+
+9A523DE4A8A24A4EECA3581BBBA6B182961EB7AF4FC2F56904C27837A00373C0A49F8121B9BD21
+
+97F0BC65592EE0F1EB1DF93E87F4514BC5D760576E3A39B18684682C0DD8496FAF939D5FBC907C
+
+F77683792DDEB86AA902C8B223ED2CD95D9AD9DBD52215AA05E690FA22831EC1E2308C97B882AF
+
+2F10D56DE08EC526B4ED696A160E139B5407268F1E17A710BA4F71A83DF53156A95B1224E5DD16
+
+B4F3EADE07B57D9FA064DD487F4E84EAF04C69CEE2BB8DB8411849B883ED8138E2023B82CCA222
+
+823E24F80B8816935AC30BCE18E9056B4E6098C7A78A252973AA19A6FD0A87D48617291C3E86C3
+
+C6140CD225B139070B2E55F4BF2BD1E752DD2F7C2C0163938B1CADE6B80EE0E4A2AB811639157B
+
+01E8B11BB02F4C3D09F86F6A178D0DE5FDF804F102F48D66F5850CB685748FC3DE7E0A657EB77E
+
+7311E98CA80D96E7D60A6A1921EDE854415C36444FC1C4E90AAA32D675BF6B36EA87818616EA80
+
+0CD1259EACEA4105F1FAF0D38AAFC1BC427A4B3AB9C83FB22ABE8BC2E607C1EE5D38720081EC4A
+
+63A2174E4CDB46EAEDC1D53771E72C763C7EF98F9CE9E6D93BE98E503571CA19910667E9900DC1
+
+65D78EAD10F8748D2C6C7BD9AA5571DF798B626E0CCD391415EF22D78ADFB11AC182147C50A14A
+
+153FB3DCB091D37290891C3D1C44012716E84E7AA39B55089D1337181950DA5BF52E39707E1A75
+
+435818E44FC0269F6FA4E034C18B94CC0C6D4750B4372D28F24B982927E5BCC910C66F8264F6AD
+
+B5DD11AA46534F6F057CCF650EFD8F1E56667C7B9958D5629B227E12037C098C7AB5D5986BC0D1
+
+2AE5AE552981FFBEA1C00CB6CC5EA988A2944C7F3A238886831C48DC81F179B9F8F686D7D0D1AE
+
+436A0897AA6255D3041C1EFE7FC6AEE65AD8608DBACB2C40BA3C8E178E8F0BC04D27343E39C3B5
+
+93498FAC8856ED317A15CEABB1D9880D1A156B4CA0E2AE90D4A42F2383523C21DECE7D1A92EEF2
+
+09E811F44C4701C1737E7C8951C140F446AC0991FCBACB9A5D8A9A36C29A7DF9FCB5405034A98D
+
+556900B7238A29E4D1C46770FB85A1C9D345F54D3F01FA966F6A1DB9213C2142AE6C6E883BA5A6
+
+307D428A5AFC0E09AC26171AE5B358ADD11AE6702095BF832A35C33A26E22C06B60E7B217E4346
+
+0979399270F5559A38EA86986306211BF37D01BC0990C38BC4CEB03C76A9EE984A6BE19E096D33
+
+CD5D1977DD237C9600F18FFED04BBBEFF024BB062C73EC12FB00E5E1D5EA32149093454EF270C1
+
+4F94446B55CE56C9B700A12AE7119E7812A1472BC70B52B67E30608D8DA81331EC9E0F2587A8FB
+
+34F3DF3DF0476046832B371F210F6FC8268C67F07ADEAE026CFC1921BAE4052680CFCB37305806
+
+529EBF63D8327A1D924A7EDEE1955B944510FEC9E243C872F10F5301B1D03C2BA248B57D1E1024
+
+2B266A9A61691E1E9E0421A89E0D267C1C87DEDA11F25EAB86A6920B90DA63DA5245AF639CB69F
+
+C4E8F12C91CAA26610A1B321F91F90C79771C91DC4D2F6887868D82C928E4574C0A395CA1FD582
+
+549D601F9274AE55DD6F146BD2A444088947EE9D191FC5AD9F5CE52D3A267FB165D55BF70A6A82
+
+12343E7328FEFBF3083AF528FEC8396228678AE2153557F93399DE55B880B020A921687B4B4719
+
+DE07EC57F00B2BDFE003A95E3211119BC72F468AED00ED92A1843A28AE104175231F8A246BD8C5
+
+E0F2FEADF643547ED3120BF4950FCB71AB33C590C74006A8F829D43A9C72EADBC7E8A48EE3E4EF
+
+2CE847D275F1D06B305DCA0A7F0234D241A187A3A9D7CCF390EAD305E5D89110B5D0453B2E29DD
+
+2E0E5313F8E5F824DD52DC515C46A4CF4E7E5D622C590A8854C9DFE724CB377F268508677B701F
+
+4CDCFF3502D072E597E3F9D5F3DFED8BCD42AA7EFA96B6A93A42642088203B075EC5CB9732EDCE
+
+4483518EA6BC04A9BD531FA9D0ED65256EA3FAE0B1493FF2CB8FBA4C7E5D8AE1CC244C834E00E5
+
+694594EE9A5A9325C8FE95C2F6FF849446E417918D88E00E86D59664E1D965310D354199BEDBAE
+
+5366C183DF1D5D1CCA5E64A434C50675CA4F1ACA9704215BC5A1FCD4C3A296CD22389DD808CCD0
+
+87AAB921F5ED11F34D2D0334861F214083BAC9541C05D78ABE5AB9DF253E7EC40AB3A8E69CE730
+
+AEAB610EF92AFEB93733C9CD9590B1B1D8A3A5E44D22B9528E429CDE7AC4123C0D7A8739ED8BC6
+
+7C5583EED7903FA0395171EFF44973DB1CF052DFF83B4D7FCB6B9FEF7EF08A4D7C0FAB844F2F90
+
+48513A6A3D39A407C33DD521409724A79F8E88DD6838298E17473829A20495C863867DB9729F83
+
+92CDECD291B601ACB55BCF9BB18D873364ED03F51631EE887246D5480A1B601FC792DA6B6D398F
+
+FB580A32E659BA4B0764654023426E0F5E51045943D2EDF0557DFC8FEF287CB77B8EA3208E2466
+
+330E762C53D8F19E173708FEC484CA6EF090A0A65A190370A8030F84CD4CD698F65E81248ED13F
+
+91A0C21C3B0D7C6337887BBCA9E5D65CA6507C58960367D36810E813B060EF9BE7D34D4AC15774
+
+06E97640F04B87D203DF42BD651229C56681D296DA1BA7C09AF38583C090D0409828F445B6A9DF
+
+429A374CF2DEE68FDB5FA4A2BDD4D2CC25E46FE69AA3C34A592288DA4DC1702592FB052DDF00D1
+
+4AFF4FFCE9E4B74DB410EF990CFF606BEB6B90AD35D3179CDFF285581A3D161D96F4DE69E5D40E
+
+B344E5D23D6F0B47ABA92D0A3EFF67C8F16D33DBA4EFF89C73B34450D13B48B4F04C87D167FA8F
+
+70E9AB17D603C4C1AD07873BF336760E655CBB6AC3A197D62551ADEA5B7C1ED5303D8598000FC4
+
+B9E738E2679F5AA08DF07BA994253000366157FEBCCE0EA475AA022B046461187C1ECD85FDEB97
+
+7B2DF4970EE03C99E8C24804484D7B7A426ACF82B05AFE51D5083CAD68F160ACC9033CB7706CBE
+
+68D44997ED54DD0D7523A032036EDE50B2200CD44F9B89A1DD0F541D977A17AD49E4F82FECB9E5
+
+FF7C525196746E8F49906B9B2014BF6E1A9A6F356DCB5CBDB427394FCAD8588FF2A0ED67430F15
+
+75B2E1617F7F7DD17E5F12E0406834B28002DC7E74C2C4EBAB48AFF4306CFB2D17301CBB238AC3
+
+85A414CA84B988C5EC5AE293F3A6A947E70EC4C7F0956AE123EB78E46C8F9B2E7DFC75DAE6E509
+
+19892249014BEDA7FD06645E6DB918A608EF4C373E7179921DD6FD94832C0FD9C15F56F784694A
+
+7788FB33B9FBA7EB9B1A19CFE576CA993F0FFC31398C89167D5F1D6BD886701B07E787851910D6
+
+B0BF96B51CC1C8BD3D0BBA00FBD00857E4329C1E9092E20E4395909BDBD334B027250BA8597F55
+
+79DFD55CCFB5721FC7A555412ABE49E3DDBF09F722120D681B6B19FA0026CDC30978976DE83887
+
+69C68B3C321B6113D3AE32FD1BDB7C1F1FF8F4DDAE81FFC131AB8316FAB33B6FDEBEEE2F1C496A
+
+805E4B920F3816BDA8E41677DE36EE413E80C500B9FE4E3EEAD0114630BB1A955D0F5C7760183E
+
+68C226060B051729F6E1F46C75168392D0ADFCC3DC52F2903849C5C1F1CC4A39486FD84401112D
+
+C1F94EBEAA3A3BD4F282978AF8C2FDEA3364ACB1121EB5F593F332D8BB3E280530F9B1A58041BE
+
+6350704391190C24BF0DAA05FF8768F084E6870401FF346AC73EAC8A6906290AB2BB58AA7D2C0C
+
+901BFD714C45188C75096057AECE6CF453B98520AA7346E42E449549EBDE4B70B16F66F48655B8
+
+7F0ED4935D108E9349F57C5745EDFA02D83EAA7EE7BE7D7FADBE66D6287A61CAA1F468DE9DF58A
+
+DCD7D4667A341F6748A35C19031767CC2E0B25B6010CDB31DDD3A81410B782B4A6CB5C9DEB3B09
+
+26D2E86C69C63BAF17055ABA5AF39B237C53D3A79C5639C3AC638E1592A5C742B3F7A65C557F76
+
+0CA2E68A0BB27D0DB493DF5353D75849304F3B15D42115F55717203817D1F6CE5567359CCE7085
+
+371BF23A60851B9BC7DEE19BBE40B8BFEEB85D20C7886CB89B21BD4DD57414958ECD3B5CCD40F5
+
+7825372CB8929AD26821F280FC5BF3F909B8454248665F39E87AC12679023561D2E4C17215CC80
+
+163600FBC3B2A3637FE8AEC7E6E9143939A96F9AFF544944EE914BA054D6B5D0070C16C99D3EF1
+
+0A5CA635C83A154D5799B7FDC311827C9E9DD651CBA5DE32A3ECB4327BAF08D924EEDBA059C33B
+
+3E7EDE159E83DE71EE0894C2A7201618AA39F39CC3574DFD644CB41618A668BD8D1BF07FCE3AB2
+
+80E3AACBD9FCB90C4D8A43BE3B72AEB9E6785DEC6E09A6CBDD95A2AC7A0BBD49D86D29B08E8F2B
+
+99137B2C31EDC27DEE6A7F5FAA39D1FAF0BDB9E047C83FE596C958A01F835149369B0641F8EA6F
+
+F0DB303EBE57724E6B1048FFD7F31682DAFEBC1103852273DD19BC98C1C5452F841D5ED7C2F746
+
+6893D23CC5D6DB45B53C9150845D7EB3F4227CB5363E3A3BF5DAFD68D415E2836B4AB53621125F
+
+D7CBD6B551B3D0BD14D6377DACD47787738EF0BE98F687C6CDDCEF0D780A1DD8CE08BC9C018E95
+
+AE44424AF1080F5D245D42A3A4C17D3E19CE340E97C722BD7EC55B09735AACF13FB2FB9906802D
+
+0B34CAB1C02758CB4FE31FCF2758B3A6CF8353E3C51F399AF3ECAC2E109C999BD15DF1148E38D1
+
+A3CEF647225CA8CC45B962A67731C7DABD9B756DAEE7DC5E4074E3DD818E3DE911C1FFA8B6C1A5
+
+4F279C8704A61C629733BBF2F227F171512AD7FB5E72B267EB0A7B6C86C0EE6BECB416A9C4867D
+
+C3716826448DEC3B8B2FC172FEF52C39A0574B976B9F3BFC53422A20313F0B058638EF1870587A
+
+A02D9C4B96AF4F5536562FFF26C1CBDEFAB5A6CE81F25084E902F56B840318847B5E31883647A0
+
+3063673BB2D0A7B2C128AFD261C434D1D4CFB08C50081C216927C28954A79149AF111705E57FFB
+
+F8C8A138AA343F16D540E138ECB9817F91B040FA65D90ADA642DFC98E414D3C909BEBF1A442F68
+
+0AE92F829D0F10BD99BC1F00E7345D05133CA2F3BAEDCC63ED6DD92DA86DF4C85C9D77FB4B1D95
+
+E64492CC0E8F0468D3E55D11D97595876CC2225416EB2D1042FD8FA07A6FDD408F619A0C84B65C
+
+20876A38638DBFE973ED7DCB6A8CE7ECAC0BC71349AB2DFBC8682C1D5E8AC8FAC86BA95A46E391
+
+1135602A147C7205C4B4951998BB1D70BC7D30E7004F3C81CFA4A1364CA1CB728859F57095A068
+
+33FA57B2AE6AE004592AE87D6A57BFEE4BFD39B77C34416E2316A739A27084E2FDB9A9A8A260B1
+
+E928D144FB43AE5A89B05997380E30987D31414EC916E3BD338D0D8997529A17BED8AF01CAD6D1
+
+CD4EE06CB6C0563E91B919903BB5C0EF8C79ACFBA7CD0DB8984603F729672DC47F6D840D911BCC
+
+3FF3F22F561AA5EDA2783B5DFF8DC573A06E8383C1B7420003FEEBD754B62BC461D314B383D483
+
+CB33660B681B6A0424D4C16B730F9759D1C5B8CDC769D96E67817016CA5356C8D45836C297E5C0
+
+CF80818E5DDF6FD6B3D96212A6E3F124AB2B2281C7E32B5A11F737C6CD9A886B2DBCEFCADE6D8A
+
+F8A392705B8EEB3EE7716BE865CA9946158402333E4345A143ABCC24FFB9280D22A2E538FC8C08
+
+14A9F82CCBBB350FDE047DF917E34B7F9A3D520C9776A501225DFB8A5440F91980155C69D69C1E
+
+8B772AC1BEDD870F516A25628445A68793EB46FF327E233DE2EF2428505D78FBCE1E933500BC08
+
+75EF2A659105BFB84D62CD8849B13A0A2AC5D32700C660460BBCBC508A644BC21C02915D44D071
+
+E6997552F1A43E771C41D9A70E52FAFAECD73AF8F50F7F38D85F9E968E178FEE686F76C17B5FB5
+
+C1235E74EC812433155856677C8A01CE329718B01E8469165B54DB6D861658E073D407FA7D295F
+
+69DFBF4CC6E06F7F4EDE5C9FE04907DE0EAF8BBDB73AE24313F1442614FA91CECDD1FEEAA36FEE
+
+969131B200334EEDA47A7B029B872A79EBF7CBD108388C90ACC3A2E0328ED70106CC5D962BA72B
+
+4FA1D5E01B7476375227CAAD08CC669F7EDE398FCD48E4C98A6FE592C60D262D9A814F364871AE
+
+8B9D881029CDEBEA22805E58C1AC88EA3D2A14C06C99A6995236CD5B66759521D1C63CAC33E631
+
+8C9441B20AE51F6C5484CD5C92301CDEDBB6ABD32BECC3273921900D13303220DB46042C720348
+
+F8F5660C96354994A9F4BC8814FD4DE786526E7629D41F523F92E612EDF64C0810600493369F06
+
+32ACE4BABE4488FB2292BF6B5629DF5062FD7D2038CD9856A13430FCF7E9440267AE07A4EDEFA0
+
+03B83DA367DBBC33F449F987AB4C90C6B54F2FB5DC614D50C803E6A85F4BDAD9F31C3C83F8C84D
+
+B51960F42978F59784756FF9D04C14899C601681615360B34077E110C6FB5EB7EEC81FD21C8ADB
+
+F5086B027D11DB853324339403A157DD593C0C482CFD6E41AD59E58C9A9481A391152151C5232F
+
+FC9F164757A08F5DBFD5F239E218915F410197D59AD84B43AA34B577E9EECF694086ADFDB4E8BD
+
+9255550D0E6DCC0F7F22C34E63678545F2B34400ABE7E4E3131D20CF0B01A3A266EC454E3F4D58
+
+24E46732C9B304EB4B7F6AE660A0DEF74EB7A35624C4F8EB8D467A0176DE9AE457EF670B5564C2
+
+749B545B284F63087A2EA02CA97C1142A7E6E81AC7F441D5C4AF68F37E85198CBBA2D509A36A92
+
+95F02A4AB6C08E001E691577FE7512B7AE437BA23D023E26320FDEF262A5B7C32C51AAE5437983
+
+1083D5CB84789619A605ADACB5CD0FA5DBE2A4DBB7A5287C151696D2DEC6BE0AB1122F19C026C8
+
+9FE4A49BA8298C0528677326F0D41CFC2BB67EA9DEF70722D6E3DF3E738668F4A9CB2E6A97E81B
+
+A717B59718A78192C70EE9E7EA06CCDBB40EA7711D05DEE264ECAF9CA47CA542EC5B17D968CF0E
+
+E334272DE264B243DBEC490A3FCC3AA34638DB49C12C2574BE206F53331429E242061F029399D7
+
+4850FAC2B14C69EE8DBB6187D782AA0F9A40C5B4C6E663474E7BF45C32FD4593BAF723BDB8B866
+
+315A898E1D429A9BA89D618836430FF6603137334E7C9F03E7DB7A68CD78A1FF11566D55063A0D
+
+3BF30A87727130E7FB50293794AF5BC45F5818E8949A1F4B806924BF629EC443C5AA6E173BA126
+
+22A346D8B071F91E1D305D1540FA83CA8DEA7F09DC80305B9D392BA31D6E71722D0B947C26F73A
+
+71661F801A9D08A7DE62886A390361FDEA22F1FE67EEC2153F999653DEEC688F25B4B9D58C815C
+
+A456804360DE294BFBBFE5D745B94511C304BD5388FBB84DA4B31E650178CC257316674C5A3EAD
+
+9081770D88683A103CCD12982465A7CAA1C903CEECA6EAA1169637BD370F1900C9143FC32DF44B
+
+BB2D6A4C4C88EDEEC16C598545208401D0985347AE8B2A16F98BF92CB495D0CAA9F137DD534D87
+
+9D8902DF0B44848B3EAC1C381B8A771F9F826A1D33D12FD45C220E94D1C18B630C46D41659F485
+
+16BF6C1A52E1951AED115AE9D4C65BA9F7D436802A5673923E65E8BAB985D09484607D6997929E
+
+09EB1DBA1DFB33BA2999AC6460734312C6827467C70EF061FF8509CD8D79180FA0C92A30B8FF54
+
+59ED13CD5158AF3CB913DAB4CB70ABE18FE0366003499020F996B787FC5BB4A767EF25E3417B4F
+
+C66EC7706E689A551B0E4AA157565C4AC5EA44511D9084CB45B3A5F8EC1C827CA408B1622E5170
+
+3A6720D74D1CB45B5C4EA56076203F3235B5D17E02F195511AC3B1D213C01B604529477E30B1C5
+
+7751808676C3F3103918FA224B3C2C65E0338CC81E11A9ACD2C9F6F995042E654C3DEA26FC3CF0
+
+A094BAF63822CB3004F2786EE74C86FB8FC6542BEF71D96183A1A4C94F01F8CDB0AE1DDAD192D6
+
+1B7AD708D3498B0EE123ED66225976E91267D45C184148C61F99BCFC11DDDFD21ED76D0FC861BF
+
+79
+
+0000000000000000000000000000000000000000000000000000000000000000
+
+0000000000000000000000000000000000000000000000000000000000000000
+
+0000000000000000000000000000000000000000000000000000000000000000
+
+0000000000000000000000000000000000000000000000000000000000000000
+
+0000000000000000000000000000000000000000000000000000000000000000
+
+0000000000000000000000000000000000000000000000000000000000000000
+
+0000000000000000000000000000000000000000000000000000000000000000
+
+0000000000000000000000000000000000000000000000000000000000000000
+
+cleartomark %{restore}if
+
+%%EndProcSet
+%%BeginProcSet: stonessbi.pfa
+11 dict begin
+/FontInfo 10 dict dup begin
+/version (001.002) readonly def
+/Notice (Copyright (c) 1987, 1990, 1992 Adobe Systems Incorporated.  All Rights Reserved.ITC Stone is a registered trademark of International Typeface Corporation.) readonly def
+/FullName (ITC Stone Sans Semibold Italic) readonly def
+/FamilyName (ITC Stone Sans) readonly def
+/Weight (Semibold) readonly def
+/isFixedPitch false def
+/ItalicAngle -12 def
+/UnderlinePosition -100 def
+/UnderlineThickness 50 def
+end readonly def
+/FontName /StoneSans-SemiboldItalic def
+/Encoding StandardEncoding def
+/PaintType 0 def
+/FontType 1 def
+/FontMatrix [0.001 0 0 0.001 0 0] readonly def
+/UniqueID 38795 def
+/FontBBox{-153 -252 1303 950}readonly def
+currentdict end
+currentfile eexec
+A62390F2B60376DE25E6D63CFB2BE19C185EE64A6BAC29C353295355E2953CB3AA6671B8B948FA
+FE62D34F0DC7D617819CCCCFA9D276C723914F28DF9F5A1BBF644109266411A6B99CABC920970F
+EF157AF4F67AFD6B8256D30B6EC249D3D2D31311F781E50A6CF1A677285290833E96072D8D1EED
+B8E7402A588F7818A3DF24AEC6EF5BA6A37D1F478AB266ADC2F139FA5B069ED780AC237BD2D560
+57ADE351BB17DDDA706520BEC386806E3D20ABB33E703B0383CE7EBD20AEA40CD1F3AF80DC63B7
+5672BB9756C84BD572171B717974500FF4A18AEF19B1C787A742E6BD5239D4CE1EA9F43F4881B6
+2A36C01609947E97CEE999B0E57F752F0091BCDDDCE6FACDF38D98728FA069D326B0BF3F03061B
+8FCE80D7B17E69BD16F034750BF510B9D36C193E853643A7968E043A0B6C68348297E52B7194DC
+86390AA0A39414FB9F278A72BB4D38D3DE6F311EE0B4EC0C38AB490D3BAECC5F9C9C3CF970127E
+8C31A6587F7B3A2AC206B60D81BCA82D7BF803849B86D987E5A0F487A25252D9F5F24FF52EB9FA
+E8F5DD1D4F1AE6BCD7F119970D83662824A17F518F3BA7C0E355630ECF16D1B2930AB700F859F5
+F79B58D5AA5AFD043451EF0E21896E9BAC697C99A006F8502AAE0F32557BDF9C3E88B5866BF280
+AFBB6309C4A6C56DDC93CBDA5BAF9D4C9C33CC5CC9614236425B9170151C3BA70FAA2B8822F999
+2902B23E11A8DAE99CA765649FFFEE734CD45A096246CC418F4DA104A0E360D84AF8413AB6315C
+F7B2D93458EFD2CF75CE8E429B4FD9A0D9E2625B56B2307C5BAA8AA4209ADF3AEFF11C2FF9CDC9
+8BC55A81AD0B8975D77B79259ED26DFDB7B48E6AC2BDA8C5DBCD573BE8BF758DCE552BD8D7B9C5
+C3EFFEEC0FEA01A3596C038750DBBDE019DD061AAC75C6DF81EA05D6C6BA940EFEBD0904EA64AD
+CD9A299FC2A677BC166B910146703C4AC77A37D1E35275DF13F0C89B921C2B33905DFB79B21455
+B76CC84D7EFDCCBE9EAD6C4548AFF3EA59A7003A5B0BE359C8B5990DB15451748D00B6658F1C1D
+3C02C9010E586E9EDA7403E03288F939C5A56E56B038BDEA3DBDDEED59953B5D5F3ECDBB9A7B20
+6E97E19EB486E666D22AF8E81C65ECA005599297CC09B83DAE12A4957252A92452C829A33E5864
+3AED6D1A5538BADB723346F28C1FFB55737AAC3B6B95AAB2BFC31B8CFEFC1238F36B24B5E0AF4E
+201DC4B4F8C584CEE2B66A8BFEC755CEFDACC6BD46D1ADC9353BB4CD9F59867A8B9750BA0D836F
+4126BFB96360523DD5EB41BDE2B6442D53B6DB3825AB19A5B8122D39AD6EDDFFDBE959A149E9F6
+5532FC70C32F297A56F4288E355D9E916225C80E4564FF3AFF4E04C65346BF983822CF047F27E9
+58AFE046332F5F8F122A687FD0BDD81032331699C60EFF44DAD7CFDD98EAB24D314013209467D5
+A80786375AB9285D7E4DA5D0B32ACC0AB990B4448822AF1D132563C579C28B38622BCE48919C23
+E4002D6563D365236ACBBC278545CE28ACC29A6DE5A9380A4AF6D2863C0283F75C864A8B5869BB
+FDECA25E17EBF3CE78C0903B393A024C3807236C92B89611B70EBBB96D672132CD28B0A402F98D
+D6475F2F9E471D9CF1D965E56EA4D0D6ED3344120D8D1ABDD8887EB839F7A2A9E0DACBF2555874
+A9200A29C081EB4562F10958353FB72F2E0486F479ADBD4767284E6339BC2DEA6A05556366FAC7
+D8C19CBC7CF415308FC33AC6763E2F450EB9FF4B86CA7ADB2A7BE9033255C445936A2C970D1FA3
+1BBD650E10EEEBB018212EAECC4D4D03046CD14B860BC6BC7FECB4C70BC60456295803399795DA
+D15E5A7F2A3B8EC7BFF9558A0EFDDF178752D7D2BE6DF7CC32212E7F3C632B5ABCF9F440CA4195
+E50F3407DC05ED8EEE3C6EF5D927A304063D2C5927558E212087231C485A118433BEA5D0314C3A
+B3DAA2631617367D5A8B79CF0C1E7982953C575C363FAE2DD20207D5F57398035825BAC5FB0280
+47C7D907B3F9529B9BA37245CA1F50488CB4F3106260D4C324D23E061A2E2E88941D56633B98C8
+75E93770FC0B33209248C5290539C23EC3E072AB079719D3417EFEC7272F496F0CED0AF2A58B93
+45F5A779AA54A0B05F80DB1908F6F4B91C0DF41AB56ECC0B54EA9BDF6929B1C791475CF0864E5B
+A00DCA62280FFE6A4C62629117C989D332FFBC25530BDF4F08592741656B60D82F0CA39A3CF374
+5A626475D1E9783378E940659ABA7211587DE18504C4B300F40434CFE719CA3CDC3D89BB226F5C
+1E345A3C9186716E03C222440EC5A9D9B585F9D10F9DA18A94F927EC32E73E8449FFE392F703B4
+18B525F5F8F765CD63824896DC2F81FA75DB733A417247F990FE6BF0861F1B463EEF1B727085AA
+39E36B48F69CD2AF2F05A3D328B3F0565049C19481287AD0515A52B323C141789D08CE15D0D792
+FF2E8F498BA4DE090B6603D7270D993A152232F4D0E37739FE269E40E8EA92872180B67347522B
+D93ADA3C3B4414004711C25276B1D845571181FFB4EAC47EB2B3E7412593A80D0AB953BBAFEB64
+A0DA73607A207B8E2CF3F1CB47B74F1D31BDFAA5F6E556D270E00DDFEFDFDFCD0BD59CD03C2590
+7A4EB0E2CBDE294AD274F29646BCBCDE44BE8AED41E878557F30E81A0842AB388637F7A212E953
+8AB2119B28C51FBFE4E75EA17AC233949A232B015F748A5C51B30ADB0918D69EC641BBAA574588
+CD45AA7791AF88AEAB4F82FFA0929BA72ADD4EAA58A00EEF780036B65D279A10240515ACBF696B
+90F919ED5D9CD9B65D85450356521278D2F8367228C09507A6B52AE413183521BD2454A755E150
+784E446EAFE3CB12F35A4A92D7F5534260CB84A4D61980C535D23FD091706B2BAFC60047ED1388
+2D3DC00BB1E006A2D678CFB3C2F2921A30A8090F303BAB9225DC241F9CCFDC1860A062EA1FF404
+7A2706F42C1AB7893334548876ECEED621CB105D30E03EF0F5F2701824D1CEB599C47DE9CE2274
+A41E3D4ED68C56D8130877E21EE161E863CF27413FDC0A9FBACC6D518A767CDC7102B786FAA8BE
+413F625031C79934879D9F0D0E82B5339BE5EF972F4B545293743F0E31647B6A022550B1CCEC31
+86297B1E8EF9A0AF76D6B144C84A2FFD5AE4BD4BBE6BE084BDB4E503216837D229CB80E4E2CC6E
+3BA702B3E23BAE1E96309D919A3DBD5F30D78C57598EDC3BEE4A8374E4DB7623E2E6F1C3215B36
+31AE53A2911298A952631D88884A477BA09F526070AEB8E0E9E1FFB8E694DCB2CBBE4E531A7575
+DE9D35B8EB87DD5FE44D4044B674BCEC038F5D4D9324C5DCA1C0505DB20497C28F345A28313B11
+0BE19BF4C12A4242FD01CE385362C273D4A01F234642D9687DC930CD66263344161EC08B49C30A
+0E39176E07272C5FFAD0E3A3489261A070DFEDCE9F27E5DBC8DAF699344C070B6C030339222DEB
+C1F625AF6DB875C69FEDB4D6135811005354B26FAF284CA2B92F7398E24D8887C8E70A151A0538
+9883EC77EAE6F2F7D6CFA77C52D81AC221EB6711EE5F11C621EB3AD2ED5755F7B055C19744B937
+4AF98B9D178FF7AF4EAE1F54F49B4C9B76A3947D647941A5C3FB9C3E5B5C57E4EDEBCE7832B16B
+DFE73FD84582E1AF57A393404FBDB07DF4344FF5837D825804ADBF5BF85682D9C2177ADA261501
+39B05AFE65678753EFFCAD4F871A3C7CDE919F7B677D93ADE141F0778C1DA0D25E4A8367089E09
+8C8E74EBC70BB5CB7B8717A2F23496BC24B00085E830EADA44B528E8A0CEBFA870140598F2F680
+40C237ED915D4E9C5158B1FB5D8ACE3B66E429E6B50C22FBC4D289A15BFF52BBCF71FDD36C6679
+5A9DA5303654B84EDD27CBF199A2C564F080D8F5781D39A32B21BEBBC978FF8C4C3694C4396725
+69811D60A95EC32A232FC0DF1276DA0DD6A2548FFB6CAD2197BA3C704D0A67FB83D05087C9C1F2
+94BBCF0F72EEE91833B9A625C6A749C3666C6A777010E05F26AFCCCC1A6D6CA26EDB8D12A713EA
+43F0CB9692E6AAFB2470787CB207D7F3D297158E4E37CCFB67EF01177C36BACF5512919E62C884
+DA155BFE257B820AB36E88A9F8BD590642E6EE18D295A53B84342E7FCFAC64C21E681D3A974856
+9A1E33FB4633FEB2DE5727872201763A5E649991664C40C76907AC876DF566911F4F151C815091
+BF3116EE7C60CBD379D3737C42FC35CEFFD725492A80FF0AA17FAFCCBE5DBD30B3310319570182
+02E91FF3813E5BF41F7986BB970808FF802C02B31B896CB480A5082334BDF9A390CB20EF03C1BB
+FB64288B244655AB9ECB8BF8B9EA61571AB2FD3B1E2916D38C247C21F4A4AE03F7E1CDD1A28307
+1AE0359B960FD9C45AE39794FCE5D73CA1A507FC6D0EA06CEED17A4083A5B6AD4AC63B9ECC0375
+0B799F3BB6F86E190BFD47CE7A697C6B1C89C3B55C2EC058F3CFEF2EB53B35CDE7749E79531D82
+0A1583DF38B2FC0A4EFDC5C30AA5D1DD77DD8196DE5170101A4AC8C8B9DDFDA93E9FDC07F3F572
+E1577A6E0BB03D5BEDC5B3AFACDE1F015534695942E9FCF6E3C8D7C70BE56738862E3A62922390
+F31AE5391D55D125680F3FC0DC392C7F696CB9CCE6EDFF20A3EA4C38EC16B2D33893E148DD373F
+A3090AA01FFD3A37C1BC80531B4310AA42B7B0FBE02762A656C69A1285003093158CC2D13054D7
+A192DA888380C82D4EC01A77EE962B78D05373B37AC588BD5F8FCCDE19C800D68499E9B07BD329
+70691EB6AB21FF4CEDC94C96E55720728B5D54AE5F8A7905D6B18EBB184992C2D4B4ED1204D6F4
+56AB648076C24864A8A7E3ECA52D5C73E760A442F1D1A162F15593442E0C37855B51FEAACC4B20
+993D9D9B3EF693CC68CA75E449F1E32B00231A484F110AAA2066A4348D8DC5D6AC1FD374E404AB
+96E308BB2A159901B6AAE12E1B5B6674C0D820841B4335CDF20F2C64CCFC7EB064FA0A0F07B125
+8CF9FA6DE9AF57B0ECF09E2DFE96F8F78B83C9F689F1A10D0BD87FE9930701583171FFDC30BB7A
+BADBAB5B079086A7943A3C6EF5C9F652F9BF035916B76764B7B53EEEE54D8A33D5846FC6A6B64E
+99FEF43C7FE90DFEBF83CE4356610C65C771426E7D28BB600E743A575F88E5A3F1A61B5F53D431
+151516B8D247E642574B409CE4191FB6EA040586F49FD9116FCC9B602F76F6298FA74221B350EB
+F69F6854D0E8E2E8BA50D2DCF7C04D3B9B63C7022006371DC3FB8E114F44A501C28A5D63383925
+3896C3CA6A65A9C0B0976A9C5FFF29EE1D27B0B6A1CD2A33928F779CAB654187FF00CAAD0FE27C
+793F5B1A1EAADB7574B2B007D9AC5F341E8AE471088DDFB6CDACD0437D1A75FD7530150DE40419
+E144C7772C5866DD09FFDF928EA4991963E0A5784961B467110E4B126D0F05CACF3AEDCC00B559
+9C789174F96D2018ACC8B58BCBCB827D694B5A4E1F8C4310F7FF5C50FB3E774173D21ECD4D276E
+B02E08A6091D1201FC1176F046466E4D685692D97EABED3699AC741FD506C10B90DCAA6B936E57
+2A4D7E6862198B29AF57010188941CC7668EC6CE860F416D4AB95C44E0B1685804BFB329919D2C
+0AD9837587A380C6FA3F605EE3C84A14F4E8E5702A1F5057317E2C3A70C4DA53FF1703BD88B18A
+07A68C2622BA3AFD610A4C3AF73B7EA0965B34C69AF7216F9E9A00CB609AC4567EFFEAB245AFE9
+02506B811227AF036E8985A0D8931B7DAD9C0DDA01A88BD5E40C6DFE3FAD7D268A41D93EE38D2C
+B5B8ECF6B7F295D107B2217B0555A439E9586B2B2526934DC922C5D75C4A5469F8B3ACB722BE01
+39318429105A4F5AC2657ABB4AF11ED67213AD16120EFC6026480FB15AEC28F3B0C0AC5B82AB55
+322A9E0E6DE39AC103C1B4EE3F6235ED6D9AF0AD4A2949C61C182978D99464DCE81462A75DBE9B
+369F0DAEB667948727B721D4B6C7AEB0E72E86896AC6BE3F8948E5A8C3A2A04FB8867515ADB92A
+B1D0C77B5A29D871B6E3406D44B6C4AF4A2907418BB99FF4912FD5E2171D141B09C3818595070D
+580411ABC386329991F4D86FC7EDAABC817A74BFFE39093115F826345A48E966674B0D3290A6BF
+1B6F634D002F7E17AE7C065DC6FB4A18897E2C25C96B9B34A6BCE88AF1F0D2A83D87C4F7EBECB3
+9F90AC1594D395F785CB0FDA4BCB7E16CC78E582525C5EA073E9611BB5B729A372DBB80ED0A53B
+7D44E35E65BA5B50E383F932F7D0C38B4BCE43C7EEF4CB1DB16AD5C3BB741AE73DD00C0F5F949E
+1C4FE879E7DDDCCD475197917D4DF3CF62CCCFCECB31137B0D807ACA9A0242898FAC954C382214
+66BB36BC54B1DD6B927924A5BE1EF65B6697FC6F0B621AB5499C03CE4AEE3CD7DFD1CA369DFEFA
+F421BA01A8D5794F63B05625CE02513B4C84B8C0189DB3368E7A7568B422DEB07D7E34D10D37A3
+1CF59111FA54E490867BBB45EE635D4E69116F4F008120FEEC6FB7B7FDB5F921381CC520C816D7
+4DC29EBEAF41EA6230982E486E4916B285CC6656EB7EB2A1E13817ED22FE119E49452AA0BEA8CD
+DF0457B8450FAA7CA6863B47B297F00AA6F039941D89626153D5FE7F54ED02FD02BD68EAB40836
+55C11306E38E89F4853E911696896232D12A0800113DC0066AEAC6E10AC5CFD56DBC4BB36BAAEA
+B1A821CD7DD5FEF17884F46BE82040B53705D3541ECFFF57F379E9BE619F52436017F6C677E2A7
+8C105CDC276A7E12224BF30284A8BE1AE06231CEE80398F16040FC720934E33E46F4E4CFB410D6
+2B37C95CCF6A5D0B205865DFD1345204A3D2AF5AABE6C5CFC16E97FC3CF27BAAF54F4F3DCF1388
+1C9916B9BAF8D160DB5573F16C5A1F95DE88F878461BFE98ACF137C14268DD8882B20A0859914C
+DDDE2899CAAA419F561C04FF0DC290F40E319210300E91628801ABBD1DFFBADC685040272DFE90
+7F3DC0C0A5C419FD17FBD4E7B60DC1EC1B69D83F4EDE8B8C6A4DCFD2D419BA88BDB4D9CA0504F6
+DC28F5071E73D2BA95D15B8AF01527B2321837CF1F66DCB58B6071349D5EC951E98B0A3E2945FD
+FA928D6393D852024CE0D9F5AD1C0D4CD275328F1263A965B539F9F77A11D9601C70FEC6109E3D
+525269B54AC7AE10ABD7E9DFE6D2C116ADCA04887F9A61236B2B6CF07BF6629B4F91272921006E
+B73CA6695943828C8B6B6AE6C74DE26D00874B0CAC27B8B6CE2AC29FCEF2DD06520113482B9E97
+B0A65BBE14572E8ED5D698C4B30B31EF4A68659CB178DC79AEB9C37A069280F10E838075F383B3
+E59B8FA6FED1E85AE260C5C9612F65722A6EEA9E0E92188738019A3AAD25E746791DD8FD92AE15
+818BD278F2E27DF6F5E9F410E419935E8829990C1A46BA2912483D48DD5BE54A42FE3360417AC4
+86D19633867EACF8CDE5865F2A5DBCEBEBBBAAEA670AAFC86ECF234FAAE825A47014913BBC29A3
+FE6F4B8AE09F62D2F8B6E54D5D1691D8C1ADE6EBADD268DCFDDC4A58484BA72D6970F4DA7905ED
+8070960225D73B77923C5DBBC359E34822348387C309B17E4F36324A2EA1C2F305D6E2C7573AC6
+63091F2F8396458371BB62B1BA041D418BCC0394B6974AAF6BE37E8E9AA7DA543EDE9F83F6DE06
+177E60C98680B8E4D6DFDCC921B6F044366539BAA9813A6ACD48D0F0229BB93AF244DD191A2B3F
+26FE28BBF4CA9BA5D2E17CE8F45B35D595220E46BDBCC47484911869E700D8229BDE2DD45775C8
+5679A730C00766EB8E69BA8ACD2D903BF01B9F8164E3CC7C9545590C55B5CC1733BCABA7B07A76
+EA61A0315A077A53626EC56D1C2DF338DF09B4DD375FC15260808C2DB4F9659D52F56D474C588E
+0A775743A7238461042BC9C40F1C4F5AC640F5467DF8C171E74FE670B331E57D7799F0A8D519F4
+88BDA299AAD86638A9983172D09EC8ACA7B7C0819CE7528FAF394569E04F54D5A6086E7588FAFB
+65AF7E6904D5409B62DA57A2C3E26184D68D5FFF28E8A0027EB5C128C9C12F1C1CDDF08D8C9D12
+E057AD30CFD90F3A29CEF4525EBA05396370DA91A7802A51E40C331F5DE2DF4A39558CD6682640
+03D174A42C50B6A5B2AB72016B2B5E39FCBBF5029D39712BE03171F1208BE5E1A945AEC3AFCB9A
+7A5E6058F70C3A1C2CDA74DB0C43A09422E11CD2A57CE4CCF0FE58E5E2E7E3051E401C1F34606E
+616FFB4F4442DB141B9BE426BFBD43D14581EA4128D244818F85B6424C800DC117D6B7BD469321
+0D72550340B1DD1C432B05EC414922C899B75559D25A63A44223A149ADB574EA515320E678DF66
+6AA9D619B3C4831B00F96F1C02712C395381CD0383B63BC53C1FA4C5CD4D00862F6819B491D260
+4A4AE4955F7615D87C298396C8278075FDC008CAC25473C9F9CB28A507452B7EADFA56A3DAA7C9
+16AD4F090123C8C885D9D1ECBFF8D074C98BE8F18C0FDC2510A4305E9CC8BA571374BBB7BBF75C
+F1CC9829D5A1A252E4730D1AE3210AB074B67B00C54391328CE1147F205502DFE3A6EC47A4D63A
+B7D2637B2DB121E63FAC1FEC68888A2001840A05AC90B07B577E11D97644517394AEC07CD40D02
+CDB9BE567DA3F4135B0253D503D50EC566F422182DA173AD62E2B94D31A5B4F2099F9FCA252246
+6862BEF6585E1A189565958B38A64CFECA4BE515E6E2BD8BC5EE44FCA593A2B868544321948E7F
+A4AFC1F5A2868CFFE363C7C6E88165444E13C8C47C65E72C9C8B28CA496B49A2E46D81B52B48C5
+7B3C8011BAB8E8DC9A14767153CCD8FF4A2166FB00A60402FE0AE3F0691B572766FA4BCE607508
+3B2B1C3E16CF4C9108462AF1E6A48F4D7A1A41645FA27677281022949500483B46BA23F1755B5F
+EF0578E5F2E5BFCEE2F713B3324A8390ACE191D51408022C3C8F3A207766EACC05A14E3C3EB6E4
+85FF87CE4C62FAE3C6BAD0D26ACC8E7E584A8CD7A25A9AFB42DA6106F07A65C261671202ADAD69
+542EC6D1CC5B1EEB605E474BC949BA7B2E8A64D4F5BD7BBB326C06F9630D4F99B9729CF4205D29
+12BE9CF81FB114541EF8D7D5CE4DD1951CBFBB5B2FF5A9896202D438C7225B8B0F4C985B5A94CA
+09448A46C2E3F04674A59F55BA9851BA61427380930BF2747CCA7CB932388561969DF7F5D9545C
+5195E52A847EF2BF4FE33255606BAF3AD695544CA0FA7681034517640D5611AE1A5F1178CE695C
+223E29C41A4017760F3651122B7BDA4E967BF5D76FB93984A52773C518BBC71DB32FC51FCC2F27
+BF59622C8907241A16D31079AAF1F310041D63C7750872F8FE294C06C483852399414A03D4B684
+44289717B3D097324EA791B963A273D0331714F1F912FD6262B81FC89A5050A5F341E91500CB00
+E970CEE22C6C28ED153A44CF43E9DA55FCFED8B953F9412A1FE477104DB3BC46A897682B4912AF
+1DDE7F20A6B9A4365060CADBE5316B805AD0C5C32D55B8458C47B5D47FC1B4140E0F6B42B78FC0
+BD262313F96DFBEF9EFA5A4F590BCBA3C484A151C05113E4DB9C56FA187CE5D07BFA5DA8EBDE83
+3E75C6AE8D8E651654E11008172BFBEC0C59F83BC1D6AD9C4DE8EEAB779C1F8DC479ED084B76D6
+D582DCFE08BC4397ED71F2562575232D9B41EA2B5F23722DA40231E9AB85677C29A6BC37FC36E4
+DC4414661CC627EBF94AF2B13CA571DBF0105D08632CBF640BE1A6F4B33046238D62D1189692A3
+6EC37D0299B2B43D8DCC06D374EAF0B5D000A8B144A954A37CB7BA6B7ABA3617BE2F719FB95410
+5179899FD2187BC906ED19D54D8BAD2B970E7B62AE8EE1B17989E26F340BDAE188F7FF4213A1ED
+758FEB0DE33A33FCEDD3B874791B6DA5F63B91A2ED5DCD67180D374562A2ADC73359CE9EDF88CE
+824AAC15079441A95D8F0EAAA18E6CFE4016326A75A76C210347ACAFBB90C3E14C7732C8F5CE97
+CC4A9CC6E2F1444DCD170DB12A9BF832CA1A238A29C61E519E9F00F0F5090E84933F35FB7E717B
+B64991ECBE650E4864B24ACA929743EB77591F64487789EBFF2A2BE399C5097D6C673B6C5A2179
+BB3E846F49F2F83F3B1F360FBB2DBA6AA4A516EA1BDED50A497ADF520F2D18846BB30AFA1B732D
+761B6760080B448963D77676D9BACC127E5E033E4F1215F0DFFBF74247404B276201C39D187DB5
+9886A597E04E4CC05DBA500A24C9F2237D5BDD93F9089B92C653E47AF8EF00E62F5F22FF8AADDA
+CCF1CEEE6350F3348792912DC6131FFC1DB93FFCACF5B88C96F5DEE570008CE39B1E002A24BBFD
+C3B0A09767B24644216BF8905E02EC1FE6477575E3C45DA5A05BE475C20DAA7BCABB43B4A9F16E
+6C5FF5483E0F5178E320CA3938736CF32569B61BE5BBC724D2AE0F970AC88A3B4AC2DBA8DE8ED0
+D42D0215D47CB49E69FE1D7D7E40E87D0354C835F45735760AC02A1324ED7816D9838D28578098
+DE0F1C6505133B000164083310573BECAEB20CC880EE592845B6CB4D3F2C94DD06E3AF43242499
+56C2DD51FE2D2208E32FC8A837B4705B71CA68D7214E92F2996066AD6BA8672A2B09652B3E1861
+7F6B1B60CE18F9EE5BEA3616C3EDEB9AB79ED7DBCFF05AE6C5E03F33C4B20C5D2AC8B049B09A80
+1EA83D3E1CC5C3CBF608B39FF2662369B85478EBDD4565AC7E6D79CDCE0A36E913FB6A6A098B4B
+A16EDD7BF1415DBC0A31DE30909DDB588C573FA54C3A7C703D76BE975079B781073CDFD60EAE69
+6BF991B69DB54FE24CDDB02A44CA8C32F0935E77A5B8339F60FC8630A0E921A444643D68501E25
+F64813FD94AF45F9040B148BF0568C1963D9B26D70995169483B011D865DD264225322C45FC65C
+5172DEC70D0B2B792594A9CACB21A225E8D07908A052AE4F0FBD3918F7F9AB0D7D2EBDA5F0E07C
+D043048C5DA8F0A38C225D2C15A5E03689049D80463B7CC35A54E202FB2333707E0A3682B85150
+1BE15715A94AAFDB49BF6BE5F80D83FCAB28B0B800D685E658D41286D4BD421DF10428C40577AC
+36386FC6B76FBB98BFB6A13FB6FA40C6837680CFB1520C0706254FCE622D14AEBF58781E0BF2A6
+222F54C43704D4E370D0AB3C91F4D5501DCF69FCDB8A08CF7706DFA456A11913C42F61A832AEA8
+B189409E146557338AB059AC7BA9CFEEF2AA969C5561B677414A91680649CC3DAFF576FE686F9A
+B9931A749AD17F6C0C90120AF8A9584535F1F0B7C31134C09C8CB07D857395F00D98384D8BFAFA
+FE27566AF9E96915870C87499EBF243D8EE8291E60DC73C8ADC2886E4D9808A39964D24B8EA30E
+F93B04DFBDA5A5B868D29E3945030AC0A394EC4657B4FAD9D2E2C7965DC7EA916A3E20E67BBB7E
+99D52554D224938DEB35B11676F91F5ED24BA6670F574537BFBCD403F09212C3DFC3B8F4DD9EEF
+DE27656AFA41B69D9094FD23779B37D6E54DFB6A654923AA9093006B23CCDD68DE0D6DC6E8B232
+464DF25412DA32486A81887450891CE49172CF0033C3CE0206B02A9BC94FB609491BD3B8F2D7D9
+080102AF684EF93913160A07FE787B1FE843A9064DCE5E29612129DFEE055646FB5BD78019058C
+8E32F297215AC6313022C40FF4BC9A38529CE8F574DBC54DCEC0FB37F1E99A50166F8D7FC40AD9
+283482952E0692D21C6B8FD7592B48D77BD3487EDFF6935DA9F4A926B5CB625C994B2365A39688
+095B9C4663254C7304617D2ED79F333F5769BECCF0B88287F1708FFA7211BC0CF9BB5715EDB733
+6F009A6A797EB3656F8B82AC930695A511B8E45E200BA82B81F3378BBE2196B4B6CFA19B829D8F
+8FDDA6006EE028965C34CFFC5D71ECE1E9864D5C770B66828B9CF8783AC1413371FE27FAFAF46D
+992047F64C1FBCDA55FC6525FE5CF16E681FCB6F35786E262034E1B1B4F09CC4AF3A478A30B408
+498D192C627B06AAF0D88E87D4FE13DC14A9A8A20F9EA404F8DC89C122423FFB5B0E3B88F25C4A
+44C799449D13B169E28A60C86E1738477256CE22E016A0319B60DC8A9D0426BE137616962BC736
+6BE6780942955BDDE4CF4CEF3177E9FCE58E706B3BB8A013BAEE39506E7378A9C5A1F9AACA2EF8
+224186542501B765F002B6B35A79ED7A2A77DE1192250A3D119B687D0AD2CD269348C65075AFAE
+D8DD82ECEF51DCBC18C374D8A092D99BAD3AB5C29A8FD28FB41C02EF3E4D095B7082E6D5EE1A5E
+4306C9E877A7BE348FCA240527B4C349FF7FF84901A5D22428B27AC34B44EC507447644BBD5501
+8FBA01EBA3693418EA2F6906EF3C1577D91B63CD0BD2C519597EE07D98297942D80B0B65C25987
+949083FB0642DFFBBAD74C22C3C10102E57C7AC0DF4099C97873DEF713944BAEB920287B8E093A
+BCE51BD52CE45DB3C6A737A55E1A00AEAB50E71F5D5B0CDFE61551DC7CC3BD03934DF272BE1944
+EEC621EAC02DAAD8E54E04DDD2C3F02CEACC947C799424EFD1A6C75C7A35BDCAD1DBCB9F19BCE4
+12BB019CBC7525536C5CE21E32E9B9AA0685C7D3BFF3D82EEFD684E8D63A526018F4305D137CF4
+6B97BDFFC1E28B7745C808293C24C849C9C61E93CC64D99820FFBC5F1D9F016DDA621C97FA8418
+A0410F78DDF4531885509464E55C2EEBE23AD17C60961699668EE76C6E44E0D0BCC839B808ABDC
+B6FBB586C87A957136216953315981AFB2089C1105EF07DC47E5B3670EC1664CD13718B8DBBC51
+746750AAA374E71D4ABDC31F8E8AC3804E908597CAB8B3E70EB42AC67A0B5B1E2E628796BC3A69
+F3DFB63DB7DE4E40411CDBF98B86688AF4CCD8647AAE4E1D608A00E0834E7D34CFDAD8C95DF21F
+AF62404643BDE3700514BDDC81BB34DF75C7F8EDA704B146D20E14EBC98B9D0A11218EC8578BF5
+239E5633605C769EF3EF6855F48DF16DD8DE5320E1851E7C17311CEB2F9A2811424DDCC0E6BD36
+E45BB5191D890197657B66FEE05B83ACB88E12BE1A48D66949188080A0F2DF71DA7A2E3B072B23
+FE94F176216AD5F8DBACE0791061056E5BA4364BB74273A93B853DB23E396116B8C1C3F3F8C545
+A42F02D45DA7DD2EAD34C01EDE163FC5B9400C0D39BF0CDE1B1FCCBB68D47B44885EB0AB14D205
+A30D1F2E4E1825D9742DA3EBF4E47F6F2F750562400C54330F792A998FFC158650940C0B115282
+D8C22CD34F8CD532ED3B94A5496C33B3802AC5D627B5F0A8706311191EC4252549D813C92A01A9
+804B39402660B489095F9441D958FE3873CD6E6FD3EA91EDFFFFABAF460B71F1C1EB9703A7D9AC
+AAA34337C306B67E7460AEE1AF02E7E2E49A332599BA8CF2309AF2703631B4D91CBED26AF49410
+830CCA7023A7581E2ADB97387A7DBA23189AA993B86BEDEF59A72F246A4F58EBE354992D91514F
+130AB2C167717A97D647A157BB6B1D968AC86C9A97E8FBDE9B2E141DA7A1EFCE2139D13F0B7489
+51CE73B1AE93B19E93B456C491363E045CD5A4C79EAE5174F332A36A9BC1001B793022983DA2A1
+8A8C7FAF236DA88415A4C7A262CA714E373A7333B366AB35B9E39C7389A9D3DC385EE951F66879
+188C6A50C3D9556CF70C19F3308ECAE12009C324F93F69E8208A2A8E9686EDBB141B1010368ADA
+78EBF3E52BF05827E453A9B2318A7A31B681148419434CB738A5A36A9A3905DB00F459B265C793
+41331A9661352E40157221BF0D3EE9A3D7E109BD2FAED3FDFF58C8B17DD8D41EEA780A090B6A61
+E84CC84E0B5A07B7F176E3E3B21FA67A6E51B154DB1422AEBB3F11DE57E3A2928440BDB1005BC8
+58598D8D77F30628DE258F26674CADC2AC1E150981DE5FCDF9A8134859EFC953524A83C1E5F4B7
+0AB82678DA8798AB558C1981DC65545E9669AECC21EFF0F428709FC457833E593AF584435C6D49
+7239E2E6FE9F99A4456AB8CC54056FE1ABB9C591E11B8E1FA72ABD1C07F23BC65D83BDF2914F02
+7711C1B5405FC84371A9050FF9B85F1338CF24D44DB280A284F9DFD368816027C9B21F41BD7B43
+1AA73797585FC93C0A5EF1353B9012FDAB80EA8DA648A32BA684437E904793FA4BA37F83A86CDE
+B9AB4FE06B5DB0172012CF27613FBFEFE108B459EF13ABD1F266E5921B51ADB35235A90B8E646C
+FC94B8A2D25E295055827B734D965E91B5520601415F93BA0CA60767C60AEAAC82678E59BAE9F0
+8C33C925768CDA423369006B6A84E9ECF4A9576C94FBDFDAC3281E13E88603DA9913BA1E148A6F
+9DDCD19E24E39B221001F6C824806A04747CB305F9FB7B22AC6C5EB18E68473959A5DB0FEB5EA4
+38AA8D7292AEAFFEA89E9ADE49034E0F03C2EDDB57D15C1106F2C50FC19E2760B8C8D1F3F21CC2
+306485BF437BAE4B710FC4DA3A7AA53F9A5B0EC13488649448249348B7A1618F5645404E04EB48
+D809DC0BD68CB12AD22F4B46FF2E9B8992B812F2CFC9F6B45FAC4B6180479E76FEAC7946FD6DA3
+965085CAA176FDA9881036220E289F6124632367CF7660E0CF5341E675A3E7914392421C1CA647
+103D4B9DD026337C4FC5A148C39F231151D9E0CD4413DE03379CF0DD10D829B95CFF70A88BF541
+6B6088529B04031C12B75E601BD72A1C1CFC52B5D377C5B80490105A0BDD5B6FE5821FF77E1A74
+DEE5AFA5ADEF8E473975360965C97BF48CFBF7F04DAC7878D0B2190A66596E10934EBC1DA5575B
+B5851D04C34BAB17979B35DF56F5E3DD914D6DE19F22310854513C2766AB6A6C58481B0993CCA8
+95B73C3D45414803FDA3D413F9220AE10097FBE7A9A6CDD150CA0F8575F8806B7F8E35D17DBA0E
+C9B5B827B8B28E634D4DFF5890D40268C96A752A8D03EEB11F06C7736EB608B101C21E71CEEC70
+73B54CB639C23D11344393FA857ABE72BDA7D0B8C1B47C92A18514EA4446E6BCF3C71305E53963
+9A0AE965D8E0E14B51DE79531EA5C3A1C0A9F8B8CBE42A24180E09AC811A85811A536C568DB390
+8F117D5A06C075C452CC2226A9DF157D84570A65DE6119CD69BC0936A0A4E2495330A023EC6C79
+EB8845454A88ADA1D22B3147AD972537CD6C8B7F1D41B4138FD6E89DFB65D12BBAA25C0E182077
+755AF5F0B4147DE8D18C59FF1EB4677FDDCAF2FEFCC49C0B3206BA2616118A86F85FCDE41058CC
+F8BAC9045AECC291C5AFB4B92B067315BBA38295C256FDE9B4D77B99470DBB0B9240E682CE9DFF
+ADC7DEA34BE240F6432DF291C19C1F2A4FFF206C0832BE628EF15672A3091B7AE7967980D10E03
+6EAC6DA540C09501ADDF9860C59E6D721E559F3BF80BDD9ED0F5EE3E95130ACF6C4EC7161B7190
+CA4D9F74FFDC060CC39FA20811C6A1725CDC2F61C080036181AA26C43E056D8FF2660F492C9989
+351B3844CC210FEF0694265282DAFBBB6AABFDFD6148B3F2982992AD34BAF3E34BC1E2DAF2F45A
+BCFF9A9888412158C73F0289F44F7793B09AE11D7788B2DF2539EC09F0FC7EE91DFC836070A38D
+F12DE1B86901966497AE0EFB1C403F81DA5CD37041F0242B55718A9B4855345EAF4DFEB6A0020B
+3996618CEC58C0948B8D68042A87343E81FAA82A20F15AFDCE6856281D80E7082799B654355EB1
+C515B0EDB842F153A30EF109F3280EEAE70BD11079B3F339E218A77A5E73E55F7738A0C81D25FD
+E5A24EA899FAD8D7D5F156BCA8DF019AB31BE0BE898D521D93E02BCA53F7AFCB1825A07BE7675D
+44BB8868354416FA3CB072E032ED4E14397D89689D998AB3540F3851F4D271F0950270A726A885
+5FEB558AD353308D5E1448B3487F895CD02A9F1FCF7164D32747CFBFD7BBFA63470E84A40ECD60
+DDD9D4A140C1818C9B19A67F4BA7D4CC9582445E58F4A9E72BE3FA66F09FEBDDC41AE995525840
+94B372CFF3CCB76A6DECC20991E38C49B70834E1649CADED29C7A3368A93F19D19C8F7BFEE958C
+021F54731E5E6379292C2EE8898058633DF19BC5F7463B48BC12DC2DE92C3AEBE2E7EF273172A6
+B064B6073BA7950D9B203119411494E694098803849CF3A2757ADD758C726291407085D17B054C
+0B5AB36B843AB10E40BC1D556E42F6D12A4934AD98AA1DCE1F3B5E36B3CFE961DE91EF6D242AA1
+93D20582798DE7146964842BA49934D8117536BCDAA1BF4CFD39FAD56FD110128506F3911A2F80
+0CFA2AF2B6F7F931645F8F7A48A29341BD7D503513600E8CE18A086578C158BEF4222141BA1AB9
+748293483AB5BA75094CAC69D6B48D9A598A22843322D71FE4E54D016CBD139F1FB38730A137C2
+B56FDC38FDCF4B911AF65D9666FE871A0184EB3C8677AC77D20B658D211956B101396C72C63821
+5C21FCF514615F7FBE4EEB17DA9E79AA2DDB6BCD486A5B3DB522C49E78154749D9656EBDE63007
+21DDCF2D738EC88B96E2018A76BB47F71ECC6D2EA330796BCE78C1502AE033D1B936ACF4B14FA7
+DA665A97E4FA3AC09F9C269DCD5422C20B8E5E1E45322663041DA01CFA72787E903D4D3974790F
+EE22666ECC6C89AAD89F01E5C683D31B69D298D5C82341E17737413B44B8CDD121705A4BC6BF67
+2CEEEB7C9F8B13E1ECB760A7EFFC1CE62249DAAD1A5F02D65FE2DD8D76B964D1EA8BAF9AA2428A
+020CE6AAA48034D0FCE36CAD982A46428D2A2B2741DEA674C018C12713289A89A60860719463D0
+B35C76FBFF9C39A73B3277B357493C704E1BFBCFB86BF566ADF70F0DDC5D3E01A0413511358924
+2CC8DB3107E229733968608BE00ADC1E0DE80427C65C74F696BD256A9E74731EFA182028D00EF8
+E686A53676FBAE9870E93CDB7C3AE6AC9F4F629E40D209EFBB2961F89ACCDE817C4906DE2050E5
+DE9646B216E31A4FA02F9941A9A104F656807969E5ED4A639000C7BECEA5499B6BED13B00C7FD1
+1473BF322B3A56BBB290C230C67FD50EFAE3DA7C2D8FDA27B0BC66941F8012FD4A40D7E65E7CDD
+4498B63C452F159BA17E2B938BFA3439BB0DC71F4551EB5DD196C8B7C0ADAED1C255883DFBF900
+94740283291693C9DC77C514F450552C6612222538C52B6474C077D71E1369263ECB4948194514
+CDA6A491EBA464C262D90C11FD4706D39EB5F3F4EEF27AAF150DF2EEAD7EA06E99358ADEE0F1D5
+9A24DCED2FB72DB849F4EACD52393C6EC86E9CDB78D36B6B3280BD7B1C3DF08DB3BE73687232DE
+A4B6B585CBC3748164C055F3D7F53C33D9F76B5DC7AD74263EC362D9E2FA9BF9E4247BB900C4DC
+60E9B4898530DDEAFE2E316827E1CB13E9E7CF88D9FE0E5043A55B8A5B10CE654D2D31504135A8
+5EB566691B4812D6E05F34BE2DC6C1BF70CA19A6633000732FEBCE0EBF4E28721B78A12F23F79F
+AF43F2C600D41EB4E3690B7EA24FC1AA3092B5EA5AA8F479F4F54B2C7721351992C114B8A79636
+FD235EE91D6B5B1BD5CD918EB3436C929DC151CB5C42EF4F62D21604F0F1EB3E01AA78487B4B93
+85D0E09B8E2531D936F5D3ED4D8C244B838B8E72416F9D4716C41C89E2980DADA92B50AC976D38
+7F9E320775EC1E9B09AC93914E01A71566CA9343E853CD63F9C0ACE1FFC41E00B5003AC5FB68B8
+0DAE5FBEB6CD8419E2434DBE40D017FBCDF617F3A8B916EE5D8ACD3689A9FA438F54C5AE5C02E1
+CC6604C021400A437E729C6FA9BEF55A049C7056DF91C68DA0C2F7990B97994A10DCD49260FCC8
+BA315238CC2DEFD07651DA975DEC1889723FA502E4BFA7ADDD25138C84BC049E4ED25885B9AA66
+4BA18B23764C3AB41213A43393EEB6FB839AF29F9E4B7AF4317E455C7F37543C668AF9B8B6DAAC
+068370E787B7D64AFD0E8C010CCE9BB2C0D67A6D8CA0CCD2F6DE3FBCDE1BC6CF9F7AE893F93AE2
+9BBE9AE62921C176C9D87DCA4608DAB3A42EE9C2E1F3180D200CFC2CC9706295BF2BC5B41F7641
+1E073C36D501F7B2F2A482D3DE67FE2A65AF72A909539D1109E70800A0126315441464BA5D1685
+0D04455746B4BBDC085E7D15BF2CA5CD8E717DDE8415C1766057473F53F74E544CAFBA17D5A4D3
+F784383FC5CAF153263794C8DEB9C06157407A0D65B0DFDCC20381CA0B54120E874D8154CBC016
+6F015A25CFCDD50A79929B2A9374BB734D3FCE5A72E270089CCF6ECC0FAE93FA7397DB79AC9303
+161BEC51B8C599881706B13A67324F029F62DABE8BD38D6FC5400FE28EB90033CFD5A1C4A2271C
+8375AA995192E491436E96AC474DC3A055E5D0DB75116C88E3E4A25810B15E82CA0FAB77546305
+7AEC6DFDB569A2ABBF5F61EBFB535CFCC451DEDD1001DC891A73BBC3726592543D15A2C90D8744
+01B996B839AF5AFE5AD85A2781A769D69B079486D4B5BDC1019CDB69046E4192EF67EF3004715D
+7E2D48FD1000DA93C2D7A963FB80EF45A0D53E7055D5A8EB872BD9191C8AA544B8BF2FAAD68531
+3909249571656A63EF113AB89AAF3D12F1A2793197962910D41C5C69100348C5B486EA8C35429D
+11225142A70A578B5D4AFEA33D6C6A6C20CEE87CBA9CBC30835067EBD602C4B7EA3C7A41CF8061
+B337EE9C4E279E200C924B1DA0D81C70BE1830487DE961BB8943008D6FBA2F5F5C0A0E319D0EE2
+3C458A69D687FAA5FDDA985B3593CEB75D0998736EF26BE2DC2F7ECF417A5D140A51953D9F06B6
+F7EEFE5EF1B13DC525EAF8A203D4371144548DB8D849005BD175354B9E0834213EBF25581765DF
+7B4D2214568C79A2E0E2DB79B6D9A330B5D58D9323CC21654ECECBDF7BA36ABC9F3025AA414A12
+F4A08034AF437BD4A184811B8C861D21D68C89E1D18E51AC98A308F91D7CDE402449FFFB4D92AA
+7CC3EE25DCD81D03712C0CB1666DAA5669C7552C19679A2F1367A222634A3B3EFF7CB21FBBC0F6
+BC37C62BAC7FC3DA19533344EDB5CE57C8CDD8A6637A75CBBF8100B8049C1F1BDCB695FE052A13
+478D5B16E025975EDA0599E6BE78F345CCF99A3494F610FE4614CF6D7F495167F8624E5A837157
+41C98DCCE432A70222F4BDB2C946E804BF5901E43222D84FDBACB5059DD9BC9A874C498230D3F2
+5699F647C873D6017488990C25F4A84EC4C38ADD46ABAB93A0272201CE3FA3B1CF239FCA8FF519
+8DE7474518CE05F3F0D9E72DA446589CD7C084B3567D23BCE3049FE59F05F542A29728B08A9BD6
+E853F3637A4CC9865196A24C9C6C38B97E2D2005C2CD395E94260AA7530A6C136BBCFEC333D0FE
+74014E6FF97BB72CD076ADA21B960462B0EC7097A7812EE3044B15293A02E3E0C71F76E10ACDA1
+73F29CECD6D9AAB7CFCA3405772463CBE2BA6D23A270755C3C740A5BC4AD27C35B95932BCD8B81
+5F2E8786A8FFA7746DA891C83A962A3D88A7B62C720A0C7360397A4AC79D32EF020C843A1AD856
+14FCEA427D7D452ED6D25227BFD6A7C49340E178906A09D616337FE7A3B44854B7B449A4856F6F
+AD157366517850666FEF127EE87E97234BE5E8059E1975261DAE35308F31C3E14DBAC56FD7C055
+BDEA02837FA4183F158F87150821DA50FE1A57A76484FAB98F808C98BDDD40661FAD8BA00E64C9
+2517E259179EC40DF9EB005F517EE72BE7A3F3F2274C6FFE3712A4BDAA872E19D93D8C01056474
+41D72B163B460947977F93206CDA0282D63F3B5DB0D8911B5F921D5054081B460CF6B213D2547B
+24BC46CCDBFA3E7AFDE74501B68A31BE5ECD011F4CE6CFFD3D762B2D90005BA732F15581AB6EF2
+E99264A0E055EDF3A2D8C9CFCFC0989ABE3B2E9B8FF08A2BA1EAE1FA92D49BDE5C447C5C156CF0
+E5D5EF4A45A1CFA72554B0AD77520C7256FDC2A7056492D52D6CB45FEDD5D627A28956397B0869
+AFBFA53B5D3D113E7ECEA051A0E3FAB7CD8E62BDC94F8B482EDEFE3FCF9D391E59777DE81E5609
+D92EB704435B291E31CAA685E21AF491ADCB2E2CB67E42803B9B84A6479C149206CB57503F6669
+323DBC71800844D05C335D966398B4BAB12079965768236D29994B9B4E3B5794D6A8976D2C87A9
+1AD31BE5D9603A7C3A061C3EC9827E6E48D105F093CF11E188F236815D7D04B879AFCF4536C9D7
+9972181F3B7741E48C7081CFEF5A7CF0E1927E80DD08E3EA3613F5C8671753A00718BE42EA6746
+D9532D5A9C6C705FBA16822E7A847E8B1C178024754B812F6B08CB7B679B5CE29D044E9A2F41E7
+CE6DE6B088B3C1D3CA882EE6692CB18DD9B5070CAC224C95BD3BE0F0FB07218947A9B398C40D55
+D0E09AFC788D43392F122DF3CD74612A2226FBD74A50C53456D344E3725E21DB2E2E196FE1532E
+0EA5CD3772C9A0B3A3AE8C3C64DFEAE4C21D12F570A92A84C75A878084EBFAD870C1A5DA372DEA
+433EAFD79F350EBB0EE20822E5A52C92730FD2A0D08F9A004DD087853A48D49507AA5B1A127D19
+921DBCE86CDD407B5B4358E098AEF334A9FF7E4AB3DE94D3414E47D758A4F37998BA6323A27385
+0DB0D41F9580341570A4CA7149EC6E4F5D952E5DF8024F86D2FB962D7A717AEDB7C95968D3DD41
+DE45F380836F03B9228401B5A0EA8BA64D7AB60C5B45B8A25050B985F63F66BADE6AF149C0BE52
+59D368ED1716D125BF6B5587D443C6D5ED7257C28CAA747120565FDDC0078D4D805BA937244772
+37927A822AB6E08DAD4A672F28C0A1159F061F46E41606A1E00AD0C9BFDC0DB57114083E319A71
+E150F6F2B5AC289425F6A7A440A83202D4AA8B4DE7492A95FD347B281D7EDF6342756511758D6C
+FBAAE5E073F5D15A378F36DD1898ECAE4580C3BF89D6416CB521506F86A2FAFA04A91A93B191B0
+ABD5D7725EEDB2B5983C17333B78D7DC84EBFB7E4A849D3DEB1676A44DF21535931FC16D9D818A
+0C5A8FE5E44279E12BC1CA2E8B2EBF90576CEBA9656E2EBED725643AB26341D9DA080EE57098A3
+26B69EE4CEC5EE684C61D03876FBEEBE651D980738CC23CCCC7376328314F5A6D1083552631627
+1C01A50150FE8547B4BCA181E1D887EEC465E2AF3CA26D4FFA699B0ECB9EAB0DA71A590AA1CECA
+FB8DB0CCDA18AA76335DB7874BDC49224D1DA363011B0F7187D2E0D8FD19189A5C82C4FFAC4CB6
+0FA7B0521BA5194D1222D0779C74EDCE672848C275C8F8E9AF39E0DA3D8BE9B1BD4118D9B11DA9
+D233D9CBE8C5AE5D2A60FFF7D28565A660D27F515D6FA0897CEAD04C6D6E253E0ED5E56DC1F005
+FCE2AD618F79CDA6826875D91262CC6D6A64BFD70E7FDC965CBA9C6BD6F251748A5A42BEE4AB29
+0E0262A4DB580249A00C69D1CBDD49E3AC700CB973BC9358ABEF8A116CB5D8D4668C302EBDF06C
+9504684D7D18E522F7C42EC6A77171552B873E753C1A1888666D23E6F9225D092C6DBF6A0D27C7
+6933632C5F1C5E01C8E139A9EB9BC084828F85095BD9E6EFA0224F86977DCFE653F00AA693623D
+CE04693A7EE2384A285A6BD7AC8767166FDE75194E326CAF447FEBD242CBFC71B637486F9934BD
+1AA8BFE3CB85F3DD258E079EE910AFA64770D5E30CA9B289A4D7FB7CFC48A7040774D36E8CD061
+AB06FCD9234D5032EF68AFC943850E53C1C3980017563C67E89393B8EE4D93585A4EF1533D5F0C
+A40FAB6EBE8721F58D05AA69D6067C2D6CB03FDF0B83DBDB696D4D4AAF3130A98729DA58CCF546
+AB2202D0B4ADE6B4845A1202D3F2456E34A1100FD6D445203153A1D11F3A2511CDA83C936AEF3A
+B05B5FB32B76029153B7FBE02057AF6993F47149E90080A3AF7CB29762148D6F94520A343E525D
+9646C0C79F1C79E75470D232E2B2CCC04AA8990909E0D26DC540582B699A71BB516DC2860CAF4F
+6F0BFC7B5292052DA41DB92BCD030863A117378B93DF7CD9B0252964BB4D80004EF8B3011E9550
+DAAE2D24F2D965E90342D847B3685DB05631D550C1FCD76C3B3903ECEBA1A2496F0DF28F4FA367
+C9A9FDB48E5E1410E815D7E93511EF7C94224686BBE827C833E4C121747AF79C69A27A0DCD982F
+91AF0BAF9EF3F9921B795BF42B817D93DD4D816DC698D063AFB306CC2000B37AE93105AB2E6DAE
+32F9DF44C09E7466A62B2AD48B216374610994CB120724D0000AB54F6837DC64ED4F6CE8684B14
+16D7EDB9D9A399D39274FEE6FD41D8E412B158A26C304FBD7CE0C4F96D01F5AB8A20B1FC4F00A9
+D33AAD2C656B31053198EB4704460D476FF2F505321212903FD21E2059C470643152B99B2E903A
+491E8E394BBCB2C0411D6D86210D5C3A43BFC2E01EAFDEA712F6CCCAA90ADC2A358AC62718D482
+FC31914E0157733283BCD29DF6D2AFF094C2496BAB6AA72265215A4BE34363EB879889E7727AAD
+054F90172C1D6858C8A338DF6C1EFCD64DCA8ACF46038F48392E75DD0BFBCFDE8EE0791CA2C0A2
+8AFD16AE56382ACCAFEE2BDFE97DCF38532C19BC5E36F9E5D82806D26171267BECC9FEAFF3000A
+005686633FE25967BED0096843C464BCA03314F1C5971FDEC8E24B80D0FD97B7E5763B427EBD26
+FD8BD086A2C45FEDF23218CCD381BF364EFCAABE04DA6687241805E37AE866786DF98C62745FCE
+9E0D6332F2BB90C0B2EFF14D08E8EEA6BCDF650D8996F48355D26CFBB859CDB418973A65AE2C3A
+767758AB288A038807F4F6469A823A9EAD746560130A2A5308AD0C3675CA8642B2B9FFCA8382C6
+E61D7959D9BB369AFFAD1C69BE31E00F0B23FB8DF407C5EC68F3BF298A35351844EB9653C83A01
+EDBEE75F792C502DF53257121DC8A8F2670AF1FC747229B53B7100D02E73821E176CF5B7518D53
+B420B1BDA8B70CEAE801D745C66231E62797084CB320DDB021BD5830BA1D3F49E03864E6A6CD35
+34511FBFAE8A4EC4E3EC817228C40F7F87F524790C4A3C4C90C010CD965016345018C27A1325AF
+E7F8F4A0F0342632D1C5F9E6728CF930F789A0F3C740FBE88015E052168A0D722B1621ED710BA6
+6842BE691E91F33EFB0708E3EA188DB42E8F4A54F77D61725731FA2E2D61F245745AC1DBE231B8
+460C3323CEC60BD1CE92CE7D1A2640D1594D24683D5E139164A26568544FD89F144F57905DB9B7
+EF81A36BD91999CCAE2192FC87C88F33B01C609A981D675A3AE8B13DD05E2622808826ECE05EEF
+3A36E25D90EA3723BF34BC6D86CE95EDBC4DD3D088869BDB105A5334B5108FADF1F336605A734F
+17044A5EABF468F4258F9E9A3E69551ECF0A4E8124EDB178B800D2708B95C2882A757568CCCC73
+C40671BA1B7737F55DE6ADACB84E87889738603A6D8BA0DB1D4C5B3730C169DA35017D477758E8
+9A33FCF009BE53F959C3F22973887E920427A968730DB8576A07C801969F89C93338A605B8A961
+54C62036EF908C81E65DBE441031994CACB043755E76A2E55BBAF6628B1AEBFEC81EB727662E1D
+C9DFD4149217DFE632606ADD92D2CA4E14443DC01CFE7EC166A4A2BDE3A06BCDF16500E12CDD2F
+6982F19E9951AD81302D2D0A20F070E75C0A3EDEF40AEB126DAF98250F6F3E38F4BC1B626E99DC
+647644AE6E4EAB48DA046C826AC7FECE466C63F75B872EE71F4F3A2122A383BEFE7103107A6169
+76C4FAECB19EBB850844FBEBBC161506715C357B35B83DEE1852B7268C65F87F4C2F96C3FECE37
+88A902F46571F0994A6586E7E582AACD11EF5EAA69097CAE24C610BEB303387CBBA1DE0D075FF9
+0BD4BE7E07C795A248FE321B468E02B84573D7486D59CCDF8325F94033EC633D2BF2867A42C0D1
+E0B0745EF8D9049D18B2AB3172093793F4CBB9DA888AD43FC22C933FF5C4DEE3D890AE21B280EF
+2DCBDAA03AE4EAB52F81A14412F26D2D3F0D49C8335D8EC4CAA6B3596238A28BD62261094E78DE
+BB0ED51CEBDE25878E1AF705C61D37A71FF60AA47FA39DB6DDB5EBEB281584A5E67B971502716E
+668FCD2A7589DA07917A048F796BD1C8512894F9DABCF712C8CFBD9B5C7760C6CBB3BC6031F288
+235BD791475907E5BCC6B1F300069EBCDAB1C3DC52E49D5C8D95994F880C5415124BFDD673C492
+CB6E77C8C44EFA04F7C5FD357CDAD23CA3642AB4359A52DFD2341072E368CC76125C0BD7607B11
+A7607D35F1A97F0B30BB56D4FBDFC9FF4BB4DCF7D670E7F5615AED6CE0BFF78E3180767C48ABB6
+18F85CF1328ADA21E937FDF0F4BEDF9688870775AD55A0B19B20948BBBA1B75C1DDEF0C2293B4D
+AE1F54F4A99D98F9B40C915990A6A08D5464AFA2F33B186DBD382D01F8B7F4341914311CBE2507
+DA3D40A333890E08236DBB4060CEBEBEE427A4DB8169E748CCE7917C4632FB85434C2AB79DEA36
+5394EA461720AFE26B51367BFBBB310A3CBDF0509EC75C97D6EC15489F3E2AD54D5E76FFAD6809
+C8992975D9C694EEF17EC52E78EFC3669B570D69ACCE61E5A7D6E73FB37823D64CD9A16BDB485B
+9642ACF32BEC3FFC593E03C3CB71867A0CB57DD13A93DCB093276E85D153CD83920D560DA50C21
+443C72B521DA546F12857BCFD5D372E71E0AF1C98EF482F04FE2A1B577505C602F0413A71B070F
+131E9DEF87869FC219DE59A1CC19AE38EFEFDE2B69F52708B60E48EF686EB362C690DE5C031D62
+E9ADA7469297531BD01F6E39DC78B7C6830AAD04277AA98EBA1D82FC0C00F5A6A1E108CD6835F5
+53346E921D728F1B4EC0B9930255A68F3E9031F360CCBDF01C9681D602A5B9F0BE055269D419AD
+73FFF504DBD4953CA30D4CC5B4C57E7921D6E648E57449E189CF7820BAD4274555CA45C66EF0DC
+34DE52D3836812264986B454C9612AE8F4B1A93C86B5E4B7DE304AFBF080BCAEF1C62FE35BB3BD
+335910FFD496760CFFD002A20637C45690466EDE85A4F28965CAC5C66F323D3960DE8389F1A758
+027BD0C3188F249FD61545C1EB9D78A0EBD81E5F5C2C8445EE82C0CB969D788F1FA267B18993FD
+ACE99B21A214C69670C77D920617074059D92819D79FB4BB4497F4E2BE1D8243AE0DFDDA0603EF
+E51D1F3D47135D354D9D7F756CAC72E35BD4E8DECB1ABD53CE2ABA5DC1526A10DA69DA2FBE9328
+A334381E0CB929266765898FD38B74039766985C88C2BB9C448B767264353A0BC63B0FD1645D71
+026DF2C08449A9F32F25C4F432119BD9A7014AE3B43DEBF621C9CB92346ACEEB5C2B599D553708
+2E054C3A5680A08191D7B87991C2ADB192BD11545BA9F5096CAF2DD7B7EB290E70AB4FDD3989A6
+B7CC123DDAE328E922100ED8C7FF95867E9A168F1C9752557AA023C8154E9BA970FA0219A9889A
+5CA8D001AECABC4CA840322BE9EC9F6072E6E7363C258789D3096875DD236CC02B078B22484767
+D7A0CE87394536A796A6498708C287DA9691B1472D4597DBD49F4204A05191265F836EAAC4E5E1
+B1D7687BEC630C3CA744A044993C03D4B935E1CC730FCEA68A2C0F5CCF52FC1A274AA67B3B6177
+F4B87DCED4856E14FF00FBBE8DB4E027751B367722ED0B39CC88216177F2CA955958CCE0A9FE85
+71CF8A1EBF64D2BB3F177F3F0EBA581AF9ED746E16CA9CCC2B5EECED7A0A2254E766B36AB84A25
+4987727F130AA391B5CC2FBB9854AE66876FF09A387F98EEF39D3DDA94CA2DF149EBFB59EA4D4C
+CBA5B5F464C4C094CF7D1F8970F8F5BF27E4C7EC99D5C8DB1CA55DDC6DC5C7DD72B62A7E5C7B17
+D5379A6CD2B6F666FF6CDA9BF690A8839E234EDF6E81BF3969F0DAE3CD69D48A6F5B0E57660BA4
+B57406CE46E3C36C0D348EB44C1116878449F9182F23BCB7F33F944D33D15BE83EF3989FB9909C
+3D5DF3442D7CB7FF592CE9AFCFBF8B1CE63B02309212969E39B9C1A933628FB38AB7565C3362FF
+803A159C82B0FB6D9C8F1E7BCE0DBA8C43C8A269DE2E684C9E20FC4818BEC7F307B6D34661D4AA
+FF8A34AB31A2B3A349D706A34831BC61ADB414C7B75B78D08A6C748715B7B2FC84D94B73EAA2D9
+F1DC97E78A3A4D3375821FCBF80E1D329289CD698DEFE021DC2C620D1558F0D2444AAA9A18419B
+CF2AD07529D307CFB11ACD08EDDF9371DCF540B2B9AB5D005068E50EBB6F9A0FBE98DF6ADE3D4D
+F2F0733C8B094202AE749953495FEB3E9E9A645647CB6755B59E7349A1E338C4FA8E4BFEAF951F
+407EB9F9CF1698C1B253D471FE553D8DA0C21829EC10CBFA7E4411DEC7167531B006BF1DC11E5C
+8BB96793B69BB78081D677DB08C3FA70D050219DE116C05B3FFD88853496D73CA094E3F373C39D
+F8D8F16BBF9F858CE416D17797EE7FFEEBB0428B15EADF7C2DC0DCB6532CEBDA1C07169820170E
+13C5FC90DE91C9D95DCB23831370A5B4B798F0B748C3B80645EC427965D6A24FE712F199405812
+EFEEB8DDBA2AA91AB87EAD349C87248122B510A0DF27EE46408416D8CEDB7E69EE2138DD95E526
+37D44375ABF3B9C266EDDD81C562501AFF0D4241304A04E71346ED178289E1F1CE61772E1C7EC0
+01E94564CD5C9F3ED640D8DAF6C1082CD8844653F78F8000ABBC4F34828085291893D690403573
+888EF8347F6723A5F5B7B49AF74B93F731C83BE6AAB8323D2265932ED00046B5A825E1729FBBB1
+BA18D48413A9ECDA400E75722E01C74D6BE5DF26B17DDF10C370083A20EF2D1080BA9F2C2E71DC
+9C78D0202B9D82EDCC7BA3A8940ABBA51BE105FD8516D8C092EB4BC9297768351FA0BB13722516
+110B2C72FB731641B3B15347CD68C894DCF2281D7A028BEDB6D3001D1D62A00A260989511C8FA8
+0C3F154B12B63BA7B639E6A111504D0B0865B08F0D9973500C3664B374916760F8588C1DA9A6AF
+74E9827194A893D0E419164521AC72B2EF626E544C3461F9A29791BA69814944DDF7032D2D1BD0
+D173D18D3E06BA08C209B20C71BA776B7F44240187996B3F4C42A797CF50F1512047A6359BE499
+F65E639D59877E7263BB0CE25B005E7A387173483CAAFFFA0DA53DDB86CA12DDCAF8E415FFD59D
+1E00855F837CC1087F18471F2146E0E0CC1901F9D1B968C13BA2209DE45FA7FA4863B159EFAC29
+982D64DC60F248DB16FA9F08F9959E6FB01543A77679AFB705B7E03995D309B901BBF9860F96AD
+7715E7E3F0B66395C953DD21380D8CB1B1791F353D06CC045C457AD2FEE593C32D77DFE63FE9E5
+9F25556892714F2C5E319C7FC1051AF2E69A0A557F26C46A9F9B4F176C5CC1B10AA4F00CDCF75B
+3541154818360F6063491BE10311BAECC1E27C38F7349B50ECD72B81F5BDBBE7C2F2994BCF843A
+B06FF3FC7D37D6A5E83FB2B42F884E3BB14D7CE1B181142D558762DD7CA511A79DF94ACE080D91
+A001536BE0848CBB9B54FD29B1AD29AB5C7CAE5257AD8D5462DA2A9D2187267CDC5D71AE4899EC
+FCBD408177396FC553884D50EBB82E5E490A646CE133F06FCA26733A5B8AFC13DE5F3ACBFCD267
+ABE6490790BF990FA258D7B1F5E513A92F5438C99D8158512001538C085259CE8552A617855AFF
+7EBD71DDE3C0C04B15AF98F776E001200DB7E94D50E7812A5D32315AAFEC430EC116CA41489C87
+8E19DE768A2EE390E610F92ECEFEFB5D63113078420EE807194A218DA54D186C412C9906BB725C
+D4380FBD73236A727895C0BE672D5EF49E5C2714454504E87A8D1B2AC808AD09BB47A8165105CA
+27813EC651185F63C5A9EFCC9A7516DF4125E43893622BDBBC8973C8C321824AB1EA53090DA7F1
+B3EF9AC4BD5F4F7D65339D0B32884CC14826EF4860B28E0B1CC119BAFD0EF0BB890A020728DD1E
+EF3D898E25610AAB5FCC83C9FD677387305D4BAF65A7CC9CCFDA17A42E24BA625580F0708FF9B9
+9A87CDF87452E87644CD9F59AF16A8E62A9B76BC3385692D4D3C0294EC71E3B662D53BCC95291C
+3513C55594FAC96ABCF86A421674B92A8610251D3D6E0BCF60738FAFF64D2024538FCC4FBC588B
+843665FC4FC64F6092C6EE7B682A3E5FA272E38C8FAA1CFEA55EF235F5D67D48A46A00FF58E47F
+F96263D4FEF92F333C71AA3D6E0D3D0325DAB33F60234E980A5E0B8DB77F85D628A693C81A532E
+BA7B90C071F8B7BB261947D43D70F7B54EDBD1D6F30B8509035FCF19F1AD8779C9088ECC6F9D1D
+EA48694ED5F7814DFADDC430EB361CB26B9AEB430C31B2D8ECB1D995DCA939E2613CB48C0BF401
+F2369329C215B3814BD135E573471527958A3DD8971694A02B812A33F4F5588F06CB0FE949CB3F
+648475AF8C778DDBEE0A7E522FC9309A6496489856BE72B91D6408CA7F0F388767C8A6B0710069
+23097353EF934B0C6A9646054B06B4FFBA632813676CB24CEEC3E28D3D63C8D13A041DFDCE0158
+72A4E2DE2B4735363CE09E06E4E7F8F6A9ECE06F8BF82937A8D893043B7438832F17F9D5E7B082
+92D68D0E0617B22E126E740E1B67F3595CEAFBA8DF47059EB6AE1FB15F2DA5A8981CC9B8805929
+F1564555CD055614CD94A5DB5487B39636DAC4FFBBDD59665AFDBC5253B475316EEA6888309F27
+AD14C2316F997372D5688DFD804F6B6034B57885B76705D2E3484CAA5078FE95592118C453FA65
+A99BFF295671C1E9BD2E6AABF1F48A71503613D3A98FB047FB5278A456A6FDFE328CED49A2121F
+0D1285701F7400A96D6F11FB99C6A456CF1D792CED72652CACF93B60B273006C83DB3741441BB9
+35A5481CECB254F410103A6DD01882097C8D19EFE4990951CCA88394A0FDEE1D763F6381391C85
+F78B9A2986AE3A4622E9FEB55B38ECF4F0E0F83DAFF187A734C752F579906668A745D4E7DAC7B2
+C7731A61252E51B8FD85E077174BD9E623F7AFB78DC102CC6368E8E115423F4CD2CC4212F4199D
+C5D6AE755191D6E6BC040EFF9DD381C15FC4659992FF8990A4847A4A11B50A241031194229B54F
+00B1DDB9D1AC575529629A161A0F1C98B248C605ED6F85A9EAD6EFB098EEF9810C320AAD530901
+5125E1D5887C25E222450A0C606116F1DC2ED89D3F2D3A6C666171371E59F1DD1D5891DC3AC02E
+572B135BADCC453EF126F15C986499CF1F3DC7B9F7C9AA47399022CF9DFA28899C679F76BE2B00
+1FB281208719E23C5301941786E1873CF7CB4DA0F5F92753624C7D8157683F6E957805EF570618
+6E9EB09162F9AAA04D7907990296F899F1621A4976734F9DCAE11CCD969F9ADA669D86ACF1FD71
+98D23A1BE3915D8ADE29D8CF640D5349FD3799EF45E6BF86FC60A384AC7D6F508CD17A4B274B37
+4B37645B25E34304C2D82B2A31170FBEB0A68966793674C1B3A4B6A117BB2F1E9F7CBD52E590ED
+D32BBE4CC0F75D0861D37651754D3BB1F3FACEBBDA42355D301510C9D1C35B8DB1ACEB5DF35D6F
+76CCFAC79F3BF0C5C7F797C894FED365267B0A33514B8F7600424CC7D6E7FBBE0B0D3C8B6CC8ED
+3CE2B4520E2FBE35A154107E6B84CDF46828D6720F62235AE2457D0DCDCF91010BF15D3CAF95B4
+A236019BE0AE1A2E8F78F5DEA56FBF1016234F75423D307BE491D29F6C27EFDC11BCE180B20F39
+EF0C4A9C72F8ACB61DB425A5376330DCFDAC700910AF3BD767BC87C4B9691C3DAEC8DAC7C226AC
+36AF7E444BD30E11EAFBC8BB77181EEA3264FAB7F63142BECDF37B8A5F63807249E618458D29AD
+0E1FEEE567EAE1B4B513A447E822A688C5D87D64C8ACD804AD1C81815E287F50BF5630CC631A93
+F95C59CBA596DBAE1EE8502E3073D76525FB2D4F94C5203569B02F94593778E8775A87CBAD08C8
+256C51A19CF381C24180D4980EE17E94B01AC761F910D6AAF09C5027B79293FC87A1DC3CB7080F
+6EC0AB763CDF14F6D7B1899D529C42A262B579A3BB96B693BD793F0BF7AFC8D1B60289BF239224
+35CC3DE78EAB44542EDEA0F24828922A702E7A11FCF529925FEAFF53751502F9434B72978AB7A1
+2B64E7BD6DA9917C9196EAACB3999225501410C818472B097C708523C310A3FAC7521BF6AB6A4E
+9E1DB38DF4D93F9C12BAF67BC8B70AFD8D08FD6F898B96629A913DA0DE669678FA1EE7086A1C3C
+0D45AD5C63433C574BDD8BA625897262A06F5AA47FDA71805868B9BBD7914D7BE697BC90C74785
+30DBE5F5576058767B5C302CCF7DC6460D44FB635B5AB595F216C13E7A4D54029C1E9281444B5E
+3B1FB3D8C7D72BA0201C51F4ABEB9CA263D4AED86B5B0CEFD0EB142FADEE40A950CF441F547B7C
+71427C30CA22C161DE130AF5210E5BD0D58AFD748D574B46A2B4EB4D6CCD31F4DAF0CCF94C7DCD
+80B0268DCE4E69D97E6F3CCB731536528B5CFE9AC0133871CEAB7FD6B1EDA4FC19F8B3E7D9A92E
+9DB50F198B792A13986A2368DE33CCE717ADE5B0FC6F76BE8B4EDE6AB157E014C6C48CFAC5D507
+53067E9330A2FE7737A0A8F259E5FFA7A030D85FEB857D785866CA8C6A5043ECE4C1CF30E76C0A
+071FEF8FB30CC9BF26CF5DD8ADB87A0C03494876AA1A2E9AEFAA45A98CD71E78608F7523B6D686
+EBD8048BC96F91397A4CAB1D5A496B43042C5DE6C1C439B8D09F6381E88F825A08E818297AA27C
+1D37FFD541F6A9E5D4B7E8DD8D13F8268C83135C9631A603C69DD22E6D3B76063E5B0BF7158C9A
+BC9FCCB946AC24995228C48BD031D0A959944181482739EFF6CF2330A6A6C6FB906EB123E44488
+F42AC2BE237CB30C441B5051C028B94D9E6B7E57F5A3FF5504756D7EC411CF61073763A5E72FC9
+DDA6E3345F58646B69EA140E1C711D794E083623B84A4FE110256FB8543D32A2D5535B7DA0A73B
+D171049412FED79B84BEB56962E1FFE1A12F9BE4FBC72CFDB9EF92BD60B200AE8D66AEA30B158F
+E9FE278D8833111AC805ECC90D65909787737E1E1FFC88DE07B8D79996C9F5685F57102C65DA61
+97513F85B173200E3222876AAB83941CB066E3C642AD23958B00B17516A2CC8D8BCB0C802CF34F
+A97851C037E656C30C446C740422991832129889EABB35F5661A430E5A503F99F5381C5F26692B
+D8DB7E9F6D312A297B697E93831A06F386AE2BFA2BFD9361F2E366E18EBCEE56B82C16B2DA0017
+95CCD97D67ACCABD22DDF00898B3C39C7442F1488552BA46D4634CB330D428A19351E401F91819
+708A82D856DE3C29180FDC56C6CC7038302E55FAA5B777E8CC6CF4BE2ADBE59BD270658F168C11
+096178AC07B7B830C0E782D41F97EF221B7B91BBCBD1EFE3A7AC3BDC0CD61C74638DF410AA53EB
+AC35A079D6D3914F380F4A376B50892AF20CF28F4FA355C6364C614A9DB092DB38D768211FA16C
+A991684DFC8F257AB0AB3F18F3D7C89934FCCEC089E6709BAD37B935E875E34AE5AF4561138D54
+9A725F4AA92A66364DAD50D00B1E251FDEEA8C145DF1ECF74D59981948C6A393D7DE3EDD731D2F
+EFDE29D89E9A4D94C69835050FC3D8513ED2C39E9FBFFBB741437DFB73277E227523A45E6362D9
+1DD5739D82821CE0DD3963D0A4F01563A82A94BCA4282563F1371322943A286FB67742953B9152
+7B377F49334141DE26AD5D170CAE36767A380A794C755A708E339635DDD2F6E7FEB4DC851502E6
+F4500CC83DE2F216304D0095190E3D405643D609921A6A895DE6F2EDD003CC4D30A5F131803822
+5EE6E072374BF755D5C0D3B59888F5B06D0167BBE0A6C5D8E5504000E4CB71C0F18E01CD5EE76F
+102DC77084D2EFCE8D85A8C2C38867F10C945C8F13B12F1470B0260612C69D494AC06D92DD3EEE
+A0CFE25CFDF09AE8C96ED32836E28E5583D60A8469AC220A4EF63123D4905890EE48B617C6F16A
+7976BC855AE0BA10E37261AB4752C6C9BC43FDC20F2355E07BDFCA70F7F15744A973425A4B7DD2
+26A11FC9D40FC34A38EF3A05FECECB29D1AB4BE73CB14CB3F6D43542D3A4821D626A3D5EA1691D
+C39F4E066C1B6C332E7611F13E27BBB6D7147ACDB573E9BCEBCF7E35FD3149BB0362E701FAC28D
+7F4D114A358D286E750F364CC2FCE36D3E6E9DDF6739FA1D1710439B28F159AD6C53AF63CF1D9B
+43D23CF6B8BA2A6F0EBCE50C5B730CC550ECAC630A328BB269E26DBEDA5FCC6C1AC14FE5485FF1
+8945D6C33657E86812E1483AFDDCCE4DA1F2CCD18703CAE39AFD732A4C26D65E29699848C2E396
+64BC127F88BB774A3088AC0A1414B0E44B194EEBA2055140374AA338D6B9D49B4BBB64FC859031
+9589D4166EF38F1B5DD8E4EEC2B39251FA156B8D00C07353C2B038322D130FC9EFFA6BEFD47BFD
+D6CC1924AE5046C077AAC80B29CFFEEB825187DB1B72BFB4689673F10EB0DA0AB3B63A5E2E8C7B
+39854700F3534AF6854E0C381A051301D24D4182A9FF745437639A4C61AC7C0505D62263A29E5F
+E0C7DD0702459061330FC9F72DF43336BC1F6AA1B5630E74C6F723098DD22B7A1DF9D710C10D3A
+96F90A36693D97F11F285CE3A4C7C799B3C3F28FC99504D54479A6C3D027B48D3B31EF23FA1A11
+24840092A41E72E08C3146E22B110346B2DA7BDB75505658E66F493BCC1250A8A7EB41836A2655
+DA0E9FED1AB3AB8065695873CCB358322BFFE548A17D79FEB4CF4D4E8A12E6ED79CD0065E1804B
+201A45A6F757809D5CE810C02A3EACABC8C28E1C766501B886152AC027E75EFEEA7E1827FF276A
+39ED79181CE3B2D94145710CB53538E8BF3B0DE5CD3EA0EC4F7D2BB917BEB5D8856C935A00A4E3
+4FFB22842279D7B2993B4213B01B71108D2B6516F1C229FE83CEB9D330B64A9CB9884339AD50F2
+14891BB3AA89A6B63193E54F641D0F8416D0D32A1D9E849B51EF1414A7214A65DEAA37C6559CF3
+A8E16299F42EC5CFA325B8B40712516E7C9DD6D9E3E1A62559FAF2A49D5002F6DD4113F5CD58D2
+A03C8DAD6B18960A806A3335B4D2A4A8BD7C09421B7B5DFBBBAA57A10E3B8034768A634565CE44
+B6C0F84FB5AC4DD6C1905F544B830DF14E56E5B8E33CC75917FCA0F4F8C878ABF607E971F8AA6C
+E6BA24E970A7AE710E56331D3F9BB7C2EEFB6C09835DB23F1EE6942E464B7ADB1C9E08CE5194E4
+948223D4C3445D4D91A9D884BC57D305C1E71331FD869E412FBBB3701AB9F114837AEC737C10BA
+624F1B234ABEBCE05B6D7DCF8C4FA44952DBC825FC41A934D71A23B4752DDAD280B5EC799278B0
+AEE5BB83051B5DA60F34951FA7B90189DFC0D53C0D2B7303EF0839EAEF0A096AB442E5176E91EA
+A754466D1807B1290DA0D3B3A675EA2EF9D1AD02D177195D670AB368EBA57C4B75ABCDD4D603B7
+7FF892E2210DDEDD429D6B12FD7078A0A04C02ABCF10B169660D0A7E184CAA2EFCDC98A2212692
+EE0914895248F7FBB690CE2A465AC90971CF57271ED4DE777D8B345259AB02B0DACA97E184E319
+8ABB5DC33E9BC6F92744EAB9DB5C20DFFA36B6C0CE1041ABBA09E50D8BAB6B5B3520FB34DF68EE
+B43B674879201EA95DE7DA8500DEBF253D5A81DD13AD3E7CBCB30200E003C27BEE141ED856C11A
+2210D12B1470804733AE89A0180211F81E25C422A95406C8A8743798B4AF102EFEA47BFC2CC2DC
+349599A4C00037A9EC03D2810B50A52AE9E5CEBEA3E2B4B6EAC0EA06046AF69CD718B57044DBF0
+DF5EA36A9B8DC51037C3396B2D0959DE97AFD35C17503FA02A313F5FFD50BEFB383E9BB672C535
+54154710BCBAD171A654C879F500BB7DAD189B1E307001B046D98C3737F906226342072DA7B7A2
+4FADAB5381426AFE402C42B338627709900EEBC77F90459492BE27041A126AAD9E44A12CE03C83
+09A407163A04F667F256CFB1066BF03F317179E57C2762DE417C5EFAA880B35E7B424BE96CE0A1
+1660F85B8FCBAA45E8F2262814ABC86C58864CF1E843F2733642C72D9AD13718A9A81C1CB4DEEF
+130614E91B8852FC6793BA0F55C42867951A1E39F5DDB1DFD30270438FF363974633862C75335D
+BB602C94FA037434DC319E6A0019350200782CCBDC96910DD18FBA2711A2534B08087E83A96C91
+3CB856FD45AA3658B76CE7041A57D46B019C76B3ECA0D757AFD0534B7C6CEF2939918CEB5DC524
+9B5601CA37D0FBE8D90EA9302DF998E37BAEECE630F4019FA8E602D460D6EB8682D115EB3F2C5C
+8AB39639E1FBBB1109A31DB5A19F116068518C3C98FB4E91144B893A403E6601D4D81DB1C1F00A
+80E837116CE3EDD313100D0B8BFD3193E20CA90AC3CB107733B6499A690F2C8D336FB29E144470
+2A5217E1E91852F5EE0B2F30B61CF661109D0ED6687D7DE2FCE90622DCDB176CBF18C9852FF3C2
+B02F9FD7AAAA692E9162349E766EC29CB98034D3A8731F4912193F1F480B657BA84E282540D2BD
+7AFE547D10936B1739CBFED239A9C3FB8DF52E9BA1F38FF0F34E703B16F87C48EC50662078FAEF
+9FC4EF4526F90740FAD6481AD3B4B5795C9E57DFDE09DF24CE8773B1FB4CEF1C95E73DA6F72018
+CA0E16DB42DDFE16C6697FE4D7E0AB517AB0A93C85EF5E7CE2C44137A6AB15159738728C6FC2A5
+BE3E799D5C832DAC601477C9FE8C24FB368AD1C6092C0DB6F516CC8556A481CDDFF1D26640647D
+01516E38275E27B2013434E4DF83335EB166395405F9DCFBF6C2CE886DD59B1AE605690493CFB3
+708BD1295A114D79A26F74CC11F49EE90EE9A364B514967C0B379E676BE00FF0073CDF0CCB5756
+E66B04AA0FEE5EE376C0258E2841D90176CC6694F5CB6369BFE4453236B4F5ADDF98B86C6C8F0B
+74832F6BB6684050D22CB28CCF9087B59ADB30838930E2BDB1FDB955C560D4D617EAE79064F742
+7F1DF3E2A20E413C7BA3E9AD26CA814295FB331D1080B45F006513F359AB822C8C9AFDE0B2CE30
+8936A66FC5C3033567C489565A58767D251D29DFEE44EEDDC59DEA50457A258FE68F7EA61208C3
+238C7EFD69F09A5C8FCD557380A6B4BD82D659B26CB4DCF180CF0057D120D6A6E0DC291C40DAE2
+833F4E84A18F10F2F32924BD93C5C70C207E5620B60E172E238EAF0198D7A1249FFB788D6C1AAA
+4E7D0B433D58C79AEB3E5CAC751B78B55E2C2F2382F2F04A71C044B98330E16D9B74481FC55496
+AF2FFF408157D99115A38BF0767039211D6841345BE3F6D624EDAEA4602BCBC3A87C8013595D9D
+09E7207197FE87FD585244060418EB2CB09EF369B785EA8B401798695B473AB58965057887EFF0
+A6585B3629E87D700C8E0835F1E35C280D61FB49871EDEC7C4E5C770C3D8DE717FDFAB7EACF7AA
+E78A1A4F0772EE38346482F021A95688E1D3121DD80A88A349258ACCD8D094F403A674E1710F61
+46DE9507C73D51C77354C475B37F3E266ADEF2D739A17EA5E8BA5F65C314D57579BAD77D37E765
+DF196FE16397CC58CD8B21C21BF2E92A0D0A4893D679AC9012757602EE65A70B93CEA9D02F8DA2
+29C783474CCAB3F8D3A06B2DEECCAD27F621D6852932D43FAB8D81167A47D16D86837B68B910FE
+3D97E07239B767FEFE692990A4F3600F7BFC55B7B137073467FB722D45EF59362B11B7AA72C101
+401FF5216F48329E7217AC572CC736B77BAD3B863FD622F46CF547EBAC0ED63BC0AF3DC86B816E
+D1B862A0A172539AFC23ED6201627BD18A317F6A2C5797591EED54D9AC7E5336402DA66965E311
+768EE74D1DBA42FBE2C59848F405DB9CEA39C7AF0D13B6F0CB99160A2CBED0ECE55B21982FDB7D
+59FA99649EF7F00ABFB9AF764DEADD60DC3BEA997C182A9E5857B1A9E3D1305A57F608807A12D9
+045236C18F174A63BB2F66F006915F701A7F6BED3120A63438B5B2EF4F7DF4A5F422FC1E61D395
+88F0A865B710D1E9165CF6D152210C7165B392E35B72D1239A18D59DE31A08676686D4C739D500
+D15D2DBF84C0C18880F41BFD757C3E2D15CF68A2444B863F6FFA3C9765637463FD9212ABFE1B5F
+03A882E46D4236052D3A270D25A26457A4C9F348B6C8F0819F3BB5BA54B09071326369AC2E7CA0
+66D472F6F7DF7D4D1EA9FDDD0717973A72257DED260FCD992C0830581EBFD02CD4941EA7EEC4B8
+5C8ECCDCCA777FEB024288604350D53F97CE23A7C2EC292EB69D3B2B75DA47C65C2C0CFE3BE097
+F9287AF9C926292CE9385A45DCDD0314B2DBDE5AAD2E6A61964D96DCAE2217BC4B5A056AE24FAD
+4A0708F63594BFF486CD18B55C44A8FDA7054B0C9A20F3C3799B8F7647DDD9B1E5A5E6579B95C9
+EA4F3E0DE8556789FB080C7019134841F44B7C9E526EF858F8ED5C0112CFD2E3C1C1F382B766D7
+310529696AA7A533D5B0B5D3532C11B3562C6DA713DEB04A5BF022058772C94CB22BB4FAA3295F
+CCA609D18EA85146A89C046FC60B0DA65A416E2A71AB5CF8D536138F2A85DD04AEDA42AEF41754
+232C92F1F79B303DB4F2ECDD3018D9C683A4BD7D60A158CEAE71D5C231165962BC3E88C2C3C0F2
+9CA2EF9070F8C0E99BC9F3652FD5599BE3911750BCBA6E5C5934EDEB6C85074B11A895A874EBB0
+E59043499D026A6C062B4F86FFD4EAD2C9A31D4E63D09EA1F00C55653A5A68717D0BCDA0961ED7
+608398841C26E307749A5C2766B0D5671AD7407C0696577DC0347FFE8CCE0772750D4D6E13A690
+E4A5EB935FCCBFCBCA751BFED56FE38A181016F87A05B90873FD8C9D843748647894AF1FC2E48F
+E408F7BA4CFC9C1A8898AC99ED230E985173B829DC2FD21F35C50103C053DDCC9F98357191CE1E
+19D6566727996460781069EFF33CA451A1088E81956DEF8E8CF997E292FBC63F99A84AB2C23A52
+09922836B072AFF17EC0343CAD1B847851CC31510C8CA59913CC8DE2B0CDAF99846F7F341E23E1
+C7727550EF11476472B3D082ECC47EA7E2B56A747E6A7777E2E1AD4F4F2209B5329F4111D8F7E5
+383D76382F8B5FA0D65F7DB47A1A080567023EE270833CBD88B00EB79DF491674B5742D27E6875
+D68C127262657624764AAE5B6A8775965A179879D4ECE7EE9D77BA6DC8D917216FADD9A26CAE9F
+9F5B135F6B6AA3DCBC7715B33EAF70717561E6C201513AB2303374
+0000000000000000000000000000000000000000000000000000000000000000
+0000000000000000000000000000000000000000000000000000000000000000
+0000000000000000000000000000000000000000000000000000000000000000
+0000000000000000000000000000000000000000000000000000000000000000
+0000000000000000000000000000000000000000000000000000000000000000
+0000000000000000000000000000000000000000000000000000000000000000
+0000000000000000000000000000000000000000000000000000000000000000
+0000000000000000000000000000000000000000000000000000000000000000
+cleartomark
+%%EndProcSet
+%%BeginProcSet: stonessb.pfa
+11 dict begin
+/FontInfo 10 dict dup begin
+/version (001.002) readonly def
+/Notice (Copyright (c) 1987, 1990, 1992 Adobe Systems Incorporated.  All Rights Reserved.ITC Stone is a registered trademark of International Typeface Corporation.) readonly def
+/FullName (ITC Stone Sans Semibold) readonly def
+/FamilyName (ITC Stone Sans) readonly def
+/Weight (Semibold) readonly def
+/isFixedPitch false def
+/ItalicAngle 0 def
+/UnderlinePosition -100 def
+/UnderlineThickness 50 def
+end readonly def
+/FontName /StoneSans-Semibold def
+/Encoding StandardEncoding def
+/PaintType 0 def
+/FontType 1 def
+/FontMatrix [0.001 0 0 0.001 0 0] readonly def
+/UniqueID 38792 def
+/FontBBox{-179 -250 1405 950}readonly def
+currentdict end
+currentfile eexec
+05D2542F9F75EC0822B36BE6F0DEDFC8DEA486830878B9EFC0865425093E0C2E69D6F33CC9AE23
+DF5EDBC1E5D079FB4764B9F54C1CB100A936A445065CB97D7CE6C0C4370B3ADE577ACD273EAED6
+15C410480C863CB75FFCE0E72EDB5035D97674731BBB8E694C0302E84C5CA55F405C83E06FA42A
+DEAA89CE21DDD2BC9F048F7501C2124566D55A81E16EBD047DA68CCABDA9D52A3880295FD057C8
+C7900A8A31BA7C4990680FF1F74D5699C19DC8359898F7A25196FDBE5DA6A0E5C6DB74B7BBE88C
+542FC0E458D64D52230079CEB32C6644A8809436BD133207FCB1E7165359DEC653C7EE65AE80A1
+92C83B6CF310F74AF760499DD67A4DCE97CCD1DD538308BFA46A992B18C02B8A332869E677523F
+E7C2597865F352B2BEA414020204762126749DC095CC55AA76E9C67A97692D14826DBBBDF5538D
+99E15D4C082726916270333E380EC6C71B2B79A5D15D9B928F63A48C4314E5CC3CE2BD2352533F
+5BBA3DECE7526814138B51B898666E823291D0142ED689AA36B326FB41E67DC29C46A7CBCF563C
+63B52680C9BAEE2BB55409547DCA64033DAF803CCD32E3768FBA08543D80A937F61B8C95927BC2
+A08F4A257D03AEF025F3877B798E55DFEA17A2C3A484BC6C6ABD60A2723446E2C67FE0BA1831E2
+D7D42EF86439263917CA19CD8F5A0A65AA7003345D13743E757A7B1D9BBCEAB6FE0022B4ABC17C
+108C913B1066A7B5218861EE2942E39E1DABCE1D16CB666B14C7421B9A58F1DAA519E6E96570D2
+AC187446F67438F56E1A80DF7A72A6A76CFC27FA07D10B624E8E1C53F71720B3351A9649A6F261
+FCCDE6BC61C0587E7CC6217F98D04986EE9AD86B0BEB09C24BA7A3F4CC66482EC7FD60F4D93D4E
+82272616392166AE09582F1A6146AF9932DF4AD2C45FB468B5D2B9E119E93B4E18EE963DAF1AF6
+FD876B362B31E36BB0A876A49D82AE89E0CAC13DE3DBF29FB96C8788CBC011CCCF04734C1CBA5A
+6C18343EA1B0DCE808382C9FFB44F1A7752C5F9AC6E7DAA59C08130034A8CEDCBA8D48881E79A1
+7BF5749F136078DA9FEC9CCFB09C85C63FD964D722ADB32B1040DB91B1508E460CD08FCB7A9E42
+B74AB09EB3F836CF46648BDD92E8DD2D48F8EE8F80FB1EED24E901DC294DD024D25A72642225D3
+028FF69FBA04392FD415B775F0B132D75D56CDE9C0CEE44C29F8F1692EE002A973C5114B03AAC6
+D1AC009184D50790D83CF803F2B36D94A8D7F3E1C56A0C924447F56925F09395CBB1DE38C5F13C
+1C7D563C43EFF5E8538C2BE12C8E214B774000FE4E2751DC6F3E2CC8DF5E4633E090E4C34C0CC6
+F06BD829B1105B50429205B2C4BA32480035CF513F4039B69EB475F16EA439E277D5CB93D7BA17
+41696ADBA069DF046232169134980DF13D2C75FAF57582B548FE67F7215D7673077168B733DCA1
+51B0A7591C1C2D7B1E93E485F54799AE111F272C49ACFDF6993996A7C5699B250CD2A9D82B7A4F
+60F990865A5A21C394ACC4D61BE0D9DDBF8DC253D156265FAA5E5163DF739F013C1BE519F5A616
+6FCDC3938E14D17D7B4CE878481D5DC2DE545CC29C88CF043EE98C4BFA6E747DC626152B6807A5
+640EA39CE6802541E5B4E80F6AAB41B13F6E8C0906556279570D7B3C5509237EFF4A98680295ED
+7BD3789DD532E12C47E9D26AB9831688E6A9D98715419BBA7AE390D6EEE7E913E98FCBA6B268B6
+C958424D98BAB18372C925ADC53415508AE4AFBF212D66A20066928CD81E5FFE5ABA34802522B8
+C49CD00CD0F7156859F14A254566578BE1E0986A86738BDD7E81EB8249A3C2B4FC522886C22209
+00BDB96EDA972558EF18E9408E6FA8B59B5E557CDBC6B9008E018089976A83157637EBCFB60E46
+0BE12F9E92FA8AE384E2E27B58A4DD46B6AEF078F17410B64296BC43BFF1AA720AC0D575B0A4A4
+685F533A846D1C8E6E3F0A8929DA9A4DD039AEC0908EEE629B28F8516836DDA89AA7E033974759
+7BAC32B7F65A47E875D6575930E4561B1077A8B6D4EBA710A60EBF8BD7F90D5966DDF217676838
+C714B7D0A1013CE649629797335E4F1E736A452FF105F1E31DB1F105F51C5DACFE14DAE5C385B9
+A493AF229268DE313F00275F6EF4E995D8E104133ECD3BCB1378B69FE0DDB100CD4481F3F7FFEB
+6B696096BFDDEEF1268BD9ADF681B57381896F851EB12534FB05EDC89ACE59E7CDBEBCDD622953
+4E12BA0C675260841609CB656B05D37CC7FCCBCC92BEBC4C2C3112AE2CED5590518438B2775DD2
+78DF847B5F3677934099A8D34B98E9F793E6C86C76B1CB0E42EC4EA2E9ACB22EEBC084026DB163
+40F8CD9CE194D2F6EA2403255DA218EC31EF12888D3C4ACE4C84910C6DD17C8321533B65496C0A
+67EF9AB8BB49D8A9DE10694D21FA679AEDFD56DF18C915FD82B3EAC5F279D4CCBF02183DF4EEF6
+11F5266108A01D054321E6F5922F2E1F78D48DA966549F37EA876C71BA109FE81719822315C2D4
+EDDC0B3B0C2564BF6D2E2BC3AA020B462F0A42C562C1FD135DB84A51ED677D2EC962C8A86DF9F1
+2B4487AF45584603D517D6BD04B66659ECDF446CAB71D768A9B4B3F58293A6DDCA895309CC045F
+951AE11077FD1AAF79DC80C0CACD362EAF1744455DB964EAD2D65F03B4F7A01AB2FB41AF084012
+C199738AEF935CF46E659DF852A78D343063014A75399F5FEC92B75DE7E04C6E42DD6D6CF84D35
+820297B7D0A4E072D9F5944E7EDABFD4E309016B6BB3450E2942DD131E7420AA2CA3E766BE9CB9
+44C28330F2DFE1518C2FBEF785AF8D9080EEF0F9E1553C2E855AA68EA71D8F5A16815D1F210430
+25E893E408B006DE432D9A1F5F3E45531785B3F8CE6B175E2F39B99945382E63C3F31C748BFC26
+B7D14060043017B3ED93E27E1728E264303B21BE3F78DF47DAA1395361BA0B84BECF2F8568AD27
+67314C0BC80A9B733D96515CF586CF038630707D2933EAF664665C7692563B2B8707B2C21EAFE7
+33C96C5CBF7970C1310EAE671F9893091706FA128B2DAADA95F26D0EB2999BC294A22A61883E19
+4222815929D7DF0683B5C8056C4D1FA0E3716C155D1ACD225D6B68976EE1A42171592A90EBC10D
+93FD735DE0FAAB691A4098239213F97BF81A8CDDB5880CBA714F22230D208AD96B9B73305B90D6
+C94697D3AE9FEE5A52503D844CDE1FC15112897C62A9C9EFBC3D775C40BAF7844AF7034669B332
+70533EA71BF0A9C27BC03A02D7040926DA1F10906D26E6431606907E8522BF6581A311A1EF1075
+B697053B59020B7FF83D0FCB0BFDF143FA8E645C5340B9226D1FB3D03E892BB24D7F5438D7B87E
+FE337343C1876CC99495707F87D96E1234B58C71A450F62CA5CE3B895B52328AC1739D3967DB01
+26EE475B5A609982C31B8FF352E959E417E907D5B9C076A27018849AC10E6113C1A0F816582683
+727477CBBCDE1222F9EBBB5648D29517E72496D1F0A44CCDB34106A53521EE8F61358A267105EF
+49577892389BFB701520AA73E6B8070DE634B853F3A61818A4B8B33264416C1C3C83FC0C8BE091
+F30252A8691D193456620B3BF471D4CCE9397558C7EAC8104C8C6A13CD716D916211A12C443F2F
+04EF0C31FAAF043729B6159B57826CDBDD6205932B251089385E4E30C4D51744A45D96FC284097
+2007ED353D62D3CDB6FC755C11BE98E8FFBB40560C93CBCECBA7C09692F817DCE1BA4526A81179
+2F2C19A169C91C025938E2B26A803682CD9921844BF9AAB1A14514BD26F046E8769D79B3604ABE
+0B786F60D424B2C6323520A982E906CC3E92D3B52AF04530708DD782134F4052EBF95339F50CF4
+5496B70B52B59CB6F54DF382CD9F4BB11F629861133B4F585B816EF197B60C5A2D9FCF7E20BFEA
+366B42D5F9B2BB0F67B045A5B57C185F621EEC91932855E0C91770A5E4FBDE4ABB9CD137C88B4E
+E499D432FA6DB2B87C71A03AD23BEFBBC5A8FB3E2130F451B0A0DD40E84783C26E573B43B15615
+4F7EEB8B381E1F97C54C48EB5AD4A1545391EC3F6650A0E43F4C23750DD58157AFAC738C07D296
+EB9AFAB0C0FAC38CE8566293C584B2256E79544A5B242834BDB31A8646DEB04C95EE80EBC2F845
+BE0536A629E8A0D23D355CE4D35E5F74A2D4E08CA6D47CFB1E0F4F98EDD2EF3DC779B69BADEEF6
+AF06F1C6CD36EED1C09E800CD723689A001000F4201D365DA557D11F057E858520DE75F5C8F354
+69A9DDF5A29D3651EFFFAF4FDBED2A9C1275DB764ABA6FF74B789DD65C8D082D9A9FC800873132
+FFAC9E782291EE6696D483D41C1398E8C65306DA0D306BB9EC713AFB4C3D55A4C38D865381DFB0
+E630628FBB7CF51922E547D8975301E2A81E0D429FAD1C65993544AA5431B880BE4F314C4981A3
+FEFB2A37BC1BEFB267FEC47737819C14C04486943CC1432135BD844A34617ED7E4140431AAE948
+E989C5C72B6B090AE889B62662E8D30D7C633110F08600F8F3DEBABE1B8272571B1550FE35C252
+818F856FFD8231E801321CFA4E088D1D6A4F56F2CA81A909D0D565B33F5B2574FC52FCA1107E4E
+94E7237D994DCA0E5C13348B6ED835AD7279D78CE290B38FD42876FCE44471AE6E20E6369C638E
+6E4B49B00B68497F912FA6518016ACE6DCA8E865184CD563E1713D7EADF64E52BBD13CE5CE54F1
+9EC5974E9F59D287F76F03F756AB42FA3CDFACA79792679B7ECA516D1532A1BF1AF2B04002A029
+AC8DC0F34527E917D6A559974DFBF9A5E13E2E1ED526F7AE17BEA04640705CAEB05F06544A17F7
+B44BF54B6B80594D71AEDAAD17079CFE2B6C65744655418B1527D51D4C45E5F321D52468C168FC
+A515979287566DFF26C061FFD7039C232FE1ACD9377C58850C99BDAE145F949F4F504D74E4278B
+3CB2EE53252AF7805F3143F0999C8C0D17CCD2E922375E563EAD698D9AE6D0DABAE5A8340497C2
+1238F9FC9FC05B76A47DA0CCFF8D108D1A188F5DB575E5C08219A04CF78E06AF124FB3FC3B4E78
+2677F3C09F9D892AB294B4EA15241CE2899514EB4D1BCF51D294737089EB4AC56AC7852E498217
+7B804241177353670637376D4D1BE4F13A6107A6A6E5A73679E687F5512801B07F67568F737B3E
+00FF13F7F8DE9C73EB3A2865B07094AF6FC8710BCBF6915BE2E2416B9A866BFC513E29E92898FB
+80F81130E4AB9E5C5D559576BEE4AE5B01BD28748240E7B2D7441E57053F934628A99CAC7F4C72
+F0A343B7937E295BBAB9DAE5CEFDD103DFF935B2454E4AE0AF39776A3C0F40701DFECB27C6DDBA
+4D97972C03109A209C6F98C1E6FD3C81AF5CFCF5223866A5E58514FE8D5DEC95945865FB6F6FBC
+51FDDDDADAB1DBC68F35F756426EB29A6A415AEC11D2EC09BC523713ED44466FBA3FDDEA873A14
+85D7C042E490BEA7512D46705A9C77B52BF575BB1C849C76D0E32033A9F59C62D3646725627CB7
+948C2F72EDA3D5D27E83C2F379B12CBB6D7ED2DCF3BDA29728F99126E56A36CC9D7FCD83F2A4FA
+DBD5C188379CC6A56073F57E75221E5BA328E84EBB6ADCD9D258DE03E5ED83123DB1964511B792
+2730D692F96B2E93273AC148ECF069362F5EABBDD6C577D0DD1D724BDBD804250DB2EB3A2B5F44
+E7DFAC5457D117F3A1B132A68C61A35179B3349A1F412C0322CB415256FE517FCB0C206CD576D0
+181CF1ED3A068444F2A19D9EEB5324CE071472AEE02E225C747913392E43331C5DC96BA985E2E1
+605A3BC09FC92CDBE4A516E1BD248D34FD85023F9D738EE10B2DC23ED8A1A2FA207A1A474B94A0
+B78694D7B9C386302B2BC7029442E574B6258F9BAAD8A099C5002BE366649A771A94A533B4D336
+695DDD599DFB4FA963B04628C52D6DD937BBCED417FDFE925CA54B9CCF44EC78D2CEA9AFABBA6A
+8D0D7479EE60204CF38D1E9B425BD3BD37519D0D64E154CC6CAE7CFC7209F4AF4E66A9DFBD1934
+E82D1209E12C44CBDF4C3E902931C6C983E712DA93F45DE79A58BEF6E742EB63D7D0C187D4037B
+9C1FDE3F204509EDCDCAA5075E3B8B4C5E62C18C2FA01040A4D153C58F0D6AA66335ACF7C455F5
+855AB3DB0A1241287856574DB170DA0C55A9AE190FDBF3049987C8CE26C501D0F3A15E9915EB5A
+9AE4A49860DA936CC61228A21C343DF6B0CCE324FA00C32653DE16F9BBAE85E9C7673159434D14
+2E25928D2EAD8021BFB2DB4F0AE93900577C5937A7A0E292546C66D9D30759EF06120604689FAE
+F808522BEC56BA62621F728E9A4A4D31DB7F7D82DDDFAB127E50E72F95EFA44D40ED9A82A1A3D2
+14AE275930F795AD74375A989D78EF0F3B28138D35A20F516C8546081BA4BCD6B493B49FAB5ADB
+C841C48AC8B22EDB9131BBAD00425D3601F4928F72F60AF6BA2845DFF2C1C46C8C0919481C2F02
+6E71627A0EEA7C1233BFC67B16DEA00AD0524FF2FD04E49266652DDA742E2770504C22430004AE
+F8CD94E6E54D1E8989264B7C22D770D9363899F97A900B8637C42CBE9DA0CAF97D69FF39910919
+155CC68FC81208F9C7E9B7B67BBEF02D65930444E9319D98A3C063EE56B907CC5B2B054965BD22
+074FF61F8F74ED5734C46BE532C9BA883C55AA5FAAF5EE80853D1BF06E260679732E7712619C39
+9DFC4225E71B878CB758C6C3DEB5347C5AD64A22F0C6BF2C692F5EC354FE9EFB940AFEDC511F8B
+1A12BD18C1FF14B354748DFA4553A396DD8457234FB1D6BBF2E58ED6A4BE5356E3402E69531BCE
+0D57E7632D2D3D9A7E7B54499CBAB807514330C566D104C48A4FBFD7F3674EDE64D674DF126856
+1145F8D649CFF1C069414667867EA7B65A012658F1376E7EAB4525EE1788B25C348850809E61E8
+CCDD2FF708C1A61EE0E2D6B5D1B85B2095185668B37836FCAEC18D5444D0C00EB6D75E811D3C50
+9DFEEDBE86B8052D0021B187A93D1EA1FE0147D11D75DB5B63536410DD74040D77F930292D00E0
+8351F7DEB63D98D55F11AE5AEEEB05D00D7E7FDD769ED33F1C61BF087C300BF8D5BCE34B479D62
+8231B9ACEF19EFCF675BB4EC2833458A151C340BA5DAB949917CCD8C455D30F4333A834519785B
+53938865FCE3D7D524C7152E03DE2F84D82F6F90682B0198BF688B2A63213CB432297AE92FCB56
+7D0C3EA22C28C373D3448D402719D0C68C3686CBAE4C45A6958D1E89E61EA8FBD3D1F63366AC59
+9490CC2118148017C72FB239F1540216397DDF36E41DC49BE4F3836B09C674454C1044A02704E6
+FF7FCF78AA85B1003C1B0EB2B5021F8F2640A68E4799E75CF40FFFC212AD560131330489555A48
+828EEDD440BDFF3FCBC860080992A3367E850F9D9D20AF1A0055D4AD13505245725BC3DFD7261A
+B7770CC41C6B908872FF99758DF7EA19CCCB8120AEA32C5E5CEACC05A0C40300C8BBA3EA16ACD7
+3C9331026D850FDE83996CA03F642F5DE54818540014EF65571190394D94FC2973A6C92CF674DE
+2AD9DDFEA8B93F556E59B61AE558E6E86824F23F6A0A72FC79A48CD14FD7BCC76011A39D8CC9AE
+F8E72402DB96DF0DF48885881F508C7C59AF6D06102FAC84718630870516EFC9429A3E95376956
+314E65ABA124F92AE11682F9788E493379F83FADF340783150C51739EE87A866D352B99E6C1F4E
+AD8191B7DBF364260CED3274A261C3AAF908D473C2175D15AA932D88DDE57C2EAD27B4D0F05C9E
+5137A409334D0954180CAB64372166266FAA5A22506D85A4928E240AFFF318EF63B45C26D23237
+6C465AC9FCF64D9DCCF13B6D5103C1F66574CCC968EE0F6CCA773B28D53ED94BB7B42287A6D3EC
+102143F52720CC5396EA524575C1CDB437487288B5587D24BFFF1B82ADD45AFECB4D747A628948
+623E61664F3655BBB1DE782B7ACBF256875DF5FCC20BB7506910D12BE7291EA0648298FD361737
+0458AD089170A005942639F7AE5BE8D1FB6B95662FF074FBCF92776E6F4C7D241D1EFAEEE40DDF
+E8D88DC1EDE3D9E0768B8E0FD38BCD9310F8A74CC0C671B0FCD404739FBC68BB02B1D90BC4D91B
+F5C24E72D98D1D36A0611BA9961B74CCE43411DA5BF2659414D74BCFE8E277EEC4A11F71342A97
+6291C52A21737F224178B619F048F2A44E9F42BD5530846E10C4F05624026E355FE623223DBF42
+90DD504ADC56051A92578CA2E00BEC120E0812E0EEEE934FB9E7FEA6B4925B4F5118F30C5BFF35
+F8A1F069B1FCC24694519FD9E817E01799FE1FB9FFBDD28222663A74E9AA253F573FB3631BAFEC
+D327514A43947F04F31BCB22C98CF9E050732BE8574BCEEBFB9938AA74FC68A3B2ECD6ACCDF22D
+E9F46AC3589AAB1C352538DAA0E1CA320694F79D7E5E6934128DE7EE3E3328D4D494B5E85EE40F
+F2032E44AE58770E78188177FCF23CDD200280A39EDB76E4D7BA6F728CE8784507F7DA164F062C
+349E325C145976D0102E65DA171F95A04A3D550EE3DEAA4A564767ECF3E7D0D5D2BD6D06CFABC4
+1D1BE5A5F1C478DE08343F2D9D6A74BEA3DAC953BF38183EB9BF9B188F88459496BC74A3EF6514
+12307AF69D68A1BD9678C642D11B75A7B5C113EA8036580596FA193F2FE45E52274F20583F6D0E
+7D7C17CA09022D07573E33F52394FF499ED067EDDF122A4AA44B9B4CD53C04304BD53BDB734D78
+5866891CFCCB5CC4ABC2EA2BE6EB432BC0EB22D9EC45BD31EC11244F9C7ADF81BCA29A70EEE439
+4A3AC5C2BCBD2E82A26B06A348542A4C56D778D2DFF2944B5EE2B2CC32762FEEA2E95D18075847
+6E18E6596B9ABB3F36745BD8228EC356BD8DFE89F8180277C50DDA883A59F1D9A21704ED019070
+7E87D30672973F4EED6C744C2E71BA35E887C0EA1503A941EA20902177DB1F5054175A215A9D4B
+FEBEC521B22F9A2924F76ACBE573E216B1C97D5D7ED322DFDFBDA1049A219EE3736B9B763538CE
+0B1BE3E253175A515DB0EB877A547C4929C9EFBF4DBC586BB076ECD7575930E4561B10A56E0F92
+165E415F78ACAF1A99AF4A1A8625CF03B6FE564CEAA6CAF2FB247541CABA278DC1966B6DA19A1E
+915024184832E33129DAA8F37C57EA8FA66B1D7C1E03945627F9807513EAA0F87CD55676460692
+E76A71885A1A37BFC0ABFDEDFF655DED8A9FC81F57912EA87ED5FB28E6FBF283FB6832C10704FB
+B1B46D7E1BEC70B5DA8F5CDB58D19E8FAAB5702A3A726EB077895D36CB6338378A3412922016E6
+5C45D77C3D7439705970C5772DEE02821F1BD236AFDB9982C1986DF161665D7A927412507700FA
+B2D873E77BF818713A257FC7FC29DD7D4987249D535E3582812CCEF3CE72B60D23F33436D1DA42
+BA60496719774783F395C42C1B44C77F6A66620F1F92367B56777A57BAC024874680CD1049EE3C
+458B24210627C745559087033EDF0CFE14485FB79D541888D97CBF9AE6BBEF9CE0DC02BBBC83B4
+C2BC26313CCE46371C60BFC33758C6BD3343C0984E58D4CE5133511898D7860DAEF04DABC44731
+7AE3A18BC898833130CF72EDD91A4E42D85F4B897D0F9E9DB4477E73063189161916DE6F34FF73
+11FA695AFA2F897334FD81DFFC505BEA5C13A3AC792569C6935611E95B74D41D9DE36140620979
+205FA7859E1585B1124DFE4B04D880615CC2198A67D47B64851A642F40CC16A8E8AE202EEC55E1
+008E3879241A61E6673C9EDF77EFB2A43F7E85E196BEA0043898FED01FBAAA47894EE7392B1DB5
+2B9433D88980461A7F6BEABE6B752600B758F0F2529EA26D57BF2894910AFC67FC6D190F359058
+517766C9403B404D50865CF632F371AA67319B6262F09A92A65E86AEDEDAC504BA901B8A19FA14
+F7C6659B209845E9665474981EF9513115B93DA16991B5E31A70DF01DB06D47BF089EB184CE039
+3A1C2C08A2B05625CE02513B4C82D026C903DCCB3135FE88A6A4CECFD2D5808CCC99BFFC43DF9C
+FA2EFE9875C3491320D62FA3A54558F298E3854DC3FC8D60EB09C534E6A14102F4953AF79A57E8
+7748A2E01C683B8ECCFE4AA681D943C3758FE70625227DE214CCACD35F15B4782100BA3C0AED4D
+523681438AE195D5B58D4F61B9807EFB12B162FBDEE63C22CE05D99E4E289EF01463DCBD748D9C
+6CA0270DB111495B0E7BA377CB34163DA6E3B7F5FE89FC9FED9960F3EB9FC42F1CD39BFAC8A36B
+F0ED0CB3B6D8503E78432EBF42C0EC6D608241DDAB2F32540AB22CEFDDBBB10077154846AD5253
+835558E1A30C426F9E7A488B88C1699ADDE69F0821342C60042D0CD505799BF1A4D86D94DC49A3
+046236CDF462CA6367220E041FF8EFE18CA65B989E865FD237A7E120EEE95915295F4FB8D0508F
+A98A2B7737D6088047521E6B740311BAA5FF402754CB1193C329B7A74AF5ABD596E5AB66C242C9
+F6F89DA12065DB01AFAE32A7CC6156B8DFF94B72C8A5F415C738963B112DF996165F52CC48C2AE
+FC903178931044B9095A09A9691668AACA9118D67E122B70BC19A511759544CE3A9BFCB73A6504
+D77E24A350FE52FB0107AEE12F59AD32C120B1205B69D0165E7BF98C9F17A04DD46649EF7E363C
+7F52F573A1B99733E5303BED19FA3CF306879C7498B18ED8EE01E8E87715A44DCEC5D259E95767
+0A469D3C4E5EC2043F6EE288ACE1E3B39084529455E1F8389186F7662F96E3E1B053073CF04D2F
+F322CFDB6263588B3802327318A8DCB9A61C9D1B1DD2F8070F214DFB2198650D14A77C14FC1AA4
+06EC487149B86B997DAF22E30CAE968971664A10A0CC346961FA49062E617ED3DD0DF737B41437
+B1DC2B0670890F9ED97E406B46A94B05A538E8240572BCCEFDE21F41A66520CE5ECDD3C0CCDB3F
+19332FD94654A9EB7D7D5175013094AC79B92D1FB0BA86F209A3283DDA9DB25B4F5A0A03E72FFE
+A45F914757E8C50B8F0F8176FA8CF44C271A584F7BE700A0D36572FAE05EF6FF23C8BB33EF6BA3
+3186583E4F55D1256072B53B91047AF7868B31CB6150F5456FD4FFB8B4B2EC3EE1148E8DB34353
+B3BFA4F84B8C3001E575372BA3F7BDF1BB6C4B82C2FAD7575E12E287EB971ED3D91404221137A2
+53026C8989FC472143DDDE9E2D49A413F1D6A409179CDC3CBF544A093FA05985E0BE71CD6018D4
+2127D0AEB4388FA7ABC8558172396885A8A42F0A0C768A4B0EC2B4D1862AFC4FF363F3668A33BB
+6F788A5D9E9CEA2BFADD7A4C611BA217D15A1F6BEB135F8F7C9FB011642B6240181494A6C192A5
+756766F62D7331C142C551AB0E64ED8CBC57EF3C295DDF2DDBD265816761F199ABA1D2E5349684
+94E676D10461C34136FB87B9FDC817DB731419278301DF86C91D21662BFB36615D4F85DF3793E2
+9BB4A86F1AEDC061B1593F59DF133E4C97B744F6AA19EE0E23ED826D0AAB5EC479F2F131DDAE26
+0F4482E8215F2A06C33152F1E26EB4F7EFE862846A37A084D6090216A1A9E111D416629AA37375
+C4924FD96E87673C5B41F627F5C1BF682E6C411725CF5414D7ED4328B94EB8EAD9EA991D0F120E
+872CD1397D36D5C2DB03164F2E5D414519FDB61DDB3E27D5BC7017CABAC9EB67BCB6A5FC451C13
+E7A3B944C1795ADE61894809B085AB4D8C046486714D086043C8E504B57476C5AFFDE8473CB6F2
+2DE06BF6FEFD368D6F8D0E00292B825EEE18F1FD3DB34DA347F1B13ABF19F22F10313E6D646809
+90E4B8D166499128BA14D2F2200C86045C731B8ECFD52B2400C2CE1BDF0958C4FCE83EAC4B757D
+CDE1F5CF4455FCB27259E3AA102E4CA642122D5DB237BE915E606850D47CD77AB07BE7B676DC86
+B5E0CE1FFFB177E2A84023F7845B5B570227433638DA173C086730C2C647096473C22DE7A47F1C
+C33E00434946AD9847A55A6D54295BA6B2F80E80A055A02A8E80D28685FFA0B766430531AE79D5
+BCA0C699624502B43A3EA10D8E3FE63AFFD751828FEE69C0769BD331FF2F4367FC4F8AEB2C06B8
+7CA3D251DBC6E81F7159862845712248FB86A0F73B767EA8784EEDFB538E41334A8F4280B64E34
+9C2260B1917657651DEE10B78C60E941AC56992BD61B84200E942F341C37C7D73D9F2AFEE845A1
+A8ECADF6BF3DD77D17517AA99FD9A0C87E735F998C2B05716746159EFB439B619C7AAB02C607E2
+911A203FA36C15B3ECECC6C72037D49F15E550FDBA5DE6A7BAA71AF83459ED20A331037F0E25D7
+177CD16B4CB572C2257700F150F03FE9EB44E9C840EA81BC1D9B9E6FACF6D05C01C1709E5D78F2
+BFBEBBCE08C5E32067CDC71FD50042FF254BF62E5E3923B66ACBAC43DEB6541EF98E1CD9B122DF
+C371CCB970C345006847880DC6814CCEC5B5955B63786B4EA225CA81C5A19487C518C8FD98568F
+13B79EDEB465CC2B0FFBF5379C4A2C0FCFB018995107224DD43754E55F7017E973F4DDFC2A14D0
+97C8C5DBD92A5D161C25B6488D53E52C4EDAD89203B0A2B5048D55EE9E577FA75E46E7648B5430
+09523BE6D66603F7A2E317FA7AC44E45342A977E76D5384B6763FE2186383F10711F36E5AAB801
+11B02699085C3222F6622C201B1C1F975721CEE86419E9DF365F1603641DF7A5905BEA0C54D3A1
+8BDCE0C892C8CEAAD1F6AE0E727B792AAEDB30390CD4C17D072B82859C0B6E6574E8F2B4F4AE03
+DCFD278B90DED764C0E6F262CCFAD7257C7D2E2733D0E9BEC3C6DF0BF779B516E41506BC084928
+3724C876682C1C6F36340AE8072AFDB1F710C2810E808C8E789DC3962174978E020DBC1A16F129
+AE110E7C701601D120702B0AEA98FE3B9EA28CD175B9E445920BAF32BCBB13652BB33B62147859
+765CD15B51A63FEE61FF92F458AC28849BAB775FD42123658F31F6DC0F896F2E37CB0BD310B098
+E7B1A6F473D0624E3D8EB7BB91E00BD164A088EAC207F0ADE1D9150D546E00F3CD038D792F42D1
+9625A14D30E8B972B263433BCED195E8FE4F200C672A1F167F969B2E067E32B7D69765823620D3
+E68894BD03C3D5E614FAE9B173C21A946453428B22C009E0BD4AD69D94BCE76303775FAF74C151
+A6D0C5A3F8703CD5BDFCA2A469BF6A42A8FA8678390B9BD516C76C2D6F358C0A28BEBF971F4C4D
+1D81CD15D913C4E3C1F934847081BB1897CA19DAF87B9D5EC72A7C26B65563514DC162CC129088
+0CF4FC0C115CF2768075CA07B04340F228E862A40F35AAD4484B109FEE50E26655A8C699205D70
+C2BE4D2368E3F7F927F64DA140F979B299B50DB1B9224E6750A7D1AA909A4921ACBE1F47C8B6B7
+0CD46EC98C9BD56C35D3FB61AE9BCD3CCC39141C92786B8C7CA61E06B88B9A1742EF6D5CD417F4
+282F220212D30EF97DCCB70CB1153E8912131C9E2E89B490BA9967CEDA089AA7D7E2925C4005AD
+5624A294E63F54235F579488A705D0D13BCD668263122CC591D2417CEE1B1C220BF4BE45722F3C
+4891858DCDCD88B67AA9E69D045F25841C0D8A4A8DE5078A22088425A6027A9FD1063F2243600B
+AAB3479833220D38F365C95EAD2B8E37E6784EA29A4D54C4445C52F3939B1A61F05FC9E5DA8FC0
+84B9B5FF7AC76B07EBDFA6EAD5E70210CF795768EA6408DF4E7EEFA5FBEEB3FFF0357F61EA6061
+06619C14EC6E4EA347AC6F96F3C852459965CD29328C3FC164F570A646D514A1FBD9C2E08A4C41
+A0539C8D5C0849A1C6173E4DC9B2B039F7B5AAFB46A98A7A9431D70388D06AB90B58BBAEC86E75
+17F25C7674A633324E1CDBBA4827A775BD6CA1A9A8AC24A51E6FD163CC0B47A00AD11EB05B3AF4
+F9F971F04F4865EABFF9EF599DB3982C62FB91915916D87E40458552EDFD00A10FDC75F86938AD
+E38ECEB82CBF2944ABA9E99BEB9856D58BEC9F1E0F52C64BC2B7B19D9B2999D16CAE02E5D12FBA
+62B9ABDCF95C664FB4550E890AF732E7EF278ADB9A945EAB167FDEE52993986949551159B3FBDC
+E8763E8795989CF46DCE7D53F9CDC713B79DD75F38D26813A6B31FE0E48777401F6FD86DA5DC18
+3F9625DD30EC75282B831CC151F4A90426BDC43EF2CEA37468363519CBC10EEDE7453F7FACA12C
+0F927B78922A81C3E78212D89AEA5006C789425A01A0F382EB35E61A15846A7C934AA1F164D44D
+E80418740CCA9364A9CB96CD01BFC91C4BB35F0F854235E98E8DFEAE7DDD7ABCD18AB84E78C00D
+D39A4F53B52B14E570D9E5377328F43BDD82936E5992A745123B42FFEBBBCF196744F193F57A40
+38B5AF3D5B1769C10EB947B4C2D6FAC578ABE2C4E682F63971EF5346C62DEFE184DFFC039C233D
+AA977CE3224DC9E989E49FFCCC73BADAE85B2A9BFDA4F848009237ABC481993FD7C358AAEB62E5
+2685C4597C9BDDC55C6CEEA1B44A2BC0A27061D08B4EFD8B97664CF2FB251B94D4900F135A952C
+46F5FA13A30F6AA5C1150A186678B610526C764054DDCB5FFAAB0B31A92B8BE1AC60F5829A927F
+006F619D10B59F59F137FA60D01ED6EE71E6544EA7CF8C8F81075767F7F88D7A2402EA33F8DF20
+9A8345776CDFAD3315FAFCF94A9776BB34697262D3856B8F72E238E8331F2CD4EBFA2CD0C2F633
+D67CFE012E32F7E1F199983EDAF394189E72D6398F48B8988668FBE0B6B1F307A9D127AB640767
+69F7856F28B8F979093B752A753AFB5E5371C66192D884FFF00A97B30FED991A46BB7F982B7858
+68BFCCE7593D432861C55AA6C48A2EDA8FAF4F9D23FEB5FD1F477AE532237A372D425664970BD6
+67080775EB9A3D080B10593CBC271FA9D8C95F9A7C89DAA54F7815F7C7126F640CD773E702037B
+2FCFCFF8BE9C6AEBBEF95A50790D25D1B289F25B43B959E9C2F94F2BB66382F299FF5E88AC003F
+2A04095AE808A6FC812C3F488B5783DACB58ABC15F81B8420C37B7797FF551B10DAC03FC1950B1
+734F753A722E9EBAAE5FC6140D800D1E3655D89B89726BB8100C00E57FB85D229E64EEF50CE010
+1699E721B94CFB42F3CCDDFE876B10B49A7A38FE69F8552D631DE6CFA9F0CCE3144AED6AD00214
+36ECD9044A3DF2B9944BE491C3F3282C38AD3839BEEC9485B30582C9D8C20986A9D2DEBA760B14
+6D541841D42FA9F46C329C5679C31BB32F89B7E4FB817A02B1CDC7ECEEEB84818B60540DBCCC0F
+3144C673320E3DDBE6E31F1677479B75C18968B766C924461482B35754DDDB9E43C81D226C91DD
+E21768A54CF64FE29980317C6864FADA228D2A972152ED1412F9498CE60B7C3B50B9890AED723C
+795934409C5EB2C727A8872C6A0DA820CCBB506CF0D78AFAD64C06891A8B570732AF12F60D456E
+17871E5E3ECDD6B3CBD8F86234C38E4FD00CD39457419A169E59EF4EE625DD40748BAE47CDC39A
+9BAAF4B65FC6C5511D9061DA352E981880F6340D6B6A20B839754663D26F6F53EFCD6EA6EC963E
+581E42331B236409F2F98C43445BA0D7D0EAA52150636AF735BFB6C475C904FD4754034ED58E1B
+B4DFAC824B3669D3AC473BD833B3CE889323987BF1EB3CA1A0872ED5388460F360FE9D1400FC8F
+10833946F68832978B0F75CB14E9FF75E7C5B9464512BFD5D5C4BDDD7530FAE0B397948FD5721A
+0D7B38FD5B67CAE166EA2DDCDFA1ABF4F8E1195913D222AC3A7CD5BA9C07304FC477FD91FD35CB
+C784826AFED5D80AB7C968036E868930508F4F1C6D7488094B78990BA4B79384C4E55E09FBD28E
+CAD7764DF404A1832B243EFF8B0F344F46A3D772E6F0507A50CF120C74DD6674DE4A72531A33E6
+28A5B1AC079AE7A41D62C723D90B7A3E999486CDCE2B64BCAF7443BCC37A9445C1B4681BD26DDB
+C451658A1981B327DDF00E3C9AC34735605595466472C34636749C436773BAA155E51ACE57A294
+62812D2F6E396F57E8A6CF5A739308FD478C69528D86B3CC1442761531D6BB1FF48A513DAA1BEB
+617A418AF696988E29538D9EF0DD8E16588D9157E619AE1226F4C2F37146DC6A49685C492578F3
+EED7B8DEE2FCE03460ADDB91C37F7A29E2D3276198740B73C93161A75FE0D83F02ECBF1B5AED93
+086DA0545EF10000706305D2911EE39ADACECBE06C1B5FE941EA8BCC6C2B6E9485674E7DBCEF3A
+65E8FB59E25C291AEC3158AE9D7C2FA661224B2CFB87970A84538F0370ED6DE4AC43BE23F914A4
+D67FC71AD27ADD384CE9099C65AD89980735B046C9F37CDB29BA5BFC3530CB1658DFEA94D70360
+F63781D87F4501875647342791EA609FD1CAC8A338BC25D296A80F4BE0A24A847ABE708BD8B7ED
+150C3E071BF0F8469A994072DCFC16BBA90FB24A71CE8E7F76ECE95DAA5BF3E78D0AFC22435753
+B94EA390CD95C19BE6C739FCB37F7051A879915507F6F4CA85CB9C5C9B1DE6EDC1A59D0463EC09
+EBDAAC2E5969658111004711C2C3769609BE35F8461BA30BD7E68321505A14B30E0BE54B29DDA6
+4ACD1D186E57F16A15A1211EAD0CC317B8B7705060E18140358F950B050A232E2E24FDDF74F90D
+F1D288F3171A38351A141DF305B3FD32F5A47C25337C252140D3D529700A391F5176134F6E4752
+7452F76E16B9D5025A0D9C4BC0A8873A9D8BA4AA0E323E1E635EE715E09E3782A64B1B578C4FB0
+489D594558A9DFDEC479A9898B3D2002EF6A3F0AACEFB4F4CD8261172C27D15D3C8A6D8BBF8550
+B5A72672A513F340492536A1C57EBA1E56138A6EB1FC138BAA1DEE14D8334BA2D8368E1B1BAEDD
+F4413490723E24933659A2C2AA76918B347ADCEA2DA773F4A90399B0D12E6D9697CCA9743D2B9B
+B2E347841AF2FFD3B2ECB2F52C6E84E249A98164940093C6B0F7F3EDC12FDB0E28458321EA539E
+D53AC5A8A6581D13899666E387F45611E6DF6FB6A912DF34837CD02A7CBD449DB6D76AE8E0B9D6
+674A78ED831CC52B501783FF61B3D6012C7FD091F78BE568A2D9CE4F30FC6B5762295DCBDA1F53
+54569F381386187186EEFA58E583D9476A4C2CEDC6B952315BC3AAA66AC4A0FF34DC46268C5B47
+7F98F170B5CA4CE9188FB5A7DE9B6C706F0E13693EDD06B359EF8B71C9CD93A55DFD9E9FFBDE43
+A8992E61E8037865318C26858FD577096730334BF64D160FBAB4B4A5D0E126E1F74F866D5B84DB
+3ED0283CC471ED7420D5C7029417256C39A3DAA6282A87C42EAF85EDED92D9D2C68B7508F9B401
+6C1C52576F20AEBF17D4FAC5D2C26C30E4F0B0DCF82914A294B01A711A06702946A90876AFD511
+E4DA8B1E2DBD6277F42BC77D6E51DCF5F682214D77BDDA36632D7024E05D01A80336C3BBA5D1EE
+6668CE16AC8BC11AC5075376590EC99818AA74958B818247ED7313B3D07D0D5D8C303483F0F0B7
+5B46246F62AEEC7DC00DCE07F5C4659B18BF0D157736575022524B7188F8BF5B5F4615E507C9C6
+8605571DF81A00715BF3D4F9AB6BC5CCFCC10496FD7EAE80D65FC97A9A5A1B82D85BBDEECA1E94
+0ED39A49C5CD3263FF051456CC785663437D56DF6FB1539C46C351FC0FED4F6C3B53E1D6010F91
+2B925DF6E2A25A7FDFEB8BB6F7FC2839467EB15668B2195DE2083B17CFB9A6B1822833DB7BE3A2
+DB6A97DEB48813C13D4BB2D257459FA71A67D1CA5672F01211EF9ABB0C16F378418F20C77F5F76
+2FA56B0F84DA79EBDF728CDB72277CFB44938799CF307E6ADFA8AA564530716D5CA8677C8710EC
+846C6E87E63BC962D59117B661D1EB2B16B8E13484DC1C7E6DF23B21C6AC4C69BF61C41ACF593F
+D36A9119969F5075A5D428BDB46620CB9B3BD16ED48E3E78C8A900FCD978DF20D16E2F895B149A
+53FE7AE1A14B0901BA3A9C2FEA002FAE3DD25BA0C1C1918FCF1C85751C4778B8D4FF71FD4275ED
+9C3E711FA12D503B0C05469AE2F0F82E9D6F7E1CF0AD5BE1BA3985CB588524AE771AD942A6C2BD
+8BBF08E9C77EA4BDD54820BD8A0FCB35A5C93C0E1A3BB507E003DB5941B7950940BBA323E45FDB
+322585D4792B5BFA97BEEC138D4CA56FA3022D3AD99E30F80557D9B531747E9F4429BA9809CB30
+D20005BC24E3A3488178526464E8A950C7D04C787225FB6DF51C3A38229C33FE52848F4DDD9665
+7B61FF9E0690EA6BB963F879D170F2EFD592D12731890BAC9AD2FEA407B161DF19EB30D6B833C2
+7ACBCE55FA0556E2F991564C15ACAE23647C57BF1885C1FD0A80C1A9EF044AF1F6C6C20B3BB5C3
+0B94C38F718696C127F3D0BBFEB64F6D2CDD82620640D7E1A7BC954D97D19B1BAD7B6EA8965E77
+EF54B80632B9CD9F8BB6028DAEE40D5965299407A01E09CCA11CC830B66135F80D5CFE6BB4CB3A
+6C8FDC309EAA940B1401C268C635AF7167B9CCCF3E7BEBA89F73B721000F8B0EC19B0F572A5B6B
+262C8FD862DE10BF92854FE705A5C5911AD6D01E83B9F15A0B7F411FA37DFD64608D0611FA75FA
+355737F0A5F1A2736D071AFBA31A2AC2F41F8748A9AC1D61AA643FF10DF9C7F0310B861F74B504
+C53739BF454C0BFAB07552B85879DBFE4CD367B3E96ADE0C3604A4AC44BA440055D572F06E86E4
+375E88A47DCE391EF8DE0C730D340AAA2BB2A486517D7A30FEF8E49B70094284FB20079BE3C8D5
+049F0B631B76D2DF986520063E0BC6AC94DBBCDEF79ACDFB022CB575C57AF8F4ACA52FD00F08A2
+BEBDDD5C7CE5F0121F2861B95C416F82BE06778D14275D4A486665A639DE1BE871DC7E2F8F0DFA
+340DEBE03F9C33622B0BE67DCD88760CF15732527B29120BAFF09DAA09DA45E32DE6B8A2339D35
+0C94DAA47D0C749C250CE7CB211BB390C521404E68F8FFF10D8CC2EC293A1322A3A6F3E3818D0B
+248A90D38612061328DE74A3D22D0BE467974BB7D3FB9A1937AC08A0955DE27876236AB3FB780C
+CCCBB0419C81982DE65ADCEEEF7230CD442C4C4A9C093AAE35A02797FD96AC49C8694FC72D0C88
+1420112C26FDEBEE7A305AC36D0658F01E1D8E685479AA8924F3FE5088642C02658CE696894DE6
+004CF81CF629C9DBDD43EA44DBC758935838CE09BB1F91250DE21F3B1AD55F3BDC8E6C95271DCB
+7811EFFEBE9CF3382176869B3A618E3B7BBAA72158B6AC5749118DDCF030AF00E74624F17D422A
+969CEFBF127BCA9A3198C2BCA0C8CCA866A809172E90E464733C9A270B1C3D2DFCA7FEC58CD753
+9D077BD744B94C9554453BA9D1BF9E6AAA7005846FD4B55CF15D60C06C3F2445758F28BD335E23
+5556B5C01A38A730607C3517698B63AF6924074CE49F290DF73CF429E6DF2FAE37A2CBC2624F9A
+6D0927C9D450BDB81C352FBE1D31871E7DDDBA1358532FE253371C8D2D8BF8C4CA863676D15E57
+C5321368FE4E7042937EC55138C4A8C27A6EA262CD0D91C0D2C685C0A066C21EC0209E391A5E2D
+49E2C48FC53EE4BBECFF04A7F8766681837A85238EF4B5A9692F28830CC59D70B5FDA03F42E0AC
+58A955D18D3596333C816F59D9E145095A83617021B47057885086A0348B573766CE83A8275C23
+6D0FD66F945C3648A154C23AFBAAA66FADAF1F8FE11921E4917558D001F26F984EFA75A37FCDFF
+CFE38BC3A587D49FDD012653EC979E65B8A52E461772A6F0C50CD9E1948FBFEEB9F3B217B4FF7C
+E5F2C86F011B8CFFA027499E5E2DA96D2C1C83E517B5B6ED1925259E97FCDBCCF1D84D0A63B4F8
+06B3EEBECBF6B25C52F78B81AD948142669990E80047ADDA3CB0B9125F1FC99F141581E0F98FFE
+91006E83866ACEE9BD48C5D79D8476BFE670EA9A60B4713D8FEA9A1A75DBBB3C36C69E2E9EE598
+33458FB987DE5E00733C954D610DA3C504A678DBF248E061FD83DE507D44BAD90D8A4DD5D9D92D
+B0C60AE2A706F7EF6FA4D17E1EE1F47AD5A399D5D53DBFBC651544EED9E39692749EC9D096B7C5
+E461B8AAF039F663B092B4D2E7A36C12A39A419CA6F3EF7F4D1D2AA1387B701030AE94ED8288C3
+BBA3D4514886BEC46BD8A25292A919E9893E7487512DCDF3B8269F6BACB5BB38CCF0801CEA8944
+F38209BBEFE1789B30069280119C67CC9BE0F77B19340466D2A2BA2C4B75F38A4F8AAA832F3063
+D93C514B7E1D22A6D63DA4CD7AEC46DCCF98E787BE93240CBF28E56EB757B3A8AB68486EC15134
+08680E0C765DD06C6339E87F8633653A7581C52FE8D0798664FEE6191F8CB5CBC9258E30FAB211
+6A6373890BB95884DE4BAECD590203EC4D8428007193C1113070C39DACE584F19363CBBF4DB4EC
+D870BA78008B2BA2E5D0124D6EE28AFCAE0097A8C7836DF5F6B2ACE881905C5765C5D7C68FED00
+D71A5C713335947713FDD49E117866F02C1A4588FC1518EF6E1CD9406CFAD6B5A9DCC50514F5BA
+F1B5259C93A8D917EA76E357DEF2B8D27DE40886959220898D59769523A74A73955842C0B44634
+7C9A1F335454A23C72F092DA2AC404CDADA9928530393880988810EEF73F80080011F1E6C3A27E
+E2804DA5CB3E1DD0CEA4D5B484F631F63474BD9EFB277C12A1F92A071A52C5E986E87EE69A567B
+44E6E1288E03D9023BA7A2222168D5FAB8D47211F7C52EE10C5DEABAC98FD192B609073F4225FB
+D035AEFDC4C9C6A042BD0A6D13AF241117E9F20E8E7CB2C068528D21D0F89E342B892A4A72FB18
+195D716AD02571E213373C608E13038D3FB474C0630999338D65C637FECCC5F1AF4ED5F9190894
+585989C690A83C63A0EE07ABCF2215055ED665D5423111218FB924C0BCCAE7BE3D634C9510D118
+E87B8AB3B7D92B8044FF15B7A0C8E1DD8A950D94958CD2082E8101ABA7447B038CF39D3099A952
+7E76B3CD1A5736F76B44FB16DE786063CA53D7F72C17326DA5B257D73B6DB82ED224FBF8CD8AA7
+42B2EA5126072AB706ED6F008DD7B59A274412BCF6DA28F9A3909FBFDAECE3F8BC302A94A6E376
+BDFF98E2B9E5C476C01FCE90A4E92176EC88FDE2A09180E0E1A21F597412480BF19F4D02CFC87D
+95343BDB16F1DA15BADFAE941A331CDADF42D591F0CB59F117DB2A1BB22D7C299936CB6DF37C47
+B37D4570C512142801E810BF82978CCFBA35761C64FB236D7CBA3755ABDB2FF5F94CFD74FF2C58
+E3B9EB02CBDC8EB3D1CF25D1460C3D8AC1FAB52410FBBBC323D2C1A99B54906E7ADCD33749F347
+51B9CACC97269AD7A879C646489A1794657BA4127F94CF8E266289979CDE7A3227742F1F4967F2
+5A49EBAB5E0B3FF4D78D558DC86B446553AFFF75B75590157EF4E4B670D4D5508ED790E39884B8
+9A0881CAF324D84772B53AE4080AC52DEE29C8506FE6F3AFDC9ADC7D1775DC59C83D09D9AEDD9F
+BC849545D80B11FD15A4FDF2ACBC494EE00259AC37FE497C6F35A4EF51B25C67C5212AE50430ED
+8D6BB73FC89E34F2E760296047AFAB9BFE89BD2FAB47E7639F04DEBB92208578E6BA025F180411
+1AE7985966A5D2AA7084640FD7C7F96578321D74E9B508903E6D5D3C16CD3FC9788FF487B31632
+5FE044A262CB14D4B97250A935124F8024D1340F58E6FD6D7B0411E3AD19E62522906BBDC9428F
+E31F00E1A0CD96DBE93F1EE73119AFE7C71F059A90D9DDBAFE00A4173E1FCF74BA97FAE28EC8E2
+45B972AF106D1FC0ED3574D1C713E0E955C4917745DE163E12B345B00A832F7F7B70CFCEB76F1A
+88C0CF050EC5D2C9331BA0D84B9BB9D0ACE85F021553DDB0EF3485B056421587241844DD64623D
+30C7EA91B5685E61D6D713D0867D8FF904E254D89B3A6F6E44239E8AFB210C2A5D741E0976BAC6
+5F07CFF611153E2DD8370D4E924459F571CC9D8B9C4BA56C0BF6BC1F6D20AA042CDB0EDD617148
+22A7A57F3B7030A9D055A8B6D5CEC8E83F471D692278EAA138FC371AD98D772D210B0F874799CC
+9D7F29C2349897B7C77353D86CE4D17F970531A57FDB7E7642702D853AB8DA5F580690262AC019
+BC2672A5238FE43BD2FEFF2D2338D71028EA1DA10A987E610F0C527D6C5E7D0960AAF5D8A77FE9
+88B1C30C6AE41A073DE7DE2053B99031214A3C69E66301B2B2C12770C070F80DC986F255D3C766
+7C4AC0C85FF653193CE6369C8AA8143B99AF8C21F58E08A77CB575369E455EB094F4D180C645C2
+0368477129CAE48C36F4396E82E18903313AD0F39E666479E88C7CA4F99089120135DBCCE047F1
+97FEA92C118A0C3F936E4D12CF469FF2C1546C6559ECDE6BC9ED971CE2ACEEE6B4541B97DB48C1
+491689E0CD883F221B58F2E3C13336176A1D2FD31524E4E56D5DE01527EA3BF596A9EC4163DC9E
+E300D6D8FB2A806A2568FCF190903D5FF08442C191980ABCE30178BBB7A0D51DC2F39850D2CE51
+8F5DAC1055CD93EB1E67AB262460646A235A14B6A2E2DC1FDF9079877D90F1997A01D7ECE1E0AC
+3C69979C7A92D318F6B93051CB55F1992A0A737A3520C553AEABADC17FF5603F23712E31985E40
+167EB338F9F96444B908723C5D906B67556B0DC088E808A239757304673DB8634E5B049A25BA86
+2491EB65EB2FD1AC1793BC94E806B22F06031902BB37F75B16E12FC28593E171F45E8B5C076370
+EB2522791038C864354C495FA67640FAE6296C953A004B68BAFDAD61F9C095768E4496B3120EB7
+718DCFECD3B6D6D506F32561E435FF2AD83FDCBB6CDEA0669F0345F651712FE000D80952151CA8
+CBE574B5828FA7D2599A82BD6B458B4F462A6C09F1D7F335AC4D8919DFC8D2BE73284691A78F83
+605E0E1818030DC666D458E168F389F9DC51A71F232C4BB3F1CEDAC17E9A751D2A496A49BE94A9
+D806656CFD620842FB76BDEE39576136D7D3B2DD8B1D2FF9A6A288EDB4128C71FF0A8BE2D140E7
+B2DE893BD3F1878631401D13156D6992FA8DF287978A8AF5052A33E7FC68EB9D2487D47B0AA43E
+B25625953FED6F4AA641604367E30E94BB66CC4EB3EA2497DFE7CC0874CB031A0635AAB2ACB504
+E70FD9D9C1F1D634D041425688DC6D4669E9ACC514A08BEC99A7F5928E98943CEC9968A09BF757
+38AB42F50308407B95DE4AD69EC9EC52D1E9C589F8B52B52091AE3872812CD55F633DF67209A25
+9FFAB05696B34096EE79AEF64B59B589E2BB49E2908FBA309167DB66F7F5D47C3873E7BD213B1B
+48E966145D40DFC0541FE4F3C382A8E15AE837DD4C7B92C53E7285DB1FE32F605B89AB71DAD229
+D4921534DAB151E4AF32840F33B9C7F3866ECCB6B53D232934CFD94C8C59BA87D62BDA859472D2
+B3CF283E94783B1D3BBD1B35AA9C10974011BA857A8772462F1B2AE8130E1263BFCE41489F5532
+3CF207FC6F8B299AF55E6762CA918374FECCA6B5B55F2732FD908D25AAC3E703A05C0D6A70289E
+ED5329628E968989AB3FE634F471EDECAC8F7056685B61DCEC44772089482AFA3CF96204E0440A
+04E570C105F1A79F592AC40F5559FA0D29178F424C0A051B92E4684B6E90DE462083F33A7A08B4
+63E12BFE98B2DC6021FA61140EB257FBD66F085AAAD4C6FB0C089B1FEF91FA820B7A2DCDA6147F
+AA85C6279992741ECAA61EB6913F437CD0E9D94B54319C12BA6EB71D8791D04D40DD386558FF9E
+DE3883C324528EF3F428D01A175B7DED3A48D184420DB29E352D025FEF804E16396F186FB68775
+5F6C9277A0555B1D4FABAB02A6D40AF88BB5C9D82C32E577CAD2054FDF64ADAC782FBD31593A6A
+65DA02FBD1ABD742C73B7634FE90DCC689489780A297B29BB3C175B3448D331B73F307751CEF96
+BB6C0C48403B1A0C7977AD7839111486EFC50AE2FA28666A0AD657F686018464001811DF596F8C
+E4ADB26B2F717A2C520AA033A184048ABD8C9DB5D0D518B00AEFEC2E6E0507FCAC2D5D09AD941C
+8B04D61233C49770640BEF7CE0B1E1424F191680A0FC4E93B5CE99A406E262D325E952D3F96EE5
+A67E22C686170726A86B6C5C72F8A8511AA6F92BD57C9A7524CE47DB120AE506E577106DACE83C
+52595127133D310397646E3E75A3B9D3B2F49C2E7DB6B0B0BE7F0392B897BDCA28461A272ED2AF
+E554A375CDB58649C07E6FB9ED7EE571FA41B8B0A7A6EE02667449ED8C079B688438BB0FAF2169
+40AA668C7771D84D4FABE67A893048C3EED90182CC236CEB3A2EF960A92EFC282964EFD400EDD4
+DE7B86DF8D18E8100DA9409CE31FE6B7360D9238DAD7590FBDE2E6686CAA620E5B578596E810E6
+AE10CA734AEE65FACEC38270F72A484C6386F37BC9122D036B531682B16CCE84C2038A58324826
+D5FE912EF4A17B59075C8FCB2C949902CBC3D948B1F8EF3EA31F6CE0E4352F3D643DF65116979F
+FB9C6BC403CF123AFD13364947D9C1B95ECA218B17F8C515108B9527E4390BCE3A9AC2C2100707
+6E97A45317B5B56FB1C582985C853A4C0C88FE31BC32E497DE73C57FBEFBE91E549C3BA19486B1
+60B5A5C3E05300E553E8036C4D831F4A65AE9D489BE07EE4BFDCB3543015C173A416B1696093E2
+DCAF9410F4A2DA057162B0193D3C03F600106F767E245191CAFBDBDA048CFE83C441E3DD223EBA
+0863BCAB6A9BB64365CEF19CD8EB1F328B17E2A3536407DB189CB5D4C8FFAB9CBAC077F4041EB9
+A73AECFE166891570C0747E94E4EBFF4914F1B986364817231471AEA4D2136FE16A83BD7CAE91B
+721499F40F7D7AA61FF7864FDC514CE91EC8608A135D8DAB5B0FC96F72362994E5E20E328EBA8E
+58F0DB8835FCD34C1757B99A98202AF46DE08761C367B2C8FFAD3063CE2F1419DF8E01CE2AA8CC
+C7148BA74AFC479746419CAF20E4E195AB8BA6950C24DF0BA732192FD61B2CFB8A65BB9B83A9FE
+9CAC67FF11B57AEB8AA1CF29F05D3A8D5EECD156D6423ADCBE34C2BE9E6E7D6B5F7551763C5DBF
+AFBD02021310B5E3699436F86F449A1B8A9C9E89C39F541FEAA3EF045E2E5088388618DFCF52A5
+7921F88D6C2D2DC2C50274B46EA6900D295720CCA3B23DC55E0B03C30A74CB9C8F77E95A3BEAD8
+8CD80B9118CF0E295CF02AD0CBD484AC35C804735A540E173D4955D033EBF28EF625403505199B
+F1B82F35648B70345550BAC06F01696C4B81C27BAEFA5E7A6A0ACBEEF1D6F83B0707787D8E98FA
+DBF67B75AD26538D7EEFAAC57DEC507158DE3EA39D3C88D3AC9E73AE988B1790C343E49EBF0070
+C3245FA4BE1480DD9E041087F87AD0520791D9BB20AA78FEEEDF0772E1749F5FD4F0FD46265B73
+815CCDA191731F7E973EB698D3FFEABB83956EC55D6A7517643906224EA5C8962DB69EB0EBBD38
+66BC8F4951F9C6CC0C156F514DC6CC91F4E0AD9AFDA4CE3D4A67E1D09D29D9B7AE386CE2428AAE
+6255AC616F9681DAB06ECE72282B0806D82947C2A680E8A3B56B0538A39AB4C55B9DB329697234
+FED1FF4298DDBB758F5B79979109A8A37CE495251311BFFBE9E0660B80C41F9A61CF994F3EDA36
+DBD67A1E44FA9C778A34E5C974E82087958B23817CF594718FFFF3423DB1FE5E7ACD4C4922402E
+2178531BD057406134E8F65CB088C3B9D40DCEA5BE9AAF5CC8E1818226852442A7F9E593688F18
+1CA6651D1073C402EFDB48F0A177E654B9CDF18B3EB01B8B70EB368FA25206DDA4AAD4131503ED
+72F6EF1647101805A062140F08B74794CEA728087D532A5C96B89660E664024D1F0FCF96447261
+32733580D9EAC90466ACAA47F0BA5113B9E462C66F7B17DD46F6EE4E1CC446EF9287A947FEA7C3
+0F4709A72C88E7C9BEAA57FAD2A7FD53EEDCD929D7013803F481F982737A6CC1879E5D3080EF8A
+4B6759E75A56443D49A8F2CA2CC55D1FB2DAD56D5B5A0D7C3C7D0A31BFC7BB377FB52DCE2C8E99
+CD3938DA37177ADE7F069E92A6DF8767377F30213677EF1C20B00A4F5DDF8E12121AA48171F7E8
+DEC03DBED1C65067784A79F0389C1739E633BA9D28EE2CA792314470255BE7248D40E3587C0A0B
+B6DB277A41BE95AE6390273E8A0B07FB13E5B530E27227F48D1298B40ADDE2E7035F94D10A2A50
+AA3A3CEED67AE00BEEAB2D163396F3DA8F68828FAB9D5E9615BD0A302AFE9775E684BC97121D80
+AD3B42C18C37FB1DAD5903B97E892160C7464813D891856E08E1ACD27A40760B7627A49F58F7EE
+8B3D3660C3DB676B6B9B71DF2968750B9F1A80DD62EE3BD32C3B47DCC6C140E5F11B27F60F7927
+F1840E9C6EADB2D6D77A1C4DEB0FA8F892B44EA91AA4094C908250B6F4F6AF2CD54AD502384C9C
+AA119D4D06DA553B03FB85AFB400F78AC92D8788DAA55B1C31944556D5ACF3AE6B4C58066E5CC8
+D618A8A49B984F703C797755145EBC8662AEDF8313522DC68C6F14C053708FA4DDBA689C43C77D
+05056D8E55E4AFFE1896E0A6C26FF013ED34E9FF62AD8C7379F6188CD1EC8AE0EF98FEA0908ABD
+2BB72119EB4D4C747152047E26AD4B14DF75F09AAA6157BFF0FB8AA220D96F2367280FF2BB17C3
+A9A738428BFC2318757A70E80E6FE8570787969C8AEEAC42A75677FDDE995476986E9EC26D17F7
+FB5F3ACBD535FDD13853DB3BAAD3F2E24370A4E8837B3EB483C395945722B35DFD7E2FDB46F2ED
+44909C5DEDA732C2039ED60989264739690320E034B23ECEF5828BB96F8F2BA4397C7B68B7F72F
+F82851184FBD2C4C392F3B5C59E5B4EDD83353CB47FCD432AD7AFC3C7E26B55928F0064993DBFD
+9FA7E89D665C7A041C18E1304D5DE61801A0DCF44D7E317954ABA6C94365661347030CCFCDFE67
+19E6722145F2CD8E1D92AE1D78C60E301EEBF94B631032E0452206B1F478B3363B7B683EEAF821
+3B8156D95EA88CD65E6844AFAE9BF59F61649AFE540A9FDE690FD5F5C328E302C9EB43456AFC10
+7E3296AEF81303FCB9CF186A6C96FDB7513D2F6F84BE3EE195FE18FEA6F2EDC04C44F266D8220C
+C201A5C84B9A81C2437B8D2E85EB7992F9FEE955FB316EA6BD40E7292F6733B9C561BF467FDF52
+B7C54D3B05D6D404F3348748E3D0FA42E5BA7BC2811139A7162181B5B13E9921701C60B0FE3F08
+9EFD39BEF19E4C8216EC556225337CB50701612C86EA1E0B85B9447D30A850D9AF35E039A1177F
+E44023F345DEDEADA693EF0FDC26468411ABAC5EDD43D9B81B42F6E4DAC35F4C68B25096004025
+87F4AD458294720EA0038D75092D449980584FE7136E22F9C170477CCB97E543CB997F84331A0E
+5AB5051B7143E86E80D13F163FE9D0B90EE9C6604B71397210300A1A098E70A27C591941A20463
+C242F2087396954BF9193E634998AAD4EF62C4ECA6A5A6B4FA755E9680F427D86A06BFE58AC515
+ABF75AC0D8F2843B39699850402D84EA6231D69A9F74F7DBB1311358AB6EAF9B965F2135257F26
+A328482E47922F23364FEC67DB123B0732BBAAAA4F88B66D08D6AB23CC9B123AE8B652378741C9
+5DEAAB8C553857883C37890ACDA07DA6996B3BB11E8AAA56F7C0BF9896CE207928BA8478F99ED2
+FF729969504DC5901265184C5606EE177FB5ADEACC7B02388D4E960F0EC674726410D099B490FC
+6B851CF9085D8BD736F82E76DF6DFFFEF79221D00370C6EED9C23EFED4FE3AB85D0A52B32B0C3B
+3FD5987A39B2BF2C89DF867E07A3C767A25F5279136E1F2E0B8636F9ECA61F03789D2ADF3C9739
+5FBA915DA068B96AF8C8F12F1D5E509B873574ACD34F2593EC309CAD1452BDCBCC3C30FAA7D023
+F44F742ED67CDED191B8C6FD26FC85E9263D174B9DE982200E94A6E4F63FB0ED4398D4A3906D70
+796A29649F70D77A8D63B1970D609BC84B93B1E4583FB5D1849C46D6C00B9643ED635626A37088
+36184EF0FB6D0DE5D537CD398F9A9361BB33DDC174E2F9C4C6D8E05648F2DE96FA713D8502678D
+D64FB9B5597F78778A22D1747EF5B40913390ED8D2704A83362AEEFD90AB39396273826BED27D9
+8FF6B4AF9700D3AC5688BC4327C8EB6973B85218C0D00020B59B57DE1735A2815372646625076F
+5278E827179D08372B9BA679ED92F3FD55CFF8B69EBDF7F8093703384E48D974AA64C5CF88C1DB
+103CADE052E80605E70F6ECB32C4639CA413744CA95E29F76DE480F988CF2B52C1DB780593C310
+7A4E8C7914DAFC82B98F853981FBB896DF909BABC9CC1A1C008C3ECFFDDD656D481D7DFEDC42FD
+C71905F15F665F800AAEC67C03403A153D46B305A45A1E05AFE40BF394D3C8A071CD5EEBF305FF
+5A371BD1F117670DF1A49C2B5D1CC83DB21FD5389BDC26601627D729D6D2BB18A843F361CCEC75
+D151A8CADCF2E49A33316165D44EDE2CAFB3179E0E2AB8B5E0A3DC050D986D073BC7413D036AA9
+8962867022EC234CDDF1EB6769054D8A2D165A873164946C614CB9AE481E6B55B2801D9D6114C4
+F3CC16833999E6662FA63B7FFFFFC21BD209B69FCEA1C26B905362105807F12C9E68F9FA012E6D
+C8DDF21969D38A19EAD13C5D49407DB5380AC40902044149070F9D7D251895CC5F8A597F45CF23
+7692FA7FF33355A31E26E7BB97CCF0E0DD2AA36AB210268836E819E45DE8518C8EE54E1719B483
+1FF5D90DE03C4E4C864057144EB4654B908EB052772160C8ECF1F862C3F504504F9E15628A4A4D
+16B01F543C677ADA28A132F8BF5F758CC086DEE7C146B83B4C6476C3A550C6218675F4C33F1ECE
+DCAB0C3112BDCFDD94A3032A73C6124451397A08EAF12937E980425DF411FA762E7817755EB367
+1A999A785D410301145F7DF41CDD1E3C642ED64B3E3A352D1C65ED1E62B2C9F40C9398CB30F77F
+7EA88CDED5A5D51106D81DA03475B3F2525DA1AD4AD55379682868E4B37897D04A8BAE8B474A8C
+60A51695076E91FAF2FD3E6FDAE7A633EC5A83242E224E1546EBD0A6BE6A1C21619A5226BA46DE
+C4A93E212FEA0531C74115BD39C52665E51001D9D0C01AB67FF7E3A25D4D644BABC17EA0300ED6
+70B5BF65DFB5F3DEE45189F185B494498A6C1ED336C60901A8E36AB95F56CB53410928DE6816E3
+CA8FCC48C1C30B86CC6E2B3E265EBD4C5C888574A9987A037053B98BD86AD429CD752C92E38982
+4E9C1E441828C53CC495BEDAB0FCC65612F4BACDF7566DC2D9794275D3C64E88E4A70886FA6C06
+F6E6CDA24F4C5258D56E3E0F647325C176D28287327B6486818334B4BEFC9226FD828184E13A7B
+44CDE166E10D44EC74EB1FC336470717BE9CC57B6DBAEBA117730124DED41270AA7A20D2CC5E82
+6F8E3A56B246E9EF62CACC7E4DFBAE4FC117D6CE6BD747FAF7E65FFAB333BAFC276A8615E36B2F
+9D2C245729CF4F37A85B67CB71C33998503C619321A3F1E965FA60CEB0409780BC2C85E141C044
+1A52DC12D01583932E878BC3898756C8B70615310AB72E0032D58452F0844553D86BC4710BA757
+E0F8B346F08CEF5E11AEACA08ED7923116591DFF79A2004AE9E36476CD523085E52BF5F584E99A
+A8F98416F11E7BE5CF0ED19B9ED53A8F5FACBCFE684C67AA615C58969FC9778C170D5AA4B495C2
+7FCE92D4BBB4A6DDCC03D57FECC625BAE1F8EF1BB450A617828AB945775A9A453CE791D118D7E3
+82DC1777BE65E6E8B7C5D6D53BEA31A4849314E6AD576437AD7BF724CECB0C5F82ED0CCCCE6A2C
+07064D4857001B3BC90DFD3CB563750C1F85E1BEF1D504351E02F136A6846F3E3766CE83A820B9
+B00E4030E0D0AE46D1259ECC0F222FC261A59D458FC690A4F3AA9CF130C75089706BB44D0E11AF
+80AEE0D30AB29AAE0C4F15DC3EACFDB17F2C398B32F1BEF376003ABC5C20A093203D44D3C1D3C9
+6730A0E2DFFDEBA332266CE06F31A3682230593B1441D5293F251509B06F2A623997A6F2E9E4B8
+F98EF0FCEB693AEBA92FE01768EB6417610228D5F164775FC17579D231AC3F37A781B960B2D28D
+F7ACA6DBE948731798A429A8B13A9E50B55A39CFD2538214C79C6A6AEA31B4A6E00CC31A59A772
+2B850CC0E56F624FCC9538EA5536A1129D3AA5A2982D4A09BE412E10263225FDA8EA1F8E42C57F
+0DAB402551A3504DCC450516FC8BE30B4835849A969A30986FA1D70A35159DC3838ED699721F10
+2758530FB4DC7D09F9491D6651755EB0A2297B4ACBD7D39A5FDBB18C09860EBB8B758AEA34934A
+E398402DB1E678368AC44F3EDA1D0D0D9D4F622098A7954DE9AF40A4BB212036DDA8A547883F09
+EB4928ABB2FE16B20AD3C4DA1E433DA1A6A79DAAAF015AC57988E75428D0FA0F2439BAE2D632C2
+46C9518D02D8AFCF2BCD48B6ED4ED70A6E84E3B41C0C4C0A3504BBB7C8B1EBF881211BEB2D6F5B
+821A773211A4275A88ACB6802899EEEE4E749383F4C8B05C364A0FD51C0BD79A29A44D79614CA5
+88142C955394E2E6947EB28568E84EFFBC1E53126B0AA649C5DAB9FD3812A82F36938DB423C744
+787DAF1E3615B14346FC285AFBEFF55619CA9C42FFEF7249E963A4940BA5523B63440014470723
+D98680E944C61D52C24C93D8D310CCCA583AC522257F9FD187239C5CD8F6C8F3ED9147EF975ADA
+69C88A6E9837FC60EBD23BF6353B191B9A60D35E783D9C404F92860FCACCEC13A520D874413DFC
+9E49B9665C6B4E571DA5F798661428A59B3E85DA5C1CF692794A19AE33921341D21BB8D4781D04
+704D31D3698CD619E18F671E767307AAB05095A47BADD8A9F3119A3BCEFCFB96B67F19C285CD45
+04479B251D4C1848636F7AF7E4E2F3450523C66C06ABBF9EBE571BF6079C53ED599684D7017F58
+33CA60357274C5D77BA844613955DC41F1257B8934D89624C66297AAA60FA3D8FE51B8071A55C0
+2B974BF714A4787154E2BE39EEA83C9CCC78E179BEE40491A7B1A69E9769065173C888DA32BAE7
+1C48A75B1ECA34460C5E7FAE5A6A0897C716A938E503D7569EEE2267314934144DED48A7376DC9
+95F1C3B89CE79946A39FF428F16CBF65E8006C9A1CBDF2D7553D4B71F884408415964AE608390B
+CA3901704E39A68928D810C8815CF7A86FA3DE326CA7D506FEE41CAE47731B2834048D25FA5F93
+78F42F336F89062F42FBC4ECE7A2D005A72204F28F0F0DEEFD83A7E2123FD8374E9B24109E00BE
+717395EBCF0692924216E3BF281AFD254E2A68FCE1344196031455C86E3800CF42DB12F84D03BB
+F9DCC70446B94AE2F67CC4847378F33FD748C76BD7D70AE4D03AE6C0230BCA80E436C2126940B5
+CC9AF92BAD3B7D52BB30A24862089644AB0E8815856B4AAE6A930240F8B6E357A040907A3D3F2D
+8DA2BDA625F5D4A2C2D7DCBA663EE58EF285FE140BFA75D28FCFF911E4F19819970268494C8285
+EBB9E85A662302D91D5B5725D508F55C1EFD3090305A904BFC3D9A7CA9D80DFF1EA435A846437F
+86DBCA41BE2F5B4C63588E3FAA3AA34EE18AB77680F551E0E81F94822ED3606A36409FF601B7B1
+2D5893C206B985F234EB22D8144DF148E73081A4EA57308D5CE68061B213862CF80C8798ED436B
+98CEF59156CED23B0718D240B9964074BBCA5EB0BD2A4F16651755078C28851D9575DBB137C2F4
+3B4AFBC5AB51F921BD6D50CA1A12B2F01C0D6501324C929D2D8CB56A83C82FC5041A4277A07EC2
+08612B09BF3D963D3A19CA82822DAA99699CC068284878829A27BE978C031EF4CB21E0F8886FEB
+70BA0EC4A6A906EFB02B9F03D0058ED7518F7343D1A6EDFF6D3912A82939B3CB06BC34F978555E
+749AA8FA24A7F9FC2D594083D139FEE84EC6523D878172D8E65BBF5FAD490090094A49456F4CEA
+EFE5413F93E50ED2AC3CB2FA53E498671F274EDE57B451C541B044282E4AF9A3760762EAEB0835
+7447709C3311E05978E4EE8CFE0802F52ED18C051690F1BDBFB0AB8FD9017FFA728BEDBDB2430A
+147847EC3711232297B0A463A705C53A36D7C6FC08949BDE34D494F550256EB1E083BBE7F5C703
+514B16AFF5D1930B3DACA9FCD03CD06409E51FEA90E950C6D93A8A1E0DC7B2CA228F56EC206860
+C8697516327C9D31D23D59F80FE2E81726DF71B43D67E94D00E841B5BC14445DA2E194700E5A60
+98EFD9983507E8AA4CFCEECC8BB43E41671B0AE88D8B0F5397F2168A2A7F5C9B9F2A4338AC7F88
+701DE489AE5932AF0AE9E4817C4C72ABEA740489E344BDCBD832A3A8B6A9AD5BCFA6A93595D2F8
+E2A784D313E058C60F62535013530C77B8559CE9A91F2F1569ECEB7662C34CB86C0B1579C83A6F
+71B3D80C2FFED3AAB2D76E71EFAF3287AC7710B9879D65298D28CFE6EE1E3714A96259D72ECB44
+838AE9623CA9D4F57CAAFCCC7EBE292C1D2960A51DE1B4AD960650DF179115BBC3B78BF5D90086
+A503818AE875F025BC5026061453503D3AA579CB0E9C809E31E7512480BCE4E0CC1C69EAE3F202
+B2D9DEC3FC0A23D11B906CD73E5B735422371413350FBFAFA051584E1463A94816DB6BB48ADE15
+5D9A1F366D3246E0645BFF4959C6385344A9A9FFD935A413A27BBE68CEF39C66DF14F56E36FC9C
+90DE20E82E1E5AAEBB441EE68CFD766F410C1622F2C1D72CC428F12E99E02D2C733F238B9902F9
+CE1D502D85364A2C4096C4FEB1639CC9D69F92D12C7AEE78D074B8808CD0BAC8086C401B0F4CD5
+0E49304ECA860A49BFF8874F2318561689AB5F7B2E5F1C5272FB75D5ED19E4136A91A3AF905856
+3D4B83865CF15078CB0C2B967E3AA549DB591A3EA0C1521DD7B2E222C171BF8EBE765A32A4A578
+4C611BA2C61B241F2AFA40E49712C919401968D84197A731B799D5397BD2B937329D299C8F0047
+DA451992E606BFE30A8E1814907A87FE84119AFB93703D9787D4C1C413F5A76236B78AECD7CBB5
+90408A312F60BC1BB63423E10312C80A121A154722994138BFB16B0393A07AFEC716EA6977071A
+22AB3ED600A094E5C6DD73F6D7F0AD132355E7AEC4E301E821E11FAAA66D70A8E3AC5253AEE552
+186B6F6378B62C14EC41AC9451513A4B27AEBD66959C41D778F3EE8C6597A0E2A48A4EE9D14F2D
+A3802830D791A3D045E94071071E8BEA8233805BBF35906CE76DD68F0B738A042708D796EB4EDE
+C17CA860D8578157D85F550F31D3BFA8D28B763E9C634F61F42FD978EC125E90C71E2F537EFAF5
+283D4F97E572F1664912F61F69A1BC5314076FA5211C400DEA3C4132AB9CB8192080D78B7EC39D
+14FAAA15298AB6C80A800957B2BDA1B2705FE6EFBA0CE5855F7E746797F964799EEC86675CC0EB
+30B447839C99713D0D4D665D0F1BAC68DAF266267A57AF2CA066FDE9600E4623613B4564C58A6B
+7343AB9DB446DC7FD45795FBAC9E7A7031AEA78EB8507BACADBFD9390EB90FC198391CA7E15CC2
+9B7C7DC6964E210FAD7808E92397B86E25500354FE8F749ED4C9A98A48B6E5BEFF2B2D6D1AE9EE
+19F82E1A144192CE87E28731AF8DF82CDD1953D73B63D54416A87F4FB927F6C99EA8EB5291B10D
+C519E5E60F8C5DB071F46F1A308B8F7DFA353C6CEF2578034B31C3B7537568B4C23657775503CB
+2F9E829D8B5CF892EC4D405F215AB48056C1ADC9E2D7195463DDBCA169F84060C6BA9D89D3CC01
+0A58D845F687B148F35C17CAE7D627E63616C3ED8E3F7FCA1A2A894E0A11918F25C97C608B02C8
+94AECDD3981577E0F550145E18FD99EE2ECDEE940C7166BEFF60771C04C8093A0E74BD30551793
+15358C2203ADD885313B9C4AFE031A15116B4DB5641871F6078BAF130457D50547A0FC4872A9EC
+C4C8BAB98AEE3EADB728523F5A1137DD046CD438E3D6C1DEFDF53C667A76570EC5F2BEC0DBD668
+5E18B204685A3C29826E79CE98555295CD1B17B29B46D52AE264C5D713DF91E38161717BF1BC52
+FCED4EF0F9E8E7384351530E4E1FA42EE19403E64D2B8C335E4585A32FECC7D3860819ECC40484
+EAF73F3CD89A56C7D2EF439C8C4E773C136898AD7492444FDA8FDB8C35223969CBE88BB5998C2B
+B30F46081A706ECA4635B16B0EDE89901B3A7FA30A87AC59F0E3242314229267537F9F4BBFB5B6
+29C9665AE09B0A3BBCDFFEA35422E7ACD6776786BC165811A457AF8FD7BCD4624FCEECC83B2416
+B225A6047E6103BB737A668E6EDBC8825302E013B73543A6114132CFFFEECD1F9A9E2FA449BCF9
+85BCDBFDDB0AF49E2E42AC2511D4767C9C63198F03EF3733F3965A2C057528644179793910DBA4
+E78749FC2D2DEFBA1974E3A16C06B97C32B0DC0BCAC4B76564F7A1E6959B26CA35C806C11B02A9
+8D32629F3CC7C90786DB3E1A70C7F3C43906860630BEBF14CABF8B6D694B27138D633A338BA1A6
+0EF170D8EF499E3FB9D58C3C723A4293D4248AC65741884D5929B77EFCB3568500A991C00B58AD
+2BD6C4D7DD017B05D02FF6E21E1C0FE24824EDF08945C7C6DB0EAF97200D3F0FF3DEB6405A5E9C
+DB4610837769F1DE543A137CB2508051E95C322328E550BEC8E72EF8CEEF6F8EC850326CE919EC
+2D66D961A3A872F086340B00ED43E63D714F2B26BF48D1A934411D909B4C1BF3B5512638036326
+5E2C49843403EBC73B3D5BB924D285E9F4B2DA3ED5D25DF840F95A089ED664C47B4ED2067E7107
+D5A83C5C25E981DECEF5C42FC7E7E210A1415FA477A5BA8DF602E04B026303757CCCFF6C2EAF53
+A95F621469BB567842F70C2D26118A6B017AA2D8DEB49DFBA75E8CDA1A6980408071A8B3152B62
+8B5DB74790313CCD0ECEBA0BD8632C7192853A41BD44759009D034F25EB1AD27A12630128AB4AE
+A7FC3B39B6BA97ADE40DD2B76AB10CADC51978D5F3F366AFCFABFA031AAFABC1B8309571DCE7EE
+20710F7282C77DAD16C1917864109E40D1B789356E45F8180126FC628850A95FAFD346B9B386E2
+C5FDAADB80844361C5D65DAFA9E305136624E7AF744E8A6831639C06C74E1DFEE49E52C3FC77FA
+601F194D97FBF6D8EF0F948F8197854CB5C7509375660EB1AFF2C385966225CD1F7566895033F3
+C4DE4CF0081EE470F4AAD53F3165939CE32132509671FC167E8168C8DEF6B595F7E32CE6EDD833
+976F27556545C800B400F31173570A54E824CA84093346AD43761204C2647F8A105A5646E7A5A4
+0697BEFB5B5E50355A84B9F0AAE34EDDC377F3AB3A6D922E2BCE9CD5420219D0D5DF8B1D26A719
+2E20D7A1CEAA433F058E34879748CF4CBC1E6A6725102D3375EF3D6785A753F73E92F78590015C
+2B3EB46F173A4CAD6E397DB0C30BE0EE57DBF27622A21E6C465C5EEC4B07112FC2D3259214E034
+229E2CAB1076CFA2CFBD0902CCDC5492A3B4C3233CD4FE6786077898E47411256FED19766B5C12
+2EDAF0206AF06CF8158A38BA554C1F1024D781BACABCDA739C87ECAFA132301160822F3C58C3A4
+B760464A89D990AE9CCEA67D3A5406355E5339F699AC6A775F15172914E55E2C8F8BB2EAF2FDA7
+E7D78411DAFE61A15B9858E980183C13F082C69D4E996DC59D5BC53AE66C50B2713510A5346FCE
+DC3A53FF738B3AB8F6E7F12DCE034394CE40490D95FD9F5F484B4E965B1A39996E3F0DD6E5FA6B
+5C238E858B92EB4E9F4FA3310F5E5135E75A7806613414C6EB5191645FDDDE7DA90936E1D4AD4B
+B096E47A5575094AACEDF7A8AE46C1572BF6C273CDC7DCD2E9845AFB9E5531E91C21BA0FD3AFF5
+02155654713ED807AF7D55EF534CAE7456FA608A3C270018A85D80522EEED986BAB71CA2FF56F7
+A5B1DD9205489BD0E19C14C585F56622EFA9DDACDF3D1C956B2BFA7469EB513998DD71B0C8745F
+F8665F2926825FE1
+0000000000000000000000000000000000000000000000000000000000000000
+0000000000000000000000000000000000000000000000000000000000000000
+0000000000000000000000000000000000000000000000000000000000000000
+0000000000000000000000000000000000000000000000000000000000000000
+0000000000000000000000000000000000000000000000000000000000000000
+0000000000000000000000000000000000000000000000000000000000000000
+0000000000000000000000000000000000000000000000000000000000000000
+0000000000000000000000000000000000000000000000000000000000000000
+cleartomark
+%%EndProcSet
+%%BeginProcSet: ppcodbol.pfa
+
+
+
+% Generated by Fontographer 3.5
+
+% Copyright (c) 1987 Adobe Systems Incorporated.
+
+% ADL: 712 288 0
+
+
+%FontDirectory/PPCodeBold known{/PPCodeBold findfont dup/UniqueID known{dup
+
+%/UniqueID get 4303737 eq exch/FontType get 1 eq and}{pop false}ifelse
+
+%{save true}{false}ifelse}{false}ifelse
+
+17 dict begin
+
+/FontInfo 13 dict dup begin
+
+ /version(001.000)readonly def
+
+ /Notice(Copyright (c) 1987 Adobe Systems Incorporated.)readonly def
+
+ /FullName(PPCodeBold)readonly def
+
+ /FamilyName(P)readonly def
+
+ /Weight(Bold)readonly def
+
+ /isFixedPitch false def
+
+ /ItalicAngle 0 def
+
+ /UnderlinePosition -90 def
+
+ /UnderlineThickness 36 def
+
+end readonly def
+
+/FontName /PPCodeBold def
+
+/Encoding StandardEncoding def
+
+/PaintType 0 def
+
+/FontType 1 def
+
+/StrokeWidth 0 def
+
+/FontMatrix[0.001 0 0 0.001 0 0]readonly def
+
+/UniqueID 4303737 def
+
+/FontBBox{-28 -288 631 1046}readonly def
+
+currentdict end
+
+currentfile eexec
+
+D9D66F633B846A97B686A97E45A3D0AA0525392EECAC163E584A9104D99AD0BC1B1F3F7121D1D0
+
+F2C60DD206B0D3C8C450620B47320CA0AEB8937511E456AADE8E66B301B1E3E9DFE17E2F79ECFE
+
+A709FF3DAE19B4C169DF6773EDA414D02915A6F0FAF8B24FBB0777C697BE8A37D63A390AD9DAE4
+
+95BB7E626721FF2FD3FB147C80D22BEAC37C2624D818D58C8DF0209F5CE76ACDDE57A303D9042B
+
+F0A674D095697F925F532D1814BEA8F8A5B5223A32BC4A95402F2C843181776EA6DD8FF9EE5F34
+
+89051FE34AE898ACF3201433CCCE8B93D5627B76114F999C81A0C554599F115C89AFA9221F963B
+
+6A2DA89342621244ABEB0E794C885F335E4EF8188C4B15B1E6630A405DA50578DDB37C96B3C8A5
+
+6A7F70B55BC23606EC03C231B2380A83E0F0467A4C6F858A0548AC5AAC2F1117E7A4EA7A8C52D2
+
+01B33626C2BEBCCA6DD9211D6C88F609BF2C6B133E55FCE6D8860090AFB3C065835D7B4F34AFF9
+
+D8E0F4E0841E4367FF8604092704E1E3626FE8CB4A48EB13E45CBFEECBDFCBFCBE64323566C437
+
+6AF858ACD9ACDC42A1C9285F253C3113122BC9AC460E2473581F9C1F210B6FE7B9D486E6C96BCD
+
+0CF9C52A89D2FA2D30D14D0FCC9A2470A3B91A0CAA9620CB376C417573860071332BF012305488
+
+2289CF2A52934FB7F32BCD94337AD1EFE57BEB43E4A661FF8EF5DBA38FA3C924E8517AEC114103
+
+11E79D6DF861159AC74C9620888EDA3AF4CA08A15623B5F3D1AEDA88B1BCCE8F057173C0337C67
+
+CA2A599F1F4BA039BBB26179F54A57A8797A9C4EFAC228FEDF1E2C50A951EB19770525AF2C6850
+
+5660A6C5F4E7C7AB39D5755DDDEB1BC4D04EB10CC09F907E6BFBB68807A874392E443C9867046F
+
+4B020E5D79BA450B63BDC0FB38AECDEA91251673C5327EEB74821505993A490133B73F7A4D90F9
+
+9D4B3778E50274762FD18E87F7CA1D009DBF4EA8CDFDAC1494B7E78C17B43A9DBCAEE0CD5FFBD0
+
+E0443DB5CB70E71D7C95AA35B42CF90830969A8C84802E49EDA9528B7D0FDD9175A6D41F7E3496
+
+7B2E93815955A9B14B34D2A37E6E88F80C7C11DD39ACDFB1F10A1237A0FCB1BB37221F7160ACA1
+
+9037AF794A3183554C07C03CF9DB3FACE33A2FB584A30A81578E99B6A625861D2D2957D5EB8789
+
+CD0934A41FCA23C935BDB7094848B0FBBC592067A34FB3AD564BE71D20074C2A4B624945ACFC71
+
+131694C4056E464D43E3249BA1FB106DA6E67BBC6DCF542801C73446A921ADABA4B4BCFE6368E4
+
+543739A1AB352A54F734ECD3CDDBC89F014F59682E3C521B33CA0F9FBC23758DCB3446724DC4F2
+
+45B6D123E904451D2030B0BA2FCBB3E58711779949740AED1F2E2B36C78EBBCCFBCBB6FA25EFDD
+
+0A9CA000C67D6BE7B0B3618E10ECF1FA5279A7D16462F5382AF104B5043777194F0138CF09DD2E
+
+F53D8F4735BBA9B1493FB2DEC4D33B35CF18813FF6BF9E9EE78E2AF93566F0FCBF4D6BFA7CA307
+
+E7B29BAF1B4F4743B14074BF91055E3FF84C3AF83C6642271BAD1430C7AFB976832E88471FCD13
+
+ACFD0E867F5BFCE3CEEDBE63EA33A440B1A28111E39EBED5D08BC3957C95C33C2F3BA027005CD6
+
+FDE60CC4471657FF6FADD89450AAB5DC9668195FB9D8F7510F13CC8EEDAA6D0915898CC619DCDE
+
+8BAFD257D6B74F1ECC62599FF345702AEC4EE7BA242C73CF8A361C72595F6824240DB10F50A8A1
+
+2E605636FDD4DEC8C7F7247E1924DD13FE0953677E86CFCB8A10F15E60C79DA019FFE0F748497F
+
+8D7D92B07FD2946BF908AF2B6CA40285C966D7767A14FF85E7F43B49E0F8EE1DA6B4E666347026
+
+4743E0AC871379CF8A079EDC65C1D84896329990B60D9A33C724E01756DDBD8B9906AD18D1E11A
+
+095085675AF9723C0DE46F78E04790916CA89B4DD5EA57619B59E71BA530B694598648D332FC78
+
+EDB34358805B64DF60C5D47AB82F3AC87B5385C39116B03017C3E4BB4556B96DE5F266B379EC69
+
+9F4FC8A9F854C41E8BB03C9BD7C003883A90226992C67B2D02DBA92242B94D21566C83FAC1B4C1
+
+2ADE6FFAA049BF6805AE76A6A6ED48144DACABDC8D2F35CB5C08158A73A0A1006667738CC471E8
+
+29D9487E22DFEC30DB6DD281931E9BE9C84859D6FA932A76F9D85A1E99AFB5F5905BFED6FFD762
+
+5654649757EB640B5B3C0D18019BECD629162091B69154DC0BDA1D08F0727AC851BB43503EE396
+
+D3682541A730EE450C30F663187C3B5004D24173F962CFEA8E04F5DD664D5F6DD515224F7E256A
+
+4EA07B5CA823456D75708998097267BE5D77D20E71BBA0BEA3F327865A7A0C5746289AA653EE2D
+
+2157C2AF3330A45557F5F825A8D75284FC69BC15E1F73AC0F5A11B26D47210D195F557B265E9E3
+
+0F6AC77C5D3AB084743E6B758365757B81D430549EF513E79AEBBA539A745F24D48AE8E728F028
+
+4DF28984F5DB1203F0BD66628756565393F1629191C50347C0A48205DD807B0E6CFD353E22BA43
+
+1CC6ACD8C6B4E97D691F743DAC69CD0881AA81CB3A48A08CAF9C32E4400A77F94A52F9AB18B4EC
+
+ADCA4F073DA5B3BF4079E0125B3064685FB783E1565D4A7779290BAA734052AE798F5CD75C9127
+
+B338A49E2CDFFD9F0A429F662D170AA8851250713E3D19928D974B9A7CE6987DCCB07A53ACC32F
+
+D217991C80C5834BBAA796A7F9B206368542218701D93279E1E197D68CB0FD0313D7672A1327F7
+
+06250FEA4DD4C623CD568F1F6BA0468D5C98B4E9C963E9E9B21BE58922750A5076449C8B9DAEA2
+
+1C46E2384EF871C9456ECC739C1B3CCB5A85CDB66E90108C860B180EC7D4DD769214FA963F26AC
+
+66E28EF2DA1CDE21B3EF93714E42E7AAD53346F23EE3985B1A3F871D49CD56A0F041FD19A4688B
+
+5C18B14C93AC2D30E55B902ACC35DE79C6B3D3BC8DF6EC35570AF34D3472C24EECB4C07AD7DEEC
+
+6429F96942BFACA4B7CFDBBCEE6FCB8D5B542E289599F9FE1C2FE2B1E0E18F135722CB2118933D
+
+7743673DD8ADA0AEAFC20C36E0157B724771B00DC2FCD821C26EADF429ECF0A24CE808ED06CB80
+
+EDDFFDD8300AC5FEB7C1B7CB59054D1A4F04267EFF030E171533ACEA869E8E93792D339FA96C6D
+
+648A9D4CC88C7D0C1B036DA7D452007A50EC5F0CF8F4C622C7078CFA3CF4BA424A63906BD510E0
+
+A580C22AA1F0279F9BE03B7E1B6C714ABFA2FDF4EC8E14714970FAF1BCA49C71C91C46B2F31A8B
+
+C338180AFFE97E0A4FA6BC9FE4750A84620E2CF23AABC6CDC4097140480D2A09C231BD32738D57
+
+26BF12435640C3978CD4C855484D6CCA4482834FD761EA4153B1984D0578B776CDB21D48918012
+
+86B6466492608DE797A7B951A979A2DCBEFFD69297C46F2B372F8ED2CCAE9372BD4AF6455DA71C
+
+65FFAEA6E84523ED098DC49D560C5D6B60BD5C19F0E61BE5F7859665295150E152FC3E885800D8
+
+C832757ED77F7C53B30FD7EFB7C2258DF6EF3AFE23109D7A342F9B348FD6F36EF63C9571A96F6F
+
+8DDA17837E72A6FE0598FFB8E0D5C220DA3D3938510923C93DB72B25726A57885D418E8D6C049A
+
+F6EDE3A1DFCA9B10B28EF6F1D077D4B375D9CB33CCABDBE849FCC158E603ECBE7A90622598C99E
+
+88B32C2DD4DE614CCFBCFD9C2726DC3B26544A3989F1E47398FA46ED9378FB048ADE2A5E4D3620
+
+708AE4B210FB4D97D3D6FA9FA4403515584D86F7C3CBF2F743CF2A63201ACD67E589B6F54BB05A
+
+4EB85B91328B9F2375E571622742681DB4F9447A2E0FBC4B4CB51FD7F8BDE4AD2D5278A472D2BD
+
+B5D88B77982B01786C035B57F85E89DE40E6368728B7283F542F3A93D3F5A7B1F6C982BB43A5B2
+
+FDEEF5BD8C61831865349BD6D41EB3D2B0F94CD10E6D75C370667831119311B9888D0BE9E84BE0
+
+F180960AFDFC65AFADCA3A9C145695CDF8C8AF9150B7BE09E5C0EE64FA511B2C8C6F5C1B206297
+
+E3C7C9733875DD3976A6D7A2CFFA5CAE810C02FCBF2349D346370B5C95F00FC99A7FBC91083A6E
+
+4901E21F99159BCD464196651D39E6209557B52F604FA6144437DACC5DCB92FE8F81913B2EE3F6
+
+B4206E0DA6A01F381D34242902678BC68F4D8B1AE7FA11A799D06C72A376197DB2527F45E2A1D8
+
+50D47D835CEC8F963A6FF0A80778E46917E6DCDD841DDE904E3FA961EDFB8E6A5B7B47275581D4
+
+1EEC0452DB032189B0F40207B11607D1427D50211D76966122832C980F9B9715DF2A25DB8B7940
+
+9783565A3A325C5CA68A248E7148944844EE8A2CDB2ACF7D8A462775555E348914DF3238F0EEA0
+
+657623EE65C29B7AD07C8B6413F78A0A4E9FC5307E427305C95FEF098E53E308703D757F37F193
+
+7489AD1131582087D24BFF50A916A0F8E6E71C335E50B31650CB2FE42388473C55213346737CF0
+
+A5D880D0A56E3E19B753411E92045A0E5C0073F378E9002DDBE0B10EE177F32FD9871B98E023E4
+
+3AA3666F4594591F6AAD8C3FFD37804A451F21C86E794E657FF50F549B9F32E4B0281C36ADEA91
+
+854944606176A6B3B7C55DBCB560D82D57D0AC1341F03240AC56A15D878EDC113A61277C4DFE71
+
+DB85C6D82658105052EF0EC3AF873F5F0D1881B97CAF0CE52167C819FE01E00DE7B448887A30DE
+
+453A38BFE37CFCCA4F41E7EEA5A415F33052FEE64F7D2108C09F79E97DBA6998A3E3D5DC37A352
+
+9333CFB254FBCB62F90A0A80BDB3606FD94A5D69A32A5EA004E94E45976A514BBCAC041DCCD593
+
+CA673BC3EE1B8E4F904C3BBA2E19E1B55518C7D69B662C115859D51137FBF2D3DC019A8CD6E6A0
+
+C14E4311B15FA670091B9CF8ABB1C196B4E0FC824BC2EBA76C62A23FE8C8A38D313F992FFAAB30
+
+594798EE9C5C216D6E95411A825FA4F29AE05E0D883C07D24C4F5108839F131395731DF39486CF
+
+4D8D668B85F7A55DF83F5ED35F9B494B0989878C33A0817B8C7537388C5C6A658014866EC07D54
+
+C89A80AF83A7C4DA21DE447206DD4C2F21A39C8CDDCF3B58A332805714F82B1E966180F5ECA958
+
+27ACDC40A4A6EC8FD9BB024D3068C94FEF25E4D6337E40D2A002494EEDC7905E6BAE38426B344F
+
+5B36EDE8FFE894652422B11A320285916F4EE5D61E5EC9869D49729A0CAB13873BB3E0F20FA518
+
+B812E5D24A641796E38A1766D805A89D9D9FB642143C377B365EC45BA6C193B3124C069C525517
+
+6F35EC85546C1933F25B093DD56C78AD86E502A235D2773ABE3B7BD49E3DC78A6AECF20CE9DA4C
+
+87AD7C7E75BB4AAB78797EB93819A5C8DE68638EFF281B141662A463135DDA0D2D236DF0EEB709
+
+AAD9A549CABBCAC4E577B1955BDD8BEB42650780CE2B1EAA47C35993E1E1F05051145A94C89D2F
+
+4162BFE23A2C91B7844885AD346BB88E9C9F8FAEDD20B6D6E54A9FCFE3C185401EFE58F29CD4AF
+
+8D9DEA6EBFF427E9AE18DDD3D1BFFE2A17A7137B596E239B7426CE38B5C48C81D17FF85462B648
+
+70A3A7C9F2F3AEE9884D03CDF387F90C5CDB807E222A744A617317038707BF3130ECAE267926D1
+
+52154FB423E2FCFC438AB660738148882BC686DB56C50D092D60428D9B0371704D3FB8FBE75D56
+
+9E22B0E9D767A5A8EB7702C34F7320C30FF142DCEB9D9157678645C51391647F9F7329B39C2432
+
+00A8D0527940F8DA37A300C0182CF76F3220B1E62EAC18E8FE0A8C93A0A5A373386E38093B81BD
+
+3EC3CFD5BF2E88C51321D4540733173592661D85F1AFD04739543C397E368C73500456264B2625
+
+37B8EA6D147D264E48E65FC6694D277E5970B0FB471D76280A74008B10CC5A216ED07F21A24BD5
+
+DBCEA5A4E0ADA483F04ACD7697AB7A0A901C0192581D4FABBC24489E3CF535737040B0C15BF2CA
+
+997026FCC37E36088D513CC20B68C8D8709E5D5811B5C510D6193A81323A271620D239CFA32F96
+
+3AF5F3B5857AC680D1491DE3F22A8BBD2952EEE5B49637F24BDE92B5A994CF5E0271CA9ADB47F5
+
+C298A391BFCB60C630312AE893AC48F202568DE1B43DD986A38A0F478AE6465F83B0FD3ABD7FFE
+
+3EE06BF88D5016BEE2E90D4238722A604448708748D608295E3B435BF2B47C91FEF385F2731E95
+
+1F73FABCC88CEB8BA48A087BEA2DFFA9301B60C4AB426BDC104A2411ED838085FC06CE3E4E6906
+
+4D7EF3F301DD3CA3EAEF498E6A7B4B1A36E9790E7F69ECD5E8967050835CE779E3B44014C27AC0
+
+456A96B9E28C71F30031B49FB00DA195A32C4175B6BFB279FE435EE92D4FD5963E42FE99D95438
+
+7400706C17567B1FB65C4E90AAC10CA628032E0493A971BD55D83E1AD70B240BFB6EEDDD625D4E
+
+4CD6D4895668B1446DDD235E8DE44B694F3F93AAC2BC0D04C871FFBF5DBA1C7EEE0BF66C949A58
+
+B16F55497E82ACD40BE356CAD3EBD707C0020ACD410DC6FFC7CC460525C2001A0B4A8B7B114932
+
+3A65FB65BB7C20CBA305E53A312E9719A15C45C39C85A4F1F008C361B1757DC0BD8C10204B0218
+
+AEAE29D3FC55C12E9985EF36A45046F46606924636F7F76480FEF7F8D264C73266C05A6DE699B2
+
+37F6C1DF777306BEF1E0AC48A6B1548ED41B7EDCE706CC8A66B3D9437210C9FCFAC978C8F9FEEB
+
+8E220D024C04DAC2CE62DC8AFBE7AD4540B5ED3668E7B59FBA28A7F8D822DBEF84DFDB72566EC5
+
+D6223A165959443A2F980F6D16C8187AD321C27AACF884336F7D8154D06FA46E3FF51D2DC26313
+
+FA812F9F1507FD75B80411DEF69FE268B9A4587195E45B1FEACB0295C63BA8A4CFD47E7C711511
+
+AEB00E93C0B359EA0DFDAFF5DFC0854E2FC63AEFD37DF473859C040D6E8D82F640C1815D3F9A53
+
+AB3E1D5E1F0B0E125510F2C6D503C4CA518BD36892B83AD31B3734804F72600562F9246FA2B5B8
+
+56BD55212CA27D700A7913AF505BBEB9BC3B2EEC13D7289997ABEC078808C79F65939B07A2619C
+
+0EFDE6FF7BAEAEBB3A4A321846F639A7096E4F7688E523DA1901EA3FFB6A71110B6CA2C45D1FC5
+
+49AC32F03FA5AA7915EF43770A13AA68C43F4FA3DED55D2940F76648076D955B509217254128F7
+
+46C3A2AC47D683FBFBE12057454435941CDE662220AA7B356E4718D591B81A06C04DCA83A814E5
+
+AFBBB758EDF1E8DF1BF622D4E4BB637E017E4E66F6067CEF0650EED31BCBDC6947DADB3982329D
+
+E902E52062CEDBEB77715735E698E40448FEC00842BAE3BAA207D2B28ED3BFE1C1FE428439470F
+
+4E1D8358E35E4B97D61EC6A128B4383EA0276A947BC9D16794C3A3D7DB0BB59FF649875E0AFA43
+
+E6586F8B4CA921C1AAFC0E2D1C970B380977CBA505B3D531F3789282E21D1B5D9D3376EAD7E4E4
+
+00085C47CB858DA960B55BEA07E0B012BE3F5620DBA167C105B95FF9B5FDD28D5354C877E56710
+
+1D45F9AA471D27183A55AB9B34D626815D32CD824A4C46772D8FC4931341E227309E8307835FD2
+
+5359A10F84AD5744B8181DAD59176B6B466595B42331683F57546ACA60106654C9A1E5F1BD47DA
+
+F9F93598E75CF032198D69A1C4B152A29586209903C7BF126BDEE5A3806BA1766BB02F5D75E33D
+
+B2B011106FC3C964F8FAA9E9857BCAF903463FA7FC37294E4F0FF98BEA22FB44F7AE5E6789658B
+
+BAB5C30D6C32D5E24E268B54353D1245ED78D1D7385EBEEA49ECE496A4261F992F67B664776D6E
+
+CA1C8352499BF3CEEF365E152582F98590B8D903867B6557200B1070D91EA32EFDAB0580559EB5
+
+56A835F74BF458693F093389EE1D1B1FC1BD2AC1146EA9C5E4B14BF26AB3EFA0BA0AA1813E6C61
+
+B7011AC330B293A5CCDDB41412F97BA02D38E502D596912D165F6B0300228891210DB700E975BB
+
+47427388D5F3246D80CB9703FE5F2B2CD40873AE0521850D4D656174B52F24C06AF1D9FE4ABBF9
+
+8B432B6150B0725E328E54BE382A16D5DF6C47D9DD14751B96E2DBCAF4C9858336F527238E263C
+
+58730C7E27DA1B21AADBB48154CE5E9C92660394D7282FC07917C91D0E91DAE3FF7DECFD5E8082
+
+563E1673A15CFC069E08D554E3B8DF570209D567C65F3D26F251B405FAE5F6106637728BDEF735
+
+EC2D5E7AA3F00434EB58C3307D221C12FEF6D741ED87081DD6B93D2E9282D09A7262EFFCCAFFDE
+
+CEE8C4E942AFFD8215B84FA57D41F5815F3A3191BC379EDC454252E688EB9788A551A17876AF1B
+
+0A5ED5A62E92E7DE332ED89A9B4F406552F9B706A6FAD59A433F72AB6D4401E25CC37C0FF91713
+
+4C838E5CB3CD5AEB8556443B1BF513900F293B9BCF33F96608D1B108CF9BC7DE95F4B518A86987
+
+28F20729D60E75E53476868220B64E905BBFBE8E26808EAEB0A46A1E096EF868EE4410EBC87D36
+
+46037AFC6D177F42F8DAB8D5C88200AEA14388AF09EAF5CA24D72A172D654BE198CB426949C4E3
+
+D23C7D49F4AEE4D20124B5830480D0A8CD0F7EFCA3FD251C609D124D0BB4E7A6CE89EA7C92E0E7
+
+B9CB870E127E0337A2E645AEC27D1B0D85C57D27F0F7AA1E849CF1F4E9BDF02297C3E61290010D
+
+4EB0F30697D30ECCD1EDE1766BC137F2E2A3D7CED25B1BA259D100BA16AC3D29C01DF83DFE5B24
+
+DCC9FFC2B80F61E91D2E41560241C00E79DA970A09D8AA229CC2F5C114E0713EAAB560442CCE73
+
+993EB9882E7C0292F248C00717E3A1DA46ABF3FC716226EAAE35E8F20726B1A045A20F80B02473
+
+8B7B93D0E79C6FA11780A6C94E64DE53FEAE019E4D838607A05C7746A3385C9728CA29D8F64373
+
+B25307272A77028815D80451061B010EC8E82B0B70243F66B97ABED264F7B53B163DE8204796BC
+
+C593CA9BE3F43E26713DCBD9E3449FD300F6111A50EDD2F9CCBC6D0012A973B5F6A1651074FD14
+
+76BF69456870C5228599FE7CC0959F6804497A28E3AAB129024816FBD3C0101A9B709DDE0A92AB
+
+F0B2948E096624D067F17A8CF2E8251A40969E857D86739883B6B46967EAC2286BD451F26B4A16
+
+026FC5F3A087F4BE21A90D336B69C5117F3AD532AF6E3FE9C8A484D372A1C8C1A342264D3C3782
+
+4F3B582D2885642D2B3442121A7F3BFCBCA35D09DAFC4B8AA8BA4E0C1139E3F29ABEDEA82732D6
+
+3810F7FB2A462E11A32DF2E74904AC7C5704C545FD6D08D6D1F6F07C69BD5418E82F6B33C36A99
+
+5044BA660ADDEB24C7AD10889CB785169960F8E6EEE9A321BAA78794AF0860DB5270193CDC9C0D
+
+5DAC45A1E67FD6063A1998D0624A5DDDEBADC8C42318929535A693677673B24CD2CD2869148DBA
+
+C1EA486DEB1B0D83E7785F1E1EE65B9AE3C839C7427108C13C4B7F657BA9669D1FD3E3BE5FEE50
+
+AA20946EE173BDC0A9B940744AEEA3847D56DE7E86ADDD6F63000CB048407070AF65E4BC097347
+
+CD82F6084D20C529E35490492E5293F97554F9979405CC6FF7F801CC3DEA50DAF9BFEFE8623B2C
+
+8C7560766C4115EEFA40BF980647F6D3187A689294060DFC214E22441044CBFBB2B6274EDD44F5
+
+218057869A46C517138E4F848DAD69F24208896C8DF860F0FF71EF89310F2D82EB7ACE6A72928B
+
+07CC57A2DF6443761D91283B59BD006650CDFDCEF8BD64A0F626CEAD770572D489E916AFA1AC26
+
+8F6D22F3F37B63928472B81EBD287F6619900AB5B291A047906AAEE2CD93F7FDBF1658DFEB8D8C
+
+D7EF987D0D1235FF8DF202F9E83AD154500909996FEDECDE0EBB2F95F69805EF1F774D4D143AAE
+
+9A50B64BD514D83D00F05715F163BC7F64B90663C5971D6A5393C1D6011978EEFFD57A7B93FA57
+
+E6CE1CBBA31DD510696A344EBDFACDB87AFDB6F425BCC13AD245E9264467960F951AD797AE9D9E
+
+631265ED0F12D4ABB0F6189FD9433A236F00D01FA038D5BCFB3DF68397610708A777FC3021B685
+
+448445D326EA7649406A88DA392857FEA6156684E3547E8C757BC38223C0CA2569BE438D03B575
+
+70E815D58BD82C2EEC861020C1DBF073EFD9C8136ABF263461D3AF77D057F50214904DDE51C3A0
+
+61A3A1E1CFE413E9A148F05A8108608EF7FDB96F392E74EEBC5A4D354BA2AE5678D28AEC014979
+
+128630984EF3D5586DB8783F0603D7210782DE979C07BE8DD589C710DD44394569B8BDE770BD90
+
+35FAF3CFA48070C5CDC8CBEA2B5AB2620D4C40818AD740966B733B99E8CBAB4909F5EF5B5575ED
+
+0A8CE4635FBE9D69E57999B2739F281CA4BEED6FF2948B8670446BBB30D0BA6679AA38C2DA2A30
+
+960687F2DCF0C741539102968C8D6582E55974811630B0FD2091B63477747F45CA0ADC23221AB4
+
+C2E94EDAD6F862119F127A79A2BC073254E941B37B830E5FB504B26E580320DCFD5B2D03A5A6BE
+
+3C9350031D7A58F7B351A9F917ADEFA72D81490B325C4C1E39175D1D3F7394A009D04A7B706E1D
+
+3B6F61BEA096CF4DC50E4C72999667EEC869125B3EB152E3E7240968F9B93BDC91CC5E62654D7B
+
+46E2E60A4D2260322B563C543D9E171D5F1E816E73222709A1E2F14112209089554DDEE17CCB1C
+
+F066D0AA1387524FC4B2BB47071407428903A1B9721D6CE4046EC2FE43B9CD9409BAC41B76A27B
+
+8D4CF3DA42F9DD8A8A751DAD103F169A1524D0780022F764C49FE9B44AF80FABFE48BFE40D62D4
+
+1AA0618245AD7BFAD7C105A3C064493B109F765EB06BFF5C1C8138296C635AD6258FB0894C2DDD
+
+BD37C46FD22311D265AE50CF391C85F6ADF59181EEAB5B65D1F81149AA5425B1C11A432032CAA0
+
+3EB2FA8204E9BB6736998DE9B12E9E37EC651560F4E906B342A725E21021B82B84249D5C0F6D96
+
+33C4196279E569DB16585843D65FAD0B5D893BB0A9D381324F76B61DA88DB8188E59C4BA15EE5F
+
+B2892E7260F9EA9861E44921ECC1A27D79B25050615852C838BC3BDB4D9A3B81AB2DFE7667E2AB
+
+0592E4D8AC4172031E12760F14AE1C058F986A22699E024E6C6CB50A43066F1A0304AA67AC44CB
+
+379814C791103B6C2D4C1439FC3046B611F6326A5BBE697384A976D0D01815B933EB4734966D07
+
+E1D509471BFAEEFBD3F9689EAF82B0E9AADC2368AE52AA48F0318AA1BCC81C3F2B89D48C08A1F9
+
+BA4D7CE86C5E913A87A0563D7790C471DD47CBDB273AA37CD4DE6BFDBA407483DE275FF57FAF93
+
+22591A8523E77A3343CB6100AFB6035223E05EF3530313885FFC63A8D72DE099C50A774A603098
+
+59EDCB3C4E424C9073E0B5B32D988FAD04EB486E65A3EA7FF7DB3D2FDFABBC92DF6C742EB6F09D
+
+2A78387DC0CA8561743CB9C8AD949472DAEC66ACADD435C818D28127770A8DA2A5090CECCBE16A
+
+516D7985D7A49C7EE9D08854435008ADF25041E8BA5744591AB7E22D3705EACBD1D9C6378F172D
+
+B82B2C7BC51293F40064306F69103E6A0BC1C1046C2A0AFA2E038550C194354EB8E263085E5390
+
+749E2C98F43EA68D466E40C5FEFE6764939CFF817814B85BA928C5859D20709D78CD50B957E809
+
+0F37CAE36B181C37E80E9E8690D2B9F0C34D204B8E4A5A164CAF2FA4FC6ADCD77509EAA5236233
+
+6E9DBFD1FDA1CF32A9E980DCBF4B7C338CD18399ACE5108435767FEA8414585DE7C3E08590B37C
+
+CA0318A82C69ADDFCEAE156E5D1FE3EF9526515FEFF356E0351CDD1D3AD340E7727A478264DF2D
+
+491259F05A6504093949502E8D10250556B87ACBCA7EB938C62BE0D0DDA4D02A93E18769B895C0
+
+4E5FC1B229FF4A3D7070A0856290BBFF3460C5E1AF92346E7879F27DCCD8A5338791656C376128
+
+421DA4B07A5F96160F0421AE10C1F1675D396A80635B7CD1BFA4CC564263DA5C0C84F3787DC8D0
+
+8ACAEDE11486C155BB1B16806303B9D21974CA19516C63402A8F0067CEDAF682EB2A2127348DBB
+
+5A662B5E87A5375B396B1153B843303501ED93534DF7C7FCA09EFB0261311155FCBA2EA97668A4
+
+65A7751F91BCA566E4946565BA1D664CD8FED19E84E7563205DD7AF77E2A4CBC6846EF5ADBD11F
+
+1958E086FD7673D5AC997867EB0217314F32D60342FAAFFFF957F60D9B0AC57E611137AC695DEF
+
+E313BEB5334B838F83A54C3ED76AC55C67571F367A409DA052A0354837BDEE4D11B426DC9DCC74
+
+61A6F422B95DF3894A002B02BDDFE3FEBA8D8E3BB7556F501A83A10FB0137F428FC522260E0A4B
+
+1655399490DA83CCEACED148AF1F447C9BBFE3B159399C82EAB257BE568A4DAD68A664D7397342
+
+AAE7D38223CD9AEFCFE5E399F1D70404D470A1CE10D46CAFF5D522352C50DB8FABD7348FC6CEC8
+
+34D5A82C04DDA105F85F450E7363E4E989C6725E6BBCF7AA6680C97D128FAAF4D6E3859F03B0F5
+
+A3A8A70E0C9DAEE84BB95F41931A30AA18D6C51D9DD3D3B0ADC7D0B5FF0D0A889A944C4468F96B
+
+9E59515BBA5C86BDC5394BC40B80CBDA19857E9DFF41E75802D2A2C0247122CE94A7D5DD8F5846
+
+27ACA0BE5C042A02FB7362C34614BCD17350AFB1F0EFDB09AE2F1C37FF21E007CD4DF1729AD932
+
+FA20A8F85C06201F9623D959B9E4A90CD04B6E4AE2C1795828B022D990D939D5D1992CB2DB807D
+
+072CEE580FA9A79F07FD6C4980C997EC524B57B350DCE4F9013B5BB07165DD6FA1902868328FA8
+
+0D3CD770B783818DE508E59383C96A05FBBA840831E129F0DBDD7B4AB05801E99E968EEB7A0106
+
+5AF04F11C641CADBE745EB6EA76CEE1AA8524E405F23A9D0683974A78879299600BDD0924FBF18
+
+908625872A63C38B4DDBBC8C764EBD99F0877FADB59B5F1D4FD9FD2FC1FC8C4F068B7B21B3787F
+
+728CD8CF5F52CE4A760746241C4A696F6BDBAD58A4D35041D744FBABDA2F883CB475E5F75D1ECB
+
+9056C3E52878FA0DDDAA30357906543F8440D1FEBC000297676E3C5AD462F825F1D302A2C7021D
+
+5A62595363A791A8EDBB22EDB9DB968BA0EEB4DF66E4622A04EB9FDB041DFB527CD404D62E4898
+
+D5E7ED464B0C24D58DAFCA7E891481363761D803A9457B7A2403E1816FC67167571D44E27469E7
+
+B1BC3AB85CAF808BB4043537D1B80CC490970D87A20857D868CBE901076419436A4E3C95C7C9B6
+
+0E3CEAC7DB19859EDE149FF3F07BA586BE12698F5C0CC9815FF2A6C62F7DD98DAC639084CA7003
+
+C99B9196CE6A6DC59CA0B202C9AF54620E38A0712AAC6E01D2711D40D012F15DCC51647721D4F7
+
+F31E29E6CD7EBB59842B01BFF8C7C424F0E58D4FD15D56DAE60A6450AF2254D368CCD09CC3FA90
+
+123C44ED4DDCD7F09D46C1354E5FC1A6C1901EFBDFBD4D6AD80EE95EA1B726B2309C0720424CD2
+
+5F72D9E5BF38B51271FD23EEA93013114B356370A3C9D438EBFA0590158654E2A3B7D4C887921C
+
+F6538D1BB294CBAC75CA66CCDDF0B7F7DF1748942A908C07EA13E6B809B1350B9D73CECADC98FA
+
+35933A81A34B7A6F8EDC7DC2AF60B2F0632962B401AAFE06CBC8EA4DC636406F2CED5FAE7AD0D9
+
+ED5023813855A83119423E4A114B413C3A016969A7481CE45E4E061ED9980FD961404B895D5A7E
+
+167B4D32E153DC778FCF5DA5EDEDF68D5707671B23DF2871C63FDBD6F9B9BCA9E7BB776B37107C
+
+38484453F24B4A3421A21D8797DB822236CA1A15D8719726C59D51F7332259E7CF23F28F1D903F
+
+100F9B0E8D8DE56CA3A99CA5B40D0622CC4D5AE6BA77112CEA79B10D0D5A808DA20D76B56FC499
+
+206587F6A0EBECA10AF73F8E091D82622BFABC52A28DCC8C295A24041869E6363CF589670D3471
+
+1F3BE64D02C861059FA9D10081FD2A0EA137C39ACFB2A83DCC9486195E40E99C0F28418B2C29C2
+
+9C01A8CE4D98F29A22E58CAA51E9ECAF4CA85FB59E18C2E53873A642E31BE8E47591DA6EC6D7C4
+
+E13055B8D08D6D1F0608A1080A38831280C98D7D47CFEBD3258432AC396BBF95B77E9470BA4B6C
+
+9A052CC8EBD7277C3B78514BDC491570B7D7B473C15CCEECB4D312C775BD8D99E46EBECF6C3533
+
+FFFD3E5BEF8D7B9424447999A91CE1880918D750EA345E6A10771DBEBDB1B4CCCE1474C07A9C4E
+
+A894017BC593024CC16B595DBC835F4EE8D9ADF7FE8671E0BDF36613FE7844C598A789CA784B9C
+
+97AD2361D7CDCB2E9BD45032A38D6B0EFDFC8F67FED8EB3CDE280D81C6DC9348BD48CC580D2958
+
+5658ACD4C3DBF2D7D85A78BCE9512D7F7BC2EDF7B76699545F3B1BCC202F53C8123B15F46D8F88
+
+1070F1232CC8FD212F15785FECFC6B83C0F439716A859B64239C1FA880D32F62376EEB12EC6C00
+
+235C9D550AFE84C981329B4B3DF17BC0E57E72D89058D1D3E6EDA91ECFEC0ECF0B802D41B4AFCC
+
+8DD250C13AECEDEAA1A0A6EE26F3351572849FF5E637A898D7B0A099D87012E274396A27E29A21
+
+DB29584ED72FB614A317E47C6177A9FBB2E5320BCD90CC086B7DCDE6ECEE01F597738AADDC7D9D
+
+33B02A09CECA2A389F16AADCD2FB02EF257BAB1265ECD97E25F0DE1C8E7526FB5F8C328FE37078
+
+A9D0F30D81B90A97A752505C8A2F8C9C7226E248AFC5B4318EB407B6A5DCE33FF5309794073737
+
+F72CB55D73FF66EE1C055B9A3E49302C11D7248F36CE257FB051674274D51CA4C0DE1F927A882D
+
+F54C567B73FF1D38556CD22716A3F269B9FDDD261FBAE4A916E0818EFA5C193AA00456DB6F7845
+
+FE41F715A8C0000E6FA8151895B3F21DD9BEF98D9CF674A60C8A1088502C6E09899D6456F4AEC9
+
+5875068E29E2199ECCB632F7A459324512A3BBE6E65132263EE3A4E2FB4205580F5DEE083FD84D
+
+48ABA8E3CFE81FB1465D3027FC69C260594ED380C47B6AE3DC2E35661906D98C0126FB7A80FA3E
+
+9A2DF727AE36048F6B083D8D8D8B1A8028B073B96CE4B5447050665BD926D5A1151F3E0CD63C60
+
+FA77FF2746D4A9E3E0F295770408CF348672EAC4772458125A8976BAC75469025B5AE8BC55540F
+
+41308CE31D273690C95D1173F05D953FBA2902E364885F821E14FB8153C749EFF100247E4AB315
+
+321D9C192E68B3FD7B51549B2224183195A549016D2A4BF943F37184743D6E5575F5A192E23290
+
+CA227E29F9BF15ABF4FAD388A9FB689A807AADD44048193B5B5B81CA9F9D7195803AE02D1A6A49
+
+00074E47313554A4F3B842F080510CE27645B65B57761A364D0F890115D8834EEBDFA247923AE1
+
+33AEDF8A46F1D1D410296E25E79C01F664136D8D219D324FA9B3349B1D5D180C025481EF9E7BF1
+
+100F242EE16EF433054913E0ECF29C4A0830E93FA9898F7B5505F87BDCC02101531C7C9C107BEB
+
+0BDECAE5A49BEB45D3BC0D869B441BB41A64A229DF5A40CF258B0178203F91318D97D529D922E8
+
+A82D36F34FFF98F0B0DC0984903B9DFE86932D96BC16C766FBAA4EE8449DD1BA7DE9ABEAD68989
+
+8BDC2155360C631458568E63B929DEF983C6E56B563394B25A44B25DFE2CBF86244D266E44B6D2
+
+DA18ACB4B2F537DB64110FC5187ECE20A514CE61209956A6555B35818E40A7036B8402C6E7F957
+
+0BA69BDDFD8CD3C77478ED8491C1B721DC66078C59097F4F328BA45D7711D5F105AB8E5C0D3C5C
+
+F88CC85A2AD9D61B39B7D5BFD41DD227E50AC8244A00D9EFD6C13679B415B0A0DAFEF87F2D0E9C
+
+E1FD835736DF865C151628CD950E7DBC216AB359D4575BC46D610D6D4A0B50351966541D60D075
+
+D98C1E28A0602F0876C3877050292E2469B66C8473420266AA8555F39F01A8C1EA343E3B42E1A8
+
+F362DEC13E6B1CA2150B54A2896D413CBABC37515587400994662F9D892B1ECC5617D309DE995B
+
+F881BB27B0D1EB7EC8318ADC767A76ECE369E01BA8DB3E4797A78FC81A0852DC3FF3758A51589D
+
+BB0C8981CBF74076E83F42109DB8E11C9FA042A13F7866D34137D02681CCC2A8A24BDA46E9DBAC
+
+BF8D771B9EFEA416168992D4A0C5489848C5FCEEB6FEED260DF9D39F576EE08492B5BE18E34D1B
+
+7C4F05A828B2A8205634428F0169B58C95D6019B899FCD1910B4518D0B62861FC1803083617858
+
+3D3273555D54206AB9624DE4658CCAF3FF2DA8DDB07A006F569F05AE0EC5E8BBA69E336B5A1BB0
+
+A62C4DEA0ACFAB694374484EB3F531805445023CCB2A58832AA92DA536F0563AFC31B0C539C566
+
+82633366B4D9DD8AFFD07071B8A172123901EE104E0A6AE2E3FE7AF22F23C3E4420F3B1C26CDFF
+
+255186F1002FA7836BD49637C480DF686F2FCE81C3CAD72EEC91046A3F2573F3A6844418FA4333
+
+96D24B40272E3B580B66EFB2ADA4DEFAB6DAD03B7C2BED09108A353FC68A77014365BCED57FB50
+
+5FC75F59C2402FDC24A886CF7B64B9FA13AB380DDA7DBF27B6B04C7FF37F61C9997B969654F75D
+
+A9929395371BFFB0D5B4FFFAC278C1E3D26E9D02C81891E8FABEFF9935FB2B6EAA225B6A223D0E
+
+D3DA70173215D25D7A3EE298AC98B9B3433A7060B52B9B1783F85E18602832228D139A86B37C3A
+
+FFE85F8552437DDEF469ACB48B86FB731379EB31940B6835CD47C640600082F3EB2E526B22F49C
+
+504721A32906DCF84888E8D0612435994D7475E23B0D6E6F829A5997812E8B53DB03116767DCC1
+
+90F373E1C58A786564AB2846C95CE3A63DA0C9BF7B5F41C2A16201E2F2232BF05E4E7015E0B898
+
+E410C7934616D499B35E96E4FB738165B8ED6708F9028114F3EFBF5B4C9288422F206AD6324AEC
+
+120A3BC0AFB1EBBA7639C8D0209DB2C432155ED7124110F3599D8E6CB9167435A06057308743D7
+
+DB1CB5CA1F1774FD4AA3BE52C7B8B04234CB4B92293DA24ACB5C03E38AD4ACF2D5BF78378A52B1
+
+D0443A548FADE2ACD6ADDCA315674D917CBFFDD48FFD4360721A9F3FA0F9F9EAF194996A33A524
+
+C8B374AACE6A364F15560886F4378F5679AF393C195C56817CFC26ADA9679180274303DDD38A41
+
+820954702774A160227CD496E147859CF2523466F8951D1BDE79AA7D21195BBEBD2DF3DBD12942
+
+2A11241FA8009F43421BF7973045343BC959CFE22530A9C3B9AE5F271BC9273756171B19885793
+
+97D4863133AF782A9B15B2714C77C6FD56077C00902C057184AD01B10B5556A6E07B6B062647AB
+
+22C783519B87E2D9A2BE689E32A95DFBD2865E585CFB0116A4110D40DAFCD0DD87709DDEC40B87
+
+4433B29CF6AA9F9406CE62FFEA07A59AFEF28E49E7BBA32C7F6066995414E9EE5E2048A298177A
+
+13DAC03E5DF94334EB6E124E86E837880746D2E63D2C49B4D0D5872991431447CE8E242A35DE34
+
+6C1D2F3DE7443EA05C2ECAE2518B883A55DDDBF53BD64A7351930C6137D351D4A88908E133A914
+
+4ED0D2001D7BF8F4CAB42242FD0B38BE90FA76816D816797A73D3B9891A0FB1950723BBCB97E15
+
+1116E7DAA5B18FED8DBBBD2FFA0B6115E256EE6755E172DE0C8F2515A494E698CCBDE81D710514
+
+AE7F732992096454BFA76172EA259DD9CB0FA5EC1BE1050C1553B34EE9C206B540DC4F53173C88
+
+B80A88B183B63949CCBCFFC64E0B9C2A9C4BC838DBD2B48AAAA1BA7B40EF4311E0AEA51E8BB2DE
+
+3508BE43E33D63D13BE33FF9546259D0EA541CDCB46321AD22773DE75726823F32EC1D37ED1122
+
+65BFBD416D0EF743B0420B73E0D73E1E8101D53E63279FBCC03B580E00066348440569704E32CF
+
+D40AED353FFC3ED3FE2D0A145867EE27FCB184E4FC03AF5F9F01767F9B2456281D326DB639BCA6
+
+6223ABA7CC63CD678F663F61B0408F1A1976EDE9F96FCCFBCB0AD29C8E27CCD81CC6C5E697B304
+
+97DD51F00F3FE7FE33F931A17FB7540263D7F749A34007D2C7CB2EE57A075C4333E2214B866661
+
+743E487ED761B8774E076ACBF9C2DE66992C70189A1EEB61B49068F413CB3851E1ED18257407B8
+
+ECB78EA381D5E423907B194E7FD9DA950C1A502A0A61ABAA12E71102792F7CF05AE65A7C631A96
+
+37679B2C4BC651E21DEF22EE339204DB722D1FDB119F9798C718E4EC9439C472D89D99612F71C9
+
+F49890C596C28BA324C5A79535AD77A5E36E1841F829DB7477CC63A944DC16DF273D376B230653
+
+C50A97F5B9590DA325210B935B68DB01B80CA6596ED2AC5BB0243FD75EF8F6891EF0A3C01EBF21
+
+FD96DAF4DAA83A5A89485490A6FC9BC693B28B0553EFFFE574A8B3C5BBEC36E657C2CDF4DF45F2
+
+47C59AB1EE5980725C51C43DC289E21FE69791D9436B49DFC122C44BE918733E70E3844CEDE633
+
+4932C5207898D707AFC2BE3AE1322CE0BC8A58F8101166B048CD6E94B392A54BA88115F08C1066
+
+4F417025B8AD2756EA62C9945999E536D1576B5E1D3327D516609D1B371A0E9B0B9FFA934B8578
+
+0D51EA2AD2AEA9FDB6419DD0485B95AF90A38B1EF5F68A1CC5C7319E4A53BD9BDD208FCD59B264
+
+BB05DF3D7E571E81547EA4815683CFF432345F717CAF3E20E627CB39B9C434F659AF97760230C8
+
+4D0C809A9F86EC721FF113D84D94FA2F37ACA9A8C4C6A2763E2F28C9A7C8220FE7F8A99209E094
+
+ED621B684B69FDA9194A7CCCD51FA49933EA157061FA23DD5FB90265E4EC9A818C1379D5E50809
+
+FC7EEE1F12D5B1DB33C6C21DF11F0D9B49A3A2D2A9F39E056B0604B6FE0FAE6F09B18F59B2C197
+
+6592E58B746D3A99AF56B1D5F2AF93A40E43CF30E1CA184D1E898C94802FF9B2365AF38D0CEDEF
+
+638B210931772BC190E4D40F4C5A1212DB95EA596DB64C7C0609C6814459DFA2286EBB5EE178FE
+
+C6AFFC3B9B520DB8DDB4EB5D4222D869799FD198C5D64E4F3887583EDFCA2B8F511F90B0D29FD0
+
+40D1427FF12F09664593E7EF1C0B426DC41061F34ECE69367F852FCD723499E564C77614CE2434
+
+5C0D41011AAE7960ADCD3E2D63EE16177D198975EF288842FA5714AFF9E533597855A0827FA444
+
+CC687E8027EC98CDB3606FEC5A045E2AC87E90EA0050768699C9598057B50310D387E91055E974
+
+AEBB7C9136C6986B279BBE5E05AA3091E97C7104E1EEB0BCE9D3448D86644340A0D11D9AC4B6CB
+
+DB4BE4D6CFF130833FAE4F03249C45298571455480603F5EFE2C1892875737ED1D561C3938689E
+
+7CB30DF5E26D479083CA61017650592ADB01BF6DD12807B65F2BEB6C8FC949AC5A1FFBE8079817
+
+934BC8897E251F4C6B27E7B6B5247F5E48C39C84AB8B70B14A868553B5F205F79B8160DEDE2172
+
+A0FF07AEF0735780736E5EBEF7E8187645578989518E1337D352BDB192AF61858778D21D7B44A9
+
+7C26F44564852788556E84D60619D1CC84E4B4A0F49CAD9B7B713930C957C632117674C503120F
+
+C564A3318560C1C57CC76F78B8E1FCA4E24EFE078FDE51A24D12CE1B799A07230441A08EACF0C7
+
+9D514169E543ADE9B97EEEFBC6C50CEA20D5AF481E8F2D5B623C444B409FCB1CAED7C3EA7754D6
+
+AD14BBE11D707D6FD3A70384E275DD06A809793B873E646BA143BE816971139F62FE007C313F7C
+
+C7370E1A3EFD18FFF7BDD8BCC1C67761A6D1EAECC7D953C58596C0B54113C8EB522FE6FD8068F0
+
+02D60C7EE92491E2F8D509A6EB872197C9FED96D963C65FC98F3DDFA3748D33A2A82C22CA4DFB7
+
+DDD49F7D622E859FE8F0DDF95144E6BBE906167CCED0D65EF05332E59D739066859809F0795E07
+
+DF9064968C5648134F527337CC5F610D5B941F0AA975F6817B920A3118EA63DE7FFF3D59BF1451
+
+E2474BFE57C94E03AC416CFDFCA559481BB587A9F8366260A884A22CE93FA8A172AB770C2DC5B0
+
+0B73C9FD9FDF5E242BA9B845FA4DB9CDCA2149A4479EA77E69E9F3742AB5711517BFCDB1B3C194
+
+7231C437D9E50C42218C3568ACD953D742D9E093DEFD04C07F2D5F151D00B1CAD086EFD5B10446
+
+748524C070123F21A09EEA839E381527DF98DE1B735C1111628A0FCD75AD863AE47A34207DF2C7
+
+8D1A50E7AF312BCC999DE49BE0F54AE7337B2B5D83C4F5507A5355C2CE2900CDE51D25A41B7407
+
+2134074708F558DDC22C14C7424A611E281413FEF9A438C8DE4BBA6BC67A6F26F0E1ED9254513D
+
+20EFE361A7426B2E9BAD4889152298ED397C6AE1B7E0AA1F93A4A717C13439B02399C773DE87E5
+
+A7ADA2B1514424939F44F114E0E663AEFFBF7BAED51670D789A671862566777C93E61E4BB5E744
+
+FBFAED947BD896DA9E1C947A1E9D328D6B2B38B23CF0ED78BFC399B9BC395F08DBF457FAB6E43E
+
+84744858F94A729DE846AA8E888C1A215C23A297C2D7A69F3C60DA53ED12FAE643A7FC15FBB680
+
+3A8ED275DB3D1E0199A71F203C8FE1F58F39289303BF7AEE928C0927EF34F1614C23C89E6FE3FB
+
+13AB6FB91EB3DC4718A8C031D3C7EC111F09AC79AE3F6245D0940A4284FACCEDA645A129A5241D
+
+91E81B627189E1809E4E4CB8690D7D16845C0E97EEFD7F88FEA959FB55F70830659CB2002C6913
+
+7870DA6E061210344B5CC6B9D03AC7B5441BDAA81C25508E3D5DD7645F7FDBE1C0E9D2360045AF
+
+2D76F46EE26CD703717A7C2E83406AF63A4378F1340357735D13B6C6A1E9437087FAE7C42E3CC5
+
+EB89EB2184DA87E6B523163D16CB221FB546C039774F1C7E4C2D19C648FF1D078691CB7A90524F
+
+AE0F1990289F3A01BE5B4BE31544102DB04EB64950A6D633E6DD1E70C1B5B50FE00D1270AF7DA1
+
+C5AE22EE0BC7D63D6ED9EDBBC2DB21A657B7C6E39284551B66E959EF624DAE21EF0598E598E5FA
+
+D8DEEE0B87AE1CA77C8902CC8927E74B0599B8DF867DDB285F30817639243DB7F97191FC15AFCD
+
+34FEF8ACFAF926AE60C13DF70ADEEE70B4D2DEF56DD6890CACA39E94CACB2E01BDCE1A29E96643
+
+CC9329028C931A5F748426032CD586E6D759033F1E46833E93EFCA0AD895CEF1311380B8782B6C
+
+15EDFFC736A939C6CA53BDF65F88484E4053B076358780D1549CD6FD0234587A4616A008E6FAA7
+
+E5D9EC458FB293B143AF0858A8532FC6B9E6F69797CC27548F1961877B9C749362C2E3BD41056B
+
+68E284267156C72A8909A86037F6A755A82DF34999C6957C415212D060C15114D5FDAFDF01B3DD
+
+563428B401E85105D7BDD9AA98E54670561354D082B5AE3C370EF9E2AB1BF8A8E3BF61B4348C0C
+
+C6AD2795B453F8F81D36DBA8847143DD955203C9A0DFA23E32EC2355AFD6678A2B05FE6E46CDAE
+
+3E8E85ADB4AB71B7F84D1266EC92A846F08170694AD6657CA47F560535D0FF5725C41CD0FB3219
+
+B9BCA5F9545658248D79896A8B5DDF1968D4D95A37ECEC7F44F2A4D6888214FB19541ADCA69F72
+
+94BEF62C0520E95CBA4A2B14D12BAD004E6468DC136C89AC5065719B9175B8A1192C83A43595B2
+
+66A196E820EAC6CA3547374FB3BF23CDF14D939B67DFC5DEA9F98D80545BF93CA67240F97A1A5B
+
+CD137F2A42BDEE7552968623E6CA659FA42EC5C2CBBEF2E2706D06E0E2CEA225482214B9B6C45D
+
+97DAF24899EE8BC6D8A980E5621075B9CE837B724340066B74C013E8AD806241DA5A18BC3E9657
+
+EFFD4A1443704B90FEAFE0A407C7C2E880FE970560BAB064935F209B1971E03C33B2B37AFB4428
+
+01A9C4D63A6A93910B607D424416620559E7B95A50E879A8A0607A2CFAB26D40858B955C8CBE4C
+
+C55B6736F20EB7439B1CB96CF00E91690659147C7D1608E5260A2E84D749D90708BFDA92BD5834
+
+FC22619A51764DB4D8CAE6463AAE80503F42CB4E7830BE796E4DCB10A1EADD636C79DD1C174C26
+
+DD44830C38E92BB25DFA70DFCBBB2D0B692D3C5917FB669BB36AB2C2C26ABF2B35C0B581F76D77
+
+64644DF89EE87862DE3D5BC1EDC74912E4F2799836023EF89E5E817DF6252B4F953DA4FD0BC02A
+
+4E22FA762048837FA8C99439BB1FCBF5E215B5B4368575E8D6769E3D01A9A252D7B20327B9B315
+
+95C01BACCB65A38FF04A5613698AF2FA63B36BC6942ED241E1ECEB7A9F2E8E381D300329CBD4E3
+
+1B19BA0AFF6415569F8774B28CF9E6D343413AA0D41DC3C3F686843BB1B7DAA242A635CF345137
+
+B3FD4B6162A9DEEA6BFF1E719DF602A8D79CD5A60BB11F26D437BE8B4A039D6C2D64ABED520C07
+
+F09E8037A8D76D7E3ABB5946D4837F1B12274D0AFAB29A44E027B2A8C81574B846A7BA94756AD8
+
+F33D2B76C79FE4D94CB3749A64ECAD8AE9D4D4EE219D5FE4524EC95CCB89BA3C73F219A88F674B
+
+2D40E2C5B4497903FAEA7BC3C7F22590F8F2D6B62151885382150E9611BBC33D9ADCE695FBF947
+
+2AF79EBEA09169FA0047E09D9499D7A977ED74E4DEE3BFEF1EFE0193AAAF9B8A2E285ACE63FCB0
+
+4DD5AA4FD311EB8005E81DF970D2C3927B9327C4093236BC98FEAC8E130001239A81C426D477C7
+
+B68AAC466820F7E655251550CC979079F3200F12B6DC35C84DC5A19EB0630BBF3CBB2539AED37F
+
+4EABC464CC5A8BFE75593C7F3AA5BEBA6CEE1AA2DC43E40AA823232D66714C058F36A012A922EB
+
+0FA0B58510C1239004B84730C1C69AEB4A38084B6E465D9EA04580B8110C9B1B023CBD1EA44753
+
+F7C87390A884BFAC825D84B93CE4AB5136264B8A1E0C3166E94E8EFA9072A10AFB760FF2265012
+
+A254F0755F81E1E42ACE3CF03D443D81F237D7DD9555F2447155DD76DC076F3BFC492392828705
+
+3EE6BE05DDFE30AF2016FEA53154ACA91A6089E9807455A536753078B7294411751450CE4ED63D
+
+0DA4C9907DA2136DE96A5289B783346CE7E6DD2C1D85395F91373C139B3CFFC5DF1A2C47F32537
+
+232691820BE497E818BCA561345707AD98249DC40062E30D647FA979EFAF4FA50AD9CC270D47ED
+
+68E1E462F54EB69E6D734C6DDB41B5C2B1D6281AD3B9F497B3B96D0C94AF938E9E785A96DE5DEE
+
+9ADFF8340600B3C173B6939B5B06B8F1341276F727EA16933151D7DA8F254786EBD6A0372B10E2
+
+79058D2327F2620B039C9453EFA9B859BB5BD459E7CCCC36B80221932668403F62BD00D1E31758
+
+E647FEC1FB816B6C52451E6FFC50EA8D52277178E3C4AF5B2A59F383B271FD132E216945B69A34
+
+B13650F5EEF129A972A695FF2BA138E10935A564AF918A66C2D51CD942DE7F843127A3DB82875F
+
+1A14662B0C3A15BE4BBE1D875F8CBE54C7488F4131074822FD47C59AA4ACF18DA9714E2619C8D1
+
+8A9EBD5098AAAA1150D83681A6E8CCB070784B128F736BFB43CAF5F239E9934878C02328BD3084
+
+CF52EEB20A26BC36E76A8DFB36C9C1397B16D16224DBB9C64ADED191E0E53C61BE7D056355F20A
+
+1AD4EE38E1EC8C1927C2CAFD36FFAC24240BF07CE01FF3B5CC5866B4A3FED0BEB8695E23C1E16D
+
+6DE2883B8A66A2400313B263EC2EE6348BE002BE0AC2B5B406E392C53FD41A144F7FF24BDE9892
+
+7AED17BDE620D5EE8F0495A9E915FC0F7FC69F8655023F3D00E3309342340AFD3F00CE76D50B48
+
+5E1AF9DCA4D3F2A40F7B02558949DDEB6DD69A5E67B8B5DAA3956EF97E710CC1BAA7476B8B534D
+
+48596240555C7A220CB029664AD274F478903E94AF66026F8562CD6C19837CE9265CB6AE578217
+
+0336FF4C7A0EA5C28E069006CC760D3B535867BD376C0E6BFA43A9DE5F6D888211DB06B6F3E5DD
+
+AA666609CA7E2291EE0596731E4CE79F34FE0559AE8E1C29E8D60015A445C34F8E643B53372EB0
+
+5331E58197096478DFC49B7F092A6209A2D209DC02EEB1B7D7B12E89A0551C06D1C3F3793D745E
+
+BC6D2D6C57628E5BDFAE09936976D7C9AFB653CE4E6E198572CE46180FF9EB009CFE450BA26BB5
+
+705525051655C355B5D61145A7EE06DFA487B311DE72A975945FBB64810434F8D739FE95632601
+
+A46C6C95C8BE365245A89CF7634735DA14CC68E23F4E9E82AC0E0F85ADE8628BA1BA4F9118F800
+
+7237990280C19061A305B87BDE6FBDABE71A72740E338925AA871C918D927F28ABB19FFD2A1261
+
+C82CD3A47B76248828300E14D71C75B777375D2970DF345C37F3BE01E56A047C99D27F41D81DF0
+
+43C1103352FBA194EAAA50055DAB070346A20F39FB007BEBA34627337C1B71465DE82D2221194D
+
+D5A61B666683F09E21F76418A8086FA4B2ADF0C94D5A702A2BE6BBA71D2A9F8767B2A390229450
+
+EB9867BEA6859EAD686C61FB52157036BA8F62468CB934E10DA07C43942B964A92C279E3DF2635
+
+541FF403CC50F7DAF1F1146783B0D2906F674273388085A1F697E6DD821649569B8CEA2920830E
+
+95A966358FC6BD7F8BA0B93495D054967B4DBF8D92EB337F50BE0DD9A03C23D2F5B5D9C73DFA4F
+
+7E01125425EE62ED9CEF7810C88553CC671A7DF9295F50DC482440E40D65D093FB5A39C4084B5A
+
+39A7C13B426BD9BA5E8DE29FEFCF03915C4DF570CFD8546B274B875FD0F80F57F1A0DA69F09DCD
+
+F98D279C0001AE6DEACE32E3B2D3443524C5FE1CD2770D7F873201442B1CC63F3CC33D2EDC0E14
+
+9327AE6C9E9720B346A3D783A0EB6D39E10C6D8C42E310C37AE06BE77056F58ED39D35BB2BE86E
+
+EC0BAABE99682DE457316B7226E0C968807D33772A20D50658353D2A6F0804E6F22584AF5887E3
+
+6AA4E7EF9D470153A11759AD42DA6EB9FC0AB5496547CAD0EB7243D0371AF330E9DEF3BBDE115B
+
+C312D0784932BE630ACF1853BC7CB9724EF91B5BBC42ED211A9FBF9105ED50DBEC61EEA28858E4
+
+B579EF2929F285ACC101311E182A27DC8F05A8BB074C559C37083D5AADA202B0BC3BEAFB7831E8
+
+79916C5FAA116BF4B4DC68DF94403DB1134D96A72A81F70D2F16FAC5768B4BB454C8DCED202A31
+
+221B25B2E3F8DC912C38FC8087F2C88B2A54F9937FD257110AB63FFED01D85D4B1161F08420F22
+
+2725FEC4B5DC4D2AF65A8EDBD3B59E4ADBFC2478E9850B6ABA868553DCB23313BBF6D03D178FF2
+
+FDCF3393B051F799D6C60AB7D57D62FD23A3F076915882B9BE1E3ED0A3DA893D6BB69A9BD15C8C
+
+607F0213D34673F8FEDA8187DF8C28E6E4A7B1FB92B11E92294203A36F95790EAD1B41CC833673
+
+3FB6A0189356C16636BE965A20E8959474834794E4D8363443CA4678901141D8BFDCC31B94BFD3
+
+CF9E54C566723BB52BFC868EC02AE2B96C657FB4FE9FBBAEAB700075588C874F559F3C85E007AD
+
+CF76B3E0372ED97E3E9775CFCE89DB79D3968DE2F396DDF4C6F2B65C909A191431F5E2134BB886
+
+3A620E2D537719D2F82FBD802C388EA66C454B8DEC27B7D6624FFAA31F85C5B13DA941EE9A7C93
+
+A5F9EE3C537B709656696929840CC05D2E60B285CE114018F19D856DE6A1408246C3A2ED085ABE
+
+E10C7B7D1A8080BDE2AAEC62F5D30C6EEDB6733EB97B626435C9CAB5FB56810E3E1924AB170102
+
+AEB24699661DB27C5A92F40E4BD4A88697EA623A3F2F80E3F217D59B50649085753E9F16C55BD1
+
+C45D2C57297689D12F55F62EA348B5FF6580B48DA85B9BA058349024D1DDC77BBA000AC0C2B635
+
+DE122E3A9EEC3434BC9B97B3546BC7850C3A472101002CF05AECED688C38D5AB82966E45AC4CF7
+
+FF266AE0F68669B5EA49C65A65ACDBF9A830988BB625A8263E570EA2C6D6A786277345EE7BD28F
+
+675AA6474ADD78E016D599B415B054F67EB1DE9BE57710DF2122405B482018D248B29619860EA3
+
+A268C586775761E62651D1BCCD3775647DFBE84A97C4EB66D204CE839B6DF81E8970834C193FAB
+
+73FD40FDAD28D249C3A086759D0F7A23457B91240AA045FB450EBF2F5DF24E5123DFFBC7A633EF
+
+723081ACBBEBD8D99C41B7ABD6C1B3CBB52ECA4976F7487AD77808052D81CE6F128109881C32F3
+
+827F5EF59022301AE7917B2D2E5C56FC82386CC1E0684FB6B43A67B51AE8B12E5B82C5214EB798
+
+38A004A4D704E03BA65038B87399EE1F93EA4CDFFD2CBFA0AE1C1E81073BD88202015EB9ED570E
+
+DB33E01777343DE3F8598EBF0CE1C79F8DBF49AC9A6E26ABE56D4E36D7452E6BF7CD81A990B6AB
+
+B05824BA2C2988D509E98E9A9ECCE3F869E1A301E7A8D69C293FC60506C762A65E66A333731BB7
+
+7886E82DFFAB187E264BB8E939125244A658DB0EF727428969C86E4240B8603F6CEF7467BA500B
+
+FB2A0461F8929E652EB7C684B6356A4F1B01317BDE4C0E278BC9C0D19D7F0F1066B7915C15482D
+
+347EA313239390884645B9D9216096257AA199425944B88B8E60D1C9D818E6C7FA57484E573FAF
+
+2681901CFFA7B03837251BDCA42963597D59F5C47CCF4FE61963D6997E88DAA6A80189F54108AD
+
+91A615519EBCAA0294CE0D2A3D6D51BA23AA538561AACB1859F9D8E7C7FBEEDFFA59FDA30C4930
+
+F3C70288AE3B7DB6835613D7975AFBF1254ED80A293C286A400E74816D07AEB927730C397EB1CF
+
+041153FC821EE357CF8D9C1C55CA1B578B603A9946E8B623AB642F227041A18A987C8A826B8E67
+
+7F8DEF5B1A7A896F2D04CA19703A9492C35748A0EB34614843CB6435E36650B1D0311D8862E78F
+
+A870CBCF6A1A6DA31FC1BCBE97B02B9F9D063975A8F4B681CEF8D7170C1D66C41BD8BBED7C4DE4
+
+5ED8EA4D5DDE0FBC9B11349AFFFABF8C7C62CF72064F93CD36EE781E45938513E6517D325137B3
+
+C8B07F6C85CEC99FEE73C19E3319C4DE54973E9F237FD4F5F522A1E247D13A5A3F76D9A223C1DC
+
+05DD98AF2F2870DDEECD1D17816F6362BA4E4C3E767823496297BD60D5AE5F3BB16C47946E1B9D
+
+599EE1945DE81896C20E0E1EE5BCCA3A817F140DAB9106C6A39396356440E28C8C37F09083C2B3
+
+8C0AF322A5A6E9911963BCB674D63BFDF08FE2A7378DFC5292CAF29E29F2C6EFF00299E23673CD
+
+BF97B919E4DEAB76A52BB588CFF489D6C984BE6945121555D2D11D5760935A18C7ED5794A8590C
+
+A9EE7CC716E12E5E50604E4DE26AE7E8198EF72323B8B449C7059831FE2B32C0B7ED4F977D455A
+
+74AC42335F92FABFC69BF798F3505987E10E6EA4B1EBA7DACDF2D8F76A14031698506F920439B5
+
+542E334FB3880BEC75609926EE99529C4E923E39369D453A4C86CAE241DAD49999819B6D3CC8ED
+
+7F99C4816DD01065DD385D47A56B3FED36E1FB26174E0428677D4BC535A2CB35646C17AC6214F9
+
+3C68C7B702D168B4439FD66A44EA76BA805180535EB32DBBFEC29D4B453317C6F35E21CB482490
+
+74F1C89B3DC6A53FE588F8DB408EBA1C60C9F2EA013F1517A8DB3CC9A097A2643C0CE53EFFE5A5
+
+E5B26CF40D3A9324F0BD35B6F526E83D2A381E976E00AF14E7F4FE22ADBB71236A5068E297C7D7
+
+0994672D86FFBDBED454659F54CAF5A364FEC8265ABA8F4F2A047D54B883E81AD48D094DE78A0A
+
+D1389F5F7BD0B36B3FA11F8864D21E57F453ACBE2A892EB6F126C9881799C021502428B0BF483D
+
+304777DC0AFB7BACCFA42AAE43121A245FAD4CE23248102CAF93C72016942B556CE59A2856BDD8
+
+7CAB9A22FC690B30ECF8926699E101D8F74D98F2759E819148E54EED6392F0B22030AFA655E07B
+
+E6B0F6A58266D5AAD8365D279FA51584ED4BDF5E981E31732868789362A13F68D7EEC3ECCF46D9
+
+1857482DCA018944AABF993F90635C6028012240D8C670BE48E4BAD29BBC118DA0B733E2019502
+
+09F2C608798E3FC6CD3699B61D207753A5C7E31D5ADB610F7A9FF36C6E73442569F025EA5E8A4D
+
+FA89E43F10B44C907024316F07B4183B202E8677F4449520CC06361F075BCC065A0C4911373281
+
+88FAC72EC24B9B52500D103737D40A311D5752EBA5F06EB593B56147F708914D474B7E67EC48C7
+
+32D40AB7C8671E0C80295DE3B2CE69C9759B536520EBDA938729214C68FFEFCA119B865C2A4BA5
+
+15986323AD149636791AD00B328E0E2D47AECF406A43D94FC87CD50AC65C5D4E55EB24F48938E2
+
+8305E1DF0C6ADA42CA47691246860F50A2A6292F0590D6F8C4076F3C6325AD25FAA56A361C03C2
+
+03694A39103DD209C04B85E5B740CEC222993C676750BF937448E4B0EFC94903FA04A658951108
+
+DDDC3DECCB7B71B544D030E6DDCDDDD5D8ABBE90862E8CB4E65C298F2AE4D6AB773091F637CF8C
+
+CA75568E46C5C3F6D837954E7C1E4AED3C449FBDC85A31C87D457485D0C1FB4C97957925EABCAF
+
+80AAB9607881FD1EE9DDB9869273A69AE28EE67E694A7AC15B38BCAE76120E84A3A570466AF88A
+
+C140243B90CE2A0A206F726ACA103D4AADEF97E5B5E4C753FB08381820EC8056288BCAF86DD714
+
+BC55BAE80E8670802A30B24361B4830E55563A74E5DB9862CE0C5AE972EF9188A9D961ECA5EFE4
+
+45DD11FF240B19766D261CAC32F2FA24B8DF95DD9A5AE6BC5ABD66E0883DE81DAC808EC9E64D82
+
+06BF34D3D418CD1502C1BF865FB89046BF228323C9B259FEDC44A24B41AFF7D4E6227F33CBC59D
+
+BB33633D31BA0F654F48762DE5D7B0A03079E67206C4661BC410F3D5F46DF102741C5949AF61C8
+
+BDB8552BA01AEEBAA183ED57681FA2FD92DD4C40E8AB10AAD4857888DDEFA5B8490191A629C0DA
+
+6F099607F85ED12417E879D770E016D297ED31E4D36082B67002F833561227A28891B6D2BDC3CA
+
+CF3F6CA3D833E8B1E587B4900F5BCDB295DD1626BFCD5D9BC31B8CA086E264F25599BE42E07D58
+
+ADA6E054970DDBEBA58D7185EB003AAA869138FB31EA477C881E556A0B35841AC095E226523B32
+
+773E128F541068A77B43F61BA7891F37781FC627C39589BA4DBCA4DD98C7BFA311A7CB6EBC7EF0
+
+A2A25393D7BD84D00D951D4CF9D9A1834038838830A50352DF68C9701D0CE7584626BA1ADF1D00
+
+B592F34897EBEC6280DA5223E46A0DB875CB10BB772B7CD16F26AE19CB1F2E554374E89CD4F7F2
+
+7485D9169FD48354317B1646578D956553430BFF2090217B15BAB550A8E0F36DFD6088A5E9D52D
+
+6B5303D9E2C0AEB607749384DF0CE76644334FF36C35387D76FF85B8064460C28FC895AA0B9994
+
+C3670EA26E8335BF331F4B406836CB7EA457258912C6DF48042050C7D333BC02FEE4748909FB45
+
+8DD5D55E7FD04497CE34DBE82E88D6AE641250863B8A57B11624E62CEDD80E05FEBADBA6466363
+
+ECECB921D11DF5939891E5B5CABB36FBDF822EBF17D950EFF3F4E850CEDC5F0FFFC97AA162BFF8
+
+A67CD77EEDDCF5D5FC48A303DEB2EE716B0C6F53469EE23B553D65FC4CDE004A2940C71E4BA72C
+
+1482B2FD2ABFC6E8A877A807486D86DA69611ADFAB9E76527E6AC15006E26DFDCC3314F24D277C
+
+53305160A9EFD4372258C69E8457EB24AE163AE997DA692DDBD6F9F6B4A0A80AC2C2AFEC71BEE1
+
+3C8EDF43F7A622B2BF0C860FCD6405704D60B6C71642F27DDFC08A8A02C6108B9036B5F7CAFBA0
+
+BC0DD2EE4AD2A3D063E2AA078FCE226B11467BAF992719B55DDF5FFCE2B34466D4CBFA8FC5647C
+
+222EBD11EE60BC567F05AA38704DDAFEC8937469A83D09643F7B798EB28E5DA823B9A06B7BC8A5
+
+C05DC705F0A1194FE17D7948940395617AC25BC922B3C838C507C1CAA95B65A2A5F41929D75D3B
+
+1EDC261930CE41163219C8827803ED5AC50BF85AF7C69D57286E5120C0F08114BDC3278FCDF774
+
+3FC7D8D5EA3B4D3F2B2F3B7B6C4D62D20A7D98AABDB9B9DD7739561B15FCEE8139B81EE60331D0
+
+939E99099F2B167A0AAA9E85D803062ECC6ED36916C75EB58243C2825BE97F3021D23D73A15615
+
+12EA904A94924AE1B66F5AA60AFE3E47E5A37E5BC53572BBD578AE923C5465F824056703DD1A1F
+
+5EFADD557CFA322C46BC944199190C9ABB2604DF2A7B55480C5D7035AFB7C7A7459A0A236573B9
+
+91F462ADEF5953AB2F45CD837DB21CADA6D39CFFDBA3554C166BA7F1FD28953FC38B853627FA21
+
+75537144A6627035A512B2D36DA71BDA234132D7C2CEC4F29750C14FB8196D256F05922F26A3DA
+
+E22E4E14B52196F8CF7261CE0CBABDAC1A2C2E0541B0ABBC8E09B1731DDEBDD541D9557AFBD90F
+
+3D84A8789EED596F6DEFD34E4651B7FF9DE1CC419FC7FAF1A3E7D7EE147D60686EFD5F55F5D911
+
+EFDD55C4E0BA647AD599E0CE1405F71669FAB6791F465E7FC1C247AB4E52C64FB2E6A18D4463B9
+
+95CF637998CB91BEB1B68A8C3E4460F8F1E35169F78FAC2D6677E243854D6F6C8685E5199D8FB7
+
+25E383CF338B276FE785954434EE8768FB95311D47FD3273751E4CDECF0CDE3F77A7513B39E319
+
+186B4495016FB97B4D996F4FB86AFD00EC9F54AC44AC519BBA5DEBFD5F39286817B25695750E1A
+
+4F210DC8C06A862F1F88CE3AD7D5764581E588D472B8B407CD074A5CCB39D6E138FC3E58C9C096
+
+4B8C0195847A7BC0E58E796EE60A10FE003F26231EA0F0EB7E100DD6890F6AFB8C2290290A97DE
+
+4EF1F5BFFC07292D2B4D2618A430FF3E115BFB35116835891EEDEF4D9456DCC8A25DF5429BDB52
+
+7151CA42570F44CF36D6FD31A10D58631F5966579495D6217A21DC436B7E26ACE1C03E62CEAEA0
+
+7C09A6711FA6B7F34504C4E0799E797D4D2775FFD0E9C2CED9DCC8F64F8639DF8B20EA979708C5
+
+81BFC54F08BABE9F5384E357885C54AC33E0FED272154843631CE03EFD93DF01D1600BE65877B1
+
+51C41219367641ED0192E12F26F871B13ECB2582F75CA7F1BAB3DF0B89942BAD036E9AC7A4C72D
+
+6EBB0BDDBAF2F6F9AD284CFDDF2934B4EB86E94999D1433EFA2E278394DDF686188AA8E6C15179
+
+AA232AAD24D5036A39A49C84BF33AC864FD76BC91D8E915F0A604B8A4AA99836DEE01D72E06596
+
+88FBD19195D92F5C7FD98C86804E7D3F7E818CC61B377ED48B5DBD744351564FD4E82B6DEB1A73
+
+B964684985FCBAB97AC903DDE810E01B27C44267B9D6C3CFDA7400CB922F6DCC6B711C045C7C1E
+
+BA276EE915936643A0A6CEB49C0DEA87B0D67B4294F21F30FFD59626D777D5E63B5400B1EB92A4
+
+03CB688B5341C40A69C4D413FF4B317750531EADD11F88851F6345669F58C53EC8B764AA666BD6
+
+E54B48E4743B2EEC13D7161C5203433FDADD9A4CB3E69641D3795A2E810A45BDAE3532B97A52C4
+
+9DB552A876C1ABAAB2E3AC102C9879D203D62B1BD4C23BC52E3F0C94A557959C6C575155F7AF65
+
+0542B5C10247CDB5409454C6BD7F56C13230C7F5395E211CF2FCD872FBBC1ACD687206EE59D6BB
+
+4EE63E2441869F875AE35680356EFE5A08AC504CBCF36F97743F06740E5137D17832DA142933F5
+
+709ADF6DF5177A84D22BEDE4CB3E6D30B11B3C91BD0D202352BDC767106C4A8719DA2C75A355C3
+
+53C67CC53775EE192E31554AE02399EC3E5CE779AED77D112F3C7059D3C6A316179EF3C3AE04F2
+
+3ACA411387E1E9D0930E9C1F3752315D631E556936CCC6EFEE77DCB7E705779F8302848EDFFE70
+
+D12A5C7BE23CB6ED65DDD47F0E0F082160A2538E1B032AAE17C97CF7F97217972F997CB20AF71B
+
+897B0CE19C8972A909EF1380692B82E9B09C257A0CA5CE07F272B56BD321D9EAEEDEEBD08634D6
+
+B9EC03320D2CE208D823C0D02D5BCB9A991AF784FD705CA331662621D3D793C8C311F7645FAC00
+
+BC8CAAF74F3FB8D3323639082601587B7816499FA4CD956628B7806CC407815BA0CB9E26145300
+
+A915F7B546222E5B4969BD44D9DF5194D7719A0A7BF72B0FA4DBA8B23BA02DC8441A9E4C57C7DC
+
+CCC2F5BE59786F3D79D070C1F2D02003160BE4B02E6767C5876973C786E10F567A1128C675DEB7
+
+46183DB34DAE298E07F0F78A48FBCBD6EDE2698639ABC2E5A1B2E467D93A69BD2D67F41F62593B
+
+8242C4A4068BEBC4FA7165B60BCD07A8752579FE46CE7D0494B06D0CC2E7568EDED60D0F9CBEC9
+
+D3D4032E650741BC21A83962700144F1CBB68AF25BE0C0D5EAA9DE8DD8A68DA7E0F6AFF1BD8FB2
+
+8278226A2EDDE7E0B33BA6D2A0514D4F90B48FD6300FFA9B7479DC934BF3AAAAB95B2AF9564E9D
+
+6EC39957E772FC5F24816637820B68B880CD84CB0C50B4DA212A20E904D37B360E29DDCA2CFB57
+
+EF239A5FAE7F964C72B1FAF64972E4969337018D26C9CB9D68B6CAC4E3CD2D3893145C9432FC6F
+
+0FF8C062C3F0F1C3AB0ED8D6B5505BD16EE6A15AAE57BCE07333465501867F2DEFBBE0274E4673
+
+8FFE8BD1B4211FEF4A8C28208E98CB4D72DEC559127AADAFEACBC0D98817239180BCB43DD239F6
+
+91A3EEDE515A3370AF5739841AB9C91DB77B91441E4A6F0FE113B4DC509E4BC951C800CE788526
+
+9E836A5AE595A7277AAC851330CD3CDAE4DD4569994E1F4CFCC75E459BC9E1BC7F215BC2D6926F
+
+5DD509A09CF22C506EBF22D2304870C3905D94609F8295D0C55B403A7572FF4C0DA600A74D3641
+
+DE4DC0CF14AE350CE94E713A2AD831422F2171777187840069F414CBD31F3648F88287C50E4277
+
+32054F5DFA1FABEA57EECB8FDC8019D37336D8D0E840FCECD0FDF19E56A386C3521E28726C3F0D
+
+B6DA49210F72C66BCC1E5CAB15FF19A8B25C5442A0F9E0D41FAF824078FC6F6EBB3778C6FFDE69
+
+8EE021C353B2A00F83903E001A1716E75308A08A8A8978CB4A99D379C76629EEFF65B926EE3338
+
+54144F43B04F838AB5003FC36505325D3E4E4B5FB75A1221B32DCAC4CFD3588FE0DA34AF3AAFAC
+
+A3955CAA04856A196ADDA16171AAB7E21C34CC447741E506F153B7F466871342AC72D798B63572
+
+3F4947AF84E679D4A9145EC26064F02388C731B2DADA26977C56FDE09BBDE051AF895A9CC4A80C
+
+E9AAE79F06BF913CBAA69D445B12023AF1A7BFD584D44CCE04F50D77E92F39294AA1BDB08FC656
+
+7218CB7FA34A09E1574F7AE40DE43FFB717625F2C5629AFD71ACD8D80B88832C24D8DF82279D88
+
+32811AFCD634C52E321A4778FF066508A0A63CFB3905EA75F5821DD568B90D1128BBBA44223C7E
+
+75DC8F780568FB2E603962125CB02C1A492FCA0A0096A5BA8B7D0CB1051A94EF617DA1E5771B0F
+
+DACDCD877D0699E01650F8CAE7027A20AC308B7B71F8D2709CED981541B50456D7D1724D28FDC7
+
+4B5FD05BF71A98DBA1B27D269436C9BC668FECBA8D660DDB7CF7F7F961BEF05FA62E49421619C4
+
+4CA720C2426A1D486C95E026416DD8534C85AA200F95B8EBD4A452541629E1FDE2FE11D84D969B
+
+2AA01A9B7F546A64F598183C23E26D38D86F47E29C8289C5ABEAF1D5ACABCE10DE46C50E3D25D9
+
+80D079E8BBA99515AFD9DB25CA8D34984D5D96ABA65E2850482F264D8316ED3868D5357AE02AE7
+
+3CD5282DC1908A666F9EAF15FBB2E19D3EA3509C5781ED0690A20621BDD31AD2D80F7787C5E678
+
+B7171B945C5AED7918DC313E011653D4AB5CA151B48144A0A6B2C2DCFF361F711811DB6F249BE7
+
+6579A43ED363306D6811D6E5801D6A84D4C892956F0D00A98CBF568A4BE481325AC9F0972FBD5B
+
+6CE323B0FC432288501276BDDA4D50505BCEA44A5C7DFFE118F1EA9FB0A01CE3B7D8D042CB8C40
+
+FA31C0C7F5D650D856C6CA864BE3BB46D88752D81EB1500923F9DB47C86B86998C8B1DA70776AF
+
+72BD3CEE2F22FF7F132DEEDF8E1FAD96D242863252F03322B458428A5D996852B1A862C57CF087
+
+C1ADE9803FAF24D25ED54C9CAE1C3175E752EBF0DFDD3DCE002BBEED1A185F2B968F1789645D13
+
+D83E3FB15F24DF44E85B303F32C681762D23ED813ABB75551A32C8D35C60FB3784E926AF187F45
+
+E98DF1FE17EA91AD0A11EBCF14BB22BFF19BB52452E8E06CE322B2959CEAAFD992054CFE95C7F2
+
+45F56ECBAC06595F4202A5272B7AFCD40C99EF3F78DC9FEBD552DD4913570438351CB76ED69147
+
+B46AF589E77DC42EF021804940ABB395F549AE7661B0E28E180C8B24B82BDB77AA17D8FBB1BFBB
+
+B16ADD5B48DA8ACA8321A66B606E67F0D64215BC3E25E74E26E6908DB19E966F94B1F3FF872642
+
+5380FD722B02C251D57E301016F29A98416D90B1945837E265A284FF2B8D655891D769DAAD74B5
+
+EB5A3274FF9140D36EBFD08A5BF579BFE5B3BA96856ABC7C4871A0A8F76D0734725F6F1D42EB9B
+
+B1EC84AE290BBC3DE601801002B8E5F075A15D81F958EA446DD2DB8F5DA10E7729AEFF94D5CDE9
+
+9E4B923722567B86EC81999EFA2F713E597AE8D971586DB1FB89AC63D3D4A6137053B4B9C9186D
+
+29994F5E4C70172153BE37E3AB1B9388A6765ACD2B02EFC8DEB50670EEF79FDBDB3494D32E9687
+
+A193AE6DB2B7B73C43876FF32D8CE6420096D9B7F8A9850812881A1E18054D57B98403A323D05D
+
+DFF6CD7AE59F4EE5FE466CD63C27D7FB6FB63885D05F4AC74951392F0BAA27B08CF886860D4484
+
+415E1DB8EDCAA39CE758F8DCB80F961BD4306E4A462AD7AA3332195002B32D53E5C212C01C9949
+
+FE30E8A3EED6747E7657A567639006F3B411985444AC3E1BD133241D58DD32A27803343E8DA969
+
+60AF85010E9B3B16AC4CFED28F3500D558CEA50C507F7A89A7F069B1FAE873584D6CFA0D4F1C29
+
+C46207EB676782B203C55279B677716D754E0C14F15711975054D94ADC8210EACD30208E0FCE47
+
+F84E120C545DC0F1A4861199D42E5A809B531D42AB092C9C42167DB6303C5A334DE18DDA7E79D8
+
+ADC546A81AF4BF03695662A9CFCFE6FA469DAC6056242A8FEB87929F978909C6D4C93DD2D60BE1
+
+60FEFDAB92638872C3E6518746C1B1DAE17AA967DE79876999615075B2FFDA67EE9B743E2CD560
+
+EBBA5608A98A05DA37D8F21C1618C02D8E978423DA80D7C38CF562610E85DD0F1775D8021C9432
+
+7CBB1F5C20EA41E8CA19A4E6D50A3BD5129E21101E312A9C8F470E1EB12D038E5AE4DE537F4327
+
+B77091667D196C3612BC6925A24E66E2BBCFBF6A4C938457FEE36DC1FF74ED7A9C8F6483C58F2F
+
+27B7065F35663227EE4492E3F06B6071CEA45739ACB943BF0EFFBCB99D03233C5312703E74CFA3
+
+5288182D9F371E3F22257964F86472AAEBA8061BF039C98C0B8DF14C70FC8A313DCDEB943E6253
+
+5234AEE628B9F97660A768CFCD04701A0F4C818BA5C0219E70B37570DB0D625E4DE3F220EEAB0F
+
+A19422A17124B098EB4C9C9E71E2AA0BF536A81161C2788973EB56CA0A8064D6025E64C5726523
+
+265C2E6AECF2E044D0969508CFD4DEA7AAFA7177FB797A5E58205C094BE985FBD4CCD2D249ECF4
+
+B2D76689EC33F64889F2AC40092F47B9BC6D5CEDD1A9F83A0832096B81BF7629E46591C109F57C
+
+4018EAAB78FE716D76EB3C35129BB163C13F3AB7651E389713513BE66A06E082E90FD2BB0C5CCC
+
+51D229B3BE5AFDD175DC9791EAC0C2BA4B32CB0427AA15BB506BD677907CE43D58F929C0E711F6
+
+FC95778515C25FE9B892BCB8448EC6EC0BE48861D1D57E0B36F62CCD687D82404CCD52A38AF266
+
+E42D201953249DD0E84308C0CE4A6056B0952F25084C684D3EF20C608FA6F4C4E3A1A274307747
+
+4E903EC46735429FCE1E1EBA363D509385AC067FEE1027282F6C735768B965F26E542C4A66A62C
+
+C134DFF94C692401FB96E63F3FDFBE3F531A26414275CAAAB1468E2B46049CB39989523D2268DA
+
+DB1B9DF4BFAE94F06F71FB2FBC496A687E62CE86572B9ACED7A6C65F9850DAA52EB296F7DE332E
+
+C44FF1E0EF2E2256A1B53BD9C55E75B81AA96830B1EDDA395C6FA74E0D2D509A5D77204BE7E17F
+
+8E4EE6CB1763728002991C68357AD3882B9C216B8A75746E29680B4A807386364E8E5CE44FD163
+
+4DC1EE5BA8F95AC20135A4344E1A9A367FD474C3572818FF643DBCE8C8D0C00DD800CA9EAC582D
+
+C5EF87C4D13408759DBAB4E8AABE8E77CDE2CA89BB581FF57D7DD284BB8297985444DB074D299B
+
+3B71A8F9B586E153A23F750B66F396B6312CD221F44172A6BA22449582A9294ECDBDFDF0917B66
+
+0A2DFA1E643188A0395C2E73B35FBF25A957A456791AABE4713C2BD33F82E0B3DA41D141FDF28B
+
+94B72AE08A0D3982864E8A565FFE5BF9DB4A49F721ED28CE94DC27DAF503154B2AEF8D4C3B52DE
+
+AFA794FBFA63941E9AA7F14D8FD4A3971D399BDA0797776D69C0F65FDEB09F54FB732C4EB24A1E
+
+74DF30F098C59BD853E4AEF3DD4719D883F38EF4131EAD84DC3E23B7A35825F39F603A1F8F10B6
+
+FB7FCAF52A1A7E315E4A8B9DB9568C2F23482E9641F80073330E8D1B0280AA09793F1D93D8B5CB
+
+7841A1EA9C923275103B63215B439F7C23C2EE2A4CE38DB0B7FBAEABB44123F0FAC8A5FF1DD555
+
+1F4CF7B3313D6A392B58BE872FCE3A867D502834B56AB141814BD0453D048D6D114F938C8514CA
+
+62060978E9B954F45FD68845DADCF5B8992BE49B25022BF659A06B65D4E7182565A3D9009B62E0
+
+D1AF3E897D35CF76F5AC69752DECC7E3AE398832F4EC4208A1249F3175E65964F4E183C8DE2F07
+
+ADF37CC73A111890AA07F12B9E5FA53CC3FEC2AFA98281D95DBBDA5AFE7709857B98F21176C381
+
+5B765AD80E38658EA89A6F88354C3B1C906749F4770F1D97C1785998D591C001C437B231508398
+
+1DD933C182F3FEFE22C6B9817715BD0B0929A1C96EC3342C31A2582B9F900CDD60F0835DB71597
+
+4DD0844893C13D12728093531390082BF3ED1D4C7FF399CAF014BF996745142BB3B49CCE64613E
+
+5274252DD36C90C714EC02E6560E0AD5EFE5412B6784421A7C12A4C0EB9B079E0A2CADB5951A92
+
+A6783053658AD4705F321A326164CFC717A214534EFD49097672A9076B3473560FC6D0BC1DE474
+
+713D41F68B804DF99ADFD2E19382305989E25FDE33356E3D8C4574BA41FE107BE34D322A1C50B7
+
+3B964707DDA438017226D5BB4E2FB498D50C9A7CE93E6D52473681008B733D494BBEC7683FED8D
+
+31F20172314B781FFB9FB79DEA628109340C92ACD967D4673126C95FA8C6E2A8035C919C3DC2CD
+
+A6787DCD041223A1F555BF011BF3A0024D8D3418B4CFA68389FBC545E1B37AA102D91EF40397F4
+
+E2C4564FBD4CC394C0A1153C3A0D51433725D358253B37567EC595609B2BC0FEA0AE65DF4E1D20
+
+73481EAB5035A7B91377E50C19A261EA0AE9BCFE4DCFC78E426646D64A546CC03A8F29B6A513F8
+
+8496EF201D7A9A3345454A497A06F57BCF060C8064472A7A6C156FFB96A9CD663C807F4DFC6B7C
+
+7DF42A95FC91FBEF4E27D1AB6010C76B016AC1EECB98184E501C7750500819FA4A36A50EAAF09C
+
+A8A0282200D23F769418E8421A940B894208860A5FF525EDB804AAA456EEBDCA2D57D5E45EDF16
+
+75B3A693F1D7A6961724420BBA61CE91F5DDC953C698ECF6CD185BB510B05E056F87E6EA729CAB
+
+38168E57A52153A5BB5938C085533E50E6FDF30AE4C5CD5F61B31BA06E5B069D76A95CDCC64E7D
+
+FCB162DFEE4836C38AB16CDCCCFECF1810EE561DAB5F5A9059D6321EF09863A1627F5C3F339A5B
+
+54CF627D5C45B794DAC46B9E57FEA489603A9D2315CB9A42CB24ABB75555BFDD2147E0DB0A7F58
+
+0BDE81C7C70C3FF6FD6CA304D719C189D0D7D991CF3E87E15240411FA94237B9FB145FDD4380FD
+
+3A5EE1843BF55C6C9F640F7B9E42AAF1D96FFC44D53719B83F9C11CFDFFE51BC454F50F20D4F62
+
+5516FE4FFB1EE798C85AFDA53319185A2CE94EB37170BD3B949582ACF20F43B0F1C4211843D50D
+
+4C0FB615107A5985F2CE49CE2F7B159C4E566E617B1C446198F48DEE3D31E9194AFCA71CE2870C
+
+6526AB1B0614C1B894FDC0DB2F2356082B8C311CBBFC4422AE45B90852326DE98A17CA8F5EB9D7
+
+492404916C61367BB9DF4FAAC2FE30C6A739CDD73E0AA1ABD14BB2D7663C86BA2598AF8B553602
+
+DF5A032CF80F79DDD04D3630DED47B48E58EE74EAC81A5BD90236954A02D98A3DB705DFBCBDBD7
+
+598D774A29200632F546A159A2656B85982FFAD6E2668069663CE017D158B7CBC1310BBB867053
+
+B300E8FF4A5BCF286D6D77CE5F5890D3E3FDA72C5DA30D7D72CA3E040DEC3792FEFDA71CEDDBF8
+
+58F17396BD5B8DC99EDC09E9A2B98877AA79665E1E43CFF02030BEFDE9E1497C822AE458BB6B15
+
+0F6AA44D7064E68294BB84CC34535060053D36A75B75B7DE664D281406FF31BFC907174B76FC51
+
+1164602EAEC09AD19A0DD24F003C17FE377B75CDA898A38A4291EE50C5D9C69F4ACDC239477849
+
+C60F0099822EDD6E3BB567ACC171F7AC87C775E56B079147BFCA802075DDD839B869C4A71F63B6
+
+B2C65E4B9EB1CB8BDF55BD6EAAE1F290B52D712C14F365D3805E29A3B5643BB90EA7E1CF8D9B42
+
+FD09FFBA06CE9941885CA6F91F0D1CFE91A94A9BC6164634FD7CA2AB88952FAA0D249FCF47ED81
+
+B9B520ED9A59CEBA8993932D67C4F9ADB27871E711B7F0F3A4845510C423845F396AC3938DE83B
+
+0304054192A788E343D51381E622E5D46FEAD67D853BF1C8C269D90D21B6267409A20E24ECEA5B
+
+1E0838A434585814C7E5128BE6D0C248CAA2014165A8B97AAA6BA8A3BD868361E8AF0C120EADBB
+
+C229EEA78227188AB22D8E85F638373E74CBEA7197BAA9847D8EBF16145726AA706C0BA81EDA7C
+
+FF7E88B39F19609165640246A4A9B7F261A5C93A5AD64D933C4A8EF9D026F2297F0EFAD595D0FC
+
+87C1393EBB9581D91814C47A0A3B06E5CC450CC22EE1B201752258453D4F145567F7D83CD99920
+
+B5C5C19B0C8BCDA6948298B6771A50CAFEC673F44A6080F89880EF0F766DFE9FE1D9C850B0CB7A
+
+6CCCA280698E832649CF604CB549CAEB31CD8356ED106F365321CE6809E2BF26C186497CDF2D18
+
+698762E4749A90F6C1D95B8EA7EC96319113C87116118100FCEA0D550F2832C57A8BF5E1E1C847
+
+F0C90EB114C7CD6C3AC2C2C5D7A7B56598739CD0CEDCF8D069EDC437C7CEAE5C0CDFD46BB57F23
+
+BD0D61B1AC0B9205FF34194628D5FBEA6CF56DDE45943EA188825138341713796874E10896757D
+
+93ED98E7B60AD890DB2AB682330AE8E15572490001C91EB2A8D7B56B33BC7E0599D4DD3A5692DC
+
+D2E05FC5DEFEB9102505392A008ACEE79CE7B2BE2A2B0AB1E783F353183BE0FC9D19C00474E0CB
+
+8817352AD755C63145D7C965C0E742F1909653FAF30C41875C6B7ED342141DB4E74512EFCC5B64
+
+A91468C89A8E692F0EBFBB4BAA6264E31702817C9AD8EB8BF75104E4D4ABDAD1FD5A81166FCB17
+
+A54E71767343F36C47D47FDE07FA3B7F943C2074622BFAFBE75603A0A117C1BD679113900992DE
+
+63C0FFAD063B669BABFF040F372B03A3030D1D1AE05188B73933127E8EE73625FC75DF1138F055
+
+C815FCA4AED0873CB6BC13414731FEFD7EFE52E3EF824C75E0A0561DD0D7BFDC5808F1B78B7D9D
+
+B562B3F0697A11379D087D49CBAEBABFFB60402E35DC6FD4D20D3C2FC88651291C379E4E8F1BC0
+
+924BA435EDE740137583CE6241C8C2FE4DCAA17103C8C8F40A37D27428E81B370788FA30C814BD
+
+1501D07654C470FD5E94CF0C0C52B5FD6E510EAB08D8869B108849B9003E7CFE8A256DF7268EB1
+
+DBF4ADE9FAFA0963B1A6A9B8AD40011E721B992A9FC9C998D26400ABA8C5B9D521C28642728063
+
+D9D0668B2B639E625D4B4F2FA3786E57E7938F995C893E7D332621716C6968004F7C302889C4BE
+
+46046983225AE2D1BC276683744800DF9683E960A8689338789ED2D2FEA1D639804EDD686295D9
+
+0128130940AF251D6B7803F0AD941F3F3D999C5459AAC5765C743BEB8CB02461B54EE0281A6006
+
+3AA762187D3B03EDD3B0B1F4EC416DA20DDD0D89CF302F6377CA73A36FD44E86C4DC6DAE2F5A64
+
+AFAC62536CDBA2C86D6AC1C6AC679E50B557045B2EB802C4C7AEBED40623B17A93ED24B65AFA01
+
+0C3FD297B52B2647355A411ACED255CD4EE2ED397B3DBBA4FC2745960491AE76F826EB9C3442A1
+
+661D656C27C486B3568A63F0D6DB571B17380652333C2D262A69FE1AC016D6D67C854A1AE0D72D
+
+ECA2AA38E6A3A3EF52B4EFA56B1913C0154BC1722016BCB3BE5B4EB5160DC9CBC068BA3EEF1F68
+
+7B663D25789E03D465A88B93A47404AB2CABB24AEA4337A79DED69CECA3E5616F3A1BC6E923B21
+
+2F58DFA41730543D0E484D43621E697DD091D3BE143A85895824C13FE5B2FC2AEC9CE8B4899197
+
+8019B6AA777AB5EB24FA352CA317C7C7F1E9549501DCE4C016AB22CF3FE5F1B911C5FFCBBC7969
+
+2D54AB0B0C92A5DC73A5BEB28FF8D2963CF66AFD981EFFC7A1246653E07A5A071442F0F5F719B8
+
+D60022D82643527C424D74F130544FC363F9D4F771B846337902AAE901C881130559CFEC5630F3
+
+767A1E1200A4DE082427A6D0DFD4CAA59DA510C73F7ED165A7FCAAAE1B541F1778A6B8FE223F28
+
+597743986FF80C2142BB9E347892AF7AEFEDD29ADCEAC1498B31F5FCEE94BB9E48750ECAF7DD52
+
+A39E793D99C03D875B9330FB1BE085B968C3B4EDFA0F050CF84405D3A42EC8732AF0DAC9C86661
+
+337B70929CB485028EEE81C0B465842EB01DF15C1EC0BBA5805FF3E900576E749187C0D94FAEC7
+
+E3F93F1F30D11242E7F65FE0EEF91676419B2E43223C0061E46C41FCF5FC82C011D2490D7A840F
+
+F0A8DD6CD0AB1CA81C273E1604A9F54AC6EA6BE04E6D14FEB14DEB14DC7CDF5878F35224C5EA7D
+
+EC76C8C5CDF816164BB47F9C6020D371F30419198AF45BAD5792D148F915BAF0DD0841169B77E4
+
+5AB50CDF50B98B4C54CD0BF91269D9FA67F74EF71BCC462AB9EC71939D361EC20AB52BD906BDA5
+
+FED00D420E32CF30AFB953C4DAAA807D5A5D3F24A353E9B0EDCACEBFC69A29E65A5CDD1B61FB66
+
+5003FCBF372FAAA06019F9945FBF32D62C461F4F4E89A400F9E0B3A46BDCA99EEA1AEAC92B3ECD
+
+C7B14616345D9A3FD1837FA24F916881004CC27351A131400D7634ECAE7DBFEE4553C86A9B1362
+
+E3BEF463D3B2923B45F5D8241F43533EC0E81168EA76DC28DC20F6A71508EF1C0EB6B946C220DE
+
+FA265F3E8F35EBA374D0865539B3857C9A21B1D43BED4EFF755B1E2C2EBDEF2A3652F19729DBE0
+
+59D94FB5448BE1F8EF205E070199F7C1D55394968A1FF745AE925EFB7237FF79FBAA77731C6C47
+
+F6866815020AA41F7F3051C7ED028518628522AE80FAD972B0A988F5793BE8D421444A2D2C0061
+
+8C6061A4CE81A807ED81987248D637B525C4E2A3D24E8AB6EB11FD36E9BCFE5432E46B89B2192B
+
+AE685D7EEF494C82A45EABA1363D2F4B7973AF5B2050B3F5471B2027511F816F1A3775861673F4
+
+B292E3425234A41A3D270A0D0C0139C105731A6F5F845685B77876B46F5ABB4DD64B669323967E
+
+D11E40E3A1837B060A6685FDCE58D2DD31D0C9A9AC68203E78A787FC6508B4604DF609D14D7AF3
+
+0E0D2CC07A4905339F7AE4522D6061FA6A7E4CB7A5A8B2B5C49D7A72DA46892AB0C82AF7D3AE1E
+
+6D882BDA8C266984230CCCB95AD2F5A0E33685BB93DFA60D8FF703C76887C32D93E53DE648C72F
+
+25128565DF4F410D1B2E8C9D569B706CB99542A27BA685DF09C752286021C18F9BD2B9C582E827
+
+745D6901DD99C4336C0268C0E8A85BE9C523DA1E4D0BA4571EADE80C88A14BF4E7450A1BCEA1BB
+
+FF95BDDF2AF1BEFEBBEE7429A4FFA5F72FD40A7AC1B70F8EDB8325AA8A611E37B0BCDC846C6C13
+
+CAA9A830E1F090059C6E3405378DF90C1AF48288481268DB2AF862AF3AF7A9C71EB60DBE819839
+
+6083CD2F545C7D78A37B90CC3B9F35B30F8D424EAC374DEB8EC893715791EE8B0CF8F899A4582D
+
+C9F2F738232B983AD8A77855D1E61065C4471EF0CDF72C0C8AC6AAAEEE1A767E8F7F0035DC77AB
+
+95BC1E2AD39914DF3E13725D8C3B5DE747B0EDF1FF3F80FD160D9A2055B4F2FF20F4626AB41979
+
+5E1FB1F382A07639342A4439A6E2F18F3832BADDE63DA1D78FB63557261C6C86C6E99FC9D252D8
+
+95A9B653782A4CAE61A6DE512CE97EC46442BE27746A90474800725E95307825739592D585054C
+
+07680680F1B60D37D64A5B0A69C84BFB05CAEFE941AFF94CD357A53C9C3E26FED2205B11F82F79
+
+64DFD8FF16D5A3CE12905945BF41C8A56A599877615B23E436DAEBC71B45BF0163A4E6D13238C0
+
+479C3DB9EC99FF0B74CD22248651F2E1BC7860ED0336E6C078D0ED4FC72F494D3F136528B25CF1
+
+53D41DEAA0761EC1E8F31F90DF1D73EB3A5BA9B52D829EDAE98000B6116072AEFEAE4D861E8928
+
+FF9DE376C856EBAB1A189F4248318A44CC3E073B855A13916073162D7A26C08BB55BB39A12033F
+
+93B55DB97CEAAAB975A7372C15D32D66578A6539ED61097D4E019CAE33119870E96C3E409E44BA
+
+E5F9C92F044BCBBD1B1041C5C68C45B766BC1FE51B57D74C11682E6FB6245DB5B24840FF1AD084
+
+4B98342B17E18B42B9FF61430B3A703D97EF8FC75B5F8462F404CACCDB2E6D947C1FCE7DBB0388
+
+DCEFF510B06216C218BE38F9460726FADC19D133E046C9057198C1C25DF85D45EAE84F3A66D339
+
+D9A1C0CD7FB6A8C706A9BA062E6415BB11BCA1923732B2A9BA984FEA53490547A03063673BB384
+
+D78CF48782AD45111EE91BAEC2128DF1A273F9143A3D28AA3E1F22DB7220092047E22268AEA219
+
+D0037677A57AA98432E3749FD577DA26285AD0E67E231F5E208385F4757D217C7070692E6AEB04
+
+EAD85FC981AD586A35293854C147A62230A8790822589C62C1BC182F9E07B7E0C5B1D02E9A73CE
+
+222AEBDB0AADAACA9685B12D914220637855F928B1C95251080DC17BFE674938D33E6C92C047F1
+
+BDC22EDE502AEEB780D6FE78304E0AEB47F39A7AA01C8B3074FA0A423B603BFB29D99F1C125E41
+
+42D310FFFA16CBF8EC7C2B09E7B088FC222706993BB4EF41C9329CF0AC1EF60DB5BCD8A7FEAC1E
+
+9DC111540A7E1633F36B0D94CB0B15A8E307CA19B3CD877BAC7AB9038CEB293CFA0EDC053AA4CC
+
+5049CF239A0841C6391A1ED537B49655EA5395477646BAAD042A98B61DD270973665497FD5CC42
+
+4B30C3911C5589231559DBD1FB713E1A384DC62A16816558A15CFCA84CF4BAA29835107C113B60
+
+04BD88E1D4B6F0EF035083AE58040791F8249B764C341064E95D788B90695E3FA9E547E456F5D4
+
+7995046BC81D5473E66C374FC360B4410670E527BC95332D6FE7DB8B8DC47AC472F37E83240AFB
+
+3800FCF5AA3279E672B3DA63FD22384CCD852C2516271892E923B9932B6DD432BE49C90DC0B554
+
+23EDEFD604A08963151679A94E3FB3E64340399F075A21DEF7843CBDC9D2D347D59CB072F12962
+
+7BE7828A6E9DF46877235D035DCB1B38BBC44BA3E7E8FCA39B5B34CC649152D23095F93B74BB7A
+
+ECD3BBD7E4087854CB47132679FB573AFE2A091FEC294B2B9E730625F68291EE7DC28C3D554037
+
+F62B30B05121A5A55D37081BA4E6DF3CD6E7347C8072E518250DC7305555487BA229F7A35CAE7A
+
+7E53417AB93E9630F6CED04F3A8C0B3B5417DB9E1D48C63EF34AF5EFD4F13AB7697F7DBB88B437
+
+A26532070E89E418AEB58759CA2EA0403C3D4EE2260F1DBB3CE9F1F06EE4B9147F9DE988324791
+
+E1C111877A6825DD08E8902A9555D2FC7B8B746C4B214AB4721F6A8251CA4D62F8E33CB4A7EB78
+
+C6C55F215314612AD89D5DBD8D5F614C8DF58AA798C7C9324FD435F059A1E94E90B2BD5EDFBDB1
+
+FDC906CEA9F5CC1204A0EE9FB244AC48B3F85593C45FBAC2DB4273AC81C68EBCD7B95E13B3D8D0
+
+87399C5EBAD86963453E54A2DD3BCD91ADEA9F0B13457B456ED9432C9EC1F4A34AB0FA8235C26F
+
+23838D53275CAC1491BD8A45026446F39EAFF0CA3CDF787D3F75EDF0D90260801639B3024B04FB
+
+4D0DA03D4FD56A2C45AA94062D92354212BDB7E62DB57BA0F08EB3727D5452E5B70B6F0FAEB0C5
+
+B8CD99011D992514D5C1D108E7E6E3DEBA9753D96DDE02BD87FCC830DF9AF89D97D6FDD9A6C77C
+
+489EE06A1B453F8A7B3776F11DCB71C9304899A22FF393F8DA55460CDD2EA1C8C70F4931FA109D
+
+5139EDD0FC9E323D0F8E323449D12470316A1D5022DD855EE9357A35C0673A093023DF988F52BD
+
+6438574B5FF0EDFAAFE12DF3747300456ECDE2814B5CB39EBBAC8198B3FD21D1FE47D7E9326A67
+
+99AB4CD5072584F774E95C55EC967AD6EBC94C45E3E2571F982379234E5FBFCAF666ADF6C64763
+
+B99496497A44A1E300928736B77011039A31CE6BA569B19AB447A6F1C95D5CB423D6A6A9FCEB77
+
+4C184F45EE6105F702B25E6586296EE177A97F5C508393206A15C40BF1EE90C1DA654EA12BB4E9
+
+C0F1D8074EBF22BC4FFE94DB00BBC01DA692DC6E72F3976C6184B7F17066B6C0B913577705EFEF
+
+F28C430A0D20E9CFBF3F1BA2F378FDD07CF7C4DAC021FF0A65E82A784F5B4DB061440032007E3C
+
+CBC4919B756235DB7988A17F76C9F16739F3202102D84484CBBFE5BC2927B020CC123121EE247A
+
+A03AC0859B54231C345116314A453E35E1C0E9FD30434915616F1B6CA42073D53EC446F4DE65A0
+
+4060367D2AE61F4B71945D3F00438E98BE840AB4254A55FF730BD897F592C5308A41351EE39650
+
+D71D24B8F2500392B68CF88C25DC357CBF0A515124336BBDFE42A9DA2AE5ADCF5F74B4B6285C0C
+
+6BF38283EC0CB48981C142E7072713506B6A38E991B507DF8F0927CB86CC86C7102446EDBB9DA4
+
+019CA4754FB67324019837E8DB09C4FC33CFE423DA1F2FF32CC343409C2DD71C814B930F59FE25
+
+E81AA8EDC97BCB05C03A51C48438020816EA31E6CEE57E394F6019945ADE3F9BBE5238F5AEE297
+
+82896EAFDB40CB42876BCAB6F37CBF8C05B9A84AE9D7215774682C0F32E23FFE0D61A04CB9E74D
+
+1D04B3AFEAAEF7B94251576B80EB8F15619B409AAD454613FD50AA7D4F3ADFFAB7332595EFACFB
+
+9655039A8D13519DF9E8B259E342F45501FD9414D9A1CE8A1DB2170C0E635497A54BDD296E4414
+
+46DFC16311669B81EAA99EF9E9F9DC6173ADECA4E9FD1D4D924A6FDF1A619D83D5AD745BE22CE0
+
+74AA80A93FB804241573C4AA99B435C0C553B6A34C1CA2420D4AD5AECF101D0C220117F52FEF1E
+
+A6A7C2E6C5ACB12F4CFE0434D38A7B80D457299CAA7BEB22401F6F41BFCFF1B73074DB204AA4F7
+
+4BF21DF02FBCFCED325450A316F3D0E19A9E578EFF6E36AE9B9FA83AC2761D9B0799760774555A
+
+CA3DC87F8FEF04FF41729AC36E78730AA4FDC9B200DD19E55A2EEB2914BC4A7AB668576E842FE2
+
+4BC3171AC6FDE3B12CA0A5CE473CA9B16AAEEF1E038F3CD0CD46FDECE92D31989529AFF640EB74
+
+4534262B1C4E74BE8E23D394A492BDEEFC7CF549C29298CCB93C99F5E7EF12F0F31F94BDD5571F
+
+A1393D675F0F7FD577F13B8A650627B83D1377E1D5BCA502A977CB56B3238D907336D392005BFF
+
+92FC98D953772DCB25A3353D07B7A21E21744A996725EBAA1C4E9359DDB16EA30F8B7B054F4338
+
+D80BC231101800CF513329DF073BEE3A9E99ACC65C4661660AAA6B2466E06BE9C9123A663F9BD0
+
+4705A874392E443C986778FDE4DBB2AB0AA855471E6D01BBE7B21F00725454FE21747084EDDA95
+
+A23AFAB912899C1155F94CDED48C003C3E06755DDDE45BC868865D5B5E6B33F441848EF915146A
+
+843A1B0F83BE8A3BCDEC8F7C33D0A6C80C17A39CFD9E466A4130862C8C9C6213593ED513B82E12
+
+7739B18A26A31884C99E43CB69082E710679FE9EFA6E57ED06B79BE2AD684EA2927843B289A1D5
+
+E54BC9B5C03EA51F5150B1B1E878D467E6062CE785053F1BC01922BFA0EF1527758F2DC5C97E84
+
+D64408424A58B069EC173390844E0DCDE2A14E874BB99D4A237BDEEF2867158C1DC360EE8D1CCA
+
+3578F9434A856C06722CF9FEA30AA6E923EB7FA1E4669732473F04A4F22282782B18B530C50616
+
+807BBB1250E64CE29BC8EAD8023A47DFD73125952ADF218E0503E6B26F09629757773511B97661
+
+28BDB57D2644C1AA9411C2BD09A1C184648ED435E61F0A8E6A3CFE2B19F7756604A32CBD27DE9E
+
+B083BEA7B9E505AB72E8A011BD3B38D71943044D552B8A2C6A9529C74C03461BA230DC1FA15BDF
+
+8EE5E8C00AA2519F2768CB41B29EE521879E4F5D33022E4F44E8BA54D9E952D730C60E283C0456
+
+9B2A7E0293E622DB7AF03759F4F6C873CE2D389C99398524E8A277E0124F42A701EB9748232621
+
+AC50CE70BAF6DEBA4CDFB47332DE090F1E6616D7457AB01CD96029F8E690231882F653F26FB2ED
+
+07DC43E96DEF70FFDDF5FF0802C87F60FDCD5C263A8AACEDD785454C63D7D1E4F0550081B30C1D
+
+460D7E7855548ACD4E31BF10893E793CA56A9E2B36E95C17E7B1ADFB825827FE2A6C00888BF692
+
+FB608A4B5B21ACB5E539667DFA247A7C108118D73E45581E53A30924061EC53D1E8C96527FD228
+
+91040578E10FA9B1B897230214B7224AA95BAFDBA6DB7DA9A65C6D19BB494D4C10E50425E88A05
+
+8DF29637BD37DE8482816F8EA5718639DD5C80671E52B9EE96470204F17C938B861718430AEC84
+
+04A67E719EDC2CFF1996B71FFEBFE745C5A3007545CB68716B04939633B6EADF766BD82AB8AA4A
+
+58917F66B20858E8B824432028EB5D44B20ECF9A394A7D2CF0C0AA6662C93442C8E081852C778C
+
+E8B3EDF6742CBB82412477FCDE7668A431F255A09D89558D6A95DB4C16E4A8EB40421FBA484DDA
+
+6371DFFA62972FEE696BC1C87CBC8A0A7854F9C53B52140C41F3E41A7CA5818821AF96C7DC4194
+
+EC0CBC08B2E7B3457FEA3E52C46467EBB84C739FB61BAFF1EA3341E1CBB563B9B8A31474AA8A0E
+
+AEC04C792AE8C1EDAB97142259FF325918D503A884CDF665D0494FDCD6E8958FA02373AC28AFA2
+
+62EC087EA4E120D22D291092834025B8D5D5B1FE22887017160C00A48BF7EABFBA436E2286EF68
+
+3FD641B1BDEA05A364B62E434B9E28A15FF9BA9EC7EE3E280FFBC79FD45A29F41B40F09CFC29B2
+
+688D662F156261913B3FA356A05EFC9D6CA122FB208B49BB38EC7543754CD60BB69C451E1CEE9C
+
+16A6C8900F6AC44EB8E8956B9E9FC43339F6AB2EFD67CC9943D3E9B957E2AC707FB9C035B89300
+
+81DB24B6A862189ED78C6B265B5BA7E0F4BE520CA0C6D0AA4E2F06F2E3CB1000B62494E924D03D
+
+081FE8FA8041E6455E0D2BE15FD5D9839F8E9D1C449EFBF81340456A7C11D3ACC1F17ECD601AD9
+
+83D228A1442FE934E61F2FEAAEB222A4DC974A49CA8AA64FA58A0E9CC64E1D19E8CBD37EA99E61
+
+CC37399CE7A4B002F36128D90D48DD0D929C150A9B791E1380494723712D4E9627689B21CACFF6
+
+535E6FFAD9CBB45FF42251DBFE4ABC9603ACC441AAA23D6D4CC515928A5B16A8E8EA265A3D50ED
+
+1570D38FA8CF1F52CED44AE32C669A6A334061D4C17EE9594B18EED1CF49C9DC20CE59CF966938
+
+3A6035B828AEDA54CF8EE35AB11ADE0CAA017103EA1A16F8289DC481FE7A027E9D56170F6AB618
+
+81FD9E6315E6F4AD853209C0720140237E3C444B714A417794975B942458C1965BF8BED420FF2E
+
+12C0BB6E977625AF3F10A16250E6033DC439D6962C59C77E5D9B99FAE6BDA21B09B82E4A832BC5
+
+04B4065400697262CD99A9C38259BC9522A66C2E2F4EDC8928CAAF77B9BF050E361DBE9D4DE7E1
+
+77F84C815F668F8BC2EFBD86E4C5C5F55CA9DC514EB07CE415BF56EE372335DE73D12DC9E67BBA
+
+6E5DFBBB7897D4AA214E51FA314E48DEADBA951330CFC54818C0205529520926A2074DF651C200
+
+BAB99792B3FB589FA7A81FBB417F94BB0478FF5A0DCB3CC649C00DF54686D76B6AE61AD0BFFA96
+
+F45EFBDB7EAF8D1CA349243B6126B26A8EFA36BF30904FDDF5D5FF102D67E5520B33989D196D70
+
+03297395971793E0C20A3C12029EB0CFC829D37D775452A9C4479BF6CE9AD9C2552530DE9628AA
+
+6EA46FC1EF19DA37F7EB79DDA088186832C8176864EC7BFC5E18E5E75C57995B77614CA213C0D9
+
+1F618C2B899E8BA93065C470475E0E914D39908C528CA0CFB179F7D88B369B0FE607020B2685FF
+
+308D779F2E22D9291A2B2BB5745E7311841F95DB8F929566A3A7FC36425891AFD5DE997A23F8B9
+
+9DECFAA1EB0A65155677B5EB5133DB8F3DDAD0745DA9BA572519C915B353985676734A828C70A4
+
+6A903A48F92C843C3C6BF42623C4281DB0B4294243A830EBCC4B4C722B9D795F875BDDA31AF7DE
+
+68640730185361F2B704F0C3ACE021A08A13393E95F0C153AC305BD3D6B1F9CD1BFD4E930AE7C6
+
+6D92DBAE21878D307C5B03AD9AC113581E5625A05D195A503F8460C00093AD8AC2155898D64D56
+
+07EF4022640582C97265A2F0D578DC7C33B2A8A28DC11DF55C90F2C39FE6BD29A5E0C2C9CD82A3
+
+136F63E603E53791354EFA93AE3A60903A3B284D0555602352199046F7E6380AD34E593A473D6D
+
+DE2B28CFAD3A75041083AEE4FB12D9EB4B069E405BCFFF5A98E3C2223CAC88F773A5C0ECBB16CF
+
+12A483641862009037D5C54A82FDD90D40D8FD663EBEC7C91B5947DB2FBF4718A627B10C078307
+
+699142374725125BE0A11DF893D8975D43BDF8AFB1476A2DFB2C8381E13CB69A8B494A6A8B0033
+
+9253323E3E285E05A9835FCF4FE2AFCD4D782A03FF8311F15A51E7F50385C4A1EFAA23950E7919
+
+D107F81C9DE9D4A10F64EAFBE8CAD85C0287CC4D4E815B561493D74FC62FEF72B5AE05812035CF
+
+4D8841974D9CE41B711DA438D00EC602C911274F7C7E0DD5F23035C5F1737EB151D12BCC736DCE
+
+4B2ACB25697D79DFD9F594B4DAF1DB7F540E11FA9D4A15C868C595BC35B4F74490624365948143
+
+51A771E4864CEBD6E92378E709463C6FE7BEEBE0F325613BD93094EFEC8BAAC89772FBFE654075
+
+351E62B844B80131E751AC4F39505DB26C8C34422C66A40316AFB198649802319D1FE4E1E66040
+
+1AB234971207ADED6B4A806F0CFE971D3577C7EC801355E5F84ACB3A33CDF296CB33CF42E74ACC
+
+003117D8F700FBD84F34EB9ADA38EE0716E1AC8ACE9882C10BB4B3633A6D877DD6578C1DB035B6
+
+DD9E4E2B2349350085E0428AAAC17759771BC4EDDA1A2D40FE0B15B65A8EBB4C28A526A49C56D0
+
+C24FD235653C78F2C40379AEE793937ED6F0BF8F4CCA825C305C0F3FDEEBDE8ABA6352F1DBF049
+
+55DF7695BFAA59E1894C1C57CBE29E48EC2F44DE77E3C449E13A25359126925E4C6C4649F0436B
+
+0188451E473513DF34C4FB2A9A37141E27811C6B33952D9C3BB0336E622DE192649C5BCB761700
+
+CE9423E9B52B20B7E29B6CA470221D593AC0C5D8951EE2A56FED99A8A3D018473C0CA28E4A4831
+
+D6A861A76C7165314BF7A299DCCB57F7D4CE2AEFD997AD21C55647DBE4F0FBBA1F413667B19604
+
+69FE97B144BF2DD823CF23E22313E8B89AB25CE9C1746F141E2046DE217ADBE18BCC3BBBE0468E
+
+03F277D3F95B56CAF8E2C51A0AAEDCDFA2294666A853088EF97BC279FB51FA78419DA0AA83BF6D
+
+8EACB8118E0462E0401EA83023DBAE6AD5420BBD25E3DEA46FB3B7C9376373C8E362E74B01AE0C
+
+E9D59C6945E108E0E92C23F62661BFA54700E203627BCAD11E7895AD59BE1859A9FFB6F7B01685
+
+23CB111552301916107D7D2A403543CB84AEFE404B8F170EE5B408981A88A65C335B3FC3454C00
+
+153FA92CC442BE0590766F765E30F82FD41499DE688DAE2748D5709BA47A89E825813BEF4DA6FA
+
+EC5D7EF6E9CB0913B5BC6A6776BF9AC7668485DE88E6265F5CDF0A854FC86DEB070E40A41A1251
+
+1291E1A6419C7694ECA5EBAC9DACEAC303C3E9FE8A62A64521E18B49B56B3ECA6EB0FFA148B2F5
+
+E558857426424288BB54DE15453E1B321D4B04C8D728B30B756B0597AE61F92447B3A757131539
+
+8701AA4F8A6B46B4283D50E26F5770EC6427592F16A66CAA8199AF84FF05A24A5FBFD1588B6114
+
+E24CDF39A99E7A6CD0BCD44E0E8776C9465D86CA3E3CDE34B33D317EC75D953411C90450003B0B
+
+941881686C9B4A3260C1DC4FE31F0A53577D4A4750AC7CDD52EB3274B61597DD5C111AF441456F
+
+E090821BC7B29806714CAC0EF5B8DE2DC813D42CDC8530F6EB1DD82657EE1B6DC39B0E2BADC17A
+
+7A13E4EDF2A893B41CDA754D6EB684D6A8D496DF331401FFAFEDAF3FD80BF1A35C2ECA54F42BA4
+
+9DB8C7CD73D81F5F1060515D47E6FC08717B9E9299B255536241DBFBC673945A38839B35D9C8EA
+
+1AA449CDA80805C4B14A54087EAE9E4EBF0E61C83A1BCC6C8243313F5C6FBFFECFC6BDC4368DEE
+
+7AFD489FD48DAFD34C59FA6D2DFAE7E2C8C95BE05D2AABA6D989D41C7F0A4307D118828963F2CF
+
+A652BCFAC33B22991E4F6D80D851C0722205702155EDB00053B5DAEC50744AE55E9184BEADA83B
+
+F76964F7D394FC27AB82DA1A65FDA56D3648D9F5AA1FEFBFA71BDC4B66E8C4A9DE4935F0FCBE47
+
+958493161696480DED3314B7079901FE5AEB10F89D9F153D654A0F0E58D70B922ACB969BD800A0
+
+F3CE421FCE37319D377D903741A60F8D83AE8FAB1C999BD8C391316A1C0CE6B3F181DEA3D2AFBF
+
+02ABE1237934194E9F42A973AB4971D3E3CB63ADDDCFE9A47BE78F24468F83E652E7E67D853F4D
+
+5020D7ACDBED250D1CDBE86D5801CD56913C20F8101F509C90F97263FAC6FFDD6C8705CBA0EFFD
+
+5EEAE1BE11841DC48401A7C41A5F0ED59FAC3CDFB8A2DFD2AC0F3C12CC0E964B25B344E1B6246A
+
+292D4E9EE6FA18BF71F1BB7A91EB5B8F0E20A4FD8593B803335980224D372417E3662D96305524
+
+F200B70168AA3B485BD83DF7A42A5771882FA599F0FAD36C9B4632E56D751FEB579F530A6A4C20
+
+A909765CADF9065E4BC80BC52FDA6A2186E22B2559017A626F230522DE708219012351E9205F6A
+
+45E968D94D4116EF55E13EF921B3740CDF45596206BDA272B14A8B2F6C6ED744BCCC8BFEAB9B50
+
+6088DBB57D8FEC837B4B00F57959EF515CE8A9802F54AF1DE01F071146D9A68BEB382FE03DD7DE
+
+AA00AA32BD552D2FD1B09E92E31E3623434A5A34E702ED0375E1A97F8B09AA52DC4FAB8A15F09F
+
+ABF0BE47AD03D997236B6B556AFA9C4A3E4135DB4956DB38F914446D7E0FC6AA21D4232B0BF5EC
+
+66F43214EEFC8CF98854BBD625668144478959A983A01DCB4FA2BC8FCDE08F3D4DAB474E05C3AA
+
+80B91FE4F53F103EFDFB1A509696E0B66830DE466CFE8243292DE34D4E9AAE50EFD539C120BB3D
+
+C0F7D3EAD1C033EF7EABBE1294276C0F78C7C089C76A1024870EBB09D493D9A4F16A3E65B5C5C9
+
+F380DBF5365BBE83AE13AD4E96C852274FA6CC8370CE8FAD45449D9050E7D2EAF352F169CC7EFA
+
+67B1BBECE485C2DCB608AA7B2B6F2762B7E4682BCC33EA0E305CC395A3D7A2C2F7E0EFCF2B1055
+
+F30E631757BB5BEA22D9074FF2D73588F9E9DD12477D44BEECB9A03DD5439C472CFEEDE2BAED9A
+
+FBD67AFF806759BA0AE34CDCB12CA52332C9328633C42F1894DE5F9EC50136AA1293C9D8937160
+
+0DFB14E2E95490853B0601AC7522BE8E519786C87AA5E1ED2B96CE221009AA9C55BC60AEA4E8CE
+
+FDB977B28F0551C306C22FF4016728BAB789B65CE07F611B9C84808837F8765E5D94B9C867C0E3
+
+AFB0EA4A21A324CC0A3BC3501C39A9BA928B09E9A87408314DE63B783392D5BD9B3ACF56CCD70B
+
+4933C1724732379A616012DFF9A9E14D5A55F50D841333958D6F36B56926228F4796421E470735
+
+4FAB7431899445114BCCE5D27117BFEA65EE1118505765132B7833FE9978899AAA1BE3E3F8AFCF
+
+0E9E1140A26FC9CA154A6BBB84C3E5FD6CD8B82732BE0179DEBACAC5340C79493A18FA2E5DF58A
+
+5F0C6546F5A5836BD61C904A8EBAF16CD933A9BC7FA72FA72F319A0A6EE86AD23C84E672D18CBB
+
+0696F22E1C69ECEFD15FA52706E5DCF3CB5311B28D9A614446CE033547EC0EF5FFAECF2A04F1A6
+
+C3DE91ED2B3FBA94DD7796E45D26AB00B99B3E295751BD6473F0BF36EBCA28FFAB2451E93DF4E0
+
+26BF0844FABC6A12EF15EBA64A5CA0E97C6DD06B94BA1CB29DFCDAD8C203C1CB6F7A1FAF4F3B58
+
+5BDD0BF922549CB45DF8F2196C709F2B9A35A43DB0043E2BD0287A3C313EE3C33F119F09A5619F
+
+B350F4011A93100CEE0847F1BDE12FEE8E323C8FAE34D535DB5A0DC8475DE8299E3C9CD6D8B0CF
+
+D6481619C68E77D92FA10D9EBCC13E474AD22B1F47D3F362FC968CFC1B5B52EC24F19BA894967E
+
+ED811F37525C260AFE0E2F9B302D6FFD019754EBCC14E053A9EED1905F402BA7BD3D8AFB09D2A8
+
+E94D0ADBC3C2ADFAFD2A4052256D58B221D0A20995F9C394F3A3AD6436CFE4F0030C7E8C2094E2
+
+092F5191C2C721CA9433369AFC221D01872BF68298677841A0656772649E7EBAAC8B1B81A38E75
+
+5B02DDA4D08B2F357C0C10E1060632FF74F7EDD5CFE7F9DBB232C3A231D128A3368C4D9872404D
+
+F45719B3EA0455836B893F07E07762F0A2FA9E011010A0872353F0CD2243E1860EC33F72E15EB2
+
+EDEE1A91397FE6D2729FED1B3A66FD009EA8DDDADD1FFDC8CD3603876F8D0C7AD60164A96A6C73
+
+B8A8B50985E1FBDA3ADC50018D341F285036B5EE255D975F6C3B5698AC4A94B2317BAC65889783
+
+4DB7BF52E9B8D20FD4981515FBEF23963A7F8636D0897E7EA88901CFAE1FDD18DA86C246507A34
+
+7672ABB116ED605AC9B4B6E899B9E8F6867140BE89DF5CD52C65C27E860170AEA6CAF303C860A6
+
+80A85394DE6896CF928BED76171F8904C5BBF4196BAD906569AC5C7057ED1201F2AE8393CBF704
+
+009124A6E5231D323C3FCE6C48CA239F169DFF496B951332DEBA5F06CEE48B6BCF824F0FB4BFE5
+
+4C1147BF208C2A9D44132D0895FA7A87F6FAD780DDCF94545F7030EF1808B30EC659FA2B6EA011
+
+A3C06070388BBAEBE45F8EAA75F72BA5B4E56380FB7FC3179BDB55A9A7CAF8D7FB60EAD6DA939B
+
+09E69159432671C88E22B34D115B6DEC54955454D622857094B70C3359D6A22C239FE03853CFD9
+
+9B7FA73D4EE3CD34124486F01F5CF05A423FFD794F577F50DE6776779107BD58808EEFA24DE1BE
+
+94BB27F82A19068D7F9DC695EC8473341F73FED626A4A6E89B58D4ED2024F78AC7678829FA40B7
+
+C8AA7400EE3CEFE125F64E1AB49CE67FA2F2D1B81FC322AA64F16463C134AF51AA9C3A154C7FD4
+
+30BCF4531EA9B6211F92006AC1C61894A7DD5C38E6CB8CC68D6A05BB95B0BDAF66971D357EFCAD
+
+89BCB8109462B796927389567F797E58823706AB224FF927A7616F0E4527D90B0DB9689D850D4B
+
+4F147080CBBF3493E564A1CC43627075E79BF3C3091E4650B8E607F4CCCBCAFCD3F778B7A1464B
+
+14A4E229FD41B5BC4A98880F008ED63FD25AE4504EE8BD38B641F65D0F3F65961AC315F4D68139
+
+7C2470E88813BCFC7E41FDA99AEFE170E274D53DD3D858D8BBDA154BFC93482C65FEAE4AD7E9A4
+
+7AC9530F0A82FF46E8BF22EC64B3A8B69527E92245B3B272C311FCF9946E93476D838EC0AE54EA
+
+8CB899087794A67E6B4E96664AFDD619FC074FA089F83A02FA4FCBB5BE698E508F87BC0F48051A
+
+8AA4DE3EBF3FD93ABCF58C1FB64257027AF8FD69B7CEF07498F48F393B4B4E9BDD6519332A780A
+
+E72152CE168E399E75DB4414618B9EFFB4986B85A94CBD0B912E3D5CDDBA6B784EAC660969A83C
+
+CF3AF928B6E84586B5F1CF353EFDF022DA5DF130E7FFD1698A9A7C26C83F135FC39E9CECB8855D
+
+9601A08D9E5ADC5397EE9E639A198A61A79B3CF5960AFC41584B56B0EF5C604E42BDD021E716B7
+
+3718AA7FA7002D329F22E3898B52F3111E975D5054C8C1BC491EDD67CAF876517901CB7805FA84
+
+4279435B26A2B54C086FE443C079A373B630528664C8F262D147F44F19B3760D4CB4D3A38B8E7B
+
+8492F3FC910E45A201FFBB8B3F06F80CD135C321EF51B7A7C30AFB5A14D5EA851E4B23232B3F0E
+
+272603125DE99C6B1755C9D3E8B9E92D33AA4EEB55D07D06158FFF93BCEE921CBE6A9B6605BE3A
+
+D1C203AB903AED90A1F735D32846EE9BF7ACBD7BC479FDAD8204F0A5601477E2CA092C7CD57671
+
+E2B179B60A72794FB3DEBEBE9E41EF333F97007BFFDC1A1C55C79EB9CF85AC2DCC23700F48D6EE
+
+621D02FAAB7D7E7C512B939362AADB1ACDB25B75FE1B935F15F922AE4E03632EC9AC1CCE112FD7
+
+CC8510B86921209CEF5E66F52CAF4EAFD83E772A653B0B10EA7DE38174A6458228F90146A1C5E5
+
+F057D384CB5CE531C02F7BF2BD20517F182597310157AED68C2325CCABC22F9D38A32AF1575707
+
+DEA5139E0363677162DB6EE9D46619DAC88D9D97902D5C58339FF9B7E3DDBDB7226DED36C1CB51
+
+B50BA744CB2DE5964126918879DBE7D2FA616FBA9D4D2965021EDDA8A88FDFC08853DC1FE99614
+
+15C741B21FA7D79A6F0281BD054E49C6F1893A2A4B3708E7272F42C6AE8A5E7C95CD6879466150
+
+CB99F4110B392DA7DF91419571EE31C926B3571DC0FD7302E271263C4AFCF7553525651D8D5587
+
+7AA4E1333092ED52A9672990BF34A1B60EC243241530E67E9F1D7CCBBA1B511A24793F2511F3E4
+
+763B02D4084CFF099BD83408FEAD0403E33A6BEFBCAD9564232FAB7BABC8BCAF785A6EA74AA882
+
+B74DE229A6C9D140E617F10E988467704D31695637106825DE0F31C3BBAD7EEC317C2CBF7CA7B2
+
+E25A5365C8234B9C57C9E3853C7A581972B3186AA87046C09DAA4429DCC56C7CF7F9750428B974
+
+49E6D9E0EE104BB2E80D05797D61C71F7751C5726E1FD7C441176ABD32613B6D7EA98B4262F9F5
+
+664AA8D4E9422AA0F44C4A1C79C32140F6F38ABD0FE9D7CD85997A357C999A37674F4603609349
+
+BEBA4F86D818290F6D1E75CC70555D68A717EC063B92931F2278E460A24A53377D85322FAC03BA
+
+D008ED6402F3768A75CEEF4EBF73852A2512C1499B3D4502E05E9C4C77D962708DE7FB406265A7
+
+A7B0AE38E879BE8922C585EF4ACDA2A4459C27DEAC5909ABCC15064EB6B974EED95702286F8C04
+
+E59187241E357BF0FA2F1B1D2576366DD96B15E40891041435D3542344DDDCEA9982E7850BCF12
+
+BF60093F0BB91279E8AC2A40DB5C7F0586422A9B7519B5A14F0E5BE49BC0818137D0D512A2BD6E
+
+475855EAFBEF470190721A6E90966CD8F47F801780B6181C92B6D401BB70A64C95B12AE7DDD980
+
+D32323EF569C05105ADC3AB5DE127B421EE1453DF7FC5BE2275E5941FC9C7FEE09F931039DA70B
+
+920604D40703369B47D8014E95F827563234D32A08FCF8B99073FBF7E87A34D7FA1AF9E6B5C5C0
+
+8802250ACB7E943DA108BB2485A41324819CE85AD51CA83FC7575FD5E8EE353AB8C6B9C2F3DB8E
+
+B3DED45F22711190321A2F6F95097DD6A0ED91E0DA54AAFD05A6B9D399239525CD833E9AA6231C
+
+D4F835B730E5459C399DF7693DC4C1CAEFAD6416BC95F8B9F0533C0A27D86B42D8480FC908AA91
+
+C0468F0BF73CC5E260E5F00D82C439E9A581B19A61B5014606D57D186D9F9469217B4472DB1609
+
+FED1949D29FF3E2E3FAAB536FF7949A26042B9FC5408B7B059EE35B0E287F4D8CEE50E540DB716
+
+6802EFBF0FB60F18E5A1FA942A4E3E66EE68EA44B8FF66B3B0669E59A81C6166312987164E6DC4
+
+DB7509B11444287A5BEC5BEA9FF656D5A42C0DCB10F83B14DF02BBFE729E9839E594895DA80448
+
+B760D7AB5E58B675ADA42098929FBED35D62A54737FE6E612569B8DE4EB603F1DD6DBFFE8F79D6
+
+AEA1B0599913AA70083EB94E251DB277BE9F492E4D13B2E42FCCF825B3589EC4F9427BA659A59B
+
+73DACC3C9D2E9CD77267DEFCFDCF2117F5207AEC4198130B1B585875A49B6E01C8A5FE5EBC4678
+
+2BDBC438BE32A1CAF134E9B53D82761E9B682E0A198A812F296E193C296412596978DD3C5EEF0F
+
+BE7B353568C5627BC6467C767F9ED8412EE405C24F6DFE95AF72437D1AD9B992FF30459D232491
+
+645E845FFF03214949D33E1A48EF2A99DB29DE6FF82E72050E0E6E08E863DB570ADF515D82931B
+
+AE70437E49C397767874E34513417A49234BBD89F19FFC3EE3CD9F5BA7112A4BEC07012C709585
+
+97ECA5A501365E3524A500FA8A43A7BA90F91E8CD5825F65940825DE80F5EF11198952A258B5BB
+
+EC5AA244F8674BE1764B526DB6B9D244C886980B25C7EE4ACFEBF79349E26F2D2D65FA2810D1CD
+
+4B39233F9638546A3FF1E8D017EF458F182CF228392AD30A6E7DF715CD0B55FA377DFA6880F554
+
+367A6E3728065DF65CAD30AD927943963973F6596C1C1DD29C2C84B224F81361D4CA2ED2CC6483
+
+A59F833CB8A964C281B0BA2C834783C5752986B8E70583E6C9AA33132BFC67998B992F249D0AD7
+
+6C02BDD2925B39501A69E4E00DD3534C474D0715C913E23660BB765C2E5FE37F445AC605F62DE9
+
+C533EE924EFE205C528C372403696885DDD6BADAF602993F3DF49957E21B2EE409AA6336A8103E
+
+BCC0B33B8FFD8C818F2D25D22E3B0E4E874CF4ADE03F69C1B017DA9CED9EAFC6CBD86780C819A9
+
+CE03C2AA203CABD299251B9090F2659C3245A845B50EB36BCBC07AD6FE0A191D3E8BD0C9B9700A
+
+706EA3028E8055B585A6D8F305C80DD5ADBE1DA433669E1D9F459EA105B5F6D756A9FF3DF71607
+
+9FDA77312E447F764C0F178B7F128DA4ACE17F8D4F213864C2AAFAB0D5BCE40A19AC92FF21D7B1
+
+F1F3CEC338951D7292147937ED0BDB0CEC2578D0BFE12F7F21B4D76ADD1F557E8A5761399591C2
+
+D4A2CB1F0D9564586567AE9165451DFF5D61E08F0421A8606E49A552E19F8CCDC90CA92C4BC2AD
+
+2FC3DC29DFF6E56BA85D8E7B0388962DB5BB107CBAB4FD4170F24C21DFE2A3EF29DDB82C02EF32
+
+4B9DB2AC09C1A5EA7C71B1547573B68FF8C3215B803CD3EDE122DE1D71492BD3B71C5A6DE52D50
+
+8E98676560ED273403B9D655F239579007706C078EA3EDC120EDFECAF4F13379A4526FB3731A08
+
+9690CF6D74F2E95E332D1DDB36DF458771F0F7BF321E524447B6E04AC33011E855A0E25582F104
+
+69F1B6C19089AF013C38F2624826A5730641
+
+0000000000000000000000000000000000000000000000000000000000000000
+
+0000000000000000000000000000000000000000000000000000000000000000
+
+0000000000000000000000000000000000000000000000000000000000000000
+
+0000000000000000000000000000000000000000000000000000000000000000
+
+0000000000000000000000000000000000000000000000000000000000000000
+
+0000000000000000000000000000000000000000000000000000000000000000
+
+0000000000000000000000000000000000000000000000000000000000000000
+
+0000000000000000000000000000000000000000000000000000000000000000
+
+cleartomark %{restore}if
+
+%%EndProcSet
+%%BeginProcSet: texps.pro
+TeXDict begin /rf{findfont dup length 1 add dict begin{1 index /FID ne 2
+index /UniqueID ne and{def}{pop pop}ifelse}forall[1 index 0 6 -1 roll
+exec 0 exch 5 -1 roll VResolution Resolution div mul neg 0 0]/Metrics
+exch def dict begin Encoding{exch dup type /integertype ne{pop pop 1 sub
+dup 0 le{pop}{[}ifelse}{FontMatrix 0 get div Metrics 0 get div def}
+ifelse}forall Metrics /Metrics currentdict end def[2 index currentdict
+end definefont 3 -1 roll makefont /setfont load]cvx def}def
+/ObliqueSlant{dup sin S cos div neg}B /SlantFont{4 index mul add}def
+/ExtendFont{3 -1 roll mul exch}def /ReEncodeFont{/Encoding exch def}def
+end
+%%EndProcSet
+%%BeginProcSet: special.pro
+TeXDict begin /SDict 200 dict N SDict begin /@SpecialDefaults{/hs 612 N
+/vs 792 N /ho 0 N /vo 0 N /hsc 1 N /vsc 1 N /ang 0 N /CLIP 0 N /rwiSeen
+false N /rhiSeen false N /letter{}N /note{}N /a4{}N /legal{}N}B
+/@scaleunit 100 N /@hscale{@scaleunit div /hsc X}B /@vscale{@scaleunit
+div /vsc X}B /@hsize{/hs X /CLIP 1 N}B /@vsize{/vs X /CLIP 1 N}B /@clip{
+/CLIP 2 N}B /@hoffset{/ho X}B /@voffset{/vo X}B /@angle{/ang X}B /@rwi{
+10 div /rwi X /rwiSeen true N}B /@rhi{10 div /rhi X /rhiSeen true N}B
+/@llx{/llx X}B /@lly{/lly X}B /@urx{/urx X}B /@ury{/ury X}B /magscale
+true def end /@MacSetUp{userdict /md known{userdict /md get type
+/dicttype eq{userdict begin md length 10 add md maxlength ge{/md md dup
+length 20 add dict copy def}if end md begin /letter{}N /note{}N /legal{}
+N /od{txpose 1 0 mtx defaultmatrix dtransform S atan/pa X newpath
+clippath mark{transform{itransform moveto}}{transform{itransform lineto}
+}{6 -2 roll transform 6 -2 roll transform 6 -2 roll transform{
+itransform 6 2 roll itransform 6 2 roll itransform 6 2 roll curveto}}{{
+closepath}}pathforall newpath counttomark array astore /gc xdf pop ct 39
+0 put 10 fz 0 fs 2 F/|______Courier fnt invertflag{PaintBlack}if}N
+/txpose{pxs pys scale ppr aload pop por{noflips{pop S neg S TR pop 1 -1
+scale}if xflip yflip and{pop S neg S TR 180 rotate 1 -1 scale ppr 3 get
+ppr 1 get neg sub neg ppr 2 get ppr 0 get neg sub neg TR}if xflip yflip
+not and{pop S neg S TR pop 180 rotate ppr 3 get ppr 1 get neg sub neg 0
+TR}if yflip xflip not and{ppr 1 get neg ppr 0 get neg TR}if}{noflips{TR
+pop pop 270 rotate 1 -1 scale}if xflip yflip and{TR pop pop 90 rotate 1
+-1 scale ppr 3 get ppr 1 get neg sub neg ppr 2 get ppr 0 get neg sub neg
+TR}if xflip yflip not and{TR pop pop 90 rotate ppr 3 get ppr 1 get neg
+sub neg 0 TR}if yflip xflip not and{TR pop pop 270 rotate ppr 2 get ppr
+0 get neg sub neg 0 S TR}if}ifelse scaleby96{ppr aload pop 4 -1 roll add
+2 div 3 1 roll add 2 div 2 copy TR .96 dup scale neg S neg S TR}if}N /cp
+{pop pop showpage pm restore}N end}if}if}N /normalscale{Resolution 72
+div VResolution 72 div neg scale magscale{DVImag dup scale}if 0 setgray}
+N /psfts{S 65781.76 div N}N /startTexFig{/psf$SavedState save N userdict
+maxlength dict begin /magscale true def normalscale currentpoint TR
+/psf$ury psfts /psf$urx psfts /psf$lly psfts /psf$llx psfts /psf$y psfts
+/psf$x psfts currentpoint /psf$cy X /psf$cx X /psf$sx psf$x psf$urx
+psf$llx sub div N /psf$sy psf$y psf$ury psf$lly sub div N psf$sx psf$sy
+scale psf$cx psf$sx div psf$llx sub psf$cy psf$sy div psf$ury sub TR
+/showpage{}N /erasepage{}N /copypage{}N /p 3 def @MacSetUp}N /doclip{
+psf$llx psf$lly psf$urx psf$ury currentpoint 6 2 roll newpath 4 copy 4 2
+roll moveto 6 -1 roll S lineto S lineto S lineto closepath clip newpath
+moveto}N /endTexFig{end psf$SavedState restore}N /@beginspecial{SDict
+begin /SpecialSave save N gsave normalscale currentpoint TR
+@SpecialDefaults count /ocount X /dcount countdictstack N}N /@setspecial
+{CLIP 1 eq{newpath 0 0 moveto hs 0 rlineto 0 vs rlineto hs neg 0 rlineto
+closepath clip}if ho vo TR hsc vsc scale ang rotate rwiSeen{rwi urx llx
+sub div rhiSeen{rhi ury lly sub div}{dup}ifelse scale llx neg lly neg TR
+}{rhiSeen{rhi ury lly sub div dup scale llx neg lly neg TR}if}ifelse
+CLIP 2 eq{newpath llx lly moveto urx lly lineto urx ury lineto llx ury
+lineto closepath clip}if /showpage{}N /erasepage{}N /copypage{}N newpath
+}N /@endspecial{count ocount sub{pop}repeat countdictstack dcount sub{
+end}repeat grestore SpecialSave restore end}N /@defspecial{SDict begin}
+N /@fedspecial{end}B /li{lineto}B /rl{rlineto}B /rc{rcurveto}B /np{
+/SaveX currentpoint /SaveY X N 1 setlinecap newpath}N /st{stroke SaveX
+SaveY moveto}N /fil{fill SaveX SaveY moveto}N /ellipse{/endangle X
+/startangle X /yrad X /xrad X /savematrix matrix currentmatrix N TR xrad
+yrad scale 0 0 1 startangle endangle arc savematrix setmatrix}N end
+%%EndProcSet
+%%BeginProcSet: crop.pro
+TeXDict begin /cX 18 def /CM{gsave TR 0 cX neg moveto 0 cX lineto stroke
+cX neg 0 moveto cX 0 lineto stroke grestore}def end /bop-hook{cX dup TR
+gsave .3 setlinewidth 0 0 CM vsize cX 2 mul sub dup hsize cX 2 mul sub
+dup isls{4 2 roll}if 0 CM exch CM 0 exch CM grestore 0 cX -2 mul TR isls
+{cX -2 mul 0 TR}if}def
+%%EndProcSet
+TeXDict begin @defspecial
+
+ /arrow { save 4 1 roll 14 dict begin /y exch def /x exch def /D exch
+def currentpoint /b exch def /a exch def /dx x a sub def /dy y b sub
+def /arrowlen dx dup mul dy dup mul add sqrt def /angle dy dx atan
+def 0 setgray a b translate angle rotate /xp arrowlen def /m xp D sub
+def 0.5 setlinewidth [3 1] 0 setdash 0 0 moveto m 0 lineto stroke /back
+D 8 div neg def /up D 4 div def m 0 moveto back up rlineto xp 0 lineto
+closepath fill m 0 moveto back up neg rlineto xp 0 lineto closepath
+fill end restore } def /drawtriangle { -144 72 rlineto 0 -144 rlineto
+closepath fill } def /cropmark { 2 copy moveto 0 -18 rmoveto 0 36 rlineto
+stroke moveto -18 0 rmoveto 36 0 rlineto stroke } def /fillpage { .9
+setgray 0 0 moveto 0 792 rlineto 612 0 rlineto 0 -792 rlineto fill
+0 setgray .25 setlinewidth 18 18 cropmark 18 684 cropmark 549 684 cropmark
+549 17 cropmark } def /showpart { 10 -22 translate /StoneSans-SemiboldItalic
+findfont 140 scalefont setfont dup stringwidth pop /sw exch def sw
+neg -46 moveto 0 setgray dup show sw 4 add neg -42 moveto 0.7 setgray
+show sw neg 0 translate /StoneSans-SemiboldItalic findfont 30 scalefont
+setfont dup stringwidth pop /sw exch def sw neg 0 moveto 0 setgray
+show sw 10 add neg 0 translate -600 10 moveto 12 0 10 arrow } def
+ 
+@fedspecial end TeXDict begin
+37298252 46178789 1000 600 600 (book.dvi) @start /Fa
+133[33 33 33 33 33 33 33 33 33 33 33 33 33 33 33 33 33
+33 33 33 33 33 33 33 33 33 1[33 33 2[33 33 33 33 33 33
+33 33 33 33 33 33 33 33 33 33 33 33 33 33 33 33 33 33
+33 33 33 33 1[33 1[33 3[33 33 33 33 33 33 33 33 33 33
+33 33 3[33 33 3[33 36[{.82 ExtendFont TeXBase1Encoding ReEncodeFont }73
+66.666667 /PPCode rf /Fb 1 14 df<000001FFC000000000001FFFFC0000000000FF
+FFFF8000000001FF007FC000000007F00007F00000001F800000FC0000003F0000007E00
+00007C0000001F000000F000000007800001E000000003C00003C000000001E000078000
+000000F00007000000000070000F000000000078001E00000000003C001C00000000001C
+003C00000000001E003800000000000E007800000000000F007000000000000700700000
+0000000700F000000000000780E000000000000380E000000000000380E0000000000003
+80E000000000000380E000000000000380E000000000000380E000000000000380E00000
+0000000380E000000000000380F000000000000780700000000000070070000000000007
+007800000000000F003800000000000E003C00000000001E001C00000000001C001E0000
+0000003C000F000000000078000700000000007000078000000000F00003C000000001E0
+0001E000000003C00000F0000000078000007C0000001F0000003F0000007E0000001F80
+0000FC00000007F00007F000000001FF007FC000000000FFFFFF80000000001FFFFC0000
+00000001FFC000000039357CA842>13 D E /Fc 140[135 6[135
+3[135 3[135 2[135 97[{.82 ExtendFont TeXBase1Encoding ReEncodeFont }5
+274.999988 /PPCode rf /Fd 144[37 2[37 7[37 1[37 98[{
+.82 ExtendFont TeXBase1Encoding ReEncodeFont }4 75.000000
+/PPCodeBold rf /Fe 1 12 df<00003FC000000000FFF800000007E07C0000000F801F
+0000003F001F800C007E000F800C00FC0007C01C01F80007E01803F00007E01807E00003
+E0380FE00003F0300FC00003F0301FC00003F0703F800003F0603F800003F0E07F800003
+F0C07F000003F1C07F000003F1807F000003F380FF000003F300FE000003F700FE000003
+FE00FE000003FC00FE000003FC00FC000003F800FC000003F000FC000003F000FC000003
+F000FC000003F0007E000007F0007E00000FF0003E00001DF8183F000079F8181F0000E1
+F8380F8007C0F83007E03F007CF001FFF8003FC0003FC0000F802E267DA435>11
+D E /Ff 82[28 51[42 42 60 1[46 28 32 32 1[42 37 46 1[23
+37 23 23 1[42 1[32 42 34 38 37 11[65 51 4[65 2[46 5[46
+51 65 17[42 42 49[{ TeXBase1Encoding ReEncodeFont }30
+83.333337 /Palatino-Italic rf /Fg 140[61 2[61 61 61 61
+61 61 2[61 2[61 61 61 1[61 55[61 61 40[{
+.82 ExtendFont TeXBase1Encoding ReEncodeFont }14 124.999997
+/PPCode rf /Fh 134[53 1[53 53 53 53 53 53 1[53 53 53
+53 53 53 1[53 53 53 53 53 53 53 1[53 1[53 11[53 6[53
+29[53 4[53 53 40[{.82 ExtendFont TeXBase1Encoding ReEncodeFont }27
+108.333331 /PPCode rf /Fi 134[37 37 3[37 37 37 1[37 37
+37 37 37 2[37 37 37 37 37 37 37 37 37 1[37 15[37 8[37
+70[{ TeXBase1Encoding ReEncodeFont .167 SlantFont .82 ExtendFont }22
+75.000000 /PPCode rf /Fj 134[43 43 43 43 43 43 43 43
+1[43 43 43 43 43 2[43 43 43 43 43 43 43 43 43 1[43 8[43
+43 2[43 2[43 43 43 43 2[43 2[43 43 1[43 43 43 43 17[43
+6[43 39[{ TeXBase1Encoding ReEncodeFont .167 SlantFont .82 ExtendFont }
+39 87.499997 /PPCode rf /Fk 134[74 80 118 74 86 62 62
+62 88 88 84 88 132 43 84 1[43 88 88 57 76 88 69 89 79
+7[91 98 145 96 96 84 74 89 103 86 103 99 129 74 1[44
+44 101 99 69 74 101 89 89 99 6[42 84 84 84 84 84 84 84
+84 84 84 76 42 46 42 2[59 59 32 39[{ TeXBase1Encoding ReEncodeFont }66
+133.333334 /StoneSans-Bold rf /Fl 82[30 24[46 46 25[51
+47 76 52 55 30 39 36 1[55 50 53 81 27 51 1[27 53 51 30
+44 56 41 51 46 11[71 4[55 3[56 2[31 26[23 1[23 2[30 30
+37[55 2[{ TeXBase1Encoding ReEncodeFont }35 91.666666
+/Palatino-Roman rf /Fm 82[32 3[71 46[48 53 48 80 53 58
+32 42 37 58 58 53 58 85 32 58 32 32 58 53 37 48 58 42
+58 48 8[64 95 74 74 64 58 69 80 58 80 80 95 58 74 37
+37 80 80 53 58 80 69 64 74 6[24 48 48 3[48 2[48 1[28
+24 1[24 4[27 36[58 2[{ TeXBase1Encoding ReEncodeFont }62
+95.833334 /Palatino-Bold rf /Fn 134[138 149 222 139 160
+115 115 115 1[166 158 165 247 80 157 1[80 165 166 106
+142 166 129 166 147 10[180 180 157 139 166 1[161 194
+185 241 138 1[82 82 189 1[129 138 190 166 1[185 19[87
+45[{ TeXBase1Encoding ReEncodeFont }42 249.999994 /StoneSans-Bold
+rf /Fo 134[181 2[181 1[136 149 140 1[218 211 215 319
+94 2[94 1[218 1[191 218 167 217 188 12[207 194 2[207
+3[181 4[266 1[189 263 2[233 65[{ TeXBase1Encoding ReEncodeFont }25
+349.999988 /StoneSans-Semibold rf /Fp 141[25 2[37 38
+55 3[17 1[38 1[31 101[{ TeXBase1Encoding ReEncodeFont }7
+66.666667 /StoneSans-SemiboldItalic rf /Fq 129[37 37
+37 37 37 37 37 37 37 37 37 37 37 37 37 37 37 37 37 37
+37 37 37 37 37 37 37 37 37 37 37 37 37 37 37 37 37 37
+37 37 37 37 37 37 37 37 37 37 37 37 37 37 37 37 37 37
+37 37 37 37 37 37 37 37 37 37 37 37 37 37 37 37 37 37
+37 37 37 37 37 37 37 37 37 37 37 37 37 37 37 37 37 37
+37 37 33[{.82 ExtendFont TeXBase1Encoding ReEncodeFont }94
+75.000000 /PPCode rf /Fr 129[43 1[43 1[43 43 43 43 43
+43 43 43 43 43 43 43 43 43 43 43 43 43 43 43 43 43 43
+43 43 43 43 43 43 43 43 43 43 43 43 43 43 43 43 43 43
+43 43 43 43 43 43 43 43 43 43 43 43 43 43 43 43 43 43
+43 43 43 43 43 43 43 43 43 43 43 43 43 43 43 43 43 43
+43 43 43 43 43 43 43 43 43 43 43 43 43 33[{
+.82 ExtendFont TeXBase1Encoding ReEncodeFont }92 87.499997
+/PPCode rf /Fs 82[28 50[42 46 42 69 46 51 28 37 32 51
+51 46 51 74 28 51 28 28 51 46 32 42 51 37 51 42 7[55
+55 83 65 65 55 51 60 69 51 69 69 83 51 65 32 32 69 69
+46 51 69 60 55 65 1[37 4[21 42 42 42 42 42 42 42 42 42
+42 25 21 1[21 2[28 28 23 36[51 2[{ TeXBase1Encoding ReEncodeFont }71
+83.333337 /Palatino-Bold rf /Ft 134[53 57 85 53 61 44
+44 44 1[64 61 63 95 31 60 1[31 63 64 41 55 64 49 64 57
+10[69 69 60 53 64 1[62 74 71 93 53 1[32 32 72 71 50 53
+73 64 64 71 7[60 60 60 60 60 60 60 60 60 60 55 1[33 45[{
+ TeXBase1Encoding ReEncodeFont }55 95.833334 /StoneSans-Bold
+rf /Fu 133[62 65 70 104 65 75 54 54 54 77 77 74 77 115
+37 73 1[37 77 77 50 66 77 60 78 69 7[80 86 127 84 84
+73 65 78 1[75 90 86 113 65 82 38 38 88 87 60 65 88 78
+78 86 6[37 73 73 73 73 73 73 73 73 73 73 67 37 41 37
+4[28 39[{ TeXBase1Encoding ReEncodeFont }65 116.666669
+/StoneSans-Bold rf /Fv 134[41 43 65 41 47 29 32 29 50
+50 48 49 74 20 40 1[20 49 49 25 42 49 40 49 42 8[54 77
+49 57 46 43 46 66 45 66 65 77 40 49 23 22 58 61 40 41
+61 57 48 51 6[24 48 48 48 48 48 48 48 48 48 48 32 24
+28 24 2[29 29 17 39[{ TeXBase1Encoding ReEncodeFont }66
+83.333337 /StoneSans rf /Fw 82[28 20[28 83 42 1[42 42
+22[50 1[42 46 43 69 47 50 27 35 33 46 50 45 48 73 24
+46 19 24 48 46 28 40 51 37 46 42 23 42 1[28 1[28 55 55
+55 83 60 65 51 44 55 65 50 65 69 79 51 60 28 28 69 63
+46 51 64 59 51 65 5[21 21 42 42 42 42 42 42 42 42 42
+42 50 21 1[21 50 32 28 28 23 5[23 29[50 50 2[{
+ TeXBase1Encoding ReEncodeFont }86 83.333337 /Palatino-Roman
+rf /Fx 173[33 24[25 25 25 25 25 25 25 25 25 25 48[{
+ TeXBase1Encoding ReEncodeFont }11 50.000001 /Palatino-Roman
+rf /Fy 82[32 50[42 48 48 69 48 53 32 37 37 44 48 42 53
+74 27 42 27 27 48 48 27 37 48 39 44 42 8[69 90 69 74
+58 53 64 74 58 74 74 90 53 64 1[32 74 69 53 58 74 64
+58 69 6[24 3[48 1[48 1[48 48 1[28 24 1[24 58 1[32 32
+27 74 35[50 2[{ TeXBase1Encoding ReEncodeFont }64 95.833334
+/Palatino-Italic rf /Fz 135[50 1[47 12[23 105[{
+ TeXBase1Encoding ReEncodeFont }3 95.833334 /StoneSans
+rf /FA 82[32 20[32 95 48 58 48 48 24[48 53 49 80 54 58
+31 40 38 53 57 52 56 84 28 53 22 28 56 53 32 46 58 42
+53 48 1[48 1[32 58 32 64 64 64 95 69 74 59 50 64 75 58
+75 79 90 58 69 32 32 79 73 53 58 74 68 58 74 71 42 3[24
+24 48 48 48 48 48 48 48 48 48 48 58 24 1[24 1[37 32 32
+27 74 4[27 29[58 58 2[{ TeXBase1Encoding ReEncodeFont }88
+95.833334 /Palatino-Roman rf /FB 134[149 149 2[166 100
+116 116 1[149 133 166 1[83 2[83 149 149 83 116 149 122
+138 133 11[233 183 166 2[183 233 233 1[166 2[100 1[216
+2[233 199 183 216 17[88 47[{ TeXBase1Encoding ReEncodeFont }33
+300.000000 /Palatino-Italic rf /FC 141[42 2[48 2[30 2[30
+3[42 3[48 13[60 11[78 2[84 21[27 46[{ TeXBase1Encoding ReEncodeFont }10
+108.333331 /Palatino-Italic rf /FD 82[36 21[108 29[60
+56 90 61 65 35 46 43 1[65 59 63 95 31 60 1[31 63 60 36
+52 66 48 60 54 19[102 2[36 36 1[82 1[66 22[27 1[27 44[{
+ .167 SlantFont TeXBase1Encoding ReEncodeFont }32 108.333331
+/Palatino-Roman rf /FE 171[112 84[{ TeXBase1Encoding ReEncodeFont }1
+183.333331 /Palatino-Italic rf /FF 139[24 32 30 1[45
+1[43 1[22 2[22 1[42 32[42 4[58 7[37 37 6[37 4[19 44[{
+ .167 SlantFont TeXBase1Encoding ReEncodeFont }14 75.000000
+/Palatino-Roman rf /FG 1 14 df<00000003FFC00000000000003FFFFC0000000000
+01FFFFFF800000000007FFFFFFE0000000001FFE007FF8000000007FE00007FE00000000
+FF000000FF00000003FC0000003FC0000007F00000000FE000000FC000000003F000001F
+8000000001F800003F0000000000FC00007E00000000007E0000FC00000000003F0000F8
+00000000001F0001F000000000000F8003F000000000000FC003E0000000000007C007C0
+000000000003E00FC0000000000003F00F80000000000001F01F00000000000000F81F00
+000000000000F81E00000000000000783E000000000000007C3E000000000000007C3C00
+0000000000003C7C000000000000003E7C000000000000003E78000000000000001E7800
+0000000000001E78000000000000001EF8000000000000001FF8000000000000001FF000
+0000000000000FF0000000000000000FF0000000000000000FF0000000000000000FF000
+0000000000000FF0000000000000000FF0000000000000000FF0000000000000000FF000
+0000000000000FF0000000000000000FF8000000000000001FF8000000000000001F7800
+0000000000001E78000000000000001E78000000000000001E7C000000000000003E7C00
+0000000000003E3C000000000000003C3E000000000000007C3E000000000000007C1E00
+000000000000781F00000000000000F81F00000000000000F80F80000000000001F00FC0
+000000000003F007C0000000000003E003E0000000000007C003F000000000000FC001F0
+00000000000F8000F800000000001F0000FC00000000003F00007E00000000007E00003F
+0000000000FC00001F8000000001F800000FC000000003F0000007F00000000FE0000003
+FC0000003FC0000000FF000000FF000000007FE00007FE000000001FFE007FF800000000
+07FFFFFFE00000000001FFFFFF8000000000003FFFFC00000000000003FFC0000000484E
+7BBB53>13 D E /FH 82[25 51[37 3[42 25 29 29 2[33 42 1[21
+2[21 1[37 21 29 1[30 35 33 16[46 3[42 7[58 50 67[{
+ TeXBase1Encoding ReEncodeFont }20 75.000000 /Palatino-Italic
+rf /FI 82[25 21[75 37 27[37 42 39 62 42 45 24 32 30 42
+45 41 43 66 22 42 17 22 43 42 25 36 46 33 41 37 6[50
+50 50 75 54 58 46 39 50 59 45 59 62 71 46 54 25 25 62
+57 42 46 58 53 46 58 6[19 37 37 37 37 37 37 37 37 37
+37 45 19 1[19 4[21 58 2[37 1[21 29[45 45 2[{
+ TeXBase1Encoding ReEncodeFont }75 75.000000 /Palatino-Roman
+rf /FJ 147[26 108[{}1 33.333334 /ZapfDingbats rf /FK
+134[37 39 58 1[43 26 29 26 2[43 44 67 18 36 1[18 44 44
+22 38 44 36 1[37 12[42 39 42 1[40 59 1[69 4[53 2[37 55
+51 43 46 20[21 44[{ TeXBase1Encoding ReEncodeFont }33
+75.000000 /StoneSans rf /FL 134[46 50 2[53 38 38 38 1[55
+53 55 82 27 2[27 55 55 35 47 55 43 55 49 7[57 1[91 2[52
+46 2[54 65 62 1[46 2[27 1[62 43 46 63 55 55 62 7[52 52
+52 52 52 52 52 52 52 52 1[26 29 26 44[{ TeXBase1Encoding ReEncodeFont }
+49 83.333337 /StoneSans-Bold rf /FM 140[63 59 2[82 87
+1[43 83 1[43 87 2[72 1[66 1[75 9[149 2[92 6[141 1[108
+50 4[91 22[37 46[{ TeXBase1Encoding ReEncodeFont }18
+150.000000 /Palatino-Roman rf /FN 135[174 1[194 213 116
+3[213 194 213 310 116 2[116 3[174 1[155 1[174 20[213
+7[290 2[271 65[{ TeXBase1Encoding ReEncodeFont }16 349.999988
+/Palatino-Bold rf /FO 139[89 89 115[{}2 100.000003 /ZapfDingbats
+rf /FP 135[133 1[148 162 88 3[162 148 162 236 88 2[88
+3[133 1[118 1[133 20[162 7[221 2[207 65[{
+ TeXBase1Encoding ReEncodeFont }16 266.666669 /Palatino-Bold
+rf /FQ 139[67 67 115[{}2 75.000000 /ZapfDingbats rf end
+%%EndProlog
+%%BeginSetup
+%%Feature: *Resolution 600dpi
+TeXDict begin
+%%PaperSize: Letter
+
+%%EndSetup
+%%Page: 445 1
+445 468 bop 0 0 a @beginspecial @setspecial
+ gsave .50 setgray newpath 278 10 moveto 0 100 rlineto 132 0 rlineto
+0 -100 rlineto -132 0 rlineto closepath fill 1 setgray /StoneSans-Bold
+findfont 12 scalefont setfont 296 19 moveto 3 0 (CHAPTER 24) ashow
+grestore
+ 
+@endspecial
+299 355 a Fn(Parsing)84 b(Command-)299 654 y(Line)g(Options)299
+1557 y Fm(From)21 b(the)f(forthcoming)i(book)f(entitled)f(Linux)h
+(Application)g(Development)f(by)299 1669 y(Michael)35
+b(K.)h(Johnson)h(and)e(Erik)h(W)l(.)g(T)-11 b(roan,)39
+b(copyright)d(\251)g(1998)e(by)i(Addison)299 1781 y(W)-7
+b(esley)38 b(Longman,)43 b(Inc.,)f(to)d(be)f(published)i(in)e(April,)k
+(1998.)77 b(All)38 b(rights)h(re\255)299 1893 y(served.)c(This)24
+b(material)e(is)i(made)g(available)f(with)g(the)h(permission)h(of)f
+(the)f(pub\255)299 2005 y(lisher)-5 b(.)34 b(The)21 b(publisher)5
+b(')-5 b(s)23 b(permission)g(is)g(required)f(for)h(reproduction,)g
+(storage,)299 2117 y(or)h(transmittal)f(of)h(this)g(material.)299
+2329 y(For)g(more)g(information,)g(see)f(http:/)-14 b(/www)-9
+b(.awl.com/cseng/books/lad/.)299 2541 y FA(Most)41 b(Linux)e(pr)n
+(ograms)h(allow)f(the)g(user)g(to)h(specify)h(command\255line)e
+(options.)299 2653 y(Such)23 b(options)h(perform)g(a)f(wide)g(variety)g
+(of)g(functions)g(but)g(ar)n(e)g(fairly)f(uniform)h(in)299
+2765 y(their)31 b(syntax.)60 b Fm(Short)33 b(options)g
+FA(consist)g(of)f(a)g Fr(-)h FA(character)e(followed)h(by)g(a)g(single)
+299 2877 y(alphanumeric)25 b(character)-7 b(.)43 b Fm(Long)28
+b(options)p FA(,)g(common)g(in)e(GNU)h(utilities,)g(consist)299
+2989 y(of)f(two)g Fr(-)g FA(characters)g(followed)g(by)g(a)g(string)g
+(made)g(up)g(of)g(letters,)h(numbers,)f(and)299 3101
+y(hyphens.)34 b(Either)24 b(type)g(of)g(option)g(may)h(be)e(followed)h
+(by)g(an)f(ar)n(gument.)34 b(A)24 b(space)299 3213 y(separates)19
+b(a)f(short)h(option)f(fr)n(om)h(its)g(ar)n(guments;)h(either)d(a)i
+(space)g(or)g(an)f Fr(=)g FA(separates)299 3325 y(a)23
+b(long)h(option)g(fr)n(om)g(an)f(ar)n(gument.)299 3537
+y(Ther)n(e)c(ar)n(e)h(many)g(ways)g(of)h(parsing)f(command\255line)g
+(options.)34 b(The)19 b(most)j(popular)299 3649 y(method)k(is)g
+(parsing)g(the)g Fr(argv)f FA(array)g(by)h(hand.)40 b(The)25
+b Fr(getopt\(\))g FA(and)h Fr(getopt_long\(\))299 3761
+y FA(library)40 b(functions)h(pr)n(ovide)g(some)h(assistance)g(for)f
+(option)h(parsing.)86 b Fr(getopt\(\))299 3873 y FA(is)38
+b(pr)n(ovided)h(by)f(many)f(Unix)h(implementations,)j(but)d(it)f
+(supports)j(only)d(short)299 3985 y(options.)d(The)22
+b Fr(getopt_long\(\))g FA(function)g(is)h(available)e(on)h(Linux)h(and)
+f(allows)h(auto\255)299 4097 y(mated)h(parsing)g(of)f(both)h(short)g
+(and)f(long)h(options.)299 4309 y(A)33 b(library)f(called)h(popt)h
+(exists)g(speci\002cally)f(for)g(option)g(parsing.)62
+b(It)34 b(includes)e(a)299 4421 y(number)22 b(of)i(advantages)g(over)f
+(the)g Fr(getopt\(\))g FA(functions.)3232 4699 y Ft(445)p
+eop
+%%Page: 446 2
+446 469 bop -187 -116 a Ft(446)118 b FL(Chapter)29 b(24)83
+b Fv(Parsing)23 b(Command-Line)f(Options)p -187 -76 3413
+4 v 128 83 a FA(\225)100 b(It)33 b(does)h(not)f(make)h(use)f(of)g
+(global)g(variables,)h(which)e(allows)h(it)g(to)h(be)f(used)286
+195 y(when)22 b(multiple)h(passes)j(ar)n(e)d(needed)g(to)h(parse)g
+Fr(argv)p FA(.)128 407 y(\225)100 b(It)22 b(can)h(parse)f(an)g
+(arbitrary)f(array)g(of)i Fr(argv)p FA(\255style)f(elements.)33
+b(This)22 b(allows)g(popt)286 519 y(to)i(be)f(used)h(for)g(parsing)f
+(command\255line\255style)h(strings)g(fr)n(om)g(any)f(sour)n(ce.)128
+731 y(\225)100 b(It)30 b(pr)n(ovides)h(a)f(standar)n(d)g(method)g(of)g
+(option)g(aliasing.)52 b(Pr)n(ograms)30 b(that)g(use)286
+843 y(popt)c(can)f(easily)g(allow)f(users)h(to)g(add)h(new)e
+(command\255line)h(options,)h(which)286 955 y(ar)n(e)k(de\002ned)g(as)h
+(combinations)f(of)h(alr)n(eady\255existing)e(options.)55
+b(This)30 b(allows)286 1067 y(the)h(user)h(to)h(de\002ne)e(new)-9
+b(,)33 b(complex)h(behaviors)d(or)h(change)f(the)h(default)f(be\255)286
+1179 y(haviors)23 b(of)h(existing)f(options.)111 1453
+y(Like)h Fr(getopt_long\(\))p FA(,)e(the)i(popt)h(library)d(supports)j
+(short)f(and)g(long)f(style)h(options.)111 1665 y(The)29
+b(popt)j(library)d(is)h(highly)f(portable)h(and)g(should)g(work)f(on)h
+(any)g(POSIX)g(plat\255)111 1777 y(form.)68 b(The)34
+b(latest)h(version)g(is)g(always)g(available)e(fr)n(om)i(ftp:/)-14
+b(/ftp.r)n(edhat.com/)111 1889 y(pub/r)n(edhat/code/popt/)111
+2100 y(It)33 b(may)f(be)g(r)n(edistributed)f(under)g(either)g(the)h
+(GNU)g(General)f(Public)g(License)h(or)111 2213 y(the)24
+b(GNU)g(Library)f(General)f(Public)h(License,)h(at)f(the)h(distributor)
+7 b('s)23 b(discr)n(etion.)-187 2541 y Fk(24.1)131 b(Basic)40
+b(popt)j(Usage)p -187 2626 3413 5 v 111 2888 a Fu(24.1.1)59
+b(The)39 b(Option)h(Table)111 3099 y FA(Applications)d(pr)n(ovide)f
+(popt)g(with)f(information)f(on)h(their)f(command\255line)h(op\255)111
+3211 y(tions)24 b(thr)n(ough)f(an)g(array)g(of)h Fr(struct)42
+b(poptOption)23 b FA(str)o(uctur)n(es.)111 3417 y Fq(#include)35
+b(<popt.h>)111 3633 y(struct)h(poptOption)e({)258 3741
+y(const)i(char)g(*)g(longName;)f(/*)h(may)g(be)h(NULL)e(*/)258
+3849 y(char)h(shortName;)292 b(/*)36 b(may)g(be)h('\\0')e(*/)258
+3957 y(int)h(argInfo;)258 4065 y(void)g(*)h(arg;)440
+b(/*)36 b(depends)f(on)i(argInfo)e(*/)258 4172 y(int)h(val;)551
+b(/*)36 b(0)h(means)e(do)i(not)f(return,)f(just)h(update)f(flag)h(*/)
+111 4280 y(};)p eop
+%%Page: 447 3
+447 470 bop 2237 -116 a Fv(24.1)82 b(Basic)23 b(popt)f(Usage)119
+b Ft(447)p 0 -76 3413 4 v 446 71 a FL(Table)27 b(24.1)84
+b Fv(popt)22 b(Argument)i(Types)p 446 103 2820 4 v 446
+120 4 17 v 1167 120 V 2775 120 V 3262 120 V 446 219 4
+100 v 532 190 a Fs(V)-9 b(alue)p 1167 219 V 502 w(Description)p
+2775 219 V 1160 w Fq(arg)20 b Fs(T)-7 b(ype)p 3262 219
+V 446 236 4 17 v 1167 236 V 2775 236 V 3262 236 V 446
+239 2820 4 v 446 246 4 7 v 1167 246 V 2775 246 V 3262
+246 V 446 249 2820 4 v 446 266 4 17 v 1167 266 V 2775
+266 V 3262 266 V 446 365 4 100 v 532 336 a Fq(POPT_ARG_NONE)p
+1167 365 V 240 w Fw(No)21 b(ar)o(gument)f(is)h(expected)p
+2775 365 V 688 w Fq(int)p 3262 365 V 446 465 V 532 436
+a(POPT_ARG_STRING)p 1167 465 V 166 w Fw(No)g(type)g(checking)g(should)h
+(be)e(performed)p 2775 465 V 169 w Fq(char)35 b(*)p 3262
+465 V 446 565 V 532 535 a(POPT_ARG_INT)p 1167 565 V 277
+w Fw(An)21 b(integer)f(ar)o(gument)h(is)g(expected)p
+2775 565 V 410 w Fq(int)p 3262 565 V 446 664 V 532 635
+a(POPT_ARG_LONG)p 1167 664 V 240 w Fw(A)f(long)i(integer)f(is)g
+(expected)p 2775 664 V 652 w Fq(long)p 3262 664 V 446
+681 4 17 v 1167 681 V 2775 681 V 3262 681 V 446 684 2820
+4 v 299 933 a FA(Each)34 b(member)f(of)g(the)g(table)g(de\002nes)g(a)h
+(single)f(option)g(that)g(may)h(be)f(passed)i(to)299
+1045 y(the)29 b(pr)n(ogram.)50 b(Long)30 b(and)e(short)i(options)f(ar)n
+(e)g(consider)n(ed)h(a)f(single)f(option)i(that)299 1157
+y(may)k(occur)g(in)g(two)g(dif)n(fer)n(ent)f(forms.)65
+b(The)33 b(\002rst)h(two)g(members,)i Fr(longName)e FA(and)299
+1269 y Fr(shortName)p FA(,)25 b(de\002ne)g(the)g(names)h(of)f(the)g
+(option;)i(the)e(\002rst)h(is)g(a)g(long)f(name,)g(and)h(the)299
+1381 y(latter)d(is)h(a)g(single)f(character)-7 b(.)299
+1593 y(The)21 b Fr(argInfo)g FA(member)h(tells)g(popt)h(what)e(type)h
+(of)g(ar)n(gument)g(is)g(expected)h(after)e(the)299 1705
+y(ar)n(gument.)33 b(If)23 b(no)g(option)g(is)g(expected,)h
+Fr(POPT_ARG_NONE)d FA(should)i(be)g(used.)34 b(The)22
+b(r)n(est)299 1817 y(of)i(the)f(valid)g(values)h(ar)n(e)f(summarized)g
+(in)h(T)-9 b(able)22 b(24.1.)2355 1783 y Fx(1)299 2029
+y FA(The)j(next)g(element,)g Fr(arg)p FA(,)h(allows)f(popt)i(to)f
+(automatically)f(update)h(pr)n(ogram)g(vari\255)299 2141
+y(ables)21 b(when)g(the)g(option)h(is)g(used.)34 b(If)22
+b Fr(arg)f FA(is)h Fr(NULL)p FA(,)g(it)f(is)i(ignor)n(ed)e(and)h(popt)g
+(takes)h(no)299 2253 y(special)18 b(action.)33 b(Otherwise,)18
+b(it)g(should)g(point)h(to)f(a)g(variable)f(of)h(the)g(type)g
+(indicated)299 2365 y(in)23 b(the)g(right\255most)h(column)g(of)g(T)-9
+b(able)22 b(24.1.)299 2577 y(If)42 b(the)f(option)g(takes)h(no)g(ar)n
+(gument)e(\()p Fr(argInfo)h FA(is)h Fr(POPT_ARG_NONE)p
+FA(\),)e(the)h(variable)299 2689 y(pointed)21 b(to)g(by)f
+Fr(arg)h FA(is)g(set)g(to)g(1)f(when)f(the)h(option)h(is)g(used.)34
+b(If)20 b(the)g(option)h(does)h(take)299 2801 y(an)16
+b(ar)n(gument,)i(the)f(variable)e(that)i Fr(arg)g FA(points)h(to)g(is)f
+(updated)h(to)f(r)n(e\003ect)g(the)g(value)f(of)299 2913
+y(the)23 b(ar)n(gument.)34 b(Any)24 b(string)f(is)i(acceptable)e(for)h
+Fr(POPT_ARG_STRING)e FA(ar)n(guments,)i(but)299 3025
+y Fr(POPT_ARG_INT)19 b FA(and)h Fr(POPT_ARG_LONG)e FA(ar)n(guments)i
+(ar)n(e)g(converted)g(to)g(the)g(appr)n(opriate)299 3137
+y(type,)k(and)f(an)h(err)n(or)f(is)h(r)n(eturned)f(if)g(the)g
+(conversion)h(fails.)299 3349 y(The)33 b(\002nal)g(option,)38
+b Fr(val)p FA(,)e(is)f(the)f(value)f(popt's)j(parsing)e(function)f
+(should)i(r)n(eturn)299 3461 y(when)26 b(the)h(option)h(is)g(encounter)
+n(ed.)45 b(If)27 b(it)h(is)g(0,)g(the)f(parsing)h(function)f(parses)h
+(the)299 3573 y(next)23 b(command\255line)h(ar)n(gument)f(rather)f
+(than)h(r)n(eturn.)299 3785 y(The)c(\002nal)g(str)o(uctur)n(e)h(in)f
+(the)h(table)f(should)h(have)f(all)g(the)h(pointer)g(values)f(set)h(to)
+h Fr(NULL)299 3897 y FA(and)i(all)h(the)f(arithmetic)g(values)g(set)h
+(to)g(0,)g(marking)f(the)g(end)h(of)g(the)f(table.)p
+299 4234 897 5 v 299 4315 a Fw(1.)29 b Fq(getopt\(\))g
+Fw(connoisseurs)j(will)f(note)g(that)f Fq(argInfo)f Fw(is)i(the)f(only)
+i(\002eld)e(of)h Fq(struct)46 b(poptOption)391 4407 y
+Fw(that)29 b(is)g(not)g(dir)o(ectly)f(analogous)i(to)f(a)f(\002eld)h
+(in)g(the)g Fq(getopt_long\(\))d Fw(ar)o(gument)i(table.)53
+b(The)391 4498 y(similarity)22 b(between)e(the)h(two)g(allows)h(for)e
+(easy)h(transitions)h(fr)o(om)e Fq(getopt_long\(\))e
+Fw(to)j(popt.)p eop
+%%Page: 448 4
+448 471 bop -187 -116 a Ft(448)118 b FL(Chapter)29 b(24)83
+b Fv(Parsing)23 b(Command-Line)f(Options)p -187 -76 3413
+4 v 111 85 a Fu(24.1.2)59 b(Creating)39 b(a)f(Context)111
+297 y FA(popt)31 b(can)f(interleave)e(the)h(parsing)g(of)h(multiple)g
+(command\255line)f(sets.)53 b(It)30 b(allows)111 409
+y(this)e(by)g(keeping)g(all)f(the)g(state)i(information)d(for)i(a)g
+(particular)f(set)h(of)g(command\255)111 521 y(line)22
+b(ar)n(guments)h(in)f(a)h Fr(poptContext)e FA(data)i(str)o(uctur)n(e,)g
+(an)f(opaque)h(type)g(that)g(should)111 633 y(not)h(be)f(modi\002ed)i
+(outside)f(the)f(popt)i(library)-11 b(.)111 845 y(New)24
+b(popt)h(contexts)g(ar)n(e)e(cr)n(eated)h(by)g Fr(poptGetContext\(\))p
+FA(.)111 1051 y Fq(#include)35 b(<popt.h>)111 1266 y(poptContext)g
+(poptGetContext\(char)d(*)k(name,)g(int)g(argc,)f(char)h(**)h(argv,)
+1104 1374 y(struct)e(poptOption)g(*)h(options,)f(int)h(flags\);)111
+1586 y FA(The)26 b(\002rst)h(parameter)-7 b(,)26 b Fr(name)p
+FA(,)h(is)g(used)g(only)g(for)f(alias)h(handling)e(\(discussed)j
+(later\).)111 1698 y(It)h(should)f(be)f(the)h(name)f(of)h(the)g
+(application)g(whose)f(options)i(ar)n(e)e(being)g(parsed,)111
+1810 y(or)e(should)f(be)g Fr(NULL)g FA(if)g(no)g(option)h(aliasing)e
+(is)i(desir)n(ed.)36 b(The)24 b(next)g(two)g(ar)n(guments)111
+1922 y(specify)g(the)f(command\255line)g(ar)n(guments)g(to)h(parse.)34
+b(These)22 b(ar)n(e)h(generally)f(passed)111 2034 y(to)37
+b Fr(poptGetContext\(\))e FA(exactly)i(as)g(they)f(wer)n(e)g(passed)i
+(to)f(the)f(pr)n(ogram's)h Fr(main\(\))111 2146 y FA(function.)50
+b(The)29 b Fr(options)f FA(parameter)h(points)h(to)g(the)f(table)f(of)i
+(command\255line)e(op\255)111 2259 y(tions,)33 b(which)d(was)h
+(described)h(in)e(the)h(pr)n(evious)g(section.)56 b(The)30
+b(\002nal)g(parameter)-7 b(,)111 2371 y Fr(flags)p FA(,)21
+b(is)g(not)g(curr)n(ently)e(used)i(but)g(should)f(always)g(be)h
+(speci\002ed)g(as)g(0)f(for)h(compat\255)111 2483 y(ibility)i(with)g
+(futur)n(e)g(versions)h(of)g(the)f(popt)i(library)-11
+b(.)111 2694 y(A)26 b Fr(poptContext)f FA(keeps)h(track)g(of)g(which)e
+(options)j(have)d(alr)n(eady)h(been)g(parsed)h(and)111
+2807 y(which)h(r)n(emain,)i(among)f(other)f(things.)47
+b(If)28 b(a)g(pr)n(ogram)g(wishes)g(to)h(r)n(estart)f(option)111
+2919 y(pr)n(ocessing)23 b(of)f(a)g(set)g(of)g(ar)n(guments,)g(it)f(can)
+h(r)n(eset)g(the)f Fr(poptContext)g FA(by)h(passing)g(the)111
+3031 y(context)j(as)f(the)f(sole)h(ar)n(gument)f(to)h
+Fr(poptResetContext\(\))p FA(.)111 3242 y(When)j(ar)n(gument)g(pr)n
+(ocessing)h(is)g(complete,)h(the)d(pr)n(ocess)j(should)f(fr)n(ee)e(the)
+h Fr(popt-)111 3354 y(Context)22 b FA(as)h(it)f(contains)h(dynamically)
+f(allocated)g(components.)35 b(The)21 b Fr(poptFreeCon-)111
+3467 y(text\(\))32 b FA(function)g(takes)h(a)f Fr(poptContext)g
+FA(as)h(its)g(sole)g(ar)n(gument)e(and)i(fr)n(ees)f(the)g(r)n(e\255)111
+3579 y(sour)n(ces)25 b(the)e(context)i(is)f(using.)111
+3790 y(Her)n(e)g(ar)n(e)f(the)h(pr)n(ototypes)h(of)f(both)f
+Fr(poptResetContext\(\))f FA(and)i Fr(poptFreeContext\(\))p
+FA(.)111 3996 y Fq(#include)35 b(<popt.h>)111 4212 y(void)h
+(poptFreeContext\(poptContext)31 b(con\);)111 4320 y(void)36
+b(poptResetContext\(poptContext)30 b(con\);)p eop
+%%Page: 449 5
+449 472 bop 2237 -116 a Fv(24.1)82 b(Basic)23 b(popt)f(Usage)119
+b Ft(449)p 0 -76 3413 4 v 299 85 a Fu(24.1.3)58 b(Parsing)39
+b(the)h(Command)e(Line)299 297 y FA(After)26 b(an)g(application)h(has)g
+(cr)n(eated)f(a)h Fr(poptContext)p FA(,)f(it)h(may)g(begin)e(parsing)i
+(ar)n(gu\255)299 409 y(ments.)34 b(The)23 b Fr(poptGetNextOpt\(\))f
+FA(performs)i(the)g(actual)f(ar)n(gument)g(parsing.)299
+615 y Fq(#include)35 b(<popt.h>)299 831 y(int)h
+(poptGetNextOpt\(poptContext)31 b(con\);)299 1042 y FA(T)-9
+b(aking)44 b(the)h(context)h(as)g(its)f(sole)h(ar)n(gument,)k(this)45
+b(function)g(parses)h(the)f(next)299 1154 y(command\255line)34
+b(ar)n(gument)f(found.)65 b(After)34 b(\002nding)f(the)h(next)g(ar)n
+(gument)f(in)h(the)299 1266 y(option)29 b(table,)g(the)f(function)g
+(\002lls)g(in)g(the)g(object)i(pointed)e(to)h(by)g(the)f(option)h
+(table)299 1379 y(entry's)18 b Fr(arg)g FA(pointer)h(if)f(it)h(is)g
+(not)f Fr(NULL)p FA(.)g(If)h(the)f Fr(val)h FA(entry)f(for)g(the)g
+(option)h(is)g(non\2550,)g(the)299 1491 y(function)h(then)g(r)n(eturns)
+g(that)g(value.)32 b(Otherwise,)20 b Fr(poptGetNextOpt\(\))f
+FA(continues)i(on)299 1603 y(to)j(the)f(next)h(ar)n(gument.)299
+1814 y Fr(poptGetNextOpt\(\))g FA(r)n(eturns)h(\2551)g(when)f(the)h
+(\002nal)g(ar)n(gument)g(has)h(been)e(parsed,)j(and)299
+1926 y(other)20 b(negative)f(values)h(when)f(err)n(ors)i(occur)-7
+b(.)33 b(This)20 b(makes)h(it)f(a)h(good)g(idea)f(to)h(keep)299
+2039 y(the)i Fr(val)h FA(elements)f(in)g(the)h(options)g(table)f(gr)n
+(eater)g(than)g(0.)299 2250 y(If)48 b(all)f(of)h(the)f(command\255line)
+h(options)g(ar)n(e)g(handled)f(thr)n(ough)g Fr(arg)g
+FA(pointers,)299 2362 y(command\255line)23 b(parsing)h(is)g(r)n(educed)
+g(to)g(the)f(following)g(line)g(of)g(code:)299 2568 y
+Fq(rc)36 b(=)h(poptGetNextOpt\(poptcon\);)299 2780 y
+FA(Many)21 b(applications)g(r)n(equir)n(e)g(mor)n(e)g(complex)h
+(command\255line)f(parsing)g(than)f(this,)299 2892 y(however)-7
+b(,)22 b(and)i(use)f(the)g(following)g(str)o(uctur)n(e.)299
+3097 y Fq(while)35 b(\(\(rc)h(=)h(poptGetNextOpt\(poptcon\)\))31
+b(>)36 b(0\))h({)446 3205 y(switch)e(\(rc\))h({)593 3313
+y(/*)g(specific)f(arguments)g(are)h(handled)f(here)h(*/)446
+3421 y(})299 3529 y(})299 3741 y FA(When)f(r)n(eturned)g(options)i(ar)n
+(e)f(handled,)i(the)e(application)g(needs)g(to)g(know)g(the)299
+3853 y(value)21 b(of)h(any)g(ar)n(guments)g(that)g(wer)n(e)f
+(speci\002ed)i(after)f(the)g(option.)34 b(Ther)n(e)20
+b(ar)n(e)i(two)299 3965 y(ways)d(to)g(discover)g(them.)32
+b(One)18 b(is)i(to)f(ask)g(popt)g(to)h(\002ll)e(in)g(a)g(variable)f
+(with)h(the)g(value)299 4077 y(of)28 b(the)h(option)f(thr)n(ough)g(the)
+g(option)h(table's)f Fr(arg)g FA(elements.)48 b(The)28
+b(other)g(is)h(to)f(use)299 4189 y Fr(poptGetOptArg\(\))p
+FA(.)p eop
+%%Page: 450 6
+450 473 bop -187 -116 a Ft(450)118 b FL(Chapter)29 b(24)83
+b Fv(Parsing)23 b(Command-Line)f(Options)p -187 -76 3413
+4 v 111 170 a Fq(#include)35 b(<popt.h>)111 386 y(char)h(*)h
+(poptGetOptArg\(poptContext)31 b(con\);)111 598 y FA(This)c(function)f
+(r)n(eturns)h(the)g(ar)n(gument)f(given)g(for)h(the)g(\002nal)f(option)
+i(r)n(eturned)e(by)111 710 y Fr(poptGetNextOpt\(\))p
+FA(,)c(or)i(it)g(r)n(eturns)f Fr(NULL)g FA(if)h(no)f(ar)n(gument)g(was)
+h(speci\002ed.)111 1073 y Fu(24.1.4)59 b(Leftover)38
+b(Arguments)111 1285 y FA(Many)24 b(applications)g(take)f(an)h
+(arbitrary)e(number)g(of)i(command\255line)f(ar)n(guments,)111
+1397 y(such)j(as)g(a)g(list)g(of)g(\002le)f(names.)40
+b(When)25 b(popt)i(encounters)e(an)g(ar)n(gument)g(that)g(does)111
+1509 y(not)k(begin)f(with)g(a)h Fr(-)p FA(,)h(it)f(assumes)h(it)f(is)g
+(such)g(an)f(ar)n(gument)g(and)h(adds)h(it)f(to)g(a)g(list)111
+1621 y(of)i(leftover)f(ar)n(guments.)55 b(Thr)n(ee)30
+b(functions)g(allow)g(applications)h(to)h(access)g(such)111
+1733 y(ar)n(guments:)111 2007 y Fr(char)43 b(*)g
+(poptGetArg\(poptContext)d(con\);)411 2119 y FA(This)35
+b(function)f(r)n(eturns)g(the)g(next)h(leftover)f(ar)n(gument)g(and)g
+(marks)i(it)e(as)411 2231 y(pr)n(ocessed.)111 2443 y
+Fr(char)43 b(*)g(poptPeekArg\(poptContext)d(con\);)411
+2555 y FA(The)15 b(next)h(leftover)f(ar)n(gument)g(is)i(r)n(eturned)d
+(but)i(not)g(marked)g(as)g(pr)n(ocessed.)411 2667 y(This)39
+b(allows)g(an)f(application)h(to)h(look)f(ahead)g(into)g(the)f(ar)n
+(gument)h(list,)411 2779 y(without)23 b(modifying)h(the)f(list.)111
+2991 y Fr(char)43 b(**)f(poptGetArgs\(poptContext)f(con\);)411
+3103 y FA(All)16 b(the)g(leftover)f(ar)n(guments)g(ar)n(e)h(r)n
+(eturned)e(in)i(a)f(manner)g(identical)g(to)h Fr(argv)p
+FA(.)411 3215 y(The)j(\002nal)g(element)g(in)g(the)g(r)n(eturned)g
+(array)g(points)h(to)g Fr(NULL)p FA(,)f(indicating)g(the)411
+3327 y(end)24 b(of)g(the)f(ar)n(guments.)-187 3680 y
+Fk(24.2)131 b(Error)41 b(Handling)p -187 3765 3413 5
+v 111 4027 a FA(All)29 b(of)g(the)g(popt)h(functions)e(that)h(can)g(r)n
+(eturn)e(err)n(ors)i(r)n(eturn)f(integers.)49 b(When)28
+b(an)111 4139 y(err)n(or)d(occurs,)i(a)e(negative)f(err)n(or)h(code)h
+(is)f(r)n(eturned.)38 b(T)-9 b(able)24 b(24.2)h(summarizes)g(the)111
+4251 y(err)n(or)f(codes)g(that)g(occur)-7 b(.)34 b(Her)n(e)24
+b(is)g(a)g(mor)n(e)g(detailed)f(discussion)i(of)f(each)f(err)n(or)-7
+b(.)p eop
+%%Page: 451 7
+451 474 bop 2329 -116 a Fv(24.2)82 b(Error)23 b(Handling)118
+b Ft(451)p 0 -76 3413 4 v 421 71 a FL(Table)27 b(24.2)84
+b Fv(popt)22 b(Errors)p 421 103 2870 4 v 421 120 4 17
+v 1399 120 V 3287 120 V 421 219 4 100 v 507 190 a Fs(Error)p
+1399 219 V 785 w(Description)p 3287 219 V 421 236 4 17
+v 1399 236 V 3287 236 V 421 239 2870 4 v 421 246 4 7
+v 1399 246 V 3287 246 V 421 249 2870 4 v 421 266 4 17
+v 1399 266 V 3287 266 V 421 365 4 100 v 507 336 a Fq(POPT_ERROR_NOARG)p
+1399 365 V 386 w Fw(An)f(ar)o(gument)f(is)h(missing)h(for)f(an)g
+(option.)p 3287 365 V 421 465 V 507 436 a Fq(POPT_ERROR_BADOPT)p
+1399 465 V 349 w Fw(An)g(option's)h(ar)o(gument)e(could)h(not)h(be)e
+(parsed.)p 3287 465 V 421 565 V 507 535 a Fq(POPT_ERROR_OPTSTOODEEP)p
+1399 565 V 164 w Fw(Option)i(aliasing)f(is)g(nested)g(too)g(deeply)-9
+b(.)p 3287 565 V 421 664 V 507 635 a Fq(POPT_ERROR_BADQUOTE)p
+1399 664 V 275 w Fw(Quotations)22 b(do)f(not)h(match.)p
+3287 664 V 421 764 V 507 735 a Fq(POPT_ERROR_BADNUMBER)p
+1399 764 V 238 w Fw(An)f(option)h(could)f(not)g(be)g(converted)f(to)h
+(a)f(number)-6 b(.)p 3287 764 V 421 863 V 507 834 a Fq
+(POPT_ERROR_OVERFLOW)p 1399 863 V 275 w Fw(A)21 b(given)g(number)g(was)
+f(too)i(big)f(or)g(too)g(small.)p 3287 863 V 421 880
+4 17 v 1399 880 V 3287 880 V 421 883 2870 4 v 299 1132
+a Fr(POPT_ERROR_NOARG)599 1244 y FA(An)c(option)h(that)f(r)n(equir)n
+(es)h(an)f(ar)n(gument)f(was)i(speci\002ed)g(on)f(the)g(command)599
+1357 y(line,)40 b(but)d(no)g(ar)n(gument)g(was)g(given.)75
+b(This)37 b(can)h(be)f(r)n(eturned)f(only)h(by)599 1469
+y Fr(poptGetNextOpt\(\))p FA(.)299 1680 y Fr(POPT_ERROR_BADOPT)599
+1792 y FA(An)26 b(option)g(was)h(speci\002ed)f(in)g Fr(argv)g
+FA(but)g(is)g(not)g(in)g(the)g(option)g(table.)41 b(This)599
+1905 y(err)n(or)23 b(can)h(be)f(r)n(eturned)g(only)g(fr)n(om)h
+Fr(poptGetNextOpt\(\))p FA(.)299 2116 y Fr(POPT_ERROR_OPTSTOODEEP)599
+2228 y FA(A)f(set)h(of)f(option)g(aliases)g(is)h(nested)f(too)h(deeply)
+-11 b(.)34 b(Curr)n(ently)-11 b(,)22 b(popt)i(follows)599
+2340 y(options)30 b(only)f(10)g(levels)g(to)h(pr)n(event)f(in\002nite)f
+(r)n(ecursion.)50 b(Only)29 b Fr(poptGet-)599 2452 y(NextOpt\(\))23
+b FA(can)g(r)n(eturn)g(this)h(err)n(or)-7 b(.)299 2664
+y Fr(POPT_ERROR_BADQUOTE)599 2776 y FA(A)15 b(parsed)g(string)g(has)g
+(a)g(quotation)g(mismatch)g(\(such)g(as)g(a)g(single)g(quotation)599
+2888 y(mark\).)62 b Fr(poptParseArgvString\(\))p FA(,)33
+b Fr(poptReadConfigFile\(\))p FA(,)g(or)g Fr(poptReadDe-)599
+3000 y(faultConfig\(\))22 b FA(can)i(r)n(eturn)e(this)i(err)n(or)-7
+b(.)299 3212 y Fr(POPT_ERROR_BADNUMBER)599 3324 y FA(A)38
+b(conversion)g(fr)n(om)g(a)g(string)g(to)h(a)f(number)f(\()p
+Fr(int)h FA(or)g Fr(long)p FA(\))f(failed)h(due)599 3436
+y(to)28 b(the)g(string)g(containing)f(nonnumeric)f(characters.)47
+b(This)28 b(occurs)h(when)599 3548 y Fr(poptGetNextOpt\(\))c
+FA(is)j(pr)n(ocessing)g(an)f(ar)n(gument)f(of)h(type)g
+Fr(POPT_ARG_INT)f FA(or)599 3660 y Fr(POPT_ARG_LONG)p
+FA(.)299 3872 y Fr(POPT_ERROR_OVERFLOW)599 3984 y FA(A)g
+(string\255to\255number)f(conversion)g(failed)g(because)h(the)f(number)
+g(was)h(too)599 4096 y(lar)n(ge)41 b(or)h(too)g(small.)88
+b(Like)42 b Fr(POPT_ERROR_BADNUMBER)p FA(,)d(this)j(err)n(or)f(can)h
+(oc\255)599 4208 y(cur)28 b(only)h(when)e Fr(poptGetNextOpt\(\))g
+FA(is)i(pr)n(ocessing)h(an)e(ar)n(gument)g(of)h(type)599
+4320 y Fr(POPT_ARG_INT)22 b FA(or)i Fr(POPT_ARG_LONG)p
+FA(.)p eop
+%%Page: 452 8
+452 475 bop -187 -116 a Ft(452)118 b FL(Chapter)29 b(24)83
+b Fv(Parsing)23 b(Command-Line)f(Options)p -187 -76 3413
+4 v 111 83 a Fr(POPT_ERROR_ERRNO)411 195 y FA(A)36 b(system)g(call)f(r)
+n(eturned)f(with)h(an)f(err)n(or)-7 b(,)37 b(and)e Fr(errno)g
+FA(still)g(contains)g(the)411 307 y(err)n(or)23 b(fr)n(om)h(the)f
+(system)i(call.)34 b(Both)24 b Fr(poptReadConfigFile\(\))d
+FA(and)j Fr(poptRead-)411 419 y(DefaultConfig\(\))f FA(can)g(r)n(eturn)
+g(this)h(err)n(or)-7 b(.)111 656 y(T)e(wo)38 b(functions)f(ar)n(e)h
+(available)e(to)i(make)g(it)f(easy)h(for)g(applications)g(to)g(pr)n
+(ovide)111 768 y(good)25 b(err)n(or)e(messages.)111 1042
+y Fr(const)43 b(char)f(*)h(poptStrerror\(const)e(int)h(error\);)411
+1154 y FA(This)18 b(function)g(takes)h(a)f(popt)h(err)n(or)f(code)h
+(and)g(r)n(eturns)e(a)i(string)f(describing)411 1266
+y(the)24 b(err)n(or)-7 b(,)23 b(just)h(as)g(with)f(the)g(standar)n(d)i
+Fr(strerror\(\))d FA(function.)111 1478 y Fr(char)43
+b(*)g(poptBadOption\(poptContext)d(con,)i(int)h(flags\);)411
+1590 y FA(If)32 b(an)e(err)n(or)g(occurr)n(ed)i(during)e
+Fr(poptGetNextOpt\(\))p FA(,)h(this)g(function)g(r)n(eturns)411
+1702 y(the)38 b(option)g(that)g(caused)h(the)e(err)n(or)-7
+b(.)77 b(If)38 b(the)f Fr(flags)h FA(ar)n(gument)f(is)i(set)f(to)411
+1814 y Fr(POPT_BADOPTION_NOALIAS)p FA(,)e(the)i(outermost)h(option)f
+(is)h(r)n(eturned.)76 b(Other)n(\255)411 1926 y(wise,)31
+b Fr(flags)e FA(should)h(be)f(0,)i(and)e(the)g(option)h(that)f(is)h(r)n
+(eturned)f(may)h(have)411 2038 y(been)23 b(speci\002ed)i(thr)n(ough)d
+(an)i(alias.)111 2275 y(These)16 b(two)h(functions)f(make)h(popt)g(err)
+n(or)f(handling)g(trivial)f(for)i(most)h(applications.)111
+2387 y(When)26 b(an)f(err)n(or)g(is)h(detected)g(fr)n(om)g(most)h(of)f
+(the)f(functions,)h(an)f(err)n(or)g(message)h(is)111
+2499 y(printed)35 b(along)g(with)g(the)g(err)n(or)f(string)i(fr)n(om)f
+Fr(poptStrerror\(\))p FA(.)68 b(When)35 b(an)f(err)n(or)111
+2611 y(occurs)26 b(during)e(ar)n(gument)h(parsing,)g(code)g(similiar)g
+(to)g(the)g(following)f(displays)i(a)111 2723 y(useful)d(err)n(or)g
+(message.)111 2929 y Fq(fprintf\(stderr,)34 b("\045s:)h(\045s\\n",)405
+3037 y(poptBadOption\(optCon,)d(POPT_BADOPTION_NOALIAS\),)405
+3144 y(poptStrerror\(rc\)\);)-187 3475 y Fk(24.3)131
+b(Option)42 b(Aliasing)p -187 3560 3413 5 v 111 3822
+a FA(One)21 b(of)h(the)f(primary)g(bene\002ts)f(of)i(using)f(popt)h
+(over)f Fr(getopt\(\))g FA(is)h(the)f(ability)f(to)i(use)111
+3934 y(option)30 b(aliasing.)49 b(This)29 b(lets)h(the)e(user)h
+(specify)h(options)g(that)f(popt)h(expands)g(into)111
+4046 y(other)22 b(options)g(when)f(they)h(ar)n(e)f(speci\002ed.)35
+b(If)22 b(the)f(standar)n(d)i(gr)n(ep)f(pr)n(ogram)h(made)111
+4158 y(use)j(of)g(popt,)h(users)f(could)h(add)f(a)g Fr(--text)f
+FA(option)h(that)g(expanded)g(to)g Fr(-i)45 b(-n)g(-E)g(-2)111
+4270 y FA(to)25 b(let)e(them)h(mor)n(e)g(easily)f(\002nd)h(information)
+e(in)h(text)h(\002les.)p eop
+%%Page: 453 9
+453 476 bop 2298 -116 a Fv(24.3)81 b(Option)22 b(Aliasing)118
+b Ft(453)p 0 -76 3413 4 v 299 85 a Fu(24.3.1)58 b(Specifying)40
+b(Aliases)299 297 y FA(Aliases)18 b(ar)n(e)e(normally)h(speci\002ed)h
+(in)f(two)g(places:)32 b(/etc/popt)18 b(and)f(the)g(.popt)h(\002le)f
+(in)299 409 y(the)25 b(user)7 b('s)25 b(home)h(dir)n(ectory)f(\(found)g
+(thr)n(ough)g(the)g Fr(HOME)g FA(envir)n(onment)f(variable\).)299
+521 y(Both)33 b(\002les)h(have)e(the)h(same)h(format,)h(an)e(arbitrary)
+f(number)g(of)h(lines)g(formatted)299 633 y(like)23 b(this:)299
+845 y Fj(appname)42 b Fr(alias)g Fj(newoption)g(expansion)299
+1057 y FA(The)24 b Fj(appname)h FA(is)h(the)f(name)g(of)h(the)f
+(application,)h(which)e(must)j(be)e(the)g(same)h(as)g(the)299
+1169 y Fr(name)e FA(parameter)g(passed)i(to)f Fr(poptGetContext\(\))p
+FA(.)36 b(This)24 b(allows)g(each)g(\002le)g(to)i(specify)299
+1281 y(aliases)e(for)h(multiple)f(pr)n(ograms.)37 b(The)24
+b Fr(alias)g FA(keywor)n(d)g(speci\002es)i(that)e(an)g(alias)g(is)299
+1393 y(being)h(de\002ned;)i(curr)n(ently)f(popt)h(con\002guration)e
+(\002les)i(support)g(only)f(aliases,)h(but)299 1505 y(other)i
+(abilities)h(may)g(be)g(added)g(in)g(the)g(futur)n(e.)52
+b(The)29 b(next)h(option)g(is)g(the)g(option)299 1617
+y(that)d(should)h(be)g(aliased,)g(and)g(it)g(may)g(be)f(either)g(a)h
+(short)g(or)f(a)h(long)g(option.)46 b(The)299 1729 y(r)n(est)29
+b(of)h(the)e(line)h(speci\002es)h(the)e(expansion)h(for)g(the)g(alias.)
+50 b(It)30 b(is)f(parsed)h(similarly)299 1841 y(to)f(a)g(shell)f
+(command,)j(which)d(allows)h Fr(\\)p FA(,)h Fr(")p FA(,)g(and)f
+Fr(')g FA(to)g(be)g(used)g(for)g(quoting.)49 b(If)29
+b(a)299 1953 y(backslash)22 b(is)g(the)g(\002nal)f(character)g(on)g(a)h
+(line,)f(the)h(next)f(line)g(in)h(the)f(\002le)g(is)i(assumed)299
+2066 y(to)28 b(be)f(a)g(logical)g(continuation)f(of)i(the)f(line)f
+(containing)h(the)g(backslash,)h(just)g(as)g(in)299 2178
+y(shell.)299 2389 y(The)i(following)g(entry)h(would)f(add)i(a)f
+Fr(--text)g FA(option)g(to)h(the)e Fr(grep)h FA(command,)j(as)299
+2501 y(suggested)24 b(at)g(the)f(beginning)f(of)i(this)g(section.)299
+2713 y Fr(grep)42 b(alias)h(--text)f(-i)h(-n)f(-E)h(-2)299
+3068 y Fu(24.3.2)58 b(Enabling)39 b(Aliases)299 3279
+y FA(An)21 b(application)f(must)i(enable)d(alias)h(expansion)h(for)g(a)
+f Fr(poptContext)g FA(befor)n(e)g(calling)299 3391 y
+Fr(poptGetNextArg\(\))33 b FA(for)i(the)g(\002rst)g(time.)68
+b(Ther)n(e)34 b(ar)n(e)g(thr)n(ee)h(functions)f(that)h(de\002ne)299
+3503 y(aliases)23 b(for)h(a)g(context.)299 3777 y Fr(int)42
+b(poptReadDefaultConfig\(poptContext)e(con,)i(int)h(flags\);)599
+3889 y FA(This)d(function)f(r)n(eads)h(aliases)g(fr)n(om)h(/etc/popt)g
+(and)f(the)g(.popt)h(\002le)f(in)599 4002 y(the)29 b(user)7
+b('s)29 b(home)g(dir)n(ectory)-11 b(.)53 b(Curr)n(ently)-11
+b(,)29 b Fr(flags)g FA(should)h(be)f Fr(NULL)p FA(,)g(as)g(it)h(is)599
+4114 y(pr)n(ovided)24 b(only)g(for)f(futur)n(e)g(expansion.)p
+eop
+%%Page: 454 10
+454 477 bop -187 -116 a Ft(454)118 b FL(Chapter)29 b(24)83
+b Fv(Parsing)23 b(Command-Line)f(Options)p -187 -76 3413
+4 v 111 83 a Fr(int)43 b(poptReadConfigFile\(poptContext)c(con,)k(char)
+f(*)h(fn\);)411 195 y FA(The)17 b(\002le)h(speci\002ed)h(by)f
+Fr(fn)g FA(is)g(opened)g(and)g(parsed)h(as)f(a)g(popt)h
+(con\002guration)411 307 y(\002le.)68 b(This)35 b(allows)f(pr)n(ograms)
+i(to)g(use)f(pr)n(ogram\255speci\002c)h(con\002guration)411
+419 y(\002les.)111 631 y Fr(int)43 b(poptAddAlias\(poptContext)d(con,)j
+(struct)f(poptAlias)g(alias,)g(int)g(flags\);)411 743
+y FA(Occasionally)-11 b(,)37 b(pr)n(ocesses)f(want)d(to)h(specify)g
+(aliases)g(without)f(having)f(to)411 855 y(r)n(ead)24
+b(them)f(fr)n(om)h(a)f(con\002guration)f(\002le.)34 b(This)23
+b(function)f(adds)i(a)g(new)e(alias)411 967 y(to)39 b(a)f(context.)77
+b(The)38 b Fr(flags)f FA(ar)n(gument)h(should)g(be)f(0,)42
+b(as)c(it)g(is)h(curr)n(ently)411 1079 y(r)n(eserved)21
+b(for)g(futur)n(e)e(expansion.)33 b(The)20 b(new)g(alias)h(is)g
+(speci\002ed)g(as)h(a)e Fr(struct)411 1191 y(poptAlias)p
+FA(,)j(which)g(is)h(de\002ned)f(as:)411 1388 y Fq(struct)36
+b(poptAlias)e({)558 1496 y(char)i(*)h(longName;)439 b(/*)36
+b(may)g(be)g(NULL)g(*/)558 1604 y(char)g(shortName;)476
+b(/*)36 b(may)g(be)g('\\0')g(*/)558 1712 y(int)g(argc;)558
+1820 y(char)g(**)h(argv;)550 b(/*)36 b(must)g(be)g(free\(\)able)f(*/)
+411 1927 y(};)411 2139 y FA(The)d(\002rst)h(two)g(elements,)i
+Fr(longName)d FA(and)g Fr(shortName)p FA(,)j(specify)e(the)g(option)411
+2251 y(that)23 b(is)g(aliased.)33 b(The)22 b(\002nal)g(two,)h
+Fr(argc)f FA(and)g Fr(argv)p FA(,)h(de\002ne)f(the)g(expansion)g(to)411
+2363 y(use)i(when)e(the)i(aliases)f(option)h(is)g(encounter)n(ed.)-187
+2716 y Fk(24.4)131 b(Parsing)41 b(Argument)f(Strings)p
+-187 2801 3413 5 v 111 3063 a FA(Although)21 b(popt)i(is)g(usually)e
+(used)h(for)f(parsing)h(ar)n(guments)g(alr)n(eady)f(divided)h(into)111
+3175 y(an)e Fr(argv)p FA(\255style)f(array)-11 b(,)20
+b(some)h(pr)n(ograms)g(need)e(to)h(parse)g(strings)h(that)e(ar)n(e)h
+(formatted)111 3287 y(identically)30 b(to)g(command)h(lines.)52
+b(T)-9 b(o)30 b(facilitate)f(this,)j(popt)f(pr)n(ovides)g(a)f(function)
+111 3399 y(that)f(parses)h(a)g(string)f(into)g(an)g(array)f(of)h
+(string,)i(using)e(r)o(ules)g(similiar)g(to)g(normal)111
+3512 y(shell)24 b(parsing.)111 3717 y Fq(#include)35
+b(<popt.h>)111 3933 y(int)h(poptParseArgvString\(char)31
+b(*)37 b(s,)f(int)g(*)h(argcPtr,)e(char)h(***)g(argvPtr\);)111
+4145 y FA(The)19 b(string)h Fr(s)g FA(is)g(parsed)h(into)f(an)f
+Fr(argv)p FA(\255style)h(array)-11 b(.)32 b(The)19 b(integer)g(pointed)
+h(to)g(by)g(the)111 4257 y(second)33 b(parameter)-7 b(,)32
+b Fr(argcPtr)p FA(,)h(contains)e(the)g(number)g(of)g(elements)g
+(parsed,)j(and)111 4369 y(the)c(pointer)h(pointed)f(to)h(by)g(the)f
+(\002nal)f(parameter)h(is)h(set)g(to)g(point)g(to)g(the)f(newly)p
+eop
+%%Page: 455 11
+455 478 bop 2154 -116 a Fv(24.6)82 b(Sample)23 b(Application)115
+b Ft(455)p 0 -76 3413 4 v 299 83 a FA(cr)n(eated)28 b(array)-11
+b(.)45 b(The)27 b(array)g(is)h(dynamically)g(allocated)f(and)h(should)f
+(be)h Fr(free\(\))p FA(ed)299 195 y(when)22 b(the)i(application)f(is)h
+(\002nished)f(with)g(it.)299 407 y(The)i Fr(argvPtr)h
+FA(cr)n(eated)h(by)f Fr(poptParseArgvString\(\))e FA(is)j(suitable)f
+(to)h(pass)g(dir)n(ectly)g(to)299 519 y Fr(poptGetContext\(\))p
+FA(.)0 838 y Fk(24.5)132 b(Handling)41 b(Extra)f(Arguments)p
+0 923 3413 5 v 299 1185 a FA(Some)33 b(applications)f(implement)h(the)f
+(equivalent)e(of)j(option)f(aliasing)g(but)g(need)299
+1297 y(to)39 b(do)h(so)g(thr)n(ough)e(special)i(logic.)80
+b(The)38 b Fr(poptStuffArgs\(\))g FA(function)g(allows)h(an)299
+1409 y(application)24 b(to)g(insert)f(new)g(ar)n(guments)g(into)h(the)f
+(curr)n(ent)g Fr(poptContext)p FA(.)299 1615 y Fq(#include)35
+b(<popt.h>)299 1831 y(int)h(poptStuffArgs\(poptContext)31
+b(con,)36 b(char)f(**)i(argv\);)299 2042 y FA(The)k(passed)j
+Fr(argv)e FA(must)h(have)f(a)h Fr(NULL)f FA(pointer)g(as)h(its)g
+(\002nal)e(element.)90 b(When)299 2154 y Fr(poptGetNextOpt\(\))39
+b FA(is)j(next)f(called,)k(the)c(\223stuf)n(fed\224)f(ar)n(guments)h
+(ar)n(e)g(the)g(\002rst)g(to)299 2266 y(be)g(parsed.)87
+b(popt)43 b(r)n(eturns)e(to)g(the)g(normal)g(ar)n(guments)g(once)g(all)
+g(the)g(stuf)n(fed)299 2378 y(ar)n(guments)23 b(have)g(been)g
+(exhausted.)0 2707 y Fk(24.6)132 b(Sample)41 b(Application)p
+0 2792 V 299 3054 a FA(Robin,)28 b(the)g(sample)g(application)g(on)g
+(pages)h(274\226281)d(of)i(Chapter)f(15,)i(uses)f(popt)299
+3166 y(for)36 b(its)i(ar)n(gument)e(parsing.)73 b(It)37
+b(pr)n(ovides)h(a)e(good)i(example)f(of)g(how)f(the)g(popt)299
+3278 y(library)22 b(is)i(generally)f(used.)299 3489 y(RPM,)31
+b(a)g(popular)f(Linux)h(package)g(management)f(pr)n(ogram,)k(makes)d
+(heavy)f(use)299 3602 y(of)23 b(popt's)g(featur)n(es.)33
+b(Many)23 b(of)g(its)g(command\255line)f(ar)n(guments)g(ar)n(e)g
+(implemented)299 3714 y(thr)n(ough)30 b(popt)i(aliases,)g(which)e
+(makes)h(RPM)g(an)f(excellent)g(example)h(of)g(how)f(to)299
+3826 y(take)36 b(advantage)g(of)h(the)f(popt)i(library)-11
+b(.)73 b(For)37 b(mor)n(e)g(information)e(on)i(RPM,)f(see)299
+3938 y(http:/)-14 b(/www)-9 b(.rpm.or)n(g)p eop
+%%Trailer
+end
+userdict /end-hook known{end-hook}if
+%%EOF
-- 
Gitee


From df76820340e48b71d89f9c8fcbbef5db79957a02 Mon Sep 17 00:00:00 2001
From: Erik Troan <ewt@redhat.com>
Date: Mon, 23 Mar 1998 20:28:01 +0000
Subject: [PATCH 025/667] don't read ~/.popt in setuid apps

---
 popt.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/popt.c b/popt.c
index 2afffb9..bf814eb 100644
--- a/popt.c
+++ b/popt.c
@@ -519,6 +519,8 @@ int poptReadDefaultConfig(poptContext con, int useEnv) {
 
     rc = poptReadConfigFile(con, "/etc/popt");
     if (rc) return rc;
+    if (getuid() != geteuid()) return 0;
+
     if ((home = getenv("HOME"))) {
 	fn = alloca(strlen(home) + 20);
 	sprintf(fn, "%s/.popt", home);
-- 
Gitee


From ee8e7bad69e7ba6115bd10ea898c15b5812979a5 Mon Sep 17 00:00:00 2001
From: Erik Troan <ewt@redhat.com>
Date: Mon, 23 Mar 1998 20:28:53 +0000
Subject: [PATCH 026/667] *** empty log message ***

---
 install-sh | 238 +++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 238 insertions(+)
 create mode 100755 install-sh

diff --git a/install-sh b/install-sh
new file mode 100755
index 0000000..5871924
--- /dev/null
+++ b/install-sh
@@ -0,0 +1,238 @@
+#! /bin/sh
+#
+# install - install a program, script, or datafile
+# This comes from X11R5.
+#
+# Calling this script install-sh is preferred over install.sh, to prevent
+# `make' implicit rules from creating a file called install from it
+# when there is no Makefile.
+#
+# This script is compatible with the BSD install script, but was written
+# from scratch.
+#
+
+
+# set DOITPROG to echo to test this script
+
+# Don't use :- since 4.3BSD and earlier shells don't like it.
+doit="${DOITPROG-}"
+
+
+# put in absolute paths if you don't have them in your path; or use env. vars.
+
+mvprog="${MVPROG-mv}"
+cpprog="${CPPROG-cp}"
+chmodprog="${CHMODPROG-chmod}"
+chownprog="${CHOWNPROG-chown}"
+chgrpprog="${CHGRPPROG-chgrp}"
+stripprog="${STRIPPROG-strip}"
+rmprog="${RMPROG-rm}"
+mkdirprog="${MKDIRPROG-mkdir}"
+
+transformbasename=""
+transform_arg=""
+instcmd="$mvprog"
+chmodcmd="$chmodprog 0755"
+chowncmd=""
+chgrpcmd=""
+stripcmd=""
+rmcmd="$rmprog -f"
+mvcmd="$mvprog"
+src=""
+dst=""
+dir_arg=""
+
+while [ x"$1" != x ]; do
+    case $1 in
+	-c) instcmd="$cpprog"
+	    shift
+	    continue;;
+
+	-d) dir_arg=true
+	    shift
+	    continue;;
+
+	-m) chmodcmd="$chmodprog $2"
+	    shift
+	    shift
+	    continue;;
+
+	-o) chowncmd="$chownprog $2"
+	    shift
+	    shift
+	    continue;;
+
+	-g) chgrpcmd="$chgrpprog $2"
+	    shift
+	    shift
+	    continue;;
+
+	-s) stripcmd="$stripprog"
+	    shift
+	    continue;;
+
+	-t=*) transformarg=`echo $1 | sed 's/-t=//'`
+	    shift
+	    continue;;
+
+	-b=*) transformbasename=`echo $1 | sed 's/-b=//'`
+	    shift
+	    continue;;
+
+	*)  if [ x"$src" = x ]
+	    then
+		src=$1
+	    else
+		# this colon is to work around a 386BSD /bin/sh bug
+		:
+		dst=$1
+	    fi
+	    shift
+	    continue;;
+    esac
+done
+
+if [ x"$src" = x ]
+then
+	echo "install:	no input file specified"
+	exit 1
+else
+	true
+fi
+
+if [ x"$dir_arg" != x ]; then
+	dst=$src
+	src=""
+	
+	if [ -d $dst ]; then
+		instcmd=:
+	else
+		instcmd=mkdir
+	fi
+else
+
+# Waiting for this to be detected by the "$instcmd $src $dsttmp" command
+# might cause directories to be created, which would be especially bad 
+# if $src (and thus $dsttmp) contains '*'.
+
+	if [ -f $src -o -d $src ]
+	then
+		true
+	else
+		echo "install:  $src does not exist"
+		exit 1
+	fi
+	
+	if [ x"$dst" = x ]
+	then
+		echo "install:	no destination specified"
+		exit 1
+	else
+		true
+	fi
+
+# If destination is a directory, append the input filename; if your system
+# does not like double slashes in filenames, you may need to add some logic
+
+	if [ -d $dst ]
+	then
+		dst="$dst"/`basename $src`
+	else
+		true
+	fi
+fi
+
+## this sed command emulates the dirname command
+dstdir=`echo $dst | sed -e 's,[^/]*$,,;s,/$,,;s,^$,.,'`
+
+# Make sure that the destination directory exists.
+#  this part is taken from Noah Friedman's mkinstalldirs script
+
+# Skip lots of stat calls in the usual case.
+if [ ! -d "$dstdir" ]; then
+defaultIFS='	
+'
+IFS="${IFS-${defaultIFS}}"
+
+oIFS="${IFS}"
+# Some sh's can't handle IFS=/ for some reason.
+IFS='%'
+set - `echo ${dstdir} | sed -e 's@/@%@g' -e 's@^%@/@'`
+IFS="${oIFS}"
+
+pathcomp=''
+
+while [ $# -ne 0 ] ; do
+	pathcomp="${pathcomp}${1}"
+	shift
+
+	if [ ! -d "${pathcomp}" ] ;
+        then
+		$mkdirprog "${pathcomp}"
+	else
+		true
+	fi
+
+	pathcomp="${pathcomp}/"
+done
+fi
+
+if [ x"$dir_arg" != x ]
+then
+	$doit $instcmd $dst &&
+
+	if [ x"$chowncmd" != x ]; then $doit $chowncmd $dst; else true ; fi &&
+	if [ x"$chgrpcmd" != x ]; then $doit $chgrpcmd $dst; else true ; fi &&
+	if [ x"$stripcmd" != x ]; then $doit $stripcmd $dst; else true ; fi &&
+	if [ x"$chmodcmd" != x ]; then $doit $chmodcmd $dst; else true ; fi
+else
+
+# If we're going to rename the final executable, determine the name now.
+
+	if [ x"$transformarg" = x ] 
+	then
+		dstfile=`basename $dst`
+	else
+		dstfile=`basename $dst $transformbasename | 
+			sed $transformarg`$transformbasename
+	fi
+
+# don't allow the sed command to completely eliminate the filename
+
+	if [ x"$dstfile" = x ] 
+	then
+		dstfile=`basename $dst`
+	else
+		true
+	fi
+
+# Make a temp file name in the proper directory.
+
+	dsttmp=$dstdir/#inst.$$#
+
+# Move or copy the file name to the temp name
+
+	$doit $instcmd $src $dsttmp &&
+
+	trap "rm -f ${dsttmp}" 0 &&
+
+# and set any options; do chmod last to preserve setuid bits
+
+# If any of these fail, we abort the whole thing.  If we want to
+# ignore errors from any of these, just make sure not to ignore
+# errors from the above "$doit $instcmd $src $dsttmp" command.
+
+	if [ x"$chowncmd" != x ]; then $doit $chowncmd $dsttmp; else true;fi &&
+	if [ x"$chgrpcmd" != x ]; then $doit $chgrpcmd $dsttmp; else true;fi &&
+	if [ x"$stripcmd" != x ]; then $doit $stripcmd $dsttmp; else true;fi &&
+	if [ x"$chmodcmd" != x ]; then $doit $chmodcmd $dsttmp; else true;fi &&
+
+# Now rename the file to the real destination.
+
+	$doit $rmcmd -f $dstdir/$dstfile &&
+	$doit $mvcmd $dsttmp $dstdir/$dstfile 
+
+fi &&
+
+
+exit 0
-- 
Gitee


From 17298618ff8526df613b67aac0f6781937179e8b Mon Sep 17 00:00:00 2001
From: Erik Troan <ewt@redhat.com>
Date: Mon, 23 Mar 1998 20:48:29 +0000
Subject: [PATCH 027/667] added autoconf into make archive

---
 Makefile.in | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/Makefile.in b/Makefile.in
index ed4ac49..58dc54f 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -16,6 +16,9 @@ LIBS=$(prefix)/lib
 INCLUDE=$(prefix)/include
 CPP=@CPP@
 
+VERSION=$(shell awk '/define version/ { print $$3 }' popt.spec)
+CVSTAG = r$(subst .,-,$(VERSION))
+
 # -----------------------------------------------------------------------
 
 CFLAGS = @CFLAGS@ @DEFS@ $(OPTS)
@@ -53,6 +56,16 @@ install:
 	$INSTALL_DATA) -m 644 popt.h $(PREFIX)/$(INCLUDE)/popt.h
 	$INSTALL_DATA) -m 644 $(LIBPOPT) $(PREFIX)/$(LIBS)/$(LIBPOPT)
 
+archive:
+	cvs tag -F $(CVSTAG) .
+	@rm -rf /tmp/popt-$(VERSION) /tmp/popt
+	@cd /tmp; cvs export -r$(CVSTAG) popt
+	@cd /tmp/popt; autoconf
+	@mv /tmp/popt /tmp/popt-$(VERSION)
+	@dir=$$PWD; cd /tmp; tar cvzf $$dir/popt-$(VERSION).tar.gz popt-$(VERSION)
+	@rm -rf /tmp/popt-$(VERSION)
+	@echo "The archive is in popt-$(VERSION).tar.gz"
+
 ifeq (.depend,$(wildcard .depend))
 include .depend
 endif
-- 
Gitee


From 02ffe0d39c9c01d38c1024c0281e259b5881f335 Mon Sep 17 00:00:00 2001
From: Erik Troan <ewt@redhat.com>
Date: Mon, 23 Mar 1998 20:52:17 +0000
Subject: [PATCH 028/667] *** empty log message ***

---
 README | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)
 create mode 100644 README

diff --git a/README b/README
new file mode 100644
index 0000000..7fccc83
--- /dev/null
+++ b/README
@@ -0,0 +1,18 @@
+This is the popt command line option parsing library. While it is similiar
+to getopt(3), it contains a number of enhancements, including:
+
+	1) popt is fully reentrant
+	2) popt can parse arbitrary argv[] style arrays while 
+	   getopt(2) makes this quite difficult
+	3) popt allows users to alias command line arguments
+	4) popt provides convience functions for parsting strings
+	   into argv[] style arrays
+
+popt is used by rpm, the Red Hat install program, and many other Red Hat
+utilities, all of which provide excellent examples of how to use popt. 
+Complete documentation on popt is available in popt.ps (included in this
+tarball), which is excerpted with permission from the book "Linux
+Application Development" by Michael K. Johnson and Erik Troan (availble
+from Addison Wesley in May, 1998).
+
+Comments on popt should be addressed to ewt@redhat.com.
-- 
Gitee


From 48b74f1cfa1cb9573d097ded147781b80daede7e Mon Sep 17 00:00:00 2001
From: Erik Troan <ewt@redhat.com>
Date: Fri, 27 Mar 1998 17:41:20 +0000
Subject: [PATCH 029/667] fixed minor typos

---
 Makefile.in | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/Makefile.in b/Makefile.in
index 58dc54f..d02c97a 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -1,6 +1,6 @@
 srcdir = @srcdir@
 top_srcdir = @top_srcdir@
-VPATH = @srcdir
+VPATH = @srcdir@
 
 LIBOBJECTS = 	popt.o
 
@@ -27,7 +27,7 @@ ifeq ($(RANLIB),)
 RANLIB=ranlib
 endif
 
-ifeq (.depend,$(wildcard .depend-done))
+ifeq (.depend-done,$(wildcard .depend-done))
 TARGET=allprogs
 else
 TARGET=@TARGET@
@@ -37,7 +37,7 @@ $(LIBPOPT): $(LIBPOPT)($(LIBOBJECTS))
 	$(RANLIB) $@
 
 distclean: clean
-	rm -f Makefile .depend-done
+	rm -f Makefile .depend-done config.log config.status
 
 clean:
 	rm -f *.a *.o *~ $(PROGS) test.out tagtable.c
-- 
Gitee


From 2b08afa82e653a22c72cc3e4dcb2f8a2e3cae17b Mon Sep 17 00:00:00 2001
From: Erik Troan <ewt@redhat.com>
Date: Thu, 2 Apr 1998 17:49:19 +0000
Subject: [PATCH 030/667] added CC

---
 Makefile.in | 1 +
 1 file changed, 1 insertion(+)

diff --git a/Makefile.in b/Makefile.in
index d02c97a..f7504da 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -6,6 +6,7 @@ LIBOBJECTS = 	popt.o
 
 SOURCES = $(addprefix $(srcdir)/,$(subst .o,.c,$(LIBOBJECTS)))
 LIBPOPT = libpopt.a
+CC = @CC@
 
 RANLIB=@RANLIB@
 INSTALL=@INSTALL@
-- 
Gitee


From 2f04d812646cb8fcb3f2f7c1e7c70170d0fc8b1c Mon Sep 17 00:00:00 2001
From: Erik Troan <ewt@redhat.com>
Date: Thu, 9 Apr 1998 13:55:29 +0000
Subject: [PATCH 031/667] - version 1.1.1 - spec file needs to ./configure

---
 popt.spec | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/popt.spec b/popt.spec
index 7175dc4..2805b95 100644
--- a/popt.spec
+++ b/popt.spec
@@ -1,6 +1,6 @@
 Summary: C library for parsing command line parameters
 Name: popt
-%define version 1.1
+%define version 1.1.1
 Version: %{version}
 Release: 1
 Copyright: LGPL
@@ -17,8 +17,15 @@ It also allows command line arguments to be aliased via configuration
 files and includes utility functions for parsing arbitrary strings into
 argv[] arrays using shell-like rules. 
 
+%changelog
+
+* Thu Apr 09 1998 Erik Troan <ewt@redhat.com>
+
+- added ./configure step to spec file
+
 %prep
 %setup
+./configure --prefix=/usr
 
 %build
 make CFLAGS="$RPM_OPT_FLAGS"
-- 
Gitee


From 7f07a95d92c2a4399bce48393d62584ff70a2dc9 Mon Sep 17 00:00:00 2001
From: Erik Troan <ewt@redhat.com>
Date: Thu, 9 Apr 1998 13:59:38 +0000
Subject: [PATCH 032/667] don't override CFLAGS for make, just for configure

---
 popt.spec | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/popt.spec b/popt.spec
index 2805b95..487b91e 100644
--- a/popt.spec
+++ b/popt.spec
@@ -25,10 +25,10 @@ argv[] arrays using shell-like rules.
 
 %prep
 %setup
-./configure --prefix=/usr
+CFLAGS="$RPM_OPT_FLAGS" ./configure --prefix=/usr
 
 %build
-make CFLAGS="$RPM_OPT_FLAGS"
+make
 
 %install
 make PREFIX=$RPM_BUILD_ROOT install
-- 
Gitee


From 992ad57613d77f08d8948f071209d1d51b1d9d26 Mon Sep 17 00:00:00 2001
From: Erik Troan <ewt@redhat.com>
Date: Thu, 9 Apr 1998 14:00:32 +0000
Subject: [PATCH 033/667] fixed some broken install rules

---
 Makefile.in | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Makefile.in b/Makefile.in
index f7504da..ddc5257 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -54,8 +54,8 @@ depend:
 install:
 	mkdir -p $(PREFIX)/$(INCLUDE)
 	mkdir -p $(PREFIX)/$(LIBS)
-	$INSTALL_DATA) -m 644 popt.h $(PREFIX)/$(INCLUDE)/popt.h
-	$INSTALL_DATA) -m 644 $(LIBPOPT) $(PREFIX)/$(LIBS)/$(LIBPOPT)
+	$(INSTALL_DATA) -m 644 popt.h $(PREFIX)/$(INCLUDE)/popt.h
+	$(INSTALL_DATA) -m 644 $(LIBPOPT) $(PREFIX)/$(LIBS)/$(LIBPOPT)
 
 archive:
 	cvs tag -F $(CVSTAG) .
-- 
Gitee


From 4a735dd878e2877fcd5195dae567b492a09bbdb6 Mon Sep 17 00:00:00 2001
From: Erik Troan <ewt@redhat.com>
Date: Sun, 10 May 1998 20:31:51 +0000
Subject: [PATCH 034/667] .cvsignore

---
 .cvsignore | 8 ++++++++
 1 file changed, 8 insertions(+)
 create mode 100644 .cvsignore

diff --git a/.cvsignore b/.cvsignore
new file mode 100644
index 0000000..eea43d2
--- /dev/null
+++ b/.cvsignore
@@ -0,0 +1,8 @@
+Makefile
+mappcinames
+pci-ids-temp.h
+Makefile
+configure
+config.log
+config.cache
+config.satus
-- 
Gitee


From 8f6dd181df3e9993181c1e61e216f9a79b932750 Mon Sep 17 00:00:00 2001
From: Erik Troan <ewt@redhat.com>
Date: Sun, 10 May 1998 20:32:15 +0000
Subject: [PATCH 035/667] .cvsignore

---
 .cvsignore | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.cvsignore b/.cvsignore
index eea43d2..92adf9d 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -6,3 +6,4 @@ configure
 config.log
 config.cache
 config.satus
+config.status
-- 
Gitee


From 267295789aba2a5c32fd8d4dfa0d9036b255c787 Mon Sep 17 00:00:00 2001
From: Erik Troan <ewt@redhat.com>
Date: Thu, 21 May 1998 18:11:14 +0000
Subject: [PATCH 036/667] added CHANGES file updated .cvsignore

---
 .cvsignore | 2 ++
 CHANGES    | 4 ++++
 2 files changed, 6 insertions(+)
 create mode 100644 CHANGES

diff --git a/.cvsignore b/.cvsignore
index 92adf9d..5e077ee 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -7,3 +7,5 @@ config.log
 config.cache
 config.satus
 config.status
+.depend
+CHANGES
diff --git a/CHANGES b/CHANGES
new file mode 100644
index 0000000..4b90523
--- /dev/null
+++ b/CHANGES
@@ -0,0 +1,4 @@
+1.0 -> 1.1
+	- moved to autoconf (Fred Fish)
+	- added STRERROR replacement (Norbert Warmuth)
+	- added const keywords (Bruce Perens)
-- 
Gitee


From b0dc78a9777241337ff70c53dee8cb85e686e2e5 Mon Sep 17 00:00:00 2001
From: Erik Troan <ewt@redhat.com>
Date: Thu, 21 May 1998 18:11:24 +0000
Subject: [PATCH 037/667] removed CHANGES

---
 .cvsignore | 1 -
 1 file changed, 1 deletion(-)

diff --git a/.cvsignore b/.cvsignore
index 5e077ee..7bc9d8a 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -8,4 +8,3 @@ config.cache
 config.satus
 config.status
 .depend
-CHANGES
-- 
Gitee


From ea3bab0e40247e78fae5891341293dfad00b030b Mon Sep 17 00:00:00 2001
From: Erik Troan <ewt@redhat.com>
Date: Tue, 30 Jun 1998 20:13:44 +0000
Subject: [PATCH 038/667] changed group to Utilities/System

---
 popt.spec | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/popt.spec b/popt.spec
index 487b91e..ff92c37 100644
--- a/popt.spec
+++ b/popt.spec
@@ -4,7 +4,7 @@ Name: popt
 Version: %{version}
 Release: 1
 Copyright: LGPL
-Group: Utilities/System
+Group: Libraries
 Source: ftp://ftp.redhat.com/pub/redhat/code/popt/popt-%{version}.tar.gz
 BuildRoot: /var/tmp/popt.root
 
-- 
Gitee


From a090d8b6ede385858c06d2575d7603ca0e44034a Mon Sep 17 00:00:00 2001
From: Erik Troan <ewt@redhat.com>
Date: Mon, 27 Jul 1998 12:55:49 +0000
Subject: [PATCH 039/667] don't use mmap anymore -- it's not worth the trouble

---
 popt.c | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/popt.c b/popt.c
index bf814eb..d572536 100644
--- a/popt.c
+++ b/popt.c
@@ -5,7 +5,6 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include <sys/mman.h>
 #include <unistd.h>
 
 #if HAVE_ALLOCA_H
@@ -467,8 +466,8 @@ int poptReadConfigFile(poptContext con, char * fn) {
     fileLength = lseek(fd, 0, SEEK_END);
     lseek(fd, 0, 0);
 
-    file = mmap(NULL, fileLength, PROT_READ, MAP_PRIVATE, fd, 0);
-    if (file == (void *) -1) {
+    file = alloca(fileLength + 1);
+    if ((fd = read(fd, file, fileLength)) != fileLength) {
 	rc = errno;
 	close(fd);
 	errno = rc;
-- 
Gitee


From 3df02806e5ec47eaf47261dbcfc3b04aa0763d3b Mon Sep 17 00:00:00 2001
From: Erik Troan <ewt@redhat.com>
Date: Mon, 27 Jul 1998 15:52:21 +0000
Subject: [PATCH 040/667] 1) renamed POPT_KEEP_FIRST to POPT_CONTEXT_KEEP_FIRST
 2) added POPT_CONTEXT_NO_EXEC

---
 popt.h | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/popt.h b/popt.h
index 2d9c525..55e63a5 100644
--- a/popt.h
+++ b/popt.h
@@ -16,9 +16,12 @@
 #define POPT_ERROR_BADNUMBER	-17
 #define POPT_ERROR_OVERFLOW	-18
 
-/* context creation flags */
+/* poptBadOption() flags */
 #define POPT_BADOPTION_NOALIAS  (1 << 0)  /* don't go into an alias */
-#define POPT_KEEP_FIRST		(1 << 1)  /* pay attention to argv[0] */
+
+/* poptGetContext() flags */
+#define POPT_CONTEXT_NO_EXEC	(1 << 0)  /* ignore exec expansions */
+#define POPT_CONTEXT_KEEP_FIRST	(1 << 1)  /* pay attention to argv[0] */
 
 struct poptOption {
     const char * longName;	/* may be NULL */
-- 
Gitee


From b1767acd8771d23e67df4a5ea6abfaa2dda5e872 Mon Sep 17 00:00:00 2001
From: Erik Troan <ewt@redhat.com>
Date: Mon, 27 Jul 1998 15:53:36 +0000
Subject: [PATCH 041/667] 1) moved duplicated alias handling code into
 handleAlias() 2) added support for exec options

---
 popt.c | 284 ++++++++++++++++++++++++++++++++++++++++-----------------
 1 file changed, 199 insertions(+), 85 deletions(-)

diff --git a/popt.c b/popt.c
index d572536..0d53349 100644
--- a/popt.c
+++ b/popt.c
@@ -20,6 +20,13 @@ struct optionStackEntry {
     char * nextArg;
     char * nextCharArg;
     struct poptAlias * currAlias;
+    int stuffed;
+};
+
+struct execEntry {
+    char * longName;
+    char shortName;
+    char * script;
 };
 
 struct poptContext_s {
@@ -33,6 +40,12 @@ struct poptContext_s {
     struct poptAlias * aliases;
     int numAliases;
     int flags;
+    struct execEntry * execs;
+    int numExecs;
+    char ** finalArgv;
+    int finalArgvCount;
+    int finalArgvAlloced;
+    struct execEntry * doExec;
 };
 
 #ifndef HAVE_STRERROR
@@ -47,34 +60,26 @@ static char * strerror(int errno) {
 }
 #endif
 
-poptContext poptGetContext(char * name ,int argc, char ** argv, 
+poptContext poptGetContext(char * name, int argc, char ** argv, 
 			   const struct poptOption * options, int flags) {
     poptContext con = malloc(sizeof(*con));
 
+    memset(con, 0, sizeof(*con));
+
     con->os = con->optionStack;
     con->os->argc = argc;
     con->os->argv = argv;
-    con->os->currAlias = NULL;
-    con->os->nextCharArg = NULL;
-    con->os->nextArg = NULL;
 
-    if (flags & POPT_KEEP_FIRST)
-	con->os->next = 0;			/* include argv[0] */
-    else
+    if (!(flags & POPT_CONTEXT_KEEP_FIRST))
 	con->os->next = 1;			/* skip argv[0] */
 
     con->leftovers = malloc(sizeof(char *) * (argc + 1));
-    con->numLeftovers = 0;
-    con->nextLeftover = 0;
-    con->restLeftover = 0;
     con->options = options;
-    con->aliases = NULL;
-    con->numAliases = 0;
-    con->flags = 0;
+    con->finalArgv = malloc(sizeof(*con->finalArgv) * (argc * 2));
+    con->finalArgvAlloced = argc * 2;
+    con->flags = flags;
     
-    if (!name)
-	con->appName = NULL;
-    else
+    if (name)
 	con->appName = strcpy(malloc(strlen(name) + 1), name);
 
     return con;
@@ -90,6 +95,111 @@ void poptResetContext(poptContext con) {
     con->numLeftovers = 0;
     con->nextLeftover = 0;
     con->restLeftover = 0;
+    con->doExec = NULL;
+    con->finalArgvCount = 0;
+}
+
+/* Only one of longName, shortName may be set at a time */
+static int handleExec(poptContext con, char * longName, char shortName) {
+    int i;
+
+    i = con->numExecs - 1;
+    if (longName) {
+	while (i >= 0 && (!con->execs[i].longName ||
+	    strcmp(con->execs[i].longName, longName))) i--;
+    } else {
+	while (i >= 0 &&
+	    con->execs[i].shortName != shortName) i--;
+    }
+
+    if (i < 0) return 0;
+
+    if (con->flags & POPT_CONTEXT_NO_EXEC)
+	return 1;
+
+    if (!con->doExec) {
+	con->doExec = con->execs + i;
+	return 1;
+    }
+
+    /* We already have an exec to do; remember this option for next
+       time 'round */
+    if ((con->finalArgvCount + 1) >= (con->finalArgvAlloced)) {
+	con->finalArgvAlloced += 10;
+	con->finalArgv = realloc(con->finalArgv,
+			sizeof(*con->finalArgv) * con->finalArgvAlloced);
+    }
+
+    i = con->finalArgvCount++;
+    con->finalArgv[i] = malloc((longName ? strlen(longName) : 0) + 3);
+    if (longName)
+	sprintf(con->finalArgv[i], "--%s", longName);
+    else 
+	sprintf(con->finalArgv[i], "-%c", shortName);
+
+    return 1;
+}
+
+/* Only one of longName, shortName may be set at a time */
+static int handleAlias(poptContext con, char * longName, char shortName,
+		       char * nextCharArg) {
+    int i;
+
+    if (con->os->currAlias && con->os->currAlias->longName &&
+	!strcmp(con->os->currAlias->longName, longName)) 
+	return 0;
+    if (con->os->currAlias && shortName == con->os->currAlias->shortName)
+	return 0;
+
+    i = con->numAliases - 1;
+    if (longName) {
+	while (i >= 0 && (!con->aliases[i].longName ||
+	    strcmp(con->aliases[i].longName, longName))) i--;
+    } else {
+	while (i >= 0 &&
+	    con->aliases[i].shortName != shortName) i--;
+    }
+
+    if (i < 0) return 0;
+
+    if ((con->os - con->optionStack + 1) 
+	    == POPT_OPTION_DEPTH)
+	return POPT_ERROR_OPTSTOODEEP;
+
+    if (nextCharArg && *nextCharArg)
+	con->os->nextCharArg = nextCharArg;
+
+    con->os++;
+    con->os->next = 0;
+    con->os->stuffed = 0;
+    con->os->nextArg = con->os->nextCharArg = NULL;
+    con->os->currAlias = con->aliases + i;
+    con->os->argc = con->os->currAlias->argc;
+    con->os->argv = con->os->currAlias->argv;
+
+    return 1;
+}
+
+static void execCommand(poptContext con) {
+    char ** argv;
+
+    argv = malloc(sizeof(*argv) * 
+			(4 + con->numLeftovers + con->finalArgvCount));
+    argv[0] = con->doExec->script;
+    memcpy(argv + 1, con->finalArgv, sizeof(*argv) * con->finalArgvCount);
+
+    if (con->numLeftovers) {
+	argv[con->finalArgvCount + 1] = "--";
+	memcpy(argv + 2 + con->finalArgvCount, con->leftovers, 
+		    sizeof(*argv) * con->numLeftovers);
+	argv[con->numLeftovers + con->finalArgvCount + 2] = NULL;
+    } else {
+	argv[con->finalArgvCount + 1] = NULL;
+    }
+
+    setreuid(getuid(), getuid());
+
+    execvp(argv[0], argv);
 }
 
 /* returns 'val' element, -1 on last item, POPT_ERROR_* on error */
@@ -107,8 +217,10 @@ int poptGetNextOpt(poptContext con) {
 	while (!con->os->nextCharArg && con->os->next == con->os->argc 
 		&& con->os > con->optionStack)
 	    con->os--;
-	if (!con->os->nextCharArg && con->os->next == con->os->argc)
+	if (!con->os->nextCharArg && con->os->next == con->os->argc) {
+	    if (con->doExec) execCommand(con);
 	    return -1;
+	}
 
 	if (!con->os->nextCharArg) {
 		
@@ -133,27 +245,10 @@ int poptGetNextOpt(poptContext con) {
 	    } else if (optString[1] == '-') {
 		optString += 2;
 
-		if (!con->os->currAlias || !con->os->currAlias->longName || 
-		    strcmp(con->os->currAlias->longName, optString)) {
-
-		    i = con->numAliases - 1;
-		    while (i >= 0 && (!con->aliases[i].longName ||
-			strcmp(con->aliases[i].longName, optString))) i--;
-
-		    if (i >= 0) {
-			if ((con->os - con->optionStack + 1) 
-				== POPT_OPTION_DEPTH)
-			    return POPT_ERROR_OPTSTOODEEP;
-
-			con->os++;
-			con->os->next = 0;
-			con->os->nextArg = con->os->nextCharArg = NULL;
-			con->os->currAlias = con->aliases + i;
-			con->os->argc = con->os->currAlias->argc;
-			con->os->argv = con->os->currAlias->argv;
-			continue;
-		    }
-		}
+		if (handleAlias(con, optString, '\0', NULL))
+		    continue;
+		if (handleExec(con, optString, '\0'))
+		    continue;
 
 		chptr = optString;
 		while (*chptr && *chptr != '=') chptr++;
@@ -179,31 +274,13 @@ int poptGetNextOpt(poptContext con) {
 
 	    con->os->nextCharArg = NULL;
 
-	    if (!con->os->currAlias || *origOptString != 
-		con->os->currAlias->shortName) {
-
-		i = con->numAliases - 1;
-		while (i >= 0 &&
-		    con->aliases[i].shortName != *origOptString) i--;
-
-		if (i >= 0) {
-		    if ((con->os - con->optionStack + 1) == POPT_OPTION_DEPTH)
-			return POPT_ERROR_OPTSTOODEEP;
-
-		    /* We'll need this on the way out */
-		    origOptString++;
-		    if (*origOptString)
-			con->os->nextCharArg = origOptString;
-
-		    con->os++;
-		    con->os->next = 0;
-		    con->os->nextArg = con->os->nextCharArg = NULL;
-		    con->os->currAlias = con->aliases + i;
-		    con->os->argc = con->os->currAlias->argc;
-		    con->os->argv = con->os->currAlias->argv;
-		    continue;
-		}
+	    if (handleAlias(con, NULL, *origOptString,
+			    origOptString + 1)) {
+		origOptString++;
+		continue;
 	    }
+	    if (handleExec(con, NULL, *origOptString))
+		continue;
 
 	    opt = con->options;
 	    while ((opt->longName || opt->shortName) && 
@@ -264,6 +341,23 @@ int poptGetNextOpt(poptContext con) {
 	}
 
 	if (opt->val) done = 1;
+
+	if ((con->finalArgvCount + 2) >= (con->finalArgvAlloced)) {
+	    con->finalArgvAlloced += 10;
+	    con->finalArgv = realloc(con->finalArgv,
+			    sizeof(*con->finalArgv) * con->finalArgvAlloced);
+	}
+
+	i = con->finalArgvCount++;
+	con->finalArgv[i] = 
+		malloc((opt->longName ? strlen(opt->longName) : 0) + 3);
+	if (opt->longName)
+	    sprintf(con->finalArgv[i], "--%s", opt->longName);
+	else 
+	    sprintf(con->finalArgv[i], "-%c", opt->shortName);
+
+	if (opt->arg && opt->argInfo != POPT_ARG_NONE) 
+	    con->finalArgv[con->finalArgvCount++] = strdup(con->os->nextArg);
     }
 
     return opt->val;
@@ -298,11 +392,20 @@ void poptFreeContext(poptContext con) {
     int i;
 
     for (i = 0; i < con->numAliases; i++) {
-	free(con->aliases[i].longName);
+	if (con->aliases[i].longName) free(con->aliases[i].longName);
 	free(con->aliases[i].argv);
     }
 
+    for (i = 0; i < con->numExecs; i++) {
+	if (con->execs[i].longName) free(con->execs[i].longName);
+	free(con->execs[i].script);
+    }
+
+    for (i = 0; i < con->finalArgvCount; i++)
+	free(con->finalArgv[i]);
+
     free(con->leftovers);
+    free(con->finalArgv);
     if (con->appName) free(con->appName);
     if (con->aliases) free(con->aliases);
     free(con);
@@ -414,38 +517,48 @@ static void configLine(poptContext con, char * line) {
     int nameLength = strlen(con->appName);
     char * opt;
     struct poptAlias alias;
+    char * entryType;
+    char * longName = NULL;
+    char shortName = '\0';
     
     if (strncmp(line, con->appName, nameLength)) return;
     line += nameLength;
     if (!*line || !isspace(*line)) return;
     while (*line && isspace(*line)) line++;
+    entryType = line;
 
-    if (!strncmp(line, "alias", 5)) {
-	line += 5;
-	if (!*line || !isspace(*line)) return;
-	while (*line && isspace(*line)) line++;
-	if (!*line) return;
+    while (!*line || !isspace(*line)) line++;
+    *line++ = '\0';
+    while (*line && isspace(*line)) line++;
+    if (!*line) return;
+    opt = line;
 
-	opt = line;
-	while (*line && !isspace(*line)) line++;
-	if (!*line) return;
-	*line++ = '\0';
-	while (*line && isspace(*line)) line++;
-	if (!*line) return;
+    while (!*line || !isspace(*line)) line++;
+    *line++ = '\0';
+    while (*line && isspace(*line)) line++;
+    if (!*line) return;
 
-	if (!strlen(opt)) return;
+    if (opt[0] == '-' && opt[1] == '-')
+	longName = opt + 2;
+    else if (opt[0] == '-' && !opt[2])
+	shortName = opt[1];
 
+    if (!strcmp(entryType, "alias")) {
 	if (poptParseArgvString(line, &alias.argc, &alias.argv)) return;
-
-	if (opt[0] == '-' && opt[1] == '-') {
-	    alias.longName = opt + 2;
-	    alias.shortName = '\0';
-	    poptAddAlias(con, alias, 0);
-	} else if (opt[0] == '-' && !opt[2]) {
-	    alias.longName = NULL;
-	    alias.shortName = opt[1];
-	    poptAddAlias(con, alias, 0);
-	}
+	alias.longName = longName, alias.shortName = shortName;
+	poptAddAlias(con, alias, 0);
+    } else if (!strcmp(entryType, "exec")) {
+	con->execs = realloc(con->execs, 
+				sizeof(*con->execs) * (con->numExecs + 1));
+	if (longName)
+	    con->execs[con->numExecs].longName = strdup(longName);
+	else
+	    con->execs[con->numExecs].longName = NULL;
+
+	con->execs[con->numExecs].shortName = shortName;
+	con->execs[con->numExecs].script = strdup(line);
+	
+	con->numExecs++;
     }
 }
 
@@ -631,6 +744,7 @@ int poptStuffArgs(poptContext con, char ** argv) {
     con->os->currAlias = NULL;
     con->os->argc = i;
     con->os->argv = argv;
+    con->os->stuffed = 1;
 
     return 0;
 }
-- 
Gitee


From bc335608bfd83a3b8d638e56faf686797fd3bcaf Mon Sep 17 00:00:00 2001
From: Erik Troan <ewt@redhat.com>
Date: Mon, 27 Jul 1998 15:54:20 +0000
Subject: [PATCH 042/667] *** empty log message ***

---
 popt.3      | 612 ++++++++++++++++++++++++++++++++++++++++++++++++++++
 test-poptrc |   9 +
 test1.c     |  47 ++++
 testit.sh   |  36 ++++
 4 files changed, 704 insertions(+)
 create mode 100644 popt.3
 create mode 100644 test-poptrc
 create mode 100644 test1.c
 create mode 100755 testit.sh

diff --git a/popt.3 b/popt.3
new file mode 100644
index 0000000..02ad54f
--- /dev/null
+++ b/popt.3
@@ -0,0 +1,612 @@
+.TH POPT 3  "June 30, 1998" "" "Linux Programmer's Manual"
+.SH NAME
+popt \- Parse command line options
+.SH SYNOPSIS
+.nf
+.B #include <popt.h>
+.sp
+.BI "poptContext poptGetContext(char * " name ", int " argc ,
+.BI "                           char ** "argv ,
+.BI "                           struct poptOption * " options ,
+.BI "                           int " flags );
+.sp
+.BI "void poptFreeContext(poptContext " con );
+.sp
+.BI "void poptResetContext(poptContext " con );
+.sp
+.BI "int poptGetNextOpt(poptContext " con );
+.sp
+.BI "char * poptGetOptArg(poptContext " con );
+.sp
+.BI "char * poptGetArg(poptContext " con );
+.sp
+.BI "char * poptPeekArg(poptContext " con );
+.sp
+.BI "char ** poptGetArgs(poptContext " con );
+.sp
+.BI "const char * poptStrerror(const int " error );
+.sp
+.BI "char * poptBadOption(poptContext " con ", int " flags );
+.sp
+.BI "int poptReadDefaultConfig(poptContext " con ", int " flags );
+.sp
+.BI "int poptReadConfigFile(poptContext " con ", char * " fn );
+.sp
+.BI "int poptAddAlias(poptContext " con ", struct poptAlias " alias , 
+.BI "                 int " flags );
+.sp
+.BI "int poptParseArgvString(char * " s ", int *  " argcPtr , 
+.BI "                        char *** " argvPtr );
+.sp
+.BI "int poptStuffArgs(poptContext " con ", char ** " argv );
+.sp
+.fi
+.SH DESCRIPTION
+The popt library exists essentially for parsing command-line 
+options. It is found superior in many ways when compared to 
+parsing the argv array by hand or using the getopt functions 
+.B getopt()
+and 
+.B getopt_long()
+[see 
+.BR getopt "(3)]."  
+Some specific advantages of popt are: it does not utilize global 
+.RI "variables, thus enabling multiple passes in parsing " argv
+.RI "; it can parse an arbitrary array of " argv "-style elements, "
+allowing parsing of command-line-strings from any source; and 
+finally, it provides a standard method of option aliasing (to be 
+discussed at length below.)
+.sp
+Like
+.BR getopt_long() ,
+the popt library supports short and long style options.  Recall 
+that a 
+.B short option
+consists of a - character followed by a single alphanumeric character.
+A 
+.BR "long option" ,
+common in GNU utilities, consists of two - characters followed by a
+string made up of letters, numbers and hyphens.  Either type of option
+may be followed by an argument.  A space separates a short option from
+its arguments; either a space or an = separates a long option from an
+argument. 
+.sp
+The popt library is highly portable and should work on any POSIX 
+platform.  The latest version is always available from: 
+ftp://ftp.redhat.com/pub/redhat/code/popt.
+.sp
+It may be redistributed under either the GNU General Public License 
+or the GNU Library General Public License, at the distributor's discretion.
+.SH "BASIC POPT USAGE"
+.SS "1. THE OPTION TABLE"
+Applications provide popt with information on their command-line 
+options by means of an "option table," i.e., an array of 
+.B struct poptOption 
+structures:
+.sp
+#include <popt.h>
+.sp
+.nf
+struct poptOption {
+     const char * longName;  /* may be NULL */
+     char shortName;   /* may be '\\0' */
+     int argInfo;
+     void * arg;   /* depends on argInfo */
+     int val;  /* 0 means don't return, just update flag */
+};
+.fi
+.sp
+Each member of the table defines a single option that may be 
+passed to the program.  Long and short options are considered 
+a single option that may occur in two different forms.  The 
+first two members, 
+.IR longName " and " shortName ", define the names of the option;"
+the first is a long name, while the latter is a single character.
+.sp
+The 
+.IR argInfo " member tell popt what type of argument is expected" 
+after the argument.  If no option is expected,
+.BR POPT_ARG_NONE " should be used.  (Connoisseurs of " getopt() 
+.RI "will note that " argInfo " is the only field of "
+.BR "struct poptOption" " that is not directly analogous to a field in "
+.RB "the " getopt_long() " argument table.  The similarity between the "
+.RB "two allows for easy transitions from " getopt_long " to popt.) " 
+The rest of the valid values are shown in the following table:
+.sp
+.nf
+.B  "   Value            Description                arg Type"
+.BR POPT_ARG_NONE "   No argument expected             int"
+.BR POPT_ARG_STRING " No type checking to be performed char *"
+.BR POPT_ARG_INT "    An integer argument is expected  int"
+.BR POPT_ARG_LONG "   A long integer is expected       long"
+.sp
+.fi
+.RI "The next element, " arg ", allows popt to automatically update "
+.RI "program variables when the option is used. If " arg " is " 
+.BR NULL ", it is ignored and popt takes no special action. " 
+Otherwise it should point to a variable of the type indicated in the 
+right-most column of the table above.
+.sp
+.RI "If the option takes no argument (" argInfo " is " 
+.BR POPT_ARG_NONE "), the variable pointed to by " 
+.IR arg " is set to 1 when the option is used.  (Incidentally, it "
+will perhaps not escape the attention of hunt-and-peck typists that 
+.RB "the value of " POPT_ARG_NONE " is 0.)  If the option does take "
+an argument, the variable that 
+.IR arg " points to is updated to reflect the value of the argument." 
+.RB "Any string is acceptable for " POPT_ARG_STRING " arguments, but "
+.BR POPT_ARG_INT " and " POPT_ARG_LONG " are converted to the 
+appropriate type, and an error returned if the conversion fails.
+.sp
+.RI "The final option, " val ", is the value popt's parsing function 
+should return when the option is encountered.  If it is 0, the parsing
+function does not return a value, instead parsing the next 
+command-line argument.
+.sp
+The final structure in the table should have all the pointer values set
+.RB "to " NULL " and all the arithmetic values set to 0, marking the "
+end of the table.
+.SS "2. CREATING A CONTEXT"
+popt can interleave the parsing of multiple command-line sets. It allows
+this by keeping all the state information for a particular set of
+command-line arguments in a 
+.BR poptContext " data structure, an opaque type that should not be "
+modified outside the popt library.
+.sp
+.RB "New popt contexts are created by " poptGetContext() ":"
+.sp
+.nf
+.BI "poptContext poptGetContext(char * " name ", int "argc ",
+.BI "                           char ** "argv ",
+.BI "                           struct poptOption * "options ",
+.BI "                           int "flags ");"
+.fi
+.sp
+The first parameter, 
+.IR name ", is used only for alias handling (discussed later). It "
+should be the name of the application whose options are being parsed,
+.RB "or should be " NULL " if no option aliasing is desired. The next "
+two arguments specify the command-line arguments to parse. These are 
+.RB "generally passed to " poptGetContext() " exactly as they were "
+.RB "passed to the program's " main() " function. The " 
+.IR options " parameter points to the table of command-line options, "
+which was described in the previous section. The final parameter, 
+.IR flags ",is not currently used but should always be specified as 
+0 for compatibility with future versions of the popt library.
+.sp
+.RB "A " poptContext " keeps track of which options have already been "
+parsed and which remain, among other things. If a program wishes to 
+restart option processing of a set of arguments, it can reset the 
+.BR poptContext " by passing the context as the sole argument to "
+.BR poptResetContext() .
+.sp
+When argument processing is complete, the process should free the 
+.BR poptContext " as it contains dynamically allocated components. The "
+.BR poptFreeContext() " function takes a " 
+.BR poptContext " as its sole argument and frees the resources the "
+context is using.
+.sp
+.RB "Here are the prototypes of both " poptResetContext() " and "
+.BR poptFreeContext() :
+.sp
+.nf
+.B #include <popt.h>
+.BI "void poptFreeContext(poptContext " con ");"
+.BI "void poptResetContext(poptContext " con ");"
+.fi
+.sp
+.SS "3. PARSING THE COMMAND LINE"
+.RB "After an application has created a " poptContext ", it may begin "
+.RB "parsing arguments. " poptGetNextOpt() " performs the actual "
+argument parsing.
+.sp
+.nf
+.B #include <popt.h>
+.BI "int poptGetNextOpt(poptContext " con ");"
+.fi
+.sp
+Taking the context as its sole argument, this function parses the next
+command-line argument found. After finding the next argument in the
+option table, the function fills in the object pointed to by the option 
+.RI "table entry's " arg 
+.RB "pointer if it is not " NULL ". If the val entry for the option is "
+non-0, the function then returns that value. Otherwise, 
+.BR poptGetNextOpt() " continues on to the next argument."
+.sp
+.BR poptGetNextOpt() " returns -1 when the final argument has been "
+parsed, and other negative values when errors occur. This makes it a 
+good idea to 
+.RI "keep the " val " elements in the options table greater than 0."
+.sp
+.RI "If all of the command-line options are handled through " arg 
+pointers, command-line parsing is reduced to the following line of code:
+.sp
+.nf
+rc = poptGetNextOpt(poptcon);
+.fi
+.sp
+Many applications require more complex command-line parsing than this,
+however, and use the following structure:
+.sp
+.nf
+while ((rc = poptGetNextOpt(poptcon)) > 0) {
+     switch (rc) {
+          /* specific arguments are handled here */
+     }
+}
+.fi
+.sp
+When returned options are handled, the application needs to know the
+value of any arguments that were specified after the option. There are two
+ways to discover them. One is to ask popt to fill in a variable with the 
+.RI "value of the option through the option table's " arg " elements. The "
+.RB "other is to use " poptGetOptArg() ":"
+.sp
+.nf
+.B #include <popt.h>
+.BI "char * poptGetOptArg(poptContext " con ");"
+.fi
+.sp
+This function returns the argument given for the final option returned by
+.BR poptGetNextOpt() ", or it returns " NULL " if no argument was specified."
+.sp
+.SS "4. LEFTOVER ARGUMENTS"
+Many applications take an arbitrary number of command-line arguments,
+such as a list of file names. When popt encounters an argument that does
+not begin with a -, it assumes it is such an argument and adds it to a list
+of leftover arguments. Three functions allow applications to access such
+arguments:
+.nf
+.HP
+.BI "char * poptGetArg(poptContext " con ");"
+.fi
+This function returns the next leftover argument and marks it as
+processed.
+.PP
+.nf
+.HP
+.BI "char * poptPeekArg(poptContext " con ");"
+.fi
+The next leftover argument is returned but not marked as processed.
+This allows an application to look ahead into the argument list,
+without modifying the list.
+.PP
+.nf
+.HP
+.BI "char ** poptGetArgs(poptContext " con ");"
+.fi
+All the leftover arguments are returned in a manner identical to 
+.IR argv ".  The final element in the returned array points to "
+.BR NULL ", indicating the end of the arguments.
+.PP 
+.SH "ERROR HANDLING"
+All of the popt functions that can return errors return integers. 
+When an error occurs, a negative error code is returned. The 
+following table summarizes the error codes that occur:
+.sp
+.nf
+.B "     Error                      Description"
+.BR "POPT_ERROR_NOARG       " "Argument missing for an option."
+.BR "POPT_ERROR_BADOPT      " "Option's argument couldn't be parsed."
+.BR "POPT_ERROR_OPTSTOODEEP " "Option aliasing nested too deeply."
+.BR "POPT_ERROR_BADQUOTE    " "Quotations do not match."
+.BR "POPT_ERROR_BADNUMBER   " "Option couldn't be converted to number."
+.BR "POPT_ERROR_OVERFLOW    " "A given number was too big or small."
+.fi
+.sp
+Here is a more detailed discussion of each error:
+.sp
+.TP
+.B POPT_ERROR_NOARG
+An option that requires an argument was specified on the command
+line, but no argument was given. This can be returned only by
+.BR poptGetNextOpt() .
+.sp
+.TP
+.B POPT_ERROR_BADOPT
+.RI "An option was specified in " argv " but is not in the option 
+.RB "table. This error can be returned only from " poptGetNextOpt() .
+.sp
+.TP
+.B POPT_ERROR_OPTSTOODEEP
+A set of option aliases is nested too deeply. Currently, popt 
+follows options only 10 levels to prevent infinite recursion. Only 
+.BR poptGetNextOpt() " can return this error."
+.sp
+.TP
+.B POPT_ERROR_BADQUOTE
+A parsed string has a quotation mismatch (such as a single quotation
+.RB "mark). " poptParseArgvString() ", " poptReadConfigFile() ", or "
+.BR poptReadDefaultConfig() " can return this error."
+.sp
+.TP
+.B POPT_ERROR_BADNUMBER
+A conversion from a string to a number (int or long) failed due
+to the string containing nonnumeric characters. This occurs when
+.BR poptGetNextOpt() " is processing an argument of type " 
+.BR POPT_ARG_INT " or " POPT_ARG_LONG .
+.sp
+.TP
+.B POPT_ERROR_OVERFLOW
+A string-to-number conversion failed because the number was too
+.RB "large or too small. Like " POPT_ERROR_BADNUMBER ", this error 
+.RB "can occur only when " poptGetNextOpt() " is processing an "
+.RB "argument of type " POPT_ARG_INT " or " POPT_ARG_LONG .  
+.sp
+.TP
+.B POPT_ERROR_ERRNO
+.RI "A system call returned with an error, and " errno " still 
+contains the error from the system call. Both 
+.BR poptReadConfigFile() " and " poptReadDefaultConfig() " can "
+return this error.
+.sp
+.PP
+Two functions are available to make it easy for applications to provide
+good error messages.
+.HP
+.nf
+.BI "const char * poptStrerror(const int " error ");"
+.fi
+This function takes a popt error code and returns a string describing
+.RB "the error, just as with the standard " strerror() " function."
+.PP
+.HP
+.nf
+.BI "char * poptBadOption(poptContext " con ", int " flags ");"
+.fi
+.RB "If an error occurred during " poptGetNextOpt() ", this function "
+.RI "returns the option that caused the error. If the " flags " argument"
+.RB "is set to " POPT_BADOPTION_NOALIAS ", the outermost option is "
+.RI "returned. Otherwise, " flags " should be 0, and the option that is "
+returned may have been specified through an alias.
+.PP
+These two functions make popt error handling trivial for most 
+applications. When an error is detected from most of the functions, 
+an error message is printed along with the error string from 
+.BR poptStrerror() ". When an error occurs during argument parsing, "
+code similiar to the following displays a useful error message:
+.sp
+.nf
+fprintf(stderr, "%s: %s\\n",
+        poptBadOption(optCon, POPT_BADOPTION_NOALIAS),
+        poptStrerror(rc));
+.fi
+.sp
+.SH "OPTION ALIASING"
+.RB "One of the primary benefits of using popt over " getopt() " is the "
+ability to use option aliasing. This lets the user specify options that 
+popt expands into other options when they are specified. If the standard 
+.RB "grep program made use of popt, users could add a " --text " option "
+.RB "that expanded to " "-i -n -E -2" " to let them more easily find "
+information in text files.
+.sp
+.SS "1. SPECIFYING ALIASES"
+.RI "Aliases are normally specified in two places: " /etc/popt 
+.RB "and the " .popt " file in the user's home directory (found through "
+.RB "the " HOME " environment variable). Both files have the same format, "
+an arbitrary number of lines formatted like this:
+.sp
+.IB appname " alias " newoption "" " expansion"
+.sp
+.RI "The " appname " is the name of the application, which must be the "
+.RI "same as the " name " parameter passed to "
+.BR poptGetContext() ". This allows each file to specify aliases for "
+.RB "multiple programs. The " alias " keyword specifies that an alias is "
+being defined; currently popt configuration files support only aliases, but
+other abilities may be added in the future. The next option is the option
+that should be aliased, and it may be either a short or a long option. The
+rest of the line specifies the expansion for the alias. It is parsed 
+similarly to a shell command, which allows \\, ", and ' to be used for 
+quoting. If a backslash is the final character on a line, the next line 
+in the file is assumed to be a logical continuation of the line containing 
+the backslash, just as in shell.
+.sp
+.RB "The following entry would add a " --text " option to the grep command, "
+as suggested at the beginning of this section.
+.sp
+.B "grep alias --text -i -n -E -2"
+.SS "2. ENABLING ALIASES"
+.RB "An application must enable alias expansion for a " poptContext 
+.RB "before calling " poptGetNextArg() " for the first time. There are "
+three functions that define aliases for a context:
+.HP
+.nf
+.BI "int poptReadDefaultConfig(poptContext " con ", int " flags ");"
+.fi
+.RI "This function reads aliases from " /etc/popt " and the "
+.BR .popt " file in the user's home directory. Currently, "
+.IR flags " should be "
+.BR NULL ", as it is provided only for future expansion."
+.PP
+.HP
+.nf
+.BI "int poptReadConfigFile(poptContext " con ", char * " fn ");"
+.fi
+.RI "The file specified by " fn " is opened and parsed as a popt "
+configuration file. This allows programs to use program-specific 
+configuration files.
+.PP
+.HP
+.nf
+.BI "int poptAddAlias(poptContext " con ", struct poptAlias " alias ",
+.BI "                 int " flags ");"
+.fi
+Occasionally, processes want to specify aliases without having to
+read them from a configuration file. This function adds a new alias
+.RI "to a context. The " flags " argument should be 0, as it is "
+currently reserved for future expansion. The new alias is specified 
+.RB "as a " "struct poptAlias" ", which is defined as:"
+.sp
+.nf
+struct poptAlias {
+     char * longName; /* may be NULL */
+     char shortName; /* may be '\\0' */
+     int argc;
+     char ** argv; /* must be free()able */
+};
+.fi
+.sp
+.RI "The first two elements, " longName " and " shortName ", specify "
+.RI "the option that is aliased. The final two, " argc " and " argv ","
+define the expansion to use when the aliases option is encountered.
+.PP
+.SH "PARSING ARGUMENT STRINGS"
+Although popt is usually used for parsing arguments already divided into
+.RI "an " argv "-style array, some programs need to parse strings that "
+are formatted identically to command lines. To facilitate this, popt 
+provides a function that parses a string into an array of strings, 
+using rules similiar to normal shell parsing.
+.sp
+.nf
+.B "#include <popt.h>"
+.BI "int poptParseArgvString(char * " s ", int *  "argcPtr ",
+.BI "                        char *** " argvPtr ");"
+.fi
+.sp
+.RI "The string s is parsed into an " argv "-style array. The integer "
+.RI "pointed to by the second parameter, " argcPtr ", contains the number "
+of elements parsed, and the pointer pointed to by the final parameter is 
+set to point to the newly created array. The array is dynamically 
+.RB "allocated and should be " free() "ed when the application is finished "
+with it.
+.sp
+.RI "The " argvPtr 
+.RB "created by " poptParseArgvString() " is suitable to pass directly "
+.RB "to " poptGetContext() .
+.SH "HANDLING EXTRA ARGUMENTS"
+Some applications implement the equivalent of option aliasing but need
+.RB "to do so through special logic. The " poptStuffArgs() " function "
+allows an application to insert new arguments into the current 
+.BR poptContext .
+.sp
+.nf
+.B "#include <popt.h>"
+.BI "int poptStuffArgs(poptContext "con ", char ** " argv ");"
+.fi
+.sp
+.RI "The passed " argv 
+.RB "must have a " NULL " pointer as its final element. When "
+.BR poptGetNextOpt() " is next called, the "
+"stuffed" arguments are the first to be parsed. popt returns to the 
+normal arguments once all the stuffed arguments have been exhausted.
+.SH "EXAMPLE"
+The following example is a simplified version of the program "robin" 
+which appears in Chapter 15 of the text cited below.  Robin has 
+been stripped of everything but its argument-parsing logic, slightly 
+reworked, and renamed "parse." It may prove useful in illustrating 
+at least some of the features of the extremely rich popt library.
+.sp
+.nf
+#include <popt.h>
+#include <stdio.h>
+
+void usage(int exitcode, char *error, char *addl) {
+   fprintf(stderr, "Usage: parse [options] <port>\\n"
+                   " [options] include:\\n"
+                   "    -H,--help   for this help\\n"
+                   "    -r,--raw    for raw mode\\n"
+                   "    -c,--crnl   to add CR with NL on output\\n"
+                   "    -h,--help   for hardware flow control\\n"
+                   "    -s,--swflow for software flow control\\n"
+                   "    -n,--noflow for no flow control\\n"
+                   "    -b,--bps <bps> for signalling rate\\n");
+   if (error) fprintf(stderr, "%s: %s\\n", error, addl);
+   exit(exitcode);
+}
+
+int main(int argc, char *argv[]) {
+   char    c;            /* used for argument parsing */
+   int     i = 0;        /* used for tracking options */
+   char    *portname;
+   int     speed = 0;    /* used in argument parsing to set speed */
+   int     raw = 0;      /* raw mode? */ 
+   int     j;
+   char    buf[BUFSIZ+1];
+   poptContext optCon;   /* context for parsing command-line options */
+
+   struct poptOption optionsTable[] = {
+	    { "bps", 'b', POPT_ARG_INT, &speed, 0 },
+	    { "crnl", 'c', 0, 0, 'c' },
+	    { "help", 'H', 0, 0, 'H' },
+	    { "hwflow", 'h', 0, 0, 'h' },
+	    { "noflow", 'n', 0, 0, 'n' },
+	    { "raw", 'r', 0, &raw, 0 }, 
+	    { "swflow", 's', 0, 0, 's' },
+	    { NULL, 0, 0, NULL, 0 }
+   };
+
+   if (argc < 2) usage(1, "Not enough arguments", "");
+
+   optCon = poptGetContext(NULL, argc, argv, optionsTable, 0);
+
+   /* Now do options processing, get portname */
+   while ((c = poptGetNextOpt(optCon)) >= 0) {
+      switch (c) {
+         case 'H':
+            usage(0, NULL, NULL);
+            break;
+         case 'c': 
+            buf[i++] = 'c';         
+            break;
+         case 'h': 
+            buf[i++] = 'h';
+            break;
+         case 's':
+            buf[i++] = 's';
+            break;
+         case 'n':
+            buf[i++] = 'n';
+            break;
+      }
+   }
+   portname = poptGetArg(optCon);
+      if((portname == NULL) || !(poptPeekArg(optCon) == NULL))
+        usage(1, "Specify a single port", ".e.g., /dev/cua0");
+
+   if (c < -1) {
+      /* an error occurred during option processing */
+      fprintf(stderr, "%s: %s\\n", 
+              poptBadOption(optCon, POPT_BADOPTION_NOALIAS),
+              poptStrerror(c));
+      return 1;
+   }
+
+   /* Print out options, portname chosen */
+   printf("Options  chosen: ");
+   for(j = 0; j < i ; j++)
+      printf("-%c ", buf[j]);
+   if(raw) printf("-r ");
+   if(speed) printf("-b %d ", speed);
+   printf("\\nPortname chosen: %s\\n", portname);
+
+   poptFreeContext(optCon);
+   exit(0);
+}
+.fi
+.sp
+RPM, a popular Linux package management program, makes heavy use
+of popt's features. Many of its command-line arguments are implemented
+through popt aliases, which makes RPM an excellent example of how to
+take advantage of the popt library. For more information on RPM, see
+http://www.rpm.org
+.SH BUGS
+None presently known.
+.SH AUTHOR
+Erik W. Troan <ewt@redhat.com>
+.PP
+This man page is derived in part from
+.IR "Linux Application Development"
+by Michael K. Johnson and Erik W. Troan, Copyright (c) 1998 by Addison
+Wesley Longman, Inc., and included in the popt documentation with the
+permission of the Publisher and the appreciation of the Authors.
+.PP
+Thanks to Robert Lynch for his extensive work on this man page.
+.SH "SEE ALSO"
+.BR getopt (3)
+.sp
+.IR "Linux Application Development" ", by Michael K. Johnson and "
+Erik W. Troan (Addison-Wesley, 1998; ISBN 0-201-30821-5), Chapter 24.
+.sp
+.BR popt.ps " is a Postscript version of the above cited book "
+chapter. It can be found in the source archive for popt available at: 
+ftp://ftp.redhat.com/pub/redhat/code/popt
diff --git a/test-poptrc b/test-poptrc
new file mode 100644
index 0000000..8a6d86c
--- /dev/null
+++ b/test-poptrc
@@ -0,0 +1,9 @@
+test1 alias --simple --arg2
+test1 alias --two --arg1 --arg2 alias
+test1 alias --takerest --
+test1 alias -T --arg2
+test1 alias -O --arg1
+
+test1 exec --echo-args echo
+test1 alias -e --echo-args
+test1 exec -a /bin/echo
diff --git a/test1.c b/test1.c
new file mode 100644
index 0000000..dc6be87
--- /dev/null
+++ b/test1.c
@@ -0,0 +1,47 @@
+#include <stdio.h>
+#include <stdlib.h>
+
+#include "popt.h"
+
+int main(int argc, char ** argv) {
+    int rc;
+    int arg1 = 0;
+    char * arg2 = "(none)";
+    poptContext optCon;
+    char ** rest;
+    int arg3 = 0;
+    struct poptOption options[] = {
+	{ "arg1", '\0', 0, &arg1, 0 },
+	{ "arg2", '2', POPT_ARG_STRING, &arg2, 0 },
+	{ "arg3", '3', POPT_ARG_INT, &arg3, 0 },
+	{ NULL, '\0', 0, NULL, 0 } 
+    };
+
+    optCon = poptGetContext("test1", argc, argv, options, 0);
+    poptReadConfigFile(optCon, "./test-poptrc");
+
+    if ((rc = poptGetNextOpt(optCon)) < -1) {
+	fprintf(stderr, "test1: bad argument %s: %s\n", 
+		poptBadOption(optCon, POPT_BADOPTION_NOALIAS), 
+		poptStrerror(rc));
+	return 2;
+    }
+
+    printf("arg1: %d arg2: %s", arg1, arg2);
+
+    if (arg3)
+	printf(" arg3: %d", arg3);
+
+    rest = poptGetArgs(optCon);
+    if (rest) {
+	printf(" rest:");
+	while (*rest) {
+	    printf(" %s", *rest);
+	    rest++;
+	}
+    }
+
+    printf("\n");
+
+    return 0;
+}
diff --git a/testit.sh b/testit.sh
new file mode 100755
index 0000000..ea8dff0
--- /dev/null
+++ b/testit.sh
@@ -0,0 +1,36 @@
+#!/bin/sh
+
+run() {
+    prog=$1; shift
+    name=$1; shift
+    answer=$1; shift
+
+    echo Running test $name.
+
+    result=`./$prog $*`
+    if [ "$answer" != "$result" ]; then
+	echo "Test \"$*\" failed with: $result"
+	exit 2
+    fi
+}
+
+make -q testcases
+
+run test1 "test1 - 1" "arg1: 1 arg2: (none)" --arg1
+run test1 "test1 - 2" "arg1: 0 arg2: foo" --arg2 foo
+run test1 "test1 - 3" "arg1: 1 arg2: something" --arg1 --arg2 something
+run test1 "test1 - 4" "arg1: 0 arg2: another" --simple another
+run test1 "test1 - 5" "arg1: 1 arg2: alias" --two
+run test1 "test1 - 6" "arg1: 1 arg2: (none) rest: --arg2" --arg1 -- --arg2 
+run test1 "test1 - 7" "arg1: 0 arg2: abcd rest: --arg1" --simple abcd -- --arg1 
+run test1 "test1 - 8" "arg1: 1 arg2: (none) rest: --arg2" --arg1 --takerest --arg2 
+run test1 "test1 - 9" "arg1: 0 arg2: foo" -2 foo
+run test1 "test1 - 10" "arg1: 0 arg2: (none) arg3: 50" -3 50
+run test1 "test1 - 11" "arg1: 0 arg2: bar" -T bar
+run test1 "test1 - 12" "arg1: 1 arg2: (none)" -O 
+run test1 "test1 - 13" "arg1: 1 arg2: foo" -OT foo
+run test1 "test1 - 14" "" --echo-args
+run test1 "test1 - 15" "--arg1" --echo-args --arg1
+run test1 "test1 - 16" "--arg2 something" -T something -e
+run test1 "test1 - 17" "--arg2 something -- more args" -T something -a more args
+run test1 "test1 - 18" "--echo-args -a" --echo-args -e -a
-- 
Gitee


From 1d31e67b7c5f0b19540c1ff2abf8f028d7d7ea72 Mon Sep 17 00:00:00 2001
From: Erik Troan <ewt@redhat.com>
Date: Mon, 27 Jul 1998 15:58:33 +0000
Subject: [PATCH 043/667] build the test cases

---
 Makefile.in | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/Makefile.in b/Makefile.in
index ddc5257..daadd2f 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -16,6 +16,7 @@ prefix=@prefix@
 LIBS=$(prefix)/lib
 INCLUDE=$(prefix)/include
 CPP=@CPP@
+TESTCASES=test1
 
 VERSION=$(shell awk '/define version/ { print $$3 }' popt.spec)
 CVSTAG = r$(subst .,-,$(VERSION))
@@ -34,6 +35,12 @@ else
 TARGET=@TARGET@
 endif
 
+allprogs: $(LIBPOPT) testcases
+
+testcases: $(TESTCASES)
+
+$(TESTCASES): $(LIBPOPT)
+
 $(LIBPOPT): $(LIBPOPT)($(LIBOBJECTS))
 	$(RANLIB) $@
 
-- 
Gitee


From 101f518239238cce7ea08b2267abc3ce900fd3f3 Mon Sep 17 00:00:00 2001
From: Erik Troan <ewt@redhat.com>
Date: Mon, 27 Jul 1998 16:00:38 +0000
Subject: [PATCH 044/667] added -Wall be default

---
 configure.in | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/configure.in b/configure.in
index 1c1daa0..f99ceb1 100755
--- a/configure.in
+++ b/configure.in
@@ -5,6 +5,10 @@ AC_GCC_TRADITIONAL
 AC_PROG_RANLIB
 AC_PROG_INSTALL
 
+if test $CC = gcc; then
+    CFLAGS="-Wall $CFLAGS"
+fi
+
 dnl
 dnl if CC is gcc, we can rebuild the dependencies (since the depend rule
 dnl requires gcc).  If it's not, don't rebuild dependencies -- use what was
-- 
Gitee


From 8b10131a764cfb8405e1a1cf2c51f094794f75f1 Mon Sep 17 00:00:00 2001
From: Erik Troan <ewt@redhat.com>
Date: Mon, 27 Jul 1998 16:01:38 +0000
Subject: [PATCH 045/667] *** empty log message ***

---
 CHANGES | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/CHANGES b/CHANGES
index 4b90523..3525827 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,10 @@
+1.1 -> 1.2
+	- added popt.3 man page (Robert Lynch)
+	- don't use mmap anymore (its lack of portability isn't worth the
+	  trouble)
+	- added test script
+	- added support for exec
+
 1.0 -> 1.1
 	- moved to autoconf (Fred Fish)
 	- added STRERROR replacement (Norbert Warmuth)
-- 
Gitee


From a3926b74f18327c0efd819cb57c13e94d4706a0b Mon Sep 17 00:00:00 2001
From: Erik Troan <ewt@redhat.com>
Date: Mon, 27 Jul 1998 16:24:50 +0000
Subject: [PATCH 046/667] no need to check for mmap anymore

---
 configure.in | 1 -
 1 file changed, 1 deletion(-)

diff --git a/configure.in b/configure.in
index f99ceb1..0f85027 100755
--- a/configure.in
+++ b/configure.in
@@ -27,7 +27,6 @@ fi
 AC_SUBST(TARGET)
 
 AC_CHECK_HEADERS(unistd.h alloca.h)
-AC_CHECK_FUNCS(mmap)
 AC_CHECK_FUNCS(strerror)
 
 AC_OUTPUT(Makefile)
-- 
Gitee


From 00146d4945c909160e450f86a6352882a704996b Mon Sep 17 00:00:00 2001
From: Erik Troan <ewt@redhat.com>
Date: Mon, 27 Jul 1998 16:25:21 +0000
Subject: [PATCH 047/667] added test1

---
 .cvsignore | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.cvsignore b/.cvsignore
index 7bc9d8a..ca86025 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -8,3 +8,4 @@ config.cache
 config.satus
 config.status
 .depend
+test1
-- 
Gitee


From 2e29c6c3f46829bf747801e9689b8115cbcb8af5 Mon Sep 17 00:00:00 2001
From: Erik Troan <ewt@redhat.com>
Date: Mon, 27 Jul 1998 18:53:42 +0000
Subject: [PATCH 048/667] *** empty log message ***

---
 findme.c | 47 +++++++++++++++++++++++++++++++++++++++++++++++
 findme.h |  6 ++++++
 2 files changed, 53 insertions(+)
 create mode 100644 findme.c
 create mode 100644 findme.h

diff --git a/findme.c b/findme.c
new file mode 100644
index 0000000..f2e764e
--- /dev/null
+++ b/findme.c
@@ -0,0 +1,47 @@
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <unistd.h>
+
+#if HAVE_ALLOCA_H
+# include <alloca.h>
+#endif
+
+#include "findme.h"
+
+char * findProgramPath(char * argv0) {
+    char * path = getenv("PATH");
+    char * pathbuf;
+    char * start, * chptr;
+    char * buf;
+
+    /* If there is a / in the argv[0], it has to be an absolute
+       path */
+    if (strchr(argv0, '/'))
+	return strdup(argv0);
+
+    if (!path) return NULL;
+
+    start = pathbuf = alloca(strlen(path) + 1);
+    buf = malloc(strlen(path) + strlen(argv0) + 2);
+    strcpy(pathbuf, path);
+
+    chptr = NULL;
+    do {
+	if ((chptr = strchr(start, ':')))
+	    *chptr = '\0';
+	sprintf(buf, "%s/%s", start, argv0);
+
+	if (access(buf, X_OK))
+	    return buf;
+
+	if (chptr) 
+	    start = chptr + 1;
+	else
+	    start = NULL;
+    } while (start && *start);
+
+    free(buf);
+
+    return NULL;
+}
diff --git a/findme.h b/findme.h
new file mode 100644
index 0000000..b4f790a
--- /dev/null
+++ b/findme.h
@@ -0,0 +1,6 @@
+#ifndef H_FINDME
+#define H_FINDME
+
+char * findProgramPath(char * argv0);
+
+#endif
-- 
Gitee


From 18d724d572331c42002d268c7e376830d22c2a4c Mon Sep 17 00:00:00 2001
From: Erik Troan <ewt@redhat.com>
Date: Mon, 27 Jul 1998 18:55:07 +0000
Subject: [PATCH 049/667] added findme.c

---
 Makefile.in | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Makefile.in b/Makefile.in
index daadd2f..26e67a2 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -2,7 +2,7 @@ srcdir = @srcdir@
 top_srcdir = @top_srcdir@
 VPATH = @srcdir@
 
-LIBOBJECTS = 	popt.o
+LIBOBJECTS = 	popt.o	findme.o
 
 SOURCES = $(addprefix $(srcdir)/,$(subst .o,.c,$(LIBOBJECTS)))
 LIBPOPT = libpopt.a
-- 
Gitee


From d8e98468e75520ff6df07bd2d07ce02449f2d4cf Mon Sep 17 00:00:00 2001
From: Erik Troan <ewt@redhat.com>
Date: Mon, 27 Jul 1998 18:55:15 +0000
Subject: [PATCH 050/667] *** empty log message ***

---
 CHANGES | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/CHANGES b/CHANGES
index 3525827..04ae84c 100644
--- a/CHANGES
+++ b/CHANGES
@@ -4,6 +4,8 @@
 	  trouble)
 	- added test script
 	- added support for exec
+	- removed support for *_POPT_ALIASES env variable -- it was a bad
+	  idea
 
 1.0 -> 1.1
 	- moved to autoconf (Fred Fish)
-- 
Gitee


From aa8eb3e1c876e828153eb500374de9029e50341d Mon Sep 17 00:00:00 2001
From: Erik Troan <ewt@redhat.com>
Date: Mon, 27 Jul 1998 18:55:56 +0000
Subject: [PATCH 051/667] 1) pass the name of the current exectuable to exec'd
 scripts 2) removed support for setting up popt alises through enviornment
 variables

---
 popt.c | 80 +++++++++++++---------------------------------------------
 1 file changed, 18 insertions(+), 62 deletions(-)

diff --git a/popt.c b/popt.c
index 0d53349..f71e773 100644
--- a/popt.c
+++ b/popt.c
@@ -11,6 +11,7 @@
 # include <alloca.h>
 #endif
 
+#include "findme.h"
 #include "popt.h"
 
 struct optionStackEntry {
@@ -182,21 +183,27 @@ static int handleAlias(poptContext con, char * longName, char shortName,
 
 static void execCommand(poptContext con) {
     char ** argv;
+    int pos = 0;
 
     argv = malloc(sizeof(*argv) * 
-			(4 + con->numLeftovers + con->finalArgvCount));
-    argv[0] = con->doExec->script;
-    memcpy(argv + 1, con->finalArgv, sizeof(*argv) * con->finalArgvCount);
+			(6 + con->numLeftovers + con->finalArgvCount));
+    argv[pos++] = con->doExec->script;
+
+    argv[pos] = findProgramPath(con->os->argv[0]);
+    if (argv[pos]) pos++;
+    argv[pos++] = ";";
+
+    memcpy(argv + pos, con->finalArgv, sizeof(*argv) * con->finalArgvCount);
+    pos += con->finalArgvCount;
 
     if (con->numLeftovers) {
-	argv[con->finalArgvCount + 1] = "--";
-	memcpy(argv + 2 + con->finalArgvCount, con->leftovers, 
-		    sizeof(*argv) * con->numLeftovers);
-	argv[con->numLeftovers + con->finalArgvCount + 2] = NULL;
-    } else {
-	argv[con->finalArgvCount + 1] = NULL;
+	argv[pos++] = "--";
+	memcpy(argv + pos, con->leftovers, sizeof(*argv) * con->numLeftovers);
+	pos += con->numLeftovers;
     }
 
+    argv[pos++] = NULL;
+
     setreuid(getuid(), getuid());
 
     execvp(argv[0], argv);
@@ -622,10 +629,8 @@ int poptReadConfigFile(poptContext con, char * fn) {
 }
 
 int poptReadDefaultConfig(poptContext con, int useEnv) {
-    char * envName, * envValue;
-    char * fn, * home, * chptr;
-    int rc, skip;
-    struct poptAlias alias;
+    char * fn, * home;
+    int rc;
 
     if (!con->appName) return 0;
 
@@ -640,55 +645,6 @@ int poptReadDefaultConfig(poptContext con, int useEnv) {
 	if (rc) return rc;
     }
 
-    envName = alloca(strlen(con->appName) + 20);
-    strcpy(envName, con->appName);
-    chptr = envName;
-    while (*chptr) {
-	*chptr = toupper(*chptr);
-	chptr++;
-    }
-    strcat(envName, "_POPT_ALIASES");
-
-    if (useEnv && (envValue = getenv(envName))) {
-	envValue = strcpy(alloca(strlen(envValue) + 1), envValue);
-
-	while (envValue && *envValue) {
-	    chptr = strchr(envValue, '=');
-	    if (!chptr) {
-		envValue = strchr(envValue, '\n');
-		if (envValue) envValue++;
-		continue;
-	    }
-
-	    *chptr = '\0';
-
-	    skip = 0;
-	    if (!strncmp(envValue, "--", 2)) {
-		alias.longName = envValue + 2;
-		alias.shortName = '\0';
-	    } else if (*envValue == '-' && strlen(envValue) == 2) {
-		alias.longName = NULL;	
-		alias.shortName = envValue[1];
-	    } else {
-		skip = 1;
-	    }
-
-	    envValue = chptr + 1;
-	    chptr = strchr(envValue, '\n');
-	    if (chptr) *chptr = '\0';
-
-	    if (!skip) {
-		poptParseArgvString(envValue, &alias.argc, &alias.argv);
-		poptAddAlias(con, alias, 0);
-	    }
-
-	    if (chptr)
-		envValue = chptr + 1;
-	    else
-		envValue = NULL;
-	}
-    }
-
     return 0;
 }
 
-- 
Gitee


From c80e62b4765aeefed4afd80da82788965ccac886 Mon Sep 17 00:00:00 2001
From: Erik Troan <ewt@redhat.com>
Date: Wed, 29 Jul 1998 14:37:11 +0000
Subject: [PATCH 052/667] success check of access() was backwards

---
 findme.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/findme.c b/findme.c
index f2e764e..4e43d86 100644
--- a/findme.c
+++ b/findme.c
@@ -32,7 +32,7 @@ char * findProgramPath(char * argv0) {
 	    *chptr = '\0';
 	sprintf(buf, "%s/%s", start, argv0);
 
-	if (access(buf, X_OK))
+	if (!access(buf, X_OK))
 	    return buf;
 
 	if (chptr) 
-- 
Gitee


From 84564092aae1ea7fdc690e6f5faf64be31e964e2 Mon Sep 17 00:00:00 2001
From: Erik Troan <ewt@redhat.com>
Date: Wed, 29 Jul 1998 16:02:54 +0000
Subject: [PATCH 053/667] added poptSetExecPath()

---
 popt.c | 20 +++++++++++++++++++-
 popt.h |  1 +
 2 files changed, 20 insertions(+), 1 deletion(-)

diff --git a/popt.c b/popt.c
index f71e773..7d16614 100644
--- a/popt.c
+++ b/popt.c
@@ -47,6 +47,8 @@ struct poptContext_s {
     int finalArgvCount;
     int finalArgvAlloced;
     struct execEntry * doExec;
+    char * execPath;
+    int execAbsolute;
 };
 
 #ifndef HAVE_STRERROR
@@ -61,6 +63,12 @@ static char * strerror(int errno) {
 }
 #endif
 
+void poptSetExecPath(poptContext con, const char * path, int allowAbsolute) {
+    if (con->execPath) free(con->execPath);
+    con->execPath = strdup(con->execPath);
+    con->execAbsolute = allowAbsolute;
+}
+
 poptContext poptGetContext(char * name, int argc, char ** argv, 
 			   const struct poptOption * options, int flags) {
     poptContext con = malloc(sizeof(*con));
@@ -184,10 +192,20 @@ static int handleAlias(poptContext con, char * longName, char shortName,
 static void execCommand(poptContext con) {
     char ** argv;
     int pos = 0;
+    char * script = con->doExec->script;
 
     argv = malloc(sizeof(*argv) * 
 			(6 + con->numLeftovers + con->finalArgvCount));
-    argv[pos++] = con->doExec->script;
+
+    if (!con->execAbsolute && strchr(script, '/')) return;
+
+    if (!strchr(script, '/') && con->execPath) {
+	argv[pos] = alloca(strlen(con->execPath) + strlen(script) + 2);
+	sprintf(argv[pos], "%s/%s", con->execPath, script);
+    } else {
+	argv[pos] = script;
+    }
+    pos++;
 
     argv[pos] = findProgramPath(con->os->argv[0]);
     if (argv[pos]) pos++;
diff --git a/popt.h b/popt.h
index 55e63a5..850a8cd 100644
--- a/popt.h
+++ b/popt.h
@@ -65,5 +65,6 @@ int poptReadDefaultConfig(poptContext con, int useEnv);
    the same as " and both may include \ quotes */
 int poptParseArgvString(char * s, int * argcPtr, char *** argvPtr);
 const char * poptStrerror(const int error);
+void poptSetExecPath(poptContext con, const char * path, int allowAbsolute);
 
 #endif
-- 
Gitee


From 0619d1f72bccdde6ccfeea456478bbe58531709c Mon Sep 17 00:00:00 2001
From: Erik Troan <ewt@redhat.com>
Date: Wed, 29 Jul 1998 16:03:04 +0000
Subject: [PATCH 054/667] updated for exec passing command name

---
 testit.sh | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/testit.sh b/testit.sh
index ea8dff0..519f320 100755
--- a/testit.sh
+++ b/testit.sh
@@ -29,8 +29,8 @@ run test1 "test1 - 10" "arg1: 0 arg2: (none) arg3: 50" -3 50
 run test1 "test1 - 11" "arg1: 0 arg2: bar" -T bar
 run test1 "test1 - 12" "arg1: 1 arg2: (none)" -O 
 run test1 "test1 - 13" "arg1: 1 arg2: foo" -OT foo
-run test1 "test1 - 14" "" --echo-args
-run test1 "test1 - 15" "--arg1" --echo-args --arg1
-run test1 "test1 - 16" "--arg2 something" -T something -e
-run test1 "test1 - 17" "--arg2 something -- more args" -T something -a more args
-run test1 "test1 - 18" "--echo-args -a" --echo-args -e -a
+run test1 "test1 - 14" "./test1 ;" --echo-args
+run test1 "test1 - 15" "./test1 ; --arg1" --echo-args --arg1
+run test1 "test1 - 16" "./test1 ; --arg2 something" -T something -e
+run test1 "test1 - 17" "./test1 ; --arg2 something -- more args" -T something -a more args
+run test1 "test1 - 18" "./test1 ; --echo-args -a" --echo-args -e -a
-- 
Gitee


From 8fad0797b076a247fbf56aca8261c267decb4637 Mon Sep 17 00:00:00 2001
From: Erik Troan <ewt@redhat.com>
Date: Thu, 30 Jul 1998 14:18:58 +0000
Subject: [PATCH 055/667] fixed stupif strdup() mistake

---
 popt.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/popt.c b/popt.c
index 7d16614..4bfd26c 100644
--- a/popt.c
+++ b/popt.c
@@ -65,7 +65,7 @@ static char * strerror(int errno) {
 
 void poptSetExecPath(poptContext con, const char * path, int allowAbsolute) {
     if (con->execPath) free(con->execPath);
-    con->execPath = strdup(con->execPath);
+    con->execPath = strdup(path);
     con->execAbsolute = allowAbsolute;
 }
 
-- 
Gitee


From affb6bfc4a580cf781e147ad8383bc32c33a4ff1 Mon Sep 17 00:00:00 2001
From: Erik Troan <ewt@redhat.com>
Date: Thu, 30 Jul 1998 14:53:29 +0000
Subject: [PATCH 056/667] don't strcmp() a NULL longName

---
 popt.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/popt.c b/popt.c
index 4bfd26c..886ac72 100644
--- a/popt.c
+++ b/popt.c
@@ -154,7 +154,7 @@ static int handleAlias(poptContext con, char * longName, char shortName,
 		       char * nextCharArg) {
     int i;
 
-    if (con->os->currAlias && con->os->currAlias->longName &&
+    if (con->os->currAlias && con->os->currAlias->longName && longName &&
 	!strcmp(con->os->currAlias->longName, longName)) 
 	return 0;
     if (con->os->currAlias && shortName == con->os->currAlias->shortName)
-- 
Gitee


From bac630af582bd847aed5094bb5b823b6f1729ace Mon Sep 17 00:00:00 2001
From: Jeff Johnson <n3npq@mac.com>
Date: Tue, 11 Aug 1998 16:09:20 +0000
Subject: [PATCH 057/667] rm .depend for multiple builds in same tree (Will
 Partain)

---
 Makefile.in | 1 +
 1 file changed, 1 insertion(+)

diff --git a/Makefile.in b/Makefile.in
index 26e67a2..0329bbc 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -55,6 +55,7 @@ squeaky: distclean
 
 depend:
 	topdir_path=`( cd $(top_srcdir) && pwd )` ; \
+	/bin/rm -f .depend ; \
 	    $(CPP) $(CFLAGS) -MM $(SOURCES) | \
 		sed s+$$topdir_path+$(top_srcdir)+g > .depend
 
-- 
Gitee


From 084776c8436838afce6729ba2ccabd08cc57ac25 Mon Sep 17 00:00:00 2001
From: Jeff Johnson <n3npq@mac.com>
Date: Thu, 24 Sep 1998 16:49:51 +0000
Subject: [PATCH 058/667] check for setreuid portably (Eugene Kanter).

---
 Makefile.in  |  1 +
 configure.in | 23 +++++++++++++++++++++++
 2 files changed, 24 insertions(+)

diff --git a/Makefile.in b/Makefile.in
index 0329bbc..bd420f0 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -16,6 +16,7 @@ prefix=@prefix@
 LIBS=$(prefix)/lib
 INCLUDE=$(prefix)/include
 CPP=@CPP@
+LDFLAGS=@LIBS@
 TESTCASES=test1
 
 VERSION=$(shell awk '/define version/ { print $$3 }' popt.spec)
diff --git a/configure.in b/configure.in
index 0f85027..e859fa5 100755
--- a/configure.in
+++ b/configure.in
@@ -8,6 +8,14 @@ AC_PROG_INSTALL
 if test $CC = gcc; then
     CFLAGS="-Wall $CFLAGS"
 fi
+addlib() {
+  l=$1
+  shift
+  case "$target" in 
+    *-*-solaris*)	LIBS="$LIBS -L$l -R $l $*";;
+    *)		LIBS="$LIBS -L$l $*";;
+  esac
+}
 
 dnl
 dnl if CC is gcc, we can rebuild the dependencies (since the depend rule
@@ -27,6 +35,21 @@ fi
 AC_SUBST(TARGET)
 
 AC_CHECK_HEADERS(unistd.h alloca.h)
+AC_MSG_CHECKING(for /usr/ucblib in LIBS)
+if test -d /usr/ucblib ; then
+	if test "$build" = "mips-sni-sysv4" ; then
+		addlib /usr/ccs/lib -lc
+	fi
+
+	addlib /usr/ucblib
+	
+	AC_MSG_RESULT(yes)
+else
+	AC_MSG_RESULT(no)
+fi
 AC_CHECK_FUNCS(strerror)
+AC_CHECK_FUNC(setreuid, [], [
+    AC_CHECK_LIB(ucb, setreuid, [if echo $LIBS | grep -- -lucb >/dev/null ;then :; else LIBS="$LIBS -lucb" USEUCB=y;fi])
+])
 
 AC_OUTPUT(Makefile)
-- 
Gitee


From a2881723008369a43f840df4208cce614a2bd477 Mon Sep 17 00:00:00 2001
From: Jeff Johnson <n3npq@mac.com>
Date: Thu, 24 Sep 1998 16:57:38 +0000
Subject: [PATCH 059/667] hpux does setreuid differently (Hermann Lauer)

---
 findme.c | 5 +++++
 popt.c   | 6 +++++-
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/findme.c b/findme.c
index 4e43d86..528d401 100644
--- a/findme.c
+++ b/findme.c
@@ -2,6 +2,11 @@
 #include <stdlib.h>
 #include <string.h>
 #include <unistd.h>
+#ifdef __NeXT
+/* access macros are not declared in non posix mode in unistd.h -
+ don't try to use posix on NeXTstep 3.3 ! */ 
+#include <libc.h>
+#endif
 
 #if HAVE_ALLOCA_H
 # include <alloca.h>
diff --git a/popt.c b/popt.c
index 886ac72..fbe5a95 100644
--- a/popt.c
+++ b/popt.c
@@ -222,7 +222,11 @@ static void execCommand(poptContext con) {
 
     argv[pos++] = NULL;
 
-    setreuid(getuid(), getuid());
+#ifdef __hpux
+    setresuid(getuid(), getuid(),-1);
+#else
+    setreuid(getuid(), getuid()); /*hlauer: not portable to hpux9.01 */
+#endif
 
     execvp(argv[0], argv);
 }
-- 
Gitee


From 02f3dfd7f029b6c7399ac4da9cca613003ab50a2 Mon Sep 17 00:00:00 2001
From: Erik Troan <ewt@redhat.com>
Date: Sun, 27 Sep 1998 14:57:03 +0000
Subject: [PATCH 060/667] 1) added included tables 2) added option callbacks 3)
 added automatic help/usage messages

---
 Makefile.in |   2 +-
 popt.c      | 311 +++++++++-------------------------------------------
 popt.h      |  21 ++++
 test1.c     |  39 ++++++-
 testit.sh   |  15 ++-
 5 files changed, 121 insertions(+), 267 deletions(-)

diff --git a/Makefile.in b/Makefile.in
index bd420f0..9796940 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -2,7 +2,7 @@ srcdir = @srcdir@
 top_srcdir = @top_srcdir@
 VPATH = @srcdir@
 
-LIBOBJECTS = 	popt.o	findme.o
+LIBOBJECTS = 	popt.o findme.o poptparse.o poptconfig.o popthelp.o
 
 SOURCES = $(addprefix $(srcdir)/,$(subst .o,.c,$(LIBOBJECTS)))
 LIBPOPT = libpopt.a
diff --git a/popt.c b/popt.c
index fbe5a95..58b4a60 100644
--- a/popt.c
+++ b/popt.c
@@ -13,43 +13,7 @@
 
 #include "findme.h"
 #include "popt.h"
-
-struct optionStackEntry {
-    int argc;
-    char ** argv;
-    int next;
-    char * nextArg;
-    char * nextCharArg;
-    struct poptAlias * currAlias;
-    int stuffed;
-};
-
-struct execEntry {
-    char * longName;
-    char shortName;
-    char * script;
-};
-
-struct poptContext_s {
-    struct optionStackEntry optionStack[POPT_OPTION_DEPTH], * os;
-    char ** leftovers;
-    int numLeftovers;
-    int nextLeftover;
-    const struct poptOption * options;
-    int restLeftover;
-    char * appName;
-    struct poptAlias * aliases;
-    int numAliases;
-    int flags;
-    struct execEntry * execs;
-    int numExecs;
-    char ** finalArgv;
-    int finalArgvCount;
-    int finalArgvAlloced;
-    struct execEntry * doExec;
-    char * execPath;
-    int execAbsolute;
-};
+#include "poptint.h"
 
 #ifndef HAVE_STRERROR
 static char * strerror(int errno) {
@@ -87,6 +51,9 @@ poptContext poptGetContext(char * name, int argc, char ** argv,
     con->finalArgv = malloc(sizeof(*con->finalArgv) * (argc * 2));
     con->finalArgvAlloced = argc * 2;
     con->flags = flags;
+
+    if (getenv("POSIXLY_CORRECT") || getenv("POSIX_ME_HARDER"))
+	con->flags |= POPT_CONTEXT_POSIXMEHARDER;
     
     if (name)
 	con->appName = strcpy(malloc(strlen(name) + 1), name);
@@ -231,6 +198,42 @@ static void execCommand(poptContext con) {
     execvp(argv[0], argv);
 }
 
+static const struct poptOption * findOption(const struct poptOption * table,
+					    const char * longName,
+					    const char shortName,
+					    poptCallbackType * callback,
+					    void ** callbackData) {
+    const struct poptOption * opt = table;
+    const struct poptOption * opt2;
+    const struct poptOption * cb = NULL;
+
+    while (opt->longName || opt->shortName || opt->arg) {
+	if (opt->argInfo == POPT_ARG_INCLUDE_TABLE) {
+	    opt2 = findOption(opt->arg, longName, shortName, callback, 
+			      callbackData);
+	    if (opt2) return opt2;
+	} else if (opt->argInfo == POPT_ARG_CALLBACK) {
+	    cb = opt;
+	} else if (longName && opt->longName && 
+		   !strcmp(longName, opt->longName)) {
+	    break;
+	} else if (shortName && shortName == opt->shortName) {
+	    break;
+	}
+	opt++;
+    }
+
+    if (!opt->longName && !opt->shortName) return NULL;
+    if (cb) {
+	*callback = cb->arg;
+	*callbackData = cb->descrip;
+    } else {
+	*callback = NULL;
+    }
+
+    return opt;
+}
+
 /* returns 'val' element, -1 on last item, POPT_ERROR_* on error */
 int poptGetNextOpt(poptContext con) {
     char * optString, * chptr, * localOptString;
@@ -241,6 +244,8 @@ int poptGetNextOpt(poptContext con) {
     const struct poptOption * opt = NULL;
     int done = 0;
     int i;
+    poptCallbackType cb;
+    void * cbData;
 
     while (!done) {
 	while (!con->os->nextCharArg && con->os->next == con->os->argc 
@@ -257,6 +262,8 @@ int poptGetNextOpt(poptContext con) {
 
 	    if (con->restLeftover || *origOptString != '-') {
 		con->leftovers[con->numLeftovers++] = origOptString;
+		if (con->flags & POPT_CONTEXT_POSIXMEHARDER)
+		    con->restLeftover = 1;
 		continue;
 	    }
 
@@ -286,14 +293,8 @@ int poptGetNextOpt(poptContext con) {
 		    *chptr = '\0';
 		}
 
-		opt = con->options;
-		while (opt->longName || opt->shortName) {
-		    if (opt->longName && !strcmp(optString, opt->longName))
-			break;
-		    opt++;
-		}
-
-		if (!opt->longName && !opt->shortName) return POPT_ERROR_BADOPT;
+		opt = findOption(con->options, optString, '\0', &cb, &cbData);
+		if (!opt) return POPT_ERROR_BADOPT;
 	    } else 
 		con->os->nextCharArg = origOptString + 1;
 	}
@@ -311,10 +312,8 @@ int poptGetNextOpt(poptContext con) {
 	    if (handleExec(con, NULL, *origOptString))
 		continue;
 
-	    opt = con->options;
-	    while ((opt->longName || opt->shortName) && 
-		    *origOptString != opt->shortName) opt++;
-	    if (!opt->longName && !opt->shortName) return POPT_ERROR_BADOPT;
+	    opt = findOption(con->options, NULL, *origOptString, &cb, &cbData);
+	    if (!opt) return POPT_ERROR_BADOPT;
 
 	    origOptString++;
 	    if (*origOptString)
@@ -369,7 +368,10 @@ int poptGetNextOpt(poptContext con) {
 	    }
 	}
 
-	if (opt->val) done = 1;
+	if (cb)
+	    cb(con, opt->val, con->os->nextArg, cbData);
+	else if (opt->val) 
+	    done = 1;
 
 	if ((con->finalArgvCount + 2) >= (con->finalArgvAlloced)) {
 	    con->finalArgvAlloced += 10;
@@ -437,6 +439,7 @@ void poptFreeContext(poptContext con) {
     free(con->finalArgv);
     if (con->appName) free(con->appName);
     if (con->aliases) free(con->aliases);
+    if (con->otherHelp) free(con->otherHelp);
     free(con);
 }
 
@@ -462,214 +465,6 @@ int poptAddAlias(poptContext con, struct poptAlias newAlias, int flags) {
     return 0;
 }
 
-int poptParseArgvString(char * s, int * argcPtr, char *** argvPtr) {
-    char * buf = strcpy(alloca(strlen(s) + 1), s);
-    char * bufStart = buf;
-    char * src, * dst;
-    char quote = '\0';
-    int argvAlloced = 5;
-    char ** argv = malloc(sizeof(*argv) * argvAlloced);
-    char ** argv2;
-    int argc = 0;
-    int i;
-
-    src = s;
-    dst = buf;
-    argv[argc] = buf;
-
-    memset(buf, '\0', strlen(s) + 1);
-
-    while (*src) {
-	if (quote == *src) {
-	    quote = '\0';
-	} else if (quote) {
-	    if (*src == '\\') {
-		src++;
-		if (!*src) {
-		    free(argv);
-		    return POPT_ERROR_BADQUOTE;
-		}
-		if (*src != quote) *buf++ = '\\';
-	    }
-	    *buf++ = *src;
-	} else if (isspace(*src)) {
-	    if (*argv[argc]) {
-		buf++, argc++;
-		if (argc == argvAlloced) {
-		    argvAlloced += 5;
-		    argv = realloc(argv, sizeof(*argv) * argvAlloced);
-		}
-		argv[argc] = buf;
-	    }
-	} else switch (*src) {
-	  case '"':
-	  case '\'':
-	    quote = *src;
-	    break;
-	  case '\\':
-	    src++;
-	    if (!*src) {
-		free(argv);
-		return POPT_ERROR_BADQUOTE;
-	    }
-	    /* fallthrough */
-	  default:
-	    *buf++ = *src;
-	}
-
-	src++;
-    }
-
-    if (strlen(argv[argc])) {
-	argc++, buf++;
-    }
-
-    dst = malloc(argc * sizeof(*argv) + (buf - bufStart));
-    argv2 = (void *) dst;
-    dst += argc * sizeof(*argv);
-    memcpy(argv2, argv, argc * sizeof(*argv));
-    memcpy(dst, bufStart, buf - bufStart);
-
-    for (i = 0; i < argc; i++) {
-	argv2[i] = dst + (argv[i] - bufStart);
-    }
-
-    free(argv);
-
-    *argvPtr = argv2;
-    *argcPtr = argc;
-
-    return 0;
-}
-
-static void configLine(poptContext con, char * line) {
-    int nameLength = strlen(con->appName);
-    char * opt;
-    struct poptAlias alias;
-    char * entryType;
-    char * longName = NULL;
-    char shortName = '\0';
-    
-    if (strncmp(line, con->appName, nameLength)) return;
-    line += nameLength;
-    if (!*line || !isspace(*line)) return;
-    while (*line && isspace(*line)) line++;
-    entryType = line;
-
-    while (!*line || !isspace(*line)) line++;
-    *line++ = '\0';
-    while (*line && isspace(*line)) line++;
-    if (!*line) return;
-    opt = line;
-
-    while (!*line || !isspace(*line)) line++;
-    *line++ = '\0';
-    while (*line && isspace(*line)) line++;
-    if (!*line) return;
-
-    if (opt[0] == '-' && opt[1] == '-')
-	longName = opt + 2;
-    else if (opt[0] == '-' && !opt[2])
-	shortName = opt[1];
-
-    if (!strcmp(entryType, "alias")) {
-	if (poptParseArgvString(line, &alias.argc, &alias.argv)) return;
-	alias.longName = longName, alias.shortName = shortName;
-	poptAddAlias(con, alias, 0);
-    } else if (!strcmp(entryType, "exec")) {
-	con->execs = realloc(con->execs, 
-				sizeof(*con->execs) * (con->numExecs + 1));
-	if (longName)
-	    con->execs[con->numExecs].longName = strdup(longName);
-	else
-	    con->execs[con->numExecs].longName = NULL;
-
-	con->execs[con->numExecs].shortName = shortName;
-	con->execs[con->numExecs].script = strdup(line);
-	
-	con->numExecs++;
-    }
-}
-
-int poptReadConfigFile(poptContext con, char * fn) {
-    char * file, * chptr, * end;
-    char * buf, * dst;
-    int fd, rc;
-    int fileLength;
-
-    fd = open(fn, O_RDONLY);
-    if (fd < 0) {
-	if (errno == ENOENT)
-	    return 0;
-	else 
-	    return POPT_ERROR_ERRNO;
-    }
-
-    fileLength = lseek(fd, 0, SEEK_END);
-    lseek(fd, 0, 0);
-
-    file = alloca(fileLength + 1);
-    if ((fd = read(fd, file, fileLength)) != fileLength) {
-	rc = errno;
-	close(fd);
-	errno = rc;
-	return POPT_ERROR_ERRNO;
-    }
-    close(fd);
-
-    dst = buf = alloca(fileLength + 1);
-
-    chptr = file;
-    end = (file + fileLength);
-    while (chptr < end) {
-	switch (*chptr) {
-	  case '\n':
-	    *dst = '\0';
-	    dst = buf;
-	    while (*dst && isspace(*dst)) dst++;
-	    if (*dst && *dst != '#') {
-		configLine(con, dst);
-	    }
-	    chptr++;
-	    break;
-	  case '\\':
-	    *dst++ = *chptr++;
-	    if (chptr < end) {
-		if (*chptr == '\n') 
-		    dst--, chptr++;	
-		    /* \ at the end of a line does not insert a \n */
-		else
-		    *dst++ = *chptr++;
-	    }
-	    break;
-	  default:
-	    *dst++ = *chptr++;
-	}
-    }
-
-    return 0;
-}
-
-int poptReadDefaultConfig(poptContext con, int useEnv) {
-    char * fn, * home;
-    int rc;
-
-    if (!con->appName) return 0;
-
-    rc = poptReadConfigFile(con, "/etc/popt");
-    if (rc) return rc;
-    if (getuid() != geteuid()) return 0;
-
-    if ((home = getenv("HOME"))) {
-	fn = alloca(strlen(home) + 20);
-	sprintf(fn, "%s/.popt", home);
-	rc = poptReadConfigFile(con, fn);
-	if (rc) return rc;
-    }
-
-    return 0;
-}
-
 char * poptBadOption(poptContext con, int flags) {
     struct optionStackEntry * os;
 
diff --git a/popt.h b/popt.h
index 850a8cd..50580f7 100644
--- a/popt.h
+++ b/popt.h
@@ -1,12 +1,19 @@
 #ifndef H_POPT
 #define H_POPT
 
+#include <stdio.h>			/* for FILE * */
+
 #define POPT_OPTION_DEPTH	10
 
 #define POPT_ARG_NONE		0
 #define POPT_ARG_STRING		1
 #define POPT_ARG_INT		2
 #define POPT_ARG_LONG		3
+#define POPT_ARG_INCLUDE_TABLE	4	/* arg points to table */
+#define POPT_ARG_CALLBACK	5	/* table-wide callback... must be
+					   set first in table; arg points 
+					   to callback, descrip points to 
+					   callback data to pass */
 
 #define POPT_ERROR_NOARG	-10
 #define POPT_ERROR_BADOPT	-11
@@ -22,6 +29,7 @@
 /* poptGetContext() flags */
 #define POPT_CONTEXT_NO_EXEC	(1 << 0)  /* ignore exec expansions */
 #define POPT_CONTEXT_KEEP_FIRST	(1 << 1)  /* pay attention to argv[0] */
+#define POPT_CONTEXT_POSIXMEHARDER (1 << 2) /* options can't follow args */
 
 struct poptOption {
     const char * longName;	/* may be NULL */
@@ -29,6 +37,8 @@ struct poptOption {
     int argInfo;
     void * arg;			/* depends on argInfo */
     int val;			/* 0 means don't return, just update flag */
+    char * descrip;		/* description for autohelp -- may be NULL */
+    char * argDescrip;		/* argument description for autohelp */
 };
 
 struct poptAlias {
@@ -38,7 +48,15 @@ struct poptAlias {
     char ** argv;		/* must be free()able */
 };
 
+extern struct poptOption poptHelpOptions[];
+#define POPT_AUTOHELP { NULL, '\0', POPT_ARG_INCLUDE_TABLE, poptHelpOptions, \
+			0, "Help options", NULL },
+
 typedef struct poptContext_s * poptContext;
+typedef struct poptOption * poptOption;
+
+typedef void (*poptCallbackType)(poptContext con, int key, const char * arg, 
+				 void * data);
 
 poptContext poptGetContext(char * name, int argc, char ** argv, 
 			   const struct poptOption * options, int flags);
@@ -66,5 +84,8 @@ int poptReadDefaultConfig(poptContext con, int useEnv);
 int poptParseArgvString(char * s, int * argcPtr, char *** argvPtr);
 const char * poptStrerror(const int error);
 void poptSetExecPath(poptContext con, const char * path, int allowAbsolute);
+void poptPrintHelp(poptContext con, FILE * f, int flags);
+void poptPrintUsage(poptContext con, FILE * f, int flags);
+void poptSetOtherOptionHelp(poptContext con, const char * text);
 
 #endif
diff --git a/test1.c b/test1.c
index dc6be87..a1559f0 100644
--- a/test1.c
+++ b/test1.c
@@ -3,6 +3,10 @@
 
 #include "popt.h"
 
+void option_callback(poptContext con, int key, char * arg, void * data) {
+    printf("callback: %s %s ", (char *) data, arg);    
+}
+
 int main(int argc, char ** argv) {
     int rc;
     int arg1 = 0;
@@ -10,10 +14,29 @@ int main(int argc, char ** argv) {
     poptContext optCon;
     char ** rest;
     int arg3 = 0;
+    int inc = 0;
+    int help = 0;
+    int usage = 0;
+    struct poptOption callbackArgs[] = {
+	{ NULL, '\0', POPT_ARG_CALLBACK, option_callback, 0, "sampledata" },
+	{ "cb", 'c', POPT_ARG_STRING, NULL, 0, "Test argument callbacks" },
+	{ "long", '\0', 0, NULL, 0, "Unused option for help testing" },
+	{ NULL, '\0', 0, NULL, 0 } 
+    };
+    struct poptOption moreArgs[] = {
+	{ "inc", 'i', 0, &inc, 0, "An included argument" },
+	{ NULL, '\0', 0, NULL, 0 } 
+    };
     struct poptOption options[] = {
-	{ "arg1", '\0', 0, &arg1, 0 },
-	{ "arg2", '2', POPT_ARG_STRING, &arg2, 0 },
-	{ "arg3", '3', POPT_ARG_INT, &arg3, 0 },
+	{ "arg1", '\0', 0, &arg1, 0, "First argument with a really long" 
+	    " description. After all, we have to test argument help"
+	    " wrapping somehow, right?", "ARG1"},
+	{ "arg2", '2', POPT_ARG_STRING, &arg2, 0, "Another argument", "ARG" },
+	{ "arg3", '3', POPT_ARG_INT, &arg3, 0, "A third argument", "ANARG" },
+	{ "unused", '\0', 0, NULL, 0, "Unused option for help testing" },
+	{ NULL, '\0', POPT_ARG_INCLUDE_TABLE, &moreArgs, 0, NULL },
+	{ NULL, '\0', POPT_ARG_INCLUDE_TABLE, &callbackArgs, 0, "Callback arguments" },
+	POPT_AUTOHELP
 	{ NULL, '\0', 0, NULL, 0 } 
     };
 
@@ -27,10 +50,20 @@ int main(int argc, char ** argv) {
 	return 2;
     }
 
+    if (help) {
+	poptPrintHelp(optCon, stdout, 0);
+	return 0;
+    } if (usage) {
+	poptPrintUsage(optCon, stdout, 0);
+	return 0;
+    }
+
     printf("arg1: %d arg2: %s", arg1, arg2);
 
     if (arg3)
 	printf(" arg3: %d", arg3);
+    if (inc)
+	printf(" inc: %d", inc);
 
     rest = poptGetArgs(optCon);
     if (rest) {
diff --git a/testit.sh b/testit.sh
index 519f320..0ea083d 100755
--- a/testit.sh
+++ b/testit.sh
@@ -29,8 +29,13 @@ run test1 "test1 - 10" "arg1: 0 arg2: (none) arg3: 50" -3 50
 run test1 "test1 - 11" "arg1: 0 arg2: bar" -T bar
 run test1 "test1 - 12" "arg1: 1 arg2: (none)" -O 
 run test1 "test1 - 13" "arg1: 1 arg2: foo" -OT foo
-run test1 "test1 - 14" "./test1 ;" --echo-args
-run test1 "test1 - 15" "./test1 ; --arg1" --echo-args --arg1
-run test1 "test1 - 16" "./test1 ; --arg2 something" -T something -e
-run test1 "test1 - 17" "./test1 ; --arg2 something -- more args" -T something -a more args
-run test1 "test1 - 18" "./test1 ; --echo-args -a" --echo-args -e -a
+run test1 "test1 - 14" "arg1: 0 arg2: (none) inc: 1" --inc
+run test1 "test1 - 15" "arg1: 0 arg2: foo inc: 1" -i --arg2 foo
+POSIX_ME_HARDER=1 run test1 "test1 - 16" "arg1: 1 arg2: (none) rest: foo --arg2 something" --arg1 foo --arg2 something
+POSIXLY_CORRECT=1 run test1 "test1 - 17" "arg1: 1 arg2: (none) rest: foo --arg2 something" --arg1 foo --arg2 something
+run test1 "test1 - 18" "callback: sampledata bar arg1: 1 arg2: (none)" --arg1 --cb bar
+run test1 "test1 - 19" "./test1 ;" --echo-args
+run test1 "test1 - 20" "./test1 ; --arg1" --echo-args --arg1
+run test1 "test1 - 21" "./test1 ; --arg2 something" -T something -e
+run test1 "test1 - 22" "./test1 ; --arg2 something -- more args" -T something -a more args
+run test1 "test1 - 23" "./test1 ; --echo-args -a" --echo-args -e -a
-- 
Gitee


From b2e25800a692d2d65c4136d7205cce144d89dc5c Mon Sep 17 00:00:00 2001
From: Erik Troan <ewt@redhat.com>
Date: Sun, 27 Sep 1998 15:02:53 +0000
Subject: [PATCH 061/667] by default, allow exec's across absolute paths

---
 popt.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/popt.c b/popt.c
index 58b4a60..96d6053 100644
--- a/popt.c
+++ b/popt.c
@@ -51,6 +51,7 @@ poptContext poptGetContext(char * name, int argc, char ** argv,
     con->finalArgv = malloc(sizeof(*con->finalArgv) * (argc * 2));
     con->finalArgvAlloced = argc * 2;
     con->flags = flags;
+    con->execAbsolute = 1;
 
     if (getenv("POSIXLY_CORRECT") || getenv("POSIX_ME_HARDER"))
 	con->flags |= POPT_CONTEXT_POSIXMEHARDER;
-- 
Gitee


From 8a8570bf38a8eece94a30149bb3d518d394e7c7c Mon Sep 17 00:00:00 2001
From: Erik Troan <ewt@redhat.com>
Date: Sun, 27 Sep 1998 15:53:49 +0000
Subject: [PATCH 062/667] started autohelp, include, and callback docs

---
 popt.3 | 144 ++++++++++++++++++++++++++++++++++++++++++---------------
 1 file changed, 107 insertions(+), 37 deletions(-)

diff --git a/popt.3 b/popt.3
index 02ad54f..de119ab 100644
--- a/popt.3
+++ b/popt.3
@@ -53,9 +53,11 @@ and
 Some specific advantages of popt are: it does not utilize global 
 .RI "variables, thus enabling multiple passes in parsing " argv
 .RI "; it can parse an arbitrary array of " argv "-style elements, "
-allowing parsing of command-line-strings from any source; and 
-finally, it provides a standard method of option aliasing (to be 
-discussed at length below.)
+allowing parsing of command-line-strings from any source; 
+it provides a standard method of option aliasing (to be 
+discussed at length below.); it can exec external option filters; and,
+finally, it can automatically generate help and usage messages for
+the application.
 .sp
 Like
 .BR getopt_long() ,
@@ -88,11 +90,13 @@ structures:
 .sp
 .nf
 struct poptOption {
-     const char * longName;  /* may be NULL */
-     char shortName;   /* may be '\\0' */
-     int argInfo;
-     void * arg;   /* depends on argInfo */
-     int val;  /* 0 means don't return, just update flag */
+    const char * longName; /* may be NULL */
+    char shortName;        /* may be '\\0' */
+    int argInfo;
+    void * arg;            /* depends on argInfo */
+    int val;               /* 0 means don't return, just update flag */
+    char * descrip;        /* description for autohelp -- may be NULL */
+    char * argDescrip;     /* argument description for autohelp */
 };
 .fi
 .sp
@@ -107,7 +111,7 @@ The
 .IR argInfo " member tell popt what type of argument is expected" 
 after the argument.  If no option is expected,
 .BR POPT_ARG_NONE " should be used.  (Connoisseurs of " getopt() 
-.RI "will note that " argInfo " is the only field of "
+.RI "will note that " argInfo " is the only required field of "
 .BR "struct poptOption" " that is not directly analogous to a field in "
 .RB "the " getopt_long() " argument table.  The similarity between the "
 .RB "two allows for easy transitions from " getopt_long " to popt.) " 
@@ -138,14 +142,78 @@ an argument, the variable that
 .BR POPT_ARG_INT " and " POPT_ARG_LONG " are converted to the 
 appropriate type, and an error returned if the conversion fails.
 .sp
-.RI "The final option, " val ", is the value popt's parsing function 
+.RI "The next option, " val ", is the value popt's parsing function 
 should return when the option is encountered.  If it is 0, the parsing
 function does not return a value, instead parsing the next 
 command-line argument.
 .sp
+.RI "The last two options, " descrip " and " argDescrip " are only required
+if automatic help messages are desired (automatic usage messages can
+.RI "be generated without them). " descrip " is a text description of the
+.RI "argument and " argdescrip " is a short summary of the type of arguments
+.RI "the option expects, or NULL if the option doesn't require any 
+arguments.
+.sp
+.RB "If popt should automatically provide " --usage " and " --help " (" -? ")
+.RB "options, one line in the table should be the macro " POPT_AUTOHELP ".
+.RB "This macro includes another option table (via " POPT_ARG_INCLUDE_TABLE;
+see below) in the main one which provides the table entries for these
+.RB "arguments. When " --usage " or " --help " are passed to programs which
+use popt's automatical help, popt displays the appropriate message on 
+stderr as soon as it finds the option, and exits the program with a
+return code of 0. If you want to use popt's automatic help generation in
+a different way, you need to explicitly add the option entries to your programs 
+.RB "option table instead of using " POPT_AUTOHELP ".
+.sp
 The final structure in the table should have all the pointer values set
 .RB "to " NULL " and all the arithmetic values set to 0, marking the "
 end of the table.
+.sp
+There are two types of option table entries which do not specify command
+line options. When either of these types of entries are used, the
+\fIlongName\fR element must be \fBNULL\fR and the \fBshortName\fR element
+must be \fB'\\0'\fR.
+.sp
+The first of these special entry types allows the application to nest
+another option table in the current one; such nesting may extend quite
+deeply (the actual depth is limited by the program's stack). Including
+other option tables allows a library to provide a standard set of
+command-line options to every program which uses it (this is often done
+in graphical programming toolkits, for example). To do this, set
+the \fIargInfo\fR field to \fBPOPT_ARG_INCLUDE_TABLE\fR and the
+\fRarg\fR field to point to the table which is being included. If
+automatic help generation is being used, the \fIdescrip\fR field should
+contain a overall description of the option table being included.
+.sp
+The other special option table entry type tells popt to call a function (a
+callback) when any option in that table is found. This is especially usefull
+when included option tables are being used, as the program which provides
+the top-level option table doesn't need to be aware of the other options
+which are provided by the included table. When a callback is set for
+a table, the parsing function never returns information on an option in
+the table. Instead, options information must be retained via the callback
+or by having popt set a variable through the option's \fIarg\fR field.
+Option callbacks should match the following prototype:
+.sp
+.nf
+.BI "void poptCallbackType(poptContext con, 
+.BI "                      const struct poptOption * opt, 
+.BI "                      const char * arg, void * data);
+.fi
+.sp
+The first parameter is the context which is being parsed (see the next
+section for information on contexts), \fIopt\fR points to the option
+which triggered this callback, and \fIarg\fR is the option's argument.
+If the option does not take an argument, \fIarg\fR is \fBNULL\fR.  The
+final parameter, \fIdata\fR is taken from the \fIdescrip\fR field
+of the option table entry which defined the callback. As \fIdescrip\fR
+is a pointer, this allows callback functions to be passed an arbitrary
+set of data (though a typecast will have to be used).
+.sp
+The option table entry which defines a callback has an \fIargInfo\fR of
+\fBPOPT_ARG_CALLBACK\fR, an \fIarg\fR which points to the callback
+function, and a \fIdescrip\fR field which specifies an arbitrary pointer
+to be passed to the callback.
 .SS "2. CREATING A CONTEXT"
 popt can interleave the parsing of multiple command-line sets. It allows
 this by keeping all the state information for a particular set of
@@ -500,18 +568,10 @@ at least some of the features of the extremely rich popt library.
 #include <popt.h>
 #include <stdio.h>
 
-void usage(int exitcode, char *error, char *addl) {
-   fprintf(stderr, "Usage: parse [options] <port>\\n"
-                   " [options] include:\\n"
-                   "    -H,--help   for this help\\n"
-                   "    -r,--raw    for raw mode\\n"
-                   "    -c,--crnl   to add CR with NL on output\\n"
-                   "    -h,--help   for hardware flow control\\n"
-                   "    -s,--swflow for software flow control\\n"
-                   "    -n,--noflow for no flow control\\n"
-                   "    -b,--bps <bps> for signalling rate\\n");
-   if (error) fprintf(stderr, "%s: %s\\n", error, addl);
-   exit(exitcode);
+void usage(poptContext optCon, int exitcode, char *error, char *addl) {
+    poptPrintUsage(optCon, stderr, 0);
+    if (error) fprintf(stderr, "%s: %s\n", error, addl);
+    exit(exitcode);
 }
 
 int main(int argc, char *argv[]) {
@@ -525,26 +585,33 @@ int main(int argc, char *argv[]) {
    poptContext optCon;   /* context for parsing command-line options */
 
    struct poptOption optionsTable[] = {
-	    { "bps", 'b', POPT_ARG_INT, &speed, 0 },
-	    { "crnl", 'c', 0, 0, 'c' },
-	    { "help", 'H', 0, 0, 'H' },
-	    { "hwflow", 'h', 0, 0, 'h' },
-	    { "noflow", 'n', 0, 0, 'n' },
-	    { "raw", 'r', 0, &raw, 0 }, 
-	    { "swflow", 's', 0, 0, 's' },
+	    { "bps", 'b', POPT_ARG_INT, &speed, 0,
+		"signaling rate in bits-per-second", "BPS" },
+	    { "crnl", 'c', 0, 0, 'c',
+		"expand cr characters to cr/lf sequences" },
+	    { "hwflow", 'h', 0, 0, 'h',
+		"use hardware (RTS/CTS) flow control" },
+	    { "noflow", 'n', 0, 0, 'n',
+		"use no flow control" },
+	    { "raw", 'r', 0, &raw, 0,
+		"don't perform any character conversions" },
+	    { "swflow", 's', 0, 0, 's',
+		"use software (XON/XOF) flow control" } ,
+	    POPT_AUTOHELP
 	    { NULL, 0, 0, NULL, 0 }
    };
 
-   if (argc < 2) usage(1, "Not enough arguments", "");
-
    optCon = poptGetContext(NULL, argc, argv, optionsTable, 0);
+   poptSetOtherOptionHelp(optCon, "[OPTIONS]* <port>");
+
+   if (argc < 2) {
+	poptPrintUsage(optCon, stderr, 0);
+	exit(1);
+   }
 
    /* Now do options processing, get portname */
    while ((c = poptGetNextOpt(optCon)) >= 0) {
       switch (c) {
-         case 'H':
-            usage(0, NULL, NULL);
-            break;
          case 'c': 
             buf[i++] = 'c';         
             break;
@@ -560,8 +627,8 @@ int main(int argc, char *argv[]) {
       }
    }
    portname = poptGetArg(optCon);
-      if((portname == NULL) || !(poptPeekArg(optCon) == NULL))
-        usage(1, "Specify a single port", ".e.g., /dev/cua0");
+   if((portname == NULL) || !(poptPeekArg(optCon) == NULL))
+      usage(optCon, 1, "Specify a single port", ".e.g., /dev/cua0");
 
    if (c < -1) {
       /* an error occurred during option processing */
@@ -588,7 +655,10 @@ RPM, a popular Linux package management program, makes heavy use
 of popt's features. Many of its command-line arguments are implemented
 through popt aliases, which makes RPM an excellent example of how to
 take advantage of the popt library. For more information on RPM, see
-http://www.rpm.org
+http://www.rpm.org. The popt source code distribution includes test
+program(s) which use all of the features of the popt libraries in
+various ways. If a feature isn't working for you, the popt test code
+is the first place to look.
 .SH BUGS
 None presently known.
 .SH AUTHOR
-- 
Gitee


From 7e88065c251dc453c959b7c81dd886ed719ecbb1 Mon Sep 17 00:00:00 2001
From: Erik Troan <ewt@redhat.com>
Date: Sun, 27 Sep 1998 15:54:20 +0000
Subject: [PATCH 063/667] changed popt callbacks t get a pointer into the
 option table

---
 popt.c | 2 +-
 popt.h | 5 +++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/popt.c b/popt.c
index 96d6053..0df3179 100644
--- a/popt.c
+++ b/popt.c
@@ -370,7 +370,7 @@ int poptGetNextOpt(poptContext con) {
 	}
 
 	if (cb)
-	    cb(con, opt->val, con->os->nextArg, cbData);
+	    cb(con, opt, con->os->nextArg, cbData);
 	else if (opt->val) 
 	    done = 1;
 
diff --git a/popt.h b/popt.h
index 50580f7..bdedcea 100644
--- a/popt.h
+++ b/popt.h
@@ -55,8 +55,9 @@ extern struct poptOption poptHelpOptions[];
 typedef struct poptContext_s * poptContext;
 typedef struct poptOption * poptOption;
 
-typedef void (*poptCallbackType)(poptContext con, int key, const char * arg, 
-				 void * data);
+typedef void (*poptCallbackType)(poptContext con, 
+			         const struct poptOption * opt,
+				 const char * arg, void * data);
 
 poptContext poptGetContext(char * name, int argc, char ** argv, 
 			   const struct poptOption * options, int flags);
-- 
Gitee


From 68b36ad81b6437596b73b8a90dd0a1f15dce9083 Mon Sep 17 00:00:00 2001
From: Erik Troan <ewt@redhat.com>
Date: Sun, 27 Sep 1998 15:56:18 +0000
Subject: [PATCH 064/667] 1) modified test to display callback val field 2)
 split popt stuff into multiple iles

---
 poptconfig.c | 143 ++++++++++++++++++++++++++++++
 popthelp.c   | 242 +++++++++++++++++++++++++++++++++++++++++++++++++++
 poptparse.c  |  85 ++++++++++++++++++
 test1.c      |   9 +-
 4 files changed, 475 insertions(+), 4 deletions(-)
 create mode 100644 poptconfig.c
 create mode 100644 popthelp.c
 create mode 100644 poptparse.c

diff --git a/poptconfig.c b/poptconfig.c
new file mode 100644
index 0000000..cd4e239
--- /dev/null
+++ b/poptconfig.c
@@ -0,0 +1,143 @@
+#include <ctype.h>
+#include <errno.h>
+#include <fcntl.h>
+#include <stdlib.h>
+#include <string.h>
+#include <unistd.h>
+
+#if HAVE_ALLOCA_H
+# include <alloca.h>
+#endif
+
+#include "popt.h"
+#include "poptint.h"
+
+static void configLine(poptContext con, char * line) {
+    int nameLength = strlen(con->appName);
+    char * opt;
+    struct poptAlias alias;
+    char * entryType;
+    char * longName = NULL;
+    char shortName = '\0';
+    
+    if (strncmp(line, con->appName, nameLength)) return;
+    line += nameLength;
+    if (!*line || !isspace(*line)) return;
+    while (*line && isspace(*line)) line++;
+    entryType = line;
+
+    while (!*line || !isspace(*line)) line++;
+    *line++ = '\0';
+    while (*line && isspace(*line)) line++;
+    if (!*line) return;
+    opt = line;
+
+    while (!*line || !isspace(*line)) line++;
+    *line++ = '\0';
+    while (*line && isspace(*line)) line++;
+    if (!*line) return;
+
+    if (opt[0] == '-' && opt[1] == '-')
+	longName = opt + 2;
+    else if (opt[0] == '-' && !opt[2])
+	shortName = opt[1];
+
+    if (!strcmp(entryType, "alias")) {
+	if (poptParseArgvString(line, &alias.argc, &alias.argv)) return;
+	alias.longName = longName, alias.shortName = shortName;
+	poptAddAlias(con, alias, 0);
+    } else if (!strcmp(entryType, "exec")) {
+	con->execs = realloc(con->execs, 
+				sizeof(*con->execs) * (con->numExecs + 1));
+	if (longName)
+	    con->execs[con->numExecs].longName = strdup(longName);
+	else
+	    con->execs[con->numExecs].longName = NULL;
+
+	con->execs[con->numExecs].shortName = shortName;
+	con->execs[con->numExecs].script = strdup(line);
+	
+	con->numExecs++;
+    }
+}
+
+int poptReadConfigFile(poptContext con, char * fn) {
+    char * file, * chptr, * end;
+    char * buf, * dst;
+    int fd, rc;
+    int fileLength;
+
+    fd = open(fn, O_RDONLY);
+    if (fd < 0) {
+	if (errno == ENOENT)
+	    return 0;
+	else 
+	    return POPT_ERROR_ERRNO;
+    }
+
+    fileLength = lseek(fd, 0, SEEK_END);
+    lseek(fd, 0, 0);
+
+    file = alloca(fileLength + 1);
+    if ((fd = read(fd, file, fileLength)) != fileLength) {
+	rc = errno;
+	close(fd);
+	errno = rc;
+	return POPT_ERROR_ERRNO;
+    }
+    close(fd);
+
+    dst = buf = alloca(fileLength + 1);
+
+    chptr = file;
+    end = (file + fileLength);
+    while (chptr < end) {
+	switch (*chptr) {
+	  case '\n':
+	    *dst = '\0';
+	    dst = buf;
+	    while (*dst && isspace(*dst)) dst++;
+	    if (*dst && *dst != '#') {
+		configLine(con, dst);
+	    }
+	    chptr++;
+	    break;
+	  case '\\':
+	    *dst++ = *chptr++;
+	    if (chptr < end) {
+		if (*chptr == '\n') 
+		    dst--, chptr++;	
+		    /* \ at the end of a line does not insert a \n */
+		else
+		    *dst++ = *chptr++;
+	    }
+	    break;
+	  default:
+	    *dst++ = *chptr++;
+	}
+    }
+
+    return 0;
+}
+
+int poptReadDefaultConfig(poptContext con, int useEnv) {
+    char * fn, * home;
+    int rc;
+
+    if (!con->appName) return 0;
+
+    rc = poptReadConfigFile(con, "/etc/popt");
+    if (rc) return rc;
+    if (getuid() != geteuid()) return 0;
+
+    if ((home = getenv("HOME"))) {
+	fn = alloca(strlen(home) + 20);
+	strcpy(fn, home);
+	strcat(fn, "/.popt");
+	rc = poptReadConfigFile(con, fn);
+	if (rc) return rc;
+    }
+
+    return 0;
+}
+
diff --git a/popthelp.c b/popthelp.c
new file mode 100644
index 0000000..326f0ae
--- /dev/null
+++ b/popthelp.c
@@ -0,0 +1,242 @@
+#include <ctype.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+
+#include "popt.h"
+#include "poptint.h"
+
+static void displayArgs(poptContext con, int key, const char * arg, 
+			void * data) {
+    if (key == '?')
+	poptPrintHelp(con, stderr, 0);
+    else
+	poptPrintUsage(con, stderr, 0);
+    exit(0);
+}
+
+struct poptOption poptHelpOptions[] = {
+    { NULL, '\0', POPT_ARG_CALLBACK, &displayArgs, '\0', NULL },
+    { "help", '?', 0, NULL, '?', "Show this help message" },
+    { "usage", '\0', 0, NULL, 'u', "Display brief usage message" },
+    { NULL, '\0', 0, NULL, 0 }
+} ;
+
+static void singleOptionHelp(FILE * f, int maxLeftCol, 
+			     const struct poptOption * opt) {
+    int indentLength = maxLeftCol + 5;
+    int lineLength = 79 - indentLength;
+    const char * help = opt->descrip;
+    int helpLength;
+    const char * ch;
+    char format[10];
+    char * left = alloca(maxLeftCol + 1);
+
+    *left = '\0';
+    if (opt->longName && opt->shortName)
+	sprintf(left, "-%c, --%s", opt->shortName, opt->longName);
+    else if (opt->shortName) 
+	sprintf(left, "-%c", opt->shortName);
+    else if (opt->longName)
+	sprintf(left, "--%s", opt->longName);
+    if (!*left) return ;
+    if (opt->argDescrip) {
+	strcat(left, "=");
+	strcat(left, opt->argDescrip);
+    }
+
+    if (help)
+	fprintf(f,"  %-*s   ", maxLeftCol, left);
+    else {
+	fprintf(f,"  %s\n", left); 
+	return;
+    }
+
+    helpLength = strlen(help);
+    while (helpLength > lineLength) {
+	ch = help + lineLength - 1;
+	while (ch > help && !isspace(*ch)) ch--;
+	if (ch == help) break;		/* give up */
+	while (ch > (help + 1) && isspace(*ch)) ch--;
+	ch++;
+
+	sprintf(format, "%%.%ds\n%%%ds", (int) (ch - help), indentLength);
+	fprintf(f, format, help, " ");
+	help = ch;
+	while (isspace(*help) && *help) help++;
+	helpLength = strlen(help);
+    }
+
+    if (helpLength) fprintf(f, "%s\n", help);
+}
+
+static int maxArgWidth(const struct poptOption * opt) {
+    int max = 0;
+    int this;
+    
+    while (opt->longName || opt->shortName || opt->arg) {
+	if (opt->argInfo == POPT_ARG_INCLUDE_TABLE) {
+	    this = maxArgWidth(opt->arg);
+	} else {
+	    this = opt->shortName ? 2 : 0;
+	    if (opt->longName) {
+		if (this) this += 2;
+		this += strlen(opt->longName) + 2;
+	    }
+
+	    if (opt->argDescrip)
+		this += strlen(opt->argDescrip) + 1;
+	}
+
+	if (this > max) max = this;
+
+	opt++;
+    }
+    
+    return max;
+}
+
+static void singleTableHelp(FILE * f, const struct poptOption * table, 
+			    int left) {
+    const struct poptOption * opt;
+
+    opt = table;
+    while (opt->longName || opt->shortName || opt->arg) {
+	if (opt->longName || opt->shortName)
+	    singleOptionHelp(f, left, opt);
+	opt++;
+    }
+
+    opt = table;
+    while (opt->longName || opt->shortName || opt->arg) {
+	if (opt->argInfo == POPT_ARG_INCLUDE_TABLE) {
+	    if (opt->descrip)
+		fprintf(f, "\n%s\n", opt->descrip);
+	    singleTableHelp(f, opt->arg, left);
+	}
+	opt++;
+    }
+}
+
+static int showHelpIntro(poptContext con, FILE * f) {
+    int len = 6;
+    char * fn;
+
+    fprintf(f, "Usage:");
+    if (!(con->flags & POPT_CONTEXT_KEEP_FIRST)) {
+	fn = con->optionStack->argv[0];
+	if (strchr(fn, '/')) fn = strchr(fn, '/') + 1;
+	fprintf(f, " %s", fn);
+	len += strlen(fn) + 1;
+    }
+
+    return len;
+}
+
+void poptPrintHelp(poptContext con, FILE * f, int flags) {
+    int leftColWidth;
+
+    showHelpIntro(con, f);
+    if (con->otherHelp)
+	fprintf(f, " %s\n", con->otherHelp);
+    else
+	fprintf(f, " [OPTION...]\n");
+
+    leftColWidth = maxArgWidth(con->options);
+    singleTableHelp(f, con->options, leftColWidth);
+}
+
+static int singleOptionUsage(FILE * f, int cursor, 
+			      const struct poptOption * opt) {
+    int len = 3;
+    char shortStr[2];
+    const char * item = shortStr;
+
+    if (opt->shortName) {
+	if (!opt->argInfo) return cursor;	/* we did these already */
+	len++;
+	*shortStr = opt->shortName;
+	shortStr[1] = '\0';
+    } else if (opt->longName) {
+	len += 1 + strlen(opt->longName);
+	item = opt->longName;
+    }
+
+    if (len == 3) return cursor;
+
+    if (opt->argDescrip) 
+	len += strlen(opt->argDescrip) + 1;
+
+    if ((cursor + len) > 79) {
+	fprintf(f, "\n       ");
+	cursor = 7;
+    } 
+
+    fprintf(f, " [-%s%s%s%s]", opt->shortName ? "" : "-", item,
+	    opt->argDescrip ? "=" : "", 
+	    opt->argDescrip ? opt->argDescrip : "");
+
+    return cursor + len + 1;
+}
+
+int singleTableUsage(FILE * f, int cursor, const struct poptOption * table) {
+    const struct poptOption * opt;
+    
+    opt = table;
+    while (opt->longName || opt->shortName || opt->arg) {
+	if (opt->longName || opt->shortName)
+	    cursor = singleOptionUsage(f, cursor, opt);
+	else if (opt->argInfo == POPT_ARG_INCLUDE_TABLE) 
+	    cursor = singleTableUsage(f, cursor, opt->arg);
+	opt++;
+    }
+
+    return cursor;
+}
+
+static int showShortOptions(const struct poptOption * opt, FILE * f, 
+			    char * str) {
+    char s[300];		/* this is larger then the ascii set, so
+				   it should do just fine */
+
+    if (!str) {
+	str = s;
+	memset(str, 0, sizeof(str));
+    }
+
+    while (opt->longName || opt->shortName || opt->arg) {
+	if (opt->shortName && !opt->argInfo)
+	    str[strlen(str)] = opt->shortName;
+	else if (opt->argInfo == POPT_ARG_INCLUDE_TABLE)
+	    showShortOptions(opt->arg, f, str);
+
+	opt++;
+    } 
+
+    if (s != str || !*s)
+	return 0;
+
+    fprintf(f, " [-%s]", s);
+    return strlen(s) + 4;
+}
+
+void poptPrintUsage(poptContext con, FILE * f, int flags) {
+    int cursor;
+
+    cursor = showHelpIntro(con, f);
+    cursor += showShortOptions(con->options, f, NULL);
+    singleTableUsage(f, cursor, con->options);
+
+    if (con->otherHelp) {
+	cursor += strlen(con->otherHelp) + 1;
+	if (cursor > 79) fprintf(f, "\n       ");
+	fprintf(f, " %s", con->otherHelp);
+    }
+
+    fprintf(f, "\n");
+}
+
+void poptSetOtherOptionHelp(poptContext con, const char * text) {
+    if (con->otherHelp) free(con->otherHelp);
+    con->otherHelp = strdup(text);
+}
diff --git a/poptparse.c b/poptparse.c
new file mode 100644
index 0000000..ade5a79
--- /dev/null
+++ b/poptparse.c
@@ -0,0 +1,85 @@
+#include <ctype.h>
+#include <stdlib.h>
+#include <string.h>
+
+#include "popt.h"
+
+int poptParseArgvString(char * s, int * argcPtr, char *** argvPtr) {
+    char * buf = strcpy(alloca(strlen(s) + 1), s);
+    char * bufStart = buf;
+    char * src, * dst;
+    char quote = '\0';
+    int argvAlloced = 5;
+    char ** argv = malloc(sizeof(*argv) * argvAlloced);
+    char ** argv2;
+    int argc = 0;
+    int i;
+
+    src = s;
+    dst = buf;
+    argv[argc] = buf;
+
+    memset(buf, '\0', strlen(s) + 1);
+
+    while (*src) {
+	if (quote == *src) {
+	    quote = '\0';
+	} else if (quote) {
+	    if (*src == '\\') {
+		src++;
+		if (!*src) {
+		    free(argv);
+		    return POPT_ERROR_BADQUOTE;
+		}
+		if (*src != quote) *buf++ = '\\';
+	    }
+	    *buf++ = *src;
+	} else if (isspace(*src)) {
+	    if (*argv[argc]) {
+		buf++, argc++;
+		if (argc == argvAlloced) {
+		    argvAlloced += 5;
+		    argv = realloc(argv, sizeof(*argv) * argvAlloced);
+		}
+		argv[argc] = buf;
+	    }
+	} else switch (*src) {
+	  case '"':
+	  case '\'':
+	    quote = *src;
+	    break;
+	  case '\\':
+	    src++;
+	    if (!*src) {
+		free(argv);
+		return POPT_ERROR_BADQUOTE;
+	    }
+	    /* fallthrough */
+	  default:
+	    *buf++ = *src;
+	}
+
+	src++;
+    }
+
+    if (strlen(argv[argc])) {
+	argc++, buf++;
+    }
+
+    dst = malloc(argc * sizeof(*argv) + (buf - bufStart));
+    argv2 = (void *) dst;
+    dst += argc * sizeof(*argv);
+    memcpy(argv2, argv, argc * sizeof(*argv));
+    memcpy(dst, bufStart, buf - bufStart);
+
+    for (i = 0; i < argc; i++) {
+	argv2[i] = dst + (argv[i] - bufStart);
+    }
+
+    free(argv);
+
+    *argvPtr = argv2;
+    *argcPtr = argc;
+
+    return 0;
+}
diff --git a/test1.c b/test1.c
index a1559f0..9ad4a29 100644
--- a/test1.c
+++ b/test1.c
@@ -3,8 +3,9 @@
 
 #include "popt.h"
 
-void option_callback(poptContext con, int key, char * arg, void * data) {
-    printf("callback: %s %s ", (char *) data, arg);    
+void option_callback(poptContext con, const struct poptOption * opt, 
+		     char * arg, void * data) {
+    printf("callback: %c %s %s ", opt->val, (char *) data, arg);    
 }
 
 int main(int argc, char ** argv) {
@@ -19,8 +20,8 @@ int main(int argc, char ** argv) {
     int usage = 0;
     struct poptOption callbackArgs[] = {
 	{ NULL, '\0', POPT_ARG_CALLBACK, option_callback, 0, "sampledata" },
-	{ "cb", 'c', POPT_ARG_STRING, NULL, 0, "Test argument callbacks" },
-	{ "long", '\0', 0, NULL, 0, "Unused option for help testing" },
+	{ "cb", 'c', POPT_ARG_STRING, NULL, 'c', "Test argument callbacks" },
+	{ "long", '\0', 0, NULL, 'l', "Unused option for help testing" },
 	{ NULL, '\0', 0, NULL, 0 } 
     };
     struct poptOption moreArgs[] = {
-- 
Gitee


From fa7e8bd5f64823d9117b3c82ee2aba7a253a5e39 Mon Sep 17 00:00:00 2001
From: Erik Troan <ewt@redhat.com>
Date: Sun, 27 Sep 1998 15:57:56 +0000
Subject: [PATCH 065/667] split popt into multiple files

---
 poptint.h | 42 ++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 42 insertions(+)
 create mode 100644 poptint.h

diff --git a/poptint.h b/poptint.h
new file mode 100644
index 0000000..f7b40d6
--- /dev/null
+++ b/poptint.h
@@ -0,0 +1,42 @@
+#ifndef H_POPTINT
+#define H_POPTINT
+
+struct optionStackEntry {
+    int argc;
+    char ** argv;
+    int next;
+    char * nextArg;
+    char * nextCharArg;
+    struct poptAlias * currAlias;
+    int stuffed;
+};
+
+struct execEntry {
+    char * longName;
+    char shortName;
+    char * script;
+};
+
+struct poptContext_s {
+    struct optionStackEntry optionStack[POPT_OPTION_DEPTH], * os;
+    char ** leftovers;
+    int numLeftovers;
+    int nextLeftover;
+    const struct poptOption * options;
+    int restLeftover;
+    char * appName;
+    struct poptAlias * aliases;
+    int numAliases;
+    int flags;
+    struct execEntry * execs;
+    int numExecs;
+    char ** finalArgv;
+    int finalArgvCount;
+    int finalArgvAlloced;
+    struct execEntry * doExec;
+    char * execPath;
+    int execAbsolute;
+    char * otherHelp;
+};
+
+#endif
-- 
Gitee


From ab5cf0a7b525cc5acd55c23a99f262bb63f4987b Mon Sep 17 00:00:00 2001
From: Erik Troan <ewt@redhat.com>
Date: Sun, 27 Sep 1998 15:58:31 +0000
Subject: [PATCH 066/667] made callback display val

---
 testit.sh | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/testit.sh b/testit.sh
index 0ea083d..5bdedf3 100755
--- a/testit.sh
+++ b/testit.sh
@@ -33,9 +33,12 @@ run test1 "test1 - 14" "arg1: 0 arg2: (none) inc: 1" --inc
 run test1 "test1 - 15" "arg1: 0 arg2: foo inc: 1" -i --arg2 foo
 POSIX_ME_HARDER=1 run test1 "test1 - 16" "arg1: 1 arg2: (none) rest: foo --arg2 something" --arg1 foo --arg2 something
 POSIXLY_CORRECT=1 run test1 "test1 - 17" "arg1: 1 arg2: (none) rest: foo --arg2 something" --arg1 foo --arg2 something
-run test1 "test1 - 18" "callback: sampledata bar arg1: 1 arg2: (none)" --arg1 --cb bar
+run test1 "test1 - 18" "callback: c sampledata bar arg1: 1 arg2: (none)" --arg1 --cb bar
 run test1 "test1 - 19" "./test1 ;" --echo-args
 run test1 "test1 - 20" "./test1 ; --arg1" --echo-args --arg1
 run test1 "test1 - 21" "./test1 ; --arg2 something" -T something -e
 run test1 "test1 - 22" "./test1 ; --arg2 something -- more args" -T something -a more args
 run test1 "test1 - 23" "./test1 ; --echo-args -a" --echo-args -e -a
+
+echo ""
+echo "Passed."
-- 
Gitee


From 987f56b0e1042698cdff306aed12cce271a423dd Mon Sep 17 00:00:00 2001
From: Jeff Johnson <n3npq@mac.com>
Date: Sun, 27 Sep 1998 20:17:31 +0000
Subject: [PATCH 067/667] add Slovak translation (Stanislav Meduna
 <stano@trillian.eunet.sk>) gettextify rpmMessage/rpmError/fprintf messages.

---
 popt.c  |  4 +++-
 test1.c | 14 +++++++-------
 2 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/popt.c b/popt.c
index 0df3179..025d2d5 100644
--- a/popt.c
+++ b/popt.c
@@ -363,7 +363,9 @@ int poptGetNextOpt(poptContext con) {
 		    break;
 
 		  default:
-		    printf("option type not implemented in popt\n");
+		    /* XXX I18N? */
+		    fprintf(stdout, "option type (%d) not implemented in popt\n",
+		      opt->argInfo);
 		    exit(1);
 		}
 	    }
diff --git a/test1.c b/test1.c
index 9ad4a29..3630f78 100644
--- a/test1.c
+++ b/test1.c
@@ -5,7 +5,7 @@
 
 void option_callback(poptContext con, const struct poptOption * opt, 
 		     char * arg, void * data) {
-    printf("callback: %c %s %s ", opt->val, (char *) data, arg);    
+    fprintf(stdout, "callback: %c %s %s ", opt->val, (char *) data, arg);    
 }
 
 int main(int argc, char ** argv) {
@@ -59,23 +59,23 @@ int main(int argc, char ** argv) {
 	return 0;
     }
 
-    printf("arg1: %d arg2: %s", arg1, arg2);
+    fprintf(stdout, "arg1: %d arg2: %s", arg1, arg2);
 
     if (arg3)
-	printf(" arg3: %d", arg3);
+	fprintf(stdout, " arg3: %d", arg3);
     if (inc)
-	printf(" inc: %d", inc);
+	fprintf(stdout, " inc: %d", inc);
 
     rest = poptGetArgs(optCon);
     if (rest) {
-	printf(" rest:");
+	fprintf(stdout, " rest:");
 	while (*rest) {
-	    printf(" %s", *rest);
+	    fprintf(stdout, " %s", *rest);
 	    rest++;
 	}
     }
 
-    printf("\n");
+    fprintf(stdout, "\n");
 
     return 0;
 }
-- 
Gitee


From 8fe5061acf8a53b07bde98afc93c828f70b6f2ad Mon Sep 17 00:00:00 2001
From: Jeff Johnson <n3npq@mac.com>
Date: Fri, 2 Oct 1998 15:37:37 +0000
Subject: [PATCH 068/667] miscellaneous portability cruft (Eugene Kanter).

---
 Makefile.in | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/Makefile.in b/Makefile.in
index 9796940..2a8814e 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -40,7 +40,9 @@ allprogs: $(LIBPOPT) testcases
 
 testcases: $(TESTCASES)
 
+# XXX SINIX ld is stupid: needs explicit rule with libs at end
 $(TESTCASES): $(LIBPOPT)
+	$(CC) $(TESTCASES).c $< -o $@ $(LDFLAGS) $(LIBPOPT)
 
 $(LIBPOPT): $(LIBPOPT)($(LIBOBJECTS))
 	$(RANLIB) $@
-- 
Gitee


From b3dbf0f0e1e9d0f38eb25a8a17d799a76268f8b0 Mon Sep 17 00:00:00 2001
From: Jeff Johnson <n3npq@mac.com>
Date: Mon, 5 Oct 1998 18:31:48 +0000
Subject: [PATCH 069/667] miscellaneous portability cruft (Eugene Kanter).

---
 configure.in | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/configure.in b/configure.in
index e859fa5..d539415 100755
--- a/configure.in
+++ b/configure.in
@@ -49,7 +49,7 @@ else
 fi
 AC_CHECK_FUNCS(strerror)
 AC_CHECK_FUNC(setreuid, [], [
-    AC_CHECK_LIB(ucb, setreuid, [if echo $LIBS | grep -- -lucb >/dev/null ;then :; else LIBS="$LIBS -lucb" USEUCB=y;fi])
+    AC_CHECK_LIB(ucb, setreuid, [if echo $LIBS | grep -- -lucb >/dev/null ;then :; else LIBS="$LIBS -lc -lucb" USEUCB=y;fi])
 ])
 
 AC_OUTPUT(Makefile)
-- 
Gitee


From 6c8fdffee5733812e4e8ff934fdb25a0e81a1e85 Mon Sep 17 00:00:00 2001
From: Jeff Johnson <n3npq@mac.com>
Date: Thu, 8 Oct 1998 10:40:52 +0000
Subject: [PATCH 070/667] configure using automake.

---
 .cvsignore   |   4 +-
 Makefile.am  |   9 ++
 Makefile.in  | 413 +++++++++++++++++++++++++++++++++++++++++----------
 aclocal.m4   | 246 ++++++++++++++++++++++++++++++
 config.h.in  |  10 ++
 configure.in |   5 +
 stamp-h      |   1 +
 stamp-h.in   |   0
 8 files changed, 611 insertions(+), 77 deletions(-)
 create mode 100644 Makefile.am
 create mode 100644 aclocal.m4
 create mode 100644 config.h.in
 create mode 100644 stamp-h
 create mode 100644 stamp-h.in

diff --git a/.cvsignore b/.cvsignore
index ca86025..3f35980 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1,11 +1,13 @@
+.deps
+.depend
 Makefile
 mappcinames
 pci-ids-temp.h
 Makefile
 configure
+config.h
 config.log
 config.cache
 config.satus
 config.status
-.depend
 test1
diff --git a/Makefile.am b/Makefile.am
new file mode 100644
index 0000000..4a93db4
--- /dev/null
+++ b/Makefile.am
@@ -0,0 +1,9 @@
+# Makefile for popt library.
+
+AUTOMAKE_OPTIONS = 1.3 foreign
+
+INCLUDES = -I..
+
+noinst_HEADERS = popt.h
+noinst_LIBRARIES = libpopt.a
+libpopt_a_SOURCES = popt.c findme.c poptparse.c poptconfig.c popthelp.c
diff --git a/Makefile.in b/Makefile.in
index 2a8814e..acf90fc 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -1,83 +1,344 @@
+# Makefile.in generated automatically by automake 1.3 from Makefile.am
+
+# Copyright (C) 1994, 1995, 1996, 1997, 1998 Free Software Foundation, Inc.
+# This Makefile.in is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+# PARTICULAR PURPOSE.
+
+# Makefile for popt library.
+
+
+SHELL = /bin/sh
+
 srcdir = @srcdir@
 top_srcdir = @top_srcdir@
 VPATH = @srcdir@
+prefix = @prefix@
+exec_prefix = @exec_prefix@
+
+bindir = @bindir@
+sbindir = @sbindir@
+libexecdir = @libexecdir@
+datadir = @datadir@
+sysconfdir = @sysconfdir@
+sharedstatedir = @sharedstatedir@
+localstatedir = @localstatedir@
+libdir = @libdir@
+infodir = @infodir@
+mandir = @mandir@
+includedir = @includedir@
+oldincludedir = /usr/include
+
+DISTDIR =
+
+pkgdatadir = $(datadir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkgincludedir = $(includedir)/@PACKAGE@
 
-LIBOBJECTS = 	popt.o findme.o poptparse.o poptconfig.o popthelp.o
+top_builddir = .
 
-SOURCES = $(addprefix $(srcdir)/,$(subst .o,.c,$(LIBOBJECTS)))
-LIBPOPT = libpopt.a
+ACLOCAL = @ACLOCAL@
+AUTOCONF = @AUTOCONF@
+AUTOMAKE = @AUTOMAKE@
+AUTOHEADER = @AUTOHEADER@
+
+INSTALL = @INSTALL@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
+INSTALL_DATA = @INSTALL_DATA@
+INSTALL_SCRIPT = @INSTALL_SCRIPT@
+transform = @program_transform_name@
+
+NORMAL_INSTALL = :
+PRE_INSTALL = :
+POST_INSTALL = :
+NORMAL_UNINSTALL = :
+PRE_UNINSTALL = :
+POST_UNINSTALL = :
 CC = @CC@
+CPP = @CPP@
+MAKEINFO = @MAKEINFO@
+PACKAGE = @PACKAGE@
+RANLIB = @RANLIB@
+TARGET = @TARGET@
+U = @U@
+VERSION = @VERSION@
+
+AUTOMAKE_OPTIONS = 1.3 foreign
+
+INCLUDES = -I..
+
+noinst_HEADERS = popt.h
+noinst_LIBRARIES = libpopt.a
+libpopt_a_SOURCES = popt.c findme.c poptparse.c poptconfig.c popthelp.c
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+CONFIG_HEADER = config.h
+CONFIG_CLEAN_FILES = 
+LIBRARIES =  $(noinst_LIBRARIES)
+
+
+DEFS = @DEFS@ -I. -I$(srcdir) -I.
+CPPFLAGS = @CPPFLAGS@
+LDFLAGS = @LDFLAGS@
+LIBS = @LIBS@
+libpopt_a_LIBADD = 
+libpopt_a_OBJECTS =  popt.o findme.o poptparse.o poptconfig.o popthelp.o
+AR = ar
+CFLAGS = @CFLAGS@
+COMPILE = $(CC) $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS)
+LINK = $(CC) $(CFLAGS) $(LDFLAGS) -o $@
+HEADERS =  $(noinst_HEADERS)
+
+DIST_COMMON =  README Makefile.am Makefile.in aclocal.m4 config.h.in \
+configure configure.in install-sh stamp-h.in
+
+
+DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
+
+TAR = tar
+GZIP = --best
+DEP_FILES =  .deps/findme.P .deps/popt.P .deps/poptconfig.P \
+.deps/popthelp.P .deps/poptparse.P
+SOURCES = $(libpopt_a_SOURCES)
+OBJECTS = $(libpopt_a_OBJECTS)
+
+all: Makefile $(LIBRARIES) $(HEADERS) config.h
+
+.SUFFIXES:
+.SUFFIXES: .S .c .o .s
+$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4)
+	cd $(top_srcdir) && $(AUTOMAKE) --foreign Makefile
+
+Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status $(BUILT_SOURCES)
+	cd $(top_builddir) \
+	  && CONFIG_FILES=$@ CONFIG_HEADERS= $(SHELL) ./config.status
+
+$(ACLOCAL_M4):  configure.in 
+	cd $(srcdir) && $(ACLOCAL)
+
+config.status: $(srcdir)/configure
+	$(SHELL) ./config.status --recheck
+$(srcdir)/configure: $(srcdir)/configure.in $(ACLOCAL_M4) $(CONFIGURE_DEPENDENCIES)
+	cd $(srcdir) && $(AUTOCONF)
+
+config.h: stamp-h
+	@:
+stamp-h: $(srcdir)/config.h.in $(top_builddir)/config.status
+	cd $(top_builddir) \
+	  && CONFIG_FILES= CONFIG_HEADERS=config.h \
+	     $(SHELL) ./config.status
+	@echo timestamp > stamp-h
+$(srcdir)/config.h.in: $(srcdir)/stamp-h.in
+$(srcdir)/stamp-h.in: $(top_srcdir)/configure.in $(ACLOCAL_M4) 
+	cd $(top_srcdir) && $(AUTOHEADER)
+	@echo timestamp > $(srcdir)/stamp-h.in
+
+mostlyclean-hdr:
+
+clean-hdr:
+
+distclean-hdr:
+	-rm -f config.h
+
+maintainer-clean-hdr:
+
+mostlyclean-noinstLIBRARIES:
+
+clean-noinstLIBRARIES:
+	-test -z "$(noinst_LIBRARIES)" || rm -f $(noinst_LIBRARIES)
+
+distclean-noinstLIBRARIES:
+
+maintainer-clean-noinstLIBRARIES:
+
+.s.o:
+	$(COMPILE) -c $<
+
+.S.o:
+	$(COMPILE) -c $<
+
+mostlyclean-compile:
+	-rm -f *.o core *.core
+
+clean-compile:
+
+distclean-compile:
+	-rm -f *.tab.c
+
+maintainer-clean-compile:
+
+libpopt.a: $(libpopt_a_OBJECTS) $(libpopt_a_DEPENDENCIES)
+	-rm -f libpopt.a
+	$(AR) cru libpopt.a $(libpopt_a_OBJECTS) $(libpopt_a_LIBADD)
+	$(RANLIB) libpopt.a
+
+tags: TAGS
+
+ID: $(HEADERS) $(SOURCES) $(LISP)
+	here=`pwd` && cd $(srcdir) \
+	  && mkid -f$$here/ID $(SOURCES) $(HEADERS) $(LISP)
+
+TAGS:  $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) $(LISP)
+	tags=; \
+	here=`pwd`; \
+	list='$(SOURCES) $(HEADERS)'; \
+	unique=`for i in $$list; do echo $$i; done | \
+	  awk '    { files[$$0] = 1; } \
+	       END { for (i in files) print i; }'`; \
+	test -z "$(ETAGS_ARGS)config.h.in$$unique$(LISP)$$tags" \
+	  || (cd $(srcdir) && etags $(ETAGS_ARGS) $$tags config.h.in $$unique $(LISP) -o $$here/TAGS)
+
+mostlyclean-tags:
+
+clean-tags:
+
+distclean-tags:
+	-rm -f TAGS ID
+
+maintainer-clean-tags:
+
+distdir = $(PACKAGE)-$(VERSION)
+top_distdir = $(distdir)
+
+# This target untars the dist file and tries a VPATH configuration.  Then
+# it guarantees that the distribution is self-contained by making another
+# tarfile.
+distcheck: dist
+	-rm -rf $(distdir)
+	GZIP=$(GZIP) $(TAR) zxf $(distdir).tar.gz
+	mkdir $(distdir)/=build
+	mkdir $(distdir)/=inst
+	dc_install_base=`cd $(distdir)/=inst && pwd`; \
+	cd $(distdir)/=build \
+	  && ../configure --srcdir=.. --prefix=$$dc_install_base \
+	  && $(MAKE) \
+	  && $(MAKE) dvi \
+	  && $(MAKE) check \
+	  && $(MAKE) install \
+	  && $(MAKE) installcheck \
+	  && $(MAKE) dist
+	-rm -rf $(distdir)
+	@echo "========================"; \
+	echo "$(distdir).tar.gz is ready for distribution"; \
+	echo "========================"
+dist: distdir
+	-chmod -R a+r $(distdir)
+	GZIP=$(GZIP) $(TAR) chozf $(distdir).tar.gz $(distdir)
+	-rm -rf $(distdir)
+dist-all: distdir
+	-chmod -R a+r $(distdir)
+	GZIP=$(GZIP) $(TAR) chozf $(distdir).tar.gz $(distdir)
+	-rm -rf $(distdir)
+distdir: $(DISTFILES)
+	-rm -rf $(distdir)
+	mkdir $(distdir)
+	-chmod 777 $(distdir)
+	here=`cd $(top_builddir) && pwd`; \
+	top_distdir=`cd $(distdir) && pwd`; \
+	distdir=`cd $(distdir) && pwd`; \
+	cd $(top_srcdir) \
+	  && $(AUTOMAKE) --include-deps --build-dir=$$here --srcdir-name=$(top_srcdir) --output-dir=$$top_distdir --foreign Makefile
+	@for file in $(DISTFILES); do \
+	  d=$(srcdir); \
+	  test -f $(distdir)/$$file \
+	  || ln $$d/$$file $(distdir)/$$file 2> /dev/null \
+	  || cp -p $$d/$$file $(distdir)/$$file; \
+	done
+
+DEPS_MAGIC := $(shell mkdir .deps > /dev/null 2>&1 || :)
+
+-include $(DEP_FILES)
+
+mostlyclean-depend:
+
+clean-depend:
+
+distclean-depend:
+
+maintainer-clean-depend:
+	-rm -rf .deps
+
+%.o: %.c
+	@echo '$(COMPILE) -c $<'; \
+	$(COMPILE) -Wp,-MD,.deps/$(*F).P -c $<
+
+%.lo: %.c
+	@echo '$(LTCOMPILE) -c $<'; \
+	$(LTCOMPILE) -Wp,-MD,.deps/$(*F).p -c $<
+	@-sed -e 's/^\([^:]*\)\.o:/\1.lo \1.o:/' \
+	  < .deps/$(*F).p > .deps/$(*F).P
+	@-rm -f .deps/$(*F).p
+info:
+dvi:
+check: all
+	$(MAKE)
+installcheck:
+install-exec: 
+	@$(NORMAL_INSTALL)
+
+install-data: 
+	@$(NORMAL_INSTALL)
+
+install: install-exec install-data all
+	@:
+
+uninstall: 
+
+install-strip:
+	$(MAKE) INSTALL_PROGRAM='$(INSTALL_PROGRAM) -s' INSTALL_SCRIPT='$(INSTALL_PROGRAM)' install
+installdirs:
+
+
+mostlyclean-generic:
+	-test -z "$(MOSTLYCLEANFILES)" || rm -f $(MOSTLYCLEANFILES)
+
+clean-generic:
+	-test -z "$(CLEANFILES)" || rm -f $(CLEANFILES)
+
+distclean-generic:
+	-rm -f Makefile $(DISTCLEANFILES)
+	-rm -f config.cache config.log stamp-h stamp-h[0-9]*
+	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+
+maintainer-clean-generic:
+	-test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES)
+	-test -z "$(BUILT_SOURCES)" || rm -f $(BUILT_SOURCES)
+mostlyclean:  mostlyclean-hdr mostlyclean-noinstLIBRARIES \
+		mostlyclean-compile mostlyclean-tags mostlyclean-depend \
+		mostlyclean-generic
+
+clean:  clean-hdr clean-noinstLIBRARIES clean-compile clean-tags \
+		clean-depend clean-generic mostlyclean
+
+distclean:  distclean-hdr distclean-noinstLIBRARIES distclean-compile \
+		distclean-tags distclean-depend distclean-generic clean
+	-rm -f config.status
+
+maintainer-clean:  maintainer-clean-hdr maintainer-clean-noinstLIBRARIES \
+		maintainer-clean-compile maintainer-clean-tags \
+		maintainer-clean-depend maintainer-clean-generic \
+		distclean
+	@echo "This command is intended for maintainers to use;"
+	@echo "it deletes files that may require special tools to rebuild."
+	-rm -f config.status
+
+.PHONY: mostlyclean-hdr distclean-hdr clean-hdr maintainer-clean-hdr \
+mostlyclean-noinstLIBRARIES distclean-noinstLIBRARIES \
+clean-noinstLIBRARIES maintainer-clean-noinstLIBRARIES \
+mostlyclean-compile distclean-compile clean-compile \
+maintainer-clean-compile tags mostlyclean-tags distclean-tags \
+clean-tags maintainer-clean-tags distdir mostlyclean-depend \
+distclean-depend clean-depend maintainer-clean-depend info dvi \
+installcheck install-exec install-data install uninstall all \
+installdirs mostlyclean-generic distclean-generic clean-generic \
+maintainer-clean-generic clean mostlyclean distclean maintainer-clean
+
 
-RANLIB=@RANLIB@
-INSTALL=@INSTALL@
-INSTALL_PREOGRAM=@INSTALL_PREOGRAM@
-INSTALL_DATA=@INSTALL_DATA@
-prefix=@prefix@
-LIBS=$(prefix)/lib
-INCLUDE=$(prefix)/include
-CPP=@CPP@
-LDFLAGS=@LIBS@
-TESTCASES=test1
-
-VERSION=$(shell awk '/define version/ { print $$3 }' popt.spec)
-CVSTAG = r$(subst .,-,$(VERSION))
-
-# -----------------------------------------------------------------------
-
-CFLAGS = @CFLAGS@ @DEFS@ $(OPTS)
-
-ifeq ($(RANLIB),)
-RANLIB=ranlib
-endif
-
-ifeq (.depend-done,$(wildcard .depend-done))
-TARGET=allprogs
-else
-TARGET=@TARGET@
-endif
-
-allprogs: $(LIBPOPT) testcases
-
-testcases: $(TESTCASES)
-
-# XXX SINIX ld is stupid: needs explicit rule with libs at end
-$(TESTCASES): $(LIBPOPT)
-	$(CC) $(TESTCASES).c $< -o $@ $(LDFLAGS) $(LIBPOPT)
-
-$(LIBPOPT): $(LIBPOPT)($(LIBOBJECTS))
-	$(RANLIB) $@
-
-distclean: clean
-	rm -f Makefile .depend-done config.log config.status
-
-clean:
-	rm -f *.a *.o *~ $(PROGS) test.out tagtable.c
-
-squeaky: distclean
-	rm -f .depend
-
-depend:
-	topdir_path=`( cd $(top_srcdir) && pwd )` ; \
-	/bin/rm -f .depend ; \
-	    $(CPP) $(CFLAGS) -MM $(SOURCES) | \
-		sed s+$$topdir_path+$(top_srcdir)+g > .depend
-
-install:
-	mkdir -p $(PREFIX)/$(INCLUDE)
-	mkdir -p $(PREFIX)/$(LIBS)
-	$(INSTALL_DATA) -m 644 popt.h $(PREFIX)/$(INCLUDE)/popt.h
-	$(INSTALL_DATA) -m 644 $(LIBPOPT) $(PREFIX)/$(LIBS)/$(LIBPOPT)
-
-archive:
-	cvs tag -F $(CVSTAG) .
-	@rm -rf /tmp/popt-$(VERSION) /tmp/popt
-	@cd /tmp; cvs export -r$(CVSTAG) popt
-	@cd /tmp/popt; autoconf
-	@mv /tmp/popt /tmp/popt-$(VERSION)
-	@dir=$$PWD; cd /tmp; tar cvzf $$dir/popt-$(VERSION).tar.gz popt-$(VERSION)
-	@rm -rf /tmp/popt-$(VERSION)
-	@echo "The archive is in popt-$(VERSION).tar.gz"
-
-ifeq (.depend,$(wildcard .depend))
-include .depend
-endif
+# Tell versions [3.59,3.63) of GNU make to not export all variables.
+# Otherwise a system limit (for SysV at least) may be exceeded.
+.NOEXPORT:
diff --git a/aclocal.m4 b/aclocal.m4
new file mode 100644
index 0000000..d234055
--- /dev/null
+++ b/aclocal.m4
@@ -0,0 +1,246 @@
+dnl aclocal.m4 generated automatically by aclocal 1.3
+
+dnl Copyright (C) 1994, 1995, 1996, 1997, 1998 Free Software Foundation, Inc.
+dnl This Makefile.in is free software; the Free Software Foundation
+dnl gives unlimited permission to copy and/or distribute it,
+dnl with or without modifications, as long as this notice is preserved.
+
+dnl This program is distributed in the hope that it will be useful,
+dnl but WITHOUT ANY WARRANTY, to the extent permitted by law; without
+dnl even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+dnl PARTICULAR PURPOSE.
+
+# Do all the work for Automake.  This macro actually does too much --
+# some checks are only needed if your package does certain things.
+# But this isn't really a big deal.
+
+# serial 1
+
+dnl Usage:
+dnl AM_INIT_AUTOMAKE(package,version, [no-define])
+
+AC_DEFUN(AM_INIT_AUTOMAKE,
+[AC_REQUIRE([AM_PROG_INSTALL])
+PACKAGE=[$1]
+AC_SUBST(PACKAGE)
+VERSION=[$2]
+AC_SUBST(VERSION)
+dnl test to see if srcdir already configured
+if test "`cd $srcdir && pwd`" != "`pwd`" && test -f $srcdir/config.status; then
+  AC_MSG_ERROR([source directory already configured; run "make distclean" there first])
+fi
+ifelse([$3],,
+AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE")
+AC_DEFINE_UNQUOTED(VERSION, "$VERSION"))
+AC_REQUIRE([AM_SANITY_CHECK])
+AC_REQUIRE([AC_ARG_PROGRAM])
+dnl FIXME This is truly gross.
+missing_dir=`cd $ac_aux_dir && pwd`
+AM_MISSING_PROG(ACLOCAL, aclocal, $missing_dir)
+AM_MISSING_PROG(AUTOCONF, autoconf, $missing_dir)
+AM_MISSING_PROG(AUTOMAKE, automake, $missing_dir)
+AM_MISSING_PROG(AUTOHEADER, autoheader, $missing_dir)
+AM_MISSING_PROG(MAKEINFO, makeinfo, $missing_dir)
+AC_REQUIRE([AC_PROG_MAKE_SET])])
+
+
+# serial 1
+
+AC_DEFUN(AM_PROG_INSTALL,
+[AC_REQUIRE([AC_PROG_INSTALL])
+test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL_PROGRAM}'
+AC_SUBST(INSTALL_SCRIPT)dnl
+])
+
+#
+# Check to make sure that the build environment is sane.
+#
+
+AC_DEFUN(AM_SANITY_CHECK,
+[AC_MSG_CHECKING([whether build environment is sane])
+# Just in case
+sleep 1
+echo timestamp > conftestfile
+# Do `set' in a subshell so we don't clobber the current shell's
+# arguments.  Must try -L first in case configure is actually a
+# symlink; some systems play weird games with the mod time of symlinks
+# (eg FreeBSD returns the mod time of the symlink's containing
+# directory).
+if (
+   set X `ls -Lt $srcdir/configure conftestfile 2> /dev/null`
+   if test "[$]*" = "X"; then
+      # -L didn't work.
+      set X `ls -t $srcdir/configure conftestfile`
+   fi
+   if test "[$]*" != "X $srcdir/configure conftestfile" \
+      && test "[$]*" != "X conftestfile $srcdir/configure"; then
+
+      # If neither matched, then we have a broken ls.  This can happen
+      # if, for instance, CONFIG_SHELL is bash and it inherits a
+      # broken ls alias from the environment.  This has actually
+      # happened.  Such a system could not be considered "sane".
+      AC_MSG_ERROR([ls -t appears to fail.  Make sure there is not a broken
+alias in your environment])
+   fi
+
+   test "[$]2" = conftestfile
+   )
+then
+   # Ok.
+   :
+else
+   AC_MSG_ERROR([newly created file is older than distributed files!
+Check your system clock])
+fi
+rm -f conftest*
+AC_MSG_RESULT(yes)])
+
+dnl AM_MISSING_PROG(NAME, PROGRAM, DIRECTORY)
+dnl The program must properly implement --version.
+AC_DEFUN(AM_MISSING_PROG,
+[AC_MSG_CHECKING(for working $2)
+# Run test in a subshell; some versions of sh will print an error if
+# an executable is not found, even if stderr is redirected.
+# Redirect stdin to placate older versions of autoconf.  Sigh.
+if ($2 --version) < /dev/null > /dev/null 2>&1; then
+   $1=$2
+   AC_MSG_RESULT(found)
+else
+   $1="$3/missing $2"
+   AC_MSG_RESULT(missing)
+fi
+AC_SUBST($1)])
+
+# Like AC_CONFIG_HEADER, but automatically create stamp file.
+
+AC_DEFUN(AM_CONFIG_HEADER,
+[AC_PREREQ([2.12])
+AC_CONFIG_HEADER([$1])
+dnl When config.status generates a header, we must update the stamp-h file.
+dnl This file resides in the same directory as the config header
+dnl that is generated.  We must strip everything past the first ":",
+dnl and everything past the last "/".
+AC_OUTPUT_COMMANDS(changequote(<<,>>)dnl
+ifelse(patsubst(<<$1>>, <<[^ ]>>, <<>>), <<>>,
+<<test -z "<<$>>CONFIG_HEADERS" || echo timestamp > patsubst(<<$1>>, <<^\([^:]*/\)?.*>>, <<\1>>)stamp-h<<>>dnl>>,
+<<am_indx=1
+for am_file in <<$1>>; do
+  case " <<$>>CONFIG_HEADERS " in
+  *" <<$>>am_file "*<<)>>
+    echo timestamp > `echo <<$>>am_file | sed -e 's%:.*%%' -e 's%[^/]*$%%'`stamp-h$am_indx
+    ;;
+  esac
+  am_indx=`expr "<<$>>am_indx" + 1`
+done<<>>dnl>>)
+changequote([,]))])
+
+
+# serial 1
+
+AC_DEFUN(AM_C_PROTOTYPES,
+[AC_REQUIRE([AM_PROG_CC_STDC])
+AC_REQUIRE([AC_PROG_CPP])
+AC_MSG_CHECKING([for function prototypes])
+if test "$am_cv_prog_cc_stdc" != no; then
+  AC_MSG_RESULT(yes)
+  AC_DEFINE(PROTOTYPES)
+  U= ANSI2KNR=
+else
+  AC_MSG_RESULT(no)
+  U=_ ANSI2KNR=./ansi2knr
+  # Ensure some checks needed by ansi2knr itself.
+  AC_HEADER_STDC
+  AC_CHECK_HEADERS(string.h)
+fi
+AC_SUBST(U)dnl
+AC_SUBST(ANSI2KNR)dnl
+])
+
+
+# serial 1
+
+# @defmac AC_PROG_CC_STDC
+# @maindex PROG_CC_STDC
+# @ovindex CC
+# If the C compiler in not in ANSI C mode by default, try to add an option
+# to output variable @code{CC} to make it so.  This macro tries various
+# options that select ANSI C on some system or another.  It considers the
+# compiler to be in ANSI C mode if it handles function prototypes correctly.
+#
+# If you use this macro, you should check after calling it whether the C
+# compiler has been set to accept ANSI C; if not, the shell variable
+# @code{am_cv_prog_cc_stdc} is set to @samp{no}.  If you wrote your source
+# code in ANSI C, you can make an un-ANSIfied copy of it by using the
+# program @code{ansi2knr}, which comes with Ghostscript.
+# @end defmac
+
+AC_DEFUN(AM_PROG_CC_STDC,
+[AC_REQUIRE([AC_PROG_CC])
+AC_BEFORE([$0], [AC_C_INLINE])
+AC_BEFORE([$0], [AC_C_CONST])
+dnl Force this before AC_PROG_CPP.  Some cpp's, eg on HPUX, require
+dnl a magic option to avoid problems with ANSI preprocessor commands
+dnl like #elif.
+dnl FIXME: can't do this because then AC_AIX won't work due to a
+dnl circular dependency.
+dnl AC_BEFORE([$0], [AC_PROG_CPP])
+AC_MSG_CHECKING(for ${CC-cc} option to accept ANSI C)
+AC_CACHE_VAL(am_cv_prog_cc_stdc,
+[am_cv_prog_cc_stdc=no
+ac_save_CC="$CC"
+# Don't try gcc -ansi; that turns off useful extensions and
+# breaks some systems' header files.
+# AIX			-qlanglvl=ansi
+# Ultrix and OSF/1	-std1
+# HP-UX			-Aa -D_HPUX_SOURCE
+# SVR4			-Xc -D__EXTENSIONS__
+for ac_arg in "" -qlanglvl=ansi -std1 "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__"
+do
+  CC="$ac_save_CC $ac_arg"
+  AC_TRY_COMPILE(
+[#include <stdarg.h>
+#include <stdio.h>
+#include <sys/types.h>
+#include <sys/stat.h>
+/* Most of the following tests are stolen from RCS 5.7's src/conf.sh.  */
+struct buf { int x; };
+FILE * (*rcsopen) (struct buf *, struct stat *, int);
+static char *e (p, i)
+     char **p;
+     int i;
+{
+  return p[i];
+}
+static char *f (char * (*g) (char **, int), char **p, ...)
+{
+  char *s;
+  va_list v;
+  va_start (v,p);
+  s = g (p, va_arg (v,int));
+  va_end (v);
+  return s;
+}
+int test (int i, double x);
+struct s1 {int (*f) (int a);};
+struct s2 {int (*f) (double a);};
+int pairnames (int, char **, FILE *(*)(struct buf *, struct stat *, int), int, int);
+int argc;
+char **argv;
+], [
+return f (e, argv, 0) != argv[0]  ||  f (e, argv, 1) != argv[1];
+],
+[am_cv_prog_cc_stdc="$ac_arg"; break])
+done
+CC="$ac_save_CC"
+])
+if test -z "$am_cv_prog_cc_stdc"; then
+  AC_MSG_RESULT([none needed])
+else
+  AC_MSG_RESULT($am_cv_prog_cc_stdc)
+fi
+case "x$am_cv_prog_cc_stdc" in
+  x|xno) ;;
+  *) CC="$CC $am_cv_prog_cc_stdc" ;;
+esac
+])
+
diff --git a/config.h.in b/config.h.in
new file mode 100644
index 0000000..2641ff2
--- /dev/null
+++ b/config.h.in
@@ -0,0 +1,10 @@
+/* config.h.in.  Generated automatically from configure.in by autoheader.  */
+
+/* Define if you have the strerror function.  */
+#undef HAVE_STRERROR
+
+/* Define if you have the <alloca.h> header file.  */
+#undef HAVE_ALLOCA_H
+
+/* Define if you have the <unistd.h> header file.  */
+#undef HAVE_UNISTD_H
diff --git a/configure.in b/configure.in
index d539415..d0d6ad8 100755
--- a/configure.in
+++ b/configure.in
@@ -1,7 +1,11 @@
 AC_INIT(popt.h)
+AM_INIT_AUTOMAKE(popt, 1.1.1)
+AM_CONFIG_HEADER(config.h)
 
 AC_PROG_CC
 AC_GCC_TRADITIONAL
+AM_C_PROTOTYPES
+
 AC_PROG_RANLIB
 AC_PROG_INSTALL
 
@@ -47,6 +51,7 @@ if test -d /usr/ucblib ; then
 else
 	AC_MSG_RESULT(no)
 fi
+
 AC_CHECK_FUNCS(strerror)
 AC_CHECK_FUNC(setreuid, [], [
     AC_CHECK_LIB(ucb, setreuid, [if echo $LIBS | grep -- -lucb >/dev/null ;then :; else LIBS="$LIBS -lc -lucb" USEUCB=y;fi])
diff --git a/stamp-h b/stamp-h
new file mode 100644
index 0000000..9788f70
--- /dev/null
+++ b/stamp-h
@@ -0,0 +1 @@
+timestamp
diff --git a/stamp-h.in b/stamp-h.in
new file mode 100644
index 0000000..e69de29
-- 
Gitee


From 670e1c2b1893256526593bd835e3d0d1770782c4 Mon Sep 17 00:00:00 2001
From: Jeff Johnson <n3npq@mac.com>
Date: Thu, 8 Oct 1998 11:20:01 +0000
Subject: [PATCH 071/667] automake linux fiddles.

---
 config.h.in  | 15 +++++++++++++++
 findme.c     |  4 ++++
 popt.c       |  4 ++++
 poptconfig.c |  4 ++++
 popthelp.c   |  4 ++++
 poptparse.c  |  4 ++++
 stamp-h.in   |  1 +
 7 files changed, 36 insertions(+)

diff --git a/config.h.in b/config.h.in
index 2641ff2..21a4244 100644
--- a/config.h.in
+++ b/config.h.in
@@ -1,10 +1,25 @@
 /* config.h.in.  Generated automatically from configure.in by autoheader.  */
 
+/* Define if you have the ANSI C header files.  */
+#undef STDC_HEADERS
+
+/* Define to the name of the distribution.  */
+#undef PACKAGE
+
+/* Define to the version of the distribution.  */
+#undef VERSION
+
+/* Define to 1 if ANSI function prototypes are usable.  */
+#undef PROTOTYPES
+
 /* Define if you have the strerror function.  */
 #undef HAVE_STRERROR
 
 /* Define if you have the <alloca.h> header file.  */
 #undef HAVE_ALLOCA_H
 
+/* Define if you have the <string.h> header file.  */
+#undef HAVE_STRING_H
+
 /* Define if you have the <unistd.h> header file.  */
 #undef HAVE_UNISTD_H
diff --git a/findme.c b/findme.c
index 528d401..1086b28 100644
--- a/findme.c
+++ b/findme.c
@@ -1,3 +1,7 @@
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
diff --git a/popt.c b/popt.c
index 025d2d5..7678734 100644
--- a/popt.c
+++ b/popt.c
@@ -1,3 +1,7 @@
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include <errno.h>
 #include <ctype.h>
 #include <fcntl.h>
diff --git a/poptconfig.c b/poptconfig.c
index cd4e239..0a81ca4 100644
--- a/poptconfig.c
+++ b/poptconfig.c
@@ -1,3 +1,7 @@
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include <ctype.h>
 #include <errno.h>
 #include <fcntl.h>
diff --git a/popthelp.c b/popthelp.c
index 326f0ae..95f3b4b 100644
--- a/popthelp.c
+++ b/popthelp.c
@@ -1,3 +1,7 @@
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include <ctype.h>
 #include <stdio.h>
 #include <stdlib.h>
diff --git a/poptparse.c b/poptparse.c
index ade5a79..aea784b 100644
--- a/poptparse.c
+++ b/poptparse.c
@@ -1,3 +1,7 @@
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include <ctype.h>
 #include <stdlib.h>
 #include <string.h>
diff --git a/stamp-h.in b/stamp-h.in
index e69de29..9788f70 100644
--- a/stamp-h.in
+++ b/stamp-h.in
@@ -0,0 +1 @@
+timestamp
-- 
Gitee


From d3a923bb001533878d8a1a66c7eec71f2725867a Mon Sep 17 00:00:00 2001
From: Jeff Johnson <n3npq@mac.com>
Date: Thu, 8 Oct 1998 14:23:55 +0000
Subject: [PATCH 072/667] add required files to popt. restore CVSTAG for "make
 archive"

---
 Makefile.in   |   2 +-
 missing       | 188 ++++++++++++++++++++++++++++++++++++++++++++++++++
 mkinstalldirs |  40 +++++++++++
 3 files changed, 229 insertions(+), 1 deletion(-)
 create mode 100755 missing
 create mode 100755 mkinstalldirs

diff --git a/Makefile.in b/Makefile.in
index acf90fc..c8a9036 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -95,7 +95,7 @@ LINK = $(CC) $(CFLAGS) $(LDFLAGS) -o $@
 HEADERS =  $(noinst_HEADERS)
 
 DIST_COMMON =  README Makefile.am Makefile.in aclocal.m4 config.h.in \
-configure configure.in install-sh stamp-h.in
+configure configure.in install-sh missing mkinstalldirs stamp-h.in
 
 
 DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
diff --git a/missing b/missing
new file mode 100755
index 0000000..cbe2b0e
--- /dev/null
+++ b/missing
@@ -0,0 +1,188 @@
+#! /bin/sh
+# Common stub for a few missing GNU programs while installing.
+# Copyright (C) 1996, 1997 Free Software Foundation, Inc.
+# Franc,ois Pinard <pinard@iro.umontreal.ca>, 1996.
+
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+# 02111-1307, USA.
+
+if test $# -eq 0; then
+  echo 1>&2 "Try \`$0 --help' for more information"
+  exit 1
+fi
+
+case "$1" in
+
+  -h|--h|--he|--hel|--help)
+    echo "\
+$0 [OPTION]... PROGRAM [ARGUMENT]...
+
+Handle \`PROGRAM [ARGUMENT]...' for when PROGRAM is missing, or return an
+error status if there is no known handling for PROGRAM.
+
+Options:
+  -h, --help      display this help and exit
+  -v, --version   output version information and exit
+
+Supported PROGRAM values:
+  aclocal      touch file \`aclocal.m4'
+  autoconf     touch file \`configure'
+  autoheader   touch file \`config.h.in'
+  automake     touch all \`Makefile.in' files
+  bison        create \`y.tab.[ch]', if possible, from existing .[ch]
+  flex         create \`lex.yy.c', if possible, from existing .c
+  lex          create \`lex.yy.c', if possible, from existing .c
+  makeinfo     touch the output file
+  yacc         create \`y.tab.[ch]', if possible, from existing .[ch]"
+    ;;
+
+  -v|--v|--ve|--ver|--vers|--versi|--versio|--version)
+    echo "missing - GNU libit 0.0"
+    ;;
+
+  -*)
+    echo 1>&2 "$0: Unknown \`$1' option"
+    echo 1>&2 "Try \`$0 --help' for more information"
+    exit 1
+    ;;
+
+  aclocal)
+    echo 1>&2 "\
+WARNING: \`$1' is missing on your system.  You should only need it if
+         you modified \`acinclude.m4' or \`configure.in'.  You might want
+         to install the \`Automake' and \`Perl' packages.  Grab them from
+         any GNU archive site."
+    touch aclocal.m4
+    ;;
+
+  autoconf)
+    echo 1>&2 "\
+WARNING: \`$1' is missing on your system.  You should only need it if
+         you modified \`configure.in'.  You might want to install the
+         \`Autoconf' and \`GNU m4' packages.  Grab them from any GNU
+         archive site."
+    touch configure
+    ;;
+
+  autoheader)
+    echo 1>&2 "\
+WARNING: \`$1' is missing on your system.  You should only need it if
+         you modified \`acconfig.h' or \`configure.in'.  You might want
+         to install the \`Autoconf' and \`GNU m4' packages.  Grab them
+         from any GNU archive site."
+    files=`sed -n 's/^[ ]*A[CM]_CONFIG_HEADER([^):]*:\([^)]*\)).*/\1/p' configure.in`
+    if test -z "$files"; then
+      files=`sed -n 's/^[ ]*A[CM]_CONFIG_HEADER(\([^):]*\)).*/\1/p' configure.in`
+      test -z "$files" || files="$files.in"
+    else
+      files=`echo "$files" | sed -e 's/:/ /g'`
+    fi
+    test -z "$files" && files="config.h.in"
+    touch $files
+    ;;
+
+  automake)
+    echo 1>&2 "\
+WARNING: \`$1' is missing on your system.  You should only need it if
+         you modified \`Makefile.am', \`acinclude.m4' or \`configure.in'.
+         You might want to install the \`Automake' and \`Perl' packages.
+         Grab them from any GNU archive site."
+    find . -type f -name Makefile.am -print \
+      | sed 's/^\(.*\).am$/touch \1.in/' \
+      | sh
+    ;;
+
+  bison|yacc)
+    echo 1>&2 "\
+WARNING: \`$1' is missing on your system.  You should only need it if
+         you modified a \`.y' file.  You may need the \`Bison' package
+         in order for those modifications to take effect.  You can get
+         \`Bison' from any GNU archive site."
+    rm -f y.tab.c y.tab.h
+    if [ $# -ne 1 ]; then
+        eval LASTARG="\${$#}"
+	case "$LASTARG" in
+	*.y)
+	    SRCFILE=`echo "$LASTARG" | sed 's/y$/c/'`
+	    if [ -f "$SRCFILE" ]; then
+	         cp "$SRCFILE" y.tab.c
+	    fi
+	    SRCFILE=`echo "$LASTARG" | sed 's/y$/h/'`
+	    if [ -f "$SRCFILE" ]; then
+	         cp "$SRCFILE" y.tab.h
+	    fi
+	  ;;
+	esac
+    fi
+    if [ ! -f y.tab.h ]; then
+	echo >y.tab.h
+    fi
+    if [ ! -f y.tab.c ]; then
+	echo 'main() { return 0; }' >y.tab.c
+    fi
+    ;;
+
+  lex|flex)
+    echo 1>&2 "\
+WARNING: \`$1' is missing on your system.  You should only need it if
+         you modified a \`.l' file.  You may need the \`Flex' package
+         in order for those modifications to take effect.  You can get
+         \`Flex' from any GNU archive site."
+    rm -f lex.yy.c
+    if [ $# -ne 1 ]; then
+        eval LASTARG="\${$#}"
+	case "$LASTARG" in
+	*.l)
+	    SRCFILE=`echo "$LASTARG" | sed 's/l$/c/'`
+	    if [ -f "$SRCFILE" ]; then
+	         cp "$SRCFILE" lex.yy.c
+	    fi
+	  ;;
+	esac
+    fi
+    if [ ! -f lex.yy.c ]; then
+	echo 'main() { return 0; }' >lex.yy.c
+    fi
+    ;;
+
+  makeinfo)
+    echo 1>&2 "\
+WARNING: \`$1' is missing on your system.  You should only need it if
+         you modified a \`.texi' or \`.texinfo' file, or any other file
+         indirectly affecting the aspect of the manual.  The spurious
+         call might also be the consequence of using a buggy \`make' (AIX,
+         DU, IRIX).  You might want to install the \`Texinfo' package or
+         the \`GNU make' package.  Grab either from any GNU archive site."
+    file=`echo "$*" | sed -n 's/.*-o \([^ ]*\).*/\1/p'`
+    if test -z "$file"; then
+      file=`echo "$*" | sed 's/.* \([^ ]*\) *$/\1/'`
+      file=`sed -n '/^@setfilename/ { s/.* \([^ ]*\) *$/\1/; p; q; }' $file`
+    fi
+    touch $file
+    ;;
+
+  *)
+    echo 1>&2 "\
+WARNING: \`$1' is needed, and you do not seem to have it handy on your
+         system.  You might have modified some files without having the
+         proper tools for further handling them.  Check the \`README' file,
+         it often tells you about the needed prerequirements for installing
+         this package.  You may also peek at any GNU archive site, in case
+         some other package would contain this missing \`$1' program."
+    exit 1
+    ;;
+esac
+
+exit 0
diff --git a/mkinstalldirs b/mkinstalldirs
new file mode 100755
index 0000000..d73a061
--- /dev/null
+++ b/mkinstalldirs
@@ -0,0 +1,40 @@
+#! /bin/sh
+# mkinstalldirs --- make directory hierarchy
+# Author: Noah Friedman <friedman@prep.ai.mit.edu>
+# Created: 1993-05-16
+# Public domain
+
+# $Id: mkinstalldirs,v 1.1 1998/10/08 14:23:56 jbj Exp $
+
+errstatus=0
+
+for file
+do
+   set fnord `echo ":$file" | sed -ne 's/^:\//#/;s/^://;s/\// /g;s/^#/\//;p'`
+   shift
+
+   pathcomp=
+   for d
+   do
+     pathcomp="$pathcomp$d"
+     case "$pathcomp" in
+       -* ) pathcomp=./$pathcomp ;;
+     esac
+
+     if test ! -d "$pathcomp"; then
+        echo "mkdir $pathcomp" 1>&2
+
+        mkdir "$pathcomp" || lasterr=$?
+
+        if test ! -d "$pathcomp"; then
+  	  errstatus=$lasterr
+        fi
+     fi
+
+     pathcomp="$pathcomp/"
+   done
+done
+
+exit $errstatus
+
+# mkinstalldirs ends here
-- 
Gitee


From f64a9619235ba8f06f191f7c1f1c785a948ef9e1 Mon Sep 17 00:00:00 2001
From: Jeff Johnson <n3npq@mac.com>
Date: Thu, 8 Oct 1998 16:03:06 +0000
Subject: [PATCH 073/667] Orphan.

---
 acconfig.h | 31 +++++++++++++++++++++++++++++++
 1 file changed, 31 insertions(+)
 create mode 100644 acconfig.h

diff --git a/acconfig.h b/acconfig.h
new file mode 100644
index 0000000..bc5b900
--- /dev/null
+++ b/acconfig.h
@@ -0,0 +1,31 @@
+/* acconfig.h
+   This file is in the public domain.
+
+   Descriptive text for the C preprocessor macros that
+   the distributed Autoconf macros can define.
+   No software package will use all of them; autoheader copies the ones
+   your configure.in uses into your configuration header file templates.
+
+   The entries are in sort -df order: alphabetical, case insensitive,
+   ignoring punctuation (such as underscores).  Although this order
+   can split up related entries, it makes it easier to check whether
+   a given entry is in the file.
+
+   Leave the following blank line there!!  Autoheader needs it.  */
+^L
+
+/* Define to the name of the distribution.  */
+#undef PACKAGE
+
+/* Define to the version of the distribution.  */
+#undef VERSION
+
+/* Define to 1 if ANSI function prototypes are usable.  */
+#undef PROTOTYPES
+
+^L
+/* Leave that blank line there!!  Autoheader needs it.
+   If you're adding to this file, keep in mind:
+   The entries are in sort -df order: alphabetical, case insensitive,
+   ignoring punctuation (such as underscores).  */
+
-- 
Gitee


From e56db20f6adbe770d2f80e742e8564b4ae05464d Mon Sep 17 00:00:00 2001
From: Jeff Johnson <n3npq@mac.com>
Date: Thu, 8 Oct 1998 18:51:48 +0000
Subject: [PATCH 074/667] Do "ln -s a a", not lazy "ln -s a".

---
 Makefile.in | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/Makefile.in b/Makefile.in
index c8a9036..6eb976c 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -94,8 +94,9 @@ COMPILE = $(CC) $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS)
 LINK = $(CC) $(CFLAGS) $(LDFLAGS) -o $@
 HEADERS =  $(noinst_HEADERS)
 
-DIST_COMMON =  README Makefile.am Makefile.in aclocal.m4 config.h.in \
-configure configure.in install-sh missing mkinstalldirs stamp-h.in
+DIST_COMMON =  README Makefile.am Makefile.in acconfig.h aclocal.m4 \
+config.h.in configure configure.in install-sh missing mkinstalldirs \
+stamp-h.in
 
 
 DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
@@ -134,7 +135,7 @@ stamp-h: $(srcdir)/config.h.in $(top_builddir)/config.status
 	     $(SHELL) ./config.status
 	@echo timestamp > stamp-h
 $(srcdir)/config.h.in: $(srcdir)/stamp-h.in
-$(srcdir)/stamp-h.in: $(top_srcdir)/configure.in $(ACLOCAL_M4) 
+$(srcdir)/stamp-h.in: $(top_srcdir)/configure.in $(ACLOCAL_M4) acconfig.h
 	cd $(top_srcdir) && $(AUTOHEADER)
 	@echo timestamp > $(srcdir)/stamp-h.in
 
-- 
Gitee


From 1676bcb2227dcae63ddefa18e6116366020d44b8 Mon Sep 17 00:00:00 2001
From: Jeff Johnson <n3npq@mac.com>
Date: Sun, 11 Oct 1998 15:20:09 +0000
Subject: [PATCH 075/667] permit rpm to be built in a sub-directory
 (--srcdir=DIR).

---
 Makefile.am | 2 +-
 Makefile.in | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index 4a93db4..bd1a4c8 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -2,7 +2,7 @@
 
 AUTOMAKE_OPTIONS = 1.3 foreign
 
-INCLUDES = -I..
+INCLUDES = -I$(top_srcdir)
 
 noinst_HEADERS = popt.h
 noinst_LIBRARIES = libpopt.a
diff --git a/Makefile.in b/Makefile.in
index 6eb976c..baadf0f 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -70,7 +70,7 @@ VERSION = @VERSION@
 
 AUTOMAKE_OPTIONS = 1.3 foreign
 
-INCLUDES = -I..
+INCLUDES = -I$(top_srcdir)
 
 noinst_HEADERS = popt.h
 noinst_LIBRARIES = libpopt.a
-- 
Gitee


From f7cc974f4d93d25c1915e63f4d95bdd22ce12abb Mon Sep 17 00:00:00 2001
From: Jeff Johnson <n3npq@mac.com>
Date: Sun, 11 Oct 1998 16:17:47 +0000
Subject: [PATCH 076/667] Sub-dir compilation on solaris.

---
 config.h.in | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/config.h.in b/config.h.in
index 21a4244..e5af0d4 100644
--- a/config.h.in
+++ b/config.h.in
@@ -1,5 +1,19 @@
 /* config.h.in.  Generated automatically from configure.in by autoheader.  */
 
+/* Avoid autoheader noise */
+#ifndef PACKAGE
+#undef PACKAGE
+#endif
+#ifndef VERSION
+#undef VERSION
+#endif
+#ifndef PROTOTYPES
+#undef PROTOTYPES
+#endif
+#ifndef _GNU_SOURCE
+#undef _GNU_SOURCE
+#endif
+
 /* Define if you have the ANSI C header files.  */
 #undef STDC_HEADERS
 
-- 
Gitee


From 0a6c1941d88fd877f035696f84cd08aa27c441e7 Mon Sep 17 00:00:00 2001
From: Erik Troan <ewt@redhat.com>
Date: Mon, 12 Oct 1998 18:25:56 +0000
Subject: [PATCH 077/667] fixed --help

---
 popthelp.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/popthelp.c b/popthelp.c
index 95f3b4b..101ecc7 100644
--- a/popthelp.c
+++ b/popthelp.c
@@ -10,9 +10,9 @@
 #include "popt.h"
 #include "poptint.h"
 
-static void displayArgs(poptContext con, int key, const char * arg, 
-			void * data) {
-    if (key == '?')
+static void displayArgs(poptContext con, struct poptOption * key, 
+			const char * arg, void * data) {
+    if (key->shortName== '?')
 	poptPrintHelp(con, stderr, 0);
     else
 	poptPrintUsage(con, stderr, 0);
-- 
Gitee


From 09414e5466cb66973619998d287f8cae8f2b996e Mon Sep 17 00:00:00 2001
From: Erik Troan <ewt@redhat.com>
Date: Tue, 13 Oct 1998 14:45:18 +0000
Subject: [PATCH 078/667] 1) added (unimplemented) POPT_CB_USE_INCLUDE_DATA and
 POPT_ARG_FLAG_* 2) added (and sued) POPT_ARG_MASK

---
 popt.h | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/popt.h b/popt.h
index bdedcea..f982da3 100644
--- a/popt.h
+++ b/popt.h
@@ -14,6 +14,8 @@
 					   set first in table; arg points 
 					   to callback, descrip points to 
 					   callback data to pass */
+#define POPT_ARG_MASK		0x0000FFFF
+#define POPT_ARGFLAG_MULTIPLE	0x80000000
 
 #define POPT_ERROR_NOARG	-10
 #define POPT_ERROR_BADOPT	-11
@@ -55,6 +57,7 @@ extern struct poptOption poptHelpOptions[];
 typedef struct poptContext_s * poptContext;
 typedef struct poptOption * poptOption;
 
+#define POPT_CB_USE_INCLUDE_DATA	((void *) -1)
 typedef void (*poptCallbackType)(poptContext con, 
 			         const struct poptOption * opt,
 				 const char * arg, void * data);
-- 
Gitee


From adcc51a5dbe5a9fa3c5a305bc4ff8a0f53274de0 Mon Sep 17 00:00:00 2001
From: Erik Troan <ewt@redhat.com>
Date: Tue, 13 Oct 1998 14:47:38 +0000
Subject: [PATCH 079/667] use POPT_ARG_MASK

---
 popt.c | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/popt.c b/popt.c
index 7678734..d54b823 100644
--- a/popt.c
+++ b/popt.c
@@ -213,11 +213,11 @@ static const struct poptOption * findOption(const struct poptOption * table,
     const struct poptOption * cb = NULL;
 
     while (opt->longName || opt->shortName || opt->arg) {
-	if (opt->argInfo == POPT_ARG_INCLUDE_TABLE) {
+	if ((opt->argInfo & POPT_ARG_MASK) == POPT_ARG_INCLUDE_TABLE) {
 	    opt2 = findOption(opt->arg, longName, shortName, callback, 
 			      callbackData);
 	    if (opt2) return opt2;
-	} else if (opt->argInfo == POPT_ARG_CALLBACK) {
+	} else if ((opt->argInfo & POPT_ARG_MASK) == POPT_ARG_CALLBACK) {
 	    cb = opt;
 	} else if (longName && opt->longName && 
 		   !strcmp(longName, opt->longName)) {
@@ -325,9 +325,9 @@ int poptGetNextOpt(poptContext con) {
 		con->os->nextCharArg = origOptString;
 	}
 
-	if (opt->arg && opt->argInfo == POPT_ARG_NONE) 
+	if (opt->arg && (opt->argInfo & POPT_ARG_MASK) == POPT_ARG_NONE) 
 	    *((int *)opt->arg) = 1;
-	else if (opt->argInfo != POPT_ARG_NONE) {
+	else if ((opt->argInfo & POPT_ARG_MASK) != POPT_ARG_NONE) {
 	    if (longArg) {
 		con->os->nextArg = longArg;
 	    } else if (con->os->nextCharArg) {
@@ -344,7 +344,7 @@ int poptGetNextOpt(poptContext con) {
 	    }
 
 	    if (opt->arg) {
-		switch (opt->argInfo) {
+		switch (opt->argInfo & POPT_ARG_MASK) {
 		  case POPT_ARG_STRING:
 		    *((char **) opt->arg) = con->os->nextArg;
 		    break;
@@ -357,7 +357,7 @@ int poptGetNextOpt(poptContext con) {
 
 		    if (aLong == LONG_MIN || aLong == LONG_MAX)
 			return POPT_ERROR_OVERFLOW;
-		    if (opt->argInfo == POPT_ARG_LONG) {
+		    if ((opt->argInfo & POPT_ARG_MASK) == POPT_ARG_LONG) {
 			*((long *) opt->arg) = aLong;
 		    } else {
 			if (aLong > INT_MAX || aLong < INT_MIN)
@@ -369,7 +369,7 @@ int poptGetNextOpt(poptContext con) {
 		  default:
 		    /* XXX I18N? */
 		    fprintf(stdout, "option type (%d) not implemented in popt\n",
-		      opt->argInfo);
+		      opt->argInfo & POPT_ARG_MASK);
 		    exit(1);
 		}
 	    }
@@ -394,7 +394,7 @@ int poptGetNextOpt(poptContext con) {
 	else 
 	    sprintf(con->finalArgv[i], "-%c", opt->shortName);
 
-	if (opt->arg && opt->argInfo != POPT_ARG_NONE) 
+	if (opt->arg && (opt->argInfo & POPT_ARG_MASK) != POPT_ARG_NONE) 
 	    con->finalArgv[con->finalArgvCount++] = strdup(con->os->nextArg);
     }
 
-- 
Gitee


From a3a65df428b1e54b07ddce55e6f9ac001cfd043d Mon Sep 17 00:00:00 2001
From: Erik Troan <ewt@redhat.com>
Date: Tue, 13 Oct 1998 14:52:13 +0000
Subject: [PATCH 080/667] used POPT_ARG_MASK

---
 popthelp.c | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/popthelp.c b/popthelp.c
index 101ecc7..5b46105 100644
--- a/popthelp.c
+++ b/popthelp.c
@@ -79,7 +79,7 @@ static int maxArgWidth(const struct poptOption * opt) {
     int this;
     
     while (opt->longName || opt->shortName || opt->arg) {
-	if (opt->argInfo == POPT_ARG_INCLUDE_TABLE) {
+	if ((opt->argInfo & POPT_ARG_MASK) == POPT_ARG_INCLUDE_TABLE) {
 	    this = maxArgWidth(opt->arg);
 	} else {
 	    this = opt->shortName ? 2 : 0;
@@ -113,7 +113,7 @@ static void singleTableHelp(FILE * f, const struct poptOption * table,
 
     opt = table;
     while (opt->longName || opt->shortName || opt->arg) {
-	if (opt->argInfo == POPT_ARG_INCLUDE_TABLE) {
+	if ((opt->argInfo & POPT_ARG_MASK) == POPT_ARG_INCLUDE_TABLE) {
 	    if (opt->descrip)
 		fprintf(f, "\n%s\n", opt->descrip);
 	    singleTableHelp(f, opt->arg, left);
@@ -157,7 +157,8 @@ static int singleOptionUsage(FILE * f, int cursor,
     const char * item = shortStr;
 
     if (opt->shortName) {
-	if (!opt->argInfo) return cursor;	/* we did these already */
+	if (!(opt->argInfo & POPT_ARG_MASK)) 
+	    return cursor;	/* we did these already */
 	len++;
 	*shortStr = opt->shortName;
 	shortStr[1] = '\0';
@@ -190,7 +191,7 @@ int singleTableUsage(FILE * f, int cursor, const struct poptOption * table) {
     while (opt->longName || opt->shortName || opt->arg) {
 	if (opt->longName || opt->shortName)
 	    cursor = singleOptionUsage(f, cursor, opt);
-	else if (opt->argInfo == POPT_ARG_INCLUDE_TABLE) 
+	else if ((opt->argInfo & POPT_ARG_MASK) == POPT_ARG_INCLUDE_TABLE) 
 	    cursor = singleTableUsage(f, cursor, opt->arg);
 	opt++;
     }
@@ -209,9 +210,9 @@ static int showShortOptions(const struct poptOption * opt, FILE * f,
     }
 
     while (opt->longName || opt->shortName || opt->arg) {
-	if (opt->shortName && !opt->argInfo)
+	if (opt->shortName && !(opt->argInfo & POPT_ARG_MASK))
 	    str[strlen(str)] = opt->shortName;
-	else if (opt->argInfo == POPT_ARG_INCLUDE_TABLE)
+	else if ((opt->argInfo & POPT_ARG_MASK) == POPT_ARG_INCLUDE_TABLE)
 	    showShortOptions(opt->arg, f, str);
 
 	opt++;
-- 
Gitee


From 7761bfa126c4e4e0baeeccf92fdd26479a02cdb6 Mon Sep 17 00:00:00 2001
From: Erik Troan <ewt@redhat.com>
Date: Tue, 13 Oct 1998 15:04:40 +0000
Subject: [PATCH 081/667] test1.c

---
 popthelp.c | 27 +++++++++++++++++++--------
 test1.c    |  5 +++--
 2 files changed, 22 insertions(+), 10 deletions(-)

diff --git a/popthelp.c b/popthelp.c
index 5b46105..36fcfdc 100644
--- a/popthelp.c
+++ b/popthelp.c
@@ -26,6 +26,13 @@ struct poptOption poptHelpOptions[] = {
     { NULL, '\0', 0, NULL, 0 }
 } ;
 
+static const char * getArgDescrip(const struct poptOption * opt) {
+    if (!(opt->argInfo & POPT_ARG_MASK)) return NULL;
+
+    if (opt->argDescrip) return opt->argDescrip;
+    return "ARG";
+}
+
 static void singleOptionHelp(FILE * f, int maxLeftCol, 
 			     const struct poptOption * opt) {
     int indentLength = maxLeftCol + 5;
@@ -35,6 +42,7 @@ static void singleOptionHelp(FILE * f, int maxLeftCol,
     const char * ch;
     char format[10];
     char * left = alloca(maxLeftCol + 1);
+    const char * argDescrip = getArgDescrip(opt);
 
     *left = '\0';
     if (opt->longName && opt->shortName)
@@ -44,9 +52,9 @@ static void singleOptionHelp(FILE * f, int maxLeftCol,
     else if (opt->longName)
 	sprintf(left, "--%s", opt->longName);
     if (!*left) return ;
-    if (opt->argDescrip) {
+    if (argDescrip) {
 	strcat(left, "=");
-	strcat(left, opt->argDescrip);
+	strcat(left, argDescrip);
     }
 
     if (help)
@@ -77,6 +85,7 @@ static void singleOptionHelp(FILE * f, int maxLeftCol,
 static int maxArgWidth(const struct poptOption * opt) {
     int max = 0;
     int this;
+    const char * s;
     
     while (opt->longName || opt->shortName || opt->arg) {
 	if ((opt->argInfo & POPT_ARG_MASK) == POPT_ARG_INCLUDE_TABLE) {
@@ -88,8 +97,9 @@ static int maxArgWidth(const struct poptOption * opt) {
 		this += strlen(opt->longName) + 2;
 	    }
 
-	    if (opt->argDescrip)
-		this += strlen(opt->argDescrip) + 1;
+	    s = getArgDescrip(opt);
+	    if (s)
+		this += strlen(s) + 1;
 	}
 
 	if (this > max) max = this;
@@ -155,6 +165,7 @@ static int singleOptionUsage(FILE * f, int cursor,
     int len = 3;
     char shortStr[2];
     const char * item = shortStr;
+    const char * argDescrip = getArgDescrip(opt);
 
     if (opt->shortName) {
 	if (!(opt->argInfo & POPT_ARG_MASK)) 
@@ -169,8 +180,8 @@ static int singleOptionUsage(FILE * f, int cursor,
 
     if (len == 3) return cursor;
 
-    if (opt->argDescrip) 
-	len += strlen(opt->argDescrip) + 1;
+    if (argDescrip) 
+	len += strlen(argDescrip) + 1;
 
     if ((cursor + len) > 79) {
 	fprintf(f, "\n       ");
@@ -178,8 +189,8 @@ static int singleOptionUsage(FILE * f, int cursor,
     } 
 
     fprintf(f, " [-%s%s%s%s]", opt->shortName ? "" : "-", item,
-	    opt->argDescrip ? "=" : "", 
-	    opt->argDescrip ? opt->argDescrip : "");
+	    argDescrip ? (opt->shortName ? " " : "=") : "",
+	    argDescrip ? argDescrip : "");
 
     return cursor + len + 1;
 }
diff --git a/test1.c b/test1.c
index 3630f78..b554b67 100644
--- a/test1.c
+++ b/test1.c
@@ -31,10 +31,11 @@ int main(int argc, char ** argv) {
     struct poptOption options[] = {
 	{ "arg1", '\0', 0, &arg1, 0, "First argument with a really long" 
 	    " description. After all, we have to test argument help"
-	    " wrapping somehow, right?", "ARG1"},
+	    " wrapping somehow, right?", NULL },
 	{ "arg2", '2', POPT_ARG_STRING, &arg2, 0, "Another argument", "ARG" },
 	{ "arg3", '3', POPT_ARG_INT, &arg3, 0, "A third argument", "ANARG" },
-	{ "unused", '\0', 0, NULL, 0, "Unused option for help testing" },
+	{ "unused", '\0', POPT_ARG_STRING, NULL, 0, 
+	    "Unused option for help testing", "UNUSED" },
 	{ NULL, '\0', POPT_ARG_INCLUDE_TABLE, &moreArgs, 0, NULL },
 	{ NULL, '\0', POPT_ARG_INCLUDE_TABLE, &callbackArgs, 0, "Callback arguments" },
 	POPT_AUTOHELP
-- 
Gitee


From 80ed26f3c1e32639ef61ea2ea363ff53d855d8ed Mon Sep 17 00:00:00 2001
From: Erik Troan <ewt@redhat.com>
Date: Fri, 16 Oct 1998 19:05:12 +0000
Subject: [PATCH 082/667] added proper licensing info

---
 COPYING      | 22 ++++++++++++++++++++++
 acconfig.h   |  4 ++++
 findme.c     |  4 ++++
 findme.h     |  4 ++++
 popt.c       |  4 ++++
 popt.h       |  4 ++++
 poptconfig.c |  4 ++++
 popthelp.c   |  4 ++++
 poptint.h    |  4 ++++
 poptparse.c  |  4 ++++
 test1.c      |  4 ++++
 11 files changed, 62 insertions(+)
 create mode 100644 COPYING

diff --git a/COPYING b/COPYING
new file mode 100644
index 0000000..b4c7ca8
--- /dev/null
+++ b/COPYING
@@ -0,0 +1,22 @@
+Copyright (c) 1998  Red Hat Software
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
+X CONSORTIUM BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
+AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+Except as contained in this notice, the name of the X Consortium shall not be
+used in advertising or otherwise to promote the sale, use or other dealings
+in this Software without prior written authorization from the X Consortium.
diff --git a/acconfig.h b/acconfig.h
index bc5b900..3e2b29f 100644
--- a/acconfig.h
+++ b/acconfig.h
@@ -1,3 +1,7 @@
+/* (C) 1998 Red Hat Software, Inc. -- Licensing details are in the COPYING
+   file accompanying popt source distributions, available from 
+   ftp://ftp.redhat.com/pub/code/popt */
+
 /* acconfig.h
    This file is in the public domain.
 
diff --git a/findme.c b/findme.c
index 1086b28..1cda62c 100644
--- a/findme.c
+++ b/findme.c
@@ -1,3 +1,7 @@
+/* (C) 1998 Red Hat Software, Inc. -- Licensing details are in the COPYING
+   file accompanying popt source distributions, available from 
+   ftp://ftp.redhat.com/pub/code/popt */
+
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
diff --git a/findme.h b/findme.h
index b4f790a..fdd01d5 100644
--- a/findme.h
+++ b/findme.h
@@ -1,3 +1,7 @@
+/* (C) 1998 Red Hat Software, Inc. -- Licensing details are in the COPYING
+   file accompanying popt source distributions, available from 
+   ftp://ftp.redhat.com/pub/code/popt */
+
 #ifndef H_FINDME
 #define H_FINDME
 
diff --git a/popt.c b/popt.c
index d54b823..a836710 100644
--- a/popt.c
+++ b/popt.c
@@ -1,3 +1,7 @@
+/* (C) 1998 Red Hat Software, Inc. -- Licensing details are in the COPYING
+   file accompanying popt source distributions, available from 
+   ftp://ftp.redhat.com/pub/code/popt */
+
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
diff --git a/popt.h b/popt.h
index f982da3..aee7ccb 100644
--- a/popt.h
+++ b/popt.h
@@ -1,3 +1,7 @@
+/* (C) 1998 Red Hat Software, Inc. -- Licensing details are in the COPYING
+   file accompanying popt source distributions, available from 
+   ftp://ftp.redhat.com/pub/code/popt */
+
 #ifndef H_POPT
 #define H_POPT
 
diff --git a/poptconfig.c b/poptconfig.c
index 0a81ca4..8f2656d 100644
--- a/poptconfig.c
+++ b/poptconfig.c
@@ -1,3 +1,7 @@
+/* (C) 1998 Red Hat Software, Inc. -- Licensing details are in the COPYING
+   file accompanying popt source distributions, available from 
+   ftp://ftp.redhat.com/pub/code/popt */
+
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
diff --git a/popthelp.c b/popthelp.c
index 36fcfdc..17f110e 100644
--- a/popthelp.c
+++ b/popthelp.c
@@ -1,3 +1,7 @@
+/* (C) 1998 Red Hat Software, Inc. -- Licensing details are in the COPYING
+   file accompanying popt source distributions, available from 
+   ftp://ftp.redhat.com/pub/code/popt */
+
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
diff --git a/poptint.h b/poptint.h
index f7b40d6..195039a 100644
--- a/poptint.h
+++ b/poptint.h
@@ -1,3 +1,7 @@
+/* (C) 1998 Red Hat Software, Inc. -- Licensing details are in the COPYING
+   file accompanying popt source distributions, available from 
+   ftp://ftp.redhat.com/pub/code/popt */
+
 #ifndef H_POPTINT
 #define H_POPTINT
 
diff --git a/poptparse.c b/poptparse.c
index aea784b..cd97ec6 100644
--- a/poptparse.c
+++ b/poptparse.c
@@ -1,3 +1,7 @@
+/* (C) 1998 Red Hat Software, Inc. -- Licensing details are in the COPYING
+   file accompanying popt source distributions, available from 
+   ftp://ftp.redhat.com/pub/code/popt */
+
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
diff --git a/test1.c b/test1.c
index b554b67..91624ad 100644
--- a/test1.c
+++ b/test1.c
@@ -1,3 +1,7 @@
+/* (C) 1998 Red Hat Software, Inc. -- Licensing details are in the COPYING
+   file accompanying popt source distributions, available from 
+   ftp://ftp.redhat.com/pub/code/popt */
+
 #include <stdio.h>
 #include <stdlib.h>
 
-- 
Gitee


From d390ea775ce201e017f2abe0b098f65bbd53f720 Mon Sep 17 00:00:00 2001
From: Jeff Johnson <n3npq@mac.com>
Date: Tue, 20 Oct 1998 11:54:25 +0000
Subject: [PATCH 083/667] First attempt at "make check".

---
 config.h.in | 14 --------------
 1 file changed, 14 deletions(-)

diff --git a/config.h.in b/config.h.in
index e5af0d4..21a4244 100644
--- a/config.h.in
+++ b/config.h.in
@@ -1,19 +1,5 @@
 /* config.h.in.  Generated automatically from configure.in by autoheader.  */
 
-/* Avoid autoheader noise */
-#ifndef PACKAGE
-#undef PACKAGE
-#endif
-#ifndef VERSION
-#undef VERSION
-#endif
-#ifndef PROTOTYPES
-#undef PROTOTYPES
-#endif
-#ifndef _GNU_SOURCE
-#undef _GNU_SOURCE
-#endif
-
 /* Define if you have the ANSI C header files.  */
 #undef STDC_HEADERS
 
-- 
Gitee


From 90d9562db99096cf0bf2e9c7cf2a58fc5c340e11 Mon Sep 17 00:00:00 2001
From: Erik Troan <ewt@redhat.com>
Date: Wed, 21 Oct 1998 20:31:23 +0000
Subject: [PATCH 084/667] added POPT_ARGFLAG_ONEDASH

---
 popt.c    | 27 +++++++++++++++++++--------
 popt.h    |  2 +-
 test1.c   |  5 +++++
 testit.sh |  2 ++
 4 files changed, 27 insertions(+), 9 deletions(-)

diff --git a/popt.c b/popt.c
index a836710..be9a181 100644
--- a/popt.c
+++ b/popt.c
@@ -211,7 +211,8 @@ static const struct poptOption * findOption(const struct poptOption * table,
 					    const char * longName,
 					    const char shortName,
 					    poptCallbackType * callback,
-					    void ** callbackData) {
+					    void ** callbackData,
+					    int singleDash) {
     const struct poptOption * opt = table;
     const struct poptOption * opt2;
     const struct poptOption * cb = NULL;
@@ -219,11 +220,12 @@ static const struct poptOption * findOption(const struct poptOption * table,
     while (opt->longName || opt->shortName || opt->arg) {
 	if ((opt->argInfo & POPT_ARG_MASK) == POPT_ARG_INCLUDE_TABLE) {
 	    opt2 = findOption(opt->arg, longName, shortName, callback, 
-			      callbackData);
+			      callbackData, singleDash);
 	    if (opt2) return opt2;
 	} else if ((opt->argInfo & POPT_ARG_MASK) == POPT_ARG_CALLBACK) {
 	    cb = opt;
 	} else if (longName && opt->longName && 
+		   (!singleDash || (opt->argInfo & POPT_ARGFLAG_ONEDASH)) &&
 		   !strcmp(longName, opt->longName)) {
 	    break;
 	} else if (shortName && shortName == opt->shortName) {
@@ -255,6 +257,7 @@ int poptGetNextOpt(poptContext con) {
     int i;
     poptCallbackType cb;
     void * cbData;
+    int singleDash;
 
     while (!done) {
 	while (!con->os->nextCharArg && con->os->next == con->os->argc 
@@ -287,8 +290,12 @@ int poptGetNextOpt(poptContext con) {
 	    if (optString[1] == '-' && !optString[2]) {
 		con->restLeftover = 1;
 		continue;
-	    } else if (optString[1] == '-') {
-		optString += 2;
+	    } else {
+		optString++;
+		if (*optString == '-')
+		    singleDash = 0, optString++;
+		else
+		    singleDash = 1;
 
 		if (handleAlias(con, optString, '\0', NULL))
 		    continue;
@@ -302,9 +309,12 @@ int poptGetNextOpt(poptContext con) {
 		    *chptr = '\0';
 		}
 
-		opt = findOption(con->options, optString, '\0', &cb, &cbData);
-		if (!opt) return POPT_ERROR_BADOPT;
-	    } else 
+		opt = findOption(con->options, optString, '\0', &cb, &cbData,
+				 singleDash);
+		if (!opt && !singleDash) return POPT_ERROR_BADOPT;
+	    }
+
+	    if (!opt)
 		con->os->nextCharArg = origOptString + 1;
 	}
 
@@ -321,7 +331,8 @@ int poptGetNextOpt(poptContext con) {
 	    if (handleExec(con, NULL, *origOptString))
 		continue;
 
-	    opt = findOption(con->options, NULL, *origOptString, &cb, &cbData);
+	    opt = findOption(con->options, NULL, *origOptString, &cb, 
+			     &cbData, 0);
 	    if (!opt) return POPT_ERROR_BADOPT;
 
 	    origOptString++;
diff --git a/popt.h b/popt.h
index aee7ccb..64c7b80 100644
--- a/popt.h
+++ b/popt.h
@@ -19,7 +19,7 @@
 					   to callback, descrip points to 
 					   callback data to pass */
 #define POPT_ARG_MASK		0x0000FFFF
-#define POPT_ARGFLAG_MULTIPLE	0x80000000
+#define POPT_ARGFLAG_ONEDASH	0x80000000  /* allow -longoption */
 
 #define POPT_ERROR_NOARG	-10
 #define POPT_ERROR_BADOPT	-11
diff --git a/test1.c b/test1.c
index 91624ad..8f53723 100644
--- a/test1.c
+++ b/test1.c
@@ -22,6 +22,7 @@ int main(int argc, char ** argv) {
     int inc = 0;
     int help = 0;
     int usage = 0;
+    int shortopt = 0;
     struct poptOption callbackArgs[] = {
 	{ NULL, '\0', POPT_ARG_CALLBACK, option_callback, 0, "sampledata" },
 	{ "cb", 'c', POPT_ARG_STRING, NULL, 'c', "Test argument callbacks" },
@@ -38,6 +39,8 @@ int main(int argc, char ** argv) {
 	    " wrapping somehow, right?", NULL },
 	{ "arg2", '2', POPT_ARG_STRING, &arg2, 0, "Another argument", "ARG" },
 	{ "arg3", '3', POPT_ARG_INT, &arg3, 0, "A third argument", "ANARG" },
+	{ "shortoption", '\0', POPT_ARGFLAG_ONEDASH, &shortopt, 0,
+		"Needs a single -", NULL },
 	{ "unused", '\0', POPT_ARG_STRING, NULL, 0, 
 	    "Unused option for help testing", "UNUSED" },
 	{ NULL, '\0', POPT_ARG_INCLUDE_TABLE, &moreArgs, 0, NULL },
@@ -70,6 +73,8 @@ int main(int argc, char ** argv) {
 	fprintf(stdout, " arg3: %d", arg3);
     if (inc)
 	fprintf(stdout, " inc: %d", inc);
+    if (shortopt)
+	fprintf(stdout, " short: %d", shortopt);
 
     rest = poptGetArgs(optCon);
     if (rest) {
diff --git a/testit.sh b/testit.sh
index 5bdedf3..a231df8 100755
--- a/testit.sh
+++ b/testit.sh
@@ -39,6 +39,8 @@ run test1 "test1 - 20" "./test1 ; --arg1" --echo-args --arg1
 run test1 "test1 - 21" "./test1 ; --arg2 something" -T something -e
 run test1 "test1 - 22" "./test1 ; --arg2 something -- more args" -T something -a more args
 run test1 "test1 - 23" "./test1 ; --echo-args -a" --echo-args -e -a
+run test1 "test1 - 24" "arg1: 0 arg2: (none) short: 1" -shortoption
+run test1 "test1 - 25" "arg1: 0 arg2: (none) short: 1" --shortoption
 
 echo ""
 echo "Passed."
-- 
Gitee


From a3213897620b0cac8dddaad179fb7bb39fc40f0e Mon Sep 17 00:00:00 2001
From: Erik Troan <ewt@redhat.com>
Date: Wed, 21 Oct 1998 20:34:05 +0000
Subject: [PATCH 085/667] added poptGetInvocationName()

---
 popt.c | 4 ++++
 popt.h | 1 +
 2 files changed, 5 insertions(+)

diff --git a/popt.c b/popt.c
index be9a181..22d5e08 100644
--- a/popt.c
+++ b/popt.c
@@ -543,3 +543,7 @@ int poptStuffArgs(poptContext con, char ** argv) {
 
     return 0;
 }
+
+const char * poptGetInvocationName(poptContext con) {
+    return con->os->argv[0];
+}
diff --git a/popt.h b/popt.h
index 64c7b80..a759f21 100644
--- a/popt.h
+++ b/popt.h
@@ -95,5 +95,6 @@ void poptSetExecPath(poptContext con, const char * path, int allowAbsolute);
 void poptPrintHelp(poptContext con, FILE * f, int flags);
 void poptPrintUsage(poptContext con, FILE * f, int flags);
 void poptSetOtherOptionHelp(poptContext con, const char * text);
+const char * poptGetInvocationName(poptContext con);
 
 #endif
-- 
Gitee


From ec772c0e82e088e6f641fe7860437c7174293195 Mon Sep 17 00:00:00 2001
From: Erik Troan <ewt@redhat.com>
Date: Wed, 21 Oct 1998 21:44:18 +0000
Subject: [PATCH 086/667] implemented POPT_ARGFLAG_DOC_HIDDEN, POPT_CBFLAG_PRE,
 POPT_CBFLAG_POST

---
 popt.3     | 19 +++++++++++++++----
 popt.c     | 24 +++++++++++++++++++++++-
 popt.h     |  7 +++++++
 popthelp.c | 15 +++++++++------
 test1.c    |  5 ++++-
 5 files changed, 58 insertions(+), 12 deletions(-)

diff --git a/popt.3 b/popt.3
index de119ab..e59a299 100644
--- a/popt.3
+++ b/popt.3
@@ -68,10 +68,12 @@ consists of a - character followed by a single alphanumeric character.
 A 
 .BR "long option" ,
 common in GNU utilities, consists of two - characters followed by a
-string made up of letters, numbers and hyphens.  Either type of option
-may be followed by an argument.  A space separates a short option from
-its arguments; either a space or an = separates a long option from an
-argument. 
+string made up of letters, numbers and hyphens.  Long options are
+optionally allowed to begin with a single -, primarily to allow command-line
+compatibility between popt applications and X toolkit applications.
+Either type of option may be followed by an argument.  A space separates a 
+short option from its arguments; either a space or an = separates a long 
+option from an argument. 
 .sp
 The popt library is highly portable and should work on any POSIX 
 platform.  The latest version is always available from: 
@@ -125,6 +127,11 @@ The rest of the valid values are shown in the following table:
 .BR POPT_ARG_LONG "   A long integer is expected       long"
 .sp
 .fi
+If \fIargInfo\fR value is logically or'd with \fBPOPT_ARGFLAG_ONEDASH\fR,
+the long argument may be given with a single - instead of two. For example,
+if \fB--longopt\fR is an option with \fBPOPT_ARGFLAG_ONEDASH\fR, is
+specified, \fB-longopt\fR is accepted as well.
+.sp
 .RI "The next element, " arg ", allows popt to automatically update "
 .RI "program variables when the option is used. If " arg " is " 
 .BR NULL ", it is ignored and popt takes no special action. " 
@@ -346,6 +353,10 @@ without modifying the list.
 All the leftover arguments are returned in a manner identical to 
 .IR argv ".  The final element in the returned array points to "
 .BR NULL ", indicating the end of the arguments.
+.sp
+.SS "5. AUTOMATIC HELP MESSAGES"
+The \fBpopt\fR library can automatically generate help messages which
+describe the options a program accepts. 
 .PP 
 .SH "ERROR HANDLING"
 All of the popt functions that can return errors return integers. 
diff --git a/popt.c b/popt.c
index 22d5e08..ec29c5f 100644
--- a/popt.c
+++ b/popt.c
@@ -41,6 +41,25 @@ void poptSetExecPath(poptContext con, const char * path, int allowAbsolute) {
     con->execAbsolute = allowAbsolute;
 }
 
+static void invokeCallbacks(poptContext con, const struct poptOption * table,
+			    int post) {
+    const struct poptOption * opt = table;
+    poptCallbackType cb;
+    
+    while (opt->longName || opt->shortName || opt->arg) {
+	if ((opt->argInfo & POPT_ARG_MASK) == POPT_ARG_INCLUDE_TABLE) {
+	    invokeCallbacks(con, opt->arg, post);
+	} else if (((opt->argInfo & POPT_ARG_MASK) == POPT_ARG_CALLBACK) &&
+		   ((!post && (opt->argInfo & POPT_CBFLAG_PRE)) ||
+		    ( post && (opt->argInfo & POPT_CBFLAG_POST)))) {
+	    cb = opt->arg;
+	    cb(con, post ? POPT_CALLBACK_REASON_POST : POPT_CALLBACK_REASON_PRE,
+	       NULL, NULL, opt->descrip);
+	}
+	opt++;
+    }
+}
+
 poptContext poptGetContext(char * name, int argc, char ** argv, 
 			   const struct poptOption * options, int flags) {
     poptContext con = malloc(sizeof(*con));
@@ -67,6 +86,8 @@ poptContext poptGetContext(char * name, int argc, char ** argv,
     if (name)
 	con->appName = strcpy(malloc(strlen(name) + 1), name);
 
+    invokeCallbacks(con, con->options, 0);
+
     return con;
 }
 
@@ -264,6 +285,7 @@ int poptGetNextOpt(poptContext con) {
 		&& con->os > con->optionStack)
 	    con->os--;
 	if (!con->os->nextCharArg && con->os->next == con->os->argc) {
+	    invokeCallbacks(con, con->options, 1);
 	    if (con->doExec) execCommand(con);
 	    return -1;
 	}
@@ -391,7 +413,7 @@ int poptGetNextOpt(poptContext con) {
 	}
 
 	if (cb)
-	    cb(con, opt, con->os->nextArg, cbData);
+	    cb(con, POPT_CALLBACK_REASON_OPTION, opt, con->os->nextArg, cbData);
 	else if (opt->val) 
 	    done = 1;
 
diff --git a/popt.h b/popt.h
index a759f21..7f953ac 100644
--- a/popt.h
+++ b/popt.h
@@ -20,6 +20,9 @@
 					   callback data to pass */
 #define POPT_ARG_MASK		0x0000FFFF
 #define POPT_ARGFLAG_ONEDASH	0x80000000  /* allow -longoption */
+#define POPT_ARGFLAG_DOC_HIDDEN 0x40000000  /* don't show in help/usage */
+#define POPT_CBFLAG_PRE		0x80000000  /* call the callback before parse */
+#define POPT_CBFLAG_POST	0x40000000  /* call the callback after parse */
 
 #define POPT_ERROR_NOARG	-10
 #define POPT_ERROR_BADOPT	-11
@@ -62,7 +65,11 @@ typedef struct poptContext_s * poptContext;
 typedef struct poptOption * poptOption;
 
 #define POPT_CB_USE_INCLUDE_DATA	((void *) -1)
+enum poptCallbackReason { POPT_CALLBACK_REASON_PRE, 
+			  POPT_CALLBACK_REASON_POST,
+			  POPT_CALLBACK_REASON_OPTION };
 typedef void (*poptCallbackType)(poptContext con, 
+				 enum poptCallbackReason reason,
 			         const struct poptOption * opt,
 				 const char * arg, void * data);
 
diff --git a/popthelp.c b/popthelp.c
index 17f110e..df5ed26 100644
--- a/popthelp.c
+++ b/popthelp.c
@@ -14,7 +14,8 @@
 #include "popt.h"
 #include "poptint.h"
 
-static void displayArgs(poptContext con, struct poptOption * key, 
+static void displayArgs(poptContext con, enum poptCallbackReason foo, 
+			struct poptOption * key, 
 			const char * arg, void * data) {
     if (key->shortName== '?')
 	poptPrintHelp(con, stderr, 0);
@@ -94,7 +95,8 @@ static int maxArgWidth(const struct poptOption * opt) {
     while (opt->longName || opt->shortName || opt->arg) {
 	if ((opt->argInfo & POPT_ARG_MASK) == POPT_ARG_INCLUDE_TABLE) {
 	    this = maxArgWidth(opt->arg);
-	} else {
+	    if (this > max) max = this;
+	} else if (!(opt->argInfo & POPT_ARGFLAG_DOC_HIDDEN)) {
 	    this = opt->shortName ? 2 : 0;
 	    if (opt->longName) {
 		if (this) this += 2;
@@ -104,10 +106,9 @@ static int maxArgWidth(const struct poptOption * opt) {
 	    s = getArgDescrip(opt);
 	    if (s)
 		this += strlen(s) + 1;
+	    if (this > max) max = this;
 	}
 
-	if (this > max) max = this;
-
 	opt++;
     }
     
@@ -120,7 +121,8 @@ static void singleTableHelp(FILE * f, const struct poptOption * table,
 
     opt = table;
     while (opt->longName || opt->shortName || opt->arg) {
-	if (opt->longName || opt->shortName)
+	if ((opt->longName || opt->shortName) && 
+	    !(opt->argInfo & POPT_ARGFLAG_DOC_HIDDEN))
 	    singleOptionHelp(f, left, opt);
 	opt++;
     }
@@ -204,7 +206,8 @@ int singleTableUsage(FILE * f, int cursor, const struct poptOption * table) {
     
     opt = table;
     while (opt->longName || opt->shortName || opt->arg) {
-	if (opt->longName || opt->shortName)
+	if ((opt->longName || opt->shortName) && 
+	    !(opt->argInfo & POPT_ARGFLAG_DOC_HIDDEN))
 	    cursor = singleOptionUsage(f, cursor, opt);
 	else if ((opt->argInfo & POPT_ARG_MASK) == POPT_ARG_INCLUDE_TABLE) 
 	    cursor = singleTableUsage(f, cursor, opt->arg);
diff --git a/test1.c b/test1.c
index 8f53723..cdda82b 100644
--- a/test1.c
+++ b/test1.c
@@ -7,7 +7,8 @@
 
 #include "popt.h"
 
-void option_callback(poptContext con, const struct poptOption * opt, 
+void option_callback(poptContext con, enum poptCallbackReason reason,
+		     const struct poptOption * opt, 
 		     char * arg, void * data) {
     fprintf(stdout, "callback: %c %s %s ", opt->val, (char *) data, arg);    
 }
@@ -41,6 +42,8 @@ int main(int argc, char ** argv) {
 	{ "arg3", '3', POPT_ARG_INT, &arg3, 0, "A third argument", "ANARG" },
 	{ "shortoption", '\0', POPT_ARGFLAG_ONEDASH, &shortopt, 0,
 		"Needs a single -", NULL },
+	{ "hidden", '\0', POPT_ARG_STRING | POPT_ARGFLAG_DOC_HIDDEN, NULL, 0, 
+		"This shouldn't show up", NULL },
 	{ "unused", '\0', POPT_ARG_STRING, NULL, 0, 
 	    "Unused option for help testing", "UNUSED" },
 	{ NULL, '\0', POPT_ARG_INCLUDE_TABLE, &moreArgs, 0, NULL },
-- 
Gitee


From 2735263fb7edbfde11492aa7e507e3dd10bd4b55 Mon Sep 17 00:00:00 2001
From: Erik Troan <ewt@redhat.com>
Date: Thu, 22 Oct 1998 16:03:38 +0000
Subject: [PATCH 087/667] added ifo on help functions

---
 popt.3 | 26 ++++++++++++++++++++++++--
 1 file changed, 24 insertions(+), 2 deletions(-)

diff --git a/popt.3 b/popt.3
index e59a299..eaf6c40 100644
--- a/popt.3
+++ b/popt.3
@@ -356,8 +356,30 @@ All the leftover arguments are returned in a manner identical to
 .sp
 .SS "5. AUTOMATIC HELP MESSAGES"
 The \fBpopt\fR library can automatically generate help messages which
-describe the options a program accepts. 
-.PP 
+describe the options a program accepts. There are two types of help
+messages which can be generated. Usage messages are a short messages
+which lists valid options, but does not describe them. Help messages
+describe each option on one (or more) lines, resulting in a longer, but
+more useful, message. Whenever automatic help messages are used, the
+\fBdescrip\fR and \fBargDescrip\fR fields \fBstruct poptOption\fR members
+should be filled in for each option.
+.sp
+The \fBPOPT_AUTOHELP\fR macro makes it easy to add \fB--usage\fR and
+\fB--help\fR messages to your program, and is described in part 1
+of this man page. If more control is needed over your help messages,
+the following two functions are available:
+.sp
+.nf
+.B #include <popt.h>
+.BI "void poptPrintHelp(poptContext " con ", FILE * " f ", int " flags ");
+.BI "void poptPrintUsage(poptContext " con ", FILE * " f ", int " flags ");
+.fi
+.sp
+\fBpoptPrintHelp()\fR displays the standard help message to the stdio file
+descriptor f, while \fBpoptPrintUsage()\fR displays the shorter usage
+message. Both functions currently ignore the \fBflags\fR argument; it is
+there to allow future changes.
+.sp
 .SH "ERROR HANDLING"
 All of the popt functions that can return errors return integers. 
 When an error occurs, a negative error code is returned. The 
-- 
Gitee


From 9554fdca730c545a7f9d2abbc7759f40782d399e Mon Sep 17 00:00:00 2001
From: Erik Troan <ewt@redhat.com>
Date: Thu, 22 Oct 1998 16:03:47 +0000
Subject: [PATCH 088/667] *** empty log message ***

---
 CHANGES | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/CHANGES b/CHANGES
index 04ae84c..627f921 100644
--- a/CHANGES
+++ b/CHANGES
@@ -6,6 +6,12 @@
 	- added support for exec
 	- removed support for *_POPT_ALIASES env variable -- it was a bad
 	  idea
+	- reorganized into multiple source files
+	- added automatic help generation, POPT_AUTOHELP
+	- added table callbacks
+	- added table inclusion
+	- updated man page for new features
+	- added test scripts
 
 1.0 -> 1.1
 	- moved to autoconf (Fred Fish)
-- 
Gitee


From 8f6191abec43ea26ad5df2e550bae8ced50d29f1 Mon Sep 17 00:00:00 2001
From: Jeff Johnson <n3npq@mac.com>
Date: Thu, 22 Oct 1998 18:06:35 +0000
Subject: [PATCH 089/667] Standalone popt with automake.

---
 Makefile.in | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Makefile.in b/Makefile.in
index baadf0f..bb74553 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -94,8 +94,8 @@ COMPILE = $(CC) $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS)
 LINK = $(CC) $(CFLAGS) $(LDFLAGS) -o $@
 HEADERS =  $(noinst_HEADERS)
 
-DIST_COMMON =  README Makefile.am Makefile.in acconfig.h aclocal.m4 \
-config.h.in configure configure.in install-sh missing mkinstalldirs \
+DIST_COMMON =  README COPYING Makefile.am Makefile.in acconfig.h \
+aclocal.m4 config.h.in configure.in install-sh missing mkinstalldirs \
 stamp-h.in
 
 
-- 
Gitee


From 40bc92fcc15669c58ba25fb3c59715137827ac40 Mon Sep 17 00:00:00 2001
From: Erik Troan <ewt@redhat.com>
Date: Thu, 22 Oct 1998 18:32:50 +0000
Subject: [PATCH 090/667] added i18n support

---
 Makefile.in  | 345 ---------------------------------------------------
 config.h.in  |   9 ++
 configure.in |   4 +-
 popt.c       |  19 ++-
 popthelp.c   |  19 +--
 poptint.h    |  18 +++
 6 files changed, 50 insertions(+), 364 deletions(-)
 delete mode 100644 Makefile.in

diff --git a/Makefile.in b/Makefile.in
deleted file mode 100644
index bb74553..0000000
--- a/Makefile.in
+++ /dev/null
@@ -1,345 +0,0 @@
-# Makefile.in generated automatically by automake 1.3 from Makefile.am
-
-# Copyright (C) 1994, 1995, 1996, 1997, 1998 Free Software Foundation, Inc.
-# This Makefile.in is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-# PARTICULAR PURPOSE.
-
-# Makefile for popt library.
-
-
-SHELL = /bin/sh
-
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
-VPATH = @srcdir@
-prefix = @prefix@
-exec_prefix = @exec_prefix@
-
-bindir = @bindir@
-sbindir = @sbindir@
-libexecdir = @libexecdir@
-datadir = @datadir@
-sysconfdir = @sysconfdir@
-sharedstatedir = @sharedstatedir@
-localstatedir = @localstatedir@
-libdir = @libdir@
-infodir = @infodir@
-mandir = @mandir@
-includedir = @includedir@
-oldincludedir = /usr/include
-
-DISTDIR =
-
-pkgdatadir = $(datadir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
-pkgincludedir = $(includedir)/@PACKAGE@
-
-top_builddir = .
-
-ACLOCAL = @ACLOCAL@
-AUTOCONF = @AUTOCONF@
-AUTOMAKE = @AUTOMAKE@
-AUTOHEADER = @AUTOHEADER@
-
-INSTALL = @INSTALL@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@
-INSTALL_DATA = @INSTALL_DATA@
-INSTALL_SCRIPT = @INSTALL_SCRIPT@
-transform = @program_transform_name@
-
-NORMAL_INSTALL = :
-PRE_INSTALL = :
-POST_INSTALL = :
-NORMAL_UNINSTALL = :
-PRE_UNINSTALL = :
-POST_UNINSTALL = :
-CC = @CC@
-CPP = @CPP@
-MAKEINFO = @MAKEINFO@
-PACKAGE = @PACKAGE@
-RANLIB = @RANLIB@
-TARGET = @TARGET@
-U = @U@
-VERSION = @VERSION@
-
-AUTOMAKE_OPTIONS = 1.3 foreign
-
-INCLUDES = -I$(top_srcdir)
-
-noinst_HEADERS = popt.h
-noinst_LIBRARIES = libpopt.a
-libpopt_a_SOURCES = popt.c findme.c poptparse.c poptconfig.c popthelp.c
-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
-CONFIG_HEADER = config.h
-CONFIG_CLEAN_FILES = 
-LIBRARIES =  $(noinst_LIBRARIES)
-
-
-DEFS = @DEFS@ -I. -I$(srcdir) -I.
-CPPFLAGS = @CPPFLAGS@
-LDFLAGS = @LDFLAGS@
-LIBS = @LIBS@
-libpopt_a_LIBADD = 
-libpopt_a_OBJECTS =  popt.o findme.o poptparse.o poptconfig.o popthelp.o
-AR = ar
-CFLAGS = @CFLAGS@
-COMPILE = $(CC) $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS)
-LINK = $(CC) $(CFLAGS) $(LDFLAGS) -o $@
-HEADERS =  $(noinst_HEADERS)
-
-DIST_COMMON =  README COPYING Makefile.am Makefile.in acconfig.h \
-aclocal.m4 config.h.in configure.in install-sh missing mkinstalldirs \
-stamp-h.in
-
-
-DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
-
-TAR = tar
-GZIP = --best
-DEP_FILES =  .deps/findme.P .deps/popt.P .deps/poptconfig.P \
-.deps/popthelp.P .deps/poptparse.P
-SOURCES = $(libpopt_a_SOURCES)
-OBJECTS = $(libpopt_a_OBJECTS)
-
-all: Makefile $(LIBRARIES) $(HEADERS) config.h
-
-.SUFFIXES:
-.SUFFIXES: .S .c .o .s
-$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4)
-	cd $(top_srcdir) && $(AUTOMAKE) --foreign Makefile
-
-Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status $(BUILT_SOURCES)
-	cd $(top_builddir) \
-	  && CONFIG_FILES=$@ CONFIG_HEADERS= $(SHELL) ./config.status
-
-$(ACLOCAL_M4):  configure.in 
-	cd $(srcdir) && $(ACLOCAL)
-
-config.status: $(srcdir)/configure
-	$(SHELL) ./config.status --recheck
-$(srcdir)/configure: $(srcdir)/configure.in $(ACLOCAL_M4) $(CONFIGURE_DEPENDENCIES)
-	cd $(srcdir) && $(AUTOCONF)
-
-config.h: stamp-h
-	@:
-stamp-h: $(srcdir)/config.h.in $(top_builddir)/config.status
-	cd $(top_builddir) \
-	  && CONFIG_FILES= CONFIG_HEADERS=config.h \
-	     $(SHELL) ./config.status
-	@echo timestamp > stamp-h
-$(srcdir)/config.h.in: $(srcdir)/stamp-h.in
-$(srcdir)/stamp-h.in: $(top_srcdir)/configure.in $(ACLOCAL_M4) acconfig.h
-	cd $(top_srcdir) && $(AUTOHEADER)
-	@echo timestamp > $(srcdir)/stamp-h.in
-
-mostlyclean-hdr:
-
-clean-hdr:
-
-distclean-hdr:
-	-rm -f config.h
-
-maintainer-clean-hdr:
-
-mostlyclean-noinstLIBRARIES:
-
-clean-noinstLIBRARIES:
-	-test -z "$(noinst_LIBRARIES)" || rm -f $(noinst_LIBRARIES)
-
-distclean-noinstLIBRARIES:
-
-maintainer-clean-noinstLIBRARIES:
-
-.s.o:
-	$(COMPILE) -c $<
-
-.S.o:
-	$(COMPILE) -c $<
-
-mostlyclean-compile:
-	-rm -f *.o core *.core
-
-clean-compile:
-
-distclean-compile:
-	-rm -f *.tab.c
-
-maintainer-clean-compile:
-
-libpopt.a: $(libpopt_a_OBJECTS) $(libpopt_a_DEPENDENCIES)
-	-rm -f libpopt.a
-	$(AR) cru libpopt.a $(libpopt_a_OBJECTS) $(libpopt_a_LIBADD)
-	$(RANLIB) libpopt.a
-
-tags: TAGS
-
-ID: $(HEADERS) $(SOURCES) $(LISP)
-	here=`pwd` && cd $(srcdir) \
-	  && mkid -f$$here/ID $(SOURCES) $(HEADERS) $(LISP)
-
-TAGS:  $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) $(LISP)
-	tags=; \
-	here=`pwd`; \
-	list='$(SOURCES) $(HEADERS)'; \
-	unique=`for i in $$list; do echo $$i; done | \
-	  awk '    { files[$$0] = 1; } \
-	       END { for (i in files) print i; }'`; \
-	test -z "$(ETAGS_ARGS)config.h.in$$unique$(LISP)$$tags" \
-	  || (cd $(srcdir) && etags $(ETAGS_ARGS) $$tags config.h.in $$unique $(LISP) -o $$here/TAGS)
-
-mostlyclean-tags:
-
-clean-tags:
-
-distclean-tags:
-	-rm -f TAGS ID
-
-maintainer-clean-tags:
-
-distdir = $(PACKAGE)-$(VERSION)
-top_distdir = $(distdir)
-
-# This target untars the dist file and tries a VPATH configuration.  Then
-# it guarantees that the distribution is self-contained by making another
-# tarfile.
-distcheck: dist
-	-rm -rf $(distdir)
-	GZIP=$(GZIP) $(TAR) zxf $(distdir).tar.gz
-	mkdir $(distdir)/=build
-	mkdir $(distdir)/=inst
-	dc_install_base=`cd $(distdir)/=inst && pwd`; \
-	cd $(distdir)/=build \
-	  && ../configure --srcdir=.. --prefix=$$dc_install_base \
-	  && $(MAKE) \
-	  && $(MAKE) dvi \
-	  && $(MAKE) check \
-	  && $(MAKE) install \
-	  && $(MAKE) installcheck \
-	  && $(MAKE) dist
-	-rm -rf $(distdir)
-	@echo "========================"; \
-	echo "$(distdir).tar.gz is ready for distribution"; \
-	echo "========================"
-dist: distdir
-	-chmod -R a+r $(distdir)
-	GZIP=$(GZIP) $(TAR) chozf $(distdir).tar.gz $(distdir)
-	-rm -rf $(distdir)
-dist-all: distdir
-	-chmod -R a+r $(distdir)
-	GZIP=$(GZIP) $(TAR) chozf $(distdir).tar.gz $(distdir)
-	-rm -rf $(distdir)
-distdir: $(DISTFILES)
-	-rm -rf $(distdir)
-	mkdir $(distdir)
-	-chmod 777 $(distdir)
-	here=`cd $(top_builddir) && pwd`; \
-	top_distdir=`cd $(distdir) && pwd`; \
-	distdir=`cd $(distdir) && pwd`; \
-	cd $(top_srcdir) \
-	  && $(AUTOMAKE) --include-deps --build-dir=$$here --srcdir-name=$(top_srcdir) --output-dir=$$top_distdir --foreign Makefile
-	@for file in $(DISTFILES); do \
-	  d=$(srcdir); \
-	  test -f $(distdir)/$$file \
-	  || ln $$d/$$file $(distdir)/$$file 2> /dev/null \
-	  || cp -p $$d/$$file $(distdir)/$$file; \
-	done
-
-DEPS_MAGIC := $(shell mkdir .deps > /dev/null 2>&1 || :)
-
--include $(DEP_FILES)
-
-mostlyclean-depend:
-
-clean-depend:
-
-distclean-depend:
-
-maintainer-clean-depend:
-	-rm -rf .deps
-
-%.o: %.c
-	@echo '$(COMPILE) -c $<'; \
-	$(COMPILE) -Wp,-MD,.deps/$(*F).P -c $<
-
-%.lo: %.c
-	@echo '$(LTCOMPILE) -c $<'; \
-	$(LTCOMPILE) -Wp,-MD,.deps/$(*F).p -c $<
-	@-sed -e 's/^\([^:]*\)\.o:/\1.lo \1.o:/' \
-	  < .deps/$(*F).p > .deps/$(*F).P
-	@-rm -f .deps/$(*F).p
-info:
-dvi:
-check: all
-	$(MAKE)
-installcheck:
-install-exec: 
-	@$(NORMAL_INSTALL)
-
-install-data: 
-	@$(NORMAL_INSTALL)
-
-install: install-exec install-data all
-	@:
-
-uninstall: 
-
-install-strip:
-	$(MAKE) INSTALL_PROGRAM='$(INSTALL_PROGRAM) -s' INSTALL_SCRIPT='$(INSTALL_PROGRAM)' install
-installdirs:
-
-
-mostlyclean-generic:
-	-test -z "$(MOSTLYCLEANFILES)" || rm -f $(MOSTLYCLEANFILES)
-
-clean-generic:
-	-test -z "$(CLEANFILES)" || rm -f $(CLEANFILES)
-
-distclean-generic:
-	-rm -f Makefile $(DISTCLEANFILES)
-	-rm -f config.cache config.log stamp-h stamp-h[0-9]*
-	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
-
-maintainer-clean-generic:
-	-test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES)
-	-test -z "$(BUILT_SOURCES)" || rm -f $(BUILT_SOURCES)
-mostlyclean:  mostlyclean-hdr mostlyclean-noinstLIBRARIES \
-		mostlyclean-compile mostlyclean-tags mostlyclean-depend \
-		mostlyclean-generic
-
-clean:  clean-hdr clean-noinstLIBRARIES clean-compile clean-tags \
-		clean-depend clean-generic mostlyclean
-
-distclean:  distclean-hdr distclean-noinstLIBRARIES distclean-compile \
-		distclean-tags distclean-depend distclean-generic clean
-	-rm -f config.status
-
-maintainer-clean:  maintainer-clean-hdr maintainer-clean-noinstLIBRARIES \
-		maintainer-clean-compile maintainer-clean-tags \
-		maintainer-clean-depend maintainer-clean-generic \
-		distclean
-	@echo "This command is intended for maintainers to use;"
-	@echo "it deletes files that may require special tools to rebuild."
-	-rm -f config.status
-
-.PHONY: mostlyclean-hdr distclean-hdr clean-hdr maintainer-clean-hdr \
-mostlyclean-noinstLIBRARIES distclean-noinstLIBRARIES \
-clean-noinstLIBRARIES maintainer-clean-noinstLIBRARIES \
-mostlyclean-compile distclean-compile clean-compile \
-maintainer-clean-compile tags mostlyclean-tags distclean-tags \
-clean-tags maintainer-clean-tags distdir mostlyclean-depend \
-distclean-depend clean-depend maintainer-clean-depend info dvi \
-installcheck install-exec install-data install uninstall all \
-installdirs mostlyclean-generic distclean-generic clean-generic \
-maintainer-clean-generic clean mostlyclean distclean maintainer-clean
-
-
-# Tell versions [3.59,3.63) of GNU make to not export all variables.
-# Otherwise a system limit (for SysV at least) may be exceeded.
-.NOEXPORT:
diff --git a/config.h.in b/config.h.in
index 21a4244..ffa5449 100644
--- a/config.h.in
+++ b/config.h.in
@@ -12,12 +12,21 @@
 /* Define to 1 if ANSI function prototypes are usable.  */
 #undef PROTOTYPES
 
+/* Define if you have the dgettext function.  */
+#undef HAVE_DGETTEXT
+
+/* Define if you have the gettext function.  */
+#undef HAVE_GETTEXT
+
 /* Define if you have the strerror function.  */
 #undef HAVE_STRERROR
 
 /* Define if you have the <alloca.h> header file.  */
 #undef HAVE_ALLOCA_H
 
+/* Define if you have the <libintl.h> header file.  */
+#undef HAVE_LIBINTL_H
+
 /* Define if you have the <string.h> header file.  */
 #undef HAVE_STRING_H
 
diff --git a/configure.in b/configure.in
index d0d6ad8..34bd278 100755
--- a/configure.in
+++ b/configure.in
@@ -38,7 +38,7 @@ else
 fi
 AC_SUBST(TARGET)
 
-AC_CHECK_HEADERS(unistd.h alloca.h)
+AC_CHECK_HEADERS(unistd.h alloca.h libintl.h)
 AC_MSG_CHECKING(for /usr/ucblib in LIBS)
 if test -d /usr/ucblib ; then
 	if test "$build" = "mips-sni-sysv4" ; then
@@ -53,6 +53,8 @@ else
 fi
 
 AC_CHECK_FUNCS(strerror)
+AC_CHECK_FUNCS(gettext)
+AC_CHECK_FUNCS(dgettext)
 AC_CHECK_FUNC(setreuid, [], [
     AC_CHECK_LIB(ucb, setreuid, [if echo $LIBS | grep -- -lucb >/dev/null ;then :; else LIBS="$LIBS -lc -lucb" USEUCB=y;fi])
 ])
diff --git a/popt.c b/popt.c
index ec29c5f..47f0d00 100644
--- a/popt.c
+++ b/popt.c
@@ -31,7 +31,7 @@ static char * strerror(int errno) {
     if ((0 <= errno) && (errno < sys_nerr))
 	return sys_errlist[errno];
     else
-	return "unknown errno";
+	return POPT_("unknown errno");
 }
 #endif
 
@@ -404,8 +404,7 @@ int poptGetNextOpt(poptContext con) {
 		    break;
 
 		  default:
-		    /* XXX I18N? */
-		    fprintf(stdout, "option type (%d) not implemented in popt\n",
+		    fprintf(stdout, POPT_("option type (%d) not implemented in popt\n"),
 		      opt->argInfo & POPT_ARG_MASK);
 		    exit(1);
 		}
@@ -529,21 +528,21 @@ char * poptBadOption(poptContext con, int flags) {
 const char * poptStrerror(const int error) {
     switch (error) {
       case POPT_ERROR_NOARG:
-	return "missing argument";
+	return POPT_("missing argument");
       case POPT_ERROR_BADOPT:
-	return "unknown option";
+	return POPT_("unknown option");
       case POPT_ERROR_OPTSTOODEEP:
-	return "aliases nested too deeply";
+	return POPT_("aliases nested too deeply");
       case POPT_ERROR_BADQUOTE:
-	return "error in paramter quoting";
+	return POPT_("error in paramter quoting");
       case POPT_ERROR_BADNUMBER:
-	return "invalid numeric value";
+	return POPT_("invalid numeric value");
       case POPT_ERROR_OVERFLOW:
-	return "number too large or too small";
+	return POPT_("number too large or too small");
       case POPT_ERROR_ERRNO:
 	return strerror(errno);
       default:
-	return "unknown error";
+	return POPT_("unknown error");
     }
 }
 
diff --git a/popthelp.c b/popthelp.c
index df5ed26..021e044 100644
--- a/popthelp.c
+++ b/popthelp.c
@@ -26,23 +26,26 @@ static void displayArgs(poptContext con, enum poptCallbackReason foo,
 
 struct poptOption poptHelpOptions[] = {
     { NULL, '\0', POPT_ARG_CALLBACK, &displayArgs, '\0', NULL },
-    { "help", '?', 0, NULL, '?', "Show this help message" },
-    { "usage", '\0', 0, NULL, 'u', "Display brief usage message" },
+    { "help", '?', 0, NULL, '?', N_("Show this help message") },
+    { "usage", '\0', 0, NULL, 'u', N_("Display brief usage message") },
     { NULL, '\0', 0, NULL, 0 }
 } ;
 
 static const char * getArgDescrip(const struct poptOption * opt) {
     if (!(opt->argInfo & POPT_ARG_MASK)) return NULL;
 
-    if (opt->argDescrip) return opt->argDescrip;
-    return "ARG";
+    if (opt == (poptHelpOptions + 1) || opt == (poptHelpOptions + 2))
+	if (opt->argDescrip) return POPT_(opt->argDescrip);
+
+    if (opt->argDescrip) return _(opt->argDescrip);
+    return POPT_("ARG");
 }
 
 static void singleOptionHelp(FILE * f, int maxLeftCol, 
 			     const struct poptOption * opt) {
     int indentLength = maxLeftCol + 5;
     int lineLength = 79 - indentLength;
-    const char * help = opt->descrip;
+    const char * help = _(opt->descrip);
     int helpLength;
     const char * ch;
     char format[10];
@@ -131,7 +134,7 @@ static void singleTableHelp(FILE * f, const struct poptOption * table,
     while (opt->longName || opt->shortName || opt->arg) {
 	if ((opt->argInfo & POPT_ARG_MASK) == POPT_ARG_INCLUDE_TABLE) {
 	    if (opt->descrip)
-		fprintf(f, "\n%s\n", opt->descrip);
+		fprintf(f, "\n%s\n", _(opt->descrip));
 	    singleTableHelp(f, opt->arg, left);
 	}
 	opt++;
@@ -142,7 +145,7 @@ static int showHelpIntro(poptContext con, FILE * f) {
     int len = 6;
     char * fn;
 
-    fprintf(f, "Usage:");
+    fprintf(f, POPT_("Usage:"));
     if (!(con->flags & POPT_CONTEXT_KEEP_FIRST)) {
 	fn = con->optionStack->argv[0];
 	if (strchr(fn, '/')) fn = strchr(fn, '/') + 1;
@@ -160,7 +163,7 @@ void poptPrintHelp(poptContext con, FILE * f, int flags) {
     if (con->otherHelp)
 	fprintf(f, " %s\n", con->otherHelp);
     else
-	fprintf(f, " [OPTION...]\n");
+	fprintf(f, " %s\n", POPT_("[OPTION...]"));
 
     leftColWidth = maxArgWidth(con->options);
     singleTableHelp(f, con->options, leftColWidth);
diff --git a/poptint.h b/poptint.h
index 195039a..5d99be5 100644
--- a/poptint.h
+++ b/poptint.h
@@ -43,4 +43,22 @@ struct poptContext_s {
     char * otherHelp;
 };
 
+#ifdef HAVE_LIBINTL_H
+#include <libintl.h>
+#endif
+
+#ifdef HAVE_GETTEXT
+#define _(foo) gettext(foo)
+#else
+#define _(foo) (foo)
+#endif
+
+#ifdef HAVE_DGETTEXT
+#define POPT_(foo) dgettext("popt", foo)
+#else
+#define POPT_(foo) (foo)
+#endif
+
+#define N_(foo) (foo)
+
 #endif
-- 
Gitee


From f28d598c2c331d396585fbef216ea0d0597aed10 Mon Sep 17 00:00:00 2001
From: Erik Troan <ewt@redhat.com>
Date: Thu, 22 Oct 1998 18:33:13 +0000
Subject: [PATCH 091/667] these don't need to be in CVS

---
 stamp-h    | 1 -
 stamp-h.in | 1 -
 2 files changed, 2 deletions(-)
 delete mode 100644 stamp-h
 delete mode 100644 stamp-h.in

diff --git a/stamp-h b/stamp-h
deleted file mode 100644
index 9788f70..0000000
--- a/stamp-h
+++ /dev/null
@@ -1 +0,0 @@
-timestamp
diff --git a/stamp-h.in b/stamp-h.in
deleted file mode 100644
index 9788f70..0000000
--- a/stamp-h.in
+++ /dev/null
@@ -1 +0,0 @@
-timestamp
-- 
Gitee


From ca8452f003cd762fbb56bb1d48296aebeaf8716b Mon Sep 17 00:00:00 2001
From: Erik Troan <ewt@redhat.com>
Date: Thu, 22 Oct 1998 18:40:57 +0000
Subject: [PATCH 092/667] *** empty log message ***

---
 po/Makefile.in | 80 ++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 80 insertions(+)
 create mode 100644 po/Makefile.in

diff --git a/po/Makefile.in b/po/Makefile.in
new file mode 100644
index 0000000..c924b3c
--- /dev/null
+++ b/po/Makefile.in
@@ -0,0 +1,80 @@
+# Generated automatically from Makefile.in.in by configure.
+srcdir = .
+top_srcdir = ..
+
+INSTALL= /usr/bin/ginstall -c
+INSTALL_PROGRAM= ${INSTALL}
+INSTALL_DATA= ${INSTALL} -m 644
+CC = gcc
+
+installprefix = $(DESTDIR)
+
+MSGMERGE = msgmerge
+
+NLSPACKAGE = popt
+
+LINGUAS = 
+CATALOGS = $(addsuffix .mo, $(LINGUAS))
+
+POTFILES = \
+
+all: $(NLSPACKAGE).pot $(CATALOGS)
+
+$(NLSPACKAGE).pot: $(POTFILES)
+	xgettext --default-domain=$(NLSPACKAGE) \
+	    --add-comments --keyword=_ --keyword=N_ $(POTFILES)
+	if cmp -s $(NLSPACKAGE).po $(NLSPACKAGE).pot; then \
+	    rm -f $(NLSPACKAGE).po; \
+	else \
+	    mv $(NLSPACKAGE).po $(NLSPACKAGE).pot; \
+	fi
+
+update-po: Makefile
+	@$(MAKE) $(NLSPACKAGE).pot
+	@catalogs='$(CATALOGS)'; \
+	for cat in $$catalogs; do \
+		lang=`echo $$cat | sed 's/.mo//'`; \
+		if $(MSGMERGE) $$lang.po $(NLSPACKAGE).pot > $$lang.pox ; then \
+			echo "$(MSGMERGE) of $$lang succeeded" ; \
+			mv $$lang.pox $$lang.po ; \
+		else \
+			echo "$(MSGMERGE) of $$lang failed" ; \
+			rm -f $$lang.pox ; \
+		fi \
+	done
+
+clean:
+	rm -f *mo $(NLSPACKAGE).pot
+
+distclean: clean
+	rm -f .depend Makefile
+
+depend:
+
+install:
+	for n in $(CATALOGS); do \
+	    l=`basename $$n .mo`; \
+	    $(INSTALL) -m 755 -d $(installprefix)/$(LOCALEDIR)/$$l; \
+	    $(INSTALL) -m 755 -d $(installprefix)/$(LOCALEDIR)/$$l/LC_MESSAGES; \
+	    $(INSTALL) -m 644 $$n $(installprefix)/$(LOCALEDIR)/$$l/LC_MESSAGES/rpm.mo; \
+	done
+
+check:
+
+POTFILES: POTFILES.in
+	( if test 'x$(srcdir)' != 'x.'; then \
+	    posrcprefix='$(top_srcdir)/'; \
+	  else \
+	    posrcprefix="../"; \
+	  fi; \
+	  sed -e '/^#/d' -e '/^[ 	]*$$/d' \
+	      -e "s@.*@	$$posrcprefix& \\\\@" \
+	      -e '$$s/\(.*\) \\/\1/' < $(srcdir)/POTFILES.in > POTFILES )
+
+Makefile: Makefile.in.in ../config.status POTFILES
+	cd .. \
+	  && CONFIG_FILES=po/$@.in CONFIG_HEADERS= \
+	       $(SHELL) ./config.status
+
+%.mo: %.po
+	msgfmt -o $@ $<
-- 
Gitee


From 0cfce64ca2e4efe7b42f16675c63645a52b1031e Mon Sep 17 00:00:00 2001
From: Erik Troan <ewt@redhat.com>
Date: Thu, 22 Oct 1998 18:41:04 +0000
Subject: [PATCH 093/667] added po/Makefile.in

---
 configure.in | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/configure.in b/configure.in
index 34bd278..b01dbbb 100755
--- a/configure.in
+++ b/configure.in
@@ -59,4 +59,4 @@ AC_CHECK_FUNC(setreuid, [], [
     AC_CHECK_LIB(ucb, setreuid, [if echo $LIBS | grep -- -lucb >/dev/null ;then :; else LIBS="$LIBS -lc -lucb" USEUCB=y;fi])
 ])
 
-AC_OUTPUT(Makefile)
+AC_OUTPUT(Makefile po/Makefile)
-- 
Gitee


From c48c50c16a34412ae2b7b3dbdb262f2f3edea893 Mon Sep 17 00:00:00 2001
From: Erik Troan <ewt@redhat.com>
Date: Thu, 22 Oct 1998 18:43:50 +0000
Subject: [PATCH 094/667] fixes

---
 po/Makefile.in | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)

diff --git a/po/Makefile.in b/po/Makefile.in
index c924b3c..110526b 100644
--- a/po/Makefile.in
+++ b/po/Makefile.in
@@ -16,13 +16,14 @@ NLSPACKAGE = popt
 LINGUAS = 
 CATALOGS = $(addsuffix .mo, $(LINGUAS))
 
-POTFILES = \
+POTFILES = $(shell ls ../*.c)
 
 all: $(NLSPACKAGE).pot $(CATALOGS)
 
 $(NLSPACKAGE).pot: $(POTFILES)
 	xgettext --default-domain=$(NLSPACKAGE) \
-	    --add-comments --keyword=_ --keyword=N_ $(POTFILES)
+	    --add-comments --keyword=_ --keyword=N_ \
+	    --keyword=POPT_ $(POTFILES)
 	if cmp -s $(NLSPACKAGE).po $(NLSPACKAGE).pot; then \
 	    rm -f $(NLSPACKAGE).po; \
 	else \
@@ -71,10 +72,5 @@ POTFILES: POTFILES.in
 	      -e "s@.*@	$$posrcprefix& \\\\@" \
 	      -e '$$s/\(.*\) \\/\1/' < $(srcdir)/POTFILES.in > POTFILES )
 
-Makefile: Makefile.in.in ../config.status POTFILES
-	cd .. \
-	  && CONFIG_FILES=po/$@.in CONFIG_HEADERS= \
-	       $(SHELL) ./config.status
-
 %.mo: %.po
 	msgfmt -o $@ $<
-- 
Gitee


From f2012e6c0125e66d3782eebbb9e7bda74c4325b7 Mon Sep 17 00:00:00 2001
From: Erik Troan <ewt@redhat.com>
Date: Thu, 22 Oct 1998 18:51:37 +0000
Subject: [PATCH 095/667] added romainian

---
 po/Makefile.in | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/po/Makefile.in b/po/Makefile.in
index 110526b..c1ab14a 100644
--- a/po/Makefile.in
+++ b/po/Makefile.in
@@ -13,7 +13,7 @@ MSGMERGE = msgmerge
 
 NLSPACKAGE = popt
 
-LINGUAS = 
+LINGUAS = ro
 CATALOGS = $(addsuffix .mo, $(LINGUAS))
 
 POTFILES = $(shell ls ../*.c)
-- 
Gitee


From 55fbc13dd3d378dc4d38a3bb9df772ff6c7438f6 Mon Sep 17 00:00:00 2001
From: Erik Troan <ewt@redhat.com>
Date: Thu, 22 Oct 1998 18:52:38 +0000
Subject: [PATCH 096/667] install popt.mo, not rpm.mo

---
 po/Makefile.in | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/po/Makefile.in b/po/Makefile.in
index c1ab14a..407f346 100644
--- a/po/Makefile.in
+++ b/po/Makefile.in
@@ -57,7 +57,7 @@ install:
 	    l=`basename $$n .mo`; \
 	    $(INSTALL) -m 755 -d $(installprefix)/$(LOCALEDIR)/$$l; \
 	    $(INSTALL) -m 755 -d $(installprefix)/$(LOCALEDIR)/$$l/LC_MESSAGES; \
-	    $(INSTALL) -m 644 $$n $(installprefix)/$(LOCALEDIR)/$$l/LC_MESSAGES/rpm.mo; \
+	    $(INSTALL) -m 644 $$n $(installprefix)/$(LOCALEDIR)/$$l/LC_MESSAGES/popt.mo; \
 	done
 
 check:
-- 
Gitee


From eb1ae7083afd6fe94142bfe22790e8cda7367ff9 Mon Sep 17 00:00:00 2001
From: Erik Troan <ewt@redhat.com>
Date: Thu, 22 Oct 1998 18:56:26 +0000
Subject: [PATCH 097/667] tried to get install rule working

---
 po/Makefile.in | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/po/Makefile.in b/po/Makefile.in
index 407f346..d3cdfd1 100644
--- a/po/Makefile.in
+++ b/po/Makefile.in
@@ -7,7 +7,7 @@ INSTALL_PROGRAM= ${INSTALL}
 INSTALL_DATA= ${INSTALL} -m 644
 CC = gcc
 
-installprefix = $(DESTDIR)
+installprefix = @prefix@
 
 MSGMERGE = msgmerge
 
-- 
Gitee


From 407da442d1d56731dbca5440c8569e7a2d263f62 Mon Sep 17 00:00:00 2001
From: Erik Troan <ewt@redhat.com>
Date: Thu, 22 Oct 1998 18:56:55 +0000
Subject: [PATCH 098/667] added po subdirectory

---
 Makefile.am | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/Makefile.am b/Makefile.am
index bd1a4c8..2080656 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -2,6 +2,8 @@
 
 AUTOMAKE_OPTIONS = 1.3 foreign
 
+SUBDIRS = po
+
 INCLUDES = -I$(top_srcdir)
 
 noinst_HEADERS = popt.h
-- 
Gitee


From f8abf67b8d002d97b9683a10f8886538dcb8c787 Mon Sep 17 00:00:00 2001
From: Erik Troan <ewt@redhat.com>
Date: Thu, 22 Oct 1998 18:57:04 +0000
Subject: [PATCH 099/667] *** empty log message ***

---
 autogen.sh | 10 ++++++++++
 1 file changed, 10 insertions(+)
 create mode 100755 autogen.sh

diff --git a/autogen.sh b/autogen.sh
new file mode 100755
index 0000000..fd0c14d
--- /dev/null
+++ b/autogen.sh
@@ -0,0 +1,10 @@
+#!/bin/sh
+
+autoheader
+autoconf
+
+if [ "$1" = "--noconfigure" ]; then 
+    exit 0;
+fi
+
+./configure "$@"
-- 
Gitee


From a66bb1c81f1635fac238c946bdae53f3fc472c25 Mon Sep 17 00:00:00 2001
From: Erik Troan <ewt@redhat.com>
Date: Thu, 22 Oct 1998 18:57:30 +0000
Subject: [PATCH 100/667] use autogen

---
 popt.spec | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/popt.spec b/popt.spec
index ff92c37..cc22299 100644
--- a/popt.spec
+++ b/popt.spec
@@ -25,7 +25,7 @@ argv[] arrays using shell-like rules.
 
 %prep
 %setup
-CFLAGS="$RPM_OPT_FLAGS" ./configure --prefix=/usr
+CFLAGS="$RPM_OPT_FLAGS" ./autogen.sh --prefix=/usr
 
 %build
 make
-- 
Gitee


From fb722eb856a89e480d75c95fc18a725ed1b53925 Mon Sep 17 00:00:00 2001
From: Cristian Gafton <gafton@redhat.com>
Date: Thu, 22 Oct 1998 18:49:50 +0000
Subject: [PATCH 101/667] *** empty log message ***

---
 po/ro.po | 72 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 72 insertions(+)
 create mode 100644 po/ro.po

diff --git a/po/ro.po b/po/ro.po
new file mode 100644
index 0000000..31f1571
--- /dev/null
+++ b/po/ro.po
@@ -0,0 +1,72 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR Free Software Foundation, Inc.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"POT-Creation-Date: 1998-10-22 14:44-0400\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=CHARSET\n"
+"Content-Transfer-Encoding: ENCODING\n"
+
+#: ../popt.c:34
+msgid "unknown errno"
+msgstr "eroare necunoscuta"
+
+#: ../popt.c:407
+#, c-format
+msgid "option type (%d) not implemented in popt\n"
+msgstr "optiunea de tipul (%d)< nu este implementata in popt"
+
+#: ../popt.c:531
+msgid "missing argument"
+msgstr "argument lipsa"
+
+#: ../popt.c:533
+msgid "unknown option"
+msgstr "optiune necunoscuta"
+
+#: ../popt.c:535
+msgid "aliases nested too deeply"
+msgstr ""
+
+#: ../popt.c:537
+msgid "error in paramter quoting"
+msgstr ""
+
+#: ../popt.c:539
+msgid "invalid numeric value"
+msgstr "valoare numarica invalida"
+
+#: ../popt.c:541
+msgid "number too large or too small"
+msgstr "numar prea mare sau prea mic"
+
+#: ../popt.c:545
+msgid "unknown error"
+msgstr "eroare necuinoscuta"
+
+#: ../popthelp.c:29
+msgid "Show this help message"
+msgstr "Afisare mesaj de help"
+
+#: ../popthelp.c:30
+msgid "Display brief usage message"
+msgstr "Afisare mesaj sintaxa sumar"
+
+#: ../popthelp.c:41
+msgid "ARG"
+msgstr ""
+
+#: ../popthelp.c:148
+msgid "Usage:"
+msgstr "Sintaxa:"
+
+#: ../popthelp.c:166
+msgid "[OPTION...]"
+msgstr "[OPTIUNE...]"
-- 
Gitee


From 65c8d2553a03f942af5559b60950e6c4f82e2f24 Mon Sep 17 00:00:00 2001
From: Erik Troan <ewt@redhat.com>
Date: Thu, 22 Oct 1998 18:53:48 +0000
Subject: [PATCH 102/667] added a missing \n

---
 po/ro.po | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/po/ro.po b/po/ro.po
index 31f1571..ad24ff7 100644
--- a/po/ro.po
+++ b/po/ro.po
@@ -21,7 +21,7 @@ msgstr "eroare necunoscuta"
 #: ../popt.c:407
 #, c-format
 msgid "option type (%d) not implemented in popt\n"
-msgstr "optiunea de tipul (%d)< nu este implementata in popt"
+msgstr "optiunea de tipul (%d)< nu este implementata in popt\n"
 
 #: ../popt.c:531
 msgid "missing argument"
-- 
Gitee


From 02a166bcd78deab758019e11a6befadb9c645212 Mon Sep 17 00:00:00 2001
From: Erik Troan <ewt@redhat.com>
Date: Thu, 22 Oct 1998 18:58:07 +0000
Subject: [PATCH 103/667] use autogen, version 1.2

---
 popt.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/popt.spec b/popt.spec
index cc22299..3686e98 100644
--- a/popt.spec
+++ b/popt.spec
@@ -1,6 +1,6 @@
 Summary: C library for parsing command line parameters
 Name: popt
-%define version 1.1.1
+%define version 1.2
 Version: %{version}
 Release: 1
 Copyright: LGPL
@@ -19,6 +19,9 @@ argv[] arrays using shell-like rules.
 
 %changelog
 
+* Thu Oct 22 1998 Erik Troan <ewt@redhat.com>
+- see CHANGES file for 1.2
+
 * Thu Apr 09 1998 Erik Troan <ewt@redhat.com>
 
 - added ./configure step to spec file
-- 
Gitee


From 288df35d6cf2241baf23a804d2e9d769484967ab Mon Sep 17 00:00:00 2001
From: Cristian Gafton <gafton@redhat.com>
Date: Thu, 22 Oct 1998 18:59:41 +0000
Subject: [PATCH 104/667] fixed a typo in translation

---
 po/ro.po | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/po/ro.po b/po/ro.po
index ad24ff7..90c4e02 100644
--- a/po/ro.po
+++ b/po/ro.po
@@ -1,18 +1,18 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR Free Software Foundation, Inc.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+# Cristian Gafton <gafton@redhat.com>, 1998.
 #
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
+"Project-Id-Version: POPT\n"
 "POT-Creation-Date: 1998-10-22 14:44-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Last-Translator: Cristian Gafton <gafton@redhat.com>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=CHARSET\n"
-"Content-Transfer-Encoding: ENCODING\n"
+"Content-Type: text/plain; charset=ISO-8859-2\n"
+"Content-Transfer-Encoding: 8bit\n"
 
 #: ../popt.c:34
 msgid "unknown errno"
@@ -21,7 +21,7 @@ msgstr "eroare necunoscuta"
 #: ../popt.c:407
 #, c-format
 msgid "option type (%d) not implemented in popt\n"
-msgstr "optiunea de tipul (%d)< nu este implementata in popt\n"
+msgstr "optiunea de tipul (%d) nu este implementata in popt\n"
 
 #: ../popt.c:531
 msgid "missing argument"
@@ -33,11 +33,11 @@ msgstr "optiune necunoscuta"
 
 #: ../popt.c:535
 msgid "aliases nested too deeply"
-msgstr ""
+msgstr "recursivitate infinita la optiunile sinonime"
 
 #: ../popt.c:537
 msgid "error in paramter quoting"
-msgstr ""
+msgstr "eroare la insertie parametru"
 
 #: ../popt.c:539
 msgid "invalid numeric value"
-- 
Gitee


From bf40066a3ac29144419d08419dd0d7bf3551c7fd Mon Sep 17 00:00:00 2001
From: Jeff Johnson <n3npq@mac.com>
Date: Thu, 22 Oct 1998 19:11:53 +0000
Subject: [PATCH 105/667] Add test1 as compile target.

---
 Makefile.am |   5 +
 Makefile.in | 442 ++++++++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 447 insertions(+)
 create mode 100644 Makefile.in

diff --git a/Makefile.am b/Makefile.am
index 2080656..d2dd63a 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -4,8 +4,13 @@ AUTOMAKE_OPTIONS = 1.3 foreign
 
 SUBDIRS = po
 
+LDFLAGS = -L$(top_builddir)
 INCLUDES = -I$(top_srcdir)
 
+noinst_PROGRAMS = test1
+test1_SOURCES = test1.c
+test1_LDADD = -lpopt
+
 noinst_HEADERS = popt.h
 noinst_LIBRARIES = libpopt.a
 libpopt_a_SOURCES = popt.c findme.c poptparse.c poptconfig.c popthelp.c
diff --git a/Makefile.in b/Makefile.in
new file mode 100644
index 0000000..cba83ba
--- /dev/null
+++ b/Makefile.in
@@ -0,0 +1,442 @@
+# Makefile.in generated automatically by automake 1.3 from Makefile.am
+
+# Copyright (C) 1994, 1995, 1996, 1997, 1998 Free Software Foundation, Inc.
+# This Makefile.in is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+# PARTICULAR PURPOSE.
+
+# Makefile for popt library.
+
+
+SHELL = /bin/sh
+
+srcdir = @srcdir@
+top_srcdir = @top_srcdir@
+VPATH = @srcdir@
+prefix = @prefix@
+exec_prefix = @exec_prefix@
+
+bindir = @bindir@
+sbindir = @sbindir@
+libexecdir = @libexecdir@
+datadir = @datadir@
+sysconfdir = @sysconfdir@
+sharedstatedir = @sharedstatedir@
+localstatedir = @localstatedir@
+libdir = @libdir@
+infodir = @infodir@
+mandir = @mandir@
+includedir = @includedir@
+oldincludedir = /usr/include
+
+DISTDIR =
+
+pkgdatadir = $(datadir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkgincludedir = $(includedir)/@PACKAGE@
+
+top_builddir = .
+
+ACLOCAL = @ACLOCAL@
+AUTOCONF = @AUTOCONF@
+AUTOMAKE = @AUTOMAKE@
+AUTOHEADER = @AUTOHEADER@
+
+INSTALL = @INSTALL@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
+INSTALL_DATA = @INSTALL_DATA@
+INSTALL_SCRIPT = @INSTALL_SCRIPT@
+transform = @program_transform_name@
+
+NORMAL_INSTALL = :
+PRE_INSTALL = :
+POST_INSTALL = :
+NORMAL_UNINSTALL = :
+PRE_UNINSTALL = :
+POST_UNINSTALL = :
+CC = @CC@
+CPP = @CPP@
+MAKEINFO = @MAKEINFO@
+PACKAGE = @PACKAGE@
+RANLIB = @RANLIB@
+TARGET = @TARGET@
+U = @U@
+VERSION = @VERSION@
+
+AUTOMAKE_OPTIONS = 1.3 foreign
+
+SUBDIRS = po
+
+LDFLAGS = -L$(top_builddir)
+INCLUDES = -I$(top_srcdir)
+
+noinst_PROGRAMS = test1
+test1_SOURCES = test1.c
+test1_LDADD = -lpopt
+
+noinst_HEADERS = popt.h
+noinst_LIBRARIES = libpopt.a
+libpopt_a_SOURCES = popt.c findme.c poptparse.c poptconfig.c popthelp.c
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+CONFIG_HEADER = config.h
+CONFIG_CLEAN_FILES = 
+LIBRARIES =  $(noinst_LIBRARIES)
+
+
+DEFS = @DEFS@ -I. -I$(srcdir) -I.
+CPPFLAGS = @CPPFLAGS@
+LIBS = @LIBS@
+libpopt_a_LIBADD = 
+libpopt_a_OBJECTS =  popt.o findme.o poptparse.o poptconfig.o popthelp.o
+AR = ar
+PROGRAMS =  $(noinst_PROGRAMS)
+
+test1_OBJECTS =  test1.o
+test1_DEPENDENCIES = 
+test1_LDFLAGS = 
+CFLAGS = @CFLAGS@
+COMPILE = $(CC) $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS)
+LINK = $(CC) $(CFLAGS) $(LDFLAGS) -o $@
+HEADERS =  $(noinst_HEADERS)
+
+DIST_COMMON =  README COPYING Makefile.am Makefile.in acconfig.h \
+aclocal.m4 config.h.in configure configure.in install-sh missing \
+mkinstalldirs stamp-h.in
+
+
+DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
+
+TAR = tar
+GZIP = --best
+DEP_FILES =  .deps/findme.P .deps/popt.P .deps/poptconfig.P \
+.deps/popthelp.P .deps/poptparse.P .deps/test1.P
+SOURCES = $(libpopt_a_SOURCES) $(test1_SOURCES)
+OBJECTS = $(libpopt_a_OBJECTS) $(test1_OBJECTS)
+
+all: all-recursive-am all-am
+
+.SUFFIXES:
+.SUFFIXES: .S .c .o .s
+$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4)
+	cd $(top_srcdir) && $(AUTOMAKE) --foreign Makefile
+
+Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status $(BUILT_SOURCES)
+	cd $(top_builddir) \
+	  && CONFIG_FILES=$@ CONFIG_HEADERS= $(SHELL) ./config.status
+
+$(ACLOCAL_M4):  configure.in 
+	cd $(srcdir) && $(ACLOCAL)
+
+config.status: $(srcdir)/configure
+	$(SHELL) ./config.status --recheck
+$(srcdir)/configure: $(srcdir)/configure.in $(ACLOCAL_M4) $(CONFIGURE_DEPENDENCIES)
+	cd $(srcdir) && $(AUTOCONF)
+
+config.h: stamp-h
+	@:
+stamp-h: $(srcdir)/config.h.in $(top_builddir)/config.status
+	cd $(top_builddir) \
+	  && CONFIG_FILES= CONFIG_HEADERS=config.h \
+	     $(SHELL) ./config.status
+	@echo timestamp > stamp-h
+$(srcdir)/config.h.in: $(srcdir)/stamp-h.in
+$(srcdir)/stamp-h.in: $(top_srcdir)/configure.in $(ACLOCAL_M4) acconfig.h
+	cd $(top_srcdir) && $(AUTOHEADER)
+	@echo timestamp > $(srcdir)/stamp-h.in
+
+mostlyclean-hdr:
+
+clean-hdr:
+
+distclean-hdr:
+	-rm -f config.h
+
+maintainer-clean-hdr:
+
+mostlyclean-noinstLIBRARIES:
+
+clean-noinstLIBRARIES:
+	-test -z "$(noinst_LIBRARIES)" || rm -f $(noinst_LIBRARIES)
+
+distclean-noinstLIBRARIES:
+
+maintainer-clean-noinstLIBRARIES:
+
+.s.o:
+	$(COMPILE) -c $<
+
+.S.o:
+	$(COMPILE) -c $<
+
+mostlyclean-compile:
+	-rm -f *.o core *.core
+
+clean-compile:
+
+distclean-compile:
+	-rm -f *.tab.c
+
+maintainer-clean-compile:
+
+libpopt.a: $(libpopt_a_OBJECTS) $(libpopt_a_DEPENDENCIES)
+	-rm -f libpopt.a
+	$(AR) cru libpopt.a $(libpopt_a_OBJECTS) $(libpopt_a_LIBADD)
+	$(RANLIB) libpopt.a
+
+mostlyclean-noinstPROGRAMS:
+
+clean-noinstPROGRAMS:
+	-test -z "$(noinst_PROGRAMS)" || rm -f $(noinst_PROGRAMS)
+
+distclean-noinstPROGRAMS:
+
+maintainer-clean-noinstPROGRAMS:
+
+test1: $(test1_OBJECTS) $(test1_DEPENDENCIES)
+	@rm -f test1
+	$(LINK) $(test1_LDFLAGS) $(test1_OBJECTS) $(test1_LDADD) $(LIBS)
+
+# This directory's subdirectories are mostly independent; you can cd
+# into them and run `make' without going through this Makefile.
+# To change the values of `make' variables: instead of editing Makefiles,
+# (1) if the variable is set in `config.status', edit `config.status'
+#     (which will cause the Makefiles to be regenerated when you run `make');
+# (2) otherwise, pass the desired values on the `make' command line.
+
+@SET_MAKE@
+
+all-recursive install-data-recursive install-exec-recursive \
+installdirs-recursive install-recursive uninstall-recursive  \
+check-recursive installcheck-recursive info-recursive dvi-recursive:
+	@set fnord $(MAKEFLAGS); amf=$$2; \
+	list='$(SUBDIRS)'; for subdir in $$list; do \
+	  target=`echo $@ | sed s/-recursive//`; \
+	  echo "Making $$target in $$subdir"; \
+	  (cd $$subdir && $(MAKE) $$target) \
+	   || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
+	done && test -z "$$fail"
+
+mostlyclean-recursive clean-recursive distclean-recursive \
+maintainer-clean-recursive:
+	@set fnord $(MAKEFLAGS); amf=$$2; \
+	rev=''; list='$(SUBDIRS)'; for subdir in $$list; do \
+	  rev="$$subdir $$rev"; \
+	done; \
+	for subdir in $$rev; do \
+	  target=`echo $@ | sed s/-recursive//`; \
+	  echo "Making $$target in $$subdir"; \
+	  (cd $$subdir && $(MAKE) $$target) \
+	   || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
+	done && test -z "$$fail"
+tags-recursive:
+	list='$(SUBDIRS)'; for subdir in $$list; do \
+	  (cd $$subdir && $(MAKE) tags); \
+	done
+
+tags: TAGS
+
+ID: $(HEADERS) $(SOURCES) $(LISP)
+	here=`pwd` && cd $(srcdir) \
+	  && mkid -f$$here/ID $(SOURCES) $(HEADERS) $(LISP)
+
+TAGS: tags-recursive $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) $(LISP)
+	tags=; \
+	here=`pwd`; \
+	list='$(SUBDIRS)'; for subdir in $$list; do \
+	  test -f $$subdir/TAGS && tags="$$tags -i $$here/$$subdir/TAGS"; \
+	done; \
+	list='$(SOURCES) $(HEADERS)'; \
+	unique=`for i in $$list; do echo $$i; done | \
+	  awk '    { files[$$0] = 1; } \
+	       END { for (i in files) print i; }'`; \
+	test -z "$(ETAGS_ARGS)config.h.in$$unique$(LISP)$$tags" \
+	  || (cd $(srcdir) && etags $(ETAGS_ARGS) $$tags config.h.in $$unique $(LISP) -o $$here/TAGS)
+
+mostlyclean-tags:
+
+clean-tags:
+
+distclean-tags:
+	-rm -f TAGS ID
+
+maintainer-clean-tags:
+
+distdir = $(PACKAGE)-$(VERSION)
+top_distdir = $(distdir)
+
+# This target untars the dist file and tries a VPATH configuration.  Then
+# it guarantees that the distribution is self-contained by making another
+# tarfile.
+distcheck: dist
+	-rm -rf $(distdir)
+	GZIP=$(GZIP) $(TAR) zxf $(distdir).tar.gz
+	mkdir $(distdir)/=build
+	mkdir $(distdir)/=inst
+	dc_install_base=`cd $(distdir)/=inst && pwd`; \
+	cd $(distdir)/=build \
+	  && ../configure --srcdir=.. --prefix=$$dc_install_base \
+	  && $(MAKE) \
+	  && $(MAKE) dvi \
+	  && $(MAKE) check \
+	  && $(MAKE) install \
+	  && $(MAKE) installcheck \
+	  && $(MAKE) dist
+	-rm -rf $(distdir)
+	@echo "========================"; \
+	echo "$(distdir).tar.gz is ready for distribution"; \
+	echo "========================"
+dist: distdir
+	-chmod -R a+r $(distdir)
+	GZIP=$(GZIP) $(TAR) chozf $(distdir).tar.gz $(distdir)
+	-rm -rf $(distdir)
+dist-all: distdir
+	-chmod -R a+r $(distdir)
+	GZIP=$(GZIP) $(TAR) chozf $(distdir).tar.gz $(distdir)
+	-rm -rf $(distdir)
+distdir: $(DISTFILES)
+	-rm -rf $(distdir)
+	mkdir $(distdir)
+	-chmod 777 $(distdir)
+	here=`cd $(top_builddir) && pwd`; \
+	top_distdir=`cd $(distdir) && pwd`; \
+	distdir=`cd $(distdir) && pwd`; \
+	cd $(top_srcdir) \
+	  && $(AUTOMAKE) --include-deps --build-dir=$$here --srcdir-name=$(top_srcdir) --output-dir=$$top_distdir --foreign Makefile
+	@for file in $(DISTFILES); do \
+	  d=$(srcdir); \
+	  test -f $(distdir)/$$file \
+	  || ln $$d/$$file $(distdir)/$$file 2> /dev/null \
+	  || cp -p $$d/$$file $(distdir)/$$file; \
+	done
+	for subdir in $(SUBDIRS); do \
+	  test -d $(distdir)/$$subdir \
+	  || mkdir $(distdir)/$$subdir \
+	  || exit 1; \
+	  chmod 777 $(distdir)/$$subdir; \
+	  (cd $$subdir && $(MAKE) top_distdir=../$(distdir) distdir=../$(distdir)/$$subdir distdir) \
+	    || exit 1; \
+	done
+
+DEPS_MAGIC := $(shell mkdir .deps > /dev/null 2>&1 || :)
+
+-include $(DEP_FILES)
+
+mostlyclean-depend:
+
+clean-depend:
+
+distclean-depend:
+
+maintainer-clean-depend:
+	-rm -rf .deps
+
+%.o: %.c
+	@echo '$(COMPILE) -c $<'; \
+	$(COMPILE) -Wp,-MD,.deps/$(*F).P -c $<
+
+%.lo: %.c
+	@echo '$(LTCOMPILE) -c $<'; \
+	$(LTCOMPILE) -Wp,-MD,.deps/$(*F).p -c $<
+	@-sed -e 's/^\([^:]*\)\.o:/\1.lo \1.o:/' \
+	  < .deps/$(*F).p > .deps/$(*F).P
+	@-rm -f .deps/$(*F).p
+info: info-recursive
+dvi: dvi-recursive
+check: all-am
+	$(MAKE) check-recursive
+installcheck: installcheck-recursive
+all-recursive-am: config.h
+	$(MAKE) all-recursive
+
+all-am: Makefile $(LIBRARIES) $(PROGRAMS) $(HEADERS) config.h
+
+install-exec: install-exec-recursive
+	@$(NORMAL_INSTALL)
+
+install-data: install-data-recursive
+	@$(NORMAL_INSTALL)
+
+install: install-recursive
+	@:
+
+uninstall: uninstall-recursive
+
+install-strip:
+	$(MAKE) INSTALL_PROGRAM='$(INSTALL_PROGRAM) -s' INSTALL_SCRIPT='$(INSTALL_PROGRAM)' install
+installdirs: installdirs-recursive
+
+
+mostlyclean-generic:
+	-test -z "$(MOSTLYCLEANFILES)" || rm -f $(MOSTLYCLEANFILES)
+
+clean-generic:
+	-test -z "$(CLEANFILES)" || rm -f $(CLEANFILES)
+
+distclean-generic:
+	-rm -f Makefile $(DISTCLEANFILES)
+	-rm -f config.cache config.log stamp-h stamp-h[0-9]*
+	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+
+maintainer-clean-generic:
+	-test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES)
+	-test -z "$(BUILT_SOURCES)" || rm -f $(BUILT_SOURCES)
+mostlyclean-am:  mostlyclean-hdr mostlyclean-noinstLIBRARIES \
+		mostlyclean-compile mostlyclean-noinstPROGRAMS \
+		mostlyclean-tags mostlyclean-depend mostlyclean-generic
+
+clean-am:  clean-hdr clean-noinstLIBRARIES clean-compile \
+		clean-noinstPROGRAMS clean-tags clean-depend \
+		clean-generic mostlyclean-am
+
+distclean-am:  distclean-hdr distclean-noinstLIBRARIES distclean-compile \
+		distclean-noinstPROGRAMS distclean-tags \
+		distclean-depend distclean-generic clean-am
+
+maintainer-clean-am:  maintainer-clean-hdr \
+		maintainer-clean-noinstLIBRARIES \
+		maintainer-clean-compile \
+		maintainer-clean-noinstPROGRAMS maintainer-clean-tags \
+		maintainer-clean-depend maintainer-clean-generic \
+		distclean-am
+
+mostlyclean:  mostlyclean-recursive mostlyclean-am
+
+clean:  clean-recursive clean-am
+
+distclean:  distclean-recursive distclean-am
+	-rm -f config.status
+
+maintainer-clean:  maintainer-clean-recursive maintainer-clean-am
+	@echo "This command is intended for maintainers to use;"
+	@echo "it deletes files that may require special tools to rebuild."
+	-rm -f config.status
+
+.PHONY: mostlyclean-hdr distclean-hdr clean-hdr maintainer-clean-hdr \
+mostlyclean-noinstLIBRARIES distclean-noinstLIBRARIES \
+clean-noinstLIBRARIES maintainer-clean-noinstLIBRARIES \
+mostlyclean-compile distclean-compile clean-compile \
+maintainer-clean-compile mostlyclean-noinstPROGRAMS \
+distclean-noinstPROGRAMS clean-noinstPROGRAMS \
+maintainer-clean-noinstPROGRAMS install-data-recursive \
+uninstall-data-recursive install-exec-recursive \
+uninstall-exec-recursive installdirs-recursive uninstalldirs-recursive \
+all-recursive check-recursive installcheck-recursive info-recursive \
+dvi-recursive mostlyclean-recursive distclean-recursive clean-recursive \
+maintainer-clean-recursive tags tags-recursive mostlyclean-tags \
+distclean-tags clean-tags maintainer-clean-tags distdir \
+mostlyclean-depend distclean-depend clean-depend \
+maintainer-clean-depend info dvi installcheck all-recursive-am all-am \
+install-exec install-data install uninstall all installdirs \
+mostlyclean-generic distclean-generic clean-generic \
+maintainer-clean-generic clean mostlyclean distclean maintainer-clean
+
+
+# Tell versions [3.59,3.63) of GNU make to not export all variables.
+# Otherwise a system limit (for SysV at least) may be exceeded.
+.NOEXPORT:
-- 
Gitee


From 5cd9d5c726e38f0e4e8bd5d5ede53191b414d39e Mon Sep 17 00:00:00 2001
From: Jeff Johnson <n3npq@mac.com>
Date: Thu, 22 Oct 1998 19:39:12 +0000
Subject: [PATCH 106/667] Check in to test "make archive".

---
 .cvsignore        |  2 ++
 Makefile.am       | 19 +++++++++++
 Makefile.in       | 19 +++++++++++
 configure.in      |  3 +-
 po/.cvsignore     |  4 +++
 po/Makefile.in    | 16 ++++++----
 po/Makefile.in.in | 80 +++++++++++++++++++++++++++++++++++++++++++++++
 po/POTFILES.in    | 11 +++++++
 po/popt.pot       | 23 ++++++++++++++
 9 files changed, 170 insertions(+), 7 deletions(-)
 create mode 100644 po/.cvsignore
 create mode 100644 po/Makefile.in.in
 create mode 100644 po/POTFILES.in
 create mode 100644 po/popt.pot

diff --git a/.cvsignore b/.cvsignore
index 3f35980..8f1ef3c 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -10,4 +10,6 @@ config.log
 config.cache
 config.satus
 config.status
+stamp-h
+stamp-h.in
 test1
diff --git a/Makefile.am b/Makefile.am
index d2dd63a..75f1520 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -14,3 +14,22 @@ test1_LDADD = -lpopt
 noinst_HEADERS = popt.h
 noinst_LIBRARIES = libpopt.a
 libpopt_a_SOURCES = popt.c findme.c poptparse.c poptconfig.c popthelp.c
+
+CVSTAG = $(PACKAGE)-$(subst .,_,$(VERSION))
+
+.PHONY: archive
+archive: 
+	@echo "This is $(PACKAGE)-$(VERSION)."
+	@sleep 5
+	@cvs -Q tag -F $(CVSTAG) .
+	rm -rf /tmp/$(PACKAGE)-$(VERSION) /tmp/$(PACKAGE)
+	cd /tmp; cvs -Q -d $(CVSROOT) export -r$(CVSTAG) $(PACKAGE) || :
+	mv /tmp/$(PACKAGE) /tmp/$(PACKAGE)-$(VERSION)
+	cd /tmp/$(PACKAGE)-$(VERSION); ./autogen.sh ; make depend; make distclean
+	cd /tmp/$(PACKAGE)-$(VERSION); ./autogen.sh --noconfigure
+	cd /tmp; tar czSpf $(PACKAGE)-$(VERSION).tar.gz $(PACKAGE)-$(VERSION)
+	rm -rf /tmp/$(PACKAGE)-$(VERSION)
+	cp /tmp/$(PACKAGE)-$(VERSION).tar.gz .
+	rm -f /tmp/$(PACKAGE)-$(VERSION).tar.gz 
+	@echo " "
+	@echo "The final archive is ./$(PACKAGE)-$(VERSION).tar.gz."
diff --git a/Makefile.in b/Makefile.in
index cba83ba..c3771e0 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -82,6 +82,8 @@ test1_LDADD = -lpopt
 noinst_HEADERS = popt.h
 noinst_LIBRARIES = libpopt.a
 libpopt_a_SOURCES = popt.c findme.c poptparse.c poptconfig.c popthelp.c
+
+CVSTAG = $(PACKAGE)-$(subst .,_,$(VERSION))
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
 CONFIG_HEADER = config.h
@@ -437,6 +439,23 @@ mostlyclean-generic distclean-generic clean-generic \
 maintainer-clean-generic clean mostlyclean distclean maintainer-clean
 
 
+.PHONY: archive
+archive: 
+	@echo "This is $(PACKAGE)-$(VERSION)."
+	@sleep 5
+	@cvs -Q tag -F $(CVSTAG) .
+	rm -rf /tmp/$(PACKAGE)-$(VERSION) /tmp/$(PACKAGE)
+	cd /tmp; cvs -Q -d $(CVSROOT) export -r$(CVSTAG) $(PACKAGE) || :
+	mv /tmp/$(PACKAGE) /tmp/$(PACKAGE)-$(VERSION)
+	cd /tmp/$(PACKAGE)-$(VERSION); ./autogen.sh ; make depend; make distclean
+	cd /tmp/$(PACKAGE)-$(VERSION); ./autogen.sh --noconfigure
+	cd /tmp; tar czSpf $(PACKAGE)-$(VERSION).tar.gz $(PACKAGE)-$(VERSION)
+	rm -rf /tmp/$(PACKAGE)-$(VERSION)
+	cp /tmp/$(PACKAGE)-$(VERSION).tar.gz .
+	rm -f /tmp/$(PACKAGE)-$(VERSION).tar.gz 
+	@echo " "
+	@echo "The final archive is ./$(PACKAGE)-$(VERSION).tar.gz."
+
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT:
diff --git a/configure.in b/configure.in
index b01dbbb..8f64fdc 100755
--- a/configure.in
+++ b/configure.in
@@ -59,4 +59,5 @@ AC_CHECK_FUNC(setreuid, [], [
     AC_CHECK_LIB(ucb, setreuid, [if echo $LIBS | grep -- -lucb >/dev/null ;then :; else LIBS="$LIBS -lc -lucb" USEUCB=y;fi])
 ])
 
-AC_OUTPUT(Makefile po/Makefile)
+AC_OUTPUT([Makefile po/Makefile.in],
+	[sed -e "/POTFILES =/r po/POTFILES" po/Makefile.in > po/Makefile])
diff --git a/po/.cvsignore b/po/.cvsignore
new file mode 100644
index 0000000..8f58e9b
--- /dev/null
+++ b/po/.cvsignore
@@ -0,0 +1,4 @@
+Makefile
+Makefile.in
+POTFILES
+*.mo
diff --git a/po/Makefile.in b/po/Makefile.in
index d3cdfd1..2f041d3 100644
--- a/po/Makefile.in
+++ b/po/Makefile.in
@@ -2,12 +2,12 @@
 srcdir = .
 top_srcdir = ..
 
-INSTALL= /usr/bin/ginstall -c
+INSTALL= /usr/bin/install -c
 INSTALL_PROGRAM= ${INSTALL}
 INSTALL_DATA= ${INSTALL} -m 644
 CC = gcc
 
-installprefix = @prefix@
+installprefix = $(DESTDIR)
 
 MSGMERGE = msgmerge
 
@@ -16,14 +16,13 @@ NLSPACKAGE = popt
 LINGUAS = ro
 CATALOGS = $(addsuffix .mo, $(LINGUAS))
 
-POTFILES = $(shell ls ../*.c)
+POTFILES = \
 
 all: $(NLSPACKAGE).pot $(CATALOGS)
 
 $(NLSPACKAGE).pot: $(POTFILES)
 	xgettext --default-domain=$(NLSPACKAGE) \
-	    --add-comments --keyword=_ --keyword=N_ \
-	    --keyword=POPT_ $(POTFILES)
+	    --add-comments --keyword=_ --keyword=N_ $(POTFILES)
 	if cmp -s $(NLSPACKAGE).po $(NLSPACKAGE).pot; then \
 	    rm -f $(NLSPACKAGE).po; \
 	else \
@@ -57,7 +56,7 @@ install:
 	    l=`basename $$n .mo`; \
 	    $(INSTALL) -m 755 -d $(installprefix)/$(LOCALEDIR)/$$l; \
 	    $(INSTALL) -m 755 -d $(installprefix)/$(LOCALEDIR)/$$l/LC_MESSAGES; \
-	    $(INSTALL) -m 644 $$n $(installprefix)/$(LOCALEDIR)/$$l/LC_MESSAGES/popt.mo; \
+	    $(INSTALL) -m 644 $$n $(installprefix)/$(LOCALEDIR)/$$l/LC_MESSAGES/rpm.mo; \
 	done
 
 check:
@@ -72,5 +71,10 @@ POTFILES: POTFILES.in
 	      -e "s@.*@	$$posrcprefix& \\\\@" \
 	      -e '$$s/\(.*\) \\/\1/' < $(srcdir)/POTFILES.in > POTFILES )
 
+Makefile: Makefile.in.in ../config.status POTFILES
+	cd .. \
+	  && CONFIG_FILES=po/$@.in CONFIG_HEADERS= \
+	       $(SHELL) ./config.status
+
 %.mo: %.po
 	msgfmt -o $@ $<
diff --git a/po/Makefile.in.in b/po/Makefile.in.in
new file mode 100644
index 0000000..81bd73d
--- /dev/null
+++ b/po/Makefile.in.in
@@ -0,0 +1,80 @@
+srcdir = @srcdir@
+top_srcdir = @top_srcdir@
+VPATH = $(srcdir)
+
+INSTALL= @INSTALL@
+INSTALL_PROGRAM= @INSTALL_PROGRAM@
+INSTALL_DATA= @INSTALL_DATA@
+CC = @CC@
+
+installprefix = $(DESTDIR)
+
+MSGMERGE = msgmerge
+
+NLSPACKAGE = @PACKAGE@
+
+LINGUAS = ro
+CATALOGS = $(addsuffix .mo, $(LINGUAS))
+
+POTFILES = \
+
+all: $(NLSPACKAGE).pot $(CATALOGS)
+
+$(NLSPACKAGE).pot: $(POTFILES)
+	xgettext --default-domain=$(NLSPACKAGE) \
+	    --add-comments --keyword=_ --keyword=N_ $(POTFILES)
+	if cmp -s $(NLSPACKAGE).po $(NLSPACKAGE).pot; then \
+	    rm -f $(NLSPACKAGE).po; \
+	else \
+	    mv $(NLSPACKAGE).po $(NLSPACKAGE).pot; \
+	fi
+
+update-po: Makefile
+	@$(MAKE) $(NLSPACKAGE).pot
+	@catalogs='$(CATALOGS)'; \
+	for cat in $$catalogs; do \
+		lang=`echo $$cat | sed 's/.mo//'`; \
+		if $(MSGMERGE) $$lang.po $(NLSPACKAGE).pot > $$lang.pox ; then \
+			echo "$(MSGMERGE) of $$lang succeeded" ; \
+			mv $$lang.pox $$lang.po ; \
+		else \
+			echo "$(MSGMERGE) of $$lang failed" ; \
+			rm -f $$lang.pox ; \
+		fi \
+	done
+
+clean:
+	rm -f *mo $(NLSPACKAGE).pot
+
+distclean: clean
+	rm -f .depend Makefile
+
+depend:
+
+install:
+	for n in $(CATALOGS); do \
+	    l=`basename $$n .mo`; \
+	    $(INSTALL) -m 755 -d $(installprefix)/$(LOCALEDIR)/$$l; \
+	    $(INSTALL) -m 755 -d $(installprefix)/$(LOCALEDIR)/$$l/LC_MESSAGES; \
+	    $(INSTALL) -m 644 $$n $(installprefix)/$(LOCALEDIR)/$$l/LC_MESSAGES/rpm.mo; \
+	done
+
+check:
+
+POTFILES: POTFILES.in
+	( if test 'x$(srcdir)' != 'x.'; then \
+	    posrcprefix='$(top_srcdir)/'; \
+	  else \
+	    posrcprefix="../"; \
+	  fi; \
+	  sed -e '/^#/d' -e '/^[ 	]*$$/d' \
+	      -e "s@.*@	$$posrcprefix& \\\\@" \
+	      -e '$$s/\(.*\) \\/\1/' < $(srcdir)/POTFILES.in > POTFILES )
+
+Makefile: Makefile.in.in ../config.status POTFILES
+	cd .. \
+	  && CONFIG_FILES=po/$@.in CONFIG_HEADERS= \
+	       $(SHELL) ./config.status
+
+%.mo: %.po
+	msgfmt -o $@ $<
diff --git a/po/POTFILES.in b/po/POTFILES.in
new file mode 100644
index 0000000..4817ca1
--- /dev/null
+++ b/po/POTFILES.in
@@ -0,0 +1,11 @@
+# List of files which contain translatable strings.
+
+# Package source files
+
+findme.c
+popt.c
+poptconfig.c
+popthelp.c
+poptparse.c
+test1.c
+
diff --git a/po/popt.pot b/po/popt.pot
new file mode 100644
index 0000000..77169cb
--- /dev/null
+++ b/po/popt.pot
@@ -0,0 +1,23 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR Free Software Foundation, Inc.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"POT-Creation-Date: 1998-10-22 15:37-0400\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=CHARSET\n"
+"Content-Transfer-Encoding: ENCODING\n"
+
+#: ../popthelp.c:29
+msgid "Show this help message"
+msgstr ""
+
+#: ../popthelp.c:30
+msgid "Display brief usage message"
+msgstr ""
-- 
Gitee


From 31fd989b1f639c566a32027dc9e7ce2c8edf4bf1 Mon Sep 17 00:00:00 2001
From: Jeff Johnson <n3npq@mac.com>
Date: Thu, 22 Oct 1998 19:41:24 +0000
Subject: [PATCH 107/667] Quiet "make archive: output.

---
 Makefile.am | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index 75f1520..e4fed1f 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -22,14 +22,14 @@ archive:
 	@echo "This is $(PACKAGE)-$(VERSION)."
 	@sleep 5
 	@cvs -Q tag -F $(CVSTAG) .
-	rm -rf /tmp/$(PACKAGE)-$(VERSION) /tmp/$(PACKAGE)
-	cd /tmp; cvs -Q -d $(CVSROOT) export -r$(CVSTAG) $(PACKAGE) || :
-	mv /tmp/$(PACKAGE) /tmp/$(PACKAGE)-$(VERSION)
-	cd /tmp/$(PACKAGE)-$(VERSION); ./autogen.sh ; make depend; make distclean
-	cd /tmp/$(PACKAGE)-$(VERSION); ./autogen.sh --noconfigure
-	cd /tmp; tar czSpf $(PACKAGE)-$(VERSION).tar.gz $(PACKAGE)-$(VERSION)
-	rm -rf /tmp/$(PACKAGE)-$(VERSION)
-	cp /tmp/$(PACKAGE)-$(VERSION).tar.gz .
-	rm -f /tmp/$(PACKAGE)-$(VERSION).tar.gz 
+	@rm -rf /tmp/$(PACKAGE)-$(VERSION) /tmp/$(PACKAGE)
+	@cd /tmp; cvs -Q -d $(CVSROOT) export -r$(CVSTAG) $(PACKAGE) || :
+	@mv /tmp/$(PACKAGE) /tmp/$(PACKAGE)-$(VERSION)
+	@cd /tmp/$(PACKAGE)-$(VERSION); ./autogen.sh ; make depend; make distclean
+	@cd /tmp/$(PACKAGE)-$(VERSION); ./autogen.sh --noconfigure
+	@cd /tmp; tar czSpf $(PACKAGE)-$(VERSION).tar.gz $(PACKAGE)-$(VERSION)
+	@rm -rf /tmp/$(PACKAGE)-$(VERSION)
+	@cp /tmp/$(PACKAGE)-$(VERSION).tar.gz .
+	@rm -f /tmp/$(PACKAGE)-$(VERSION).tar.gz 
 	@echo " "
 	@echo "The final archive is ./$(PACKAGE)-$(VERSION).tar.gz."
-- 
Gitee


From 6cf1daa33ecda99de5c7eec3a086ef254ddb7522 Mon Sep 17 00:00:00 2001
From: Jeff Johnson <n3npq@mac.com>
Date: Thu, 22 Oct 1998 20:06:47 +0000
Subject: [PATCH 108/667] Sanity.

---
 Makefile.in | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/Makefile.in b/Makefile.in
index c3771e0..aaed1db 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -444,15 +444,15 @@ archive:
 	@echo "This is $(PACKAGE)-$(VERSION)."
 	@sleep 5
 	@cvs -Q tag -F $(CVSTAG) .
-	rm -rf /tmp/$(PACKAGE)-$(VERSION) /tmp/$(PACKAGE)
-	cd /tmp; cvs -Q -d $(CVSROOT) export -r$(CVSTAG) $(PACKAGE) || :
-	mv /tmp/$(PACKAGE) /tmp/$(PACKAGE)-$(VERSION)
-	cd /tmp/$(PACKAGE)-$(VERSION); ./autogen.sh ; make depend; make distclean
-	cd /tmp/$(PACKAGE)-$(VERSION); ./autogen.sh --noconfigure
-	cd /tmp; tar czSpf $(PACKAGE)-$(VERSION).tar.gz $(PACKAGE)-$(VERSION)
-	rm -rf /tmp/$(PACKAGE)-$(VERSION)
-	cp /tmp/$(PACKAGE)-$(VERSION).tar.gz .
-	rm -f /tmp/$(PACKAGE)-$(VERSION).tar.gz 
+	@rm -rf /tmp/$(PACKAGE)-$(VERSION) /tmp/$(PACKAGE)
+	@cd /tmp; cvs -Q -d $(CVSROOT) export -r$(CVSTAG) $(PACKAGE) || :
+	@mv /tmp/$(PACKAGE) /tmp/$(PACKAGE)-$(VERSION)
+	@cd /tmp/$(PACKAGE)-$(VERSION); ./autogen.sh ; make depend; make distclean
+	@cd /tmp/$(PACKAGE)-$(VERSION); ./autogen.sh --noconfigure
+	@cd /tmp; tar czSpf $(PACKAGE)-$(VERSION).tar.gz $(PACKAGE)-$(VERSION)
+	@rm -rf /tmp/$(PACKAGE)-$(VERSION)
+	@cp /tmp/$(PACKAGE)-$(VERSION).tar.gz .
+	@rm -f /tmp/$(PACKAGE)-$(VERSION).tar.gz 
 	@echo " "
 	@echo "The final archive is ./$(PACKAGE)-$(VERSION).tar.gz."
 
-- 
Gitee


From a587ac842fc03f740850f57627a7a79db1bda4f2 Mon Sep 17 00:00:00 2001
From: Jeff Johnson <n3npq@mac.com>
Date: Thu, 22 Oct 1998 20:15:05 +0000
Subject: [PATCH 109/667] Set VERSION at top of Makefile.am, expand
 popt.spec.in accordingly.

---
 configure.in |  4 ++--
 popt.spec    | 44 --------------------------------------------
 2 files changed, 2 insertions(+), 46 deletions(-)
 delete mode 100644 popt.spec

diff --git a/configure.in b/configure.in
index 8f64fdc..38a20e1 100755
--- a/configure.in
+++ b/configure.in
@@ -1,5 +1,5 @@
 AC_INIT(popt.h)
-AM_INIT_AUTOMAKE(popt, 1.1.1)
+AM_INIT_AUTOMAKE(popt, 1.2)
 AM_CONFIG_HEADER(config.h)
 
 AC_PROG_CC
@@ -59,5 +59,5 @@ AC_CHECK_FUNC(setreuid, [], [
     AC_CHECK_LIB(ucb, setreuid, [if echo $LIBS | grep -- -lucb >/dev/null ;then :; else LIBS="$LIBS -lc -lucb" USEUCB=y;fi])
 ])
 
-AC_OUTPUT([Makefile po/Makefile.in],
+AC_OUTPUT([Makefile popt.spec po/Makefile.in],
 	[sed -e "/POTFILES =/r po/POTFILES" po/Makefile.in > po/Makefile])
diff --git a/popt.spec b/popt.spec
deleted file mode 100644
index 3686e98..0000000
--- a/popt.spec
+++ /dev/null
@@ -1,44 +0,0 @@
-Summary: C library for parsing command line parameters
-Name: popt
-%define version 1.2
-Version: %{version}
-Release: 1
-Copyright: LGPL
-Group: Libraries
-Source: ftp://ftp.redhat.com/pub/redhat/code/popt/popt-%{version}.tar.gz
-BuildRoot: /var/tmp/popt.root
-
-%description
-Popt is a C library for pasing command line parameters. It was heavily
-influenced by the getopt() and getopt_long() functions, but it allows
-more powerfull argument expansion. It can parse arbitrary argv[] style
-arrays and automatically set variables based on command line arguments.
-It also allows command line arguments to be aliased via configuration
-files and includes utility functions for parsing arbitrary strings into
-argv[] arrays using shell-like rules. 
-
-%changelog
-
-* Thu Oct 22 1998 Erik Troan <ewt@redhat.com>
-- see CHANGES file for 1.2
-
-* Thu Apr 09 1998 Erik Troan <ewt@redhat.com>
-
-- added ./configure step to spec file
-
-%prep
-%setup
-CFLAGS="$RPM_OPT_FLAGS" ./autogen.sh --prefix=/usr
-
-%build
-make
-
-%install
-make PREFIX=$RPM_BUILD_ROOT install
-
-%clean
-rm -rf $RPM_BUILD_ROOT
-
-%files
-%attr(0644, root, root) /usr/lib/libpopt.a
-%attr(0644, root, root) /usr/include/popt.h
-- 
Gitee


From c0c2fb6882fd117431c43bff775ab940e5c75034 Mon Sep 17 00:00:00 2001
From: Jeff Johnson <n3npq@mac.com>
Date: Thu, 22 Oct 1998 20:15:23 +0000
Subject: [PATCH 110/667] Oriphan.

---
 popt.spec.in | 41 +++++++++++++++++++++++++++++++++++++++++
 1 file changed, 41 insertions(+)
 create mode 100644 popt.spec.in

diff --git a/popt.spec.in b/popt.spec.in
new file mode 100644
index 0000000..af2b600
--- /dev/null
+++ b/popt.spec.in
@@ -0,0 +1,41 @@
+Summary: C library for parsing command line parameters
+Name: popt
+Version: @VERSION@
+Release: 1
+Copyright: LGPL
+Group: Libraries
+Source: ftp://ftp.redhat.com/pub/redhat/code/popt/popt-%{version}.tar.gz
+BuildRoot: /var/tmp/popt.root
+
+%description
+Popt is a C library for pasing command line parameters. It was heavily
+influenced by the getopt() and getopt_long() functions, but it allows
+more powerfull argument expansion. It can parse arbitrary argv[] style
+arrays and automatically set variables based on command line arguments.
+It also allows command line arguments to be aliased via configuration
+files and includes utility functions for parsing arbitrary strings into
+argv[] arrays using shell-like rules. 
+
+%prep
+%setup -q
+CFLAGS="$RPM_OPT_FLAGS" ./autogen.sh --prefix=/usr
+
+%build
+make
+
+%install
+make DESTDIR=$RPM_BUILD_ROOT install
+
+%clean
+rm -rf $RPM_BUILD_ROOT
+
+%files
+%attr(0644, root, root) /usr/lib/libpopt.a
+%attr(0644, root, root) /usr/include/popt.h
+
+%changelog
+* Thu Oct 22 1998 Erik Troan <ewt@redhat.com>
+- see CHANGES file for 1.2
+
+* Thu Apr 09 1998 Erik Troan <ewt@redhat.com>
+- added ./configure step to spec file
-- 
Gitee


From 678ce2ca66fea93ecc531520e8e74aaadaf945a0 Mon Sep 17 00:00:00 2001
From: Jeff Johnson <n3npq@mac.com>
Date: Thu, 22 Oct 1998 20:32:09 +0000
Subject: [PATCH 111/667] Revert VERSION change.

---
 configure.in              | 2 +-
 po/popt.pot               | 2 +-
 popt.spec.in => popt.spec | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)
 rename popt.spec.in => popt.spec (98%)

diff --git a/configure.in b/configure.in
index 38a20e1..0b0d0a8 100755
--- a/configure.in
+++ b/configure.in
@@ -59,5 +59,5 @@ AC_CHECK_FUNC(setreuid, [], [
     AC_CHECK_LIB(ucb, setreuid, [if echo $LIBS | grep -- -lucb >/dev/null ;then :; else LIBS="$LIBS -lc -lucb" USEUCB=y;fi])
 ])
 
-AC_OUTPUT([Makefile popt.spec po/Makefile.in],
+AC_OUTPUT([Makefile  po/Makefile.in],
 	[sed -e "/POTFILES =/r po/POTFILES" po/Makefile.in > po/Makefile])
diff --git a/po/popt.pot b/po/popt.pot
index 77169cb..dedc6f7 100644
--- a/po/popt.pot
+++ b/po/popt.pot
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 1998-10-22 15:37-0400\n"
+"POT-Creation-Date: 1998-10-22 16:16-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/popt.spec.in b/popt.spec
similarity index 98%
rename from popt.spec.in
rename to popt.spec
index af2b600..adfea95 100644
--- a/popt.spec.in
+++ b/popt.spec
@@ -1,6 +1,6 @@
 Summary: C library for parsing command line parameters
 Name: popt
-Version: @VERSION@
+Version: 1.2
 Release: 1
 Copyright: LGPL
 Group: Libraries
-- 
Gitee


From 253cfb7196514b4d15fd173bb67fac40f6e05bd1 Mon Sep 17 00:00:00 2001
From: Erik Troan <ewt@redhat.com>
Date: Mon, 26 Oct 1998 21:20:31 +0000
Subject: [PATCH 112/667] don't typedef poptOption on c++

---
 popt.h | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/popt.h b/popt.h
index 7f953ac..ba3a815 100644
--- a/popt.h
+++ b/popt.h
@@ -62,7 +62,9 @@ extern struct poptOption poptHelpOptions[];
 			0, "Help options", NULL },
 
 typedef struct poptContext_s * poptContext;
+#ifndef __cplusplus
 typedef struct poptOption * poptOption;
+#endif
 
 #define POPT_CB_USE_INCLUDE_DATA	((void *) -1)
 enum poptCallbackReason { POPT_CALLBACK_REASON_PRE, 
-- 
Gitee


From 4a01c274f780826c9325ec1776d62611eb636c53 Mon Sep 17 00:00:00 2001
From: Jeff Johnson <n3npq@mac.com>
Date: Mon, 26 Oct 1998 21:53:26 +0000
Subject: [PATCH 113/667] Add install steps for libpopt.a and popt.h

---
 Makefile.am |   4 +-
 Makefile.in | 106 +++++++++++++++++++++++++++++++++++++---------------
 2 files changed, 78 insertions(+), 32 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index e4fed1f..4284910 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -11,8 +11,8 @@ noinst_PROGRAMS = test1
 test1_SOURCES = test1.c
 test1_LDADD = -lpopt
 
-noinst_HEADERS = popt.h
-noinst_LIBRARIES = libpopt.a
+include_HEADERS = popt.h
+lib_LIBRARIES = libpopt.a
 libpopt_a_SOURCES = popt.c findme.c poptparse.c poptconfig.c popthelp.c
 
 CVSTAG = $(PACKAGE)-$(subst .,_,$(VERSION))
diff --git a/Makefile.in b/Makefile.in
index aaed1db..9fe78ed 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -79,8 +79,8 @@ noinst_PROGRAMS = test1
 test1_SOURCES = test1.c
 test1_LDADD = -lpopt
 
-noinst_HEADERS = popt.h
-noinst_LIBRARIES = libpopt.a
+include_HEADERS = popt.h
+lib_LIBRARIES = libpopt.a
 libpopt_a_SOURCES = popt.c findme.c poptparse.c poptconfig.c popthelp.c
 
 CVSTAG = $(PACKAGE)-$(subst .,_,$(VERSION))
@@ -88,7 +88,7 @@ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
 CONFIG_HEADER = config.h
 CONFIG_CLEAN_FILES = 
-LIBRARIES =  $(noinst_LIBRARIES)
+LIBRARIES =  $(lib_LIBRARIES)
 
 
 DEFS = @DEFS@ -I. -I$(srcdir) -I.
@@ -105,7 +105,7 @@ test1_LDFLAGS =
 CFLAGS = @CFLAGS@
 COMPILE = $(CC) $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS)
 LINK = $(CC) $(CFLAGS) $(LDFLAGS) -o $@
-HEADERS =  $(noinst_HEADERS)
+HEADERS =  $(include_HEADERS)
 
 DIST_COMMON =  README COPYING Makefile.am Makefile.in acconfig.h \
 aclocal.m4 config.h.in configure configure.in install-sh missing \
@@ -161,14 +161,37 @@ distclean-hdr:
 
 maintainer-clean-hdr:
 
-mostlyclean-noinstLIBRARIES:
+mostlyclean-libLIBRARIES:
 
-clean-noinstLIBRARIES:
-	-test -z "$(noinst_LIBRARIES)" || rm -f $(noinst_LIBRARIES)
+clean-libLIBRARIES:
+	-test -z "$(lib_LIBRARIES)" || rm -f $(lib_LIBRARIES)
 
-distclean-noinstLIBRARIES:
+distclean-libLIBRARIES:
 
-maintainer-clean-noinstLIBRARIES:
+maintainer-clean-libLIBRARIES:
+
+install-libLIBRARIES: $(lib_LIBRARIES)
+	@$(NORMAL_INSTALL)
+	$(mkinstalldirs) $(DESTDIR)$(libdir)
+	list='$(lib_LIBRARIES)'; for p in $$list; do \
+	  if test -f $$p; then \
+	    echo " $(INSTALL_DATA) $$p $(DESTDIR)$(libdir)/$$p"; \
+	    $(INSTALL_DATA) $$p $(DESTDIR)$(libdir)/$$p; \
+	  else :; fi; \
+	done
+	@$(POST_INSTALL)
+	@list='$(lib_LIBRARIES)'; for p in $$list; do \
+	  if test -f $$p; then \
+	    echo " $(RANLIB) $(DESTDIR)$(libdir)/$$p"; \
+	    $(RANLIB) $(DESTDIR)$(libdir)/$$p; \
+	  else :; fi; \
+	done
+
+uninstall-libLIBRARIES:
+	@$(NORMAL_UNINSTALL)
+	list='$(lib_LIBRARIES)'; for p in $$list; do \
+	  rm -f $(DESTDIR)$(libdir)/$$p; \
+	done
 
 .s.o:
 	$(COMPILE) -c $<
@@ -204,6 +227,21 @@ test1: $(test1_OBJECTS) $(test1_DEPENDENCIES)
 	@rm -f test1
 	$(LINK) $(test1_LDFLAGS) $(test1_OBJECTS) $(test1_LDADD) $(LIBS)
 
+install-includeHEADERS: $(include_HEADERS)
+	@$(NORMAL_INSTALL)
+	$(mkinstalldirs) $(DESTDIR)$(includedir)
+	@list='$(include_HEADERS)'; for p in $$list; do \
+	  if test -f "$$p"; then d= ; else d="$(srcdir)/"; fi; \
+	  echo " $(INSTALL_DATA) $$d$$p $(DESTDIR)$(includedir)/$$p"; \
+	  $(INSTALL_DATA) $$d$$p $(DESTDIR)$(includedir)/$$p; \
+	done
+
+uninstall-includeHEADERS:
+	@$(NORMAL_UNINSTALL)
+	list='$(include_HEADERS)'; for p in $$list; do \
+	  rm -f $(DESTDIR)$(includedir)/$$p; \
+	done
+
 # This directory's subdirectories are mostly independent; you can cd
 # into them and run `make' without going through this Makefile.
 # To change the values of `make' variables: instead of editing Makefiles,
@@ -358,20 +396,27 @@ all-recursive-am: config.h
 
 all-am: Makefile $(LIBRARIES) $(PROGRAMS) $(HEADERS) config.h
 
-install-exec: install-exec-recursive
+install-exec-am: install-libLIBRARIES
+
+install-data-am: install-includeHEADERS
+
+uninstall-am: uninstall-libLIBRARIES uninstall-includeHEADERS
+
+install-exec: install-exec-recursive install-exec-am
 	@$(NORMAL_INSTALL)
 
-install-data: install-data-recursive
+install-data: install-data-recursive install-data-am
 	@$(NORMAL_INSTALL)
 
-install: install-recursive
+install: install-recursive install-exec-am install-data-am
 	@:
 
-uninstall: uninstall-recursive
+uninstall: uninstall-recursive uninstall-am
 
 install-strip:
 	$(MAKE) INSTALL_PROGRAM='$(INSTALL_PROGRAM) -s' INSTALL_SCRIPT='$(INSTALL_PROGRAM)' install
 installdirs: installdirs-recursive
+	$(mkinstalldirs)  $(DATADIR)$(libdir) $(DATADIR)$(includedir)
 
 
 mostlyclean-generic:
@@ -388,20 +433,19 @@ distclean-generic:
 maintainer-clean-generic:
 	-test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES)
 	-test -z "$(BUILT_SOURCES)" || rm -f $(BUILT_SOURCES)
-mostlyclean-am:  mostlyclean-hdr mostlyclean-noinstLIBRARIES \
+mostlyclean-am:  mostlyclean-hdr mostlyclean-libLIBRARIES \
 		mostlyclean-compile mostlyclean-noinstPROGRAMS \
 		mostlyclean-tags mostlyclean-depend mostlyclean-generic
 
-clean-am:  clean-hdr clean-noinstLIBRARIES clean-compile \
+clean-am:  clean-hdr clean-libLIBRARIES clean-compile \
 		clean-noinstPROGRAMS clean-tags clean-depend \
 		clean-generic mostlyclean-am
 
-distclean-am:  distclean-hdr distclean-noinstLIBRARIES distclean-compile \
+distclean-am:  distclean-hdr distclean-libLIBRARIES distclean-compile \
 		distclean-noinstPROGRAMS distclean-tags \
 		distclean-depend distclean-generic clean-am
 
-maintainer-clean-am:  maintainer-clean-hdr \
-		maintainer-clean-noinstLIBRARIES \
+maintainer-clean-am:  maintainer-clean-hdr maintainer-clean-libLIBRARIES \
 		maintainer-clean-compile \
 		maintainer-clean-noinstPROGRAMS maintainer-clean-tags \
 		maintainer-clean-depend maintainer-clean-generic \
@@ -420,23 +464,25 @@ maintainer-clean:  maintainer-clean-recursive maintainer-clean-am
 	-rm -f config.status
 
 .PHONY: mostlyclean-hdr distclean-hdr clean-hdr maintainer-clean-hdr \
-mostlyclean-noinstLIBRARIES distclean-noinstLIBRARIES \
-clean-noinstLIBRARIES maintainer-clean-noinstLIBRARIES \
-mostlyclean-compile distclean-compile clean-compile \
-maintainer-clean-compile mostlyclean-noinstPROGRAMS \
+mostlyclean-libLIBRARIES distclean-libLIBRARIES clean-libLIBRARIES \
+maintainer-clean-libLIBRARIES uninstall-libLIBRARIES \
+install-libLIBRARIES mostlyclean-compile distclean-compile \
+clean-compile maintainer-clean-compile mostlyclean-noinstPROGRAMS \
 distclean-noinstPROGRAMS clean-noinstPROGRAMS \
-maintainer-clean-noinstPROGRAMS install-data-recursive \
-uninstall-data-recursive install-exec-recursive \
-uninstall-exec-recursive installdirs-recursive uninstalldirs-recursive \
-all-recursive check-recursive installcheck-recursive info-recursive \
-dvi-recursive mostlyclean-recursive distclean-recursive clean-recursive \
+maintainer-clean-noinstPROGRAMS uninstall-includeHEADERS \
+install-includeHEADERS install-data-recursive uninstall-data-recursive \
+install-exec-recursive uninstall-exec-recursive installdirs-recursive \
+uninstalldirs-recursive all-recursive check-recursive \
+installcheck-recursive info-recursive dvi-recursive \
+mostlyclean-recursive distclean-recursive clean-recursive \
 maintainer-clean-recursive tags tags-recursive mostlyclean-tags \
 distclean-tags clean-tags maintainer-clean-tags distdir \
 mostlyclean-depend distclean-depend clean-depend \
 maintainer-clean-depend info dvi installcheck all-recursive-am all-am \
-install-exec install-data install uninstall all installdirs \
-mostlyclean-generic distclean-generic clean-generic \
-maintainer-clean-generic clean mostlyclean distclean maintainer-clean
+install-exec-am install-data-am uninstall-am install-exec install-data \
+install uninstall all installdirs mostlyclean-generic distclean-generic \
+clean-generic maintainer-clean-generic clean mostlyclean distclean \
+maintainer-clean
 
 
 .PHONY: archive
-- 
Gitee


From f0d73139d1fdc75daae0df0e3564bf42bfa085b7 Mon Sep 17 00:00:00 2001
From: Erik Troan <ewt@redhat.com>
Date: Tue, 27 Oct 1998 05:38:37 +0000
Subject: [PATCH 114/667] implemented POPT_ARGINFO_INC_DATA

---
 po/Makefile.in |  2 +-
 po/popt.pot    |  2 +-
 popt.c         | 13 +++++++++----
 popt.h         |  3 ++-
 test1.c        |  7 +++++++
 testit.sh      |  1 +
 6 files changed, 21 insertions(+), 7 deletions(-)

diff --git a/po/Makefile.in b/po/Makefile.in
index 2f041d3..604c184 100644
--- a/po/Makefile.in
+++ b/po/Makefile.in
@@ -2,7 +2,7 @@
 srcdir = .
 top_srcdir = ..
 
-INSTALL= /usr/bin/install -c
+INSTALL= /usr/bin/ginstall -c
 INSTALL_PROGRAM= ${INSTALL}
 INSTALL_DATA= ${INSTALL} -m 644
 CC = gcc
diff --git a/po/popt.pot b/po/popt.pot
index dedc6f7..2131d92 100644
--- a/po/popt.pot
+++ b/po/popt.pot
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 1998-10-22 16:16-0400\n"
+"POT-Creation-Date: 1998-10-26 23:55-0500\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/popt.c b/popt.c
index 47f0d00..9ebc81b 100644
--- a/popt.c
+++ b/popt.c
@@ -242,7 +242,11 @@ static const struct poptOption * findOption(const struct poptOption * table,
 	if ((opt->argInfo & POPT_ARG_MASK) == POPT_ARG_INCLUDE_TABLE) {
 	    opt2 = findOption(opt->arg, longName, shortName, callback, 
 			      callbackData, singleDash);
-	    if (opt2) return opt2;
+	    if (opt2) {
+		if (*callback && !*callbackData)
+		    *callbackData = opt->descrip;
+		return opt2;
+	    }
 	} else if ((opt->argInfo & POPT_ARG_MASK) == POPT_ARG_CALLBACK) {
 	    cb = opt;
 	} else if (longName && opt->longName && 
@@ -256,11 +260,12 @@ static const struct poptOption * findOption(const struct poptOption * table,
     }
 
     if (!opt->longName && !opt->shortName) return NULL;
+    *callbackData = NULL;
+    *callback = NULL;
     if (cb) {
 	*callback = cb->arg;
-	*callbackData = cb->descrip;
-    } else {
-	*callback = NULL;
+	if (!(cb->argInfo & POPT_CBFLAG_INC_DATA))
+	    *callbackData = cb->descrip;
     }
 
     return opt;
diff --git a/popt.h b/popt.h
index ba3a815..9bac797 100644
--- a/popt.h
+++ b/popt.h
@@ -23,6 +23,8 @@
 #define POPT_ARGFLAG_DOC_HIDDEN 0x40000000  /* don't show in help/usage */
 #define POPT_CBFLAG_PRE		0x80000000  /* call the callback before parse */
 #define POPT_CBFLAG_POST	0x40000000  /* call the callback after parse */
+#define POPT_CBFLAG_INC_DATA	0x20000000  /* use data from the include line,
+					       not the subtable */
 
 #define POPT_ERROR_NOARG	-10
 #define POPT_ERROR_BADOPT	-11
@@ -66,7 +68,6 @@ typedef struct poptContext_s * poptContext;
 typedef struct poptOption * poptOption;
 #endif
 
-#define POPT_CB_USE_INCLUDE_DATA	((void *) -1)
 enum poptCallbackReason { POPT_CALLBACK_REASON_PRE, 
 			  POPT_CALLBACK_REASON_POST,
 			  POPT_CALLBACK_REASON_OPTION };
diff --git a/test1.c b/test1.c
index cdda82b..28ee269 100644
--- a/test1.c
+++ b/test1.c
@@ -24,6 +24,12 @@ int main(int argc, char ** argv) {
     int help = 0;
     int usage = 0;
     int shortopt = 0;
+    struct poptOption moreCallbackArgs[] = {
+	{ NULL, '\0', POPT_ARG_CALLBACK | POPT_CBFLAG_INC_DATA, 
+		option_callback, 0, NULL },
+	{ "cb2", 'c', POPT_ARG_STRING, NULL, 'c', "Test argument callbacks" },
+	{ NULL, '\0', 0, NULL, 0 } 
+    };
     struct poptOption callbackArgs[] = {
 	{ NULL, '\0', POPT_ARG_CALLBACK, option_callback, 0, "sampledata" },
 	{ "cb", 'c', POPT_ARG_STRING, NULL, 'c', "Test argument callbacks" },
@@ -35,6 +41,7 @@ int main(int argc, char ** argv) {
 	{ NULL, '\0', 0, NULL, 0 } 
     };
     struct poptOption options[] = {
+	{ NULL, '\0', POPT_ARG_INCLUDE_TABLE, &moreCallbackArgs, 0, "arg for cb2" },
 	{ "arg1", '\0', 0, &arg1, 0, "First argument with a really long" 
 	    " description. After all, we have to test argument help"
 	    " wrapping somehow, right?", NULL },
diff --git a/testit.sh b/testit.sh
index a231df8..bdb78ab 100755
--- a/testit.sh
+++ b/testit.sh
@@ -41,6 +41,7 @@ run test1 "test1 - 22" "./test1 ; --arg2 something -- more args" -T something -a
 run test1 "test1 - 23" "./test1 ; --echo-args -a" --echo-args -e -a
 run test1 "test1 - 24" "arg1: 0 arg2: (none) short: 1" -shortoption
 run test1 "test1 - 25" "arg1: 0 arg2: (none) short: 1" --shortoption
+run test1 "test1 - 26" "callback: c arg for cb2 foo arg1: 0 arg2: (none)" --cb2 foo
 
 echo ""
 echo "Passed."
-- 
Gitee


From 200b729a4d76c40261985d706d5018f7566ee945 Mon Sep 17 00:00:00 2001
From: Jeff Johnson <n3npq@mac.com>
Date: Thu, 29 Oct 1998 13:49:24 +0000
Subject: [PATCH 115/667] Sanity.

---
 po/Makefile.in | 2 +-
 po/popt.pot    | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/po/Makefile.in b/po/Makefile.in
index 604c184..2f041d3 100644
--- a/po/Makefile.in
+++ b/po/Makefile.in
@@ -2,7 +2,7 @@
 srcdir = .
 top_srcdir = ..
 
-INSTALL= /usr/bin/ginstall -c
+INSTALL= /usr/bin/install -c
 INSTALL_PROGRAM= ${INSTALL}
 INSTALL_DATA= ${INSTALL} -m 644
 CC = gcc
diff --git a/po/popt.pot b/po/popt.pot
index 2131d92..c413040 100644
--- a/po/popt.pot
+++ b/po/popt.pot
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 1998-10-26 23:55-0500\n"
+"POT-Creation-Date: 1998-10-27 11:46-0500\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
-- 
Gitee


From 55fb447c7ed0521114efd15824e74fdd2ffe9d7c Mon Sep 17 00:00:00 2001
From: Erik Troan <ewt@redhat.com>
Date: Thu, 29 Oct 1998 22:52:03 +0000
Subject: [PATCH 116/667] added POPT_ARG_INTL_DOMAIN (Elliot Lee) updated
 Makefile's to be more GNUish (Elliot Lee)

---
 CHANGES           |  4 +++
 po/Makefile.in.in |  2 ++
 po/popt.pot       |  6 ++--
 popt.h            |  4 +++
 popthelp.c        | 82 +++++++++++++++++++++++++++++++++--------------
 poptint.h         |  4 ++-
 6 files changed, 74 insertions(+), 28 deletions(-)

diff --git a/CHANGES b/CHANGES
index 627f921..6e29d22 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,7 @@
+1.1 -> 1.2.1
+	- added POPT_ARG_INTL_DOMAIN (Elliot Lee)
+	- updated Makefile's to be more GNUish (Elliot Lee)
+
 1.1 -> 1.2
 	- added popt.3 man page (Robert Lynch)
 	- don't use mmap anymore (its lack of portability isn't worth the
diff --git a/po/Makefile.in.in b/po/Makefile.in.in
index 81bd73d..602496d 100644
--- a/po/Makefile.in.in
+++ b/po/Makefile.in.in
@@ -1,4 +1,6 @@
+prefix=@prefix@
 srcdir = @srcdir@
+datadir = @datadir@
 top_srcdir = @top_srcdir@
 VPATH = $(srcdir)
 
diff --git a/po/popt.pot b/po/popt.pot
index c413040..8819dab 100644
--- a/po/popt.pot
+++ b/po/popt.pot
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 1998-10-27 11:46-0500\n"
+"POT-Creation-Date: 1998-10-29 17:51-0500\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -14,10 +14,10 @@ msgstr ""
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: ENCODING\n"
 
-#: ../popthelp.c:29
+#: ../popthelp.c:31
 msgid "Show this help message"
 msgstr ""
 
-#: ../popthelp.c:30
+#: ../popthelp.c:32
 msgid "Display brief usage message"
 msgstr ""
diff --git a/popt.h b/popt.h
index 9bac797..e216049 100644
--- a/popt.h
+++ b/popt.h
@@ -18,6 +18,10 @@
 					   set first in table; arg points 
 					   to callback, descrip points to 
 					   callback data to pass */
+#define POPT_ARG_INTL_DOMAIN    6       /* set the translation domain
+					   for this table and any
+					   included tables; arg points
+					   to the domain string */
 #define POPT_ARG_MASK		0x0000FFFF
 #define POPT_ARGFLAG_ONEDASH	0x80000000  /* allow -longoption */
 #define POPT_ARGFLAG_DOC_HIDDEN 0x40000000  /* don't show in help/usage */
diff --git a/popthelp.c b/popthelp.c
index 021e044..c454640 100644
--- a/popthelp.c
+++ b/popthelp.c
@@ -1,3 +1,5 @@
+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 4 -*- */
+
 /* (C) 1998 Red Hat Software, Inc. -- Licensing details are in the COPYING
    file accompanying popt source distributions, available from 
    ftp://ftp.redhat.com/pub/code/popt */
@@ -18,9 +20,9 @@ static void displayArgs(poptContext con, enum poptCallbackReason foo,
 			struct poptOption * key, 
 			const char * arg, void * data) {
     if (key->shortName== '?')
-	poptPrintHelp(con, stderr, 0);
+	poptPrintHelp(con, stdout, 0);
     else
-	poptPrintUsage(con, stderr, 0);
+	poptPrintUsage(con, stdout, 0);
     exit(0);
 }
 
@@ -31,26 +33,44 @@ struct poptOption poptHelpOptions[] = {
     { NULL, '\0', 0, NULL, 0 }
 } ;
 
-static const char * getArgDescrip(const struct poptOption * opt) {
+
+static const char *
+getTableTranslationDomain(const struct poptOption *table)
+{
+  const struct poptOption *opt;
+
+  for(opt = table;
+      opt->longName || opt->shortName || opt->arg;
+      opt++) {
+    if(opt->argInfo == POPT_ARG_INTL_DOMAIN)
+      return opt->arg;
+  }
+
+  return NULL;
+}
+
+static const char * getArgDescrip(const struct poptOption * opt,
+				  const char *translation_domain) {
     if (!(opt->argInfo & POPT_ARG_MASK)) return NULL;
 
     if (opt == (poptHelpOptions + 1) || opt == (poptHelpOptions + 2))
 	if (opt->argDescrip) return POPT_(opt->argDescrip);
 
-    if (opt->argDescrip) return _(opt->argDescrip);
+    if (opt->argDescrip) return D_(translation_domain, opt->argDescrip);
     return POPT_("ARG");
 }
 
 static void singleOptionHelp(FILE * f, int maxLeftCol, 
-			     const struct poptOption * opt) {
+			     const struct poptOption * opt,
+			     const char *translation_domain) {
     int indentLength = maxLeftCol + 5;
     int lineLength = 79 - indentLength;
-    const char * help = _(opt->descrip);
+    const char * help = D_(translation_domain, opt->descrip);
     int helpLength;
     const char * ch;
     char format[10];
     char * left = alloca(maxLeftCol + 1);
-    const char * argDescrip = getArgDescrip(opt);
+    const char * argDescrip = getArgDescrip(opt, translation_domain);
 
     *left = '\0';
     if (opt->longName && opt->shortName)
@@ -90,14 +110,15 @@ static void singleOptionHelp(FILE * f, int maxLeftCol,
     if (helpLength) fprintf(f, "%s\n", help);
 }
 
-static int maxArgWidth(const struct poptOption * opt) {
+static int maxArgWidth(const struct poptOption * opt,
+		       const char * translation_domain) {
     int max = 0;
     int this;
     const char * s;
     
     while (opt->longName || opt->shortName || opt->arg) {
 	if ((opt->argInfo & POPT_ARG_MASK) == POPT_ARG_INCLUDE_TABLE) {
-	    this = maxArgWidth(opt->arg);
+	    this = maxArgWidth(opt->arg, translation_domain);
 	    if (this > max) max = this;
 	} else if (!(opt->argInfo & POPT_ARGFLAG_DOC_HIDDEN)) {
 	    this = opt->shortName ? 2 : 0;
@@ -106,7 +127,7 @@ static int maxArgWidth(const struct poptOption * opt) {
 		this += strlen(opt->longName) + 2;
 	    }
 
-	    s = getArgDescrip(opt);
+	    s = getArgDescrip(opt, translation_domain);
 	    if (s)
 		this += strlen(s) + 1;
 	    if (this > max) max = this;
@@ -119,23 +140,30 @@ static int maxArgWidth(const struct poptOption * opt) {
 }
 
 static void singleTableHelp(FILE * f, const struct poptOption * table, 
-			    int left) {
+			    int left,
+			    const char *translation_domain) {
     const struct poptOption * opt;
+    const char *sub_transdom;
 
     opt = table;
     while (opt->longName || opt->shortName || opt->arg) {
 	if ((opt->longName || opt->shortName) && 
 	    !(opt->argInfo & POPT_ARGFLAG_DOC_HIDDEN))
-	    singleOptionHelp(f, left, opt);
+	    singleOptionHelp(f, left, opt, translation_domain);
 	opt++;
     }
 
     opt = table;
     while (opt->longName || opt->shortName || opt->arg) {
 	if ((opt->argInfo & POPT_ARG_MASK) == POPT_ARG_INCLUDE_TABLE) {
+	    sub_transdom = getTableTranslationDomain(opt->arg);
+	    if(!sub_transdom)
+		sub_transdom = translation_domain;
+	    
 	    if (opt->descrip)
-		fprintf(f, "\n%s\n", _(opt->descrip));
-	    singleTableHelp(f, opt->arg, left);
+		fprintf(f, "\n%s\n", D_(sub_transdom, opt->descrip));
+
+	    singleTableHelp(f, opt->arg, left, sub_transdom);
 	}
 	opt++;
     }
@@ -165,16 +193,17 @@ void poptPrintHelp(poptContext con, FILE * f, int flags) {
     else
 	fprintf(f, " %s\n", POPT_("[OPTION...]"));
 
-    leftColWidth = maxArgWidth(con->options);
-    singleTableHelp(f, con->options, leftColWidth);
+    leftColWidth = maxArgWidth(con->options, NULL);
+    singleTableHelp(f, con->options, leftColWidth, NULL);
 }
 
 static int singleOptionUsage(FILE * f, int cursor, 
-			      const struct poptOption * opt) {
+			     const struct poptOption * opt,
+			     const char *translation_domain) {
     int len = 3;
     char shortStr[2];
     const char * item = shortStr;
-    const char * argDescrip = getArgDescrip(opt);
+    const char * argDescrip = getArgDescrip(opt, translation_domain);
 
     if (opt->shortName) {
 	if (!(opt->argInfo & POPT_ARG_MASK)) 
@@ -204,16 +233,21 @@ static int singleOptionUsage(FILE * f, int cursor,
     return cursor + len + 1;
 }
 
-int singleTableUsage(FILE * f, int cursor, const struct poptOption * table) {
+int singleTableUsage(FILE * f, int cursor, const struct poptOption * table,
+		     const char *translation_domain) {
     const struct poptOption * opt;
     
     opt = table;
     while (opt->longName || opt->shortName || opt->arg) {
-	if ((opt->longName || opt->shortName) && 
-	    !(opt->argInfo & POPT_ARGFLAG_DOC_HIDDEN))
-	    cursor = singleOptionUsage(f, cursor, opt);
+        if ((opt->argInfo & POPT_ARG_MASK) == POPT_ARG_INTL_DOMAIN)
+	    translation_domain = (const char *)opt->arg;
 	else if ((opt->argInfo & POPT_ARG_MASK) == POPT_ARG_INCLUDE_TABLE) 
-	    cursor = singleTableUsage(f, cursor, opt->arg);
+	    cursor = singleTableUsage(f, cursor, opt->arg,
+				      translation_domain);
+	else if ((opt->longName || opt->shortName) && 
+		 !(opt->argInfo & POPT_ARGFLAG_DOC_HIDDEN))
+	  cursor = singleOptionUsage(f, cursor, opt, translation_domain);
+
 	opt++;
     }
 
@@ -251,7 +285,7 @@ void poptPrintUsage(poptContext con, FILE * f, int flags) {
 
     cursor = showHelpIntro(con, f);
     cursor += showShortOptions(con->options, f, NULL);
-    singleTableUsage(f, cursor, con->options);
+    singleTableUsage(f, cursor, con->options, NULL);
 
     if (con->otherHelp) {
 	cursor += strlen(con->otherHelp) + 1;
diff --git a/poptint.h b/poptint.h
index 5d99be5..8fc6a84 100644
--- a/poptint.h
+++ b/poptint.h
@@ -54,9 +54,11 @@ struct poptContext_s {
 #endif
 
 #ifdef HAVE_DGETTEXT
-#define POPT_(foo) dgettext("popt", foo)
+#define D_(dom, str) dgettext(dom, str)
+#define POPT_(foo) D_("popt", foo)
 #else
 #define POPT_(foo) (foo)
+#define D_(dom, str) (str)
 #endif
 
 #define N_(foo) (foo)
-- 
Gitee


From bc6e1bbda7b10da6f5a2d0f745d175a7d491925b Mon Sep 17 00:00:00 2001
From: Erik Troan <ewt@redhat.com>
Date: Thu, 29 Oct 1998 22:54:31 +0000
Subject: [PATCH 117/667] updated to version 1.2.1

---
 configure.in   | 2 +-
 po/Makefile.in | 4 +++-
 popt.spec      | 2 +-
 3 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/configure.in b/configure.in
index 0b0d0a8..8c1633f 100755
--- a/configure.in
+++ b/configure.in
@@ -1,5 +1,5 @@
 AC_INIT(popt.h)
-AM_INIT_AUTOMAKE(popt, 1.2)
+AM_INIT_AUTOMAKE(popt, 1.2.1)
 AM_CONFIG_HEADER(config.h)
 
 AC_PROG_CC
diff --git a/po/Makefile.in b/po/Makefile.in
index 2f041d3..75ece20 100644
--- a/po/Makefile.in
+++ b/po/Makefile.in
@@ -1,8 +1,10 @@
 # Generated automatically from Makefile.in.in by configure.
+prefix=/usr
 srcdir = .
+datadir = ${prefix}/share
 top_srcdir = ..
 
-INSTALL= /usr/bin/install -c
+INSTALL= /usr/bin/ginstall -c
 INSTALL_PROGRAM= ${INSTALL}
 INSTALL_DATA= ${INSTALL} -m 644
 CC = gcc
diff --git a/popt.spec b/popt.spec
index adfea95..718e75c 100644
--- a/popt.spec
+++ b/popt.spec
@@ -1,6 +1,6 @@
 Summary: C library for parsing command line parameters
 Name: popt
-Version: 1.2
+Version: 1.2.1
 Release: 1
 Copyright: LGPL
 Group: Libraries
-- 
Gitee


From 07aae9ba68379141564df2f9dab5a2d8e7e42cce Mon Sep 17 00:00:00 2001
From: Jeff Johnson <n3npq@mac.com>
Date: Tue, 3 Nov 1998 19:13:50 +0000
Subject: [PATCH 118/667] Set value of LOCALEDIR. Change name of installed file
 to popt.mo.

---
 po/Makefile.in    | 6 +++---
 po/Makefile.in.in | 6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/po/Makefile.in b/po/Makefile.in
index 75ece20..ec596f3 100644
--- a/po/Makefile.in
+++ b/po/Makefile.in
@@ -1,10 +1,10 @@
 # Generated automatically from Makefile.in.in by configure.
-prefix=/usr
 srcdir = .
-datadir = ${prefix}/share
 top_srcdir = ..
 
-INSTALL= /usr/bin/ginstall -c
+LOCALEDIR=/usr/local/share/locale
+
+INSTALL= /usr/bin/install -c
 INSTALL_PROGRAM= ${INSTALL}
 INSTALL_DATA= ${INSTALL} -m 644
 CC = gcc
diff --git a/po/Makefile.in.in b/po/Makefile.in.in
index 602496d..3ba7cbd 100644
--- a/po/Makefile.in.in
+++ b/po/Makefile.in.in
@@ -1,9 +1,9 @@
-prefix=@prefix@
 srcdir = @srcdir@
-datadir = @datadir@
 top_srcdir = @top_srcdir@
 VPATH = $(srcdir)
 
+LOCALEDIR=@prefix@/share/locale
+
 INSTALL= @INSTALL@
 INSTALL_PROGRAM= @INSTALL_PROGRAM@
 INSTALL_DATA= @INSTALL_DATA@
@@ -58,7 +58,7 @@ install:
 	    l=`basename $$n .mo`; \
 	    $(INSTALL) -m 755 -d $(installprefix)/$(LOCALEDIR)/$$l; \
 	    $(INSTALL) -m 755 -d $(installprefix)/$(LOCALEDIR)/$$l/LC_MESSAGES; \
-	    $(INSTALL) -m 644 $$n $(installprefix)/$(LOCALEDIR)/$$l/LC_MESSAGES/rpm.mo; \
+	    $(INSTALL) -m 644 $$n $(installprefix)/$(LOCALEDIR)/$$l/LC_MESSAGES/popt.mo; \
 	done
 
 check:
-- 
Gitee


From 70d7f0bed66a0ea138d14198acb71b296ab9a9dd Mon Sep 17 00:00:00 2001
From: Jeff Johnson <n3npq@mac.com>
Date: Fri, 6 Nov 1998 22:12:05 +0000
Subject: [PATCH 119/667] add new Epoch: keyword just like Serial:.

---
 po/Makefile.in | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/po/Makefile.in b/po/Makefile.in
index ec596f3..a90f859 100644
--- a/po/Makefile.in
+++ b/po/Makefile.in
@@ -2,7 +2,7 @@
 srcdir = .
 top_srcdir = ..
 
-LOCALEDIR=/usr/local/share/locale
+LOCALEDIR=/usr/share/locale
 
 INSTALL= /usr/bin/install -c
 INSTALL_PROGRAM= ${INSTALL}
@@ -58,7 +58,7 @@ install:
 	    l=`basename $$n .mo`; \
 	    $(INSTALL) -m 755 -d $(installprefix)/$(LOCALEDIR)/$$l; \
 	    $(INSTALL) -m 755 -d $(installprefix)/$(LOCALEDIR)/$$l/LC_MESSAGES; \
-	    $(INSTALL) -m 644 $$n $(installprefix)/$(LOCALEDIR)/$$l/LC_MESSAGES/rpm.mo; \
+	    $(INSTALL) -m 644 $$n $(installprefix)/$(LOCALEDIR)/$$l/LC_MESSAGES/popt.mo; \
 	done
 
 check:
-- 
Gitee


From bd7cc753e9fef375958a6684eab1a3abe7edf7cd Mon Sep 17 00:00:00 2001
From: Jeff Johnson <n3npq@mac.com>
Date: Sat, 7 Nov 1998 23:55:43 +0000
Subject: [PATCH 120/667] permit --rmsource --force even if sources/patches are
 missing.

---
 po/popt.pot | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/po/popt.pot b/po/popt.pot
index 8819dab..f58b754 100644
--- a/po/popt.pot
+++ b/po/popt.pot
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 1998-10-29 17:51-0500\n"
+"POT-Creation-Date: 1998-11-07 18:09-0500\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
-- 
Gitee


From e1fbfaf0ce079214cd18ccd017faf064fff82f62 Mon Sep 17 00:00:00 2001
From: Jeff Johnson <n3npq@mac.com>
Date: Sun, 8 Nov 1998 00:15:42 +0000
Subject: [PATCH 121/667] permit --rmsource --force even if sources/patches are
 missing.

---
 po/Makefile.in | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/po/Makefile.in b/po/Makefile.in
index a90f859..7c94655 100644
--- a/po/Makefile.in
+++ b/po/Makefile.in
@@ -2,7 +2,7 @@
 srcdir = .
 top_srcdir = ..
 
-LOCALEDIR=/usr/share/locale
+LOCALEDIR=/usr/local/share/locale
 
 INSTALL= /usr/bin/install -c
 INSTALL_PROGRAM= ${INSTALL}
-- 
Gitee


From 2832cf2f7c883fd8da824e641b19c52acc7d48ca Mon Sep 17 00:00:00 2001
From: Erik Troan <ewt@redhat.com>
Date: Mon, 16 Nov 1998 21:00:43 +0000
Subject: [PATCH 122/667] bug in alias handling (showed up w/ --triggers)

---
 popt.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/popt.c b/popt.c
index 9ebc81b..ca97e5d 100644
--- a/popt.c
+++ b/popt.c
@@ -154,7 +154,8 @@ static int handleAlias(poptContext con, char * longName, char shortName,
     if (con->os->currAlias && con->os->currAlias->longName && longName &&
 	!strcmp(con->os->currAlias->longName, longName)) 
 	return 0;
-    if (con->os->currAlias && shortName == con->os->currAlias->shortName)
+    if (con->os->currAlias && shortName && 
+	    shortName == con->os->currAlias->shortName)
 	return 0;
 
     i = con->numAliases - 1;
-- 
Gitee


From e8b3b5e495c129367ef78ef3472f3638083989ca Mon Sep 17 00:00:00 2001
From: Erik Troan <ewt@redhat.com>
Date: Mon, 16 Nov 1998 21:01:30 +0000
Subject: [PATCH 123/667] *** empty log message ***

---
 CHANGES | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/CHANGES b/CHANGES
index 6e29d22..e1950b3 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,4 +1,8 @@
-1.1 -> 1.2.1
+1.2.1 -> 1.2.2
+	- fixed bug in chaind alias happens which seems to have only
+	  affected --triggers in rpm
+
+1.2 -> 1.2.1
 	- added POPT_ARG_INTL_DOMAIN (Elliot Lee)
 	- updated Makefile's to be more GNUish (Elliot Lee)
 
-- 
Gitee


From 61b23f1982d1a0d1f1000db6aa792de21a3c2de9 Mon Sep 17 00:00:00 2001
From: Jeff Johnson <n3npq@mac.com>
Date: Wed, 18 Nov 1998 21:42:01 +0000
Subject: [PATCH 124/667] implement abstract fd type almost everywhere.

---
 po/Makefile.in | 2 +-
 po/popt.pot    | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/po/Makefile.in b/po/Makefile.in
index 7c94655..a90f859 100644
--- a/po/Makefile.in
+++ b/po/Makefile.in
@@ -2,7 +2,7 @@
 srcdir = .
 top_srcdir = ..
 
-LOCALEDIR=/usr/local/share/locale
+LOCALEDIR=/usr/share/locale
 
 INSTALL= /usr/bin/install -c
 INSTALL_PROGRAM= ${INSTALL}
diff --git a/po/popt.pot b/po/popt.pot
index f58b754..4940540 100644
--- a/po/popt.pot
+++ b/po/popt.pot
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 1998-11-07 18:09-0500\n"
+"POT-Creation-Date: 1998-11-18 12:51-0500\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
-- 
Gitee


From a8d089637ba38a6aca2bf7cddf0d556c36815604 Mon Sep 17 00:00:00 2001
From: "Michael K. Johnson" <johnsonm@redhat.com>
Date: Thu, 19 Nov 1998 20:56:15 +0000
Subject: [PATCH 125/667] Improved man page a bit, install by default. Added
 POPT_ARG_VAL

---
 Makefile.am |  1 +
 Makefile.in | 69 +++++++++++++++++++++++++++++++++++++++++++----------
 popt.3      | 34 ++++++++++++++++----------
 popt.c      |  6 ++++-
 popt.h      |  1 +
 popt.spec   |  4 ++++
 6 files changed, 89 insertions(+), 26 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index 4284910..9777e2e 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -14,6 +14,7 @@ test1_LDADD = -lpopt
 include_HEADERS = popt.h
 lib_LIBRARIES = libpopt.a
 libpopt_a_SOURCES = popt.c findme.c poptparse.c poptconfig.c popthelp.c
+man_MANS = popt.3
 
 CVSTAG = $(PACKAGE)-$(subst .,_,$(VERSION))
 
diff --git a/Makefile.in b/Makefile.in
index 9fe78ed..3ab14d4 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -82,6 +82,7 @@ test1_LDADD = -lpopt
 include_HEADERS = popt.h
 lib_LIBRARIES = libpopt.a
 libpopt_a_SOURCES = popt.c findme.c poptparse.c poptconfig.c popthelp.c
+man_MANS = popt.3
 
 CVSTAG = $(PACKAGE)-$(subst .,_,$(VERSION))
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
@@ -105,11 +106,15 @@ test1_LDFLAGS =
 CFLAGS = @CFLAGS@
 COMPILE = $(CC) $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS)
 LINK = $(CC) $(CFLAGS) $(LDFLAGS) -o $@
+man3dir = $(mandir)/man3
+MANS = $(man_MANS)
+
+NROFF = nroff
 HEADERS =  $(include_HEADERS)
 
 DIST_COMMON =  README COPYING Makefile.am Makefile.in acconfig.h \
-aclocal.m4 config.h.in configure configure.in install-sh missing \
-mkinstalldirs stamp-h.in
+aclocal.m4 config.h.in configure.in install-sh missing mkinstalldirs \
+stamp-h.in
 
 
 DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
@@ -227,6 +232,45 @@ test1: $(test1_OBJECTS) $(test1_DEPENDENCIES)
 	@rm -f test1
 	$(LINK) $(test1_LDFLAGS) $(test1_OBJECTS) $(test1_LDADD) $(LIBS)
 
+install-man3:
+	$(mkinstalldirs) $(DESTDIR)$(man3dir)
+	@list='$(man3_MANS)'; \
+	l2='$(man_MANS)'; for i in $$l2; do \
+	  case "$$i" in \
+	    *.3*) list="$$list $$i" ;; \
+	  esac; \
+	done; \
+	for i in $$list; do \
+	  if test -f $(srcdir)/$$i; then file=$(srcdir)/$$i; \
+	  else file=$$i; fi; \
+	  ext=`echo $$i | sed -e 's/^.*\\.//'`; \
+	  inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \
+	  inst=`echo $$inst | sed '$(transform)'`.$$ext; \
+	  echo " $(INSTALL_DATA) $$file $(DESTDIR)$(man3dir)/$$inst"; \
+	  $(INSTALL_DATA) $$file $(DESTDIR)$(man3dir)/$$inst; \
+	done
+
+uninstall-man3:
+	@list='$(man3_MANS)'; \
+	l2='$(man_MANS)'; for i in $$l2; do \
+	  case "$$i" in \
+	    *.3*) list="$$list $$i" ;; \
+	  esac; \
+	done; \
+	for i in $$list; do \
+	  ext=`echo $$i | sed -e 's/^.*\\.//'`; \
+	  inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \
+	  inst=`echo $$inst | sed '$(transform)'`.$$ext; \
+	  echo " rm -f $(DESTDIR)$(man3dir)/$$inst"; \
+	  rm -f $(DESTDIR)$(man3dir)/$$inst; \
+	done
+install-man: $(MANS)
+	@$(NORMAL_INSTALL)
+	$(MAKE) install-man3
+uninstall-man:
+	@$(NORMAL_UNINSTALL)
+	$(MAKE) uninstall-man3
+
 install-includeHEADERS: $(include_HEADERS)
 	@$(NORMAL_INSTALL)
 	$(mkinstalldirs) $(DESTDIR)$(includedir)
@@ -394,13 +438,13 @@ installcheck: installcheck-recursive
 all-recursive-am: config.h
 	$(MAKE) all-recursive
 
-all-am: Makefile $(LIBRARIES) $(PROGRAMS) $(HEADERS) config.h
+all-am: Makefile $(LIBRARIES) $(PROGRAMS) $(MANS) $(HEADERS) config.h
 
 install-exec-am: install-libLIBRARIES
 
-install-data-am: install-includeHEADERS
+install-data-am: install-man install-includeHEADERS
 
-uninstall-am: uninstall-libLIBRARIES uninstall-includeHEADERS
+uninstall-am: uninstall-libLIBRARIES uninstall-man uninstall-includeHEADERS
 
 install-exec: install-exec-recursive install-exec-am
 	@$(NORMAL_INSTALL)
@@ -416,7 +460,8 @@ uninstall: uninstall-recursive uninstall-am
 install-strip:
 	$(MAKE) INSTALL_PROGRAM='$(INSTALL_PROGRAM) -s' INSTALL_SCRIPT='$(INSTALL_PROGRAM)' install
 installdirs: installdirs-recursive
-	$(mkinstalldirs)  $(DATADIR)$(libdir) $(DATADIR)$(includedir)
+	$(mkinstalldirs)  $(DATADIR)$(libdir) $(DESTDIR)$(mandir)/man3 \
+		$(DATADIR)$(includedir)
 
 
 mostlyclean-generic:
@@ -469,12 +514,12 @@ maintainer-clean-libLIBRARIES uninstall-libLIBRARIES \
 install-libLIBRARIES mostlyclean-compile distclean-compile \
 clean-compile maintainer-clean-compile mostlyclean-noinstPROGRAMS \
 distclean-noinstPROGRAMS clean-noinstPROGRAMS \
-maintainer-clean-noinstPROGRAMS uninstall-includeHEADERS \
-install-includeHEADERS install-data-recursive uninstall-data-recursive \
-install-exec-recursive uninstall-exec-recursive installdirs-recursive \
-uninstalldirs-recursive all-recursive check-recursive \
-installcheck-recursive info-recursive dvi-recursive \
-mostlyclean-recursive distclean-recursive clean-recursive \
+maintainer-clean-noinstPROGRAMS install-man3 uninstall-man3 install-man \
+uninstall-man uninstall-includeHEADERS install-includeHEADERS \
+install-data-recursive uninstall-data-recursive install-exec-recursive \
+uninstall-exec-recursive installdirs-recursive uninstalldirs-recursive \
+all-recursive check-recursive installcheck-recursive info-recursive \
+dvi-recursive mostlyclean-recursive distclean-recursive clean-recursive \
 maintainer-clean-recursive tags tags-recursive mostlyclean-tags \
 distclean-tags clean-tags maintainer-clean-tags distdir \
 mostlyclean-depend distclean-depend clean-depend \
diff --git a/popt.3 b/popt.3
index eaf6c40..e299826 100644
--- a/popt.3
+++ b/popt.3
@@ -110,23 +110,23 @@ first two members,
 the first is a long name, while the latter is a single character.
 .sp
 The 
-.IR argInfo " member tell popt what type of argument is expected" 
+.IR argInfo " member tells popt what type of argument is expected" 
 after the argument.  If no option is expected,
-.BR POPT_ARG_NONE " should be used.  (Connoisseurs of " getopt() 
-.RI "will note that " argInfo " is the only required field of "
-.BR "struct poptOption" " that is not directly analogous to a field in "
-.RB "the " getopt_long() " argument table.  The similarity between the "
-.RB "two allows for easy transitions from " getopt_long " to popt.) " 
+.B POPT_ARG_NONE
+should be used.
 The rest of the valid values are shown in the following table:
 .sp
-.nf
-.B  "   Value            Description                arg Type"
-.BR POPT_ARG_NONE "   No argument expected             int"
-.BR POPT_ARG_STRING " No type checking to be performed char *"
-.BR POPT_ARG_INT "    An integer argument is expected  int"
-.BR POPT_ARG_LONG "   A long integer is expected       long"
+.TS
+lfB lfB lfB
+lfB lfR lfR.
+Value	Description	arg Type
+POPT_ARG_NONE	No argument expected	int
+POPT_ARG_STRING	No type checking to be performed	char *
+POPT_ARG_INT	An integer argument is expected	int
+POPT_ARG_LONG	A long integer is expected	long
+POPT_ARG_VAL	Integer value taken from \f(CWval\fR	int
+.TE
 .sp
-.fi
 If \fIargInfo\fR value is logically or'd with \fBPOPT_ARGFLAG_ONEDASH\fR,
 the long argument may be given with a single - instead of two. For example,
 if \fB--longopt\fR is an option with \fBPOPT_ARGFLAG_ONEDASH\fR, is
@@ -149,6 +149,14 @@ an argument, the variable that
 .BR POPT_ARG_INT " and " POPT_ARG_LONG " are converted to the 
 appropriate type, and an error returned if the conversion fails.
 .sp
+\fBPOPT_ARG_VAL\fR causes \fIarg\fP to be set to the (integer) value of
+\fIval\fP when the argument is found.  This is most often useful for
+mutually-exclusive arguments in cases where it is not an error for
+multiple arguments to occur and where you want the last argument
+specified to win; for example, "rm -i -f".  \fBPOPT_ARG_VAL\fP causes
+the parsing function not to return a value, since the value of \fIval\fP
+has already been used.
+.sp
 .RI "The next option, " val ", is the value popt's parsing function 
 should return when the option is encountered.  If it is 0, the parsing
 function does not return a value, instead parsing the next 
diff --git a/popt.c b/popt.c
index ca97e5d..f9e6153 100644
--- a/popt.c
+++ b/popt.c
@@ -392,6 +392,10 @@ int poptGetNextOpt(poptContext con) {
 		    *((char **) opt->arg) = con->os->nextArg;
 		    break;
 
+		  case POPT_ARG_VAL:
+		    *((int *) opt->arg) = opt->val;
+		    break;
+
 		  case POPT_ARG_INT:
 		  case POPT_ARG_LONG:
 		    aLong = strtol(con->os->nextArg, &end, 0);
@@ -419,7 +423,7 @@ int poptGetNextOpt(poptContext con) {
 
 	if (cb)
 	    cb(con, POPT_CALLBACK_REASON_OPTION, opt, con->os->nextArg, cbData);
-	else if (opt->val) 
+	else if (opt->val && ((opt->argInfo & POPT_ARG_MASK) != POPT_ARG_VAL))
 	    done = 1;
 
 	if ((con->finalArgvCount + 2) >= (con->finalArgvAlloced)) {
diff --git a/popt.h b/popt.h
index e216049..069cab1 100644
--- a/popt.h
+++ b/popt.h
@@ -22,6 +22,7 @@
 					   for this table and any
 					   included tables; arg points
 					   to the domain string */
+#define POPT_ARG_VAL		7	/* arg should take value val */
 #define POPT_ARG_MASK		0x0000FFFF
 #define POPT_ARGFLAG_ONEDASH	0x80000000  /* allow -longoption */
 #define POPT_ARGFLAG_DOC_HIDDEN 0x40000000  /* don't show in help/usage */
diff --git a/popt.spec b/popt.spec
index 718e75c..3a2ddc1 100644
--- a/popt.spec
+++ b/popt.spec
@@ -32,8 +32,12 @@ rm -rf $RPM_BUILD_ROOT
 %files
 %attr(0644, root, root) /usr/lib/libpopt.a
 %attr(0644, root, root) /usr/include/popt.h
+%attr(0644, root, root) /usr/man/man3/popt.3
 
 %changelog
+* Tue Nov 17 1998 Michael K. Johnson <johnsonm@redhat.com>
+- added man page to default install
+
 * Thu Oct 22 1998 Erik Troan <ewt@redhat.com>
 - see CHANGES file for 1.2
 
-- 
Gitee


From a2c845365e82fc9aaf1af9f20170e37d01cf62d7 Mon Sep 17 00:00:00 2001
From: Jeff Johnson <n3npq@mac.com>
Date: Fri, 20 Nov 1998 00:29:46 +0000
Subject: [PATCH 126/667] permit "rpm -q --specfile ... file.spec" queries.

---
 po/popt.pot | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/po/popt.pot b/po/popt.pot
index 4940540..a23c3be 100644
--- a/po/popt.pot
+++ b/po/popt.pot
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 1998-11-18 12:51-0500\n"
+"POT-Creation-Date: 1998-11-19 18:16-0500\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
-- 
Gitee


From bd8c8f8a5fcc2fd9787bef9828603cb7d5592df0 Mon Sep 17 00:00:00 2001
From: Jeff Johnson <n3npq@mac.com>
Date: Tue, 24 Nov 1998 19:30:49 +0000
Subject: [PATCH 127/667] Clean up on files.c.

---
 po/popt.pot | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/po/popt.pot b/po/popt.pot
index a23c3be..f9857f9 100644
--- a/po/popt.pot
+++ b/po/popt.pot
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 1998-11-19 18:16-0500\n"
+"POT-Creation-Date: 1998-11-23 17:24-0500\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
-- 
Gitee


From 8667de50d071882c0cd02f71c66c55bc7845117f Mon Sep 17 00:00:00 2001
From: Jeff Johnson <n3npq@mac.com>
Date: Wed, 25 Nov 1998 20:23:36 +0000
Subject: [PATCH 128/667] fix incorrect directory permissions using
 %attr/%defattr.

---
 po/popt.pot | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/po/popt.pot b/po/popt.pot
index f9857f9..f254d70 100644
--- a/po/popt.pot
+++ b/po/popt.pot
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 1998-11-23 17:24-0500\n"
+"POT-Creation-Date: 1998-11-25 13:52-0500\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
-- 
Gitee


From 79fb56b3e9dfaeeda62a9f0c36a103e3f672dde6 Mon Sep 17 00:00:00 2001
From: Erik Troan <ewt@redhat.com>
Date: Mon, 30 Nov 1998 17:53:03 +0000
Subject: [PATCH 129/667] switched to rpmfilexists

---
 po/Makefile.in | 2 +-
 po/popt.pot    | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/po/Makefile.in b/po/Makefile.in
index a90f859..05fbe6d 100644
--- a/po/Makefile.in
+++ b/po/Makefile.in
@@ -4,7 +4,7 @@ top_srcdir = ..
 
 LOCALEDIR=/usr/share/locale
 
-INSTALL= /usr/bin/install -c
+INSTALL= /usr/bin/ginstall -c
 INSTALL_PROGRAM= ${INSTALL}
 INSTALL_DATA= ${INSTALL} -m 644
 CC = gcc
diff --git a/po/popt.pot b/po/popt.pot
index f254d70..cadc26c 100644
--- a/po/popt.pot
+++ b/po/popt.pot
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 1998-11-25 13:52-0500\n"
+"POT-Creation-Date: 1998-11-30 12:53-0500\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
-- 
Gitee


From d360c5ececfdef12a051b1b80d461b9efc400d8c Mon Sep 17 00:00:00 2001
From: Jeff Johnson <n3npq@mac.com>
Date: Tue, 1 Dec 1998 00:10:30 +0000
Subject: [PATCH 130/667] Sanity.

---
 Makefile.in    | 59 +++++++++++++++++++++++---------------------------
 po/Makefile.in |  2 +-
 po/popt.pot    |  2 +-
 3 files changed, 29 insertions(+), 34 deletions(-)

diff --git a/Makefile.in b/Makefile.in
index 3ab14d4..8c82a88 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated automatically by automake 1.3 from Makefile.am
+# Makefile.in generated automatically by automake 1.3b from Makefile.am
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998 Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
@@ -34,7 +34,7 @@ mandir = @mandir@
 includedir = @includedir@
 oldincludedir = /usr/include
 
-DISTDIR =
+DESTDIR =
 
 pkgdatadir = $(datadir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
@@ -104,8 +104,8 @@ test1_OBJECTS =  test1.o
 test1_DEPENDENCIES = 
 test1_LDFLAGS = 
 CFLAGS = @CFLAGS@
-COMPILE = $(CC) $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS)
-LINK = $(CC) $(CFLAGS) $(LDFLAGS) -o $@
+COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+LINK = $(CC) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS) -o $@
 man3dir = $(mandir)/man3
 MANS = $(man_MANS)
 
@@ -113,13 +113,13 @@ NROFF = nroff
 HEADERS =  $(include_HEADERS)
 
 DIST_COMMON =  README COPYING Makefile.am Makefile.in acconfig.h \
-aclocal.m4 config.h.in configure.in install-sh missing mkinstalldirs \
-stamp-h.in
+aclocal.m4 config.h.in configure configure.in install-sh missing \
+mkinstalldirs stamp-h.in
 
 
 DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
 
-TAR = tar
+TAR = gtar
 GZIP = --best
 DEP_FILES =  .deps/findme.P .deps/popt.P .deps/poptconfig.P \
 .deps/popthelp.P .deps/poptparse.P .deps/test1.P
@@ -140,7 +140,7 @@ Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status $(BUILT_SOURCES)
 $(ACLOCAL_M4):  configure.in 
 	cd $(srcdir) && $(ACLOCAL)
 
-config.status: $(srcdir)/configure
+config.status: $(srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
 	$(SHELL) ./config.status --recheck
 $(srcdir)/configure: $(srcdir)/configure.in $(ACLOCAL_M4) $(CONFIGURE_DEPENDENCIES)
 	cd $(srcdir) && $(AUTOCONF)
@@ -178,7 +178,7 @@ maintainer-clean-libLIBRARIES:
 install-libLIBRARIES: $(lib_LIBRARIES)
 	@$(NORMAL_INSTALL)
 	$(mkinstalldirs) $(DESTDIR)$(libdir)
-	list='$(lib_LIBRARIES)'; for p in $$list; do \
+	@list='$(lib_LIBRARIES)'; for p in $$list; do \
 	  if test -f $$p; then \
 	    echo " $(INSTALL_DATA) $$p $(DESTDIR)$(libdir)/$$p"; \
 	    $(INSTALL_DATA) $$p $(DESTDIR)$(libdir)/$$p; \
@@ -266,10 +266,10 @@ uninstall-man3:
 	done
 install-man: $(MANS)
 	@$(NORMAL_INSTALL)
-	$(MAKE) install-man3
+	$(MAKE) $(AM_MAKEFLAGS) install-man3
 uninstall-man:
 	@$(NORMAL_UNINSTALL)
-	$(MAKE) uninstall-man3
+	$(MAKE) $(AM_MAKEFLAGS) uninstall-man3
 
 install-includeHEADERS: $(include_HEADERS)
 	@$(NORMAL_INSTALL)
@@ -302,7 +302,7 @@ check-recursive installcheck-recursive info-recursive dvi-recursive:
 	list='$(SUBDIRS)'; for subdir in $$list; do \
 	  target=`echo $@ | sed s/-recursive//`; \
 	  echo "Making $$target in $$subdir"; \
-	  (cd $$subdir && $(MAKE) $$target) \
+	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$target) \
 	   || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
 	done && test -z "$$fail"
 
@@ -315,12 +315,12 @@ maintainer-clean-recursive:
 	for subdir in $$rev; do \
 	  target=`echo $@ | sed s/-recursive//`; \
 	  echo "Making $$target in $$subdir"; \
-	  (cd $$subdir && $(MAKE) $$target) \
+	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$target) \
 	   || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
 	done && test -z "$$fail"
 tags-recursive:
 	list='$(SUBDIRS)'; for subdir in $$list; do \
-	  (cd $$subdir && $(MAKE) tags); \
+	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \
 	done
 
 tags: TAGS
@@ -365,12 +365,12 @@ distcheck: dist
 	dc_install_base=`cd $(distdir)/=inst && pwd`; \
 	cd $(distdir)/=build \
 	  && ../configure --srcdir=.. --prefix=$$dc_install_base \
-	  && $(MAKE) \
-	  && $(MAKE) dvi \
-	  && $(MAKE) check \
-	  && $(MAKE) install \
-	  && $(MAKE) installcheck \
-	  && $(MAKE) dist
+	  && $(MAKE) $(AM_MAKEFLAGS) \
+	  && $(MAKE) $(AM_MAKEFLAGS) dvi \
+	  && $(MAKE) $(AM_MAKEFLAGS) check \
+	  && $(MAKE) $(AM_MAKEFLAGS) install \
+	  && $(MAKE) $(AM_MAKEFLAGS) installcheck \
+	  && $(MAKE) $(AM_MAKEFLAGS) dist
 	-rm -rf $(distdir)
 	@echo "========================"; \
 	echo "$(distdir).tar.gz is ready for distribution"; \
@@ -403,7 +403,7 @@ distdir: $(DISTFILES)
 	  || mkdir $(distdir)/$$subdir \
 	  || exit 1; \
 	  chmod 777 $(distdir)/$$subdir; \
-	  (cd $$subdir && $(MAKE) top_distdir=../$(distdir) distdir=../$(distdir)/$$subdir distdir) \
+	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) top_distdir=../$(distdir) distdir=../$(distdir)/$$subdir distdir) \
 	    || exit 1; \
 	done
 
@@ -433,10 +433,10 @@ maintainer-clean-depend:
 info: info-recursive
 dvi: dvi-recursive
 check: all-am
-	$(MAKE) check-recursive
+	$(MAKE) $(AM_MAKEFLAGS) check-recursive
 installcheck: installcheck-recursive
 all-recursive-am: config.h
-	$(MAKE) all-recursive
+	$(MAKE) $(AM_MAKEFLAGS) all-recursive
 
 all-am: Makefile $(LIBRARIES) $(PROGRAMS) $(MANS) $(HEADERS) config.h
 
@@ -458,26 +458,21 @@ install: install-recursive install-exec-am install-data-am
 uninstall: uninstall-recursive uninstall-am
 
 install-strip:
-	$(MAKE) INSTALL_PROGRAM='$(INSTALL_PROGRAM) -s' INSTALL_SCRIPT='$(INSTALL_PROGRAM)' install
+	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM='$(INSTALL_PROGRAM) -s' INSTALL_SCRIPT='$(INSTALL_PROGRAM)' install
 installdirs: installdirs-recursive
-	$(mkinstalldirs)  $(DATADIR)$(libdir) $(DESTDIR)$(mandir)/man3 \
-		$(DATADIR)$(includedir)
+	$(mkinstalldirs)  $(DESTDIR)$(libdir) $(DESTDIR)$(mandir)/man3 \
+		$(DESTDIR)$(includedir)
 
 
 mostlyclean-generic:
-	-test -z "$(MOSTLYCLEANFILES)" || rm -f $(MOSTLYCLEANFILES)
 
 clean-generic:
-	-test -z "$(CLEANFILES)" || rm -f $(CLEANFILES)
 
 distclean-generic:
-	-rm -f Makefile $(DISTCLEANFILES)
+	-rm -f Makefile $(CONFIG_CLEAN_FILES)
 	-rm -f config.cache config.log stamp-h stamp-h[0-9]*
-	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
 
 maintainer-clean-generic:
-	-test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES)
-	-test -z "$(BUILT_SOURCES)" || rm -f $(BUILT_SOURCES)
 mostlyclean-am:  mostlyclean-hdr mostlyclean-libLIBRARIES \
 		mostlyclean-compile mostlyclean-noinstPROGRAMS \
 		mostlyclean-tags mostlyclean-depend mostlyclean-generic
diff --git a/po/Makefile.in b/po/Makefile.in
index 05fbe6d..a90f859 100644
--- a/po/Makefile.in
+++ b/po/Makefile.in
@@ -4,7 +4,7 @@ top_srcdir = ..
 
 LOCALEDIR=/usr/share/locale
 
-INSTALL= /usr/bin/ginstall -c
+INSTALL= /usr/bin/install -c
 INSTALL_PROGRAM= ${INSTALL}
 INSTALL_DATA= ${INSTALL} -m 644
 CC = gcc
diff --git a/po/popt.pot b/po/popt.pot
index cadc26c..7912bc4 100644
--- a/po/popt.pot
+++ b/po/popt.pot
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 1998-11-30 12:53-0500\n"
+"POT-Creation-Date: 1998-11-30 18:28-0500\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
-- 
Gitee


From dda843a0858c45d0ad8d834230bc36b0d08f9b50 Mon Sep 17 00:00:00 2001
From: "Michael K. Johnson" <johnsonm@redhat.com>
Date: Tue, 1 Dec 1998 19:05:36 +0000
Subject: [PATCH 131/667] POPT_ARG_VAL appears to work, now that I have a
 finished test case...

---
 popt.c | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/popt.c b/popt.c
index f9e6153..7dd453d 100644
--- a/popt.c
+++ b/popt.c
@@ -368,9 +368,11 @@ int poptGetNextOpt(poptContext con) {
 		con->os->nextCharArg = origOptString;
 	}
 
-	if (opt->arg && (opt->argInfo & POPT_ARG_MASK) == POPT_ARG_NONE) 
+	if (opt->arg && (opt->argInfo & POPT_ARG_MASK) == POPT_ARG_NONE) {
 	    *((int *)opt->arg) = 1;
-	else if ((opt->argInfo & POPT_ARG_MASK) != POPT_ARG_NONE) {
+	} else if ((opt->argInfo & POPT_ARG_MASK) == POPT_ARG_VAL) {
+	    if (opt->arg) *((int *) opt->arg) = opt->val;
+	} else if ((opt->argInfo & POPT_ARG_MASK) != POPT_ARG_NONE) {
 	    if (longArg) {
 		con->os->nextArg = longArg;
 	    } else if (con->os->nextCharArg) {
@@ -392,10 +394,6 @@ int poptGetNextOpt(poptContext con) {
 		    *((char **) opt->arg) = con->os->nextArg;
 		    break;
 
-		  case POPT_ARG_VAL:
-		    *((int *) opt->arg) = opt->val;
-		    break;
-
 		  case POPT_ARG_INT:
 		  case POPT_ARG_LONG:
 		    aLong = strtol(con->os->nextArg, &end, 0);
@@ -440,7 +438,8 @@ int poptGetNextOpt(poptContext con) {
 	else 
 	    sprintf(con->finalArgv[i], "-%c", opt->shortName);
 
-	if (opt->arg && (opt->argInfo & POPT_ARG_MASK) != POPT_ARG_NONE) 
+	if (opt->arg && (opt->argInfo & POPT_ARG_MASK) != POPT_ARG_NONE
+		     && (opt->argInfo & POPT_ARG_MASK) != POPT_ARG_VAL) 
 	    con->finalArgv[con->finalArgvCount++] = strdup(con->os->nextArg);
     }
 
-- 
Gitee


From 57b5c8fe3eed26fafeb2ee7e687e392d17fc5b77 Mon Sep 17 00:00:00 2001
From: "Michael K. Johnson" <johnsonm@redhat.com>
Date: Tue, 1 Dec 1998 22:28:41 +0000
Subject: [PATCH 132/667] fixed a few typos, documented POPT_ARGFLAG_DOC_HIDDEN

---
 popt.3 | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/popt.3 b/popt.3
index e299826..582a270 100644
--- a/popt.3
+++ b/popt.3
@@ -127,7 +127,7 @@ POPT_ARG_LONG	A long integer is expected	long
 POPT_ARG_VAL	Integer value taken from \f(CWval\fR	int
 .TE
 .sp
-If \fIargInfo\fR value is logically or'd with \fBPOPT_ARGFLAG_ONEDASH\fR,
+If the \fIargInfo\fR value is bitwise or'd with \fBPOPT_ARGFLAG_ONEDASH\fR,
 the long argument may be given with a single - instead of two. For example,
 if \fB--longopt\fR is an option with \fBPOPT_ARGFLAG_ONEDASH\fR, is
 specified, \fB-longopt\fR is accepted as well.
@@ -180,6 +180,9 @@ return code of 0. If you want to use popt's automatic help generation in
 a different way, you need to explicitly add the option entries to your programs 
 .RB "option table instead of using " POPT_AUTOHELP ".
 .sp
+If the \fIargInfo\fR value is bitwise or'd with \fBPOPT_ARGFLAG_DOC_HIDDEN\fR,
+the argument will not be shown in help output.
+.sp
 The final structure in the table should have all the pointer values set
 .RB "to " NULL " and all the arithmetic values set to 0, marking the "
 end of the table.
-- 
Gitee


From d19d4ed98aeefc7f2e102bda36ffa3e72ee2b5dc Mon Sep 17 00:00:00 2001
From: Jeff Johnson <n3npq@mac.com>
Date: Tue, 1 Dec 1998 23:28:38 +0000
Subject: [PATCH 133/667] More build popts moved to build.c Fix access of freed
 memory.

---
 po/popt.pot | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/po/popt.pot b/po/popt.pot
index 7912bc4..8c70910 100644
--- a/po/popt.pot
+++ b/po/popt.pot
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 1998-11-30 18:28-0500\n"
+"POT-Creation-Date: 1998-12-01 16:02-0500\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
-- 
Gitee


From 06061cf92f5cb7474b9780a237404dd846e636ad Mon Sep 17 00:00:00 2001
From: Jeff Johnson <n3npq@mac.com>
Date: Sat, 5 Dec 1998 19:16:19 +0000
Subject: [PATCH 134/667] display "..?....." rather than "..5....." for
 unreadable files. run time (rather than compile time) host endian check.

---
 po/popt.pot | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/po/popt.pot b/po/popt.pot
index 8c70910..8c3b411 100644
--- a/po/popt.pot
+++ b/po/popt.pot
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 1998-12-01 16:02-0500\n"
+"POT-Creation-Date: 1998-12-05 12:58-0500\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
-- 
Gitee


From fdb688a878ac98e641019dbc6e1c885b065ebe7e Mon Sep 17 00:00:00 2001
From: "Michael K. Johnson" <johnsonm@redhat.com>
Date: Thu, 10 Dec 1998 18:37:22 +0000
Subject: [PATCH 135/667] releasing 1.2.2

---
 CHANGES      | 2 ++
 configure.in | 2 +-
 popt.spec    | 5 ++++-
 3 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/CHANGES b/CHANGES
index e1950b3..4f4885e 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,6 +1,8 @@
 1.2.1 -> 1.2.2
 	- fixed bug in chaind alias happens which seems to have only
 	  affected --triggers in rpm
+	- added POPT_ARG_VAL
+	- popt.3 installed by default
 
 1.2 -> 1.2.1
 	- added POPT_ARG_INTL_DOMAIN (Elliot Lee)
diff --git a/configure.in b/configure.in
index 8c1633f..0adcc68 100755
--- a/configure.in
+++ b/configure.in
@@ -1,5 +1,5 @@
 AC_INIT(popt.h)
-AM_INIT_AUTOMAKE(popt, 1.2.1)
+AM_INIT_AUTOMAKE(popt, 1.2.2)
 AM_CONFIG_HEADER(config.h)
 
 AC_PROG_CC
diff --git a/popt.spec b/popt.spec
index 3a2ddc1..c626a2b 100644
--- a/popt.spec
+++ b/popt.spec
@@ -1,6 +1,6 @@
 Summary: C library for parsing command line parameters
 Name: popt
-Version: 1.2.1
+Version: 1.2.2
 Release: 1
 Copyright: LGPL
 Group: Libraries
@@ -35,6 +35,9 @@ rm -rf $RPM_BUILD_ROOT
 %attr(0644, root, root) /usr/man/man3/popt.3
 
 %changelog
+* Thu Dec 10 1998 Michael Johnson <johnsonm@redhat.com>
+- released 1.2.2; see CHANGES
+
 * Tue Nov 17 1998 Michael K. Johnson <johnsonm@redhat.com>
 - added man page to default install
 
-- 
Gitee


From fa238d8282278401789cfd9bf1e8ff16b3003a6f Mon Sep 17 00:00:00 2001
From: Jeff Johnson <n3npq@mac.com>
Date: Thu, 10 Dec 1998 20:56:06 +0000
Subject: [PATCH 136/667] Move inlines to rpmio.c. rpmio.h needs necessary
 includes.

---
 aclocal.m4 | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/aclocal.m4 b/aclocal.m4
index d234055..2e1a7f0 100644
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -1,7 +1,7 @@
-dnl aclocal.m4 generated automatically by aclocal 1.3
+dnl aclocal.m4 generated automatically by aclocal 1.3b
 
 dnl Copyright (C) 1994, 1995, 1996, 1997, 1998 Free Software Foundation, Inc.
-dnl This Makefile.in is free software; the Free Software Foundation
+dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
 
-- 
Gitee


From b1a92abc6238b1f174a328f0d350cf25e1f7ab17 Mon Sep 17 00:00:00 2001
From: Jeff Johnson <n3npq@mac.com>
Date: Mon, 14 Dec 1998 21:34:23 +0000
Subject: [PATCH 137/667] permit http:// and file:// url's as well as ftp://.
 attempt ftp ABOR on query/verify url's. cache open ftp control descriptor
 with password. verify needed same realpath semantics as query. plug fd leak
 in urlGetFile().

---
 po/popt.pot | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/po/popt.pot b/po/popt.pot
index 8c3b411..51c452b 100644
--- a/po/popt.pot
+++ b/po/popt.pot
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 1998-12-05 12:58-0500\n"
+"POT-Creation-Date: 1998-12-11 12:08-0500\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
-- 
Gitee


From f63ac12241a86efde7eda4c5e278381d4482c949 Mon Sep 17 00:00:00 2001
From: Erik Troan <ewt@redhat.com>
Date: Tue, 29 Dec 1998 02:35:08 +0000
Subject: [PATCH 138/667] fixed memset() in help message generation (Dale
 Hawkins) added extern "C" stuff to popt.h for C++ compilers (Dale Hawkins)

---
 CHANGES     | 4 ++++
 po/popt.pot | 2 +-
 popt.h      | 8 ++++++++
 popthelp.c  | 2 +-
 4 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/CHANGES b/CHANGES
index 4f4885e..82227f2 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,7 @@
+1.2.2 -> 1.2.3
+	- fixed memset() in help message generation (Dale Hawkins)
+	- added extern "C" stuff to popt.h for C++ compilers (Dale Hawkins)
+
 1.2.1 -> 1.2.2
 	- fixed bug in chaind alias happens which seems to have only
 	  affected --triggers in rpm
diff --git a/po/popt.pot b/po/popt.pot
index 51c452b..88981be 100644
--- a/po/popt.pot
+++ b/po/popt.pot
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 1998-12-11 12:08-0500\n"
+"POT-Creation-Date: 1998-12-28 21:37-0500\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/popt.h b/popt.h
index 069cab1..c742533 100644
--- a/popt.h
+++ b/popt.h
@@ -5,6 +5,10 @@
 #ifndef H_POPT
 #define H_POPT
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 #include <stdio.h>			/* for FILE * */
 
 #define POPT_OPTION_DEPTH	10
@@ -112,4 +116,8 @@ void poptPrintUsage(poptContext con, FILE * f, int flags);
 void poptSetOtherOptionHelp(poptContext con, const char * text);
 const char * poptGetInvocationName(poptContext con);
 
+#ifdef  __cplusplus
+}
+#endif
+
 #endif
diff --git a/popthelp.c b/popthelp.c
index c454640..2b5a13c 100644
--- a/popthelp.c
+++ b/popthelp.c
@@ -261,7 +261,7 @@ static int showShortOptions(const struct poptOption * opt, FILE * f,
 
     if (!str) {
 	str = s;
-	memset(str, 0, sizeof(str));
+	memset(str, 0, sizeof(s));
     }
 
     while (opt->longName || opt->shortName || opt->arg) {
-- 
Gitee


From c9a509d378df7056c443b8ad646d77ab700a1642 Mon Sep 17 00:00:00 2001
From: Erik Troan <ewt@redhat.com>
Date: Tue, 29 Dec 1998 02:52:47 +0000
Subject: [PATCH 139/667] const'ified poptParseArgvString (Jeff Garzik)

---
 CHANGES     |  1 +
 po/popt.pot |  2 +-
 popt.h      |  2 +-
 poptparse.c | 22 ++++++++++++----------
 4 files changed, 15 insertions(+), 12 deletions(-)

diff --git a/CHANGES b/CHANGES
index 82227f2..6dd2378 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,6 +1,7 @@
 1.2.2 -> 1.2.3
 	- fixed memset() in help message generation (Dale Hawkins)
 	- added extern "C" stuff to popt.h for C++ compilers (Dale Hawkins)
+	- const'ified poptParseArgvString (Jeff Garzik)
 
 1.2.1 -> 1.2.2
 	- fixed bug in chaind alias happens which seems to have only
diff --git a/po/popt.pot b/po/popt.pot
index 88981be..a8963de 100644
--- a/po/popt.pot
+++ b/po/popt.pot
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 1998-12-28 21:37-0500\n"
+"POT-Creation-Date: 1998-12-28 21:56-0500\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/popt.h b/popt.h
index c742533..2fea9e8 100644
--- a/popt.h
+++ b/popt.h
@@ -108,7 +108,7 @@ int poptReadConfigFile(poptContext con, char * fn);
 int poptReadDefaultConfig(poptContext con, int useEnv);
 /* argv should be freed -- this allows ', ", and \ quoting, but ' is treated
    the same as " and both may include \ quotes */
-int poptParseArgvString(char * s, int * argcPtr, char *** argvPtr);
+int poptParseArgvString(const char * s, int * argcPtr, char *** argvPtr);
 const char * poptStrerror(const int error);
 void poptSetExecPath(poptContext con, const char * path, int allowAbsolute);
 void poptPrintHelp(poptContext con, FILE * f, int flags);
diff --git a/poptparse.c b/poptparse.c
index cd97ec6..a465a03 100644
--- a/poptparse.c
+++ b/poptparse.c
@@ -12,23 +12,25 @@
 
 #include "popt.h"
 
-int poptParseArgvString(char * s, int * argcPtr, char *** argvPtr) {
-    char * buf = strcpy(alloca(strlen(s) + 1), s);
-    char * bufStart = buf;
-    char * src, * dst;
+static const int poptArgvArrayGrowDelta = 5;
+
+int poptParseArgvString(const char * s, int * argcPtr, char *** argvPtr) {
+    char * buf, * bufStart, * dst;
+    const char * src;
     char quote = '\0';
-    int argvAlloced = 5;
+    int argvAlloced = poptArgvArrayGrowDelta;
     char ** argv = malloc(sizeof(*argv) * argvAlloced);
     char ** argv2;
     int argc = 0;
-    int i;
+    int i, buflen;
+
+    buflen = strlen(s) + 1;
+    bufStart = buf = alloca(buflen);
+    memset(buf, '\0', buflen);
 
     src = s;
-    dst = buf;
     argv[argc] = buf;
 
-    memset(buf, '\0', strlen(s) + 1);
-
     while (*src) {
 	if (quote == *src) {
 	    quote = '\0';
@@ -46,7 +48,7 @@ int poptParseArgvString(char * s, int * argcPtr, char *** argvPtr) {
 	    if (*argv[argc]) {
 		buf++, argc++;
 		if (argc == argvAlloced) {
-		    argvAlloced += 5;
+		    argvAlloced += poptArgvArrayGrowDelta;
 		    argv = realloc(argv, sizeof(*argv) * argvAlloced);
 		}
 		argv[argc] = buf;
-- 
Gitee


From ae45607fecc25c9a0e7b6be60adecc7e0410ae03 Mon Sep 17 00:00:00 2001
From: Erik Troan <ewt@redhat.com>
Date: Tue, 29 Dec 1998 03:02:20 +0000
Subject: [PATCH 140/667] version 1.2.3

---
 configure.in | 2 +-
 popt.spec    | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/configure.in b/configure.in
index 0adcc68..634db54 100755
--- a/configure.in
+++ b/configure.in
@@ -1,5 +1,5 @@
 AC_INIT(popt.h)
-AM_INIT_AUTOMAKE(popt, 1.2.2)
+AM_INIT_AUTOMAKE(popt, 1.2.3)
 AM_CONFIG_HEADER(config.h)
 
 AC_PROG_CC
diff --git a/popt.spec b/popt.spec
index c626a2b..7d45da3 100644
--- a/popt.spec
+++ b/popt.spec
@@ -1,6 +1,6 @@
 Summary: C library for parsing command line parameters
 Name: popt
-Version: 1.2.2
+Version: 1.2.3
 Release: 1
 Copyright: LGPL
 Group: Libraries
-- 
Gitee


From bd7d82f2d93ce9af40990044fb37cbf83a2a892c Mon Sep 17 00:00:00 2001
From: Jeff Johnson <n3npq@mac.com>
Date: Wed, 30 Dec 1998 01:51:53 +0000
Subject: [PATCH 141/667] use "original db-1.85" if available (Raw Hide glibc
 2.1).

---
 Makefile.in | 55 +++++++++++++++++++++++++++++------------------------
 aclocal.m4  |  4 ++--
 2 files changed, 32 insertions(+), 27 deletions(-)

diff --git a/Makefile.in b/Makefile.in
index 8c82a88..878774d 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated automatically by automake 1.3b from Makefile.am
+# Makefile.in generated automatically by automake 1.3 from Makefile.am
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998 Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
@@ -34,7 +34,7 @@ mandir = @mandir@
 includedir = @includedir@
 oldincludedir = /usr/include
 
-DESTDIR =
+DISTDIR =
 
 pkgdatadir = $(datadir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
@@ -104,8 +104,8 @@ test1_OBJECTS =  test1.o
 test1_DEPENDENCIES = 
 test1_LDFLAGS = 
 CFLAGS = @CFLAGS@
-COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-LINK = $(CC) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS) -o $@
+COMPILE = $(CC) $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS)
+LINK = $(CC) $(CFLAGS) $(LDFLAGS) -o $@
 man3dir = $(mandir)/man3
 MANS = $(man_MANS)
 
@@ -119,7 +119,7 @@ mkinstalldirs stamp-h.in
 
 DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
 
-TAR = gtar
+TAR = tar
 GZIP = --best
 DEP_FILES =  .deps/findme.P .deps/popt.P .deps/poptconfig.P \
 .deps/popthelp.P .deps/poptparse.P .deps/test1.P
@@ -140,7 +140,7 @@ Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status $(BUILT_SOURCES)
 $(ACLOCAL_M4):  configure.in 
 	cd $(srcdir) && $(ACLOCAL)
 
-config.status: $(srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+config.status: $(srcdir)/configure
 	$(SHELL) ./config.status --recheck
 $(srcdir)/configure: $(srcdir)/configure.in $(ACLOCAL_M4) $(CONFIGURE_DEPENDENCIES)
 	cd $(srcdir) && $(AUTOCONF)
@@ -178,7 +178,7 @@ maintainer-clean-libLIBRARIES:
 install-libLIBRARIES: $(lib_LIBRARIES)
 	@$(NORMAL_INSTALL)
 	$(mkinstalldirs) $(DESTDIR)$(libdir)
-	@list='$(lib_LIBRARIES)'; for p in $$list; do \
+	list='$(lib_LIBRARIES)'; for p in $$list; do \
 	  if test -f $$p; then \
 	    echo " $(INSTALL_DATA) $$p $(DESTDIR)$(libdir)/$$p"; \
 	    $(INSTALL_DATA) $$p $(DESTDIR)$(libdir)/$$p; \
@@ -266,10 +266,10 @@ uninstall-man3:
 	done
 install-man: $(MANS)
 	@$(NORMAL_INSTALL)
-	$(MAKE) $(AM_MAKEFLAGS) install-man3
+	$(MAKE) install-man3
 uninstall-man:
 	@$(NORMAL_UNINSTALL)
-	$(MAKE) $(AM_MAKEFLAGS) uninstall-man3
+	$(MAKE) uninstall-man3
 
 install-includeHEADERS: $(include_HEADERS)
 	@$(NORMAL_INSTALL)
@@ -302,7 +302,7 @@ check-recursive installcheck-recursive info-recursive dvi-recursive:
 	list='$(SUBDIRS)'; for subdir in $$list; do \
 	  target=`echo $@ | sed s/-recursive//`; \
 	  echo "Making $$target in $$subdir"; \
-	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$target) \
+	  (cd $$subdir && $(MAKE) $$target) \
 	   || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
 	done && test -z "$$fail"
 
@@ -315,12 +315,12 @@ maintainer-clean-recursive:
 	for subdir in $$rev; do \
 	  target=`echo $@ | sed s/-recursive//`; \
 	  echo "Making $$target in $$subdir"; \
-	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$target) \
+	  (cd $$subdir && $(MAKE) $$target) \
 	   || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
 	done && test -z "$$fail"
 tags-recursive:
 	list='$(SUBDIRS)'; for subdir in $$list; do \
-	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \
+	  (cd $$subdir && $(MAKE) tags); \
 	done
 
 tags: TAGS
@@ -365,12 +365,12 @@ distcheck: dist
 	dc_install_base=`cd $(distdir)/=inst && pwd`; \
 	cd $(distdir)/=build \
 	  && ../configure --srcdir=.. --prefix=$$dc_install_base \
-	  && $(MAKE) $(AM_MAKEFLAGS) \
-	  && $(MAKE) $(AM_MAKEFLAGS) dvi \
-	  && $(MAKE) $(AM_MAKEFLAGS) check \
-	  && $(MAKE) $(AM_MAKEFLAGS) install \
-	  && $(MAKE) $(AM_MAKEFLAGS) installcheck \
-	  && $(MAKE) $(AM_MAKEFLAGS) dist
+	  && $(MAKE) \
+	  && $(MAKE) dvi \
+	  && $(MAKE) check \
+	  && $(MAKE) install \
+	  && $(MAKE) installcheck \
+	  && $(MAKE) dist
 	-rm -rf $(distdir)
 	@echo "========================"; \
 	echo "$(distdir).tar.gz is ready for distribution"; \
@@ -403,7 +403,7 @@ distdir: $(DISTFILES)
 	  || mkdir $(distdir)/$$subdir \
 	  || exit 1; \
 	  chmod 777 $(distdir)/$$subdir; \
-	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) top_distdir=../$(distdir) distdir=../$(distdir)/$$subdir distdir) \
+	  (cd $$subdir && $(MAKE) top_distdir=../$(distdir) distdir=../$(distdir)/$$subdir distdir) \
 	    || exit 1; \
 	done
 
@@ -433,10 +433,10 @@ maintainer-clean-depend:
 info: info-recursive
 dvi: dvi-recursive
 check: all-am
-	$(MAKE) $(AM_MAKEFLAGS) check-recursive
+	$(MAKE) check-recursive
 installcheck: installcheck-recursive
 all-recursive-am: config.h
-	$(MAKE) $(AM_MAKEFLAGS) all-recursive
+	$(MAKE) all-recursive
 
 all-am: Makefile $(LIBRARIES) $(PROGRAMS) $(MANS) $(HEADERS) config.h
 
@@ -458,21 +458,26 @@ install: install-recursive install-exec-am install-data-am
 uninstall: uninstall-recursive uninstall-am
 
 install-strip:
-	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM='$(INSTALL_PROGRAM) -s' INSTALL_SCRIPT='$(INSTALL_PROGRAM)' install
+	$(MAKE) INSTALL_PROGRAM='$(INSTALL_PROGRAM) -s' INSTALL_SCRIPT='$(INSTALL_PROGRAM)' install
 installdirs: installdirs-recursive
-	$(mkinstalldirs)  $(DESTDIR)$(libdir) $(DESTDIR)$(mandir)/man3 \
-		$(DESTDIR)$(includedir)
+	$(mkinstalldirs)  $(DATADIR)$(libdir) $(DESTDIR)$(mandir)/man3 \
+		$(DATADIR)$(includedir)
 
 
 mostlyclean-generic:
+	-test -z "$(MOSTLYCLEANFILES)" || rm -f $(MOSTLYCLEANFILES)
 
 clean-generic:
+	-test -z "$(CLEANFILES)" || rm -f $(CLEANFILES)
 
 distclean-generic:
-	-rm -f Makefile $(CONFIG_CLEAN_FILES)
+	-rm -f Makefile $(DISTCLEANFILES)
 	-rm -f config.cache config.log stamp-h stamp-h[0-9]*
+	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
 
 maintainer-clean-generic:
+	-test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES)
+	-test -z "$(BUILT_SOURCES)" || rm -f $(BUILT_SOURCES)
 mostlyclean-am:  mostlyclean-hdr mostlyclean-libLIBRARIES \
 		mostlyclean-compile mostlyclean-noinstPROGRAMS \
 		mostlyclean-tags mostlyclean-depend mostlyclean-generic
diff --git a/aclocal.m4 b/aclocal.m4
index 2e1a7f0..d234055 100644
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -1,7 +1,7 @@
-dnl aclocal.m4 generated automatically by aclocal 1.3b
+dnl aclocal.m4 generated automatically by aclocal 1.3
 
 dnl Copyright (C) 1994, 1995, 1996, 1997, 1998 Free Software Foundation, Inc.
-dnl This file is free software; the Free Software Foundation
+dnl This Makefile.in is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
 
-- 
Gitee


From e3ca70353cf47915e3fb0cc14ab92b5c8ceb75bc Mon Sep 17 00:00:00 2001
From: Jeff Johnson <n3npq@mac.com>
Date: Wed, 6 Jan 1999 17:34:30 +0000
Subject: [PATCH 142/667] propagate "const char *" into rpmlib prototypes.

---
 po/popt.pot | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/po/popt.pot b/po/popt.pot
index a8963de..bf4fa47 100644
--- a/po/popt.pot
+++ b/po/popt.pot
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 1998-12-28 21:56-0500\n"
+"POT-Creation-Date: 1999-01-06 11:43-0500\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
-- 
Gitee


From 39856e80cba2b23d28f1230657ff81a0c99365b9 Mon Sep 17 00:00:00 2001
From: Jeff Johnson <n3npq@mac.com>
Date: Wed, 6 Jan 1999 20:54:08 +0000
Subject: [PATCH 143/667] EGCS cruft.

---
 popthelp.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/popthelp.c b/popthelp.c
index 2b5a13c..c0fb6e7 100644
--- a/popthelp.c
+++ b/popthelp.c
@@ -233,7 +233,7 @@ static int singleOptionUsage(FILE * f, int cursor,
     return cursor + len + 1;
 }
 
-int singleTableUsage(FILE * f, int cursor, const struct poptOption * table,
+static int singleTableUsage(FILE * f, int cursor, const struct poptOption * table,
 		     const char *translation_domain) {
     const struct poptOption * opt;
     
-- 
Gitee


From 209f41c04646ce75b7f380ec00b48561612962fb Mon Sep 17 00:00:00 2001
From: Jeff Johnson <n3npq@mac.com>
Date: Wed, 6 Jan 1999 21:05:14 +0000
Subject: [PATCH 144/667] Eliminate inline functions (the inline, not the
 function). EGCS cruft.

---
 po/popt.pot | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/po/popt.pot b/po/popt.pot
index bf4fa47..2b1571a 100644
--- a/po/popt.pot
+++ b/po/popt.pot
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 1999-01-06 11:43-0500\n"
+"POT-Creation-Date: 1999-01-06 15:53-0500\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
-- 
Gitee


From 70e51badcff14a61f8470b22c4aff78fed955873 Mon Sep 17 00:00:00 2001
From: Jeff Johnson <n3npq@mac.com>
Date: Fri, 8 Jan 1999 16:44:38 +0000
Subject: [PATCH 145/667] EGCS cruft. Use cpioStrerror when getNextHeader
 fails. More const warnings removed. binary rpms always have RPMTAG_SOURCERPM,
 source rpms do not.

---
 po/popt.pot | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/po/popt.pot b/po/popt.pot
index 2b1571a..40d81e4 100644
--- a/po/popt.pot
+++ b/po/popt.pot
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 1999-01-06 15:53-0500\n"
+"POT-Creation-Date: 1999-01-08 09:54-0500\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
-- 
Gitee


From 63b5fd01c827520710d5331613628a07cddeb8c3 Mon Sep 17 00:00:00 2001
From: Jeff Johnson <n3npq@mac.com>
Date: Tue, 12 Jan 1999 11:43:33 +0000
Subject: [PATCH 146/667] Automake noise..

---
 Makefile.in | 55 ++++++++++++++++++++++++-----------------------------
 1 file changed, 25 insertions(+), 30 deletions(-)

diff --git a/Makefile.in b/Makefile.in
index 878774d..8c82a88 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated automatically by automake 1.3 from Makefile.am
+# Makefile.in generated automatically by automake 1.3b from Makefile.am
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998 Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
@@ -34,7 +34,7 @@ mandir = @mandir@
 includedir = @includedir@
 oldincludedir = /usr/include
 
-DISTDIR =
+DESTDIR =
 
 pkgdatadir = $(datadir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
@@ -104,8 +104,8 @@ test1_OBJECTS =  test1.o
 test1_DEPENDENCIES = 
 test1_LDFLAGS = 
 CFLAGS = @CFLAGS@
-COMPILE = $(CC) $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS)
-LINK = $(CC) $(CFLAGS) $(LDFLAGS) -o $@
+COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+LINK = $(CC) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS) -o $@
 man3dir = $(mandir)/man3
 MANS = $(man_MANS)
 
@@ -119,7 +119,7 @@ mkinstalldirs stamp-h.in
 
 DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
 
-TAR = tar
+TAR = gtar
 GZIP = --best
 DEP_FILES =  .deps/findme.P .deps/popt.P .deps/poptconfig.P \
 .deps/popthelp.P .deps/poptparse.P .deps/test1.P
@@ -140,7 +140,7 @@ Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status $(BUILT_SOURCES)
 $(ACLOCAL_M4):  configure.in 
 	cd $(srcdir) && $(ACLOCAL)
 
-config.status: $(srcdir)/configure
+config.status: $(srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
 	$(SHELL) ./config.status --recheck
 $(srcdir)/configure: $(srcdir)/configure.in $(ACLOCAL_M4) $(CONFIGURE_DEPENDENCIES)
 	cd $(srcdir) && $(AUTOCONF)
@@ -178,7 +178,7 @@ maintainer-clean-libLIBRARIES:
 install-libLIBRARIES: $(lib_LIBRARIES)
 	@$(NORMAL_INSTALL)
 	$(mkinstalldirs) $(DESTDIR)$(libdir)
-	list='$(lib_LIBRARIES)'; for p in $$list; do \
+	@list='$(lib_LIBRARIES)'; for p in $$list; do \
 	  if test -f $$p; then \
 	    echo " $(INSTALL_DATA) $$p $(DESTDIR)$(libdir)/$$p"; \
 	    $(INSTALL_DATA) $$p $(DESTDIR)$(libdir)/$$p; \
@@ -266,10 +266,10 @@ uninstall-man3:
 	done
 install-man: $(MANS)
 	@$(NORMAL_INSTALL)
-	$(MAKE) install-man3
+	$(MAKE) $(AM_MAKEFLAGS) install-man3
 uninstall-man:
 	@$(NORMAL_UNINSTALL)
-	$(MAKE) uninstall-man3
+	$(MAKE) $(AM_MAKEFLAGS) uninstall-man3
 
 install-includeHEADERS: $(include_HEADERS)
 	@$(NORMAL_INSTALL)
@@ -302,7 +302,7 @@ check-recursive installcheck-recursive info-recursive dvi-recursive:
 	list='$(SUBDIRS)'; for subdir in $$list; do \
 	  target=`echo $@ | sed s/-recursive//`; \
 	  echo "Making $$target in $$subdir"; \
-	  (cd $$subdir && $(MAKE) $$target) \
+	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$target) \
 	   || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
 	done && test -z "$$fail"
 
@@ -315,12 +315,12 @@ maintainer-clean-recursive:
 	for subdir in $$rev; do \
 	  target=`echo $@ | sed s/-recursive//`; \
 	  echo "Making $$target in $$subdir"; \
-	  (cd $$subdir && $(MAKE) $$target) \
+	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$target) \
 	   || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
 	done && test -z "$$fail"
 tags-recursive:
 	list='$(SUBDIRS)'; for subdir in $$list; do \
-	  (cd $$subdir && $(MAKE) tags); \
+	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \
 	done
 
 tags: TAGS
@@ -365,12 +365,12 @@ distcheck: dist
 	dc_install_base=`cd $(distdir)/=inst && pwd`; \
 	cd $(distdir)/=build \
 	  && ../configure --srcdir=.. --prefix=$$dc_install_base \
-	  && $(MAKE) \
-	  && $(MAKE) dvi \
-	  && $(MAKE) check \
-	  && $(MAKE) install \
-	  && $(MAKE) installcheck \
-	  && $(MAKE) dist
+	  && $(MAKE) $(AM_MAKEFLAGS) \
+	  && $(MAKE) $(AM_MAKEFLAGS) dvi \
+	  && $(MAKE) $(AM_MAKEFLAGS) check \
+	  && $(MAKE) $(AM_MAKEFLAGS) install \
+	  && $(MAKE) $(AM_MAKEFLAGS) installcheck \
+	  && $(MAKE) $(AM_MAKEFLAGS) dist
 	-rm -rf $(distdir)
 	@echo "========================"; \
 	echo "$(distdir).tar.gz is ready for distribution"; \
@@ -403,7 +403,7 @@ distdir: $(DISTFILES)
 	  || mkdir $(distdir)/$$subdir \
 	  || exit 1; \
 	  chmod 777 $(distdir)/$$subdir; \
-	  (cd $$subdir && $(MAKE) top_distdir=../$(distdir) distdir=../$(distdir)/$$subdir distdir) \
+	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) top_distdir=../$(distdir) distdir=../$(distdir)/$$subdir distdir) \
 	    || exit 1; \
 	done
 
@@ -433,10 +433,10 @@ maintainer-clean-depend:
 info: info-recursive
 dvi: dvi-recursive
 check: all-am
-	$(MAKE) check-recursive
+	$(MAKE) $(AM_MAKEFLAGS) check-recursive
 installcheck: installcheck-recursive
 all-recursive-am: config.h
-	$(MAKE) all-recursive
+	$(MAKE) $(AM_MAKEFLAGS) all-recursive
 
 all-am: Makefile $(LIBRARIES) $(PROGRAMS) $(MANS) $(HEADERS) config.h
 
@@ -458,26 +458,21 @@ install: install-recursive install-exec-am install-data-am
 uninstall: uninstall-recursive uninstall-am
 
 install-strip:
-	$(MAKE) INSTALL_PROGRAM='$(INSTALL_PROGRAM) -s' INSTALL_SCRIPT='$(INSTALL_PROGRAM)' install
+	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM='$(INSTALL_PROGRAM) -s' INSTALL_SCRIPT='$(INSTALL_PROGRAM)' install
 installdirs: installdirs-recursive
-	$(mkinstalldirs)  $(DATADIR)$(libdir) $(DESTDIR)$(mandir)/man3 \
-		$(DATADIR)$(includedir)
+	$(mkinstalldirs)  $(DESTDIR)$(libdir) $(DESTDIR)$(mandir)/man3 \
+		$(DESTDIR)$(includedir)
 
 
 mostlyclean-generic:
-	-test -z "$(MOSTLYCLEANFILES)" || rm -f $(MOSTLYCLEANFILES)
 
 clean-generic:
-	-test -z "$(CLEANFILES)" || rm -f $(CLEANFILES)
 
 distclean-generic:
-	-rm -f Makefile $(DISTCLEANFILES)
+	-rm -f Makefile $(CONFIG_CLEAN_FILES)
 	-rm -f config.cache config.log stamp-h stamp-h[0-9]*
-	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
 
 maintainer-clean-generic:
-	-test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES)
-	-test -z "$(BUILT_SOURCES)" || rm -f $(BUILT_SOURCES)
 mostlyclean-am:  mostlyclean-hdr mostlyclean-libLIBRARIES \
 		mostlyclean-compile mostlyclean-noinstPROGRAMS \
 		mostlyclean-tags mostlyclean-depend mostlyclean-generic
-- 
Gitee


From 8ee120ad36e2bda21ef038aacf6e4edd4689d0d0 Mon Sep 17 00:00:00 2001
From: Jeff Johnson <n3npq@mac.com>
Date: Tue, 19 Jan 1999 19:42:36 +0000
Subject: [PATCH 147/667] Automake fiddles.

---
 po/Makefile.in    | 3 ++-
 po/Makefile.in.in | 3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/po/Makefile.in b/po/Makefile.in
index a90f859..b2ab87f 100644
--- a/po/Makefile.in
+++ b/po/Makefile.in
@@ -46,7 +46,8 @@ update-po: Makefile
 	done
 
 clean:
-	rm -f *mo $(NLSPACKAGE).pot
+	rm -f *mo
+#	rm -f $(NLSPACKAGE).pot
 
 distclean: clean
 	rm -f .depend Makefile
diff --git a/po/Makefile.in.in b/po/Makefile.in.in
index 3ba7cbd..11489ef 100644
--- a/po/Makefile.in.in
+++ b/po/Makefile.in.in
@@ -46,7 +46,8 @@ update-po: Makefile
 	done
 
 clean:
-	rm -f *mo $(NLSPACKAGE).pot
+	rm -f *mo
+#	rm -f $(NLSPACKAGE).pot
 
 distclean: clean
 	rm -f .depend Makefile
-- 
Gitee


From cc612a6cccd68a4ad9de76a92bdc61bf588ff125 Mon Sep 17 00:00:00 2001
From: Jeff Johnson <n3npq@mac.com>
Date: Tue, 19 Jan 1999 23:54:44 +0000
Subject: [PATCH 148/667] Released rpm-2.90 -- version is now 2.91 Use automake
 1.4 and autoconf 2.13.

---
 Makefile.am |   2 +-
 Makefile.in | 201 ++++++++++++++++++++++++++++++++--------------------
 aclocal.m4  |   2 +-
 3 files changed, 126 insertions(+), 79 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index 9777e2e..8250058 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,6 +1,6 @@
 # Makefile for popt library.
 
-AUTOMAKE_OPTIONS = 1.3 foreign
+AUTOMAKE_OPTIONS = 1.4 foreign
 
 SUBDIRS = po
 
diff --git a/Makefile.in b/Makefile.in
index 8c82a88..54dbe9b 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -1,6 +1,6 @@
-# Makefile.in generated automatically by automake 1.3b from Makefile.am
+# Makefile.in generated automatically by automake 1.4 from Makefile.am
 
-# Copyright (C) 1994, 1995, 1996, 1997, 1998 Free Software Foundation, Inc.
+# Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -13,7 +13,7 @@
 # Makefile for popt library.
 
 
-SHELL = /bin/sh
+SHELL = @SHELL@
 
 srcdir = @srcdir@
 top_srcdir = @top_srcdir@
@@ -48,7 +48,7 @@ AUTOMAKE = @AUTOMAKE@
 AUTOHEADER = @AUTOHEADER@
 
 INSTALL = @INSTALL@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@ $(AM_INSTALL_PROGRAM_FLAGS)
 INSTALL_DATA = @INSTALL_DATA@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 transform = @program_transform_name@
@@ -68,7 +68,7 @@ TARGET = @TARGET@
 U = @U@
 VERSION = @VERSION@
 
-AUTOMAKE_OPTIONS = 1.3 foreign
+AUTOMAKE_OPTIONS = 1.4 foreign
 
 SUBDIRS = po
 
@@ -105,32 +105,32 @@ test1_DEPENDENCIES =
 test1_LDFLAGS = 
 CFLAGS = @CFLAGS@
 COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-LINK = $(CC) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS) -o $@
+CCLD = $(CC)
+LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS) -o $@
 man3dir = $(mandir)/man3
 MANS = $(man_MANS)
 
 NROFF = nroff
 HEADERS =  $(include_HEADERS)
 
-DIST_COMMON =  README COPYING Makefile.am Makefile.in acconfig.h \
-aclocal.m4 config.h.in configure configure.in install-sh missing \
-mkinstalldirs stamp-h.in
+DIST_COMMON =  README ./stamp-h.in COPYING Makefile.am Makefile.in \
+acconfig.h aclocal.m4 config.h.in configure configure.in install-sh \
+missing mkinstalldirs
 
 
 DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
 
 TAR = gtar
-GZIP = --best
+GZIP_ENV = --best
 DEP_FILES =  .deps/findme.P .deps/popt.P .deps/poptconfig.P \
 .deps/popthelp.P .deps/poptparse.P .deps/test1.P
 SOURCES = $(libpopt_a_SOURCES) $(test1_SOURCES)
 OBJECTS = $(libpopt_a_OBJECTS) $(test1_OBJECTS)
 
-all: all-recursive-am all-am
-
+all: all-redirect
 .SUFFIXES:
 .SUFFIXES: .S .c .o .s
-$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4)
+$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) 
 	cd $(top_srcdir) && $(AUTOMAKE) --foreign Makefile
 
 Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status $(BUILT_SOURCES)
@@ -146,16 +146,23 @@ $(srcdir)/configure: $(srcdir)/configure.in $(ACLOCAL_M4) $(CONFIGURE_DEPENDENCI
 	cd $(srcdir) && $(AUTOCONF)
 
 config.h: stamp-h
-	@:
+	@if test ! -f $@; then \
+		rm -f stamp-h; \
+		$(MAKE) stamp-h; \
+	else :; fi
 stamp-h: $(srcdir)/config.h.in $(top_builddir)/config.status
 	cd $(top_builddir) \
 	  && CONFIG_FILES= CONFIG_HEADERS=config.h \
 	     $(SHELL) ./config.status
-	@echo timestamp > stamp-h
+	@echo timestamp > stamp-h 2> /dev/null
 $(srcdir)/config.h.in: $(srcdir)/stamp-h.in
+	@if test ! -f $@; then \
+		rm -f $(srcdir)/stamp-h.in; \
+		$(MAKE) $(srcdir)/stamp-h.in; \
+	else :; fi
 $(srcdir)/stamp-h.in: $(top_srcdir)/configure.in $(ACLOCAL_M4) acconfig.h
 	cd $(top_srcdir) && $(AUTOHEADER)
-	@echo timestamp > $(srcdir)/stamp-h.in
+	@echo timestamp > $(srcdir)/stamp-h.in 2> /dev/null
 
 mostlyclean-hdr:
 
@@ -299,41 +306,65 @@ all-recursive install-data-recursive install-exec-recursive \
 installdirs-recursive install-recursive uninstall-recursive  \
 check-recursive installcheck-recursive info-recursive dvi-recursive:
 	@set fnord $(MAKEFLAGS); amf=$$2; \
+	dot_seen=no; \
+	target=`echo $@ | sed s/-recursive//`; \
 	list='$(SUBDIRS)'; for subdir in $$list; do \
-	  target=`echo $@ | sed s/-recursive//`; \
 	  echo "Making $$target in $$subdir"; \
-	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$target) \
+	  if test "$$subdir" = "."; then \
+	    dot_seen=yes; \
+	    local_target="$$target-am"; \
+	  else \
+	    local_target="$$target"; \
+	  fi; \
+	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
 	   || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
-	done && test -z "$$fail"
+	done; \
+	if test "$$dot_seen" = "no"; then \
+	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
+	fi; test -z "$$fail"
 
 mostlyclean-recursive clean-recursive distclean-recursive \
 maintainer-clean-recursive:
 	@set fnord $(MAKEFLAGS); amf=$$2; \
+	dot_seen=no; \
 	rev=''; list='$(SUBDIRS)'; for subdir in $$list; do \
 	  rev="$$subdir $$rev"; \
+	  test "$$subdir" = "." && dot_seen=yes; \
 	done; \
+	test "$$dot_seen" = "no" && rev=". $$rev"; \
+	target=`echo $@ | sed s/-recursive//`; \
 	for subdir in $$rev; do \
-	  target=`echo $@ | sed s/-recursive//`; \
 	  echo "Making $$target in $$subdir"; \
-	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$target) \
+	  if test "$$subdir" = "."; then \
+	    local_target="$$target-am"; \
+	  else \
+	    local_target="$$target"; \
+	  fi; \
+	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
 	   || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
 	done && test -z "$$fail"
 tags-recursive:
 	list='$(SUBDIRS)'; for subdir in $$list; do \
-	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \
+	  test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \
 	done
 
 tags: TAGS
 
 ID: $(HEADERS) $(SOURCES) $(LISP)
+	list='$(SOURCES) $(HEADERS)'; \
+	unique=`for i in $$list; do echo $$i; done | \
+	  awk '    { files[$$0] = 1; } \
+	       END { for (i in files) print i; }'`; \
 	here=`pwd` && cd $(srcdir) \
-	  && mkid -f$$here/ID $(SOURCES) $(HEADERS) $(LISP)
+	  && mkid -f$$here/ID $$unique $(LISP)
 
 TAGS: tags-recursive $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) $(LISP)
 	tags=; \
 	here=`pwd`; \
 	list='$(SUBDIRS)'; for subdir in $$list; do \
-	  test -f $$subdir/TAGS && tags="$$tags -i $$here/$$subdir/TAGS"; \
+   if test "$$subdir" = .; then :; else \
+	    test -f $$subdir/TAGS && tags="$$tags -i $$here/$$subdir/TAGS"; \
+   fi; \
 	done; \
 	list='$(SOURCES) $(HEADERS)'; \
 	unique=`for i in $$list; do echo $$i; done | \
@@ -359,7 +390,7 @@ top_distdir = $(distdir)
 # tarfile.
 distcheck: dist
 	-rm -rf $(distdir)
-	GZIP=$(GZIP) $(TAR) zxf $(distdir).tar.gz
+	GZIP=$(GZIP_ENV) $(TAR) zxf $(distdir).tar.gz
 	mkdir $(distdir)/=build
 	mkdir $(distdir)/=inst
 	dc_install_base=`cd $(distdir)/=inst && pwd`; \
@@ -372,16 +403,18 @@ distcheck: dist
 	  && $(MAKE) $(AM_MAKEFLAGS) installcheck \
 	  && $(MAKE) $(AM_MAKEFLAGS) dist
 	-rm -rf $(distdir)
-	@echo "========================"; \
-	echo "$(distdir).tar.gz is ready for distribution"; \
-	echo "========================"
+	@banner="$(distdir).tar.gz is ready for distribution"; \
+	dashes=`echo "$$banner" | sed s/./=/g`; \
+	echo "$$dashes"; \
+	echo "$$banner"; \
+	echo "$$dashes"
 dist: distdir
 	-chmod -R a+r $(distdir)
-	GZIP=$(GZIP) $(TAR) chozf $(distdir).tar.gz $(distdir)
+	GZIP=$(GZIP_ENV) $(TAR) chozf $(distdir).tar.gz $(distdir)
 	-rm -rf $(distdir)
 dist-all: distdir
 	-chmod -R a+r $(distdir)
-	GZIP=$(GZIP) $(TAR) chozf $(distdir).tar.gz $(distdir)
+	GZIP=$(GZIP_ENV) $(TAR) chozf $(distdir).tar.gz $(distdir)
 	-rm -rf $(distdir)
 distdir: $(DISTFILES)
 	-rm -rf $(distdir)
@@ -394,17 +427,23 @@ distdir: $(DISTFILES)
 	  && $(AUTOMAKE) --include-deps --build-dir=$$here --srcdir-name=$(top_srcdir) --output-dir=$$top_distdir --foreign Makefile
 	@for file in $(DISTFILES); do \
 	  d=$(srcdir); \
-	  test -f $(distdir)/$$file \
-	  || ln $$d/$$file $(distdir)/$$file 2> /dev/null \
-	  || cp -p $$d/$$file $(distdir)/$$file; \
+	  if test -d $$d/$$file; then \
+	    cp -pr $$/$$file $(distdir)/$$file; \
+	  else \
+	    test -f $(distdir)/$$file \
+	    || ln $$d/$$file $(distdir)/$$file 2> /dev/null \
+	    || cp -p $$d/$$file $(distdir)/$$file || :; \
+	  fi; \
 	done
 	for subdir in $(SUBDIRS); do \
-	  test -d $(distdir)/$$subdir \
-	  || mkdir $(distdir)/$$subdir \
-	  || exit 1; \
-	  chmod 777 $(distdir)/$$subdir; \
-	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) top_distdir=../$(distdir) distdir=../$(distdir)/$$subdir distdir) \
+	  if test "$$subdir" = .; then :; else \
+	    test -d $(distdir)/$$subdir \
+	    || mkdir $(distdir)/$$subdir \
 	    || exit 1; \
+	    chmod 777 $(distdir)/$$subdir; \
+	    (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) top_distdir=../$(distdir) distdir=../$(distdir)/$$subdir distdir) \
+	      || exit 1; \
+	  fi; \
 	done
 
 DEPS_MAGIC := $(shell mkdir .deps > /dev/null 2>&1 || :)
@@ -416,50 +455,57 @@ mostlyclean-depend:
 clean-depend:
 
 distclean-depend:
+	-rm -rf .deps
 
 maintainer-clean-depend:
-	-rm -rf .deps
 
 %.o: %.c
 	@echo '$(COMPILE) -c $<'; \
-	$(COMPILE) -Wp,-MD,.deps/$(*F).P -c $<
+	$(COMPILE) -Wp,-MD,.deps/$(*F).pp -c $<
+	@-cp .deps/$(*F).pp .deps/$(*F).P; \
+	tr ' ' '\012' < .deps/$(*F).pp \
+	  | sed -e 's/^\\$$//' -e '/^$$/ d' -e '/:$$/ d' -e 's/$$/ :/' \
+	    >> .deps/$(*F).P; \
+	rm .deps/$(*F).pp
 
 %.lo: %.c
 	@echo '$(LTCOMPILE) -c $<'; \
-	$(LTCOMPILE) -Wp,-MD,.deps/$(*F).p -c $<
-	@-sed -e 's/^\([^:]*\)\.o:/\1.lo \1.o:/' \
-	  < .deps/$(*F).p > .deps/$(*F).P
-	@-rm -f .deps/$(*F).p
+	$(LTCOMPILE) -Wp,-MD,.deps/$(*F).pp -c $<
+	@-sed -e 's/^\([^:]*\)\.o[ 	]*:/\1.lo \1.o :/' \
+	  < .deps/$(*F).pp > .deps/$(*F).P; \
+	tr ' ' '\012' < .deps/$(*F).pp \
+	  | sed -e 's/^\\$$//' -e '/^$$/ d' -e '/:$$/ d' -e 's/$$/ :/' \
+	    >> .deps/$(*F).P; \
+	rm -f .deps/$(*F).pp
+info-am:
 info: info-recursive
+dvi-am:
 dvi: dvi-recursive
-check: all-am
-	$(MAKE) $(AM_MAKEFLAGS) check-recursive
+check-am: all-am
+check: check-recursive
+installcheck-am:
 installcheck: installcheck-recursive
 all-recursive-am: config.h
 	$(MAKE) $(AM_MAKEFLAGS) all-recursive
 
-all-am: Makefile $(LIBRARIES) $(PROGRAMS) $(MANS) $(HEADERS) config.h
-
 install-exec-am: install-libLIBRARIES
+install-exec: install-exec-recursive
 
 install-data-am: install-man install-includeHEADERS
-
-uninstall-am: uninstall-libLIBRARIES uninstall-man uninstall-includeHEADERS
-
-install-exec: install-exec-recursive install-exec-am
-	@$(NORMAL_INSTALL)
-
-install-data: install-data-recursive install-data-am
-	@$(NORMAL_INSTALL)
-
-install: install-recursive install-exec-am install-data-am
-	@:
-
-uninstall: uninstall-recursive uninstall-am
-
+install-data: install-data-recursive
+
+install-am: all-am
+	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
+install: install-recursive
+uninstall-am: uninstall-libLIBRARIES uninstall-man \
+		uninstall-includeHEADERS
+uninstall: uninstall-recursive
+all-am: Makefile $(LIBRARIES) $(PROGRAMS) $(MANS) $(HEADERS) config.h
+all-redirect: all-recursive-am
 install-strip:
-	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM='$(INSTALL_PROGRAM) -s' INSTALL_SCRIPT='$(INSTALL_PROGRAM)' install
+	$(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install
 installdirs: installdirs-recursive
+installdirs-am:
 	$(mkinstalldirs)  $(DESTDIR)$(libdir) $(DESTDIR)$(mandir)/man3 \
 		$(DESTDIR)$(includedir)
 
@@ -477,30 +523,30 @@ mostlyclean-am:  mostlyclean-hdr mostlyclean-libLIBRARIES \
 		mostlyclean-compile mostlyclean-noinstPROGRAMS \
 		mostlyclean-tags mostlyclean-depend mostlyclean-generic
 
+mostlyclean: mostlyclean-recursive
+
 clean-am:  clean-hdr clean-libLIBRARIES clean-compile \
 		clean-noinstPROGRAMS clean-tags clean-depend \
 		clean-generic mostlyclean-am
 
+clean: clean-recursive
+
 distclean-am:  distclean-hdr distclean-libLIBRARIES distclean-compile \
 		distclean-noinstPROGRAMS distclean-tags \
 		distclean-depend distclean-generic clean-am
 
+distclean: distclean-recursive
+	-rm -f config.status
+
 maintainer-clean-am:  maintainer-clean-hdr maintainer-clean-libLIBRARIES \
 		maintainer-clean-compile \
 		maintainer-clean-noinstPROGRAMS maintainer-clean-tags \
 		maintainer-clean-depend maintainer-clean-generic \
 		distclean-am
-
-mostlyclean:  mostlyclean-recursive mostlyclean-am
-
-clean:  clean-recursive clean-am
-
-distclean:  distclean-recursive distclean-am
-	-rm -f config.status
-
-maintainer-clean:  maintainer-clean-recursive maintainer-clean-am
 	@echo "This command is intended for maintainers to use;"
 	@echo "it deletes files that may require special tools to rebuild."
+
+maintainer-clean: maintainer-clean-recursive
 	-rm -f config.status
 
 .PHONY: mostlyclean-hdr distclean-hdr clean-hdr maintainer-clean-hdr \
@@ -518,11 +564,12 @@ dvi-recursive mostlyclean-recursive distclean-recursive clean-recursive \
 maintainer-clean-recursive tags tags-recursive mostlyclean-tags \
 distclean-tags clean-tags maintainer-clean-tags distdir \
 mostlyclean-depend distclean-depend clean-depend \
-maintainer-clean-depend info dvi installcheck all-recursive-am all-am \
-install-exec-am install-data-am uninstall-am install-exec install-data \
-install uninstall all installdirs mostlyclean-generic distclean-generic \
-clean-generic maintainer-clean-generic clean mostlyclean distclean \
-maintainer-clean
+maintainer-clean-depend info-am info dvi-am dvi check check-am \
+installcheck-am installcheck all-recursive-am install-exec-am \
+install-exec install-data-am install-data install-am install \
+uninstall-am uninstall all-redirect all-am all installdirs-am \
+installdirs mostlyclean-generic distclean-generic clean-generic \
+maintainer-clean-generic clean mostlyclean distclean maintainer-clean
 
 
 .PHONY: archive
diff --git a/aclocal.m4 b/aclocal.m4
index d234055..bb02844 100644
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -20,7 +20,7 @@ dnl Usage:
 dnl AM_INIT_AUTOMAKE(package,version, [no-define])
 
 AC_DEFUN(AM_INIT_AUTOMAKE,
-[AC_REQUIRE([AM_PROG_INSTALL])
+[AC_REQUIRE([AC_PROG_INSTALL])
 PACKAGE=[$1]
 AC_SUBST(PACKAGE)
 VERSION=[$2]
-- 
Gitee


From b8a9e67cbc96e9360022ca1c67a195db2b8edf49 Mon Sep 17 00:00:00 2001
From: Jeff Johnson <n3npq@mac.com>
Date: Thu, 21 Jan 1999 18:43:02 +0000
Subject: [PATCH 149/667] Automake: almost functional make dist.

---
 Makefile.am       | 5 +++++
 Makefile.in       | 6 ++++++
 po/Makefile.in    | 2 ++
 po/Makefile.in.in | 2 ++
 4 files changed, 15 insertions(+)

diff --git a/Makefile.am b/Makefile.am
index 8250058..b46024e 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -2,11 +2,16 @@
 
 AUTOMAKE_OPTIONS = 1.4 foreign
 
+EXTRA_DIST = CHANGES autogen.sh findme.h popt.3 popt.spec poptint.h testit.sh \
+	po/*.in po/*.po po/popt.pot popt.ps
+
 SUBDIRS = po
 
 LDFLAGS = -L$(top_builddir)
 INCLUDES = -I$(top_srcdir)
 
+noinst_INCLUDES = findme.h poptint.h
+
 noinst_PROGRAMS = test1
 test1_SOURCES = test1.c
 test1_LDADD = -lpopt
diff --git a/Makefile.in b/Makefile.in
index 54dbe9b..aa33597 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -70,11 +70,16 @@ VERSION = @VERSION@
 
 AUTOMAKE_OPTIONS = 1.4 foreign
 
+EXTRA_DIST = CHANGES autogen.sh findme.h popt.3 popt.spec poptint.h testit.sh 	po/*.in po/*.po po/popt.pot popt.ps
+
+
 SUBDIRS = po
 
 LDFLAGS = -L$(top_builddir)
 INCLUDES = -I$(top_srcdir)
 
+noinst_INCLUDES = findme.h poptint.h
+
 noinst_PROGRAMS = test1
 test1_SOURCES = test1.c
 test1_LDADD = -lpopt
@@ -425,6 +430,7 @@ distdir: $(DISTFILES)
 	distdir=`cd $(distdir) && pwd`; \
 	cd $(top_srcdir) \
 	  && $(AUTOMAKE) --include-deps --build-dir=$$here --srcdir-name=$(top_srcdir) --output-dir=$$top_distdir --foreign Makefile
+	$(mkinstalldirs) $(distdir)/po
 	@for file in $(DISTFILES); do \
 	  d=$(srcdir); \
 	  if test -d $$d/$$file; then \
diff --git a/po/Makefile.in b/po/Makefile.in
index b2ab87f..4a3eeb9 100644
--- a/po/Makefile.in
+++ b/po/Makefile.in
@@ -79,5 +79,7 @@ Makefile: Makefile.in.in ../config.status POTFILES
 	  && CONFIG_FILES=po/$@.in CONFIG_HEADERS= \
 	       $(SHELL) ./config.status
 
+distdir:
+
 %.mo: %.po
 	msgfmt -o $@ $<
diff --git a/po/Makefile.in.in b/po/Makefile.in.in
index 11489ef..78e1782 100644
--- a/po/Makefile.in.in
+++ b/po/Makefile.in.in
@@ -79,5 +79,7 @@ Makefile: Makefile.in.in ../config.status POTFILES
 	  && CONFIG_FILES=po/$@.in CONFIG_HEADERS= \
 	       $(SHELL) ./config.status
 
+distdir:
+
 %.mo: %.po
 	msgfmt -o $@ $<
-- 
Gitee


From d64d9d196c60f62bba35e689e2633a01517b5066 Mon Sep 17 00:00:00 2001
From: Jeff Johnson <n3npq@mac.com>
Date: Thu, 21 Jan 1999 22:31:02 +0000
Subject: [PATCH 150/667] After running libtoolize to update config.guess
 config.sub

---
 Makefile.am       |   7 +-
 Makefile.in       |  71 ++++--
 aclocal.m4        | 543 ++++++++++++++++++++++++++++++++++++++++++++--
 config.h.in       |  22 +-
 configure.in      |   2 +-
 po/Makefile.in    |   3 -
 po/Makefile.in.in |   3 -
 7 files changed, 597 insertions(+), 54 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index b46024e..978b910 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -2,12 +2,13 @@
 
 AUTOMAKE_OPTIONS = 1.4 foreign
 
-EXTRA_DIST = CHANGES autogen.sh findme.h popt.3 popt.spec poptint.h testit.sh \
-	po/*.in po/*.po po/popt.pot popt.ps
+EXTRA_DIST = CHANGES autogen.sh findme.h $(man_MANS) popt.spec poptint.h \
+	testit.sh po/*.in po/*.po po/popt.pot popt.ps
 
 SUBDIRS = po
 
-LDFLAGS = -L$(top_builddir)
+tbd = `pwd`/$(top_builddir)
+LDFLAGS = -L$(tbd)
 INCLUDES = -I$(top_srcdir)
 
 noinst_INCLUDES = findme.h poptint.h
diff --git a/Makefile.in b/Makefile.in
index aa33597..6eea8f1 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -59,9 +59,17 @@ POST_INSTALL = :
 NORMAL_UNINSTALL = :
 PRE_UNINSTALL = :
 POST_UNINSTALL = :
+host_alias = @host_alias@
+host_triplet = @host@
+AS = @AS@
 CC = @CC@
 CPP = @CPP@
+DLLTOOL = @DLLTOOL@
+LD = @LD@
+LIBTOOL = @LIBTOOL@
+LN_S = @LN_S@
 MAKEINFO = @MAKEINFO@
+NM = @NM@
 PACKAGE = @PACKAGE@
 RANLIB = @RANLIB@
 TARGET = @TARGET@
@@ -70,12 +78,13 @@ VERSION = @VERSION@
 
 AUTOMAKE_OPTIONS = 1.4 foreign
 
-EXTRA_DIST = CHANGES autogen.sh findme.h popt.3 popt.spec poptint.h testit.sh 	po/*.in po/*.po po/popt.pot popt.ps
+EXTRA_DIST = CHANGES autogen.sh findme.h $(man_MANS) popt.spec poptint.h 	testit.sh po/*.in po/*.po po/popt.pot popt.ps
 
 
 SUBDIRS = po
 
-LDFLAGS = -L$(top_builddir)
+tbd = `pwd`/$(top_builddir)
+LDFLAGS = -L$(tbd)
 INCLUDES = -I$(top_srcdir)
 
 noinst_INCLUDES = findme.h poptint.h
@@ -110,8 +119,9 @@ test1_DEPENDENCIES =
 test1_LDFLAGS = 
 CFLAGS = @CFLAGS@
 COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
 CCLD = $(CC)
-LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS) -o $@
+LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS) -o $@
 man3dir = $(mandir)/man3
 MANS = $(man_MANS)
 
@@ -119,8 +129,8 @@ NROFF = nroff
 HEADERS =  $(include_HEADERS)
 
 DIST_COMMON =  README ./stamp-h.in COPYING Makefile.am Makefile.in \
-acconfig.h aclocal.m4 config.h.in configure configure.in install-sh \
-missing mkinstalldirs
+acconfig.h aclocal.m4 config.guess config.h.in config.sub configure \
+configure.in install-sh ltconfig ltmain.sh missing mkinstalldirs
 
 
 DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
@@ -134,7 +144,7 @@ OBJECTS = $(libpopt_a_OBJECTS) $(test1_OBJECTS)
 
 all: all-redirect
 .SUFFIXES:
-.SUFFIXES: .S .c .o .s
+.SUFFIXES: .S .c .lo .o .s
 $(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) 
 	cd $(top_srcdir) && $(AUTOMAKE) --foreign Makefile
 
@@ -226,6 +236,22 @@ distclean-compile:
 
 maintainer-clean-compile:
 
+.s.lo:
+	$(LIBTOOL) --mode=compile $(COMPILE) -c $<
+
+.S.lo:
+	$(LIBTOOL) --mode=compile $(COMPILE) -c $<
+
+mostlyclean-libtool:
+	-rm -f *.lo
+
+clean-libtool:
+	-rm -rf .libs _libs
+
+distclean-libtool:
+
+maintainer-clean-libtool:
+
 libpopt.a: $(libpopt_a_OBJECTS) $(libpopt_a_DEPENDENCIES)
 	-rm -f libpopt.a
 	$(AR) cru libpopt.a $(libpopt_a_OBJECTS) $(libpopt_a_LIBADD)
@@ -526,26 +552,29 @@ distclean-generic:
 
 maintainer-clean-generic:
 mostlyclean-am:  mostlyclean-hdr mostlyclean-libLIBRARIES \
-		mostlyclean-compile mostlyclean-noinstPROGRAMS \
-		mostlyclean-tags mostlyclean-depend mostlyclean-generic
+		mostlyclean-compile mostlyclean-libtool \
+		mostlyclean-noinstPROGRAMS mostlyclean-tags \
+		mostlyclean-depend mostlyclean-generic
 
 mostlyclean: mostlyclean-recursive
 
-clean-am:  clean-hdr clean-libLIBRARIES clean-compile \
+clean-am:  clean-hdr clean-libLIBRARIES clean-compile clean-libtool \
 		clean-noinstPROGRAMS clean-tags clean-depend \
 		clean-generic mostlyclean-am
 
 clean: clean-recursive
 
 distclean-am:  distclean-hdr distclean-libLIBRARIES distclean-compile \
-		distclean-noinstPROGRAMS distclean-tags \
-		distclean-depend distclean-generic clean-am
+		distclean-libtool distclean-noinstPROGRAMS \
+		distclean-tags distclean-depend distclean-generic \
+		clean-am
+	-rm -f libtool
 
 distclean: distclean-recursive
 	-rm -f config.status
 
 maintainer-clean-am:  maintainer-clean-hdr maintainer-clean-libLIBRARIES \
-		maintainer-clean-compile \
+		maintainer-clean-compile maintainer-clean-libtool \
 		maintainer-clean-noinstPROGRAMS maintainer-clean-tags \
 		maintainer-clean-depend maintainer-clean-generic \
 		distclean-am
@@ -559,14 +588,16 @@ maintainer-clean: maintainer-clean-recursive
 mostlyclean-libLIBRARIES distclean-libLIBRARIES clean-libLIBRARIES \
 maintainer-clean-libLIBRARIES uninstall-libLIBRARIES \
 install-libLIBRARIES mostlyclean-compile distclean-compile \
-clean-compile maintainer-clean-compile mostlyclean-noinstPROGRAMS \
-distclean-noinstPROGRAMS clean-noinstPROGRAMS \
-maintainer-clean-noinstPROGRAMS install-man3 uninstall-man3 install-man \
-uninstall-man uninstall-includeHEADERS install-includeHEADERS \
-install-data-recursive uninstall-data-recursive install-exec-recursive \
-uninstall-exec-recursive installdirs-recursive uninstalldirs-recursive \
-all-recursive check-recursive installcheck-recursive info-recursive \
-dvi-recursive mostlyclean-recursive distclean-recursive clean-recursive \
+clean-compile maintainer-clean-compile mostlyclean-libtool \
+distclean-libtool clean-libtool maintainer-clean-libtool \
+mostlyclean-noinstPROGRAMS distclean-noinstPROGRAMS \
+clean-noinstPROGRAMS maintainer-clean-noinstPROGRAMS install-man3 \
+uninstall-man3 install-man uninstall-man uninstall-includeHEADERS \
+install-includeHEADERS install-data-recursive uninstall-data-recursive \
+install-exec-recursive uninstall-exec-recursive installdirs-recursive \
+uninstalldirs-recursive all-recursive check-recursive \
+installcheck-recursive info-recursive dvi-recursive \
+mostlyclean-recursive distclean-recursive clean-recursive \
 maintainer-clean-recursive tags tags-recursive mostlyclean-tags \
 distclean-tags clean-tags maintainer-clean-tags distdir \
 mostlyclean-depend distclean-depend clean-depend \
diff --git a/aclocal.m4 b/aclocal.m4
index bb02844..ba33d33 100644
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -1,7 +1,7 @@
-dnl aclocal.m4 generated automatically by aclocal 1.3
+dnl aclocal.m4 generated automatically by aclocal 1.4
 
-dnl Copyright (C) 1994, 1995, 1996, 1997, 1998 Free Software Foundation, Inc.
-dnl This Makefile.in is free software; the Free Software Foundation
+dnl Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc.
+dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
 
@@ -30,8 +30,8 @@ if test "`cd $srcdir && pwd`" != "`pwd`" && test -f $srcdir/config.status; then
   AC_MSG_ERROR([source directory already configured; run "make distclean" there first])
 fi
 ifelse([$3],,
-AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE")
-AC_DEFINE_UNQUOTED(VERSION, "$VERSION"))
+AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE", [Name of package])
+AC_DEFINE_UNQUOTED(VERSION, "$VERSION", [Version number of package]))
 AC_REQUIRE([AM_SANITY_CHECK])
 AC_REQUIRE([AC_ARG_PROGRAM])
 dnl FIXME This is truly gross.
@@ -43,15 +43,6 @@ AM_MISSING_PROG(AUTOHEADER, autoheader, $missing_dir)
 AM_MISSING_PROG(MAKEINFO, makeinfo, $missing_dir)
 AC_REQUIRE([AC_PROG_MAKE_SET])])
 
-
-# serial 1
-
-AC_DEFUN(AM_PROG_INSTALL,
-[AC_REQUIRE([AC_PROG_INSTALL])
-test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL_PROGRAM}'
-AC_SUBST(INSTALL_SCRIPT)dnl
-])
-
 #
 # Check to make sure that the build environment is sane.
 #
@@ -143,7 +134,7 @@ AC_REQUIRE([AC_PROG_CPP])
 AC_MSG_CHECKING([for function prototypes])
 if test "$am_cv_prog_cc_stdc" != no; then
   AC_MSG_RESULT(yes)
-  AC_DEFINE(PROTOTYPES)
+  AC_DEFINE(PROTOTYPES,1,[Define if compiler has function prototypes])
   U= ANSI2KNR=
 else
   AC_MSG_RESULT(no)
@@ -244,3 +235,525 @@ case "x$am_cv_prog_cc_stdc" in
 esac
 ])
 
+
+# serial 29 AM_PROG_LIBTOOL
+AC_DEFUN(AM_PROG_LIBTOOL,
+[AC_REQUIRE([AM_ENABLE_SHARED])dnl
+AC_REQUIRE([AM_ENABLE_STATIC])dnl
+AC_REQUIRE([AC_CANONICAL_HOST])dnl
+AC_REQUIRE([AC_CANONICAL_BUILD])dnl
+AC_REQUIRE([AC_PROG_RANLIB])dnl
+AC_REQUIRE([AC_PROG_CC])dnl
+AC_REQUIRE([AM_PROG_LD])dnl
+AC_REQUIRE([AM_PROG_NM])dnl
+AC_REQUIRE([AM_SYS_NM_PARSE])dnl
+AC_REQUIRE([AM_SYS_SYMBOL_UNDERSCORE])dnl
+AC_REQUIRE([AC_PROG_LN_S])dnl
+dnl
+# Always use our own libtool.
+LIBTOOL='$(SHELL) $(top_builddir)/libtool'
+AC_SUBST(LIBTOOL)dnl
+
+# Check for any special flags to pass to ltconfig.
+libtool_flags=
+test "$enable_shared" = no && libtool_flags="$libtool_flags --disable-shared"
+test "$enable_static" = no && libtool_flags="$libtool_flags --disable-static"
+test "$silent" = yes && libtool_flags="$libtool_flags --silent"
+test "$ac_cv_prog_gcc" = yes && libtool_flags="$libtool_flags --with-gcc"
+test "$ac_cv_prog_gnu_ld" = yes && libtool_flags="$libtool_flags --with-gnu-ld"
+
+# Some flags need to be propagated to the compiler or linker for good
+# libtool support.
+case "$host" in
+*-*-irix6*)
+  # Find out which ABI we are using.
+  echo '[#]line __oline__ "configure"' > conftest.$ac_ext
+  if AC_TRY_EVAL(ac_compile); then
+    case "`/usr/bin/file conftest.o`" in
+    *32-bit*)
+      LD="${LD-ld} -32"
+      ;;
+    *N32*)
+      LD="${LD-ld} -n32"
+      ;;
+    *64-bit*)
+      LD="${LD-ld} -64"
+      ;;
+    esac
+  fi
+  rm -rf conftest*
+  ;;
+
+*-*-sco3.2v5*)
+  # On SCO OpenServer 5, we need -belf to get full-featured binaries.
+  SAVE_CFLAGS="$CFLAGS"
+  CFLAGS="$CFLAGS -belf"
+  AC_CACHE_CHECK([whether the C compiler needs -belf], lt_cv_cc_needs_belf,
+    [AC_TRY_LINK([],[],[lt_cv_cc_needs_belf=yes],[lt_cv_cc_needs_belf=no])])
+  if test x"$lt_cv_cc_needs_belf" != x"yes"; then
+    # this is probably gcc 2.8.0, egcs 1.0 or newer; no need for -belf
+    CFLAGS="$SAVE_CFLAGS"
+  fi
+  ;;
+
+*-*-cygwin32*)
+  AM_SYS_LIBTOOL_CYGWIN32
+  ;;
+
+esac
+
+# enable the --disable-libtool-lock switch
+
+AC_ARG_ENABLE(libtool-lock,
+[  --disable-libtool-lock  force libtool not to do file locking],
+need_locks=$enableval,
+need_locks=yes)
+
+if test x"$need_locks" = xno; then
+  libtool_flags="$libtool_flags --disable-lock"
+fi
+
+
+# Actually configure libtool.  ac_aux_dir is where install-sh is found.
+CC="$CC" CFLAGS="$CFLAGS" CPPFLAGS="$CPPFLAGS" \
+LD="$LD" NM="$NM" RANLIB="$RANLIB" LN_S="$LN_S" \
+DLLTOOL="$DLLTOOL" AS="$AS" \
+${CONFIG_SHELL-/bin/sh} $ac_aux_dir/ltconfig --no-reexec \
+$libtool_flags --no-verify $ac_aux_dir/ltmain.sh $host \
+|| AC_MSG_ERROR([libtool configure failed])
+
+# Redirect the config.log output again, so that the ltconfig log is not
+# clobbered by the next message.
+exec 5>>./config.log
+])
+
+# AM_ENABLE_SHARED - implement the --enable-shared flag
+# Usage: AM_ENABLE_SHARED[(DEFAULT)]
+#   Where DEFAULT is either `yes' or `no'.  If omitted, it defaults to
+#   `yes'.
+AC_DEFUN(AM_ENABLE_SHARED,
+[define([AM_ENABLE_SHARED_DEFAULT], ifelse($1, no, no, yes))dnl
+AC_ARG_ENABLE(shared,
+changequote(<<, >>)dnl
+<<  --enable-shared[=PKGS]  build shared libraries [default=>>AM_ENABLE_SHARED_DEFAULT],
+changequote([, ])dnl
+[p=${PACKAGE-default}
+case "$enableval" in
+yes) enable_shared=yes ;;
+no) enable_shared=no ;;
+*)
+  enable_shared=no
+  # Look at the argument we got.  We use all the common list separators.
+  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS="${IFS}:,"
+  for pkg in $enableval; do
+    if test "X$pkg" = "X$p"; then
+      enable_shared=yes
+    fi
+  done
+  IFS="$ac_save_ifs"
+  ;;
+esac],
+enable_shared=AM_ENABLE_SHARED_DEFAULT)dnl
+])
+
+# AM_DISABLE_SHARED - set the default shared flag to --disable-shared
+AC_DEFUN(AM_DISABLE_SHARED,
+[AM_ENABLE_SHARED(no)])
+
+# AM_DISABLE_STATIC - set the default static flag to --disable-static
+AC_DEFUN(AM_DISABLE_STATIC,
+[AM_ENABLE_STATIC(no)])
+
+# AM_ENABLE_STATIC - implement the --enable-static flag
+# Usage: AM_ENABLE_STATIC[(DEFAULT)]
+#   Where DEFAULT is either `yes' or `no'.  If omitted, it defaults to
+#   `yes'.
+AC_DEFUN(AM_ENABLE_STATIC,
+[define([AM_ENABLE_STATIC_DEFAULT], ifelse($1, no, no, yes))dnl
+AC_ARG_ENABLE(static,
+changequote(<<, >>)dnl
+<<  --enable-static[=PKGS]  build static libraries [default=>>AM_ENABLE_STATIC_DEFAULT],
+changequote([, ])dnl
+[p=${PACKAGE-default}
+case "$enableval" in
+yes) enable_static=yes ;;
+no) enable_static=no ;;
+*)
+  enable_static=no
+  # Look at the argument we got.  We use all the common list separators.
+  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS="${IFS}:,"
+  for pkg in $enableval; do
+    if test "X$pkg" = "X$p"; then
+      enable_static=yes
+    fi
+  done
+  IFS="$ac_save_ifs"
+  ;;
+esac],
+enable_static=AM_ENABLE_STATIC_DEFAULT)dnl
+])
+
+
+# AM_PROG_LD - find the path to the GNU or non-GNU linker
+AC_DEFUN(AM_PROG_LD,
+[AC_ARG_WITH(gnu-ld,
+[  --with-gnu-ld           assume the C compiler uses GNU ld [default=no]],
+test "$withval" = no || with_gnu_ld=yes, with_gnu_ld=no)
+AC_REQUIRE([AC_PROG_CC])dnl
+AC_REQUIRE([AC_CANONICAL_HOST])dnl
+AC_REQUIRE([AC_CANONICAL_BUILD])dnl
+ac_prog=ld
+if test "$ac_cv_prog_gcc" = yes; then
+  # Check if gcc -print-prog-name=ld gives a path.
+  AC_MSG_CHECKING([for ld used by GCC])
+  ac_prog=`($CC -print-prog-name=ld) 2>&5`
+  case "$ac_prog" in
+    # Accept absolute paths.
+changequote(,)dnl
+    /* | [A-Za-z]:/*)
+      # Canonicalize the path of ld
+      re_direlt='/[^/][^/]*/\.\./'
+      sub_uncdrive='s%^\([A-Za-z]\):/%//\1/%'
+changequote([,])dnl
+      while echo $ac_prog | grep "$re_direlt" > /dev/null 2>&1; do
+        ac_prog=`echo $ac_prog| sed "s%$re_direlt%/%"`
+      done
+      case "$host_os" in
+      cygwin*)
+        # Convert to a UNC path for cygwin
+        test -z "$LD" && LD=`echo X$ac_prog | $Xsed -e "$sub_uncdrive"`
+	;;
+      *)
+        test -z "$LD" && LD="$ac_prog"
+	;;
+      esac
+      ;;
+    ##
+    ## FIXME:  The code fails later on if we try to use an $LD with
+    ##         '\\' path separators.
+    ##
+changequote(,)dnl
+    [A-Za-z]:[\\]*)
+      # Canonicalize the path of ld
+      re_direlt='\\[^\\][^\\]*\\\.\.\(\\\)'
+      sub_uncdrive='s%^\([A-Za-z]\):\\%//\1/%'
+changequote([,])dnl
+      sub_uncdir='s%\\%/%g'
+      while echo $ac_prog | grep "$re_direlt" > /dev/null 2>&1; do
+        ac_prog=`echo $ac_prog| sed "s%$re_direlt%\1%"`
+      done
+      case "$host_os" in
+      cygwin*)
+        # Convert to a UNC path for cygwin
+        test -z "$LD" && LD=`echo X$ac_prog | sed -e 's%^X%%' -e "$sub_uncdrive" -e "$sub_uncdir"`
+	;;
+      *)
+        test -z "$LD" && LD="$ac_prog"
+	;;
+      esac
+      ;;
+  "")
+    # If it fails, then pretend we aren't using GCC.
+    ac_prog=ld
+    ;;
+  *)
+    # If it is relative, then search for the first ld in PATH.
+    with_gnu_ld=unknown
+    ;;
+  esac
+elif test "$with_gnu_ld" = yes; then
+  AC_MSG_CHECKING([for GNU ld])
+else
+  AC_MSG_CHECKING([for non-GNU ld])
+fi
+AC_CACHE_VAL(ac_cv_path_LD,
+[if test -z "$LD"; then
+  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS="${IFS}:"
+  for ac_dir in $PATH; do
+    test -z "$ac_dir" && ac_dir=.
+    if test -f "$ac_dir/$ac_prog"; then
+      ac_cv_path_LD="$ac_dir/$ac_prog"
+      # Check to see if the program is GNU ld.  I'd rather use --version,
+      # but apparently some GNU ld's only accept -v.
+      # Break only if it was the GNU/non-GNU ld that we prefer.
+      if "$ac_cv_path_LD" -v 2>&1 < /dev/null | egrep '(GNU|with BFD)' > /dev/null; then
+	test "$with_gnu_ld" != no && break
+      else
+        test "$with_gnu_ld" != yes && break
+      fi
+    fi
+  done
+  IFS="$ac_save_ifs"
+else
+  ac_cv_path_LD="$LD" # Let the user override the test with a path.
+fi])
+LD="$ac_cv_path_LD"
+if test -n "$LD"; then
+  AC_MSG_RESULT($LD)
+else
+  AC_MSG_RESULT(no)
+fi
+test -z "$LD" && AC_MSG_ERROR([no acceptable ld found in \$PATH])
+AC_SUBST(LD)
+AM_PROG_LD_GNU
+])
+
+AC_DEFUN(AM_PROG_LD_GNU,
+[AC_CACHE_CHECK([if the linker ($LD) is GNU ld], ac_cv_prog_gnu_ld,
+[# I'd rather use --version here, but apparently some GNU ld's only accept -v.
+if $LD -v 2>&1 </dev/null | egrep '(GNU|with BFD)' 1>&5; then
+  ac_cv_prog_gnu_ld=yes
+else
+  ac_cv_prog_gnu_ld=no
+fi])
+])
+
+# AM_PROG_NM - find the path to a BSD-compatible name lister
+AC_DEFUN(AM_PROG_NM,
+[AC_MSG_CHECKING([for BSD-compatible nm])
+AC_CACHE_VAL(ac_cv_path_NM,
+[if test -n "$NM"; then
+  # Let the user override the test.
+  ac_cv_path_NM="$NM"
+else
+  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS="${IFS}:"
+  for ac_dir in /usr/ucb /usr/ccs/bin $PATH /bin; do
+    test -z "$ac_dir" && ac_dir=.
+    if test -f $ac_dir/nm; then
+      # Check to see if the nm accepts a BSD-compat flag.
+      # Adding the `sed 1q' prevents false positives on HP-UX, which says:
+      #   nm: unknown option "B" ignored
+      if ($ac_dir/nm -B /dev/null 2>&1 | sed '1q'; exit 0) | egrep /dev/null >/dev/null; then
+        ac_cv_path_NM="$ac_dir/nm -B"
+      elif ($ac_dir/nm -p /dev/null 2>&1 | sed '1q'; exit 0) | egrep /dev/null >/dev/null; then
+        ac_cv_path_NM="$ac_dir/nm -p"
+      else
+        ac_cv_path_NM="$ac_dir/nm"
+      fi
+      break
+    fi
+  done
+  IFS="$ac_save_ifs"
+  test -z "$ac_cv_path_NM" && ac_cv_path_NM=nm
+fi])
+NM="$ac_cv_path_NM"
+AC_MSG_RESULT([$NM])
+AC_SUBST(NM)
+])
+
+# AM_SYS_NM_PARSE - Check for command ro grab the raw symbol name followed
+# by C symbol name from nm.
+AC_DEFUN(AM_SYS_NM_PARSE,
+[AC_REQUIRE([AC_CANONICAL_HOST])dnl
+AC_REQUIRE([AM_PROG_NM])dnl
+# Check for command to grab the raw symbol name followed by C symbol from nm.
+AC_MSG_CHECKING([command to parse $NM output])
+AC_CACHE_VAL(ac_cv_sys_global_symbol_pipe,
+[# These are sane defaults that work on at least a few old systems.
+# {They come from Ultrix.  What could be older than Ultrix?!! ;)}
+
+changequote(,)dnl
+# Character class describing NM global symbol codes.
+ac_symcode='[BCDEGRSTU]'
+
+# Regexp to match symbols that can be accessed directly from C.
+ac_sympat='\([_A-Za-z][_A-Za-z0-9]*\)'
+
+# Transform the above into a raw symbol and a C symbol.
+ac_symxfrm='\1 \1'
+
+# Define system-specific variables.
+case "$host_os" in
+aix*)
+  ac_symcode='[BCDTU]'
+  ;;
+sunos* | cygwin32* | mingw32*)
+  ac_sympat='_\([_A-Za-z][_A-Za-z0-9]*\)'
+  ac_symxfrm='_\1 \1'
+  ;;
+irix*)
+  # Cannot use undefined symbols on IRIX because inlined functions mess us up.
+  ac_symcode='[BCDEGRST]'
+  ;;
+solaris*)
+  ac_symcode='[BDTU]'
+  ;;
+esac
+
+# If we're using GNU nm, then use its standard symbol codes.
+if $NM -V 2>&1 | egrep '(GNU|with BFD)' > /dev/null; then
+  ac_symcode='[ABCDGISTUW]'
+fi
+
+case "$host_os" in
+cygwin32* | mingw32*)
+  # We do not want undefined symbols on cygwin32.  The user must
+  # arrange to define them via -l arguments.
+  ac_symcode='[ABCDGISTW]'
+  ;;
+esac
+changequote([,])dnl
+
+# Write the raw and C identifiers.
+ac_cv_sys_global_symbol_pipe="sed -n -e 's/^.* $ac_symcode $ac_sympat$/$ac_symxfrm/p'"
+
+# Check to see that the pipe works correctly.
+ac_pipe_works=no
+cat > conftest.$ac_ext <<EOF
+#ifdef __cplusplus
+extern "C" {
+#endif
+char nm_test_var;
+void nm_test_func(){}
+#ifdef __cplusplus
+}
+#endif
+int main(){nm_test_var='a';nm_test_func;return 0;}
+EOF
+if AC_TRY_EVAL(ac_compile); then
+  # Now try to grab the symbols.
+  ac_nlist=conftest.nm
+  if AC_TRY_EVAL(NM conftest.$ac_objext \| $ac_cv_sys_global_symbol_pipe \> $ac_nlist) && test -s "$ac_nlist"; then
+
+    # Try sorting and uniquifying the output.
+    if sort "$ac_nlist" | uniq > "$ac_nlist"T; then
+      mv -f "$ac_nlist"T "$ac_nlist"
+      ac_wcout=`wc "$ac_nlist" 2>/dev/null`
+changequote(,)dnl
+      ac_count=`echo "X$ac_wcout" | sed -e 's,^X,,' -e 's/^[ 	]*\([0-9][0-9]*\).*$/\1/'`
+changequote([,])dnl
+      (test "$ac_count" -ge 0) 2>/dev/null || ac_count=-1
+    else
+      rm -f "$ac_nlist"T
+      ac_count=-1
+    fi
+
+    # Make sure that we snagged all the symbols we need.
+    if egrep ' nm_test_var$' "$ac_nlist" >/dev/null; then
+      if egrep ' nm_test_func$' "$ac_nlist" >/dev/null; then
+	cat <<EOF > conftest.c
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+EOF
+        # Now generate the symbol file.
+        sed 's/^.* \(.*\)$/extern char \1;/' < "$ac_nlist" >> conftest.c
+
+	cat <<EOF >> conftest.c
+#if defined (__STDC__) && __STDC__
+# define __ptr_t void *
+#else
+# define __ptr_t char *
+#endif
+
+/* The number of symbols in dld_preloaded_symbols, -1 if unsorted. */
+int dld_preloaded_symbol_count = $ac_count;
+
+/* The mapping between symbol names and symbols. */
+struct {
+  char *name;
+  __ptr_t address;
+}
+changequote(,)dnl
+dld_preloaded_symbols[] =
+changequote([,])dnl
+{
+EOF
+        sed 's/^\(.*\) \(.*\)$/  {"\1", (__ptr_t) \&\2},/' < "$ac_nlist" >> conftest.c
+        cat <<\EOF >> conftest.c
+  {0, (__ptr_t) 0}
+};
+
+#ifdef __cplusplus
+}
+#endif
+EOF
+        # Now try linking the two files.
+        mv conftest.$ac_objext conftestm.$ac_objext
+	ac_save_LIBS="$LIBS"
+	ac_save_CFLAGS="$CFLAGS"
+        LIBS="conftestm.$ac_objext"
+	CFLAGS="$CFLAGS$no_builtin_flag"
+        if AC_TRY_EVAL(ac_link) && test -s conftest; then
+          ac_pipe_works=yes
+        else
+          echo "configure: failed program was:" >&AC_FD_CC
+          cat conftest.c >&AC_FD_CC
+        fi
+        LIBS="$ac_save_LIBS"
+	CFLAGS="$ac_save_CFLAGS"
+      else
+        echo "cannot find nm_test_func in $ac_nlist" >&AC_FD_CC
+      fi
+    else
+      echo "cannot find nm_test_var in $ac_nlist" >&AC_FD_CC
+    fi
+  else
+    echo "cannot run $ac_cv_sys_global_symbol_pipe" >&AC_FD_CC
+  fi
+else
+  echo "$progname: failed program was:" >&AC_FD_CC
+  cat conftest.c >&AC_FD_CC
+fi
+rm -rf conftest*
+
+# Do not use the global_symbol_pipe unless it works.
+test "$ac_pipe_works" = yes || ac_cv_sys_global_symbol_pipe=
+])
+
+ac_result=yes
+if test -z "$ac_cv_sys_global_symbol_pipe"; then
+   ac_result=no
+fi
+AC_MSG_RESULT($ac_result)
+])
+
+# AM_SYS_LIBTOOL_CYGWIN32 - find tools needed on cygwin32
+AC_DEFUN(AM_SYS_LIBTOOL_CYGWIN32,
+[AC_CHECK_TOOL(DLLTOOL, dlltool, false)
+AC_CHECK_TOOL(AS, as, false)
+])
+
+# AM_SYS_SYMBOL_UNDERSCORE - does the compiler prefix global symbols
+#                            with an underscore?
+AC_DEFUN(AM_SYS_SYMBOL_UNDERSCORE,
+[AC_REQUIRE([AM_PROG_NM])dnl
+AC_REQUIRE([AM_SYS_NM_PARSE])dnl
+AC_MSG_CHECKING([for _ prefix in compiled symbols])
+AC_CACHE_VAL(ac_cv_sys_symbol_underscore,
+[ac_cv_sys_symbol_underscore=no
+cat > conftest.$ac_ext <<EOF
+void nm_test_func(){}
+int main(){nm_test_func;return 0;}
+EOF
+if AC_TRY_EVAL(ac_compile); then
+  # Now try to grab the symbols.
+  ac_nlist=conftest.nm
+  if AC_TRY_EVAL(NM conftest.$ac_objext \| $ac_cv_sys_global_symbol_pipe \> $ac_nlist) && test -s "$ac_nlist"; then
+    # See whether the symbols have a leading underscore.
+    if egrep '^_nm_test_func' "$ac_nlist" >/dev/null; then
+      ac_cv_sys_symbol_underscore=yes
+    else
+      if egrep '^nm_test_func ' "$ac_nlist" >/dev/null; then
+        :
+      else
+        echo "configure: cannot find nm_test_func in $ac_nlist" >&AC_FD_CC
+      fi
+    fi
+  else
+    echo "configure: cannot run $ac_cv_sys_global_symbol_pipe" >&AC_FD_CC
+  fi
+else
+  echo "configure: failed program was:" >&AC_FD_CC
+  cat conftest.c >&AC_FD_CC
+fi
+rm -rf conftest*
+])
+AC_MSG_RESULT($ac_cv_sys_symbol_underscore)
+if test x$ac_cv_sys_symbol_underscore = xyes; then
+  AC_DEFINE(WITH_SYMBOL_UNDERSCORE,1,
+  [define if compiled symbols have a leading underscore])
+fi
+])
+
diff --git a/config.h.in b/config.h.in
index ffa5449..c2b94e7 100644
--- a/config.h.in
+++ b/config.h.in
@@ -3,15 +3,6 @@
 /* Define if you have the ANSI C header files.  */
 #undef STDC_HEADERS
 
-/* Define to the name of the distribution.  */
-#undef PACKAGE
-
-/* Define to the version of the distribution.  */
-#undef VERSION
-
-/* Define to 1 if ANSI function prototypes are usable.  */
-#undef PROTOTYPES
-
 /* Define if you have the dgettext function.  */
 #undef HAVE_DGETTEXT
 
@@ -32,3 +23,16 @@
 
 /* Define if you have the <unistd.h> header file.  */
 #undef HAVE_UNISTD_H
+
+/* Name of package */
+#undef PACKAGE
+
+/* Version number of package */
+#undef VERSION
+
+/* Define if compiler has function prototypes */
+#undef PROTOTYPES
+
+/* define if compiled symbols have a leading underscore */
+#undef WITH_SYMBOL_UNDERSCORE
+
diff --git a/configure.in b/configure.in
index 634db54..370d4ca 100755
--- a/configure.in
+++ b/configure.in
@@ -6,7 +6,7 @@ AC_PROG_CC
 AC_GCC_TRADITIONAL
 AM_C_PROTOTYPES
 
-AC_PROG_RANLIB
+AM_PROG_LIBTOOL
 AC_PROG_INSTALL
 
 if test $CC = gcc; then
diff --git a/po/Makefile.in b/po/Makefile.in
index 4a3eeb9..67354b5 100644
--- a/po/Makefile.in
+++ b/po/Makefile.in
@@ -5,9 +5,6 @@ top_srcdir = ..
 LOCALEDIR=/usr/share/locale
 
 INSTALL= /usr/bin/install -c
-INSTALL_PROGRAM= ${INSTALL}
-INSTALL_DATA= ${INSTALL} -m 644
-CC = gcc
 
 installprefix = $(DESTDIR)
 
diff --git a/po/Makefile.in.in b/po/Makefile.in.in
index 78e1782..3ac0cc6 100644
--- a/po/Makefile.in.in
+++ b/po/Makefile.in.in
@@ -5,9 +5,6 @@ VPATH = $(srcdir)
 LOCALEDIR=@prefix@/share/locale
 
 INSTALL= @INSTALL@
-INSTALL_PROGRAM= @INSTALL_PROGRAM@
-INSTALL_DATA= @INSTALL_DATA@
-CC = @CC@
 
 installprefix = $(DESTDIR)
 
-- 
Gitee


From f8d430ae4375a8f9db954d458333b9674c121ee3 Mon Sep 17 00:00:00 2001
From: Jeff Johnson <n3npq@mac.com>
Date: Fri, 22 Jan 1999 00:34:32 +0000
Subject: [PATCH 151/667] use portable mkinstalldirs (Tim Mooney).

---
 po/Makefile.in.in | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/po/Makefile.in.in b/po/Makefile.in.in
index 3ac0cc6..3a1c44c 100644
--- a/po/Makefile.in.in
+++ b/po/Makefile.in.in
@@ -54,8 +54,8 @@ depend:
 install:
 	for n in $(CATALOGS); do \
 	    l=`basename $$n .mo`; \
-	    $(INSTALL) -m 755 -d $(installprefix)/$(LOCALEDIR)/$$l; \
-	    $(INSTALL) -m 755 -d $(installprefix)/$(LOCALEDIR)/$$l/LC_MESSAGES; \
+	    $(top_srcdir)/mkinstalldirs \
+	        $(installprefix)/$(LOCALEDIR)/$$l/LC_MESSAGES; \
 	    $(INSTALL) -m 644 $$n $(installprefix)/$(LOCALEDIR)/$$l/LC_MESSAGES/popt.mo; \
 	done
 
-- 
Gitee


From 99bfba5f738a26c0af708493f372d60900601ae9 Mon Sep 17 00:00:00 2001
From: Jeff Johnson <n3npq@mac.com>
Date: Fri, 22 Jan 1999 15:57:45 +0000
Subject: [PATCH 152/667] Change dependencies so that automake is not needed to
 build. Update rpm POTFILES. Popt too.

---
 .cvsignore     |   5 +-
 config.sub     | 955 +++++++++++++++++++++++++++++++++++++++++++++++++
 po/Makefile.in |  82 -----
 popt.spec      |   9 +-
 4 files changed, 964 insertions(+), 87 deletions(-)
 create mode 100755 config.sub
 delete mode 100644 po/Makefile.in

diff --git a/.cvsignore b/.cvsignore
index 8f1ef3c..f90b971 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -7,9 +7,12 @@ Makefile
 configure
 config.h
 config.log
+config.guess
 config.cache
-config.satus
 config.status
 stamp-h
 stamp-h.in
 test1
+libtool
+ltconfig
+ltmain.sh
diff --git a/config.sub b/config.sub
new file mode 100755
index 0000000..ba26d74
--- /dev/null
+++ b/config.sub
@@ -0,0 +1,955 @@
+#! /bin/sh
+# Configuration validation subroutine script, version 1.1.
+#   Copyright (C) 1991, 92-97, 1998 Free Software Foundation, Inc.
+# This file is (in principle) common to ALL GNU software.
+# The presence of a machine in this file suggests that SOME GNU software
+# can handle that machine.  It does not imply ALL GNU software can.
+#
+# This file is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place - Suite 330,
+# Boston, MA 02111-1307, USA.
+
+# As a special exception to the GNU General Public License, if you
+# distribute this file as part of a program that contains a
+# configuration script generated by Autoconf, you may include it under
+# the same distribution terms that you use for the rest of that program.
+
+# Configuration subroutine to validate and canonicalize a configuration type.
+# Supply the specified configuration type as an argument.
+# If it is invalid, we print an error message on stderr and exit with code 1.
+# Otherwise, we print the canonical config type on stdout and succeed.
+
+# This file is supposed to be the same for all GNU packages
+# and recognize all the CPU types, system types and aliases
+# that are meaningful with *any* GNU software.
+# Each package is responsible for reporting which valid configurations
+# it does not support.  The user should be able to distinguish
+# a failure to support a valid configuration from a meaningless
+# configuration.
+
+# The goal of this file is to map all the various variations of a given
+# machine specification into a single specification in the form:
+#	CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM
+# or in some cases, the newer four-part form:
+#	CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM
+# It is wrong to echo any other type of specification.
+
+if [ x$1 = x ]
+then
+	echo Configuration name missing. 1>&2
+	echo "Usage: $0 CPU-MFR-OPSYS" 1>&2
+	echo "or     $0 ALIAS" 1>&2
+	echo where ALIAS is a recognized configuration type. 1>&2
+	exit 1
+fi
+
+# First pass through any local machine types.
+case $1 in
+	*local*)
+		echo $1
+		exit 0
+		;;
+	*)
+	;;
+esac
+
+# Separate what the user gave into CPU-COMPANY and OS or KERNEL-OS (if any).
+# Here we must recognize all the valid KERNEL-OS combinations.
+maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'`
+case $maybe_os in
+  linux-gnu*)
+    os=-$maybe_os
+    basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`
+    ;;
+  *)
+    basic_machine=`echo $1 | sed 's/-[^-]*$//'`
+    if [ $basic_machine != $1 ]
+    then os=`echo $1 | sed 's/.*-/-/'`
+    else os=; fi
+    ;;
+esac
+
+### Let's recognize common machines as not being operating systems so
+### that things like config.sub decstation-3100 work.  We also
+### recognize some manufacturers as not being operating systems, so we
+### can provide default operating systems below.
+case $os in
+	-sun*os*)
+		# Prevent following clause from handling this invalid input.
+		;;
+	-dec* | -mips* | -sequent* | -encore* | -pc532* | -sgi* | -sony* | \
+	-att* | -7300* | -3300* | -delta* | -motorola* | -sun[234]* | \
+	-unicom* | -ibm* | -next | -hp | -isi* | -apollo | -altos* | \
+	-convergent* | -ncr* | -news | -32* | -3600* | -3100* | -hitachi* |\
+	-c[123]* | -convex* | -sun | -crds | -omron* | -dg | -ultra | -tti* | \
+	-harris | -dolphin | -highlevel | -gould | -cbm | -ns | -masscomp | \
+	-apple)
+		os=
+		basic_machine=$1
+		;;
+	-hiux*)
+		os=-hiuxwe2
+		;;
+	-sco5)
+		os=sco3.2v5
+		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
+		;;
+	-sco4)
+		os=-sco3.2v4
+		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
+		;;
+	-sco3.2.[4-9]*)
+		os=`echo $os | sed -e 's/sco3.2./sco3.2v/'`
+		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
+		;;
+	-sco3.2v[4-9]*)
+		# Don't forget version if it is 3.2v4 or newer.
+		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
+		;;
+	-sco*)
+		os=-sco3.2v2
+		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
+		;;
+	-isc)
+		os=-isc2.2
+		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
+		;;
+	-clix*)
+		basic_machine=clipper-intergraph
+		;;
+	-isc*)
+		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
+		;;
+	-lynx*)
+		os=-lynxos
+		;;
+	-ptx*)
+		basic_machine=`echo $1 | sed -e 's/86-.*/86-sequent/'`
+		;;
+	-windowsnt*)
+		os=`echo $os | sed -e 's/windowsnt/winnt/'`
+		;;
+	-psos*)
+		os=-psos
+		;;
+esac
+
+# Decode aliases for certain CPU-COMPANY combinations.
+case $basic_machine in
+	# Recognize the basic CPU types without company name.
+	# Some are omitted here because they have special meanings below.
+	tahoe | i860 | m32r | m68k | m68000 | m88k | ns32k | arc | arm \
+		| arme[lb] | pyramid | mn10200 | mn10300 | tron | a29k \
+		| 580 | i960 | h8300 | hppa | hppa1.0 | hppa1.1 | hppa2.0 \
+		| alpha | alphaev5 | alphaev56 | we32k | ns16k | clipper \
+		| i370 | sh | powerpc | powerpcle | 1750a | dsp16xx | pdp11 \
+		| mips64 | mipsel | mips64el | mips64orion | mips64orionel \
+		| mipstx39 | mipstx39el | armv[34][lb] \
+		| sparc | sparclet | sparclite | sparc64 | v850)
+		basic_machine=$basic_machine-unknown
+		;;
+	# We use `pc' rather than `unknown'
+	# because (1) that's what they normally are, and
+	# (2) the word "unknown" tends to confuse beginning users.
+	i[34567]86)
+	  basic_machine=$basic_machine-pc
+	  ;;
+	# Object if more than one company name word.
+	*-*-*)
+		echo Invalid configuration \`$1\': machine \`$basic_machine\' not recognized 1>&2
+		exit 1
+		;;
+	# Recognize the basic CPU types with company name.
+	vax-* | tahoe-* | i[34567]86-* | i860-* | m32r-* | m68k-* | m68000-* \
+	      | m88k-* | sparc-* | ns32k-* | fx80-* | arc-* | arm-* | c[123]* \
+	      | mips-* | pyramid-* | tron-* | a29k-* | romp-* | rs6000-* \
+	      | power-* | none-* | 580-* | cray2-* | h8300-* | i960-* \
+	      | xmp-* | ymp-* | hppa-* | hppa1.0-* | hppa1.1-* | hppa2.0-* \
+	      | alpha-* | alphaev5-* | alphaev56-* | we32k-* | cydra-* \
+	      | ns16k-* | pn-* | np1-* | xps100-* | clipper-* | orion-* \
+	      | sparclite-* | pdp11-* | sh-* | powerpc-* | powerpcle-* \
+	      | sparc64-* | mips64-* | mipsel-* | armv[34][lb]-*\
+	      | mips64el-* | mips64orion-* | mips64orionel-*  \
+	      | mipstx39-* | mipstx39el-* \
+	      | f301-*)
+		;;
+	# Recognize the various machine names and aliases which stand
+	# for a CPU type and a company and sometimes even an OS.
+	3b1 | 7300 | 7300-att | att-7300 | pc7300 | safari | unixpc)
+		basic_machine=m68000-att
+		;;
+	3b*)
+		basic_machine=we32k-att
+		;;
+	alliant | fx80)
+		basic_machine=fx80-alliant
+		;;
+	altos | altos3068)
+		basic_machine=m68k-altos
+		;;
+	am29k)
+		basic_machine=a29k-none
+		os=-bsd
+		;;
+	amdahl)
+		basic_machine=580-amdahl
+		os=-sysv
+		;;
+	amiga | amiga-*)
+		basic_machine=m68k-cbm
+		;;
+	amigaos | amigados)
+		basic_machine=m68k-cbm
+		os=-amigaos
+		;;
+	amigaunix | amix)
+		basic_machine=m68k-cbm
+		os=-sysv4
+		;;
+	apollo68)
+		basic_machine=m68k-apollo
+		os=-sysv
+		;;
+	aux)
+		basic_machine=m68k-apple
+		os=-aux
+		;;
+	balance)
+		basic_machine=ns32k-sequent
+		os=-dynix
+		;;
+	convex-c1)
+		basic_machine=c1-convex
+		os=-bsd
+		;;
+	convex-c2)
+		basic_machine=c2-convex
+		os=-bsd
+		;;
+	convex-c32)
+		basic_machine=c32-convex
+		os=-bsd
+		;;
+	convex-c34)
+		basic_machine=c34-convex
+		os=-bsd
+		;;
+	convex-c38)
+		basic_machine=c38-convex
+		os=-bsd
+		;;
+	cray | ymp)
+		basic_machine=ymp-cray
+		os=-unicos
+		;;
+	cray2)
+		basic_machine=cray2-cray
+		os=-unicos
+		;;
+	[ctj]90-cray)
+		basic_machine=c90-cray
+		os=-unicos
+		;;
+	crds | unos)
+		basic_machine=m68k-crds
+		;;
+	da30 | da30-*)
+		basic_machine=m68k-da30
+		;;
+	decstation | decstation-3100 | pmax | pmax-* | pmin | dec3100 | decstatn)
+		basic_machine=mips-dec
+		;;
+	delta | 3300 | motorola-3300 | motorola-delta \
+	      | 3300-motorola | delta-motorola)
+		basic_machine=m68k-motorola
+		;;
+	delta88)
+		basic_machine=m88k-motorola
+		os=-sysv3
+		;;
+	dpx20 | dpx20-*)
+		basic_machine=rs6000-bull
+		os=-bosx
+		;;
+	dpx2* | dpx2*-bull)
+		basic_machine=m68k-bull
+		os=-sysv3
+		;;
+	ebmon29k)
+		basic_machine=a29k-amd
+		os=-ebmon
+		;;
+	elxsi)
+		basic_machine=elxsi-elxsi
+		os=-bsd
+		;;
+	encore | umax | mmax)
+		basic_machine=ns32k-encore
+		;;
+	fx2800)
+		basic_machine=i860-alliant
+		;;
+	genix)
+		basic_machine=ns32k-ns
+		;;
+	gmicro)
+		basic_machine=tron-gmicro
+		os=-sysv
+		;;
+	h3050r* | hiux*)
+		basic_machine=hppa1.1-hitachi
+		os=-hiuxwe2
+		;;
+	h8300hms)
+		basic_machine=h8300-hitachi
+		os=-hms
+		;;
+	harris)
+		basic_machine=m88k-harris
+		os=-sysv3
+		;;
+	hp300-*)
+		basic_machine=m68k-hp
+		;;
+	hp300bsd)
+		basic_machine=m68k-hp
+		os=-bsd
+		;;
+	hp300hpux)
+		basic_machine=m68k-hp
+		os=-hpux
+		;;
+	hp9k2[0-9][0-9] | hp9k31[0-9])
+		basic_machine=m68000-hp
+		;;
+	hp9k3[2-9][0-9])
+		basic_machine=m68k-hp
+		;;
+	hp9k7[0-9][0-9] | hp7[0-9][0-9] | hp9k8[0-9]7 | hp8[0-9]7)
+		basic_machine=hppa1.1-hp
+		;;
+	hp9k8[0-9][0-9] | hp8[0-9][0-9])
+		basic_machine=hppa1.0-hp
+		;;
+	hppa-next)
+		os=-nextstep3
+		;;
+	i370-ibm* | ibm*)
+		basic_machine=i370-ibm
+		os=-mvs
+		;;
+# I'm not sure what "Sysv32" means.  Should this be sysv3.2?
+	i[34567]86v32)
+		basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
+		os=-sysv32
+		;;
+	i[34567]86v4*)
+		basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
+		os=-sysv4
+		;;
+	i[34567]86v)
+		basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
+		os=-sysv
+		;;
+	i[34567]86sol2)
+		basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
+		os=-solaris2
+		;;
+	iris | iris4d)
+		basic_machine=mips-sgi
+		case $os in
+		    -irix*)
+			;;
+		    *)
+			os=-irix4
+			;;
+		esac
+		;;
+	isi68 | isi)
+		basic_machine=m68k-isi
+		os=-sysv
+		;;
+	m88k-omron*)
+		basic_machine=m88k-omron
+		;;
+	magnum | m3230)
+		basic_machine=mips-mips
+		os=-sysv
+		;;
+	merlin)
+		basic_machine=ns32k-utek
+		os=-sysv
+		;;
+	miniframe)
+		basic_machine=m68000-convergent
+		;;
+	mipsel*-linux*)
+		basic_machine=mipsel-unknown
+		os=-linux-gnu
+		;;
+	mips*-linux*)
+		basic_machine=mips-unknown
+		os=-linux-gnu
+		;;
+	mips3*-*)
+		basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'`
+		;;
+	mips3*)
+		basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'`-unknown
+		;;
+	ncr3000)
+		basic_machine=i486-ncr
+		os=-sysv4
+		;;
+	news | news700 | news800 | news900)
+		basic_machine=m68k-sony
+		os=-newsos
+		;;
+	news1000)
+		basic_machine=m68030-sony
+		os=-newsos
+		;;
+	news-3600 | risc-news)
+		basic_machine=mips-sony
+		os=-newsos
+		;;
+	next | m*-next )
+		basic_machine=m68k-next
+		case $os in
+		    -nextstep* )
+			;;
+		    -ns2*)
+		      os=-nextstep2
+			;;
+		    *)
+		      os=-nextstep3
+			;;
+		esac
+		;;
+	nh3000)
+		basic_machine=m68k-harris
+		os=-cxux
+		;;
+	nh[45]000)
+		basic_machine=m88k-harris
+		os=-cxux
+		;;
+	nindy960)
+		basic_machine=i960-intel
+		os=-nindy
+		;;
+	np1)
+		basic_machine=np1-gould
+		;;
+	pa-hitachi)
+		basic_machine=hppa1.1-hitachi
+		os=-hiuxwe2
+		;;
+	paragon)
+		basic_machine=i860-intel
+		os=-osf
+		;;
+	pbd)
+		basic_machine=sparc-tti
+		;;
+	pbb)
+		basic_machine=m68k-tti
+		;;
+        pc532 | pc532-*)
+		basic_machine=ns32k-pc532
+		;;
+	pentium | p5 | k5 | nexen)
+		basic_machine=i586-pc
+		;;
+	pentiumpro | p6 | k6 | 6x86)
+		basic_machine=i686-pc
+		;;
+	pentiumii | pentium2)
+		basic_machine=i786-pc
+		;;
+	pentium-* | p5-* | k5-* | nexen-*)
+		basic_machine=i586-`echo $basic_machine | sed 's/^[^-]*-//'`
+		;;
+	pentiumpro-* | p6-* | k6-* | 6x86-*)
+		basic_machine=i686-`echo $basic_machine | sed 's/^[^-]*-//'`
+		;;
+	pentiumii-* | pentium2-*)
+		basic_machine=i786-`echo $basic_machine | sed 's/^[^-]*-//'`
+		;;
+	pn)
+		basic_machine=pn-gould
+		;;
+	power)	basic_machine=rs6000-ibm
+		;;
+	ppc)	basic_machine=powerpc-unknown
+	        ;;
+	ppc-*)	basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'`
+		;;
+	ppcle | powerpclittle | ppc-le | powerpc-little)
+		basic_machine=powerpcle-unknown
+	        ;;
+	ppcle-* | powerpclittle-*)
+		basic_machine=powerpcle-`echo $basic_machine | sed 's/^[^-]*-//'`
+		;;
+	ps2)
+		basic_machine=i386-ibm
+		;;
+	rm[46]00)
+		basic_machine=mips-siemens
+		;;
+	rtpc | rtpc-*)
+		basic_machine=romp-ibm
+		;;
+	sequent)
+		basic_machine=i386-sequent
+		;;
+	sh)
+		basic_machine=sh-hitachi
+		os=-hms
+		;;
+	sps7)
+		basic_machine=m68k-bull
+		os=-sysv2
+		;;
+	spur)
+		basic_machine=spur-unknown
+		;;
+	sun2)
+		basic_machine=m68000-sun
+		;;
+	sun2os3)
+		basic_machine=m68000-sun
+		os=-sunos3
+		;;
+	sun2os4)
+		basic_machine=m68000-sun
+		os=-sunos4
+		;;
+	sun3os3)
+		basic_machine=m68k-sun
+		os=-sunos3
+		;;
+	sun3os4)
+		basic_machine=m68k-sun
+		os=-sunos4
+		;;
+	sun4os3)
+		basic_machine=sparc-sun
+		os=-sunos3
+		;;
+	sun4os4)
+		basic_machine=sparc-sun
+		os=-sunos4
+		;;
+	sun4sol2)
+		basic_machine=sparc-sun
+		os=-solaris2
+		;;
+	sun3 | sun3-*)
+		basic_machine=m68k-sun
+		;;
+	sun4)
+		basic_machine=sparc-sun
+		;;
+	sun386 | sun386i | roadrunner)
+		basic_machine=i386-sun
+		;;
+	symmetry)
+		basic_machine=i386-sequent
+		os=-dynix
+		;;
+	tx39)
+		basic_machine=mipstx39-unknown
+		;;
+	tx39el)
+		basic_machine=mipstx39el-unknown
+		;;
+	tower | tower-32)
+		basic_machine=m68k-ncr
+		;;
+	udi29k)
+		basic_machine=a29k-amd
+		os=-udi
+		;;
+	ultra3)
+		basic_machine=a29k-nyu
+		os=-sym1
+		;;
+	vaxv)
+		basic_machine=vax-dec
+		os=-sysv
+		;;
+	vms)
+		basic_machine=vax-dec
+		os=-vms
+		;;
+	vpp*|vx|vx-*)
+               basic_machine=f301-fujitsu
+               ;;
+	vxworks960)
+		basic_machine=i960-wrs
+		os=-vxworks
+		;;
+	vxworks68)
+		basic_machine=m68k-wrs
+		os=-vxworks
+		;;
+	vxworks29k)
+		basic_machine=a29k-wrs
+		os=-vxworks
+		;;
+	xmp)
+		basic_machine=xmp-cray
+		os=-unicos
+		;;
+        xps | xps100)
+		basic_machine=xps100-honeywell
+		;;
+	none)
+		basic_machine=none-none
+		os=-none
+		;;
+
+# Here we handle the default manufacturer of certain CPU types.  It is in
+# some cases the only manufacturer, in others, it is the most popular.
+	mips)
+		if [ x$os = x-linux-gnu ]; then
+			basic_machine=mips-unknown
+		else
+			basic_machine=mips-mips
+		fi
+		;;
+	romp)
+		basic_machine=romp-ibm
+		;;
+	rs6000)
+		basic_machine=rs6000-ibm
+		;;
+	vax)
+		basic_machine=vax-dec
+		;;
+	pdp11)
+		basic_machine=pdp11-dec
+		;;
+	we32k)
+		basic_machine=we32k-att
+		;;
+	sparc)
+		basic_machine=sparc-sun
+		;;
+        cydra)
+		basic_machine=cydra-cydrome
+		;;
+	orion)
+		basic_machine=orion-highlevel
+		;;
+	orion105)
+		basic_machine=clipper-highlevel
+		;;
+	*)
+		echo Invalid configuration \`$1\': machine \`$basic_machine\' not recognized 1>&2
+		exit 1
+		;;
+esac
+
+# Here we canonicalize certain aliases for manufacturers.
+case $basic_machine in
+	*-digital*)
+		basic_machine=`echo $basic_machine | sed 's/digital.*/dec/'`
+		;;
+	*-commodore*)
+		basic_machine=`echo $basic_machine | sed 's/commodore.*/cbm/'`
+		;;
+	*)
+		;;
+esac
+
+# Decode manufacturer-specific aliases for certain operating systems.
+
+if [ x"$os" != x"" ]
+then
+case $os in
+        # First match some system type aliases
+        # that might get confused with valid system types.
+	# -solaris* is a basic system type, with this one exception.
+	-solaris1 | -solaris1.*)
+		os=`echo $os | sed -e 's|solaris1|sunos4|'`
+		;;
+	-solaris)
+		os=-solaris2
+		;;
+	-svr4*)
+		os=-sysv4
+		;;
+	-unixware*)
+		os=-sysv4.2uw
+		;;
+	-gnu/linux*)
+		os=`echo $os | sed -e 's|gnu/linux|linux-gnu|'`
+		;;
+	# First accept the basic system types.
+	# The portable systems comes first.
+	# Each alternative MUST END IN A *, to match a version number.
+	# -sysv* is not here because it comes later, after sysvr4.
+	-gnu* | -bsd* | -mach* | -minix* | -genix* | -ultrix* | -irix* \
+	      | -*vms* | -sco* | -esix* | -isc* | -aix* | -sunos | -sunos[34]*\
+	      | -hpux* | -unos* | -osf* | -luna* | -dgux* | -solaris* | -sym* \
+	      | -amigaos* | -amigados* | -msdos* | -newsos* | -unicos* | -aof* \
+	      | -aos* \
+	      | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \
+	      | -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \
+	      | -hiux* | -386bsd* | -netbsd* | -openbsd* | -freebsd* | -riscix* \
+	      | -lynxos* | -bosx* | -nextstep* | -cxux* | -aout* | -elf* \
+	      | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \
+	      | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \
+	      | -cygwin32* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
+	      | -mingw32* | -linux-gnu* | -uxpv* | -beos*)
+	# Remember, each alternative MUST END IN *, to match a version number.
+		;;
+	-linux*)
+		os=`echo $os | sed -e 's|linux|linux-gnu|'`
+		;;
+	-sunos5*)
+		os=`echo $os | sed -e 's|sunos5|solaris2|'`
+		;;
+	-sunos6*)
+		os=`echo $os | sed -e 's|sunos6|solaris3|'`
+		;;
+	-osfrose*)
+		os=-osfrose
+		;;
+	-osf*)
+		os=-osf
+		;;
+	-utek*)
+		os=-bsd
+		;;
+	-dynix*)
+		os=-bsd
+		;;
+	-acis*)
+		os=-aos
+		;;
+	-ctix* | -uts*)
+		os=-sysv
+		;;
+	-ns2 )
+	        os=-nextstep2
+		;;
+	# Preserve the version number of sinix5.
+	-sinix5.*)
+		os=`echo $os | sed -e 's|sinix|sysv|'`
+		;;
+	-sinix*)
+		os=-sysv4
+		;;
+	-triton*)
+		os=-sysv3
+		;;
+	-oss*)
+		os=-sysv3
+		;;
+	-svr4)
+		os=-sysv4
+		;;
+	-svr3)
+		os=-sysv3
+		;;
+	-sysvr4)
+		os=-sysv4
+		;;
+	# This must come after -sysvr4.
+	-sysv*)
+		;;
+	-xenix)
+		os=-xenix
+		;;
+	-none)
+		;;
+	*)
+		# Get rid of the `-' at the beginning of $os.
+		os=`echo $os | sed 's/[^-]*-//'`
+		echo Invalid configuration \`$1\': system \`$os\' not recognized 1>&2
+		exit 1
+		;;
+esac
+else
+
+# Here we handle the default operating systems that come with various machines.
+# The value should be what the vendor currently ships out the door with their
+# machine or put another way, the most popular os provided with the machine.
+
+# Note that if you're going to try to match "-MANUFACTURER" here (say,
+# "-sun"), then you have to tell the case statement up towards the top
+# that MANUFACTURER isn't an operating system.  Otherwise, code above
+# will signal an error saying that MANUFACTURER isn't an operating
+# system, and we'll never get to this point.
+
+case $basic_machine in
+	*-acorn)
+		os=-riscix1.2
+		;;
+	arm*-semi)
+		os=-aout
+		;;
+        pdp11-*)
+		os=-none
+		;;
+	*-dec | vax-*)
+		os=-ultrix4.2
+		;;
+	m68*-apollo)
+		os=-domain
+		;;
+	i386-sun)
+		os=-sunos4.0.2
+		;;
+	m68000-sun)
+		os=-sunos3
+		# This also exists in the configure program, but was not the
+		# default.
+		# os=-sunos4
+		;;
+	*-tti)	# must be before sparc entry or we get the wrong os.
+		os=-sysv3
+		;;
+	sparc-* | *-sun)
+		os=-sunos4.1.1
+		;;
+	*-be)
+		os=-beos
+		;;
+	*-ibm)
+		os=-aix
+		;;
+	*-hp)
+		os=-hpux
+		;;
+	*-hitachi)
+		os=-hiux
+		;;
+	i860-* | *-att | *-ncr | *-altos | *-motorola | *-convergent)
+		os=-sysv
+		;;
+	*-cbm)
+		os=-amigaos
+		;;
+	*-dg)
+		os=-dgux
+		;;
+	*-dolphin)
+		os=-sysv3
+		;;
+	m68k-ccur)
+		os=-rtu
+		;;
+	m88k-omron*)
+		os=-luna
+		;;
+	*-next )
+		os=-nextstep
+		;;
+	*-sequent)
+		os=-ptx
+		;;
+	*-crds)
+		os=-unos
+		;;
+	*-ns)
+		os=-genix
+		;;
+	i370-*)
+		os=-mvs
+		;;
+	*-next)
+		os=-nextstep3
+		;;
+        *-gould)
+		os=-sysv
+		;;
+        *-highlevel)
+		os=-bsd
+		;;
+	*-encore)
+		os=-bsd
+		;;
+        *-sgi)
+		os=-irix
+		;;
+        *-siemens)
+		os=-sysv4
+		;;
+	*-masscomp)
+		os=-rtu
+		;;
+	f301-fujitsu)
+		os=-uxpv
+		;;
+	*)
+		os=-none
+		;;
+esac
+fi
+
+# Here we handle the case where we know the os, and the CPU type, but not the
+# manufacturer.  We pick the logical manufacturer.
+vendor=unknown
+case $basic_machine in
+	*-unknown)
+		case $os in
+			-riscix*)
+				vendor=acorn
+				;;
+			-sunos*)
+				vendor=sun
+				;;
+			-aix*)
+				vendor=ibm
+				;;
+			-hpux*)
+				vendor=hp
+				;;
+			-hiux*)
+				vendor=hitachi
+				;;
+			-unos*)
+				vendor=crds
+				;;
+			-dgux*)
+				vendor=dg
+				;;
+			-luna*)
+				vendor=omron
+				;;
+			-genix*)
+				vendor=ns
+				;;
+			-mvs*)
+				vendor=ibm
+				;;
+			-ptx*)
+				vendor=sequent
+				;;
+			-vxsim* | -vxworks*)
+				vendor=wrs
+				;;
+			-aux*)
+				vendor=apple
+				;;
+		esac
+		basic_machine=`echo $basic_machine | sed "s/unknown/$vendor/"`
+		;;
+esac
+
+echo $basic_machine$os
diff --git a/po/Makefile.in b/po/Makefile.in
deleted file mode 100644
index 67354b5..0000000
--- a/po/Makefile.in
+++ /dev/null
@@ -1,82 +0,0 @@
-# Generated automatically from Makefile.in.in by configure.
-srcdir = .
-top_srcdir = ..
-
-LOCALEDIR=/usr/share/locale
-
-INSTALL= /usr/bin/install -c
-
-installprefix = $(DESTDIR)
-
-MSGMERGE = msgmerge
-
-NLSPACKAGE = popt
-
-LINGUAS = ro
-CATALOGS = $(addsuffix .mo, $(LINGUAS))
-
-POTFILES = \
-
-all: $(NLSPACKAGE).pot $(CATALOGS)
-
-$(NLSPACKAGE).pot: $(POTFILES)
-	xgettext --default-domain=$(NLSPACKAGE) \
-	    --add-comments --keyword=_ --keyword=N_ $(POTFILES)
-	if cmp -s $(NLSPACKAGE).po $(NLSPACKAGE).pot; then \
-	    rm -f $(NLSPACKAGE).po; \
-	else \
-	    mv $(NLSPACKAGE).po $(NLSPACKAGE).pot; \
-	fi
-
-update-po: Makefile
-	@$(MAKE) $(NLSPACKAGE).pot
-	@catalogs='$(CATALOGS)'; \
-	for cat in $$catalogs; do \
-		lang=`echo $$cat | sed 's/.mo//'`; \
-		if $(MSGMERGE) $$lang.po $(NLSPACKAGE).pot > $$lang.pox ; then \
-			echo "$(MSGMERGE) of $$lang succeeded" ; \
-			mv $$lang.pox $$lang.po ; \
-		else \
-			echo "$(MSGMERGE) of $$lang failed" ; \
-			rm -f $$lang.pox ; \
-		fi \
-	done
-
-clean:
-	rm -f *mo
-#	rm -f $(NLSPACKAGE).pot
-
-distclean: clean
-	rm -f .depend Makefile
-
-depend:
-
-install:
-	for n in $(CATALOGS); do \
-	    l=`basename $$n .mo`; \
-	    $(INSTALL) -m 755 -d $(installprefix)/$(LOCALEDIR)/$$l; \
-	    $(INSTALL) -m 755 -d $(installprefix)/$(LOCALEDIR)/$$l/LC_MESSAGES; \
-	    $(INSTALL) -m 644 $$n $(installprefix)/$(LOCALEDIR)/$$l/LC_MESSAGES/popt.mo; \
-	done
-
-check:
-
-POTFILES: POTFILES.in
-	( if test 'x$(srcdir)' != 'x.'; then \
-	    posrcprefix='$(top_srcdir)/'; \
-	  else \
-	    posrcprefix="../"; \
-	  fi; \
-	  sed -e '/^#/d' -e '/^[ 	]*$$/d' \
-	      -e "s@.*@	$$posrcprefix& \\\\@" \
-	      -e '$$s/\(.*\) \\/\1/' < $(srcdir)/POTFILES.in > POTFILES )
-
-Makefile: Makefile.in.in ../config.status POTFILES
-	cd .. \
-	  && CONFIG_FILES=po/$@.in CONFIG_HEADERS= \
-	       $(SHELL) ./config.status
-
-distdir:
-
-%.mo: %.po
-	msgfmt -o $@ $<
diff --git a/popt.spec b/popt.spec
index 7d45da3..53909df 100644
--- a/popt.spec
+++ b/popt.spec
@@ -5,7 +5,7 @@ Release: 1
 Copyright: LGPL
 Group: Libraries
 Source: ftp://ftp.redhat.com/pub/redhat/code/popt/popt-%{version}.tar.gz
-BuildRoot: /var/tmp/popt.root
+BuildRoot: /var/tmp/%{name}root
 
 %description
 Popt is a C library for pasing command line parameters. It was heavily
@@ -30,9 +30,10 @@ make DESTDIR=$RPM_BUILD_ROOT install
 rm -rf $RPM_BUILD_ROOT
 
 %files
-%attr(0644, root, root) /usr/lib/libpopt.a
-%attr(0644, root, root) /usr/include/popt.h
-%attr(0644, root, root) /usr/man/man3/popt.3
+%defattr(-,root,root)
+/usr/lib/libpopt.a
+/usr/include/popt.h
+/usr/man/man3/popt.3
 
 %changelog
 * Thu Dec 10 1998 Michael Johnson <johnsonm@redhat.com>
-- 
Gitee


From 949b45536abbfd1a8ee19b1a361d31ca6583f31e Mon Sep 17 00:00:00 2001
From: Jeff Johnson <n3npq@mac.com>
Date: Fri, 22 Jan 1999 17:22:20 +0000
Subject: [PATCH 153/667] Use libbtool to generate librpmbuild.a.

---
 Makefile.am |  4 +--
 Makefile.in | 95 +++++++++++++++++++++++++----------------------------
 2 files changed, 46 insertions(+), 53 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index 978b910..ee3f239 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -18,8 +18,8 @@ test1_SOURCES = test1.c
 test1_LDADD = -lpopt
 
 include_HEADERS = popt.h
-lib_LIBRARIES = libpopt.a
-libpopt_a_SOURCES = popt.c findme.c poptparse.c poptconfig.c popthelp.c
+lib_LTLIBRARIES = libpopt.la
+libpopt_la_SOURCES = popt.c findme.c poptparse.c poptconfig.c popthelp.c
 man_MANS = popt.3
 
 CVSTAG = $(PACKAGE)-$(subst .,_,$(VERSION))
diff --git a/Makefile.in b/Makefile.in
index 6eea8f1..f8b31ab 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -94,8 +94,8 @@ test1_SOURCES = test1.c
 test1_LDADD = -lpopt
 
 include_HEADERS = popt.h
-lib_LIBRARIES = libpopt.a
-libpopt_a_SOURCES = popt.c findme.c poptparse.c poptconfig.c popthelp.c
+lib_LTLIBRARIES = libpopt.la
+libpopt_la_SOURCES = popt.c findme.c poptparse.c poptconfig.c popthelp.c
 man_MANS = popt.3
 
 CVSTAG = $(PACKAGE)-$(subst .,_,$(VERSION))
@@ -103,15 +103,16 @@ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
 CONFIG_HEADER = config.h
 CONFIG_CLEAN_FILES = 
-LIBRARIES =  $(lib_LIBRARIES)
+LTLIBRARIES =  $(lib_LTLIBRARIES)
 
 
 DEFS = @DEFS@ -I. -I$(srcdir) -I.
 CPPFLAGS = @CPPFLAGS@
 LIBS = @LIBS@
-libpopt_a_LIBADD = 
-libpopt_a_OBJECTS =  popt.o findme.o poptparse.o poptconfig.o popthelp.o
-AR = ar
+libpopt_la_LDFLAGS = 
+libpopt_la_LIBADD = 
+libpopt_la_OBJECTS =  popt.lo findme.lo poptparse.lo poptconfig.lo \
+popthelp.lo
 PROGRAMS =  $(noinst_PROGRAMS)
 
 test1_OBJECTS =  test1.o
@@ -139,8 +140,8 @@ TAR = gtar
 GZIP_ENV = --best
 DEP_FILES =  .deps/findme.P .deps/popt.P .deps/poptconfig.P \
 .deps/popthelp.P .deps/poptparse.P .deps/test1.P
-SOURCES = $(libpopt_a_SOURCES) $(test1_SOURCES)
-OBJECTS = $(libpopt_a_OBJECTS) $(test1_OBJECTS)
+SOURCES = $(libpopt_la_SOURCES) $(test1_SOURCES)
+OBJECTS = $(libpopt_la_OBJECTS) $(test1_OBJECTS)
 
 all: all-redirect
 .SUFFIXES:
@@ -188,36 +189,29 @@ distclean-hdr:
 
 maintainer-clean-hdr:
 
-mostlyclean-libLIBRARIES:
+mostlyclean-libLTLIBRARIES:
 
-clean-libLIBRARIES:
-	-test -z "$(lib_LIBRARIES)" || rm -f $(lib_LIBRARIES)
+clean-libLTLIBRARIES:
+	-test -z "$(lib_LTLIBRARIES)" || rm -f $(lib_LTLIBRARIES)
 
-distclean-libLIBRARIES:
+distclean-libLTLIBRARIES:
 
-maintainer-clean-libLIBRARIES:
+maintainer-clean-libLTLIBRARIES:
 
-install-libLIBRARIES: $(lib_LIBRARIES)
+install-libLTLIBRARIES: $(lib_LTLIBRARIES)
 	@$(NORMAL_INSTALL)
 	$(mkinstalldirs) $(DESTDIR)$(libdir)
-	@list='$(lib_LIBRARIES)'; for p in $$list; do \
+	@list='$(lib_LTLIBRARIES)'; for p in $$list; do \
 	  if test -f $$p; then \
-	    echo " $(INSTALL_DATA) $$p $(DESTDIR)$(libdir)/$$p"; \
-	    $(INSTALL_DATA) $$p $(DESTDIR)$(libdir)/$$p; \
-	  else :; fi; \
-	done
-	@$(POST_INSTALL)
-	@list='$(lib_LIBRARIES)'; for p in $$list; do \
-	  if test -f $$p; then \
-	    echo " $(RANLIB) $(DESTDIR)$(libdir)/$$p"; \
-	    $(RANLIB) $(DESTDIR)$(libdir)/$$p; \
+	    echo "$(LIBTOOL)  --mode=install $(INSTALL) $$p $(DESTDIR)$(libdir)/$$p"; \
+	    $(LIBTOOL)  --mode=install $(INSTALL) $$p $(DESTDIR)$(libdir)/$$p; \
 	  else :; fi; \
 	done
 
-uninstall-libLIBRARIES:
+uninstall-libLTLIBRARIES:
 	@$(NORMAL_UNINSTALL)
-	list='$(lib_LIBRARIES)'; for p in $$list; do \
-	  rm -f $(DESTDIR)$(libdir)/$$p; \
+	list='$(lib_LTLIBRARIES)'; for p in $$list; do \
+	  $(LIBTOOL)  --mode=uninstall rm -f $(DESTDIR)$(libdir)/$$p; \
 	done
 
 .s.o:
@@ -252,10 +246,8 @@ distclean-libtool:
 
 maintainer-clean-libtool:
 
-libpopt.a: $(libpopt_a_OBJECTS) $(libpopt_a_DEPENDENCIES)
-	-rm -f libpopt.a
-	$(AR) cru libpopt.a $(libpopt_a_OBJECTS) $(libpopt_a_LIBADD)
-	$(RANLIB) libpopt.a
+libpopt.la: $(libpopt_la_OBJECTS) $(libpopt_la_DEPENDENCIES)
+	$(LINK) -rpath $(libdir) $(libpopt_la_LDFLAGS) $(libpopt_la_OBJECTS) $(libpopt_la_LIBADD) $(LIBS)
 
 mostlyclean-noinstPROGRAMS:
 
@@ -520,7 +512,7 @@ installcheck: installcheck-recursive
 all-recursive-am: config.h
 	$(MAKE) $(AM_MAKEFLAGS) all-recursive
 
-install-exec-am: install-libLIBRARIES
+install-exec-am: install-libLTLIBRARIES
 install-exec: install-exec-recursive
 
 install-data-am: install-man install-includeHEADERS
@@ -529,10 +521,10 @@ install-data: install-data-recursive
 install-am: all-am
 	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
 install: install-recursive
-uninstall-am: uninstall-libLIBRARIES uninstall-man \
+uninstall-am: uninstall-libLTLIBRARIES uninstall-man \
 		uninstall-includeHEADERS
 uninstall: uninstall-recursive
-all-am: Makefile $(LIBRARIES) $(PROGRAMS) $(MANS) $(HEADERS) config.h
+all-am: Makefile $(LTLIBRARIES) $(PROGRAMS) $(MANS) $(HEADERS) config.h
 all-redirect: all-recursive-am
 install-strip:
 	$(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install
@@ -551,20 +543,20 @@ distclean-generic:
 	-rm -f config.cache config.log stamp-h stamp-h[0-9]*
 
 maintainer-clean-generic:
-mostlyclean-am:  mostlyclean-hdr mostlyclean-libLIBRARIES \
+mostlyclean-am:  mostlyclean-hdr mostlyclean-libLTLIBRARIES \
 		mostlyclean-compile mostlyclean-libtool \
 		mostlyclean-noinstPROGRAMS mostlyclean-tags \
 		mostlyclean-depend mostlyclean-generic
 
 mostlyclean: mostlyclean-recursive
 
-clean-am:  clean-hdr clean-libLIBRARIES clean-compile clean-libtool \
+clean-am:  clean-hdr clean-libLTLIBRARIES clean-compile clean-libtool \
 		clean-noinstPROGRAMS clean-tags clean-depend \
 		clean-generic mostlyclean-am
 
 clean: clean-recursive
 
-distclean-am:  distclean-hdr distclean-libLIBRARIES distclean-compile \
+distclean-am:  distclean-hdr distclean-libLTLIBRARIES distclean-compile \
 		distclean-libtool distclean-noinstPROGRAMS \
 		distclean-tags distclean-depend distclean-generic \
 		clean-am
@@ -573,7 +565,8 @@ distclean-am:  distclean-hdr distclean-libLIBRARIES distclean-compile \
 distclean: distclean-recursive
 	-rm -f config.status
 
-maintainer-clean-am:  maintainer-clean-hdr maintainer-clean-libLIBRARIES \
+maintainer-clean-am:  maintainer-clean-hdr \
+		maintainer-clean-libLTLIBRARIES \
 		maintainer-clean-compile maintainer-clean-libtool \
 		maintainer-clean-noinstPROGRAMS maintainer-clean-tags \
 		maintainer-clean-depend maintainer-clean-generic \
@@ -585,19 +578,19 @@ maintainer-clean: maintainer-clean-recursive
 	-rm -f config.status
 
 .PHONY: mostlyclean-hdr distclean-hdr clean-hdr maintainer-clean-hdr \
-mostlyclean-libLIBRARIES distclean-libLIBRARIES clean-libLIBRARIES \
-maintainer-clean-libLIBRARIES uninstall-libLIBRARIES \
-install-libLIBRARIES mostlyclean-compile distclean-compile \
-clean-compile maintainer-clean-compile mostlyclean-libtool \
-distclean-libtool clean-libtool maintainer-clean-libtool \
-mostlyclean-noinstPROGRAMS distclean-noinstPROGRAMS \
-clean-noinstPROGRAMS maintainer-clean-noinstPROGRAMS install-man3 \
-uninstall-man3 install-man uninstall-man uninstall-includeHEADERS \
-install-includeHEADERS install-data-recursive uninstall-data-recursive \
-install-exec-recursive uninstall-exec-recursive installdirs-recursive \
-uninstalldirs-recursive all-recursive check-recursive \
-installcheck-recursive info-recursive dvi-recursive \
-mostlyclean-recursive distclean-recursive clean-recursive \
+mostlyclean-libLTLIBRARIES distclean-libLTLIBRARIES \
+clean-libLTLIBRARIES maintainer-clean-libLTLIBRARIES \
+uninstall-libLTLIBRARIES install-libLTLIBRARIES mostlyclean-compile \
+distclean-compile clean-compile maintainer-clean-compile \
+mostlyclean-libtool distclean-libtool clean-libtool \
+maintainer-clean-libtool mostlyclean-noinstPROGRAMS \
+distclean-noinstPROGRAMS clean-noinstPROGRAMS \
+maintainer-clean-noinstPROGRAMS install-man3 uninstall-man3 install-man \
+uninstall-man uninstall-includeHEADERS install-includeHEADERS \
+install-data-recursive uninstall-data-recursive install-exec-recursive \
+uninstall-exec-recursive installdirs-recursive uninstalldirs-recursive \
+all-recursive check-recursive installcheck-recursive info-recursive \
+dvi-recursive mostlyclean-recursive distclean-recursive clean-recursive \
 maintainer-clean-recursive tags tags-recursive mostlyclean-tags \
 distclean-tags clean-tags maintainer-clean-tags distdir \
 mostlyclean-depend distclean-depend clean-depend \
-- 
Gitee


From cd68123ac7109df29c0fb9bd190a10c4bee54db5 Mon Sep 17 00:00:00 2001
From: Jeff Johnson <n3npq@mac.com>
Date: Fri, 22 Jan 1999 18:42:44 +0000
Subject: [PATCH 154/667] Use libtool to build libraries, but force
 --disable-shared for now.

---
 .cvsignore  | 4 ++++
 Makefile.am | 2 --
 Makefile.in | 2 --
 autogen.sh  | 6 +++++-
 popt.spec   | 2 +-
 5 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/.cvsignore b/.cvsignore
index f90b971..d3f6c72 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -16,3 +16,7 @@ test1
 libtool
 ltconfig
 ltmain.sh
+.libs
+*.la
+*.lo
+popt-*.tar.gz
diff --git a/Makefile.am b/Makefile.am
index ee3f239..c897002 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -7,8 +7,6 @@ EXTRA_DIST = CHANGES autogen.sh findme.h $(man_MANS) popt.spec poptint.h \
 
 SUBDIRS = po
 
-tbd = `pwd`/$(top_builddir)
-LDFLAGS = -L$(tbd)
 INCLUDES = -I$(top_srcdir)
 
 noinst_INCLUDES = findme.h poptint.h
diff --git a/Makefile.in b/Makefile.in
index f8b31ab..885680a 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -83,8 +83,6 @@ EXTRA_DIST = CHANGES autogen.sh findme.h $(man_MANS) popt.spec poptint.h 	testit
 
 SUBDIRS = po
 
-tbd = `pwd`/$(top_builddir)
-LDFLAGS = -L$(tbd)
 INCLUDES = -I$(top_srcdir)
 
 noinst_INCLUDES = findme.h poptint.h
diff --git a/autogen.sh b/autogen.sh
index fd0c14d..d5f4d10 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -7,4 +7,8 @@ if [ "$1" = "--noconfigure" ]; then
     exit 0;
 fi
 
-./configure "$@"
+if [ X"$@" = X  -a "X`uname -s`" = "XLinux" ]; then
+    ./configure --prefix=/usr --disable-shared
+else
+    ./configure "$@"
+fi
diff --git a/popt.spec b/popt.spec
index 53909df..5fba883 100644
--- a/popt.spec
+++ b/popt.spec
@@ -18,7 +18,7 @@ argv[] arrays using shell-like rules.
 
 %prep
 %setup -q
-CFLAGS="$RPM_OPT_FLAGS" ./autogen.sh --prefix=/usr
+CFLAGS="$RPM_OPT_FLAGS" ./configure --prefix=/usr --disable-shared
 
 %build
 make
-- 
Gitee


From 73eb93e8fe9aa284e4891307d9523b36f3977c47 Mon Sep 17 00:00:00 2001
From: Jeff Johnson <n3npq@mac.com>
Date: Fri, 22 Jan 1999 20:02:41 +0000
Subject: [PATCH 155/667] Libtool config files needed by cvs checkouts.

---
 ltconfig  | 2101 ++++++++++++++++++++++++++++++++++++
 ltmain.sh | 3079 +++++++++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 5180 insertions(+)
 create mode 100755 ltconfig
 create mode 100644 ltmain.sh

diff --git a/ltconfig b/ltconfig
new file mode 100755
index 0000000..62ac479
--- /dev/null
+++ b/ltconfig
@@ -0,0 +1,2101 @@
+#! /bin/sh
+
+# ltconfig - Create a system-specific libtool.
+# Copyright (C) 1996-1998 Free Software Foundation, Inc.
+# Gordon Matzigkeit <gord@gnu.ai.mit.edu>, 1996
+#
+# This file is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+# General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+#
+# As a special exception to the GNU General Public License, if you
+# distribute this file as part of a program that contains a
+# configuration script generated by Autoconf, you may include it under
+# the same distribution terms that you use for the rest of that program.
+
+# A lot of this script is taken from autoconf-2.10.
+
+# Check that we are running under the correct shell.
+SHELL=${CONFIG_SHELL-/bin/sh}
+echo=echo
+if test "X$1" = X--no-reexec; then
+  # Discard the --no-reexec flag, and continue.
+  shift
+elif test "X$1" = X--fallback-echo; then
+  # used as fallback echo
+  shift
+  cat <<EOF
+$*
+EOF
+  exit 0
+elif test "X`($echo '\t') 2>/dev/null`" = 'X\t'; then
+  # Yippee, $echo works!
+  :
+else
+  # Restart under the correct shell.
+  exec "$SHELL" "$0" --no-reexec ${1+"$@"}
+fi
+
+# The HP-UX ksh and POSIX shell print the target directory to stdout
+# if CDPATH is set.
+if test "${CDPATH+set}" = set; then CDPATH=; export CDPATH; fi
+
+if test "X${echo_test_string+set}" != "Xset"; then
+  # find a string as large as possible, as long as the shell can cope with it
+  for cmd in 'sed 50q "$0"' 'sed 20q "$0"' 'sed 10q "$0"' 'sed 2q "$0"' 'echo test'; do
+    # expected sizes: less than 2Kb, 1Kb, 512 bytes, 16 bytes, ...
+    if (echo_test_string="`eval $cmd`") 2>/dev/null &&
+       echo_test_string="`eval $cmd`" &&
+       (test "X$echo_test_string" = "X$echo_test_string") 2>/dev/null; then
+      break
+    fi
+  done
+fi
+
+if test "X`($echo '\t') 2>/dev/null`" != 'X\t' ||
+   test "X`($echo "$echo_test_string") 2>/dev/null`" != X"$echo_test_string"; then
+  # The Solaris, AIX, and Digital Unix default echo programs unquote
+  # backslashes.  This makes it impossible to quote backslashes using
+  #   echo "$something" | sed 's/\\/\\\\/g'
+  #
+  # So, first we look for a working echo in the user's PATH.
+
+  IFS="${IFS= 	}"; save_ifs="$IFS"; IFS="${IFS}:"
+  for dir in $PATH /usr/ucb; do
+    if test -f $dir/echo &&
+       test "X`($dir/echo '\t') 2>/dev/null`" = 'X\t' &&
+       test "X`($dir/echo "$echo_test_string") 2>/dev/null`" = X"$echo_test_string"; then
+      echo="$dir/echo"
+      break
+    fi
+  done
+  IFS="$save_ifs"
+
+  if test "X$echo" = Xecho; then
+    # We didn't find a better echo, so look for alternatives.
+    if test "X`(print -r '\t') 2>/dev/null`" = 'X\t' &&
+       test "X`(print -r "$echo_test_string") 2>/dev/null`" = X"$echo_test_string"; then
+      # This shell has a builtin print -r that does the trick.
+      echo='print -r'
+    elif test -f /bin/ksh && test "X$CONFIG_SHELL" != X/bin/ksh; then
+      # If we have ksh, try running ltconfig again with it.
+      ORIGINAL_CONFIG_SHELL="${CONFIG_SHELL-/bin/sh}"
+      export ORIGINAL_CONFIG_SHELL
+      CONFIG_SHELL=/bin/ksh
+      export CONFIG_SHELL
+      exec "$CONFIG_SHELL" "$0" --no-reexec ${1+"$@"}
+    else
+      # Try using printf.
+      echo='printf %s\n'
+      if test "X`($echo '\t') 2>/dev/null`" = 'X\t' &&
+         test "X`($echo "$echo_test_string") 2>/dev/null`" = X"$echo_test_string"; then
+        # Cool, printf works
+	:
+      elif test "X`("$ORIGINAL_CONFIG_SHELL" "$0" --fallback-echo '\t') 2>/dev/null`" = 'X\t' &&
+	   test "X`("$ORIGINAL_CONFIG_SHELL" "$0" --fallback-echo "$echo_test_string") 2>/dev/null`" = X"$echo_test_string"; then
+	CONFIG_SHELL="$ORIGINAL_CONFIG_SHELL"
+	export CONFIG_SHELL
+	SHELL="$CONFIG_SHELL"
+	export SHELL
+	echo="$CONFIG_SHELL $0 --fallback-echo"
+      elif test "X`("$CONFIG_SHELL" "$0" --fallback-echo '\t') 2>/dev/null`" = 'X\t' &&
+	   test "X`("$CONFIG_SHELL" "$0" --fallback-echo "$echo_test_string") 2>/dev/null`" = X"$echo_test_string"; then
+        echo="$CONFIG_SHELL $0 --fallback-echo"
+      else
+        # maybe with a smaller string...
+	prev=:
+
+	for cmd in 'echo test' 'sed 2q "$0"' 'sed 10q "$0"' 'sed 20q "$0"' 'sed 50q "$0"'; do
+	  if (test "X$echo_test_string" = "X`eval $cmd`") 2>/dev/null; then
+	    break
+	  fi
+	  prev="$cmd"
+	done
+
+	if test "$prev" != 'sed 50q "$0"'; then
+	  echo_test_string=`eval $prev`
+	  export echo_test_string
+	  exec "${ORIGINAL_CONFIG_SHELL}" "$0" ${1+"$@"}
+	else
+	  # Oops.  We lost completely, so just stick with echo.
+	  echo=echo
+	fi
+      fi
+    fi
+  fi
+fi
+
+# Sed substitution that helps us do robust quoting.  It backslashifies
+# metacharacters that are still active within double-quoted strings.
+Xsed='sed -e s/^X//'
+sed_quote_subst='s/\([\\"\\`$\\\\]\)/\\\1/g'
+
+# Same as above, but do not quote variable references.
+double_quote_subst='s/\([\\"\\`\\\\]\)/\\\1/g'
+
+# The name of this program.
+progname=`$echo "X$0" | $Xsed -e 's%^.*/%%'`
+
+# Constants:
+PROGRAM=ltconfig
+PACKAGE=libtool
+VERSION=1.2d
+ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.c 1>&5'
+ac_link='${CC-cc} -o conftest $CFLAGS $CPPFLAGS $LDFLAGS conftest.c $LIBS 1>&5'
+rm="rm -f"
+
+help="Try \`$progname --help' for more information."
+
+# Global variables:
+default_ofile=libtool
+can_build_shared=yes
+enable_shared=yes
+# All known linkers require a `.a' archive for static linking.
+enable_static=yes
+ltmain=
+silent=
+srcdir=
+ac_config_guess=
+ac_config_sub=
+host=
+nonopt=
+ofile="$default_ofile"
+verify_host=yes
+with_gcc=no
+with_gnu_ld=no
+need_locks=yes
+objext=o
+libext=a
+
+old_AR="$AR"
+old_CC="$CC"
+old_CFLAGS="$CFLAGS"
+old_CPPFLAGS="$CPPFLAGS"
+old_LD="$LD"
+old_LN_S="$LN_S"
+old_NM="$NM"
+old_RANLIB="$RANLIB"
+old_DLLTOOL="$DLLTOOL"
+old_AS="$AS"
+
+# Parse the command line options.
+args=
+prev=
+for option
+do
+  case "$option" in
+  -*=*) optarg=`echo "$option" | sed 's/[-_a-zA-Z0-9]*=//'` ;;
+  *) optarg= ;;
+  esac
+
+  # If the previous option needs an argument, assign it.
+  if test -n "$prev"; then
+    eval "$prev=\$option"
+    prev=
+    continue
+  fi
+
+  case "$option" in
+  --help) cat <<EOM
+Usage: $progname [OPTION]... [HOST [LTMAIN]]
+
+Generate a system-specific libtool script.
+
+    --debug                enable verbose shell tracing
+    --disable-shared       do not build shared libraries
+    --disable-static       do not build static libraries
+    --help                 display this help and exit
+    --no-verify            do not verify that HOST is a valid host type
+-o, --output=FILE          specify the output file [default=$default_ofile]
+    --quiet                same as \`--silent'
+    --silent               do not print informational messages
+    --srcdir=DIR           find \`config.guess' in DIR
+    --version              output version information and exit
+    --with-gcc             assume that the GNU C compiler will be used
+    --with-gnu-ld          assume that the C compiler uses the GNU linker
+    --disable-lock         disable file locking
+
+LTMAIN is the \`ltmain.sh' shell script fragment or \`ltmain.c' program
+that provides basic libtool functionality.
+
+HOST is the canonical host system name [default=guessed].
+EOM
+  exit 0
+  ;;
+
+  --debug)
+    echo "$progname: enabling shell trace mode"
+    set -x
+    ;;
+
+  --disable-shared) enable_shared=no ;;
+
+  --disable-static) enable_static=no ;;
+
+  --quiet | --silent) silent=yes ;;
+
+  --srcdir) prev=srcdir ;;
+  --srcdir=*) srcdir="$optarg" ;;
+
+  --no-verify) verify_host=no ;;
+
+  --output | -o) prev=ofile ;;
+  --output=*) ofile="$optarg" ;;
+
+  --version) echo "$PROGRAM (GNU $PACKAGE) $VERSION"; exit 0 ;;
+
+  --with-gcc) with_gcc=yes ;;
+  --with-gnu-ld) with_gnu_ld=yes ;;
+
+  --disable-lock) need_locks=no ;;
+
+  -*)
+    echo "$progname: unrecognized option \`$option'" 1>&2
+    echo "$help" 1>&2
+    exit 1
+    ;;
+
+  *)
+    if test -z "$ltmain"; then
+      ltmain="$option"
+    elif test -z "$host"; then
+# This generates an unnecessary warning for sparc-sun-solaris4.1.3_U1
+#      if test -n "`echo $option| sed 's/[-a-z0-9.]//g'`"; then
+#        echo "$progname: warning \`$option' is not a valid host type" 1>&2
+#      fi
+      host="$option"
+    else
+      echo "$progname: too many arguments" 1>&2
+      echo "$help" 1>&2
+      exit 1
+    fi ;;
+  esac
+done
+
+if test -z "$ltmain"; then
+  echo "$progname: you must specify a LTMAIN file" 1>&2
+  echo "$help" 1>&2
+  exit 1
+fi
+
+if test ! -f "$ltmain"; then
+  echo "$progname: \`$ltmain' does not exist" 1>&2
+  echo "$help" 1>&2
+  exit 1
+fi
+
+# Quote any args containing shell metacharacters.
+ltconfig_args=
+for arg
+do
+  case "$arg" in
+  *" "*|*"	"*|*[\[\]\~\#\$\^\&\*\(\)\{\}\\\|\;\<\>\?]*)
+  ltconfig_args="$ltconfig_args '$arg'" ;;
+  *) ltconfig_args="$ltconfig_args $arg" ;;
+  esac
+done
+
+# A relevant subset of AC_INIT.
+
+# File descriptor usage:
+# 0 standard input
+# 1 file creation
+# 2 errors and warnings
+# 3 some systems may open it to /dev/tty
+# 4 used on the Kubota Titan
+# 5 compiler messages saved in config.log
+# 6 checking for... messages and results
+if test "$silent" = yes; then
+  exec 6>/dev/null
+else
+  exec 6>&1
+fi
+exec 5>>./config.log
+
+# NLS nuisances.
+# Only set LANG and LC_ALL to C if already set.
+# These must not be set unconditionally because not all systems understand
+# e.g. LANG=C (notably SCO).
+if test "${LC_ALL+set}" = set; then LC_ALL=C; export LC_ALL; fi
+if test "${LANG+set}"   = set; then LANG=C;   export LANG;   fi
+
+if (echo "testing\c"; echo 1,2,3) | grep c >/dev/null; then
+  # Stardent Vistra SVR4 grep lacks -e, says ghazi@caip.rutgers.edu.
+  if (echo -n testing; echo 1,2,3) | sed s/-n/xn/ | grep xn >/dev/null; then
+    ac_n= ac_c='
+' ac_t='	'
+  else
+    ac_n=-n ac_c= ac_t=
+  fi
+else
+  ac_n= ac_c='\c' ac_t=
+fi
+
+if test -z "$srcdir"; then
+  # Assume the source directory is the same one as the path to LTMAIN.
+  srcdir=`$echo "$ltmain" | $Xsed -e 's%/[^/]*$%%'`
+  test "$srcdir" = "$ltmain" && srcdir=.
+fi
+
+trap "$rm conftest*; exit 1" 1 2 15
+if test "$verify_host" = yes; then
+  # Check for config.guess and config.sub.
+  ac_aux_dir=
+  for ac_dir in $srcdir $srcdir/.. $srcdir/../..; do
+    if test -f $ac_dir/config.guess; then
+      ac_aux_dir=$ac_dir
+      break
+    fi
+  done
+  if test -z "$ac_aux_dir"; then
+    echo "$progname: cannot find config.guess in $srcdir $srcdir/.. $srcdir/../.." 1>&2
+    echo "$help" 1>&2
+    exit 1
+  fi
+  ac_config_guess=$ac_aux_dir/config.guess
+  ac_config_sub=$ac_aux_dir/config.sub
+
+  # Make sure we can run config.sub.
+  if $SHELL $ac_config_sub sun4 >/dev/null 2>&1; then :
+  else
+    echo "$progname: cannot run $ac_config_sub" 1>&2
+    echo "$help" 1>&2
+    exit 1
+  fi
+
+  echo $ac_n "checking host system type""... $ac_c" 1>&6
+
+  host_alias=$host
+  case "$host_alias" in
+  "")
+    if host_alias=`$SHELL $ac_config_guess`; then :
+    else
+      echo "$progname: cannot guess host type; you must specify one" 1>&2
+      echo "$help" 1>&2
+      exit 1
+    fi ;;
+  esac
+  host=`$SHELL $ac_config_sub $host_alias`
+  echo "$ac_t$host" 1>&6
+
+  # Make sure the host verified.
+  test -z "$host" && exit 1
+
+elif test -z "$host"; then
+  echo "$progname: you must specify a host type if you use \`--no-verify'" 1>&2
+  echo "$help" 1>&2
+  exit 1
+else
+  host_alias=$host
+fi
+
+# Transform linux* to *-*-linux-gnu*, to support old configure scripts.
+case "$host_os" in
+linux-gnu*) ;;
+linux*) host=`echo $host | sed 's/^\(.*-.*-linux\)\(.*\)$/\1-gnu\2/'`
+esac
+
+host_cpu=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
+host_vendor=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
+host_os=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
+
+case "$host_os" in
+aix3*)
+  # AIX sometimes has problems with the GCC collect2 program.  For some
+  # reason, if we set the COLLECT_NAMES environment variable, the problems
+  # vanish in a puff of smoke.
+  if test "${COLLECT_NAMES+set}" != set; then
+    COLLECT_NAMES=
+    export COLLECT_NAMES
+  fi
+  ;;
+esac
+
+# Determine commands to create old-style static archives.
+old_archive_cmds='$AR cru $oldlib$oldobjs'
+old_postinstall_cmds='chmod 644 $oldlib'
+old_postuninstall_cmds=
+
+# Set a sane default for `AR'.
+test -z "$AR" && AR=ar
+
+# If RANLIB is not set, then run the test.
+if test "${RANLIB+set}" != "set"; then
+  result=no
+
+  echo $ac_n "checking for ranlib... $ac_c" 1>&6
+  IFS="${IFS= 	}"; save_ifs="$IFS"; IFS="${IFS}:"
+  for dir in $PATH; do
+    test -z "$dir" && dir=.
+    if test -f $dir/ranlib; then
+      RANLIB="ranlib"
+      result="ranlib"
+      break
+    fi
+  done
+  IFS="$save_ifs"
+
+  echo "$ac_t$result" 1>&6
+fi
+
+if test -n "$RANLIB"; then
+  old_archive_cmds="$old_archive_cmds~\$RANLIB \$oldlib"
+  old_postinstall_cmds="\$RANLIB \$oldlib~$old_postinstall_cmds"
+fi
+
+# Set sane defaults for `DLLTOOL' and `AS', used on cygwin32.
+test -z "$DLLTOOL" && DLLTOOL=dlltool
+test -z "$AS" && AS=as
+
+# Check to see if we are using GCC.
+if test "$with_gcc" != yes || test -z "$CC"; then
+  # If CC is not set, then try to find GCC or a usable CC.
+  if test -z "$CC"; then
+    echo $ac_n "checking for gcc... $ac_c" 1>&6
+    IFS="${IFS= 	}"; save_ifs="$IFS"; IFS="${IFS}:"
+    for dir in $PATH; do
+      IFS="$save_ifs"
+      test -z "$dir" && dir=.
+      if test -f $dir/gcc; then
+	CC="gcc"
+	break
+      fi
+    done
+    IFS="$save_ifs"
+
+    if test -n "$CC"; then
+      echo "$ac_t$CC" 1>&6
+    else
+      echo "$ac_t"no 1>&6
+    fi
+  fi
+
+  # Not "gcc", so try "cc", rejecting "/usr/ucb/cc".
+  if test -z "$CC"; then
+    echo $ac_n "checking for cc... $ac_c" 1>&6
+    IFS="${IFS= 	}"; save_ifs="$IFS"; IFS="${IFS}:"
+    cc_rejected=no
+    for dir in $PATH; do
+      test -z "$dir" && dir=.
+      if test -f $dir/cc; then
+	if test "$dir/cc" = "/usr/ucb/cc"; then
+	  cc_rejected=yes
+	  continue
+	fi
+	CC="cc"
+	break
+      fi
+    done
+    IFS="$save_ifs"
+    if test $cc_rejected = yes; then
+      # We found a bogon in the path, so make sure we never use it.
+      set dummy $CC
+      shift
+      if test $# -gt 0; then
+	# We chose a different compiler from the bogus one.
+	# However, it has the same name, so the bogon will be chosen
+	# first if we set CC to just the name; use the full file name.
+	shift
+	set dummy "$dir/cc" "$@"
+	shift
+	CC="$@"
+      fi
+    fi
+
+    if test -n "$CC"; then
+      echo "$ac_t$CC" 1>&6
+    else
+      echo "$ac_t"no 1>&6
+    fi
+
+    if test -z "$CC"; then
+      echo "$progname: error: no acceptable cc found in \$PATH" 1>&2
+      exit 1
+    fi
+  fi
+
+  # Now see if the compiler is really GCC.
+  with_gcc=no
+  echo $ac_n "checking whether we are using GNU C... $ac_c" 1>&6
+  echo "$progname:530: checking whether we are using GNU C" >&5
+
+  $rm conftest.c
+  cat > conftest.c <<EOF
+#ifdef __GNUC__
+  yes;
+#endif
+EOF
+  if { ac_try='${CC-cc} -E conftest.c'; { (eval echo $progname:538: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
+    with_gcc=yes
+  fi
+  $rm conftest.c
+  echo "$ac_t$with_gcc" 1>&6
+fi
+
+# Allow CC to be a program name with arguments.
+set dummy $CC
+compiler="$2"
+
+echo $ac_n "checking for object suffix... $ac_c" 1>&6
+$rm conftest*
+echo 'int i = 1;' > conftest.c
+echo "$progname:552: checking for object suffix" >& 5
+if { (eval echo $progname:553: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>conftest.err; }; then
+  # Append any warnings to the config.log.
+  cat conftest.err 1>&5
+
+  for ac_file in conftest.*; do
+    case $ac_file in
+    *.c) ;;
+    *) objext=`echo $ac_file | sed -e s/conftest.//` ;;
+    esac
+  done
+else
+  cat conftest.err 1>&5
+  echo "$progname: failed program was:" >&5
+  cat conftest.c >&5
+fi
+$rm conftest*
+echo "$ac_t$objext" 1>&6
+
+echo $ac_n "checking for $compiler option to produce PIC... $ac_c" 1>&6
+pic_flag=
+special_shlib_compile_flags=
+wl=
+link_static_flag=
+no_builtin_flag=
+
+if test "$with_gcc" = yes; then
+  wl='-Wl,'
+  link_static_flag='-static'
+
+  case "$host_os" in
+  aix3* | aix4* | irix5* | irix6* | osf3* | osf4*)
+    # PIC is the default for these OSes.
+    ;;
+  cygwin32* | mingw32* | os2*)
+    # We can build DLLs from non-PIC.
+    ;;
+  amigaos*)
+    # FIXME: we need at least 68020 code to build shared libraries, but
+    # adding the `-m68020' flag to GCC prevents building anything better,
+    # like `-m68040'.
+    pic_flag='-m68020 -resident32 -malways-restore-a4'
+    ;;
+  *)
+    pic_flag='-fPIC'
+    ;;
+  esac
+else
+  # PORTME Check for PIC flags for the system compiler.
+  case "$host_os" in
+  aix3* | aix4*)
+    # All AIX code is PIC.
+    link_static_flag='-bnso -bI:/lib/syscalls.exp'
+    ;;
+
+  hpux9* | hpux10* | hpux11*)
+    # Is there a better link_static_flag that works with the bundled CC?
+    wl='-Wl,'
+    link_static_flag="${wl}-a ${wl}archive"
+    pic_flag='+Z'
+    ;;
+
+  irix5* | irix6*)
+    wl='-Wl,'
+    link_static_flag='-non_shared'
+    # PIC (with -KPIC) is the default.
+    ;;
+
+  cygwin32* | mingw32* | os2*)
+    # We can build DLLs from non-PIC.
+    ;;
+
+  osf3* | osf4*)
+    # All OSF/1 code is PIC.
+    wl='-Wl,'
+    link_static_flag='-non_shared'
+    ;;
+
+  sco3.2v5*)
+    pic_flag='-Kpic'
+    link_static_flag='-dn'
+    special_shlib_compile_flags='-belf'
+    ;;
+
+  solaris*)
+    pic_flag='-KPIC'
+    link_static_flag='-Bstatic'
+    wl='-Wl,'
+    ;;
+
+  sunos4*)
+    pic_flag='-PIC'
+    link_static_flag='-Bstatic'
+    wl='-Qoption ld '
+    ;;
+
+  sysv4.2uw2* | sysv5*)
+    pic_flag='-KPIC'
+    link_static_flag='-Bstatic'
+    wl='-Wl,'
+    ;;
+
+  uts4*)
+    pic_flag='-pic'
+    link_static_flag='-Bstatic'
+    ;;
+
+  *)
+    can_build_shared=no
+    ;;
+  esac
+fi
+
+if test -n "$pic_flag"; then
+  echo "$ac_t$pic_flag" 1>&6
+
+  # Check to make sure the pic_flag actually works.
+  echo $ac_n "checking if $compiler PIC flag $pic_flag works... $ac_c" 1>&6
+  $rm conftest*
+  echo "int some_variable = 0;" > conftest.c
+  save_CFLAGS="$CFLAGS"
+  CFLAGS="$CFLAGS $pic_flag -DPIC"
+  echo "$progname:674: checking if $compiler PIC flag $pic_flag works" >&5
+  if { (eval echo $progname:675: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>conftest.err; } && test -s conftest.$objext; then
+    # Append any warnings to the config.log.
+    cat conftest.err 1>&5
+
+    # On HP-UX, both CC and GCC only warn that PIC is supported... then they
+    # create non-PIC objects.  So, if there were any warnings, we assume that
+    # PIC is not supported.
+    if test -s conftest.err; then
+      echo "$ac_t"no 1>&6
+      can_build_shared=no
+      pic_flag=
+    else
+      echo "$ac_t"yes 1>&6
+      pic_flag=" $pic_flag"
+    fi
+  else
+    # Append any errors to the config.log.
+    cat conftest.err 1>&5
+    can_build_shared=no
+    pic_flag=
+    echo "$ac_t"no 1>&6
+  fi
+  CFLAGS="$save_CFLAGS"
+  $rm conftest*
+else
+  echo "$ac_t"none 1>&6
+fi
+
+# Check to see if options -o and -c are simultaneously supported by compiler
+echo $ac_n "checking if $compiler supports -c -o file.o... $ac_c" 1>&6
+$rm conftest*
+echo "int some_variable = 0;" > conftest.c
+save_CFLAGS="$CFLAGS"
+CFLAGS="$CFLAGS -c -o conftest2.o"
+echo "$progname:709: checking if $compiler supports -c -o file.o" >&5
+if { (eval echo $progname:710: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>conftest.err; } && test -s conftest2.o; then
+
+  # The compiler can only warn and ignore the option if not recognized
+  # So say no if there are warnings
+    if test -s conftest.err; then
+      echo "$ac_t"no 1>&6
+      compiler_c_o=no
+    else
+      echo "$ac_t"yes 1>&6
+      compiler_c_o=yes
+    fi
+else
+  # Append any errors to the config.log.
+  cat conftest.err 1>&5
+  compiler_c_o=no
+  echo "$ac_t"no 1>&6
+fi
+CFLAGS="$save_CFLAGS"
+$rm conftest*
+
+if test x"$compiler_c_o" = x"yes"; then
+  # Check to see if we can write to a .lo
+  echo $ac_n "checking if $compiler supports -c -o file.lo... $ac_c" 1>&6
+  $rm conftest*
+  echo "int some_variable = 0;" > conftest.c
+  save_CFLAGS="$CFLAGS"
+  CFLAGS="$CFLAGS -c -o conftest.lo"
+  echo "$progname:737: checking if $compiler supports -c -o file.lo" >&5
+if { (eval echo $progname:738: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>conftest.err; } && test -s conftest.lo; then
+
+    # The compiler can only warn and ignore the option if not recognized
+    # So say no if there are warnings
+      if test -s conftest.err; then
+	echo "$ac_t"no 1>&6
+	compiler_o_lo=no
+      else
+        echo "$ac_t"yes 1>&6
+        compiler_o_lo=yes
+      fi
+  else
+    # Append any errors to the config.log.
+    cat conftest.err 1>&5
+    compiler_o_lo=no
+    echo "$ac_t"no 1>&6
+  fi
+  CFLAGS="$save_CFLAGS"
+  $rm conftest*
+else
+  compiler_o_lo=no
+fi
+
+# Check to see if we can do hard links to lock some files if needed
+hard_links="nottested"
+if test "$compiler_c_o" = no && test "$need_locks" != no; then
+  # do not overwrite the value of need_locks provided by the user
+  echo $ac_n "checking if we can lock with hard links... $ac_c" 1>&6
+  hard_links=yes
+  $rm conftest*
+  ln conftest.a conftest.b 2>/dev/null && hard_links=no
+  touch conftest.a
+  ln conftest.a conftest.b 2>&5 || hard_links=no
+  ln conftest.a conftest.b 2>/dev/null && hard_links=no
+  echo "$ac_t$hard_links" 1>&6
+  $rm conftest*
+  if test "$hard_links" = no; then
+    echo "*** WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&2
+    need_locks=warn
+  fi
+else
+  need_locks=no
+fi
+
+if test "$with_gcc" = yes; then
+  # Check to see if options -fno-rtti -fno-exceptions are supported by compiler
+  echo $ac_n "checking if $compiler supports -fno-rtti -fno-exceptions ... $ac_c" 1>&6
+  $rm conftest*
+  echo "int some_variable = 0;" > conftest.c
+  save_CFLAGS="$CFLAGS"
+  CFLAGS="$CFLAGS -fno-rtti -fno-exceptions -c conftest.c"
+  echo "$progname:789: checking if $compiler supports -fno-rtti -fno-exceptions" >&5
+  if { (eval echo $progname:790: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>conftest.err; } && test -s conftest.o; then
+
+    # The compiler can only warn and ignore the option if not recognized
+    # So say no if there are warnings
+      if test -s conftest.err; then
+        echo "$ac_t"no 1>&6
+        compiler_rtti_exceptions=no
+      else
+        echo "$ac_t"yes 1>&6
+        compiler_rtti_exceptions=yes
+      fi
+  else
+    # Append any errors to the config.log.
+    cat conftest.err 1>&5
+    compiler_rtti_exceptions=no
+    echo "$ac_t"no 1>&6
+  fi
+  CFLAGS="$save_CFLAGS"
+  $rm conftest*
+
+  if test "$compiler_rtti_exceptions" = "yes"; then
+    no_builtin_flag=' -fno-builtin -fno-rtti -fno-exceptions'
+  else
+    no_builtin_flag=' -fno-builtin'
+  fi
+  
+fi
+
+# Check for any special shared library compilation flags.
+if test -n "$special_shlib_compile_flags"; then
+  echo "$progname: warning: \`$CC' requires \`$special_shlib_compile_flags' to build shared libraries" 1>&2
+  if echo "$old_CC $old_CFLAGS " | egrep -e "[ 	]$special_shlib_compile_flags[ 	]" >/dev/null; then :
+  else
+    echo "$progname: add \`$special_shlib_compile_flags' to the CC or CFLAGS env variable and reconfigure" 1>&2
+    can_build_shared=no
+  fi
+fi
+
+echo $ac_n "checking if $compiler static flag $link_static_flag works... $ac_c" 1>&6
+$rm conftest*
+echo 'main(){return(0);}' > conftest.c
+save_LDFLAGS="$LDFLAGS"
+LDFLAGS="$LDFLAGS $link_static_flag"
+echo "$progname:833: checking if $compiler static flag $link_static_flag works" >&5
+if { (eval echo $progname:834: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+  echo "$ac_t$link_static_flag" 1>&6
+else
+  echo "$ac_t"none 1>&6
+  link_static_flag=
+fi
+LDFLAGS="$save_LDFLAGS"
+$rm conftest*
+
+if test -z "$LN_S"; then
+  # Check to see if we can use ln -s, or we need hard links.
+  echo $ac_n "checking whether ln -s works... $ac_c" 1>&6
+  $rm conftestdata
+  if ln -s X conftestdata 2>/dev/null; then
+    $rm conftestdata
+    LN_S="ln -s"
+  else
+    LN_S=ln
+  fi
+  if test "$LN_S" = "ln -s"; then
+    echo "$ac_t"yes 1>&6
+  else
+    echo "$ac_t"no 1>&6
+  fi
+fi
+
+# Make sure LD is an absolute path.
+if test -z "$LD"; then
+  ac_prog=ld
+  if test "$with_gcc" = yes; then
+    # Check if gcc -print-prog-name=ld gives a path.
+    echo $ac_n "checking for ld used by GCC... $ac_c" 1>&6
+    echo "$progname:866: checking for ld used by GCC" >&5
+    ac_prog=`($CC -print-prog-name=ld) 2>&5`
+    case "$ac_prog" in
+    # Accept absolute paths.
+    /* | [A-Za-z]:/*)
+      re_direlt='/[^/][^/]*/\.\./'
+      sub_uncdrive='s%^\([A-Za-z]\):/%//\1/%'
+      # Canonicalize the path of ld
+      while echo $ac_prog | grep "$re_direlt" > /dev/null 2>&1; do
+        ac_prog=`echo $ac_prog| sed "s%$re_direlt%/%"`
+      done
+      case "$host_os" in
+      cygwin*)
+        # Convert to a UNC path for cygwin
+        test -z "$LD" && LD=`echo X$ac_prog | $Xsed -e "$sub_uncdrive"`
+	;;
+      *)
+        test -z "$LD" && LD="$ac_prog"
+	;;
+      esac
+      ;;
+    ##
+    ## FIXME:  The code fails later on if we try to use an $LD with
+    ##         '\\' path separators.
+    ##
+    [A-Za-z]:[\\]*)
+      re_direlt='\\[^\\][^\\]*\\\.\.\(\\\)'
+      sub_uncdrive='s%^\([A-Za-z]\):\\%//\1/%'
+      sub_uncdir='s%\\%/%g'
+      # Canonicalize the path of ld
+      while echo $ac_prog | grep "$re_direlt" > /dev/null 2>&1; do
+        ac_prog=`echo $ac_prog| sed "s%$re_direlt%\1%"`
+      done
+      case "$host_os" in
+      cygwin*)
+        # Convert to a UNC path for cygwin
+        test -z "$LD" && LD=`echo X$ac_prog | $Xsed -e "$sub_uncdrive" -e "$sub_uncdir"`
+	;;
+      *)
+        test -z "$LD" && LD="$ac_prog"
+	;;
+      esac
+      ;;
+    "")
+      # If it fails, then pretend we are not using GCC.
+      ac_prog=ld
+      ;;
+    *)
+      # If it is relative, then search for the first ld in PATH.
+      with_gnu_ld=unknown
+      ;;
+    esac
+  elif test "$with_gnu_ld" = yes; then
+    echo $ac_n "checking for GNU ld... $ac_c" 1>&6
+    echo "$progname:920: checking for GNU ld" >&5
+  else
+    echo $ac_n "checking for non-GNU ld""... $ac_c" 1>&6
+    echo "$progname:923: checking for non-GNU ld" >&5
+  fi
+
+  if test -z "$LD"; then
+    IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS="${IFS}:"
+    for ac_dir in $PATH; do
+      test -z "$ac_dir" && ac_dir=.
+      if test -f "$ac_dir/$ac_prog"; then
+	LD="$ac_dir/$ac_prog"
+	# Check to see if the program is GNU ld.  I'd rather use --version,
+	# but apparently some GNU ld's only accept -v.
+	# Break only if it was the GNU/non-GNU ld that we prefer.
+	if "$LD" -v 2>&1 < /dev/null | egrep '(GNU|with BFD)' > /dev/null; then
+	  test "$with_gnu_ld" != no && break
+	else
+	  test "$with_gnu_ld" != yes && break
+	fi
+      fi
+    done
+    IFS="$ac_save_ifs"
+  fi
+
+  if test -n "$LD"; then
+    echo "$ac_t$LD" 1>&6
+  else
+    echo "$ac_t"no 1>&6
+  fi
+
+  if test -z "$LD"; then
+    echo "$progname: error: no acceptable ld found in \$PATH" 1>&2
+    exit 1
+  fi
+fi
+
+# Check to see if it really is or is not GNU ld.
+echo $ac_n "checking if the linker ($LD) is GNU ld... $ac_c" 1>&6
+# I'd rather use --version here, but apparently some GNU ld's only accept -v.
+if $LD -v 2>&1 </dev/null | egrep '(GNU|with BFD)' 1>&5; then
+  with_gnu_ld=yes
+else
+  with_gnu_ld=no
+fi
+echo "$ac_t$with_gnu_ld" 1>&6
+
+# See if the linker supports building shared libraries.
+echo $ac_n "checking whether the linker ($LD) supports shared libraries... $ac_c" 1>&6
+
+allow_undefined_flag=
+no_undefined_flag=
+archive_cmds=
+archive_sym_cmds=
+old_archive_from_new_cmds=
+export_dynamic_flag_spec=
+whole_archive_flag_spec=
+hardcode_libdir_flag_spec=
+hardcode_libdir_separator=
+hardcode_direct=no
+hardcode_minus_L=no
+hardcode_shlibpath_var=unsupported
+runpath_var=
+
+case "$host_os" in
+aix3* | aix4*)
+  # On AIX, the GNU linker works like the native linker.
+  with_gnu_ld=no
+  ;;
+esac
+
+ld_shlibs=yes
+if test "$with_gnu_ld" = yes; then
+
+  # See if GNU ld supports shared libraries.
+  case "$host_os" in
+  amigaos*)
+    archive_cmds='$rm $objdir/a2ixlibrary.data~$echo "#define NAME $libname" > $objdir/a2ixlibrary.data~$echo "#define LIBRARY_ID 1" >> $objdir/a2ixlibrary.data~$echo "#define VERSION $major" >> $objdir/a2ixlibrary.data~$echo "#define REVISION $revision" >> $objdir/a2ixlibrary.data~$AR cru $lib$libobjs~$RANLIB $lib~(cd $objdir && a2ixlibrary -32)'
+    hardcode_libdir_flag_spec='-L$libdir'
+    hardcode_minus_L=yes
+    ;;
+
+  sunos4*)
+    archive_cmds='$LD -assert pure-text -Bstatic -o $lib$libobjs$deplibs'
+    hardcode_direct=yes
+    hardcode_minus_L=yes
+    hardcode_shlibpath_var=no
+    ;;
+
+  cygwin32* | mingw32*)
+    if test "$with_gcc" = yes; then
+      # hardcode_libdir_flag_spec is actually meaningless, as there is
+      # no search path for DLLs.
+      hardcode_libdir_flag_spec='-L$libdir'
+      allow_undefined_flag=unsupported
+      # Very, very bogus.
+      echo '
+#define WIN32_LEAN_AND_MEAN
+#include <windows.h>
+#undef WIN32_LEAN_AND_MEAN
+#include <stdio.h>
+
+BOOL APIENTRY DllMain (HINSTANCE hInst, DWORD reason, LPVOID reserved);
+
+#include <cygwin/cygwin_dll.h>
+DECLARE_CYGWIN_DLL( DllMain );
+HINSTANCE __hDllInstance_base;
+
+BOOL APIENTRY
+DllMain (HINSTANCE hInst, DWORD reason, LPVOID reserved)
+{
+  __hDllInstance_base = hInst;
+  return TRUE;
+}
+' > ltdll.c
+      archive_cmds='$CC -c '"`pwd`"'/ltdll.c~echo EXPORTS > $lib-def~
+      $DLLTOOL --export-all --output-def $lib-def $libobjs ltdll.$objext~
+      $CC -Wl,--base-file,$soname-base -Wl,--dll -nostartfiles -Wl,-e,__cygwin_dll_entry@12 $libobjs ltdll.$objext~
+      $DLLTOOL --as=$AS --dllname $soname --exclude-symbol=_cygwin_dll_entry@12 --def $lib-def --base-file $soname-base --output-exp $soname-exp~
+      $CC -Wl,--base-file,$soname-base $soname-exp -Wl,--dll -nostartfiles -Wl,-e,__cygwin_dll_entry@12 -o $lib $libobjs ltdll.$objext$deplibs~
+      $DLLTOOL --as=$AS --dllname $soname --exclude-symbol=_cygwin_dll_entry@12 --def $lib-def --base-file $soname-base --output-exp $soname-exp~
+      $CC $soname-exp -Wl,--dll -nostartfiles -Wl,-e,__cygwin_dll_entry@12 -o $lib $libobjs ltdll.$objext$deplibs~
+      $rm ltdll.$objext $soname-base $soname-exp'
+      archive_sym_cmds='$CC -c '"`pwd`"'/ltdll.c~echo EXPORTS > $lib-def~
+      cat "$export_symbols" >> $lib-def~
+      $CC -Wl,--base-file,$soname-base -Wl,--dll -nostartfiles -Wl,-e,__cygwin_dll_entry@12 $libobjs ltdll.$objext~
+      $DLLTOOL --as=$AS --dllname $soname --exclude-symbol=_cygwin_dll_entry@12 --def $lib-def --base-file $soname-base --output-exp $soname-exp~
+      $CC -Wl,--base-file,$soname-base $soname-exp -Wl,--dll -nostartfiles -Wl,-e,__cygwin_dll_entry@12 -o $lib $libobjs ltdll.$objext$deplibs~
+      $DLLTOOL --as=$AS --dllname $soname --exclude-symbol=_cygwin_dll_entry@12 --def $lib-def --base-file $soname-base --output-exp $soname-exp~
+      $CC $soname-exp -Wl,--dll -nostartfiles -Wl,-e,__cygwin_dll_entry@12 -o $lib $libobjs ltdll.$objext$deplibs~
+      $rm ltdll.$objext $soname-base $soname-exp'
+      old_archive_from_new_cmds='$DLLTOOL --as=$AS --dllname $soname --def $lib-def --output-lib $objdir/$libname.a~$rm $lib.exp'
+   else
+      # When not using gcc, we currently assume that we are using
+      # Microsoft Visual C++.
+      with_gnu_ld=no
+      # hardcode_libdir_flag_spec is actually meaningless, as there is
+      # no search path for DLLs.
+      hardcode_libdir_flag_spec=' '
+      allow_undefined_flag=unsupported
+      # Tell ltmain to make .lib files, not .a files.
+      libext=lib
+      # FIXME: Setting linknames here is a bad hack.
+      archive_cmds='$CC -o $lib$libobjs`echo "$deplibs" | sed -e '\''s/ -lc$//'\''` -link -dll~linknames='
+      # The linker will automatically build a .lib file if we build a DLL.
+      old_archive_from_new_cmds='true'
+      # FIXME: Should let the user specify the lib program.
+      old_archive_cmds='lib /OUT:$oldlib$oldobjs'
+      fix_srcfile_path='`cygpath -w $srcfile`'
+    fi
+    ;;
+
+  *)
+    if $LD --help 2>&1 | egrep ': supported targets:.* elf' > /dev/null; then
+      archive_cmds='$CC -shared ${wl}-soname $wl$soname -o $lib$libobjs$deplibs'
+      archive_sym_cmds='$CC -shared ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib$libobjs$deplibs'
+    else
+      ld_shlibs=no
+    fi
+    ;;
+  esac
+
+  if test "$ld_shlibs" = yes && test "$with_gnu_ld" = yes; then
+    runpath_var=LD_RUN_PATH
+    hardcode_libdir_flag_spec='${wl}--rpath ${wl}$libdir'
+    export_dynamic_flag_spec='${wl}--export-dynamic'
+    whole_archive_flag_spec='${wl}--whole-archive$convenience ${wl}--no-whole-archive'
+  fi
+else
+  # PORTME fill in a description of your system's linker (not GNU ld)
+  case "$host_os" in
+  aix3*)
+    allow_undefined_flag=unsupported
+    archive_cmds='$NM$libobjs | $global_symbol_pipe | sed '\''s/.* //'\' | sort | uniq' > $lib.exp~
+        $LD -o $objdir/$soname$libobjs$deplibs -bE:$lib.exp -T512 -H512 -bM:SRE~$AR cru $lib $objdir/$soname'
+    archive_sym_cmds='$LD -o $objdir/$soname$libobjs$deplibs -bE:$export_symbols -T512 -H512 -bM:SRE~$AR cru $lib $objdir/$soname'
+    # Note: this linker hardcodes the directories in LIBPATH if there
+    # are no directories specified by -L.
+    hardcode_minus_L=yes
+    if test "$with_gcc" = yes && test -z "$link_static_flag"; then
+      # Neither direct hardcoding nor static linking is supported with a
+      # broken collect2.
+      hardcode_direct=unsupported
+    fi
+    ;;
+
+  aix4*)
+    allow_undefined_flag=unsupported
+    archive_cmds='$NM$libobjs | $global_symbol_pipe | sed '\''s/.* //'\' | sort | uniq' > $lib.exp        else cat $export_symbols > $lib.exp~
+    	$CC -o $objdir/$soname$libobjs$deplibs ${wl}-bE:$lib.exp ${wl}-bM:SRE ${wl}-bnoentry~$AR cru $lib $objdir/$soname'
+    archive_sym_cmds='$CC -o $objdir/$soname$libobjs$deplibs ${wl}-bE:$export_symbols ${wl}-bM:SRE ${wl}-bnoentry~$AR cru $lib $objdir/$soname'
+    hardcode_direct=yes
+    hardcode_minus_L=yes
+    ;;
+
+  amigaos*)
+    archive_cmds='$rm $objdir/a2ixlibrary.data~$echo "#define NAME $libname" > $objdir/a2ixlibrary.data~$echo "#define LIBRARY_ID 1" >> $objdir/a2ixlibrary.data~$echo "#define VERSION $major" >> $objdir/a2ixlibrary.data~$echo "#define REVISION $revision" >> $objdir/a2ixlibrary.data~$AR cru $lib$libobjs~$RANLIB $lib~(cd $objdir && a2ixlibrary -32)'
+    hardcode_libdir_flag_spec='-L$libdir'
+    hardcode_minus_L=yes
+    ;;
+
+  cygwin32* | mingw32*)
+    if test "$with_gcc" = yes; then
+      # hardcode_libdir_flag_spec is actually meaningless, as there is
+      # no search path for DLLs.
+      hardcode_libdir_flag_spec='-L$libdir'
+      allow_undefined_flag=unsupported
+      # Very, very bogus.
+      echo '
+#define WIN32_LEAN_AND_MEAN
+#include <windows.h>
+#undef WIN32_LEAN_AND_MEAN
+#include <stdio.h>
+
+BOOL APIENTRY DllMain (HINSTANCE hInst, DWORD reason, LPVOID reserved);
+
+#include <cygwin/cygwin_dll.h>
+DECLARE_CYGWIN_DLL( DllMain );
+HINSTANCE __hDllInstance_base;
+
+BOOL APIENTRY
+DllMain (HINSTANCE hInst, DWORD reason, LPVOID reserved)
+{
+  __hDllInstance_base = hInst;
+  return TRUE;
+}
+' > ltdll.c
+      archive_cmds='$CC -c '"`pwd`"'/ltdll.c~echo EXPORTS > $lib-def~
+      $DLLTOOL --export-all --output-def $lib-def $libobjs ltdll.$objext~
+      $CC -Wl,--base-file,$soname-base -Wl,--dll -nostartfiles -Wl,-e,__cygwin_dll_entry@12 $libobjs ltdll.$objext~
+      $DLLTOOL --as=$AS --dllname $soname --exclude-symbol=_cygwin_dll_entry@12 --def $lib-def --base-file $soname-base --output-exp $soname-exp~
+      $CC -Wl,--base-file,$soname-base $soname-exp -Wl,--dll -nostartfiles -Wl,-e,__cygwin_dll_entry@12 -o $lib $libobjs ltdll.$objext$deplibs~
+      $DLLTOOL --as=$AS --dllname $soname --exclude-symbol=_cygwin_dll_entry@12 --def $lib-def --base-file $soname-base --output-exp $soname-exp~
+      $CC $soname-exp -Wl,--dll -nostartfiles -Wl,-e,__cygwin_dll_entry@12 -o $lib $libobjs ltdll.$objext$deplibs~
+      $rm ltdll.$objext $soname-base $soname-exp'
+      archive_sym_cmds='$CC -c '"`pwd`"'/ltdll.c~echo EXPORTS > $lib-def~
+      cat "$export_symbols" >> $lib-def~
+      $CC -Wl,--base-file,$soname-base -Wl,--dll -nostartfiles -Wl,-e,__cygwin_dll_entry@12 $libobjs ltdll.$objext~
+      $DLLTOOL --as=$AS --dllname $soname --exclude-symbol=_cygwin_dll_entry@12 --def $lib-def --base-file $soname-base --output-exp $soname-exp~
+      $CC -Wl,--base-file,$soname-base $soname-exp -Wl,--dll -nostartfiles -Wl,-e,__cygwin_dll_entry@12 -o $lib $libobjs ltdll.$objext$deplibs~
+      $DLLTOOL --as=$AS --dllname $soname --exclude-symbol=_cygwin_dll_entry@12 --def $lib-def --base-file $soname-base --output-exp $soname-exp~
+      $CC $soname-exp -Wl,--dll -nostartfiles -Wl,-e,__cygwin_dll_entry@12 -o $lib $libobjs ltdll.$objext$deplibs~
+      $rm ltdll.$objext $soname-base $soname-exp'
+      old_archive_from_new_cmds='$DLLTOOL --as=$AS --dllname $soname --def $lib-def --output-lib $objdir/$libname.a~$rm $lib.exp'
+    else
+      # When not using gcc, we currently assume that we are using
+      # Microsoft Visual C++.
+      # hardcode_libdir_flag_spec is actually meaningless, as there is
+      # no search path for DLLs.
+      hardcode_libdir_flag_spec=' '
+      allow_undefined_flag=unsupported
+      # Tell ltmain to make .lib files, not .a files.
+      libext=lib
+      # FIXME: Setting linknames here is a bad hack.
+      archive_cmds='$CC -o $lib$libobjs`echo "$deplibs" | sed -e '\''s/ -lc$//'\''` -link -dll~linknames='
+      # The linker will automatically build a .lib file if we build a DLL.
+      old_archive_from_new_cmds='true'
+      # FIXME: Should let the user specify the lib program.
+      old_archive_cmds='lib /OUT:$oldlib$oldobjs'
+      fix_srcfile_path='`cygpath -w $srcfile`'
+    fi
+    ;;
+
+  # FreeBSD 2.2.[012] allows us to include c++rt0.o to get C++ constructor
+  # support.  Future versions do this automatically, but an explicit c++rt0.o
+  # does not break anything, and helps significantly (at the cost of a little
+  # extra space).
+  freebsd2.2*)
+    archive_cmds='$LD -Bshareable -o $lib$libobjs$deplibs /usr/lib/c++rt0.o'
+    hardcode_libdir_flag_spec='-R$libdir'
+    hardcode_direct=yes
+    hardcode_minus_L=yes
+    hardcode_shlibpath_var=no
+    ;;
+
+  # Unfortunately, older versions of FreeBSD 2 do not have this feature.
+  freebsd2*)
+    archive_cmds='$LD -Bshareable -o $lib$libobjs$deplibs'
+    hardcode_direct=yes
+    hardcode_minus_L=yes
+    hardcode_shlibpath_var=no
+    ;;
+
+  # FreeBSD 3, at last, uses gcc -shared to do shared libraries.
+  freebsd3*)
+    archive_cmds='$CC -shared -o $lib$libobjs$deplibs'
+    hardcode_libdir_flag_spec='-R$libdir'
+    hardcode_direct=yes
+    hardcode_minus_L=no
+    hardcode_shlibpath_var=no
+    ;;
+
+  hpux9*)
+    archive_cmds='$rm $objdir/$soname~$LD -b +s +b $install_libdir -o $objdir/$soname$libobjs$deplibs~test $objdir/$soname = $lib || mv $objdir/$soname $lib'
+    hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir'
+    hardcode_direct=yes
+    hardcode_minus_L=yes
+    export_dynamic_flag_spec='${wl}-E'
+    ;;
+
+  hpux10* | hpux11*)
+    archive_cmds='$LD -b +h $soname +s +b $install_libdir -o $lib$libobjs$deplibs'
+    hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir'
+    hardcode_direct=yes
+    hardcode_minus_L=yes
+    export_dynamic_flag_spec='${wl}-E'
+    ;;
+
+  irix5* | irix6*)
+    if test "$with_gcc" = yes; then
+      archive_cmds='$CC -shared -o $lib ${wl}-soname ${wl}$soname ${wl}-set_version ${wl}$verstring$libobjs$deplibs'
+    else
+      archive_cmds='$LD -shared -o $lib -soname $soname -set_version $verstring$libobjs$deplibs'
+    fi
+    hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
+    ;;
+
+  netbsd*)
+    # Tested with NetBSD 1.2 ld
+    archive_cmds='$LD -Bshareable -o $lib$libobjs$deplibs'
+    hardcode_libdir_flag_spec='-R$libdir'
+    hardcode_direct=yes
+    hardcode_shlibpath_var=no
+    ;;
+
+  openbsd*)
+    archive_cmds='$LD -Bshareable -o $lib$libobjs$deplibs'
+    hardcode_libdir_flag_spec='-R$libdir'
+    hardcode_direct=yes
+    hardcode_shlibpath_var=no
+    ;;
+
+  os2*)
+    hardcode_libdir_flag_spec='-L$libdir'
+    hardcode_minus_L=yes
+    allow_undefined_flag=unsupported
+    archive_cmds='$echo "LIBRARY $libname INITINSTANCE" > $objdir/$libname.def~$echo "DESCRIPTION \"$libname\"" >> $objdir/$libname.def~$echo DATA >> $objdir/$libname.def~$echo " SINGLE NONSHARED" >> $objdir/$libname.def~$echo EXPORTS >> $objdir/$libname.def~emxexp$libobjs >> $objdir/$libname.def~$CC -Zdll -Zcrtdll -o $lib$libobjs$deplibs $objdir/$libname.def'
+    old_archive_from_new_cmds='emximp -o $objdir/$libname.a $objdir/$libname.def'
+    ;;
+
+  osf3* | osf4*)
+    if test "$with_gcc" = yes; then
+      allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*'
+      archive_cmds='$CC -shared${allow_undefined_flag} -o $lib ${wl}-soname ${wl}$soname ${wl}-set_version ${wl}$verstring$libobjs$deplibs'
+    else
+      allow_undefined_flag=' -expect_unresolved \*'
+      archive_cmds='$LD -shared${allow_undefined_flag} -o $lib -soname $soname -set_version $verstring$libobjs$deplibs'
+    fi
+    hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
+    hardcode_libdir_separator=:
+    ;;
+
+  sco3.2v5*)
+    archive_cmds='$LD -G -o $lib$libobjs$deplibs'
+    hardcode_direct=yes
+    ;;
+
+  solaris*)
+    no_undefined_flag=' -z text'
+    # $CC -shared without GNU ld will not create a library from C++
+    # object files and a static libstdc++, better avoid it by now
+    archive_cmds='$LD -G${allow_undefined_flag} -h $soname -o $lib$libobjs$deplibs'
+    archive_sym_cmds='$echo "{ global:" > $lib.exp~sed $export_symbols -e "s/.*/\1;/" >> $lib.exp~$echo "local: * }" >> $lib.exp~
+		$LD -G${allow_undefined_flag} -M $export_symbols -h $soname -o $lib$libobjs$deplibs~$rm $lib.exp'
+    hardcode_libdir_flag_spec='-R$libdir'
+    hardcode_shlibpath_var=no
+
+    # Solaris 2 before 2.5 hardcodes -L paths.
+    case "$host_os" in
+    solaris2.[0-4]*)
+      hardcode_minus_L=yes
+      ;;
+    esac
+    ;;
+
+  sunos4*)
+    # Why do we need -Bstatic?  To avoid inter-library dependencies, maybe...
+    if test "$with_gcc" = yes; then
+      archive_cmds='$CC -shared ${wl}-Bstatic -o $lib$libobjs$deplibs'
+    else
+      archive_cmds='$LD -assert pure-text -Bstatic -o $lib$libobjs$deplibs'
+    fi
+    hardcode_libdir_flag_spec='-L$libdir'
+    hardcode_direct=yes
+    hardcode_minus_L=yes
+    hardcode_shlibpath_var=no
+    ;;
+
+  uts4*)
+    archive_cmds='$LD -G -h $soname -o $lib$libobjs$deplibs'
+    hardcode_libdir_flag_spec='-L$libdir'
+    hardcode_direct=no
+    hardcode_minus_L=no
+    hardcode_shlibpath_var=no
+    ;;
+
+  dgux*)
+    archive_cmds='$LD -G -h $soname -o $lib$libobjs$deplibs'
+    hardcode_libdir_flag_spec='-L$libdir'
+    hardcode_direct=no
+    hardcode_minus_L=no
+    hardcode_shlibpath_var=no
+    ;;
+
+  *)
+    ld_shlibs=no
+    can_build_shared=no
+    ;;
+  esac
+fi
+echo "$ac_t$ld_shlibs" 1>&6
+
+if test -z "$NM"; then
+  echo $ac_n "checking for BSD-compatible nm... $ac_c" 1>&6
+  case "$NM" in
+  /* | [A-Za-z]:[/\\]*) ;; # Let the user override the test with a path.
+  *)
+    IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS="${IFS}:"
+    for ac_dir in /usr/ucb /usr/ccs/bin $PATH /bin; do
+      test -z "$ac_dir" && ac_dir=.
+      if test -f $ac_dir/nm; then
+        # Check to see if the nm accepts a BSD-compat flag.
+        # Adding the `sed 1q' prevents false positives on HP-UX, which says:
+        #   nm: unknown option "B" ignored
+        if ($ac_dir/nm -B /dev/null 2>&1 | sed '1q'; exit 0) | egrep /dev/null >/dev/null; then
+          NM="$ac_dir/nm -B"
+        elif ($ac_dir/nm -p /dev/null 2>&1 | sed '1q'; exit 0) | egrep /dev/null >/dev/null; then
+          NM="$ac_dir/nm -p"
+	else
+          NM="$ac_dir/nm"
+	fi
+        break
+      fi
+    done
+    IFS="$ac_save_ifs"
+    test -z "$NM" && NM=nm
+    ;;
+  esac
+  echo "$ac_t$NM" 1>&6
+fi
+
+# Check for command to grab the raw symbol name followed by C symbol from nm.
+echo $ac_n "checking command to parse $NM output... $ac_c" 1>&6
+
+# These are sane defaults that work on at least a few old systems.
+# [They come from Ultrix.  What could be older than Ultrix?!! ;)]
+
+# Character class describing NM global symbol codes.
+symcode='[BCDEGRSTU]'
+
+# Regexp to match symbols that can be accessed directly from C.
+sympat='\([_A-Za-z][_A-Za-z0-9]*\)'
+
+# Transform the above into a raw symbol and a C symbol.
+symxfrm='\1 \1'
+
+# Define system-specific variables.
+case "$host_os" in
+aix*)
+  symcode='[BCDTU]'
+  ;;
+sunos* | cygwin32* | mingw32*)
+  sympat='_\([_A-Za-z][_A-Za-z0-9]*\)'
+  symxfrm='_\1 \1'
+  ;;
+irix*)
+  # Cannot use undefined symbols on IRIX because inlined functions mess us up.
+  symcode='[BCDEGRST]'
+  ;;
+solaris*)
+  symcode='[BDTU]'
+  ;;
+esac
+
+# If we're using GNU nm, then use its standard symbol codes.
+if $NM -V 2>&1 | egrep '(GNU|with BFD)' > /dev/null; then
+  symcode='[ABCDGISTUW]'
+fi
+
+case "$host_os" in
+cygwin32* | mingw32*)
+  # We do not want undefined symbols on cygwin32.  The user must
+  # arrange to define them via -l arguments.
+  symcode='[ABCDGISTW]'
+  ;;
+esac
+
+# Write the raw and C identifiers.
+global_symbol_pipe="sed -n -e 's/^.* $symcode $sympat$/$symxfrm/p'"
+
+# Check to see that the pipe works correctly.
+pipe_works=no
+$rm conftest*
+cat > conftest.c <<EOF
+#ifdef __cplusplus
+extern "C" {
+#endif
+char nm_test_var;
+void nm_test_func(){}
+#ifdef __cplusplus
+}
+#endif
+main(){nm_test_var='a';nm_test_func();return(0);}
+EOF
+
+echo "$progname:1425: checking if global_symbol_pipe works" >&5
+if { (eval echo $progname:1426: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; } && test -s conftest.$objext; then
+  # Now try to grab the symbols.
+  nlist=conftest.nm
+  if { echo "$progname:1429: eval \"$NM conftest.$objext | $global_symbol_pipe > $nlist\"" >&5; eval "$NM conftest.$objext | $global_symbol_pipe > $nlist 2>&5"; } && test -s "$nlist"; then
+
+    # Try sorting and uniquifying the output.
+    if sort "$nlist" | uniq > "$nlist"T; then
+      mv -f "$nlist"T "$nlist"
+      wcout=`wc "$nlist" 2>/dev/null`
+      count=`$echo "X$wcout" | $Xsed -e 's/^[ 	]*\([0-9][0-9]*\).*$/\1/'`
+      (test "$count" -ge 0) 2>/dev/null || count=-1
+    else
+      rm -f "$nlist"T
+      count=-1
+    fi
+
+    # Make sure that we snagged all the symbols we need.
+    if egrep ' nm_test_var$' "$nlist" >/dev/null; then
+      if egrep ' nm_test_func$' "$nlist" >/dev/null; then
+	cat <<EOF > conftest.c
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+EOF
+        # Now generate the symbol file.
+        sed 's/^.* \(.*\)$/extern char \1;/' < "$nlist" >> conftest.c
+
+	cat <<EOF >> conftest.c
+#if defined (__STDC__) && __STDC__
+# define __ptr_t void *
+#else
+# define __ptr_t char *
+#endif
+
+/* The number of symbols in dld_preloaded_symbols, -1 if unsorted. */
+int dld_preloaded_symbol_count = $count;
+
+/* The mapping between symbol names and symbols. */
+struct {
+  char *name;
+  __ptr_t address;
+}
+dld_preloaded_symbols[] =
+{
+EOF
+        sed 's/^\(.*\) \(.*\)$/  {"\1", (__ptr_t) \&\2},/' < "$nlist" >> conftest.c
+        cat <<\EOF >> conftest.c
+  {0, (__ptr_t) 0}
+};
+
+#ifdef __cplusplus
+}
+#endif
+EOF
+        # Now try linking the two files.
+        mv conftest.$objext conftestm.$objext
+	save_LIBS="$LIBS"
+	save_CFLAGS="$CFLAGS"
+        LIBS="conftestm.$objext"
+	CFLAGS="$CFLAGS$no_builtin_flag"
+        if { (eval echo $progname:1487: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+          pipe_works=yes
+        else
+          echo "$progname: failed program was:" >&5
+          cat conftest.c >&5
+        fi
+        LIBS="$save_LIBS"
+      else
+        echo "cannot find nm_test_func in $nlist" >&5
+      fi
+    else
+      echo "cannot find nm_test_var in $nlist" >&5
+    fi
+  else
+    echo "cannot run $global_symbol_pipe" >&5
+  fi
+else
+  echo "$progname: failed program was:" >&5
+  cat conftest.c >&5
+fi
+$rm conftest*
+
+# Do not use the global_symbol_pipe unless it works.
+echo "$ac_t$pipe_works" 1>&6
+test "$pipe_works" = yes || global_symbol_pipe=
+
+# Check hardcoding attributes.
+echo $ac_n "checking how to hardcode library paths into programs... $ac_c" 1>&6
+hardcode_action=
+if test -n "$hardcode_libdir_flag_spec" || \
+   test -n "$runpath_var"; then
+
+  # We can hardcode non-existant directories.
+  if test "$hardcode_direct" != no && \
+     test "$hardcode_minus_L" != no && \
+     test "$hardcode_shlibpath_var" != no; then
+
+    # Linking always hardcodes the temporary library directory.
+    hardcode_action=relink
+  else
+    # We can link without hardcoding, and we can hardcode nonexisting dirs.
+    hardcode_action=immediate
+  fi
+else
+  # We cannot hardcode anything, or else we can only hardcode existing
+  # directories.
+  hardcode_action=unsupported
+fi
+echo "$ac_t$hardcode_action" 1>&6
+
+
+reload_flag=
+reload_cmds='$LD$reload_flag -o $output$reload_objs'
+echo $ac_n "checking for $LD option to reload object files... $ac_c" 1>&6
+# PORTME Some linkers may need a different reload flag.
+reload_flag='-r'
+echo "$ac_t$reload_flag" 1>&6
+test -n "$reload_flag" && reload_flag=" $reload_flag"
+
+# PORTME Fill in your ld.so characteristics
+library_names_spec=
+libname_spec='lib$name'
+soname_spec=
+postinstall_cmds=
+postuninstall_cmds=
+finish_cmds=
+finish_eval=
+shlibpath_var=
+version_type=none
+dynamic_linker="$host_os ld.so"
+sys_lib_search_path="/lib /usr/lib /usr/local/lib"
+check_shared_deplibs_method='none'
+# Need to set the preceding variable on all platforms that support
+# interlibrary dependencies.
+# 'none' -- dependencies not supported.
+# 'pass_all' -- all dependencies passed with no checks.
+# 'test_compile' -- check by making test program.
+# 'file_regex' -- check by looking for filenames that look like the shared
+# library in the library path.
+# 'file_magic [regex]' -- check by looking for files in library path which
+# responds to the "file" command with a given regex.  This is actually a
+# superset of the file_regex command.  If you have file on your system, you'll
+# want to use this instead.
+# Notes: regexes are run through expr.
+
+echo $ac_n "checking dynamic linker characteristics... $ac_c" 1>&6
+case "$host_os" in
+aix3* | aix4*)
+  version_type=linux
+  library_names_spec='${libname}${release}.so$versuffix $libname.a'
+  shlibpath_var=LIBPATH
+
+  # AIX has no versioning support, so we append a major version to the name.
+  soname_spec='${libname}${release}.so$major'
+  ;;
+
+amigaos*)
+  library_names_spec='$libname.ixlibrary $libname.a'
+  # Create ${libname}_ixlibrary.a entries in /sys/libs.
+  finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`$echo "X$lib" | $Xsed -e '\''s%^.*/\([^/]*\)\.ixlibrary$%\1%'\''`; test $rm /sys/libs/${libname}_ixlibrary.a; $show "(cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a)"; (cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a) || exit 1; done'
+  ;;
+
+bsdi4*)
+  version_type=linux
+  library_names_spec='${libname}.so.$major ${libname}.so'
+  soname_spec='${libname}.so'
+  finish_cmds='PATH="$PATH:/sbin" ldconfig $libdir'
+  shlibpath_var=LD_LIBRARY_PATH
+  ;;
+
+cygwin32* | mingw32*)
+  version_type=windows
+  if test "$with_gcc" = yes; then
+    library_names_spec='${libname}`echo ${release} | sed -e 's/[.]/-/g'`${versuffix}.dll $libname.a'
+  else
+    library_names_spec='${libname}`echo ${release} | sed -e 's/[.]/-/g'`${versuffix}.dll $libname.lib'
+  fi
+  dynamic_linker='Win32 ld.exe'
+  libname_spec='$name'
+  shlibpath_var=PATH
+  ;;
+
+freebsd2* | freebsd3*)
+  objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout`
+  version_type=freebsd-$objformat
+  library_names_spec='${libname}${release}.so$versuffix $libname.so'
+  finish_cmds='PATH="$PATH:/sbin" OBJFORMAT="$objformat" ldconfig -m $libdir'
+  shlibpath_var=LD_LIBRARY_PATH
+  ;;
+
+gnu*)
+  version_type=linux
+  library_names_spec='${libname}${release}.so$versuffix ${libname}.so'
+  shlibpath_var=LD_LIBRARY_PATH
+  ;;
+
+hpux9* | hpux10* | hpux11*)
+  # Give a soname corresponding to the major version so that dld.sl refuses to
+  # link against other versions.
+  dynamic_linker="$host_os dld.sl"
+  version_type=sunos
+  shlibpath_var=SHLIB_PATH
+  library_names_spec='${libname}${release}.sl$versuffix ${libname}${release}.sl$major $libname.sl'
+  soname_spec='${libname}${release}.sl$major'
+  # HP-UX runs *really* slowly unless shared libraries are mode 555.
+  postinstall_cmds='chmod 555 $lib'
+  ;;
+
+irix5*)
+  version_type=osf
+  soname_spec='${libname}${release}.so'
+  library_names_spec='${libname}${release}.so$versuffix $libname.so'
+  shlibpath_var=LD_LIBRARY_PATH
+  ;;
+
+irix6*)
+  version_type=osf
+  soname_spec='${libname}${release}.so'
+  library_names_spec='${libname}${release}.so$versuffix $libname.so'
+  shlibpath_var=LD_LIBRARYN32_PATH
+  ;;
+
+# No shared lib support for Linux oldld, aout, or coff.
+linux-gnuoldld* | linux-gnuaout* | linux-gnucoff*)
+  dynamic_linker=no
+  ;;
+
+# This must be Linux ELF.
+linux-gnu*)
+  version_type=linux
+  library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major $libname.so'
+  soname_spec='${libname}${release}.so$major'
+  finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir'
+  shlibpath_var=LD_LIBRARY_PATH
+  check_shared_deplibs_method='file_magic ELF 32-bit LSB shared object'
+  sys_lib_search_path="/lib /usr/lib /usr/local/lib `echo $LD_LIBRARY_PATH | sed -e 's/:/ /g'`"
+
+  if test -f /lib/ld.so.1; then
+    dynamic_linker='GNU ld.so'
+  else
+    # Only the GNU ld.so supports shared libraries on MkLinux.
+    case "$host_cpu" in
+    powerpc*) dynamic_linker=no ;;
+    *) dynamic_linker='Linux ld.so' ;;
+    esac
+  fi
+  ;;
+
+netbsd* | openbsd*)
+  version_type=sunos
+  library_names_spec='${libname}${release}.so$versuffix'
+  finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
+  shlibpath_var=LD_LIBRARY_PATH
+  ;;
+
+os2*)
+  libname_spec='$name'
+  library_names_spec='$libname.dll $libname.a'
+  dynamic_linker='OS/2 ld.exe'
+  shlibpath_var=LIBPATH
+  ;;
+
+osf3* | osf4*)
+  version_type=osf
+  soname_spec='${libname}${release}.so'
+  library_names_spec='${libname}${release}.so$versuffix $libname.so'
+  shlibpath_var=LD_LIBRARY_PATH
+  check_shared_deplibs_method='pass_all'
+  ;;
+
+sco3.2v5*)
+  version_type=osf
+  soname_spec='${libname}${release}.so$major'
+  library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major $libname.so'
+  shlibpath_var=LD_LIBRARY_PATH
+  ;;
+
+solaris*)
+  version_type=linux
+  library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major $libname.so'
+  soname_spec='${libname}${release}.so$major'
+  shlibpath_var=LD_LIBRARY_PATH
+  # ldd complains unless libraries are executable
+  postinstall_cmds='chmod +x $lib'
+  ;;
+
+sunos4*)
+  version_type=sunos
+  library_names_spec='${libname}${release}.so$versuffix ${libname}.so$versuffix'
+  finish_cmds='PATH="\$PATH:/usr/etc" ldconfig $libdir'
+  shlibpath_var=LD_LIBRARY_PATH
+  ;;
+
+sysv4.2uw2*)
+  version_type=linux
+  library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major $libname.so'
+  soname_spec='${libname}${release}.so$major'
+  shlibpath_var=LD_LIBRARY_PATH
+  ;;
+
+uts4*)
+  version_type=linux
+  library_names_spec='${libname}${release}.so.$versuffix ${libname}${release}.so.$major $libname.so'
+  soname_spec='${libname}${release}.so.$major'
+  shlibpath_var=LD_LIBRARY_PATH
+  ;;
+
+dgux*)
+  version_type=linux
+  library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major $libname.so'
+  soname_spec='${libname}${release}.so$major'
+  shlibpath_var=LD_LIBRARY_PATH
+  ;;
+
+*)
+  dynamic_linker=no
+  ;;
+esac
+echo "$ac_t$dynamic_linker" 1>&6
+test "$dynamic_linker" = no && can_build_shared=no
+
+# Report the final consequences.
+echo "checking if libtool supports shared libraries... $can_build_shared" 1>&6
+
+echo $ac_n "checking whether to build shared libraries... $ac_c" 1>&6
+test "$can_build_shared" = "no" && enable_shared=no
+
+# On AIX, shared libraries and static libraries use the same namespace, and
+# are all built from PIC.
+case "$host_os" in
+aix*)
+  test "$enable_shared" = yes && enable_static=no
+  if test -n "$RANLIB"; then
+    archive_cmds="$archive_cmds~\$RANLIB \$lib"
+    postinstall_cmds='$RANLIB $lib'
+  fi
+  ;;
+esac
+
+echo "$ac_t$enable_shared" 1>&6
+
+# Make sure either enable_shared or enable_static is yes.
+test "$enable_shared" = yes || enable_static=yes
+
+echo "checking whether to build static libraries... $enable_static" 1>&6
+
+echo $ac_n "checking for objdir... $ac_c" 1>&6
+rm -f .libs 2>/dev/null
+mkdir .libs 2>/dev/null
+if test -d .libs; then
+  objdir=.libs
+else
+  # MS-DOS does not allow filenames that begin with a dot.
+  objdir=_libs
+fi
+rmdir .libs 2>/dev/null
+echo "$ac_t$objdir" 1>&6
+
+# Copy echo and quote the copy, instead of the original, because it is
+# used later.
+ltecho="$echo"
+if test "X$ltecho" = "X$CONFIG_SHELL $0 --fallback-echo"; then
+   ltecho="$CONFIG_SHELL \$0 --fallback-echo"
+fi
+LTSHELL="$SHELL"
+
+# Only quote variables if we're using ltmain.sh.
+case "$ltmain" in
+*.sh)
+  # Now quote all the things that may contain metacharacters.
+  for var in ltecho old_CC old_CFLAGS old_CPPFLAGS old_LD old_NM old_RANLIB \
+    old_LN_S old_DLLTOOL old_AS AR CC LD LN_S NM LTSHELL VERSION \
+    reload_flag reload_cmds wl \
+    pic_flag link_static_flag no_builtin_flag export_dynamic_flag_spec \
+    whole_archive_flag_spec libname_spec library_names_spec soname_spec \
+    RANLIB old_archive_cmds old_archive_from_new_cmds old_postinstall_cmds \
+    old_postuninstall_cmds archive_cmds archive_sym_cmds postinstall_cmds postuninstall_cmds \
+    check_shared_deplibs_method allow_undefined_flag no_undefined_flag \
+    finish_cmds finish_eval global_symbol_pipe \
+    hardcode_libdir_flag_spec hardcode_libdir_separator sys_lib_search_path \
+    compiler_c_o compiler_o_lo need_locks; do
+
+    case "$var" in
+    reload_cmds | old_archive_cmds | old_archive_from_new_cmds | \
+    old_postinstall_cmds | old_postuninstall_cmds | \
+    archive_cmds | archive_sym_cmds | \
+    postinstall_cmds | postuninstall_cmds | \
+    finish_cmds | sys_lib_search_path)
+      # Double-quote double-evaled strings.
+      eval "$var=\\\"\`\$echo \"X\$$var\" | \$Xsed -e \"\$double_quote_subst\" -e \"\$sed_quote_subst\"\`\\\""
+      ;;
+    *)
+      eval "$var=\\\"\`\$echo \"X\$$var\" | \$Xsed -e \"\$sed_quote_subst\"\`\\\""
+      ;;
+    esac
+  done
+
+  case "$ltecho" in
+  *'\$0 --fallback-echo"')
+    ltecho=`$echo "X$ltecho" |
+	    $Xsed -e 's/\\\\\\\$0 --fallback-echo"$/$0 --fallback-echo"/'`
+    ;;
+  esac
+
+  trap "$rm \"$ofile\"; exit 1" 1 2 15
+  echo "creating $ofile"
+  $rm "$ofile"
+  cat <<EOF > "$ofile"
+#! $SHELL
+
+# `$echo "$ofile" | sed 's%^.*/%%'` - Provide generalized library-building support services.
+# Generated automatically by $PROGRAM (GNU $PACKAGE $VERSION)
+# NOTE: Changes made to this file will be lost: look at ltconfig or ltmain.sh.
+#
+# Copyright (C) 1996-1998 Free Software Foundation, Inc.
+# Gordon Matzigkeit <gord@gnu.ai.mit.edu>, 1996
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+# General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+#
+# As a special exception to the GNU General Public License, if you
+# distribute this file as part of a program that contains a
+# configuration script generated by Autoconf, you may include it under
+# the same distribution terms that you use for the rest of that program.
+
+# Sed that helps us avoid accidentally triggering echo(1) options like -n.
+Xsed="sed -e s/^X//"
+
+# The HP-UX ksh and POSIX shell print the target directory to stdout
+# if CDPATH is set.
+if test "\${CDPATH+set}" = set; then CDPATH=; export CDPATH; fi
+
+### BEGIN LIBTOOL CONFIG
+EOF
+  cfgfile="$ofile"
+  ;;
+
+*)
+  # Double-quote the variables that need it (for aesthetics).
+  for var in old_CC old_CFLAGS old_CPPFLAGS old_LD old_NM old_RANLIB \
+    old_LN_S old_DLLTOOL old_AS; do
+    eval "$var=\\\"\$var\\\""
+  done
+
+  # Just create a config file.
+  cfgfile="$ofile.cfg"
+  trap "$rm \"$cfgfile\"; exit 1" 1 2 15
+  echo "creating $cfgfile"
+  $rm "$cfgfile"
+  cat <<EOF > "$cfgfile"
+# `$echo "$cfgfile" | sed 's%^.*/%%'` - Libtool configuration file.
+# Generated automatically by $PROGRAM (GNU $PACKAGE $VERSION)
+EOF
+  ;;
+esac
+
+cat <<EOF >> "$cfgfile"
+# Libtool was configured as follows, on host `(hostname || uname -n) 2>/dev/null | sed 1q`:
+#
+# CC=$old_CC CFLAGS=$old_CFLAGS CPPFLAGS=$old_CPPFLAGS \\
+# LD=$old_LD NM=$old_NM RANLIB=$old_RANLIB LN_S=$old_LN_S \\
+# DLLTOOL="$old_DLLTOOL" AS="$old_AS" \\
+#   $0$ltconfig_args
+#
+# Compiler and other test output produced by $progname, useful for
+# debugging $progname, is in ./config.log if it exists.
+
+# The version of $progname that generated this script.
+LTCONFIG_VERSION=$VERSION
+
+# Shell to use when invoking shell scripts.
+SHELL=$LTSHELL
+
+# Whether or not to build shared libraries.
+build_libtool_libs=$enable_shared
+
+# Whether or not to build static libraries.
+build_old_libs=$enable_static
+
+# The host system.
+host_alias=$host_alias
+host=$host
+
+# An echo program that does not interpret backslashes.
+echo=$ltecho
+
+# The archiver.
+AR=$AR
+
+# The default C compiler.
+CC=$CC
+
+# The linker used to build libraries.
+LD=$LD
+
+# Whether we need hard or soft links.
+LN_S=$LN_S
+
+# A BSD-compatible nm program.
+NM=$NM
+
+# Used on cygwin32: DLL creation program.
+DLLTOOL="$DLLTOOL"
+
+# Used on cygwin32: assembler.
+AS="$AS"
+
+# The name of the directory that contains temporary libtool files.
+objdir=$objdir
+
+# How to create reloadable object files.
+reload_flag=$reload_flag
+reload_cmds=$reload_cmds
+
+# How to pass a linker flag through the compiler.
+wl=$wl
+
+# Object file suffix (normally "o").
+objext="$objext"
+
+# Old archive suffix (normally "a").
+libext="$libext"
+
+# Additional compiler flags for building library objects.
+pic_flag=$pic_flag
+
+# Does compiler simultaneously support -c and -o options
+compiler_c_o=$compiler_c_o
+
+# Can we write directly to a .lo ?
+compiler_o_lo=$compiler_o_lo
+
+# Must we lock files when doing compilation ?
+need_locks=$need_locks
+
+# Compiler flag to prevent dynamic linking.
+link_static_flag=$link_static_flag
+
+# Compiler flag to turn off builtin functions.
+no_builtin_flag=$no_builtin_flag
+
+# Compiler flag to allow reflexive dlopens.
+export_dynamic_flag_spec=$export_dynamic_flag_spec
+
+# Compiler flag to generate shared objects directly from archives.
+whole_archive_flag_spec=$whole_archive_flag_spec
+
+# Library versioning type.
+version_type=$version_type
+
+# Format of library name prefix.
+libname_spec=$libname_spec
+
+# List of archive names.  First name is the real one, the rest are links.
+# The last name is the one that the linker finds with -lNAME.
+library_names_spec=$library_names_spec
+
+# The coded name of the library, if different from the real name.
+soname_spec=$soname_spec
+
+# Commands used to build and install an old-style archive.
+RANLIB=$RANLIB
+old_archive_cmds=$old_archive_cmds
+old_postinstall_cmds=$old_postinstall_cmds
+old_postuninstall_cmds=$old_postuninstall_cmds
+
+# Create an old-style archive from a shared archive.
+old_archive_from_new_cmds=$old_archive_from_new_cmds
+
+# Commands used to build and install a shared archive.
+archive_cmds=$archive_cmds
+archive_sym_cmds=$archive_sym_cmds
+postinstall_cmds=$postinstall_cmds
+postuninstall_cmds=$postuninstall_cmds
+
+# Method to check whether dependent libraries are shared objects.
+check_shared_deplibs_method=$check_shared_deplibs_method
+
+# Flag that allows shared libraries with undefined symbols to be built.
+allow_undefined_flag=$allow_undefined_flag
+
+# Flag that forces no undefined symbols.
+no_undefined_flag=$no_undefined_flag
+
+# Commands used to finish a libtool library installation in a directory.
+finish_cmds=$finish_cmds
+
+# Same as above, but a single script fragment to be evaled but not shown.
+finish_eval=$finish_eval
+
+# Take the output of nm and produce a listing of raw symbols and C names.
+global_symbol_pipe=$global_symbol_pipe
+
+# This is the shared library runtime path variable.
+runpath_var=$runpath_var
+
+# This is the shared library path variable.
+shlibpath_var=$shlibpath_var
+
+# How to hardcode a shared library path into an executable.
+hardcode_action=$hardcode_action
+
+# Flag to hardcode \$libdir into a binary during linking.
+# This must work even if \$libdir does not exist.
+hardcode_libdir_flag_spec=$hardcode_libdir_flag_spec
+
+# Whether we need a single -rpath flag with a separated argument.
+hardcode_libdir_separator=$hardcode_libdir_separator
+
+# Set to yes if using DIR/libNAME.so during linking hardcodes DIR into the
+# resulting binary.
+hardcode_direct=$hardcode_direct
+
+# Set to yes if using the -LDIR flag during linking hardcodes DIR into the
+# resulting binary.
+hardcode_minus_L=$hardcode_minus_L
+
+# Set to yes if using SHLIBPATH_VAR=DIR during linking hardcodes DIR into
+# the resulting binary.
+hardcode_shlibpath_var=$hardcode_shlibpath_var
+
+# System search path for libraries
+sys_lib_search_path=$sys_lib_search_path
+
+# Fix the shell variable \$srcfile for the compiler.
+fix_srcfile_path="$fix_srcfile_path"
+EOF
+
+case "$ltmain" in
+*.sh)
+  echo '### END LIBTOOL CONFIG' >> "$ofile"
+  echo >> "$ofile"
+  case "$host_os" in
+  aix3*)
+    cat <<\EOF >> "$ofile"
+
+# AIX sometimes has problems with the GCC collect2 program.  For some
+# reason, if we set the COLLECT_NAMES environment variable, the problems
+# vanish in a puff of smoke.
+if test "${COLLECT_NAMES+set}" != set; then
+  COLLECT_NAMES=
+  export COLLECT_NAMES
+fi
+EOF
+    ;;
+  esac
+
+  # Append the ltmain.sh script.
+  cat "$ltmain" >> "$ofile" || (rm -f "$ofile"; exit 1)
+
+  chmod +x "$ofile"
+  ;;
+
+*)
+  # Compile the libtool program.
+  echo "FIXME: would compile $ltmain"
+  ;;
+esac
+exit 0
+
+# Local Variables:
+# mode:shell-script
+# sh-indentation:2
+# End:
diff --git a/ltmain.sh b/ltmain.sh
new file mode 100644
index 0000000..397cc1e
--- /dev/null
+++ b/ltmain.sh
@@ -0,0 +1,3079 @@
+# ltmain.sh - Provide generalized library-building support services.
+# NOTE: Changing this file will not affect anything until you rerun ltconfig.
+#
+# Copyright (C) 1996-1998 Free Software Foundation, Inc.
+# Gordon Matzigkeit <gord@gnu.ai.mit.edu>, 1996
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+# General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+#
+# As a special exception to the GNU General Public License, if you
+# distribute this file as part of a program that contains a
+# configuration script generated by Autoconf, you may include it under
+# the same distribution terms that you use for the rest of that program.
+
+# Check that we have a working $echo.
+if test "X$1" = X--no-reexec; then
+  # Discard the --no-reexec flag, and continue.
+  shift
+elif test "X$1" = X--fallback-echo; then
+  # used as fallback echo
+  shift
+  cat <<EOF
+$*
+EOF
+  exit 0
+elif test "X`($echo '\t') 2>/dev/null`" = 'X\t'; then
+  # Yippee, $echo works!
+  :
+else
+  # Restart under the correct shell, and then maybe $echo will work.
+  exec $SHELL "$0" --no-reexec ${1+"$@"}
+fi
+
+# The name of this program.
+progname=`$echo "$0" | sed 's%^.*/%%'`
+modename="$progname"
+
+# Constants.
+PROGRAM=ltmain.sh
+PACKAGE=libtool
+VERSION=1.2d
+
+default_mode=
+help="Try \`$progname --help' for more information."
+magic="%%%MAGIC variable%%%"
+mkdir="mkdir"
+mv="mv -f"
+rm="rm -f"
+
+# Sed substitution that helps us do robust quoting.  It backslashifies
+# metacharacters that are still active within double-quoted strings.
+Xsed='sed -e s/^X//'
+sed_quote_subst='s/\([\\`\\"$\\\\]\)/\\\1/g'
+
+# NLS nuisances.
+# Only set LANG and LC_ALL to C if already set.
+# These must not be set unconditionally because not all systems understand
+# e.g. LANG=C (notably SCO).
+# We save the old values to restore during execute mode.
+if test "${LC_ALL+set}" = set; then
+  save_LC_ALL="$LC_ALL"; LC_ALL=C; export LC_ALL
+fi
+if test "${LANG+set}" = set; then
+  save_LANG="$LANG"; LANG=C; export LANG
+fi
+
+if test "$LTCONFIG_VERSION" != "$VERSION"; then
+  echo "$modename: ltconfig version \`$LTCONFIG_VERSION' does not match $PROGRAM version \`$VERSION'" 1>&2
+  echo "Fatal configuration error.  See the $PACKAGE docs for more information." 1>&2
+  exit 1
+fi
+
+if test "$build_libtool_libs" != yes && test "$build_old_libs" != yes; then
+  echo "$modename: not configured to build any kind of library" 1>&2
+  echo "Fatal configuration error.  See the $PACKAGE docs for more information." 1>&2
+  exit 1
+fi
+
+# Global variables.
+mode=$default_mode
+nonopt=
+prev=
+prevopt=
+run=
+show="$echo"
+show_help=
+execute_dlfiles=
+lo2o="s/\\.lo\$/.${objext}/"
+los2o="s/\\.lo /.${objext} /g"
+
+# Parse our command line options once, thoroughly.
+while test $# -gt 0
+do
+  arg="$1"
+  shift
+
+  case "$arg" in
+  -*=*) optarg=`$echo "X$arg" | $Xsed -e 's/[-_a-zA-Z0-9]*=//'` ;;
+  *) optarg= ;;
+  esac
+
+  # If the previous option needs an argument, assign it.
+  if test -n "$prev"; then
+    case "$prev" in
+    execute_dlfiles)
+      eval "$prev=\"\$$prev \$arg\""
+      ;;
+    *)
+      eval "$prev=\$arg"
+      ;;
+    esac
+
+    prev=
+    prevopt=
+    continue
+  fi
+
+  # Have we seen a non-optional argument yet?
+  case "$arg" in
+  --help)
+    show_help=yes
+    ;;
+
+  --version)
+    echo "$PROGRAM (GNU $PACKAGE) $VERSION"
+    exit 0
+    ;;
+
+  --config)
+    sed -e '1,/^### BEGIN LIBTOOL CONFIG/d' -e '/^### END LIBTOOL CONFIG/,$d' $0
+    exit 0
+    ;;
+
+  --debug)
+    echo "$progname: enabling shell trace mode"
+    set -x
+    ;;
+
+  --dry-run | -n)
+    run=:
+    ;;
+
+  --features)
+    echo "host: $host"
+    if test "$build_libtool_libs" = yes; then
+      echo "enable shared libraries"
+    else
+      echo "disable shared libraries"
+    fi
+    if test "$build_old_libs" = yes; then
+      echo "enable static libraries"
+    else
+      echo "disable static libraries"
+    fi
+    exit 0
+    ;;
+
+  --finish) mode="finish" ;;
+
+  --mode) prevopt="--mode" prev=mode ;;
+  --mode=*) mode="$optarg" ;;
+
+  --quiet | --silent)
+    show=:
+    ;;
+
+  -dlopen)
+    prevopt="-dlopen"
+    prev=execute_dlfiles
+    ;;
+
+  -*)
+    $echo "$modename: unrecognized option \`$arg'" 1>&2
+    $echo "$help" 1>&2
+    exit 1
+    ;;
+
+  *)
+    nonopt="$arg"
+    break
+    ;;
+  esac
+done
+
+if test -n "$prevopt"; then
+  $echo "$modename: option \`$prevopt' requires an argument" 1>&2
+  $echo "$help" 1>&2
+  exit 1
+fi
+
+if test -z "$show_help"; then
+
+  # Infer the operation mode.
+  if test -z "$mode"; then
+    case "$nonopt" in
+    *cc | *++ | gcc* | *-gcc*)
+      mode=link
+      for arg
+      do
+        case "$arg" in
+        -c)
+           mode=compile
+           break
+           ;;
+        esac
+      done
+      ;;
+    *db | *dbx | *strace | *truss)
+      mode=execute
+      ;;
+    *install*|cp|mv)
+      mode=install
+      ;;
+    *rm)
+      mode=uninstall
+      ;;
+    *)
+      # If we have no mode, but dlfiles were specified, then do execute mode.
+      test -n "$execute_dlfiles" && mode=execute
+
+      # Just use the default operation mode.
+      if test -z "$mode"; then
+        if test -n "$nonopt"; then
+          $echo "$modename: warning: cannot infer operation mode from \`$nonopt'" 1>&2
+        else
+          $echo "$modename: warning: cannot infer operation mode without MODE-ARGS" 1>&2
+        fi
+      fi
+      ;;
+    esac
+  fi
+
+  # Only execute mode is allowed to have -dlopen flags.
+  if test -n "$execute_dlfiles" && test "$mode" != execute; then
+    $echo "$modename: unrecognized option \`-dlopen'" 1>&2
+    $echo "$help" 1>&2
+    exit 1
+  fi
+
+  # Change the help message to a mode-specific one.
+  generic_help="$help"
+  help="Try \`$modename --help --mode=$mode' for more information."
+
+  # These modes are in order of execution frequency so that they run quickly.
+  case "$mode" in
+  # libtool compile mode
+  compile)
+    modename="$modename: compile"
+    # Get the compilation command and the source file.
+    base_compile=
+    lastarg=
+    srcfile="$nonopt"
+    suppress_output=
+    force_static=no
+
+    user_target=no
+    for arg
+    do
+      # Accept any command-line options.
+      case "$arg" in
+      -o)
+        if test "$user_target" != "no"; then
+          $echo "$modename: you cannot specify \`-o' more than once" 1>&2
+	  exit 1
+        fi
+        user_target=next
+	;;
+
+      -force-static)
+        force_static=yes
+        continue
+        ;;
+	
+      -static)
+        build_old_libs=yes
+        continue
+        ;;
+      esac
+
+      case "$user_target" in
+      next)
+        # The next one is the -o target name
+        user_target=yes
+        continue
+        ;;
+      yes)
+        # We got the output file
+        user_target=set
+        libobj="$arg"
+        continue
+        ;;
+      esac
+
+      # Accept the current argument as the source file.
+      lastarg="$srcfile"
+      srcfile="$arg"
+
+      # Aesthetically quote the previous argument.
+
+      # Backslashify any backslashes, double quotes, and dollar signs.
+      # These are the only characters that are still specially
+      # interpreted inside of double-quoted scrings.
+      lastarg=`$echo "X$lastarg" | $Xsed -e "$sed_quote_subst"`
+
+      # Double-quote args containing other shell metacharacters.
+      # Many Bourne shells cannot handle close brackets correctly in scan
+      # sets, so we specify it separately.
+      case "$lastarg" in
+      *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \	]*|*]*)
+        lastarg="\"$lastarg\""
+        ;;
+      esac
+
+      # Add the previous argument to base_compile.
+      if test -z "$base_compile"; then
+        base_compile="$lastarg"
+      else
+        base_compile="$base_compile $lastarg"
+      fi
+    done
+
+    case "$user_target" in
+    set)
+      ;;
+    no)
+      # Get the name of the library object.
+      libobj=`$echo "X$srcfile" | $Xsed -e 's%^.*/%%'`
+      ;;
+    *)
+      $echo "$modename: you must specify a target with \`-o'" 1>&2
+      exit 1
+      ;;
+    esac
+
+    # Recognize several different file suffixes.
+    # If the user specifies -o file.o, it is replaced with file.lo
+    xform='[cCFSfmso]'
+    case "$libobj" in
+    *.ada) xform=ada ;;
+    *.adb) xform=adb ;;
+    *.ads) xform=ads ;;
+    *.asm) xform=asm ;;
+    *.c++) xform=c++ ;;
+    *.cc) xform=cc ;;
+    *.cpp) xform=cpp ;;
+    *.cxx) xform=cxx ;;
+    *.f90) xform=f90 ;;
+    *.for) xform=for ;;
+    esac
+
+    libobj=`$echo "X$libobj" | $Xsed -e "s/\.$xform$/.lo/"`
+
+    case "$libobj" in
+    *.lo) obj=`$echo "X$libobj" | $Xsed -e "$lo2o"` ;;
+    *)
+      $echo "$modename: cannot determine name of library object from \`$libobj'" 1>&2
+      exit 1
+      ;;
+    esac
+
+    if test -z "$base_compile"; then
+      $echo "$modename: you must specify a compilation command" 1>&2
+      $echo "$help" 1>&2
+      exit 1
+    fi
+
+    # Delete any leftover library objects.
+    if test "$build_old_libs" = yes; then
+      removelist="$obj $libobj $lockfile"
+    else
+      removelist="$libobj $lockfile"
+    fi
+
+    $run $rm $removelist
+    trap "$run $rm $removelist; exit 1" 1 2 15
+
+    # Calculate the filename of the output object if compiler does
+    # not support -o with -c
+    if test "$compiler_c_o" = no; then
+      output_obj=`$echo "X$srcfile" | $Xsed -e 's%^.*/%%' -e 's%\..*$%%'`.${objext}
+      lockfile="$output_obj.lock"
+      removelist="$removelist $output_obj $lockfile"
+      trap "$run $rm $removelist; exit 1" 1 2 15
+    else
+      need_locks=no
+      lockfile=
+    fi
+
+    # Lock this critical section if it is needed
+    # We use this script file to make the link, it avoids creating a new file
+    if test "$need_locks" = yes; then
+      until ln "$0" "$lockfile" 2>/dev/null; do
+        $show "Waiting for $lockfile to be removed"
+        sleep 2
+      done
+    elif test "$need_locks" = warn; then
+      if test -f "$lockfile"; then
+	echo "\
+*** ERROR, $lockfile exists and contains:
+`cat $lockfile 2>/dev/null`
+
+This indicates that another process is trying to use the same
+temporary object file, and libtool could not work around it because
+your compiler does not support \`-c' and \`-o' together.  If you
+repeat this compilation, it may succeed, by chance, but you had better
+avoid parallel builds (make -j) in this platform, or get a better
+compiler."
+
+	$run $rm $removelist
+	exit 1
+      fi
+      echo $srcfile > "$lockfile"
+    fi
+
+    if test -n "$fix_srcfile_path"; then
+      eval srcfile=\"$fix_srcfile_path\"
+    fi
+
+    # Only build a PIC object if we are building libtool libraries.
+    if test "$build_libtool_libs" = yes; then
+      # Without this assignment, base_compile gets emptied.
+      fbsd_hideous_sh_bug=$base_compile
+
+      # All platforms use -DPIC, to notify preprocessed assembler code.
+      command="$base_compile$pic_flag -DPIC $srcfile"
+      if test "$compiler_o_lo" = yes; then
+        command="$command -o $libobj"
+        output_obj="$libobj"
+      elif test "$compiler_c_o" = yes; then
+        command="$command -o $obj"
+        output_obj="$obj"
+      fi
+
+      $show "$command"
+      if $run eval "$command"; then :
+      else
+        test -n "$output_obj" && $run $rm $removelist
+        exit 1
+      fi
+
+      if test "$need_locks" = warn &&
+	 test x"`cat $lockfile 2>/dev/null`" != x"$srcfile"; then
+	echo "\
+*** ERROR, $lockfile contains:
+`cat $lockfile 2>/dev/null`
+
+but it should contain:
+$srcfile
+
+This indicates that another process is trying to use the same
+temporary object file, and libtool could not work around it because
+your compiler does not support \`-c' and \`-o' together.  If you
+repeat this compilation, it may succeed, by chance, but you had better
+avoid parallel builds (make -j) in this platform, or get a better
+compiler."
+
+	$run $rm $removelist
+	exit 1
+      fi
+
+      # Just move the object if needed, then go on to compile the next one
+      if test "$compiler_o_lo" = no && test x"$output_obj" != x"$libobj"; then
+        $show "$mv $output_obj $libobj"
+        if $run $mv $output_obj $libobj; then :
+	else
+	  error=$?
+	  $run $rm $removelist
+	  exit $error
+	fi
+      fi
+
+      # If we have no pic_flag and do not have -force-static, 
+      # then copy the object into place and finish.
+      if test -z "$pic_flag" && test "$force_static" = no; then
+        $show "$LN_S $libobj $obj"
+        if $run $LN_S $libobj $obj; then
+	  exit 0
+	else
+          error=$?
+	  $run $rm $removelist
+	  exit $error
+	fi
+      fi
+
+      # Allow error messages only from the first compilation.
+      suppress_output=' >/dev/null 2>&1'
+    fi
+
+    # Only build a position-dependent object if we build old libraries.
+    if test "$build_old_libs" = yes; then
+      command="$base_compile $srcfile"
+      if test "$force_static" = yes; then
+        command="$command -DLIBTOOL_STATIC"
+      fi
+      if test "$compiler_c_o" = yes; then
+        command="$command -o $obj"
+        output_obj="$obj"
+      fi
+
+      # Suppress compiler output if we already did a PIC compilation.
+      command="$command$suppress_output"
+      $show "$command"
+      if $run eval "$command"; then :
+      else
+        $run $rm $removelist
+        exit 1
+      fi
+
+      if test "$need_locks" = warn &&
+	 test x"`cat $lockfile 2>/dev/null`" != x"$srcfile"; then
+	echo "\
+*** ERROR, $lockfile contains:
+`cat $lockfile 2>/dev/null`
+
+but it should contain:
+$srcfile
+
+This indicates that another process is trying to use the same
+temporary object file, and libtool could not work around it because
+your compiler does not support \`-c' and \`-o' together.  If you
+repeat this compilation, it may succeed, by chance, but you had better
+avoid parallel builds (make -j) in this platform, or get a better
+compiler."
+
+	$run $rm $removelist
+	exit 1
+      fi
+
+      # Just move the object if needed
+      if test "$compiler_c_o" = no && test x"$output_obj" != x"$obj"; then
+        $show "$mv $output_obj $obj"
+        if $run $mv $output_obj $obj; then :
+	else
+	  error=$?
+	  $run $rm $removelist
+	  exit $error
+	fi
+      fi
+    fi
+
+    # Unlock the critical section if it was locked
+    if test "$need_locks" != no; then
+      $rm "$lockfile"
+    fi
+
+    # Create an invalid libtool object if no PIC, so that we do not
+    # accidentally link it into a program.
+    if test "$build_libtool_libs" != yes; then
+      $show "echo timestamp > $libobj"
+      $run eval "echo timestamp > \$libobj" || exit $?
+    fi
+
+    exit 0
+    ;;
+
+  # libtool link mode
+  link)
+    modename="$modename: link"
+    C_compiler="$CC" # save it, to compile generated C sources
+    CC="$nonopt"
+    allow_undefined=yes
+    compile_command="$CC"
+    finalize_command="$CC"
+
+    compile_shlibpath=
+    finalize_shlibpath=
+    convenience=
+    old_convenience=
+    deplibs=
+    eval lib_search_path=\"$sys_lib_search_path\"
+    
+    dlfiles=
+    dlprefiles=
+    export_dynamic=no
+    export_symbols=
+    generated=
+    hardcode_libdirs=
+    libobjs=
+    link_against_libtool_libs=
+    ltlibs=
+    module=no
+    objs=
+    prev=
+    prevarg=
+    release=
+    rpath=
+    perm_rpath=
+    temp_rpath=
+    vinfo=
+
+    # We need to know -static, to get the right output filenames.
+    for arg
+    do
+      case "$arg" in
+      -all-static | -static)
+        if test "X$arg" = "X-all-static" && test "$build_libtool_libs" = yes && test -z "$link_static_flag"; then
+	    $echo "$modename: warning: complete static linking is impossible in this configuration" 1>&2
+        fi
+        build_libtool_libs=no
+	build_old_libs=yes
+        break
+        ;;
+      esac
+    done
+
+    # See if our shared archives depend on static archives.
+    test -n "$old_archive_from_new_cmds" && build_old_libs=yes
+
+    # Go through the arguments, transforming them on the way.
+    while test $# -gt 0; do
+      arg="$1"
+      shift
+
+      # If the previous option needs an argument, assign it.
+      if test -n "$prev"; then
+        case "$prev" in
+        output)
+          compile_command="$compile_command @OUTPUT@"
+          finalize_command="$finalize_command @OUTPUT@"
+          ;;
+        esac
+
+        case "$prev" in
+        dlfiles|dlprefiles)
+          case "$arg" in
+          *.la | *.lo) ;;  # We handle these cases below.
+          *)
+            dlprefiles="$dlprefiles $arg"
+            test "$prev" = dlfiles && dlfiles="$dlfiles $arg"
+            prev=
+            ;;
+          esac
+          ;;
+	exportsyms)
+	  export_symbols="$arg"
+          if test ! -f "$arg"; then
+            $echo "$modename: symbol file \`$arg' does not exist"
+            exit 1
+          fi
+	  prev=
+	  ;;
+	release)
+	  release="-$arg"
+	  prev=
+	  continue
+	  ;;
+        rpath)
+          rpath="$rpath $arg"
+	  prev=
+	  continue
+	  ;;
+        *)
+          eval "$prev=\"\$arg\""
+          prev=
+          continue
+          ;;
+        esac
+      fi
+
+      prevarg="$arg"
+
+      case "$arg" in
+      -all-static)
+	if test -n "$link_static_flag"; then
+          compile_command="$compile_command $link_static_flag"
+	  finalize_command="$finalize_command $link_static_flag"
+        fi
+        continue
+	;;
+
+      -allow-undefined)
+	# FIXME: remove this flag sometime in the future.
+	$echo "$modename: \`-allow-undefined' is deprecated because it is the default" 1>&2
+	continue
+	;;
+
+      -dlopen)
+        prev=dlfiles
+        continue
+        ;;
+
+      -dlpreopen)
+        prev=dlprefiles
+        continue
+        ;;
+
+      -export-dynamic)
+        if test "$export_dynamic" != yes; then
+          export_dynamic=yes
+	  if test -n "$export_dynamic_flag_spec"; then
+	    eval arg=\"$export_dynamic_flag_spec\"
+	  else
+	    arg=
+	  fi
+
+          # Add the symbol object into the linking commands.
+	  compile_command="$compile_command @SYMFILE@"
+	  finalize_command="$finalize_command @SYMFILE@"
+        fi
+        ;;
+
+      -export-symbols)
+        if test -n "$export_symbols"; then
+          $echo "$modename: cannot have more than one -exported-symbols"
+          exit 1
+        fi
+	prev=exportsyms
+	continue
+        ;;
+
+      -L*)
+        dir=`$echo "X$arg" | $Xsed -e 's%^-L\(.*\)$%\1%'`
+        case "$dir" in
+        /* | [A-Za-z]:[/\\]*)
+	  # Add the corresponding hardcode_libdir_flag, if it is not identical.
+          ;;
+        *)
+          $echo "$modename: \`-L$dir' cannot specify a relative directory" 1>&2
+          exit 1
+          ;;
+        esac
+        deplibs="$deplibs $arg"
+        lib_search_path="$lib_search_path `expr $arg : '-L\(.*\)'`"
+        ;;
+
+      -l*) deplibs="$deplibs $arg" ;;
+
+      -module)
+        if test "$module" != yes; then
+          module=yes
+	  if test -n "$export_dynamic_flag_spec"; then
+	    eval arg=\"$export_dynamic_flag_spec\"
+	  else
+	    arg=
+	  fi
+	fi
+        ;;
+	
+      -no-undefined)
+	allow_undefined=no
+	continue
+	;;
+
+      -o) prev=output ;;
+
+      -release)
+	prev=release
+	continue
+	;;
+
+      -rpath)
+        prev=rpath
+        continue
+        ;;
+
+      -static)
+	# If we have no pic_flag, then this is the same as -all-static.
+	if test -z "$pic_flag" && test -n "$link_static_flag"; then
+          compile_command="$compile_command $link_static_flag"
+	  finalize_command="$finalize_command $link_static_flag"
+        fi
+	continue
+	;;
+
+      -version-info)
+        prev=vinfo
+        continue
+        ;;
+
+      # Some other compiler flag.
+      -* | +*)
+	# Unknown arguments in both finalize_command and compile_command need
+	# to be aesthetically quoted because they are evaled later.
+	arg=`$echo "X$arg" | $Xsed -e "$sed_quote_subst"`
+	case "$arg" in
+	*[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \	]*|*]*)
+	  arg="\"$arg\""
+	  ;;
+	esac
+        ;;
+
+      *.o | *.obj | *.a | *.lib)
+        # A standard object.
+        objs="$objs $arg"
+        ;;
+
+      *.lo)
+        # A library object.
+	if test "$prev" = dlfiles; then
+	  dlfiles="$dlfiles $arg"
+	  if test "$build_libtool_libs" = yes; then
+	    prev=
+	    continue
+	  else
+	    # If libtool objects are unsupported, then we need to preload.
+	    prev=dlprefiles
+	  fi
+	fi
+
+	if test "$prev" = dlprefiles; then
+	  # Preload the old-style object.
+	  dlprefiles="$dlprefiles "`$echo "X$arg" | $Xsed -e "$lo2o"`
+	  prev=
+	fi
+	libobjs="$libobjs $arg"
+        ;;
+
+      *.la)
+        # A libtool-controlled library.
+
+        dlname=
+        libdir=
+        library_names=
+        old_library=
+
+        # Check to see that this really is a libtool archive.
+        if (sed -e '2q' $arg | egrep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then :
+        else
+          $echo "$modename: \`$arg' is not a valid libtool archive" 1>&2
+          exit 1
+        fi
+
+	# If the library was installed with an old release of libtool,
+	# it will not redefine variable installed.
+	installed=yes
+
+        # If there is no directory component, then add one.
+        case "$arg" in
+        */* | *\\*) . $arg ;;
+        *) . ./$arg ;;
+        esac
+
+        # Get the name of the library we link against.
+        linklib=
+        for l in $old_library $library_names; do
+          linklib="$l"
+        done
+
+        if test -z "$linklib"; then
+          $echo "$modename: cannot find name of link library for \`$arg'" 1>&2
+          exit 1
+        fi
+
+        # Find the relevant object directory and library name.
+        name=`$echo "X$arg" | $Xsed -e 's%^.*/%%' -e 's/\.la$//' -e 's/^lib//'`
+
+	if test "X$installed" = Xyes; then
+	  dir="$libdir"
+	else
+	  dir=`$echo "X$arg" | $Xsed -e 's%/[^/]*$%%'`
+	  if test "X$dir" = "X$arg"; then
+	    dir="$objdir"
+	  else
+	    dir="$dir/$objdir"
+	  fi
+	fi
+
+        if test -z "$libdir"; then
+	  # It is a libtool convenience library, so add in its objects.
+	  convenience="$convenience $dir/$old_library"
+	  old_convenience="$old_convenience $dir/$old_library"
+	  deplibs="$deplibs$dependency_libs"
+	  compile_command="$compile_command $dir/$old_library$dependency_libs"
+	  finalize_command="$finalize_command $dir/$old_library$dependency_libs"
+	  continue
+	fi
+
+        # This library was specified with -dlopen.
+        if test "$prev" = dlfiles; then
+          dlfiles="$dlfiles $arg"
+          if test -z "$dlname" || test "$build_libtool_libs" = no; then
+            # If there is no dlname or we're linking statically,
+            # we need to preload.
+            prev=dlprefiles
+          else
+            # We should not create a dependency on this library, but we
+	    # may need any libraries it requires.
+	    compile_command="$compile_command$dependency_libs"
+	    finalize_command="$finalize_command$dependency_libs"
+            prev=
+            continue
+          fi
+        fi
+
+        # The library was specified with -dlpreopen.
+        if test "$prev" = dlprefiles; then
+          # Prefer using a static library (so that no silly _DYNAMIC symbols
+          # are required to link).
+          if test -n "$old_library"; then
+            dlprefiles="$dlprefiles $dir/$old_library"
+          else
+            dlprefiles="$dlprefiles $dir/$linklib"
+          fi
+          prev=
+        fi
+
+        if test "$build_libtool_libs" = yes && test -n "$library_names"; then
+          link_against_libtool_libs="$link_against_libtool_libs $arg"
+          if test -n "$shlibpath_var"; then
+            # Make sure the rpath contains only unique directories.
+            case "$temp_rpath " in
+            *" $dir "*) ;;
+            *) temp_rpath="$temp_rpath $dir" ;;
+            esac
+          fi
+
+	  # This is the magic to use -rpath.
+          if test -n "$hardcode_libdir_flag_spec"; then
+            if test -n "$hardcode_libdir_separator"; then
+              if test -z "$hardcode_libdirs"; then
+                # Put the magic libdir with the hardcode flag.
+                hardcode_libdirs="$libdir"
+                libdir="@HARDCODE_LIBDIRS@"
+              else
+                # Just accumulate the unique libdirs.
+		case "$hardcode_libdir_separator$hardcode_libdirs$hardcode_libdir_separator" in
+		*"$hardcode_libdir_separator$libdir$hardcode_libdir_separator"*)
+		  ;;
+		*)
+		  hardcode_libdirs="$hardcode_libdirs$hardcode_libdir_separator$libdir"
+		  ;;
+		esac
+                libdir=
+              fi
+            fi
+
+            if test -n "$libdir"; then
+              eval flag=\"$hardcode_libdir_flag_spec\"
+
+              compile_command="$compile_command $flag"
+              finalize_command="$finalize_command $flag"
+            fi
+          elif test -n "$runpath_var"; then
+            # Do the same for the permanent run path.
+            case "$perm_rpath " in
+            *" $libdir "*) ;;
+            *) perm_rpath="$perm_rpath $libdir" ;;
+            esac
+          fi
+
+
+	  lib_linked=yes
+          case "$hardcode_action" in
+          immediate | unsupported)
+            if test "$hardcode_direct" = no; then
+              compile_command="$compile_command $dir/$linklib"
+            elif test "$hardcode_minus_L" = no; then
+	      case "$host" in
+	      *-*-sunos*)
+                compile_shlibpath="$compile_shlibpath$dir:"
+		;;
+	      esac
+              compile_command="$compile_command -L$dir -l$name"
+            elif test "$hardcode_shlibpath_var" = no; then
+              compile_shlibpath="$compile_shlibpath$dir:"
+              compile_command="$compile_command -l$name"
+	    else
+	      lib_linked=no
+            fi
+            ;;
+
+          relink)
+            # We need an absolute path.
+            case "$dir" in
+            /* | [A-Za-z]:[/\\]*) ;;
+            *)
+              absdir=`cd "$dir" && pwd`
+              if test -z "$absdir"; then
+                $echo "$modename: cannot determine absolute directory name of \`$dir'" 1>&2
+                exit 1
+              fi
+              dir="$absdir"
+              ;;
+            esac
+
+            if test "$hardcode_direct" = yes; then
+              compile_command="$compile_command $dir/$linklib"
+            elif test "$hardcode_minus_L" = yes; then
+              compile_command="$compile_command -L$dir -l$name"
+            elif test "$hardcode_shlibpath_var" = yes; then
+              compile_shlibpath="$compile_shlibpath$dir:"
+              compile_command="$compile_command -l$name"
+	    else
+	      lib_linked=no
+            fi
+            ;;
+
+	  *)
+	    lib_linked=no
+	    ;;
+          esac
+
+	  if test "$lib_linked" != yes; then
+	    $echo "$modename: configuration error: unsupported hardcode properties"
+	    exit 1
+	  fi
+
+          # Finalize command for both is simple: just hardcode it.
+          if test "$hardcode_direct" = yes; then
+            finalize_command="$finalize_command $libdir/$linklib"
+          elif test "$hardcode_minus_L" = yes; then
+            finalize_command="$finalize_command -L$libdir -l$name"
+          elif test "$hardcode_shlibpath_var" = yes; then
+            finalize_shlibpath="$finalize_shlibpath$libdir:"
+            finalize_command="$finalize_command -l$name"
+          else
+            # We cannot seem to hardcode it, guess we'll fake it.
+            finalize_command="$finalize_command -L$libdir -l$name"
+          fi
+        else
+          # Transform directly to old archives if we don't build new libraries.
+          if test -n "$pic_flag" && test -z "$old_library"; then
+            $echo "$modename: cannot find static library for \`$arg'" 1>&2
+            exit 1
+          fi
+
+	  # Here we assume that one of hardcode_direct or hardcode_minus_L
+	  # is not unsupported.  This is valid on all known static and
+	  # shared platforms.
+	  if test "$hardcode_direct" != unsupported; then
+	    test -n "$old_library" && linklib="$old_library"
+	    compile_command="$compile_command $dir/$linklib"
+	    finalize_command="$finalize_command $dir/$linklib"
+	  else
+	    compile_command="$compile_command -L$dir -l$name"
+	    finalize_command="$finalize_command -L$dir -l$name"
+	  fi
+        fi
+
+	# Add in any libraries that this one depends upon.
+	compile_command="$compile_command$dependency_libs"
+	finalize_command="$finalize_command$dependency_libs"
+	continue
+        ;;
+
+      # Some other compiler argument.
+      *)
+	# Unknown arguments in both finalize_command and compile_command need
+	# to be aesthetically quoted because they are evaled later.
+	arg=`$echo "X$arg" | $Xsed -e "$sed_quote_subst"`
+	case "$arg" in
+	*[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \	]*|*]*)
+	  arg="\"$arg\""
+	  ;;
+	esac
+        ;;
+      esac
+
+      # Now actually substitute the argument into the commands.
+      if test -n "$arg"; then
+	compile_command="$compile_command $arg"
+	finalize_command="$finalize_command $arg"
+      fi
+    done
+
+    if test -n "$prev"; then
+      $echo "$modename: the \`$prevarg' option requires an argument" 1>&2
+      $echo "$help" 1>&2
+      exit 1
+    fi
+
+    if test -n "$export_symbols" && test "$module" = yes; then
+      $echo "$modename: \`-export-symbols' is not supported for modules"
+      exit 1
+    fi
+    
+    oldlibs=
+    # calculate the name of the file, without its directory
+    outputname=`$echo "X$output" | $Xsed -e 's%^.*/%%'`
+
+    case "$output" in
+    "")
+      $echo "$modename: you must specify an output file" 1>&2
+      $echo "$help" 1>&2
+      exit 1
+      ;;
+
+    *.a | *.lib)
+      if test -n "$link_against_libtool_libs"; then
+        $echo "$modename: error: cannot link libtool libraries into archives" 1>&2
+        exit 1
+      fi
+
+      if test -n "$deplibs"; then
+        $echo "$modename: warning: \`-l' and \`-L' are ignored for archives" 1>&2
+      fi
+
+      if test -n "$dlfiles$dlprefiles"; then
+        $echo "$modename: warning: \`-dlopen' is ignored for archives" 1>&2
+      fi
+
+      if test -n "$rpath"; then
+        $echo "$modename: warning: \`-rpath' is ignored for archives" 1>&2
+      fi
+
+      if test -n "$vinfo"; then
+        $echo "$modename: warning: \`-version-info' is ignored for archives" 1>&2
+      fi
+
+      if test -n "$release"; then
+        $echo "$modename: warning: \`-release' is ignored for archives" 1>&2
+      fi
+
+      if test -n "$export_symbols"; then
+        $echo "$modename: warning: \`-export-symbols' is ignored for archives" 1>&2
+      fi
+
+      # Now set the variables for building old libraries.
+      build_libtool_libs=no
+      oldlibs="$output"
+      ;;
+
+    *.la)
+      # Make sure we only generate libraries of the form `libNAME.la'.
+      case "$outputname" in
+      lib*) ;;
+      *)
+	$echo "$modename: libtool library \`$output' must begin with \`lib'" 1>&2
+	$echo "$help" 1>&2
+	exit 1
+	;;
+      esac
+
+      name=`$echo "X$outputname" | $Xsed -e 's/\.la$//' -e 's/^lib//'`
+      eval libname=\"$libname_spec\"
+
+      output_objdir=`$echo "X$output" | $Xsed -e 's%/[^/]*$%%'`
+      if test "X$output_objdir" = "X$output"; then
+        output_objdir="$objdir"
+      else
+        output_objdir="$output_objdir/$objdir"
+      fi
+
+      # All the library-specific variables (install_libdir is set above).
+      library_names=
+      old_library=
+      dlname=
+
+      if test -n "$objs"; then
+        $echo "$modename: cannot build libtool library \`$output' from non-libtool objects:$objs" 2>&1
+        exit 1
+      fi
+
+      # How the heck are we supposed to write a wrapper for a shared library?
+      if test -n "$link_against_libtool_libs"; then
+        $echo "$modename: error: cannot link shared libraries into libtool libraries" 1>&2
+        exit 1
+      fi
+
+      if test -n "$dlfiles$dlprefiles"; then
+        $echo "$modename: warning: \`-dlopen' is ignored for libtool libraries" 1>&2
+      fi
+
+      set dummy $rpath
+      if test $# -gt 2; then
+	$echo "$modename: warning: ignoring multiple \`-rpath's for a libtool library" 1>&2
+      fi
+      install_libdir="$2"
+
+      oldlibs=
+      if test -z "$rpath"; then
+	# Building a libtool convenience library.
+        libext=al
+	oldlibs="$output_objdir/$libname.$libext $oldlibs"
+	build_libtool_libs=convenience
+	dependency_libs="$deplibs"
+
+	if test -n "$vinfo"; then
+	  $echo "$modename: warning: \`-version-info' is ignored for convenience libraries" 1>&2
+	fi
+
+	if test -n "$release"; then
+	  $echo "$modename: warning: \`-release' is ignored for convenience libraries" 1>&2
+	fi
+      else
+
+	# Parse the version information argument.
+	IFS="${IFS= 	}"; save_ifs="$IFS"; IFS=':'
+	set dummy $vinfo 0 0 0
+	IFS="$save_ifs"
+
+	if test -n "$8"; then
+	  $echo "$modename: too many parameters to \`-version-info'" 1>&2
+	  $echo "$help" 1>&2
+	  exit 1
+	fi
+
+	current="$2"
+	revision="$3"
+	age="$4"
+
+	# Check that each of the things are valid numbers.
+	case "$current" in
+	0 | [1-9] | [1-9][0-9]*) ;;
+	*)
+	  $echo "$modename: CURRENT \`$current' is not a nonnegative integer" 1>&2
+	  $echo "$modename: \`$vinfo' is not valid version information" 1>&2
+	  exit 1
+	  ;;
+	esac
+
+	case "$revision" in
+	0 | [1-9] | [1-9][0-9]*) ;;
+	*)
+	  $echo "$modename: REVISION \`$revision' is not a nonnegative integer" 1>&2
+	  $echo "$modename: \`$vinfo' is not valid version information" 1>&2
+	  exit 1
+	  ;;
+	esac
+
+	case "$age" in
+	0 | [1-9] | [1-9][0-9]*) ;;
+	*)
+	  $echo "$modename: AGE \`$age' is not a nonnegative integer" 1>&2
+	  $echo "$modename: \`$vinfo' is not valid version information" 1>&2
+	  exit 1
+	  ;;
+	esac
+
+	if test $age -gt $current; then
+	  $echo "$modename: AGE \`$age' is greater than the current interface number \`$current'" 1>&2
+	  $echo "$modename: \`$vinfo' is not valid version information" 1>&2
+	  exit 1
+	fi
+
+	# Calculate the version variables.
+	major=
+	versuffix=
+	verstring=
+	case "$version_type" in
+	none) ;;
+
+	linux)
+	  major=.`expr $current - $age`
+	  versuffix="$major.$age.$revision"
+	  ;;
+
+	osf)
+	  major=`expr $current - $age`
+	  versuffix=".$current.$age.$revision"
+	  verstring="$current.$age.$revision"
+
+	  # Add in all the interfaces that we are compatible with.
+	  loop=$age
+	  while test $loop != 0; do
+	    iface=`expr $current - $loop`
+	    loop=`expr $loop - 1`
+	    verstring="$verstring:${iface}.0"
+	  done
+
+	  # Make executables depend on our current version.
+	  verstring="$verstring:${current}.0"
+	  ;;
+
+	sunos)
+	  major=".$current"
+	  versuffix=".$current.$revision"
+	  ;;
+
+	freebsd-aout)
+	  major=".$current"
+	  versuffix=".$current.$revision";
+	  ;;
+
+	freebsd-elf)
+	  major=".$current"
+	  versuffix=".$current";
+	  ;;
+
+	windows)
+	  # Like Linux, but with '-' rather than '.', since we only
+	  # want one extension on Windows 95.
+	  major=`expr $current - $age`
+	  versuffix="-$major-$age-$revision"
+	  ;;
+
+	*)
+	  $echo "$modename: unknown library version type \`$version_type'" 1>&2
+	  echo "Fatal configuration error.  See the $PACKAGE docs for more information." 1>&2
+	  exit 1
+	  ;;
+	esac
+
+	# Clear the version info if we defaulted, and they specified a release.
+	if test -z "$vinfo" && test -n "$release"; then
+	  major=
+	  versuffix=
+	  verstring="0.0"
+	  case "$host" in
+	  *-*-sunos*)
+	    versuffix=".0.0"
+	    ;;
+	  esac
+	fi
+
+	# Check to see if the archive will have undefined symbols.
+	if test "$allow_undefined" = yes; then
+	  if test "$allow_undefined_flag" = unsupported; then
+	    $echo "$modename: warning: undefined symbols not allowed in $host shared libraries" 1>&2
+	    build_libtool_libs=no
+	    build_old_libs=yes
+	  fi
+	else
+	  # Don't allow undefined symbols.
+	  allow_undefined_flag="$no_undefined_flag"
+	fi
+
+	# Add libc to deplibs on all systems.
+	dependency_libs="$deplibs"
+	deplibs="$deplibs -lc"
+      fi
+
+      # Create the output directory, or remove our outputs if we need to.
+      if test -d $output_objdir; then
+        $show "${rm}r $output_objdir/$outputname $output_objdir/$libname.* $output_objdir/${libname}${release}.*"
+	$run ${rm}r $output_objdir/$outputname $output_objdir/$libname.* $output_objdir/${libname}${release}.*
+      else
+        $show "$mkdir $output_objdir"
+        $run $mkdir $output_objdir
+        status=$?
+        if test $status -ne 0 && test ! -d $output_objdir; then
+          exit $status
+        fi
+      fi
+
+      # Now set the variables for building old libraries.
+      if test "$build_old_libs" = yes && test "$build_libtool_libs" != convenience ; then
+	oldlibs="$oldlibs $output_objdir/$libname.$libext"
+
+	# Transform .lo files to .o files.
+	oldobjs="$objs"`$echo "X$libobjs " | $Xsed -e 's/[^   ]*\.'${libext}' //g' -e "$los2o" -e 's/ $//g'`
+      fi
+
+      if test "$build_libtool_libs" = yes; then
+        # Transform deplibs into only deplibs that can be linked in shared.
+        ## Gordon: Do you check for the existence of the libraries in deplibs
+        ## on the system?  That should maybe be merged in here someplace....
+        ## Actually: I think test_compile and file_magic do this... file_regex
+        ## sorta does this. Only pas_all needs to be changed.  -Toshio
+        name_save=$name
+        libname_save=$libname
+        release_save=$release
+        versuffix_save=$versuffix
+        major_save=$major
+        # I'm not sure if I'm treating the release correctly.  I think
+        # release should show up in the -l (ie -lgmp5) so we don't want to
+        # add it in twice.  Is that correct?
+        release=""
+        versuffix=""
+        major=""
+        newdeplibs=
+        case "$check_shared_deplibs_method" in
+        pass_all)  
+          newdeplibs=$deplibs 
+                    ;; # Don't check for shared/static.  Everything works.
+                       # This might be a little naive.  We might want to check
+                       # whether the library exists or not.  But this is on
+                       # osf3 & osf4 and I'm not really sure... Just
+                       # implementing what was already the behaviour.
+        test_compile)
+          # This code stresses the "libraries are programs" paradigm to its
+          # limits. Maybe even breaks it.  We compile a program, linking it
+          # against the deplibs as a proxy for the library.  Then we can check
+          # whether they linked in statically or dynamically with ldd.
+          $rm conftest.c
+          cat > conftest.c <<EOF
+          int main() { return 0; }
+EOF
+          $rm a.out
+          $C_compiler conftest.c $deplibs
+          if test $? -eq 0 ; then
+            ldd_output=`ldd a.out`
+            for i in $deplibs; do
+              name="`expr $i : '-l\(.*\)'`"
+              # If $name is empty we are operating on a -L argument.
+              if test "$name" != "" ; then
+                libname=`eval \\$echo \"$libname_spec\"`
+                deplib_matches=`eval \\$echo \"$library_names_spec\"`
+                set dummy $deplib_matches
+                deplib_match=$2
+                if test `expr "$ldd_output" : ".*$deplib_match"` -ne 0 ; then
+                  newdeplibs="$newdeplibs $i"
+                else
+                  echo
+                  echo "*** Warning: This library needs some functionality provided by $i."
+                  echo "*** I have the capability to make that library automatically link in when"
+                  echo "*** you link to this library.  But I can only do this if you have a"
+                  echo "*** shared version of the library, which you do not appear to have."
+                fi
+              else
+                newdeplibs="$newdeplibs $i"
+              fi
+            done
+          else
+            # Error occured in the first compile.  Let's try to salvage the situation:
+            # Compile a seperate program for each library.
+            for i in $deplibs; do
+              name="`expr $i : '-l\(.*\)'`"
+             # If $name is empty we are operating on a -L argument.
+              if test "$name" != "" ; then
+                $rm a.out
+                $C_compiler conftest.c $i
+                # Did it work?
+                if test $? -eq 0 ; then
+                  ldd_output=`ldd a.out`
+                    libname=`eval \\$echo \"$libname_spec\"`
+                    deplib_matches=`eval \\$echo \"$library_names_spec\"`
+                    set dummy $deplib_matches
+                    deplib_match=$2
+                    if test `expr "$ldd_output" : ".*$deplib_match"` -ne 0 ; then
+                      newdeplibs="$newdeplibs $i"
+                    else
+                      echo
+                      echo "*** Warning: This library needs some functionality provided by $i."
+                      echo "*** I have the capability to make that library automatically link in when"
+                      echo "*** you link to this library.  But I can only do this if you have a"
+                      echo "*** shared version of the library, which you do not appear to have."
+                    fi
+                else
+                  echo
+                  echo "*** Warning!  Library $i is needed by this library but I was not able to"
+                  echo "***  make it link in!  You will probably need to install it or some"
+                  echo "*** library that it depends on before this library will be fully"
+                  echo "*** functional.  Installing it before continuing would be even better."
+                fi
+              else
+                newdeplibs="$newdeplibs $i"
+              fi
+            done
+          fi
+          deplibs=$newdeplibs
+          ;;
+        file_magic* | file_regex)
+          set dummy $check_shared_deplibs_method
+          file_magic_regex="`expr \"$check_shared_deplibs_method\" : \"$2\(.*\)\"`"
+          for a_deplib in $deplibs; do
+            name="`expr $a_deplib : '-l\(.*\)'`"
+            # If $name is empty we are operating on a -L argument.
+            if test "$name" != "" ; then
+              libname=`eval \\$echo \"$libname_spec\"`
+              case "$check_shared_deplibs_method" in
+                file_magic*)
+                  for i in $lib_search_path; do
+                   # This needs to be more general than file_regex in order to
+                   # catch things like glibc on linux.  Maybe file_regex
+                   # should be more general as well, but maybe not.  Since
+                   # library names are supposed to conform to
+                   # library_name_spec, I think file_regex should remain
+                   # strict.  What do you think Gordon?
+                    potential_libs=`ls $i/$libname[.-]* 2>/dev/null`
+                    for potent_lib in $potential_libs; do
+                      file_output=`file $potent_lib`
+                      if test `expr "$file_output" : ".*$file_magic_regex"` -ne 0 ; then
+                        newdeplibs="$newdeplibs $a_deplib"
+                        a_deplib=""
+                        break 2
+                      fi
+                    done
+                  done
+                  ;;
+                file_regex)
+                  deplib_matches=`eval \\$echo \"$library_names_spec\"`
+                  set dummy $deplib_matches
+                  deplib_match=$2
+                  for i in $lib_search_path; do
+                    potential_libs=`ls $i/$deplib_match* 2>/dev/null`
+                    if test "$potential_libs" != "" ; then
+                      newdeplibs="$newdeplibs $a_deplib"
+                      a_deplib=""
+                      break
+                    fi
+                  done
+                  ;;
+              esac
+              if test "$a_deplib" != "" ; then
+                echo
+                echo "*** Warning: This library needs some functionality provided by $a_deplib."
+                echo "*** I have the capability to make that library automatically link in when"
+                echo "*** you link to this library.  But I can only do this if you have a"
+                echo "*** shared version of the library, which you do not appear to have."
+              fi
+            else
+              # Add a -L argument.
+              newdeplibs="$newdeplibs $a_deplib"
+            fi
+          done # Gone through all deplibs.
+          ;;
+        none | *)  deplibs="" ;;
+        esac
+        versuffix=$versuffix_save
+        major=$major_save
+        release=$release_save
+        libname=$libname_save
+        name=$name_save
+        deplibs=$newdeplibs
+        # Done checking deplibs!
+ 
+	# Get the real and link names of the library.
+	eval library_names=\"$library_names_spec\"
+	set dummy $library_names
+	realname="$2"
+	shift; shift
+
+	if test -n "$soname_spec"; then
+	  eval soname=\"$soname_spec\"
+	else
+	  soname="$realname"
+	fi
+
+	lib="$output_objdir/$realname"
+	for link
+	do
+	  linknames="$linknames $link"
+	done
+
+	# Use standard objects if they are PIC.
+	test -z "$pic_flag" && libobjs=`$echo "X$libobjs " | $Xsed -e "$los2o" -e 's/ $//g'`
+
+	if test -n "$whole_archive_flag_spec"; then
+	  if test -n "$convenience"; then
+	    eval libobjs=\"\$libobjs $whole_archive_flag_spec\"
+	  fi
+	else
+	  for xlib in $convenience; do
+	    # Extract the objects.
+	    xdir="$xlib"x
+	    generated="$generated $xdir"
+	    xlib=`echo "$xlib" | $Xsed -e 's%^.*/%%'`
+
+	    $show "${rm}r $xdir"
+	    $run ${rm}r "$xdir"
+	    $show "mkdir $xdir"
+	    $run mkdir "$xdir"
+	    status=$?
+	    if test $status -ne 0 && test ! -d "$xdir"; then
+	      exit $status
+	    fi
+	    $show "(cd $xdir && $AR x ../$xlib)"
+	    $run eval "(cd \$xdir && $AR x ../\$xlib)" || exit $?
+
+	    libobjs="$libobjs `echo $xdir/*`"
+	  done
+	fi
+
+	# Do each of the archive commands.
+	if test -n "$export_symbols" && test -n "$archive_sym_cmds"; then
+	  eval cmds=\"$archive_sym_cmds\"
+	else
+	  eval cmds=\"$archive_cmds\"
+	fi
+	IFS="${IFS= 	}"; save_ifs="$IFS"; IFS='~'
+	for cmd in $cmds; do
+	  IFS="$save_ifs"
+	  $show "$cmd"
+	  $run eval "$cmd" || exit $?
+	done
+	IFS="$save_ifs"
+
+	# Create links to the real library.
+	for linkname in $linknames; do
+	  if test "$realname" != "$linkname"; then
+	    $show "(cd $output_objdir && $LN_S $realname $linkname)"
+	    $run eval '(cd $output_objdir && $LN_S $realname $linkname)' || exit $?
+	  fi
+	done
+
+	# If -module or -export-dynamic was specified, set the dlname.
+	if test "$module" = yes || test "$export_dynamic" = yes; then
+	  # On all known operating systems, these are identical.
+	  dlname="$soname"
+	fi
+      fi
+      ;;
+
+    *.lo | *.o | *.obj)
+      if test -n "$link_against_libtool_libs"; then
+        $echo "$modename: error: cannot link libtool libraries into objects" 1>&2
+        exit 1
+      fi
+
+      if test -n "$deplibs"; then
+        $echo "$modename: warning: \`-l' and \`-L' are ignored for objects" 1>&2
+      fi
+
+      if test -n "$dlfiles$dlprefiles"; then
+        $echo "$modename: warning: \`-dlopen' is ignored for objects" 1>&2
+      fi
+
+      if test -n "$rpath"; then
+        $echo "$modename: warning: \`-rpath' is ignored for objects" 1>&2
+      fi
+
+      if test -n "$vinfo"; then
+        $echo "$modename: warning: \`-version-info' is ignored for objects" 1>&2
+      fi
+
+      if test -n "$release"; then
+        $echo "$modename: warning: \`-release' is ignored for objects" 1>&2
+      fi
+
+      case "$output" in
+      *.lo)
+        if test -n "$objs"; then
+          $echo "$modename: cannot build library object \`$output' from non-libtool objects" 1>&2
+          exit 1
+        fi
+        libobj="$output"
+        obj=`$echo "X$output" | $Xsed -e "$lo2o"`
+        ;;
+      *)
+        libobj=
+        obj="$output"
+        ;;
+      esac
+
+      # Delete the old objects.
+      $run $rm $obj $libobj
+
+      # Create the old-style object.
+      reload_objs="$objs"`$echo "X$libobjs " | $Xsed -e 's/[^       ]*\.'${libext}' //g' -e 's/[^       ]*\.lib //g' -e "$los2o" -e 's/ $//g'`
+
+      output="$obj"
+      eval cmds=\"$reload_cmds\"
+      IFS="${IFS= 	}"; save_ifs="$IFS"; IFS='~'
+      for cmd in $cmds; do
+        IFS="$save_ifs"
+        $show "$cmd"
+        $run eval "$cmd" || exit $?
+      done
+      IFS="$save_ifs"
+
+      # Exit if we aren't doing a library object file.
+      test -z "$libobj" && exit 0
+
+      if test "$build_libtool_libs" != yes; then
+        # Create an invalid libtool object if no PIC, so that we don't
+        # accidentally link it into a program.
+        $show "echo timestamp > $libobj"
+        $run eval "echo timestamp > $libobj" || exit $?
+        exit 0
+      fi
+
+      if test -n "$pic_flag"; then
+        # Only do commands if we really have different PIC objects.
+        reload_objs="$libobjs"
+        output="$libobj"
+        eval cmds=\"$reload_cmds\"
+        IFS="${IFS= 	}"; save_ifs="$IFS"; IFS='~'
+        for cmd in $cmds; do
+          IFS="$save_ifs"
+          $show "$cmd"
+          $run eval "$cmd" || exit $?
+        done
+        IFS="$save_ifs"
+      else
+        # Just create a symlink.
+        $show "$LN_S $obj $libobj"
+        $run $LN_S $obj $libobj || exit $?
+      fi
+
+      exit 0
+      ;;
+
+    # Anything else should be a program.
+    *)
+      if test -n "$vinfo"; then
+        $echo "$modename: warning: \`-version-info' is ignored for programs" 1>&2
+      fi
+
+      if test -n "$release"; then
+        $echo "$modename: warning: \`-release' is ignored for programs" 1>&2
+      fi
+
+      if test -n "$rpath"; then
+	# If the user specified any rpath flags, then add them.
+	for libdir in $rpath; do
+          if test -n "$hardcode_libdir_flag_spec"; then
+            if test -n "$hardcode_libdir_separator"; then
+              if test -z "$hardcode_libdirs"; then
+                # Put the magic libdir with the hardcode flag.
+                hardcode_libdirs="$libdir"
+                libdir="@HARDCODE_LIBDIRS@"
+              else
+                # Just accumulate the unique libdirs.
+		case "$hardcode_libdir_separator$hardcode_libdirs$hardcode_libdir_separator" in
+		*"$hardcode_libdir_separator$libdir$hardcode_libdir_separator"*)
+		  ;;
+		*)
+		  hardcode_libdirs="$hardcode_libdirs$hardcode_libdir_separator$libdir"
+		  ;;
+		esac
+                libdir=
+              fi
+            fi
+
+            if test -n "$libdir"; then
+              eval flag=\"$hardcode_libdir_flag_spec\"
+
+              compile_command="$compile_command $flag"
+              finalize_command="$finalize_command $flag"
+            fi
+          elif test -n "$runpath_var"; then
+            case "$perm_rpath " in
+            *" $libdir "*) ;;
+            *) perm_rpath="$perm_rpath $libdir" ;;
+            esac
+          fi
+	done
+      fi
+
+      # Substitute the hardcoded libdirs into the compile commands.
+      if test -n "$hardcode_libdir_separator"; then
+	compile_command=`$echo "X$compile_command" | $Xsed -e "s%@HARDCODE_LIBDIRS@%$hardcode_libdirs%g"`
+	finalize_command=`$echo "X$finalize_command" | $Xsed -e "s%@HARDCODE_LIBDIRS@%$hardcode_libdirs%g"`
+      fi
+
+      output_objdir=`$echo "X$output" | $Xsed -e 's%/[^/]*$%%'`
+      if test "X$output_objdir" = "X$output"; then
+        output_objdir="$objdir"
+      else
+        output_objdir="$output_objdir/$objdir"
+      fi
+
+      if test -n "$libobjs" && test "$build_old_libs" = yes; then
+        # Transform all the library objects into standard objects.
+        compile_command=`$echo "X$compile_command " | $Xsed -e "$los2o" -e 's/ $//'`
+        finalize_command=`$echo "X$finalize_command " | $Xsed -e "$los2o" -e 's/ $//'`
+      fi
+
+      if test "$export_dynamic" = yes && test -n "$NM" && test -n "$global_symbol_pipe"; then
+        dlsyms="${outputname}S.c"
+      else
+        dlsyms=
+      fi
+
+      if test -n "$dlsyms"; then
+        case "$dlsyms" in
+        "") ;;
+        *.c)
+          if test -z "$export_symbols"; then
+            # Add our own program objects to the preloaded list.
+            dlprefiles=`$echo "X$objs$dlprefiles " | $Xsed -e "$los2o" -e 's/ $//'`
+          fi
+
+          # Discover the nlist of each of the dlfiles.
+          nlist="$objdir/${output}.nm"
+
+	  if test -d $objdir; then
+	    $show "$rm $nlist ${nlist}T"
+	    $run $rm "$nlist" "${nlist}T"
+	  else
+	    $show "$mkdir $objdir"
+	    $run $mkdir $objdir
+	    status=$?
+	    if test $status -ne 0 && test ! -d $objdir; then
+	      exit $status
+	    fi
+	  fi
+
+          # Parse the name list into a source file.
+          $show "creating $objdir/$dlsyms"
+
+          $echo > "$objdir/$dlsyms" "\
+/* $dlsyms - symbol resolution table for \`$outputname' dlsym emulation. */
+/* Generated by $PROGRAM - GNU $PACKAGE $VERSION */
+
+#ifdef __cplusplus
+extern \"C\" {
+#endif
+
+/* Prevent the only kind of declaration conflicts we can make. */
+#define dld_preloaded_symbols some_other_symbol
+
+/* External symbol declarations for the compiler. */\
+"
+
+          if test -n "$export_symbols"; then
+	    sed -e 's/^\(.*\)/\1 \1/' < "$export_symbols" > "$nlist"
+          fi
+
+          for arg in $dlprefiles; do
+	    $show "extracting global C symbols from \`$arg'"
+	    $run eval "$NM $arg | $global_symbol_pipe >> '$nlist'"
+          done
+
+          if test -z "$run"; then
+	    # Make sure we at least have an empty file.
+	    test -f "$nlist" || : > "$nlist"
+
+	    # Try sorting and uniquifying the output.
+	    if sort "$nlist" | uniq > "$nlist"T; then
+	      mv -f "$nlist"T "$nlist"
+	    else
+	      $rm "$nlist"T
+	    fi
+
+	    if test -f "$nlist"; then
+	      sed -e 's/^.* \(.*\)$/extern char \1;/' < "$nlist" >> "$output_objdir/$dlsyms"
+  	    else
+	      echo '/* NONE */' >> "$output_objdir/$dlsyms"
+  	    fi
+
+	    $echo >> "$output_objdir/$dlsyms" "\
+
+#undef dld_preloaded_symbols
+
+#if defined (__STDC__) && __STDC__
+# define __ptr_t void *
+#else
+# define __ptr_t char *
+#endif
+
+/* The mapping between symbol names and symbols. */
+struct {
+  char *name;
+  __ptr_t address;
+}
+dld_preloaded_symbols[] =
+{\
+"
+
+            if test -n "$export_symbols"; then
+              echo >> "$objdir/$dlsyms" "\
+  {\"${output}\", (__ptr_t) 0},"
+	      sed 's/^\(.*\)/  {"\1", (__ptr_t) \&\1},/' < "$export_symbols" >> "$objdir/$dlsyms"
+            fi
+
+            for arg in $dlprefiles; do
+	      name=`echo "$arg" | sed -e 's%^.*/%%'`
+              echo >> "$objdir/$dlsyms" "\
+  {\"$name\", (__ptr_t) 0},"
+	      eval "$NM $arg | $global_symbol_pipe > '$nlist'"
+
+	      if test -f "$nlist"; then
+	        sed 's/^\(.*\) \(.*\)$/  {"\1", (__ptr_t) \&\2},/' < "$nlist" >> "$objdir/$dlsyms"
+	      else
+		echo '/* NONE */' >> "$output_objdir/$dlsyms"
+	      fi
+
+            done
+
+	    if test -f "$nlist"; then
+	      sed 's/^\(.*\) \(.*\)$/  {"\1", (__ptr_t) \&\2},/' < "$nlist" >> "$output_objdir/$dlsyms"
+	    fi
+
+	    $echo >> "$output_objdir/$dlsyms" "\
+  {0, (__ptr_t) 0}
+};
+
+#ifdef __cplusplus
+}
+#endif\
+"
+          fi
+
+          # Now compile the dynamic symbol file.
+          $show "(cd $objdir && $C_compiler -c$no_builtin_flag \"$dlsyms\")"
+          $run eval '(cd $objdir && $C_compiler -c$no_builtin_flag "$dlsyms")' || exit $?
+
+          # Transform the symbol file into the correct name.
+          compile_command=`$echo "X$compile_command" | $Xsed -e "s%@SYMFILE@%$objdir/${output}S.${objext}%"`
+          finalize_command=`$echo "X$finalize_command" | $Xsed -e "s%@SYMFILE@%$objdir/${output}S.${objext}%"`
+	  ;;
+        *)
+          $echo "$modename: unknown suffix for \`$dlsyms'" 1>&2
+          exit 1
+          ;;
+        esac
+      elif test "$export_dynamic" != yes; then
+        test -n "$dlfiles$dlprefiles" && $echo "$modename: warning: \`-dlopen' and \`-dlpreopen' are ignored without \`-export-dynamic'" 1>&2
+      else
+        # We keep going just in case the user didn't refer to
+        # dld_preloaded_symbols.  The linker will fail if global_symbol_pipe
+        # really was required.
+        $echo "$modename: not configured to extract global symbols from dlpreopened files" 1>&2
+
+        # Nullify the symbol file.
+        compile_command=`$echo "X$compile_command" | $Xsed -e "s% @SYMFILE@%%"`
+        finalize_command=`$echo "X$finalize_command" | $Xsed -e "s% @SYMFILE@%%"`
+      fi
+
+      if test -z "$link_against_libtool_libs" || test "$build_libtool_libs" != yes; then
+        # Replace the output file specification.
+        compile_command=`$echo "X$compile_command" | $Xsed -e 's%@OUTPUT@%'"$output"'%g'`
+        finalize_command=`$echo "X$finalize_command" | $Xsed -e 's%@OUTPUT@%'"$output"'%g'`
+
+        # We have no uninstalled library dependencies, so finalize right now.
+        $show "$compile_command"
+        $run eval "$compile_command"
+        exit $?
+      fi
+
+      # Replace the output file specification.
+      compile_command=`$echo "X$compile_command" | $Xsed -e 's%@OUTPUT@%'"$output_objdir/$outputname"'%g'`
+      finalize_command=`$echo "X$finalize_command" | $Xsed -e 's%@OUTPUT@%'"$output_objdir/$outputname"'T%g'`
+
+      # Create the binary in the object directory, then wrap it.
+      if test ! -d $output_objdir; then
+        $show "$mkdir $output_objdir"
+	$run $mkdir $output_objdir
+	status=$?
+	if test $status -ne 0 && test ! -d $objdir; then
+	  exit $status
+	fi
+      fi
+
+      if test -n "$shlibpath_var"; then
+        # We should set the shlibpath_var
+        rpath=
+        for dir in $temp_rpath; do
+          case "$dir" in
+          /* | [A-Za-z]:[/\\]*)
+            # Absolute path.
+            rpath="$rpath$dir:"
+            ;;
+          *)
+            # Relative path: add a thisdir entry.
+            rpath="$rpath\$thisdir/$dir:"
+            ;;
+          esac
+        done
+        temp_rpath="$rpath"
+      fi
+
+      # Delete the old output file.
+      $run $rm $output
+
+      if test -n "$compile_shlibpath"; then
+        compile_command="$shlibpath_var=\"$compile_shlibpath\$$shlibpath_var\" $compile_command"
+      fi
+      if test -n "$finalize_shlibpath"; then
+        finalize_command="$shlibpath_var=\"$finalize_shlibpath\$$shlibpath_var\" $finalize_command"
+      fi
+
+      if test -n "$runpath_var" && test -n "$perm_rpath"; then
+        # We should set the runpath_var.
+        rpath=
+        for dir in $perm_rpath; do
+          rpath="$rpath$dir:"
+        done
+        compile_command="$runpath_var=\"$rpath\$$runpath_var\" $compile_command"
+        finalize_command="$runpath_var=\"$rpath\$$runpath_var\" $finalize_command"
+      fi
+
+      if test "$hardcode_action" = relink; then
+        # AGH! Flame the AIX and HP-UX people for me, will ya?
+        $echo "$modename: warning: this platform doesn\'t like uninstalled shared libraries" 1>&2
+        $echo "$modename: \`$output' will be relinked during installation" 1>&2
+      fi
+
+      $show "$compile_command"
+      $run eval "$compile_command" || exit $?
+
+      # Now create the wrapper script.
+      $show "creating $output"
+
+      # Quote the finalize command for shipping.
+      finalize_command=`$echo "X$finalize_command" | $Xsed -e "$sed_quote_subst"`
+
+      # Quote $echo for shipping.
+      if test "X$echo" = "X$SHELL $0 --fallback-echo"; then
+	case "$0" in
+	/* | [A-Za-z]:[/\\]*) qecho="$SHELL $0 --fallback-echo";;
+	*) qecho="$SHELL `pwd`/$0 --fallback-echo";;
+	esac
+	qecho=`$echo "X$qecho" | $Xsed -e "$sed_quote_subst"`
+      else
+        qecho=`$echo "X$echo" | $Xsed -e "$sed_quote_subst"`
+      fi
+
+      # Only actually do things if our run command is non-null.
+      if test -z "$run"; then
+        $rm $output
+        trap "$rm $output; exit 1" 1 2 15
+
+        $echo > $output "\
+#! $SHELL
+
+# $output - temporary wrapper script for $objdir/$outputname
+# Generated by $PROGRAM - GNU $PACKAGE $VERSION
+#
+# The $output program cannot be directly executed until all the libtool
+# libraries that it depends on are installed.
+#
+# This wrapper script should never be moved out of the build directory.
+# If it is, it will not operate correctly.
+
+# Sed substitution that helps us do robust quoting.  It backslashifies
+# metacharacters that are still active within double-quoted strings.
+Xsed='sed -e s/^X//'
+sed_quote_subst='$sed_quote_subst'
+
+# The HP-UX ksh and POSIX shell print the target directory to stdout
+# if CDPATH is set.
+if test \"\${CDPATH+set}\" = set; then CDPATH=; export CDPATH; fi
+
+# This environment variable determines our operation mode.
+if test \"\$libtool_install_magic\" = \"$magic\"; then
+  # install mode needs the following variables:
+  link_against_libtool_libs='$link_against_libtool_libs'
+  finalize_command=\"cd `pwd | sed -e $sed_quote_subst`; $finalize_command\"
+else
+  # When we are sourced in execute mode, \$file and \$echo are already set.
+  if test \"\$libtool_execute_magic\" != \"$magic\"; then
+    echo=\"$qecho\"
+    file=\"\$0\"
+    # Make sure echo works.
+    if test \"X\$1\" = X--no-reexec; then
+      # Discard the --no-reexec flag, and continue.
+      shift
+    elif test \"X\`(\$echo '\t') 2>/dev/null\`\" = 'X\t'; then
+      # Yippee, \$echo works!
+      :
+    else
+      # Restart under the correct shell, and then maybe \$echo will work.
+      exec $SHELL \"\$0\" --no-reexec \${1+\"\$@\"}
+    fi
+  fi\
+"
+        $echo >> $output "\
+
+  # Find the directory that this script lives in.
+  thisdir=\`\$echo \"X\$file\" | \$Xsed -e 's%/[^/]*$%%'\`
+  test \"x\$thisdir\" = \"x\$file\" && thisdir=.
+
+  # Follow symbolic links until we get to the real thisdir.
+  file=\`ls -ld \"\$file\" | sed -n 's/.*-> //p'\`
+  while test -n \"\$file\"; do
+    destdir=\`\$echo \"X\$file\" | \$Xsed -e 's%/[^/]*\$%%'\`
+
+    # If there was a directory component, then change thisdir.
+    if test \"x\$destdir\" != \"x\$file\"; then
+      case \"\$destdir\" in
+      /* | [A-Za-z]:[/\\]*) thisdir=\"\$destdir\" ;;
+      *) thisdir=\"\$thisdir/\$destdir\" ;;
+      esac
+    fi
+
+    file=\`\$echo \"X\$file\" | \$Xsed -e 's%^.*/%%'\`
+    file=\`ls -ld \"\$thisdir/\$file\" | sed -n 's/.*-> //p'\`
+  done
+
+  # Try to get the absolute directory name.
+  absdir=\`cd \"\$thisdir\" && pwd\`
+  test -n \"\$absdir\" && thisdir=\"\$absdir\"
+
+  progdir=\"\$thisdir/$objdir\"
+  program='$outputname'
+
+  if test -f \"\$progdir/\$program\"; then"
+
+        # Export our shlibpath_var if we have one.
+        if test -n "$shlibpath_var" && test -n "$temp_rpath"; then
+          $echo >> $output "\
+    # Add our own library path to $shlibpath_var
+    $shlibpath_var=\"$temp_rpath\$$shlibpath_var\"
+
+    # Some systems cannot cope with colon-terminated $shlibpath_var
+    $shlibpath_var=\`\$echo \"X\$$shlibpath_var\" | \$Xsed -e 's/:*\$//'\`
+
+    export $shlibpath_var
+"
+        fi
+
+        $echo >> $output "\
+    if test \"\$libtool_execute_magic\" != \"$magic\"; then
+      # Run the actual program with our arguments.
+
+      # Export the path to the program.
+      PATH=\"\$progdir:\$PATH\"
+      export PATH
+
+      exec \$program \${1+\"\$@\"}
+
+      \$echo \"\$0: cannot exec \$program \${1+\"\$@\"}\"
+      exit 1
+    fi
+  else
+    # The program doesn't exist.
+    \$echo \"\$0: error: \$progdir/\$program does not exist\" 1>&2
+    \$echo \"This script is just a wrapper for \$program.\" 1>&2
+    echo \"See the $PACKAGE documentation for more information.\" 1>&2
+    exit 1
+  fi
+fi\
+"
+        chmod +x $output
+      fi
+      exit 0
+      ;;
+    esac
+
+    # See if we need to build an old-fashioned archive.
+    for oldlib in $oldlibs; do
+
+      if test "$build_libtool_libs" = convenience; then
+	oldobjs="$libobjs"
+	addlibs="$convenience"
+	build_libtool_libs=no
+      else
+	oldobjs="$objs"`$echo "X$libobjs " | $Xsed -e 's/[^   ]*\.'${libext}' //g' -e 's/[^   ]*\.lib //g' -e "$los2o" -e 's/ $//g'`
+	addlibs="$old_convenience"
+      fi
+
+      # Add in members from convenience archives.
+      for xlib in $addlibs; do
+	# Extract the objects.
+	xdir="$xlib"x
+	generated="$generated $xdir"
+	xlib=`echo "$xlib" | $Xsed -e 's%^.*/%%'`
+
+	$show "${rm}r $xdir"
+	$run ${rm}r "$xdir"
+	$show "mkdir $xdir"
+	$run mkdir "$xdir"
+	status=$?
+	if test $status -ne 0 && test ! -d "$xdir"; then
+	  exit $status
+	fi
+	$show "(cd $xdir && $AR x ../$xlib)"
+	$run eval "(cd \$xdir && $AR x ../\$xlib)" || exit $?
+
+	oldobjs="$oldobjs `echo $xdir/*`"
+      done
+
+      # Do each command in the archive commands.
+      if test -n "$old_archive_from_new_cmds" && test "$build_libtool_libs" = yes; then
+	eval cmds=\"$old_archive_from_new_cmds\"
+      else
+	eval cmds=\"$old_archive_cmds\"
+      fi
+      IFS="${IFS= 	}"; save_ifs="$IFS"; IFS='~'
+      for cmd in $cmds; do
+        IFS="$save_ifs"
+        $show "$cmd"
+        $run eval "$cmd" || exit $?
+      done
+      IFS="$save_ifs"
+    done
+
+    if test -n "$generated"; then
+      $show "${rm}r$generated"
+      $run ${rm}r$generated
+    fi
+
+    # Now create the libtool archive.
+    case "$output" in
+    *.la)
+      old_library=
+      test "$build_old_libs" = yes && old_library="$libname.$libext"
+      $show "creating $output"
+
+      # Only create the output if not a dry run.
+      if test -z "$run"; then
+        $echo > $output "\
+# $output - a libtool library file
+# Generated by $PROGRAM - GNU $PACKAGE $VERSION
+
+# The name that we can dlopen(3).
+dlname='$dlname'
+
+# Names of this library.
+library_names='$library_names'
+
+# The name of the static archive.
+old_library='$old_library'
+
+# Libraries that this one depends upon.
+dependency_libs='$dependency_libs'
+
+# Version information for $libname.
+current=$current
+age=$age
+revision=$revision
+
+# Is this an already installed library?
+installed=no
+
+# Directory that this library needs to be installed in:
+libdir='$install_libdir'\
+"
+      fi
+
+      # Do a symbolic link so that the libtool archive can be found in
+      # LD_LIBRARY_PATH before the program is installed.
+      $show "(cd $output_objdir && $LN_S ../$outputname $outputname)"
+      $run eval "(cd $output_objdir && $LN_S ../$outputname $outputname)" || exit $?
+      ;;
+    esac
+    exit 0
+    ;;
+
+  # libtool install mode
+  install)
+    modename="$modename: install"
+
+    # There may be an optional sh(1) argument at the beginning of
+    # install_prog (especially on Windows NT).
+    if test "$nonopt" = "$SHELL" || test "$nonopt" = /bin/sh; then
+      # Aesthetically quote it.
+      arg=`$echo "X$nonopt" | $Xsed -e "$sed_quote_subst"`
+      case "$arg" in
+      *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \	]*|*]*)
+	arg="\"$arg\""
+	;;
+      esac
+      install_prog="$arg "
+      arg="$1"
+      shift
+    else
+      install_prog=
+      arg="$nonopt"
+    fi
+
+    # The real first argument should be the name of the installation program.
+    # Aesthetically quote it.
+    arg=`$echo "X$arg" | $Xsed -e "$sed_quote_subst"`
+    case "$arg" in
+    *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \	]*|*]*)
+      arg="\"$arg\""
+      ;;
+    esac
+    install_prog="$install_prog$arg"
+
+    # We need to accept at least all the BSD install flags.
+    dest=
+    files=
+    opts=
+    prev=
+    install_type=
+    isdir=no
+    stripme=
+    for arg
+    do
+      if test -n "$dest"; then
+        files="$files $dest"
+        dest="$arg"
+        continue
+      fi
+
+      case "$arg" in
+      -d) isdir=yes ;;
+      -f) prev="-f" ;;
+      -g) prev="-g" ;;
+      -m) prev="-m" ;;
+      -o) prev="-o" ;;
+      -s)
+        stripme=" -s"
+        continue
+        ;;
+      -*) ;;
+
+      *)
+        # If the previous option needed an argument, then skip it.
+        if test -n "$prev"; then
+          prev=
+        else
+          dest="$arg"
+          continue
+        fi
+        ;;
+      esac
+
+      # Aesthetically quote the argument.
+      arg=`$echo "X$arg" | $Xsed -e "$sed_quote_subst"`
+      case "$arg" in
+      *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \	]*|*]*)
+	arg="\"$arg\""
+	;;
+      esac
+      install_prog="$install_prog $arg"
+    done
+
+    if test -z "$install_prog"; then
+      $echo "$modename: you must specify an install program" 1>&2
+      $echo "$help" 1>&2
+      exit 1
+    fi
+
+    if test -n "$prev"; then
+      $echo "$modename: the \`$prev' option requires an argument" 1>&2
+      $echo "$help" 1>&2
+      exit 1
+    fi
+
+    if test -z "$files"; then
+      if test -z "$dest"; then
+        $echo "$modename: no file or destination specified" 1>&2
+      else
+        $echo "$modename: you must specify a destination" 1>&2
+      fi
+      $echo "$help" 1>&2
+      exit 1
+    fi
+
+    # Strip any trailing slash from the destination.
+    dest=`$echo "X$dest" | $Xsed -e 's%/$%%'`
+
+    # Check to see that the destination is a directory.
+    test -d "$dest" && isdir=yes
+    if test "$isdir" = yes; then
+      destdir="$dest"
+      destname=
+    else
+      destdir=`$echo "X$dest" | $Xsed -e 's%/[^/]*$%%'`
+      test "X$destdir" = "X$dest" && destdir=.
+      destname=`$echo "X$dest" | $Xsed -e 's%^.*/%%'`
+
+      # Not a directory, so check to see that there is only one file specified.
+      set dummy $files
+      if test $# -gt 2; then
+        $echo "$modename: \`$dest' is not a directory" 1>&2
+        $echo "$help" 1>&2
+        exit 1
+      fi
+    fi
+    case "$destdir" in
+    /* | [A-Za-z]:[/\\]*) ;;
+    *)
+      for file in $files; do
+        case "$file" in
+        *.lo) ;;
+        *)
+          $echo "$modename: \`$destdir' must be an absolute directory name" 1>&2
+          $echo "$help" 1>&2
+          exit 1
+          ;;
+        esac
+      done
+      ;;
+    esac
+
+    # This variable tells wrapper scripts just to set variables rather
+    # than running their programs.
+    libtool_install_magic="$magic"
+
+    staticlibs=
+    future_libdirs=
+    current_libdirs=
+    for file in $files; do
+
+      # Do each installation.
+      case "$file" in
+      *.a | *.lib)
+        # Do the static libraries later.
+        staticlibs="$staticlibs $file"
+        ;;
+
+      *.la)
+        # Check to see that this really is a libtool archive.
+        if (sed -e '2q' $file | egrep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then :
+        else
+          $echo "$modename: \`$file' is not a valid libtool archive" 1>&2
+          $echo "$help" 1>&2
+          exit 1
+        fi
+
+        library_names=
+        old_library=
+        # If there is no directory component, then add one.
+        case "$file" in
+        */* | *\\*) . $file ;;
+        *) . ./$file ;;
+        esac
+
+        # Add the libdir to current_libdirs if it is the destination.
+        if test "X$destdir" = "X$libdir"; then
+          case "$current_libdirs " in
+          *" $libdir "*) ;;
+          *) current_libdirs="$current_libdirs $libdir" ;;
+          esac
+        else
+          # Note the libdir as a future libdir.
+          case "$future_libdirs " in
+          *" $libdir "*) ;;
+          *) future_libdirs="$future_libdirs $libdir" ;;
+          esac
+        fi
+
+        dir="`$echo "X$file" | $Xsed -e 's%/[^/]*$%%'`/"
+        test "X$dir" = "X$file/" && dir=
+        dir="$dir$objdir"
+
+        # See the names of the shared library.
+        set dummy $library_names
+        if test -n "$2"; then
+          realname="$2"
+          shift
+          shift
+
+          # Install the shared library and build the symlinks.
+          $show "$install_prog $dir/$realname $destdir/$realname"
+          $run eval "$install_prog $dir/$realname $destdir/$realname" || exit $?
+          test "X$dlname" = "X$realname" && dlname=
+
+          if test $# -gt 0; then
+            # Delete the old symlinks, and create new ones.
+            for linkname
+            do
+              test "X$dlname" = "X$linkname" && dlname=
+	      if test "$linkname" != "$realname"; then
+		$show "(cd $destdir && $rm $linkname && $LN_S $realname $linkname)"
+		$run eval "(cd $destdir && $rm $linkname && $LN_S $realname $linkname)"
+	      fi
+            done
+          fi
+
+          if test -n "$dlname"; then
+            # Install the dynamically-loadable library.
+            $show "$install_prog $dir/$dlname $destdir/$dlname"
+            $run eval "$install_prog $dir/$dlname $destdir/$dlname" || exit $?
+          fi
+
+          # Do each command in the postinstall commands.
+          lib="$destdir/$realname"
+          eval cmds=\"$postinstall_cmds\"
+          IFS="${IFS= 	}"; save_ifs="$IFS"; IFS='~'
+          for cmd in $cmds; do
+            IFS="$save_ifs"
+            $show "$cmd"
+            $run eval "$cmd" || exit $?
+          done
+          IFS="$save_ifs"
+        fi
+
+        # Install the pseudo-library for information purposes.
+        name=`$echo "X$file" | $Xsed -e 's%^.*/%%'`
+	instname="$dir/$name"i
+	$show "Creating $instname"
+	$rm "$instname"
+	sed 's/^installed=no$/installed=yes/' "$file" > "$instname"
+        $show "$install_prog $instname $destdir/$name"
+        $run eval "$install_prog $instname $destdir/$name" || exit $?
+	$show "$rm $instname"
+	$rm "$instname"
+
+        # Maybe install the static library, too.
+        test -n "$old_library" && staticlibs="$staticlibs $dir/$old_library"
+        ;;
+
+      *.lo)
+        # Install (i.e. copy) a libtool object.
+
+        # Figure out destination file name, if it wasn't already specified.
+        if test -n "$destname"; then
+          destfile="$destdir/$destname"
+        else
+          destfile=`$echo "X$file" | $Xsed -e 's%^.*/%%'`
+          destfile="$destdir/$destfile"
+        fi
+
+        # Deduce the name of the destination old-style object file.
+        case "$destfile" in
+        *.lo)
+          staticdest=`$echo "X$destfile" | $Xsed -e "$lo2o"`
+          ;;
+        *.o | *.obj)
+          staticdest="$destfile"
+          destfile=
+          ;;
+        *)
+          $echo "$modename: cannot copy a libtool object to \`$destfile'" 1>&2
+          $echo "$help" 1>&2
+          exit 1
+          ;;
+        esac
+
+        # Install the libtool object if requested.
+        if test -n "$destfile"; then
+          $show "$install_prog $file $destfile"
+          $run eval "$install_prog $file $destfile" || exit $?
+        fi
+
+        # Install the old object if enabled.
+        if test "$build_old_libs" = yes; then
+          # Deduce the name of the old-style object file.
+          staticobj=`$echo "X$file" | $Xsed -e "$lo2o"`
+
+          $show "$install_prog $staticobj $staticdest"
+          $run eval "$install_prog \$staticobj \$staticdest" || exit $?
+        fi
+        exit 0
+        ;;
+
+      *)
+        # Figure out destination file name, if it wasn't already specified.
+        if test -n "$destname"; then
+          destfile="$destdir/$destname"
+        else
+          destfile=`$echo "X$file" | $Xsed -e 's%^.*/%%'`
+          destfile="$destdir/$destfile"
+        fi
+
+        # Do a test to see if this is really a libtool program.
+        if (sed -e '4q' $file | egrep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then
+          link_against_libtool_libs=
+          finalize_command=
+
+          # If there is no directory component, then add one.
+          case "$file" in
+          */* | *\\*) . $file ;;
+          *) . ./$file ;;
+          esac
+
+          # Check the variables that should have been set.
+          if test -z "$link_against_libtool_libs" || test -z "$finalize_command"; then
+            $echo "$modename: invalid libtool wrapper script \`$file'" 1>&2
+            exit 1
+          fi
+
+          finalize=yes
+          for lib in $link_against_libtool_libs; do
+            # Check to see that each library is installed.
+            libdir=
+            if test -f "$lib"; then
+              # If there is no directory component, then add one.
+              case "$lib" in
+              */* | *\\*) . $lib ;;
+              *) . ./$lib ;;
+              esac
+            fi
+            libfile="$libdir/`$echo "X$lib" | $Xsed -e 's%^.*/%%g'`"
+            if test -n "$libdir" && test ! -f "$libfile"; then
+              $echo "$modename: warning: \`$lib' has not been installed in \`$libdir'" 1>&2
+              finalize=no
+            fi
+          done
+
+          if test "$hardcode_action" = relink; then
+            if test "$finalize" = yes; then
+              $echo "$modename: warning: relinking \`$file' on behalf of your buggy system linker" 1>&2
+              $show "$finalize_command"
+              if $run eval "$finalize_command"; then :
+              else
+                $echo "$modename: error: relink \`$file' with the above command before installing it" 1>&2
+                continue
+              fi
+              file="$objdir/$file"T
+            else
+              $echo "$modename: warning: cannot relink \`$file' on behalf of your buggy system linker" 1>&2
+            fi
+          else
+            # Install the binary that we compiled earlier.
+	    file=`$echo "X$file" | $Xsed -e "s%\([^/]*\)$%$objdir/\1%"`
+          fi
+        fi
+
+        $show "$install_prog$stripme $file $destfile"
+        $run eval "$install_prog\$stripme \$file \$destfile" || exit $?
+        ;;
+      esac
+    done
+
+    for file in $staticlibs; do
+      name=`$echo "X$file" | $Xsed -e 's%^.*/%%'`
+
+      # Set up the ranlib parameters.
+      oldlib="$destdir/$name"
+
+      $show "$install_prog $file $oldlib"
+      $run eval "$install_prog \$file \$oldlib" || exit $?
+
+      # Do each command in the postinstall commands.
+      eval cmds=\"$old_postinstall_cmds\"
+      IFS="${IFS= 	}"; save_ifs="$IFS"; IFS='~'
+      for cmd in $cmds; do
+        IFS="$save_ifs"
+        $show "$cmd"
+        $run eval "$cmd" || exit $?
+      done
+      IFS="$save_ifs"
+    done
+
+    if test -n "$future_libdirs"; then
+      $echo "$modename: warning: remember to run \`$progname --finish$future_libdirs'" 1>&2
+    fi
+
+    if test -n "$current_libdirs"; then
+      # Maybe just do a dry run.
+      test -n "$run" && current_libdirs=" -n$current_libdirs"
+      exec $SHELL $0 --finish$current_libdirs
+      exit 1
+    fi
+
+    exit 0
+    ;;
+
+  # libtool finish mode
+  finish)
+    modename="$modename: finish"
+    libdirs="$nonopt"
+    admincmds=
+
+    if test -n "$finish_cmds$finish_eval" && test -n "$libdirs"; then
+      for dir
+      do
+        libdirs="$libdirs $dir"
+      done
+
+      for libdir in $libdirs; do
+	if test -n "$finish_cmds"; then
+	  # Do each command in the finish commands.
+	  eval cmds=\"$finish_cmds\"
+          IFS="${IFS= 	}"; save_ifs="$IFS"; IFS='~'
+          for cmd in $cmds; do
+            IFS="$save_ifs"
+            $show "$cmd"
+            $run eval "$cmd" || admincmds="$admincmds
+       $cmd"
+          done
+          IFS="$save_ifs"
+	fi
+	if test -n "$finish_eval"; then
+	  # Do the single finish_eval.
+	  eval cmds=\"$finish_eval\"
+	  $run eval "$cmds" || admincmds="$admincmds
+       $cmds"
+	fi
+      done
+    fi
+
+    # Exit here if they wanted silent mode.
+    test "$show" = : && exit 0
+
+    echo "----------------------------------------------------------------------"
+    echo "Libraries have been installed in:"
+    for libdir in $libdirs; do
+      echo "   $libdir"
+    done
+    echo
+    echo "To link against installed libraries in a given directory, LIBDIR,"
+    echo "you must use the \`-LLIBDIR' flag during linking."
+    echo
+    echo " You will also need to do at least one of the following:"
+    if test -n "$shlibpath_var"; then
+      echo "   - add LIBDIR to the \`$shlibpath_var' environment variable"
+      echo "     during execution"
+    fi
+    if test -n "$runpath_var"; then
+      echo "   - add LIBDIR to the \`$runpath_var' environment variable"
+      echo "     during linking"
+    fi
+    if test -n "$hardcode_libdir_flag_spec"; then
+      libdir=LIBDIR
+      eval flag=\"$hardcode_libdir_flag_spec\"
+
+      echo "   - use the \`$flag' linker flag"
+    fi
+    if test -n "$admincmds"; then
+      echo "   - have your system administrator run these commands:$admincmds"
+    fi
+    if test -f /etc/ld.so.conf; then
+      echo "   - have your system administrator add LIBDIR to \`/etc/ld.so.conf'"
+    fi
+    echo
+    echo "See any operating system documentation about shared libraries for"
+    echo "more information, such as the ld(1) and ld.so(8) manual pages."
+    echo "----------------------------------------------------------------------"
+    exit 0
+    ;;
+
+  # libtool execute mode
+  execute)
+    modename="$modename: execute"
+
+    # The first argument is the command name.
+    cmd="$nonopt"
+    if test -z "$cmd"; then
+      $echo "$modename: you must specify a COMMAND" 1>&2
+      $echo "$help"
+      exit 1
+    fi
+
+    # Handle -dlopen flags immediately.
+    for file in $execute_dlfiles; do
+      if test ! -f "$file"; then
+	$echo "$modename: \`$file' is not a file" 1>&2
+	$echo "$help" 1>&2
+	exit 1
+      fi
+
+      dir=
+      case "$file" in
+      *.la)
+        # Check to see that this really is a libtool archive.
+        if (sed -e '2q' $file | egrep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then :
+        else
+          $echo "$modename: \`$lib' is not a valid libtool archive" 1>&2
+          $echo "$help" 1>&2
+          exit 1
+        fi
+
+	# Read the libtool library.
+	dlname=
+	library_names=
+
+        # If there is no directory component, then add one.
+	case "$file" in
+	*/* | *\\*) . $file ;;
+        *) . ./$file ;;
+	esac
+
+	# Skip this library if it cannot be dlopened.
+	if test -z "$dlname"; then
+	  # Warn if it was a shared library.
+	  test -n "$library_names" && $echo "$modename: warning: \`$file' was not linked with \`-export-dynamic'"
+	  continue
+	fi
+
+	dir=`$echo "X$file" | $Xsed -e 's%/[^/]*$%%'`
+	test "X$dir" = "X$file" && dir=.
+
+	if test -f "$dir/$objdir/$dlname"; then
+	  dir="$dir/$objdir"
+	else
+	  $echo "$modename: cannot find \`$dlname' in \`$dir' or \`$dir/$objdir'" 1>&2
+	  exit 1
+	fi
+	;;
+
+      *.lo)
+	# Just add the directory containing the .lo file.
+	dir=`$echo "X$file" | $Xsed -e 's%/[^/]*$%%'`
+	test "X$dir" = "X$file" && dir=.
+	;;
+
+      *)
+	$echo "$modename: warning \`-dlopen' is ignored for non-libtool libraries and objects" 1>&2
+        continue
+	;;
+      esac
+
+      # Get the absolute pathname.
+      absdir=`cd "$dir" && pwd`
+      test -n "$absdir" && dir="$absdir"
+
+      # Now add the directory to shlibpath_var.
+      if eval "test -z \"\$$shlibpath_var\""; then
+	eval "$shlibpath_var=\"\$dir\""
+      else
+	eval "$shlibpath_var=\"\$dir:\$$shlibpath_var\""
+      fi
+    done
+
+    # This variable tells wrapper scripts just to set shlibpath_var
+    # rather than running their programs.
+    libtool_execute_magic="$magic"
+
+    # Check if any of the arguments is a wrapper script.
+    args=
+    for file
+    do
+      case "$file" in
+      -*) ;;
+      *)
+        # Do a test to see if this is really a libtool program.
+        if (sed -e '4q' $file | egrep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then
+	  # If there is no directory component, then add one.
+	  case "$file" in
+	  */* | *\\*) . $file ;;
+	  *) . ./$file ;;
+	  esac
+
+	  # Transform arg to wrapped name.
+	  file="$progdir/$program"
+	fi
+        ;;
+      esac
+      # Quote arguments (to preserve shell metacharacters).
+      file=`$echo "X$file" | $Xsed -e "$sed_quote_subst"`
+      args="$args \"$file\""
+    done
+
+    if test -z "$run"; then
+      # Export the shlibpath_var.
+      eval "export $shlibpath_var"
+
+      # Restore saved enviroment variables
+      if test "${save_LC_ALL+set}" = set; then
+        LC_ALL="$save_LC_ALL"; export LC_ALL
+      fi
+      if test "${save_LANG+set}" = set; then
+        LANG="$save_LANG"; export LANG
+      fi
+
+      # Now actually exec the command.
+      eval "exec \$cmd$args"
+
+      $echo "$modename: cannot exec \$cmd$args"
+      exit 1
+    else
+      # Display what would be done.
+      eval "\$echo \"\$shlibpath_var=\$$shlibpath_var\""
+      $echo "export $shlibpath_var"
+      $echo "$cmd$args"
+      exit 0
+    fi
+    ;;
+
+  # libtool uninstall mode
+  uninstall)
+    modename="$modename: uninstall"
+    rm="$nonopt"
+    files=
+
+    for arg
+    do
+      case "$arg" in
+      -*) rm="$rm $arg" ;;
+      *) files="$files $arg" ;;
+      esac
+    done
+
+    if test -z "$rm"; then
+      $echo "$modename: you must specify an RM program" 1>&2
+      $echo "$help" 1>&2
+      exit 1
+    fi
+
+    for file in $files; do
+      dir=`$echo "X$file" | $Xsed -e 's%/[^/]*$%%'`
+      test "X$dir" = "X$file" && dir=.
+      name=`$echo "X$file" | $Xsed -e 's%^.*/%%'`
+
+      rmfiles="$file"
+
+      case "$name" in
+      *.la)
+        # Possibly a libtool archive, so verify it.
+        if (sed -e '2q' $file | egrep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then
+          . $dir/$name
+
+          # Delete the libtool libraries and symlinks.
+          for n in $library_names; do
+            rmfiles="$rmfiles $dir/$n"
+            test "X$n" = "X$dlname" && dlname=
+          done
+          test -n "$dlname" && rmfiles="$rmfiles $dir/$dlname"
+          test -n "$old_library" && rmfiles="$rmfiles $dir/$old_library"
+
+	  $show "$rm $rmfiles"
+	  $run $rm $rmfiles
+
+	  if test -n "$library_names"; then
+	    # Do each command in the postuninstall commands.
+	    eval cmds=\"$postuninstall_cmds\"
+	    IFS="${IFS= 	}"; save_ifs="$IFS"; IFS='~'
+	    for cmd in $cmds; do
+	      IFS="$save_ifs"
+	      $show "$cmd"
+	      $run eval "$cmd"
+	    done
+	    IFS="$save_ifs"
+	  fi
+
+          if test -n "$old_library"; then
+	    # Do each command in the old_postuninstall commands.
+	    eval cmds=\"$old_postuninstall_cmds\"
+	    IFS="${IFS= 	}"; save_ifs="$IFS"; IFS='~'
+	    for cmd in $cmds; do
+	      IFS="$save_ifs"
+	      $show "$cmd"
+	      $run eval "$cmd"
+	    done
+	    IFS="$save_ifs"
+	  fi
+
+          # FIXME: should reinstall the best remaining shared library.
+        fi
+        ;;
+
+      *.lo)
+        if test "$build_old_libs" = yes; then
+          oldobj=`$echo "X$name" | $Xsed -e "$lo2o"`
+          rmfiles="$rmfiles $dir/$oldobj"
+        fi
+	$show "$rm $rmfiles"
+	$run $rm $rmfiles
+        ;;
+
+      *)
+      	$show "$rm $rmfiles"
+	$run $rm $rmfiles
+	;;
+      esac
+    done
+    exit 0
+    ;;
+
+  "")
+    $echo "$modename: you must specify a MODE" 1>&2
+    $echo "$generic_help" 1>&2
+    exit 1
+    ;;
+  esac
+
+  $echo "$modename: invalid operation mode \`$mode'" 1>&2
+  $echo "$generic_help" 1>&2
+  exit 1
+fi # test -z "$show_help"
+
+# We need to display help for each of the modes.
+case "$mode" in
+"") $echo \
+"Usage: $modename [OPTION]... [MODE-ARG]...
+
+Provide generalized library-building support services.
+
+    --config          show all configuration variables
+    --debug           enable verbose shell tracing
+-n, --dry-run         display commands without modifying any files
+    --features        display basic configuration information and exit
+    --finish          same as \`--mode=finish'
+    --help            display this help message and exit
+    --mode=MODE       use operation mode MODE [default=inferred from MODE-ARGS]
+    --quiet           same as \`--silent'
+    --silent          don't print informational messages
+    --version         print version information
+
+MODE must be one of the following:
+
+      compile         compile a source file into a libtool object
+      execute         automatically set library path, then run a program
+      finish          complete the installation of libtool libraries
+      install         install libraries or executables
+      link            create a library or an executable
+      uninstall       remove libraries from an installed directory
+
+MODE-ARGS vary depending on the MODE.  Try \`$modename --help --mode=MODE' for
+a more detailed description of MODE."
+  exit 0
+  ;;
+
+compile)
+  $echo \
+"Usage: $modename [OPTION]... --mode=compile COMPILE-COMMAND... SOURCEFILE
+
+Compile a source file into a libtool library object.
+
+This mode accepts the following additional options:
+
+  -static           always build a \`.o' file suitable for static linking
+
+COMPILE-COMMAND is a command to be used in creating a \`standard' object file
+from the given SOURCEFILE.
+
+The output file name is determined by removing the directory component from
+SOURCEFILE, then substituting the C source code suffix \`.c' with the
+library object suffix, \`.lo'."
+  ;;
+
+execute)
+  $echo \
+"Usage: $modename [OPTION]... --mode=execute COMMAND [ARGS]...
+
+Automatically set library path, then run a program.
+
+This mode accepts the following additional options:
+
+  -dlopen FILE      add the directory containing FILE to the library path
+
+This mode sets the library path environment variable according to \`-dlopen'
+flags.
+
+If any of the ARGS are libtool executable wrappers, then they are translated
+into their corresponding uninstalled binary, and any of their required library
+directories are added to the library path.
+
+Then, COMMAND is executed, with ARGS as arguments."
+  ;;
+
+finish)
+  $echo \
+"Usage: $modename [OPTION]... --mode=finish [LIBDIR]...
+
+Complete the installation of libtool libraries.
+
+Each LIBDIR is a directory that contains libtool libraries.
+
+The commands that this mode executes may require superuser privileges.  Use
+the \`--dry-run' option if you just want to see what would be executed."
+  ;;
+
+install)
+  $echo \
+"Usage: $modename [OPTION]... --mode=install INSTALL-COMMAND...
+
+Install executables or libraries.
+
+INSTALL-COMMAND is the installation command.  The first component should be
+either the \`install' or \`cp' program.
+
+The rest of the components are interpreted as arguments to that command (only
+BSD-compatible install options are recognized)."
+  ;;
+
+link)
+  $echo \
+"Usage: $modename [OPTION]... --mode=link LINK-COMMAND...
+
+Link object files or libraries together to form another library, or to
+create an executable program.
+
+LINK-COMMAND is a command using the C compiler that you would use to create
+a program from several object files.
+
+The following components of LINK-COMMAND are treated specially:
+
+  -all-static       do not do any dynamic linking at all
+  -dlopen FILE      \`-dlpreopen' FILE if it cannot be dlopened at runtime
+  -dlpreopen FILE   link in FILE and add its symbols to dld_preloaded_symbols
+  -export-dynamic   allow symbols from OUTPUT-FILE to be resolved with dlsym(3)
+  -LLIBDIR          search LIBDIR for required installed libraries
+  -lNAME            OUTPUT-FILE requires the installed library libNAME
+  -no-undefined     declare that a library does not refer to external symbols
+  -o OUTPUT-FILE    create OUTPUT-FILE from the specified objects
+  -release RELEASE  specify package release information
+  -rpath LIBDIR     the created library will eventually be installed in LIBDIR
+  -static           do not do any dynamic linking of libtool libraries
+  -version-info CURRENT[:REVISION[:AGE]]
+                    specify library version info [each variable defaults to 0]
+
+All other options (arguments beginning with \`-') are ignored.
+
+Every other argument is treated as a filename.  Files ending in \`.la' are
+treated as uninstalled libtool libraries, other files are standard or library
+object files.
+
+If the OUTPUT-FILE ends in \`.la', then a libtool library is created, only
+library objects (\`.lo' files) may be specified, and \`-rpath' is required.
+
+If OUTPUT-FILE ends in \`.a' or \`.lib', then a standard library is created
+using \`ar' and \`ranlib', or on Windows using \`lib'.
+
+If OUTPUT-FILE ends in \`.lo' or \`.${objext}', then a reloadable object file
+is created, otherwise an executable program is created."
+  ;;
+
+uninstall)
+  $echo
+"Usage: $modename [OPTION]... --mode=uninstall RM [RM-OPTION]... FILE...
+
+Remove libraries from an installation directory.
+
+RM is the name of the program to use to delete files associated with each FILE
+(typically \`/bin/rm').  RM-OPTIONS are options (such as \`-f') to be passed
+to RM.
+
+If FILE is a libtool library, all the files associated with it are deleted.
+Otherwise, only FILE itself is deleted using RM."
+  ;;
+
+*)
+  $echo "$modename: invalid operation mode \`$mode'" 1>&2
+  $echo "$help" 1>&2
+  exit 1
+  ;;
+esac
+
+echo
+$echo "Try \`$modename --help' for more information about other modes."
+
+exit 0
+
+# Local Variables:
+# mode:shell-script
+# sh-indentation:2
+# End:
-- 
Gitee


From 1cf05834b308dd152c8a43434e8d527d7da374dc Mon Sep 17 00:00:00 2001
From: Jeff Johnson <n3npq@mac.com>
Date: Fri, 22 Jan 1999 22:20:45 +0000
Subject: [PATCH 156/667] Do only string replacement (w/o -C) in %configure for
 now.

---
 Makefile.am | 2 +-
 Makefile.in | 5 +++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index c897002..a929c90 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -13,7 +13,7 @@ noinst_INCLUDES = findme.h poptint.h
 
 noinst_PROGRAMS = test1
 test1_SOURCES = test1.c
-test1_LDADD = -lpopt
+test1_LDADD = $(lib_LTLIBRARIES)
 
 include_HEADERS = popt.h
 lib_LTLIBRARIES = libpopt.la
diff --git a/Makefile.in b/Makefile.in
index 885680a..c2d52e3 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -89,7 +89,7 @@ noinst_INCLUDES = findme.h poptint.h
 
 noinst_PROGRAMS = test1
 test1_SOURCES = test1.c
-test1_LDADD = -lpopt
+test1_LDADD = $(lib_LTLIBRARIES)
 
 include_HEADERS = popt.h
 lib_LTLIBRARIES = libpopt.la
@@ -106,6 +106,7 @@ LTLIBRARIES =  $(lib_LTLIBRARIES)
 
 DEFS = @DEFS@ -I. -I$(srcdir) -I.
 CPPFLAGS = @CPPFLAGS@
+LDFLAGS = @LDFLAGS@
 LIBS = @LIBS@
 libpopt_la_LDFLAGS = 
 libpopt_la_LIBADD = 
@@ -114,7 +115,7 @@ popthelp.lo
 PROGRAMS =  $(noinst_PROGRAMS)
 
 test1_OBJECTS =  test1.o
-test1_DEPENDENCIES = 
+test1_DEPENDENCIES =  libpopt.la
 test1_LDFLAGS = 
 CFLAGS = @CFLAGS@
 COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-- 
Gitee


From da75525c7d98d92d5a3e25458113ac71911b9562 Mon Sep 17 00:00:00 2001
From: Jeff Johnson <n3npq@mac.com>
Date: Sun, 24 Jan 1999 19:40:43 +0000
Subject: [PATCH 157/667] Eliminate files that can be regenerated.

---
 autogen.sh |    1 +
 config.sub |  955 ----------------
 ltconfig   | 2101 -----------------------------------
 ltmain.sh  | 3079 ----------------------------------------------------
 4 files changed, 1 insertion(+), 6135 deletions(-)
 delete mode 100755 config.sub
 delete mode 100755 ltconfig
 delete mode 100644 ltmain.sh

diff --git a/autogen.sh b/autogen.sh
index d5f4d10..f443c3e 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -1,5 +1,6 @@
 #!/bin/sh
 
+libtoolize --copy
 autoheader
 autoconf
 
diff --git a/config.sub b/config.sub
deleted file mode 100755
index ba26d74..0000000
--- a/config.sub
+++ /dev/null
@@ -1,955 +0,0 @@
-#! /bin/sh
-# Configuration validation subroutine script, version 1.1.
-#   Copyright (C) 1991, 92-97, 1998 Free Software Foundation, Inc.
-# This file is (in principle) common to ALL GNU software.
-# The presence of a machine in this file suggests that SOME GNU software
-# can handle that machine.  It does not imply ALL GNU software can.
-#
-# This file is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330,
-# Boston, MA 02111-1307, USA.
-
-# As a special exception to the GNU General Public License, if you
-# distribute this file as part of a program that contains a
-# configuration script generated by Autoconf, you may include it under
-# the same distribution terms that you use for the rest of that program.
-
-# Configuration subroutine to validate and canonicalize a configuration type.
-# Supply the specified configuration type as an argument.
-# If it is invalid, we print an error message on stderr and exit with code 1.
-# Otherwise, we print the canonical config type on stdout and succeed.
-
-# This file is supposed to be the same for all GNU packages
-# and recognize all the CPU types, system types and aliases
-# that are meaningful with *any* GNU software.
-# Each package is responsible for reporting which valid configurations
-# it does not support.  The user should be able to distinguish
-# a failure to support a valid configuration from a meaningless
-# configuration.
-
-# The goal of this file is to map all the various variations of a given
-# machine specification into a single specification in the form:
-#	CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM
-# or in some cases, the newer four-part form:
-#	CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM
-# It is wrong to echo any other type of specification.
-
-if [ x$1 = x ]
-then
-	echo Configuration name missing. 1>&2
-	echo "Usage: $0 CPU-MFR-OPSYS" 1>&2
-	echo "or     $0 ALIAS" 1>&2
-	echo where ALIAS is a recognized configuration type. 1>&2
-	exit 1
-fi
-
-# First pass through any local machine types.
-case $1 in
-	*local*)
-		echo $1
-		exit 0
-		;;
-	*)
-	;;
-esac
-
-# Separate what the user gave into CPU-COMPANY and OS or KERNEL-OS (if any).
-# Here we must recognize all the valid KERNEL-OS combinations.
-maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'`
-case $maybe_os in
-  linux-gnu*)
-    os=-$maybe_os
-    basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`
-    ;;
-  *)
-    basic_machine=`echo $1 | sed 's/-[^-]*$//'`
-    if [ $basic_machine != $1 ]
-    then os=`echo $1 | sed 's/.*-/-/'`
-    else os=; fi
-    ;;
-esac
-
-### Let's recognize common machines as not being operating systems so
-### that things like config.sub decstation-3100 work.  We also
-### recognize some manufacturers as not being operating systems, so we
-### can provide default operating systems below.
-case $os in
-	-sun*os*)
-		# Prevent following clause from handling this invalid input.
-		;;
-	-dec* | -mips* | -sequent* | -encore* | -pc532* | -sgi* | -sony* | \
-	-att* | -7300* | -3300* | -delta* | -motorola* | -sun[234]* | \
-	-unicom* | -ibm* | -next | -hp | -isi* | -apollo | -altos* | \
-	-convergent* | -ncr* | -news | -32* | -3600* | -3100* | -hitachi* |\
-	-c[123]* | -convex* | -sun | -crds | -omron* | -dg | -ultra | -tti* | \
-	-harris | -dolphin | -highlevel | -gould | -cbm | -ns | -masscomp | \
-	-apple)
-		os=
-		basic_machine=$1
-		;;
-	-hiux*)
-		os=-hiuxwe2
-		;;
-	-sco5)
-		os=sco3.2v5
-		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
-		;;
-	-sco4)
-		os=-sco3.2v4
-		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
-		;;
-	-sco3.2.[4-9]*)
-		os=`echo $os | sed -e 's/sco3.2./sco3.2v/'`
-		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
-		;;
-	-sco3.2v[4-9]*)
-		# Don't forget version if it is 3.2v4 or newer.
-		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
-		;;
-	-sco*)
-		os=-sco3.2v2
-		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
-		;;
-	-isc)
-		os=-isc2.2
-		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
-		;;
-	-clix*)
-		basic_machine=clipper-intergraph
-		;;
-	-isc*)
-		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
-		;;
-	-lynx*)
-		os=-lynxos
-		;;
-	-ptx*)
-		basic_machine=`echo $1 | sed -e 's/86-.*/86-sequent/'`
-		;;
-	-windowsnt*)
-		os=`echo $os | sed -e 's/windowsnt/winnt/'`
-		;;
-	-psos*)
-		os=-psos
-		;;
-esac
-
-# Decode aliases for certain CPU-COMPANY combinations.
-case $basic_machine in
-	# Recognize the basic CPU types without company name.
-	# Some are omitted here because they have special meanings below.
-	tahoe | i860 | m32r | m68k | m68000 | m88k | ns32k | arc | arm \
-		| arme[lb] | pyramid | mn10200 | mn10300 | tron | a29k \
-		| 580 | i960 | h8300 | hppa | hppa1.0 | hppa1.1 | hppa2.0 \
-		| alpha | alphaev5 | alphaev56 | we32k | ns16k | clipper \
-		| i370 | sh | powerpc | powerpcle | 1750a | dsp16xx | pdp11 \
-		| mips64 | mipsel | mips64el | mips64orion | mips64orionel \
-		| mipstx39 | mipstx39el | armv[34][lb] \
-		| sparc | sparclet | sparclite | sparc64 | v850)
-		basic_machine=$basic_machine-unknown
-		;;
-	# We use `pc' rather than `unknown'
-	# because (1) that's what they normally are, and
-	# (2) the word "unknown" tends to confuse beginning users.
-	i[34567]86)
-	  basic_machine=$basic_machine-pc
-	  ;;
-	# Object if more than one company name word.
-	*-*-*)
-		echo Invalid configuration \`$1\': machine \`$basic_machine\' not recognized 1>&2
-		exit 1
-		;;
-	# Recognize the basic CPU types with company name.
-	vax-* | tahoe-* | i[34567]86-* | i860-* | m32r-* | m68k-* | m68000-* \
-	      | m88k-* | sparc-* | ns32k-* | fx80-* | arc-* | arm-* | c[123]* \
-	      | mips-* | pyramid-* | tron-* | a29k-* | romp-* | rs6000-* \
-	      | power-* | none-* | 580-* | cray2-* | h8300-* | i960-* \
-	      | xmp-* | ymp-* | hppa-* | hppa1.0-* | hppa1.1-* | hppa2.0-* \
-	      | alpha-* | alphaev5-* | alphaev56-* | we32k-* | cydra-* \
-	      | ns16k-* | pn-* | np1-* | xps100-* | clipper-* | orion-* \
-	      | sparclite-* | pdp11-* | sh-* | powerpc-* | powerpcle-* \
-	      | sparc64-* | mips64-* | mipsel-* | armv[34][lb]-*\
-	      | mips64el-* | mips64orion-* | mips64orionel-*  \
-	      | mipstx39-* | mipstx39el-* \
-	      | f301-*)
-		;;
-	# Recognize the various machine names and aliases which stand
-	# for a CPU type and a company and sometimes even an OS.
-	3b1 | 7300 | 7300-att | att-7300 | pc7300 | safari | unixpc)
-		basic_machine=m68000-att
-		;;
-	3b*)
-		basic_machine=we32k-att
-		;;
-	alliant | fx80)
-		basic_machine=fx80-alliant
-		;;
-	altos | altos3068)
-		basic_machine=m68k-altos
-		;;
-	am29k)
-		basic_machine=a29k-none
-		os=-bsd
-		;;
-	amdahl)
-		basic_machine=580-amdahl
-		os=-sysv
-		;;
-	amiga | amiga-*)
-		basic_machine=m68k-cbm
-		;;
-	amigaos | amigados)
-		basic_machine=m68k-cbm
-		os=-amigaos
-		;;
-	amigaunix | amix)
-		basic_machine=m68k-cbm
-		os=-sysv4
-		;;
-	apollo68)
-		basic_machine=m68k-apollo
-		os=-sysv
-		;;
-	aux)
-		basic_machine=m68k-apple
-		os=-aux
-		;;
-	balance)
-		basic_machine=ns32k-sequent
-		os=-dynix
-		;;
-	convex-c1)
-		basic_machine=c1-convex
-		os=-bsd
-		;;
-	convex-c2)
-		basic_machine=c2-convex
-		os=-bsd
-		;;
-	convex-c32)
-		basic_machine=c32-convex
-		os=-bsd
-		;;
-	convex-c34)
-		basic_machine=c34-convex
-		os=-bsd
-		;;
-	convex-c38)
-		basic_machine=c38-convex
-		os=-bsd
-		;;
-	cray | ymp)
-		basic_machine=ymp-cray
-		os=-unicos
-		;;
-	cray2)
-		basic_machine=cray2-cray
-		os=-unicos
-		;;
-	[ctj]90-cray)
-		basic_machine=c90-cray
-		os=-unicos
-		;;
-	crds | unos)
-		basic_machine=m68k-crds
-		;;
-	da30 | da30-*)
-		basic_machine=m68k-da30
-		;;
-	decstation | decstation-3100 | pmax | pmax-* | pmin | dec3100 | decstatn)
-		basic_machine=mips-dec
-		;;
-	delta | 3300 | motorola-3300 | motorola-delta \
-	      | 3300-motorola | delta-motorola)
-		basic_machine=m68k-motorola
-		;;
-	delta88)
-		basic_machine=m88k-motorola
-		os=-sysv3
-		;;
-	dpx20 | dpx20-*)
-		basic_machine=rs6000-bull
-		os=-bosx
-		;;
-	dpx2* | dpx2*-bull)
-		basic_machine=m68k-bull
-		os=-sysv3
-		;;
-	ebmon29k)
-		basic_machine=a29k-amd
-		os=-ebmon
-		;;
-	elxsi)
-		basic_machine=elxsi-elxsi
-		os=-bsd
-		;;
-	encore | umax | mmax)
-		basic_machine=ns32k-encore
-		;;
-	fx2800)
-		basic_machine=i860-alliant
-		;;
-	genix)
-		basic_machine=ns32k-ns
-		;;
-	gmicro)
-		basic_machine=tron-gmicro
-		os=-sysv
-		;;
-	h3050r* | hiux*)
-		basic_machine=hppa1.1-hitachi
-		os=-hiuxwe2
-		;;
-	h8300hms)
-		basic_machine=h8300-hitachi
-		os=-hms
-		;;
-	harris)
-		basic_machine=m88k-harris
-		os=-sysv3
-		;;
-	hp300-*)
-		basic_machine=m68k-hp
-		;;
-	hp300bsd)
-		basic_machine=m68k-hp
-		os=-bsd
-		;;
-	hp300hpux)
-		basic_machine=m68k-hp
-		os=-hpux
-		;;
-	hp9k2[0-9][0-9] | hp9k31[0-9])
-		basic_machine=m68000-hp
-		;;
-	hp9k3[2-9][0-9])
-		basic_machine=m68k-hp
-		;;
-	hp9k7[0-9][0-9] | hp7[0-9][0-9] | hp9k8[0-9]7 | hp8[0-9]7)
-		basic_machine=hppa1.1-hp
-		;;
-	hp9k8[0-9][0-9] | hp8[0-9][0-9])
-		basic_machine=hppa1.0-hp
-		;;
-	hppa-next)
-		os=-nextstep3
-		;;
-	i370-ibm* | ibm*)
-		basic_machine=i370-ibm
-		os=-mvs
-		;;
-# I'm not sure what "Sysv32" means.  Should this be sysv3.2?
-	i[34567]86v32)
-		basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
-		os=-sysv32
-		;;
-	i[34567]86v4*)
-		basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
-		os=-sysv4
-		;;
-	i[34567]86v)
-		basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
-		os=-sysv
-		;;
-	i[34567]86sol2)
-		basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
-		os=-solaris2
-		;;
-	iris | iris4d)
-		basic_machine=mips-sgi
-		case $os in
-		    -irix*)
-			;;
-		    *)
-			os=-irix4
-			;;
-		esac
-		;;
-	isi68 | isi)
-		basic_machine=m68k-isi
-		os=-sysv
-		;;
-	m88k-omron*)
-		basic_machine=m88k-omron
-		;;
-	magnum | m3230)
-		basic_machine=mips-mips
-		os=-sysv
-		;;
-	merlin)
-		basic_machine=ns32k-utek
-		os=-sysv
-		;;
-	miniframe)
-		basic_machine=m68000-convergent
-		;;
-	mipsel*-linux*)
-		basic_machine=mipsel-unknown
-		os=-linux-gnu
-		;;
-	mips*-linux*)
-		basic_machine=mips-unknown
-		os=-linux-gnu
-		;;
-	mips3*-*)
-		basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'`
-		;;
-	mips3*)
-		basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'`-unknown
-		;;
-	ncr3000)
-		basic_machine=i486-ncr
-		os=-sysv4
-		;;
-	news | news700 | news800 | news900)
-		basic_machine=m68k-sony
-		os=-newsos
-		;;
-	news1000)
-		basic_machine=m68030-sony
-		os=-newsos
-		;;
-	news-3600 | risc-news)
-		basic_machine=mips-sony
-		os=-newsos
-		;;
-	next | m*-next )
-		basic_machine=m68k-next
-		case $os in
-		    -nextstep* )
-			;;
-		    -ns2*)
-		      os=-nextstep2
-			;;
-		    *)
-		      os=-nextstep3
-			;;
-		esac
-		;;
-	nh3000)
-		basic_machine=m68k-harris
-		os=-cxux
-		;;
-	nh[45]000)
-		basic_machine=m88k-harris
-		os=-cxux
-		;;
-	nindy960)
-		basic_machine=i960-intel
-		os=-nindy
-		;;
-	np1)
-		basic_machine=np1-gould
-		;;
-	pa-hitachi)
-		basic_machine=hppa1.1-hitachi
-		os=-hiuxwe2
-		;;
-	paragon)
-		basic_machine=i860-intel
-		os=-osf
-		;;
-	pbd)
-		basic_machine=sparc-tti
-		;;
-	pbb)
-		basic_machine=m68k-tti
-		;;
-        pc532 | pc532-*)
-		basic_machine=ns32k-pc532
-		;;
-	pentium | p5 | k5 | nexen)
-		basic_machine=i586-pc
-		;;
-	pentiumpro | p6 | k6 | 6x86)
-		basic_machine=i686-pc
-		;;
-	pentiumii | pentium2)
-		basic_machine=i786-pc
-		;;
-	pentium-* | p5-* | k5-* | nexen-*)
-		basic_machine=i586-`echo $basic_machine | sed 's/^[^-]*-//'`
-		;;
-	pentiumpro-* | p6-* | k6-* | 6x86-*)
-		basic_machine=i686-`echo $basic_machine | sed 's/^[^-]*-//'`
-		;;
-	pentiumii-* | pentium2-*)
-		basic_machine=i786-`echo $basic_machine | sed 's/^[^-]*-//'`
-		;;
-	pn)
-		basic_machine=pn-gould
-		;;
-	power)	basic_machine=rs6000-ibm
-		;;
-	ppc)	basic_machine=powerpc-unknown
-	        ;;
-	ppc-*)	basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'`
-		;;
-	ppcle | powerpclittle | ppc-le | powerpc-little)
-		basic_machine=powerpcle-unknown
-	        ;;
-	ppcle-* | powerpclittle-*)
-		basic_machine=powerpcle-`echo $basic_machine | sed 's/^[^-]*-//'`
-		;;
-	ps2)
-		basic_machine=i386-ibm
-		;;
-	rm[46]00)
-		basic_machine=mips-siemens
-		;;
-	rtpc | rtpc-*)
-		basic_machine=romp-ibm
-		;;
-	sequent)
-		basic_machine=i386-sequent
-		;;
-	sh)
-		basic_machine=sh-hitachi
-		os=-hms
-		;;
-	sps7)
-		basic_machine=m68k-bull
-		os=-sysv2
-		;;
-	spur)
-		basic_machine=spur-unknown
-		;;
-	sun2)
-		basic_machine=m68000-sun
-		;;
-	sun2os3)
-		basic_machine=m68000-sun
-		os=-sunos3
-		;;
-	sun2os4)
-		basic_machine=m68000-sun
-		os=-sunos4
-		;;
-	sun3os3)
-		basic_machine=m68k-sun
-		os=-sunos3
-		;;
-	sun3os4)
-		basic_machine=m68k-sun
-		os=-sunos4
-		;;
-	sun4os3)
-		basic_machine=sparc-sun
-		os=-sunos3
-		;;
-	sun4os4)
-		basic_machine=sparc-sun
-		os=-sunos4
-		;;
-	sun4sol2)
-		basic_machine=sparc-sun
-		os=-solaris2
-		;;
-	sun3 | sun3-*)
-		basic_machine=m68k-sun
-		;;
-	sun4)
-		basic_machine=sparc-sun
-		;;
-	sun386 | sun386i | roadrunner)
-		basic_machine=i386-sun
-		;;
-	symmetry)
-		basic_machine=i386-sequent
-		os=-dynix
-		;;
-	tx39)
-		basic_machine=mipstx39-unknown
-		;;
-	tx39el)
-		basic_machine=mipstx39el-unknown
-		;;
-	tower | tower-32)
-		basic_machine=m68k-ncr
-		;;
-	udi29k)
-		basic_machine=a29k-amd
-		os=-udi
-		;;
-	ultra3)
-		basic_machine=a29k-nyu
-		os=-sym1
-		;;
-	vaxv)
-		basic_machine=vax-dec
-		os=-sysv
-		;;
-	vms)
-		basic_machine=vax-dec
-		os=-vms
-		;;
-	vpp*|vx|vx-*)
-               basic_machine=f301-fujitsu
-               ;;
-	vxworks960)
-		basic_machine=i960-wrs
-		os=-vxworks
-		;;
-	vxworks68)
-		basic_machine=m68k-wrs
-		os=-vxworks
-		;;
-	vxworks29k)
-		basic_machine=a29k-wrs
-		os=-vxworks
-		;;
-	xmp)
-		basic_machine=xmp-cray
-		os=-unicos
-		;;
-        xps | xps100)
-		basic_machine=xps100-honeywell
-		;;
-	none)
-		basic_machine=none-none
-		os=-none
-		;;
-
-# Here we handle the default manufacturer of certain CPU types.  It is in
-# some cases the only manufacturer, in others, it is the most popular.
-	mips)
-		if [ x$os = x-linux-gnu ]; then
-			basic_machine=mips-unknown
-		else
-			basic_machine=mips-mips
-		fi
-		;;
-	romp)
-		basic_machine=romp-ibm
-		;;
-	rs6000)
-		basic_machine=rs6000-ibm
-		;;
-	vax)
-		basic_machine=vax-dec
-		;;
-	pdp11)
-		basic_machine=pdp11-dec
-		;;
-	we32k)
-		basic_machine=we32k-att
-		;;
-	sparc)
-		basic_machine=sparc-sun
-		;;
-        cydra)
-		basic_machine=cydra-cydrome
-		;;
-	orion)
-		basic_machine=orion-highlevel
-		;;
-	orion105)
-		basic_machine=clipper-highlevel
-		;;
-	*)
-		echo Invalid configuration \`$1\': machine \`$basic_machine\' not recognized 1>&2
-		exit 1
-		;;
-esac
-
-# Here we canonicalize certain aliases for manufacturers.
-case $basic_machine in
-	*-digital*)
-		basic_machine=`echo $basic_machine | sed 's/digital.*/dec/'`
-		;;
-	*-commodore*)
-		basic_machine=`echo $basic_machine | sed 's/commodore.*/cbm/'`
-		;;
-	*)
-		;;
-esac
-
-# Decode manufacturer-specific aliases for certain operating systems.
-
-if [ x"$os" != x"" ]
-then
-case $os in
-        # First match some system type aliases
-        # that might get confused with valid system types.
-	# -solaris* is a basic system type, with this one exception.
-	-solaris1 | -solaris1.*)
-		os=`echo $os | sed -e 's|solaris1|sunos4|'`
-		;;
-	-solaris)
-		os=-solaris2
-		;;
-	-svr4*)
-		os=-sysv4
-		;;
-	-unixware*)
-		os=-sysv4.2uw
-		;;
-	-gnu/linux*)
-		os=`echo $os | sed -e 's|gnu/linux|linux-gnu|'`
-		;;
-	# First accept the basic system types.
-	# The portable systems comes first.
-	# Each alternative MUST END IN A *, to match a version number.
-	# -sysv* is not here because it comes later, after sysvr4.
-	-gnu* | -bsd* | -mach* | -minix* | -genix* | -ultrix* | -irix* \
-	      | -*vms* | -sco* | -esix* | -isc* | -aix* | -sunos | -sunos[34]*\
-	      | -hpux* | -unos* | -osf* | -luna* | -dgux* | -solaris* | -sym* \
-	      | -amigaos* | -amigados* | -msdos* | -newsos* | -unicos* | -aof* \
-	      | -aos* \
-	      | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \
-	      | -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \
-	      | -hiux* | -386bsd* | -netbsd* | -openbsd* | -freebsd* | -riscix* \
-	      | -lynxos* | -bosx* | -nextstep* | -cxux* | -aout* | -elf* \
-	      | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \
-	      | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \
-	      | -cygwin32* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
-	      | -mingw32* | -linux-gnu* | -uxpv* | -beos*)
-	# Remember, each alternative MUST END IN *, to match a version number.
-		;;
-	-linux*)
-		os=`echo $os | sed -e 's|linux|linux-gnu|'`
-		;;
-	-sunos5*)
-		os=`echo $os | sed -e 's|sunos5|solaris2|'`
-		;;
-	-sunos6*)
-		os=`echo $os | sed -e 's|sunos6|solaris3|'`
-		;;
-	-osfrose*)
-		os=-osfrose
-		;;
-	-osf*)
-		os=-osf
-		;;
-	-utek*)
-		os=-bsd
-		;;
-	-dynix*)
-		os=-bsd
-		;;
-	-acis*)
-		os=-aos
-		;;
-	-ctix* | -uts*)
-		os=-sysv
-		;;
-	-ns2 )
-	        os=-nextstep2
-		;;
-	# Preserve the version number of sinix5.
-	-sinix5.*)
-		os=`echo $os | sed -e 's|sinix|sysv|'`
-		;;
-	-sinix*)
-		os=-sysv4
-		;;
-	-triton*)
-		os=-sysv3
-		;;
-	-oss*)
-		os=-sysv3
-		;;
-	-svr4)
-		os=-sysv4
-		;;
-	-svr3)
-		os=-sysv3
-		;;
-	-sysvr4)
-		os=-sysv4
-		;;
-	# This must come after -sysvr4.
-	-sysv*)
-		;;
-	-xenix)
-		os=-xenix
-		;;
-	-none)
-		;;
-	*)
-		# Get rid of the `-' at the beginning of $os.
-		os=`echo $os | sed 's/[^-]*-//'`
-		echo Invalid configuration \`$1\': system \`$os\' not recognized 1>&2
-		exit 1
-		;;
-esac
-else
-
-# Here we handle the default operating systems that come with various machines.
-# The value should be what the vendor currently ships out the door with their
-# machine or put another way, the most popular os provided with the machine.
-
-# Note that if you're going to try to match "-MANUFACTURER" here (say,
-# "-sun"), then you have to tell the case statement up towards the top
-# that MANUFACTURER isn't an operating system.  Otherwise, code above
-# will signal an error saying that MANUFACTURER isn't an operating
-# system, and we'll never get to this point.
-
-case $basic_machine in
-	*-acorn)
-		os=-riscix1.2
-		;;
-	arm*-semi)
-		os=-aout
-		;;
-        pdp11-*)
-		os=-none
-		;;
-	*-dec | vax-*)
-		os=-ultrix4.2
-		;;
-	m68*-apollo)
-		os=-domain
-		;;
-	i386-sun)
-		os=-sunos4.0.2
-		;;
-	m68000-sun)
-		os=-sunos3
-		# This also exists in the configure program, but was not the
-		# default.
-		# os=-sunos4
-		;;
-	*-tti)	# must be before sparc entry or we get the wrong os.
-		os=-sysv3
-		;;
-	sparc-* | *-sun)
-		os=-sunos4.1.1
-		;;
-	*-be)
-		os=-beos
-		;;
-	*-ibm)
-		os=-aix
-		;;
-	*-hp)
-		os=-hpux
-		;;
-	*-hitachi)
-		os=-hiux
-		;;
-	i860-* | *-att | *-ncr | *-altos | *-motorola | *-convergent)
-		os=-sysv
-		;;
-	*-cbm)
-		os=-amigaos
-		;;
-	*-dg)
-		os=-dgux
-		;;
-	*-dolphin)
-		os=-sysv3
-		;;
-	m68k-ccur)
-		os=-rtu
-		;;
-	m88k-omron*)
-		os=-luna
-		;;
-	*-next )
-		os=-nextstep
-		;;
-	*-sequent)
-		os=-ptx
-		;;
-	*-crds)
-		os=-unos
-		;;
-	*-ns)
-		os=-genix
-		;;
-	i370-*)
-		os=-mvs
-		;;
-	*-next)
-		os=-nextstep3
-		;;
-        *-gould)
-		os=-sysv
-		;;
-        *-highlevel)
-		os=-bsd
-		;;
-	*-encore)
-		os=-bsd
-		;;
-        *-sgi)
-		os=-irix
-		;;
-        *-siemens)
-		os=-sysv4
-		;;
-	*-masscomp)
-		os=-rtu
-		;;
-	f301-fujitsu)
-		os=-uxpv
-		;;
-	*)
-		os=-none
-		;;
-esac
-fi
-
-# Here we handle the case where we know the os, and the CPU type, but not the
-# manufacturer.  We pick the logical manufacturer.
-vendor=unknown
-case $basic_machine in
-	*-unknown)
-		case $os in
-			-riscix*)
-				vendor=acorn
-				;;
-			-sunos*)
-				vendor=sun
-				;;
-			-aix*)
-				vendor=ibm
-				;;
-			-hpux*)
-				vendor=hp
-				;;
-			-hiux*)
-				vendor=hitachi
-				;;
-			-unos*)
-				vendor=crds
-				;;
-			-dgux*)
-				vendor=dg
-				;;
-			-luna*)
-				vendor=omron
-				;;
-			-genix*)
-				vendor=ns
-				;;
-			-mvs*)
-				vendor=ibm
-				;;
-			-ptx*)
-				vendor=sequent
-				;;
-			-vxsim* | -vxworks*)
-				vendor=wrs
-				;;
-			-aux*)
-				vendor=apple
-				;;
-		esac
-		basic_machine=`echo $basic_machine | sed "s/unknown/$vendor/"`
-		;;
-esac
-
-echo $basic_machine$os
diff --git a/ltconfig b/ltconfig
deleted file mode 100755
index 62ac479..0000000
--- a/ltconfig
+++ /dev/null
@@ -1,2101 +0,0 @@
-#! /bin/sh
-
-# ltconfig - Create a system-specific libtool.
-# Copyright (C) 1996-1998 Free Software Foundation, Inc.
-# Gordon Matzigkeit <gord@gnu.ai.mit.edu>, 1996
-#
-# This file is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-#
-# As a special exception to the GNU General Public License, if you
-# distribute this file as part of a program that contains a
-# configuration script generated by Autoconf, you may include it under
-# the same distribution terms that you use for the rest of that program.
-
-# A lot of this script is taken from autoconf-2.10.
-
-# Check that we are running under the correct shell.
-SHELL=${CONFIG_SHELL-/bin/sh}
-echo=echo
-if test "X$1" = X--no-reexec; then
-  # Discard the --no-reexec flag, and continue.
-  shift
-elif test "X$1" = X--fallback-echo; then
-  # used as fallback echo
-  shift
-  cat <<EOF
-$*
-EOF
-  exit 0
-elif test "X`($echo '\t') 2>/dev/null`" = 'X\t'; then
-  # Yippee, $echo works!
-  :
-else
-  # Restart under the correct shell.
-  exec "$SHELL" "$0" --no-reexec ${1+"$@"}
-fi
-
-# The HP-UX ksh and POSIX shell print the target directory to stdout
-# if CDPATH is set.
-if test "${CDPATH+set}" = set; then CDPATH=; export CDPATH; fi
-
-if test "X${echo_test_string+set}" != "Xset"; then
-  # find a string as large as possible, as long as the shell can cope with it
-  for cmd in 'sed 50q "$0"' 'sed 20q "$0"' 'sed 10q "$0"' 'sed 2q "$0"' 'echo test'; do
-    # expected sizes: less than 2Kb, 1Kb, 512 bytes, 16 bytes, ...
-    if (echo_test_string="`eval $cmd`") 2>/dev/null &&
-       echo_test_string="`eval $cmd`" &&
-       (test "X$echo_test_string" = "X$echo_test_string") 2>/dev/null; then
-      break
-    fi
-  done
-fi
-
-if test "X`($echo '\t') 2>/dev/null`" != 'X\t' ||
-   test "X`($echo "$echo_test_string") 2>/dev/null`" != X"$echo_test_string"; then
-  # The Solaris, AIX, and Digital Unix default echo programs unquote
-  # backslashes.  This makes it impossible to quote backslashes using
-  #   echo "$something" | sed 's/\\/\\\\/g'
-  #
-  # So, first we look for a working echo in the user's PATH.
-
-  IFS="${IFS= 	}"; save_ifs="$IFS"; IFS="${IFS}:"
-  for dir in $PATH /usr/ucb; do
-    if test -f $dir/echo &&
-       test "X`($dir/echo '\t') 2>/dev/null`" = 'X\t' &&
-       test "X`($dir/echo "$echo_test_string") 2>/dev/null`" = X"$echo_test_string"; then
-      echo="$dir/echo"
-      break
-    fi
-  done
-  IFS="$save_ifs"
-
-  if test "X$echo" = Xecho; then
-    # We didn't find a better echo, so look for alternatives.
-    if test "X`(print -r '\t') 2>/dev/null`" = 'X\t' &&
-       test "X`(print -r "$echo_test_string") 2>/dev/null`" = X"$echo_test_string"; then
-      # This shell has a builtin print -r that does the trick.
-      echo='print -r'
-    elif test -f /bin/ksh && test "X$CONFIG_SHELL" != X/bin/ksh; then
-      # If we have ksh, try running ltconfig again with it.
-      ORIGINAL_CONFIG_SHELL="${CONFIG_SHELL-/bin/sh}"
-      export ORIGINAL_CONFIG_SHELL
-      CONFIG_SHELL=/bin/ksh
-      export CONFIG_SHELL
-      exec "$CONFIG_SHELL" "$0" --no-reexec ${1+"$@"}
-    else
-      # Try using printf.
-      echo='printf %s\n'
-      if test "X`($echo '\t') 2>/dev/null`" = 'X\t' &&
-         test "X`($echo "$echo_test_string") 2>/dev/null`" = X"$echo_test_string"; then
-        # Cool, printf works
-	:
-      elif test "X`("$ORIGINAL_CONFIG_SHELL" "$0" --fallback-echo '\t') 2>/dev/null`" = 'X\t' &&
-	   test "X`("$ORIGINAL_CONFIG_SHELL" "$0" --fallback-echo "$echo_test_string") 2>/dev/null`" = X"$echo_test_string"; then
-	CONFIG_SHELL="$ORIGINAL_CONFIG_SHELL"
-	export CONFIG_SHELL
-	SHELL="$CONFIG_SHELL"
-	export SHELL
-	echo="$CONFIG_SHELL $0 --fallback-echo"
-      elif test "X`("$CONFIG_SHELL" "$0" --fallback-echo '\t') 2>/dev/null`" = 'X\t' &&
-	   test "X`("$CONFIG_SHELL" "$0" --fallback-echo "$echo_test_string") 2>/dev/null`" = X"$echo_test_string"; then
-        echo="$CONFIG_SHELL $0 --fallback-echo"
-      else
-        # maybe with a smaller string...
-	prev=:
-
-	for cmd in 'echo test' 'sed 2q "$0"' 'sed 10q "$0"' 'sed 20q "$0"' 'sed 50q "$0"'; do
-	  if (test "X$echo_test_string" = "X`eval $cmd`") 2>/dev/null; then
-	    break
-	  fi
-	  prev="$cmd"
-	done
-
-	if test "$prev" != 'sed 50q "$0"'; then
-	  echo_test_string=`eval $prev`
-	  export echo_test_string
-	  exec "${ORIGINAL_CONFIG_SHELL}" "$0" ${1+"$@"}
-	else
-	  # Oops.  We lost completely, so just stick with echo.
-	  echo=echo
-	fi
-      fi
-    fi
-  fi
-fi
-
-# Sed substitution that helps us do robust quoting.  It backslashifies
-# metacharacters that are still active within double-quoted strings.
-Xsed='sed -e s/^X//'
-sed_quote_subst='s/\([\\"\\`$\\\\]\)/\\\1/g'
-
-# Same as above, but do not quote variable references.
-double_quote_subst='s/\([\\"\\`\\\\]\)/\\\1/g'
-
-# The name of this program.
-progname=`$echo "X$0" | $Xsed -e 's%^.*/%%'`
-
-# Constants:
-PROGRAM=ltconfig
-PACKAGE=libtool
-VERSION=1.2d
-ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.c 1>&5'
-ac_link='${CC-cc} -o conftest $CFLAGS $CPPFLAGS $LDFLAGS conftest.c $LIBS 1>&5'
-rm="rm -f"
-
-help="Try \`$progname --help' for more information."
-
-# Global variables:
-default_ofile=libtool
-can_build_shared=yes
-enable_shared=yes
-# All known linkers require a `.a' archive for static linking.
-enable_static=yes
-ltmain=
-silent=
-srcdir=
-ac_config_guess=
-ac_config_sub=
-host=
-nonopt=
-ofile="$default_ofile"
-verify_host=yes
-with_gcc=no
-with_gnu_ld=no
-need_locks=yes
-objext=o
-libext=a
-
-old_AR="$AR"
-old_CC="$CC"
-old_CFLAGS="$CFLAGS"
-old_CPPFLAGS="$CPPFLAGS"
-old_LD="$LD"
-old_LN_S="$LN_S"
-old_NM="$NM"
-old_RANLIB="$RANLIB"
-old_DLLTOOL="$DLLTOOL"
-old_AS="$AS"
-
-# Parse the command line options.
-args=
-prev=
-for option
-do
-  case "$option" in
-  -*=*) optarg=`echo "$option" | sed 's/[-_a-zA-Z0-9]*=//'` ;;
-  *) optarg= ;;
-  esac
-
-  # If the previous option needs an argument, assign it.
-  if test -n "$prev"; then
-    eval "$prev=\$option"
-    prev=
-    continue
-  fi
-
-  case "$option" in
-  --help) cat <<EOM
-Usage: $progname [OPTION]... [HOST [LTMAIN]]
-
-Generate a system-specific libtool script.
-
-    --debug                enable verbose shell tracing
-    --disable-shared       do not build shared libraries
-    --disable-static       do not build static libraries
-    --help                 display this help and exit
-    --no-verify            do not verify that HOST is a valid host type
--o, --output=FILE          specify the output file [default=$default_ofile]
-    --quiet                same as \`--silent'
-    --silent               do not print informational messages
-    --srcdir=DIR           find \`config.guess' in DIR
-    --version              output version information and exit
-    --with-gcc             assume that the GNU C compiler will be used
-    --with-gnu-ld          assume that the C compiler uses the GNU linker
-    --disable-lock         disable file locking
-
-LTMAIN is the \`ltmain.sh' shell script fragment or \`ltmain.c' program
-that provides basic libtool functionality.
-
-HOST is the canonical host system name [default=guessed].
-EOM
-  exit 0
-  ;;
-
-  --debug)
-    echo "$progname: enabling shell trace mode"
-    set -x
-    ;;
-
-  --disable-shared) enable_shared=no ;;
-
-  --disable-static) enable_static=no ;;
-
-  --quiet | --silent) silent=yes ;;
-
-  --srcdir) prev=srcdir ;;
-  --srcdir=*) srcdir="$optarg" ;;
-
-  --no-verify) verify_host=no ;;
-
-  --output | -o) prev=ofile ;;
-  --output=*) ofile="$optarg" ;;
-
-  --version) echo "$PROGRAM (GNU $PACKAGE) $VERSION"; exit 0 ;;
-
-  --with-gcc) with_gcc=yes ;;
-  --with-gnu-ld) with_gnu_ld=yes ;;
-
-  --disable-lock) need_locks=no ;;
-
-  -*)
-    echo "$progname: unrecognized option \`$option'" 1>&2
-    echo "$help" 1>&2
-    exit 1
-    ;;
-
-  *)
-    if test -z "$ltmain"; then
-      ltmain="$option"
-    elif test -z "$host"; then
-# This generates an unnecessary warning for sparc-sun-solaris4.1.3_U1
-#      if test -n "`echo $option| sed 's/[-a-z0-9.]//g'`"; then
-#        echo "$progname: warning \`$option' is not a valid host type" 1>&2
-#      fi
-      host="$option"
-    else
-      echo "$progname: too many arguments" 1>&2
-      echo "$help" 1>&2
-      exit 1
-    fi ;;
-  esac
-done
-
-if test -z "$ltmain"; then
-  echo "$progname: you must specify a LTMAIN file" 1>&2
-  echo "$help" 1>&2
-  exit 1
-fi
-
-if test ! -f "$ltmain"; then
-  echo "$progname: \`$ltmain' does not exist" 1>&2
-  echo "$help" 1>&2
-  exit 1
-fi
-
-# Quote any args containing shell metacharacters.
-ltconfig_args=
-for arg
-do
-  case "$arg" in
-  *" "*|*"	"*|*[\[\]\~\#\$\^\&\*\(\)\{\}\\\|\;\<\>\?]*)
-  ltconfig_args="$ltconfig_args '$arg'" ;;
-  *) ltconfig_args="$ltconfig_args $arg" ;;
-  esac
-done
-
-# A relevant subset of AC_INIT.
-
-# File descriptor usage:
-# 0 standard input
-# 1 file creation
-# 2 errors and warnings
-# 3 some systems may open it to /dev/tty
-# 4 used on the Kubota Titan
-# 5 compiler messages saved in config.log
-# 6 checking for... messages and results
-if test "$silent" = yes; then
-  exec 6>/dev/null
-else
-  exec 6>&1
-fi
-exec 5>>./config.log
-
-# NLS nuisances.
-# Only set LANG and LC_ALL to C if already set.
-# These must not be set unconditionally because not all systems understand
-# e.g. LANG=C (notably SCO).
-if test "${LC_ALL+set}" = set; then LC_ALL=C; export LC_ALL; fi
-if test "${LANG+set}"   = set; then LANG=C;   export LANG;   fi
-
-if (echo "testing\c"; echo 1,2,3) | grep c >/dev/null; then
-  # Stardent Vistra SVR4 grep lacks -e, says ghazi@caip.rutgers.edu.
-  if (echo -n testing; echo 1,2,3) | sed s/-n/xn/ | grep xn >/dev/null; then
-    ac_n= ac_c='
-' ac_t='	'
-  else
-    ac_n=-n ac_c= ac_t=
-  fi
-else
-  ac_n= ac_c='\c' ac_t=
-fi
-
-if test -z "$srcdir"; then
-  # Assume the source directory is the same one as the path to LTMAIN.
-  srcdir=`$echo "$ltmain" | $Xsed -e 's%/[^/]*$%%'`
-  test "$srcdir" = "$ltmain" && srcdir=.
-fi
-
-trap "$rm conftest*; exit 1" 1 2 15
-if test "$verify_host" = yes; then
-  # Check for config.guess and config.sub.
-  ac_aux_dir=
-  for ac_dir in $srcdir $srcdir/.. $srcdir/../..; do
-    if test -f $ac_dir/config.guess; then
-      ac_aux_dir=$ac_dir
-      break
-    fi
-  done
-  if test -z "$ac_aux_dir"; then
-    echo "$progname: cannot find config.guess in $srcdir $srcdir/.. $srcdir/../.." 1>&2
-    echo "$help" 1>&2
-    exit 1
-  fi
-  ac_config_guess=$ac_aux_dir/config.guess
-  ac_config_sub=$ac_aux_dir/config.sub
-
-  # Make sure we can run config.sub.
-  if $SHELL $ac_config_sub sun4 >/dev/null 2>&1; then :
-  else
-    echo "$progname: cannot run $ac_config_sub" 1>&2
-    echo "$help" 1>&2
-    exit 1
-  fi
-
-  echo $ac_n "checking host system type""... $ac_c" 1>&6
-
-  host_alias=$host
-  case "$host_alias" in
-  "")
-    if host_alias=`$SHELL $ac_config_guess`; then :
-    else
-      echo "$progname: cannot guess host type; you must specify one" 1>&2
-      echo "$help" 1>&2
-      exit 1
-    fi ;;
-  esac
-  host=`$SHELL $ac_config_sub $host_alias`
-  echo "$ac_t$host" 1>&6
-
-  # Make sure the host verified.
-  test -z "$host" && exit 1
-
-elif test -z "$host"; then
-  echo "$progname: you must specify a host type if you use \`--no-verify'" 1>&2
-  echo "$help" 1>&2
-  exit 1
-else
-  host_alias=$host
-fi
-
-# Transform linux* to *-*-linux-gnu*, to support old configure scripts.
-case "$host_os" in
-linux-gnu*) ;;
-linux*) host=`echo $host | sed 's/^\(.*-.*-linux\)\(.*\)$/\1-gnu\2/'`
-esac
-
-host_cpu=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
-host_vendor=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
-host_os=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
-
-case "$host_os" in
-aix3*)
-  # AIX sometimes has problems with the GCC collect2 program.  For some
-  # reason, if we set the COLLECT_NAMES environment variable, the problems
-  # vanish in a puff of smoke.
-  if test "${COLLECT_NAMES+set}" != set; then
-    COLLECT_NAMES=
-    export COLLECT_NAMES
-  fi
-  ;;
-esac
-
-# Determine commands to create old-style static archives.
-old_archive_cmds='$AR cru $oldlib$oldobjs'
-old_postinstall_cmds='chmod 644 $oldlib'
-old_postuninstall_cmds=
-
-# Set a sane default for `AR'.
-test -z "$AR" && AR=ar
-
-# If RANLIB is not set, then run the test.
-if test "${RANLIB+set}" != "set"; then
-  result=no
-
-  echo $ac_n "checking for ranlib... $ac_c" 1>&6
-  IFS="${IFS= 	}"; save_ifs="$IFS"; IFS="${IFS}:"
-  for dir in $PATH; do
-    test -z "$dir" && dir=.
-    if test -f $dir/ranlib; then
-      RANLIB="ranlib"
-      result="ranlib"
-      break
-    fi
-  done
-  IFS="$save_ifs"
-
-  echo "$ac_t$result" 1>&6
-fi
-
-if test -n "$RANLIB"; then
-  old_archive_cmds="$old_archive_cmds~\$RANLIB \$oldlib"
-  old_postinstall_cmds="\$RANLIB \$oldlib~$old_postinstall_cmds"
-fi
-
-# Set sane defaults for `DLLTOOL' and `AS', used on cygwin32.
-test -z "$DLLTOOL" && DLLTOOL=dlltool
-test -z "$AS" && AS=as
-
-# Check to see if we are using GCC.
-if test "$with_gcc" != yes || test -z "$CC"; then
-  # If CC is not set, then try to find GCC or a usable CC.
-  if test -z "$CC"; then
-    echo $ac_n "checking for gcc... $ac_c" 1>&6
-    IFS="${IFS= 	}"; save_ifs="$IFS"; IFS="${IFS}:"
-    for dir in $PATH; do
-      IFS="$save_ifs"
-      test -z "$dir" && dir=.
-      if test -f $dir/gcc; then
-	CC="gcc"
-	break
-      fi
-    done
-    IFS="$save_ifs"
-
-    if test -n "$CC"; then
-      echo "$ac_t$CC" 1>&6
-    else
-      echo "$ac_t"no 1>&6
-    fi
-  fi
-
-  # Not "gcc", so try "cc", rejecting "/usr/ucb/cc".
-  if test -z "$CC"; then
-    echo $ac_n "checking for cc... $ac_c" 1>&6
-    IFS="${IFS= 	}"; save_ifs="$IFS"; IFS="${IFS}:"
-    cc_rejected=no
-    for dir in $PATH; do
-      test -z "$dir" && dir=.
-      if test -f $dir/cc; then
-	if test "$dir/cc" = "/usr/ucb/cc"; then
-	  cc_rejected=yes
-	  continue
-	fi
-	CC="cc"
-	break
-      fi
-    done
-    IFS="$save_ifs"
-    if test $cc_rejected = yes; then
-      # We found a bogon in the path, so make sure we never use it.
-      set dummy $CC
-      shift
-      if test $# -gt 0; then
-	# We chose a different compiler from the bogus one.
-	# However, it has the same name, so the bogon will be chosen
-	# first if we set CC to just the name; use the full file name.
-	shift
-	set dummy "$dir/cc" "$@"
-	shift
-	CC="$@"
-      fi
-    fi
-
-    if test -n "$CC"; then
-      echo "$ac_t$CC" 1>&6
-    else
-      echo "$ac_t"no 1>&6
-    fi
-
-    if test -z "$CC"; then
-      echo "$progname: error: no acceptable cc found in \$PATH" 1>&2
-      exit 1
-    fi
-  fi
-
-  # Now see if the compiler is really GCC.
-  with_gcc=no
-  echo $ac_n "checking whether we are using GNU C... $ac_c" 1>&6
-  echo "$progname:530: checking whether we are using GNU C" >&5
-
-  $rm conftest.c
-  cat > conftest.c <<EOF
-#ifdef __GNUC__
-  yes;
-#endif
-EOF
-  if { ac_try='${CC-cc} -E conftest.c'; { (eval echo $progname:538: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
-    with_gcc=yes
-  fi
-  $rm conftest.c
-  echo "$ac_t$with_gcc" 1>&6
-fi
-
-# Allow CC to be a program name with arguments.
-set dummy $CC
-compiler="$2"
-
-echo $ac_n "checking for object suffix... $ac_c" 1>&6
-$rm conftest*
-echo 'int i = 1;' > conftest.c
-echo "$progname:552: checking for object suffix" >& 5
-if { (eval echo $progname:553: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>conftest.err; }; then
-  # Append any warnings to the config.log.
-  cat conftest.err 1>&5
-
-  for ac_file in conftest.*; do
-    case $ac_file in
-    *.c) ;;
-    *) objext=`echo $ac_file | sed -e s/conftest.//` ;;
-    esac
-  done
-else
-  cat conftest.err 1>&5
-  echo "$progname: failed program was:" >&5
-  cat conftest.c >&5
-fi
-$rm conftest*
-echo "$ac_t$objext" 1>&6
-
-echo $ac_n "checking for $compiler option to produce PIC... $ac_c" 1>&6
-pic_flag=
-special_shlib_compile_flags=
-wl=
-link_static_flag=
-no_builtin_flag=
-
-if test "$with_gcc" = yes; then
-  wl='-Wl,'
-  link_static_flag='-static'
-
-  case "$host_os" in
-  aix3* | aix4* | irix5* | irix6* | osf3* | osf4*)
-    # PIC is the default for these OSes.
-    ;;
-  cygwin32* | mingw32* | os2*)
-    # We can build DLLs from non-PIC.
-    ;;
-  amigaos*)
-    # FIXME: we need at least 68020 code to build shared libraries, but
-    # adding the `-m68020' flag to GCC prevents building anything better,
-    # like `-m68040'.
-    pic_flag='-m68020 -resident32 -malways-restore-a4'
-    ;;
-  *)
-    pic_flag='-fPIC'
-    ;;
-  esac
-else
-  # PORTME Check for PIC flags for the system compiler.
-  case "$host_os" in
-  aix3* | aix4*)
-    # All AIX code is PIC.
-    link_static_flag='-bnso -bI:/lib/syscalls.exp'
-    ;;
-
-  hpux9* | hpux10* | hpux11*)
-    # Is there a better link_static_flag that works with the bundled CC?
-    wl='-Wl,'
-    link_static_flag="${wl}-a ${wl}archive"
-    pic_flag='+Z'
-    ;;
-
-  irix5* | irix6*)
-    wl='-Wl,'
-    link_static_flag='-non_shared'
-    # PIC (with -KPIC) is the default.
-    ;;
-
-  cygwin32* | mingw32* | os2*)
-    # We can build DLLs from non-PIC.
-    ;;
-
-  osf3* | osf4*)
-    # All OSF/1 code is PIC.
-    wl='-Wl,'
-    link_static_flag='-non_shared'
-    ;;
-
-  sco3.2v5*)
-    pic_flag='-Kpic'
-    link_static_flag='-dn'
-    special_shlib_compile_flags='-belf'
-    ;;
-
-  solaris*)
-    pic_flag='-KPIC'
-    link_static_flag='-Bstatic'
-    wl='-Wl,'
-    ;;
-
-  sunos4*)
-    pic_flag='-PIC'
-    link_static_flag='-Bstatic'
-    wl='-Qoption ld '
-    ;;
-
-  sysv4.2uw2* | sysv5*)
-    pic_flag='-KPIC'
-    link_static_flag='-Bstatic'
-    wl='-Wl,'
-    ;;
-
-  uts4*)
-    pic_flag='-pic'
-    link_static_flag='-Bstatic'
-    ;;
-
-  *)
-    can_build_shared=no
-    ;;
-  esac
-fi
-
-if test -n "$pic_flag"; then
-  echo "$ac_t$pic_flag" 1>&6
-
-  # Check to make sure the pic_flag actually works.
-  echo $ac_n "checking if $compiler PIC flag $pic_flag works... $ac_c" 1>&6
-  $rm conftest*
-  echo "int some_variable = 0;" > conftest.c
-  save_CFLAGS="$CFLAGS"
-  CFLAGS="$CFLAGS $pic_flag -DPIC"
-  echo "$progname:674: checking if $compiler PIC flag $pic_flag works" >&5
-  if { (eval echo $progname:675: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>conftest.err; } && test -s conftest.$objext; then
-    # Append any warnings to the config.log.
-    cat conftest.err 1>&5
-
-    # On HP-UX, both CC and GCC only warn that PIC is supported... then they
-    # create non-PIC objects.  So, if there were any warnings, we assume that
-    # PIC is not supported.
-    if test -s conftest.err; then
-      echo "$ac_t"no 1>&6
-      can_build_shared=no
-      pic_flag=
-    else
-      echo "$ac_t"yes 1>&6
-      pic_flag=" $pic_flag"
-    fi
-  else
-    # Append any errors to the config.log.
-    cat conftest.err 1>&5
-    can_build_shared=no
-    pic_flag=
-    echo "$ac_t"no 1>&6
-  fi
-  CFLAGS="$save_CFLAGS"
-  $rm conftest*
-else
-  echo "$ac_t"none 1>&6
-fi
-
-# Check to see if options -o and -c are simultaneously supported by compiler
-echo $ac_n "checking if $compiler supports -c -o file.o... $ac_c" 1>&6
-$rm conftest*
-echo "int some_variable = 0;" > conftest.c
-save_CFLAGS="$CFLAGS"
-CFLAGS="$CFLAGS -c -o conftest2.o"
-echo "$progname:709: checking if $compiler supports -c -o file.o" >&5
-if { (eval echo $progname:710: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>conftest.err; } && test -s conftest2.o; then
-
-  # The compiler can only warn and ignore the option if not recognized
-  # So say no if there are warnings
-    if test -s conftest.err; then
-      echo "$ac_t"no 1>&6
-      compiler_c_o=no
-    else
-      echo "$ac_t"yes 1>&6
-      compiler_c_o=yes
-    fi
-else
-  # Append any errors to the config.log.
-  cat conftest.err 1>&5
-  compiler_c_o=no
-  echo "$ac_t"no 1>&6
-fi
-CFLAGS="$save_CFLAGS"
-$rm conftest*
-
-if test x"$compiler_c_o" = x"yes"; then
-  # Check to see if we can write to a .lo
-  echo $ac_n "checking if $compiler supports -c -o file.lo... $ac_c" 1>&6
-  $rm conftest*
-  echo "int some_variable = 0;" > conftest.c
-  save_CFLAGS="$CFLAGS"
-  CFLAGS="$CFLAGS -c -o conftest.lo"
-  echo "$progname:737: checking if $compiler supports -c -o file.lo" >&5
-if { (eval echo $progname:738: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>conftest.err; } && test -s conftest.lo; then
-
-    # The compiler can only warn and ignore the option if not recognized
-    # So say no if there are warnings
-      if test -s conftest.err; then
-	echo "$ac_t"no 1>&6
-	compiler_o_lo=no
-      else
-        echo "$ac_t"yes 1>&6
-        compiler_o_lo=yes
-      fi
-  else
-    # Append any errors to the config.log.
-    cat conftest.err 1>&5
-    compiler_o_lo=no
-    echo "$ac_t"no 1>&6
-  fi
-  CFLAGS="$save_CFLAGS"
-  $rm conftest*
-else
-  compiler_o_lo=no
-fi
-
-# Check to see if we can do hard links to lock some files if needed
-hard_links="nottested"
-if test "$compiler_c_o" = no && test "$need_locks" != no; then
-  # do not overwrite the value of need_locks provided by the user
-  echo $ac_n "checking if we can lock with hard links... $ac_c" 1>&6
-  hard_links=yes
-  $rm conftest*
-  ln conftest.a conftest.b 2>/dev/null && hard_links=no
-  touch conftest.a
-  ln conftest.a conftest.b 2>&5 || hard_links=no
-  ln conftest.a conftest.b 2>/dev/null && hard_links=no
-  echo "$ac_t$hard_links" 1>&6
-  $rm conftest*
-  if test "$hard_links" = no; then
-    echo "*** WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&2
-    need_locks=warn
-  fi
-else
-  need_locks=no
-fi
-
-if test "$with_gcc" = yes; then
-  # Check to see if options -fno-rtti -fno-exceptions are supported by compiler
-  echo $ac_n "checking if $compiler supports -fno-rtti -fno-exceptions ... $ac_c" 1>&6
-  $rm conftest*
-  echo "int some_variable = 0;" > conftest.c
-  save_CFLAGS="$CFLAGS"
-  CFLAGS="$CFLAGS -fno-rtti -fno-exceptions -c conftest.c"
-  echo "$progname:789: checking if $compiler supports -fno-rtti -fno-exceptions" >&5
-  if { (eval echo $progname:790: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>conftest.err; } && test -s conftest.o; then
-
-    # The compiler can only warn and ignore the option if not recognized
-    # So say no if there are warnings
-      if test -s conftest.err; then
-        echo "$ac_t"no 1>&6
-        compiler_rtti_exceptions=no
-      else
-        echo "$ac_t"yes 1>&6
-        compiler_rtti_exceptions=yes
-      fi
-  else
-    # Append any errors to the config.log.
-    cat conftest.err 1>&5
-    compiler_rtti_exceptions=no
-    echo "$ac_t"no 1>&6
-  fi
-  CFLAGS="$save_CFLAGS"
-  $rm conftest*
-
-  if test "$compiler_rtti_exceptions" = "yes"; then
-    no_builtin_flag=' -fno-builtin -fno-rtti -fno-exceptions'
-  else
-    no_builtin_flag=' -fno-builtin'
-  fi
-  
-fi
-
-# Check for any special shared library compilation flags.
-if test -n "$special_shlib_compile_flags"; then
-  echo "$progname: warning: \`$CC' requires \`$special_shlib_compile_flags' to build shared libraries" 1>&2
-  if echo "$old_CC $old_CFLAGS " | egrep -e "[ 	]$special_shlib_compile_flags[ 	]" >/dev/null; then :
-  else
-    echo "$progname: add \`$special_shlib_compile_flags' to the CC or CFLAGS env variable and reconfigure" 1>&2
-    can_build_shared=no
-  fi
-fi
-
-echo $ac_n "checking if $compiler static flag $link_static_flag works... $ac_c" 1>&6
-$rm conftest*
-echo 'main(){return(0);}' > conftest.c
-save_LDFLAGS="$LDFLAGS"
-LDFLAGS="$LDFLAGS $link_static_flag"
-echo "$progname:833: checking if $compiler static flag $link_static_flag works" >&5
-if { (eval echo $progname:834: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
-  echo "$ac_t$link_static_flag" 1>&6
-else
-  echo "$ac_t"none 1>&6
-  link_static_flag=
-fi
-LDFLAGS="$save_LDFLAGS"
-$rm conftest*
-
-if test -z "$LN_S"; then
-  # Check to see if we can use ln -s, or we need hard links.
-  echo $ac_n "checking whether ln -s works... $ac_c" 1>&6
-  $rm conftestdata
-  if ln -s X conftestdata 2>/dev/null; then
-    $rm conftestdata
-    LN_S="ln -s"
-  else
-    LN_S=ln
-  fi
-  if test "$LN_S" = "ln -s"; then
-    echo "$ac_t"yes 1>&6
-  else
-    echo "$ac_t"no 1>&6
-  fi
-fi
-
-# Make sure LD is an absolute path.
-if test -z "$LD"; then
-  ac_prog=ld
-  if test "$with_gcc" = yes; then
-    # Check if gcc -print-prog-name=ld gives a path.
-    echo $ac_n "checking for ld used by GCC... $ac_c" 1>&6
-    echo "$progname:866: checking for ld used by GCC" >&5
-    ac_prog=`($CC -print-prog-name=ld) 2>&5`
-    case "$ac_prog" in
-    # Accept absolute paths.
-    /* | [A-Za-z]:/*)
-      re_direlt='/[^/][^/]*/\.\./'
-      sub_uncdrive='s%^\([A-Za-z]\):/%//\1/%'
-      # Canonicalize the path of ld
-      while echo $ac_prog | grep "$re_direlt" > /dev/null 2>&1; do
-        ac_prog=`echo $ac_prog| sed "s%$re_direlt%/%"`
-      done
-      case "$host_os" in
-      cygwin*)
-        # Convert to a UNC path for cygwin
-        test -z "$LD" && LD=`echo X$ac_prog | $Xsed -e "$sub_uncdrive"`
-	;;
-      *)
-        test -z "$LD" && LD="$ac_prog"
-	;;
-      esac
-      ;;
-    ##
-    ## FIXME:  The code fails later on if we try to use an $LD with
-    ##         '\\' path separators.
-    ##
-    [A-Za-z]:[\\]*)
-      re_direlt='\\[^\\][^\\]*\\\.\.\(\\\)'
-      sub_uncdrive='s%^\([A-Za-z]\):\\%//\1/%'
-      sub_uncdir='s%\\%/%g'
-      # Canonicalize the path of ld
-      while echo $ac_prog | grep "$re_direlt" > /dev/null 2>&1; do
-        ac_prog=`echo $ac_prog| sed "s%$re_direlt%\1%"`
-      done
-      case "$host_os" in
-      cygwin*)
-        # Convert to a UNC path for cygwin
-        test -z "$LD" && LD=`echo X$ac_prog | $Xsed -e "$sub_uncdrive" -e "$sub_uncdir"`
-	;;
-      *)
-        test -z "$LD" && LD="$ac_prog"
-	;;
-      esac
-      ;;
-    "")
-      # If it fails, then pretend we are not using GCC.
-      ac_prog=ld
-      ;;
-    *)
-      # If it is relative, then search for the first ld in PATH.
-      with_gnu_ld=unknown
-      ;;
-    esac
-  elif test "$with_gnu_ld" = yes; then
-    echo $ac_n "checking for GNU ld... $ac_c" 1>&6
-    echo "$progname:920: checking for GNU ld" >&5
-  else
-    echo $ac_n "checking for non-GNU ld""... $ac_c" 1>&6
-    echo "$progname:923: checking for non-GNU ld" >&5
-  fi
-
-  if test -z "$LD"; then
-    IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS="${IFS}:"
-    for ac_dir in $PATH; do
-      test -z "$ac_dir" && ac_dir=.
-      if test -f "$ac_dir/$ac_prog"; then
-	LD="$ac_dir/$ac_prog"
-	# Check to see if the program is GNU ld.  I'd rather use --version,
-	# but apparently some GNU ld's only accept -v.
-	# Break only if it was the GNU/non-GNU ld that we prefer.
-	if "$LD" -v 2>&1 < /dev/null | egrep '(GNU|with BFD)' > /dev/null; then
-	  test "$with_gnu_ld" != no && break
-	else
-	  test "$with_gnu_ld" != yes && break
-	fi
-      fi
-    done
-    IFS="$ac_save_ifs"
-  fi
-
-  if test -n "$LD"; then
-    echo "$ac_t$LD" 1>&6
-  else
-    echo "$ac_t"no 1>&6
-  fi
-
-  if test -z "$LD"; then
-    echo "$progname: error: no acceptable ld found in \$PATH" 1>&2
-    exit 1
-  fi
-fi
-
-# Check to see if it really is or is not GNU ld.
-echo $ac_n "checking if the linker ($LD) is GNU ld... $ac_c" 1>&6
-# I'd rather use --version here, but apparently some GNU ld's only accept -v.
-if $LD -v 2>&1 </dev/null | egrep '(GNU|with BFD)' 1>&5; then
-  with_gnu_ld=yes
-else
-  with_gnu_ld=no
-fi
-echo "$ac_t$with_gnu_ld" 1>&6
-
-# See if the linker supports building shared libraries.
-echo $ac_n "checking whether the linker ($LD) supports shared libraries... $ac_c" 1>&6
-
-allow_undefined_flag=
-no_undefined_flag=
-archive_cmds=
-archive_sym_cmds=
-old_archive_from_new_cmds=
-export_dynamic_flag_spec=
-whole_archive_flag_spec=
-hardcode_libdir_flag_spec=
-hardcode_libdir_separator=
-hardcode_direct=no
-hardcode_minus_L=no
-hardcode_shlibpath_var=unsupported
-runpath_var=
-
-case "$host_os" in
-aix3* | aix4*)
-  # On AIX, the GNU linker works like the native linker.
-  with_gnu_ld=no
-  ;;
-esac
-
-ld_shlibs=yes
-if test "$with_gnu_ld" = yes; then
-
-  # See if GNU ld supports shared libraries.
-  case "$host_os" in
-  amigaos*)
-    archive_cmds='$rm $objdir/a2ixlibrary.data~$echo "#define NAME $libname" > $objdir/a2ixlibrary.data~$echo "#define LIBRARY_ID 1" >> $objdir/a2ixlibrary.data~$echo "#define VERSION $major" >> $objdir/a2ixlibrary.data~$echo "#define REVISION $revision" >> $objdir/a2ixlibrary.data~$AR cru $lib$libobjs~$RANLIB $lib~(cd $objdir && a2ixlibrary -32)'
-    hardcode_libdir_flag_spec='-L$libdir'
-    hardcode_minus_L=yes
-    ;;
-
-  sunos4*)
-    archive_cmds='$LD -assert pure-text -Bstatic -o $lib$libobjs$deplibs'
-    hardcode_direct=yes
-    hardcode_minus_L=yes
-    hardcode_shlibpath_var=no
-    ;;
-
-  cygwin32* | mingw32*)
-    if test "$with_gcc" = yes; then
-      # hardcode_libdir_flag_spec is actually meaningless, as there is
-      # no search path for DLLs.
-      hardcode_libdir_flag_spec='-L$libdir'
-      allow_undefined_flag=unsupported
-      # Very, very bogus.
-      echo '
-#define WIN32_LEAN_AND_MEAN
-#include <windows.h>
-#undef WIN32_LEAN_AND_MEAN
-#include <stdio.h>
-
-BOOL APIENTRY DllMain (HINSTANCE hInst, DWORD reason, LPVOID reserved);
-
-#include <cygwin/cygwin_dll.h>
-DECLARE_CYGWIN_DLL( DllMain );
-HINSTANCE __hDllInstance_base;
-
-BOOL APIENTRY
-DllMain (HINSTANCE hInst, DWORD reason, LPVOID reserved)
-{
-  __hDllInstance_base = hInst;
-  return TRUE;
-}
-' > ltdll.c
-      archive_cmds='$CC -c '"`pwd`"'/ltdll.c~echo EXPORTS > $lib-def~
-      $DLLTOOL --export-all --output-def $lib-def $libobjs ltdll.$objext~
-      $CC -Wl,--base-file,$soname-base -Wl,--dll -nostartfiles -Wl,-e,__cygwin_dll_entry@12 $libobjs ltdll.$objext~
-      $DLLTOOL --as=$AS --dllname $soname --exclude-symbol=_cygwin_dll_entry@12 --def $lib-def --base-file $soname-base --output-exp $soname-exp~
-      $CC -Wl,--base-file,$soname-base $soname-exp -Wl,--dll -nostartfiles -Wl,-e,__cygwin_dll_entry@12 -o $lib $libobjs ltdll.$objext$deplibs~
-      $DLLTOOL --as=$AS --dllname $soname --exclude-symbol=_cygwin_dll_entry@12 --def $lib-def --base-file $soname-base --output-exp $soname-exp~
-      $CC $soname-exp -Wl,--dll -nostartfiles -Wl,-e,__cygwin_dll_entry@12 -o $lib $libobjs ltdll.$objext$deplibs~
-      $rm ltdll.$objext $soname-base $soname-exp'
-      archive_sym_cmds='$CC -c '"`pwd`"'/ltdll.c~echo EXPORTS > $lib-def~
-      cat "$export_symbols" >> $lib-def~
-      $CC -Wl,--base-file,$soname-base -Wl,--dll -nostartfiles -Wl,-e,__cygwin_dll_entry@12 $libobjs ltdll.$objext~
-      $DLLTOOL --as=$AS --dllname $soname --exclude-symbol=_cygwin_dll_entry@12 --def $lib-def --base-file $soname-base --output-exp $soname-exp~
-      $CC -Wl,--base-file,$soname-base $soname-exp -Wl,--dll -nostartfiles -Wl,-e,__cygwin_dll_entry@12 -o $lib $libobjs ltdll.$objext$deplibs~
-      $DLLTOOL --as=$AS --dllname $soname --exclude-symbol=_cygwin_dll_entry@12 --def $lib-def --base-file $soname-base --output-exp $soname-exp~
-      $CC $soname-exp -Wl,--dll -nostartfiles -Wl,-e,__cygwin_dll_entry@12 -o $lib $libobjs ltdll.$objext$deplibs~
-      $rm ltdll.$objext $soname-base $soname-exp'
-      old_archive_from_new_cmds='$DLLTOOL --as=$AS --dllname $soname --def $lib-def --output-lib $objdir/$libname.a~$rm $lib.exp'
-   else
-      # When not using gcc, we currently assume that we are using
-      # Microsoft Visual C++.
-      with_gnu_ld=no
-      # hardcode_libdir_flag_spec is actually meaningless, as there is
-      # no search path for DLLs.
-      hardcode_libdir_flag_spec=' '
-      allow_undefined_flag=unsupported
-      # Tell ltmain to make .lib files, not .a files.
-      libext=lib
-      # FIXME: Setting linknames here is a bad hack.
-      archive_cmds='$CC -o $lib$libobjs`echo "$deplibs" | sed -e '\''s/ -lc$//'\''` -link -dll~linknames='
-      # The linker will automatically build a .lib file if we build a DLL.
-      old_archive_from_new_cmds='true'
-      # FIXME: Should let the user specify the lib program.
-      old_archive_cmds='lib /OUT:$oldlib$oldobjs'
-      fix_srcfile_path='`cygpath -w $srcfile`'
-    fi
-    ;;
-
-  *)
-    if $LD --help 2>&1 | egrep ': supported targets:.* elf' > /dev/null; then
-      archive_cmds='$CC -shared ${wl}-soname $wl$soname -o $lib$libobjs$deplibs'
-      archive_sym_cmds='$CC -shared ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib$libobjs$deplibs'
-    else
-      ld_shlibs=no
-    fi
-    ;;
-  esac
-
-  if test "$ld_shlibs" = yes && test "$with_gnu_ld" = yes; then
-    runpath_var=LD_RUN_PATH
-    hardcode_libdir_flag_spec='${wl}--rpath ${wl}$libdir'
-    export_dynamic_flag_spec='${wl}--export-dynamic'
-    whole_archive_flag_spec='${wl}--whole-archive$convenience ${wl}--no-whole-archive'
-  fi
-else
-  # PORTME fill in a description of your system's linker (not GNU ld)
-  case "$host_os" in
-  aix3*)
-    allow_undefined_flag=unsupported
-    archive_cmds='$NM$libobjs | $global_symbol_pipe | sed '\''s/.* //'\' | sort | uniq' > $lib.exp~
-        $LD -o $objdir/$soname$libobjs$deplibs -bE:$lib.exp -T512 -H512 -bM:SRE~$AR cru $lib $objdir/$soname'
-    archive_sym_cmds='$LD -o $objdir/$soname$libobjs$deplibs -bE:$export_symbols -T512 -H512 -bM:SRE~$AR cru $lib $objdir/$soname'
-    # Note: this linker hardcodes the directories in LIBPATH if there
-    # are no directories specified by -L.
-    hardcode_minus_L=yes
-    if test "$with_gcc" = yes && test -z "$link_static_flag"; then
-      # Neither direct hardcoding nor static linking is supported with a
-      # broken collect2.
-      hardcode_direct=unsupported
-    fi
-    ;;
-
-  aix4*)
-    allow_undefined_flag=unsupported
-    archive_cmds='$NM$libobjs | $global_symbol_pipe | sed '\''s/.* //'\' | sort | uniq' > $lib.exp        else cat $export_symbols > $lib.exp~
-    	$CC -o $objdir/$soname$libobjs$deplibs ${wl}-bE:$lib.exp ${wl}-bM:SRE ${wl}-bnoentry~$AR cru $lib $objdir/$soname'
-    archive_sym_cmds='$CC -o $objdir/$soname$libobjs$deplibs ${wl}-bE:$export_symbols ${wl}-bM:SRE ${wl}-bnoentry~$AR cru $lib $objdir/$soname'
-    hardcode_direct=yes
-    hardcode_minus_L=yes
-    ;;
-
-  amigaos*)
-    archive_cmds='$rm $objdir/a2ixlibrary.data~$echo "#define NAME $libname" > $objdir/a2ixlibrary.data~$echo "#define LIBRARY_ID 1" >> $objdir/a2ixlibrary.data~$echo "#define VERSION $major" >> $objdir/a2ixlibrary.data~$echo "#define REVISION $revision" >> $objdir/a2ixlibrary.data~$AR cru $lib$libobjs~$RANLIB $lib~(cd $objdir && a2ixlibrary -32)'
-    hardcode_libdir_flag_spec='-L$libdir'
-    hardcode_minus_L=yes
-    ;;
-
-  cygwin32* | mingw32*)
-    if test "$with_gcc" = yes; then
-      # hardcode_libdir_flag_spec is actually meaningless, as there is
-      # no search path for DLLs.
-      hardcode_libdir_flag_spec='-L$libdir'
-      allow_undefined_flag=unsupported
-      # Very, very bogus.
-      echo '
-#define WIN32_LEAN_AND_MEAN
-#include <windows.h>
-#undef WIN32_LEAN_AND_MEAN
-#include <stdio.h>
-
-BOOL APIENTRY DllMain (HINSTANCE hInst, DWORD reason, LPVOID reserved);
-
-#include <cygwin/cygwin_dll.h>
-DECLARE_CYGWIN_DLL( DllMain );
-HINSTANCE __hDllInstance_base;
-
-BOOL APIENTRY
-DllMain (HINSTANCE hInst, DWORD reason, LPVOID reserved)
-{
-  __hDllInstance_base = hInst;
-  return TRUE;
-}
-' > ltdll.c
-      archive_cmds='$CC -c '"`pwd`"'/ltdll.c~echo EXPORTS > $lib-def~
-      $DLLTOOL --export-all --output-def $lib-def $libobjs ltdll.$objext~
-      $CC -Wl,--base-file,$soname-base -Wl,--dll -nostartfiles -Wl,-e,__cygwin_dll_entry@12 $libobjs ltdll.$objext~
-      $DLLTOOL --as=$AS --dllname $soname --exclude-symbol=_cygwin_dll_entry@12 --def $lib-def --base-file $soname-base --output-exp $soname-exp~
-      $CC -Wl,--base-file,$soname-base $soname-exp -Wl,--dll -nostartfiles -Wl,-e,__cygwin_dll_entry@12 -o $lib $libobjs ltdll.$objext$deplibs~
-      $DLLTOOL --as=$AS --dllname $soname --exclude-symbol=_cygwin_dll_entry@12 --def $lib-def --base-file $soname-base --output-exp $soname-exp~
-      $CC $soname-exp -Wl,--dll -nostartfiles -Wl,-e,__cygwin_dll_entry@12 -o $lib $libobjs ltdll.$objext$deplibs~
-      $rm ltdll.$objext $soname-base $soname-exp'
-      archive_sym_cmds='$CC -c '"`pwd`"'/ltdll.c~echo EXPORTS > $lib-def~
-      cat "$export_symbols" >> $lib-def~
-      $CC -Wl,--base-file,$soname-base -Wl,--dll -nostartfiles -Wl,-e,__cygwin_dll_entry@12 $libobjs ltdll.$objext~
-      $DLLTOOL --as=$AS --dllname $soname --exclude-symbol=_cygwin_dll_entry@12 --def $lib-def --base-file $soname-base --output-exp $soname-exp~
-      $CC -Wl,--base-file,$soname-base $soname-exp -Wl,--dll -nostartfiles -Wl,-e,__cygwin_dll_entry@12 -o $lib $libobjs ltdll.$objext$deplibs~
-      $DLLTOOL --as=$AS --dllname $soname --exclude-symbol=_cygwin_dll_entry@12 --def $lib-def --base-file $soname-base --output-exp $soname-exp~
-      $CC $soname-exp -Wl,--dll -nostartfiles -Wl,-e,__cygwin_dll_entry@12 -o $lib $libobjs ltdll.$objext$deplibs~
-      $rm ltdll.$objext $soname-base $soname-exp'
-      old_archive_from_new_cmds='$DLLTOOL --as=$AS --dllname $soname --def $lib-def --output-lib $objdir/$libname.a~$rm $lib.exp'
-    else
-      # When not using gcc, we currently assume that we are using
-      # Microsoft Visual C++.
-      # hardcode_libdir_flag_spec is actually meaningless, as there is
-      # no search path for DLLs.
-      hardcode_libdir_flag_spec=' '
-      allow_undefined_flag=unsupported
-      # Tell ltmain to make .lib files, not .a files.
-      libext=lib
-      # FIXME: Setting linknames here is a bad hack.
-      archive_cmds='$CC -o $lib$libobjs`echo "$deplibs" | sed -e '\''s/ -lc$//'\''` -link -dll~linknames='
-      # The linker will automatically build a .lib file if we build a DLL.
-      old_archive_from_new_cmds='true'
-      # FIXME: Should let the user specify the lib program.
-      old_archive_cmds='lib /OUT:$oldlib$oldobjs'
-      fix_srcfile_path='`cygpath -w $srcfile`'
-    fi
-    ;;
-
-  # FreeBSD 2.2.[012] allows us to include c++rt0.o to get C++ constructor
-  # support.  Future versions do this automatically, but an explicit c++rt0.o
-  # does not break anything, and helps significantly (at the cost of a little
-  # extra space).
-  freebsd2.2*)
-    archive_cmds='$LD -Bshareable -o $lib$libobjs$deplibs /usr/lib/c++rt0.o'
-    hardcode_libdir_flag_spec='-R$libdir'
-    hardcode_direct=yes
-    hardcode_minus_L=yes
-    hardcode_shlibpath_var=no
-    ;;
-
-  # Unfortunately, older versions of FreeBSD 2 do not have this feature.
-  freebsd2*)
-    archive_cmds='$LD -Bshareable -o $lib$libobjs$deplibs'
-    hardcode_direct=yes
-    hardcode_minus_L=yes
-    hardcode_shlibpath_var=no
-    ;;
-
-  # FreeBSD 3, at last, uses gcc -shared to do shared libraries.
-  freebsd3*)
-    archive_cmds='$CC -shared -o $lib$libobjs$deplibs'
-    hardcode_libdir_flag_spec='-R$libdir'
-    hardcode_direct=yes
-    hardcode_minus_L=no
-    hardcode_shlibpath_var=no
-    ;;
-
-  hpux9*)
-    archive_cmds='$rm $objdir/$soname~$LD -b +s +b $install_libdir -o $objdir/$soname$libobjs$deplibs~test $objdir/$soname = $lib || mv $objdir/$soname $lib'
-    hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir'
-    hardcode_direct=yes
-    hardcode_minus_L=yes
-    export_dynamic_flag_spec='${wl}-E'
-    ;;
-
-  hpux10* | hpux11*)
-    archive_cmds='$LD -b +h $soname +s +b $install_libdir -o $lib$libobjs$deplibs'
-    hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir'
-    hardcode_direct=yes
-    hardcode_minus_L=yes
-    export_dynamic_flag_spec='${wl}-E'
-    ;;
-
-  irix5* | irix6*)
-    if test "$with_gcc" = yes; then
-      archive_cmds='$CC -shared -o $lib ${wl}-soname ${wl}$soname ${wl}-set_version ${wl}$verstring$libobjs$deplibs'
-    else
-      archive_cmds='$LD -shared -o $lib -soname $soname -set_version $verstring$libobjs$deplibs'
-    fi
-    hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
-    ;;
-
-  netbsd*)
-    # Tested with NetBSD 1.2 ld
-    archive_cmds='$LD -Bshareable -o $lib$libobjs$deplibs'
-    hardcode_libdir_flag_spec='-R$libdir'
-    hardcode_direct=yes
-    hardcode_shlibpath_var=no
-    ;;
-
-  openbsd*)
-    archive_cmds='$LD -Bshareable -o $lib$libobjs$deplibs'
-    hardcode_libdir_flag_spec='-R$libdir'
-    hardcode_direct=yes
-    hardcode_shlibpath_var=no
-    ;;
-
-  os2*)
-    hardcode_libdir_flag_spec='-L$libdir'
-    hardcode_minus_L=yes
-    allow_undefined_flag=unsupported
-    archive_cmds='$echo "LIBRARY $libname INITINSTANCE" > $objdir/$libname.def~$echo "DESCRIPTION \"$libname\"" >> $objdir/$libname.def~$echo DATA >> $objdir/$libname.def~$echo " SINGLE NONSHARED" >> $objdir/$libname.def~$echo EXPORTS >> $objdir/$libname.def~emxexp$libobjs >> $objdir/$libname.def~$CC -Zdll -Zcrtdll -o $lib$libobjs$deplibs $objdir/$libname.def'
-    old_archive_from_new_cmds='emximp -o $objdir/$libname.a $objdir/$libname.def'
-    ;;
-
-  osf3* | osf4*)
-    if test "$with_gcc" = yes; then
-      allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*'
-      archive_cmds='$CC -shared${allow_undefined_flag} -o $lib ${wl}-soname ${wl}$soname ${wl}-set_version ${wl}$verstring$libobjs$deplibs'
-    else
-      allow_undefined_flag=' -expect_unresolved \*'
-      archive_cmds='$LD -shared${allow_undefined_flag} -o $lib -soname $soname -set_version $verstring$libobjs$deplibs'
-    fi
-    hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
-    hardcode_libdir_separator=:
-    ;;
-
-  sco3.2v5*)
-    archive_cmds='$LD -G -o $lib$libobjs$deplibs'
-    hardcode_direct=yes
-    ;;
-
-  solaris*)
-    no_undefined_flag=' -z text'
-    # $CC -shared without GNU ld will not create a library from C++
-    # object files and a static libstdc++, better avoid it by now
-    archive_cmds='$LD -G${allow_undefined_flag} -h $soname -o $lib$libobjs$deplibs'
-    archive_sym_cmds='$echo "{ global:" > $lib.exp~sed $export_symbols -e "s/.*/\1;/" >> $lib.exp~$echo "local: * }" >> $lib.exp~
-		$LD -G${allow_undefined_flag} -M $export_symbols -h $soname -o $lib$libobjs$deplibs~$rm $lib.exp'
-    hardcode_libdir_flag_spec='-R$libdir'
-    hardcode_shlibpath_var=no
-
-    # Solaris 2 before 2.5 hardcodes -L paths.
-    case "$host_os" in
-    solaris2.[0-4]*)
-      hardcode_minus_L=yes
-      ;;
-    esac
-    ;;
-
-  sunos4*)
-    # Why do we need -Bstatic?  To avoid inter-library dependencies, maybe...
-    if test "$with_gcc" = yes; then
-      archive_cmds='$CC -shared ${wl}-Bstatic -o $lib$libobjs$deplibs'
-    else
-      archive_cmds='$LD -assert pure-text -Bstatic -o $lib$libobjs$deplibs'
-    fi
-    hardcode_libdir_flag_spec='-L$libdir'
-    hardcode_direct=yes
-    hardcode_minus_L=yes
-    hardcode_shlibpath_var=no
-    ;;
-
-  uts4*)
-    archive_cmds='$LD -G -h $soname -o $lib$libobjs$deplibs'
-    hardcode_libdir_flag_spec='-L$libdir'
-    hardcode_direct=no
-    hardcode_minus_L=no
-    hardcode_shlibpath_var=no
-    ;;
-
-  dgux*)
-    archive_cmds='$LD -G -h $soname -o $lib$libobjs$deplibs'
-    hardcode_libdir_flag_spec='-L$libdir'
-    hardcode_direct=no
-    hardcode_minus_L=no
-    hardcode_shlibpath_var=no
-    ;;
-
-  *)
-    ld_shlibs=no
-    can_build_shared=no
-    ;;
-  esac
-fi
-echo "$ac_t$ld_shlibs" 1>&6
-
-if test -z "$NM"; then
-  echo $ac_n "checking for BSD-compatible nm... $ac_c" 1>&6
-  case "$NM" in
-  /* | [A-Za-z]:[/\\]*) ;; # Let the user override the test with a path.
-  *)
-    IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS="${IFS}:"
-    for ac_dir in /usr/ucb /usr/ccs/bin $PATH /bin; do
-      test -z "$ac_dir" && ac_dir=.
-      if test -f $ac_dir/nm; then
-        # Check to see if the nm accepts a BSD-compat flag.
-        # Adding the `sed 1q' prevents false positives on HP-UX, which says:
-        #   nm: unknown option "B" ignored
-        if ($ac_dir/nm -B /dev/null 2>&1 | sed '1q'; exit 0) | egrep /dev/null >/dev/null; then
-          NM="$ac_dir/nm -B"
-        elif ($ac_dir/nm -p /dev/null 2>&1 | sed '1q'; exit 0) | egrep /dev/null >/dev/null; then
-          NM="$ac_dir/nm -p"
-	else
-          NM="$ac_dir/nm"
-	fi
-        break
-      fi
-    done
-    IFS="$ac_save_ifs"
-    test -z "$NM" && NM=nm
-    ;;
-  esac
-  echo "$ac_t$NM" 1>&6
-fi
-
-# Check for command to grab the raw symbol name followed by C symbol from nm.
-echo $ac_n "checking command to parse $NM output... $ac_c" 1>&6
-
-# These are sane defaults that work on at least a few old systems.
-# [They come from Ultrix.  What could be older than Ultrix?!! ;)]
-
-# Character class describing NM global symbol codes.
-symcode='[BCDEGRSTU]'
-
-# Regexp to match symbols that can be accessed directly from C.
-sympat='\([_A-Za-z][_A-Za-z0-9]*\)'
-
-# Transform the above into a raw symbol and a C symbol.
-symxfrm='\1 \1'
-
-# Define system-specific variables.
-case "$host_os" in
-aix*)
-  symcode='[BCDTU]'
-  ;;
-sunos* | cygwin32* | mingw32*)
-  sympat='_\([_A-Za-z][_A-Za-z0-9]*\)'
-  symxfrm='_\1 \1'
-  ;;
-irix*)
-  # Cannot use undefined symbols on IRIX because inlined functions mess us up.
-  symcode='[BCDEGRST]'
-  ;;
-solaris*)
-  symcode='[BDTU]'
-  ;;
-esac
-
-# If we're using GNU nm, then use its standard symbol codes.
-if $NM -V 2>&1 | egrep '(GNU|with BFD)' > /dev/null; then
-  symcode='[ABCDGISTUW]'
-fi
-
-case "$host_os" in
-cygwin32* | mingw32*)
-  # We do not want undefined symbols on cygwin32.  The user must
-  # arrange to define them via -l arguments.
-  symcode='[ABCDGISTW]'
-  ;;
-esac
-
-# Write the raw and C identifiers.
-global_symbol_pipe="sed -n -e 's/^.* $symcode $sympat$/$symxfrm/p'"
-
-# Check to see that the pipe works correctly.
-pipe_works=no
-$rm conftest*
-cat > conftest.c <<EOF
-#ifdef __cplusplus
-extern "C" {
-#endif
-char nm_test_var;
-void nm_test_func(){}
-#ifdef __cplusplus
-}
-#endif
-main(){nm_test_var='a';nm_test_func();return(0);}
-EOF
-
-echo "$progname:1425: checking if global_symbol_pipe works" >&5
-if { (eval echo $progname:1426: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; } && test -s conftest.$objext; then
-  # Now try to grab the symbols.
-  nlist=conftest.nm
-  if { echo "$progname:1429: eval \"$NM conftest.$objext | $global_symbol_pipe > $nlist\"" >&5; eval "$NM conftest.$objext | $global_symbol_pipe > $nlist 2>&5"; } && test -s "$nlist"; then
-
-    # Try sorting and uniquifying the output.
-    if sort "$nlist" | uniq > "$nlist"T; then
-      mv -f "$nlist"T "$nlist"
-      wcout=`wc "$nlist" 2>/dev/null`
-      count=`$echo "X$wcout" | $Xsed -e 's/^[ 	]*\([0-9][0-9]*\).*$/\1/'`
-      (test "$count" -ge 0) 2>/dev/null || count=-1
-    else
-      rm -f "$nlist"T
-      count=-1
-    fi
-
-    # Make sure that we snagged all the symbols we need.
-    if egrep ' nm_test_var$' "$nlist" >/dev/null; then
-      if egrep ' nm_test_func$' "$nlist" >/dev/null; then
-	cat <<EOF > conftest.c
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-EOF
-        # Now generate the symbol file.
-        sed 's/^.* \(.*\)$/extern char \1;/' < "$nlist" >> conftest.c
-
-	cat <<EOF >> conftest.c
-#if defined (__STDC__) && __STDC__
-# define __ptr_t void *
-#else
-# define __ptr_t char *
-#endif
-
-/* The number of symbols in dld_preloaded_symbols, -1 if unsorted. */
-int dld_preloaded_symbol_count = $count;
-
-/* The mapping between symbol names and symbols. */
-struct {
-  char *name;
-  __ptr_t address;
-}
-dld_preloaded_symbols[] =
-{
-EOF
-        sed 's/^\(.*\) \(.*\)$/  {"\1", (__ptr_t) \&\2},/' < "$nlist" >> conftest.c
-        cat <<\EOF >> conftest.c
-  {0, (__ptr_t) 0}
-};
-
-#ifdef __cplusplus
-}
-#endif
-EOF
-        # Now try linking the two files.
-        mv conftest.$objext conftestm.$objext
-	save_LIBS="$LIBS"
-	save_CFLAGS="$CFLAGS"
-        LIBS="conftestm.$objext"
-	CFLAGS="$CFLAGS$no_builtin_flag"
-        if { (eval echo $progname:1487: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
-          pipe_works=yes
-        else
-          echo "$progname: failed program was:" >&5
-          cat conftest.c >&5
-        fi
-        LIBS="$save_LIBS"
-      else
-        echo "cannot find nm_test_func in $nlist" >&5
-      fi
-    else
-      echo "cannot find nm_test_var in $nlist" >&5
-    fi
-  else
-    echo "cannot run $global_symbol_pipe" >&5
-  fi
-else
-  echo "$progname: failed program was:" >&5
-  cat conftest.c >&5
-fi
-$rm conftest*
-
-# Do not use the global_symbol_pipe unless it works.
-echo "$ac_t$pipe_works" 1>&6
-test "$pipe_works" = yes || global_symbol_pipe=
-
-# Check hardcoding attributes.
-echo $ac_n "checking how to hardcode library paths into programs... $ac_c" 1>&6
-hardcode_action=
-if test -n "$hardcode_libdir_flag_spec" || \
-   test -n "$runpath_var"; then
-
-  # We can hardcode non-existant directories.
-  if test "$hardcode_direct" != no && \
-     test "$hardcode_minus_L" != no && \
-     test "$hardcode_shlibpath_var" != no; then
-
-    # Linking always hardcodes the temporary library directory.
-    hardcode_action=relink
-  else
-    # We can link without hardcoding, and we can hardcode nonexisting dirs.
-    hardcode_action=immediate
-  fi
-else
-  # We cannot hardcode anything, or else we can only hardcode existing
-  # directories.
-  hardcode_action=unsupported
-fi
-echo "$ac_t$hardcode_action" 1>&6
-
-
-reload_flag=
-reload_cmds='$LD$reload_flag -o $output$reload_objs'
-echo $ac_n "checking for $LD option to reload object files... $ac_c" 1>&6
-# PORTME Some linkers may need a different reload flag.
-reload_flag='-r'
-echo "$ac_t$reload_flag" 1>&6
-test -n "$reload_flag" && reload_flag=" $reload_flag"
-
-# PORTME Fill in your ld.so characteristics
-library_names_spec=
-libname_spec='lib$name'
-soname_spec=
-postinstall_cmds=
-postuninstall_cmds=
-finish_cmds=
-finish_eval=
-shlibpath_var=
-version_type=none
-dynamic_linker="$host_os ld.so"
-sys_lib_search_path="/lib /usr/lib /usr/local/lib"
-check_shared_deplibs_method='none'
-# Need to set the preceding variable on all platforms that support
-# interlibrary dependencies.
-# 'none' -- dependencies not supported.
-# 'pass_all' -- all dependencies passed with no checks.
-# 'test_compile' -- check by making test program.
-# 'file_regex' -- check by looking for filenames that look like the shared
-# library in the library path.
-# 'file_magic [regex]' -- check by looking for files in library path which
-# responds to the "file" command with a given regex.  This is actually a
-# superset of the file_regex command.  If you have file on your system, you'll
-# want to use this instead.
-# Notes: regexes are run through expr.
-
-echo $ac_n "checking dynamic linker characteristics... $ac_c" 1>&6
-case "$host_os" in
-aix3* | aix4*)
-  version_type=linux
-  library_names_spec='${libname}${release}.so$versuffix $libname.a'
-  shlibpath_var=LIBPATH
-
-  # AIX has no versioning support, so we append a major version to the name.
-  soname_spec='${libname}${release}.so$major'
-  ;;
-
-amigaos*)
-  library_names_spec='$libname.ixlibrary $libname.a'
-  # Create ${libname}_ixlibrary.a entries in /sys/libs.
-  finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`$echo "X$lib" | $Xsed -e '\''s%^.*/\([^/]*\)\.ixlibrary$%\1%'\''`; test $rm /sys/libs/${libname}_ixlibrary.a; $show "(cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a)"; (cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a) || exit 1; done'
-  ;;
-
-bsdi4*)
-  version_type=linux
-  library_names_spec='${libname}.so.$major ${libname}.so'
-  soname_spec='${libname}.so'
-  finish_cmds='PATH="$PATH:/sbin" ldconfig $libdir'
-  shlibpath_var=LD_LIBRARY_PATH
-  ;;
-
-cygwin32* | mingw32*)
-  version_type=windows
-  if test "$with_gcc" = yes; then
-    library_names_spec='${libname}`echo ${release} | sed -e 's/[.]/-/g'`${versuffix}.dll $libname.a'
-  else
-    library_names_spec='${libname}`echo ${release} | sed -e 's/[.]/-/g'`${versuffix}.dll $libname.lib'
-  fi
-  dynamic_linker='Win32 ld.exe'
-  libname_spec='$name'
-  shlibpath_var=PATH
-  ;;
-
-freebsd2* | freebsd3*)
-  objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout`
-  version_type=freebsd-$objformat
-  library_names_spec='${libname}${release}.so$versuffix $libname.so'
-  finish_cmds='PATH="$PATH:/sbin" OBJFORMAT="$objformat" ldconfig -m $libdir'
-  shlibpath_var=LD_LIBRARY_PATH
-  ;;
-
-gnu*)
-  version_type=linux
-  library_names_spec='${libname}${release}.so$versuffix ${libname}.so'
-  shlibpath_var=LD_LIBRARY_PATH
-  ;;
-
-hpux9* | hpux10* | hpux11*)
-  # Give a soname corresponding to the major version so that dld.sl refuses to
-  # link against other versions.
-  dynamic_linker="$host_os dld.sl"
-  version_type=sunos
-  shlibpath_var=SHLIB_PATH
-  library_names_spec='${libname}${release}.sl$versuffix ${libname}${release}.sl$major $libname.sl'
-  soname_spec='${libname}${release}.sl$major'
-  # HP-UX runs *really* slowly unless shared libraries are mode 555.
-  postinstall_cmds='chmod 555 $lib'
-  ;;
-
-irix5*)
-  version_type=osf
-  soname_spec='${libname}${release}.so'
-  library_names_spec='${libname}${release}.so$versuffix $libname.so'
-  shlibpath_var=LD_LIBRARY_PATH
-  ;;
-
-irix6*)
-  version_type=osf
-  soname_spec='${libname}${release}.so'
-  library_names_spec='${libname}${release}.so$versuffix $libname.so'
-  shlibpath_var=LD_LIBRARYN32_PATH
-  ;;
-
-# No shared lib support for Linux oldld, aout, or coff.
-linux-gnuoldld* | linux-gnuaout* | linux-gnucoff*)
-  dynamic_linker=no
-  ;;
-
-# This must be Linux ELF.
-linux-gnu*)
-  version_type=linux
-  library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major $libname.so'
-  soname_spec='${libname}${release}.so$major'
-  finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir'
-  shlibpath_var=LD_LIBRARY_PATH
-  check_shared_deplibs_method='file_magic ELF 32-bit LSB shared object'
-  sys_lib_search_path="/lib /usr/lib /usr/local/lib `echo $LD_LIBRARY_PATH | sed -e 's/:/ /g'`"
-
-  if test -f /lib/ld.so.1; then
-    dynamic_linker='GNU ld.so'
-  else
-    # Only the GNU ld.so supports shared libraries on MkLinux.
-    case "$host_cpu" in
-    powerpc*) dynamic_linker=no ;;
-    *) dynamic_linker='Linux ld.so' ;;
-    esac
-  fi
-  ;;
-
-netbsd* | openbsd*)
-  version_type=sunos
-  library_names_spec='${libname}${release}.so$versuffix'
-  finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
-  shlibpath_var=LD_LIBRARY_PATH
-  ;;
-
-os2*)
-  libname_spec='$name'
-  library_names_spec='$libname.dll $libname.a'
-  dynamic_linker='OS/2 ld.exe'
-  shlibpath_var=LIBPATH
-  ;;
-
-osf3* | osf4*)
-  version_type=osf
-  soname_spec='${libname}${release}.so'
-  library_names_spec='${libname}${release}.so$versuffix $libname.so'
-  shlibpath_var=LD_LIBRARY_PATH
-  check_shared_deplibs_method='pass_all'
-  ;;
-
-sco3.2v5*)
-  version_type=osf
-  soname_spec='${libname}${release}.so$major'
-  library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major $libname.so'
-  shlibpath_var=LD_LIBRARY_PATH
-  ;;
-
-solaris*)
-  version_type=linux
-  library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major $libname.so'
-  soname_spec='${libname}${release}.so$major'
-  shlibpath_var=LD_LIBRARY_PATH
-  # ldd complains unless libraries are executable
-  postinstall_cmds='chmod +x $lib'
-  ;;
-
-sunos4*)
-  version_type=sunos
-  library_names_spec='${libname}${release}.so$versuffix ${libname}.so$versuffix'
-  finish_cmds='PATH="\$PATH:/usr/etc" ldconfig $libdir'
-  shlibpath_var=LD_LIBRARY_PATH
-  ;;
-
-sysv4.2uw2*)
-  version_type=linux
-  library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major $libname.so'
-  soname_spec='${libname}${release}.so$major'
-  shlibpath_var=LD_LIBRARY_PATH
-  ;;
-
-uts4*)
-  version_type=linux
-  library_names_spec='${libname}${release}.so.$versuffix ${libname}${release}.so.$major $libname.so'
-  soname_spec='${libname}${release}.so.$major'
-  shlibpath_var=LD_LIBRARY_PATH
-  ;;
-
-dgux*)
-  version_type=linux
-  library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major $libname.so'
-  soname_spec='${libname}${release}.so$major'
-  shlibpath_var=LD_LIBRARY_PATH
-  ;;
-
-*)
-  dynamic_linker=no
-  ;;
-esac
-echo "$ac_t$dynamic_linker" 1>&6
-test "$dynamic_linker" = no && can_build_shared=no
-
-# Report the final consequences.
-echo "checking if libtool supports shared libraries... $can_build_shared" 1>&6
-
-echo $ac_n "checking whether to build shared libraries... $ac_c" 1>&6
-test "$can_build_shared" = "no" && enable_shared=no
-
-# On AIX, shared libraries and static libraries use the same namespace, and
-# are all built from PIC.
-case "$host_os" in
-aix*)
-  test "$enable_shared" = yes && enable_static=no
-  if test -n "$RANLIB"; then
-    archive_cmds="$archive_cmds~\$RANLIB \$lib"
-    postinstall_cmds='$RANLIB $lib'
-  fi
-  ;;
-esac
-
-echo "$ac_t$enable_shared" 1>&6
-
-# Make sure either enable_shared or enable_static is yes.
-test "$enable_shared" = yes || enable_static=yes
-
-echo "checking whether to build static libraries... $enable_static" 1>&6
-
-echo $ac_n "checking for objdir... $ac_c" 1>&6
-rm -f .libs 2>/dev/null
-mkdir .libs 2>/dev/null
-if test -d .libs; then
-  objdir=.libs
-else
-  # MS-DOS does not allow filenames that begin with a dot.
-  objdir=_libs
-fi
-rmdir .libs 2>/dev/null
-echo "$ac_t$objdir" 1>&6
-
-# Copy echo and quote the copy, instead of the original, because it is
-# used later.
-ltecho="$echo"
-if test "X$ltecho" = "X$CONFIG_SHELL $0 --fallback-echo"; then
-   ltecho="$CONFIG_SHELL \$0 --fallback-echo"
-fi
-LTSHELL="$SHELL"
-
-# Only quote variables if we're using ltmain.sh.
-case "$ltmain" in
-*.sh)
-  # Now quote all the things that may contain metacharacters.
-  for var in ltecho old_CC old_CFLAGS old_CPPFLAGS old_LD old_NM old_RANLIB \
-    old_LN_S old_DLLTOOL old_AS AR CC LD LN_S NM LTSHELL VERSION \
-    reload_flag reload_cmds wl \
-    pic_flag link_static_flag no_builtin_flag export_dynamic_flag_spec \
-    whole_archive_flag_spec libname_spec library_names_spec soname_spec \
-    RANLIB old_archive_cmds old_archive_from_new_cmds old_postinstall_cmds \
-    old_postuninstall_cmds archive_cmds archive_sym_cmds postinstall_cmds postuninstall_cmds \
-    check_shared_deplibs_method allow_undefined_flag no_undefined_flag \
-    finish_cmds finish_eval global_symbol_pipe \
-    hardcode_libdir_flag_spec hardcode_libdir_separator sys_lib_search_path \
-    compiler_c_o compiler_o_lo need_locks; do
-
-    case "$var" in
-    reload_cmds | old_archive_cmds | old_archive_from_new_cmds | \
-    old_postinstall_cmds | old_postuninstall_cmds | \
-    archive_cmds | archive_sym_cmds | \
-    postinstall_cmds | postuninstall_cmds | \
-    finish_cmds | sys_lib_search_path)
-      # Double-quote double-evaled strings.
-      eval "$var=\\\"\`\$echo \"X\$$var\" | \$Xsed -e \"\$double_quote_subst\" -e \"\$sed_quote_subst\"\`\\\""
-      ;;
-    *)
-      eval "$var=\\\"\`\$echo \"X\$$var\" | \$Xsed -e \"\$sed_quote_subst\"\`\\\""
-      ;;
-    esac
-  done
-
-  case "$ltecho" in
-  *'\$0 --fallback-echo"')
-    ltecho=`$echo "X$ltecho" |
-	    $Xsed -e 's/\\\\\\\$0 --fallback-echo"$/$0 --fallback-echo"/'`
-    ;;
-  esac
-
-  trap "$rm \"$ofile\"; exit 1" 1 2 15
-  echo "creating $ofile"
-  $rm "$ofile"
-  cat <<EOF > "$ofile"
-#! $SHELL
-
-# `$echo "$ofile" | sed 's%^.*/%%'` - Provide generalized library-building support services.
-# Generated automatically by $PROGRAM (GNU $PACKAGE $VERSION)
-# NOTE: Changes made to this file will be lost: look at ltconfig or ltmain.sh.
-#
-# Copyright (C) 1996-1998 Free Software Foundation, Inc.
-# Gordon Matzigkeit <gord@gnu.ai.mit.edu>, 1996
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-#
-# As a special exception to the GNU General Public License, if you
-# distribute this file as part of a program that contains a
-# configuration script generated by Autoconf, you may include it under
-# the same distribution terms that you use for the rest of that program.
-
-# Sed that helps us avoid accidentally triggering echo(1) options like -n.
-Xsed="sed -e s/^X//"
-
-# The HP-UX ksh and POSIX shell print the target directory to stdout
-# if CDPATH is set.
-if test "\${CDPATH+set}" = set; then CDPATH=; export CDPATH; fi
-
-### BEGIN LIBTOOL CONFIG
-EOF
-  cfgfile="$ofile"
-  ;;
-
-*)
-  # Double-quote the variables that need it (for aesthetics).
-  for var in old_CC old_CFLAGS old_CPPFLAGS old_LD old_NM old_RANLIB \
-    old_LN_S old_DLLTOOL old_AS; do
-    eval "$var=\\\"\$var\\\""
-  done
-
-  # Just create a config file.
-  cfgfile="$ofile.cfg"
-  trap "$rm \"$cfgfile\"; exit 1" 1 2 15
-  echo "creating $cfgfile"
-  $rm "$cfgfile"
-  cat <<EOF > "$cfgfile"
-# `$echo "$cfgfile" | sed 's%^.*/%%'` - Libtool configuration file.
-# Generated automatically by $PROGRAM (GNU $PACKAGE $VERSION)
-EOF
-  ;;
-esac
-
-cat <<EOF >> "$cfgfile"
-# Libtool was configured as follows, on host `(hostname || uname -n) 2>/dev/null | sed 1q`:
-#
-# CC=$old_CC CFLAGS=$old_CFLAGS CPPFLAGS=$old_CPPFLAGS \\
-# LD=$old_LD NM=$old_NM RANLIB=$old_RANLIB LN_S=$old_LN_S \\
-# DLLTOOL="$old_DLLTOOL" AS="$old_AS" \\
-#   $0$ltconfig_args
-#
-# Compiler and other test output produced by $progname, useful for
-# debugging $progname, is in ./config.log if it exists.
-
-# The version of $progname that generated this script.
-LTCONFIG_VERSION=$VERSION
-
-# Shell to use when invoking shell scripts.
-SHELL=$LTSHELL
-
-# Whether or not to build shared libraries.
-build_libtool_libs=$enable_shared
-
-# Whether or not to build static libraries.
-build_old_libs=$enable_static
-
-# The host system.
-host_alias=$host_alias
-host=$host
-
-# An echo program that does not interpret backslashes.
-echo=$ltecho
-
-# The archiver.
-AR=$AR
-
-# The default C compiler.
-CC=$CC
-
-# The linker used to build libraries.
-LD=$LD
-
-# Whether we need hard or soft links.
-LN_S=$LN_S
-
-# A BSD-compatible nm program.
-NM=$NM
-
-# Used on cygwin32: DLL creation program.
-DLLTOOL="$DLLTOOL"
-
-# Used on cygwin32: assembler.
-AS="$AS"
-
-# The name of the directory that contains temporary libtool files.
-objdir=$objdir
-
-# How to create reloadable object files.
-reload_flag=$reload_flag
-reload_cmds=$reload_cmds
-
-# How to pass a linker flag through the compiler.
-wl=$wl
-
-# Object file suffix (normally "o").
-objext="$objext"
-
-# Old archive suffix (normally "a").
-libext="$libext"
-
-# Additional compiler flags for building library objects.
-pic_flag=$pic_flag
-
-# Does compiler simultaneously support -c and -o options
-compiler_c_o=$compiler_c_o
-
-# Can we write directly to a .lo ?
-compiler_o_lo=$compiler_o_lo
-
-# Must we lock files when doing compilation ?
-need_locks=$need_locks
-
-# Compiler flag to prevent dynamic linking.
-link_static_flag=$link_static_flag
-
-# Compiler flag to turn off builtin functions.
-no_builtin_flag=$no_builtin_flag
-
-# Compiler flag to allow reflexive dlopens.
-export_dynamic_flag_spec=$export_dynamic_flag_spec
-
-# Compiler flag to generate shared objects directly from archives.
-whole_archive_flag_spec=$whole_archive_flag_spec
-
-# Library versioning type.
-version_type=$version_type
-
-# Format of library name prefix.
-libname_spec=$libname_spec
-
-# List of archive names.  First name is the real one, the rest are links.
-# The last name is the one that the linker finds with -lNAME.
-library_names_spec=$library_names_spec
-
-# The coded name of the library, if different from the real name.
-soname_spec=$soname_spec
-
-# Commands used to build and install an old-style archive.
-RANLIB=$RANLIB
-old_archive_cmds=$old_archive_cmds
-old_postinstall_cmds=$old_postinstall_cmds
-old_postuninstall_cmds=$old_postuninstall_cmds
-
-# Create an old-style archive from a shared archive.
-old_archive_from_new_cmds=$old_archive_from_new_cmds
-
-# Commands used to build and install a shared archive.
-archive_cmds=$archive_cmds
-archive_sym_cmds=$archive_sym_cmds
-postinstall_cmds=$postinstall_cmds
-postuninstall_cmds=$postuninstall_cmds
-
-# Method to check whether dependent libraries are shared objects.
-check_shared_deplibs_method=$check_shared_deplibs_method
-
-# Flag that allows shared libraries with undefined symbols to be built.
-allow_undefined_flag=$allow_undefined_flag
-
-# Flag that forces no undefined symbols.
-no_undefined_flag=$no_undefined_flag
-
-# Commands used to finish a libtool library installation in a directory.
-finish_cmds=$finish_cmds
-
-# Same as above, but a single script fragment to be evaled but not shown.
-finish_eval=$finish_eval
-
-# Take the output of nm and produce a listing of raw symbols and C names.
-global_symbol_pipe=$global_symbol_pipe
-
-# This is the shared library runtime path variable.
-runpath_var=$runpath_var
-
-# This is the shared library path variable.
-shlibpath_var=$shlibpath_var
-
-# How to hardcode a shared library path into an executable.
-hardcode_action=$hardcode_action
-
-# Flag to hardcode \$libdir into a binary during linking.
-# This must work even if \$libdir does not exist.
-hardcode_libdir_flag_spec=$hardcode_libdir_flag_spec
-
-# Whether we need a single -rpath flag with a separated argument.
-hardcode_libdir_separator=$hardcode_libdir_separator
-
-# Set to yes if using DIR/libNAME.so during linking hardcodes DIR into the
-# resulting binary.
-hardcode_direct=$hardcode_direct
-
-# Set to yes if using the -LDIR flag during linking hardcodes DIR into the
-# resulting binary.
-hardcode_minus_L=$hardcode_minus_L
-
-# Set to yes if using SHLIBPATH_VAR=DIR during linking hardcodes DIR into
-# the resulting binary.
-hardcode_shlibpath_var=$hardcode_shlibpath_var
-
-# System search path for libraries
-sys_lib_search_path=$sys_lib_search_path
-
-# Fix the shell variable \$srcfile for the compiler.
-fix_srcfile_path="$fix_srcfile_path"
-EOF
-
-case "$ltmain" in
-*.sh)
-  echo '### END LIBTOOL CONFIG' >> "$ofile"
-  echo >> "$ofile"
-  case "$host_os" in
-  aix3*)
-    cat <<\EOF >> "$ofile"
-
-# AIX sometimes has problems with the GCC collect2 program.  For some
-# reason, if we set the COLLECT_NAMES environment variable, the problems
-# vanish in a puff of smoke.
-if test "${COLLECT_NAMES+set}" != set; then
-  COLLECT_NAMES=
-  export COLLECT_NAMES
-fi
-EOF
-    ;;
-  esac
-
-  # Append the ltmain.sh script.
-  cat "$ltmain" >> "$ofile" || (rm -f "$ofile"; exit 1)
-
-  chmod +x "$ofile"
-  ;;
-
-*)
-  # Compile the libtool program.
-  echo "FIXME: would compile $ltmain"
-  ;;
-esac
-exit 0
-
-# Local Variables:
-# mode:shell-script
-# sh-indentation:2
-# End:
diff --git a/ltmain.sh b/ltmain.sh
deleted file mode 100644
index 397cc1e..0000000
--- a/ltmain.sh
+++ /dev/null
@@ -1,3079 +0,0 @@
-# ltmain.sh - Provide generalized library-building support services.
-# NOTE: Changing this file will not affect anything until you rerun ltconfig.
-#
-# Copyright (C) 1996-1998 Free Software Foundation, Inc.
-# Gordon Matzigkeit <gord@gnu.ai.mit.edu>, 1996
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-#
-# As a special exception to the GNU General Public License, if you
-# distribute this file as part of a program that contains a
-# configuration script generated by Autoconf, you may include it under
-# the same distribution terms that you use for the rest of that program.
-
-# Check that we have a working $echo.
-if test "X$1" = X--no-reexec; then
-  # Discard the --no-reexec flag, and continue.
-  shift
-elif test "X$1" = X--fallback-echo; then
-  # used as fallback echo
-  shift
-  cat <<EOF
-$*
-EOF
-  exit 0
-elif test "X`($echo '\t') 2>/dev/null`" = 'X\t'; then
-  # Yippee, $echo works!
-  :
-else
-  # Restart under the correct shell, and then maybe $echo will work.
-  exec $SHELL "$0" --no-reexec ${1+"$@"}
-fi
-
-# The name of this program.
-progname=`$echo "$0" | sed 's%^.*/%%'`
-modename="$progname"
-
-# Constants.
-PROGRAM=ltmain.sh
-PACKAGE=libtool
-VERSION=1.2d
-
-default_mode=
-help="Try \`$progname --help' for more information."
-magic="%%%MAGIC variable%%%"
-mkdir="mkdir"
-mv="mv -f"
-rm="rm -f"
-
-# Sed substitution that helps us do robust quoting.  It backslashifies
-# metacharacters that are still active within double-quoted strings.
-Xsed='sed -e s/^X//'
-sed_quote_subst='s/\([\\`\\"$\\\\]\)/\\\1/g'
-
-# NLS nuisances.
-# Only set LANG and LC_ALL to C if already set.
-# These must not be set unconditionally because not all systems understand
-# e.g. LANG=C (notably SCO).
-# We save the old values to restore during execute mode.
-if test "${LC_ALL+set}" = set; then
-  save_LC_ALL="$LC_ALL"; LC_ALL=C; export LC_ALL
-fi
-if test "${LANG+set}" = set; then
-  save_LANG="$LANG"; LANG=C; export LANG
-fi
-
-if test "$LTCONFIG_VERSION" != "$VERSION"; then
-  echo "$modename: ltconfig version \`$LTCONFIG_VERSION' does not match $PROGRAM version \`$VERSION'" 1>&2
-  echo "Fatal configuration error.  See the $PACKAGE docs for more information." 1>&2
-  exit 1
-fi
-
-if test "$build_libtool_libs" != yes && test "$build_old_libs" != yes; then
-  echo "$modename: not configured to build any kind of library" 1>&2
-  echo "Fatal configuration error.  See the $PACKAGE docs for more information." 1>&2
-  exit 1
-fi
-
-# Global variables.
-mode=$default_mode
-nonopt=
-prev=
-prevopt=
-run=
-show="$echo"
-show_help=
-execute_dlfiles=
-lo2o="s/\\.lo\$/.${objext}/"
-los2o="s/\\.lo /.${objext} /g"
-
-# Parse our command line options once, thoroughly.
-while test $# -gt 0
-do
-  arg="$1"
-  shift
-
-  case "$arg" in
-  -*=*) optarg=`$echo "X$arg" | $Xsed -e 's/[-_a-zA-Z0-9]*=//'` ;;
-  *) optarg= ;;
-  esac
-
-  # If the previous option needs an argument, assign it.
-  if test -n "$prev"; then
-    case "$prev" in
-    execute_dlfiles)
-      eval "$prev=\"\$$prev \$arg\""
-      ;;
-    *)
-      eval "$prev=\$arg"
-      ;;
-    esac
-
-    prev=
-    prevopt=
-    continue
-  fi
-
-  # Have we seen a non-optional argument yet?
-  case "$arg" in
-  --help)
-    show_help=yes
-    ;;
-
-  --version)
-    echo "$PROGRAM (GNU $PACKAGE) $VERSION"
-    exit 0
-    ;;
-
-  --config)
-    sed -e '1,/^### BEGIN LIBTOOL CONFIG/d' -e '/^### END LIBTOOL CONFIG/,$d' $0
-    exit 0
-    ;;
-
-  --debug)
-    echo "$progname: enabling shell trace mode"
-    set -x
-    ;;
-
-  --dry-run | -n)
-    run=:
-    ;;
-
-  --features)
-    echo "host: $host"
-    if test "$build_libtool_libs" = yes; then
-      echo "enable shared libraries"
-    else
-      echo "disable shared libraries"
-    fi
-    if test "$build_old_libs" = yes; then
-      echo "enable static libraries"
-    else
-      echo "disable static libraries"
-    fi
-    exit 0
-    ;;
-
-  --finish) mode="finish" ;;
-
-  --mode) prevopt="--mode" prev=mode ;;
-  --mode=*) mode="$optarg" ;;
-
-  --quiet | --silent)
-    show=:
-    ;;
-
-  -dlopen)
-    prevopt="-dlopen"
-    prev=execute_dlfiles
-    ;;
-
-  -*)
-    $echo "$modename: unrecognized option \`$arg'" 1>&2
-    $echo "$help" 1>&2
-    exit 1
-    ;;
-
-  *)
-    nonopt="$arg"
-    break
-    ;;
-  esac
-done
-
-if test -n "$prevopt"; then
-  $echo "$modename: option \`$prevopt' requires an argument" 1>&2
-  $echo "$help" 1>&2
-  exit 1
-fi
-
-if test -z "$show_help"; then
-
-  # Infer the operation mode.
-  if test -z "$mode"; then
-    case "$nonopt" in
-    *cc | *++ | gcc* | *-gcc*)
-      mode=link
-      for arg
-      do
-        case "$arg" in
-        -c)
-           mode=compile
-           break
-           ;;
-        esac
-      done
-      ;;
-    *db | *dbx | *strace | *truss)
-      mode=execute
-      ;;
-    *install*|cp|mv)
-      mode=install
-      ;;
-    *rm)
-      mode=uninstall
-      ;;
-    *)
-      # If we have no mode, but dlfiles were specified, then do execute mode.
-      test -n "$execute_dlfiles" && mode=execute
-
-      # Just use the default operation mode.
-      if test -z "$mode"; then
-        if test -n "$nonopt"; then
-          $echo "$modename: warning: cannot infer operation mode from \`$nonopt'" 1>&2
-        else
-          $echo "$modename: warning: cannot infer operation mode without MODE-ARGS" 1>&2
-        fi
-      fi
-      ;;
-    esac
-  fi
-
-  # Only execute mode is allowed to have -dlopen flags.
-  if test -n "$execute_dlfiles" && test "$mode" != execute; then
-    $echo "$modename: unrecognized option \`-dlopen'" 1>&2
-    $echo "$help" 1>&2
-    exit 1
-  fi
-
-  # Change the help message to a mode-specific one.
-  generic_help="$help"
-  help="Try \`$modename --help --mode=$mode' for more information."
-
-  # These modes are in order of execution frequency so that they run quickly.
-  case "$mode" in
-  # libtool compile mode
-  compile)
-    modename="$modename: compile"
-    # Get the compilation command and the source file.
-    base_compile=
-    lastarg=
-    srcfile="$nonopt"
-    suppress_output=
-    force_static=no
-
-    user_target=no
-    for arg
-    do
-      # Accept any command-line options.
-      case "$arg" in
-      -o)
-        if test "$user_target" != "no"; then
-          $echo "$modename: you cannot specify \`-o' more than once" 1>&2
-	  exit 1
-        fi
-        user_target=next
-	;;
-
-      -force-static)
-        force_static=yes
-        continue
-        ;;
-	
-      -static)
-        build_old_libs=yes
-        continue
-        ;;
-      esac
-
-      case "$user_target" in
-      next)
-        # The next one is the -o target name
-        user_target=yes
-        continue
-        ;;
-      yes)
-        # We got the output file
-        user_target=set
-        libobj="$arg"
-        continue
-        ;;
-      esac
-
-      # Accept the current argument as the source file.
-      lastarg="$srcfile"
-      srcfile="$arg"
-
-      # Aesthetically quote the previous argument.
-
-      # Backslashify any backslashes, double quotes, and dollar signs.
-      # These are the only characters that are still specially
-      # interpreted inside of double-quoted scrings.
-      lastarg=`$echo "X$lastarg" | $Xsed -e "$sed_quote_subst"`
-
-      # Double-quote args containing other shell metacharacters.
-      # Many Bourne shells cannot handle close brackets correctly in scan
-      # sets, so we specify it separately.
-      case "$lastarg" in
-      *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \	]*|*]*)
-        lastarg="\"$lastarg\""
-        ;;
-      esac
-
-      # Add the previous argument to base_compile.
-      if test -z "$base_compile"; then
-        base_compile="$lastarg"
-      else
-        base_compile="$base_compile $lastarg"
-      fi
-    done
-
-    case "$user_target" in
-    set)
-      ;;
-    no)
-      # Get the name of the library object.
-      libobj=`$echo "X$srcfile" | $Xsed -e 's%^.*/%%'`
-      ;;
-    *)
-      $echo "$modename: you must specify a target with \`-o'" 1>&2
-      exit 1
-      ;;
-    esac
-
-    # Recognize several different file suffixes.
-    # If the user specifies -o file.o, it is replaced with file.lo
-    xform='[cCFSfmso]'
-    case "$libobj" in
-    *.ada) xform=ada ;;
-    *.adb) xform=adb ;;
-    *.ads) xform=ads ;;
-    *.asm) xform=asm ;;
-    *.c++) xform=c++ ;;
-    *.cc) xform=cc ;;
-    *.cpp) xform=cpp ;;
-    *.cxx) xform=cxx ;;
-    *.f90) xform=f90 ;;
-    *.for) xform=for ;;
-    esac
-
-    libobj=`$echo "X$libobj" | $Xsed -e "s/\.$xform$/.lo/"`
-
-    case "$libobj" in
-    *.lo) obj=`$echo "X$libobj" | $Xsed -e "$lo2o"` ;;
-    *)
-      $echo "$modename: cannot determine name of library object from \`$libobj'" 1>&2
-      exit 1
-      ;;
-    esac
-
-    if test -z "$base_compile"; then
-      $echo "$modename: you must specify a compilation command" 1>&2
-      $echo "$help" 1>&2
-      exit 1
-    fi
-
-    # Delete any leftover library objects.
-    if test "$build_old_libs" = yes; then
-      removelist="$obj $libobj $lockfile"
-    else
-      removelist="$libobj $lockfile"
-    fi
-
-    $run $rm $removelist
-    trap "$run $rm $removelist; exit 1" 1 2 15
-
-    # Calculate the filename of the output object if compiler does
-    # not support -o with -c
-    if test "$compiler_c_o" = no; then
-      output_obj=`$echo "X$srcfile" | $Xsed -e 's%^.*/%%' -e 's%\..*$%%'`.${objext}
-      lockfile="$output_obj.lock"
-      removelist="$removelist $output_obj $lockfile"
-      trap "$run $rm $removelist; exit 1" 1 2 15
-    else
-      need_locks=no
-      lockfile=
-    fi
-
-    # Lock this critical section if it is needed
-    # We use this script file to make the link, it avoids creating a new file
-    if test "$need_locks" = yes; then
-      until ln "$0" "$lockfile" 2>/dev/null; do
-        $show "Waiting for $lockfile to be removed"
-        sleep 2
-      done
-    elif test "$need_locks" = warn; then
-      if test -f "$lockfile"; then
-	echo "\
-*** ERROR, $lockfile exists and contains:
-`cat $lockfile 2>/dev/null`
-
-This indicates that another process is trying to use the same
-temporary object file, and libtool could not work around it because
-your compiler does not support \`-c' and \`-o' together.  If you
-repeat this compilation, it may succeed, by chance, but you had better
-avoid parallel builds (make -j) in this platform, or get a better
-compiler."
-
-	$run $rm $removelist
-	exit 1
-      fi
-      echo $srcfile > "$lockfile"
-    fi
-
-    if test -n "$fix_srcfile_path"; then
-      eval srcfile=\"$fix_srcfile_path\"
-    fi
-
-    # Only build a PIC object if we are building libtool libraries.
-    if test "$build_libtool_libs" = yes; then
-      # Without this assignment, base_compile gets emptied.
-      fbsd_hideous_sh_bug=$base_compile
-
-      # All platforms use -DPIC, to notify preprocessed assembler code.
-      command="$base_compile$pic_flag -DPIC $srcfile"
-      if test "$compiler_o_lo" = yes; then
-        command="$command -o $libobj"
-        output_obj="$libobj"
-      elif test "$compiler_c_o" = yes; then
-        command="$command -o $obj"
-        output_obj="$obj"
-      fi
-
-      $show "$command"
-      if $run eval "$command"; then :
-      else
-        test -n "$output_obj" && $run $rm $removelist
-        exit 1
-      fi
-
-      if test "$need_locks" = warn &&
-	 test x"`cat $lockfile 2>/dev/null`" != x"$srcfile"; then
-	echo "\
-*** ERROR, $lockfile contains:
-`cat $lockfile 2>/dev/null`
-
-but it should contain:
-$srcfile
-
-This indicates that another process is trying to use the same
-temporary object file, and libtool could not work around it because
-your compiler does not support \`-c' and \`-o' together.  If you
-repeat this compilation, it may succeed, by chance, but you had better
-avoid parallel builds (make -j) in this platform, or get a better
-compiler."
-
-	$run $rm $removelist
-	exit 1
-      fi
-
-      # Just move the object if needed, then go on to compile the next one
-      if test "$compiler_o_lo" = no && test x"$output_obj" != x"$libobj"; then
-        $show "$mv $output_obj $libobj"
-        if $run $mv $output_obj $libobj; then :
-	else
-	  error=$?
-	  $run $rm $removelist
-	  exit $error
-	fi
-      fi
-
-      # If we have no pic_flag and do not have -force-static, 
-      # then copy the object into place and finish.
-      if test -z "$pic_flag" && test "$force_static" = no; then
-        $show "$LN_S $libobj $obj"
-        if $run $LN_S $libobj $obj; then
-	  exit 0
-	else
-          error=$?
-	  $run $rm $removelist
-	  exit $error
-	fi
-      fi
-
-      # Allow error messages only from the first compilation.
-      suppress_output=' >/dev/null 2>&1'
-    fi
-
-    # Only build a position-dependent object if we build old libraries.
-    if test "$build_old_libs" = yes; then
-      command="$base_compile $srcfile"
-      if test "$force_static" = yes; then
-        command="$command -DLIBTOOL_STATIC"
-      fi
-      if test "$compiler_c_o" = yes; then
-        command="$command -o $obj"
-        output_obj="$obj"
-      fi
-
-      # Suppress compiler output if we already did a PIC compilation.
-      command="$command$suppress_output"
-      $show "$command"
-      if $run eval "$command"; then :
-      else
-        $run $rm $removelist
-        exit 1
-      fi
-
-      if test "$need_locks" = warn &&
-	 test x"`cat $lockfile 2>/dev/null`" != x"$srcfile"; then
-	echo "\
-*** ERROR, $lockfile contains:
-`cat $lockfile 2>/dev/null`
-
-but it should contain:
-$srcfile
-
-This indicates that another process is trying to use the same
-temporary object file, and libtool could not work around it because
-your compiler does not support \`-c' and \`-o' together.  If you
-repeat this compilation, it may succeed, by chance, but you had better
-avoid parallel builds (make -j) in this platform, or get a better
-compiler."
-
-	$run $rm $removelist
-	exit 1
-      fi
-
-      # Just move the object if needed
-      if test "$compiler_c_o" = no && test x"$output_obj" != x"$obj"; then
-        $show "$mv $output_obj $obj"
-        if $run $mv $output_obj $obj; then :
-	else
-	  error=$?
-	  $run $rm $removelist
-	  exit $error
-	fi
-      fi
-    fi
-
-    # Unlock the critical section if it was locked
-    if test "$need_locks" != no; then
-      $rm "$lockfile"
-    fi
-
-    # Create an invalid libtool object if no PIC, so that we do not
-    # accidentally link it into a program.
-    if test "$build_libtool_libs" != yes; then
-      $show "echo timestamp > $libobj"
-      $run eval "echo timestamp > \$libobj" || exit $?
-    fi
-
-    exit 0
-    ;;
-
-  # libtool link mode
-  link)
-    modename="$modename: link"
-    C_compiler="$CC" # save it, to compile generated C sources
-    CC="$nonopt"
-    allow_undefined=yes
-    compile_command="$CC"
-    finalize_command="$CC"
-
-    compile_shlibpath=
-    finalize_shlibpath=
-    convenience=
-    old_convenience=
-    deplibs=
-    eval lib_search_path=\"$sys_lib_search_path\"
-    
-    dlfiles=
-    dlprefiles=
-    export_dynamic=no
-    export_symbols=
-    generated=
-    hardcode_libdirs=
-    libobjs=
-    link_against_libtool_libs=
-    ltlibs=
-    module=no
-    objs=
-    prev=
-    prevarg=
-    release=
-    rpath=
-    perm_rpath=
-    temp_rpath=
-    vinfo=
-
-    # We need to know -static, to get the right output filenames.
-    for arg
-    do
-      case "$arg" in
-      -all-static | -static)
-        if test "X$arg" = "X-all-static" && test "$build_libtool_libs" = yes && test -z "$link_static_flag"; then
-	    $echo "$modename: warning: complete static linking is impossible in this configuration" 1>&2
-        fi
-        build_libtool_libs=no
-	build_old_libs=yes
-        break
-        ;;
-      esac
-    done
-
-    # See if our shared archives depend on static archives.
-    test -n "$old_archive_from_new_cmds" && build_old_libs=yes
-
-    # Go through the arguments, transforming them on the way.
-    while test $# -gt 0; do
-      arg="$1"
-      shift
-
-      # If the previous option needs an argument, assign it.
-      if test -n "$prev"; then
-        case "$prev" in
-        output)
-          compile_command="$compile_command @OUTPUT@"
-          finalize_command="$finalize_command @OUTPUT@"
-          ;;
-        esac
-
-        case "$prev" in
-        dlfiles|dlprefiles)
-          case "$arg" in
-          *.la | *.lo) ;;  # We handle these cases below.
-          *)
-            dlprefiles="$dlprefiles $arg"
-            test "$prev" = dlfiles && dlfiles="$dlfiles $arg"
-            prev=
-            ;;
-          esac
-          ;;
-	exportsyms)
-	  export_symbols="$arg"
-          if test ! -f "$arg"; then
-            $echo "$modename: symbol file \`$arg' does not exist"
-            exit 1
-          fi
-	  prev=
-	  ;;
-	release)
-	  release="-$arg"
-	  prev=
-	  continue
-	  ;;
-        rpath)
-          rpath="$rpath $arg"
-	  prev=
-	  continue
-	  ;;
-        *)
-          eval "$prev=\"\$arg\""
-          prev=
-          continue
-          ;;
-        esac
-      fi
-
-      prevarg="$arg"
-
-      case "$arg" in
-      -all-static)
-	if test -n "$link_static_flag"; then
-          compile_command="$compile_command $link_static_flag"
-	  finalize_command="$finalize_command $link_static_flag"
-        fi
-        continue
-	;;
-
-      -allow-undefined)
-	# FIXME: remove this flag sometime in the future.
-	$echo "$modename: \`-allow-undefined' is deprecated because it is the default" 1>&2
-	continue
-	;;
-
-      -dlopen)
-        prev=dlfiles
-        continue
-        ;;
-
-      -dlpreopen)
-        prev=dlprefiles
-        continue
-        ;;
-
-      -export-dynamic)
-        if test "$export_dynamic" != yes; then
-          export_dynamic=yes
-	  if test -n "$export_dynamic_flag_spec"; then
-	    eval arg=\"$export_dynamic_flag_spec\"
-	  else
-	    arg=
-	  fi
-
-          # Add the symbol object into the linking commands.
-	  compile_command="$compile_command @SYMFILE@"
-	  finalize_command="$finalize_command @SYMFILE@"
-        fi
-        ;;
-
-      -export-symbols)
-        if test -n "$export_symbols"; then
-          $echo "$modename: cannot have more than one -exported-symbols"
-          exit 1
-        fi
-	prev=exportsyms
-	continue
-        ;;
-
-      -L*)
-        dir=`$echo "X$arg" | $Xsed -e 's%^-L\(.*\)$%\1%'`
-        case "$dir" in
-        /* | [A-Za-z]:[/\\]*)
-	  # Add the corresponding hardcode_libdir_flag, if it is not identical.
-          ;;
-        *)
-          $echo "$modename: \`-L$dir' cannot specify a relative directory" 1>&2
-          exit 1
-          ;;
-        esac
-        deplibs="$deplibs $arg"
-        lib_search_path="$lib_search_path `expr $arg : '-L\(.*\)'`"
-        ;;
-
-      -l*) deplibs="$deplibs $arg" ;;
-
-      -module)
-        if test "$module" != yes; then
-          module=yes
-	  if test -n "$export_dynamic_flag_spec"; then
-	    eval arg=\"$export_dynamic_flag_spec\"
-	  else
-	    arg=
-	  fi
-	fi
-        ;;
-	
-      -no-undefined)
-	allow_undefined=no
-	continue
-	;;
-
-      -o) prev=output ;;
-
-      -release)
-	prev=release
-	continue
-	;;
-
-      -rpath)
-        prev=rpath
-        continue
-        ;;
-
-      -static)
-	# If we have no pic_flag, then this is the same as -all-static.
-	if test -z "$pic_flag" && test -n "$link_static_flag"; then
-          compile_command="$compile_command $link_static_flag"
-	  finalize_command="$finalize_command $link_static_flag"
-        fi
-	continue
-	;;
-
-      -version-info)
-        prev=vinfo
-        continue
-        ;;
-
-      # Some other compiler flag.
-      -* | +*)
-	# Unknown arguments in both finalize_command and compile_command need
-	# to be aesthetically quoted because they are evaled later.
-	arg=`$echo "X$arg" | $Xsed -e "$sed_quote_subst"`
-	case "$arg" in
-	*[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \	]*|*]*)
-	  arg="\"$arg\""
-	  ;;
-	esac
-        ;;
-
-      *.o | *.obj | *.a | *.lib)
-        # A standard object.
-        objs="$objs $arg"
-        ;;
-
-      *.lo)
-        # A library object.
-	if test "$prev" = dlfiles; then
-	  dlfiles="$dlfiles $arg"
-	  if test "$build_libtool_libs" = yes; then
-	    prev=
-	    continue
-	  else
-	    # If libtool objects are unsupported, then we need to preload.
-	    prev=dlprefiles
-	  fi
-	fi
-
-	if test "$prev" = dlprefiles; then
-	  # Preload the old-style object.
-	  dlprefiles="$dlprefiles "`$echo "X$arg" | $Xsed -e "$lo2o"`
-	  prev=
-	fi
-	libobjs="$libobjs $arg"
-        ;;
-
-      *.la)
-        # A libtool-controlled library.
-
-        dlname=
-        libdir=
-        library_names=
-        old_library=
-
-        # Check to see that this really is a libtool archive.
-        if (sed -e '2q' $arg | egrep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then :
-        else
-          $echo "$modename: \`$arg' is not a valid libtool archive" 1>&2
-          exit 1
-        fi
-
-	# If the library was installed with an old release of libtool,
-	# it will not redefine variable installed.
-	installed=yes
-
-        # If there is no directory component, then add one.
-        case "$arg" in
-        */* | *\\*) . $arg ;;
-        *) . ./$arg ;;
-        esac
-
-        # Get the name of the library we link against.
-        linklib=
-        for l in $old_library $library_names; do
-          linklib="$l"
-        done
-
-        if test -z "$linklib"; then
-          $echo "$modename: cannot find name of link library for \`$arg'" 1>&2
-          exit 1
-        fi
-
-        # Find the relevant object directory and library name.
-        name=`$echo "X$arg" | $Xsed -e 's%^.*/%%' -e 's/\.la$//' -e 's/^lib//'`
-
-	if test "X$installed" = Xyes; then
-	  dir="$libdir"
-	else
-	  dir=`$echo "X$arg" | $Xsed -e 's%/[^/]*$%%'`
-	  if test "X$dir" = "X$arg"; then
-	    dir="$objdir"
-	  else
-	    dir="$dir/$objdir"
-	  fi
-	fi
-
-        if test -z "$libdir"; then
-	  # It is a libtool convenience library, so add in its objects.
-	  convenience="$convenience $dir/$old_library"
-	  old_convenience="$old_convenience $dir/$old_library"
-	  deplibs="$deplibs$dependency_libs"
-	  compile_command="$compile_command $dir/$old_library$dependency_libs"
-	  finalize_command="$finalize_command $dir/$old_library$dependency_libs"
-	  continue
-	fi
-
-        # This library was specified with -dlopen.
-        if test "$prev" = dlfiles; then
-          dlfiles="$dlfiles $arg"
-          if test -z "$dlname" || test "$build_libtool_libs" = no; then
-            # If there is no dlname or we're linking statically,
-            # we need to preload.
-            prev=dlprefiles
-          else
-            # We should not create a dependency on this library, but we
-	    # may need any libraries it requires.
-	    compile_command="$compile_command$dependency_libs"
-	    finalize_command="$finalize_command$dependency_libs"
-            prev=
-            continue
-          fi
-        fi
-
-        # The library was specified with -dlpreopen.
-        if test "$prev" = dlprefiles; then
-          # Prefer using a static library (so that no silly _DYNAMIC symbols
-          # are required to link).
-          if test -n "$old_library"; then
-            dlprefiles="$dlprefiles $dir/$old_library"
-          else
-            dlprefiles="$dlprefiles $dir/$linklib"
-          fi
-          prev=
-        fi
-
-        if test "$build_libtool_libs" = yes && test -n "$library_names"; then
-          link_against_libtool_libs="$link_against_libtool_libs $arg"
-          if test -n "$shlibpath_var"; then
-            # Make sure the rpath contains only unique directories.
-            case "$temp_rpath " in
-            *" $dir "*) ;;
-            *) temp_rpath="$temp_rpath $dir" ;;
-            esac
-          fi
-
-	  # This is the magic to use -rpath.
-          if test -n "$hardcode_libdir_flag_spec"; then
-            if test -n "$hardcode_libdir_separator"; then
-              if test -z "$hardcode_libdirs"; then
-                # Put the magic libdir with the hardcode flag.
-                hardcode_libdirs="$libdir"
-                libdir="@HARDCODE_LIBDIRS@"
-              else
-                # Just accumulate the unique libdirs.
-		case "$hardcode_libdir_separator$hardcode_libdirs$hardcode_libdir_separator" in
-		*"$hardcode_libdir_separator$libdir$hardcode_libdir_separator"*)
-		  ;;
-		*)
-		  hardcode_libdirs="$hardcode_libdirs$hardcode_libdir_separator$libdir"
-		  ;;
-		esac
-                libdir=
-              fi
-            fi
-
-            if test -n "$libdir"; then
-              eval flag=\"$hardcode_libdir_flag_spec\"
-
-              compile_command="$compile_command $flag"
-              finalize_command="$finalize_command $flag"
-            fi
-          elif test -n "$runpath_var"; then
-            # Do the same for the permanent run path.
-            case "$perm_rpath " in
-            *" $libdir "*) ;;
-            *) perm_rpath="$perm_rpath $libdir" ;;
-            esac
-          fi
-
-
-	  lib_linked=yes
-          case "$hardcode_action" in
-          immediate | unsupported)
-            if test "$hardcode_direct" = no; then
-              compile_command="$compile_command $dir/$linklib"
-            elif test "$hardcode_minus_L" = no; then
-	      case "$host" in
-	      *-*-sunos*)
-                compile_shlibpath="$compile_shlibpath$dir:"
-		;;
-	      esac
-              compile_command="$compile_command -L$dir -l$name"
-            elif test "$hardcode_shlibpath_var" = no; then
-              compile_shlibpath="$compile_shlibpath$dir:"
-              compile_command="$compile_command -l$name"
-	    else
-	      lib_linked=no
-            fi
-            ;;
-
-          relink)
-            # We need an absolute path.
-            case "$dir" in
-            /* | [A-Za-z]:[/\\]*) ;;
-            *)
-              absdir=`cd "$dir" && pwd`
-              if test -z "$absdir"; then
-                $echo "$modename: cannot determine absolute directory name of \`$dir'" 1>&2
-                exit 1
-              fi
-              dir="$absdir"
-              ;;
-            esac
-
-            if test "$hardcode_direct" = yes; then
-              compile_command="$compile_command $dir/$linklib"
-            elif test "$hardcode_minus_L" = yes; then
-              compile_command="$compile_command -L$dir -l$name"
-            elif test "$hardcode_shlibpath_var" = yes; then
-              compile_shlibpath="$compile_shlibpath$dir:"
-              compile_command="$compile_command -l$name"
-	    else
-	      lib_linked=no
-            fi
-            ;;
-
-	  *)
-	    lib_linked=no
-	    ;;
-          esac
-
-	  if test "$lib_linked" != yes; then
-	    $echo "$modename: configuration error: unsupported hardcode properties"
-	    exit 1
-	  fi
-
-          # Finalize command for both is simple: just hardcode it.
-          if test "$hardcode_direct" = yes; then
-            finalize_command="$finalize_command $libdir/$linklib"
-          elif test "$hardcode_minus_L" = yes; then
-            finalize_command="$finalize_command -L$libdir -l$name"
-          elif test "$hardcode_shlibpath_var" = yes; then
-            finalize_shlibpath="$finalize_shlibpath$libdir:"
-            finalize_command="$finalize_command -l$name"
-          else
-            # We cannot seem to hardcode it, guess we'll fake it.
-            finalize_command="$finalize_command -L$libdir -l$name"
-          fi
-        else
-          # Transform directly to old archives if we don't build new libraries.
-          if test -n "$pic_flag" && test -z "$old_library"; then
-            $echo "$modename: cannot find static library for \`$arg'" 1>&2
-            exit 1
-          fi
-
-	  # Here we assume that one of hardcode_direct or hardcode_minus_L
-	  # is not unsupported.  This is valid on all known static and
-	  # shared platforms.
-	  if test "$hardcode_direct" != unsupported; then
-	    test -n "$old_library" && linklib="$old_library"
-	    compile_command="$compile_command $dir/$linklib"
-	    finalize_command="$finalize_command $dir/$linklib"
-	  else
-	    compile_command="$compile_command -L$dir -l$name"
-	    finalize_command="$finalize_command -L$dir -l$name"
-	  fi
-        fi
-
-	# Add in any libraries that this one depends upon.
-	compile_command="$compile_command$dependency_libs"
-	finalize_command="$finalize_command$dependency_libs"
-	continue
-        ;;
-
-      # Some other compiler argument.
-      *)
-	# Unknown arguments in both finalize_command and compile_command need
-	# to be aesthetically quoted because they are evaled later.
-	arg=`$echo "X$arg" | $Xsed -e "$sed_quote_subst"`
-	case "$arg" in
-	*[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \	]*|*]*)
-	  arg="\"$arg\""
-	  ;;
-	esac
-        ;;
-      esac
-
-      # Now actually substitute the argument into the commands.
-      if test -n "$arg"; then
-	compile_command="$compile_command $arg"
-	finalize_command="$finalize_command $arg"
-      fi
-    done
-
-    if test -n "$prev"; then
-      $echo "$modename: the \`$prevarg' option requires an argument" 1>&2
-      $echo "$help" 1>&2
-      exit 1
-    fi
-
-    if test -n "$export_symbols" && test "$module" = yes; then
-      $echo "$modename: \`-export-symbols' is not supported for modules"
-      exit 1
-    fi
-    
-    oldlibs=
-    # calculate the name of the file, without its directory
-    outputname=`$echo "X$output" | $Xsed -e 's%^.*/%%'`
-
-    case "$output" in
-    "")
-      $echo "$modename: you must specify an output file" 1>&2
-      $echo "$help" 1>&2
-      exit 1
-      ;;
-
-    *.a | *.lib)
-      if test -n "$link_against_libtool_libs"; then
-        $echo "$modename: error: cannot link libtool libraries into archives" 1>&2
-        exit 1
-      fi
-
-      if test -n "$deplibs"; then
-        $echo "$modename: warning: \`-l' and \`-L' are ignored for archives" 1>&2
-      fi
-
-      if test -n "$dlfiles$dlprefiles"; then
-        $echo "$modename: warning: \`-dlopen' is ignored for archives" 1>&2
-      fi
-
-      if test -n "$rpath"; then
-        $echo "$modename: warning: \`-rpath' is ignored for archives" 1>&2
-      fi
-
-      if test -n "$vinfo"; then
-        $echo "$modename: warning: \`-version-info' is ignored for archives" 1>&2
-      fi
-
-      if test -n "$release"; then
-        $echo "$modename: warning: \`-release' is ignored for archives" 1>&2
-      fi
-
-      if test -n "$export_symbols"; then
-        $echo "$modename: warning: \`-export-symbols' is ignored for archives" 1>&2
-      fi
-
-      # Now set the variables for building old libraries.
-      build_libtool_libs=no
-      oldlibs="$output"
-      ;;
-
-    *.la)
-      # Make sure we only generate libraries of the form `libNAME.la'.
-      case "$outputname" in
-      lib*) ;;
-      *)
-	$echo "$modename: libtool library \`$output' must begin with \`lib'" 1>&2
-	$echo "$help" 1>&2
-	exit 1
-	;;
-      esac
-
-      name=`$echo "X$outputname" | $Xsed -e 's/\.la$//' -e 's/^lib//'`
-      eval libname=\"$libname_spec\"
-
-      output_objdir=`$echo "X$output" | $Xsed -e 's%/[^/]*$%%'`
-      if test "X$output_objdir" = "X$output"; then
-        output_objdir="$objdir"
-      else
-        output_objdir="$output_objdir/$objdir"
-      fi
-
-      # All the library-specific variables (install_libdir is set above).
-      library_names=
-      old_library=
-      dlname=
-
-      if test -n "$objs"; then
-        $echo "$modename: cannot build libtool library \`$output' from non-libtool objects:$objs" 2>&1
-        exit 1
-      fi
-
-      # How the heck are we supposed to write a wrapper for a shared library?
-      if test -n "$link_against_libtool_libs"; then
-        $echo "$modename: error: cannot link shared libraries into libtool libraries" 1>&2
-        exit 1
-      fi
-
-      if test -n "$dlfiles$dlprefiles"; then
-        $echo "$modename: warning: \`-dlopen' is ignored for libtool libraries" 1>&2
-      fi
-
-      set dummy $rpath
-      if test $# -gt 2; then
-	$echo "$modename: warning: ignoring multiple \`-rpath's for a libtool library" 1>&2
-      fi
-      install_libdir="$2"
-
-      oldlibs=
-      if test -z "$rpath"; then
-	# Building a libtool convenience library.
-        libext=al
-	oldlibs="$output_objdir/$libname.$libext $oldlibs"
-	build_libtool_libs=convenience
-	dependency_libs="$deplibs"
-
-	if test -n "$vinfo"; then
-	  $echo "$modename: warning: \`-version-info' is ignored for convenience libraries" 1>&2
-	fi
-
-	if test -n "$release"; then
-	  $echo "$modename: warning: \`-release' is ignored for convenience libraries" 1>&2
-	fi
-      else
-
-	# Parse the version information argument.
-	IFS="${IFS= 	}"; save_ifs="$IFS"; IFS=':'
-	set dummy $vinfo 0 0 0
-	IFS="$save_ifs"
-
-	if test -n "$8"; then
-	  $echo "$modename: too many parameters to \`-version-info'" 1>&2
-	  $echo "$help" 1>&2
-	  exit 1
-	fi
-
-	current="$2"
-	revision="$3"
-	age="$4"
-
-	# Check that each of the things are valid numbers.
-	case "$current" in
-	0 | [1-9] | [1-9][0-9]*) ;;
-	*)
-	  $echo "$modename: CURRENT \`$current' is not a nonnegative integer" 1>&2
-	  $echo "$modename: \`$vinfo' is not valid version information" 1>&2
-	  exit 1
-	  ;;
-	esac
-
-	case "$revision" in
-	0 | [1-9] | [1-9][0-9]*) ;;
-	*)
-	  $echo "$modename: REVISION \`$revision' is not a nonnegative integer" 1>&2
-	  $echo "$modename: \`$vinfo' is not valid version information" 1>&2
-	  exit 1
-	  ;;
-	esac
-
-	case "$age" in
-	0 | [1-9] | [1-9][0-9]*) ;;
-	*)
-	  $echo "$modename: AGE \`$age' is not a nonnegative integer" 1>&2
-	  $echo "$modename: \`$vinfo' is not valid version information" 1>&2
-	  exit 1
-	  ;;
-	esac
-
-	if test $age -gt $current; then
-	  $echo "$modename: AGE \`$age' is greater than the current interface number \`$current'" 1>&2
-	  $echo "$modename: \`$vinfo' is not valid version information" 1>&2
-	  exit 1
-	fi
-
-	# Calculate the version variables.
-	major=
-	versuffix=
-	verstring=
-	case "$version_type" in
-	none) ;;
-
-	linux)
-	  major=.`expr $current - $age`
-	  versuffix="$major.$age.$revision"
-	  ;;
-
-	osf)
-	  major=`expr $current - $age`
-	  versuffix=".$current.$age.$revision"
-	  verstring="$current.$age.$revision"
-
-	  # Add in all the interfaces that we are compatible with.
-	  loop=$age
-	  while test $loop != 0; do
-	    iface=`expr $current - $loop`
-	    loop=`expr $loop - 1`
-	    verstring="$verstring:${iface}.0"
-	  done
-
-	  # Make executables depend on our current version.
-	  verstring="$verstring:${current}.0"
-	  ;;
-
-	sunos)
-	  major=".$current"
-	  versuffix=".$current.$revision"
-	  ;;
-
-	freebsd-aout)
-	  major=".$current"
-	  versuffix=".$current.$revision";
-	  ;;
-
-	freebsd-elf)
-	  major=".$current"
-	  versuffix=".$current";
-	  ;;
-
-	windows)
-	  # Like Linux, but with '-' rather than '.', since we only
-	  # want one extension on Windows 95.
-	  major=`expr $current - $age`
-	  versuffix="-$major-$age-$revision"
-	  ;;
-
-	*)
-	  $echo "$modename: unknown library version type \`$version_type'" 1>&2
-	  echo "Fatal configuration error.  See the $PACKAGE docs for more information." 1>&2
-	  exit 1
-	  ;;
-	esac
-
-	# Clear the version info if we defaulted, and they specified a release.
-	if test -z "$vinfo" && test -n "$release"; then
-	  major=
-	  versuffix=
-	  verstring="0.0"
-	  case "$host" in
-	  *-*-sunos*)
-	    versuffix=".0.0"
-	    ;;
-	  esac
-	fi
-
-	# Check to see if the archive will have undefined symbols.
-	if test "$allow_undefined" = yes; then
-	  if test "$allow_undefined_flag" = unsupported; then
-	    $echo "$modename: warning: undefined symbols not allowed in $host shared libraries" 1>&2
-	    build_libtool_libs=no
-	    build_old_libs=yes
-	  fi
-	else
-	  # Don't allow undefined symbols.
-	  allow_undefined_flag="$no_undefined_flag"
-	fi
-
-	# Add libc to deplibs on all systems.
-	dependency_libs="$deplibs"
-	deplibs="$deplibs -lc"
-      fi
-
-      # Create the output directory, or remove our outputs if we need to.
-      if test -d $output_objdir; then
-        $show "${rm}r $output_objdir/$outputname $output_objdir/$libname.* $output_objdir/${libname}${release}.*"
-	$run ${rm}r $output_objdir/$outputname $output_objdir/$libname.* $output_objdir/${libname}${release}.*
-      else
-        $show "$mkdir $output_objdir"
-        $run $mkdir $output_objdir
-        status=$?
-        if test $status -ne 0 && test ! -d $output_objdir; then
-          exit $status
-        fi
-      fi
-
-      # Now set the variables for building old libraries.
-      if test "$build_old_libs" = yes && test "$build_libtool_libs" != convenience ; then
-	oldlibs="$oldlibs $output_objdir/$libname.$libext"
-
-	# Transform .lo files to .o files.
-	oldobjs="$objs"`$echo "X$libobjs " | $Xsed -e 's/[^   ]*\.'${libext}' //g' -e "$los2o" -e 's/ $//g'`
-      fi
-
-      if test "$build_libtool_libs" = yes; then
-        # Transform deplibs into only deplibs that can be linked in shared.
-        ## Gordon: Do you check for the existence of the libraries in deplibs
-        ## on the system?  That should maybe be merged in here someplace....
-        ## Actually: I think test_compile and file_magic do this... file_regex
-        ## sorta does this. Only pas_all needs to be changed.  -Toshio
-        name_save=$name
-        libname_save=$libname
-        release_save=$release
-        versuffix_save=$versuffix
-        major_save=$major
-        # I'm not sure if I'm treating the release correctly.  I think
-        # release should show up in the -l (ie -lgmp5) so we don't want to
-        # add it in twice.  Is that correct?
-        release=""
-        versuffix=""
-        major=""
-        newdeplibs=
-        case "$check_shared_deplibs_method" in
-        pass_all)  
-          newdeplibs=$deplibs 
-                    ;; # Don't check for shared/static.  Everything works.
-                       # This might be a little naive.  We might want to check
-                       # whether the library exists or not.  But this is on
-                       # osf3 & osf4 and I'm not really sure... Just
-                       # implementing what was already the behaviour.
-        test_compile)
-          # This code stresses the "libraries are programs" paradigm to its
-          # limits. Maybe even breaks it.  We compile a program, linking it
-          # against the deplibs as a proxy for the library.  Then we can check
-          # whether they linked in statically or dynamically with ldd.
-          $rm conftest.c
-          cat > conftest.c <<EOF
-          int main() { return 0; }
-EOF
-          $rm a.out
-          $C_compiler conftest.c $deplibs
-          if test $? -eq 0 ; then
-            ldd_output=`ldd a.out`
-            for i in $deplibs; do
-              name="`expr $i : '-l\(.*\)'`"
-              # If $name is empty we are operating on a -L argument.
-              if test "$name" != "" ; then
-                libname=`eval \\$echo \"$libname_spec\"`
-                deplib_matches=`eval \\$echo \"$library_names_spec\"`
-                set dummy $deplib_matches
-                deplib_match=$2
-                if test `expr "$ldd_output" : ".*$deplib_match"` -ne 0 ; then
-                  newdeplibs="$newdeplibs $i"
-                else
-                  echo
-                  echo "*** Warning: This library needs some functionality provided by $i."
-                  echo "*** I have the capability to make that library automatically link in when"
-                  echo "*** you link to this library.  But I can only do this if you have a"
-                  echo "*** shared version of the library, which you do not appear to have."
-                fi
-              else
-                newdeplibs="$newdeplibs $i"
-              fi
-            done
-          else
-            # Error occured in the first compile.  Let's try to salvage the situation:
-            # Compile a seperate program for each library.
-            for i in $deplibs; do
-              name="`expr $i : '-l\(.*\)'`"
-             # If $name is empty we are operating on a -L argument.
-              if test "$name" != "" ; then
-                $rm a.out
-                $C_compiler conftest.c $i
-                # Did it work?
-                if test $? -eq 0 ; then
-                  ldd_output=`ldd a.out`
-                    libname=`eval \\$echo \"$libname_spec\"`
-                    deplib_matches=`eval \\$echo \"$library_names_spec\"`
-                    set dummy $deplib_matches
-                    deplib_match=$2
-                    if test `expr "$ldd_output" : ".*$deplib_match"` -ne 0 ; then
-                      newdeplibs="$newdeplibs $i"
-                    else
-                      echo
-                      echo "*** Warning: This library needs some functionality provided by $i."
-                      echo "*** I have the capability to make that library automatically link in when"
-                      echo "*** you link to this library.  But I can only do this if you have a"
-                      echo "*** shared version of the library, which you do not appear to have."
-                    fi
-                else
-                  echo
-                  echo "*** Warning!  Library $i is needed by this library but I was not able to"
-                  echo "***  make it link in!  You will probably need to install it or some"
-                  echo "*** library that it depends on before this library will be fully"
-                  echo "*** functional.  Installing it before continuing would be even better."
-                fi
-              else
-                newdeplibs="$newdeplibs $i"
-              fi
-            done
-          fi
-          deplibs=$newdeplibs
-          ;;
-        file_magic* | file_regex)
-          set dummy $check_shared_deplibs_method
-          file_magic_regex="`expr \"$check_shared_deplibs_method\" : \"$2\(.*\)\"`"
-          for a_deplib in $deplibs; do
-            name="`expr $a_deplib : '-l\(.*\)'`"
-            # If $name is empty we are operating on a -L argument.
-            if test "$name" != "" ; then
-              libname=`eval \\$echo \"$libname_spec\"`
-              case "$check_shared_deplibs_method" in
-                file_magic*)
-                  for i in $lib_search_path; do
-                   # This needs to be more general than file_regex in order to
-                   # catch things like glibc on linux.  Maybe file_regex
-                   # should be more general as well, but maybe not.  Since
-                   # library names are supposed to conform to
-                   # library_name_spec, I think file_regex should remain
-                   # strict.  What do you think Gordon?
-                    potential_libs=`ls $i/$libname[.-]* 2>/dev/null`
-                    for potent_lib in $potential_libs; do
-                      file_output=`file $potent_lib`
-                      if test `expr "$file_output" : ".*$file_magic_regex"` -ne 0 ; then
-                        newdeplibs="$newdeplibs $a_deplib"
-                        a_deplib=""
-                        break 2
-                      fi
-                    done
-                  done
-                  ;;
-                file_regex)
-                  deplib_matches=`eval \\$echo \"$library_names_spec\"`
-                  set dummy $deplib_matches
-                  deplib_match=$2
-                  for i in $lib_search_path; do
-                    potential_libs=`ls $i/$deplib_match* 2>/dev/null`
-                    if test "$potential_libs" != "" ; then
-                      newdeplibs="$newdeplibs $a_deplib"
-                      a_deplib=""
-                      break
-                    fi
-                  done
-                  ;;
-              esac
-              if test "$a_deplib" != "" ; then
-                echo
-                echo "*** Warning: This library needs some functionality provided by $a_deplib."
-                echo "*** I have the capability to make that library automatically link in when"
-                echo "*** you link to this library.  But I can only do this if you have a"
-                echo "*** shared version of the library, which you do not appear to have."
-              fi
-            else
-              # Add a -L argument.
-              newdeplibs="$newdeplibs $a_deplib"
-            fi
-          done # Gone through all deplibs.
-          ;;
-        none | *)  deplibs="" ;;
-        esac
-        versuffix=$versuffix_save
-        major=$major_save
-        release=$release_save
-        libname=$libname_save
-        name=$name_save
-        deplibs=$newdeplibs
-        # Done checking deplibs!
- 
-	# Get the real and link names of the library.
-	eval library_names=\"$library_names_spec\"
-	set dummy $library_names
-	realname="$2"
-	shift; shift
-
-	if test -n "$soname_spec"; then
-	  eval soname=\"$soname_spec\"
-	else
-	  soname="$realname"
-	fi
-
-	lib="$output_objdir/$realname"
-	for link
-	do
-	  linknames="$linknames $link"
-	done
-
-	# Use standard objects if they are PIC.
-	test -z "$pic_flag" && libobjs=`$echo "X$libobjs " | $Xsed -e "$los2o" -e 's/ $//g'`
-
-	if test -n "$whole_archive_flag_spec"; then
-	  if test -n "$convenience"; then
-	    eval libobjs=\"\$libobjs $whole_archive_flag_spec\"
-	  fi
-	else
-	  for xlib in $convenience; do
-	    # Extract the objects.
-	    xdir="$xlib"x
-	    generated="$generated $xdir"
-	    xlib=`echo "$xlib" | $Xsed -e 's%^.*/%%'`
-
-	    $show "${rm}r $xdir"
-	    $run ${rm}r "$xdir"
-	    $show "mkdir $xdir"
-	    $run mkdir "$xdir"
-	    status=$?
-	    if test $status -ne 0 && test ! -d "$xdir"; then
-	      exit $status
-	    fi
-	    $show "(cd $xdir && $AR x ../$xlib)"
-	    $run eval "(cd \$xdir && $AR x ../\$xlib)" || exit $?
-
-	    libobjs="$libobjs `echo $xdir/*`"
-	  done
-	fi
-
-	# Do each of the archive commands.
-	if test -n "$export_symbols" && test -n "$archive_sym_cmds"; then
-	  eval cmds=\"$archive_sym_cmds\"
-	else
-	  eval cmds=\"$archive_cmds\"
-	fi
-	IFS="${IFS= 	}"; save_ifs="$IFS"; IFS='~'
-	for cmd in $cmds; do
-	  IFS="$save_ifs"
-	  $show "$cmd"
-	  $run eval "$cmd" || exit $?
-	done
-	IFS="$save_ifs"
-
-	# Create links to the real library.
-	for linkname in $linknames; do
-	  if test "$realname" != "$linkname"; then
-	    $show "(cd $output_objdir && $LN_S $realname $linkname)"
-	    $run eval '(cd $output_objdir && $LN_S $realname $linkname)' || exit $?
-	  fi
-	done
-
-	# If -module or -export-dynamic was specified, set the dlname.
-	if test "$module" = yes || test "$export_dynamic" = yes; then
-	  # On all known operating systems, these are identical.
-	  dlname="$soname"
-	fi
-      fi
-      ;;
-
-    *.lo | *.o | *.obj)
-      if test -n "$link_against_libtool_libs"; then
-        $echo "$modename: error: cannot link libtool libraries into objects" 1>&2
-        exit 1
-      fi
-
-      if test -n "$deplibs"; then
-        $echo "$modename: warning: \`-l' and \`-L' are ignored for objects" 1>&2
-      fi
-
-      if test -n "$dlfiles$dlprefiles"; then
-        $echo "$modename: warning: \`-dlopen' is ignored for objects" 1>&2
-      fi
-
-      if test -n "$rpath"; then
-        $echo "$modename: warning: \`-rpath' is ignored for objects" 1>&2
-      fi
-
-      if test -n "$vinfo"; then
-        $echo "$modename: warning: \`-version-info' is ignored for objects" 1>&2
-      fi
-
-      if test -n "$release"; then
-        $echo "$modename: warning: \`-release' is ignored for objects" 1>&2
-      fi
-
-      case "$output" in
-      *.lo)
-        if test -n "$objs"; then
-          $echo "$modename: cannot build library object \`$output' from non-libtool objects" 1>&2
-          exit 1
-        fi
-        libobj="$output"
-        obj=`$echo "X$output" | $Xsed -e "$lo2o"`
-        ;;
-      *)
-        libobj=
-        obj="$output"
-        ;;
-      esac
-
-      # Delete the old objects.
-      $run $rm $obj $libobj
-
-      # Create the old-style object.
-      reload_objs="$objs"`$echo "X$libobjs " | $Xsed -e 's/[^       ]*\.'${libext}' //g' -e 's/[^       ]*\.lib //g' -e "$los2o" -e 's/ $//g'`
-
-      output="$obj"
-      eval cmds=\"$reload_cmds\"
-      IFS="${IFS= 	}"; save_ifs="$IFS"; IFS='~'
-      for cmd in $cmds; do
-        IFS="$save_ifs"
-        $show "$cmd"
-        $run eval "$cmd" || exit $?
-      done
-      IFS="$save_ifs"
-
-      # Exit if we aren't doing a library object file.
-      test -z "$libobj" && exit 0
-
-      if test "$build_libtool_libs" != yes; then
-        # Create an invalid libtool object if no PIC, so that we don't
-        # accidentally link it into a program.
-        $show "echo timestamp > $libobj"
-        $run eval "echo timestamp > $libobj" || exit $?
-        exit 0
-      fi
-
-      if test -n "$pic_flag"; then
-        # Only do commands if we really have different PIC objects.
-        reload_objs="$libobjs"
-        output="$libobj"
-        eval cmds=\"$reload_cmds\"
-        IFS="${IFS= 	}"; save_ifs="$IFS"; IFS='~'
-        for cmd in $cmds; do
-          IFS="$save_ifs"
-          $show "$cmd"
-          $run eval "$cmd" || exit $?
-        done
-        IFS="$save_ifs"
-      else
-        # Just create a symlink.
-        $show "$LN_S $obj $libobj"
-        $run $LN_S $obj $libobj || exit $?
-      fi
-
-      exit 0
-      ;;
-
-    # Anything else should be a program.
-    *)
-      if test -n "$vinfo"; then
-        $echo "$modename: warning: \`-version-info' is ignored for programs" 1>&2
-      fi
-
-      if test -n "$release"; then
-        $echo "$modename: warning: \`-release' is ignored for programs" 1>&2
-      fi
-
-      if test -n "$rpath"; then
-	# If the user specified any rpath flags, then add them.
-	for libdir in $rpath; do
-          if test -n "$hardcode_libdir_flag_spec"; then
-            if test -n "$hardcode_libdir_separator"; then
-              if test -z "$hardcode_libdirs"; then
-                # Put the magic libdir with the hardcode flag.
-                hardcode_libdirs="$libdir"
-                libdir="@HARDCODE_LIBDIRS@"
-              else
-                # Just accumulate the unique libdirs.
-		case "$hardcode_libdir_separator$hardcode_libdirs$hardcode_libdir_separator" in
-		*"$hardcode_libdir_separator$libdir$hardcode_libdir_separator"*)
-		  ;;
-		*)
-		  hardcode_libdirs="$hardcode_libdirs$hardcode_libdir_separator$libdir"
-		  ;;
-		esac
-                libdir=
-              fi
-            fi
-
-            if test -n "$libdir"; then
-              eval flag=\"$hardcode_libdir_flag_spec\"
-
-              compile_command="$compile_command $flag"
-              finalize_command="$finalize_command $flag"
-            fi
-          elif test -n "$runpath_var"; then
-            case "$perm_rpath " in
-            *" $libdir "*) ;;
-            *) perm_rpath="$perm_rpath $libdir" ;;
-            esac
-          fi
-	done
-      fi
-
-      # Substitute the hardcoded libdirs into the compile commands.
-      if test -n "$hardcode_libdir_separator"; then
-	compile_command=`$echo "X$compile_command" | $Xsed -e "s%@HARDCODE_LIBDIRS@%$hardcode_libdirs%g"`
-	finalize_command=`$echo "X$finalize_command" | $Xsed -e "s%@HARDCODE_LIBDIRS@%$hardcode_libdirs%g"`
-      fi
-
-      output_objdir=`$echo "X$output" | $Xsed -e 's%/[^/]*$%%'`
-      if test "X$output_objdir" = "X$output"; then
-        output_objdir="$objdir"
-      else
-        output_objdir="$output_objdir/$objdir"
-      fi
-
-      if test -n "$libobjs" && test "$build_old_libs" = yes; then
-        # Transform all the library objects into standard objects.
-        compile_command=`$echo "X$compile_command " | $Xsed -e "$los2o" -e 's/ $//'`
-        finalize_command=`$echo "X$finalize_command " | $Xsed -e "$los2o" -e 's/ $//'`
-      fi
-
-      if test "$export_dynamic" = yes && test -n "$NM" && test -n "$global_symbol_pipe"; then
-        dlsyms="${outputname}S.c"
-      else
-        dlsyms=
-      fi
-
-      if test -n "$dlsyms"; then
-        case "$dlsyms" in
-        "") ;;
-        *.c)
-          if test -z "$export_symbols"; then
-            # Add our own program objects to the preloaded list.
-            dlprefiles=`$echo "X$objs$dlprefiles " | $Xsed -e "$los2o" -e 's/ $//'`
-          fi
-
-          # Discover the nlist of each of the dlfiles.
-          nlist="$objdir/${output}.nm"
-
-	  if test -d $objdir; then
-	    $show "$rm $nlist ${nlist}T"
-	    $run $rm "$nlist" "${nlist}T"
-	  else
-	    $show "$mkdir $objdir"
-	    $run $mkdir $objdir
-	    status=$?
-	    if test $status -ne 0 && test ! -d $objdir; then
-	      exit $status
-	    fi
-	  fi
-
-          # Parse the name list into a source file.
-          $show "creating $objdir/$dlsyms"
-
-          $echo > "$objdir/$dlsyms" "\
-/* $dlsyms - symbol resolution table for \`$outputname' dlsym emulation. */
-/* Generated by $PROGRAM - GNU $PACKAGE $VERSION */
-
-#ifdef __cplusplus
-extern \"C\" {
-#endif
-
-/* Prevent the only kind of declaration conflicts we can make. */
-#define dld_preloaded_symbols some_other_symbol
-
-/* External symbol declarations for the compiler. */\
-"
-
-          if test -n "$export_symbols"; then
-	    sed -e 's/^\(.*\)/\1 \1/' < "$export_symbols" > "$nlist"
-          fi
-
-          for arg in $dlprefiles; do
-	    $show "extracting global C symbols from \`$arg'"
-	    $run eval "$NM $arg | $global_symbol_pipe >> '$nlist'"
-          done
-
-          if test -z "$run"; then
-	    # Make sure we at least have an empty file.
-	    test -f "$nlist" || : > "$nlist"
-
-	    # Try sorting and uniquifying the output.
-	    if sort "$nlist" | uniq > "$nlist"T; then
-	      mv -f "$nlist"T "$nlist"
-	    else
-	      $rm "$nlist"T
-	    fi
-
-	    if test -f "$nlist"; then
-	      sed -e 's/^.* \(.*\)$/extern char \1;/' < "$nlist" >> "$output_objdir/$dlsyms"
-  	    else
-	      echo '/* NONE */' >> "$output_objdir/$dlsyms"
-  	    fi
-
-	    $echo >> "$output_objdir/$dlsyms" "\
-
-#undef dld_preloaded_symbols
-
-#if defined (__STDC__) && __STDC__
-# define __ptr_t void *
-#else
-# define __ptr_t char *
-#endif
-
-/* The mapping between symbol names and symbols. */
-struct {
-  char *name;
-  __ptr_t address;
-}
-dld_preloaded_symbols[] =
-{\
-"
-
-            if test -n "$export_symbols"; then
-              echo >> "$objdir/$dlsyms" "\
-  {\"${output}\", (__ptr_t) 0},"
-	      sed 's/^\(.*\)/  {"\1", (__ptr_t) \&\1},/' < "$export_symbols" >> "$objdir/$dlsyms"
-            fi
-
-            for arg in $dlprefiles; do
-	      name=`echo "$arg" | sed -e 's%^.*/%%'`
-              echo >> "$objdir/$dlsyms" "\
-  {\"$name\", (__ptr_t) 0},"
-	      eval "$NM $arg | $global_symbol_pipe > '$nlist'"
-
-	      if test -f "$nlist"; then
-	        sed 's/^\(.*\) \(.*\)$/  {"\1", (__ptr_t) \&\2},/' < "$nlist" >> "$objdir/$dlsyms"
-	      else
-		echo '/* NONE */' >> "$output_objdir/$dlsyms"
-	      fi
-
-            done
-
-	    if test -f "$nlist"; then
-	      sed 's/^\(.*\) \(.*\)$/  {"\1", (__ptr_t) \&\2},/' < "$nlist" >> "$output_objdir/$dlsyms"
-	    fi
-
-	    $echo >> "$output_objdir/$dlsyms" "\
-  {0, (__ptr_t) 0}
-};
-
-#ifdef __cplusplus
-}
-#endif\
-"
-          fi
-
-          # Now compile the dynamic symbol file.
-          $show "(cd $objdir && $C_compiler -c$no_builtin_flag \"$dlsyms\")"
-          $run eval '(cd $objdir && $C_compiler -c$no_builtin_flag "$dlsyms")' || exit $?
-
-          # Transform the symbol file into the correct name.
-          compile_command=`$echo "X$compile_command" | $Xsed -e "s%@SYMFILE@%$objdir/${output}S.${objext}%"`
-          finalize_command=`$echo "X$finalize_command" | $Xsed -e "s%@SYMFILE@%$objdir/${output}S.${objext}%"`
-	  ;;
-        *)
-          $echo "$modename: unknown suffix for \`$dlsyms'" 1>&2
-          exit 1
-          ;;
-        esac
-      elif test "$export_dynamic" != yes; then
-        test -n "$dlfiles$dlprefiles" && $echo "$modename: warning: \`-dlopen' and \`-dlpreopen' are ignored without \`-export-dynamic'" 1>&2
-      else
-        # We keep going just in case the user didn't refer to
-        # dld_preloaded_symbols.  The linker will fail if global_symbol_pipe
-        # really was required.
-        $echo "$modename: not configured to extract global symbols from dlpreopened files" 1>&2
-
-        # Nullify the symbol file.
-        compile_command=`$echo "X$compile_command" | $Xsed -e "s% @SYMFILE@%%"`
-        finalize_command=`$echo "X$finalize_command" | $Xsed -e "s% @SYMFILE@%%"`
-      fi
-
-      if test -z "$link_against_libtool_libs" || test "$build_libtool_libs" != yes; then
-        # Replace the output file specification.
-        compile_command=`$echo "X$compile_command" | $Xsed -e 's%@OUTPUT@%'"$output"'%g'`
-        finalize_command=`$echo "X$finalize_command" | $Xsed -e 's%@OUTPUT@%'"$output"'%g'`
-
-        # We have no uninstalled library dependencies, so finalize right now.
-        $show "$compile_command"
-        $run eval "$compile_command"
-        exit $?
-      fi
-
-      # Replace the output file specification.
-      compile_command=`$echo "X$compile_command" | $Xsed -e 's%@OUTPUT@%'"$output_objdir/$outputname"'%g'`
-      finalize_command=`$echo "X$finalize_command" | $Xsed -e 's%@OUTPUT@%'"$output_objdir/$outputname"'T%g'`
-
-      # Create the binary in the object directory, then wrap it.
-      if test ! -d $output_objdir; then
-        $show "$mkdir $output_objdir"
-	$run $mkdir $output_objdir
-	status=$?
-	if test $status -ne 0 && test ! -d $objdir; then
-	  exit $status
-	fi
-      fi
-
-      if test -n "$shlibpath_var"; then
-        # We should set the shlibpath_var
-        rpath=
-        for dir in $temp_rpath; do
-          case "$dir" in
-          /* | [A-Za-z]:[/\\]*)
-            # Absolute path.
-            rpath="$rpath$dir:"
-            ;;
-          *)
-            # Relative path: add a thisdir entry.
-            rpath="$rpath\$thisdir/$dir:"
-            ;;
-          esac
-        done
-        temp_rpath="$rpath"
-      fi
-
-      # Delete the old output file.
-      $run $rm $output
-
-      if test -n "$compile_shlibpath"; then
-        compile_command="$shlibpath_var=\"$compile_shlibpath\$$shlibpath_var\" $compile_command"
-      fi
-      if test -n "$finalize_shlibpath"; then
-        finalize_command="$shlibpath_var=\"$finalize_shlibpath\$$shlibpath_var\" $finalize_command"
-      fi
-
-      if test -n "$runpath_var" && test -n "$perm_rpath"; then
-        # We should set the runpath_var.
-        rpath=
-        for dir in $perm_rpath; do
-          rpath="$rpath$dir:"
-        done
-        compile_command="$runpath_var=\"$rpath\$$runpath_var\" $compile_command"
-        finalize_command="$runpath_var=\"$rpath\$$runpath_var\" $finalize_command"
-      fi
-
-      if test "$hardcode_action" = relink; then
-        # AGH! Flame the AIX and HP-UX people for me, will ya?
-        $echo "$modename: warning: this platform doesn\'t like uninstalled shared libraries" 1>&2
-        $echo "$modename: \`$output' will be relinked during installation" 1>&2
-      fi
-
-      $show "$compile_command"
-      $run eval "$compile_command" || exit $?
-
-      # Now create the wrapper script.
-      $show "creating $output"
-
-      # Quote the finalize command for shipping.
-      finalize_command=`$echo "X$finalize_command" | $Xsed -e "$sed_quote_subst"`
-
-      # Quote $echo for shipping.
-      if test "X$echo" = "X$SHELL $0 --fallback-echo"; then
-	case "$0" in
-	/* | [A-Za-z]:[/\\]*) qecho="$SHELL $0 --fallback-echo";;
-	*) qecho="$SHELL `pwd`/$0 --fallback-echo";;
-	esac
-	qecho=`$echo "X$qecho" | $Xsed -e "$sed_quote_subst"`
-      else
-        qecho=`$echo "X$echo" | $Xsed -e "$sed_quote_subst"`
-      fi
-
-      # Only actually do things if our run command is non-null.
-      if test -z "$run"; then
-        $rm $output
-        trap "$rm $output; exit 1" 1 2 15
-
-        $echo > $output "\
-#! $SHELL
-
-# $output - temporary wrapper script for $objdir/$outputname
-# Generated by $PROGRAM - GNU $PACKAGE $VERSION
-#
-# The $output program cannot be directly executed until all the libtool
-# libraries that it depends on are installed.
-#
-# This wrapper script should never be moved out of the build directory.
-# If it is, it will not operate correctly.
-
-# Sed substitution that helps us do robust quoting.  It backslashifies
-# metacharacters that are still active within double-quoted strings.
-Xsed='sed -e s/^X//'
-sed_quote_subst='$sed_quote_subst'
-
-# The HP-UX ksh and POSIX shell print the target directory to stdout
-# if CDPATH is set.
-if test \"\${CDPATH+set}\" = set; then CDPATH=; export CDPATH; fi
-
-# This environment variable determines our operation mode.
-if test \"\$libtool_install_magic\" = \"$magic\"; then
-  # install mode needs the following variables:
-  link_against_libtool_libs='$link_against_libtool_libs'
-  finalize_command=\"cd `pwd | sed -e $sed_quote_subst`; $finalize_command\"
-else
-  # When we are sourced in execute mode, \$file and \$echo are already set.
-  if test \"\$libtool_execute_magic\" != \"$magic\"; then
-    echo=\"$qecho\"
-    file=\"\$0\"
-    # Make sure echo works.
-    if test \"X\$1\" = X--no-reexec; then
-      # Discard the --no-reexec flag, and continue.
-      shift
-    elif test \"X\`(\$echo '\t') 2>/dev/null\`\" = 'X\t'; then
-      # Yippee, \$echo works!
-      :
-    else
-      # Restart under the correct shell, and then maybe \$echo will work.
-      exec $SHELL \"\$0\" --no-reexec \${1+\"\$@\"}
-    fi
-  fi\
-"
-        $echo >> $output "\
-
-  # Find the directory that this script lives in.
-  thisdir=\`\$echo \"X\$file\" | \$Xsed -e 's%/[^/]*$%%'\`
-  test \"x\$thisdir\" = \"x\$file\" && thisdir=.
-
-  # Follow symbolic links until we get to the real thisdir.
-  file=\`ls -ld \"\$file\" | sed -n 's/.*-> //p'\`
-  while test -n \"\$file\"; do
-    destdir=\`\$echo \"X\$file\" | \$Xsed -e 's%/[^/]*\$%%'\`
-
-    # If there was a directory component, then change thisdir.
-    if test \"x\$destdir\" != \"x\$file\"; then
-      case \"\$destdir\" in
-      /* | [A-Za-z]:[/\\]*) thisdir=\"\$destdir\" ;;
-      *) thisdir=\"\$thisdir/\$destdir\" ;;
-      esac
-    fi
-
-    file=\`\$echo \"X\$file\" | \$Xsed -e 's%^.*/%%'\`
-    file=\`ls -ld \"\$thisdir/\$file\" | sed -n 's/.*-> //p'\`
-  done
-
-  # Try to get the absolute directory name.
-  absdir=\`cd \"\$thisdir\" && pwd\`
-  test -n \"\$absdir\" && thisdir=\"\$absdir\"
-
-  progdir=\"\$thisdir/$objdir\"
-  program='$outputname'
-
-  if test -f \"\$progdir/\$program\"; then"
-
-        # Export our shlibpath_var if we have one.
-        if test -n "$shlibpath_var" && test -n "$temp_rpath"; then
-          $echo >> $output "\
-    # Add our own library path to $shlibpath_var
-    $shlibpath_var=\"$temp_rpath\$$shlibpath_var\"
-
-    # Some systems cannot cope with colon-terminated $shlibpath_var
-    $shlibpath_var=\`\$echo \"X\$$shlibpath_var\" | \$Xsed -e 's/:*\$//'\`
-
-    export $shlibpath_var
-"
-        fi
-
-        $echo >> $output "\
-    if test \"\$libtool_execute_magic\" != \"$magic\"; then
-      # Run the actual program with our arguments.
-
-      # Export the path to the program.
-      PATH=\"\$progdir:\$PATH\"
-      export PATH
-
-      exec \$program \${1+\"\$@\"}
-
-      \$echo \"\$0: cannot exec \$program \${1+\"\$@\"}\"
-      exit 1
-    fi
-  else
-    # The program doesn't exist.
-    \$echo \"\$0: error: \$progdir/\$program does not exist\" 1>&2
-    \$echo \"This script is just a wrapper for \$program.\" 1>&2
-    echo \"See the $PACKAGE documentation for more information.\" 1>&2
-    exit 1
-  fi
-fi\
-"
-        chmod +x $output
-      fi
-      exit 0
-      ;;
-    esac
-
-    # See if we need to build an old-fashioned archive.
-    for oldlib in $oldlibs; do
-
-      if test "$build_libtool_libs" = convenience; then
-	oldobjs="$libobjs"
-	addlibs="$convenience"
-	build_libtool_libs=no
-      else
-	oldobjs="$objs"`$echo "X$libobjs " | $Xsed -e 's/[^   ]*\.'${libext}' //g' -e 's/[^   ]*\.lib //g' -e "$los2o" -e 's/ $//g'`
-	addlibs="$old_convenience"
-      fi
-
-      # Add in members from convenience archives.
-      for xlib in $addlibs; do
-	# Extract the objects.
-	xdir="$xlib"x
-	generated="$generated $xdir"
-	xlib=`echo "$xlib" | $Xsed -e 's%^.*/%%'`
-
-	$show "${rm}r $xdir"
-	$run ${rm}r "$xdir"
-	$show "mkdir $xdir"
-	$run mkdir "$xdir"
-	status=$?
-	if test $status -ne 0 && test ! -d "$xdir"; then
-	  exit $status
-	fi
-	$show "(cd $xdir && $AR x ../$xlib)"
-	$run eval "(cd \$xdir && $AR x ../\$xlib)" || exit $?
-
-	oldobjs="$oldobjs `echo $xdir/*`"
-      done
-
-      # Do each command in the archive commands.
-      if test -n "$old_archive_from_new_cmds" && test "$build_libtool_libs" = yes; then
-	eval cmds=\"$old_archive_from_new_cmds\"
-      else
-	eval cmds=\"$old_archive_cmds\"
-      fi
-      IFS="${IFS= 	}"; save_ifs="$IFS"; IFS='~'
-      for cmd in $cmds; do
-        IFS="$save_ifs"
-        $show "$cmd"
-        $run eval "$cmd" || exit $?
-      done
-      IFS="$save_ifs"
-    done
-
-    if test -n "$generated"; then
-      $show "${rm}r$generated"
-      $run ${rm}r$generated
-    fi
-
-    # Now create the libtool archive.
-    case "$output" in
-    *.la)
-      old_library=
-      test "$build_old_libs" = yes && old_library="$libname.$libext"
-      $show "creating $output"
-
-      # Only create the output if not a dry run.
-      if test -z "$run"; then
-        $echo > $output "\
-# $output - a libtool library file
-# Generated by $PROGRAM - GNU $PACKAGE $VERSION
-
-# The name that we can dlopen(3).
-dlname='$dlname'
-
-# Names of this library.
-library_names='$library_names'
-
-# The name of the static archive.
-old_library='$old_library'
-
-# Libraries that this one depends upon.
-dependency_libs='$dependency_libs'
-
-# Version information for $libname.
-current=$current
-age=$age
-revision=$revision
-
-# Is this an already installed library?
-installed=no
-
-# Directory that this library needs to be installed in:
-libdir='$install_libdir'\
-"
-      fi
-
-      # Do a symbolic link so that the libtool archive can be found in
-      # LD_LIBRARY_PATH before the program is installed.
-      $show "(cd $output_objdir && $LN_S ../$outputname $outputname)"
-      $run eval "(cd $output_objdir && $LN_S ../$outputname $outputname)" || exit $?
-      ;;
-    esac
-    exit 0
-    ;;
-
-  # libtool install mode
-  install)
-    modename="$modename: install"
-
-    # There may be an optional sh(1) argument at the beginning of
-    # install_prog (especially on Windows NT).
-    if test "$nonopt" = "$SHELL" || test "$nonopt" = /bin/sh; then
-      # Aesthetically quote it.
-      arg=`$echo "X$nonopt" | $Xsed -e "$sed_quote_subst"`
-      case "$arg" in
-      *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \	]*|*]*)
-	arg="\"$arg\""
-	;;
-      esac
-      install_prog="$arg "
-      arg="$1"
-      shift
-    else
-      install_prog=
-      arg="$nonopt"
-    fi
-
-    # The real first argument should be the name of the installation program.
-    # Aesthetically quote it.
-    arg=`$echo "X$arg" | $Xsed -e "$sed_quote_subst"`
-    case "$arg" in
-    *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \	]*|*]*)
-      arg="\"$arg\""
-      ;;
-    esac
-    install_prog="$install_prog$arg"
-
-    # We need to accept at least all the BSD install flags.
-    dest=
-    files=
-    opts=
-    prev=
-    install_type=
-    isdir=no
-    stripme=
-    for arg
-    do
-      if test -n "$dest"; then
-        files="$files $dest"
-        dest="$arg"
-        continue
-      fi
-
-      case "$arg" in
-      -d) isdir=yes ;;
-      -f) prev="-f" ;;
-      -g) prev="-g" ;;
-      -m) prev="-m" ;;
-      -o) prev="-o" ;;
-      -s)
-        stripme=" -s"
-        continue
-        ;;
-      -*) ;;
-
-      *)
-        # If the previous option needed an argument, then skip it.
-        if test -n "$prev"; then
-          prev=
-        else
-          dest="$arg"
-          continue
-        fi
-        ;;
-      esac
-
-      # Aesthetically quote the argument.
-      arg=`$echo "X$arg" | $Xsed -e "$sed_quote_subst"`
-      case "$arg" in
-      *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \	]*|*]*)
-	arg="\"$arg\""
-	;;
-      esac
-      install_prog="$install_prog $arg"
-    done
-
-    if test -z "$install_prog"; then
-      $echo "$modename: you must specify an install program" 1>&2
-      $echo "$help" 1>&2
-      exit 1
-    fi
-
-    if test -n "$prev"; then
-      $echo "$modename: the \`$prev' option requires an argument" 1>&2
-      $echo "$help" 1>&2
-      exit 1
-    fi
-
-    if test -z "$files"; then
-      if test -z "$dest"; then
-        $echo "$modename: no file or destination specified" 1>&2
-      else
-        $echo "$modename: you must specify a destination" 1>&2
-      fi
-      $echo "$help" 1>&2
-      exit 1
-    fi
-
-    # Strip any trailing slash from the destination.
-    dest=`$echo "X$dest" | $Xsed -e 's%/$%%'`
-
-    # Check to see that the destination is a directory.
-    test -d "$dest" && isdir=yes
-    if test "$isdir" = yes; then
-      destdir="$dest"
-      destname=
-    else
-      destdir=`$echo "X$dest" | $Xsed -e 's%/[^/]*$%%'`
-      test "X$destdir" = "X$dest" && destdir=.
-      destname=`$echo "X$dest" | $Xsed -e 's%^.*/%%'`
-
-      # Not a directory, so check to see that there is only one file specified.
-      set dummy $files
-      if test $# -gt 2; then
-        $echo "$modename: \`$dest' is not a directory" 1>&2
-        $echo "$help" 1>&2
-        exit 1
-      fi
-    fi
-    case "$destdir" in
-    /* | [A-Za-z]:[/\\]*) ;;
-    *)
-      for file in $files; do
-        case "$file" in
-        *.lo) ;;
-        *)
-          $echo "$modename: \`$destdir' must be an absolute directory name" 1>&2
-          $echo "$help" 1>&2
-          exit 1
-          ;;
-        esac
-      done
-      ;;
-    esac
-
-    # This variable tells wrapper scripts just to set variables rather
-    # than running their programs.
-    libtool_install_magic="$magic"
-
-    staticlibs=
-    future_libdirs=
-    current_libdirs=
-    for file in $files; do
-
-      # Do each installation.
-      case "$file" in
-      *.a | *.lib)
-        # Do the static libraries later.
-        staticlibs="$staticlibs $file"
-        ;;
-
-      *.la)
-        # Check to see that this really is a libtool archive.
-        if (sed -e '2q' $file | egrep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then :
-        else
-          $echo "$modename: \`$file' is not a valid libtool archive" 1>&2
-          $echo "$help" 1>&2
-          exit 1
-        fi
-
-        library_names=
-        old_library=
-        # If there is no directory component, then add one.
-        case "$file" in
-        */* | *\\*) . $file ;;
-        *) . ./$file ;;
-        esac
-
-        # Add the libdir to current_libdirs if it is the destination.
-        if test "X$destdir" = "X$libdir"; then
-          case "$current_libdirs " in
-          *" $libdir "*) ;;
-          *) current_libdirs="$current_libdirs $libdir" ;;
-          esac
-        else
-          # Note the libdir as a future libdir.
-          case "$future_libdirs " in
-          *" $libdir "*) ;;
-          *) future_libdirs="$future_libdirs $libdir" ;;
-          esac
-        fi
-
-        dir="`$echo "X$file" | $Xsed -e 's%/[^/]*$%%'`/"
-        test "X$dir" = "X$file/" && dir=
-        dir="$dir$objdir"
-
-        # See the names of the shared library.
-        set dummy $library_names
-        if test -n "$2"; then
-          realname="$2"
-          shift
-          shift
-
-          # Install the shared library and build the symlinks.
-          $show "$install_prog $dir/$realname $destdir/$realname"
-          $run eval "$install_prog $dir/$realname $destdir/$realname" || exit $?
-          test "X$dlname" = "X$realname" && dlname=
-
-          if test $# -gt 0; then
-            # Delete the old symlinks, and create new ones.
-            for linkname
-            do
-              test "X$dlname" = "X$linkname" && dlname=
-	      if test "$linkname" != "$realname"; then
-		$show "(cd $destdir && $rm $linkname && $LN_S $realname $linkname)"
-		$run eval "(cd $destdir && $rm $linkname && $LN_S $realname $linkname)"
-	      fi
-            done
-          fi
-
-          if test -n "$dlname"; then
-            # Install the dynamically-loadable library.
-            $show "$install_prog $dir/$dlname $destdir/$dlname"
-            $run eval "$install_prog $dir/$dlname $destdir/$dlname" || exit $?
-          fi
-
-          # Do each command in the postinstall commands.
-          lib="$destdir/$realname"
-          eval cmds=\"$postinstall_cmds\"
-          IFS="${IFS= 	}"; save_ifs="$IFS"; IFS='~'
-          for cmd in $cmds; do
-            IFS="$save_ifs"
-            $show "$cmd"
-            $run eval "$cmd" || exit $?
-          done
-          IFS="$save_ifs"
-        fi
-
-        # Install the pseudo-library for information purposes.
-        name=`$echo "X$file" | $Xsed -e 's%^.*/%%'`
-	instname="$dir/$name"i
-	$show "Creating $instname"
-	$rm "$instname"
-	sed 's/^installed=no$/installed=yes/' "$file" > "$instname"
-        $show "$install_prog $instname $destdir/$name"
-        $run eval "$install_prog $instname $destdir/$name" || exit $?
-	$show "$rm $instname"
-	$rm "$instname"
-
-        # Maybe install the static library, too.
-        test -n "$old_library" && staticlibs="$staticlibs $dir/$old_library"
-        ;;
-
-      *.lo)
-        # Install (i.e. copy) a libtool object.
-
-        # Figure out destination file name, if it wasn't already specified.
-        if test -n "$destname"; then
-          destfile="$destdir/$destname"
-        else
-          destfile=`$echo "X$file" | $Xsed -e 's%^.*/%%'`
-          destfile="$destdir/$destfile"
-        fi
-
-        # Deduce the name of the destination old-style object file.
-        case "$destfile" in
-        *.lo)
-          staticdest=`$echo "X$destfile" | $Xsed -e "$lo2o"`
-          ;;
-        *.o | *.obj)
-          staticdest="$destfile"
-          destfile=
-          ;;
-        *)
-          $echo "$modename: cannot copy a libtool object to \`$destfile'" 1>&2
-          $echo "$help" 1>&2
-          exit 1
-          ;;
-        esac
-
-        # Install the libtool object if requested.
-        if test -n "$destfile"; then
-          $show "$install_prog $file $destfile"
-          $run eval "$install_prog $file $destfile" || exit $?
-        fi
-
-        # Install the old object if enabled.
-        if test "$build_old_libs" = yes; then
-          # Deduce the name of the old-style object file.
-          staticobj=`$echo "X$file" | $Xsed -e "$lo2o"`
-
-          $show "$install_prog $staticobj $staticdest"
-          $run eval "$install_prog \$staticobj \$staticdest" || exit $?
-        fi
-        exit 0
-        ;;
-
-      *)
-        # Figure out destination file name, if it wasn't already specified.
-        if test -n "$destname"; then
-          destfile="$destdir/$destname"
-        else
-          destfile=`$echo "X$file" | $Xsed -e 's%^.*/%%'`
-          destfile="$destdir/$destfile"
-        fi
-
-        # Do a test to see if this is really a libtool program.
-        if (sed -e '4q' $file | egrep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then
-          link_against_libtool_libs=
-          finalize_command=
-
-          # If there is no directory component, then add one.
-          case "$file" in
-          */* | *\\*) . $file ;;
-          *) . ./$file ;;
-          esac
-
-          # Check the variables that should have been set.
-          if test -z "$link_against_libtool_libs" || test -z "$finalize_command"; then
-            $echo "$modename: invalid libtool wrapper script \`$file'" 1>&2
-            exit 1
-          fi
-
-          finalize=yes
-          for lib in $link_against_libtool_libs; do
-            # Check to see that each library is installed.
-            libdir=
-            if test -f "$lib"; then
-              # If there is no directory component, then add one.
-              case "$lib" in
-              */* | *\\*) . $lib ;;
-              *) . ./$lib ;;
-              esac
-            fi
-            libfile="$libdir/`$echo "X$lib" | $Xsed -e 's%^.*/%%g'`"
-            if test -n "$libdir" && test ! -f "$libfile"; then
-              $echo "$modename: warning: \`$lib' has not been installed in \`$libdir'" 1>&2
-              finalize=no
-            fi
-          done
-
-          if test "$hardcode_action" = relink; then
-            if test "$finalize" = yes; then
-              $echo "$modename: warning: relinking \`$file' on behalf of your buggy system linker" 1>&2
-              $show "$finalize_command"
-              if $run eval "$finalize_command"; then :
-              else
-                $echo "$modename: error: relink \`$file' with the above command before installing it" 1>&2
-                continue
-              fi
-              file="$objdir/$file"T
-            else
-              $echo "$modename: warning: cannot relink \`$file' on behalf of your buggy system linker" 1>&2
-            fi
-          else
-            # Install the binary that we compiled earlier.
-	    file=`$echo "X$file" | $Xsed -e "s%\([^/]*\)$%$objdir/\1%"`
-          fi
-        fi
-
-        $show "$install_prog$stripme $file $destfile"
-        $run eval "$install_prog\$stripme \$file \$destfile" || exit $?
-        ;;
-      esac
-    done
-
-    for file in $staticlibs; do
-      name=`$echo "X$file" | $Xsed -e 's%^.*/%%'`
-
-      # Set up the ranlib parameters.
-      oldlib="$destdir/$name"
-
-      $show "$install_prog $file $oldlib"
-      $run eval "$install_prog \$file \$oldlib" || exit $?
-
-      # Do each command in the postinstall commands.
-      eval cmds=\"$old_postinstall_cmds\"
-      IFS="${IFS= 	}"; save_ifs="$IFS"; IFS='~'
-      for cmd in $cmds; do
-        IFS="$save_ifs"
-        $show "$cmd"
-        $run eval "$cmd" || exit $?
-      done
-      IFS="$save_ifs"
-    done
-
-    if test -n "$future_libdirs"; then
-      $echo "$modename: warning: remember to run \`$progname --finish$future_libdirs'" 1>&2
-    fi
-
-    if test -n "$current_libdirs"; then
-      # Maybe just do a dry run.
-      test -n "$run" && current_libdirs=" -n$current_libdirs"
-      exec $SHELL $0 --finish$current_libdirs
-      exit 1
-    fi
-
-    exit 0
-    ;;
-
-  # libtool finish mode
-  finish)
-    modename="$modename: finish"
-    libdirs="$nonopt"
-    admincmds=
-
-    if test -n "$finish_cmds$finish_eval" && test -n "$libdirs"; then
-      for dir
-      do
-        libdirs="$libdirs $dir"
-      done
-
-      for libdir in $libdirs; do
-	if test -n "$finish_cmds"; then
-	  # Do each command in the finish commands.
-	  eval cmds=\"$finish_cmds\"
-          IFS="${IFS= 	}"; save_ifs="$IFS"; IFS='~'
-          for cmd in $cmds; do
-            IFS="$save_ifs"
-            $show "$cmd"
-            $run eval "$cmd" || admincmds="$admincmds
-       $cmd"
-          done
-          IFS="$save_ifs"
-	fi
-	if test -n "$finish_eval"; then
-	  # Do the single finish_eval.
-	  eval cmds=\"$finish_eval\"
-	  $run eval "$cmds" || admincmds="$admincmds
-       $cmds"
-	fi
-      done
-    fi
-
-    # Exit here if they wanted silent mode.
-    test "$show" = : && exit 0
-
-    echo "----------------------------------------------------------------------"
-    echo "Libraries have been installed in:"
-    for libdir in $libdirs; do
-      echo "   $libdir"
-    done
-    echo
-    echo "To link against installed libraries in a given directory, LIBDIR,"
-    echo "you must use the \`-LLIBDIR' flag during linking."
-    echo
-    echo " You will also need to do at least one of the following:"
-    if test -n "$shlibpath_var"; then
-      echo "   - add LIBDIR to the \`$shlibpath_var' environment variable"
-      echo "     during execution"
-    fi
-    if test -n "$runpath_var"; then
-      echo "   - add LIBDIR to the \`$runpath_var' environment variable"
-      echo "     during linking"
-    fi
-    if test -n "$hardcode_libdir_flag_spec"; then
-      libdir=LIBDIR
-      eval flag=\"$hardcode_libdir_flag_spec\"
-
-      echo "   - use the \`$flag' linker flag"
-    fi
-    if test -n "$admincmds"; then
-      echo "   - have your system administrator run these commands:$admincmds"
-    fi
-    if test -f /etc/ld.so.conf; then
-      echo "   - have your system administrator add LIBDIR to \`/etc/ld.so.conf'"
-    fi
-    echo
-    echo "See any operating system documentation about shared libraries for"
-    echo "more information, such as the ld(1) and ld.so(8) manual pages."
-    echo "----------------------------------------------------------------------"
-    exit 0
-    ;;
-
-  # libtool execute mode
-  execute)
-    modename="$modename: execute"
-
-    # The first argument is the command name.
-    cmd="$nonopt"
-    if test -z "$cmd"; then
-      $echo "$modename: you must specify a COMMAND" 1>&2
-      $echo "$help"
-      exit 1
-    fi
-
-    # Handle -dlopen flags immediately.
-    for file in $execute_dlfiles; do
-      if test ! -f "$file"; then
-	$echo "$modename: \`$file' is not a file" 1>&2
-	$echo "$help" 1>&2
-	exit 1
-      fi
-
-      dir=
-      case "$file" in
-      *.la)
-        # Check to see that this really is a libtool archive.
-        if (sed -e '2q' $file | egrep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then :
-        else
-          $echo "$modename: \`$lib' is not a valid libtool archive" 1>&2
-          $echo "$help" 1>&2
-          exit 1
-        fi
-
-	# Read the libtool library.
-	dlname=
-	library_names=
-
-        # If there is no directory component, then add one.
-	case "$file" in
-	*/* | *\\*) . $file ;;
-        *) . ./$file ;;
-	esac
-
-	# Skip this library if it cannot be dlopened.
-	if test -z "$dlname"; then
-	  # Warn if it was a shared library.
-	  test -n "$library_names" && $echo "$modename: warning: \`$file' was not linked with \`-export-dynamic'"
-	  continue
-	fi
-
-	dir=`$echo "X$file" | $Xsed -e 's%/[^/]*$%%'`
-	test "X$dir" = "X$file" && dir=.
-
-	if test -f "$dir/$objdir/$dlname"; then
-	  dir="$dir/$objdir"
-	else
-	  $echo "$modename: cannot find \`$dlname' in \`$dir' or \`$dir/$objdir'" 1>&2
-	  exit 1
-	fi
-	;;
-
-      *.lo)
-	# Just add the directory containing the .lo file.
-	dir=`$echo "X$file" | $Xsed -e 's%/[^/]*$%%'`
-	test "X$dir" = "X$file" && dir=.
-	;;
-
-      *)
-	$echo "$modename: warning \`-dlopen' is ignored for non-libtool libraries and objects" 1>&2
-        continue
-	;;
-      esac
-
-      # Get the absolute pathname.
-      absdir=`cd "$dir" && pwd`
-      test -n "$absdir" && dir="$absdir"
-
-      # Now add the directory to shlibpath_var.
-      if eval "test -z \"\$$shlibpath_var\""; then
-	eval "$shlibpath_var=\"\$dir\""
-      else
-	eval "$shlibpath_var=\"\$dir:\$$shlibpath_var\""
-      fi
-    done
-
-    # This variable tells wrapper scripts just to set shlibpath_var
-    # rather than running their programs.
-    libtool_execute_magic="$magic"
-
-    # Check if any of the arguments is a wrapper script.
-    args=
-    for file
-    do
-      case "$file" in
-      -*) ;;
-      *)
-        # Do a test to see if this is really a libtool program.
-        if (sed -e '4q' $file | egrep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then
-	  # If there is no directory component, then add one.
-	  case "$file" in
-	  */* | *\\*) . $file ;;
-	  *) . ./$file ;;
-	  esac
-
-	  # Transform arg to wrapped name.
-	  file="$progdir/$program"
-	fi
-        ;;
-      esac
-      # Quote arguments (to preserve shell metacharacters).
-      file=`$echo "X$file" | $Xsed -e "$sed_quote_subst"`
-      args="$args \"$file\""
-    done
-
-    if test -z "$run"; then
-      # Export the shlibpath_var.
-      eval "export $shlibpath_var"
-
-      # Restore saved enviroment variables
-      if test "${save_LC_ALL+set}" = set; then
-        LC_ALL="$save_LC_ALL"; export LC_ALL
-      fi
-      if test "${save_LANG+set}" = set; then
-        LANG="$save_LANG"; export LANG
-      fi
-
-      # Now actually exec the command.
-      eval "exec \$cmd$args"
-
-      $echo "$modename: cannot exec \$cmd$args"
-      exit 1
-    else
-      # Display what would be done.
-      eval "\$echo \"\$shlibpath_var=\$$shlibpath_var\""
-      $echo "export $shlibpath_var"
-      $echo "$cmd$args"
-      exit 0
-    fi
-    ;;
-
-  # libtool uninstall mode
-  uninstall)
-    modename="$modename: uninstall"
-    rm="$nonopt"
-    files=
-
-    for arg
-    do
-      case "$arg" in
-      -*) rm="$rm $arg" ;;
-      *) files="$files $arg" ;;
-      esac
-    done
-
-    if test -z "$rm"; then
-      $echo "$modename: you must specify an RM program" 1>&2
-      $echo "$help" 1>&2
-      exit 1
-    fi
-
-    for file in $files; do
-      dir=`$echo "X$file" | $Xsed -e 's%/[^/]*$%%'`
-      test "X$dir" = "X$file" && dir=.
-      name=`$echo "X$file" | $Xsed -e 's%^.*/%%'`
-
-      rmfiles="$file"
-
-      case "$name" in
-      *.la)
-        # Possibly a libtool archive, so verify it.
-        if (sed -e '2q' $file | egrep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then
-          . $dir/$name
-
-          # Delete the libtool libraries and symlinks.
-          for n in $library_names; do
-            rmfiles="$rmfiles $dir/$n"
-            test "X$n" = "X$dlname" && dlname=
-          done
-          test -n "$dlname" && rmfiles="$rmfiles $dir/$dlname"
-          test -n "$old_library" && rmfiles="$rmfiles $dir/$old_library"
-
-	  $show "$rm $rmfiles"
-	  $run $rm $rmfiles
-
-	  if test -n "$library_names"; then
-	    # Do each command in the postuninstall commands.
-	    eval cmds=\"$postuninstall_cmds\"
-	    IFS="${IFS= 	}"; save_ifs="$IFS"; IFS='~'
-	    for cmd in $cmds; do
-	      IFS="$save_ifs"
-	      $show "$cmd"
-	      $run eval "$cmd"
-	    done
-	    IFS="$save_ifs"
-	  fi
-
-          if test -n "$old_library"; then
-	    # Do each command in the old_postuninstall commands.
-	    eval cmds=\"$old_postuninstall_cmds\"
-	    IFS="${IFS= 	}"; save_ifs="$IFS"; IFS='~'
-	    for cmd in $cmds; do
-	      IFS="$save_ifs"
-	      $show "$cmd"
-	      $run eval "$cmd"
-	    done
-	    IFS="$save_ifs"
-	  fi
-
-          # FIXME: should reinstall the best remaining shared library.
-        fi
-        ;;
-
-      *.lo)
-        if test "$build_old_libs" = yes; then
-          oldobj=`$echo "X$name" | $Xsed -e "$lo2o"`
-          rmfiles="$rmfiles $dir/$oldobj"
-        fi
-	$show "$rm $rmfiles"
-	$run $rm $rmfiles
-        ;;
-
-      *)
-      	$show "$rm $rmfiles"
-	$run $rm $rmfiles
-	;;
-      esac
-    done
-    exit 0
-    ;;
-
-  "")
-    $echo "$modename: you must specify a MODE" 1>&2
-    $echo "$generic_help" 1>&2
-    exit 1
-    ;;
-  esac
-
-  $echo "$modename: invalid operation mode \`$mode'" 1>&2
-  $echo "$generic_help" 1>&2
-  exit 1
-fi # test -z "$show_help"
-
-# We need to display help for each of the modes.
-case "$mode" in
-"") $echo \
-"Usage: $modename [OPTION]... [MODE-ARG]...
-
-Provide generalized library-building support services.
-
-    --config          show all configuration variables
-    --debug           enable verbose shell tracing
--n, --dry-run         display commands without modifying any files
-    --features        display basic configuration information and exit
-    --finish          same as \`--mode=finish'
-    --help            display this help message and exit
-    --mode=MODE       use operation mode MODE [default=inferred from MODE-ARGS]
-    --quiet           same as \`--silent'
-    --silent          don't print informational messages
-    --version         print version information
-
-MODE must be one of the following:
-
-      compile         compile a source file into a libtool object
-      execute         automatically set library path, then run a program
-      finish          complete the installation of libtool libraries
-      install         install libraries or executables
-      link            create a library or an executable
-      uninstall       remove libraries from an installed directory
-
-MODE-ARGS vary depending on the MODE.  Try \`$modename --help --mode=MODE' for
-a more detailed description of MODE."
-  exit 0
-  ;;
-
-compile)
-  $echo \
-"Usage: $modename [OPTION]... --mode=compile COMPILE-COMMAND... SOURCEFILE
-
-Compile a source file into a libtool library object.
-
-This mode accepts the following additional options:
-
-  -static           always build a \`.o' file suitable for static linking
-
-COMPILE-COMMAND is a command to be used in creating a \`standard' object file
-from the given SOURCEFILE.
-
-The output file name is determined by removing the directory component from
-SOURCEFILE, then substituting the C source code suffix \`.c' with the
-library object suffix, \`.lo'."
-  ;;
-
-execute)
-  $echo \
-"Usage: $modename [OPTION]... --mode=execute COMMAND [ARGS]...
-
-Automatically set library path, then run a program.
-
-This mode accepts the following additional options:
-
-  -dlopen FILE      add the directory containing FILE to the library path
-
-This mode sets the library path environment variable according to \`-dlopen'
-flags.
-
-If any of the ARGS are libtool executable wrappers, then they are translated
-into their corresponding uninstalled binary, and any of their required library
-directories are added to the library path.
-
-Then, COMMAND is executed, with ARGS as arguments."
-  ;;
-
-finish)
-  $echo \
-"Usage: $modename [OPTION]... --mode=finish [LIBDIR]...
-
-Complete the installation of libtool libraries.
-
-Each LIBDIR is a directory that contains libtool libraries.
-
-The commands that this mode executes may require superuser privileges.  Use
-the \`--dry-run' option if you just want to see what would be executed."
-  ;;
-
-install)
-  $echo \
-"Usage: $modename [OPTION]... --mode=install INSTALL-COMMAND...
-
-Install executables or libraries.
-
-INSTALL-COMMAND is the installation command.  The first component should be
-either the \`install' or \`cp' program.
-
-The rest of the components are interpreted as arguments to that command (only
-BSD-compatible install options are recognized)."
-  ;;
-
-link)
-  $echo \
-"Usage: $modename [OPTION]... --mode=link LINK-COMMAND...
-
-Link object files or libraries together to form another library, or to
-create an executable program.
-
-LINK-COMMAND is a command using the C compiler that you would use to create
-a program from several object files.
-
-The following components of LINK-COMMAND are treated specially:
-
-  -all-static       do not do any dynamic linking at all
-  -dlopen FILE      \`-dlpreopen' FILE if it cannot be dlopened at runtime
-  -dlpreopen FILE   link in FILE and add its symbols to dld_preloaded_symbols
-  -export-dynamic   allow symbols from OUTPUT-FILE to be resolved with dlsym(3)
-  -LLIBDIR          search LIBDIR for required installed libraries
-  -lNAME            OUTPUT-FILE requires the installed library libNAME
-  -no-undefined     declare that a library does not refer to external symbols
-  -o OUTPUT-FILE    create OUTPUT-FILE from the specified objects
-  -release RELEASE  specify package release information
-  -rpath LIBDIR     the created library will eventually be installed in LIBDIR
-  -static           do not do any dynamic linking of libtool libraries
-  -version-info CURRENT[:REVISION[:AGE]]
-                    specify library version info [each variable defaults to 0]
-
-All other options (arguments beginning with \`-') are ignored.
-
-Every other argument is treated as a filename.  Files ending in \`.la' are
-treated as uninstalled libtool libraries, other files are standard or library
-object files.
-
-If the OUTPUT-FILE ends in \`.la', then a libtool library is created, only
-library objects (\`.lo' files) may be specified, and \`-rpath' is required.
-
-If OUTPUT-FILE ends in \`.a' or \`.lib', then a standard library is created
-using \`ar' and \`ranlib', or on Windows using \`lib'.
-
-If OUTPUT-FILE ends in \`.lo' or \`.${objext}', then a reloadable object file
-is created, otherwise an executable program is created."
-  ;;
-
-uninstall)
-  $echo
-"Usage: $modename [OPTION]... --mode=uninstall RM [RM-OPTION]... FILE...
-
-Remove libraries from an installation directory.
-
-RM is the name of the program to use to delete files associated with each FILE
-(typically \`/bin/rm').  RM-OPTIONS are options (such as \`-f') to be passed
-to RM.
-
-If FILE is a libtool library, all the files associated with it are deleted.
-Otherwise, only FILE itself is deleted using RM."
-  ;;
-
-*)
-  $echo "$modename: invalid operation mode \`$mode'" 1>&2
-  $echo "$help" 1>&2
-  exit 1
-  ;;
-esac
-
-echo
-$echo "Try \`$modename --help' for more information about other modes."
-
-exit 0
-
-# Local Variables:
-# mode:shell-script
-# sh-indentation:2
-# End:
-- 
Gitee


From 6a7c1d00d4018a4726e85f6cccdfc2d994b3c43d Mon Sep 17 00:00:00 2001
From: Jeff Johnson <n3npq@mac.com>
Date: Mon, 25 Jan 1999 19:47:00 +0000
Subject: [PATCH 158/667] Eliminate generated files.

---
 .cvsignore  |   8 +-
 Makefile.in | 623 ----------------------------------------------------
 autogen.sh  |   8 +-
 config.h.in |  38 ----
 4 files changed, 10 insertions(+), 667 deletions(-)
 delete mode 100644 Makefile.in
 delete mode 100644 config.h.in

diff --git a/.cvsignore b/.cvsignore
index d3f6c72..42db10f 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1,15 +1,17 @@
 .deps
 .depend
 Makefile
+Makefile.in
 mappcinames
 pci-ids-temp.h
-Makefile
 configure
+config.h.in
 config.h
-config.log
-config.guess
 config.cache
+config.guess
+config.log
 config.status
+config.sub
 stamp-h
 stamp-h.in
 test1
diff --git a/Makefile.in b/Makefile.in
deleted file mode 100644
index c2d52e3..0000000
--- a/Makefile.in
+++ /dev/null
@@ -1,623 +0,0 @@
-# Makefile.in generated automatically by automake 1.4 from Makefile.am
-
-# Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc.
-# This Makefile.in is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-# PARTICULAR PURPOSE.
-
-# Makefile for popt library.
-
-
-SHELL = @SHELL@
-
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
-VPATH = @srcdir@
-prefix = @prefix@
-exec_prefix = @exec_prefix@
-
-bindir = @bindir@
-sbindir = @sbindir@
-libexecdir = @libexecdir@
-datadir = @datadir@
-sysconfdir = @sysconfdir@
-sharedstatedir = @sharedstatedir@
-localstatedir = @localstatedir@
-libdir = @libdir@
-infodir = @infodir@
-mandir = @mandir@
-includedir = @includedir@
-oldincludedir = /usr/include
-
-DESTDIR =
-
-pkgdatadir = $(datadir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
-pkgincludedir = $(includedir)/@PACKAGE@
-
-top_builddir = .
-
-ACLOCAL = @ACLOCAL@
-AUTOCONF = @AUTOCONF@
-AUTOMAKE = @AUTOMAKE@
-AUTOHEADER = @AUTOHEADER@
-
-INSTALL = @INSTALL@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@ $(AM_INSTALL_PROGRAM_FLAGS)
-INSTALL_DATA = @INSTALL_DATA@
-INSTALL_SCRIPT = @INSTALL_SCRIPT@
-transform = @program_transform_name@
-
-NORMAL_INSTALL = :
-PRE_INSTALL = :
-POST_INSTALL = :
-NORMAL_UNINSTALL = :
-PRE_UNINSTALL = :
-POST_UNINSTALL = :
-host_alias = @host_alias@
-host_triplet = @host@
-AS = @AS@
-CC = @CC@
-CPP = @CPP@
-DLLTOOL = @DLLTOOL@
-LD = @LD@
-LIBTOOL = @LIBTOOL@
-LN_S = @LN_S@
-MAKEINFO = @MAKEINFO@
-NM = @NM@
-PACKAGE = @PACKAGE@
-RANLIB = @RANLIB@
-TARGET = @TARGET@
-U = @U@
-VERSION = @VERSION@
-
-AUTOMAKE_OPTIONS = 1.4 foreign
-
-EXTRA_DIST = CHANGES autogen.sh findme.h $(man_MANS) popt.spec poptint.h 	testit.sh po/*.in po/*.po po/popt.pot popt.ps
-
-
-SUBDIRS = po
-
-INCLUDES = -I$(top_srcdir)
-
-noinst_INCLUDES = findme.h poptint.h
-
-noinst_PROGRAMS = test1
-test1_SOURCES = test1.c
-test1_LDADD = $(lib_LTLIBRARIES)
-
-include_HEADERS = popt.h
-lib_LTLIBRARIES = libpopt.la
-libpopt_la_SOURCES = popt.c findme.c poptparse.c poptconfig.c popthelp.c
-man_MANS = popt.3
-
-CVSTAG = $(PACKAGE)-$(subst .,_,$(VERSION))
-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
-CONFIG_HEADER = config.h
-CONFIG_CLEAN_FILES = 
-LTLIBRARIES =  $(lib_LTLIBRARIES)
-
-
-DEFS = @DEFS@ -I. -I$(srcdir) -I.
-CPPFLAGS = @CPPFLAGS@
-LDFLAGS = @LDFLAGS@
-LIBS = @LIBS@
-libpopt_la_LDFLAGS = 
-libpopt_la_LIBADD = 
-libpopt_la_OBJECTS =  popt.lo findme.lo poptparse.lo poptconfig.lo \
-popthelp.lo
-PROGRAMS =  $(noinst_PROGRAMS)
-
-test1_OBJECTS =  test1.o
-test1_DEPENDENCIES =  libpopt.la
-test1_LDFLAGS = 
-CFLAGS = @CFLAGS@
-COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-CCLD = $(CC)
-LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS) -o $@
-man3dir = $(mandir)/man3
-MANS = $(man_MANS)
-
-NROFF = nroff
-HEADERS =  $(include_HEADERS)
-
-DIST_COMMON =  README ./stamp-h.in COPYING Makefile.am Makefile.in \
-acconfig.h aclocal.m4 config.guess config.h.in config.sub configure \
-configure.in install-sh ltconfig ltmain.sh missing mkinstalldirs
-
-
-DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
-
-TAR = gtar
-GZIP_ENV = --best
-DEP_FILES =  .deps/findme.P .deps/popt.P .deps/poptconfig.P \
-.deps/popthelp.P .deps/poptparse.P .deps/test1.P
-SOURCES = $(libpopt_la_SOURCES) $(test1_SOURCES)
-OBJECTS = $(libpopt_la_OBJECTS) $(test1_OBJECTS)
-
-all: all-redirect
-.SUFFIXES:
-.SUFFIXES: .S .c .lo .o .s
-$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) 
-	cd $(top_srcdir) && $(AUTOMAKE) --foreign Makefile
-
-Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status $(BUILT_SOURCES)
-	cd $(top_builddir) \
-	  && CONFIG_FILES=$@ CONFIG_HEADERS= $(SHELL) ./config.status
-
-$(ACLOCAL_M4):  configure.in 
-	cd $(srcdir) && $(ACLOCAL)
-
-config.status: $(srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
-	$(SHELL) ./config.status --recheck
-$(srcdir)/configure: $(srcdir)/configure.in $(ACLOCAL_M4) $(CONFIGURE_DEPENDENCIES)
-	cd $(srcdir) && $(AUTOCONF)
-
-config.h: stamp-h
-	@if test ! -f $@; then \
-		rm -f stamp-h; \
-		$(MAKE) stamp-h; \
-	else :; fi
-stamp-h: $(srcdir)/config.h.in $(top_builddir)/config.status
-	cd $(top_builddir) \
-	  && CONFIG_FILES= CONFIG_HEADERS=config.h \
-	     $(SHELL) ./config.status
-	@echo timestamp > stamp-h 2> /dev/null
-$(srcdir)/config.h.in: $(srcdir)/stamp-h.in
-	@if test ! -f $@; then \
-		rm -f $(srcdir)/stamp-h.in; \
-		$(MAKE) $(srcdir)/stamp-h.in; \
-	else :; fi
-$(srcdir)/stamp-h.in: $(top_srcdir)/configure.in $(ACLOCAL_M4) acconfig.h
-	cd $(top_srcdir) && $(AUTOHEADER)
-	@echo timestamp > $(srcdir)/stamp-h.in 2> /dev/null
-
-mostlyclean-hdr:
-
-clean-hdr:
-
-distclean-hdr:
-	-rm -f config.h
-
-maintainer-clean-hdr:
-
-mostlyclean-libLTLIBRARIES:
-
-clean-libLTLIBRARIES:
-	-test -z "$(lib_LTLIBRARIES)" || rm -f $(lib_LTLIBRARIES)
-
-distclean-libLTLIBRARIES:
-
-maintainer-clean-libLTLIBRARIES:
-
-install-libLTLIBRARIES: $(lib_LTLIBRARIES)
-	@$(NORMAL_INSTALL)
-	$(mkinstalldirs) $(DESTDIR)$(libdir)
-	@list='$(lib_LTLIBRARIES)'; for p in $$list; do \
-	  if test -f $$p; then \
-	    echo "$(LIBTOOL)  --mode=install $(INSTALL) $$p $(DESTDIR)$(libdir)/$$p"; \
-	    $(LIBTOOL)  --mode=install $(INSTALL) $$p $(DESTDIR)$(libdir)/$$p; \
-	  else :; fi; \
-	done
-
-uninstall-libLTLIBRARIES:
-	@$(NORMAL_UNINSTALL)
-	list='$(lib_LTLIBRARIES)'; for p in $$list; do \
-	  $(LIBTOOL)  --mode=uninstall rm -f $(DESTDIR)$(libdir)/$$p; \
-	done
-
-.s.o:
-	$(COMPILE) -c $<
-
-.S.o:
-	$(COMPILE) -c $<
-
-mostlyclean-compile:
-	-rm -f *.o core *.core
-
-clean-compile:
-
-distclean-compile:
-	-rm -f *.tab.c
-
-maintainer-clean-compile:
-
-.s.lo:
-	$(LIBTOOL) --mode=compile $(COMPILE) -c $<
-
-.S.lo:
-	$(LIBTOOL) --mode=compile $(COMPILE) -c $<
-
-mostlyclean-libtool:
-	-rm -f *.lo
-
-clean-libtool:
-	-rm -rf .libs _libs
-
-distclean-libtool:
-
-maintainer-clean-libtool:
-
-libpopt.la: $(libpopt_la_OBJECTS) $(libpopt_la_DEPENDENCIES)
-	$(LINK) -rpath $(libdir) $(libpopt_la_LDFLAGS) $(libpopt_la_OBJECTS) $(libpopt_la_LIBADD) $(LIBS)
-
-mostlyclean-noinstPROGRAMS:
-
-clean-noinstPROGRAMS:
-	-test -z "$(noinst_PROGRAMS)" || rm -f $(noinst_PROGRAMS)
-
-distclean-noinstPROGRAMS:
-
-maintainer-clean-noinstPROGRAMS:
-
-test1: $(test1_OBJECTS) $(test1_DEPENDENCIES)
-	@rm -f test1
-	$(LINK) $(test1_LDFLAGS) $(test1_OBJECTS) $(test1_LDADD) $(LIBS)
-
-install-man3:
-	$(mkinstalldirs) $(DESTDIR)$(man3dir)
-	@list='$(man3_MANS)'; \
-	l2='$(man_MANS)'; for i in $$l2; do \
-	  case "$$i" in \
-	    *.3*) list="$$list $$i" ;; \
-	  esac; \
-	done; \
-	for i in $$list; do \
-	  if test -f $(srcdir)/$$i; then file=$(srcdir)/$$i; \
-	  else file=$$i; fi; \
-	  ext=`echo $$i | sed -e 's/^.*\\.//'`; \
-	  inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \
-	  inst=`echo $$inst | sed '$(transform)'`.$$ext; \
-	  echo " $(INSTALL_DATA) $$file $(DESTDIR)$(man3dir)/$$inst"; \
-	  $(INSTALL_DATA) $$file $(DESTDIR)$(man3dir)/$$inst; \
-	done
-
-uninstall-man3:
-	@list='$(man3_MANS)'; \
-	l2='$(man_MANS)'; for i in $$l2; do \
-	  case "$$i" in \
-	    *.3*) list="$$list $$i" ;; \
-	  esac; \
-	done; \
-	for i in $$list; do \
-	  ext=`echo $$i | sed -e 's/^.*\\.//'`; \
-	  inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \
-	  inst=`echo $$inst | sed '$(transform)'`.$$ext; \
-	  echo " rm -f $(DESTDIR)$(man3dir)/$$inst"; \
-	  rm -f $(DESTDIR)$(man3dir)/$$inst; \
-	done
-install-man: $(MANS)
-	@$(NORMAL_INSTALL)
-	$(MAKE) $(AM_MAKEFLAGS) install-man3
-uninstall-man:
-	@$(NORMAL_UNINSTALL)
-	$(MAKE) $(AM_MAKEFLAGS) uninstall-man3
-
-install-includeHEADERS: $(include_HEADERS)
-	@$(NORMAL_INSTALL)
-	$(mkinstalldirs) $(DESTDIR)$(includedir)
-	@list='$(include_HEADERS)'; for p in $$list; do \
-	  if test -f "$$p"; then d= ; else d="$(srcdir)/"; fi; \
-	  echo " $(INSTALL_DATA) $$d$$p $(DESTDIR)$(includedir)/$$p"; \
-	  $(INSTALL_DATA) $$d$$p $(DESTDIR)$(includedir)/$$p; \
-	done
-
-uninstall-includeHEADERS:
-	@$(NORMAL_UNINSTALL)
-	list='$(include_HEADERS)'; for p in $$list; do \
-	  rm -f $(DESTDIR)$(includedir)/$$p; \
-	done
-
-# This directory's subdirectories are mostly independent; you can cd
-# into them and run `make' without going through this Makefile.
-# To change the values of `make' variables: instead of editing Makefiles,
-# (1) if the variable is set in `config.status', edit `config.status'
-#     (which will cause the Makefiles to be regenerated when you run `make');
-# (2) otherwise, pass the desired values on the `make' command line.
-
-@SET_MAKE@
-
-all-recursive install-data-recursive install-exec-recursive \
-installdirs-recursive install-recursive uninstall-recursive  \
-check-recursive installcheck-recursive info-recursive dvi-recursive:
-	@set fnord $(MAKEFLAGS); amf=$$2; \
-	dot_seen=no; \
-	target=`echo $@ | sed s/-recursive//`; \
-	list='$(SUBDIRS)'; for subdir in $$list; do \
-	  echo "Making $$target in $$subdir"; \
-	  if test "$$subdir" = "."; then \
-	    dot_seen=yes; \
-	    local_target="$$target-am"; \
-	  else \
-	    local_target="$$target"; \
-	  fi; \
-	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-	   || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
-	done; \
-	if test "$$dot_seen" = "no"; then \
-	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
-	fi; test -z "$$fail"
-
-mostlyclean-recursive clean-recursive distclean-recursive \
-maintainer-clean-recursive:
-	@set fnord $(MAKEFLAGS); amf=$$2; \
-	dot_seen=no; \
-	rev=''; list='$(SUBDIRS)'; for subdir in $$list; do \
-	  rev="$$subdir $$rev"; \
-	  test "$$subdir" = "." && dot_seen=yes; \
-	done; \
-	test "$$dot_seen" = "no" && rev=". $$rev"; \
-	target=`echo $@ | sed s/-recursive//`; \
-	for subdir in $$rev; do \
-	  echo "Making $$target in $$subdir"; \
-	  if test "$$subdir" = "."; then \
-	    local_target="$$target-am"; \
-	  else \
-	    local_target="$$target"; \
-	  fi; \
-	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-	   || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
-	done && test -z "$$fail"
-tags-recursive:
-	list='$(SUBDIRS)'; for subdir in $$list; do \
-	  test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \
-	done
-
-tags: TAGS
-
-ID: $(HEADERS) $(SOURCES) $(LISP)
-	list='$(SOURCES) $(HEADERS)'; \
-	unique=`for i in $$list; do echo $$i; done | \
-	  awk '    { files[$$0] = 1; } \
-	       END { for (i in files) print i; }'`; \
-	here=`pwd` && cd $(srcdir) \
-	  && mkid -f$$here/ID $$unique $(LISP)
-
-TAGS: tags-recursive $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) $(LISP)
-	tags=; \
-	here=`pwd`; \
-	list='$(SUBDIRS)'; for subdir in $$list; do \
-   if test "$$subdir" = .; then :; else \
-	    test -f $$subdir/TAGS && tags="$$tags -i $$here/$$subdir/TAGS"; \
-   fi; \
-	done; \
-	list='$(SOURCES) $(HEADERS)'; \
-	unique=`for i in $$list; do echo $$i; done | \
-	  awk '    { files[$$0] = 1; } \
-	       END { for (i in files) print i; }'`; \
-	test -z "$(ETAGS_ARGS)config.h.in$$unique$(LISP)$$tags" \
-	  || (cd $(srcdir) && etags $(ETAGS_ARGS) $$tags config.h.in $$unique $(LISP) -o $$here/TAGS)
-
-mostlyclean-tags:
-
-clean-tags:
-
-distclean-tags:
-	-rm -f TAGS ID
-
-maintainer-clean-tags:
-
-distdir = $(PACKAGE)-$(VERSION)
-top_distdir = $(distdir)
-
-# This target untars the dist file and tries a VPATH configuration.  Then
-# it guarantees that the distribution is self-contained by making another
-# tarfile.
-distcheck: dist
-	-rm -rf $(distdir)
-	GZIP=$(GZIP_ENV) $(TAR) zxf $(distdir).tar.gz
-	mkdir $(distdir)/=build
-	mkdir $(distdir)/=inst
-	dc_install_base=`cd $(distdir)/=inst && pwd`; \
-	cd $(distdir)/=build \
-	  && ../configure --srcdir=.. --prefix=$$dc_install_base \
-	  && $(MAKE) $(AM_MAKEFLAGS) \
-	  && $(MAKE) $(AM_MAKEFLAGS) dvi \
-	  && $(MAKE) $(AM_MAKEFLAGS) check \
-	  && $(MAKE) $(AM_MAKEFLAGS) install \
-	  && $(MAKE) $(AM_MAKEFLAGS) installcheck \
-	  && $(MAKE) $(AM_MAKEFLAGS) dist
-	-rm -rf $(distdir)
-	@banner="$(distdir).tar.gz is ready for distribution"; \
-	dashes=`echo "$$banner" | sed s/./=/g`; \
-	echo "$$dashes"; \
-	echo "$$banner"; \
-	echo "$$dashes"
-dist: distdir
-	-chmod -R a+r $(distdir)
-	GZIP=$(GZIP_ENV) $(TAR) chozf $(distdir).tar.gz $(distdir)
-	-rm -rf $(distdir)
-dist-all: distdir
-	-chmod -R a+r $(distdir)
-	GZIP=$(GZIP_ENV) $(TAR) chozf $(distdir).tar.gz $(distdir)
-	-rm -rf $(distdir)
-distdir: $(DISTFILES)
-	-rm -rf $(distdir)
-	mkdir $(distdir)
-	-chmod 777 $(distdir)
-	here=`cd $(top_builddir) && pwd`; \
-	top_distdir=`cd $(distdir) && pwd`; \
-	distdir=`cd $(distdir) && pwd`; \
-	cd $(top_srcdir) \
-	  && $(AUTOMAKE) --include-deps --build-dir=$$here --srcdir-name=$(top_srcdir) --output-dir=$$top_distdir --foreign Makefile
-	$(mkinstalldirs) $(distdir)/po
-	@for file in $(DISTFILES); do \
-	  d=$(srcdir); \
-	  if test -d $$d/$$file; then \
-	    cp -pr $$/$$file $(distdir)/$$file; \
-	  else \
-	    test -f $(distdir)/$$file \
-	    || ln $$d/$$file $(distdir)/$$file 2> /dev/null \
-	    || cp -p $$d/$$file $(distdir)/$$file || :; \
-	  fi; \
-	done
-	for subdir in $(SUBDIRS); do \
-	  if test "$$subdir" = .; then :; else \
-	    test -d $(distdir)/$$subdir \
-	    || mkdir $(distdir)/$$subdir \
-	    || exit 1; \
-	    chmod 777 $(distdir)/$$subdir; \
-	    (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) top_distdir=../$(distdir) distdir=../$(distdir)/$$subdir distdir) \
-	      || exit 1; \
-	  fi; \
-	done
-
-DEPS_MAGIC := $(shell mkdir .deps > /dev/null 2>&1 || :)
-
--include $(DEP_FILES)
-
-mostlyclean-depend:
-
-clean-depend:
-
-distclean-depend:
-	-rm -rf .deps
-
-maintainer-clean-depend:
-
-%.o: %.c
-	@echo '$(COMPILE) -c $<'; \
-	$(COMPILE) -Wp,-MD,.deps/$(*F).pp -c $<
-	@-cp .deps/$(*F).pp .deps/$(*F).P; \
-	tr ' ' '\012' < .deps/$(*F).pp \
-	  | sed -e 's/^\\$$//' -e '/^$$/ d' -e '/:$$/ d' -e 's/$$/ :/' \
-	    >> .deps/$(*F).P; \
-	rm .deps/$(*F).pp
-
-%.lo: %.c
-	@echo '$(LTCOMPILE) -c $<'; \
-	$(LTCOMPILE) -Wp,-MD,.deps/$(*F).pp -c $<
-	@-sed -e 's/^\([^:]*\)\.o[ 	]*:/\1.lo \1.o :/' \
-	  < .deps/$(*F).pp > .deps/$(*F).P; \
-	tr ' ' '\012' < .deps/$(*F).pp \
-	  | sed -e 's/^\\$$//' -e '/^$$/ d' -e '/:$$/ d' -e 's/$$/ :/' \
-	    >> .deps/$(*F).P; \
-	rm -f .deps/$(*F).pp
-info-am:
-info: info-recursive
-dvi-am:
-dvi: dvi-recursive
-check-am: all-am
-check: check-recursive
-installcheck-am:
-installcheck: installcheck-recursive
-all-recursive-am: config.h
-	$(MAKE) $(AM_MAKEFLAGS) all-recursive
-
-install-exec-am: install-libLTLIBRARIES
-install-exec: install-exec-recursive
-
-install-data-am: install-man install-includeHEADERS
-install-data: install-data-recursive
-
-install-am: all-am
-	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
-install: install-recursive
-uninstall-am: uninstall-libLTLIBRARIES uninstall-man \
-		uninstall-includeHEADERS
-uninstall: uninstall-recursive
-all-am: Makefile $(LTLIBRARIES) $(PROGRAMS) $(MANS) $(HEADERS) config.h
-all-redirect: all-recursive-am
-install-strip:
-	$(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install
-installdirs: installdirs-recursive
-installdirs-am:
-	$(mkinstalldirs)  $(DESTDIR)$(libdir) $(DESTDIR)$(mandir)/man3 \
-		$(DESTDIR)$(includedir)
-
-
-mostlyclean-generic:
-
-clean-generic:
-
-distclean-generic:
-	-rm -f Makefile $(CONFIG_CLEAN_FILES)
-	-rm -f config.cache config.log stamp-h stamp-h[0-9]*
-
-maintainer-clean-generic:
-mostlyclean-am:  mostlyclean-hdr mostlyclean-libLTLIBRARIES \
-		mostlyclean-compile mostlyclean-libtool \
-		mostlyclean-noinstPROGRAMS mostlyclean-tags \
-		mostlyclean-depend mostlyclean-generic
-
-mostlyclean: mostlyclean-recursive
-
-clean-am:  clean-hdr clean-libLTLIBRARIES clean-compile clean-libtool \
-		clean-noinstPROGRAMS clean-tags clean-depend \
-		clean-generic mostlyclean-am
-
-clean: clean-recursive
-
-distclean-am:  distclean-hdr distclean-libLTLIBRARIES distclean-compile \
-		distclean-libtool distclean-noinstPROGRAMS \
-		distclean-tags distclean-depend distclean-generic \
-		clean-am
-	-rm -f libtool
-
-distclean: distclean-recursive
-	-rm -f config.status
-
-maintainer-clean-am:  maintainer-clean-hdr \
-		maintainer-clean-libLTLIBRARIES \
-		maintainer-clean-compile maintainer-clean-libtool \
-		maintainer-clean-noinstPROGRAMS maintainer-clean-tags \
-		maintainer-clean-depend maintainer-clean-generic \
-		distclean-am
-	@echo "This command is intended for maintainers to use;"
-	@echo "it deletes files that may require special tools to rebuild."
-
-maintainer-clean: maintainer-clean-recursive
-	-rm -f config.status
-
-.PHONY: mostlyclean-hdr distclean-hdr clean-hdr maintainer-clean-hdr \
-mostlyclean-libLTLIBRARIES distclean-libLTLIBRARIES \
-clean-libLTLIBRARIES maintainer-clean-libLTLIBRARIES \
-uninstall-libLTLIBRARIES install-libLTLIBRARIES mostlyclean-compile \
-distclean-compile clean-compile maintainer-clean-compile \
-mostlyclean-libtool distclean-libtool clean-libtool \
-maintainer-clean-libtool mostlyclean-noinstPROGRAMS \
-distclean-noinstPROGRAMS clean-noinstPROGRAMS \
-maintainer-clean-noinstPROGRAMS install-man3 uninstall-man3 install-man \
-uninstall-man uninstall-includeHEADERS install-includeHEADERS \
-install-data-recursive uninstall-data-recursive install-exec-recursive \
-uninstall-exec-recursive installdirs-recursive uninstalldirs-recursive \
-all-recursive check-recursive installcheck-recursive info-recursive \
-dvi-recursive mostlyclean-recursive distclean-recursive clean-recursive \
-maintainer-clean-recursive tags tags-recursive mostlyclean-tags \
-distclean-tags clean-tags maintainer-clean-tags distdir \
-mostlyclean-depend distclean-depend clean-depend \
-maintainer-clean-depend info-am info dvi-am dvi check check-am \
-installcheck-am installcheck all-recursive-am install-exec-am \
-install-exec install-data-am install-data install-am install \
-uninstall-am uninstall all-redirect all-am all installdirs-am \
-installdirs mostlyclean-generic distclean-generic clean-generic \
-maintainer-clean-generic clean mostlyclean distclean maintainer-clean
-
-
-.PHONY: archive
-archive: 
-	@echo "This is $(PACKAGE)-$(VERSION)."
-	@sleep 5
-	@cvs -Q tag -F $(CVSTAG) .
-	@rm -rf /tmp/$(PACKAGE)-$(VERSION) /tmp/$(PACKAGE)
-	@cd /tmp; cvs -Q -d $(CVSROOT) export -r$(CVSTAG) $(PACKAGE) || :
-	@mv /tmp/$(PACKAGE) /tmp/$(PACKAGE)-$(VERSION)
-	@cd /tmp/$(PACKAGE)-$(VERSION); ./autogen.sh ; make depend; make distclean
-	@cd /tmp/$(PACKAGE)-$(VERSION); ./autogen.sh --noconfigure
-	@cd /tmp; tar czSpf $(PACKAGE)-$(VERSION).tar.gz $(PACKAGE)-$(VERSION)
-	@rm -rf /tmp/$(PACKAGE)-$(VERSION)
-	@cp /tmp/$(PACKAGE)-$(VERSION).tar.gz .
-	@rm -f /tmp/$(PACKAGE)-$(VERSION).tar.gz 
-	@echo " "
-	@echo "The final archive is ./$(PACKAGE)-$(VERSION).tar.gz."
-
-# Tell versions [3.59,3.63) of GNU make to not export all variables.
-# Otherwise a system limit (for SysV at least) may be exceeded.
-.NOEXPORT:
diff --git a/autogen.sh b/autogen.sh
index f443c3e..726d99b 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -1,7 +1,9 @@
 #!/bin/sh
 
-libtoolize --copy
+libtoolize --copy --force
+aclocal
 autoheader
+automake
 autoconf
 
 if [ "$1" = "--noconfigure" ]; then 
@@ -9,7 +11,7 @@ if [ "$1" = "--noconfigure" ]; then
 fi
 
 if [ X"$@" = X  -a "X`uname -s`" = "XLinux" ]; then
-    ./configure --prefix=/usr --disable-shared
+    ./configure --disable-shared --prefix=/usr
 else
-    ./configure "$@"
+    ./configure --disable-shared "$@"
 fi
diff --git a/config.h.in b/config.h.in
deleted file mode 100644
index c2b94e7..0000000
--- a/config.h.in
+++ /dev/null
@@ -1,38 +0,0 @@
-/* config.h.in.  Generated automatically from configure.in by autoheader.  */
-
-/* Define if you have the ANSI C header files.  */
-#undef STDC_HEADERS
-
-/* Define if you have the dgettext function.  */
-#undef HAVE_DGETTEXT
-
-/* Define if you have the gettext function.  */
-#undef HAVE_GETTEXT
-
-/* Define if you have the strerror function.  */
-#undef HAVE_STRERROR
-
-/* Define if you have the <alloca.h> header file.  */
-#undef HAVE_ALLOCA_H
-
-/* Define if you have the <libintl.h> header file.  */
-#undef HAVE_LIBINTL_H
-
-/* Define if you have the <string.h> header file.  */
-#undef HAVE_STRING_H
-
-/* Define if you have the <unistd.h> header file.  */
-#undef HAVE_UNISTD_H
-
-/* Name of package */
-#undef PACKAGE
-
-/* Version number of package */
-#undef VERSION
-
-/* Define if compiler has function prototypes */
-#undef PROTOTYPES
-
-/* define if compiled symbols have a leading underscore */
-#undef WITH_SYMBOL_UNDERSCORE
-
-- 
Gitee


From 70d73fd6057d79a2a3bde87988efe01418a4bc28 Mon Sep 17 00:00:00 2001
From: Jeff Johnson <n3npq@mac.com>
Date: Tue, 16 Feb 1999 03:07:27 +0000
Subject: [PATCH 159/667] Update to automake 1.4a.

---
 aclocal.m4 | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/aclocal.m4 b/aclocal.m4
index ba33d33..828f6c7 100644
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -1,4 +1,4 @@
-dnl aclocal.m4 generated automatically by aclocal 1.4
+dnl aclocal.m4 generated automatically by aclocal 1.4a
 
 dnl Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
@@ -21,6 +21,8 @@ dnl AM_INIT_AUTOMAKE(package,version, [no-define])
 
 AC_DEFUN(AM_INIT_AUTOMAKE,
 [AC_REQUIRE([AC_PROG_INSTALL])
+dnl We require 2.13 because we rely on SHELL being computed by configure.
+AC_PREREQ([2.13])
 PACKAGE=[$1]
 AC_SUBST(PACKAGE)
 VERSION=[$2]
-- 
Gitee


From f32358f285b66abd5002daaff5662527388d7976 Mon Sep 17 00:00:00 2001
From: Erik Troan <ewt@redhat.com>
Date: Thu, 25 Feb 1999 20:16:43 +0000
Subject: [PATCH 160/667] allow single dash arguments (to represent stdin)

---
 popt.c  | 6 +++++-
 test1.c | 4 ++++
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/popt.c b/popt.c
index 7dd453d..104623e 100644
--- a/popt.c
+++ b/popt.c
@@ -231,7 +231,7 @@ static void execCommand(poptContext con) {
 
 static const struct poptOption * findOption(const struct poptOption * table,
 					    const char * longName,
-					    const char shortName,
+					    char shortName,
 					    poptCallbackType * callback,
 					    void ** callbackData,
 					    int singleDash) {
@@ -239,6 +239,10 @@ static const struct poptOption * findOption(const struct poptOption * table,
     const struct poptOption * opt2;
     const struct poptOption * cb = NULL;
 
+    /* This happens when a single - is given */
+    if (singleDash && !shortName)
+	shortName = '-';
+
     while (opt->longName || opt->shortName || opt->arg) {
 	if ((opt->argInfo & POPT_ARG_MASK) == POPT_ARG_INCLUDE_TABLE) {
 	    opt2 = findOption(opt->arg, longName, shortName, callback, 
diff --git a/test1.c b/test1.c
index 28ee269..04b0299 100644
--- a/test1.c
+++ b/test1.c
@@ -24,6 +24,7 @@ int main(int argc, char ** argv) {
     int help = 0;
     int usage = 0;
     int shortopt = 0;
+    int singleDash = 0;
     struct poptOption moreCallbackArgs[] = {
 	{ NULL, '\0', POPT_ARG_CALLBACK | POPT_CBFLAG_INC_DATA, 
 		option_callback, 0, NULL },
@@ -53,6 +54,7 @@ int main(int argc, char ** argv) {
 		"This shouldn't show up", NULL },
 	{ "unused", '\0', POPT_ARG_STRING, NULL, 0, 
 	    "Unused option for help testing", "UNUSED" },
+	{ NULL, '-', POPT_ARG_NONE | POPT_ARGFLAG_DOC_HIDDEN, &singleDash, 0 },
 	{ NULL, '\0', POPT_ARG_INCLUDE_TABLE, &moreArgs, 0, NULL },
 	{ NULL, '\0', POPT_ARG_INCLUDE_TABLE, &callbackArgs, 0, "Callback arguments" },
 	POPT_AUTOHELP
@@ -85,6 +87,8 @@ int main(int argc, char ** argv) {
 	fprintf(stdout, " inc: %d", inc);
     if (shortopt)
 	fprintf(stdout, " short: %d", shortopt);
+    if (singleDash)
+	fprintf(stdout, " -", shortopt);
 
     rest = poptGetArgs(optCon);
     if (rest) {
-- 
Gitee


From c23b96493c5605533c425fcb76584d950bd0bccf Mon Sep 17 00:00:00 2001
From: Erik Troan <ewt@redhat.com>
Date: Thu, 25 Feb 1999 20:17:30 +0000
Subject: [PATCH 161/667] *** empty log message ***

---
 popt.spec | 24 ++++++++++++++----------
 1 file changed, 14 insertions(+), 10 deletions(-)

diff --git a/popt.spec b/popt.spec
index 5fba883..735fb51 100644
--- a/popt.spec
+++ b/popt.spec
@@ -1,20 +1,24 @@
-Summary: C library for parsing command line parameters
+Summary: A C library for parsing command line parameters.
 Name: popt
-Version: 1.2.3
+Version: 1.2.4
 Release: 1
 Copyright: LGPL
-Group: Libraries
+Group: System Environment/Libraries
 Source: ftp://ftp.redhat.com/pub/redhat/code/popt/popt-%{version}.tar.gz
 BuildRoot: /var/tmp/%{name}root
 
 %description
-Popt is a C library for pasing command line parameters. It was heavily
-influenced by the getopt() and getopt_long() functions, but it allows
-more powerfull argument expansion. It can parse arbitrary argv[] style
-arrays and automatically set variables based on command line arguments.
-It also allows command line arguments to be aliased via configuration
-files and includes utility functions for parsing arbitrary strings into
-argv[] arrays using shell-like rules. 
+Popt is a C library for parsing command line parameters.  Popt
+was heavily influenced by the getopt() and getopt_long() functions,
+but it improves on them by allowing more powerful argument expansion.
+Popt can parse arbitrary argv[] style arrays and automatically set
+variables based on command line arguments.  Popt allows command
+line arguments to be aliased via configuration files and includes
+utility functions for parsing arbitrary strings into argv[] arrays
+using shell-like rules.
+
+Install popt if you're a C programmer and you'd like to use its
+capabilities.
 
 %prep
 %setup -q
-- 
Gitee


From 2710b325ede30e7a9f07a2be76edad094eefb7b3 Mon Sep 17 00:00:00 2001
From: Jeff Johnson <n3npq@mac.com>
Date: Sun, 28 Feb 1999 14:18:59 +0000
Subject: [PATCH 162/667] increase timeout in tread from 5 to 30 secs for slow
 links.

---
 po/popt.pot | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/po/popt.pot b/po/popt.pot
index 40d81e4..632e58c 100644
--- a/po/popt.pot
+++ b/po/popt.pot
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 1999-01-08 09:54-0500\n"
+"POT-Creation-Date: 1999-02-26 18:01-0500\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
-- 
Gitee


From 6d802f2a495526a723bfb760019b98babc3c07d3 Mon Sep 17 00:00:00 2001
From: Erik Troan <ewt@redhat.com>
Date: Fri, 5 Mar 1999 01:16:42 +0000
Subject: [PATCH 163/667] plugged some minor memory leaks

---
 popt.c | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/popt.c b/popt.c
index 104623e..2ba61e1 100644
--- a/popt.c
+++ b/popt.c
@@ -92,6 +92,8 @@ poptContext poptGetContext(char * name, int argc, char ** argv,
 }
 
 void poptResetContext(poptContext con) {
+    int i;
+
     con->os = con->optionStack;
     con->os->currAlias = NULL;
     con->os->nextCharArg = NULL;
@@ -102,6 +104,10 @@ void poptResetContext(poptContext con) {
     con->nextLeftover = 0;
     con->restLeftover = 0;
     con->doExec = NULL;
+
+    for (i = 0; i < con->finalArgvCount; i++)
+	free(con->finalArgv[i]);
+
     con->finalArgvCount = 0;
 }
 
@@ -496,6 +502,7 @@ void poptFreeContext(poptContext con) {
     if (con->appName) free(con->appName);
     if (con->aliases) free(con->aliases);
     if (con->otherHelp) free(con->otherHelp);
+    if (con->execPath) free(con->execPath);
     free(con);
 }
 
-- 
Gitee


From bf003590cee2ac15eba8a6fc0d075275884e4865 Mon Sep 17 00:00:00 2001
From: Jeff Johnson <n3npq@mac.com>
Date: Tue, 9 Mar 1999 03:37:24 +0000
Subject: [PATCH 164/667] Fix proxy FTP segfault.

---
 po/popt.pot | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/po/popt.pot b/po/popt.pot
index 632e58c..9df8ebe 100644
--- a/po/popt.pot
+++ b/po/popt.pot
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 1999-02-26 18:01-0500\n"
+"POT-Creation-Date: 1999-03-08 21:55-0500\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
-- 
Gitee


From e3e094416832ec2b66513db1ec980764e6908af2 Mon Sep 17 00:00:00 2001
From: Elliot Lee <sopwith@redhat.com>
Date: Wed, 10 Mar 1999 02:55:24 +0000
Subject: [PATCH 165/667] autogen.sh: Fix builddir != srcdir.

*.c: Fix compilation with -ansi -pedantic-errors.
---
 aclocal.m4 | 151 ++++++++++++++++++++++++++++-------------------------
 autogen.sh |  12 ++++-
 popt.c     |   4 +-
 popthelp.c |   2 +-
 test1.c    |  48 +++++++++--------
 5 files changed, 119 insertions(+), 98 deletions(-)

diff --git a/aclocal.m4 b/aclocal.m4
index 828f6c7..e3cde60 100644
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -1,4 +1,4 @@
-dnl aclocal.m4 generated automatically by aclocal 1.4a
+dnl aclocal.m4 generated automatically by aclocal 1.4
 
 dnl Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
@@ -21,8 +21,6 @@ dnl AM_INIT_AUTOMAKE(package,version, [no-define])
 
 AC_DEFUN(AM_INIT_AUTOMAKE,
 [AC_REQUIRE([AC_PROG_INSTALL])
-dnl We require 2.13 because we rely on SHELL being computed by configure.
-AC_PREREQ([2.13])
 PACKAGE=[$1]
 AC_SUBST(PACKAGE)
 VERSION=[$2]
@@ -238,9 +236,10 @@ esac
 ])
 
 
-# serial 29 AM_PROG_LIBTOOL
+# serial 30 AM_PROG_LIBTOOL
 AC_DEFUN(AM_PROG_LIBTOOL,
-[AC_REQUIRE([AM_ENABLE_SHARED])dnl
+[AC_PREREQ(2.12.2)dnl
+AC_REQUIRE([AM_ENABLE_SHARED])dnl
 AC_REQUIRE([AM_ENABLE_STATIC])dnl
 AC_REQUIRE([AC_CANONICAL_HOST])dnl
 AC_REQUIRE([AC_CANONICAL_BUILD])dnl
@@ -519,7 +518,7 @@ AC_CACHE_VAL(ac_cv_path_NM,
   ac_cv_path_NM="$NM"
 else
   IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS="${IFS}:"
-  for ac_dir in /usr/ucb /usr/ccs/bin $PATH /bin; do
+  for ac_dir in $PATH /usr/ccs/bin /usr/ucb /bin; do
     test -z "$ac_dir" && ac_dir=.
     if test -f $ac_dir/nm; then
       # Check to see if the nm accepts a BSD-compat flag.
@@ -527,12 +526,14 @@ else
       #   nm: unknown option "B" ignored
       if ($ac_dir/nm -B /dev/null 2>&1 | sed '1q'; exit 0) | egrep /dev/null >/dev/null; then
         ac_cv_path_NM="$ac_dir/nm -B"
+	break
       elif ($ac_dir/nm -p /dev/null 2>&1 | sed '1q'; exit 0) | egrep /dev/null >/dev/null; then
         ac_cv_path_NM="$ac_dir/nm -p"
+	break
       else
-        ac_cv_path_NM="$ac_dir/nm"
+        ac_cv_path_NM=${ac_cv_path_NM="$ac_dir/nm"} # keep the first match, but
+	continue # so that we can try to find one that supports BSD flags
       fi
-      break
     fi
   done
   IFS="$ac_save_ifs"
@@ -569,10 +570,6 @@ case "$host_os" in
 aix*)
   ac_symcode='[BCDTU]'
   ;;
-sunos* | cygwin32* | mingw32*)
-  ac_sympat='_\([_A-Za-z][_A-Za-z0-9]*\)'
-  ac_symxfrm='_\1 \1'
-  ;;
 irix*)
   # Cannot use undefined symbols on IRIX because inlined functions mess us up.
   ac_symcode='[BCDEGRST]'
@@ -596,12 +593,17 @@ cygwin32* | mingw32*)
 esac
 changequote([,])dnl
 
-# Write the raw and C identifiers.
-ac_cv_sys_global_symbol_pipe="sed -n -e 's/^.* $ac_symcode $ac_sympat$/$ac_symxfrm/p'"
+# Try without a prefix undercore, then with it.
+for ac_symprfx in "" "_"; do
 
-# Check to see that the pipe works correctly.
-ac_pipe_works=no
-cat > conftest.$ac_ext <<EOF
+  # Write the raw and C identifiers.
+  # Unlike in ltconfig.in, we need $ac_symprfx before $ac_symxfrm here,
+  # otherwise AM_SYS_SYMBOL_UNDERSCORE will always be false
+  ac_cv_sys_global_symbol_pipe="sed -n -e 's/^.* $ac_symcode $ac_symprfx$ac_sympat$/$ac_symprfx$ac_symxfrm/p'"
+
+  # Check to see that the pipe works correctly.
+  ac_pipe_works=no
+  cat > conftest.$ac_ext <<EOF
 #ifdef __cplusplus
 extern "C" {
 #endif
@@ -612,41 +614,42 @@ void nm_test_func(){}
 #endif
 int main(){nm_test_var='a';nm_test_func;return 0;}
 EOF
-if AC_TRY_EVAL(ac_compile); then
-  # Now try to grab the symbols.
-  ac_nlist=conftest.nm
-  if AC_TRY_EVAL(NM conftest.$ac_objext \| $ac_cv_sys_global_symbol_pipe \> $ac_nlist) && test -s "$ac_nlist"; then
-
-    # Try sorting and uniquifying the output.
-    if sort "$ac_nlist" | uniq > "$ac_nlist"T; then
-      mv -f "$ac_nlist"T "$ac_nlist"
-      ac_wcout=`wc "$ac_nlist" 2>/dev/null`
+  if AC_TRY_EVAL(ac_compile); then
+    # Now try to grab the symbols.
+    ac_nlist=conftest.nm
+  
+    if AC_TRY_EVAL(NM conftest.$ac_objext \| $ac_cv_sys_global_symbol_pipe \> $ac_nlist) && test -s "$ac_nlist"; then
+
+      # Try sorting and uniquifying the output.
+      if sort "$ac_nlist" | uniq > "$ac_nlist"T; then
+        mv -f "$ac_nlist"T "$ac_nlist"
+        ac_wcout=`wc "$ac_nlist" 2>/dev/null`
 changequote(,)dnl
-      ac_count=`echo "X$ac_wcout" | sed -e 's,^X,,' -e 's/^[ 	]*\([0-9][0-9]*\).*$/\1/'`
+        ac_count=`echo "X$ac_wcout" | sed -e 's,^X,,' -e 's/^[ 	]*\([0-9][0-9]*\).*$/\1/'`
 changequote([,])dnl
-      (test "$ac_count" -ge 0) 2>/dev/null || ac_count=-1
-    else
-      rm -f "$ac_nlist"T
-      ac_count=-1
-    fi
+        (test "$ac_count" -ge 0) 2>/dev/null || ac_count=-1
+      else
+        rm -f "$ac_nlist"T
+        ac_count=-1
+      fi
 
-    # Make sure that we snagged all the symbols we need.
-    if egrep ' nm_test_var$' "$ac_nlist" >/dev/null; then
-      if egrep ' nm_test_func$' "$ac_nlist" >/dev/null; then
-	cat <<EOF > conftest.c
+      # Make sure that we snagged all the symbols we need.
+      if egrep ' nm_test_var$' "$ac_nlist" >/dev/null; then
+        if egrep ' nm_test_func$' "$ac_nlist" >/dev/null; then
+	  cat <<EOF > conftest.c
 #ifdef __cplusplus
 extern "C" {
 #endif
 
 EOF
-        # Now generate the symbol file.
-        sed 's/^.* \(.*\)$/extern char \1;/' < "$ac_nlist" >> conftest.c
+          # Now generate the symbol file.
+          sed 's/^.* \(.*\)$/extern char \1;/' < "$ac_nlist" >> conftest.c
 
-	cat <<EOF >> conftest.c
+	  cat <<EOF >> conftest.c
 #if defined (__STDC__) && __STDC__
-# define __ptr_t void *
+# define lt_ptr_t void *
 #else
-# define __ptr_t char *
+# define lt_ptr_t char *
 #endif
 
 /* The number of symbols in dld_preloaded_symbols, -1 if unsorted. */
@@ -655,53 +658,63 @@ int dld_preloaded_symbol_count = $ac_count;
 /* The mapping between symbol names and symbols. */
 struct {
   char *name;
-  __ptr_t address;
+  lt_ptr_t address;
 }
 changequote(,)dnl
 dld_preloaded_symbols[] =
 changequote([,])dnl
 {
 EOF
-        sed 's/^\(.*\) \(.*\)$/  {"\1", (__ptr_t) \&\2},/' < "$ac_nlist" >> conftest.c
+        sed 's/^\(.*\) \(.*\)$/  {"\1", (lt_ptr_t) \&\2},/' < "$ac_nlist" >> conftest.c
         cat <<\EOF >> conftest.c
-  {0, (__ptr_t) 0}
+  {0, (lt_ptr_t) 0}
 };
 
 #ifdef __cplusplus
 }
 #endif
 EOF
-        # Now try linking the two files.
-        mv conftest.$ac_objext conftestm.$ac_objext
-	ac_save_LIBS="$LIBS"
-	ac_save_CFLAGS="$CFLAGS"
-        LIBS="conftestm.$ac_objext"
-	CFLAGS="$CFLAGS$no_builtin_flag"
-        if AC_TRY_EVAL(ac_link) && test -s conftest; then
-          ac_pipe_works=yes
+          # Now try linking the two files.
+          mv conftest.$ac_objext conftestm.$ac_objext
+	  ac_save_LIBS="$LIBS"
+	  ac_save_CFLAGS="$CFLAGS"
+          LIBS="conftestm.$ac_objext"
+	  CFLAGS="$CFLAGS$no_builtin_flag"
+          if AC_TRY_EVAL(ac_link) && test -s conftest; then
+            ac_pipe_works=yes
+          else
+            echo "configure: failed program was:" >&AC_FD_CC
+            cat conftest.c >&AC_FD_CC
+          fi
+          LIBS="$ac_save_LIBS"
+	  CFLAGS="$ac_save_CFLAGS"
         else
-          echo "configure: failed program was:" >&AC_FD_CC
-          cat conftest.c >&AC_FD_CC
+          echo "cannot find nm_test_func in $ac_nlist" >&AC_FD_CC
         fi
-        LIBS="$ac_save_LIBS"
-	CFLAGS="$ac_save_CFLAGS"
       else
-        echo "cannot find nm_test_func in $ac_nlist" >&AC_FD_CC
+        echo "cannot find nm_test_var in $ac_nlist" >&AC_FD_CC
       fi
     else
-      echo "cannot find nm_test_var in $ac_nlist" >&AC_FD_CC
+      echo "cannot run $ac_cv_sys_global_symbol_pipe" >&AC_FD_CC
     fi
   else
-    echo "cannot run $ac_cv_sys_global_symbol_pipe" >&AC_FD_CC
+    echo "$progname: failed program was:" >&AC_FD_CC
+    cat conftest.c >&AC_FD_CC
   fi
-else
-  echo "$progname: failed program was:" >&AC_FD_CC
-  cat conftest.c >&AC_FD_CC
-fi
-rm -rf conftest*
+  rm -rf conftest*
 
-# Do not use the global_symbol_pipe unless it works.
-test "$ac_pipe_works" = yes || ac_cv_sys_global_symbol_pipe=
+  # Do not use the global_symbol_pipe unless it works.
+  if test "$ac_pipe_works" = yes; then
+    if test x"$ac_symprfx" = x"_"; then
+      ac_cv_sys_symbol_underscore=yes
+    else
+      ac_cv_sys_symbol_underscore=no
+    fi
+    break
+  else
+    ac_cv_sys_global_symbol_pipe=
+  fi
+done
 ])
 
 ac_result=yes
@@ -753,9 +766,7 @@ fi
 rm -rf conftest*
 ])
 AC_MSG_RESULT($ac_cv_sys_symbol_underscore)
-if test x$ac_cv_sys_symbol_underscore = xyes; then
-  AC_DEFINE(WITH_SYMBOL_UNDERSCORE,1,
-  [define if compiled symbols have a leading underscore])
-fi
+USE_SYMBOL_UNDERSCORE=${ac_cv_sys_symbol_underscore=no}
+AC_SUBST(USE_SYMBOL_UNDERSCORE)dnl
 ])
 
diff --git a/autogen.sh b/autogen.sh
index 726d99b..51e80b8 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -1,5 +1,11 @@
 #!/bin/sh
 
+srcdir="`dirname $0`"
+test -z "$srcdir" && srcdir=.
+
+THEDIR="`pwd`"
+
+cd "$srcdir"
 libtoolize --copy --force
 aclocal
 autoheader
@@ -10,8 +16,10 @@ if [ "$1" = "--noconfigure" ]; then
     exit 0;
 fi
 
+cd "$THEDIR"
+
 if [ X"$@" = X  -a "X`uname -s`" = "XLinux" ]; then
-    ./configure --disable-shared --prefix=/usr
+    $srcdir/configure --disable-shared --prefix=/usr
 else
-    ./configure --disable-shared "$@"
+    $srcdir/configure --disable-shared "$@"
 fi
diff --git a/popt.c b/popt.c
index 2ba61e1..b4564ae 100644
--- a/popt.c
+++ b/popt.c
@@ -52,7 +52,7 @@ static void invokeCallbacks(poptContext con, const struct poptOption * table,
 	} else if (((opt->argInfo & POPT_ARG_MASK) == POPT_ARG_CALLBACK) &&
 		   ((!post && (opt->argInfo & POPT_CBFLAG_PRE)) ||
 		    ( post && (opt->argInfo & POPT_CBFLAG_POST)))) {
-	    cb = opt->arg;
+	    cb = (poptCallbackType)opt->arg;
 	    cb(con, post ? POPT_CALLBACK_REASON_POST : POPT_CALLBACK_REASON_PRE,
 	       NULL, NULL, opt->descrip);
 	}
@@ -274,7 +274,7 @@ static const struct poptOption * findOption(const struct poptOption * table,
     *callbackData = NULL;
     *callback = NULL;
     if (cb) {
-	*callback = cb->arg;
+	*callback = (poptCallbackType)cb->arg;
 	if (!(cb->argInfo & POPT_CBFLAG_INC_DATA))
 	    *callbackData = cb->descrip;
     }
diff --git a/popthelp.c b/popthelp.c
index c0fb6e7..1ec8c8b 100644
--- a/popthelp.c
+++ b/popthelp.c
@@ -27,7 +27,7 @@ static void displayArgs(poptContext con, enum poptCallbackReason foo,
 }
 
 struct poptOption poptHelpOptions[] = {
-    { NULL, '\0', POPT_ARG_CALLBACK, &displayArgs, '\0', NULL },
+    { NULL, '\0', POPT_ARG_CALLBACK, (void *)&displayArgs, '\0', NULL },
     { "help", '?', 0, NULL, '?', N_("Show this help message") },
     { "usage", '\0', 0, NULL, 'u', N_("Display brief usage message") },
     { NULL, '\0', 0, NULL, 0 }
diff --git a/test1.c b/test1.c
index 04b0299..90ac9c6 100644
--- a/test1.c
+++ b/test1.c
@@ -13,35 +13,30 @@ void option_callback(poptContext con, enum poptCallbackReason reason,
     fprintf(stdout, "callback: %c %s %s ", opt->val, (char *) data, arg);    
 }
 
-int main(int argc, char ** argv) {
-    int rc;
-    int arg1 = 0;
-    char * arg2 = "(none)";
-    poptContext optCon;
-    char ** rest;
-    int arg3 = 0;
-    int inc = 0;
-    int help = 0;
-    int usage = 0;
-    int shortopt = 0;
-    int singleDash = 0;
-    struct poptOption moreCallbackArgs[] = {
+int arg1 = 0;
+char * arg2 = "(none)";
+int arg3 = 0;
+int inc = 0;
+int shortopt = 0;
+int singleDash = 0;
+
+static struct poptOption moreCallbackArgs[] = {
 	{ NULL, '\0', POPT_ARG_CALLBACK | POPT_CBFLAG_INC_DATA, 
-		option_callback, 0, NULL },
+		(void *)option_callback, 0, NULL },
 	{ "cb2", 'c', POPT_ARG_STRING, NULL, 'c', "Test argument callbacks" },
 	{ NULL, '\0', 0, NULL, 0 } 
-    };
-    struct poptOption callbackArgs[] = {
-	{ NULL, '\0', POPT_ARG_CALLBACK, option_callback, 0, "sampledata" },
+};
+static struct poptOption callbackArgs[] = {
+	{ NULL, '\0', POPT_ARG_CALLBACK, (void *)option_callback, 0, "sampledata" },
 	{ "cb", 'c', POPT_ARG_STRING, NULL, 'c', "Test argument callbacks" },
 	{ "long", '\0', 0, NULL, 'l', "Unused option for help testing" },
 	{ NULL, '\0', 0, NULL, 0 } 
-    };
-    struct poptOption moreArgs[] = {
+};
+static struct poptOption moreArgs[] = {
 	{ "inc", 'i', 0, &inc, 0, "An included argument" },
 	{ NULL, '\0', 0, NULL, 0 } 
-    };
-    struct poptOption options[] = {
+};
+static struct poptOption options[] = {
 	{ NULL, '\0', POPT_ARG_INCLUDE_TABLE, &moreCallbackArgs, 0, "arg for cb2" },
 	{ "arg1", '\0', 0, &arg1, 0, "First argument with a really long" 
 	    " description. After all, we have to test argument help"
@@ -59,7 +54,14 @@ int main(int argc, char ** argv) {
 	{ NULL, '\0', POPT_ARG_INCLUDE_TABLE, &callbackArgs, 0, "Callback arguments" },
 	POPT_AUTOHELP
 	{ NULL, '\0', 0, NULL, 0 } 
-    };
+};
+
+int main(int argc, char ** argv) {
+    int rc;
+    poptContext optCon;
+    char ** rest;
+    int help = 0;
+    int usage = 0;
 
     optCon = poptGetContext("test1", argc, argv, options, 0);
     poptReadConfigFile(optCon, "./test-poptrc");
@@ -88,7 +90,7 @@ int main(int argc, char ** argv) {
     if (shortopt)
 	fprintf(stdout, " short: %d", shortopt);
     if (singleDash)
-	fprintf(stdout, " -", shortopt);
+	fprintf(stdout, " -");
 
     rest = poptGetArgs(optCon);
     if (rest) {
-- 
Gitee


From 803feabe75bfb726a7e8d3fafad1a452209ef8c2 Mon Sep 17 00:00:00 2001
From: Jeff Johnson <n3npq@mac.com>
Date: Fri, 19 Mar 1999 22:38:45 +0000
Subject: [PATCH 166/667] update with libtool-2.4f.

---
 aclocal.m4 | 387 +++++++++++++++++++++++++++++++----------------------
 1 file changed, 229 insertions(+), 158 deletions(-)

diff --git a/aclocal.m4 b/aclocal.m4
index e3cde60..2650a11 100644
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -1,4 +1,4 @@
-dnl aclocal.m4 generated automatically by aclocal 1.4
+dnl aclocal.m4 generated automatically by aclocal 1.4a
 
 dnl Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
@@ -21,6 +21,8 @@ dnl AM_INIT_AUTOMAKE(package,version, [no-define])
 
 AC_DEFUN(AM_INIT_AUTOMAKE,
 [AC_REQUIRE([AC_PROG_INSTALL])
+dnl We require 2.13 because we rely on SHELL being computed by configure.
+AC_PREREQ([2.13])
 PACKAGE=[$1]
 AC_SUBST(PACKAGE)
 VERSION=[$2]
@@ -236,29 +238,58 @@ esac
 ])
 
 
-# serial 30 AM_PROG_LIBTOOL
-AC_DEFUN(AM_PROG_LIBTOOL,
-[AC_PREREQ(2.12.2)dnl
-AC_REQUIRE([AM_ENABLE_SHARED])dnl
-AC_REQUIRE([AM_ENABLE_STATIC])dnl
+# serial 35 AC_PROG_LIBTOOL
+AC_DEFUN(AC_PROG_LIBTOOL,
+[AC_REQUIRE([AC_LIBTOOL_SETUP])dnl
+
+# Save cache, so that ltconfig can load it
+AC_CACHE_SAVE
+
+# Actually configure libtool.  ac_aux_dir is where install-sh is found.
+CC="$CC" CFLAGS="$CFLAGS" CPPFLAGS="$CPPFLAGS" \
+LD="$LD" NM="$NM" RANLIB="$RANLIB" LN_S="$LN_S" \
+DLLTOOL="$DLLTOOL" AS="$AS" \
+${CONFIG_SHELL-/bin/sh} $ac_aux_dir/ltconfig --no-reexec \
+$libtool_flags --no-verify $ac_aux_dir/ltmain.sh $host \
+|| AC_MSG_ERROR([libtool configure failed])
+
+# Reload cache, that may have been modified by ltconfig
+AC_CACHE_LOAD
+
+# This can be used to rebuild libtool when needed
+LIBTOOL_DEPS="$ac_aux_dir/ltconfig $ac_aux_dir/ltmain.sh"
+
+# Always use our own libtool.
+LIBTOOL='$(SHELL) $(top_builddir)/libtool'
+AC_SUBST(LIBTOOL)dnl
+
+# Redirect the config.log output again, so that the ltconfig log is not
+# clobbered by the next message.
+exec 5>>./config.log
+])
+
+AC_DEFUN(AC_LIBTOOL_SETUP,
+[AC_PREREQ(2.13)dnl
+AC_REQUIRE([AC_ENABLE_SHARED])dnl
+AC_REQUIRE([AC_ENABLE_STATIC])dnl
+AC_REQUIRE([AC_ENABLE_FAST_INSTALL])dnl
 AC_REQUIRE([AC_CANONICAL_HOST])dnl
 AC_REQUIRE([AC_CANONICAL_BUILD])dnl
 AC_REQUIRE([AC_PROG_RANLIB])dnl
 AC_REQUIRE([AC_PROG_CC])dnl
-AC_REQUIRE([AM_PROG_LD])dnl
-AC_REQUIRE([AM_PROG_NM])dnl
-AC_REQUIRE([AM_SYS_NM_PARSE])dnl
-AC_REQUIRE([AM_SYS_SYMBOL_UNDERSCORE])dnl
+AC_REQUIRE([AC_PROG_LD])dnl
+AC_REQUIRE([AC_PROG_NM])dnl
+AC_REQUIRE([AC_SYS_NM_PARSE])dnl
+AC_REQUIRE([AC_SYS_SYMBOL_UNDERSCORE])dnl
 AC_REQUIRE([AC_PROG_LN_S])dnl
 dnl
-# Always use our own libtool.
-LIBTOOL='$(SHELL) $(top_builddir)/libtool'
-AC_SUBST(LIBTOOL)dnl
 
 # Check for any special flags to pass to ltconfig.
-libtool_flags=
+libtool_flags="--cache-file=$cache_file"
 test "$enable_shared" = no && libtool_flags="$libtool_flags --disable-shared"
 test "$enable_static" = no && libtool_flags="$libtool_flags --disable-static"
+test "$enable_fast_install" = no && libtool_flags="$libtool_flags --disable-fast-install"
+test "$lt_dlopen" = yes && libtool_flags="$libtool_flags --enable-dlopen"
 test "$silent" = yes && libtool_flags="$libtool_flags --silent"
 test "$ac_cv_prog_gcc" = yes && libtool_flags="$libtool_flags --with-gcc"
 test "$ac_cv_prog_gnu_ld" = yes && libtool_flags="$libtool_flags --with-gnu-ld"
@@ -297,8 +328,8 @@ case "$host" in
   fi
   ;;
 
-*-*-cygwin32*)
-  AM_SYS_LIBTOOL_CYGWIN32
+*-*-cygwin*)
+  AC_SYS_LIBTOOL_CYGWIN
   ;;
 
 esac
@@ -313,30 +344,20 @@ need_locks=yes)
 if test x"$need_locks" = xno; then
   libtool_flags="$libtool_flags --disable-lock"
 fi
-
-
-# Actually configure libtool.  ac_aux_dir is where install-sh is found.
-CC="$CC" CFLAGS="$CFLAGS" CPPFLAGS="$CPPFLAGS" \
-LD="$LD" NM="$NM" RANLIB="$RANLIB" LN_S="$LN_S" \
-DLLTOOL="$DLLTOOL" AS="$AS" \
-${CONFIG_SHELL-/bin/sh} $ac_aux_dir/ltconfig --no-reexec \
-$libtool_flags --no-verify $ac_aux_dir/ltmain.sh $host \
-|| AC_MSG_ERROR([libtool configure failed])
-
-# Redirect the config.log output again, so that the ltconfig log is not
-# clobbered by the next message.
-exec 5>>./config.log
 ])
 
-# AM_ENABLE_SHARED - implement the --enable-shared flag
-# Usage: AM_ENABLE_SHARED[(DEFAULT)]
+# AC_LIBTOOL_DLOPEN - check for dlopen support
+AC_DEFUN(AC_LIBTOOL_DLOPEN, [lt_dlopen=yes])
+
+# AC_ENABLE_SHARED - implement the --enable-shared flag
+# Usage: AC_ENABLE_SHARED[(DEFAULT)]
 #   Where DEFAULT is either `yes' or `no'.  If omitted, it defaults to
 #   `yes'.
-AC_DEFUN(AM_ENABLE_SHARED,
-[define([AM_ENABLE_SHARED_DEFAULT], ifelse($1, no, no, yes))dnl
+AC_DEFUN(AC_ENABLE_SHARED,
+[define([AC_ENABLE_SHARED_DEFAULT], ifelse($1, no, no, yes))dnl
 AC_ARG_ENABLE(shared,
 changequote(<<, >>)dnl
-<<  --enable-shared[=PKGS]  build shared libraries [default=>>AM_ENABLE_SHARED_DEFAULT],
+<<  --enable-shared[=PKGS]  build shared libraries [default=>>AC_ENABLE_SHARED_DEFAULT],
 changequote([, ])dnl
 [p=${PACKAGE-default}
 case "$enableval" in
@@ -354,26 +375,22 @@ no) enable_shared=no ;;
   IFS="$ac_save_ifs"
   ;;
 esac],
-enable_shared=AM_ENABLE_SHARED_DEFAULT)dnl
+enable_shared=AC_ENABLE_SHARED_DEFAULT)dnl
 ])
 
-# AM_DISABLE_SHARED - set the default shared flag to --disable-shared
-AC_DEFUN(AM_DISABLE_SHARED,
-[AM_ENABLE_SHARED(no)])
-
-# AM_DISABLE_STATIC - set the default static flag to --disable-static
-AC_DEFUN(AM_DISABLE_STATIC,
-[AM_ENABLE_STATIC(no)])
+# AC_DISABLE_SHARED - set the default shared flag to --disable-shared
+AC_DEFUN(AC_DISABLE_SHARED,
+[AC_ENABLE_SHARED(no)])
 
-# AM_ENABLE_STATIC - implement the --enable-static flag
-# Usage: AM_ENABLE_STATIC[(DEFAULT)]
+# AC_ENABLE_STATIC - implement the --enable-static flag
+# Usage: AC_ENABLE_STATIC[(DEFAULT)]
 #   Where DEFAULT is either `yes' or `no'.  If omitted, it defaults to
 #   `yes'.
-AC_DEFUN(AM_ENABLE_STATIC,
-[define([AM_ENABLE_STATIC_DEFAULT], ifelse($1, no, no, yes))dnl
+AC_DEFUN(AC_ENABLE_STATIC,
+[define([AC_ENABLE_STATIC_DEFAULT], ifelse($1, no, no, yes))dnl
 AC_ARG_ENABLE(static,
 changequote(<<, >>)dnl
-<<  --enable-static[=PKGS]  build static libraries [default=>>AM_ENABLE_STATIC_DEFAULT],
+<<  --enable-static[=PKGS]  build static libraries [default=>>AC_ENABLE_STATIC_DEFAULT],
 changequote([, ])dnl
 [p=${PACKAGE-default}
 case "$enableval" in
@@ -391,12 +408,50 @@ no) enable_static=no ;;
   IFS="$ac_save_ifs"
   ;;
 esac],
-enable_static=AM_ENABLE_STATIC_DEFAULT)dnl
+enable_static=AC_ENABLE_STATIC_DEFAULT)dnl
+])
+
+# AC_DISABLE_STATIC - set the default static flag to --disable-static
+AC_DEFUN(AC_DISABLE_STATIC,
+[AC_ENABLE_STATIC(no)])
+
+
+# AC_ENABLE_FAST_INSTALL - implement the --enable-fast-install flag
+# Usage: AC_ENABLE_FAST_INSTALL[(DEFAULT)]
+#   Where DEFAULT is either `yes' or `no'.  If omitted, it defaults to
+#   `yes'.
+AC_DEFUN(AC_ENABLE_FAST_INSTALL,
+[define([AC_ENABLE_FAST_INSTALL_DEFAULT], ifelse($1, no, no, yes))dnl
+AC_ARG_ENABLE(fast-install,
+changequote(<<, >>)dnl
+<<  --enable-fast-install[=PKGS]  optimize for fast installation [default=>>AC_ENABLE_FAST_INSTALL_DEFAULT],
+changequote([, ])dnl
+[p=${PACKAGE-default}
+case "$enableval" in
+yes) enable_fast_install=yes ;;
+no) enable_fast_install=no ;;
+*)
+  enable_fast_install=no
+  # Look at the argument we got.  We use all the common list separators.
+  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS="${IFS}:,"
+  for pkg in $enableval; do
+    if test "X$pkg" = "X$p"; then
+      enable_fast_install=yes
+    fi
+  done
+  IFS="$ac_save_ifs"
+  ;;
+esac],
+enable_fast_install=AC_ENABLE_FAST_INSTALL_DEFAULT)dnl
 ])
 
+# AC_ENABLE_FAST_INSTALL - set the default to --disable-fast-install
+AC_DEFUN(AC_DISABLE_FAST_INSTALL,
+[AC_ENABLE_FAST_INSTALL(no)])
+
 
-# AM_PROG_LD - find the path to the GNU or non-GNU linker
-AC_DEFUN(AM_PROG_LD,
+# AC_PROG_LD - find the path to the GNU or non-GNU linker
+AC_DEFUN(AC_PROG_LD,
 [AC_ARG_WITH(gnu-ld,
 [  --with-gnu-ld           assume the C compiler uses GNU ld [default=no]],
 test "$withval" = no || with_gnu_ld=yes, with_gnu_ld=no)
@@ -411,47 +466,15 @@ if test "$ac_cv_prog_gcc" = yes; then
   case "$ac_prog" in
     # Accept absolute paths.
 changequote(,)dnl
-    /* | [A-Za-z]:/*)
-      # Canonicalize the path of ld
+    /* | [A-Za-z]:[\\/]*)
       re_direlt='/[^/][^/]*/\.\./'
-      sub_uncdrive='s%^\([A-Za-z]\):/%//\1/%'
 changequote([,])dnl
-      while echo $ac_prog | grep "$re_direlt" > /dev/null 2>&1; do
-        ac_prog=`echo $ac_prog| sed "s%$re_direlt%/%"`
-      done
-      case "$host_os" in
-      cygwin*)
-        # Convert to a UNC path for cygwin
-        test -z "$LD" && LD=`echo X$ac_prog | $Xsed -e "$sub_uncdrive"`
-	;;
-      *)
-        test -z "$LD" && LD="$ac_prog"
-	;;
-      esac
-      ;;
-    ##
-    ## FIXME:  The code fails later on if we try to use an $LD with
-    ##         '\\' path separators.
-    ##
-changequote(,)dnl
-    [A-Za-z]:[\\]*)
       # Canonicalize the path of ld
-      re_direlt='\\[^\\][^\\]*\\\.\.\(\\\)'
-      sub_uncdrive='s%^\([A-Za-z]\):\\%//\1/%'
-changequote([,])dnl
-      sub_uncdir='s%\\%/%g'
+      ac_prog=`echo $ac_prog| sed 's%\\\\%/%g'`
       while echo $ac_prog | grep "$re_direlt" > /dev/null 2>&1; do
-        ac_prog=`echo $ac_prog| sed "s%$re_direlt%\1%"`
+	ac_prog=`echo $ac_prog| sed "s%$re_direlt%/%"`
       done
-      case "$host_os" in
-      cygwin*)
-        # Convert to a UNC path for cygwin
-        test -z "$LD" && LD=`echo X$ac_prog | sed -e 's%^X%%' -e "$sub_uncdrive" -e "$sub_uncdir"`
-	;;
-      *)
-        test -z "$LD" && LD="$ac_prog"
-	;;
-      esac
+      test -z "$LD" && LD="$ac_prog"
       ;;
   "")
     # If it fails, then pretend we aren't using GCC.
@@ -480,7 +503,7 @@ AC_CACHE_VAL(ac_cv_path_LD,
       if "$ac_cv_path_LD" -v 2>&1 < /dev/null | egrep '(GNU|with BFD)' > /dev/null; then
 	test "$with_gnu_ld" != no && break
       else
-        test "$with_gnu_ld" != yes && break
+	test "$with_gnu_ld" != yes && break
       fi
     fi
   done
@@ -496,10 +519,10 @@ else
 fi
 test -z "$LD" && AC_MSG_ERROR([no acceptable ld found in \$PATH])
 AC_SUBST(LD)
-AM_PROG_LD_GNU
+AC_PROG_LD_GNU
 ])
 
-AC_DEFUN(AM_PROG_LD_GNU,
+AC_DEFUN(AC_PROG_LD_GNU,
 [AC_CACHE_CHECK([if the linker ($LD) is GNU ld], ac_cv_prog_gnu_ld,
 [# I'd rather use --version here, but apparently some GNU ld's only accept -v.
 if $LD -v 2>&1 </dev/null | egrep '(GNU|with BFD)' 1>&5; then
@@ -509,8 +532,8 @@ else
 fi])
 ])
 
-# AM_PROG_NM - find the path to a BSD-compatible name lister
-AC_DEFUN(AM_PROG_NM,
+# AC_PROG_NM - find the path to a BSD-compatible name lister
+AC_DEFUN(AC_PROG_NM,
 [AC_MSG_CHECKING([for BSD-compatible nm])
 AC_CACHE_VAL(ac_cv_path_NM,
 [if test -n "$NM"; then
@@ -525,13 +548,13 @@ else
       # Adding the `sed 1q' prevents false positives on HP-UX, which says:
       #   nm: unknown option "B" ignored
       if ($ac_dir/nm -B /dev/null 2>&1 | sed '1q'; exit 0) | egrep /dev/null >/dev/null; then
-        ac_cv_path_NM="$ac_dir/nm -B"
+	ac_cv_path_NM="$ac_dir/nm -B"
 	break
       elif ($ac_dir/nm -p /dev/null 2>&1 | sed '1q'; exit 0) | egrep /dev/null >/dev/null; then
-        ac_cv_path_NM="$ac_dir/nm -p"
+	ac_cv_path_NM="$ac_dir/nm -p"
 	break
       else
-        ac_cv_path_NM=${ac_cv_path_NM="$ac_dir/nm"} # keep the first match, but
+	ac_cv_path_NM=${ac_cv_path_NM="$ac_dir/nm"} # keep the first match, but
 	continue # so that we can try to find one that supports BSD flags
       fi
     fi
@@ -544,11 +567,11 @@ AC_MSG_RESULT([$NM])
 AC_SUBST(NM)
 ])
 
-# AM_SYS_NM_PARSE - Check for command ro grab the raw symbol name followed
+# AC_SYS_NM_PARSE - Check for command to grab the raw symbol name followed
 # by C symbol name from nm.
-AC_DEFUN(AM_SYS_NM_PARSE,
+AC_DEFUN(AC_SYS_NM_PARSE,
 [AC_REQUIRE([AC_CANONICAL_HOST])dnl
-AC_REQUIRE([AM_PROG_NM])dnl
+AC_REQUIRE([AC_PROG_NM])dnl
 # Check for command to grab the raw symbol name followed by C symbol from nm.
 AC_MSG_CHECKING([command to parse $NM output])
 AC_CACHE_VAL(ac_cv_sys_global_symbol_pipe,
@@ -557,52 +580,50 @@ AC_CACHE_VAL(ac_cv_sys_global_symbol_pipe,
 
 changequote(,)dnl
 # Character class describing NM global symbol codes.
-ac_symcode='[BCDEGRSTU]'
+ac_symcode='[BCDEGRST]'
 
 # Regexp to match symbols that can be accessed directly from C.
 ac_sympat='\([_A-Za-z][_A-Za-z0-9]*\)'
 
 # Transform the above into a raw symbol and a C symbol.
-ac_symxfrm='\1 \1'
+ac_symxfrm='\1 \2\3 \3'
+
+# Transform an extracted symbol line into a proper C declaration
+ac_global_symbol_to_cdecl="sed -n -e 's/^. .* \(.*\)$/extern char \1;/p'"
 
 # Define system-specific variables.
 case "$host_os" in
 aix*)
-  ac_symcode='[BCDTU]'
+  ac_symcode='[BCDT]'
+  ;;
+cygwin* | mingw*)
+  ac_symcode='[ABCDGISTW]'
+  ;;
+hpux*)
+  ac_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern char \1();/p' -e 's/^. .* \(.*\)$/extern char \1;/p'"
   ;;
 irix*)
-  # Cannot use undefined symbols on IRIX because inlined functions mess us up.
   ac_symcode='[BCDEGRST]'
   ;;
 solaris*)
-  ac_symcode='[BDTU]'
+  ac_symcode='[BDT]'
   ;;
 esac
 
 # If we're using GNU nm, then use its standard symbol codes.
 if $NM -V 2>&1 | egrep '(GNU|with BFD)' > /dev/null; then
-  ac_symcode='[ABCDGISTUW]'
-fi
-
-case "$host_os" in
-cygwin32* | mingw32*)
-  # We do not want undefined symbols on cygwin32.  The user must
-  # arrange to define them via -l arguments.
   ac_symcode='[ABCDGISTW]'
-  ;;
-esac
+fi
 changequote([,])dnl
 
 # Try without a prefix undercore, then with it.
 for ac_symprfx in "" "_"; do
 
-  # Write the raw and C identifiers.
-  # Unlike in ltconfig.in, we need $ac_symprfx before $ac_symxfrm here,
-  # otherwise AM_SYS_SYMBOL_UNDERSCORE will always be false
-  ac_cv_sys_global_symbol_pipe="sed -n -e 's/^.* $ac_symcode $ac_symprfx$ac_sympat$/$ac_symprfx$ac_symxfrm/p'"
+  ac_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[ 	]\($ac_symcode\)[ 	][ 	]*\($ac_symprfx\)$ac_sympat$/$ac_symxfrm/p'"
 
   # Check to see that the pipe works correctly.
   ac_pipe_works=no
+  rm -f conftest.$ac_ext
   cat > conftest.$ac_ext <<EOF
 #ifdef __cplusplus
 extern "C" {
@@ -614,6 +635,7 @@ void nm_test_func(){}
 #endif
 int main(){nm_test_var='a';nm_test_func;return 0;}
 EOF
+
   if AC_TRY_EVAL(ac_compile); then
     # Now try to grab the symbols.
     ac_nlist=conftest.nm
@@ -622,51 +644,43 @@ EOF
 
       # Try sorting and uniquifying the output.
       if sort "$ac_nlist" | uniq > "$ac_nlist"T; then
-        mv -f "$ac_nlist"T "$ac_nlist"
-        ac_wcout=`wc "$ac_nlist" 2>/dev/null`
-changequote(,)dnl
-        ac_count=`echo "X$ac_wcout" | sed -e 's,^X,,' -e 's/^[ 	]*\([0-9][0-9]*\).*$/\1/'`
-changequote([,])dnl
-        (test "$ac_count" -ge 0) 2>/dev/null || ac_count=-1
+	mv -f "$ac_nlist"T "$ac_nlist"
       else
-        rm -f "$ac_nlist"T
-        ac_count=-1
+	rm -f "$ac_nlist"T
       fi
 
       # Make sure that we snagged all the symbols we need.
       if egrep ' nm_test_var$' "$ac_nlist" >/dev/null; then
-        if egrep ' nm_test_func$' "$ac_nlist" >/dev/null; then
+	if egrep ' nm_test_func$' "$ac_nlist" >/dev/null; then
 	  cat <<EOF > conftest.c
 #ifdef __cplusplus
 extern "C" {
 #endif
 
 EOF
-          # Now generate the symbol file.
-          sed 's/^.* \(.*\)$/extern char \1;/' < "$ac_nlist" >> conftest.c
+	  # Now generate the symbol file.
+	  eval "$ac_global_symbol_to_cdecl"' < "$ac_nlist" >> conftest.c'
 
 	  cat <<EOF >> conftest.c
 #if defined (__STDC__) && __STDC__
 # define lt_ptr_t void *
 #else
 # define lt_ptr_t char *
+# define const
 #endif
 
-/* The number of symbols in dld_preloaded_symbols, -1 if unsorted. */
-int dld_preloaded_symbol_count = $ac_count;
-
 /* The mapping between symbol names and symbols. */
-struct {
-  char *name;
+const struct {
+  const char *name;
   lt_ptr_t address;
 }
 changequote(,)dnl
-dld_preloaded_symbols[] =
+lt_preloaded_symbols[] =
 changequote([,])dnl
 {
 EOF
-        sed 's/^\(.*\) \(.*\)$/  {"\1", (lt_ptr_t) \&\2},/' < "$ac_nlist" >> conftest.c
-        cat <<\EOF >> conftest.c
+	sed 's/^. \(.*\) \(.*\)$/  {"\2", (lt_ptr_t) \&\2},/' < "$ac_nlist" >> conftest.c
+	cat <<\EOF >> conftest.c
   {0, (lt_ptr_t) 0}
 };
 
@@ -674,25 +688,25 @@ EOF
 }
 #endif
 EOF
-          # Now try linking the two files.
-          mv conftest.$ac_objext conftestm.$ac_objext
+	  # Now try linking the two files.
+	  mv conftest.$ac_objext conftestm.$ac_objext
 	  ac_save_LIBS="$LIBS"
 	  ac_save_CFLAGS="$CFLAGS"
-          LIBS="conftestm.$ac_objext"
+	  LIBS="conftestm.$ac_objext"
 	  CFLAGS="$CFLAGS$no_builtin_flag"
-          if AC_TRY_EVAL(ac_link) && test -s conftest; then
-            ac_pipe_works=yes
-          else
-            echo "configure: failed program was:" >&AC_FD_CC
-            cat conftest.c >&AC_FD_CC
-          fi
-          LIBS="$ac_save_LIBS"
+	  if AC_TRY_EVAL(ac_link) && test -s conftest; then
+	    ac_pipe_works=yes
+	  else
+	    echo "configure: failed program was:" >&AC_FD_CC
+	    cat conftest.c >&AC_FD_CC
+	  fi
+	  LIBS="$ac_save_LIBS"
 	  CFLAGS="$ac_save_CFLAGS"
-        else
-          echo "cannot find nm_test_func in $ac_nlist" >&AC_FD_CC
-        fi
+	else
+	  echo "cannot find nm_test_func in $ac_nlist" >&AC_FD_CC
+	fi
       else
-        echo "cannot find nm_test_var in $ac_nlist" >&AC_FD_CC
+	echo "cannot find nm_test_var in $ac_nlist" >&AC_FD_CC
       fi
     else
       echo "cannot run $ac_cv_sys_global_symbol_pipe" >&AC_FD_CC
@@ -724,17 +738,17 @@ fi
 AC_MSG_RESULT($ac_result)
 ])
 
-# AM_SYS_LIBTOOL_CYGWIN32 - find tools needed on cygwin32
-AC_DEFUN(AM_SYS_LIBTOOL_CYGWIN32,
+# AC_SYS_LIBTOOL_CYGWIN - find tools needed on cygwin
+AC_DEFUN(AC_SYS_LIBTOOL_CYGWIN,
 [AC_CHECK_TOOL(DLLTOOL, dlltool, false)
 AC_CHECK_TOOL(AS, as, false)
 ])
 
-# AM_SYS_SYMBOL_UNDERSCORE - does the compiler prefix global symbols
+# AC_SYS_SYMBOL_UNDERSCORE - does the compiler prefix global symbols
 #                            with an underscore?
-AC_DEFUN(AM_SYS_SYMBOL_UNDERSCORE,
-[AC_REQUIRE([AM_PROG_NM])dnl
-AC_REQUIRE([AM_SYS_NM_PARSE])dnl
+AC_DEFUN(AC_SYS_SYMBOL_UNDERSCORE,
+[AC_REQUIRE([AC_PROG_NM])dnl
+AC_REQUIRE([AC_SYS_NM_PARSE])dnl
 AC_MSG_CHECKING([for _ prefix in compiled symbols])
 AC_CACHE_VAL(ac_cv_sys_symbol_underscore,
 [ac_cv_sys_symbol_underscore=no
@@ -747,13 +761,13 @@ if AC_TRY_EVAL(ac_compile); then
   ac_nlist=conftest.nm
   if AC_TRY_EVAL(NM conftest.$ac_objext \| $ac_cv_sys_global_symbol_pipe \> $ac_nlist) && test -s "$ac_nlist"; then
     # See whether the symbols have a leading underscore.
-    if egrep '^_nm_test_func' "$ac_nlist" >/dev/null; then
+    if egrep '^. _nm_test_func' "$ac_nlist" >/dev/null; then
       ac_cv_sys_symbol_underscore=yes
     else
-      if egrep '^nm_test_func ' "$ac_nlist" >/dev/null; then
-        :
+      if egrep '^. nm_test_func ' "$ac_nlist" >/dev/null; then
+	:
       else
-        echo "configure: cannot find nm_test_func in $ac_nlist" >&AC_FD_CC
+	echo "configure: cannot find nm_test_func in $ac_nlist" >&AC_FD_CC
       fi
     fi
   else
@@ -770,3 +784,60 @@ USE_SYMBOL_UNDERSCORE=${ac_cv_sys_symbol_underscore=no}
 AC_SUBST(USE_SYMBOL_UNDERSCORE)dnl
 ])
 
+# AC_CHECK_LIBM - check for math library
+AC_DEFUN(AC_CHECK_LIBM, [
+AC_CHECK_LIB(mw, _mwvalidcheckl)
+AC_CHECK_LIB(m, cos)
+])
+
+# AC_LIBLTDL_CONVENIENCE[(dir)] - sets LIBLTDL to the link flags for
+# the libltdl convenience library, adds --enable-ltdl-convenience to
+# the configure arguments.  Note that LIBLTDL is not AC_SUBSTed, nor
+# is AC_CONFIG_SUBDIRS called.  If DIR is not provided, it is assumed
+# to be `${top_builddir}/libltdl'.  Make sure you start DIR with
+# '${top_builddir}/' (note the single quotes!) if your package is not
+# flat, and, if you're not using automake, define top_builddir as
+# appropriate in the Makefiles.
+AC_DEFUN(AC_LIBLTDL_CONVENIENCE, [
+  case "$enable_ltdl_convenience" in
+  no) AC_MSG_ERROR([this package needs a convenience libltdl]) ;;
+  "") enable_ltdl_convenience=yes
+      ac_configure_args="$ac_configure_args --enable-ltdl-convenience" ;;
+  esac
+  LIBLTDL=ifelse($#,1,$1,['${top_builddir}/libltdl'])/libltdlc.la
+])
+
+# AC_LIBLTDL_INSTALLABLE[(dir)] - sets LIBLTDL to the link flags for
+# the libltdl installable library, and adds --enable-ltdl-install to
+# the configure arguments.  Note that LIBLTDL is not AC_SUBSTed, nor
+# is AC_CONFIG_SUBDIRS called.  If DIR is not provided, it is assumed
+# to be `${top_builddir}/libltdl'.  Make sure you start DIR with
+# '${top_builddir}/' (note the single quotes!) if your package is not
+# flat, and, if you're not using automake, define top_builddir as
+# appropriate in the Makefiles.
+# In the future, this macro may have to be called after AC_PROG_LIBTOOL.
+AC_DEFUN(AC_LIBLTDL_INSTALLABLE, [
+  AC_CHECK_LIB(ltdl, main, LIBLTDL="-lltdl", [
+    case "$enable_ltdl_install" in
+    no) AC_MSG_WARN([libltdl not installed, but installation disabled]) ;;
+    "") enable_ltdl_install=yes
+        ac_configure_args="$ac_configure_args --enable-ltdl-install" ;;
+    esac
+  ])
+  if test x"$enable_ltdl_install" != x"no"; then
+    LIBLTDL=ifelse($#,1,$1,['${top_builddir}/libltdl'])/libltdl.la
+  fi
+])
+
+dnl old names
+AC_DEFUN(AM_PROG_LIBTOOL, [indir([AC_PROG_LIBTOOL])])dnl
+AC_DEFUN(AM_ENABLE_SHARED, [indir([AC_ENABLE_SHARED], $@)])dnl
+AC_DEFUN(AM_ENABLE_STATIC, [indir([AC_ENABLE_STATIC], $@)])dnl
+AC_DEFUN(AM_DISABLE_SHARED, [indir([AC_DISABLE_SHARED], $@)])dnl
+AC_DEFUN(AM_DISABLE_STATIC, [indir([AC_DISABLE_STATIC], $@)])dnl
+AC_DEFUN(AM_PROG_LD, [indir([AC_PROG_LD])])dnl
+AC_DEFUN(AM_PROG_NM, [indir([AC_PROG_NM])])dnl
+AC_DEFUN(AM_SYS_NM_PARSE, [indir([AC_SYS_NM_PARSE])])dnl
+AC_DEFUN(AM_SYS_SYMBOL_UNDERSCORE, [indir([AC_SYS_SYMBOL_UNDERSCORE])])dnl
+AC_DEFUN(AM_SYS_LIBTOOL_CYGWIN, [indir([AC_SYS_LIBTOOL_CYGWIN])])dnl
+
-- 
Gitee


From 324be2fa906c2fb89562f4103c00dfcd4c667b39 Mon Sep 17 00:00:00 2001
From: Jeff Johnson <n3npq@mac.com>
Date: Mon, 22 Mar 1999 17:32:11 +0000
Subject: [PATCH 167/667] fix: don't add header if signature generation failed
 (Carlo Wood).

---
 po/popt.pot | 2 +-
 popt.c      | 2 +-
 test1.c     | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/po/popt.pot b/po/popt.pot
index 9df8ebe..8a3d5b9 100644
--- a/po/popt.pot
+++ b/po/popt.pot
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 1999-03-08 21:55-0500\n"
+"POT-Creation-Date: 1999-03-22 12:03-0500\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/popt.c b/popt.c
index b4564ae..98c439b 100644
--- a/popt.c
+++ b/popt.c
@@ -407,7 +407,7 @@ int poptGetNextOpt(poptContext con) {
 		  case POPT_ARG_INT:
 		  case POPT_ARG_LONG:
 		    aLong = strtol(con->os->nextArg, &end, 0);
-		    if (*end) 
+		    if (!(end && *end == '\0')) 
 			return POPT_ERROR_BADNUMBER;
 
 		    if (aLong == LONG_MIN || aLong == LONG_MAX)
diff --git a/test1.c b/test1.c
index 90ac9c6..0039415 100644
--- a/test1.c
+++ b/test1.c
@@ -7,7 +7,7 @@
 
 #include "popt.h"
 
-void option_callback(poptContext con, enum poptCallbackReason reason,
+static void option_callback(poptContext con, enum poptCallbackReason reason,
 		     const struct poptOption * opt, 
 		     char * arg, void * data) {
     fprintf(stdout, "callback: %c %s %s ", opt->val, (char *) data, arg);    
-- 
Gitee


From af4244fe6b209b37c5b32415f4282ae599a05a61 Mon Sep 17 00:00:00 2001
From: Jeff Johnson <n3npq@mac.com>
Date: Fri, 26 Mar 1999 20:07:43 +0000
Subject: [PATCH 168/667] autoReq/autoProv now per-package.

---
 aclocal.m4 | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/aclocal.m4 b/aclocal.m4
index 2650a11..6b45541 100644
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -285,7 +285,12 @@ AC_REQUIRE([AC_PROG_LN_S])dnl
 dnl
 
 # Check for any special flags to pass to ltconfig.
-libtool_flags="--cache-file=$cache_file"
+#
+# the following will cause an existing older ltconfig to fail, so
+# we ignore this at the expense of the cache file... Checking this 
+# will just take longer ... bummer!
+#libtool_flags="--cache-file=$cache_file"
+#
 test "$enable_shared" = no && libtool_flags="$libtool_flags --disable-shared"
 test "$enable_static" = no && libtool_flags="$libtool_flags --disable-static"
 test "$enable_fast_install" = no && libtool_flags="$libtool_flags --disable-fast-install"
-- 
Gitee


From 342227c9d158715d8eeac310f0ad7e577a5fb9cd Mon Sep 17 00:00:00 2001
From: Jeff Johnson <n3npq@mac.com>
Date: Wed, 31 Mar 1999 14:58:43 +0000
Subject: [PATCH 169/667] Include alloca.h if available (Tim Mooney).

---
 popthelp.c  | 4 ++++
 poptparse.c | 4 ++++
 2 files changed, 8 insertions(+)

diff --git a/popthelp.c b/popthelp.c
index 1ec8c8b..fb945d4 100644
--- a/popthelp.c
+++ b/popthelp.c
@@ -13,6 +13,10 @@
 #include <stdlib.h>
 #include <string.h>
 
+#ifdef HAVE_ALLOCA_H
+#include <alloca.h>
+#endif
+
 #include "popt.h"
 #include "poptint.h"
 
diff --git a/poptparse.c b/poptparse.c
index a465a03..181ec1a 100644
--- a/poptparse.c
+++ b/poptparse.c
@@ -10,6 +10,10 @@
 #include <stdlib.h>
 #include <string.h>
 
+#ifdef HAVE_ALLOCA_H
+#include <alloca.h>
+#endif
+
 #include "popt.h"
 
 static const int poptArgvArrayGrowDelta = 5;
-- 
Gitee


From 30369c3e7e6a7104ac7fb817bf0463b9b03d5053 Mon Sep 17 00:00:00 2001
From: Jeff Johnson <n3npq@mac.com>
Date: Wed, 31 Mar 1999 15:08:40 +0000
Subject: [PATCH 170/667] I was told by Timur Bakeyev <mc@bat.ru> that on BSD
 systems setuid should be prefered over setreuid.

On Unixware 2.1 linking the Midnight Commander against libucb
broke the binary horrible (readdir returned garbage). I haven't
looked deeper into this because I don't have such a system.
Instead I applied a similar patch like the one attached
to this message (I made this patch against popt from CVS).

from Norbert Warmuth <nwarmuth@privat.circular.de>
---
 popt.c | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/popt.c b/popt.c
index 98c439b..a730049 100644
--- a/popt.c
+++ b/popt.c
@@ -229,7 +229,17 @@ static void execCommand(poptContext con) {
 #ifdef __hpux
     setresuid(getuid(), getuid(),-1);
 #else
+/*
+ * XXX " ... on BSD systems setuid() should be preferred over setreuid()"
+ * XXX 	sez' Timur Bakeyev <mc@bat.ru>
+ * XXX	from Norbert Warmuth <nwarmuth@privat.circular.de>
+ */
+#if defined(HAVE_SETUID)
+    setuid(getuid());
+#elif defined (HAVE_SETREUID)
     setreuid(getuid(), getuid()); /*hlauer: not portable to hpux9.01 */
+#else
+    ; /* Can't drop privileges */
 #endif
 
     execvp(argv[0], argv);
-- 
Gitee


From 6cd3edb40d6e044eec6e9feff6a0d9e646e430b6 Mon Sep 17 00:00:00 2001
From: Jeff Johnson <n3npq@mac.com>
Date: Wed, 31 Mar 1999 16:23:34 +0000
Subject: [PATCH 171/667] Typo.

---
 po/popt.pot | 6 +++---
 popt.c      | 1 +
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/po/popt.pot b/po/popt.pot
index 8a3d5b9..38a69c8 100644
--- a/po/popt.pot
+++ b/po/popt.pot
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 1999-03-22 12:03-0500\n"
+"POT-Creation-Date: 1999-03-31 16:20-0500\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -14,10 +14,10 @@ msgstr ""
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: ENCODING\n"
 
-#: ../popthelp.c:31
+#: ../popthelp.c:35
 msgid "Show this help message"
 msgstr ""
 
-#: ../popthelp.c:32
+#: ../popthelp.c:36
 msgid "Display brief usage message"
 msgstr ""
diff --git a/popt.c b/popt.c
index a730049..4549955 100644
--- a/popt.c
+++ b/popt.c
@@ -240,6 +240,7 @@ static void execCommand(poptContext con) {
     setreuid(getuid(), getuid()); /*hlauer: not portable to hpux9.01 */
 #else
     ; /* Can't drop privileges */
+#endif
 #endif
 
     execvp(argv[0], argv);
-- 
Gitee


From 14234cf437519d1208f9bdae6384d2364bfc2fcb Mon Sep 17 00:00:00 2001
From: Jeff Johnson <n3npq@mac.com>
Date: Sun, 4 Apr 1999 16:56:53 +0000
Subject: [PATCH 172/667] Don't clobber fd (#1966).

---
 poptconfig.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/poptconfig.c b/poptconfig.c
index 8f2656d..fce6d74 100644
--- a/poptconfig.c
+++ b/poptconfig.c
@@ -87,7 +87,7 @@ int poptReadConfigFile(poptContext con, char * fn) {
     lseek(fd, 0, 0);
 
     file = alloca(fileLength + 1);
-    if ((fd = read(fd, file, fileLength)) != fileLength) {
+    if (read(fd, file, fileLength) != fileLength) {
 	rc = errno;
 	close(fd);
 	errno = rc;
-- 
Gitee


From 03cc5143b773b9ecca2801974ab3494f3f866e74 Mon Sep 17 00:00:00 2001
From: Jeff Johnson <n3npq@mac.com>
Date: Mon, 5 Apr 1999 16:06:02 +0000
Subject: [PATCH 173/667] Update-po.

---
 po/popt.pot |  2 +-
 po/ro.po    | 74 +++++++++++++++++++++--------------------------------
 2 files changed, 30 insertions(+), 46 deletions(-)

diff --git a/po/popt.pot b/po/popt.pot
index 38a69c8..7dc7a0b 100644
--- a/po/popt.pot
+++ b/po/popt.pot
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 1999-03-31 16:20-0500\n"
+"POT-Creation-Date: 1999-04-05 11:38-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/po/ro.po b/po/ro.po
index 90c4e02..b6e8c6d 100644
--- a/po/ro.po
+++ b/po/ro.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: POPT\n"
-"POT-Creation-Date: 1998-10-22 14:44-0400\n"
+"POT-Creation-Date: 1999-04-05 11:38-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Cristian Gafton <gafton@redhat.com>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -14,59 +14,43 @@ msgstr ""
 "Content-Type: text/plain; charset=ISO-8859-2\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../popt.c:34
-msgid "unknown errno"
-msgstr "eroare necunoscuta"
-
-#: ../popt.c:407
-#, c-format
-msgid "option type (%d) not implemented in popt\n"
-msgstr "optiunea de tipul (%d) nu este implementata in popt\n"
+#: ../popthelp.c:35
+msgid "Show this help message"
+msgstr "Afisare mesaj de help"
 
-#: ../popt.c:531
-msgid "missing argument"
-msgstr "argument lipsa"
+#: ../popthelp.c:36
+msgid "Display brief usage message"
+msgstr "Afisare mesaj sintaxa sumar"
 
-#: ../popt.c:533
-msgid "unknown option"
-msgstr "optiune necunoscuta"
+#~ msgid "unknown errno"
+#~ msgstr "eroare necunoscuta"
 
-#: ../popt.c:535
-msgid "aliases nested too deeply"
-msgstr "recursivitate infinita la optiunile sinonime"
+#~ msgid "option type (%d) not implemented in popt\n"
+#~ msgstr "optiunea de tipul (%d) nu este implementata in popt\n"
 
-#: ../popt.c:537
-msgid "error in paramter quoting"
-msgstr "eroare la insertie parametru"
+#~ msgid "missing argument"
+#~ msgstr "argument lipsa"
 
-#: ../popt.c:539
-msgid "invalid numeric value"
-msgstr "valoare numarica invalida"
+#~ msgid "unknown option"
+#~ msgstr "optiune necunoscuta"
 
-#: ../popt.c:541
-msgid "number too large or too small"
-msgstr "numar prea mare sau prea mic"
+#~ msgid "aliases nested too deeply"
+#~ msgstr "recursivitate infinita la optiunile sinonime"
 
-#: ../popt.c:545
-msgid "unknown error"
-msgstr "eroare necuinoscuta"
+#~ msgid "error in paramter quoting"
+#~ msgstr "eroare la insertie parametru"
 
-#: ../popthelp.c:29
-msgid "Show this help message"
-msgstr "Afisare mesaj de help"
+#~ msgid "invalid numeric value"
+#~ msgstr "valoare numarica invalida"
 
-#: ../popthelp.c:30
-msgid "Display brief usage message"
-msgstr "Afisare mesaj sintaxa sumar"
+#~ msgid "number too large or too small"
+#~ msgstr "numar prea mare sau prea mic"
 
-#: ../popthelp.c:41
-msgid "ARG"
-msgstr ""
+#~ msgid "unknown error"
+#~ msgstr "eroare necuinoscuta"
 
-#: ../popthelp.c:148
-msgid "Usage:"
-msgstr "Sintaxa:"
+#~ msgid "Usage:"
+#~ msgstr "Sintaxa:"
 
-#: ../popthelp.c:166
-msgid "[OPTION...]"
-msgstr "[OPTIUNE...]"
+#~ msgid "[OPTION...]"
+#~ msgstr "[OPTIUNE...]"
-- 
Gitee


From 9ad20042eedc83c9020189d4c8531b2739b6e040 Mon Sep 17 00:00:00 2001
From: Erik Troan <ewt@redhat.com>
Date: Wed, 7 Apr 1999 06:20:13 +0000
Subject: [PATCH 174/667] we weren't quite careful enough about testing for a
 single -

---
 popt.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/popt.c b/popt.c
index 4549955..bfcc005 100644
--- a/popt.c
+++ b/popt.c
@@ -257,7 +257,7 @@ static const struct poptOption * findOption(const struct poptOption * table,
     const struct poptOption * cb = NULL;
 
     /* This happens when a single - is given */
-    if (singleDash && !shortName)
+    if (singleDash && !shortName && !*longName)
 	shortName = '-';
 
     while (opt->longName || opt->shortName || opt->arg) {
-- 
Gitee


From f5272e4bebe2814a2388abc66cf99720a2c3ca82 Mon Sep 17 00:00:00 2001
From: Erik Troan <ewt@redhat.com>
Date: Wed, 7 Apr 1999 06:22:30 +0000
Subject: [PATCH 175/667] added tests for single - argument

---
 testit.sh | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/testit.sh b/testit.sh
index bdb78ab..f81edb2 100755
--- a/testit.sh
+++ b/testit.sh
@@ -42,6 +42,8 @@ run test1 "test1 - 23" "./test1 ; --echo-args -a" --echo-args -e -a
 run test1 "test1 - 24" "arg1: 0 arg2: (none) short: 1" -shortoption
 run test1 "test1 - 25" "arg1: 0 arg2: (none) short: 1" --shortoption
 run test1 "test1 - 26" "callback: c arg for cb2 foo arg1: 0 arg2: (none)" --cb2 foo
+run test1 "test1 - 27" "arg1: 0 arg2: (none) -" -
+run test1 "test1 - 28" "arg1: 0 arg2: foo -" - -2 foo
 
 echo ""
 echo "Passed."
-- 
Gitee


From 61d9698665cb66411d60dccabd4128c8a221b980 Mon Sep 17 00:00:00 2001
From: Erik Troan <ewt@redhat.com>
Date: Wed, 7 Apr 1999 06:23:07 +0000
Subject: [PATCH 176/667] *** empty log message ***

---
 CHANGES | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/CHANGES b/CHANGES
index 6dd2378..50c150f 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,8 @@
+1.2.3 -> 1.3
+	- added support for single -
+	- misc bug fixes
+	- portability improvements
+
 1.2.2 -> 1.2.3
 	- fixed memset() in help message generation (Dale Hawkins)
 	- added extern "C" stuff to popt.h for C++ compilers (Dale Hawkins)
-- 
Gitee


From ab30bae4c01b007dcaef8201c61c116cb5aaac66 Mon Sep 17 00:00:00 2001
From: Erik Troan <ewt@redhat.com>
Date: Wed, 7 Apr 1999 06:25:08 +0000
Subject: [PATCH 177/667] version 1.3

---
 configure.in | 2 +-
 popt.spec    | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/configure.in b/configure.in
index 370d4ca..9f975df 100755
--- a/configure.in
+++ b/configure.in
@@ -1,5 +1,5 @@
 AC_INIT(popt.h)
-AM_INIT_AUTOMAKE(popt, 1.2.3)
+AM_INIT_AUTOMAKE(popt, 1.3)
 AM_CONFIG_HEADER(config.h)
 
 AC_PROG_CC
diff --git a/popt.spec b/popt.spec
index 735fb51..54db661 100644
--- a/popt.spec
+++ b/popt.spec
@@ -1,6 +1,6 @@
 Summary: A C library for parsing command line parameters.
 Name: popt
-Version: 1.2.4
+Version: 1.3
 Release: 1
 Copyright: LGPL
 Group: System Environment/Libraries
-- 
Gitee


From 9bab9d65c9fb3ef9158cf2b034c055236a22e05c Mon Sep 17 00:00:00 2001
From: Elliot Lee <sopwith@redhat.com>
Date: Wed, 7 Apr 1999 18:57:23 +0000
Subject: [PATCH 178/667] Merge (most) changes from the GNOME version of popt.
 The remaining changes are GNOME-specific.

---
 .cvsignore        |   1 +
 Makefile.am       |   2 +-
 aclocal.m4        | 848 ----------------------------------------------
 configure.in      |   2 +-
 po/.cvsignore     |   1 +
 po/Makefile.in.in |   4 +-
 popthelp.c        |   9 +-
 poptparse.c       |  23 +-
 8 files changed, 31 insertions(+), 859 deletions(-)
 delete mode 100644 aclocal.m4

diff --git a/.cvsignore b/.cvsignore
index 42db10f..6fe1398 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1,5 +1,6 @@
 .deps
 .depend
+aclocal.m4
 Makefile
 Makefile.in
 mappcinames
diff --git a/Makefile.am b/Makefile.am
index a929c90..6918114 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -3,7 +3,7 @@
 AUTOMAKE_OPTIONS = 1.4 foreign
 
 EXTRA_DIST = CHANGES autogen.sh findme.h $(man_MANS) popt.spec poptint.h \
-	testit.sh po/*.in po/*.po po/popt.pot popt.ps
+	testit.sh po/Makefile.in.in po/POTFILES.in po/ro.po po/popt.pot popt.ps
 
 SUBDIRS = po
 
diff --git a/aclocal.m4 b/aclocal.m4
deleted file mode 100644
index 6b45541..0000000
--- a/aclocal.m4
+++ /dev/null
@@ -1,848 +0,0 @@
-dnl aclocal.m4 generated automatically by aclocal 1.4a
-
-dnl Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc.
-dnl This file is free software; the Free Software Foundation
-dnl gives unlimited permission to copy and/or distribute it,
-dnl with or without modifications, as long as this notice is preserved.
-
-dnl This program is distributed in the hope that it will be useful,
-dnl but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-dnl even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-dnl PARTICULAR PURPOSE.
-
-# Do all the work for Automake.  This macro actually does too much --
-# some checks are only needed if your package does certain things.
-# But this isn't really a big deal.
-
-# serial 1
-
-dnl Usage:
-dnl AM_INIT_AUTOMAKE(package,version, [no-define])
-
-AC_DEFUN(AM_INIT_AUTOMAKE,
-[AC_REQUIRE([AC_PROG_INSTALL])
-dnl We require 2.13 because we rely on SHELL being computed by configure.
-AC_PREREQ([2.13])
-PACKAGE=[$1]
-AC_SUBST(PACKAGE)
-VERSION=[$2]
-AC_SUBST(VERSION)
-dnl test to see if srcdir already configured
-if test "`cd $srcdir && pwd`" != "`pwd`" && test -f $srcdir/config.status; then
-  AC_MSG_ERROR([source directory already configured; run "make distclean" there first])
-fi
-ifelse([$3],,
-AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE", [Name of package])
-AC_DEFINE_UNQUOTED(VERSION, "$VERSION", [Version number of package]))
-AC_REQUIRE([AM_SANITY_CHECK])
-AC_REQUIRE([AC_ARG_PROGRAM])
-dnl FIXME This is truly gross.
-missing_dir=`cd $ac_aux_dir && pwd`
-AM_MISSING_PROG(ACLOCAL, aclocal, $missing_dir)
-AM_MISSING_PROG(AUTOCONF, autoconf, $missing_dir)
-AM_MISSING_PROG(AUTOMAKE, automake, $missing_dir)
-AM_MISSING_PROG(AUTOHEADER, autoheader, $missing_dir)
-AM_MISSING_PROG(MAKEINFO, makeinfo, $missing_dir)
-AC_REQUIRE([AC_PROG_MAKE_SET])])
-
-#
-# Check to make sure that the build environment is sane.
-#
-
-AC_DEFUN(AM_SANITY_CHECK,
-[AC_MSG_CHECKING([whether build environment is sane])
-# Just in case
-sleep 1
-echo timestamp > conftestfile
-# Do `set' in a subshell so we don't clobber the current shell's
-# arguments.  Must try -L first in case configure is actually a
-# symlink; some systems play weird games with the mod time of symlinks
-# (eg FreeBSD returns the mod time of the symlink's containing
-# directory).
-if (
-   set X `ls -Lt $srcdir/configure conftestfile 2> /dev/null`
-   if test "[$]*" = "X"; then
-      # -L didn't work.
-      set X `ls -t $srcdir/configure conftestfile`
-   fi
-   if test "[$]*" != "X $srcdir/configure conftestfile" \
-      && test "[$]*" != "X conftestfile $srcdir/configure"; then
-
-      # If neither matched, then we have a broken ls.  This can happen
-      # if, for instance, CONFIG_SHELL is bash and it inherits a
-      # broken ls alias from the environment.  This has actually
-      # happened.  Such a system could not be considered "sane".
-      AC_MSG_ERROR([ls -t appears to fail.  Make sure there is not a broken
-alias in your environment])
-   fi
-
-   test "[$]2" = conftestfile
-   )
-then
-   # Ok.
-   :
-else
-   AC_MSG_ERROR([newly created file is older than distributed files!
-Check your system clock])
-fi
-rm -f conftest*
-AC_MSG_RESULT(yes)])
-
-dnl AM_MISSING_PROG(NAME, PROGRAM, DIRECTORY)
-dnl The program must properly implement --version.
-AC_DEFUN(AM_MISSING_PROG,
-[AC_MSG_CHECKING(for working $2)
-# Run test in a subshell; some versions of sh will print an error if
-# an executable is not found, even if stderr is redirected.
-# Redirect stdin to placate older versions of autoconf.  Sigh.
-if ($2 --version) < /dev/null > /dev/null 2>&1; then
-   $1=$2
-   AC_MSG_RESULT(found)
-else
-   $1="$3/missing $2"
-   AC_MSG_RESULT(missing)
-fi
-AC_SUBST($1)])
-
-# Like AC_CONFIG_HEADER, but automatically create stamp file.
-
-AC_DEFUN(AM_CONFIG_HEADER,
-[AC_PREREQ([2.12])
-AC_CONFIG_HEADER([$1])
-dnl When config.status generates a header, we must update the stamp-h file.
-dnl This file resides in the same directory as the config header
-dnl that is generated.  We must strip everything past the first ":",
-dnl and everything past the last "/".
-AC_OUTPUT_COMMANDS(changequote(<<,>>)dnl
-ifelse(patsubst(<<$1>>, <<[^ ]>>, <<>>), <<>>,
-<<test -z "<<$>>CONFIG_HEADERS" || echo timestamp > patsubst(<<$1>>, <<^\([^:]*/\)?.*>>, <<\1>>)stamp-h<<>>dnl>>,
-<<am_indx=1
-for am_file in <<$1>>; do
-  case " <<$>>CONFIG_HEADERS " in
-  *" <<$>>am_file "*<<)>>
-    echo timestamp > `echo <<$>>am_file | sed -e 's%:.*%%' -e 's%[^/]*$%%'`stamp-h$am_indx
-    ;;
-  esac
-  am_indx=`expr "<<$>>am_indx" + 1`
-done<<>>dnl>>)
-changequote([,]))])
-
-
-# serial 1
-
-AC_DEFUN(AM_C_PROTOTYPES,
-[AC_REQUIRE([AM_PROG_CC_STDC])
-AC_REQUIRE([AC_PROG_CPP])
-AC_MSG_CHECKING([for function prototypes])
-if test "$am_cv_prog_cc_stdc" != no; then
-  AC_MSG_RESULT(yes)
-  AC_DEFINE(PROTOTYPES,1,[Define if compiler has function prototypes])
-  U= ANSI2KNR=
-else
-  AC_MSG_RESULT(no)
-  U=_ ANSI2KNR=./ansi2knr
-  # Ensure some checks needed by ansi2knr itself.
-  AC_HEADER_STDC
-  AC_CHECK_HEADERS(string.h)
-fi
-AC_SUBST(U)dnl
-AC_SUBST(ANSI2KNR)dnl
-])
-
-
-# serial 1
-
-# @defmac AC_PROG_CC_STDC
-# @maindex PROG_CC_STDC
-# @ovindex CC
-# If the C compiler in not in ANSI C mode by default, try to add an option
-# to output variable @code{CC} to make it so.  This macro tries various
-# options that select ANSI C on some system or another.  It considers the
-# compiler to be in ANSI C mode if it handles function prototypes correctly.
-#
-# If you use this macro, you should check after calling it whether the C
-# compiler has been set to accept ANSI C; if not, the shell variable
-# @code{am_cv_prog_cc_stdc} is set to @samp{no}.  If you wrote your source
-# code in ANSI C, you can make an un-ANSIfied copy of it by using the
-# program @code{ansi2knr}, which comes with Ghostscript.
-# @end defmac
-
-AC_DEFUN(AM_PROG_CC_STDC,
-[AC_REQUIRE([AC_PROG_CC])
-AC_BEFORE([$0], [AC_C_INLINE])
-AC_BEFORE([$0], [AC_C_CONST])
-dnl Force this before AC_PROG_CPP.  Some cpp's, eg on HPUX, require
-dnl a magic option to avoid problems with ANSI preprocessor commands
-dnl like #elif.
-dnl FIXME: can't do this because then AC_AIX won't work due to a
-dnl circular dependency.
-dnl AC_BEFORE([$0], [AC_PROG_CPP])
-AC_MSG_CHECKING(for ${CC-cc} option to accept ANSI C)
-AC_CACHE_VAL(am_cv_prog_cc_stdc,
-[am_cv_prog_cc_stdc=no
-ac_save_CC="$CC"
-# Don't try gcc -ansi; that turns off useful extensions and
-# breaks some systems' header files.
-# AIX			-qlanglvl=ansi
-# Ultrix and OSF/1	-std1
-# HP-UX			-Aa -D_HPUX_SOURCE
-# SVR4			-Xc -D__EXTENSIONS__
-for ac_arg in "" -qlanglvl=ansi -std1 "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__"
-do
-  CC="$ac_save_CC $ac_arg"
-  AC_TRY_COMPILE(
-[#include <stdarg.h>
-#include <stdio.h>
-#include <sys/types.h>
-#include <sys/stat.h>
-/* Most of the following tests are stolen from RCS 5.7's src/conf.sh.  */
-struct buf { int x; };
-FILE * (*rcsopen) (struct buf *, struct stat *, int);
-static char *e (p, i)
-     char **p;
-     int i;
-{
-  return p[i];
-}
-static char *f (char * (*g) (char **, int), char **p, ...)
-{
-  char *s;
-  va_list v;
-  va_start (v,p);
-  s = g (p, va_arg (v,int));
-  va_end (v);
-  return s;
-}
-int test (int i, double x);
-struct s1 {int (*f) (int a);};
-struct s2 {int (*f) (double a);};
-int pairnames (int, char **, FILE *(*)(struct buf *, struct stat *, int), int, int);
-int argc;
-char **argv;
-], [
-return f (e, argv, 0) != argv[0]  ||  f (e, argv, 1) != argv[1];
-],
-[am_cv_prog_cc_stdc="$ac_arg"; break])
-done
-CC="$ac_save_CC"
-])
-if test -z "$am_cv_prog_cc_stdc"; then
-  AC_MSG_RESULT([none needed])
-else
-  AC_MSG_RESULT($am_cv_prog_cc_stdc)
-fi
-case "x$am_cv_prog_cc_stdc" in
-  x|xno) ;;
-  *) CC="$CC $am_cv_prog_cc_stdc" ;;
-esac
-])
-
-
-# serial 35 AC_PROG_LIBTOOL
-AC_DEFUN(AC_PROG_LIBTOOL,
-[AC_REQUIRE([AC_LIBTOOL_SETUP])dnl
-
-# Save cache, so that ltconfig can load it
-AC_CACHE_SAVE
-
-# Actually configure libtool.  ac_aux_dir is where install-sh is found.
-CC="$CC" CFLAGS="$CFLAGS" CPPFLAGS="$CPPFLAGS" \
-LD="$LD" NM="$NM" RANLIB="$RANLIB" LN_S="$LN_S" \
-DLLTOOL="$DLLTOOL" AS="$AS" \
-${CONFIG_SHELL-/bin/sh} $ac_aux_dir/ltconfig --no-reexec \
-$libtool_flags --no-verify $ac_aux_dir/ltmain.sh $host \
-|| AC_MSG_ERROR([libtool configure failed])
-
-# Reload cache, that may have been modified by ltconfig
-AC_CACHE_LOAD
-
-# This can be used to rebuild libtool when needed
-LIBTOOL_DEPS="$ac_aux_dir/ltconfig $ac_aux_dir/ltmain.sh"
-
-# Always use our own libtool.
-LIBTOOL='$(SHELL) $(top_builddir)/libtool'
-AC_SUBST(LIBTOOL)dnl
-
-# Redirect the config.log output again, so that the ltconfig log is not
-# clobbered by the next message.
-exec 5>>./config.log
-])
-
-AC_DEFUN(AC_LIBTOOL_SETUP,
-[AC_PREREQ(2.13)dnl
-AC_REQUIRE([AC_ENABLE_SHARED])dnl
-AC_REQUIRE([AC_ENABLE_STATIC])dnl
-AC_REQUIRE([AC_ENABLE_FAST_INSTALL])dnl
-AC_REQUIRE([AC_CANONICAL_HOST])dnl
-AC_REQUIRE([AC_CANONICAL_BUILD])dnl
-AC_REQUIRE([AC_PROG_RANLIB])dnl
-AC_REQUIRE([AC_PROG_CC])dnl
-AC_REQUIRE([AC_PROG_LD])dnl
-AC_REQUIRE([AC_PROG_NM])dnl
-AC_REQUIRE([AC_SYS_NM_PARSE])dnl
-AC_REQUIRE([AC_SYS_SYMBOL_UNDERSCORE])dnl
-AC_REQUIRE([AC_PROG_LN_S])dnl
-dnl
-
-# Check for any special flags to pass to ltconfig.
-#
-# the following will cause an existing older ltconfig to fail, so
-# we ignore this at the expense of the cache file... Checking this 
-# will just take longer ... bummer!
-#libtool_flags="--cache-file=$cache_file"
-#
-test "$enable_shared" = no && libtool_flags="$libtool_flags --disable-shared"
-test "$enable_static" = no && libtool_flags="$libtool_flags --disable-static"
-test "$enable_fast_install" = no && libtool_flags="$libtool_flags --disable-fast-install"
-test "$lt_dlopen" = yes && libtool_flags="$libtool_flags --enable-dlopen"
-test "$silent" = yes && libtool_flags="$libtool_flags --silent"
-test "$ac_cv_prog_gcc" = yes && libtool_flags="$libtool_flags --with-gcc"
-test "$ac_cv_prog_gnu_ld" = yes && libtool_flags="$libtool_flags --with-gnu-ld"
-
-# Some flags need to be propagated to the compiler or linker for good
-# libtool support.
-case "$host" in
-*-*-irix6*)
-  # Find out which ABI we are using.
-  echo '[#]line __oline__ "configure"' > conftest.$ac_ext
-  if AC_TRY_EVAL(ac_compile); then
-    case "`/usr/bin/file conftest.o`" in
-    *32-bit*)
-      LD="${LD-ld} -32"
-      ;;
-    *N32*)
-      LD="${LD-ld} -n32"
-      ;;
-    *64-bit*)
-      LD="${LD-ld} -64"
-      ;;
-    esac
-  fi
-  rm -rf conftest*
-  ;;
-
-*-*-sco3.2v5*)
-  # On SCO OpenServer 5, we need -belf to get full-featured binaries.
-  SAVE_CFLAGS="$CFLAGS"
-  CFLAGS="$CFLAGS -belf"
-  AC_CACHE_CHECK([whether the C compiler needs -belf], lt_cv_cc_needs_belf,
-    [AC_TRY_LINK([],[],[lt_cv_cc_needs_belf=yes],[lt_cv_cc_needs_belf=no])])
-  if test x"$lt_cv_cc_needs_belf" != x"yes"; then
-    # this is probably gcc 2.8.0, egcs 1.0 or newer; no need for -belf
-    CFLAGS="$SAVE_CFLAGS"
-  fi
-  ;;
-
-*-*-cygwin*)
-  AC_SYS_LIBTOOL_CYGWIN
-  ;;
-
-esac
-
-# enable the --disable-libtool-lock switch
-
-AC_ARG_ENABLE(libtool-lock,
-[  --disable-libtool-lock  force libtool not to do file locking],
-need_locks=$enableval,
-need_locks=yes)
-
-if test x"$need_locks" = xno; then
-  libtool_flags="$libtool_flags --disable-lock"
-fi
-])
-
-# AC_LIBTOOL_DLOPEN - check for dlopen support
-AC_DEFUN(AC_LIBTOOL_DLOPEN, [lt_dlopen=yes])
-
-# AC_ENABLE_SHARED - implement the --enable-shared flag
-# Usage: AC_ENABLE_SHARED[(DEFAULT)]
-#   Where DEFAULT is either `yes' or `no'.  If omitted, it defaults to
-#   `yes'.
-AC_DEFUN(AC_ENABLE_SHARED,
-[define([AC_ENABLE_SHARED_DEFAULT], ifelse($1, no, no, yes))dnl
-AC_ARG_ENABLE(shared,
-changequote(<<, >>)dnl
-<<  --enable-shared[=PKGS]  build shared libraries [default=>>AC_ENABLE_SHARED_DEFAULT],
-changequote([, ])dnl
-[p=${PACKAGE-default}
-case "$enableval" in
-yes) enable_shared=yes ;;
-no) enable_shared=no ;;
-*)
-  enable_shared=no
-  # Look at the argument we got.  We use all the common list separators.
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS="${IFS}:,"
-  for pkg in $enableval; do
-    if test "X$pkg" = "X$p"; then
-      enable_shared=yes
-    fi
-  done
-  IFS="$ac_save_ifs"
-  ;;
-esac],
-enable_shared=AC_ENABLE_SHARED_DEFAULT)dnl
-])
-
-# AC_DISABLE_SHARED - set the default shared flag to --disable-shared
-AC_DEFUN(AC_DISABLE_SHARED,
-[AC_ENABLE_SHARED(no)])
-
-# AC_ENABLE_STATIC - implement the --enable-static flag
-# Usage: AC_ENABLE_STATIC[(DEFAULT)]
-#   Where DEFAULT is either `yes' or `no'.  If omitted, it defaults to
-#   `yes'.
-AC_DEFUN(AC_ENABLE_STATIC,
-[define([AC_ENABLE_STATIC_DEFAULT], ifelse($1, no, no, yes))dnl
-AC_ARG_ENABLE(static,
-changequote(<<, >>)dnl
-<<  --enable-static[=PKGS]  build static libraries [default=>>AC_ENABLE_STATIC_DEFAULT],
-changequote([, ])dnl
-[p=${PACKAGE-default}
-case "$enableval" in
-yes) enable_static=yes ;;
-no) enable_static=no ;;
-*)
-  enable_static=no
-  # Look at the argument we got.  We use all the common list separators.
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS="${IFS}:,"
-  for pkg in $enableval; do
-    if test "X$pkg" = "X$p"; then
-      enable_static=yes
-    fi
-  done
-  IFS="$ac_save_ifs"
-  ;;
-esac],
-enable_static=AC_ENABLE_STATIC_DEFAULT)dnl
-])
-
-# AC_DISABLE_STATIC - set the default static flag to --disable-static
-AC_DEFUN(AC_DISABLE_STATIC,
-[AC_ENABLE_STATIC(no)])
-
-
-# AC_ENABLE_FAST_INSTALL - implement the --enable-fast-install flag
-# Usage: AC_ENABLE_FAST_INSTALL[(DEFAULT)]
-#   Where DEFAULT is either `yes' or `no'.  If omitted, it defaults to
-#   `yes'.
-AC_DEFUN(AC_ENABLE_FAST_INSTALL,
-[define([AC_ENABLE_FAST_INSTALL_DEFAULT], ifelse($1, no, no, yes))dnl
-AC_ARG_ENABLE(fast-install,
-changequote(<<, >>)dnl
-<<  --enable-fast-install[=PKGS]  optimize for fast installation [default=>>AC_ENABLE_FAST_INSTALL_DEFAULT],
-changequote([, ])dnl
-[p=${PACKAGE-default}
-case "$enableval" in
-yes) enable_fast_install=yes ;;
-no) enable_fast_install=no ;;
-*)
-  enable_fast_install=no
-  # Look at the argument we got.  We use all the common list separators.
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS="${IFS}:,"
-  for pkg in $enableval; do
-    if test "X$pkg" = "X$p"; then
-      enable_fast_install=yes
-    fi
-  done
-  IFS="$ac_save_ifs"
-  ;;
-esac],
-enable_fast_install=AC_ENABLE_FAST_INSTALL_DEFAULT)dnl
-])
-
-# AC_ENABLE_FAST_INSTALL - set the default to --disable-fast-install
-AC_DEFUN(AC_DISABLE_FAST_INSTALL,
-[AC_ENABLE_FAST_INSTALL(no)])
-
-
-# AC_PROG_LD - find the path to the GNU or non-GNU linker
-AC_DEFUN(AC_PROG_LD,
-[AC_ARG_WITH(gnu-ld,
-[  --with-gnu-ld           assume the C compiler uses GNU ld [default=no]],
-test "$withval" = no || with_gnu_ld=yes, with_gnu_ld=no)
-AC_REQUIRE([AC_PROG_CC])dnl
-AC_REQUIRE([AC_CANONICAL_HOST])dnl
-AC_REQUIRE([AC_CANONICAL_BUILD])dnl
-ac_prog=ld
-if test "$ac_cv_prog_gcc" = yes; then
-  # Check if gcc -print-prog-name=ld gives a path.
-  AC_MSG_CHECKING([for ld used by GCC])
-  ac_prog=`($CC -print-prog-name=ld) 2>&5`
-  case "$ac_prog" in
-    # Accept absolute paths.
-changequote(,)dnl
-    /* | [A-Za-z]:[\\/]*)
-      re_direlt='/[^/][^/]*/\.\./'
-changequote([,])dnl
-      # Canonicalize the path of ld
-      ac_prog=`echo $ac_prog| sed 's%\\\\%/%g'`
-      while echo $ac_prog | grep "$re_direlt" > /dev/null 2>&1; do
-	ac_prog=`echo $ac_prog| sed "s%$re_direlt%/%"`
-      done
-      test -z "$LD" && LD="$ac_prog"
-      ;;
-  "")
-    # If it fails, then pretend we aren't using GCC.
-    ac_prog=ld
-    ;;
-  *)
-    # If it is relative, then search for the first ld in PATH.
-    with_gnu_ld=unknown
-    ;;
-  esac
-elif test "$with_gnu_ld" = yes; then
-  AC_MSG_CHECKING([for GNU ld])
-else
-  AC_MSG_CHECKING([for non-GNU ld])
-fi
-AC_CACHE_VAL(ac_cv_path_LD,
-[if test -z "$LD"; then
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS="${IFS}:"
-  for ac_dir in $PATH; do
-    test -z "$ac_dir" && ac_dir=.
-    if test -f "$ac_dir/$ac_prog"; then
-      ac_cv_path_LD="$ac_dir/$ac_prog"
-      # Check to see if the program is GNU ld.  I'd rather use --version,
-      # but apparently some GNU ld's only accept -v.
-      # Break only if it was the GNU/non-GNU ld that we prefer.
-      if "$ac_cv_path_LD" -v 2>&1 < /dev/null | egrep '(GNU|with BFD)' > /dev/null; then
-	test "$with_gnu_ld" != no && break
-      else
-	test "$with_gnu_ld" != yes && break
-      fi
-    fi
-  done
-  IFS="$ac_save_ifs"
-else
-  ac_cv_path_LD="$LD" # Let the user override the test with a path.
-fi])
-LD="$ac_cv_path_LD"
-if test -n "$LD"; then
-  AC_MSG_RESULT($LD)
-else
-  AC_MSG_RESULT(no)
-fi
-test -z "$LD" && AC_MSG_ERROR([no acceptable ld found in \$PATH])
-AC_SUBST(LD)
-AC_PROG_LD_GNU
-])
-
-AC_DEFUN(AC_PROG_LD_GNU,
-[AC_CACHE_CHECK([if the linker ($LD) is GNU ld], ac_cv_prog_gnu_ld,
-[# I'd rather use --version here, but apparently some GNU ld's only accept -v.
-if $LD -v 2>&1 </dev/null | egrep '(GNU|with BFD)' 1>&5; then
-  ac_cv_prog_gnu_ld=yes
-else
-  ac_cv_prog_gnu_ld=no
-fi])
-])
-
-# AC_PROG_NM - find the path to a BSD-compatible name lister
-AC_DEFUN(AC_PROG_NM,
-[AC_MSG_CHECKING([for BSD-compatible nm])
-AC_CACHE_VAL(ac_cv_path_NM,
-[if test -n "$NM"; then
-  # Let the user override the test.
-  ac_cv_path_NM="$NM"
-else
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS="${IFS}:"
-  for ac_dir in $PATH /usr/ccs/bin /usr/ucb /bin; do
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/nm; then
-      # Check to see if the nm accepts a BSD-compat flag.
-      # Adding the `sed 1q' prevents false positives on HP-UX, which says:
-      #   nm: unknown option "B" ignored
-      if ($ac_dir/nm -B /dev/null 2>&1 | sed '1q'; exit 0) | egrep /dev/null >/dev/null; then
-	ac_cv_path_NM="$ac_dir/nm -B"
-	break
-      elif ($ac_dir/nm -p /dev/null 2>&1 | sed '1q'; exit 0) | egrep /dev/null >/dev/null; then
-	ac_cv_path_NM="$ac_dir/nm -p"
-	break
-      else
-	ac_cv_path_NM=${ac_cv_path_NM="$ac_dir/nm"} # keep the first match, but
-	continue # so that we can try to find one that supports BSD flags
-      fi
-    fi
-  done
-  IFS="$ac_save_ifs"
-  test -z "$ac_cv_path_NM" && ac_cv_path_NM=nm
-fi])
-NM="$ac_cv_path_NM"
-AC_MSG_RESULT([$NM])
-AC_SUBST(NM)
-])
-
-# AC_SYS_NM_PARSE - Check for command to grab the raw symbol name followed
-# by C symbol name from nm.
-AC_DEFUN(AC_SYS_NM_PARSE,
-[AC_REQUIRE([AC_CANONICAL_HOST])dnl
-AC_REQUIRE([AC_PROG_NM])dnl
-# Check for command to grab the raw symbol name followed by C symbol from nm.
-AC_MSG_CHECKING([command to parse $NM output])
-AC_CACHE_VAL(ac_cv_sys_global_symbol_pipe,
-[# These are sane defaults that work on at least a few old systems.
-# {They come from Ultrix.  What could be older than Ultrix?!! ;)}
-
-changequote(,)dnl
-# Character class describing NM global symbol codes.
-ac_symcode='[BCDEGRST]'
-
-# Regexp to match symbols that can be accessed directly from C.
-ac_sympat='\([_A-Za-z][_A-Za-z0-9]*\)'
-
-# Transform the above into a raw symbol and a C symbol.
-ac_symxfrm='\1 \2\3 \3'
-
-# Transform an extracted symbol line into a proper C declaration
-ac_global_symbol_to_cdecl="sed -n -e 's/^. .* \(.*\)$/extern char \1;/p'"
-
-# Define system-specific variables.
-case "$host_os" in
-aix*)
-  ac_symcode='[BCDT]'
-  ;;
-cygwin* | mingw*)
-  ac_symcode='[ABCDGISTW]'
-  ;;
-hpux*)
-  ac_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern char \1();/p' -e 's/^. .* \(.*\)$/extern char \1;/p'"
-  ;;
-irix*)
-  ac_symcode='[BCDEGRST]'
-  ;;
-solaris*)
-  ac_symcode='[BDT]'
-  ;;
-esac
-
-# If we're using GNU nm, then use its standard symbol codes.
-if $NM -V 2>&1 | egrep '(GNU|with BFD)' > /dev/null; then
-  ac_symcode='[ABCDGISTW]'
-fi
-changequote([,])dnl
-
-# Try without a prefix undercore, then with it.
-for ac_symprfx in "" "_"; do
-
-  ac_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[ 	]\($ac_symcode\)[ 	][ 	]*\($ac_symprfx\)$ac_sympat$/$ac_symxfrm/p'"
-
-  # Check to see that the pipe works correctly.
-  ac_pipe_works=no
-  rm -f conftest.$ac_ext
-  cat > conftest.$ac_ext <<EOF
-#ifdef __cplusplus
-extern "C" {
-#endif
-char nm_test_var;
-void nm_test_func(){}
-#ifdef __cplusplus
-}
-#endif
-int main(){nm_test_var='a';nm_test_func;return 0;}
-EOF
-
-  if AC_TRY_EVAL(ac_compile); then
-    # Now try to grab the symbols.
-    ac_nlist=conftest.nm
-  
-    if AC_TRY_EVAL(NM conftest.$ac_objext \| $ac_cv_sys_global_symbol_pipe \> $ac_nlist) && test -s "$ac_nlist"; then
-
-      # Try sorting and uniquifying the output.
-      if sort "$ac_nlist" | uniq > "$ac_nlist"T; then
-	mv -f "$ac_nlist"T "$ac_nlist"
-      else
-	rm -f "$ac_nlist"T
-      fi
-
-      # Make sure that we snagged all the symbols we need.
-      if egrep ' nm_test_var$' "$ac_nlist" >/dev/null; then
-	if egrep ' nm_test_func$' "$ac_nlist" >/dev/null; then
-	  cat <<EOF > conftest.c
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-EOF
-	  # Now generate the symbol file.
-	  eval "$ac_global_symbol_to_cdecl"' < "$ac_nlist" >> conftest.c'
-
-	  cat <<EOF >> conftest.c
-#if defined (__STDC__) && __STDC__
-# define lt_ptr_t void *
-#else
-# define lt_ptr_t char *
-# define const
-#endif
-
-/* The mapping between symbol names and symbols. */
-const struct {
-  const char *name;
-  lt_ptr_t address;
-}
-changequote(,)dnl
-lt_preloaded_symbols[] =
-changequote([,])dnl
-{
-EOF
-	sed 's/^. \(.*\) \(.*\)$/  {"\2", (lt_ptr_t) \&\2},/' < "$ac_nlist" >> conftest.c
-	cat <<\EOF >> conftest.c
-  {0, (lt_ptr_t) 0}
-};
-
-#ifdef __cplusplus
-}
-#endif
-EOF
-	  # Now try linking the two files.
-	  mv conftest.$ac_objext conftestm.$ac_objext
-	  ac_save_LIBS="$LIBS"
-	  ac_save_CFLAGS="$CFLAGS"
-	  LIBS="conftestm.$ac_objext"
-	  CFLAGS="$CFLAGS$no_builtin_flag"
-	  if AC_TRY_EVAL(ac_link) && test -s conftest; then
-	    ac_pipe_works=yes
-	  else
-	    echo "configure: failed program was:" >&AC_FD_CC
-	    cat conftest.c >&AC_FD_CC
-	  fi
-	  LIBS="$ac_save_LIBS"
-	  CFLAGS="$ac_save_CFLAGS"
-	else
-	  echo "cannot find nm_test_func in $ac_nlist" >&AC_FD_CC
-	fi
-      else
-	echo "cannot find nm_test_var in $ac_nlist" >&AC_FD_CC
-      fi
-    else
-      echo "cannot run $ac_cv_sys_global_symbol_pipe" >&AC_FD_CC
-    fi
-  else
-    echo "$progname: failed program was:" >&AC_FD_CC
-    cat conftest.c >&AC_FD_CC
-  fi
-  rm -rf conftest*
-
-  # Do not use the global_symbol_pipe unless it works.
-  if test "$ac_pipe_works" = yes; then
-    if test x"$ac_symprfx" = x"_"; then
-      ac_cv_sys_symbol_underscore=yes
-    else
-      ac_cv_sys_symbol_underscore=no
-    fi
-    break
-  else
-    ac_cv_sys_global_symbol_pipe=
-  fi
-done
-])
-
-ac_result=yes
-if test -z "$ac_cv_sys_global_symbol_pipe"; then
-   ac_result=no
-fi
-AC_MSG_RESULT($ac_result)
-])
-
-# AC_SYS_LIBTOOL_CYGWIN - find tools needed on cygwin
-AC_DEFUN(AC_SYS_LIBTOOL_CYGWIN,
-[AC_CHECK_TOOL(DLLTOOL, dlltool, false)
-AC_CHECK_TOOL(AS, as, false)
-])
-
-# AC_SYS_SYMBOL_UNDERSCORE - does the compiler prefix global symbols
-#                            with an underscore?
-AC_DEFUN(AC_SYS_SYMBOL_UNDERSCORE,
-[AC_REQUIRE([AC_PROG_NM])dnl
-AC_REQUIRE([AC_SYS_NM_PARSE])dnl
-AC_MSG_CHECKING([for _ prefix in compiled symbols])
-AC_CACHE_VAL(ac_cv_sys_symbol_underscore,
-[ac_cv_sys_symbol_underscore=no
-cat > conftest.$ac_ext <<EOF
-void nm_test_func(){}
-int main(){nm_test_func;return 0;}
-EOF
-if AC_TRY_EVAL(ac_compile); then
-  # Now try to grab the symbols.
-  ac_nlist=conftest.nm
-  if AC_TRY_EVAL(NM conftest.$ac_objext \| $ac_cv_sys_global_symbol_pipe \> $ac_nlist) && test -s "$ac_nlist"; then
-    # See whether the symbols have a leading underscore.
-    if egrep '^. _nm_test_func' "$ac_nlist" >/dev/null; then
-      ac_cv_sys_symbol_underscore=yes
-    else
-      if egrep '^. nm_test_func ' "$ac_nlist" >/dev/null; then
-	:
-      else
-	echo "configure: cannot find nm_test_func in $ac_nlist" >&AC_FD_CC
-      fi
-    fi
-  else
-    echo "configure: cannot run $ac_cv_sys_global_symbol_pipe" >&AC_FD_CC
-  fi
-else
-  echo "configure: failed program was:" >&AC_FD_CC
-  cat conftest.c >&AC_FD_CC
-fi
-rm -rf conftest*
-])
-AC_MSG_RESULT($ac_cv_sys_symbol_underscore)
-USE_SYMBOL_UNDERSCORE=${ac_cv_sys_symbol_underscore=no}
-AC_SUBST(USE_SYMBOL_UNDERSCORE)dnl
-])
-
-# AC_CHECK_LIBM - check for math library
-AC_DEFUN(AC_CHECK_LIBM, [
-AC_CHECK_LIB(mw, _mwvalidcheckl)
-AC_CHECK_LIB(m, cos)
-])
-
-# AC_LIBLTDL_CONVENIENCE[(dir)] - sets LIBLTDL to the link flags for
-# the libltdl convenience library, adds --enable-ltdl-convenience to
-# the configure arguments.  Note that LIBLTDL is not AC_SUBSTed, nor
-# is AC_CONFIG_SUBDIRS called.  If DIR is not provided, it is assumed
-# to be `${top_builddir}/libltdl'.  Make sure you start DIR with
-# '${top_builddir}/' (note the single quotes!) if your package is not
-# flat, and, if you're not using automake, define top_builddir as
-# appropriate in the Makefiles.
-AC_DEFUN(AC_LIBLTDL_CONVENIENCE, [
-  case "$enable_ltdl_convenience" in
-  no) AC_MSG_ERROR([this package needs a convenience libltdl]) ;;
-  "") enable_ltdl_convenience=yes
-      ac_configure_args="$ac_configure_args --enable-ltdl-convenience" ;;
-  esac
-  LIBLTDL=ifelse($#,1,$1,['${top_builddir}/libltdl'])/libltdlc.la
-])
-
-# AC_LIBLTDL_INSTALLABLE[(dir)] - sets LIBLTDL to the link flags for
-# the libltdl installable library, and adds --enable-ltdl-install to
-# the configure arguments.  Note that LIBLTDL is not AC_SUBSTed, nor
-# is AC_CONFIG_SUBDIRS called.  If DIR is not provided, it is assumed
-# to be `${top_builddir}/libltdl'.  Make sure you start DIR with
-# '${top_builddir}/' (note the single quotes!) if your package is not
-# flat, and, if you're not using automake, define top_builddir as
-# appropriate in the Makefiles.
-# In the future, this macro may have to be called after AC_PROG_LIBTOOL.
-AC_DEFUN(AC_LIBLTDL_INSTALLABLE, [
-  AC_CHECK_LIB(ltdl, main, LIBLTDL="-lltdl", [
-    case "$enable_ltdl_install" in
-    no) AC_MSG_WARN([libltdl not installed, but installation disabled]) ;;
-    "") enable_ltdl_install=yes
-        ac_configure_args="$ac_configure_args --enable-ltdl-install" ;;
-    esac
-  ])
-  if test x"$enable_ltdl_install" != x"no"; then
-    LIBLTDL=ifelse($#,1,$1,['${top_builddir}/libltdl'])/libltdl.la
-  fi
-])
-
-dnl old names
-AC_DEFUN(AM_PROG_LIBTOOL, [indir([AC_PROG_LIBTOOL])])dnl
-AC_DEFUN(AM_ENABLE_SHARED, [indir([AC_ENABLE_SHARED], $@)])dnl
-AC_DEFUN(AM_ENABLE_STATIC, [indir([AC_ENABLE_STATIC], $@)])dnl
-AC_DEFUN(AM_DISABLE_SHARED, [indir([AC_DISABLE_SHARED], $@)])dnl
-AC_DEFUN(AM_DISABLE_STATIC, [indir([AC_DISABLE_STATIC], $@)])dnl
-AC_DEFUN(AM_PROG_LD, [indir([AC_PROG_LD])])dnl
-AC_DEFUN(AM_PROG_NM, [indir([AC_PROG_NM])])dnl
-AC_DEFUN(AM_SYS_NM_PARSE, [indir([AC_SYS_NM_PARSE])])dnl
-AC_DEFUN(AM_SYS_SYMBOL_UNDERSCORE, [indir([AC_SYS_SYMBOL_UNDERSCORE])])dnl
-AC_DEFUN(AM_SYS_LIBTOOL_CYGWIN, [indir([AC_SYS_LIBTOOL_CYGWIN])])dnl
-
diff --git a/configure.in b/configure.in
index 9f975df..2085796 100755
--- a/configure.in
+++ b/configure.in
@@ -26,7 +26,7 @@ dnl if CC is gcc, we can rebuild the dependencies (since the depend rule
 dnl requires gcc).  If it's not, don't rebuild dependencies -- use what was
 dnl shipped with RPM.
 dnl
-if test X"$GCC" = Xyes ; then
+if test X"$GCC" = "Xyes" ; then
     TARGET="depend allprogs"
 else
     TARGET="everything"
diff --git a/po/.cvsignore b/po/.cvsignore
index 8f58e9b..3d7c249 100644
--- a/po/.cvsignore
+++ b/po/.cvsignore
@@ -2,3 +2,4 @@ Makefile
 Makefile.in
 POTFILES
 *.mo
+popt.pot
diff --git a/po/Makefile.in.in b/po/Makefile.in.in
index 3a1c44c..1d343d7 100644
--- a/po/Makefile.in.in
+++ b/po/Makefile.in.in
@@ -76,7 +76,7 @@ Makefile: Makefile.in.in ../config.status POTFILES
 	  && CONFIG_FILES=po/$@.in CONFIG_HEADERS= \
 	       $(SHELL) ./config.status
 
-distdir:
-
 %.mo: %.po
 	msgfmt -o $@ $<
+
+distdir dvi installcheck:
diff --git a/popthelp.c b/popthelp.c
index fb945d4..ca86f34 100644
--- a/popthelp.c
+++ b/popthelp.c
@@ -73,10 +73,12 @@ static void singleOptionHelp(FILE * f, int maxLeftCol,
     int helpLength;
     const char * ch;
     char format[10];
-    char * left = alloca(maxLeftCol + 1);
+    char * left;
     const char * argDescrip = getArgDescrip(opt, translation_domain);
 
+    left = malloc(maxLeftCol + 1);
     *left = '\0';
+
     if (opt->longName && opt->shortName)
 	sprintf(left, "-%c, --%s", opt->shortName, opt->longName);
     else if (opt->shortName) 
@@ -93,7 +95,7 @@ static void singleOptionHelp(FILE * f, int maxLeftCol,
 	fprintf(f,"  %-*s   ", maxLeftCol, left);
     else {
 	fprintf(f,"  %s\n", left); 
-	return;
+	goto out;
     }
 
     helpLength = strlen(help);
@@ -112,6 +114,9 @@ static void singleOptionHelp(FILE * f, int maxLeftCol,
     }
 
     if (helpLength) fprintf(f, "%s\n", help);
+
+out:
+    free(left);
 }
 
 static int maxArgWidth(const struct poptOption * opt,
diff --git a/poptparse.c b/poptparse.c
index 181ec1a..ebad66a 100644
--- a/poptparse.c
+++ b/poptparse.c
@@ -10,19 +10,32 @@
 #include <stdlib.h>
 #include <string.h>
 
-#ifdef HAVE_ALLOCA_H
-#include <alloca.h>
+/* AIX requires this to be the first thing in the file.  */
+#ifndef __GNUC__
+# if HAVE_ALLOCA_H
+#  include <alloca.h>
+# else
+#  ifdef _AIX
+#pragma alloca
+#  else
+#   ifndef alloca /* predefined by HP cc +Olibcalls */
+char *alloca ();
+#   endif
+#  endif
+# endif
+#elif defined(__GNUC__) && defined(__STRICT_ANSI__)
+#define alloca __builtin_alloca
 #endif
 
 #include "popt.h"
 
-static const int poptArgvArrayGrowDelta = 5;
+#define POPT_ARGV_ARRAY_GROW_DELTA 5
 
 int poptParseArgvString(const char * s, int * argcPtr, char *** argvPtr) {
     char * buf, * bufStart, * dst;
     const char * src;
     char quote = '\0';
-    int argvAlloced = poptArgvArrayGrowDelta;
+    int argvAlloced = POPT_ARGV_ARRAY_GROW_DELTA;
     char ** argv = malloc(sizeof(*argv) * argvAlloced);
     char ** argv2;
     int argc = 0;
@@ -52,7 +65,7 @@ int poptParseArgvString(const char * s, int * argcPtr, char *** argvPtr) {
 	    if (*argv[argc]) {
 		buf++, argc++;
 		if (argc == argvAlloced) {
-		    argvAlloced += poptArgvArrayGrowDelta;
+		    argvAlloced += POPT_ARGV_ARRAY_GROW_DELTA;
 		    argv = realloc(argv, sizeof(*argv) * argvAlloced);
 		}
 		argv[argc] = buf;
-- 
Gitee


From 7f3d94fd10421237c35a68f3348c22aca68a2dbd Mon Sep 17 00:00:00 2001
From: Jeff Johnson <n3npq@mac.com>
Date: Thu, 8 Apr 1999 20:53:52 +0000
Subject: [PATCH 179/667] non-linux, non-gcc portability fixes (Tim Mooney).

---
 po/popt.pot | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/po/popt.pot b/po/popt.pot
index 7dc7a0b..3949071 100644
--- a/po/popt.pot
+++ b/po/popt.pot
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 1999-04-05 11:38-0400\n"
+"POT-Creation-Date: 1999-04-08 16:15-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
-- 
Gitee


From da54b3c4e0c2c7adcb051085f07215350f5100bf Mon Sep 17 00:00:00 2001
From: Jeff Johnson <n3npq@mac.com>
Date: Thu, 8 Apr 1999 21:28:13 +0000
Subject: [PATCH 180/667] Update Slovak translations. Update-po.

---
 po/Makefile.in.in |  2 +-
 po/ro.po          |  2 +-
 po/sk.po          | 22 ++++++++++++++++++++++
 3 files changed, 24 insertions(+), 2 deletions(-)
 create mode 100644 po/sk.po

diff --git a/po/Makefile.in.in b/po/Makefile.in.in
index 1d343d7..3c120a7 100644
--- a/po/Makefile.in.in
+++ b/po/Makefile.in.in
@@ -12,7 +12,7 @@ MSGMERGE = msgmerge
 
 NLSPACKAGE = @PACKAGE@
 
-LINGUAS = ro
+LINGUAS = ro sk
 CATALOGS = $(addsuffix .mo, $(LINGUAS))
 
 POTFILES = \
diff --git a/po/ro.po b/po/ro.po
index b6e8c6d..218d971 100644
--- a/po/ro.po
+++ b/po/ro.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: POPT\n"
-"POT-Creation-Date: 1999-04-05 11:38-0400\n"
+"POT-Creation-Date: 1999-04-08 16:15-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Cristian Gafton <gafton@redhat.com>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/po/sk.po b/po/sk.po
new file mode 100644
index 0000000..fdbf8a0
--- /dev/null
+++ b/po/sk.po
@@ -0,0 +1,22 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR Free Software Foundation, Inc.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: popt\n"
+"POT-Creation-Date: 1999-04-08 16:15-0400\n"
+"PO-Revision-Date: 1999-08-04 21:40+0200\n"
+"Last-Translator: Stanislav Meduna <stano@eunet.sk>\n"
+"Language-Team: Slovak <sk-i18n@rak.isternet.sk>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=iso-8859-2\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#: ../popthelp.c:35
+msgid "Show this help message"
+msgstr "Vyp�sa� t�to spr�vu"
+
+#: ../popthelp.c:36
+msgid "Display brief usage message"
+msgstr "Zobrazi� stru�n� n�vod na pou�itie"
-- 
Gitee


From fcfc65b877dede28fa8c856b03f4d56e9c4be2af Mon Sep 17 00:00:00 2001
From: Jeff Johnson <n3npq@mac.com>
Date: Fri, 9 Apr 1999 22:41:34 +0000
Subject: [PATCH 181/667] Include all po files.

---
 Makefile.am | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Makefile.am b/Makefile.am
index 6918114..6b6b800 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -3,7 +3,7 @@
 AUTOMAKE_OPTIONS = 1.4 foreign
 
 EXTRA_DIST = CHANGES autogen.sh findme.h $(man_MANS) popt.spec poptint.h \
-	testit.sh po/Makefile.in.in po/POTFILES.in po/ro.po po/popt.pot popt.ps
+	testit.sh po/Makefile.in.in po/POTFILES.in po/*.po po/popt.pot popt.ps
 
 SUBDIRS = po
 
-- 
Gitee


From 0377d69513fc23d954ef4cdbe481a67e9e6d67cb Mon Sep 17 00:00:00 2001
From: Jeff Johnson <n3npq@mac.com>
Date: Sun, 11 Apr 1999 22:15:30 +0000
Subject: [PATCH 182/667] Default to not build shared libraries.

---
 autogen.sh   | 4 ++--
 configure.in | 2 ++
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/autogen.sh b/autogen.sh
index 51e80b8..9d53309 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -19,7 +19,7 @@ fi
 cd "$THEDIR"
 
 if [ X"$@" = X  -a "X`uname -s`" = "XLinux" ]; then
-    $srcdir/configure --disable-shared --prefix=/usr
+    $srcdir/configure --prefix=/usr
 else
-    $srcdir/configure --disable-shared "$@"
+    $srcdir/configure "$@"
 fi
diff --git a/configure.in b/configure.in
index 2085796..91e66e6 100755
--- a/configure.in
+++ b/configure.in
@@ -6,7 +6,9 @@ AC_PROG_CC
 AC_GCC_TRADITIONAL
 AM_C_PROTOTYPES
 
+AM_DISABLE_SHARED
 AM_PROG_LIBTOOL
+
 AC_PROG_INSTALL
 
 if test $CC = gcc; then
-- 
Gitee


From 6725c8417f04f5b7ec061ae33ce3a83a05bf7e5a Mon Sep 17 00:00:00 2001
From: Jeff Johnson <n3npq@mac.com>
Date: Mon, 26 Apr 1999 15:01:40 +0000
Subject: [PATCH 183/667] Shell bulletproofing.

---
 configure.in | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/configure.in b/configure.in
index 91e66e6..b38cbbb 100755
--- a/configure.in
+++ b/configure.in
@@ -11,7 +11,7 @@ AM_PROG_LIBTOOL
 
 AC_PROG_INSTALL
 
-if test $CC = gcc; then
+if test "X$CC" = Xgcc; then
     CFLAGS="-Wall $CFLAGS"
 fi
 addlib() {
-- 
Gitee


From fbd18a95fa9c02bb956374a0c4159be416fd6cbd Mon Sep 17 00:00:00 2001
From: Jeff Johnson <n3npq@mac.com>
Date: Thu, 17 Jun 1999 20:18:11 +0000
Subject: [PATCH 184/667] eliminate find-requirements on libNoVersion (Red Hat
 linux only). add new-fangled requires on "libc.so.6(GLIBC_2.1)" (sparc-linux
 only).

---
 test-poptrc | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/test-poptrc b/test-poptrc
index 8a6d86c..7046ec9 100644
--- a/test-poptrc
+++ b/test-poptrc
@@ -4,6 +4,8 @@ test1 alias --takerest --
 test1 alias -T --arg2
 test1 alias -O --arg1
 
+test1 alias --wc --arg2 @@1 --arg1 @@2
+
 test1 exec --echo-args echo
 test1 alias -e --echo-args
 test1 exec -a /bin/echo
-- 
Gitee


From df593afe77e8ab5ba54b3881f9c66bd3c6fd3978 Mon Sep 17 00:00:00 2001
From: Jeff Johnson <n3npq@mac.com>
Date: Thu, 15 Jul 1999 21:02:54 +0000
Subject: [PATCH 185/667] add python bindings to rpm-devel (linux only).

---
 po/popt.pot | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/po/popt.pot b/po/popt.pot
index 3949071..110311a 100644
--- a/po/popt.pot
+++ b/po/popt.pot
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 1999-04-08 16:15-0400\n"
+"POT-Creation-Date: 1999-07-15 16:51-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
-- 
Gitee


From 63b65177903249059069473c0f68daa1d32385ea Mon Sep 17 00:00:00 2001
From: Jeff Johnson <n3npq@mac.com>
Date: Thu, 15 Jul 1999 22:26:15 +0000
Subject: [PATCH 186/667] Change shared lib defaults.

---
 popt.spec | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/popt.spec b/popt.spec
index 54db661..fd2e49c 100644
--- a/popt.spec
+++ b/popt.spec
@@ -22,7 +22,7 @@ capabilities.
 
 %prep
 %setup -q
-CFLAGS="$RPM_OPT_FLAGS" ./configure --prefix=/usr --disable-shared
+CFLAGS="$RPM_OPT_FLAGS" ./configure --prefix=/usr
 
 %build
 make
-- 
Gitee


From 6083f7307e759623034d22c834ed160daf9fcf18 Mon Sep 17 00:00:00 2001
From: Jeff Johnson <n3npq@mac.com>
Date: Tue, 27 Jul 1999 22:05:43 +0000
Subject: [PATCH 187/667] popt: heavy dose of const.

---
 CHANGES      |  3 ++
 findme.c     |  2 +-
 findme.h     |  2 +-
 po/popt.pot  |  2 +-
 popt.c       | 86 +++++++++++++++++++++++++++-------------------------
 popt.h       | 22 +++++++-------
 poptconfig.c |  4 +--
 popthelp.c   |  4 +--
 poptint.h    | 22 ++++++++------
 poptparse.c  |  4 +--
 test1.c      |  2 +-
 11 files changed, 81 insertions(+), 72 deletions(-)

diff --git a/CHANGES b/CHANGES
index 50c150f..054a00f 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,6 @@
+1.3 ->
+	- heavy dose of const's
+
 1.2.3 -> 1.3
 	- added support for single -
 	- misc bug fixes
diff --git a/findme.c b/findme.c
index 1cda62c..4ba4950 100644
--- a/findme.c
+++ b/findme.c
@@ -22,7 +22,7 @@
 
 #include "findme.h"
 
-char * findProgramPath(char * argv0) {
+const char * findProgramPath(const char * argv0) {
     char * path = getenv("PATH");
     char * pathbuf;
     char * start, * chptr;
diff --git a/findme.h b/findme.h
index fdd01d5..5e93963 100644
--- a/findme.h
+++ b/findme.h
@@ -5,6 +5,6 @@
 #ifndef H_FINDME
 #define H_FINDME
 
-char * findProgramPath(char * argv0);
+const char * findProgramPath(const char * argv0);
 
 #endif
diff --git a/po/popt.pot b/po/popt.pot
index 110311a..d359df2 100644
--- a/po/popt.pot
+++ b/po/popt.pot
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 1999-07-15 16:51-0400\n"
+"POT-Creation-Date: 1999-07-27 17:51-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/popt.c b/popt.c
index bfcc005..9808ac3 100644
--- a/popt.c
+++ b/popt.c
@@ -36,7 +36,7 @@ static char * strerror(int errno) {
 #endif
 
 void poptSetExecPath(poptContext con, const char * path, int allowAbsolute) {
-    if (con->execPath) free(con->execPath);
+    if (con->execPath) xfree(con->execPath);
     con->execPath = strdup(path);
     con->execAbsolute = allowAbsolute;
 }
@@ -60,7 +60,7 @@ static void invokeCallbacks(poptContext con, const struct poptOption * table,
     }
 }
 
-poptContext poptGetContext(char * name, int argc, char ** argv, 
+poptContext poptGetContext(const char * name, int argc, char ** argv, 
 			   const struct poptOption * options, int flags) {
     poptContext con = malloc(sizeof(*con));
 
@@ -68,7 +68,7 @@ poptContext poptGetContext(char * name, int argc, char ** argv,
 
     con->os = con->optionStack;
     con->os->argc = argc;
-    con->os->argv = argv;
+    con->os->argv = (const char **)argv;	/* XXX don't change the API */
 
     if (!(flags & POPT_CONTEXT_KEEP_FIRST))
 	con->os->next = 1;			/* skip argv[0] */
@@ -106,7 +106,7 @@ void poptResetContext(poptContext con) {
     con->doExec = NULL;
 
     for (i = 0; i < con->finalArgvCount; i++)
-	free(con->finalArgv[i]);
+	xfree(con->finalArgv[i]);
 
     con->finalArgvCount = 0;
 }
@@ -143,18 +143,20 @@ static int handleExec(poptContext con, char * longName, char shortName) {
     }
 
     i = con->finalArgvCount++;
-    con->finalArgv[i] = malloc((longName ? strlen(longName) : 0) + 3);
-    if (longName)
-	sprintf(con->finalArgv[i], "--%s", longName);
-    else 
-	sprintf(con->finalArgv[i], "-%c", shortName);
+    {	char *s  = malloc((longName ? strlen(longName) : 0) + 3);
+	if (longName)
+	    sprintf(s, "--%s", longName);
+	else 
+	    sprintf(s, "-%c", shortName);
+	con->finalArgv[i] = s;
+    }
 
     return 1;
 }
 
 /* Only one of longName, shortName may be set at a time */
-static int handleAlias(poptContext con, char * longName, char shortName,
-		       char * nextCharArg) {
+static int handleAlias(poptContext con, const char * longName, char shortName,
+		       const char * nextCharArg) {
     int i;
 
     if (con->os->currAlias && con->os->currAlias->longName && longName &&
@@ -194,9 +196,9 @@ static int handleAlias(poptContext con, char * longName, char shortName,
 }
 
 static void execCommand(poptContext con) {
-    char ** argv;
+    const char ** argv;
     int pos = 0;
-    char * script = con->doExec->script;
+    const char * script = con->doExec->script;
 
     argv = malloc(sizeof(*argv) * 
 			(6 + con->numLeftovers + con->finalArgvCount));
@@ -204,8 +206,9 @@ static void execCommand(poptContext con) {
     if (!con->execAbsolute && strchr(script, '/')) return;
 
     if (!strchr(script, '/') && con->execPath) {
-	argv[pos] = alloca(strlen(con->execPath) + strlen(script) + 2);
-	sprintf(argv[pos], "%s/%s", con->execPath, script);
+	char *s = alloca(strlen(con->execPath) + strlen(script) + 2);
+	sprintf(s, "%s/%s", con->execPath, script);
+	argv[pos] = s;
     } else {
 	argv[pos] = script;
     }
@@ -243,14 +246,14 @@ static void execCommand(poptContext con) {
 #endif
 #endif
 
-    execvp(argv[0], argv);
+    execvp(argv[0], (char *const *)argv);
 }
 
 static const struct poptOption * findOption(const struct poptOption * table,
 					    const char * longName,
 					    char shortName,
 					    poptCallbackType * callback,
-					    void ** callbackData,
+					    const void ** callbackData,
 					    int singleDash) {
     const struct poptOption * opt = table;
     const struct poptOption * opt2;
@@ -296,15 +299,15 @@ static const struct poptOption * findOption(const struct poptOption * table,
 /* returns 'val' element, -1 on last item, POPT_ERROR_* on error */
 int poptGetNextOpt(poptContext con) {
     char * optString, * chptr, * localOptString;
-    char * longArg = NULL;
-    char * origOptString;
+    const char * longArg = NULL;
+    const char * origOptString;
     long aLong;
     char * end;
     const struct poptOption * opt = NULL;
     int done = 0;
     int i;
     poptCallbackType cb;
-    void * cbData;
+    const void * cbData;
     int singleDash;
 
     while (!done) {
@@ -412,7 +415,7 @@ int poptGetNextOpt(poptContext con) {
 	    if (opt->arg) {
 		switch (opt->argInfo & POPT_ARG_MASK) {
 		  case POPT_ARG_STRING:
-		    *((char **) opt->arg) = con->os->nextArg;
+		    *((const char **) opt->arg) = con->os->nextArg;
 		    break;
 
 		  case POPT_ARG_INT:
@@ -452,12 +455,13 @@ int poptGetNextOpt(poptContext con) {
 	}
 
 	i = con->finalArgvCount++;
-	con->finalArgv[i] = 
-		malloc((opt->longName ? strlen(opt->longName) : 0) + 3);
-	if (opt->longName)
-	    sprintf(con->finalArgv[i], "--%s", opt->longName);
-	else 
-	    sprintf(con->finalArgv[i], "-%c", opt->shortName);
+	{    char *s = malloc((opt->longName ? strlen(opt->longName) : 0) + 3);
+	    if (opt->longName)
+		sprintf(s, "--%s", opt->longName);
+	    else 
+		sprintf(s, "-%c", opt->shortName);
+	    con->finalArgv[i] = s;
+	}
 
 	if (opt->arg && (opt->argInfo & POPT_ARG_MASK) != POPT_ARG_NONE
 		     && (opt->argInfo & POPT_ARG_MASK) != POPT_ARG_VAL) 
@@ -468,22 +472,22 @@ int poptGetNextOpt(poptContext con) {
 }
 
 char * poptGetOptArg(poptContext con) {
-    char * ret = con->os->nextArg;
+    char * ret = (char *)con->os->nextArg;	/* XXX don't change the API */
     con->os->nextArg = NULL;
     return ret;
 }
 
 char * poptGetArg(poptContext con) {
     if (con->numLeftovers == con->nextLeftover) return NULL;
-    return (con->leftovers[con->nextLeftover++]);
+    return (char *)con->leftovers[con->nextLeftover++];	/* XXX don't change the API */
 }
 
-char * poptPeekArg(poptContext con) {
+const char * poptPeekArg(poptContext con) {
     if (con->numLeftovers == con->nextLeftover) return NULL;
-    return (con->leftovers[con->nextLeftover]);
+    return con->leftovers[con->nextLeftover];
 }
 
-char ** poptGetArgs(poptContext con) {
+const char ** poptGetArgs(poptContext con) {
     if (con->numLeftovers == con->nextLeftover) return NULL;
 
     /* some apps like [like RPM ;-) ] need this NULL terminated */
@@ -496,24 +500,24 @@ void poptFreeContext(poptContext con) {
     int i;
 
     for (i = 0; i < con->numAliases; i++) {
-	if (con->aliases[i].longName) free(con->aliases[i].longName);
+	if (con->aliases[i].longName) xfree(con->aliases[i].longName);
 	free(con->aliases[i].argv);
     }
 
     for (i = 0; i < con->numExecs; i++) {
-	if (con->execs[i].longName) free(con->execs[i].longName);
-	free(con->execs[i].script);
+	if (con->execs[i].longName) xfree(con->execs[i].longName);
+	xfree(con->execs[i].script);
     }
 
     for (i = 0; i < con->finalArgvCount; i++)
-	free(con->finalArgv[i]);
+	xfree(con->finalArgv[i]);
 
     free(con->leftovers);
     free(con->finalArgv);
-    if (con->appName) free(con->appName);
+    if (con->appName) xfree(con->appName);
     if (con->aliases) free(con->aliases);
-    if (con->otherHelp) free(con->otherHelp);
-    if (con->execPath) free(con->execPath);
+    if (con->otherHelp) xfree(con->otherHelp);
+    if (con->execPath) xfree(con->execPath);
     free(con);
 }
 
@@ -539,7 +543,7 @@ int poptAddAlias(poptContext con, struct poptAlias newAlias, int flags) {
     return 0;
 }
 
-char * poptBadOption(poptContext con, int flags) {
+const char * poptBadOption(poptContext con, int flags) {
     struct optionStackEntry * os;
 
     if (flags & POPT_BADOPTION_NOALIAS)
@@ -577,7 +581,7 @@ const char * poptStrerror(const int error) {
     }
 }
 
-int poptStuffArgs(poptContext con, char ** argv) {
+int poptStuffArgs(poptContext con, const char ** argv) {
     int i;
 
     if ((con->os - con->optionStack) == POPT_OPTION_DEPTH)
diff --git a/popt.h b/popt.h
index 2fea9e8..c252e6b 100644
--- a/popt.h
+++ b/popt.h
@@ -57,15 +57,15 @@ struct poptOption {
     int argInfo;
     void * arg;			/* depends on argInfo */
     int val;			/* 0 means don't return, just update flag */
-    char * descrip;		/* description for autohelp -- may be NULL */
-    char * argDescrip;		/* argument description for autohelp */
+    const char * descrip;	/* description for autohelp -- may be NULL */
+    const char * argDescrip;	/* argument description for autohelp */
 };
 
 struct poptAlias {
-    char * longName;		/* may be NULL */
+    const char * longName;	/* may be NULL */
     char shortName;		/* may be '\0' */
     int argc;
-    char ** argv;		/* must be free()able */
+    const char ** argv;		/* must be free()able */
 };
 
 extern struct poptOption poptHelpOptions[];
@@ -83,9 +83,9 @@ enum poptCallbackReason { POPT_CALLBACK_REASON_PRE,
 typedef void (*poptCallbackType)(poptContext con, 
 				 enum poptCallbackReason reason,
 			         const struct poptOption * opt,
-				 const char * arg, void * data);
+				 const char * arg, const void * data);
 
-poptContext poptGetContext(char * name, int argc, char ** argv, 
+poptContext poptGetContext(const char * name, int argc, char ** argv, 
 			   const struct poptOption * options, int flags);
 void poptResetContext(poptContext con);
 
@@ -95,14 +95,14 @@ int poptGetNextOpt(poptContext con);
 char * poptGetOptArg(poptContext con);
 /* returns NULL if no more options are available */
 char * poptGetArg(poptContext con);
-char * poptPeekArg(poptContext con);
-char ** poptGetArgs(poptContext con);
+const char * poptPeekArg(poptContext con);
+const char ** poptGetArgs(poptContext con);
 /* returns the option which caused the most recent error */
-char * poptBadOption(poptContext con, int flags);
+const char * poptBadOption(poptContext con, int flags);
 void poptFreeContext(poptContext con);
-int poptStuffArgs(poptContext con, char ** argv);
+int poptStuffArgs(poptContext con, const char ** argv);
 int poptAddAlias(poptContext con, struct poptAlias alias, int flags);
-int poptReadConfigFile(poptContext con, char * fn);
+int poptReadConfigFile(poptContext con, const char * fn);
 /* like above, but reads /etc/popt and $HOME/.popt along with environment 
    vars */
 int poptReadDefaultConfig(poptContext con, int useEnv);
diff --git a/poptconfig.c b/poptconfig.c
index fce6d74..ea670e7 100644
--- a/poptconfig.c
+++ b/poptconfig.c
@@ -51,7 +51,7 @@ static void configLine(poptContext con, char * line) {
 	shortName = opt[1];
 
     if (!strcmp(entryType, "alias")) {
-	if (poptParseArgvString(line, &alias.argc, &alias.argv)) return;
+	if (poptParseArgvString(line, &alias.argc, (char ***)&alias.argv)) return;
 	alias.longName = longName, alias.shortName = shortName;
 	poptAddAlias(con, alias, 0);
     } else if (!strcmp(entryType, "exec")) {
@@ -69,7 +69,7 @@ static void configLine(poptContext con, char * line) {
     }
 }
 
-int poptReadConfigFile(poptContext con, char * fn) {
+int poptReadConfigFile(poptContext con, const char * fn) {
     char * file, * chptr, * end;
     char * buf, * dst;
     int fd, rc;
diff --git a/popthelp.c b/popthelp.c
index ca86f34..05570bb 100644
--- a/popthelp.c
+++ b/popthelp.c
@@ -180,7 +180,7 @@ static void singleTableHelp(FILE * f, const struct poptOption * table,
 
 static int showHelpIntro(poptContext con, FILE * f) {
     int len = 6;
-    char * fn;
+    const char * fn;
 
     fprintf(f, POPT_("Usage:"));
     if (!(con->flags & POPT_CONTEXT_KEEP_FIRST)) {
@@ -306,6 +306,6 @@ void poptPrintUsage(poptContext con, FILE * f, int flags) {
 }
 
 void poptSetOtherOptionHelp(poptContext con, const char * text) {
-    if (con->otherHelp) free(con->otherHelp);
+    if (con->otherHelp) xfree(con->otherHelp);
     con->otherHelp = strdup(text);
 }
diff --git a/poptint.h b/poptint.h
index 8fc6a84..62cc60a 100644
--- a/poptint.h
+++ b/poptint.h
@@ -7,42 +7,44 @@
 
 struct optionStackEntry {
     int argc;
-    char ** argv;
+    const char ** argv;
     int next;
-    char * nextArg;
-    char * nextCharArg;
+    const char * nextArg;
+    const char * nextCharArg;
     struct poptAlias * currAlias;
     int stuffed;
 };
 
 struct execEntry {
-    char * longName;
+    const char * longName;
     char shortName;
-    char * script;
+    const char * script;
 };
 
 struct poptContext_s {
     struct optionStackEntry optionStack[POPT_OPTION_DEPTH], * os;
-    char ** leftovers;
+    const char ** leftovers;
     int numLeftovers;
     int nextLeftover;
     const struct poptOption * options;
     int restLeftover;
-    char * appName;
+    const char * appName;
     struct poptAlias * aliases;
     int numAliases;
     int flags;
     struct execEntry * execs;
     int numExecs;
-    char ** finalArgv;
+    const char ** finalArgv;
     int finalArgvCount;
     int finalArgvAlloced;
     struct execEntry * doExec;
-    char * execPath;
+    const char * execPath;
     int execAbsolute;
-    char * otherHelp;
+    const char * otherHelp;
 };
 
+#define	xfree(_a)	free((void *)_a)
+
 #ifdef HAVE_LIBINTL_H
 #include <libintl.h>
 #endif
diff --git a/poptparse.c b/poptparse.c
index ebad66a..92af27a 100644
--- a/poptparse.c
+++ b/poptparse.c
@@ -37,7 +37,7 @@ int poptParseArgvString(const char * s, int * argcPtr, char *** argvPtr) {
     char quote = '\0';
     int argvAlloced = POPT_ARGV_ARRAY_GROW_DELTA;
     char ** argv = malloc(sizeof(*argv) * argvAlloced);
-    char ** argv2;
+    const char ** argv2;
     int argc = 0;
     int i, buflen;
 
@@ -105,7 +105,7 @@ int poptParseArgvString(const char * s, int * argcPtr, char *** argvPtr) {
 
     free(argv);
 
-    *argvPtr = argv2;
+    *argvPtr = (char **)argv2;	/* XXX don't change the API */
     *argcPtr = argc;
 
     return 0;
diff --git a/test1.c b/test1.c
index 0039415..4a33287 100644
--- a/test1.c
+++ b/test1.c
@@ -59,7 +59,7 @@ static struct poptOption options[] = {
 int main(int argc, char ** argv) {
     int rc;
     poptContext optCon;
-    char ** rest;
+    const char ** rest;
     int help = 0;
     int usage = 0;
 
-- 
Gitee


From 46b6a6869b10ceb05b28d73da4bc23c9377300a4 Mon Sep 17 00:00:00 2001
From: Jeff Johnson <n3npq@mac.com>
Date: Mon, 2 Aug 1999 19:10:09 +0000
Subject: [PATCH 188/667] Sanity.

---
 po/popt.pot | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/po/popt.pot b/po/popt.pot
index d359df2..988795e 100644
--- a/po/popt.pot
+++ b/po/popt.pot
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 1999-07-27 17:51-0400\n"
+"POT-Creation-Date: 1999-07-27 18:20-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
-- 
Gitee


From 12f2e74565894b08ca055728aa1be438163371c2 Mon Sep 17 00:00:00 2001
From: Erik Troan <ewt@redhat.com>
Date: Sat, 4 Sep 1999 19:37:00 +0000
Subject: [PATCH 189/667] null terminate parsed argument lists

---
 poptparse.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/poptparse.c b/poptparse.c
index 92af27a..c64ce0f 100644
--- a/poptparse.c
+++ b/poptparse.c
@@ -93,10 +93,11 @@ int poptParseArgvString(const char * s, int * argcPtr, char *** argvPtr) {
 	argc++, buf++;
     }
 
-    dst = malloc(argc * sizeof(*argv) + (buf - bufStart));
+    dst = malloc((argc + 1) * sizeof(*argv) + (buf - bufStart));
     argv2 = (void *) dst;
-    dst += argc * sizeof(*argv);
+    dst += (argc + 1) * sizeof(*argv);
     memcpy(argv2, argv, argc * sizeof(*argv));
+    argv2[argc] = NULL;
     memcpy(dst, bufStart, buf - bufStart);
 
     for (i = 0; i < argc; i++) {
-- 
Gitee


From a4ce9eef2f4ea7144e8a3ddb0c7bfd4de32a55ba Mon Sep 17 00:00:00 2001
From: Erik Troan <ewt@redhat.com>
Date: Sat, 4 Sep 1999 19:38:05 +0000
Subject: [PATCH 190/667] *** empty log message ***

---
 CHANGES     | 1 +
 po/popt.pot | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/CHANGES b/CHANGES
index 054a00f..b6ab2aa 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,5 +1,6 @@
 1.3 ->
 	- heavy dose of const's
+	- poptParseArgvString() now NULL terminates the list
 
 1.2.3 -> 1.3
 	- added support for single -
diff --git a/po/popt.pot b/po/popt.pot
index 988795e..e4f1f94 100644
--- a/po/popt.pot
+++ b/po/popt.pot
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 1999-07-27 18:20-0400\n"
+"POT-Creation-Date: 1999-09-04 10:55-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
-- 
Gitee


From 739af5f86169ee66e69bc6b3dd95f001f775f3bf Mon Sep 17 00:00:00 2001
From: Erik Troan <ewt@redhat.com>
Date: Fri, 10 Sep 1999 00:50:25 +0000
Subject: [PATCH 191/667] version 1.4

---
 configure.in | 2 +-
 popt.spec    | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/configure.in b/configure.in
index b38cbbb..2dd7fe2 100755
--- a/configure.in
+++ b/configure.in
@@ -1,5 +1,5 @@
 AC_INIT(popt.h)
-AM_INIT_AUTOMAKE(popt, 1.3)
+AM_INIT_AUTOMAKE(popt, 1.4)
 AM_CONFIG_HEADER(config.h)
 
 AC_PROG_CC
diff --git a/popt.spec b/popt.spec
index fd2e49c..8b50f7e 100644
--- a/popt.spec
+++ b/popt.spec
@@ -1,6 +1,6 @@
 Summary: A C library for parsing command line parameters.
 Name: popt
-Version: 1.3
+Version: 1.4
 Release: 1
 Copyright: LGPL
 Group: System Environment/Libraries
-- 
Gitee


From 4c2c6997e5bff24da0edec88aaf0262bbc4fdaab Mon Sep 17 00:00:00 2001
From: Jeff Johnson <n3npq@mac.com>
Date: Tue, 21 Sep 1999 17:21:58 +0000
Subject: [PATCH 192/667] fix: removed files fingerprint memory leak. fix:
 resurrect allfiles flag from rpm-2.5.x.

---
 po/popt.pot  | 2 +-
 poptconfig.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/po/popt.pot b/po/popt.pot
index e4f1f94..8848085 100644
--- a/po/popt.pot
+++ b/po/popt.pot
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 1999-09-04 10:55-0400\n"
+"POT-Creation-Date: 1999-09-21 14:38-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/poptconfig.c b/poptconfig.c
index ea670e7..9d9b495 100644
--- a/poptconfig.c
+++ b/poptconfig.c
@@ -55,7 +55,7 @@ static void configLine(poptContext con, char * line) {
 	alias.longName = longName, alias.shortName = shortName;
 	poptAddAlias(con, alias, 0);
     } else if (!strcmp(entryType, "exec")) {
-	con->execs = realloc(con->execs, 
+	con->execs = realloc(con->execs, /* XXX memory leak */
 				sizeof(*con->execs) * (con->numExecs + 1));
 	if (longName)
 	    con->execs[con->numExecs].longName = strdup(longName);
-- 
Gitee


From b93d7868dc3592e45ea03ca1332d94296fb4b54b Mon Sep 17 00:00:00 2001
From: Jeff Johnson <n3npq@mac.com>
Date: Wed, 29 Sep 1999 21:12:45 +0000
Subject: [PATCH 193/667] Add intl so popt no longer requires gettext.

---
 Makefile.am        |    2 +-
 acconfig.h         |   15 +
 autogen.sh         |    2 +-
 configure.in       |   11 +-
 intl/ChangeLog     | 1086 ++++++++++++++++++++++++++++++++++++++++++++
 intl/Makefile.in   |  214 +++++++++
 intl/VERSION       |    1 +
 intl/bindtextdom.c |  203 +++++++++
 intl/cat-compat.c  |  262 +++++++++++
 intl/dcgettext.c   |  624 +++++++++++++++++++++++++
 intl/dgettext.c    |   59 +++
 intl/explodename.c |  188 ++++++++
 intl/finddomain.c  |  216 +++++++++
 intl/gettext.c     |   70 +++
 intl/gettext.h     |  105 +++++
 intl/gettextP.h    |   89 ++++
 intl/hash-string.h |   59 +++
 intl/intl-compat.c |   76 ++++
 intl/l10nflist.c   |  411 +++++++++++++++++
 intl/libgettext.h  |  182 ++++++++
 intl/libintl.h     |  182 ++++++++
 intl/linux-msg.sed |  100 ++++
 intl/loadinfo.h    |   76 ++++
 intl/loadmsgcat.c  |  222 +++++++++
 intl/localealias.c |  424 +++++++++++++++++
 intl/po2tbl.sed.in |  102 +++++
 intl/textdomain.c  |  108 +++++
 intl/xopen-msg.sed |  104 +++++
 po/Makefile.in.in  |  257 +++++++++--
 po/ro.po           |    2 +-
 po/sk.po           |    2 +-
 popt.spec          |   12 +-
 32 files changed, 5410 insertions(+), 56 deletions(-)
 create mode 100644 intl/ChangeLog
 create mode 100644 intl/Makefile.in
 create mode 100644 intl/VERSION
 create mode 100644 intl/bindtextdom.c
 create mode 100644 intl/cat-compat.c
 create mode 100644 intl/dcgettext.c
 create mode 100644 intl/dgettext.c
 create mode 100644 intl/explodename.c
 create mode 100644 intl/finddomain.c
 create mode 100644 intl/gettext.c
 create mode 100644 intl/gettext.h
 create mode 100644 intl/gettextP.h
 create mode 100644 intl/hash-string.h
 create mode 100644 intl/intl-compat.c
 create mode 100644 intl/l10nflist.c
 create mode 100644 intl/libgettext.h
 create mode 100644 intl/libintl.h
 create mode 100644 intl/linux-msg.sed
 create mode 100644 intl/loadinfo.h
 create mode 100644 intl/loadmsgcat.c
 create mode 100644 intl/localealias.c
 create mode 100644 intl/po2tbl.sed.in
 create mode 100644 intl/textdomain.c
 create mode 100644 intl/xopen-msg.sed

diff --git a/Makefile.am b/Makefile.am
index 6b6b800..7c187ad 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -5,7 +5,7 @@ AUTOMAKE_OPTIONS = 1.4 foreign
 EXTRA_DIST = CHANGES autogen.sh findme.h $(man_MANS) popt.spec poptint.h \
 	testit.sh po/Makefile.in.in po/POTFILES.in po/*.po po/popt.pot popt.ps
 
-SUBDIRS = po
+SUBDIRS = intl po
 
 INCLUDES = -I$(top_srcdir)
 
diff --git a/acconfig.h b/acconfig.h
index 3e2b29f..3121e41 100644
--- a/acconfig.h
+++ b/acconfig.h
@@ -27,6 +27,21 @@
 /* Define to 1 if ANSI function prototypes are usable.  */
 #undef PROTOTYPES
 
+/* Define to 1 if NLS is requested.  */
+#undef ENABLE_NLS
+
+/* Define as 1 if you have catgets and don't want to use GNU gettext.  */
+#undef HAVE_CATGETS
+
+/* Define as 1 if you have gettext and don't want to use GNU gettext.  */
+#undef HAVE_GETTEXT
+
+/* Define if your locale.h file contains LC_MESSAGES.  */
+#undef HAVE_LC_MESSAGES
+
+/* Define to 1 if you have the stpcpy function.  */
+#undef HAVE_STPCPY
+
 ^L
 /* Leave that blank line there!!  Autoheader needs it.
    If you're adding to this file, keep in mind:
diff --git a/autogen.sh b/autogen.sh
index 9d53309..198b94b 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -19,7 +19,7 @@ fi
 cd "$THEDIR"
 
 if [ X"$@" = X  -a "X`uname -s`" = "XLinux" ]; then
-    $srcdir/configure --prefix=/usr
+    $srcdir/configure --prefix=/usr "$@"
 else
     $srcdir/configure "$@"
 fi
diff --git a/configure.in b/configure.in
index 2dd7fe2..a04b086 100755
--- a/configure.in
+++ b/configure.in
@@ -1,6 +1,11 @@
 AC_INIT(popt.h)
-AM_INIT_AUTOMAKE(popt, 1.4)
 AM_CONFIG_HEADER(config.h)
+AC_PREREQ(2.12)
+AC_CANONICAL_SYSTEM
+AM_INIT_AUTOMAKE(popt, 1.4)
+ALL_LINGUAS="ro sk"
+
+AC_ISC_POSIX
 
 AC_PROG_CC
 AC_GCC_TRADITIONAL
@@ -61,5 +66,7 @@ AC_CHECK_FUNC(setreuid, [], [
     AC_CHECK_LIB(ucb, setreuid, [if echo $LIBS | grep -- -lucb >/dev/null ;then :; else LIBS="$LIBS -lc -lucb" USEUCB=y;fi])
 ])
 
-AC_OUTPUT([Makefile  po/Makefile.in],
+AM_GNU_GETTEXT
+
+AC_OUTPUT([Makefile intl/Makefile po/Makefile.in],
 	[sed -e "/POTFILES =/r po/POTFILES" po/Makefile.in > po/Makefile])
diff --git a/intl/ChangeLog b/intl/ChangeLog
new file mode 100644
index 0000000..1989501
--- /dev/null
+++ b/intl/ChangeLog
@@ -0,0 +1,1086 @@
+1998-04-29  Ulrich Drepper  <drepper@cygnus.com>
+
+	* intl/localealias.c (read_alias_file): Use unsigned char for
+	local variables.  Remove unused variable tp.
+	* intl/l10nflist.c (_nl_normalize_codeset): Use unsigned char *
+	for type of codeset.  For loosing Solaris systems.
+	* intl/loadinfo.h: Adapt prototype of _nl_normalize_codeset.
+	* intl/bindtextdom.c (BINDTEXTDOMAIN): Don't define local variable
+	len if not needed.
+	Patches by Jim Meyering.
+
+1998-04-28  Ulrich Drepper  <drepper@cygnus.com>
+
+	* loadmsgcat.c (_nl_load_domain): Don't assign the element use_mmap if
+	mmap is not supported.
+
+	* hash-string.h: Don't include <values.h>.
+
+1998-04-27  Ulrich Drepper  <drepper@cygnus.com>
+
+	* textdomain.c: Use strdup is available.
+
+	* localealias.c: Define HAVE_MEMPCPY so that we can use this
+	function.  Define and use semapahores to protect modfication of
+	global objects when compiling for glibc.  Add code to allow
+	freeing alias table.
+
+	* l10nflist.c: Don't assume stpcpy not being a macro.
+
+	* gettextP.h: Define internal_function macri if not already done.
+	Use glibc byte-swap macros instead of defining SWAP when compiled
+	for glibc.
+	(struct loaded_domain): Add elements to allow unloading.
+
+	* Makefile.in (distclean): Don't remove libintl.h here.
+
+	* bindtextdomain.c: Carry over changes from glibc.  Use strdup if
+	available.
+
+	* dcgettext.c: Don't assume stpcpy not being a macro.  Mark internal
+	functions.  Add memory freeing code for glibc.
+
+	* dgettext.c: Update copyright.
+
+	* explodename.c: Include stdlib.h and string.h only if they exist.
+	Use strings.h eventually.
+
+	* finddomain.c: Mark internal functions.  Use strdup if available.
+	Add memory freeing code for glibc.
+
+1997-10-10 20:00  Ulrich Drepper  <drepper@cygnus.com>
+
+	* libgettext.h: Fix dummy textdomain and bindtextdomain macros.
+	They should return reasonable values.
+	Reported by Tom Tromey <tromey@cygnus.com>.
+
+1997-09-16 03:33  Ulrich Drepper  <drepper@cygnus.com>
+
+	* libgettext.h: Define PARAMS also to `args' if __cplusplus is defined.
+	* intlh.inst.in: Likewise.
+	Reported by Jean-Marc Lasgouttes <Jean-Marc.Lasgouttes@inria.fr>.
+
+	* libintl.glibc: Update from current glibc version.
+
+1997-09-06 02:10  Ulrich Drepper  <drepper@cygnus.com>
+
+	* intlh.inst.in: Reformat copyright.
+
+1997-08-19 15:22  Ulrich Drepper  <drepper@cygnus.com>
+
+	* dcgettext.c (DCGETTEXT): Remove wrong comment.
+
+1997-08-16 00:13  Ulrich Drepper  <drepper@cygnus.com>
+
+	* Makefile.in (install-data): Don't change directory to install.
+
+1997-08-01 14:30  Ulrich Drepper  <drepper@cygnus.com>
+
+	* cat-compat.c: Fix copyright.
+
+	* localealias.c: Don't define strchr unless !HAVE_STRCHR.
+
+	* loadmsgcat.c: Update copyright.  Fix typos.
+
+	* l10nflist.c: Don't define strchr unless !HAVE_STRCHR.
+	(_nl_make_l10nflist): Handle sponsor and revision correctly.
+
+	* gettext.c: Update copyright.
+	* gettext.h: Likewise.
+	* hash-string.h: Likewise.
+
+	* finddomain.c: Remoave dead code.  Define strchr only if
+	!HAVE_STRCHR.
+
+	* explodename.c: Include <sys/types.h>.
+
+	* explodename.c: Reformat copyright text.
+	(_nl_explode_name): Fix typo.
+
+	* dcgettext.c: Define and use __set_errno.
+	(guess_category_value): Don't use setlocale if HAVE_LC_MESSAGES is
+	not defined.
+
+	* bindtextdom.c: Pretty printing.
+
+1997-05-01 02:25  Ulrich Drepper  <drepper@cygnus.com>
+
+	* dcgettext.c (guess_category_value): Don't depend on
+	HAVE_LC_MESSAGES.  We don't need the macro here.
+	Patch by Bruno Haible <haible@ilog.fr>.
+
+	* cat-compat.c (textdomain): DoN't refer to HAVE_SETLOCALE_NULL
+	macro.  Instead use HAVE_LOCALE_NULL and define it when using
+	glibc, as in dcgettext.c.
+	Patch by Bruno Haible <haible@ilog.fr>.
+
+	* Makefile.in (CPPFLAGS): New variable.  Reported by Franc,ois
+	Pinard.
+
+Mon Mar 10 06:51:17 1997  Ulrich Drepper  <drepper@cygnus.com>
+
+	* Makefile.in: Implement handling of libtool.
+
+	* gettextP.h: Change data structures for use of generic lowlevel
+	i18n file handling.
+
+Wed Dec  4 20:21:18 1996  Ulrich Drepper  <drepper@cygnus.com>
+
+	* textdomain.c: Put parentheses around arguments of memcpy macro
+	definition.
+	* localealias.c: Likewise.
+	* l10nflist.c: Likewise.
+	* finddomain.c: Likewise.
+	* bindtextdom.c: Likewise.
+	Reported by Thomas Esken.
+
+Mon Nov 25 22:57:51 1996  Ulrich Drepper  <drepper@cygnus.com>
+
+	* textdomain.c: Move definition of `memcpy` macro to right
+	position.
+
+Fri Nov 22 04:01:58 1996  Ulrich Drepper  <drepper@cygnus.com>
+
+	* finddomain.c [!HAVE_STRING_H && !_LIBC]: Define memcpy using
+ 	bcopy if not already defined.  Reported by Thomas Esken.
+	* bindtextdom.c: Likewise.
+	* l10nflist.c: Likewise.
+	* localealias.c: Likewise.
+	* textdomain.c: Likewise.
+
+Tue Oct 29 11:10:27 1996  Ulrich Drepper  <drepper@cygnus.com>
+
+	* Makefile.in (libdir): Change to use exec_prefix instead of
+ 	prefix.  Reported by Knut-H�vardAksnes <etokna@eto.ericsson.se>.
+
+Sat Aug 31 03:07:09 1996  Ulrich Drepper  <drepper@cygnus.com>
+
+	* l10nflist.c (_nl_normalize_codeset): We convert to lower case,
+	so don't prepend uppercase `ISO' for only numeric arg.
+
+Fri Jul 19 00:15:46 1996  Ulrich Drepper  <drepper@cygnus.com>
+
+	* l10nflist.c: Move inclusion of argz.h, ctype.h, stdlib.h after
+	definition of _GNU_SOURCE.  Patch by Roland McGrath.
+
+	* Makefile.in (uninstall): Fix another bug with `for' loop and
+	empty arguments.  Patch by Jim Meyering.  Correct name os
+	uninstalled files: no intl- prefix anymore.
+
+	* Makefile.in (install-data): Again work around shells which
+	cannot handle mpty for list.  Reported by Jim Meyering.
+
+Sat Jul 13 18:11:35 1996  Ulrich Drepper  <drepper@cygnus.com>
+
+	* Makefile.in (install): Split goal.  Now depend on install-exec
+        and install-data.
+	(install-exec, install-data): New goals.  Created from former
+	install goal.
+	Reported by Karl Berry.
+
+Sat Jun 22 04:58:14 1996  Ulrich Drepper  <drepper@cygnus.com>
+
+	* Makefile.in (MKINSTALLDIRS): New variable.  Path to
+        mkinstalldirs script.
+	(install): use MKINSTALLDIRS variable or if the script is not present
+	try to find it in the $top_scrdir).
+
+Wed Jun 19 02:56:56 1996  Ulrich Drepper  <drepper@cygnus.com>
+
+	* l10nflist.c: Linux libc *partly* includes the argz_* functions.
+	Grr.  Work around by renaming the static version and use macros
+	for renaming.
+
+Tue Jun 18 20:11:17 1996  Ulrich Drepper  <drepper@cygnus.com>
+
+	* l10nflist.c: Correct presence test macros of __argz_* functions.
+
+	* l10nflist.c: Include <argz.h> based on test of it instead when
+	__argz_* functions are available.
+	Reported by Andreas Schwab.
+
+Thu Jun 13 15:17:44 1996  Ulrich Drepper  <drepper@cygnus.com>
+
+	* explodename.c, l10nflist.c: Define NULL for dumb systems.
+
+Tue Jun 11 17:05:13 1996  Ulrich Drepper  <drepper@cygnus.com>
+
+	* intlh.inst.in, libgettext.h (dcgettext): Rename local variable
+	result to __result to prevent name clash.
+
+	* l10nflist.c, localealias.c, dcgettext.c: Define _GNU_SOURCE to
+        get prototype for stpcpy and strcasecmp.
+
+	* intlh.inst.in, libgettext.h: Move declaration of
+	`_nl_msg_cat_cntr' outside __extension__ block to prevent warning
+	from gcc's -Wnested-extern option.
+
+Fri Jun  7 01:58:00 1996  Ulrich Drepper  <drepper@cygnus.com>
+
+	* Makefile.in (install): Remove comment.
+
+Thu Jun  6 17:28:17 1996  Ulrich Drepper  <drepper@cygnus.com>
+
+	* Makefile.in (install): Work around for another Buglix stupidity.
+	Always use an `else' close for `if's.  Reported by Nelson Beebe.
+
+	* Makefile.in (intlh.inst): Correct typo in phony rule.
+	Reported by Nelson Beebe.
+
+Thu Jun  6 01:49:52 1996  Ulrich Drepper  <drepper@cygnus.com>
+
+	* dcgettext.c (read_alias_file): Rename variable alloca_list to
+	block_list as the macro calls assume.
+	Patch by Eric Backus.
+
+	* localealias.c [!HAVE_ALLOCA]: Define alloca as macro using
+        malloc.
+	(read_alias_file): Rename varriabe alloca_list to block_list as the
+	macro calls assume.
+	Patch by Eric Backus.
+
+	* l10nflist.c: Correct conditional for <argz.h> inclusion.
+	Reported by Roland McGrath.
+
+	* Makefile.in (all): Depend on all-@USE_INCLUDED_LIBINTL@, not
+        all-@USE_NLS@.
+
+	* Makefile.in (install): intlh.inst comes from local dir, not
+        $(srcdir).
+
+	* Makefile.in (intlh.inst): Special handling of this goal.  If
+	used in gettext, this is really a rul to construct this file.  If
+	used in any other package it is defined as a .PHONY rule with
+	empty body.
+
+	* finddomain.c: Extract locale file information handling into
+	l10nfile.c.  Rename local stpcpy__ function to stpcpy.
+
+	* dcgettext.c (stpcpy): Add local definition.
+
+	* l10nflist.c: Solve some portability problems.  Patches partly by
+	Thomas Esken.  Add local definition of stpcpy.
+
+Tue Jun  4 02:47:49 1996  Ulrich Drepper  <drepper@cygnus.com>
+
+	* intlh.inst.in: Don't depend including <locale.h> on
+	HAVE_LOCALE_H.  Instead configure must rewrite this fiile
+	depending on the result of the configure run.
+
+	* Makefile.in (install): libintl.inst is now called intlh.inst.
+	Add rules for updating intlh.inst from intlh.inst.in.
+
+	* libintl.inst: Renamed to intlh.inst.in.
+
+	* localealias.c, dcgettext.c [__GNUC__]: Define HAVE_ALLOCA to 1
+        because gcc has __buitlin_alloca.
+	Reported by Roland McGrath.
+
+Mon Jun  3 00:32:16 1996  Ulrich Drepper  <drepper@cygnus.com>
+
+	* Makefile.in (installcheck): New goal to fulfill needs of
+        automake's distcheck.
+
+	* Makefile.in (install): Reorder commands so that VERSION is
+        found.
+
+	* Makefile.in (gettextsrcdir): Now use subdirectory intl/ in
+        @datadir@/gettext.
+	(COMSRCS): Add l10nfile.c.
+	(OBJECTS): Add l10nfile.o.
+	(DISTFILES): Rename to DISTFILE.normal.  Remove $(DISTFILES.common).
+	(DISTFILE.gettext): Remove $(DISTFILES.common).
+	(all-gettext): Remove goal.
+	(install): If $(PACKAGE) = gettext install, otherwose do nothing.  No
+	package but gettext itself should install libintl.h + headers.
+	(dist): Extend goal to work for gettext, too.
+	(dist-gettext): Remove goal.
+
+	* dcgettext.c [!HAVE_ALLOCA]: Define macro alloca by using malloc.
+
+Sun Jun  2 17:33:06 1996  Ulrich Drepper  <drepper@cygnus.com>
+
+	* loadmsgcat.c (_nl_load_domain): Parameter is now comes from
+        find_l10nfile.
+
+Sat Jun  1 02:23:03 1996  Ulrich Drepper  <drepper@cygnus.com>
+
+	* l10nflist.c (__argz_next): Add definition.
+
+	* dcgettext.c [!HAVE_ALLOCA]: Add code for handling missing alloca
+	code.  Use new l10nfile handling.
+
+	* localealias.c [!HAVE_ALLOCA]: Add code for handling missing
+        alloca code.
+
+	* l10nflist.c: Initial revision.
+
+Tue Apr  2 18:51:18 1996  Ulrich Drepper  <drepper@myware>
+
+	* Makefile.in (all-gettext): New goal.  Same as all-yes.
+
+Thu Mar 28 23:01:22 1996  Karl Eichwalder  <ke@ke.central.de>
+
+	* Makefile.in (gettextsrcdir): Define using @datadir@.
+
+Tue Mar 26 12:39:14 1996  Ulrich Drepper  <drepper@myware>
+
+	* finddomain.c: Include <ctype.h>.  Reported by Roland McGrath.
+
+Sat Mar 23 02:00:35 1996  Ulrich Drepper  <drepper@myware>
+
+	* finddomain.c (stpcpy): Rename to stpcpy__ to prevent clashing
+        with external declaration.
+
+Sat Mar  2 00:47:09 1996  Ulrich Drepper  <drepper@myware>
+
+	* Makefile.in (all-no): Rename from all_no.
+
+Sat Feb 17 00:25:59 1996  Ulrich Drepper  <drepper@myware>
+
+	* gettextP.h [loaded_domain]: Array `successor' must now contain up
+        to 63 elements (because of codeset name normalization).
+
+	* finddomain.c: Implement codeset name normalization.
+
+Thu Feb 15 04:39:09 1996  Ulrich Drepper  <drepper@myware>
+
+	* Makefile.in (all): Define to `all-@USE_NLS@'.
+	(all-yes, all_no): New goals.  `all-no' is noop, `all-yes'
+	is former all.
+
+Mon Jan 15 21:46:01 1996  Howard Gayle  <howard@hal.com>
+
+	* localealias.c (alias_compare): Increment string pointers in loop
+        of strcasecmp replacement.
+
+Fri Dec 29 21:16:34 1995  Ulrich Drepper  <drepper@myware>
+
+	* Makefile.in (install-src): Who commented this goal out ? :-)
+
+Fri Dec 29 15:08:16 1995  Ulrich Drepper  <drepper@myware>
+
+	* dcgettext.c (DCGETTEXT): Save `errno'.  Failing system calls
+	should not effect it because a missing catalog is no error.
+	Reported by Harald K<o:>nig <koenig@tat.physik.uni-tuebingen.de>.
+
+Tue Dec 19 22:09:13 1995  Ulrich Drepper  <drepper@myware>
+
+	* Makefile.in (Makefile): Explicitly use $(SHELL) for running
+        shell scripts.
+
+Fri Dec 15 17:34:59 1995  Andreas Schwab  <schwab@issan.informatik.uni-dortmund.de>
+
+	* Makefile.in (install-src): Only install library and header when
+	we use the own implementation.  Don't do it when using the
+	system's gettext or catgets functions.
+
+	* dcgettext.c (find_msg): Must not swap domain->hash_size here.
+
+Sat Dec  9 16:24:37 1995  Ulrich Drepper  <drepper@myware>
+
+	* localealias.c, libintl.inst, libgettext.h, hash-string.h,
+	gettextP.h, finddomain.c, dcgettext.c, cat-compat.c:
+	Use PARAMS instead of __P.  Suggested by Roland McGrath.
+
+Tue Dec  5 11:39:14 1995  Larry Schwimmer  <rosebud@cyclone.stanford.edu>
+
+	* libgettext.h: Use `#if !defined (_LIBINTL_H)' instead of `#if
+	!_LIBINTL_H' because Solaris defines _LIBINTL_H as empty.
+
+Mon Dec  4 15:42:07 1995  Ulrich Drepper  <drepper@myware>
+
+	* Makefile.in (install-src):
+	Install libintl.inst instead of libintl.h.install.
+
+Sat Dec  2 22:51:38 1995  Marcus Daniels  <marcus@sysc.pdx.edu>
+
+	* cat-compat.c (textdomain):
+	Reverse order in which files are tried you load.  First
+	try local file, when this failed absolute path.
+
+Wed Nov 29 02:03:53 1995  Nelson H. F. Beebe  <beebe@math.utah.edu>
+
+	* cat-compat.c (bindtextdomain): Add missing { }.
+
+Sun Nov 26 18:21:41 1995  Ulrich Drepper  <drepper@myware>
+
+	* libintl.inst: Add missing __P definition.  Reported by Nelson Beebe.
+
+	* Makefile.in:
+	Add dummy `all' and `dvi' goals.  Reported by Tom Tromey.
+
+Sat Nov 25 16:12:01 1995  Franc,ois Pinard  <pinard@iro.umontreal.ca>
+
+	* hash-string.h: Capitalize arguments of macros.
+
+Sat Nov 25 12:01:36 1995  Ulrich Drepper  <drepper@myware>
+
+	* Makefile.in (DISTFILES): Prevent files names longer than 13
+	characters.  libintl.h.glibc->libintl.glibc,
+	libintl.h.install->libintl.inst.  Reported by Joshua R. Poulson.
+
+Sat Nov 25 11:31:12 1995  Eric Backus  <ericb@lsid.hp.com>
+
+	* dcgettext.c: Fix bug in preprocessor conditionals.
+
+Sat Nov 25 02:35:27 1995  Nelson H. F. Beebe  <beebe@math.utah.edu>
+
+	* libgettext.h: Solaris cc does not understand
+	 #if !SYMBOL1 && !SYMBOL2.  Sad	but true.
+
+Thu Nov 23 16:22:14 1995  Ulrich Drepper  <drepper@myware>
+
+	* hash-string.h (hash_string):
+	Fix for machine with >32 bit `unsigned long's.
+
+	* dcgettext.c (DCGETTEXT):
+	Fix horrible bug in loop for alternative translation.
+
+Thu Nov 23 01:45:29 1995  Ulrich Drepper  <drepper@myware>
+
+	* po2tbl.sed.in, linux-msg.sed, xopen-msg.sed:
+	Some further simplifications in message number generation.
+
+Mon Nov 20 21:08:43 1995  Ulrich Drepper  <drepper@myware>
+
+	* libintl.h.glibc: Use __const instead of const in prototypes.
+
+	* Makefile.in (install-src):
+	Install libintl.h.install instead of libintl.h.  This
+	is a stripped-down version.  Suggested by Peter Miller.
+
+	* libintl.h.install, libintl.h.glibc: Initial revision.
+
+	* localealias.c (_nl_expand_alias, read_alias_file):
+	Protect prototypes in type casts by __P.
+
+Tue Nov 14 16:43:58 1995  Ulrich Drepper  <drepper@myware>
+
+	* hash-string.h: Correct prototype for hash_string.
+
+Sun Nov 12 12:42:30 1995  Ulrich Drepper  <drepper@myware>
+
+	* hash-string.h (hash_string): Add prototype.
+
+	* gettextP.h: Fix copyright.
+	(SWAP): Add prototype.
+
+Wed Nov  8 22:56:33 1995  Ulrich Drepper  <drepper@myware>
+
+	* localealias.c (read_alias_file): Forgot sizeof.
+	Avoid calling *printf function.  This introduces a big overhead.
+	Patch by Roland McGrath.
+
+Tue Nov  7 14:21:08 1995  Ulrich Drepper  <drepper@myware>
+
+	* finddomain.c, cat-compat.c: Wrong indentation in #if for stpcpy.
+
+	* finddomain.c (stpcpy):
+	Define substitution function local.  The macro was to flaky.
+
+	* cat-compat.c: Fix typo.
+
+	* xopen-msg.sed, linux-msg.sed:
+	While bringing message number to right place only accept digits.
+
+	* linux-msg.sed, xopen-msg.sed: Now that the counter does not have
+	leading 0s we don't need to remove them.  Reported by Marcus
+	Daniels.
+
+	* Makefile.in (../po/cat-id-tbl.o): Use $(top_srdir) in
+	dependency.  Reported by Marcus Daniels.
+
+	* cat-compat.c: (stpcpy) [!_LIBC && !HAVE_STPCPY]: Define replacement.
+	Generally cleanup using #if instead of #ifndef.
+
+	* Makefile.in: Correct typos in comment.  By Franc,ois Pinard.
+
+Mon Nov  6 00:27:02 1995  Ulrich Drepper  <drepper@myware>
+
+	* Makefile.in (install-src): Don't install libintl.h and libintl.a
+	if we use an available gettext implementation.
+
+Sun Nov  5 22:02:08 1995  Ulrich Drepper  <drepper@myware>
+
+	* libgettext.h: Fix typo: HAVE_CATGETTS -> HAVE_CATGETS.  Reported
+	by Franc,ois Pinard.
+
+	* libgettext.h: Use #if instead of #ifdef/#ifndef.
+
+	* finddomain.c:
+	Comments describing what has to be done should start with FIXME.
+
+Sun Nov  5 19:38:01 1995  Ulrich Drepper  <drepper@myware>
+
+	* Makefile.in (DISTFILES): Split.  Use DISTFILES with normal meaning.
+	DISTFILES.common names the files common to both dist goals.
+	DISTFILES.gettext are the files only distributed in GNU gettext.
+
+Sun Nov  5 17:32:54 1995  Ulrich Drepper  <drepper@myware>
+
+	* dcgettext.c (DCGETTEXT): Correct searching in derived locales.
+	This was necessary since a change in _nl_find_msg several weeks
+	ago.  I really don't know this is still not fixed.
+
+Sun Nov  5 12:43:12 1995  Ulrich Drepper  <drepper@myware>
+
+	* loadmsgcat.c (_nl_load_domain): Test for FILENAME == NULL.  This
+	might mark a special condition.
+
+	* finddomain.c (make_entry_rec): Don't make illegal entry as decided.
+
+	* Makefile.in (dist): Suppress error message when ln failed.
+	Get files from $(srcdir) explicitly.
+
+	* libgettext.h (gettext_const): Rename to gettext_noop.
+
+Fri Nov  3 07:36:50 1995  Ulrich Drepper  <drepper@myware>
+
+	* finddomain.c (make_entry_rec):
+	Protect against wrong locale names by testing mask.
+
+	* libgettext.h (gettext_const): Add macro definition.
+	Capitalize macro arguments.
+
+Thu Nov  2 23:15:51 1995  Ulrich Drepper  <drepper@myware>
+
+	* finddomain.c (_nl_find_domain):
+	Test for pointer != NULL before accessing value.
+	Reported by Tom Tromey.
+
+	* gettext.c (NULL):
+	Define as (void*)0 instad of 0.  Reported by Franc,ois Pinard.
+
+Mon Oct 30 21:28:52 1995  Ulrich Drepper  <drepper@myware>
+
+	* po2tbl.sed.in: Serious typo bug fixed by Jim Meyering.
+
+Sat Oct 28 23:20:47 1995  Ulrich Drepper  <drepper@myware>
+
+	* libgettext.h: Disable dcgettext optimization for Solaris 2.3.
+
+	* localealias.c (alias_compare):
+	Peter Miller reported that tolower in some systems is
+	even dumber than I thought.  Protect call by `isupper'.
+
+Fri Oct 27 22:22:51 1995  Ulrich Drepper  <drepper@myware>
+
+	* Makefile.in (libdir, includedir): New variables.
+	(install-src): Install libintl.a and libintl.h in correct dirs.
+
+Fri Oct 27 22:07:29 1995  Ulrich Drepper  <drepper@myware>
+
+	* Makefile.in (SOURCES): Fix typo: intrl.compat.c -> intl-compat.c.
+
+	* po2tbl.sed.in: Patch for buggy SEDs by Christian von Roques.
+
+	* localealias.c:
+	Fix typo and superflous test.  Reported by Christian von Roques.
+
+Fri Oct  6 11:52:05 1995  Ulrich Drepper  <drepper@myware>
+
+	* finddomain.c (_nl_find_domain):
+	Correct some remainder from the pre-CEN syntax.  Now
+	we don't have a constant number of successors anymore.
+
+Wed Sep 27 21:41:13 1995  Ulrich Drepper  <drepper@myware>
+
+	* Makefile.in (DISTFILES): Add libintl.h.glibc.
+
+	* Makefile.in (dist-libc): Add goal for packing sources for glibc.
+	(COMSRCS, COMHDRS): Splitted to separate sources shared with glibc.
+
+	* loadmsgcat.c: Forget to continue #if line.
+
+	* localealias.c:
+	[_LIBC]: Rename strcasecmp to __strcasecmp to keep ANSI C name
+	space clean.
+
+	* dcgettext.c, finddomain.c: Better comment to last change.
+
+	* loadmsgcat.c:
+	[_LIBC]: Rename fstat, open, close, read, mmap, and munmap to
+	__fstat, __open, __close, __read, __mmap, and __munmap resp
+	to keep ANSI C name space clean.
+
+	* finddomain.c:
+	[_LIBC]: Rename stpcpy to __stpcpy to keep ANSI C name space clean.
+
+	* dcgettext.c:
+	[_LIBC]: Rename getced and stpcpy to __getcwd and __stpcpy resp to
+	keep ANSI C name space clean.
+
+	* libgettext.h:
+	Include sys/types.h for those old SysV systems out there.
+	Reported by Francesco Potorti`.
+
+	* loadmsgcat.c (use_mmap): Define if compiled for glibc.
+
+	* bindtextdom.c: Include all those standard headers
+	unconditionally if _LIBC is defined.
+
+	* finddomain.c: Fix 2 times defiend -> defined.
+
+	* textdomain.c: Include libintl.h instead of libgettext.h when
+	compiling for glibc.  Include all those standard headers
+	unconditionally if _LIBC is defined.
+
+	* localealias.c, loadmsgcat.c: Prepare to be compiled in glibc.
+
+	* gettext.c:
+	Include libintl.h instead of libgettext.h when compiling for glibc.
+	Get NULL from stddef.h if we compile for glibc.
+
+	* finddomain.c: Include libintl.h instead of libgettext.h when
+	compiling for glibc.  Include all those standard headers
+	unconditionally if _LIBC is defined.
+
+	* dcgettext.c: Include all those standard headers unconditionally
+	if _LIBC is defined.
+
+	* dgettext.c: If compiled in glibc include libintl.h instead of
+	libgettext.h.
+	(locale.h): Don't rely on HAVE_LOCALE_H when compiling for glibc.
+
+	* dcgettext.c: If compiled in glibc include libintl.h instead of
+	libgettext.h.
+	(getcwd): Don't rely on HAVE_GETCWD when compiling for glibc.
+
+	* bindtextdom.c:
+	If compiled in glibc include libintl.h instead of libgettext.h.
+
+Mon Sep 25 22:23:06 1995  Ulrich Drepper  <drepper@myware>
+
+	* localealias.c (_nl_expand_alias): Don't call bsearch if NMAP <= 0.
+	Reported by Marcus Daniels.
+
+	* cat-compat.c (bindtextdomain):
+	String used in putenv must not be recycled.
+	Reported by Marcus Daniels.
+
+	* libgettext.h (__USE_GNU_GETTEXT):
+	Additional symbol to signal that we use GNU gettext
+	library.
+
+	* cat-compat.c (bindtextdomain):
+	Fix bug with the strange stpcpy replacement.
+	Reported by Nelson Beebe.
+
+Sat Sep 23 08:23:51 1995  Ulrich Drepper  <drepper@myware>
+
+	* cat-compat.c: Include <string.h> for stpcpy prototype.
+
+	* localealias.c (read_alias_file):
+	While expand strdup code temporary variable `cp' hided
+	higher level variable with same name.  Rename to `tp'.
+
+	* textdomain.c (textdomain):
+	Avoid warning by using temporary variable in strdup code.
+
+	* finddomain.c (_nl_find_domain): Remove unused variable `application'.
+
+Thu Sep 21 15:51:44 1995  Ulrich Drepper  <drepper@myware>
+
+	* localealias.c (alias_compare):
+	Use strcasecmp() only if available.  Else use
+	implementation in place.
+
+	* intl-compat.c:
+	Wrapper functions now call *__ functions instead of __*.
+
+	* libgettext.h: Declare prototypes for *__ functions instead for __*.
+
+	* cat-compat.c, loadmsgcat.c:
+	Don't use xmalloc, xstrdup, and stpcpy.  These functions are not part
+	of the standard libc and so prevent libintl.a from being used
+	standalone.
+
+	* bindtextdom.c:
+	Don't use xmalloc, xstrdup, and stpcpy.  These functions are not part
+	of the standard libc and so prevent libintl.a from being used
+	standalone.
+	Rename to bindtextdomain__ if not used in GNU C Library.
+
+	* dgettext.c:
+	Rename function to dgettext__ if not used in GNU C Library.
+
+	* gettext.c:
+	Don't use xmalloc, xstrdup, and stpcpy.  These functions are not part
+	of the standard libc and so prevent libintl.a from being used
+	standalone.
+	Functions now called gettext__ if not used in GNU C Library.
+
+	* dcgettext.c, localealias.c, textdomain.c, finddomain.c:
+	Don't use xmalloc, xstrdup, and stpcpy.  These functions are not part
+	of the standard libc and so prevent libintl.a from being used
+	standalone.
+
+Sun Sep 17 23:14:49 1995  Ulrich Drepper  <drepper@myware>
+
+	* finddomain.c: Correct some bugs in handling of CEN standard
+ 	locale definitions.
+
+Thu Sep  7 01:49:28 1995  Ulrich Drepper  <drepper@myware>
+
+	* finddomain.c: Implement CEN syntax.
+
+	* gettextP.h (loaded_domain): Extend number of successors to 31.
+
+Sat Aug 19 19:25:29 1995  Ulrich Drepper  <drepper@myware>
+
+	* Makefile.in (aliaspath): Remove path to X11 locale dir.
+
+	* Makefile.in: Make install-src depend on install.  This helps
+ 	gettext to install the sources and other packages can use the
+ 	install goal.
+
+Sat Aug 19 15:19:33 1995  Ulrich Drepper  <drepper@myware>
+
+	* Makefile.in (uninstall): Remove stuff installed by install-src.
+
+Tue Aug 15 13:13:53 1995  Ulrich Drepper  <drepper@myware>
+
+	* VERSION.in: Initial revision.
+
+	* Makefile.in (DISTFILES):
+	Add VERSION file.  This is not necessary for gettext, but
+	for other packages using this library.
+
+Tue Aug 15 06:16:44 1995  Ulrich Drepper  <drepper@myware>
+
+	* gettextP.h (_nl_find_domain):
+	New prototype after changing search strategy.
+
+	* finddomain.c (_nl_find_domain):
+	We now try only to find a specified catalog.  Fall back to other
+	catalogs listed in the locale list is now done in __dcgettext.
+
+	* dcgettext.c (__dcgettext):
+	Now we provide message fall back even to different languages.
+	I.e. if a message is not available in one language all the other
+ 	in the locale list a tried.  Formerly fall back was only possible
+ 	within one language.  Implemented by moving one loop from
+ 	_nl_find_domain to here.
+
+Mon Aug 14 23:45:50 1995  Ulrich Drepper  <drepper@myware>
+
+	* Makefile.in (gettextsrcdir):
+	Directory where source of GNU gettext library are made
+	available.
+	(INSTALL, INSTALL_DATA): Programs used for installing sources.
+	(gettext-src): New.  Rule to install GNU gettext sources for use in
+	gettextize shell script.
+
+Sun Aug 13 14:40:48 1995  Ulrich Drepper  <drepper@myware>
+
+	* loadmsgcat.c (_nl_load_domain):
+	Use mmap for loading only when munmap function is
+	also available.
+
+	* Makefile.in (install): Depend on `all' goal.
+
+Wed Aug  9 11:04:33 1995  Ulrich Drepper  <drepper@myware>
+
+	* localealias.c (read_alias_file):
+	Do not overwrite '\n' when terminating alias value string.
+
+	* localealias.c (read_alias_file):
+	Handle long lines.  Ignore the rest not fitting in
+	the buffer after the initial `fgets' call.
+
+Wed Aug  9 00:54:29 1995  Ulrich Drepper  <drepper@myware>
+
+	* gettextP.h (_nl_load_domain):
+	Add prototype, replacing prototype for _nl_load_msg_cat.
+
+	* finddomain.c (_nl_find_domain):
+	Remove unneeded variable filename and filename_len.
+	(expand_alias): Remove prototype because functions does not
+ 	exist anymore.
+
+	* localealias.c (read_alias_file):
+	Change type of fname_len parameter to int.
+	(xmalloc): Add prototype.
+
+	* loadmsgcat.c: Better prototypes for xmalloc.
+
+Tue Aug  8 22:30:39 1995  Ulrich Drepper  <drepper@myware>
+
+	* finddomain.c (_nl_find_domain):
+	Allow alias name to be constructed from the four components.
+
+	* Makefile.in (aliaspath): New variable.  Set to preliminary value.
+	(SOURCES): Add localealias.c.
+	(OBJECTS): Add localealias.o.
+
+	* gettextP.h: Add prototype for _nl_expand_alias.
+
+	* finddomain.c: Aliasing handled in intl/localealias.c.
+
+	* localealias.c: Aliasing for locale names.
+
+	* bindtextdom.c: Better prototypes for xmalloc and xstrdup.
+
+Mon Aug  7 23:47:42 1995  Ulrich Drepper  <drepper@myware>
+
+	* Makefile.in (DISTFILES): gettext.perl is now found in misc/.
+
+	* cat-compat.c (bindtextdomain):
+	Correct implementation.  dirname parameter was not used.
+	Reported by Marcus Daniels.
+
+	* gettextP.h (loaded_domain):
+	New fields `successor' and `decided' for oo, lazy
+	message handling implementation.
+
+	* dcgettext.c:
+	Adopt for oo, lazy message handliing.
+  	Now we can inherit translations from less specific locales.
+	(find_msg): New function.
+
+	* loadmsgcat.c, finddomain.c:
+	Complete rewrite.  Implement oo, lazy message handling :-).
+  	We now have an additional environment variable `LANGUAGE' with
+ 	a higher priority than LC_ALL for the LC_MESSAGE locale.
+  	Here we can set a colon separated list of specifications each
+ 	of the form `language[_territory[.codeset]][@modifier]'.
+
+Sat Aug  5 09:55:42 1995  Ulrich Drepper  <drepper@myware>
+
+	* finddomain.c (unistd.h):
+	Include to get _PC_PATH_MAX defined on system having it.
+
+Fri Aug  4 22:42:00 1995  Ulrich Drepper  <drepper@myware>
+
+	* finddomain.c (stpcpy): Include prototype.
+
+	* Makefile.in (dist): Remove `copying instead' message.
+
+Wed Aug  2 18:52:03 1995  Ulrich Drepper  <drepper@myware>
+
+	* Makefile.in (ID, TAGS): Do not use $^.
+
+Tue Aug  1 20:07:11 1995  Ulrich Drepper  <drepper@myware>
+
+	* Makefile.in (TAGS, ID): Use $^ as command argument.
+	(TAGS): Give etags -o option t write to current directory,
+ 	not $(srcdir).
+	(ID): Use $(srcdir) instead os $(top_srcdir)/src.
+	(distclean): Remove ID.
+
+Sun Jul 30 11:51:46 1995  Ulrich Drepper  <drepper@myware>
+
+	* Makefile.in (gnulocaledir):
+	New variable, always using share/ for data directory.
+	(DEFS): Add GNULOCALEDIR, used in finddomain.c.
+
+	* finddomain.c (_nl_default_dirname):
+	Set to GNULOCALEDIR, because it always has to point
+	to the directory where GNU gettext Library writes it to.
+
+	* intl-compat.c (textdomain, bindtextdomain):
+	Undefine macros before function definition.
+
+Sat Jul 22 01:10:02 1995  Ulrich Drepper  <drepper@myware>
+
+	* libgettext.h (_LIBINTL_H):
+	Protect definition in case where this file is included as
+	libgettext.h on Solaris machines.  Add comment about this.
+
+Wed Jul 19 02:36:42 1995  Ulrich Drepper  <drepper@myware>
+
+	* intl-compat.c (textdomain): Correct typo.
+
+Wed Jul 19 01:51:35 1995  Ulrich Drepper  <drepper@myware>
+
+	* dcgettext.c (dcgettext): Function now called __dcgettext.
+
+	* dgettext.c (dgettext): Now called __dgettext and calls
+ 	__dcgettext.
+
+	* gettext.c (gettext):
+	Function now called __gettext and calls __dgettext.
+
+	* textdomain.c (textdomain): Function now called __textdomain.
+
+	* bindtextdom.c (bindtextdomain): Function now called
+ 	__bindtextdomain.
+
+	* intl-compat.c: Initial revision.
+
+	* Makefile.in (SOURCES): Add intl-compat.c.
+	(OBJECTS): We always compile the GNU gettext library functions.
+  	OBJECTS contains all objects but cat-compat.o, ../po/cat-if-tbl.o,
+ 	and intl-compat.o.
+  	(GETTOBJS): Contains now only intl-compat.o.
+
+	* libgettext.h:
+	Re-include protection matches dualistic character of libgettext.h.
+	For all functions in GNU gettext library define __ counter part.
+
+	* finddomain.c (strchr): Define as index if not found in C library.
+	(_nl_find_domain): For relative paths paste / in between.
+
+Tue Jul 18 16:37:45 1995  Ulrich Drepper  <drepper@myware>
+
+	* loadmsgcat.c, finddomain.c: Add inclusion of sys/types.h.
+
+	* xopen-msg.sed: Fix bug with `msgstr ""' lines.
+	A little bit better comments.
+
+Tue Jul 18 01:18:27 1995  Ulrich Drepper  <drepper@myware>
+
+	* Makefile.in:
+	po-mode.el, makelinks, combine-sh are now found in ../misc.
+
+	* po-mode.el, makelinks, combine-sh, elisp-comp:
+	Moved to ../misc/.
+
+	* libgettext.h, gettextP.h, gettext.h: Uniform test for __STDC__.
+
+Sun Jul 16 22:33:02 1995  Ulrich Drepper  <drepper@myware>
+
+	* Makefile.in (INSTALL, INSTALL_DATA): New variables.
+	(install-data, uninstall): Install/uninstall .elc file.
+
+	* po-mode.el (Installation comment):
+	Add .pox as possible extension of .po files.
+
+Sun Jul 16 13:23:27 1995  Ulrich Drepper  <drepper@myware>
+
+	* elisp-comp: Complete new version by Franc,ois: This does not
+ 	fail when not compiling in the source directory.
+
+Sun Jul 16 00:12:17 1995  Ulrich Drepper  <drepper@myware>
+
+	* Makefile.in (../po/cat-id-tbl.o):
+	Use $(MAKE) instead of make for recursive make.
+
+	* Makefile.in (.el.elc): Use $(SHELL) instead of /bin/sh.
+	(install-exec): Add missing dummy goal.
+	(install-data, uninstall): @ in multi-line shell command at
+ 	beginning, not in front of echo.  Reported by Eric Backus.
+
+Sat Jul 15 00:21:28 1995  Ulrich Drepper  <drepper@myware>
+
+	* Makefile.in (DISTFILES):
+	Rename libgettext.perl to gettext.perl to fit in 14 chars
+	file systems.
+
+	* gettext.perl:
+ 	Rename to gettext.perl to fit in 14 chars file systems.
+
+Thu Jul 13 23:17:20 1995  Ulrich Drepper  <drepper@myware>
+
+	* cat-compat.c: If !STDC_HEADERS try to include malloc.h.
+
+Thu Jul 13 20:55:02 1995  Ulrich Drepper  <drepper@myware>
+
+	* po2tbl.sed.in: Pretty printing.
+
+	* linux-msg.sed, xopen-msg.sed:
+	Correct bugs with handling substitute flags in branches.
+
+	* hash-string.h (hash_string):
+	Old K&R compilers don't under stand `unsigned char'.
+
+	* gettext.h (nls_uint32):
+	Some old K&R compilers (eg HP) don't understand `unsigned int'.
+
+	* cat-compat.c (msg_to_cat_id): De-ANSI-fy prototypes.
+
+Thu Jul 13 01:34:33 1995  Ulrich Drepper  <drepper@myware>
+
+	* Makefile.in (ELCFILES): New variable.
+	(DISTFILES): Add elisp-comp.
+	Add implicit rule for .el -> .elc compilation.
+	(install-data): install $ELCFILES
+	(clean): renamed po-to-tbl and po-to-msg to po2tbl and po2msg resp.
+
+	* elisp-comp: Initial revision
+
+Wed Jul 12 16:14:52 1995  Ulrich Drepper  <drepper@myware>
+
+	* Makefile.in:
+	cat-id-tbl.c is now found in po/.  This enables us to use an identical
+	intl/ directory in all packages.
+
+	* dcgettext.c (dcgettext): hashing does not work for table size <= 2.
+
+	* textdomain.c: fix typo (#if def -> #if defined)
+
+Tue Jul 11 18:44:43 1995  Ulrich Drepper  <drepper@myware>
+
+	* Makefile.in (stamp-cat-id): use top_srcdir to address source files
+	(DISTFILES,distclean): move tupdate.perl to src/
+
+	* po-to-tbl.sed.in:
+	add additional jump to clear change flag to recognize multiline strings
+
+Tue Jul 11 01:32:50 1995  Ulrich Drepper  <drepper@myware>
+
+	* textdomain.c: Protect inclusion of stdlib.h and string.h.
+
+	* loadmsgcat.c: Protect inclusion of stdlib.h.
+
+	* libgettext.h: Protect inclusion of locale.h.
+	Allow use in C++ programs.
+	Define NULL is not happened already.
+
+	* Makefile.in (DISTFILES): ship po-to-tbl.sed.in instead of
+	po-to-tbl.sed.
+	(distclean): remove po-to-tbl.sed and tupdate.perl.
+
+	* tupdate.perl.in: Substitute Perl path even in exec line.
+	Don't include entries without translation from old .po file.
+
+Tue Jul  4 00:41:51 1995  Ulrich Drepper  <drepper@myware>
+
+	* tupdate.perl.in: use "Updated: " in msgid "".
+
+	* cat-compat.c: Fix typo (LOCALDIR -> LOCALEDIR).
+ 	Define getenv if !__STDC__.
+
+	* bindtextdom.c: Protect stdlib.h and string.h inclusion.
+ 	Define free if !__STDC__.
+
+	* finddomain.c: Change DEF_MSG_DOM_DIR to LOCALEDIR.
+ 	Define free if !__STDC__.
+
+	* cat-compat.c: Change DEF_MSG_DOM_DIR to LOCALEDIR.
+
+Mon Jul  3 23:56:30 1995  Ulrich Drepper  <drepper@myware>
+
+	* Makefile.in: Use LOCALEDIR instead of DEF_MSG_DOM_DIR.
+	Remove unneeded $(srcdir) from Makefile.in dependency.
+
+	* makelinks: Add copyright and short description.
+
+	* po-mode.el: Last version for 0.7.
+
+	* tupdate.perl.in: Fix die message.
+
+	* dcgettext.c: Protect include of string.h.
+
+	* gettext.c: Protect include of stdlib.h and further tries to get NULL.
+
+	* finddomain.c: Some corrections in includes.
+
+	* Makefile.in (INCLUDES): Prune list correct path to Makefile.in.
+
+	* po-to-tbl.sed: Adopt for new .po file format.
+
+	* linux-msg.sed, xopen-msg.sed: Adopt for new .po file format.
+
+Sun Jul  2 23:55:03 1995  Ulrich Drepper  <drepper@myware>
+
+	* tupdate.perl.in: Complete rewrite for new .po file format.
+
+Sun Jul  2 02:06:50 1995  Ulrich Drepper  <drepper@myware>
+
+	* First official release.  This directory contains all the code
+	needed to internationalize own packages.  It provides functions
+	which allow to use the X/Open catgets function with an interface
+	like the Uniforum gettext function.  For system which does not
+	have neither of those a complete implementation is provided.
diff --git a/intl/Makefile.in b/intl/Makefile.in
new file mode 100644
index 0000000..4bdb186
--- /dev/null
+++ b/intl/Makefile.in
@@ -0,0 +1,214 @@
+# Makefile for directory with message catalog handling in GNU NLS Utilities.
+# Copyright (C) 1995, 1996, 1997 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+
+PACKAGE = @PACKAGE@
+VERSION = @VERSION@
+
+SHELL = /bin/sh
+
+srcdir = @srcdir@
+top_srcdir = @top_srcdir@
+top_builddir = ..
+VPATH = @srcdir@
+
+prefix = @prefix@
+exec_prefix = @exec_prefix@
+transform = @program_transform_name@
+libdir = $(exec_prefix)/lib
+includedir = $(prefix)/include
+datadir = $(prefix)/@DATADIRNAME@
+localedir = $(datadir)/locale
+gnulocaledir = $(prefix)/share/locale
+gettextsrcdir = @datadir@/gettext/intl
+aliaspath = $(localedir):.
+subdir = intl
+
+INSTALL = @INSTALL@
+INSTALL_DATA = @INSTALL_DATA@
+MKINSTALLDIRS = @MKINSTALLDIRS@
+
+l = @l@
+
+AR = ar
+CC = @CC@
+LIBTOOL = @LIBTOOL@
+RANLIB = @RANLIB@
+
+DEFS = -DLOCALEDIR=\"$(localedir)\" -DGNULOCALEDIR=\"$(gnulocaledir)\" \
+-DLOCALE_ALIAS_PATH=\"$(aliaspath)\" @DEFS@
+CPPFLAGS = @CPPFLAGS@
+CFLAGS = @CFLAGS@
+LDFLAGS = @LDFLAGS@
+
+COMPILE = $(CC) -c $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS) $(XCFLAGS)
+
+HEADERS = $(COMHDRS) libgettext.h loadinfo.h
+COMHDRS = gettext.h gettextP.h hash-string.h
+SOURCES = $(COMSRCS) intl-compat.c cat-compat.c
+COMSRCS = bindtextdom.c dcgettext.c dgettext.c gettext.c \
+finddomain.c loadmsgcat.c localealias.c textdomain.c l10nflist.c \
+explodename.c
+OBJECTS = @INTLOBJS@ bindtextdom.$lo dcgettext.$lo dgettext.$lo gettext.$lo \
+finddomain.$lo loadmsgcat.$lo localealias.$lo textdomain.$lo l10nflist.$lo \
+explodename.$lo
+CATOBJS = cat-compat.$lo ../po/cat-id-tbl.$lo
+GETTOBJS = intl-compat.$lo
+DISTFILES.common = ChangeLog Makefile.in linux-msg.sed po2tbl.sed.in \
+xopen-msg.sed $(HEADERS) $(SOURCES)
+DISTFILES.normal = VERSION
+DISTFILES.gettext = libintl.glibc intlh.inst.in
+
+.SUFFIXES:
+.SUFFIXES: .c .o .lo
+.c.o:
+	$(COMPILE) $<
+.c.lo:
+	$(LIBTOOL) --mode=compile $(COMPILE) $<
+
+INCLUDES = -I.. -I. -I$(top_srcdir)/intl -I$(top_srcdir)/lib
+
+all: all-@USE_INCLUDED_LIBINTL@
+
+all-yes: libintl.$la intlh.inst
+all-no:
+
+libintl.a: $(OBJECTS)
+	rm -f $@
+	$(AR) cru $@ $(OBJECTS)
+	$(RANLIB) $@
+
+libintl.la: $(OBJECTS)
+	$(LIBTOOL) --mode=link $(CC) $(LDFLAGS) -o $@ $(OBJECTS) \
+		   -version-info 1:0 -rpath $(libdir)
+
+../po/cat-id-tbl.$lo: ../po/cat-id-tbl.c $(top_srcdir)/po/$(PACKAGE).pot
+	cd ../po && $(MAKE) cat-id-tbl.$lo
+
+check: all
+
+# This installation goal is only used in GNU gettext.  Packages which
+# only use the library should use install instead.
+
+# We must not install the libintl.h/libintl.a files if we are on a
+# system which has the gettext() function in its C library or in a
+# separate library or use the catgets interface.  A special case is
+# where configure found a previously installed GNU gettext library.
+# If you want to use the one which comes with this version of the
+# package, you have to use `configure --with-included-gettext'.
+install: install-exec install-data
+install-exec: all
+	if test "$(PACKAGE)" = "gettext" \
+	   && test '@INTLOBJS@' = '$(GETTOBJS)'; then \
+	  if test -r $(MKINSTALLDIRS); then \
+	    $(MKINSTALLDIRS) $(libdir) $(includedir); \
+	  else \
+	    $(top_srcdir)/mkinstalldirs $(libdir) $(includedir); \
+	  fi; \
+	  $(INSTALL_DATA) intlh.inst $(includedir)/libintl.h; \
+	  $(INSTALL_DATA) libintl.a $(libdir)/libintl.a; \
+	else \
+	  : ; \
+	fi
+install-data: all
+	if test "$(PACKAGE)" = "gettext"; then \
+	  if test -r $(MKINSTALLDIRS); then \
+	    $(MKINSTALLDIRS) $(gettextsrcdir); \
+	  else \
+	    $(top_srcdir)/mkinstalldirs $(gettextsrcdir); \
+	  fi; \
+	  $(INSTALL_DATA) VERSION $(gettextsrcdir)/VERSION; \
+	  dists="$(DISTFILES.common)"; \
+	  for file in $$dists; do \
+	    $(INSTALL_DATA) $(srcdir)/$$file $(gettextsrcdir)/$$file; \
+	  done; \
+	else \
+	  : ; \
+	fi
+
+# Define this as empty until I found a useful application.
+installcheck:
+
+uninstall:
+	dists="$(DISTFILES.common)"; \
+	for file in $$dists; do \
+	  rm -f $(gettextsrcdir)/$$file; \
+	done
+
+info dvi:
+
+$(OBJECTS): ../config.h libgettext.h
+bindtextdom.$lo finddomain.$lo loadmsgcat.$lo: gettextP.h gettext.h loadinfo.h
+dcgettext.$lo: gettextP.h gettext.h hash-string.h loadinfo.h
+
+tags: TAGS
+
+TAGS: $(HEADERS) $(SOURCES)
+	here=`pwd`; cd $(srcdir) && etags -o $$here/TAGS $(HEADERS) $(SOURCES)
+
+id: ID
+
+ID: $(HEADERS) $(SOURCES)
+	here=`pwd`; cd $(srcdir) && mkid -f$$here/ID $(HEADERS) $(SOURCES)
+
+
+mostlyclean:
+	rm -f *.a *.o *.lo core core.*
+
+clean: mostlyclean
+
+distclean: clean
+	rm -f Makefile ID TAGS po2msg.sed po2tbl.sed
+
+maintainer-clean: distclean
+	@echo "This command is intended for maintainers to use;"
+	@echo "it deletes files that may require special tools to rebuild."
+
+
+# GNU gettext needs not contain the file `VERSION' but contains some
+# other files which should not be distributed in other packages.
+distdir = ../$(PACKAGE)-$(VERSION)/$(subdir)
+dist distdir: Makefile $(DISTFILES)
+	if test "$(PACKAGE)" = gettext; then \
+	  additional="$(DISTFILES.gettext)"; \
+	else \
+	  additional="$(DISTFILES.normal)"; \
+	fi; \
+	for file in $(DISTFILES.common) $$additional; do \
+	  ln $(srcdir)/$$file $(distdir) 2> /dev/null \
+	    || cp -p $(srcdir)/$$file $(distdir); \
+	done
+
+dist-libc:
+	tar zcvf intl-glibc.tar.gz $(COMSRCS) $(COMHDRS) libintl.h.glibc
+
+Makefile: Makefile.in ../config.status
+	cd .. \
+	  && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
+
+# The dependency for intlh.inst is different in gettext and all other
+# packages.  Because we cannot you GNU make features we have to solve
+# the problem while rewriting Makefile.in.
+@GT_YES@intlh.inst: intlh.inst.in ../config.status
+@GT_YES@	cd .. \
+@GT_YES@	&& CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= \
+@GT_YES@	  $(SHELL) ./config.status
+@GT_NO@.PHONY: intlh.inst
+@GT_NO@intlh.inst:
+
+# Tell versions [3.59,3.63) of GNU make not to export all variables.
+# Otherwise a system limit (for SysV at least) may be exceeded.
+.NOEXPORT:
diff --git a/intl/VERSION b/intl/VERSION
new file mode 100644
index 0000000..ee66b06
--- /dev/null
+++ b/intl/VERSION
@@ -0,0 +1 @@
+GNU gettext library from gettext-0.10.35
diff --git a/intl/bindtextdom.c b/intl/bindtextdom.c
new file mode 100644
index 0000000..d9c3f34
--- /dev/null
+++ b/intl/bindtextdom.c
@@ -0,0 +1,203 @@
+/* Implementation of the bindtextdomain(3) function
+   Copyright (C) 1995, 1996, 1997, 1998 Free Software Foundation, Inc.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 2, or (at your option)
+   any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software Foundation,
+   Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
+
+#ifdef HAVE_CONFIG_H
+# include <config.h>
+#endif
+
+#if defined STDC_HEADERS || defined _LIBC
+# include <stdlib.h>
+#else
+# ifdef HAVE_MALLOC_H
+#  include <malloc.h>
+# else
+void free ();
+# endif
+#endif
+
+#if defined HAVE_STRING_H || defined _LIBC
+# include <string.h>
+#else
+# include <strings.h>
+# ifndef memcpy
+#  define memcpy(Dst, Src, Num) bcopy (Src, Dst, Num)
+# endif
+#endif
+
+#ifdef _LIBC
+# include <libintl.h>
+#else
+# include "libgettext.h"
+#endif
+#include "gettext.h"
+#include "gettextP.h"
+
+/* @@ end of prolog @@ */
+
+/* Contains the default location of the message catalogs.  */
+extern const char _nl_default_dirname[];
+
+/* List with bindings of specific domains.  */
+extern struct binding *_nl_domain_bindings;
+
+
+/* Names for the libintl functions are a problem.  They must not clash
+   with existing names and they should follow ANSI C.  But this source
+   code is also used in GNU C Library where the names have a __
+   prefix.  So we have to make a difference here.  */
+#ifdef _LIBC
+# define BINDTEXTDOMAIN __bindtextdomain
+# ifndef strdup
+#  define strdup(str) __strdup (str)
+# endif
+#else
+# define BINDTEXTDOMAIN bindtextdomain__
+#endif
+
+/* Specify that the DOMAINNAME message catalog will be found
+   in DIRNAME rather than in the system locale data base.  */
+char *
+BINDTEXTDOMAIN (domainname, dirname)
+     const char *domainname;
+     const char *dirname;
+{
+  struct binding *binding;
+
+  /* Some sanity checks.  */
+  if (domainname == NULL || domainname[0] == '\0')
+    return NULL;
+
+  for (binding = _nl_domain_bindings; binding != NULL; binding = binding->next)
+    {
+      int compare = strcmp (domainname, binding->domainname);
+      if (compare == 0)
+	/* We found it!  */
+	break;
+      if (compare < 0)
+	{
+	  /* It is not in the list.  */
+	  binding = NULL;
+	  break;
+	}
+    }
+
+  if (dirname == NULL)
+    /* The current binding has be to returned.  */
+    return binding == NULL ? (char *) _nl_default_dirname : binding->dirname;
+
+  if (binding != NULL)
+    {
+      /* The domain is already bound.  If the new value and the old
+	 one are equal we simply do nothing.  Otherwise replace the
+	 old binding.  */
+      if (strcmp (dirname, binding->dirname) != 0)
+	{
+	  char *new_dirname;
+
+	  if (strcmp (dirname, _nl_default_dirname) == 0)
+	    new_dirname = (char *) _nl_default_dirname;
+	  else
+	    {
+#if defined _LIBC || defined HAVE_STRDUP
+	      new_dirname = strdup (dirname);
+	      if (new_dirname == NULL)
+		return NULL;
+#else
+	      size_t len = strlen (dirname) + 1;
+	      new_dirname = (char *) malloc (len);
+	      if (new_dirname == NULL)
+		return NULL;
+
+	      memcpy (new_dirname, dirname, len);
+#endif
+	    }
+
+	  if (binding->dirname != _nl_default_dirname)
+	    free (binding->dirname);
+
+	  binding->dirname = new_dirname;
+	}
+    }
+  else
+    {
+      /* We have to create a new binding.  */
+#if !defined _LIBC && !defined HAVE_STRDUP
+      size_t len;
+#endif
+      struct binding *new_binding =
+	(struct binding *) malloc (sizeof (*new_binding));
+
+      if (new_binding == NULL)
+	return NULL;
+
+#if defined _LIBC || defined HAVE_STRDUP
+      new_binding->domainname = strdup (domainname);
+      if (new_binding->domainname == NULL)
+	return NULL;
+#else
+      len = strlen (domainname) + 1;
+      new_binding->domainname = (char *) malloc (len);
+      if (new_binding->domainname == NULL)
+	return NULL;
+      memcpy (new_binding->domainname, domainname, len);
+#endif
+
+      if (strcmp (dirname, _nl_default_dirname) == 0)
+	new_binding->dirname = (char *) _nl_default_dirname;
+      else
+	{
+#if defined _LIBC || defined HAVE_STRDUP
+	  new_binding->dirname = strdup (dirname);
+	  if (new_binding->dirname == NULL)
+	    return NULL;
+#else
+	  len = strlen (dirname) + 1;
+	  new_binding->dirname = (char *) malloc (len);
+	  if (new_binding->dirname == NULL)
+	    return NULL;
+	  memcpy (new_binding->dirname, dirname, len);
+#endif
+	}
+
+      /* Now enqueue it.  */
+      if (_nl_domain_bindings == NULL
+	  || strcmp (domainname, _nl_domain_bindings->domainname) < 0)
+	{
+	  new_binding->next = _nl_domain_bindings;
+	  _nl_domain_bindings = new_binding;
+	}
+      else
+	{
+	  binding = _nl_domain_bindings;
+	  while (binding->next != NULL
+		 && strcmp (domainname, binding->next->domainname) > 0)
+	    binding = binding->next;
+
+	  new_binding->next = binding->next;
+	  binding->next = new_binding;
+	}
+
+      binding = new_binding;
+    }
+
+  return binding->dirname;
+}
+
+#ifdef _LIBC
+/* Alias for function name in GNU C Library.  */
+weak_alias (__bindtextdomain, bindtextdomain);
+#endif
diff --git a/intl/cat-compat.c b/intl/cat-compat.c
new file mode 100644
index 0000000..867d901
--- /dev/null
+++ b/intl/cat-compat.c
@@ -0,0 +1,262 @@
+/* Compatibility code for gettext-using-catgets interface.
+   Copyright (C) 1995, 1997 Free Software Foundation, Inc.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 2, or (at your option)
+   any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software Foundation,
+   Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
+
+#ifdef HAVE_CONFIG_H
+# include <config.h>
+#endif
+
+#include <stdio.h>
+
+#ifdef STDC_HEADERS
+# include <stdlib.h>
+# include <string.h>
+#else
+char *getenv ();
+# ifdef HAVE_MALLOC_H
+#  include <malloc.h>
+# endif
+#endif
+
+#ifdef HAVE_NL_TYPES_H
+# include <nl_types.h>
+#endif
+
+#include "libgettext.h"
+
+/* @@ end of prolog @@ */
+
+/* XPG3 defines the result of `setlocale (category, NULL)' as:
+   ``Directs `setlocale()' to query `category' and return the current
+     setting of `local'.''
+   However it does not specify the exact format.  And even worse: POSIX
+   defines this not at all.  So we can use this feature only on selected
+   system (e.g. those using GNU C Library).  */
+#ifdef _LIBC
+# define HAVE_LOCALE_NULL
+#endif
+
+/* The catalog descriptor.  */
+static nl_catd catalog = (nl_catd) -1;
+
+/* Name of the default catalog.  */
+static const char default_catalog_name[] = "messages";
+
+/* Name of currently used catalog.  */
+static const char *catalog_name = default_catalog_name;
+
+/* Get ID for given string.  If not found return -1.  */
+static int msg_to_cat_id PARAMS ((const char *msg));
+
+/* Substitution for systems lacking this function in their C library.  */
+#if !_LIBC && !HAVE_STPCPY
+static char *stpcpy PARAMS ((char *dest, const char *src));
+#endif
+
+
+/* Set currently used domain/catalog.  */
+char *
+textdomain (domainname)
+     const char *domainname;
+{
+  nl_catd new_catalog;
+  char *new_name;
+  size_t new_name_len;
+  char *lang;
+
+#if defined HAVE_SETLOCALE && defined HAVE_LC_MESSAGES \
+    && defined HAVE_LOCALE_NULL
+  lang = setlocale (LC_MESSAGES, NULL);
+#else
+  lang = getenv ("LC_ALL");
+  if (lang == NULL || lang[0] == '\0')
+    {
+      lang = getenv ("LC_MESSAGES");
+      if (lang == NULL || lang[0] == '\0')
+	lang = getenv ("LANG");
+    }
+#endif
+  if (lang == NULL || lang[0] == '\0')
+    lang = "C";
+
+  /* See whether name of currently used domain is asked.  */
+  if (domainname == NULL)
+    return (char *) catalog_name;
+
+  if (domainname[0] == '\0')
+    domainname = default_catalog_name;
+
+  /* Compute length of added path element.  */
+  new_name_len = sizeof (LOCALEDIR) - 1 + 1 + strlen (lang)
+		 + sizeof ("/LC_MESSAGES/") - 1 + sizeof (PACKAGE) - 1
+		 + sizeof (".cat");
+
+  new_name = (char *) malloc (new_name_len);
+  if (new_name == NULL)
+    return NULL;
+
+  strcpy (new_name, PACKAGE);
+  new_catalog = catopen (new_name, 0);
+
+  if (new_catalog == (nl_catd) -1)
+    {
+      /* NLSPATH search didn't work, try absolute path */
+      sprintf (new_name, "%s/%s/LC_MESSAGES/%s.cat", LOCALEDIR, lang,
+	       PACKAGE);
+      new_catalog = catopen (new_name, 0);
+
+      if (new_catalog == (nl_catd) -1)
+	{
+	  free (new_name);
+	  return (char *) catalog_name;
+	}
+    }
+
+  /* Close old catalog.  */
+  if (catalog != (nl_catd) -1)
+    catclose (catalog);
+  if (catalog_name != default_catalog_name)
+    free ((char *) catalog_name);
+
+  catalog = new_catalog;
+  catalog_name = new_name;
+
+  return (char *) catalog_name;
+}
+
+char *
+bindtextdomain (domainname, dirname)
+     const char *domainname;
+     const char *dirname;
+{
+#if HAVE_SETENV || HAVE_PUTENV
+  char *old_val, *new_val, *cp;
+  size_t new_val_len;
+
+  /* This does not make much sense here but to be compatible do it.  */
+  if (domainname == NULL)
+    return NULL;
+
+  /* Compute length of added path element.  If we use setenv we don't need
+     the first byts for NLSPATH=, but why complicate the code for this
+     peanuts.  */
+  new_val_len = sizeof ("NLSPATH=") - 1 + strlen (dirname)
+		+ sizeof ("/%L/LC_MESSAGES/%N.cat");
+
+  old_val = getenv ("NLSPATH");
+  if (old_val == NULL || old_val[0] == '\0')
+    {
+      old_val = NULL;
+      new_val_len += 1 + sizeof (LOCALEDIR) - 1
+	             + sizeof ("/%L/LC_MESSAGES/%N.cat");
+    }
+  else
+    new_val_len += strlen (old_val);
+
+  new_val = (char *) malloc (new_val_len);
+  if (new_val == NULL)
+    return NULL;
+
+# if HAVE_SETENV
+  cp = new_val;
+# else
+  cp = stpcpy (new_val, "NLSPATH=");
+# endif
+
+  cp = stpcpy (cp, dirname);
+  cp = stpcpy (cp, "/%L/LC_MESSAGES/%N.cat:");
+
+  if (old_val == NULL)
+    {
+# if __STDC__
+      stpcpy (cp, LOCALEDIR "/%L/LC_MESSAGES/%N.cat");
+# else
+
+      cp = stpcpy (cp, LOCALEDIR);
+      stpcpy (cp, "/%L/LC_MESSAGES/%N.cat");
+# endif
+    }
+  else
+    stpcpy (cp, old_val);
+
+# if HAVE_SETENV
+  setenv ("NLSPATH", new_val, 1);
+  free (new_val);
+# else
+  putenv (new_val);
+  /* Do *not* free the environment entry we just entered.  It is used
+     from now on.   */
+# endif
+
+#endif
+
+  return (char *) domainname;
+}
+
+#undef gettext
+char *
+gettext (msg)
+     const char *msg;
+{
+  int msgid;
+
+  if (msg == NULL || catalog == (nl_catd) -1)
+    return (char *) msg;
+
+  /* Get the message from the catalog.  We always use set number 1.
+     The message ID is computed by the function `msg_to_cat_id'
+     which works on the table generated by `po-to-tbl'.  */
+  msgid = msg_to_cat_id (msg);
+  if (msgid == -1)
+    return (char *) msg;
+
+  return catgets (catalog, 1, msgid, (char *) msg);
+}
+
+/* Look through the table `_msg_tbl' which has `_msg_tbl_length' entries
+   for the one equal to msg.  If it is found return the ID.  In case when
+   the string is not found return -1.  */
+static int
+msg_to_cat_id (msg)
+     const char *msg;
+{
+  int cnt;
+
+  for (cnt = 0; cnt < _msg_tbl_length; ++cnt)
+    if (strcmp (msg, _msg_tbl[cnt]._msg) == 0)
+      return _msg_tbl[cnt]._msg_number;
+
+  return -1;
+}
+
+
+/* @@ begin of epilog @@ */
+
+/* We don't want libintl.a to depend on any other library.  So we
+   avoid the non-standard function stpcpy.  In GNU C Library this
+   function is available, though.  Also allow the symbol HAVE_STPCPY
+   to be defined.  */
+#if !_LIBC && !HAVE_STPCPY
+static char *
+stpcpy (dest, src)
+     char *dest;
+     const char *src;
+{
+  while ((*dest++ = *src++) != '\0')
+    /* Do nothing. */ ;
+  return dest - 1;
+}
+#endif
diff --git a/intl/dcgettext.c b/intl/dcgettext.c
new file mode 100644
index 0000000..c4c7a2c
--- /dev/null
+++ b/intl/dcgettext.c
@@ -0,0 +1,624 @@
+/* Implementation of the dcgettext(3) function.
+   Copyright (C) 1995, 1996, 1997, 1998 Free Software Foundation, Inc.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 2, or (at your option)
+   any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software Foundation,
+   Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
+
+#ifdef HAVE_CONFIG_H
+# include <config.h>
+#endif
+
+#include <sys/types.h>
+
+#ifdef __GNUC__
+# define alloca __builtin_alloca
+# define HAVE_ALLOCA 1
+#else
+# if defined HAVE_ALLOCA_H || defined _LIBC
+#  include <alloca.h>
+# else
+#  ifdef _AIX
+ #pragma alloca
+#  else
+#   ifndef alloca
+char *alloca ();
+#   endif
+#  endif
+# endif
+#endif
+
+#include <errno.h>
+#ifndef errno
+extern int errno;
+#endif
+#ifndef __set_errno
+# define __set_errno(val) errno = (val)
+#endif
+
+#if defined STDC_HEADERS || defined _LIBC
+# include <stdlib.h>
+#else
+char *getenv ();
+# ifdef HAVE_MALLOC_H
+#  include <malloc.h>
+# else
+void free ();
+# endif
+#endif
+
+#if defined HAVE_STRING_H || defined _LIBC
+# ifndef _GNU_SOURCE
+#  define _GNU_SOURCE	1
+# endif
+# include <string.h>
+#else
+# include <strings.h>
+#endif
+#if !HAVE_STRCHR && !defined _LIBC
+# ifndef strchr
+#  define strchr index
+# endif
+#endif
+
+#if defined HAVE_UNISTD_H || defined _LIBC
+# include <unistd.h>
+#endif
+
+#include "gettext.h"
+#include "gettextP.h"
+#ifdef _LIBC
+# include <libintl.h>
+#else
+# include "libgettext.h"
+#endif
+#include "hash-string.h"
+
+/* @@ end of prolog @@ */
+
+#ifdef _LIBC
+/* Rename the non ANSI C functions.  This is required by the standard
+   because some ANSI C functions will require linking with this object
+   file and the name space must not be polluted.  */
+# define getcwd __getcwd
+# ifndef stpcpy
+#  define stpcpy __stpcpy
+# endif
+#else
+# if !defined HAVE_GETCWD
+char *getwd ();
+#  define getcwd(buf, max) getwd (buf)
+# else
+char *getcwd ();
+# endif
+# ifndef HAVE_STPCPY
+static char *stpcpy PARAMS ((char *dest, const char *src));
+# endif
+#endif
+
+/* Amount to increase buffer size by in each try.  */
+#define PATH_INCR 32
+
+/* The following is from pathmax.h.  */
+/* Non-POSIX BSD systems might have gcc's limits.h, which doesn't define
+   PATH_MAX but might cause redefinition warnings when sys/param.h is
+   later included (as on MORE/BSD 4.3).  */
+#if defined(_POSIX_VERSION) || (defined(HAVE_LIMITS_H) && !defined(__GNUC__))
+# include <limits.h>
+#endif
+
+#ifndef _POSIX_PATH_MAX
+# define _POSIX_PATH_MAX 255
+#endif
+
+#if !defined(PATH_MAX) && defined(_PC_PATH_MAX)
+# define PATH_MAX (pathconf ("/", _PC_PATH_MAX) < 1 ? 1024 : pathconf ("/", _PC_PATH_MAX))
+#endif
+
+/* Don't include sys/param.h if it already has been.  */
+#if defined(HAVE_SYS_PARAM_H) && !defined(PATH_MAX) && !defined(MAXPATHLEN)
+# include <sys/param.h>
+#endif
+
+#if !defined(PATH_MAX) && defined(MAXPATHLEN)
+# define PATH_MAX MAXPATHLEN
+#endif
+
+#ifndef PATH_MAX
+# define PATH_MAX _POSIX_PATH_MAX
+#endif
+
+/* XPG3 defines the result of `setlocale (category, NULL)' as:
+   ``Directs `setlocale()' to query `category' and return the current
+     setting of `local'.''
+   However it does not specify the exact format.  And even worse: POSIX
+   defines this not at all.  So we can use this feature only on selected
+   system (e.g. those using GNU C Library).  */
+#ifdef _LIBC
+# define HAVE_LOCALE_NULL
+#endif
+
+/* Name of the default domain used for gettext(3) prior any call to
+   textdomain(3).  The default value for this is "messages".  */
+const char _nl_default_default_domain[] = "messages";
+
+/* Value used as the default domain for gettext(3).  */
+const char *_nl_current_default_domain = _nl_default_default_domain;
+
+/* Contains the default location of the message catalogs.  */
+const char _nl_default_dirname[] = GNULOCALEDIR;
+
+/* List with bindings of specific domains created by bindtextdomain()
+   calls.  */
+struct binding *_nl_domain_bindings;
+
+/* Prototypes for local functions.  */
+static char *find_msg PARAMS ((struct loaded_l10nfile *domain_file,
+			       const char *msgid)) internal_function;
+static const char *category_to_name PARAMS ((int category)) internal_function;
+static const char *guess_category_value PARAMS ((int category,
+						 const char *categoryname))
+     internal_function;
+
+
+/* For those loosing systems which don't have `alloca' we have to add
+   some additional code emulating it.  */
+#ifdef HAVE_ALLOCA
+/* Nothing has to be done.  */
+# define ADD_BLOCK(list, address) /* nothing */
+# define FREE_BLOCKS(list) /* nothing */
+#else
+struct block_list
+{
+  void *address;
+  struct block_list *next;
+};
+# define ADD_BLOCK(list, addr)						      \
+  do {									      \
+    struct block_list *newp = (struct block_list *) malloc (sizeof (*newp));  \
+    /* If we cannot get a free block we cannot add the new element to	      \
+       the list.  */							      \
+    if (newp != NULL) {							      \
+      newp->address = (addr);						      \
+      newp->next = (list);						      \
+      (list) = newp;							      \
+    }									      \
+  } while (0)
+# define FREE_BLOCKS(list)						      \
+  do {									      \
+    while (list != NULL) {						      \
+      struct block_list *old = list;					      \
+      list = list->next;						      \
+      free (old);							      \
+    }									      \
+  } while (0)
+# undef alloca
+# define alloca(size) (malloc (size))
+#endif	/* have alloca */
+
+
+/* Names for the libintl functions are a problem.  They must not clash
+   with existing names and they should follow ANSI C.  But this source
+   code is also used in GNU C Library where the names have a __
+   prefix.  So we have to make a difference here.  */
+#ifdef _LIBC
+# define DCGETTEXT __dcgettext
+#else
+# define DCGETTEXT dcgettext__
+#endif
+
+/* Look up MSGID in the DOMAINNAME message catalog for the current CATEGORY
+   locale.  */
+char *
+DCGETTEXT (domainname, msgid, category)
+     const char *domainname;
+     const char *msgid;
+     int category;
+{
+#ifndef HAVE_ALLOCA
+  struct block_list *block_list = NULL;
+#endif
+  struct loaded_l10nfile *domain;
+  struct binding *binding;
+  const char *categoryname;
+  const char *categoryvalue;
+  char *dirname, *xdomainname;
+  char *single_locale;
+  char *retval;
+  int saved_errno = errno;
+
+  /* If no real MSGID is given return NULL.  */
+  if (msgid == NULL)
+    return NULL;
+
+  /* If DOMAINNAME is NULL, we are interested in the default domain.  If
+     CATEGORY is not LC_MESSAGES this might not make much sense but the
+     defintion left this undefined.  */
+  if (domainname == NULL)
+    domainname = _nl_current_default_domain;
+
+  /* First find matching binding.  */
+  for (binding = _nl_domain_bindings; binding != NULL; binding = binding->next)
+    {
+      int compare = strcmp (domainname, binding->domainname);
+      if (compare == 0)
+	/* We found it!  */
+	break;
+      if (compare < 0)
+	{
+	  /* It is not in the list.  */
+	  binding = NULL;
+	  break;
+	}
+    }
+
+  if (binding == NULL)
+    dirname = (char *) _nl_default_dirname;
+  else if (binding->dirname[0] == '/')
+    dirname = binding->dirname;
+  else
+    {
+      /* We have a relative path.  Make it absolute now.  */
+      size_t dirname_len = strlen (binding->dirname) + 1;
+      size_t path_max;
+      char *ret;
+
+      path_max = (unsigned) PATH_MAX;
+      path_max += 2;		/* The getcwd docs say to do this.  */
+
+      dirname = (char *) alloca (path_max + dirname_len);
+      ADD_BLOCK (block_list, dirname);
+
+      __set_errno (0);
+      while ((ret = getcwd (dirname, path_max)) == NULL && errno == ERANGE)
+	{
+	  path_max += PATH_INCR;
+	  dirname = (char *) alloca (path_max + dirname_len);
+	  ADD_BLOCK (block_list, dirname);
+	  __set_errno (0);
+	}
+
+      if (ret == NULL)
+	{
+	  /* We cannot get the current working directory.  Don't signal an
+	     error but simply return the default string.  */
+	  FREE_BLOCKS (block_list);
+	  __set_errno (saved_errno);
+	  return (char *) msgid;
+	}
+
+      stpcpy (stpcpy (strchr (dirname, '\0'), "/"), binding->dirname);
+    }
+
+  /* Now determine the symbolic name of CATEGORY and its value.  */
+  categoryname = category_to_name (category);
+  categoryvalue = guess_category_value (category, categoryname);
+
+  xdomainname = (char *) alloca (strlen (categoryname)
+				 + strlen (domainname) + 5);
+  ADD_BLOCK (block_list, xdomainname);
+
+  stpcpy (stpcpy (stpcpy (stpcpy (xdomainname, categoryname), "/"),
+		  domainname),
+	  ".mo");
+
+  /* Creating working area.  */
+  single_locale = (char *) alloca (strlen (categoryvalue) + 1);
+  ADD_BLOCK (block_list, single_locale);
+
+
+  /* Search for the given string.  This is a loop because we perhaps
+     got an ordered list of languages to consider for th translation.  */
+  while (1)
+    {
+      /* Make CATEGORYVALUE point to the next element of the list.  */
+      while (categoryvalue[0] != '\0' && categoryvalue[0] == ':')
+	++categoryvalue;
+      if (categoryvalue[0] == '\0')
+	{
+	  /* The whole contents of CATEGORYVALUE has been searched but
+	     no valid entry has been found.  We solve this situation
+	     by implicitly appending a "C" entry, i.e. no translation
+	     will take place.  */
+	  single_locale[0] = 'C';
+	  single_locale[1] = '\0';
+	}
+      else
+	{
+	  char *cp = single_locale;
+	  while (categoryvalue[0] != '\0' && categoryvalue[0] != ':')
+	    *cp++ = *categoryvalue++;
+	  *cp = '\0';
+	}
+
+      /* If the current locale value is C (or POSIX) we don't load a
+	 domain.  Return the MSGID.  */
+      if (strcmp (single_locale, "C") == 0
+	  || strcmp (single_locale, "POSIX") == 0)
+	{
+	  FREE_BLOCKS (block_list);
+	  __set_errno (saved_errno);
+	  return (char *) msgid;
+	}
+
+
+      /* Find structure describing the message catalog matching the
+	 DOMAINNAME and CATEGORY.  */
+      domain = _nl_find_domain (dirname, single_locale, xdomainname);
+
+      if (domain != NULL)
+	{
+	  retval = find_msg (domain, msgid);
+
+	  if (retval == NULL)
+	    {
+	      int cnt;
+
+	      for (cnt = 0; domain->successor[cnt] != NULL; ++cnt)
+		{
+		  retval = find_msg (domain->successor[cnt], msgid);
+
+		  if (retval != NULL)
+		    break;
+		}
+	    }
+
+	  if (retval != NULL)
+	    {
+	      FREE_BLOCKS (block_list);
+	      __set_errno (saved_errno);
+	      return retval;
+	    }
+	}
+    }
+  /* NOTREACHED */
+}
+
+#ifdef _LIBC
+/* Alias for function name in GNU C Library.  */
+weak_alias (__dcgettext, dcgettext);
+#endif
+
+
+static char *
+internal_function
+find_msg (domain_file, msgid)
+     struct loaded_l10nfile *domain_file;
+     const char *msgid;
+{
+  size_t top, act, bottom;
+  struct loaded_domain *domain;
+
+  if (domain_file->decided == 0)
+    _nl_load_domain (domain_file);
+
+  if (domain_file->data == NULL)
+    return NULL;
+
+  domain = (struct loaded_domain *) domain_file->data;
+
+  /* Locate the MSGID and its translation.  */
+  if (domain->hash_size > 2 && domain->hash_tab != NULL)
+    {
+      /* Use the hashing table.  */
+      nls_uint32 len = strlen (msgid);
+      nls_uint32 hash_val = hash_string (msgid);
+      nls_uint32 idx = hash_val % domain->hash_size;
+      nls_uint32 incr = 1 + (hash_val % (domain->hash_size - 2));
+      nls_uint32 nstr = W (domain->must_swap, domain->hash_tab[idx]);
+
+      if (nstr == 0)
+	/* Hash table entry is empty.  */
+	return NULL;
+
+      if (W (domain->must_swap, domain->orig_tab[nstr - 1].length) == len
+	  && strcmp (msgid,
+		     domain->data + W (domain->must_swap,
+				       domain->orig_tab[nstr - 1].offset)) == 0)
+	return (char *) domain->data + W (domain->must_swap,
+					  domain->trans_tab[nstr - 1].offset);
+
+      while (1)
+	{
+	  if (idx >= domain->hash_size - incr)
+	    idx -= domain->hash_size - incr;
+	  else
+	    idx += incr;
+
+	  nstr = W (domain->must_swap, domain->hash_tab[idx]);
+	  if (nstr == 0)
+	    /* Hash table entry is empty.  */
+	    return NULL;
+
+	  if (W (domain->must_swap, domain->orig_tab[nstr - 1].length) == len
+	      && strcmp (msgid,
+			 domain->data + W (domain->must_swap,
+					   domain->orig_tab[nstr - 1].offset))
+	         == 0)
+	    return (char *) domain->data
+	      + W (domain->must_swap, domain->trans_tab[nstr - 1].offset);
+	}
+      /* NOTREACHED */
+    }
+
+  /* Now we try the default method:  binary search in the sorted
+     array of messages.  */
+  bottom = 0;
+  top = domain->nstrings;
+  while (bottom < top)
+    {
+      int cmp_val;
+
+      act = (bottom + top) / 2;
+      cmp_val = strcmp (msgid, domain->data
+			       + W (domain->must_swap,
+				    domain->orig_tab[act].offset));
+      if (cmp_val < 0)
+	top = act;
+      else if (cmp_val > 0)
+	bottom = act + 1;
+      else
+	break;
+    }
+
+  /* If an translation is found return this.  */
+  return bottom >= top ? NULL : (char *) domain->data
+                                + W (domain->must_swap,
+				     domain->trans_tab[act].offset);
+}
+
+
+/* Return string representation of locale CATEGORY.  */
+static const char *
+internal_function
+category_to_name (category)
+     int category;
+{
+  const char *retval;
+
+  switch (category)
+  {
+#ifdef LC_COLLATE
+  case LC_COLLATE:
+    retval = "LC_COLLATE";
+    break;
+#endif
+#ifdef LC_CTYPE
+  case LC_CTYPE:
+    retval = "LC_CTYPE";
+    break;
+#endif
+#ifdef LC_MONETARY
+  case LC_MONETARY:
+    retval = "LC_MONETARY";
+    break;
+#endif
+#ifdef LC_NUMERIC
+  case LC_NUMERIC:
+    retval = "LC_NUMERIC";
+    break;
+#endif
+#ifdef LC_TIME
+  case LC_TIME:
+    retval = "LC_TIME";
+    break;
+#endif
+#ifdef LC_MESSAGES
+  case LC_MESSAGES:
+    retval = "LC_MESSAGES";
+    break;
+#endif
+#ifdef LC_RESPONSE
+  case LC_RESPONSE:
+    retval = "LC_RESPONSE";
+    break;
+#endif
+#ifdef LC_ALL
+  case LC_ALL:
+    /* This might not make sense but is perhaps better than any other
+       value.  */
+    retval = "LC_ALL";
+    break;
+#endif
+  default:
+    /* If you have a better idea for a default value let me know.  */
+    retval = "LC_XXX";
+  }
+
+  return retval;
+}
+
+/* Guess value of current locale from value of the environment variables.  */
+static const char *
+internal_function
+guess_category_value (category, categoryname)
+     int category;
+     const char *categoryname;
+{
+  const char *retval;
+
+  /* The highest priority value is the `LANGUAGE' environment
+     variable.  This is a GNU extension.  */
+  retval = getenv ("LANGUAGE");
+  if (retval != NULL && retval[0] != '\0')
+    return retval;
+
+  /* `LANGUAGE' is not set.  So we have to proceed with the POSIX
+     methods of looking to `LC_ALL', `LC_xxx', and `LANG'.  On some
+     systems this can be done by the `setlocale' function itself.  */
+#if defined HAVE_SETLOCALE && defined HAVE_LC_MESSAGES && defined HAVE_LOCALE_NULL
+  return setlocale (category, NULL);
+#else
+  /* Setting of LC_ALL overwrites all other.  */
+  retval = getenv ("LC_ALL");
+  if (retval != NULL && retval[0] != '\0')
+    return retval;
+
+  /* Next comes the name of the desired category.  */
+  retval = getenv (categoryname);
+  if (retval != NULL && retval[0] != '\0')
+    return retval;
+
+  /* Last possibility is the LANG environment variable.  */
+  retval = getenv ("LANG");
+  if (retval != NULL && retval[0] != '\0')
+    return retval;
+
+  /* We use C as the default domain.  POSIX says this is implementation
+     defined.  */
+  return "C";
+#endif
+}
+
+/* @@ begin of epilog @@ */
+
+/* We don't want libintl.a to depend on any other library.  So we
+   avoid the non-standard function stpcpy.  In GNU C Library this
+   function is available, though.  Also allow the symbol HAVE_STPCPY
+   to be defined.  */
+#if !_LIBC && !HAVE_STPCPY
+static char *
+stpcpy (dest, src)
+     char *dest;
+     const char *src;
+{
+  while ((*dest++ = *src++) != '\0')
+    /* Do nothing. */ ;
+  return dest - 1;
+}
+#endif
+
+
+#ifdef _LIBC
+/* If we want to free all resources we have to do some work at
+   program's end.  */
+static void __attribute__ ((unused))
+free_mem (void)
+{
+  struct binding *runp;
+
+  for (runp = _nl_domain_bindings; runp != NULL; runp = runp->next)
+    {
+      free (runp->domainname);
+      if (runp->dirname != _nl_default_dirname)
+	/* Yes, this is a pointer comparison.  */
+	free (runp->dirname);
+    }
+
+  if (_nl_current_default_domain != _nl_default_default_domain)
+    /* Yes, again a pointer comparison.  */
+    free ((char *) _nl_current_default_domain);
+}
+
+text_set_element (__libc_subfreeres, free_mem);
+#endif
diff --git a/intl/dgettext.c b/intl/dgettext.c
new file mode 100644
index 0000000..0510c2b
--- /dev/null
+++ b/intl/dgettext.c
@@ -0,0 +1,59 @@
+/* Implementation of the dgettext(3) function
+   Copyright (C) 1995, 1996, 1997 Free Software Foundation, Inc.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 2, or (at your option)
+   any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software Foundation,
+   Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
+
+#ifdef HAVE_CONFIG_H
+# include <config.h>
+#endif
+
+#if defined HAVE_LOCALE_H || defined _LIBC
+# include <locale.h>
+#endif
+
+#ifdef _LIBC
+# include <libintl.h>
+#else
+# include "libgettext.h"
+#endif
+
+/* @@ end of prolog @@ */
+
+/* Names for the libintl functions are a problem.  They must not clash
+   with existing names and they should follow ANSI C.  But this source
+   code is also used in GNU C Library where the names have a __
+   prefix.  So we have to make a difference here.  */
+#ifdef _LIBC
+# define DGETTEXT __dgettext
+# define DCGETTEXT __dcgettext
+#else
+# define DGETTEXT dgettext__
+# define DCGETTEXT dcgettext__
+#endif
+
+/* Look up MSGID in the DOMAINNAME message catalog of the current
+   LC_MESSAGES locale.  */
+char *
+DGETTEXT (domainname, msgid)
+     const char *domainname;
+     const char *msgid;
+{
+  return DCGETTEXT (domainname, msgid, LC_MESSAGES);
+}
+
+#ifdef _LIBC
+/* Alias for function name in GNU C Library.  */
+weak_alias (__dgettext, dgettext);
+#endif
diff --git a/intl/explodename.c b/intl/explodename.c
new file mode 100644
index 0000000..8066dc2
--- /dev/null
+++ b/intl/explodename.c
@@ -0,0 +1,188 @@
+/* Copyright (C) 1995, 1996, 1997, 1998 Free Software Foundation, Inc.
+   Contributed by Ulrich Drepper <drepper@gnu.ai.mit.edu>, 1995.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 2, or (at your option)
+   any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software Foundation,
+   Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
+
+#ifdef HAVE_CONFIG_H
+# include <config.h>
+#endif
+
+#if defined STDC_HEADERS || defined _LIBC
+# include <stdlib.h>
+#endif
+
+#if defined HAVE_STRING_H || defined _LIBC
+# include <string.h>
+#else
+# include <strings.h>
+#endif
+#include <sys/types.h>
+
+#include "loadinfo.h"
+
+/* On some strange systems still no definition of NULL is found.  Sigh!  */
+#ifndef NULL
+# if defined __STDC__ && __STDC__
+#  define NULL ((void *) 0)
+# else
+#  define NULL 0
+# endif
+#endif
+
+/* @@ end of prolog @@ */
+
+int
+_nl_explode_name (name, language, modifier, territory, codeset,
+		  normalized_codeset, special, sponsor, revision)
+     char *name;
+     const char **language;
+     const char **modifier;
+     const char **territory;
+     const char **codeset;
+     const char **normalized_codeset;
+     const char **special;
+     const char **sponsor;
+     const char **revision;
+{
+  enum { undecided, xpg, cen } syntax;
+  char *cp;
+  int mask;
+
+  *modifier = NULL;
+  *territory = NULL;
+  *codeset = NULL;
+  *normalized_codeset = NULL;
+  *special = NULL;
+  *sponsor = NULL;
+  *revision = NULL;
+
+  /* Now we determine the single parts of the locale name.  First
+     look for the language.  Termination symbols are `_' and `@' if
+     we use XPG4 style, and `_', `+', and `,' if we use CEN syntax.  */
+  mask = 0;
+  syntax = undecided;
+  *language = cp = name;
+  while (cp[0] != '\0' && cp[0] != '_' && cp[0] != '@'
+	 && cp[0] != '+' && cp[0] != ',')
+    ++cp;
+
+  if (*language == cp)
+    /* This does not make sense: language has to be specified.  Use
+       this entry as it is without exploding.  Perhaps it is an alias.  */
+    cp = strchr (*language, '\0');
+  else if (cp[0] == '_')
+    {
+      /* Next is the territory.  */
+      cp[0] = '\0';
+      *territory = ++cp;
+
+      while (cp[0] != '\0' && cp[0] != '.' && cp[0] != '@'
+	     && cp[0] != '+' && cp[0] != ',' && cp[0] != '_')
+	++cp;
+
+      mask |= TERRITORY;
+
+      if (cp[0] == '.')
+	{
+	  /* Next is the codeset.  */
+	  syntax = xpg;
+	  cp[0] = '\0';
+	  *codeset = ++cp;
+
+	  while (cp[0] != '\0' && cp[0] != '@')
+	    ++cp;
+
+	  mask |= XPG_CODESET;
+
+	  if (*codeset != cp && (*codeset)[0] != '\0')
+	    {
+	      *normalized_codeset = _nl_normalize_codeset (*codeset,
+							   cp - *codeset);
+	      if (strcmp (*codeset, *normalized_codeset) == 0)
+		free ((char *) *normalized_codeset);
+	      else
+		mask |= XPG_NORM_CODESET;
+	    }
+	}
+    }
+
+  if (cp[0] == '@' || (syntax != xpg && cp[0] == '+'))
+    {
+      /* Next is the modifier.  */
+      syntax = cp[0] == '@' ? xpg : cen;
+      cp[0] = '\0';
+      *modifier = ++cp;
+
+      while (syntax == cen && cp[0] != '\0' && cp[0] != '+'
+	     && cp[0] != ',' && cp[0] != '_')
+	++cp;
+
+      mask |= XPG_MODIFIER | CEN_AUDIENCE;
+    }
+
+  if (syntax != xpg && (cp[0] == '+' || cp[0] == ',' || cp[0] == '_'))
+    {
+      syntax = cen;
+
+      if (cp[0] == '+')
+	{
+ 	  /* Next is special application (CEN syntax).  */
+	  cp[0] = '\0';
+	  *special = ++cp;
+
+	  while (cp[0] != '\0' && cp[0] != ',' && cp[0] != '_')
+	    ++cp;
+
+	  mask |= CEN_SPECIAL;
+	}
+
+      if (cp[0] == ',')
+	{
+ 	  /* Next is sponsor (CEN syntax).  */
+	  cp[0] = '\0';
+	  *sponsor = ++cp;
+
+	  while (cp[0] != '\0' && cp[0] != '_')
+	    ++cp;
+
+	  mask |= CEN_SPONSOR;
+	}
+
+      if (cp[0] == '_')
+	{
+ 	  /* Next is revision (CEN syntax).  */
+	  cp[0] = '\0';
+	  *revision = ++cp;
+
+	  mask |= CEN_REVISION;
+	}
+    }
+
+  /* For CEN syntax values it might be important to have the
+     separator character in the file name, not for XPG syntax.  */
+  if (syntax == xpg)
+    {
+      if (*territory != NULL && (*territory)[0] == '\0')
+	mask &= ~TERRITORY;
+
+      if (*codeset != NULL && (*codeset)[0] == '\0')
+	mask &= ~XPG_CODESET;
+
+      if (*modifier != NULL && (*modifier)[0] == '\0')
+	mask &= ~XPG_MODIFIER;
+    }
+
+  return mask;
+}
diff --git a/intl/finddomain.c b/intl/finddomain.c
new file mode 100644
index 0000000..81ea29b
--- /dev/null
+++ b/intl/finddomain.c
@@ -0,0 +1,216 @@
+/* Handle list of needed message catalogs
+   Copyright (C) 1995, 1996, 1997, 1998 Free Software Foundation, Inc.
+   Written by Ulrich Drepper <drepper@gnu.ai.mit.edu>, 1995.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 2, or (at your option)
+   any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software Foundation,
+   Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
+
+#ifdef HAVE_CONFIG_H
+# include <config.h>
+#endif
+
+#include <ctype.h>
+#include <errno.h>
+#include <stdio.h>
+#include <sys/types.h>
+
+#if defined STDC_HEADERS || defined _LIBC
+# include <stdlib.h>
+#else
+# ifdef HAVE_MALLOC_H
+#  include <malloc.h>
+# else
+void free ();
+# endif
+#endif
+
+#if defined HAVE_STRING_H || defined _LIBC
+# include <string.h>
+#else
+# include <strings.h>
+# ifndef memcpy
+#  define memcpy(Dst, Src, Num) bcopy (Src, Dst, Num)
+# endif
+#endif
+#if !HAVE_STRCHR && !defined _LIBC
+# ifndef strchr
+#  define strchr index
+# endif
+#endif
+
+#if defined HAVE_UNISTD_H || defined _LIBC
+# include <unistd.h>
+#endif
+
+#include "gettext.h"
+#include "gettextP.h"
+#ifdef _LIBC
+# include <libintl.h>
+#else
+# include "libgettext.h"
+#endif
+
+/* @@ end of prolog @@ */
+/* List of already loaded domains.  */
+static struct loaded_l10nfile *_nl_loaded_domains;
+
+
+/* Return a data structure describing the message catalog described by
+   the DOMAINNAME and CATEGORY parameters with respect to the currently
+   established bindings.  */
+struct loaded_l10nfile *
+internal_function
+_nl_find_domain (dirname, locale, domainname)
+     const char *dirname;
+     char *locale;
+     const char *domainname;
+{
+  struct loaded_l10nfile *retval;
+  const char *language;
+  const char *modifier;
+  const char *territory;
+  const char *codeset;
+  const char *normalized_codeset;
+  const char *special;
+  const char *sponsor;
+  const char *revision;
+  const char *alias_value;
+  int mask;
+
+  /* LOCALE can consist of up to four recognized parts for the XPG syntax:
+
+		language[_territory[.codeset]][@modifier]
+
+     and six parts for the CEN syntax:
+
+	language[_territory][+audience][+special][,[sponsor][_revision]]
+
+     Beside the first part all of them are allowed to be missing.  If
+     the full specified locale is not found, the less specific one are
+     looked for.  The various parts will be stripped off according to
+     the following order:
+		(1) revision
+		(2) sponsor
+		(3) special
+		(4) codeset
+		(5) normalized codeset
+		(6) territory
+		(7) audience/modifier
+   */
+
+  /* If we have already tested for this locale entry there has to
+     be one data set in the list of loaded domains.  */
+  retval = _nl_make_l10nflist (&_nl_loaded_domains, dirname,
+			       strlen (dirname) + 1, 0, locale, NULL, NULL,
+			       NULL, NULL, NULL, NULL, NULL, domainname, 0);
+  if (retval != NULL)
+    {
+      /* We know something about this locale.  */
+      int cnt;
+
+      if (retval->decided == 0)
+	_nl_load_domain (retval);
+
+      if (retval->data != NULL)
+	return retval;
+
+      for (cnt = 0; retval->successor[cnt] != NULL; ++cnt)
+	{
+	  if (retval->successor[cnt]->decided == 0)
+	    _nl_load_domain (retval->successor[cnt]);
+
+	  if (retval->successor[cnt]->data != NULL)
+	    break;
+	}
+      return cnt >= 0 ? retval : NULL;
+      /* NOTREACHED */
+    }
+
+  /* See whether the locale value is an alias.  If yes its value
+     *overwrites* the alias name.  No test for the original value is
+     done.  */
+  alias_value = _nl_expand_alias (locale);
+  if (alias_value != NULL)
+    {
+#if defined _LIBC || defined HAVE_STRDUP
+      locale = strdup (alias_value);
+      if (locale == NULL)
+	return NULL;
+#else
+      size_t len = strlen (alias_value) + 1;
+      locale = (char *) malloc (len);
+      if (locale == NULL)
+	return NULL;
+
+      memcpy (locale, alias_value, len);
+#endif
+    }
+
+  /* Now we determine the single parts of the locale name.  First
+     look for the language.  Termination symbols are `_' and `@' if
+     we use XPG4 style, and `_', `+', and `,' if we use CEN syntax.  */
+  mask = _nl_explode_name (locale, &language, &modifier, &territory,
+			   &codeset, &normalized_codeset, &special,
+			   &sponsor, &revision);
+
+  /* Create all possible locale entries which might be interested in
+     generalization.  */
+  retval = _nl_make_l10nflist (&_nl_loaded_domains, dirname,
+			       strlen (dirname) + 1, mask, language, territory,
+			       codeset, normalized_codeset, modifier, special,
+			       sponsor, revision, domainname, 1);
+  if (retval == NULL)
+    /* This means we are out of core.  */
+    return NULL;
+
+  if (retval->decided == 0)
+    _nl_load_domain (retval);
+  if (retval->data == NULL)
+    {
+      int cnt;
+      for (cnt = 0; retval->successor[cnt] != NULL; ++cnt)
+	{
+	  if (retval->successor[cnt]->decided == 0)
+	    _nl_load_domain (retval->successor[cnt]);
+	  if (retval->successor[cnt]->data != NULL)
+	    break;
+	}
+    }
+
+  /* The room for an alias was dynamically allocated.  Free it now.  */
+  if (alias_value != NULL)
+    free (locale);
+
+  return retval;
+}
+
+
+#ifdef _LIBC
+static void __attribute__ ((unused))
+free_mem (void)
+{
+  struct loaded_l10nfile *runp = _nl_loaded_domains;
+
+  while (runp != NULL)
+    {
+      struct loaded_l10nfile *here = runp;
+      if (runp->data != NULL)
+	_nl_unload_domain ((struct loaded_domain *) runp->data);
+      runp = runp->next;
+      free (here);
+    }
+}
+
+text_set_element (__libc_subfreeres, free_mem);
+#endif
diff --git a/intl/gettext.c b/intl/gettext.c
new file mode 100644
index 0000000..d929f98
--- /dev/null
+++ b/intl/gettext.c
@@ -0,0 +1,70 @@
+/* Implementation of gettext(3) function.
+   Copyright (C) 1995, 1997 Free Software Foundation, Inc.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 2, or (at your option)
+   any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software Foundation,
+   Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
+
+#ifdef HAVE_CONFIG_H
+# include <config.h>
+#endif
+
+#ifdef _LIBC
+# define __need_NULL
+# include <stddef.h>
+#else
+# ifdef STDC_HEADERS
+#  include <stdlib.h>		/* Just for NULL.  */
+# else
+#  ifdef HAVE_STRING_H
+#   include <string.h>
+#  else
+#   define NULL ((void *) 0)
+#  endif
+# endif
+#endif
+
+#ifdef _LIBC
+# include <libintl.h>
+#else
+# include "libgettext.h"
+#endif
+
+/* @@ end of prolog @@ */
+
+/* Names for the libintl functions are a problem.  They must not clash
+   with existing names and they should follow ANSI C.  But this source
+   code is also used in GNU C Library where the names have a __
+   prefix.  So we have to make a difference here.  */
+#ifdef _LIBC
+# define GETTEXT __gettext
+# define DGETTEXT __dgettext
+#else
+# define GETTEXT gettext__
+# define DGETTEXT dgettext__
+#endif
+
+/* Look up MSGID in the current default message catalog for the current
+   LC_MESSAGES locale.  If not found, returns MSGID itself (the default
+   text).  */
+char *
+GETTEXT (msgid)
+     const char *msgid;
+{
+  return DGETTEXT (NULL, msgid);
+}
+
+#ifdef _LIBC
+/* Alias for function name in GNU C Library.  */
+weak_alias (__gettext, gettext);
+#endif
diff --git a/intl/gettext.h b/intl/gettext.h
new file mode 100644
index 0000000..3cd23d7
--- /dev/null
+++ b/intl/gettext.h
@@ -0,0 +1,105 @@
+/* Internal header for GNU gettext internationalization functions.
+   Copyright (C) 1995, 1997 Free Software Foundation, Inc.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 2, or (at your option)
+   any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU Library General Public
+   License along with the GNU C Library; see the file COPYING.LIB.  If not,
+   write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+   Boston, MA 02111-1307, USA.  */
+
+#ifndef _GETTEXT_H
+#define _GETTEXT_H 1
+
+#include <stdio.h>
+
+#if HAVE_LIMITS_H || _LIBC
+# include <limits.h>
+#endif
+
+/* @@ end of prolog @@ */
+
+/* The magic number of the GNU message catalog format.  */
+#define _MAGIC 0x950412de
+#define _MAGIC_SWAPPED 0xde120495
+
+/* Revision number of the currently used .mo (binary) file format.  */
+#define MO_REVISION_NUMBER 0
+
+/* The following contortions are an attempt to use the C preprocessor
+   to determine an unsigned integral type that is 32 bits wide.  An
+   alternative approach is to use autoconf's AC_CHECK_SIZEOF macro, but
+   doing that would require that the configure script compile and *run*
+   the resulting executable.  Locally running cross-compiled executables
+   is usually not possible.  */
+
+#if __STDC__
+# define UINT_MAX_32_BITS 4294967295U
+#else
+# define UINT_MAX_32_BITS 0xFFFFFFFF
+#endif
+
+/* If UINT_MAX isn't defined, assume it's a 32-bit type.
+   This should be valid for all systems GNU cares about because
+   that doesn't include 16-bit systems, and only modern systems
+   (that certainly have <limits.h>) have 64+-bit integral types.  */
+
+#ifndef UINT_MAX
+# define UINT_MAX UINT_MAX_32_BITS
+#endif
+
+#if UINT_MAX == UINT_MAX_32_BITS
+typedef unsigned nls_uint32;
+#else
+# if USHRT_MAX == UINT_MAX_32_BITS
+typedef unsigned short nls_uint32;
+# else
+#  if ULONG_MAX == UINT_MAX_32_BITS
+typedef unsigned long nls_uint32;
+#  else
+  /* The following line is intended to throw an error.  Using #error is
+     not portable enough.  */
+  "Cannot determine unsigned 32-bit data type."
+#  endif
+# endif
+#endif
+
+
+/* Header for binary .mo file format.  */
+struct mo_file_header
+{
+  /* The magic number.  */
+  nls_uint32 magic;
+  /* The revision number of the file format.  */
+  nls_uint32 revision;
+  /* The number of strings pairs.  */
+  nls_uint32 nstrings;
+  /* Offset of table with start offsets of original strings.  */
+  nls_uint32 orig_tab_offset;
+  /* Offset of table with start offsets of translation strings.  */
+  nls_uint32 trans_tab_offset;
+  /* Size of hashing table.  */
+  nls_uint32 hash_tab_size;
+  /* Offset of first hashing entry.  */
+  nls_uint32 hash_tab_offset;
+};
+
+struct string_desc
+{
+  /* Length of addressed string.  */
+  nls_uint32 length;
+  /* Offset of string in file.  */
+  nls_uint32 offset;
+};
+
+/* @@ begin of epilog @@ */
+
+#endif	/* gettext.h  */
diff --git a/intl/gettextP.h b/intl/gettextP.h
new file mode 100644
index 0000000..00c5203
--- /dev/null
+++ b/intl/gettextP.h
@@ -0,0 +1,89 @@
+/* Header describing internals of gettext library
+   Copyright (C) 1995, 1996, 1997, 1998 Free Software Foundation, Inc.
+   Written by Ulrich Drepper <drepper@gnu.ai.mit.edu>, 1995.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 2, or (at your option)
+   any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software Foundation,
+   Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
+
+#ifndef _GETTEXTP_H
+#define _GETTEXTP_H
+
+#include "loadinfo.h"
+
+/* @@ end of prolog @@ */
+
+#ifndef PARAMS
+# if __STDC__
+#  define PARAMS(args) args
+# else
+#  define PARAMS(args) ()
+# endif
+#endif
+
+#ifndef internal_function
+# define internal_function
+#endif
+
+#ifndef W
+# define W(flag, data) ((flag) ? SWAP (data) : (data))
+#endif
+
+
+#ifdef _LIBC
+# include <byteswap.h>
+# define SWAP(i) bswap_32 (i)
+#else
+static nls_uint32 SWAP PARAMS ((nls_uint32 i));
+
+static inline nls_uint32
+SWAP (i)
+     nls_uint32 i;
+{
+  return (i << 24) | ((i & 0xff00) << 8) | ((i >> 8) & 0xff00) | (i >> 24);
+}
+#endif
+
+
+struct loaded_domain
+{
+  const char *data;
+  int use_mmap;
+  size_t mmap_size;
+  int must_swap;
+  nls_uint32 nstrings;
+  struct string_desc *orig_tab;
+  struct string_desc *trans_tab;
+  nls_uint32 hash_size;
+  nls_uint32 *hash_tab;
+};
+
+struct binding
+{
+  struct binding *next;
+  char *domainname;
+  char *dirname;
+};
+
+struct loaded_l10nfile *_nl_find_domain PARAMS ((const char *__dirname,
+						 char *__locale,
+						 const char *__domainname))
+     internal_function;
+void _nl_load_domain PARAMS ((struct loaded_l10nfile *__domain))
+     internal_function;
+void _nl_unload_domain PARAMS ((struct loaded_domain *__domain))
+     internal_function;
+
+/* @@ begin of epilog @@ */
+
+#endif /* gettextP.h  */
diff --git a/intl/hash-string.h b/intl/hash-string.h
new file mode 100644
index 0000000..cacb38e
--- /dev/null
+++ b/intl/hash-string.h
@@ -0,0 +1,59 @@
+/* Implements a string hashing function.
+   Copyright (C) 1995, 1997 Free Software Foundation, Inc.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 2, or (at your option)
+   any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU Library General Public
+   License along with the GNU C Library; see the file COPYING.LIB.  If not,
+   write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+   Boston, MA 02111-1307, USA.  */
+
+/* @@ end of prolog @@ */
+
+#ifndef PARAMS
+# if __STDC__
+#  define PARAMS(Args) Args
+# else
+#  define PARAMS(Args) ()
+# endif
+#endif
+
+/* We assume to have `unsigned long int' value with at least 32 bits.  */
+#define HASHWORDBITS 32
+
+
+/* Defines the so called `hashpjw' function by P.J. Weinberger
+   [see Aho/Sethi/Ullman, COMPILERS: Principles, Techniques and Tools,
+   1986, 1987 Bell Telephone Laboratories, Inc.]  */
+static unsigned long hash_string PARAMS ((const char *__str_param));
+
+static inline unsigned long
+hash_string (str_param)
+     const char *str_param;
+{
+  unsigned long int hval, g;
+  const char *str = str_param;
+
+  /* Compute the hash value for the given string.  */
+  hval = 0;
+  while (*str != '\0')
+    {
+      hval <<= 4;
+      hval += (unsigned long) *str++;
+      g = hval & ((unsigned long) 0xf << (HASHWORDBITS - 4));
+      if (g != 0)
+	{
+	  hval ^= g >> (HASHWORDBITS - 8);
+	  hval ^= g;
+	}
+    }
+  return hval;
+}
diff --git a/intl/intl-compat.c b/intl/intl-compat.c
new file mode 100644
index 0000000..503efa0
--- /dev/null
+++ b/intl/intl-compat.c
@@ -0,0 +1,76 @@
+/* intl-compat.c - Stub functions to call gettext functions from GNU gettext
+   Library.
+   Copyright (C) 1995 Software Foundation, Inc.
+
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation; either version 2, or (at your option)
+any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program; if not, write to the Free Software
+Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
+
+#ifdef HAVE_CONFIG_H
+# include <config.h>
+#endif
+
+#include "libgettext.h"
+
+/* @@ end of prolog @@ */
+
+
+#undef gettext
+#undef dgettext
+#undef dcgettext
+#undef textdomain
+#undef bindtextdomain
+
+
+char *
+bindtextdomain (domainname, dirname)
+     const char *domainname;
+     const char *dirname;
+{
+  return bindtextdomain__ (domainname, dirname);
+}
+
+
+char *
+dcgettext (domainname, msgid, category)
+     const char *domainname;
+     const char *msgid;
+     int category;
+{
+  return dcgettext__ (domainname, msgid, category);
+}
+
+
+char *
+dgettext (domainname, msgid)
+     const char *domainname;
+     const char *msgid;
+{
+  return dgettext__ (domainname, msgid);
+}
+
+
+char *
+gettext (msgid)
+     const char *msgid;
+{
+  return gettext__ (msgid);
+}
+
+
+char *
+textdomain (domainname)
+     const char *domainname;
+{
+  return textdomain__ (domainname);
+}
diff --git a/intl/l10nflist.c b/intl/l10nflist.c
new file mode 100644
index 0000000..9c7dc18
--- /dev/null
+++ b/intl/l10nflist.c
@@ -0,0 +1,411 @@
+/* Handle list of needed message catalogs
+   Copyright (C) 1995, 1996, 1997 Free Software Foundation, Inc.
+   Contributed by Ulrich Drepper <drepper@gnu.ai.mit.edu>, 1995.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 2, or (at your option)
+   any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software Foundation,
+   Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
+
+#ifdef HAVE_CONFIG_H
+# include <config.h>
+#endif
+
+
+#if defined HAVE_STRING_H || defined _LIBC
+# ifndef _GNU_SOURCE
+#  define _GNU_SOURCE	1
+# endif
+# include <string.h>
+#else
+# include <strings.h>
+# ifndef memcpy
+#  define memcpy(Dst, Src, Num) bcopy (Src, Dst, Num)
+# endif
+#endif
+#if !HAVE_STRCHR && !defined _LIBC
+# ifndef strchr
+#  define strchr index
+# endif
+#endif
+
+#if defined _LIBC || defined HAVE_ARGZ_H
+# include <argz.h>
+#endif
+#include <ctype.h>
+#include <sys/types.h>
+
+#if defined STDC_HEADERS || defined _LIBC
+# include <stdlib.h>
+#endif
+
+#include "loadinfo.h"
+
+/* On some strange systems still no definition of NULL is found.  Sigh!  */
+#ifndef NULL
+# if defined __STDC__ && __STDC__
+#  define NULL ((void *) 0)
+# else
+#  define NULL 0
+# endif
+#endif
+
+/* @@ end of prolog @@ */
+
+#ifdef _LIBC
+/* Rename the non ANSI C functions.  This is required by the standard
+   because some ANSI C functions will require linking with this object
+   file and the name space must not be polluted.  */
+# ifndef stpcpy
+#  define stpcpy(dest, src) __stpcpy(dest, src)
+# endif
+#else
+# ifndef HAVE_STPCPY
+static char *stpcpy PARAMS ((char *dest, const char *src));
+# endif
+#endif
+
+/* Define function which are usually not available.  */
+
+#if !defined _LIBC && !defined HAVE___ARGZ_COUNT
+/* Returns the number of strings in ARGZ.  */
+static size_t argz_count__ PARAMS ((const char *argz, size_t len));
+
+static size_t
+argz_count__ (argz, len)
+     const char *argz;
+     size_t len;
+{
+  size_t count = 0;
+  while (len > 0)
+    {
+      size_t part_len = strlen (argz);
+      argz += part_len + 1;
+      len -= part_len + 1;
+      count++;
+    }
+  return count;
+}
+# undef __argz_count
+# define __argz_count(argz, len) argz_count__ (argz, len)
+#endif	/* !_LIBC && !HAVE___ARGZ_COUNT */
+
+#if !defined _LIBC && !defined HAVE___ARGZ_STRINGIFY
+/* Make '\0' separated arg vector ARGZ printable by converting all the '\0's
+   except the last into the character SEP.  */
+static void argz_stringify__ PARAMS ((char *argz, size_t len, int sep));
+
+static void
+argz_stringify__ (argz, len, sep)
+     char *argz;
+     size_t len;
+     int sep;
+{
+  while (len > 0)
+    {
+      size_t part_len = strlen (argz);
+      argz += part_len;
+      len -= part_len + 1;
+      if (len > 0)
+	*argz++ = sep;
+    }
+}
+# undef __argz_stringify
+# define __argz_stringify(argz, len, sep) argz_stringify__ (argz, len, sep)
+#endif	/* !_LIBC && !HAVE___ARGZ_STRINGIFY */
+
+#if !defined _LIBC && !defined HAVE___ARGZ_NEXT
+static char *argz_next__ PARAMS ((char *argz, size_t argz_len,
+				  const char *entry));
+
+static char *
+argz_next__ (argz, argz_len, entry)
+     char *argz;
+     size_t argz_len;
+     const char *entry;
+{
+  if (entry)
+    {
+      if (entry < argz + argz_len)
+        entry = strchr (entry, '\0') + 1;
+
+      return entry >= argz + argz_len ? NULL : (char *) entry;
+    }
+  else
+    if (argz_len > 0)
+      return argz;
+    else
+      return 0;
+}
+# undef __argz_next
+# define __argz_next(argz, len, entry) argz_next__ (argz, len, entry)
+#endif	/* !_LIBC && !HAVE___ARGZ_NEXT */
+
+
+/* Return number of bits set in X.  */
+static int pop PARAMS ((int x));
+
+static inline int
+pop (x)
+     int x;
+{
+  /* We assume that no more than 16 bits are used.  */
+  x = ((x & ~0x5555) >> 1) + (x & 0x5555);
+  x = ((x & ~0x3333) >> 2) + (x & 0x3333);
+  x = ((x >> 4) + x) & 0x0f0f;
+  x = ((x >> 8) + x) & 0xff;
+
+  return x;
+}
+
+
+struct loaded_l10nfile *
+_nl_make_l10nflist (l10nfile_list, dirlist, dirlist_len, mask, language,
+		    territory, codeset, normalized_codeset, modifier, special,
+		    sponsor, revision, filename, do_allocate)
+     struct loaded_l10nfile **l10nfile_list;
+     const char *dirlist;
+     size_t dirlist_len;
+     int mask;
+     const char *language;
+     const char *territory;
+     const char *codeset;
+     const char *normalized_codeset;
+     const char *modifier;
+     const char *special;
+     const char *sponsor;
+     const char *revision;
+     const char *filename;
+     int do_allocate;
+{
+  char *abs_filename;
+  struct loaded_l10nfile *last = NULL;
+  struct loaded_l10nfile *retval;
+  char *cp;
+  size_t entries;
+  int cnt;
+
+  /* Allocate room for the full file name.  */
+  abs_filename = (char *) malloc (dirlist_len
+				  + strlen (language)
+				  + ((mask & TERRITORY) != 0
+				     ? strlen (territory) + 1 : 0)
+				  + ((mask & XPG_CODESET) != 0
+				     ? strlen (codeset) + 1 : 0)
+				  + ((mask & XPG_NORM_CODESET) != 0
+				     ? strlen (normalized_codeset) + 1 : 0)
+				  + (((mask & XPG_MODIFIER) != 0
+				      || (mask & CEN_AUDIENCE) != 0)
+				     ? strlen (modifier) + 1 : 0)
+				  + ((mask & CEN_SPECIAL) != 0
+				     ? strlen (special) + 1 : 0)
+				  + (((mask & CEN_SPONSOR) != 0
+				      || (mask & CEN_REVISION) != 0)
+				     ? (1 + ((mask & CEN_SPONSOR) != 0
+					     ? strlen (sponsor) + 1 : 0)
+					+ ((mask & CEN_REVISION) != 0
+					   ? strlen (revision) + 1 : 0)) : 0)
+				  + 1 + strlen (filename) + 1);
+
+  if (abs_filename == NULL)
+    return NULL;
+
+  retval = NULL;
+  last = NULL;
+
+  /* Construct file name.  */
+  memcpy (abs_filename, dirlist, dirlist_len);
+  __argz_stringify (abs_filename, dirlist_len, ':');
+  cp = abs_filename + (dirlist_len - 1);
+  *cp++ = '/';
+  cp = stpcpy (cp, language);
+
+  if ((mask & TERRITORY) != 0)
+    {
+      *cp++ = '_';
+      cp = stpcpy (cp, territory);
+    }
+  if ((mask & XPG_CODESET) != 0)
+    {
+      *cp++ = '.';
+      cp = stpcpy (cp, codeset);
+    }
+  if ((mask & XPG_NORM_CODESET) != 0)
+    {
+      *cp++ = '.';
+      cp = stpcpy (cp, normalized_codeset);
+    }
+  if ((mask & (XPG_MODIFIER | CEN_AUDIENCE)) != 0)
+    {
+      /* This component can be part of both syntaces but has different
+	 leading characters.  For CEN we use `+', else `@'.  */
+      *cp++ = (mask & CEN_AUDIENCE) != 0 ? '+' : '@';
+      cp = stpcpy (cp, modifier);
+    }
+  if ((mask & CEN_SPECIAL) != 0)
+    {
+      *cp++ = '+';
+      cp = stpcpy (cp, special);
+    }
+  if ((mask & (CEN_SPONSOR | CEN_REVISION)) != 0)
+    {
+      *cp++ = ',';
+      if ((mask & CEN_SPONSOR) != 0)
+	cp = stpcpy (cp, sponsor);
+      if ((mask & CEN_REVISION) != 0)
+	{
+	  *cp++ = '_';
+	  cp = stpcpy (cp, revision);
+	}
+    }
+
+  *cp++ = '/';
+  stpcpy (cp, filename);
+
+  /* Look in list of already loaded domains whether it is already
+     available.  */
+  last = NULL;
+  for (retval = *l10nfile_list; retval != NULL; retval = retval->next)
+    if (retval->filename != NULL)
+      {
+	int compare = strcmp (retval->filename, abs_filename);
+	if (compare == 0)
+	  /* We found it!  */
+	  break;
+	if (compare < 0)
+	  {
+	    /* It's not in the list.  */
+	    retval = NULL;
+	    break;
+	  }
+
+	last = retval;
+      }
+
+  if (retval != NULL || do_allocate == 0)
+    {
+      free (abs_filename);
+      return retval;
+    }
+
+  retval = (struct loaded_l10nfile *)
+    malloc (sizeof (*retval) + (__argz_count (dirlist, dirlist_len)
+				* (1 << pop (mask))
+				* sizeof (struct loaded_l10nfile *)));
+  if (retval == NULL)
+    return NULL;
+
+  retval->filename = abs_filename;
+  retval->decided = (__argz_count (dirlist, dirlist_len) != 1
+		     || ((mask & XPG_CODESET) != 0
+			 && (mask & XPG_NORM_CODESET) != 0));
+  retval->data = NULL;
+
+  if (last == NULL)
+    {
+      retval->next = *l10nfile_list;
+      *l10nfile_list = retval;
+    }
+  else
+    {
+      retval->next = last->next;
+      last->next = retval;
+    }
+
+  entries = 0;
+  /* If the DIRLIST is a real list the RETVAL entry corresponds not to
+     a real file.  So we have to use the DIRLIST separation mechanism
+     of the inner loop.  */
+  cnt = __argz_count (dirlist, dirlist_len) == 1 ? mask - 1 : mask;
+  for (; cnt >= 0; --cnt)
+    if ((cnt & ~mask) == 0
+	&& ((cnt & CEN_SPECIFIC) == 0 || (cnt & XPG_SPECIFIC) == 0)
+	&& ((cnt & XPG_CODESET) == 0 || (cnt & XPG_NORM_CODESET) == 0))
+      {
+	/* Iterate over all elements of the DIRLIST.  */
+	char *dir = NULL;
+
+	while ((dir = __argz_next ((char *) dirlist, dirlist_len, dir))
+	       != NULL)
+	  retval->successor[entries++]
+	    = _nl_make_l10nflist (l10nfile_list, dir, strlen (dir) + 1, cnt,
+				  language, territory, codeset,
+				  normalized_codeset, modifier, special,
+				  sponsor, revision, filename, 1);
+      }
+  retval->successor[entries] = NULL;
+
+  return retval;
+}
+
+/* Normalize codeset name.  There is no standard for the codeset
+   names.  Normalization allows the user to use any of the common
+   names.  */
+const char *
+_nl_normalize_codeset (codeset, name_len)
+     const unsigned char *codeset;
+     size_t name_len;
+{
+  int len = 0;
+  int only_digit = 1;
+  char *retval;
+  char *wp;
+  size_t cnt;
+
+  for (cnt = 0; cnt < name_len; ++cnt)
+    if (isalnum (codeset[cnt]))
+      {
+	++len;
+
+	if (isalpha (codeset[cnt]))
+	  only_digit = 0;
+      }
+
+  retval = (char *) malloc ((only_digit ? 3 : 0) + len + 1);
+
+  if (retval != NULL)
+    {
+      if (only_digit)
+	wp = stpcpy (retval, "iso");
+      else
+	wp = retval;
+
+      for (cnt = 0; cnt < name_len; ++cnt)
+	if (isalpha (codeset[cnt]))
+	  *wp++ = tolower (codeset[cnt]);
+	else if (isdigit (codeset[cnt]))
+	  *wp++ = codeset[cnt];
+
+      *wp = '\0';
+    }
+
+  return (const char *) retval;
+}
+
+
+/* @@ begin of epilog @@ */
+
+/* We don't want libintl.a to depend on any other library.  So we
+   avoid the non-standard function stpcpy.  In GNU C Library this
+   function is available, though.  Also allow the symbol HAVE_STPCPY
+   to be defined.  */
+#if !_LIBC && !HAVE_STPCPY
+static char *
+stpcpy (dest, src)
+     char *dest;
+     const char *src;
+{
+  while ((*dest++ = *src++) != '\0')
+    /* Do nothing. */ ;
+  return dest - 1;
+}
+#endif
diff --git a/intl/libgettext.h b/intl/libgettext.h
new file mode 100644
index 0000000..3a92960
--- /dev/null
+++ b/intl/libgettext.h
@@ -0,0 +1,182 @@
+/* Message catalogs for internationalization.
+   Copyright (C) 1995, 1996, 1997, 1998 Free Software Foundation, Inc.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 2, or (at your option)
+   any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software Foundation,
+   Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
+
+/* Because on some systems (e.g. Solaris) we sometimes have to include
+   the systems libintl.h as well as this file we have more complex
+   include protection above.  But the systems header might perhaps also
+   define _LIBINTL_H and therefore we have to protect the definition here.  */
+
+#if !defined _LIBINTL_H || !defined _LIBGETTEXT_H
+#ifndef _LIBINTL_H
+# define _LIBINTL_H	1
+#endif
+#define _LIBGETTEXT_H	1
+
+/* We define an additional symbol to signal that we use the GNU
+   implementation of gettext.  */
+#define __USE_GNU_GETTEXT 1
+
+#include <sys/types.h>
+
+#if HAVE_LOCALE_H
+# include <locale.h>
+#endif
+
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/* @@ end of prolog @@ */
+
+#ifndef PARAMS
+# if __STDC__ || defined __cplusplus
+#  define PARAMS(args) args
+# else
+#  define PARAMS(args) ()
+# endif
+#endif
+
+#ifndef NULL
+# if !defined __cplusplus || defined __GNUC__
+#  define NULL ((void *) 0)
+# else
+#  define NULL (0)
+# endif
+#endif
+
+#if !HAVE_LC_MESSAGES
+/* This value determines the behaviour of the gettext() and dgettext()
+   function.  But some system does not have this defined.  Define it
+   to a default value.  */
+# define LC_MESSAGES (-1)
+#endif
+
+
+/* Declarations for gettext-using-catgets interface.  Derived from
+   Jim Meyering's libintl.h.  */
+struct _msg_ent
+{
+  const char *_msg;
+  int _msg_number;
+};
+
+
+#if HAVE_CATGETS
+/* These two variables are defined in the automatically by po-to-tbl.sed
+   generated file `cat-id-tbl.c'.  */
+extern const struct _msg_ent _msg_tbl[];
+extern int _msg_tbl_length;
+#endif
+
+
+/* For automatical extraction of messages sometimes no real
+   translation is needed.  Instead the string itself is the result.  */
+#define gettext_noop(Str) (Str)
+
+/* Look up MSGID in the current default message catalog for the current
+   LC_MESSAGES locale.  If not found, returns MSGID itself (the default
+   text).  */
+extern char *gettext PARAMS ((const char *__msgid));
+extern char *gettext__ PARAMS ((const char *__msgid));
+
+/* Look up MSGID in the DOMAINNAME message catalog for the current
+   LC_MESSAGES locale.  */
+extern char *dgettext PARAMS ((const char *__domainname, const char *__msgid));
+extern char *dgettext__ PARAMS ((const char *__domainname,
+				 const char *__msgid));
+
+/* Look up MSGID in the DOMAINNAME message catalog for the current CATEGORY
+   locale.  */
+extern char *dcgettext PARAMS ((const char *__domainname, const char *__msgid,
+				int __category));
+extern char *dcgettext__ PARAMS ((const char *__domainname,
+				  const char *__msgid, int __category));
+
+
+/* Set the current default message catalog to DOMAINNAME.
+   If DOMAINNAME is null, return the current default.
+   If DOMAINNAME is "", reset to the default of "messages".  */
+extern char *textdomain PARAMS ((const char *__domainname));
+extern char *textdomain__ PARAMS ((const char *__domainname));
+
+/* Specify that the DOMAINNAME message catalog will be found
+   in DIRNAME rather than in the system locale data base.  */
+extern char *bindtextdomain PARAMS ((const char *__domainname,
+				  const char *__dirname));
+extern char *bindtextdomain__ PARAMS ((const char *__domainname,
+				    const char *__dirname));
+
+#if ENABLE_NLS
+
+/* Solaris 2.3 has the gettext function but dcgettext is missing.
+   So we omit this optimization for Solaris 2.3.  BTW, Solaris 2.4
+   has dcgettext.  */
+# if !HAVE_CATGETS && (!HAVE_GETTEXT || HAVE_DCGETTEXT)
+
+#  define gettext(Msgid)						      \
+     dgettext (NULL, Msgid)
+
+#  define dgettext(Domainname, Msgid)					      \
+     dcgettext (Domainname, Msgid, LC_MESSAGES)
+
+#  if defined __GNUC__ && __GNUC__ == 2 && __GNUC_MINOR__ >= 7
+/* This global variable is defined in loadmsgcat.c.  We need a sign,
+   whether a new catalog was loaded, which can be associated with all
+   translations.  */
+extern int _nl_msg_cat_cntr;
+
+#   define dcgettext(Domainname, Msgid, Category)			      \
+  (__extension__							      \
+   ({									      \
+     char *__result;							      \
+     if (__builtin_constant_p (Msgid))					      \
+       {								      \
+	 static char *__translation__;					      \
+	 static int __catalog_counter__;				      \
+	 if (! __translation__ || __catalog_counter__ != _nl_msg_cat_cntr)    \
+	   {								      \
+	     __translation__ =						      \
+	       dcgettext__ (Domainname, Msgid, Category);		      \
+	     __catalog_counter__ = _nl_msg_cat_cntr;			      \
+	   }								      \
+	 __result = __translation__;					      \
+       }								      \
+     else								      \
+       __result = dcgettext__ (Domainname, Msgid, Category);		      \
+     __result;								      \
+    }))
+#  endif
+# endif
+
+#else
+
+# define gettext(Msgid) (Msgid)
+# define dgettext(Domainname, Msgid) (Msgid)
+# define dcgettext(Domainname, Msgid, Category) (Msgid)
+# define textdomain(Domainname) ((char *) Domainname)
+# define bindtextdomain(Domainname, Dirname) ((char *) Dirname)
+
+#endif
+
+/* @@ begin of epilog @@ */
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif
diff --git a/intl/libintl.h b/intl/libintl.h
new file mode 100644
index 0000000..3a92960
--- /dev/null
+++ b/intl/libintl.h
@@ -0,0 +1,182 @@
+/* Message catalogs for internationalization.
+   Copyright (C) 1995, 1996, 1997, 1998 Free Software Foundation, Inc.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 2, or (at your option)
+   any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software Foundation,
+   Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
+
+/* Because on some systems (e.g. Solaris) we sometimes have to include
+   the systems libintl.h as well as this file we have more complex
+   include protection above.  But the systems header might perhaps also
+   define _LIBINTL_H and therefore we have to protect the definition here.  */
+
+#if !defined _LIBINTL_H || !defined _LIBGETTEXT_H
+#ifndef _LIBINTL_H
+# define _LIBINTL_H	1
+#endif
+#define _LIBGETTEXT_H	1
+
+/* We define an additional symbol to signal that we use the GNU
+   implementation of gettext.  */
+#define __USE_GNU_GETTEXT 1
+
+#include <sys/types.h>
+
+#if HAVE_LOCALE_H
+# include <locale.h>
+#endif
+
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/* @@ end of prolog @@ */
+
+#ifndef PARAMS
+# if __STDC__ || defined __cplusplus
+#  define PARAMS(args) args
+# else
+#  define PARAMS(args) ()
+# endif
+#endif
+
+#ifndef NULL
+# if !defined __cplusplus || defined __GNUC__
+#  define NULL ((void *) 0)
+# else
+#  define NULL (0)
+# endif
+#endif
+
+#if !HAVE_LC_MESSAGES
+/* This value determines the behaviour of the gettext() and dgettext()
+   function.  But some system does not have this defined.  Define it
+   to a default value.  */
+# define LC_MESSAGES (-1)
+#endif
+
+
+/* Declarations for gettext-using-catgets interface.  Derived from
+   Jim Meyering's libintl.h.  */
+struct _msg_ent
+{
+  const char *_msg;
+  int _msg_number;
+};
+
+
+#if HAVE_CATGETS
+/* These two variables are defined in the automatically by po-to-tbl.sed
+   generated file `cat-id-tbl.c'.  */
+extern const struct _msg_ent _msg_tbl[];
+extern int _msg_tbl_length;
+#endif
+
+
+/* For automatical extraction of messages sometimes no real
+   translation is needed.  Instead the string itself is the result.  */
+#define gettext_noop(Str) (Str)
+
+/* Look up MSGID in the current default message catalog for the current
+   LC_MESSAGES locale.  If not found, returns MSGID itself (the default
+   text).  */
+extern char *gettext PARAMS ((const char *__msgid));
+extern char *gettext__ PARAMS ((const char *__msgid));
+
+/* Look up MSGID in the DOMAINNAME message catalog for the current
+   LC_MESSAGES locale.  */
+extern char *dgettext PARAMS ((const char *__domainname, const char *__msgid));
+extern char *dgettext__ PARAMS ((const char *__domainname,
+				 const char *__msgid));
+
+/* Look up MSGID in the DOMAINNAME message catalog for the current CATEGORY
+   locale.  */
+extern char *dcgettext PARAMS ((const char *__domainname, const char *__msgid,
+				int __category));
+extern char *dcgettext__ PARAMS ((const char *__domainname,
+				  const char *__msgid, int __category));
+
+
+/* Set the current default message catalog to DOMAINNAME.
+   If DOMAINNAME is null, return the current default.
+   If DOMAINNAME is "", reset to the default of "messages".  */
+extern char *textdomain PARAMS ((const char *__domainname));
+extern char *textdomain__ PARAMS ((const char *__domainname));
+
+/* Specify that the DOMAINNAME message catalog will be found
+   in DIRNAME rather than in the system locale data base.  */
+extern char *bindtextdomain PARAMS ((const char *__domainname,
+				  const char *__dirname));
+extern char *bindtextdomain__ PARAMS ((const char *__domainname,
+				    const char *__dirname));
+
+#if ENABLE_NLS
+
+/* Solaris 2.3 has the gettext function but dcgettext is missing.
+   So we omit this optimization for Solaris 2.3.  BTW, Solaris 2.4
+   has dcgettext.  */
+# if !HAVE_CATGETS && (!HAVE_GETTEXT || HAVE_DCGETTEXT)
+
+#  define gettext(Msgid)						      \
+     dgettext (NULL, Msgid)
+
+#  define dgettext(Domainname, Msgid)					      \
+     dcgettext (Domainname, Msgid, LC_MESSAGES)
+
+#  if defined __GNUC__ && __GNUC__ == 2 && __GNUC_MINOR__ >= 7
+/* This global variable is defined in loadmsgcat.c.  We need a sign,
+   whether a new catalog was loaded, which can be associated with all
+   translations.  */
+extern int _nl_msg_cat_cntr;
+
+#   define dcgettext(Domainname, Msgid, Category)			      \
+  (__extension__							      \
+   ({									      \
+     char *__result;							      \
+     if (__builtin_constant_p (Msgid))					      \
+       {								      \
+	 static char *__translation__;					      \
+	 static int __catalog_counter__;				      \
+	 if (! __translation__ || __catalog_counter__ != _nl_msg_cat_cntr)    \
+	   {								      \
+	     __translation__ =						      \
+	       dcgettext__ (Domainname, Msgid, Category);		      \
+	     __catalog_counter__ = _nl_msg_cat_cntr;			      \
+	   }								      \
+	 __result = __translation__;					      \
+       }								      \
+     else								      \
+       __result = dcgettext__ (Domainname, Msgid, Category);		      \
+     __result;								      \
+    }))
+#  endif
+# endif
+
+#else
+
+# define gettext(Msgid) (Msgid)
+# define dgettext(Domainname, Msgid) (Msgid)
+# define dcgettext(Domainname, Msgid, Category) (Msgid)
+# define textdomain(Domainname) ((char *) Domainname)
+# define bindtextdomain(Domainname, Dirname) ((char *) Dirname)
+
+#endif
+
+/* @@ begin of epilog @@ */
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif
diff --git a/intl/linux-msg.sed b/intl/linux-msg.sed
new file mode 100644
index 0000000..5918e72
--- /dev/null
+++ b/intl/linux-msg.sed
@@ -0,0 +1,100 @@
+# po2msg.sed - Convert Uniforum style .po file to Linux style .msg file
+# Copyright (C) 1995 Free Software Foundation, Inc.
+# Ulrich Drepper <drepper@gnu.ai.mit.edu>, 1995.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+#
+#
+# The first directive in the .msg should be the definition of the
+# message set number.  We use always set number 1.
+#
+1 {
+  i\
+$set 1 # Automatically created by po2msg.sed
+  h
+  s/.*/0/
+  x
+}
+#
+# Mitch's old catalog format does not allow comments.
+#
+# We copy the original message as a comment into the .msg file.
+#
+/^msgid/ {
+  s/msgid[ 	]*"//
+#
+# This does not work now with the new format.
+# /"$/! {
+#   s/\\$//
+#   s/$/ ... (more lines following)"/
+# }
+  x
+# The following nice solution is by
+# Bruno <Haible@ma2s2.mathematik.uni-karlsruhe.de>
+  td
+# Increment a decimal number in pattern space.
+# First hide trailing `9' digits.
+  :d
+  s/9\(_*\)$/_\1/
+  td
+# Assure at least one digit is available.
+  s/^\(_*\)$/0\1/
+# Increment the last digit.
+  s/8\(_*\)$/9\1/
+  s/7\(_*\)$/8\1/
+  s/6\(_*\)$/7\1/
+  s/5\(_*\)$/6\1/
+  s/4\(_*\)$/5\1/
+  s/3\(_*\)$/4\1/
+  s/2\(_*\)$/3\1/
+  s/1\(_*\)$/2\1/
+  s/0\(_*\)$/1\1/
+# Convert the hidden `9' digits to `0's.
+  s/_/0/g
+  x
+  G
+  s/\(.*\)"\n\([0-9]*\)/$ #\2 Original Message:(\1)/p
+}
+#
+# The .msg file contains, other then the .po file, only the translations
+# but each given a unique ID.  Starting from 1 and incrementing by 1 for
+# each message we assign them to the messages.
+# It is important that the .po file used to generate the cat-id-tbl.c file
+# (with po-to-tbl) is the same as the one used here.  (At least the order
+# of declarations must not be changed.)
+#
+/^msgstr/ {
+  s/msgstr[ 	]*"\(.*\)"/# \1/
+# Clear substitution flag.
+  tb
+# Append the next line.
+  :b
+  N
+# Look whether second part is continuation line.
+  s/\(.*\n\)"\(.*\)"/\1\2/
+# Yes, then branch.
+  ta
+  P
+  D
+# Note that D includes a jump to the start!!
+# We found a continuation line.  But before printing insert '\'.
+  :a
+  s/\(.*\)\(\n.*\)/\1\\\2/
+  P
+# We cannot use D here.
+  s/.*\n\(.*\)/\1/
+  tb
+}
+d
diff --git a/intl/loadinfo.h b/intl/loadinfo.h
new file mode 100644
index 0000000..f4ebf6d
--- /dev/null
+++ b/intl/loadinfo.h
@@ -0,0 +1,76 @@
+/* Copyright (C) 1996, 1997 Free Software Foundation, Inc.
+   This file is part of the GNU C Library.
+   Contributed by Ulrich Drepper <drepper@cygnus.com>, 1996.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 2, or (at your option)
+   any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software Foundation,
+   Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
+
+#ifndef PARAMS
+# if __STDC__
+#  define PARAMS(args) args
+# else
+#  define PARAMS(args) ()
+# endif
+#endif
+
+/* Encoding of locale name parts.  */
+#define CEN_REVISION		1
+#define CEN_SPONSOR		2
+#define CEN_SPECIAL		4
+#define XPG_NORM_CODESET	8
+#define XPG_CODESET		16
+#define TERRITORY		32
+#define CEN_AUDIENCE		64
+#define XPG_MODIFIER		128
+
+#define CEN_SPECIFIC	(CEN_REVISION|CEN_SPONSOR|CEN_SPECIAL|CEN_AUDIENCE)
+#define XPG_SPECIFIC	(XPG_CODESET|XPG_NORM_CODESET|XPG_MODIFIER)
+
+
+struct loaded_l10nfile
+{
+  const char *filename;
+  int decided;
+
+  const void *data;
+
+  struct loaded_l10nfile *next;
+  struct loaded_l10nfile *successor[1];
+};
+
+
+extern const char *_nl_normalize_codeset PARAMS ((const unsigned char *codeset,
+						  size_t name_len));
+
+extern struct loaded_l10nfile *
+_nl_make_l10nflist PARAMS ((struct loaded_l10nfile **l10nfile_list,
+			    const char *dirlist, size_t dirlist_len, int mask,
+			    const char *language, const char *territory,
+			    const char *codeset,
+			    const char *normalized_codeset,
+			    const char *modifier, const char *special,
+			    const char *sponsor, const char *revision,
+			    const char *filename, int do_allocate));
+
+
+extern const char *_nl_expand_alias PARAMS ((const char *name));
+
+extern int _nl_explode_name PARAMS ((char *name, const char **language,
+				     const char **modifier,
+				     const char **territory,
+				     const char **codeset,
+				     const char **normalized_codeset,
+				     const char **special,
+				     const char **sponsor,
+				     const char **revision));
diff --git a/intl/loadmsgcat.c b/intl/loadmsgcat.c
new file mode 100644
index 0000000..515892d
--- /dev/null
+++ b/intl/loadmsgcat.c
@@ -0,0 +1,222 @@
+/* Load needed message catalogs.
+   Copyright (C) 1995, 1996, 1997, 1998 Free Software Foundation, Inc.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 2, or (at your option)
+   any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software Foundation,
+   Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
+
+#ifdef HAVE_CONFIG_H
+# include <config.h>
+#endif
+
+#include <fcntl.h>
+#include <sys/types.h>
+#include <sys/stat.h>
+
+#if defined STDC_HEADERS || defined _LIBC
+# include <stdlib.h>
+#endif
+
+#if defined HAVE_UNISTD_H || defined _LIBC
+# include <unistd.h>
+#endif
+
+#if (defined HAVE_MMAP && defined HAVE_MUNMAP) || defined _LIBC
+# include <sys/mman.h>
+#endif
+
+#include "gettext.h"
+#include "gettextP.h"
+
+/* @@ end of prolog @@ */
+
+#ifdef _LIBC
+/* Rename the non ISO C functions.  This is required by the standard
+   because some ISO C functions will require linking with this object
+   file and the name space must not be polluted.  */
+# define open   __open
+# define close  __close
+# define read   __read
+# define mmap   __mmap
+# define munmap __munmap
+#endif
+
+/* We need a sign, whether a new catalog was loaded, which can be associated
+   with all translations.  This is important if the translations are
+   cached by one of GCC's features.  */
+int _nl_msg_cat_cntr = 0;
+
+
+/* Load the message catalogs specified by FILENAME.  If it is no valid
+   message catalog do nothing.  */
+void
+internal_function
+_nl_load_domain (domain_file)
+     struct loaded_l10nfile *domain_file;
+{
+  int fd;
+  size_t size;
+  struct stat st;
+  struct mo_file_header *data = (struct mo_file_header *) -1;
+#if (defined HAVE_MMAP && defined HAVE_MUNMAP && !defined DISALLOW_MMAP) \
+    || defined _LIBC
+  int use_mmap = 0;
+#endif
+  struct loaded_domain *domain;
+
+  domain_file->decided = 1;
+  domain_file->data = NULL;
+
+  /* If the record does not represent a valid locale the FILENAME
+     might be NULL.  This can happen when according to the given
+     specification the locale file name is different for XPG and CEN
+     syntax.  */
+  if (domain_file->filename == NULL)
+    return;
+
+  /* Try to open the addressed file.  */
+  fd = open (domain_file->filename, O_RDONLY);
+  if (fd == -1)
+    return;
+
+  /* We must know about the size of the file.  */
+  if (fstat (fd, &st) != 0
+      || (size = (size_t) st.st_size) != st.st_size
+      || size < sizeof (struct mo_file_header))
+    {
+      /* Something went wrong.  */
+      close (fd);
+      return;
+    }
+
+#if (defined HAVE_MMAP && defined HAVE_MUNMAP && !defined DISALLOW_MMAP) \
+    || defined _LIBC
+  /* Now we are ready to load the file.  If mmap() is available we try
+     this first.  If not available or it failed we try to load it.  */
+  data = (struct mo_file_header *) mmap (NULL, size, PROT_READ,
+					 MAP_PRIVATE, fd, 0);
+
+  if (data != (struct mo_file_header *) -1)
+    {
+      /* mmap() call was successful.  */
+      close (fd);
+      use_mmap = 1;
+    }
+#endif
+
+  /* If the data is not yet available (i.e. mmap'ed) we try to load
+     it manually.  */
+  if (data == (struct mo_file_header *) -1)
+    {
+      size_t to_read;
+      char *read_ptr;
+
+      data = (struct mo_file_header *) malloc (size);
+      if (data == NULL)
+	return;
+
+      to_read = size;
+      read_ptr = (char *) data;
+      do
+	{
+	  long int nb = (long int) read (fd, read_ptr, to_read);
+	  if (nb == -1)
+	    {
+	      close (fd);
+	      return;
+	    }
+
+	  read_ptr += nb;
+	  to_read -= nb;
+	}
+      while (to_read > 0);
+
+      close (fd);
+    }
+
+  /* Using the magic number we can test whether it really is a message
+     catalog file.  */
+  if (data->magic != _MAGIC && data->magic != _MAGIC_SWAPPED)
+    {
+      /* The magic number is wrong: not a message catalog file.  */
+#if (defined HAVE_MMAP && defined HAVE_MUNMAP && !defined DISALLOW_MMAP) \
+    || defined _LIBC
+      if (use_mmap)
+	munmap ((caddr_t) data, size);
+      else
+#endif
+	free (data);
+      return;
+    }
+
+  domain_file->data
+    = (struct loaded_domain *) malloc (sizeof (struct loaded_domain));
+  if (domain_file->data == NULL)
+    return;
+
+  domain = (struct loaded_domain *) domain_file->data;
+  domain->data = (char *) data;
+#if (defined HAVE_MMAP && defined HAVE_MUNMAP && !defined DISALLOW_MMAP) \
+    || defined _LIBC
+  domain->use_mmap = use_mmap;
+#endif
+  domain->mmap_size = size;
+  domain->must_swap = data->magic != _MAGIC;
+
+  /* Fill in the information about the available tables.  */
+  switch (W (domain->must_swap, data->revision))
+    {
+    case 0:
+      domain->nstrings = W (domain->must_swap, data->nstrings);
+      domain->orig_tab = (struct string_desc *)
+	((char *) data + W (domain->must_swap, data->orig_tab_offset));
+      domain->trans_tab = (struct string_desc *)
+	((char *) data + W (domain->must_swap, data->trans_tab_offset));
+      domain->hash_size = W (domain->must_swap, data->hash_tab_size);
+      domain->hash_tab = (nls_uint32 *)
+	((char *) data + W (domain->must_swap, data->hash_tab_offset));
+      break;
+    default:
+      /* This is an illegal revision.  */
+#if (defined HAVE_MMAP && defined HAVE_MUNMAP && !defined DISALLOW_MMAP) \
+    || defined _LIBC
+      if (use_mmap)
+	munmap ((caddr_t) data, size);
+      else
+#endif
+	free (data);
+      free (domain);
+      domain_file->data = NULL;
+      return;
+    }
+
+  /* Show that one domain is changed.  This might make some cached
+     translations invalid.  */
+  ++_nl_msg_cat_cntr;
+}
+
+
+#ifdef _LIBC
+void
+internal_function
+_nl_unload_domain (domain)
+     struct loaded_domain *domain;
+{
+  if (domain->use_mmap)
+    munmap ((caddr_t) domain->data, domain->mmap_size);
+  else
+    free ((void *) domain->data);
+
+  free (domain);
+}
+#endif
diff --git a/intl/localealias.c b/intl/localealias.c
new file mode 100644
index 0000000..bca555a
--- /dev/null
+++ b/intl/localealias.c
@@ -0,0 +1,424 @@
+/* Handle aliases for locale names.
+   Copyright (C) 1995, 1996, 1997, 1998 Free Software Foundation, Inc.
+   Written by Ulrich Drepper <drepper@gnu.ai.mit.edu>, 1995.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 2, or (at your option)
+   any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software Foundation,
+   Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
+
+#ifdef HAVE_CONFIG_H
+# include <config.h>
+#endif
+
+#include <ctype.h>
+#include <stdio.h>
+#include <sys/types.h>
+
+#ifdef __GNUC__
+# define alloca __builtin_alloca
+# define HAVE_ALLOCA 1
+#else
+# if defined HAVE_ALLOCA_H || defined _LIBC
+#  include <alloca.h>
+# else
+#  ifdef _AIX
+ #pragma alloca
+#  else
+#   ifndef alloca
+char *alloca ();
+#   endif
+#  endif
+# endif
+#endif
+
+#if defined STDC_HEADERS || defined _LIBC
+# include <stdlib.h>
+#else
+char *getenv ();
+# ifdef HAVE_MALLOC_H
+#  include <malloc.h>
+# else
+void free ();
+# endif
+#endif
+
+#if defined HAVE_STRING_H || defined _LIBC
+# ifndef _GNU_SOURCE
+#  define _GNU_SOURCE	1
+# endif
+# include <string.h>
+#else
+# include <strings.h>
+# ifndef memcpy
+#  define memcpy(Dst, Src, Num) bcopy (Src, Dst, Num)
+# endif
+#endif
+#if !HAVE_STRCHR && !defined _LIBC
+# ifndef strchr
+#  define strchr index
+# endif
+#endif
+
+#include "gettext.h"
+#include "gettextP.h"
+
+/* @@ end of prolog @@ */
+
+#ifdef _LIBC
+/* Rename the non ANSI C functions.  This is required by the standard
+   because some ANSI C functions will require linking with this object
+   file and the name space must not be polluted.  */
+# define strcasecmp __strcasecmp
+
+# define mempcpy __mempcpy
+# define HAVE_MEMPCPY	1
+
+/* We need locking here since we can be called from different places.  */
+# include <bits/libc-lock.h>
+
+__libc_lock_define_initialized (static, lock);
+#endif
+
+
+/* For those loosing systems which don't have `alloca' we have to add
+   some additional code emulating it.  */
+#ifdef HAVE_ALLOCA
+/* Nothing has to be done.  */
+# define ADD_BLOCK(list, address) /* nothing */
+# define FREE_BLOCKS(list) /* nothing */
+#else
+struct block_list
+{
+  void *address;
+  struct block_list *next;
+};
+# define ADD_BLOCK(list, addr)						      \
+  do {									      \
+    struct block_list *newp = (struct block_list *) malloc (sizeof (*newp));  \
+    /* If we cannot get a free block we cannot add the new element to	      \
+       the list.  */							      \
+    if (newp != NULL) {							      \
+      newp->address = (addr);						      \
+      newp->next = (list);						      \
+      (list) = newp;							      \
+    }									      \
+  } while (0)
+# define FREE_BLOCKS(list)						      \
+  do {									      \
+    while (list != NULL) {						      \
+      struct block_list *old = list;					      \
+      list = list->next;						      \
+      free (old);							      \
+    }									      \
+  } while (0)
+# undef alloca
+# define alloca(size) (malloc (size))
+#endif	/* have alloca */
+
+
+struct alias_map
+{
+  const char *alias;
+  const char *value;
+};
+
+
+static char *string_space = NULL;
+static size_t string_space_act = 0;
+static size_t string_space_max = 0;
+static struct alias_map *map;
+static size_t nmap = 0;
+static size_t maxmap = 0;
+
+
+/* Prototypes for local functions.  */
+static size_t read_alias_file PARAMS ((const char *fname, int fname_len))
+     internal_function;
+static void extend_alias_table PARAMS ((void));
+static int alias_compare PARAMS ((const struct alias_map *map1,
+				  const struct alias_map *map2));
+
+
+const char *
+_nl_expand_alias (name)
+    const char *name;
+{
+  static const char *locale_alias_path = LOCALE_ALIAS_PATH;
+  struct alias_map *retval;
+  const char *result = NULL;
+  size_t added;
+
+#ifdef _LIBC
+  __libc_lock_lock (lock);
+#endif
+
+  do
+    {
+      struct alias_map item;
+
+      item.alias = name;
+
+      if (nmap > 0)
+	retval = (struct alias_map *) bsearch (&item, map, nmap,
+					       sizeof (struct alias_map),
+					       (int (*) PARAMS ((const void *,
+								 const void *))
+						) alias_compare);
+      else
+	retval = NULL;
+
+      /* We really found an alias.  Return the value.  */
+      if (retval != NULL)
+	{
+	  result = retval->value;
+	  break;
+	}
+
+      /* Perhaps we can find another alias file.  */
+      added = 0;
+      while (added == 0 && locale_alias_path[0] != '\0')
+	{
+	  const char *start;
+
+	  while (locale_alias_path[0] == ':')
+	    ++locale_alias_path;
+	  start = locale_alias_path;
+
+	  while (locale_alias_path[0] != '\0' && locale_alias_path[0] != ':')
+	    ++locale_alias_path;
+
+	  if (start < locale_alias_path)
+	    added = read_alias_file (start, locale_alias_path - start);
+	}
+    }
+  while (added != 0);
+
+#ifdef _LIBC
+  __libc_lock_unlock (lock);
+#endif
+
+  return result;
+}
+
+
+static size_t
+internal_function
+read_alias_file (fname, fname_len)
+     const char *fname;
+     int fname_len;
+{
+#ifndef HAVE_ALLOCA
+  struct block_list *block_list = NULL;
+#endif
+  FILE *fp;
+  char *full_fname;
+  size_t added;
+  static const char aliasfile[] = "/locale.alias";
+
+  full_fname = (char *) alloca (fname_len + sizeof aliasfile);
+  ADD_BLOCK (block_list, full_fname);
+#ifdef HAVE_MEMPCPY
+  mempcpy (mempcpy (full_fname, fname, fname_len),
+	   aliasfile, sizeof aliasfile);
+#else
+  memcpy (full_fname, fname, fname_len);
+  memcpy (&full_fname[fname_len], aliasfile, sizeof aliasfile);
+#endif
+
+  fp = fopen (full_fname, "r");
+  if (fp == NULL)
+    {
+      FREE_BLOCKS (block_list);
+      return 0;
+    }
+
+  added = 0;
+  while (!feof (fp))
+    {
+      /* It is a reasonable approach to use a fix buffer here because
+	 a) we are only interested in the first two fields
+	 b) these fields must be usable as file names and so must not
+	    be that long
+       */
+      unsigned char buf[BUFSIZ];
+      unsigned char *alias;
+      unsigned char *value;
+      unsigned char *cp;
+
+      if (fgets (buf, sizeof buf, fp) == NULL)
+	/* EOF reached.  */
+	break;
+
+      /* Possibly not the whole line fits into the buffer.  Ignore
+	 the rest of the line.  */
+      if (strchr (buf, '\n') == NULL)
+	{
+	  char altbuf[BUFSIZ];
+	  do
+	    if (fgets (altbuf, sizeof altbuf, fp) == NULL)
+	      /* Make sure the inner loop will be left.  The outer loop
+		 will exit at the `feof' test.  */
+	      break;
+	  while (strchr (altbuf, '\n') == NULL);
+	}
+
+      cp = buf;
+      /* Ignore leading white space.  */
+      while (isspace (cp[0]))
+	++cp;
+
+      /* A leading '#' signals a comment line.  */
+      if (cp[0] != '\0' && cp[0] != '#')
+	{
+	  alias = cp++;
+	  while (cp[0] != '\0' && !isspace (cp[0]))
+	    ++cp;
+	  /* Terminate alias name.  */
+	  if (cp[0] != '\0')
+	    *cp++ = '\0';
+
+	  /* Now look for the beginning of the value.  */
+	  while (isspace (cp[0]))
+	    ++cp;
+
+	  if (cp[0] != '\0')
+	    {
+	      size_t alias_len;
+	      size_t value_len;
+
+	      value = cp++;
+	      while (cp[0] != '\0' && !isspace (cp[0]))
+		++cp;
+	      /* Terminate value.  */
+	      if (cp[0] == '\n')
+		{
+		  /* This has to be done to make the following test
+		     for the end of line possible.  We are looking for
+		     the terminating '\n' which do not overwrite here.  */
+		  *cp++ = '\0';
+		  *cp = '\n';
+		}
+	      else if (cp[0] != '\0')
+		*cp++ = '\0';
+
+	      if (nmap >= maxmap)
+		extend_alias_table ();
+
+	      alias_len = strlen (alias) + 1;
+	      value_len = strlen (value) + 1;
+
+	      if (string_space_act + alias_len + value_len > string_space_max)
+		{
+		  /* Increase size of memory pool.  */
+		  size_t new_size = (string_space_max
+				     + (alias_len + value_len > 1024
+					? alias_len + value_len : 1024));
+		  char *new_pool = (char *) realloc (string_space, new_size);
+		  if (new_pool == NULL)
+		    {
+		      FREE_BLOCKS (block_list);
+		      return added;
+		    }
+		  string_space = new_pool;
+		  string_space_max = new_size;
+		}
+
+	      map[nmap].alias = memcpy (&string_space[string_space_act],
+					alias, alias_len);
+	      string_space_act += alias_len;
+
+	      map[nmap].value = memcpy (&string_space[string_space_act],
+					value, value_len);
+	      string_space_act += value_len;
+
+	      ++nmap;
+	      ++added;
+	    }
+	}
+    }
+
+  /* Should we test for ferror()?  I think we have to silently ignore
+     errors.  --drepper  */
+  fclose (fp);
+
+  if (added > 0)
+    qsort (map, nmap, sizeof (struct alias_map),
+	   (int (*) PARAMS ((const void *, const void *))) alias_compare);
+
+  FREE_BLOCKS (block_list);
+  return added;
+}
+
+
+static void
+extend_alias_table ()
+{
+  size_t new_size;
+  struct alias_map *new_map;
+
+  new_size = maxmap == 0 ? 100 : 2 * maxmap;
+  new_map = (struct alias_map *) realloc (map, (new_size
+						* sizeof (struct alias_map)));
+  if (new_map == NULL)
+    /* Simply don't extend: we don't have any more core.  */
+    return;
+
+  map = new_map;
+  maxmap = new_size;
+}
+
+
+#ifdef _LIBC
+static void __attribute__ ((unused))
+free_mem (void)
+{
+  if (string_space != NULL)
+    free (string_space);
+  if (map != NULL)
+    free (map);
+}
+text_set_element (__libc_subfreeres, free_mem);
+#endif
+
+
+static int
+alias_compare (map1, map2)
+     const struct alias_map *map1;
+     const struct alias_map *map2;
+{
+#if defined _LIBC || defined HAVE_STRCASECMP
+  return strcasecmp (map1->alias, map2->alias);
+#else
+  const unsigned char *p1 = (const unsigned char *) map1->alias;
+  const unsigned char *p2 = (const unsigned char *) map2->alias;
+  unsigned char c1, c2;
+
+  if (p1 == p2)
+    return 0;
+
+  do
+    {
+      /* I know this seems to be odd but the tolower() function in
+	 some systems libc cannot handle nonalpha characters.  */
+      c1 = isupper (*p1) ? tolower (*p1) : *p1;
+      c2 = isupper (*p2) ? tolower (*p2) : *p2;
+      if (c1 == '\0')
+	break;
+      ++p1;
+      ++p2;
+    }
+  while (c1 == c2);
+
+  return c1 - c2;
+#endif
+}
diff --git a/intl/po2tbl.sed.in b/intl/po2tbl.sed.in
new file mode 100644
index 0000000..b3bcca4
--- /dev/null
+++ b/intl/po2tbl.sed.in
@@ -0,0 +1,102 @@
+# po2tbl.sed - Convert Uniforum style .po file to lookup table for catgets
+# Copyright (C) 1995 Free Software Foundation, Inc.
+# Ulrich Drepper <drepper@gnu.ai.mit.edu>, 1995.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+#
+1 {
+  i\
+/* Automatically generated by po2tbl.sed from @PACKAGE NAME@.pot.  */\
+\
+#if HAVE_CONFIG_H\
+# include <config.h>\
+#endif\
+\
+#include "libgettext.h"\
+\
+const struct _msg_ent _msg_tbl[] = {
+  h
+  s/.*/0/
+  x
+}
+#
+# Write msgid entries in C array form.
+#
+/^msgid/ {
+  s/msgid[ 	]*\(".*"\)/  {\1/
+  tb
+# Append the next line
+  :b
+  N
+# Look whether second part is continuation line.
+  s/\(.*\)"\(\n\)"\(.*"\)/\1\2\3/
+# Yes, then branch.
+  ta
+# Because we assume that the input file correctly formed the line
+# just read cannot be again be a msgid line.  So it's safe to ignore
+# it.
+  s/\(.*\)\n.*/\1/
+  bc
+# We found a continuation line.  But before printing insert '\'.
+  :a
+  s/\(.*\)\(\n.*\)/\1\\\2/
+  P
+# We cannot use D here.
+  s/.*\n\(.*\)/\1/
+# Some buggy seds do not clear the `successful substitution since last ``t'''
+# flag on `N', so we do a `t' here to clear it.
+  tb
+# Not reached
+  :c
+  x
+# The following nice solution is by
+# Bruno <Haible@ma2s2.mathematik.uni-karlsruhe.de>
+  td
+# Increment a decimal number in pattern space.
+# First hide trailing `9' digits.
+  :d
+  s/9\(_*\)$/_\1/
+  td
+# Assure at least one digit is available.
+  s/^\(_*\)$/0\1/
+# Increment the last digit.
+  s/8\(_*\)$/9\1/
+  s/7\(_*\)$/8\1/
+  s/6\(_*\)$/7\1/
+  s/5\(_*\)$/6\1/
+  s/4\(_*\)$/5\1/
+  s/3\(_*\)$/4\1/
+  s/2\(_*\)$/3\1/
+  s/1\(_*\)$/2\1/
+  s/0\(_*\)$/1\1/
+# Convert the hidden `9' digits to `0's.
+  s/_/0/g
+  x
+  G
+  s/\(.*\)\n\([0-9]*\)/\1, \2},/
+  s/\(.*\)"$/\1/
+  p
+}
+#
+# Last line.
+#
+$ {
+  i\
+};\
+
+  g
+  s/0*\(.*\)/int _msg_tbl_length = \1;/p
+}
+d
diff --git a/intl/textdomain.c b/intl/textdomain.c
new file mode 100644
index 0000000..8855746
--- /dev/null
+++ b/intl/textdomain.c
@@ -0,0 +1,108 @@
+/* Implementation of the textdomain(3) function.
+   Copyright (C) 1995, 1996, 1997, 1998 Free Software Foundation, Inc.
+   Written by Ulrich Drepper <drepper@gnu.ai.mit.edu>, 1995.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 2, or (at your option)
+   any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software Foundation,
+   Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
+
+#ifdef HAVE_CONFIG_H
+# include <config.h>
+#endif
+
+#if defined STDC_HEADERS || defined _LIBC
+# include <stdlib.h>
+#endif
+
+#if defined STDC_HEADERS || defined HAVE_STRING_H || defined _LIBC
+# include <string.h>
+#else
+# include <strings.h>
+# ifndef memcpy
+#  define memcpy(Dst, Src, Num) bcopy (Src, Dst, Num)
+# endif
+#endif
+
+#ifdef _LIBC
+# include <libintl.h>
+#else
+# include "libgettext.h"
+#endif
+
+/* @@ end of prolog @@ */
+
+/* Name of the default text domain.  */
+extern const char _nl_default_default_domain[];
+
+/* Default text domain in which entries for gettext(3) are to be found.  */
+extern const char *_nl_current_default_domain;
+
+
+/* Names for the libintl functions are a problem.  They must not clash
+   with existing names and they should follow ANSI C.  But this source
+   code is also used in GNU C Library where the names have a __
+   prefix.  So we have to make a difference here.  */
+#ifdef _LIBC
+# define TEXTDOMAIN __textdomain
+# ifndef strdup
+#  define strdup(str) __strdup (str)
+# endif
+#else
+# define TEXTDOMAIN textdomain__
+#endif
+
+/* Set the current default message catalog to DOMAINNAME.
+   If DOMAINNAME is null, return the current default.
+   If DOMAINNAME is "", reset to the default of "messages".  */
+char *
+TEXTDOMAIN (domainname)
+     const char *domainname;
+{
+  char *old;
+
+  /* A NULL pointer requests the current setting.  */
+  if (domainname == NULL)
+    return (char *) _nl_current_default_domain;
+
+  old = (char *) _nl_current_default_domain;
+
+  /* If domain name is the null string set to default domain "messages".  */
+  if (domainname[0] == '\0'
+      || strcmp (domainname, _nl_default_default_domain) == 0)
+    _nl_current_default_domain = _nl_default_default_domain;
+  else
+    {
+      /* If the following malloc fails `_nl_current_default_domain'
+	 will be NULL.  This value will be returned and so signals we
+	 are out of core.  */
+#if defined _LIBC || defined HAVE_STRDUP
+      _nl_current_default_domain = strdup (domainname);
+#else
+      size_t len = strlen (domainname) + 1;
+      char *cp = (char *) malloc (len);
+      if (cp != NULL)
+	memcpy (cp, domainname, len);
+      _nl_current_default_domain = cp;
+#endif
+    }
+
+  if (old != _nl_default_default_domain)
+    free (old);
+
+  return (char *) _nl_current_default_domain;
+}
+
+#ifdef _LIBC
+/* Alias for function name in GNU C Library.  */
+weak_alias (__textdomain, textdomain);
+#endif
diff --git a/intl/xopen-msg.sed b/intl/xopen-msg.sed
new file mode 100644
index 0000000..b19c0bb
--- /dev/null
+++ b/intl/xopen-msg.sed
@@ -0,0 +1,104 @@
+# po2msg.sed - Convert Uniforum style .po file to X/Open style .msg file
+# Copyright (C) 1995 Free Software Foundation, Inc.
+# Ulrich Drepper <drepper@gnu.ai.mit.edu>, 1995.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+#
+#
+# The first directive in the .msg should be the definition of the
+# message set number.  We use always set number 1.
+#
+1 {
+  i\
+$set 1 # Automatically created by po2msg.sed
+  h
+  s/.*/0/
+  x
+}
+#
+# We copy all comments into the .msg file.  Perhaps they can help.
+#
+/^#/ s/^#[ 	]*/$ /p
+#
+# We copy the original message as a comment into the .msg file.
+#
+/^msgid/ {
+# Does not work now
+#  /"$/! {
+#    s/\\$//
+#    s/$/ ... (more lines following)"/
+#  }
+  s/^msgid[ 	]*"\(.*\)"$/$ Original Message: \1/
+  p
+}
+#
+# The .msg file contains, other then the .po file, only the translations
+# but each given a unique ID.  Starting from 1 and incrementing by 1 for
+# each message we assign them to the messages.
+# It is important that the .po file used to generate the cat-id-tbl.c file
+# (with po-to-tbl) is the same as the one used here.  (At least the order
+# of declarations must not be changed.)
+#
+/^msgstr/ {
+  s/msgstr[ 	]*"\(.*\)"/\1/
+  x
+# The following nice solution is by
+# Bruno <Haible@ma2s2.mathematik.uni-karlsruhe.de>
+  td
+# Increment a decimal number in pattern space.
+# First hide trailing `9' digits.
+  :d
+  s/9\(_*\)$/_\1/
+  td
+# Assure at least one digit is available.
+  s/^\(_*\)$/0\1/
+# Increment the last digit.
+  s/8\(_*\)$/9\1/
+  s/7\(_*\)$/8\1/
+  s/6\(_*\)$/7\1/
+  s/5\(_*\)$/6\1/
+  s/4\(_*\)$/5\1/
+  s/3\(_*\)$/4\1/
+  s/2\(_*\)$/3\1/
+  s/1\(_*\)$/2\1/
+  s/0\(_*\)$/1\1/
+# Convert the hidden `9' digits to `0's.
+  s/_/0/g
+  x
+# Bring the line in the format `<number> <message>'
+  G
+  s/^[^\n]*$/& /
+  s/\(.*\)\n\([0-9]*\)/\2 \1/
+# Clear flag from last substitution.
+  tb
+# Append the next line.
+  :b
+  N
+# Look whether second part is a continuation line.
+  s/\(.*\n\)"\(.*\)"/\1\2/
+# Yes, then branch.
+  ta
+  P
+  D
+# Note that `D' includes a jump to the start!!
+# We found a continuation line.  But before printing insert '\'.
+  :a
+  s/\(.*\)\(\n.*\)/\1\\\2/
+  P
+# We cannot use the sed command `D' here
+  s/.*\n\(.*\)/\1/
+  tb
+}
+d
diff --git a/po/Makefile.in.in b/po/Makefile.in.in
index 3c120a7..ea01d49 100644
--- a/po/Makefile.in.in
+++ b/po/Makefile.in.in
@@ -1,65 +1,228 @@
+# Makefile for program source directory in GNU NLS utilities package.
+# Copyright (C) 1995, 1996, 1997 by Ulrich Drepper <drepper@gnu.ai.mit.edu>
+#
+# This file file be copied and used freely without restrictions.  It can
+# be used in projects which are not available under the GNU Public License
+# but which still want to provide support for the GNU gettext functionality.
+# Please note that the actual code is *not* freely available.
+
+PACKAGE = @PACKAGE@
+VERSION = @VERSION@
+
+SHELL = /bin/sh
+@SET_MAKE@
+
 srcdir = @srcdir@
 top_srcdir = @top_srcdir@
-VPATH = $(srcdir)
+VPATH = @srcdir@
 
-LOCALEDIR=@prefix@/share/locale
+prefix = @prefix@
+exec_prefix = @exec_prefix@
+datadir = $(prefix)/@DATADIRNAME@
+localedir = $(datadir)/locale
+gnulocaledir = $(prefix)/share/locale
+gettextsrcdir = $(prefix)/share/gettext/po
+subdir = po
 
-INSTALL= @INSTALL@
+INSTALL = @INSTALL@
+INSTALL_DATA = @INSTALL_DATA@
+MKINSTALLDIRS = @MKINSTALLDIRS@
 
-installprefix = $(DESTDIR)
+CC = @CC@
+GENCAT = @GENCAT@
+GMSGFMT = PATH=../src:$$PATH @GMSGFMT@
+MSGFMT = @MSGFMT@
+XGETTEXT = PATH=../src:$$PATH @XGETTEXT@
+MSGMERGE = PATH=../src:$$PATH msgmerge
 
-MSGMERGE = msgmerge
+DEFS = @DEFS@
+CFLAGS = @CFLAGS@
+CPPFLAGS = @CPPFLAGS@
 
-NLSPACKAGE = @PACKAGE@
+INCLUDES = -I.. -I$(top_srcdir)/intl
 
-LINGUAS = ro sk
-CATALOGS = $(addsuffix .mo, $(LINGUAS))
+COMPILE = $(CC) -c $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS) $(XCFLAGS)
+
+SOURCES = cat-id-tbl.c
+POFILES = @POFILES@
+GMOFILES = @GMOFILES@
+DISTFILES = Makefile.in.in POTFILES.in $(PACKAGE).pot \
+stamp-cat-id $(POFILES) $(GMOFILES) $(SOURCES)
 
 POTFILES = \
 
-all: $(NLSPACKAGE).pot $(CATALOGS)
+CATALOGS = @CATALOGS@
+CATOBJEXT = @CATOBJEXT@
+INSTOBJEXT = @INSTOBJEXT@
+
+.SUFFIXES:
+.SUFFIXES: .c .o .po .pox .gmo .mo .msg .cat
+
+.c.o:
+	$(COMPILE) $<
+
+.po.pox:
+	$(MAKE) $(PACKAGE).pot
+	$(MSGMERGE) $< $(srcdir)/$(PACKAGE).pot -o $*.pox
+
+.po.mo:
+	$(MSGFMT) -o $@ $<
+
+.po.gmo:
+	file=$(srcdir)/`echo $* | sed 's,.*/,,'`.gmo \
+	  && rm -f $$file && $(GMSGFMT) -o $$file $<
+
+.po.cat:
+	sed -f ../intl/po2msg.sed < $< > $*.msg \
+	  && rm -f $@ && $(GENCAT) $@ $*.msg
+
 
-$(NLSPACKAGE).pot: $(POTFILES)
-	xgettext --default-domain=$(NLSPACKAGE) \
-	    --add-comments --keyword=_ --keyword=N_ $(POTFILES)
-	if cmp -s $(NLSPACKAGE).po $(NLSPACKAGE).pot; then \
-	    rm -f $(NLSPACKAGE).po; \
+all: all-@USE_NLS@
+
+all-yes: cat-id-tbl.c $(CATALOGS)
+all-no:
+
+$(srcdir)/$(PACKAGE).pot: $(POTFILES)
+	$(XGETTEXT) --default-domain=$(PACKAGE) --directory=$(top_srcdir) \
+	  --add-comments --keyword=_ --keyword=N_ \
+	  --files-from=$(srcdir)/POTFILES.in \
+	&& test ! -f $(PACKAGE).po \
+	   || ( rm -f $(srcdir)/$(PACKAGE).pot \
+		&& mv $(PACKAGE).po $(srcdir)/$(PACKAGE).pot )
+
+$(srcdir)/cat-id-tbl.c: stamp-cat-id; @:
+$(srcdir)/stamp-cat-id: $(PACKAGE).pot
+	rm -f cat-id-tbl.tmp
+	sed -f ../intl/po2tbl.sed $(srcdir)/$(PACKAGE).pot \
+		| sed -e "s/@PACKAGE NAME@/$(PACKAGE)/" > cat-id-tbl.tmp
+	if cmp -s cat-id-tbl.tmp $(srcdir)/cat-id-tbl.c; then \
+	  rm cat-id-tbl.tmp; \
 	else \
-	    mv $(NLSPACKAGE).po $(NLSPACKAGE).pot; \
+	  echo cat-id-tbl.c changed; \
+	  rm -f $(srcdir)/cat-id-tbl.c; \
+	  mv cat-id-tbl.tmp $(srcdir)/cat-id-tbl.c; \
 	fi
+	cd $(srcdir) && rm -f stamp-cat-id && echo timestamp > stamp-cat-id
 
-update-po: Makefile
-	@$(MAKE) $(NLSPACKAGE).pot
+
+install: install-exec install-data
+install-exec:
+install-data: install-data-@USE_NLS@
+install-data-no: all
+install-data-yes: all
+	if test -x "$(MKINSTALLDIRS)"; then \
+	  $(MKINSTALLDIRS) $(DESTDIR)$(datadir); \
+	else \
+	  $(SHELL) $(top_srcdir)/mkinstalldirs $(DESTDIR)$(datadir); \
+	fi
 	@catalogs='$(CATALOGS)'; \
 	for cat in $$catalogs; do \
-		lang=`echo $$cat | sed 's/.mo//'`; \
-		if $(MSGMERGE) $$lang.po $(NLSPACKAGE).pot > $$lang.pox ; then \
-			echo "$(MSGMERGE) of $$lang succeeded" ; \
-			mv $$lang.pox $$lang.po ; \
-		else \
-			echo "$(MSGMERGE) of $$lang failed" ; \
-			rm -f $$lang.pox ; \
-		fi \
+	  cat=`basename $$cat`; \
+	  case "$$cat" in \
+	    *.gmo) destdir=$(DESTDIR)$(gnulocaledir);; \
+	    *)     destdir=$(DESTDIR)$(localedir);; \
+	  esac; \
+	  lang=`echo $$cat | sed 's/\$(CATOBJEXT)$$//'`; \
+	  dir=$$destdir/$$lang/LC_MESSAGES; \
+	  if test -r "$(MKINSTALLDIRS)"; then \
+	    $(MKINSTALLDIRS) $$dir; \
+	  else \
+	    $(SHELL) $(top_srcdir)/mkinstalldirs $$dir; \
+	  fi; \
+	  if test -r $$cat; then \
+	    $(INSTALL_DATA) $$cat $$dir/$(PACKAGE)$(INSTOBJEXT); \
+	    echo "installing $$cat as $$dir/$(PACKAGE)$(INSTOBJEXT)"; \
+	  else \
+	    $(INSTALL_DATA) $(srcdir)/$$cat $$dir/$(PACKAGE)$(INSTOBJEXT); \
+	    echo "installing $(srcdir)/$$cat as" \
+		 "$$dir/$(PACKAGE)$(INSTOBJEXT)"; \
+	  fi; \
+	  if test -r $$cat.m; then \
+	    $(INSTALL_DATA) $$cat.m $$dir/$(PACKAGE)$(INSTOBJEXT).m; \
+	    echo "installing $$cat.m as $$dir/$(PACKAGE)$(INSTOBJEXT).m"; \
+	  else \
+	    if test -r $(srcdir)/$$cat.m ; then \
+	      $(INSTALL_DATA) $(srcdir)/$$cat.m \
+		$$dir/$(PACKAGE)$(INSTOBJEXT).m; \
+	      echo "installing $(srcdir)/$$cat as" \
+		   "$$dir/$(PACKAGE)$(INSTOBJEXT).m"; \
+	    else \
+	      true; \
+	    fi; \
+	  fi; \
+	done
+	if test "$(PACKAGE)" = "gettext"; then \
+	  if test -x "$(MKINSTALLDIRS)"; then \
+	    $(MKINSTALLDIRS) $(DESTDIR)$(gettextsrcdir); \
+	  else \
+	    $(SHELL) $(top_srcdir)/mkinstalldirs $(DESTDIR)$(gettextsrcdir); \
+	  fi; \
+	  $(INSTALL_DATA) $(srcdir)/Makefile.in.in \
+			  $(DESTDIR)$(gettextsrcdir)/Makefile.in.in; \
+	else \
+	  : ; \
+	fi
+
+# Define this as empty until I found a useful application.
+installcheck:
+
+uninstall:
+	catalogs='$(CATALOGS)'; \
+	for cat in $$catalogs; do \
+	  cat=`basename $$cat`; \
+	  lang=`echo $$cat | sed 's/\$(CATOBJEXT)$$//'`; \
+	  rm -f $(DESTDIR)$(localedir)/$$lang/LC_MESSAGES/$(PACKAGE)$(INSTOBJEXT); \
+	  rm -f $(DESTDIR)$(localedir)/$$lang/LC_MESSAGES/$(PACKAGE)$(INSTOBJEXT).m; \
+	  rm -f $(DESTDIR)$(gnulocaledir)/$$lang/LC_MESSAGES/$(PACKAGE)$(INSTOBJEXT); \
+	  rm -f $(DESTDIR)$(gnulocaledir)/$$lang/LC_MESSAGES/$(PACKAGE)$(INSTOBJEXT).m; \
 	done
 
-clean:
-	rm -f *mo
-#	rm -f $(NLSPACKAGE).pot
+check: all
 
-distclean: clean
-	rm -f .depend Makefile
+cat-id-tbl.o: ../intl/libgettext.h
+
+dvi info tags TAGS ID:
+
+mostlyclean:
+	rm -f core core.* *.pox $(PACKAGE).po *.old.po cat-id-tbl.tmp
+	rm -fr *.o
 
-depend:
+clean: mostlyclean
 
-install:
-	for n in $(CATALOGS); do \
-	    l=`basename $$n .mo`; \
-	    $(top_srcdir)/mkinstalldirs \
-	        $(installprefix)/$(LOCALEDIR)/$$l/LC_MESSAGES; \
-	    $(INSTALL) -m 644 $$n $(installprefix)/$(LOCALEDIR)/$$l/LC_MESSAGES/popt.mo; \
+distclean: clean
+	rm -f Makefile Makefile.in POTFILES *.mo *.msg *.cat *.cat.m
+
+maintainer-clean: distclean
+	@echo "This command is intended for maintainers to use;"
+	@echo "it deletes files that may require special tools to rebuild."
+	rm -f $(GMOFILES)
+
+distdir = ../$(PACKAGE)-$(VERSION)/$(subdir)
+dist distdir: update-po $(DISTFILES)
+	dists="$(DISTFILES)"; \
+	for file in $$dists; do \
+	  ln $(srcdir)/$$file $(distdir) 2> /dev/null \
+	    || cp -p $(srcdir)/$$file $(distdir); \
 	done
 
-check:
+update-po: Makefile
+	$(MAKE) $(PACKAGE).pot
+	PATH=`pwd`/../src:$$PATH; \
+	cd $(srcdir); \
+	catalogs='$(CATALOGS)'; \
+	for cat in $$catalogs; do \
+	  cat=`basename $$cat`; \
+	  lang=`echo $$cat | sed 's/\$(CATOBJEXT)$$//'`; \
+	  mv $$lang.po $$lang.old.po; \
+	  echo "$$lang:"; \
+	  if $(MSGMERGE) $$lang.old.po $(PACKAGE).pot -o $$lang.po; then \
+	    rm -f $$lang.old.po; \
+	  else \
+	    echo "msgmerge for $$cat failed!"; \
+	    rm -f $$lang.po; \
+	    mv $$lang.old.po $$lang.po; \
+	  fi; \
+	done
 
 POTFILES: POTFILES.in
 	( if test 'x$(srcdir)' != 'x.'; then \
@@ -67,16 +230,18 @@ POTFILES: POTFILES.in
 	  else \
 	    posrcprefix="../"; \
 	  fi; \
-	  sed -e '/^#/d' -e '/^[ 	]*$$/d' \
-	      -e "s@.*@	$$posrcprefix& \\\\@" \
-	      -e '$$s/\(.*\) \\/\1/' < $(srcdir)/POTFILES.in > POTFILES )
+	  rm -f $@-t $@ \
+	    && (sed -e '/^#/d' -e '/^[ 	]*$$/d' \
+		    -e "s@.*@	$$posrcprefix& \\\\@" < $(srcdir)/$@.in \
+		| sed -e '$$s/\\$$//') > $@-t \
+	    && chmod a-w $@-t \
+	    && mv $@-t $@ )
 
 Makefile: Makefile.in.in ../config.status POTFILES
 	cd .. \
-	  && CONFIG_FILES=po/$@.in CONFIG_HEADERS= \
+	  && CONFIG_FILES=$(subdir)/$@.in CONFIG_HEADERS= \
 	       $(SHELL) ./config.status
 
-%.mo: %.po
-	msgfmt -o $@ $<
-
-distdir dvi installcheck:
+# Tell versions [3.59,3.63) of GNU make not to export all variables.
+# Otherwise a system limit (for SysV at least) may be exceeded.
+.NOEXPORT:
diff --git a/po/ro.po b/po/ro.po
index 218d971..ff83784 100644
--- a/po/ro.po
+++ b/po/ro.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: POPT\n"
-"POT-Creation-Date: 1999-04-08 16:15-0400\n"
+"POT-Creation-Date: 1999-09-21 14:38-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Cristian Gafton <gafton@redhat.com>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/po/sk.po b/po/sk.po
index fdbf8a0..fcb9c19 100644
--- a/po/sk.po
+++ b/po/sk.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt\n"
-"POT-Creation-Date: 1999-04-08 16:15-0400\n"
+"POT-Creation-Date: 1999-09-21 14:38-0400\n"
 "PO-Revision-Date: 1999-08-04 21:40+0200\n"
 "Last-Translator: Stanislav Meduna <stano@eunet.sk>\n"
 "Language-Team: Slovak <sk-i18n@rak.isternet.sk>\n"
diff --git a/popt.spec b/popt.spec
index 8b50f7e..8adb06f 100644
--- a/popt.spec
+++ b/popt.spec
@@ -22,9 +22,11 @@ capabilities.
 
 %prep
 %setup -q
-CFLAGS="$RPM_OPT_FLAGS" ./configure --prefix=/usr
 
 %build
+#CFLAGS="$RPM_OPT_FLAGS" ./configure --prefix=/usr
+
+%configure
 make
 
 %install
@@ -35,9 +37,11 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(-,root,root)
-/usr/lib/libpopt.a
-/usr/include/popt.h
-/usr/man/man3/popt.3
+%{_prefix}/lib/libpopt.a
+%{_prefix}/lib/libpopt.la
+%{_prefix}/include/popt.h
+%{_prefix}/man/man3/popt.3
+%{_prefix}/share/locale/*/LC_MESSAGES/popt.mo
 
 %changelog
 * Thu Dec 10 1998 Michael Johnson <johnsonm@redhat.com>
-- 
Gitee


From a488a1b94c8c05a841c4712d041e87581b4d729d Mon Sep 17 00:00:00 2001
From: Jeff Johnson <n3npq@mac.com>
Date: Wed, 29 Sep 1999 21:22:24 +0000
Subject: [PATCH 194/667] Create.

---
 intl/.cvsignore | 2 ++
 po/.cvsignore   | 5 +++--
 2 files changed, 5 insertions(+), 2 deletions(-)
 create mode 100644 intl/.cvsignore

diff --git a/intl/.cvsignore b/intl/.cvsignore
new file mode 100644
index 0000000..3b6496f
--- /dev/null
+++ b/intl/.cvsignore
@@ -0,0 +1,2 @@
+Makefile
+po2tbl.sed
diff --git a/po/.cvsignore b/po/.cvsignore
index 3d7c249..3c3710e 100644
--- a/po/.cvsignore
+++ b/po/.cvsignore
@@ -1,5 +1,6 @@
 Makefile
 Makefile.in
 POTFILES
-*.mo
-popt.pot
+stamp-cat-id
+cat-id-tbl.c
+*.gmo
-- 
Gitee


From 6b2fb062bb645f5510dc3eecf25acd8a637b8482 Mon Sep 17 00:00:00 2001
From: Jeff Johnson <n3npq@mac.com>
Date: Wed, 29 Sep 1999 23:26:09 +0000
Subject: [PATCH 195/667] Check in time stamps.

---
 .cvsignore   |   2 -
 Makefile.in  | 650 +++++++++++++++++++++++++++++++++++++++++++++++++++
 configure.in |   1 +
 3 files changed, 651 insertions(+), 2 deletions(-)
 create mode 100644 Makefile.in

diff --git a/.cvsignore b/.cvsignore
index 6fe1398..27bbd77 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -2,7 +2,6 @@
 .depend
 aclocal.m4
 Makefile
-Makefile.in
 mappcinames
 pci-ids-temp.h
 configure
@@ -14,7 +13,6 @@ config.log
 config.status
 config.sub
 stamp-h
-stamp-h.in
 test1
 libtool
 ltconfig
diff --git a/Makefile.in b/Makefile.in
new file mode 100644
index 0000000..8b243f5
--- /dev/null
+++ b/Makefile.in
@@ -0,0 +1,650 @@
+
+# Makefile.in generated automatically by automake 1.4a from Makefile.am
+
+# Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc.
+# This Makefile.in is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+# PARTICULAR PURPOSE.
+
+# Makefile for popt library.
+
+
+SHELL = @SHELL@
+
+srcdir = @srcdir@
+top_srcdir = @top_srcdir@
+VPATH = @srcdir@
+prefix = @prefix@
+exec_prefix = @exec_prefix@
+
+bindir = @bindir@
+sbindir = @sbindir@
+libexecdir = @libexecdir@
+datadir = @datadir@
+sysconfdir = @sysconfdir@
+sharedstatedir = @sharedstatedir@
+localstatedir = @localstatedir@
+libdir = @libdir@
+infodir = @infodir@
+mandir = @mandir@
+includedir = @includedir@
+oldincludedir = /usr/include
+
+DESTDIR =
+
+pkgdatadir = $(datadir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkgincludedir = $(includedir)/@PACKAGE@
+
+top_builddir = .
+
+ACLOCAL = @ACLOCAL@
+AUTOCONF = @AUTOCONF@
+AUTOMAKE = @AUTOMAKE@
+AUTOHEADER = @AUTOHEADER@
+
+INSTALL = @INSTALL@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
+INSTALL_DATA = @INSTALL_DATA@
+INSTALL_SCRIPT = @INSTALL_SCRIPT@
+INSTALL_STRIP_FLAG =
+transform = @program_transform_name@
+
+NORMAL_INSTALL = :
+PRE_INSTALL = :
+POST_INSTALL = :
+NORMAL_UNINSTALL = :
+PRE_UNINSTALL = :
+POST_UNINSTALL = :
+build_alias = @build_alias@
+build_triplet = @build@
+host_alias = @host_alias@
+host_triplet = @host@
+target_alias = @target_alias@
+target_triplet = @target@
+AS = @AS@
+CATALOGS = @CATALOGS@
+CATOBJEXT = @CATOBJEXT@
+CC = @CC@
+CPP = @CPP@
+DATADIRNAME = @DATADIRNAME@
+DLLTOOL = @DLLTOOL@
+GENCAT = @GENCAT@
+GMOFILES = @GMOFILES@
+GMSGFMT = @GMSGFMT@
+GT_NO = @GT_NO@
+GT_YES = @GT_YES@
+INCLUDE_LOCALE_H = @INCLUDE_LOCALE_H@
+INSTOBJEXT = @INSTOBJEXT@
+INTLDEPS = @INTLDEPS@
+INTLLIBS = @INTLLIBS@
+INTLOBJS = @INTLOBJS@
+LD = @LD@
+LIBTOOL = @LIBTOOL@
+LN_S = @LN_S@
+MAKEINFO = @MAKEINFO@
+MKINSTALLDIRS = @MKINSTALLDIRS@
+MSGFMT = @MSGFMT@
+NM = @NM@
+OBJDUMP = @OBJDUMP@
+PACKAGE = @PACKAGE@
+POFILES = @POFILES@
+POSUB = @POSUB@
+RANLIB = @RANLIB@
+TARGET = @TARGET@
+U = @U@
+USE_INCLUDED_LIBINTL = @USE_INCLUDED_LIBINTL@
+USE_NLS = @USE_NLS@
+VERSION = @VERSION@
+l = @l@
+
+AUTOMAKE_OPTIONS = 1.4 foreign
+
+EXTRA_DIST = CHANGES autogen.sh findme.h $(man_MANS) popt.spec poptint.h 	testit.sh po/Makefile.in.in po/POTFILES.in po/*.po po/popt.pot popt.ps
+
+
+SUBDIRS = intl po
+
+INCLUDES = -I$(top_srcdir)
+
+noinst_INCLUDES = findme.h poptint.h
+
+noinst_PROGRAMS = test1
+test1_SOURCES = test1.c
+test1_LDADD = $(lib_LTLIBRARIES)
+
+include_HEADERS = popt.h
+lib_LTLIBRARIES = libpopt.la
+libpopt_la_SOURCES = popt.c findme.c poptparse.c poptconfig.c popthelp.c
+man_MANS = popt.3
+
+CVSTAG = $(PACKAGE)-$(subst .,_,$(VERSION))
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+CONFIG_HEADER = config.h
+CONFIG_CLEAN_FILES = 
+LTLIBRARIES =  $(lib_LTLIBRARIES)
+
+
+DEFS = @DEFS@ -I. -I$(srcdir) -I.
+CPPFLAGS = @CPPFLAGS@
+LDFLAGS = @LDFLAGS@
+LIBS = @LIBS@
+libpopt_la_LDFLAGS = 
+libpopt_la_LIBADD = 
+libpopt_la_OBJECTS =  popt.lo findme.lo poptparse.lo poptconfig.lo \
+popthelp.lo
+PROGRAMS =  $(noinst_PROGRAMS)
+
+test1_OBJECTS =  test1.o
+test1_DEPENDENCIES =  libpopt.la
+test1_LDFLAGS = 
+CFLAGS = @CFLAGS@
+COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+CCLD = $(CC)
+LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS) -o $@
+man3dir = $(mandir)/man3
+MANS = $(man_MANS)
+
+NROFF = nroff
+HEADERS =  $(include_HEADERS)
+
+DIST_COMMON =  README ./stamp-h.in COPYING Makefile.am Makefile.in \
+acconfig.h aclocal.m4 config.guess config.h.in config.sub configure \
+configure.in install-sh ltconfig ltmain.sh missing mkinstalldirs
+
+
+DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
+
+TAR = gtar
+GZIP_ENV = --best
+DEP_FILES =  .deps/findme.P .deps/popt.P .deps/poptconfig.P \
+.deps/popthelp.P .deps/poptparse.P .deps/test1.P
+SOURCES = $(libpopt_la_SOURCES) $(test1_SOURCES)
+OBJECTS = $(libpopt_la_OBJECTS) $(test1_OBJECTS)
+
+all: all-redirect
+.SUFFIXES:
+.SUFFIXES: .S .c .lo .o .s
+$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) 
+	cd $(top_srcdir) && $(AUTOMAKE) --foreign Makefile
+
+Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status $(BUILT_SOURCES)
+	cd $(top_builddir) \
+	  && CONFIG_FILES=$@ CONFIG_HEADERS= $(SHELL) ./config.status
+
+$(ACLOCAL_M4):  configure.in 
+	cd $(srcdir) && $(ACLOCAL)
+
+config.status: $(srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+	$(SHELL) ./config.status --recheck
+$(srcdir)/configure: $(srcdir)/configure.in $(ACLOCAL_M4) $(CONFIGURE_DEPENDENCIES)
+	cd $(srcdir) && $(AUTOCONF)
+
+config.h: stamp-h
+	@if test ! -f $@; then \
+		rm -f stamp-h; \
+		$(MAKE) stamp-h; \
+	else :; fi
+stamp-h: $(srcdir)/config.h.in $(top_builddir)/config.status
+	cd $(top_builddir) \
+	  && CONFIG_FILES= CONFIG_HEADERS=config.h \
+	     $(SHELL) ./config.status
+	@echo timestamp > stamp-h 2> /dev/null
+$(srcdir)/config.h.in: $(srcdir)/stamp-h.in
+	@if test ! -f $@; then \
+		rm -f $(srcdir)/stamp-h.in; \
+		$(MAKE) $(srcdir)/stamp-h.in; \
+	else :; fi
+$(srcdir)/stamp-h.in: $(top_srcdir)/configure.in $(ACLOCAL_M4) acconfig.h
+	cd $(top_srcdir) && $(AUTOHEADER)
+	@echo timestamp > $(srcdir)/stamp-h.in 2> /dev/null
+
+mostlyclean-hdr:
+
+clean-hdr:
+
+distclean-hdr:
+	-rm -f config.h
+
+maintainer-clean-hdr:
+
+mostlyclean-libLTLIBRARIES:
+
+clean-libLTLIBRARIES:
+	-test -z "$(lib_LTLIBRARIES)" || rm -f $(lib_LTLIBRARIES)
+
+distclean-libLTLIBRARIES:
+
+maintainer-clean-libLTLIBRARIES:
+
+install-libLTLIBRARIES: $(lib_LTLIBRARIES)
+	@$(NORMAL_INSTALL)
+	$(mkinstalldirs) $(DESTDIR)$(libdir)
+	@list='$(lib_LTLIBRARIES)'; for p in $$list; do \
+	  if test -f $$p; then \
+	    echo "$(LIBTOOL)  --mode=install $(INSTALL) $$p $(DESTDIR)$(libdir)/$$p"; \
+	    $(LIBTOOL)  --mode=install $(INSTALL) $$p $(DESTDIR)$(libdir)/$$p; \
+	  else :; fi; \
+	done
+
+uninstall-libLTLIBRARIES:
+	@$(NORMAL_UNINSTALL)
+	list='$(lib_LTLIBRARIES)'; for p in $$list; do \
+	  $(LIBTOOL)  --mode=uninstall rm -f $(DESTDIR)$(libdir)/$$p; \
+	done
+
+.s.o:
+	$(COMPILE) -c $<
+
+.S.o:
+	$(COMPILE) -c $<
+
+mostlyclean-compile:
+	-rm -f *.o core *.core
+
+clean-compile:
+
+distclean-compile:
+	-rm -f *.tab.c
+
+maintainer-clean-compile:
+
+.s.lo:
+	$(LIBTOOL) --mode=compile $(COMPILE) -c $<
+
+.S.lo:
+	$(LIBTOOL) --mode=compile $(COMPILE) -c $<
+
+mostlyclean-libtool:
+	-rm -f *.lo
+
+clean-libtool:
+	-rm -rf .libs _libs
+
+distclean-libtool:
+
+maintainer-clean-libtool:
+
+libpopt.la: $(libpopt_la_OBJECTS) $(libpopt_la_DEPENDENCIES)
+	$(LINK) -rpath $(libdir) $(libpopt_la_LDFLAGS) $(libpopt_la_OBJECTS) $(libpopt_la_LIBADD) $(LIBS)
+
+mostlyclean-noinstPROGRAMS:
+
+clean-noinstPROGRAMS:
+	-test -z "$(noinst_PROGRAMS)" || rm -f $(noinst_PROGRAMS)
+
+distclean-noinstPROGRAMS:
+
+maintainer-clean-noinstPROGRAMS:
+
+test1: $(test1_OBJECTS) $(test1_DEPENDENCIES)
+	@rm -f test1
+	$(LINK) $(test1_LDFLAGS) $(test1_OBJECTS) $(test1_LDADD) $(LIBS)
+
+install-man3:
+	$(mkinstalldirs) $(DESTDIR)$(man3dir)
+	@list='$(man3_MANS)'; \
+	l2='$(man_MANS)'; for i in $$l2; do \
+	  case "$$i" in \
+	    *.3*) list="$$list $$i" ;; \
+	  esac; \
+	done; \
+	for i in $$list; do \
+	  if test -f $(srcdir)/$$i; then file=$(srcdir)/$$i; \
+	  else file=$$i; fi; \
+	  ext=`echo $$i | sed -e 's/^.*\\.//'`; \
+	  inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \
+	  inst=`echo $$inst | sed '$(transform)'`.$$ext; \
+	  echo " $(INSTALL_DATA) $$file $(DESTDIR)$(man3dir)/$$inst"; \
+	  $(INSTALL_DATA) $$file $(DESTDIR)$(man3dir)/$$inst; \
+	done
+
+uninstall-man3:
+	@list='$(man3_MANS)'; \
+	l2='$(man_MANS)'; for i in $$l2; do \
+	  case "$$i" in \
+	    *.3*) list="$$list $$i" ;; \
+	  esac; \
+	done; \
+	for i in $$list; do \
+	  ext=`echo $$i | sed -e 's/^.*\\.//'`; \
+	  inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \
+	  inst=`echo $$inst | sed '$(transform)'`.$$ext; \
+	  echo " rm -f $(DESTDIR)$(man3dir)/$$inst"; \
+	  rm -f $(DESTDIR)$(man3dir)/$$inst; \
+	done
+install-man: $(MANS)
+	@$(NORMAL_INSTALL)
+	$(MAKE) $(AM_MAKEFLAGS) install-man3
+uninstall-man:
+	@$(NORMAL_UNINSTALL)
+	$(MAKE) $(AM_MAKEFLAGS) uninstall-man3
+
+install-includeHEADERS: $(include_HEADERS)
+	@$(NORMAL_INSTALL)
+	$(mkinstalldirs) $(DESTDIR)$(includedir)
+	@list='$(include_HEADERS)'; for p in $$list; do \
+	  if test -f "$$p"; then d= ; else d="$(srcdir)/"; fi; \
+	  echo " $(INSTALL_DATA) $$d$$p $(DESTDIR)$(includedir)/$$p"; \
+	  $(INSTALL_DATA) $$d$$p $(DESTDIR)$(includedir)/$$p; \
+	done
+
+uninstall-includeHEADERS:
+	@$(NORMAL_UNINSTALL)
+	list='$(include_HEADERS)'; for p in $$list; do \
+	  rm -f $(DESTDIR)$(includedir)/$$p; \
+	done
+
+# This directory's subdirectories are mostly independent; you can cd
+# into them and run `make' without going through this Makefile.
+# To change the values of `make' variables: instead of editing Makefiles,
+# (1) if the variable is set in `config.status', edit `config.status'
+#     (which will cause the Makefiles to be regenerated when you run `make');
+# (2) otherwise, pass the desired values on the `make' command line.
+
+@SET_MAKE@
+
+all-recursive install-data-recursive install-exec-recursive \
+installdirs-recursive install-recursive uninstall-recursive  \
+check-recursive installcheck-recursive info-recursive dvi-recursive:
+	@set fnord $(MAKEFLAGS); amf=$$2; \
+	dot_seen=no; \
+	target=`echo $@ | sed s/-recursive//`; \
+	list='$(SUBDIRS)'; for subdir in $$list; do \
+	  echo "Making $$target in $$subdir"; \
+	  if test "$$subdir" = "."; then \
+	    dot_seen=yes; \
+	    local_target="$$target-am"; \
+	  else \
+	    local_target="$$target"; \
+	  fi; \
+	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+	   || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
+	done; \
+	if test "$$dot_seen" = "no"; then \
+	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
+	fi; test -z "$$fail"
+
+mostlyclean-recursive clean-recursive distclean-recursive \
+maintainer-clean-recursive:
+	@set fnord $(MAKEFLAGS); amf=$$2; \
+	dot_seen=no; \
+	rev=''; list='$(SUBDIRS)'; for subdir in $$list; do \
+	  rev="$$subdir $$rev"; \
+	  test "$$subdir" = "." && dot_seen=yes; \
+	done; \
+	test "$$dot_seen" = "no" && rev=". $$rev"; \
+	target=`echo $@ | sed s/-recursive//`; \
+	for subdir in $$rev; do \
+	  echo "Making $$target in $$subdir"; \
+	  if test "$$subdir" = "."; then \
+	    local_target="$$target-am"; \
+	  else \
+	    local_target="$$target"; \
+	  fi; \
+	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+	   || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
+	done && test -z "$$fail"
+tags-recursive:
+	list='$(SUBDIRS)'; for subdir in $$list; do \
+	  test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \
+	done
+
+tags: TAGS
+
+ID: $(HEADERS) $(SOURCES) $(LISP)
+	list='$(SOURCES) $(HEADERS)'; \
+	unique=`for i in $$list; do echo $$i; done | \
+	  awk '    { files[$$0] = 1; } \
+	       END { for (i in files) print i; }'`; \
+	here=`pwd` && cd $(srcdir) \
+	  && mkid -f$$here/ID $$unique $(LISP)
+
+TAGS: tags-recursive $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) $(LISP)
+	tags=; \
+	here=`pwd`; \
+	list='$(SUBDIRS)'; for subdir in $$list; do \
+   if test "$$subdir" = .; then :; else \
+	    test -f $$subdir/TAGS && tags="$$tags -i $$here/$$subdir/TAGS"; \
+   fi; \
+	done; \
+	list='$(SOURCES) $(HEADERS)'; \
+	unique=`for i in $$list; do echo $$i; done | \
+	  awk '    { files[$$0] = 1; } \
+	       END { for (i in files) print i; }'`; \
+	test -z "$(ETAGS_ARGS)config.h.in$$unique$(LISP)$$tags" \
+	  || (cd $(srcdir) && etags $(ETAGS_ARGS) $$tags config.h.in $$unique $(LISP) -o $$here/TAGS)
+
+mostlyclean-tags:
+
+clean-tags:
+
+distclean-tags:
+	-rm -f TAGS ID
+
+maintainer-clean-tags:
+
+distdir = $(PACKAGE)-$(VERSION)
+top_distdir = $(distdir)
+
+# This target untars the dist file and tries a VPATH configuration.  Then
+# it guarantees that the distribution is self-contained by making another
+# tarfile.
+distcheck: dist
+	-rm -rf $(distdir)
+	GZIP=$(GZIP_ENV) $(TAR) zxf $(distdir).tar.gz
+	mkdir $(distdir)/=build
+	mkdir $(distdir)/=inst
+	dc_install_base=`cd $(distdir)/=inst && pwd`; \
+	cd $(distdir)/=build \
+	  && ../configure --with-included-gettext --srcdir=.. --prefix=$$dc_install_base \
+	  && $(MAKE) $(AM_MAKEFLAGS) \
+	  && $(MAKE) $(AM_MAKEFLAGS) dvi \
+	  && $(MAKE) $(AM_MAKEFLAGS) check \
+	  && $(MAKE) $(AM_MAKEFLAGS) install \
+	  && $(MAKE) $(AM_MAKEFLAGS) installcheck \
+	  && $(MAKE) $(AM_MAKEFLAGS) dist
+	-rm -rf $(distdir)
+	@banner="$(distdir).tar.gz is ready for distribution"; \
+	dashes=`echo "$$banner" | sed s/./=/g`; \
+	echo "$$dashes"; \
+	echo "$$banner"; \
+	echo "$$dashes"
+dist: distdir
+	-chmod -R a+r $(distdir)
+	GZIP=$(GZIP_ENV) $(TAR) chozf $(distdir).tar.gz $(distdir)
+	-rm -rf $(distdir)
+dist-all: distdir
+	-chmod -R a+r $(distdir)
+	GZIP=$(GZIP_ENV) $(TAR) chozf $(distdir).tar.gz $(distdir)
+	-rm -rf $(distdir)
+distdir: $(DISTFILES)
+	-rm -rf $(distdir)
+	mkdir $(distdir)
+	-chmod 777 $(distdir)
+	here=`cd $(top_builddir) && pwd`; \
+	top_distdir=`cd $(distdir) && pwd`; \
+	distdir=`cd $(distdir) && pwd`; \
+	cd $(top_srcdir) \
+	  && $(AUTOMAKE) --include-deps --build-dir=$$here --srcdir-name=$(top_srcdir) --output-dir=$$top_distdir --foreign Makefile
+	$(mkinstalldirs) $(distdir)/po
+	@for file in $(DISTFILES); do \
+	  d=$(srcdir); \
+	  if test -d $$d/$$file; then \
+	    cp -pr $$d/$$file $(distdir)/$$file; \
+	  else \
+	    test -f $(distdir)/$$file \
+	    || ln $$d/$$file $(distdir)/$$file 2> /dev/null \
+	    || cp -p $$d/$$file $(distdir)/$$file || :; \
+	  fi; \
+	done
+	for subdir in $(SUBDIRS); do \
+	  if test "$$subdir" = .; then :; else \
+	    test -d $(distdir)/$$subdir \
+	    || mkdir $(distdir)/$$subdir \
+	    || exit 1; \
+	    chmod 777 $(distdir)/$$subdir; \
+	    (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) top_distdir=../$(distdir) distdir=../$(distdir)/$$subdir distdir) \
+	      || exit 1; \
+	  fi; \
+	done
+
+DEPS_MAGIC := $(shell mkdir .deps > /dev/null 2>&1 || :)
+
+-include $(DEP_FILES)
+
+mostlyclean-depend:
+
+clean-depend:
+
+distclean-depend:
+	-rm -rf .deps
+
+maintainer-clean-depend:
+
+%.o: %.c
+	@echo '$(COMPILE) -c $<'; \
+	$(COMPILE) -Wp,-MD,.deps/$(*F).pp -c $<
+	@-cp .deps/$(*F).pp .deps/$(*F).P; \
+	tr ' ' '\012' < .deps/$(*F).pp \
+	  | sed -e 's/^\\$$//' -e '/^$$/ d' -e '/:$$/ d' -e 's/$$/ :/' \
+	    >> .deps/$(*F).P; \
+	rm .deps/$(*F).pp
+
+%.lo: %.c
+	@echo '$(LTCOMPILE) -c $<'; \
+	$(LTCOMPILE) -Wp,-MD,.deps/$(*F).pp -c $<
+	@-sed -e 's/^\([^:]*\)\.o[ 	]*:/\1.lo \1.o :/' \
+	  < .deps/$(*F).pp > .deps/$(*F).P; \
+	tr ' ' '\012' < .deps/$(*F).pp \
+	  | sed -e 's/^\\$$//' -e '/^$$/ d' -e '/:$$/ d' -e 's/$$/ :/' \
+	    >> .deps/$(*F).P; \
+	rm -f .deps/$(*F).pp
+info-am:
+info: info-recursive
+dvi-am:
+dvi: dvi-recursive
+check-am: all-am
+check: check-recursive
+installcheck-am:
+installcheck: installcheck-recursive
+all-recursive-am: config.h
+	$(MAKE) $(AM_MAKEFLAGS) all-recursive
+
+install-exec-am: install-libLTLIBRARIES
+install-exec: install-exec-recursive
+
+install-data-am: install-man install-includeHEADERS
+install-data: install-data-recursive
+
+install-am: all-am
+	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
+install: install-recursive
+uninstall-am: uninstall-libLTLIBRARIES uninstall-man \
+		uninstall-includeHEADERS
+uninstall: uninstall-recursive
+all-am: Makefile $(LTLIBRARIES) $(PROGRAMS) $(MANS) $(HEADERS) config.h
+all-redirect: all-recursive-am
+install-strip:
+	$(MAKE) $(AM_MAKEFLAGS) INSTALL_STRIP_FLAG=-s install
+installdirs: installdirs-recursive
+installdirs-am:
+	$(mkinstalldirs)  $(DESTDIR)$(libdir) $(DESTDIR)$(mandir)/man3 \
+		$(DESTDIR)$(includedir)
+
+
+mostlyclean-generic:
+
+clean-generic:
+
+distclean-generic:
+	-rm -f Makefile $(CONFIG_CLEAN_FILES)
+	-rm -f config.cache config.log stamp-h stamp-h[0-9]*
+
+maintainer-clean-generic:
+mostlyclean-am:  mostlyclean-hdr mostlyclean-libLTLIBRARIES \
+		mostlyclean-compile mostlyclean-libtool \
+		mostlyclean-noinstPROGRAMS mostlyclean-tags \
+		mostlyclean-depend mostlyclean-generic
+
+mostlyclean: mostlyclean-recursive
+
+clean-am:  clean-hdr clean-libLTLIBRARIES clean-compile clean-libtool \
+		clean-noinstPROGRAMS clean-tags clean-depend \
+		clean-generic mostlyclean-am
+
+clean: clean-recursive
+
+distclean-am:  distclean-hdr distclean-libLTLIBRARIES distclean-compile \
+		distclean-libtool distclean-noinstPROGRAMS \
+		distclean-tags distclean-depend distclean-generic \
+		clean-am
+	-rm -f libtool
+
+distclean: distclean-recursive
+	-rm -f config.status
+
+maintainer-clean-am:  maintainer-clean-hdr \
+		maintainer-clean-libLTLIBRARIES \
+		maintainer-clean-compile maintainer-clean-libtool \
+		maintainer-clean-noinstPROGRAMS maintainer-clean-tags \
+		maintainer-clean-depend maintainer-clean-generic \
+		distclean-am
+	@echo "This command is intended for maintainers to use;"
+	@echo "it deletes files that may require special tools to rebuild."
+
+maintainer-clean: maintainer-clean-recursive
+	-rm -f config.status
+
+.PHONY: mostlyclean-hdr distclean-hdr clean-hdr maintainer-clean-hdr \
+mostlyclean-libLTLIBRARIES distclean-libLTLIBRARIES \
+clean-libLTLIBRARIES maintainer-clean-libLTLIBRARIES \
+uninstall-libLTLIBRARIES install-libLTLIBRARIES mostlyclean-compile \
+distclean-compile clean-compile maintainer-clean-compile \
+mostlyclean-libtool distclean-libtool clean-libtool \
+maintainer-clean-libtool mostlyclean-noinstPROGRAMS \
+distclean-noinstPROGRAMS clean-noinstPROGRAMS \
+maintainer-clean-noinstPROGRAMS install-man3 uninstall-man3 install-man \
+uninstall-man uninstall-includeHEADERS install-includeHEADERS \
+install-data-recursive uninstall-data-recursive install-exec-recursive \
+uninstall-exec-recursive installdirs-recursive uninstalldirs-recursive \
+all-recursive check-recursive installcheck-recursive info-recursive \
+dvi-recursive mostlyclean-recursive distclean-recursive clean-recursive \
+maintainer-clean-recursive tags tags-recursive mostlyclean-tags \
+distclean-tags clean-tags maintainer-clean-tags distdir \
+mostlyclean-depend distclean-depend clean-depend \
+maintainer-clean-depend info-am info dvi-am dvi check check-am \
+installcheck-am installcheck all-recursive-am install-exec-am \
+install-exec install-data-am install-data install-am install \
+uninstall-am uninstall all-redirect all-am all installdirs-am \
+installdirs mostlyclean-generic distclean-generic clean-generic \
+maintainer-clean-generic clean mostlyclean distclean maintainer-clean
+
+
+.PHONY: archive
+archive: 
+	@echo "This is $(PACKAGE)-$(VERSION)."
+	@sleep 5
+	@cvs -Q tag -F $(CVSTAG) .
+	@rm -rf /tmp/$(PACKAGE)-$(VERSION) /tmp/$(PACKAGE)
+	@cd /tmp; cvs -Q -d $(CVSROOT) export -r$(CVSTAG) $(PACKAGE) || :
+	@mv /tmp/$(PACKAGE) /tmp/$(PACKAGE)-$(VERSION)
+	@cd /tmp/$(PACKAGE)-$(VERSION); ./autogen.sh ; make depend; make distclean
+	@cd /tmp/$(PACKAGE)-$(VERSION); ./autogen.sh --noconfigure
+	@cd /tmp; tar czSpf $(PACKAGE)-$(VERSION).tar.gz $(PACKAGE)-$(VERSION)
+	@rm -rf /tmp/$(PACKAGE)-$(VERSION)
+	@cp /tmp/$(PACKAGE)-$(VERSION).tar.gz .
+	@rm -f /tmp/$(PACKAGE)-$(VERSION).tar.gz 
+	@echo " "
+	@echo "The final archive is ./$(PACKAGE)-$(VERSION).tar.gz."
+
+# Tell versions [3.59,3.63) of GNU make to not export all variables.
+# Otherwise a system limit (for SysV at least) may be exceeded.
+.NOEXPORT:
diff --git a/configure.in b/configure.in
index a04b086..e7ab57d 100755
--- a/configure.in
+++ b/configure.in
@@ -1,3 +1,4 @@
+
 AC_INIT(popt.h)
 AM_CONFIG_HEADER(config.h)
 AC_PREREQ(2.12)
-- 
Gitee


From 9ee6291422d51731cea9e2dcbdc7f0b989ade76e Mon Sep 17 00:00:00 2001
From: Jeff Johnson <n3npq@mac.com>
Date: Wed, 29 Sep 1999 23:29:58 +0000
Subject: [PATCH 196/667] Check in time stamps again.

---
 Makefile.in  | 1 -
 configure.in | 1 -
 2 files changed, 2 deletions(-)

diff --git a/Makefile.in b/Makefile.in
index 8b243f5..39efa45 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -1,4 +1,3 @@
-
 # Makefile.in generated automatically by automake 1.4a from Makefile.am
 
 # Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc.
diff --git a/configure.in b/configure.in
index e7ab57d..a04b086 100755
--- a/configure.in
+++ b/configure.in
@@ -1,4 +1,3 @@
-
 AC_INIT(popt.h)
 AM_CONFIG_HEADER(config.h)
 AC_PREREQ(2.12)
-- 
Gitee


From 12c45f228d0abcdbe7a1260730f6d222f4a6e6c0 Mon Sep 17 00:00:00 2001
From: Jeff Johnson <n3npq@mac.com>
Date: Wed, 29 Sep 1999 23:37:04 +0000
Subject: [PATCH 197/667] Nuke'em again.

---
 Makefile.in | 649 ----------------------------------------------------
 1 file changed, 649 deletions(-)
 delete mode 100644 Makefile.in

diff --git a/Makefile.in b/Makefile.in
deleted file mode 100644
index 39efa45..0000000
--- a/Makefile.in
+++ /dev/null
@@ -1,649 +0,0 @@
-# Makefile.in generated automatically by automake 1.4a from Makefile.am
-
-# Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc.
-# This Makefile.in is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-# PARTICULAR PURPOSE.
-
-# Makefile for popt library.
-
-
-SHELL = @SHELL@
-
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
-VPATH = @srcdir@
-prefix = @prefix@
-exec_prefix = @exec_prefix@
-
-bindir = @bindir@
-sbindir = @sbindir@
-libexecdir = @libexecdir@
-datadir = @datadir@
-sysconfdir = @sysconfdir@
-sharedstatedir = @sharedstatedir@
-localstatedir = @localstatedir@
-libdir = @libdir@
-infodir = @infodir@
-mandir = @mandir@
-includedir = @includedir@
-oldincludedir = /usr/include
-
-DESTDIR =
-
-pkgdatadir = $(datadir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
-pkgincludedir = $(includedir)/@PACKAGE@
-
-top_builddir = .
-
-ACLOCAL = @ACLOCAL@
-AUTOCONF = @AUTOCONF@
-AUTOMAKE = @AUTOMAKE@
-AUTOHEADER = @AUTOHEADER@
-
-INSTALL = @INSTALL@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@
-INSTALL_DATA = @INSTALL_DATA@
-INSTALL_SCRIPT = @INSTALL_SCRIPT@
-INSTALL_STRIP_FLAG =
-transform = @program_transform_name@
-
-NORMAL_INSTALL = :
-PRE_INSTALL = :
-POST_INSTALL = :
-NORMAL_UNINSTALL = :
-PRE_UNINSTALL = :
-POST_UNINSTALL = :
-build_alias = @build_alias@
-build_triplet = @build@
-host_alias = @host_alias@
-host_triplet = @host@
-target_alias = @target_alias@
-target_triplet = @target@
-AS = @AS@
-CATALOGS = @CATALOGS@
-CATOBJEXT = @CATOBJEXT@
-CC = @CC@
-CPP = @CPP@
-DATADIRNAME = @DATADIRNAME@
-DLLTOOL = @DLLTOOL@
-GENCAT = @GENCAT@
-GMOFILES = @GMOFILES@
-GMSGFMT = @GMSGFMT@
-GT_NO = @GT_NO@
-GT_YES = @GT_YES@
-INCLUDE_LOCALE_H = @INCLUDE_LOCALE_H@
-INSTOBJEXT = @INSTOBJEXT@
-INTLDEPS = @INTLDEPS@
-INTLLIBS = @INTLLIBS@
-INTLOBJS = @INTLOBJS@
-LD = @LD@
-LIBTOOL = @LIBTOOL@
-LN_S = @LN_S@
-MAKEINFO = @MAKEINFO@
-MKINSTALLDIRS = @MKINSTALLDIRS@
-MSGFMT = @MSGFMT@
-NM = @NM@
-OBJDUMP = @OBJDUMP@
-PACKAGE = @PACKAGE@
-POFILES = @POFILES@
-POSUB = @POSUB@
-RANLIB = @RANLIB@
-TARGET = @TARGET@
-U = @U@
-USE_INCLUDED_LIBINTL = @USE_INCLUDED_LIBINTL@
-USE_NLS = @USE_NLS@
-VERSION = @VERSION@
-l = @l@
-
-AUTOMAKE_OPTIONS = 1.4 foreign
-
-EXTRA_DIST = CHANGES autogen.sh findme.h $(man_MANS) popt.spec poptint.h 	testit.sh po/Makefile.in.in po/POTFILES.in po/*.po po/popt.pot popt.ps
-
-
-SUBDIRS = intl po
-
-INCLUDES = -I$(top_srcdir)
-
-noinst_INCLUDES = findme.h poptint.h
-
-noinst_PROGRAMS = test1
-test1_SOURCES = test1.c
-test1_LDADD = $(lib_LTLIBRARIES)
-
-include_HEADERS = popt.h
-lib_LTLIBRARIES = libpopt.la
-libpopt_la_SOURCES = popt.c findme.c poptparse.c poptconfig.c popthelp.c
-man_MANS = popt.3
-
-CVSTAG = $(PACKAGE)-$(subst .,_,$(VERSION))
-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
-CONFIG_HEADER = config.h
-CONFIG_CLEAN_FILES = 
-LTLIBRARIES =  $(lib_LTLIBRARIES)
-
-
-DEFS = @DEFS@ -I. -I$(srcdir) -I.
-CPPFLAGS = @CPPFLAGS@
-LDFLAGS = @LDFLAGS@
-LIBS = @LIBS@
-libpopt_la_LDFLAGS = 
-libpopt_la_LIBADD = 
-libpopt_la_OBJECTS =  popt.lo findme.lo poptparse.lo poptconfig.lo \
-popthelp.lo
-PROGRAMS =  $(noinst_PROGRAMS)
-
-test1_OBJECTS =  test1.o
-test1_DEPENDENCIES =  libpopt.la
-test1_LDFLAGS = 
-CFLAGS = @CFLAGS@
-COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-CCLD = $(CC)
-LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS) -o $@
-man3dir = $(mandir)/man3
-MANS = $(man_MANS)
-
-NROFF = nroff
-HEADERS =  $(include_HEADERS)
-
-DIST_COMMON =  README ./stamp-h.in COPYING Makefile.am Makefile.in \
-acconfig.h aclocal.m4 config.guess config.h.in config.sub configure \
-configure.in install-sh ltconfig ltmain.sh missing mkinstalldirs
-
-
-DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
-
-TAR = gtar
-GZIP_ENV = --best
-DEP_FILES =  .deps/findme.P .deps/popt.P .deps/poptconfig.P \
-.deps/popthelp.P .deps/poptparse.P .deps/test1.P
-SOURCES = $(libpopt_la_SOURCES) $(test1_SOURCES)
-OBJECTS = $(libpopt_la_OBJECTS) $(test1_OBJECTS)
-
-all: all-redirect
-.SUFFIXES:
-.SUFFIXES: .S .c .lo .o .s
-$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) 
-	cd $(top_srcdir) && $(AUTOMAKE) --foreign Makefile
-
-Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status $(BUILT_SOURCES)
-	cd $(top_builddir) \
-	  && CONFIG_FILES=$@ CONFIG_HEADERS= $(SHELL) ./config.status
-
-$(ACLOCAL_M4):  configure.in 
-	cd $(srcdir) && $(ACLOCAL)
-
-config.status: $(srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
-	$(SHELL) ./config.status --recheck
-$(srcdir)/configure: $(srcdir)/configure.in $(ACLOCAL_M4) $(CONFIGURE_DEPENDENCIES)
-	cd $(srcdir) && $(AUTOCONF)
-
-config.h: stamp-h
-	@if test ! -f $@; then \
-		rm -f stamp-h; \
-		$(MAKE) stamp-h; \
-	else :; fi
-stamp-h: $(srcdir)/config.h.in $(top_builddir)/config.status
-	cd $(top_builddir) \
-	  && CONFIG_FILES= CONFIG_HEADERS=config.h \
-	     $(SHELL) ./config.status
-	@echo timestamp > stamp-h 2> /dev/null
-$(srcdir)/config.h.in: $(srcdir)/stamp-h.in
-	@if test ! -f $@; then \
-		rm -f $(srcdir)/stamp-h.in; \
-		$(MAKE) $(srcdir)/stamp-h.in; \
-	else :; fi
-$(srcdir)/stamp-h.in: $(top_srcdir)/configure.in $(ACLOCAL_M4) acconfig.h
-	cd $(top_srcdir) && $(AUTOHEADER)
-	@echo timestamp > $(srcdir)/stamp-h.in 2> /dev/null
-
-mostlyclean-hdr:
-
-clean-hdr:
-
-distclean-hdr:
-	-rm -f config.h
-
-maintainer-clean-hdr:
-
-mostlyclean-libLTLIBRARIES:
-
-clean-libLTLIBRARIES:
-	-test -z "$(lib_LTLIBRARIES)" || rm -f $(lib_LTLIBRARIES)
-
-distclean-libLTLIBRARIES:
-
-maintainer-clean-libLTLIBRARIES:
-
-install-libLTLIBRARIES: $(lib_LTLIBRARIES)
-	@$(NORMAL_INSTALL)
-	$(mkinstalldirs) $(DESTDIR)$(libdir)
-	@list='$(lib_LTLIBRARIES)'; for p in $$list; do \
-	  if test -f $$p; then \
-	    echo "$(LIBTOOL)  --mode=install $(INSTALL) $$p $(DESTDIR)$(libdir)/$$p"; \
-	    $(LIBTOOL)  --mode=install $(INSTALL) $$p $(DESTDIR)$(libdir)/$$p; \
-	  else :; fi; \
-	done
-
-uninstall-libLTLIBRARIES:
-	@$(NORMAL_UNINSTALL)
-	list='$(lib_LTLIBRARIES)'; for p in $$list; do \
-	  $(LIBTOOL)  --mode=uninstall rm -f $(DESTDIR)$(libdir)/$$p; \
-	done
-
-.s.o:
-	$(COMPILE) -c $<
-
-.S.o:
-	$(COMPILE) -c $<
-
-mostlyclean-compile:
-	-rm -f *.o core *.core
-
-clean-compile:
-
-distclean-compile:
-	-rm -f *.tab.c
-
-maintainer-clean-compile:
-
-.s.lo:
-	$(LIBTOOL) --mode=compile $(COMPILE) -c $<
-
-.S.lo:
-	$(LIBTOOL) --mode=compile $(COMPILE) -c $<
-
-mostlyclean-libtool:
-	-rm -f *.lo
-
-clean-libtool:
-	-rm -rf .libs _libs
-
-distclean-libtool:
-
-maintainer-clean-libtool:
-
-libpopt.la: $(libpopt_la_OBJECTS) $(libpopt_la_DEPENDENCIES)
-	$(LINK) -rpath $(libdir) $(libpopt_la_LDFLAGS) $(libpopt_la_OBJECTS) $(libpopt_la_LIBADD) $(LIBS)
-
-mostlyclean-noinstPROGRAMS:
-
-clean-noinstPROGRAMS:
-	-test -z "$(noinst_PROGRAMS)" || rm -f $(noinst_PROGRAMS)
-
-distclean-noinstPROGRAMS:
-
-maintainer-clean-noinstPROGRAMS:
-
-test1: $(test1_OBJECTS) $(test1_DEPENDENCIES)
-	@rm -f test1
-	$(LINK) $(test1_LDFLAGS) $(test1_OBJECTS) $(test1_LDADD) $(LIBS)
-
-install-man3:
-	$(mkinstalldirs) $(DESTDIR)$(man3dir)
-	@list='$(man3_MANS)'; \
-	l2='$(man_MANS)'; for i in $$l2; do \
-	  case "$$i" in \
-	    *.3*) list="$$list $$i" ;; \
-	  esac; \
-	done; \
-	for i in $$list; do \
-	  if test -f $(srcdir)/$$i; then file=$(srcdir)/$$i; \
-	  else file=$$i; fi; \
-	  ext=`echo $$i | sed -e 's/^.*\\.//'`; \
-	  inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \
-	  inst=`echo $$inst | sed '$(transform)'`.$$ext; \
-	  echo " $(INSTALL_DATA) $$file $(DESTDIR)$(man3dir)/$$inst"; \
-	  $(INSTALL_DATA) $$file $(DESTDIR)$(man3dir)/$$inst; \
-	done
-
-uninstall-man3:
-	@list='$(man3_MANS)'; \
-	l2='$(man_MANS)'; for i in $$l2; do \
-	  case "$$i" in \
-	    *.3*) list="$$list $$i" ;; \
-	  esac; \
-	done; \
-	for i in $$list; do \
-	  ext=`echo $$i | sed -e 's/^.*\\.//'`; \
-	  inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \
-	  inst=`echo $$inst | sed '$(transform)'`.$$ext; \
-	  echo " rm -f $(DESTDIR)$(man3dir)/$$inst"; \
-	  rm -f $(DESTDIR)$(man3dir)/$$inst; \
-	done
-install-man: $(MANS)
-	@$(NORMAL_INSTALL)
-	$(MAKE) $(AM_MAKEFLAGS) install-man3
-uninstall-man:
-	@$(NORMAL_UNINSTALL)
-	$(MAKE) $(AM_MAKEFLAGS) uninstall-man3
-
-install-includeHEADERS: $(include_HEADERS)
-	@$(NORMAL_INSTALL)
-	$(mkinstalldirs) $(DESTDIR)$(includedir)
-	@list='$(include_HEADERS)'; for p in $$list; do \
-	  if test -f "$$p"; then d= ; else d="$(srcdir)/"; fi; \
-	  echo " $(INSTALL_DATA) $$d$$p $(DESTDIR)$(includedir)/$$p"; \
-	  $(INSTALL_DATA) $$d$$p $(DESTDIR)$(includedir)/$$p; \
-	done
-
-uninstall-includeHEADERS:
-	@$(NORMAL_UNINSTALL)
-	list='$(include_HEADERS)'; for p in $$list; do \
-	  rm -f $(DESTDIR)$(includedir)/$$p; \
-	done
-
-# This directory's subdirectories are mostly independent; you can cd
-# into them and run `make' without going through this Makefile.
-# To change the values of `make' variables: instead of editing Makefiles,
-# (1) if the variable is set in `config.status', edit `config.status'
-#     (which will cause the Makefiles to be regenerated when you run `make');
-# (2) otherwise, pass the desired values on the `make' command line.
-
-@SET_MAKE@
-
-all-recursive install-data-recursive install-exec-recursive \
-installdirs-recursive install-recursive uninstall-recursive  \
-check-recursive installcheck-recursive info-recursive dvi-recursive:
-	@set fnord $(MAKEFLAGS); amf=$$2; \
-	dot_seen=no; \
-	target=`echo $@ | sed s/-recursive//`; \
-	list='$(SUBDIRS)'; for subdir in $$list; do \
-	  echo "Making $$target in $$subdir"; \
-	  if test "$$subdir" = "."; then \
-	    dot_seen=yes; \
-	    local_target="$$target-am"; \
-	  else \
-	    local_target="$$target"; \
-	  fi; \
-	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-	   || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
-	done; \
-	if test "$$dot_seen" = "no"; then \
-	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
-	fi; test -z "$$fail"
-
-mostlyclean-recursive clean-recursive distclean-recursive \
-maintainer-clean-recursive:
-	@set fnord $(MAKEFLAGS); amf=$$2; \
-	dot_seen=no; \
-	rev=''; list='$(SUBDIRS)'; for subdir in $$list; do \
-	  rev="$$subdir $$rev"; \
-	  test "$$subdir" = "." && dot_seen=yes; \
-	done; \
-	test "$$dot_seen" = "no" && rev=". $$rev"; \
-	target=`echo $@ | sed s/-recursive//`; \
-	for subdir in $$rev; do \
-	  echo "Making $$target in $$subdir"; \
-	  if test "$$subdir" = "."; then \
-	    local_target="$$target-am"; \
-	  else \
-	    local_target="$$target"; \
-	  fi; \
-	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-	   || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
-	done && test -z "$$fail"
-tags-recursive:
-	list='$(SUBDIRS)'; for subdir in $$list; do \
-	  test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \
-	done
-
-tags: TAGS
-
-ID: $(HEADERS) $(SOURCES) $(LISP)
-	list='$(SOURCES) $(HEADERS)'; \
-	unique=`for i in $$list; do echo $$i; done | \
-	  awk '    { files[$$0] = 1; } \
-	       END { for (i in files) print i; }'`; \
-	here=`pwd` && cd $(srcdir) \
-	  && mkid -f$$here/ID $$unique $(LISP)
-
-TAGS: tags-recursive $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) $(LISP)
-	tags=; \
-	here=`pwd`; \
-	list='$(SUBDIRS)'; for subdir in $$list; do \
-   if test "$$subdir" = .; then :; else \
-	    test -f $$subdir/TAGS && tags="$$tags -i $$here/$$subdir/TAGS"; \
-   fi; \
-	done; \
-	list='$(SOURCES) $(HEADERS)'; \
-	unique=`for i in $$list; do echo $$i; done | \
-	  awk '    { files[$$0] = 1; } \
-	       END { for (i in files) print i; }'`; \
-	test -z "$(ETAGS_ARGS)config.h.in$$unique$(LISP)$$tags" \
-	  || (cd $(srcdir) && etags $(ETAGS_ARGS) $$tags config.h.in $$unique $(LISP) -o $$here/TAGS)
-
-mostlyclean-tags:
-
-clean-tags:
-
-distclean-tags:
-	-rm -f TAGS ID
-
-maintainer-clean-tags:
-
-distdir = $(PACKAGE)-$(VERSION)
-top_distdir = $(distdir)
-
-# This target untars the dist file and tries a VPATH configuration.  Then
-# it guarantees that the distribution is self-contained by making another
-# tarfile.
-distcheck: dist
-	-rm -rf $(distdir)
-	GZIP=$(GZIP_ENV) $(TAR) zxf $(distdir).tar.gz
-	mkdir $(distdir)/=build
-	mkdir $(distdir)/=inst
-	dc_install_base=`cd $(distdir)/=inst && pwd`; \
-	cd $(distdir)/=build \
-	  && ../configure --with-included-gettext --srcdir=.. --prefix=$$dc_install_base \
-	  && $(MAKE) $(AM_MAKEFLAGS) \
-	  && $(MAKE) $(AM_MAKEFLAGS) dvi \
-	  && $(MAKE) $(AM_MAKEFLAGS) check \
-	  && $(MAKE) $(AM_MAKEFLAGS) install \
-	  && $(MAKE) $(AM_MAKEFLAGS) installcheck \
-	  && $(MAKE) $(AM_MAKEFLAGS) dist
-	-rm -rf $(distdir)
-	@banner="$(distdir).tar.gz is ready for distribution"; \
-	dashes=`echo "$$banner" | sed s/./=/g`; \
-	echo "$$dashes"; \
-	echo "$$banner"; \
-	echo "$$dashes"
-dist: distdir
-	-chmod -R a+r $(distdir)
-	GZIP=$(GZIP_ENV) $(TAR) chozf $(distdir).tar.gz $(distdir)
-	-rm -rf $(distdir)
-dist-all: distdir
-	-chmod -R a+r $(distdir)
-	GZIP=$(GZIP_ENV) $(TAR) chozf $(distdir).tar.gz $(distdir)
-	-rm -rf $(distdir)
-distdir: $(DISTFILES)
-	-rm -rf $(distdir)
-	mkdir $(distdir)
-	-chmod 777 $(distdir)
-	here=`cd $(top_builddir) && pwd`; \
-	top_distdir=`cd $(distdir) && pwd`; \
-	distdir=`cd $(distdir) && pwd`; \
-	cd $(top_srcdir) \
-	  && $(AUTOMAKE) --include-deps --build-dir=$$here --srcdir-name=$(top_srcdir) --output-dir=$$top_distdir --foreign Makefile
-	$(mkinstalldirs) $(distdir)/po
-	@for file in $(DISTFILES); do \
-	  d=$(srcdir); \
-	  if test -d $$d/$$file; then \
-	    cp -pr $$d/$$file $(distdir)/$$file; \
-	  else \
-	    test -f $(distdir)/$$file \
-	    || ln $$d/$$file $(distdir)/$$file 2> /dev/null \
-	    || cp -p $$d/$$file $(distdir)/$$file || :; \
-	  fi; \
-	done
-	for subdir in $(SUBDIRS); do \
-	  if test "$$subdir" = .; then :; else \
-	    test -d $(distdir)/$$subdir \
-	    || mkdir $(distdir)/$$subdir \
-	    || exit 1; \
-	    chmod 777 $(distdir)/$$subdir; \
-	    (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) top_distdir=../$(distdir) distdir=../$(distdir)/$$subdir distdir) \
-	      || exit 1; \
-	  fi; \
-	done
-
-DEPS_MAGIC := $(shell mkdir .deps > /dev/null 2>&1 || :)
-
--include $(DEP_FILES)
-
-mostlyclean-depend:
-
-clean-depend:
-
-distclean-depend:
-	-rm -rf .deps
-
-maintainer-clean-depend:
-
-%.o: %.c
-	@echo '$(COMPILE) -c $<'; \
-	$(COMPILE) -Wp,-MD,.deps/$(*F).pp -c $<
-	@-cp .deps/$(*F).pp .deps/$(*F).P; \
-	tr ' ' '\012' < .deps/$(*F).pp \
-	  | sed -e 's/^\\$$//' -e '/^$$/ d' -e '/:$$/ d' -e 's/$$/ :/' \
-	    >> .deps/$(*F).P; \
-	rm .deps/$(*F).pp
-
-%.lo: %.c
-	@echo '$(LTCOMPILE) -c $<'; \
-	$(LTCOMPILE) -Wp,-MD,.deps/$(*F).pp -c $<
-	@-sed -e 's/^\([^:]*\)\.o[ 	]*:/\1.lo \1.o :/' \
-	  < .deps/$(*F).pp > .deps/$(*F).P; \
-	tr ' ' '\012' < .deps/$(*F).pp \
-	  | sed -e 's/^\\$$//' -e '/^$$/ d' -e '/:$$/ d' -e 's/$$/ :/' \
-	    >> .deps/$(*F).P; \
-	rm -f .deps/$(*F).pp
-info-am:
-info: info-recursive
-dvi-am:
-dvi: dvi-recursive
-check-am: all-am
-check: check-recursive
-installcheck-am:
-installcheck: installcheck-recursive
-all-recursive-am: config.h
-	$(MAKE) $(AM_MAKEFLAGS) all-recursive
-
-install-exec-am: install-libLTLIBRARIES
-install-exec: install-exec-recursive
-
-install-data-am: install-man install-includeHEADERS
-install-data: install-data-recursive
-
-install-am: all-am
-	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
-install: install-recursive
-uninstall-am: uninstall-libLTLIBRARIES uninstall-man \
-		uninstall-includeHEADERS
-uninstall: uninstall-recursive
-all-am: Makefile $(LTLIBRARIES) $(PROGRAMS) $(MANS) $(HEADERS) config.h
-all-redirect: all-recursive-am
-install-strip:
-	$(MAKE) $(AM_MAKEFLAGS) INSTALL_STRIP_FLAG=-s install
-installdirs: installdirs-recursive
-installdirs-am:
-	$(mkinstalldirs)  $(DESTDIR)$(libdir) $(DESTDIR)$(mandir)/man3 \
-		$(DESTDIR)$(includedir)
-
-
-mostlyclean-generic:
-
-clean-generic:
-
-distclean-generic:
-	-rm -f Makefile $(CONFIG_CLEAN_FILES)
-	-rm -f config.cache config.log stamp-h stamp-h[0-9]*
-
-maintainer-clean-generic:
-mostlyclean-am:  mostlyclean-hdr mostlyclean-libLTLIBRARIES \
-		mostlyclean-compile mostlyclean-libtool \
-		mostlyclean-noinstPROGRAMS mostlyclean-tags \
-		mostlyclean-depend mostlyclean-generic
-
-mostlyclean: mostlyclean-recursive
-
-clean-am:  clean-hdr clean-libLTLIBRARIES clean-compile clean-libtool \
-		clean-noinstPROGRAMS clean-tags clean-depend \
-		clean-generic mostlyclean-am
-
-clean: clean-recursive
-
-distclean-am:  distclean-hdr distclean-libLTLIBRARIES distclean-compile \
-		distclean-libtool distclean-noinstPROGRAMS \
-		distclean-tags distclean-depend distclean-generic \
-		clean-am
-	-rm -f libtool
-
-distclean: distclean-recursive
-	-rm -f config.status
-
-maintainer-clean-am:  maintainer-clean-hdr \
-		maintainer-clean-libLTLIBRARIES \
-		maintainer-clean-compile maintainer-clean-libtool \
-		maintainer-clean-noinstPROGRAMS maintainer-clean-tags \
-		maintainer-clean-depend maintainer-clean-generic \
-		distclean-am
-	@echo "This command is intended for maintainers to use;"
-	@echo "it deletes files that may require special tools to rebuild."
-
-maintainer-clean: maintainer-clean-recursive
-	-rm -f config.status
-
-.PHONY: mostlyclean-hdr distclean-hdr clean-hdr maintainer-clean-hdr \
-mostlyclean-libLTLIBRARIES distclean-libLTLIBRARIES \
-clean-libLTLIBRARIES maintainer-clean-libLTLIBRARIES \
-uninstall-libLTLIBRARIES install-libLTLIBRARIES mostlyclean-compile \
-distclean-compile clean-compile maintainer-clean-compile \
-mostlyclean-libtool distclean-libtool clean-libtool \
-maintainer-clean-libtool mostlyclean-noinstPROGRAMS \
-distclean-noinstPROGRAMS clean-noinstPROGRAMS \
-maintainer-clean-noinstPROGRAMS install-man3 uninstall-man3 install-man \
-uninstall-man uninstall-includeHEADERS install-includeHEADERS \
-install-data-recursive uninstall-data-recursive install-exec-recursive \
-uninstall-exec-recursive installdirs-recursive uninstalldirs-recursive \
-all-recursive check-recursive installcheck-recursive info-recursive \
-dvi-recursive mostlyclean-recursive distclean-recursive clean-recursive \
-maintainer-clean-recursive tags tags-recursive mostlyclean-tags \
-distclean-tags clean-tags maintainer-clean-tags distdir \
-mostlyclean-depend distclean-depend clean-depend \
-maintainer-clean-depend info-am info dvi-am dvi check check-am \
-installcheck-am installcheck all-recursive-am install-exec-am \
-install-exec install-data-am install-data install-am install \
-uninstall-am uninstall all-redirect all-am all installdirs-am \
-installdirs mostlyclean-generic distclean-generic clean-generic \
-maintainer-clean-generic clean mostlyclean distclean maintainer-clean
-
-
-.PHONY: archive
-archive: 
-	@echo "This is $(PACKAGE)-$(VERSION)."
-	@sleep 5
-	@cvs -Q tag -F $(CVSTAG) .
-	@rm -rf /tmp/$(PACKAGE)-$(VERSION) /tmp/$(PACKAGE)
-	@cd /tmp; cvs -Q -d $(CVSROOT) export -r$(CVSTAG) $(PACKAGE) || :
-	@mv /tmp/$(PACKAGE) /tmp/$(PACKAGE)-$(VERSION)
-	@cd /tmp/$(PACKAGE)-$(VERSION); ./autogen.sh ; make depend; make distclean
-	@cd /tmp/$(PACKAGE)-$(VERSION); ./autogen.sh --noconfigure
-	@cd /tmp; tar czSpf $(PACKAGE)-$(VERSION).tar.gz $(PACKAGE)-$(VERSION)
-	@rm -rf /tmp/$(PACKAGE)-$(VERSION)
-	@cp /tmp/$(PACKAGE)-$(VERSION).tar.gz .
-	@rm -f /tmp/$(PACKAGE)-$(VERSION).tar.gz 
-	@echo " "
-	@echo "The final archive is ./$(PACKAGE)-$(VERSION).tar.gz."
-
-# Tell versions [3.59,3.63) of GNU make to not export all variables.
-# Otherwise a system limit (for SysV at least) may be exceeded.
-.NOEXPORT:
-- 
Gitee


From 9361435debfad5c31887bea2d863c1442bbcb770 Mon Sep 17 00:00:00 2001
From: Jeff Johnson <n3npq@mac.com>
Date: Wed, 29 Sep 1999 23:48:23 +0000
Subject: [PATCH 198/667] Ignore generated files.

---
 .cvsignore | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.cvsignore b/.cvsignore
index 27bbd77..6fe1398 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -2,6 +2,7 @@
 .depend
 aclocal.m4
 Makefile
+Makefile.in
 mappcinames
 pci-ids-temp.h
 configure
@@ -13,6 +14,7 @@ config.log
 config.status
 config.sub
 stamp-h
+stamp-h.in
 test1
 libtool
 ltconfig
-- 
Gitee


From 2678b86ea57ec2ab89dbcb10dc62181b5572b6f8 Mon Sep 17 00:00:00 2001
From: Jeff Johnson <n3npq@mac.com>
Date: Mon, 4 Oct 1999 19:40:03 +0000
Subject: [PATCH 199/667] lclint annotations from build.

---
 popt.h | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/popt.h b/popt.h
index c252e6b..bf463b5 100644
--- a/popt.h
+++ b/popt.h
@@ -108,7 +108,8 @@ int poptReadConfigFile(poptContext con, const char * fn);
 int poptReadDefaultConfig(poptContext con, int useEnv);
 /* argv should be freed -- this allows ', ", and \ quoting, but ' is treated
    the same as " and both may include \ quotes */
-int poptParseArgvString(const char * s, int * argcPtr, char *** argvPtr);
+int poptParseArgvString(const char * s,
+		/*@out@*/ int * argcPtr, /*@out@*/ char *** argvPtr);
 const char * poptStrerror(const int error);
 void poptSetExecPath(poptContext con, const char * path, int allowAbsolute);
 void poptPrintHelp(poptContext con, FILE * f, int flags);
-- 
Gitee


From dc341034c20c4b525433dd6acf2dd5090cf2b9ce Mon Sep 17 00:00:00 2001
From: Jeff Johnson <n3npq@mac.com>
Date: Thu, 21 Oct 1999 15:04:26 +0000
Subject: [PATCH 200/667] lclint annotations.

---
 popt.h | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/popt.h b/popt.h
index bf463b5..2d9ea8c 100644
--- a/popt.h
+++ b/popt.h
@@ -52,17 +52,17 @@ extern "C" {
 #define POPT_CONTEXT_POSIXMEHARDER (1 << 2) /* options can't follow args */
 
 struct poptOption {
-    const char * longName;	/* may be NULL */
+    /*@observer@*/ /*@null@*/ const char * longName;	/* may be NULL */
     char shortName;		/* may be '\0' */
     int argInfo;
-    void * arg;			/* depends on argInfo */
+    /*@dependent@*/ /*@null@*/ void * arg;		/* depends on argInfo */
     int val;			/* 0 means don't return, just update flag */
-    const char * descrip;	/* description for autohelp -- may be NULL */
-    const char * argDescrip;	/* argument description for autohelp */
+    /*@null@*/ const char * descrip;	/* description for autohelp -- may be NULL */
+    /*@null@*/ const char * argDescrip;	/* argument description for autohelp */
 };
 
 struct poptAlias {
-    const char * longName;	/* may be NULL */
+    /*@null@*/ const char * longName;	/* may be NULL */
     char shortName;		/* may be '\0' */
     int argc;
     const char ** argv;		/* must be free()able */
-- 
Gitee


From cd3a98a7a8ef71d2580ead494b04d37067709b2b Mon Sep 17 00:00:00 2001
From: Jeff Johnson <n3npq@mac.com>
Date: Thu, 21 Oct 1999 18:20:12 +0000
Subject: [PATCH 201/667] lclint annotations.

---
 Makefile.am  |  5 +++++
 popt.c       | 53 ++++++++++++++++++++++++++++------------------------
 popt.h       | 33 ++++++++++++++++----------------
 poptconfig.c |  5 +++--
 popthelp.c   | 33 +++++++++++++++++---------------
 poptint.h    | 31 +++++++++++++++---------------
 poptparse.c  |  3 ++-
 7 files changed, 90 insertions(+), 73 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index 7c187ad..ec8480d 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -18,8 +18,13 @@ test1_LDADD = $(lib_LTLIBRARIES)
 include_HEADERS = popt.h
 lib_LTLIBRARIES = libpopt.la
 libpopt_la_SOURCES = popt.c findme.c poptparse.c poptconfig.c popthelp.c
+
 man_MANS = popt.3
 
+.PHONY: lclint
+lclint:
+	lclint ${DEFS} ${INCLUDES} ${libpopt_la_SOURCES}
+
 CVSTAG = $(PACKAGE)-$(subst .,_,$(VERSION))
 
 .PHONY: archive
diff --git a/popt.c b/popt.c
index 9808ac3..9075899 100644
--- a/popt.c
+++ b/popt.c
@@ -73,10 +73,10 @@ poptContext poptGetContext(const char * name, int argc, char ** argv,
     if (!(flags & POPT_CONTEXT_KEEP_FIRST))
 	con->os->next = 1;			/* skip argv[0] */
 
-    con->leftovers = malloc(sizeof(char *) * (argc + 1));
+    con->leftovers = calloc( (argc + 1), sizeof(char *) );
     con->options = options;
-    con->finalArgv = malloc(sizeof(*con->finalArgv) * (argc * 2));
     con->finalArgvAlloced = argc * 2;
+    con->finalArgv = calloc( con->finalArgvAlloced, sizeof(*con->finalArgv) );
     con->flags = flags;
     con->execAbsolute = 1;
 
@@ -129,7 +129,7 @@ static int handleExec(poptContext con, char * longName, char shortName) {
     if (con->flags & POPT_CONTEXT_NO_EXEC)
 	return 1;
 
-    if (!con->doExec) {
+    if (con->doExec == NULL) {
 	con->doExec = con->execs + i;
 	return 1;
     }
@@ -156,7 +156,7 @@ static int handleExec(poptContext con, char * longName, char shortName) {
 
 /* Only one of longName, shortName may be set at a time */
 static int handleAlias(poptContext con, const char * longName, char shortName,
-		       const char * nextCharArg) {
+		       /*@keep@*/ const char * nextCharArg) {
     int i;
 
     if (con->os->currAlias && con->os->currAlias->longName && longName &&
@@ -187,7 +187,8 @@ static int handleAlias(poptContext con, const char * longName, char shortName,
     con->os++;
     con->os->next = 0;
     con->os->stuffed = 0;
-    con->os->nextArg = con->os->nextCharArg = NULL;
+    con->os->nextArg = NULL;
+    con->os->nextCharArg = NULL;
     con->os->currAlias = con->aliases + i;
     con->os->argc = con->os->currAlias->argc;
     con->os->argv = con->os->currAlias->argv;
@@ -249,12 +250,12 @@ static void execCommand(poptContext con) {
     execvp(argv[0], (char *const *)argv);
 }
 
-static const struct poptOption * findOption(const struct poptOption * table,
-					    const char * longName,
-					    char shortName,
-					    poptCallbackType * callback,
-					    const void ** callbackData,
-					    int singleDash) {
+/*@observer@*/ static const struct poptOption *
+findOption(const struct poptOption * table, const char * longName,
+    char shortName,
+    /*@out@*/ poptCallbackType * callback, /*@out@*/ const void ** callbackData,
+    int singleDash)
+{
     const struct poptOption * opt = table;
     const struct poptOption * opt2;
     const struct poptOption * cb = NULL;
@@ -306,8 +307,8 @@ int poptGetNextOpt(poptContext con) {
     const struct poptOption * opt = NULL;
     int done = 0;
     int i;
-    poptCallbackType cb;
-    const void * cbData;
+    poptCallbackType cb = NULL;
+    const void * cbData = NULL;
     int singleDash;
 
     while (!done) {
@@ -438,7 +439,7 @@ int poptGetNextOpt(poptContext con) {
 		  default:
 		    fprintf(stdout, POPT_("option type (%d) not implemented in popt\n"),
 		      opt->argInfo & POPT_ARG_MASK);
-		    exit(1);
+		    exit(EXIT_FAILURE);
 		}
 	    }
 	}
@@ -521,7 +522,9 @@ void poptFreeContext(poptContext con) {
     free(con);
 }
 
-int poptAddAlias(poptContext con, struct poptAlias newAlias, int flags) {
+int poptAddAlias(poptContext con, struct poptAlias newAlias,
+		/*@unused@*/ int flags)
+{
     int aliasNum = con->numAliases++;
     struct poptAlias * alias;
 
@@ -533,12 +536,12 @@ int poptAddAlias(poptContext con, struct poptAlias newAlias, int flags) {
 			       sizeof(newAlias) * con->numAliases);
     alias = con->aliases + aliasNum;
     
-    *alias = newAlias;
-    if (alias->longName)
-	alias->longName = strcpy(malloc(strlen(alias->longName) + 1), 
-				    alias->longName);
-    else
-	alias->longName = NULL;
+    alias->longName = (newAlias->longName)
+	? strcpy(malloc(strlen(newAlias->longName) + 1), newAlias->longName)
+	: NULL;
+    alias->shortName = newAlias->shortName;
+    alias->argc = newAlias->argc;
+    alias->argv = newAlias->argv;
 
     return 0;
 }
@@ -560,7 +563,7 @@ const char * poptBadOption(poptContext con, int flags) {
 #define POPT_ERROR_BADQUOTE	-15	/* only from poptParseArgString() */
 #define POPT_ERROR_ERRNO	-16	/* only from poptParseArgString() */
 
-const char * poptStrerror(const int error) {
+const char *const poptStrerror(const int error) {
     switch (error) {
       case POPT_ERROR_NOARG:
 	return POPT_("missing argument");
@@ -587,11 +590,13 @@ int poptStuffArgs(poptContext con, const char ** argv) {
     if ((con->os - con->optionStack) == POPT_OPTION_DEPTH)
 	return POPT_ERROR_OPTSTOODEEP;
 
-    for (i = 0; argv[i]; i++);
+    for (i = 0; argv[i]; i++)
+	;
 
     con->os++;
     con->os->next = 0;
-    con->os->nextArg = con->os->nextCharArg = NULL;
+    con->os->nextArg = NULL;
+    con->os->nextCharArg = NULL;
     con->os->currAlias = NULL;
     con->os->argc = i;
     con->os->argv = argv;
diff --git a/popt.h b/popt.h
index 2d9ea8c..459dea7 100644
--- a/popt.h
+++ b/popt.h
@@ -55,17 +55,17 @@ struct poptOption {
     /*@observer@*/ /*@null@*/ const char * longName;	/* may be NULL */
     char shortName;		/* may be '\0' */
     int argInfo;
-    /*@dependent@*/ /*@null@*/ void * arg;		/* depends on argInfo */
+    /*@shared@*/ /*@null@*/ void * arg;		/* depends on argInfo */
     int val;			/* 0 means don't return, just update flag */
-    /*@null@*/ const char * descrip;	/* description for autohelp -- may be NULL */
-    /*@null@*/ const char * argDescrip;	/* argument description for autohelp */
+    /*@shared@*/ /*@null@*/ const char * descrip;	/* description for autohelp -- may be NULL */
+    /*@shared@*/ /*@null@*/ const char * argDescrip;	/* argument description for autohelp */
 };
 
 struct poptAlias {
-    /*@null@*/ const char * longName;	/* may be NULL */
+    /*@owned@*/ /*@null@*/ const char * longName;	/* may be NULL */
     char shortName;		/* may be '\0' */
     int argc;
-    const char ** argv;		/* must be free()able */
+    /*@owned@*/ const char ** argv;		/* must be free()able */
 };
 
 extern struct poptOption poptHelpOptions[];
@@ -85,22 +85,23 @@ typedef void (*poptCallbackType)(poptContext con,
 			         const struct poptOption * opt,
 				 const char * arg, const void * data);
 
-poptContext poptGetContext(const char * name, int argc, char ** argv, 
-			   const struct poptOption * options, int flags);
+/*@only@*/ poptContext poptGetContext(/*@keep@*/ const char * name,
+		int argc, /*@keep@*/ char ** argv,
+		/*@keep@*/ const struct poptOption * options, int flags);
 void poptResetContext(poptContext con);
 
 /* returns 'val' element, -1 on last item, POPT_ERROR_* on error */
 int poptGetNextOpt(poptContext con);
 /* returns NULL if no argument is available */
-char * poptGetOptArg(poptContext con);
+/*@observer@*/ /*@null@*/ char * poptGetOptArg(poptContext con);
 /* returns NULL if no more options are available */
-char * poptGetArg(poptContext con);
-const char * poptPeekArg(poptContext con);
-const char ** poptGetArgs(poptContext con);
+/*@observer@*/ /*@null@*/ char * poptGetArg(poptContext con);
+/*@observer@*/ /*@null@*/ const char * poptPeekArg(poptContext con);
+/*@observer@*/ /*@null@*/ const char ** poptGetArgs(poptContext con);
 /* returns the option which caused the most recent error */
-const char * poptBadOption(poptContext con, int flags);
-void poptFreeContext(poptContext con);
-int poptStuffArgs(poptContext con, const char ** argv);
+/*@observer@*/ const char * poptBadOption(poptContext con, int flags);
+void poptFreeContext( /*@only@*/ poptContext con);
+int poptStuffArgs(poptContext con, /*@keep@*/ const char ** argv);
 int poptAddAlias(poptContext con, struct poptAlias alias, int flags);
 int poptReadConfigFile(poptContext con, const char * fn);
 /* like above, but reads /etc/popt and $HOME/.popt along with environment 
@@ -110,12 +111,12 @@ int poptReadDefaultConfig(poptContext con, int useEnv);
    the same as " and both may include \ quotes */
 int poptParseArgvString(const char * s,
 		/*@out@*/ int * argcPtr, /*@out@*/ char *** argvPtr);
-const char * poptStrerror(const int error);
+/*@observer@*/ const char *const poptStrerror(const int error);
 void poptSetExecPath(poptContext con, const char * path, int allowAbsolute);
 void poptPrintHelp(poptContext con, FILE * f, int flags);
 void poptPrintUsage(poptContext con, FILE * f, int flags);
 void poptSetOtherOptionHelp(poptContext con, const char * text);
-const char * poptGetInvocationName(poptContext con);
+/*@observer@*/ const char * poptGetInvocationName(poptContext con);
 
 #ifdef  __cplusplus
 }
diff --git a/poptconfig.c b/poptconfig.c
index 9d9b495..5f7ec8d 100644
--- a/poptconfig.c
+++ b/poptconfig.c
@@ -84,7 +84,7 @@ int poptReadConfigFile(poptContext con, const char * fn) {
     }
 
     fileLength = lseek(fd, 0, SEEK_END);
-    lseek(fd, 0, 0);
+    (void) lseek(fd, 0, 0);
 
     file = alloca(fileLength + 1);
     if (read(fd, file, fileLength) != fileLength) {
@@ -122,13 +122,14 @@ int poptReadConfigFile(poptContext con, const char * fn) {
 	    break;
 	  default:
 	    *dst++ = *chptr++;
+	    break;
 	}
     }
 
     return 0;
 }
 
-int poptReadDefaultConfig(poptContext con, int useEnv) {
+int poptReadDefaultConfig(poptContext con, /*@unused@*/ int useEnv) {
     char * fn, * home;
     int rc;
 
diff --git a/popthelp.c b/popthelp.c
index 05570bb..4ebe621 100644
--- a/popthelp.c
+++ b/popthelp.c
@@ -20,9 +20,10 @@
 #include "popt.h"
 #include "poptint.h"
 
-static void displayArgs(poptContext con, enum poptCallbackReason foo, 
-			struct poptOption * key, 
-			const char * arg, void * data) {
+static void displayArgs(poptContext con,
+		/*@unused@*/ enum poptCallbackReason foo,
+		struct poptOption * key, 
+		/*@unused@*/ const char * arg, /*@unused@*/ void * data) {
     if (key->shortName== '?')
 	poptPrintHelp(con, stdout, 0);
     else
@@ -31,14 +32,14 @@ static void displayArgs(poptContext con, enum poptCallbackReason foo,
 }
 
 struct poptOption poptHelpOptions[] = {
-    { NULL, '\0', POPT_ARG_CALLBACK, (void *)&displayArgs, '\0', NULL },
-    { "help", '?', 0, NULL, '?', N_("Show this help message") },
-    { "usage", '\0', 0, NULL, 'u', N_("Display brief usage message") },
-    { NULL, '\0', 0, NULL, 0 }
+    { NULL, '\0', POPT_ARG_CALLBACK, (void *)&displayArgs, '\0', NULL, NULL },
+    { "help", '?', 0, NULL, '?', N_("Show this help message"), NULL },
+    { "usage", '\0', 0, NULL, 'u', N_("Display brief usage message"), NULL },
+    { NULL, '\0', 0, NULL, 0, NULL, NULL }
 } ;
 
 
-static const char *
+/*@observer@*/ /*@null@*/ static const char *const
 getTableTranslationDomain(const struct poptOption *table)
 {
   const struct poptOption *opt;
@@ -53,8 +54,9 @@ getTableTranslationDomain(const struct poptOption *table)
   return NULL;
 }
 
-static const char * getArgDescrip(const struct poptOption * opt,
-				  const char *translation_domain) {
+/*@observer@*/ /*@null@*/ static const char *const
+getArgDescrip(const struct poptOption * opt, const char *translation_domain)
+{
     if (!(opt->argInfo & POPT_ARG_MASK)) return NULL;
 
     if (opt == (poptHelpOptions + 1) || opt == (poptHelpOptions + 2))
@@ -193,7 +195,7 @@ static int showHelpIntro(poptContext con, FILE * f) {
     return len;
 }
 
-void poptPrintHelp(poptContext con, FILE * f, int flags) {
+void poptPrintHelp(poptContext con, FILE * f, /*@unused@*/ int flags) {
     int leftColWidth;
 
     showHelpIntro(con, f);
@@ -210,7 +212,7 @@ static int singleOptionUsage(FILE * f, int cursor,
 			     const struct poptOption * opt,
 			     const char *translation_domain) {
     int len = 3;
-    char shortStr[2];
+    char shortStr[2] = { '\0', '\0' };
     const char * item = shortStr;
     const char * argDescrip = getArgDescrip(opt, translation_domain);
 
@@ -268,9 +270,10 @@ static int showShortOptions(const struct poptOption * opt, FILE * f,
     char s[300];		/* this is larger then the ascii set, so
 				   it should do just fine */
 
-    if (!str) {
+    s[0] = '\0';
+    if (str == NULL) {
+	memset(s, 0, sizeof(s));
 	str = s;
-	memset(str, 0, sizeof(s));
     }
 
     while (opt->longName || opt->shortName || opt->arg) {
@@ -289,7 +292,7 @@ static int showShortOptions(const struct poptOption * opt, FILE * f,
     return strlen(s) + 4;
 }
 
-void poptPrintUsage(poptContext con, FILE * f, int flags) {
+void poptPrintUsage(poptContext con, FILE * f, /*@unused@*/ int flags) {
     int cursor;
 
     cursor = showHelpIntro(con, f);
diff --git a/poptint.h b/poptint.h
index 62cc60a..4cab19f 100644
--- a/poptint.h
+++ b/poptint.h
@@ -7,11 +7,11 @@
 
 struct optionStackEntry {
     int argc;
-    const char ** argv;
+    /*@keep@*/ const char ** argv;
     int next;
-    const char * nextArg;
-    const char * nextCharArg;
-    struct poptAlias * currAlias;
+    /*@keep@*/ const char * nextArg;
+    /*@keep@*/ const char * nextCharArg;
+    /*@dependent@*/ struct poptAlias * currAlias;
     int stuffed;
 };
 
@@ -22,25 +22,26 @@ struct execEntry {
 };
 
 struct poptContext_s {
-    struct optionStackEntry optionStack[POPT_OPTION_DEPTH], * os;
-    const char ** leftovers;
+    struct optionStackEntry optionStack[POPT_OPTION_DEPTH];
+    /*@dependent@*/ struct optionStackEntry * os;
+    /*@owned@*/ const char ** leftovers;
     int numLeftovers;
     int nextLeftover;
-    const struct poptOption * options;
+    /*@keep@*/ const struct poptOption * options;
     int restLeftover;
-    const char * appName;
-    struct poptAlias * aliases;
+    /*@owned@*/ const char * appName;
+    /*@owned@*/ struct poptAlias * aliases;
     int numAliases;
     int flags;
     struct execEntry * execs;
     int numExecs;
-    const char ** finalArgv;
+    /*@owned@*/ const char ** finalArgv;
     int finalArgvCount;
     int finalArgvAlloced;
-    struct execEntry * doExec;
-    const char * execPath;
+    /*@dependent@*/ struct execEntry * doExec;
+    /*@owned@*/ const char * execPath;
     int execAbsolute;
-    const char * otherHelp;
+    /*@owned@*/ const char * otherHelp;
 };
 
 #define	xfree(_a)	free((void *)_a)
@@ -49,13 +50,13 @@ struct poptContext_s {
 #include <libintl.h>
 #endif
 
-#ifdef HAVE_GETTEXT
+#if defined(HAVE_GETTEXT) && !defined(__LCLINT__)
 #define _(foo) gettext(foo)
 #else
 #define _(foo) (foo)
 #endif
 
-#ifdef HAVE_DGETTEXT
+#if defined(HAVE_DGETTEXT) && !defined(__LCLINT__)
 #define D_(dom, str) dgettext(dom, str)
 #define POPT_(foo) D_("popt", foo)
 #else
diff --git a/poptparse.c b/poptparse.c
index c64ce0f..0d318f4 100644
--- a/poptparse.c
+++ b/poptparse.c
@@ -81,9 +81,10 @@ int poptParseArgvString(const char * s, int * argcPtr, char *** argvPtr) {
 		free(argv);
 		return POPT_ERROR_BADQUOTE;
 	    }
-	    /* fallthrough */
+	    /*@fallthrough@*/
 	  default:
 	    *buf++ = *src;
+	    break;
 	}
 
 	src++;
-- 
Gitee


From 04c55dc00c12a979ef324aed41aa5913834046c2 Mon Sep 17 00:00:00 2001
From: Jeff Johnson <n3npq@mac.com>
Date: Thu, 21 Oct 1999 18:20:29 +0000
Subject: [PATCH 202/667] Create.

---
 .lclintrc | 41 +++++++++++++++++++++++++++++++++++++++++
 1 file changed, 41 insertions(+)
 create mode 100644 .lclintrc

diff --git a/.lclintrc b/.lclintrc
new file mode 100644
index 0000000..9aea531
--- /dev/null
+++ b/.lclintrc
@@ -0,0 +1,41 @@
+-I. -I.. -DHAVE_CONFIG_H
+
++partial
+
+-warnunixlib
+-warnposix
+
++unixlib
+
+# don't-bother-me-yet parameters
+-branchstate
+#-immediatetrans
+-mustfree
+#-observertrans
+#-statictrans
+
+# not-yet normal parameters
+-boolops		# w->n
+-fixedformalarray
+-null
+-predboolint		# w->n
+-predboolothers		# w->n
+-retvalint		# w->n
+-type
+
+
+# -weak paramaters
+#+boolint
+#-boolops
+#+ignorequals
+#+ignoresigns
+#-mustfree
+#+longintegral
+#+matchanyintegral
+#-nullpass
+#-observertrans
+#-predboolint
+#-predboolothers
+#-retvalint
+#-retvalother
+#-shiftsigned
-- 
Gitee


From 7a4e5235b234081120ad97637e4475ae9abd4150 Mon Sep 17 00:00:00 2001
From: Jeff Johnson <n3npq@mac.com>
Date: Thu, 21 Oct 1999 18:48:00 +0000
Subject: [PATCH 203/667] lclint annotations.

---
 .lclintrc |  2 +-
 poptint.h | 10 +++++-----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/.lclintrc b/.lclintrc
index 9aea531..3e869d5 100644
--- a/.lclintrc
+++ b/.lclintrc
@@ -8,7 +8,7 @@
 +unixlib
 
 # don't-bother-me-yet parameters
--branchstate
+#-branchstate
 #-immediatetrans
 -mustfree
 #-observertrans
diff --git a/poptint.h b/poptint.h
index 4cab19f..64e8cec 100644
--- a/poptint.h
+++ b/poptint.h
@@ -29,19 +29,19 @@ struct poptContext_s {
     int nextLeftover;
     /*@keep@*/ const struct poptOption * options;
     int restLeftover;
-    /*@owned@*/ const char * appName;
-    /*@owned@*/ struct poptAlias * aliases;
+    /*@only@*/ const char * appName;
+    /*@only@*/ struct poptAlias * aliases;
     int numAliases;
     int flags;
     struct execEntry * execs;
     int numExecs;
-    /*@owned@*/ const char ** finalArgv;
+    /*@only@*/ const char ** finalArgv;
     int finalArgvCount;
     int finalArgvAlloced;
     /*@dependent@*/ struct execEntry * doExec;
-    /*@owned@*/ const char * execPath;
+    /*@only@*/ const char * execPath;
     int execAbsolute;
-    /*@owned@*/ const char * otherHelp;
+    /*@only@*/ const char * otherHelp;
 };
 
 #define	xfree(_a)	free((void *)_a)
-- 
Gitee


From 04d5b32ad0ef7a121aaf68dc7a51aa23b779da91 Mon Sep 17 00:00:00 2001
From: Jeff Johnson <n3npq@mac.com>
Date: Thu, 21 Oct 1999 20:36:16 +0000
Subject: [PATCH 204/667] lclint annotations and compiler cruft.

---
 po/popt.pot |  6 +++---
 popt.c      | 10 +++++-----
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/po/popt.pot b/po/popt.pot
index 8848085..c7230f1 100644
--- a/po/popt.pot
+++ b/po/popt.pot
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 1999-09-21 14:38-0400\n"
+"POT-Creation-Date: 1999-10-21 16:18-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -14,10 +14,10 @@ msgstr ""
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: ENCODING\n"
 
-#: ../popthelp.c:35
+#: popthelp.c:36
 msgid "Show this help message"
 msgstr ""
 
-#: ../popthelp.c:36
+#: popthelp.c:37
 msgid "Display brief usage message"
 msgstr ""
diff --git a/popt.c b/popt.c
index 9075899..df3b7f5 100644
--- a/popt.c
+++ b/popt.c
@@ -536,12 +536,12 @@ int poptAddAlias(poptContext con, struct poptAlias newAlias,
 			       sizeof(newAlias) * con->numAliases);
     alias = con->aliases + aliasNum;
     
-    alias->longName = (newAlias->longName)
-	? strcpy(malloc(strlen(newAlias->longName) + 1), newAlias->longName)
+    alias->longName = (newAlias.longName)
+	? strcpy(malloc(strlen(newAlias.longName) + 1), newAlias.longName)
 	: NULL;
-    alias->shortName = newAlias->shortName;
-    alias->argc = newAlias->argc;
-    alias->argv = newAlias->argv;
+    alias->shortName = newAlias.shortName;
+    alias->argc = newAlias.argc;
+    alias->argv = newAlias.argv;
 
     return 0;
 }
-- 
Gitee


From db52be4ec7423662fe2ccc3872003b1619fe4e87 Mon Sep 17 00:00:00 2001
From: Jeff Johnson <n3npq@mac.com>
Date: Thu, 21 Oct 1999 21:38:18 +0000
Subject: [PATCH 205/667] Functional "make check".

---
 Makefile.am |  7 +++++++
 testit.sh   | 60 +++++++++++++++++++++++++++--------------------------
 2 files changed, 38 insertions(+), 29 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index ec8480d..903109f 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -15,6 +15,13 @@ noinst_PROGRAMS = test1
 test1_SOURCES = test1.c
 test1_LDADD = $(lib_LTLIBRARIES)
 
+noinst_SCRIPTS = testit.sh
+
+TESTS_ENVIRONMENT = \
+test1="`pwd`/.libs/lt-test1"
+
+TESTS = testit.sh
+
 include_HEADERS = popt.h
 lib_LTLIBRARIES = libpopt.la
 libpopt_la_SOURCES = popt.c findme.c poptparse.c poptconfig.c popthelp.c
diff --git a/testit.sh b/testit.sh
index f81edb2..e54b737 100755
--- a/testit.sh
+++ b/testit.sh
@@ -1,5 +1,7 @@
 #!/bin/sh
 
+${test1:=./test1}
+
 run() {
     prog=$1; shift
     name=$1; shift
@@ -7,7 +9,7 @@ run() {
 
     echo Running test $name.
 
-    result=`./$prog $*`
+    result=`$prog $*`
     if [ "$answer" != "$result" ]; then
 	echo "Test \"$*\" failed with: $result"
 	exit 2
@@ -16,34 +18,34 @@ run() {
 
 make -q testcases
 
-run test1 "test1 - 1" "arg1: 1 arg2: (none)" --arg1
-run test1 "test1 - 2" "arg1: 0 arg2: foo" --arg2 foo
-run test1 "test1 - 3" "arg1: 1 arg2: something" --arg1 --arg2 something
-run test1 "test1 - 4" "arg1: 0 arg2: another" --simple another
-run test1 "test1 - 5" "arg1: 1 arg2: alias" --two
-run test1 "test1 - 6" "arg1: 1 arg2: (none) rest: --arg2" --arg1 -- --arg2 
-run test1 "test1 - 7" "arg1: 0 arg2: abcd rest: --arg1" --simple abcd -- --arg1 
-run test1 "test1 - 8" "arg1: 1 arg2: (none) rest: --arg2" --arg1 --takerest --arg2 
-run test1 "test1 - 9" "arg1: 0 arg2: foo" -2 foo
-run test1 "test1 - 10" "arg1: 0 arg2: (none) arg3: 50" -3 50
-run test1 "test1 - 11" "arg1: 0 arg2: bar" -T bar
-run test1 "test1 - 12" "arg1: 1 arg2: (none)" -O 
-run test1 "test1 - 13" "arg1: 1 arg2: foo" -OT foo
-run test1 "test1 - 14" "arg1: 0 arg2: (none) inc: 1" --inc
-run test1 "test1 - 15" "arg1: 0 arg2: foo inc: 1" -i --arg2 foo
-POSIX_ME_HARDER=1 run test1 "test1 - 16" "arg1: 1 arg2: (none) rest: foo --arg2 something" --arg1 foo --arg2 something
-POSIXLY_CORRECT=1 run test1 "test1 - 17" "arg1: 1 arg2: (none) rest: foo --arg2 something" --arg1 foo --arg2 something
-run test1 "test1 - 18" "callback: c sampledata bar arg1: 1 arg2: (none)" --arg1 --cb bar
-run test1 "test1 - 19" "./test1 ;" --echo-args
-run test1 "test1 - 20" "./test1 ; --arg1" --echo-args --arg1
-run test1 "test1 - 21" "./test1 ; --arg2 something" -T something -e
-run test1 "test1 - 22" "./test1 ; --arg2 something -- more args" -T something -a more args
-run test1 "test1 - 23" "./test1 ; --echo-args -a" --echo-args -e -a
-run test1 "test1 - 24" "arg1: 0 arg2: (none) short: 1" -shortoption
-run test1 "test1 - 25" "arg1: 0 arg2: (none) short: 1" --shortoption
-run test1 "test1 - 26" "callback: c arg for cb2 foo arg1: 0 arg2: (none)" --cb2 foo
-run test1 "test1 - 27" "arg1: 0 arg2: (none) -" -
-run test1 "test1 - 28" "arg1: 0 arg2: foo -" - -2 foo
+run ${test1} "test1 - 1" "arg1: 1 arg2: (none)" --arg1
+run ${test1} "test1 - 2" "arg1: 0 arg2: foo" --arg2 foo
+run ${test1} "test1 - 3" "arg1: 1 arg2: something" --arg1 --arg2 something
+run ${test1} "test1 - 4" "arg1: 0 arg2: another" --simple another
+run ${test1} "test1 - 5" "arg1: 1 arg2: alias" --two
+run ${test1} "test1 - 6" "arg1: 1 arg2: (none) rest: --arg2" --arg1 -- --arg2 
+run ${test1} "test1 - 7" "arg1: 0 arg2: abcd rest: --arg1" --simple abcd -- --arg1 
+run ${test1} "test1 - 8" "arg1: 1 arg2: (none) rest: --arg2" --arg1 --takerest --arg2 
+run ${test1} "test1 - 9" "arg1: 0 arg2: foo" -2 foo
+run ${test1} "test1 - 10" "arg1: 0 arg2: (none) arg3: 50" -3 50
+run ${test1} "test1 - 11" "arg1: 0 arg2: bar" -T bar
+run ${test1} "test1 - 12" "arg1: 1 arg2: (none)" -O 
+run ${test1} "test1 - 13" "arg1: 1 arg2: foo" -OT foo
+run ${test1} "test1 - 14" "arg1: 0 arg2: (none) inc: 1" --inc
+run ${test1} "test1 - 15" "arg1: 0 arg2: foo inc: 1" -i --arg2 foo
+POSIX_ME_HARDER=1 run ${test1} "test1 - 16" "arg1: 1 arg2: (none) rest: foo --arg2 something" --arg1 foo --arg2 something
+POSIXLY_CORRECT=1 run ${test1} "test1 - 17" "arg1: 1 arg2: (none) rest: foo --arg2 something" --arg1 foo --arg2 something
+run ${test1} "test1 - 18" "callback: c sampledata bar arg1: 1 arg2: (none)" --arg1 --cb bar
+run ${test1} "test1 - 19" "${test1} ;" --echo-args
+run ${test1} "test1 - 20" "${test1} ; --arg1" --echo-args --arg1
+run ${test1} "test1 - 21" "${test1} ; --arg2 something" -T something -e
+run ${test1} "test1 - 22" "${test1} ; --arg2 something -- more args" -T something -a more args
+run ${test1} "test1 - 23" "${test1} ; --echo-args -a" --echo-args -e -a
+run ${test1} "test1 - 24" "arg1: 0 arg2: (none) short: 1" -shortoption
+run ${test1} "test1 - 25" "arg1: 0 arg2: (none) short: 1" --shortoption
+run ${test1} "test1 - 26" "callback: c arg for cb2 foo arg1: 0 arg2: (none)" --cb2 foo
+run ${test1} "test1 - 27" "arg1: 0 arg2: (none) -" -
+run ${test1} "test1 - 28" "arg1: 0 arg2: foo -" - -2 foo
 
 echo ""
 echo "Passed."
-- 
Gitee


From 1eb937c1082313d97c4aeb874e2efa14d6fd3f9c Mon Sep 17 00:00:00 2001
From: Jeff Johnson <n3npq@mac.com>
Date: Fri, 22 Oct 1999 18:10:51 +0000
Subject: [PATCH 206/667] fix: long options like "--long=val" needed longArg
 reset to NULL at top of      poptGetNextOpt() while loop. Variables in
 poptGetNextOpt() are also locally scoped.

---
 .cvsignore  |   1 +
 Makefile.am |   4 +-
 po/popt.pot |   2 +-
 popt.c      |  96 ++++++++++++++++++----------------
 test2.c     | 145 ++++++++++++++++++++++++++++++++++++++++++++++++++++
 testit.sh   |  61 +++++++++++-----------
 6 files changed, 233 insertions(+), 76 deletions(-)
 create mode 100644 test2.c

diff --git a/.cvsignore b/.cvsignore
index 6fe1398..1263a59 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -16,6 +16,7 @@ config.sub
 stamp-h
 stamp-h.in
 test1
+test2
 libtool
 ltconfig
 ltmain.sh
diff --git a/Makefile.am b/Makefile.am
index 903109f..c0aca77 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -11,9 +11,11 @@ INCLUDES = -I$(top_srcdir)
 
 noinst_INCLUDES = findme.h poptint.h
 
-noinst_PROGRAMS = test1
+noinst_PROGRAMS = test1 test2
 test1_SOURCES = test1.c
 test1_LDADD = $(lib_LTLIBRARIES)
+test2_SOURCES = test2.c
+test2_LDADD = $(lib_LTLIBRARIES)
 
 noinst_SCRIPTS = testit.sh
 
diff --git a/po/popt.pot b/po/popt.pot
index c7230f1..c337343 100644
--- a/po/popt.pot
+++ b/po/popt.pot
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 1999-10-21 16:18-0400\n"
+"POT-Creation-Date: 1999-10-22 14:06-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/popt.c b/popt.c
index df3b7f5..27b014e 100644
--- a/popt.c
+++ b/popt.c
@@ -1,5 +1,5 @@
 /* (C) 1998 Red Hat Software, Inc. -- Licensing details are in the COPYING
-   file accompanying popt source distributions, available from 
+   file accompanying popt source distributions, available from
    ftp://ftp.redhat.com/pub/code/popt */
 
 #ifdef HAVE_CONFIG_H
@@ -45,7 +45,7 @@ static void invokeCallbacks(poptContext con, const struct poptOption * table,
 			    int post) {
     const struct poptOption * opt = table;
     poptCallbackType cb;
-    
+
     while (opt->longName || opt->shortName || opt->arg) {
 	if ((opt->argInfo & POPT_ARG_MASK) == POPT_ARG_INCLUDE_TABLE) {
 	    invokeCallbacks(con, opt->arg, post);
@@ -60,7 +60,7 @@ static void invokeCallbacks(poptContext con, const struct poptOption * table,
     }
 }
 
-poptContext poptGetContext(const char * name, int argc, char ** argv, 
+poptContext poptGetContext(const char * name, int argc, char ** argv,
 			   const struct poptOption * options, int flags) {
     poptContext con = malloc(sizeof(*con));
 
@@ -82,7 +82,7 @@ poptContext poptGetContext(const char * name, int argc, char ** argv,
 
     if (getenv("POSIXLY_CORRECT") || getenv("POSIX_ME_HARDER"))
 	con->flags |= POPT_CONTEXT_POSIXMEHARDER;
-    
+
     if (name)
 	con->appName = strcpy(malloc(strlen(name) + 1), name);
 
@@ -146,7 +146,7 @@ static int handleExec(poptContext con, char * longName, char shortName) {
     {	char *s  = malloc((longName ? strlen(longName) : 0) + 3);
 	if (longName)
 	    sprintf(s, "--%s", longName);
-	else 
+	else
 	    sprintf(s, "-%c", shortName);
 	con->finalArgv[i] = s;
     }
@@ -160,9 +160,9 @@ static int handleAlias(poptContext con, const char * longName, char shortName,
     int i;
 
     if (con->os->currAlias && con->os->currAlias->longName && longName &&
-	!strcmp(con->os->currAlias->longName, longName)) 
+	!strcmp(con->os->currAlias->longName, longName))
 	return 0;
-    if (con->os->currAlias && shortName && 
+    if (con->os->currAlias && shortName &&
 	    shortName == con->os->currAlias->shortName)
 	return 0;
 
@@ -177,7 +177,7 @@ static int handleAlias(poptContext con, const char * longName, char shortName,
 
     if (i < 0) return 0;
 
-    if ((con->os - con->optionStack + 1) 
+    if ((con->os - con->optionStack + 1)
 	    == POPT_OPTION_DEPTH)
 	return POPT_ERROR_OPTSTOODEEP;
 
@@ -201,7 +201,7 @@ static void execCommand(poptContext con) {
     int pos = 0;
     const char * script = con->doExec->script;
 
-    argv = malloc(sizeof(*argv) * 
+    argv = malloc(sizeof(*argv) *
 			(6 + con->numLeftovers + con->finalArgvCount));
 
     if (!con->execAbsolute && strchr(script, '/')) return;
@@ -266,7 +266,7 @@ findOption(const struct poptOption * table, const char * longName,
 
     while (opt->longName || opt->shortName || opt->arg) {
 	if ((opt->argInfo & POPT_ARG_MASK) == POPT_ARG_INCLUDE_TABLE) {
-	    opt2 = findOption(opt->arg, longName, shortName, callback, 
+	    opt2 = findOption(opt->arg, longName, shortName, callback,
 			      callbackData, singleDash);
 	    if (opt2) {
 		if (*callback && !*callbackData)
@@ -275,7 +275,7 @@ findOption(const struct poptOption * table, const char * longName,
 	    }
 	} else if ((opt->argInfo & POPT_ARG_MASK) == POPT_ARG_CALLBACK) {
 	    cb = opt;
-	} else if (longName && opt->longName && 
+	} else if (longName && opt->longName &&
 		   (!singleDash || (opt->argInfo & POPT_ARGFLAG_ONEDASH)) &&
 		   !strcmp(longName, opt->longName)) {
 	    break;
@@ -298,21 +298,18 @@ findOption(const struct poptOption * table, const char * longName,
 }
 
 /* returns 'val' element, -1 on last item, POPT_ERROR_* on error */
-int poptGetNextOpt(poptContext con) {
-    char * optString, * chptr, * localOptString;
-    const char * longArg = NULL;
-    const char * origOptString;
-    long aLong;
-    char * end;
+int poptGetNextOpt(poptContext con)
+{
     const struct poptOption * opt = NULL;
     int done = 0;
-    int i;
-    poptCallbackType cb = NULL;
-    const void * cbData = NULL;
-    int singleDash;
 
     while (!done) {
-	while (!con->os->nextCharArg && con->os->next == con->os->argc 
+	const char * origOptString = NULL;
+	poptCallbackType cb = NULL;
+	const void * cbData = NULL;
+	const char * longArg = NULL;
+
+	while (!con->os->nextCharArg && con->os->next == con->os->argc
 		&& con->os > con->optionStack)
 	    con->os--;
 	if (!con->os->nextCharArg && con->os->next == con->os->argc) {
@@ -322,7 +319,8 @@ int poptGetNextOpt(poptContext con) {
 	}
 
 	if (!con->os->nextCharArg) {
-		
+	    char * localOptString, * optString;
+
 	    origOptString = con->os->argv[con->os->next++];
 
 	    if (con->restLeftover || *origOptString != '-') {
@@ -333,8 +331,8 @@ int poptGetNextOpt(poptContext con) {
 	    }
 
 	    /* Make a copy we can hack at */
-	    localOptString = optString = 
-			strcpy(alloca(strlen(origOptString) + 1), 
+	    localOptString = optString =
+			strcpy(alloca(strlen(origOptString) + 1),
 			origOptString);
 
 	    if (!optString[0])
@@ -344,6 +342,9 @@ int poptGetNextOpt(poptContext con) {
 		con->restLeftover = 1;
 		continue;
 	    } else {
+		char *oe;
+		int singleDash;
+
 		optString++;
 		if (*optString == '-')
 		    singleDash = 0, optString++;
@@ -355,16 +356,19 @@ int poptGetNextOpt(poptContext con) {
 		if (handleExec(con, optString, '\0'))
 		    continue;
 
-		chptr = optString;
-		while (*chptr && *chptr != '=') chptr++;
-		if (*chptr == '=') {
-		    longArg = origOptString + (chptr - localOptString) + 1;
-		    *chptr = '\0';
+		/* Check for "--long=arg" option. */
+		for (oe = optString; *oe && *oe != '='; oe++)
+		    ;
+		if (*oe == '=') {
+		    *oe++ = '\0';
+		    /* XXX longArg is mapped back to persistent storage. */
+		    longArg = origOptString + (oe - localOptString);
 		}
 
 		opt = findOption(con->options, optString, '\0', &cb, &cbData,
 				 singleDash);
-		if (!opt && !singleDash) return POPT_ERROR_BADOPT;
+		if (!opt && !singleDash)
+		    return POPT_ERROR_BADOPT;
 	    }
 
 	    if (!opt)
@@ -384,9 +388,10 @@ int poptGetNextOpt(poptContext con) {
 	    if (handleExec(con, NULL, *origOptString))
 		continue;
 
-	    opt = findOption(con->options, NULL, *origOptString, &cb, 
+	    opt = findOption(con->options, NULL, *origOptString, &cb,
 			     &cbData, 0);
-	    if (!opt) return POPT_ERROR_BADOPT;
+	    if (!opt)
+		return POPT_ERROR_BADOPT;
 
 	    origOptString++;
 	    if (*origOptString)
@@ -396,15 +401,16 @@ int poptGetNextOpt(poptContext con) {
 	if (opt->arg && (opt->argInfo & POPT_ARG_MASK) == POPT_ARG_NONE) {
 	    *((int *)opt->arg) = 1;
 	} else if ((opt->argInfo & POPT_ARG_MASK) == POPT_ARG_VAL) {
-	    if (opt->arg) *((int *) opt->arg) = opt->val;
+	    if (opt->arg)
+		*((int *) opt->arg) = opt->val;
 	} else if ((opt->argInfo & POPT_ARG_MASK) != POPT_ARG_NONE) {
 	    if (longArg) {
 		con->os->nextArg = longArg;
 	    } else if (con->os->nextCharArg) {
 		con->os->nextArg = con->os->nextCharArg;
 		con->os->nextCharArg = NULL;
-	    } else { 
-		while (con->os->next == con->os->argc && 
+	    } else {
+		while (con->os->next == con->os->argc &&
 		       con->os > con->optionStack)
 		    con->os--;
 		if (con->os->next == con->os->argc)
@@ -414,6 +420,9 @@ int poptGetNextOpt(poptContext con) {
 	    }
 
 	    if (opt->arg) {
+		long aLong;
+		char *end;
+
 		switch (opt->argInfo & POPT_ARG_MASK) {
 		  case POPT_ARG_STRING:
 		    *((const char **) opt->arg) = con->os->nextArg;
@@ -422,7 +431,7 @@ int poptGetNextOpt(poptContext con) {
 		  case POPT_ARG_INT:
 		  case POPT_ARG_LONG:
 		    aLong = strtol(con->os->nextArg, &end, 0);
-		    if (!(end && *end == '\0')) 
+		    if (!(end && *end == '\0'))
 			return POPT_ERROR_BADNUMBER;
 
 		    if (aLong == LONG_MIN || aLong == LONG_MAX)
@@ -432,7 +441,7 @@ int poptGetNextOpt(poptContext con) {
 		    } else {
 			if (aLong > INT_MAX || aLong < INT_MIN)
 			    return POPT_ERROR_OVERFLOW;
-			*((int *) opt->arg) =aLong;
+			*((int *) opt->arg) = aLong;
 		    }
 		    break;
 
@@ -455,17 +464,16 @@ int poptGetNextOpt(poptContext con) {
 			    sizeof(*con->finalArgv) * con->finalArgvAlloced);
 	}
 
-	i = con->finalArgvCount++;
 	{    char *s = malloc((opt->longName ? strlen(opt->longName) : 0) + 3);
 	    if (opt->longName)
 		sprintf(s, "--%s", opt->longName);
-	    else 
+	    else
 		sprintf(s, "-%c", opt->shortName);
-	    con->finalArgv[i] = s;
+	    con->finalArgv[con->finalArgvCount++] = s;
 	}
 
 	if (opt->arg && (opt->argInfo & POPT_ARG_MASK) != POPT_ARG_NONE
-		     && (opt->argInfo & POPT_ARG_MASK) != POPT_ARG_VAL) 
+		     && (opt->argInfo & POPT_ARG_MASK) != POPT_ARG_VAL)
 	    con->finalArgv[con->finalArgvCount++] = strdup(con->os->nextArg);
     }
 
@@ -532,10 +540,10 @@ int poptAddAlias(poptContext con, struct poptAlias newAlias,
     if (!con->aliases)
 	con->aliases = malloc(sizeof(newAlias) * con->numAliases);
     else
-	con->aliases = realloc(con->aliases, 
+	con->aliases = realloc(con->aliases,
 			       sizeof(newAlias) * con->numAliases);
     alias = con->aliases + aliasNum;
-    
+
     alias->longName = (newAlias.longName)
 	? strcpy(malloc(strlen(newAlias.longName) + 1), newAlias.longName)
 	: NULL;
diff --git a/test2.c b/test2.c
new file mode 100644
index 0000000..4e9275d
--- /dev/null
+++ b/test2.c
@@ -0,0 +1,145 @@
+/*
+    Popt Library Test Program Number Too 
+    
+    --> "a real world test of popt bugs" <--
+
+    Copyright (C) 1999 US Interactive, Inc.
+
+    This program can be used under the GPL or LGPL at your
+    whim as long as this Copyright remains attached.  
+*/
+
+#include <stdio.h>
+#include <string.h>
+#include <popt.h>
+
+#define TEST2
+
+char *PathnameOfKeyFile		= NULL;
+char *PathnameOfOfferFile	= NULL;
+
+char *txHost			= NULL;
+int   txSslPort			= 443;
+int   txStoreId			= 0;
+
+char *contentProtocol		= NULL;
+char *contentHost		= NULL;
+int   contentPort		= 80;
+char *contentPath		= NULL;
+
+char *dbPassword		= NULL;
+char *dbUserName		= NULL;
+
+char *rcfile = "createuser-defaults";
+char *username=NULL;
+
+char *password			= NULL;
+char *firstname			= NULL;
+char *lastname			= NULL;
+char *addr1			= NULL;
+char *addr2			= NULL;
+char *city			= NULL;
+char *state			= NULL;
+char *postal			= NULL;
+char *country			= NULL;
+
+char *email			= NULL;
+
+char *dayphone			= NULL;
+char *fax			= NULL;
+
+
+int 
+main(int argc, char**argv ) {
+
+    poptContext optCon;   /* context for parsing command-line options */
+    struct poptOption userOptionsTable[] = {
+        { "first", 'f', POPT_ARG_STRING, &firstname, 0,
+            "user's first name", "first" },
+        { "last", 'l', POPT_ARG_STRING, &lastname, 0,
+            "user's last name", "last" },
+        { "username", 'u', POPT_ARG_STRING, &username, 0,
+            "system user name", "user" },
+        { "password", 'p', POPT_ARG_STRING, &password, 0,
+            "system password name", "password" },
+        { "addr1", '1', POPT_ARG_STRING, &addr1, 0,
+            "line 1 of address", "addr1" },
+        { "addr2", '2', POPT_ARG_STRING, &addr2, 0,
+            "line 2 of address", "addr2" },
+        { "city", 'c', POPT_ARG_STRING, &city, 0,
+            "city", "city" },
+        { "state", 's', POPT_ARG_STRING, &state, 0,
+            "state or province", "state" },
+        { "postal", 'P', POPT_ARG_STRING, &postal, 0,
+            "postal or zip code", "postal" },
+        { "zip", 'z', POPT_ARG_STRING, &postal, 0,
+            "postal or zip code", "postal" },
+        { "country", 'C', POPT_ARG_STRING, &country, 0,
+            "two letter ISO country code", "country" },
+        { "email", 'e', POPT_ARG_STRING, &email, 0,
+            "user's email address", "email" },
+        { "dayphone", 'd', POPT_ARG_STRING, &dayphone, 0,
+            "day time phone number", "dayphone" },
+        { "fax", 'F', POPT_ARG_STRING, &fax, 0,
+            "fax number", "fax" },
+        { NULL, 0, 0, NULL, 0, NULL, NULL }
+    };
+    struct poptOption transactOptionsTable[] = {
+        { "keyfile", '\0', POPT_ARG_STRING, &PathnameOfKeyFile, 0,
+            "transact offer key file (flat_O.kf)", "key-file" },
+        { "offerfile", '\0', POPT_ARG_STRING, &PathnameOfOfferFile, 0,
+            "offer template file (osl.ofr)", "offer-file" },
+        { "storeid", '\0', POPT_ARG_INT, &txStoreId, 0,
+            "store id", "store-id" },
+        { "rcfile", '\0', POPT_ARG_STRING, &rcfile, 0,
+            "default command line options (in popt format)", "rcfile" },
+        { "txhost", '\0', POPT_ARG_STRING, &txHost, 0,
+            "transact host", "transact-host" },
+        { "txsslport", '\0', POPT_ARG_INT, &txSslPort, 0,
+            "transact server ssl port ", "transact ssl port" },
+        { "cnhost", '\0', POPT_ARG_STRING, &contentHost, 0,
+            "content host", "content-host" },
+        { "cnpath", '\0', POPT_ARG_STRING, &contentPath, 0,
+            "content url path", "content-path" },
+        { NULL, 0, 0, NULL, 0, NULL, NULL }
+    };
+
+    struct poptOption databaseOptionsTable[] = {
+        { "dbpassword", '\0', POPT_ARG_STRING, &dbPassword, 0,
+            "Database password", "DB password" },
+        { "dbusername", '\0', POPT_ARG_STRING, &dbUserName, 0,
+            "Database user name", "DB UserName" },
+        { NULL, 0, 0, NULL, 0, NULL, NULL }
+    };
+
+    struct poptOption optionsTable[] = {
+	{ NULL, '\0', POPT_ARG_INCLUDE_TABLE,  transactOptionsTable, 0,
+            "Transact Options (not all will apply)", NULL },
+	{ NULL, '\0', POPT_ARG_INCLUDE_TABLE,  databaseOptionsTable, 0,
+            "Transact Database Names", NULL },
+	{ NULL, '\0', POPT_ARG_INCLUDE_TABLE,  userOptionsTable, 0,
+            "User Fields", NULL },
+        POPT_AUTOHELP
+        { NULL, 0, 0, NULL, 0, NULL, NULL }
+    };
+
+    optCon = poptGetContext("createuser", argc, argv, optionsTable, 0);
+    poptReadConfigFile(optCon, rcfile );
+
+    /* although there are no options to be parsed, check for --help */
+    poptGetNextOpt(optCon);
+
+    poptFreeContext(optCon);
+
+    printf( "dbusername %s\tdbpassword %s\n"
+            "txhost %s\ttxsslport %d\ttxstoreid %d\tpathofkeyfile %s\n"
+	    "username %s\tpassword %s\tfirstname %s\tlastname %s\n"
+	    "addr1 %s\taddr2 %s\tcity %s\tstate %s\tpostal %s\n"
+	    "country %s\temail %s\tdayphone %s\tfax %s\n",
+        dbUserName, dbPassword,
+        txHost, txSslPort, txStoreId, PathnameOfKeyFile,
+        username, password, firstname, lastname,
+        addr1,addr2, city, state, postal,
+        country, email, dayphone, fax);
+    return 0;
+}
diff --git a/testit.sh b/testit.sh
index e54b737..8883510 100755
--- a/testit.sh
+++ b/testit.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-${test1:=./test1}
+${test1:=`pwd`/.libs/lt-test1}
 
 run() {
     prog=$1; shift
@@ -9,7 +9,7 @@ run() {
 
     echo Running test $name.
 
-    result=`$prog $*`
+    result=`./$prog $*`
     if [ "$answer" != "$result" ]; then
 	echo "Test \"$*\" failed with: $result"
 	exit 2
@@ -18,34 +18,35 @@ run() {
 
 make -q testcases
 
-run ${test1} "test1 - 1" "arg1: 1 arg2: (none)" --arg1
-run ${test1} "test1 - 2" "arg1: 0 arg2: foo" --arg2 foo
-run ${test1} "test1 - 3" "arg1: 1 arg2: something" --arg1 --arg2 something
-run ${test1} "test1 - 4" "arg1: 0 arg2: another" --simple another
-run ${test1} "test1 - 5" "arg1: 1 arg2: alias" --two
-run ${test1} "test1 - 6" "arg1: 1 arg2: (none) rest: --arg2" --arg1 -- --arg2 
-run ${test1} "test1 - 7" "arg1: 0 arg2: abcd rest: --arg1" --simple abcd -- --arg1 
-run ${test1} "test1 - 8" "arg1: 1 arg2: (none) rest: --arg2" --arg1 --takerest --arg2 
-run ${test1} "test1 - 9" "arg1: 0 arg2: foo" -2 foo
-run ${test1} "test1 - 10" "arg1: 0 arg2: (none) arg3: 50" -3 50
-run ${test1} "test1 - 11" "arg1: 0 arg2: bar" -T bar
-run ${test1} "test1 - 12" "arg1: 1 arg2: (none)" -O 
-run ${test1} "test1 - 13" "arg1: 1 arg2: foo" -OT foo
-run ${test1} "test1 - 14" "arg1: 0 arg2: (none) inc: 1" --inc
-run ${test1} "test1 - 15" "arg1: 0 arg2: foo inc: 1" -i --arg2 foo
-POSIX_ME_HARDER=1 run ${test1} "test1 - 16" "arg1: 1 arg2: (none) rest: foo --arg2 something" --arg1 foo --arg2 something
-POSIXLY_CORRECT=1 run ${test1} "test1 - 17" "arg1: 1 arg2: (none) rest: foo --arg2 something" --arg1 foo --arg2 something
-run ${test1} "test1 - 18" "callback: c sampledata bar arg1: 1 arg2: (none)" --arg1 --cb bar
-run ${test1} "test1 - 19" "${test1} ;" --echo-args
-run ${test1} "test1 - 20" "${test1} ; --arg1" --echo-args --arg1
-run ${test1} "test1 - 21" "${test1} ; --arg2 something" -T something -e
-run ${test1} "test1 - 22" "${test1} ; --arg2 something -- more args" -T something -a more args
-run ${test1} "test1 - 23" "${test1} ; --echo-args -a" --echo-args -e -a
-run ${test1} "test1 - 24" "arg1: 0 arg2: (none) short: 1" -shortoption
-run ${test1} "test1 - 25" "arg1: 0 arg2: (none) short: 1" --shortoption
-run ${test1} "test1 - 26" "callback: c arg for cb2 foo arg1: 0 arg2: (none)" --cb2 foo
-run ${test1} "test1 - 27" "arg1: 0 arg2: (none) -" -
-run ${test1} "test1 - 28" "arg1: 0 arg2: foo -" - -2 foo
+run test1 "test1 - 1" "arg1: 1 arg2: (none)" --arg1
+run test1 "test1 - 2" "arg1: 0 arg2: foo" --arg2 foo
+run test1 "test1 - 3" "arg1: 1 arg2: something" --arg1 --arg2 something
+run test1 "test1 - 4" "arg1: 0 arg2: another" --simple another
+run test1 "test1 - 5" "arg1: 1 arg2: alias" --two
+run test1 "test1 - 6" "arg1: 1 arg2: (none) rest: --arg2" --arg1 -- --arg2 
+run test1 "test1 - 7" "arg1: 0 arg2: abcd rest: --arg1" --simple abcd -- --arg1 
+run test1 "test1 - 8" "arg1: 1 arg2: (none) rest: --arg2" --arg1 --takerest --arg2 
+run test1 "test1 - 9" "arg1: 0 arg2: foo" -2 foo
+run test1 "test1 - 10" "arg1: 0 arg2: (none) arg3: 50" -3 50
+run test1 "test1 - 11" "arg1: 0 arg2: bar" -T bar
+run test1 "test1 - 12" "arg1: 1 arg2: (none)" -O 
+run test1 "test1 - 13" "arg1: 1 arg2: foo" -OT foo
+run test1 "test1 - 14" "arg1: 0 arg2: (none) inc: 1" --inc
+run test1 "test1 - 15" "arg1: 0 arg2: foo inc: 1" -i --arg2 foo
+POSIX_ME_HARDER=1 run test1 "test1 - 16" "arg1: 1 arg2: (none) rest: foo --arg2 something" --arg1 foo --arg2 something
+POSIXLY_CORRECT=1 run test1 "test1 - 17" "arg1: 1 arg2: (none) rest: foo --arg2 something" --arg1 foo --arg2 something
+run test1 "test1 - 18" "callback: c sampledata bar arg1: 1 arg2: (none)" --arg1 --cb bar
+run test1 "test1 - 19" "${test1} ;" --echo-args
+run test1 "test1 - 20" "${test1} ; --arg1" --echo-args --arg1
+run test1 "test1 - 21" "${test1} ; --arg2 something" -T something -e
+run test1 "test1 - 22" "${test1} ; --arg2 something -- more args" -T something -a more args
+run test1 "test1 - 23" "${test1} ; --echo-args -a" --echo-args -e -a
+run test1 "test1 - 24" "arg1: 0 arg2: (none) short: 1" -shortoption
+run test1 "test1 - 25" "arg1: 0 arg2: (none) short: 1" --shortoption
+run test1 "test1 - 26" "callback: c arg for cb2 foo arg1: 0 arg2: (none)" --cb2 foo
+run test1 "test1 - 27" "arg1: 0 arg2: (none) -" -
+run test1 "test1 - 28" "arg1: 0 arg2: foo -" - -2 foo
+run test1 "test1 - 29" "arg1: 0 arg2: bbbb" --arg2=aaaa -2 bbbb
 
 echo ""
 echo "Passed."
-- 
Gitee


From a4518cac5d26e1a4174ca9e32961f546988e1e77 Mon Sep 17 00:00:00 2001
From: Jeff Johnson <n3npq@mac.com>
Date: Fri, 22 Oct 1999 18:25:39 +0000
Subject: [PATCH 207/667] Modify test1 to do poptResetContext before parsing
 args.

---
 po/popt.pot |  2 +-
 test1.c     | 47 ++++++++++++++++++++++++++++++++++-------------
 2 files changed, 35 insertions(+), 14 deletions(-)

diff --git a/po/popt.pot b/po/popt.pot
index c337343..9238071 100644
--- a/po/popt.pot
+++ b/po/popt.pot
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 1999-10-22 14:06-0400\n"
+"POT-Creation-Date: 1999-10-22 14:22-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/test1.c b/test1.c
index 4a33287..cd8e897 100644
--- a/test1.c
+++ b/test1.c
@@ -1,5 +1,5 @@
 /* (C) 1998 Red Hat Software, Inc. -- Licensing details are in the COPYING
-   file accompanying popt source distributions, available from 
+   file accompanying popt source distributions, available from
    ftp://ftp.redhat.com/pub/code/popt */
 
 #include <stdio.h>
@@ -7,10 +7,12 @@
 
 #include "popt.h"
 
+static int pass2 = 0;
 static void option_callback(poptContext con, enum poptCallbackReason reason,
-		     const struct poptOption * opt, 
+		     const struct poptOption * opt,
 		     char * arg, void * data) {
-    fprintf(stdout, "callback: %c %s %s ", opt->val, (char *) data, arg);    
+    if (pass2)
+	fprintf(stdout, "callback: %c %s %s ", opt->val, (char *) data, arg);
 }
 
 int arg1 = 0;
@@ -21,41 +23,52 @@ int shortopt = 0;
 int singleDash = 0;
 
 static struct poptOption moreCallbackArgs[] = {
-	{ NULL, '\0', POPT_ARG_CALLBACK | POPT_CBFLAG_INC_DATA, 
+	{ NULL, '\0', POPT_ARG_CALLBACK | POPT_CBFLAG_INC_DATA,
 		(void *)option_callback, 0, NULL },
 	{ "cb2", 'c', POPT_ARG_STRING, NULL, 'c', "Test argument callbacks" },
-	{ NULL, '\0', 0, NULL, 0 } 
+	{ NULL, '\0', 0, NULL, 0 }
 };
 static struct poptOption callbackArgs[] = {
 	{ NULL, '\0', POPT_ARG_CALLBACK, (void *)option_callback, 0, "sampledata" },
 	{ "cb", 'c', POPT_ARG_STRING, NULL, 'c', "Test argument callbacks" },
 	{ "long", '\0', 0, NULL, 'l', "Unused option for help testing" },
-	{ NULL, '\0', 0, NULL, 0 } 
+	{ NULL, '\0', 0, NULL, 0 }
 };
 static struct poptOption moreArgs[] = {
 	{ "inc", 'i', 0, &inc, 0, "An included argument" },
-	{ NULL, '\0', 0, NULL, 0 } 
+	{ NULL, '\0', 0, NULL, 0 }
 };
 static struct poptOption options[] = {
 	{ NULL, '\0', POPT_ARG_INCLUDE_TABLE, &moreCallbackArgs, 0, "arg for cb2" },
-	{ "arg1", '\0', 0, &arg1, 0, "First argument with a really long" 
+	{ "arg1", '\0', 0, &arg1, 0, "First argument with a really long"
 	    " description. After all, we have to test argument help"
 	    " wrapping somehow, right?", NULL },
 	{ "arg2", '2', POPT_ARG_STRING, &arg2, 0, "Another argument", "ARG" },
 	{ "arg3", '3', POPT_ARG_INT, &arg3, 0, "A third argument", "ANARG" },
 	{ "shortoption", '\0', POPT_ARGFLAG_ONEDASH, &shortopt, 0,
 		"Needs a single -", NULL },
-	{ "hidden", '\0', POPT_ARG_STRING | POPT_ARGFLAG_DOC_HIDDEN, NULL, 0, 
+	{ "hidden", '\0', POPT_ARG_STRING | POPT_ARGFLAG_DOC_HIDDEN, NULL, 0,
 		"This shouldn't show up", NULL },
-	{ "unused", '\0', POPT_ARG_STRING, NULL, 0, 
+	{ "unused", '\0', POPT_ARG_STRING, NULL, 0,
 	    "Unused option for help testing", "UNUSED" },
 	{ NULL, '-', POPT_ARG_NONE | POPT_ARGFLAG_DOC_HIDDEN, &singleDash, 0 },
 	{ NULL, '\0', POPT_ARG_INCLUDE_TABLE, &moreArgs, 0, NULL },
 	{ NULL, '\0', POPT_ARG_INCLUDE_TABLE, &callbackArgs, 0, "Callback arguments" },
 	POPT_AUTOHELP
-	{ NULL, '\0', 0, NULL, 0 } 
+	{ NULL, '\0', 0, NULL, 0 }
 };
 
+static void resetVars(void)
+{
+    arg1 = 0;
+    arg2 = "(none)";
+    arg3 = 0;
+    inc = 0;
+    shortopt = 0;
+    singleDash = 0;
+    pass2 = 0;
+}
+
 int main(int argc, char ** argv) {
     int rc;
     poptContext optCon;
@@ -63,12 +76,20 @@ int main(int argc, char ** argv) {
     int help = 0;
     int usage = 0;
 
+    resetVars();
     optCon = poptGetContext("test1", argc, argv, options, 0);
     poptReadConfigFile(optCon, "./test-poptrc");
 
+    while ((rc = poptGetNextOpt(optCon)) > 0)	/* Read all the options ... */
+	;
+
+    poptResetContext(optCon);			/* ... and then start over. */
+    resetVars();
+
+    pass2 = 1;
     if ((rc = poptGetNextOpt(optCon)) < -1) {
-	fprintf(stderr, "test1: bad argument %s: %s\n", 
-		poptBadOption(optCon, POPT_BADOPTION_NOALIAS), 
+	fprintf(stderr, "test1: bad argument %s: %s\n",
+		poptBadOption(optCon, POPT_BADOPTION_NOALIAS),
 		poptStrerror(rc));
 	return 2;
     }
-- 
Gitee


From 3ce02e4f3ae8cabc9b707ec50b80d4b1327c5396 Mon Sep 17 00:00:00 2001
From: Jeff Johnson <n3npq@mac.com>
Date: Mon, 25 Oct 1999 18:22:19 +0000
Subject: [PATCH 208/667] Add !#:+ token parsing to retrieve (and delete) next
 argument from list.

---
 Makefile.am  |   8 ++-
 configure.in |   8 +--
 findme.c     |  21 +------
 po/popt.pot  |   6 +-
 po/ro.po     |   6 +-
 po/sk.po     |   6 +-
 popt.c       | 168 ++++++++++++++++++++++++++++++++++++++-------------
 popt.h       |   4 +-
 poptconfig.c |  23 ++-----
 popthelp.c   |  17 +-----
 poptint.h    |  17 ++++++
 poptparse.c  | 101 ++++++++++++++++---------------
 system.h     |  55 +++++++++++++++++
 test-poptrc  |   3 +-
 test1.c      |  29 ++++++---
 test2.c      |  10 +--
 testit.sh    |   4 +-
 17 files changed, 310 insertions(+), 176 deletions(-)
 create mode 100644 system.h

diff --git a/Makefile.am b/Makefile.am
index c0aca77..ce9d5e6 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -2,25 +2,27 @@
 
 AUTOMAKE_OPTIONS = 1.4 foreign
 
-EXTRA_DIST = CHANGES autogen.sh findme.h $(man_MANS) popt.spec poptint.h \
+EXTRA_DIST = CHANGES autogen.sh $(man_MANS) popt.spec \
 	testit.sh po/Makefile.in.in po/POTFILES.in po/*.po po/popt.pot popt.ps
 
 SUBDIRS = intl po
 
 INCLUDES = -I$(top_srcdir)
 
-noinst_INCLUDES = findme.h poptint.h
+noinst_HEADERS = findme.h poptint.h system.h
 
 noinst_PROGRAMS = test1 test2
 test1_SOURCES = test1.c
+test1_LDFLAGS = -all-static
 test1_LDADD = $(lib_LTLIBRARIES)
 test2_SOURCES = test2.c
+test2_LDFLAGS = -all-static
 test2_LDADD = $(lib_LTLIBRARIES)
 
 noinst_SCRIPTS = testit.sh
 
 TESTS_ENVIRONMENT = \
-test1="`pwd`/.libs/lt-test1"
+test1="./test1"
 
 TESTS = testit.sh
 
diff --git a/configure.in b/configure.in
index a04b086..665a277 100755
--- a/configure.in
+++ b/configure.in
@@ -45,7 +45,7 @@ else
 fi
 AC_SUBST(TARGET)
 
-AC_CHECK_HEADERS(unistd.h alloca.h libintl.h)
+AC_CHECK_HEADERS(alloca.h libintl.h mcheck.h unistd.h)
 AC_MSG_CHECKING(for /usr/ucblib in LIBS)
 if test -d /usr/ucblib ; then
 	if test "$build" = "mips-sni-sysv4" ; then
@@ -59,9 +59,9 @@ else
 	AC_MSG_RESULT(no)
 fi
 
-AC_CHECK_FUNCS(strerror)
-AC_CHECK_FUNCS(gettext)
-AC_CHECK_FUNCS(dgettext)
+AC_CHECK_FUNCS(strerror mtrace)
+dnl AC_CHECK_FUNCS(gettext)
+dnl AC_CHECK_FUNCS(dgettext)
 AC_CHECK_FUNC(setreuid, [], [
     AC_CHECK_LIB(ucb, setreuid, [if echo $LIBS | grep -- -lucb >/dev/null ;then :; else LIBS="$LIBS -lc -lucb" USEUCB=y;fi])
 ])
diff --git a/findme.c b/findme.c
index 4ba4950..6d1b41c 100644
--- a/findme.c
+++ b/findme.c
@@ -2,24 +2,7 @@
    file accompanying popt source distributions, available from 
    ftp://ftp.redhat.com/pub/code/popt */
 
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <unistd.h>
-#ifdef __NeXT
-/* access macros are not declared in non posix mode in unistd.h -
- don't try to use posix on NeXTstep 3.3 ! */ 
-#include <libc.h>
-#endif
-
-#if HAVE_ALLOCA_H
-# include <alloca.h>
-#endif
-
+#include "system.h"
 #include "findme.h"
 
 const char * findProgramPath(const char * argv0) {
@@ -31,7 +14,7 @@ const char * findProgramPath(const char * argv0) {
     /* If there is a / in the argv[0], it has to be an absolute
        path */
     if (strchr(argv0, '/'))
-	return strdup(argv0);
+	return xstrdup(argv0);
 
     if (!path) return NULL;
 
diff --git a/po/popt.pot b/po/popt.pot
index 9238071..e0204d7 100644
--- a/po/popt.pot
+++ b/po/popt.pot
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 1999-10-22 14:22-0400\n"
+"POT-Creation-Date: 1999-10-25 14:20-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -14,10 +14,10 @@ msgstr ""
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: ENCODING\n"
 
-#: popthelp.c:36
+#: popthelp.c:23
 msgid "Show this help message"
 msgstr ""
 
-#: popthelp.c:37
+#: popthelp.c:24
 msgid "Display brief usage message"
 msgstr ""
diff --git a/po/ro.po b/po/ro.po
index ff83784..f01b2de 100644
--- a/po/ro.po
+++ b/po/ro.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: POPT\n"
-"POT-Creation-Date: 1999-09-21 14:38-0400\n"
+"POT-Creation-Date: 1999-10-22 17:29-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Cristian Gafton <gafton@redhat.com>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -14,11 +14,11 @@ msgstr ""
 "Content-Type: text/plain; charset=ISO-8859-2\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../popthelp.c:35
+#: popthelp.c:23
 msgid "Show this help message"
 msgstr "Afisare mesaj de help"
 
-#: ../popthelp.c:36
+#: popthelp.c:24
 msgid "Display brief usage message"
 msgstr "Afisare mesaj sintaxa sumar"
 
diff --git a/po/sk.po b/po/sk.po
index fcb9c19..712b63e 100644
--- a/po/sk.po
+++ b/po/sk.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt\n"
-"POT-Creation-Date: 1999-09-21 14:38-0400\n"
+"POT-Creation-Date: 1999-10-22 17:29-0400\n"
 "PO-Revision-Date: 1999-08-04 21:40+0200\n"
 "Last-Translator: Stanislav Meduna <stano@eunet.sk>\n"
 "Language-Team: Slovak <sk-i18n@rak.isternet.sk>\n"
@@ -13,10 +13,10 @@ msgstr ""
 "Content-Type: text/plain; charset=iso-8859-2\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../popthelp.c:35
+#: popthelp.c:23
 msgid "Show this help message"
 msgstr "Vyp�sa� t�to spr�vu"
 
-#: ../popthelp.c:36
+#: popthelp.c:24
 msgid "Display brief usage message"
 msgstr "Zobrazi� stru�n� n�vod na pou�itie"
diff --git a/popt.c b/popt.c
index 27b014e..6b82988 100644
--- a/popt.c
+++ b/popt.c
@@ -2,25 +2,8 @@
    file accompanying popt source distributions, available from
    ftp://ftp.redhat.com/pub/code/popt */
 
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
-
-#include <errno.h>
-#include <ctype.h>
-#include <fcntl.h>
-#include <limits.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <unistd.h>
-
-#if HAVE_ALLOCA_H
-# include <alloca.h>
-#endif
-
+#include "system.h"
 #include "findme.h"
-#include "popt.h"
 #include "poptint.h"
 
 #ifndef HAVE_STRERROR
@@ -37,7 +20,7 @@ static char * strerror(int errno) {
 
 void poptSetExecPath(poptContext con, const char * path, int allowAbsolute) {
     if (con->execPath) xfree(con->execPath);
-    con->execPath = strdup(path);
+    con->execPath = xstrdup(path);
     con->execAbsolute = allowAbsolute;
 }
 
@@ -69,6 +52,7 @@ poptContext poptGetContext(const char * name, int argc, char ** argv,
     con->os = con->optionStack;
     con->os->argc = argc;
     con->os->argv = (const char **)argv;	/* XXX don't change the API */
+    con->os->argb = PBM_ALLOC(argc);
 
     if (!(flags & POPT_CONTEXT_KEEP_FIRST))
 	con->os->next = 1;			/* skip argv[0] */
@@ -91,10 +75,32 @@ poptContext poptGetContext(const char * name, int argc, char ** argv,
     return con;
 }
 
+static void cleanOSE(struct optionStackEntry *os)
+{
+    if (os->nextArg) {
+	xfree(os->nextArg);
+	os->nextArg = NULL;
+    }
+    if (os->argv) {
+	xfree(os->argv);
+	os->argv = NULL;
+    }
+    if (os->argb) {
+	PBM_FREE(os->argb);
+	os->argb = NULL;
+    }
+}
+
 void poptResetContext(poptContext con) {
     int i;
 
-    con->os = con->optionStack;
+    while (con->os > con->optionStack) {
+	cleanOSE(con->os--);
+    }
+    if (con->os->argb) {
+	PBM_FREE(con->os->argb);
+	con->os->argb = PBM_ALLOC(con->os->argc);
+    }
     con->os->currAlias = NULL;
     con->os->nextCharArg = NULL;
     con->os->nextArg = NULL;
@@ -177,8 +183,7 @@ static int handleAlias(poptContext con, const char * longName, char shortName,
 
     if (i < 0) return 0;
 
-    if ((con->os - con->optionStack + 1)
-	    == POPT_OPTION_DEPTH)
+    if ((con->os - con->optionStack + 1) == POPT_OPTION_DEPTH)
 	return POPT_ERROR_OPTSTOODEEP;
 
     if (nextCharArg && *nextCharArg)
@@ -190,8 +195,9 @@ static int handleAlias(poptContext con, const char * longName, char shortName,
     con->os->nextArg = NULL;
     con->os->nextCharArg = NULL;
     con->os->currAlias = con->aliases + i;
-    con->os->argc = con->os->currAlias->argc;
-    con->os->argv = con->os->currAlias->argv;
+    poptDupArgv(con->os->currAlias->argc, con->os->currAlias->argv,
+		&con->os->argc, &con->os->argv);
+    con->os->argb = PBM_ALLOC(con->os->argc);
 
     return 1;
 }
@@ -297,6 +303,71 @@ findOption(const struct poptOption * table, const char * longName,
     return opt;
 }
 
+static const char *findNextArg(poptContext con, unsigned argx, int delete)
+{
+    struct optionStackEntry * os = con->os;
+    const char * arg;
+
+    do {
+	int i;
+	arg = NULL;
+	while (os->next == os->argc && os > con->optionStack) os--;
+	if (os->next == os->argc && os == con->optionStack) break;
+	for (i = os->next; i < os->argc; i++) {
+	    if (os->argb && PBM_ISSET(i, os->argb)) continue;
+	    if (*os->argv[i] == '-') continue;
+	    if (--argx > 0) continue;
+	    arg = os->argv[i];
+	    if (delete) {
+		if (os->argb == NULL) os->argb = PBM_ALLOC(os->argc);
+		PBM_SET(i, os->argb);
+	    }
+	    break;
+	}
+	if (os > con->optionStack) os--;
+    } while (arg == NULL);
+    return arg;
+}
+
+static const char * expandNextArg(poptContext con, const char * s)
+{
+    const char *a;
+    size_t alen;
+    char *t, *te;
+    size_t tn = strlen(s) + 1;
+    char c;
+
+    te = t = malloc(tn);;
+    while ((c = *s++) != '\0') {
+	switch (c) {
+	case '\\':	/* escape */
+	    c = *s++;
+	    break;
+	case '!':
+	    if (!(s[0] == '#' && s[1] == ':' && s[2] == '+'))
+		break;
+	    if ((a = findNextArg(con, 1, 1)) == NULL)
+		break;
+	    s += 3;
+
+	    alen = strlen(a);
+	    tn += alen;
+	    *te = '\0';
+	    t = realloc(t, tn);
+	    te = t + strlen(t);
+	    strncpy(te, a, alen); te += alen;
+	    continue;
+	    /*@notreached@*/ break;
+	default:
+	    break;
+	}
+	*te++ = c;
+    }
+    *te = '\0';
+    t = realloc(t, strlen(t));
+    return t;
+}
+
 /* returns 'val' element, -1 on last item, POPT_ERROR_* on error */
 int poptGetNextOpt(poptContext con)
 {
@@ -310,17 +381,23 @@ int poptGetNextOpt(poptContext con)
 	const char * longArg = NULL;
 
 	while (!con->os->nextCharArg && con->os->next == con->os->argc
-		&& con->os > con->optionStack)
-	    con->os--;
+		&& con->os > con->optionStack) {
+	    cleanOSE(con->os--);
+	}
 	if (!con->os->nextCharArg && con->os->next == con->os->argc) {
 	    invokeCallbacks(con, con->options, 1);
 	    if (con->doExec) execCommand(con);
 	    return -1;
 	}
 
+	/* Process next long option */
 	if (!con->os->nextCharArg) {
 	    char * localOptString, * optString;
 
+	    if (con->os->argb && PBM_ISSET(con->os->next, con->os->argb)) {
+		con->os->next++;
+		continue;
+	    }
 	    origOptString = con->os->argv[con->os->next++];
 
 	    if (con->restLeftover || *origOptString != '-') {
@@ -351,6 +428,7 @@ int poptGetNextOpt(poptContext con)
 		else
 		    singleDash = 1;
 
+		/* XXX aliases with arg substitution need "--alias=arg" */
 		if (handleAlias(con, optString, '\0', NULL))
 		    continue;
 		if (handleExec(con, optString, '\0'))
@@ -375,6 +453,7 @@ int poptGetNextOpt(poptContext con)
 		con->os->nextCharArg = origOptString + 1;
 	}
 
+	/* Process next short option */
 	if (con->os->nextCharArg) {
 	    origOptString = con->os->nextCharArg;
 
@@ -404,19 +483,24 @@ int poptGetNextOpt(poptContext con)
 	    if (opt->arg)
 		*((int *) opt->arg) = opt->val;
 	} else if ((opt->argInfo & POPT_ARG_MASK) != POPT_ARG_NONE) {
+	    if (con->os->nextArg) {
+		xfree(con->os->nextArg);
+		con->os->nextArg = NULL;
+	    }
 	    if (longArg) {
-		con->os->nextArg = longArg;
+		con->os->nextArg = expandNextArg(con, longArg);
 	    } else if (con->os->nextCharArg) {
-		con->os->nextArg = con->os->nextCharArg;
+		con->os->nextArg = expandNextArg(con, con->os->nextCharArg);
 		con->os->nextCharArg = NULL;
 	    } else {
 		while (con->os->next == con->os->argc &&
-		       con->os > con->optionStack)
-		    con->os--;
+		       con->os > con->optionStack) {
+		    cleanOSE(con->os--);
+		}
 		if (con->os->next == con->os->argc)
 		    return POPT_ERROR_NOARG;
 
-		con->os->nextArg = con->os->argv[con->os->next++];
+		con->os->nextArg = expandNextArg(con, con->os->argv[con->os->next++]);
 	    }
 
 	    if (opt->arg) {
@@ -425,7 +509,7 @@ int poptGetNextOpt(poptContext con)
 
 		switch (opt->argInfo & POPT_ARG_MASK) {
 		  case POPT_ARG_STRING:
-		    *((const char **) opt->arg) = con->os->nextArg;
+		    *((const char **) opt->arg) = xstrdup(con->os->nextArg);
 		    break;
 
 		  case POPT_ARG_INT:
@@ -473,8 +557,9 @@ int poptGetNextOpt(poptContext con)
 	}
 
 	if (opt->arg && (opt->argInfo & POPT_ARG_MASK) != POPT_ARG_NONE
-		     && (opt->argInfo & POPT_ARG_MASK) != POPT_ARG_VAL)
-	    con->finalArgv[con->finalArgvCount++] = strdup(con->os->nextArg);
+		     && (opt->argInfo & POPT_ARG_MASK) != POPT_ARG_VAL) {
+	    con->finalArgv[con->finalArgvCount++] = xstrdup(con->os->nextArg);
+	}
     }
 
     return opt->val;
@@ -508,6 +593,9 @@ const char ** poptGetArgs(poptContext con) {
 void poptFreeContext(poptContext con) {
     int i;
 
+    poptResetContext(con);
+    if (con->os->argb) free(con->os->argb);
+
     for (i = 0; i < con->numAliases; i++) {
 	if (con->aliases[i].longName) xfree(con->aliases[i].longName);
 	free(con->aliases[i].argv);
@@ -517,9 +605,7 @@ void poptFreeContext(poptContext con) {
 	if (con->execs[i].longName) xfree(con->execs[i].longName);
 	xfree(con->execs[i].script);
     }
-
-    for (i = 0; i < con->finalArgvCount; i++)
-	xfree(con->finalArgv[i]);
+    xfree(con->execs);
 
     free(con->leftovers);
     free(con->finalArgv);
@@ -593,12 +679,12 @@ const char *const poptStrerror(const int error) {
 }
 
 int poptStuffArgs(poptContext con, const char ** argv) {
-    int i;
+    int argc;
 
     if ((con->os - con->optionStack) == POPT_OPTION_DEPTH)
 	return POPT_ERROR_OPTSTOODEEP;
 
-    for (i = 0; argv[i]; i++)
+    for (argc = 0; argv[argc]; argc++)
 	;
 
     con->os++;
@@ -606,8 +692,8 @@ int poptStuffArgs(poptContext con, const char ** argv) {
     con->os->nextArg = NULL;
     con->os->nextCharArg = NULL;
     con->os->currAlias = NULL;
-    con->os->argc = i;
-    con->os->argv = argv;
+    poptDupArgv(argc, argv, &con->os->argc, &con->os->argv);
+    con->os->argb = PBM_ALLOC(argc);
     con->os->stuffed = 1;
 
     return 0;
diff --git a/popt.h b/popt.h
index 459dea7..b1e58fa 100644
--- a/popt.h
+++ b/popt.h
@@ -109,8 +109,10 @@ int poptReadConfigFile(poptContext con, const char * fn);
 int poptReadDefaultConfig(poptContext con, int useEnv);
 /* argv should be freed -- this allows ', ", and \ quoting, but ' is treated
    the same as " and both may include \ quotes */
+int poptDupArgv(int argc, const char **argv,
+		/*@out@*/ int * argcPtr, /*@out@*/ const char *** argvPtr);
 int poptParseArgvString(const char * s,
-		/*@out@*/ int * argcPtr, /*@out@*/ char *** argvPtr);
+		/*@out@*/ int * argcPtr, /*@out@*/ const char *** argvPtr);
 /*@observer@*/ const char *const poptStrerror(const int error);
 void poptSetExecPath(poptContext con, const char * path, int allowAbsolute);
 void poptPrintHelp(poptContext con, FILE * f, int flags);
diff --git a/poptconfig.c b/poptconfig.c
index 5f7ec8d..9d23862 100644
--- a/poptconfig.c
+++ b/poptconfig.c
@@ -2,22 +2,7 @@
    file accompanying popt source distributions, available from 
    ftp://ftp.redhat.com/pub/code/popt */
 
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
-
-#include <ctype.h>
-#include <errno.h>
-#include <fcntl.h>
-#include <stdlib.h>
-#include <string.h>
-#include <unistd.h>
-
-#if HAVE_ALLOCA_H
-# include <alloca.h>
-#endif
-
-#include "popt.h"
+#include "system.h"
 #include "poptint.h"
 
 static void configLine(poptContext con, char * line) {
@@ -51,19 +36,19 @@ static void configLine(poptContext con, char * line) {
 	shortName = opt[1];
 
     if (!strcmp(entryType, "alias")) {
-	if (poptParseArgvString(line, &alias.argc, (char ***)&alias.argv)) return;
+	if (poptParseArgvString(line, &alias.argc, &alias.argv)) return;
 	alias.longName = longName, alias.shortName = shortName;
 	poptAddAlias(con, alias, 0);
     } else if (!strcmp(entryType, "exec")) {
 	con->execs = realloc(con->execs, /* XXX memory leak */
 				sizeof(*con->execs) * (con->numExecs + 1));
 	if (longName)
-	    con->execs[con->numExecs].longName = strdup(longName);
+	    con->execs[con->numExecs].longName = xstrdup(longName);
 	else
 	    con->execs[con->numExecs].longName = NULL;
 
 	con->execs[con->numExecs].shortName = shortName;
-	con->execs[con->numExecs].script = strdup(line);
+	con->execs[con->numExecs].script = xstrdup(line);
 	
 	con->numExecs++;
     }
diff --git a/popthelp.c b/popthelp.c
index 4ebe621..c36ecea 100644
--- a/popthelp.c
+++ b/popthelp.c
@@ -4,20 +4,7 @@
    file accompanying popt source distributions, available from 
    ftp://ftp.redhat.com/pub/code/popt */
 
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
-
-#include <ctype.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-
-#ifdef HAVE_ALLOCA_H
-#include <alloca.h>
-#endif
-
-#include "popt.h"
+#include "system.h"
 #include "poptint.h"
 
 static void displayArgs(poptContext con,
@@ -310,5 +297,5 @@ void poptPrintUsage(poptContext con, FILE * f, /*@unused@*/ int flags) {
 
 void poptSetOtherOptionHelp(poptContext con, const char * text) {
     if (con->otherHelp) xfree(con->otherHelp);
-    con->otherHelp = strdup(text);
+    con->otherHelp = xstrdup(text);
 }
diff --git a/poptint.h b/poptint.h
index 64e8cec..89ef4e9 100644
--- a/poptint.h
+++ b/poptint.h
@@ -5,9 +5,26 @@
 #ifndef H_POPTINT
 #define H_POPTINT
 
+/* Bit mask macros. */
+typedef	unsigned int __pbm_bits;
+#define	__PBM_NBITS		(8 * sizeof (__pbm_bits))
+#define	__PBM_IX(d)		((d) / __PBM_NBITS)
+#define __PBM_MASK(d)		((__pbm_bits) 1 << ((d) % __PBM_NBITS))
+typedef struct {
+    __pbm_bits bits[1];
+} pbm_set;
+#define	__PBM_BITS(set)	((set)->bits)
+
+#define	PBM_ALLOC(d)	calloc(__PBM_IX (d) + 1, sizeof(__pbm_bits))
+#define	PBM_FREE(s)	free(s);
+#define PBM_SET(d, s)   (__PBM_BITS (s)[__PBM_IX (d)] |= __PBM_MASK (d))
+#define PBM_CLR(d, s)   (__PBM_BITS (s)[__PBM_IX (d)] &= ~__PBM_MASK (d))
+#define PBM_ISSET(d, s) ((__PBM_BITS (s)[__PBM_IX (d)] & __PBM_MASK (d)) != 0)
+
 struct optionStackEntry {
     int argc;
     /*@keep@*/ const char ** argv;
+    /*@only@*/ pbm_set * argb;
     int next;
     /*@keep@*/ const char * nextArg;
     /*@keep@*/ const char * nextCharArg;
diff --git a/poptparse.c b/poptparse.c
index 0d318f4..ad455de 100644
--- a/poptparse.c
+++ b/poptparse.c
@@ -2,53 +2,52 @@
    file accompanying popt source distributions, available from 
    ftp://ftp.redhat.com/pub/code/popt */
 
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
+#include "system.h"
+#include "poptint.h"
 
-#include <ctype.h>
-#include <stdlib.h>
-#include <string.h>
-
-/* AIX requires this to be the first thing in the file.  */
-#ifndef __GNUC__
-# if HAVE_ALLOCA_H
-#  include <alloca.h>
-# else
-#  ifdef _AIX
-#pragma alloca
-#  else
-#   ifndef alloca /* predefined by HP cc +Olibcalls */
-char *alloca ();
-#   endif
-#  endif
-# endif
-#elif defined(__GNUC__) && defined(__STRICT_ANSI__)
-#define alloca __builtin_alloca
-#endif
+#define POPT_ARGV_ARRAY_GROW_DELTA 5
 
-#include "popt.h"
+int poptDupArgv(int argc, const char **argv,
+		int * argcPtr, const char *** argvPtr)
+{
+    size_t nb = (argc + 1) * sizeof(*argv);
+    const char ** argv2;
+    char * dst;
+    int i;
 
-#define POPT_ARGV_ARRAY_GROW_DELTA 5
+    for (i = 0; i < argc; i++) {
+	if (argv[i] == NULL)
+	    return POPT_ERROR_NOARG;
+	nb += strlen(argv[i]) + 1;
+    }
+	
+    argv2 = (void *) dst = malloc(nb);
+    dst += (argc + 1) * sizeof(*argv);
 
-int poptParseArgvString(const char * s, int * argcPtr, char *** argvPtr) {
-    char * buf, * bufStart, * dst;
+    for (i = 0; i < argc; i++) {
+	argv2[i] = dst;
+	dst += strlen(strcpy(dst, argv[i])) + 1;
+    }
+    argv2[argc] = NULL;
+
+    *argvPtr = argv2;
+    *argcPtr = argc;
+    return 0;
+}
+
+int poptParseArgvString(const char * s, int * argcPtr, const char *** argvPtr)
+{
     const char * src;
     char quote = '\0';
     int argvAlloced = POPT_ARGV_ARRAY_GROW_DELTA;
-    char ** argv = malloc(sizeof(*argv) * argvAlloced);
-    const char ** argv2;
+    const char ** argv = malloc(sizeof(*argv) * argvAlloced);
     int argc = 0;
-    int i, buflen;
-
-    buflen = strlen(s) + 1;
-    bufStart = buf = alloca(buflen);
-    memset(buf, '\0', buflen);
+    int buflen = strlen(s) + 1;
+    char * buf = memset(alloca(buflen), 0, buflen);
 
-    src = s;
     argv[argc] = buf;
 
-    while (*src) {
+    for (src = s; *src; src++) {
 	if (quote == *src) {
 	    quote = '\0';
 	} else if (quote) {
@@ -86,29 +85,33 @@ int poptParseArgvString(const char * s, int * argcPtr, char *** argvPtr) {
 	    *buf++ = *src;
 	    break;
 	}
-
-	src++;
     }
 
     if (strlen(argv[argc])) {
 	argc++, buf++;
     }
 
-    dst = malloc((argc + 1) * sizeof(*argv) + (buf - bufStart));
-    argv2 = (void *) dst;
-    dst += (argc + 1) * sizeof(*argv);
-    memcpy(argv2, argv, argc * sizeof(*argv));
-    argv2[argc] = NULL;
-    memcpy(dst, bufStart, buf - bufStart);
+#if 0
+    {	char * dst = malloc((argc + 1) * sizeof(*argv) + (buf - argv[0]));
+	const char ** argv2 = (void *) dst;
+	int i;
 
-    for (i = 0; i < argc; i++) {
-	argv2[i] = dst + (argv[i] - bufStart);
+	dst += (argc + 1) * sizeof(*argv);
+	memcpy(argv2, argv, argc * sizeof(*argv));
+	argv2[argc] = NULL;
+	memcpy(dst, argv[0], buf - argv[0]);
+
+	for (i = 0; i < argc; i++)
+	    argv2[i] = dst + (argv[i] - argv[0]);
+
+	*argvPtr = argv2;
+	*argcPtr = argc;
     }
+#else
+    (void) poptDupArgv(argc, argv, argcPtr, argvPtr);
+#endif
 
     free(argv);
 
-    *argvPtr = (char **)argv2;	/* XXX don't change the API */
-    *argcPtr = argc;
-
     return 0;
 }
diff --git a/system.h b/system.h
new file mode 100644
index 0000000..43ad70f
--- /dev/null
+++ b/system.h
@@ -0,0 +1,55 @@
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include <ctype.h>
+#include <errno.h>
+#include <fcntl.h>
+#include <limits.h>
+
+#if HAVE_MCHECK_H 
+#include <mcheck.h>
+#endif
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+
+#if HAVE_UNISTD_H
+#include <unistd.h>
+#endif
+
+#ifdef __NeXT
+/* access macros are not declared in non posix mode in unistd.h -
+ don't try to use posix on NeXTstep 3.3 ! */
+#include <libc.h>
+#endif
+
+/* AIX requires this to be the first thing in the file.  */ 
+#ifndef __GNUC__
+# if HAVE_ALLOCA_H
+#  include <alloca.h>
+# else
+#  ifdef _AIX
+#pragma alloca
+#  else
+#   ifndef alloca /* predefined by HP cc +Olibcalls */
+char *alloca ();
+#   endif
+#  endif
+# endif
+#elif defined(__GNUC__) && defined(__STRICT_ANSI__)
+#define alloca __builtin_alloca
+#endif
+
+/*@only@*/ char * xstrdup (const char *str);
+
+#if HAVE_MCHECK_H && defined(__GNUC__)
+#define	vmefail()	(fprintf(stderr, "virtual memory exhausted.\n"), exit(EXIT_FAILURE), NULL)
+#define xstrdup(_str)   (strcpy((malloc(strlen(_str)+1) ? : vmefail()), (_str)))
+#else
+#define	xstrdup(_str)	strdup(_str)
+#endif  /* HAVE_MCHECK_H && defined(__GNUC__) */
+
+
+#include "popt.h"
diff --git a/test-poptrc b/test-poptrc
index 7046ec9..509e013 100644
--- a/test-poptrc
+++ b/test-poptrc
@@ -4,7 +4,8 @@ test1 alias --takerest --
 test1 alias -T --arg2
 test1 alias -O --arg1
 
-test1 alias --wc --arg2 @@1 --arg1 @@2
+test1 alias --grab --arg2 "'foo !#:+'"
+test1 alias --grabbar --grab bar
 
 test1 exec --echo-args echo
 test1 alias -e --echo-args
diff --git a/test1.c b/test1.c
index cd8e897..68ec7fd 100644
--- a/test1.c
+++ b/test1.c
@@ -2,10 +2,7 @@
    file accompanying popt source distributions, available from
    ftp://ftp.redhat.com/pub/code/popt */
 
-#include <stdio.h>
-#include <stdlib.h>
-
-#include "popt.h"
+#include "system.h"
 
 static int pass2 = 0;
 static void option_callback(poptContext con, enum poptCallbackReason reason,
@@ -71,35 +68,44 @@ static void resetVars(void)
 
 int main(int argc, char ** argv) {
     int rc;
+    int ec = 0;
     poptContext optCon;
     const char ** rest;
     int help = 0;
     int usage = 0;
 
+#if HAVE_MCHECK_H && HAVE_MTRACE
+    mtrace();   /* Trace malloc only if MALLOC_TRACE=mtrace-output-file. */
+#endif
+
     resetVars();
     optCon = poptGetContext("test1", argc, argv, options, 0);
     poptReadConfigFile(optCon, "./test-poptrc");
 
+#if 1
     while ((rc = poptGetNextOpt(optCon)) > 0)	/* Read all the options ... */
 	;
 
     poptResetContext(optCon);			/* ... and then start over. */
     resetVars();
+#endif
 
     pass2 = 1;
     if ((rc = poptGetNextOpt(optCon)) < -1) {
 	fprintf(stderr, "test1: bad argument %s: %s\n",
 		poptBadOption(optCon, POPT_BADOPTION_NOALIAS),
 		poptStrerror(rc));
-	return 2;
+	ec = 2;
+	goto exit;
     }
 
     if (help) {
 	poptPrintHelp(optCon, stdout, 0);
-	return 0;
-    } if (usage) {
+	goto exit;
+    }
+    if (usage) {
 	poptPrintUsage(optCon, stdout, 0);
-	return 0;
+	goto exit;
     }
 
     fprintf(stdout, "arg1: %d arg2: %s", arg1, arg2);
@@ -124,5 +130,10 @@ int main(int argc, char ** argv) {
 
     fprintf(stdout, "\n");
 
-    return 0;
+exit:
+    poptFreeContext(optCon);
+#if HAVE_MCHECK_H && HAVE_MTRACE
+    muntrace();   /* Trace malloc only if MALLOC_TRACE=mtrace-output-file. */
+#endif
+    return ec;
 }
diff --git a/test2.c b/test2.c
index 4e9275d..5deb89d 100644
--- a/test2.c
+++ b/test2.c
@@ -9,11 +9,7 @@
     whim as long as this Copyright remains attached.  
 */
 
-#include <stdio.h>
-#include <string.h>
-#include <popt.h>
-
-#define TEST2
+#include "system.h"
 
 char *PathnameOfKeyFile		= NULL;
 char *PathnameOfOfferFile	= NULL;
@@ -123,6 +119,10 @@ main(int argc, char**argv ) {
         { NULL, 0, 0, NULL, 0, NULL, NULL }
     };
 
+#if HAVE_MCHECK_H && HAVE_MTRACE
+    mtrace();   /* Trace malloc only if MALLOC_TRACE=mtrace-output-file. */
+#endif
+
     optCon = poptGetContext("createuser", argc, argv, optionsTable, 0);
     poptReadConfigFile(optCon, rcfile );
 
diff --git a/testit.sh b/testit.sh
index 8883510..fdb1541 100755
--- a/testit.sh
+++ b/testit.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-${test1:=`pwd`/.libs/lt-test1}
+${test1:=./test1}
 
 run() {
     prog=$1; shift
@@ -47,6 +47,8 @@ run test1 "test1 - 26" "callback: c arg for cb2 foo arg1: 0 arg2: (none)" --cb2
 run test1 "test1 - 27" "arg1: 0 arg2: (none) -" -
 run test1 "test1 - 28" "arg1: 0 arg2: foo -" - -2 foo
 run test1 "test1 - 29" "arg1: 0 arg2: bbbb" --arg2=aaaa -2 bbbb
+run test1 "test1 - 30" "arg1: 0 arg2: 'foo bingo' rest: boggle" --grab bingo boggle
+run test1 "test1 - 31" "arg1: 0 arg2: 'foo bar' rest: boggle" --grabbar boggle
 
 echo ""
 echo "Passed."
-- 
Gitee


From e397a225d91705cb1bf44e1a62fdd11cfa9e2ab9 Mon Sep 17 00:00:00 2001
From: Jeff Johnson <n3npq@mac.com>
Date: Mon, 25 Oct 1999 18:24:38 +0000
Subject: [PATCH 209/667] Lazy allocation of deleted arg bit map.

---
 po/popt.pot | 2 +-
 popt.c      | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/po/popt.pot b/po/popt.pot
index e0204d7..78c2117 100644
--- a/po/popt.pot
+++ b/po/popt.pot
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 1999-10-25 14:20-0400\n"
+"POT-Creation-Date: 1999-10-25 14:23-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/popt.c b/popt.c
index 6b82988..4eeb8fe 100644
--- a/popt.c
+++ b/popt.c
@@ -52,7 +52,7 @@ poptContext poptGetContext(const char * name, int argc, char ** argv,
     con->os = con->optionStack;
     con->os->argc = argc;
     con->os->argv = (const char **)argv;	/* XXX don't change the API */
-    con->os->argb = PBM_ALLOC(argc);
+    con->os->argb = NULL;
 
     if (!(flags & POPT_CONTEXT_KEEP_FIRST))
 	con->os->next = 1;			/* skip argv[0] */
@@ -99,7 +99,7 @@ void poptResetContext(poptContext con) {
     }
     if (con->os->argb) {
 	PBM_FREE(con->os->argb);
-	con->os->argb = PBM_ALLOC(con->os->argc);
+	con->os->argb = NULL;
     }
     con->os->currAlias = NULL;
     con->os->nextCharArg = NULL;
@@ -197,7 +197,7 @@ static int handleAlias(poptContext con, const char * longName, char shortName,
     con->os->currAlias = con->aliases + i;
     poptDupArgv(con->os->currAlias->argc, con->os->currAlias->argv,
 		&con->os->argc, &con->os->argv);
-    con->os->argb = PBM_ALLOC(con->os->argc);
+    con->os->argb = NULL;
 
     return 1;
 }
@@ -693,7 +693,7 @@ int poptStuffArgs(poptContext con, const char ** argv) {
     con->os->nextCharArg = NULL;
     con->os->currAlias = NULL;
     poptDupArgv(argc, argv, &con->os->argc, &con->os->argv);
-    con->os->argb = PBM_ALLOC(argc);
+    con->os->argb = NULL;
     con->os->stuffed = 1;
 
     return 0;
-- 
Gitee


From a87e9e9945f55c2fd6d62160f28dd0587960a217 Mon Sep 17 00:00:00 2001
From: Jeff Johnson <n3npq@mac.com>
Date: Mon, 25 Oct 1999 19:07:14 +0000
Subject: [PATCH 210/667] lclint annotations.

---
 popt.c      | 10 +++++++---
 poptint.h   |  4 ++--
 poptparse.c |  3 ++-
 3 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/popt.c b/popt.c
index 4eeb8fe..11eb184 100644
--- a/popt.c
+++ b/popt.c
@@ -111,8 +111,12 @@ void poptResetContext(poptContext con) {
     con->restLeftover = 0;
     con->doExec = NULL;
 
-    for (i = 0; i < con->finalArgvCount; i++)
-	xfree(con->finalArgv[i]);
+    for (i = 0; i < con->finalArgvCount; i++) {
+	if (con->finalArgv[i]) {
+	    xfree(con->finalArgv[i]);
+	    con->finalArgv[i] = NULL;
+	}
+    }
 
     con->finalArgvCount = 0;
 }
@@ -329,7 +333,7 @@ static const char *findNextArg(poptContext con, unsigned argx, int delete)
     return arg;
 }
 
-static const char * expandNextArg(poptContext con, const char * s)
+static /*@only@*/ const char * expandNextArg(poptContext con, const char * s)
 {
     const char *a;
     size_t alen;
diff --git a/poptint.h b/poptint.h
index 89ef4e9..1688095 100644
--- a/poptint.h
+++ b/poptint.h
@@ -23,10 +23,10 @@ typedef struct {
 
 struct optionStackEntry {
     int argc;
-    /*@keep@*/ const char ** argv;
+    /*@only@*/ const char ** argv;
     /*@only@*/ pbm_set * argb;
     int next;
-    /*@keep@*/ const char * nextArg;
+    /*@only@*/ const char * nextArg;
     /*@keep@*/ const char * nextCharArg;
     /*@dependent@*/ struct poptAlias * currAlias;
     int stuffed;
diff --git a/poptparse.c b/poptparse.c
index ad455de..65c948b 100644
--- a/poptparse.c
+++ b/poptparse.c
@@ -21,7 +21,8 @@ int poptDupArgv(int argc, const char **argv,
 	nb += strlen(argv[i]) + 1;
     }
 	
-    argv2 = (void *) dst = malloc(nb);
+    dst = malloc(nb);
+    argv2 = (void *) dst;
     dst += (argc + 1) * sizeof(*argv);
 
     for (i = 0; i < argc; i++) {
-- 
Gitee


From 23443d9e7f5ddc9573b91161c627856fd82fff23 Mon Sep 17 00:00:00 2001
From: Jeff Johnson <n3npq@mac.com>
Date: Mon, 25 Oct 1999 20:10:00 +0000
Subject: [PATCH 211/667] Add poptDupArgv() and const's to popt.3 man page.

---
 po/popt.pot |  2 +-
 popt.3      | 58 ++++++++++++++++++++++++++++++-----------------------
 popt.c      |  2 +-
 3 files changed, 35 insertions(+), 27 deletions(-)

diff --git a/po/popt.pot b/po/popt.pot
index 78c2117..6793fcf 100644
--- a/po/popt.pot
+++ b/po/popt.pot
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 1999-10-25 14:23-0400\n"
+"POT-Creation-Date: 1999-10-25 16:06-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/popt.3 b/popt.3
index 582a270..96848d3 100644
--- a/popt.3
+++ b/popt.3
@@ -5,9 +5,9 @@ popt \- Parse command line options
 .nf
 .B #include <popt.h>
 .sp
-.BI "poptContext poptGetContext(char * " name ", int " argc ,
-.BI "                           char ** "argv ,
-.BI "                           struct poptOption * " options ,
+.BI "poptContext poptGetContext(const char * " name ", int " argc ,
+.BI "                           har ** "argv ,
+.BI "                           const struct poptOption * " options ,
 .BI "                           int " flags );
 .sp
 .BI "void poptFreeContext(poptContext " con );
@@ -20,13 +20,13 @@ popt \- Parse command line options
 .sp
 .BI "char * poptGetArg(poptContext " con );
 .sp
-.BI "char * poptPeekArg(poptContext " con );
+.BI "const char * poptPeekArg(poptContext " con );
 .sp
-.BI "char ** poptGetArgs(poptContext " con );
+.BI "const char ** poptGetArgs(poptContext " con );
 .sp
-.BI "const char * poptStrerror(const int " error );
+.BI "const char *const poptStrerror(const int " error );
 .sp
-.BI "char * poptBadOption(poptContext " con ", int " flags );
+.BI "const char * poptBadOption(poptContext " con ", int " flags );
 .sp
 .BI "int poptReadDefaultConfig(poptContext " con ", int " flags );
 .sp
@@ -36,9 +36,12 @@ popt \- Parse command line options
 .BI "                 int " flags );
 .sp
 .BI "int poptParseArgvString(char * " s ", int *  " argcPtr , 
-.BI "                        char *** " argvPtr );
+.BI "                        const char *** " argvPtr );
 .sp
-.BI "int poptStuffArgs(poptContext " con ", char ** " argv );
+.BI "int poptDupArgv(int " argc ", const char ** " argv ", int * " argcPtr ",
+.BI "                        const char *** " argvPtr ");"
+.sp
+.BI "int poptStuffArgs(poptContext " con ", const char ** " argv );
 .sp
 .fi
 .SH DESCRIPTION
@@ -242,9 +245,9 @@ modified outside the popt library.
 .RB "New popt contexts are created by " poptGetContext() ":"
 .sp
 .nf
-.BI "poptContext poptGetContext(char * " name ", int "argc ",
+.BI "poptContext poptGetContext(const char * " name ", int "argc ",
 .BI "                           char ** "argv ",
-.BI "                           struct poptOption * "options ",
+.BI "                           const struct poptOption * "options ",
 .BI "                           int "flags ");"
 .fi
 .sp
@@ -351,7 +354,7 @@ processed.
 .PP
 .nf
 .HP
-.BI "char * poptPeekArg(poptContext " con ");"
+.BI "const char * poptPeekArg(poptContext " con ");"
 .fi
 The next leftover argument is returned but not marked as processed.
 This allows an application to look ahead into the argument list,
@@ -359,7 +362,7 @@ without modifying the list.
 .PP
 .nf
 .HP
-.BI "char ** poptGetArgs(poptContext " con ");"
+.BI "const char ** poptGetArgs(poptContext " con ");"
 .fi
 All the leftover arguments are returned in a manner identical to 
 .IR argv ".  The final element in the returned array points to "
@@ -457,14 +460,14 @@ Two functions are available to make it easy for applications to provide
 good error messages.
 .HP
 .nf
-.BI "const char * poptStrerror(const int " error ");"
+.BI "const char *const poptStrerror(const int " error ");"
 .fi
 This function takes a popt error code and returns a string describing
 .RB "the error, just as with the standard " strerror() " function."
 .PP
 .HP
 .nf
-.BI "char * poptBadOption(poptContext " con ", int " flags ");"
+.BI "const char * poptBadOption(poptContext " con ", int " flags ");"
 .fi
 .RB "If an error occurred during " poptGetNextOpt() ", this function "
 .RI "returns the option that caused the error. If the " flags " argument"
@@ -551,10 +554,10 @@ currently reserved for future expansion. The new alias is specified
 .sp
 .nf
 struct poptAlias {
-     char * longName; /* may be NULL */
+     const char * longName; /* may be NULL */
      char shortName; /* may be '\\0' */
      int argc;
-     char ** argv; /* must be free()able */
+     const char ** argv; /* must be free()able */
 };
 .fi
 .sp
@@ -571,20 +574,25 @@ using rules similiar to normal shell parsing.
 .sp
 .nf
 .B "#include <popt.h>"
-.BI "int poptParseArgvString(char * " s ", int *  "argcPtr ",
+.BI "int poptParseArgvString(char * " s ", int * " argcPtr ",
 .BI "                        char *** " argvPtr ");"
+.BI "int poptDupArgv(int " argc ", const char ** " argv ", int * " argcPtr ",
+.BI "                        const char *** " argvPtr ");"
 .fi
 .sp
 .RI "The string s is parsed into an " argv "-style array. The integer "
-.RI "pointed to by the second parameter, " argcPtr ", contains the number "
-of elements parsed, and the pointer pointed to by the final parameter is 
-set to point to the newly created array. The array is dynamically 
-.RB "allocated and should be " free() "ed when the application is finished "
-with it.
+.RI "pointed to by the " argcPtr " parameter contains the number of elements "
+.RI "parsed, and the final " argvPtr " parameter contains the address of the"
+newly created array.
+.RB "The routine " poptDupArgv() " can be used to make a copy of an existing "
+argument array.
 .sp
 .RI "The " argvPtr 
-.RB "created by " poptParseArgvString() " is suitable to pass directly "
+.RB "created by " poptParseArgvString() " or " poptDupArgv() " is suitable to pass directly "
 .RB "to " poptGetContext() .
+Both routines return a single dynamically allocated contiguous
+.RB "block of storage and should be " free() "ed when the application is"
+finished with the storage.
 .SH "HANDLING EXTRA ARGUMENTS"
 Some applications implement the equivalent of option aliasing but need
 .RB "to do so through special logic. The " poptStuffArgs() " function "
@@ -593,7 +601,7 @@ allows an application to insert new arguments into the current
 .sp
 .nf
 .B "#include <popt.h>"
-.BI "int poptStuffArgs(poptContext "con ", char ** " argv ");"
+.BI "int poptStuffArgs(poptContext "con ", const char ** " argv ");"
 .fi
 .sp
 .RI "The passed " argv 
diff --git a/popt.c b/popt.c
index 11eb184..3fb54f7 100644
--- a/popt.c
+++ b/popt.c
@@ -51,7 +51,7 @@ poptContext poptGetContext(const char * name, int argc, char ** argv,
 
     con->os = con->optionStack;
     con->os->argc = argc;
-    con->os->argv = (const char **)argv;	/* XXX don't change the API */
+    con->os->argv = (const char **) argv;	/* XXX don't change the API */
     con->os->argb = NULL;
 
     if (!(flags & POPT_CONTEXT_KEEP_FIRST))
-- 
Gitee


From c38853ccebac4aa6a5d673e7b674e68827dd9ffd Mon Sep 17 00:00:00 2001
From: Jeff Johnson <n3npq@mac.com>
Date: Wed, 27 Oct 1999 23:18:11 +0000
Subject: [PATCH 212/667] use compressed filenames on install side. start
 unifying FD types, CFD_t now gone.

---
 po/popt.pot |  2 +-
 po/ro.po    |  2 +-
 po/sk.po    |  2 +-
 popt.3      | 12 ++++++------
 popt.c      | 12 ++++++------
 popt.h      |  6 +++---
 test1.c     |  2 +-
 test2.c     |  2 +-
 8 files changed, 20 insertions(+), 20 deletions(-)

diff --git a/po/popt.pot b/po/popt.pot
index 6793fcf..7e9bfbf 100644
--- a/po/popt.pot
+++ b/po/popt.pot
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 1999-10-25 16:06-0400\n"
+"POT-Creation-Date: 1999-10-26 13:07-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/po/ro.po b/po/ro.po
index f01b2de..0f7b805 100644
--- a/po/ro.po
+++ b/po/ro.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: POPT\n"
-"POT-Creation-Date: 1999-10-22 17:29-0400\n"
+"POT-Creation-Date: 1999-10-26 13:07-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Cristian Gafton <gafton@redhat.com>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/po/sk.po b/po/sk.po
index 712b63e..1f492ee 100644
--- a/po/sk.po
+++ b/po/sk.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt\n"
-"POT-Creation-Date: 1999-10-22 17:29-0400\n"
+"POT-Creation-Date: 1999-10-26 13:07-0400\n"
 "PO-Revision-Date: 1999-08-04 21:40+0200\n"
 "Last-Translator: Stanislav Meduna <stano@eunet.sk>\n"
 "Language-Team: Slovak <sk-i18n@rak.isternet.sk>\n"
diff --git a/popt.3 b/popt.3
index 96848d3..b07b394 100644
--- a/popt.3
+++ b/popt.3
@@ -6,7 +6,7 @@ popt \- Parse command line options
 .B #include <popt.h>
 .sp
 .BI "poptContext poptGetContext(const char * " name ", int " argc ,
-.BI "                           har ** "argv ,
+.BI "                           const char ** "argv ,
 .BI "                           const struct poptOption * " options ,
 .BI "                           int " flags );
 .sp
@@ -16,9 +16,9 @@ popt \- Parse command line options
 .sp
 .BI "int poptGetNextOpt(poptContext " con );
 .sp
-.BI "char * poptGetOptArg(poptContext " con );
+.BI "const char * poptGetOptArg(poptContext " con );
 .sp
-.BI "char * poptGetArg(poptContext " con );
+.BI "const char * poptGetArg(poptContext " con );
 .sp
 .BI "const char * poptPeekArg(poptContext " con );
 .sp
@@ -246,7 +246,7 @@ modified outside the popt library.
 .sp
 .nf
 .BI "poptContext poptGetContext(const char * " name ", int "argc ",
-.BI "                           char ** "argv ",
+.BI "                           const char ** "argv ",
 .BI "                           const struct poptOption * "options ",
 .BI "                           int "flags ");"
 .fi
@@ -333,7 +333,7 @@ ways to discover them. One is to ask popt to fill in a variable with the
 .sp
 .nf
 .B #include <popt.h>
-.BI "char * poptGetOptArg(poptContext " con ");"
+.BI "const char * poptGetOptArg(poptContext " con ");"
 .fi
 .sp
 This function returns the argument given for the final option returned by
@@ -347,7 +347,7 @@ of leftover arguments. Three functions allow applications to access such
 arguments:
 .nf
 .HP
-.BI "char * poptGetArg(poptContext " con ");"
+.BI "const char * poptGetArg(poptContext " con ");"
 .fi
 This function returns the next leftover argument and marks it as
 processed.
diff --git a/popt.c b/popt.c
index 3fb54f7..75c8b92 100644
--- a/popt.c
+++ b/popt.c
@@ -43,7 +43,7 @@ static void invokeCallbacks(poptContext con, const struct poptOption * table,
     }
 }
 
-poptContext poptGetContext(const char * name, int argc, char ** argv,
+poptContext poptGetContext(const char * name, int argc, const char ** argv,
 			   const struct poptOption * options, int flags) {
     poptContext con = malloc(sizeof(*con));
 
@@ -51,7 +51,7 @@ poptContext poptGetContext(const char * name, int argc, char ** argv,
 
     con->os = con->optionStack;
     con->os->argc = argc;
-    con->os->argv = (const char **) argv;	/* XXX don't change the API */
+    con->os->argv = argv;
     con->os->argb = NULL;
 
     if (!(flags & POPT_CONTEXT_KEEP_FIRST))
@@ -569,15 +569,15 @@ int poptGetNextOpt(poptContext con)
     return opt->val;
 }
 
-char * poptGetOptArg(poptContext con) {
-    char * ret = (char *)con->os->nextArg;	/* XXX don't change the API */
+const char * poptGetOptArg(poptContext con) {
+    const char * ret = con->os->nextArg;
     con->os->nextArg = NULL;
     return ret;
 }
 
-char * poptGetArg(poptContext con) {
+const char * poptGetArg(poptContext con) {
     if (con->numLeftovers == con->nextLeftover) return NULL;
-    return (char *)con->leftovers[con->nextLeftover++];	/* XXX don't change the API */
+    return con->leftovers[con->nextLeftover++];
 }
 
 const char * poptPeekArg(poptContext con) {
diff --git a/popt.h b/popt.h
index b1e58fa..5046fad 100644
--- a/popt.h
+++ b/popt.h
@@ -86,16 +86,16 @@ typedef void (*poptCallbackType)(poptContext con,
 				 const char * arg, const void * data);
 
 /*@only@*/ poptContext poptGetContext(/*@keep@*/ const char * name,
-		int argc, /*@keep@*/ char ** argv,
+		int argc, /*@keep@*/ const char ** argv,
 		/*@keep@*/ const struct poptOption * options, int flags);
 void poptResetContext(poptContext con);
 
 /* returns 'val' element, -1 on last item, POPT_ERROR_* on error */
 int poptGetNextOpt(poptContext con);
 /* returns NULL if no argument is available */
-/*@observer@*/ /*@null@*/ char * poptGetOptArg(poptContext con);
+/*@observer@*/ /*@null@*/ const char * poptGetOptArg(poptContext con);
 /* returns NULL if no more options are available */
-/*@observer@*/ /*@null@*/ char * poptGetArg(poptContext con);
+/*@observer@*/ /*@null@*/ const char * poptGetArg(poptContext con);
 /*@observer@*/ /*@null@*/ const char * poptPeekArg(poptContext con);
 /*@observer@*/ /*@null@*/ const char ** poptGetArgs(poptContext con);
 /* returns the option which caused the most recent error */
diff --git a/test1.c b/test1.c
index 68ec7fd..416d59e 100644
--- a/test1.c
+++ b/test1.c
@@ -66,7 +66,7 @@ static void resetVars(void)
     pass2 = 0;
 }
 
-int main(int argc, char ** argv) {
+int main(int argc, const char ** argv) {
     int rc;
     int ec = 0;
     poptContext optCon;
diff --git a/test2.c b/test2.c
index 5deb89d..f4e4bae 100644
--- a/test2.c
+++ b/test2.c
@@ -46,7 +46,7 @@ char *fax			= NULL;
 
 
 int 
-main(int argc, char**argv ) {
+main(int argc, const char ** argv) {
 
     poptContext optCon;   /* context for parsing command-line options */
     struct poptOption userOptionsTable[] = {
-- 
Gitee


From d98bb9737f102b60acd8b1ff1a9077d392016cae Mon Sep 17 00:00:00 2001
From: Jeff Johnson <n3npq@mac.com>
Date: Fri, 29 Oct 1999 16:06:01 +0000
Subject: [PATCH 213/667] check for memory leaks (almost all leaks are
 plugged).

---
 po/popt.pot  |  2 +-
 popt.c       | 11 ++++++++---
 poptconfig.c |  2 +-
 3 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/po/popt.pot b/po/popt.pot
index 7e9bfbf..309f012 100644
--- a/po/popt.pot
+++ b/po/popt.pot
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 1999-10-26 13:07-0400\n"
+"POT-Creation-Date: 1999-10-29 09:03-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/popt.c b/popt.c
index 75c8b92..283cf83 100644
--- a/popt.c
+++ b/popt.c
@@ -59,9 +59,13 @@ poptContext poptGetContext(const char * name, int argc, const char ** argv,
 
     con->leftovers = calloc( (argc + 1), sizeof(char *) );
     con->options = options;
+    con->aliases = NULL;
+    con->numAliases = 0;
+    con->flags = flags;
+    con->execs = NULL;
+    con->numExecs = 0;
     con->finalArgvAlloced = argc * 2;
     con->finalArgv = calloc( con->finalArgvAlloced, sizeof(*con->finalArgv) );
-    con->flags = flags;
     con->execAbsolute = 1;
 
     if (getenv("POSIXLY_CORRECT") || getenv("POSIX_ME_HARDER"))
@@ -368,7 +372,7 @@ static /*@only@*/ const char * expandNextArg(poptContext con, const char * s)
 	*te++ = c;
     }
     *te = '\0';
-    t = realloc(t, strlen(t));
+    t = realloc(t, strlen(t));	/* XXX memory leak, hard to plug */
     return t;
 }
 
@@ -513,6 +517,7 @@ int poptGetNextOpt(poptContext con)
 
 		switch (opt->argInfo & POPT_ARG_MASK) {
 		  case POPT_ARG_STRING:
+		    /* XXX memory leak, hard to plug */
 		    *((const char **) opt->arg) = xstrdup(con->os->nextArg);
 		    break;
 
@@ -609,7 +614,7 @@ void poptFreeContext(poptContext con) {
 	if (con->execs[i].longName) xfree(con->execs[i].longName);
 	xfree(con->execs[i].script);
     }
-    xfree(con->execs);
+    if (con->execs) xfree(con->execs);
 
     free(con->leftovers);
     free(con->finalArgv);
diff --git a/poptconfig.c b/poptconfig.c
index 9d23862..7a1a4c2 100644
--- a/poptconfig.c
+++ b/poptconfig.c
@@ -40,7 +40,7 @@ static void configLine(poptContext con, char * line) {
 	alias.longName = longName, alias.shortName = shortName;
 	poptAddAlias(con, alias, 0);
     } else if (!strcmp(entryType, "exec")) {
-	con->execs = realloc(con->execs, /* XXX memory leak */
+	con->execs = realloc(con->execs,
 				sizeof(*con->execs) * (con->numExecs + 1));
 	if (longName)
 	    con->execs[con->numExecs].longName = xstrdup(longName);
-- 
Gitee


From adc875b79e5cb74f5389919a430e8662d3f9e403 Mon Sep 17 00:00:00 2001
From: Jeff Johnson <n3npq@mac.com>
Date: Mon, 1 Nov 1999 23:23:09 +0000
Subject: [PATCH 214/667] fix: expandNextArg() can't permit '\\' escapes.

---
 po/popt.pot | 2 +-
 popt.c      | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/po/popt.pot b/po/popt.pot
index 309f012..56a5f60 100644
--- a/po/popt.pot
+++ b/po/popt.pot
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 1999-10-29 09:03-0400\n"
+"POT-Creation-Date: 1999-11-01 18:21-0500\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/popt.c b/popt.c
index 283cf83..1121c91 100644
--- a/popt.c
+++ b/popt.c
@@ -348,9 +348,11 @@ static /*@only@*/ const char * expandNextArg(poptContext con, const char * s)
     te = t = malloc(tn);;
     while ((c = *s++) != '\0') {
 	switch (c) {
+#if 0	/* XXX can't do this */
 	case '\\':	/* escape */
 	    c = *s++;
 	    break;
+#endif
 	case '!':
 	    if (!(s[0] == '#' && s[1] == ':' && s[2] == '+'))
 		break;
-- 
Gitee


From 95835870c285a7e864c4bb4fb09f421866e93d00 Mon Sep 17 00:00:00 2001
From: Jeff Johnson <n3npq@mac.com>
Date: Thu, 18 Nov 1999 16:57:45 +0000
Subject: [PATCH 215/667] fix: realloc didn't include space for trailing NUL.

---
 po/popt.pot | 2 +-
 popt.c      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/po/popt.pot b/po/popt.pot
index 56a5f60..1691522 100644
--- a/po/popt.pot
+++ b/po/popt.pot
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 1999-11-01 18:21-0500\n"
+"POT-Creation-Date: 1999-11-18 11:50-0500\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/popt.c b/popt.c
index 1121c91..0de68fd 100644
--- a/popt.c
+++ b/popt.c
@@ -374,7 +374,7 @@ static /*@only@*/ const char * expandNextArg(poptContext con, const char * s)
 	*te++ = c;
     }
     *te = '\0';
-    t = realloc(t, strlen(t));	/* XXX memory leak, hard to plug */
+    t = realloc(t, strlen(t)+1);	/* XXX memory leak, hard to plug */
     return t;
 }
 
-- 
Gitee


From 12b940fdddbe67a8611e6cb1ea8e988bab31bcde Mon Sep 17 00:00:00 2001
From: Jeff Johnson <n3npq@mac.com>
Date: Thu, 18 Nov 1999 17:10:15 +0000
Subject: [PATCH 216/667] From: Dick Porter <dick@acm.org> --

Here is a patch for popt to implement selective argument stripping from argv.
With this patch I can use popt in ORBit (the CORBA spec requires ORBs to
remove all ORB options from argv), which allows me to export a popt option
table to the rest of Gnome.

There is also a bug fix included where a string was realloc()d into a space
too small to hold the trailing NULL.
---
 po/popt.pot |  2 +-
 popt.c      | 61 ++++++++++++++++++++++++++++++++++++++++++++++++++++-
 popt.h      |  3 +++
 poptint.h   |  1 +
 4 files changed, 65 insertions(+), 2 deletions(-)

diff --git a/po/popt.pot b/po/popt.pot
index 1691522..6a3a1b4 100644
--- a/po/popt.pot
+++ b/po/popt.pot
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 1999-11-18 11:50-0500\n"
+"POT-Creation-Date: 1999-11-18 11:59-0500\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/popt.c b/popt.c
index 0de68fd..ae608f1 100644
--- a/popt.c
+++ b/popt.c
@@ -67,6 +67,7 @@ poptContext poptGetContext(const char * name, int argc, const char ** argv,
     con->finalArgvAlloced = argc * 2;
     con->finalArgv = calloc( con->finalArgvAlloced, sizeof(*con->finalArgv) );
     con->execAbsolute = 1;
+    con->arg_strip = NULL;
 
     if (getenv("POSIXLY_CORRECT") || getenv("POSIX_ME_HARDER"))
 	con->flags |= POPT_CONTEXT_POSIXMEHARDER;
@@ -123,6 +124,11 @@ void poptResetContext(poptContext con) {
     }
 
     con->finalArgvCount = 0;
+
+    if (con->arg_strip) {
+	PBM_FREE(con->arg_strip);
+	con->arg_strip = NULL;
+    }
 }
 
 /* Only one of longName, shortName may be set at a time */
@@ -378,6 +384,14 @@ static /*@only@*/ const char * expandNextArg(poptContext con, const char * s)
     return t;
 }
 
+static void poptStripArg(poptContext con, int which)
+{
+    if(con->arg_strip == NULL) {
+	con->arg_strip = PBM_ALLOC(con->optionStack[0].argc);
+    }
+    PBM_SET(which, con->arg_strip);
+}
+
 /* returns 'val' element, -1 on last item, POPT_ERROR_* on error */
 int poptGetNextOpt(poptContext con)
 {
@@ -389,6 +403,7 @@ int poptGetNextOpt(poptContext con)
 	poptCallbackType cb = NULL;
 	const void * cbData = NULL;
 	const char * longArg = NULL;
+	int canstrip = 0;
 
 	while (!con->os->nextCharArg && con->os->next == con->os->argc
 		&& con->os > con->optionStack) {
@@ -403,11 +418,13 @@ int poptGetNextOpt(poptContext con)
 	/* Process next long option */
 	if (!con->os->nextCharArg) {
 	    char * localOptString, * optString;
+	    int thisopt;
 
 	    if (con->os->argb && PBM_ISSET(con->os->next, con->os->argb)) {
 		con->os->next++;
 		continue;
 	    }
+	    thisopt=con->os->next;
 	    origOptString = con->os->argv[con->os->next++];
 
 	    if (con->restLeftover || *origOptString != '-') {
@@ -459,8 +476,15 @@ int poptGetNextOpt(poptContext con)
 		    return POPT_ERROR_BADOPT;
 	    }
 
-	    if (!opt)
+	    if (!opt) {
 		con->os->nextCharArg = origOptString + 1;
+	    } else {
+		if(con->os == con->optionStack &&
+		   opt->argInfo & POPT_ARGFLAG_STRIP) {
+		    canstrip = 1;
+		    poptStripArg(con, thisopt);
+		}
+	    }
 	}
 
 	/* Process next short option */
@@ -510,6 +534,14 @@ int poptGetNextOpt(poptContext con)
 		if (con->os->next == con->os->argc)
 		    return POPT_ERROR_NOARG;
 
+		/* make sure this isn't part of a short arg or the
+                   result of an alias expansion */
+		if(con->os == con->optionStack &&
+		   opt->argInfo & POPT_ARGFLAG_STRIP &&
+		   canstrip) {
+		    poptStripArg(con, con->os->next);
+		}
+		
 		con->os->nextArg = expandNextArg(con, con->os->argv[con->os->next++]);
 	    }
 
@@ -624,6 +656,8 @@ void poptFreeContext(poptContext con) {
     if (con->aliases) free(con->aliases);
     if (con->otherHelp) xfree(con->otherHelp);
     if (con->execPath) xfree(con->execPath);
+    if (con->arg_strip) PBM_FREE(con->arg_strip);
+    
     free(con);
 }
 
@@ -713,3 +747,28 @@ int poptStuffArgs(poptContext con, const char ** argv) {
 const char * poptGetInvocationName(poptContext con) {
     return con->os->argv[0];
 }
+
+int poptStrippedArgv(poptContext con, int argc, char **argv)
+{
+    int i,j=1, numargs=argc;
+    
+    for(i=1; i<argc; i++) {
+	if(PBM_ISSET(i, con->arg_strip)) {
+	    numargs--;
+	}
+    }
+    
+    for(i=1; i<argc; i++) {
+	if(PBM_ISSET(i, con->arg_strip)) {
+	    continue;
+	} else {
+	    if(j<numargs) {
+		argv[j++]=argv[i];
+	    } else {
+		argv[j++]='\0';
+	    }
+	}
+    }
+    
+    return(numargs);
+}
diff --git a/popt.h b/popt.h
index 5046fad..e6fa8bd 100644
--- a/popt.h
+++ b/popt.h
@@ -30,6 +30,7 @@ extern "C" {
 #define POPT_ARG_MASK		0x0000FFFF
 #define POPT_ARGFLAG_ONEDASH	0x80000000  /* allow -longoption */
 #define POPT_ARGFLAG_DOC_HIDDEN 0x40000000  /* don't show in help/usage */
+#define POPT_ARGFLAG_STRIP	0x20000000  /* strip this arg from argv (only applies to long args) */
 #define POPT_CBFLAG_PRE		0x80000000  /* call the callback before parse */
 #define POPT_CBFLAG_POST	0x40000000  /* call the callback after parse */
 #define POPT_CBFLAG_INC_DATA	0x20000000  /* use data from the include line,
@@ -119,6 +120,8 @@ void poptPrintHelp(poptContext con, FILE * f, int flags);
 void poptPrintUsage(poptContext con, FILE * f, int flags);
 void poptSetOtherOptionHelp(poptContext con, const char * text);
 /*@observer@*/ const char * poptGetInvocationName(poptContext con);
+/* shuffles argv pointers to remove stripped args, returns new argc */
+int poptStrippedArgv(poptContext con, int argc, char **argv);
 
 #ifdef  __cplusplus
 }
diff --git a/poptint.h b/poptint.h
index 1688095..a1edb97 100644
--- a/poptint.h
+++ b/poptint.h
@@ -59,6 +59,7 @@ struct poptContext_s {
     /*@only@*/ const char * execPath;
     int execAbsolute;
     /*@only@*/ const char * otherHelp;
+    pbm_set * arg_strip;
 };
 
 #define	xfree(_a)	free((void *)_a)
-- 
Gitee


From ce84a7502de0666227f88be661efdab533a2a98c Mon Sep 17 00:00:00 2001
From: Jeff Johnson <n3npq@mac.com>
Date: Wed, 24 Nov 1999 16:55:42 +0000
Subject: [PATCH 217/667] Display message if GNU xgettext is not found.

---
 configure.in | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/configure.in b/configure.in
index 665a277..d0e04ce 100755
--- a/configure.in
+++ b/configure.in
@@ -59,6 +59,12 @@ else
 	AC_MSG_RESULT(no)
 fi
 
+AC_MSG_CHECKING(for GNU xgettext)
+xgettext --version 2>&1 | grep 'GNU gettext' >/dev/null 2>&1 || AC_MSG_ERROR([
+*** GNU gettext is required. The latest version
+*** is always available from ftp://ftp.gnu.org/gnu/gettext/.])
+AC_MSG_RESULT(yes)
+
 AC_CHECK_FUNCS(strerror mtrace)
 dnl AC_CHECK_FUNCS(gettext)
 dnl AC_CHECK_FUNCS(dgettext)
-- 
Gitee


From de892b9a3bfd863b57c39493a4a18441b408c12f Mon Sep 17 00:00:00 2001
From: Jeff Johnson <n3npq@mac.com>
Date: Fri, 26 Nov 1999 22:02:38 +0000
Subject: [PATCH 218/667] Package 3.0.4-0.1

---
 po/ro.po | 2 +-
 po/sk.po | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/po/ro.po b/po/ro.po
index 0f7b805..f2b15ee 100644
--- a/po/ro.po
+++ b/po/ro.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: POPT\n"
-"POT-Creation-Date: 1999-10-26 13:07-0400\n"
+"POT-Creation-Date: 1999-11-18 11:59-0500\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Cristian Gafton <gafton@redhat.com>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/po/sk.po b/po/sk.po
index 1f492ee..537f6b2 100644
--- a/po/sk.po
+++ b/po/sk.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt\n"
-"POT-Creation-Date: 1999-10-26 13:07-0400\n"
+"POT-Creation-Date: 1999-11-18 11:59-0500\n"
 "PO-Revision-Date: 1999-08-04 21:40+0200\n"
 "Last-Translator: Stanislav Meduna <stano@eunet.sk>\n"
 "Language-Team: Slovak <sk-i18n@rak.isternet.sk>\n"
-- 
Gitee


From d2334a799d6e2d9eec166a0d21de7315ff8618cc Mon Sep 17 00:00:00 2001
From: Jeff Johnson <n3npq@mac.com>
Date: Wed, 22 Dec 1999 21:30:29 +0000
Subject: [PATCH 219/667] duplicate popt routine so that librpm.so needs not
 libpopt.so.

---
 po/popt.pot |  2 +-
 poptparse.c | 19 -------------------
 2 files changed, 1 insertion(+), 20 deletions(-)

diff --git a/po/popt.pot b/po/popt.pot
index 6a3a1b4..8c58cf8 100644
--- a/po/popt.pot
+++ b/po/popt.pot
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 1999-11-18 11:59-0500\n"
+"POT-Creation-Date: 1999-12-22 16:20-0500\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/poptparse.c b/poptparse.c
index 65c948b..7c9f06b 100644
--- a/poptparse.c
+++ b/poptparse.c
@@ -3,7 +3,6 @@
    ftp://ftp.redhat.com/pub/code/popt */
 
 #include "system.h"
-#include "poptint.h"
 
 #define POPT_ARGV_ARRAY_GROW_DELTA 5
 
@@ -92,25 +91,7 @@ int poptParseArgvString(const char * s, int * argcPtr, const char *** argvPtr)
 	argc++, buf++;
     }
 
-#if 0
-    {	char * dst = malloc((argc + 1) * sizeof(*argv) + (buf - argv[0]));
-	const char ** argv2 = (void *) dst;
-	int i;
-
-	dst += (argc + 1) * sizeof(*argv);
-	memcpy(argv2, argv, argc * sizeof(*argv));
-	argv2[argc] = NULL;
-	memcpy(dst, argv[0], buf - argv[0]);
-
-	for (i = 0; i < argc; i++)
-	    argv2[i] = dst + (argv[i] - argv[0]);
-
-	*argvPtr = argv2;
-	*argcPtr = argc;
-    }
-#else
     (void) poptDupArgv(argc, argv, argcPtr, argvPtr);
-#endif
 
     free(argv);
 
-- 
Gitee


From ce269923b11e496bd505b9165712104a9382595d Mon Sep 17 00:00:00 2001
From: Jeff Johnson <n3npq@mac.com>
Date: Wed, 22 Dec 1999 21:31:39 +0000
Subject: [PATCH 220/667] Sanity (make dist).

---
 po/ro.po | 2 +-
 po/sk.po | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/po/ro.po b/po/ro.po
index f2b15ee..8f29d97 100644
--- a/po/ro.po
+++ b/po/ro.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: POPT\n"
-"POT-Creation-Date: 1999-11-18 11:59-0500\n"
+"POT-Creation-Date: 1999-12-22 16:20-0500\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Cristian Gafton <gafton@redhat.com>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/po/sk.po b/po/sk.po
index 537f6b2..62a5190 100644
--- a/po/sk.po
+++ b/po/sk.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt\n"
-"POT-Creation-Date: 1999-11-18 11:59-0500\n"
+"POT-Creation-Date: 1999-12-22 16:20-0500\n"
 "PO-Revision-Date: 1999-08-04 21:40+0200\n"
 "Last-Translator: Stanislav Meduna <stano@eunet.sk>\n"
 "Language-Team: Slovak <sk-i18n@rak.isternet.sk>\n"
-- 
Gitee


From 6dfaf94d7b73523b981abf03671b5e1c3ea8447e Mon Sep 17 00:00:00 2001
From: Jeff Johnson <n3npq@mac.com>
Date: Fri, 24 Dec 1999 14:54:35 +0000
Subject: [PATCH 221/667] split python bindings into a separate sub-package of
 rpm.

---
 configure.in | 2 +-
 popt.spec    | 6 +++++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/configure.in b/configure.in
index d0e04ce..400293a 100755
--- a/configure.in
+++ b/configure.in
@@ -11,7 +11,7 @@ AC_PROG_CC
 AC_GCC_TRADITIONAL
 AM_C_PROTOTYPES
 
-AM_DISABLE_SHARED
+dnl AM_DISABLE_SHARED
 AM_PROG_LIBTOOL
 
 AC_PROG_INSTALL
diff --git a/popt.spec b/popt.spec
index 8adb06f..2610652 100644
--- a/popt.spec
+++ b/popt.spec
@@ -1,6 +1,10 @@
+#
+# Note: popt is now an rpm sub-package (including libpopt.so*) so you probably
+# shouldn't need to use this spec file to package popt anymore.
+#
 Summary: A C library for parsing command line parameters.
 Name: popt
-Version: 1.4
+Version: 1.5
 Release: 1
 Copyright: LGPL
 Group: System Environment/Libraries
-- 
Gitee


From 75a3e0e7e668e9a63b933d64fa1297f8b63ef254 Mon Sep 17 00:00:00 2001
From: Jeff Johnson <n3npq@mac.com>
Date: Wed, 19 Jan 2000 20:54:53 +0000
Subject: [PATCH 222/667] Preliminary support for doxygen generated API doco.

---
 .cvsignore   |  20 +--
 Doxyfile.in  | 475 +++++++++++++++++++++++++++++++++++++++++++++++++++
 Makefile.am  |   8 +-
 acconfig.h   |   3 +
 configure.in |   8 +-
 5 files changed, 501 insertions(+), 13 deletions(-)
 create mode 100644 Doxyfile.in

diff --git a/.cvsignore b/.cvsignore
index 1263a59..57687cd 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1,26 +1,26 @@
 .deps
 .depend
-aclocal.m4
+.libs
+Doxyfile
 Makefile
 Makefile.in
-mappcinames
-pci-ids-temp.h
-configure
-config.h.in
-config.h
+aclocal.m4
 config.cache
 config.guess
+config.h
+config.h.in
 config.log
 config.status
 config.sub
+configure
+doxygen
+libtool
+ltconfig
+ltmain.sh
 stamp-h
 stamp-h.in
 test1
 test2
-libtool
-ltconfig
-ltmain.sh
-.libs
 *.la
 *.lo
 popt-*.tar.gz
diff --git a/Doxyfile.in b/Doxyfile.in
new file mode 100644
index 0000000..eb92e86
--- /dev/null
+++ b/Doxyfile.in
@@ -0,0 +1,475 @@
+# Doxyfile 1.0.0
+
+# This file describes the settings to be used by doxygen for a project
+#
+# All text after a hash (#) is considered a comment and will be ignored
+# The format is:
+#       TAG = value [value, ...]
+# Values that contain spaces should be placed between quotes (" ")
+
+#---------------------------------------------------------------------------
+# General configuration options
+#---------------------------------------------------------------------------
+
+# The PROJECT_NAME tag is a single word (or a sequence of word surrounded
+# by quotes) that should identify the project. 
+
+PROJECT_NAME         = @PACKAGE@
+
+# The PROJECT_NUMBER tag can be used to enter a project or revision number.
+# This could be handy for archiving the generated documentation or 
+# if some version control system is used.
+
+PROJECT_NUMBER       = @VERSION@
+
+# The OUTPUT_DIRECTORY tag is used to specify the (relative or absolute) 
+# base path where the generated documentation will be put. 
+# If a relative path is entered, it will be relative to the location 
+# where doxygen was started. If left blank the current directory will be used.
+
+OUTPUT_DIRECTORY     = doxygen
+
+# The OUTPUT_LANGUAGE tag is used to specify the language in which all
+# documentation generated by doxygen is written. Doxygen will use this
+# information to generate all constant output in the proper language.
+# The default language is English, other supported languages are: 
+# Dutch, French, Italian, Czech, Swedish, German and Japanese
+
+OUTPUT_LANGUAGE      = English
+
+# The QUIET tag can be used to turn on/off the messages that are generated
+# by doxygen. Possible values are YES and NO. If left blank NO is used.
+
+QUIET                = NO
+
+# The WARNINGS tag can be used to turn on/off the warning messages that are
+# generated by doxygen. Possible values are YES and NO. If left blank
+# NO is used.
+
+WARNINGS             = YES
+
+# The DISABLE_INDEX tag can be used to turn on/off the condensed index at
+# top of each HTML page. The value NO (the default) enables the index and
+# the value YES disables it.
+
+DISABLE_INDEX        = NO
+
+# If the EXTRACT_ALL tag is set to YES all classes and functions will be
+# included in the documentation, even if no documentation was available.
+
+EXTRACT_ALL          = YES
+
+# If the EXTRACT_PRIVATE tag is set to YES all private members of a class
+# will be included in the documentation.
+
+EXTRACT_PRIVATE      = NO
+
+# If the HIDE_UNDOC_MEMBERS tag is set to YES, Doxygen will hide all
+# undocumented members inside documented classes or files.
+
+HIDE_UNDOC_MEMBERS   = NO
+
+# If the HIDE_UNDOC_CLASSESS tag is set to YES, Doxygen will hide all
+# undocumented classes.
+
+HIDE_UNDOC_CLASSES   = NO
+
+# If the BRIEF_MEMBER_DESC tag is set to YES (the default) Doxygen will
+# include brief member descriptions after the members that are listed in 
+# the file and class documentation (similar to JavaDoc).
+# Set to NO to disable this.
+
+BRIEF_MEMBER_DESC    = YES
+
+# If the REPEAT_BRIEF tag is set to YES (the default) Doxygen will prepend
+# the brief description of a member or function before the detailed description.
+# Note: if both HIDE_UNDOC_MEMBERS and BRIEF_MEMBER_DESC are set to NO, the 
+# brief descriptions will be completely suppressed.
+
+REPEAT_BRIEF         = YES
+
+# If the ALWAYS_DETAILS_SEC and REPEAT_BRIEF tags are both set to YES then
+# Doxygen will generate a detailed section even if there is only a brief
+# description.
+
+ALWAYS_DETAILED_SEC  = NO
+
+# If the FULL_PATH_NAMES tag is set to YES then Doxygen will prepend the full
+# path before files name in the file list and in the header files. If set
+# to NO the shortest path that makes the file name unique will be used.
+
+FULL_PATH_NAMES      = YES
+
+# If the FULL_PATH_NAMES tag is set to YES then the STRIP_FROM_PATH tag
+# can be used to strip a user defined part of the path. Stripping is
+# only done if one of the specified strings matches the left-hand part of
+# the path.
+
+STRIP_FROM_PATH      = @POPT_SOURCE_PATH@/
+
+# The INTERNAL_DOCS tag determines if documentation
+# that is typed after a \internal command is included. If the tag is set 
+# to NO (the default) then the documentation will be excluded.
+# Set it to YES to include the internal documentation.
+
+INTERNAL_DOCS        = NO
+
+# If the CLASS_DIAGRAMS tag is set to YES (the default) Doxygen will
+# generate a class diagram (in Html and LaTeX) for classes with base or
+# super classes. Setting the tag to NO turns the diagrams off.
+
+CLASS_DIAGRAMS       = YES
+
+# If the SOURCE_BROWSER tag is set to YES then a list of source files will
+# be generated. Documented entities will be cross-referenced with these sources.
+
+SOURCE_BROWSER       = YES
+
+# Setting the INLINE_SOURCES tag to YES will include the body
+# of functions and classes directly in the documentation.
+
+INLINE_SOURCES       = NO
+
+# If the CASE_SENSE_NAMES tag is set to NO (the default) then Doxygen
+# will only generate file names in lower case letters. If set to
+# YES upper case letters are also allowed. This is useful if you have
+# classes or files whose names only differ in case and if your file system
+# supports case sensitive file names.
+
+CASE_SENSE_NAMES     = NO
+
+# If the VERBATIM_HEADERS tag is set to YES (the default) then Doxygen
+# will generate a verbatim copy of the header file for each class for
+# which an include is specified. Set to NO to disable this.
+
+VERBATIM_HEADERS     = YES
+
+# If the JAVADOC_AUTOBRIEF tag is set to YES (the default) then Doxygen
+# will interpret the first line (until the first dot) of a JavaDoc-style
+# comment as the brief description. If set to NO, the Javadoc-style will
+# behave just like the Qt-style comments.
+
+JAVADOC_AUTOBRIEF    = YES
+
+# if the INHERIT_DOCS tag is set to YES (the default) then an undocumented
+# member inherits the documentation from any documented member that it
+# reimplements.
+
+INHERIT_DOCS         = YES
+
+# if the INLINE_INFO tag is set to YES (the default) then a tag [inline]
+# is inserted in the documentation for inline members.
+
+INLINE_INFO          = YES
+
+# the TAB_SIZE tag can be used to set the number of spaces in a tab.
+# Doxygen uses this value to replace tabs by spaces in code fragments.
+
+TAB_SIZE             = 8
+
+#---------------------------------------------------------------------------
+# configuration options related to the input files
+#---------------------------------------------------------------------------
+
+# The INPUT tag can be used to specify the files and/or directories that contain 
+# documented source files. You may enter file names like "myfile.cpp" or 
+# directories like "/usr/src/myproject". Separate the files or directories 
+# with spaces.
+
+INPUT                = \
+	./findme.c \
+	./findme.h \
+	./popt.c \
+	./popt.h \
+	./poptconfig.c \
+	./popthelp.c \
+	./poptint.h \
+	./poptparse.c \
+	./system.h
+
+# If the value of the INPUT tag contains directories, you can use the 
+# FILE_PATTERNS tag to specify one or more wildcard pattern (like *.cpp 
+# and *.h) to filter out the source-files in the directories. If left 
+# blank all files are included.
+
+FILE_PATTERNS        = *.c *.h
+
+# The RECURSIVE tag can be used to turn specify whether or not subdirectories
+# should be searched for input files as well. Possible values are YES and NO.
+# If left blank NO is used.
+
+RECURSIVE            = NO
+
+# The EXCLUDE tag can be used to specify files and/or directories that should
+# excluded from the INPUT source files. This way you can easily exclude a 
+# subdirectory from a directory tree whose root is specified with the INPUT tag.
+
+EXCLUDE              =
+
+# If the value of the INPUT tag contains directories, you can use the
+# EXCLUDE_PATTERNS tag to specify one or more wildcard patterns to exclude
+# certain files from those directories.
+
+EXCLUDE_PATTERNS     =
+
+# The EXAMPLE_PATH tag can be used to specify one or more files or 
+# directories that contain example code fragments that are included (see 
+# the \include command).
+
+EXAMPLE_PATH         =
+
+# If the value of the EXAMPLE_PATH tag contains directories, you can use the
+# EXAMPLE_PATTERNS tag to specify one or more wildcard pattern (like *.cpp 
+# and *.h) to filter out the source-files in the directories. If left 
+# blank all files are included.
+
+EXAMPLE_PATTERNS     =
+
+# The IMAGE_PATH tag can be used to specify one or more files or 
+# directories that contain image that are included in the documentation (see 
+# the \image command).
+
+IMAGE_PATH           =
+
+# The INPUT_FILTER tag can be used to specify a program that doxygen should
+# invoke to filter for each input file. Doxygen will invoke the filter program 
+# by executing (via popen()) the command <filter> <input-file>, where <filter>
+# is the value of the INPUT_FILTER tag, and <input-file> is the name of an
+# input file. Doxygen will then use the output that the filter program writes
+# to standard output.
+
+INPUT_FILTER         =
+
+#---------------------------------------------------------------------------
+# configuration options related to the HTML output
+#---------------------------------------------------------------------------
+
+# If the GENERATE_HTML tag is set to YES (the default) Doxygen will
+# generate HTML output
+
+GENERATE_HTML        = YES
+
+# The HTML_OUTPUT tag is used to specify where the HTML docs will be put.
+# If a relative path is entered the value of OUTPUT_DIRECTORY will be
+# put in front of it. If left blank `html' will be used as the default path.
+
+HTML_OUTPUT          =
+
+# The HTML_HEADER tag can be used to specify a personal HTML header for 
+# each generated HTML page. If it is left blank doxygen will generate a 
+# standard header.
+
+HTML_HEADER          =
+
+# The HTML_FOOTER tag can be used to specify a personal HTML footer for 
+# each generated HTML page. If it is left blank doxygen will generate a 
+# standard footer.
+
+HTML_FOOTER          =
+
+# The HTML_STYLESHEET tag can be used to specify a user defined cascading
+# style sheet that is used by each HTML page. It can be used to 
+# fine-tune the look of the HTML output. If the tag is left blank doxygen
+# will generate a default style sheet
+
+HTML_STYLESHEET      =
+
+# If the HTML_ALIGN_MEMBERS tag is set to YES, the members of classes,
+# files or namespaces will be aligned in HTML using tables. If set to
+# NO a bullet list will be used.
+
+HTML_ALIGN_MEMBERS   = YES
+
+# If the GENERATE_HTMLHELP tag is set to YES, additional index files
+# will be generated that can be used as input for tools like the
+# Microsoft HTML help workshop to generate a compressed HTML help file (.chm)
+# of the generated HTML documentation.
+
+GENERATE_HTMLHELP    = NO
+
+# If the ALPHABETICAL_INDEX tag is set to YES, an alphabetical index
+# of all compounds will be generated. Enable this if the project
+# contains a lot of classes, structs, unions or interfaces.
+
+ALPHABETICAL_INDEX   = NO
+
+# If the alphabetical index is enabled (see ALPHABETICAL_INDEX) then
+# the COLS_IN_ALPHA_INDEX tag can be used to specify the number of columns
+# in which this list will be split (can be a number in the range [1..20])
+
+COLS_IN_ALPHA_INDEX  = 5
+
+#---------------------------------------------------------------------------
+# configuration options related to the LaTeX output
+#---------------------------------------------------------------------------
+
+# If the GENERATE_LATEX tag is set to YES (the default) Doxygen will
+# generate Latex output.
+
+GENERATE_LATEX       = NO
+
+# The LATEX_OUTPUT tag is used to specify where the LaTeX docs will be put.
+# If a relative path is entered the value of OUTPUT_DIRECTORY will be
+# put in front of it. If left blank `latex' will be used as the default path.
+
+LATEX_OUTPUT         =
+
+# If the COMPACT_LATEX tag is set to YES Doxygen generates more compact
+# LaTeX documents. This may be useful for small projects and may help to
+# save some trees in general.
+
+COMPACT_LATEX        = NO
+
+# The PAPER_TYPE tag can be used to set the paper type that is used
+# by the printer. Possible values are: a4, a4wide, letter, legal and 
+# executive. If left blank a4wide will be used.
+
+PAPER_TYPE           = a4wide
+
+# The EXTRA_PACKAGES tag can be to specify one or more names of LaTeX
+# packages that should be included in the LaTeX output.
+
+EXTRA_PACKAGES       =
+
+# The LATEX_HEADER tag can be used to specify a personal LaTeX header for 
+# the generated latex document. The header should contain everything until
+# the first chapter. If it is left blank doxygen will generate a 
+# standard header. Notice: only use this tag if you know what you are doing!
+
+LATEX_HEADER         =
+
+# If the PDF_HYPERLINKS tag is set to YES, the LaTeX that is generated
+# is prepared for conversion to pdf (using ps2pdf). The pdf file will
+# contain links (just like the HTML output) instead of page references
+# This makes the output suitable for online browsing using a pdf viewer.
+
+PDF_HYPERLINKS       = NO
+
+#---------------------------------------------------------------------------
+# configuration options related to the man page output
+#---------------------------------------------------------------------------
+
+# If the GENERATE_MAN tag is set to YES (the default) Doxygen will
+# generate man pages
+
+GENERATE_MAN         = YES
+
+# The MAN_OUTPUT tag is used to specify where the man pages will be put.
+# If a relative path is entered the value of OUTPUT_DIRECTORY will be
+# put in front of it. If left blank `man' will be used as the default path.
+
+MAN_OUTPUT           =
+
+# The MAN_EXTENSION tag determines the extension that is added to
+# the generated man pages (default is the subroutine's section .3)
+
+MAN_EXTENSION        = .3
+
+#---------------------------------------------------------------------------
+# Configuration options related to the preprocessor 
+#---------------------------------------------------------------------------
+
+# If the ENABLE_PREPROCESSING tag is set to YES (the default) Doxygen will
+# evaluate all C-preprocessor directives found in the sources and include
+# files.
+
+ENABLE_PREPROCESSING = YES
+
+# If the MACRO_EXPANSION tag is set to YES Doxygen will expand all macro
+# names in the source code. If set to NO (the default) only conditional 
+# compilation will be performed.
+
+MACRO_EXPANSION      = YES
+
+# If the SEARCH_INCLUDES tag is set to YES (the default) the includes files
+# in the INCLUDE_PATH (see below) will be search if a #include is found.
+
+SEARCH_INCLUDES      = YES
+
+# The INCLUDE_PATH tag can be used to specify one or more directories that
+# contain include files that are not input files but should be processed by
+# the preprocessor.
+
+INCLUDE_PATH         =
+
+# The PREDEFINED tag can be used to specify one or more macro names that
+# are defined before the preprocessor is started (similar to the -D option of
+# gcc). The argument of the tag is a list of macros of the form: name
+# or name=definition (no spaces). If the definition and the = are 
+# omitted =1 is assumed.
+
+PREDEFINED           =
+
+# If the EXPAND_ONLY_PREDEF and MACRO_EXPANSION tags are both set to YES
+# then the macro expansion is limited to the macros specified with the
+# PREDEFINED tag.
+
+EXPAND_ONLY_PREDEF   = NO
+
+#---------------------------------------------------------------------------
+# Configuration options related to external references 
+#---------------------------------------------------------------------------
+
+# The TAGFILES tag can be used to specify one or more tagfiles. 
+
+TAGFILES             =
+
+# When a file name is specified after GENERATE_TAGFILE, doxygen will create
+# a tag file that is based on the input files it reads.
+
+GENERATE_TAGFILE     =
+
+# If the ALLEXTERNALS tag is set to YES all external classes will be listed
+# in the class index. If set to NO only the inherited external classes
+# will be listed.
+
+ALLEXTERNALS         = NO
+
+# The PERL_PATH should be the absolute path and name of the perl script
+# interpreter (i.e. the result of `which perl').
+
+PERL_PATH            = /usr/bin/perl
+
+#---------------------------------------------------------------------------
+# Configuration options related to the search engine 
+#---------------------------------------------------------------------------
+
+# The SEARCHENGINE tag specifies whether or not a search engine should be 
+# used. If set to NO the values of all tags below this one will be ignored.
+
+SEARCHENGINE         = NO
+
+# The CGI_NAME tag should be the name of the CGI script that
+# starts the search engine (doxysearch) with the correct parameters.
+# A script with this name will be generated by doxygen.
+
+CGI_NAME             = search.cgi
+
+# The CGI_URL tag should be the absolute URL to the directory where the
+# cgi binaries are located. See the documentation of your http daemon for 
+# details.
+
+CGI_URL              =
+
+# The DOC_URL tag should be the absolute URL to the directory where the
+# documentation is located. If left blank the absolute path to the 
+# documentation, with file:// prepended to it, will be used.
+
+DOC_URL              =
+
+# The DOC_ABSPATH tag should be the absolute path to the directory where the
+# documentation is located. If left blank the directory on the local machine
+# will be used.
+
+DOC_ABSPATH          =
+
+# The BIN_ABSPATH tag must point to the directory where the doxysearch binary
+# is installed.
+
+BIN_ABSPATH          = /usr/local/bin/
+
+# The EXT_DOC_PATHS tag can be used to specify one or more paths to 
+# documentation generated for other projects. This allows doxysearch to search
+# the documentation for these projects as well.
+
+EXT_DOC_PATHS        =
diff --git a/Makefile.am b/Makefile.am
index ce9d5e6..7c0679f 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -2,7 +2,7 @@
 
 AUTOMAKE_OPTIONS = 1.4 foreign
 
-EXTRA_DIST = CHANGES autogen.sh $(man_MANS) popt.spec \
+EXTRA_DIST = autogen.sh CHANGES $(man_MANS) popt.spec \
 	testit.sh po/Makefile.in.in po/POTFILES.in po/*.po po/popt.pot popt.ps
 
 SUBDIRS = intl po
@@ -54,3 +54,9 @@ archive:
 	@rm -f /tmp/$(PACKAGE)-$(VERSION).tar.gz 
 	@echo " "
 	@echo "The final archive is ./$(PACKAGE)-$(VERSION).tar.gz."
+
+.PHONY: doxygen
+doxygen: Doxyfile
+	rm -rf doxygen
+	mkdir -p doxygen
+	doxygen
diff --git a/acconfig.h b/acconfig.h
index 3121e41..7fe3ea9 100644
--- a/acconfig.h
+++ b/acconfig.h
@@ -42,6 +42,9 @@
 /* Define to 1 if you have the stpcpy function.  */
 #undef HAVE_STPCPY
 
+/* Absolute path to popt top_sourcedir. */
+#undef POPT_SOURCE_PATH
+
 ^L
 /* Leave that blank line there!!  Autoheader needs it.
    If you're adding to this file, keep in mind:
diff --git a/configure.in b/configure.in
index 400293a..045094f 100755
--- a/configure.in
+++ b/configure.in
@@ -2,7 +2,7 @@ AC_INIT(popt.h)
 AM_CONFIG_HEADER(config.h)
 AC_PREREQ(2.12)
 AC_CANONICAL_SYSTEM
-AM_INIT_AUTOMAKE(popt, 1.4)
+AM_INIT_AUTOMAKE(popt, 1.5)
 ALL_LINGUAS="ro sk"
 
 AC_ISC_POSIX
@@ -74,5 +74,9 @@ AC_CHECK_FUNC(setreuid, [], [
 
 AM_GNU_GETTEXT
 
-AC_OUTPUT([Makefile intl/Makefile po/Makefile.in],
+POPT_SOURCE_PATH="`pwd`"
+AC_DEFINE_UNQUOTED(POPT_SOURCE_PATH, "$POPT_SOURCE_PATH")
+AC_SUBST(POPT_SOURCE_PATH)
+
+AC_OUTPUT([Doxyfile Makefile intl/Makefile po/Makefile.in],
 	[sed -e "/POTFILES =/r po/POTFILES" po/Makefile.in > po/Makefile])
-- 
Gitee


From f75f4d18fcdc4d722768cabbafe0ebd33da1b9ce Mon Sep 17 00:00:00 2001
From: Elliot Lee <sopwith@redhat.com>
Date: Fri, 11 Feb 2000 04:44:14 +0000
Subject: [PATCH 223/667] Makefile.am: Distribute test-poptrc, don't try to
 wildcard .po files.

testit.sh: Work with srcdir != builddir.
---
 Makefile.am |  4 +++-
 testit.sh   | 13 ++++++++-----
 2 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index 7c0679f..c209223 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -3,7 +3,9 @@
 AUTOMAKE_OPTIONS = 1.4 foreign
 
 EXTRA_DIST = autogen.sh CHANGES $(man_MANS) popt.spec \
-	testit.sh po/Makefile.in.in po/POTFILES.in po/*.po po/popt.pot popt.ps
+	testit.sh test-poptrc \
+	po/Makefile.in.in po/POTFILES.in po/sk.po po/ro.po po/popt.pot \
+	popt.ps
 
 SUBDIRS = intl po
 
diff --git a/testit.sh b/testit.sh
index fdb1541..e9b7198 100755
--- a/testit.sh
+++ b/testit.sh
@@ -1,7 +1,5 @@
 #!/bin/sh
 
-${test1:=./test1}
-
 run() {
     prog=$1; shift
     name=$1; shift
@@ -9,14 +7,19 @@ run() {
 
     echo Running test $name.
 
-    result=`./$prog $*`
+    result=`$builddir/$prog $*`
     if [ "$answer" != "$result" ]; then
-	echo "Test \"$*\" failed with: $result"
+	echo "Test \"$*\" failed with: \"$result\" != \"$answer\" "
 	exit 2
     fi
 }
 
-make -q testcases
+builddir=`pwd`
+cd ${srcdir}
+test1=${builddir}/test1
+echo "Running tests in `pwd`"
+
+#make -q testcases
 
 run test1 "test1 - 1" "arg1: 1 arg2: (none)" --arg1
 run test1 "test1 - 2" "arg1: 0 arg2: foo" --arg2 foo
-- 
Gitee


From 99b086afb7b725d1b54e191e96bafe33f13e2fe9 Mon Sep 17 00:00:00 2001
From: Elliot Lee <sopwith@redhat.com>
Date: Thu, 17 Feb 2000 03:32:20 +0000
Subject: [PATCH 224/667] Include shlib files.

---
 popt.spec | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/popt.spec b/popt.spec
index 2610652..8c3d9db 100644
--- a/popt.spec
+++ b/popt.spec
@@ -41,8 +41,7 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(-,root,root)
-%{_prefix}/lib/libpopt.a
-%{_prefix}/lib/libpopt.la
+%{_prefix}/lib/libpopt.*
 %{_prefix}/include/popt.h
 %{_prefix}/man/man3/popt.3
 %{_prefix}/share/locale/*/LC_MESSAGES/popt.mo
-- 
Gitee


From 7bf1cdec0fe071fc11de89610826f394bf4016c3 Mon Sep 17 00:00:00 2001
From: Jeff Johnson <n3npq@mac.com>
Date: Wed, 23 Feb 2000 17:20:20 +0000
Subject: [PATCH 225/667] ANSIfcation.

---
 test2.c | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/test2.c b/test2.c
index f4e4bae..3181c0f 100644
--- a/test2.c
+++ b/test2.c
@@ -109,16 +109,20 @@ main(int argc, const char ** argv) {
     };
 
     struct poptOption optionsTable[] = {
-	{ NULL, '\0', POPT_ARG_INCLUDE_TABLE,  transactOptionsTable, 0,
+	{ NULL, '\0', POPT_ARG_INCLUDE_TABLE,  NULL, 0,
             "Transact Options (not all will apply)", NULL },
-	{ NULL, '\0', POPT_ARG_INCLUDE_TABLE,  databaseOptionsTable, 0,
+	{ NULL, '\0', POPT_ARG_INCLUDE_TABLE,  NULL, 0,
             "Transact Database Names", NULL },
-	{ NULL, '\0', POPT_ARG_INCLUDE_TABLE,  userOptionsTable, 0,
+	{ NULL, '\0', POPT_ARG_INCLUDE_TABLE,  NULL, 0,
             "User Fields", NULL },
         POPT_AUTOHELP
         { NULL, 0, 0, NULL, 0, NULL, NULL }
     };
 
+    optionsTable[0].arg = transactOptionsTable;
+    optionsTable[1].arg = databaseOptionsTable;
+    optionsTable[2].arg = userOptionsTable;
+
 #if HAVE_MCHECK_H && HAVE_MTRACE
     mtrace();   /* Trace malloc only if MALLOC_TRACE=mtrace-output-file. */
 #endif
-- 
Gitee


From 7e98c582a2b0cb00fd1b68f4e85d2c3e77d3a462 Mon Sep 17 00:00:00 2001
From: Jeff Johnson <n3npq@mac.com>
Date: Sun, 27 Feb 2000 23:40:38 +0000
Subject: [PATCH 226/667] Permit building w/o libbz2.a. In popt, check for
 building within the rpm tree before requiring GNU gettext.

---
 configure.in | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/configure.in b/configure.in
index 045094f..65fb526 100755
--- a/configure.in
+++ b/configure.in
@@ -59,11 +59,14 @@ else
 	AC_MSG_RESULT(no)
 fi
 
-AC_MSG_CHECKING(for GNU xgettext)
-xgettext --version 2>&1 | grep 'GNU gettext' >/dev/null 2>&1 || AC_MSG_ERROR([
-*** GNU gettext is required. The latest version
-*** is always available from ftp://ftp.gnu.org/gnu/gettext/.])
-AC_MSG_RESULT(yes)
+if !test -f ../rpm.c
+then
+  AC_MSG_CHECKING(for GNU xgettext)
+  xgettext --version 2>&1 | grep 'GNU gettext' >/dev/null 2>&1 || AC_MSG_ERROR([
+  *** GNU gettext is required. The latest version
+  *** is always available from ftp://ftp.gnu.org/gnu/gettext/.])
+  AC_MSG_RESULT(yes)
+fi
 
 AC_CHECK_FUNCS(strerror mtrace)
 dnl AC_CHECK_FUNCS(gettext)
-- 
Gitee


From f3d761ff050855260e0cf561c6c3ff0ea23157f8 Mon Sep 17 00:00:00 2001
From: Jeff Johnson <n3npq@mac.com>
Date: Sun, 27 Feb 2000 23:57:14 +0000
Subject: [PATCH 227/667] Typos.

---
 configure.in | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/configure.in b/configure.in
index 65fb526..82ea0fb 100755
--- a/configure.in
+++ b/configure.in
@@ -59,7 +59,7 @@ else
 	AC_MSG_RESULT(no)
 fi
 
-if !test -f ../rpm.c
+if test ! -f ../rpm.c
 then
   AC_MSG_CHECKING(for GNU xgettext)
   xgettext --version 2>&1 | grep 'GNU gettext' >/dev/null 2>&1 || AC_MSG_ERROR([
-- 
Gitee


From d177dd307c4f82688f721e1f58df89a9f867fef9 Mon Sep 17 00:00:00 2001
From: Jeff Johnson <n3npq@mac.com>
Date: Fri, 24 Mar 2000 22:12:59 +0000
Subject: [PATCH 228/667] Bump version to next release.

---
 configure.in | 2 +-
 popt.spec    | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/configure.in b/configure.in
index 82ea0fb..7dcebeb 100755
--- a/configure.in
+++ b/configure.in
@@ -2,7 +2,7 @@ AC_INIT(popt.h)
 AM_CONFIG_HEADER(config.h)
 AC_PREREQ(2.12)
 AC_CANONICAL_SYSTEM
-AM_INIT_AUTOMAKE(popt, 1.5)
+AM_INIT_AUTOMAKE(popt, 1.6)
 ALL_LINGUAS="ro sk"
 
 AC_ISC_POSIX
diff --git a/popt.spec b/popt.spec
index 8c3d9db..ff3a657 100644
--- a/popt.spec
+++ b/popt.spec
@@ -4,8 +4,8 @@
 #
 Summary: A C library for parsing command line parameters.
 Name: popt
-Version: 1.5
-Release: 1
+Version: 1.6
+Release: 0.1
 Copyright: LGPL
 Group: System Environment/Libraries
 Source: ftp://ftp.redhat.com/pub/redhat/code/popt/popt-%{version}.tar.gz
-- 
Gitee


From 35f6591c4351e68f7cde895b0b4f73b9743b7f75 Mon Sep 17 00:00:00 2001
From: Jeff Johnson <n3npq@mac.com>
Date: Sun, 23 Apr 2000 20:37:57 +0000
Subject: [PATCH 229/667] make db indices as lightweight as possible, with
 per-dbi config. db1.c will never be needed, eliminate. API: merge rebuilddb.c
 into rpmdb.c.

---
 po/popt.pot |  2 +-
 popt.3      |  6 ++++
 popt.c      | 89 ++++++++++++++++++++++++++++++++++++++++-------------
 popt.h      | 12 ++++++++
 4 files changed, 87 insertions(+), 22 deletions(-)

diff --git a/po/popt.pot b/po/popt.pot
index 8c58cf8..dc108e1 100644
--- a/po/popt.pot
+++ b/po/popt.pot
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 1999-12-22 16:20-0500\n"
+"POT-Creation-Date: 2000-04-22 14:29-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/popt.3 b/popt.3
index b07b394..29a6309 100644
--- a/popt.3
+++ b/popt.3
@@ -130,6 +130,12 @@ POPT_ARG_LONG	A long integer is expected	long
 POPT_ARG_VAL	Integer value taken from \f(CWval\fR	int
 .TE
 .sp
+For numeric values, if the \fIargInfo\fR value is bitwise or'd with one of
+\fBPOPT_ARGFLAG_OR\fR, \fBPOPT_ARGFLAG_AND\fR, or \fBPOPT_ARGFLAG_XOR\fR,
+the value is saved by performing an OR, AND, or XOR.
+If the \fIargInfo\fR value is bitwise or'd with \fBPOPT_ARGFLAG_NOT\fR,
+the value will be negated before saving.
+.sp
 If the \fIargInfo\fR value is bitwise or'd with \fBPOPT_ARGFLAG_ONEDASH\fR,
 the long argument may be given with a single - instead of two. For example,
 if \fB--longopt\fR is an option with \fBPOPT_ARGFLAG_ONEDASH\fR, is
diff --git a/popt.c b/popt.c
index ae608f1..43de9f6 100644
--- a/popt.c
+++ b/popt.c
@@ -392,6 +392,52 @@ static void poptStripArg(poptContext con, int which)
     PBM_SET(which, con->arg_strip);
 }
 
+static int poptSaveLong(const struct poptOption * opt, long aLong) {
+    if (opt->argInfo & POPT_ARGFLAG_NOT)
+	aLong = ~aLong;
+    switch (opt->argInfo & POPT_ARGFLAG_LOGICALOPS) {
+    case 0:
+	*((long *) opt->arg) = aLong;
+	break;
+    case POPT_ARGFLAG_OR:
+	*((long *) opt->arg) |= aLong;
+	break;
+    case POPT_ARGFLAG_AND:
+	*((long *) opt->arg) &= aLong;
+	break;
+    case POPT_ARGFLAG_XOR:
+	*((long *) opt->arg) ^= aLong;
+	break;
+    default:
+	return POPT_ERROR_BADOPERATION;
+	break;
+    }
+    return 0;
+}
+
+static int poptSaveInt(const struct poptOption * opt, long aLong) {
+    if (opt->argInfo & POPT_ARGFLAG_NOT)
+	aLong = ~aLong;
+    switch (opt->argInfo & POPT_ARGFLAG_LOGICALOPS) {
+    case 0:
+	*((int *) opt->arg) = aLong;
+	break;
+    case POPT_ARGFLAG_OR:
+	*((int *) opt->arg) |= aLong;
+	break;
+    case POPT_ARGFLAG_AND:
+	*((int *) opt->arg) &= aLong;
+	break;
+    case POPT_ARGFLAG_XOR:
+	*((int *) opt->arg) ^= aLong;
+	break;
+    default:
+	return POPT_ERROR_BADOPERATION;
+	break;
+    }
+    return 0;
+}
+
 /* returns 'val' element, -1 on last item, POPT_ERROR_* on error */
 int poptGetNextOpt(poptContext con)
 {
@@ -512,10 +558,13 @@ int poptGetNextOpt(poptContext con)
 	}
 
 	if (opt->arg && (opt->argInfo & POPT_ARG_MASK) == POPT_ARG_NONE) {
-	    *((int *)opt->arg) = 1;
+	    if (poptSaveInt(opt, 1L))
+		return POPT_ERROR_BADOPERATION;
 	} else if ((opt->argInfo & POPT_ARG_MASK) == POPT_ARG_VAL) {
-	    if (opt->arg)
-		*((int *) opt->arg) = opt->val;
+	    if (opt->arg) {
+		if (poptSaveInt(opt, (long)opt->val))
+		    return POPT_ERROR_BADOPERATION;
+	    }
 	} else if ((opt->argInfo & POPT_ARG_MASK) != POPT_ARG_NONE) {
 	    if (con->os->nextArg) {
 		xfree(con->os->nextArg);
@@ -546,33 +595,35 @@ int poptGetNextOpt(poptContext con)
 	    }
 
 	    if (opt->arg) {
-		long aLong;
-		char *end;
-
 		switch (opt->argInfo & POPT_ARG_MASK) {
-		  case POPT_ARG_STRING:
+		case POPT_ARG_STRING:
 		    /* XXX memory leak, hard to plug */
 		    *((const char **) opt->arg) = xstrdup(con->os->nextArg);
 		    break;
 
-		  case POPT_ARG_INT:
-		  case POPT_ARG_LONG:
+		case POPT_ARG_INT:
+		case POPT_ARG_LONG:
+		{   long aLong;
+		    char *end;
+
 		    aLong = strtol(con->os->nextArg, &end, 0);
 		    if (!(end && *end == '\0'))
 			return POPT_ERROR_BADNUMBER;
 
-		    if (aLong == LONG_MIN || aLong == LONG_MAX)
-			return POPT_ERROR_OVERFLOW;
 		    if ((opt->argInfo & POPT_ARG_MASK) == POPT_ARG_LONG) {
-			*((long *) opt->arg) = aLong;
+			if (aLong == LONG_MIN || aLong == LONG_MAX)
+			    return POPT_ERROR_OVERFLOW;
+			if (poptSaveLong(opt, aLong))
+			    return POPT_ERROR_BADOPERATION;
 		    } else {
 			if (aLong > INT_MAX || aLong < INT_MIN)
 			    return POPT_ERROR_OVERFLOW;
-			*((int *) opt->arg) = aLong;
+			if (poptSaveInt(opt, aLong))
+			    return POPT_ERROR_BADOPERATION;
 		    }
-		    break;
+		  } break;
 
-		  default:
+		default:
 		    fprintf(stdout, POPT_("option type (%d) not implemented in popt\n"),
 		      opt->argInfo & POPT_ARG_MASK);
 		    exit(EXIT_FAILURE);
@@ -696,18 +747,14 @@ const char * poptBadOption(poptContext con, int flags) {
     return os->argv[os->next - 1];
 }
 
-#define POPT_ERROR_NOARG	-10
-#define POPT_ERROR_BADOPT	-11
-#define POPT_ERROR_OPTSTOODEEP	-13
-#define POPT_ERROR_BADQUOTE	-15	/* only from poptParseArgString() */
-#define POPT_ERROR_ERRNO	-16	/* only from poptParseArgString() */
-
 const char *const poptStrerror(const int error) {
     switch (error) {
       case POPT_ERROR_NOARG:
 	return POPT_("missing argument");
       case POPT_ERROR_BADOPT:
 	return POPT_("unknown option");
+      case POPT_ERROR_BADOPERATION:
+	return POPT_("mutually exclusive logical operations requested");
       case POPT_ERROR_OPTSTOODEEP:
 	return POPT_("aliases nested too deeply");
       case POPT_ERROR_BADQUOTE:
diff --git a/popt.h b/popt.h
index e6fa8bd..841adcb 100644
--- a/popt.h
+++ b/popt.h
@@ -27,10 +27,21 @@ extern "C" {
 					   included tables; arg points
 					   to the domain string */
 #define POPT_ARG_VAL		7	/* arg should take value val */
+
 #define POPT_ARG_MASK		0x0000FFFF
 #define POPT_ARGFLAG_ONEDASH	0x80000000  /* allow -longoption */
 #define POPT_ARGFLAG_DOC_HIDDEN 0x40000000  /* don't show in help/usage */
 #define POPT_ARGFLAG_STRIP	0x20000000  /* strip this arg from argv (only applies to long args) */
+
+#define	POPT_ARGFLAG_OR		0x08000000 /* arg will be or'ed */
+#define	POPT_ARGFLAG_NOR	0x09000000 /* arg will be nor'ed */
+#define	POPT_ARGFLAG_AND	0x04000000 /* arg will be and'ed */
+#define	POPT_ARGFLAG_NAND	0x05000000 /* arg will be nand'ed */
+#define	POPT_ARGFLAG_XOR	0x02000000 /* arg will be xor'ed */
+#define	POPT_ARGFLAG_NOT	0x01000000 /* arg will be negated */
+#define POPT_ARGFLAG_LOGICALOPS \
+        (POPT_ARGFLAG_OR|POPT_ARGFLAG_AND|POPT_ARGFLAG_XOR)
+
 #define POPT_CBFLAG_PRE		0x80000000  /* call the callback before parse */
 #define POPT_CBFLAG_POST	0x40000000  /* call the callback after parse */
 #define POPT_CBFLAG_INC_DATA	0x20000000  /* use data from the include line,
@@ -43,6 +54,7 @@ extern "C" {
 #define POPT_ERROR_ERRNO	-16	/* only from poptParseArgString() */
 #define POPT_ERROR_BADNUMBER	-17
 #define POPT_ERROR_OVERFLOW	-18
+#define	POPT_ERROR_BADOPERATION	-19
 
 /* poptBadOption() flags */
 #define POPT_BADOPTION_NOALIAS  (1 << 0)  /* don't go into an alias */
-- 
Gitee


From 2b22804837757d00013dcdee4c4ae9a7846cdf8f Mon Sep 17 00:00:00 2001
From: Jeff Johnson <n3npq@mac.com>
Date: Mon, 24 Apr 2000 16:57:40 +0000
Subject: [PATCH 230/667] Add Turkish translation (Fatih Demir
 <kabalak@gmx.net>)

---
 po/tr.po | 359 +++++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 359 insertions(+)
 create mode 100644 po/tr.po

diff --git a/po/tr.po b/po/tr.po
new file mode 100644
index 0000000..30479e2
--- /dev/null
+++ b/po/tr.po
@@ -0,0 +1,359 @@
+# -------------------------------------------------------
+# Copyright (C) 2000 Free Software Foundation, Inc.
+# Fatih Demir <kabalak@gmx.net>, 2000.
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: popt 1.2\n"
+"POT-Creation-Date: 2000-01-06 13:31+0100\n"
+"PO-Revision-Date: 2000-01-06 13:01+0100\n"
+"Last-Translator: Fatih Demir <kabalak@gmx.net>\n"
+"Language-Team: Turkish Gnome Tranlation Team <gnotrap@gmx.net>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=iso-8859-9\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#: ../popthelp.c:262 ../test1.c:98
+msgid "\n"
+msgstr "\n"
+
+#: ../popthelp.c:196 ../popthelp.c:258
+msgid ""
+"\n"
+"       "
+msgstr ""
+"\n"
+"       "
+
+#: ../popthelp.c:137
+#, c-format
+msgid ""
+"\n"
+"%s\n"
+msgstr ""
+"\n"
+"%s\n"
+""
+
+#: ../popthelp.c:84 ../popthelp.c:201
+msgid " "
+msgstr " "
+
+#: ../popthelp.c:69
+#, c-format
+msgid "  %-*s   "
+msgstr "  %-*s   "
+
+#: ../popthelp.c:71
+#, c-format
+msgid "  %s\n"
+msgstr "  %s\n"
+
+#: ../popthelp.c:152 ../popthelp.c:259 ../test1.c:93
+#, c-format
+msgid " %s"
+msgstr " %s"
+
+#: ../popthelp.c:164 ../popthelp.c:166
+#, c-format
+msgid " %s\n"
+msgstr " %s\n"
+
+#: ../popthelp.c:200
+#, c-format
+msgid " [-%s%s%s%s]"
+msgstr " [-%s%s%s%s]"
+
+#: ../popthelp.c:245
+#, c-format
+msgid " [-%s]"
+msgstr " [-%s]"
+
+#: ../test1.c:83
+#, c-format
+msgid " arg3: %d"
+msgstr " arg3: %d"
+
+#: ../test1.c:85
+#, c-format
+msgid " inc: %d"
+msgstr " inc: %d"
+
+#: ../test1.c:91
+msgid " rest:"
+msgstr " rest:"
+
+#: ../test1.c:87
+#, c-format
+msgid " short: %d"
+msgstr " short: %d"
+
+#: ../popthelp.c:83
+msgid ""
+"%%.%ds\n"
+"%%%ds"
+msgstr ""
+"%%.%ds\n"
+"%%%ds"
+
+#: ../popthelp.c:90
+#, c-format
+msgid "%s\n"
+msgstr "%s\n"
+
+#: ../findme.c:46 ../popt.c:201
+#, c-format
+msgid "%s/%s"
+msgstr "%s/%s"
+
+#: ../test1.c:19
+msgid "(none)"
+msgstr "(yok)"
+
+#: ../popthelp.c:200
+msgid "-"
+msgstr "-"
+
+#: ../popt.c:144 ../popt.c:436 ../popthelp.c:59
+#, c-format
+msgid "-%c"
+msgstr "-%c"
+
+#: ../popthelp.c:57
+#, c-format
+msgid "-%c, --%s"
+msgstr "-%c, --%s"
+
+#: ../popt.c:215
+msgid "--"
+msgstr "--"
+
+#: ../popt.c:142 ../popt.c:434 ../popthelp.c:61
+#, c-format
+msgid "--%s"
+msgstr "--%s"
+
+#: ../test1.c:63
+msgid "./test-poptrc"
+msgstr "./test-poptrc"
+
+#: ../poptconfig.c:144
+msgid "/.popt"
+msgstr "/.popt"
+
+#: ../poptconfig.c:137
+msgid "/etc/popt"
+msgstr "/etc/popt"
+
+#: ../popt.c:209
+msgid ";"
+msgstr ";"
+
+#: ../popthelp.c:64 ../popthelp.c:201
+msgid "="
+msgstr "="
+
+#: ../test1.c:49
+msgid "A third argument"
+msgstr "���nc� se�enek"
+
+#: ../test1.c:49
+msgid "ANARG"
+msgstr "BIRSECENEK"
+
+#: ../popthelp.c:41 ../test1.c:48
+msgid "ARG"
+msgstr "SECENEK"
+
+#: ../test1.c:40
+msgid "An included argument"
+msgstr "Dahil olan bir se�enek"
+
+#: ../test1.c:48
+msgid "Another argument"
+msgstr "Bir ba�ka se�enek"
+
+#: ../test1.c:57
+msgid "Callback arguments"
+msgstr "Geri-verim se�enekleri"
+
+#: ../popthelp.c:30
+msgid "Display brief usage message"
+msgstr "K�sa bir kullan�m iletisi g�ster"
+
+#: ../test1.c:45
+msgid ""
+"First argument with a really long description. After all, we have to test "
+"argument help wrapping somehow, right?"
+msgstr ""
+"Ilk uzun anlat�mll� se�enek . Her�ey'den sonra , yard�m"
+"iletisinin k�r�n� g�stermek zorunday�z , de�il mi ?"
+
+#: ../poptconfig.c:141
+msgid "13ME"
+msgstr "13ME"
+
+#: ../test1.c:51
+msgid "Needs a single -"
+msgstr "Tek bir - bekler"
+
+#: ../findme.c:26
+msgid "PATH"
+msgstr "PATH"
+
+#: ../popt.c:83
+msgid "POSIXLY_CORRECT"
+msgstr "POSIXLY_CORRECT"
+
+#: ../popt.c:83
+msgid "POSIX_ME_HARDER"
+msgstr "POSIX_ME_HARDER"
+
+#: ../popthelp.c:29
+msgid "Show this help message"
+msgstr "Bu yard�m iletisini g�sterir"
+
+#: ../test1.c:30 ../test1.c:35
+msgid "Test argument callbacks"
+msgstr "Deneme se�eneklerinin geri-verimleri"
+
+#: ../test1.c:53
+msgid "This shouldn't show up"
+msgstr "Bu ileti sana ��kmamas� laz�m"
+
+#: ../test1.c:55
+msgid "UNUSED"
+msgstr "UNUSED"
+
+#: ../test1.c:36 ../test1.c:55
+msgid "Unused option for help testing"
+msgstr "Yard�m� denemek i�in kullan�lan bir avare se�enek"
+
+#: ../popthelp.c:148
+msgid "Usage:"
+msgstr "Kullan�m :"
+
+#: ../popthelp.c:166
+msgid "[OPTION...]"
+msgstr "[SECENEK ... ]"
+
+#: ../poptconfig.c:53
+msgid "alias"
+msgstr "nam-� di�er"
+
+#: ../popt.c:540
+msgid "aliases nested too deeply"
+msgstr "nam-� di�er i�ini de abartt�n , ha"
+
+#: ../test1.c:44
+msgid "arg for cb2"
+msgstr "cb1 i�in se�enekler"
+
+#: ../test1.c:45
+msgid "arg1"
+msgstr "se�enek1"
+
+#: ../test1.c:80
+#, c-format
+msgid "arg1: %d arg2: %s"
+msgstr "se�enek1: %d se�enek2: %s"
+
+#: ../test1.c:48
+msgid "arg2"
+msgstr "se�enek2"
+
+#: ../test1.c:49
+msgid "arg3"
+msgstr "se�enek3"
+
+#: ../test1.c:13
+#, c-format
+msgid "callback: %c %s %s "
+msgstr "geri-verim: %c %s %s"
+
+#: ../test1.c:35
+msgid "cb"
+msgstr "cb"
+
+#: ../test1.c:30
+msgid "cb2"
+msgstr "cb2"
+
+#: ../popt.c:542
+msgid "error in paramter quoting"
+msgstr "veri veriminde hata olu�tu"
+
+#: ../poptconfig.c:57
+msgid "exec"
+msgstr "exec"
+
+#: ../popthelp.c:29
+msgid "help"
+msgstr "yard�m"
+
+#: ../test1.c:52
+msgid "hidden"
+msgstr "gizli"
+
+#: ../test1.c:40
+msgid "inc"
+msgstr "inc"
+
+#: ../popt.c:544
+msgid "invalid numeric value"
+msgstr "ge�ersiz say�sal i�lem"
+
+#: ../test1.c:36
+msgid "long"
+msgstr "long"
+
+#: ../popt.c:536
+msgid "missing argument"
+msgstr "eksik se�enek arg�man�"
+
+#: ../popt.c:546
+msgid "number too large or too small"
+msgstr "say� �ok fazla uzun/k�sa"
+
+#: ../popt.c:412
+#, c-format
+msgid "option type (%d) not implemented in popt\n"
+msgstr "(%d) se�enek t�r� popt'de tan�nm�yor\n"
+
+#: ../test1.c:34
+msgid "sampledata"
+msgstr "denemebilgisi"
+
+#: ../test1.c:50
+msgid "shortoption"
+msgstr "k�sase�enek"
+
+#: ../test1.c:62
+msgid "test1"
+msgstr "deneme_no1"
+
+#: ../test1.c:66
+#, c-format
+msgid "test1: bad argument %s: %s\n"
+msgstr "deneme_no1:  k�t� se�enek %s: %s\n"
+
+#: ../popt.c:34
+msgid "unknown errno"
+msgstr "tan�nmayan hata numaras�"
+
+#: ../popt.c:550
+msgid "unknown error"
+msgstr "tan�nmayan hata"
+
+#: ../popt.c:538
+msgid "unknown option"
+msgstr "tan�nmayan se�enek"
+
+#: ../test1.c:54
+msgid "unused"
+msgstr "kullan�lm�yor"
+
+#: ../popthelp.c:30
+msgid "usage"
+msgstr "kullan�m"
-- 
Gitee


From 9c6e3ba0db079009e40159a22382a9601d000b77 Mon Sep 17 00:00:00 2001
From: Jeff Johnson <n3npq@mac.com>
Date: Tue, 25 Apr 2000 19:57:28 +0000
Subject: [PATCH 231/667] Sanity (rebuild to check autoconf configuration in
 dist-7.0).

---
 configure.in | 2 +-
 po/ro.po     | 2 +-
 po/sk.po     | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/configure.in b/configure.in
index 7dcebeb..922774d 100755
--- a/configure.in
+++ b/configure.in
@@ -3,7 +3,7 @@ AM_CONFIG_HEADER(config.h)
 AC_PREREQ(2.12)
 AC_CANONICAL_SYSTEM
 AM_INIT_AUTOMAKE(popt, 1.6)
-ALL_LINGUAS="ro sk"
+ALL_LINGUAS="ro sk tr"
 
 AC_ISC_POSIX
 
diff --git a/po/ro.po b/po/ro.po
index 8f29d97..a9dd784 100644
--- a/po/ro.po
+++ b/po/ro.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: POPT\n"
-"POT-Creation-Date: 1999-12-22 16:20-0500\n"
+"POT-Creation-Date: 2000-04-22 14:29-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Cristian Gafton <gafton@redhat.com>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/po/sk.po b/po/sk.po
index 62a5190..fa860e3 100644
--- a/po/sk.po
+++ b/po/sk.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt\n"
-"POT-Creation-Date: 1999-12-22 16:20-0500\n"
+"POT-Creation-Date: 2000-04-22 14:29-0400\n"
 "PO-Revision-Date: 1999-08-04 21:40+0200\n"
 "Last-Translator: Stanislav Meduna <stano@eunet.sk>\n"
 "Language-Team: Slovak <sk-i18n@rak.isternet.sk>\n"
-- 
Gitee


From ee9caede8e330c0d8c6a1540d8d5cdb7a0c109a1 Mon Sep 17 00:00:00 2001
From: Jeff Johnson <n3npq@mac.com>
Date: Tue, 25 Apr 2000 20:14:21 +0000
Subject: [PATCH 232/667] Fix popt/po/tr.po addition.

---
 Makefile.am | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Makefile.am b/Makefile.am
index c209223..a5fafa9 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -4,7 +4,7 @@ AUTOMAKE_OPTIONS = 1.4 foreign
 
 EXTRA_DIST = autogen.sh CHANGES $(man_MANS) popt.spec \
 	testit.sh test-poptrc \
-	po/Makefile.in.in po/POTFILES.in po/sk.po po/ro.po po/popt.pot \
+	po/*.in po/*.po po/popt.pot \
 	popt.ps
 
 SUBDIRS = intl po
-- 
Gitee


From 1db5afab23d4a4158a796420966263b0004b30bd Mon Sep 17 00:00:00 2001
From: Jeff Johnson <n3npq@mac.com>
Date: Mon, 1 May 2000 17:50:37 +0000
Subject: [PATCH 233/667] Rename db0.c to db1.c, resurrect db2.c (from db3.c).
 Add ia64 and sparc64 changes. rpm.spec: add per-platform sub-directories. Add
 rpmdbSync to API. installplatform: pass LIB=lib64 on sparc64. db3.c: Add
 nodbsync, lockdbfd, debug dbi configuration. db3.c: don't check dbi_mode when
 deciding on DB_WRITECURSOR.

---
 po/tr.po | 551 +++++++++++++++++++++++--------------------------------
 1 file changed, 228 insertions(+), 323 deletions(-)

diff --git a/po/tr.po b/po/tr.po
index 30479e2..3eb8394 100644
--- a/po/tr.po
+++ b/po/tr.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.2\n"
-"POT-Creation-Date: 2000-01-06 13:31+0100\n"
+"POT-Creation-Date: 2000-04-22 14:29-0400\n"
 "PO-Revision-Date: 2000-01-06 13:01+0100\n"
 "Last-Translator: Fatih Demir <kabalak@gmx.net>\n"
 "Language-Team: Turkish Gnome Tranlation Team <gnotrap@gmx.net>\n"
@@ -14,346 +14,251 @@ msgstr ""
 "Content-Type: text/plain; charset=iso-8859-9\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../popthelp.c:262 ../test1.c:98
-msgid "\n"
-msgstr "\n"
-
-#: ../popthelp.c:196 ../popthelp.c:258
-msgid ""
-"\n"
-"       "
-msgstr ""
-"\n"
-"       "
+#: popthelp.c:23
+msgid "Show this help message"
+msgstr "Bu yard�m iletisini g�sterir"
 
-#: ../popthelp.c:137
-#, c-format
-msgid ""
-"\n"
-"%s\n"
-msgstr ""
-"\n"
-"%s\n"
-""
-
-#: ../popthelp.c:84 ../popthelp.c:201
-msgid " "
-msgstr " "
-
-#: ../popthelp.c:69
-#, c-format
-msgid "  %-*s   "
-msgstr "  %-*s   "
-
-#: ../popthelp.c:71
-#, c-format
-msgid "  %s\n"
-msgstr "  %s\n"
-
-#: ../popthelp.c:152 ../popthelp.c:259 ../test1.c:93
-#, c-format
-msgid " %s"
-msgstr " %s"
-
-#: ../popthelp.c:164 ../popthelp.c:166
-#, c-format
-msgid " %s\n"
-msgstr " %s\n"
-
-#: ../popthelp.c:200
-#, c-format
-msgid " [-%s%s%s%s]"
-msgstr " [-%s%s%s%s]"
-
-#: ../popthelp.c:245
-#, c-format
-msgid " [-%s]"
-msgstr " [-%s]"
-
-#: ../test1.c:83
-#, c-format
-msgid " arg3: %d"
-msgstr " arg3: %d"
-
-#: ../test1.c:85
-#, c-format
-msgid " inc: %d"
-msgstr " inc: %d"
-
-#: ../test1.c:91
-msgid " rest:"
-msgstr " rest:"
-
-#: ../test1.c:87
-#, c-format
-msgid " short: %d"
-msgstr " short: %d"
-
-#: ../popthelp.c:83
-msgid ""
-"%%.%ds\n"
-"%%%ds"
-msgstr ""
-"%%.%ds\n"
-"%%%ds"
-
-#: ../popthelp.c:90
-#, c-format
-msgid "%s\n"
-msgstr "%s\n"
-
-#: ../findme.c:46 ../popt.c:201
-#, c-format
-msgid "%s/%s"
-msgstr "%s/%s"
-
-#: ../test1.c:19
-msgid "(none)"
-msgstr "(yok)"
-
-#: ../popthelp.c:200
-msgid "-"
-msgstr "-"
-
-#: ../popt.c:144 ../popt.c:436 ../popthelp.c:59
-#, c-format
-msgid "-%c"
-msgstr "-%c"
-
-#: ../popthelp.c:57
-#, c-format
-msgid "-%c, --%s"
-msgstr "-%c, --%s"
-
-#: ../popt.c:215
-msgid "--"
-msgstr "--"
-
-#: ../popt.c:142 ../popt.c:434 ../popthelp.c:61
-#, c-format
-msgid "--%s"
-msgstr "--%s"
-
-#: ../test1.c:63
-msgid "./test-poptrc"
-msgstr "./test-poptrc"
-
-#: ../poptconfig.c:144
-msgid "/.popt"
-msgstr "/.popt"
-
-#: ../poptconfig.c:137
-msgid "/etc/popt"
-msgstr "/etc/popt"
-
-#: ../popt.c:209
-msgid ";"
-msgstr ";"
-
-#: ../popthelp.c:64 ../popthelp.c:201
-msgid "="
-msgstr "="
-
-#: ../test1.c:49
-msgid "A third argument"
-msgstr "���nc� se�enek"
-
-#: ../test1.c:49
-msgid "ANARG"
-msgstr "BIRSECENEK"
-
-#: ../popthelp.c:41 ../test1.c:48
-msgid "ARG"
-msgstr "SECENEK"
-
-#: ../test1.c:40
-msgid "An included argument"
-msgstr "Dahil olan bir se�enek"
-
-#: ../test1.c:48
-msgid "Another argument"
-msgstr "Bir ba�ka se�enek"
-
-#: ../test1.c:57
-msgid "Callback arguments"
-msgstr "Geri-verim se�enekleri"
-
-#: ../popthelp.c:30
+#: popthelp.c:24
 msgid "Display brief usage message"
 msgstr "K�sa bir kullan�m iletisi g�ster"
 
-#: ../test1.c:45
-msgid ""
-"First argument with a really long description. After all, we have to test "
-"argument help wrapping somehow, right?"
-msgstr ""
-"Ilk uzun anlat�mll� se�enek . Her�ey'den sonra , yard�m"
-"iletisinin k�r�n� g�stermek zorunday�z , de�il mi ?"
+#~ msgid "\n"
+#~ msgstr "\n"
 
-#: ../poptconfig.c:141
-msgid "13ME"
-msgstr "13ME"
+#~ msgid ""
+#~ "\n"
+#~ "       "
+#~ msgstr ""
+#~ "\n"
+#~ "       "
 
-#: ../test1.c:51
-msgid "Needs a single -"
-msgstr "Tek bir - bekler"
+#~ msgid ""
+#~ "\n"
+#~ "%s\n"
+#~ msgstr ""
+#~ "\n"
+#~ "%s\n"
 
-#: ../findme.c:26
-msgid "PATH"
-msgstr "PATH"
+#~ msgid " "
+#~ msgstr " "
 
-#: ../popt.c:83
-msgid "POSIXLY_CORRECT"
-msgstr "POSIXLY_CORRECT"
+#~ msgid "  %-*s   "
+#~ msgstr "  %-*s   "
 
-#: ../popt.c:83
-msgid "POSIX_ME_HARDER"
-msgstr "POSIX_ME_HARDER"
+#~ msgid "  %s\n"
+#~ msgstr "  %s\n"
 
-#: ../popthelp.c:29
-msgid "Show this help message"
-msgstr "Bu yard�m iletisini g�sterir"
+#~ msgid " %s"
+#~ msgstr " %s"
+
+#~ msgid " %s\n"
+#~ msgstr " %s\n"
+
+#~ msgid " [-%s%s%s%s]"
+#~ msgstr " [-%s%s%s%s]"
+
+#~ msgid " [-%s]"
+#~ msgstr " [-%s]"
+
+#~ msgid " arg3: %d"
+#~ msgstr " arg3: %d"
+
+#~ msgid " inc: %d"
+#~ msgstr " inc: %d"
+
+#~ msgid " rest:"
+#~ msgstr " rest:"
+
+#~ msgid " short: %d"
+#~ msgstr " short: %d"
+
+#~ msgid ""
+#~ "%%.%ds\n"
+#~ "%%%ds"
+#~ msgstr ""
+#~ "%%.%ds\n"
+#~ "%%%ds"
+
+#~ msgid "%s\n"
+#~ msgstr "%s\n"
+
+#~ msgid "%s/%s"
+#~ msgstr "%s/%s"
+
+#~ msgid "(none)"
+#~ msgstr "(yok)"
+
+#~ msgid "-"
+#~ msgstr "-"
+
+#~ msgid "-%c"
+#~ msgstr "-%c"
+
+#~ msgid "-%c, --%s"
+#~ msgstr "-%c, --%s"
+
+#~ msgid "--"
+#~ msgstr "--"
+
+#~ msgid "--%s"
+#~ msgstr "--%s"
+
+#~ msgid "./test-poptrc"
+#~ msgstr "./test-poptrc"
+
+#~ msgid "/.popt"
+#~ msgstr "/.popt"
+
+#~ msgid "/etc/popt"
+#~ msgstr "/etc/popt"
+
+#~ msgid ";"
+#~ msgstr ";"
+
+#~ msgid "="
+#~ msgstr "="
+
+#~ msgid "A third argument"
+#~ msgstr "���nc� se�enek"
+
+#~ msgid "ANARG"
+#~ msgstr "BIRSECENEK"
+
+#~ msgid "ARG"
+#~ msgstr "SECENEK"
+
+#~ msgid "An included argument"
+#~ msgstr "Dahil olan bir se�enek"
+
+#~ msgid "Another argument"
+#~ msgstr "Bir ba�ka se�enek"
+
+#~ msgid "Callback arguments"
+#~ msgstr "Geri-verim se�enekleri"
+
+#~ msgid ""
+#~ "First argument with a really long description. After all, we have to test "
+#~ "argument help wrapping somehow, right?"
+#~ msgstr ""
+#~ "Ilk uzun anlat�mll� se�enek . Her�ey'den sonra , yard�miletisinin k�r�n� "
+#~ "g�stermek zorunday�z , de�il mi ?"
+
+#~ msgid "13ME"
+#~ msgstr "13ME"
+
+#~ msgid "Needs a single -"
+#~ msgstr "Tek bir - bekler"
+
+#~ msgid "PATH"
+#~ msgstr "PATH"
+
+#~ msgid "POSIXLY_CORRECT"
+#~ msgstr "POSIXLY_CORRECT"
+
+#~ msgid "POSIX_ME_HARDER"
+#~ msgstr "POSIX_ME_HARDER"
+
+#~ msgid "Test argument callbacks"
+#~ msgstr "Deneme se�eneklerinin geri-verimleri"
+
+#~ msgid "This shouldn't show up"
+#~ msgstr "Bu ileti sana ��kmamas� laz�m"
+
+#~ msgid "UNUSED"
+#~ msgstr "UNUSED"
+
+#~ msgid "Unused option for help testing"
+#~ msgstr "Yard�m� denemek i�in kullan�lan bir avare se�enek"
+
+#~ msgid "Usage:"
+#~ msgstr "Kullan�m :"
+
+#~ msgid "[OPTION...]"
+#~ msgstr "[SECENEK ... ]"
+
+#~ msgid "alias"
+#~ msgstr "nam-� di�er"
+
+#~ msgid "aliases nested too deeply"
+#~ msgstr "nam-� di�er i�ini de abartt�n , ha"
+
+#~ msgid "arg for cb2"
+#~ msgstr "cb1 i�in se�enekler"
+
+#~ msgid "arg1"
+#~ msgstr "se�enek1"
+
+#~ msgid "arg1: %d arg2: %s"
+#~ msgstr "se�enek1: %d se�enek2: %s"
+
+#~ msgid "arg2"
+#~ msgstr "se�enek2"
+
+#~ msgid "arg3"
+#~ msgstr "se�enek3"
+
+#~ msgid "callback: %c %s %s "
+#~ msgstr "geri-verim: %c %s %s"
+
+#~ msgid "cb"
+#~ msgstr "cb"
+
+#~ msgid "cb2"
+#~ msgstr "cb2"
+
+#~ msgid "error in paramter quoting"
+#~ msgstr "veri veriminde hata olu�tu"
+
+#~ msgid "exec"
+#~ msgstr "exec"
+
+#~ msgid "help"
+#~ msgstr "yard�m"
+
+#~ msgid "hidden"
+#~ msgstr "gizli"
+
+#~ msgid "inc"
+#~ msgstr "inc"
+
+#~ msgid "invalid numeric value"
+#~ msgstr "ge�ersiz say�sal i�lem"
+
+#~ msgid "long"
+#~ msgstr "long"
+
+#~ msgid "missing argument"
+#~ msgstr "eksik se�enek arg�man�"
 
-#: ../test1.c:30 ../test1.c:35
-msgid "Test argument callbacks"
-msgstr "Deneme se�eneklerinin geri-verimleri"
+#~ msgid "number too large or too small"
+#~ msgstr "say� �ok fazla uzun/k�sa"
 
-#: ../test1.c:53
-msgid "This shouldn't show up"
-msgstr "Bu ileti sana ��kmamas� laz�m"
+#~ msgid "option type (%d) not implemented in popt\n"
+#~ msgstr "(%d) se�enek t�r� popt'de tan�nm�yor\n"
 
-#: ../test1.c:55
-msgid "UNUSED"
-msgstr "UNUSED"
+#~ msgid "sampledata"
+#~ msgstr "denemebilgisi"
 
-#: ../test1.c:36 ../test1.c:55
-msgid "Unused option for help testing"
-msgstr "Yard�m� denemek i�in kullan�lan bir avare se�enek"
+#~ msgid "shortoption"
+#~ msgstr "k�sase�enek"
 
-#: ../popthelp.c:148
-msgid "Usage:"
-msgstr "Kullan�m :"
+#~ msgid "test1"
+#~ msgstr "deneme_no1"
 
-#: ../popthelp.c:166
-msgid "[OPTION...]"
-msgstr "[SECENEK ... ]"
+#~ msgid "test1: bad argument %s: %s\n"
+#~ msgstr "deneme_no1:  k�t� se�enek %s: %s\n"
 
-#: ../poptconfig.c:53
-msgid "alias"
-msgstr "nam-� di�er"
+#~ msgid "unknown errno"
+#~ msgstr "tan�nmayan hata numaras�"
 
-#: ../popt.c:540
-msgid "aliases nested too deeply"
-msgstr "nam-� di�er i�ini de abartt�n , ha"
+#~ msgid "unknown error"
+#~ msgstr "tan�nmayan hata"
 
-#: ../test1.c:44
-msgid "arg for cb2"
-msgstr "cb1 i�in se�enekler"
+#~ msgid "unknown option"
+#~ msgstr "tan�nmayan se�enek"
 
-#: ../test1.c:45
-msgid "arg1"
-msgstr "se�enek1"
+#~ msgid "unused"
+#~ msgstr "kullan�lm�yor"
 
-#: ../test1.c:80
-#, c-format
-msgid "arg1: %d arg2: %s"
-msgstr "se�enek1: %d se�enek2: %s"
-
-#: ../test1.c:48
-msgid "arg2"
-msgstr "se�enek2"
-
-#: ../test1.c:49
-msgid "arg3"
-msgstr "se�enek3"
-
-#: ../test1.c:13
-#, c-format
-msgid "callback: %c %s %s "
-msgstr "geri-verim: %c %s %s"
-
-#: ../test1.c:35
-msgid "cb"
-msgstr "cb"
-
-#: ../test1.c:30
-msgid "cb2"
-msgstr "cb2"
-
-#: ../popt.c:542
-msgid "error in paramter quoting"
-msgstr "veri veriminde hata olu�tu"
-
-#: ../poptconfig.c:57
-msgid "exec"
-msgstr "exec"
-
-#: ../popthelp.c:29
-msgid "help"
-msgstr "yard�m"
-
-#: ../test1.c:52
-msgid "hidden"
-msgstr "gizli"
-
-#: ../test1.c:40
-msgid "inc"
-msgstr "inc"
-
-#: ../popt.c:544
-msgid "invalid numeric value"
-msgstr "ge�ersiz say�sal i�lem"
-
-#: ../test1.c:36
-msgid "long"
-msgstr "long"
-
-#: ../popt.c:536
-msgid "missing argument"
-msgstr "eksik se�enek arg�man�"
-
-#: ../popt.c:546
-msgid "number too large or too small"
-msgstr "say� �ok fazla uzun/k�sa"
-
-#: ../popt.c:412
-#, c-format
-msgid "option type (%d) not implemented in popt\n"
-msgstr "(%d) se�enek t�r� popt'de tan�nm�yor\n"
-
-#: ../test1.c:34
-msgid "sampledata"
-msgstr "denemebilgisi"
-
-#: ../test1.c:50
-msgid "shortoption"
-msgstr "k�sase�enek"
-
-#: ../test1.c:62
-msgid "test1"
-msgstr "deneme_no1"
-
-#: ../test1.c:66
-#, c-format
-msgid "test1: bad argument %s: %s\n"
-msgstr "deneme_no1:  k�t� se�enek %s: %s\n"
-
-#: ../popt.c:34
-msgid "unknown errno"
-msgstr "tan�nmayan hata numaras�"
-
-#: ../popt.c:550
-msgid "unknown error"
-msgstr "tan�nmayan hata"
-
-#: ../popt.c:538
-msgid "unknown option"
-msgstr "tan�nmayan se�enek"
-
-#: ../test1.c:54
-msgid "unused"
-msgstr "kullan�lm�yor"
-
-#: ../popthelp.c:30
-msgid "usage"
-msgstr "kullan�m"
+#~ msgid "usage"
+#~ msgstr "kullan�m"
-- 
Gitee


From bdff5d69dd271aee37115cfd3dcd1e1e6d54b047 Mon Sep 17 00:00:00 2001
From: Jeff Johnson <n3npq@mac.com>
Date: Wed, 24 May 2000 17:53:39 +0000
Subject: [PATCH 234/667] - change popt exec alias in oreder to exec rpm
 children. - split rpm into 5 pieces along major mode fault lines with popt
 glue.

---
 findme.c    |   5 +--
 po/popt.pot |   2 +-
 po/ro.po    |   2 +-
 po/sk.po    |   2 +-
 po/tr.po    |   2 +-
 popt.c      | 104 +++++++++++++++++++++++++++++++++++-----------------
 testit.sh   |  11 +++---
 7 files changed, 82 insertions(+), 46 deletions(-)

diff --git a/findme.c b/findme.c
index 6d1b41c..8518be1 100644
--- a/findme.c
+++ b/findme.c
@@ -11,15 +11,14 @@ const char * findProgramPath(const char * argv0) {
     char * start, * chptr;
     char * buf;
 
-    /* If there is a / in the argv[0], it has to be an absolute
-       path */
+    /* If there is a / in the argv[0], it has to be an absolute path */
     if (strchr(argv0, '/'))
 	return xstrdup(argv0);
 
     if (!path) return NULL;
 
     start = pathbuf = alloca(strlen(path) + 1);
-    buf = malloc(strlen(path) + strlen(argv0) + 2);
+    buf = malloc(strlen(path) + strlen(argv0) + sizeof("/"));
     strcpy(pathbuf, path);
 
     chptr = NULL;
diff --git a/po/popt.pot b/po/popt.pot
index dc108e1..49ad01e 100644
--- a/po/popt.pot
+++ b/po/popt.pot
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2000-04-22 14:29-0400\n"
+"POT-Creation-Date: 2000-05-24 13:46-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/po/ro.po b/po/ro.po
index a9dd784..3cbf575 100644
--- a/po/ro.po
+++ b/po/ro.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: POPT\n"
-"POT-Creation-Date: 2000-04-22 14:29-0400\n"
+"POT-Creation-Date: 2000-05-24 13:46-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Cristian Gafton <gafton@redhat.com>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/po/sk.po b/po/sk.po
index fa860e3..37466a2 100644
--- a/po/sk.po
+++ b/po/sk.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt\n"
-"POT-Creation-Date: 2000-04-22 14:29-0400\n"
+"POT-Creation-Date: 2000-05-24 13:46-0400\n"
 "PO-Revision-Date: 1999-08-04 21:40+0200\n"
 "Last-Translator: Stanislav Meduna <stano@eunet.sk>\n"
 "Language-Team: Slovak <sk-i18n@rak.isternet.sk>\n"
diff --git a/po/tr.po b/po/tr.po
index 3eb8394..7e5c3db 100644
--- a/po/tr.po
+++ b/po/tr.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.2\n"
-"POT-Creation-Date: 2000-04-22 14:29-0400\n"
+"POT-Creation-Date: 2000-05-24 13:46-0400\n"
 "PO-Revision-Date: 2000-01-06 13:01+0100\n"
 "Last-Translator: Fatih Demir <kabalak@gmx.net>\n"
 "Language-Team: Turkish Gnome Tranlation Team <gnotrap@gmx.net>\n"
diff --git a/popt.c b/popt.c
index 43de9f6..0706ccc 100644
--- a/popt.c
+++ b/popt.c
@@ -2,6 +2,8 @@
    file accompanying popt source distributions, available from
    ftp://ftp.redhat.com/pub/code/popt */
 
+#undef	MYDEBUG
+
 #include "system.h"
 #include "findme.h"
 #include "poptint.h"
@@ -218,37 +220,43 @@ static int handleAlias(poptContext con, const char * longName, char shortName,
 
 static void execCommand(poptContext con) {
     const char ** argv;
-    int pos = 0;
-    const char * script = con->doExec->script;
+    int argc = 0;
+    const char ** sargv;
+    int sargc = 0;
 
-    argv = malloc(sizeof(*argv) *
-			(6 + con->numLeftovers + con->finalArgvCount));
+    poptParseArgvString(con->doExec->script, &sargc, &sargv);
 
-    if (!con->execAbsolute && strchr(script, '/')) return;
+    if (sargv == NULL || sargc < 1 ||
+	(!con->execAbsolute && strchr(sargv[0], '/')))
+	    return;
 
-    if (!strchr(script, '/') && con->execPath) {
-	char *s = alloca(strlen(con->execPath) + strlen(script) + 2);
-	sprintf(s, "%s/%s", con->execPath, script);
-	argv[pos] = s;
+    argv = malloc(sizeof(*argv) *
+			(6 + sargc + con->numLeftovers + con->finalArgvCount));
+
+    if (!strchr(sargv[0], '/') && con->execPath) {
+	char *s = alloca(strlen(con->execPath) + strlen(sargv[0]) + sizeof("/"));
+	sprintf(s, "%s/%s", con->execPath, sargv[0]);
+	argv[argc] = s;
     } else {
-	argv[pos] = script;
+	argv[argc] = findProgramPath(sargv[0]);
     }
-    pos++;
+    if (argv[argc++] == NULL) return;
 
-    argv[pos] = findProgramPath(con->os->argv[0]);
-    if (argv[pos]) pos++;
-    argv[pos++] = ";";
+    if (sargc > 1) {
+	memcpy(argv + argc, sargv + 1, sizeof(*argv) * (sargc - 1));
+	argc += (sargc - 1);
+    }
 
-    memcpy(argv + pos, con->finalArgv, sizeof(*argv) * con->finalArgvCount);
-    pos += con->finalArgvCount;
+    memcpy(argv + argc, con->finalArgv, sizeof(*argv) * con->finalArgvCount);
+    argc += con->finalArgvCount;
 
     if (con->numLeftovers) {
-	argv[pos++] = "--";
-	memcpy(argv + pos, con->leftovers, sizeof(*argv) * con->numLeftovers);
-	pos += con->numLeftovers;
+	argv[argc++] = "--";
+	memcpy(argv + argc, con->leftovers, sizeof(*argv) * con->numLeftovers);
+	argc += con->numLeftovers;
     }
 
-    argv[pos++] = NULL;
+    argv[argc++] = NULL;
 
 #ifdef __hpux
     setresuid(getuid(), getuid(),-1);
@@ -267,6 +275,17 @@ static void execCommand(poptContext con) {
 #endif
 #endif
 
+    if (argv[0] == NULL)
+	return;
+#ifdef MYDEBUG
+    {	const char ** arg;
+	fprintf(stderr, "==> execvp(%s):", argv[0]);
+	for (arg = argv; *arg; arg++)
+	    fprintf(stderr, " %s", *arg);
+	fprintf(stderr, "\n");
+    }
+#endif
+
     execvp(argv[0], (char *const *)argv);
 }
 
@@ -386,7 +405,7 @@ static /*@only@*/ const char * expandNextArg(poptContext con, const char * s)
 
 static void poptStripArg(poptContext con, int which)
 {
-    if(con->arg_strip == NULL) {
+    if (con->arg_strip == NULL) {
 	con->arg_strip = PBM_ALLOC(con->optionStack[0].argc);
     }
     PBM_SET(which, con->arg_strip);
@@ -438,6 +457,20 @@ static int poptSaveInt(const struct poptOption * opt, long aLong) {
     return 0;
 }
 
+#ifdef MYDEBUG
+static void prtcon(const char *msg, poptContext con)
+{
+    if (msg) fprintf(stderr, "%s", msg);
+    fprintf(stderr, "\tcon %p os %p nextCharArg %p \"%s\" argv[%d] \"%s\"\n",
+	con, con->os,
+	con->os->nextCharArg,
+	(con->os->nextCharArg ? con->os->nextCharArg : ""),
+	con->os->next,
+	(con->os->argv && con->os->argv[con->os->next]
+		? con->os->argv[con->os->next] : ""));
+}
+#endif
+
 /* returns 'val' element, -1 on last item, POPT_ERROR_* on error */
 int poptGetNextOpt(poptContext con)
 {
@@ -470,7 +503,7 @@ int poptGetNextOpt(poptContext con)
 		con->os->next++;
 		continue;
 	    }
-	    thisopt=con->os->next;
+	    thisopt = con->os->next;
 	    origOptString = con->os->argv[con->os->next++];
 
 	    if (con->restLeftover || *origOptString != '-') {
@@ -525,7 +558,7 @@ int poptGetNextOpt(poptContext con)
 	    if (!opt) {
 		con->os->nextCharArg = origOptString + 1;
 	    } else {
-		if(con->os == con->optionStack &&
+		if (con->os == con->optionStack &&
 		   opt->argInfo & POPT_ARGFLAG_STRIP) {
 		    canstrip = 1;
 		    poptStripArg(con, thisopt);
@@ -541,11 +574,14 @@ int poptGetNextOpt(poptContext con)
 
 	    if (handleAlias(con, NULL, *origOptString,
 			    origOptString + 1)) {
-		origOptString++;
 		continue;
 	    }
-	    if (handleExec(con, NULL, *origOptString))
+	    if (handleExec(con, NULL, *origOptString)) {
+		/* Restore rest of short options for further processing */
+		origOptString++;
+		if (*origOptString) con->os->nextCharArg = origOptString;
 		continue;
+	    }
 
 	    opt = findOption(con->options, NULL, *origOptString, &cb,
 			     &cbData, 0);
@@ -553,8 +589,7 @@ int poptGetNextOpt(poptContext con)
 		return POPT_ERROR_BADOPT;
 
 	    origOptString++;
-	    if (*origOptString)
-		con->os->nextCharArg = origOptString;
+	    if (*origOptString) con->os->nextCharArg = origOptString;
 	}
 
 	if (opt->arg && (opt->argInfo & POPT_ARG_MASK) == POPT_ARG_NONE) {
@@ -585,7 +620,7 @@ int poptGetNextOpt(poptContext con)
 
 		/* make sure this isn't part of a short arg or the
                    result of an alias expansion */
-		if(con->os == con->optionStack &&
+		if (con->os == con->optionStack &&
 		   opt->argInfo & POPT_ARGFLAG_STRIP &&
 		   canstrip) {
 		    poptStripArg(con, con->os->next);
@@ -642,7 +677,7 @@ int poptGetNextOpt(poptContext con)
 			    sizeof(*con->finalArgv) * con->finalArgvAlloced);
 	}
 
-	{    char *s = malloc((opt->longName ? strlen(opt->longName) : 0) + 3);
+	{   char *s = malloc((opt->longName ? strlen(opt->longName) : 0) + 3);
 	    if (opt->longName)
 		sprintf(s, "--%s", opt->longName);
 	    else
@@ -650,8 +685,9 @@ int poptGetNextOpt(poptContext con)
 	    con->finalArgv[con->finalArgvCount++] = s;
 	}
 
-	if (opt->arg && (opt->argInfo & POPT_ARG_MASK) != POPT_ARG_NONE
-		     && (opt->argInfo & POPT_ARG_MASK) != POPT_ARG_VAL) {
+	if (opt->arg && (opt->argInfo & POPT_ARG_MASK) == POPT_ARG_NONE) {
+	} else if ((opt->argInfo & POPT_ARG_MASK) == POPT_ARG_VAL) {
+	} else if ((opt->argInfo & POPT_ARG_MASK) != POPT_ARG_NONE) {
 	    con->finalArgv[con->finalArgvCount++] = xstrdup(con->os->nextArg);
 	}
     }
@@ -800,16 +836,16 @@ int poptStrippedArgv(poptContext con, int argc, char **argv)
     int i,j=1, numargs=argc;
     
     for(i=1; i<argc; i++) {
-	if(PBM_ISSET(i, con->arg_strip)) {
+	if (PBM_ISSET(i, con->arg_strip)) {
 	    numargs--;
 	}
     }
     
     for(i=1; i<argc; i++) {
-	if(PBM_ISSET(i, con->arg_strip)) {
+	if (PBM_ISSET(i, con->arg_strip)) {
 	    continue;
 	} else {
-	    if(j<numargs) {
+	    if (j<numargs) {
 		argv[j++]=argv[i];
 	    } else {
 		argv[j++]='\0';
diff --git a/testit.sh b/testit.sh
index e9b7198..a322176 100755
--- a/testit.sh
+++ b/testit.sh
@@ -15,6 +15,7 @@ run() {
 }
 
 builddir=`pwd`
+srcdir=$builddir
 cd ${srcdir}
 test1=${builddir}/test1
 echo "Running tests in `pwd`"
@@ -39,11 +40,11 @@ run test1 "test1 - 15" "arg1: 0 arg2: foo inc: 1" -i --arg2 foo
 POSIX_ME_HARDER=1 run test1 "test1 - 16" "arg1: 1 arg2: (none) rest: foo --arg2 something" --arg1 foo --arg2 something
 POSIXLY_CORRECT=1 run test1 "test1 - 17" "arg1: 1 arg2: (none) rest: foo --arg2 something" --arg1 foo --arg2 something
 run test1 "test1 - 18" "callback: c sampledata bar arg1: 1 arg2: (none)" --arg1 --cb bar
-run test1 "test1 - 19" "${test1} ;" --echo-args
-run test1 "test1 - 20" "${test1} ; --arg1" --echo-args --arg1
-run test1 "test1 - 21" "${test1} ; --arg2 something" -T something -e
-run test1 "test1 - 22" "${test1} ; --arg2 something -- more args" -T something -a more args
-run test1 "test1 - 23" "${test1} ; --echo-args -a" --echo-args -e -a
+run test1 "test1 - 19" "" --echo-args
+run test1 "test1 - 20" "--arg1" --echo-args --arg1
+run test1 "test1 - 21" "--arg2 something" -T something -e
+run test1 "test1 - 22" "--arg2 something -- more args" -T something -a more args
+run test1 "test1 - 23" "--echo-args -a" --echo-args -e -a
 run test1 "test1 - 24" "arg1: 0 arg2: (none) short: 1" -shortoption
 run test1 "test1 - 25" "arg1: 0 arg2: (none) short: 1" --shortoption
 run test1 "test1 - 26" "callback: c arg for cb2 foo arg1: 0 arg2: (none)" --cb2 foo
-- 
Gitee


From 6ddedc6778dbf4cb87c768a06a46eaa0cd27dcdd Mon Sep 17 00:00:00 2001
From: Jeff Johnson <n3npq@mac.com>
Date: Fri, 26 May 2000 13:58:11 +0000
Subject: [PATCH 235/667] Honor POPT_ARGFLAG_ONEDASH when dup'ing args for popt
 exec.

---
 po/popt.pot |  2 +-
 popt.c      | 49 ++++++++++++++++++++++++-------------------------
 2 files changed, 25 insertions(+), 26 deletions(-)

diff --git a/po/popt.pot b/po/popt.pot
index 49ad01e..f3d7527 100644
--- a/po/popt.pot
+++ b/po/popt.pot
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2000-05-24 13:46-0400\n"
+"POT-Creation-Date: 2000-05-26 09:27-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/popt.c b/popt.c
index 0706ccc..5b2c8d5 100644
--- a/popt.c
+++ b/popt.c
@@ -405,9 +405,8 @@ static /*@only@*/ const char * expandNextArg(poptContext con, const char * s)
 
 static void poptStripArg(poptContext con, int which)
 {
-    if (con->arg_strip == NULL) {
+    if (con->arg_strip == NULL)
 	con->arg_strip = PBM_ALLOC(con->optionStack[0].argc);
-    }
     PBM_SET(which, con->arg_strip);
 }
 
@@ -461,10 +460,10 @@ static int poptSaveInt(const struct poptOption * opt, long aLong) {
 static void prtcon(const char *msg, poptContext con)
 {
     if (msg) fprintf(stderr, "%s", msg);
-    fprintf(stderr, "\tcon %p os %p nextCharArg %p \"%s\" argv[%d] \"%s\"\n",
+    fprintf(stderr, "\tcon %p os %p nextCharArg \"%s\" nextArg \"%s\" argv[%d] \"%s\"\n",
 	con, con->os,
-	con->os->nextCharArg,
 	(con->os->nextCharArg ? con->os->nextCharArg : ""),
+	(con->os->nextArg ? con->os->nextArg : ""),
 	con->os->next,
 	(con->os->argv && con->os->argv[con->os->next]
 		? con->os->argv[con->os->next] : ""));
@@ -679,15 +678,19 @@ int poptGetNextOpt(poptContext con)
 
 	{   char *s = malloc((opt->longName ? strlen(opt->longName) : 0) + 3);
 	    if (opt->longName)
-		sprintf(s, "--%s", opt->longName);
+		sprintf(s, "%s%s",
+		    ((opt->argInfo & POPT_ARGFLAG_ONEDASH) ? "-" : "--"),
+		    opt->longName);
 	    else
 		sprintf(s, "-%c", opt->shortName);
 	    con->finalArgv[con->finalArgvCount++] = s;
 	}
 
-	if (opt->arg && (opt->argInfo & POPT_ARG_MASK) == POPT_ARG_NONE) {
-	} else if ((opt->argInfo & POPT_ARG_MASK) == POPT_ARG_VAL) {
-	} else if ((opt->argInfo & POPT_ARG_MASK) != POPT_ARG_NONE) {
+	if (opt->arg && (opt->argInfo & POPT_ARG_MASK) == POPT_ARG_NONE)
+	    /*@-ifempty@*/ ;
+	else if ((opt->argInfo & POPT_ARG_MASK) == POPT_ARG_VAL)
+	    /*@-ifempty@*/ ;
+	else if ((opt->argInfo & POPT_ARG_MASK) != POPT_ARG_NONE) {
 	    con->finalArgv[con->finalArgvCount++] = xstrdup(con->os->nextArg);
 	}
     }
@@ -702,13 +705,15 @@ const char * poptGetOptArg(poptContext con) {
 }
 
 const char * poptGetArg(poptContext con) {
-    if (con->numLeftovers == con->nextLeftover) return NULL;
-    return con->leftovers[con->nextLeftover++];
+    const char * ret = (con->nextLeftover < con->numLeftovers)
+	? con->leftovers[con->nextLeftover++] : NULL;
+    return ret;
 }
 
 const char * poptPeekArg(poptContext con) {
-    if (con->numLeftovers == con->nextLeftover) return NULL;
-    return con->leftovers[con->nextLeftover];
+    const char * ret = (con->nextLeftover < con->numLeftovers)
+	? con->leftovers[con->nextLeftover] : NULL;
+    return ret;
 }
 
 const char ** poptGetArgs(poptContext con) {
@@ -835,23 +840,17 @@ int poptStrippedArgv(poptContext con, int argc, char **argv)
 {
     int i,j=1, numargs=argc;
     
-    for(i=1; i<argc; i++) {
-	if (PBM_ISSET(i, con->arg_strip)) {
+    for (i = 1; i < argc; i++) {
+	if (PBM_ISSET(i, con->arg_strip))
 	    numargs--;
-	}
     }
     
-    for(i=1; i<argc; i++) {
-	if (PBM_ISSET(i, con->arg_strip)) {
+    for (i = 1; i < argc; i++) {
+	if (PBM_ISSET(i, con->arg_strip))
 	    continue;
-	} else {
-	    if (j<numargs) {
-		argv[j++]=argv[i];
-	    } else {
-		argv[j++]='\0';
-	    }
-	}
+	argv[j] = (j < numargs) ? argv[i] : '\0';
+	j++;
     }
     
-    return(numargs);
+    return numargs;
 }
-- 
Gitee


From fde7f79fb3e77e2df1baccdbc69f69b25aa0603a Mon Sep 17 00:00:00 2001
From: Jeff Johnson <n3npq@mac.com>
Date: Fri, 26 May 2000 18:51:12 +0000
Subject: [PATCH 236/667] Remove build modes from rpm, use rpmb and/or popt
 glue instead.

---
 po/popt.pot | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/po/popt.pot b/po/popt.pot
index f3d7527..9196a95 100644
--- a/po/popt.pot
+++ b/po/popt.pot
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2000-05-26 09:27-0400\n"
+"POT-Creation-Date: 2000-05-26 14:35-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
-- 
Gitee


From 57fa6e4d7201bba391ba114d0365a64ab43f6eef Mon Sep 17 00:00:00 2001
From: Jeff Johnson <n3npq@mac.com>
Date: Fri, 26 May 2000 18:59:10 +0000
Subject: [PATCH 237/667] Sanity (make dist).

---
 po/ro.po | 2 +-
 po/sk.po | 2 +-
 po/tr.po | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/po/ro.po b/po/ro.po
index 3cbf575..5d6e349 100644
--- a/po/ro.po
+++ b/po/ro.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: POPT\n"
-"POT-Creation-Date: 2000-05-24 13:46-0400\n"
+"POT-Creation-Date: 2000-05-26 14:35-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Cristian Gafton <gafton@redhat.com>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/po/sk.po b/po/sk.po
index 37466a2..402a873 100644
--- a/po/sk.po
+++ b/po/sk.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt\n"
-"POT-Creation-Date: 2000-05-24 13:46-0400\n"
+"POT-Creation-Date: 2000-05-26 14:35-0400\n"
 "PO-Revision-Date: 1999-08-04 21:40+0200\n"
 "Last-Translator: Stanislav Meduna <stano@eunet.sk>\n"
 "Language-Team: Slovak <sk-i18n@rak.isternet.sk>\n"
diff --git a/po/tr.po b/po/tr.po
index 7e5c3db..216951f 100644
--- a/po/tr.po
+++ b/po/tr.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.2\n"
-"POT-Creation-Date: 2000-05-24 13:46-0400\n"
+"POT-Creation-Date: 2000-05-26 14:35-0400\n"
 "PO-Revision-Date: 2000-01-06 13:01+0100\n"
 "Last-Translator: Fatih Demir <kabalak@gmx.net>\n"
 "Language-Team: Turkish Gnome Tranlation Team <gnotrap@gmx.net>\n"
-- 
Gitee


From 9f5e51e9e1231523926d77eb356e1c96bf0b1c23 Mon Sep 17 00:00:00 2001
From: Jeff Johnson <n3npq@mac.com>
Date: Wed, 31 May 2000 17:39:01 +0000
Subject: [PATCH 238/667] Duplicate query aliases onto rpmq.

---
 po/popt.pot | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/po/popt.pot b/po/popt.pot
index 9196a95..0ddcd5b 100644
--- a/po/popt.pot
+++ b/po/popt.pot
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2000-05-26 14:35-0400\n"
+"POT-Creation-Date: 2000-05-31 13:35-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
-- 
Gitee


From 98b4265940e43bc13cd2e7f18fcceadc74cac731 Mon Sep 17 00:00:00 2001
From: Jeff Johnson <n3npq@mac.com>
Date: Wed, 31 May 2000 17:45:44 +0000
Subject: [PATCH 239/667] Sanity (make dist).

---
 po/ro.po | 2 +-
 po/sk.po | 2 +-
 po/tr.po | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/po/ro.po b/po/ro.po
index 5d6e349..1eb1c0e 100644
--- a/po/ro.po
+++ b/po/ro.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: POPT\n"
-"POT-Creation-Date: 2000-05-26 14:35-0400\n"
+"POT-Creation-Date: 2000-05-31 13:35-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Cristian Gafton <gafton@redhat.com>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/po/sk.po b/po/sk.po
index 402a873..bed307a 100644
--- a/po/sk.po
+++ b/po/sk.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt\n"
-"POT-Creation-Date: 2000-05-26 14:35-0400\n"
+"POT-Creation-Date: 2000-05-31 13:35-0400\n"
 "PO-Revision-Date: 1999-08-04 21:40+0200\n"
 "Last-Translator: Stanislav Meduna <stano@eunet.sk>\n"
 "Language-Team: Slovak <sk-i18n@rak.isternet.sk>\n"
diff --git a/po/tr.po b/po/tr.po
index 216951f..e4b1ff6 100644
--- a/po/tr.po
+++ b/po/tr.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.2\n"
-"POT-Creation-Date: 2000-05-26 14:35-0400\n"
+"POT-Creation-Date: 2000-05-31 13:35-0400\n"
 "PO-Revision-Date: 2000-01-06 13:01+0100\n"
 "Last-Translator: Fatih Demir <kabalak@gmx.net>\n"
 "Language-Team: Turkish Gnome Tranlation Team <gnotrap@gmx.net>\n"
-- 
Gitee


From 56c0e5abd601a5003a64ed1e8b833c1b3eaf89f9 Mon Sep 17 00:00:00 2001
From: Jeff Johnson <n3npq@mac.com>
Date: Thu, 1 Jun 2000 02:00:12 +0000
Subject: [PATCH 240/667] Hack to pass build args correctly. Create noarch
 symlink to canonical arch directory.

---
 po/popt.pot | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/po/popt.pot b/po/popt.pot
index 0ddcd5b..6378d9c 100644
--- a/po/popt.pot
+++ b/po/popt.pot
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2000-05-31 13:35-0400\n"
+"POT-Creation-Date: 2000-05-31 21:46-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
-- 
Gitee


From b23b437098a4fa91c8666bdc4a9671decde90b90 Mon Sep 17 00:00:00 2001
From: Jeff Johnson <n3npq@mac.com>
Date: Thu, 1 Jun 2000 04:47:46 +0000
Subject: [PATCH 241/667] Split popt glue into lib/popt{BT,QV}.c. Add
 dependencies to *.la.

---
 configure.in | 3 +++
 po/ro.po     | 2 +-
 po/sk.po     | 2 +-
 po/tr.po     | 2 +-
 4 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/configure.in b/configure.in
index 922774d..56d05af 100755
--- a/configure.in
+++ b/configure.in
@@ -19,6 +19,9 @@ AC_PROG_INSTALL
 if test "X$CC" = Xgcc; then
     CFLAGS="-Wall $CFLAGS"
 fi
+
+dnl XXX lose rpm libs
+LIBS=
 addlib() {
   l=$1
   shift
diff --git a/po/ro.po b/po/ro.po
index 1eb1c0e..842e8a8 100644
--- a/po/ro.po
+++ b/po/ro.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: POPT\n"
-"POT-Creation-Date: 2000-05-31 13:35-0400\n"
+"POT-Creation-Date: 2000-05-31 21:46-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Cristian Gafton <gafton@redhat.com>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/po/sk.po b/po/sk.po
index bed307a..b31a128 100644
--- a/po/sk.po
+++ b/po/sk.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt\n"
-"POT-Creation-Date: 2000-05-31 13:35-0400\n"
+"POT-Creation-Date: 2000-05-31 21:46-0400\n"
 "PO-Revision-Date: 1999-08-04 21:40+0200\n"
 "Last-Translator: Stanislav Meduna <stano@eunet.sk>\n"
 "Language-Team: Slovak <sk-i18n@rak.isternet.sk>\n"
diff --git a/po/tr.po b/po/tr.po
index e4b1ff6..2dd89d7 100644
--- a/po/tr.po
+++ b/po/tr.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.2\n"
-"POT-Creation-Date: 2000-05-31 13:35-0400\n"
+"POT-Creation-Date: 2000-05-31 21:46-0400\n"
 "PO-Revision-Date: 2000-01-06 13:01+0100\n"
 "Last-Translator: Fatih Demir <kabalak@gmx.net>\n"
 "Language-Team: Turkish Gnome Tranlation Team <gnotrap@gmx.net>\n"
-- 
Gitee


From 94569b7fa5bfdbd74ad0ccd66bfee0a422550d44 Mon Sep 17 00:00:00 2001
From: Jeff Johnson <n3npq@mac.com>
Date: Mon, 12 Jun 2000 22:15:04 +0000
Subject: [PATCH 242/667] Ignore *.mo as well.

---
 po/.cvsignore | 1 +
 1 file changed, 1 insertion(+)

diff --git a/po/.cvsignore b/po/.cvsignore
index 3c3710e..557ce8d 100644
--- a/po/.cvsignore
+++ b/po/.cvsignore
@@ -3,4 +3,5 @@ Makefile.in
 POTFILES
 stamp-cat-id
 cat-id-tbl.c
+*.mo
 *.gmo
-- 
Gitee


From 9d4f89e4942c4b7d31491c4adaa5fa125186b245 Mon Sep 17 00:00:00 2001
From: Jeff Johnson <n3npq@mac.com>
Date: Wed, 14 Jun 2000 14:21:12 +0000
Subject: [PATCH 243/667] Add header.

---
 po/ro.po | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/po/ro.po b/po/ro.po
index 842e8a8..df50641 100644
--- a/po/ro.po
+++ b/po/ro.po
@@ -7,9 +7,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: POPT\n"
 "POT-Creation-Date: 2000-05-31 21:46-0400\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2000-06-14 23:23+EST\n"
 "Last-Translator: Cristian Gafton <gafton@redhat.com>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
+"Language-Team: Romanian <ro@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=ISO-8859-2\n"
 "Content-Transfer-Encoding: 8bit\n"
-- 
Gitee


From 88abd2000e9e04fcc2da271ae7bc5aace62bf3d3 Mon Sep 17 00:00:00 2001
From: Jeff Johnson <n3npq@mac.com>
Date: Wed, 14 Jun 2000 14:21:13 +0000
Subject: [PATCH 244/667] Update header.

---
 po/ro.po | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/po/ro.po b/po/ro.po
index df50641..40be6ef 100644
--- a/po/ro.po
+++ b/po/ro.po
@@ -5,7 +5,7 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: POPT\n"
+"Project-Id-Version: popt 1.6\n"
 "POT-Creation-Date: 2000-05-31 21:46-0400\n"
 "PO-Revision-Date: 2000-06-14 23:23+EST\n"
 "Last-Translator: Cristian Gafton <gafton@redhat.com>\n"
-- 
Gitee


From d79aa29e9174c3ea6d244ad859b03a931a1396c4 Mon Sep 17 00:00:00 2001
From: Jeff Johnson <n3npq@mac.com>
Date: Thu, 15 Jun 2000 10:11:50 +0000
Subject: [PATCH 245/667] Remove leading comments.

---
 po/ro.po | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/po/ro.po b/po/ro.po
index 40be6ef..0d21b25 100644
--- a/po/ro.po
+++ b/po/ro.po
@@ -1,8 +1,3 @@
-# SOME DESCRIPTIVE TITLE.
-# Copyright (C) YEAR Free Software Foundation, Inc.
-# Cristian Gafton <gafton@redhat.com>, 1998.
-#
-#, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6\n"
-- 
Gitee


From f1359a73078daf6435c70e87be41042a1543b1f7 Mon Sep 17 00:00:00 2001
From: Jeff Johnson <n3npq@mac.com>
Date: Thu, 15 Jun 2000 23:50:22 +0000
Subject: [PATCH 246/667] New file

---
 po/cs.po | 23 +++++++++++++++++++++++
 po/da.po | 23 +++++++++++++++++++++++
 po/de.po | 23 +++++++++++++++++++++++
 po/es.po | 23 +++++++++++++++++++++++
 po/fi.po | 23 +++++++++++++++++++++++
 po/fr.po | 23 +++++++++++++++++++++++
 po/gl.po | 23 +++++++++++++++++++++++
 po/hu.po | 23 +++++++++++++++++++++++
 po/id.po | 23 +++++++++++++++++++++++
 po/is.po | 23 +++++++++++++++++++++++
 po/it.po | 23 +++++++++++++++++++++++
 po/ja.po | 23 +++++++++++++++++++++++
 po/uk.po | 23 +++++++++++++++++++++++
 13 files changed, 299 insertions(+)
 create mode 100644 po/cs.po
 create mode 100644 po/da.po
 create mode 100644 po/de.po
 create mode 100644 po/es.po
 create mode 100644 po/fi.po
 create mode 100644 po/fr.po
 create mode 100644 po/gl.po
 create mode 100644 po/hu.po
 create mode 100644 po/id.po
 create mode 100644 po/is.po
 create mode 100644 po/it.po
 create mode 100644 po/ja.po
 create mode 100644 po/uk.po

diff --git a/po/cs.po b/po/cs.po
new file mode 100644
index 0000000..6378d9c
--- /dev/null
+++ b/po/cs.po
@@ -0,0 +1,23 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR Free Software Foundation, Inc.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"POT-Creation-Date: 2000-05-31 21:46-0400\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=CHARSET\n"
+"Content-Transfer-Encoding: ENCODING\n"
+
+#: popthelp.c:23
+msgid "Show this help message"
+msgstr ""
+
+#: popthelp.c:24
+msgid "Display brief usage message"
+msgstr ""
diff --git a/po/da.po b/po/da.po
new file mode 100644
index 0000000..6378d9c
--- /dev/null
+++ b/po/da.po
@@ -0,0 +1,23 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR Free Software Foundation, Inc.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"POT-Creation-Date: 2000-05-31 21:46-0400\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=CHARSET\n"
+"Content-Transfer-Encoding: ENCODING\n"
+
+#: popthelp.c:23
+msgid "Show this help message"
+msgstr ""
+
+#: popthelp.c:24
+msgid "Display brief usage message"
+msgstr ""
diff --git a/po/de.po b/po/de.po
new file mode 100644
index 0000000..6378d9c
--- /dev/null
+++ b/po/de.po
@@ -0,0 +1,23 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR Free Software Foundation, Inc.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"POT-Creation-Date: 2000-05-31 21:46-0400\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=CHARSET\n"
+"Content-Transfer-Encoding: ENCODING\n"
+
+#: popthelp.c:23
+msgid "Show this help message"
+msgstr ""
+
+#: popthelp.c:24
+msgid "Display brief usage message"
+msgstr ""
diff --git a/po/es.po b/po/es.po
new file mode 100644
index 0000000..6378d9c
--- /dev/null
+++ b/po/es.po
@@ -0,0 +1,23 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR Free Software Foundation, Inc.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"POT-Creation-Date: 2000-05-31 21:46-0400\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=CHARSET\n"
+"Content-Transfer-Encoding: ENCODING\n"
+
+#: popthelp.c:23
+msgid "Show this help message"
+msgstr ""
+
+#: popthelp.c:24
+msgid "Display brief usage message"
+msgstr ""
diff --git a/po/fi.po b/po/fi.po
new file mode 100644
index 0000000..6378d9c
--- /dev/null
+++ b/po/fi.po
@@ -0,0 +1,23 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR Free Software Foundation, Inc.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"POT-Creation-Date: 2000-05-31 21:46-0400\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=CHARSET\n"
+"Content-Transfer-Encoding: ENCODING\n"
+
+#: popthelp.c:23
+msgid "Show this help message"
+msgstr ""
+
+#: popthelp.c:24
+msgid "Display brief usage message"
+msgstr ""
diff --git a/po/fr.po b/po/fr.po
new file mode 100644
index 0000000..6378d9c
--- /dev/null
+++ b/po/fr.po
@@ -0,0 +1,23 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR Free Software Foundation, Inc.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"POT-Creation-Date: 2000-05-31 21:46-0400\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=CHARSET\n"
+"Content-Transfer-Encoding: ENCODING\n"
+
+#: popthelp.c:23
+msgid "Show this help message"
+msgstr ""
+
+#: popthelp.c:24
+msgid "Display brief usage message"
+msgstr ""
diff --git a/po/gl.po b/po/gl.po
new file mode 100644
index 0000000..6378d9c
--- /dev/null
+++ b/po/gl.po
@@ -0,0 +1,23 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR Free Software Foundation, Inc.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"POT-Creation-Date: 2000-05-31 21:46-0400\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=CHARSET\n"
+"Content-Transfer-Encoding: ENCODING\n"
+
+#: popthelp.c:23
+msgid "Show this help message"
+msgstr ""
+
+#: popthelp.c:24
+msgid "Display brief usage message"
+msgstr ""
diff --git a/po/hu.po b/po/hu.po
new file mode 100644
index 0000000..6378d9c
--- /dev/null
+++ b/po/hu.po
@@ -0,0 +1,23 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR Free Software Foundation, Inc.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"POT-Creation-Date: 2000-05-31 21:46-0400\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=CHARSET\n"
+"Content-Transfer-Encoding: ENCODING\n"
+
+#: popthelp.c:23
+msgid "Show this help message"
+msgstr ""
+
+#: popthelp.c:24
+msgid "Display brief usage message"
+msgstr ""
diff --git a/po/id.po b/po/id.po
new file mode 100644
index 0000000..6378d9c
--- /dev/null
+++ b/po/id.po
@@ -0,0 +1,23 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR Free Software Foundation, Inc.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"POT-Creation-Date: 2000-05-31 21:46-0400\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=CHARSET\n"
+"Content-Transfer-Encoding: ENCODING\n"
+
+#: popthelp.c:23
+msgid "Show this help message"
+msgstr ""
+
+#: popthelp.c:24
+msgid "Display brief usage message"
+msgstr ""
diff --git a/po/is.po b/po/is.po
new file mode 100644
index 0000000..6378d9c
--- /dev/null
+++ b/po/is.po
@@ -0,0 +1,23 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR Free Software Foundation, Inc.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"POT-Creation-Date: 2000-05-31 21:46-0400\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=CHARSET\n"
+"Content-Transfer-Encoding: ENCODING\n"
+
+#: popthelp.c:23
+msgid "Show this help message"
+msgstr ""
+
+#: popthelp.c:24
+msgid "Display brief usage message"
+msgstr ""
diff --git a/po/it.po b/po/it.po
new file mode 100644
index 0000000..6378d9c
--- /dev/null
+++ b/po/it.po
@@ -0,0 +1,23 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR Free Software Foundation, Inc.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"POT-Creation-Date: 2000-05-31 21:46-0400\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=CHARSET\n"
+"Content-Transfer-Encoding: ENCODING\n"
+
+#: popthelp.c:23
+msgid "Show this help message"
+msgstr ""
+
+#: popthelp.c:24
+msgid "Display brief usage message"
+msgstr ""
diff --git a/po/ja.po b/po/ja.po
new file mode 100644
index 0000000..6378d9c
--- /dev/null
+++ b/po/ja.po
@@ -0,0 +1,23 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR Free Software Foundation, Inc.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"POT-Creation-Date: 2000-05-31 21:46-0400\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=CHARSET\n"
+"Content-Transfer-Encoding: ENCODING\n"
+
+#: popthelp.c:23
+msgid "Show this help message"
+msgstr ""
+
+#: popthelp.c:24
+msgid "Display brief usage message"
+msgstr ""
diff --git a/po/uk.po b/po/uk.po
new file mode 100644
index 0000000..6378d9c
--- /dev/null
+++ b/po/uk.po
@@ -0,0 +1,23 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR Free Software Foundation, Inc.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"POT-Creation-Date: 2000-05-31 21:46-0400\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=CHARSET\n"
+"Content-Transfer-Encoding: ENCODING\n"
+
+#: popthelp.c:23
+msgid "Show this help message"
+msgstr ""
+
+#: popthelp.c:24
+msgid "Display brief usage message"
+msgstr ""
-- 
Gitee


From e63169b8edb86cb6df4b5206d9b5622ea77cd519 Mon Sep 17 00:00:00 2001
From: Jeff Johnson <n3npq@mac.com>
Date: Fri, 16 Jun 2000 00:04:08 +0000
Subject: [PATCH 247/667] New file

---
 po/no.po    | 23 +++++++++++++++++++++++
 po/pl.po    | 23 +++++++++++++++++++++++
 po/pt.po    | 23 +++++++++++++++++++++++
 po/pt_BR.po | 23 +++++++++++++++++++++++
 po/ru.po    | 23 +++++++++++++++++++++++
 po/sl.po    | 23 +++++++++++++++++++++++
 po/sr.po    | 23 +++++++++++++++++++++++
 po/sv.po    | 23 +++++++++++++++++++++++
 8 files changed, 184 insertions(+)
 create mode 100644 po/no.po
 create mode 100644 po/pl.po
 create mode 100644 po/pt.po
 create mode 100644 po/pt_BR.po
 create mode 100644 po/ru.po
 create mode 100644 po/sl.po
 create mode 100644 po/sr.po
 create mode 100644 po/sv.po

diff --git a/po/no.po b/po/no.po
new file mode 100644
index 0000000..6378d9c
--- /dev/null
+++ b/po/no.po
@@ -0,0 +1,23 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR Free Software Foundation, Inc.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"POT-Creation-Date: 2000-05-31 21:46-0400\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=CHARSET\n"
+"Content-Transfer-Encoding: ENCODING\n"
+
+#: popthelp.c:23
+msgid "Show this help message"
+msgstr ""
+
+#: popthelp.c:24
+msgid "Display brief usage message"
+msgstr ""
diff --git a/po/pl.po b/po/pl.po
new file mode 100644
index 0000000..6378d9c
--- /dev/null
+++ b/po/pl.po
@@ -0,0 +1,23 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR Free Software Foundation, Inc.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"POT-Creation-Date: 2000-05-31 21:46-0400\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=CHARSET\n"
+"Content-Transfer-Encoding: ENCODING\n"
+
+#: popthelp.c:23
+msgid "Show this help message"
+msgstr ""
+
+#: popthelp.c:24
+msgid "Display brief usage message"
+msgstr ""
diff --git a/po/pt.po b/po/pt.po
new file mode 100644
index 0000000..6378d9c
--- /dev/null
+++ b/po/pt.po
@@ -0,0 +1,23 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR Free Software Foundation, Inc.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"POT-Creation-Date: 2000-05-31 21:46-0400\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=CHARSET\n"
+"Content-Transfer-Encoding: ENCODING\n"
+
+#: popthelp.c:23
+msgid "Show this help message"
+msgstr ""
+
+#: popthelp.c:24
+msgid "Display brief usage message"
+msgstr ""
diff --git a/po/pt_BR.po b/po/pt_BR.po
new file mode 100644
index 0000000..6378d9c
--- /dev/null
+++ b/po/pt_BR.po
@@ -0,0 +1,23 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR Free Software Foundation, Inc.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"POT-Creation-Date: 2000-05-31 21:46-0400\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=CHARSET\n"
+"Content-Transfer-Encoding: ENCODING\n"
+
+#: popthelp.c:23
+msgid "Show this help message"
+msgstr ""
+
+#: popthelp.c:24
+msgid "Display brief usage message"
+msgstr ""
diff --git a/po/ru.po b/po/ru.po
new file mode 100644
index 0000000..6378d9c
--- /dev/null
+++ b/po/ru.po
@@ -0,0 +1,23 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR Free Software Foundation, Inc.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"POT-Creation-Date: 2000-05-31 21:46-0400\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=CHARSET\n"
+"Content-Transfer-Encoding: ENCODING\n"
+
+#: popthelp.c:23
+msgid "Show this help message"
+msgstr ""
+
+#: popthelp.c:24
+msgid "Display brief usage message"
+msgstr ""
diff --git a/po/sl.po b/po/sl.po
new file mode 100644
index 0000000..6378d9c
--- /dev/null
+++ b/po/sl.po
@@ -0,0 +1,23 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR Free Software Foundation, Inc.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"POT-Creation-Date: 2000-05-31 21:46-0400\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=CHARSET\n"
+"Content-Transfer-Encoding: ENCODING\n"
+
+#: popthelp.c:23
+msgid "Show this help message"
+msgstr ""
+
+#: popthelp.c:24
+msgid "Display brief usage message"
+msgstr ""
diff --git a/po/sr.po b/po/sr.po
new file mode 100644
index 0000000..6378d9c
--- /dev/null
+++ b/po/sr.po
@@ -0,0 +1,23 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR Free Software Foundation, Inc.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"POT-Creation-Date: 2000-05-31 21:46-0400\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=CHARSET\n"
+"Content-Transfer-Encoding: ENCODING\n"
+
+#: popthelp.c:23
+msgid "Show this help message"
+msgstr ""
+
+#: popthelp.c:24
+msgid "Display brief usage message"
+msgstr ""
diff --git a/po/sv.po b/po/sv.po
new file mode 100644
index 0000000..6378d9c
--- /dev/null
+++ b/po/sv.po
@@ -0,0 +1,23 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR Free Software Foundation, Inc.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"POT-Creation-Date: 2000-05-31 21:46-0400\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=CHARSET\n"
+"Content-Transfer-Encoding: ENCODING\n"
+
+#: popthelp.c:23
+msgid "Show this help message"
+msgstr ""
+
+#: popthelp.c:24
+msgid "Display brief usage message"
+msgstr ""
-- 
Gitee


From d90e4b66ca65b76128676bc250976f52a385944a Mon Sep 17 00:00:00 2001
From: Jeff Johnson <n3npq@mac.com>
Date: Fri, 16 Jun 2000 02:17:41 +0000
Subject: [PATCH 248/667] Auto-update by ra@xo.hp.is

---
 po/is.po | 21 ++++++++-------------
 1 file changed, 8 insertions(+), 13 deletions(-)

diff --git a/po/is.po b/po/is.po
index 6378d9c..e5bb3dd 100644
--- a/po/is.po
+++ b/po/is.po
@@ -1,23 +1,18 @@
-# SOME DESCRIPTIVE TITLE.
-# Copyright (C) YEAR Free Software Foundation, Inc.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#
-#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
+"Project-Id-Version: popt 1.0\n"
 "POT-Creation-Date: 2000-05-31 21:46-0400\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
+"PO-Revision-Date: 2000-06-16 02:12+0000\n"
+"Last-Translator: Richard Allen <ra@hp.is>\n"
+"Language-Team: is <kde-isl@mmedia.is>\n"
 "MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=CHARSET\n"
-"Content-Transfer-Encoding: ENCODING\n"
+"Content-Type: text/plain; charset=ISO-8859-1\n"
+"Content-Transfer-Encoding: 8-bit\n"
 
 #: popthelp.c:23
 msgid "Show this help message"
-msgstr ""
+msgstr "S�na �essa hj�lp"
 
 #: popthelp.c:24
 msgid "Display brief usage message"
-msgstr ""
+msgstr "S�na stuttar notkunarlei�beiningar"
-- 
Gitee


From 6dd811f8d789184402846cb5ae0aa97fd5662bf7 Mon Sep 17 00:00:00 2001
From: Jeff Johnson <n3npq@mac.com>
Date: Fri, 16 Jun 2000 19:08:41 +0000
Subject: [PATCH 249/667] Create.

---
 po/ko.po | 23 +++++++++++++++++++++++
 1 file changed, 23 insertions(+)
 create mode 100644 po/ko.po

diff --git a/po/ko.po b/po/ko.po
new file mode 100644
index 0000000..6378d9c
--- /dev/null
+++ b/po/ko.po
@@ -0,0 +1,23 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR Free Software Foundation, Inc.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"POT-Creation-Date: 2000-05-31 21:46-0400\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=CHARSET\n"
+"Content-Transfer-Encoding: ENCODING\n"
+
+#: popthelp.c:23
+msgid "Show this help message"
+msgstr ""
+
+#: popthelp.c:24
+msgid "Display brief usage message"
+msgstr ""
-- 
Gitee


From a9ab30b461837cd36ca12c657cc194a09b676ac2 Mon Sep 17 00:00:00 2001
From: Jeff Johnson <n3npq@mac.com>
Date: Fri, 16 Jun 2000 19:12:12 +0000
Subject: [PATCH 250/667] - fix: resurrect symlink unique'ifying property of
 finger prints.

---
 configure.in | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/configure.in b/configure.in
index 56d05af..1878cf4 100755
--- a/configure.in
+++ b/configure.in
@@ -3,7 +3,7 @@ AM_CONFIG_HEADER(config.h)
 AC_PREREQ(2.12)
 AC_CANONICAL_SYSTEM
 AM_INIT_AUTOMAKE(popt, 1.6)
-ALL_LINGUAS="ro sk tr"
+ALL_LINGUAS="cs da de es fi fr gl hu id is it ja ko no pl pt pt_BR ro ru sk sl sr sv tr uk"
 
 AC_ISC_POSIX
 
-- 
Gitee


From 71430ac2574dc4b99f3456849bf284298bdafdef Mon Sep 17 00:00:00 2001
From: Jeff Johnson <n3npq@mac.com>
Date: Mon, 19 Jun 2000 22:49:48 +0000
Subject: [PATCH 251/667] Auto-update by menthos@menthos.com

---
 po/sv.po | 21 ++++++++-------------
 1 file changed, 8 insertions(+), 13 deletions(-)

diff --git a/po/sv.po b/po/sv.po
index 6378d9c..c448e80 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -1,23 +1,18 @@
-# SOME DESCRIPTIVE TITLE.
-# Copyright (C) YEAR Free Software Foundation, Inc.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#
-#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
+"Project-Id-Version: popt\n"
 "POT-Creation-Date: 2000-05-31 21:46-0400\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
+"PO-Revision-Date: 2000-06-20 00:07+0200\n"
+"Last-Translator: Christian Rose <menthos@menthos.com>\n"
+"Language-Team: Swedish <sv@li.org>\n"
 "MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=CHARSET\n"
-"Content-Transfer-Encoding: ENCODING\n"
+"Content-Type: text/plain; charset=ISO-8859-1\n"
+"Content-Transfer-Encoding: 8bit\n"
 
 #: popthelp.c:23
 msgid "Show this help message"
-msgstr ""
+msgstr "Visa detta hj�lpmeddelande"
 
 #: popthelp.c:24
 msgid "Display brief usage message"
-msgstr ""
+msgstr "Visa ett kortfattat anv�ndningsmeddelande"
-- 
Gitee


From 296fc684801a0a184b7e6833fadc609325514a60 Mon Sep 17 00:00:00 2001
From: Jeff Johnson <n3npq@mac.com>
Date: Wed, 21 Jun 2000 14:25:06 +0000
Subject: [PATCH 252/667] Auto-update by kmaraas@online.no

---
 po/no.po | 2584 +++++++++++++++++++++++++++++++++++++++++++++++++++++-
 1 file changed, 2573 insertions(+), 11 deletions(-)

diff --git a/po/no.po b/po/no.po
index 6378d9c..ac7aa3c 100644
--- a/po/no.po
+++ b/po/no.po
@@ -1,18 +1,13 @@
-# SOME DESCRIPTIVE TITLE.
-# Copyright (C) YEAR Free Software Foundation, Inc.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#
-#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
+"Project-Id-Version: install 7.0\n"
 "POT-Creation-Date: 2000-05-31 21:46-0400\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
+"PO-Revision-Date: 2000-06-21 16:11+02:00\n"
+"Last-Translator: Kjartan Maraas <kmaraas@online.no>\n"
+"Language-Team: Norwegian <no@li.org>\n"
 "MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=CHARSET\n"
-"Content-Transfer-Encoding: ENCODING\n"
+"Content-Type: text/plain; charset=iso-8859-1\n"
+"Content-Transfer-Encoding: 8-bit\n"
 
 #: popthelp.c:23
 msgid "Show this help message"
@@ -21,3 +16,2570 @@ msgstr ""
 #: popthelp.c:24
 msgid "Display brief usage message"
 msgstr ""
+
+#~ msgid "Formatting"
+#~ msgstr "Formaterer"
+
+#~ msgid "Formatting swap space on /dev/%s..."
+#~ msgstr "Formaterer swap omr�de p� /dev/%s..."
+
+#~ msgid "Error"
+#~ msgstr "Feil"
+
+#~ msgid "Error creating swap on device "
+#~ msgstr "Feil under oppretting av swapomr�de p� enhet "
+
+#~ msgid "Error unmounting %s: %s"
+#~ msgstr "Feil ved avmontering av %s: %s"
+
+#~ msgid "Creating"
+#~ msgstr "Oppretter"
+
+#~ msgid "Creating RAID devices..."
+#~ msgstr "Oppretter RAID enheter..."
+
+#~ msgid "Formatting %s filesystem..."
+#~ msgstr "Formaterer %s filsystem..."
+
+#~ msgid "Loopback"
+#~ msgstr "Loopback"
+
+#~ msgid "Creating loopback filesystem on device /dev/%s..."
+#~ msgstr "Oppretter loopback filsystem p� enhet /dev/%s..."
+
+#~ msgid "Error mounting %s: %s"
+#~ msgstr "Feil under montering av %s: %s"
+
+#~ msgid ""
+#~ "An exceptional condition has occured.  This is most likely a bug.  Please "
+#~ "copy the full text of this exception and file a bug report at "
+#~ "http://bugzilla.redhat.com/bugzilla"
+#~ msgstr ""
+#~ "Et unntak har oppst�tt. Dette er mest sannsynlig en feil. Vennligst kopier "
+#~ "hele teksten fra unntaksmeldingen og send inn en feilrapport p� "
+#~ "http://bugzilla.redhat.com/bugzilla"
+
+#~ msgid "Next"
+#~ msgstr "Neste"
+
+#~ msgid "Back"
+#~ msgstr "Tilbake"
+
+#~ msgid "Show Help"
+#~ msgstr "Vis hjelp"
+
+#~ msgid "Hide Help"
+#~ msgstr "Skjul hjelp"
+
+#~ msgid "Finish"
+#~ msgstr "Fullf�r"
+
+#~ msgid "Online Help"
+#~ msgstr "Online hjelp"
+
+#~ msgid "Language Selection"
+#~ msgstr "Valg av spr�k"
+
+#~ msgid "Red Hat Linux Installer"
+#~ msgstr "Red Hat Linux installasjon"
+
+#~ msgid "Red Hat Linux Install Shell"
+#~ msgstr "Red Hat Linux installasjonsskall"
+
+#~ msgid "Red Hat Linux Installer on %s"
+#~ msgstr "Red Hat Linux installasjon p� %s"
+
+#~ msgid "Red Hat Linux Install Shell on %s"
+#~ msgstr "Red Hat Linux installasjonsskall p� %s"
+
+#~ msgid "Install Window"
+#~ msgstr "Installasjonsvindu"
+
+#~ msgid "Copying File"
+#~ msgstr "Kopierer fil"
+
+#~ msgid "Transferring install image to hard drive..."
+#~ msgstr "Overf�rer installasjonsbildet til harddisken..."
+
+#~ msgid "Change CDROM"
+#~ msgstr "Bytt CDROM"
+
+#~ msgid "Please insert disc %d to continue."
+#~ msgstr "Vennligst sett inn CD %d for � fortsette."
+
+#~ msgid "Wrong CDROM"
+#~ msgstr "Feil CDROM"
+
+#~ msgid "That's not the correct Red Hat CDROM."
+#~ msgstr "Dette er ikke den korrekte Red Hat CDROM'en."
+
+#~ msgid "The CDROM could not be mounted."
+#~ msgstr "Denne CDROM'en kunne ikke monteres."
+
+#~ msgid "Ok"
+#~ msgstr "Ok"
+
+#~ msgid "What language would you like to use during the installation process?"
+#~ msgstr "Hvilket spr�k �nsker du � bruke under installasjonen?"
+
+#~ msgid "/dev/ttyS0 (COM1 under DOS)"
+#~ msgstr "/dev/ttyS0 (COM1 i DOS)"
+
+#~ msgid "/dev/ttyS1 (COM2 under DOS)"
+#~ msgstr "/dev/ttyS1 (COM2 i DOS)"
+
+#~ msgid "/dev/ttyS2 (COM3 under DOS)"
+#~ msgstr "/dev/ttyS2 (COM3 i DOS)"
+
+#~ msgid "/dev/ttyS3 (COM4 under DOS)"
+#~ msgstr "/dev/ttyS3 (COM4 i DOS)"
+
+#~ msgid "Device"
+#~ msgstr "Enhet"
+
+#~ msgid "What device is your mouse located on? %s %i"
+#~ msgstr "Hvilken enhet er musen plassert p�? %s %i"
+
+#~ msgid "OK"
+#~ msgstr "OK"
+
+#~ msgid "Which model mouse is attached to this computer?"
+#~ msgstr "Hvilken mustype brukes p� denne datamaskinen?"
+
+#~ msgid "Emulate 3 Buttons?"
+#~ msgstr "Emul�r 3 knapper?"
+
+#~ msgid "Mouse Selection"
+#~ msgstr "Musvalg"
+
+#~ msgid "Keyboard Selection"
+#~ msgstr "Tastaturvalg"
+
+#~ msgid "Which model keyboard is attached to this computer?"
+#~ msgstr "Hvilken type tastatur brukes p� denne datamaskinen?"
+
+#~ msgid "Upgrade Existing Installation"
+#~ msgstr "Oppgrader eksisterende installasjon"
+
+#~ msgid "Installation Type"
+#~ msgstr "Installasjonstype"
+
+#~ msgid "What type of system would you like to install?"
+#~ msgstr "Hvilken type installasjon �nsker du?"
+
+#~ msgid "You don't have any Linux partitions. You can't upgrade this system!"
+#~ msgstr ""
+#~ "Du har ingen Linux-partisjoner. Du kan ikke oppgradere dette systemet!"
+
+#~ msgid "System to Upgrade"
+#~ msgstr "System som skal oppgraderes"
+
+#~ msgid "What partition holds the root partition of your installation?"
+#~ msgstr "Hvilken partisjon inneholder rotpartisjonen til din installasjon?"
+
+#~ msgid "Customize Packages to Upgrade"
+#~ msgstr "Tilpass pakker som skal oppgraderes"
+
+#~ msgid ""
+#~ "The packages you have installed, and any other packages which are needed to "
+#~ "satisfy their dependencies, have been selected for installation. Would you "
+#~ "like to customize the set of packages that will be upgraded?"
+#~ msgstr ""
+#~ "Pakkene du har installert og eventuelle andre pakker som er n�dvendige for � "
+#~ "tilfredstille deres avhengiheter, er valgt for installasjon. �nsker du � "
+#~ "endre pakkesettet som skal oppgraderes?"
+
+#~ msgid "Yes"
+#~ msgstr "Ja"
+
+#~ msgid "No"
+#~ msgstr "Nei"
+
+#~ msgid "Red Hat Linux"
+#~ msgstr "Red Hat Linux"
+
+#~ msgid ""
+#~ "Welcome to Red Hat Linux!\n"
+#~ "\n"
+#~ "This installation process is outlined in detail in the Official Red Hat "
+#~ "Linux Installation Guide available from Red Hat Software. If you have access "
+#~ "to this manual, you should read the installation section before continuing.\n"
+#~ "\n"
+#~ "If you have purchased Official Red Hat Linux, be sure to register your "
+#~ "purchase through our web site, http://www.redhat.com/."
+#~ msgstr ""
+#~ "Velkommen til Red Hat Linux!\n"
+#~ "\n"
+#~ "Denne installasjonsprosessen er beskrevet i detalj i \"Official Red Hat \n"
+#~ "Linux Installation Guide\", som er tilgjengelig fra Red Hat Software. Hvis "
+#~ "du har\n"
+#~ "tilgang til denne manualen b�r du lese installasjonsdelen f�r du "
+#~ "fortsetter.\n"
+#~ "\n"
+#~ "Hvis du har kj�pt Official Red Hat Linux b�r du registrere kj�pet gjennom "
+#~ "v�rt web-sted, http://www.redhat.com/."
+
+#~ msgid ""
+#~ "Welcome to the Red Hat Linux!\n"
+#~ "\n"
+#~ "You have entered reconfiguration mode, which will allow you to configure "
+#~ "site-specific options of your computer.\n"
+#~ "\n"
+#~ "To exit without changing your setup select the Cancel button below."
+#~ msgstr ""
+#~ "Velkommen til Red Hat Linux!\n"
+#~ "\n"
+#~ "Du har g�tt til rekonfigurasjonsmodus, som lar deg konfigurere "
+#~ "steds-spesifikke alternativer for din maskin.\n"
+#~ "\n"
+#~ "For � avslutte uten � endre oppsettet velg Avbryt knappen under."
+
+#~ msgid "Cancel"
+#~ msgstr "Avbryt"
+
+#~ msgid "X probe results"
+#~ msgstr "Resultater etter X s�k"
+
+#~ msgid "Unlisted Card"
+#~ msgstr "Kort som ikke er listet"
+
+#~ msgid "Video Card Selection"
+#~ msgstr "Valg av grafikk kort"
+
+#~ msgid "Which video card do you have?"
+#~ msgstr "Hvilket grafikk-kort har du?"
+
+#~ msgid "X Server Selection"
+#~ msgstr "Valg av X-tjener"
+
+#~ msgid "Choose a server"
+#~ msgstr "Velg en tjener"
+
+#~ msgid "Installation to begin"
+#~ msgstr "Installasjon som skal starte"
+
+#~ msgid ""
+#~ "A complete log of your installation will be in /tmp/install.log after "
+#~ "rebooting your system. You may want to keep this file for later reference."
+#~ msgstr ""
+#~ "En komplett logg av installasjonen vil befinne seg i /tmp/install.log etter "
+#~ "omstart av systemet. Du vil kanskje beholde denne filen som et "
+#~ "referansepunkt til senere."
+
+#~ msgid "Upgrade to begin"
+#~ msgstr "Oppgradering starter"
+
+#~ msgid ""
+#~ "A complete log of your upgrade will be in /tmp/upgrade.log after rebooting "
+#~ "your system. You may want to keep this file for later reference."
+#~ msgstr ""
+#~ "En komplett logg av oppgraderingen vil befinne seg i /tmp/upgrade.log etter "
+#~ "omstart av systemet. Du vil kanskje beholde denne filen som referanse til "
+#~ "senere."
+
+#~ msgid "Complete"
+#~ msgstr "Ferdig"
+
+#~ msgid ""
+#~ "Congratulations, installation is complete.\n"
+#~ "\n"
+#~ "Press return to reboot, and be sure to remove your boot medium as the system "
+#~ "reboots, or your system will rerun the install. For information on fixes "
+#~ "which are available for this release of Red Hat Linux, consult the Errata "
+#~ "available from http://www.redhat.com/errata.\n"
+#~ "\n"
+#~ "Information on configuring and using your Red Hat Linux system is contained "
+#~ "in the Red Hat Linux manuals."
+#~ msgstr ""
+#~ "Gratulerer, installasjonen er ferdig.\n"
+#~ "\n"
+#~ "Trykk linjeskift for � starte opp p� nytt, og forsikre deg om at oppstarts- "
+#~ "mediet er fjernet f�r maskinen starter p� nytt, ellers vil installasjonen "
+#~ "Starte p� nytt. For informasjon om feilrettinger som er tilgjengelig for "
+#~ "denne utgaven av Red Hat Linux, se errataen som finnes p� "
+#~ "http://www.redhat.com/errata.\n"
+#~ "\n"
+#~ "Informasjon om konfigurasjon av systemet er tilgjengelig i brukerh�ndb�kene "
+#~ "for Red Hat Linux."
+
+#~ msgid ""
+#~ "Congratulations, configuration is complete.\n"
+#~ "\n"
+#~ " For information on fixes which are available for this release of Red Hat "
+#~ "Linux, consult the Errata available from http://www.redhat.com.\n"
+#~ "\n"
+#~ "Information on further configuring your system is available in the post "
+#~ "install chapter of the Official Red Hat Linux User's Guide."
+#~ msgstr ""
+#~ "Gratulerer, konfigurasjonen er ferdig.\n"
+#~ "\n"
+#~ "For informasjon om feilrettinger som er tilgjengelig for denne utgaven av "
+#~ "Red Hat Linux, se errataen som finnes p� http://www.redhat.com.\n"
+#~ "\n"
+#~ "Informasjon om videre konfigurasjon av systemet er tilgjengelig i \"etter "
+#~ "installasjonen\" kapittelet i den offisielle brukermanualen for Red Hat "
+#~ "Linux."
+
+#~ msgid "Package Installation"
+#~ msgstr "Pakkeinstallasjon"
+
+#~ msgid "Name   : "
+#~ msgstr "Navn   : "
+
+#~ msgid "Size   : "
+#~ msgstr "St�rr. : "
+
+#~ msgid "Summary: "
+#~ msgstr "Sammendrag: "
+
+#~ msgid "    Packages"
+#~ msgstr "    Pakker"
+
+#~ msgid "       Bytes"
+#~ msgstr "       Bytes"
+
+#~ msgid "        Time"
+#~ msgstr "        Tid"
+
+#~ msgid "Total    :"
+#~ msgstr "Total    :"
+
+#~ msgid "Completed:   "
+#~ msgstr "Ferdig:      "
+
+#~ msgid "Remaining:  "
+#~ msgstr "Gjenst�r:   "
+
+#~ msgid "Help not available"
+#~ msgstr "Hjelp ikke tilgjengelig"
+
+#~ msgid "No help is available for this install."
+#~ msgstr "Ingen hjelp tilgjengelig for denne installasjonen."
+
+#~ msgid "Exception Occurred"
+#~ msgstr "Unntak oppstod"
+
+#~ msgid "Debug"
+#~ msgstr "Debug"
+
+#~ msgid "Red Hat Linux (C) 2000 Red Hat, Inc."
+#~ msgstr "Red Hat Linux (C) 2000 Red Hat, Inc."
+
+#~ msgid ""
+#~ " <F1> for help> | <Tab> between elements | <Space> selects | <F12> next "
+#~ "screen"
+#~ msgstr ""
+#~ " <F1> for hjelp | <Tab> mellom menyvalg | <Mellomrom> velg | <F12> neste "
+#~ "skjerm"
+
+#~ msgid ""
+#~ "  <Tab>/<Alt-Tab> between elements   |  <Space> selects   |  <F12> next "
+#~ "screen"
+#~ msgstr ""
+#~ "  <Tab>/Alt-Tab> mellom elementer   | <Mellomrom> velger | <F12> neste "
+#~ "skjerm "
+
+#~ msgid "Welcome"
+#~ msgstr "Velkommen"
+
+#~ msgid "Hostname Setup"
+#~ msgstr "Oppsett av vertsnavn"
+
+#~ msgid "Network Setup"
+#~ msgstr "Oppsett av nettverk"
+
+#~ msgid "Time Zone Setup"
+#~ msgstr "Oppsett av tidssone"
+
+#~ msgid "Root Password"
+#~ msgstr "Root-passord"
+
+#~ msgid "User Account Setup"
+#~ msgstr "Oppsett av brukerkonto"
+
+#~ msgid "Authentication"
+#~ msgstr "Autentisering"
+
+#~ msgid "Configuration Complete"
+#~ msgstr "Konfigurasjonen fullf�rt"
+
+#~ msgid "SILO Configuration"
+#~ msgstr "SILO-konfigurasjon"
+
+#~ msgid "LILO Configuration"
+#~ msgstr "LILO-konfigurasjon"
+
+#~ msgid "Partition"
+#~ msgstr "Partisjon"
+
+#~ msgid "Manually Partition"
+#~ msgstr "Manuell partisjonering"
+
+#~ msgid "Automatic Partition"
+#~ msgstr "Automatisk partisjon"
+
+#~ msgid "Root Filesystem Size"
+#~ msgstr "St�rrelse p� rot filsystem"
+
+#~ msgid "Swap"
+#~ msgstr "Swap"
+
+#~ msgid "Filesystem Formatting"
+#~ msgstr "Formatering av filsystem"
+
+#~ msgid "Mouse Configuration"
+#~ msgstr "Konfigurasjon av mus"
+
+#~ msgid "Package Groups"
+#~ msgstr "Pakkegrupper"
+
+#~ msgid "Individual Packages"
+#~ msgstr "Individuelle pakker"
+
+#~ msgid "Package Dependencies"
+#~ msgstr "Pakkeavhengigheter"
+
+#~ msgid "X Configuration"
+#~ msgstr "Konfigurasjon av X"
+
+#~ msgid "Installation Begins"
+#~ msgstr "Installasjonen starter"
+
+#~ msgid "Install System"
+#~ msgstr "Install�r system"
+
+#~ msgid "Boot Disk"
+#~ msgstr "Oppstartsdiskett"
+
+#~ msgid "Installation Complete"
+#~ msgstr "Installasjon ferdig"
+
+#~ msgid "Examine System"
+#~ msgstr "Unders�k system"
+
+#~ msgid "Customize Upgrade"
+#~ msgstr "Tilpass oppgradering"
+
+#~ msgid "Upgrade Begins"
+#~ msgstr "Oppgradering starter"
+
+#~ msgid "Upgrade System"
+#~ msgstr "Oppgrad�r system"
+
+#~ msgid "Upgrade Complete"
+#~ msgstr "Oppgrad�ring ferdig"
+
+#~ msgid "Cancelled"
+#~ msgstr "Avbrutt"
+
+#~ msgid ""
+#~ "I can't go to the previous step from here. You will have to try again."
+#~ msgstr "Kan ikke g� tilbake til forrige steg herfra. Du m� fors�ke igjen."
+
+#~ msgid "Error copying timezone (from %s): %s"
+#~ msgstr "Feil ved kopiering av tidssone (fra %s): %s"
+
+#~ msgid "Creating boot disk..."
+#~ msgstr "Oppretter oppstartsdiskett..."
+
+#~ msgid "Reading"
+#~ msgstr "Leser"
+
+#~ msgid "Reading package information..."
+#~ msgstr "Leser pakkeinformasjon"
+
+#~ msgid "Dependency Check"
+#~ msgstr "Sjekk av avhengigheter"
+
+#~ msgid "Checking dependencies in packages selected for installation..."
+#~ msgstr "Sjekker avhengigheter i pakker valgt for installasjon..."
+
+#~ msgid "no suggestion"
+#~ msgstr "ingen forslag"
+
+#~ msgid "Searching"
+#~ msgstr "S�ker"
+
+#~ msgid "Searching for Red Hat Linux installations..."
+#~ msgstr "Slker etter Red Hat Linux installasjoner..."
+
+#~ msgid "Error mounting ext2 filesystem on %s: %s"
+#~ msgstr "Feil under montering av ext2 filsystem p� %s: %s"
+
+#~ msgid "Finding"
+#~ msgstr "Finner"
+
+#~ msgid "Finding packages to upgrade..."
+#~ msgstr "Finner pakker som skal oppgraderes..."
+
+#~ msgid ""
+#~ "One or more of the filesystems for your Linux system was not unmounted "
+#~ "cleanly. Please boot your Linux installation, let the filesystems be "
+#~ "checked, and shut down cleanly to upgrade."
+#~ msgstr ""
+#~ "Ett eller flere av filsystemene i ditt Linux system ble ikke riktig "
+#~ "avmontert. Vennligst start opp din Linux installasjon, la filsystemene g� "
+#~ "gjennom sjekk, og steng ned p� riktig m�te f�r du pr�ver � oppgradere."
+
+#~ msgid "Rebuild of RPM database failed. You may be out of disk space?"
+#~ msgstr "Gjenoppbygging av RPM databasen feilet. Ikke mer diskplass?"
+
+#~ msgid "Processing"
+#~ msgstr "Arbeider"
+
+#~ msgid "Preparing to install..."
+#~ msgstr "Forbereder installasjon..."
+
+#~ msgid "Upgrading %s.\n"
+#~ msgstr "Oppgraderer %s.\n"
+
+#~ msgid "Installing %s.\n"
+#~ msgstr "Installerer %s.\n"
+
+#~ msgid ""
+#~ "You don't appear to have enough disk space to install the packages you've "
+#~ "selected. You need more space on the following filesystems:\n"
+#~ "\n"
+#~ msgstr ""
+#~ "Det ser ikke ut til at du har nok diskplass til � installere pakkene du har "
+#~ "valgt. Du m� ha mer plass p� de f�lgende filsystemene:\n"
+#~ "\n"
+
+#~ msgid "Mount Point"
+#~ msgstr "Monteringspunkt"
+
+#~ msgid "Space Needed"
+#~ msgstr "N�dvendig plass"
+
+#~ msgid "Disk Space"
+#~ msgstr "Diskplass"
+
+#~ msgid "Post Install"
+#~ msgstr "Etter-installasjon"
+
+#~ msgid "Performing post install configuration..."
+#~ msgstr "Utf�rer etter-installasjons konfigurasjon..."
+
+#~ msgid "Video Card"
+#~ msgstr "Grafikk-kort"
+
+#~ msgid "Video Ram"
+#~ msgstr "Grafikkminne"
+
+#~ msgid "X server"
+#~ msgstr "X-tjener"
+
+#~ msgid "Unable to detect video card"
+#~ msgstr "Kunne ikke finne skjermkort"
+
+#~ msgid "Monitor"
+#~ msgstr "Skjerm"
+
+#~ msgid "Plug and Play Monitor"
+#~ msgstr "Plug and Play skjerm"
+
+#~ msgid "Horizontal frequency range"
+#~ msgstr "Horisontalt frekvensomr�de"
+
+#~ msgid "Vertical frequency range"
+#~ msgstr "Vertikalt frekvensomr�de"
+
+#~ msgid "Account Configuration"
+#~ msgstr "Konfigurasjon av kontoer"
+
+#~ msgid "Root password accepted."
+#~ msgstr "Passord for root godtatt."
+
+#~ msgid "Please enter root password."
+#~ msgstr "Vennligst skriv inn root-passord."
+
+#~ msgid "Root password is too short."
+#~ msgstr "Passord for root er for kort."
+
+#~ msgid "Root passwords do not match."
+#~ msgstr "Root-passordene er ikke like."
+
+#~ msgid "Root account can not be added here."
+#~ msgstr "Root kontoen kan ikke legges til her."
+
+#~ msgid "Please enter user password."
+#~ msgstr "Vennligst skriv inn brukers passord."
+
+#~ msgid "User password is too short."
+#~ msgstr "Brukers passord er for kort."
+
+#~ msgid "User passwords do not match."
+#~ msgstr "Brukerpassordene er ikke like."
+
+#~ msgid "Root Password: "
+#~ msgstr "Passord for root: "
+
+#~ msgid "Confirm: "
+#~ msgstr "Bekreft: "
+
+#~ msgid "Account Name"
+#~ msgstr "Kontonavn"
+
+#~ msgid "Password"
+#~ msgstr "Passord"
+
+#~ msgid "Password (confirm)"
+#~ msgstr "Passord (bekreft)"
+
+#~ msgid "Full Name"
+#~ msgstr "Fullt navn"
+
+#~ msgid "Add"
+#~ msgstr "Legg til"
+
+#~ msgid "Edit"
+#~ msgstr "Rediger"
+
+#~ msgid "Delete"
+#~ msgstr "Slett"
+
+#~ msgid "New"
+#~ msgstr "Ny"
+
+#~ msgid "Authentication Configuration"
+#~ msgstr "Konfigurasjon av autentisering"
+
+#~ msgid "Enable MD5 passwords"
+#~ msgstr "Bruk MD5 passord"
+
+#~ msgid "Enable shadow passwords"
+#~ msgstr "Bruk skyggepassord"
+
+#~ msgid "Enable NIS"
+#~ msgstr "Bruk NIS"
+
+#~ msgid "Use broadcast to find NIS server"
+#~ msgstr "Bruk kringkasting til � finne NIS-tjener"
+
+#~ msgid "NIS Domain: "
+#~ msgstr "NIS-domene: "
+
+#~ msgid "NIS Server: "
+#~ msgstr "NIS-tjener: "
+
+#~ msgid "Bootdisk Creation"
+#~ msgstr "Lag oppstartsdiskett"
+
+#~ msgid ""
+#~ "Please remove the install floppy (if used) and insert a blank floppy in the "
+#~ "first floppy drive. All data on this disk will be erased during creation of "
+#~ "the boot disk."
+#~ msgstr ""
+#~ "Vennligst fjern installasjonsdisketten (hvis brukt) og sett inn en tom "
+#~ "diskett i den f�rste diskettstasjonen. Alle data p� denne disketten vil bli "
+#~ "slettet under oppretting av oppstartsdisketten."
+
+#~ msgid ""
+#~ "An error occured while making the boot disk. Please make sure that there is "
+#~ "a formatted floppy in the first floppy drive."
+#~ msgstr ""
+#~ "En feil oppstod under oppretting av oppstartsdisketten. Vennligst forsikre "
+#~ "deg om at det st�r en formatert diskett i diskettstasjonen."
+
+#~ msgid "Skip boot disk creation"
+#~ msgstr "Hopp over oppstartsdiskett"
+
+#~ msgid "About to Upgrade"
+#~ msgstr "I ferd med � oppgradere"
+
+#~ msgid "About to Install"
+#~ msgstr "Starter installasjonen"
+
+#~ msgid "Click next to begin upgrade of Red Hat Linux."
+#~ msgstr "Klikk neste for � starte oppgradering av Red Hat Linux."
+
+#~ msgid "Click next to begin installation of Red Hat Linux."
+#~ msgstr "Klikk neste for � starte installasjonen av Red Hat Linux."
+
+#~ msgid "Congratulations"
+#~ msgstr "Gratulerer"
+
+#~ msgid "Exit"
+#~ msgstr "Avslutt"
+
+#~ msgid ""
+#~ "Congratulations, configuration is complete.\n"
+#~ "\n"
+#~ "For information on fixes which are available for this release of Red Hat "
+#~ "Linux, consult the Errata available from http://www.redhat.com.\n"
+#~ "\n"
+#~ "Information on further configuring your system is available in the post "
+#~ "install chapter of the Official Red Hat Linux User's Guide."
+#~ msgstr ""
+#~ "Gratulerer, konfigurasjonen er ferdig.\n"
+#~ "\n"
+#~ "For informasjon om feilrettinger som er tilgjengelig for denne utgaven av "
+#~ "Red Hat Linux, se errataen som finnes p� http://www.redhat.com.\n"
+#~ "\n"
+#~ "Informasjon om konfigurasjon av systemet er tilgjengelig i \"etter "
+#~ "installasjonen\" i den offisielle brukermanualen for Red Hat Linux."
+
+#~ msgid "Unresolved Dependencies"
+#~ msgstr "Ul�ste avhengigheter"
+
+#~ msgid "Total install size: %s"
+#~ msgstr "Total st�rrelse for installasjon: %s"
+
+#~ msgid "Package"
+#~ msgstr "Pakke"
+
+#~ msgid "Requirement"
+#~ msgstr "Avhengighet"
+
+#~ msgid "Install packages to satisfy dependencies"
+#~ msgstr "Installer pakker for � tilfredstille avhengigheter"
+
+#~ msgid "Do not install packages that have dependencies"
+#~ msgstr "Ikke installer pakker som har avhengigheter"
+
+#~ msgid "Ignore package dependencies"
+#~ msgstr "Ignor�r pakkeavhengigheter"
+
+#~ msgid "Upgrade Examine"
+#~ msgstr "Sjekk oppgradering"
+
+#~ msgid ""
+#~ "You don't have any Linux partitions.\n"
+#~ " You can't upgrade this sytem!"
+#~ msgstr ""
+#~ "Du har ingen Linux-partisjoner.\n"
+#~ "Du kan ikke oppgradere dette systemet!"
+
+#~ msgid "Customize packages to be upgraded"
+#~ msgstr "Velg pakker som skal oppgraderes"
+
+#~ msgid "fdisk"
+#~ msgstr "fdisk"
+
+#~ msgid "Select drive to run fdisk on"
+#~ msgstr "Velg disk det fdisk skal kj�res p�"
+
+#~ msgid "Choose partitions to Format"
+#~ msgstr "Velg partisjoner som skal formateres"
+
+#~ msgid "Check for bad blocks while formatting"
+#~ msgstr "Sjekk etter d�rlige blokker under formatering"
+
+#~ msgid "Install Type"
+#~ msgstr "Type installasjon"
+
+#~ msgid "Install"
+#~ msgstr "Install�r"
+
+#~ msgid "Upgrade"
+#~ msgstr "Oppgrad�r"
+
+#~ msgid "Keyboard Configuration"
+#~ msgstr "Konfigurasjon av tastatur"
+
+#~ msgid "Model"
+#~ msgstr "Modell"
+
+#~ msgid "Layout"
+#~ msgstr "Utforming"
+
+#~ msgid "Dead Keys"
+#~ msgstr "D�de taster"
+
+#~ msgid "Enable dead keys"
+#~ msgstr "Sl� p� d�de taster"
+
+#~ msgid "Disable dead keys"
+#~ msgstr "Sl� av d�de taster"
+
+#~ msgid "Test your selection here:"
+#~ msgstr "Test ditt valg her:"
+
+#~ msgid "What language should be used during the installation process?"
+#~ msgstr "Hvilket spr�k skal brukes under installasjonen?"
+
+#~ msgid "Lilo Configuration"
+#~ msgstr "LILO-konfigurasjon"
+
+#~ msgid "Type"
+#~ msgstr "Type"
+
+#~ msgid "Install LILO boot record on:"
+#~ msgstr "Install�r oppstartslaster p�:"
+
+#~ msgid "Master Boot Record (MBR)"
+#~ msgstr "Master Boot Record (MBR)"
+
+#~ msgid "First sector of boot partition"
+#~ msgstr "F�rste sektor p� oppstartspartisjonen"
+
+#~ msgid "Use linear mode (needed for some SCSI drives)"
+#~ msgstr "Bruk line�r modus (n�dvendig for noen SCSI-disker)"
+
+#~ msgid "Kernel parameters"
+#~ msgstr "Parametere for kjerne"
+
+#~ msgid "Create boot disk"
+#~ msgstr "Lag oppstartsdiskett"
+
+#~ msgid "Do not install LILO"
+#~ msgstr "Ikke install�r LILO"
+
+#~ msgid "Default"
+#~ msgstr "Standard"
+
+#~ msgid "Partition type"
+#~ msgstr "Partisjonstype"
+
+#~ msgid "Boot label"
+#~ msgstr "Oppstartsetikett"
+
+#~ msgid "Emulate 3 Buttons"
+#~ msgstr "Emuler 3 knapper"
+
+#~ msgid "Network Configuration"
+#~ msgstr "Nettverkskonfigurasjon"
+
+#~ msgid "Configure using DHCP"
+#~ msgstr "Konfigur�r ved bruk av DHCP"
+
+#~ msgid "Activate on boot"
+#~ msgstr "Aktiver ved oppstart"
+
+#~ msgid "IP Address"
+#~ msgstr "IP-adresse"
+
+#~ msgid "Netmask"
+#~ msgstr "Nettmaske"
+
+#~ msgid "Network"
+#~ msgstr "Nettverk"
+
+#~ msgid "Broadcast"
+#~ msgstr "Kringkast"
+
+#~ msgid "Hostname"
+#~ msgstr "Vertsnavn"
+
+#~ msgid "Gateway"
+#~ msgstr "Gateway"
+
+#~ msgid "Primary DNS"
+#~ msgstr "Prim�r DNS"
+
+#~ msgid "Secondary DNS"
+#~ msgstr "Sekund�r DNS"
+
+#~ msgid "Ternary DNS"
+#~ msgstr "Terti�r DNS"
+
+#~ msgid "Individual Package Selection"
+#~ msgstr "Indiviuelt pakkevalg"
+
+#~ msgid "Up"
+#~ msgstr "Opp"
+
+#~ msgid "Name: "
+#~ msgstr "Navn: "
+
+#~ msgid "Package Details"
+#~ msgstr "Pakke"
+
+#~ msgid "Size: "
+#~ msgstr "St�rr.: "
+
+#~ msgid "Select Package For Installation"
+#~ msgstr "Velg pakke for installasjon"
+
+#~ msgid "Total install size: "
+#~ msgstr "Total st�rrelse for installasjon: "
+
+#~ msgid "Package Group Selection"
+#~ msgstr "Valg av pakkegruppe"
+
+#~ msgid "Select individual packages"
+#~ msgstr "Velg individuelle pakker"
+
+#~ msgid "Installing Packages"
+#~ msgstr "Installerer pakker"
+
+#~ msgid "Size"
+#~ msgstr "St�rrelse"
+
+#~ msgid "Summary"
+#~ msgstr "Sammendrag"
+
+#~ msgid "Status"
+#~ msgstr "Status"
+
+#~ msgid "Packages"
+#~ msgstr "Pakker"
+
+#~ msgid "Time"
+#~ msgstr "Tid"
+
+#~ msgid "Total"
+#~ msgstr "Total"
+
+#~ msgid "Completed"
+#~ msgstr "Ferdig"
+
+#~ msgid "Remaining"
+#~ msgstr "Gjenst�r"
+
+#~ msgid "Confirm Partitioning Selection"
+#~ msgstr "Bekreft valg av partisjonering"
+
+#~ msgid "Disk Druid"
+#~ msgstr "Disk Druid"
+
+#~ msgid "Low Memory"
+#~ msgstr "Lite minne"
+
+#~ msgid ""
+#~ "As you don't have much memory in this machine, we need to turn on swap space "
+#~ "immediately. To do this we'll have to write your new partition table to the "
+#~ "disk immediately. Is that okay?"
+#~ msgstr ""
+#~ "Siden du ikke har mye minne p� denne maskinen, m� vi benytte et swap-omr�de "
+#~ "med en gang. For � gj�re dette m� vi skrive den nye partisjonstabellen til "
+#~ "disken n�. Er dette ok?"
+
+#~ msgid ""
+#~ "You've chosen to put your root filesystem in a file on an already-existing "
+#~ "DOS or Windows filesystem. How large, in megabytes, should would you like "
+#~ "the root filesystem to be, and how much swap space would you like? They must "
+#~ "total less then %d megabytes in size."
+#~ msgstr ""
+#~ "Du har valgt � legge rot filsystemet i en fil p� et allerede eksisterende "
+#~ "DOS eller Windows filsystem. Hvor stor, i megabytes, �nsker du at rot "
+#~ "filsystemet skal v�re, og hvor stort swap omr�de �nsker du? Totalt m� dette "
+#~ "v�re mindre enn %d megabytes."
+
+#~ msgid "Root filesystem size:"
+#~ msgstr "St�rrelse p� rot filsystem:"
+
+#~ msgid "Swap space size:"
+#~ msgstr "St�rrelse p� swap omr�de:"
+
+#~ msgid "Automatic Partitioning"
+#~ msgstr "Automatisk partisjonering"
+
+#~ msgid ""
+#~ "%s\n"
+#~ "\n"
+#~ "If you don't want to do this, you can continue with this install by "
+#~ "partitioning manually, or you can go back and perform a fully customized "
+#~ "installation."
+#~ msgstr ""
+#~ "%s\n"
+#~ "\n"
+#~ "Hvis du ikke �nsker � gj�re dette, kan du fortsette denne installasjonen ved "
+#~ "� partisjonere manuelt, eller du kan g� tilbake og utf�re en tilpasset "
+#~ "installasjon."
+
+#~ msgid "Automatic Partitioning Failed"
+#~ msgstr "Automatisk partisjonering feilet"
+
+#~ msgid ""
+#~ "\n"
+#~ "There is not sufficient disk space in order to automatically partition your "
+#~ "disk. You will need to manually partition your disks for Red Hat Linux to "
+#~ "install.\n"
+#~ "\n"
+#~ "Please choose the tool you would like to use to partition your system for "
+#~ "Red Hat Linux."
+#~ msgstr ""
+#~ "\n"
+#~ "Det er ikke tilstrekkelig diskplass for � partisjonere din disk automatisk. "
+#~ "Du vil m�tte partisjonere diskene manuelt for � installere Red Hat Linux.\n"
+#~ "\n"
+#~ "Vennligst velg hvilket verkt�y du vil bruke til � partisjonere ditt system "
+#~ "for Red Hat Linux."
+
+#~ msgid "Manual Partitioning"
+#~ msgstr "Manuell partisjonering"
+
+#~ msgid ""
+#~ "\n"
+#~ "Please choose the tool you would like to use to partition your system for "
+#~ "Red Hat Linux."
+#~ msgstr ""
+#~ "\n"
+#~ "Vennligst velg hvilket verkt�y du vil bruke for � partisjonere ditt system "
+#~ "for Red Hat Linux."
+
+#~ msgid "Automatically partition and REMOVE DATA"
+#~ msgstr "Partisjoner automatisk og FJERN DATA"
+
+#~ msgid "Manually partition with Disk Druid"
+#~ msgstr "Partisjoner manuelt med Disk Druid"
+
+#~ msgid "Manually partition with fdisk [experts only]"
+#~ msgstr "Partisjoner manuelt med fdisk [kun eksperter]"
+
+#~ msgid "Silo Configuration"
+#~ msgstr "Silo-konfigurasjon"
+
+#~ msgid "Install SILO boot record on:"
+#~ msgstr "Install�r SILO oppstartssektor p�:"
+
+#~ msgid "Create PROM alias"
+#~ msgstr "Opprett PROM-alias"
+
+#~ msgid "Set default PROM boot device to linux"
+#~ msgstr "Sett standard PROM oppstartsenhet til linux"
+
+#~ msgid "Do not install SILO"
+#~ msgstr "Ikke installer SILO"
+
+#~ msgid "Time Zone Selection"
+#~ msgstr "Valg av tidssone"
+
+#~ msgid "View:"
+#~ msgstr "Vis:"
+
+#~ msgid "System clock uses UTC"
+#~ msgstr "Systemklokken bruker UTC"
+
+#~ msgid "Use Daylight Saving Time (US only)"
+#~ msgstr "Bruk \"Daylight Saving Time\""
+
+#~ msgid "Location"
+#~ msgstr "Arbeidsstasjon"
+
+#~ msgid "UTC Offset"
+#~ msgstr "Forskyvning fra UTC"
+
+#~ msgid "Would you like to configure your system?"
+#~ msgstr "Vil du konfigurere systemet ditt?"
+
+#~ msgid "Horizontal Frequency Range"
+#~ msgstr "Horisontalt frekvensomr�de"
+
+#~ msgid "Vertical Frequency Range"
+#~ msgstr "Vertikalt frekvensomr�de"
+
+#~ msgid "Test failed"
+#~ msgstr "Testen feilet"
+
+#~ msgid "Customize X Configuration"
+#~ msgstr "Tilpass konfigurasjon av X"
+
+#~ msgid "Bits per Pixel"
+#~ msgstr "Biter pr. piksel"
+
+#~ msgid "Test this configuration"
+#~ msgstr "Test denne konfigurasjonen"
+
+#~ msgid "Monitor Configuration"
+#~ msgstr "Skjermkonfigurasjon"
+
+#~ msgid "Horizontal Sync"
+#~ msgstr "Horisontal synkronisering"
+
+#~ msgid "Vertical Sync"
+#~ msgstr "Vertikal synkronisering"
+
+#~ msgid ""
+#~ "Your video ram size can not be autodetected.  Choose your video ram size "
+#~ "from the choices below:"
+#~ msgstr ""
+#~ "Mengden videominne kunne ikke finnes av autos�k. Velg mengden videoram fra "
+#~ "listen under:"
+
+#~ msgid ""
+#~ "In most cases your video hardware can be probed to automatically determine "
+#~ "the best settings for your display."
+#~ msgstr ""
+#~ "I de fleste tilfeller kan grafikk-maskinvaren finnes automatisk for � "
+#~ "bestemme de beste innstillingene for din skjerm."
+
+#~ msgid ""
+#~ "If the probed settings do not match your hardware select the correct setting "
+#~ "below:"
+#~ msgstr ""
+#~ "Hvis innstillingene fra autos�k ikke er riktig for din maskinvare, velg de "
+#~ "riktige innstillingene under:"
+
+#~ msgid "Autoprobe results:"
+#~ msgstr "Resultater etter autos�k:"
+
+#~ msgid "Use Graphical Login"
+#~ msgstr "Bruk grafisk p�logging"
+
+#~ msgid "Skip X Configuration"
+#~ msgstr "Hopp over konfigurasjon av X"
+
+#~ msgid ""
+#~ "A custom boot disk provides a way of booting into your Linux system without "
+#~ "depending on the normal bootloader. This is useful if you don't want to "
+#~ "install lilo on your system, another operating system removes lilo, or lilo "
+#~ "doesn't work with your hardware configuration. A custom boot disk can also "
+#~ "be used with the Red Hat rescue image, making it much easier to recover from "
+#~ "severe system failures.\n"
+#~ "\n"
+#~ "Would you like to create a boot disk for your system?"
+#~ msgstr ""
+#~ "En egendefinert oppstartsdiskett gir deg en m�te � starte opp ditt Linux "
+#~ "system uten � v�re avhengig av oppstartslasteren. Dette er nyttig hvis du "
+#~ "ikke �nsker � installere lilo p� systemet, et annet operativsystem fjerner "
+#~ "lilo, eller hvis lilo ikke virker med din maskinvarekonfigurasjon. En "
+#~ "egendefinert oppstartsdiskett kan ogs� brukes med Red Hats redningsdisk, og "
+#~ "gj�r det mye lettere � rette opp alvorlige systemfeil.\n"
+#~ "\n"
+#~ "�nsker du � lage en oppstartsdiskett for ditt system?"
+
+#~ msgid ""
+#~ "\n"
+#~ "On SMCC made Ultra machines floppy booting probably does not work\n"
+#~ "\n"
+#~ msgstr ""
+#~ "\n"
+#~ "P� Ultra maskiner laget av SMCC, virker sannsynligvis ikke oppstart fra "
+#~ "diskett.\n"
+
+#~ msgid "Bootdisk"
+#~ msgstr "Oppstartsdiskett"
+
+#~ msgid ""
+#~ "If you have the install floppy in your drive, first remove it. Then insert a "
+#~ "blank floppy in the first floppy drive. All data on this disk will be erased "
+#~ "during creation of the boot disk."
+#~ msgstr ""
+#~ "Hvis du har installasjonsdisketten i stasjonen, fjern denne f�rst. Sett s� "
+#~ "inn en tom diskett i den f�rste diskettstasjonen. Alle data p� denne "
+#~ "disketten vil bli slettet under oppretting av oppstartsdisketten."
+
+#~ msgid "Skip"
+#~ msgstr "Hopp over"
+
+#~ msgid ""
+#~ "A few systems will need to pass special options to the kernel at boot time "
+#~ "for the system to function properly. If you need to pass boot options to the "
+#~ "kernel, enter them now. If you don't need any or aren't sure, leave this "
+#~ "blank."
+#~ msgstr ""
+#~ "For noen f� systemer kan det v�re n�dvendig � gi spesielle flagg til kjernen "
+#~ "ved oppstart for at systemet skal fungere ordentlig. Hvis du trenger � gi "
+#~ "oppstartsflagg til kjernen, skriv dem inn n�. Hvis du ikke trenger dette, "
+#~ "eller ikke er sikker, kan du la dette st� tomt."
+
+#~ msgid "Where do you want to install the bootloader?"
+#~ msgstr "Hvor vil du installere oppstartslasteren?"
+
+#~ msgid "Clear"
+#~ msgstr "Slett"
+
+#~ msgid "Edit Boot Label Please"
+#~ msgstr "Vennligst rediger oppstartsetikett"
+
+#~ msgid "Invalid Boot Label"
+#~ msgstr "Ugyldig oppstartsetikett"
+
+#~ msgid "Boot label may not be empty."
+#~ msgstr "Oppstartsetiketten kan ikke v�re tom."
+
+#~ msgid "Boot labels cannot contain space(s)."
+#~ msgstr "Oppstartsetiketter kan ikke inneholde mellomrom."
+
+#~ msgid ""
+#~ "The boot manager Red Hat uses can boot other operating systems as well. You "
+#~ "need to tell me what partitions you would like to be able to boot and what "
+#~ "label you want to use for each of them.\n"
+#~ "\n"
+#~ msgstr ""
+#~ "Oppstartslasteren som brukes av Red Hat kan starte andre operativsystemer "
+#~ "ogs�. Du m� fortelle hvilke partisjoner du �nsker � starte andre systemer "
+#~ "fra og hvilken etikett du vil gi hver av dem.\n"
+
+#~ msgid "Use bootp/dhcp"
+#~ msgstr "Bruk bootp/dhcp"
+
+#~ msgid "IP address:"
+#~ msgstr "IP-adresse:"
+
+#~ msgid "Netmask:"
+#~ msgstr "Nettmaske:"
+
+#~ msgid "Default gateway (IP):"
+#~ msgstr "Standard gateway (IP):"
+
+#~ msgid "Primary nameserver:"
+#~ msgstr "Prim�r navnetjener:"
+
+#~ msgid "Invalid information"
+#~ msgstr "Ugyldig informasjon"
+
+#~ msgid "You must enter valid IP information to continue"
+#~ msgstr "Du m� skrive inn gyldig IP-informasjon for � fortsette"
+
+#~ msgid "Hostname Configuration"
+#~ msgstr "Konfigurasjon av vertsnavn"
+
+#~ msgid ""
+#~ "The hostname is the name of your computer.  If your computer is attached to "
+#~ "a network, this may be assigned by your network administrator."
+#~ msgstr ""
+#~ "Vertsnavnet er navnet p� din datamaskin.  Hvis datamaskinen er tilknyttet et "
+#~ "nettverk, er det mulig at dette oppgis av din nettverksadministrator."
+
+#~ msgid "Package :"
+#~ msgstr "Pakke  :"
+
+#~ msgid "Size    :"
+#~ msgstr "St�rr. :"
+
+#~ msgid "Total size"
+#~ msgstr "Total st�rrelse"
+
+#~ msgid ""
+#~ "   <Space>,<+>,<-> selection   |   <F1> help   |   <F2> package description"
+#~ msgstr ""
+#~ "   <Mellomrom>,<+>,<-> valg    |   <F1 hjelp   |   <F2> pakkebeskrivelse"
+
+#~ msgid ""
+#~ "Some of the packages you have selected to install require packages you have "
+#~ "not selected. If you just select Ok all of those required packages will be "
+#~ "installed."
+#~ msgstr ""
+#~ "Noen av pakkene du har valgt � installere trenger pakker som ikke er valgt. "
+#~ "Hvis du bare velger Ok vil alle de n�dvendige pakkene bli installert."
+
+#~ msgid "Disk Setup"
+#~ msgstr "Diskoppsett"
+
+#~ msgid ""
+#~ "Disk Druid is a tool for partitioning and setting up mount points. It is "
+#~ "designed to be easier to use than Linux's traditional disk partitioning "
+#~ "sofware, fdisk, as well as more powerful. However, there are some cases "
+#~ "where fdisk may be preferred.\n"
+#~ "\n"
+#~ "Which tool would you like to use?"
+#~ msgstr ""
+#~ "Disk Druid er et verkt�y for partisjonering og oppsett av monteringspunkter. "
+#~ "Det er laget for � v�re lettere � bruke enn Linux's tradisjonelle disk- "
+#~ "partisjoneringsprogramvare, fdisk, i tillegg til � v�re kraftigere. Likevel "
+#~ "finnes det tilfeller hvor fdisk kan v�re � foretrekke.\n"
+#~ "\n"
+#~ "Hvilket verkt�y vil du bruke?"
+
+#~ msgid ""
+#~ "To install Red Hat Linux, you must have at least one partition of 150 MB "
+#~ "dedicated to Linux. We suggest placing that partition on one of the first "
+#~ "two hard drives in your system so you can boot into Linux with LILO."
+#~ msgstr ""
+#~ "For � installere Red Hat Linux m� du ha minst �n partisjon p� 150 MB "
+#~ "dedikert til Linux. Vi foresl�r at du plasserer den partisjonen p� en av de "
+#~ "f�rste to harddiskene i systemet ditt, slik at du kan bruke LILO til � "
+#~ "starte opp Linux."
+
+#~ msgid "Done"
+#~ msgstr "Ferdig"
+
+#~ msgid "Continue"
+#~ msgstr "Fortsett"
+
+#~ msgid "Manually partition"
+#~ msgstr "Manuell partisjonering"
+
+#~ msgid ""
+#~ "What partitions would you like to format? We strongly suggest formatting all "
+#~ "of the system partitions, including /, /usr, and /var. There is no need to "
+#~ "format /home or /usr/local if they have already been configured during a "
+#~ "previous install."
+#~ msgstr ""
+#~ "Hvilke partisjoner �nsker du � formatere? Vi vil p� det sterkeste anbefale � "
+#~ "formatere alle systempartisjonene, inkludert /, /usr, og /var. Det er ikke "
+#~ "n�dvendig � formatere /home eller /usr/local hvis de allerede har blitt "
+#~ "konfigurert ved en tildligere installasjon."
+
+#~ msgid "Check for bad blocks during format"
+#~ msgstr "Sjekk etter d�rlige blokker under formatering"
+
+#~ msgid "Choose Partitions to Format"
+#~ msgstr "Velg partisjoner som skal formateres"
+
+#~ msgid "Root filesystem size"
+#~ msgstr "St�rrelse p� rot filsystem"
+
+#~ msgid "Swap space"
+#~ msgstr "Swap omr�de"
+
+#~ msgid "Bad Size"
+#~ msgstr "Ugyldig st�rrelse"
+
+#~ msgid "The size you enter must be a number."
+#~ msgstr "St�rrelsen du oppgir m� v�re et tall."
+
+#~ msgid ""
+#~ "The total size must be smaller then the amount of free space on the disk, "
+#~ "which is %d megabytes."
+#~ msgstr ""
+#~ "Total st�rrelse m� v�re mindre enn mengden ledig plass p� disken, som er %d "
+#~ "megabytes."
+
+#~ msgid ""
+#~ "Neither the root file system size nor the swap space size may be greater "
+#~ "then 2000 megabytes."
+#~ msgstr ""
+#~ "Hverken rot-filsystemet eller swapomr�det kan v�re st�rre enn 2000 megabyte."
+
+#~ msgid "Create PROM alias `linux'"
+#~ msgstr "Lag PROM-alias `linux'"
+
+#~ msgid "Set default PROM boot device"
+#~ msgstr "Sett standard PROM oppstartsenhet"
+
+#~ msgid "Edit Boot Label"
+#~ msgstr "Rediger oppstartsetikett"
+
+#~ msgid ""
+#~ "The boot manager Red Hat uses can boot other operating systems as well. You "
+#~ "need to tell me what partitions you would like to be able to boot and what "
+#~ "label you want to use for each of them."
+#~ msgstr ""
+#~ "Oppstartslasteren som brukes av Red Hat kan starte andre operativsystemer "
+#~ "ogs�. Du m� fortelle hvilke partisjoner du �nsker � starte andre systemer "
+#~ "fra og hvilket navn du vil gi hver av dem."
+
+#~ msgid "What time zone are you located in?"
+#~ msgstr "Hvilken tidssone befinner du deg i?"
+
+#~ msgid "Hardware clock set to GMT?"
+#~ msgstr "Maskinvareklokken satt til GMT?"
+
+#~ msgid ""
+#~ "Pick a root password. You must type it twice to ensure you know what it is "
+#~ "and didn't make a mistake in typing. Remember that the root password is a "
+#~ "critical part of system security!"
+#~ msgstr ""
+#~ "Velg et root-passord. Du m� skrive det inn to ganger for � v�re sikker p� at "
+#~ "du vet hva det er og at du ikke gjorde en skrivefeil. Husk at root-passordet "
+#~ "er kritisk for systemsikkerheten!"
+
+#~ msgid "Password:"
+#~ msgstr "Passord:"
+
+#~ msgid "Password (again):"
+#~ msgstr "Passord (igjen):"
+
+#~ msgid "Password Length"
+#~ msgstr "Passordlengde"
+
+#~ msgid "The root password must be at least 6 characters long."
+#~ msgstr "Root-passordet m� v�re minst 6 tegn langt."
+
+#~ msgid "Password Mismatch"
+#~ msgstr "Passordene er ikke like"
+
+#~ msgid "The passwords you entered were different. Please try again."
+#~ msgstr "Passordene du skrev inn var forskjellige. Vennligst fors�k igjen."
+
+#~ msgid "Edit User"
+#~ msgstr "Redig�r bruker"
+
+#~ msgid "Add User"
+#~ msgstr "Legg til bruker"
+
+#~ msgid "User ID"
+#~ msgstr "Bruker-ID:"
+
+#~ msgid "Bad User ID"
+#~ msgstr "Ugyldig bruker-ID"
+
+#~ msgid ""
+#~ "User IDs must be less than 8 characters and contain only characters A-Z, "
+#~ "a-z, and 0-9."
+#~ msgstr ""
+#~ "Bruker-IDer m� v�re mindre enn 8 tegn og kan kun inneholde tegnene A-Z, a-z "
+#~ "og 0-9."
+
+#~ msgid "Missing User ID"
+#~ msgstr "Manglende bruker-ID"
+
+#~ msgid "You must provide a user ID"
+#~ msgstr "Du m� oppgi en bruker-ID"
+
+#~ msgid "The password must be at least 6 characters long."
+#~ msgstr "Passordet m� best� av minst 6 tegn."
+
+#~ msgid "User Exists"
+#~ msgstr "Brukeren eksisterer"
+
+#~ msgid ""
+#~ "The root user is already configured. You don't need to add this user here."
+#~ msgstr ""
+#~ "Root brukeren er allerede konfigurert. Du trenger ikke � legge til denne "
+#~ "brukeren her."
+
+#~ msgid "This user id already exists.  Choose another."
+#~ msgstr "Denne brukeren eksisterer allerede. Velg en annen."
+
+#~ msgid ""
+#~ "You should use a normal user account for most activities on your system. By "
+#~ "not using the root account casually, you'll reduce the chance of disrupting "
+#~ "your system's configuration."
+#~ msgstr ""
+#~ "Du b�r bruke en vanlig brukerkonto for de fleste aktivitetene p� systemet "
+#~ "ditt Ved � ikke bruke root kontoen reduserer du sjansene for � �delegge "
+#~ "systemets konfigurasjon."
+
+#~ msgid ""
+#~ "What user account would you like to have on the system? You should have at "
+#~ "least one non-root account for normal work, but multi-user systems can have "
+#~ "any number of accounts set up."
+#~ msgstr ""
+#~ "Hvilken brukerkonto �nsker du � ha p� systemet? Du b�r ha minst en konto ved "
+#~ "siden av root for vanlig arbeid, men flerbrukersystemer kan ha mange kontoer "
+#~ "satt opp."
+
+#~ msgid "User name"
+#~ msgstr "Brukernavn"
+
+#~ msgid "Enter the information for the user."
+#~ msgstr "Skriv inn informasjon om brukeren."
+
+#~ msgid "Change the information for this user."
+#~ msgstr "Endre informasjonen om denne brukeren."
+
+#~ msgid "Use Shadow Passwords"
+#~ msgstr "Bruk skyggepassord"
+
+#~ msgid "Enable MD5 Passwords"
+#~ msgstr "Bruk MD5-passord"
+
+#~ msgid "NIS Domain:"
+#~ msgstr "NIS-domene:"
+
+#~ msgid "NIS Server:"
+#~ msgstr "NIS-tjener:"
+
+#~ msgid "or use:"
+#~ msgstr "eller bruk:"
+
+#~ msgid "Request server via broadcast"
+#~ msgstr "Foresp�r tjener via kringkasting"
+
+#~ msgid "Bad Mount Point"
+#~ msgstr "Ugyldig monteringspunkt"
+
+#~ msgid "The %s directory must be on the root filesystem."
+#~ msgstr "Katalogen %s m� v�re p� rotfilsystemet."
+
+#~ msgid ""
+#~ "The mount point %s is illegal.\n"
+#~ "\n"
+#~ "Mount points must begin with a leading /."
+#~ msgstr ""
+#~ "Monteringspunktet %s er ugyldig.\n"
+#~ "\n"
+#~ "Monteringspunkter m� begynne med \"/\"."
+
+#~ msgid ""
+#~ "The mount point %s is illegal.\n"
+#~ "\n"
+#~ "Mount points may not end with a /."
+#~ msgstr ""
+#~ "Monteringspunktet %s er ugyldig.\n"
+#~ "\n"
+#~ "Monteringspunkter kan ikke slutte med \"/\"."
+
+#~ msgid ""
+#~ "The mount point %s is illegal.\n"
+#~ "\n"
+#~ "Mount points may only printable characters."
+#~ msgstr ""
+#~ "Monteringspunktet %s er ugyldig.\n"
+#~ "\n"
+#~ "Monteringpunkt kan bare inneholde skrivbare tegn."
+
+#~ msgid ""
+#~ "You've asked to put your root (/) filesystem on a DOS-style FAT partition. "
+#~ "You can do this, but you may not use any other filesystems for your Linux "
+#~ "system. Additionally, there will be a speed penalty for not using "
+#~ "Linux-native partitions. Do you want to continue?"
+#~ msgstr ""
+#~ "Du har bedt om � legge rot (/) filsystemet p� en DOS-stil FAT partisjon. Du "
+#~ "kan gj�re dette, men du vil ikke kunne bruke andre filsystemer for ditt "
+#~ "Linux system. I tillegg vil det g� utover ytelsen n�r du ikke bruker Linux "
+#~ "partisjoner. Vil du fortsette?"
+
+#~ msgid ""
+#~ "The mount point %s is illegal.\n"
+#~ "\n"
+#~ "System partitions must be on Linux Native partitions."
+#~ msgstr ""
+#~ "Monteringspunktet %s er ugyldig.\n"
+#~ "\n"
+#~ "Systempartisjoner m� ligge p� Linux Native-partisjoner."
+
+#~ msgid "On this platform, /boot must be on a DOS-compatible filesystem %x."
+#~ msgstr ""
+#~ "P� denne plattformen m� /boot v�re p� et DOS kompatibelt filsystem %x."
+
+#~ msgid ""
+#~ "The mount point %s is illegal.\n"
+#~ "\n"
+#~ "/usr must be on a Linux Native partition or an NFS volume."
+#~ msgstr ""
+#~ "Monteringspunktet %s er ugyldig.\n"
+#~ "\n"
+#~ "/usr m� ligge p� en Linux Native-partisjon eller et NFS-volum."
+
+#~ msgid "Too Many Drives"
+#~ msgstr "For mange disker"
+
+#~ msgid ""
+#~ "You have more drives than this program supports. Please use the standard "
+#~ "fdisk program to setup your drives and please notify Red Hat Software that "
+#~ "you saw this message."
+#~ msgstr ""
+#~ "Du har flere disker enn dette programmet st�tter. Vennligst bruk fdisk- "
+#~ "programmet til � sette opp diskene dine og informer Red Hat Software om "
+#~ "denne meldingen."
+
+#~ msgid "Error Creating Device Nodes"
+#~ msgstr "Feil under oppretting av enhetsnoder"
+
+#~ msgid ""
+#~ "An error has occurred why trying to create device nodes for the hard drives "
+#~ "in your system.  This may be because you have run out of disk space on the "
+#~ "/tmp partition."
+#~ msgstr ""
+#~ "En feil har oppst�tt under fors�k p� � opprette enhetsnoder for harddiskene "
+#~ "i ditt system. Dette kan v�re for�rsaket av at du har g�tt tom for diskplass "
+#~ "p� /tmp partisjonen."
+
+#~ msgid "No Drives Found"
+#~ msgstr "Ingen stasjoner funnet"
+
+#~ msgid ""
+#~ "An error has occurred - no valid devices were found on which to create new "
+#~ "filesystems.  Please check your hardware for the cause of this problem."
+#~ msgstr ""
+#~ "En feil har oppst�tt - ingen gyldige enheter for oppretting av filsystemer "
+#~ "ble funnet. Vennligst sjekk maskinvaren din for � finne �rsaken til dette."
+
+#~ msgid ""
+#~ "An error occurred reading the partition table for the block device %s.  The "
+#~ "error was"
+#~ msgstr ""
+#~ "En feil oppstod under lesing av partisjonstabellen for blokkenhet %s. Feilen "
+#~ "var"
+
+#~ msgid ""
+#~ "The partition table on device %s is corrupted.  To create new partitions it "
+#~ "must be initialized, causing the loss of ALL DATA on this drive."
+#~ msgstr ""
+#~ "Partisjonstabellen p� enhet %s er korrupt. For � opprette nye partisjoner m� "
+#~ "denne initialiseres. Dette medf�rer tap av ALLE DATA p� denne disken."
+
+#~ msgid "Bad Partition Table"
+#~ msgstr "Ugyldig partisjonstabell"
+
+#~ msgid "Initialize"
+#~ msgstr "Initialis�r"
+
+#~ msgid "Skip Drive"
+#~ msgstr "Hopp over stasjon"
+
+#~ msgid "Retry"
+#~ msgstr "Pr�v igjen"
+
+#~ msgid "BSD Disklabel"
+#~ msgstr "BSD-disketikett"
+
+#~ msgid ""
+#~ "A disk with a BSD disklabel has been found. The Red Hat installation only "
+#~ "supports BSD Disklabels in read-only mode, so you must use a custom install "
+#~ "and fdisk (instead of Disk Druid) for machines with BSD Disklabels."
+#~ msgstr ""
+#~ "En disk med en BSD-disketikett ble funnet. Red Hat installasjonen st�tter "
+#~ "bare BSD-disketiketter i skrivebeskyttet modus, s� du m� bruke en spesiell "
+#~ "installasjonsdisk og fdisk (i stedet for Disk Druid) for maskiner med BSD- "
+#~ "disketiketter."
+
+#~ msgid "System error %d"
+#~ msgstr "Systemfeil %d"
+
+#~ msgid "Fdisk Error"
+#~ msgstr "Fdisk-feil"
+
+#~ msgid "<Swap Partition>"
+#~ msgstr "<Swap-partisjon>"
+
+#~ msgid "<RAID Partition>"
+#~ msgstr "<RAID-partisjon>"
+
+#~ msgid "Delete Partition"
+#~ msgstr "Slett partisjon"
+
+#~ msgid "Are you sure you want to delete this partition?"
+#~ msgstr "Er du sikker p� at du vil slette denne partisjonen?"
+
+#~ msgid "Cannot Edit Partitions"
+#~ msgstr "Kan ikke redigere partisjoner"
+
+#~ msgid ""
+#~ "You have defined the '/' filesystem on a non-ext2 partition, so you cannot "
+#~ "edit other partitions."
+#~ msgstr ""
+#~ "Du har definert '/' filsystemet p� en partisjon av en annen type enn ext2. "
+#~ "Du kan derfor ikke redigere andre partisjoner."
+
+#~ msgid "Edit Partition"
+#~ msgstr "Redig�r partisjon"
+
+#~ msgid "Mount Point:"
+#~ msgstr "Monteringspunkt:"
+
+#~ msgid "Size (Megs):"
+#~ msgstr "St�rrelse (MB):"
+
+#~ msgid "Use remaining space?"
+#~ msgstr "Bruk gjenv�rende plass?"
+
+#~ msgid "Allocation Status:"
+#~ msgstr "Allokeringsstatus:"
+
+#~ msgid "Successful"
+#~ msgstr "Fullf�rt"
+
+#~ msgid "Failed"
+#~ msgstr "Feilet"
+
+#~ msgid "Failure Reason:"
+#~ msgstr "Feil�rsak:"
+
+#~ msgid "Partition Type:"
+#~ msgstr "Partisjonstype:"
+
+#~ msgid "Allowable Drives:"
+#~ msgstr "Tillatte stasjoner:"
+
+#~ msgid "No Mount Point"
+#~ msgstr "Ingen monteringspunkt"
+
+#~ msgid ""
+#~ "You have not selected a mount point for this partition. Are you sure you "
+#~ "want to do this?"
+#~ msgstr ""
+#~ "Du har ikke valgt et monteringspunkt for denne partisjonen. Er du sikker p� "
+#~ "at du �nsker � gj�re dette?"
+
+#~ msgid "Mount Point Error"
+#~ msgstr "Feil ved monteringspunkt"
+
+#~ msgid ""
+#~ "You have tried to assign the '/' mount point to a FAT-style partition.  You "
+#~ "cannot do this now because mount points have been assigned to ext2 "
+#~ "partitions also.  Clear those mount points and then you will be able to "
+#~ "assign '/' to this partition."
+#~ msgstr ""
+#~ "Du har fors�kt � tildele '/' monteringspunktet til en FAT-partisjon. Du kan "
+#~ "ikke gj�re dette n� fordi monteringspunkter er satt opp for ext2 partisjoner "
+#~ "ogs�. Fjern disse monteringspunktene, s� vil du kunne tildele '/' til denne "
+#~ "partisjonen."
+
+#~ msgid ""
+#~ "The mount point requested is either an illegal path or is already in use. "
+#~ "Please select a valid mount point."
+#~ msgstr ""
+#~ "Monteringspunktet som ble forespurt er enten en ugyldig sti eller det er "
+#~ "allerede i bruk. Vennligst velg et gyldig monteringspunkt."
+
+#~ msgid "Size Error"
+#~ msgstr "Feil ved st�rrelse"
+
+#~ msgid ""
+#~ "The size requested is illegal. Make sure the size is greater and zero (0), "
+#~ "and is specified int decimal (base 10) format."
+#~ msgstr ""
+#~ "St�rrelsen du ba om er ugyldig. S�rg for at st�rrelsen er st�rre enn null "
+#~ "(0), og at den er spesifisert i desimal format (base 10)."
+
+#~ msgid "Swap Size Error"
+#~ msgstr "Feil ved st�rrelse p� swap"
+
+#~ msgid ""
+#~ "You have created a swap partition which is too large. The maximum size of a "
+#~ "swap partition is %ld Megabytes."
+#~ msgstr ""
+#~ "Du har opprettet en swap-partisjon som er for stor. Maksimal st�rrelse p� en "
+#~ "swap-partisjon er %ld Megabyte."
+
+#~ msgid "No RAID Drive Constraint"
+#~ msgstr "Ingen begrensning p� RAID stasjon"
+
+#~ msgid ""
+#~ "You have configured a RAID partition without constraining the partition to a "
+#~ "single drive.\n"
+#~ " Are you sure you want to do this?"
+#~ msgstr ""
+#~ "Du har konfigurert en RAID partisjon uten � begrense partisjonen til en "
+#~ "enkelt stasjon.\n"
+#~ " Er du sikker p� at du vil gj�re dette?"
+
+#~ msgid "Close"
+#~ msgstr "Lukk"
+
+#~ msgid ""
+#~ "You have configured a RAID partition without constraining the partition to a "
+#~ "single drive. Please select one drive to constrain this partition to."
+#~ msgstr ""
+#~ "Du har konfigurert en RAID-partisjon uten � begrense partisjonen til en "
+#~ "enkelt disk. Vennligst velg en disk � begrense denne partisjonen til."
+
+#~ msgid "Cannot Add Partitions"
+#~ msgstr "Kan ikke legge til partisjoner"
+
+#~ msgid ""
+#~ "You have defined the '/' filesystem on a non-ext2 partition, so you cannot "
+#~ "add other partitions."
+#~ msgstr ""
+#~ "Du har definert '/' filsystemet p� en partisjon av en annen type enn ext2 Du "
+#~ "kan derfor ikke legge til andre partisjoner."
+
+#~ msgid "RAID Entry Incomplete"
+#~ msgstr "RAID-oppf�ringen er ikke komplett"
+
+#~ msgid ""
+#~ "The raid device /dev/%s now contains partitions which are unallocated. The "
+#~ "raid device /dev/%s will now be decomposed into its component partitions. "
+#~ "Please recompose the raid device with allocated partitions."
+#~ msgstr ""
+#~ "RAID-enheten /dev/%s inneholder n� ikke-allokerte partisjoner. RAID-enheten "
+#~ "/dev/%s vil n� deles opp i sine enkeltkomponenter. Vennligst sett sammen "
+#~ "RAID-enheten p� nytt med de allokerte partisjonene."
+
+#~ msgid "Unallocated Partitions"
+#~ msgstr "Ikke-allokerte partisjoner"
+
+#~ msgid ""
+#~ "There are currently unallocated partition(s) present in the list of "
+#~ "requested partitions. The unallocated partition(s) are shown below, along "
+#~ "with the reason they were not allocated."
+#~ msgstr ""
+#~ "Det finnes ikke-allokerte partisjoner i listen over forespurte partisjoner. "
+#~ "De ikke-allokerte partisjonene vises under, sammen med grunnen til at de "
+#~ "ikke ble allokert."
+
+#~ msgid "Cannot Edit Raid"
+#~ msgstr "Kan ikke redigere RAID"
+
+#~ msgid ""
+#~ "You have defined the '/' filesystem on a non-ext2 partition, so you cannot "
+#~ "edit RAID devices."
+#~ msgstr ""
+#~ "Du har definert '/' filsystemet p� en partisjon av en annen type enn ext2. "
+#~ "Du kan derfor ikke redigere RAID-enheter."
+
+#~ msgid "<Swap Partition"
+#~ msgstr "<Swap-partisjon"
+
+#~ msgid "RAID Device: /dev/"
+#~ msgstr "RAID-enhet: /dev/"
+
+#~ msgid "RAID Type:"
+#~ msgstr "RAID-type:"
+
+#~ msgid "Partitions For RAID Array:"
+#~ msgstr "Partisjoner for RAID-disk:"
+
+#~ msgid "You have not selected a mount point. A mount point is required."
+#~ msgstr "Du har ikke valgt et monteringspunkt. Dette er p�krevd."
+
+#~ msgid ""
+#~ "The mount point requested is already in use. Please select a valid mount "
+#~ "point."
+#~ msgstr ""
+#~ "Monteringspunktet som ble forespurt er allerede i bruk. Vennligst velg et "
+#~ "gyldig monteringspunkt."
+
+#~ msgid ""
+#~ "The bootable raid device can only include partitions from the first two "
+#~ "drives on your system.\n"
+#~ "\n"
+#~ "These drives are: "
+#~ msgstr ""
+#~ "Den oppstartbare RAID-enheten kan kun inkludere partisjoner fra de to f�rste "
+#~ "diskene i systemet.\n"
+#~ "\n"
+#~ "Det er disse diskene:"
+
+#~ msgid "Booting From RAID Warning"
+#~ msgstr "Advarsel ved oppstart fra RAID"
+
+#~ msgid "No RAID Device"
+#~ msgstr "Ingen RAID-enhet"
+
+#~ msgid "You need to selected a RAID device."
+#~ msgstr "Du m� velge en RAID-enhet."
+
+#~ msgid "Used Raid Device"
+#~ msgstr "Brukt Raid enhet"
+
+#~ msgid ""
+#~ "The raid device \"/dev/%s\" is already configured as a raid device. Please "
+#~ "select another."
+#~ msgstr ""
+#~ "RAID-enheten \"/dev/%s\" er allerede konfigurert som en RAID-enhet. "
+#~ "Vennligst velg en annen."
+
+#~ msgid "Not Enough Partitions"
+#~ msgstr "Ikke nok partisjoner"
+
+#~ msgid ""
+#~ "You have not configured enough partitions for the RAID type you have "
+#~ "selected."
+#~ msgstr ""
+#~ "Du har ikke konfigurert mange nok partisjoner for RAID-typen du valgte."
+
+#~ msgid "Illegal /boot RAID Type"
+#~ msgstr "Ugyldig RAID-type i /boot"
+
+#~ msgid "Boot partitions (/boot) are only allowed on RAID-1."
+#~ msgstr "Oppstartspartisjoner (/boot) kan kun plasseres p� RAID-1."
+
+#~ msgid "Illegal RAID mountpoint"
+#~ msgstr "Ugyldig RAID monteringspunkt"
+
+#~ msgid "RAID partitions cannot be mounted as root (/) on Alpha."
+#~ msgstr "RAID partisjoner kan ikke monteres som rot (/) p� Alpha."
+
+#~ msgid ""
+#~ "The partition %s is a pre-existing partition in the set of partitions for "
+#~ "this RAID device.  The mount point is set to /boot. Are you sure that it is "
+#~ "possible to boot from this partition?"
+#~ msgstr ""
+#~ "Partisjonen %s er en eksisterende partisjon i settet med partisjoner for "
+#~ "denne RAID-enheten. Monteringspunktet er satt til /boot. Er du sikker p� at "
+#~ "det er mulig � starte opp fra denne partisjonen?"
+
+#~ msgid "Use Pre-existing Partition?"
+#~ msgstr "Bruk eksisterende partisjon?"
+
+#~ msgid "Cannot Add RAID Devices"
+#~ msgstr "Kan ikke legge til RAID-enheter"
+
+#~ msgid ""
+#~ "You have defined the '/' filesystem on a non-ext2 partition, so you cannot "
+#~ "add RAID devices."
+#~ msgstr ""
+#~ "Du har definert '/' filsystemet p� en partisjon av en annen type enn ext2 Du "
+#~ "kan derfor ikke legge til RAID-enheter."
+
+#~ msgid "Auto-Partition"
+#~ msgstr "Auto-partisjoner"
+
+#~ msgid "Using Existing Disk Space"
+#~ msgstr "Bruk eksisterende diskplass"
+
+#~ msgid "Remove Linux partitions"
+#~ msgstr "Fjern Linux partisjoner"
+
+#~ msgid "Use existing free space"
+#~ msgstr "Bruk eksisterende ledig plass"
+
+#~ msgid "Intended Use"
+#~ msgstr "Tenkt bruk"
+
+#~ msgid "Server"
+#~ msgstr "Tjener"
+
+#~ msgid "Workstation"
+#~ msgstr "Arbeidsstasjon"
+
+#~ msgid "Delete RAID Device?"
+#~ msgstr "Slett RAID enhet?"
+
+#~ msgid "Are you sure you want to remove this RAID device?"
+#~ msgstr "Er du sikker p� at du vil fjerne denne RAID-enheten?"
+
+#~ msgid "Reset Partition Table"
+#~ msgstr "Nullstill partisjonstabellen"
+
+#~ msgid "Reset partition table to original contents? "
+#~ msgstr "Sett partisjonstabellen tilbake til originalt innhold? "
+
+#~ msgid "<Swap>"
+#~ msgstr "<Swap>"
+
+#~ msgid "<RAID>"
+#~ msgstr "<RAID>"
+
+#~ msgid "<not set>"
+#~ msgstr "<ikke satt>"
+
+#~ msgid "Requested"
+#~ msgstr "Forespurt"
+
+#~ msgid "Actual"
+#~ msgstr "Reell"
+
+#~ msgid "Drive"
+#~ msgstr "Stasjon"
+
+#~ msgid "Geom [C/H/S]"
+#~ msgstr "Geom [C/H/S]"
+
+#~ msgid "Total (M)"
+#~ msgstr "Total (M)"
+
+#~ msgid "Free (M)"
+#~ msgstr "Ledig (M)"
+
+#~ msgid "Used (M)"
+#~ msgstr "Brukt (M)"
+
+#~ msgid "Used (%)"
+#~ msgstr "Brukt (%)"
+
+#~ msgid "Unallocated Partitions Exist..."
+#~ msgstr "Det finnes ikke-allokerte partisjoner..."
+
+#~ msgid ""
+#~ "You must assign a root (/) partition to a Linux native partition (ext2) or a "
+#~ "RAID partition for the install to proceed."
+#~ msgstr ""
+#~ "Du m� tilegne systemet en rot-partisjon (/) plassert p�  en Linux Native- "
+#~ "partisjon (ext2), eller en RAID-partisjon for at installasjonen skal "
+#~ "fortsette."
+
+#~ msgid "Partitions"
+#~ msgstr "Partisjoner"
+
+#~ msgid "_Add..."
+#~ msgstr "_Legg til"
+
+#~ msgid "_Edit..."
+#~ msgstr "R_ediger"
+
+#~ msgid "_Reset"
+#~ msgstr "_Nullstill"
+
+#~ msgid "_Delete"
+#~ msgstr "_Slett"
+
+#~ msgid "_Make RAID Device"
+#~ msgstr "_Opprett RAID-enhet"
+
+#~ msgid "Auto Partition"
+#~ msgstr "Auto-partisjoner"
+
+#~ msgid "Drive Summary"
+#~ msgstr "Disksammendrag"
+
+#~ msgid "Swap Partition"
+#~ msgstr "Swap-partisjon"
+
+#~ msgid "Edit New Partition"
+#~ msgstr "Redig�r ny partisjon"
+
+#~ msgid "Use remaining space?:"
+#~ msgstr "Bruk all gjenv�rende plass?:"
+
+#~ msgid "Type:"
+#~ msgstr "Type:"
+
+#~ msgid "Unknown"
+#~ msgstr "Ukjent"
+
+#~ msgid "Current Disk Partitions"
+#~ msgstr "N�v�rende diskpartisjoner"
+
+#~ msgid ""
+#~ "    F1-Help     F2-Add      F3-Edit   F4-Delete    F5-Reset    F12-Ok        "
+#~ msgstr ""
+#~ "    F1-Hjelp    F2-Legg til F3-Rediger F4-Slett    F5-Nullstill F12-Ok       "
+
+#~ msgid "Drive Summaries"
+#~ msgstr "Disksammendrag"
+
+#~ msgid "  Drive      Geom [C/H/S]      Total    Used    Free"
+#~ msgstr "  Disk       Geom [C/H/S]      Total    Brukt   Ledig"
+
+#~ msgid "No Root Partition"
+#~ msgstr "Ingen rotpartisjon"
+
+#~ msgid ""
+#~ "You must assign a root (/) partition to a Linux native partition (ext2) for "
+#~ "the install to proceed."
+#~ msgstr ""
+#~ "Du m� tilegne systemet en rot-partisjon (/) plassert p�  en Linux Native- "
+#~ "partisjon (ext2) for at installasjonen skal fortsette."
+
+#~ msgid "No Swap Partition"
+#~ msgstr "Ingen swappartisjon"
+
+#~ msgid "You must assign a swap partition for the install to proceed."
+#~ msgstr ""
+#~ "Du m� sette opp en swap-partisjon for at installasjonen skal fortsette."
+
+#~ msgid ""
+#~ "There are unallocated partitions left. If you quit now they will not be "
+#~ "written to the disk.\n"
+#~ "\n"
+#~ "Are you sure you want to exit?"
+#~ msgstr ""
+#~ "Det finnes ikke-allokerte partisjoner enn�. Hvis du avslutter n� vil disse "
+#~ "ikke bli skrevet til disken.\n"
+#~ "\n"
+#~ "Er du sikker p� at du vil avslutte?"
+
+#~ msgid "Save Changes"
+#~ msgstr "Lagre endringer"
+
+#~ msgid "Save changes to partition table(s)?"
+#~ msgstr "Lagre endringer til partisjonstabellen(e)?"
+
+#~ msgid "You may only delete NFS mounts."
+#~ msgstr "Du kan bare slette NFS-monteringer."
+
+#~ msgid "Other CDROM"
+#~ msgstr "Andre CDROM"
+
+#~ msgid "CDROM type"
+#~ msgstr "CDROM-type"
+
+#~ msgid "What type of CDROM do you have?"
+#~ msgstr "Hvilken type CDROM har du?"
+
+#~ msgid "Initializing CDROM..."
+#~ msgstr "Initialiserer CDROM..."
+
+#~ msgid "Miscellaneous"
+#~ msgstr "Forskjellig"
+
+#~ msgid ""
+#~ "This module can take parameters which affects its operation. If you don't "
+#~ "know what parameters to supply, just skip this screen by pressing the \"OK\" "
+#~ "button now."
+#~ msgstr ""
+#~ "Denne modulen kan ta parametere som har innvirkning p� m�ten den virker. "
+#~ "Hvis du ikke vet hvilke parametere du skal oppgi, kan du hoppe over denne "
+#~ "skjermen ved � trykke \"OK\" knappen n�."
+
+#~ msgid "Module Parameters"
+#~ msgstr "Parametere for moduler"
+
+#~ msgid "Devices"
+#~ msgstr "Enheter"
+
+#~ msgid "Do you have a driver disk?"
+#~ msgstr "Har du en driverdisk?"
+
+#~ msgid "Insert your driver disk and press \"OK\" to continue."
+#~ msgstr "Sett inn driverdisketten og trykk \"OK\" for � fortsette."
+
+#~ msgid "Failed to mount driver disk."
+#~ msgstr "Kunne ikke montere driverdisketten."
+
+#~ msgid ""
+#~ "The floppy disk you inserted is not a valid driver disk for this release of "
+#~ "Red Hat Linux."
+#~ msgstr ""
+#~ "Disketten du satte inn er ikke en gyldig driverdiskett for denne utgaven av "
+#~ "Red Hat Linux."
+
+#~ msgid ""
+#~ "Which driver should I try?. If the driver you need does not appear in this "
+#~ "list, and you have a separate driver disk, please press F2."
+#~ msgstr ""
+#~ "Hvilken driver skal jeg fors�ke? Hvis driveren du trenger ikke finnes p� "
+#~ "denne listen, og du har en separat driverdiskett, vennligst trykk F2."
+
+#~ msgid "Specify module parameters"
+#~ msgstr "Spesifiser parametere modul"
+
+#~ msgid "Failed to insert %s module."
+#~ msgstr "Klarte ikke � laste %s modul."
+
+#~ msgid "The wrong diskette was inserted."
+#~ msgstr "Feil diskett ble satt inn."
+
+#~ msgid "Driver Disk"
+#~ msgstr "Driverdisk"
+
+#~ msgid "Please insert the %s driver disk now."
+#~ msgstr "Vennligst sett inn %s driverdisketten n�."
+
+#~ msgid "Kickstart Error"
+#~ msgstr "Kickstart-feil"
+
+#~ msgid "Error opening: kickstart file %s: %s"
+#~ msgstr "Feil under �pning: kickstart-fil %s: %s"
+
+#~ msgid "Error reading contents of kickstart file %s: %s"
+#~ msgstr "Feil under lesing av innholdet i kickstart-fil %s: %s"
+
+#~ msgid "Error on line %d of kickstart file %s."
+#~ msgstr "Feil p� linje %d i kickstart-fil %s."
+
+#~ msgid "Choose a Language"
+#~ msgstr "Velg et spr�k"
+
+#~ msgid "Welcome to Red Hat Linux"
+#~ msgstr "Velkommen til Red Hat Linux"
+
+#~ msgid ""
+#~ "  <Tab>/<Alt-Tab> between elements  | <Space> selects | <F12> next screen "
+#~ msgstr ""
+#~ "  <Tab>/Alt-Tab> mellom elementer  | <Mellomrom> velger | <F12> neste skjerm "
+
+#~ msgid "Keyboard Type"
+#~ msgstr "Tastaturtype"
+
+#~ msgid "What type of keyboard do you have?"
+#~ msgstr "Hvilken type tastatur har du?"
+
+#~ msgid "Local CDROM"
+#~ msgstr "Lokal CDROM"
+
+#~ msgid "NFS image"
+#~ msgstr "NFS-bilde"
+
+#~ msgid "Hard drive"
+#~ msgstr "Harddisk"
+
+#~ msgid "SCSI"
+#~ msgstr "SCSI"
+
+#~ msgid "What kind of device would you like to add"
+#~ msgstr "Hvilken enhet �nsker du � legge til?"
+
+#~ msgid "I have found the following devices in your system:"
+#~ msgstr "Jeg har funnet f�lgende typer enheter p� ditt system:"
+
+#~ msgid "Add Device"
+#~ msgstr "Legg til enhet"
+
+#~ msgid ""
+#~ "I don't have any special device drivers loaded for your system. Would you "
+#~ "like to load some now?"
+#~ msgstr ""
+#~ "Har ikke lastet noen spesielle enhetsdrivere for ditt system. Vil du at jeg "
+#~ "skal gj�re det n�?"
+
+#~ msgid "Loading"
+#~ msgstr "Laster"
+
+#~ msgid "Loading %s ramdisk..."
+#~ msgstr "Laster %s ramdisk..."
+
+#~ msgid "Error loading ramdisk."
+#~ msgstr "Feil under lasting av ramdisk."
+
+#~ msgid "Hard Drives"
+#~ msgstr "Harddisker"
+
+#~ msgid ""
+#~ "You don't seem to have any hard drives on your system! Would you like to "
+#~ "configure additional devices?"
+#~ msgstr ""
+#~ "Det ser ikke ut som om du har noen harddisker p� systemet ditt! �nsker du � "
+#~ "konfigurere noen tilleggsenheter?"
+
+#~ msgid ""
+#~ "What partition and directory on that partition hold the RedHat/RPMS and "
+#~ "RedHat/base directories? If you don't see the disk drive you're using listed "
+#~ "here, press F2 to configure additional devices."
+#~ msgstr ""
+#~ "Hvilken partisjon og hvilken katalog p� denne partisjonen inneholder "
+#~ "katalogene RedHat/RPMS og RedHat/base? Hvis du ikke ser disken du bruker p� "
+#~ "denne listen, trykk F2 for � konfigurere tilleggsenheter."
+
+#~ msgid "Directory holding Red Hat:"
+#~ msgstr "Katalog som inneholder Red Hat:"
+
+#~ msgid "Select Partition"
+#~ msgstr "Velg partisjon"
+
+#~ msgid "Device %s does not appear to contain a Red Hat installation tree."
+#~ msgstr "Enheten %s ser ikke ut til � inneholde et Red Hat installasjonstre."
+
+#~ msgid ""
+#~ "I could not find a Red Hat Linux CDROM in any of your CDROM drives. Please "
+#~ "insert the Red Hat CD and press \"OK\" to retry."
+#~ msgstr ""
+#~ "Kunne ikke finne en Red Hat Linux CDROM i noen av dine CDROM stasjoner. "
+#~ "Vennligst sett inn Red Hat CD'en og trykk \"OK\" for � pv�ve igjen."
+
+#~ msgid "Networking Device"
+#~ msgstr "Nettverksenhet"
+
+#~ msgid ""
+#~ "You have multiple network devices on this system. Which would you like to "
+#~ "install through?"
+#~ msgstr ""
+#~ "Du har flere nettverksenheter p� dette systemet. Hvilken enhet skal du bruke "
+#~ "for installasjonen?"
+
+#~ msgid "That directory does not seem to contain a Red Hat installation tree."
+#~ msgstr ""
+#~ "Den katalogen ser ikke ut til � inneholde et Red Hat installasjonstre."
+
+#~ msgid "I could not mount that directory from the server"
+#~ msgstr "Klarte ikke � montere den katalogen fra tjeneren"
+
+#~ msgid "FTP"
+#~ msgstr "FTP"
+
+#~ msgid "HTTP"
+#~ msgstr "HTTP"
+
+#~ msgid "Unable to retrieve the first install image"
+#~ msgstr "Kunne ikke finne f�rste installasjonsbilde"
+
+#~ msgid "Unable to retrieve the second install image"
+#~ msgstr "Kunne ikke finne andre installasjonsbilde"
+
+#~ msgid "Rescue Method"
+#~ msgstr "Redningsmetode"
+
+#~ msgid "Installation Method"
+#~ msgstr "Installasjonsmetode"
+
+#~ msgid "What type of media contains the rescue image?"
+#~ msgstr "Hvilken type media inneholder redningsbildet?"
+
+#~ msgid "What type of media contains the packages to be installed?"
+#~ msgstr "Hvilken type media inneholder pakkene som skal installeres?"
+
+#~ msgid "Cannot find ks.cfg on boot floppy."
+#~ msgstr "Kan ikke finne ks.cfg p� oppstartsdisketten."
+
+#~ msgid "Failed to read directory %s: %s"
+#~ msgstr "Kunne ikke lese katalog %s: %s"
+
+#~ msgid "Updates Disk"
+#~ msgstr "Oppdateringsdiskett"
+
+#~ msgid "Insert your updates disk and press \"OK\" to continue."
+#~ msgstr "Sett inn oppdateringsdisketten og trykk \"OK\" for � fortsette."
+
+#~ msgid "Failed to mount floppy disk."
+#~ msgstr "Kunne ikke montere disketten."
+
+#~ msgid "Updates"
+#~ msgstr "Oppdateringer"
+
+#~ msgid "Reading anaconda updates..."
+#~ msgstr "Leser anaconda oppdateringer..."
+
+#~ msgid "PC Card"
+#~ msgstr "PC-kort"
+
+#~ msgid "Initializing PC Card Devices..."
+#~ msgstr "Initialiserer enheter p� PC-kort..."
+
+#~ msgid "NFS server name:"
+#~ msgstr "Navn p� NFS-tjener:"
+
+#~ msgid "Red Hat directory:"
+#~ msgstr "Red Hat katalog:"
+
+#~ msgid "NFS Setup"
+#~ msgstr "NFS-oppsett"
+
+#~ msgid ""
+#~ "Please enter the following information:\n"
+#~ "\n"
+#~ "    o the name or IP number of your NFS server\n"
+#~ "    o the directory on that server containing\n"
+#~ "      Red Hat Linux for your architecture"
+#~ msgstr ""
+#~ "V�r snill � skriv inn f�lgende informasjon:\n"
+#~ "\n"
+#~ "    o navnet eller IP-adressen til din NFS-tjener\n"
+#~ "    o katalogen p� tjeneren som inneholder \n"
+#~ "      Red Har Linux for din arkitektur."
+
+#~ msgid "Nameserver IP"
+#~ msgstr "Navnetjeners IP-adresse"
+
+#~ msgid "Nameserver"
+#~ msgstr "Navnetjener"
+
+#~ msgid ""
+#~ "Your dynamic IP request returned IP configuration information, but it did "
+#~ "not include a DNS nameserver. If you know what your nameserver is, please "
+#~ "enter it now. If you don't have this information, you can leave this field "
+#~ "blank and the install will continue."
+#~ msgstr ""
+#~ "Din foresp�rsel om dynamisk IP returnerte informasjon om IP-konfigurasjon, "
+#~ "men den inkluderte ikke en DNS-navnetjener. Hvis du har informasjon om din "
+#~ "navnetjener, skriv den inn n�. Hvis du ikke har denne informasjonen kan du "
+#~ "la dette feltet st� tomt og installasjonen vil fortsette."
+
+#~ msgid "Invalid IP Information"
+#~ msgstr "Ugyldig IP-informasjon"
+
+#~ msgid "You entered an invalid IP address."
+#~ msgstr "Du skrev inn en ugyldig IP-adresse."
+
+#~ msgid ""
+#~ "Please enter the IP configuration for this machine. Each item should be "
+#~ "entered as an IP address in dotted-decimal notation (for example, 1.2.3.4)."
+#~ msgstr ""
+#~ "V�r snill � skrive inn IP-konfigurasjonen for denne maskinen. Hver oppf�ring "
+#~ "skal skrives inn som en IP-adresse i punktdelt desimal notasjon (f.eks, "
+#~ "1.2.3.4)."
+
+#~ msgid "Use dynamic IP configuration (BOOTP/DHCP)"
+#~ msgstr "Bruk dynamisk konfigurasjon av IP (BOOTP/DHCP)"
+
+#~ msgid "Configure TCP/IP"
+#~ msgstr "Konfigur�r TCP/IP"
+
+#~ msgid "Missing Information"
+#~ msgstr "Manglende informasjon"
+
+#~ msgid "You must enter both a valid IP address and a netmask."
+#~ msgstr "Du m� skrive inn b�de en gyldig IP-adresse og en nettmaske."
+
+#~ msgid "Dynamic IP"
+#~ msgstr "Dynamisk IP"
+
+#~ msgid "Sending request for IP information..."
+#~ msgstr "Sender foresp�rsel for IP-informasjon"
+
+#~ msgid "Determining host name and domain..."
+#~ msgstr "Unders�ker vertsnavn og domene..."
+
+#~ msgid "kickstart"
+#~ msgstr "kickstart"
+
+#~ msgid "bad argument to kickstart network command %s: %s"
+#~ msgstr "ugyldig argument til nettverks-kommando for kickstart %s: %s"
+
+#~ msgid "Bad bootproto %s specified in network command"
+#~ msgstr "Ugyldig bootproto %s spesifisert i nettverkskommandoen"
+
+#~ msgid "Boot protocol to use"
+#~ msgstr "Oppstartsprotokoll som skal brukes"
+
+#~ msgid "Network gateway"
+#~ msgstr "Nettverkets portner (gateway)"
+
+#~ msgid "IP address"
+#~ msgstr "IP-adresse"
+
+#~ msgid "Domain name"
+#~ msgstr "Domenenavn"
+
+#~ msgid "Network device"
+#~ msgstr "Nettverksenhet"
+
+#~ msgid ""
+#~ " <Tab>/<Alt-Tab> between elements   |   <Space> selects  |   <F12> next "
+#~ "screen"
+#~ msgstr ""
+#~ "  <Tab>/Alt-Tab> mellom elementer   | <Mellomrom> velger | <F12> neste "
+#~ "skjerm "
+
+#~ msgid "netconfig %s  (C) 1999 Red Hat, Inc."
+#~ msgstr "netconfig %s  (C) 1999 Red Hat, Inc."
+
+#~ msgid "Network configuration"
+#~ msgstr "Nettverkskonfigurasjon"
+
+#~ msgid "Would you like to set up networking?"
+#~ msgstr "Vil du sette opp nettverk?"
+
+#~ msgid "Failed to log into %s: %s"
+#~ msgstr "Klarte ikke logge inn p� %s: %s"
+
+#~ msgid "Failed to retrieve %s: %s"
+#~ msgstr "Klarte ikke � hente %s: %s"
+
+#~ msgid "Retrieving"
+#~ msgstr "Henter"
+
+#~ msgid ""
+#~ "Please enter the following information:\n"
+#~ "\n"
+#~ "    o the name or IP number of your FTP server\n"
+#~ "    o the directory on that server containing\n"
+#~ "      Red Hat Linux for your architecure\n"
+#~ msgstr ""
+#~ "V�r snill � skriv inn f�lgende informasjon:\n"
+#~ "\n"
+#~ "    o navnet eller IP-adressen til din FTP-tjener\n"
+#~ "    o katalogen p� den tjeneren som inneholder\n"
+#~ "      Red Hat Linux for din arkitektur\n"
+
+#~ msgid ""
+#~ "Please enter the following information:\n"
+#~ "\n"
+#~ "    o the name or IP number of your web server\n"
+#~ "    o the directory on that server containing\n"
+#~ "      Red Hat Linux for your architecure\n"
+#~ msgstr ""
+#~ "V�r snill � skriv inn f�lgende informasjon:\n"
+#~ "\n"
+#~ "    o navnet eller IP-adressen til din web-tjener\n"
+#~ "    o katalogen p� den tjeneren som inneholder\n"
+#~ "      Red Hat Linux for din arkitektur\n"
+
+#~ msgid "FTP site name:"
+#~ msgstr "Navn p� FTP-omr�de:"
+
+#~ msgid "Web site name:"
+#~ msgstr "Navn p� WWW-omr�de:"
+
+#~ msgid "Use non-anonymous ftp or a proxy server"
+#~ msgstr "Bruk ikke-anonym ftp eller en proxytjener"
+
+#~ msgid "Use proxy server"
+#~ msgstr "Velg en proxytjener"
+
+#~ msgid "FTP Setup"
+#~ msgstr "FTP-oppsett"
+
+#~ msgid "HTTP Setup"
+#~ msgstr "HTTP-oppsett"
+
+#~ msgid "You must enter a server name."
+#~ msgstr "Du m� skrive inn et tjenernavn."
+
+#~ msgid "You must enter a directory."
+#~ msgstr "Du m� skrive inn en katalog."
+
+#~ msgid "Unknown Host"
+#~ msgstr "Ukjent vert"
+
+#~ msgid "%s is not a valid hostname."
+#~ msgstr "%s er ikke et gyldig vertsnavn."
+
+#~ msgid ""
+#~ "If you are using non anonymous ftp, enter the account name and password you "
+#~ "wish to use below. If you are using an FTP proxy enter the name of the FTP "
+#~ "proxy server to use."
+#~ msgstr ""
+#~ "Hvis du bruker ikke-anonym ftp, skriv inn kontonavnet og passordet du �nsker "
+#~ "� bruke under. Hvis du bruker en FTP-proxy, skriv inn navnet til FTP- "
+#~ "proxytjeneren som skal brukes."
+
+#~ msgid ""
+#~ "If you are using a HTTP proxy server enter the name of the HTTP proxy server "
+#~ "to use."
+#~ msgstr ""
+#~ "Hvis du bruker en HTTP-proxytjener, skriv inn navnet til HTTP-proxytjeneren "
+#~ "som skal brukes."
+
+#~ msgid "Account name:"
+#~ msgstr "Kontonavn:"
+
+#~ msgid "FTP Proxy:"
+#~ msgstr "FTP-proxy:"
+
+#~ msgid "HTTP Proxy:"
+#~ msgstr "HTTP-proxy:"
+
+#~ msgid "FTP Proxy Port:"
+#~ msgstr "FTP-proxy-port:"
+
+#~ msgid "HTTP Proxy Port:"
+#~ msgstr "HTTP-proxy-port:"
+
+#~ msgid "Loading SCSI driver"
+#~ msgstr "Laster SCSI-driver..."
+
+#~ msgid "Custom System"
+#~ msgstr "Spesialtilpasset system"
+
+#~ msgid ""
+#~ "You are about to erase ALL DATA on your hard drive to make room for your "
+#~ "Linux installation."
+#~ msgstr ""
+#~ "Du er i ferd med � slette ALLE DATA p� din harddisk for � gj�re plass til "
+#~ "din Linux installasjon."
+
+#~ msgid ""
+#~ "You are about to erase any preexisting Linux installations on your system."
+#~ msgstr ""
+#~ "Du er i ferd med � slette alle eksisterende Linux installasjoner p� ditt "
+#~ "system."
+
+#~ msgid "Base"
+#~ msgstr "Basis"
+
+#~ msgid "Printer Support"
+#~ msgstr "Skriverst�tte"
+
+#~ msgid "X Window System"
+#~ msgstr "X vindussystem"
+
+#~ msgid "GNOME"
+#~ msgstr "GNOME"
+
+#~ msgid "KDE"
+#~ msgstr "KDE"
+
+#~ msgid "Mail/WWW/News Tools"
+#~ msgstr "E-post/Web/Nyhetsverkt�y"
+
+#~ msgid "DOS/Windows Connectivity"
+#~ msgstr "DOS/Windows st�tte"
+
+#~ msgid "Graphics Manipulation"
+#~ msgstr "Grafikkmanipulasjon"
+
+#~ msgid "Games"
+#~ msgstr "Spill"
+
+#~ msgid "Multimedia Support"
+#~ msgstr "Multimediast�tte"
+
+#~ msgid "Networked Workstation"
+#~ msgstr "Arbeidsstasjon i nettverk"
+
+#~ msgid "Dialup Workstation"
+#~ msgstr "Oppringt arbeidsstasjon"
+
+#~ msgid "News Server"
+#~ msgstr "Nyhetstjener"
+
+#~ msgid "NFS Server"
+#~ msgstr "NFS-tjener"
+
+#~ msgid "SMB (Samba) Server"
+#~ msgstr "SMB (Samba) tjener"
+
+#~ msgid "IPX/Netware(tm) Connectivity"
+#~ msgstr "IPX/Netware(tm) st�tte"
+
+#~ msgid "Anonymous FTP Server"
+#~ msgstr "Anonym FTP-tjener"
+
+#~ msgid "Web Server"
+#~ msgstr "Web-tjener"
+
+#~ msgid "DNS Name Server"
+#~ msgstr "DNS navnetjener"
+
+#~ msgid "Postgres (SQL) Server"
+#~ msgstr "Postgres (SQL) tjener"
+
+#~ msgid "Network Management Workstation"
+#~ msgstr "Arbeidsstasjon for nettverksadministrasjon"
+
+#~ msgid "Authoring/Publishing"
+#~ msgstr "Publisering/forfatterskap"
+
+#~ msgid "Emacs"
+#~ msgstr "Emacs"
+
+#~ msgid "Development"
+#~ msgstr "Utvikling"
+
+#~ msgid "Kernel Development"
+#~ msgstr "Kjerneutvikling"
+
+#~ msgid "Clustering"
+#~ msgstr "Klyngeteknologi"
+
+#~ msgid "Utilities"
+#~ msgstr "Verkt�y"
-- 
Gitee


From eeb61f72e795664854ae43e281783ac8c881e0ea Mon Sep 17 00:00:00 2001
From: Jeff Johnson <n3npq@mac.com>
Date: Wed, 21 Jun 2000 14:27:52 +0000
Subject: [PATCH 253/667] Auto-update by kmaraas@online.no

---
 po/no.po | 2573 +-----------------------------------------------------
 1 file changed, 3 insertions(+), 2570 deletions(-)

diff --git a/po/no.po b/po/no.po
index ac7aa3c..bc5114a 100644
--- a/po/no.po
+++ b/po/no.po
@@ -1,6 +1,6 @@
 msgid ""
 msgstr ""
-"Project-Id-Version: install 7.0\n"
+"Project-Id-Version: popt 7.0\n"
 "POT-Creation-Date: 2000-05-31 21:46-0400\n"
 "PO-Revision-Date: 2000-06-21 16:11+02:00\n"
 "Last-Translator: Kjartan Maraas <kmaraas@online.no>\n"
@@ -11,2575 +11,8 @@ msgstr ""
 
 #: popthelp.c:23
 msgid "Show this help message"
-msgstr ""
+msgstr "Vis denne hjelpmeldingen"
 
 #: popthelp.c:24
 msgid "Display brief usage message"
-msgstr ""
-
-#~ msgid "Formatting"
-#~ msgstr "Formaterer"
-
-#~ msgid "Formatting swap space on /dev/%s..."
-#~ msgstr "Formaterer swap omr�de p� /dev/%s..."
-
-#~ msgid "Error"
-#~ msgstr "Feil"
-
-#~ msgid "Error creating swap on device "
-#~ msgstr "Feil under oppretting av swapomr�de p� enhet "
-
-#~ msgid "Error unmounting %s: %s"
-#~ msgstr "Feil ved avmontering av %s: %s"
-
-#~ msgid "Creating"
-#~ msgstr "Oppretter"
-
-#~ msgid "Creating RAID devices..."
-#~ msgstr "Oppretter RAID enheter..."
-
-#~ msgid "Formatting %s filesystem..."
-#~ msgstr "Formaterer %s filsystem..."
-
-#~ msgid "Loopback"
-#~ msgstr "Loopback"
-
-#~ msgid "Creating loopback filesystem on device /dev/%s..."
-#~ msgstr "Oppretter loopback filsystem p� enhet /dev/%s..."
-
-#~ msgid "Error mounting %s: %s"
-#~ msgstr "Feil under montering av %s: %s"
-
-#~ msgid ""
-#~ "An exceptional condition has occured.  This is most likely a bug.  Please "
-#~ "copy the full text of this exception and file a bug report at "
-#~ "http://bugzilla.redhat.com/bugzilla"
-#~ msgstr ""
-#~ "Et unntak har oppst�tt. Dette er mest sannsynlig en feil. Vennligst kopier "
-#~ "hele teksten fra unntaksmeldingen og send inn en feilrapport p� "
-#~ "http://bugzilla.redhat.com/bugzilla"
-
-#~ msgid "Next"
-#~ msgstr "Neste"
-
-#~ msgid "Back"
-#~ msgstr "Tilbake"
-
-#~ msgid "Show Help"
-#~ msgstr "Vis hjelp"
-
-#~ msgid "Hide Help"
-#~ msgstr "Skjul hjelp"
-
-#~ msgid "Finish"
-#~ msgstr "Fullf�r"
-
-#~ msgid "Online Help"
-#~ msgstr "Online hjelp"
-
-#~ msgid "Language Selection"
-#~ msgstr "Valg av spr�k"
-
-#~ msgid "Red Hat Linux Installer"
-#~ msgstr "Red Hat Linux installasjon"
-
-#~ msgid "Red Hat Linux Install Shell"
-#~ msgstr "Red Hat Linux installasjonsskall"
-
-#~ msgid "Red Hat Linux Installer on %s"
-#~ msgstr "Red Hat Linux installasjon p� %s"
-
-#~ msgid "Red Hat Linux Install Shell on %s"
-#~ msgstr "Red Hat Linux installasjonsskall p� %s"
-
-#~ msgid "Install Window"
-#~ msgstr "Installasjonsvindu"
-
-#~ msgid "Copying File"
-#~ msgstr "Kopierer fil"
-
-#~ msgid "Transferring install image to hard drive..."
-#~ msgstr "Overf�rer installasjonsbildet til harddisken..."
-
-#~ msgid "Change CDROM"
-#~ msgstr "Bytt CDROM"
-
-#~ msgid "Please insert disc %d to continue."
-#~ msgstr "Vennligst sett inn CD %d for � fortsette."
-
-#~ msgid "Wrong CDROM"
-#~ msgstr "Feil CDROM"
-
-#~ msgid "That's not the correct Red Hat CDROM."
-#~ msgstr "Dette er ikke den korrekte Red Hat CDROM'en."
-
-#~ msgid "The CDROM could not be mounted."
-#~ msgstr "Denne CDROM'en kunne ikke monteres."
-
-#~ msgid "Ok"
-#~ msgstr "Ok"
-
-#~ msgid "What language would you like to use during the installation process?"
-#~ msgstr "Hvilket spr�k �nsker du � bruke under installasjonen?"
-
-#~ msgid "/dev/ttyS0 (COM1 under DOS)"
-#~ msgstr "/dev/ttyS0 (COM1 i DOS)"
-
-#~ msgid "/dev/ttyS1 (COM2 under DOS)"
-#~ msgstr "/dev/ttyS1 (COM2 i DOS)"
-
-#~ msgid "/dev/ttyS2 (COM3 under DOS)"
-#~ msgstr "/dev/ttyS2 (COM3 i DOS)"
-
-#~ msgid "/dev/ttyS3 (COM4 under DOS)"
-#~ msgstr "/dev/ttyS3 (COM4 i DOS)"
-
-#~ msgid "Device"
-#~ msgstr "Enhet"
-
-#~ msgid "What device is your mouse located on? %s %i"
-#~ msgstr "Hvilken enhet er musen plassert p�? %s %i"
-
-#~ msgid "OK"
-#~ msgstr "OK"
-
-#~ msgid "Which model mouse is attached to this computer?"
-#~ msgstr "Hvilken mustype brukes p� denne datamaskinen?"
-
-#~ msgid "Emulate 3 Buttons?"
-#~ msgstr "Emul�r 3 knapper?"
-
-#~ msgid "Mouse Selection"
-#~ msgstr "Musvalg"
-
-#~ msgid "Keyboard Selection"
-#~ msgstr "Tastaturvalg"
-
-#~ msgid "Which model keyboard is attached to this computer?"
-#~ msgstr "Hvilken type tastatur brukes p� denne datamaskinen?"
-
-#~ msgid "Upgrade Existing Installation"
-#~ msgstr "Oppgrader eksisterende installasjon"
-
-#~ msgid "Installation Type"
-#~ msgstr "Installasjonstype"
-
-#~ msgid "What type of system would you like to install?"
-#~ msgstr "Hvilken type installasjon �nsker du?"
-
-#~ msgid "You don't have any Linux partitions. You can't upgrade this system!"
-#~ msgstr ""
-#~ "Du har ingen Linux-partisjoner. Du kan ikke oppgradere dette systemet!"
-
-#~ msgid "System to Upgrade"
-#~ msgstr "System som skal oppgraderes"
-
-#~ msgid "What partition holds the root partition of your installation?"
-#~ msgstr "Hvilken partisjon inneholder rotpartisjonen til din installasjon?"
-
-#~ msgid "Customize Packages to Upgrade"
-#~ msgstr "Tilpass pakker som skal oppgraderes"
-
-#~ msgid ""
-#~ "The packages you have installed, and any other packages which are needed to "
-#~ "satisfy their dependencies, have been selected for installation. Would you "
-#~ "like to customize the set of packages that will be upgraded?"
-#~ msgstr ""
-#~ "Pakkene du har installert og eventuelle andre pakker som er n�dvendige for � "
-#~ "tilfredstille deres avhengiheter, er valgt for installasjon. �nsker du � "
-#~ "endre pakkesettet som skal oppgraderes?"
-
-#~ msgid "Yes"
-#~ msgstr "Ja"
-
-#~ msgid "No"
-#~ msgstr "Nei"
-
-#~ msgid "Red Hat Linux"
-#~ msgstr "Red Hat Linux"
-
-#~ msgid ""
-#~ "Welcome to Red Hat Linux!\n"
-#~ "\n"
-#~ "This installation process is outlined in detail in the Official Red Hat "
-#~ "Linux Installation Guide available from Red Hat Software. If you have access "
-#~ "to this manual, you should read the installation section before continuing.\n"
-#~ "\n"
-#~ "If you have purchased Official Red Hat Linux, be sure to register your "
-#~ "purchase through our web site, http://www.redhat.com/."
-#~ msgstr ""
-#~ "Velkommen til Red Hat Linux!\n"
-#~ "\n"
-#~ "Denne installasjonsprosessen er beskrevet i detalj i \"Official Red Hat \n"
-#~ "Linux Installation Guide\", som er tilgjengelig fra Red Hat Software. Hvis "
-#~ "du har\n"
-#~ "tilgang til denne manualen b�r du lese installasjonsdelen f�r du "
-#~ "fortsetter.\n"
-#~ "\n"
-#~ "Hvis du har kj�pt Official Red Hat Linux b�r du registrere kj�pet gjennom "
-#~ "v�rt web-sted, http://www.redhat.com/."
-
-#~ msgid ""
-#~ "Welcome to the Red Hat Linux!\n"
-#~ "\n"
-#~ "You have entered reconfiguration mode, which will allow you to configure "
-#~ "site-specific options of your computer.\n"
-#~ "\n"
-#~ "To exit without changing your setup select the Cancel button below."
-#~ msgstr ""
-#~ "Velkommen til Red Hat Linux!\n"
-#~ "\n"
-#~ "Du har g�tt til rekonfigurasjonsmodus, som lar deg konfigurere "
-#~ "steds-spesifikke alternativer for din maskin.\n"
-#~ "\n"
-#~ "For � avslutte uten � endre oppsettet velg Avbryt knappen under."
-
-#~ msgid "Cancel"
-#~ msgstr "Avbryt"
-
-#~ msgid "X probe results"
-#~ msgstr "Resultater etter X s�k"
-
-#~ msgid "Unlisted Card"
-#~ msgstr "Kort som ikke er listet"
-
-#~ msgid "Video Card Selection"
-#~ msgstr "Valg av grafikk kort"
-
-#~ msgid "Which video card do you have?"
-#~ msgstr "Hvilket grafikk-kort har du?"
-
-#~ msgid "X Server Selection"
-#~ msgstr "Valg av X-tjener"
-
-#~ msgid "Choose a server"
-#~ msgstr "Velg en tjener"
-
-#~ msgid "Installation to begin"
-#~ msgstr "Installasjon som skal starte"
-
-#~ msgid ""
-#~ "A complete log of your installation will be in /tmp/install.log after "
-#~ "rebooting your system. You may want to keep this file for later reference."
-#~ msgstr ""
-#~ "En komplett logg av installasjonen vil befinne seg i /tmp/install.log etter "
-#~ "omstart av systemet. Du vil kanskje beholde denne filen som et "
-#~ "referansepunkt til senere."
-
-#~ msgid "Upgrade to begin"
-#~ msgstr "Oppgradering starter"
-
-#~ msgid ""
-#~ "A complete log of your upgrade will be in /tmp/upgrade.log after rebooting "
-#~ "your system. You may want to keep this file for later reference."
-#~ msgstr ""
-#~ "En komplett logg av oppgraderingen vil befinne seg i /tmp/upgrade.log etter "
-#~ "omstart av systemet. Du vil kanskje beholde denne filen som referanse til "
-#~ "senere."
-
-#~ msgid "Complete"
-#~ msgstr "Ferdig"
-
-#~ msgid ""
-#~ "Congratulations, installation is complete.\n"
-#~ "\n"
-#~ "Press return to reboot, and be sure to remove your boot medium as the system "
-#~ "reboots, or your system will rerun the install. For information on fixes "
-#~ "which are available for this release of Red Hat Linux, consult the Errata "
-#~ "available from http://www.redhat.com/errata.\n"
-#~ "\n"
-#~ "Information on configuring and using your Red Hat Linux system is contained "
-#~ "in the Red Hat Linux manuals."
-#~ msgstr ""
-#~ "Gratulerer, installasjonen er ferdig.\n"
-#~ "\n"
-#~ "Trykk linjeskift for � starte opp p� nytt, og forsikre deg om at oppstarts- "
-#~ "mediet er fjernet f�r maskinen starter p� nytt, ellers vil installasjonen "
-#~ "Starte p� nytt. For informasjon om feilrettinger som er tilgjengelig for "
-#~ "denne utgaven av Red Hat Linux, se errataen som finnes p� "
-#~ "http://www.redhat.com/errata.\n"
-#~ "\n"
-#~ "Informasjon om konfigurasjon av systemet er tilgjengelig i brukerh�ndb�kene "
-#~ "for Red Hat Linux."
-
-#~ msgid ""
-#~ "Congratulations, configuration is complete.\n"
-#~ "\n"
-#~ " For information on fixes which are available for this release of Red Hat "
-#~ "Linux, consult the Errata available from http://www.redhat.com.\n"
-#~ "\n"
-#~ "Information on further configuring your system is available in the post "
-#~ "install chapter of the Official Red Hat Linux User's Guide."
-#~ msgstr ""
-#~ "Gratulerer, konfigurasjonen er ferdig.\n"
-#~ "\n"
-#~ "For informasjon om feilrettinger som er tilgjengelig for denne utgaven av "
-#~ "Red Hat Linux, se errataen som finnes p� http://www.redhat.com.\n"
-#~ "\n"
-#~ "Informasjon om videre konfigurasjon av systemet er tilgjengelig i \"etter "
-#~ "installasjonen\" kapittelet i den offisielle brukermanualen for Red Hat "
-#~ "Linux."
-
-#~ msgid "Package Installation"
-#~ msgstr "Pakkeinstallasjon"
-
-#~ msgid "Name   : "
-#~ msgstr "Navn   : "
-
-#~ msgid "Size   : "
-#~ msgstr "St�rr. : "
-
-#~ msgid "Summary: "
-#~ msgstr "Sammendrag: "
-
-#~ msgid "    Packages"
-#~ msgstr "    Pakker"
-
-#~ msgid "       Bytes"
-#~ msgstr "       Bytes"
-
-#~ msgid "        Time"
-#~ msgstr "        Tid"
-
-#~ msgid "Total    :"
-#~ msgstr "Total    :"
-
-#~ msgid "Completed:   "
-#~ msgstr "Ferdig:      "
-
-#~ msgid "Remaining:  "
-#~ msgstr "Gjenst�r:   "
-
-#~ msgid "Help not available"
-#~ msgstr "Hjelp ikke tilgjengelig"
-
-#~ msgid "No help is available for this install."
-#~ msgstr "Ingen hjelp tilgjengelig for denne installasjonen."
-
-#~ msgid "Exception Occurred"
-#~ msgstr "Unntak oppstod"
-
-#~ msgid "Debug"
-#~ msgstr "Debug"
-
-#~ msgid "Red Hat Linux (C) 2000 Red Hat, Inc."
-#~ msgstr "Red Hat Linux (C) 2000 Red Hat, Inc."
-
-#~ msgid ""
-#~ " <F1> for help> | <Tab> between elements | <Space> selects | <F12> next "
-#~ "screen"
-#~ msgstr ""
-#~ " <F1> for hjelp | <Tab> mellom menyvalg | <Mellomrom> velg | <F12> neste "
-#~ "skjerm"
-
-#~ msgid ""
-#~ "  <Tab>/<Alt-Tab> between elements   |  <Space> selects   |  <F12> next "
-#~ "screen"
-#~ msgstr ""
-#~ "  <Tab>/Alt-Tab> mellom elementer   | <Mellomrom> velger | <F12> neste "
-#~ "skjerm "
-
-#~ msgid "Welcome"
-#~ msgstr "Velkommen"
-
-#~ msgid "Hostname Setup"
-#~ msgstr "Oppsett av vertsnavn"
-
-#~ msgid "Network Setup"
-#~ msgstr "Oppsett av nettverk"
-
-#~ msgid "Time Zone Setup"
-#~ msgstr "Oppsett av tidssone"
-
-#~ msgid "Root Password"
-#~ msgstr "Root-passord"
-
-#~ msgid "User Account Setup"
-#~ msgstr "Oppsett av brukerkonto"
-
-#~ msgid "Authentication"
-#~ msgstr "Autentisering"
-
-#~ msgid "Configuration Complete"
-#~ msgstr "Konfigurasjonen fullf�rt"
-
-#~ msgid "SILO Configuration"
-#~ msgstr "SILO-konfigurasjon"
-
-#~ msgid "LILO Configuration"
-#~ msgstr "LILO-konfigurasjon"
-
-#~ msgid "Partition"
-#~ msgstr "Partisjon"
-
-#~ msgid "Manually Partition"
-#~ msgstr "Manuell partisjonering"
-
-#~ msgid "Automatic Partition"
-#~ msgstr "Automatisk partisjon"
-
-#~ msgid "Root Filesystem Size"
-#~ msgstr "St�rrelse p� rot filsystem"
-
-#~ msgid "Swap"
-#~ msgstr "Swap"
-
-#~ msgid "Filesystem Formatting"
-#~ msgstr "Formatering av filsystem"
-
-#~ msgid "Mouse Configuration"
-#~ msgstr "Konfigurasjon av mus"
-
-#~ msgid "Package Groups"
-#~ msgstr "Pakkegrupper"
-
-#~ msgid "Individual Packages"
-#~ msgstr "Individuelle pakker"
-
-#~ msgid "Package Dependencies"
-#~ msgstr "Pakkeavhengigheter"
-
-#~ msgid "X Configuration"
-#~ msgstr "Konfigurasjon av X"
-
-#~ msgid "Installation Begins"
-#~ msgstr "Installasjonen starter"
-
-#~ msgid "Install System"
-#~ msgstr "Install�r system"
-
-#~ msgid "Boot Disk"
-#~ msgstr "Oppstartsdiskett"
-
-#~ msgid "Installation Complete"
-#~ msgstr "Installasjon ferdig"
-
-#~ msgid "Examine System"
-#~ msgstr "Unders�k system"
-
-#~ msgid "Customize Upgrade"
-#~ msgstr "Tilpass oppgradering"
-
-#~ msgid "Upgrade Begins"
-#~ msgstr "Oppgradering starter"
-
-#~ msgid "Upgrade System"
-#~ msgstr "Oppgrad�r system"
-
-#~ msgid "Upgrade Complete"
-#~ msgstr "Oppgrad�ring ferdig"
-
-#~ msgid "Cancelled"
-#~ msgstr "Avbrutt"
-
-#~ msgid ""
-#~ "I can't go to the previous step from here. You will have to try again."
-#~ msgstr "Kan ikke g� tilbake til forrige steg herfra. Du m� fors�ke igjen."
-
-#~ msgid "Error copying timezone (from %s): %s"
-#~ msgstr "Feil ved kopiering av tidssone (fra %s): %s"
-
-#~ msgid "Creating boot disk..."
-#~ msgstr "Oppretter oppstartsdiskett..."
-
-#~ msgid "Reading"
-#~ msgstr "Leser"
-
-#~ msgid "Reading package information..."
-#~ msgstr "Leser pakkeinformasjon"
-
-#~ msgid "Dependency Check"
-#~ msgstr "Sjekk av avhengigheter"
-
-#~ msgid "Checking dependencies in packages selected for installation..."
-#~ msgstr "Sjekker avhengigheter i pakker valgt for installasjon..."
-
-#~ msgid "no suggestion"
-#~ msgstr "ingen forslag"
-
-#~ msgid "Searching"
-#~ msgstr "S�ker"
-
-#~ msgid "Searching for Red Hat Linux installations..."
-#~ msgstr "Slker etter Red Hat Linux installasjoner..."
-
-#~ msgid "Error mounting ext2 filesystem on %s: %s"
-#~ msgstr "Feil under montering av ext2 filsystem p� %s: %s"
-
-#~ msgid "Finding"
-#~ msgstr "Finner"
-
-#~ msgid "Finding packages to upgrade..."
-#~ msgstr "Finner pakker som skal oppgraderes..."
-
-#~ msgid ""
-#~ "One or more of the filesystems for your Linux system was not unmounted "
-#~ "cleanly. Please boot your Linux installation, let the filesystems be "
-#~ "checked, and shut down cleanly to upgrade."
-#~ msgstr ""
-#~ "Ett eller flere av filsystemene i ditt Linux system ble ikke riktig "
-#~ "avmontert. Vennligst start opp din Linux installasjon, la filsystemene g� "
-#~ "gjennom sjekk, og steng ned p� riktig m�te f�r du pr�ver � oppgradere."
-
-#~ msgid "Rebuild of RPM database failed. You may be out of disk space?"
-#~ msgstr "Gjenoppbygging av RPM databasen feilet. Ikke mer diskplass?"
-
-#~ msgid "Processing"
-#~ msgstr "Arbeider"
-
-#~ msgid "Preparing to install..."
-#~ msgstr "Forbereder installasjon..."
-
-#~ msgid "Upgrading %s.\n"
-#~ msgstr "Oppgraderer %s.\n"
-
-#~ msgid "Installing %s.\n"
-#~ msgstr "Installerer %s.\n"
-
-#~ msgid ""
-#~ "You don't appear to have enough disk space to install the packages you've "
-#~ "selected. You need more space on the following filesystems:\n"
-#~ "\n"
-#~ msgstr ""
-#~ "Det ser ikke ut til at du har nok diskplass til � installere pakkene du har "
-#~ "valgt. Du m� ha mer plass p� de f�lgende filsystemene:\n"
-#~ "\n"
-
-#~ msgid "Mount Point"
-#~ msgstr "Monteringspunkt"
-
-#~ msgid "Space Needed"
-#~ msgstr "N�dvendig plass"
-
-#~ msgid "Disk Space"
-#~ msgstr "Diskplass"
-
-#~ msgid "Post Install"
-#~ msgstr "Etter-installasjon"
-
-#~ msgid "Performing post install configuration..."
-#~ msgstr "Utf�rer etter-installasjons konfigurasjon..."
-
-#~ msgid "Video Card"
-#~ msgstr "Grafikk-kort"
-
-#~ msgid "Video Ram"
-#~ msgstr "Grafikkminne"
-
-#~ msgid "X server"
-#~ msgstr "X-tjener"
-
-#~ msgid "Unable to detect video card"
-#~ msgstr "Kunne ikke finne skjermkort"
-
-#~ msgid "Monitor"
-#~ msgstr "Skjerm"
-
-#~ msgid "Plug and Play Monitor"
-#~ msgstr "Plug and Play skjerm"
-
-#~ msgid "Horizontal frequency range"
-#~ msgstr "Horisontalt frekvensomr�de"
-
-#~ msgid "Vertical frequency range"
-#~ msgstr "Vertikalt frekvensomr�de"
-
-#~ msgid "Account Configuration"
-#~ msgstr "Konfigurasjon av kontoer"
-
-#~ msgid "Root password accepted."
-#~ msgstr "Passord for root godtatt."
-
-#~ msgid "Please enter root password."
-#~ msgstr "Vennligst skriv inn root-passord."
-
-#~ msgid "Root password is too short."
-#~ msgstr "Passord for root er for kort."
-
-#~ msgid "Root passwords do not match."
-#~ msgstr "Root-passordene er ikke like."
-
-#~ msgid "Root account can not be added here."
-#~ msgstr "Root kontoen kan ikke legges til her."
-
-#~ msgid "Please enter user password."
-#~ msgstr "Vennligst skriv inn brukers passord."
-
-#~ msgid "User password is too short."
-#~ msgstr "Brukers passord er for kort."
-
-#~ msgid "User passwords do not match."
-#~ msgstr "Brukerpassordene er ikke like."
-
-#~ msgid "Root Password: "
-#~ msgstr "Passord for root: "
-
-#~ msgid "Confirm: "
-#~ msgstr "Bekreft: "
-
-#~ msgid "Account Name"
-#~ msgstr "Kontonavn"
-
-#~ msgid "Password"
-#~ msgstr "Passord"
-
-#~ msgid "Password (confirm)"
-#~ msgstr "Passord (bekreft)"
-
-#~ msgid "Full Name"
-#~ msgstr "Fullt navn"
-
-#~ msgid "Add"
-#~ msgstr "Legg til"
-
-#~ msgid "Edit"
-#~ msgstr "Rediger"
-
-#~ msgid "Delete"
-#~ msgstr "Slett"
-
-#~ msgid "New"
-#~ msgstr "Ny"
-
-#~ msgid "Authentication Configuration"
-#~ msgstr "Konfigurasjon av autentisering"
-
-#~ msgid "Enable MD5 passwords"
-#~ msgstr "Bruk MD5 passord"
-
-#~ msgid "Enable shadow passwords"
-#~ msgstr "Bruk skyggepassord"
-
-#~ msgid "Enable NIS"
-#~ msgstr "Bruk NIS"
-
-#~ msgid "Use broadcast to find NIS server"
-#~ msgstr "Bruk kringkasting til � finne NIS-tjener"
-
-#~ msgid "NIS Domain: "
-#~ msgstr "NIS-domene: "
-
-#~ msgid "NIS Server: "
-#~ msgstr "NIS-tjener: "
-
-#~ msgid "Bootdisk Creation"
-#~ msgstr "Lag oppstartsdiskett"
-
-#~ msgid ""
-#~ "Please remove the install floppy (if used) and insert a blank floppy in the "
-#~ "first floppy drive. All data on this disk will be erased during creation of "
-#~ "the boot disk."
-#~ msgstr ""
-#~ "Vennligst fjern installasjonsdisketten (hvis brukt) og sett inn en tom "
-#~ "diskett i den f�rste diskettstasjonen. Alle data p� denne disketten vil bli "
-#~ "slettet under oppretting av oppstartsdisketten."
-
-#~ msgid ""
-#~ "An error occured while making the boot disk. Please make sure that there is "
-#~ "a formatted floppy in the first floppy drive."
-#~ msgstr ""
-#~ "En feil oppstod under oppretting av oppstartsdisketten. Vennligst forsikre "
-#~ "deg om at det st�r en formatert diskett i diskettstasjonen."
-
-#~ msgid "Skip boot disk creation"
-#~ msgstr "Hopp over oppstartsdiskett"
-
-#~ msgid "About to Upgrade"
-#~ msgstr "I ferd med � oppgradere"
-
-#~ msgid "About to Install"
-#~ msgstr "Starter installasjonen"
-
-#~ msgid "Click next to begin upgrade of Red Hat Linux."
-#~ msgstr "Klikk neste for � starte oppgradering av Red Hat Linux."
-
-#~ msgid "Click next to begin installation of Red Hat Linux."
-#~ msgstr "Klikk neste for � starte installasjonen av Red Hat Linux."
-
-#~ msgid "Congratulations"
-#~ msgstr "Gratulerer"
-
-#~ msgid "Exit"
-#~ msgstr "Avslutt"
-
-#~ msgid ""
-#~ "Congratulations, configuration is complete.\n"
-#~ "\n"
-#~ "For information on fixes which are available for this release of Red Hat "
-#~ "Linux, consult the Errata available from http://www.redhat.com.\n"
-#~ "\n"
-#~ "Information on further configuring your system is available in the post "
-#~ "install chapter of the Official Red Hat Linux User's Guide."
-#~ msgstr ""
-#~ "Gratulerer, konfigurasjonen er ferdig.\n"
-#~ "\n"
-#~ "For informasjon om feilrettinger som er tilgjengelig for denne utgaven av "
-#~ "Red Hat Linux, se errataen som finnes p� http://www.redhat.com.\n"
-#~ "\n"
-#~ "Informasjon om konfigurasjon av systemet er tilgjengelig i \"etter "
-#~ "installasjonen\" i den offisielle brukermanualen for Red Hat Linux."
-
-#~ msgid "Unresolved Dependencies"
-#~ msgstr "Ul�ste avhengigheter"
-
-#~ msgid "Total install size: %s"
-#~ msgstr "Total st�rrelse for installasjon: %s"
-
-#~ msgid "Package"
-#~ msgstr "Pakke"
-
-#~ msgid "Requirement"
-#~ msgstr "Avhengighet"
-
-#~ msgid "Install packages to satisfy dependencies"
-#~ msgstr "Installer pakker for � tilfredstille avhengigheter"
-
-#~ msgid "Do not install packages that have dependencies"
-#~ msgstr "Ikke installer pakker som har avhengigheter"
-
-#~ msgid "Ignore package dependencies"
-#~ msgstr "Ignor�r pakkeavhengigheter"
-
-#~ msgid "Upgrade Examine"
-#~ msgstr "Sjekk oppgradering"
-
-#~ msgid ""
-#~ "You don't have any Linux partitions.\n"
-#~ " You can't upgrade this sytem!"
-#~ msgstr ""
-#~ "Du har ingen Linux-partisjoner.\n"
-#~ "Du kan ikke oppgradere dette systemet!"
-
-#~ msgid "Customize packages to be upgraded"
-#~ msgstr "Velg pakker som skal oppgraderes"
-
-#~ msgid "fdisk"
-#~ msgstr "fdisk"
-
-#~ msgid "Select drive to run fdisk on"
-#~ msgstr "Velg disk det fdisk skal kj�res p�"
-
-#~ msgid "Choose partitions to Format"
-#~ msgstr "Velg partisjoner som skal formateres"
-
-#~ msgid "Check for bad blocks while formatting"
-#~ msgstr "Sjekk etter d�rlige blokker under formatering"
-
-#~ msgid "Install Type"
-#~ msgstr "Type installasjon"
-
-#~ msgid "Install"
-#~ msgstr "Install�r"
-
-#~ msgid "Upgrade"
-#~ msgstr "Oppgrad�r"
-
-#~ msgid "Keyboard Configuration"
-#~ msgstr "Konfigurasjon av tastatur"
-
-#~ msgid "Model"
-#~ msgstr "Modell"
-
-#~ msgid "Layout"
-#~ msgstr "Utforming"
-
-#~ msgid "Dead Keys"
-#~ msgstr "D�de taster"
-
-#~ msgid "Enable dead keys"
-#~ msgstr "Sl� p� d�de taster"
-
-#~ msgid "Disable dead keys"
-#~ msgstr "Sl� av d�de taster"
-
-#~ msgid "Test your selection here:"
-#~ msgstr "Test ditt valg her:"
-
-#~ msgid "What language should be used during the installation process?"
-#~ msgstr "Hvilket spr�k skal brukes under installasjonen?"
-
-#~ msgid "Lilo Configuration"
-#~ msgstr "LILO-konfigurasjon"
-
-#~ msgid "Type"
-#~ msgstr "Type"
-
-#~ msgid "Install LILO boot record on:"
-#~ msgstr "Install�r oppstartslaster p�:"
-
-#~ msgid "Master Boot Record (MBR)"
-#~ msgstr "Master Boot Record (MBR)"
-
-#~ msgid "First sector of boot partition"
-#~ msgstr "F�rste sektor p� oppstartspartisjonen"
-
-#~ msgid "Use linear mode (needed for some SCSI drives)"
-#~ msgstr "Bruk line�r modus (n�dvendig for noen SCSI-disker)"
-
-#~ msgid "Kernel parameters"
-#~ msgstr "Parametere for kjerne"
-
-#~ msgid "Create boot disk"
-#~ msgstr "Lag oppstartsdiskett"
-
-#~ msgid "Do not install LILO"
-#~ msgstr "Ikke install�r LILO"
-
-#~ msgid "Default"
-#~ msgstr "Standard"
-
-#~ msgid "Partition type"
-#~ msgstr "Partisjonstype"
-
-#~ msgid "Boot label"
-#~ msgstr "Oppstartsetikett"
-
-#~ msgid "Emulate 3 Buttons"
-#~ msgstr "Emuler 3 knapper"
-
-#~ msgid "Network Configuration"
-#~ msgstr "Nettverkskonfigurasjon"
-
-#~ msgid "Configure using DHCP"
-#~ msgstr "Konfigur�r ved bruk av DHCP"
-
-#~ msgid "Activate on boot"
-#~ msgstr "Aktiver ved oppstart"
-
-#~ msgid "IP Address"
-#~ msgstr "IP-adresse"
-
-#~ msgid "Netmask"
-#~ msgstr "Nettmaske"
-
-#~ msgid "Network"
-#~ msgstr "Nettverk"
-
-#~ msgid "Broadcast"
-#~ msgstr "Kringkast"
-
-#~ msgid "Hostname"
-#~ msgstr "Vertsnavn"
-
-#~ msgid "Gateway"
-#~ msgstr "Gateway"
-
-#~ msgid "Primary DNS"
-#~ msgstr "Prim�r DNS"
-
-#~ msgid "Secondary DNS"
-#~ msgstr "Sekund�r DNS"
-
-#~ msgid "Ternary DNS"
-#~ msgstr "Terti�r DNS"
-
-#~ msgid "Individual Package Selection"
-#~ msgstr "Indiviuelt pakkevalg"
-
-#~ msgid "Up"
-#~ msgstr "Opp"
-
-#~ msgid "Name: "
-#~ msgstr "Navn: "
-
-#~ msgid "Package Details"
-#~ msgstr "Pakke"
-
-#~ msgid "Size: "
-#~ msgstr "St�rr.: "
-
-#~ msgid "Select Package For Installation"
-#~ msgstr "Velg pakke for installasjon"
-
-#~ msgid "Total install size: "
-#~ msgstr "Total st�rrelse for installasjon: "
-
-#~ msgid "Package Group Selection"
-#~ msgstr "Valg av pakkegruppe"
-
-#~ msgid "Select individual packages"
-#~ msgstr "Velg individuelle pakker"
-
-#~ msgid "Installing Packages"
-#~ msgstr "Installerer pakker"
-
-#~ msgid "Size"
-#~ msgstr "St�rrelse"
-
-#~ msgid "Summary"
-#~ msgstr "Sammendrag"
-
-#~ msgid "Status"
-#~ msgstr "Status"
-
-#~ msgid "Packages"
-#~ msgstr "Pakker"
-
-#~ msgid "Time"
-#~ msgstr "Tid"
-
-#~ msgid "Total"
-#~ msgstr "Total"
-
-#~ msgid "Completed"
-#~ msgstr "Ferdig"
-
-#~ msgid "Remaining"
-#~ msgstr "Gjenst�r"
-
-#~ msgid "Confirm Partitioning Selection"
-#~ msgstr "Bekreft valg av partisjonering"
-
-#~ msgid "Disk Druid"
-#~ msgstr "Disk Druid"
-
-#~ msgid "Low Memory"
-#~ msgstr "Lite minne"
-
-#~ msgid ""
-#~ "As you don't have much memory in this machine, we need to turn on swap space "
-#~ "immediately. To do this we'll have to write your new partition table to the "
-#~ "disk immediately. Is that okay?"
-#~ msgstr ""
-#~ "Siden du ikke har mye minne p� denne maskinen, m� vi benytte et swap-omr�de "
-#~ "med en gang. For � gj�re dette m� vi skrive den nye partisjonstabellen til "
-#~ "disken n�. Er dette ok?"
-
-#~ msgid ""
-#~ "You've chosen to put your root filesystem in a file on an already-existing "
-#~ "DOS or Windows filesystem. How large, in megabytes, should would you like "
-#~ "the root filesystem to be, and how much swap space would you like? They must "
-#~ "total less then %d megabytes in size."
-#~ msgstr ""
-#~ "Du har valgt � legge rot filsystemet i en fil p� et allerede eksisterende "
-#~ "DOS eller Windows filsystem. Hvor stor, i megabytes, �nsker du at rot "
-#~ "filsystemet skal v�re, og hvor stort swap omr�de �nsker du? Totalt m� dette "
-#~ "v�re mindre enn %d megabytes."
-
-#~ msgid "Root filesystem size:"
-#~ msgstr "St�rrelse p� rot filsystem:"
-
-#~ msgid "Swap space size:"
-#~ msgstr "St�rrelse p� swap omr�de:"
-
-#~ msgid "Automatic Partitioning"
-#~ msgstr "Automatisk partisjonering"
-
-#~ msgid ""
-#~ "%s\n"
-#~ "\n"
-#~ "If you don't want to do this, you can continue with this install by "
-#~ "partitioning manually, or you can go back and perform a fully customized "
-#~ "installation."
-#~ msgstr ""
-#~ "%s\n"
-#~ "\n"
-#~ "Hvis du ikke �nsker � gj�re dette, kan du fortsette denne installasjonen ved "
-#~ "� partisjonere manuelt, eller du kan g� tilbake og utf�re en tilpasset "
-#~ "installasjon."
-
-#~ msgid "Automatic Partitioning Failed"
-#~ msgstr "Automatisk partisjonering feilet"
-
-#~ msgid ""
-#~ "\n"
-#~ "There is not sufficient disk space in order to automatically partition your "
-#~ "disk. You will need to manually partition your disks for Red Hat Linux to "
-#~ "install.\n"
-#~ "\n"
-#~ "Please choose the tool you would like to use to partition your system for "
-#~ "Red Hat Linux."
-#~ msgstr ""
-#~ "\n"
-#~ "Det er ikke tilstrekkelig diskplass for � partisjonere din disk automatisk. "
-#~ "Du vil m�tte partisjonere diskene manuelt for � installere Red Hat Linux.\n"
-#~ "\n"
-#~ "Vennligst velg hvilket verkt�y du vil bruke til � partisjonere ditt system "
-#~ "for Red Hat Linux."
-
-#~ msgid "Manual Partitioning"
-#~ msgstr "Manuell partisjonering"
-
-#~ msgid ""
-#~ "\n"
-#~ "Please choose the tool you would like to use to partition your system for "
-#~ "Red Hat Linux."
-#~ msgstr ""
-#~ "\n"
-#~ "Vennligst velg hvilket verkt�y du vil bruke for � partisjonere ditt system "
-#~ "for Red Hat Linux."
-
-#~ msgid "Automatically partition and REMOVE DATA"
-#~ msgstr "Partisjoner automatisk og FJERN DATA"
-
-#~ msgid "Manually partition with Disk Druid"
-#~ msgstr "Partisjoner manuelt med Disk Druid"
-
-#~ msgid "Manually partition with fdisk [experts only]"
-#~ msgstr "Partisjoner manuelt med fdisk [kun eksperter]"
-
-#~ msgid "Silo Configuration"
-#~ msgstr "Silo-konfigurasjon"
-
-#~ msgid "Install SILO boot record on:"
-#~ msgstr "Install�r SILO oppstartssektor p�:"
-
-#~ msgid "Create PROM alias"
-#~ msgstr "Opprett PROM-alias"
-
-#~ msgid "Set default PROM boot device to linux"
-#~ msgstr "Sett standard PROM oppstartsenhet til linux"
-
-#~ msgid "Do not install SILO"
-#~ msgstr "Ikke installer SILO"
-
-#~ msgid "Time Zone Selection"
-#~ msgstr "Valg av tidssone"
-
-#~ msgid "View:"
-#~ msgstr "Vis:"
-
-#~ msgid "System clock uses UTC"
-#~ msgstr "Systemklokken bruker UTC"
-
-#~ msgid "Use Daylight Saving Time (US only)"
-#~ msgstr "Bruk \"Daylight Saving Time\""
-
-#~ msgid "Location"
-#~ msgstr "Arbeidsstasjon"
-
-#~ msgid "UTC Offset"
-#~ msgstr "Forskyvning fra UTC"
-
-#~ msgid "Would you like to configure your system?"
-#~ msgstr "Vil du konfigurere systemet ditt?"
-
-#~ msgid "Horizontal Frequency Range"
-#~ msgstr "Horisontalt frekvensomr�de"
-
-#~ msgid "Vertical Frequency Range"
-#~ msgstr "Vertikalt frekvensomr�de"
-
-#~ msgid "Test failed"
-#~ msgstr "Testen feilet"
-
-#~ msgid "Customize X Configuration"
-#~ msgstr "Tilpass konfigurasjon av X"
-
-#~ msgid "Bits per Pixel"
-#~ msgstr "Biter pr. piksel"
-
-#~ msgid "Test this configuration"
-#~ msgstr "Test denne konfigurasjonen"
-
-#~ msgid "Monitor Configuration"
-#~ msgstr "Skjermkonfigurasjon"
-
-#~ msgid "Horizontal Sync"
-#~ msgstr "Horisontal synkronisering"
-
-#~ msgid "Vertical Sync"
-#~ msgstr "Vertikal synkronisering"
-
-#~ msgid ""
-#~ "Your video ram size can not be autodetected.  Choose your video ram size "
-#~ "from the choices below:"
-#~ msgstr ""
-#~ "Mengden videominne kunne ikke finnes av autos�k. Velg mengden videoram fra "
-#~ "listen under:"
-
-#~ msgid ""
-#~ "In most cases your video hardware can be probed to automatically determine "
-#~ "the best settings for your display."
-#~ msgstr ""
-#~ "I de fleste tilfeller kan grafikk-maskinvaren finnes automatisk for � "
-#~ "bestemme de beste innstillingene for din skjerm."
-
-#~ msgid ""
-#~ "If the probed settings do not match your hardware select the correct setting "
-#~ "below:"
-#~ msgstr ""
-#~ "Hvis innstillingene fra autos�k ikke er riktig for din maskinvare, velg de "
-#~ "riktige innstillingene under:"
-
-#~ msgid "Autoprobe results:"
-#~ msgstr "Resultater etter autos�k:"
-
-#~ msgid "Use Graphical Login"
-#~ msgstr "Bruk grafisk p�logging"
-
-#~ msgid "Skip X Configuration"
-#~ msgstr "Hopp over konfigurasjon av X"
-
-#~ msgid ""
-#~ "A custom boot disk provides a way of booting into your Linux system without "
-#~ "depending on the normal bootloader. This is useful if you don't want to "
-#~ "install lilo on your system, another operating system removes lilo, or lilo "
-#~ "doesn't work with your hardware configuration. A custom boot disk can also "
-#~ "be used with the Red Hat rescue image, making it much easier to recover from "
-#~ "severe system failures.\n"
-#~ "\n"
-#~ "Would you like to create a boot disk for your system?"
-#~ msgstr ""
-#~ "En egendefinert oppstartsdiskett gir deg en m�te � starte opp ditt Linux "
-#~ "system uten � v�re avhengig av oppstartslasteren. Dette er nyttig hvis du "
-#~ "ikke �nsker � installere lilo p� systemet, et annet operativsystem fjerner "
-#~ "lilo, eller hvis lilo ikke virker med din maskinvarekonfigurasjon. En "
-#~ "egendefinert oppstartsdiskett kan ogs� brukes med Red Hats redningsdisk, og "
-#~ "gj�r det mye lettere � rette opp alvorlige systemfeil.\n"
-#~ "\n"
-#~ "�nsker du � lage en oppstartsdiskett for ditt system?"
-
-#~ msgid ""
-#~ "\n"
-#~ "On SMCC made Ultra machines floppy booting probably does not work\n"
-#~ "\n"
-#~ msgstr ""
-#~ "\n"
-#~ "P� Ultra maskiner laget av SMCC, virker sannsynligvis ikke oppstart fra "
-#~ "diskett.\n"
-
-#~ msgid "Bootdisk"
-#~ msgstr "Oppstartsdiskett"
-
-#~ msgid ""
-#~ "If you have the install floppy in your drive, first remove it. Then insert a "
-#~ "blank floppy in the first floppy drive. All data on this disk will be erased "
-#~ "during creation of the boot disk."
-#~ msgstr ""
-#~ "Hvis du har installasjonsdisketten i stasjonen, fjern denne f�rst. Sett s� "
-#~ "inn en tom diskett i den f�rste diskettstasjonen. Alle data p� denne "
-#~ "disketten vil bli slettet under oppretting av oppstartsdisketten."
-
-#~ msgid "Skip"
-#~ msgstr "Hopp over"
-
-#~ msgid ""
-#~ "A few systems will need to pass special options to the kernel at boot time "
-#~ "for the system to function properly. If you need to pass boot options to the "
-#~ "kernel, enter them now. If you don't need any or aren't sure, leave this "
-#~ "blank."
-#~ msgstr ""
-#~ "For noen f� systemer kan det v�re n�dvendig � gi spesielle flagg til kjernen "
-#~ "ved oppstart for at systemet skal fungere ordentlig. Hvis du trenger � gi "
-#~ "oppstartsflagg til kjernen, skriv dem inn n�. Hvis du ikke trenger dette, "
-#~ "eller ikke er sikker, kan du la dette st� tomt."
-
-#~ msgid "Where do you want to install the bootloader?"
-#~ msgstr "Hvor vil du installere oppstartslasteren?"
-
-#~ msgid "Clear"
-#~ msgstr "Slett"
-
-#~ msgid "Edit Boot Label Please"
-#~ msgstr "Vennligst rediger oppstartsetikett"
-
-#~ msgid "Invalid Boot Label"
-#~ msgstr "Ugyldig oppstartsetikett"
-
-#~ msgid "Boot label may not be empty."
-#~ msgstr "Oppstartsetiketten kan ikke v�re tom."
-
-#~ msgid "Boot labels cannot contain space(s)."
-#~ msgstr "Oppstartsetiketter kan ikke inneholde mellomrom."
-
-#~ msgid ""
-#~ "The boot manager Red Hat uses can boot other operating systems as well. You "
-#~ "need to tell me what partitions you would like to be able to boot and what "
-#~ "label you want to use for each of them.\n"
-#~ "\n"
-#~ msgstr ""
-#~ "Oppstartslasteren som brukes av Red Hat kan starte andre operativsystemer "
-#~ "ogs�. Du m� fortelle hvilke partisjoner du �nsker � starte andre systemer "
-#~ "fra og hvilken etikett du vil gi hver av dem.\n"
-
-#~ msgid "Use bootp/dhcp"
-#~ msgstr "Bruk bootp/dhcp"
-
-#~ msgid "IP address:"
-#~ msgstr "IP-adresse:"
-
-#~ msgid "Netmask:"
-#~ msgstr "Nettmaske:"
-
-#~ msgid "Default gateway (IP):"
-#~ msgstr "Standard gateway (IP):"
-
-#~ msgid "Primary nameserver:"
-#~ msgstr "Prim�r navnetjener:"
-
-#~ msgid "Invalid information"
-#~ msgstr "Ugyldig informasjon"
-
-#~ msgid "You must enter valid IP information to continue"
-#~ msgstr "Du m� skrive inn gyldig IP-informasjon for � fortsette"
-
-#~ msgid "Hostname Configuration"
-#~ msgstr "Konfigurasjon av vertsnavn"
-
-#~ msgid ""
-#~ "The hostname is the name of your computer.  If your computer is attached to "
-#~ "a network, this may be assigned by your network administrator."
-#~ msgstr ""
-#~ "Vertsnavnet er navnet p� din datamaskin.  Hvis datamaskinen er tilknyttet et "
-#~ "nettverk, er det mulig at dette oppgis av din nettverksadministrator."
-
-#~ msgid "Package :"
-#~ msgstr "Pakke  :"
-
-#~ msgid "Size    :"
-#~ msgstr "St�rr. :"
-
-#~ msgid "Total size"
-#~ msgstr "Total st�rrelse"
-
-#~ msgid ""
-#~ "   <Space>,<+>,<-> selection   |   <F1> help   |   <F2> package description"
-#~ msgstr ""
-#~ "   <Mellomrom>,<+>,<-> valg    |   <F1 hjelp   |   <F2> pakkebeskrivelse"
-
-#~ msgid ""
-#~ "Some of the packages you have selected to install require packages you have "
-#~ "not selected. If you just select Ok all of those required packages will be "
-#~ "installed."
-#~ msgstr ""
-#~ "Noen av pakkene du har valgt � installere trenger pakker som ikke er valgt. "
-#~ "Hvis du bare velger Ok vil alle de n�dvendige pakkene bli installert."
-
-#~ msgid "Disk Setup"
-#~ msgstr "Diskoppsett"
-
-#~ msgid ""
-#~ "Disk Druid is a tool for partitioning and setting up mount points. It is "
-#~ "designed to be easier to use than Linux's traditional disk partitioning "
-#~ "sofware, fdisk, as well as more powerful. However, there are some cases "
-#~ "where fdisk may be preferred.\n"
-#~ "\n"
-#~ "Which tool would you like to use?"
-#~ msgstr ""
-#~ "Disk Druid er et verkt�y for partisjonering og oppsett av monteringspunkter. "
-#~ "Det er laget for � v�re lettere � bruke enn Linux's tradisjonelle disk- "
-#~ "partisjoneringsprogramvare, fdisk, i tillegg til � v�re kraftigere. Likevel "
-#~ "finnes det tilfeller hvor fdisk kan v�re � foretrekke.\n"
-#~ "\n"
-#~ "Hvilket verkt�y vil du bruke?"
-
-#~ msgid ""
-#~ "To install Red Hat Linux, you must have at least one partition of 150 MB "
-#~ "dedicated to Linux. We suggest placing that partition on one of the first "
-#~ "two hard drives in your system so you can boot into Linux with LILO."
-#~ msgstr ""
-#~ "For � installere Red Hat Linux m� du ha minst �n partisjon p� 150 MB "
-#~ "dedikert til Linux. Vi foresl�r at du plasserer den partisjonen p� en av de "
-#~ "f�rste to harddiskene i systemet ditt, slik at du kan bruke LILO til � "
-#~ "starte opp Linux."
-
-#~ msgid "Done"
-#~ msgstr "Ferdig"
-
-#~ msgid "Continue"
-#~ msgstr "Fortsett"
-
-#~ msgid "Manually partition"
-#~ msgstr "Manuell partisjonering"
-
-#~ msgid ""
-#~ "What partitions would you like to format? We strongly suggest formatting all "
-#~ "of the system partitions, including /, /usr, and /var. There is no need to "
-#~ "format /home or /usr/local if they have already been configured during a "
-#~ "previous install."
-#~ msgstr ""
-#~ "Hvilke partisjoner �nsker du � formatere? Vi vil p� det sterkeste anbefale � "
-#~ "formatere alle systempartisjonene, inkludert /, /usr, og /var. Det er ikke "
-#~ "n�dvendig � formatere /home eller /usr/local hvis de allerede har blitt "
-#~ "konfigurert ved en tildligere installasjon."
-
-#~ msgid "Check for bad blocks during format"
-#~ msgstr "Sjekk etter d�rlige blokker under formatering"
-
-#~ msgid "Choose Partitions to Format"
-#~ msgstr "Velg partisjoner som skal formateres"
-
-#~ msgid "Root filesystem size"
-#~ msgstr "St�rrelse p� rot filsystem"
-
-#~ msgid "Swap space"
-#~ msgstr "Swap omr�de"
-
-#~ msgid "Bad Size"
-#~ msgstr "Ugyldig st�rrelse"
-
-#~ msgid "The size you enter must be a number."
-#~ msgstr "St�rrelsen du oppgir m� v�re et tall."
-
-#~ msgid ""
-#~ "The total size must be smaller then the amount of free space on the disk, "
-#~ "which is %d megabytes."
-#~ msgstr ""
-#~ "Total st�rrelse m� v�re mindre enn mengden ledig plass p� disken, som er %d "
-#~ "megabytes."
-
-#~ msgid ""
-#~ "Neither the root file system size nor the swap space size may be greater "
-#~ "then 2000 megabytes."
-#~ msgstr ""
-#~ "Hverken rot-filsystemet eller swapomr�det kan v�re st�rre enn 2000 megabyte."
-
-#~ msgid "Create PROM alias `linux'"
-#~ msgstr "Lag PROM-alias `linux'"
-
-#~ msgid "Set default PROM boot device"
-#~ msgstr "Sett standard PROM oppstartsenhet"
-
-#~ msgid "Edit Boot Label"
-#~ msgstr "Rediger oppstartsetikett"
-
-#~ msgid ""
-#~ "The boot manager Red Hat uses can boot other operating systems as well. You "
-#~ "need to tell me what partitions you would like to be able to boot and what "
-#~ "label you want to use for each of them."
-#~ msgstr ""
-#~ "Oppstartslasteren som brukes av Red Hat kan starte andre operativsystemer "
-#~ "ogs�. Du m� fortelle hvilke partisjoner du �nsker � starte andre systemer "
-#~ "fra og hvilket navn du vil gi hver av dem."
-
-#~ msgid "What time zone are you located in?"
-#~ msgstr "Hvilken tidssone befinner du deg i?"
-
-#~ msgid "Hardware clock set to GMT?"
-#~ msgstr "Maskinvareklokken satt til GMT?"
-
-#~ msgid ""
-#~ "Pick a root password. You must type it twice to ensure you know what it is "
-#~ "and didn't make a mistake in typing. Remember that the root password is a "
-#~ "critical part of system security!"
-#~ msgstr ""
-#~ "Velg et root-passord. Du m� skrive det inn to ganger for � v�re sikker p� at "
-#~ "du vet hva det er og at du ikke gjorde en skrivefeil. Husk at root-passordet "
-#~ "er kritisk for systemsikkerheten!"
-
-#~ msgid "Password:"
-#~ msgstr "Passord:"
-
-#~ msgid "Password (again):"
-#~ msgstr "Passord (igjen):"
-
-#~ msgid "Password Length"
-#~ msgstr "Passordlengde"
-
-#~ msgid "The root password must be at least 6 characters long."
-#~ msgstr "Root-passordet m� v�re minst 6 tegn langt."
-
-#~ msgid "Password Mismatch"
-#~ msgstr "Passordene er ikke like"
-
-#~ msgid "The passwords you entered were different. Please try again."
-#~ msgstr "Passordene du skrev inn var forskjellige. Vennligst fors�k igjen."
-
-#~ msgid "Edit User"
-#~ msgstr "Redig�r bruker"
-
-#~ msgid "Add User"
-#~ msgstr "Legg til bruker"
-
-#~ msgid "User ID"
-#~ msgstr "Bruker-ID:"
-
-#~ msgid "Bad User ID"
-#~ msgstr "Ugyldig bruker-ID"
-
-#~ msgid ""
-#~ "User IDs must be less than 8 characters and contain only characters A-Z, "
-#~ "a-z, and 0-9."
-#~ msgstr ""
-#~ "Bruker-IDer m� v�re mindre enn 8 tegn og kan kun inneholde tegnene A-Z, a-z "
-#~ "og 0-9."
-
-#~ msgid "Missing User ID"
-#~ msgstr "Manglende bruker-ID"
-
-#~ msgid "You must provide a user ID"
-#~ msgstr "Du m� oppgi en bruker-ID"
-
-#~ msgid "The password must be at least 6 characters long."
-#~ msgstr "Passordet m� best� av minst 6 tegn."
-
-#~ msgid "User Exists"
-#~ msgstr "Brukeren eksisterer"
-
-#~ msgid ""
-#~ "The root user is already configured. You don't need to add this user here."
-#~ msgstr ""
-#~ "Root brukeren er allerede konfigurert. Du trenger ikke � legge til denne "
-#~ "brukeren her."
-
-#~ msgid "This user id already exists.  Choose another."
-#~ msgstr "Denne brukeren eksisterer allerede. Velg en annen."
-
-#~ msgid ""
-#~ "You should use a normal user account for most activities on your system. By "
-#~ "not using the root account casually, you'll reduce the chance of disrupting "
-#~ "your system's configuration."
-#~ msgstr ""
-#~ "Du b�r bruke en vanlig brukerkonto for de fleste aktivitetene p� systemet "
-#~ "ditt Ved � ikke bruke root kontoen reduserer du sjansene for � �delegge "
-#~ "systemets konfigurasjon."
-
-#~ msgid ""
-#~ "What user account would you like to have on the system? You should have at "
-#~ "least one non-root account for normal work, but multi-user systems can have "
-#~ "any number of accounts set up."
-#~ msgstr ""
-#~ "Hvilken brukerkonto �nsker du � ha p� systemet? Du b�r ha minst en konto ved "
-#~ "siden av root for vanlig arbeid, men flerbrukersystemer kan ha mange kontoer "
-#~ "satt opp."
-
-#~ msgid "User name"
-#~ msgstr "Brukernavn"
-
-#~ msgid "Enter the information for the user."
-#~ msgstr "Skriv inn informasjon om brukeren."
-
-#~ msgid "Change the information for this user."
-#~ msgstr "Endre informasjonen om denne brukeren."
-
-#~ msgid "Use Shadow Passwords"
-#~ msgstr "Bruk skyggepassord"
-
-#~ msgid "Enable MD5 Passwords"
-#~ msgstr "Bruk MD5-passord"
-
-#~ msgid "NIS Domain:"
-#~ msgstr "NIS-domene:"
-
-#~ msgid "NIS Server:"
-#~ msgstr "NIS-tjener:"
-
-#~ msgid "or use:"
-#~ msgstr "eller bruk:"
-
-#~ msgid "Request server via broadcast"
-#~ msgstr "Foresp�r tjener via kringkasting"
-
-#~ msgid "Bad Mount Point"
-#~ msgstr "Ugyldig monteringspunkt"
-
-#~ msgid "The %s directory must be on the root filesystem."
-#~ msgstr "Katalogen %s m� v�re p� rotfilsystemet."
-
-#~ msgid ""
-#~ "The mount point %s is illegal.\n"
-#~ "\n"
-#~ "Mount points must begin with a leading /."
-#~ msgstr ""
-#~ "Monteringspunktet %s er ugyldig.\n"
-#~ "\n"
-#~ "Monteringspunkter m� begynne med \"/\"."
-
-#~ msgid ""
-#~ "The mount point %s is illegal.\n"
-#~ "\n"
-#~ "Mount points may not end with a /."
-#~ msgstr ""
-#~ "Monteringspunktet %s er ugyldig.\n"
-#~ "\n"
-#~ "Monteringspunkter kan ikke slutte med \"/\"."
-
-#~ msgid ""
-#~ "The mount point %s is illegal.\n"
-#~ "\n"
-#~ "Mount points may only printable characters."
-#~ msgstr ""
-#~ "Monteringspunktet %s er ugyldig.\n"
-#~ "\n"
-#~ "Monteringpunkt kan bare inneholde skrivbare tegn."
-
-#~ msgid ""
-#~ "You've asked to put your root (/) filesystem on a DOS-style FAT partition. "
-#~ "You can do this, but you may not use any other filesystems for your Linux "
-#~ "system. Additionally, there will be a speed penalty for not using "
-#~ "Linux-native partitions. Do you want to continue?"
-#~ msgstr ""
-#~ "Du har bedt om � legge rot (/) filsystemet p� en DOS-stil FAT partisjon. Du "
-#~ "kan gj�re dette, men du vil ikke kunne bruke andre filsystemer for ditt "
-#~ "Linux system. I tillegg vil det g� utover ytelsen n�r du ikke bruker Linux "
-#~ "partisjoner. Vil du fortsette?"
-
-#~ msgid ""
-#~ "The mount point %s is illegal.\n"
-#~ "\n"
-#~ "System partitions must be on Linux Native partitions."
-#~ msgstr ""
-#~ "Monteringspunktet %s er ugyldig.\n"
-#~ "\n"
-#~ "Systempartisjoner m� ligge p� Linux Native-partisjoner."
-
-#~ msgid "On this platform, /boot must be on a DOS-compatible filesystem %x."
-#~ msgstr ""
-#~ "P� denne plattformen m� /boot v�re p� et DOS kompatibelt filsystem %x."
-
-#~ msgid ""
-#~ "The mount point %s is illegal.\n"
-#~ "\n"
-#~ "/usr must be on a Linux Native partition or an NFS volume."
-#~ msgstr ""
-#~ "Monteringspunktet %s er ugyldig.\n"
-#~ "\n"
-#~ "/usr m� ligge p� en Linux Native-partisjon eller et NFS-volum."
-
-#~ msgid "Too Many Drives"
-#~ msgstr "For mange disker"
-
-#~ msgid ""
-#~ "You have more drives than this program supports. Please use the standard "
-#~ "fdisk program to setup your drives and please notify Red Hat Software that "
-#~ "you saw this message."
-#~ msgstr ""
-#~ "Du har flere disker enn dette programmet st�tter. Vennligst bruk fdisk- "
-#~ "programmet til � sette opp diskene dine og informer Red Hat Software om "
-#~ "denne meldingen."
-
-#~ msgid "Error Creating Device Nodes"
-#~ msgstr "Feil under oppretting av enhetsnoder"
-
-#~ msgid ""
-#~ "An error has occurred why trying to create device nodes for the hard drives "
-#~ "in your system.  This may be because you have run out of disk space on the "
-#~ "/tmp partition."
-#~ msgstr ""
-#~ "En feil har oppst�tt under fors�k p� � opprette enhetsnoder for harddiskene "
-#~ "i ditt system. Dette kan v�re for�rsaket av at du har g�tt tom for diskplass "
-#~ "p� /tmp partisjonen."
-
-#~ msgid "No Drives Found"
-#~ msgstr "Ingen stasjoner funnet"
-
-#~ msgid ""
-#~ "An error has occurred - no valid devices were found on which to create new "
-#~ "filesystems.  Please check your hardware for the cause of this problem."
-#~ msgstr ""
-#~ "En feil har oppst�tt - ingen gyldige enheter for oppretting av filsystemer "
-#~ "ble funnet. Vennligst sjekk maskinvaren din for � finne �rsaken til dette."
-
-#~ msgid ""
-#~ "An error occurred reading the partition table for the block device %s.  The "
-#~ "error was"
-#~ msgstr ""
-#~ "En feil oppstod under lesing av partisjonstabellen for blokkenhet %s. Feilen "
-#~ "var"
-
-#~ msgid ""
-#~ "The partition table on device %s is corrupted.  To create new partitions it "
-#~ "must be initialized, causing the loss of ALL DATA on this drive."
-#~ msgstr ""
-#~ "Partisjonstabellen p� enhet %s er korrupt. For � opprette nye partisjoner m� "
-#~ "denne initialiseres. Dette medf�rer tap av ALLE DATA p� denne disken."
-
-#~ msgid "Bad Partition Table"
-#~ msgstr "Ugyldig partisjonstabell"
-
-#~ msgid "Initialize"
-#~ msgstr "Initialis�r"
-
-#~ msgid "Skip Drive"
-#~ msgstr "Hopp over stasjon"
-
-#~ msgid "Retry"
-#~ msgstr "Pr�v igjen"
-
-#~ msgid "BSD Disklabel"
-#~ msgstr "BSD-disketikett"
-
-#~ msgid ""
-#~ "A disk with a BSD disklabel has been found. The Red Hat installation only "
-#~ "supports BSD Disklabels in read-only mode, so you must use a custom install "
-#~ "and fdisk (instead of Disk Druid) for machines with BSD Disklabels."
-#~ msgstr ""
-#~ "En disk med en BSD-disketikett ble funnet. Red Hat installasjonen st�tter "
-#~ "bare BSD-disketiketter i skrivebeskyttet modus, s� du m� bruke en spesiell "
-#~ "installasjonsdisk og fdisk (i stedet for Disk Druid) for maskiner med BSD- "
-#~ "disketiketter."
-
-#~ msgid "System error %d"
-#~ msgstr "Systemfeil %d"
-
-#~ msgid "Fdisk Error"
-#~ msgstr "Fdisk-feil"
-
-#~ msgid "<Swap Partition>"
-#~ msgstr "<Swap-partisjon>"
-
-#~ msgid "<RAID Partition>"
-#~ msgstr "<RAID-partisjon>"
-
-#~ msgid "Delete Partition"
-#~ msgstr "Slett partisjon"
-
-#~ msgid "Are you sure you want to delete this partition?"
-#~ msgstr "Er du sikker p� at du vil slette denne partisjonen?"
-
-#~ msgid "Cannot Edit Partitions"
-#~ msgstr "Kan ikke redigere partisjoner"
-
-#~ msgid ""
-#~ "You have defined the '/' filesystem on a non-ext2 partition, so you cannot "
-#~ "edit other partitions."
-#~ msgstr ""
-#~ "Du har definert '/' filsystemet p� en partisjon av en annen type enn ext2. "
-#~ "Du kan derfor ikke redigere andre partisjoner."
-
-#~ msgid "Edit Partition"
-#~ msgstr "Redig�r partisjon"
-
-#~ msgid "Mount Point:"
-#~ msgstr "Monteringspunkt:"
-
-#~ msgid "Size (Megs):"
-#~ msgstr "St�rrelse (MB):"
-
-#~ msgid "Use remaining space?"
-#~ msgstr "Bruk gjenv�rende plass?"
-
-#~ msgid "Allocation Status:"
-#~ msgstr "Allokeringsstatus:"
-
-#~ msgid "Successful"
-#~ msgstr "Fullf�rt"
-
-#~ msgid "Failed"
-#~ msgstr "Feilet"
-
-#~ msgid "Failure Reason:"
-#~ msgstr "Feil�rsak:"
-
-#~ msgid "Partition Type:"
-#~ msgstr "Partisjonstype:"
-
-#~ msgid "Allowable Drives:"
-#~ msgstr "Tillatte stasjoner:"
-
-#~ msgid "No Mount Point"
-#~ msgstr "Ingen monteringspunkt"
-
-#~ msgid ""
-#~ "You have not selected a mount point for this partition. Are you sure you "
-#~ "want to do this?"
-#~ msgstr ""
-#~ "Du har ikke valgt et monteringspunkt for denne partisjonen. Er du sikker p� "
-#~ "at du �nsker � gj�re dette?"
-
-#~ msgid "Mount Point Error"
-#~ msgstr "Feil ved monteringspunkt"
-
-#~ msgid ""
-#~ "You have tried to assign the '/' mount point to a FAT-style partition.  You "
-#~ "cannot do this now because mount points have been assigned to ext2 "
-#~ "partitions also.  Clear those mount points and then you will be able to "
-#~ "assign '/' to this partition."
-#~ msgstr ""
-#~ "Du har fors�kt � tildele '/' monteringspunktet til en FAT-partisjon. Du kan "
-#~ "ikke gj�re dette n� fordi monteringspunkter er satt opp for ext2 partisjoner "
-#~ "ogs�. Fjern disse monteringspunktene, s� vil du kunne tildele '/' til denne "
-#~ "partisjonen."
-
-#~ msgid ""
-#~ "The mount point requested is either an illegal path or is already in use. "
-#~ "Please select a valid mount point."
-#~ msgstr ""
-#~ "Monteringspunktet som ble forespurt er enten en ugyldig sti eller det er "
-#~ "allerede i bruk. Vennligst velg et gyldig monteringspunkt."
-
-#~ msgid "Size Error"
-#~ msgstr "Feil ved st�rrelse"
-
-#~ msgid ""
-#~ "The size requested is illegal. Make sure the size is greater and zero (0), "
-#~ "and is specified int decimal (base 10) format."
-#~ msgstr ""
-#~ "St�rrelsen du ba om er ugyldig. S�rg for at st�rrelsen er st�rre enn null "
-#~ "(0), og at den er spesifisert i desimal format (base 10)."
-
-#~ msgid "Swap Size Error"
-#~ msgstr "Feil ved st�rrelse p� swap"
-
-#~ msgid ""
-#~ "You have created a swap partition which is too large. The maximum size of a "
-#~ "swap partition is %ld Megabytes."
-#~ msgstr ""
-#~ "Du har opprettet en swap-partisjon som er for stor. Maksimal st�rrelse p� en "
-#~ "swap-partisjon er %ld Megabyte."
-
-#~ msgid "No RAID Drive Constraint"
-#~ msgstr "Ingen begrensning p� RAID stasjon"
-
-#~ msgid ""
-#~ "You have configured a RAID partition without constraining the partition to a "
-#~ "single drive.\n"
-#~ " Are you sure you want to do this?"
-#~ msgstr ""
-#~ "Du har konfigurert en RAID partisjon uten � begrense partisjonen til en "
-#~ "enkelt stasjon.\n"
-#~ " Er du sikker p� at du vil gj�re dette?"
-
-#~ msgid "Close"
-#~ msgstr "Lukk"
-
-#~ msgid ""
-#~ "You have configured a RAID partition without constraining the partition to a "
-#~ "single drive. Please select one drive to constrain this partition to."
-#~ msgstr ""
-#~ "Du har konfigurert en RAID-partisjon uten � begrense partisjonen til en "
-#~ "enkelt disk. Vennligst velg en disk � begrense denne partisjonen til."
-
-#~ msgid "Cannot Add Partitions"
-#~ msgstr "Kan ikke legge til partisjoner"
-
-#~ msgid ""
-#~ "You have defined the '/' filesystem on a non-ext2 partition, so you cannot "
-#~ "add other partitions."
-#~ msgstr ""
-#~ "Du har definert '/' filsystemet p� en partisjon av en annen type enn ext2 Du "
-#~ "kan derfor ikke legge til andre partisjoner."
-
-#~ msgid "RAID Entry Incomplete"
-#~ msgstr "RAID-oppf�ringen er ikke komplett"
-
-#~ msgid ""
-#~ "The raid device /dev/%s now contains partitions which are unallocated. The "
-#~ "raid device /dev/%s will now be decomposed into its component partitions. "
-#~ "Please recompose the raid device with allocated partitions."
-#~ msgstr ""
-#~ "RAID-enheten /dev/%s inneholder n� ikke-allokerte partisjoner. RAID-enheten "
-#~ "/dev/%s vil n� deles opp i sine enkeltkomponenter. Vennligst sett sammen "
-#~ "RAID-enheten p� nytt med de allokerte partisjonene."
-
-#~ msgid "Unallocated Partitions"
-#~ msgstr "Ikke-allokerte partisjoner"
-
-#~ msgid ""
-#~ "There are currently unallocated partition(s) present in the list of "
-#~ "requested partitions. The unallocated partition(s) are shown below, along "
-#~ "with the reason they were not allocated."
-#~ msgstr ""
-#~ "Det finnes ikke-allokerte partisjoner i listen over forespurte partisjoner. "
-#~ "De ikke-allokerte partisjonene vises under, sammen med grunnen til at de "
-#~ "ikke ble allokert."
-
-#~ msgid "Cannot Edit Raid"
-#~ msgstr "Kan ikke redigere RAID"
-
-#~ msgid ""
-#~ "You have defined the '/' filesystem on a non-ext2 partition, so you cannot "
-#~ "edit RAID devices."
-#~ msgstr ""
-#~ "Du har definert '/' filsystemet p� en partisjon av en annen type enn ext2. "
-#~ "Du kan derfor ikke redigere RAID-enheter."
-
-#~ msgid "<Swap Partition"
-#~ msgstr "<Swap-partisjon"
-
-#~ msgid "RAID Device: /dev/"
-#~ msgstr "RAID-enhet: /dev/"
-
-#~ msgid "RAID Type:"
-#~ msgstr "RAID-type:"
-
-#~ msgid "Partitions For RAID Array:"
-#~ msgstr "Partisjoner for RAID-disk:"
-
-#~ msgid "You have not selected a mount point. A mount point is required."
-#~ msgstr "Du har ikke valgt et monteringspunkt. Dette er p�krevd."
-
-#~ msgid ""
-#~ "The mount point requested is already in use. Please select a valid mount "
-#~ "point."
-#~ msgstr ""
-#~ "Monteringspunktet som ble forespurt er allerede i bruk. Vennligst velg et "
-#~ "gyldig monteringspunkt."
-
-#~ msgid ""
-#~ "The bootable raid device can only include partitions from the first two "
-#~ "drives on your system.\n"
-#~ "\n"
-#~ "These drives are: "
-#~ msgstr ""
-#~ "Den oppstartbare RAID-enheten kan kun inkludere partisjoner fra de to f�rste "
-#~ "diskene i systemet.\n"
-#~ "\n"
-#~ "Det er disse diskene:"
-
-#~ msgid "Booting From RAID Warning"
-#~ msgstr "Advarsel ved oppstart fra RAID"
-
-#~ msgid "No RAID Device"
-#~ msgstr "Ingen RAID-enhet"
-
-#~ msgid "You need to selected a RAID device."
-#~ msgstr "Du m� velge en RAID-enhet."
-
-#~ msgid "Used Raid Device"
-#~ msgstr "Brukt Raid enhet"
-
-#~ msgid ""
-#~ "The raid device \"/dev/%s\" is already configured as a raid device. Please "
-#~ "select another."
-#~ msgstr ""
-#~ "RAID-enheten \"/dev/%s\" er allerede konfigurert som en RAID-enhet. "
-#~ "Vennligst velg en annen."
-
-#~ msgid "Not Enough Partitions"
-#~ msgstr "Ikke nok partisjoner"
-
-#~ msgid ""
-#~ "You have not configured enough partitions for the RAID type you have "
-#~ "selected."
-#~ msgstr ""
-#~ "Du har ikke konfigurert mange nok partisjoner for RAID-typen du valgte."
-
-#~ msgid "Illegal /boot RAID Type"
-#~ msgstr "Ugyldig RAID-type i /boot"
-
-#~ msgid "Boot partitions (/boot) are only allowed on RAID-1."
-#~ msgstr "Oppstartspartisjoner (/boot) kan kun plasseres p� RAID-1."
-
-#~ msgid "Illegal RAID mountpoint"
-#~ msgstr "Ugyldig RAID monteringspunkt"
-
-#~ msgid "RAID partitions cannot be mounted as root (/) on Alpha."
-#~ msgstr "RAID partisjoner kan ikke monteres som rot (/) p� Alpha."
-
-#~ msgid ""
-#~ "The partition %s is a pre-existing partition in the set of partitions for "
-#~ "this RAID device.  The mount point is set to /boot. Are you sure that it is "
-#~ "possible to boot from this partition?"
-#~ msgstr ""
-#~ "Partisjonen %s er en eksisterende partisjon i settet med partisjoner for "
-#~ "denne RAID-enheten. Monteringspunktet er satt til /boot. Er du sikker p� at "
-#~ "det er mulig � starte opp fra denne partisjonen?"
-
-#~ msgid "Use Pre-existing Partition?"
-#~ msgstr "Bruk eksisterende partisjon?"
-
-#~ msgid "Cannot Add RAID Devices"
-#~ msgstr "Kan ikke legge til RAID-enheter"
-
-#~ msgid ""
-#~ "You have defined the '/' filesystem on a non-ext2 partition, so you cannot "
-#~ "add RAID devices."
-#~ msgstr ""
-#~ "Du har definert '/' filsystemet p� en partisjon av en annen type enn ext2 Du "
-#~ "kan derfor ikke legge til RAID-enheter."
-
-#~ msgid "Auto-Partition"
-#~ msgstr "Auto-partisjoner"
-
-#~ msgid "Using Existing Disk Space"
-#~ msgstr "Bruk eksisterende diskplass"
-
-#~ msgid "Remove Linux partitions"
-#~ msgstr "Fjern Linux partisjoner"
-
-#~ msgid "Use existing free space"
-#~ msgstr "Bruk eksisterende ledig plass"
-
-#~ msgid "Intended Use"
-#~ msgstr "Tenkt bruk"
-
-#~ msgid "Server"
-#~ msgstr "Tjener"
-
-#~ msgid "Workstation"
-#~ msgstr "Arbeidsstasjon"
-
-#~ msgid "Delete RAID Device?"
-#~ msgstr "Slett RAID enhet?"
-
-#~ msgid "Are you sure you want to remove this RAID device?"
-#~ msgstr "Er du sikker p� at du vil fjerne denne RAID-enheten?"
-
-#~ msgid "Reset Partition Table"
-#~ msgstr "Nullstill partisjonstabellen"
-
-#~ msgid "Reset partition table to original contents? "
-#~ msgstr "Sett partisjonstabellen tilbake til originalt innhold? "
-
-#~ msgid "<Swap>"
-#~ msgstr "<Swap>"
-
-#~ msgid "<RAID>"
-#~ msgstr "<RAID>"
-
-#~ msgid "<not set>"
-#~ msgstr "<ikke satt>"
-
-#~ msgid "Requested"
-#~ msgstr "Forespurt"
-
-#~ msgid "Actual"
-#~ msgstr "Reell"
-
-#~ msgid "Drive"
-#~ msgstr "Stasjon"
-
-#~ msgid "Geom [C/H/S]"
-#~ msgstr "Geom [C/H/S]"
-
-#~ msgid "Total (M)"
-#~ msgstr "Total (M)"
-
-#~ msgid "Free (M)"
-#~ msgstr "Ledig (M)"
-
-#~ msgid "Used (M)"
-#~ msgstr "Brukt (M)"
-
-#~ msgid "Used (%)"
-#~ msgstr "Brukt (%)"
-
-#~ msgid "Unallocated Partitions Exist..."
-#~ msgstr "Det finnes ikke-allokerte partisjoner..."
-
-#~ msgid ""
-#~ "You must assign a root (/) partition to a Linux native partition (ext2) or a "
-#~ "RAID partition for the install to proceed."
-#~ msgstr ""
-#~ "Du m� tilegne systemet en rot-partisjon (/) plassert p�  en Linux Native- "
-#~ "partisjon (ext2), eller en RAID-partisjon for at installasjonen skal "
-#~ "fortsette."
-
-#~ msgid "Partitions"
-#~ msgstr "Partisjoner"
-
-#~ msgid "_Add..."
-#~ msgstr "_Legg til"
-
-#~ msgid "_Edit..."
-#~ msgstr "R_ediger"
-
-#~ msgid "_Reset"
-#~ msgstr "_Nullstill"
-
-#~ msgid "_Delete"
-#~ msgstr "_Slett"
-
-#~ msgid "_Make RAID Device"
-#~ msgstr "_Opprett RAID-enhet"
-
-#~ msgid "Auto Partition"
-#~ msgstr "Auto-partisjoner"
-
-#~ msgid "Drive Summary"
-#~ msgstr "Disksammendrag"
-
-#~ msgid "Swap Partition"
-#~ msgstr "Swap-partisjon"
-
-#~ msgid "Edit New Partition"
-#~ msgstr "Redig�r ny partisjon"
-
-#~ msgid "Use remaining space?:"
-#~ msgstr "Bruk all gjenv�rende plass?:"
-
-#~ msgid "Type:"
-#~ msgstr "Type:"
-
-#~ msgid "Unknown"
-#~ msgstr "Ukjent"
-
-#~ msgid "Current Disk Partitions"
-#~ msgstr "N�v�rende diskpartisjoner"
-
-#~ msgid ""
-#~ "    F1-Help     F2-Add      F3-Edit   F4-Delete    F5-Reset    F12-Ok        "
-#~ msgstr ""
-#~ "    F1-Hjelp    F2-Legg til F3-Rediger F4-Slett    F5-Nullstill F12-Ok       "
-
-#~ msgid "Drive Summaries"
-#~ msgstr "Disksammendrag"
-
-#~ msgid "  Drive      Geom [C/H/S]      Total    Used    Free"
-#~ msgstr "  Disk       Geom [C/H/S]      Total    Brukt   Ledig"
-
-#~ msgid "No Root Partition"
-#~ msgstr "Ingen rotpartisjon"
-
-#~ msgid ""
-#~ "You must assign a root (/) partition to a Linux native partition (ext2) for "
-#~ "the install to proceed."
-#~ msgstr ""
-#~ "Du m� tilegne systemet en rot-partisjon (/) plassert p�  en Linux Native- "
-#~ "partisjon (ext2) for at installasjonen skal fortsette."
-
-#~ msgid "No Swap Partition"
-#~ msgstr "Ingen swappartisjon"
-
-#~ msgid "You must assign a swap partition for the install to proceed."
-#~ msgstr ""
-#~ "Du m� sette opp en swap-partisjon for at installasjonen skal fortsette."
-
-#~ msgid ""
-#~ "There are unallocated partitions left. If you quit now they will not be "
-#~ "written to the disk.\n"
-#~ "\n"
-#~ "Are you sure you want to exit?"
-#~ msgstr ""
-#~ "Det finnes ikke-allokerte partisjoner enn�. Hvis du avslutter n� vil disse "
-#~ "ikke bli skrevet til disken.\n"
-#~ "\n"
-#~ "Er du sikker p� at du vil avslutte?"
-
-#~ msgid "Save Changes"
-#~ msgstr "Lagre endringer"
-
-#~ msgid "Save changes to partition table(s)?"
-#~ msgstr "Lagre endringer til partisjonstabellen(e)?"
-
-#~ msgid "You may only delete NFS mounts."
-#~ msgstr "Du kan bare slette NFS-monteringer."
-
-#~ msgid "Other CDROM"
-#~ msgstr "Andre CDROM"
-
-#~ msgid "CDROM type"
-#~ msgstr "CDROM-type"
-
-#~ msgid "What type of CDROM do you have?"
-#~ msgstr "Hvilken type CDROM har du?"
-
-#~ msgid "Initializing CDROM..."
-#~ msgstr "Initialiserer CDROM..."
-
-#~ msgid "Miscellaneous"
-#~ msgstr "Forskjellig"
-
-#~ msgid ""
-#~ "This module can take parameters which affects its operation. If you don't "
-#~ "know what parameters to supply, just skip this screen by pressing the \"OK\" "
-#~ "button now."
-#~ msgstr ""
-#~ "Denne modulen kan ta parametere som har innvirkning p� m�ten den virker. "
-#~ "Hvis du ikke vet hvilke parametere du skal oppgi, kan du hoppe over denne "
-#~ "skjermen ved � trykke \"OK\" knappen n�."
-
-#~ msgid "Module Parameters"
-#~ msgstr "Parametere for moduler"
-
-#~ msgid "Devices"
-#~ msgstr "Enheter"
-
-#~ msgid "Do you have a driver disk?"
-#~ msgstr "Har du en driverdisk?"
-
-#~ msgid "Insert your driver disk and press \"OK\" to continue."
-#~ msgstr "Sett inn driverdisketten og trykk \"OK\" for � fortsette."
-
-#~ msgid "Failed to mount driver disk."
-#~ msgstr "Kunne ikke montere driverdisketten."
-
-#~ msgid ""
-#~ "The floppy disk you inserted is not a valid driver disk for this release of "
-#~ "Red Hat Linux."
-#~ msgstr ""
-#~ "Disketten du satte inn er ikke en gyldig driverdiskett for denne utgaven av "
-#~ "Red Hat Linux."
-
-#~ msgid ""
-#~ "Which driver should I try?. If the driver you need does not appear in this "
-#~ "list, and you have a separate driver disk, please press F2."
-#~ msgstr ""
-#~ "Hvilken driver skal jeg fors�ke? Hvis driveren du trenger ikke finnes p� "
-#~ "denne listen, og du har en separat driverdiskett, vennligst trykk F2."
-
-#~ msgid "Specify module parameters"
-#~ msgstr "Spesifiser parametere modul"
-
-#~ msgid "Failed to insert %s module."
-#~ msgstr "Klarte ikke � laste %s modul."
-
-#~ msgid "The wrong diskette was inserted."
-#~ msgstr "Feil diskett ble satt inn."
-
-#~ msgid "Driver Disk"
-#~ msgstr "Driverdisk"
-
-#~ msgid "Please insert the %s driver disk now."
-#~ msgstr "Vennligst sett inn %s driverdisketten n�."
-
-#~ msgid "Kickstart Error"
-#~ msgstr "Kickstart-feil"
-
-#~ msgid "Error opening: kickstart file %s: %s"
-#~ msgstr "Feil under �pning: kickstart-fil %s: %s"
-
-#~ msgid "Error reading contents of kickstart file %s: %s"
-#~ msgstr "Feil under lesing av innholdet i kickstart-fil %s: %s"
-
-#~ msgid "Error on line %d of kickstart file %s."
-#~ msgstr "Feil p� linje %d i kickstart-fil %s."
-
-#~ msgid "Choose a Language"
-#~ msgstr "Velg et spr�k"
-
-#~ msgid "Welcome to Red Hat Linux"
-#~ msgstr "Velkommen til Red Hat Linux"
-
-#~ msgid ""
-#~ "  <Tab>/<Alt-Tab> between elements  | <Space> selects | <F12> next screen "
-#~ msgstr ""
-#~ "  <Tab>/Alt-Tab> mellom elementer  | <Mellomrom> velger | <F12> neste skjerm "
-
-#~ msgid "Keyboard Type"
-#~ msgstr "Tastaturtype"
-
-#~ msgid "What type of keyboard do you have?"
-#~ msgstr "Hvilken type tastatur har du?"
-
-#~ msgid "Local CDROM"
-#~ msgstr "Lokal CDROM"
-
-#~ msgid "NFS image"
-#~ msgstr "NFS-bilde"
-
-#~ msgid "Hard drive"
-#~ msgstr "Harddisk"
-
-#~ msgid "SCSI"
-#~ msgstr "SCSI"
-
-#~ msgid "What kind of device would you like to add"
-#~ msgstr "Hvilken enhet �nsker du � legge til?"
-
-#~ msgid "I have found the following devices in your system:"
-#~ msgstr "Jeg har funnet f�lgende typer enheter p� ditt system:"
-
-#~ msgid "Add Device"
-#~ msgstr "Legg til enhet"
-
-#~ msgid ""
-#~ "I don't have any special device drivers loaded for your system. Would you "
-#~ "like to load some now?"
-#~ msgstr ""
-#~ "Har ikke lastet noen spesielle enhetsdrivere for ditt system. Vil du at jeg "
-#~ "skal gj�re det n�?"
-
-#~ msgid "Loading"
-#~ msgstr "Laster"
-
-#~ msgid "Loading %s ramdisk..."
-#~ msgstr "Laster %s ramdisk..."
-
-#~ msgid "Error loading ramdisk."
-#~ msgstr "Feil under lasting av ramdisk."
-
-#~ msgid "Hard Drives"
-#~ msgstr "Harddisker"
-
-#~ msgid ""
-#~ "You don't seem to have any hard drives on your system! Would you like to "
-#~ "configure additional devices?"
-#~ msgstr ""
-#~ "Det ser ikke ut som om du har noen harddisker p� systemet ditt! �nsker du � "
-#~ "konfigurere noen tilleggsenheter?"
-
-#~ msgid ""
-#~ "What partition and directory on that partition hold the RedHat/RPMS and "
-#~ "RedHat/base directories? If you don't see the disk drive you're using listed "
-#~ "here, press F2 to configure additional devices."
-#~ msgstr ""
-#~ "Hvilken partisjon og hvilken katalog p� denne partisjonen inneholder "
-#~ "katalogene RedHat/RPMS og RedHat/base? Hvis du ikke ser disken du bruker p� "
-#~ "denne listen, trykk F2 for � konfigurere tilleggsenheter."
-
-#~ msgid "Directory holding Red Hat:"
-#~ msgstr "Katalog som inneholder Red Hat:"
-
-#~ msgid "Select Partition"
-#~ msgstr "Velg partisjon"
-
-#~ msgid "Device %s does not appear to contain a Red Hat installation tree."
-#~ msgstr "Enheten %s ser ikke ut til � inneholde et Red Hat installasjonstre."
-
-#~ msgid ""
-#~ "I could not find a Red Hat Linux CDROM in any of your CDROM drives. Please "
-#~ "insert the Red Hat CD and press \"OK\" to retry."
-#~ msgstr ""
-#~ "Kunne ikke finne en Red Hat Linux CDROM i noen av dine CDROM stasjoner. "
-#~ "Vennligst sett inn Red Hat CD'en og trykk \"OK\" for � pv�ve igjen."
-
-#~ msgid "Networking Device"
-#~ msgstr "Nettverksenhet"
-
-#~ msgid ""
-#~ "You have multiple network devices on this system. Which would you like to "
-#~ "install through?"
-#~ msgstr ""
-#~ "Du har flere nettverksenheter p� dette systemet. Hvilken enhet skal du bruke "
-#~ "for installasjonen?"
-
-#~ msgid "That directory does not seem to contain a Red Hat installation tree."
-#~ msgstr ""
-#~ "Den katalogen ser ikke ut til � inneholde et Red Hat installasjonstre."
-
-#~ msgid "I could not mount that directory from the server"
-#~ msgstr "Klarte ikke � montere den katalogen fra tjeneren"
-
-#~ msgid "FTP"
-#~ msgstr "FTP"
-
-#~ msgid "HTTP"
-#~ msgstr "HTTP"
-
-#~ msgid "Unable to retrieve the first install image"
-#~ msgstr "Kunne ikke finne f�rste installasjonsbilde"
-
-#~ msgid "Unable to retrieve the second install image"
-#~ msgstr "Kunne ikke finne andre installasjonsbilde"
-
-#~ msgid "Rescue Method"
-#~ msgstr "Redningsmetode"
-
-#~ msgid "Installation Method"
-#~ msgstr "Installasjonsmetode"
-
-#~ msgid "What type of media contains the rescue image?"
-#~ msgstr "Hvilken type media inneholder redningsbildet?"
-
-#~ msgid "What type of media contains the packages to be installed?"
-#~ msgstr "Hvilken type media inneholder pakkene som skal installeres?"
-
-#~ msgid "Cannot find ks.cfg on boot floppy."
-#~ msgstr "Kan ikke finne ks.cfg p� oppstartsdisketten."
-
-#~ msgid "Failed to read directory %s: %s"
-#~ msgstr "Kunne ikke lese katalog %s: %s"
-
-#~ msgid "Updates Disk"
-#~ msgstr "Oppdateringsdiskett"
-
-#~ msgid "Insert your updates disk and press \"OK\" to continue."
-#~ msgstr "Sett inn oppdateringsdisketten og trykk \"OK\" for � fortsette."
-
-#~ msgid "Failed to mount floppy disk."
-#~ msgstr "Kunne ikke montere disketten."
-
-#~ msgid "Updates"
-#~ msgstr "Oppdateringer"
-
-#~ msgid "Reading anaconda updates..."
-#~ msgstr "Leser anaconda oppdateringer..."
-
-#~ msgid "PC Card"
-#~ msgstr "PC-kort"
-
-#~ msgid "Initializing PC Card Devices..."
-#~ msgstr "Initialiserer enheter p� PC-kort..."
-
-#~ msgid "NFS server name:"
-#~ msgstr "Navn p� NFS-tjener:"
-
-#~ msgid "Red Hat directory:"
-#~ msgstr "Red Hat katalog:"
-
-#~ msgid "NFS Setup"
-#~ msgstr "NFS-oppsett"
-
-#~ msgid ""
-#~ "Please enter the following information:\n"
-#~ "\n"
-#~ "    o the name or IP number of your NFS server\n"
-#~ "    o the directory on that server containing\n"
-#~ "      Red Hat Linux for your architecture"
-#~ msgstr ""
-#~ "V�r snill � skriv inn f�lgende informasjon:\n"
-#~ "\n"
-#~ "    o navnet eller IP-adressen til din NFS-tjener\n"
-#~ "    o katalogen p� tjeneren som inneholder \n"
-#~ "      Red Har Linux for din arkitektur."
-
-#~ msgid "Nameserver IP"
-#~ msgstr "Navnetjeners IP-adresse"
-
-#~ msgid "Nameserver"
-#~ msgstr "Navnetjener"
-
-#~ msgid ""
-#~ "Your dynamic IP request returned IP configuration information, but it did "
-#~ "not include a DNS nameserver. If you know what your nameserver is, please "
-#~ "enter it now. If you don't have this information, you can leave this field "
-#~ "blank and the install will continue."
-#~ msgstr ""
-#~ "Din foresp�rsel om dynamisk IP returnerte informasjon om IP-konfigurasjon, "
-#~ "men den inkluderte ikke en DNS-navnetjener. Hvis du har informasjon om din "
-#~ "navnetjener, skriv den inn n�. Hvis du ikke har denne informasjonen kan du "
-#~ "la dette feltet st� tomt og installasjonen vil fortsette."
-
-#~ msgid "Invalid IP Information"
-#~ msgstr "Ugyldig IP-informasjon"
-
-#~ msgid "You entered an invalid IP address."
-#~ msgstr "Du skrev inn en ugyldig IP-adresse."
-
-#~ msgid ""
-#~ "Please enter the IP configuration for this machine. Each item should be "
-#~ "entered as an IP address in dotted-decimal notation (for example, 1.2.3.4)."
-#~ msgstr ""
-#~ "V�r snill � skrive inn IP-konfigurasjonen for denne maskinen. Hver oppf�ring "
-#~ "skal skrives inn som en IP-adresse i punktdelt desimal notasjon (f.eks, "
-#~ "1.2.3.4)."
-
-#~ msgid "Use dynamic IP configuration (BOOTP/DHCP)"
-#~ msgstr "Bruk dynamisk konfigurasjon av IP (BOOTP/DHCP)"
-
-#~ msgid "Configure TCP/IP"
-#~ msgstr "Konfigur�r TCP/IP"
-
-#~ msgid "Missing Information"
-#~ msgstr "Manglende informasjon"
-
-#~ msgid "You must enter both a valid IP address and a netmask."
-#~ msgstr "Du m� skrive inn b�de en gyldig IP-adresse og en nettmaske."
-
-#~ msgid "Dynamic IP"
-#~ msgstr "Dynamisk IP"
-
-#~ msgid "Sending request for IP information..."
-#~ msgstr "Sender foresp�rsel for IP-informasjon"
-
-#~ msgid "Determining host name and domain..."
-#~ msgstr "Unders�ker vertsnavn og domene..."
-
-#~ msgid "kickstart"
-#~ msgstr "kickstart"
-
-#~ msgid "bad argument to kickstart network command %s: %s"
-#~ msgstr "ugyldig argument til nettverks-kommando for kickstart %s: %s"
-
-#~ msgid "Bad bootproto %s specified in network command"
-#~ msgstr "Ugyldig bootproto %s spesifisert i nettverkskommandoen"
-
-#~ msgid "Boot protocol to use"
-#~ msgstr "Oppstartsprotokoll som skal brukes"
-
-#~ msgid "Network gateway"
-#~ msgstr "Nettverkets portner (gateway)"
-
-#~ msgid "IP address"
-#~ msgstr "IP-adresse"
-
-#~ msgid "Domain name"
-#~ msgstr "Domenenavn"
-
-#~ msgid "Network device"
-#~ msgstr "Nettverksenhet"
-
-#~ msgid ""
-#~ " <Tab>/<Alt-Tab> between elements   |   <Space> selects  |   <F12> next "
-#~ "screen"
-#~ msgstr ""
-#~ "  <Tab>/Alt-Tab> mellom elementer   | <Mellomrom> velger | <F12> neste "
-#~ "skjerm "
-
-#~ msgid "netconfig %s  (C) 1999 Red Hat, Inc."
-#~ msgstr "netconfig %s  (C) 1999 Red Hat, Inc."
-
-#~ msgid "Network configuration"
-#~ msgstr "Nettverkskonfigurasjon"
-
-#~ msgid "Would you like to set up networking?"
-#~ msgstr "Vil du sette opp nettverk?"
-
-#~ msgid "Failed to log into %s: %s"
-#~ msgstr "Klarte ikke logge inn p� %s: %s"
-
-#~ msgid "Failed to retrieve %s: %s"
-#~ msgstr "Klarte ikke � hente %s: %s"
-
-#~ msgid "Retrieving"
-#~ msgstr "Henter"
-
-#~ msgid ""
-#~ "Please enter the following information:\n"
-#~ "\n"
-#~ "    o the name or IP number of your FTP server\n"
-#~ "    o the directory on that server containing\n"
-#~ "      Red Hat Linux for your architecure\n"
-#~ msgstr ""
-#~ "V�r snill � skriv inn f�lgende informasjon:\n"
-#~ "\n"
-#~ "    o navnet eller IP-adressen til din FTP-tjener\n"
-#~ "    o katalogen p� den tjeneren som inneholder\n"
-#~ "      Red Hat Linux for din arkitektur\n"
-
-#~ msgid ""
-#~ "Please enter the following information:\n"
-#~ "\n"
-#~ "    o the name or IP number of your web server\n"
-#~ "    o the directory on that server containing\n"
-#~ "      Red Hat Linux for your architecure\n"
-#~ msgstr ""
-#~ "V�r snill � skriv inn f�lgende informasjon:\n"
-#~ "\n"
-#~ "    o navnet eller IP-adressen til din web-tjener\n"
-#~ "    o katalogen p� den tjeneren som inneholder\n"
-#~ "      Red Hat Linux for din arkitektur\n"
-
-#~ msgid "FTP site name:"
-#~ msgstr "Navn p� FTP-omr�de:"
-
-#~ msgid "Web site name:"
-#~ msgstr "Navn p� WWW-omr�de:"
-
-#~ msgid "Use non-anonymous ftp or a proxy server"
-#~ msgstr "Bruk ikke-anonym ftp eller en proxytjener"
-
-#~ msgid "Use proxy server"
-#~ msgstr "Velg en proxytjener"
-
-#~ msgid "FTP Setup"
-#~ msgstr "FTP-oppsett"
-
-#~ msgid "HTTP Setup"
-#~ msgstr "HTTP-oppsett"
-
-#~ msgid "You must enter a server name."
-#~ msgstr "Du m� skrive inn et tjenernavn."
-
-#~ msgid "You must enter a directory."
-#~ msgstr "Du m� skrive inn en katalog."
-
-#~ msgid "Unknown Host"
-#~ msgstr "Ukjent vert"
-
-#~ msgid "%s is not a valid hostname."
-#~ msgstr "%s er ikke et gyldig vertsnavn."
-
-#~ msgid ""
-#~ "If you are using non anonymous ftp, enter the account name and password you "
-#~ "wish to use below. If you are using an FTP proxy enter the name of the FTP "
-#~ "proxy server to use."
-#~ msgstr ""
-#~ "Hvis du bruker ikke-anonym ftp, skriv inn kontonavnet og passordet du �nsker "
-#~ "� bruke under. Hvis du bruker en FTP-proxy, skriv inn navnet til FTP- "
-#~ "proxytjeneren som skal brukes."
-
-#~ msgid ""
-#~ "If you are using a HTTP proxy server enter the name of the HTTP proxy server "
-#~ "to use."
-#~ msgstr ""
-#~ "Hvis du bruker en HTTP-proxytjener, skriv inn navnet til HTTP-proxytjeneren "
-#~ "som skal brukes."
-
-#~ msgid "Account name:"
-#~ msgstr "Kontonavn:"
-
-#~ msgid "FTP Proxy:"
-#~ msgstr "FTP-proxy:"
-
-#~ msgid "HTTP Proxy:"
-#~ msgstr "HTTP-proxy:"
-
-#~ msgid "FTP Proxy Port:"
-#~ msgstr "FTP-proxy-port:"
-
-#~ msgid "HTTP Proxy Port:"
-#~ msgstr "HTTP-proxy-port:"
-
-#~ msgid "Loading SCSI driver"
-#~ msgstr "Laster SCSI-driver..."
-
-#~ msgid "Custom System"
-#~ msgstr "Spesialtilpasset system"
-
-#~ msgid ""
-#~ "You are about to erase ALL DATA on your hard drive to make room for your "
-#~ "Linux installation."
-#~ msgstr ""
-#~ "Du er i ferd med � slette ALLE DATA p� din harddisk for � gj�re plass til "
-#~ "din Linux installasjon."
-
-#~ msgid ""
-#~ "You are about to erase any preexisting Linux installations on your system."
-#~ msgstr ""
-#~ "Du er i ferd med � slette alle eksisterende Linux installasjoner p� ditt "
-#~ "system."
-
-#~ msgid "Base"
-#~ msgstr "Basis"
-
-#~ msgid "Printer Support"
-#~ msgstr "Skriverst�tte"
-
-#~ msgid "X Window System"
-#~ msgstr "X vindussystem"
-
-#~ msgid "GNOME"
-#~ msgstr "GNOME"
-
-#~ msgid "KDE"
-#~ msgstr "KDE"
-
-#~ msgid "Mail/WWW/News Tools"
-#~ msgstr "E-post/Web/Nyhetsverkt�y"
-
-#~ msgid "DOS/Windows Connectivity"
-#~ msgstr "DOS/Windows st�tte"
-
-#~ msgid "Graphics Manipulation"
-#~ msgstr "Grafikkmanipulasjon"
-
-#~ msgid "Games"
-#~ msgstr "Spill"
-
-#~ msgid "Multimedia Support"
-#~ msgstr "Multimediast�tte"
-
-#~ msgid "Networked Workstation"
-#~ msgstr "Arbeidsstasjon i nettverk"
-
-#~ msgid "Dialup Workstation"
-#~ msgstr "Oppringt arbeidsstasjon"
-
-#~ msgid "News Server"
-#~ msgstr "Nyhetstjener"
-
-#~ msgid "NFS Server"
-#~ msgstr "NFS-tjener"
-
-#~ msgid "SMB (Samba) Server"
-#~ msgstr "SMB (Samba) tjener"
-
-#~ msgid "IPX/Netware(tm) Connectivity"
-#~ msgstr "IPX/Netware(tm) st�tte"
-
-#~ msgid "Anonymous FTP Server"
-#~ msgstr "Anonym FTP-tjener"
-
-#~ msgid "Web Server"
-#~ msgstr "Web-tjener"
-
-#~ msgid "DNS Name Server"
-#~ msgstr "DNS navnetjener"
-
-#~ msgid "Postgres (SQL) Server"
-#~ msgstr "Postgres (SQL) tjener"
-
-#~ msgid "Network Management Workstation"
-#~ msgstr "Arbeidsstasjon for nettverksadministrasjon"
-
-#~ msgid "Authoring/Publishing"
-#~ msgstr "Publisering/forfatterskap"
-
-#~ msgid "Emacs"
-#~ msgstr "Emacs"
-
-#~ msgid "Development"
-#~ msgstr "Utvikling"
-
-#~ msgid "Kernel Development"
-#~ msgstr "Kjerneutvikling"
-
-#~ msgid "Clustering"
-#~ msgstr "Klyngeteknologi"
-
-#~ msgid "Utilities"
-#~ msgstr "Verkt�y"
+msgstr "Vis kort bruksmelding"
-- 
Gitee


From 7e04a963321f288ce52339149ea677a40bccc82a Mon Sep 17 00:00:00 2001
From: Jeff Johnson <n3npq@mac.com>
Date: Wed, 21 Jun 2000 21:47:34 +0000
Subject: [PATCH 254/667] Auto-update by kenneth@gnu.org

---
 po/da.po | 21 ++++++++-------------
 1 file changed, 8 insertions(+), 13 deletions(-)

diff --git a/po/da.po b/po/da.po
index 6378d9c..63a8ab9 100644
--- a/po/da.po
+++ b/po/da.po
@@ -1,23 +1,18 @@
-# SOME DESCRIPTIVE TITLE.
-# Copyright (C) YEAR Free Software Foundation, Inc.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#
-#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
+"Project-Id-Version: popt\n"
 "POT-Creation-Date: 2000-05-31 21:46-0400\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
+"PO-Revision-Date: 2000-03-07 05:17+01:00\n"
+"Last-Translator: K. Christiansen <kenneth@gnu.org>\n"
+"Language-Team: Danish/Dansk <dansk@klid.dk>\n"
 "MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=CHARSET\n"
-"Content-Transfer-Encoding: ENCODING\n"
+"Content-Type: text/plain; charset=ISO-8859-1\n"
+"Content-Transfer-Encoding: 8-bit\n"
 
 #: popthelp.c:23
 msgid "Show this help message"
-msgstr ""
+msgstr "Vis denne hj�lpemeddelelse"
 
 #: popthelp.c:24
 msgid "Display brief usage message"
-msgstr ""
+msgstr "Vis kortfattet brugsanvisning"
-- 
Gitee


From 281937210d97ac80c65ffd234eb776779b93b39f Mon Sep 17 00:00:00 2001
From: Jeff Johnson <n3npq@mac.com>
Date: Thu, 22 Jun 2000 00:07:10 +0000
Subject: [PATCH 255/667] Auto-update by pmmm@rnl.ist.utl.pt

---
 po/pt.po | 21 ++++++++-------------
 1 file changed, 8 insertions(+), 13 deletions(-)

diff --git a/po/pt.po b/po/pt.po
index 6378d9c..53169b7 100644
--- a/po/pt.po
+++ b/po/pt.po
@@ -1,23 +1,18 @@
-# SOME DESCRIPTIVE TITLE.
-# Copyright (C) YEAR Free Software Foundation, Inc.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#
-#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
+"Project-Id-Version: popt\n"
 "POT-Creation-Date: 2000-05-31 21:46-0400\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
+"PO-Revision-Date: 2000-06-22 01:02+01:00\n"
+"Last-Translator: Pedro Morais <morais@kde.org>\n"
+"Language-Team: pt <morais@kde.org>\n"
 "MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=CHARSET\n"
-"Content-Transfer-Encoding: ENCODING\n"
+"Content-Type: text/plain; charset=iso-latin1\n"
+"Content-Transfer-Encoding: none\n"
 
 #: popthelp.c:23
 msgid "Show this help message"
-msgstr ""
+msgstr "Mostrar esta mensagem de ajuda"
 
 #: popthelp.c:24
 msgid "Display brief usage message"
-msgstr ""
+msgstr "Mostrar uma mensagem de utiliza��o sucinta"
-- 
Gitee


From 12d8f9c0848199006e0587a5426a7975d080f785 Mon Sep 17 00:00:00 2001
From: Jeff Johnson <n3npq@mac.com>
Date: Wed, 28 Jun 2000 16:24:30 +0000
Subject: [PATCH 256/667] Auto-update by jba@pobox.com

---
 po/gl.po | 21 ++++++++-------------
 1 file changed, 8 insertions(+), 13 deletions(-)

diff --git a/po/gl.po b/po/gl.po
index 6378d9c..0f9a0c1 100644
--- a/po/gl.po
+++ b/po/gl.po
@@ -1,23 +1,18 @@
-# SOME DESCRIPTIVE TITLE.
-# Copyright (C) YEAR Free Software Foundation, Inc.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#
-#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
+"Project-Id-Version: popt\n"
 "POT-Creation-Date: 2000-05-31 21:46-0400\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
+"PO-Revision-Date: 2000-01-06 20:31+0100\n"
+"Last-Translator: Jes�s Bravo �lvarez <jba@pobox.com>\n"
+"Language-Team: Galician <trasno@ceu.fi.udc.es>\n"
 "MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=CHARSET\n"
-"Content-Transfer-Encoding: ENCODING\n"
+"Content-Type: text/plain; charset=iso-8859-1\n"
+"Content-Transfer-Encoding: 8bit\n"
 
 #: popthelp.c:23
 msgid "Show this help message"
-msgstr ""
+msgstr "Amosar esta mensaxe de axuda"
 
 #: popthelp.c:24
 msgid "Display brief usage message"
-msgstr ""
+msgstr "Amosar brevemente o xeito de utilizaci�n"
-- 
Gitee


From 8098df284fe283555c9b4adc9c07a718cbefeb6b Mon Sep 17 00:00:00 2001
From: Jeff Johnson <n3npq@mac.com>
Date: Fri, 7 Jul 2000 21:19:21 +0000
Subject: [PATCH 257/667] Update i18n from gnome version.

---
 configure.in       |  2 +-
 po/cs.po           | 25 ++++++++++++-------------
 po/gl.po           | 15 ++++++++++++---
 po/uk.po           | 29 ++++++++++++++---------------
 po/wa.po           | 26 ++++++++++++++++++++++++++
 po/zh_CN.GB2312.po | 18 ++++++++++++++++++
 6 files changed, 83 insertions(+), 32 deletions(-)
 create mode 100644 po/wa.po
 create mode 100644 po/zh_CN.GB2312.po

diff --git a/configure.in b/configure.in
index 1878cf4..210fe7e 100755
--- a/configure.in
+++ b/configure.in
@@ -3,7 +3,7 @@ AM_CONFIG_HEADER(config.h)
 AC_PREREQ(2.12)
 AC_CANONICAL_SYSTEM
 AM_INIT_AUTOMAKE(popt, 1.6)
-ALL_LINGUAS="cs da de es fi fr gl hu id is it ja ko no pl pt pt_BR ro ru sk sl sr sv tr uk"
+ALL_LINGUAS="cs da de es fi fr gl hu id is it ja ko no pl pt pt_BR ro ru sk sl sr sv tr uk wa zh_CN.GB2312"
 
 AC_ISC_POSIX
 
diff --git a/po/cs.po b/po/cs.po
index 6378d9c..712c5d7 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -1,23 +1,22 @@
-# SOME DESCRIPTIVE TITLE.
-# Copyright (C) YEAR Free Software Foundation, Inc.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+# This is the Czech locale definition for popt.
+# Copyright (C) 1999 Free Software Foundation, Inc.
+# Stanislav Brabec <utx@k332.feld.cvut.cz>, 1999.
 #
-#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2000-05-31 21:46-0400\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
+"Project-Id-Version: popt 1.3\n"
+"POT-Creation-Date: 1999-12-16 12:42-0500\n"
+"PO-Revision-Date: 1999-10-23 18:49+02:00\n"
+"Last-Translator: Stanislav Brabec <utx@k332.feld.cvut.cz>\n"
+"Language-Team: Czech <cs@li.org>\n"
 "MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=CHARSET\n"
-"Content-Transfer-Encoding: ENCODING\n"
+"Content-Type: text/plain; charset=iso-8859-2\n"
+"Content-Transfer-Encoding: 8bit\n"
 
 #: popthelp.c:23
 msgid "Show this help message"
-msgstr ""
+msgstr "Vyp��e tuto n�pov�du"
 
 #: popthelp.c:24
 msgid "Display brief usage message"
-msgstr ""
+msgstr "Vyp��e kr�tk� n�vod na pou�it�"
diff --git a/po/gl.po b/po/gl.po
index 0f9a0c1..f9b6836 100644
--- a/po/gl.po
+++ b/po/gl.po
@@ -1,10 +1,19 @@
+# Galician translation of popt.
+# Copyright (C) 2000 Jes�s Bravo �lvarez.
+# Jes�s Bravo �lvarez <jba@pobox.com>, 2000.
+#
+# Se desexas colaborar connosco na traducci�n de programas libres � galego,
+# vai mira-la p�xina do noso grupo:  http://www.ctv.es/USERS/jtarrio/trans
+#
+# First Version: 2000-01-06 20:31+0100
+#
 msgid ""
 msgstr ""
-"Project-Id-Version: popt\n"
-"POT-Creation-Date: 2000-05-31 21:46-0400\n"
+"Project-Id-Version: popt 1.4\n"
+"POT-Creation-Date: 2000-01-06 20:30+0100\n"
 "PO-Revision-Date: 2000-01-06 20:31+0100\n"
 "Last-Translator: Jes�s Bravo �lvarez <jba@pobox.com>\n"
-"Language-Team: Galician <trasno@ceu.fi.udc.es>\n"
+"Language-Team: Galician <gpul-traduccion@ceu.fi.udc.es>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=iso-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/po/uk.po b/po/uk.po
index 6378d9c..bdd08f4 100644
--- a/po/uk.po
+++ b/po/uk.po
@@ -1,23 +1,22 @@
-# SOME DESCRIPTIVE TITLE.
-# Copyright (C) YEAR Free Software Foundation, Inc.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+# Translation into the ukrainian language.
+# Copyright (C) 1999 Free Software Foundation, Inc.
+# Yuri Syrota <rasta@renome.rovno.ua>, 1999.
 #
-#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2000-05-31 21:46-0400\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
+"Project-Id-Version: popt 1.4\n"
+"POT-Creation-Date: 1999-05-31 18:09-0400\n"
+"PO-Revision-Date: 1999-09-30 16:54+0200\n"
+"Last-Translator: Yuri Syrota <rasta@renome.rovno.ua>\n"
+"Language-Team: Ukrainian <uk@li.org>\n"
 "MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=CHARSET\n"
-"Content-Transfer-Encoding: ENCODING\n"
+"Content-Type: text/plain; charset=koi8-u\n"
+"Content-Transfer-Encoding: 8bit\n"
 
-#: popthelp.c:23
+#: ../popthelp.c:35
 msgid "Show this help message"
-msgstr ""
+msgstr "�������� �� ��צ���"
 
-#: popthelp.c:24
+#: ../popthelp.c:36
 msgid "Display brief usage message"
-msgstr ""
+msgstr "�������� ������� ��צ��� ��� ������������"
diff --git a/po/wa.po b/po/wa.po
new file mode 100644
index 0000000..403374e
--- /dev/null
+++ b/po/wa.po
@@ -0,0 +1,26 @@
+# Translation into the walloon language.
+#
+# Si vos voloz donner on c�p di spale pol rato�rnaedje di Gnome (ou des
+# �tes libes programes) sicrijhoz-mu a l' adresse emile
+# <linux-wa@chanae.alphanet.ch>; nos avons co br�mint di l' ovraedje a f�.
+#
+# Copyright (C) 1999 Free Software Foundation, Inc.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: popt 1.3\n"
+"POT-Creation-Date: 1999-12-16 12:42-0500\n"
+"PO-Revision-Date: 1999-03-18 23:11+0100\n"
+"Last-Translator: Nobody yet\n"
+"Language-Team: walon <linux-wa@chanae.alphanet.ch>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=iso-8859-1\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#: popthelp.c:23
+msgid "Show this help message"
+msgstr "Mostrer ci messaedje d' aide chal"
+
+#: popthelp.c:24
+msgid "Display brief usage message"
+msgstr "Mostre on court messaedje so kmint vos � siervi"
diff --git a/po/zh_CN.GB2312.po b/po/zh_CN.GB2312.po
new file mode 100644
index 0000000..19dfebe
--- /dev/null
+++ b/po/zh_CN.GB2312.po
@@ -0,0 +1,18 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: kcmkpanel\n"
+"POT-Creation-Date: 1999-05-31 18:09-0400\n"
+"PO-Revision-Date: 1999-11-11 05:04+0800\n"
+"Last-Translator: Dillion Chen <dillon.chen@turbolinux.com.cn>\n"
+"Language-Team: TLDN\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=gb2312\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#: ../popthelp.c:35
+msgid "Show this help message"
+msgstr "��ʾ����������Ϣ"
+
+#: ../popthelp.c:36
+msgid "Display brief usage message"
+msgstr "��ʾ���ʹ����Ϣ"
-- 
Gitee


From 25d183f806ff3a75b9614d39b34a374e66ab0acd Mon Sep 17 00:00:00 2001
From: Jeff Johnson <n3npq@mac.com>
Date: Sun, 9 Jul 2000 23:10:25 +0000
Subject: [PATCH 258/667] - prefix payload paths with "./", otherwise "/" can't
 be represented. - fix: compressFilelist broke when fed '/'. - fix: typo in
 --last popt alias (#12690). - fix: clean file paths before performing -qf
 (#12493).

---
 po/popt.pot | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/po/popt.pot b/po/popt.pot
index 6378d9c..79aa22d 100644
--- a/po/popt.pot
+++ b/po/popt.pot
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2000-05-31 21:46-0400\n"
+"POT-Creation-Date: 2000-07-09 15:05-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
-- 
Gitee


From f67583785d59987fe480559e5cddbd4491e190ea Mon Sep 17 00:00:00 2001
From: Jeff Johnson <n3npq@mac.com>
Date: Sun, 9 Jul 2000 23:23:00 +0000
Subject: [PATCH 259/667] Sanoty (make dist).

---
 po/ro.po | 2 +-
 po/sk.po | 2 +-
 po/tr.po | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/po/ro.po b/po/ro.po
index 0d21b25..841731e 100644
--- a/po/ro.po
+++ b/po/ro.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6\n"
-"POT-Creation-Date: 2000-05-31 21:46-0400\n"
+"POT-Creation-Date: 2000-07-09 15:05-0400\n"
 "PO-Revision-Date: 2000-06-14 23:23+EST\n"
 "Last-Translator: Cristian Gafton <gafton@redhat.com>\n"
 "Language-Team: Romanian <ro@li.org>\n"
diff --git a/po/sk.po b/po/sk.po
index b31a128..eb9a8b8 100644
--- a/po/sk.po
+++ b/po/sk.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt\n"
-"POT-Creation-Date: 2000-05-31 21:46-0400\n"
+"POT-Creation-Date: 2000-07-09 15:05-0400\n"
 "PO-Revision-Date: 1999-08-04 21:40+0200\n"
 "Last-Translator: Stanislav Meduna <stano@eunet.sk>\n"
 "Language-Team: Slovak <sk-i18n@rak.isternet.sk>\n"
diff --git a/po/tr.po b/po/tr.po
index 2dd89d7..041be0a 100644
--- a/po/tr.po
+++ b/po/tr.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.2\n"
-"POT-Creation-Date: 2000-05-31 21:46-0400\n"
+"POT-Creation-Date: 2000-07-09 15:05-0400\n"
 "PO-Revision-Date: 2000-01-06 13:01+0100\n"
 "Last-Translator: Fatih Demir <kabalak@gmx.net>\n"
 "Language-Team: Turkish Gnome Tranlation Team <gnotrap@gmx.net>\n"
-- 
Gitee


From 649e6b15530b48202b1d7679501c5c0fdbbb935e Mon Sep 17 00:00:00 2001
From: Jeff Johnson <n3npq@mac.com>
Date: Tue, 11 Jul 2000 22:23:19 +0000
Subject: [PATCH 260/667] - fix: legacy requires './' payload prefix to be
 omitted for rpm itself. - fix: remove verbose database +++/--- messages to
 conform to doco.

---
 po/cs.po           | 2 +-
 po/da.po           | 2 +-
 po/de.po           | 2 +-
 po/es.po           | 2 +-
 po/fi.po           | 2 +-
 po/fr.po           | 2 +-
 po/gl.po           | 2 +-
 po/hu.po           | 2 +-
 po/id.po           | 2 +-
 po/is.po           | 2 +-
 po/it.po           | 2 +-
 po/ja.po           | 2 +-
 po/ko.po           | 2 +-
 po/no.po           | 2 +-
 po/pl.po           | 2 +-
 po/pt.po           | 2 +-
 po/pt_BR.po        | 2 +-
 po/ru.po           | 2 +-
 po/sl.po           | 2 +-
 po/sr.po           | 2 +-
 po/sv.po           | 2 +-
 po/uk.po           | 6 +++---
 po/wa.po           | 2 +-
 po/zh_CN.GB2312.po | 6 +++---
 24 files changed, 28 insertions(+), 28 deletions(-)

diff --git a/po/cs.po b/po/cs.po
index 712c5d7..3bbf418 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.3\n"
-"POT-Creation-Date: 1999-12-16 12:42-0500\n"
+"POT-Creation-Date: 2000-07-09 15:05-0400\n"
 "PO-Revision-Date: 1999-10-23 18:49+02:00\n"
 "Last-Translator: Stanislav Brabec <utx@k332.feld.cvut.cz>\n"
 "Language-Team: Czech <cs@li.org>\n"
diff --git a/po/da.po b/po/da.po
index 63a8ab9..644f1fa 100644
--- a/po/da.po
+++ b/po/da.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt\n"
-"POT-Creation-Date: 2000-05-31 21:46-0400\n"
+"POT-Creation-Date: 2000-07-09 15:05-0400\n"
 "PO-Revision-Date: 2000-03-07 05:17+01:00\n"
 "Last-Translator: K. Christiansen <kenneth@gnu.org>\n"
 "Language-Team: Danish/Dansk <dansk@klid.dk>\n"
diff --git a/po/de.po b/po/de.po
index 6378d9c..79aa22d 100644
--- a/po/de.po
+++ b/po/de.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2000-05-31 21:46-0400\n"
+"POT-Creation-Date: 2000-07-09 15:05-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/po/es.po b/po/es.po
index 6378d9c..79aa22d 100644
--- a/po/es.po
+++ b/po/es.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2000-05-31 21:46-0400\n"
+"POT-Creation-Date: 2000-07-09 15:05-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/po/fi.po b/po/fi.po
index 6378d9c..79aa22d 100644
--- a/po/fi.po
+++ b/po/fi.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2000-05-31 21:46-0400\n"
+"POT-Creation-Date: 2000-07-09 15:05-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/po/fr.po b/po/fr.po
index 6378d9c..79aa22d 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2000-05-31 21:46-0400\n"
+"POT-Creation-Date: 2000-07-09 15:05-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/po/gl.po b/po/gl.po
index f9b6836..4efd338 100644
--- a/po/gl.po
+++ b/po/gl.po
@@ -10,7 +10,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.4\n"
-"POT-Creation-Date: 2000-01-06 20:30+0100\n"
+"POT-Creation-Date: 2000-07-09 15:05-0400\n"
 "PO-Revision-Date: 2000-01-06 20:31+0100\n"
 "Last-Translator: Jes�s Bravo �lvarez <jba@pobox.com>\n"
 "Language-Team: Galician <gpul-traduccion@ceu.fi.udc.es>\n"
diff --git a/po/hu.po b/po/hu.po
index 6378d9c..79aa22d 100644
--- a/po/hu.po
+++ b/po/hu.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2000-05-31 21:46-0400\n"
+"POT-Creation-Date: 2000-07-09 15:05-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/po/id.po b/po/id.po
index 6378d9c..79aa22d 100644
--- a/po/id.po
+++ b/po/id.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2000-05-31 21:46-0400\n"
+"POT-Creation-Date: 2000-07-09 15:05-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/po/is.po b/po/is.po
index e5bb3dd..a062e68 100644
--- a/po/is.po
+++ b/po/is.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.0\n"
-"POT-Creation-Date: 2000-05-31 21:46-0400\n"
+"POT-Creation-Date: 2000-07-09 15:05-0400\n"
 "PO-Revision-Date: 2000-06-16 02:12+0000\n"
 "Last-Translator: Richard Allen <ra@hp.is>\n"
 "Language-Team: is <kde-isl@mmedia.is>\n"
diff --git a/po/it.po b/po/it.po
index 6378d9c..79aa22d 100644
--- a/po/it.po
+++ b/po/it.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2000-05-31 21:46-0400\n"
+"POT-Creation-Date: 2000-07-09 15:05-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/po/ja.po b/po/ja.po
index 6378d9c..79aa22d 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2000-05-31 21:46-0400\n"
+"POT-Creation-Date: 2000-07-09 15:05-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/po/ko.po b/po/ko.po
index 6378d9c..79aa22d 100644
--- a/po/ko.po
+++ b/po/ko.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2000-05-31 21:46-0400\n"
+"POT-Creation-Date: 2000-07-09 15:05-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/po/no.po b/po/no.po
index bc5114a..c1746be 100644
--- a/po/no.po
+++ b/po/no.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 7.0\n"
-"POT-Creation-Date: 2000-05-31 21:46-0400\n"
+"POT-Creation-Date: 2000-07-09 15:05-0400\n"
 "PO-Revision-Date: 2000-06-21 16:11+02:00\n"
 "Last-Translator: Kjartan Maraas <kmaraas@online.no>\n"
 "Language-Team: Norwegian <no@li.org>\n"
diff --git a/po/pl.po b/po/pl.po
index 6378d9c..79aa22d 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2000-05-31 21:46-0400\n"
+"POT-Creation-Date: 2000-07-09 15:05-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/po/pt.po b/po/pt.po
index 53169b7..5bba89c 100644
--- a/po/pt.po
+++ b/po/pt.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt\n"
-"POT-Creation-Date: 2000-05-31 21:46-0400\n"
+"POT-Creation-Date: 2000-07-09 15:05-0400\n"
 "PO-Revision-Date: 2000-06-22 01:02+01:00\n"
 "Last-Translator: Pedro Morais <morais@kde.org>\n"
 "Language-Team: pt <morais@kde.org>\n"
diff --git a/po/pt_BR.po b/po/pt_BR.po
index 6378d9c..79aa22d 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2000-05-31 21:46-0400\n"
+"POT-Creation-Date: 2000-07-09 15:05-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/po/ru.po b/po/ru.po
index 6378d9c..79aa22d 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2000-05-31 21:46-0400\n"
+"POT-Creation-Date: 2000-07-09 15:05-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/po/sl.po b/po/sl.po
index 6378d9c..79aa22d 100644
--- a/po/sl.po
+++ b/po/sl.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2000-05-31 21:46-0400\n"
+"POT-Creation-Date: 2000-07-09 15:05-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/po/sr.po b/po/sr.po
index 6378d9c..79aa22d 100644
--- a/po/sr.po
+++ b/po/sr.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2000-05-31 21:46-0400\n"
+"POT-Creation-Date: 2000-07-09 15:05-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/po/sv.po b/po/sv.po
index c448e80..2a6f26a 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt\n"
-"POT-Creation-Date: 2000-05-31 21:46-0400\n"
+"POT-Creation-Date: 2000-07-09 15:05-0400\n"
 "PO-Revision-Date: 2000-06-20 00:07+0200\n"
 "Last-Translator: Christian Rose <menthos@menthos.com>\n"
 "Language-Team: Swedish <sv@li.org>\n"
diff --git a/po/uk.po b/po/uk.po
index bdd08f4..bd20477 100644
--- a/po/uk.po
+++ b/po/uk.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.4\n"
-"POT-Creation-Date: 1999-05-31 18:09-0400\n"
+"POT-Creation-Date: 2000-07-09 15:05-0400\n"
 "PO-Revision-Date: 1999-09-30 16:54+0200\n"
 "Last-Translator: Yuri Syrota <rasta@renome.rovno.ua>\n"
 "Language-Team: Ukrainian <uk@li.org>\n"
@@ -13,10 +13,10 @@ msgstr ""
 "Content-Type: text/plain; charset=koi8-u\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../popthelp.c:35
+#: popthelp.c:23
 msgid "Show this help message"
 msgstr "�������� �� ��צ���"
 
-#: ../popthelp.c:36
+#: popthelp.c:24
 msgid "Display brief usage message"
 msgstr "�������� ������� ��צ��� ��� ������������"
diff --git a/po/wa.po b/po/wa.po
index 403374e..cbf357b 100644
--- a/po/wa.po
+++ b/po/wa.po
@@ -9,7 +9,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.3\n"
-"POT-Creation-Date: 1999-12-16 12:42-0500\n"
+"POT-Creation-Date: 2000-07-09 15:05-0400\n"
 "PO-Revision-Date: 1999-03-18 23:11+0100\n"
 "Last-Translator: Nobody yet\n"
 "Language-Team: walon <linux-wa@chanae.alphanet.ch>\n"
diff --git a/po/zh_CN.GB2312.po b/po/zh_CN.GB2312.po
index 19dfebe..44972ae 100644
--- a/po/zh_CN.GB2312.po
+++ b/po/zh_CN.GB2312.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: kcmkpanel\n"
-"POT-Creation-Date: 1999-05-31 18:09-0400\n"
+"POT-Creation-Date: 2000-07-09 15:05-0400\n"
 "PO-Revision-Date: 1999-11-11 05:04+0800\n"
 "Last-Translator: Dillion Chen <dillon.chen@turbolinux.com.cn>\n"
 "Language-Team: TLDN\n"
@@ -9,10 +9,10 @@ msgstr ""
 "Content-Type: text/plain; charset=gb2312\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../popthelp.c:35
+#: popthelp.c:23
 msgid "Show this help message"
 msgstr "��ʾ����������Ϣ"
 
-#: ../popthelp.c:36
+#: popthelp.c:24
 msgid "Display brief usage message"
 msgstr "��ʾ���ʹ����Ϣ"
-- 
Gitee


From 5820ea9cb05d935be10d38bbeea4ee559a760fc4 Mon Sep 17 00:00:00 2001
From: Jeff Johnson <n3npq@mac.com>
Date: Tue, 25 Jul 2000 14:04:24 +0000
Subject: [PATCH 261/667] New file

---
 po/zh.po | 23 +++++++++++++++++++++++
 1 file changed, 23 insertions(+)
 create mode 100644 po/zh.po

diff --git a/po/zh.po b/po/zh.po
new file mode 100644
index 0000000..79aa22d
--- /dev/null
+++ b/po/zh.po
@@ -0,0 +1,23 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR Free Software Foundation, Inc.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"POT-Creation-Date: 2000-07-09 15:05-0400\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=CHARSET\n"
+"Content-Transfer-Encoding: ENCODING\n"
+
+#: popthelp.c:23
+msgid "Show this help message"
+msgstr ""
+
+#: popthelp.c:24
+msgid "Display brief usage message"
+msgstr ""
-- 
Gitee


From 4d0450b44bae76e1f11386caa04897653fbd721b Mon Sep 17 00:00:00 2001
From: Jeff Johnson <n3npq@mac.com>
Date: Tue, 25 Jul 2000 18:37:33 +0000
Subject: [PATCH 262/667] - create rpmbuild/rpmquery/rpmverify/rpmsign
 symlinks.

---
 configure.in | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/configure.in b/configure.in
index 210fe7e..0947e5e 100755
--- a/configure.in
+++ b/configure.in
@@ -3,7 +3,7 @@ AM_CONFIG_HEADER(config.h)
 AC_PREREQ(2.12)
 AC_CANONICAL_SYSTEM
 AM_INIT_AUTOMAKE(popt, 1.6)
-ALL_LINGUAS="cs da de es fi fr gl hu id is it ja ko no pl pt pt_BR ro ru sk sl sr sv tr uk wa zh_CN.GB2312"
+ALL_LINGUAS="cs da de es fi fr gl hu id is it ja ko no pl pt pt_BR ro ru sk sl sr sv tr uk wa zh zh_CN.GB2312"
 
 AC_ISC_POSIX
 
-- 
Gitee


From 8dc17112c4d7477a7d2b154a43256d0cc4443c65 Mon Sep 17 00:00:00 2001
From: Jeff Johnson <n3npq@mac.com>
Date: Wed, 26 Jul 2000 21:07:14 +0000
Subject: [PATCH 263/667] Auto-update by milan.kerslager@spsselib.hiedu.cz

---
 po/cs.po | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/po/cs.po b/po/cs.po
index 3bbf418..ed16490 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -1,13 +1,9 @@
-# This is the Czech locale definition for popt.
-# Copyright (C) 1999 Free Software Foundation, Inc.
-# Stanislav Brabec <utx@k332.feld.cvut.cz>, 1999.
-#
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.3\n"
 "POT-Creation-Date: 2000-07-09 15:05-0400\n"
-"PO-Revision-Date: 1999-10-23 18:49+02:00\n"
-"Last-Translator: Stanislav Brabec <utx@k332.feld.cvut.cz>\n"
+"PO-Revision-Date: 2000-07-26 23:06+0100\n"
+"Last-Translator: Milan Kerslager <milan.kerslager@spsselib.hiedu.cz>\n"
 "Language-Team: Czech <cs@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=iso-8859-2\n"
-- 
Gitee


From 1ae801e4be86bfc719f096341819cd8d1f5c5bb5 Mon Sep 17 00:00:00 2001
From: Jeff Johnson <n3npq@mac.com>
Date: Wed, 26 Jul 2000 21:10:11 +0000
Subject: [PATCH 264/667] Auto-update by milan.kerslager@spsselib.hiedu.cz

---
 po/cs.po | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/po/cs.po b/po/cs.po
index ed16490..92e7729 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.3\n"
 "POT-Creation-Date: 2000-07-09 15:05-0400\n"
-"PO-Revision-Date: 2000-07-26 23:06+0100\n"
+"PO-Revision-Date: 2000-07-26 23:09+0100\n"
 "Last-Translator: Milan Kerslager <milan.kerslager@spsselib.hiedu.cz>\n"
 "Language-Team: Czech <cs@li.org>\n"
 "MIME-Version: 1.0\n"
@@ -15,4 +15,4 @@ msgstr "Vyp
 
 #: popthelp.c:24
 msgid "Display brief usage message"
-msgstr "Vyp��e kr�tk� n�vod na pou�it�"
+msgstr "Vyp��e kr�tk� n�vod k pou�it�"
-- 
Gitee


From 11edbd4635bc686f5508c4ee3d15d2320b0bf402 Mon Sep 17 00:00:00 2001
From: Jeff Johnson <n3npq@mac.com>
Date: Mon, 31 Jul 2000 15:04:23 +0000
Subject: [PATCH 265/667] - fix: uniqify dependency problems when printing
 (#14034). - popt: add ability to perform callbacks for every, not just first,
 match.

---
 CHANGES            |  5 ++-
 po/cs.po           |  2 +-
 po/da.po           |  2 +-
 po/de.po           |  2 +-
 po/es.po           |  2 +-
 po/fi.po           |  2 +-
 po/fr.po           |  2 +-
 po/gl.po           |  2 +-
 po/hu.po           |  2 +-
 po/id.po           |  2 +-
 po/is.po           |  2 +-
 po/it.po           |  2 +-
 po/ja.po           |  2 +-
 po/ko.po           |  2 +-
 po/no.po           |  2 +-
 po/pl.po           |  2 +-
 po/popt.pot        |  2 +-
 po/pt.po           |  2 +-
 po/pt_BR.po        |  2 +-
 po/ro.po           |  2 +-
 po/ru.po           |  2 +-
 po/sk.po           |  2 +-
 po/sl.po           |  2 +-
 po/sr.po           |  2 +-
 po/sv.po           |  2 +-
 po/tr.po           |  2 +-
 po/uk.po           |  2 +-
 po/wa.po           |  2 +-
 po/zh.po           |  2 +-
 po/zh_CN.GB2312.po |  2 +-
 popt.c             | 98 ++++++++++++++++++++++++++++++++++------------
 popt.h             |  2 +
 32 files changed, 109 insertions(+), 54 deletions(-)

diff --git a/CHANGES b/CHANGES
index b6ab2aa..db16a5f 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,4 +1,7 @@
-1.3 ->
+1.5 -> 1.6
+	- add ability to perform callbacks for every, not just first, match.
+
+1.3 -> 1.5
 	- heavy dose of const's
 	- poptParseArgvString() now NULL terminates the list
 
diff --git a/po/cs.po b/po/cs.po
index 92e7729..14f88e1 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.3\n"
-"POT-Creation-Date: 2000-07-09 15:05-0400\n"
+"POT-Creation-Date: 2000-07-30 09:36-0400\n"
 "PO-Revision-Date: 2000-07-26 23:09+0100\n"
 "Last-Translator: Milan Kerslager <milan.kerslager@spsselib.hiedu.cz>\n"
 "Language-Team: Czech <cs@li.org>\n"
diff --git a/po/da.po b/po/da.po
index 644f1fa..af02b5a 100644
--- a/po/da.po
+++ b/po/da.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt\n"
-"POT-Creation-Date: 2000-07-09 15:05-0400\n"
+"POT-Creation-Date: 2000-07-30 09:36-0400\n"
 "PO-Revision-Date: 2000-03-07 05:17+01:00\n"
 "Last-Translator: K. Christiansen <kenneth@gnu.org>\n"
 "Language-Team: Danish/Dansk <dansk@klid.dk>\n"
diff --git a/po/de.po b/po/de.po
index 79aa22d..2c19397 100644
--- a/po/de.po
+++ b/po/de.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2000-07-09 15:05-0400\n"
+"POT-Creation-Date: 2000-07-30 09:36-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/po/es.po b/po/es.po
index 79aa22d..2c19397 100644
--- a/po/es.po
+++ b/po/es.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2000-07-09 15:05-0400\n"
+"POT-Creation-Date: 2000-07-30 09:36-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/po/fi.po b/po/fi.po
index 79aa22d..2c19397 100644
--- a/po/fi.po
+++ b/po/fi.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2000-07-09 15:05-0400\n"
+"POT-Creation-Date: 2000-07-30 09:36-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/po/fr.po b/po/fr.po
index 79aa22d..2c19397 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2000-07-09 15:05-0400\n"
+"POT-Creation-Date: 2000-07-30 09:36-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/po/gl.po b/po/gl.po
index 4efd338..cb7e52d 100644
--- a/po/gl.po
+++ b/po/gl.po
@@ -10,7 +10,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.4\n"
-"POT-Creation-Date: 2000-07-09 15:05-0400\n"
+"POT-Creation-Date: 2000-07-30 09:36-0400\n"
 "PO-Revision-Date: 2000-01-06 20:31+0100\n"
 "Last-Translator: Jes�s Bravo �lvarez <jba@pobox.com>\n"
 "Language-Team: Galician <gpul-traduccion@ceu.fi.udc.es>\n"
diff --git a/po/hu.po b/po/hu.po
index 79aa22d..2c19397 100644
--- a/po/hu.po
+++ b/po/hu.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2000-07-09 15:05-0400\n"
+"POT-Creation-Date: 2000-07-30 09:36-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/po/id.po b/po/id.po
index 79aa22d..2c19397 100644
--- a/po/id.po
+++ b/po/id.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2000-07-09 15:05-0400\n"
+"POT-Creation-Date: 2000-07-30 09:36-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/po/is.po b/po/is.po
index a062e68..8540f16 100644
--- a/po/is.po
+++ b/po/is.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.0\n"
-"POT-Creation-Date: 2000-07-09 15:05-0400\n"
+"POT-Creation-Date: 2000-07-30 09:36-0400\n"
 "PO-Revision-Date: 2000-06-16 02:12+0000\n"
 "Last-Translator: Richard Allen <ra@hp.is>\n"
 "Language-Team: is <kde-isl@mmedia.is>\n"
diff --git a/po/it.po b/po/it.po
index 79aa22d..2c19397 100644
--- a/po/it.po
+++ b/po/it.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2000-07-09 15:05-0400\n"
+"POT-Creation-Date: 2000-07-30 09:36-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/po/ja.po b/po/ja.po
index 79aa22d..2c19397 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2000-07-09 15:05-0400\n"
+"POT-Creation-Date: 2000-07-30 09:36-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/po/ko.po b/po/ko.po
index 79aa22d..2c19397 100644
--- a/po/ko.po
+++ b/po/ko.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2000-07-09 15:05-0400\n"
+"POT-Creation-Date: 2000-07-30 09:36-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/po/no.po b/po/no.po
index c1746be..99732b0 100644
--- a/po/no.po
+++ b/po/no.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 7.0\n"
-"POT-Creation-Date: 2000-07-09 15:05-0400\n"
+"POT-Creation-Date: 2000-07-30 09:36-0400\n"
 "PO-Revision-Date: 2000-06-21 16:11+02:00\n"
 "Last-Translator: Kjartan Maraas <kmaraas@online.no>\n"
 "Language-Team: Norwegian <no@li.org>\n"
diff --git a/po/pl.po b/po/pl.po
index 79aa22d..2c19397 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2000-07-09 15:05-0400\n"
+"POT-Creation-Date: 2000-07-30 09:36-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/po/popt.pot b/po/popt.pot
index 79aa22d..2c19397 100644
--- a/po/popt.pot
+++ b/po/popt.pot
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2000-07-09 15:05-0400\n"
+"POT-Creation-Date: 2000-07-30 09:36-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/po/pt.po b/po/pt.po
index 5bba89c..c132180 100644
--- a/po/pt.po
+++ b/po/pt.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt\n"
-"POT-Creation-Date: 2000-07-09 15:05-0400\n"
+"POT-Creation-Date: 2000-07-30 09:36-0400\n"
 "PO-Revision-Date: 2000-06-22 01:02+01:00\n"
 "Last-Translator: Pedro Morais <morais@kde.org>\n"
 "Language-Team: pt <morais@kde.org>\n"
diff --git a/po/pt_BR.po b/po/pt_BR.po
index 79aa22d..2c19397 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2000-07-09 15:05-0400\n"
+"POT-Creation-Date: 2000-07-30 09:36-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/po/ro.po b/po/ro.po
index 841731e..7d6feda 100644
--- a/po/ro.po
+++ b/po/ro.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6\n"
-"POT-Creation-Date: 2000-07-09 15:05-0400\n"
+"POT-Creation-Date: 2000-07-30 09:36-0400\n"
 "PO-Revision-Date: 2000-06-14 23:23+EST\n"
 "Last-Translator: Cristian Gafton <gafton@redhat.com>\n"
 "Language-Team: Romanian <ro@li.org>\n"
diff --git a/po/ru.po b/po/ru.po
index 79aa22d..2c19397 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2000-07-09 15:05-0400\n"
+"POT-Creation-Date: 2000-07-30 09:36-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/po/sk.po b/po/sk.po
index eb9a8b8..172c263 100644
--- a/po/sk.po
+++ b/po/sk.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt\n"
-"POT-Creation-Date: 2000-07-09 15:05-0400\n"
+"POT-Creation-Date: 2000-07-30 09:36-0400\n"
 "PO-Revision-Date: 1999-08-04 21:40+0200\n"
 "Last-Translator: Stanislav Meduna <stano@eunet.sk>\n"
 "Language-Team: Slovak <sk-i18n@rak.isternet.sk>\n"
diff --git a/po/sl.po b/po/sl.po
index 79aa22d..2c19397 100644
--- a/po/sl.po
+++ b/po/sl.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2000-07-09 15:05-0400\n"
+"POT-Creation-Date: 2000-07-30 09:36-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/po/sr.po b/po/sr.po
index 79aa22d..2c19397 100644
--- a/po/sr.po
+++ b/po/sr.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2000-07-09 15:05-0400\n"
+"POT-Creation-Date: 2000-07-30 09:36-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/po/sv.po b/po/sv.po
index 2a6f26a..649a79c 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt\n"
-"POT-Creation-Date: 2000-07-09 15:05-0400\n"
+"POT-Creation-Date: 2000-07-30 09:36-0400\n"
 "PO-Revision-Date: 2000-06-20 00:07+0200\n"
 "Last-Translator: Christian Rose <menthos@menthos.com>\n"
 "Language-Team: Swedish <sv@li.org>\n"
diff --git a/po/tr.po b/po/tr.po
index 041be0a..a1333f5 100644
--- a/po/tr.po
+++ b/po/tr.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.2\n"
-"POT-Creation-Date: 2000-07-09 15:05-0400\n"
+"POT-Creation-Date: 2000-07-30 09:36-0400\n"
 "PO-Revision-Date: 2000-01-06 13:01+0100\n"
 "Last-Translator: Fatih Demir <kabalak@gmx.net>\n"
 "Language-Team: Turkish Gnome Tranlation Team <gnotrap@gmx.net>\n"
diff --git a/po/uk.po b/po/uk.po
index bd20477..2e8dd21 100644
--- a/po/uk.po
+++ b/po/uk.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.4\n"
-"POT-Creation-Date: 2000-07-09 15:05-0400\n"
+"POT-Creation-Date: 2000-07-30 09:36-0400\n"
 "PO-Revision-Date: 1999-09-30 16:54+0200\n"
 "Last-Translator: Yuri Syrota <rasta@renome.rovno.ua>\n"
 "Language-Team: Ukrainian <uk@li.org>\n"
diff --git a/po/wa.po b/po/wa.po
index cbf357b..cb7af66 100644
--- a/po/wa.po
+++ b/po/wa.po
@@ -9,7 +9,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.3\n"
-"POT-Creation-Date: 2000-07-09 15:05-0400\n"
+"POT-Creation-Date: 2000-07-30 09:36-0400\n"
 "PO-Revision-Date: 1999-03-18 23:11+0100\n"
 "Last-Translator: Nobody yet\n"
 "Language-Team: walon <linux-wa@chanae.alphanet.ch>\n"
diff --git a/po/zh.po b/po/zh.po
index 79aa22d..2c19397 100644
--- a/po/zh.po
+++ b/po/zh.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2000-07-09 15:05-0400\n"
+"POT-Creation-Date: 2000-07-30 09:36-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/po/zh_CN.GB2312.po b/po/zh_CN.GB2312.po
index 44972ae..5c158de 100644
--- a/po/zh_CN.GB2312.po
+++ b/po/zh_CN.GB2312.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: kcmkpanel\n"
-"POT-Creation-Date: 2000-07-09 15:05-0400\n"
+"POT-Creation-Date: 2000-07-30 09:36-0400\n"
 "PO-Revision-Date: 1999-11-11 05:04+0800\n"
 "Last-Translator: Dillion Chen <dillon.chen@turbolinux.com.cn>\n"
 "Language-Team: TLDN\n"
diff --git a/popt.c b/popt.c
index 5b2c8d5..8527295 100644
--- a/popt.c
+++ b/popt.c
@@ -26,27 +26,72 @@ void poptSetExecPath(poptContext con, const char * path, int allowAbsolute) {
     con->execAbsolute = allowAbsolute;
 }
 
-static void invokeCallbacks(poptContext con, const struct poptOption * table,
-			    int post) {
-    const struct poptOption * opt = table;
-    poptCallbackType cb;
+static void invokeCallbacksPRE(poptContext con, const struct poptOption * opt)
+{
+    for (; opt->longName || opt->shortName || opt->arg; opt++) {
+	if ((opt->argInfo & POPT_ARG_MASK) == POPT_ARG_INCLUDE_TABLE) {
+	    /* Recurse on included sub-tables. */
+	    invokeCallbacksPRE(con, opt->arg);
+	} else if ((opt->argInfo & POPT_ARG_MASK) == POPT_ARG_CALLBACK &&
+		   (opt->argInfo & POPT_CBFLAG_PRE))
+	{   poptCallbackType cb = (poptCallbackType)opt->arg;
+	    /* Perform callback. */
+	    cb(con, POPT_CALLBACK_REASON_PRE, NULL, NULL, opt->descrip);
+	}
+    }
+}
 
-    while (opt->longName || opt->shortName || opt->arg) {
+static void invokeCallbacksPOST(poptContext con, const struct poptOption * opt)
+{
+    for (; opt->longName || opt->shortName || opt->arg; opt++) {
 	if ((opt->argInfo & POPT_ARG_MASK) == POPT_ARG_INCLUDE_TABLE) {
-	    invokeCallbacks(con, opt->arg, post);
-	} else if (((opt->argInfo & POPT_ARG_MASK) == POPT_ARG_CALLBACK) &&
-		   ((!post && (opt->argInfo & POPT_CBFLAG_PRE)) ||
-		    ( post && (opt->argInfo & POPT_CBFLAG_POST)))) {
-	    cb = (poptCallbackType)opt->arg;
-	    cb(con, post ? POPT_CALLBACK_REASON_POST : POPT_CALLBACK_REASON_PRE,
-	       NULL, NULL, opt->descrip);
+	    /* Recurse on included sub-tables. */
+	    invokeCallbacksPRE(con, opt->arg);
+	} else if ((opt->argInfo & POPT_ARG_MASK) == POPT_ARG_CALLBACK &&
+		   (opt->argInfo & POPT_CBFLAG_POST))
+	{   poptCallbackType cb = (poptCallbackType)opt->arg;
+	    /* Perform callback. */
+	    cb(con, POPT_CALLBACK_REASON_POST, NULL, NULL, opt->descrip);
+	}
+    }
+}
+
+static void invokeCallbacksOPTION(poptContext con,
+				  const struct poptOption * opt,
+				  const struct poptOption * myOpt,
+				  const void * myData, int shorty)
+{
+    const struct poptOption * cbopt = NULL;
+
+    for (; opt->longName || opt->shortName || opt->arg; opt++) {
+	if ((opt->argInfo & POPT_ARG_MASK) == POPT_ARG_INCLUDE_TABLE) {
+	    /* Recurse on included sub-tables. */
+	    invokeCallbacksOPTION(con, opt->arg, myOpt, myData, shorty);
+	} else if ((opt->argInfo & POPT_ARG_MASK) == POPT_ARG_CALLBACK &&
+		  !(opt->argInfo & POPT_CBFLAG_SKIPOPTION)) {
+	    /* Save callback info. */
+	    cbopt = opt;
+	} else if (cbopt != NULL &&
+		   ((myOpt->shortName && opt->shortName && shorty &&
+			myOpt->shortName == opt->shortName) ||
+		    (myOpt->longName && opt->longName &&
+			!strcmp(myOpt->longName, opt->longName)))
+		   )
+	{   poptCallbackType cb = (poptCallbackType)cbopt->arg;
+	    const void * cbData = (cbopt->descrip ? cbopt->descrip : myData);
+	    /* Perform callback. */
+	    cb(con, POPT_CALLBACK_REASON_OPTION, myOpt,
+			con->os->nextArg, cbData);
+	    /* Terminate (unless explcitly continuing). */
+	    if (!(cbopt->argInfo & POPT_CBFLAG_CONTINUE))
+		return;
 	}
-	opt++;
     }
 }
 
 poptContext poptGetContext(const char * name, int argc, const char ** argv,
-			   const struct poptOption * options, int flags) {
+			   const struct poptOption * options, int flags)
+{
     poptContext con = malloc(sizeof(*con));
 
     memset(con, 0, sizeof(*con));
@@ -77,7 +122,7 @@ poptContext poptGetContext(const char * name, int argc, const char ** argv,
     if (name)
 	con->appName = strcpy(malloc(strlen(name) + 1), name);
 
-    invokeCallbacks(con, con->options, 0);
+    invokeCallbacksPRE(con, con->options);
 
     return con;
 }
@@ -290,25 +335,27 @@ static void execCommand(poptContext con) {
 }
 
 /*@observer@*/ static const struct poptOption *
-findOption(const struct poptOption * table, const char * longName,
+findOption(const struct poptOption * opt, const char * longName,
     char shortName,
     /*@out@*/ poptCallbackType * callback, /*@out@*/ const void ** callbackData,
     int singleDash)
 {
-    const struct poptOption * opt = table;
-    const struct poptOption * opt2;
     const struct poptOption * cb = NULL;
 
     /* This happens when a single - is given */
     if (singleDash && !shortName && !*longName)
 	shortName = '-';
 
-    while (opt->longName || opt->shortName || opt->arg) {
+    for (; opt->longName || opt->shortName || opt->arg; opt++) {
+
 	if ((opt->argInfo & POPT_ARG_MASK) == POPT_ARG_INCLUDE_TABLE) {
+	    const struct poptOption * opt2;
+	    /* Recurse on included sub-tables. */
 	    opt2 = findOption(opt->arg, longName, shortName, callback,
 			      callbackData, singleDash);
 	    if (opt2) {
-		if (*callback && !*callbackData)
+		/* Sub-table data will be inheirited if no data yet. */
+		if (*callback && *callbackData == NULL)
 		    *callbackData = opt->descrip;
 		return opt2;
 	    }
@@ -321,10 +368,10 @@ findOption(const struct poptOption * table, const char * longName,
 	} else if (shortName && shortName == opt->shortName) {
 	    break;
 	}
-	opt++;
     }
 
-    if (!opt->longName && !opt->shortName) return NULL;
+    if (!opt->longName && !opt->shortName)
+	return NULL;
     *callbackData = NULL;
     *callback = NULL;
     if (cb) {
@@ -482,13 +529,14 @@ int poptGetNextOpt(poptContext con)
 	const void * cbData = NULL;
 	const char * longArg = NULL;
 	int canstrip = 0;
+	int shorty = 0;
 
 	while (!con->os->nextCharArg && con->os->next == con->os->argc
 		&& con->os > con->optionStack) {
 	    cleanOSE(con->os--);
 	}
 	if (!con->os->nextCharArg && con->os->next == con->os->argc) {
-	    invokeCallbacks(con, con->options, 1);
+	    invokeCallbacksPOST(con, con->options);
 	    if (con->doExec) execCommand(con);
 	    return -1;
 	}
@@ -562,6 +610,7 @@ int poptGetNextOpt(poptContext con)
 		    canstrip = 1;
 		    poptStripArg(con, thisopt);
 		}
+		shorty = 0;
 	    }
 	}
 
@@ -586,6 +635,7 @@ int poptGetNextOpt(poptContext con)
 			     &cbData, 0);
 	    if (!opt)
 		return POPT_ERROR_BADOPT;
+	    shorty = 1;
 
 	    origOptString++;
 	    if (*origOptString) con->os->nextCharArg = origOptString;
@@ -666,7 +716,7 @@ int poptGetNextOpt(poptContext con)
 	}
 
 	if (cb)
-	    cb(con, POPT_CALLBACK_REASON_OPTION, opt, con->os->nextArg, cbData);
+	    invokeCallbacksOPTION(con, con->options, opt, cbData, shorty);
 	else if (opt->val && ((opt->argInfo & POPT_ARG_MASK) != POPT_ARG_VAL))
 	    done = 1;
 
diff --git a/popt.h b/popt.h
index 841adcb..2209f38 100644
--- a/popt.h
+++ b/popt.h
@@ -46,6 +46,8 @@ extern "C" {
 #define POPT_CBFLAG_POST	0x40000000  /* call the callback after parse */
 #define POPT_CBFLAG_INC_DATA	0x20000000  /* use data from the include line,
 					       not the subtable */
+#define POPT_CBFLAG_SKIPOPTION	0x10000000  /* don't callback with option */
+#define POPT_CBFLAG_CONTINUE	0x08000000  /* continue callbacks with option */
 
 #define POPT_ERROR_NOARG	-10
 #define POPT_ERROR_BADOPT	-11
-- 
Gitee


From 5463c29d13206287a67d7e2f00e4c885f400731b Mon Sep 17 00:00:00 2001
From: Jeff Johnson <n3npq@mac.com>
Date: Thu, 3 Aug 2000 21:48:27 +0000
Subject: [PATCH 266/667] Auto-update by nemeth@qwertynet.hu

---
 po/hu.po | 21 ++++++++-------------
 1 file changed, 8 insertions(+), 13 deletions(-)

diff --git a/po/hu.po b/po/hu.po
index 2c19397..9179f5a 100644
--- a/po/hu.po
+++ b/po/hu.po
@@ -1,23 +1,18 @@
-# SOME DESCRIPTIVE TITLE.
-# Copyright (C) YEAR Free Software Foundation, Inc.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#
-#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
+"Project-Id-Version: popt\n"
 "POT-Creation-Date: 2000-07-30 09:36-0400\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
+"PO-Revision-Date: 2000-08-03 23:26+0200\n"
+"Last-Translator: L�szl� N�meth <nemeth@qwertynet.hu>\n"
+"Language-Team: Hungarian\n"
 "MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=CHARSET\n"
-"Content-Transfer-Encoding: ENCODING\n"
+"Content-Type: text/plain; charset=ISO-8859-2\n"
+"Content-Transfer-Encoding: 8-bit\n"
 
 #: popthelp.c:23
 msgid "Show this help message"
-msgstr ""
+msgstr "E s�g� megjelen�t�se"
 
 #: popthelp.c:24
 msgid "Display brief usage message"
-msgstr ""
+msgstr "R�vid haszn�lati utas�t�s megjelen�t�se"
-- 
Gitee


From 8330535f61b7ac009fbdcb8cff836e02aea08d7c Mon Sep 17 00:00:00 2001
From: Jeff Johnson <n3npq@mac.com>
Date: Fri, 4 Aug 2000 19:47:22 +0000
Subject: [PATCH 267/667] - fix: popt POST callbacks typo.

---
 popt.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/popt.c b/popt.c
index 8527295..4979ed5 100644
--- a/popt.c
+++ b/popt.c
@@ -46,7 +46,7 @@ static void invokeCallbacksPOST(poptContext con, const struct poptOption * opt)
     for (; opt->longName || opt->shortName || opt->arg; opt++) {
 	if ((opt->argInfo & POPT_ARG_MASK) == POPT_ARG_INCLUDE_TABLE) {
 	    /* Recurse on included sub-tables. */
-	    invokeCallbacksPRE(con, opt->arg);
+	    invokeCallbacksPOST(con, opt->arg);
 	} else if ((opt->argInfo & POPT_ARG_MASK) == POPT_ARG_CALLBACK &&
 		   (opt->argInfo & POPT_CBFLAG_POST))
 	{   poptCallbackType cb = (poptCallbackType)opt->arg;
-- 
Gitee


From 4f0afd05997298ccb6bb66846dc4bf992fedfec5 Mon Sep 17 00:00:00 2001
From: Jeff Johnson <n3npq@mac.com>
Date: Fri, 4 Aug 2000 19:52:57 +0000
Subject: [PATCH 268/667] Sanity (make dist).

---
 po/cs.po           | 2 +-
 po/da.po           | 2 +-
 po/de.po           | 2 +-
 po/es.po           | 2 +-
 po/fi.po           | 2 +-
 po/fr.po           | 2 +-
 po/gl.po           | 2 +-
 po/hu.po           | 2 +-
 po/id.po           | 2 +-
 po/is.po           | 2 +-
 po/it.po           | 2 +-
 po/ja.po           | 2 +-
 po/ko.po           | 2 +-
 po/no.po           | 2 +-
 po/pl.po           | 2 +-
 po/popt.pot        | 2 +-
 po/pt.po           | 2 +-
 po/pt_BR.po        | 2 +-
 po/ro.po           | 2 +-
 po/ru.po           | 2 +-
 po/sk.po           | 2 +-
 po/sl.po           | 2 +-
 po/sr.po           | 2 +-
 po/sv.po           | 2 +-
 po/tr.po           | 2 +-
 po/uk.po           | 2 +-
 po/wa.po           | 2 +-
 po/zh.po           | 2 +-
 po/zh_CN.GB2312.po | 2 +-
 29 files changed, 29 insertions(+), 29 deletions(-)

diff --git a/po/cs.po b/po/cs.po
index 14f88e1..e90c6da 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.3\n"
-"POT-Creation-Date: 2000-07-30 09:36-0400\n"
+"POT-Creation-Date: 2000-08-04 15:48-0400\n"
 "PO-Revision-Date: 2000-07-26 23:09+0100\n"
 "Last-Translator: Milan Kerslager <milan.kerslager@spsselib.hiedu.cz>\n"
 "Language-Team: Czech <cs@li.org>\n"
diff --git a/po/da.po b/po/da.po
index af02b5a..b0d4652 100644
--- a/po/da.po
+++ b/po/da.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt\n"
-"POT-Creation-Date: 2000-07-30 09:36-0400\n"
+"POT-Creation-Date: 2000-08-04 15:48-0400\n"
 "PO-Revision-Date: 2000-03-07 05:17+01:00\n"
 "Last-Translator: K. Christiansen <kenneth@gnu.org>\n"
 "Language-Team: Danish/Dansk <dansk@klid.dk>\n"
diff --git a/po/de.po b/po/de.po
index 2c19397..e5aae73 100644
--- a/po/de.po
+++ b/po/de.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2000-07-30 09:36-0400\n"
+"POT-Creation-Date: 2000-08-04 15:48-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/po/es.po b/po/es.po
index 2c19397..e5aae73 100644
--- a/po/es.po
+++ b/po/es.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2000-07-30 09:36-0400\n"
+"POT-Creation-Date: 2000-08-04 15:48-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/po/fi.po b/po/fi.po
index 2c19397..e5aae73 100644
--- a/po/fi.po
+++ b/po/fi.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2000-07-30 09:36-0400\n"
+"POT-Creation-Date: 2000-08-04 15:48-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/po/fr.po b/po/fr.po
index 2c19397..e5aae73 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2000-07-30 09:36-0400\n"
+"POT-Creation-Date: 2000-08-04 15:48-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/po/gl.po b/po/gl.po
index cb7e52d..5e92fa8 100644
--- a/po/gl.po
+++ b/po/gl.po
@@ -10,7 +10,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.4\n"
-"POT-Creation-Date: 2000-07-30 09:36-0400\n"
+"POT-Creation-Date: 2000-08-04 15:48-0400\n"
 "PO-Revision-Date: 2000-01-06 20:31+0100\n"
 "Last-Translator: Jes�s Bravo �lvarez <jba@pobox.com>\n"
 "Language-Team: Galician <gpul-traduccion@ceu.fi.udc.es>\n"
diff --git a/po/hu.po b/po/hu.po
index 9179f5a..0fda506 100644
--- a/po/hu.po
+++ b/po/hu.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt\n"
-"POT-Creation-Date: 2000-07-30 09:36-0400\n"
+"POT-Creation-Date: 2000-08-04 15:48-0400\n"
 "PO-Revision-Date: 2000-08-03 23:26+0200\n"
 "Last-Translator: L�szl� N�meth <nemeth@qwertynet.hu>\n"
 "Language-Team: Hungarian\n"
diff --git a/po/id.po b/po/id.po
index 2c19397..e5aae73 100644
--- a/po/id.po
+++ b/po/id.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2000-07-30 09:36-0400\n"
+"POT-Creation-Date: 2000-08-04 15:48-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/po/is.po b/po/is.po
index 8540f16..3c8407e 100644
--- a/po/is.po
+++ b/po/is.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.0\n"
-"POT-Creation-Date: 2000-07-30 09:36-0400\n"
+"POT-Creation-Date: 2000-08-04 15:48-0400\n"
 "PO-Revision-Date: 2000-06-16 02:12+0000\n"
 "Last-Translator: Richard Allen <ra@hp.is>\n"
 "Language-Team: is <kde-isl@mmedia.is>\n"
diff --git a/po/it.po b/po/it.po
index 2c19397..e5aae73 100644
--- a/po/it.po
+++ b/po/it.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2000-07-30 09:36-0400\n"
+"POT-Creation-Date: 2000-08-04 15:48-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/po/ja.po b/po/ja.po
index 2c19397..e5aae73 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2000-07-30 09:36-0400\n"
+"POT-Creation-Date: 2000-08-04 15:48-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/po/ko.po b/po/ko.po
index 2c19397..e5aae73 100644
--- a/po/ko.po
+++ b/po/ko.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2000-07-30 09:36-0400\n"
+"POT-Creation-Date: 2000-08-04 15:48-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/po/no.po b/po/no.po
index 99732b0..b870dbc 100644
--- a/po/no.po
+++ b/po/no.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 7.0\n"
-"POT-Creation-Date: 2000-07-30 09:36-0400\n"
+"POT-Creation-Date: 2000-08-04 15:48-0400\n"
 "PO-Revision-Date: 2000-06-21 16:11+02:00\n"
 "Last-Translator: Kjartan Maraas <kmaraas@online.no>\n"
 "Language-Team: Norwegian <no@li.org>\n"
diff --git a/po/pl.po b/po/pl.po
index 2c19397..e5aae73 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2000-07-30 09:36-0400\n"
+"POT-Creation-Date: 2000-08-04 15:48-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/po/popt.pot b/po/popt.pot
index 2c19397..e5aae73 100644
--- a/po/popt.pot
+++ b/po/popt.pot
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2000-07-30 09:36-0400\n"
+"POT-Creation-Date: 2000-08-04 15:48-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/po/pt.po b/po/pt.po
index c132180..1b1e762 100644
--- a/po/pt.po
+++ b/po/pt.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt\n"
-"POT-Creation-Date: 2000-07-30 09:36-0400\n"
+"POT-Creation-Date: 2000-08-04 15:48-0400\n"
 "PO-Revision-Date: 2000-06-22 01:02+01:00\n"
 "Last-Translator: Pedro Morais <morais@kde.org>\n"
 "Language-Team: pt <morais@kde.org>\n"
diff --git a/po/pt_BR.po b/po/pt_BR.po
index 2c19397..e5aae73 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2000-07-30 09:36-0400\n"
+"POT-Creation-Date: 2000-08-04 15:48-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/po/ro.po b/po/ro.po
index 7d6feda..090ed09 100644
--- a/po/ro.po
+++ b/po/ro.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6\n"
-"POT-Creation-Date: 2000-07-30 09:36-0400\n"
+"POT-Creation-Date: 2000-08-04 15:48-0400\n"
 "PO-Revision-Date: 2000-06-14 23:23+EST\n"
 "Last-Translator: Cristian Gafton <gafton@redhat.com>\n"
 "Language-Team: Romanian <ro@li.org>\n"
diff --git a/po/ru.po b/po/ru.po
index 2c19397..e5aae73 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2000-07-30 09:36-0400\n"
+"POT-Creation-Date: 2000-08-04 15:48-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/po/sk.po b/po/sk.po
index 172c263..3dec0d6 100644
--- a/po/sk.po
+++ b/po/sk.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt\n"
-"POT-Creation-Date: 2000-07-30 09:36-0400\n"
+"POT-Creation-Date: 2000-08-04 15:48-0400\n"
 "PO-Revision-Date: 1999-08-04 21:40+0200\n"
 "Last-Translator: Stanislav Meduna <stano@eunet.sk>\n"
 "Language-Team: Slovak <sk-i18n@rak.isternet.sk>\n"
diff --git a/po/sl.po b/po/sl.po
index 2c19397..e5aae73 100644
--- a/po/sl.po
+++ b/po/sl.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2000-07-30 09:36-0400\n"
+"POT-Creation-Date: 2000-08-04 15:48-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/po/sr.po b/po/sr.po
index 2c19397..e5aae73 100644
--- a/po/sr.po
+++ b/po/sr.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2000-07-30 09:36-0400\n"
+"POT-Creation-Date: 2000-08-04 15:48-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/po/sv.po b/po/sv.po
index 649a79c..8482638 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt\n"
-"POT-Creation-Date: 2000-07-30 09:36-0400\n"
+"POT-Creation-Date: 2000-08-04 15:48-0400\n"
 "PO-Revision-Date: 2000-06-20 00:07+0200\n"
 "Last-Translator: Christian Rose <menthos@menthos.com>\n"
 "Language-Team: Swedish <sv@li.org>\n"
diff --git a/po/tr.po b/po/tr.po
index a1333f5..5de9e9b 100644
--- a/po/tr.po
+++ b/po/tr.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.2\n"
-"POT-Creation-Date: 2000-07-30 09:36-0400\n"
+"POT-Creation-Date: 2000-08-04 15:48-0400\n"
 "PO-Revision-Date: 2000-01-06 13:01+0100\n"
 "Last-Translator: Fatih Demir <kabalak@gmx.net>\n"
 "Language-Team: Turkish Gnome Tranlation Team <gnotrap@gmx.net>\n"
diff --git a/po/uk.po b/po/uk.po
index 2e8dd21..27e6a98 100644
--- a/po/uk.po
+++ b/po/uk.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.4\n"
-"POT-Creation-Date: 2000-07-30 09:36-0400\n"
+"POT-Creation-Date: 2000-08-04 15:48-0400\n"
 "PO-Revision-Date: 1999-09-30 16:54+0200\n"
 "Last-Translator: Yuri Syrota <rasta@renome.rovno.ua>\n"
 "Language-Team: Ukrainian <uk@li.org>\n"
diff --git a/po/wa.po b/po/wa.po
index cb7af66..6f4d894 100644
--- a/po/wa.po
+++ b/po/wa.po
@@ -9,7 +9,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.3\n"
-"POT-Creation-Date: 2000-07-30 09:36-0400\n"
+"POT-Creation-Date: 2000-08-04 15:48-0400\n"
 "PO-Revision-Date: 1999-03-18 23:11+0100\n"
 "Last-Translator: Nobody yet\n"
 "Language-Team: walon <linux-wa@chanae.alphanet.ch>\n"
diff --git a/po/zh.po b/po/zh.po
index 2c19397..e5aae73 100644
--- a/po/zh.po
+++ b/po/zh.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2000-07-30 09:36-0400\n"
+"POT-Creation-Date: 2000-08-04 15:48-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/po/zh_CN.GB2312.po b/po/zh_CN.GB2312.po
index 5c158de..fa3003e 100644
--- a/po/zh_CN.GB2312.po
+++ b/po/zh_CN.GB2312.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: kcmkpanel\n"
-"POT-Creation-Date: 2000-07-30 09:36-0400\n"
+"POT-Creation-Date: 2000-08-04 15:48-0400\n"
 "PO-Revision-Date: 1999-11-11 05:04+0800\n"
 "Last-Translator: Dillion Chen <dillon.chen@turbolinux.com.cn>\n"
 "Language-Team: TLDN\n"
-- 
Gitee


From 6417a27bca14b678af1c9a51640a2bddb48380cb Mon Sep 17 00:00:00 2001
From: Jeff Johnson <n3npq@mac.com>
Date: Tue, 8 Aug 2000 20:38:46 +0000
Subject: [PATCH 269/667] Auto-update by milan.kerslager@spsselib.hiedu.cz

---
 po/cs.po | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/po/cs.po b/po/cs.po
index e90c6da..6f27c6d 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.3\n"
 "POT-Creation-Date: 2000-08-04 15:48-0400\n"
-"PO-Revision-Date: 2000-07-26 23:09+0100\n"
+"PO-Revision-Date: 2000-08-08 22:36+0100\n"
 "Last-Translator: Milan Kerslager <milan.kerslager@spsselib.hiedu.cz>\n"
 "Language-Team: Czech <cs@li.org>\n"
 "MIME-Version: 1.0\n"
-- 
Gitee


From 11c689b18a55460e69e729880986a1eae2acc71e Mon Sep 17 00:00:00 2001
From: Jeff Johnson <n3npq@mac.com>
Date: Thu, 10 Aug 2000 16:29:06 +0000
Subject: [PATCH 270/667] Add refresh-po.

---
 po/Makefile.in.in | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/po/Makefile.in.in b/po/Makefile.in.in
index ea01d49..e4ea0fd 100644
--- a/po/Makefile.in.in
+++ b/po/Makefile.in.in
@@ -224,6 +224,19 @@ update-po: Makefile
 	  fi; \
 	done
 
+refresh-po: Makefile
+	catalogs='$(CATALOGS)'; \
+	for cat in $$catalogs; do \
+		lang=`echo $$cat | sed 's/.mo//'`; \
+		if $(MSGMERGE) $$lang.po $(NLSPACKAGE).pot > $$lang.pot ; then \
+			echo "$(MSGMERGE) of $$lang succeeded" ; \
+			mv -f $$lang.pot $$lang.po ; \
+		else \
+			echo "$(MSGMERGE) of $$lang failed" ; \
+			rm -f $$lang.pot ; \
+		fi \
+	done
+
 POTFILES: POTFILES.in
 	( if test 'x$(srcdir)' != 'x.'; then \
 	    posrcprefix='$(top_srcdir)/'; \
-- 
Gitee


From cf0f019f68387a315d5b3ed01fa002818ee38001 Mon Sep 17 00:00:00 2001
From: Jeff Johnson <n3npq@mac.com>
Date: Fri, 11 Aug 2000 15:25:44 +0000
Subject: [PATCH 271/667] Simplify environment setting for braindead (i.e.
 solaris) shells.

---
 testit.sh | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/testit.sh b/testit.sh
index a322176..d73dfb2 100755
--- a/testit.sh
+++ b/testit.sh
@@ -37,8 +37,12 @@ run test1 "test1 - 12" "arg1: 1 arg2: (none)" -O
 run test1 "test1 - 13" "arg1: 1 arg2: foo" -OT foo
 run test1 "test1 - 14" "arg1: 0 arg2: (none) inc: 1" --inc
 run test1 "test1 - 15" "arg1: 0 arg2: foo inc: 1" -i --arg2 foo
-POSIX_ME_HARDER=1 run test1 "test1 - 16" "arg1: 1 arg2: (none) rest: foo --arg2 something" --arg1 foo --arg2 something
-POSIXLY_CORRECT=1 run test1 "test1 - 17" "arg1: 1 arg2: (none) rest: foo --arg2 something" --arg1 foo --arg2 something
+export POSIX_ME_HARDER=1
+run test1 "test1 - 16" "arg1: 1 arg2: (none) rest: foo --arg2 something" --arg1 foo --arg2 something
+unset POSIX_ME_HARDER
+export POSIXLY_CORRECT=1
+run test1 "test1 - 17" "arg1: 1 arg2: (none) rest: foo --arg2 something" --arg1 foo --arg2 something
+unset POSIXLY_CORRECT
 run test1 "test1 - 18" "callback: c sampledata bar arg1: 1 arg2: (none)" --arg1 --cb bar
 run test1 "test1 - 19" "" --echo-args
 run test1 "test1 - 20" "--arg1" --echo-args --arg1
-- 
Gitee


From 7a0ca2b3bf5b0b4edeb3f39f00f6aaa91ab277c6 Mon Sep 17 00:00:00 2001
From: Jeff Johnson <n3npq@mac.com>
Date: Sun, 13 Aug 2000 17:40:22 +0000
Subject: [PATCH 272/667] Auto-update by leon@geon.donetsk.ua

---
 po/ru.po | 21 ++++++++-------------
 1 file changed, 8 insertions(+), 13 deletions(-)

diff --git a/po/ru.po b/po/ru.po
index e5aae73..2467f0d 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -1,23 +1,18 @@
-# SOME DESCRIPTIVE TITLE.
-# Copyright (C) YEAR Free Software Foundation, Inc.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#
-#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
+"Project-Id-Version: 1.0\n"
 "POT-Creation-Date: 2000-08-04 15:48-0400\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
+"PO-Revision-Date: 2000-08-13 21:00+0300\n"
+"Last-Translator: Leon Kanter <leon@blackcatlinux.com>\n"
+"Language-Team: Black Cat Linux Team <blackcat-support@blackcatlinux.com>\n"
 "MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=CHARSET\n"
-"Content-Transfer-Encoding: ENCODING\n"
+"Content-Type: text/plain; charset=koi8-r\n"
+"Content-Transfer-Encoding: 8bit\n"
 
 #: popthelp.c:23
 msgid "Show this help message"
-msgstr ""
+msgstr "�������� ��� ���������"
 
 #: popthelp.c:24
 msgid "Display brief usage message"
-msgstr ""
+msgstr "�������� ������� ���������� �� �������������"
-- 
Gitee


From 80d4fb6c5a48d6afd38959aa8271906231de0220 Mon Sep 17 00:00:00 2001
From: Jeff Johnson <n3npq@mac.com>
Date: Mon, 14 Aug 2000 19:26:47 +0000
Subject: [PATCH 273/667] Update versions, rpm -> 4.1, popt -> 1.7.

---
 configure.in | 2 +-
 popt.spec    | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/configure.in b/configure.in
index 0947e5e..9c6ddac 100755
--- a/configure.in
+++ b/configure.in
@@ -2,7 +2,7 @@ AC_INIT(popt.h)
 AM_CONFIG_HEADER(config.h)
 AC_PREREQ(2.12)
 AC_CANONICAL_SYSTEM
-AM_INIT_AUTOMAKE(popt, 1.6)
+AM_INIT_AUTOMAKE(popt, 1.7)
 ALL_LINGUAS="cs da de es fi fr gl hu id is it ja ko no pl pt pt_BR ro ru sk sl sr sv tr uk wa zh zh_CN.GB2312"
 
 AC_ISC_POSIX
diff --git a/popt.spec b/popt.spec
index ff3a657..a417aeb 100644
--- a/popt.spec
+++ b/popt.spec
@@ -4,7 +4,7 @@
 #
 Summary: A C library for parsing command line parameters.
 Name: popt
-Version: 1.6
+Version: 1.7
 Release: 0.1
 Copyright: LGPL
 Group: System Environment/Libraries
-- 
Gitee


From d241c4a5263e8a28e232a4313318e9a15f75de06 Mon Sep 17 00:00:00 2001
From: Jeff Johnson <n3npq@mac.com>
Date: Sun, 27 Aug 2000 19:41:22 +0000
Subject: [PATCH 274/667] Doxygen annotations.

---
 findme.c     | 4 ++++
 findme.h     | 4 ++++
 po/popt.pot  | 6 +++---
 popt.c       | 4 ++++
 popt.h       | 4 ++++
 poptconfig.c | 4 ++++
 popthelp.c   | 4 ++++
 poptint.h    | 4 ++++
 poptparse.c  | 4 ++++
 9 files changed, 35 insertions(+), 3 deletions(-)

diff --git a/findme.c b/findme.c
index 8518be1..b5878a1 100644
--- a/findme.c
+++ b/findme.c
@@ -1,3 +1,7 @@
+/** \ingroup popt
+ * \file popt/findme.c
+ */
+
 /* (C) 1998 Red Hat Software, Inc. -- Licensing details are in the COPYING
    file accompanying popt source distributions, available from 
    ftp://ftp.redhat.com/pub/code/popt */
diff --git a/findme.h b/findme.h
index 5e93963..78f714e 100644
--- a/findme.h
+++ b/findme.h
@@ -1,3 +1,7 @@
+/** \ingroup popt
+ * \file popt/findme.h
+ */
+
 /* (C) 1998 Red Hat Software, Inc. -- Licensing details are in the COPYING
    file accompanying popt source distributions, available from 
    ftp://ftp.redhat.com/pub/code/popt */
diff --git a/po/popt.pot b/po/popt.pot
index e5aae73..a8101ef 100644
--- a/po/popt.pot
+++ b/po/popt.pot
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2000-08-04 15:48-0400\n"
+"POT-Creation-Date: 2000-08-27 14:45-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -14,10 +14,10 @@ msgstr ""
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: ENCODING\n"
 
-#: popthelp.c:23
+#: popthelp.c:27
 msgid "Show this help message"
 msgstr ""
 
-#: popthelp.c:24
+#: popthelp.c:28
 msgid "Display brief usage message"
 msgstr ""
diff --git a/popt.c b/popt.c
index 4979ed5..0726c32 100644
--- a/popt.c
+++ b/popt.c
@@ -1,3 +1,7 @@
+/** \ingroup popt
+ * \file popt/popt.c
+ */
+
 /* (C) 1998 Red Hat Software, Inc. -- Licensing details are in the COPYING
    file accompanying popt source distributions, available from
    ftp://ftp.redhat.com/pub/code/popt */
diff --git a/popt.h b/popt.h
index 2209f38..b6e1f6b 100644
--- a/popt.h
+++ b/popt.h
@@ -1,3 +1,7 @@
+/** \ingroup popt
+ * \file popt/popt.h
+ */
+
 /* (C) 1998 Red Hat Software, Inc. -- Licensing details are in the COPYING
    file accompanying popt source distributions, available from 
    ftp://ftp.redhat.com/pub/code/popt */
diff --git a/poptconfig.c b/poptconfig.c
index 7a1a4c2..9e50b52 100644
--- a/poptconfig.c
+++ b/poptconfig.c
@@ -1,3 +1,7 @@
+/** \ingroup popt
+ * \file popt/poptconfig.c
+ */
+
 /* (C) 1998 Red Hat Software, Inc. -- Licensing details are in the COPYING
    file accompanying popt source distributions, available from 
    ftp://ftp.redhat.com/pub/code/popt */
diff --git a/popthelp.c b/popthelp.c
index c36ecea..8eed7ee 100644
--- a/popthelp.c
+++ b/popthelp.c
@@ -1,5 +1,9 @@
 /* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 4 -*- */
 
+/** \ingroup popt
+ * \file popt/popthelp.c
+ */
+
 /* (C) 1998 Red Hat Software, Inc. -- Licensing details are in the COPYING
    file accompanying popt source distributions, available from 
    ftp://ftp.redhat.com/pub/code/popt */
diff --git a/poptint.h b/poptint.h
index a1edb97..39ae3ee 100644
--- a/poptint.h
+++ b/poptint.h
@@ -1,3 +1,7 @@
+/** \ingroup popt
+ * \file popt/poptint.h
+ */
+
 /* (C) 1998 Red Hat Software, Inc. -- Licensing details are in the COPYING
    file accompanying popt source distributions, available from 
    ftp://ftp.redhat.com/pub/code/popt */
diff --git a/poptparse.c b/poptparse.c
index 7c9f06b..7a2d505 100644
--- a/poptparse.c
+++ b/poptparse.c
@@ -1,3 +1,7 @@
+/** \ingroup popt
+ * \file popt/poptparse.c
+ */
+
 /* (C) 1998 Red Hat Software, Inc. -- Licensing details are in the COPYING
    file accompanying popt source distributions, available from 
    ftp://ftp.redhat.com/pub/code/popt */
-- 
Gitee


From 578621dab242ee3d1da436b72593532ecdaafc7f Mon Sep 17 00:00:00 2001
From: Jeff Johnson <n3npq@mac.com>
Date: Mon, 28 Aug 2000 01:50:51 +0000
Subject: [PATCH 275/667] - rip out rpm{get,put}text, use getpo.sh and specspo
 instead.

---
 po/cs.po           | 6 +++---
 po/da.po           | 6 +++---
 po/de.po           | 6 +++---
 po/es.po           | 6 +++---
 po/fi.po           | 6 +++---
 po/fr.po           | 6 +++---
 po/gl.po           | 6 +++---
 po/hu.po           | 6 +++---
 po/id.po           | 6 +++---
 po/is.po           | 6 +++---
 po/it.po           | 6 +++---
 po/ja.po           | 6 +++---
 po/ko.po           | 6 +++---
 po/no.po           | 6 +++---
 po/pl.po           | 6 +++---
 po/pt.po           | 6 +++---
 po/pt_BR.po        | 6 +++---
 po/ro.po           | 6 +++---
 po/ru.po           | 6 +++---
 po/sk.po           | 6 +++---
 po/sl.po           | 6 +++---
 po/sr.po           | 6 +++---
 po/sv.po           | 6 +++---
 po/tr.po           | 6 +++---
 po/uk.po           | 6 +++---
 po/wa.po           | 6 +++---
 po/zh.po           | 6 +++---
 po/zh_CN.GB2312.po | 6 +++---
 28 files changed, 84 insertions(+), 84 deletions(-)

diff --git a/po/cs.po b/po/cs.po
index 6f27c6d..999208c 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.3\n"
-"POT-Creation-Date: 2000-08-04 15:48-0400\n"
+"POT-Creation-Date: 2000-08-27 14:45-0400\n"
 "PO-Revision-Date: 2000-08-08 22:36+0100\n"
 "Last-Translator: Milan Kerslager <milan.kerslager@spsselib.hiedu.cz>\n"
 "Language-Team: Czech <cs@li.org>\n"
@@ -9,10 +9,10 @@ msgstr ""
 "Content-Type: text/plain; charset=iso-8859-2\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: popthelp.c:23
+#: popthelp.c:27
 msgid "Show this help message"
 msgstr "Vyp��e tuto n�pov�du"
 
-#: popthelp.c:24
+#: popthelp.c:28
 msgid "Display brief usage message"
 msgstr "Vyp��e kr�tk� n�vod k pou�it�"
diff --git a/po/da.po b/po/da.po
index b0d4652..8b3ad01 100644
--- a/po/da.po
+++ b/po/da.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt\n"
-"POT-Creation-Date: 2000-08-04 15:48-0400\n"
+"POT-Creation-Date: 2000-08-27 14:45-0400\n"
 "PO-Revision-Date: 2000-03-07 05:17+01:00\n"
 "Last-Translator: K. Christiansen <kenneth@gnu.org>\n"
 "Language-Team: Danish/Dansk <dansk@klid.dk>\n"
@@ -9,10 +9,10 @@ msgstr ""
 "Content-Type: text/plain; charset=ISO-8859-1\n"
 "Content-Transfer-Encoding: 8-bit\n"
 
-#: popthelp.c:23
+#: popthelp.c:27
 msgid "Show this help message"
 msgstr "Vis denne hj�lpemeddelelse"
 
-#: popthelp.c:24
+#: popthelp.c:28
 msgid "Display brief usage message"
 msgstr "Vis kortfattet brugsanvisning"
diff --git a/po/de.po b/po/de.po
index e5aae73..a8101ef 100644
--- a/po/de.po
+++ b/po/de.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2000-08-04 15:48-0400\n"
+"POT-Creation-Date: 2000-08-27 14:45-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -14,10 +14,10 @@ msgstr ""
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: ENCODING\n"
 
-#: popthelp.c:23
+#: popthelp.c:27
 msgid "Show this help message"
 msgstr ""
 
-#: popthelp.c:24
+#: popthelp.c:28
 msgid "Display brief usage message"
 msgstr ""
diff --git a/po/es.po b/po/es.po
index e5aae73..a8101ef 100644
--- a/po/es.po
+++ b/po/es.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2000-08-04 15:48-0400\n"
+"POT-Creation-Date: 2000-08-27 14:45-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -14,10 +14,10 @@ msgstr ""
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: ENCODING\n"
 
-#: popthelp.c:23
+#: popthelp.c:27
 msgid "Show this help message"
 msgstr ""
 
-#: popthelp.c:24
+#: popthelp.c:28
 msgid "Display brief usage message"
 msgstr ""
diff --git a/po/fi.po b/po/fi.po
index e5aae73..a8101ef 100644
--- a/po/fi.po
+++ b/po/fi.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2000-08-04 15:48-0400\n"
+"POT-Creation-Date: 2000-08-27 14:45-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -14,10 +14,10 @@ msgstr ""
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: ENCODING\n"
 
-#: popthelp.c:23
+#: popthelp.c:27
 msgid "Show this help message"
 msgstr ""
 
-#: popthelp.c:24
+#: popthelp.c:28
 msgid "Display brief usage message"
 msgstr ""
diff --git a/po/fr.po b/po/fr.po
index e5aae73..a8101ef 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2000-08-04 15:48-0400\n"
+"POT-Creation-Date: 2000-08-27 14:45-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -14,10 +14,10 @@ msgstr ""
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: ENCODING\n"
 
-#: popthelp.c:23
+#: popthelp.c:27
 msgid "Show this help message"
 msgstr ""
 
-#: popthelp.c:24
+#: popthelp.c:28
 msgid "Display brief usage message"
 msgstr ""
diff --git a/po/gl.po b/po/gl.po
index 5e92fa8..fb3abc0 100644
--- a/po/gl.po
+++ b/po/gl.po
@@ -10,7 +10,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.4\n"
-"POT-Creation-Date: 2000-08-04 15:48-0400\n"
+"POT-Creation-Date: 2000-08-27 14:45-0400\n"
 "PO-Revision-Date: 2000-01-06 20:31+0100\n"
 "Last-Translator: Jes�s Bravo �lvarez <jba@pobox.com>\n"
 "Language-Team: Galician <gpul-traduccion@ceu.fi.udc.es>\n"
@@ -18,10 +18,10 @@ msgstr ""
 "Content-Type: text/plain; charset=iso-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: popthelp.c:23
+#: popthelp.c:27
 msgid "Show this help message"
 msgstr "Amosar esta mensaxe de axuda"
 
-#: popthelp.c:24
+#: popthelp.c:28
 msgid "Display brief usage message"
 msgstr "Amosar brevemente o xeito de utilizaci�n"
diff --git a/po/hu.po b/po/hu.po
index 0fda506..41455b5 100644
--- a/po/hu.po
+++ b/po/hu.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt\n"
-"POT-Creation-Date: 2000-08-04 15:48-0400\n"
+"POT-Creation-Date: 2000-08-27 14:45-0400\n"
 "PO-Revision-Date: 2000-08-03 23:26+0200\n"
 "Last-Translator: L�szl� N�meth <nemeth@qwertynet.hu>\n"
 "Language-Team: Hungarian\n"
@@ -9,10 +9,10 @@ msgstr ""
 "Content-Type: text/plain; charset=ISO-8859-2\n"
 "Content-Transfer-Encoding: 8-bit\n"
 
-#: popthelp.c:23
+#: popthelp.c:27
 msgid "Show this help message"
 msgstr "E s�g� megjelen�t�se"
 
-#: popthelp.c:24
+#: popthelp.c:28
 msgid "Display brief usage message"
 msgstr "R�vid haszn�lati utas�t�s megjelen�t�se"
diff --git a/po/id.po b/po/id.po
index e5aae73..a8101ef 100644
--- a/po/id.po
+++ b/po/id.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2000-08-04 15:48-0400\n"
+"POT-Creation-Date: 2000-08-27 14:45-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -14,10 +14,10 @@ msgstr ""
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: ENCODING\n"
 
-#: popthelp.c:23
+#: popthelp.c:27
 msgid "Show this help message"
 msgstr ""
 
-#: popthelp.c:24
+#: popthelp.c:28
 msgid "Display brief usage message"
 msgstr ""
diff --git a/po/is.po b/po/is.po
index 3c8407e..2d64db3 100644
--- a/po/is.po
+++ b/po/is.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.0\n"
-"POT-Creation-Date: 2000-08-04 15:48-0400\n"
+"POT-Creation-Date: 2000-08-27 14:45-0400\n"
 "PO-Revision-Date: 2000-06-16 02:12+0000\n"
 "Last-Translator: Richard Allen <ra@hp.is>\n"
 "Language-Team: is <kde-isl@mmedia.is>\n"
@@ -9,10 +9,10 @@ msgstr ""
 "Content-Type: text/plain; charset=ISO-8859-1\n"
 "Content-Transfer-Encoding: 8-bit\n"
 
-#: popthelp.c:23
+#: popthelp.c:27
 msgid "Show this help message"
 msgstr "S�na �essa hj�lp"
 
-#: popthelp.c:24
+#: popthelp.c:28
 msgid "Display brief usage message"
 msgstr "S�na stuttar notkunarlei�beiningar"
diff --git a/po/it.po b/po/it.po
index e5aae73..a8101ef 100644
--- a/po/it.po
+++ b/po/it.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2000-08-04 15:48-0400\n"
+"POT-Creation-Date: 2000-08-27 14:45-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -14,10 +14,10 @@ msgstr ""
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: ENCODING\n"
 
-#: popthelp.c:23
+#: popthelp.c:27
 msgid "Show this help message"
 msgstr ""
 
-#: popthelp.c:24
+#: popthelp.c:28
 msgid "Display brief usage message"
 msgstr ""
diff --git a/po/ja.po b/po/ja.po
index e5aae73..a8101ef 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2000-08-04 15:48-0400\n"
+"POT-Creation-Date: 2000-08-27 14:45-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -14,10 +14,10 @@ msgstr ""
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: ENCODING\n"
 
-#: popthelp.c:23
+#: popthelp.c:27
 msgid "Show this help message"
 msgstr ""
 
-#: popthelp.c:24
+#: popthelp.c:28
 msgid "Display brief usage message"
 msgstr ""
diff --git a/po/ko.po b/po/ko.po
index e5aae73..a8101ef 100644
--- a/po/ko.po
+++ b/po/ko.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2000-08-04 15:48-0400\n"
+"POT-Creation-Date: 2000-08-27 14:45-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -14,10 +14,10 @@ msgstr ""
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: ENCODING\n"
 
-#: popthelp.c:23
+#: popthelp.c:27
 msgid "Show this help message"
 msgstr ""
 
-#: popthelp.c:24
+#: popthelp.c:28
 msgid "Display brief usage message"
 msgstr ""
diff --git a/po/no.po b/po/no.po
index b870dbc..85878dd 100644
--- a/po/no.po
+++ b/po/no.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 7.0\n"
-"POT-Creation-Date: 2000-08-04 15:48-0400\n"
+"POT-Creation-Date: 2000-08-27 14:45-0400\n"
 "PO-Revision-Date: 2000-06-21 16:11+02:00\n"
 "Last-Translator: Kjartan Maraas <kmaraas@online.no>\n"
 "Language-Team: Norwegian <no@li.org>\n"
@@ -9,10 +9,10 @@ msgstr ""
 "Content-Type: text/plain; charset=iso-8859-1\n"
 "Content-Transfer-Encoding: 8-bit\n"
 
-#: popthelp.c:23
+#: popthelp.c:27
 msgid "Show this help message"
 msgstr "Vis denne hjelpmeldingen"
 
-#: popthelp.c:24
+#: popthelp.c:28
 msgid "Display brief usage message"
 msgstr "Vis kort bruksmelding"
diff --git a/po/pl.po b/po/pl.po
index e5aae73..a8101ef 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2000-08-04 15:48-0400\n"
+"POT-Creation-Date: 2000-08-27 14:45-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -14,10 +14,10 @@ msgstr ""
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: ENCODING\n"
 
-#: popthelp.c:23
+#: popthelp.c:27
 msgid "Show this help message"
 msgstr ""
 
-#: popthelp.c:24
+#: popthelp.c:28
 msgid "Display brief usage message"
 msgstr ""
diff --git a/po/pt.po b/po/pt.po
index 1b1e762..0748f73 100644
--- a/po/pt.po
+++ b/po/pt.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt\n"
-"POT-Creation-Date: 2000-08-04 15:48-0400\n"
+"POT-Creation-Date: 2000-08-27 14:45-0400\n"
 "PO-Revision-Date: 2000-06-22 01:02+01:00\n"
 "Last-Translator: Pedro Morais <morais@kde.org>\n"
 "Language-Team: pt <morais@kde.org>\n"
@@ -9,10 +9,10 @@ msgstr ""
 "Content-Type: text/plain; charset=iso-latin1\n"
 "Content-Transfer-Encoding: none\n"
 
-#: popthelp.c:23
+#: popthelp.c:27
 msgid "Show this help message"
 msgstr "Mostrar esta mensagem de ajuda"
 
-#: popthelp.c:24
+#: popthelp.c:28
 msgid "Display brief usage message"
 msgstr "Mostrar uma mensagem de utiliza��o sucinta"
diff --git a/po/pt_BR.po b/po/pt_BR.po
index e5aae73..a8101ef 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2000-08-04 15:48-0400\n"
+"POT-Creation-Date: 2000-08-27 14:45-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -14,10 +14,10 @@ msgstr ""
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: ENCODING\n"
 
-#: popthelp.c:23
+#: popthelp.c:27
 msgid "Show this help message"
 msgstr ""
 
-#: popthelp.c:24
+#: popthelp.c:28
 msgid "Display brief usage message"
 msgstr ""
diff --git a/po/ro.po b/po/ro.po
index 090ed09..374856e 100644
--- a/po/ro.po
+++ b/po/ro.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6\n"
-"POT-Creation-Date: 2000-08-04 15:48-0400\n"
+"POT-Creation-Date: 2000-08-27 14:45-0400\n"
 "PO-Revision-Date: 2000-06-14 23:23+EST\n"
 "Last-Translator: Cristian Gafton <gafton@redhat.com>\n"
 "Language-Team: Romanian <ro@li.org>\n"
@@ -9,11 +9,11 @@ msgstr ""
 "Content-Type: text/plain; charset=ISO-8859-2\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: popthelp.c:23
+#: popthelp.c:27
 msgid "Show this help message"
 msgstr "Afisare mesaj de help"
 
-#: popthelp.c:24
+#: popthelp.c:28
 msgid "Display brief usage message"
 msgstr "Afisare mesaj sintaxa sumar"
 
diff --git a/po/ru.po b/po/ru.po
index 2467f0d..2d106f0 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: 1.0\n"
-"POT-Creation-Date: 2000-08-04 15:48-0400\n"
+"POT-Creation-Date: 2000-08-27 14:45-0400\n"
 "PO-Revision-Date: 2000-08-13 21:00+0300\n"
 "Last-Translator: Leon Kanter <leon@blackcatlinux.com>\n"
 "Language-Team: Black Cat Linux Team <blackcat-support@blackcatlinux.com>\n"
@@ -9,10 +9,10 @@ msgstr ""
 "Content-Type: text/plain; charset=koi8-r\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: popthelp.c:23
+#: popthelp.c:27
 msgid "Show this help message"
 msgstr "�������� ��� ���������"
 
-#: popthelp.c:24
+#: popthelp.c:28
 msgid "Display brief usage message"
 msgstr "�������� ������� ���������� �� �������������"
diff --git a/po/sk.po b/po/sk.po
index 3dec0d6..5350784 100644
--- a/po/sk.po
+++ b/po/sk.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt\n"
-"POT-Creation-Date: 2000-08-04 15:48-0400\n"
+"POT-Creation-Date: 2000-08-27 14:45-0400\n"
 "PO-Revision-Date: 1999-08-04 21:40+0200\n"
 "Last-Translator: Stanislav Meduna <stano@eunet.sk>\n"
 "Language-Team: Slovak <sk-i18n@rak.isternet.sk>\n"
@@ -13,10 +13,10 @@ msgstr ""
 "Content-Type: text/plain; charset=iso-8859-2\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: popthelp.c:23
+#: popthelp.c:27
 msgid "Show this help message"
 msgstr "Vyp�sa� t�to spr�vu"
 
-#: popthelp.c:24
+#: popthelp.c:28
 msgid "Display brief usage message"
 msgstr "Zobrazi� stru�n� n�vod na pou�itie"
diff --git a/po/sl.po b/po/sl.po
index e5aae73..a8101ef 100644
--- a/po/sl.po
+++ b/po/sl.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2000-08-04 15:48-0400\n"
+"POT-Creation-Date: 2000-08-27 14:45-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -14,10 +14,10 @@ msgstr ""
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: ENCODING\n"
 
-#: popthelp.c:23
+#: popthelp.c:27
 msgid "Show this help message"
 msgstr ""
 
-#: popthelp.c:24
+#: popthelp.c:28
 msgid "Display brief usage message"
 msgstr ""
diff --git a/po/sr.po b/po/sr.po
index e5aae73..a8101ef 100644
--- a/po/sr.po
+++ b/po/sr.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2000-08-04 15:48-0400\n"
+"POT-Creation-Date: 2000-08-27 14:45-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -14,10 +14,10 @@ msgstr ""
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: ENCODING\n"
 
-#: popthelp.c:23
+#: popthelp.c:27
 msgid "Show this help message"
 msgstr ""
 
-#: popthelp.c:24
+#: popthelp.c:28
 msgid "Display brief usage message"
 msgstr ""
diff --git a/po/sv.po b/po/sv.po
index 8482638..02180cc 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt\n"
-"POT-Creation-Date: 2000-08-04 15:48-0400\n"
+"POT-Creation-Date: 2000-08-27 14:45-0400\n"
 "PO-Revision-Date: 2000-06-20 00:07+0200\n"
 "Last-Translator: Christian Rose <menthos@menthos.com>\n"
 "Language-Team: Swedish <sv@li.org>\n"
@@ -9,10 +9,10 @@ msgstr ""
 "Content-Type: text/plain; charset=ISO-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: popthelp.c:23
+#: popthelp.c:27
 msgid "Show this help message"
 msgstr "Visa detta hj�lpmeddelande"
 
-#: popthelp.c:24
+#: popthelp.c:28
 msgid "Display brief usage message"
 msgstr "Visa ett kortfattat anv�ndningsmeddelande"
diff --git a/po/tr.po b/po/tr.po
index 5de9e9b..0eea675 100644
--- a/po/tr.po
+++ b/po/tr.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.2\n"
-"POT-Creation-Date: 2000-08-04 15:48-0400\n"
+"POT-Creation-Date: 2000-08-27 14:45-0400\n"
 "PO-Revision-Date: 2000-01-06 13:01+0100\n"
 "Last-Translator: Fatih Demir <kabalak@gmx.net>\n"
 "Language-Team: Turkish Gnome Tranlation Team <gnotrap@gmx.net>\n"
@@ -14,11 +14,11 @@ msgstr ""
 "Content-Type: text/plain; charset=iso-8859-9\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: popthelp.c:23
+#: popthelp.c:27
 msgid "Show this help message"
 msgstr "Bu yard�m iletisini g�sterir"
 
-#: popthelp.c:24
+#: popthelp.c:28
 msgid "Display brief usage message"
 msgstr "K�sa bir kullan�m iletisi g�ster"
 
diff --git a/po/uk.po b/po/uk.po
index 27e6a98..eee99af 100644
--- a/po/uk.po
+++ b/po/uk.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.4\n"
-"POT-Creation-Date: 2000-08-04 15:48-0400\n"
+"POT-Creation-Date: 2000-08-27 14:45-0400\n"
 "PO-Revision-Date: 1999-09-30 16:54+0200\n"
 "Last-Translator: Yuri Syrota <rasta@renome.rovno.ua>\n"
 "Language-Team: Ukrainian <uk@li.org>\n"
@@ -13,10 +13,10 @@ msgstr ""
 "Content-Type: text/plain; charset=koi8-u\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: popthelp.c:23
+#: popthelp.c:27
 msgid "Show this help message"
 msgstr "�������� �� ��צ���"
 
-#: popthelp.c:24
+#: popthelp.c:28
 msgid "Display brief usage message"
 msgstr "�������� ������� ��צ��� ��� ������������"
diff --git a/po/wa.po b/po/wa.po
index 6f4d894..12c5f11 100644
--- a/po/wa.po
+++ b/po/wa.po
@@ -9,7 +9,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.3\n"
-"POT-Creation-Date: 2000-08-04 15:48-0400\n"
+"POT-Creation-Date: 2000-08-27 14:45-0400\n"
 "PO-Revision-Date: 1999-03-18 23:11+0100\n"
 "Last-Translator: Nobody yet\n"
 "Language-Team: walon <linux-wa@chanae.alphanet.ch>\n"
@@ -17,10 +17,10 @@ msgstr ""
 "Content-Type: text/plain; charset=iso-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: popthelp.c:23
+#: popthelp.c:27
 msgid "Show this help message"
 msgstr "Mostrer ci messaedje d' aide chal"
 
-#: popthelp.c:24
+#: popthelp.c:28
 msgid "Display brief usage message"
 msgstr "Mostre on court messaedje so kmint vos � siervi"
diff --git a/po/zh.po b/po/zh.po
index e5aae73..a8101ef 100644
--- a/po/zh.po
+++ b/po/zh.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2000-08-04 15:48-0400\n"
+"POT-Creation-Date: 2000-08-27 14:45-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -14,10 +14,10 @@ msgstr ""
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: ENCODING\n"
 
-#: popthelp.c:23
+#: popthelp.c:27
 msgid "Show this help message"
 msgstr ""
 
-#: popthelp.c:24
+#: popthelp.c:28
 msgid "Display brief usage message"
 msgstr ""
diff --git a/po/zh_CN.GB2312.po b/po/zh_CN.GB2312.po
index fa3003e..49d991c 100644
--- a/po/zh_CN.GB2312.po
+++ b/po/zh_CN.GB2312.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: kcmkpanel\n"
-"POT-Creation-Date: 2000-08-04 15:48-0400\n"
+"POT-Creation-Date: 2000-08-27 14:45-0400\n"
 "PO-Revision-Date: 1999-11-11 05:04+0800\n"
 "Last-Translator: Dillion Chen <dillon.chen@turbolinux.com.cn>\n"
 "Language-Team: TLDN\n"
@@ -9,10 +9,10 @@ msgstr ""
 "Content-Type: text/plain; charset=gb2312\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: popthelp.c:23
+#: popthelp.c:27
 msgid "Show this help message"
 msgstr "��ʾ����������Ϣ"
 
-#: popthelp.c:24
+#: popthelp.c:28
 msgid "Display brief usage message"
 msgstr "��ʾ���ʹ����Ϣ"
-- 
Gitee


From fe35ce0430d29207be0faae1e808bd356f463548 Mon Sep 17 00:00:00 2001
From: Jeff Johnson <n3npq@mac.com>
Date: Mon, 11 Sep 2000 17:09:32 +0000
Subject: [PATCH 276/667] - popt: support for float/double args.

---
 po/popt.pot |  2 +-
 popt.3      | 13 +++++++++----
 popt.c      | 32 +++++++++++++++++++++++++++++++-
 popt.h      |  2 ++
 test1.c     | 12 ++++++++++++
 testit.sh   |  5 +++++
 6 files changed, 60 insertions(+), 6 deletions(-)

diff --git a/po/popt.pot b/po/popt.pot
index a8101ef..6e3a15b 100644
--- a/po/popt.pot
+++ b/po/popt.pot
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2000-08-27 14:45-0400\n"
+"POT-Creation-Date: 2000-09-11 12:53-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/popt.3 b/popt.3
index 29a6309..bfa7a2b 100644
--- a/popt.3
+++ b/popt.3
@@ -128,6 +128,8 @@ POPT_ARG_STRING	No type checking to be performed	char *
 POPT_ARG_INT	An integer argument is expected	int
 POPT_ARG_LONG	A long integer is expected	long
 POPT_ARG_VAL	Integer value taken from \f(CWval\fR	int
+POPT_ARG_FLOAT	An float argument is expected	float
+POPT_ARG_DOUBLE	A double argument is expected	double
 .TE
 .sp
 For numeric values, if the \fIargInfo\fR value is bitwise or'd with one of
@@ -155,8 +157,9 @@ will perhaps not escape the attention of hunt-and-peck typists that
 an argument, the variable that 
 .IR arg " points to is updated to reflect the value of the argument." 
 .RB "Any string is acceptable for " POPT_ARG_STRING " arguments, but "
-.BR POPT_ARG_INT " and " POPT_ARG_LONG " are converted to the 
-appropriate type, and an error returned if the conversion fails.
+.BR POPT_ARG_INT ", " POPT_ARG_LONG ", " POPT_ARG_FLOAT ", and "
+.BR POPT_ARG_DOUBLE " are converted to the appropriate type, and an "
+error returned if the conversion fails.
 .sp
 \fBPOPT_ARG_VAL\fR causes \fIarg\fP to be set to the (integer) value of
 \fIval\fP when the argument is found.  This is most often useful for
@@ -445,14 +448,16 @@ A parsed string has a quotation mismatch (such as a single quotation
 A conversion from a string to a number (int or long) failed due
 to the string containing nonnumeric characters. This occurs when
 .BR poptGetNextOpt() " is processing an argument of type " 
-.BR POPT_ARG_INT " or " POPT_ARG_LONG .
+.BR POPT_ARG_INT ", " POPT_ARG_LONG ", "
+.RB POPT_ARG_FLOAT ", or " POPT_ARG_DOUBLE "."  
 .sp
 .TP
 .B POPT_ERROR_OVERFLOW
 A string-to-number conversion failed because the number was too
 .RB "large or too small. Like " POPT_ERROR_BADNUMBER ", this error 
 .RB "can occur only when " poptGetNextOpt() " is processing an "
-.RB "argument of type " POPT_ARG_INT " or " POPT_ARG_LONG .  
+.RB "argument of type " POPT_ARG_INT ", " POPT_ARG_LONG ", "
+.RB POPT_ARG_FLOAT ", or " POPT_ARG_DOUBLE "."  
 .sp
 .TP
 .B POPT_ERROR_ERRNO
diff --git a/popt.c b/popt.c
index 0726c32..3fd6361 100644
--- a/popt.c
+++ b/popt.c
@@ -9,6 +9,9 @@
 #undef	MYDEBUG
 
 #include "system.h"
+
+#include <math.h>
+
 #include "findme.h"
 #include "poptint.h"
 
@@ -709,8 +712,35 @@ int poptGetNextOpt(poptContext con)
 			if (poptSaveInt(opt, aLong))
 			    return POPT_ERROR_BADOPERATION;
 		    }
-		  } break;
+		}   break;
+
+		case POPT_ARG_FLOAT:
+		case POPT_ARG_DOUBLE:
+		{   long aDouble;
+		    char *end;
+
+		    aDouble = strtod(con->os->nextArg, &end);
+		    if (*end)
+			return POPT_ERROR_BADNUMBER;
 
+		    if (aDouble == +HUGE_VAL || aDouble == -HUGE_VAL)
+			return POPT_ERROR_OVERFLOW;
+		    if (aDouble == 0.0 && errno == ERANGE)
+			return POPT_ERROR_OVERFLOW;
+		    if ((opt->argInfo & POPT_ARG_MASK) == POPT_ARG_DOUBLE) {
+			*((double *) opt->arg) = aDouble;
+		    } else {
+#ifdef ABS
+#undef ABS
+#endif
+#define ABS(a) (((a) < 0) ? -(a) : (a))
+			if (ABS(aDouble) > FLT_MAX)
+			    return POPT_ERROR_OVERFLOW;
+			if (ABS(aDouble) < FLT_MIN)
+			    return POPT_ERROR_OVERFLOW;
+			*((float *) opt->arg) = aDouble;
+		    }
+		}   break;
 		default:
 		    fprintf(stdout, POPT_("option type (%d) not implemented in popt\n"),
 		      opt->argInfo & POPT_ARG_MASK);
diff --git a/popt.h b/popt.h
index b6e1f6b..d4dd489 100644
--- a/popt.h
+++ b/popt.h
@@ -31,6 +31,8 @@ extern "C" {
 					   included tables; arg points
 					   to the domain string */
 #define POPT_ARG_VAL		7	/* arg should take value val */
+#define	POPT_ARG_FLOAT		8	/* arg should be converted to float */
+#define	POPT_ARG_DOUBLE		9	/* arg should be converted to double */
 
 #define POPT_ARG_MASK		0x0000FFFF
 #define POPT_ARGFLAG_ONEDASH	0x80000000  /* allow -longoption */
diff --git a/test1.c b/test1.c
index 416d59e..fdd3a4a 100644
--- a/test1.c
+++ b/test1.c
@@ -17,6 +17,8 @@ char * arg2 = "(none)";
 int arg3 = 0;
 int inc = 0;
 int shortopt = 0;
+float aFloat = 0.0;
+double aDouble = 0.0;
 int singleDash = 0;
 
 static struct poptOption moreCallbackArgs[] = {
@@ -48,6 +50,10 @@ static struct poptOption options[] = {
 		"This shouldn't show up", NULL },
 	{ "unused", '\0', POPT_ARG_STRING, NULL, 0,
 	    "Unused option for help testing", "UNUSED" },
+	{ "float", 'f', POPT_ARG_FLOAT, &aFloat, 0,
+	    "A float argument", "FLOAT" },
+	{ "double", 'd', POPT_ARG_DOUBLE, &aDouble, 0,
+	    "A double argument", "DOUBLE" },
 	{ NULL, '-', POPT_ARG_NONE | POPT_ARGFLAG_DOC_HIDDEN, &singleDash, 0 },
 	{ NULL, '\0', POPT_ARG_INCLUDE_TABLE, &moreArgs, 0, NULL },
 	{ NULL, '\0', POPT_ARG_INCLUDE_TABLE, &callbackArgs, 0, "Callback arguments" },
@@ -62,6 +68,8 @@ static void resetVars(void)
     arg3 = 0;
     inc = 0;
     shortopt = 0;
+    aFloat = 0.0;
+    aDouble = 0.0;
     singleDash = 0;
     pass2 = 0;
 }
@@ -116,6 +124,10 @@ int main(int argc, const char ** argv) {
 	fprintf(stdout, " inc: %d", inc);
     if (shortopt)
 	fprintf(stdout, " short: %d", shortopt);
+    if (aFloat != 0.0)
+	fprintf(stdout, " aFloat: %g", aFloat);
+    if (aDouble != 0.0)
+	fprintf(stdout, " aDouble: %g", aDouble);
     if (singleDash)
 	fprintf(stdout, " -");
 
diff --git a/testit.sh b/testit.sh
index d73dfb2..975b5ef 100755
--- a/testit.sh
+++ b/testit.sh
@@ -58,5 +58,10 @@ run test1 "test1 - 29" "arg1: 0 arg2: bbbb" --arg2=aaaa -2 bbbb
 run test1 "test1 - 30" "arg1: 0 arg2: 'foo bingo' rest: boggle" --grab bingo boggle
 run test1 "test1 - 31" "arg1: 0 arg2: 'foo bar' rest: boggle" --grabbar boggle
 
+run test1 "test1 - 32" "arg1: 0 arg2: (none) aFloat: 10.1" -f 10.1
+run test1 "test1 - 33" "arg1: 0 arg2: (none) aFloat: 10.1" --float 10.1
+run test1 "test1 - 34" "arg1: 0 arg2: (none) aDouble: 10.1" -d 10.1
+run test1 "test1 - 35" "arg1: 0 arg2: (none) aDouble: 10.1" --double 10.1
+
 echo ""
 echo "Passed."
-- 
Gitee


From 7befb2b32f2c68521a3c1b511ebd87bc120780ee Mon Sep 17 00:00:00 2001
From: Jeff Johnson <n3npq@mac.com>
Date: Thu, 14 Sep 2000 11:42:54 +0000
Subject: [PATCH 277/667] Revert rpmrc excision for now. rpmio: add
 rpmlog.c/rpmlog.h.

---
 po/cs.po           | 2 +-
 po/da.po           | 2 +-
 po/de.po           | 2 +-
 po/es.po           | 2 +-
 po/fi.po           | 2 +-
 po/fr.po           | 2 +-
 po/gl.po           | 2 +-
 po/hu.po           | 2 +-
 po/id.po           | 2 +-
 po/is.po           | 2 +-
 po/it.po           | 2 +-
 po/ja.po           | 2 +-
 po/ko.po           | 2 +-
 po/no.po           | 2 +-
 po/pl.po           | 2 +-
 po/pt.po           | 2 +-
 po/pt_BR.po        | 2 +-
 po/ro.po           | 2 +-
 po/ru.po           | 2 +-
 po/sk.po           | 2 +-
 po/sl.po           | 2 +-
 po/sr.po           | 2 +-
 po/sv.po           | 2 +-
 po/tr.po           | 2 +-
 po/uk.po           | 2 +-
 po/wa.po           | 2 +-
 po/zh.po           | 2 +-
 po/zh_CN.GB2312.po | 2 +-
 28 files changed, 28 insertions(+), 28 deletions(-)

diff --git a/po/cs.po b/po/cs.po
index 999208c..7b69957 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.3\n"
-"POT-Creation-Date: 2000-08-27 14:45-0400\n"
+"POT-Creation-Date: 2000-09-11 12:53-0400\n"
 "PO-Revision-Date: 2000-08-08 22:36+0100\n"
 "Last-Translator: Milan Kerslager <milan.kerslager@spsselib.hiedu.cz>\n"
 "Language-Team: Czech <cs@li.org>\n"
diff --git a/po/da.po b/po/da.po
index 8b3ad01..104d518 100644
--- a/po/da.po
+++ b/po/da.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt\n"
-"POT-Creation-Date: 2000-08-27 14:45-0400\n"
+"POT-Creation-Date: 2000-09-11 12:53-0400\n"
 "PO-Revision-Date: 2000-03-07 05:17+01:00\n"
 "Last-Translator: K. Christiansen <kenneth@gnu.org>\n"
 "Language-Team: Danish/Dansk <dansk@klid.dk>\n"
diff --git a/po/de.po b/po/de.po
index a8101ef..6e3a15b 100644
--- a/po/de.po
+++ b/po/de.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2000-08-27 14:45-0400\n"
+"POT-Creation-Date: 2000-09-11 12:53-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/po/es.po b/po/es.po
index a8101ef..6e3a15b 100644
--- a/po/es.po
+++ b/po/es.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2000-08-27 14:45-0400\n"
+"POT-Creation-Date: 2000-09-11 12:53-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/po/fi.po b/po/fi.po
index a8101ef..6e3a15b 100644
--- a/po/fi.po
+++ b/po/fi.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2000-08-27 14:45-0400\n"
+"POT-Creation-Date: 2000-09-11 12:53-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/po/fr.po b/po/fr.po
index a8101ef..6e3a15b 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2000-08-27 14:45-0400\n"
+"POT-Creation-Date: 2000-09-11 12:53-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/po/gl.po b/po/gl.po
index fb3abc0..a3eeb9f 100644
--- a/po/gl.po
+++ b/po/gl.po
@@ -10,7 +10,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.4\n"
-"POT-Creation-Date: 2000-08-27 14:45-0400\n"
+"POT-Creation-Date: 2000-09-11 12:53-0400\n"
 "PO-Revision-Date: 2000-01-06 20:31+0100\n"
 "Last-Translator: Jes�s Bravo �lvarez <jba@pobox.com>\n"
 "Language-Team: Galician <gpul-traduccion@ceu.fi.udc.es>\n"
diff --git a/po/hu.po b/po/hu.po
index 41455b5..a91e74a 100644
--- a/po/hu.po
+++ b/po/hu.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt\n"
-"POT-Creation-Date: 2000-08-27 14:45-0400\n"
+"POT-Creation-Date: 2000-09-11 12:53-0400\n"
 "PO-Revision-Date: 2000-08-03 23:26+0200\n"
 "Last-Translator: L�szl� N�meth <nemeth@qwertynet.hu>\n"
 "Language-Team: Hungarian\n"
diff --git a/po/id.po b/po/id.po
index a8101ef..6e3a15b 100644
--- a/po/id.po
+++ b/po/id.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2000-08-27 14:45-0400\n"
+"POT-Creation-Date: 2000-09-11 12:53-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/po/is.po b/po/is.po
index 2d64db3..efb524d 100644
--- a/po/is.po
+++ b/po/is.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.0\n"
-"POT-Creation-Date: 2000-08-27 14:45-0400\n"
+"POT-Creation-Date: 2000-09-11 12:53-0400\n"
 "PO-Revision-Date: 2000-06-16 02:12+0000\n"
 "Last-Translator: Richard Allen <ra@hp.is>\n"
 "Language-Team: is <kde-isl@mmedia.is>\n"
diff --git a/po/it.po b/po/it.po
index a8101ef..6e3a15b 100644
--- a/po/it.po
+++ b/po/it.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2000-08-27 14:45-0400\n"
+"POT-Creation-Date: 2000-09-11 12:53-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/po/ja.po b/po/ja.po
index a8101ef..6e3a15b 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2000-08-27 14:45-0400\n"
+"POT-Creation-Date: 2000-09-11 12:53-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/po/ko.po b/po/ko.po
index a8101ef..6e3a15b 100644
--- a/po/ko.po
+++ b/po/ko.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2000-08-27 14:45-0400\n"
+"POT-Creation-Date: 2000-09-11 12:53-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/po/no.po b/po/no.po
index 85878dd..03e9aec 100644
--- a/po/no.po
+++ b/po/no.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 7.0\n"
-"POT-Creation-Date: 2000-08-27 14:45-0400\n"
+"POT-Creation-Date: 2000-09-11 12:53-0400\n"
 "PO-Revision-Date: 2000-06-21 16:11+02:00\n"
 "Last-Translator: Kjartan Maraas <kmaraas@online.no>\n"
 "Language-Team: Norwegian <no@li.org>\n"
diff --git a/po/pl.po b/po/pl.po
index a8101ef..6e3a15b 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2000-08-27 14:45-0400\n"
+"POT-Creation-Date: 2000-09-11 12:53-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/po/pt.po b/po/pt.po
index 0748f73..dfc1c38 100644
--- a/po/pt.po
+++ b/po/pt.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt\n"
-"POT-Creation-Date: 2000-08-27 14:45-0400\n"
+"POT-Creation-Date: 2000-09-11 12:53-0400\n"
 "PO-Revision-Date: 2000-06-22 01:02+01:00\n"
 "Last-Translator: Pedro Morais <morais@kde.org>\n"
 "Language-Team: pt <morais@kde.org>\n"
diff --git a/po/pt_BR.po b/po/pt_BR.po
index a8101ef..6e3a15b 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2000-08-27 14:45-0400\n"
+"POT-Creation-Date: 2000-09-11 12:53-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/po/ro.po b/po/ro.po
index 374856e..8f2b40d 100644
--- a/po/ro.po
+++ b/po/ro.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6\n"
-"POT-Creation-Date: 2000-08-27 14:45-0400\n"
+"POT-Creation-Date: 2000-09-11 12:53-0400\n"
 "PO-Revision-Date: 2000-06-14 23:23+EST\n"
 "Last-Translator: Cristian Gafton <gafton@redhat.com>\n"
 "Language-Team: Romanian <ro@li.org>\n"
diff --git a/po/ru.po b/po/ru.po
index 2d106f0..8f7869f 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: 1.0\n"
-"POT-Creation-Date: 2000-08-27 14:45-0400\n"
+"POT-Creation-Date: 2000-09-11 12:53-0400\n"
 "PO-Revision-Date: 2000-08-13 21:00+0300\n"
 "Last-Translator: Leon Kanter <leon@blackcatlinux.com>\n"
 "Language-Team: Black Cat Linux Team <blackcat-support@blackcatlinux.com>\n"
diff --git a/po/sk.po b/po/sk.po
index 5350784..d142fca 100644
--- a/po/sk.po
+++ b/po/sk.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt\n"
-"POT-Creation-Date: 2000-08-27 14:45-0400\n"
+"POT-Creation-Date: 2000-09-11 12:53-0400\n"
 "PO-Revision-Date: 1999-08-04 21:40+0200\n"
 "Last-Translator: Stanislav Meduna <stano@eunet.sk>\n"
 "Language-Team: Slovak <sk-i18n@rak.isternet.sk>\n"
diff --git a/po/sl.po b/po/sl.po
index a8101ef..6e3a15b 100644
--- a/po/sl.po
+++ b/po/sl.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2000-08-27 14:45-0400\n"
+"POT-Creation-Date: 2000-09-11 12:53-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/po/sr.po b/po/sr.po
index a8101ef..6e3a15b 100644
--- a/po/sr.po
+++ b/po/sr.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2000-08-27 14:45-0400\n"
+"POT-Creation-Date: 2000-09-11 12:53-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/po/sv.po b/po/sv.po
index 02180cc..01afba9 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt\n"
-"POT-Creation-Date: 2000-08-27 14:45-0400\n"
+"POT-Creation-Date: 2000-09-11 12:53-0400\n"
 "PO-Revision-Date: 2000-06-20 00:07+0200\n"
 "Last-Translator: Christian Rose <menthos@menthos.com>\n"
 "Language-Team: Swedish <sv@li.org>\n"
diff --git a/po/tr.po b/po/tr.po
index 0eea675..9fc0f99 100644
--- a/po/tr.po
+++ b/po/tr.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.2\n"
-"POT-Creation-Date: 2000-08-27 14:45-0400\n"
+"POT-Creation-Date: 2000-09-11 12:53-0400\n"
 "PO-Revision-Date: 2000-01-06 13:01+0100\n"
 "Last-Translator: Fatih Demir <kabalak@gmx.net>\n"
 "Language-Team: Turkish Gnome Tranlation Team <gnotrap@gmx.net>\n"
diff --git a/po/uk.po b/po/uk.po
index eee99af..0f0316e 100644
--- a/po/uk.po
+++ b/po/uk.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.4\n"
-"POT-Creation-Date: 2000-08-27 14:45-0400\n"
+"POT-Creation-Date: 2000-09-11 12:53-0400\n"
 "PO-Revision-Date: 1999-09-30 16:54+0200\n"
 "Last-Translator: Yuri Syrota <rasta@renome.rovno.ua>\n"
 "Language-Team: Ukrainian <uk@li.org>\n"
diff --git a/po/wa.po b/po/wa.po
index 12c5f11..efcfea8 100644
--- a/po/wa.po
+++ b/po/wa.po
@@ -9,7 +9,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.3\n"
-"POT-Creation-Date: 2000-08-27 14:45-0400\n"
+"POT-Creation-Date: 2000-09-11 12:53-0400\n"
 "PO-Revision-Date: 1999-03-18 23:11+0100\n"
 "Last-Translator: Nobody yet\n"
 "Language-Team: walon <linux-wa@chanae.alphanet.ch>\n"
diff --git a/po/zh.po b/po/zh.po
index a8101ef..6e3a15b 100644
--- a/po/zh.po
+++ b/po/zh.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2000-08-27 14:45-0400\n"
+"POT-Creation-Date: 2000-09-11 12:53-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/po/zh_CN.GB2312.po b/po/zh_CN.GB2312.po
index 49d991c..d985660 100644
--- a/po/zh_CN.GB2312.po
+++ b/po/zh_CN.GB2312.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: kcmkpanel\n"
-"POT-Creation-Date: 2000-08-27 14:45-0400\n"
+"POT-Creation-Date: 2000-09-11 12:53-0400\n"
 "PO-Revision-Date: 1999-11-11 05:04+0800\n"
 "Last-Translator: Dillion Chen <dillon.chen@turbolinux.com.cn>\n"
 "Language-Team: TLDN\n"
-- 
Gitee


From dff5c122ea3780baf571c7567fea47c4459e0ea7 Mon Sep 17 00:00:00 2001
From: Jeff Johnson <n3npq@mac.com>
Date: Fri, 29 Sep 2000 00:51:41 +0000
Subject: [PATCH 278/667] manpage fix (johnsonm@redhat.com)

---
 popt.3 | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/popt.3 b/popt.3
index bfa7a2b..8d17f17 100644
--- a/popt.3
+++ b/popt.3
@@ -269,8 +269,17 @@ two arguments specify the command-line arguments to parse. These are
 .RB "passed to the program's " main() " function. The " 
 .IR options " parameter points to the table of command-line options, "
 which was described in the previous section. The final parameter, 
-.IR flags ",is not currently used but should always be specified as 
-0 for compatibility with future versions of the popt library.
+.IR flags ,
+can take one of three values:
+.br
+.TS
+lfB lfB
+lfB lfR.
+Value	Description
+POPT_CONTEXT_NO_EXEC	Ignore exec expansions
+POPT_CONTEXT_KEEP_FIRST	Do not ignore argv[0]
+POPT_CONTEXT_POSIXMEHARDER	Options cannot follow arguments
+.TE
 .sp
 .RB "A " poptContext " keeps track of which options have already been "
 parsed and which remain, among other things. If a program wishes to 
-- 
Gitee


From 0e9f91699c4c50fbfeadeddfc8aafdaf75f35041 Mon Sep 17 00:00:00 2001
From: Jeff Johnson <n3npq@mac.com>
Date: Tue, 12 Dec 2000 20:04:04 +0000
Subject: [PATCH 279/667] Sync with rpm-4_0 branch.

---
 po/cs.po           |   6 +-
 po/da.po           |   4 +-
 po/de.po           |   4 +-
 po/es.po           |   4 +-
 po/fi.po           |   4 +-
 po/fr.po           |   4 +-
 po/gl.po           |   4 +-
 po/hu.po           |   4 +-
 po/id.po           |   4 +-
 po/is.po           |   4 +-
 po/it.po           |   4 +-
 po/ja.po           |   4 +-
 po/ko.po           |   4 +-
 po/no.po           |   4 +-
 po/pl.po           |   4 +-
 po/pt.po           |   4 +-
 po/pt_BR.po        |   4 +-
 po/ro.po           |   4 +-
 po/ru.po           |   4 +-
 po/sk.po           |   4 +-
 po/sl.po           |  23 ++--
 po/sr.po           |   4 +-
 po/sv.po           |   4 +-
 po/tr.po           | 256 +--------------------------------------------
 po/uk.po           |   4 +-
 po/wa.po           |   4 +-
 po/zh.po           |   4 +-
 po/zh_CN.GB2312.po |   4 +-
 28 files changed, 67 insertions(+), 318 deletions(-)

diff --git a/po/cs.po b/po/cs.po
index 7b69957..77c532f 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -1,8 +1,8 @@
 msgid ""
 msgstr ""
-"Project-Id-Version: popt 1.3\n"
-"POT-Creation-Date: 2000-09-11 12:53-0400\n"
-"PO-Revision-Date: 2000-08-08 22:36+0100\n"
+"Project-Id-Version: popt 1.6.1\n"
+"POT-Creation-Date: 2000-11-20 14:36-0500\n"
+"PO-Revision-Date: 2000-08-23 22:24+0100\n"
 "Last-Translator: Milan Kerslager <milan.kerslager@spsselib.hiedu.cz>\n"
 "Language-Team: Czech <cs@li.org>\n"
 "MIME-Version: 1.0\n"
diff --git a/po/da.po b/po/da.po
index 104d518..13c8638 100644
--- a/po/da.po
+++ b/po/da.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
-"Project-Id-Version: popt\n"
-"POT-Creation-Date: 2000-09-11 12:53-0400\n"
+"Project-Id-Version: popt 1.6.1\n"
+"POT-Creation-Date: 2000-11-20 14:36-0500\n"
 "PO-Revision-Date: 2000-03-07 05:17+01:00\n"
 "Last-Translator: K. Christiansen <kenneth@gnu.org>\n"
 "Language-Team: Danish/Dansk <dansk@klid.dk>\n"
diff --git a/po/de.po b/po/de.po
index 6e3a15b..1d906ea 100644
--- a/po/de.po
+++ b/po/de.po
@@ -5,8 +5,8 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2000-09-11 12:53-0400\n"
+"Project-Id-Version: popt 1.6.1\n"
+"POT-Creation-Date: 2000-11-20 14:36-0500\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/po/es.po b/po/es.po
index 6e3a15b..1d906ea 100644
--- a/po/es.po
+++ b/po/es.po
@@ -5,8 +5,8 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2000-09-11 12:53-0400\n"
+"Project-Id-Version: popt 1.6.1\n"
+"POT-Creation-Date: 2000-11-20 14:36-0500\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/po/fi.po b/po/fi.po
index 6e3a15b..1d906ea 100644
--- a/po/fi.po
+++ b/po/fi.po
@@ -5,8 +5,8 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2000-09-11 12:53-0400\n"
+"Project-Id-Version: popt 1.6.1\n"
+"POT-Creation-Date: 2000-11-20 14:36-0500\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/po/fr.po b/po/fr.po
index 6e3a15b..1d906ea 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -5,8 +5,8 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2000-09-11 12:53-0400\n"
+"Project-Id-Version: popt 1.6.1\n"
+"POT-Creation-Date: 2000-11-20 14:36-0500\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/po/gl.po b/po/gl.po
index a3eeb9f..dd2b14a 100644
--- a/po/gl.po
+++ b/po/gl.po
@@ -9,8 +9,8 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: popt 1.4\n"
-"POT-Creation-Date: 2000-09-11 12:53-0400\n"
+"Project-Id-Version: popt 1.6.1\n"
+"POT-Creation-Date: 2000-11-20 14:36-0500\n"
 "PO-Revision-Date: 2000-01-06 20:31+0100\n"
 "Last-Translator: Jes�s Bravo �lvarez <jba@pobox.com>\n"
 "Language-Team: Galician <gpul-traduccion@ceu.fi.udc.es>\n"
diff --git a/po/hu.po b/po/hu.po
index a91e74a..f7117ba 100644
--- a/po/hu.po
+++ b/po/hu.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
-"Project-Id-Version: popt\n"
-"POT-Creation-Date: 2000-09-11 12:53-0400\n"
+"Project-Id-Version: popt 1.6.1\n"
+"POT-Creation-Date: 2000-11-20 14:36-0500\n"
 "PO-Revision-Date: 2000-08-03 23:26+0200\n"
 "Last-Translator: L�szl� N�meth <nemeth@qwertynet.hu>\n"
 "Language-Team: Hungarian\n"
diff --git a/po/id.po b/po/id.po
index 6e3a15b..1d906ea 100644
--- a/po/id.po
+++ b/po/id.po
@@ -5,8 +5,8 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2000-09-11 12:53-0400\n"
+"Project-Id-Version: popt 1.6.1\n"
+"POT-Creation-Date: 2000-11-20 14:36-0500\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/po/is.po b/po/is.po
index efb524d..1fe5229 100644
--- a/po/is.po
+++ b/po/is.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
-"Project-Id-Version: popt 1.0\n"
-"POT-Creation-Date: 2000-09-11 12:53-0400\n"
+"Project-Id-Version: popt 1.6.1\n"
+"POT-Creation-Date: 2000-11-20 14:36-0500\n"
 "PO-Revision-Date: 2000-06-16 02:12+0000\n"
 "Last-Translator: Richard Allen <ra@hp.is>\n"
 "Language-Team: is <kde-isl@mmedia.is>\n"
diff --git a/po/it.po b/po/it.po
index 6e3a15b..1d906ea 100644
--- a/po/it.po
+++ b/po/it.po
@@ -5,8 +5,8 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2000-09-11 12:53-0400\n"
+"Project-Id-Version: popt 1.6.1\n"
+"POT-Creation-Date: 2000-11-20 14:36-0500\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/po/ja.po b/po/ja.po
index 6e3a15b..1d906ea 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -5,8 +5,8 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2000-09-11 12:53-0400\n"
+"Project-Id-Version: popt 1.6.1\n"
+"POT-Creation-Date: 2000-11-20 14:36-0500\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/po/ko.po b/po/ko.po
index 6e3a15b..1d906ea 100644
--- a/po/ko.po
+++ b/po/ko.po
@@ -5,8 +5,8 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2000-09-11 12:53-0400\n"
+"Project-Id-Version: popt 1.6.1\n"
+"POT-Creation-Date: 2000-11-20 14:36-0500\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/po/no.po b/po/no.po
index 03e9aec..84a4cf9 100644
--- a/po/no.po
+++ b/po/no.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
-"Project-Id-Version: popt 7.0\n"
-"POT-Creation-Date: 2000-09-11 12:53-0400\n"
+"Project-Id-Version: popt 1.6.1\n"
+"POT-Creation-Date: 2000-11-20 14:36-0500\n"
 "PO-Revision-Date: 2000-06-21 16:11+02:00\n"
 "Last-Translator: Kjartan Maraas <kmaraas@online.no>\n"
 "Language-Team: Norwegian <no@li.org>\n"
diff --git a/po/pl.po b/po/pl.po
index 6e3a15b..1d906ea 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -5,8 +5,8 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2000-09-11 12:53-0400\n"
+"Project-Id-Version: popt 1.6.1\n"
+"POT-Creation-Date: 2000-11-20 14:36-0500\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/po/pt.po b/po/pt.po
index dfc1c38..c6ae4f2 100644
--- a/po/pt.po
+++ b/po/pt.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
-"Project-Id-Version: popt\n"
-"POT-Creation-Date: 2000-09-11 12:53-0400\n"
+"Project-Id-Version: popt 1.6.1\n"
+"POT-Creation-Date: 2000-11-20 14:36-0500\n"
 "PO-Revision-Date: 2000-06-22 01:02+01:00\n"
 "Last-Translator: Pedro Morais <morais@kde.org>\n"
 "Language-Team: pt <morais@kde.org>\n"
diff --git a/po/pt_BR.po b/po/pt_BR.po
index 6e3a15b..1d906ea 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -5,8 +5,8 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2000-09-11 12:53-0400\n"
+"Project-Id-Version: popt 1.6.1\n"
+"POT-Creation-Date: 2000-11-20 14:36-0500\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/po/ro.po b/po/ro.po
index 8f2b40d..c6cec5b 100644
--- a/po/ro.po
+++ b/po/ro.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
-"Project-Id-Version: popt 1.6\n"
-"POT-Creation-Date: 2000-09-11 12:53-0400\n"
+"Project-Id-Version: popt 1.6.1\n"
+"POT-Creation-Date: 2000-11-20 14:36-0500\n"
 "PO-Revision-Date: 2000-06-14 23:23+EST\n"
 "Last-Translator: Cristian Gafton <gafton@redhat.com>\n"
 "Language-Team: Romanian <ro@li.org>\n"
diff --git a/po/ru.po b/po/ru.po
index 8f7869f..fa1e91c 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
-"Project-Id-Version: 1.0\n"
-"POT-Creation-Date: 2000-09-11 12:53-0400\n"
+"Project-Id-Version: popt 1.6.1\n"
+"POT-Creation-Date: 2000-11-20 14:36-0500\n"
 "PO-Revision-Date: 2000-08-13 21:00+0300\n"
 "Last-Translator: Leon Kanter <leon@blackcatlinux.com>\n"
 "Language-Team: Black Cat Linux Team <blackcat-support@blackcatlinux.com>\n"
diff --git a/po/sk.po b/po/sk.po
index d142fca..a3b29ae 100644
--- a/po/sk.po
+++ b/po/sk.po
@@ -4,8 +4,8 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: popt\n"
-"POT-Creation-Date: 2000-09-11 12:53-0400\n"
+"Project-Id-Version: popt 1.6.1\n"
+"POT-Creation-Date: 2000-11-20 14:36-0500\n"
 "PO-Revision-Date: 1999-08-04 21:40+0200\n"
 "Last-Translator: Stanislav Meduna <stano@eunet.sk>\n"
 "Language-Team: Slovak <sk-i18n@rak.isternet.sk>\n"
diff --git a/po/sl.po b/po/sl.po
index 6e3a15b..7330b89 100644
--- a/po/sl.po
+++ b/po/sl.po
@@ -1,23 +1,18 @@
-# SOME DESCRIPTIVE TITLE.
-# Copyright (C) YEAR Free Software Foundation, Inc.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#
-#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2000-09-11 12:53-0400\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
+"Project-Id-Version: popt 1.6.1\n"
+"POT-Creation-Date: 2000-11-20 14:36-0500\n"
+"PO-Revision-Date: 2000-09-05 12:30+0200\n"
+"Last-Translator: Roman Maurer <roman.maurer@hermes.si>\n"
+"Language-Team: Slovenian <sl@li.org>\n"
 "MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=CHARSET\n"
-"Content-Transfer-Encoding: ENCODING\n"
+"Content-Type: text/plain; charset=iso-8859-2\n"
+"Content-Transfer-Encoding: 8bit\n"
 
 #: popthelp.c:27
 msgid "Show this help message"
-msgstr ""
+msgstr "Prika�i to sporo�ilo s pomo�jo"
 
 #: popthelp.c:28
 msgid "Display brief usage message"
-msgstr ""
+msgstr "Prika�i kratko sporo�ilo o uporabi"
diff --git a/po/sr.po b/po/sr.po
index 6e3a15b..1d906ea 100644
--- a/po/sr.po
+++ b/po/sr.po
@@ -5,8 +5,8 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2000-09-11 12:53-0400\n"
+"Project-Id-Version: popt 1.6.1\n"
+"POT-Creation-Date: 2000-11-20 14:36-0500\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/po/sv.po b/po/sv.po
index 01afba9..e27bcff 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
-"Project-Id-Version: popt\n"
-"POT-Creation-Date: 2000-09-11 12:53-0400\n"
+"Project-Id-Version: popt 1.6.1\n"
+"POT-Creation-Date: 2000-11-20 14:36-0500\n"
 "PO-Revision-Date: 2000-06-20 00:07+0200\n"
 "Last-Translator: Christian Rose <menthos@menthos.com>\n"
 "Language-Team: Swedish <sv@li.org>\n"
diff --git a/po/tr.po b/po/tr.po
index 9fc0f99..2b144bf 100644
--- a/po/tr.po
+++ b/po/tr.po
@@ -1,17 +1,12 @@
-# -------------------------------------------------------
-# Copyright (C) 2000 Free Software Foundation, Inc.
-# Fatih Demir <kabalak@gmx.net>, 2000.
-#
-#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: popt 1.2\n"
-"POT-Creation-Date: 2000-09-11 12:53-0400\n"
+"Project-Id-Version: popt 1.6.1\n"
+"POT-Creation-Date: 2000-11-20 14:36-0500\n"
 "PO-Revision-Date: 2000-01-06 13:01+0100\n"
-"Last-Translator: Fatih Demir <kabalak@gmx.net>\n"
-"Language-Team: Turkish Gnome Tranlation Team <gnotrap@gmx.net>\n"
+"Last-Translator: G�rkem �etin <kabalak@gmx.net>\n"
+"Language-Team: Gelecek A.� <gorkem@gelecek.com.tr>\n"
 "MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=iso-8859-9\n"
+"Content-Type: text/plain; charset=iso8859-9\n"
 "Content-Transfer-Encoding: 8bit\n"
 
 #: popthelp.c:27
@@ -21,244 +16,3 @@ msgstr "Bu yard
 #: popthelp.c:28
 msgid "Display brief usage message"
 msgstr "K�sa bir kullan�m iletisi g�ster"
-
-#~ msgid "\n"
-#~ msgstr "\n"
-
-#~ msgid ""
-#~ "\n"
-#~ "       "
-#~ msgstr ""
-#~ "\n"
-#~ "       "
-
-#~ msgid ""
-#~ "\n"
-#~ "%s\n"
-#~ msgstr ""
-#~ "\n"
-#~ "%s\n"
-
-#~ msgid " "
-#~ msgstr " "
-
-#~ msgid "  %-*s   "
-#~ msgstr "  %-*s   "
-
-#~ msgid "  %s\n"
-#~ msgstr "  %s\n"
-
-#~ msgid " %s"
-#~ msgstr " %s"
-
-#~ msgid " %s\n"
-#~ msgstr " %s\n"
-
-#~ msgid " [-%s%s%s%s]"
-#~ msgstr " [-%s%s%s%s]"
-
-#~ msgid " [-%s]"
-#~ msgstr " [-%s]"
-
-#~ msgid " arg3: %d"
-#~ msgstr " arg3: %d"
-
-#~ msgid " inc: %d"
-#~ msgstr " inc: %d"
-
-#~ msgid " rest:"
-#~ msgstr " rest:"
-
-#~ msgid " short: %d"
-#~ msgstr " short: %d"
-
-#~ msgid ""
-#~ "%%.%ds\n"
-#~ "%%%ds"
-#~ msgstr ""
-#~ "%%.%ds\n"
-#~ "%%%ds"
-
-#~ msgid "%s\n"
-#~ msgstr "%s\n"
-
-#~ msgid "%s/%s"
-#~ msgstr "%s/%s"
-
-#~ msgid "(none)"
-#~ msgstr "(yok)"
-
-#~ msgid "-"
-#~ msgstr "-"
-
-#~ msgid "-%c"
-#~ msgstr "-%c"
-
-#~ msgid "-%c, --%s"
-#~ msgstr "-%c, --%s"
-
-#~ msgid "--"
-#~ msgstr "--"
-
-#~ msgid "--%s"
-#~ msgstr "--%s"
-
-#~ msgid "./test-poptrc"
-#~ msgstr "./test-poptrc"
-
-#~ msgid "/.popt"
-#~ msgstr "/.popt"
-
-#~ msgid "/etc/popt"
-#~ msgstr "/etc/popt"
-
-#~ msgid ";"
-#~ msgstr ";"
-
-#~ msgid "="
-#~ msgstr "="
-
-#~ msgid "A third argument"
-#~ msgstr "���nc� se�enek"
-
-#~ msgid "ANARG"
-#~ msgstr "BIRSECENEK"
-
-#~ msgid "ARG"
-#~ msgstr "SECENEK"
-
-#~ msgid "An included argument"
-#~ msgstr "Dahil olan bir se�enek"
-
-#~ msgid "Another argument"
-#~ msgstr "Bir ba�ka se�enek"
-
-#~ msgid "Callback arguments"
-#~ msgstr "Geri-verim se�enekleri"
-
-#~ msgid ""
-#~ "First argument with a really long description. After all, we have to test "
-#~ "argument help wrapping somehow, right?"
-#~ msgstr ""
-#~ "Ilk uzun anlat�mll� se�enek . Her�ey'den sonra , yard�miletisinin k�r�n� "
-#~ "g�stermek zorunday�z , de�il mi ?"
-
-#~ msgid "13ME"
-#~ msgstr "13ME"
-
-#~ msgid "Needs a single -"
-#~ msgstr "Tek bir - bekler"
-
-#~ msgid "PATH"
-#~ msgstr "PATH"
-
-#~ msgid "POSIXLY_CORRECT"
-#~ msgstr "POSIXLY_CORRECT"
-
-#~ msgid "POSIX_ME_HARDER"
-#~ msgstr "POSIX_ME_HARDER"
-
-#~ msgid "Test argument callbacks"
-#~ msgstr "Deneme se�eneklerinin geri-verimleri"
-
-#~ msgid "This shouldn't show up"
-#~ msgstr "Bu ileti sana ��kmamas� laz�m"
-
-#~ msgid "UNUSED"
-#~ msgstr "UNUSED"
-
-#~ msgid "Unused option for help testing"
-#~ msgstr "Yard�m� denemek i�in kullan�lan bir avare se�enek"
-
-#~ msgid "Usage:"
-#~ msgstr "Kullan�m :"
-
-#~ msgid "[OPTION...]"
-#~ msgstr "[SECENEK ... ]"
-
-#~ msgid "alias"
-#~ msgstr "nam-� di�er"
-
-#~ msgid "aliases nested too deeply"
-#~ msgstr "nam-� di�er i�ini de abartt�n , ha"
-
-#~ msgid "arg for cb2"
-#~ msgstr "cb1 i�in se�enekler"
-
-#~ msgid "arg1"
-#~ msgstr "se�enek1"
-
-#~ msgid "arg1: %d arg2: %s"
-#~ msgstr "se�enek1: %d se�enek2: %s"
-
-#~ msgid "arg2"
-#~ msgstr "se�enek2"
-
-#~ msgid "arg3"
-#~ msgstr "se�enek3"
-
-#~ msgid "callback: %c %s %s "
-#~ msgstr "geri-verim: %c %s %s"
-
-#~ msgid "cb"
-#~ msgstr "cb"
-
-#~ msgid "cb2"
-#~ msgstr "cb2"
-
-#~ msgid "error in paramter quoting"
-#~ msgstr "veri veriminde hata olu�tu"
-
-#~ msgid "exec"
-#~ msgstr "exec"
-
-#~ msgid "help"
-#~ msgstr "yard�m"
-
-#~ msgid "hidden"
-#~ msgstr "gizli"
-
-#~ msgid "inc"
-#~ msgstr "inc"
-
-#~ msgid "invalid numeric value"
-#~ msgstr "ge�ersiz say�sal i�lem"
-
-#~ msgid "long"
-#~ msgstr "long"
-
-#~ msgid "missing argument"
-#~ msgstr "eksik se�enek arg�man�"
-
-#~ msgid "number too large or too small"
-#~ msgstr "say� �ok fazla uzun/k�sa"
-
-#~ msgid "option type (%d) not implemented in popt\n"
-#~ msgstr "(%d) se�enek t�r� popt'de tan�nm�yor\n"
-
-#~ msgid "sampledata"
-#~ msgstr "denemebilgisi"
-
-#~ msgid "shortoption"
-#~ msgstr "k�sase�enek"
-
-#~ msgid "test1"
-#~ msgstr "deneme_no1"
-
-#~ msgid "test1: bad argument %s: %s\n"
-#~ msgstr "deneme_no1:  k�t� se�enek %s: %s\n"
-
-#~ msgid "unknown errno"
-#~ msgstr "tan�nmayan hata numaras�"
-
-#~ msgid "unknown error"
-#~ msgstr "tan�nmayan hata"
-
-#~ msgid "unknown option"
-#~ msgstr "tan�nmayan se�enek"
-
-#~ msgid "unused"
-#~ msgstr "kullan�lm�yor"
-
-#~ msgid "usage"
-#~ msgstr "kullan�m"
diff --git a/po/uk.po b/po/uk.po
index 0f0316e..41d49b0 100644
--- a/po/uk.po
+++ b/po/uk.po
@@ -4,8 +4,8 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: popt 1.4\n"
-"POT-Creation-Date: 2000-09-11 12:53-0400\n"
+"Project-Id-Version: popt 1.6.1\n"
+"POT-Creation-Date: 2000-11-20 14:36-0500\n"
 "PO-Revision-Date: 1999-09-30 16:54+0200\n"
 "Last-Translator: Yuri Syrota <rasta@renome.rovno.ua>\n"
 "Language-Team: Ukrainian <uk@li.org>\n"
diff --git a/po/wa.po b/po/wa.po
index efcfea8..e0c3f4e 100644
--- a/po/wa.po
+++ b/po/wa.po
@@ -8,8 +8,8 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: popt 1.3\n"
-"POT-Creation-Date: 2000-09-11 12:53-0400\n"
+"Project-Id-Version: popt 1.6.1\n"
+"POT-Creation-Date: 2000-11-20 14:36-0500\n"
 "PO-Revision-Date: 1999-03-18 23:11+0100\n"
 "Last-Translator: Nobody yet\n"
 "Language-Team: walon <linux-wa@chanae.alphanet.ch>\n"
diff --git a/po/zh.po b/po/zh.po
index 6e3a15b..1d906ea 100644
--- a/po/zh.po
+++ b/po/zh.po
@@ -5,8 +5,8 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2000-09-11 12:53-0400\n"
+"Project-Id-Version: popt 1.6.1\n"
+"POT-Creation-Date: 2000-11-20 14:36-0500\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/po/zh_CN.GB2312.po b/po/zh_CN.GB2312.po
index d985660..523cea6 100644
--- a/po/zh_CN.GB2312.po
+++ b/po/zh_CN.GB2312.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
-"Project-Id-Version: kcmkpanel\n"
-"POT-Creation-Date: 2000-09-11 12:53-0400\n"
+"Project-Id-Version: popt 1.6.1\n"
+"POT-Creation-Date: 2000-11-20 14:36-0500\n"
 "PO-Revision-Date: 1999-11-11 05:04+0800\n"
 "Last-Translator: Dillion Chen <dillon.chen@turbolinux.com.cn>\n"
 "Language-Team: TLDN\n"
-- 
Gitee


From d574a8eaebe45b1fd12694a5321f327338349988 Mon Sep 17 00:00:00 2001
From: Jeff Johnson <n3npq@mac.com>
Date: Tue, 12 Dec 2000 21:05:52 +0000
Subject: [PATCH 280/667] - fix: headerLoad segfault in python bindings.

---
 po/cs.po           | 2 +-
 po/da.po           | 2 +-
 po/de.po           | 2 +-
 po/es.po           | 2 +-
 po/fi.po           | 2 +-
 po/fr.po           | 2 +-
 po/gl.po           | 2 +-
 po/hu.po           | 2 +-
 po/id.po           | 2 +-
 po/is.po           | 2 +-
 po/it.po           | 2 +-
 po/ja.po           | 2 +-
 po/ko.po           | 2 +-
 po/no.po           | 2 +-
 po/pl.po           | 2 +-
 po/pt.po           | 2 +-
 po/pt_BR.po        | 2 +-
 po/ro.po           | 2 +-
 po/ru.po           | 2 +-
 po/sk.po           | 2 +-
 po/sl.po           | 2 +-
 po/sr.po           | 2 +-
 po/sv.po           | 2 +-
 po/tr.po           | 2 +-
 po/uk.po           | 2 +-
 po/wa.po           | 2 +-
 po/zh.po           | 2 +-
 po/zh_CN.GB2312.po | 2 +-
 28 files changed, 28 insertions(+), 28 deletions(-)

diff --git a/po/cs.po b/po/cs.po
index 77c532f..f3cdb8e 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.1\n"
-"POT-Creation-Date: 2000-11-20 14:36-0500\n"
+"POT-Creation-Date: 2000-09-11 12:53-0400\n"
 "PO-Revision-Date: 2000-08-23 22:24+0100\n"
 "Last-Translator: Milan Kerslager <milan.kerslager@spsselib.hiedu.cz>\n"
 "Language-Team: Czech <cs@li.org>\n"
diff --git a/po/da.po b/po/da.po
index 13c8638..f563646 100644
--- a/po/da.po
+++ b/po/da.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.1\n"
-"POT-Creation-Date: 2000-11-20 14:36-0500\n"
+"POT-Creation-Date: 2000-09-11 12:53-0400\n"
 "PO-Revision-Date: 2000-03-07 05:17+01:00\n"
 "Last-Translator: K. Christiansen <kenneth@gnu.org>\n"
 "Language-Team: Danish/Dansk <dansk@klid.dk>\n"
diff --git a/po/de.po b/po/de.po
index 1d906ea..6204394 100644
--- a/po/de.po
+++ b/po/de.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.1\n"
-"POT-Creation-Date: 2000-11-20 14:36-0500\n"
+"POT-Creation-Date: 2000-09-11 12:53-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/po/es.po b/po/es.po
index 1d906ea..6204394 100644
--- a/po/es.po
+++ b/po/es.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.1\n"
-"POT-Creation-Date: 2000-11-20 14:36-0500\n"
+"POT-Creation-Date: 2000-09-11 12:53-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/po/fi.po b/po/fi.po
index 1d906ea..6204394 100644
--- a/po/fi.po
+++ b/po/fi.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.1\n"
-"POT-Creation-Date: 2000-11-20 14:36-0500\n"
+"POT-Creation-Date: 2000-09-11 12:53-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/po/fr.po b/po/fr.po
index 1d906ea..6204394 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.1\n"
-"POT-Creation-Date: 2000-11-20 14:36-0500\n"
+"POT-Creation-Date: 2000-09-11 12:53-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/po/gl.po b/po/gl.po
index dd2b14a..0e4a0de 100644
--- a/po/gl.po
+++ b/po/gl.po
@@ -10,7 +10,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.1\n"
-"POT-Creation-Date: 2000-11-20 14:36-0500\n"
+"POT-Creation-Date: 2000-09-11 12:53-0400\n"
 "PO-Revision-Date: 2000-01-06 20:31+0100\n"
 "Last-Translator: Jes�s Bravo �lvarez <jba@pobox.com>\n"
 "Language-Team: Galician <gpul-traduccion@ceu.fi.udc.es>\n"
diff --git a/po/hu.po b/po/hu.po
index f7117ba..10d2537 100644
--- a/po/hu.po
+++ b/po/hu.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.1\n"
-"POT-Creation-Date: 2000-11-20 14:36-0500\n"
+"POT-Creation-Date: 2000-09-11 12:53-0400\n"
 "PO-Revision-Date: 2000-08-03 23:26+0200\n"
 "Last-Translator: L�szl� N�meth <nemeth@qwertynet.hu>\n"
 "Language-Team: Hungarian\n"
diff --git a/po/id.po b/po/id.po
index 1d906ea..6204394 100644
--- a/po/id.po
+++ b/po/id.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.1\n"
-"POT-Creation-Date: 2000-11-20 14:36-0500\n"
+"POT-Creation-Date: 2000-09-11 12:53-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/po/is.po b/po/is.po
index 1fe5229..7a9e5ec 100644
--- a/po/is.po
+++ b/po/is.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.1\n"
-"POT-Creation-Date: 2000-11-20 14:36-0500\n"
+"POT-Creation-Date: 2000-09-11 12:53-0400\n"
 "PO-Revision-Date: 2000-06-16 02:12+0000\n"
 "Last-Translator: Richard Allen <ra@hp.is>\n"
 "Language-Team: is <kde-isl@mmedia.is>\n"
diff --git a/po/it.po b/po/it.po
index 1d906ea..6204394 100644
--- a/po/it.po
+++ b/po/it.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.1\n"
-"POT-Creation-Date: 2000-11-20 14:36-0500\n"
+"POT-Creation-Date: 2000-09-11 12:53-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/po/ja.po b/po/ja.po
index 1d906ea..6204394 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.1\n"
-"POT-Creation-Date: 2000-11-20 14:36-0500\n"
+"POT-Creation-Date: 2000-09-11 12:53-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/po/ko.po b/po/ko.po
index 1d906ea..6204394 100644
--- a/po/ko.po
+++ b/po/ko.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.1\n"
-"POT-Creation-Date: 2000-11-20 14:36-0500\n"
+"POT-Creation-Date: 2000-09-11 12:53-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/po/no.po b/po/no.po
index 84a4cf9..c2cc103 100644
--- a/po/no.po
+++ b/po/no.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.1\n"
-"POT-Creation-Date: 2000-11-20 14:36-0500\n"
+"POT-Creation-Date: 2000-09-11 12:53-0400\n"
 "PO-Revision-Date: 2000-06-21 16:11+02:00\n"
 "Last-Translator: Kjartan Maraas <kmaraas@online.no>\n"
 "Language-Team: Norwegian <no@li.org>\n"
diff --git a/po/pl.po b/po/pl.po
index 1d906ea..6204394 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.1\n"
-"POT-Creation-Date: 2000-11-20 14:36-0500\n"
+"POT-Creation-Date: 2000-09-11 12:53-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/po/pt.po b/po/pt.po
index c6ae4f2..1ec4985 100644
--- a/po/pt.po
+++ b/po/pt.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.1\n"
-"POT-Creation-Date: 2000-11-20 14:36-0500\n"
+"POT-Creation-Date: 2000-09-11 12:53-0400\n"
 "PO-Revision-Date: 2000-06-22 01:02+01:00\n"
 "Last-Translator: Pedro Morais <morais@kde.org>\n"
 "Language-Team: pt <morais@kde.org>\n"
diff --git a/po/pt_BR.po b/po/pt_BR.po
index 1d906ea..6204394 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.1\n"
-"POT-Creation-Date: 2000-11-20 14:36-0500\n"
+"POT-Creation-Date: 2000-09-11 12:53-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/po/ro.po b/po/ro.po
index c6cec5b..52689c8 100644
--- a/po/ro.po
+++ b/po/ro.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.1\n"
-"POT-Creation-Date: 2000-11-20 14:36-0500\n"
+"POT-Creation-Date: 2000-09-11 12:53-0400\n"
 "PO-Revision-Date: 2000-06-14 23:23+EST\n"
 "Last-Translator: Cristian Gafton <gafton@redhat.com>\n"
 "Language-Team: Romanian <ro@li.org>\n"
diff --git a/po/ru.po b/po/ru.po
index fa1e91c..9d9e5c7 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.1\n"
-"POT-Creation-Date: 2000-11-20 14:36-0500\n"
+"POT-Creation-Date: 2000-09-11 12:53-0400\n"
 "PO-Revision-Date: 2000-08-13 21:00+0300\n"
 "Last-Translator: Leon Kanter <leon@blackcatlinux.com>\n"
 "Language-Team: Black Cat Linux Team <blackcat-support@blackcatlinux.com>\n"
diff --git a/po/sk.po b/po/sk.po
index a3b29ae..95e9897 100644
--- a/po/sk.po
+++ b/po/sk.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.1\n"
-"POT-Creation-Date: 2000-11-20 14:36-0500\n"
+"POT-Creation-Date: 2000-09-11 12:53-0400\n"
 "PO-Revision-Date: 1999-08-04 21:40+0200\n"
 "Last-Translator: Stanislav Meduna <stano@eunet.sk>\n"
 "Language-Team: Slovak <sk-i18n@rak.isternet.sk>\n"
diff --git a/po/sl.po b/po/sl.po
index 7330b89..fd7562a 100644
--- a/po/sl.po
+++ b/po/sl.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.1\n"
-"POT-Creation-Date: 2000-11-20 14:36-0500\n"
+"POT-Creation-Date: 2000-09-11 12:53-0400\n"
 "PO-Revision-Date: 2000-09-05 12:30+0200\n"
 "Last-Translator: Roman Maurer <roman.maurer@hermes.si>\n"
 "Language-Team: Slovenian <sl@li.org>\n"
diff --git a/po/sr.po b/po/sr.po
index 1d906ea..6204394 100644
--- a/po/sr.po
+++ b/po/sr.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.1\n"
-"POT-Creation-Date: 2000-11-20 14:36-0500\n"
+"POT-Creation-Date: 2000-09-11 12:53-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/po/sv.po b/po/sv.po
index e27bcff..e7c2045 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.1\n"
-"POT-Creation-Date: 2000-11-20 14:36-0500\n"
+"POT-Creation-Date: 2000-09-11 12:53-0400\n"
 "PO-Revision-Date: 2000-06-20 00:07+0200\n"
 "Last-Translator: Christian Rose <menthos@menthos.com>\n"
 "Language-Team: Swedish <sv@li.org>\n"
diff --git a/po/tr.po b/po/tr.po
index 2b144bf..1da4d82 100644
--- a/po/tr.po
+++ b/po/tr.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.1\n"
-"POT-Creation-Date: 2000-11-20 14:36-0500\n"
+"POT-Creation-Date: 2000-09-11 12:53-0400\n"
 "PO-Revision-Date: 2000-01-06 13:01+0100\n"
 "Last-Translator: G�rkem �etin <kabalak@gmx.net>\n"
 "Language-Team: Gelecek A.� <gorkem@gelecek.com.tr>\n"
diff --git a/po/uk.po b/po/uk.po
index 41d49b0..7f0b59e 100644
--- a/po/uk.po
+++ b/po/uk.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.1\n"
-"POT-Creation-Date: 2000-11-20 14:36-0500\n"
+"POT-Creation-Date: 2000-09-11 12:53-0400\n"
 "PO-Revision-Date: 1999-09-30 16:54+0200\n"
 "Last-Translator: Yuri Syrota <rasta@renome.rovno.ua>\n"
 "Language-Team: Ukrainian <uk@li.org>\n"
diff --git a/po/wa.po b/po/wa.po
index e0c3f4e..57fa272 100644
--- a/po/wa.po
+++ b/po/wa.po
@@ -9,7 +9,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.1\n"
-"POT-Creation-Date: 2000-11-20 14:36-0500\n"
+"POT-Creation-Date: 2000-09-11 12:53-0400\n"
 "PO-Revision-Date: 1999-03-18 23:11+0100\n"
 "Last-Translator: Nobody yet\n"
 "Language-Team: walon <linux-wa@chanae.alphanet.ch>\n"
diff --git a/po/zh.po b/po/zh.po
index 1d906ea..6204394 100644
--- a/po/zh.po
+++ b/po/zh.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.1\n"
-"POT-Creation-Date: 2000-11-20 14:36-0500\n"
+"POT-Creation-Date: 2000-09-11 12:53-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/po/zh_CN.GB2312.po b/po/zh_CN.GB2312.po
index 523cea6..9db6ad6 100644
--- a/po/zh_CN.GB2312.po
+++ b/po/zh_CN.GB2312.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.1\n"
-"POT-Creation-Date: 2000-11-20 14:36-0500\n"
+"POT-Creation-Date: 2000-09-11 12:53-0400\n"
 "PO-Revision-Date: 1999-11-11 05:04+0800\n"
 "Last-Translator: Dillion Chen <dillon.chen@turbolinux.com.cn>\n"
 "Language-Team: TLDN\n"
-- 
Gitee


From 90bcd4f0066116588abd41985367f9260d67def8 Mon Sep 17 00:00:00 2001
From: Jeff Johnson <n3npq@mac.com>
Date: Tue, 19 Dec 2000 23:22:01 +0000
Subject: [PATCH 281/667] Sync with rpm-4_0 branch.

---
 acconfig.h   | 4 ++--
 findme.c     | 4 ++--
 findme.h     | 4 ++--
 po/popt.pot  | 2 +-
 popt.c       | 4 ++--
 popt.h       | 4 ++--
 popt.spec    | 4 ++--
 poptconfig.c | 4 ++--
 popthelp.c   | 4 ++--
 poptint.h    | 4 ++--
 poptparse.c  | 4 ++--
 test1.c      | 4 ++--
 12 files changed, 23 insertions(+), 23 deletions(-)

diff --git a/acconfig.h b/acconfig.h
index 7fe3ea9..10965f1 100644
--- a/acconfig.h
+++ b/acconfig.h
@@ -1,6 +1,6 @@
-/* (C) 1998 Red Hat Software, Inc. -- Licensing details are in the COPYING
+/* (C) 1998-2000 Red Hat, Inc. -- Licensing details are in the COPYING
    file accompanying popt source distributions, available from 
-   ftp://ftp.redhat.com/pub/code/popt */
+   ftp://ftp.rpm.org/pub/rpm/dist. */
 
 /* acconfig.h
    This file is in the public domain.
diff --git a/findme.c b/findme.c
index b5878a1..e65762d 100644
--- a/findme.c
+++ b/findme.c
@@ -2,9 +2,9 @@
  * \file popt/findme.c
  */
 
-/* (C) 1998 Red Hat Software, Inc. -- Licensing details are in the COPYING
+/* (C) 1998-2000 Red Hat, Inc. -- Licensing details are in the COPYING
    file accompanying popt source distributions, available from 
-   ftp://ftp.redhat.com/pub/code/popt */
+   ftp://ftp.rpm.org/pub/rpm/dist. */
 
 #include "system.h"
 #include "findme.h"
diff --git a/findme.h b/findme.h
index 78f714e..44ec801 100644
--- a/findme.h
+++ b/findme.h
@@ -2,9 +2,9 @@
  * \file popt/findme.h
  */
 
-/* (C) 1998 Red Hat Software, Inc. -- Licensing details are in the COPYING
+/* (C) 1998-2000 Red Hat, Inc. -- Licensing details are in the COPYING
    file accompanying popt source distributions, available from 
-   ftp://ftp.redhat.com/pub/code/popt */
+   ftp://ftp.rpm.org/pub/rpm/dist. */
 
 #ifndef H_FINDME
 #define H_FINDME
diff --git a/po/popt.pot b/po/popt.pot
index 6e3a15b..b15489b 100644
--- a/po/popt.pot
+++ b/po/popt.pot
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2000-09-11 12:53-0400\n"
+"POT-Creation-Date: 2000-12-19 18:05-0500\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/popt.c b/popt.c
index 3fd6361..6c4100c 100644
--- a/popt.c
+++ b/popt.c
@@ -2,9 +2,9 @@
  * \file popt/popt.c
  */
 
-/* (C) 1998 Red Hat Software, Inc. -- Licensing details are in the COPYING
+/* (C) 19982000 Red Hat, Inc. -- Licensing details are in the COPYING
    file accompanying popt source distributions, available from
-   ftp://ftp.redhat.com/pub/code/popt */
+   ftp://ftp.rpm.org/pub/rpm/dist */
 
 #undef	MYDEBUG
 
diff --git a/popt.h b/popt.h
index d4dd489..7a0a6b1 100644
--- a/popt.h
+++ b/popt.h
@@ -2,9 +2,9 @@
  * \file popt/popt.h
  */
 
-/* (C) 1998 Red Hat Software, Inc. -- Licensing details are in the COPYING
+/* (C) 1998-2000 Red Hat, Inc. -- Licensing details are in the COPYING
    file accompanying popt source distributions, available from 
-   ftp://ftp.redhat.com/pub/code/popt */
+   ftp://ftp.rpm.org/pub/rpm/dist. */
 
 #ifndef H_POPT
 #define H_POPT
diff --git a/popt.spec b/popt.spec
index a417aeb..5c23295 100644
--- a/popt.spec
+++ b/popt.spec
@@ -4,9 +4,9 @@
 #
 Summary: A C library for parsing command line parameters.
 Name: popt
-Version: 1.7
+Version: 1.6.1
 Release: 0.1
-Copyright: LGPL
+Copyright: X Consortium
 Group: System Environment/Libraries
 Source: ftp://ftp.redhat.com/pub/redhat/code/popt/popt-%{version}.tar.gz
 BuildRoot: /var/tmp/%{name}root
diff --git a/poptconfig.c b/poptconfig.c
index 9e50b52..0cfd1a1 100644
--- a/poptconfig.c
+++ b/poptconfig.c
@@ -2,9 +2,9 @@
  * \file popt/poptconfig.c
  */
 
-/* (C) 1998 Red Hat Software, Inc. -- Licensing details are in the COPYING
+/* (C) 1998-2000 Red Hat, Inc. -- Licensing details are in the COPYING
    file accompanying popt source distributions, available from 
-   ftp://ftp.redhat.com/pub/code/popt */
+   ftp://ftp.rpm.org/pub/rpm/dist. */
 
 #include "system.h"
 #include "poptint.h"
diff --git a/popthelp.c b/popthelp.c
index 8eed7ee..c88d094 100644
--- a/popthelp.c
+++ b/popthelp.c
@@ -4,9 +4,9 @@
  * \file popt/popthelp.c
  */
 
-/* (C) 1998 Red Hat Software, Inc. -- Licensing details are in the COPYING
+/* (C) 1998-2000 Red Hat, Inc. -- Licensing details are in the COPYING
    file accompanying popt source distributions, available from 
-   ftp://ftp.redhat.com/pub/code/popt */
+   ftp://ftp.rpm.org/pub/rpm/dist. */
 
 #include "system.h"
 #include "poptint.h"
diff --git a/poptint.h b/poptint.h
index 39ae3ee..a37a9b9 100644
--- a/poptint.h
+++ b/poptint.h
@@ -2,9 +2,9 @@
  * \file popt/poptint.h
  */
 
-/* (C) 1998 Red Hat Software, Inc. -- Licensing details are in the COPYING
+/* (C) 1998-2000 Red Hat, Inc. -- Licensing details are in the COPYING
    file accompanying popt source distributions, available from 
-   ftp://ftp.redhat.com/pub/code/popt */
+   ftp://ftp.rpm.org/pub/rpm/dist. */
 
 #ifndef H_POPTINT
 #define H_POPTINT
diff --git a/poptparse.c b/poptparse.c
index 7a2d505..9133c36 100644
--- a/poptparse.c
+++ b/poptparse.c
@@ -2,9 +2,9 @@
  * \file popt/poptparse.c
  */
 
-/* (C) 1998 Red Hat Software, Inc. -- Licensing details are in the COPYING
+/* (C) 1998-2000 Red Hat, Inc. -- Licensing details are in the COPYING
    file accompanying popt source distributions, available from 
-   ftp://ftp.redhat.com/pub/code/popt */
+   ftp://ftp.rpm.org/pub/rpm/dist. */
 
 #include "system.h"
 
diff --git a/test1.c b/test1.c
index fdd3a4a..5b6aeb7 100644
--- a/test1.c
+++ b/test1.c
@@ -1,6 +1,6 @@
-/* (C) 1998 Red Hat Software, Inc. -- Licensing details are in the COPYING
+/* (C) 1998-2000 Red Hat, Inc. -- Licensing details are in the COPYING
    file accompanying popt source distributions, available from
-   ftp://ftp.redhat.com/pub/code/popt */
+   ftp://ftp.rpm.org/pub/rpm/dist. */
 
 #include "system.h"
 
-- 
Gitee


From f8cfc5e54fa4bc3dea2042adcfabef40f004ab68 Mon Sep 17 00:00:00 2001
From: Jeff Johnson <n3npq@mac.com>
Date: Wed, 20 Dec 2000 21:08:24 +0000
Subject: [PATCH 282/667] - whiteout mozilla loop for 7.1. fix the auto
 %_tmppath creation.

---
 po/cs.po           | 2 +-
 po/da.po           | 2 +-
 po/de.po           | 2 +-
 po/es.po           | 2 +-
 po/fi.po           | 2 +-
 po/fr.po           | 2 +-
 po/gl.po           | 2 +-
 po/hu.po           | 2 +-
 po/id.po           | 2 +-
 po/is.po           | 2 +-
 po/it.po           | 2 +-
 po/ja.po           | 2 +-
 po/ko.po           | 2 +-
 po/no.po           | 2 +-
 po/pl.po           | 2 +-
 po/pt.po           | 2 +-
 po/pt_BR.po        | 2 +-
 po/ro.po           | 2 +-
 po/ru.po           | 2 +-
 po/sk.po           | 2 +-
 po/sl.po           | 2 +-
 po/sr.po           | 2 +-
 po/sv.po           | 2 +-
 po/tr.po           | 2 +-
 po/uk.po           | 2 +-
 po/wa.po           | 2 +-
 po/zh.po           | 2 +-
 po/zh_CN.GB2312.po | 2 +-
 28 files changed, 28 insertions(+), 28 deletions(-)

diff --git a/po/cs.po b/po/cs.po
index f3cdb8e..31b10cd 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.1\n"
-"POT-Creation-Date: 2000-09-11 12:53-0400\n"
+"POT-Creation-Date: 2000-12-19 18:05-0500\n"
 "PO-Revision-Date: 2000-08-23 22:24+0100\n"
 "Last-Translator: Milan Kerslager <milan.kerslager@spsselib.hiedu.cz>\n"
 "Language-Team: Czech <cs@li.org>\n"
diff --git a/po/da.po b/po/da.po
index f563646..346a403 100644
--- a/po/da.po
+++ b/po/da.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.1\n"
-"POT-Creation-Date: 2000-09-11 12:53-0400\n"
+"POT-Creation-Date: 2000-12-19 18:05-0500\n"
 "PO-Revision-Date: 2000-03-07 05:17+01:00\n"
 "Last-Translator: K. Christiansen <kenneth@gnu.org>\n"
 "Language-Team: Danish/Dansk <dansk@klid.dk>\n"
diff --git a/po/de.po b/po/de.po
index 6204394..4c4d98f 100644
--- a/po/de.po
+++ b/po/de.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.1\n"
-"POT-Creation-Date: 2000-09-11 12:53-0400\n"
+"POT-Creation-Date: 2000-12-19 18:05-0500\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/po/es.po b/po/es.po
index 6204394..4c4d98f 100644
--- a/po/es.po
+++ b/po/es.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.1\n"
-"POT-Creation-Date: 2000-09-11 12:53-0400\n"
+"POT-Creation-Date: 2000-12-19 18:05-0500\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/po/fi.po b/po/fi.po
index 6204394..4c4d98f 100644
--- a/po/fi.po
+++ b/po/fi.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.1\n"
-"POT-Creation-Date: 2000-09-11 12:53-0400\n"
+"POT-Creation-Date: 2000-12-19 18:05-0500\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/po/fr.po b/po/fr.po
index 6204394..4c4d98f 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.1\n"
-"POT-Creation-Date: 2000-09-11 12:53-0400\n"
+"POT-Creation-Date: 2000-12-19 18:05-0500\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/po/gl.po b/po/gl.po
index 0e4a0de..9f58484 100644
--- a/po/gl.po
+++ b/po/gl.po
@@ -10,7 +10,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.1\n"
-"POT-Creation-Date: 2000-09-11 12:53-0400\n"
+"POT-Creation-Date: 2000-12-19 18:05-0500\n"
 "PO-Revision-Date: 2000-01-06 20:31+0100\n"
 "Last-Translator: Jes�s Bravo �lvarez <jba@pobox.com>\n"
 "Language-Team: Galician <gpul-traduccion@ceu.fi.udc.es>\n"
diff --git a/po/hu.po b/po/hu.po
index 10d2537..a3abdb3 100644
--- a/po/hu.po
+++ b/po/hu.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.1\n"
-"POT-Creation-Date: 2000-09-11 12:53-0400\n"
+"POT-Creation-Date: 2000-12-19 18:05-0500\n"
 "PO-Revision-Date: 2000-08-03 23:26+0200\n"
 "Last-Translator: L�szl� N�meth <nemeth@qwertynet.hu>\n"
 "Language-Team: Hungarian\n"
diff --git a/po/id.po b/po/id.po
index 6204394..4c4d98f 100644
--- a/po/id.po
+++ b/po/id.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.1\n"
-"POT-Creation-Date: 2000-09-11 12:53-0400\n"
+"POT-Creation-Date: 2000-12-19 18:05-0500\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/po/is.po b/po/is.po
index 7a9e5ec..2d9759f 100644
--- a/po/is.po
+++ b/po/is.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.1\n"
-"POT-Creation-Date: 2000-09-11 12:53-0400\n"
+"POT-Creation-Date: 2000-12-19 18:05-0500\n"
 "PO-Revision-Date: 2000-06-16 02:12+0000\n"
 "Last-Translator: Richard Allen <ra@hp.is>\n"
 "Language-Team: is <kde-isl@mmedia.is>\n"
diff --git a/po/it.po b/po/it.po
index 6204394..4c4d98f 100644
--- a/po/it.po
+++ b/po/it.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.1\n"
-"POT-Creation-Date: 2000-09-11 12:53-0400\n"
+"POT-Creation-Date: 2000-12-19 18:05-0500\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/po/ja.po b/po/ja.po
index 6204394..4c4d98f 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.1\n"
-"POT-Creation-Date: 2000-09-11 12:53-0400\n"
+"POT-Creation-Date: 2000-12-19 18:05-0500\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/po/ko.po b/po/ko.po
index 6204394..4c4d98f 100644
--- a/po/ko.po
+++ b/po/ko.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.1\n"
-"POT-Creation-Date: 2000-09-11 12:53-0400\n"
+"POT-Creation-Date: 2000-12-19 18:05-0500\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/po/no.po b/po/no.po
index c2cc103..bf8e742 100644
--- a/po/no.po
+++ b/po/no.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.1\n"
-"POT-Creation-Date: 2000-09-11 12:53-0400\n"
+"POT-Creation-Date: 2000-12-19 18:05-0500\n"
 "PO-Revision-Date: 2000-06-21 16:11+02:00\n"
 "Last-Translator: Kjartan Maraas <kmaraas@online.no>\n"
 "Language-Team: Norwegian <no@li.org>\n"
diff --git a/po/pl.po b/po/pl.po
index 6204394..4c4d98f 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.1\n"
-"POT-Creation-Date: 2000-09-11 12:53-0400\n"
+"POT-Creation-Date: 2000-12-19 18:05-0500\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/po/pt.po b/po/pt.po
index 1ec4985..2bd6434 100644
--- a/po/pt.po
+++ b/po/pt.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.1\n"
-"POT-Creation-Date: 2000-09-11 12:53-0400\n"
+"POT-Creation-Date: 2000-12-19 18:05-0500\n"
 "PO-Revision-Date: 2000-06-22 01:02+01:00\n"
 "Last-Translator: Pedro Morais <morais@kde.org>\n"
 "Language-Team: pt <morais@kde.org>\n"
diff --git a/po/pt_BR.po b/po/pt_BR.po
index 6204394..4c4d98f 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.1\n"
-"POT-Creation-Date: 2000-09-11 12:53-0400\n"
+"POT-Creation-Date: 2000-12-19 18:05-0500\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/po/ro.po b/po/ro.po
index 52689c8..e374d86 100644
--- a/po/ro.po
+++ b/po/ro.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.1\n"
-"POT-Creation-Date: 2000-09-11 12:53-0400\n"
+"POT-Creation-Date: 2000-12-19 18:05-0500\n"
 "PO-Revision-Date: 2000-06-14 23:23+EST\n"
 "Last-Translator: Cristian Gafton <gafton@redhat.com>\n"
 "Language-Team: Romanian <ro@li.org>\n"
diff --git a/po/ru.po b/po/ru.po
index 9d9e5c7..60098ee 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.1\n"
-"POT-Creation-Date: 2000-09-11 12:53-0400\n"
+"POT-Creation-Date: 2000-12-19 18:05-0500\n"
 "PO-Revision-Date: 2000-08-13 21:00+0300\n"
 "Last-Translator: Leon Kanter <leon@blackcatlinux.com>\n"
 "Language-Team: Black Cat Linux Team <blackcat-support@blackcatlinux.com>\n"
diff --git a/po/sk.po b/po/sk.po
index 95e9897..de2d347 100644
--- a/po/sk.po
+++ b/po/sk.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.1\n"
-"POT-Creation-Date: 2000-09-11 12:53-0400\n"
+"POT-Creation-Date: 2000-12-19 18:05-0500\n"
 "PO-Revision-Date: 1999-08-04 21:40+0200\n"
 "Last-Translator: Stanislav Meduna <stano@eunet.sk>\n"
 "Language-Team: Slovak <sk-i18n@rak.isternet.sk>\n"
diff --git a/po/sl.po b/po/sl.po
index fd7562a..2939331 100644
--- a/po/sl.po
+++ b/po/sl.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.1\n"
-"POT-Creation-Date: 2000-09-11 12:53-0400\n"
+"POT-Creation-Date: 2000-12-19 18:05-0500\n"
 "PO-Revision-Date: 2000-09-05 12:30+0200\n"
 "Last-Translator: Roman Maurer <roman.maurer@hermes.si>\n"
 "Language-Team: Slovenian <sl@li.org>\n"
diff --git a/po/sr.po b/po/sr.po
index 6204394..4c4d98f 100644
--- a/po/sr.po
+++ b/po/sr.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.1\n"
-"POT-Creation-Date: 2000-09-11 12:53-0400\n"
+"POT-Creation-Date: 2000-12-19 18:05-0500\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/po/sv.po b/po/sv.po
index e7c2045..bd5f157 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.1\n"
-"POT-Creation-Date: 2000-09-11 12:53-0400\n"
+"POT-Creation-Date: 2000-12-19 18:05-0500\n"
 "PO-Revision-Date: 2000-06-20 00:07+0200\n"
 "Last-Translator: Christian Rose <menthos@menthos.com>\n"
 "Language-Team: Swedish <sv@li.org>\n"
diff --git a/po/tr.po b/po/tr.po
index 1da4d82..2e56a91 100644
--- a/po/tr.po
+++ b/po/tr.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.1\n"
-"POT-Creation-Date: 2000-09-11 12:53-0400\n"
+"POT-Creation-Date: 2000-12-19 18:05-0500\n"
 "PO-Revision-Date: 2000-01-06 13:01+0100\n"
 "Last-Translator: G�rkem �etin <kabalak@gmx.net>\n"
 "Language-Team: Gelecek A.� <gorkem@gelecek.com.tr>\n"
diff --git a/po/uk.po b/po/uk.po
index 7f0b59e..b4ea032 100644
--- a/po/uk.po
+++ b/po/uk.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.1\n"
-"POT-Creation-Date: 2000-09-11 12:53-0400\n"
+"POT-Creation-Date: 2000-12-19 18:05-0500\n"
 "PO-Revision-Date: 1999-09-30 16:54+0200\n"
 "Last-Translator: Yuri Syrota <rasta@renome.rovno.ua>\n"
 "Language-Team: Ukrainian <uk@li.org>\n"
diff --git a/po/wa.po b/po/wa.po
index 57fa272..d054d39 100644
--- a/po/wa.po
+++ b/po/wa.po
@@ -9,7 +9,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.1\n"
-"POT-Creation-Date: 2000-09-11 12:53-0400\n"
+"POT-Creation-Date: 2000-12-19 18:05-0500\n"
 "PO-Revision-Date: 1999-03-18 23:11+0100\n"
 "Last-Translator: Nobody yet\n"
 "Language-Team: walon <linux-wa@chanae.alphanet.ch>\n"
diff --git a/po/zh.po b/po/zh.po
index 6204394..4c4d98f 100644
--- a/po/zh.po
+++ b/po/zh.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.1\n"
-"POT-Creation-Date: 2000-09-11 12:53-0400\n"
+"POT-Creation-Date: 2000-12-19 18:05-0500\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/po/zh_CN.GB2312.po b/po/zh_CN.GB2312.po
index 9db6ad6..3e7a016 100644
--- a/po/zh_CN.GB2312.po
+++ b/po/zh_CN.GB2312.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.1\n"
-"POT-Creation-Date: 2000-09-11 12:53-0400\n"
+"POT-Creation-Date: 2000-12-19 18:05-0500\n"
 "PO-Revision-Date: 1999-11-11 05:04+0800\n"
 "Last-Translator: Dillion Chen <dillon.chen@turbolinux.com.cn>\n"
 "Language-Team: TLDN\n"
-- 
Gitee


From 87106e87117115b930284529e735f54cc3b7e00f Mon Sep 17 00:00:00 2001
From: Jeff Johnson <n3npq@mac.com>
Date: Sat, 30 Dec 2000 19:59:37 +0000
Subject: [PATCH 283/667] - (popt): fix float/double handling (#19701). -
 (popt): non-linux needs <float.h> (#22732).

---
 configure.in       | 2 +-
 po/cs.po           | 2 +-
 po/da.po           | 2 +-
 po/de.po           | 2 +-
 po/es.po           | 2 +-
 po/fi.po           | 2 +-
 po/fr.po           | 2 +-
 po/gl.po           | 2 +-
 po/hu.po           | 2 +-
 po/id.po           | 2 +-
 po/is.po           | 2 +-
 po/it.po           | 2 +-
 po/ja.po           | 2 +-
 po/ko.po           | 2 +-
 po/no.po           | 2 +-
 po/pl.po           | 2 +-
 po/popt.pot        | 2 +-
 po/pt.po           | 2 +-
 po/pt_BR.po        | 2 +-
 po/ro.po           | 2 +-
 po/ru.po           | 2 +-
 po/sk.po           | 2 +-
 po/sl.po           | 2 +-
 po/sr.po           | 2 +-
 po/sv.po           | 2 +-
 po/tr.po           | 2 +-
 po/uk.po           | 2 +-
 po/wa.po           | 2 +-
 po/zh.po           | 2 +-
 po/zh_CN.GB2312.po | 2 +-
 popt.c             | 5 ++++-
 31 files changed, 34 insertions(+), 31 deletions(-)

diff --git a/configure.in b/configure.in
index 9c6ddac..b484c87 100755
--- a/configure.in
+++ b/configure.in
@@ -48,7 +48,7 @@ else
 fi
 AC_SUBST(TARGET)
 
-AC_CHECK_HEADERS(alloca.h libintl.h mcheck.h unistd.h)
+AC_CHECK_HEADERS(alloca.h float.h libintl.h mcheck.h unistd.h)
 AC_MSG_CHECKING(for /usr/ucblib in LIBS)
 if test -d /usr/ucblib ; then
 	if test "$build" = "mips-sni-sysv4" ; then
diff --git a/po/cs.po b/po/cs.po
index 31b10cd..d81453b 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.1\n"
-"POT-Creation-Date: 2000-12-19 18:05-0500\n"
+"POT-Creation-Date: 2000-12-30 14:24-0500\n"
 "PO-Revision-Date: 2000-08-23 22:24+0100\n"
 "Last-Translator: Milan Kerslager <milan.kerslager@spsselib.hiedu.cz>\n"
 "Language-Team: Czech <cs@li.org>\n"
diff --git a/po/da.po b/po/da.po
index 346a403..ab784a5 100644
--- a/po/da.po
+++ b/po/da.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.1\n"
-"POT-Creation-Date: 2000-12-19 18:05-0500\n"
+"POT-Creation-Date: 2000-12-30 14:24-0500\n"
 "PO-Revision-Date: 2000-03-07 05:17+01:00\n"
 "Last-Translator: K. Christiansen <kenneth@gnu.org>\n"
 "Language-Team: Danish/Dansk <dansk@klid.dk>\n"
diff --git a/po/de.po b/po/de.po
index 4c4d98f..35c4226 100644
--- a/po/de.po
+++ b/po/de.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.1\n"
-"POT-Creation-Date: 2000-12-19 18:05-0500\n"
+"POT-Creation-Date: 2000-12-30 14:24-0500\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/po/es.po b/po/es.po
index 4c4d98f..35c4226 100644
--- a/po/es.po
+++ b/po/es.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.1\n"
-"POT-Creation-Date: 2000-12-19 18:05-0500\n"
+"POT-Creation-Date: 2000-12-30 14:24-0500\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/po/fi.po b/po/fi.po
index 4c4d98f..35c4226 100644
--- a/po/fi.po
+++ b/po/fi.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.1\n"
-"POT-Creation-Date: 2000-12-19 18:05-0500\n"
+"POT-Creation-Date: 2000-12-30 14:24-0500\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/po/fr.po b/po/fr.po
index 4c4d98f..35c4226 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.1\n"
-"POT-Creation-Date: 2000-12-19 18:05-0500\n"
+"POT-Creation-Date: 2000-12-30 14:24-0500\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/po/gl.po b/po/gl.po
index 9f58484..989e963 100644
--- a/po/gl.po
+++ b/po/gl.po
@@ -10,7 +10,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.1\n"
-"POT-Creation-Date: 2000-12-19 18:05-0500\n"
+"POT-Creation-Date: 2000-12-30 14:24-0500\n"
 "PO-Revision-Date: 2000-01-06 20:31+0100\n"
 "Last-Translator: Jes�s Bravo �lvarez <jba@pobox.com>\n"
 "Language-Team: Galician <gpul-traduccion@ceu.fi.udc.es>\n"
diff --git a/po/hu.po b/po/hu.po
index a3abdb3..22b953f 100644
--- a/po/hu.po
+++ b/po/hu.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.1\n"
-"POT-Creation-Date: 2000-12-19 18:05-0500\n"
+"POT-Creation-Date: 2000-12-30 14:24-0500\n"
 "PO-Revision-Date: 2000-08-03 23:26+0200\n"
 "Last-Translator: L�szl� N�meth <nemeth@qwertynet.hu>\n"
 "Language-Team: Hungarian\n"
diff --git a/po/id.po b/po/id.po
index 4c4d98f..35c4226 100644
--- a/po/id.po
+++ b/po/id.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.1\n"
-"POT-Creation-Date: 2000-12-19 18:05-0500\n"
+"POT-Creation-Date: 2000-12-30 14:24-0500\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/po/is.po b/po/is.po
index 2d9759f..2e582b2 100644
--- a/po/is.po
+++ b/po/is.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.1\n"
-"POT-Creation-Date: 2000-12-19 18:05-0500\n"
+"POT-Creation-Date: 2000-12-30 14:24-0500\n"
 "PO-Revision-Date: 2000-06-16 02:12+0000\n"
 "Last-Translator: Richard Allen <ra@hp.is>\n"
 "Language-Team: is <kde-isl@mmedia.is>\n"
diff --git a/po/it.po b/po/it.po
index 4c4d98f..35c4226 100644
--- a/po/it.po
+++ b/po/it.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.1\n"
-"POT-Creation-Date: 2000-12-19 18:05-0500\n"
+"POT-Creation-Date: 2000-12-30 14:24-0500\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/po/ja.po b/po/ja.po
index 4c4d98f..35c4226 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.1\n"
-"POT-Creation-Date: 2000-12-19 18:05-0500\n"
+"POT-Creation-Date: 2000-12-30 14:24-0500\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/po/ko.po b/po/ko.po
index 4c4d98f..35c4226 100644
--- a/po/ko.po
+++ b/po/ko.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.1\n"
-"POT-Creation-Date: 2000-12-19 18:05-0500\n"
+"POT-Creation-Date: 2000-12-30 14:24-0500\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/po/no.po b/po/no.po
index bf8e742..4443b98 100644
--- a/po/no.po
+++ b/po/no.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.1\n"
-"POT-Creation-Date: 2000-12-19 18:05-0500\n"
+"POT-Creation-Date: 2000-12-30 14:24-0500\n"
 "PO-Revision-Date: 2000-06-21 16:11+02:00\n"
 "Last-Translator: Kjartan Maraas <kmaraas@online.no>\n"
 "Language-Team: Norwegian <no@li.org>\n"
diff --git a/po/pl.po b/po/pl.po
index 4c4d98f..35c4226 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.1\n"
-"POT-Creation-Date: 2000-12-19 18:05-0500\n"
+"POT-Creation-Date: 2000-12-30 14:24-0500\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/po/popt.pot b/po/popt.pot
index b15489b..4fb4a86 100644
--- a/po/popt.pot
+++ b/po/popt.pot
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2000-12-19 18:05-0500\n"
+"POT-Creation-Date: 2000-12-30 14:24-0500\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/po/pt.po b/po/pt.po
index 2bd6434..398e7f7 100644
--- a/po/pt.po
+++ b/po/pt.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.1\n"
-"POT-Creation-Date: 2000-12-19 18:05-0500\n"
+"POT-Creation-Date: 2000-12-30 14:24-0500\n"
 "PO-Revision-Date: 2000-06-22 01:02+01:00\n"
 "Last-Translator: Pedro Morais <morais@kde.org>\n"
 "Language-Team: pt <morais@kde.org>\n"
diff --git a/po/pt_BR.po b/po/pt_BR.po
index 4c4d98f..35c4226 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.1\n"
-"POT-Creation-Date: 2000-12-19 18:05-0500\n"
+"POT-Creation-Date: 2000-12-30 14:24-0500\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/po/ro.po b/po/ro.po
index e374d86..cf36c52 100644
--- a/po/ro.po
+++ b/po/ro.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.1\n"
-"POT-Creation-Date: 2000-12-19 18:05-0500\n"
+"POT-Creation-Date: 2000-12-30 14:24-0500\n"
 "PO-Revision-Date: 2000-06-14 23:23+EST\n"
 "Last-Translator: Cristian Gafton <gafton@redhat.com>\n"
 "Language-Team: Romanian <ro@li.org>\n"
diff --git a/po/ru.po b/po/ru.po
index 60098ee..692381b 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.1\n"
-"POT-Creation-Date: 2000-12-19 18:05-0500\n"
+"POT-Creation-Date: 2000-12-30 14:24-0500\n"
 "PO-Revision-Date: 2000-08-13 21:00+0300\n"
 "Last-Translator: Leon Kanter <leon@blackcatlinux.com>\n"
 "Language-Team: Black Cat Linux Team <blackcat-support@blackcatlinux.com>\n"
diff --git a/po/sk.po b/po/sk.po
index de2d347..1a7cf7a 100644
--- a/po/sk.po
+++ b/po/sk.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.1\n"
-"POT-Creation-Date: 2000-12-19 18:05-0500\n"
+"POT-Creation-Date: 2000-12-30 14:24-0500\n"
 "PO-Revision-Date: 1999-08-04 21:40+0200\n"
 "Last-Translator: Stanislav Meduna <stano@eunet.sk>\n"
 "Language-Team: Slovak <sk-i18n@rak.isternet.sk>\n"
diff --git a/po/sl.po b/po/sl.po
index 2939331..35071ed 100644
--- a/po/sl.po
+++ b/po/sl.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.1\n"
-"POT-Creation-Date: 2000-12-19 18:05-0500\n"
+"POT-Creation-Date: 2000-12-30 14:24-0500\n"
 "PO-Revision-Date: 2000-09-05 12:30+0200\n"
 "Last-Translator: Roman Maurer <roman.maurer@hermes.si>\n"
 "Language-Team: Slovenian <sl@li.org>\n"
diff --git a/po/sr.po b/po/sr.po
index 4c4d98f..35c4226 100644
--- a/po/sr.po
+++ b/po/sr.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.1\n"
-"POT-Creation-Date: 2000-12-19 18:05-0500\n"
+"POT-Creation-Date: 2000-12-30 14:24-0500\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/po/sv.po b/po/sv.po
index bd5f157..32fd97d 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.1\n"
-"POT-Creation-Date: 2000-12-19 18:05-0500\n"
+"POT-Creation-Date: 2000-12-30 14:24-0500\n"
 "PO-Revision-Date: 2000-06-20 00:07+0200\n"
 "Last-Translator: Christian Rose <menthos@menthos.com>\n"
 "Language-Team: Swedish <sv@li.org>\n"
diff --git a/po/tr.po b/po/tr.po
index 2e56a91..8e5c43d 100644
--- a/po/tr.po
+++ b/po/tr.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.1\n"
-"POT-Creation-Date: 2000-12-19 18:05-0500\n"
+"POT-Creation-Date: 2000-12-30 14:24-0500\n"
 "PO-Revision-Date: 2000-01-06 13:01+0100\n"
 "Last-Translator: G�rkem �etin <kabalak@gmx.net>\n"
 "Language-Team: Gelecek A.� <gorkem@gelecek.com.tr>\n"
diff --git a/po/uk.po b/po/uk.po
index b4ea032..94d6890 100644
--- a/po/uk.po
+++ b/po/uk.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.1\n"
-"POT-Creation-Date: 2000-12-19 18:05-0500\n"
+"POT-Creation-Date: 2000-12-30 14:24-0500\n"
 "PO-Revision-Date: 1999-09-30 16:54+0200\n"
 "Last-Translator: Yuri Syrota <rasta@renome.rovno.ua>\n"
 "Language-Team: Ukrainian <uk@li.org>\n"
diff --git a/po/wa.po b/po/wa.po
index d054d39..8731d70 100644
--- a/po/wa.po
+++ b/po/wa.po
@@ -9,7 +9,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.1\n"
-"POT-Creation-Date: 2000-12-19 18:05-0500\n"
+"POT-Creation-Date: 2000-12-30 14:24-0500\n"
 "PO-Revision-Date: 1999-03-18 23:11+0100\n"
 "Last-Translator: Nobody yet\n"
 "Language-Team: walon <linux-wa@chanae.alphanet.ch>\n"
diff --git a/po/zh.po b/po/zh.po
index 4c4d98f..35c4226 100644
--- a/po/zh.po
+++ b/po/zh.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.1\n"
-"POT-Creation-Date: 2000-12-19 18:05-0500\n"
+"POT-Creation-Date: 2000-12-30 14:24-0500\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/po/zh_CN.GB2312.po b/po/zh_CN.GB2312.po
index 3e7a016..4459f61 100644
--- a/po/zh_CN.GB2312.po
+++ b/po/zh_CN.GB2312.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.1\n"
-"POT-Creation-Date: 2000-12-19 18:05-0500\n"
+"POT-Creation-Date: 2000-12-30 14:24-0500\n"
 "PO-Revision-Date: 1999-11-11 05:04+0800\n"
 "Last-Translator: Dillion Chen <dillon.chen@turbolinux.com.cn>\n"
 "Language-Team: TLDN\n"
diff --git a/popt.c b/popt.c
index 6c4100c..79bfdaa 100644
--- a/popt.c
+++ b/popt.c
@@ -10,6 +10,9 @@
 
 #include "system.h"
 
+#if HAVE_FLOAT_H
+#include <float.h>
+#endif
 #include <math.h>
 
 #include "findme.h"
@@ -716,7 +719,7 @@ int poptGetNextOpt(poptContext con)
 
 		case POPT_ARG_FLOAT:
 		case POPT_ARG_DOUBLE:
-		{   long aDouble;
+		{   double aDouble;
 		    char *end;
 
 		    aDouble = strtod(con->os->nextArg, &end);
-- 
Gitee


From c3f5898f9a36344fd977586fead3c362ec2de992 Mon Sep 17 00:00:00 2001
From: Jeff Johnson <n3npq@mac.com>
Date: Sun, 31 Dec 2000 20:30:37 +0000
Subject: [PATCH 284/667] - (popt): add POPT_ARGFLAG_OPTIONAL for long options
 with optional arg. - (popt): diddle auto-help to include type of arg
 expected.

---
 po/cs.po           |  2 +-
 po/da.po           |  2 +-
 po/de.po           |  2 +-
 po/es.po           |  2 +-
 po/fi.po           |  2 +-
 po/fr.po           |  2 +-
 po/gl.po           |  2 +-
 po/hu.po           |  2 +-
 po/id.po           |  2 +-
 po/is.po           |  2 +-
 po/it.po           |  2 +-
 po/ja.po           |  2 +-
 po/ko.po           |  2 +-
 po/no.po           |  2 +-
 po/pl.po           |  2 +-
 po/popt.pot        |  2 +-
 po/pt.po           |  2 +-
 po/pt_BR.po        |  2 +-
 po/ro.po           |  2 +-
 po/ru.po           |  2 +-
 po/sk.po           |  2 +-
 po/sl.po           |  2 +-
 po/sr.po           |  2 +-
 po/sv.po           |  2 +-
 po/tr.po           |  2 +-
 po/uk.po           |  2 +-
 po/wa.po           |  2 +-
 po/zh.po           |  2 +-
 po/zh_CN.GB2312.po |  2 +-
 popt.3             |  6 +++++
 popt.c             | 54 ++++++++++++++++++++++---------------
 popt.h             |  3 ++-
 popthelp.c         | 66 +++++++++++++++++++++++++++++++++++++++++-----
 test1.c            |  6 +++++
 testit.sh          |  5 ++++
 35 files changed, 140 insertions(+), 58 deletions(-)

diff --git a/po/cs.po b/po/cs.po
index d81453b..b453b9f 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.1\n"
-"POT-Creation-Date: 2000-12-30 14:24-0500\n"
+"POT-Creation-Date: 2000-12-31 15:18-0500\n"
 "PO-Revision-Date: 2000-08-23 22:24+0100\n"
 "Last-Translator: Milan Kerslager <milan.kerslager@spsselib.hiedu.cz>\n"
 "Language-Team: Czech <cs@li.org>\n"
diff --git a/po/da.po b/po/da.po
index ab784a5..348e8c2 100644
--- a/po/da.po
+++ b/po/da.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.1\n"
-"POT-Creation-Date: 2000-12-30 14:24-0500\n"
+"POT-Creation-Date: 2000-12-31 15:18-0500\n"
 "PO-Revision-Date: 2000-03-07 05:17+01:00\n"
 "Last-Translator: K. Christiansen <kenneth@gnu.org>\n"
 "Language-Team: Danish/Dansk <dansk@klid.dk>\n"
diff --git a/po/de.po b/po/de.po
index 35c4226..92426ed 100644
--- a/po/de.po
+++ b/po/de.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.1\n"
-"POT-Creation-Date: 2000-12-30 14:24-0500\n"
+"POT-Creation-Date: 2000-12-31 15:18-0500\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/po/es.po b/po/es.po
index 35c4226..92426ed 100644
--- a/po/es.po
+++ b/po/es.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.1\n"
-"POT-Creation-Date: 2000-12-30 14:24-0500\n"
+"POT-Creation-Date: 2000-12-31 15:18-0500\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/po/fi.po b/po/fi.po
index 35c4226..92426ed 100644
--- a/po/fi.po
+++ b/po/fi.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.1\n"
-"POT-Creation-Date: 2000-12-30 14:24-0500\n"
+"POT-Creation-Date: 2000-12-31 15:18-0500\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/po/fr.po b/po/fr.po
index 35c4226..92426ed 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.1\n"
-"POT-Creation-Date: 2000-12-30 14:24-0500\n"
+"POT-Creation-Date: 2000-12-31 15:18-0500\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/po/gl.po b/po/gl.po
index 989e963..38f2893 100644
--- a/po/gl.po
+++ b/po/gl.po
@@ -10,7 +10,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.1\n"
-"POT-Creation-Date: 2000-12-30 14:24-0500\n"
+"POT-Creation-Date: 2000-12-31 15:18-0500\n"
 "PO-Revision-Date: 2000-01-06 20:31+0100\n"
 "Last-Translator: Jes�s Bravo �lvarez <jba@pobox.com>\n"
 "Language-Team: Galician <gpul-traduccion@ceu.fi.udc.es>\n"
diff --git a/po/hu.po b/po/hu.po
index 22b953f..d90a9ee 100644
--- a/po/hu.po
+++ b/po/hu.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.1\n"
-"POT-Creation-Date: 2000-12-30 14:24-0500\n"
+"POT-Creation-Date: 2000-12-31 15:18-0500\n"
 "PO-Revision-Date: 2000-08-03 23:26+0200\n"
 "Last-Translator: L�szl� N�meth <nemeth@qwertynet.hu>\n"
 "Language-Team: Hungarian\n"
diff --git a/po/id.po b/po/id.po
index 35c4226..92426ed 100644
--- a/po/id.po
+++ b/po/id.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.1\n"
-"POT-Creation-Date: 2000-12-30 14:24-0500\n"
+"POT-Creation-Date: 2000-12-31 15:18-0500\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/po/is.po b/po/is.po
index 2e582b2..6d6d63d 100644
--- a/po/is.po
+++ b/po/is.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.1\n"
-"POT-Creation-Date: 2000-12-30 14:24-0500\n"
+"POT-Creation-Date: 2000-12-31 15:18-0500\n"
 "PO-Revision-Date: 2000-06-16 02:12+0000\n"
 "Last-Translator: Richard Allen <ra@hp.is>\n"
 "Language-Team: is <kde-isl@mmedia.is>\n"
diff --git a/po/it.po b/po/it.po
index 35c4226..92426ed 100644
--- a/po/it.po
+++ b/po/it.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.1\n"
-"POT-Creation-Date: 2000-12-30 14:24-0500\n"
+"POT-Creation-Date: 2000-12-31 15:18-0500\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/po/ja.po b/po/ja.po
index 35c4226..92426ed 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.1\n"
-"POT-Creation-Date: 2000-12-30 14:24-0500\n"
+"POT-Creation-Date: 2000-12-31 15:18-0500\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/po/ko.po b/po/ko.po
index 35c4226..92426ed 100644
--- a/po/ko.po
+++ b/po/ko.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.1\n"
-"POT-Creation-Date: 2000-12-30 14:24-0500\n"
+"POT-Creation-Date: 2000-12-31 15:18-0500\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/po/no.po b/po/no.po
index 4443b98..4864b41 100644
--- a/po/no.po
+++ b/po/no.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.1\n"
-"POT-Creation-Date: 2000-12-30 14:24-0500\n"
+"POT-Creation-Date: 2000-12-31 15:18-0500\n"
 "PO-Revision-Date: 2000-06-21 16:11+02:00\n"
 "Last-Translator: Kjartan Maraas <kmaraas@online.no>\n"
 "Language-Team: Norwegian <no@li.org>\n"
diff --git a/po/pl.po b/po/pl.po
index 35c4226..92426ed 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.1\n"
-"POT-Creation-Date: 2000-12-30 14:24-0500\n"
+"POT-Creation-Date: 2000-12-31 15:18-0500\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/po/popt.pot b/po/popt.pot
index 4fb4a86..acd8de0 100644
--- a/po/popt.pot
+++ b/po/popt.pot
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2000-12-30 14:24-0500\n"
+"POT-Creation-Date: 2000-12-31 15:18-0500\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/po/pt.po b/po/pt.po
index 398e7f7..9b10b57 100644
--- a/po/pt.po
+++ b/po/pt.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.1\n"
-"POT-Creation-Date: 2000-12-30 14:24-0500\n"
+"POT-Creation-Date: 2000-12-31 15:18-0500\n"
 "PO-Revision-Date: 2000-06-22 01:02+01:00\n"
 "Last-Translator: Pedro Morais <morais@kde.org>\n"
 "Language-Team: pt <morais@kde.org>\n"
diff --git a/po/pt_BR.po b/po/pt_BR.po
index 35c4226..92426ed 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.1\n"
-"POT-Creation-Date: 2000-12-30 14:24-0500\n"
+"POT-Creation-Date: 2000-12-31 15:18-0500\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/po/ro.po b/po/ro.po
index cf36c52..c721649 100644
--- a/po/ro.po
+++ b/po/ro.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.1\n"
-"POT-Creation-Date: 2000-12-30 14:24-0500\n"
+"POT-Creation-Date: 2000-12-31 15:18-0500\n"
 "PO-Revision-Date: 2000-06-14 23:23+EST\n"
 "Last-Translator: Cristian Gafton <gafton@redhat.com>\n"
 "Language-Team: Romanian <ro@li.org>\n"
diff --git a/po/ru.po b/po/ru.po
index 692381b..f8f053b 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.1\n"
-"POT-Creation-Date: 2000-12-30 14:24-0500\n"
+"POT-Creation-Date: 2000-12-31 15:18-0500\n"
 "PO-Revision-Date: 2000-08-13 21:00+0300\n"
 "Last-Translator: Leon Kanter <leon@blackcatlinux.com>\n"
 "Language-Team: Black Cat Linux Team <blackcat-support@blackcatlinux.com>\n"
diff --git a/po/sk.po b/po/sk.po
index 1a7cf7a..d17e683 100644
--- a/po/sk.po
+++ b/po/sk.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.1\n"
-"POT-Creation-Date: 2000-12-30 14:24-0500\n"
+"POT-Creation-Date: 2000-12-31 15:18-0500\n"
 "PO-Revision-Date: 1999-08-04 21:40+0200\n"
 "Last-Translator: Stanislav Meduna <stano@eunet.sk>\n"
 "Language-Team: Slovak <sk-i18n@rak.isternet.sk>\n"
diff --git a/po/sl.po b/po/sl.po
index 35071ed..d332612 100644
--- a/po/sl.po
+++ b/po/sl.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.1\n"
-"POT-Creation-Date: 2000-12-30 14:24-0500\n"
+"POT-Creation-Date: 2000-12-31 15:18-0500\n"
 "PO-Revision-Date: 2000-09-05 12:30+0200\n"
 "Last-Translator: Roman Maurer <roman.maurer@hermes.si>\n"
 "Language-Team: Slovenian <sl@li.org>\n"
diff --git a/po/sr.po b/po/sr.po
index 35c4226..92426ed 100644
--- a/po/sr.po
+++ b/po/sr.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.1\n"
-"POT-Creation-Date: 2000-12-30 14:24-0500\n"
+"POT-Creation-Date: 2000-12-31 15:18-0500\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/po/sv.po b/po/sv.po
index 32fd97d..e2f1328 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.1\n"
-"POT-Creation-Date: 2000-12-30 14:24-0500\n"
+"POT-Creation-Date: 2000-12-31 15:18-0500\n"
 "PO-Revision-Date: 2000-06-20 00:07+0200\n"
 "Last-Translator: Christian Rose <menthos@menthos.com>\n"
 "Language-Team: Swedish <sv@li.org>\n"
diff --git a/po/tr.po b/po/tr.po
index 8e5c43d..e528034 100644
--- a/po/tr.po
+++ b/po/tr.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.1\n"
-"POT-Creation-Date: 2000-12-30 14:24-0500\n"
+"POT-Creation-Date: 2000-12-31 15:18-0500\n"
 "PO-Revision-Date: 2000-01-06 13:01+0100\n"
 "Last-Translator: G�rkem �etin <kabalak@gmx.net>\n"
 "Language-Team: Gelecek A.� <gorkem@gelecek.com.tr>\n"
diff --git a/po/uk.po b/po/uk.po
index 94d6890..913a46a 100644
--- a/po/uk.po
+++ b/po/uk.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.1\n"
-"POT-Creation-Date: 2000-12-30 14:24-0500\n"
+"POT-Creation-Date: 2000-12-31 15:18-0500\n"
 "PO-Revision-Date: 1999-09-30 16:54+0200\n"
 "Last-Translator: Yuri Syrota <rasta@renome.rovno.ua>\n"
 "Language-Team: Ukrainian <uk@li.org>\n"
diff --git a/po/wa.po b/po/wa.po
index 8731d70..c0c7ef5 100644
--- a/po/wa.po
+++ b/po/wa.po
@@ -9,7 +9,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.1\n"
-"POT-Creation-Date: 2000-12-30 14:24-0500\n"
+"POT-Creation-Date: 2000-12-31 15:18-0500\n"
 "PO-Revision-Date: 1999-03-18 23:11+0100\n"
 "Last-Translator: Nobody yet\n"
 "Language-Team: walon <linux-wa@chanae.alphanet.ch>\n"
diff --git a/po/zh.po b/po/zh.po
index 35c4226..92426ed 100644
--- a/po/zh.po
+++ b/po/zh.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.1\n"
-"POT-Creation-Date: 2000-12-30 14:24-0500\n"
+"POT-Creation-Date: 2000-12-31 15:18-0500\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/po/zh_CN.GB2312.po b/po/zh_CN.GB2312.po
index 4459f61..64932fa 100644
--- a/po/zh_CN.GB2312.po
+++ b/po/zh_CN.GB2312.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.1\n"
-"POT-Creation-Date: 2000-12-30 14:24-0500\n"
+"POT-Creation-Date: 2000-12-31 15:18-0500\n"
 "PO-Revision-Date: 1999-11-11 05:04+0800\n"
 "Last-Translator: Dillion Chen <dillon.chen@turbolinux.com.cn>\n"
 "Language-Team: TLDN\n"
diff --git a/popt.3 b/popt.3
index 8d17f17..0d9e0b0 100644
--- a/popt.3
+++ b/popt.3
@@ -169,6 +169,12 @@ specified to win; for example, "rm -i -f".  \fBPOPT_ARG_VAL\fP causes
 the parsing function not to return a value, since the value of \fIval\fP
 has already been used.
 .sp
+If the \fIargInfo\fR value is bitwise or'd with \fBPOPT_ARGFLAG_OPTIONAL\fR,
+the argument to the long option may be omitted. If the long option
+is used without an argument, a default value of zero or NULL will be saved
+(if the arg pointer is present), otherwise behavior will be identical to
+a long option with argument.
+.sp
 .RI "The next option, " val ", is the value popt's parsing function 
 should return when the option is encountered.  If it is 0, the parsing
 function does not return a value, instead parsing the next 
diff --git a/popt.c b/popt.c
index 79bfdaa..d67e313 100644
--- a/popt.c
+++ b/popt.c
@@ -674,35 +674,43 @@ int poptGetNextOpt(poptContext con)
 		       con->os > con->optionStack) {
 		    cleanOSE(con->os--);
 		}
-		if (con->os->next == con->os->argc)
-		    return POPT_ERROR_NOARG;
-
-		/* make sure this isn't part of a short arg or the
-                   result of an alias expansion */
-		if (con->os == con->optionStack &&
-		   opt->argInfo & POPT_ARGFLAG_STRIP &&
-		   canstrip) {
-		    poptStripArg(con, con->os->next);
-		}
+		if (con->os->next == con->os->argc) {
+		    if (opt->argInfo & POPT_ARGFLAG_OPTIONAL)
+			con->os->nextArg = NULL;
+		    else
+			return POPT_ERROR_NOARG;
+		} else {
+
+		    /* make sure this isn't part of a short arg or the
+			result of an alias expansion */
+		    if (con->os == con->optionStack &&
+			opt->argInfo & POPT_ARGFLAG_STRIP &&
+			canstrip) {
+			poptStripArg(con, con->os->next);
+		    }
 		
-		con->os->nextArg = expandNextArg(con, con->os->argv[con->os->next++]);
+		    con->os->nextArg = expandNextArg(con, con->os->argv[con->os->next++]);
+		}
 	    }
 
 	    if (opt->arg) {
 		switch (opt->argInfo & POPT_ARG_MASK) {
 		case POPT_ARG_STRING:
 		    /* XXX memory leak, hard to plug */
-		    *((const char **) opt->arg) = xstrdup(con->os->nextArg);
+		    *((const char **) opt->arg) = (con->os->nextArg)
+			? xstrdup(con->os->nextArg) : NULL;
 		    break;
 
 		case POPT_ARG_INT:
 		case POPT_ARG_LONG:
-		{   long aLong;
+		{   long aLong = 0;
 		    char *end;
 
-		    aLong = strtol(con->os->nextArg, &end, 0);
-		    if (!(end && *end == '\0'))
-			return POPT_ERROR_BADNUMBER;
+		    if (con->os->nextArg) {
+			aLong = strtol(con->os->nextArg, &end, 0);
+			if (!(end && *end == '\0'))
+			    return POPT_ERROR_BADNUMBER;
+		    }
 
 		    if ((opt->argInfo & POPT_ARG_MASK) == POPT_ARG_LONG) {
 			if (aLong == LONG_MIN || aLong == LONG_MAX)
@@ -719,12 +727,14 @@ int poptGetNextOpt(poptContext con)
 
 		case POPT_ARG_FLOAT:
 		case POPT_ARG_DOUBLE:
-		{   double aDouble;
+		{   double aDouble = 0.0;
 		    char *end;
 
-		    aDouble = strtod(con->os->nextArg, &end);
-		    if (*end)
-			return POPT_ERROR_BADNUMBER;
+		    if (con->os->nextArg) {
+			aDouble = strtod(con->os->nextArg, &end);
+			if (*end)
+			    return POPT_ERROR_BADNUMBER;
+		    }
 
 		    if (aDouble == +HUGE_VAL || aDouble == -HUGE_VAL)
 			return POPT_ERROR_OVERFLOW;
@@ -778,7 +788,9 @@ int poptGetNextOpt(poptContext con)
 	else if ((opt->argInfo & POPT_ARG_MASK) == POPT_ARG_VAL)
 	    /*@-ifempty@*/ ;
 	else if ((opt->argInfo & POPT_ARG_MASK) != POPT_ARG_NONE) {
-	    con->finalArgv[con->finalArgvCount++] = xstrdup(con->os->nextArg);
+	    if (con->os->nextArg)
+	        con->finalArgv[con->finalArgvCount++] =
+			xstrdup(con->os->nextArg);
 	}
     }
 
diff --git a/popt.h b/popt.h
index 7a0a6b1..5bae679 100644
--- a/popt.h
+++ b/popt.h
@@ -37,7 +37,8 @@ extern "C" {
 #define POPT_ARG_MASK		0x0000FFFF
 #define POPT_ARGFLAG_ONEDASH	0x80000000  /* allow -longoption */
 #define POPT_ARGFLAG_DOC_HIDDEN 0x40000000  /* don't show in help/usage */
-#define POPT_ARGFLAG_STRIP	0x20000000  /* strip this arg from argv (only applies to long args) */
+#define POPT_ARGFLAG_STRIP	0x20000000  /* strip this arg from argv(only applies to long args) */
+#define	POPT_ARGFLAG_OPTIONAL	0x10000000  /* arg may be missing */
 
 #define	POPT_ARGFLAG_OR		0x08000000 /* arg will be or'ed */
 #define	POPT_ARGFLAG_NOR	0x09000000 /* arg will be nor'ed */
diff --git a/popthelp.c b/popthelp.c
index c88d094..12fb484 100644
--- a/popthelp.c
+++ b/popthelp.c
@@ -54,7 +54,17 @@ getArgDescrip(const struct poptOption * opt, const char *translation_domain)
 	if (opt->argDescrip) return POPT_(opt->argDescrip);
 
     if (opt->argDescrip) return D_(translation_domain, opt->argDescrip);
-    return POPT_("ARG");
+
+    switch (opt->argInfo & POPT_ARG_MASK) {
+    case POPT_ARG_NONE:		return POPT_("NONE");
+    case POPT_ARG_VAL:		return POPT_("VAL");
+    case POPT_ARG_INT:		return POPT_("INT");
+    case POPT_ARG_LONG:		return POPT_("LONG");
+    case POPT_ARG_STRING:	return POPT_("STRING");
+    case POPT_ARG_FLOAT:	return POPT_("FLOAT");
+    case POPT_ARG_DOUBLE:	return POPT_("DOUBLE");
+    default:			return POPT_("ARG");
+    }
 }
 
 static void singleOptionHelp(FILE * f, int maxLeftCol, 
@@ -70,18 +80,60 @@ static void singleOptionHelp(FILE * f, int maxLeftCol,
     const char * argDescrip = getArgDescrip(opt, translation_domain);
 
     left = malloc(maxLeftCol + 1);
-    *left = '\0';
+    left[0] = left[maxLeftCol] = '\0';
 
     if (opt->longName && opt->shortName)
-	sprintf(left, "-%c, --%s", opt->shortName, opt->longName);
+	snprintf(left, maxLeftCol, "-%c, --%s", opt->shortName, opt->longName);
     else if (opt->shortName) 
-	sprintf(left, "-%c", opt->shortName);
+	snprintf(left, maxLeftCol, "-%c", opt->shortName);
     else if (opt->longName)
-	sprintf(left, "--%s", opt->longName);
+	snprintf(left, maxLeftCol, "--%s", opt->longName);
     if (!*left) return ;
     if (argDescrip) {
-	strcat(left, "=");
-	strcat(left, argDescrip);
+	char * le = left + strlen(left);
+	int nl = maxLeftCol - (le - left);
+	if (opt->argInfo & POPT_ARGFLAG_OPTIONAL) {
+	    *le++ = '['; nl--;
+	}
+	if (opt->argDescrip == NULL) {
+	    switch (opt->argInfo & POPT_ARG_MASK) {
+	    case POPT_ARG_NONE:
+		snprintf(le, nl-1, "[true]");
+		break;
+	    case POPT_ARG_VAL:
+	    {   long aLong = opt->val;
+
+		if (opt->argInfo & POPT_ARGFLAG_NOT) aLong = ~aLong;
+		switch (opt->argInfo & POPT_ARGFLAG_LOGICALOPS) {
+		case POPT_ARGFLAG_OR:
+		    snprintf(le, nl-1, "[|=0x%lx]", aLong);	break;
+		case POPT_ARGFLAG_AND:
+		    snprintf(le, nl-1, "[&=0x%lx]", aLong);	break;
+		case POPT_ARGFLAG_XOR:
+		    snprintf(le, nl-1, "[^=0x%lx]", aLong);	break;
+		default:
+		    if (!(aLong == 0L || aLong == 1L || aLong == -1L))
+			snprintf(le, nl-1, "[=%ld]", aLong);
+		    break;
+		}
+	    }	break;
+	    case POPT_ARG_INT:
+	    case POPT_ARG_LONG:
+	    case POPT_ARG_STRING:
+	    case POPT_ARG_FLOAT:
+	    case POPT_ARG_DOUBLE:
+		snprintf(le, nl-1, "=%s", argDescrip);
+		break;
+	    }
+	} else {
+	    snprintf(le, nl-1, "=%s", argDescrip);
+	}
+	nl -= strlen(le);
+	le += strlen(le);
+	if (opt->argInfo & POPT_ARGFLAG_OPTIONAL) {
+	    *le++ = ']'; nl--;
+	}
+	*le = '\0';
     }
 
     if (help)
diff --git a/test1.c b/test1.c
index 5b6aeb7..7b7f55f 100644
--- a/test1.c
+++ b/test1.c
@@ -19,6 +19,7 @@ int inc = 0;
 int shortopt = 0;
 float aFloat = 0.0;
 double aDouble = 0.0;
+char * oStr = (char *)-1;
 int singleDash = 0;
 
 static struct poptOption moreCallbackArgs[] = {
@@ -54,6 +55,9 @@ static struct poptOption options[] = {
 	    "A float argument", "FLOAT" },
 	{ "double", 'd', POPT_ARG_DOUBLE, &aDouble, 0,
 	    "A double argument", "DOUBLE" },
+	{ "ostr", '\0', POPT_ARG_STRING|POPT_ARGFLAG_OPTIONAL, &oStr, 0,
+	    "An optional str", "ARG" },
+
 	{ NULL, '-', POPT_ARG_NONE | POPT_ARGFLAG_DOC_HIDDEN, &singleDash, 0 },
 	{ NULL, '\0', POPT_ARG_INCLUDE_TABLE, &moreArgs, 0, NULL },
 	{ NULL, '\0', POPT_ARG_INCLUDE_TABLE, &callbackArgs, 0, "Callback arguments" },
@@ -128,6 +132,8 @@ int main(int argc, const char ** argv) {
 	fprintf(stdout, " aFloat: %g", aFloat);
     if (aDouble != 0.0)
 	fprintf(stdout, " aDouble: %g", aDouble);
+    if (oStr != (char *)-1)
+	fprintf(stdout, " oStr: %s", (oStr ? oStr : "(none)"));
     if (singleDash)
 	fprintf(stdout, " -");
 
diff --git a/testit.sh b/testit.sh
index 975b5ef..ce5530a 100755
--- a/testit.sh
+++ b/testit.sh
@@ -62,6 +62,11 @@ run test1 "test1 - 32" "arg1: 0 arg2: (none) aFloat: 10.1" -f 10.1
 run test1 "test1 - 33" "arg1: 0 arg2: (none) aFloat: 10.1" --float 10.1
 run test1 "test1 - 34" "arg1: 0 arg2: (none) aDouble: 10.1" -d 10.1
 run test1 "test1 - 35" "arg1: 0 arg2: (none) aDouble: 10.1" --double 10.1
+run test1 "test1 - 36" "arg1: 0 arg2: (none) oStr: (none)" --ostr
+run test1 "test1 - 37" "arg1: 0 arg2: (none) oStr: yadda" --ostr=yadda
+run test1 "test1 - 38" "arg1: 0 arg2: (none) oStr: yadda" --ostr yadda
+run test1 "test1 - 39" "arg1: 0 arg2: (none) oStr: ping rest: pong" --ostr=ping pong
+run test1 "test1 - 40" "arg1: 0 arg2: (none) oStr: ping rest: pong" --ostr ping pong
 
 echo ""
 echo "Passed."
-- 
Gitee


From 066766cbc04655970ace9c6378eab425707bf503 Mon Sep 17 00:00:00 2001
From: Jeff Johnson <n3npq@mac.com>
Date: Mon, 1 Jan 2001 23:14:52 +0000
Subject: [PATCH 285/667] - use popt autohelp for rpm helper binaries.

---
 po/cs.po           |   6 +--
 po/da.po           |   6 +--
 po/de.po           |   6 +--
 po/es.po           |   6 +--
 po/fi.po           |   6 +--
 po/fr.po           |   6 +--
 po/gl.po           |   6 +--
 po/hu.po           |   6 +--
 po/id.po           |   6 +--
 po/is.po           |   6 +--
 po/it.po           |   6 +--
 po/ja.po           |   6 +--
 po/ko.po           |   6 +--
 po/no.po           |   6 +--
 po/pl.po           |   6 +--
 po/popt.pot        |   6 +--
 po/pt.po           |   6 +--
 po/pt_BR.po        |   6 +--
 po/ro.po           |   6 +--
 po/ru.po           |   6 +--
 po/sk.po           |   6 +--
 po/sl.po           |   6 +--
 po/sr.po           |   6 +--
 po/sv.po           |   6 +--
 po/tr.po           |   6 +--
 po/uk.po           |   6 +--
 po/wa.po           |   6 +--
 po/zh.po           |   6 +--
 po/zh_CN.GB2312.po |   6 +--
 popt.c             |  24 +++++------
 popt.h             |  15 +++----
 popthelp.c         | 102 ++++++++++++++++++++++++---------------------
 poptint.h          |  32 +++++++-------
 33 files changed, 177 insertions(+), 170 deletions(-)

diff --git a/po/cs.po b/po/cs.po
index b453b9f..ab883d5 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.1\n"
-"POT-Creation-Date: 2000-12-31 15:18-0500\n"
+"POT-Creation-Date: 2001-01-01 17:42-0500\n"
 "PO-Revision-Date: 2000-08-23 22:24+0100\n"
 "Last-Translator: Milan Kerslager <milan.kerslager@spsselib.hiedu.cz>\n"
 "Language-Team: Czech <cs@li.org>\n"
@@ -9,10 +9,10 @@ msgstr ""
 "Content-Type: text/plain; charset=iso-8859-2\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: popthelp.c:27
+#: popthelp.c:28
 msgid "Show this help message"
 msgstr "Vyp��e tuto n�pov�du"
 
-#: popthelp.c:28
+#: popthelp.c:29
 msgid "Display brief usage message"
 msgstr "Vyp��e kr�tk� n�vod k pou�it�"
diff --git a/po/da.po b/po/da.po
index 348e8c2..9f59184 100644
--- a/po/da.po
+++ b/po/da.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.1\n"
-"POT-Creation-Date: 2000-12-31 15:18-0500\n"
+"POT-Creation-Date: 2001-01-01 17:42-0500\n"
 "PO-Revision-Date: 2000-03-07 05:17+01:00\n"
 "Last-Translator: K. Christiansen <kenneth@gnu.org>\n"
 "Language-Team: Danish/Dansk <dansk@klid.dk>\n"
@@ -9,10 +9,10 @@ msgstr ""
 "Content-Type: text/plain; charset=ISO-8859-1\n"
 "Content-Transfer-Encoding: 8-bit\n"
 
-#: popthelp.c:27
+#: popthelp.c:28
 msgid "Show this help message"
 msgstr "Vis denne hj�lpemeddelelse"
 
-#: popthelp.c:28
+#: popthelp.c:29
 msgid "Display brief usage message"
 msgstr "Vis kortfattet brugsanvisning"
diff --git a/po/de.po b/po/de.po
index 92426ed..192688a 100644
--- a/po/de.po
+++ b/po/de.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.1\n"
-"POT-Creation-Date: 2000-12-31 15:18-0500\n"
+"POT-Creation-Date: 2001-01-01 17:42-0500\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -14,10 +14,10 @@ msgstr ""
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: ENCODING\n"
 
-#: popthelp.c:27
+#: popthelp.c:28
 msgid "Show this help message"
 msgstr ""
 
-#: popthelp.c:28
+#: popthelp.c:29
 msgid "Display brief usage message"
 msgstr ""
diff --git a/po/es.po b/po/es.po
index 92426ed..192688a 100644
--- a/po/es.po
+++ b/po/es.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.1\n"
-"POT-Creation-Date: 2000-12-31 15:18-0500\n"
+"POT-Creation-Date: 2001-01-01 17:42-0500\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -14,10 +14,10 @@ msgstr ""
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: ENCODING\n"
 
-#: popthelp.c:27
+#: popthelp.c:28
 msgid "Show this help message"
 msgstr ""
 
-#: popthelp.c:28
+#: popthelp.c:29
 msgid "Display brief usage message"
 msgstr ""
diff --git a/po/fi.po b/po/fi.po
index 92426ed..192688a 100644
--- a/po/fi.po
+++ b/po/fi.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.1\n"
-"POT-Creation-Date: 2000-12-31 15:18-0500\n"
+"POT-Creation-Date: 2001-01-01 17:42-0500\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -14,10 +14,10 @@ msgstr ""
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: ENCODING\n"
 
-#: popthelp.c:27
+#: popthelp.c:28
 msgid "Show this help message"
 msgstr ""
 
-#: popthelp.c:28
+#: popthelp.c:29
 msgid "Display brief usage message"
 msgstr ""
diff --git a/po/fr.po b/po/fr.po
index 92426ed..192688a 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.1\n"
-"POT-Creation-Date: 2000-12-31 15:18-0500\n"
+"POT-Creation-Date: 2001-01-01 17:42-0500\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -14,10 +14,10 @@ msgstr ""
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: ENCODING\n"
 
-#: popthelp.c:27
+#: popthelp.c:28
 msgid "Show this help message"
 msgstr ""
 
-#: popthelp.c:28
+#: popthelp.c:29
 msgid "Display brief usage message"
 msgstr ""
diff --git a/po/gl.po b/po/gl.po
index 38f2893..a6be50c 100644
--- a/po/gl.po
+++ b/po/gl.po
@@ -10,7 +10,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.1\n"
-"POT-Creation-Date: 2000-12-31 15:18-0500\n"
+"POT-Creation-Date: 2001-01-01 17:42-0500\n"
 "PO-Revision-Date: 2000-01-06 20:31+0100\n"
 "Last-Translator: Jes�s Bravo �lvarez <jba@pobox.com>\n"
 "Language-Team: Galician <gpul-traduccion@ceu.fi.udc.es>\n"
@@ -18,10 +18,10 @@ msgstr ""
 "Content-Type: text/plain; charset=iso-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: popthelp.c:27
+#: popthelp.c:28
 msgid "Show this help message"
 msgstr "Amosar esta mensaxe de axuda"
 
-#: popthelp.c:28
+#: popthelp.c:29
 msgid "Display brief usage message"
 msgstr "Amosar brevemente o xeito de utilizaci�n"
diff --git a/po/hu.po b/po/hu.po
index d90a9ee..bc2e388 100644
--- a/po/hu.po
+++ b/po/hu.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.1\n"
-"POT-Creation-Date: 2000-12-31 15:18-0500\n"
+"POT-Creation-Date: 2001-01-01 17:42-0500\n"
 "PO-Revision-Date: 2000-08-03 23:26+0200\n"
 "Last-Translator: L�szl� N�meth <nemeth@qwertynet.hu>\n"
 "Language-Team: Hungarian\n"
@@ -9,10 +9,10 @@ msgstr ""
 "Content-Type: text/plain; charset=ISO-8859-2\n"
 "Content-Transfer-Encoding: 8-bit\n"
 
-#: popthelp.c:27
+#: popthelp.c:28
 msgid "Show this help message"
 msgstr "E s�g� megjelen�t�se"
 
-#: popthelp.c:28
+#: popthelp.c:29
 msgid "Display brief usage message"
 msgstr "R�vid haszn�lati utas�t�s megjelen�t�se"
diff --git a/po/id.po b/po/id.po
index 92426ed..192688a 100644
--- a/po/id.po
+++ b/po/id.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.1\n"
-"POT-Creation-Date: 2000-12-31 15:18-0500\n"
+"POT-Creation-Date: 2001-01-01 17:42-0500\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -14,10 +14,10 @@ msgstr ""
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: ENCODING\n"
 
-#: popthelp.c:27
+#: popthelp.c:28
 msgid "Show this help message"
 msgstr ""
 
-#: popthelp.c:28
+#: popthelp.c:29
 msgid "Display brief usage message"
 msgstr ""
diff --git a/po/is.po b/po/is.po
index 6d6d63d..f4c93e7 100644
--- a/po/is.po
+++ b/po/is.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.1\n"
-"POT-Creation-Date: 2000-12-31 15:18-0500\n"
+"POT-Creation-Date: 2001-01-01 17:42-0500\n"
 "PO-Revision-Date: 2000-06-16 02:12+0000\n"
 "Last-Translator: Richard Allen <ra@hp.is>\n"
 "Language-Team: is <kde-isl@mmedia.is>\n"
@@ -9,10 +9,10 @@ msgstr ""
 "Content-Type: text/plain; charset=ISO-8859-1\n"
 "Content-Transfer-Encoding: 8-bit\n"
 
-#: popthelp.c:27
+#: popthelp.c:28
 msgid "Show this help message"
 msgstr "S�na �essa hj�lp"
 
-#: popthelp.c:28
+#: popthelp.c:29
 msgid "Display brief usage message"
 msgstr "S�na stuttar notkunarlei�beiningar"
diff --git a/po/it.po b/po/it.po
index 92426ed..192688a 100644
--- a/po/it.po
+++ b/po/it.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.1\n"
-"POT-Creation-Date: 2000-12-31 15:18-0500\n"
+"POT-Creation-Date: 2001-01-01 17:42-0500\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -14,10 +14,10 @@ msgstr ""
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: ENCODING\n"
 
-#: popthelp.c:27
+#: popthelp.c:28
 msgid "Show this help message"
 msgstr ""
 
-#: popthelp.c:28
+#: popthelp.c:29
 msgid "Display brief usage message"
 msgstr ""
diff --git a/po/ja.po b/po/ja.po
index 92426ed..192688a 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.1\n"
-"POT-Creation-Date: 2000-12-31 15:18-0500\n"
+"POT-Creation-Date: 2001-01-01 17:42-0500\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -14,10 +14,10 @@ msgstr ""
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: ENCODING\n"
 
-#: popthelp.c:27
+#: popthelp.c:28
 msgid "Show this help message"
 msgstr ""
 
-#: popthelp.c:28
+#: popthelp.c:29
 msgid "Display brief usage message"
 msgstr ""
diff --git a/po/ko.po b/po/ko.po
index 92426ed..192688a 100644
--- a/po/ko.po
+++ b/po/ko.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.1\n"
-"POT-Creation-Date: 2000-12-31 15:18-0500\n"
+"POT-Creation-Date: 2001-01-01 17:42-0500\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -14,10 +14,10 @@ msgstr ""
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: ENCODING\n"
 
-#: popthelp.c:27
+#: popthelp.c:28
 msgid "Show this help message"
 msgstr ""
 
-#: popthelp.c:28
+#: popthelp.c:29
 msgid "Display brief usage message"
 msgstr ""
diff --git a/po/no.po b/po/no.po
index 4864b41..25370fb 100644
--- a/po/no.po
+++ b/po/no.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.1\n"
-"POT-Creation-Date: 2000-12-31 15:18-0500\n"
+"POT-Creation-Date: 2001-01-01 17:42-0500\n"
 "PO-Revision-Date: 2000-06-21 16:11+02:00\n"
 "Last-Translator: Kjartan Maraas <kmaraas@online.no>\n"
 "Language-Team: Norwegian <no@li.org>\n"
@@ -9,10 +9,10 @@ msgstr ""
 "Content-Type: text/plain; charset=iso-8859-1\n"
 "Content-Transfer-Encoding: 8-bit\n"
 
-#: popthelp.c:27
+#: popthelp.c:28
 msgid "Show this help message"
 msgstr "Vis denne hjelpmeldingen"
 
-#: popthelp.c:28
+#: popthelp.c:29
 msgid "Display brief usage message"
 msgstr "Vis kort bruksmelding"
diff --git a/po/pl.po b/po/pl.po
index 92426ed..192688a 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.1\n"
-"POT-Creation-Date: 2000-12-31 15:18-0500\n"
+"POT-Creation-Date: 2001-01-01 17:42-0500\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -14,10 +14,10 @@ msgstr ""
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: ENCODING\n"
 
-#: popthelp.c:27
+#: popthelp.c:28
 msgid "Show this help message"
 msgstr ""
 
-#: popthelp.c:28
+#: popthelp.c:29
 msgid "Display brief usage message"
 msgstr ""
diff --git a/po/popt.pot b/po/popt.pot
index acd8de0..502a396 100644
--- a/po/popt.pot
+++ b/po/popt.pot
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2000-12-31 15:18-0500\n"
+"POT-Creation-Date: 2001-01-01 17:42-0500\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -14,10 +14,10 @@ msgstr ""
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: ENCODING\n"
 
-#: popthelp.c:27
+#: popthelp.c:28
 msgid "Show this help message"
 msgstr ""
 
-#: popthelp.c:28
+#: popthelp.c:29
 msgid "Display brief usage message"
 msgstr ""
diff --git a/po/pt.po b/po/pt.po
index 9b10b57..22fc2f4 100644
--- a/po/pt.po
+++ b/po/pt.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.1\n"
-"POT-Creation-Date: 2000-12-31 15:18-0500\n"
+"POT-Creation-Date: 2001-01-01 17:42-0500\n"
 "PO-Revision-Date: 2000-06-22 01:02+01:00\n"
 "Last-Translator: Pedro Morais <morais@kde.org>\n"
 "Language-Team: pt <morais@kde.org>\n"
@@ -9,10 +9,10 @@ msgstr ""
 "Content-Type: text/plain; charset=iso-latin1\n"
 "Content-Transfer-Encoding: none\n"
 
-#: popthelp.c:27
+#: popthelp.c:28
 msgid "Show this help message"
 msgstr "Mostrar esta mensagem de ajuda"
 
-#: popthelp.c:28
+#: popthelp.c:29
 msgid "Display brief usage message"
 msgstr "Mostrar uma mensagem de utiliza��o sucinta"
diff --git a/po/pt_BR.po b/po/pt_BR.po
index 92426ed..192688a 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.1\n"
-"POT-Creation-Date: 2000-12-31 15:18-0500\n"
+"POT-Creation-Date: 2001-01-01 17:42-0500\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -14,10 +14,10 @@ msgstr ""
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: ENCODING\n"
 
-#: popthelp.c:27
+#: popthelp.c:28
 msgid "Show this help message"
 msgstr ""
 
-#: popthelp.c:28
+#: popthelp.c:29
 msgid "Display brief usage message"
 msgstr ""
diff --git a/po/ro.po b/po/ro.po
index c721649..03ade33 100644
--- a/po/ro.po
+++ b/po/ro.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.1\n"
-"POT-Creation-Date: 2000-12-31 15:18-0500\n"
+"POT-Creation-Date: 2001-01-01 17:42-0500\n"
 "PO-Revision-Date: 2000-06-14 23:23+EST\n"
 "Last-Translator: Cristian Gafton <gafton@redhat.com>\n"
 "Language-Team: Romanian <ro@li.org>\n"
@@ -9,11 +9,11 @@ msgstr ""
 "Content-Type: text/plain; charset=ISO-8859-2\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: popthelp.c:27
+#: popthelp.c:28
 msgid "Show this help message"
 msgstr "Afisare mesaj de help"
 
-#: popthelp.c:28
+#: popthelp.c:29
 msgid "Display brief usage message"
 msgstr "Afisare mesaj sintaxa sumar"
 
diff --git a/po/ru.po b/po/ru.po
index f8f053b..7820489 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.1\n"
-"POT-Creation-Date: 2000-12-31 15:18-0500\n"
+"POT-Creation-Date: 2001-01-01 17:42-0500\n"
 "PO-Revision-Date: 2000-08-13 21:00+0300\n"
 "Last-Translator: Leon Kanter <leon@blackcatlinux.com>\n"
 "Language-Team: Black Cat Linux Team <blackcat-support@blackcatlinux.com>\n"
@@ -9,10 +9,10 @@ msgstr ""
 "Content-Type: text/plain; charset=koi8-r\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: popthelp.c:27
+#: popthelp.c:28
 msgid "Show this help message"
 msgstr "�������� ��� ���������"
 
-#: popthelp.c:28
+#: popthelp.c:29
 msgid "Display brief usage message"
 msgstr "�������� ������� ���������� �� �������������"
diff --git a/po/sk.po b/po/sk.po
index d17e683..9081bc8 100644
--- a/po/sk.po
+++ b/po/sk.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.1\n"
-"POT-Creation-Date: 2000-12-31 15:18-0500\n"
+"POT-Creation-Date: 2001-01-01 17:42-0500\n"
 "PO-Revision-Date: 1999-08-04 21:40+0200\n"
 "Last-Translator: Stanislav Meduna <stano@eunet.sk>\n"
 "Language-Team: Slovak <sk-i18n@rak.isternet.sk>\n"
@@ -13,10 +13,10 @@ msgstr ""
 "Content-Type: text/plain; charset=iso-8859-2\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: popthelp.c:27
+#: popthelp.c:28
 msgid "Show this help message"
 msgstr "Vyp�sa� t�to spr�vu"
 
-#: popthelp.c:28
+#: popthelp.c:29
 msgid "Display brief usage message"
 msgstr "Zobrazi� stru�n� n�vod na pou�itie"
diff --git a/po/sl.po b/po/sl.po
index d332612..42e359b 100644
--- a/po/sl.po
+++ b/po/sl.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.1\n"
-"POT-Creation-Date: 2000-12-31 15:18-0500\n"
+"POT-Creation-Date: 2001-01-01 17:42-0500\n"
 "PO-Revision-Date: 2000-09-05 12:30+0200\n"
 "Last-Translator: Roman Maurer <roman.maurer@hermes.si>\n"
 "Language-Team: Slovenian <sl@li.org>\n"
@@ -9,10 +9,10 @@ msgstr ""
 "Content-Type: text/plain; charset=iso-8859-2\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: popthelp.c:27
+#: popthelp.c:28
 msgid "Show this help message"
 msgstr "Prika�i to sporo�ilo s pomo�jo"
 
-#: popthelp.c:28
+#: popthelp.c:29
 msgid "Display brief usage message"
 msgstr "Prika�i kratko sporo�ilo o uporabi"
diff --git a/po/sr.po b/po/sr.po
index 92426ed..192688a 100644
--- a/po/sr.po
+++ b/po/sr.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.1\n"
-"POT-Creation-Date: 2000-12-31 15:18-0500\n"
+"POT-Creation-Date: 2001-01-01 17:42-0500\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -14,10 +14,10 @@ msgstr ""
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: ENCODING\n"
 
-#: popthelp.c:27
+#: popthelp.c:28
 msgid "Show this help message"
 msgstr ""
 
-#: popthelp.c:28
+#: popthelp.c:29
 msgid "Display brief usage message"
 msgstr ""
diff --git a/po/sv.po b/po/sv.po
index e2f1328..b5bf6d3 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.1\n"
-"POT-Creation-Date: 2000-12-31 15:18-0500\n"
+"POT-Creation-Date: 2001-01-01 17:42-0500\n"
 "PO-Revision-Date: 2000-06-20 00:07+0200\n"
 "Last-Translator: Christian Rose <menthos@menthos.com>\n"
 "Language-Team: Swedish <sv@li.org>\n"
@@ -9,10 +9,10 @@ msgstr ""
 "Content-Type: text/plain; charset=ISO-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: popthelp.c:27
+#: popthelp.c:28
 msgid "Show this help message"
 msgstr "Visa detta hj�lpmeddelande"
 
-#: popthelp.c:28
+#: popthelp.c:29
 msgid "Display brief usage message"
 msgstr "Visa ett kortfattat anv�ndningsmeddelande"
diff --git a/po/tr.po b/po/tr.po
index e528034..700abc2 100644
--- a/po/tr.po
+++ b/po/tr.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.1\n"
-"POT-Creation-Date: 2000-12-31 15:18-0500\n"
+"POT-Creation-Date: 2001-01-01 17:42-0500\n"
 "PO-Revision-Date: 2000-01-06 13:01+0100\n"
 "Last-Translator: G�rkem �etin <kabalak@gmx.net>\n"
 "Language-Team: Gelecek A.� <gorkem@gelecek.com.tr>\n"
@@ -9,10 +9,10 @@ msgstr ""
 "Content-Type: text/plain; charset=iso8859-9\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: popthelp.c:27
+#: popthelp.c:28
 msgid "Show this help message"
 msgstr "Bu yard�m iletisini g�sterir"
 
-#: popthelp.c:28
+#: popthelp.c:29
 msgid "Display brief usage message"
 msgstr "K�sa bir kullan�m iletisi g�ster"
diff --git a/po/uk.po b/po/uk.po
index 913a46a..9d7f435 100644
--- a/po/uk.po
+++ b/po/uk.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.1\n"
-"POT-Creation-Date: 2000-12-31 15:18-0500\n"
+"POT-Creation-Date: 2001-01-01 17:42-0500\n"
 "PO-Revision-Date: 1999-09-30 16:54+0200\n"
 "Last-Translator: Yuri Syrota <rasta@renome.rovno.ua>\n"
 "Language-Team: Ukrainian <uk@li.org>\n"
@@ -13,10 +13,10 @@ msgstr ""
 "Content-Type: text/plain; charset=koi8-u\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: popthelp.c:27
+#: popthelp.c:28
 msgid "Show this help message"
 msgstr "�������� �� ��צ���"
 
-#: popthelp.c:28
+#: popthelp.c:29
 msgid "Display brief usage message"
 msgstr "�������� ������� ��צ��� ��� ������������"
diff --git a/po/wa.po b/po/wa.po
index c0c7ef5..297f214 100644
--- a/po/wa.po
+++ b/po/wa.po
@@ -9,7 +9,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.1\n"
-"POT-Creation-Date: 2000-12-31 15:18-0500\n"
+"POT-Creation-Date: 2001-01-01 17:42-0500\n"
 "PO-Revision-Date: 1999-03-18 23:11+0100\n"
 "Last-Translator: Nobody yet\n"
 "Language-Team: walon <linux-wa@chanae.alphanet.ch>\n"
@@ -17,10 +17,10 @@ msgstr ""
 "Content-Type: text/plain; charset=iso-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: popthelp.c:27
+#: popthelp.c:28
 msgid "Show this help message"
 msgstr "Mostrer ci messaedje d' aide chal"
 
-#: popthelp.c:28
+#: popthelp.c:29
 msgid "Display brief usage message"
 msgstr "Mostre on court messaedje so kmint vos � siervi"
diff --git a/po/zh.po b/po/zh.po
index 92426ed..192688a 100644
--- a/po/zh.po
+++ b/po/zh.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.1\n"
-"POT-Creation-Date: 2000-12-31 15:18-0500\n"
+"POT-Creation-Date: 2001-01-01 17:42-0500\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -14,10 +14,10 @@ msgstr ""
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: ENCODING\n"
 
-#: popthelp.c:27
+#: popthelp.c:28
 msgid "Show this help message"
 msgstr ""
 
-#: popthelp.c:28
+#: popthelp.c:29
 msgid "Display brief usage message"
 msgstr ""
diff --git a/po/zh_CN.GB2312.po b/po/zh_CN.GB2312.po
index 64932fa..0a79484 100644
--- a/po/zh_CN.GB2312.po
+++ b/po/zh_CN.GB2312.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.1\n"
-"POT-Creation-Date: 2000-12-31 15:18-0500\n"
+"POT-Creation-Date: 2001-01-01 17:42-0500\n"
 "PO-Revision-Date: 1999-11-11 05:04+0800\n"
 "Last-Translator: Dillion Chen <dillon.chen@turbolinux.com.cn>\n"
 "Language-Team: TLDN\n"
@@ -9,10 +9,10 @@ msgstr ""
 "Content-Type: text/plain; charset=gb2312\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: popthelp.c:27
+#: popthelp.c:28
 msgid "Show this help message"
 msgstr "��ʾ����������Ϣ"
 
-#: popthelp.c:28
+#: popthelp.c:29
 msgid "Display brief usage message"
 msgstr "��ʾ���ʹ����Ϣ"
diff --git a/popt.c b/popt.c
index d67e313..15e3eee 100644
--- a/popt.c
+++ b/popt.c
@@ -31,7 +31,7 @@ static char * strerror(int errno) {
 #endif
 
 void poptSetExecPath(poptContext con, const char * path, int allowAbsolute) {
-    if (con->execPath) xfree(con->execPath);
+    if (con->execPath) free((void *)con->execPath);
     con->execPath = xstrdup(path);
     con->execAbsolute = allowAbsolute;
 }
@@ -140,11 +140,11 @@ poptContext poptGetContext(const char * name, int argc, const char ** argv,
 static void cleanOSE(struct optionStackEntry *os)
 {
     if (os->nextArg) {
-	xfree(os->nextArg);
+	free((void *)os->nextArg);
 	os->nextArg = NULL;
     }
     if (os->argv) {
-	xfree(os->argv);
+	free((void *)os->argv);
 	os->argv = NULL;
     }
     if (os->argb) {
@@ -175,7 +175,7 @@ void poptResetContext(poptContext con) {
 
     for (i = 0; i < con->finalArgvCount; i++) {
 	if (con->finalArgv[i]) {
-	    xfree(con->finalArgv[i]);
+	    free((void *)con->finalArgv[i]);
 	    con->finalArgv[i] = NULL;
 	}
     }
@@ -661,7 +661,7 @@ int poptGetNextOpt(poptContext con)
 	    }
 	} else if ((opt->argInfo & POPT_ARG_MASK) != POPT_ARG_NONE) {
 	    if (con->os->nextArg) {
-		xfree(con->os->nextArg);
+		free((void *)con->os->nextArg);
 		con->os->nextArg = NULL;
 	    }
 	    if (longArg) {
@@ -831,22 +831,22 @@ void poptFreeContext(poptContext con) {
     if (con->os->argb) free(con->os->argb);
 
     for (i = 0; i < con->numAliases; i++) {
-	if (con->aliases[i].longName) xfree(con->aliases[i].longName);
+	if (con->aliases[i].longName) free((void *)con->aliases[i].longName);
 	free(con->aliases[i].argv);
     }
 
     for (i = 0; i < con->numExecs; i++) {
-	if (con->execs[i].longName) xfree(con->execs[i].longName);
-	xfree(con->execs[i].script);
+	if (con->execs[i].longName) free((void *)con->execs[i].longName);
+	free((void *)con->execs[i].script);
     }
-    if (con->execs) xfree(con->execs);
+    if (con->execs) free((void *)con->execs);
 
     free(con->leftovers);
     free(con->finalArgv);
-    if (con->appName) xfree(con->appName);
+    if (con->appName) free((void *)con->appName);
     if (con->aliases) free(con->aliases);
-    if (con->otherHelp) xfree(con->otherHelp);
-    if (con->execPath) xfree(con->execPath);
+    if (con->otherHelp) free((void *)con->otherHelp);
+    if (con->execPath) free((void *)con->execPath);
     if (con->arg_strip) PBM_FREE(con->arg_strip);
     
     free(con);
diff --git a/popt.h b/popt.h
index 5bae679..2bb83ad 100644
--- a/popt.h
+++ b/popt.h
@@ -74,25 +74,26 @@ extern "C" {
 #define POPT_CONTEXT_POSIXMEHARDER (1 << 2) /* options can't follow args */
 
 struct poptOption {
-    /*@observer@*/ /*@null@*/ const char * longName;	/* may be NULL */
+/*@observer@*/ /*@null@*/ const char * longName;	/* may be NULL */
     char shortName;		/* may be '\0' */
     int argInfo;
-    /*@shared@*/ /*@null@*/ void * arg;		/* depends on argInfo */
+/*@shared@*/ /*@null@*/ void * arg;		/* depends on argInfo */
     int val;			/* 0 means don't return, just update flag */
-    /*@shared@*/ /*@null@*/ const char * descrip;	/* description for autohelp -- may be NULL */
-    /*@shared@*/ /*@null@*/ const char * argDescrip;	/* argument description for autohelp */
+/*@shared@*/ /*@null@*/ const char * descrip;	/* description for autohelp -- may be NULL */
+/*@shared@*/ /*@null@*/ const char * argDescrip;	/* argument description for autohelp */
 };
 
 struct poptAlias {
-    /*@owned@*/ /*@null@*/ const char * longName;	/* may be NULL */
+/*@owned@*/ /*@null@*/ const char * longName;	/* may be NULL */
     char shortName;		/* may be '\0' */
     int argc;
-    /*@owned@*/ const char ** argv;		/* must be free()able */
+/*@owned@*/ const char ** argv;		/* must be free()able */
 };
 
 extern struct poptOption poptHelpOptions[];
 #define POPT_AUTOHELP { NULL, '\0', POPT_ARG_INCLUDE_TABLE, poptHelpOptions, \
-			0, "Help options", NULL },
+			0, "Help options:", NULL },
+#define POPT_TABLEEND { NULL, '\0', 0, 0, 0, NULL, NULL }
 
 typedef struct poptContext_s * poptContext;
 #ifndef __cplusplus
diff --git a/popthelp.c b/popthelp.c
index 12fb484..25cb791 100644
--- a/popthelp.c
+++ b/popthelp.c
@@ -14,8 +14,9 @@
 static void displayArgs(poptContext con,
 		/*@unused@*/ enum poptCallbackReason foo,
 		struct poptOption * key, 
-		/*@unused@*/ const char * arg, /*@unused@*/ void * data) {
-    if (key->shortName== '?')
+		/*@unused@*/ const char * arg, /*@unused@*/ void * data)
+{
+    if (key->shortName == '?')
 	poptPrintHelp(con, stdout, 0);
     else
 	poptPrintUsage(con, stdout, 0);
@@ -26,7 +27,7 @@ struct poptOption poptHelpOptions[] = {
     { NULL, '\0', POPT_ARG_CALLBACK, (void *)&displayArgs, '\0', NULL, NULL },
     { "help", '?', 0, NULL, '?', N_("Show this help message"), NULL },
     { "usage", '\0', 0, NULL, 'u', N_("Display brief usage message"), NULL },
-    { NULL, '\0', 0, NULL, 0, NULL, NULL }
+    POPT_TABLEEND
 } ;
 
 
@@ -69,25 +70,28 @@ getArgDescrip(const struct poptOption * opt, const char *translation_domain)
 
 static void singleOptionHelp(FILE * f, int maxLeftCol, 
 			     const struct poptOption * opt,
-			     const char *translation_domain) {
+			     const char *translation_domain)
+{
     int indentLength = maxLeftCol + 5;
     int lineLength = 79 - indentLength;
     const char * help = D_(translation_domain, opt->descrip);
+    const char * argDescrip = getArgDescrip(opt, translation_domain);
     int helpLength;
-    const char * ch;
-    char format[10];
     char * left;
-    const char * argDescrip = getArgDescrip(opt, translation_domain);
 
     left = malloc(maxLeftCol + 1);
     left[0] = left[maxLeftCol] = '\0';
 
     if (opt->longName && opt->shortName)
-	snprintf(left, maxLeftCol, "-%c, --%s", opt->shortName, opt->longName);
+	snprintf(left, maxLeftCol, "-%c, %s%s", opt->shortName,
+		((opt->argInfo & POPT_ARGFLAG_ONEDASH) ? "-" : "--"),
+		opt->longName);
     else if (opt->shortName) 
 	snprintf(left, maxLeftCol, "-%c", opt->shortName);
     else if (opt->longName)
-	snprintf(left, maxLeftCol, "--%s", opt->longName);
+	snprintf(left, maxLeftCol, "%s%s",
+		((opt->argInfo & POPT_ARGFLAG_ONEDASH) ? "-" : "--"),
+		opt->longName);
     if (!*left) return ;
     if (argDescrip) {
 	char * le = left + strlen(left);
@@ -145,6 +149,9 @@ static void singleOptionHelp(FILE * f, int maxLeftCol,
 
     helpLength = strlen(help);
     while (helpLength > lineLength) {
+	const char * ch;
+	char format[10];
+
 	ch = help + lineLength - 1;
 	while (ch > help && !isspace(*ch)) ch--;
 	if (ch == help) break;		/* give up */
@@ -165,7 +172,8 @@ out:
 }
 
 static int maxArgWidth(const struct poptOption * opt,
-		       const char * translation_domain) {
+		       const char * translation_domain)
+{
     int max = 0;
     int this;
     const char * s;
@@ -175,15 +183,19 @@ static int maxArgWidth(const struct poptOption * opt,
 	    this = maxArgWidth(opt->arg, translation_domain);
 	    if (this > max) max = this;
 	} else if (!(opt->argInfo & POPT_ARGFLAG_DOC_HIDDEN)) {
-	    this = opt->shortName ? 2 : 0;
+	    this = sizeof("  ")-1;
+	    if (opt->shortName) this += sizeof("-X")-1;
+	    if (opt->shortName && opt->longName) this += sizeof(", ")-1;
 	    if (opt->longName) {
-		if (this) this += 2;
-		this += strlen(opt->longName) + 2;
+		this += ((opt->argInfo & POPT_ARGFLAG_ONEDASH)
+			? sizeof("-")-1 : sizeof("--")-1);
+		this += strlen(opt->longName);
 	    }
 
 	    s = getArgDescrip(opt, translation_domain);
 	    if (s)
-		this += strlen(s) + 1;
+		this += sizeof("=")-1 + strlen(s);
+	    if (opt->argInfo & POPT_ARGFLAG_OPTIONAL) this += sizeof("[]")-1;
 	    if (this > max) max = this;
 	}
 
@@ -195,20 +207,18 @@ static int maxArgWidth(const struct poptOption * opt,
 
 static void singleTableHelp(FILE * f, const struct poptOption * table, 
 			    int left,
-			    const char *translation_domain) {
+			    const char *translation_domain)
+{
     const struct poptOption * opt;
     const char *sub_transdom;
 
-    opt = table;
-    while (opt->longName || opt->shortName || opt->arg) {
+    for (opt = table; (opt->longName || opt->shortName || opt->arg); opt++) {
 	if ((opt->longName || opt->shortName) && 
 	    !(opt->argInfo & POPT_ARGFLAG_DOC_HIDDEN))
 	    singleOptionHelp(f, left, opt, translation_domain);
-	opt++;
     }
 
-    opt = table;
-    while (opt->longName || opt->shortName || opt->arg) {
+    for (opt = table; (opt->longName || opt->shortName || opt->arg); opt++) {
 	if ((opt->argInfo & POPT_ARG_MASK) == POPT_ARG_INCLUDE_TABLE) {
 	    sub_transdom = getTableTranslationDomain(opt->arg);
 	    if(!sub_transdom)
@@ -219,18 +229,18 @@ static void singleTableHelp(FILE * f, const struct poptOption * table,
 
 	    singleTableHelp(f, opt->arg, left, sub_transdom);
 	}
-	opt++;
     }
 }
 
-static int showHelpIntro(poptContext con, FILE * f) {
+static int showHelpIntro(poptContext con, FILE * f)
+{
     int len = 6;
     const char * fn;
 
     fprintf(f, POPT_("Usage:"));
     if (!(con->flags & POPT_CONTEXT_KEEP_FIRST)) {
 	fn = con->optionStack->argv[0];
-	if (strchr(fn, '/')) fn = strchr(fn, '/') + 1;
+	if (strchr(fn, '/')) fn = strrchr(fn, '/') + 1;
 	fprintf(f, " %s", fn);
 	len += strlen(fn) + 1;
     }
@@ -238,7 +248,8 @@ static int showHelpIntro(poptContext con, FILE * f) {
     return len;
 }
 
-void poptPrintHelp(poptContext con, FILE * f, /*@unused@*/ int flags) {
+void poptPrintHelp(poptContext con, FILE * f, /*@unused@*/ int flags)
+{
     int leftColWidth;
 
     showHelpIntro(con, f);
@@ -253,7 +264,8 @@ void poptPrintHelp(poptContext con, FILE * f, /*@unused@*/ int flags) {
 
 static int singleOptionUsage(FILE * f, int cursor, 
 			     const struct poptOption * opt,
-			     const char *translation_domain) {
+			     const char *translation_domain)
+{
     int len = 3;
     char shortStr[2] = { '\0', '\0' };
     const char * item = shortStr;
@@ -263,7 +275,7 @@ static int singleOptionUsage(FILE * f, int cursor,
 	if (!(opt->argInfo & POPT_ARG_MASK)) 
 	    return cursor;	/* we did these already */
 	len++;
-	*shortStr = opt->shortName;
+	shortStr[0] = opt->shortName;
 	shortStr[1] = '\0';
     } else if (opt->longName) {
 	len += 1 + strlen(opt->longName);
@@ -280,36 +292,33 @@ static int singleOptionUsage(FILE * f, int cursor,
 	cursor = 7;
     } 
 
-    fprintf(f, " [-%s%s%s%s]", opt->shortName ? "" : "-", item,
-	    argDescrip ? (opt->shortName ? " " : "=") : "",
-	    argDescrip ? argDescrip : "");
+    fprintf(f, " [-%s%s%s%s]",
+	((opt->shortName || (opt->argInfo & POPT_ARGFLAG_ONEDASH)) ? "" : "-"),
+	item,
+	(argDescrip ? (opt->shortName ? " " : "=") : ""),
+	(argDescrip ? argDescrip : ""));
 
     return cursor + len + 1;
 }
 
-static int singleTableUsage(FILE * f, int cursor, const struct poptOption * table,
-		     const char *translation_domain) {
-    const struct poptOption * opt;
-    
-    opt = table;
-    while (opt->longName || opt->shortName || opt->arg) {
+static int singleTableUsage(FILE * f, int cursor,
+	const struct poptOption * opt, const char * translation_domain)
+{
+    for (; (opt->longName || opt->shortName || opt->arg) ; opt++) {
         if ((opt->argInfo & POPT_ARG_MASK) == POPT_ARG_INTL_DOMAIN)
 	    translation_domain = (const char *)opt->arg;
 	else if ((opt->argInfo & POPT_ARG_MASK) == POPT_ARG_INCLUDE_TABLE) 
-	    cursor = singleTableUsage(f, cursor, opt->arg,
-				      translation_domain);
+	    cursor = singleTableUsage(f, cursor, opt->arg, translation_domain);
 	else if ((opt->longName || opt->shortName) && 
 		 !(opt->argInfo & POPT_ARGFLAG_DOC_HIDDEN))
-	  cursor = singleOptionUsage(f, cursor, opt, translation_domain);
-
-	opt++;
+	    cursor = singleOptionUsage(f, cursor, opt, translation_domain);
     }
 
     return cursor;
 }
 
-static int showShortOptions(const struct poptOption * opt, FILE * f, 
-			    char * str) {
+static int showShortOptions(const struct poptOption * opt, FILE * f, char * str)
+{
     char s[300];		/* this is larger then the ascii set, so
 				   it should do just fine */
 
@@ -319,13 +328,11 @@ static int showShortOptions(const struct poptOption * opt, FILE * f,
 	str = s;
     }
 
-    while (opt->longName || opt->shortName || opt->arg) {
+    for (; (opt->longName || opt->shortName || opt->arg); opt++) {
 	if (opt->shortName && !(opt->argInfo & POPT_ARG_MASK))
 	    str[strlen(str)] = opt->shortName;
 	else if ((opt->argInfo & POPT_ARG_MASK) == POPT_ARG_INCLUDE_TABLE)
 	    showShortOptions(opt->arg, f, str);
-
-	opt++;
     } 
 
     if (s != str || !*s)
@@ -335,7 +342,8 @@ static int showShortOptions(const struct poptOption * opt, FILE * f,
     return strlen(s) + 4;
 }
 
-void poptPrintUsage(poptContext con, FILE * f, /*@unused@*/ int flags) {
+void poptPrintUsage(poptContext con, FILE * f, /*@unused@*/ int flags)
+{
     int cursor;
 
     cursor = showHelpIntro(con, f);
@@ -352,6 +360,6 @@ void poptPrintUsage(poptContext con, FILE * f, /*@unused@*/ int flags) {
 }
 
 void poptSetOtherOptionHelp(poptContext con, const char * text) {
-    if (con->otherHelp) xfree(con->otherHelp);
+    if (con->otherHelp) free((void *)con->otherHelp);
     con->otherHelp = xstrdup(text);
 }
diff --git a/poptint.h b/poptint.h
index a37a9b9..066e143 100644
--- a/poptint.h
+++ b/poptint.h
@@ -27,12 +27,12 @@ typedef struct {
 
 struct optionStackEntry {
     int argc;
-    /*@only@*/ const char ** argv;
-    /*@only@*/ pbm_set * argb;
+/*@only@*/ const char ** argv;
+/*@only@*/ pbm_set * argb;
     int next;
-    /*@only@*/ const char * nextArg;
-    /*@keep@*/ const char * nextCharArg;
-    /*@dependent@*/ struct poptAlias * currAlias;
+/*@only@*/ const char * nextArg;
+/*@keep@*/ const char * nextCharArg;
+/*@dependent@*/ struct poptAlias * currAlias;
     int stuffed;
 };
 
@@ -44,30 +44,28 @@ struct execEntry {
 
 struct poptContext_s {
     struct optionStackEntry optionStack[POPT_OPTION_DEPTH];
-    /*@dependent@*/ struct optionStackEntry * os;
-    /*@owned@*/ const char ** leftovers;
+/*@dependent@*/ struct optionStackEntry * os;
+/*@owned@*/ const char ** leftovers;
     int numLeftovers;
     int nextLeftover;
-    /*@keep@*/ const struct poptOption * options;
+/*@keep@*/ const struct poptOption * options;
     int restLeftover;
-    /*@only@*/ const char * appName;
-    /*@only@*/ struct poptAlias * aliases;
+/*@only@*/ const char * appName;
+/*@only@*/ struct poptAlias * aliases;
     int numAliases;
     int flags;
     struct execEntry * execs;
     int numExecs;
-    /*@only@*/ const char ** finalArgv;
+/*@only@*/ const char ** finalArgv;
     int finalArgvCount;
     int finalArgvAlloced;
-    /*@dependent@*/ struct execEntry * doExec;
-    /*@only@*/ const char * execPath;
+/*@dependent@*/ struct execEntry * doExec;
+/*@only@*/ const char * execPath;
     int execAbsolute;
-    /*@only@*/ const char * otherHelp;
+/*@only@*/ const char * otherHelp;
     pbm_set * arg_strip;
 };
 
-#define	xfree(_a)	free((void *)_a)
-
 #ifdef HAVE_LIBINTL_H
 #include <libintl.h>
 #endif
@@ -82,8 +80,8 @@ struct poptContext_s {
 #define D_(dom, str) dgettext(dom, str)
 #define POPT_(foo) D_("popt", foo)
 #else
-#define POPT_(foo) (foo)
 #define D_(dom, str) (str)
+#define POPT_(foo) (foo)
 #endif
 
 #define N_(foo) (foo)
-- 
Gitee


From 02c43f2ea8c2d087b70e90309e2ba307dc3aad64 Mon Sep 17 00:00:00 2001
From: Jeff Johnson <n3npq@mac.com>
Date: Tue, 2 Jan 2001 17:19:43 +0000
Subject: [PATCH 286/667] doxygen annotations for popt.

---
 findme.h |   7 +-
 popt.h   | 326 ++++++++++++++++++++++++++++++++++++++++++++-----------
 2 files changed, 266 insertions(+), 67 deletions(-)

diff --git a/findme.h b/findme.h
index 44ec801..2fe346d 100644
--- a/findme.h
+++ b/findme.h
@@ -9,6 +9,11 @@
 #ifndef H_FINDME
 #define H_FINDME
 
-const char * findProgramPath(const char * argv0);
+/**
+ * Return absolute path to executable by searching PATH.
+ * @param argv0		name of executable
+ * @return		(malloc'd) absolute path to executable (or NULL)
+ */
+/*@null@*/ const char * findProgramPath(const char * argv0);
 
 #endif
diff --git a/popt.h b/popt.h
index 2bb83ad..f66db84 100644
--- a/popt.h
+++ b/popt.h
@@ -1,5 +1,5 @@
-/** \ingroup popt
- * \file popt/popt.h
+/** \file popt/popt.h
+ * \ingroup popt
  */
 
 /* (C) 1998-2000 Red Hat, Inc. -- Licensing details are in the COPYING
@@ -17,85 +17,128 @@ extern "C" {
 
 #define POPT_OPTION_DEPTH	10
 
-#define POPT_ARG_NONE		0
-#define POPT_ARG_STRING		1
-#define POPT_ARG_INT		2
-#define POPT_ARG_LONG		3
-#define POPT_ARG_INCLUDE_TABLE	4	/* arg points to table */
-#define POPT_ARG_CALLBACK	5	/* table-wide callback... must be
+/** \ingroup popt
+ * \name Arg type identifiers
+ */
+/*@{*/
+#define POPT_ARG_NONE		0	/*!< no arg */
+#define POPT_ARG_STRING		1	/*!< arg will be saved as string */
+#define POPT_ARG_INT		2	/*!< arg will be converted to int */
+#define POPT_ARG_LONG		3	/*!< arg will be converted to long */
+#define POPT_ARG_INCLUDE_TABLE	4	/*!< arg points to table */
+#define POPT_ARG_CALLBACK	5	/*!< table-wide callback... must be
 					   set first in table; arg points 
 					   to callback, descrip points to 
 					   callback data to pass */
-#define POPT_ARG_INTL_DOMAIN    6       /* set the translation domain
+#define POPT_ARG_INTL_DOMAIN    6       /*!< set the translation domain
 					   for this table and any
 					   included tables; arg points
 					   to the domain string */
-#define POPT_ARG_VAL		7	/* arg should take value val */
-#define	POPT_ARG_FLOAT		8	/* arg should be converted to float */
-#define	POPT_ARG_DOUBLE		9	/* arg should be converted to double */
+#define POPT_ARG_VAL		7	/*!< arg should take value val */
+#define	POPT_ARG_FLOAT		8	/*!< arg will be converted to float */
+#define	POPT_ARG_DOUBLE		9	/*!< arg will be converted to double */
 
 #define POPT_ARG_MASK		0x0000FFFF
-#define POPT_ARGFLAG_ONEDASH	0x80000000  /* allow -longoption */
-#define POPT_ARGFLAG_DOC_HIDDEN 0x40000000  /* don't show in help/usage */
-#define POPT_ARGFLAG_STRIP	0x20000000  /* strip this arg from argv(only applies to long args) */
-#define	POPT_ARGFLAG_OPTIONAL	0x10000000  /* arg may be missing */
-
-#define	POPT_ARGFLAG_OR		0x08000000 /* arg will be or'ed */
-#define	POPT_ARGFLAG_NOR	0x09000000 /* arg will be nor'ed */
-#define	POPT_ARGFLAG_AND	0x04000000 /* arg will be and'ed */
-#define	POPT_ARGFLAG_NAND	0x05000000 /* arg will be nand'ed */
-#define	POPT_ARGFLAG_XOR	0x02000000 /* arg will be xor'ed */
-#define	POPT_ARGFLAG_NOT	0x01000000 /* arg will be negated */
+/*@}*/
+
+/** \ingroup popt
+ * \name Arg modifiers
+ */
+/*@{*/
+#define POPT_ARGFLAG_ONEDASH	0x80000000  /*!< allow -longoption */
+#define POPT_ARGFLAG_DOC_HIDDEN 0x40000000  /*!< don't show in help/usage */
+#define POPT_ARGFLAG_STRIP	0x20000000  /*!< strip this arg from argv(only applies to long args) */
+#define	POPT_ARGFLAG_OPTIONAL	0x10000000  /*!< arg may be missing */
+
+#define	POPT_ARGFLAG_OR		0x08000000  /*!< arg will be or'ed */
+#define	POPT_ARGFLAG_NOR	0x09000000  /*!< arg will be nor'ed */
+#define	POPT_ARGFLAG_AND	0x04000000  /*!< arg will be and'ed */
+#define	POPT_ARGFLAG_NAND	0x05000000  /*!< arg will be nand'ed */
+#define	POPT_ARGFLAG_XOR	0x02000000  /*!< arg will be xor'ed */
+#define	POPT_ARGFLAG_NOT	0x01000000  /*!< arg will be negated */
 #define POPT_ARGFLAG_LOGICALOPS \
         (POPT_ARGFLAG_OR|POPT_ARGFLAG_AND|POPT_ARGFLAG_XOR)
+/*@}*/
 
-#define POPT_CBFLAG_PRE		0x80000000  /* call the callback before parse */
-#define POPT_CBFLAG_POST	0x40000000  /* call the callback after parse */
-#define POPT_CBFLAG_INC_DATA	0x20000000  /* use data from the include line,
+/** \ingroup popt
+ * \name Callback modifiers
+ */
+/*@{*/
+#define POPT_CBFLAG_PRE		0x80000000  /*!< call the callback before parse */
+#define POPT_CBFLAG_POST	0x40000000  /*!< call the callback after parse */
+#define POPT_CBFLAG_INC_DATA	0x20000000  /*!< use data from the include line,
 					       not the subtable */
-#define POPT_CBFLAG_SKIPOPTION	0x10000000  /* don't callback with option */
-#define POPT_CBFLAG_CONTINUE	0x08000000  /* continue callbacks with option */
-
-#define POPT_ERROR_NOARG	-10
-#define POPT_ERROR_BADOPT	-11
-#define POPT_ERROR_OPTSTOODEEP	-13
-#define POPT_ERROR_BADQUOTE	-15	/* only from poptParseArgString() */
-#define POPT_ERROR_ERRNO	-16	/* only from poptParseArgString() */
-#define POPT_ERROR_BADNUMBER	-17
-#define POPT_ERROR_OVERFLOW	-18
-#define	POPT_ERROR_BADOPERATION	-19
-
-/* poptBadOption() flags */
-#define POPT_BADOPTION_NOALIAS  (1 << 0)  /* don't go into an alias */
-
-/* poptGetContext() flags */
-#define POPT_CONTEXT_NO_EXEC	(1 << 0)  /* ignore exec expansions */
-#define POPT_CONTEXT_KEEP_FIRST	(1 << 1)  /* pay attention to argv[0] */
-#define POPT_CONTEXT_POSIXMEHARDER (1 << 2) /* options can't follow args */
+#define POPT_CBFLAG_SKIPOPTION	0x10000000  /*!< don't callback with option */
+#define POPT_CBFLAG_CONTINUE	0x08000000  /*!< continue callbacks with option */
+/*@}*/
+
+/** \ingroup popt
+ * \name Error return values
+ */
+/*@{*/
+#define POPT_ERROR_NOARG	-10	/*!< missing argument */
+#define POPT_ERROR_BADOPT	-11	/*!< unknown option */
+#define POPT_ERROR_OPTSTOODEEP	-13	/*!< aliases nested too deeply */
+#define POPT_ERROR_BADQUOTE	-15	/*!< error in paramter quoting */
+#define POPT_ERROR_ERRNO	-16	/*!< errno set, use strerror(errno) */
+#define POPT_ERROR_BADNUMBER	-17	/*!< invalid numeric value */
+#define POPT_ERROR_OVERFLOW	-18	/*!< number too large or too small */
+#define	POPT_ERROR_BADOPERATION	-19	/*!< mutually exclusive logical operations requested */
+/*@}*/
 
+/** \ingroup popt
+ * \name poptBadOption() flags
+ */
+/*@{*/
+#define POPT_BADOPTION_NOALIAS  (1 << 0)  /*!< don't go into an alias */
+/*@}*/
+
+/** \ingroup popt
+ * \name poptGetContext() flags
+ */
+/*@{*/
+#define POPT_CONTEXT_NO_EXEC	(1 << 0)  /*!< ignore exec expansions */
+#define POPT_CONTEXT_KEEP_FIRST	(1 << 1)  /*!< pay attention to argv[0] */
+#define POPT_CONTEXT_POSIXMEHARDER (1 << 2) /*!< options can't follow args */
+/*@}*/
+
+/** \ingroup popt
+ */
 struct poptOption {
-/*@observer@*/ /*@null@*/ const char * longName;	/* may be NULL */
-    char shortName;		/* may be '\0' */
+/*@observer@*/ /*@null@*/ const char * longName; /*!< may be NULL */
+    char shortName;			/*!< may be '\0' */
     int argInfo;
-/*@shared@*/ /*@null@*/ void * arg;		/* depends on argInfo */
-    int val;			/* 0 means don't return, just update flag */
-/*@shared@*/ /*@null@*/ const char * descrip;	/* description for autohelp -- may be NULL */
-/*@shared@*/ /*@null@*/ const char * argDescrip;	/* argument description for autohelp */
+/*@shared@*/ /*@null@*/ void * arg;	/*!< depends on argInfo */
+    int val;			/*!< 0 means don't return, just update flag */
+/*@shared@*/ /*@null@*/ const char * descrip;	/*!< description for autohelp -- may be NULL */
+/*@shared@*/ /*@null@*/ const char * argDescrip; /*!< argument description for autohelp */
 };
 
+/** \ingroup popt
+ */
 struct poptAlias {
-/*@owned@*/ /*@null@*/ const char * longName;	/* may be NULL */
-    char shortName;		/* may be '\0' */
+/*@owned@*/ /*@null@*/ const char * longName;	/*!< may be NULL */
+    char shortName;		/*!< may be '\0' */
     int argc;
-/*@owned@*/ const char ** argv;		/* must be free()able */
+/*@owned@*/ const char ** argv;	/*!< must be free()able */
 };
 
+/** \ingroup popt
+ * \name Auto-generated help/usage
+ */
+/*@{*/
 extern struct poptOption poptHelpOptions[];
 #define POPT_AUTOHELP { NULL, '\0', POPT_ARG_INCLUDE_TABLE, poptHelpOptions, \
 			0, "Help options:", NULL },
 #define POPT_TABLEEND { NULL, '\0', 0, 0, 0, NULL, NULL }
+/*@}*/
 
+/** \ingroup popt
+ */
 typedef struct poptContext_s * poptContext;
+
+/** \ingroup popt
+ */
 #ifndef __cplusplus
 typedef struct poptOption * poptOption;
 #endif
@@ -103,46 +146,197 @@ typedef struct poptOption * poptOption;
 enum poptCallbackReason { POPT_CALLBACK_REASON_PRE, 
 			  POPT_CALLBACK_REASON_POST,
 			  POPT_CALLBACK_REASON_OPTION };
-typedef void (*poptCallbackType)(poptContext con, 
+
+/** \ingroup popt
+ * Table callback prototype.
+ * @param con		context
+ * @param reason	reason for callback
+ * @param opt		option that triggered callback
+ * @param arg		@todo Document.
+ * @param data		@todo Document.
+ */
+typedef void (*poptCallbackType) (poptContext con, 
 				 enum poptCallbackReason reason,
 			         const struct poptOption * opt,
 				 const char * arg, const void * data);
 
+/** \ingroup popt
+ * Initialize popt context.
+ * @param name
+ * @param argc		no. of arguments
+ * @param argv		argument array
+ * @param options	address of popt option table
+ * @param flags		or'd POPT_CONTEXT_* bits
+ * @return		initialized popt context
+ */
 /*@only@*/ poptContext poptGetContext(/*@keep@*/ const char * name,
 		int argc, /*@keep@*/ const char ** argv,
 		/*@keep@*/ const struct poptOption * options, int flags);
+
+/** \ingroup popt
+ * Reinitialize popt context.
+ * @param con		context
+ */
 void poptResetContext(poptContext con);
 
-/* returns 'val' element, -1 on last item, POPT_ERROR_* on error */
+/** \ingroup popt
+ * Return value of next option found.
+ * @param con		context
+ * @return		next option val, -1 on last item, POPT_ERROR_* on error
+ */
 int poptGetNextOpt(poptContext con);
 /* returns NULL if no argument is available */
+
+/** \ingroup popt
+ * @param con		context
+ */
 /*@observer@*/ /*@null@*/ const char * poptGetOptArg(poptContext con);
-/* returns NULL if no more options are available */
+
+/** \ingroup popt
+ * Return current option's argument.
+ * @param con		context
+ * @return		option argument, NULL if no more options are available
+ */
 /*@observer@*/ /*@null@*/ const char * poptGetArg(poptContext con);
+
+/** \ingroup popt
+ * Peek at  current option's argument.
+ * @param con		context
+ * @return		option argument
+ */
 /*@observer@*/ /*@null@*/ const char * poptPeekArg(poptContext con);
+
+/** \ingroup popt
+ * Return remaining arguments.
+ * @param con		context
+ * @return		argument array, terminated with NULL
+ */
 /*@observer@*/ /*@null@*/ const char ** poptGetArgs(poptContext con);
-/* returns the option which caused the most recent error */
+
+/** \ingroup popt
+ * Return the option which caused the most recent error.
+ * @param con		context
+ * @return		offending option
+ */
 /*@observer@*/ const char * poptBadOption(poptContext con, int flags);
+
+/** \ingroup popt
+ * Destroy context.
+ * @param con		context
+ */
 void poptFreeContext( /*@only@*/ poptContext con);
+
+/** \ingroup popt
+ * Add arguments to context.
+ * @param con		context
+ * @param argv		argument array, NULL terminated
+ * @return		0 on success, POPT_ERROR_OPTSTOODEEP on failure
+ */
 int poptStuffArgs(poptContext con, /*@keep@*/ const char ** argv);
+
+/** \ingroup popt
+ * Add alias to context.
+ * @todo Pass alias by reference, not value.
+ * @param con		context
+ * @param alias		alias to add
+ * @param flags		(unused)
+ * @return		0 always
+ */
 int poptAddAlias(poptContext con, struct poptAlias alias, int flags);
+
+/** \ingroup popt
+ * Read configuration file.
+ * @param con		context
+ * @param fn		file name to read
+ * @return		0 on success, POPT_ERROR_ERRNO on failure
+ */
 int poptReadConfigFile(poptContext con, const char * fn);
-/* like above, but reads /etc/popt and $HOME/.popt along with environment 
-   vars */
-int poptReadDefaultConfig(poptContext con, int useEnv);
-/* argv should be freed -- this allows ', ", and \ quoting, but ' is treated
-   the same as " and both may include \ quotes */
+
+/** \ingroup popt
+ * Read default configuration from /etc/popt and $HOME/.popt.
+ * @param con		context
+ * @param useEnv	(unused)
+ * @return		0 on success, POPT_ERROR_ERRNO on failure
+ */
+int poptReadDefaultConfig(poptContext con, /*@unused@*/ int useEnv);
+
+/** \ingroup popt
+ * Duplicate an argument array.
+ * @note: The argument array is malloc'd as a single area, so only argv must
+ * be free'd.
+ *
+ * @param argc		no. of arguments
+ * @param argv		argument array
+ * @retval argcPtr	address of returned no. of arguments
+ * @retval argvPtr	address of returned argument array
+ * @return		0 on success, POPT_ERROR_NOARG on failure
+ */
 int poptDupArgv(int argc, const char **argv,
 		/*@out@*/ int * argcPtr, /*@out@*/ const char *** argvPtr);
+
+/** \ingroup popt
+ * Parse a string into an argument array.
+ * The parse allows ', ", and \ quoting, but ' is treated the same as " and
+ * both may include \ quotes.
+ * @note: The argument array is malloc'd as a single area, so only argv must
+ * be free'd.
+ *
+ * @param s		string to parse
+ * @retval argcPtr	address of returned no. of arguments
+ * @retval argvPtr	address of returned argument array
+ */
 int poptParseArgvString(const char * s,
 		/*@out@*/ int * argcPtr, /*@out@*/ const char *** argvPtr);
+
+/** \ingroup popt
+ * Return formatted error string for popt failure.
+ * @param error		popt error
+ * @return		error string
+ */
 /*@observer@*/ const char *const poptStrerror(const int error);
+
+/** \ingroup popt
+ * Limit search for executables.
+ * @param con		context
+ * @param path		single path to search for executables
+ * @param allowAbsolute	absolute paths only?
+ */
 void poptSetExecPath(poptContext con, const char * path, int allowAbsolute);
-void poptPrintHelp(poptContext con, FILE * f, int flags);
-void poptPrintUsage(poptContext con, FILE * f, int flags);
+
+/** \ingroup popt
+ * Print detailed description of options.
+ * @param con		context
+ * @param f		ouput file handle
+ * @param flags		(unused)
+ */
+void poptPrintHelp(poptContext con, FILE * f, /*@unused@*/ int flags);
+
+/** \ingroup popt
+ * Print terse description of options.
+ * @param con		context
+ * @param f		ouput file handle
+ * @param flags		(unused)
+ */
+void poptPrintUsage(poptContext con, FILE * f, /*@unused@*/ int flags);
+
+/** \ingroup popt
+ * Provide text to replace default "[OPTION...]" in help/usage output.
+ * @param con		context
+ * @param text		replacement text
+ */
 void poptSetOtherOptionHelp(poptContext con, const char * text);
+
+/** \ingroup popt
+ * Return argv[0] from context.
+ * @param con		context
+ */
 /*@observer@*/ const char * poptGetInvocationName(poptContext con);
-/* shuffles argv pointers to remove stripped args, returns new argc */
+
+/** \ingroup popt
+ * Shuffle argv pointers to remove stripped args, returns new argc.
+ * @param con		context
+ * @return		new argc
+ */
 int poptStrippedArgv(poptContext con, int argc, char **argv);
 
 #ifdef  __cplusplus
-- 
Gitee


From 7c845d4b4b3f71011d20f283e75edb99be84be5f Mon Sep 17 00:00:00 2001
From: Jeff Johnson <n3npq@mac.com>
Date: Mon, 8 Jan 2001 17:20:32 +0000
Subject: [PATCH 287/667] configure.in: Typo in --with-puthon. Add eu_ES
 (Basque).

---
 configure.in |  2 +-
 po/eu_ES.po  | 23 +++++++++++++++++++++++
 2 files changed, 24 insertions(+), 1 deletion(-)
 create mode 100644 po/eu_ES.po

diff --git a/configure.in b/configure.in
index b484c87..02f54eb 100755
--- a/configure.in
+++ b/configure.in
@@ -3,7 +3,7 @@ AM_CONFIG_HEADER(config.h)
 AC_PREREQ(2.12)
 AC_CANONICAL_SYSTEM
 AM_INIT_AUTOMAKE(popt, 1.7)
-ALL_LINGUAS="cs da de es fi fr gl hu id is it ja ko no pl pt pt_BR ro ru sk sl sr sv tr uk wa zh zh_CN.GB2312"
+ALL_LINGUAS="cs da de es eu_ES fi fr gl hu id is it ja ko no pl pt pt_BR ro ru sk sl sr sv tr uk wa zh zh_CN.GB2312"
 
 AC_ISC_POSIX
 
diff --git a/po/eu_ES.po b/po/eu_ES.po
new file mode 100644
index 0000000..fc99ea7
--- /dev/null
+++ b/po/eu_ES.po
@@ -0,0 +1,23 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR Free Software Foundation, Inc.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"POT-Creation-Date: 2001-01-01 18:27-0500\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=CHARSET\n"
+"Content-Transfer-Encoding: ENCODING\n"
+
+#: popthelp.c:28
+msgid "Show this help message"
+msgstr ""
+
+#: popthelp.c:29
+msgid "Display brief usage message"
+msgstr ""
-- 
Gitee


From 2d0b99bf38b205fddf2d25c8ddd2957f3503937f Mon Sep 17 00:00:00 2001
From: Jeff Johnson <n3npq@mac.com>
Date: Fri, 12 Jan 2001 16:34:16 +0000
Subject: [PATCH 288/667] Remove bash syntax.

---
 testit.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/testit.sh b/testit.sh
index ce5530a..46d6706 100755
--- a/testit.sh
+++ b/testit.sh
@@ -37,10 +37,10 @@ run test1 "test1 - 12" "arg1: 1 arg2: (none)" -O
 run test1 "test1 - 13" "arg1: 1 arg2: foo" -OT foo
 run test1 "test1 - 14" "arg1: 0 arg2: (none) inc: 1" --inc
 run test1 "test1 - 15" "arg1: 0 arg2: foo inc: 1" -i --arg2 foo
-export POSIX_ME_HARDER=1
+POSIX_ME_HARDER=1 ; export POSIX_ME_HARDER
 run test1 "test1 - 16" "arg1: 1 arg2: (none) rest: foo --arg2 something" --arg1 foo --arg2 something
 unset POSIX_ME_HARDER
-export POSIXLY_CORRECT=1
+POSIXLY_CORRECT=1 ; export POSIXLY_CORRECT
 run test1 "test1 - 17" "arg1: 1 arg2: (none) rest: foo --arg2 something" --arg1 foo --arg2 something
 unset POSIXLY_CORRECT
 run test1 "test1 - 18" "callback: c sampledata bar arg1: 1 arg2: (none)" --arg1 --cb bar
-- 
Gitee


From 1143054dd96685766a184a01a7ce0d6d018a0f74 Mon Sep 17 00:00:00 2001
From: Jeff Johnson <n3npq@mac.com>
Date: Mon, 15 Jan 2001 22:55:49 +0000
Subject: [PATCH 289/667] Add missing keyword=POPT_ line to xgettext
 extraction.

---
 po/Makefile.in.in | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/po/Makefile.in.in b/po/Makefile.in.in
index e4ea0fd..a11d0bb 100644
--- a/po/Makefile.in.in
+++ b/po/Makefile.in.in
@@ -26,14 +26,14 @@ subdir = po
 
 INSTALL = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
-MKINSTALLDIRS = @MKINSTALLDIRS@
+MKINSTALLDIRS = $(top_srcdir)/@MKINSTALLDIRS@
 
 CC = @CC@
 GENCAT = @GENCAT@
-GMSGFMT = PATH=../src:$$PATH @GMSGFMT@
+GMSGFMT = PATH=../intl:$$PATH @GMSGFMT@
 MSGFMT = @MSGFMT@
-XGETTEXT = PATH=../src:$$PATH @XGETTEXT@
-MSGMERGE = PATH=../src:$$PATH msgmerge
+XGETTEXT = PATH=../intl:$$PATH @XGETTEXT@
+MSGMERGE = PATH=../intl:$$PATH msgmerge
 
 DEFS = @DEFS@
 CFLAGS = @CFLAGS@
@@ -84,7 +84,7 @@ all-no:
 
 $(srcdir)/$(PACKAGE).pot: $(POTFILES)
 	$(XGETTEXT) --default-domain=$(PACKAGE) --directory=$(top_srcdir) \
-	  --add-comments --keyword=_ --keyword=N_ \
+	  --add-comments --keyword=_ --keyword=N_ --keyword=POPT_ \
 	  --files-from=$(srcdir)/POTFILES.in \
 	&& test ! -f $(PACKAGE).po \
 	   || ( rm -f $(srcdir)/$(PACKAGE).pot \
@@ -207,7 +207,7 @@ dist distdir: update-po $(DISTFILES)
 
 update-po: Makefile
 	$(MAKE) $(PACKAGE).pot
-	PATH=`pwd`/../src:$$PATH; \
+	PATH=`pwd`/../intl:$$PATH; \
 	cd $(srcdir); \
 	catalogs='$(CATALOGS)'; \
 	for cat in $$catalogs; do \
@@ -227,8 +227,8 @@ update-po: Makefile
 refresh-po: Makefile
 	catalogs='$(CATALOGS)'; \
 	for cat in $$catalogs; do \
-		lang=`echo $$cat | sed 's/.mo//'`; \
-		if $(MSGMERGE) $$lang.po $(NLSPACKAGE).pot > $$lang.pot ; then \
+		lang=`echo $$cat | sed 's/\$(CATOBJEXT)$$//'`; \
+		if $(MSGMERGE) $$lang.po $(PACKAGE).pot > $$lang.pot ; then \
 			echo "$(MSGMERGE) of $$lang succeeded" ; \
 			mv -f $$lang.pot $$lang.po ; \
 		else \
-- 
Gitee


From b758b2bb0ae290e15b7d54ba2eab5a5dca5d1464 Mon Sep 17 00:00:00 2001
From: Jeff Johnson <n3npq@mac.com>
Date: Mon, 15 Jan 2001 23:10:07 +0000
Subject: [PATCH 290/667] - fix: extra newline in many error messages (#23947).
 - fix: rpm -Va with db1 needs per-iterator, not per-index, offset. - add
 install/remove transaction id tags.

---
 po/cs.po           | 83 ++++++++++++++++++++++++++++++++++++++-
 po/da.po           | 83 ++++++++++++++++++++++++++++++++++++++-
 po/de.po           | 83 ++++++++++++++++++++++++++++++++++++++-
 po/es.po           | 83 ++++++++++++++++++++++++++++++++++++++-
 po/eu_ES.po        | 83 ++++++++++++++++++++++++++++++++++++++-
 po/fi.po           | 83 ++++++++++++++++++++++++++++++++++++++-
 po/fr.po           | 83 ++++++++++++++++++++++++++++++++++++++-
 po/gl.po           | 83 ++++++++++++++++++++++++++++++++++++++-
 po/hu.po           | 83 ++++++++++++++++++++++++++++++++++++++-
 po/id.po           | 83 ++++++++++++++++++++++++++++++++++++++-
 po/is.po           | 83 ++++++++++++++++++++++++++++++++++++++-
 po/it.po           | 83 ++++++++++++++++++++++++++++++++++++++-
 po/ja.po           | 83 ++++++++++++++++++++++++++++++++++++++-
 po/ko.po           | 83 ++++++++++++++++++++++++++++++++++++++-
 po/no.po           | 83 ++++++++++++++++++++++++++++++++++++++-
 po/pl.po           | 83 ++++++++++++++++++++++++++++++++++++++-
 po/popt.pot        | 83 ++++++++++++++++++++++++++++++++++++++-
 po/pt.po           | 83 ++++++++++++++++++++++++++++++++++++++-
 po/pt_BR.po        | 83 ++++++++++++++++++++++++++++++++++++++-
 po/ro.po           | 96 ++++++++++++++++++++++++++++++++++------------
 po/ru.po           | 83 ++++++++++++++++++++++++++++++++++++++-
 po/sk.po           | 83 ++++++++++++++++++++++++++++++++++++++-
 po/sl.po           | 83 ++++++++++++++++++++++++++++++++++++++-
 po/sr.po           | 83 ++++++++++++++++++++++++++++++++++++++-
 po/sv.po           | 83 ++++++++++++++++++++++++++++++++++++++-
 po/tr.po           | 83 ++++++++++++++++++++++++++++++++++++++-
 po/uk.po           | 83 ++++++++++++++++++++++++++++++++++++++-
 po/wa.po           | 83 ++++++++++++++++++++++++++++++++++++++-
 po/zh.po           | 83 ++++++++++++++++++++++++++++++++++++++-
 po/zh_CN.GB2312.po | 83 ++++++++++++++++++++++++++++++++++++++-
 30 files changed, 2450 insertions(+), 53 deletions(-)

diff --git a/po/cs.po b/po/cs.po
index ab883d5..f987102 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.1\n"
-"POT-Creation-Date: 2001-01-01 17:42-0500\n"
+"POT-Creation-Date: 2001-01-15 16:14-0500\n"
 "PO-Revision-Date: 2000-08-23 22:24+0100\n"
 "Last-Translator: Milan Kerslager <milan.kerslager@spsselib.hiedu.cz>\n"
 "Language-Team: Czech <cs@li.org>\n"
@@ -9,6 +9,47 @@ msgstr ""
 "Content-Type: text/plain; charset=iso-8859-2\n"
 "Content-Transfer-Encoding: 8bit\n"
 
+#: popt.c:29
+msgid "unknown errno"
+msgstr ""
+
+#: popt.c:758
+#, c-format
+msgid "option type (%d) not implemented in popt\n"
+msgstr ""
+
+#: popt.c:893
+msgid "missing argument"
+msgstr ""
+
+#: popt.c:895
+msgid "unknown option"
+msgstr ""
+
+#: popt.c:897
+msgid "mutually exclusive logical operations requested"
+msgstr ""
+
+#: popt.c:899
+msgid "aliases nested too deeply"
+msgstr ""
+
+#: popt.c:901
+msgid "error in paramter quoting"
+msgstr ""
+
+#: popt.c:903
+msgid "invalid numeric value"
+msgstr ""
+
+#: popt.c:905
+msgid "number too large or too small"
+msgstr ""
+
+#: popt.c:909
+msgid "unknown error"
+msgstr ""
+
 #: popthelp.c:28
 msgid "Show this help message"
 msgstr "Vyp��e tuto n�pov�du"
@@ -16,3 +57,43 @@ msgstr "Vyp
 #: popthelp.c:29
 msgid "Display brief usage message"
 msgstr "Vyp��e kr�tk� n�vod k pou�it�"
+
+#: popthelp.c:60
+msgid "NONE"
+msgstr ""
+
+#: popthelp.c:61
+msgid "VAL"
+msgstr ""
+
+#: popthelp.c:62
+msgid "INT"
+msgstr ""
+
+#: popthelp.c:63
+msgid "LONG"
+msgstr ""
+
+#: popthelp.c:64
+msgid "STRING"
+msgstr ""
+
+#: popthelp.c:65
+msgid "FLOAT"
+msgstr ""
+
+#: popthelp.c:66
+msgid "DOUBLE"
+msgstr ""
+
+#: popthelp.c:67
+msgid "ARG"
+msgstr ""
+
+#: popthelp.c:240
+msgid "Usage:"
+msgstr ""
+
+#: popthelp.c:259
+msgid "[OPTION...]"
+msgstr ""
diff --git a/po/da.po b/po/da.po
index 9f59184..0fbcf69 100644
--- a/po/da.po
+++ b/po/da.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.1\n"
-"POT-Creation-Date: 2001-01-01 17:42-0500\n"
+"POT-Creation-Date: 2001-01-15 16:14-0500\n"
 "PO-Revision-Date: 2000-03-07 05:17+01:00\n"
 "Last-Translator: K. Christiansen <kenneth@gnu.org>\n"
 "Language-Team: Danish/Dansk <dansk@klid.dk>\n"
@@ -9,6 +9,47 @@ msgstr ""
 "Content-Type: text/plain; charset=ISO-8859-1\n"
 "Content-Transfer-Encoding: 8-bit\n"
 
+#: popt.c:29
+msgid "unknown errno"
+msgstr ""
+
+#: popt.c:758
+#, c-format
+msgid "option type (%d) not implemented in popt\n"
+msgstr ""
+
+#: popt.c:893
+msgid "missing argument"
+msgstr ""
+
+#: popt.c:895
+msgid "unknown option"
+msgstr ""
+
+#: popt.c:897
+msgid "mutually exclusive logical operations requested"
+msgstr ""
+
+#: popt.c:899
+msgid "aliases nested too deeply"
+msgstr ""
+
+#: popt.c:901
+msgid "error in paramter quoting"
+msgstr ""
+
+#: popt.c:903
+msgid "invalid numeric value"
+msgstr ""
+
+#: popt.c:905
+msgid "number too large or too small"
+msgstr ""
+
+#: popt.c:909
+msgid "unknown error"
+msgstr ""
+
 #: popthelp.c:28
 msgid "Show this help message"
 msgstr "Vis denne hj�lpemeddelelse"
@@ -16,3 +57,43 @@ msgstr "Vis denne hj
 #: popthelp.c:29
 msgid "Display brief usage message"
 msgstr "Vis kortfattet brugsanvisning"
+
+#: popthelp.c:60
+msgid "NONE"
+msgstr ""
+
+#: popthelp.c:61
+msgid "VAL"
+msgstr ""
+
+#: popthelp.c:62
+msgid "INT"
+msgstr ""
+
+#: popthelp.c:63
+msgid "LONG"
+msgstr ""
+
+#: popthelp.c:64
+msgid "STRING"
+msgstr ""
+
+#: popthelp.c:65
+msgid "FLOAT"
+msgstr ""
+
+#: popthelp.c:66
+msgid "DOUBLE"
+msgstr ""
+
+#: popthelp.c:67
+msgid "ARG"
+msgstr ""
+
+#: popthelp.c:240
+msgid "Usage:"
+msgstr ""
+
+#: popthelp.c:259
+msgid "[OPTION...]"
+msgstr ""
diff --git a/po/de.po b/po/de.po
index 192688a..bcd9863 100644
--- a/po/de.po
+++ b/po/de.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.1\n"
-"POT-Creation-Date: 2001-01-01 17:42-0500\n"
+"POT-Creation-Date: 2001-01-15 16:14-0500\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -14,6 +14,47 @@ msgstr ""
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: ENCODING\n"
 
+#: popt.c:29
+msgid "unknown errno"
+msgstr ""
+
+#: popt.c:758
+#, c-format
+msgid "option type (%d) not implemented in popt\n"
+msgstr ""
+
+#: popt.c:893
+msgid "missing argument"
+msgstr ""
+
+#: popt.c:895
+msgid "unknown option"
+msgstr ""
+
+#: popt.c:897
+msgid "mutually exclusive logical operations requested"
+msgstr ""
+
+#: popt.c:899
+msgid "aliases nested too deeply"
+msgstr ""
+
+#: popt.c:901
+msgid "error in paramter quoting"
+msgstr ""
+
+#: popt.c:903
+msgid "invalid numeric value"
+msgstr ""
+
+#: popt.c:905
+msgid "number too large or too small"
+msgstr ""
+
+#: popt.c:909
+msgid "unknown error"
+msgstr ""
+
 #: popthelp.c:28
 msgid "Show this help message"
 msgstr ""
@@ -21,3 +62,43 @@ msgstr ""
 #: popthelp.c:29
 msgid "Display brief usage message"
 msgstr ""
+
+#: popthelp.c:60
+msgid "NONE"
+msgstr ""
+
+#: popthelp.c:61
+msgid "VAL"
+msgstr ""
+
+#: popthelp.c:62
+msgid "INT"
+msgstr ""
+
+#: popthelp.c:63
+msgid "LONG"
+msgstr ""
+
+#: popthelp.c:64
+msgid "STRING"
+msgstr ""
+
+#: popthelp.c:65
+msgid "FLOAT"
+msgstr ""
+
+#: popthelp.c:66
+msgid "DOUBLE"
+msgstr ""
+
+#: popthelp.c:67
+msgid "ARG"
+msgstr ""
+
+#: popthelp.c:240
+msgid "Usage:"
+msgstr ""
+
+#: popthelp.c:259
+msgid "[OPTION...]"
+msgstr ""
diff --git a/po/es.po b/po/es.po
index 192688a..bcd9863 100644
--- a/po/es.po
+++ b/po/es.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.1\n"
-"POT-Creation-Date: 2001-01-01 17:42-0500\n"
+"POT-Creation-Date: 2001-01-15 16:14-0500\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -14,6 +14,47 @@ msgstr ""
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: ENCODING\n"
 
+#: popt.c:29
+msgid "unknown errno"
+msgstr ""
+
+#: popt.c:758
+#, c-format
+msgid "option type (%d) not implemented in popt\n"
+msgstr ""
+
+#: popt.c:893
+msgid "missing argument"
+msgstr ""
+
+#: popt.c:895
+msgid "unknown option"
+msgstr ""
+
+#: popt.c:897
+msgid "mutually exclusive logical operations requested"
+msgstr ""
+
+#: popt.c:899
+msgid "aliases nested too deeply"
+msgstr ""
+
+#: popt.c:901
+msgid "error in paramter quoting"
+msgstr ""
+
+#: popt.c:903
+msgid "invalid numeric value"
+msgstr ""
+
+#: popt.c:905
+msgid "number too large or too small"
+msgstr ""
+
+#: popt.c:909
+msgid "unknown error"
+msgstr ""
+
 #: popthelp.c:28
 msgid "Show this help message"
 msgstr ""
@@ -21,3 +62,43 @@ msgstr ""
 #: popthelp.c:29
 msgid "Display brief usage message"
 msgstr ""
+
+#: popthelp.c:60
+msgid "NONE"
+msgstr ""
+
+#: popthelp.c:61
+msgid "VAL"
+msgstr ""
+
+#: popthelp.c:62
+msgid "INT"
+msgstr ""
+
+#: popthelp.c:63
+msgid "LONG"
+msgstr ""
+
+#: popthelp.c:64
+msgid "STRING"
+msgstr ""
+
+#: popthelp.c:65
+msgid "FLOAT"
+msgstr ""
+
+#: popthelp.c:66
+msgid "DOUBLE"
+msgstr ""
+
+#: popthelp.c:67
+msgid "ARG"
+msgstr ""
+
+#: popthelp.c:240
+msgid "Usage:"
+msgstr ""
+
+#: popthelp.c:259
+msgid "[OPTION...]"
+msgstr ""
diff --git a/po/eu_ES.po b/po/eu_ES.po
index fc99ea7..41fef9e 100644
--- a/po/eu_ES.po
+++ b/po/eu_ES.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2001-01-01 18:27-0500\n"
+"POT-Creation-Date: 2001-01-15 16:14-0500\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -14,6 +14,47 @@ msgstr ""
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: ENCODING\n"
 
+#: popt.c:29
+msgid "unknown errno"
+msgstr ""
+
+#: popt.c:758
+#, c-format
+msgid "option type (%d) not implemented in popt\n"
+msgstr ""
+
+#: popt.c:893
+msgid "missing argument"
+msgstr ""
+
+#: popt.c:895
+msgid "unknown option"
+msgstr ""
+
+#: popt.c:897
+msgid "mutually exclusive logical operations requested"
+msgstr ""
+
+#: popt.c:899
+msgid "aliases nested too deeply"
+msgstr ""
+
+#: popt.c:901
+msgid "error in paramter quoting"
+msgstr ""
+
+#: popt.c:903
+msgid "invalid numeric value"
+msgstr ""
+
+#: popt.c:905
+msgid "number too large or too small"
+msgstr ""
+
+#: popt.c:909
+msgid "unknown error"
+msgstr ""
+
 #: popthelp.c:28
 msgid "Show this help message"
 msgstr ""
@@ -21,3 +62,43 @@ msgstr ""
 #: popthelp.c:29
 msgid "Display brief usage message"
 msgstr ""
+
+#: popthelp.c:60
+msgid "NONE"
+msgstr ""
+
+#: popthelp.c:61
+msgid "VAL"
+msgstr ""
+
+#: popthelp.c:62
+msgid "INT"
+msgstr ""
+
+#: popthelp.c:63
+msgid "LONG"
+msgstr ""
+
+#: popthelp.c:64
+msgid "STRING"
+msgstr ""
+
+#: popthelp.c:65
+msgid "FLOAT"
+msgstr ""
+
+#: popthelp.c:66
+msgid "DOUBLE"
+msgstr ""
+
+#: popthelp.c:67
+msgid "ARG"
+msgstr ""
+
+#: popthelp.c:240
+msgid "Usage:"
+msgstr ""
+
+#: popthelp.c:259
+msgid "[OPTION...]"
+msgstr ""
diff --git a/po/fi.po b/po/fi.po
index 192688a..bcd9863 100644
--- a/po/fi.po
+++ b/po/fi.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.1\n"
-"POT-Creation-Date: 2001-01-01 17:42-0500\n"
+"POT-Creation-Date: 2001-01-15 16:14-0500\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -14,6 +14,47 @@ msgstr ""
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: ENCODING\n"
 
+#: popt.c:29
+msgid "unknown errno"
+msgstr ""
+
+#: popt.c:758
+#, c-format
+msgid "option type (%d) not implemented in popt\n"
+msgstr ""
+
+#: popt.c:893
+msgid "missing argument"
+msgstr ""
+
+#: popt.c:895
+msgid "unknown option"
+msgstr ""
+
+#: popt.c:897
+msgid "mutually exclusive logical operations requested"
+msgstr ""
+
+#: popt.c:899
+msgid "aliases nested too deeply"
+msgstr ""
+
+#: popt.c:901
+msgid "error in paramter quoting"
+msgstr ""
+
+#: popt.c:903
+msgid "invalid numeric value"
+msgstr ""
+
+#: popt.c:905
+msgid "number too large or too small"
+msgstr ""
+
+#: popt.c:909
+msgid "unknown error"
+msgstr ""
+
 #: popthelp.c:28
 msgid "Show this help message"
 msgstr ""
@@ -21,3 +62,43 @@ msgstr ""
 #: popthelp.c:29
 msgid "Display brief usage message"
 msgstr ""
+
+#: popthelp.c:60
+msgid "NONE"
+msgstr ""
+
+#: popthelp.c:61
+msgid "VAL"
+msgstr ""
+
+#: popthelp.c:62
+msgid "INT"
+msgstr ""
+
+#: popthelp.c:63
+msgid "LONG"
+msgstr ""
+
+#: popthelp.c:64
+msgid "STRING"
+msgstr ""
+
+#: popthelp.c:65
+msgid "FLOAT"
+msgstr ""
+
+#: popthelp.c:66
+msgid "DOUBLE"
+msgstr ""
+
+#: popthelp.c:67
+msgid "ARG"
+msgstr ""
+
+#: popthelp.c:240
+msgid "Usage:"
+msgstr ""
+
+#: popthelp.c:259
+msgid "[OPTION...]"
+msgstr ""
diff --git a/po/fr.po b/po/fr.po
index 192688a..bcd9863 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.1\n"
-"POT-Creation-Date: 2001-01-01 17:42-0500\n"
+"POT-Creation-Date: 2001-01-15 16:14-0500\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -14,6 +14,47 @@ msgstr ""
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: ENCODING\n"
 
+#: popt.c:29
+msgid "unknown errno"
+msgstr ""
+
+#: popt.c:758
+#, c-format
+msgid "option type (%d) not implemented in popt\n"
+msgstr ""
+
+#: popt.c:893
+msgid "missing argument"
+msgstr ""
+
+#: popt.c:895
+msgid "unknown option"
+msgstr ""
+
+#: popt.c:897
+msgid "mutually exclusive logical operations requested"
+msgstr ""
+
+#: popt.c:899
+msgid "aliases nested too deeply"
+msgstr ""
+
+#: popt.c:901
+msgid "error in paramter quoting"
+msgstr ""
+
+#: popt.c:903
+msgid "invalid numeric value"
+msgstr ""
+
+#: popt.c:905
+msgid "number too large or too small"
+msgstr ""
+
+#: popt.c:909
+msgid "unknown error"
+msgstr ""
+
 #: popthelp.c:28
 msgid "Show this help message"
 msgstr ""
@@ -21,3 +62,43 @@ msgstr ""
 #: popthelp.c:29
 msgid "Display brief usage message"
 msgstr ""
+
+#: popthelp.c:60
+msgid "NONE"
+msgstr ""
+
+#: popthelp.c:61
+msgid "VAL"
+msgstr ""
+
+#: popthelp.c:62
+msgid "INT"
+msgstr ""
+
+#: popthelp.c:63
+msgid "LONG"
+msgstr ""
+
+#: popthelp.c:64
+msgid "STRING"
+msgstr ""
+
+#: popthelp.c:65
+msgid "FLOAT"
+msgstr ""
+
+#: popthelp.c:66
+msgid "DOUBLE"
+msgstr ""
+
+#: popthelp.c:67
+msgid "ARG"
+msgstr ""
+
+#: popthelp.c:240
+msgid "Usage:"
+msgstr ""
+
+#: popthelp.c:259
+msgid "[OPTION...]"
+msgstr ""
diff --git a/po/gl.po b/po/gl.po
index a6be50c..74f858f 100644
--- a/po/gl.po
+++ b/po/gl.po
@@ -10,7 +10,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.1\n"
-"POT-Creation-Date: 2001-01-01 17:42-0500\n"
+"POT-Creation-Date: 2001-01-15 16:14-0500\n"
 "PO-Revision-Date: 2000-01-06 20:31+0100\n"
 "Last-Translator: Jes�s Bravo �lvarez <jba@pobox.com>\n"
 "Language-Team: Galician <gpul-traduccion@ceu.fi.udc.es>\n"
@@ -18,6 +18,47 @@ msgstr ""
 "Content-Type: text/plain; charset=iso-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
 
+#: popt.c:29
+msgid "unknown errno"
+msgstr ""
+
+#: popt.c:758
+#, c-format
+msgid "option type (%d) not implemented in popt\n"
+msgstr ""
+
+#: popt.c:893
+msgid "missing argument"
+msgstr ""
+
+#: popt.c:895
+msgid "unknown option"
+msgstr ""
+
+#: popt.c:897
+msgid "mutually exclusive logical operations requested"
+msgstr ""
+
+#: popt.c:899
+msgid "aliases nested too deeply"
+msgstr ""
+
+#: popt.c:901
+msgid "error in paramter quoting"
+msgstr ""
+
+#: popt.c:903
+msgid "invalid numeric value"
+msgstr ""
+
+#: popt.c:905
+msgid "number too large or too small"
+msgstr ""
+
+#: popt.c:909
+msgid "unknown error"
+msgstr ""
+
 #: popthelp.c:28
 msgid "Show this help message"
 msgstr "Amosar esta mensaxe de axuda"
@@ -25,3 +66,43 @@ msgstr "Amosar esta mensaxe de axuda"
 #: popthelp.c:29
 msgid "Display brief usage message"
 msgstr "Amosar brevemente o xeito de utilizaci�n"
+
+#: popthelp.c:60
+msgid "NONE"
+msgstr ""
+
+#: popthelp.c:61
+msgid "VAL"
+msgstr ""
+
+#: popthelp.c:62
+msgid "INT"
+msgstr ""
+
+#: popthelp.c:63
+msgid "LONG"
+msgstr ""
+
+#: popthelp.c:64
+msgid "STRING"
+msgstr ""
+
+#: popthelp.c:65
+msgid "FLOAT"
+msgstr ""
+
+#: popthelp.c:66
+msgid "DOUBLE"
+msgstr ""
+
+#: popthelp.c:67
+msgid "ARG"
+msgstr ""
+
+#: popthelp.c:240
+msgid "Usage:"
+msgstr ""
+
+#: popthelp.c:259
+msgid "[OPTION...]"
+msgstr ""
diff --git a/po/hu.po b/po/hu.po
index bc2e388..fe6007b 100644
--- a/po/hu.po
+++ b/po/hu.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.1\n"
-"POT-Creation-Date: 2001-01-01 17:42-0500\n"
+"POT-Creation-Date: 2001-01-15 16:14-0500\n"
 "PO-Revision-Date: 2000-08-03 23:26+0200\n"
 "Last-Translator: L�szl� N�meth <nemeth@qwertynet.hu>\n"
 "Language-Team: Hungarian\n"
@@ -9,6 +9,47 @@ msgstr ""
 "Content-Type: text/plain; charset=ISO-8859-2\n"
 "Content-Transfer-Encoding: 8-bit\n"
 
+#: popt.c:29
+msgid "unknown errno"
+msgstr ""
+
+#: popt.c:758
+#, c-format
+msgid "option type (%d) not implemented in popt\n"
+msgstr ""
+
+#: popt.c:893
+msgid "missing argument"
+msgstr ""
+
+#: popt.c:895
+msgid "unknown option"
+msgstr ""
+
+#: popt.c:897
+msgid "mutually exclusive logical operations requested"
+msgstr ""
+
+#: popt.c:899
+msgid "aliases nested too deeply"
+msgstr ""
+
+#: popt.c:901
+msgid "error in paramter quoting"
+msgstr ""
+
+#: popt.c:903
+msgid "invalid numeric value"
+msgstr ""
+
+#: popt.c:905
+msgid "number too large or too small"
+msgstr ""
+
+#: popt.c:909
+msgid "unknown error"
+msgstr ""
+
 #: popthelp.c:28
 msgid "Show this help message"
 msgstr "E s�g� megjelen�t�se"
@@ -16,3 +57,43 @@ msgstr "E s
 #: popthelp.c:29
 msgid "Display brief usage message"
 msgstr "R�vid haszn�lati utas�t�s megjelen�t�se"
+
+#: popthelp.c:60
+msgid "NONE"
+msgstr ""
+
+#: popthelp.c:61
+msgid "VAL"
+msgstr ""
+
+#: popthelp.c:62
+msgid "INT"
+msgstr ""
+
+#: popthelp.c:63
+msgid "LONG"
+msgstr ""
+
+#: popthelp.c:64
+msgid "STRING"
+msgstr ""
+
+#: popthelp.c:65
+msgid "FLOAT"
+msgstr ""
+
+#: popthelp.c:66
+msgid "DOUBLE"
+msgstr ""
+
+#: popthelp.c:67
+msgid "ARG"
+msgstr ""
+
+#: popthelp.c:240
+msgid "Usage:"
+msgstr ""
+
+#: popthelp.c:259
+msgid "[OPTION...]"
+msgstr ""
diff --git a/po/id.po b/po/id.po
index 192688a..bcd9863 100644
--- a/po/id.po
+++ b/po/id.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.1\n"
-"POT-Creation-Date: 2001-01-01 17:42-0500\n"
+"POT-Creation-Date: 2001-01-15 16:14-0500\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -14,6 +14,47 @@ msgstr ""
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: ENCODING\n"
 
+#: popt.c:29
+msgid "unknown errno"
+msgstr ""
+
+#: popt.c:758
+#, c-format
+msgid "option type (%d) not implemented in popt\n"
+msgstr ""
+
+#: popt.c:893
+msgid "missing argument"
+msgstr ""
+
+#: popt.c:895
+msgid "unknown option"
+msgstr ""
+
+#: popt.c:897
+msgid "mutually exclusive logical operations requested"
+msgstr ""
+
+#: popt.c:899
+msgid "aliases nested too deeply"
+msgstr ""
+
+#: popt.c:901
+msgid "error in paramter quoting"
+msgstr ""
+
+#: popt.c:903
+msgid "invalid numeric value"
+msgstr ""
+
+#: popt.c:905
+msgid "number too large or too small"
+msgstr ""
+
+#: popt.c:909
+msgid "unknown error"
+msgstr ""
+
 #: popthelp.c:28
 msgid "Show this help message"
 msgstr ""
@@ -21,3 +62,43 @@ msgstr ""
 #: popthelp.c:29
 msgid "Display brief usage message"
 msgstr ""
+
+#: popthelp.c:60
+msgid "NONE"
+msgstr ""
+
+#: popthelp.c:61
+msgid "VAL"
+msgstr ""
+
+#: popthelp.c:62
+msgid "INT"
+msgstr ""
+
+#: popthelp.c:63
+msgid "LONG"
+msgstr ""
+
+#: popthelp.c:64
+msgid "STRING"
+msgstr ""
+
+#: popthelp.c:65
+msgid "FLOAT"
+msgstr ""
+
+#: popthelp.c:66
+msgid "DOUBLE"
+msgstr ""
+
+#: popthelp.c:67
+msgid "ARG"
+msgstr ""
+
+#: popthelp.c:240
+msgid "Usage:"
+msgstr ""
+
+#: popthelp.c:259
+msgid "[OPTION...]"
+msgstr ""
diff --git a/po/is.po b/po/is.po
index f4c93e7..301a1d5 100644
--- a/po/is.po
+++ b/po/is.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.1\n"
-"POT-Creation-Date: 2001-01-01 17:42-0500\n"
+"POT-Creation-Date: 2001-01-15 16:14-0500\n"
 "PO-Revision-Date: 2000-06-16 02:12+0000\n"
 "Last-Translator: Richard Allen <ra@hp.is>\n"
 "Language-Team: is <kde-isl@mmedia.is>\n"
@@ -9,6 +9,47 @@ msgstr ""
 "Content-Type: text/plain; charset=ISO-8859-1\n"
 "Content-Transfer-Encoding: 8-bit\n"
 
+#: popt.c:29
+msgid "unknown errno"
+msgstr ""
+
+#: popt.c:758
+#, c-format
+msgid "option type (%d) not implemented in popt\n"
+msgstr ""
+
+#: popt.c:893
+msgid "missing argument"
+msgstr ""
+
+#: popt.c:895
+msgid "unknown option"
+msgstr ""
+
+#: popt.c:897
+msgid "mutually exclusive logical operations requested"
+msgstr ""
+
+#: popt.c:899
+msgid "aliases nested too deeply"
+msgstr ""
+
+#: popt.c:901
+msgid "error in paramter quoting"
+msgstr ""
+
+#: popt.c:903
+msgid "invalid numeric value"
+msgstr ""
+
+#: popt.c:905
+msgid "number too large or too small"
+msgstr ""
+
+#: popt.c:909
+msgid "unknown error"
+msgstr ""
+
 #: popthelp.c:28
 msgid "Show this help message"
 msgstr "S�na �essa hj�lp"
@@ -16,3 +57,43 @@ msgstr "S
 #: popthelp.c:29
 msgid "Display brief usage message"
 msgstr "S�na stuttar notkunarlei�beiningar"
+
+#: popthelp.c:60
+msgid "NONE"
+msgstr ""
+
+#: popthelp.c:61
+msgid "VAL"
+msgstr ""
+
+#: popthelp.c:62
+msgid "INT"
+msgstr ""
+
+#: popthelp.c:63
+msgid "LONG"
+msgstr ""
+
+#: popthelp.c:64
+msgid "STRING"
+msgstr ""
+
+#: popthelp.c:65
+msgid "FLOAT"
+msgstr ""
+
+#: popthelp.c:66
+msgid "DOUBLE"
+msgstr ""
+
+#: popthelp.c:67
+msgid "ARG"
+msgstr ""
+
+#: popthelp.c:240
+msgid "Usage:"
+msgstr ""
+
+#: popthelp.c:259
+msgid "[OPTION...]"
+msgstr ""
diff --git a/po/it.po b/po/it.po
index 192688a..bcd9863 100644
--- a/po/it.po
+++ b/po/it.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.1\n"
-"POT-Creation-Date: 2001-01-01 17:42-0500\n"
+"POT-Creation-Date: 2001-01-15 16:14-0500\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -14,6 +14,47 @@ msgstr ""
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: ENCODING\n"
 
+#: popt.c:29
+msgid "unknown errno"
+msgstr ""
+
+#: popt.c:758
+#, c-format
+msgid "option type (%d) not implemented in popt\n"
+msgstr ""
+
+#: popt.c:893
+msgid "missing argument"
+msgstr ""
+
+#: popt.c:895
+msgid "unknown option"
+msgstr ""
+
+#: popt.c:897
+msgid "mutually exclusive logical operations requested"
+msgstr ""
+
+#: popt.c:899
+msgid "aliases nested too deeply"
+msgstr ""
+
+#: popt.c:901
+msgid "error in paramter quoting"
+msgstr ""
+
+#: popt.c:903
+msgid "invalid numeric value"
+msgstr ""
+
+#: popt.c:905
+msgid "number too large or too small"
+msgstr ""
+
+#: popt.c:909
+msgid "unknown error"
+msgstr ""
+
 #: popthelp.c:28
 msgid "Show this help message"
 msgstr ""
@@ -21,3 +62,43 @@ msgstr ""
 #: popthelp.c:29
 msgid "Display brief usage message"
 msgstr ""
+
+#: popthelp.c:60
+msgid "NONE"
+msgstr ""
+
+#: popthelp.c:61
+msgid "VAL"
+msgstr ""
+
+#: popthelp.c:62
+msgid "INT"
+msgstr ""
+
+#: popthelp.c:63
+msgid "LONG"
+msgstr ""
+
+#: popthelp.c:64
+msgid "STRING"
+msgstr ""
+
+#: popthelp.c:65
+msgid "FLOAT"
+msgstr ""
+
+#: popthelp.c:66
+msgid "DOUBLE"
+msgstr ""
+
+#: popthelp.c:67
+msgid "ARG"
+msgstr ""
+
+#: popthelp.c:240
+msgid "Usage:"
+msgstr ""
+
+#: popthelp.c:259
+msgid "[OPTION...]"
+msgstr ""
diff --git a/po/ja.po b/po/ja.po
index 192688a..bcd9863 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.1\n"
-"POT-Creation-Date: 2001-01-01 17:42-0500\n"
+"POT-Creation-Date: 2001-01-15 16:14-0500\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -14,6 +14,47 @@ msgstr ""
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: ENCODING\n"
 
+#: popt.c:29
+msgid "unknown errno"
+msgstr ""
+
+#: popt.c:758
+#, c-format
+msgid "option type (%d) not implemented in popt\n"
+msgstr ""
+
+#: popt.c:893
+msgid "missing argument"
+msgstr ""
+
+#: popt.c:895
+msgid "unknown option"
+msgstr ""
+
+#: popt.c:897
+msgid "mutually exclusive logical operations requested"
+msgstr ""
+
+#: popt.c:899
+msgid "aliases nested too deeply"
+msgstr ""
+
+#: popt.c:901
+msgid "error in paramter quoting"
+msgstr ""
+
+#: popt.c:903
+msgid "invalid numeric value"
+msgstr ""
+
+#: popt.c:905
+msgid "number too large or too small"
+msgstr ""
+
+#: popt.c:909
+msgid "unknown error"
+msgstr ""
+
 #: popthelp.c:28
 msgid "Show this help message"
 msgstr ""
@@ -21,3 +62,43 @@ msgstr ""
 #: popthelp.c:29
 msgid "Display brief usage message"
 msgstr ""
+
+#: popthelp.c:60
+msgid "NONE"
+msgstr ""
+
+#: popthelp.c:61
+msgid "VAL"
+msgstr ""
+
+#: popthelp.c:62
+msgid "INT"
+msgstr ""
+
+#: popthelp.c:63
+msgid "LONG"
+msgstr ""
+
+#: popthelp.c:64
+msgid "STRING"
+msgstr ""
+
+#: popthelp.c:65
+msgid "FLOAT"
+msgstr ""
+
+#: popthelp.c:66
+msgid "DOUBLE"
+msgstr ""
+
+#: popthelp.c:67
+msgid "ARG"
+msgstr ""
+
+#: popthelp.c:240
+msgid "Usage:"
+msgstr ""
+
+#: popthelp.c:259
+msgid "[OPTION...]"
+msgstr ""
diff --git a/po/ko.po b/po/ko.po
index 192688a..bcd9863 100644
--- a/po/ko.po
+++ b/po/ko.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.1\n"
-"POT-Creation-Date: 2001-01-01 17:42-0500\n"
+"POT-Creation-Date: 2001-01-15 16:14-0500\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -14,6 +14,47 @@ msgstr ""
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: ENCODING\n"
 
+#: popt.c:29
+msgid "unknown errno"
+msgstr ""
+
+#: popt.c:758
+#, c-format
+msgid "option type (%d) not implemented in popt\n"
+msgstr ""
+
+#: popt.c:893
+msgid "missing argument"
+msgstr ""
+
+#: popt.c:895
+msgid "unknown option"
+msgstr ""
+
+#: popt.c:897
+msgid "mutually exclusive logical operations requested"
+msgstr ""
+
+#: popt.c:899
+msgid "aliases nested too deeply"
+msgstr ""
+
+#: popt.c:901
+msgid "error in paramter quoting"
+msgstr ""
+
+#: popt.c:903
+msgid "invalid numeric value"
+msgstr ""
+
+#: popt.c:905
+msgid "number too large or too small"
+msgstr ""
+
+#: popt.c:909
+msgid "unknown error"
+msgstr ""
+
 #: popthelp.c:28
 msgid "Show this help message"
 msgstr ""
@@ -21,3 +62,43 @@ msgstr ""
 #: popthelp.c:29
 msgid "Display brief usage message"
 msgstr ""
+
+#: popthelp.c:60
+msgid "NONE"
+msgstr ""
+
+#: popthelp.c:61
+msgid "VAL"
+msgstr ""
+
+#: popthelp.c:62
+msgid "INT"
+msgstr ""
+
+#: popthelp.c:63
+msgid "LONG"
+msgstr ""
+
+#: popthelp.c:64
+msgid "STRING"
+msgstr ""
+
+#: popthelp.c:65
+msgid "FLOAT"
+msgstr ""
+
+#: popthelp.c:66
+msgid "DOUBLE"
+msgstr ""
+
+#: popthelp.c:67
+msgid "ARG"
+msgstr ""
+
+#: popthelp.c:240
+msgid "Usage:"
+msgstr ""
+
+#: popthelp.c:259
+msgid "[OPTION...]"
+msgstr ""
diff --git a/po/no.po b/po/no.po
index 25370fb..07a1cab 100644
--- a/po/no.po
+++ b/po/no.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.1\n"
-"POT-Creation-Date: 2001-01-01 17:42-0500\n"
+"POT-Creation-Date: 2001-01-15 16:14-0500\n"
 "PO-Revision-Date: 2000-06-21 16:11+02:00\n"
 "Last-Translator: Kjartan Maraas <kmaraas@online.no>\n"
 "Language-Team: Norwegian <no@li.org>\n"
@@ -9,6 +9,47 @@ msgstr ""
 "Content-Type: text/plain; charset=iso-8859-1\n"
 "Content-Transfer-Encoding: 8-bit\n"
 
+#: popt.c:29
+msgid "unknown errno"
+msgstr ""
+
+#: popt.c:758
+#, c-format
+msgid "option type (%d) not implemented in popt\n"
+msgstr ""
+
+#: popt.c:893
+msgid "missing argument"
+msgstr ""
+
+#: popt.c:895
+msgid "unknown option"
+msgstr ""
+
+#: popt.c:897
+msgid "mutually exclusive logical operations requested"
+msgstr ""
+
+#: popt.c:899
+msgid "aliases nested too deeply"
+msgstr ""
+
+#: popt.c:901
+msgid "error in paramter quoting"
+msgstr ""
+
+#: popt.c:903
+msgid "invalid numeric value"
+msgstr ""
+
+#: popt.c:905
+msgid "number too large or too small"
+msgstr ""
+
+#: popt.c:909
+msgid "unknown error"
+msgstr ""
+
 #: popthelp.c:28
 msgid "Show this help message"
 msgstr "Vis denne hjelpmeldingen"
@@ -16,3 +57,43 @@ msgstr "Vis denne hjelpmeldingen"
 #: popthelp.c:29
 msgid "Display brief usage message"
 msgstr "Vis kort bruksmelding"
+
+#: popthelp.c:60
+msgid "NONE"
+msgstr ""
+
+#: popthelp.c:61
+msgid "VAL"
+msgstr ""
+
+#: popthelp.c:62
+msgid "INT"
+msgstr ""
+
+#: popthelp.c:63
+msgid "LONG"
+msgstr ""
+
+#: popthelp.c:64
+msgid "STRING"
+msgstr ""
+
+#: popthelp.c:65
+msgid "FLOAT"
+msgstr ""
+
+#: popthelp.c:66
+msgid "DOUBLE"
+msgstr ""
+
+#: popthelp.c:67
+msgid "ARG"
+msgstr ""
+
+#: popthelp.c:240
+msgid "Usage:"
+msgstr ""
+
+#: popthelp.c:259
+msgid "[OPTION...]"
+msgstr ""
diff --git a/po/pl.po b/po/pl.po
index 192688a..bcd9863 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.1\n"
-"POT-Creation-Date: 2001-01-01 17:42-0500\n"
+"POT-Creation-Date: 2001-01-15 16:14-0500\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -14,6 +14,47 @@ msgstr ""
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: ENCODING\n"
 
+#: popt.c:29
+msgid "unknown errno"
+msgstr ""
+
+#: popt.c:758
+#, c-format
+msgid "option type (%d) not implemented in popt\n"
+msgstr ""
+
+#: popt.c:893
+msgid "missing argument"
+msgstr ""
+
+#: popt.c:895
+msgid "unknown option"
+msgstr ""
+
+#: popt.c:897
+msgid "mutually exclusive logical operations requested"
+msgstr ""
+
+#: popt.c:899
+msgid "aliases nested too deeply"
+msgstr ""
+
+#: popt.c:901
+msgid "error in paramter quoting"
+msgstr ""
+
+#: popt.c:903
+msgid "invalid numeric value"
+msgstr ""
+
+#: popt.c:905
+msgid "number too large or too small"
+msgstr ""
+
+#: popt.c:909
+msgid "unknown error"
+msgstr ""
+
 #: popthelp.c:28
 msgid "Show this help message"
 msgstr ""
@@ -21,3 +62,43 @@ msgstr ""
 #: popthelp.c:29
 msgid "Display brief usage message"
 msgstr ""
+
+#: popthelp.c:60
+msgid "NONE"
+msgstr ""
+
+#: popthelp.c:61
+msgid "VAL"
+msgstr ""
+
+#: popthelp.c:62
+msgid "INT"
+msgstr ""
+
+#: popthelp.c:63
+msgid "LONG"
+msgstr ""
+
+#: popthelp.c:64
+msgid "STRING"
+msgstr ""
+
+#: popthelp.c:65
+msgid "FLOAT"
+msgstr ""
+
+#: popthelp.c:66
+msgid "DOUBLE"
+msgstr ""
+
+#: popthelp.c:67
+msgid "ARG"
+msgstr ""
+
+#: popthelp.c:240
+msgid "Usage:"
+msgstr ""
+
+#: popthelp.c:259
+msgid "[OPTION...]"
+msgstr ""
diff --git a/po/popt.pot b/po/popt.pot
index 502a396..41fef9e 100644
--- a/po/popt.pot
+++ b/po/popt.pot
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2001-01-01 17:42-0500\n"
+"POT-Creation-Date: 2001-01-15 16:14-0500\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -14,6 +14,47 @@ msgstr ""
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: ENCODING\n"
 
+#: popt.c:29
+msgid "unknown errno"
+msgstr ""
+
+#: popt.c:758
+#, c-format
+msgid "option type (%d) not implemented in popt\n"
+msgstr ""
+
+#: popt.c:893
+msgid "missing argument"
+msgstr ""
+
+#: popt.c:895
+msgid "unknown option"
+msgstr ""
+
+#: popt.c:897
+msgid "mutually exclusive logical operations requested"
+msgstr ""
+
+#: popt.c:899
+msgid "aliases nested too deeply"
+msgstr ""
+
+#: popt.c:901
+msgid "error in paramter quoting"
+msgstr ""
+
+#: popt.c:903
+msgid "invalid numeric value"
+msgstr ""
+
+#: popt.c:905
+msgid "number too large or too small"
+msgstr ""
+
+#: popt.c:909
+msgid "unknown error"
+msgstr ""
+
 #: popthelp.c:28
 msgid "Show this help message"
 msgstr ""
@@ -21,3 +62,43 @@ msgstr ""
 #: popthelp.c:29
 msgid "Display brief usage message"
 msgstr ""
+
+#: popthelp.c:60
+msgid "NONE"
+msgstr ""
+
+#: popthelp.c:61
+msgid "VAL"
+msgstr ""
+
+#: popthelp.c:62
+msgid "INT"
+msgstr ""
+
+#: popthelp.c:63
+msgid "LONG"
+msgstr ""
+
+#: popthelp.c:64
+msgid "STRING"
+msgstr ""
+
+#: popthelp.c:65
+msgid "FLOAT"
+msgstr ""
+
+#: popthelp.c:66
+msgid "DOUBLE"
+msgstr ""
+
+#: popthelp.c:67
+msgid "ARG"
+msgstr ""
+
+#: popthelp.c:240
+msgid "Usage:"
+msgstr ""
+
+#: popthelp.c:259
+msgid "[OPTION...]"
+msgstr ""
diff --git a/po/pt.po b/po/pt.po
index 22fc2f4..44b2f4a 100644
--- a/po/pt.po
+++ b/po/pt.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.1\n"
-"POT-Creation-Date: 2001-01-01 17:42-0500\n"
+"POT-Creation-Date: 2001-01-15 16:14-0500\n"
 "PO-Revision-Date: 2000-06-22 01:02+01:00\n"
 "Last-Translator: Pedro Morais <morais@kde.org>\n"
 "Language-Team: pt <morais@kde.org>\n"
@@ -9,6 +9,47 @@ msgstr ""
 "Content-Type: text/plain; charset=iso-latin1\n"
 "Content-Transfer-Encoding: none\n"
 
+#: popt.c:29
+msgid "unknown errno"
+msgstr ""
+
+#: popt.c:758
+#, c-format
+msgid "option type (%d) not implemented in popt\n"
+msgstr ""
+
+#: popt.c:893
+msgid "missing argument"
+msgstr ""
+
+#: popt.c:895
+msgid "unknown option"
+msgstr ""
+
+#: popt.c:897
+msgid "mutually exclusive logical operations requested"
+msgstr ""
+
+#: popt.c:899
+msgid "aliases nested too deeply"
+msgstr ""
+
+#: popt.c:901
+msgid "error in paramter quoting"
+msgstr ""
+
+#: popt.c:903
+msgid "invalid numeric value"
+msgstr ""
+
+#: popt.c:905
+msgid "number too large or too small"
+msgstr ""
+
+#: popt.c:909
+msgid "unknown error"
+msgstr ""
+
 #: popthelp.c:28
 msgid "Show this help message"
 msgstr "Mostrar esta mensagem de ajuda"
@@ -16,3 +57,43 @@ msgstr "Mostrar esta mensagem de ajuda"
 #: popthelp.c:29
 msgid "Display brief usage message"
 msgstr "Mostrar uma mensagem de utiliza��o sucinta"
+
+#: popthelp.c:60
+msgid "NONE"
+msgstr ""
+
+#: popthelp.c:61
+msgid "VAL"
+msgstr ""
+
+#: popthelp.c:62
+msgid "INT"
+msgstr ""
+
+#: popthelp.c:63
+msgid "LONG"
+msgstr ""
+
+#: popthelp.c:64
+msgid "STRING"
+msgstr ""
+
+#: popthelp.c:65
+msgid "FLOAT"
+msgstr ""
+
+#: popthelp.c:66
+msgid "DOUBLE"
+msgstr ""
+
+#: popthelp.c:67
+msgid "ARG"
+msgstr ""
+
+#: popthelp.c:240
+msgid "Usage:"
+msgstr ""
+
+#: popthelp.c:259
+msgid "[OPTION...]"
+msgstr ""
diff --git a/po/pt_BR.po b/po/pt_BR.po
index 192688a..bcd9863 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.1\n"
-"POT-Creation-Date: 2001-01-01 17:42-0500\n"
+"POT-Creation-Date: 2001-01-15 16:14-0500\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -14,6 +14,47 @@ msgstr ""
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: ENCODING\n"
 
+#: popt.c:29
+msgid "unknown errno"
+msgstr ""
+
+#: popt.c:758
+#, c-format
+msgid "option type (%d) not implemented in popt\n"
+msgstr ""
+
+#: popt.c:893
+msgid "missing argument"
+msgstr ""
+
+#: popt.c:895
+msgid "unknown option"
+msgstr ""
+
+#: popt.c:897
+msgid "mutually exclusive logical operations requested"
+msgstr ""
+
+#: popt.c:899
+msgid "aliases nested too deeply"
+msgstr ""
+
+#: popt.c:901
+msgid "error in paramter quoting"
+msgstr ""
+
+#: popt.c:903
+msgid "invalid numeric value"
+msgstr ""
+
+#: popt.c:905
+msgid "number too large or too small"
+msgstr ""
+
+#: popt.c:909
+msgid "unknown error"
+msgstr ""
+
 #: popthelp.c:28
 msgid "Show this help message"
 msgstr ""
@@ -21,3 +62,43 @@ msgstr ""
 #: popthelp.c:29
 msgid "Display brief usage message"
 msgstr ""
+
+#: popthelp.c:60
+msgid "NONE"
+msgstr ""
+
+#: popthelp.c:61
+msgid "VAL"
+msgstr ""
+
+#: popthelp.c:62
+msgid "INT"
+msgstr ""
+
+#: popthelp.c:63
+msgid "LONG"
+msgstr ""
+
+#: popthelp.c:64
+msgid "STRING"
+msgstr ""
+
+#: popthelp.c:65
+msgid "FLOAT"
+msgstr ""
+
+#: popthelp.c:66
+msgid "DOUBLE"
+msgstr ""
+
+#: popthelp.c:67
+msgid "ARG"
+msgstr ""
+
+#: popthelp.c:240
+msgid "Usage:"
+msgstr ""
+
+#: popthelp.c:259
+msgid "[OPTION...]"
+msgstr ""
diff --git a/po/ro.po b/po/ro.po
index 03ade33..16be068 100644
--- a/po/ro.po
+++ b/po/ro.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.1\n"
-"POT-Creation-Date: 2001-01-01 17:42-0500\n"
+"POT-Creation-Date: 2001-01-15 16:14-0500\n"
 "PO-Revision-Date: 2000-06-14 23:23+EST\n"
 "Last-Translator: Cristian Gafton <gafton@redhat.com>\n"
 "Language-Team: Romanian <ro@li.org>\n"
@@ -9,6 +9,47 @@ msgstr ""
 "Content-Type: text/plain; charset=ISO-8859-2\n"
 "Content-Transfer-Encoding: 8bit\n"
 
+#: popt.c:29
+msgid "unknown errno"
+msgstr "eroare necunoscuta"
+
+#: popt.c:758
+#, c-format
+msgid "option type (%d) not implemented in popt\n"
+msgstr "optiunea de tipul (%d) nu este implementata in popt\n"
+
+#: popt.c:893
+msgid "missing argument"
+msgstr "argument lipsa"
+
+#: popt.c:895
+msgid "unknown option"
+msgstr "optiune necunoscuta"
+
+#: popt.c:897
+msgid "mutually exclusive logical operations requested"
+msgstr ""
+
+#: popt.c:899
+msgid "aliases nested too deeply"
+msgstr "recursivitate infinita la optiunile sinonime"
+
+#: popt.c:901
+msgid "error in paramter quoting"
+msgstr "eroare la insertie parametru"
+
+#: popt.c:903
+msgid "invalid numeric value"
+msgstr "valoare numarica invalida"
+
+#: popt.c:905
+msgid "number too large or too small"
+msgstr "numar prea mare sau prea mic"
+
+#: popt.c:909
+msgid "unknown error"
+msgstr "eroare necuinoscuta"
+
 #: popthelp.c:28
 msgid "Show this help message"
 msgstr "Afisare mesaj de help"
@@ -17,35 +58,42 @@ msgstr "Afisare mesaj de help"
 msgid "Display brief usage message"
 msgstr "Afisare mesaj sintaxa sumar"
 
-#~ msgid "unknown errno"
-#~ msgstr "eroare necunoscuta"
-
-#~ msgid "option type (%d) not implemented in popt\n"
-#~ msgstr "optiunea de tipul (%d) nu este implementata in popt\n"
+#: popthelp.c:60
+msgid "NONE"
+msgstr ""
 
-#~ msgid "missing argument"
-#~ msgstr "argument lipsa"
+#: popthelp.c:61
+msgid "VAL"
+msgstr ""
 
-#~ msgid "unknown option"
-#~ msgstr "optiune necunoscuta"
+#: popthelp.c:62
+msgid "INT"
+msgstr ""
 
-#~ msgid "aliases nested too deeply"
-#~ msgstr "recursivitate infinita la optiunile sinonime"
+#: popthelp.c:63
+msgid "LONG"
+msgstr ""
 
-#~ msgid "error in paramter quoting"
-#~ msgstr "eroare la insertie parametru"
+#: popthelp.c:64
+msgid "STRING"
+msgstr ""
 
-#~ msgid "invalid numeric value"
-#~ msgstr "valoare numarica invalida"
+#: popthelp.c:65
+msgid "FLOAT"
+msgstr ""
 
-#~ msgid "number too large or too small"
-#~ msgstr "numar prea mare sau prea mic"
+#: popthelp.c:66
+msgid "DOUBLE"
+msgstr ""
 
-#~ msgid "unknown error"
-#~ msgstr "eroare necuinoscuta"
+#: popthelp.c:67
+msgid "ARG"
+msgstr ""
 
-#~ msgid "Usage:"
-#~ msgstr "Sintaxa:"
+#: popthelp.c:240
+msgid "Usage:"
+msgstr "Sintaxa:"
 
-#~ msgid "[OPTION...]"
-#~ msgstr "[OPTIUNE...]"
+#: popthelp.c:259
+msgid "[OPTION...]"
+msgstr "[OPTIUNE...]"
diff --git a/po/ru.po b/po/ru.po
index 7820489..3452e83 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.1\n"
-"POT-Creation-Date: 2001-01-01 17:42-0500\n"
+"POT-Creation-Date: 2001-01-15 16:14-0500\n"
 "PO-Revision-Date: 2000-08-13 21:00+0300\n"
 "Last-Translator: Leon Kanter <leon@blackcatlinux.com>\n"
 "Language-Team: Black Cat Linux Team <blackcat-support@blackcatlinux.com>\n"
@@ -9,6 +9,47 @@ msgstr ""
 "Content-Type: text/plain; charset=koi8-r\n"
 "Content-Transfer-Encoding: 8bit\n"
 
+#: popt.c:29
+msgid "unknown errno"
+msgstr ""
+
+#: popt.c:758
+#, c-format
+msgid "option type (%d) not implemented in popt\n"
+msgstr ""
+
+#: popt.c:893
+msgid "missing argument"
+msgstr ""
+
+#: popt.c:895
+msgid "unknown option"
+msgstr ""
+
+#: popt.c:897
+msgid "mutually exclusive logical operations requested"
+msgstr ""
+
+#: popt.c:899
+msgid "aliases nested too deeply"
+msgstr ""
+
+#: popt.c:901
+msgid "error in paramter quoting"
+msgstr ""
+
+#: popt.c:903
+msgid "invalid numeric value"
+msgstr ""
+
+#: popt.c:905
+msgid "number too large or too small"
+msgstr ""
+
+#: popt.c:909
+msgid "unknown error"
+msgstr ""
+
 #: popthelp.c:28
 msgid "Show this help message"
 msgstr "�������� ��� ���������"
@@ -16,3 +57,43 @@ msgstr "
 #: popthelp.c:29
 msgid "Display brief usage message"
 msgstr "�������� ������� ���������� �� �������������"
+
+#: popthelp.c:60
+msgid "NONE"
+msgstr ""
+
+#: popthelp.c:61
+msgid "VAL"
+msgstr ""
+
+#: popthelp.c:62
+msgid "INT"
+msgstr ""
+
+#: popthelp.c:63
+msgid "LONG"
+msgstr ""
+
+#: popthelp.c:64
+msgid "STRING"
+msgstr ""
+
+#: popthelp.c:65
+msgid "FLOAT"
+msgstr ""
+
+#: popthelp.c:66
+msgid "DOUBLE"
+msgstr ""
+
+#: popthelp.c:67
+msgid "ARG"
+msgstr ""
+
+#: popthelp.c:240
+msgid "Usage:"
+msgstr ""
+
+#: popthelp.c:259
+msgid "[OPTION...]"
+msgstr ""
diff --git a/po/sk.po b/po/sk.po
index 9081bc8..469d0ea 100644
--- a/po/sk.po
+++ b/po/sk.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.1\n"
-"POT-Creation-Date: 2001-01-01 17:42-0500\n"
+"POT-Creation-Date: 2001-01-15 16:14-0500\n"
 "PO-Revision-Date: 1999-08-04 21:40+0200\n"
 "Last-Translator: Stanislav Meduna <stano@eunet.sk>\n"
 "Language-Team: Slovak <sk-i18n@rak.isternet.sk>\n"
@@ -13,6 +13,47 @@ msgstr ""
 "Content-Type: text/plain; charset=iso-8859-2\n"
 "Content-Transfer-Encoding: 8bit\n"
 
+#: popt.c:29
+msgid "unknown errno"
+msgstr ""
+
+#: popt.c:758
+#, c-format
+msgid "option type (%d) not implemented in popt\n"
+msgstr ""
+
+#: popt.c:893
+msgid "missing argument"
+msgstr ""
+
+#: popt.c:895
+msgid "unknown option"
+msgstr ""
+
+#: popt.c:897
+msgid "mutually exclusive logical operations requested"
+msgstr ""
+
+#: popt.c:899
+msgid "aliases nested too deeply"
+msgstr ""
+
+#: popt.c:901
+msgid "error in paramter quoting"
+msgstr ""
+
+#: popt.c:903
+msgid "invalid numeric value"
+msgstr ""
+
+#: popt.c:905
+msgid "number too large or too small"
+msgstr ""
+
+#: popt.c:909
+msgid "unknown error"
+msgstr ""
+
 #: popthelp.c:28
 msgid "Show this help message"
 msgstr "Vyp�sa� t�to spr�vu"
@@ -20,3 +61,43 @@ msgstr "Vyp
 #: popthelp.c:29
 msgid "Display brief usage message"
 msgstr "Zobrazi� stru�n� n�vod na pou�itie"
+
+#: popthelp.c:60
+msgid "NONE"
+msgstr ""
+
+#: popthelp.c:61
+msgid "VAL"
+msgstr ""
+
+#: popthelp.c:62
+msgid "INT"
+msgstr ""
+
+#: popthelp.c:63
+msgid "LONG"
+msgstr ""
+
+#: popthelp.c:64
+msgid "STRING"
+msgstr ""
+
+#: popthelp.c:65
+msgid "FLOAT"
+msgstr ""
+
+#: popthelp.c:66
+msgid "DOUBLE"
+msgstr ""
+
+#: popthelp.c:67
+msgid "ARG"
+msgstr ""
+
+#: popthelp.c:240
+msgid "Usage:"
+msgstr ""
+
+#: popthelp.c:259
+msgid "[OPTION...]"
+msgstr ""
diff --git a/po/sl.po b/po/sl.po
index 42e359b..e051310 100644
--- a/po/sl.po
+++ b/po/sl.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.1\n"
-"POT-Creation-Date: 2001-01-01 17:42-0500\n"
+"POT-Creation-Date: 2001-01-15 16:14-0500\n"
 "PO-Revision-Date: 2000-09-05 12:30+0200\n"
 "Last-Translator: Roman Maurer <roman.maurer@hermes.si>\n"
 "Language-Team: Slovenian <sl@li.org>\n"
@@ -9,6 +9,47 @@ msgstr ""
 "Content-Type: text/plain; charset=iso-8859-2\n"
 "Content-Transfer-Encoding: 8bit\n"
 
+#: popt.c:29
+msgid "unknown errno"
+msgstr ""
+
+#: popt.c:758
+#, c-format
+msgid "option type (%d) not implemented in popt\n"
+msgstr ""
+
+#: popt.c:893
+msgid "missing argument"
+msgstr ""
+
+#: popt.c:895
+msgid "unknown option"
+msgstr ""
+
+#: popt.c:897
+msgid "mutually exclusive logical operations requested"
+msgstr ""
+
+#: popt.c:899
+msgid "aliases nested too deeply"
+msgstr ""
+
+#: popt.c:901
+msgid "error in paramter quoting"
+msgstr ""
+
+#: popt.c:903
+msgid "invalid numeric value"
+msgstr ""
+
+#: popt.c:905
+msgid "number too large or too small"
+msgstr ""
+
+#: popt.c:909
+msgid "unknown error"
+msgstr ""
+
 #: popthelp.c:28
 msgid "Show this help message"
 msgstr "Prika�i to sporo�ilo s pomo�jo"
@@ -16,3 +57,43 @@ msgstr "Prika
 #: popthelp.c:29
 msgid "Display brief usage message"
 msgstr "Prika�i kratko sporo�ilo o uporabi"
+
+#: popthelp.c:60
+msgid "NONE"
+msgstr ""
+
+#: popthelp.c:61
+msgid "VAL"
+msgstr ""
+
+#: popthelp.c:62
+msgid "INT"
+msgstr ""
+
+#: popthelp.c:63
+msgid "LONG"
+msgstr ""
+
+#: popthelp.c:64
+msgid "STRING"
+msgstr ""
+
+#: popthelp.c:65
+msgid "FLOAT"
+msgstr ""
+
+#: popthelp.c:66
+msgid "DOUBLE"
+msgstr ""
+
+#: popthelp.c:67
+msgid "ARG"
+msgstr ""
+
+#: popthelp.c:240
+msgid "Usage:"
+msgstr ""
+
+#: popthelp.c:259
+msgid "[OPTION...]"
+msgstr ""
diff --git a/po/sr.po b/po/sr.po
index 192688a..bcd9863 100644
--- a/po/sr.po
+++ b/po/sr.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.1\n"
-"POT-Creation-Date: 2001-01-01 17:42-0500\n"
+"POT-Creation-Date: 2001-01-15 16:14-0500\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -14,6 +14,47 @@ msgstr ""
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: ENCODING\n"
 
+#: popt.c:29
+msgid "unknown errno"
+msgstr ""
+
+#: popt.c:758
+#, c-format
+msgid "option type (%d) not implemented in popt\n"
+msgstr ""
+
+#: popt.c:893
+msgid "missing argument"
+msgstr ""
+
+#: popt.c:895
+msgid "unknown option"
+msgstr ""
+
+#: popt.c:897
+msgid "mutually exclusive logical operations requested"
+msgstr ""
+
+#: popt.c:899
+msgid "aliases nested too deeply"
+msgstr ""
+
+#: popt.c:901
+msgid "error in paramter quoting"
+msgstr ""
+
+#: popt.c:903
+msgid "invalid numeric value"
+msgstr ""
+
+#: popt.c:905
+msgid "number too large or too small"
+msgstr ""
+
+#: popt.c:909
+msgid "unknown error"
+msgstr ""
+
 #: popthelp.c:28
 msgid "Show this help message"
 msgstr ""
@@ -21,3 +62,43 @@ msgstr ""
 #: popthelp.c:29
 msgid "Display brief usage message"
 msgstr ""
+
+#: popthelp.c:60
+msgid "NONE"
+msgstr ""
+
+#: popthelp.c:61
+msgid "VAL"
+msgstr ""
+
+#: popthelp.c:62
+msgid "INT"
+msgstr ""
+
+#: popthelp.c:63
+msgid "LONG"
+msgstr ""
+
+#: popthelp.c:64
+msgid "STRING"
+msgstr ""
+
+#: popthelp.c:65
+msgid "FLOAT"
+msgstr ""
+
+#: popthelp.c:66
+msgid "DOUBLE"
+msgstr ""
+
+#: popthelp.c:67
+msgid "ARG"
+msgstr ""
+
+#: popthelp.c:240
+msgid "Usage:"
+msgstr ""
+
+#: popthelp.c:259
+msgid "[OPTION...]"
+msgstr ""
diff --git a/po/sv.po b/po/sv.po
index b5bf6d3..647097a 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.1\n"
-"POT-Creation-Date: 2001-01-01 17:42-0500\n"
+"POT-Creation-Date: 2001-01-15 16:14-0500\n"
 "PO-Revision-Date: 2000-06-20 00:07+0200\n"
 "Last-Translator: Christian Rose <menthos@menthos.com>\n"
 "Language-Team: Swedish <sv@li.org>\n"
@@ -9,6 +9,47 @@ msgstr ""
 "Content-Type: text/plain; charset=ISO-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
 
+#: popt.c:29
+msgid "unknown errno"
+msgstr ""
+
+#: popt.c:758
+#, c-format
+msgid "option type (%d) not implemented in popt\n"
+msgstr ""
+
+#: popt.c:893
+msgid "missing argument"
+msgstr ""
+
+#: popt.c:895
+msgid "unknown option"
+msgstr ""
+
+#: popt.c:897
+msgid "mutually exclusive logical operations requested"
+msgstr ""
+
+#: popt.c:899
+msgid "aliases nested too deeply"
+msgstr ""
+
+#: popt.c:901
+msgid "error in paramter quoting"
+msgstr ""
+
+#: popt.c:903
+msgid "invalid numeric value"
+msgstr ""
+
+#: popt.c:905
+msgid "number too large or too small"
+msgstr ""
+
+#: popt.c:909
+msgid "unknown error"
+msgstr ""
+
 #: popthelp.c:28
 msgid "Show this help message"
 msgstr "Visa detta hj�lpmeddelande"
@@ -16,3 +57,43 @@ msgstr "Visa detta hj
 #: popthelp.c:29
 msgid "Display brief usage message"
 msgstr "Visa ett kortfattat anv�ndningsmeddelande"
+
+#: popthelp.c:60
+msgid "NONE"
+msgstr ""
+
+#: popthelp.c:61
+msgid "VAL"
+msgstr ""
+
+#: popthelp.c:62
+msgid "INT"
+msgstr ""
+
+#: popthelp.c:63
+msgid "LONG"
+msgstr ""
+
+#: popthelp.c:64
+msgid "STRING"
+msgstr ""
+
+#: popthelp.c:65
+msgid "FLOAT"
+msgstr ""
+
+#: popthelp.c:66
+msgid "DOUBLE"
+msgstr ""
+
+#: popthelp.c:67
+msgid "ARG"
+msgstr ""
+
+#: popthelp.c:240
+msgid "Usage:"
+msgstr ""
+
+#: popthelp.c:259
+msgid "[OPTION...]"
+msgstr ""
diff --git a/po/tr.po b/po/tr.po
index 700abc2..bc9d028 100644
--- a/po/tr.po
+++ b/po/tr.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.1\n"
-"POT-Creation-Date: 2001-01-01 17:42-0500\n"
+"POT-Creation-Date: 2001-01-15 16:14-0500\n"
 "PO-Revision-Date: 2000-01-06 13:01+0100\n"
 "Last-Translator: G�rkem �etin <kabalak@gmx.net>\n"
 "Language-Team: Gelecek A.� <gorkem@gelecek.com.tr>\n"
@@ -9,6 +9,47 @@ msgstr ""
 "Content-Type: text/plain; charset=iso8859-9\n"
 "Content-Transfer-Encoding: 8bit\n"
 
+#: popt.c:29
+msgid "unknown errno"
+msgstr ""
+
+#: popt.c:758
+#, c-format
+msgid "option type (%d) not implemented in popt\n"
+msgstr ""
+
+#: popt.c:893
+msgid "missing argument"
+msgstr ""
+
+#: popt.c:895
+msgid "unknown option"
+msgstr ""
+
+#: popt.c:897
+msgid "mutually exclusive logical operations requested"
+msgstr ""
+
+#: popt.c:899
+msgid "aliases nested too deeply"
+msgstr ""
+
+#: popt.c:901
+msgid "error in paramter quoting"
+msgstr ""
+
+#: popt.c:903
+msgid "invalid numeric value"
+msgstr ""
+
+#: popt.c:905
+msgid "number too large or too small"
+msgstr ""
+
+#: popt.c:909
+msgid "unknown error"
+msgstr ""
+
 #: popthelp.c:28
 msgid "Show this help message"
 msgstr "Bu yard�m iletisini g�sterir"
@@ -16,3 +57,43 @@ msgstr "Bu yard
 #: popthelp.c:29
 msgid "Display brief usage message"
 msgstr "K�sa bir kullan�m iletisi g�ster"
+
+#: popthelp.c:60
+msgid "NONE"
+msgstr ""
+
+#: popthelp.c:61
+msgid "VAL"
+msgstr ""
+
+#: popthelp.c:62
+msgid "INT"
+msgstr ""
+
+#: popthelp.c:63
+msgid "LONG"
+msgstr ""
+
+#: popthelp.c:64
+msgid "STRING"
+msgstr ""
+
+#: popthelp.c:65
+msgid "FLOAT"
+msgstr ""
+
+#: popthelp.c:66
+msgid "DOUBLE"
+msgstr ""
+
+#: popthelp.c:67
+msgid "ARG"
+msgstr ""
+
+#: popthelp.c:240
+msgid "Usage:"
+msgstr ""
+
+#: popthelp.c:259
+msgid "[OPTION...]"
+msgstr ""
diff --git a/po/uk.po b/po/uk.po
index 9d7f435..7617999 100644
--- a/po/uk.po
+++ b/po/uk.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.1\n"
-"POT-Creation-Date: 2001-01-01 17:42-0500\n"
+"POT-Creation-Date: 2001-01-15 16:14-0500\n"
 "PO-Revision-Date: 1999-09-30 16:54+0200\n"
 "Last-Translator: Yuri Syrota <rasta@renome.rovno.ua>\n"
 "Language-Team: Ukrainian <uk@li.org>\n"
@@ -13,6 +13,47 @@ msgstr ""
 "Content-Type: text/plain; charset=koi8-u\n"
 "Content-Transfer-Encoding: 8bit\n"
 
+#: popt.c:29
+msgid "unknown errno"
+msgstr ""
+
+#: popt.c:758
+#, c-format
+msgid "option type (%d) not implemented in popt\n"
+msgstr ""
+
+#: popt.c:893
+msgid "missing argument"
+msgstr ""
+
+#: popt.c:895
+msgid "unknown option"
+msgstr ""
+
+#: popt.c:897
+msgid "mutually exclusive logical operations requested"
+msgstr ""
+
+#: popt.c:899
+msgid "aliases nested too deeply"
+msgstr ""
+
+#: popt.c:901
+msgid "error in paramter quoting"
+msgstr ""
+
+#: popt.c:903
+msgid "invalid numeric value"
+msgstr ""
+
+#: popt.c:905
+msgid "number too large or too small"
+msgstr ""
+
+#: popt.c:909
+msgid "unknown error"
+msgstr ""
+
 #: popthelp.c:28
 msgid "Show this help message"
 msgstr "�������� �� ��צ���"
@@ -20,3 +61,43 @@ msgstr "
 #: popthelp.c:29
 msgid "Display brief usage message"
 msgstr "�������� ������� ��צ��� ��� ������������"
+
+#: popthelp.c:60
+msgid "NONE"
+msgstr ""
+
+#: popthelp.c:61
+msgid "VAL"
+msgstr ""
+
+#: popthelp.c:62
+msgid "INT"
+msgstr ""
+
+#: popthelp.c:63
+msgid "LONG"
+msgstr ""
+
+#: popthelp.c:64
+msgid "STRING"
+msgstr ""
+
+#: popthelp.c:65
+msgid "FLOAT"
+msgstr ""
+
+#: popthelp.c:66
+msgid "DOUBLE"
+msgstr ""
+
+#: popthelp.c:67
+msgid "ARG"
+msgstr ""
+
+#: popthelp.c:240
+msgid "Usage:"
+msgstr ""
+
+#: popthelp.c:259
+msgid "[OPTION...]"
+msgstr ""
diff --git a/po/wa.po b/po/wa.po
index 297f214..c0862a4 100644
--- a/po/wa.po
+++ b/po/wa.po
@@ -9,7 +9,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.1\n"
-"POT-Creation-Date: 2001-01-01 17:42-0500\n"
+"POT-Creation-Date: 2001-01-15 16:14-0500\n"
 "PO-Revision-Date: 1999-03-18 23:11+0100\n"
 "Last-Translator: Nobody yet\n"
 "Language-Team: walon <linux-wa@chanae.alphanet.ch>\n"
@@ -17,6 +17,47 @@ msgstr ""
 "Content-Type: text/plain; charset=iso-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
 
+#: popt.c:29
+msgid "unknown errno"
+msgstr ""
+
+#: popt.c:758
+#, c-format
+msgid "option type (%d) not implemented in popt\n"
+msgstr ""
+
+#: popt.c:893
+msgid "missing argument"
+msgstr ""
+
+#: popt.c:895
+msgid "unknown option"
+msgstr ""
+
+#: popt.c:897
+msgid "mutually exclusive logical operations requested"
+msgstr ""
+
+#: popt.c:899
+msgid "aliases nested too deeply"
+msgstr ""
+
+#: popt.c:901
+msgid "error in paramter quoting"
+msgstr ""
+
+#: popt.c:903
+msgid "invalid numeric value"
+msgstr ""
+
+#: popt.c:905
+msgid "number too large or too small"
+msgstr ""
+
+#: popt.c:909
+msgid "unknown error"
+msgstr ""
+
 #: popthelp.c:28
 msgid "Show this help message"
 msgstr "Mostrer ci messaedje d' aide chal"
@@ -24,3 +65,43 @@ msgstr "Mostrer ci messaedje d' aide chal"
 #: popthelp.c:29
 msgid "Display brief usage message"
 msgstr "Mostre on court messaedje so kmint vos � siervi"
+
+#: popthelp.c:60
+msgid "NONE"
+msgstr ""
+
+#: popthelp.c:61
+msgid "VAL"
+msgstr ""
+
+#: popthelp.c:62
+msgid "INT"
+msgstr ""
+
+#: popthelp.c:63
+msgid "LONG"
+msgstr ""
+
+#: popthelp.c:64
+msgid "STRING"
+msgstr ""
+
+#: popthelp.c:65
+msgid "FLOAT"
+msgstr ""
+
+#: popthelp.c:66
+msgid "DOUBLE"
+msgstr ""
+
+#: popthelp.c:67
+msgid "ARG"
+msgstr ""
+
+#: popthelp.c:240
+msgid "Usage:"
+msgstr ""
+
+#: popthelp.c:259
+msgid "[OPTION...]"
+msgstr ""
diff --git a/po/zh.po b/po/zh.po
index 192688a..bcd9863 100644
--- a/po/zh.po
+++ b/po/zh.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.1\n"
-"POT-Creation-Date: 2001-01-01 17:42-0500\n"
+"POT-Creation-Date: 2001-01-15 16:14-0500\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -14,6 +14,47 @@ msgstr ""
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: ENCODING\n"
 
+#: popt.c:29
+msgid "unknown errno"
+msgstr ""
+
+#: popt.c:758
+#, c-format
+msgid "option type (%d) not implemented in popt\n"
+msgstr ""
+
+#: popt.c:893
+msgid "missing argument"
+msgstr ""
+
+#: popt.c:895
+msgid "unknown option"
+msgstr ""
+
+#: popt.c:897
+msgid "mutually exclusive logical operations requested"
+msgstr ""
+
+#: popt.c:899
+msgid "aliases nested too deeply"
+msgstr ""
+
+#: popt.c:901
+msgid "error in paramter quoting"
+msgstr ""
+
+#: popt.c:903
+msgid "invalid numeric value"
+msgstr ""
+
+#: popt.c:905
+msgid "number too large or too small"
+msgstr ""
+
+#: popt.c:909
+msgid "unknown error"
+msgstr ""
+
 #: popthelp.c:28
 msgid "Show this help message"
 msgstr ""
@@ -21,3 +62,43 @@ msgstr ""
 #: popthelp.c:29
 msgid "Display brief usage message"
 msgstr ""
+
+#: popthelp.c:60
+msgid "NONE"
+msgstr ""
+
+#: popthelp.c:61
+msgid "VAL"
+msgstr ""
+
+#: popthelp.c:62
+msgid "INT"
+msgstr ""
+
+#: popthelp.c:63
+msgid "LONG"
+msgstr ""
+
+#: popthelp.c:64
+msgid "STRING"
+msgstr ""
+
+#: popthelp.c:65
+msgid "FLOAT"
+msgstr ""
+
+#: popthelp.c:66
+msgid "DOUBLE"
+msgstr ""
+
+#: popthelp.c:67
+msgid "ARG"
+msgstr ""
+
+#: popthelp.c:240
+msgid "Usage:"
+msgstr ""
+
+#: popthelp.c:259
+msgid "[OPTION...]"
+msgstr ""
diff --git a/po/zh_CN.GB2312.po b/po/zh_CN.GB2312.po
index 0a79484..19b83b9 100644
--- a/po/zh_CN.GB2312.po
+++ b/po/zh_CN.GB2312.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.1\n"
-"POT-Creation-Date: 2001-01-01 17:42-0500\n"
+"POT-Creation-Date: 2001-01-15 16:14-0500\n"
 "PO-Revision-Date: 1999-11-11 05:04+0800\n"
 "Last-Translator: Dillion Chen <dillon.chen@turbolinux.com.cn>\n"
 "Language-Team: TLDN\n"
@@ -9,6 +9,47 @@ msgstr ""
 "Content-Type: text/plain; charset=gb2312\n"
 "Content-Transfer-Encoding: 8bit\n"
 
+#: popt.c:29
+msgid "unknown errno"
+msgstr ""
+
+#: popt.c:758
+#, c-format
+msgid "option type (%d) not implemented in popt\n"
+msgstr ""
+
+#: popt.c:893
+msgid "missing argument"
+msgstr ""
+
+#: popt.c:895
+msgid "unknown option"
+msgstr ""
+
+#: popt.c:897
+msgid "mutually exclusive logical operations requested"
+msgstr ""
+
+#: popt.c:899
+msgid "aliases nested too deeply"
+msgstr ""
+
+#: popt.c:901
+msgid "error in paramter quoting"
+msgstr ""
+
+#: popt.c:903
+msgid "invalid numeric value"
+msgstr ""
+
+#: popt.c:905
+msgid "number too large or too small"
+msgstr ""
+
+#: popt.c:909
+msgid "unknown error"
+msgstr ""
+
 #: popthelp.c:28
 msgid "Show this help message"
 msgstr "��ʾ����������Ϣ"
@@ -16,3 +57,43 @@ msgstr "
 #: popthelp.c:29
 msgid "Display brief usage message"
 msgstr "��ʾ���ʹ����Ϣ"
+
+#: popthelp.c:60
+msgid "NONE"
+msgstr ""
+
+#: popthelp.c:61
+msgid "VAL"
+msgstr ""
+
+#: popthelp.c:62
+msgid "INT"
+msgstr ""
+
+#: popthelp.c:63
+msgid "LONG"
+msgstr ""
+
+#: popthelp.c:64
+msgid "STRING"
+msgstr ""
+
+#: popthelp.c:65
+msgid "FLOAT"
+msgstr ""
+
+#: popthelp.c:66
+msgid "DOUBLE"
+msgstr ""
+
+#: popthelp.c:67
+msgid "ARG"
+msgstr ""
+
+#: popthelp.c:240
+msgid "Usage:"
+msgstr ""
+
+#: popthelp.c:259
+msgid "[OPTION...]"
+msgstr ""
-- 
Gitee


From 91835b7290148cea0d3cc7b3a2ee3729591ad9db Mon Sep 17 00:00:00 2001
From: Jeff Johnson <n3npq@mac.com>
Date: Tue, 16 Jan 2001 12:54:00 +0000
Subject: [PATCH 291/667] Typo.

---
 popt.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/popt.c b/popt.c
index 15e3eee..168c46e 100644
--- a/popt.c
+++ b/popt.c
@@ -898,7 +898,7 @@ const char *const poptStrerror(const int error) {
       case POPT_ERROR_OPTSTOODEEP:
 	return POPT_("aliases nested too deeply");
       case POPT_ERROR_BADQUOTE:
-	return POPT_("error in paramter quoting");
+	return POPT_("error in parameter quoting");
       case POPT_ERROR_BADNUMBER:
 	return POPT_("invalid numeric value");
       case POPT_ERROR_OVERFLOW:
-- 
Gitee


From 19e6a565b56146466bf93edb5aa8bd5e398f6551 Mon Sep 17 00:00:00 2001
From: Jeff Johnson <n3npq@mac.com>
Date: Tue, 16 Jan 2001 17:34:09 +0000
Subject: [PATCH 292/667] - tsort prefers presentation order.

---
 po/cs.po           | 4 ++--
 po/da.po           | 4 ++--
 po/de.po           | 4 ++--
 po/es.po           | 4 ++--
 po/eu_ES.po        | 4 ++--
 po/fi.po           | 4 ++--
 po/fr.po           | 4 ++--
 po/gl.po           | 4 ++--
 po/hu.po           | 4 ++--
 po/id.po           | 4 ++--
 po/is.po           | 4 ++--
 po/it.po           | 4 ++--
 po/ja.po           | 4 ++--
 po/ko.po           | 4 ++--
 po/no.po           | 4 ++--
 po/pl.po           | 4 ++--
 po/popt.pot        | 4 ++--
 po/pt.po           | 4 ++--
 po/pt_BR.po        | 4 ++--
 po/ro.po           | 5 +++--
 po/ru.po           | 4 ++--
 po/sk.po           | 4 ++--
 po/sl.po           | 4 ++--
 po/sr.po           | 4 ++--
 po/sv.po           | 4 ++--
 po/tr.po           | 4 ++--
 po/uk.po           | 4 ++--
 po/wa.po           | 4 ++--
 po/zh.po           | 4 ++--
 po/zh_CN.GB2312.po | 4 ++--
 30 files changed, 61 insertions(+), 60 deletions(-)

diff --git a/po/cs.po b/po/cs.po
index f987102..a72177f 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.1\n"
-"POT-Creation-Date: 2001-01-15 16:14-0500\n"
+"POT-Creation-Date: 2001-01-16 08:53-0500\n"
 "PO-Revision-Date: 2000-08-23 22:24+0100\n"
 "Last-Translator: Milan Kerslager <milan.kerslager@spsselib.hiedu.cz>\n"
 "Language-Team: Czech <cs@li.org>\n"
@@ -35,7 +35,7 @@ msgid "aliases nested too deeply"
 msgstr ""
 
 #: popt.c:901
-msgid "error in paramter quoting"
+msgid "error in parameter quoting"
 msgstr ""
 
 #: popt.c:903
diff --git a/po/da.po b/po/da.po
index 0fbcf69..88255eb 100644
--- a/po/da.po
+++ b/po/da.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.1\n"
-"POT-Creation-Date: 2001-01-15 16:14-0500\n"
+"POT-Creation-Date: 2001-01-16 08:53-0500\n"
 "PO-Revision-Date: 2000-03-07 05:17+01:00\n"
 "Last-Translator: K. Christiansen <kenneth@gnu.org>\n"
 "Language-Team: Danish/Dansk <dansk@klid.dk>\n"
@@ -35,7 +35,7 @@ msgid "aliases nested too deeply"
 msgstr ""
 
 #: popt.c:901
-msgid "error in paramter quoting"
+msgid "error in parameter quoting"
 msgstr ""
 
 #: popt.c:903
diff --git a/po/de.po b/po/de.po
index bcd9863..5515081 100644
--- a/po/de.po
+++ b/po/de.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.1\n"
-"POT-Creation-Date: 2001-01-15 16:14-0500\n"
+"POT-Creation-Date: 2001-01-16 08:53-0500\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -40,7 +40,7 @@ msgid "aliases nested too deeply"
 msgstr ""
 
 #: popt.c:901
-msgid "error in paramter quoting"
+msgid "error in parameter quoting"
 msgstr ""
 
 #: popt.c:903
diff --git a/po/es.po b/po/es.po
index bcd9863..5515081 100644
--- a/po/es.po
+++ b/po/es.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.1\n"
-"POT-Creation-Date: 2001-01-15 16:14-0500\n"
+"POT-Creation-Date: 2001-01-16 08:53-0500\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -40,7 +40,7 @@ msgid "aliases nested too deeply"
 msgstr ""
 
 #: popt.c:901
-msgid "error in paramter quoting"
+msgid "error in parameter quoting"
 msgstr ""
 
 #: popt.c:903
diff --git a/po/eu_ES.po b/po/eu_ES.po
index 41fef9e..13907cd 100644
--- a/po/eu_ES.po
+++ b/po/eu_ES.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2001-01-15 16:14-0500\n"
+"POT-Creation-Date: 2001-01-16 08:53-0500\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -40,7 +40,7 @@ msgid "aliases nested too deeply"
 msgstr ""
 
 #: popt.c:901
-msgid "error in paramter quoting"
+msgid "error in parameter quoting"
 msgstr ""
 
 #: popt.c:903
diff --git a/po/fi.po b/po/fi.po
index bcd9863..5515081 100644
--- a/po/fi.po
+++ b/po/fi.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.1\n"
-"POT-Creation-Date: 2001-01-15 16:14-0500\n"
+"POT-Creation-Date: 2001-01-16 08:53-0500\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -40,7 +40,7 @@ msgid "aliases nested too deeply"
 msgstr ""
 
 #: popt.c:901
-msgid "error in paramter quoting"
+msgid "error in parameter quoting"
 msgstr ""
 
 #: popt.c:903
diff --git a/po/fr.po b/po/fr.po
index bcd9863..5515081 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.1\n"
-"POT-Creation-Date: 2001-01-15 16:14-0500\n"
+"POT-Creation-Date: 2001-01-16 08:53-0500\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -40,7 +40,7 @@ msgid "aliases nested too deeply"
 msgstr ""
 
 #: popt.c:901
-msgid "error in paramter quoting"
+msgid "error in parameter quoting"
 msgstr ""
 
 #: popt.c:903
diff --git a/po/gl.po b/po/gl.po
index 74f858f..39070c9 100644
--- a/po/gl.po
+++ b/po/gl.po
@@ -10,7 +10,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.1\n"
-"POT-Creation-Date: 2001-01-15 16:14-0500\n"
+"POT-Creation-Date: 2001-01-16 08:53-0500\n"
 "PO-Revision-Date: 2000-01-06 20:31+0100\n"
 "Last-Translator: Jes�s Bravo �lvarez <jba@pobox.com>\n"
 "Language-Team: Galician <gpul-traduccion@ceu.fi.udc.es>\n"
@@ -44,7 +44,7 @@ msgid "aliases nested too deeply"
 msgstr ""
 
 #: popt.c:901
-msgid "error in paramter quoting"
+msgid "error in parameter quoting"
 msgstr ""
 
 #: popt.c:903
diff --git a/po/hu.po b/po/hu.po
index fe6007b..ddeba47 100644
--- a/po/hu.po
+++ b/po/hu.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.1\n"
-"POT-Creation-Date: 2001-01-15 16:14-0500\n"
+"POT-Creation-Date: 2001-01-16 08:53-0500\n"
 "PO-Revision-Date: 2000-08-03 23:26+0200\n"
 "Last-Translator: L�szl� N�meth <nemeth@qwertynet.hu>\n"
 "Language-Team: Hungarian\n"
@@ -35,7 +35,7 @@ msgid "aliases nested too deeply"
 msgstr ""
 
 #: popt.c:901
-msgid "error in paramter quoting"
+msgid "error in parameter quoting"
 msgstr ""
 
 #: popt.c:903
diff --git a/po/id.po b/po/id.po
index bcd9863..5515081 100644
--- a/po/id.po
+++ b/po/id.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.1\n"
-"POT-Creation-Date: 2001-01-15 16:14-0500\n"
+"POT-Creation-Date: 2001-01-16 08:53-0500\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -40,7 +40,7 @@ msgid "aliases nested too deeply"
 msgstr ""
 
 #: popt.c:901
-msgid "error in paramter quoting"
+msgid "error in parameter quoting"
 msgstr ""
 
 #: popt.c:903
diff --git a/po/is.po b/po/is.po
index 301a1d5..b802904 100644
--- a/po/is.po
+++ b/po/is.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.1\n"
-"POT-Creation-Date: 2001-01-15 16:14-0500\n"
+"POT-Creation-Date: 2001-01-16 08:53-0500\n"
 "PO-Revision-Date: 2000-06-16 02:12+0000\n"
 "Last-Translator: Richard Allen <ra@hp.is>\n"
 "Language-Team: is <kde-isl@mmedia.is>\n"
@@ -35,7 +35,7 @@ msgid "aliases nested too deeply"
 msgstr ""
 
 #: popt.c:901
-msgid "error in paramter quoting"
+msgid "error in parameter quoting"
 msgstr ""
 
 #: popt.c:903
diff --git a/po/it.po b/po/it.po
index bcd9863..5515081 100644
--- a/po/it.po
+++ b/po/it.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.1\n"
-"POT-Creation-Date: 2001-01-15 16:14-0500\n"
+"POT-Creation-Date: 2001-01-16 08:53-0500\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -40,7 +40,7 @@ msgid "aliases nested too deeply"
 msgstr ""
 
 #: popt.c:901
-msgid "error in paramter quoting"
+msgid "error in parameter quoting"
 msgstr ""
 
 #: popt.c:903
diff --git a/po/ja.po b/po/ja.po
index bcd9863..5515081 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.1\n"
-"POT-Creation-Date: 2001-01-15 16:14-0500\n"
+"POT-Creation-Date: 2001-01-16 08:53-0500\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -40,7 +40,7 @@ msgid "aliases nested too deeply"
 msgstr ""
 
 #: popt.c:901
-msgid "error in paramter quoting"
+msgid "error in parameter quoting"
 msgstr ""
 
 #: popt.c:903
diff --git a/po/ko.po b/po/ko.po
index bcd9863..5515081 100644
--- a/po/ko.po
+++ b/po/ko.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.1\n"
-"POT-Creation-Date: 2001-01-15 16:14-0500\n"
+"POT-Creation-Date: 2001-01-16 08:53-0500\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -40,7 +40,7 @@ msgid "aliases nested too deeply"
 msgstr ""
 
 #: popt.c:901
-msgid "error in paramter quoting"
+msgid "error in parameter quoting"
 msgstr ""
 
 #: popt.c:903
diff --git a/po/no.po b/po/no.po
index 07a1cab..fbfb58a 100644
--- a/po/no.po
+++ b/po/no.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.1\n"
-"POT-Creation-Date: 2001-01-15 16:14-0500\n"
+"POT-Creation-Date: 2001-01-16 08:53-0500\n"
 "PO-Revision-Date: 2000-06-21 16:11+02:00\n"
 "Last-Translator: Kjartan Maraas <kmaraas@online.no>\n"
 "Language-Team: Norwegian <no@li.org>\n"
@@ -35,7 +35,7 @@ msgid "aliases nested too deeply"
 msgstr ""
 
 #: popt.c:901
-msgid "error in paramter quoting"
+msgid "error in parameter quoting"
 msgstr ""
 
 #: popt.c:903
diff --git a/po/pl.po b/po/pl.po
index bcd9863..5515081 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.1\n"
-"POT-Creation-Date: 2001-01-15 16:14-0500\n"
+"POT-Creation-Date: 2001-01-16 08:53-0500\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -40,7 +40,7 @@ msgid "aliases nested too deeply"
 msgstr ""
 
 #: popt.c:901
-msgid "error in paramter quoting"
+msgid "error in parameter quoting"
 msgstr ""
 
 #: popt.c:903
diff --git a/po/popt.pot b/po/popt.pot
index 41fef9e..13907cd 100644
--- a/po/popt.pot
+++ b/po/popt.pot
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2001-01-15 16:14-0500\n"
+"POT-Creation-Date: 2001-01-16 08:53-0500\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -40,7 +40,7 @@ msgid "aliases nested too deeply"
 msgstr ""
 
 #: popt.c:901
-msgid "error in paramter quoting"
+msgid "error in parameter quoting"
 msgstr ""
 
 #: popt.c:903
diff --git a/po/pt.po b/po/pt.po
index 44b2f4a..7af69fb 100644
--- a/po/pt.po
+++ b/po/pt.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.1\n"
-"POT-Creation-Date: 2001-01-15 16:14-0500\n"
+"POT-Creation-Date: 2001-01-16 08:53-0500\n"
 "PO-Revision-Date: 2000-06-22 01:02+01:00\n"
 "Last-Translator: Pedro Morais <morais@kde.org>\n"
 "Language-Team: pt <morais@kde.org>\n"
@@ -35,7 +35,7 @@ msgid "aliases nested too deeply"
 msgstr ""
 
 #: popt.c:901
-msgid "error in paramter quoting"
+msgid "error in parameter quoting"
 msgstr ""
 
 #: popt.c:903
diff --git a/po/pt_BR.po b/po/pt_BR.po
index bcd9863..5515081 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.1\n"
-"POT-Creation-Date: 2001-01-15 16:14-0500\n"
+"POT-Creation-Date: 2001-01-16 08:53-0500\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -40,7 +40,7 @@ msgid "aliases nested too deeply"
 msgstr ""
 
 #: popt.c:901
-msgid "error in paramter quoting"
+msgid "error in parameter quoting"
 msgstr ""
 
 #: popt.c:903
diff --git a/po/ro.po b/po/ro.po
index 16be068..b13575f 100644
--- a/po/ro.po
+++ b/po/ro.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.1\n"
-"POT-Creation-Date: 2001-01-15 16:14-0500\n"
+"POT-Creation-Date: 2001-01-16 08:53-0500\n"
 "PO-Revision-Date: 2000-06-14 23:23+EST\n"
 "Last-Translator: Cristian Gafton <gafton@redhat.com>\n"
 "Language-Team: Romanian <ro@li.org>\n"
@@ -35,7 +35,8 @@ msgid "aliases nested too deeply"
 msgstr "recursivitate infinita la optiunile sinonime"
 
 #: popt.c:901
-msgid "error in paramter quoting"
+#, fuzzy
+msgid "error in parameter quoting"
 msgstr "eroare la insertie parametru"
 
 #: popt.c:903
diff --git a/po/ru.po b/po/ru.po
index 3452e83..ff67982 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.1\n"
-"POT-Creation-Date: 2001-01-15 16:14-0500\n"
+"POT-Creation-Date: 2001-01-16 08:53-0500\n"
 "PO-Revision-Date: 2000-08-13 21:00+0300\n"
 "Last-Translator: Leon Kanter <leon@blackcatlinux.com>\n"
 "Language-Team: Black Cat Linux Team <blackcat-support@blackcatlinux.com>\n"
@@ -35,7 +35,7 @@ msgid "aliases nested too deeply"
 msgstr ""
 
 #: popt.c:901
-msgid "error in paramter quoting"
+msgid "error in parameter quoting"
 msgstr ""
 
 #: popt.c:903
diff --git a/po/sk.po b/po/sk.po
index 469d0ea..8903e2f 100644
--- a/po/sk.po
+++ b/po/sk.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.1\n"
-"POT-Creation-Date: 2001-01-15 16:14-0500\n"
+"POT-Creation-Date: 2001-01-16 08:53-0500\n"
 "PO-Revision-Date: 1999-08-04 21:40+0200\n"
 "Last-Translator: Stanislav Meduna <stano@eunet.sk>\n"
 "Language-Team: Slovak <sk-i18n@rak.isternet.sk>\n"
@@ -39,7 +39,7 @@ msgid "aliases nested too deeply"
 msgstr ""
 
 #: popt.c:901
-msgid "error in paramter quoting"
+msgid "error in parameter quoting"
 msgstr ""
 
 #: popt.c:903
diff --git a/po/sl.po b/po/sl.po
index e051310..949fcf2 100644
--- a/po/sl.po
+++ b/po/sl.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.1\n"
-"POT-Creation-Date: 2001-01-15 16:14-0500\n"
+"POT-Creation-Date: 2001-01-16 08:53-0500\n"
 "PO-Revision-Date: 2000-09-05 12:30+0200\n"
 "Last-Translator: Roman Maurer <roman.maurer@hermes.si>\n"
 "Language-Team: Slovenian <sl@li.org>\n"
@@ -35,7 +35,7 @@ msgid "aliases nested too deeply"
 msgstr ""
 
 #: popt.c:901
-msgid "error in paramter quoting"
+msgid "error in parameter quoting"
 msgstr ""
 
 #: popt.c:903
diff --git a/po/sr.po b/po/sr.po
index bcd9863..5515081 100644
--- a/po/sr.po
+++ b/po/sr.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.1\n"
-"POT-Creation-Date: 2001-01-15 16:14-0500\n"
+"POT-Creation-Date: 2001-01-16 08:53-0500\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -40,7 +40,7 @@ msgid "aliases nested too deeply"
 msgstr ""
 
 #: popt.c:901
-msgid "error in paramter quoting"
+msgid "error in parameter quoting"
 msgstr ""
 
 #: popt.c:903
diff --git a/po/sv.po b/po/sv.po
index 647097a..6b7627c 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.1\n"
-"POT-Creation-Date: 2001-01-15 16:14-0500\n"
+"POT-Creation-Date: 2001-01-16 08:53-0500\n"
 "PO-Revision-Date: 2000-06-20 00:07+0200\n"
 "Last-Translator: Christian Rose <menthos@menthos.com>\n"
 "Language-Team: Swedish <sv@li.org>\n"
@@ -35,7 +35,7 @@ msgid "aliases nested too deeply"
 msgstr ""
 
 #: popt.c:901
-msgid "error in paramter quoting"
+msgid "error in parameter quoting"
 msgstr ""
 
 #: popt.c:903
diff --git a/po/tr.po b/po/tr.po
index bc9d028..ece9fe8 100644
--- a/po/tr.po
+++ b/po/tr.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.1\n"
-"POT-Creation-Date: 2001-01-15 16:14-0500\n"
+"POT-Creation-Date: 2001-01-16 08:53-0500\n"
 "PO-Revision-Date: 2000-01-06 13:01+0100\n"
 "Last-Translator: G�rkem �etin <kabalak@gmx.net>\n"
 "Language-Team: Gelecek A.� <gorkem@gelecek.com.tr>\n"
@@ -35,7 +35,7 @@ msgid "aliases nested too deeply"
 msgstr ""
 
 #: popt.c:901
-msgid "error in paramter quoting"
+msgid "error in parameter quoting"
 msgstr ""
 
 #: popt.c:903
diff --git a/po/uk.po b/po/uk.po
index 7617999..3eeca5f 100644
--- a/po/uk.po
+++ b/po/uk.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.1\n"
-"POT-Creation-Date: 2001-01-15 16:14-0500\n"
+"POT-Creation-Date: 2001-01-16 08:53-0500\n"
 "PO-Revision-Date: 1999-09-30 16:54+0200\n"
 "Last-Translator: Yuri Syrota <rasta@renome.rovno.ua>\n"
 "Language-Team: Ukrainian <uk@li.org>\n"
@@ -39,7 +39,7 @@ msgid "aliases nested too deeply"
 msgstr ""
 
 #: popt.c:901
-msgid "error in paramter quoting"
+msgid "error in parameter quoting"
 msgstr ""
 
 #: popt.c:903
diff --git a/po/wa.po b/po/wa.po
index c0862a4..9c5595f 100644
--- a/po/wa.po
+++ b/po/wa.po
@@ -9,7 +9,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.1\n"
-"POT-Creation-Date: 2001-01-15 16:14-0500\n"
+"POT-Creation-Date: 2001-01-16 08:53-0500\n"
 "PO-Revision-Date: 1999-03-18 23:11+0100\n"
 "Last-Translator: Nobody yet\n"
 "Language-Team: walon <linux-wa@chanae.alphanet.ch>\n"
@@ -43,7 +43,7 @@ msgid "aliases nested too deeply"
 msgstr ""
 
 #: popt.c:901
-msgid "error in paramter quoting"
+msgid "error in parameter quoting"
 msgstr ""
 
 #: popt.c:903
diff --git a/po/zh.po b/po/zh.po
index bcd9863..5515081 100644
--- a/po/zh.po
+++ b/po/zh.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.1\n"
-"POT-Creation-Date: 2001-01-15 16:14-0500\n"
+"POT-Creation-Date: 2001-01-16 08:53-0500\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -40,7 +40,7 @@ msgid "aliases nested too deeply"
 msgstr ""
 
 #: popt.c:901
-msgid "error in paramter quoting"
+msgid "error in parameter quoting"
 msgstr ""
 
 #: popt.c:903
diff --git a/po/zh_CN.GB2312.po b/po/zh_CN.GB2312.po
index 19b83b9..1268eed 100644
--- a/po/zh_CN.GB2312.po
+++ b/po/zh_CN.GB2312.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.1\n"
-"POT-Creation-Date: 2001-01-15 16:14-0500\n"
+"POT-Creation-Date: 2001-01-16 08:53-0500\n"
 "PO-Revision-Date: 1999-11-11 05:04+0800\n"
 "Last-Translator: Dillion Chen <dillon.chen@turbolinux.com.cn>\n"
 "Language-Team: TLDN\n"
@@ -35,7 +35,7 @@ msgid "aliases nested too deeply"
 msgstr ""
 
 #: popt.c:901
-msgid "error in paramter quoting"
+msgid "error in parameter quoting"
 msgstr ""
 
 #: popt.c:903
-- 
Gitee


From 120746b61138fe46ebf6d1d55694172f1cf62e1d Mon Sep 17 00:00:00 2001
From: Jeff Johnson <n3npq@mac.com>
Date: Fri, 19 Jan 2001 01:38:59 +0000
Subject: [PATCH 293/667] - fix: insure that %lang scopes over hard links
 correctly. - fix: rpmCleanPath was nibbling at .. in macrofiles incorrectly.

---
 configure.in | 2 +-
 popt.spec    | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/configure.in b/configure.in
index 02f54eb..7b4137e 100755
--- a/configure.in
+++ b/configure.in
@@ -2,7 +2,7 @@ AC_INIT(popt.h)
 AM_CONFIG_HEADER(config.h)
 AC_PREREQ(2.12)
 AC_CANONICAL_SYSTEM
-AM_INIT_AUTOMAKE(popt, 1.7)
+AM_INIT_AUTOMAKE(popt, 1.6.2)
 ALL_LINGUAS="cs da de es eu_ES fi fr gl hu id is it ja ko no pl pt pt_BR ro ru sk sl sr sv tr uk wa zh zh_CN.GB2312"
 
 AC_ISC_POSIX
diff --git a/popt.spec b/popt.spec
index 5c23295..faf6191 100644
--- a/popt.spec
+++ b/popt.spec
@@ -4,7 +4,7 @@
 #
 Summary: A C library for parsing command line parameters.
 Name: popt
-Version: 1.6.1
+Version: 1.6.2
 Release: 0.1
 Copyright: X Consortium
 Group: System Environment/Libraries
-- 
Gitee


From 7ed0a9249e33668b995b546a6ccfbc122f5d3c1b Mon Sep 17 00:00:00 2001
From: Jeff Johnson <n3npq@mac.com>
Date: Wed, 7 Feb 2001 17:57:10 +0000
Subject: [PATCH 294/667] Update location of sources.

---
 popt.3 | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/popt.3 b/popt.3
index 0d9e0b0..5928b2a 100644
--- a/popt.3
+++ b/popt.3
@@ -79,8 +79,8 @@ short option from its arguments; either a space or an = separates a long
 option from an argument. 
 .sp
 The popt library is highly portable and should work on any POSIX 
-platform.  The latest version is always available from: 
-ftp://ftp.redhat.com/pub/redhat/code/popt.
+platform.  The latest version is distributed with rpm and is always available
+from: ftp://ftp.rpm.org/pub/rpm/dist.
 .sp
 It may be redistributed under either the GNU General Public License 
 or the GNU Library General Public License, at the distributor's discretion.
-- 
Gitee


From 6a02d2d69fe596f9503755e4fd63ee01854c376f Mon Sep 17 00:00:00 2001
From: Jeff Johnson <n3npq@mac.com>
Date: Fri, 9 Feb 2001 20:58:37 +0000
Subject: [PATCH 295/667] fix: make a copy of retrieved header before loading.
 handle out-of-sync hardlinks as sub-state, don't save the file name. fix: on
 build, was broke, add --fsmdebug as well.

---
 po/popt.pot | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/po/popt.pot b/po/popt.pot
index 13907cd..a90e3c1 100644
--- a/po/popt.pot
+++ b/po/popt.pot
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2001-01-16 08:53-0500\n"
+"POT-Creation-Date: 2001-02-09 10:46-0500\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
-- 
Gitee


From 5c80ebc83b14b45f6dd84e814f40bbf5562bf5ba Mon Sep 17 00:00:00 2001
From: Jeff Johnson <n3npq@mac.com>
Date: Tue, 27 Feb 2001 21:30:39 +0000
Subject: [PATCH 296/667] Handle non-string tag indices correctly. Sync with
 rpm-4.0.2.

---
 po/cs.po           |  2 +-
 po/da.po           |  2 +-
 po/de.po           |  2 +-
 po/es.po           |  2 +-
 po/eu_ES.po        |  2 +-
 po/fi.po           |  2 +-
 po/fr.po           |  2 +-
 po/gl.po           |  2 +-
 po/hu.po           |  2 +-
 po/id.po           |  2 +-
 po/is.po           |  2 +-
 po/it.po           |  2 +-
 po/ja.po           |  2 +-
 po/ko.po           |  2 +-
 po/no.po           |  2 +-
 po/pl.po           |  2 +-
 po/popt.pot        |  6 +++---
 po/pt.po           |  2 +-
 po/pt_BR.po        |  2 +-
 po/ro.po           |  2 +-
 po/ru.po           |  2 +-
 po/sk.po           |  2 +-
 po/sl.po           |  2 +-
 po/sr.po           |  2 +-
 po/sv.po           |  2 +-
 po/tr.po           |  2 +-
 po/uk.po           |  2 +-
 po/wa.po           |  2 +-
 po/zh.po           |  2 +-
 po/zh_CN.GB2312.po |  2 +-
 popthelp.c         | 41 +++++++++++++++++++++--------------------
 31 files changed, 53 insertions(+), 52 deletions(-)

diff --git a/po/cs.po b/po/cs.po
index a72177f..a3edc24 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.1\n"
-"POT-Creation-Date: 2001-01-16 08:53-0500\n"
+"POT-Creation-Date: 2001-02-09 10:46-0500\n"
 "PO-Revision-Date: 2000-08-23 22:24+0100\n"
 "Last-Translator: Milan Kerslager <milan.kerslager@spsselib.hiedu.cz>\n"
 "Language-Team: Czech <cs@li.org>\n"
diff --git a/po/da.po b/po/da.po
index 88255eb..9e2db83 100644
--- a/po/da.po
+++ b/po/da.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.1\n"
-"POT-Creation-Date: 2001-01-16 08:53-0500\n"
+"POT-Creation-Date: 2001-02-09 10:46-0500\n"
 "PO-Revision-Date: 2000-03-07 05:17+01:00\n"
 "Last-Translator: K. Christiansen <kenneth@gnu.org>\n"
 "Language-Team: Danish/Dansk <dansk@klid.dk>\n"
diff --git a/po/de.po b/po/de.po
index 5515081..f810615 100644
--- a/po/de.po
+++ b/po/de.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.1\n"
-"POT-Creation-Date: 2001-01-16 08:53-0500\n"
+"POT-Creation-Date: 2001-02-09 10:46-0500\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/po/es.po b/po/es.po
index 5515081..f810615 100644
--- a/po/es.po
+++ b/po/es.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.1\n"
-"POT-Creation-Date: 2001-01-16 08:53-0500\n"
+"POT-Creation-Date: 2001-02-09 10:46-0500\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/po/eu_ES.po b/po/eu_ES.po
index 13907cd..a90e3c1 100644
--- a/po/eu_ES.po
+++ b/po/eu_ES.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2001-01-16 08:53-0500\n"
+"POT-Creation-Date: 2001-02-09 10:46-0500\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/po/fi.po b/po/fi.po
index 5515081..f810615 100644
--- a/po/fi.po
+++ b/po/fi.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.1\n"
-"POT-Creation-Date: 2001-01-16 08:53-0500\n"
+"POT-Creation-Date: 2001-02-09 10:46-0500\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/po/fr.po b/po/fr.po
index 5515081..f810615 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.1\n"
-"POT-Creation-Date: 2001-01-16 08:53-0500\n"
+"POT-Creation-Date: 2001-02-09 10:46-0500\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/po/gl.po b/po/gl.po
index 39070c9..e0b0b4d 100644
--- a/po/gl.po
+++ b/po/gl.po
@@ -10,7 +10,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.1\n"
-"POT-Creation-Date: 2001-01-16 08:53-0500\n"
+"POT-Creation-Date: 2001-02-09 10:46-0500\n"
 "PO-Revision-Date: 2000-01-06 20:31+0100\n"
 "Last-Translator: Jes�s Bravo �lvarez <jba@pobox.com>\n"
 "Language-Team: Galician <gpul-traduccion@ceu.fi.udc.es>\n"
diff --git a/po/hu.po b/po/hu.po
index ddeba47..267ed76 100644
--- a/po/hu.po
+++ b/po/hu.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.1\n"
-"POT-Creation-Date: 2001-01-16 08:53-0500\n"
+"POT-Creation-Date: 2001-02-09 10:46-0500\n"
 "PO-Revision-Date: 2000-08-03 23:26+0200\n"
 "Last-Translator: L�szl� N�meth <nemeth@qwertynet.hu>\n"
 "Language-Team: Hungarian\n"
diff --git a/po/id.po b/po/id.po
index 5515081..f810615 100644
--- a/po/id.po
+++ b/po/id.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.1\n"
-"POT-Creation-Date: 2001-01-16 08:53-0500\n"
+"POT-Creation-Date: 2001-02-09 10:46-0500\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/po/is.po b/po/is.po
index b802904..9005a7d 100644
--- a/po/is.po
+++ b/po/is.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.1\n"
-"POT-Creation-Date: 2001-01-16 08:53-0500\n"
+"POT-Creation-Date: 2001-02-09 10:46-0500\n"
 "PO-Revision-Date: 2000-06-16 02:12+0000\n"
 "Last-Translator: Richard Allen <ra@hp.is>\n"
 "Language-Team: is <kde-isl@mmedia.is>\n"
diff --git a/po/it.po b/po/it.po
index 5515081..f810615 100644
--- a/po/it.po
+++ b/po/it.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.1\n"
-"POT-Creation-Date: 2001-01-16 08:53-0500\n"
+"POT-Creation-Date: 2001-02-09 10:46-0500\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/po/ja.po b/po/ja.po
index 5515081..f810615 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.1\n"
-"POT-Creation-Date: 2001-01-16 08:53-0500\n"
+"POT-Creation-Date: 2001-02-09 10:46-0500\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/po/ko.po b/po/ko.po
index 5515081..f810615 100644
--- a/po/ko.po
+++ b/po/ko.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.1\n"
-"POT-Creation-Date: 2001-01-16 08:53-0500\n"
+"POT-Creation-Date: 2001-02-09 10:46-0500\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/po/no.po b/po/no.po
index fbfb58a..004f9b6 100644
--- a/po/no.po
+++ b/po/no.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.1\n"
-"POT-Creation-Date: 2001-01-16 08:53-0500\n"
+"POT-Creation-Date: 2001-02-09 10:46-0500\n"
 "PO-Revision-Date: 2000-06-21 16:11+02:00\n"
 "Last-Translator: Kjartan Maraas <kmaraas@online.no>\n"
 "Language-Team: Norwegian <no@li.org>\n"
diff --git a/po/pl.po b/po/pl.po
index 5515081..f810615 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.1\n"
-"POT-Creation-Date: 2001-01-16 08:53-0500\n"
+"POT-Creation-Date: 2001-02-09 10:46-0500\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/po/popt.pot b/po/popt.pot
index a90e3c1..3687099 100644
--- a/po/popt.pot
+++ b/po/popt.pot
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2001-02-09 10:46-0500\n"
+"POT-Creation-Date: 2001-02-22 17:41-0500\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -95,10 +95,10 @@ msgstr ""
 msgid "ARG"
 msgstr ""
 
-#: popthelp.c:240
+#: popthelp.c:241
 msgid "Usage:"
 msgstr ""
 
-#: popthelp.c:259
+#: popthelp.c:260
 msgid "[OPTION...]"
 msgstr ""
diff --git a/po/pt.po b/po/pt.po
index 7af69fb..83edf25 100644
--- a/po/pt.po
+++ b/po/pt.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.1\n"
-"POT-Creation-Date: 2001-01-16 08:53-0500\n"
+"POT-Creation-Date: 2001-02-09 10:46-0500\n"
 "PO-Revision-Date: 2000-06-22 01:02+01:00\n"
 "Last-Translator: Pedro Morais <morais@kde.org>\n"
 "Language-Team: pt <morais@kde.org>\n"
diff --git a/po/pt_BR.po b/po/pt_BR.po
index 5515081..f810615 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.1\n"
-"POT-Creation-Date: 2001-01-16 08:53-0500\n"
+"POT-Creation-Date: 2001-02-09 10:46-0500\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/po/ro.po b/po/ro.po
index b13575f..2f2bf37 100644
--- a/po/ro.po
+++ b/po/ro.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.1\n"
-"POT-Creation-Date: 2001-01-16 08:53-0500\n"
+"POT-Creation-Date: 2001-02-09 10:46-0500\n"
 "PO-Revision-Date: 2000-06-14 23:23+EST\n"
 "Last-Translator: Cristian Gafton <gafton@redhat.com>\n"
 "Language-Team: Romanian <ro@li.org>\n"
diff --git a/po/ru.po b/po/ru.po
index ff67982..3cffcd4 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.1\n"
-"POT-Creation-Date: 2001-01-16 08:53-0500\n"
+"POT-Creation-Date: 2001-02-09 10:46-0500\n"
 "PO-Revision-Date: 2000-08-13 21:00+0300\n"
 "Last-Translator: Leon Kanter <leon@blackcatlinux.com>\n"
 "Language-Team: Black Cat Linux Team <blackcat-support@blackcatlinux.com>\n"
diff --git a/po/sk.po b/po/sk.po
index 8903e2f..b92dff2 100644
--- a/po/sk.po
+++ b/po/sk.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.1\n"
-"POT-Creation-Date: 2001-01-16 08:53-0500\n"
+"POT-Creation-Date: 2001-02-09 10:46-0500\n"
 "PO-Revision-Date: 1999-08-04 21:40+0200\n"
 "Last-Translator: Stanislav Meduna <stano@eunet.sk>\n"
 "Language-Team: Slovak <sk-i18n@rak.isternet.sk>\n"
diff --git a/po/sl.po b/po/sl.po
index 949fcf2..6171f37 100644
--- a/po/sl.po
+++ b/po/sl.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.1\n"
-"POT-Creation-Date: 2001-01-16 08:53-0500\n"
+"POT-Creation-Date: 2001-02-09 10:46-0500\n"
 "PO-Revision-Date: 2000-09-05 12:30+0200\n"
 "Last-Translator: Roman Maurer <roman.maurer@hermes.si>\n"
 "Language-Team: Slovenian <sl@li.org>\n"
diff --git a/po/sr.po b/po/sr.po
index 5515081..f810615 100644
--- a/po/sr.po
+++ b/po/sr.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.1\n"
-"POT-Creation-Date: 2001-01-16 08:53-0500\n"
+"POT-Creation-Date: 2001-02-09 10:46-0500\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/po/sv.po b/po/sv.po
index 6b7627c..da6b310 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.1\n"
-"POT-Creation-Date: 2001-01-16 08:53-0500\n"
+"POT-Creation-Date: 2001-02-09 10:46-0500\n"
 "PO-Revision-Date: 2000-06-20 00:07+0200\n"
 "Last-Translator: Christian Rose <menthos@menthos.com>\n"
 "Language-Team: Swedish <sv@li.org>\n"
diff --git a/po/tr.po b/po/tr.po
index ece9fe8..d425349 100644
--- a/po/tr.po
+++ b/po/tr.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.1\n"
-"POT-Creation-Date: 2001-01-16 08:53-0500\n"
+"POT-Creation-Date: 2001-02-09 10:46-0500\n"
 "PO-Revision-Date: 2000-01-06 13:01+0100\n"
 "Last-Translator: G�rkem �etin <kabalak@gmx.net>\n"
 "Language-Team: Gelecek A.� <gorkem@gelecek.com.tr>\n"
diff --git a/po/uk.po b/po/uk.po
index 3eeca5f..6ce797f 100644
--- a/po/uk.po
+++ b/po/uk.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.1\n"
-"POT-Creation-Date: 2001-01-16 08:53-0500\n"
+"POT-Creation-Date: 2001-02-09 10:46-0500\n"
 "PO-Revision-Date: 1999-09-30 16:54+0200\n"
 "Last-Translator: Yuri Syrota <rasta@renome.rovno.ua>\n"
 "Language-Team: Ukrainian <uk@li.org>\n"
diff --git a/po/wa.po b/po/wa.po
index 9c5595f..f9bb6f6 100644
--- a/po/wa.po
+++ b/po/wa.po
@@ -9,7 +9,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.1\n"
-"POT-Creation-Date: 2001-01-16 08:53-0500\n"
+"POT-Creation-Date: 2001-02-09 10:46-0500\n"
 "PO-Revision-Date: 1999-03-18 23:11+0100\n"
 "Last-Translator: Nobody yet\n"
 "Language-Team: walon <linux-wa@chanae.alphanet.ch>\n"
diff --git a/po/zh.po b/po/zh.po
index 5515081..f810615 100644
--- a/po/zh.po
+++ b/po/zh.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.1\n"
-"POT-Creation-Date: 2001-01-16 08:53-0500\n"
+"POT-Creation-Date: 2001-02-09 10:46-0500\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/po/zh_CN.GB2312.po b/po/zh_CN.GB2312.po
index 1268eed..d2769e4 100644
--- a/po/zh_CN.GB2312.po
+++ b/po/zh_CN.GB2312.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.1\n"
-"POT-Creation-Date: 2001-01-16 08:53-0500\n"
+"POT-Creation-Date: 2001-02-09 10:46-0500\n"
 "PO-Revision-Date: 1999-11-11 05:04+0800\n"
 "Last-Translator: Dillion Chen <dillon.chen@turbolinux.com.cn>\n"
 "Language-Team: TLDN\n"
diff --git a/popthelp.c b/popthelp.c
index 25cb791..a76b03c 100644
--- a/popthelp.c
+++ b/popthelp.c
@@ -78,31 +78,34 @@ static void singleOptionHelp(FILE * f, int maxLeftCol,
     const char * argDescrip = getArgDescrip(opt, translation_domain);
     int helpLength;
     char * left;
+    int nb = maxLeftCol + 1;
 
-    left = malloc(maxLeftCol + 1);
+    /* Make sure there's more than enough room in target buffer. */
+    if (opt->longName)	nb += strlen(opt->longName);
+    if (argDescrip)	nb += strlen(argDescrip);
+
+    left = malloc(nb);
     left[0] = left[maxLeftCol] = '\0';
 
     if (opt->longName && opt->shortName)
-	snprintf(left, maxLeftCol, "-%c, %s%s", opt->shortName,
+	sprintf(left, "-%c, %s%s", opt->shortName,
 		((opt->argInfo & POPT_ARGFLAG_ONEDASH) ? "-" : "--"),
 		opt->longName);
     else if (opt->shortName) 
-	snprintf(left, maxLeftCol, "-%c", opt->shortName);
+	sprintf(left, "-%c", opt->shortName);
     else if (opt->longName)
-	snprintf(left, maxLeftCol, "%s%s",
+	sprintf(left, "%s%s",
 		((opt->argInfo & POPT_ARGFLAG_ONEDASH) ? "-" : "--"),
 		opt->longName);
-    if (!*left) return ;
+    if (!*left) goto out;
     if (argDescrip) {
 	char * le = left + strlen(left);
-	int nl = maxLeftCol - (le - left);
-	if (opt->argInfo & POPT_ARGFLAG_OPTIONAL) {
-	    *le++ = '['; nl--;
-	}
+	if (opt->argInfo & POPT_ARGFLAG_OPTIONAL)
+	    *le++ = '[';
 	if (opt->argDescrip == NULL) {
 	    switch (opt->argInfo & POPT_ARG_MASK) {
 	    case POPT_ARG_NONE:
-		snprintf(le, nl-1, "[true]");
+		sprintf(le, "[true]");
 		break;
 	    case POPT_ARG_VAL:
 	    {   long aLong = opt->val;
@@ -110,14 +113,14 @@ static void singleOptionHelp(FILE * f, int maxLeftCol,
 		if (opt->argInfo & POPT_ARGFLAG_NOT) aLong = ~aLong;
 		switch (opt->argInfo & POPT_ARGFLAG_LOGICALOPS) {
 		case POPT_ARGFLAG_OR:
-		    snprintf(le, nl-1, "[|=0x%lx]", aLong);	break;
+		    sprintf(le, "[|=0x%lx]", aLong);	break;
 		case POPT_ARGFLAG_AND:
-		    snprintf(le, nl-1, "[&=0x%lx]", aLong);	break;
+		    sprintf(le, "[&=0x%lx]", aLong);	break;
 		case POPT_ARGFLAG_XOR:
-		    snprintf(le, nl-1, "[^=0x%lx]", aLong);	break;
+		    sprintf(le, "[^=0x%lx]", aLong);	break;
 		default:
 		    if (!(aLong == 0L || aLong == 1L || aLong == -1L))
-			snprintf(le, nl-1, "[=%ld]", aLong);
+			sprintf(le, "[=%ld]", aLong);
 		    break;
 		}
 	    }	break;
@@ -126,17 +129,15 @@ static void singleOptionHelp(FILE * f, int maxLeftCol,
 	    case POPT_ARG_STRING:
 	    case POPT_ARG_FLOAT:
 	    case POPT_ARG_DOUBLE:
-		snprintf(le, nl-1, "=%s", argDescrip);
+		sprintf(le, "=%s", argDescrip);
 		break;
 	    }
 	} else {
-	    snprintf(le, nl-1, "=%s", argDescrip);
+	    sprintf(le, "=%s", argDescrip);
 	}
-	nl -= strlen(le);
 	le += strlen(le);
-	if (opt->argInfo & POPT_ARGFLAG_OPTIONAL) {
-	    *le++ = ']'; nl--;
-	}
+	if (opt->argInfo & POPT_ARGFLAG_OPTIONAL)
+	    *le++ = ']';
 	*le = '\0';
     }
 
-- 
Gitee


From 7ae9f60e07c6bdc6d3305f8ebdf5c5cd6e4f9eb6 Mon Sep 17 00:00:00 2001
From: Jeff Johnson <n3npq@mac.com>
Date: Wed, 28 Feb 2001 15:49:37 +0000
Subject: [PATCH 297/667] Merge scriptlet handling into psm.c, remove from API.

---
 po/cs.po           | 6 +++---
 po/da.po           | 6 +++---
 po/de.po           | 6 +++---
 po/es.po           | 6 +++---
 po/eu_ES.po        | 6 +++---
 po/fi.po           | 6 +++---
 po/fr.po           | 6 +++---
 po/gl.po           | 6 +++---
 po/hu.po           | 6 +++---
 po/id.po           | 6 +++---
 po/is.po           | 6 +++---
 po/it.po           | 6 +++---
 po/ja.po           | 6 +++---
 po/ko.po           | 6 +++---
 po/no.po           | 6 +++---
 po/pl.po           | 6 +++---
 po/pt.po           | 6 +++---
 po/pt_BR.po        | 6 +++---
 po/ro.po           | 6 +++---
 po/ru.po           | 6 +++---
 po/sk.po           | 6 +++---
 po/sl.po           | 6 +++---
 po/sr.po           | 6 +++---
 po/sv.po           | 6 +++---
 po/tr.po           | 6 +++---
 po/uk.po           | 6 +++---
 po/wa.po           | 6 +++---
 po/zh.po           | 6 +++---
 po/zh_CN.GB2312.po | 6 +++---
 29 files changed, 87 insertions(+), 87 deletions(-)

diff --git a/po/cs.po b/po/cs.po
index a3edc24..892c91f 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.1\n"
-"POT-Creation-Date: 2001-02-09 10:46-0500\n"
+"POT-Creation-Date: 2001-02-22 17:41-0500\n"
 "PO-Revision-Date: 2000-08-23 22:24+0100\n"
 "Last-Translator: Milan Kerslager <milan.kerslager@spsselib.hiedu.cz>\n"
 "Language-Team: Czech <cs@li.org>\n"
@@ -90,10 +90,10 @@ msgstr ""
 msgid "ARG"
 msgstr ""
 
-#: popthelp.c:240
+#: popthelp.c:241
 msgid "Usage:"
 msgstr ""
 
-#: popthelp.c:259
+#: popthelp.c:260
 msgid "[OPTION...]"
 msgstr ""
diff --git a/po/da.po b/po/da.po
index 9e2db83..d22c4cb 100644
--- a/po/da.po
+++ b/po/da.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.1\n"
-"POT-Creation-Date: 2001-02-09 10:46-0500\n"
+"POT-Creation-Date: 2001-02-22 17:41-0500\n"
 "PO-Revision-Date: 2000-03-07 05:17+01:00\n"
 "Last-Translator: K. Christiansen <kenneth@gnu.org>\n"
 "Language-Team: Danish/Dansk <dansk@klid.dk>\n"
@@ -90,10 +90,10 @@ msgstr ""
 msgid "ARG"
 msgstr ""
 
-#: popthelp.c:240
+#: popthelp.c:241
 msgid "Usage:"
 msgstr ""
 
-#: popthelp.c:259
+#: popthelp.c:260
 msgid "[OPTION...]"
 msgstr ""
diff --git a/po/de.po b/po/de.po
index f810615..ae68916 100644
--- a/po/de.po
+++ b/po/de.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.1\n"
-"POT-Creation-Date: 2001-02-09 10:46-0500\n"
+"POT-Creation-Date: 2001-02-22 17:41-0500\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -95,10 +95,10 @@ msgstr ""
 msgid "ARG"
 msgstr ""
 
-#: popthelp.c:240
+#: popthelp.c:241
 msgid "Usage:"
 msgstr ""
 
-#: popthelp.c:259
+#: popthelp.c:260
 msgid "[OPTION...]"
 msgstr ""
diff --git a/po/es.po b/po/es.po
index f810615..ae68916 100644
--- a/po/es.po
+++ b/po/es.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.1\n"
-"POT-Creation-Date: 2001-02-09 10:46-0500\n"
+"POT-Creation-Date: 2001-02-22 17:41-0500\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -95,10 +95,10 @@ msgstr ""
 msgid "ARG"
 msgstr ""
 
-#: popthelp.c:240
+#: popthelp.c:241
 msgid "Usage:"
 msgstr ""
 
-#: popthelp.c:259
+#: popthelp.c:260
 msgid "[OPTION...]"
 msgstr ""
diff --git a/po/eu_ES.po b/po/eu_ES.po
index a90e3c1..3687099 100644
--- a/po/eu_ES.po
+++ b/po/eu_ES.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2001-02-09 10:46-0500\n"
+"POT-Creation-Date: 2001-02-22 17:41-0500\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -95,10 +95,10 @@ msgstr ""
 msgid "ARG"
 msgstr ""
 
-#: popthelp.c:240
+#: popthelp.c:241
 msgid "Usage:"
 msgstr ""
 
-#: popthelp.c:259
+#: popthelp.c:260
 msgid "[OPTION...]"
 msgstr ""
diff --git a/po/fi.po b/po/fi.po
index f810615..ae68916 100644
--- a/po/fi.po
+++ b/po/fi.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.1\n"
-"POT-Creation-Date: 2001-02-09 10:46-0500\n"
+"POT-Creation-Date: 2001-02-22 17:41-0500\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -95,10 +95,10 @@ msgstr ""
 msgid "ARG"
 msgstr ""
 
-#: popthelp.c:240
+#: popthelp.c:241
 msgid "Usage:"
 msgstr ""
 
-#: popthelp.c:259
+#: popthelp.c:260
 msgid "[OPTION...]"
 msgstr ""
diff --git a/po/fr.po b/po/fr.po
index f810615..ae68916 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.1\n"
-"POT-Creation-Date: 2001-02-09 10:46-0500\n"
+"POT-Creation-Date: 2001-02-22 17:41-0500\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -95,10 +95,10 @@ msgstr ""
 msgid "ARG"
 msgstr ""
 
-#: popthelp.c:240
+#: popthelp.c:241
 msgid "Usage:"
 msgstr ""
 
-#: popthelp.c:259
+#: popthelp.c:260
 msgid "[OPTION...]"
 msgstr ""
diff --git a/po/gl.po b/po/gl.po
index e0b0b4d..8696d51 100644
--- a/po/gl.po
+++ b/po/gl.po
@@ -10,7 +10,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.1\n"
-"POT-Creation-Date: 2001-02-09 10:46-0500\n"
+"POT-Creation-Date: 2001-02-22 17:41-0500\n"
 "PO-Revision-Date: 2000-01-06 20:31+0100\n"
 "Last-Translator: Jes�s Bravo �lvarez <jba@pobox.com>\n"
 "Language-Team: Galician <gpul-traduccion@ceu.fi.udc.es>\n"
@@ -99,10 +99,10 @@ msgstr ""
 msgid "ARG"
 msgstr ""
 
-#: popthelp.c:240
+#: popthelp.c:241
 msgid "Usage:"
 msgstr ""
 
-#: popthelp.c:259
+#: popthelp.c:260
 msgid "[OPTION...]"
 msgstr ""
diff --git a/po/hu.po b/po/hu.po
index 267ed76..a0f69a7 100644
--- a/po/hu.po
+++ b/po/hu.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.1\n"
-"POT-Creation-Date: 2001-02-09 10:46-0500\n"
+"POT-Creation-Date: 2001-02-22 17:41-0500\n"
 "PO-Revision-Date: 2000-08-03 23:26+0200\n"
 "Last-Translator: L�szl� N�meth <nemeth@qwertynet.hu>\n"
 "Language-Team: Hungarian\n"
@@ -90,10 +90,10 @@ msgstr ""
 msgid "ARG"
 msgstr ""
 
-#: popthelp.c:240
+#: popthelp.c:241
 msgid "Usage:"
 msgstr ""
 
-#: popthelp.c:259
+#: popthelp.c:260
 msgid "[OPTION...]"
 msgstr ""
diff --git a/po/id.po b/po/id.po
index f810615..ae68916 100644
--- a/po/id.po
+++ b/po/id.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.1\n"
-"POT-Creation-Date: 2001-02-09 10:46-0500\n"
+"POT-Creation-Date: 2001-02-22 17:41-0500\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -95,10 +95,10 @@ msgstr ""
 msgid "ARG"
 msgstr ""
 
-#: popthelp.c:240
+#: popthelp.c:241
 msgid "Usage:"
 msgstr ""
 
-#: popthelp.c:259
+#: popthelp.c:260
 msgid "[OPTION...]"
 msgstr ""
diff --git a/po/is.po b/po/is.po
index 9005a7d..faa18c6 100644
--- a/po/is.po
+++ b/po/is.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.1\n"
-"POT-Creation-Date: 2001-02-09 10:46-0500\n"
+"POT-Creation-Date: 2001-02-22 17:41-0500\n"
 "PO-Revision-Date: 2000-06-16 02:12+0000\n"
 "Last-Translator: Richard Allen <ra@hp.is>\n"
 "Language-Team: is <kde-isl@mmedia.is>\n"
@@ -90,10 +90,10 @@ msgstr ""
 msgid "ARG"
 msgstr ""
 
-#: popthelp.c:240
+#: popthelp.c:241
 msgid "Usage:"
 msgstr ""
 
-#: popthelp.c:259
+#: popthelp.c:260
 msgid "[OPTION...]"
 msgstr ""
diff --git a/po/it.po b/po/it.po
index f810615..ae68916 100644
--- a/po/it.po
+++ b/po/it.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.1\n"
-"POT-Creation-Date: 2001-02-09 10:46-0500\n"
+"POT-Creation-Date: 2001-02-22 17:41-0500\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -95,10 +95,10 @@ msgstr ""
 msgid "ARG"
 msgstr ""
 
-#: popthelp.c:240
+#: popthelp.c:241
 msgid "Usage:"
 msgstr ""
 
-#: popthelp.c:259
+#: popthelp.c:260
 msgid "[OPTION...]"
 msgstr ""
diff --git a/po/ja.po b/po/ja.po
index f810615..ae68916 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.1\n"
-"POT-Creation-Date: 2001-02-09 10:46-0500\n"
+"POT-Creation-Date: 2001-02-22 17:41-0500\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -95,10 +95,10 @@ msgstr ""
 msgid "ARG"
 msgstr ""
 
-#: popthelp.c:240
+#: popthelp.c:241
 msgid "Usage:"
 msgstr ""
 
-#: popthelp.c:259
+#: popthelp.c:260
 msgid "[OPTION...]"
 msgstr ""
diff --git a/po/ko.po b/po/ko.po
index f810615..ae68916 100644
--- a/po/ko.po
+++ b/po/ko.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.1\n"
-"POT-Creation-Date: 2001-02-09 10:46-0500\n"
+"POT-Creation-Date: 2001-02-22 17:41-0500\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -95,10 +95,10 @@ msgstr ""
 msgid "ARG"
 msgstr ""
 
-#: popthelp.c:240
+#: popthelp.c:241
 msgid "Usage:"
 msgstr ""
 
-#: popthelp.c:259
+#: popthelp.c:260
 msgid "[OPTION...]"
 msgstr ""
diff --git a/po/no.po b/po/no.po
index 004f9b6..f83d266 100644
--- a/po/no.po
+++ b/po/no.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.1\n"
-"POT-Creation-Date: 2001-02-09 10:46-0500\n"
+"POT-Creation-Date: 2001-02-22 17:41-0500\n"
 "PO-Revision-Date: 2000-06-21 16:11+02:00\n"
 "Last-Translator: Kjartan Maraas <kmaraas@online.no>\n"
 "Language-Team: Norwegian <no@li.org>\n"
@@ -90,10 +90,10 @@ msgstr ""
 msgid "ARG"
 msgstr ""
 
-#: popthelp.c:240
+#: popthelp.c:241
 msgid "Usage:"
 msgstr ""
 
-#: popthelp.c:259
+#: popthelp.c:260
 msgid "[OPTION...]"
 msgstr ""
diff --git a/po/pl.po b/po/pl.po
index f810615..ae68916 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.1\n"
-"POT-Creation-Date: 2001-02-09 10:46-0500\n"
+"POT-Creation-Date: 2001-02-22 17:41-0500\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -95,10 +95,10 @@ msgstr ""
 msgid "ARG"
 msgstr ""
 
-#: popthelp.c:240
+#: popthelp.c:241
 msgid "Usage:"
 msgstr ""
 
-#: popthelp.c:259
+#: popthelp.c:260
 msgid "[OPTION...]"
 msgstr ""
diff --git a/po/pt.po b/po/pt.po
index 83edf25..621a00a 100644
--- a/po/pt.po
+++ b/po/pt.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.1\n"
-"POT-Creation-Date: 2001-02-09 10:46-0500\n"
+"POT-Creation-Date: 2001-02-22 17:41-0500\n"
 "PO-Revision-Date: 2000-06-22 01:02+01:00\n"
 "Last-Translator: Pedro Morais <morais@kde.org>\n"
 "Language-Team: pt <morais@kde.org>\n"
@@ -90,10 +90,10 @@ msgstr ""
 msgid "ARG"
 msgstr ""
 
-#: popthelp.c:240
+#: popthelp.c:241
 msgid "Usage:"
 msgstr ""
 
-#: popthelp.c:259
+#: popthelp.c:260
 msgid "[OPTION...]"
 msgstr ""
diff --git a/po/pt_BR.po b/po/pt_BR.po
index f810615..ae68916 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.1\n"
-"POT-Creation-Date: 2001-02-09 10:46-0500\n"
+"POT-Creation-Date: 2001-02-22 17:41-0500\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -95,10 +95,10 @@ msgstr ""
 msgid "ARG"
 msgstr ""
 
-#: popthelp.c:240
+#: popthelp.c:241
 msgid "Usage:"
 msgstr ""
 
-#: popthelp.c:259
+#: popthelp.c:260
 msgid "[OPTION...]"
 msgstr ""
diff --git a/po/ro.po b/po/ro.po
index 2f2bf37..f36a58d 100644
--- a/po/ro.po
+++ b/po/ro.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.1\n"
-"POT-Creation-Date: 2001-02-09 10:46-0500\n"
+"POT-Creation-Date: 2001-02-22 17:41-0500\n"
 "PO-Revision-Date: 2000-06-14 23:23+EST\n"
 "Last-Translator: Cristian Gafton <gafton@redhat.com>\n"
 "Language-Team: Romanian <ro@li.org>\n"
@@ -91,10 +91,10 @@ msgstr ""
 msgid "ARG"
 msgstr ""
 
-#: popthelp.c:240
+#: popthelp.c:241
 msgid "Usage:"
 msgstr "Sintaxa:"
 
-#: popthelp.c:259
+#: popthelp.c:260
 msgid "[OPTION...]"
 msgstr "[OPTIUNE...]"
diff --git a/po/ru.po b/po/ru.po
index 3cffcd4..5ff7be3 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.1\n"
-"POT-Creation-Date: 2001-02-09 10:46-0500\n"
+"POT-Creation-Date: 2001-02-22 17:41-0500\n"
 "PO-Revision-Date: 2000-08-13 21:00+0300\n"
 "Last-Translator: Leon Kanter <leon@blackcatlinux.com>\n"
 "Language-Team: Black Cat Linux Team <blackcat-support@blackcatlinux.com>\n"
@@ -90,10 +90,10 @@ msgstr ""
 msgid "ARG"
 msgstr ""
 
-#: popthelp.c:240
+#: popthelp.c:241
 msgid "Usage:"
 msgstr ""
 
-#: popthelp.c:259
+#: popthelp.c:260
 msgid "[OPTION...]"
 msgstr ""
diff --git a/po/sk.po b/po/sk.po
index b92dff2..4f3ba8b 100644
--- a/po/sk.po
+++ b/po/sk.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.1\n"
-"POT-Creation-Date: 2001-02-09 10:46-0500\n"
+"POT-Creation-Date: 2001-02-22 17:41-0500\n"
 "PO-Revision-Date: 1999-08-04 21:40+0200\n"
 "Last-Translator: Stanislav Meduna <stano@eunet.sk>\n"
 "Language-Team: Slovak <sk-i18n@rak.isternet.sk>\n"
@@ -94,10 +94,10 @@ msgstr ""
 msgid "ARG"
 msgstr ""
 
-#: popthelp.c:240
+#: popthelp.c:241
 msgid "Usage:"
 msgstr ""
 
-#: popthelp.c:259
+#: popthelp.c:260
 msgid "[OPTION...]"
 msgstr ""
diff --git a/po/sl.po b/po/sl.po
index 6171f37..f0543ff 100644
--- a/po/sl.po
+++ b/po/sl.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.1\n"
-"POT-Creation-Date: 2001-02-09 10:46-0500\n"
+"POT-Creation-Date: 2001-02-22 17:41-0500\n"
 "PO-Revision-Date: 2000-09-05 12:30+0200\n"
 "Last-Translator: Roman Maurer <roman.maurer@hermes.si>\n"
 "Language-Team: Slovenian <sl@li.org>\n"
@@ -90,10 +90,10 @@ msgstr ""
 msgid "ARG"
 msgstr ""
 
-#: popthelp.c:240
+#: popthelp.c:241
 msgid "Usage:"
 msgstr ""
 
-#: popthelp.c:259
+#: popthelp.c:260
 msgid "[OPTION...]"
 msgstr ""
diff --git a/po/sr.po b/po/sr.po
index f810615..ae68916 100644
--- a/po/sr.po
+++ b/po/sr.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.1\n"
-"POT-Creation-Date: 2001-02-09 10:46-0500\n"
+"POT-Creation-Date: 2001-02-22 17:41-0500\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -95,10 +95,10 @@ msgstr ""
 msgid "ARG"
 msgstr ""
 
-#: popthelp.c:240
+#: popthelp.c:241
 msgid "Usage:"
 msgstr ""
 
-#: popthelp.c:259
+#: popthelp.c:260
 msgid "[OPTION...]"
 msgstr ""
diff --git a/po/sv.po b/po/sv.po
index da6b310..407c4d0 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.1\n"
-"POT-Creation-Date: 2001-02-09 10:46-0500\n"
+"POT-Creation-Date: 2001-02-22 17:41-0500\n"
 "PO-Revision-Date: 2000-06-20 00:07+0200\n"
 "Last-Translator: Christian Rose <menthos@menthos.com>\n"
 "Language-Team: Swedish <sv@li.org>\n"
@@ -90,10 +90,10 @@ msgstr ""
 msgid "ARG"
 msgstr ""
 
-#: popthelp.c:240
+#: popthelp.c:241
 msgid "Usage:"
 msgstr ""
 
-#: popthelp.c:259
+#: popthelp.c:260
 msgid "[OPTION...]"
 msgstr ""
diff --git a/po/tr.po b/po/tr.po
index d425349..03c94a8 100644
--- a/po/tr.po
+++ b/po/tr.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.1\n"
-"POT-Creation-Date: 2001-02-09 10:46-0500\n"
+"POT-Creation-Date: 2001-02-22 17:41-0500\n"
 "PO-Revision-Date: 2000-01-06 13:01+0100\n"
 "Last-Translator: G�rkem �etin <kabalak@gmx.net>\n"
 "Language-Team: Gelecek A.� <gorkem@gelecek.com.tr>\n"
@@ -90,10 +90,10 @@ msgstr ""
 msgid "ARG"
 msgstr ""
 
-#: popthelp.c:240
+#: popthelp.c:241
 msgid "Usage:"
 msgstr ""
 
-#: popthelp.c:259
+#: popthelp.c:260
 msgid "[OPTION...]"
 msgstr ""
diff --git a/po/uk.po b/po/uk.po
index 6ce797f..011fccc 100644
--- a/po/uk.po
+++ b/po/uk.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.1\n"
-"POT-Creation-Date: 2001-02-09 10:46-0500\n"
+"POT-Creation-Date: 2001-02-22 17:41-0500\n"
 "PO-Revision-Date: 1999-09-30 16:54+0200\n"
 "Last-Translator: Yuri Syrota <rasta@renome.rovno.ua>\n"
 "Language-Team: Ukrainian <uk@li.org>\n"
@@ -94,10 +94,10 @@ msgstr ""
 msgid "ARG"
 msgstr ""
 
-#: popthelp.c:240
+#: popthelp.c:241
 msgid "Usage:"
 msgstr ""
 
-#: popthelp.c:259
+#: popthelp.c:260
 msgid "[OPTION...]"
 msgstr ""
diff --git a/po/wa.po b/po/wa.po
index f9bb6f6..5537215 100644
--- a/po/wa.po
+++ b/po/wa.po
@@ -9,7 +9,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.1\n"
-"POT-Creation-Date: 2001-02-09 10:46-0500\n"
+"POT-Creation-Date: 2001-02-22 17:41-0500\n"
 "PO-Revision-Date: 1999-03-18 23:11+0100\n"
 "Last-Translator: Nobody yet\n"
 "Language-Team: walon <linux-wa@chanae.alphanet.ch>\n"
@@ -98,10 +98,10 @@ msgstr ""
 msgid "ARG"
 msgstr ""
 
-#: popthelp.c:240
+#: popthelp.c:241
 msgid "Usage:"
 msgstr ""
 
-#: popthelp.c:259
+#: popthelp.c:260
 msgid "[OPTION...]"
 msgstr ""
diff --git a/po/zh.po b/po/zh.po
index f810615..ae68916 100644
--- a/po/zh.po
+++ b/po/zh.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.1\n"
-"POT-Creation-Date: 2001-02-09 10:46-0500\n"
+"POT-Creation-Date: 2001-02-22 17:41-0500\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -95,10 +95,10 @@ msgstr ""
 msgid "ARG"
 msgstr ""
 
-#: popthelp.c:240
+#: popthelp.c:241
 msgid "Usage:"
 msgstr ""
 
-#: popthelp.c:259
+#: popthelp.c:260
 msgid "[OPTION...]"
 msgstr ""
diff --git a/po/zh_CN.GB2312.po b/po/zh_CN.GB2312.po
index d2769e4..2545528 100644
--- a/po/zh_CN.GB2312.po
+++ b/po/zh_CN.GB2312.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.1\n"
-"POT-Creation-Date: 2001-02-09 10:46-0500\n"
+"POT-Creation-Date: 2001-02-22 17:41-0500\n"
 "PO-Revision-Date: 1999-11-11 05:04+0800\n"
 "Last-Translator: Dillion Chen <dillon.chen@turbolinux.com.cn>\n"
 "Language-Team: TLDN\n"
@@ -90,10 +90,10 @@ msgstr ""
 msgid "ARG"
 msgstr ""
 
-#: popthelp.c:240
+#: popthelp.c:241
 msgid "Usage:"
 msgstr ""
 
-#: popthelp.c:259
+#: popthelp.c:260
 msgid "[OPTION...]"
 msgstr ""
-- 
Gitee


From 0bac08d7aa0265c738ed4ac46771d1a79fb2cc96 Mon Sep 17 00:00:00 2001
From: Jeff Johnson <n3npq@mac.com>
Date: Thu, 15 Mar 2001 17:55:08 +0000
Subject: [PATCH 298/667] Bump version to 4.1. Invert logic for db1, don't
 build by default.

---
 configure.in | 2 +-
 popt.spec    | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/configure.in b/configure.in
index 7b4137e..02f54eb 100755
--- a/configure.in
+++ b/configure.in
@@ -2,7 +2,7 @@ AC_INIT(popt.h)
 AM_CONFIG_HEADER(config.h)
 AC_PREREQ(2.12)
 AC_CANONICAL_SYSTEM
-AM_INIT_AUTOMAKE(popt, 1.6.2)
+AM_INIT_AUTOMAKE(popt, 1.7)
 ALL_LINGUAS="cs da de es eu_ES fi fr gl hu id is it ja ko no pl pt pt_BR ro ru sk sl sr sv tr uk wa zh zh_CN.GB2312"
 
 AC_ISC_POSIX
diff --git a/popt.spec b/popt.spec
index faf6191..93dd393 100644
--- a/popt.spec
+++ b/popt.spec
@@ -4,7 +4,7 @@
 #
 Summary: A C library for parsing command line parameters.
 Name: popt
-Version: 1.6.2
+Version: 1.7
 Release: 0.1
 Copyright: X Consortium
 Group: System Environment/Libraries
-- 
Gitee


From f05bab22fdb99e2bc863b937e31f806e2f46b5f0 Mon Sep 17 00:00:00 2001
From: Jeff Johnson <n3npq@mac.com>
Date: Tue, 17 Apr 2001 19:34:58 +0000
Subject: [PATCH 299/667] Remove blank line to avoid irix lossage (#34656).

---
 po/POTFILES.in | 1 -
 1 file changed, 1 deletion(-)

diff --git a/po/POTFILES.in b/po/POTFILES.in
index 4817ca1..a1eddf7 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -8,4 +8,3 @@ poptconfig.c
 popthelp.c
 poptparse.c
 test1.c
-
-- 
Gitee


From 584dec479a604961f301b57cb47d7e25b7ea5849 Mon Sep 17 00:00:00 2001
From: Jeff Johnson <n3npq@mac.com>
Date: Sun, 29 Apr 2001 01:05:44 +0000
Subject: [PATCH 300/667] - globalize _free(3) wrapper in rpmlib.h, consistent
 usage throughout. - internalize locale insensitive ctype(3) in rpmio.h -
 boring lclint annotations and fiddles.

---
 popt.h | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/popt.h b/popt.h
index f66db84..70bb408 100644
--- a/popt.h
+++ b/popt.h
@@ -169,9 +169,11 @@ typedef void (*poptCallbackType) (poptContext con,
  * @param flags		or'd POPT_CONTEXT_* bits
  * @return		initialized popt context
  */
-/*@only@*/ poptContext poptGetContext(/*@keep@*/ const char * name,
-		int argc, /*@keep@*/ const char ** argv,
-		/*@keep@*/ const struct poptOption * options, int flags);
+/*@only@*/ poptContext poptGetContext(
+		/*@dependent@*/ /*@keep@*/ const char * name,
+		int argc, /*@dependent@*/ /*@keep@*/ const char ** argv,
+		/*@dependent@*/ /*@keep@*/ const struct poptOption * options,
+		int flags);
 
 /** \ingroup popt
  * Reinitialize popt context.
-- 
Gitee


From 1a3923b0be41b65f337d66d1c127486954be33b4 Mon Sep 17 00:00:00 2001
From: Jeff Johnson <n3npq@mac.com>
Date: Mon, 30 Apr 2001 22:32:24 +0000
Subject: [PATCH 301/667] - yet more boring lclint annotations and fiddles.

---
 .lclintrc | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

diff --git a/.lclintrc b/.lclintrc
index 3e869d5..81370f6 100644
--- a/.lclintrc
+++ b/.lclintrc
@@ -9,18 +9,12 @@
 
 # don't-bother-me-yet parameters
 #-branchstate
-#-immediatetrans
 -mustfree
-#-observertrans
-#-statictrans
 
 # not-yet normal parameters
 -boolops		# w->n
--fixedformalarray
--null
+#-null
 -predboolint		# w->n
--predboolothers		# w->n
--retvalint		# w->n
 -type
 
 
-- 
Gitee


From a7a66960e37bc9769ba60da5d848d245085a41a0 Mon Sep 17 00:00:00 2001
From: Jeff Johnson <n3npq@mac.com>
Date: Thu, 3 May 2001 21:00:34 +0000
Subject: [PATCH 302/667] - still more boring lclint annotations and fiddles.

---
 Makefile.am | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/Makefile.am b/Makefile.am
index a5fafa9..8ffe164 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -34,6 +34,10 @@ libpopt_la_SOURCES = popt.c findme.c poptparse.c poptconfig.c popthelp.c
 
 man_MANS = popt.3
 
+.PHONY:	sources
+sources:
+	@echo $(libpopt_la_SOURCES:%=popt/%)
+
 .PHONY: lclint
 lclint:
 	lclint ${DEFS} ${INCLUDES} ${libpopt_la_SOURCES}
-- 
Gitee


From d61abacd965cf9ed2ed6fdce922182ef2aa68a3d Mon Sep 17 00:00:00 2001
From: Jeff Johnson <n3npq@mac.com>
Date: Sat, 5 May 2001 19:28:33 +0000
Subject: [PATCH 303/667] - enough lclint annotations and fiddles already.

---
 .lclintrc    |  13 +-
 findme.c     |   4 +-
 findme.h     |   2 +-
 popt.c       | 435 +++++++++++++++++++++++++++++++++------------------
 popt.h       |  56 ++++---
 poptconfig.c |  52 +++---
 popthelp.c   | 109 +++++++------
 poptint.h    |  40 +++--
 poptparse.c  |  39 +++--
 system.h     |   2 +
 test1.c      |   2 +-
 test2.c      |   2 +-
 12 files changed, 477 insertions(+), 279 deletions(-)

diff --git a/.lclintrc b/.lclintrc
index 81370f6..bf23f75 100644
--- a/.lclintrc
+++ b/.lclintrc
@@ -1,4 +1,4 @@
--I. -I.. -DHAVE_CONFIG_H
+-I. -I./build -I./lib -I./rpmio -I./popt -DHAVE_CONFIG_H -D_GNU_SOURCE
 
 +partial
 
@@ -7,16 +7,17 @@
 
 +unixlib
 
+# XXX ignore doxygen markings
+-unrecogcomments
+
 # don't-bother-me-yet parameters
-#-branchstate
--mustfree
+#-branchstate		# painful
+-mustfree		# alloca is painful
 
 # not-yet normal parameters
 -boolops		# w->n
-#-null
 -predboolint		# w->n
--type
-
+-type			#
 
 # -weak paramaters
 #+boolint
diff --git a/findme.c b/findme.c
index e65762d..f8d51bd 100644
--- a/findme.c
+++ b/findme.c
@@ -15,14 +15,16 @@ const char * findProgramPath(const char * argv0) {
     char * start, * chptr;
     char * buf;
 
+    if (argv0 == NULL) return NULL;	/* XXX can't happen */
     /* If there is a / in the argv[0], it has to be an absolute path */
     if (strchr(argv0, '/'))
 	return xstrdup(argv0);
 
-    if (!path) return NULL;
+    if (path == NULL) return NULL;
 
     start = pathbuf = alloca(strlen(path) + 1);
     buf = malloc(strlen(path) + strlen(argv0) + sizeof("/"));
+    if (buf == NULL) return NULL;	/* XXX can't happen */
     strcpy(pathbuf, path);
 
     chptr = NULL;
diff --git a/findme.h b/findme.h
index 2fe346d..1626ee5 100644
--- a/findme.h
+++ b/findme.h
@@ -14,6 +14,6 @@
  * @param argv0		name of executable
  * @return		(malloc'd) absolute path to executable (or NULL)
  */
-/*@null@*/ const char * findProgramPath(const char * argv0);
+/*@null@*/ const char * findProgramPath(/*@null@*/ const char * argv0);
 
 #endif
diff --git a/popt.c b/popt.c
index 168c46e..169c3a4 100644
--- a/popt.c
+++ b/popt.c
@@ -30,21 +30,26 @@ static char * strerror(int errno) {
 }
 #endif
 
-void poptSetExecPath(poptContext con, const char * path, int allowAbsolute) {
-    if (con->execPath) free((void *)con->execPath);
+void poptSetExecPath(poptContext con, const char * path, int allowAbsolute)
+{
+    con->execPath = _free(con->execPath);
     con->execPath = xstrdup(path);
     con->execAbsolute = allowAbsolute;
 }
 
 static void invokeCallbacksPRE(poptContext con, const struct poptOption * opt)
 {
+    if (opt != NULL)
     for (; opt->longName || opt->shortName || opt->arg; opt++) {
+	if (opt->arg == NULL) continue;		/* XXX program error. */
 	if ((opt->argInfo & POPT_ARG_MASK) == POPT_ARG_INCLUDE_TABLE) {
 	    /* Recurse on included sub-tables. */
 	    invokeCallbacksPRE(con, opt->arg);
 	} else if ((opt->argInfo & POPT_ARG_MASK) == POPT_ARG_CALLBACK &&
 		   (opt->argInfo & POPT_CBFLAG_PRE))
-	{   poptCallbackType cb = (poptCallbackType)opt->arg;
+	{   /*@-castfcnptr@*/
+	    poptCallbackType cb = (poptCallbackType)opt->arg;
+	    /*@=castfcnptr@*/
 	    /* Perform callback. */
 	    cb(con, POPT_CALLBACK_REASON_PRE, NULL, NULL, opt->descrip);
 	}
@@ -53,13 +58,17 @@ static void invokeCallbacksPRE(poptContext con, const struct poptOption * opt)
 
 static void invokeCallbacksPOST(poptContext con, const struct poptOption * opt)
 {
+    if (opt != NULL)
     for (; opt->longName || opt->shortName || opt->arg; opt++) {
+	if (opt->arg == NULL) continue;		/* XXX program error. */
 	if ((opt->argInfo & POPT_ARG_MASK) == POPT_ARG_INCLUDE_TABLE) {
 	    /* Recurse on included sub-tables. */
 	    invokeCallbacksPOST(con, opt->arg);
 	} else if ((opt->argInfo & POPT_ARG_MASK) == POPT_ARG_CALLBACK &&
 		   (opt->argInfo & POPT_CBFLAG_POST))
-	{   poptCallbackType cb = (poptCallbackType)opt->arg;
+	{   /*@-castfcnptr@*/
+	    poptCallbackType cb = (poptCallbackType)opt->arg;
+	    /*@=castfcnptr@*/
 	    /* Perform callback. */
 	    cb(con, POPT_CALLBACK_REASON_POST, NULL, NULL, opt->descrip);
 	}
@@ -69,14 +78,16 @@ static void invokeCallbacksPOST(poptContext con, const struct poptOption * opt)
 static void invokeCallbacksOPTION(poptContext con,
 				  const struct poptOption * opt,
 				  const struct poptOption * myOpt,
-				  const void * myData, int shorty)
+				  /*@null@*/ const void * myData, int shorty)
 {
     const struct poptOption * cbopt = NULL;
 
+    if (opt != NULL)
     for (; opt->longName || opt->shortName || opt->arg; opt++) {
 	if ((opt->argInfo & POPT_ARG_MASK) == POPT_ARG_INCLUDE_TABLE) {
 	    /* Recurse on included sub-tables. */
-	    invokeCallbacksOPTION(con, opt->arg, myOpt, myData, shorty);
+	    if (opt->arg != NULL)	/* XXX program error */
+		invokeCallbacksOPTION(con, opt->arg, myOpt, myData, shorty);
 	} else if ((opt->argInfo & POPT_ARG_MASK) == POPT_ARG_CALLBACK &&
 		  !(opt->argInfo & POPT_CBFLAG_SKIPOPTION)) {
 	    /* Save callback info. */
@@ -85,12 +96,17 @@ static void invokeCallbacksOPTION(poptContext con,
 		   ((myOpt->shortName && opt->shortName && shorty &&
 			myOpt->shortName == opt->shortName) ||
 		    (myOpt->longName && opt->longName &&
+		/*@-nullpass@*/		/* LCL: opt->longName != NULL */
 			!strcmp(myOpt->longName, opt->longName)))
+		/*@=nullpass@*/
 		   )
-	{   poptCallbackType cb = (poptCallbackType)cbopt->arg;
+	{   /*@-castfcnptr@*/
+	    poptCallbackType cb = (poptCallbackType)cbopt->arg;
+	    /*@=castfcnptr@*/
 	    const void * cbData = (cbopt->descrip ? cbopt->descrip : myData);
 	    /* Perform callback. */
-	    cb(con, POPT_CALLBACK_REASON_OPTION, myOpt,
+	    if (cb != NULL)	/* XXX program error */
+		cb(con, POPT_CALLBACK_REASON_OPTION, myOpt,
 			con->os->nextArg, cbData);
 	    /* Terminate (unless explcitly continuing). */
 	    if (!(cbopt->argInfo & POPT_CBFLAG_CONTINUE))
@@ -104,18 +120,23 @@ poptContext poptGetContext(const char * name, int argc, const char ** argv,
 {
     poptContext con = malloc(sizeof(*con));
 
+    if (con == NULL) return NULL;	/* XXX can't happen */
     memset(con, 0, sizeof(*con));
 
     con->os = con->optionStack;
     con->os->argc = argc;
+    /*@-dependenttrans@*/	/* FIX: W2DO? */
     con->os->argv = argv;
+    /*@=dependenttrans@*/
     con->os->argb = NULL;
 
     if (!(flags & POPT_CONTEXT_KEEP_FIRST))
 	con->os->next = 1;			/* skip argv[0] */
 
     con->leftovers = calloc( (argc + 1), sizeof(char *) );
+    /*@-dependenttrans@*/	/* FIX: W2DO? */
     con->options = options;
+    /*@=dependenttrans@*/
     con->aliases = NULL;
     con->numAliases = 0;
     con->flags = flags;
@@ -130,7 +151,9 @@ poptContext poptGetContext(const char * name, int argc, const char ** argv,
 	con->flags |= POPT_CONTEXT_POSIXMEHARDER;
 
     if (name)
+	/*@-nullpass@*/		/* FIX: malloc can return NULL. */
 	con->appName = strcpy(malloc(strlen(name) + 1), name);
+	/*@=nullpass@*/
 
     invokeCallbacksPRE(con, con->options);
 
@@ -139,30 +162,20 @@ poptContext poptGetContext(const char * name, int argc, const char ** argv,
 
 static void cleanOSE(struct optionStackEntry *os)
 {
-    if (os->nextArg) {
-	free((void *)os->nextArg);
-	os->nextArg = NULL;
-    }
-    if (os->argv) {
-	free((void *)os->argv);
-	os->argv = NULL;
-    }
-    if (os->argb) {
-	PBM_FREE(os->argb);
-	os->argb = NULL;
-    }
+    os->nextArg = _free(os->nextArg);
+    os->argv = _free(os->argv);
+    os->argb = PBM_FREE(os->argb);
 }
 
-void poptResetContext(poptContext con) {
+void poptResetContext(poptContext con)
+{
     int i;
 
+    if (con == NULL) return;
     while (con->os > con->optionStack) {
 	cleanOSE(con->os--);
     }
-    if (con->os->argb) {
-	PBM_FREE(con->os->argb);
-	con->os->argb = NULL;
-    }
+    con->os->argb = PBM_FREE(con->os->argb);
     con->os->currAlias = NULL;
     con->os->nextCharArg = NULL;
     con->os->nextArg = NULL;
@@ -173,25 +186,27 @@ void poptResetContext(poptContext con) {
     con->restLeftover = 0;
     con->doExec = NULL;
 
-    for (i = 0; i < con->finalArgvCount; i++) {
-	if (con->finalArgv[i]) {
-	    free((void *)con->finalArgv[i]);
-	    con->finalArgv[i] = NULL;
-	}
-    }
+    if (con->finalArgv != NULL)
+    for (i = 0; i < con->finalArgvCount; i++)
+	/*@-unqualifiedtrans@*/		/* FIX: typedef double indirection. */
+	con->finalArgv[i] = _free(con->finalArgv[i]);
+	/*@=unqualifiedtrans@*/
 
     con->finalArgvCount = 0;
-
-    if (con->arg_strip) {
-	PBM_FREE(con->arg_strip);
-	con->arg_strip = NULL;
-    }
+    con->arg_strip = PBM_FREE(con->arg_strip);
+    /*@-nullstate@*/	/* FIX: con->finalArgv != NULL */
+    return;
+    /*@=nullstate@*/
 }
 
 /* Only one of longName, shortName may be set at a time */
-static int handleExec(poptContext con, char * longName, char shortName) {
+static int handleExec(poptContext con, /*@null@*/ const char * longName,
+		char shortName)
+{
     int i;
 
+    if (con->execs == NULL || con->numExecs <= 0) /* XXX can't happen */
+	return 0;
     i = con->numExecs - 1;
     if (longName) {
 	while (i >= 0 && (!con->execs[i].longName ||
@@ -220,29 +235,42 @@ static int handleExec(poptContext con, char * longName, char shortName) {
     }
 
     i = con->finalArgvCount++;
+    if (con->finalArgv != NULL)	/* XXX can't happen */
     {	char *s  = malloc((longName ? strlen(longName) : 0) + 3);
-	if (longName)
-	    sprintf(s, "--%s", longName);
-	else
-	    sprintf(s, "-%c", shortName);
-	con->finalArgv[i] = s;
+	if (s != NULL) {	/* XXX can't happen */
+	    if (longName)
+		sprintf(s, "--%s", longName);
+	    else
+		sprintf(s, "-%c", shortName);
+	    con->finalArgv[i] = s;
+	} else
+	    con->finalArgv[i] = NULL;
     }
 
+    /*@-nullstate@*/	/* FIX: con->finalArgv[] == NULL */
     return 1;
+    /*@=nullstate@*/
 }
 
 /* Only one of longName, shortName may be set at a time */
-static int handleAlias(poptContext con, const char * longName, char shortName,
-		       /*@keep@*/ const char * nextCharArg) {
+static int handleAlias(poptContext con,
+		/*@null@*/ const char * longName, char shortName,
+		/*@keep@*/ /*@null@*/ const char * nextCharArg)
+{
+    int rc;
     int i;
 
     if (con->os->currAlias && con->os->currAlias->longName && longName &&
+	/*@-nullpass@*/	/* LCL: con->os->currAlias->longName != NULL */
 	!strcmp(con->os->currAlias->longName, longName))
+	/*@=nullpass@*/
 	return 0;
     if (con->os->currAlias && shortName &&
 	    shortName == con->os->currAlias->shortName)
 	return 0;
 
+    if (con->aliases == NULL || con->numAliases <= 0) /* XXX can't happen */
+	return 0;
     i = con->numAliases - 1;
     if (longName) {
 	while (i >= 0 && (!con->aliases[i].longName ||
@@ -266,27 +294,34 @@ static int handleAlias(poptContext con, const char * longName, char shortName,
     con->os->nextArg = NULL;
     con->os->nextCharArg = NULL;
     con->os->currAlias = con->aliases + i;
-    poptDupArgv(con->os->currAlias->argc, con->os->currAlias->argv,
+    rc = poptDupArgv(con->os->currAlias->argc, con->os->currAlias->argv,
 		&con->os->argc, &con->os->argv);
     con->os->argb = NULL;
 
-    return 1;
+    return (rc ? rc : 1);
 }
 
-static void execCommand(poptContext con) {
+static int execCommand(poptContext con)
+    /*@modifies fileSystem @*/
+{
     const char ** argv;
     int argc = 0;
     const char ** sargv;
     int sargc = 0;
+    int rc;
 
-    poptParseArgvString(con->doExec->script, &sargc, &sargv);
+    if (con->doExec == NULL || con->doExec->script == NULL) /*XXX can't happen*/
+	return POPT_ERROR_NOARG;
+    rc = poptParseArgvString(con->doExec->script, &sargc, &sargv);
+    if (rc) return rc;
 
     if (sargv == NULL || sargc < 1 ||
 	(!con->execAbsolute && strchr(sargv[0], '/')))
-	    return;
+	    return POPT_ERROR_NOARG;
 
     argv = malloc(sizeof(*argv) *
 			(6 + sargc + con->numLeftovers + con->finalArgvCount));
+    if (argv == NULL) return POPT_ERROR_MALLOC;	/* XXX can't happen */
 
     if (!strchr(sargv[0], '/') && con->execPath) {
 	char *s = alloca(strlen(con->execPath) + strlen(sargv[0]) + sizeof("/"));
@@ -295,17 +330,20 @@ static void execCommand(poptContext con) {
     } else {
 	argv[argc] = findProgramPath(sargv[0]);
     }
-    if (argv[argc++] == NULL) return;
+    if (argv[argc++] == NULL) return POPT_ERROR_NOARG;
 
     if (sargc > 1) {
 	memcpy(argv + argc, sargv + 1, sizeof(*argv) * (sargc - 1));
 	argc += (sargc - 1);
     }
 
-    memcpy(argv + argc, con->finalArgv, sizeof(*argv) * con->finalArgvCount);
-    argc += con->finalArgvCount;
+    if (con->finalArgv != NULL && con->finalArgvCount > 0) {
+	memcpy(argv + argc, con->finalArgv,
+		sizeof(*argv) * con->finalArgvCount);
+	argc += con->finalArgvCount;
+    }
 
-    if (con->numLeftovers) {
+    if (con->leftovers != NULL && con->numLeftovers > 0) {
 	argv[argc++] = "--";
 	memcpy(argv + argc, con->leftovers, sizeof(*argv) * con->numLeftovers);
 	argc += con->numLeftovers;
@@ -314,7 +352,7 @@ static void execCommand(poptContext con) {
     argv[argc++] = NULL;
 
 #ifdef __hpux
-    setresuid(getuid(), getuid(),-1);
+    (void) setresuid(getuid(), getuid(),-1);
 #else
 /*
  * XXX " ... on BSD systems setuid() should be preferred over setreuid()"
@@ -322,16 +360,16 @@ static void execCommand(poptContext con) {
  * XXX	from Norbert Warmuth <nwarmuth@privat.circular.de>
  */
 #if defined(HAVE_SETUID)
-    setuid(getuid());
+    (void) setuid(getuid());
 #elif defined (HAVE_SETREUID)
-    setreuid(getuid(), getuid()); /*hlauer: not portable to hpux9.01 */
+    (void) setreuid(getuid(), getuid()); /*hlauer: not portable to hpux9.01 */
 #else
     ; /* Can't drop privileges */
 #endif
 #endif
 
     if (argv[0] == NULL)
-	return;
+	return POPT_ERROR_NOARG;
 #ifdef MYDEBUG
     {	const char ** arg;
 	fprintf(stderr, "==> execvp(%s):", argv[0]);
@@ -341,19 +379,22 @@ static void execCommand(poptContext con) {
     }
 #endif
 
-    execvp(argv[0], (char *const *)argv);
+    (void) execvp(argv[0], (char *const *)argv);
+    return POPT_ERROR_ERRNO;
 }
 
-/*@observer@*/ static const struct poptOption *
-findOption(const struct poptOption * opt, const char * longName,
-    char shortName,
-    /*@out@*/ poptCallbackType * callback, /*@out@*/ const void ** callbackData,
-    int singleDash)
+/*@observer@*/ /*@null@*/ static const struct poptOption *
+findOption(const struct poptOption * opt, /*@null@*/ const char * longName,
+		char shortName,
+		/*@null@*/ /*@out@*/ poptCallbackType * callback,
+		/*@null@*/ /*@out@*/ const void ** callbackData,
+		int singleDash)
+	/*@modifies *callback, *callbackData */
 {
     const struct poptOption * cb = NULL;
 
     /* This happens when a single - is given */
-    if (singleDash && !shortName && !*longName)
+    if (singleDash && !shortName && (longName && *longName == '\0'))
 	shortName = '-';
 
     for (; opt->longName || opt->shortName || opt->arg; opt++) {
@@ -361,19 +402,28 @@ findOption(const struct poptOption * opt, const char * longName,
 	if ((opt->argInfo & POPT_ARG_MASK) == POPT_ARG_INCLUDE_TABLE) {
 	    const struct poptOption * opt2;
 	    /* Recurse on included sub-tables. */
+	    if (opt->arg == NULL) continue;	/* XXX program error */
 	    opt2 = findOption(opt->arg, longName, shortName, callback,
 			      callbackData, singleDash);
 	    if (opt2) {
 		/* Sub-table data will be inheirited if no data yet. */
-		if (*callback && *callbackData == NULL)
+		/*@-nullderef@*/	/* LCL: *callback != NULL */
+		if (callback && *callback &&
+			callbackData && *callbackData == NULL)
+		    /*@-observertrans -dependenttrans @*/
 		    *callbackData = opt->descrip;
+		    /*@=observertrans =dependenttrans @*/
+		/*@=nullderef@*/
 		return opt2;
 	    }
 	} else if ((opt->argInfo & POPT_ARG_MASK) == POPT_ARG_CALLBACK) {
 	    cb = opt;
 	} else if (longName && opt->longName &&
 		   (!singleDash || (opt->argInfo & POPT_ARGFLAG_ONEDASH)) &&
-		   !strcmp(longName, opt->longName)) {
+		/*@-nullpass@*/		/* LCL: opt->longName != NULL */
+		   !strcmp(longName, opt->longName))
+		/*@=nullpass@*/
+	{
 	    break;
 	} else if (shortName && shortName == opt->shortName) {
 	    break;
@@ -382,18 +432,28 @@ findOption(const struct poptOption * opt, const char * longName,
 
     if (!opt->longName && !opt->shortName)
 	return NULL;
-    *callbackData = NULL;
-    *callback = NULL;
+    /*@-modobserver -mods @*/
+    if (callback) *callback = NULL;
+    if (callbackData) *callbackData = NULL;
     if (cb) {
-	*callback = (poptCallbackType)cb->arg;
-	if (!(cb->argInfo & POPT_CBFLAG_INC_DATA))
-	    *callbackData = cb->descrip;
+	if (callback)
+	/*@-castfcnptr@*/
+	    *callback = (poptCallbackType)cb->arg;
+	/*@=castfcnptr@*/
+	if (!(cb->argInfo & POPT_CBFLAG_INC_DATA)) {
+	    if (callbackData)
+		/*@-observertrans@*/	/* FIX: typedef double indirection. */
+		*callbackData = cb->descrip;
+		/*@=observertrans@*/
+	}
     }
+    /*@=modobserver =mods @*/
 
     return opt;
 }
 
-static const char *findNextArg(poptContext con, unsigned argx, int delete)
+static const char * findNextArg(poptContext con, unsigned argx, int delete)
+	/*@modifies con @*/
 {
     struct optionStackEntry * os = con->os;
     const char * arg;
@@ -403,6 +463,7 @@ static const char *findNextArg(poptContext con, unsigned argx, int delete)
 	arg = NULL;
 	while (os->next == os->argc && os > con->optionStack) os--;
 	if (os->next == os->argc && os == con->optionStack) break;
+	if (os->argv != NULL)
 	for (i = os->next; i < os->argc; i++) {
 	    if (os->argb && PBM_ISSET(i, os->argb)) continue;
 	    if (*os->argv[i] == '-') continue;
@@ -410,16 +471,21 @@ static const char *findNextArg(poptContext con, unsigned argx, int delete)
 	    arg = os->argv[i];
 	    if (delete) {
 		if (os->argb == NULL) os->argb = PBM_ALLOC(os->argc);
+		if (os->argb != NULL)	/* XXX can't happen */
 		PBM_SET(i, os->argb);
 	    }
 	    break;
 	}
 	if (os > con->optionStack) os--;
     } while (arg == NULL);
+    /*@-compdef@*/	/* FIX: con->os->argv undefined */
     return arg;
+    /*@=compdef@*/
 }
 
-static /*@only@*/ const char * expandNextArg(poptContext con, const char * s)
+static /*@only@*/ /*@null@*/ const char *
+expandNextArg(poptContext con, const char * s)
+	/*@modifies con @*/
 {
     const char *a;
     size_t alen;
@@ -428,6 +494,7 @@ static /*@only@*/ const char * expandNextArg(poptContext con, const char * s)
     char c;
 
     te = t = malloc(tn);;
+    if (t == NULL) return NULL;		/* XXX can't happen */
     while ((c = *s++) != '\0') {
 	switch (c) {
 #if 0	/* XXX can't do this */
@@ -456,7 +523,7 @@ static /*@only@*/ const char * expandNextArg(poptContext con, const char * s)
 	*te++ = c;
     }
     *te = '\0';
-    t = realloc(t, strlen(t)+1);	/* XXX memory leak, hard to plug */
+    t = realloc(t, strlen(t) + 1);	/* XXX memory leak, hard to plug */
     return t;
 }
 
@@ -464,10 +531,15 @@ static void poptStripArg(poptContext con, int which)
 {
     if (con->arg_strip == NULL)
 	con->arg_strip = PBM_ALLOC(con->optionStack[0].argc);
+    if (con->arg_strip != NULL)		/* XXX can't happen */
     PBM_SET(which, con->arg_strip);
 }
 
-static int poptSaveLong(const struct poptOption * opt, long aLong) {
+static int poptSaveLong(const struct poptOption * opt, long aLong)
+{
+    if (opt->arg == NULL)
+	return POPT_ERROR_NULLARG;
+
     if (opt->argInfo & POPT_ARGFLAG_NOT)
 	aLong = ~aLong;
     switch (opt->argInfo & POPT_ARGFLAG_LOGICALOPS) {
@@ -485,12 +557,16 @@ static int poptSaveLong(const struct poptOption * opt, long aLong) {
 	break;
     default:
 	return POPT_ERROR_BADOPERATION;
-	break;
+	/*@notreached@*/ break;
     }
     return 0;
 }
 
-static int poptSaveInt(const struct poptOption * opt, long aLong) {
+static int poptSaveInt(const struct poptOption * opt, long aLong)
+{
+    if (opt->arg == NULL)
+	return POPT_ERROR_NULLARG;
+
     if (opt->argInfo & POPT_ARGFLAG_NOT)
 	aLong = ~aLong;
     switch (opt->argInfo & POPT_ARGFLAG_LOGICALOPS) {
@@ -508,7 +584,7 @@ static int poptSaveInt(const struct poptOption * opt, long aLong) {
 	break;
     default:
 	return POPT_ERROR_BADOPERATION;
-	break;
+	/*@notreached@*/ break;
     }
     return 0;
 }
@@ -533,6 +609,8 @@ int poptGetNextOpt(poptContext con)
     const struct poptOption * opt = NULL;
     int done = 0;
 
+    if (con == NULL)
+	return -1;
     while (!done) {
 	const char * origOptString = NULL;
 	poptCallbackType cb = NULL;
@@ -547,7 +625,7 @@ int poptGetNextOpt(poptContext con)
 	}
 	if (!con->os->nextCharArg && con->os->next == con->os->argc) {
 	    invokeCallbacksPOST(con, con->options);
-	    if (con->doExec) execCommand(con);
+	    if (con->doExec) return execCommand(con);
 	    return -1;
 	}
 
@@ -561,9 +639,14 @@ int poptGetNextOpt(poptContext con)
 		continue;
 	    }
 	    thisopt = con->os->next;
+	    if (con->os->argv != NULL)	/* XXX can't happen */
 	    origOptString = con->os->argv[con->os->next++];
 
+	    if (origOptString == NULL)	/* XXX can't happen */
+		return POPT_ERROR_BADOPT;
+
 	    if (con->restLeftover || *origOptString != '-') {
+		if (con->leftovers != NULL)	/* XXX can't happen */
 		con->leftovers[con->numLeftovers++] = origOptString;
 		if (con->flags & POPT_CONTEXT_POSIXMEHARDER)
 		    con->restLeftover = 1;
@@ -572,10 +655,9 @@ int poptGetNextOpt(poptContext con)
 
 	    /* Make a copy we can hack at */
 	    localOptString = optString =
-			strcpy(alloca(strlen(origOptString) + 1),
-			origOptString);
+		strcpy(alloca(strlen(origOptString) + 1), origOptString);
 
-	    if (!optString[0])
+	    if (optString[0] == '\0')
 		return POPT_ERROR_BADOPT;
 
 	    if (optString[1] == '-' && !optString[2]) {
@@ -626,6 +708,7 @@ int poptGetNextOpt(poptContext con)
 
 	/* Process next short option */
 	if (con->os->nextCharArg) {
+	    /*@-branchstate@*/		/* FIX: W2DO? */
 	    origOptString = con->os->nextCharArg;
 
 	    con->os->nextCharArg = NULL;
@@ -637,7 +720,8 @@ int poptGetNextOpt(poptContext con)
 	    if (handleExec(con, NULL, *origOptString)) {
 		/* Restore rest of short options for further processing */
 		origOptString++;
-		if (*origOptString) con->os->nextCharArg = origOptString;
+		if (*origOptString != '\0')
+		    con->os->nextCharArg = origOptString;
 		continue;
 	    }
 
@@ -648,9 +732,12 @@ int poptGetNextOpt(poptContext con)
 	    shorty = 1;
 
 	    origOptString++;
-	    if (*origOptString) con->os->nextCharArg = origOptString;
+	    if (*origOptString != '\0')
+		con->os->nextCharArg = origOptString;
+	    /*@=branchstate@*/
 	}
 
+	if (opt == NULL) return POPT_ERROR_BADOPT;	/* XXX can't happen */
 	if (opt->arg && (opt->argInfo & POPT_ARG_MASK) == POPT_ARG_NONE) {
 	    if (poptSaveInt(opt, 1L))
 		return POPT_ERROR_BADOPERATION;
@@ -660,14 +747,17 @@ int poptGetNextOpt(poptContext con)
 		    return POPT_ERROR_BADOPERATION;
 	    }
 	} else if ((opt->argInfo & POPT_ARG_MASK) != POPT_ARG_NONE) {
-	    if (con->os->nextArg) {
-		free((void *)con->os->nextArg);
-		con->os->nextArg = NULL;
-	    }
+	    con->os->nextArg = _free(con->os->nextArg);
+	    /*@-usedef@*/	/* FIX: W2DO? */
 	    if (longArg) {
+	    /*@=usedef@*/
+		/*@-evalorder@*/	/* FIX: W2DO? */
 		con->os->nextArg = expandNextArg(con, longArg);
+		/*@=evalorder@*/
 	    } else if (con->os->nextCharArg) {
+		/*@-evalorder@*/	/* FIX: W2DO? */
 		con->os->nextArg = expandNextArg(con, con->os->nextCharArg);
+		/*@=evalorder@*/
 		con->os->nextCharArg = NULL;
 	    } else {
 		while (con->os->next == con->os->argc &&
@@ -689,7 +779,11 @@ int poptGetNextOpt(poptContext con)
 			poptStripArg(con, con->os->next);
 		    }
 		
-		    con->os->nextArg = expandNextArg(con, con->os->argv[con->os->next++]);
+		    if (con->os->argv != NULL)	/* XXX can't happen */
+		    /*@-evalorder@*/	/* FIX: W2DO? */
+		    con->os->nextArg =
+			expandNextArg(con, con->os->argv[con->os->next++]);
+		    /*@=evalorder@*/
 		}
 	    }
 
@@ -732,24 +826,21 @@ int poptGetNextOpt(poptContext con)
 
 		    if (con->os->nextArg) {
 			aDouble = strtod(con->os->nextArg, &end);
-			if (*end)
+			if (*end != '\0')
 			    return POPT_ERROR_BADNUMBER;
 		    }
 
-		    if (aDouble == +HUGE_VAL || aDouble == -HUGE_VAL)
+		    if ((aDouble - HUGE_VAL) < DBL_EPSILON ||
+			(aDouble + HUGE_VAL) < DBL_EPSILON)
 			return POPT_ERROR_OVERFLOW;
-		    if (aDouble == 0.0 && errno == ERANGE)
+		    if ((aDouble - 0.0) < DBL_EPSILON && errno == ERANGE)
 			return POPT_ERROR_OVERFLOW;
 		    if ((opt->argInfo & POPT_ARG_MASK) == POPT_ARG_DOUBLE) {
 			*((double *) opt->arg) = aDouble;
 		    } else {
-#ifdef ABS
-#undef ABS
-#endif
-#define ABS(a) (((a) < 0) ? -(a) : (a))
-			if (ABS(aDouble) > FLT_MAX)
+			if ((aDouble - FLT_MAX) > DBL_EPSILON)
 			    return POPT_ERROR_OVERFLOW;
-			if (ABS(aDouble) < FLT_MIN)
+			if ((aDouble + FLT_MIN) > DBL_EPSILON)
 			    return POPT_ERROR_OVERFLOW;
 			*((float *) opt->arg) = aDouble;
 		    }
@@ -773,83 +864,107 @@ int poptGetNextOpt(poptContext con)
 			    sizeof(*con->finalArgv) * con->finalArgvAlloced);
 	}
 
+	if (con->finalArgv != NULL)
 	{   char *s = malloc((opt->longName ? strlen(opt->longName) : 0) + 3);
-	    if (opt->longName)
-		sprintf(s, "%s%s",
-		    ((opt->argInfo & POPT_ARGFLAG_ONEDASH) ? "-" : "--"),
-		    opt->longName);
-	    else
-		sprintf(s, "-%c", opt->shortName);
-	    con->finalArgv[con->finalArgvCount++] = s;
+	    if (s != NULL) {	/* XXX can't happen */
+		if (opt->longName)
+		    sprintf(s, "%s%s",
+			((opt->argInfo & POPT_ARGFLAG_ONEDASH) ? "-" : "--"),
+			opt->longName);
+		else
+		    sprintf(s, "-%c", opt->shortName);
+		con->finalArgv[con->finalArgvCount++] = s;
+	    } else
+		con->finalArgv[con->finalArgvCount++] = NULL;
 	}
 
 	if (opt->arg && (opt->argInfo & POPT_ARG_MASK) == POPT_ARG_NONE)
-	    /*@-ifempty@*/ ;
+	    /*@-ifempty@*/ ; /*@=ifempty@*/
 	else if ((opt->argInfo & POPT_ARG_MASK) == POPT_ARG_VAL)
-	    /*@-ifempty@*/ ;
+	    /*@-ifempty@*/ ; /*@=ifempty@*/
 	else if ((opt->argInfo & POPT_ARG_MASK) != POPT_ARG_NONE) {
-	    if (con->os->nextArg)
+	    if (con->finalArgv != NULL && con->os->nextArg)
 	        con->finalArgv[con->finalArgvCount++] =
+			/*@-nullpass@*/	/* LCL: con->os->nextArg != NULL */
 			xstrdup(con->os->nextArg);
+			/*@=nullpass@*/
 	}
     }
 
-    return opt->val;
+    return (opt ? opt->val : -1);	/* XXX can't happen */
 }
 
-const char * poptGetOptArg(poptContext con) {
-    const char * ret = con->os->nextArg;
-    con->os->nextArg = NULL;
+const char * poptGetOptArg(poptContext con)
+{
+    const char * ret = NULL;
+    if (con) {
+	ret = con->os->nextArg;
+	con->os->nextArg = NULL;
+    }
     return ret;
 }
 
-const char * poptGetArg(poptContext con) {
-    const char * ret = (con->nextLeftover < con->numLeftovers)
-	? con->leftovers[con->nextLeftover++] : NULL;
+const char * poptGetArg(poptContext con)
+{
+    const char * ret = NULL;
+    if (con && con->leftovers != NULL && con->nextLeftover < con->numLeftovers)
+	ret = con->leftovers[con->nextLeftover++];
     return ret;
 }
 
-const char * poptPeekArg(poptContext con) {
-    const char * ret = (con->nextLeftover < con->numLeftovers)
-	? con->leftovers[con->nextLeftover] : NULL;
+const char * poptPeekArg(poptContext con)
+{
+    const char * ret = NULL;
+    if (con && con->leftovers != NULL && con->nextLeftover < con->numLeftovers)
+	ret = con->leftovers[con->nextLeftover];
     return ret;
 }
 
-const char ** poptGetArgs(poptContext con) {
-    if (con->numLeftovers == con->nextLeftover) return NULL;
+const char ** poptGetArgs(poptContext con)
+{
+    if (con == NULL ||
+	con->leftovers == NULL || con->numLeftovers == con->nextLeftover)
+	return NULL;
 
     /* some apps like [like RPM ;-) ] need this NULL terminated */
     con->leftovers[con->numLeftovers] = NULL;
 
+    /*@-nullret -nullstate @*/	/* FIX: typedef double indirection. */
     return (con->leftovers + con->nextLeftover);
+    /*@=nullret =nullstate @*/
 }
 
-void poptFreeContext(poptContext con) {
+poptContext poptFreeContext(poptContext con)
+{
     int i;
 
+    if (con == NULL) return con;
     poptResetContext(con);
-    if (con->os->argb) free(con->os->argb);
+    con->os->argb = _free(con->os->argb);
 
+    if (con->aliases != NULL)
     for (i = 0; i < con->numAliases; i++) {
-	if (con->aliases[i].longName) free((void *)con->aliases[i].longName);
-	free(con->aliases[i].argv);
+	con->aliases[i].longName = _free(con->aliases[i].longName);
+	con->aliases[i].argv = _free(con->aliases[i].argv);
     }
 
+    if (con->execs != NULL)
     for (i = 0; i < con->numExecs; i++) {
-	if (con->execs[i].longName) free((void *)con->execs[i].longName);
-	free((void *)con->execs[i].script);
+	con->execs[i].longName = _free(con->execs[i].longName);
+	con->execs[i].script = _free(con->execs[i].script);
     }
-    if (con->execs) free((void *)con->execs);
-
-    free(con->leftovers);
-    free(con->finalArgv);
-    if (con->appName) free((void *)con->appName);
-    if (con->aliases) free(con->aliases);
-    if (con->otherHelp) free((void *)con->otherHelp);
-    if (con->execPath) free((void *)con->execPath);
-    if (con->arg_strip) PBM_FREE(con->arg_strip);
+    con->execs = _free(con->execs);
+
+    con->leftovers = _free(con->leftovers);
+    con->finalArgv = _free(con->finalArgv);
+    con->appName = _free(con->appName);
+    con->aliases = _free(con->aliases);
+    con->otherHelp = _free(con->otherHelp);
+    con->execPath = _free(con->execPath);
+    con->arg_strip = PBM_FREE(con->arg_strip);
     
-    free(con);
+    con = _free(con);
+    return con;
 }
 
 int poptAddAlias(poptContext con, struct poptAlias newAlias,
@@ -867,7 +982,9 @@ int poptAddAlias(poptContext con, struct poptAlias newAlias,
     alias = con->aliases + aliasNum;
 
     alias->longName = (newAlias.longName)
+	/*@-nullpass@*/		/* FIX: malloc can return NULL. */
 	? strcpy(malloc(strlen(newAlias.longName) + 1), newAlias.longName)
+	/*@=nullpass@*/
 	: NULL;
     alias->shortName = newAlias.shortName;
     alias->argc = newAlias.argc;
@@ -876,18 +993,20 @@ int poptAddAlias(poptContext con, struct poptAlias newAlias,
     return 0;
 }
 
-const char * poptBadOption(poptContext con, int flags) {
-    struct optionStackEntry * os;
+const char * poptBadOption(poptContext con, int flags)
+{
+    struct optionStackEntry * os = NULL;
 
-    if (flags & POPT_BADOPTION_NOALIAS)
-	os = con->optionStack;
-    else
-	os = con->os;
+    if (con != NULL)
+	os = (flags & POPT_BADOPTION_NOALIAS) ? con->optionStack : con->os;
 
-    return os->argv[os->next - 1];
+    /*@-nullderef@*/	/* LCL: os->argv != NULL */
+    return (os && os->argv ? os->argv[os->next - 1] : NULL);
+    /*@=nullderef@*/
 }
 
-const char *const poptStrerror(const int error) {
+const char *const poptStrerror(const int error)
+{
     switch (error) {
       case POPT_ERROR_NOARG:
 	return POPT_("missing argument");
@@ -895,6 +1014,8 @@ const char *const poptStrerror(const int error) {
 	return POPT_("unknown option");
       case POPT_ERROR_BADOPERATION:
 	return POPT_("mutually exclusive logical operations requested");
+      case POPT_ERROR_NULLARG:
+	return POPT_("opt->arg should not be NULL");
       case POPT_ERROR_OPTSTOODEEP:
 	return POPT_("aliases nested too deeply");
       case POPT_ERROR_BADQUOTE:
@@ -903,6 +1024,8 @@ const char *const poptStrerror(const int error) {
 	return POPT_("invalid numeric value");
       case POPT_ERROR_OVERFLOW:
 	return POPT_("number too large or too small");
+      case POPT_ERROR_MALLOC:
+	return POPT_("memory allocation failed");
       case POPT_ERROR_ERRNO:
 	return strerror(errno);
       default:
@@ -910,8 +1033,10 @@ const char *const poptStrerror(const int error) {
     }
 }
 
-int poptStuffArgs(poptContext con, const char ** argv) {
+int poptStuffArgs(poptContext con, const char ** argv)
+{
     int argc;
+    int rc;
 
     if ((con->os - con->optionStack) == POPT_OPTION_DEPTH)
 	return POPT_ERROR_OPTSTOODEEP;
@@ -924,30 +1049,34 @@ int poptStuffArgs(poptContext con, const char ** argv) {
     con->os->nextArg = NULL;
     con->os->nextCharArg = NULL;
     con->os->currAlias = NULL;
-    poptDupArgv(argc, argv, &con->os->argc, &con->os->argv);
+    rc = poptDupArgv(argc, argv, &con->os->argc, &con->os->argv);
     con->os->argb = NULL;
     con->os->stuffed = 1;
 
-    return 0;
+    return rc;
 }
 
-const char * poptGetInvocationName(poptContext con) {
-    return con->os->argv[0];
+const char * poptGetInvocationName(poptContext con)
+{
+    return (con->os->argv ? con->os->argv[0] : "");
 }
 
-int poptStrippedArgv(poptContext con, int argc, char **argv)
+int poptStrippedArgv(poptContext con, int argc, char ** argv)
 {
-    int i,j=1, numargs=argc;
+    int numargs = argc;
+    int j = 1;
+    int i;
     
+    if (con->arg_strip)
     for (i = 1; i < argc; i++) {
 	if (PBM_ISSET(i, con->arg_strip))
 	    numargs--;
     }
     
     for (i = 1; i < argc; i++) {
-	if (PBM_ISSET(i, con->arg_strip))
+	if (con->arg_strip && PBM_ISSET(i, con->arg_strip))
 	    continue;
-	argv[j] = (j < numargs) ? argv[i] : '\0';
+	argv[j] = (j < numargs) ? argv[i] : NULL;
 	j++;
     }
     
diff --git a/popt.h b/popt.h
index 70bb408..b74f7d8 100644
--- a/popt.h
+++ b/popt.h
@@ -84,6 +84,8 @@ extern "C" {
 #define POPT_ERROR_BADNUMBER	-17	/*!< invalid numeric value */
 #define POPT_ERROR_OVERFLOW	-18	/*!< number too large or too small */
 #define	POPT_ERROR_BADOPERATION	-19	/*!< mutually exclusive logical operations requested */
+#define	POPT_ERROR_NULLARG	-20	/*!< opt->arg should not be NULL */
+#define	POPT_ERROR_MALLOC	-21	/*!< memory allocation failed */
 /*@}*/
 
 /** \ingroup popt
@@ -110,8 +112,8 @@ struct poptOption {
     int argInfo;
 /*@shared@*/ /*@null@*/ void * arg;	/*!< depends on argInfo */
     int val;			/*!< 0 means don't return, just update flag */
-/*@shared@*/ /*@null@*/ const char * descrip;	/*!< description for autohelp -- may be NULL */
-/*@shared@*/ /*@null@*/ const char * argDescrip; /*!< argument description for autohelp */
+/*@observer@*/ /*@null@*/ const char * descrip;	/*!< description for autohelp -- may be NULL */
+/*@observer@*/ /*@null@*/ const char * argDescrip; /*!< argument description for autohelp */
 };
 
 /** \ingroup popt
@@ -135,7 +137,7 @@ extern struct poptOption poptHelpOptions[];
 
 /** \ingroup popt
  */
-typedef struct poptContext_s * poptContext;
+typedef /*@abstract@*/ struct poptContext_s * poptContext;
 
 /** \ingroup popt
  */
@@ -156,9 +158,10 @@ enum poptCallbackReason { POPT_CALLBACK_REASON_PRE,
  * @param data		@todo Document.
  */
 typedef void (*poptCallbackType) (poptContext con, 
-				 enum poptCallbackReason reason,
-			         const struct poptOption * opt,
-				 const char * arg, const void * data);
+		enum poptCallbackReason reason,
+		/*@null@*/ const struct poptOption * opt,
+		/*@null@*/ const char * arg,
+		/*@null@*/ const void * data);
 
 /** \ingroup popt
  * Initialize popt context.
@@ -169,7 +172,7 @@ typedef void (*poptCallbackType) (poptContext con,
  * @param flags		or'd POPT_CONTEXT_* bits
  * @return		initialized popt context
  */
-/*@only@*/ poptContext poptGetContext(
+/*@only@*/ /*@null@*/ poptContext poptGetContext(
 		/*@dependent@*/ /*@keep@*/ const char * name,
 		int argc, /*@dependent@*/ /*@keep@*/ const char ** argv,
 		/*@dependent@*/ /*@keep@*/ const struct poptOption * options,
@@ -179,54 +182,55 @@ typedef void (*poptCallbackType) (poptContext con,
  * Reinitialize popt context.
  * @param con		context
  */
-void poptResetContext(poptContext con);
+void poptResetContext(/*@null@*/poptContext con);
 
 /** \ingroup popt
  * Return value of next option found.
  * @param con		context
  * @return		next option val, -1 on last item, POPT_ERROR_* on error
  */
-int poptGetNextOpt(poptContext con);
+int poptGetNextOpt(/*@null@*/poptContext con);
 /* returns NULL if no argument is available */
 
 /** \ingroup popt
  * @param con		context
  */
-/*@observer@*/ /*@null@*/ const char * poptGetOptArg(poptContext con);
+/*@observer@*/ /*@null@*/ const char * poptGetOptArg(/*@null@*/poptContext con);
 
 /** \ingroup popt
  * Return current option's argument.
  * @param con		context
  * @return		option argument, NULL if no more options are available
  */
-/*@observer@*/ /*@null@*/ const char * poptGetArg(poptContext con);
+/*@observer@*/ /*@null@*/ const char * poptGetArg(/*@null@*/poptContext con);
 
 /** \ingroup popt
  * Peek at  current option's argument.
  * @param con		context
  * @return		option argument
  */
-/*@observer@*/ /*@null@*/ const char * poptPeekArg(poptContext con);
+/*@observer@*/ /*@null@*/ const char * poptPeekArg(/*@null@*/poptContext con);
 
 /** \ingroup popt
  * Return remaining arguments.
  * @param con		context
  * @return		argument array, terminated with NULL
  */
-/*@observer@*/ /*@null@*/ const char ** poptGetArgs(poptContext con);
+/*@observer@*/ /*@null@*/ const char ** poptGetArgs(/*@null@*/poptContext con);
 
 /** \ingroup popt
  * Return the option which caused the most recent error.
  * @param con		context
  * @return		offending option
  */
-/*@observer@*/ const char * poptBadOption(poptContext con, int flags);
+/*@observer@*/ const char * poptBadOption(/*@null@*/poptContext con, int flags);
 
 /** \ingroup popt
  * Destroy context.
  * @param con		context
+ * @return		NULL
  */
-void poptFreeContext( /*@only@*/ poptContext con);
+/*@null@*/ poptContext poptFreeContext( /*@only@*/ /*@null@*/ poptContext con);
 
 /** \ingroup popt
  * Add arguments to context.
@@ -252,7 +256,9 @@ int poptAddAlias(poptContext con, struct poptAlias alias, int flags);
  * @param fn		file name to read
  * @return		0 on success, POPT_ERROR_ERRNO on failure
  */
-int poptReadConfigFile(poptContext con, const char * fn);
+int poptReadConfigFile(poptContext con, const char * fn)
+	/*@modifies fileSystem,
+		con->execs, con->numExecs @*/;
 
 /** \ingroup popt
  * Read default configuration from /etc/popt and $HOME/.popt.
@@ -260,7 +266,9 @@ int poptReadConfigFile(poptContext con, const char * fn);
  * @param useEnv	(unused)
  * @return		0 on success, POPT_ERROR_ERRNO on failure
  */
-int poptReadDefaultConfig(poptContext con, /*@unused@*/ int useEnv);
+int poptReadDefaultConfig(poptContext con, /*@unused@*/ int useEnv)
+	/*@modifies fileSystem,
+		con->execs, con->numExecs @*/;
 
 /** \ingroup popt
  * Duplicate an argument array.
@@ -273,8 +281,10 @@ int poptReadDefaultConfig(poptContext con, /*@unused@*/ int useEnv);
  * @retval argvPtr	address of returned argument array
  * @return		0 on success, POPT_ERROR_NOARG on failure
  */
-int poptDupArgv(int argc, const char **argv,
-		/*@out@*/ int * argcPtr, /*@out@*/ const char *** argvPtr);
+int poptDupArgv(int argc, /*@null@*/ const char **argv,
+		/*@null@*/ /*@out@*/ int * argcPtr,
+		/*@null@*/ /*@out@*/ const char *** argvPtr)
+	/*@modifies *argcPtr, *argvPtr @*/;
 
 /** \ingroup popt
  * Parse a string into an argument array.
@@ -288,14 +298,16 @@ int poptDupArgv(int argc, const char **argv,
  * @retval argvPtr	address of returned argument array
  */
 int poptParseArgvString(const char * s,
-		/*@out@*/ int * argcPtr, /*@out@*/ const char *** argvPtr);
+		/*@out@*/ int * argcPtr, /*@out@*/ const char *** argvPtr)
+	/*@modifies *argcPtr, *argvPtr @*/;
 
 /** \ingroup popt
  * Return formatted error string for popt failure.
  * @param error		popt error
  * @return		error string
  */
-/*@observer@*/ const char *const poptStrerror(const int error);
+/*@observer@*/ const char *const poptStrerror(const int error)
+	/*@*/;
 
 /** \ingroup popt
  * Limit search for executables.
@@ -339,7 +351,7 @@ void poptSetOtherOptionHelp(poptContext con, const char * text);
  * @param con		context
  * @return		new argc
  */
-int poptStrippedArgv(poptContext con, int argc, char **argv);
+int poptStrippedArgv(poptContext con, int argc, char ** argv);
 
 #ifdef  __cplusplus
 }
diff --git a/poptconfig.c b/poptconfig.c
index 0cfd1a1..d518646 100644
--- a/poptconfig.c
+++ b/poptconfig.c
@@ -9,30 +9,33 @@
 #include "system.h"
 #include "poptint.h"
 
-static void configLine(poptContext con, char * line) {
+static void configLine(poptContext con, char * line)
+	/*@modifies *line,
+		con->execs, con->numExecs @*/
+{
     int nameLength = strlen(con->appName);
-    char * opt;
+    const char * opt;
     struct poptAlias alias;
-    char * entryType;
-    char * longName = NULL;
+    const char * entryType;
+    const char * longName = NULL;
     char shortName = '\0';
     
     if (strncmp(line, con->appName, nameLength)) return;
     line += nameLength;
-    if (!*line || !isspace(*line)) return;
-    while (*line && isspace(*line)) line++;
+    if (*line == '\0' || !isspace(*line)) return;
+    while (*line != '\0' && isspace(*line)) line++;
     entryType = line;
 
-    while (!*line || !isspace(*line)) line++;
+    while (*line == '\0' || !isspace(*line)) line++;
     *line++ = '\0';
-    while (*line && isspace(*line)) line++;
-    if (!*line) return;
+    while (*line != '\0' && isspace(*line)) line++;
+    if (*line == '\0') return;
     opt = line;
 
-    while (!*line || !isspace(*line)) line++;
+    while (*line == '\0' || !isspace(*line)) line++;
     *line++ = '\0';
-    while (*line && isspace(*line)) line++;
-    if (!*line) return;
+    while (*line != '\0' && isspace(*line)) line++;
+    if (*line == '\0') return;
 
     if (opt[0] == '-' && opt[1] == '-')
 	longName = opt + 2;
@@ -42,10 +45,11 @@ static void configLine(poptContext con, char * line) {
     if (!strcmp(entryType, "alias")) {
 	if (poptParseArgvString(line, &alias.argc, &alias.argv)) return;
 	alias.longName = longName, alias.shortName = shortName;
-	poptAddAlias(con, alias, 0);
+	(void) poptAddAlias(con, alias, 0);
     } else if (!strcmp(entryType, "exec")) {
 	con->execs = realloc(con->execs,
 				sizeof(*con->execs) * (con->numExecs + 1));
+	if (con->execs == NULL) return;	/* XXX can't happen */
 	if (longName)
 	    con->execs[con->numExecs].longName = xstrdup(longName);
 	else
@@ -54,13 +58,17 @@ static void configLine(poptContext con, char * line) {
 	con->execs[con->numExecs].shortName = shortName;
 	con->execs[con->numExecs].script = xstrdup(line);
 	
+	/*@-noeffect@*/		/* LCL: broken? */
 	con->numExecs++;
+	/*@=noeffect@*/
     }
 }
 
-int poptReadConfigFile(poptContext con, const char * fn) {
-    char * file, * chptr, * end;
-    char * buf, * dst;
+int poptReadConfigFile(poptContext con, const char * fn)
+{
+    const char * file, * chptr, * end;
+    char * buf;
+/*@dependent@*/ char * dst;
     int fd, rc;
     int fileLength;
 
@@ -76,27 +84,27 @@ int poptReadConfigFile(poptContext con, const char * fn) {
     (void) lseek(fd, 0, 0);
 
     file = alloca(fileLength + 1);
-    if (read(fd, file, fileLength) != fileLength) {
+    if (read(fd, (char *)file, fileLength) != fileLength) {
 	rc = errno;
-	close(fd);
+	(void) close(fd);
 	errno = rc;
 	return POPT_ERROR_ERRNO;
     }
-    close(fd);
+    (void) close(fd);
 
     dst = buf = alloca(fileLength + 1);
 
     chptr = file;
     end = (file + fileLength);
+    /*@-infloops@*/	/* LCL: can't detect chptr++ */
     while (chptr < end) {
 	switch (*chptr) {
 	  case '\n':
 	    *dst = '\0';
 	    dst = buf;
 	    while (*dst && isspace(*dst)) dst++;
-	    if (*dst && *dst != '#') {
+	    if (*dst && *dst != '#')
 		configLine(con, dst);
-	    }
 	    chptr++;
 	    break;
 	  case '\\':
@@ -114,6 +122,7 @@ int poptReadConfigFile(poptContext con, const char * fn) {
 	    break;
 	}
     }
+    /*@=infloops@*/
 
     return 0;
 }
@@ -138,4 +147,3 @@ int poptReadDefaultConfig(poptContext con, /*@unused@*/ int useEnv) {
 
     return 0;
 }
-
diff --git a/popthelp.c b/popthelp.c
index a76b03c..086cd43 100644
--- a/popthelp.c
+++ b/popthelp.c
@@ -23,31 +23,33 @@ static void displayArgs(poptContext con,
     exit(0);
 }
 
+/*@-castfcnptr@*/
 struct poptOption poptHelpOptions[] = {
     { NULL, '\0', POPT_ARG_CALLBACK, (void *)&displayArgs, '\0', NULL, NULL },
     { "help", '?', 0, NULL, '?', N_("Show this help message"), NULL },
     { "usage", '\0', 0, NULL, 'u', N_("Display brief usage message"), NULL },
     POPT_TABLEEND
 } ;
-
+/*@=castfcnptr@*/
 
 /*@observer@*/ /*@null@*/ static const char *const
-getTableTranslationDomain(const struct poptOption *table)
+getTableTranslationDomain(/*@null@*/ const struct poptOption *table)
 {
-  const struct poptOption *opt;
-
-  for(opt = table;
-      opt->longName || opt->shortName || opt->arg;
-      opt++) {
-    if(opt->argInfo == POPT_ARG_INTL_DOMAIN)
-      return opt->arg;
-  }
+    const struct poptOption *opt;
 
-  return NULL;
+    if (table != NULL)
+    for (opt = table; opt->longName || opt->shortName || opt->arg; opt++) {
+	if (opt->argInfo == POPT_ARG_INTL_DOMAIN)
+	    return opt->arg;
+    }
+    return NULL;
 }
 
 /*@observer@*/ /*@null@*/ static const char *const
-getArgDescrip(const struct poptOption * opt, const char *translation_domain)
+getArgDescrip(const struct poptOption * opt,
+		/*@-paramuse@*/		/* FIX: wazzup? */
+		/*@null@*/ const char * translation_domain)
+		/*@=paramuse@*/
 {
     if (!(opt->argInfo & POPT_ARG_MASK)) return NULL;
 
@@ -69,8 +71,8 @@ getArgDescrip(const struct poptOption * opt, const char *translation_domain)
 }
 
 static void singleOptionHelp(FILE * f, int maxLeftCol, 
-			     const struct poptOption * opt,
-			     const char *translation_domain)
+		const struct poptOption * opt,
+		/*@null@*/ const char *translation_domain)
 {
     int indentLength = maxLeftCol + 5;
     int lineLength = 79 - indentLength;
@@ -85,13 +87,15 @@ static void singleOptionHelp(FILE * f, int maxLeftCol,
     if (argDescrip)	nb += strlen(argDescrip);
 
     left = malloc(nb);
-    left[0] = left[maxLeftCol] = '\0';
+    if (left == NULL) return;	/* XXX can't happen */
+    left[0] = '\0';
+    left[maxLeftCol] = '\0';
 
     if (opt->longName && opt->shortName)
 	sprintf(left, "-%c, %s%s", opt->shortName,
 		((opt->argInfo & POPT_ARGFLAG_ONEDASH) ? "-" : "--"),
 		opt->longName);
-    else if (opt->shortName) 
+    else if (opt->shortName != '\0') 
 	sprintf(left, "-%c", opt->shortName);
     else if (opt->longName)
 	sprintf(left, "%s%s",
@@ -113,11 +117,11 @@ static void singleOptionHelp(FILE * f, int maxLeftCol,
 		if (opt->argInfo & POPT_ARGFLAG_NOT) aLong = ~aLong;
 		switch (opt->argInfo & POPT_ARGFLAG_LOGICALOPS) {
 		case POPT_ARGFLAG_OR:
-		    sprintf(le, "[|=0x%lx]", aLong);	break;
+		    sprintf(le, "[|=0x%lx]", (unsigned long)aLong);	break;
 		case POPT_ARGFLAG_AND:
-		    sprintf(le, "[&=0x%lx]", aLong);	break;
+		    sprintf(le, "[&=0x%lx]", (unsigned long)aLong);	break;
 		case POPT_ARGFLAG_XOR:
-		    sprintf(le, "[^=0x%lx]", aLong);	break;
+		    sprintf(le, "[^=0x%lx]", (unsigned long)aLong);	break;
 		default:
 		    if (!(aLong == 0L || aLong == 1L || aLong == -1L))
 			sprintf(le, "[=%ld]", aLong);
@@ -173,20 +177,22 @@ out:
 }
 
 static int maxArgWidth(const struct poptOption * opt,
-		       const char * translation_domain)
+		       /*@null@*/ const char * translation_domain)
 {
     int max = 0;
-    int this;
+    int this = 0;
     const char * s;
     
+    if (opt != NULL)
     while (opt->longName || opt->shortName || opt->arg) {
 	if ((opt->argInfo & POPT_ARG_MASK) == POPT_ARG_INCLUDE_TABLE) {
+	    if (opt->arg)	/* XXX program error */
 	    this = maxArgWidth(opt->arg, translation_domain);
 	    if (this > max) max = this;
 	} else if (!(opt->argInfo & POPT_ARGFLAG_DOC_HIDDEN)) {
 	    this = sizeof("  ")-1;
-	    if (opt->shortName) this += sizeof("-X")-1;
-	    if (opt->shortName && opt->longName) this += sizeof(", ")-1;
+	    if (opt->shortName != '\0') this += sizeof("-X")-1;
+	    if (opt->shortName != '\0' && opt->longName) this += sizeof(", ")-1;
 	    if (opt->longName) {
 		this += ((opt->argInfo & POPT_ARGFLAG_ONEDASH)
 			? sizeof("-")-1 : sizeof("--")-1);
@@ -206,23 +212,25 @@ static int maxArgWidth(const struct poptOption * opt,
     return max;
 }
 
-static void singleTableHelp(FILE * f, const struct poptOption * table, 
-			    int left,
-			    const char *translation_domain)
+static void singleTableHelp(FILE * f,
+		/*@null@*/ const struct poptOption * table, int left,
+		/*@null@*/ const char * translation_domain)
 {
     const struct poptOption * opt;
     const char *sub_transdom;
 
+    if (table != NULL)
     for (opt = table; (opt->longName || opt->shortName || opt->arg); opt++) {
 	if ((opt->longName || opt->shortName) && 
 	    !(opt->argInfo & POPT_ARGFLAG_DOC_HIDDEN))
 	    singleOptionHelp(f, left, opt, translation_domain);
     }
 
+    if (table != NULL)
     for (opt = table; (opt->longName || opt->shortName || opt->arg); opt++) {
 	if ((opt->argInfo & POPT_ARG_MASK) == POPT_ARG_INCLUDE_TABLE) {
 	    sub_transdom = getTableTranslationDomain(opt->arg);
-	    if(!sub_transdom)
+	    if (sub_transdom == NULL)
 		sub_transdom = translation_domain;
 	    
 	    if (opt->descrip)
@@ -240,7 +248,10 @@ static int showHelpIntro(poptContext con, FILE * f)
 
     fprintf(f, POPT_("Usage:"));
     if (!(con->flags & POPT_CONTEXT_KEEP_FIRST)) {
+	/*@-nullderef@*/	/* LCL: wazzup? */
 	fn = con->optionStack->argv[0];
+	/*@=nullderef@*/
+	if (fn == NULL) return len;
 	if (strchr(fn, '/')) fn = strrchr(fn, '/') + 1;
 	fprintf(f, " %s", fn);
 	len += strlen(fn) + 1;
@@ -253,7 +264,7 @@ void poptPrintHelp(poptContext con, FILE * f, /*@unused@*/ int flags)
 {
     int leftColWidth;
 
-    showHelpIntro(con, f);
+    (void) showHelpIntro(con, f);
     if (con->otherHelp)
 	fprintf(f, " %s\n", con->otherHelp);
     else
@@ -264,15 +275,15 @@ void poptPrintHelp(poptContext con, FILE * f, /*@unused@*/ int flags)
 }
 
 static int singleOptionUsage(FILE * f, int cursor, 
-			     const struct poptOption * opt,
-			     const char *translation_domain)
+		const struct poptOption * opt,
+		/*@null@*/ const char *translation_domain)
 {
     int len = 3;
     char shortStr[2] = { '\0', '\0' };
     const char * item = shortStr;
     const char * argDescrip = getArgDescrip(opt, translation_domain);
 
-    if (opt->shortName) {
+    if (opt->shortName!= '\0' ) {
 	if (!(opt->argInfo & POPT_ARG_MASK)) 
 	    return cursor;	/* we did these already */
 	len++;
@@ -296,47 +307,57 @@ static int singleOptionUsage(FILE * f, int cursor,
     fprintf(f, " [-%s%s%s%s]",
 	((opt->shortName || (opt->argInfo & POPT_ARGFLAG_ONEDASH)) ? "" : "-"),
 	item,
-	(argDescrip ? (opt->shortName ? " " : "=") : ""),
+	(argDescrip ? (opt->shortName != '\0' ? " " : "=") : ""),
 	(argDescrip ? argDescrip : ""));
 
     return cursor + len + 1;
 }
 
-static int singleTableUsage(FILE * f, int cursor,
-	const struct poptOption * opt, const char * translation_domain)
+static int singleTableUsage(FILE * f,
+		int cursor, const struct poptOption * opt,
+		/*@null@*/ const char * translation_domain)
 {
+    /*@-branchstate@*/		/* FIX: W2DO? */
+    if (opt != NULL)
     for (; (opt->longName || opt->shortName || opt->arg) ; opt++) {
-        if ((opt->argInfo & POPT_ARG_MASK) == POPT_ARG_INTL_DOMAIN)
+        if ((opt->argInfo & POPT_ARG_MASK) == POPT_ARG_INTL_DOMAIN) {
 	    translation_domain = (const char *)opt->arg;
-	else if ((opt->argInfo & POPT_ARG_MASK) == POPT_ARG_INCLUDE_TABLE) 
+	} else if ((opt->argInfo & POPT_ARG_MASK) == POPT_ARG_INCLUDE_TABLE) {
+	    if (opt->arg)	/* XXX program error */
 	    cursor = singleTableUsage(f, cursor, opt->arg, translation_domain);
-	else if ((opt->longName || opt->shortName) && 
-		 !(opt->argInfo & POPT_ARGFLAG_DOC_HIDDEN))
+	} else if ((opt->longName || opt->shortName) &&
+		 !(opt->argInfo & POPT_ARGFLAG_DOC_HIDDEN)) {
 	    cursor = singleOptionUsage(f, cursor, opt, translation_domain);
+	}
     }
+    /*@=branchstate@*/
 
     return cursor;
 }
 
-static int showShortOptions(const struct poptOption * opt, FILE * f, char * str)
+static int showShortOptions(const struct poptOption * opt, FILE * f,
+		/*@null@*/ char * str)
 {
-    char s[300];		/* this is larger then the ascii set, so
-				   it should do just fine */
+    char * s = alloca(300);	/* larger then the ascii set */
 
     s[0] = '\0';
+    /*@-branchstate@*/		/* FIX: W2DO? */
     if (str == NULL) {
 	memset(s, 0, sizeof(s));
 	str = s;
     }
+    /*@=branchstate@*/
 
+    if (opt != NULL)
     for (; (opt->longName || opt->shortName || opt->arg); opt++) {
 	if (opt->shortName && !(opt->argInfo & POPT_ARG_MASK))
 	    str[strlen(str)] = opt->shortName;
 	else if ((opt->argInfo & POPT_ARG_MASK) == POPT_ARG_INCLUDE_TABLE)
-	    showShortOptions(opt->arg, f, str);
+	    if (opt->arg)	/* XXX program error */
+		(void) showShortOptions(opt->arg, f, str);
     } 
 
-    if (s != str || !*s)
+    if (s != str || *s != '\0')
 	return 0;
 
     fprintf(f, " [-%s]", s);
@@ -349,7 +370,7 @@ void poptPrintUsage(poptContext con, FILE * f, /*@unused@*/ int flags)
 
     cursor = showHelpIntro(con, f);
     cursor += showShortOptions(con->options, f, NULL);
-    singleTableUsage(f, cursor, con->options, NULL);
+    (void) singleTableUsage(f, cursor, con->options, NULL);
 
     if (con->otherHelp) {
 	cursor += strlen(con->otherHelp) + 1;
diff --git a/poptint.h b/poptint.h
index 066e143..3a3ee9b 100644
--- a/poptint.h
+++ b/poptint.h
@@ -9,6 +9,16 @@
 #ifndef H_POPTINT
 #define H_POPTINT
 
+/**
+ * Wrapper to free(3), hides const compilation noise, permit NULL, return NULL.
+ * @param this		memory to free
+ * @retval		NULL always
+ */
+/*@unused@*/ static inline /*@null@*/ void * _free(/*@only@*/ /*@null@*/ const void * this) {
+    if (this != NULL)	free((void *)this);
+    return NULL;
+}
+
 /* Bit mask macros. */
 typedef	unsigned int __pbm_bits;
 #define	__PBM_NBITS		(8 * sizeof (__pbm_bits))
@@ -20,50 +30,50 @@ typedef struct {
 #define	__PBM_BITS(set)	((set)->bits)
 
 #define	PBM_ALLOC(d)	calloc(__PBM_IX (d) + 1, sizeof(__pbm_bits))
-#define	PBM_FREE(s)	free(s);
+#define	PBM_FREE(s)	_free(s);
 #define PBM_SET(d, s)   (__PBM_BITS (s)[__PBM_IX (d)] |= __PBM_MASK (d))
 #define PBM_CLR(d, s)   (__PBM_BITS (s)[__PBM_IX (d)] &= ~__PBM_MASK (d))
 #define PBM_ISSET(d, s) ((__PBM_BITS (s)[__PBM_IX (d)] & __PBM_MASK (d)) != 0)
 
 struct optionStackEntry {
     int argc;
-/*@only@*/ const char ** argv;
-/*@only@*/ pbm_set * argb;
+/*@only@*/ /*@null@*/ const char ** argv;
+/*@only@*/ /*@null@*/ pbm_set * argb;
     int next;
-/*@only@*/ const char * nextArg;
-/*@keep@*/ const char * nextCharArg;
-/*@dependent@*/ struct poptAlias * currAlias;
+/*@only@*/ /*@null@*/ const char * nextArg;
+/*@keep@*/ /*@null@*/ const char * nextCharArg;
+/*@dependent@*/ /*@null@*/ struct poptAlias * currAlias;
     int stuffed;
 };
 
 struct execEntry {
-    const char * longName;
+/*@owned@*/ /*@null@*/ const char * longName;
     char shortName;
-    const char * script;
+/*@only@*/ /*@null@*/ const char * script;
 };
 
 struct poptContext_s {
     struct optionStackEntry optionStack[POPT_OPTION_DEPTH];
 /*@dependent@*/ struct optionStackEntry * os;
-/*@owned@*/ const char ** leftovers;
+/*@owned@*/ /*@null@*/ const char ** leftovers;
     int numLeftovers;
     int nextLeftover;
 /*@keep@*/ const struct poptOption * options;
     int restLeftover;
-/*@only@*/ const char * appName;
-/*@only@*/ struct poptAlias * aliases;
+/*@only@*/ /*@null@*/ const char * appName;
+/*@only@*/ /*@null@*/ struct poptAlias * aliases;
     int numAliases;
     int flags;
-    struct execEntry * execs;
+/*@owned@*/ /*@null@*/ struct execEntry * execs;
     int numExecs;
-/*@only@*/ const char ** finalArgv;
+/*@only@*/ /*@null@*/ const char ** finalArgv;
     int finalArgvCount;
     int finalArgvAlloced;
-/*@dependent@*/ struct execEntry * doExec;
+/*@dependent@*/ /*@null@*/ struct execEntry * doExec;
 /*@only@*/ const char * execPath;
     int execAbsolute;
 /*@only@*/ const char * otherHelp;
-    pbm_set * arg_strip;
+/*@null@*/ pbm_set * arg_strip;
 };
 
 #ifdef HAVE_LIBINTL_H
diff --git a/poptparse.c b/poptparse.c
index 9133c36..fdce572 100644
--- a/poptparse.c
+++ b/poptparse.c
@@ -18,6 +18,8 @@ int poptDupArgv(int argc, const char **argv,
     char * dst;
     int i;
 
+    if (argc <= 0 || argv == NULL)	/* XXX can't happen */
+	return POPT_ERROR_NOARG;
     for (i = 0; i < argc; i++) {
 	if (argv[i] == NULL)
 	    return POPT_ERROR_NOARG;
@@ -25,6 +27,8 @@ int poptDupArgv(int argc, const char **argv,
     }
 	
     dst = malloc(nb);
+    if (dst == NULL)			/* XXX can't happen */
+	return POPT_ERROR_MALLOC;
     argv2 = (void *) dst;
     dst += (argc + 1) * sizeof(*argv);
 
@@ -34,8 +38,14 @@ int poptDupArgv(int argc, const char **argv,
     }
     argv2[argc] = NULL;
 
-    *argvPtr = argv2;
-    *argcPtr = argc;
+    if (argvPtr) {
+	*argvPtr = argv2;
+    } else {
+	free(argv2);
+	argv2 = NULL;
+    }
+    if (argcPtr)
+	*argcPtr = argc;
     return 0;
 }
 
@@ -48,28 +58,31 @@ int poptParseArgvString(const char * s, int * argcPtr, const char *** argvPtr)
     int argc = 0;
     int buflen = strlen(s) + 1;
     char * buf = memset(alloca(buflen), 0, buflen);
+    int rc = POPT_ERROR_MALLOC;
 
+    if (argv == NULL) return rc;
     argv[argc] = buf;
 
-    for (src = s; *src; src++) {
+    for (src = s; *src != '\0'; src++) {
 	if (quote == *src) {
 	    quote = '\0';
-	} else if (quote) {
+	} else if (quote != '\0') {
 	    if (*src == '\\') {
 		src++;
 		if (!*src) {
-		    free(argv);
-		    return POPT_ERROR_BADQUOTE;
+		    rc = POPT_ERROR_BADQUOTE;
+		    goto exit;
 		}
 		if (*src != quote) *buf++ = '\\';
 	    }
 	    *buf++ = *src;
 	} else if (isspace(*src)) {
-	    if (*argv[argc]) {
+	    if (*argv[argc] != '\0') {
 		buf++, argc++;
 		if (argc == argvAlloced) {
 		    argvAlloced += POPT_ARGV_ARRAY_GROW_DELTA;
 		    argv = realloc(argv, sizeof(*argv) * argvAlloced);
+		    if (argv == NULL) goto exit;
 		}
 		argv[argc] = buf;
 	    }
@@ -81,8 +94,8 @@ int poptParseArgvString(const char * s, int * argcPtr, const char *** argvPtr)
 	  case '\\':
 	    src++;
 	    if (!*src) {
-		free(argv);
-		return POPT_ERROR_BADQUOTE;
+		rc = POPT_ERROR_BADQUOTE;
+		goto exit;
 	    }
 	    /*@fallthrough@*/
 	  default:
@@ -95,9 +108,9 @@ int poptParseArgvString(const char * s, int * argcPtr, const char *** argvPtr)
 	argc++, buf++;
     }
 
-    (void) poptDupArgv(argc, argv, argcPtr, argvPtr);
-
-    free(argv);
+    rc = poptDupArgv(argc, argv, argcPtr, argvPtr);
 
-    return 0;
+exit:
+    if (argv) free(argv);
+    return rc;
 }
diff --git a/system.h b/system.h
index 43ad70f..8015c64 100644
--- a/system.h
+++ b/system.h
@@ -44,12 +44,14 @@ char *alloca ();
 
 /*@only@*/ char * xstrdup (const char *str);
 
+#if !defined(__LCLINT__)
 #if HAVE_MCHECK_H && defined(__GNUC__)
 #define	vmefail()	(fprintf(stderr, "virtual memory exhausted.\n"), exit(EXIT_FAILURE), NULL)
 #define xstrdup(_str)   (strcpy((malloc(strlen(_str)+1) ? : vmefail()), (_str)))
 #else
 #define	xstrdup(_str)	strdup(_str)
 #endif  /* HAVE_MCHECK_H && defined(__GNUC__) */
+#endif /* !__LCLINT__ */
 
 
 #include "popt.h"
diff --git a/test1.c b/test1.c
index 7b7f55f..919ea7c 100644
--- a/test1.c
+++ b/test1.c
@@ -149,7 +149,7 @@ int main(int argc, const char ** argv) {
     fprintf(stdout, "\n");
 
 exit:
-    poptFreeContext(optCon);
+    optCon = poptFreeContext(optCon);
 #if HAVE_MCHECK_H && HAVE_MTRACE
     muntrace();   /* Trace malloc only if MALLOC_TRACE=mtrace-output-file. */
 #endif
diff --git a/test2.c b/test2.c
index 3181c0f..afac1c6 100644
--- a/test2.c
+++ b/test2.c
@@ -133,7 +133,7 @@ main(int argc, const char ** argv) {
     /* although there are no options to be parsed, check for --help */
     poptGetNextOpt(optCon);
 
-    poptFreeContext(optCon);
+    optCon = poptFreeContext(optCon);
 
     printf( "dbusername %s\tdbpassword %s\n"
             "txhost %s\ttxsslport %d\ttxstoreid %d\tpathofkeyfile %s\n"
-- 
Gitee


From f22dad373eeb3a9ced45765bdb2ecccd48964520 Mon Sep 17 00:00:00 2001
From: Jeff Johnson <n3npq@mac.com>
Date: Sun, 6 May 2001 13:39:22 +0000
Subject: [PATCH 304/667] Change URL.

---
 popt.3 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/popt.3 b/popt.3
index 5928b2a..68a8556 100644
--- a/popt.3
+++ b/popt.3
@@ -757,4 +757,4 @@ Erik W. Troan (Addison-Wesley, 1998; ISBN 0-201-30821-5), Chapter 24.
 .sp
 .BR popt.ps " is a Postscript version of the above cited book "
 chapter. It can be found in the source archive for popt available at: 
-ftp://ftp.redhat.com/pub/redhat/code/popt
+ftp://ftp.rpm.org/pub/rpm.
-- 
Gitee


From 240b2861c6b3b789e8ee00d666daa65d470002a7 Mon Sep 17 00:00:00 2001
From: Jeff Johnson <n3npq@mac.com>
Date: Tue, 29 May 2001 15:03:36 +0000
Subject: [PATCH 305/667] - eliminate db-1.85 and db-2.x configuration. - fix:
 popt arg sanity checks broken, optarg != optArg. - fix: popt range checks on
 floats/doubles broken. - popt: return POPT_ERROR_ERRNO on config
 open/read/close failure.

---
 popt.c       | 116 ++++++++++++++++++++++++++-------------------------
 poptconfig.c |  20 +++++----
 2 files changed, 70 insertions(+), 66 deletions(-)

diff --git a/popt.c b/popt.c
index 169c3a4..caae8b2 100644
--- a/popt.c
+++ b/popt.c
@@ -30,6 +30,20 @@ static char * strerror(int errno) {
 }
 #endif
 
+#ifdef MYDEBUG
+/*@unused@*/ static void prtcon(const char *msg, poptContext con)
+{
+    if (msg) fprintf(stderr, "%s", msg);
+    fprintf(stderr, "\tcon %p os %p nextCharArg \"%s\" nextArg \"%s\" argv[%d] \"%s\"\n",
+	con, con->os,
+	(con->os->nextCharArg ? con->os->nextCharArg : ""),
+	(con->os->nextArg ? con->os->nextArg : ""),
+	con->os->next,
+	(con->os->argv && con->os->argv[con->os->next]
+		? con->os->argv[con->os->next] : ""));
+}
+#endif
+
 void poptSetExecPath(poptContext con, const char * path, int allowAbsolute)
 {
     con->execPath = _free(con->execPath);
@@ -105,9 +119,10 @@ static void invokeCallbacksOPTION(poptContext con,
 	    /*@=castfcnptr@*/
 	    const void * cbData = (cbopt->descrip ? cbopt->descrip : myData);
 	    /* Perform callback. */
-	    if (cb != NULL)	/* XXX program error */
+	    if (cb != NULL) {	/* XXX program error */
 		cb(con, POPT_CALLBACK_REASON_OPTION, myOpt,
 			con->os->nextArg, cbData);
+	    }
 	    /* Terminate (unless explcitly continuing). */
 	    if (!(cbopt->argInfo & POPT_CBFLAG_CONTINUE))
 		return;
@@ -150,10 +165,10 @@ poptContext poptGetContext(const char * name, int argc, const char ** argv,
     if (getenv("POSIXLY_CORRECT") || getenv("POSIX_ME_HARDER"))
 	con->flags |= POPT_CONTEXT_POSIXMEHARDER;
 
-    if (name)
-	/*@-nullpass@*/		/* FIX: malloc can return NULL. */
-	con->appName = strcpy(malloc(strlen(name) + 1), name);
-	/*@=nullpass@*/
+    if (name) {
+	char * t = malloc(strlen(name) + 1);
+	if (t) con->appName = strcpy(t, name);
+     }
 
     invokeCallbacksPRE(con, con->options);
 
@@ -349,7 +364,7 @@ static int execCommand(poptContext con)
 	argc += con->numLeftovers;
     }
 
-    argv[argc++] = NULL;
+    argv[argc] = NULL;
 
 #ifdef __hpux
     (void) setresuid(getuid(), getuid(),-1);
@@ -371,10 +386,10 @@ static int execCommand(poptContext con)
     if (argv[0] == NULL)
 	return POPT_ERROR_NOARG;
 #ifdef MYDEBUG
-    {	const char ** arg;
-	fprintf(stderr, "==> execvp(%s):", argv[0]);
-	for (arg = argv; *arg; arg++)
-	    fprintf(stderr, " %s", *arg);
+    {	const char ** avp;
+	fprintf(stderr, "==> execvp(%s) argv[%d]:", argv[0], argc);
+	for (avp = argv; *avp; avp++)
+	    fprintf(stderr, " '%s'", *avp);
 	fprintf(stderr, "\n");
     }
 #endif
@@ -401,21 +416,19 @@ findOption(const struct poptOption * opt, /*@null@*/ const char * longName,
 
 	if ((opt->argInfo & POPT_ARG_MASK) == POPT_ARG_INCLUDE_TABLE) {
 	    const struct poptOption * opt2;
+
 	    /* Recurse on included sub-tables. */
 	    if (opt->arg == NULL) continue;	/* XXX program error */
 	    opt2 = findOption(opt->arg, longName, shortName, callback,
 			      callbackData, singleDash);
-	    if (opt2) {
-		/* Sub-table data will be inheirited if no data yet. */
-		/*@-nullderef@*/	/* LCL: *callback != NULL */
-		if (callback && *callback &&
-			callbackData && *callbackData == NULL)
-		    /*@-observertrans -dependenttrans @*/
-		    *callbackData = opt->descrip;
-		    /*@=observertrans =dependenttrans @*/
-		/*@=nullderef@*/
-		return opt2;
-	    }
+	    if (opt2 == NULL) continue;
+	    /* Sub-table data will be inheirited if no data yet. */
+	    if (!(callback && *callback)) return opt2;
+	    if (!(callbackData && *callback == NULL)) return opt2;
+	    /*@-observertrans -dependenttrans @*/
+	    *callbackData = opt->descrip;
+	    /*@=observertrans =dependenttrans @*/
+	    return opt2;
 	} else if ((opt->argInfo & POPT_ARG_MASK) == POPT_ARG_CALLBACK) {
 	    cb = opt;
 	} else if (longName && opt->longName &&
@@ -589,20 +602,6 @@ static int poptSaveInt(const struct poptOption * opt, long aLong)
     return 0;
 }
 
-#ifdef MYDEBUG
-static void prtcon(const char *msg, poptContext con)
-{
-    if (msg) fprintf(stderr, "%s", msg);
-    fprintf(stderr, "\tcon %p os %p nextCharArg \"%s\" nextArg \"%s\" argv[%d] \"%s\"\n",
-	con, con->os,
-	(con->os->nextCharArg ? con->os->nextCharArg : ""),
-	(con->os->nextArg ? con->os->nextArg : ""),
-	con->os->next,
-	(con->os->argv && con->os->argv[con->os->next]
-		? con->os->argv[con->os->next] : ""));
-}
-#endif
-
 /* returns 'val' element, -1 on last item, POPT_ERROR_* on error */
 int poptGetNextOpt(poptContext con)
 {
@@ -698,7 +697,8 @@ int poptGetNextOpt(poptContext con)
 		con->os->nextCharArg = origOptString + 1;
 	    } else {
 		if (con->os == con->optionStack &&
-		   opt->argInfo & POPT_ARGFLAG_STRIP) {
+		   opt->argInfo & POPT_ARGFLAG_STRIP)
+		{
 		    canstrip = 1;
 		    poptStripArg(con, thisopt);
 		}
@@ -751,13 +751,11 @@ int poptGetNextOpt(poptContext con)
 	    /*@-usedef@*/	/* FIX: W2DO? */
 	    if (longArg) {
 	    /*@=usedef@*/
-		/*@-evalorder@*/	/* FIX: W2DO? */
-		con->os->nextArg = expandNextArg(con, longArg);
-		/*@=evalorder@*/
+		longArg = expandNextArg(con, longArg);
+		con->os->nextArg = longArg;
 	    } else if (con->os->nextCharArg) {
-		/*@-evalorder@*/	/* FIX: W2DO? */
-		con->os->nextArg = expandNextArg(con, con->os->nextCharArg);
-		/*@=evalorder@*/
+		longArg = expandNextArg(con, con->os->nextCharArg);
+		con->os->nextArg = longArg;
 		con->os->nextCharArg = NULL;
 	    } else {
 		while (con->os->next == con->os->argc &&
@@ -774,18 +772,20 @@ int poptGetNextOpt(poptContext con)
 		    /* make sure this isn't part of a short arg or the
 			result of an alias expansion */
 		    if (con->os == con->optionStack &&
-			opt->argInfo & POPT_ARGFLAG_STRIP &&
+			(opt->argInfo & POPT_ARGFLAG_STRIP) &&
 			canstrip) {
 			poptStripArg(con, con->os->next);
 		    }
 		
-		    if (con->os->argv != NULL)	/* XXX can't happen */
-		    /*@-evalorder@*/	/* FIX: W2DO? */
-		    con->os->nextArg =
-			expandNextArg(con, con->os->argv[con->os->next++]);
-		    /*@=evalorder@*/
+		    if (con->os->argv != NULL) {	/* XXX can't happen */
+			longArg =
+			    expandNextArg(con, con->os->argv[con->os->next]);
+			con->os->nextArg = longArg;
+			con->os->next++;
+		    }
 		}
 	    }
+	    longArg = NULL;
 
 	    if (opt->arg) {
 		switch (opt->argInfo & POPT_ARG_MASK) {
@@ -825,29 +825,31 @@ int poptGetNextOpt(poptContext con)
 		    char *end;
 
 		    if (con->os->nextArg) {
+			int saveerrno = errno;
+			errno = 0;
 			aDouble = strtod(con->os->nextArg, &end);
+			if (errno == ERANGE)
+			    return POPT_ERROR_OVERFLOW;
+			errno = saveerrno;
 			if (*end != '\0')
 			    return POPT_ERROR_BADNUMBER;
 		    }
 
-		    if ((aDouble - HUGE_VAL) < DBL_EPSILON ||
-			(aDouble + HUGE_VAL) < DBL_EPSILON)
-			return POPT_ERROR_OVERFLOW;
-		    if ((aDouble - 0.0) < DBL_EPSILON && errno == ERANGE)
-			return POPT_ERROR_OVERFLOW;
 		    if ((opt->argInfo & POPT_ARG_MASK) == POPT_ARG_DOUBLE) {
 			*((double *) opt->arg) = aDouble;
 		    } else {
-			if ((aDouble - FLT_MAX) > DBL_EPSILON)
+#define _ABS(a)	((((a) - 0.0) < DBL_EPSILON) ? -(a) : (a))
+			if ((_ABS(aDouble) - FLT_MAX) > DBL_EPSILON)
 			    return POPT_ERROR_OVERFLOW;
-			if ((aDouble + FLT_MIN) > DBL_EPSILON)
+			if ((FLT_MIN - _ABS(aDouble)) > DBL_EPSILON)
 			    return POPT_ERROR_OVERFLOW;
 			*((float *) opt->arg) = aDouble;
 		    }
 		}   break;
 		default:
-		    fprintf(stdout, POPT_("option type (%d) not implemented in popt\n"),
-		      opt->argInfo & POPT_ARG_MASK);
+		    fprintf(stdout,
+			POPT_("option type (%d) not implemented in popt\n"),
+			(opt->argInfo & POPT_ARG_MASK));
 		    exit(EXIT_FAILURE);
 		}
 	    }
diff --git a/poptconfig.c b/poptconfig.c
index d518646..f53dd5d 100644
--- a/poptconfig.c
+++ b/poptconfig.c
@@ -70,18 +70,19 @@ int poptReadConfigFile(poptContext con, const char * fn)
     char * buf;
 /*@dependent@*/ char * dst;
     int fd, rc;
-    int fileLength;
+    off_t fileLength;
 
     fd = open(fn, O_RDONLY);
-    if (fd < 0) {
-	if (errno == ENOENT)
-	    return 0;
-	else 
-	    return POPT_ERROR_ERRNO;
-    }
+    if (fd < 0)
+	return (errno == ENOENT ? 0 : POPT_ERROR_ERRNO);
 
     fileLength = lseek(fd, 0, SEEK_END);
-    (void) lseek(fd, 0, 0);
+    if (fileLength == -1 || lseek(fd, 0, 0) == -1) {
+	rc = errno;
+	(void) close(fd);
+	errno = rc;
+	return POPT_ERROR_ERRNO;
+    }
 
     file = alloca(fileLength + 1);
     if (read(fd, (char *)file, fileLength) != fileLength) {
@@ -90,7 +91,8 @@ int poptReadConfigFile(poptContext con, const char * fn)
 	errno = rc;
 	return POPT_ERROR_ERRNO;
     }
-    (void) close(fd);
+    if (close(fd) == -1)
+	return POPT_ERROR_ERRNO;
 
     dst = buf = alloca(fileLength + 1);
 
-- 
Gitee


From ced4e2a5b7c9f4433bca01084b90bee703a4d756 Mon Sep 17 00:00:00 2001
From: Jeff Johnson <n3npq@mac.com>
Date: Tue, 29 May 2001 20:01:28 +0000
Subject: [PATCH 306/667] - fix: popt exec doesn't add '--', --target et al no
 longer need '='. - fix: popt consume-next-arg "!#:+" w/o side effect
 (#41956).

---
 popt.c    | 68 +++++++++++++++++++++++++++++++++++--------------------
 testit.sh |  2 +-
 2 files changed, 45 insertions(+), 25 deletions(-)

diff --git a/popt.c b/popt.c
index caae8b2..548cbd8 100644
--- a/popt.c
+++ b/popt.c
@@ -52,6 +52,7 @@ void poptSetExecPath(poptContext con, const char * path, int allowAbsolute)
 }
 
 static void invokeCallbacksPRE(poptContext con, const struct poptOption * opt)
+	/*@modifies internalState@*/
 {
     if (opt != NULL)
     for (; opt->longName || opt->shortName || opt->arg; opt++) {
@@ -71,6 +72,7 @@ static void invokeCallbacksPRE(poptContext con, const struct poptOption * opt)
 }
 
 static void invokeCallbacksPOST(poptContext con, const struct poptOption * opt)
+	/*@modifies internalState@*/
 {
     if (opt != NULL)
     for (; opt->longName || opt->shortName || opt->arg; opt++) {
@@ -93,6 +95,7 @@ static void invokeCallbacksOPTION(poptContext con,
 				  const struct poptOption * opt,
 				  const struct poptOption * myOpt,
 				  /*@null@*/ const void * myData, int shorty)
+	/*@modifies internalState@*/
 {
     const struct poptOption * cbopt = NULL;
 
@@ -168,14 +171,16 @@ poptContext poptGetContext(const char * name, int argc, const char ** argv,
     if (name) {
 	char * t = malloc(strlen(name) + 1);
 	if (t) con->appName = strcpy(t, name);
-     }
+    }
 
     invokeCallbacksPRE(con, con->options);
 
     return con;
 }
 
-static void cleanOSE(struct optionStackEntry *os)
+static void cleanOSE(/*@special@*/ struct optionStackEntry *os)
+	/*@uses os @*/
+	/*@releases os->nextArg, os->argv, os->argb @*/
 {
     os->nextArg = _free(os->nextArg);
     os->argv = _free(os->argv);
@@ -214,9 +219,11 @@ void poptResetContext(poptContext con)
     /*@=nullstate@*/
 }
 
-/* Only one of longName, shortName may be set at a time */
-static int handleExec(poptContext con, /*@null@*/ const char * longName,
-		char shortName)
+/* Only one of longName, shortName should be set, not both. */
+static int handleExec(/*@special@*/ poptContext con,
+		/*@null@*/ const char * longName, char shortName)
+	/*@uses con->execs, con->numExecs, con->flags, con->doExec,
+		con->finalArgv, con->finalArgvAlloced, con->finalArgvCount @*/
 {
     int i;
 
@@ -268,9 +275,11 @@ static int handleExec(poptContext con, /*@null@*/ const char * longName,
 }
 
 /* Only one of longName, shortName may be set at a time */
-static int handleAlias(poptContext con,
+static int handleAlias(/*@special@*/ poptContext con,
 		/*@null@*/ const char * longName, char shortName,
 		/*@keep@*/ /*@null@*/ const char * nextCharArg)
+	/*@uses con->aliases, con->numAliases, con->optionStack,
+		con->os, con->os->currAlias, con->os->currAlias->longName @*/
 {
     int rc;
     int i;
@@ -359,7 +368,9 @@ static int execCommand(poptContext con)
     }
 
     if (con->leftovers != NULL && con->numLeftovers > 0) {
+#if 0
 	argv[argc++] = "--";
+#endif
 	memcpy(argv + argc, con->leftovers, sizeof(*argv) * con->numLeftovers);
 	argc += con->numLeftovers;
     }
@@ -424,7 +435,7 @@ findOption(const struct poptOption * opt, /*@null@*/ const char * longName,
 	    if (opt2 == NULL) continue;
 	    /* Sub-table data will be inheirited if no data yet. */
 	    if (!(callback && *callback)) return opt2;
-	    if (!(callbackData && *callback == NULL)) return opt2;
+	    if (!(callbackData && *callbackData == NULL)) return opt2;
 	    /*@-observertrans -dependenttrans @*/
 	    *callbackData = opt->descrip;
 	    /*@=observertrans =dependenttrans @*/
@@ -465,8 +476,10 @@ findOption(const struct poptOption * opt, /*@null@*/ const char * longName,
     return opt;
 }
 
-static const char * findNextArg(poptContext con, unsigned argx, int delete)
-	/*@modifies con @*/
+static const char * findNextArg(/*@special@*/ poptContext con,
+		unsigned argx, int delete)
+	/*@uses con->optionStack, con->os,
+		con->os->next, con->os->argb, con->os->argc, con->os->argv @*/
 {
     struct optionStackEntry * os = con->os;
     const char * arg;
@@ -491,16 +504,16 @@ static const char * findNextArg(poptContext con, unsigned argx, int delete)
 	}
 	if (os > con->optionStack) os--;
     } while (arg == NULL);
-    /*@-compdef@*/	/* FIX: con->os->argv undefined */
     return arg;
-    /*@=compdef@*/
 }
 
 static /*@only@*/ /*@null@*/ const char *
-expandNextArg(poptContext con, const char * s)
+expandNextArg(/*@special@*/ poptContext con, const char * s)
+	/*@uses con->optionStack, con->os,
+		con->os->next, con->os->argb, con->os->argc, con->os->argv @*/
 	/*@modifies con @*/
 {
-    const char *a;
+    const char * a = NULL;
     size_t alen;
     char *t, *te;
     size_t tn = strlen(s) + 1;
@@ -518,8 +531,10 @@ expandNextArg(poptContext con, const char * s)
 	case '!':
 	    if (!(s[0] == '#' && s[1] == ':' && s[2] == '+'))
 		break;
-	    if ((a = findNextArg(con, 1, 1)) == NULL)
-		break;
+	    /* XXX Make sure that findNextArg deletes only next arg. */
+	    if (a == NULL) {
+		if ((a = findNextArg(con, 1, 1)) == NULL) break;
+	    }
 	    s += 3;
 
 	    alen = strlen(a);
@@ -541,6 +556,7 @@ expandNextArg(poptContext con, const char * s)
 }
 
 static void poptStripArg(poptContext con, int which)
+	/*@modifies con @*/
 {
     if (con->arg_strip == NULL)
 	con->arg_strip = PBM_ALLOC(con->optionStack[0].argc);
@@ -549,6 +565,7 @@ static void poptStripArg(poptContext con, int which)
 }
 
 static int poptSaveLong(const struct poptOption * opt, long aLong)
+	/*@modifies opt->arg @*/
 {
     if (opt->arg == NULL)
 	return POPT_ERROR_NULLARG;
@@ -576,6 +593,7 @@ static int poptSaveLong(const struct poptOption * opt, long aLong)
 }
 
 static int poptSaveInt(const struct poptOption * opt, long aLong)
+	/*@modifies opt->arg @*/
 {
     if (opt->arg == NULL)
 	return POPT_ERROR_NULLARG;
@@ -675,6 +693,7 @@ int poptGetNextOpt(poptContext con)
 		/* XXX aliases with arg substitution need "--alias=arg" */
 		if (handleAlias(con, optString, '\0', NULL))
 		    continue;
+
 		if (handleExec(con, optString, '\0'))
 		    continue;
 
@@ -708,15 +727,13 @@ int poptGetNextOpt(poptContext con)
 
 	/* Process next short option */
 	if (con->os->nextCharArg) {
-	    /*@-branchstate@*/		/* FIX: W2DO? */
 	    origOptString = con->os->nextCharArg;
 
 	    con->os->nextCharArg = NULL;
 
-	    if (handleAlias(con, NULL, *origOptString,
-			    origOptString + 1)) {
+	    if (handleAlias(con, NULL, *origOptString, origOptString + 1))
 		continue;
-	    }
+
 	    if (handleExec(con, NULL, *origOptString)) {
 		/* Restore rest of short options for further processing */
 		origOptString++;
@@ -732,6 +749,7 @@ int poptGetNextOpt(poptContext con)
 	    shorty = 1;
 
 	    origOptString++;
+	    /*@-branchstate@*/		/* FIX: W2DO? */
 	    if (*origOptString != '\0')
 		con->os->nextCharArg = origOptString;
 	    /*@=branchstate@*/
@@ -769,8 +787,10 @@ int poptGetNextOpt(poptContext con)
 			return POPT_ERROR_NOARG;
 		} else {
 
-		    /* make sure this isn't part of a short arg or the
-			result of an alias expansion */
+		    /*
+		     * Make sure this isn't part of a short arg or the
+		     * result of an alias expansion.
+		     */
 		    if (con->os == con->optionStack &&
 			(opt->argInfo & POPT_ARGFLAG_STRIP) &&
 			canstrip) {
@@ -778,10 +798,10 @@ int poptGetNextOpt(poptContext con)
 		    }
 		
 		    if (con->os->argv != NULL) {	/* XXX can't happen */
-			longArg =
-			    expandNextArg(con, con->os->argv[con->os->next]);
+			/* XXX watchout: subtle side-effects live here. */
+			longArg = con->os->argv[con->os->next++];
+			longArg = expandNextArg(con, longArg);
 			con->os->nextArg = longArg;
-			con->os->next++;
 		    }
 		}
 	    }
diff --git a/testit.sh b/testit.sh
index 46d6706..478613d 100755
--- a/testit.sh
+++ b/testit.sh
@@ -47,7 +47,7 @@ run test1 "test1 - 18" "callback: c sampledata bar arg1: 1 arg2: (none)" --arg1
 run test1 "test1 - 19" "" --echo-args
 run test1 "test1 - 20" "--arg1" --echo-args --arg1
 run test1 "test1 - 21" "--arg2 something" -T something -e
-run test1 "test1 - 22" "--arg2 something -- more args" -T something -a more args
+run test1 "test1 - 22" "--arg2 something more args" -T something -a more args
 run test1 "test1 - 23" "--echo-args -a" --echo-args -e -a
 run test1 "test1 - 24" "arg1: 0 arg2: (none) short: 1" -shortoption
 run test1 "test1 - 25" "arg1: 0 arg2: (none) short: 1" --shortoption
-- 
Gitee


From c0d437597ae259d1abafe4610d3eeea39caeb50f Mon Sep 17 00:00:00 2001
From: Jeff Johnson <n3npq@mac.com>
Date: Mon, 4 Jun 2001 13:55:58 +0000
Subject: [PATCH 307/667] lclint fiddles.

---
 popt.c     |  4 +--
 popt.h     | 76 +++++++++++++++++++++++++++++++++++++++---------------
 popthelp.c | 22 ++++++++--------
 poptint.h  |  6 ++---
 system.h   |  2 +-
 5 files changed, 72 insertions(+), 38 deletions(-)

diff --git a/popt.c b/popt.c
index 548cbd8..8c42f90 100644
--- a/popt.c
+++ b/popt.c
@@ -477,7 +477,7 @@ findOption(const struct poptOption * opt, /*@null@*/ const char * longName,
 }
 
 static const char * findNextArg(/*@special@*/ poptContext con,
-		unsigned argx, int delete)
+		unsigned argx, int delete_arg)
 	/*@uses con->optionStack, con->os,
 		con->os->next, con->os->argb, con->os->argc, con->os->argv @*/
 {
@@ -495,7 +495,7 @@ static const char * findNextArg(/*@special@*/ poptContext con,
 	    if (*os->argv[i] == '-') continue;
 	    if (--argx > 0) continue;
 	    arg = os->argv[i];
-	    if (delete) {
+	    if (delete_arg) {
 		if (os->argb == NULL) os->argb = PBM_ALLOC(os->argc);
 		if (os->argb != NULL)	/* XXX can't happen */
 		PBM_SET(i, os->argb);
diff --git a/popt.h b/popt.h
index b74f7d8..52819f5 100644
--- a/popt.h
+++ b/popt.h
@@ -142,7 +142,9 @@ typedef /*@abstract@*/ struct poptContext_s * poptContext;
 /** \ingroup popt
  */
 #ifndef __cplusplus
+/*@-typeuse@*/
 typedef struct poptOption * poptOption;
+/*@=typeuse@*/
 #endif
 
 enum poptCallbackReason { POPT_CALLBACK_REASON_PRE, 
@@ -161,7 +163,8 @@ typedef void (*poptCallbackType) (poptContext con,
 		enum poptCallbackReason reason,
 		/*@null@*/ const struct poptOption * opt,
 		/*@null@*/ const char * arg,
-		/*@null@*/ const void * data);
+		/*@null@*/ const void * data)
+	/*@*/;
 
 /** \ingroup popt
  * Initialize popt context.
@@ -176,61 +179,73 @@ typedef void (*poptCallbackType) (poptContext con,
 		/*@dependent@*/ /*@keep@*/ const char * name,
 		int argc, /*@dependent@*/ /*@keep@*/ const char ** argv,
 		/*@dependent@*/ /*@keep@*/ const struct poptOption * options,
-		int flags);
+		int flags)
+	/*@*/;
 
 /** \ingroup popt
  * Reinitialize popt context.
  * @param con		context
  */
-void poptResetContext(/*@null@*/poptContext con);
+void poptResetContext(/*@null@*/poptContext con)
+	/*@modifies con @*/;
 
 /** \ingroup popt
  * Return value of next option found.
  * @param con		context
  * @return		next option val, -1 on last item, POPT_ERROR_* on error
  */
-int poptGetNextOpt(/*@null@*/poptContext con);
-/* returns NULL if no argument is available */
+int poptGetNextOpt(/*@null@*/poptContext con)
+	/*@modifies con @*/;
 
+/*@-redecl@*/
 /** \ingroup popt
+ * Return next option argument (if any).
  * @param con		context
+ * @return		option argument, NULL if no more options are available
  */
-/*@observer@*/ /*@null@*/ const char * poptGetOptArg(/*@null@*/poptContext con);
+/*@observer@*/ /*@null@*/ const char * poptGetOptArg(/*@null@*/poptContext con)
+	/*@modifies con @*/;
 
 /** \ingroup popt
  * Return current option's argument.
  * @param con		context
  * @return		option argument, NULL if no more options are available
  */
-/*@observer@*/ /*@null@*/ const char * poptGetArg(/*@null@*/poptContext con);
+/*@observer@*/ /*@null@*/ const char * poptGetArg(/*@null@*/poptContext con)
+	/*@modifies con @*/;
 
 /** \ingroup popt
- * Peek at  current option's argument.
+ * Peek at current option's argument.
  * @param con		context
  * @return		option argument
  */
-/*@observer@*/ /*@null@*/ const char * poptPeekArg(/*@null@*/poptContext con);
+/*@observer@*/ /*@null@*/ const char * poptPeekArg(/*@null@*/poptContext con)
+	/*@*/;
 
 /** \ingroup popt
  * Return remaining arguments.
  * @param con		context
  * @return		argument array, terminated with NULL
  */
-/*@observer@*/ /*@null@*/ const char ** poptGetArgs(/*@null@*/poptContext con);
+/*@observer@*/ /*@null@*/ const char ** poptGetArgs(/*@null@*/poptContext con)
+	/*@modifies con @*/;
 
 /** \ingroup popt
  * Return the option which caused the most recent error.
  * @param con		context
  * @return		offending option
  */
-/*@observer@*/ const char * poptBadOption(/*@null@*/poptContext con, int flags);
+/*@observer@*/ const char * poptBadOption(/*@null@*/poptContext con, int flags)
+	/*@*/;
+/*@=redecl@*/
 
 /** \ingroup popt
  * Destroy context.
  * @param con		context
- * @return		NULL
+ * @return		NULL always
  */
-/*@null@*/ poptContext poptFreeContext( /*@only@*/ /*@null@*/ poptContext con);
+/*@null@*/ poptContext poptFreeContext( /*@only@*/ /*@null@*/ poptContext con)
+	/*@modifies con @*/;
 
 /** \ingroup popt
  * Add arguments to context.
@@ -238,7 +253,8 @@ int poptGetNextOpt(/*@null@*/poptContext con);
  * @param argv		argument array, NULL terminated
  * @return		0 on success, POPT_ERROR_OPTSTOODEEP on failure
  */
-int poptStuffArgs(poptContext con, /*@keep@*/ const char ** argv);
+int poptStuffArgs(poptContext con, /*@keep@*/ const char ** argv)
+	/*@modifies con @*/;
 
 /** \ingroup popt
  * Add alias to context.
@@ -248,7 +264,8 @@ int poptStuffArgs(poptContext con, /*@keep@*/ const char ** argv);
  * @param flags		(unused)
  * @return		0 always
  */
-int poptAddAlias(poptContext con, struct poptAlias alias, int flags);
+int poptAddAlias(poptContext con, struct poptAlias alias, int flags)
+	/*@modifies con @*/;
 
 /** \ingroup popt
  * Read configuration file.
@@ -306,8 +323,10 @@ int poptParseArgvString(const char * s,
  * @param error		popt error
  * @return		error string
  */
+/*@-redecl@*/
 /*@observer@*/ const char *const poptStrerror(const int error)
 	/*@*/;
+/*@=redecl@*/
 
 /** \ingroup popt
  * Limit search for executables.
@@ -315,7 +334,8 @@ int poptParseArgvString(const char * s,
  * @param path		single path to search for executables
  * @param allowAbsolute	absolute paths only?
  */
-void poptSetExecPath(poptContext con, const char * path, int allowAbsolute);
+void poptSetExecPath(poptContext con, const char * path, int allowAbsolute)
+	/*@modifies con @*/;
 
 /** \ingroup popt
  * Print detailed description of options.
@@ -323,7 +343,8 @@ void poptSetExecPath(poptContext con, const char * path, int allowAbsolute);
  * @param f		ouput file handle
  * @param flags		(unused)
  */
-void poptPrintHelp(poptContext con, FILE * f, /*@unused@*/ int flags);
+void poptPrintHelp(poptContext con, FILE * f, /*@unused@*/ int flags)
+	/*@modifies *f @*/;
 
 /** \ingroup popt
  * Print terse description of options.
@@ -331,27 +352,40 @@ void poptPrintHelp(poptContext con, FILE * f, /*@unused@*/ int flags);
  * @param f		ouput file handle
  * @param flags		(unused)
  */
-void poptPrintUsage(poptContext con, FILE * f, /*@unused@*/ int flags);
+void poptPrintUsage(poptContext con, FILE * f, /*@unused@*/ int flags)
+	/*@modifies *f @*/;
 
 /** \ingroup popt
  * Provide text to replace default "[OPTION...]" in help/usage output.
  * @param con		context
  * @param text		replacement text
  */
-void poptSetOtherOptionHelp(poptContext con, const char * text);
+/*@-fcnuse@*/
+void poptSetOtherOptionHelp(poptContext con, const char * text)
+	/*@modifies con @*/;
+/*@=fcnuse@*/
 
 /** \ingroup popt
  * Return argv[0] from context.
  * @param con		context
+ * @return		argv[0]
  */
-/*@observer@*/ const char * poptGetInvocationName(poptContext con);
+/*@-redecl -fcnuse@*/
+/*@observer@*/ const char * poptGetInvocationName(poptContext con)
+	/*@*/;
+/*@=redecl =fcnuse@*/
 
 /** \ingroup popt
  * Shuffle argv pointers to remove stripped args, returns new argc.
  * @param con		context
+ * @param argc		no. of args
+ * @param argv		arg vector
  * @return		new argc
  */
-int poptStrippedArgv(poptContext con, int argc, char ** argv);
+/*@-fcnuse@*/
+int poptStrippedArgv(poptContext con, int argc, char ** argv)
+	/*@modifies *argv @*/;
+/*@=fcnuse@*/
 
 #ifdef  __cplusplus
 }
diff --git a/popthelp.c b/popthelp.c
index 086cd43..62822fa 100644
--- a/popthelp.c
+++ b/popthelp.c
@@ -180,30 +180,30 @@ static int maxArgWidth(const struct poptOption * opt,
 		       /*@null@*/ const char * translation_domain)
 {
     int max = 0;
-    int this = 0;
+    int len = 0;
     const char * s;
     
     if (opt != NULL)
     while (opt->longName || opt->shortName || opt->arg) {
 	if ((opt->argInfo & POPT_ARG_MASK) == POPT_ARG_INCLUDE_TABLE) {
 	    if (opt->arg)	/* XXX program error */
-	    this = maxArgWidth(opt->arg, translation_domain);
-	    if (this > max) max = this;
+	    len = maxArgWidth(opt->arg, translation_domain);
+	    if (len > max) max = len;
 	} else if (!(opt->argInfo & POPT_ARGFLAG_DOC_HIDDEN)) {
-	    this = sizeof("  ")-1;
-	    if (opt->shortName != '\0') this += sizeof("-X")-1;
-	    if (opt->shortName != '\0' && opt->longName) this += sizeof(", ")-1;
+	    len = sizeof("  ")-1;
+	    if (opt->shortName != '\0') len += sizeof("-X")-1;
+	    if (opt->shortName != '\0' && opt->longName) len += sizeof(", ")-1;
 	    if (opt->longName) {
-		this += ((opt->argInfo & POPT_ARGFLAG_ONEDASH)
+		len += ((opt->argInfo & POPT_ARGFLAG_ONEDASH)
 			? sizeof("-")-1 : sizeof("--")-1);
-		this += strlen(opt->longName);
+		len += strlen(opt->longName);
 	    }
 
 	    s = getArgDescrip(opt, translation_domain);
 	    if (s)
-		this += sizeof("=")-1 + strlen(s);
-	    if (opt->argInfo & POPT_ARGFLAG_OPTIONAL) this += sizeof("[]")-1;
-	    if (this > max) max = this;
+		len += sizeof("=")-1 + strlen(s);
+	    if (opt->argInfo & POPT_ARGFLAG_OPTIONAL) len += sizeof("[]")-1;
+	    if (len > max) max = len;
 	}
 
 	opt++;
diff --git a/poptint.h b/poptint.h
index 3a3ee9b..59841e0 100644
--- a/poptint.h
+++ b/poptint.h
@@ -11,11 +11,11 @@
 
 /**
  * Wrapper to free(3), hides const compilation noise, permit NULL, return NULL.
- * @param this		memory to free
+ * @param p		memory to free
  * @retval		NULL always
  */
-/*@unused@*/ static inline /*@null@*/ void * _free(/*@only@*/ /*@null@*/ const void * this) {
-    if (this != NULL)	free((void *)this);
+/*@unused@*/ static inline /*@null@*/ void * _free(/*@only@*/ /*@null@*/ const void * p) {
+    if (p != NULL)	free((void *)p);
     return NULL;
 }
 
diff --git a/system.h b/system.h
index 8015c64..2ff7588 100644
--- a/system.h
+++ b/system.h
@@ -42,9 +42,9 @@ char *alloca ();
 #define alloca __builtin_alloca
 #endif
 
+#if !defined(__LCLINT__)
 /*@only@*/ char * xstrdup (const char *str);
 
-#if !defined(__LCLINT__)
 #if HAVE_MCHECK_H && defined(__GNUC__)
 #define	vmefail()	(fprintf(stderr, "virtual memory exhausted.\n"), exit(EXIT_FAILURE), NULL)
 #define xstrdup(_str)   (strcpy((malloc(strlen(_str)+1) ? : vmefail()), (_str)))
-- 
Gitee


From bad30c88a11e8c2133b274c289fa974d151aac21 Mon Sep 17 00:00:00 2001
From: Jeff Johnson <n3npq@mac.com>
Date: Tue, 5 Jun 2001 19:26:22 +0000
Subject: [PATCH 308/667] - fix typos in linux.{req,prov}.

---
 findme.h     |  3 +-
 popt.c       | 58 +++++++++++++++++++++++--------------
 popt.h       | 14 ++++-----
 poptconfig.c |  5 ++--
 popthelp.c   | 82 +++++++++++++++++++++++++++++-----------------------
 poptint.h    |  5 +++-
 6 files changed, 98 insertions(+), 69 deletions(-)

diff --git a/findme.h b/findme.h
index 1626ee5..bb54ec7 100644
--- a/findme.h
+++ b/findme.h
@@ -14,6 +14,7 @@
  * @param argv0		name of executable
  * @return		(malloc'd) absolute path to executable (or NULL)
  */
-/*@null@*/ const char * findProgramPath(/*@null@*/ const char * argv0);
+/*@null@*/ const char * findProgramPath(/*@null@*/ const char * argv0)
+	/*@modifies fileSystem @*/;
 
 #endif
diff --git a/popt.c b/popt.c
index 8c42f90..851f6ab 100644
--- a/popt.c
+++ b/popt.c
@@ -66,7 +66,9 @@ static void invokeCallbacksPRE(poptContext con, const struct poptOption * opt)
 	    poptCallbackType cb = (poptCallbackType)opt->arg;
 	    /*@=castfcnptr@*/
 	    /* Perform callback. */
+	    /*@-moduncon@*/
 	    cb(con, POPT_CALLBACK_REASON_PRE, NULL, NULL, opt->descrip);
+	    /*@=moduncon@*/
 	}
     }
 }
@@ -86,7 +88,9 @@ static void invokeCallbacksPOST(poptContext con, const struct poptOption * opt)
 	    poptCallbackType cb = (poptCallbackType)opt->arg;
 	    /*@=castfcnptr@*/
 	    /* Perform callback. */
+	    /*@-moduncon@*/
 	    cb(con, POPT_CALLBACK_REASON_POST, NULL, NULL, opt->descrip);
+	    /*@=moduncon@*/
 	}
     }
 }
@@ -123,8 +127,10 @@ static void invokeCallbacksOPTION(poptContext con,
 	    const void * cbData = (cbopt->descrip ? cbopt->descrip : myData);
 	    /* Perform callback. */
 	    if (cb != NULL) {	/* XXX program error */
+		/*@-moduncon@*/
 		cb(con, POPT_CALLBACK_REASON_OPTION, myOpt,
 			con->os->nextArg, cbData);
+		/*@=moduncon@*/
 	    }
 	    /* Terminate (unless explcitly continuing). */
 	    if (!(cbopt->argInfo & POPT_CBFLAG_CONTINUE))
@@ -143,18 +149,18 @@ poptContext poptGetContext(const char * name, int argc, const char ** argv,
 
     con->os = con->optionStack;
     con->os->argc = argc;
-    /*@-dependenttrans@*/	/* FIX: W2DO? */
+    /*@-dependenttrans -assignexpose@*/	/* FIX: W2DO? */
     con->os->argv = argv;
-    /*@=dependenttrans@*/
+    /*@=dependenttrans =assignexpose@*/
     con->os->argb = NULL;
 
     if (!(flags & POPT_CONTEXT_KEEP_FIRST))
 	con->os->next = 1;			/* skip argv[0] */
 
     con->leftovers = calloc( (argc + 1), sizeof(char *) );
-    /*@-dependenttrans@*/	/* FIX: W2DO? */
+    /*@-dependenttrans -assignexpose@*/	/* FIX: W2DO? */
     con->options = options;
-    /*@=dependenttrans@*/
+    /*@=dependenttrans =assignexpose@*/
     con->aliases = NULL;
     con->numAliases = 0;
     con->flags = flags;
@@ -181,6 +187,7 @@ poptContext poptGetContext(const char * name, int argc, const char ** argv,
 static void cleanOSE(/*@special@*/ struct optionStackEntry *os)
 	/*@uses os @*/
 	/*@releases os->nextArg, os->argv, os->argb @*/
+	/*@modifies os @*/
 {
     os->nextArg = _free(os->nextArg);
     os->argv = _free(os->argv);
@@ -224,6 +231,7 @@ static int handleExec(/*@special@*/ poptContext con,
 		/*@null@*/ const char * longName, char shortName)
 	/*@uses con->execs, con->numExecs, con->flags, con->doExec,
 		con->finalArgv, con->finalArgvAlloced, con->finalArgvCount @*/
+	/*@modifies con @*/
 {
     int i;
 
@@ -280,6 +288,7 @@ static int handleAlias(/*@special@*/ poptContext con,
 		/*@keep@*/ /*@null@*/ const char * nextCharArg)
 	/*@uses con->aliases, con->numAliases, con->optionStack,
 		con->os, con->os->currAlias, con->os->currAlias->longName @*/
+	/*@modifies con @*/
 {
     int rc;
     int i;
@@ -480,6 +489,7 @@ static const char * findNextArg(/*@special@*/ poptContext con,
 		unsigned argx, int delete_arg)
 	/*@uses con->optionStack, con->os,
 		con->os->next, con->os->argb, con->os->argc, con->os->argv @*/
+	/*@modifies con @*/
 {
     struct optionStackEntry * os = con->os;
     const char * arg;
@@ -500,7 +510,7 @@ static const char * findNextArg(/*@special@*/ poptContext con,
 		if (os->argb != NULL)	/* XXX can't happen */
 		PBM_SET(i, os->argb);
 	    }
-	    break;
+	    /*@innerbreak@*/ break;
 	}
 	if (os > con->optionStack) os--;
     } while (arg == NULL);
@@ -555,7 +565,9 @@ expandNextArg(/*@special@*/ poptContext con, const char * s)
     return t;
 }
 
-static void poptStripArg(poptContext con, int which)
+static void poptStripArg(/*@special@*/ poptContext con, int which)
+	/*@uses con->arg_strip, con->optionStack @*/
+	/*@defines con->arg_strip @*/
 	/*@modifies con @*/
 {
     if (con->arg_strip == NULL)
@@ -699,7 +711,7 @@ int poptGetNextOpt(poptContext con)
 
 		/* Check for "--long=arg" option. */
 		for (oe = optString; *oe && *oe != '='; oe++)
-		    ;
+		    {};
 		if (*oe == '=') {
 		    *oe++ = '\0';
 		    /* XXX longArg is mapped back to persistent storage. */
@@ -993,24 +1005,26 @@ int poptAddAlias(poptContext con, struct poptAlias newAlias,
 		/*@unused@*/ int flags)
 {
     int aliasNum = con->numAliases++;
-    struct poptAlias * alias;
 
     /* SunOS won't realloc(NULL, ...) */
-    if (!con->aliases)
-	con->aliases = malloc(sizeof(newAlias) * con->numAliases);
+    if (con->aliases == NULL)
+	con->aliases = malloc(con->numAliases * sizeof(newAlias));
     else
 	con->aliases = realloc(con->aliases,
-			       sizeof(newAlias) * con->numAliases);
-    alias = con->aliases + aliasNum;
-
-    alias->longName = (newAlias.longName)
-	/*@-nullpass@*/		/* FIX: malloc can return NULL. */
-	? strcpy(malloc(strlen(newAlias.longName) + 1), newAlias.longName)
-	/*@=nullpass@*/
-	: NULL;
-    alias->shortName = newAlias.shortName;
-    alias->argc = newAlias.argc;
-    alias->argv = newAlias.argv;
+			       con->numAliases * sizeof(newAlias));
+
+    if (con->aliases) {
+	struct poptAlias * alias = con->aliases + aliasNum;
+
+	alias->longName = (newAlias.longName)
+	    /*@-nullpass@*/		/* FIX: malloc can return NULL. */
+	    ? strcpy(malloc(strlen(newAlias.longName) + 1), newAlias.longName)
+	    /*@=nullpass@*/
+	    : NULL;
+	alias->shortName = newAlias.shortName;
+	alias->argc = newAlias.argc;
+	alias->argv = newAlias.argv;
+    }
 
     return 0;
 }
@@ -1064,7 +1078,7 @@ int poptStuffArgs(poptContext con, const char ** argv)
 	return POPT_ERROR_OPTSTOODEEP;
 
     for (argc = 0; argv[argc]; argc++)
-	;
+	{};
 
     con->os++;
     con->os->next = 0;
diff --git a/popt.h b/popt.h
index 52819f5..a195947 100644
--- a/popt.h
+++ b/popt.h
@@ -195,7 +195,7 @@ void poptResetContext(/*@null@*/poptContext con)
  * @return		next option val, -1 on last item, POPT_ERROR_* on error
  */
 int poptGetNextOpt(/*@null@*/poptContext con)
-	/*@modifies con @*/;
+	/*@modifies con, fileSystem @*/;
 
 /*@-redecl@*/
 /** \ingroup popt
@@ -340,20 +340,20 @@ void poptSetExecPath(poptContext con, const char * path, int allowAbsolute)
 /** \ingroup popt
  * Print detailed description of options.
  * @param con		context
- * @param f		ouput file handle
+ * @param fp		ouput file handle
  * @param flags		(unused)
  */
-void poptPrintHelp(poptContext con, FILE * f, /*@unused@*/ int flags)
-	/*@modifies *f @*/;
+void poptPrintHelp(poptContext con, FILE * fp, /*@unused@*/ int flags)
+	/*@modifies *fp, fileSystem @*/;
 
 /** \ingroup popt
  * Print terse description of options.
  * @param con		context
- * @param f		ouput file handle
+ * @param fp		ouput file handle
  * @param flags		(unused)
  */
-void poptPrintUsage(poptContext con, FILE * f, /*@unused@*/ int flags)
-	/*@modifies *f @*/;
+void poptPrintUsage(poptContext con, FILE * fp, /*@unused@*/ int flags)
+	/*@modifies *fp, fileSystem @*/;
 
 /** \ingroup popt
  * Provide text to replace default "[OPTION...]" in help/usage output.
diff --git a/poptconfig.c b/poptconfig.c
index f53dd5d..8fddbcd 100644
--- a/poptconfig.c
+++ b/poptconfig.c
@@ -9,9 +9,9 @@
 #include "system.h"
 #include "poptint.h"
 
+/*@-mustmod@*/	/* LCL: *line is modified @*/
 static void configLine(poptContext con, char * line)
-	/*@modifies *line,
-		con->execs, con->numExecs @*/
+	/*@modifies *line, con->execs, con->numExecs @*/
 {
     int nameLength = strlen(con->appName);
     const char * opt;
@@ -63,6 +63,7 @@ static void configLine(poptContext con, char * line)
 	/*@=noeffect@*/
     }
 }
+/*@=mustmod@*/
 
 int poptReadConfigFile(poptContext con, const char * fn)
 {
diff --git a/popthelp.c b/popthelp.c
index 62822fa..a5e1980 100644
--- a/popthelp.c
+++ b/popthelp.c
@@ -34,6 +34,7 @@ struct poptOption poptHelpOptions[] = {
 
 /*@observer@*/ /*@null@*/ static const char *const
 getTableTranslationDomain(/*@null@*/ const struct poptOption *table)
+	/*@*/
 {
     const struct poptOption *opt;
 
@@ -50,6 +51,7 @@ getArgDescrip(const struct poptOption * opt,
 		/*@-paramuse@*/		/* FIX: wazzup? */
 		/*@null@*/ const char * translation_domain)
 		/*@=paramuse@*/
+	/*@*/
 {
     if (!(opt->argInfo & POPT_ARG_MASK)) return NULL;
 
@@ -70,9 +72,10 @@ getArgDescrip(const struct poptOption * opt,
     }
 }
 
-static void singleOptionHelp(FILE * f, int maxLeftCol, 
+static void singleOptionHelp(FILE * fp, int maxLeftCol, 
 		const struct poptOption * opt,
 		/*@null@*/ const char *translation_domain)
+	/*@modifies *fp, fileSystem @*/
 {
     int indentLength = maxLeftCol + 5;
     int lineLength = 79 - indentLength;
@@ -146,9 +149,9 @@ static void singleOptionHelp(FILE * f, int maxLeftCol,
     }
 
     if (help)
-	fprintf(f,"  %-*s   ", maxLeftCol, left);
+	fprintf(fp,"  %-*s   ", maxLeftCol, left);
     else {
-	fprintf(f,"  %s\n", left); 
+	fprintf(fp,"  %s\n", left); 
 	goto out;
     }
 
@@ -164,20 +167,21 @@ static void singleOptionHelp(FILE * f, int maxLeftCol,
 	ch++;
 
 	sprintf(format, "%%.%ds\n%%%ds", (int) (ch - help), indentLength);
-	fprintf(f, format, help, " ");
+	fprintf(fp, format, help, " ");
 	help = ch;
 	while (isspace(*help) && *help) help++;
 	helpLength = strlen(help);
     }
 
-    if (helpLength) fprintf(f, "%s\n", help);
+    if (helpLength) fprintf(fp, "%s\n", help);
 
 out:
-    free(left);
+    left = _free(left);
 }
 
 static int maxArgWidth(const struct poptOption * opt,
 		       /*@null@*/ const char * translation_domain)
+	/*@*/
 {
     int max = 0;
     int len = 0;
@@ -212,9 +216,10 @@ static int maxArgWidth(const struct poptOption * opt,
     return max;
 }
 
-static void singleTableHelp(FILE * f,
+static void singleTableHelp(FILE * fp,
 		/*@null@*/ const struct poptOption * table, int left,
 		/*@null@*/ const char * translation_domain)
+	/*@modifies *fp, fileSystem @*/
 {
     const struct poptOption * opt;
     const char *sub_transdom;
@@ -223,7 +228,7 @@ static void singleTableHelp(FILE * f,
     for (opt = table; (opt->longName || opt->shortName || opt->arg); opt++) {
 	if ((opt->longName || opt->shortName) && 
 	    !(opt->argInfo & POPT_ARGFLAG_DOC_HIDDEN))
-	    singleOptionHelp(f, left, opt, translation_domain);
+	    singleOptionHelp(fp, left, opt, translation_domain);
     }
 
     if (table != NULL)
@@ -234,49 +239,51 @@ static void singleTableHelp(FILE * f,
 		sub_transdom = translation_domain;
 	    
 	    if (opt->descrip)
-		fprintf(f, "\n%s\n", D_(sub_transdom, opt->descrip));
+		fprintf(fp, "\n%s\n", D_(sub_transdom, opt->descrip));
 
-	    singleTableHelp(f, opt->arg, left, sub_transdom);
+	    singleTableHelp(fp, opt->arg, left, sub_transdom);
 	}
     }
 }
 
-static int showHelpIntro(poptContext con, FILE * f)
+static int showHelpIntro(poptContext con, FILE * fp)
+	/*@modifies *fp, fileSystem @*/
 {
     int len = 6;
     const char * fn;
 
-    fprintf(f, POPT_("Usage:"));
+    fprintf(fp, POPT_("Usage:"));
     if (!(con->flags & POPT_CONTEXT_KEEP_FIRST)) {
 	/*@-nullderef@*/	/* LCL: wazzup? */
 	fn = con->optionStack->argv[0];
 	/*@=nullderef@*/
 	if (fn == NULL) return len;
 	if (strchr(fn, '/')) fn = strrchr(fn, '/') + 1;
-	fprintf(f, " %s", fn);
+	fprintf(fp, " %s", fn);
 	len += strlen(fn) + 1;
     }
 
     return len;
 }
 
-void poptPrintHelp(poptContext con, FILE * f, /*@unused@*/ int flags)
+void poptPrintHelp(poptContext con, FILE * fp, /*@unused@*/ int flags)
 {
     int leftColWidth;
 
-    (void) showHelpIntro(con, f);
+    (void) showHelpIntro(con, fp);
     if (con->otherHelp)
-	fprintf(f, " %s\n", con->otherHelp);
+	fprintf(fp, " %s\n", con->otherHelp);
     else
-	fprintf(f, " %s\n", POPT_("[OPTION...]"));
+	fprintf(fp, " %s\n", POPT_("[OPTION...]"));
 
     leftColWidth = maxArgWidth(con->options, NULL);
-    singleTableHelp(f, con->options, leftColWidth, NULL);
+    singleTableHelp(fp, con->options, leftColWidth, NULL);
 }
 
-static int singleOptionUsage(FILE * f, int cursor, 
+static int singleOptionUsage(FILE * fp, int cursor, 
 		const struct poptOption * opt,
 		/*@null@*/ const char *translation_domain)
+	/*@modifies *fp, fileSystem @*/
 {
     int len = 3;
     char shortStr[2] = { '\0', '\0' };
@@ -300,11 +307,11 @@ static int singleOptionUsage(FILE * f, int cursor,
 	len += strlen(argDescrip) + 1;
 
     if ((cursor + len) > 79) {
-	fprintf(f, "\n       ");
+	fprintf(fp, "\n       ");
 	cursor = 7;
     } 
 
-    fprintf(f, " [-%s%s%s%s]",
+    fprintf(fp, " [-%s%s%s%s]",
 	((opt->shortName || (opt->argInfo & POPT_ARGFLAG_ONEDASH)) ? "" : "-"),
 	item,
 	(argDescrip ? (opt->shortName != '\0' ? " " : "=") : ""),
@@ -313,9 +320,10 @@ static int singleOptionUsage(FILE * f, int cursor,
     return cursor + len + 1;
 }
 
-static int singleTableUsage(FILE * f,
+static int singleTableUsage(FILE * fp,
 		int cursor, const struct poptOption * opt,
 		/*@null@*/ const char * translation_domain)
+	/*@modifies *fp, fileSystem @*/
 {
     /*@-branchstate@*/		/* FIX: W2DO? */
     if (opt != NULL)
@@ -324,10 +332,10 @@ static int singleTableUsage(FILE * f,
 	    translation_domain = (const char *)opt->arg;
 	} else if ((opt->argInfo & POPT_ARG_MASK) == POPT_ARG_INCLUDE_TABLE) {
 	    if (opt->arg)	/* XXX program error */
-	    cursor = singleTableUsage(f, cursor, opt->arg, translation_domain);
+	    cursor = singleTableUsage(fp, cursor, opt->arg, translation_domain);
 	} else if ((opt->longName || opt->shortName) &&
 		 !(opt->argInfo & POPT_ARGFLAG_DOC_HIDDEN)) {
-	    cursor = singleOptionUsage(f, cursor, opt, translation_domain);
+	    cursor = singleOptionUsage(fp, cursor, opt, translation_domain);
 	}
     }
     /*@=branchstate@*/
@@ -335,8 +343,9 @@ static int singleTableUsage(FILE * f,
     return cursor;
 }
 
-static int showShortOptions(const struct poptOption * opt, FILE * f,
+static int showShortOptions(const struct poptOption * opt, FILE * fp,
 		/*@null@*/ char * str)
+	/*@modifies *str, *fp, fileSystem @*/
 {
     char * s = alloca(300);	/* larger then the ascii set */
 
@@ -354,34 +363,35 @@ static int showShortOptions(const struct poptOption * opt, FILE * f,
 	    str[strlen(str)] = opt->shortName;
 	else if ((opt->argInfo & POPT_ARG_MASK) == POPT_ARG_INCLUDE_TABLE)
 	    if (opt->arg)	/* XXX program error */
-		(void) showShortOptions(opt->arg, f, str);
+		(void) showShortOptions(opt->arg, fp, str);
     } 
 
     if (s != str || *s != '\0')
 	return 0;
 
-    fprintf(f, " [-%s]", s);
+    fprintf(fp, " [-%s]", s);
     return strlen(s) + 4;
 }
 
-void poptPrintUsage(poptContext con, FILE * f, /*@unused@*/ int flags)
+void poptPrintUsage(poptContext con, FILE * fp, /*@unused@*/ int flags)
 {
     int cursor;
 
-    cursor = showHelpIntro(con, f);
-    cursor += showShortOptions(con->options, f, NULL);
-    (void) singleTableUsage(f, cursor, con->options, NULL);
+    cursor = showHelpIntro(con, fp);
+    cursor += showShortOptions(con->options, fp, NULL);
+    (void) singleTableUsage(fp, cursor, con->options, NULL);
 
     if (con->otherHelp) {
 	cursor += strlen(con->otherHelp) + 1;
-	if (cursor > 79) fprintf(f, "\n       ");
-	fprintf(f, " %s", con->otherHelp);
+	if (cursor > 79) fprintf(fp, "\n       ");
+	fprintf(fp, " %s", con->otherHelp);
     }
 
-    fprintf(f, "\n");
+    fprintf(fp, "\n");
 }
 
-void poptSetOtherOptionHelp(poptContext con, const char * text) {
-    if (con->otherHelp) free((void *)con->otherHelp);
+void poptSetOtherOptionHelp(poptContext con, const char * text)
+{
+    con->otherHelp = _free(con->otherHelp);
     con->otherHelp = xstrdup(text);
 }
diff --git a/poptint.h b/poptint.h
index 59841e0..fe8430b 100644
--- a/poptint.h
+++ b/poptint.h
@@ -14,7 +14,10 @@
  * @param p		memory to free
  * @retval		NULL always
  */
-/*@unused@*/ static inline /*@null@*/ void * _free(/*@only@*/ /*@null@*/ const void * p) {
+/*@unused@*/ static inline /*@null@*/ void *
+_free(/*@only@*/ /*@null@*/ const void * p)
+	/*@modifies p @*/
+{
     if (p != NULL)	free((void *)p);
     return NULL;
 }
-- 
Gitee


From d4304202ba75a81300eaedbed61f3b468a46b2ce Mon Sep 17 00:00:00 2001
From: Jeff Johnson <n3npq@mac.com>
Date: Sun, 17 Jun 2001 00:36:01 +0000
Subject: [PATCH 309/667] - popt: add POPT_ARGFLAG_SHOW_DEFAULT to display
 initial values (#32558).

---
 popt.3     |   9 +++-
 popt.h     |   8 +++
 popthelp.c | 133 +++++++++++++++++++++++++++++++++++++++++--------
 test1.c    | 143 ++++++++++++++++++++++++++++++++++++++---------------
 testit.sh  |  16 +++---
 5 files changed, 239 insertions(+), 70 deletions(-)

diff --git a/popt.3 b/popt.3
index 68a8556..87e140c 100644
--- a/popt.3
+++ b/popt.3
@@ -136,7 +136,9 @@ For numeric values, if the \fIargInfo\fR value is bitwise or'd with one of
 \fBPOPT_ARGFLAG_OR\fR, \fBPOPT_ARGFLAG_AND\fR, or \fBPOPT_ARGFLAG_XOR\fR,
 the value is saved by performing an OR, AND, or XOR.
 If the \fIargInfo\fR value is bitwise or'd with \fBPOPT_ARGFLAG_NOT\fR,
-the value will be negated before saving.
+the value will be negated before saving. For the common operations of
+setting and/or clearing bits, \fBPOPT_BIT_SET\fR and \fBPOPT_BIT_CLR\fR
+have the appropriate flags set to perform bit operations.
 .sp
 If the \fIargInfo\fR value is bitwise or'd with \fBPOPT_ARGFLAG_ONEDASH\fR,
 the long argument may be given with a single - instead of two. For example,
@@ -201,9 +203,12 @@ a different way, you need to explicitly add the option entries to your programs
 If the \fIargInfo\fR value is bitwise or'd with \fBPOPT_ARGFLAG_DOC_HIDDEN\fR,
 the argument will not be shown in help output.
 .sp
+If the \fIargInfo\fR value is bitwise or'd with \fBPOPT_ARGFLAG_SHOW_DEFAULT\fR,
+the inital value of the arg will be shown in help output.
+.sp
 The final structure in the table should have all the pointer values set
 .RB "to " NULL " and all the arithmetic values set to 0, marking the "
-end of the table.
+.RB "end of the table. The macro " POPT_TABLEEND " is provided to do that.
 .sp
 There are two types of option table entries which do not specify command
 line options. When either of these types of entries are used, the
diff --git a/popt.h b/popt.h
index a195947..844e673 100644
--- a/popt.h
+++ b/popt.h
@@ -58,6 +58,14 @@ extern "C" {
 #define	POPT_ARGFLAG_NOT	0x01000000  /*!< arg will be negated */
 #define POPT_ARGFLAG_LOGICALOPS \
         (POPT_ARGFLAG_OR|POPT_ARGFLAG_AND|POPT_ARGFLAG_XOR)
+
+#define	POPT_BIT_SET	(POPT_ARG_VAL|POPT_ARGFLAG_OR)
+					/*!< set arg bit(s) */
+#define	POPT_BIT_CLR	(POPT_ARG_VAL|POPT_ARGFLAG_NAND)
+					/*!< clear arg bit(s) */
+
+#define	POPT_ARGFLAG_SHOW_DEFAULT 0x00800000 /*!< show default value in --help */
+
 /*@}*/
 
 /** \ingroup popt
diff --git a/popthelp.c b/popthelp.c
index a5e1980..5ce98e8 100644
--- a/popthelp.c
+++ b/popthelp.c
@@ -23,11 +23,18 @@ static void displayArgs(poptContext con,
     exit(0);
 }
 
+#ifdef	NOTYET
+static int show_option_defaults = 0;
+#endif
 /*@-castfcnptr@*/
 struct poptOption poptHelpOptions[] = {
-    { NULL, '\0', POPT_ARG_CALLBACK, (void *)&displayArgs, '\0', NULL, NULL },
-    { "help", '?', 0, NULL, '?', N_("Show this help message"), NULL },
-    { "usage", '\0', 0, NULL, 'u', N_("Display brief usage message"), NULL },
+  { NULL, '\0', POPT_ARG_CALLBACK, (void *)&displayArgs, '\0', NULL, NULL },
+  { "help", '?', 0, NULL, '?', N_("Show this help message"), NULL },
+  { "usage", '\0', 0, NULL, 'u', N_("Display brief usage message"), NULL },
+#ifdef	NOTYET
+  { "defaults", '\0', POPT_ARG_NONE, &show_option_defaults, 0,
+	N_("Display option defaults in message"), NULL },
+#endif
     POPT_TABLEEND
 } ;
 /*@=castfcnptr@*/
@@ -72,6 +79,63 @@ getArgDescrip(const struct poptOption * opt,
     }
 }
 
+static /*@only@*/ /*@null@*/ char * singleOptionDefaultValue(int lineLength,
+		const struct poptOption * opt,
+		/*@null@*/ const char *translation_domain)
+	/*@*/
+{
+    const char * defstr = D_(translation_domain, "default");
+    char * l = malloc(4*lineLength + 1);
+    char * le = l;
+
+    if (l == NULL) return l;	/* XXX can't happen */
+    *le++ = '(';
+    le = stpcpy(le, defstr);
+    *le++ = ':';
+    *le++ = ' ';
+    switch (opt->argInfo & POPT_ARG_MASK) {
+    case POPT_ARG_VAL:
+    case POPT_ARG_INT:
+    {	long aLong = *((int *)opt->arg);
+	le += sprintf(le, "%ld", aLong);
+    }	break;
+    case POPT_ARG_LONG:
+    {	long aLong = *((long *)opt->arg);
+	le += sprintf(le, "%ld", aLong);
+    }	break;
+    case POPT_ARG_FLOAT:
+    {	double aDouble = *((float *)opt->arg);
+	le += sprintf(le, "%g", aDouble);
+    }	break;
+    case POPT_ARG_DOUBLE:
+    {	double aDouble = *((double *)opt->arg);
+	le += sprintf(le, "%g", aDouble);
+    }	break;
+    case POPT_ARG_STRING:
+    {	const char * s = *(const char **)opt->arg;
+	if (s == NULL)
+	    le = stpcpy(le, "null");
+	else {
+	    size_t slen = 4*lineLength - (le - l) - sizeof("\"...\")");
+	    *le++ = '"';
+	    le = stpncpy(le, s, slen);
+	    if (slen < strlen(s))
+		le = stpcpy(le, "...");
+	    *le++ = '"';
+	}
+    }	break;
+    case POPT_ARG_NONE:
+    default:
+	l = _free(l);
+	return NULL;
+	break;
+    }
+    *le++ = ')';
+    *le = '\0';
+
+    return l;
+}
+
 static void singleOptionHelp(FILE * fp, int maxLeftCol, 
 		const struct poptOption * opt,
 		/*@null@*/ const char *translation_domain)
@@ -82,6 +146,7 @@ static void singleOptionHelp(FILE * fp, int maxLeftCol,
     const char * help = D_(translation_domain, opt->descrip);
     const char * argDescrip = getArgDescrip(opt, translation_domain);
     int helpLength;
+    char * defs = NULL;
     char * left;
     int nb = maxLeftCol + 1;
 
@@ -107,42 +172,62 @@ static void singleOptionHelp(FILE * fp, int maxLeftCol,
     if (!*left) goto out;
     if (argDescrip) {
 	char * le = left + strlen(left);
+
 	if (opt->argInfo & POPT_ARGFLAG_OPTIONAL)
 	    *le++ = '[';
+
+	/* Choose type of output */
+	if (opt->argInfo & POPT_ARGFLAG_SHOW_DEFAULT) {
+	    defs = singleOptionDefaultValue(lineLength, opt, translation_domain);
+	    if (defs) {
+		char * t = malloc(strlen(help) + strlen(defs) + sizeof(" "));
+		if (t) {
+		    (void) stpcpy( stpcpy( stpcpy(t, help), " "), defs);
+		    defs = _free(defs);
+		}
+		defs = t;
+	    }
+	}
+
 	if (opt->argDescrip == NULL) {
 	    switch (opt->argInfo & POPT_ARG_MASK) {
 	    case POPT_ARG_NONE:
-		sprintf(le, "[true]");
 		break;
 	    case POPT_ARG_VAL:
-	    {   long aLong = opt->val;
-
-		if (opt->argInfo & POPT_ARGFLAG_NOT) aLong = ~aLong;
-		switch (opt->argInfo & POPT_ARGFLAG_LOGICALOPS) {
-		case POPT_ARGFLAG_OR:
-		    sprintf(le, "[|=0x%lx]", (unsigned long)aLong);	break;
-		case POPT_ARGFLAG_AND:
-		    sprintf(le, "[&=0x%lx]", (unsigned long)aLong);	break;
-		case POPT_ARGFLAG_XOR:
-		    sprintf(le, "[^=0x%lx]", (unsigned long)aLong);	break;
-		default:
-		    if (!(aLong == 0L || aLong == 1L || aLong == -1L))
-			sprintf(le, "[=%ld]", aLong);
+	    {	long aLong = opt->val;
+		int ops = (opt->argInfo & POPT_ARGFLAG_LOGICALOPS);
+		int negate = (opt->argInfo & POPT_ARGFLAG_NOT);
+
+		/* Don't bother displaying typical values */
+		if (!ops && (aLong == 0L || aLong == 1L || aLong == -1L))
 		    break;
+		*le++ = '[';
+		switch (ops) {
+		case POPT_ARGFLAG_OR:	*le++ = '|';	break;
+		case POPT_ARGFLAG_AND:	*le++ = '&';	break;
+		case POPT_ARGFLAG_XOR:	*le++ = '^';	break;
+		default:				break;
 		}
+		*le++ = '=';
+		if (negate) *le++ = '~';
+		le += sprintf(le, (ops ? "0x%lx" : "%ld"), aLong);
+		*le++ = ']';
 	    }	break;
 	    case POPT_ARG_INT:
 	    case POPT_ARG_LONG:
-	    case POPT_ARG_STRING:
 	    case POPT_ARG_FLOAT:
 	    case POPT_ARG_DOUBLE:
-		sprintf(le, "=%s", argDescrip);
+	    case POPT_ARG_STRING:
+		*le++ = '=';
+		le = stpcpy(le, argDescrip);
+		break;
+	    default:
 		break;
 	    }
 	} else {
-	    sprintf(le, "=%s", argDescrip);
+	    *le++ = '=';
+	    le = stpcpy(le, argDescrip);
 	}
-	le += strlen(le);
 	if (opt->argInfo & POPT_ARGFLAG_OPTIONAL)
 	    *le++ = ']';
 	*le = '\0';
@@ -155,6 +240,11 @@ static void singleOptionHelp(FILE * fp, int maxLeftCol,
 	goto out;
     }
 
+    left = _free(left);
+    if (defs) {
+	help = defs; defs = NULL;
+    }
+
     helpLength = strlen(help);
     while (helpLength > lineLength) {
 	const char * ch;
@@ -176,6 +266,7 @@ static void singleOptionHelp(FILE * fp, int maxLeftCol,
     if (helpLength) fprintf(fp, "%s\n", help);
 
 out:
+    defs = _free(defs);
     left = _free(left);
 }
 
diff --git a/test1.c b/test1.c
index 919ea7c..ca5b3a6 100644
--- a/test1.c
+++ b/test1.c
@@ -17,52 +17,100 @@ char * arg2 = "(none)";
 int arg3 = 0;
 int inc = 0;
 int shortopt = 0;
-float aFloat = 0.0;
-double aDouble = 0.0;
-char * oStr = (char *)-1;
+
+int aVal = 141421;
+int bVal = 141421;
+int aFlag = 0;
+int bFlag = 0;
+
+int aInt = 271828;
+int bInt = 271828;
+long aLong = 738905609L;
+long bLong = 738905609L;
+float aFloat = 3.1415926535;
+float bFloat = 3.1415926535;
+double aDouble = 9.86960440108935861883;
+double bDouble = 9.86960440108935861883;
+char * oStr = (char *) -1;
 int singleDash = 0;
 
+char * lStr = "This tests default strings and exceeds the ... limit. "
+"123456789+123456789+123456789+123456789+123456789+ "
+"123456789+123456789+123456789+123456789+123456789+ "
+"123456789+123456789+123456789+123456789+123456789+ "
+"123456789+123456789+123456789+123456789+123456789+ ";
+char * nStr = NULL; 
+
 static struct poptOption moreCallbackArgs[] = {
-	{ NULL, '\0', POPT_ARG_CALLBACK | POPT_CBFLAG_INC_DATA,
-		(void *)option_callback, 0, NULL },
-	{ "cb2", 'c', POPT_ARG_STRING, NULL, 'c', "Test argument callbacks" },
-	{ NULL, '\0', 0, NULL, 0 }
+  { NULL, '\0', POPT_ARG_CALLBACK|POPT_CBFLAG_INC_DATA,
+	(void *)option_callback, 0,
+	NULL, NULL },
+  { "cb2", 'c', POPT_ARG_STRING, NULL, 'c',
+	"Test argument callbacks", NULL },
+  POPT_TABLEEND
 };
+
 static struct poptOption callbackArgs[] = {
-	{ NULL, '\0', POPT_ARG_CALLBACK, (void *)option_callback, 0, "sampledata" },
-	{ "cb", 'c', POPT_ARG_STRING, NULL, 'c', "Test argument callbacks" },
-	{ "long", '\0', 0, NULL, 'l', "Unused option for help testing" },
-	{ NULL, '\0', 0, NULL, 0 }
+  { NULL, '\0', POPT_ARG_CALLBACK, (void *)option_callback, 0, "sampledata" },
+  { "cb", 'c', POPT_ARG_STRING, NULL, 'c',
+	"Test argument callbacks", NULL },
+  { "longopt", '\0', 0, NULL, 'l',
+	"Unused option for help testing", NULL },
+  POPT_TABLEEND
 };
+
 static struct poptOption moreArgs[] = {
-	{ "inc", 'i', 0, &inc, 0, "An included argument" },
-	{ NULL, '\0', 0, NULL, 0 }
+  { "inc", 'I', 0, &inc, 0, "An included argument" },
+  POPT_TABLEEND
 };
+
 static struct poptOption options[] = {
-	{ NULL, '\0', POPT_ARG_INCLUDE_TABLE, &moreCallbackArgs, 0, "arg for cb2" },
-	{ "arg1", '\0', 0, &arg1, 0, "First argument with a really long"
+  { NULL, '\0', POPT_ARG_INCLUDE_TABLE, &moreCallbackArgs, 0, "arg for cb2" },
+  { "arg1", '\0', 0, &arg1, 0, "First argument with a really long"
 	    " description. After all, we have to test argument help"
 	    " wrapping somehow, right?", NULL },
-	{ "arg2", '2', POPT_ARG_STRING, &arg2, 0, "Another argument", "ARG" },
-	{ "arg3", '3', POPT_ARG_INT, &arg3, 0, "A third argument", "ANARG" },
-	{ "shortoption", '\0', POPT_ARGFLAG_ONEDASH, &shortopt, 0,
-		"Needs a single -", NULL },
-	{ "hidden", '\0', POPT_ARG_STRING | POPT_ARGFLAG_DOC_HIDDEN, NULL, 0,
-		"This shouldn't show up", NULL },
-	{ "unused", '\0', POPT_ARG_STRING, NULL, 0,
-	    "Unused option for help testing", "UNUSED" },
-	{ "float", 'f', POPT_ARG_FLOAT, &aFloat, 0,
-	    "A float argument", "FLOAT" },
-	{ "double", 'd', POPT_ARG_DOUBLE, &aDouble, 0,
-	    "A double argument", "DOUBLE" },
-	{ "ostr", '\0', POPT_ARG_STRING|POPT_ARGFLAG_OPTIONAL, &oStr, 0,
-	    "An optional str", "ARG" },
-
-	{ NULL, '-', POPT_ARG_NONE | POPT_ARGFLAG_DOC_HIDDEN, &singleDash, 0 },
-	{ NULL, '\0', POPT_ARG_INCLUDE_TABLE, &moreArgs, 0, NULL },
-	{ NULL, '\0', POPT_ARG_INCLUDE_TABLE, &callbackArgs, 0, "Callback arguments" },
-	POPT_AUTOHELP
-	{ NULL, '\0', 0, NULL, 0 }
+  { "arg2", '2', POPT_ARG_STRING | POPT_ARGFLAG_SHOW_DEFAULT, &arg2, 0,
+	"Another argument", "ARG" },
+  { "arg3", '3', POPT_ARG_INT, &arg3, 0,
+	"A third argument", "ANARG" },
+  { "onedash", '\0', POPT_ARGFLAG_ONEDASH, &shortopt, 0,
+	"POPT_ARGFLAG_ONEDASH: Option takes a single -", NULL },
+  { "hidden", '\0', POPT_ARG_STRING | POPT_ARGFLAG_DOC_HIDDEN, NULL, 0,
+	"POPT_ARGFLAG_HIDDEN: A hidden option (--help shouldn't display)",
+	NULL },
+  { "optional", '\0', POPT_ARG_STRING | POPT_ARGFLAG_OPTIONAL, &oStr, 0,
+	"POPT_ARGFLAG_OPTIONAL: Takes an optional string argument", NULL },
+
+  { "val", '\0', POPT_ARG_VAL | POPT_ARGFLAG_SHOW_DEFAULT, &aVal, 125992,
+	"POPT_ARG_VAL: 125992 141421", 0},
+
+  { "int", 'i', POPT_ARG_INT | POPT_ARGFLAG_SHOW_DEFAULT, &aInt, 0,
+	"POPT_ARG_INT: 271828", NULL },
+  { "long", 'l', POPT_ARG_LONG | POPT_ARGFLAG_SHOW_DEFAULT, &aLong, 0,
+	"POPT_ARG_LONG: 738905609", NULL },
+  { "float", 'f', POPT_ARG_FLOAT | POPT_ARGFLAG_SHOW_DEFAULT, &aFloat, 0,
+	"POPT_ARG_FLOAT: 3.14159", NULL },
+  { "double", 'd', POPT_ARG_DOUBLE | POPT_ARGFLAG_SHOW_DEFAULT, &aDouble, 0,
+	"POPT_ARG_DOUBLE: 9.8696", NULL },
+
+  { "bitset", '\0', POPT_BIT_SET | POPT_ARGFLAG_SHOW_DEFAULT, &aFlag, 0x4321,
+	"POPT_BIT_SET: |= 0x4321", 0},
+  { "bitclr", '\0', POPT_BIT_CLR | POPT_ARGFLAG_SHOW_DEFAULT, &aFlag, 0x1234,
+	"POPT_BIT_CLR: &= ~0x1234", 0},
+
+  { "nstr", '\0', POPT_ARG_STRING | POPT_ARGFLAG_SHOW_DEFAULT, &nStr, 0,
+	"POPT_ARG_STRING: (null)", NULL},
+  { "lstr", '\0', POPT_ARG_STRING | POPT_ARGFLAG_SHOW_DEFAULT, &lStr, 0,
+	"POPT_ARG_STRING: \"123456789...\"", NULL},
+
+  { NULL, '-', POPT_ARG_NONE | POPT_ARGFLAG_DOC_HIDDEN, &singleDash, 0,
+	NULL, NULL },
+  { NULL, '\0', POPT_ARG_INCLUDE_TABLE, &moreArgs, 0,
+	NULL, NULL },
+  { NULL, '\0', POPT_ARG_INCLUDE_TABLE, &callbackArgs, 0,
+	"Callback arguments", NULL },
+  POPT_AUTOHELP
+  POPT_TABLEEND
 };
 
 static void resetVars(void)
@@ -72,8 +120,17 @@ static void resetVars(void)
     arg3 = 0;
     inc = 0;
     shortopt = 0;
-    aFloat = 0.0;
-    aDouble = 0.0;
+
+    aVal = bVal;
+    aFlag = bFlag;
+
+    aInt = bInt;
+    aLong = bLong;
+    aFloat = bFloat;
+    aDouble = bDouble;
+
+    oStr = (char *) -1;
+
     singleDash = 0;
     pass2 = 0;
 }
@@ -128,9 +185,17 @@ int main(int argc, const char ** argv) {
 	fprintf(stdout, " inc: %d", inc);
     if (shortopt)
 	fprintf(stdout, " short: %d", shortopt);
-    if (aFloat != 0.0)
+    if (aVal != bVal)
+	fprintf(stdout, " aVal: %d", aVal);
+    if (aFlag != bFlag)
+	fprintf(stdout, " aFlag: %d", aFlag);
+    if (aInt != bInt)
+	fprintf(stdout, " aInt: %d", aInt);
+    if (aLong != bLong)
+	fprintf(stdout, " aLong: %ld", aLong);
+    if (aFloat != bFloat)
 	fprintf(stdout, " aFloat: %g", aFloat);
-    if (aDouble != 0.0)
+    if (aDouble != bDouble)
 	fprintf(stdout, " aDouble: %g", aDouble);
     if (oStr != (char *)-1)
 	fprintf(stdout, " oStr: %s", (oStr ? oStr : "(none)"));
diff --git a/testit.sh b/testit.sh
index 478613d..534a135 100755
--- a/testit.sh
+++ b/testit.sh
@@ -36,7 +36,7 @@ run test1 "test1 - 11" "arg1: 0 arg2: bar" -T bar
 run test1 "test1 - 12" "arg1: 1 arg2: (none)" -O 
 run test1 "test1 - 13" "arg1: 1 arg2: foo" -OT foo
 run test1 "test1 - 14" "arg1: 0 arg2: (none) inc: 1" --inc
-run test1 "test1 - 15" "arg1: 0 arg2: foo inc: 1" -i --arg2 foo
+run test1 "test1 - 15" "arg1: 0 arg2: foo inc: 1" -I --arg2 foo
 POSIX_ME_HARDER=1 ; export POSIX_ME_HARDER
 run test1 "test1 - 16" "arg1: 1 arg2: (none) rest: foo --arg2 something" --arg1 foo --arg2 something
 unset POSIX_ME_HARDER
@@ -49,8 +49,8 @@ run test1 "test1 - 20" "--arg1" --echo-args --arg1
 run test1 "test1 - 21" "--arg2 something" -T something -e
 run test1 "test1 - 22" "--arg2 something more args" -T something -a more args
 run test1 "test1 - 23" "--echo-args -a" --echo-args -e -a
-run test1 "test1 - 24" "arg1: 0 arg2: (none) short: 1" -shortoption
-run test1 "test1 - 25" "arg1: 0 arg2: (none) short: 1" --shortoption
+run test1 "test1 - 24" "arg1: 0 arg2: (none) short: 1" -onedash
+run test1 "test1 - 25" "arg1: 0 arg2: (none) short: 1" --onedash
 run test1 "test1 - 26" "callback: c arg for cb2 foo arg1: 0 arg2: (none)" --cb2 foo
 run test1 "test1 - 27" "arg1: 0 arg2: (none) -" -
 run test1 "test1 - 28" "arg1: 0 arg2: foo -" - -2 foo
@@ -62,11 +62,11 @@ run test1 "test1 - 32" "arg1: 0 arg2: (none) aFloat: 10.1" -f 10.1
 run test1 "test1 - 33" "arg1: 0 arg2: (none) aFloat: 10.1" --float 10.1
 run test1 "test1 - 34" "arg1: 0 arg2: (none) aDouble: 10.1" -d 10.1
 run test1 "test1 - 35" "arg1: 0 arg2: (none) aDouble: 10.1" --double 10.1
-run test1 "test1 - 36" "arg1: 0 arg2: (none) oStr: (none)" --ostr
-run test1 "test1 - 37" "arg1: 0 arg2: (none) oStr: yadda" --ostr=yadda
-run test1 "test1 - 38" "arg1: 0 arg2: (none) oStr: yadda" --ostr yadda
-run test1 "test1 - 39" "arg1: 0 arg2: (none) oStr: ping rest: pong" --ostr=ping pong
-run test1 "test1 - 40" "arg1: 0 arg2: (none) oStr: ping rest: pong" --ostr ping pong
+run test1 "test1 - 36" "arg1: 0 arg2: (none) oStr: (none)" --optional
+run test1 "test1 - 37" "arg1: 0 arg2: (none) oStr: yadda" --optional=yadda
+run test1 "test1 - 38" "arg1: 0 arg2: (none) oStr: yadda" --optional yadda
+run test1 "test1 - 39" "arg1: 0 arg2: (none) oStr: ping rest: pong" --optional=ping pong
+run test1 "test1 - 40" "arg1: 0 arg2: (none) oStr: ping rest: pong" --optional ping pong
 
 echo ""
 echo "Passed."
-- 
Gitee


From fe9cbc098e3a7a0f9b74367e120c82d2d68cc5ae Mon Sep 17 00:00:00 2001
From: Jeff Johnson <n3npq@mac.com>
Date: Sun, 17 Jun 2001 15:19:26 +0000
Subject: [PATCH 310/667] - popt: add POPT_CONTEXT_ARG_OPTS for all opts to
 return 1 (#30912). - fix: fsm reads/writes now return error on partial I/O. -
 fix: Ferror returned spurious error for gzdio/bzdio.

---
 popt.c     | 15 ++++++++++-----
 popt.h     |  1 +
 popthelp.c | 24 ++++++++++++++++--------
 3 files changed, 27 insertions(+), 13 deletions(-)

diff --git a/popt.c b/popt.c
index 851f6ab..a5672c4 100644
--- a/popt.c
+++ b/popt.c
@@ -675,10 +675,14 @@ int poptGetNextOpt(poptContext con)
 		return POPT_ERROR_BADOPT;
 
 	    if (con->restLeftover || *origOptString != '-') {
-		if (con->leftovers != NULL)	/* XXX can't happen */
-		con->leftovers[con->numLeftovers++] = origOptString;
 		if (con->flags & POPT_CONTEXT_POSIXMEHARDER)
 		    con->restLeftover = 1;
+		if (con->flags & POPT_CONTEXT_ARG_OPTS) {
+		    con->os->nextArg = xstrdup(origOptString);
+		    return 0;
+		}
+		if (con->leftovers != NULL)	/* XXX can't happen */
+		    con->leftovers[con->numLeftovers++] = origOptString;
 		continue;
 	    }
 
@@ -793,10 +797,11 @@ int poptGetNextOpt(poptContext con)
 		    cleanOSE(con->os--);
 		}
 		if (con->os->next == con->os->argc) {
-		    if (opt->argInfo & POPT_ARGFLAG_OPTIONAL)
-			con->os->nextArg = NULL;
-		    else
+		    if (!(opt->argInfo & POPT_ARGFLAG_OPTIONAL))
+			/*@-compdef@*/	/* FIX: con->os->argv not defined */
 			return POPT_ERROR_NOARG;
+			/*@=compdef@*/
+		    con->os->nextArg = NULL;
 		} else {
 
 		    /*
diff --git a/popt.h b/popt.h
index 844e673..a4c60e9 100644
--- a/popt.h
+++ b/popt.h
@@ -110,6 +110,7 @@ extern "C" {
 #define POPT_CONTEXT_NO_EXEC	(1 << 0)  /*!< ignore exec expansions */
 #define POPT_CONTEXT_KEEP_FIRST	(1 << 1)  /*!< pay attention to argv[0] */
 #define POPT_CONTEXT_POSIXMEHARDER (1 << 2) /*!< options can't follow args */
+#define POPT_CONTEXT_ARG_OPTS	(1 << 4) /*!< return args as options with value 0 */
 /*@}*/
 
 /** \ingroup popt
diff --git a/popthelp.c b/popthelp.c
index 5ce98e8..b63a15e 100644
--- a/popthelp.c
+++ b/popthelp.c
@@ -81,18 +81,22 @@ getArgDescrip(const struct poptOption * opt,
 
 static /*@only@*/ /*@null@*/ char * singleOptionDefaultValue(int lineLength,
 		const struct poptOption * opt,
-		/*@null@*/ const char *translation_domain)
+		/*@-paramuse@*/	/* FIX: i18n macros disable with lclint */
+		/*@null@*/ const char * translation_domain)
+		/*@=paramuse@*/
 	/*@*/
 {
     const char * defstr = D_(translation_domain, "default");
-    char * l = malloc(4*lineLength + 1);
-    char * le = l;
+    char * le = malloc(4*lineLength + 1);
+    char * l = le;
 
-    if (l == NULL) return l;	/* XXX can't happen */
+    if (l == NULL) return NULL;	/* XXX can't happen */
+    *le = '\0';
     *le++ = '(';
     le = stpcpy(le, defstr);
     *le++ = ':';
     *le++ = ' ';
+    if (opt->arg)	/* XXX programmer error */
     switch (opt->argInfo & POPT_ARG_MASK) {
     case POPT_ARG_VAL:
     case POPT_ARG_INT:
@@ -128,7 +132,7 @@ static /*@only@*/ /*@null@*/ char * singleOptionDefaultValue(int lineLength,
     default:
 	l = _free(l);
 	return NULL;
-	break;
+	/*@notreached@*/ break;
     }
     *le++ = ')';
     *le = '\0';
@@ -138,7 +142,7 @@ static /*@only@*/ /*@null@*/ char * singleOptionDefaultValue(int lineLength,
 
 static void singleOptionHelp(FILE * fp, int maxLeftCol, 
 		const struct poptOption * opt,
-		/*@null@*/ const char *translation_domain)
+		/*@null@*/ const char * translation_domain)
 	/*@modifies *fp, fileSystem @*/
 {
     int indentLength = maxLeftCol + 5;
@@ -180,9 +184,13 @@ static void singleOptionHelp(FILE * fp, int maxLeftCol,
 	if (opt->argInfo & POPT_ARGFLAG_SHOW_DEFAULT) {
 	    defs = singleOptionDefaultValue(lineLength, opt, translation_domain);
 	    if (defs) {
-		char * t = malloc(strlen(help) + strlen(defs) + sizeof(" "));
+		char * t = malloc((help ? strlen(help) : 0) +
+				strlen(defs) + sizeof(" "));
 		if (t) {
-		    (void) stpcpy( stpcpy( stpcpy(t, help), " "), defs);
+		    char * te = t;
+		    *te = '\0';
+		    if (help) te = stpcpy(te, help);
+		    (void) stpcpy( stpcpy( te, " "), defs);
 		    defs = _free(defs);
 		}
 		defs = t;
-- 
Gitee


From db2c34fa3444ef4f39d82a6d3c2348947b4cf00a Mon Sep 17 00:00:00 2001
From: Jeff Johnson <n3npq@mac.com>
Date: Tue, 19 Jun 2001 11:38:52 +0000
Subject: [PATCH 311/667] - preliminary abstraction to support per-header
 methods.

---
 po/popt.pot | 58 ++++++++++++++++++++++++++++++++---------------------
 1 file changed, 35 insertions(+), 23 deletions(-)

diff --git a/po/popt.pot b/po/popt.pot
index 3687099..f786aef 100644
--- a/po/popt.pot
+++ b/po/popt.pot
@@ -6,99 +6,111 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2001-02-22 17:41-0500\n"
+"POT-Creation-Date: 2001-06-19 07:33-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=CHARSET\n"
-"Content-Transfer-Encoding: ENCODING\n"
+"Content-Transfer-Encoding: 8bit\n"
 
 #: popt.c:29
 msgid "unknown errno"
 msgstr ""
 
-#: popt.c:758
+#: popt.c:888
 #, c-format
 msgid "option type (%d) not implemented in popt\n"
 msgstr ""
 
-#: popt.c:893
+#: popt.c:1053
 msgid "missing argument"
 msgstr ""
 
-#: popt.c:895
+#: popt.c:1055
 msgid "unknown option"
 msgstr ""
 
-#: popt.c:897
+#: popt.c:1057
 msgid "mutually exclusive logical operations requested"
 msgstr ""
 
-#: popt.c:899
+#: popt.c:1059
+msgid "opt->arg should not be NULL"
+msgstr ""
+
+#: popt.c:1061
 msgid "aliases nested too deeply"
 msgstr ""
 
-#: popt.c:901
+#: popt.c:1063
 msgid "error in parameter quoting"
 msgstr ""
 
-#: popt.c:903
+#: popt.c:1065
 msgid "invalid numeric value"
 msgstr ""
 
-#: popt.c:905
+#: popt.c:1067
 msgid "number too large or too small"
 msgstr ""
 
-#: popt.c:909
+#: popt.c:1069
+msgid "memory allocation failed"
+msgstr ""
+
+#: popt.c:1073
 msgid "unknown error"
 msgstr ""
 
-#: popthelp.c:28
+#: popthelp.c:32
 msgid "Show this help message"
 msgstr ""
 
-#: popthelp.c:29
+#: popthelp.c:33
 msgid "Display brief usage message"
 msgstr ""
 
-#: popthelp.c:60
+#: popthelp.c:36
+msgid "Display option defaults in message"
+msgstr ""
+
+#: popthelp.c:71
 msgid "NONE"
 msgstr ""
 
-#: popthelp.c:61
+#: popthelp.c:72
 msgid "VAL"
 msgstr ""
 
-#: popthelp.c:62
+#: popthelp.c:73
 msgid "INT"
 msgstr ""
 
-#: popthelp.c:63
+#: popthelp.c:74
 msgid "LONG"
 msgstr ""
 
-#: popthelp.c:64
+#: popthelp.c:75
 msgid "STRING"
 msgstr ""
 
-#: popthelp.c:65
+#: popthelp.c:76
 msgid "FLOAT"
 msgstr ""
 
-#: popthelp.c:66
+#: popthelp.c:77
 msgid "DOUBLE"
 msgstr ""
 
-#: popthelp.c:67
+#: popthelp.c:78
 msgid "ARG"
 msgstr ""
 
-#: popthelp.c:241
+#: popthelp.c:354
 msgid "Usage:"
 msgstr ""
 
-#: popthelp.c:260
+#: popthelp.c:376
 msgid "[OPTION...]"
 msgstr ""
-- 
Gitee


From 16147857b2c0f4771877e87049e4d18c6ab77dcf Mon Sep 17 00:00:00 2001
From: Jeff Johnson <n3npq@mac.com>
Date: Fri, 29 Jun 2001 22:38:13 +0000
Subject: [PATCH 312/667] Update included gettext routines to 0.10.38.

---
 intl/.cvsignore    |    4 +
 intl/ChangeLog     | 1086 +-------------------------------------------
 intl/Makefile.in   |  234 +++++++---
 intl/VERSION       |    2 +-
 intl/bindtextdom.c |  319 +++++++++----
 intl/cat-compat.c  |  262 -----------
 intl/dcgettext.c   |  577 +----------------------
 intl/dgettext.c    |   11 +-
 intl/explodename.c |   29 +-
 intl/finddomain.c  |   51 +--
 intl/gettext.c     |   21 +-
 intl/gettext.h     |   18 +-
 intl/gettextP.h    |  178 +++++++-
 intl/hash-string.h |   19 +-
 intl/intl-compat.c |  111 ++++-
 intl/l10nflist.c   |   35 +-
 intl/libgettext.h  |  174 +------
 intl/linux-msg.sed |  100 ----
 intl/loadinfo.h    |   36 +-
 intl/loadmsgcat.c  |  412 +++++++++++++++--
 intl/localealias.c |  143 +++---
 intl/po2tbl.sed.in |  102 -----
 intl/textdomain.c  |   81 +++-
 intl/xopen-msg.sed |  104 -----
 24 files changed, 1314 insertions(+), 2795 deletions(-)
 delete mode 100644 intl/cat-compat.c
 delete mode 100644 intl/linux-msg.sed
 delete mode 100644 intl/po2tbl.sed.in
 delete mode 100644 intl/xopen-msg.sed

diff --git a/intl/.cvsignore b/intl/.cvsignore
index 3b6496f..0f61936 100644
--- a/intl/.cvsignore
+++ b/intl/.cvsignore
@@ -1,2 +1,6 @@
 Makefile
 po2tbl.sed
+charset.alias
+libintl.h
+ref-add.sed
+ref-del.sed
diff --git a/intl/ChangeLog b/intl/ChangeLog
index 1989501..df904de 100644
--- a/intl/ChangeLog
+++ b/intl/ChangeLog
@@ -1,1086 +1,4 @@
-1998-04-29  Ulrich Drepper  <drepper@cygnus.com>
+2001-05-23  GNU  <bug-gnu-utils@gnu.org>
 
-	* intl/localealias.c (read_alias_file): Use unsigned char for
-	local variables.  Remove unused variable tp.
-	* intl/l10nflist.c (_nl_normalize_codeset): Use unsigned char *
-	for type of codeset.  For loosing Solaris systems.
-	* intl/loadinfo.h: Adapt prototype of _nl_normalize_codeset.
-	* intl/bindtextdom.c (BINDTEXTDOMAIN): Don't define local variable
-	len if not needed.
-	Patches by Jim Meyering.
+	* Version 0.10.38 released.
 
-1998-04-28  Ulrich Drepper  <drepper@cygnus.com>
-
-	* loadmsgcat.c (_nl_load_domain): Don't assign the element use_mmap if
-	mmap is not supported.
-
-	* hash-string.h: Don't include <values.h>.
-
-1998-04-27  Ulrich Drepper  <drepper@cygnus.com>
-
-	* textdomain.c: Use strdup is available.
-
-	* localealias.c: Define HAVE_MEMPCPY so that we can use this
-	function.  Define and use semapahores to protect modfication of
-	global objects when compiling for glibc.  Add code to allow
-	freeing alias table.
-
-	* l10nflist.c: Don't assume stpcpy not being a macro.
-
-	* gettextP.h: Define internal_function macri if not already done.
-	Use glibc byte-swap macros instead of defining SWAP when compiled
-	for glibc.
-	(struct loaded_domain): Add elements to allow unloading.
-
-	* Makefile.in (distclean): Don't remove libintl.h here.
-
-	* bindtextdomain.c: Carry over changes from glibc.  Use strdup if
-	available.
-
-	* dcgettext.c: Don't assume stpcpy not being a macro.  Mark internal
-	functions.  Add memory freeing code for glibc.
-
-	* dgettext.c: Update copyright.
-
-	* explodename.c: Include stdlib.h and string.h only if they exist.
-	Use strings.h eventually.
-
-	* finddomain.c: Mark internal functions.  Use strdup if available.
-	Add memory freeing code for glibc.
-
-1997-10-10 20:00  Ulrich Drepper  <drepper@cygnus.com>
-
-	* libgettext.h: Fix dummy textdomain and bindtextdomain macros.
-	They should return reasonable values.
-	Reported by Tom Tromey <tromey@cygnus.com>.
-
-1997-09-16 03:33  Ulrich Drepper  <drepper@cygnus.com>
-
-	* libgettext.h: Define PARAMS also to `args' if __cplusplus is defined.
-	* intlh.inst.in: Likewise.
-	Reported by Jean-Marc Lasgouttes <Jean-Marc.Lasgouttes@inria.fr>.
-
-	* libintl.glibc: Update from current glibc version.
-
-1997-09-06 02:10  Ulrich Drepper  <drepper@cygnus.com>
-
-	* intlh.inst.in: Reformat copyright.
-
-1997-08-19 15:22  Ulrich Drepper  <drepper@cygnus.com>
-
-	* dcgettext.c (DCGETTEXT): Remove wrong comment.
-
-1997-08-16 00:13  Ulrich Drepper  <drepper@cygnus.com>
-
-	* Makefile.in (install-data): Don't change directory to install.
-
-1997-08-01 14:30  Ulrich Drepper  <drepper@cygnus.com>
-
-	* cat-compat.c: Fix copyright.
-
-	* localealias.c: Don't define strchr unless !HAVE_STRCHR.
-
-	* loadmsgcat.c: Update copyright.  Fix typos.
-
-	* l10nflist.c: Don't define strchr unless !HAVE_STRCHR.
-	(_nl_make_l10nflist): Handle sponsor and revision correctly.
-
-	* gettext.c: Update copyright.
-	* gettext.h: Likewise.
-	* hash-string.h: Likewise.
-
-	* finddomain.c: Remoave dead code.  Define strchr only if
-	!HAVE_STRCHR.
-
-	* explodename.c: Include <sys/types.h>.
-
-	* explodename.c: Reformat copyright text.
-	(_nl_explode_name): Fix typo.
-
-	* dcgettext.c: Define and use __set_errno.
-	(guess_category_value): Don't use setlocale if HAVE_LC_MESSAGES is
-	not defined.
-
-	* bindtextdom.c: Pretty printing.
-
-1997-05-01 02:25  Ulrich Drepper  <drepper@cygnus.com>
-
-	* dcgettext.c (guess_category_value): Don't depend on
-	HAVE_LC_MESSAGES.  We don't need the macro here.
-	Patch by Bruno Haible <haible@ilog.fr>.
-
-	* cat-compat.c (textdomain): DoN't refer to HAVE_SETLOCALE_NULL
-	macro.  Instead use HAVE_LOCALE_NULL and define it when using
-	glibc, as in dcgettext.c.
-	Patch by Bruno Haible <haible@ilog.fr>.
-
-	* Makefile.in (CPPFLAGS): New variable.  Reported by Franc,ois
-	Pinard.
-
-Mon Mar 10 06:51:17 1997  Ulrich Drepper  <drepper@cygnus.com>
-
-	* Makefile.in: Implement handling of libtool.
-
-	* gettextP.h: Change data structures for use of generic lowlevel
-	i18n file handling.
-
-Wed Dec  4 20:21:18 1996  Ulrich Drepper  <drepper@cygnus.com>
-
-	* textdomain.c: Put parentheses around arguments of memcpy macro
-	definition.
-	* localealias.c: Likewise.
-	* l10nflist.c: Likewise.
-	* finddomain.c: Likewise.
-	* bindtextdom.c: Likewise.
-	Reported by Thomas Esken.
-
-Mon Nov 25 22:57:51 1996  Ulrich Drepper  <drepper@cygnus.com>
-
-	* textdomain.c: Move definition of `memcpy` macro to right
-	position.
-
-Fri Nov 22 04:01:58 1996  Ulrich Drepper  <drepper@cygnus.com>
-
-	* finddomain.c [!HAVE_STRING_H && !_LIBC]: Define memcpy using
- 	bcopy if not already defined.  Reported by Thomas Esken.
-	* bindtextdom.c: Likewise.
-	* l10nflist.c: Likewise.
-	* localealias.c: Likewise.
-	* textdomain.c: Likewise.
-
-Tue Oct 29 11:10:27 1996  Ulrich Drepper  <drepper@cygnus.com>
-
-	* Makefile.in (libdir): Change to use exec_prefix instead of
- 	prefix.  Reported by Knut-H�vardAksnes <etokna@eto.ericsson.se>.
-
-Sat Aug 31 03:07:09 1996  Ulrich Drepper  <drepper@cygnus.com>
-
-	* l10nflist.c (_nl_normalize_codeset): We convert to lower case,
-	so don't prepend uppercase `ISO' for only numeric arg.
-
-Fri Jul 19 00:15:46 1996  Ulrich Drepper  <drepper@cygnus.com>
-
-	* l10nflist.c: Move inclusion of argz.h, ctype.h, stdlib.h after
-	definition of _GNU_SOURCE.  Patch by Roland McGrath.
-
-	* Makefile.in (uninstall): Fix another bug with `for' loop and
-	empty arguments.  Patch by Jim Meyering.  Correct name os
-	uninstalled files: no intl- prefix anymore.
-
-	* Makefile.in (install-data): Again work around shells which
-	cannot handle mpty for list.  Reported by Jim Meyering.
-
-Sat Jul 13 18:11:35 1996  Ulrich Drepper  <drepper@cygnus.com>
-
-	* Makefile.in (install): Split goal.  Now depend on install-exec
-        and install-data.
-	(install-exec, install-data): New goals.  Created from former
-	install goal.
-	Reported by Karl Berry.
-
-Sat Jun 22 04:58:14 1996  Ulrich Drepper  <drepper@cygnus.com>
-
-	* Makefile.in (MKINSTALLDIRS): New variable.  Path to
-        mkinstalldirs script.
-	(install): use MKINSTALLDIRS variable or if the script is not present
-	try to find it in the $top_scrdir).
-
-Wed Jun 19 02:56:56 1996  Ulrich Drepper  <drepper@cygnus.com>
-
-	* l10nflist.c: Linux libc *partly* includes the argz_* functions.
-	Grr.  Work around by renaming the static version and use macros
-	for renaming.
-
-Tue Jun 18 20:11:17 1996  Ulrich Drepper  <drepper@cygnus.com>
-
-	* l10nflist.c: Correct presence test macros of __argz_* functions.
-
-	* l10nflist.c: Include <argz.h> based on test of it instead when
-	__argz_* functions are available.
-	Reported by Andreas Schwab.
-
-Thu Jun 13 15:17:44 1996  Ulrich Drepper  <drepper@cygnus.com>
-
-	* explodename.c, l10nflist.c: Define NULL for dumb systems.
-
-Tue Jun 11 17:05:13 1996  Ulrich Drepper  <drepper@cygnus.com>
-
-	* intlh.inst.in, libgettext.h (dcgettext): Rename local variable
-	result to __result to prevent name clash.
-
-	* l10nflist.c, localealias.c, dcgettext.c: Define _GNU_SOURCE to
-        get prototype for stpcpy and strcasecmp.
-
-	* intlh.inst.in, libgettext.h: Move declaration of
-	`_nl_msg_cat_cntr' outside __extension__ block to prevent warning
-	from gcc's -Wnested-extern option.
-
-Fri Jun  7 01:58:00 1996  Ulrich Drepper  <drepper@cygnus.com>
-
-	* Makefile.in (install): Remove comment.
-
-Thu Jun  6 17:28:17 1996  Ulrich Drepper  <drepper@cygnus.com>
-
-	* Makefile.in (install): Work around for another Buglix stupidity.
-	Always use an `else' close for `if's.  Reported by Nelson Beebe.
-
-	* Makefile.in (intlh.inst): Correct typo in phony rule.
-	Reported by Nelson Beebe.
-
-Thu Jun  6 01:49:52 1996  Ulrich Drepper  <drepper@cygnus.com>
-
-	* dcgettext.c (read_alias_file): Rename variable alloca_list to
-	block_list as the macro calls assume.
-	Patch by Eric Backus.
-
-	* localealias.c [!HAVE_ALLOCA]: Define alloca as macro using
-        malloc.
-	(read_alias_file): Rename varriabe alloca_list to block_list as the
-	macro calls assume.
-	Patch by Eric Backus.
-
-	* l10nflist.c: Correct conditional for <argz.h> inclusion.
-	Reported by Roland McGrath.
-
-	* Makefile.in (all): Depend on all-@USE_INCLUDED_LIBINTL@, not
-        all-@USE_NLS@.
-
-	* Makefile.in (install): intlh.inst comes from local dir, not
-        $(srcdir).
-
-	* Makefile.in (intlh.inst): Special handling of this goal.  If
-	used in gettext, this is really a rul to construct this file.  If
-	used in any other package it is defined as a .PHONY rule with
-	empty body.
-
-	* finddomain.c: Extract locale file information handling into
-	l10nfile.c.  Rename local stpcpy__ function to stpcpy.
-
-	* dcgettext.c (stpcpy): Add local definition.
-
-	* l10nflist.c: Solve some portability problems.  Patches partly by
-	Thomas Esken.  Add local definition of stpcpy.
-
-Tue Jun  4 02:47:49 1996  Ulrich Drepper  <drepper@cygnus.com>
-
-	* intlh.inst.in: Don't depend including <locale.h> on
-	HAVE_LOCALE_H.  Instead configure must rewrite this fiile
-	depending on the result of the configure run.
-
-	* Makefile.in (install): libintl.inst is now called intlh.inst.
-	Add rules for updating intlh.inst from intlh.inst.in.
-
-	* libintl.inst: Renamed to intlh.inst.in.
-
-	* localealias.c, dcgettext.c [__GNUC__]: Define HAVE_ALLOCA to 1
-        because gcc has __buitlin_alloca.
-	Reported by Roland McGrath.
-
-Mon Jun  3 00:32:16 1996  Ulrich Drepper  <drepper@cygnus.com>
-
-	* Makefile.in (installcheck): New goal to fulfill needs of
-        automake's distcheck.
-
-	* Makefile.in (install): Reorder commands so that VERSION is
-        found.
-
-	* Makefile.in (gettextsrcdir): Now use subdirectory intl/ in
-        @datadir@/gettext.
-	(COMSRCS): Add l10nfile.c.
-	(OBJECTS): Add l10nfile.o.
-	(DISTFILES): Rename to DISTFILE.normal.  Remove $(DISTFILES.common).
-	(DISTFILE.gettext): Remove $(DISTFILES.common).
-	(all-gettext): Remove goal.
-	(install): If $(PACKAGE) = gettext install, otherwose do nothing.  No
-	package but gettext itself should install libintl.h + headers.
-	(dist): Extend goal to work for gettext, too.
-	(dist-gettext): Remove goal.
-
-	* dcgettext.c [!HAVE_ALLOCA]: Define macro alloca by using malloc.
-
-Sun Jun  2 17:33:06 1996  Ulrich Drepper  <drepper@cygnus.com>
-
-	* loadmsgcat.c (_nl_load_domain): Parameter is now comes from
-        find_l10nfile.
-
-Sat Jun  1 02:23:03 1996  Ulrich Drepper  <drepper@cygnus.com>
-
-	* l10nflist.c (__argz_next): Add definition.
-
-	* dcgettext.c [!HAVE_ALLOCA]: Add code for handling missing alloca
-	code.  Use new l10nfile handling.
-
-	* localealias.c [!HAVE_ALLOCA]: Add code for handling missing
-        alloca code.
-
-	* l10nflist.c: Initial revision.
-
-Tue Apr  2 18:51:18 1996  Ulrich Drepper  <drepper@myware>
-
-	* Makefile.in (all-gettext): New goal.  Same as all-yes.
-
-Thu Mar 28 23:01:22 1996  Karl Eichwalder  <ke@ke.central.de>
-
-	* Makefile.in (gettextsrcdir): Define using @datadir@.
-
-Tue Mar 26 12:39:14 1996  Ulrich Drepper  <drepper@myware>
-
-	* finddomain.c: Include <ctype.h>.  Reported by Roland McGrath.
-
-Sat Mar 23 02:00:35 1996  Ulrich Drepper  <drepper@myware>
-
-	* finddomain.c (stpcpy): Rename to stpcpy__ to prevent clashing
-        with external declaration.
-
-Sat Mar  2 00:47:09 1996  Ulrich Drepper  <drepper@myware>
-
-	* Makefile.in (all-no): Rename from all_no.
-
-Sat Feb 17 00:25:59 1996  Ulrich Drepper  <drepper@myware>
-
-	* gettextP.h [loaded_domain]: Array `successor' must now contain up
-        to 63 elements (because of codeset name normalization).
-
-	* finddomain.c: Implement codeset name normalization.
-
-Thu Feb 15 04:39:09 1996  Ulrich Drepper  <drepper@myware>
-
-	* Makefile.in (all): Define to `all-@USE_NLS@'.
-	(all-yes, all_no): New goals.  `all-no' is noop, `all-yes'
-	is former all.
-
-Mon Jan 15 21:46:01 1996  Howard Gayle  <howard@hal.com>
-
-	* localealias.c (alias_compare): Increment string pointers in loop
-        of strcasecmp replacement.
-
-Fri Dec 29 21:16:34 1995  Ulrich Drepper  <drepper@myware>
-
-	* Makefile.in (install-src): Who commented this goal out ? :-)
-
-Fri Dec 29 15:08:16 1995  Ulrich Drepper  <drepper@myware>
-
-	* dcgettext.c (DCGETTEXT): Save `errno'.  Failing system calls
-	should not effect it because a missing catalog is no error.
-	Reported by Harald K<o:>nig <koenig@tat.physik.uni-tuebingen.de>.
-
-Tue Dec 19 22:09:13 1995  Ulrich Drepper  <drepper@myware>
-
-	* Makefile.in (Makefile): Explicitly use $(SHELL) for running
-        shell scripts.
-
-Fri Dec 15 17:34:59 1995  Andreas Schwab  <schwab@issan.informatik.uni-dortmund.de>
-
-	* Makefile.in (install-src): Only install library and header when
-	we use the own implementation.  Don't do it when using the
-	system's gettext or catgets functions.
-
-	* dcgettext.c (find_msg): Must not swap domain->hash_size here.
-
-Sat Dec  9 16:24:37 1995  Ulrich Drepper  <drepper@myware>
-
-	* localealias.c, libintl.inst, libgettext.h, hash-string.h,
-	gettextP.h, finddomain.c, dcgettext.c, cat-compat.c:
-	Use PARAMS instead of __P.  Suggested by Roland McGrath.
-
-Tue Dec  5 11:39:14 1995  Larry Schwimmer  <rosebud@cyclone.stanford.edu>
-
-	* libgettext.h: Use `#if !defined (_LIBINTL_H)' instead of `#if
-	!_LIBINTL_H' because Solaris defines _LIBINTL_H as empty.
-
-Mon Dec  4 15:42:07 1995  Ulrich Drepper  <drepper@myware>
-
-	* Makefile.in (install-src):
-	Install libintl.inst instead of libintl.h.install.
-
-Sat Dec  2 22:51:38 1995  Marcus Daniels  <marcus@sysc.pdx.edu>
-
-	* cat-compat.c (textdomain):
-	Reverse order in which files are tried you load.  First
-	try local file, when this failed absolute path.
-
-Wed Nov 29 02:03:53 1995  Nelson H. F. Beebe  <beebe@math.utah.edu>
-
-	* cat-compat.c (bindtextdomain): Add missing { }.
-
-Sun Nov 26 18:21:41 1995  Ulrich Drepper  <drepper@myware>
-
-	* libintl.inst: Add missing __P definition.  Reported by Nelson Beebe.
-
-	* Makefile.in:
-	Add dummy `all' and `dvi' goals.  Reported by Tom Tromey.
-
-Sat Nov 25 16:12:01 1995  Franc,ois Pinard  <pinard@iro.umontreal.ca>
-
-	* hash-string.h: Capitalize arguments of macros.
-
-Sat Nov 25 12:01:36 1995  Ulrich Drepper  <drepper@myware>
-
-	* Makefile.in (DISTFILES): Prevent files names longer than 13
-	characters.  libintl.h.glibc->libintl.glibc,
-	libintl.h.install->libintl.inst.  Reported by Joshua R. Poulson.
-
-Sat Nov 25 11:31:12 1995  Eric Backus  <ericb@lsid.hp.com>
-
-	* dcgettext.c: Fix bug in preprocessor conditionals.
-
-Sat Nov 25 02:35:27 1995  Nelson H. F. Beebe  <beebe@math.utah.edu>
-
-	* libgettext.h: Solaris cc does not understand
-	 #if !SYMBOL1 && !SYMBOL2.  Sad	but true.
-
-Thu Nov 23 16:22:14 1995  Ulrich Drepper  <drepper@myware>
-
-	* hash-string.h (hash_string):
-	Fix for machine with >32 bit `unsigned long's.
-
-	* dcgettext.c (DCGETTEXT):
-	Fix horrible bug in loop for alternative translation.
-
-Thu Nov 23 01:45:29 1995  Ulrich Drepper  <drepper@myware>
-
-	* po2tbl.sed.in, linux-msg.sed, xopen-msg.sed:
-	Some further simplifications in message number generation.
-
-Mon Nov 20 21:08:43 1995  Ulrich Drepper  <drepper@myware>
-
-	* libintl.h.glibc: Use __const instead of const in prototypes.
-
-	* Makefile.in (install-src):
-	Install libintl.h.install instead of libintl.h.  This
-	is a stripped-down version.  Suggested by Peter Miller.
-
-	* libintl.h.install, libintl.h.glibc: Initial revision.
-
-	* localealias.c (_nl_expand_alias, read_alias_file):
-	Protect prototypes in type casts by __P.
-
-Tue Nov 14 16:43:58 1995  Ulrich Drepper  <drepper@myware>
-
-	* hash-string.h: Correct prototype for hash_string.
-
-Sun Nov 12 12:42:30 1995  Ulrich Drepper  <drepper@myware>
-
-	* hash-string.h (hash_string): Add prototype.
-
-	* gettextP.h: Fix copyright.
-	(SWAP): Add prototype.
-
-Wed Nov  8 22:56:33 1995  Ulrich Drepper  <drepper@myware>
-
-	* localealias.c (read_alias_file): Forgot sizeof.
-	Avoid calling *printf function.  This introduces a big overhead.
-	Patch by Roland McGrath.
-
-Tue Nov  7 14:21:08 1995  Ulrich Drepper  <drepper@myware>
-
-	* finddomain.c, cat-compat.c: Wrong indentation in #if for stpcpy.
-
-	* finddomain.c (stpcpy):
-	Define substitution function local.  The macro was to flaky.
-
-	* cat-compat.c: Fix typo.
-
-	* xopen-msg.sed, linux-msg.sed:
-	While bringing message number to right place only accept digits.
-
-	* linux-msg.sed, xopen-msg.sed: Now that the counter does not have
-	leading 0s we don't need to remove them.  Reported by Marcus
-	Daniels.
-
-	* Makefile.in (../po/cat-id-tbl.o): Use $(top_srdir) in
-	dependency.  Reported by Marcus Daniels.
-
-	* cat-compat.c: (stpcpy) [!_LIBC && !HAVE_STPCPY]: Define replacement.
-	Generally cleanup using #if instead of #ifndef.
-
-	* Makefile.in: Correct typos in comment.  By Franc,ois Pinard.
-
-Mon Nov  6 00:27:02 1995  Ulrich Drepper  <drepper@myware>
-
-	* Makefile.in (install-src): Don't install libintl.h and libintl.a
-	if we use an available gettext implementation.
-
-Sun Nov  5 22:02:08 1995  Ulrich Drepper  <drepper@myware>
-
-	* libgettext.h: Fix typo: HAVE_CATGETTS -> HAVE_CATGETS.  Reported
-	by Franc,ois Pinard.
-
-	* libgettext.h: Use #if instead of #ifdef/#ifndef.
-
-	* finddomain.c:
-	Comments describing what has to be done should start with FIXME.
-
-Sun Nov  5 19:38:01 1995  Ulrich Drepper  <drepper@myware>
-
-	* Makefile.in (DISTFILES): Split.  Use DISTFILES with normal meaning.
-	DISTFILES.common names the files common to both dist goals.
-	DISTFILES.gettext are the files only distributed in GNU gettext.
-
-Sun Nov  5 17:32:54 1995  Ulrich Drepper  <drepper@myware>
-
-	* dcgettext.c (DCGETTEXT): Correct searching in derived locales.
-	This was necessary since a change in _nl_find_msg several weeks
-	ago.  I really don't know this is still not fixed.
-
-Sun Nov  5 12:43:12 1995  Ulrich Drepper  <drepper@myware>
-
-	* loadmsgcat.c (_nl_load_domain): Test for FILENAME == NULL.  This
-	might mark a special condition.
-
-	* finddomain.c (make_entry_rec): Don't make illegal entry as decided.
-
-	* Makefile.in (dist): Suppress error message when ln failed.
-	Get files from $(srcdir) explicitly.
-
-	* libgettext.h (gettext_const): Rename to gettext_noop.
-
-Fri Nov  3 07:36:50 1995  Ulrich Drepper  <drepper@myware>
-
-	* finddomain.c (make_entry_rec):
-	Protect against wrong locale names by testing mask.
-
-	* libgettext.h (gettext_const): Add macro definition.
-	Capitalize macro arguments.
-
-Thu Nov  2 23:15:51 1995  Ulrich Drepper  <drepper@myware>
-
-	* finddomain.c (_nl_find_domain):
-	Test for pointer != NULL before accessing value.
-	Reported by Tom Tromey.
-
-	* gettext.c (NULL):
-	Define as (void*)0 instad of 0.  Reported by Franc,ois Pinard.
-
-Mon Oct 30 21:28:52 1995  Ulrich Drepper  <drepper@myware>
-
-	* po2tbl.sed.in: Serious typo bug fixed by Jim Meyering.
-
-Sat Oct 28 23:20:47 1995  Ulrich Drepper  <drepper@myware>
-
-	* libgettext.h: Disable dcgettext optimization for Solaris 2.3.
-
-	* localealias.c (alias_compare):
-	Peter Miller reported that tolower in some systems is
-	even dumber than I thought.  Protect call by `isupper'.
-
-Fri Oct 27 22:22:51 1995  Ulrich Drepper  <drepper@myware>
-
-	* Makefile.in (libdir, includedir): New variables.
-	(install-src): Install libintl.a and libintl.h in correct dirs.
-
-Fri Oct 27 22:07:29 1995  Ulrich Drepper  <drepper@myware>
-
-	* Makefile.in (SOURCES): Fix typo: intrl.compat.c -> intl-compat.c.
-
-	* po2tbl.sed.in: Patch for buggy SEDs by Christian von Roques.
-
-	* localealias.c:
-	Fix typo and superflous test.  Reported by Christian von Roques.
-
-Fri Oct  6 11:52:05 1995  Ulrich Drepper  <drepper@myware>
-
-	* finddomain.c (_nl_find_domain):
-	Correct some remainder from the pre-CEN syntax.  Now
-	we don't have a constant number of successors anymore.
-
-Wed Sep 27 21:41:13 1995  Ulrich Drepper  <drepper@myware>
-
-	* Makefile.in (DISTFILES): Add libintl.h.glibc.
-
-	* Makefile.in (dist-libc): Add goal for packing sources for glibc.
-	(COMSRCS, COMHDRS): Splitted to separate sources shared with glibc.
-
-	* loadmsgcat.c: Forget to continue #if line.
-
-	* localealias.c:
-	[_LIBC]: Rename strcasecmp to __strcasecmp to keep ANSI C name
-	space clean.
-
-	* dcgettext.c, finddomain.c: Better comment to last change.
-
-	* loadmsgcat.c:
-	[_LIBC]: Rename fstat, open, close, read, mmap, and munmap to
-	__fstat, __open, __close, __read, __mmap, and __munmap resp
-	to keep ANSI C name space clean.
-
-	* finddomain.c:
-	[_LIBC]: Rename stpcpy to __stpcpy to keep ANSI C name space clean.
-
-	* dcgettext.c:
-	[_LIBC]: Rename getced and stpcpy to __getcwd and __stpcpy resp to
-	keep ANSI C name space clean.
-
-	* libgettext.h:
-	Include sys/types.h for those old SysV systems out there.
-	Reported by Francesco Potorti`.
-
-	* loadmsgcat.c (use_mmap): Define if compiled for glibc.
-
-	* bindtextdom.c: Include all those standard headers
-	unconditionally if _LIBC is defined.
-
-	* finddomain.c: Fix 2 times defiend -> defined.
-
-	* textdomain.c: Include libintl.h instead of libgettext.h when
-	compiling for glibc.  Include all those standard headers
-	unconditionally if _LIBC is defined.
-
-	* localealias.c, loadmsgcat.c: Prepare to be compiled in glibc.
-
-	* gettext.c:
-	Include libintl.h instead of libgettext.h when compiling for glibc.
-	Get NULL from stddef.h if we compile for glibc.
-
-	* finddomain.c: Include libintl.h instead of libgettext.h when
-	compiling for glibc.  Include all those standard headers
-	unconditionally if _LIBC is defined.
-
-	* dcgettext.c: Include all those standard headers unconditionally
-	if _LIBC is defined.
-
-	* dgettext.c: If compiled in glibc include libintl.h instead of
-	libgettext.h.
-	(locale.h): Don't rely on HAVE_LOCALE_H when compiling for glibc.
-
-	* dcgettext.c: If compiled in glibc include libintl.h instead of
-	libgettext.h.
-	(getcwd): Don't rely on HAVE_GETCWD when compiling for glibc.
-
-	* bindtextdom.c:
-	If compiled in glibc include libintl.h instead of libgettext.h.
-
-Mon Sep 25 22:23:06 1995  Ulrich Drepper  <drepper@myware>
-
-	* localealias.c (_nl_expand_alias): Don't call bsearch if NMAP <= 0.
-	Reported by Marcus Daniels.
-
-	* cat-compat.c (bindtextdomain):
-	String used in putenv must not be recycled.
-	Reported by Marcus Daniels.
-
-	* libgettext.h (__USE_GNU_GETTEXT):
-	Additional symbol to signal that we use GNU gettext
-	library.
-
-	* cat-compat.c (bindtextdomain):
-	Fix bug with the strange stpcpy replacement.
-	Reported by Nelson Beebe.
-
-Sat Sep 23 08:23:51 1995  Ulrich Drepper  <drepper@myware>
-
-	* cat-compat.c: Include <string.h> for stpcpy prototype.
-
-	* localealias.c (read_alias_file):
-	While expand strdup code temporary variable `cp' hided
-	higher level variable with same name.  Rename to `tp'.
-
-	* textdomain.c (textdomain):
-	Avoid warning by using temporary variable in strdup code.
-
-	* finddomain.c (_nl_find_domain): Remove unused variable `application'.
-
-Thu Sep 21 15:51:44 1995  Ulrich Drepper  <drepper@myware>
-
-	* localealias.c (alias_compare):
-	Use strcasecmp() only if available.  Else use
-	implementation in place.
-
-	* intl-compat.c:
-	Wrapper functions now call *__ functions instead of __*.
-
-	* libgettext.h: Declare prototypes for *__ functions instead for __*.
-
-	* cat-compat.c, loadmsgcat.c:
-	Don't use xmalloc, xstrdup, and stpcpy.  These functions are not part
-	of the standard libc and so prevent libintl.a from being used
-	standalone.
-
-	* bindtextdom.c:
-	Don't use xmalloc, xstrdup, and stpcpy.  These functions are not part
-	of the standard libc and so prevent libintl.a from being used
-	standalone.
-	Rename to bindtextdomain__ if not used in GNU C Library.
-
-	* dgettext.c:
-	Rename function to dgettext__ if not used in GNU C Library.
-
-	* gettext.c:
-	Don't use xmalloc, xstrdup, and stpcpy.  These functions are not part
-	of the standard libc and so prevent libintl.a from being used
-	standalone.
-	Functions now called gettext__ if not used in GNU C Library.
-
-	* dcgettext.c, localealias.c, textdomain.c, finddomain.c:
-	Don't use xmalloc, xstrdup, and stpcpy.  These functions are not part
-	of the standard libc and so prevent libintl.a from being used
-	standalone.
-
-Sun Sep 17 23:14:49 1995  Ulrich Drepper  <drepper@myware>
-
-	* finddomain.c: Correct some bugs in handling of CEN standard
- 	locale definitions.
-
-Thu Sep  7 01:49:28 1995  Ulrich Drepper  <drepper@myware>
-
-	* finddomain.c: Implement CEN syntax.
-
-	* gettextP.h (loaded_domain): Extend number of successors to 31.
-
-Sat Aug 19 19:25:29 1995  Ulrich Drepper  <drepper@myware>
-
-	* Makefile.in (aliaspath): Remove path to X11 locale dir.
-
-	* Makefile.in: Make install-src depend on install.  This helps
- 	gettext to install the sources and other packages can use the
- 	install goal.
-
-Sat Aug 19 15:19:33 1995  Ulrich Drepper  <drepper@myware>
-
-	* Makefile.in (uninstall): Remove stuff installed by install-src.
-
-Tue Aug 15 13:13:53 1995  Ulrich Drepper  <drepper@myware>
-
-	* VERSION.in: Initial revision.
-
-	* Makefile.in (DISTFILES):
-	Add VERSION file.  This is not necessary for gettext, but
-	for other packages using this library.
-
-Tue Aug 15 06:16:44 1995  Ulrich Drepper  <drepper@myware>
-
-	* gettextP.h (_nl_find_domain):
-	New prototype after changing search strategy.
-
-	* finddomain.c (_nl_find_domain):
-	We now try only to find a specified catalog.  Fall back to other
-	catalogs listed in the locale list is now done in __dcgettext.
-
-	* dcgettext.c (__dcgettext):
-	Now we provide message fall back even to different languages.
-	I.e. if a message is not available in one language all the other
- 	in the locale list a tried.  Formerly fall back was only possible
- 	within one language.  Implemented by moving one loop from
- 	_nl_find_domain to here.
-
-Mon Aug 14 23:45:50 1995  Ulrich Drepper  <drepper@myware>
-
-	* Makefile.in (gettextsrcdir):
-	Directory where source of GNU gettext library are made
-	available.
-	(INSTALL, INSTALL_DATA): Programs used for installing sources.
-	(gettext-src): New.  Rule to install GNU gettext sources for use in
-	gettextize shell script.
-
-Sun Aug 13 14:40:48 1995  Ulrich Drepper  <drepper@myware>
-
-	* loadmsgcat.c (_nl_load_domain):
-	Use mmap for loading only when munmap function is
-	also available.
-
-	* Makefile.in (install): Depend on `all' goal.
-
-Wed Aug  9 11:04:33 1995  Ulrich Drepper  <drepper@myware>
-
-	* localealias.c (read_alias_file):
-	Do not overwrite '\n' when terminating alias value string.
-
-	* localealias.c (read_alias_file):
-	Handle long lines.  Ignore the rest not fitting in
-	the buffer after the initial `fgets' call.
-
-Wed Aug  9 00:54:29 1995  Ulrich Drepper  <drepper@myware>
-
-	* gettextP.h (_nl_load_domain):
-	Add prototype, replacing prototype for _nl_load_msg_cat.
-
-	* finddomain.c (_nl_find_domain):
-	Remove unneeded variable filename and filename_len.
-	(expand_alias): Remove prototype because functions does not
- 	exist anymore.
-
-	* localealias.c (read_alias_file):
-	Change type of fname_len parameter to int.
-	(xmalloc): Add prototype.
-
-	* loadmsgcat.c: Better prototypes for xmalloc.
-
-Tue Aug  8 22:30:39 1995  Ulrich Drepper  <drepper@myware>
-
-	* finddomain.c (_nl_find_domain):
-	Allow alias name to be constructed from the four components.
-
-	* Makefile.in (aliaspath): New variable.  Set to preliminary value.
-	(SOURCES): Add localealias.c.
-	(OBJECTS): Add localealias.o.
-
-	* gettextP.h: Add prototype for _nl_expand_alias.
-
-	* finddomain.c: Aliasing handled in intl/localealias.c.
-
-	* localealias.c: Aliasing for locale names.
-
-	* bindtextdom.c: Better prototypes for xmalloc and xstrdup.
-
-Mon Aug  7 23:47:42 1995  Ulrich Drepper  <drepper@myware>
-
-	* Makefile.in (DISTFILES): gettext.perl is now found in misc/.
-
-	* cat-compat.c (bindtextdomain):
-	Correct implementation.  dirname parameter was not used.
-	Reported by Marcus Daniels.
-
-	* gettextP.h (loaded_domain):
-	New fields `successor' and `decided' for oo, lazy
-	message handling implementation.
-
-	* dcgettext.c:
-	Adopt for oo, lazy message handliing.
-  	Now we can inherit translations from less specific locales.
-	(find_msg): New function.
-
-	* loadmsgcat.c, finddomain.c:
-	Complete rewrite.  Implement oo, lazy message handling :-).
-  	We now have an additional environment variable `LANGUAGE' with
- 	a higher priority than LC_ALL for the LC_MESSAGE locale.
-  	Here we can set a colon separated list of specifications each
- 	of the form `language[_territory[.codeset]][@modifier]'.
-
-Sat Aug  5 09:55:42 1995  Ulrich Drepper  <drepper@myware>
-
-	* finddomain.c (unistd.h):
-	Include to get _PC_PATH_MAX defined on system having it.
-
-Fri Aug  4 22:42:00 1995  Ulrich Drepper  <drepper@myware>
-
-	* finddomain.c (stpcpy): Include prototype.
-
-	* Makefile.in (dist): Remove `copying instead' message.
-
-Wed Aug  2 18:52:03 1995  Ulrich Drepper  <drepper@myware>
-
-	* Makefile.in (ID, TAGS): Do not use $^.
-
-Tue Aug  1 20:07:11 1995  Ulrich Drepper  <drepper@myware>
-
-	* Makefile.in (TAGS, ID): Use $^ as command argument.
-	(TAGS): Give etags -o option t write to current directory,
- 	not $(srcdir).
-	(ID): Use $(srcdir) instead os $(top_srcdir)/src.
-	(distclean): Remove ID.
-
-Sun Jul 30 11:51:46 1995  Ulrich Drepper  <drepper@myware>
-
-	* Makefile.in (gnulocaledir):
-	New variable, always using share/ for data directory.
-	(DEFS): Add GNULOCALEDIR, used in finddomain.c.
-
-	* finddomain.c (_nl_default_dirname):
-	Set to GNULOCALEDIR, because it always has to point
-	to the directory where GNU gettext Library writes it to.
-
-	* intl-compat.c (textdomain, bindtextdomain):
-	Undefine macros before function definition.
-
-Sat Jul 22 01:10:02 1995  Ulrich Drepper  <drepper@myware>
-
-	* libgettext.h (_LIBINTL_H):
-	Protect definition in case where this file is included as
-	libgettext.h on Solaris machines.  Add comment about this.
-
-Wed Jul 19 02:36:42 1995  Ulrich Drepper  <drepper@myware>
-
-	* intl-compat.c (textdomain): Correct typo.
-
-Wed Jul 19 01:51:35 1995  Ulrich Drepper  <drepper@myware>
-
-	* dcgettext.c (dcgettext): Function now called __dcgettext.
-
-	* dgettext.c (dgettext): Now called __dgettext and calls
- 	__dcgettext.
-
-	* gettext.c (gettext):
-	Function now called __gettext and calls __dgettext.
-
-	* textdomain.c (textdomain): Function now called __textdomain.
-
-	* bindtextdom.c (bindtextdomain): Function now called
- 	__bindtextdomain.
-
-	* intl-compat.c: Initial revision.
-
-	* Makefile.in (SOURCES): Add intl-compat.c.
-	(OBJECTS): We always compile the GNU gettext library functions.
-  	OBJECTS contains all objects but cat-compat.o, ../po/cat-if-tbl.o,
- 	and intl-compat.o.
-  	(GETTOBJS): Contains now only intl-compat.o.
-
-	* libgettext.h:
-	Re-include protection matches dualistic character of libgettext.h.
-	For all functions in GNU gettext library define __ counter part.
-
-	* finddomain.c (strchr): Define as index if not found in C library.
-	(_nl_find_domain): For relative paths paste / in between.
-
-Tue Jul 18 16:37:45 1995  Ulrich Drepper  <drepper@myware>
-
-	* loadmsgcat.c, finddomain.c: Add inclusion of sys/types.h.
-
-	* xopen-msg.sed: Fix bug with `msgstr ""' lines.
-	A little bit better comments.
-
-Tue Jul 18 01:18:27 1995  Ulrich Drepper  <drepper@myware>
-
-	* Makefile.in:
-	po-mode.el, makelinks, combine-sh are now found in ../misc.
-
-	* po-mode.el, makelinks, combine-sh, elisp-comp:
-	Moved to ../misc/.
-
-	* libgettext.h, gettextP.h, gettext.h: Uniform test for __STDC__.
-
-Sun Jul 16 22:33:02 1995  Ulrich Drepper  <drepper@myware>
-
-	* Makefile.in (INSTALL, INSTALL_DATA): New variables.
-	(install-data, uninstall): Install/uninstall .elc file.
-
-	* po-mode.el (Installation comment):
-	Add .pox as possible extension of .po files.
-
-Sun Jul 16 13:23:27 1995  Ulrich Drepper  <drepper@myware>
-
-	* elisp-comp: Complete new version by Franc,ois: This does not
- 	fail when not compiling in the source directory.
-
-Sun Jul 16 00:12:17 1995  Ulrich Drepper  <drepper@myware>
-
-	* Makefile.in (../po/cat-id-tbl.o):
-	Use $(MAKE) instead of make for recursive make.
-
-	* Makefile.in (.el.elc): Use $(SHELL) instead of /bin/sh.
-	(install-exec): Add missing dummy goal.
-	(install-data, uninstall): @ in multi-line shell command at
- 	beginning, not in front of echo.  Reported by Eric Backus.
-
-Sat Jul 15 00:21:28 1995  Ulrich Drepper  <drepper@myware>
-
-	* Makefile.in (DISTFILES):
-	Rename libgettext.perl to gettext.perl to fit in 14 chars
-	file systems.
-
-	* gettext.perl:
- 	Rename to gettext.perl to fit in 14 chars file systems.
-
-Thu Jul 13 23:17:20 1995  Ulrich Drepper  <drepper@myware>
-
-	* cat-compat.c: If !STDC_HEADERS try to include malloc.h.
-
-Thu Jul 13 20:55:02 1995  Ulrich Drepper  <drepper@myware>
-
-	* po2tbl.sed.in: Pretty printing.
-
-	* linux-msg.sed, xopen-msg.sed:
-	Correct bugs with handling substitute flags in branches.
-
-	* hash-string.h (hash_string):
-	Old K&R compilers don't under stand `unsigned char'.
-
-	* gettext.h (nls_uint32):
-	Some old K&R compilers (eg HP) don't understand `unsigned int'.
-
-	* cat-compat.c (msg_to_cat_id): De-ANSI-fy prototypes.
-
-Thu Jul 13 01:34:33 1995  Ulrich Drepper  <drepper@myware>
-
-	* Makefile.in (ELCFILES): New variable.
-	(DISTFILES): Add elisp-comp.
-	Add implicit rule for .el -> .elc compilation.
-	(install-data): install $ELCFILES
-	(clean): renamed po-to-tbl and po-to-msg to po2tbl and po2msg resp.
-
-	* elisp-comp: Initial revision
-
-Wed Jul 12 16:14:52 1995  Ulrich Drepper  <drepper@myware>
-
-	* Makefile.in:
-	cat-id-tbl.c is now found in po/.  This enables us to use an identical
-	intl/ directory in all packages.
-
-	* dcgettext.c (dcgettext): hashing does not work for table size <= 2.
-
-	* textdomain.c: fix typo (#if def -> #if defined)
-
-Tue Jul 11 18:44:43 1995  Ulrich Drepper  <drepper@myware>
-
-	* Makefile.in (stamp-cat-id): use top_srcdir to address source files
-	(DISTFILES,distclean): move tupdate.perl to src/
-
-	* po-to-tbl.sed.in:
-	add additional jump to clear change flag to recognize multiline strings
-
-Tue Jul 11 01:32:50 1995  Ulrich Drepper  <drepper@myware>
-
-	* textdomain.c: Protect inclusion of stdlib.h and string.h.
-
-	* loadmsgcat.c: Protect inclusion of stdlib.h.
-
-	* libgettext.h: Protect inclusion of locale.h.
-	Allow use in C++ programs.
-	Define NULL is not happened already.
-
-	* Makefile.in (DISTFILES): ship po-to-tbl.sed.in instead of
-	po-to-tbl.sed.
-	(distclean): remove po-to-tbl.sed and tupdate.perl.
-
-	* tupdate.perl.in: Substitute Perl path even in exec line.
-	Don't include entries without translation from old .po file.
-
-Tue Jul  4 00:41:51 1995  Ulrich Drepper  <drepper@myware>
-
-	* tupdate.perl.in: use "Updated: " in msgid "".
-
-	* cat-compat.c: Fix typo (LOCALDIR -> LOCALEDIR).
- 	Define getenv if !__STDC__.
-
-	* bindtextdom.c: Protect stdlib.h and string.h inclusion.
- 	Define free if !__STDC__.
-
-	* finddomain.c: Change DEF_MSG_DOM_DIR to LOCALEDIR.
- 	Define free if !__STDC__.
-
-	* cat-compat.c: Change DEF_MSG_DOM_DIR to LOCALEDIR.
-
-Mon Jul  3 23:56:30 1995  Ulrich Drepper  <drepper@myware>
-
-	* Makefile.in: Use LOCALEDIR instead of DEF_MSG_DOM_DIR.
-	Remove unneeded $(srcdir) from Makefile.in dependency.
-
-	* makelinks: Add copyright and short description.
-
-	* po-mode.el: Last version for 0.7.
-
-	* tupdate.perl.in: Fix die message.
-
-	* dcgettext.c: Protect include of string.h.
-
-	* gettext.c: Protect include of stdlib.h and further tries to get NULL.
-
-	* finddomain.c: Some corrections in includes.
-
-	* Makefile.in (INCLUDES): Prune list correct path to Makefile.in.
-
-	* po-to-tbl.sed: Adopt for new .po file format.
-
-	* linux-msg.sed, xopen-msg.sed: Adopt for new .po file format.
-
-Sun Jul  2 23:55:03 1995  Ulrich Drepper  <drepper@myware>
-
-	* tupdate.perl.in: Complete rewrite for new .po file format.
-
-Sun Jul  2 02:06:50 1995  Ulrich Drepper  <drepper@myware>
-
-	* First official release.  This directory contains all the code
-	needed to internationalize own packages.  It provides functions
-	which allow to use the X/Open catgets function with an interface
-	like the Uniforum gettext function.  For system which does not
-	have neither of those a complete implementation is provided.
diff --git a/intl/Makefile.in b/intl/Makefile.in
index 4bdb186..889ba23 100644
--- a/intl/Makefile.in
+++ b/intl/Makefile.in
@@ -1,5 +1,5 @@
 # Makefile for directory with message catalog handling in GNU NLS Utilities.
-# Copyright (C) 1995, 1996, 1997 Free Software Foundation, Inc.
+# Copyright (C) 1995-1998, 2000, 2001 Free Software Foundation, Inc.
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -28,75 +28,106 @@ VPATH = @srcdir@
 prefix = @prefix@
 exec_prefix = @exec_prefix@
 transform = @program_transform_name@
-libdir = $(exec_prefix)/lib
-includedir = $(prefix)/include
-datadir = $(prefix)/@DATADIRNAME@
+libdir = @libdir@
+includedir = @includedir@
+datadir = @datadir@
 localedir = $(datadir)/locale
-gnulocaledir = $(prefix)/share/locale
-gettextsrcdir = @datadir@/gettext/intl
-aliaspath = $(localedir):.
+gettextsrcdir = $(datadir)/gettext/intl
+aliaspath = $(localedir)
 subdir = intl
 
 INSTALL = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
 MKINSTALLDIRS = @MKINSTALLDIRS@
+mkinstalldirs = $(SHELL) `case "$(MKINSTALLDIRS)" in /*) echo "$(MKINSTALLDIRS)" ;; *) echo "$(top_builddir)/$(MKINSTALLDIRS)" ;; esac`
 
-l = @l@
+l = @INTL_LIBTOOL_SUFFIX_PREFIX@
 
 AR = ar
 CC = @CC@
 LIBTOOL = @LIBTOOL@
 RANLIB = @RANLIB@
+YACC = @INTLBISON@ -y -d
+YFLAGS = --name-prefix=__gettext
 
-DEFS = -DLOCALEDIR=\"$(localedir)\" -DGNULOCALEDIR=\"$(gnulocaledir)\" \
--DLOCALE_ALIAS_PATH=\"$(aliaspath)\" @DEFS@
+DEFS = -DLOCALEDIR=\"$(localedir)\" -DLOCALE_ALIAS_PATH=\"$(aliaspath)\" \
+-DLIBDIR=\"$(libdir)\" @DEFS@
 CPPFLAGS = @CPPFLAGS@
 CFLAGS = @CFLAGS@
 LDFLAGS = @LDFLAGS@
 
 COMPILE = $(CC) -c $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS) $(XCFLAGS)
 
-HEADERS = $(COMHDRS) libgettext.h loadinfo.h
+HEADERS = $(COMHDRS) libgnuintl.h libgettext.h loadinfo.h
 COMHDRS = gettext.h gettextP.h hash-string.h
-SOURCES = $(COMSRCS) intl-compat.c cat-compat.c
+SOURCES = $(COMSRCS) intl-compat.c
 COMSRCS = bindtextdom.c dcgettext.c dgettext.c gettext.c \
 finddomain.c loadmsgcat.c localealias.c textdomain.c l10nflist.c \
-explodename.c
+explodename.c dcigettext.c dcngettext.c dngettext.c ngettext.c plural.y \
+localcharset.c
 OBJECTS = @INTLOBJS@ bindtextdom.$lo dcgettext.$lo dgettext.$lo gettext.$lo \
 finddomain.$lo loadmsgcat.$lo localealias.$lo textdomain.$lo l10nflist.$lo \
-explodename.$lo
-CATOBJS = cat-compat.$lo ../po/cat-id-tbl.$lo
+explodename.$lo dcigettext.$lo dcngettext.$lo dngettext.$lo ngettext.$lo \
+plural.$lo localcharset.$lo
 GETTOBJS = intl-compat.$lo
-DISTFILES.common = ChangeLog Makefile.in linux-msg.sed po2tbl.sed.in \
-xopen-msg.sed $(HEADERS) $(SOURCES)
+DISTFILES.common = Makefile.in \
+config.charset locale.alias ref-add.sin ref-del.sin $(HEADERS) $(SOURCES)
+DISTFILES.generated = plural.c
 DISTFILES.normal = VERSION
-DISTFILES.gettext = libintl.glibc intlh.inst.in
+DISTFILES.gettext = libintl.glibc
+DISTFILES.obsolete = xopen-msg.sed linux-msg.sed po2tbl.sed.in cat-compat.c
+
+# Libtool's library version information for libintl.
+# Before making a gettext release, the gettext maintainer must change this
+# according to the libtool documentation, section "Library interface versions".
+# Maintainers of other packages that include the intl directory must *not*
+# change these values.
+LTV_CURRENT=1
+LTV_REVISION=1
+LTV_AGE=0
 
 .SUFFIXES:
-.SUFFIXES: .c .o .lo
+.SUFFIXES: .c .y .o .lo .sin .sed
 .c.o:
 	$(COMPILE) $<
 .c.lo:
 	$(LIBTOOL) --mode=compile $(COMPILE) $<
 
-INCLUDES = -I.. -I. -I$(top_srcdir)/intl -I$(top_srcdir)/lib
+.y.c:
+	$(YACC) $(YFLAGS) --output $@ $<
+	rm -f $*.h
 
-all: all-@USE_INCLUDED_LIBINTL@
+.sin.sed:
+	sed -e '/^#/d' -e 's/@''PACKAGE''@/@PACKAGE@/g' $< > t-$@
+	mv t-$@ $@
+
+INCLUDES = -I.. -I. -I$(top_srcdir)/intl
 
-all-yes: libintl.$la intlh.inst
-all-no:
+all: all-@USE_INCLUDED_LIBINTL@
+all-yes: libintl.$la libintl.h charset.alias ref-add.sed ref-del.sed
+all-no: all-no-@BUILD_INCLUDED_LIBINTL@
+all-no-yes: libgnuintl.$la
+all-no-no:
 
-libintl.a: $(OBJECTS)
+libintl.a libgnuintl.a: $(OBJECTS)
 	rm -f $@
 	$(AR) cru $@ $(OBJECTS)
 	$(RANLIB) $@
 
-libintl.la: $(OBJECTS)
-	$(LIBTOOL) --mode=link $(CC) $(LDFLAGS) -o $@ $(OBJECTS) \
-		   -version-info 1:0 -rpath $(libdir)
+libintl.la libgnuintl.la: $(OBJECTS)
+	$(LIBTOOL) --mode=link \
+	  $(CC) $(CPPFLAGS) $(CFLAGS) $(XCFLAGS) $(LDFLAGS) -o $@ \
+	  $(OBJECTS) @LIBICONV@ \
+	  -version-info $(LTV_CURRENT):$(LTV_REVISION):$(LTV_AGE) \
+	  -rpath $(libdir) \
+	  -no-undefined
 
-../po/cat-id-tbl.$lo: ../po/cat-id-tbl.c $(top_srcdir)/po/$(PACKAGE).pot
-	cd ../po && $(MAKE) cat-id-tbl.$lo
+libintl.h: libgnuintl.h
+	cp $(srcdir)/libgnuintl.h libintl.h
+
+charset.alias: config.charset
+	$(SHELL) $(srcdir)/config.charset '@host@' > t-$@
+	mv t-$@ $@
 
 check: all
 
@@ -104,36 +135,70 @@ check: all
 # only use the library should use install instead.
 
 # We must not install the libintl.h/libintl.a files if we are on a
-# system which has the gettext() function in its C library or in a
-# separate library or use the catgets interface.  A special case is
-# where configure found a previously installed GNU gettext library.
+# system which has the GNU gettext() function in its C library or in a
+# separate library.
 # If you want to use the one which comes with this version of the
 # package, you have to use `configure --with-included-gettext'.
 install: install-exec install-data
 install-exec: all
 	if test "$(PACKAGE)" = "gettext" \
 	   && test '@INTLOBJS@' = '$(GETTOBJS)'; then \
-	  if test -r $(MKINSTALLDIRS); then \
-	    $(MKINSTALLDIRS) $(libdir) $(includedir); \
+	  $(mkinstalldirs) $(DESTDIR)$(libdir) $(DESTDIR)$(includedir); \
+	  $(INSTALL_DATA) libintl.h $(DESTDIR)$(includedir)/libintl.h; \
+	  $(LIBTOOL) --mode=install \
+	    $(INSTALL_DATA) libintl.$la $(DESTDIR)$(libdir)/libintl.$la; \
+	else \
+	  : ; \
+	fi
+	if test '@USE_INCLUDED_LIBINTL@' = yes; then \
+	  $(mkinstalldirs) $(DESTDIR)$(libdir); \
+	  temp=$(DESTDIR)$(libdir)/t-charset.alias; \
+	  dest=$(DESTDIR)$(libdir)/charset.alias; \
+	  if test -f $(DESTDIR)$(libdir)/charset.alias; then \
+	    orig=$(DESTDIR)$(libdir)/charset.alias; \
+	    sed -f ref-add.sed $$orig > $$temp; \
+	    $(INSTALL_DATA) $$temp $$dest; \
+	    rm -f $$temp; \
 	  else \
-	    $(top_srcdir)/mkinstalldirs $(libdir) $(includedir); \
+	    if test @GLIBC21@ = no; then \
+	      orig=charset.alias; \
+	      sed -f ref-add.sed $$orig > $$temp; \
+	      $(INSTALL_DATA) $$temp $$dest; \
+	      rm -f $$temp; \
+	    fi; \
 	  fi; \
-	  $(INSTALL_DATA) intlh.inst $(includedir)/libintl.h; \
-	  $(INSTALL_DATA) libintl.a $(libdir)/libintl.a; \
+	  $(mkinstalldirs) $(DESTDIR)$(localedir); \
+	  test -f $(DESTDIR)$(localedir)/locale.alias \
+	    && orig=$(DESTDIR)$(localedir)/locale.alias \
+	    || orig=$(srcdir)/locale.alias; \
+	  temp=$(DESTDIR)$(localedir)/t-locale.alias; \
+	  dest=$(DESTDIR)$(localedir)/locale.alias; \
+	  sed -f ref-add.sed $$orig > $$temp; \
+	  $(INSTALL_DATA) $$temp $$dest; \
+	  rm -f $$temp; \
 	else \
 	  : ; \
 	fi
 install-data: all
 	if test "$(PACKAGE)" = "gettext"; then \
-	  if test -r $(MKINSTALLDIRS); then \
-	    $(MKINSTALLDIRS) $(gettextsrcdir); \
-	  else \
-	    $(top_srcdir)/mkinstalldirs $(gettextsrcdir); \
-	  fi; \
-	  $(INSTALL_DATA) VERSION $(gettextsrcdir)/VERSION; \
+	  $(mkinstalldirs) $(DESTDIR)$(gettextsrcdir); \
+	  $(INSTALL_DATA) VERSION $(DESTDIR)$(gettextsrcdir)/VERSION; \
+	  $(INSTALL_DATA) ChangeLog.inst $(DESTDIR)$(gettextsrcdir)/ChangeLog; \
 	  dists="$(DISTFILES.common)"; \
 	  for file in $$dists; do \
-	    $(INSTALL_DATA) $(srcdir)/$$file $(gettextsrcdir)/$$file; \
+	    $(INSTALL_DATA) $(srcdir)/$$file \
+			    $(DESTDIR)$(gettextsrcdir)/$$file; \
+	  done; \
+	  chmod a+x $(DESTDIR)$(gettextsrcdir)/config.charset; \
+	  dists="$(DISTFILES.generated)"; \
+	  for file in $$dists; do \
+	    if test -f $$file; then dir=.; else dir=$(srcdir); fi; \
+	    $(INSTALL_DATA) $$dir/$$file \
+			    $(DESTDIR)$(gettextsrcdir)/$$file; \
+	  done; \
+	  dists="$(DISTFILES.obsolete)"; \
+	  for file in $$dists; do \
+	    rm -f $(DESTDIR)$(gettextsrcdir)/$$file; \
 	  done; \
 	else \
 	  : ; \
@@ -143,14 +208,51 @@ install-data: all
 installcheck:
 
 uninstall:
-	dists="$(DISTFILES.common)"; \
-	for file in $$dists; do \
-	  rm -f $(gettextsrcdir)/$$file; \
-	done
+	if test "$(PACKAGE)" = "gettext" \
+	   && test '@INTLOBJS@' = '$(GETTOBJS)'; then \
+	  rm -f $(DESTDIR)$(includedir)/libintl.h; \
+	  $(LIBTOOL) --mode=uninstall \
+	    rm -f $(DESTDIR)$(libdir)/libintl.$la; \
+	else \
+	  : ; \
+	fi
+	if test '@USE_INCLUDED_LIBINTL@' = yes; then \
+	  if test -f $(DESTDIR)$(libdir)/charset.alias; then \
+	    temp=$(DESTDIR)$(libdir)/t-charset.alias; \
+	    dest=$(DESTDIR)$(libdir)/charset.alias; \
+	    sed -f ref-del.sed $$dest > $$temp; \
+	    if grep '^# Packages using this file: $$' $$temp > /dev/null; then \
+	      rm -f $$dest; \
+	    else \
+	      $(INSTALL_DATA) $$temp $$dest; \
+	    fi; \
+	    rm -f $$temp; \
+	  fi; \
+	  if test -f $(DESTDIR)$(localedir)/locale.alias; then \
+	    temp=$(DESTDIR)$(localedir)/t-locale.alias; \
+	    dest=$(DESTDIR)$(localedir)/locale.alias; \
+	    sed -f ref-del.sed $$dest > $$temp; \
+	    if grep '^# Packages using this file: $$' $$temp > /dev/null; then \
+	      rm -f $$dest; \
+	    else \
+	      $(INSTALL_DATA) $$temp $$dest; \
+	    fi; \
+	    rm -f $$temp; \
+	  fi; \
+	else \
+	  : ; \
+	fi
+	if test "$(PACKAGE)" = "gettext"; then \
+	  for file in VERSION ChangeLog $(DISTFILES.common) $(DISTFILES.generated); do \
+	    rm -f $(DESTDIR)$(gettextsrcdir)/$$file; \
+	  done; \
+	else \
+	  : ; \
+	fi
 
 info dvi:
 
-$(OBJECTS): ../config.h libgettext.h
+$(OBJECTS): ../config.h libgnuintl.h
 bindtextdom.$lo finddomain.$lo loadmsgcat.$lo: gettextP.h gettext.h loadinfo.h
 dcgettext.$lo: gettextP.h gettext.h hash-string.h loadinfo.h
 
@@ -166,12 +268,19 @@ ID: $(HEADERS) $(SOURCES)
 
 
 mostlyclean:
-	rm -f *.a *.o *.lo core core.*
+	rm -f *.a *.la *.o *.lo core core.*
+	rm -f libintl.h charset.alias ref-add.sed ref-del.sed
+	rm -f -r .libs _libs
 
 clean: mostlyclean
 
 distclean: clean
-	rm -f Makefile ID TAGS po2msg.sed po2tbl.sed
+	rm -f Makefile ID TAGS
+	if test "$(PACKAGE)" = gettext; then \
+	  rm -f ChangeLog.inst $(DISTFILES.normal); \
+	else \
+	  : ; \
+	fi
 
 maintainer-clean: distclean
 	@echo "This command is intended for maintainers to use;"
@@ -181,34 +290,23 @@ maintainer-clean: distclean
 # GNU gettext needs not contain the file `VERSION' but contains some
 # other files which should not be distributed in other packages.
 distdir = ../$(PACKAGE)-$(VERSION)/$(subdir)
-dist distdir: Makefile $(DISTFILES)
+dist distdir: Makefile
 	if test "$(PACKAGE)" = gettext; then \
 	  additional="$(DISTFILES.gettext)"; \
 	else \
 	  additional="$(DISTFILES.normal)"; \
 	fi; \
-	for file in $(DISTFILES.common) $$additional; do \
-	  ln $(srcdir)/$$file $(distdir) 2> /dev/null \
-	    || cp -p $(srcdir)/$$file $(distdir); \
+	$(MAKE) $(DISTFILES.common) $(DISTFILES.generated) $$additional; \
+	for file in ChangeLog $(DISTFILES.common) $(DISTFILES.generated) $$additional; do \
+	  if test -f $$file; then dir=.; else dir=$(srcdir); fi; \
+	  ln $$dir/$$file $(distdir) 2> /dev/null \
+	    || cp -p $$dir/$$file $(distdir); \
 	done
 
-dist-libc:
-	tar zcvf intl-glibc.tar.gz $(COMSRCS) $(COMHDRS) libintl.h.glibc
-
 Makefile: Makefile.in ../config.status
 	cd .. \
 	  && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
 
-# The dependency for intlh.inst is different in gettext and all other
-# packages.  Because we cannot you GNU make features we have to solve
-# the problem while rewriting Makefile.in.
-@GT_YES@intlh.inst: intlh.inst.in ../config.status
-@GT_YES@	cd .. \
-@GT_YES@	&& CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= \
-@GT_YES@	  $(SHELL) ./config.status
-@GT_NO@.PHONY: intlh.inst
-@GT_NO@intlh.inst:
-
 # Tell versions [3.59,3.63) of GNU make not to export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT:
diff --git a/intl/VERSION b/intl/VERSION
index ee66b06..268da64 100644
--- a/intl/VERSION
+++ b/intl/VERSION
@@ -1 +1 @@
-GNU gettext library from gettext-0.10.35
+GNU gettext library from gettext-0.10.38
diff --git a/intl/bindtextdom.c b/intl/bindtextdom.c
index d9c3f34..7e5a74a 100644
--- a/intl/bindtextdom.c
+++ b/intl/bindtextdom.c
@@ -1,5 +1,5 @@
 /* Implementation of the bindtextdomain(3) function
-   Copyright (C) 1995, 1996, 1997, 1998 Free Software Foundation, Inc.
+   Copyright (C) 1995-1998, 2000, 2001 Free Software Foundation, Inc.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -19,32 +19,39 @@
 # include <config.h>
 #endif
 
-#if defined STDC_HEADERS || defined _LIBC
-# include <stdlib.h>
-#else
-# ifdef HAVE_MALLOC_H
-#  include <malloc.h>
-# else
-void free ();
-# endif
-#endif
+#include <stddef.h>
+#include <stdlib.h>
+#include <string.h>
 
-#if defined HAVE_STRING_H || defined _LIBC
-# include <string.h>
+#ifdef _LIBC
+# include <libintl.h>
 #else
-# include <strings.h>
-# ifndef memcpy
-#  define memcpy(Dst, Src, Num) bcopy (Src, Dst, Num)
-# endif
+# include "libgnuintl.h"
 #endif
+#include "gettextP.h"
 
 #ifdef _LIBC
-# include <libintl.h>
+/* We have to handle multi-threaded applications.  */
+# include <bits/libc-lock.h>
 #else
-# include "libgettext.h"
+/* Provide dummy implementation if this is outside glibc.  */
+# define __libc_rwlock_define(CLASS, NAME)
+# define __libc_rwlock_wrlock(NAME)
+# define __libc_rwlock_unlock(NAME)
+#endif
+
+/* The internal variables in the standalone libintl.a must have different
+   names than the internal variables in GNU libc, otherwise programs
+   using libintl.a cannot be linked statically.  */
+#if !defined _LIBC
+# define _nl_default_dirname _nl_default_dirname__
+# define _nl_domain_bindings _nl_domain_bindings__
+#endif
+
+/* Some compilers, like SunOS4 cc, don't have offsetof in <stddef.h>.  */
+#ifndef offsetof
+# define offsetof(type,ident) ((size_t)&(((type*)0)->ident))
 #endif
-#include "gettext.h"
-#include "gettextP.h"
 
 /* @@ end of prolog @@ */
 
@@ -54,6 +61,9 @@ extern const char _nl_default_dirname[];
 /* List with bindings of specific domains.  */
 extern struct binding *_nl_domain_bindings;
 
+/* Lock variable to protect the global data in the gettext implementation.  */
+__libc_rwlock_define (extern, _nl_state_lock)
+
 
 /* Names for the libintl functions are a problem.  They must not clash
    with existing names and they should follow ANSI C.  But this source
@@ -61,25 +71,48 @@ extern struct binding *_nl_domain_bindings;
    prefix.  So we have to make a difference here.  */
 #ifdef _LIBC
 # define BINDTEXTDOMAIN __bindtextdomain
+# define BIND_TEXTDOMAIN_CODESET __bind_textdomain_codeset
 # ifndef strdup
 #  define strdup(str) __strdup (str)
 # endif
 #else
 # define BINDTEXTDOMAIN bindtextdomain__
+# define BIND_TEXTDOMAIN_CODESET bind_textdomain_codeset__
 #endif
 
-/* Specify that the DOMAINNAME message catalog will be found
-   in DIRNAME rather than in the system locale data base.  */
-char *
-BINDTEXTDOMAIN (domainname, dirname)
+/* Prototypes for local functions.  */
+static void set_binding_values PARAMS ((const char *domainname,
+					const char **dirnamep,
+					const char **codesetp));
+     
+/* Specifies the directory name *DIRNAMEP and the output codeset *CODESETP
+   to be used for the DOMAINNAME message catalog.
+   If *DIRNAMEP or *CODESETP is NULL, the corresponding attribute is not
+   modified, only the current value is returned.
+   If DIRNAMEP or CODESETP is NULL, the corresponding attribute is neither
+   modified nor returned.  */
+static void
+set_binding_values (domainname, dirnamep, codesetp)
      const char *domainname;
-     const char *dirname;
+     const char **dirnamep;
+     const char **codesetp;
 {
   struct binding *binding;
+  int modified;
 
   /* Some sanity checks.  */
   if (domainname == NULL || domainname[0] == '\0')
-    return NULL;
+    {
+      if (dirnamep)
+	*dirnamep = NULL;
+      if (codesetp)
+	*codesetp = NULL;
+      return;
+    }
+
+  __libc_rwlock_wrlock (_nl_state_lock);
+
+  modified = 0;
 
   for (binding = _nl_domain_bindings; binding != NULL; binding = binding->next)
     {
@@ -95,83 +128,173 @@ BINDTEXTDOMAIN (domainname, dirname)
 	}
     }
 
-  if (dirname == NULL)
-    /* The current binding has be to returned.  */
-    return binding == NULL ? (char *) _nl_default_dirname : binding->dirname;
-
   if (binding != NULL)
     {
-      /* The domain is already bound.  If the new value and the old
-	 one are equal we simply do nothing.  Otherwise replace the
-	 old binding.  */
-      if (strcmp (dirname, binding->dirname) != 0)
+      if (dirnamep)
 	{
-	  char *new_dirname;
+	  const char *dirname = *dirnamep;
 
-	  if (strcmp (dirname, _nl_default_dirname) == 0)
-	    new_dirname = (char *) _nl_default_dirname;
+	  if (dirname == NULL)
+	    /* The current binding has be to returned.  */
+	    *dirnamep = binding->dirname;
 	  else
 	    {
+	      /* The domain is already bound.  If the new value and the old
+		 one are equal we simply do nothing.  Otherwise replace the
+		 old binding.  */
+	      char *result = binding->dirname;
+	      if (strcmp (dirname, result) != 0)
+		{
+		  if (strcmp (dirname, _nl_default_dirname) == 0)
+		    result = (char *) _nl_default_dirname;
+		  else
+		    {
 #if defined _LIBC || defined HAVE_STRDUP
-	      new_dirname = strdup (dirname);
-	      if (new_dirname == NULL)
-		return NULL;
+		      result = strdup (dirname);
 #else
-	      size_t len = strlen (dirname) + 1;
-	      new_dirname = (char *) malloc (len);
-	      if (new_dirname == NULL)
-		return NULL;
-
-	      memcpy (new_dirname, dirname, len);
+		      size_t len = strlen (dirname) + 1;
+		      result = (char *) malloc (len);
+		      if (__builtin_expect (result != NULL, 1))
+			memcpy (result, dirname, len);
 #endif
+		    }
+
+		  if (__builtin_expect (result != NULL, 1))
+		    {
+		      if (binding->dirname != _nl_default_dirname)
+			free (binding->dirname);
+
+		      binding->dirname = result;
+		      modified = 1;
+		    }
+		}
+	      *dirnamep = result;
 	    }
+	}
 
-	  if (binding->dirname != _nl_default_dirname)
-	    free (binding->dirname);
+      if (codesetp)
+	{
+	  const char *codeset = *codesetp;
 
-	  binding->dirname = new_dirname;
+	  if (codeset == NULL)
+	    /* The current binding has be to returned.  */
+	    *codesetp = binding->codeset;
+	  else
+	    {
+	      /* The domain is already bound.  If the new value and the old
+		 one are equal we simply do nothing.  Otherwise replace the
+		 old binding.  */
+	      char *result = binding->codeset;
+	      if (result == NULL || strcmp (codeset, result) != 0)
+		{
+#if defined _LIBC || defined HAVE_STRDUP
+		  result = strdup (codeset);
+#else
+		  size_t len = strlen (codeset) + 1;
+		  result = (char *) malloc (len);
+		  if (__builtin_expect (result != NULL, 1))
+		    memcpy (result, codeset, len);
+#endif
+
+		  if (__builtin_expect (result != NULL, 1))
+		    {
+		      if (binding->codeset != NULL)
+			free (binding->codeset);
+
+		      binding->codeset = result;
+		      binding->codeset_cntr++;
+		      modified = 1;
+		    }
+		}
+	      *codesetp = result;
+	    }
 	}
     }
+  else if ((dirnamep == NULL || *dirnamep == NULL)
+	   && (codesetp == NULL || *codesetp == NULL))
+    {
+      /* Simply return the default values.  */
+      if (dirnamep)
+	*dirnamep = _nl_default_dirname;
+      if (codesetp)
+	*codesetp = NULL;
+    }
   else
     {
       /* We have to create a new binding.  */
-#if !defined _LIBC && !defined HAVE_STRDUP
-      size_t len;
-#endif
+      size_t len = strlen (domainname) + 1;
       struct binding *new_binding =
-	(struct binding *) malloc (sizeof (*new_binding));
+	(struct binding *) malloc (offsetof (struct binding, domainname) + len);
+
+      if (__builtin_expect (new_binding == NULL, 0))
+	goto failed;
 
-      if (new_binding == NULL)
-	return NULL;
+      memcpy (new_binding->domainname, domainname, len);
+
+      if (dirnamep)
+	{
+	  const char *dirname = *dirnamep;
 
+	  if (dirname == NULL)
+	    /* The default value.  */
+	    dirname = _nl_default_dirname;
+	  else
+	    {
+	      if (strcmp (dirname, _nl_default_dirname) == 0)
+		dirname = _nl_default_dirname;
+	      else
+		{
+		  char *result;
 #if defined _LIBC || defined HAVE_STRDUP
-      new_binding->domainname = strdup (domainname);
-      if (new_binding->domainname == NULL)
-	return NULL;
+		  result = strdup (dirname);
+		  if (__builtin_expect (result == NULL, 0))
+		    goto failed_dirname;
 #else
-      len = strlen (domainname) + 1;
-      new_binding->domainname = (char *) malloc (len);
-      if (new_binding->domainname == NULL)
-	return NULL;
-      memcpy (new_binding->domainname, domainname, len);
+		  size_t len = strlen (dirname) + 1;
+		  result = (char *) malloc (len);
+		  if (__builtin_expect (result == NULL, 0))
+		    goto failed_dirname;
+		  memcpy (result, dirname, len);
 #endif
-
-      if (strcmp (dirname, _nl_default_dirname) == 0)
-	new_binding->dirname = (char *) _nl_default_dirname;
+		  dirname = result;
+		}
+	    }
+	  *dirnamep = dirname;
+	  new_binding->dirname = (char *) dirname;
+	}
       else
+	/* The default value.  */
+	new_binding->dirname = (char *) _nl_default_dirname;
+
+      new_binding->codeset_cntr = 0;
+
+      if (codesetp)
 	{
+	  const char *codeset = *codesetp;
+
+	  if (codeset != NULL)
+	    {
+	      char *result;
+
 #if defined _LIBC || defined HAVE_STRDUP
-	  new_binding->dirname = strdup (dirname);
-	  if (new_binding->dirname == NULL)
-	    return NULL;
+	      result = strdup (codeset);
+	      if (__builtin_expect (result == NULL, 0))
+		goto failed_codeset;
 #else
-	  len = strlen (dirname) + 1;
-	  new_binding->dirname = (char *) malloc (len);
-	  if (new_binding->dirname == NULL)
-	    return NULL;
-	  memcpy (new_binding->dirname, dirname, len);
+	      size_t len = strlen (codeset) + 1;
+	      result = (char *) malloc (len);
+	      if (__builtin_expect (result == NULL, 0))
+		goto failed_codeset;
+	      memcpy (result, codeset, len);
 #endif
+	      codeset = result;
+	      new_binding->codeset_cntr++;
+	    }
+	  *codesetp = codeset;
+	  new_binding->codeset = (char *) codeset;
 	}
+      else
+	new_binding->codeset = NULL;
 
       /* Now enqueue it.  */
       if (_nl_domain_bindings == NULL
@@ -191,13 +314,55 @@ BINDTEXTDOMAIN (domainname, dirname)
 	  binding->next = new_binding;
 	}
 
-      binding = new_binding;
+      modified = 1;
+
+      /* Here we deal with memory allocation failures.  */
+      if (0)
+	{
+	failed_codeset:
+	  if (new_binding->dirname != _nl_default_dirname)
+	    free (new_binding->dirname);
+	failed_dirname:
+	  free (new_binding);
+	failed:
+	  if (dirnamep)
+	    *dirnamep = NULL;
+	  if (codesetp)
+	    *codesetp = NULL;
+	}
     }
 
-  return binding->dirname;
+  /* If we modified any binding, we flush the caches.  */
+  if (modified)
+    ++_nl_msg_cat_cntr;
+
+  __libc_rwlock_unlock (_nl_state_lock);
+}
+
+/* Specify that the DOMAINNAME message catalog will be found
+   in DIRNAME rather than in the system locale data base.  */
+char *
+BINDTEXTDOMAIN (domainname, dirname)
+     const char *domainname;
+     const char *dirname;
+{
+  set_binding_values (domainname, &dirname, NULL);
+  return (char *) dirname;
+}
+
+/* Specify the character encoding in which the messages from the
+   DOMAINNAME message catalog will be returned.  */
+char *
+BIND_TEXTDOMAIN_CODESET (domainname, codeset)
+     const char *domainname;
+     const char *codeset;
+{
+  set_binding_values (domainname, NULL, &codeset);
+  return (char *) codeset;
 }
 
 #ifdef _LIBC
-/* Alias for function name in GNU C Library.  */
+/* Aliases for function names in GNU C Library.  */
 weak_alias (__bindtextdomain, bindtextdomain);
+weak_alias (__bind_textdomain_codeset, bind_textdomain_codeset);
 #endif
diff --git a/intl/cat-compat.c b/intl/cat-compat.c
deleted file mode 100644
index 867d901..0000000
--- a/intl/cat-compat.c
+++ /dev/null
@@ -1,262 +0,0 @@
-/* Compatibility code for gettext-using-catgets interface.
-   Copyright (C) 1995, 1997 Free Software Foundation, Inc.
-
-   This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2, or (at your option)
-   any later version.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software Foundation,
-   Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
-
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
-
-#include <stdio.h>
-
-#ifdef STDC_HEADERS
-# include <stdlib.h>
-# include <string.h>
-#else
-char *getenv ();
-# ifdef HAVE_MALLOC_H
-#  include <malloc.h>
-# endif
-#endif
-
-#ifdef HAVE_NL_TYPES_H
-# include <nl_types.h>
-#endif
-
-#include "libgettext.h"
-
-/* @@ end of prolog @@ */
-
-/* XPG3 defines the result of `setlocale (category, NULL)' as:
-   ``Directs `setlocale()' to query `category' and return the current
-     setting of `local'.''
-   However it does not specify the exact format.  And even worse: POSIX
-   defines this not at all.  So we can use this feature only on selected
-   system (e.g. those using GNU C Library).  */
-#ifdef _LIBC
-# define HAVE_LOCALE_NULL
-#endif
-
-/* The catalog descriptor.  */
-static nl_catd catalog = (nl_catd) -1;
-
-/* Name of the default catalog.  */
-static const char default_catalog_name[] = "messages";
-
-/* Name of currently used catalog.  */
-static const char *catalog_name = default_catalog_name;
-
-/* Get ID for given string.  If not found return -1.  */
-static int msg_to_cat_id PARAMS ((const char *msg));
-
-/* Substitution for systems lacking this function in their C library.  */
-#if !_LIBC && !HAVE_STPCPY
-static char *stpcpy PARAMS ((char *dest, const char *src));
-#endif
-
-
-/* Set currently used domain/catalog.  */
-char *
-textdomain (domainname)
-     const char *domainname;
-{
-  nl_catd new_catalog;
-  char *new_name;
-  size_t new_name_len;
-  char *lang;
-
-#if defined HAVE_SETLOCALE && defined HAVE_LC_MESSAGES \
-    && defined HAVE_LOCALE_NULL
-  lang = setlocale (LC_MESSAGES, NULL);
-#else
-  lang = getenv ("LC_ALL");
-  if (lang == NULL || lang[0] == '\0')
-    {
-      lang = getenv ("LC_MESSAGES");
-      if (lang == NULL || lang[0] == '\0')
-	lang = getenv ("LANG");
-    }
-#endif
-  if (lang == NULL || lang[0] == '\0')
-    lang = "C";
-
-  /* See whether name of currently used domain is asked.  */
-  if (domainname == NULL)
-    return (char *) catalog_name;
-
-  if (domainname[0] == '\0')
-    domainname = default_catalog_name;
-
-  /* Compute length of added path element.  */
-  new_name_len = sizeof (LOCALEDIR) - 1 + 1 + strlen (lang)
-		 + sizeof ("/LC_MESSAGES/") - 1 + sizeof (PACKAGE) - 1
-		 + sizeof (".cat");
-
-  new_name = (char *) malloc (new_name_len);
-  if (new_name == NULL)
-    return NULL;
-
-  strcpy (new_name, PACKAGE);
-  new_catalog = catopen (new_name, 0);
-
-  if (new_catalog == (nl_catd) -1)
-    {
-      /* NLSPATH search didn't work, try absolute path */
-      sprintf (new_name, "%s/%s/LC_MESSAGES/%s.cat", LOCALEDIR, lang,
-	       PACKAGE);
-      new_catalog = catopen (new_name, 0);
-
-      if (new_catalog == (nl_catd) -1)
-	{
-	  free (new_name);
-	  return (char *) catalog_name;
-	}
-    }
-
-  /* Close old catalog.  */
-  if (catalog != (nl_catd) -1)
-    catclose (catalog);
-  if (catalog_name != default_catalog_name)
-    free ((char *) catalog_name);
-
-  catalog = new_catalog;
-  catalog_name = new_name;
-
-  return (char *) catalog_name;
-}
-
-char *
-bindtextdomain (domainname, dirname)
-     const char *domainname;
-     const char *dirname;
-{
-#if HAVE_SETENV || HAVE_PUTENV
-  char *old_val, *new_val, *cp;
-  size_t new_val_len;
-
-  /* This does not make much sense here but to be compatible do it.  */
-  if (domainname == NULL)
-    return NULL;
-
-  /* Compute length of added path element.  If we use setenv we don't need
-     the first byts for NLSPATH=, but why complicate the code for this
-     peanuts.  */
-  new_val_len = sizeof ("NLSPATH=") - 1 + strlen (dirname)
-		+ sizeof ("/%L/LC_MESSAGES/%N.cat");
-
-  old_val = getenv ("NLSPATH");
-  if (old_val == NULL || old_val[0] == '\0')
-    {
-      old_val = NULL;
-      new_val_len += 1 + sizeof (LOCALEDIR) - 1
-	             + sizeof ("/%L/LC_MESSAGES/%N.cat");
-    }
-  else
-    new_val_len += strlen (old_val);
-
-  new_val = (char *) malloc (new_val_len);
-  if (new_val == NULL)
-    return NULL;
-
-# if HAVE_SETENV
-  cp = new_val;
-# else
-  cp = stpcpy (new_val, "NLSPATH=");
-# endif
-
-  cp = stpcpy (cp, dirname);
-  cp = stpcpy (cp, "/%L/LC_MESSAGES/%N.cat:");
-
-  if (old_val == NULL)
-    {
-# if __STDC__
-      stpcpy (cp, LOCALEDIR "/%L/LC_MESSAGES/%N.cat");
-# else
-
-      cp = stpcpy (cp, LOCALEDIR);
-      stpcpy (cp, "/%L/LC_MESSAGES/%N.cat");
-# endif
-    }
-  else
-    stpcpy (cp, old_val);
-
-# if HAVE_SETENV
-  setenv ("NLSPATH", new_val, 1);
-  free (new_val);
-# else
-  putenv (new_val);
-  /* Do *not* free the environment entry we just entered.  It is used
-     from now on.   */
-# endif
-
-#endif
-
-  return (char *) domainname;
-}
-
-#undef gettext
-char *
-gettext (msg)
-     const char *msg;
-{
-  int msgid;
-
-  if (msg == NULL || catalog == (nl_catd) -1)
-    return (char *) msg;
-
-  /* Get the message from the catalog.  We always use set number 1.
-     The message ID is computed by the function `msg_to_cat_id'
-     which works on the table generated by `po-to-tbl'.  */
-  msgid = msg_to_cat_id (msg);
-  if (msgid == -1)
-    return (char *) msg;
-
-  return catgets (catalog, 1, msgid, (char *) msg);
-}
-
-/* Look through the table `_msg_tbl' which has `_msg_tbl_length' entries
-   for the one equal to msg.  If it is found return the ID.  In case when
-   the string is not found return -1.  */
-static int
-msg_to_cat_id (msg)
-     const char *msg;
-{
-  int cnt;
-
-  for (cnt = 0; cnt < _msg_tbl_length; ++cnt)
-    if (strcmp (msg, _msg_tbl[cnt]._msg) == 0)
-      return _msg_tbl[cnt]._msg_number;
-
-  return -1;
-}
-
-
-/* @@ begin of epilog @@ */
-
-/* We don't want libintl.a to depend on any other library.  So we
-   avoid the non-standard function stpcpy.  In GNU C Library this
-   function is available, though.  Also allow the symbol HAVE_STPCPY
-   to be defined.  */
-#if !_LIBC && !HAVE_STPCPY
-static char *
-stpcpy (dest, src)
-     char *dest;
-     const char *src;
-{
-  while ((*dest++ = *src++) != '\0')
-    /* Do nothing. */ ;
-  return dest - 1;
-}
-#endif
diff --git a/intl/dcgettext.c b/intl/dcgettext.c
index c4c7a2c..469e78d 100644
--- a/intl/dcgettext.c
+++ b/intl/dcgettext.c
@@ -1,5 +1,5 @@
 /* Implementation of the dcgettext(3) function.
-   Copyright (C) 1995, 1996, 1997, 1998 Free Software Foundation, Inc.
+   Copyright (C) 1995-1999, 2000, 2001 Free Software Foundation, Inc.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -19,202 +19,25 @@
 # include <config.h>
 #endif
 
-#include <sys/types.h>
-
-#ifdef __GNUC__
-# define alloca __builtin_alloca
-# define HAVE_ALLOCA 1
-#else
-# if defined HAVE_ALLOCA_H || defined _LIBC
-#  include <alloca.h>
-# else
-#  ifdef _AIX
- #pragma alloca
-#  else
-#   ifndef alloca
-char *alloca ();
-#   endif
-#  endif
-# endif
-#endif
-
-#include <errno.h>
-#ifndef errno
-extern int errno;
-#endif
-#ifndef __set_errno
-# define __set_errno(val) errno = (val)
-#endif
-
-#if defined STDC_HEADERS || defined _LIBC
-# include <stdlib.h>
-#else
-char *getenv ();
-# ifdef HAVE_MALLOC_H
-#  include <malloc.h>
-# else
-void free ();
-# endif
-#endif
-
-#if defined HAVE_STRING_H || defined _LIBC
-# ifndef _GNU_SOURCE
-#  define _GNU_SOURCE	1
-# endif
-# include <string.h>
-#else
-# include <strings.h>
-#endif
-#if !HAVE_STRCHR && !defined _LIBC
-# ifndef strchr
-#  define strchr index
-# endif
-#endif
-
-#if defined HAVE_UNISTD_H || defined _LIBC
-# include <unistd.h>
-#endif
-
-#include "gettext.h"
 #include "gettextP.h"
 #ifdef _LIBC
 # include <libintl.h>
 #else
-# include "libgettext.h"
+# include "libgnuintl.h"
 #endif
-#include "hash-string.h"
 
 /* @@ end of prolog @@ */
 
-#ifdef _LIBC
-/* Rename the non ANSI C functions.  This is required by the standard
-   because some ANSI C functions will require linking with this object
-   file and the name space must not be polluted.  */
-# define getcwd __getcwd
-# ifndef stpcpy
-#  define stpcpy __stpcpy
-# endif
-#else
-# if !defined HAVE_GETCWD
-char *getwd ();
-#  define getcwd(buf, max) getwd (buf)
-# else
-char *getcwd ();
-# endif
-# ifndef HAVE_STPCPY
-static char *stpcpy PARAMS ((char *dest, const char *src));
-# endif
-#endif
-
-/* Amount to increase buffer size by in each try.  */
-#define PATH_INCR 32
-
-/* The following is from pathmax.h.  */
-/* Non-POSIX BSD systems might have gcc's limits.h, which doesn't define
-   PATH_MAX but might cause redefinition warnings when sys/param.h is
-   later included (as on MORE/BSD 4.3).  */
-#if defined(_POSIX_VERSION) || (defined(HAVE_LIMITS_H) && !defined(__GNUC__))
-# include <limits.h>
-#endif
-
-#ifndef _POSIX_PATH_MAX
-# define _POSIX_PATH_MAX 255
-#endif
-
-#if !defined(PATH_MAX) && defined(_PC_PATH_MAX)
-# define PATH_MAX (pathconf ("/", _PC_PATH_MAX) < 1 ? 1024 : pathconf ("/", _PC_PATH_MAX))
-#endif
-
-/* Don't include sys/param.h if it already has been.  */
-#if defined(HAVE_SYS_PARAM_H) && !defined(PATH_MAX) && !defined(MAXPATHLEN)
-# include <sys/param.h>
-#endif
-
-#if !defined(PATH_MAX) && defined(MAXPATHLEN)
-# define PATH_MAX MAXPATHLEN
-#endif
-
-#ifndef PATH_MAX
-# define PATH_MAX _POSIX_PATH_MAX
-#endif
-
-/* XPG3 defines the result of `setlocale (category, NULL)' as:
-   ``Directs `setlocale()' to query `category' and return the current
-     setting of `local'.''
-   However it does not specify the exact format.  And even worse: POSIX
-   defines this not at all.  So we can use this feature only on selected
-   system (e.g. those using GNU C Library).  */
-#ifdef _LIBC
-# define HAVE_LOCALE_NULL
-#endif
-
-/* Name of the default domain used for gettext(3) prior any call to
-   textdomain(3).  The default value for this is "messages".  */
-const char _nl_default_default_domain[] = "messages";
-
-/* Value used as the default domain for gettext(3).  */
-const char *_nl_current_default_domain = _nl_default_default_domain;
-
-/* Contains the default location of the message catalogs.  */
-const char _nl_default_dirname[] = GNULOCALEDIR;
-
-/* List with bindings of specific domains created by bindtextdomain()
-   calls.  */
-struct binding *_nl_domain_bindings;
-
-/* Prototypes for local functions.  */
-static char *find_msg PARAMS ((struct loaded_l10nfile *domain_file,
-			       const char *msgid)) internal_function;
-static const char *category_to_name PARAMS ((int category)) internal_function;
-static const char *guess_category_value PARAMS ((int category,
-						 const char *categoryname))
-     internal_function;
-
-
-/* For those loosing systems which don't have `alloca' we have to add
-   some additional code emulating it.  */
-#ifdef HAVE_ALLOCA
-/* Nothing has to be done.  */
-# define ADD_BLOCK(list, address) /* nothing */
-# define FREE_BLOCKS(list) /* nothing */
-#else
-struct block_list
-{
-  void *address;
-  struct block_list *next;
-};
-# define ADD_BLOCK(list, addr)						      \
-  do {									      \
-    struct block_list *newp = (struct block_list *) malloc (sizeof (*newp));  \
-    /* If we cannot get a free block we cannot add the new element to	      \
-       the list.  */							      \
-    if (newp != NULL) {							      \
-      newp->address = (addr);						      \
-      newp->next = (list);						      \
-      (list) = newp;							      \
-    }									      \
-  } while (0)
-# define FREE_BLOCKS(list)						      \
-  do {									      \
-    while (list != NULL) {						      \
-      struct block_list *old = list;					      \
-      list = list->next;						      \
-      free (old);							      \
-    }									      \
-  } while (0)
-# undef alloca
-# define alloca(size) (malloc (size))
-#endif	/* have alloca */
-
-
 /* Names for the libintl functions are a problem.  They must not clash
    with existing names and they should follow ANSI C.  But this source
    code is also used in GNU C Library where the names have a __
    prefix.  So we have to make a difference here.  */
 #ifdef _LIBC
 # define DCGETTEXT __dcgettext
+# define DCIGETTEXT __dcigettext
 #else
 # define DCGETTEXT dcgettext__
+# define DCIGETTEXT dcigettext__
 #endif
 
 /* Look up MSGID in the DOMAINNAME message catalog for the current CATEGORY
@@ -225,400 +48,10 @@ DCGETTEXT (domainname, msgid, category)
      const char *msgid;
      int category;
 {
-#ifndef HAVE_ALLOCA
-  struct block_list *block_list = NULL;
-#endif
-  struct loaded_l10nfile *domain;
-  struct binding *binding;
-  const char *categoryname;
-  const char *categoryvalue;
-  char *dirname, *xdomainname;
-  char *single_locale;
-  char *retval;
-  int saved_errno = errno;
-
-  /* If no real MSGID is given return NULL.  */
-  if (msgid == NULL)
-    return NULL;
-
-  /* If DOMAINNAME is NULL, we are interested in the default domain.  If
-     CATEGORY is not LC_MESSAGES this might not make much sense but the
-     defintion left this undefined.  */
-  if (domainname == NULL)
-    domainname = _nl_current_default_domain;
-
-  /* First find matching binding.  */
-  for (binding = _nl_domain_bindings; binding != NULL; binding = binding->next)
-    {
-      int compare = strcmp (domainname, binding->domainname);
-      if (compare == 0)
-	/* We found it!  */
-	break;
-      if (compare < 0)
-	{
-	  /* It is not in the list.  */
-	  binding = NULL;
-	  break;
-	}
-    }
-
-  if (binding == NULL)
-    dirname = (char *) _nl_default_dirname;
-  else if (binding->dirname[0] == '/')
-    dirname = binding->dirname;
-  else
-    {
-      /* We have a relative path.  Make it absolute now.  */
-      size_t dirname_len = strlen (binding->dirname) + 1;
-      size_t path_max;
-      char *ret;
-
-      path_max = (unsigned) PATH_MAX;
-      path_max += 2;		/* The getcwd docs say to do this.  */
-
-      dirname = (char *) alloca (path_max + dirname_len);
-      ADD_BLOCK (block_list, dirname);
-
-      __set_errno (0);
-      while ((ret = getcwd (dirname, path_max)) == NULL && errno == ERANGE)
-	{
-	  path_max += PATH_INCR;
-	  dirname = (char *) alloca (path_max + dirname_len);
-	  ADD_BLOCK (block_list, dirname);
-	  __set_errno (0);
-	}
-
-      if (ret == NULL)
-	{
-	  /* We cannot get the current working directory.  Don't signal an
-	     error but simply return the default string.  */
-	  FREE_BLOCKS (block_list);
-	  __set_errno (saved_errno);
-	  return (char *) msgid;
-	}
-
-      stpcpy (stpcpy (strchr (dirname, '\0'), "/"), binding->dirname);
-    }
-
-  /* Now determine the symbolic name of CATEGORY and its value.  */
-  categoryname = category_to_name (category);
-  categoryvalue = guess_category_value (category, categoryname);
-
-  xdomainname = (char *) alloca (strlen (categoryname)
-				 + strlen (domainname) + 5);
-  ADD_BLOCK (block_list, xdomainname);
-
-  stpcpy (stpcpy (stpcpy (stpcpy (xdomainname, categoryname), "/"),
-		  domainname),
-	  ".mo");
-
-  /* Creating working area.  */
-  single_locale = (char *) alloca (strlen (categoryvalue) + 1);
-  ADD_BLOCK (block_list, single_locale);
-
-
-  /* Search for the given string.  This is a loop because we perhaps
-     got an ordered list of languages to consider for th translation.  */
-  while (1)
-    {
-      /* Make CATEGORYVALUE point to the next element of the list.  */
-      while (categoryvalue[0] != '\0' && categoryvalue[0] == ':')
-	++categoryvalue;
-      if (categoryvalue[0] == '\0')
-	{
-	  /* The whole contents of CATEGORYVALUE has been searched but
-	     no valid entry has been found.  We solve this situation
-	     by implicitly appending a "C" entry, i.e. no translation
-	     will take place.  */
-	  single_locale[0] = 'C';
-	  single_locale[1] = '\0';
-	}
-      else
-	{
-	  char *cp = single_locale;
-	  while (categoryvalue[0] != '\0' && categoryvalue[0] != ':')
-	    *cp++ = *categoryvalue++;
-	  *cp = '\0';
-	}
-
-      /* If the current locale value is C (or POSIX) we don't load a
-	 domain.  Return the MSGID.  */
-      if (strcmp (single_locale, "C") == 0
-	  || strcmp (single_locale, "POSIX") == 0)
-	{
-	  FREE_BLOCKS (block_list);
-	  __set_errno (saved_errno);
-	  return (char *) msgid;
-	}
-
-
-      /* Find structure describing the message catalog matching the
-	 DOMAINNAME and CATEGORY.  */
-      domain = _nl_find_domain (dirname, single_locale, xdomainname);
-
-      if (domain != NULL)
-	{
-	  retval = find_msg (domain, msgid);
-
-	  if (retval == NULL)
-	    {
-	      int cnt;
-
-	      for (cnt = 0; domain->successor[cnt] != NULL; ++cnt)
-		{
-		  retval = find_msg (domain->successor[cnt], msgid);
-
-		  if (retval != NULL)
-		    break;
-		}
-	    }
-
-	  if (retval != NULL)
-	    {
-	      FREE_BLOCKS (block_list);
-	      __set_errno (saved_errno);
-	      return retval;
-	    }
-	}
-    }
-  /* NOTREACHED */
+  return DCIGETTEXT (domainname, msgid, NULL, 0, 0, category);
 }
 
 #ifdef _LIBC
 /* Alias for function name in GNU C Library.  */
 weak_alias (__dcgettext, dcgettext);
 #endif
-
-
-static char *
-internal_function
-find_msg (domain_file, msgid)
-     struct loaded_l10nfile *domain_file;
-     const char *msgid;
-{
-  size_t top, act, bottom;
-  struct loaded_domain *domain;
-
-  if (domain_file->decided == 0)
-    _nl_load_domain (domain_file);
-
-  if (domain_file->data == NULL)
-    return NULL;
-
-  domain = (struct loaded_domain *) domain_file->data;
-
-  /* Locate the MSGID and its translation.  */
-  if (domain->hash_size > 2 && domain->hash_tab != NULL)
-    {
-      /* Use the hashing table.  */
-      nls_uint32 len = strlen (msgid);
-      nls_uint32 hash_val = hash_string (msgid);
-      nls_uint32 idx = hash_val % domain->hash_size;
-      nls_uint32 incr = 1 + (hash_val % (domain->hash_size - 2));
-      nls_uint32 nstr = W (domain->must_swap, domain->hash_tab[idx]);
-
-      if (nstr == 0)
-	/* Hash table entry is empty.  */
-	return NULL;
-
-      if (W (domain->must_swap, domain->orig_tab[nstr - 1].length) == len
-	  && strcmp (msgid,
-		     domain->data + W (domain->must_swap,
-				       domain->orig_tab[nstr - 1].offset)) == 0)
-	return (char *) domain->data + W (domain->must_swap,
-					  domain->trans_tab[nstr - 1].offset);
-
-      while (1)
-	{
-	  if (idx >= domain->hash_size - incr)
-	    idx -= domain->hash_size - incr;
-	  else
-	    idx += incr;
-
-	  nstr = W (domain->must_swap, domain->hash_tab[idx]);
-	  if (nstr == 0)
-	    /* Hash table entry is empty.  */
-	    return NULL;
-
-	  if (W (domain->must_swap, domain->orig_tab[nstr - 1].length) == len
-	      && strcmp (msgid,
-			 domain->data + W (domain->must_swap,
-					   domain->orig_tab[nstr - 1].offset))
-	         == 0)
-	    return (char *) domain->data
-	      + W (domain->must_swap, domain->trans_tab[nstr - 1].offset);
-	}
-      /* NOTREACHED */
-    }
-
-  /* Now we try the default method:  binary search in the sorted
-     array of messages.  */
-  bottom = 0;
-  top = domain->nstrings;
-  while (bottom < top)
-    {
-      int cmp_val;
-
-      act = (bottom + top) / 2;
-      cmp_val = strcmp (msgid, domain->data
-			       + W (domain->must_swap,
-				    domain->orig_tab[act].offset));
-      if (cmp_val < 0)
-	top = act;
-      else if (cmp_val > 0)
-	bottom = act + 1;
-      else
-	break;
-    }
-
-  /* If an translation is found return this.  */
-  return bottom >= top ? NULL : (char *) domain->data
-                                + W (domain->must_swap,
-				     domain->trans_tab[act].offset);
-}
-
-
-/* Return string representation of locale CATEGORY.  */
-static const char *
-internal_function
-category_to_name (category)
-     int category;
-{
-  const char *retval;
-
-  switch (category)
-  {
-#ifdef LC_COLLATE
-  case LC_COLLATE:
-    retval = "LC_COLLATE";
-    break;
-#endif
-#ifdef LC_CTYPE
-  case LC_CTYPE:
-    retval = "LC_CTYPE";
-    break;
-#endif
-#ifdef LC_MONETARY
-  case LC_MONETARY:
-    retval = "LC_MONETARY";
-    break;
-#endif
-#ifdef LC_NUMERIC
-  case LC_NUMERIC:
-    retval = "LC_NUMERIC";
-    break;
-#endif
-#ifdef LC_TIME
-  case LC_TIME:
-    retval = "LC_TIME";
-    break;
-#endif
-#ifdef LC_MESSAGES
-  case LC_MESSAGES:
-    retval = "LC_MESSAGES";
-    break;
-#endif
-#ifdef LC_RESPONSE
-  case LC_RESPONSE:
-    retval = "LC_RESPONSE";
-    break;
-#endif
-#ifdef LC_ALL
-  case LC_ALL:
-    /* This might not make sense but is perhaps better than any other
-       value.  */
-    retval = "LC_ALL";
-    break;
-#endif
-  default:
-    /* If you have a better idea for a default value let me know.  */
-    retval = "LC_XXX";
-  }
-
-  return retval;
-}
-
-/* Guess value of current locale from value of the environment variables.  */
-static const char *
-internal_function
-guess_category_value (category, categoryname)
-     int category;
-     const char *categoryname;
-{
-  const char *retval;
-
-  /* The highest priority value is the `LANGUAGE' environment
-     variable.  This is a GNU extension.  */
-  retval = getenv ("LANGUAGE");
-  if (retval != NULL && retval[0] != '\0')
-    return retval;
-
-  /* `LANGUAGE' is not set.  So we have to proceed with the POSIX
-     methods of looking to `LC_ALL', `LC_xxx', and `LANG'.  On some
-     systems this can be done by the `setlocale' function itself.  */
-#if defined HAVE_SETLOCALE && defined HAVE_LC_MESSAGES && defined HAVE_LOCALE_NULL
-  return setlocale (category, NULL);
-#else
-  /* Setting of LC_ALL overwrites all other.  */
-  retval = getenv ("LC_ALL");
-  if (retval != NULL && retval[0] != '\0')
-    return retval;
-
-  /* Next comes the name of the desired category.  */
-  retval = getenv (categoryname);
-  if (retval != NULL && retval[0] != '\0')
-    return retval;
-
-  /* Last possibility is the LANG environment variable.  */
-  retval = getenv ("LANG");
-  if (retval != NULL && retval[0] != '\0')
-    return retval;
-
-  /* We use C as the default domain.  POSIX says this is implementation
-     defined.  */
-  return "C";
-#endif
-}
-
-/* @@ begin of epilog @@ */
-
-/* We don't want libintl.a to depend on any other library.  So we
-   avoid the non-standard function stpcpy.  In GNU C Library this
-   function is available, though.  Also allow the symbol HAVE_STPCPY
-   to be defined.  */
-#if !_LIBC && !HAVE_STPCPY
-static char *
-stpcpy (dest, src)
-     char *dest;
-     const char *src;
-{
-  while ((*dest++ = *src++) != '\0')
-    /* Do nothing. */ ;
-  return dest - 1;
-}
-#endif
-
-
-#ifdef _LIBC
-/* If we want to free all resources we have to do some work at
-   program's end.  */
-static void __attribute__ ((unused))
-free_mem (void)
-{
-  struct binding *runp;
-
-  for (runp = _nl_domain_bindings; runp != NULL; runp = runp->next)
-    {
-      free (runp->domainname);
-      if (runp->dirname != _nl_default_dirname)
-	/* Yes, this is a pointer comparison.  */
-	free (runp->dirname);
-    }
-
-  if (_nl_current_default_domain != _nl_default_default_domain)
-    /* Yes, again a pointer comparison.  */
-    free ((char *) _nl_current_default_domain);
-}
-
-text_set_element (__libc_subfreeres, free_mem);
-#endif
diff --git a/intl/dgettext.c b/intl/dgettext.c
index 0510c2b..c513041 100644
--- a/intl/dgettext.c
+++ b/intl/dgettext.c
@@ -1,5 +1,5 @@
-/* Implementation of the dgettext(3) function
-   Copyright (C) 1995, 1996, 1997 Free Software Foundation, Inc.
+/* Implementation of the dgettext(3) function.
+   Copyright (C) 1995-1997, 2000, 2001 Free Software Foundation, Inc.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -19,14 +19,13 @@
 # include <config.h>
 #endif
 
-#if defined HAVE_LOCALE_H || defined _LIBC
-# include <locale.h>
-#endif
+#include <locale.h>
 
+#include "gettextP.h"
 #ifdef _LIBC
 # include <libintl.h>
 #else
-# include "libgettext.h"
+# include "libgnuintl.h"
 #endif
 
 /* @@ end of prolog @@ */
diff --git a/intl/explodename.c b/intl/explodename.c
index 8066dc2..c4ddcc4 100644
--- a/intl/explodename.c
+++ b/intl/explodename.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1995, 1996, 1997, 1998 Free Software Foundation, Inc.
+/* Copyright (C) 1995-1998, 2000, 2001 Free Software Foundation, Inc.
    Contributed by Ulrich Drepper <drepper@gnu.ai.mit.edu>, 1995.
 
    This program is free software; you can redistribute it and/or modify
@@ -19,15 +19,8 @@
 # include <config.h>
 #endif
 
-#if defined STDC_HEADERS || defined _LIBC
-# include <stdlib.h>
-#endif
-
-#if defined HAVE_STRING_H || defined _LIBC
-# include <string.h>
-#else
-# include <strings.h>
-#endif
+#include <stdlib.h>
+#include <string.h>
 #include <sys/types.h>
 
 #include "loadinfo.h"
@@ -43,6 +36,18 @@
 
 /* @@ end of prolog @@ */
 
+char *
+_nl_find_language (name)
+     const char *name;
+{
+  while (name[0] != '\0' && name[0] != '_' && name[0] != '@'
+	 && name[0] != '+' && name[0] != ',')
+    ++name;
+
+  return (char *) name;
+}
+
+
 int
 _nl_explode_name (name, language, modifier, territory, codeset,
 		  normalized_codeset, special, sponsor, revision)
@@ -74,9 +79,7 @@ _nl_explode_name (name, language, modifier, territory, codeset,
   mask = 0;
   syntax = undecided;
   *language = cp = name;
-  while (cp[0] != '\0' && cp[0] != '_' && cp[0] != '@'
-	 && cp[0] != '+' && cp[0] != ',')
-    ++cp;
+  cp = _nl_find_language (*language);
 
   if (*language == cp)
     /* This does not make sense: language has to be specified.  Use
diff --git a/intl/finddomain.c b/intl/finddomain.c
index 81ea29b..4882554 100644
--- a/intl/finddomain.c
+++ b/intl/finddomain.c
@@ -1,6 +1,6 @@
 /* Handle list of needed message catalogs
-   Copyright (C) 1995, 1996, 1997, 1998 Free Software Foundation, Inc.
-   Written by Ulrich Drepper <drepper@gnu.ai.mit.edu>, 1995.
+   Copyright (C) 1995-1999, 2000, 2001 Free Software Foundation, Inc.
+   Written by Ulrich Drepper <drepper@gnu.org>, 1995.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -20,45 +20,20 @@
 # include <config.h>
 #endif
 
-#include <ctype.h>
-#include <errno.h>
 #include <stdio.h>
 #include <sys/types.h>
-
-#if defined STDC_HEADERS || defined _LIBC
-# include <stdlib.h>
-#else
-# ifdef HAVE_MALLOC_H
-#  include <malloc.h>
-# else
-void free ();
-# endif
-#endif
-
-#if defined HAVE_STRING_H || defined _LIBC
-# include <string.h>
-#else
-# include <strings.h>
-# ifndef memcpy
-#  define memcpy(Dst, Src, Num) bcopy (Src, Dst, Num)
-# endif
-#endif
-#if !HAVE_STRCHR && !defined _LIBC
-# ifndef strchr
-#  define strchr index
-# endif
-#endif
+#include <stdlib.h>
+#include <string.h>
 
 #if defined HAVE_UNISTD_H || defined _LIBC
 # include <unistd.h>
 #endif
 
-#include "gettext.h"
 #include "gettextP.h"
 #ifdef _LIBC
 # include <libintl.h>
 #else
-# include "libgettext.h"
+# include "libgnuintl.h"
 #endif
 
 /* @@ end of prolog @@ */
@@ -71,10 +46,11 @@ static struct loaded_l10nfile *_nl_loaded_domains;
    established bindings.  */
 struct loaded_l10nfile *
 internal_function
-_nl_find_domain (dirname, locale, domainname)
+_nl_find_domain (dirname, locale, domainname, domainbinding)
      const char *dirname;
      char *locale;
      const char *domainname;
+     struct binding *domainbinding;
 {
   struct loaded_l10nfile *retval;
   const char *language;
@@ -120,7 +96,7 @@ _nl_find_domain (dirname, locale, domainname)
       int cnt;
 
       if (retval->decided == 0)
-	_nl_load_domain (retval);
+	_nl_load_domain (retval, domainbinding);
 
       if (retval->data != NULL)
 	return retval;
@@ -128,7 +104,7 @@ _nl_find_domain (dirname, locale, domainname)
       for (cnt = 0; retval->successor[cnt] != NULL; ++cnt)
 	{
 	  if (retval->successor[cnt]->decided == 0)
-	    _nl_load_domain (retval->successor[cnt]);
+	    _nl_load_domain (retval->successor[cnt], domainbinding);
 
 	  if (retval->successor[cnt]->data != NULL)
 	    break;
@@ -175,14 +151,14 @@ _nl_find_domain (dirname, locale, domainname)
     return NULL;
 
   if (retval->decided == 0)
-    _nl_load_domain (retval);
+    _nl_load_domain (retval, domainbinding);
   if (retval->data == NULL)
     {
       int cnt;
       for (cnt = 0; retval->successor[cnt] != NULL; ++cnt)
 	{
 	  if (retval->successor[cnt]->decided == 0)
-	    _nl_load_domain (retval->successor[cnt]);
+	    _nl_load_domain (retval->successor[cnt], domainbinding);
 	  if (retval->successor[cnt]->data != NULL)
 	    break;
 	}
@@ -192,6 +168,10 @@ _nl_find_domain (dirname, locale, domainname)
   if (alias_value != NULL)
     free (locale);
 
+  /* The space for normalized_codeset is dynamically allocated.  Free it.  */
+  if (mask & XPG_NORM_CODESET)
+    free ((void *) normalized_codeset);
+
   return retval;
 }
 
@@ -208,6 +188,7 @@ free_mem (void)
       if (runp->data != NULL)
 	_nl_unload_domain ((struct loaded_domain *) runp->data);
       runp = runp->next;
+      free ((char *) here->filename);
       free (here);
     }
 }
diff --git a/intl/gettext.c b/intl/gettext.c
index d929f98..a640205 100644
--- a/intl/gettext.c
+++ b/intl/gettext.c
@@ -1,5 +1,5 @@
 /* Implementation of gettext(3) function.
-   Copyright (C) 1995, 1997 Free Software Foundation, Inc.
+   Copyright (C) 1995, 1997, 2000, 2001 Free Software Foundation, Inc.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -23,21 +23,14 @@
 # define __need_NULL
 # include <stddef.h>
 #else
-# ifdef STDC_HEADERS
-#  include <stdlib.h>		/* Just for NULL.  */
-# else
-#  ifdef HAVE_STRING_H
-#   include <string.h>
-#  else
-#   define NULL ((void *) 0)
-#  endif
-# endif
+# include <stdlib.h>		/* Just for NULL.  */
 #endif
 
+#include "gettextP.h"
 #ifdef _LIBC
 # include <libintl.h>
 #else
-# include "libgettext.h"
+# include "libgnuintl.h"
 #endif
 
 /* @@ end of prolog @@ */
@@ -48,10 +41,10 @@
    prefix.  So we have to make a difference here.  */
 #ifdef _LIBC
 # define GETTEXT __gettext
-# define DGETTEXT __dgettext
+# define DCGETTEXT __dcgettext
 #else
 # define GETTEXT gettext__
-# define DGETTEXT dgettext__
+# define DCGETTEXT dcgettext__
 #endif
 
 /* Look up MSGID in the current default message catalog for the current
@@ -61,7 +54,7 @@ char *
 GETTEXT (msgid)
      const char *msgid;
 {
-  return DGETTEXT (NULL, msgid);
+  return DCGETTEXT (NULL, msgid, LC_MESSAGES);
 }
 
 #ifdef _LIBC
diff --git a/intl/gettext.h b/intl/gettext.h
index 3cd23d7..eb58890 100644
--- a/intl/gettext.h
+++ b/intl/gettext.h
@@ -1,5 +1,5 @@
-/* Internal header for GNU gettext internationalization functions.
-   Copyright (C) 1995, 1997 Free Software Foundation, Inc.
+/* Description of GNU message catalog format: general file layout.
+   Copyright (C) 1995, 1997, 2000, 2001 Free Software Foundation, Inc.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -11,16 +11,13 @@
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
    GNU General Public License for more details.
 
-   You should have received a copy of the GNU Library General Public
-   License along with the GNU C Library; see the file COPYING.LIB.  If not,
-   write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA.  */
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software Foundation,
+   Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
 
 #ifndef _GETTEXT_H
 #define _GETTEXT_H 1
 
-#include <stdio.h>
-
 #if HAVE_LIMITS_H || _LIBC
 # include <limits.h>
 #endif
@@ -37,9 +34,8 @@
 /* The following contortions are an attempt to use the C preprocessor
    to determine an unsigned integral type that is 32 bits wide.  An
    alternative approach is to use autoconf's AC_CHECK_SIZEOF macro, but
-   doing that would require that the configure script compile and *run*
-   the resulting executable.  Locally running cross-compiled executables
-   is usually not possible.  */
+   as of version autoconf-2.13, the AC_CHECK_SIZEOF macro doesn't work
+   when cross-compiling.  */
 
 #if __STDC__
 # define UINT_MAX_32_BITS 4294967295U
diff --git a/intl/gettextP.h b/intl/gettextP.h
index 00c5203..ee8ca48 100644
--- a/intl/gettextP.h
+++ b/intl/gettextP.h
@@ -1,6 +1,6 @@
-/* Header describing internals of gettext library
-   Copyright (C) 1995, 1996, 1997, 1998 Free Software Foundation, Inc.
-   Written by Ulrich Drepper <drepper@gnu.ai.mit.edu>, 1995.
+/* Header describing internals of libintl library.
+   Copyright (C) 1995-1999, 2000, 2001 Free Software Foundation, Inc.
+   Written by Ulrich Drepper <drepper@cygnus.com>, 1995.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -19,8 +19,20 @@
 #ifndef _GETTEXTP_H
 #define _GETTEXTP_H
 
+#include <stddef.h>		/* Get size_t.  */
+
+#ifdef _LIBC
+# include "../iconv/gconv_int.h"
+#else
+# if HAVE_ICONV
+#  include <iconv.h>
+# endif
+#endif
+
 #include "loadinfo.h"
 
+#include "gettext.h"		/* Get nls_uint32.  */
+
 /* @@ end of prolog @@ */
 
 #ifndef PARAMS
@@ -35,6 +47,12 @@
 # define internal_function
 #endif
 
+/* Tell the compiler when a conditional or integer expression is
+   almost always true or almost always false.  */
+#ifndef HAVE_BUILTIN_EXPECT
+# define __builtin_expect(expr, val) (expr)
+#endif
+
 #ifndef W
 # define W(flag, data) ((flag) ? SWAP (data) : (data))
 #endif
@@ -44,8 +62,6 @@
 # include <byteswap.h>
 # define SWAP(i) bswap_32 (i)
 #else
-static nls_uint32 SWAP PARAMS ((nls_uint32 i));
-
 static inline nls_uint32
 SWAP (i)
      nls_uint32 i;
@@ -55,6 +71,52 @@ SWAP (i)
 #endif
 
 
+/* This is the representation of the expressions to determine the
+   plural form.  */
+struct expression
+{
+  int nargs;			/* Number of arguments.  */
+  enum operator
+  {
+    /* Without arguments:  */
+    var,			/* The variable "n".  */
+    num,			/* Decimal number.  */
+    /* Unary operators:  */
+    lnot,			/* Logical NOT.  */
+    /* Binary operators:  */
+    mult,			/* Multiplication.  */
+    divide,			/* Division.  */
+    module,			/* Module operation.  */
+    plus,			/* Addition.  */
+    minus,			/* Subtraction.  */
+    less_than,			/* Comparison.  */
+    greater_than,		/* Comparison.  */
+    less_or_equal,		/* Comparison.  */
+    greater_or_equal,		/* Comparison.  */
+    equal,			/* Comparision for equality.  */
+    not_equal,			/* Comparision for inequality.  */
+    land,			/* Logical AND.  */
+    lor,			/* Logical OR.  */
+    /* Ternary operators:  */
+    qmop			/* Question mark operator.  */
+  } operation;
+  union
+  {
+    unsigned long int num;	/* Number value for `num'.  */
+    struct expression *args[3];	/* Up to three arguments.  */
+  } val;
+};
+
+/* This is the data structure to pass information to the parser and get
+   the result in a thread-safe way.  */
+struct parse_args
+{
+  const char *cp;
+  struct expression *res;
+};
+
+
+/* The representation of an opened message catalog.  */
 struct loaded_domain
 {
   const char *data;
@@ -66,23 +128,123 @@ struct loaded_domain
   struct string_desc *trans_tab;
   nls_uint32 hash_size;
   nls_uint32 *hash_tab;
+  int codeset_cntr;
+#ifdef _LIBC
+  __gconv_t conv;
+#else
+# if HAVE_ICONV
+  iconv_t conv;
+# endif
+#endif
+  char **conv_tab;
+
+  struct expression *plural;
+  unsigned long int nplurals;
 };
 
+/* We want to allocate a string at the end of the struct.  But ISO C
+   doesn't allow zero sized arrays.  */
+#ifdef __GNUC__
+# define ZERO 0
+#else
+# define ZERO 1
+#endif
+
+/* A set of settings bound to a message domain.  Used to store settings
+   from bindtextdomain() and bind_textdomain_codeset().  */
 struct binding
 {
   struct binding *next;
-  char *domainname;
   char *dirname;
+  int codeset_cntr;	/* Incremented each time codeset changes.  */
+  char *codeset;
+  char domainname[ZERO];
 };
 
+/* A counter which is incremented each time some previous translations
+   become invalid.
+   This variable is part of the external ABI of the GNU libintl.  */
+extern int _nl_msg_cat_cntr;
+
 struct loaded_l10nfile *_nl_find_domain PARAMS ((const char *__dirname,
 						 char *__locale,
-						 const char *__domainname))
+						 const char *__domainname,
+					      struct binding *__domainbinding))
      internal_function;
-void _nl_load_domain PARAMS ((struct loaded_l10nfile *__domain))
+void _nl_load_domain PARAMS ((struct loaded_l10nfile *__domain,
+			      struct binding *__domainbinding))
      internal_function;
 void _nl_unload_domain PARAMS ((struct loaded_domain *__domain))
      internal_function;
+const char *_nl_init_domain_conv PARAMS ((struct loaded_l10nfile *__domain_file,
+					  struct loaded_domain *__domain,
+					  struct binding *__domainbinding))
+     internal_function;
+void _nl_free_domain_conv PARAMS ((struct loaded_domain *__domain))
+     internal_function;
+
+char *_nl_find_msg PARAMS ((struct loaded_l10nfile *domain_file,
+			    struct binding *domainbinding,
+			    const char *msgid, size_t *lengthp))
+     internal_function;
+
+#ifdef _LIBC
+extern char *__gettext PARAMS ((const char *__msgid));
+extern char *__dgettext PARAMS ((const char *__domainname,
+				 const char *__msgid));
+extern char *__dcgettext PARAMS ((const char *__domainname,
+				  const char *__msgid, int __category));
+extern char *__ngettext PARAMS ((const char *__msgid1, const char *__msgid2,
+				 unsigned long int __n));
+extern char *__dngettext PARAMS ((const char *__domainname,
+				  const char *__msgid1, const char *__msgid2,
+				  unsigned long int n));
+extern char *__dcngettext PARAMS ((const char *__domainname,
+				   const char *__msgid1, const char *__msgid2,
+				   unsigned long int __n, int __category));
+extern char *__dcigettext PARAMS ((const char *__domainname,
+				   const char *__msgid1, const char *__msgid2,
+				   int __plural, unsigned long int __n,
+				   int __category));
+extern char *__textdomain PARAMS ((const char *__domainname));
+extern char *__bindtextdomain PARAMS ((const char *__domainname,
+				       const char *__dirname));
+extern char *__bind_textdomain_codeset PARAMS ((const char *__domainname,
+						const char *__codeset));
+#else
+extern char *gettext__ PARAMS ((const char *__msgid));
+extern char *dgettext__ PARAMS ((const char *__domainname,
+				 const char *__msgid));
+extern char *dcgettext__ PARAMS ((const char *__domainname,
+				  const char *__msgid, int __category));
+extern char *ngettext__ PARAMS ((const char *__msgid1, const char *__msgid2,
+				 unsigned long int __n));
+extern char *dngettext__ PARAMS ((const char *__domainname,
+				  const char *__msgid1, const char *__msgid2,
+				  unsigned long int __n));
+extern char *dcngettext__ PARAMS ((const char *__domainname,
+				   const char *__msgid1, const char *__msgid2,
+				   unsigned long int __n, int __category));
+extern char *dcigettext__ PARAMS ((const char *__domainname,
+				   const char *__msgid1, const char *__msgid2,
+				   int __plural, unsigned long int __n,
+				   int __category));
+extern char *textdomain__ PARAMS ((const char *__domainname));
+extern char *bindtextdomain__ PARAMS ((const char *__domainname,
+				       const char *__dirname));
+extern char *bind_textdomain_codeset__ PARAMS ((const char *__domainname,
+						const char *__codeset));
+#endif
+
+#ifdef _LIBC
+extern void __gettext_free_exp PARAMS ((struct expression *exp))
+     internal_function;
+extern int __gettextparse PARAMS ((void *arg));
+#else
+extern void gettext_free_exp__ PARAMS ((struct expression *exp))
+     internal_function;
+extern int gettextparse__ PARAMS ((void *arg));
+#endif
 
 /* @@ begin of epilog @@ */
 
diff --git a/intl/hash-string.h b/intl/hash-string.h
index cacb38e..37d4ce1 100644
--- a/intl/hash-string.h
+++ b/intl/hash-string.h
@@ -1,5 +1,5 @@
-/* Implements a string hashing function.
-   Copyright (C) 1995, 1997 Free Software Foundation, Inc.
+/* Description of GNU message catalog format: string hashing function.
+   Copyright (C) 1995, 1997, 1998, 2000, 2001 Free Software Foundation, Inc.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -11,10 +11,9 @@
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
    GNU General Public License for more details.
 
-   You should have received a copy of the GNU Library General Public
-   License along with the GNU C Library; see the file COPYING.LIB.  If not,
-   write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA.  */
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software Foundation,
+   Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
 
 /* @@ end of prolog @@ */
 
@@ -33,9 +32,9 @@
 /* Defines the so called `hashpjw' function by P.J. Weinberger
    [see Aho/Sethi/Ullman, COMPILERS: Principles, Techniques and Tools,
    1986, 1987 Bell Telephone Laboratories, Inc.]  */
-static unsigned long hash_string PARAMS ((const char *__str_param));
+static unsigned long int hash_string PARAMS ((const char *__str_param));
 
-static inline unsigned long
+static inline unsigned long int
 hash_string (str_param)
      const char *str_param;
 {
@@ -47,8 +46,8 @@ hash_string (str_param)
   while (*str != '\0')
     {
       hval <<= 4;
-      hval += (unsigned long) *str++;
-      g = hval & ((unsigned long) 0xf << (HASHWORDBITS - 4));
+      hval += (unsigned long int) *str++;
+      g = hval & ((unsigned long int) 0xf << (HASHWORDBITS - 4));
       if (g != 0)
 	{
 	  hval ^= g >> (HASHWORDBITS - 8);
diff --git a/intl/intl-compat.c b/intl/intl-compat.c
index 503efa0..b8edaa1 100644
--- a/intl/intl-compat.c
+++ b/intl/intl-compat.c
@@ -1,6 +1,6 @@
 /* intl-compat.c - Stub functions to call gettext functions from GNU gettext
    Library.
-   Copyright (C) 1995 Software Foundation, Inc.
+   Copyright (C) 1995, 2000, 2001 Software Foundation, Inc.
 
 This program is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
@@ -20,24 +20,79 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
 # include <config.h>
 #endif
 
-#include "libgettext.h"
+#include "libgnuintl.h"
+#include "gettextP.h"
 
 /* @@ end of prolog @@ */
 
+/* This file redirects the gettext functions (without prefix or suffix) to
+   those defined in the included GNU gettext library (with "__" suffix).
+   It is compiled into libintl when the included GNU gettext library is
+   configured --with-included-gettext.
+
+   This redirection works also in the case that the system C library or
+   the system libintl library contain gettext/textdomain/... functions.
+   If it didn't, we would need to add preprocessor level redirections to
+   libgnuintl.h of the following form:
+
+#    define gettext gettext__
+#    define dgettext dgettext__
+#    define dcgettext dcgettext__
+#    define ngettext ngettext__
+#    define dngettext dngettext__
+#    define dcngettext dcngettext__
+#    define textdomain textdomain__
+#    define bindtextdomain bindtextdomain__
+#    define bind_textdomain_codeset bind_textdomain_codeset__
+
+   How does this redirection work? There are two cases.
+   A. When libintl.a is linked into an executable, it works because
+      functions defined in the executable always override functions in
+      the shared libraries.
+   B. When libintl.so is used, it works because
+      1. those systems defining gettext/textdomain/... in the C library
+         (namely, Solaris 2.4 and newer, and GNU libc 2.0 and newer) are
+         ELF systems and define these symbols as weak, thus explicitly
+         letting other shared libraries override it.
+      2. those systems defining gettext/textdomain/... in a standalone
+         libintl.so library (namely, Solaris 2.3 and newer) have this
+         shared library in /usr/lib, and the linker will search /usr/lib
+         *after* the directory where the GNU gettext library is installed.
+
+   A third case, namely when libintl.a is linked into a shared library
+   whose name is not libintl.so, is not supported. In this case, on
+   Solaris, when -lintl precedes the linker option for the shared library
+   containing GNU gettext, the system's gettext would indeed override
+   the GNU gettext. Anyone doing this kind of stuff must be clever enough
+   to 1. compile libintl.a with -fPIC, 2. remove -lintl from his linker
+   command line.  */
+
 
 #undef gettext
 #undef dgettext
 #undef dcgettext
+#undef ngettext
+#undef dngettext
+#undef dcngettext
 #undef textdomain
 #undef bindtextdomain
+#undef bind_textdomain_codeset
 
 
 char *
-bindtextdomain (domainname, dirname)
+gettext (msgid)
+     const char *msgid;
+{
+  return gettext__ (msgid);
+}
+
+
+char *
+dgettext (domainname, msgid)
      const char *domainname;
-     const char *dirname;
+     const char *msgid;
 {
-  return bindtextdomain__ (domainname, dirname);
+  return dgettext__ (domainname, msgid);
 }
 
 
@@ -52,19 +107,35 @@ dcgettext (domainname, msgid, category)
 
 
 char *
-dgettext (domainname, msgid)
+ngettext (msgid1, msgid2, n)
+     const char *msgid1;
+     const char *msgid2;
+     unsigned long int n;
+{
+  return ngettext__ (msgid1, msgid2, n);
+}
+
+
+char *
+dngettext (domainname, msgid1, msgid2, n)
      const char *domainname;
-     const char *msgid;
+     const char *msgid1;
+     const char *msgid2;
+     unsigned long int n;
 {
-  return dgettext__ (domainname, msgid);
+  return dngettext__ (domainname, msgid1, msgid2, n);
 }
 
 
 char *
-gettext (msgid)
-     const char *msgid;
+dcngettext (domainname, msgid1, msgid2, n, category)
+     const char *domainname;
+     const char *msgid1;
+     const char *msgid2;
+     unsigned long int n;
+     int category;
 {
-  return gettext__ (msgid);
+  return dcngettext__ (domainname, msgid1, msgid2, n, category);
 }
 
 
@@ -74,3 +145,21 @@ textdomain (domainname)
 {
   return textdomain__ (domainname);
 }
+
+
+char *
+bindtextdomain (domainname, dirname)
+     const char *domainname;
+     const char *dirname;
+{
+  return bindtextdomain__ (domainname, dirname);
+}
+
+
+char *
+bind_textdomain_codeset (domainname, codeset)
+     const char *domainname;
+     const char *codeset;
+{
+  return bind_textdomain_codeset__ (domainname, codeset);
+}
diff --git a/intl/l10nflist.c b/intl/l10nflist.c
index 9c7dc18..557253e 100644
--- a/intl/l10nflist.c
+++ b/intl/l10nflist.c
@@ -1,5 +1,4 @@
-/* Handle list of needed message catalogs
-   Copyright (C) 1995, 1996, 1997 Free Software Foundation, Inc.
+/* Copyright (C) 1995-1999, 2000, 2001 Free Software Foundation, Inc.
    Contributed by Ulrich Drepper <drepper@gnu.ai.mit.edu>, 1995.
 
    This program is free software; you can redistribute it and/or modify
@@ -16,22 +15,18 @@
    along with this program; if not, write to the Free Software Foundation,
    Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
 
+/* Tell glibc's <string.h> to provide a prototype for stpcpy().
+   This must come before <config.h> because <config.h> may include
+   <features.h>, and once <features.h> has been included, it's too late.  */
+#ifndef _GNU_SOURCE
+# define _GNU_SOURCE	1
+#endif
+
 #ifdef HAVE_CONFIG_H
 # include <config.h>
 #endif
 
-
-#if defined HAVE_STRING_H || defined _LIBC
-# ifndef _GNU_SOURCE
-#  define _GNU_SOURCE	1
-# endif
-# include <string.h>
-#else
-# include <strings.h>
-# ifndef memcpy
-#  define memcpy(Dst, Src, Num) bcopy (Src, Dst, Num)
-# endif
-#endif
+#include <string.h>
 #if !HAVE_STRCHR && !defined _LIBC
 # ifndef strchr
 #  define strchr index
@@ -43,10 +38,7 @@
 #endif
 #include <ctype.h>
 #include <sys/types.h>
-
-#if defined STDC_HEADERS || defined _LIBC
-# include <stdlib.h>
-#endif
+#include <stdlib.h>
 
 #include "loadinfo.h"
 
@@ -224,7 +216,7 @@ _nl_make_l10nflist (l10nfile_list, dirlist, dirlist_len, mask, language,
 
   /* Construct file name.  */
   memcpy (abs_filename, dirlist, dirlist_len);
-  __argz_stringify (abs_filename, dirlist_len, ':');
+  __argz_stringify (abs_filename, dirlist_len, PATH_SEPARATOR);
   cp = abs_filename + (dirlist_len - 1);
   *cp++ = '/';
   cp = stpcpy (cp, language);
@@ -349,10 +341,11 @@ _nl_make_l10nflist (l10nfile_list, dirlist, dirlist_len, mask, language,
 
 /* Normalize codeset name.  There is no standard for the codeset
    names.  Normalization allows the user to use any of the common
-   names.  */
+   names.  The return value is dynamically allocated and has to be
+   freed by the caller.  */
 const char *
 _nl_normalize_codeset (codeset, name_len)
-     const unsigned char *codeset;
+     const char *codeset;
      size_t name_len;
 {
   int len = 0;
diff --git a/intl/libgettext.h b/intl/libgettext.h
index 3a92960..553382c 100644
--- a/intl/libgettext.h
+++ b/intl/libgettext.h
@@ -1,5 +1,5 @@
-/* Message catalogs for internationalization.
-   Copyright (C) 1995, 1996, 1997, 1998 Free Software Foundation, Inc.
+/* Convenience header for conditional use of GNU <libintl.h>.
+   Copyright (C) 1995-1998, 2000, 2001 Free Software Foundation, Inc.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -15,168 +15,34 @@
    along with this program; if not, write to the Free Software Foundation,
    Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
 
-/* Because on some systems (e.g. Solaris) we sometimes have to include
-   the systems libintl.h as well as this file we have more complex
-   include protection above.  But the systems header might perhaps also
-   define _LIBINTL_H and therefore we have to protect the definition here.  */
-
-#if !defined _LIBINTL_H || !defined _LIBGETTEXT_H
-#ifndef _LIBINTL_H
-# define _LIBINTL_H	1
-#endif
-#define _LIBGETTEXT_H	1
-
-/* We define an additional symbol to signal that we use the GNU
-   implementation of gettext.  */
-#define __USE_GNU_GETTEXT 1
-
-#include <sys/types.h>
-
-#if HAVE_LOCALE_H
-# include <locale.h>
-#endif
-
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/* @@ end of prolog @@ */
-
-#ifndef PARAMS
-# if __STDC__ || defined __cplusplus
-#  define PARAMS(args) args
-# else
-#  define PARAMS(args) ()
-# endif
-#endif
-
-#ifndef NULL
-# if !defined __cplusplus || defined __GNUC__
-#  define NULL ((void *) 0)
-# else
-#  define NULL (0)
-# endif
-#endif
-
-#if !HAVE_LC_MESSAGES
-/* This value determines the behaviour of the gettext() and dgettext()
-   function.  But some system does not have this defined.  Define it
-   to a default value.  */
-# define LC_MESSAGES (-1)
-#endif
-
-
-/* Declarations for gettext-using-catgets interface.  Derived from
-   Jim Meyering's libintl.h.  */
-struct _msg_ent
-{
-  const char *_msg;
-  int _msg_number;
-};
-
-
-#if HAVE_CATGETS
-/* These two variables are defined in the automatically by po-to-tbl.sed
-   generated file `cat-id-tbl.c'.  */
-extern const struct _msg_ent _msg_tbl[];
-extern int _msg_tbl_length;
-#endif
-
-
-/* For automatical extraction of messages sometimes no real
-   translation is needed.  Instead the string itself is the result.  */
-#define gettext_noop(Str) (Str)
-
-/* Look up MSGID in the current default message catalog for the current
-   LC_MESSAGES locale.  If not found, returns MSGID itself (the default
-   text).  */
-extern char *gettext PARAMS ((const char *__msgid));
-extern char *gettext__ PARAMS ((const char *__msgid));
-
-/* Look up MSGID in the DOMAINNAME message catalog for the current
-   LC_MESSAGES locale.  */
-extern char *dgettext PARAMS ((const char *__domainname, const char *__msgid));
-extern char *dgettext__ PARAMS ((const char *__domainname,
-				 const char *__msgid));
-
-/* Look up MSGID in the DOMAINNAME message catalog for the current CATEGORY
-   locale.  */
-extern char *dcgettext PARAMS ((const char *__domainname, const char *__msgid,
-				int __category));
-extern char *dcgettext__ PARAMS ((const char *__domainname,
-				  const char *__msgid, int __category));
-
-
-/* Set the current default message catalog to DOMAINNAME.
-   If DOMAINNAME is null, return the current default.
-   If DOMAINNAME is "", reset to the default of "messages".  */
-extern char *textdomain PARAMS ((const char *__domainname));
-extern char *textdomain__ PARAMS ((const char *__domainname));
-
-/* Specify that the DOMAINNAME message catalog will be found
-   in DIRNAME rather than in the system locale data base.  */
-extern char *bindtextdomain PARAMS ((const char *__domainname,
-				  const char *__dirname));
-extern char *bindtextdomain__ PARAMS ((const char *__domainname,
-				    const char *__dirname));
+#ifndef _LIBGETTEXT_H
+#define _LIBGETTEXT_H 1
 
+/* NLS can be disabled through the configure --disable-nls option.  */
 #if ENABLE_NLS
 
-/* Solaris 2.3 has the gettext function but dcgettext is missing.
-   So we omit this optimization for Solaris 2.3.  BTW, Solaris 2.4
-   has dcgettext.  */
-# if !HAVE_CATGETS && (!HAVE_GETTEXT || HAVE_DCGETTEXT)
-
-#  define gettext(Msgid)						      \
-     dgettext (NULL, Msgid)
-
-#  define dgettext(Domainname, Msgid)					      \
-     dcgettext (Domainname, Msgid, LC_MESSAGES)
-
-#  if defined __GNUC__ && __GNUC__ == 2 && __GNUC_MINOR__ >= 7
-/* This global variable is defined in loadmsgcat.c.  We need a sign,
-   whether a new catalog was loaded, which can be associated with all
-   translations.  */
-extern int _nl_msg_cat_cntr;
-
-#   define dcgettext(Domainname, Msgid, Category)			      \
-  (__extension__							      \
-   ({									      \
-     char *__result;							      \
-     if (__builtin_constant_p (Msgid))					      \
-       {								      \
-	 static char *__translation__;					      \
-	 static int __catalog_counter__;				      \
-	 if (! __translation__ || __catalog_counter__ != _nl_msg_cat_cntr)    \
-	   {								      \
-	     __translation__ =						      \
-	       dcgettext__ (Domainname, Msgid, Category);		      \
-	     __catalog_counter__ = _nl_msg_cat_cntr;			      \
-	   }								      \
-	 __result = __translation__;					      \
-       }								      \
-     else								      \
-       __result = dcgettext__ (Domainname, Msgid, Category);		      \
-     __result;								      \
-    }))
-#  endif
-# endif
+/* Get declarations of GNU message catalog functions.  */
+# include <libintl.h>
 
 #else
 
 # define gettext(Msgid) (Msgid)
 # define dgettext(Domainname, Msgid) (Msgid)
 # define dcgettext(Domainname, Msgid, Category) (Msgid)
-# define textdomain(Domainname) ((char *) Domainname)
-# define bindtextdomain(Domainname, Dirname) ((char *) Dirname)
+# define ngettext(Msgid1, Msgid2, N) \
+    ((N) == 1 ? (char *) (Msgid1) : (char *) (Msgid2))
+# define dngettext(Domainname, Msgid1, Msgid2, N) \
+    ((N) == 1 ? (char *) (Msgid1) : (char *) (Msgid2))
+# define dcngettext(Domainname, Msgid1, Msgid2, N, Category) \
+    ((N) == 1 ? (char *) (Msgid1) : (char *) (Msgid2))
+# define textdomain(Domainname) ((char *) (Domainname))
+# define bindtextdomain(Domainname, Dirname) ((char *) (Dirname))
+# define bind_textdomain_codeset(Domainname, Codeset) ((char *) (Codeset))
 
 #endif
 
-/* @@ begin of epilog @@ */
-
-#ifdef __cplusplus
-}
-#endif
+/* For automatical extraction of messages sometimes no real
+   translation is needed.  Instead the string itself is the result.  */
+#define gettext_noop(Str) (Str)
 
-#endif
+#endif /* _LIBGETTEXT_H */
diff --git a/intl/linux-msg.sed b/intl/linux-msg.sed
deleted file mode 100644
index 5918e72..0000000
--- a/intl/linux-msg.sed
+++ /dev/null
@@ -1,100 +0,0 @@
-# po2msg.sed - Convert Uniforum style .po file to Linux style .msg file
-# Copyright (C) 1995 Free Software Foundation, Inc.
-# Ulrich Drepper <drepper@gnu.ai.mit.edu>, 1995.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-#
-#
-# The first directive in the .msg should be the definition of the
-# message set number.  We use always set number 1.
-#
-1 {
-  i\
-$set 1 # Automatically created by po2msg.sed
-  h
-  s/.*/0/
-  x
-}
-#
-# Mitch's old catalog format does not allow comments.
-#
-# We copy the original message as a comment into the .msg file.
-#
-/^msgid/ {
-  s/msgid[ 	]*"//
-#
-# This does not work now with the new format.
-# /"$/! {
-#   s/\\$//
-#   s/$/ ... (more lines following)"/
-# }
-  x
-# The following nice solution is by
-# Bruno <Haible@ma2s2.mathematik.uni-karlsruhe.de>
-  td
-# Increment a decimal number in pattern space.
-# First hide trailing `9' digits.
-  :d
-  s/9\(_*\)$/_\1/
-  td
-# Assure at least one digit is available.
-  s/^\(_*\)$/0\1/
-# Increment the last digit.
-  s/8\(_*\)$/9\1/
-  s/7\(_*\)$/8\1/
-  s/6\(_*\)$/7\1/
-  s/5\(_*\)$/6\1/
-  s/4\(_*\)$/5\1/
-  s/3\(_*\)$/4\1/
-  s/2\(_*\)$/3\1/
-  s/1\(_*\)$/2\1/
-  s/0\(_*\)$/1\1/
-# Convert the hidden `9' digits to `0's.
-  s/_/0/g
-  x
-  G
-  s/\(.*\)"\n\([0-9]*\)/$ #\2 Original Message:(\1)/p
-}
-#
-# The .msg file contains, other then the .po file, only the translations
-# but each given a unique ID.  Starting from 1 and incrementing by 1 for
-# each message we assign them to the messages.
-# It is important that the .po file used to generate the cat-id-tbl.c file
-# (with po-to-tbl) is the same as the one used here.  (At least the order
-# of declarations must not be changed.)
-#
-/^msgstr/ {
-  s/msgstr[ 	]*"\(.*\)"/# \1/
-# Clear substitution flag.
-  tb
-# Append the next line.
-  :b
-  N
-# Look whether second part is continuation line.
-  s/\(.*\n\)"\(.*\)"/\1\2/
-# Yes, then branch.
-  ta
-  P
-  D
-# Note that D includes a jump to the start!!
-# We found a continuation line.  But before printing insert '\'.
-  :a
-  s/\(.*\)\(\n.*\)/\1\\\2/
-  P
-# We cannot use D here.
-  s/.*\n\(.*\)/\1/
-  tb
-}
-d
diff --git a/intl/loadinfo.h b/intl/loadinfo.h
index f4ebf6d..5171a8f 100644
--- a/intl/loadinfo.h
+++ b/intl/loadinfo.h
@@ -1,4 +1,4 @@
-/* Copyright (C) 1996, 1997 Free Software Foundation, Inc.
+/* Copyright (C) 1996-1999, 2000, 2001 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
    Contributed by Ulrich Drepper <drepper@cygnus.com>, 1996.
 
@@ -16,6 +16,9 @@
    along with this program; if not, write to the Free Software Foundation,
    Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
 
+#ifndef _LOADINFO_H
+#define _LOADINFO_H	1
+
 #ifndef PARAMS
 # if __STDC__
 #  define PARAMS(args) args
@@ -24,6 +27,25 @@
 # endif
 #endif
 
+#ifndef internal_function
+# define internal_function
+#endif
+
+/* Tell the compiler when a conditional or integer expression is
+   almost always true or almost always false.  */
+#ifndef HAVE_BUILTIN_EXPECT
+# define __builtin_expect(expr, val) (expr)
+#endif
+
+/* Separator in PATH like lists of pathnames.  */
+#if defined _WIN32 || defined __WIN32__ || defined __EMX__ || defined __DJGPP__
+  /* Win32, OS/2, DOS */
+# define PATH_SEPARATOR ';'
+#else
+  /* Unix */
+# define PATH_SEPARATOR ':'
+#endif
+
 /* Encoding of locale name parts.  */
 #define CEN_REVISION		1
 #define CEN_SPONSOR		2
@@ -50,7 +72,11 @@ struct loaded_l10nfile
 };
 
 
-extern const char *_nl_normalize_codeset PARAMS ((const unsigned char *codeset,
+/* Normalize codeset name.  There is no standard for the codeset
+   names.  Normalization allows the user to use any of the common
+   names.  The return value is dynamically allocated and has to be
+   freed by the caller.  */
+extern const char *_nl_normalize_codeset PARAMS ((const char *codeset,
 						  size_t name_len));
 
 extern struct loaded_l10nfile *
@@ -66,6 +92,8 @@ _nl_make_l10nflist PARAMS ((struct loaded_l10nfile **l10nfile_list,
 
 extern const char *_nl_expand_alias PARAMS ((const char *name));
 
+/* normalized_codeset is dynamically allocated and has to be freed by
+   the caller.  */
 extern int _nl_explode_name PARAMS ((char *name, const char **language,
 				     const char **modifier,
 				     const char **territory,
@@ -74,3 +102,7 @@ extern int _nl_explode_name PARAMS ((char *name, const char **language,
 				     const char **special,
 				     const char **sponsor,
 				     const char **revision));
+
+extern char *_nl_find_language PARAMS ((const char *name));
+
+#endif	/* loadinfo.h */
diff --git a/intl/loadmsgcat.c b/intl/loadmsgcat.c
index 515892d..d589243 100644
--- a/intl/loadmsgcat.c
+++ b/intl/loadmsgcat.c
@@ -1,5 +1,5 @@
 /* Load needed message catalogs.
-   Copyright (C) 1995, 1996, 1997, 1998 Free Software Foundation, Inc.
+   Copyright (C) 1995-1999, 2000, 2001 Free Software Foundation, Inc.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -15,29 +15,68 @@
    along with this program; if not, write to the Free Software Foundation,
    Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
 
+/* Tell glibc's <string.h> to provide a prototype for mempcpy().
+   This must come before <config.h> because <config.h> may include
+   <features.h>, and once <features.h> has been included, it's too late.  */
+#ifndef _GNU_SOURCE
+# define _GNU_SOURCE    1
+#endif
+
 #ifdef HAVE_CONFIG_H
 # include <config.h>
 #endif
 
+#include <ctype.h>
+#include <errno.h>
 #include <fcntl.h>
 #include <sys/types.h>
 #include <sys/stat.h>
 
-#if defined STDC_HEADERS || defined _LIBC
-# include <stdlib.h>
+#ifdef __GNUC__
+# define alloca __builtin_alloca
+# define HAVE_ALLOCA 1
+#else
+# if defined HAVE_ALLOCA_H || defined _LIBC
+#  include <alloca.h>
+# else
+#  ifdef _AIX
+ #pragma alloca
+#  else
+#   ifndef alloca
+char *alloca ();
+#   endif
+#  endif
+# endif
 #endif
 
+#include <stdlib.h>
+#include <string.h>
+
 #if defined HAVE_UNISTD_H || defined _LIBC
 # include <unistd.h>
 #endif
 
-#if (defined HAVE_MMAP && defined HAVE_MUNMAP) || defined _LIBC
+#ifdef _LIBC
+# include <langinfo.h>
+# include <locale.h>
+#endif
+
+#if (defined HAVE_MMAP && defined HAVE_MUNMAP && !defined DISALLOW_MMAP) \
+    || (defined _LIBC && defined _POSIX_MAPPED_FILES)
 # include <sys/mman.h>
+# undef HAVE_MMAP
+# define HAVE_MMAP	1
+#else
+# undef HAVE_MMAP
 #endif
 
 #include "gettext.h"
 #include "gettextP.h"
 
+#ifdef _LIBC
+# include "../locale/localeinfo.h"
+#endif
+
 /* @@ end of prolog @@ */
 
 #ifdef _LIBC
@@ -51,32 +90,275 @@
 # define munmap __munmap
 #endif
 
+/* Names for the libintl functions are a problem.  They must not clash
+   with existing names and they should follow ANSI C.  But this source
+   code is also used in GNU C Library where the names have a __
+   prefix.  So we have to make a difference here.  */
+#ifdef _LIBC
+# define PLURAL_PARSE __gettextparse
+#else
+# define PLURAL_PARSE gettextparse__
+#endif
+
+/* For those losing systems which don't have `alloca' we have to add
+   some additional code emulating it.  */
+#ifdef HAVE_ALLOCA
+# define freea(p) /* nothing */
+#else
+# define alloca(n) malloc (n)
+# define freea(p) free (p)
+#endif
+
+/* For systems that distinguish between text and binary I/O.
+   O_BINARY is usually declared in <fcntl.h>. */
+#if !defined O_BINARY && defined _O_BINARY
+  /* For MSC-compatible compilers.  */
+# define O_BINARY _O_BINARY
+# define O_TEXT _O_TEXT
+#endif
+#ifdef __BEOS__
+  /* BeOS 5 has O_BINARY and O_TEXT, but they have no effect.  */
+# undef O_BINARY
+# undef O_TEXT
+#endif
+/* On reasonable systems, binary I/O is the default.  */
+#ifndef O_BINARY
+# define O_BINARY 0
+#endif
+
 /* We need a sign, whether a new catalog was loaded, which can be associated
    with all translations.  This is important if the translations are
    cached by one of GCC's features.  */
-int _nl_msg_cat_cntr = 0;
+int _nl_msg_cat_cntr;
+
+#if (defined __GNUC__ && !defined __APPLE_CC__) \
+    || (defined __STDC_VERSION__ && __STDC_VERSION__ >= 199901L)
+
+/* These structs are the constant expression for the germanic plural
+   form determination.  It represents the expression  "n != 1".  */
+static const struct expression plvar =
+{
+  .nargs = 0,
+  .operation = var,
+};
+static const struct expression plone =
+{
+  .nargs = 0,
+  .operation = num,
+  .val =
+  {
+    .num = 1
+  }
+};
+static struct expression germanic_plural =
+{
+  .nargs = 2,
+  .operation = not_equal,
+  .val =
+  {
+    .args =
+    {
+      [0] = (struct expression *) &plvar,
+      [1] = (struct expression *) &plone
+    }
+  }
+};
+
+# define INIT_GERMANIC_PLURAL()
+
+#else
+
+/* For compilers without support for ISO C 99 struct/union initializers:
+   Initialization at run-time.  */
+
+static struct expression plvar;
+static struct expression plone;
+static struct expression germanic_plural;
+
+static void
+init_germanic_plural ()
+{
+  if (plone.val.num == 0)
+    {
+      plvar.nargs = 0;
+      plvar.operation = var;
+
+      plone.nargs = 0;
+      plone.operation = num;
+      plone.val.num = 1;
+
+      germanic_plural.nargs = 2;
+      germanic_plural.operation = not_equal;
+      germanic_plural.val.args[0] = &plvar;
+      germanic_plural.val.args[1] = &plone;
+    }
+}
+
+# define INIT_GERMANIC_PLURAL() init_germanic_plural ()
+
+#endif
+
+
+/* Initialize the codeset dependent parts of an opened message catalog.
+   Return the header entry.  */
+const char *
+internal_function
+_nl_init_domain_conv (domain_file, domain, domainbinding)
+     struct loaded_l10nfile *domain_file;
+     struct loaded_domain *domain;
+     struct binding *domainbinding;
+{
+  /* Find out about the character set the file is encoded with.
+     This can be found (in textual form) in the entry "".  If this
+     entry does not exist or if this does not contain the `charset='
+     information, we will assume the charset matches the one the
+     current locale and we don't have to perform any conversion.  */
+  char *nullentry;
+  size_t nullentrylen;
+
+  /* Preinitialize fields, to avoid recursion during _nl_find_msg.  */
+  domain->codeset_cntr =
+    (domainbinding != NULL ? domainbinding->codeset_cntr : 0);
+#ifdef _LIBC
+  domain->conv = (__gconv_t) -1;
+#else
+# if HAVE_ICONV
+  domain->conv = (iconv_t) -1;
+# endif
+#endif
+  domain->conv_tab = NULL;
 
+  /* Get the header entry.  */
+  nullentry = _nl_find_msg (domain_file, domainbinding, "", &nullentrylen);
+
+  if (nullentry != NULL)
+    {
+#if defined _LIBC || HAVE_ICONV
+      const char *charsetstr;
+
+      charsetstr = strstr (nullentry, "charset=");
+      if (charsetstr != NULL)
+	{
+	  size_t len;
+	  char *charset;
+	  const char *outcharset;
+
+	  charsetstr += strlen ("charset=");
+	  len = strcspn (charsetstr, " \t\n");
+
+	  charset = (char *) alloca (len + 1);
+# if defined _LIBC || HAVE_MEMPCPY
+	  *((char *) mempcpy (charset, charsetstr, len)) = '\0';
+# else
+	  memcpy (charset, charsetstr, len);
+	  charset[len] = '\0';
+# endif
+
+	  /* The output charset should normally be determined by the
+	     locale.  But sometimes the locale is not used or not correctly
+	     set up, so we provide a possibility for the user to override
+	     this.  Moreover, the value specified through
+	     bind_textdomain_codeset overrides both.  */
+	  if (domainbinding != NULL && domainbinding->codeset != NULL)
+	    outcharset = domainbinding->codeset;
+	  else
+	    {
+	      outcharset = getenv ("OUTPUT_CHARSET");
+	      if (outcharset == NULL || outcharset[0] == '\0')
+		{
+# ifdef _LIBC
+		  outcharset = (*_nl_current[LC_CTYPE])->values[_NL_ITEM_INDEX (CODESET)].string;
+# else
+#  if HAVE_ICONV
+		  extern const char *locale_charset (void);
+		  outcharset = locale_charset ();
+#  endif
+# endif
+		}
+	    }
+
+# ifdef _LIBC
+	  /* We always want to use transliteration.  */
+	  outcharset = norm_add_slashes (outcharset, "TRANSLIT");
+	  charset = norm_add_slashes (charset, NULL);
+	  if (__gconv_open (outcharset, charset, &domain->conv,
+			    GCONV_AVOID_NOCONV)
+	      != __GCONV_OK)
+	    domain->conv = (__gconv_t) -1;
+# else
+#  if HAVE_ICONV
+	  /* When using GNU libiconv, we want to use transliteration.  */
+#   if _LIBICONV_VERSION >= 0x0105
+	  len = strlen (outcharset);
+	  {
+	    char *tmp = (char *) alloca (len + 10 + 1);
+	    memcpy (tmp, outcharset, len);
+	    memcpy (tmp + len, "//TRANSLIT", 10 + 1);
+	    outcharset = tmp;
+	  }
+#   endif
+	  domain->conv = iconv_open (outcharset, charset);
+#   if _LIBICONV_VERSION >= 0x0105
+	  freea (outcharset);
+#   endif
+#  endif
+# endif
+
+	  freea (charset);
+	}
+#endif /* _LIBC || HAVE_ICONV */
+    }
+
+  return nullentry;
+}
+
+/* Frees the codeset dependent parts of an opened message catalog.  */
+void
+internal_function
+_nl_free_domain_conv (domain)
+     struct loaded_domain *domain;
+{
+  if (domain->conv_tab != NULL && domain->conv_tab != (char **) -1)
+    free (domain->conv_tab);
+
+#ifdef _LIBC
+  if (domain->conv != (__gconv_t) -1)
+    __gconv_close (domain->conv);
+#else
+# if HAVE_ICONV
+  if (domain->conv != (iconv_t) -1)
+    iconv_close (domain->conv);
+# endif
+#endif
+}
 
 /* Load the message catalogs specified by FILENAME.  If it is no valid
    message catalog do nothing.  */
 void
 internal_function
-_nl_load_domain (domain_file)
+_nl_load_domain (domain_file, domainbinding)
      struct loaded_l10nfile *domain_file;
+     struct binding *domainbinding;
 {
   int fd;
   size_t size;
+#ifdef _LIBC
+  struct stat64 st;
+#else
   struct stat st;
+#endif
   struct mo_file_header *data = (struct mo_file_header *) -1;
-#if (defined HAVE_MMAP && defined HAVE_MUNMAP && !defined DISALLOW_MMAP) \
-    || defined _LIBC
   int use_mmap = 0;
-#endif
   struct loaded_domain *domain;
+  const char *nullentry;
 
   domain_file->decided = 1;
   domain_file->data = NULL;
 
+  /* Note that it would be useless to store domainbinding in domain_file
+     because domainbinding might be == NULL now but != NULL later (after
+     a call to bind_textdomain_codeset).  */
+
   /* If the record does not represent a valid locale the FILENAME
      might be NULL.  This can happen when according to the given
      specification the locale file name is different for XPG and CEN
@@ -85,28 +367,32 @@ _nl_load_domain (domain_file)
     return;
 
   /* Try to open the addressed file.  */
-  fd = open (domain_file->filename, O_RDONLY);
+  fd = open (domain_file->filename, O_RDONLY | O_BINARY);
   if (fd == -1)
     return;
 
   /* We must know about the size of the file.  */
-  if (fstat (fd, &st) != 0
-      || (size = (size_t) st.st_size) != st.st_size
-      || size < sizeof (struct mo_file_header))
+  if (
+#ifdef _LIBC
+      __builtin_expect (fstat64 (fd, &st) != 0, 0)
+#else
+      __builtin_expect (fstat (fd, &st) != 0, 0)
+#endif
+      || __builtin_expect ((size = (size_t) st.st_size) != st.st_size, 0)
+      || __builtin_expect (size < sizeof (struct mo_file_header), 0))
     {
       /* Something went wrong.  */
       close (fd);
       return;
     }
 
-#if (defined HAVE_MMAP && defined HAVE_MUNMAP && !defined DISALLOW_MMAP) \
-    || defined _LIBC
+#ifdef HAVE_MMAP
   /* Now we are ready to load the file.  If mmap() is available we try
      this first.  If not available or it failed we try to load it.  */
   data = (struct mo_file_header *) mmap (NULL, size, PROT_READ,
 					 MAP_PRIVATE, fd, 0);
 
-  if (data != (struct mo_file_header *) -1)
+  if (__builtin_expect (data != (struct mo_file_header *) -1, 1))
     {
       /* mmap() call was successful.  */
       close (fd);
@@ -130,12 +416,15 @@ _nl_load_domain (domain_file)
       do
 	{
 	  long int nb = (long int) read (fd, read_ptr, to_read);
-	  if (nb == -1)
+	  if (nb <= 0)
 	    {
+#ifdef EINTR
+	      if (nb == -1 && errno == EINTR)
+		continue;
+#endif
 	      close (fd);
 	      return;
 	    }
-
 	  read_ptr += nb;
 	  to_read -= nb;
 	}
@@ -146,11 +435,11 @@ _nl_load_domain (domain_file)
 
   /* Using the magic number we can test whether it really is a message
      catalog file.  */
-  if (data->magic != _MAGIC && data->magic != _MAGIC_SWAPPED)
+  if (__builtin_expect (data->magic != _MAGIC && data->magic != _MAGIC_SWAPPED,
+			0))
     {
       /* The magic number is wrong: not a message catalog file.  */
-#if (defined HAVE_MMAP && defined HAVE_MUNMAP && !defined DISALLOW_MMAP) \
-    || defined _LIBC
+#ifdef HAVE_MMAP
       if (use_mmap)
 	munmap ((caddr_t) data, size);
       else
@@ -159,17 +448,13 @@ _nl_load_domain (domain_file)
       return;
     }
 
-  domain_file->data
-    = (struct loaded_domain *) malloc (sizeof (struct loaded_domain));
-  if (domain_file->data == NULL)
+  domain = (struct loaded_domain *) malloc (sizeof (struct loaded_domain));
+  if (domain == NULL)
     return;
+  domain_file->data = domain;
 
-  domain = (struct loaded_domain *) domain_file->data;
   domain->data = (char *) data;
-#if (defined HAVE_MMAP && defined HAVE_MUNMAP && !defined DISALLOW_MMAP) \
-    || defined _LIBC
   domain->use_mmap = use_mmap;
-#endif
   domain->mmap_size = size;
   domain->must_swap = data->magic != _MAGIC;
 
@@ -187,9 +472,8 @@ _nl_load_domain (domain_file)
 	((char *) data + W (domain->must_swap, data->hash_tab_offset));
       break;
     default:
-      /* This is an illegal revision.  */
-#if (defined HAVE_MMAP && defined HAVE_MUNMAP && !defined DISALLOW_MMAP) \
-    || defined _LIBC
+      /* This is an invalid revision.  */
+#ifdef HAVE_MMAP
       if (use_mmap)
 	munmap ((caddr_t) data, size);
       else
@@ -200,9 +484,62 @@ _nl_load_domain (domain_file)
       return;
     }
 
-  /* Show that one domain is changed.  This might make some cached
-     translations invalid.  */
-  ++_nl_msg_cat_cntr;
+  /* Now initialize the character set converter from the character set
+     the file is encoded with (found in the header entry) to the domain's
+     specified character set or the locale's character set.  */
+  nullentry = _nl_init_domain_conv (domain_file, domain, domainbinding);
+
+  /* Also look for a plural specification.  */
+  if (nullentry != NULL)
+    {
+      const char *plural;
+      const char *nplurals;
+
+      plural = strstr (nullentry, "plural=");
+      nplurals = strstr (nullentry, "nplurals=");
+      if (plural == NULL || nplurals == NULL)
+	goto no_plural;
+      else
+	{
+	  /* First get the number.  */
+	  char *endp;
+	  unsigned long int n;
+	  struct parse_args args;
+
+	  nplurals += 9;
+	  while (*nplurals != '\0' && isspace (*nplurals))
+	    ++nplurals;
+#if defined HAVE_STRTOUL || defined _LIBC
+	  n = strtoul (nplurals, &endp, 10);
+#else
+	  for (endp = nplurals, n = 0; *endp >= '0' && *endp <= '9'; endp++)
+	    n = n * 10 + (*endp - '0');
+#endif
+	  domain->nplurals = n;
+	  if (nplurals == endp)
+	    goto no_plural;
+
+	  /* Due to the restrictions bison imposes onto the interface of the
+	     scanner function we have to put the input string and the result
+	     passed up from the parser into the same structure which address
+	     is passed down to the parser.  */
+	  plural += 7;
+	  args.cp = plural;
+	  if (PLURAL_PARSE (&args) != 0)
+	    goto no_plural;
+	  domain->plural = args.res;
+	}
+    }
+  else
+    {
+      /* By default we are using the Germanic form: singular form only
+         for `one', the plural form otherwise.  Yes, this is also what
+         English is using since English is a Germanic language.  */
+    no_plural:
+      INIT_GERMANIC_PLURAL ();
+      domain->plural = &germanic_plural;
+      domain->nplurals = 2;
+    }
 }
 
 
@@ -212,9 +549,16 @@ internal_function
 _nl_unload_domain (domain)
      struct loaded_domain *domain;
 {
+  if (domain->plural != &germanic_plural)
+    __gettext_free_exp (domain->plural);
+
+  _nl_free_domain_conv (domain);
+
+# ifdef _POSIX_MAPPED_FILES
   if (domain->use_mmap)
     munmap ((caddr_t) domain->data, domain->mmap_size);
   else
+# endif	/* _POSIX_MAPPED_FILES */
     free ((void *) domain->data);
 
   free (domain);
diff --git a/intl/localealias.c b/intl/localealias.c
index bca555a..76f19a9 100644
--- a/intl/localealias.c
+++ b/intl/localealias.c
@@ -1,6 +1,5 @@
 /* Handle aliases for locale names.
-   Copyright (C) 1995, 1996, 1997, 1998 Free Software Foundation, Inc.
-   Written by Ulrich Drepper <drepper@gnu.ai.mit.edu>, 1995.
+   Copyright (C) 1995-1999, 2000, 2001 Free Software Foundation, Inc.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -16,6 +15,13 @@
    along with this program; if not, write to the Free Software Foundation,
    Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
 
+/* Tell glibc's <string.h> to provide a prototype for mempcpy().
+   This must come before <config.h> because <config.h> may include
+   <features.h>, and once <features.h> has been included, it's too late.  */
+#ifndef _GNU_SOURCE
+# define _GNU_SOURCE    1
+#endif
+
 #ifdef HAVE_CONFIG_H
 # include <config.h>
 #endif
@@ -41,35 +47,15 @@ char *alloca ();
 # endif
 #endif
 
-#if defined STDC_HEADERS || defined _LIBC
-# include <stdlib.h>
-#else
-char *getenv ();
-# ifdef HAVE_MALLOC_H
-#  include <malloc.h>
-# else
-void free ();
-# endif
-#endif
+#include <stdlib.h>
 
-#if defined HAVE_STRING_H || defined _LIBC
-# ifndef _GNU_SOURCE
-#  define _GNU_SOURCE	1
-# endif
-# include <string.h>
-#else
-# include <strings.h>
-# ifndef memcpy
-#  define memcpy(Dst, Src, Num) bcopy (Src, Dst, Num)
-# endif
-#endif
+#include <string.h>
 #if !HAVE_STRCHR && !defined _LIBC
 # ifndef strchr
 #  define strchr index
 # endif
 #endif
 
-#include "gettext.h"
 #include "gettextP.h"
 
 /* @@ end of prolog @@ */
@@ -80,7 +66,9 @@ void free ();
    file and the name space must not be polluted.  */
 # define strcasecmp __strcasecmp
 
-# define mempcpy __mempcpy
+# ifndef mempcpy
+#  define mempcpy __mempcpy
+# endif
 # define HAVE_MEMPCPY	1
 
 /* We need locking here since we can be called from different places.  */
@@ -89,41 +77,27 @@ void free ();
 __libc_lock_define_initialized (static, lock);
 #endif
 
+#ifndef internal_function
+# define internal_function
+#endif
 
-/* For those loosing systems which don't have `alloca' we have to add
+/* For those losing systems which don't have `alloca' we have to add
    some additional code emulating it.  */
 #ifdef HAVE_ALLOCA
-/* Nothing has to be done.  */
-# define ADD_BLOCK(list, address) /* nothing */
-# define FREE_BLOCKS(list) /* nothing */
+# define freea(p) /* nothing */
 #else
-struct block_list
-{
-  void *address;
-  struct block_list *next;
-};
-# define ADD_BLOCK(list, addr)						      \
-  do {									      \
-    struct block_list *newp = (struct block_list *) malloc (sizeof (*newp));  \
-    /* If we cannot get a free block we cannot add the new element to	      \
-       the list.  */							      \
-    if (newp != NULL) {							      \
-      newp->address = (addr);						      \
-      newp->next = (list);						      \
-      (list) = newp;							      \
-    }									      \
-  } while (0)
-# define FREE_BLOCKS(list)						      \
-  do {									      \
-    while (list != NULL) {						      \
-      struct block_list *old = list;					      \
-      list = list->next;						      \
-      free (old);							      \
-    }									      \
-  } while (0)
-# undef alloca
-# define alloca(size) (malloc (size))
-#endif	/* have alloca */
+# define alloca(n) malloc (n)
+# define freea(p) free (p)
+#endif
+
+#if defined _LIBC_REENTRANT || defined HAVE_FGETS_UNLOCKED
+# undef fgets
+# define fgets(buf, len, s) fgets_unlocked (buf, len, s)
+#endif
+#if defined _LIBC_REENTRANT || defined HAVE_FEOF_UNLOCKED
+# undef feof
+# define feof(s) feof_unlocked (s)
+#endif
 
 
 struct alias_map
@@ -133,18 +107,18 @@ struct alias_map
 };
 
 
-static char *string_space = NULL;
-static size_t string_space_act = 0;
-static size_t string_space_max = 0;
+static char *string_space;
+static size_t string_space_act;
+static size_t string_space_max;
 static struct alias_map *map;
-static size_t nmap = 0;
-static size_t maxmap = 0;
+static size_t nmap;
+static size_t maxmap;
 
 
 /* Prototypes for local functions.  */
 static size_t read_alias_file PARAMS ((const char *fname, int fname_len))
      internal_function;
-static void extend_alias_table PARAMS ((void));
+static int extend_alias_table PARAMS ((void));
 static int alias_compare PARAMS ((const struct alias_map *map1,
 				  const struct alias_map *map2));
 
@@ -190,11 +164,12 @@ _nl_expand_alias (name)
 	{
 	  const char *start;
 
-	  while (locale_alias_path[0] == ':')
+	  while (locale_alias_path[0] == PATH_SEPARATOR)
 	    ++locale_alias_path;
 	  start = locale_alias_path;
 
-	  while (locale_alias_path[0] != '\0' && locale_alias_path[0] != ':')
+	  while (locale_alias_path[0] != '\0'
+		 && locale_alias_path[0] != PATH_SEPARATOR)
 	    ++locale_alias_path;
 
 	  if (start < locale_alias_path)
@@ -217,16 +192,12 @@ read_alias_file (fname, fname_len)
      const char *fname;
      int fname_len;
 {
-#ifndef HAVE_ALLOCA
-  struct block_list *block_list = NULL;
-#endif
   FILE *fp;
   char *full_fname;
   size_t added;
   static const char aliasfile[] = "/locale.alias";
 
   full_fname = (char *) alloca (fname_len + sizeof aliasfile);
-  ADD_BLOCK (block_list, full_fname);
 #ifdef HAVE_MEMPCPY
   mempcpy (mempcpy (full_fname, fname, fname_len),
 	   aliasfile, sizeof aliasfile);
@@ -236,11 +207,9 @@ read_alias_file (fname, fname_len)
 #endif
 
   fp = fopen (full_fname, "r");
+  freea (full_fname);
   if (fp == NULL)
-    {
-      FREE_BLOCKS (block_list);
-      return 0;
-    }
+    return 0;
 
   added = 0;
   while (!feof (fp))
@@ -250,10 +219,10 @@ read_alias_file (fname, fname_len)
 	 b) these fields must be usable as file names and so must not
 	    be that long
        */
-      unsigned char buf[BUFSIZ];
-      unsigned char *alias;
-      unsigned char *value;
-      unsigned char *cp;
+      char buf[BUFSIZ];
+      char *alias;
+      char *value;
+      char *cp;
 
       if (fgets (buf, sizeof buf, fp) == NULL)
 	/* EOF reached.  */
@@ -312,7 +281,8 @@ read_alias_file (fname, fname_len)
 		*cp++ = '\0';
 
 	      if (nmap >= maxmap)
-		extend_alias_table ();
+		if (__builtin_expect (extend_alias_table (), 0))
+		  return added;
 
 	      alias_len = strlen (alias) + 1;
 	      value_len = strlen (value) + 1;
@@ -325,10 +295,19 @@ read_alias_file (fname, fname_len)
 					? alias_len + value_len : 1024));
 		  char *new_pool = (char *) realloc (string_space, new_size);
 		  if (new_pool == NULL)
+		    return added;
+
+		  if (__builtin_expect (string_space != new_pool, 0))
 		    {
-		      FREE_BLOCKS (block_list);
-		      return added;
+		      size_t i;
+
+		      for (i = 0; i < nmap; i++)
+			{
+			  map[i].alias += new_pool - string_space;
+			  map[i].value += new_pool - string_space;
+			}
 		    }
+
 		  string_space = new_pool;
 		  string_space_max = new_size;
 		}
@@ -355,12 +334,11 @@ read_alias_file (fname, fname_len)
     qsort (map, nmap, sizeof (struct alias_map),
 	   (int (*) PARAMS ((const void *, const void *))) alias_compare);
 
-  FREE_BLOCKS (block_list);
   return added;
 }
 
 
-static void
+static int
 extend_alias_table ()
 {
   size_t new_size;
@@ -371,10 +349,11 @@ extend_alias_table ()
 						* sizeof (struct alias_map)));
   if (new_map == NULL)
     /* Simply don't extend: we don't have any more core.  */
-    return;
+    return -1;
 
   map = new_map;
   maxmap = new_size;
+  return 0;
 }
 
 
diff --git a/intl/po2tbl.sed.in b/intl/po2tbl.sed.in
deleted file mode 100644
index b3bcca4..0000000
--- a/intl/po2tbl.sed.in
+++ /dev/null
@@ -1,102 +0,0 @@
-# po2tbl.sed - Convert Uniforum style .po file to lookup table for catgets
-# Copyright (C) 1995 Free Software Foundation, Inc.
-# Ulrich Drepper <drepper@gnu.ai.mit.edu>, 1995.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-#
-1 {
-  i\
-/* Automatically generated by po2tbl.sed from @PACKAGE NAME@.pot.  */\
-\
-#if HAVE_CONFIG_H\
-# include <config.h>\
-#endif\
-\
-#include "libgettext.h"\
-\
-const struct _msg_ent _msg_tbl[] = {
-  h
-  s/.*/0/
-  x
-}
-#
-# Write msgid entries in C array form.
-#
-/^msgid/ {
-  s/msgid[ 	]*\(".*"\)/  {\1/
-  tb
-# Append the next line
-  :b
-  N
-# Look whether second part is continuation line.
-  s/\(.*\)"\(\n\)"\(.*"\)/\1\2\3/
-# Yes, then branch.
-  ta
-# Because we assume that the input file correctly formed the line
-# just read cannot be again be a msgid line.  So it's safe to ignore
-# it.
-  s/\(.*\)\n.*/\1/
-  bc
-# We found a continuation line.  But before printing insert '\'.
-  :a
-  s/\(.*\)\(\n.*\)/\1\\\2/
-  P
-# We cannot use D here.
-  s/.*\n\(.*\)/\1/
-# Some buggy seds do not clear the `successful substitution since last ``t'''
-# flag on `N', so we do a `t' here to clear it.
-  tb
-# Not reached
-  :c
-  x
-# The following nice solution is by
-# Bruno <Haible@ma2s2.mathematik.uni-karlsruhe.de>
-  td
-# Increment a decimal number in pattern space.
-# First hide trailing `9' digits.
-  :d
-  s/9\(_*\)$/_\1/
-  td
-# Assure at least one digit is available.
-  s/^\(_*\)$/0\1/
-# Increment the last digit.
-  s/8\(_*\)$/9\1/
-  s/7\(_*\)$/8\1/
-  s/6\(_*\)$/7\1/
-  s/5\(_*\)$/6\1/
-  s/4\(_*\)$/5\1/
-  s/3\(_*\)$/4\1/
-  s/2\(_*\)$/3\1/
-  s/1\(_*\)$/2\1/
-  s/0\(_*\)$/1\1/
-# Convert the hidden `9' digits to `0's.
-  s/_/0/g
-  x
-  G
-  s/\(.*\)\n\([0-9]*\)/\1, \2},/
-  s/\(.*\)"$/\1/
-  p
-}
-#
-# Last line.
-#
-$ {
-  i\
-};\
-
-  g
-  s/0*\(.*\)/int _msg_tbl_length = \1;/p
-}
-d
diff --git a/intl/textdomain.c b/intl/textdomain.c
index 8855746..05c2fd7 100644
--- a/intl/textdomain.c
+++ b/intl/textdomain.c
@@ -1,6 +1,5 @@
 /* Implementation of the textdomain(3) function.
-   Copyright (C) 1995, 1996, 1997, 1998 Free Software Foundation, Inc.
-   Written by Ulrich Drepper <drepper@gnu.ai.mit.edu>, 1995.
+   Copyright (C) 1995-1998, 2000, 2001 Free Software Foundation, Inc.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -20,23 +19,32 @@
 # include <config.h>
 #endif
 
-#if defined STDC_HEADERS || defined _LIBC
-# include <stdlib.h>
-#endif
+#include <stdlib.h>
+#include <string.h>
 
-#if defined STDC_HEADERS || defined HAVE_STRING_H || defined _LIBC
-# include <string.h>
+#ifdef _LIBC
+# include <libintl.h>
 #else
-# include <strings.h>
-# ifndef memcpy
-#  define memcpy(Dst, Src, Num) bcopy (Src, Dst, Num)
-# endif
+# include "libgnuintl.h"
 #endif
+#include "gettextP.h"
 
 #ifdef _LIBC
-# include <libintl.h>
+/* We have to handle multi-threaded applications.  */
+# include <bits/libc-lock.h>
 #else
-# include "libgettext.h"
+/* Provide dummy implementation if this is outside glibc.  */
+# define __libc_rwlock_define(CLASS, NAME)
+# define __libc_rwlock_wrlock(NAME)
+# define __libc_rwlock_unlock(NAME)
+#endif
+
+/* The internal variables in the standalone libintl.a must have different
+   names than the internal variables in GNU libc, otherwise programs
+   using libintl.a cannot be linked statically.  */
+#if !defined _LIBC
+# define _nl_default_default_domain _nl_default_default_domain__
+# define _nl_current_default_domain _nl_current_default_domain__
 #endif
 
 /* @@ end of prolog @@ */
@@ -61,6 +69,9 @@ extern const char *_nl_current_default_domain;
 # define TEXTDOMAIN textdomain__
 #endif
 
+/* Lock variable to protect the global data in the gettext implementation.  */
+__libc_rwlock_define (extern, _nl_state_lock)
+
 /* Set the current default message catalog to DOMAINNAME.
    If DOMAINNAME is null, return the current default.
    If DOMAINNAME is "", reset to the default of "messages".  */
@@ -68,38 +79,60 @@ char *
 TEXTDOMAIN (domainname)
      const char *domainname;
 {
-  char *old;
+  char *new_domain;
+  char *old_domain;
 
   /* A NULL pointer requests the current setting.  */
   if (domainname == NULL)
     return (char *) _nl_current_default_domain;
 
-  old = (char *) _nl_current_default_domain;
+  __libc_rwlock_wrlock (_nl_state_lock);
+
+  old_domain = (char *) _nl_current_default_domain;
 
   /* If domain name is the null string set to default domain "messages".  */
   if (domainname[0] == '\0'
       || strcmp (domainname, _nl_default_default_domain) == 0)
-    _nl_current_default_domain = _nl_default_default_domain;
+    {
+      _nl_current_default_domain = _nl_default_default_domain;
+      new_domain = (char *) _nl_current_default_domain;
+    }
+  else if (strcmp (domainname, old_domain) == 0)
+    /* This can happen and people will use it to signal that some
+       environment variable changed.  */
+    new_domain = old_domain;
   else
     {
       /* If the following malloc fails `_nl_current_default_domain'
 	 will be NULL.  This value will be returned and so signals we
 	 are out of core.  */
 #if defined _LIBC || defined HAVE_STRDUP
-      _nl_current_default_domain = strdup (domainname);
+      new_domain = strdup (domainname);
 #else
       size_t len = strlen (domainname) + 1;
-      char *cp = (char *) malloc (len);
-      if (cp != NULL)
-	memcpy (cp, domainname, len);
-      _nl_current_default_domain = cp;
+      new_domain = (char *) malloc (len);
+      if (new_domain != NULL)
+	memcpy (new_domain, domainname, len);
 #endif
+
+      if (new_domain != NULL)
+	_nl_current_default_domain = new_domain;
+    }
+
+  /* We use this possibility to signal a change of the loaded catalogs
+     since this is most likely the case and there is no other easy we
+     to do it.  Do it only when the call was successful.  */
+  if (new_domain != NULL)
+    {
+      ++_nl_msg_cat_cntr;
+
+      if (old_domain != new_domain && old_domain != _nl_default_default_domain)
+	free (old_domain);
     }
 
-  if (old != _nl_default_default_domain)
-    free (old);
+  __libc_rwlock_unlock (_nl_state_lock);
 
-  return (char *) _nl_current_default_domain;
+  return new_domain;
 }
 
 #ifdef _LIBC
diff --git a/intl/xopen-msg.sed b/intl/xopen-msg.sed
deleted file mode 100644
index b19c0bb..0000000
--- a/intl/xopen-msg.sed
+++ /dev/null
@@ -1,104 +0,0 @@
-# po2msg.sed - Convert Uniforum style .po file to X/Open style .msg file
-# Copyright (C) 1995 Free Software Foundation, Inc.
-# Ulrich Drepper <drepper@gnu.ai.mit.edu>, 1995.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-#
-#
-# The first directive in the .msg should be the definition of the
-# message set number.  We use always set number 1.
-#
-1 {
-  i\
-$set 1 # Automatically created by po2msg.sed
-  h
-  s/.*/0/
-  x
-}
-#
-# We copy all comments into the .msg file.  Perhaps they can help.
-#
-/^#/ s/^#[ 	]*/$ /p
-#
-# We copy the original message as a comment into the .msg file.
-#
-/^msgid/ {
-# Does not work now
-#  /"$/! {
-#    s/\\$//
-#    s/$/ ... (more lines following)"/
-#  }
-  s/^msgid[ 	]*"\(.*\)"$/$ Original Message: \1/
-  p
-}
-#
-# The .msg file contains, other then the .po file, only the translations
-# but each given a unique ID.  Starting from 1 and incrementing by 1 for
-# each message we assign them to the messages.
-# It is important that the .po file used to generate the cat-id-tbl.c file
-# (with po-to-tbl) is the same as the one used here.  (At least the order
-# of declarations must not be changed.)
-#
-/^msgstr/ {
-  s/msgstr[ 	]*"\(.*\)"/\1/
-  x
-# The following nice solution is by
-# Bruno <Haible@ma2s2.mathematik.uni-karlsruhe.de>
-  td
-# Increment a decimal number in pattern space.
-# First hide trailing `9' digits.
-  :d
-  s/9\(_*\)$/_\1/
-  td
-# Assure at least one digit is available.
-  s/^\(_*\)$/0\1/
-# Increment the last digit.
-  s/8\(_*\)$/9\1/
-  s/7\(_*\)$/8\1/
-  s/6\(_*\)$/7\1/
-  s/5\(_*\)$/6\1/
-  s/4\(_*\)$/5\1/
-  s/3\(_*\)$/4\1/
-  s/2\(_*\)$/3\1/
-  s/1\(_*\)$/2\1/
-  s/0\(_*\)$/1\1/
-# Convert the hidden `9' digits to `0's.
-  s/_/0/g
-  x
-# Bring the line in the format `<number> <message>'
-  G
-  s/^[^\n]*$/& /
-  s/\(.*\)\n\([0-9]*\)/\2 \1/
-# Clear flag from last substitution.
-  tb
-# Append the next line.
-  :b
-  N
-# Look whether second part is a continuation line.
-  s/\(.*\n\)"\(.*\)"/\1\2/
-# Yes, then branch.
-  ta
-  P
-  D
-# Note that `D' includes a jump to the start!!
-# We found a continuation line.  But before printing insert '\'.
-  :a
-  s/\(.*\)\(\n.*\)/\1\\\2/
-  P
-# We cannot use the sed command `D' here
-  s/.*\n\(.*\)/\1/
-  tb
-}
-d
-- 
Gitee


From b5e99f6446bc7c8efe5b3d737edc5b33e1a7f7c4 Mon Sep 17 00:00:00 2001
From: Jeff Johnson <n3npq@mac.com>
Date: Sat, 7 Jul 2001 19:15:17 +0000
Subject: [PATCH 313/667] - popthelp.c: don't use stpcpy to avoid portability
 grief (#47500). - permit alias/exec description/arg text to be set from popt
 config. - use rpmqv.c, not rpm.c, as rpm's main() routine.

---
 configure.in |   2 -
 popt.c       | 185 ++++++++++++++++++++++++++++++++-------------------
 popt.h       |  36 +++++++++-
 poptconfig.c |  78 +++++++++++++---------
 popthelp.c   | 180 ++++++++++++++++++++++++++++++++++++++++++-------
 poptint.h    |  14 ++--
 6 files changed, 355 insertions(+), 140 deletions(-)

diff --git a/configure.in b/configure.in
index 02f54eb..bb7fbfd 100755
--- a/configure.in
+++ b/configure.in
@@ -72,8 +72,6 @@ then
 fi
 
 AC_CHECK_FUNCS(strerror mtrace)
-dnl AC_CHECK_FUNCS(gettext)
-dnl AC_CHECK_FUNCS(dgettext)
 AC_CHECK_FUNC(setreuid, [], [
     AC_CHECK_LIB(ucb, setreuid, [if echo $LIBS | grep -- -lucb >/dev/null ;then :; else LIBS="$LIBS -lc -lucb" USEUCB=y;fi])
 ])
diff --git a/popt.c b/popt.c
index a5672c4..c4fa4ee 100644
--- a/popt.c
+++ b/popt.c
@@ -233,21 +233,24 @@ static int handleExec(/*@special@*/ poptContext con,
 		con->finalArgv, con->finalArgvAlloced, con->finalArgvCount @*/
 	/*@modifies con @*/
 {
+    poptItem item;
     int i;
 
     if (con->execs == NULL || con->numExecs <= 0) /* XXX can't happen */
 	return 0;
-    i = con->numExecs - 1;
-    if (longName) {
-	while (i >= 0 && (!con->execs[i].longName ||
-	    strcmp(con->execs[i].longName, longName))) i--;
-    } else {
-	while (i >= 0 &&
-	    con->execs[i].shortName != shortName) i--;
-    }
 
+    for (i = con->numExecs - 1; i >= 0; i--) {
+	item = con->execs + i;
+	if (longName && !(item->option.longName &&
+			!strcmp(longName, item->option.longName)))
+	    continue;
+	else if (shortName != item->option.shortName)
+	    continue;
+	break;
+    }
     if (i < 0) return 0;
 
+
     if (con->flags & POPT_CONTEXT_NO_EXEC)
 	return 1;
 
@@ -286,33 +289,34 @@ static int handleExec(/*@special@*/ poptContext con,
 static int handleAlias(/*@special@*/ poptContext con,
 		/*@null@*/ const char * longName, char shortName,
 		/*@keep@*/ /*@null@*/ const char * nextCharArg)
-	/*@uses con->aliases, con->numAliases, con->optionStack,
-		con->os, con->os->currAlias, con->os->currAlias->longName @*/
+	/*@uses con->aliases, con->numAliases, con->optionStack, con->os,
+		con->os->currAlias, con->os->currAlias->option.longName @*/
 	/*@modifies con @*/
 {
+    poptItem item = con->os->currAlias;
     int rc;
     int i;
 
-    if (con->os->currAlias && con->os->currAlias->longName && longName &&
-	/*@-nullpass@*/	/* LCL: con->os->currAlias->longName != NULL */
-	!strcmp(con->os->currAlias->longName, longName))
-	/*@=nullpass@*/
-	return 0;
-    if (con->os->currAlias && shortName &&
-	    shortName == con->os->currAlias->shortName)
-	return 0;
+    if (item) {
+	if (longName && (item->option.longName &&
+		!strcmp(longName, item->option.longName)))
+	    return 0;
+	if (shortName && shortName == item->option.shortName)
+	    return 0;
+    }
 
     if (con->aliases == NULL || con->numAliases <= 0) /* XXX can't happen */
 	return 0;
-    i = con->numAliases - 1;
-    if (longName) {
-	while (i >= 0 && (!con->aliases[i].longName ||
-	    strcmp(con->aliases[i].longName, longName))) i--;
-    } else {
-	while (i >= 0 &&
-	    con->aliases[i].shortName != shortName) i--;
-    }
 
+    for (i = con->numAliases - 1; i >= 0; i--) {
+	item = con->aliases + i;
+	if (longName && !(item->option.longName &&
+			!strcmp(longName, item->option.longName)))
+	    continue;
+	else if (shortName != item->option.shortName)
+	    continue;
+	break;
+    }
     if (i < 0) return 0;
 
     if ((con->os - con->optionStack + 1) == POPT_OPTION_DEPTH)
@@ -337,37 +341,34 @@ static int handleAlias(/*@special@*/ poptContext con,
 static int execCommand(poptContext con)
     /*@modifies fileSystem @*/
 {
+    poptItem item = con->doExec;
     const char ** argv;
     int argc = 0;
-    const char ** sargv;
-    int sargc = 0;
     int rc;
 
-    if (con->doExec == NULL || con->doExec->script == NULL) /*XXX can't happen*/
+    if (item == NULL) /*XXX can't happen*/
 	return POPT_ERROR_NOARG;
-    rc = poptParseArgvString(con->doExec->script, &sargc, &sargv);
-    if (rc) return rc;
 
-    if (sargv == NULL || sargc < 1 ||
-	(!con->execAbsolute && strchr(sargv[0], '/')))
+    if (item->argv == NULL || item->argc < 1 ||
+	(!con->execAbsolute && strchr(item->argv[0], '/')))
 	    return POPT_ERROR_NOARG;
 
     argv = malloc(sizeof(*argv) *
-			(6 + sargc + con->numLeftovers + con->finalArgvCount));
+			(6 + item->argc + con->numLeftovers + con->finalArgvCount));
     if (argv == NULL) return POPT_ERROR_MALLOC;	/* XXX can't happen */
 
-    if (!strchr(sargv[0], '/') && con->execPath) {
-	char *s = alloca(strlen(con->execPath) + strlen(sargv[0]) + sizeof("/"));
-	sprintf(s, "%s/%s", con->execPath, sargv[0]);
+    if (!strchr(item->argv[0], '/') && con->execPath) {
+	char *s = alloca(strlen(con->execPath) + strlen(item->argv[0]) + sizeof("/"));
+	sprintf(s, "%s/%s", con->execPath, item->argv[0]);
 	argv[argc] = s;
     } else {
-	argv[argc] = findProgramPath(sargv[0]);
+	argv[argc] = findProgramPath(item->argv[0]);
     }
     if (argv[argc++] == NULL) return POPT_ERROR_NOARG;
 
-    if (sargc > 1) {
-	memcpy(argv + argc, sargv + 1, sizeof(*argv) * (sargc - 1));
-	argc += (sargc - 1);
+    if (item->argc > 1) {
+	memcpy(argv + argc, item->argv + 1, sizeof(*argv) * (item->argc - 1));
+	argc += (item->argc - 1);
     }
 
     if (con->finalArgv != NULL && con->finalArgvCount > 0) {
@@ -387,7 +388,8 @@ static int execCommand(poptContext con)
     argv[argc] = NULL;
 
 #ifdef __hpux
-    (void) setresuid(getuid(), getuid(),-1);
+    rc = setresuid(getuid(), getuid(),-1);
+    if (rc) return POPT_ERROR_ERRNO;
 #else
 /*
  * XXX " ... on BSD systems setuid() should be preferred over setreuid()"
@@ -395,9 +397,11 @@ static int execCommand(poptContext con)
  * XXX	from Norbert Warmuth <nwarmuth@privat.circular.de>
  */
 #if defined(HAVE_SETUID)
-    (void) setuid(getuid());
+    rc = setuid(getuid());
+    if (rc) return POPT_ERROR_ERRNO;
 #elif defined (HAVE_SETREUID)
-    (void) setreuid(getuid(), getuid()); /*hlauer: not portable to hpux9.01 */
+    rc = setreuid(getuid(), getuid()); /*hlauer: not portable to hpux9.01 */
+    if (rc) return POPT_ERROR_ERRNO;
 #else
     ; /* Can't drop privileges */
 #endif
@@ -414,7 +418,7 @@ static int execCommand(poptContext con)
     }
 #endif
 
-    (void) execvp(argv[0], (char *const *)argv);
+    rc = execvp(argv[0], (char *const *)argv);
     return POPT_ERROR_ERRNO;
 }
 
@@ -975,6 +979,7 @@ const char ** poptGetArgs(poptContext con)
 
 poptContext poptFreeContext(poptContext con)
 {
+    poptItem item;
     int i;
 
     if (con == NULL) return con;
@@ -983,21 +988,31 @@ poptContext poptFreeContext(poptContext con)
 
     if (con->aliases != NULL)
     for (i = 0; i < con->numAliases; i++) {
-	con->aliases[i].longName = _free(con->aliases[i].longName);
-	con->aliases[i].argv = _free(con->aliases[i].argv);
+	item = con->aliases + i;
+	/*@-modobserver -observertrans -dependenttrans@*/
+	item->option.longName = _free(item->option.longName);
+	item->option.descrip = _free(item->option.descrip);
+	item->option.argDescrip = _free(item->option.argDescrip);
+	/*@=modobserver =observertrans =dependenttrans@*/
+	item->argv = _free(item->argv);
     }
+    con->aliases = _free(con->aliases);
 
     if (con->execs != NULL)
     for (i = 0; i < con->numExecs; i++) {
-	con->execs[i].longName = _free(con->execs[i].longName);
-	con->execs[i].script = _free(con->execs[i].script);
+	item = con->execs + i;
+	/*@-modobserver -observertrans -dependenttrans@*/
+	item->option.longName = _free(item->option.longName);
+	item->option.descrip = _free(item->option.descrip);
+	item->option.argDescrip = _free(item->option.argDescrip);
+	/*@=modobserver =observertrans =dependenttrans@*/
+	item->argv = _free(item->argv);
     }
     con->execs = _free(con->execs);
 
     con->leftovers = _free(con->leftovers);
     con->finalArgv = _free(con->finalArgv);
     con->appName = _free(con->appName);
-    con->aliases = _free(con->aliases);
     con->otherHelp = _free(con->otherHelp);
     con->execPath = _free(con->execPath);
     con->arg_strip = PBM_FREE(con->arg_strip);
@@ -1009,28 +1024,60 @@ poptContext poptFreeContext(poptContext con)
 int poptAddAlias(poptContext con, struct poptAlias newAlias,
 		/*@unused@*/ int flags)
 {
-    int aliasNum = con->numAliases++;
+    poptItem item = alloca(sizeof(*item));
+    memset(item, 0, sizeof(*item));
+    item->option.longName = newAlias.longName;
+    item->option.shortName = newAlias.shortName;
+    item->option.argInfo = POPT_ARGFLAG_DOC_HIDDEN;
+    item->option.arg = 0;
+    item->option.val = 0;
+    item->option.descrip = NULL;
+    item->option.argDescrip = NULL;
+    item->argc = newAlias.argc;
+    item->argv = newAlias.argv;
+    return poptAddItem(con, item, 0);
+}
 
-    /* SunOS won't realloc(NULL, ...) */
-    if (con->aliases == NULL)
-	con->aliases = malloc(con->numAliases * sizeof(newAlias));
-    else
-	con->aliases = realloc(con->aliases,
-			       con->numAliases * sizeof(newAlias));
-
-    if (con->aliases) {
-	struct poptAlias * alias = con->aliases + aliasNum;
-
-	alias->longName = (newAlias.longName)
-	    /*@-nullpass@*/		/* FIX: malloc can return NULL. */
-	    ? strcpy(malloc(strlen(newAlias.longName) + 1), newAlias.longName)
-	    /*@=nullpass@*/
-	    : NULL;
-	alias->shortName = newAlias.shortName;
-	alias->argc = newAlias.argc;
-	alias->argv = newAlias.argv;
+int poptAddItem(poptContext con, poptItem newItem, int flags)
+{
+    poptItem * items, item;
+    int * nitems;
+
+    switch (flags) {
+    case 1:
+	items = &con->execs;
+	nitems = &con->numExecs;
+	break;
+    case 0:
+	items = &con->aliases;
+	nitems = &con->numAliases;
+	break;
+    default:
+	return 1;
+	/*@notreached@*/ break;
     }
 
+    *items = realloc((*items), ((*nitems) + 1) * sizeof(**items));
+    if ((*items) == NULL)
+	return 1;
+
+    item = (*items) + (*nitems);
+
+    item->option.longName =
+	(newItem->option.longName ? xstrdup(newItem->option.longName) : NULL);
+    item->option.shortName = newItem->option.shortName;
+    item->option.argInfo = newItem->option.argInfo;
+    item->option.arg = newItem->option.arg;
+    item->option.val = newItem->option.val;
+    item->option.descrip =
+	(newItem->option.descrip ? xstrdup(newItem->option.descrip) : NULL);
+    item->option.argDescrip =
+       (newItem->option.argDescrip ? xstrdup(newItem->option.argDescrip) : NULL);
+    item->argc = newItem->argc;
+    item->argv = newItem->argv;
+
+    (*nitems)++;
+
     return 0;
 }
 
diff --git a/popt.h b/popt.h
index a4c60e9..cf61498 100644
--- a/popt.h
+++ b/popt.h
@@ -126,6 +126,7 @@ struct poptOption {
 };
 
 /** \ingroup popt
+ * A popt alias argument for poptAddAlias().
  */
 struct poptAlias {
 /*@owned@*/ /*@null@*/ const char * longName;	/*!< may be NULL */
@@ -134,13 +135,34 @@ struct poptAlias {
 /*@owned@*/ const char ** argv;	/*!< must be free()able */
 };
 
+/** \ingroup popt
+ * A popt alias or exec argument for poptAddItem().
+ */
+typedef struct poptItem_s {
+    struct poptOption option;	/*!< alias/exec name(s) and description. */
+    int argc;			/*!< (alias) no. of args. */
+/*@owned@*/ const char ** argv;	/*!< (alias) args, must be free()able. */
+} * poptItem;
+
 /** \ingroup popt
  * \name Auto-generated help/usage
  */
 /*@{*/
+
+/**
+ * Empty table marker to enable displaying popt alias/exec options.
+ */
+extern struct poptOption poptAliasOptions[];
+#define POPT_AUTOALIAS { NULL, '\0', POPT_ARG_INCLUDE_TABLE, poptAliasOptions, \
+			0, "Options implemented via popt alias/exec:", NULL },
+
+/**
+ * Auto help table options.
+ */
 extern struct poptOption poptHelpOptions[];
 #define POPT_AUTOHELP { NULL, '\0', POPT_ARG_INCLUDE_TABLE, poptHelpOptions, \
 			0, "Help options:", NULL },
+
 #define POPT_TABLEEND { NULL, '\0', 0, 0, 0, NULL, NULL }
 /*@}*/
 
@@ -268,14 +290,26 @@ int poptStuffArgs(poptContext con, /*@keep@*/ const char ** argv)
 /** \ingroup popt
  * Add alias to context.
  * @todo Pass alias by reference, not value.
+ * @deprecated Use poptAddItem instead.
  * @param con		context
  * @param alias		alias to add
  * @param flags		(unused)
- * @return		0 always
+ * @return		0 on success
  */
+/*@unused@*/
 int poptAddAlias(poptContext con, struct poptAlias alias, int flags)
 	/*@modifies con @*/;
 
+/** \ingroup popt
+ * Add alias/exec item to context.
+ * @param con		context
+ * @param item		alias/exec item to add
+ * @param flags		0 for alias, 1 for exec
+ * @return		0 on success
+ */
+int poptAddItem(poptContext con, poptItem newItem, int flags)
+	/*@modifies con @*/;
+
 /** \ingroup popt
  * Read configuration file.
  * @param con		context
diff --git a/poptconfig.c b/poptconfig.c
index 8fddbcd..6aafde8 100644
--- a/poptconfig.c
+++ b/poptconfig.c
@@ -9,61 +9,73 @@
 #include "system.h"
 #include "poptint.h"
 
-/*@-mustmod@*/	/* LCL: *line is modified @*/
+/*@-compmempass@*/	/* FIX: item->option.longName kept, not dependent. */
 static void configLine(poptContext con, char * line)
-	/*@modifies *line, con->execs, con->numExecs @*/
+	/*@modifies con @*/
 {
     int nameLength = strlen(con->appName);
-    const char * opt;
-    struct poptAlias alias;
     const char * entryType;
-    const char * longName = NULL;
-    char shortName = '\0';
+    const char * opt;
+    poptItem item = alloca(sizeof(*item));
+    int i, j;
     
+    memset(item, 0, sizeof(*item));
+
     if (strncmp(line, con->appName, nameLength)) return;
     line += nameLength;
     if (*line == '\0' || !isspace(*line)) return;
+
     while (*line != '\0' && isspace(*line)) line++;
     entryType = line;
-
     while (*line == '\0' || !isspace(*line)) line++;
     *line++ = '\0';
+
     while (*line != '\0' && isspace(*line)) line++;
     if (*line == '\0') return;
     opt = line;
+    if (opt[0] == '-' && opt[1] == '-')
+	item->option.longName = opt + 2;
+    else if (opt[0] == '-' && !opt[2])
+	item->option.shortName = opt[1];
 
     while (*line == '\0' || !isspace(*line)) line++;
     *line++ = '\0';
     while (*line != '\0' && isspace(*line)) line++;
     if (*line == '\0') return;
-
-    if (opt[0] == '-' && opt[1] == '-')
-	longName = opt + 2;
-    else if (opt[0] == '-' && !opt[2])
-	shortName = opt[1];
-
-    if (!strcmp(entryType, "alias")) {
-	if (poptParseArgvString(line, &alias.argc, &alias.argv)) return;
-	alias.longName = longName, alias.shortName = shortName;
-	(void) poptAddAlias(con, alias, 0);
-    } else if (!strcmp(entryType, "exec")) {
-	con->execs = realloc(con->execs,
-				sizeof(*con->execs) * (con->numExecs + 1));
-	if (con->execs == NULL) return;	/* XXX can't happen */
-	if (longName)
-	    con->execs[con->numExecs].longName = xstrdup(longName);
-	else
-	    con->execs[con->numExecs].longName = NULL;
-
-	con->execs[con->numExecs].shortName = shortName;
-	con->execs[con->numExecs].script = xstrdup(line);
-	
-	/*@-noeffect@*/		/* LCL: broken? */
-	con->numExecs++;
-	/*@=noeffect@*/
+    if (poptParseArgvString(line, &item->argc, &item->argv)) return;
+
+    /*@-modobserver@*/
+    item->option.argInfo = POPT_ARGFLAG_DOC_HIDDEN;
+    for (i = 0, j = 0; i < item->argc; i++, j++) {
+	const char * f;
+	if (!strncmp(item->argv[i], "--POPTdesc=", sizeof("--POPTdesc=")-1)) {
+	    f = item->argv[i] + sizeof("--POPTdesc=");
+	    if (f[0] == '$' && f[1] == '"') f++;
+	    item->option.descrip = f;
+	    item->option.argInfo &= ~POPT_ARGFLAG_DOC_HIDDEN;
+	    j--;
+	} else
+	if (!strncmp(item->argv[i], "--POPTargs=", sizeof("--POPTargs=")-1)) {
+	    f = item->argv[i] + sizeof("--POPTargs=");
+	    if (f[0] == '$' && f[1] == '"') f++;
+	    item->option.argDescrip = f;
+	    item->option.argInfo &= ~POPT_ARGFLAG_DOC_HIDDEN;
+	    item->option.argInfo |= POPT_ARG_STRING;
+	    j--;
+	} else
+	if (j != i)
+	    item->argv[j] = item->argv[i];
     }
+    if (j != i)
+	item->argv[j] = NULL;
+    /*@=modobserver@*/
+	
+    if (!strcmp(entryType, "alias"))
+	(void) poptAddItem(con, item, 0);
+    else if (!strcmp(entryType, "exec"))
+	(void) poptAddItem(con, item, 1);
 }
-/*@=mustmod@*/
+/*@=compmempass@*/
 
 int poptReadConfigFile(poptContext con, const char * fn)
 {
diff --git a/popthelp.c b/popthelp.c
index b63a15e..d94b98e 100644
--- a/popthelp.c
+++ b/popthelp.c
@@ -11,6 +11,10 @@
 #include "system.h"
 #include "poptint.h"
 
+/**
+ * @param con		context
+ * @param key		option(s)
+ */
 static void displayArgs(poptContext con,
 		/*@unused@*/ enum poptCallbackReason foo,
 		struct poptOption * key, 
@@ -26,6 +30,17 @@ static void displayArgs(poptContext con,
 #ifdef	NOTYET
 static int show_option_defaults = 0;
 #endif
+
+/**
+ * Empty table marker to enable displaying popt alias/exec options.
+ */
+struct poptOption poptAliasOptions[] = {
+    POPT_TABLEEND
+};
+
+/**
+ * Auto help table options.
+ */
 /*@-castfcnptr@*/
 struct poptOption poptHelpOptions[] = {
   { NULL, '\0', POPT_ARG_CALLBACK, (void *)&displayArgs, '\0', NULL, NULL },
@@ -39,6 +54,9 @@ struct poptOption poptHelpOptions[] = {
 } ;
 /*@=castfcnptr@*/
 
+/**
+ * @param table		option(s)
+ */
 /*@observer@*/ /*@null@*/ static const char *const
 getTableTranslationDomain(/*@null@*/ const struct poptOption *table)
 	/*@*/
@@ -53,6 +71,10 @@ getTableTranslationDomain(/*@null@*/ const struct poptOption *table)
     return NULL;
 }
 
+/**
+ * @param opt		option(s)
+ * @param translation_domain	translation domain
+ */
 /*@observer@*/ /*@null@*/ static const char *const
 getArgDescrip(const struct poptOption * opt,
 		/*@-paramuse@*/		/* FIX: wazzup? */
@@ -79,7 +101,12 @@ getArgDescrip(const struct poptOption * opt,
     }
 }
 
-static /*@only@*/ /*@null@*/ char * singleOptionDefaultValue(int lineLength,
+/**
+ * @param opt		option(s)
+ * @param translation_domain	translation domain
+ */
+static /*@only@*/ /*@null@*/ char *
+singleOptionDefaultValue(int lineLength,
 		const struct poptOption * opt,
 		/*@-paramuse@*/	/* FIX: i18n macros disable with lclint */
 		/*@null@*/ const char * translation_domain)
@@ -93,7 +120,7 @@ static /*@only@*/ /*@null@*/ char * singleOptionDefaultValue(int lineLength,
     if (l == NULL) return NULL;	/* XXX can't happen */
     *le = '\0';
     *le++ = '(';
-    le = stpcpy(le, defstr);
+    strcpy(le, defstr);	le += strlen(le);
     *le++ = ':';
     *le++ = ' ';
     if (opt->arg)	/* XXX programmer error */
@@ -117,14 +144,15 @@ static /*@only@*/ /*@null@*/ char * singleOptionDefaultValue(int lineLength,
     }	break;
     case POPT_ARG_STRING:
     {	const char * s = *(const char **)opt->arg;
-	if (s == NULL)
-	    le = stpcpy(le, "null");
-	else {
+	if (s == NULL) {
+	    strcpy(le, "null");	le += strlen(le);
+	} else {
 	    size_t slen = 4*lineLength - (le - l) - sizeof("\"...\")");
 	    *le++ = '"';
-	    le = stpncpy(le, s, slen);
-	    if (slen < strlen(s))
-		le = stpcpy(le, "...");
+	    strncpy(le, s, slen); le[slen] = '\0'; le += strlen(le);	
+	    if (slen < strlen(s)) {
+		strcpy(le, "...");	le += strlen(le);
+	    }
 	    *le++ = '"';
 	}
     }	break;
@@ -140,6 +168,11 @@ static /*@only@*/ /*@null@*/ char * singleOptionDefaultValue(int lineLength,
     return l;
 }
 
+/**
+ * @param fp		output file handle
+ * @param opt		option(s)
+ * @param translation_domain	translation domain
+ */
 static void singleOptionHelp(FILE * fp, int maxLeftCol, 
 		const struct poptOption * opt,
 		/*@null@*/ const char * translation_domain)
@@ -189,8 +222,11 @@ static void singleOptionHelp(FILE * fp, int maxLeftCol,
 		if (t) {
 		    char * te = t;
 		    *te = '\0';
-		    if (help) te = stpcpy(te, help);
-		    (void) stpcpy( stpcpy( te, " "), defs);
+		    if (help) {
+			strcpy(te, help);	te += strlen(te);
+		    }
+		    *te++ = ' ';
+		    strcpy(te, defs);
 		    defs = _free(defs);
 		}
 		defs = t;
@@ -227,14 +263,14 @@ static void singleOptionHelp(FILE * fp, int maxLeftCol,
 	    case POPT_ARG_DOUBLE:
 	    case POPT_ARG_STRING:
 		*le++ = '=';
-		le = stpcpy(le, argDescrip);
+		strcpy(le, argDescrip);		le += strlen(le);
 		break;
 	    default:
 		break;
 	    }
 	} else {
 	    *le++ = '=';
-	    le = stpcpy(le, argDescrip);
+	    strcpy(le, argDescrip);		le += strlen(le);
 	}
 	if (opt->argInfo & POPT_ARGFLAG_OPTIONAL)
 	    *le++ = ']';
@@ -278,6 +314,10 @@ out:
     left = _free(left);
 }
 
+/**
+ * @param opt		option(s)
+ * @param translation_domain	translation domain
+ */
 static int maxArgWidth(const struct poptOption * opt,
 		       /*@null@*/ const char * translation_domain)
 	/*@*/
@@ -315,7 +355,37 @@ static int maxArgWidth(const struct poptOption * opt,
     return max;
 }
 
-static void singleTableHelp(FILE * fp,
+/**
+ * Display popt alias and exec help.
+ * @param fp		output file handle
+ * @param items		alias/exec array
+ * @param nitems	no. of alias/exec entries
+ * @param translation_domain	translation domain
+ */
+static void itemHelp(FILE * fp,
+		/*@null@*/ poptItem items, int nitems, int left,
+		/*@null@*/ const char * translation_domain)
+	/*@modifies *fp, fileSystem @*/
+{
+    poptItem item;
+    int i;
+
+    if (items != NULL)
+    for (i = 0, item = items; i < nitems; i++, item++) {
+	const struct poptOption * opt;
+	opt = &item->option;
+	if ((opt->longName || opt->shortName) && 
+	    !(opt->argInfo & POPT_ARGFLAG_DOC_HIDDEN))
+	    singleOptionHelp(fp, left, opt, translation_domain);
+    }
+}
+
+/**
+ * @param fp		output file handle
+ * @param table		option(s)
+ * @param translation_domain	translation domain
+ */
+static void singleTableHelp(poptContext con, FILE * fp,
 		/*@null@*/ const struct poptOption * table, int left,
 		/*@null@*/ const char * translation_domain)
 	/*@modifies *fp, fileSystem @*/
@@ -323,6 +393,12 @@ static void singleTableHelp(FILE * fp,
     const struct poptOption * opt;
     const char *sub_transdom;
 
+    if (table == poptAliasOptions) {
+	itemHelp(fp, con->aliases, con->numAliases, left, NULL);
+	itemHelp(fp, con->execs, con->numExecs, left, NULL);
+	return;
+    }
+
     if (table != NULL)
     for (opt = table; (opt->longName || opt->shortName || opt->arg); opt++) {
 	if ((opt->longName || opt->shortName) && 
@@ -332,19 +408,23 @@ static void singleTableHelp(FILE * fp,
 
     if (table != NULL)
     for (opt = table; (opt->longName || opt->shortName || opt->arg); opt++) {
-	if ((opt->argInfo & POPT_ARG_MASK) == POPT_ARG_INCLUDE_TABLE) {
-	    sub_transdom = getTableTranslationDomain(opt->arg);
-	    if (sub_transdom == NULL)
-		sub_transdom = translation_domain;
+	if ((opt->argInfo & POPT_ARG_MASK) != POPT_ARG_INCLUDE_TABLE)
+	    continue;
+	sub_transdom = getTableTranslationDomain(opt->arg);
+	if (sub_transdom == NULL)
+	    sub_transdom = translation_domain;
 	    
-	    if (opt->descrip)
-		fprintf(fp, "\n%s\n", D_(sub_transdom, opt->descrip));
+	if (opt->descrip)
+	    fprintf(fp, "\n%s\n", D_(sub_transdom, opt->descrip));
 
-	    singleTableHelp(fp, opt->arg, left, sub_transdom);
-	}
+	singleTableHelp(con, fp, opt->arg, left, sub_transdom);
     }
 }
 
+/**
+ * @param con		context
+ * @param fp		output file handle
+ */
 static int showHelpIntro(poptContext con, FILE * fp)
 	/*@modifies *fp, fileSystem @*/
 {
@@ -376,9 +456,14 @@ void poptPrintHelp(poptContext con, FILE * fp, /*@unused@*/ int flags)
 	fprintf(fp, " %s\n", POPT_("[OPTION...]"));
 
     leftColWidth = maxArgWidth(con->options, NULL);
-    singleTableHelp(fp, con->options, leftColWidth, NULL);
+    singleTableHelp(con, fp, con->options, leftColWidth, NULL);
 }
 
+/**
+ * @param fp		output file handle
+ * @param opt		option(s)
+ * @param translation_domain	translation domain
+ */
 static int singleOptionUsage(FILE * fp, int cursor, 
 		const struct poptOption * opt,
 		/*@null@*/ const char *translation_domain)
@@ -419,7 +504,42 @@ static int singleOptionUsage(FILE * fp, int cursor,
     return cursor + len + 1;
 }
 
-static int singleTableUsage(FILE * fp,
+/**
+ * Display popt alias and exec usage.
+ * @param fp		output file handle
+ * @param item		alias/exec array
+ * @param nitems	no. of ara/exec entries
+ * @param translation_domain	translation domain
+ */
+static int itemUsage(FILE * fp, int cursor, poptItem item, int nitems,
+		/*@null@*/ const char * translation_domain)
+	/*@modifies *fp, fileSystem @*/
+{
+    int i;
+
+    /*@-branchstate@*/		/* FIX: W2DO? */
+    if (item != NULL)
+    for (i = 0; i < nitems; i++, item++) {
+	const struct poptOption * opt;
+	opt = &item->option;
+        if ((opt->argInfo & POPT_ARG_MASK) == POPT_ARG_INTL_DOMAIN) {
+	    translation_domain = (const char *)opt->arg;
+	} else if ((opt->longName || opt->shortName) &&
+		 !(opt->argInfo & POPT_ARGFLAG_DOC_HIDDEN)) {
+	    cursor = singleOptionUsage(fp, cursor, opt, translation_domain);
+	}
+    }
+    /*@=branchstate@*/
+
+    return cursor;
+}
+
+/**
+ * @param fp		output file handle
+ * @param opt		option(s)
+ * @param translation_domain	translation domain
+ */
+static int singleTableUsage(poptContext con, FILE * fp,
 		int cursor, const struct poptOption * opt,
 		/*@null@*/ const char * translation_domain)
 	/*@modifies *fp, fileSystem @*/
@@ -431,7 +551,8 @@ static int singleTableUsage(FILE * fp,
 	    translation_domain = (const char *)opt->arg;
 	} else if ((opt->argInfo & POPT_ARG_MASK) == POPT_ARG_INCLUDE_TABLE) {
 	    if (opt->arg)	/* XXX program error */
-	    cursor = singleTableUsage(fp, cursor, opt->arg, translation_domain);
+	    cursor = singleTableUsage(con, fp, cursor, opt->arg,
+			translation_domain);
 	} else if ((opt->longName || opt->shortName) &&
 		 !(opt->argInfo & POPT_ARGFLAG_DOC_HIDDEN)) {
 	    cursor = singleOptionUsage(fp, cursor, opt, translation_domain);
@@ -442,6 +563,13 @@ static int singleTableUsage(FILE * fp,
     return cursor;
 }
 
+/**
+ * Return concatenated short options for display.
+ * @param opt		option(s)
+ * @param fp		output file handle
+ * @retval str		concatenation of short options
+ * @return		length of display string
+ */
 static int showShortOptions(const struct poptOption * opt, FILE * fp,
 		/*@null@*/ char * str)
 	/*@modifies *str, *fp, fileSystem @*/
@@ -478,7 +606,9 @@ void poptPrintUsage(poptContext con, FILE * fp, /*@unused@*/ int flags)
 
     cursor = showHelpIntro(con, fp);
     cursor += showShortOptions(con->options, fp, NULL);
-    (void) singleTableUsage(fp, cursor, con->options, NULL);
+    (void) singleTableUsage(con, fp, cursor, con->options, NULL);
+    (void) itemUsage(fp, cursor, con->aliases, con->numAliases, NULL);
+    (void) itemUsage(fp, cursor, con->execs, con->numExecs, NULL);
 
     if (con->otherHelp) {
 	cursor += strlen(con->otherHelp) + 1;
diff --git a/poptint.h b/poptint.h
index fe8430b..089275e 100644
--- a/poptint.h
+++ b/poptint.h
@@ -45,16 +45,10 @@ struct optionStackEntry {
     int next;
 /*@only@*/ /*@null@*/ const char * nextArg;
 /*@keep@*/ /*@null@*/ const char * nextCharArg;
-/*@dependent@*/ /*@null@*/ struct poptAlias * currAlias;
+/*@dependent@*/ /*@null@*/ poptItem currAlias;
     int stuffed;
 };
 
-struct execEntry {
-/*@owned@*/ /*@null@*/ const char * longName;
-    char shortName;
-/*@only@*/ /*@null@*/ const char * script;
-};
-
 struct poptContext_s {
     struct optionStackEntry optionStack[POPT_OPTION_DEPTH];
 /*@dependent@*/ struct optionStackEntry * os;
@@ -64,15 +58,15 @@ struct poptContext_s {
 /*@keep@*/ const struct poptOption * options;
     int restLeftover;
 /*@only@*/ /*@null@*/ const char * appName;
-/*@only@*/ /*@null@*/ struct poptAlias * aliases;
+/*@only@*/ /*@null@*/ poptItem aliases;
     int numAliases;
     int flags;
-/*@owned@*/ /*@null@*/ struct execEntry * execs;
+/*@owned@*/ /*@null@*/ poptItem execs;
     int numExecs;
 /*@only@*/ /*@null@*/ const char ** finalArgv;
     int finalArgvCount;
     int finalArgvAlloced;
-/*@dependent@*/ /*@null@*/ struct execEntry * doExec;
+/*@dependent@*/ /*@null@*/ poptItem doExec;
 /*@only@*/ const char * execPath;
     int execAbsolute;
 /*@only@*/ const char * otherHelp;
-- 
Gitee


From 9fa370ddd9ce7a6b0474f3652e556d4fca0aa90f Mon Sep 17 00:00:00 2001
From: Jeff Johnson <n3npq@mac.com>
Date: Wed, 11 Jul 2001 14:23:01 +0000
Subject: [PATCH 314/667] - fix: adjust arg count for --POPTdesc/--POPTargs
 deletion. - add linux per-platform macro %_smp_mflags <sopwith@redhat.com>. -
 document more popt aliases for --help usage. - remove --tarbuild from man
 page(s), use -t[abpcils] instead (#48666).

---
 poptconfig.c | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/poptconfig.c b/poptconfig.c
index 6aafde8..c103265 100644
--- a/poptconfig.c
+++ b/poptconfig.c
@@ -66,8 +66,11 @@ static void configLine(poptContext con, char * line)
 	if (j != i)
 	    item->argv[j] = item->argv[i];
     }
-    if (j != i)
+    if (j != i) {
 	item->argv[j] = NULL;
+	item->argc = j;
+    }
+    
     /*@=modobserver@*/
 	
     if (!strcmp(entryType, "alias"))
-- 
Gitee


From fb33256d776baf04722d62e1c1fca2889ee323aa Mon Sep 17 00:00:00 2001
From: Jeff Johnson <n3npq@mac.com>
Date: Tue, 17 Jul 2001 03:03:15 +0000
Subject: [PATCH 315/667] - fix: _smp_flags macro broken. - python: bind
 rhnUnload differently. - fix: rescusitate --querytags. - fix: short aliases
 broken (#49213).

---
 po/popt.pot  | 50 +++++++++++++++++++++++++-------------------------
 poptconfig.c | 12 +++++++-----
 2 files changed, 32 insertions(+), 30 deletions(-)

diff --git a/po/popt.pot b/po/popt.pot
index f786aef..a9d365f 100644
--- a/po/popt.pot
+++ b/po/popt.pot
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2001-06-19 07:33-0400\n"
+"POT-Creation-Date: 2001-07-16 22:58-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -18,99 +18,99 @@ msgstr ""
 msgid "unknown errno"
 msgstr ""
 
-#: popt.c:888
+#: popt.c:892
 #, c-format
 msgid "option type (%d) not implemented in popt\n"
 msgstr ""
 
-#: popt.c:1053
+#: popt.c:1100
 msgid "missing argument"
 msgstr ""
 
-#: popt.c:1055
+#: popt.c:1102
 msgid "unknown option"
 msgstr ""
 
-#: popt.c:1057
+#: popt.c:1104
 msgid "mutually exclusive logical operations requested"
 msgstr ""
 
-#: popt.c:1059
+#: popt.c:1106
 msgid "opt->arg should not be NULL"
 msgstr ""
 
-#: popt.c:1061
+#: popt.c:1108
 msgid "aliases nested too deeply"
 msgstr ""
 
-#: popt.c:1063
+#: popt.c:1110
 msgid "error in parameter quoting"
 msgstr ""
 
-#: popt.c:1065
+#: popt.c:1112
 msgid "invalid numeric value"
 msgstr ""
 
-#: popt.c:1067
+#: popt.c:1114
 msgid "number too large or too small"
 msgstr ""
 
-#: popt.c:1069
+#: popt.c:1116
 msgid "memory allocation failed"
 msgstr ""
 
-#: popt.c:1073
+#: popt.c:1120
 msgid "unknown error"
 msgstr ""
 
-#: popthelp.c:32
+#: popthelp.c:47
 msgid "Show this help message"
 msgstr ""
 
-#: popthelp.c:33
+#: popthelp.c:48
 msgid "Display brief usage message"
 msgstr ""
 
-#: popthelp.c:36
+#: popthelp.c:51
 msgid "Display option defaults in message"
 msgstr ""
 
-#: popthelp.c:71
+#: popthelp.c:93
 msgid "NONE"
 msgstr ""
 
-#: popthelp.c:72
+#: popthelp.c:94
 msgid "VAL"
 msgstr ""
 
-#: popthelp.c:73
+#: popthelp.c:95
 msgid "INT"
 msgstr ""
 
-#: popthelp.c:74
+#: popthelp.c:96
 msgid "LONG"
 msgstr ""
 
-#: popthelp.c:75
+#: popthelp.c:97
 msgid "STRING"
 msgstr ""
 
-#: popthelp.c:76
+#: popthelp.c:98
 msgid "FLOAT"
 msgstr ""
 
-#: popthelp.c:77
+#: popthelp.c:99
 msgid "DOUBLE"
 msgstr ""
 
-#: popthelp.c:78
+#: popthelp.c:100
 msgid "ARG"
 msgstr ""
 
-#: popthelp.c:354
+#: popthelp.c:434
 msgid "Usage:"
 msgstr ""
 
-#: popthelp.c:376
+#: popthelp.c:456
 msgid "[OPTION...]"
 msgstr ""
diff --git a/poptconfig.c b/poptconfig.c
index c103265..1801db6 100644
--- a/poptconfig.c
+++ b/poptconfig.c
@@ -33,15 +33,17 @@ static void configLine(poptContext con, char * line)
     while (*line != '\0' && isspace(*line)) line++;
     if (*line == '\0') return;
     opt = line;
-    if (opt[0] == '-' && opt[1] == '-')
-	item->option.longName = opt + 2;
-    else if (opt[0] == '-' && !opt[2])
-	item->option.shortName = opt[1];
-
     while (*line == '\0' || !isspace(*line)) line++;
     *line++ = '\0';
+
     while (*line != '\0' && isspace(*line)) line++;
     if (*line == '\0') return;
+
+    if (opt[0] == '-' && opt[1] == '-')
+	item->option.longName = opt + 2;
+    else if (opt[0] == '-' && opt[2] == '\0')
+	item->option.shortName = opt[1];
+
     if (poptParseArgvString(line, &item->argc, &item->argv)) return;
 
     /*@-modobserver@*/
-- 
Gitee


From c3b43260afabfb0f45537750e3da19b7871da6fe Mon Sep 17 00:00:00 2001
From: Jeff Johnson <n3npq@mac.com>
Date: Mon, 13 Aug 2001 16:39:14 +0000
Subject: [PATCH 316/667] - fix: segfault on headerFree given malicious data. -
 fix: don't verify hash page nelem. - better error messages for verification
 failures. - include directory /usr/lib/rpm in rpm package.

---
 po/es.po | 101 +++++++++++++++++++++++++++++++------------------------
 1 file changed, 57 insertions(+), 44 deletions(-)

diff --git a/po/es.po b/po/es.po
index ae68916..9e7b809 100644
--- a/po/es.po
+++ b/po/es.po
@@ -5,10 +5,10 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: popt 1.6.1\n"
-"POT-Creation-Date: 2001-02-22 17:41-0500\n"
+"Project-Id-Version: popt 1.6.3\n"
+"POT-Creation-Date: 2001-07-16 21:53-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Last-Translator: Leandro Lucarella <luca@linuxmendoza.org.ar>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=CHARSET\n"
@@ -16,89 +16,102 @@ msgstr ""
 
 #: popt.c:29
 msgid "unknown errno"
-msgstr ""
+msgstr "errno desconocido"
 
-#: popt.c:758
+#: popt.c:892
 #, c-format
 msgid "option type (%d) not implemented in popt\n"
-msgstr ""
+msgstr "tipo de opci�n (%d) no implementada en popt\n"
 
-#: popt.c:893
+#: popt.c:1100
 msgid "missing argument"
-msgstr ""
+msgstr "falta argumento"
 
-#: popt.c:895
+#: popt.c:1102
 msgid "unknown option"
-msgstr ""
+msgstr "opci�n desconocida"
 
-#: popt.c:897
+#: popt.c:1104
 msgid "mutually exclusive logical operations requested"
+msgstr "requerida operaci�n l�gica mutuamente exclusiva"
+
+#: popt.c:1106
+msgid "opt->arg should not be NULL"
 msgstr ""
 
-#: popt.c:899
+#: popt.c:1108
 msgid "aliases nested too deeply"
-msgstr ""
+msgstr "alias anidados muy profundamente"
 
-#: popt.c:901
+#: popt.c:1110
 msgid "error in parameter quoting"
-msgstr ""
+msgstr "error en cita de par�metros"
 
-#: popt.c:903
+#: popt.c:1112
 msgid "invalid numeric value"
-msgstr ""
+msgstr "valor num�rico inv�lido"
 
-#: popt.c:905
+#: popt.c:1114
 msgid "number too large or too small"
+msgstr "n�mero muy largo o muy peque�o"
+
+#: popt.c:1116
+msgid "memory allocation failed"
 msgstr ""
 
-#: popt.c:909
+#: popt.c:1120
 msgid "unknown error"
-msgstr ""
+msgstr "error desconocido"
 
-#: popthelp.c:28
+#: popthelp.c:47
 msgid "Show this help message"
-msgstr ""
+msgstr "Muestra este mensaje de ayuda"
 
-#: popthelp.c:29
+#: popthelp.c:48
 msgid "Display brief usage message"
-msgstr ""
+msgstr "Indica el modo de uso resumido"
 
-#: popthelp.c:60
+#: popthelp.c:51
+#, fuzzy
+msgid "Display option defaults in message"
+msgstr "Indica el modo de uso resumido"
+
+#: popthelp.c:93
 msgid "NONE"
-msgstr ""
+msgstr "NONE"
 
-#: popthelp.c:61
+#: popthelp.c:94
 msgid "VAL"
-msgstr ""
+msgstr "VAL"
 
-#: popthelp.c:62
+#: popthelp.c:95
 msgid "INT"
-msgstr ""
+msgstr "INT"
 
-#: popthelp.c:63
+#: popthelp.c:96
 msgid "LONG"
-msgstr ""
+msgstr "LONG"
 
-#: popthelp.c:64
+#: popthelp.c:97
 msgid "STRING"
-msgstr ""
+msgstr "STRING"
 
-#: popthelp.c:65
+#: popthelp.c:98
 msgid "FLOAT"
-msgstr ""
+msgstr "FLOAT"
 
-#: popthelp.c:66
+#: popthelp.c:99
 msgid "DOUBLE"
-msgstr ""
+msgstr "DOUBLE"
 
-#: popthelp.c:67
+#: popthelp.c:100
 msgid "ARG"
-msgstr ""
+msgstr "ARG"
 
-#: popthelp.c:241
+#: popthelp.c:434
 msgid "Usage:"
-msgstr ""
+msgstr "Modo de Uso:"
 
-#: popthelp.c:260
+#: popthelp.c:456
 msgid "[OPTION...]"
-msgstr ""
+msgstr "[OPCI�N...]"
-- 
Gitee


From 7bae0a2cfe9db3246530682665fd1c99c43dd5a4 Mon Sep 17 00:00:00 2001
From: Jeff Johnson <n3npq@mac.com>
Date: Sat, 15 Sep 2001 13:49:37 +0000
Subject: [PATCH 317/667] Sync with rpm-4_0 branch.

---
 configure.in       |   2 +-
 po/cs.po           | 102 ++++++++++++++++++++++-----------------
 po/da.po           | 102 ++++++++++++++++++++++-----------------
 po/de.po           |  58 +++++++++++++---------
 po/eu_ES.po        |  58 +++++++++++++---------
 po/fi.po           |  58 +++++++++++++---------
 po/fr.po           |  58 +++++++++++++---------
 po/gl.po           | 108 +++++++++++++++++++++--------------------
 po/hu.po           |  59 ++++++++++++++---------
 po/id.po           |  58 +++++++++++++---------
 po/is.po           | 100 +++++++++++++++++++++-----------------
 po/it.po           |  58 +++++++++++++---------
 po/ja.po           |  58 +++++++++++++---------
 po/ko.po           | 117 ++++++++++++++++++++++++---------------------
 po/no.po           | 100 +++++++++++++++++++++-----------------
 po/pl.po           |  58 +++++++++++++---------
 po/popt.pot        |   2 +-
 po/pt.po           |  97 +++++++++++++++++++++----------------
 po/pt_BR.po        |  58 +++++++++++++---------
 po/ro.po           |  59 ++++++++++++++---------
 po/ru.po           | 102 ++++++++++++++++++++++-----------------
 po/sk.po           |  59 ++++++++++++++---------
 po/sl.po           |  59 ++++++++++++++---------
 po/sr.po           |  58 +++++++++++++---------
 po/sv.po           | 106 ++++++++++++++++++++++------------------
 po/tr.po           | 101 +++++++++++++++++++++-----------------
 po/uk.po           |  59 ++++++++++++++---------
 po/wa.po           |  59 ++++++++++++++---------
 po/zh.po           |  58 +++++++++++++---------
 po/zh_CN.GB2312.po |  59 ++++++++++++++---------
 popt.3             |   4 +-
 popt.spec          |   2 +-
 32 files changed, 1215 insertions(+), 881 deletions(-)

diff --git a/configure.in b/configure.in
index bb7fbfd..cce8afd 100755
--- a/configure.in
+++ b/configure.in
@@ -2,7 +2,7 @@ AC_INIT(popt.h)
 AM_CONFIG_HEADER(config.h)
 AC_PREREQ(2.12)
 AC_CANONICAL_SYSTEM
-AM_INIT_AUTOMAKE(popt, 1.7)
+AM_INIT_AUTOMAKE(popt, 1.6.3)
 ALL_LINGUAS="cs da de es eu_ES fi fr gl hu id is it ja ko no pl pt pt_BR ro ru sk sl sr sv tr uk wa zh zh_CN.GB2312"
 
 AC_ISC_POSIX
diff --git a/po/cs.po b/po/cs.po
index 892c91f..81feb86 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -1,9 +1,9 @@
 msgid ""
 msgstr ""
-"Project-Id-Version: popt 1.6.1\n"
-"POT-Creation-Date: 2001-02-22 17:41-0500\n"
-"PO-Revision-Date: 2000-08-23 22:24+0100\n"
-"Last-Translator: Milan Kerslager <milan.kerslager@spsselib.hiedu.cz>\n"
+"Project-Id-Version: popt 1.6.3\n"
+"POT-Creation-Date: 2001-07-16 21:53-0400\n"
+"PO-Revision-Date: 2001-07-24 00:03+0100\n"
+"Last-Translator: Milan Kerslager <kerslage@linux.cz>\n"
 "Language-Team: Czech <cs@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=iso-8859-2\n"
@@ -11,89 +11,101 @@ msgstr ""
 
 #: popt.c:29
 msgid "unknown errno"
-msgstr ""
+msgstr "nezn�m� ��slo chyby"
 
-#: popt.c:758
+#: popt.c:892
 #, c-format
 msgid "option type (%d) not implemented in popt\n"
-msgstr ""
+msgstr "volba (%d) nen� v popt implementov�na\n"
 
-#: popt.c:893
+#: popt.c:1100
 msgid "missing argument"
-msgstr ""
+msgstr "chyb� argument"
 
-#: popt.c:895
+#: popt.c:1102
 msgid "unknown option"
-msgstr ""
+msgstr "nezn�m� volba"
 
-#: popt.c:897
+#: popt.c:1104
 msgid "mutually exclusive logical operations requested"
-msgstr ""
+msgstr "po�adov�ny vz�jemn� v�lu�n� logick� operace"
+
+#: popt.c:1106
+msgid "opt->arg should not be NULL"
+msgstr "opt->arg nesm� b�t NULL"
 
-#: popt.c:899
+#: popt.c:1108
 msgid "aliases nested too deeply"
-msgstr ""
+msgstr "aliasy vno�en� p��li� hluboko"
 
-#: popt.c:901
+#: popt.c:1110
 msgid "error in parameter quoting"
-msgstr ""
+msgstr "chyba v quotov�n� parametr�"
 
-#: popt.c:903
+#: popt.c:1112
 msgid "invalid numeric value"
-msgstr ""
+msgstr "chybn� numerick� hodnota"
 
-#: popt.c:905
+#: popt.c:1114
 msgid "number too large or too small"
-msgstr ""
+msgstr "��slo je p��li� velk� nebo p��li� mal�"
+
+#: popt.c:1116
+msgid "memory allocation failed"
+msgstr "selhala alokace pam�ti"
 
-#: popt.c:909
+#: popt.c:1120
 msgid "unknown error"
-msgstr ""
+msgstr "nezn�m� chyba"
 
-#: popthelp.c:28
+#: popthelp.c:47
 msgid "Show this help message"
 msgstr "Vyp��e tuto n�pov�du"
 
-#: popthelp.c:29
+#: popthelp.c:48
 msgid "Display brief usage message"
 msgstr "Vyp��e kr�tk� n�vod k pou�it�"
 
-#: popthelp.c:60
+#: popthelp.c:51
+msgid "Display option defaults in message"
+msgstr "Zobrazit implicitn� volby ve zpr�v�"
+
+#: popthelp.c:93
 msgid "NONE"
-msgstr ""
+msgstr "NONE"
 
-#: popthelp.c:61
+#: popthelp.c:94
 msgid "VAL"
-msgstr ""
+msgstr "VAL"
 
-#: popthelp.c:62
+#: popthelp.c:95
 msgid "INT"
-msgstr ""
+msgstr "INT"
 
-#: popthelp.c:63
+#: popthelp.c:96
 msgid "LONG"
-msgstr ""
+msgstr "LONG"
 
-#: popthelp.c:64
+#: popthelp.c:97
 msgid "STRING"
-msgstr ""
+msgstr "STRING"
 
-#: popthelp.c:65
+#: popthelp.c:98
 msgid "FLOAT"
-msgstr ""
+msgstr "FLOAT"
 
-#: popthelp.c:66
+#: popthelp.c:99
 msgid "DOUBLE"
-msgstr ""
+msgstr "DOUBLE"
 
-#: popthelp.c:67
+#: popthelp.c:100
 msgid "ARG"
-msgstr ""
+msgstr "ARG"
 
-#: popthelp.c:241
+#: popthelp.c:434
 msgid "Usage:"
-msgstr ""
+msgstr "Pou�it�:"
 
-#: popthelp.c:260
+#: popthelp.c:456
 msgid "[OPTION...]"
-msgstr ""
+msgstr "[VOLBY...]"
diff --git a/po/da.po b/po/da.po
index d22c4cb..1443ade 100644
--- a/po/da.po
+++ b/po/da.po
@@ -1,99 +1,113 @@
 msgid ""
 msgstr ""
-"Project-Id-Version: popt 1.6.1\n"
-"POT-Creation-Date: 2001-02-22 17:41-0500\n"
-"PO-Revision-Date: 2000-03-07 05:17+01:00\n"
-"Last-Translator: K. Christiansen <kenneth@gnu.org>\n"
-"Language-Team: Danish/Dansk <dansk@klid.dk>\n"
+"Project-Id-Version: popt 1.6.3\n"
+"POT-Creation-Date: 2001-07-16 21:53-0400\n"
+"PO-Revision-Date: Sun Jan 21 2001 04:30:32+0200\n"
+"Last-Translator: Martin Hansen <mah@k64.dk>\n"
+"Language-Team: Dansk <dansk@klid.dk>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=ISO-8859-1\n"
 "Content-Transfer-Encoding: 8-bit\n"
+"X-Generator: KTranslator v 0.6.0\n"
 
 #: popt.c:29
 msgid "unknown errno"
-msgstr ""
+msgstr "ukendt fejlnr."
 
-#: popt.c:758
+#: popt.c:892
 #, c-format
 msgid "option type (%d) not implemented in popt\n"
-msgstr ""
+msgstr "tilvalgstype (%d) er ikke implementeret i popt\n"
 
-#: popt.c:893
+#: popt.c:1100
 msgid "missing argument"
-msgstr ""
+msgstr "mangler argument"
 
-#: popt.c:895
+#: popt.c:1102
 msgid "unknown option"
-msgstr ""
+msgstr "ukendt tilvalg"
 
-#: popt.c:897
+#: popt.c:1104
 msgid "mutually exclusive logical operations requested"
+msgstr "de �nskede handlinger udelukker hinanden"
+
+#: popt.c:1106
+msgid "opt->arg should not be NULL"
 msgstr ""
 
-#: popt.c:899
+#: popt.c:1108
 msgid "aliases nested too deeply"
-msgstr ""
+msgstr "aliaser er for dybt indlejret"
 
-#: popt.c:901
+#: popt.c:1110
 msgid "error in parameter quoting"
-msgstr ""
+msgstr "fejl i parameter citering"
 
-#: popt.c:903
+#: popt.c:1112
 msgid "invalid numeric value"
-msgstr ""
+msgstr "ugyldig numerisk v�rdi"
 
-#: popt.c:905
+#: popt.c:1114
 msgid "number too large or too small"
+msgstr "nummer for stort, eller for lille"
+
+#: popt.c:1116
+msgid "memory allocation failed"
 msgstr ""
 
-#: popt.c:909
+#: popt.c:1120
 msgid "unknown error"
-msgstr ""
+msgstr "ukendt fejl"
 
-#: popthelp.c:28
+#: popthelp.c:47
 msgid "Show this help message"
 msgstr "Vis denne hj�lpemeddelelse"
 
-#: popthelp.c:29
+#: popthelp.c:48
 msgid "Display brief usage message"
 msgstr "Vis kortfattet brugsanvisning"
 
-#: popthelp.c:60
+#: popthelp.c:51
+#, fuzzy
+msgid "Display option defaults in message"
+msgstr "Vis kortfattet brugsanvisning"
+
+#: popthelp.c:93
 msgid "NONE"
-msgstr ""
+msgstr "INGEN"
 
-#: popthelp.c:61
+#: popthelp.c:94
 msgid "VAL"
-msgstr ""
+msgstr "VAL"
 
-#: popthelp.c:62
+#: popthelp.c:95
 msgid "INT"
-msgstr ""
+msgstr "INT"
 
-#: popthelp.c:63
+#: popthelp.c:96
 msgid "LONG"
-msgstr ""
+msgstr "LONG"
 
-#: popthelp.c:64
+#: popthelp.c:97
 msgid "STRING"
-msgstr ""
+msgstr "STRING"
 
-#: popthelp.c:65
+#: popthelp.c:98
 msgid "FLOAT"
-msgstr ""
+msgstr "FLOAT"
 
-#: popthelp.c:66
+#: popthelp.c:99
 msgid "DOUBLE"
-msgstr ""
+msgstr "DOUBLE"
 
-#: popthelp.c:67
+#: popthelp.c:100
 msgid "ARG"
-msgstr ""
+msgstr "ARG"
 
-#: popthelp.c:241
+#: popthelp.c:434
 msgid "Usage:"
-msgstr ""
+msgstr "Brug:"
 
-#: popthelp.c:260
+#: popthelp.c:456
 msgid "[OPTION...]"
-msgstr ""
+msgstr "[TILVALG...]"
diff --git a/po/de.po b/po/de.po
index ae68916..9408ada 100644
--- a/po/de.po
+++ b/po/de.po
@@ -5,8 +5,8 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: popt 1.6.1\n"
-"POT-Creation-Date: 2001-02-22 17:41-0500\n"
+"Project-Id-Version: popt 1.6.3\n"
+"POT-Creation-Date: 2001-07-16 21:53-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -18,87 +18,99 @@ msgstr ""
 msgid "unknown errno"
 msgstr ""
 
-#: popt.c:758
+#: popt.c:892
 #, c-format
 msgid "option type (%d) not implemented in popt\n"
 msgstr ""
 
-#: popt.c:893
+#: popt.c:1100
 msgid "missing argument"
 msgstr ""
 
-#: popt.c:895
+#: popt.c:1102
 msgid "unknown option"
 msgstr ""
 
-#: popt.c:897
+#: popt.c:1104
 msgid "mutually exclusive logical operations requested"
 msgstr ""
 
-#: popt.c:899
+#: popt.c:1106
+msgid "opt->arg should not be NULL"
+msgstr ""
+
+#: popt.c:1108
 msgid "aliases nested too deeply"
 msgstr ""
 
-#: popt.c:901
+#: popt.c:1110
 msgid "error in parameter quoting"
 msgstr ""
 
-#: popt.c:903
+#: popt.c:1112
 msgid "invalid numeric value"
 msgstr ""
 
-#: popt.c:905
+#: popt.c:1114
 msgid "number too large or too small"
 msgstr ""
 
-#: popt.c:909
+#: popt.c:1116
+msgid "memory allocation failed"
+msgstr ""
+
+#: popt.c:1120
 msgid "unknown error"
 msgstr ""
 
-#: popthelp.c:28
+#: popthelp.c:47
 msgid "Show this help message"
 msgstr ""
 
-#: popthelp.c:29
+#: popthelp.c:48
 msgid "Display brief usage message"
 msgstr ""
 
-#: popthelp.c:60
+#: popthelp.c:51
+msgid "Display option defaults in message"
+msgstr ""
+
+#: popthelp.c:93
 msgid "NONE"
 msgstr ""
 
-#: popthelp.c:61
+#: popthelp.c:94
 msgid "VAL"
 msgstr ""
 
-#: popthelp.c:62
+#: popthelp.c:95
 msgid "INT"
 msgstr ""
 
-#: popthelp.c:63
+#: popthelp.c:96
 msgid "LONG"
 msgstr ""
 
-#: popthelp.c:64
+#: popthelp.c:97
 msgid "STRING"
 msgstr ""
 
-#: popthelp.c:65
+#: popthelp.c:98
 msgid "FLOAT"
 msgstr ""
 
-#: popthelp.c:66
+#: popthelp.c:99
 msgid "DOUBLE"
 msgstr ""
 
-#: popthelp.c:67
+#: popthelp.c:100
 msgid "ARG"
 msgstr ""
 
-#: popthelp.c:241
+#: popthelp.c:434
 msgid "Usage:"
 msgstr ""
 
-#: popthelp.c:260
+#: popthelp.c:456
 msgid "[OPTION...]"
 msgstr ""
diff --git a/po/eu_ES.po b/po/eu_ES.po
index 3687099..9408ada 100644
--- a/po/eu_ES.po
+++ b/po/eu_ES.po
@@ -5,8 +5,8 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2001-02-22 17:41-0500\n"
+"Project-Id-Version: popt 1.6.3\n"
+"POT-Creation-Date: 2001-07-16 21:53-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -18,87 +18,99 @@ msgstr ""
 msgid "unknown errno"
 msgstr ""
 
-#: popt.c:758
+#: popt.c:892
 #, c-format
 msgid "option type (%d) not implemented in popt\n"
 msgstr ""
 
-#: popt.c:893
+#: popt.c:1100
 msgid "missing argument"
 msgstr ""
 
-#: popt.c:895
+#: popt.c:1102
 msgid "unknown option"
 msgstr ""
 
-#: popt.c:897
+#: popt.c:1104
 msgid "mutually exclusive logical operations requested"
 msgstr ""
 
-#: popt.c:899
+#: popt.c:1106
+msgid "opt->arg should not be NULL"
+msgstr ""
+
+#: popt.c:1108
 msgid "aliases nested too deeply"
 msgstr ""
 
-#: popt.c:901
+#: popt.c:1110
 msgid "error in parameter quoting"
 msgstr ""
 
-#: popt.c:903
+#: popt.c:1112
 msgid "invalid numeric value"
 msgstr ""
 
-#: popt.c:905
+#: popt.c:1114
 msgid "number too large or too small"
 msgstr ""
 
-#: popt.c:909
+#: popt.c:1116
+msgid "memory allocation failed"
+msgstr ""
+
+#: popt.c:1120
 msgid "unknown error"
 msgstr ""
 
-#: popthelp.c:28
+#: popthelp.c:47
 msgid "Show this help message"
 msgstr ""
 
-#: popthelp.c:29
+#: popthelp.c:48
 msgid "Display brief usage message"
 msgstr ""
 
-#: popthelp.c:60
+#: popthelp.c:51
+msgid "Display option defaults in message"
+msgstr ""
+
+#: popthelp.c:93
 msgid "NONE"
 msgstr ""
 
-#: popthelp.c:61
+#: popthelp.c:94
 msgid "VAL"
 msgstr ""
 
-#: popthelp.c:62
+#: popthelp.c:95
 msgid "INT"
 msgstr ""
 
-#: popthelp.c:63
+#: popthelp.c:96
 msgid "LONG"
 msgstr ""
 
-#: popthelp.c:64
+#: popthelp.c:97
 msgid "STRING"
 msgstr ""
 
-#: popthelp.c:65
+#: popthelp.c:98
 msgid "FLOAT"
 msgstr ""
 
-#: popthelp.c:66
+#: popthelp.c:99
 msgid "DOUBLE"
 msgstr ""
 
-#: popthelp.c:67
+#: popthelp.c:100
 msgid "ARG"
 msgstr ""
 
-#: popthelp.c:241
+#: popthelp.c:434
 msgid "Usage:"
 msgstr ""
 
-#: popthelp.c:260
+#: popthelp.c:456
 msgid "[OPTION...]"
 msgstr ""
diff --git a/po/fi.po b/po/fi.po
index ae68916..9408ada 100644
--- a/po/fi.po
+++ b/po/fi.po
@@ -5,8 +5,8 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: popt 1.6.1\n"
-"POT-Creation-Date: 2001-02-22 17:41-0500\n"
+"Project-Id-Version: popt 1.6.3\n"
+"POT-Creation-Date: 2001-07-16 21:53-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -18,87 +18,99 @@ msgstr ""
 msgid "unknown errno"
 msgstr ""
 
-#: popt.c:758
+#: popt.c:892
 #, c-format
 msgid "option type (%d) not implemented in popt\n"
 msgstr ""
 
-#: popt.c:893
+#: popt.c:1100
 msgid "missing argument"
 msgstr ""
 
-#: popt.c:895
+#: popt.c:1102
 msgid "unknown option"
 msgstr ""
 
-#: popt.c:897
+#: popt.c:1104
 msgid "mutually exclusive logical operations requested"
 msgstr ""
 
-#: popt.c:899
+#: popt.c:1106
+msgid "opt->arg should not be NULL"
+msgstr ""
+
+#: popt.c:1108
 msgid "aliases nested too deeply"
 msgstr ""
 
-#: popt.c:901
+#: popt.c:1110
 msgid "error in parameter quoting"
 msgstr ""
 
-#: popt.c:903
+#: popt.c:1112
 msgid "invalid numeric value"
 msgstr ""
 
-#: popt.c:905
+#: popt.c:1114
 msgid "number too large or too small"
 msgstr ""
 
-#: popt.c:909
+#: popt.c:1116
+msgid "memory allocation failed"
+msgstr ""
+
+#: popt.c:1120
 msgid "unknown error"
 msgstr ""
 
-#: popthelp.c:28
+#: popthelp.c:47
 msgid "Show this help message"
 msgstr ""
 
-#: popthelp.c:29
+#: popthelp.c:48
 msgid "Display brief usage message"
 msgstr ""
 
-#: popthelp.c:60
+#: popthelp.c:51
+msgid "Display option defaults in message"
+msgstr ""
+
+#: popthelp.c:93
 msgid "NONE"
 msgstr ""
 
-#: popthelp.c:61
+#: popthelp.c:94
 msgid "VAL"
 msgstr ""
 
-#: popthelp.c:62
+#: popthelp.c:95
 msgid "INT"
 msgstr ""
 
-#: popthelp.c:63
+#: popthelp.c:96
 msgid "LONG"
 msgstr ""
 
-#: popthelp.c:64
+#: popthelp.c:97
 msgid "STRING"
 msgstr ""
 
-#: popthelp.c:65
+#: popthelp.c:98
 msgid "FLOAT"
 msgstr ""
 
-#: popthelp.c:66
+#: popthelp.c:99
 msgid "DOUBLE"
 msgstr ""
 
-#: popthelp.c:67
+#: popthelp.c:100
 msgid "ARG"
 msgstr ""
 
-#: popthelp.c:241
+#: popthelp.c:434
 msgid "Usage:"
 msgstr ""
 
-#: popthelp.c:260
+#: popthelp.c:456
 msgid "[OPTION...]"
 msgstr ""
diff --git a/po/fr.po b/po/fr.po
index ae68916..9408ada 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -5,8 +5,8 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: popt 1.6.1\n"
-"POT-Creation-Date: 2001-02-22 17:41-0500\n"
+"Project-Id-Version: popt 1.6.3\n"
+"POT-Creation-Date: 2001-07-16 21:53-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -18,87 +18,99 @@ msgstr ""
 msgid "unknown errno"
 msgstr ""
 
-#: popt.c:758
+#: popt.c:892
 #, c-format
 msgid "option type (%d) not implemented in popt\n"
 msgstr ""
 
-#: popt.c:893
+#: popt.c:1100
 msgid "missing argument"
 msgstr ""
 
-#: popt.c:895
+#: popt.c:1102
 msgid "unknown option"
 msgstr ""
 
-#: popt.c:897
+#: popt.c:1104
 msgid "mutually exclusive logical operations requested"
 msgstr ""
 
-#: popt.c:899
+#: popt.c:1106
+msgid "opt->arg should not be NULL"
+msgstr ""
+
+#: popt.c:1108
 msgid "aliases nested too deeply"
 msgstr ""
 
-#: popt.c:901
+#: popt.c:1110
 msgid "error in parameter quoting"
 msgstr ""
 
-#: popt.c:903
+#: popt.c:1112
 msgid "invalid numeric value"
 msgstr ""
 
-#: popt.c:905
+#: popt.c:1114
 msgid "number too large or too small"
 msgstr ""
 
-#: popt.c:909
+#: popt.c:1116
+msgid "memory allocation failed"
+msgstr ""
+
+#: popt.c:1120
 msgid "unknown error"
 msgstr ""
 
-#: popthelp.c:28
+#: popthelp.c:47
 msgid "Show this help message"
 msgstr ""
 
-#: popthelp.c:29
+#: popthelp.c:48
 msgid "Display brief usage message"
 msgstr ""
 
-#: popthelp.c:60
+#: popthelp.c:51
+msgid "Display option defaults in message"
+msgstr ""
+
+#: popthelp.c:93
 msgid "NONE"
 msgstr ""
 
-#: popthelp.c:61
+#: popthelp.c:94
 msgid "VAL"
 msgstr ""
 
-#: popthelp.c:62
+#: popthelp.c:95
 msgid "INT"
 msgstr ""
 
-#: popthelp.c:63
+#: popthelp.c:96
 msgid "LONG"
 msgstr ""
 
-#: popthelp.c:64
+#: popthelp.c:97
 msgid "STRING"
 msgstr ""
 
-#: popthelp.c:65
+#: popthelp.c:98
 msgid "FLOAT"
 msgstr ""
 
-#: popthelp.c:66
+#: popthelp.c:99
 msgid "DOUBLE"
 msgstr ""
 
-#: popthelp.c:67
+#: popthelp.c:100
 msgid "ARG"
 msgstr ""
 
-#: popthelp.c:241
+#: popthelp.c:434
 msgid "Usage:"
 msgstr ""
 
-#: popthelp.c:260
+#: popthelp.c:456
 msgid "[OPTION...]"
 msgstr ""
diff --git a/po/gl.po b/po/gl.po
index 8696d51..237da1b 100644
--- a/po/gl.po
+++ b/po/gl.po
@@ -1,108 +1,112 @@
-# Galician translation of popt.
-# Copyright (C) 2000 Jes�s Bravo �lvarez.
-# Jes�s Bravo �lvarez <jba@pobox.com>, 2000.
-#
-# Se desexas colaborar connosco na traducci�n de programas libres � galego,
-# vai mira-la p�xina do noso grupo:  http://www.ctv.es/USERS/jtarrio/trans
-#
-# First Version: 2000-01-06 20:31+0100
-#
 msgid ""
 msgstr ""
-"Project-Id-Version: popt 1.6.1\n"
-"POT-Creation-Date: 2001-02-22 17:41-0500\n"
-"PO-Revision-Date: 2000-01-06 20:31+0100\n"
+"Project-Id-Version: popt 1.6.3\n"
+"POT-Creation-Date: 2001-07-16 21:53-0400\n"
+"PO-Revision-Date: 2001-01-17 01:01+0100\n"
 "Last-Translator: Jes�s Bravo �lvarez <jba@pobox.com>\n"
-"Language-Team: Galician <gpul-traduccion@ceu.fi.udc.es>\n"
+"Language-Team: Galician <trasno@ceu.fi.udc.es>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=iso-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
 
 #: popt.c:29
 msgid "unknown errno"
-msgstr ""
+msgstr "errno desco�ecido"
 
-#: popt.c:758
+#: popt.c:892
 #, c-format
 msgid "option type (%d) not implemented in popt\n"
-msgstr ""
+msgstr "tipo de opci�n (%d) non implementada en popt\n"
 
-#: popt.c:893
+#: popt.c:1100
 msgid "missing argument"
-msgstr ""
+msgstr "falta un argumento"
 
-#: popt.c:895
+#: popt.c:1102
 msgid "unknown option"
-msgstr ""
+msgstr "opci�n desco�ecida"
 
-#: popt.c:897
+#: popt.c:1104
 msgid "mutually exclusive logical operations requested"
+msgstr "solicit�ronse operaci�ns l�xicas mutuamente exclu�ntes"
+
+#: popt.c:1106
+msgid "opt->arg should not be NULL"
 msgstr ""
 
-#: popt.c:899
+#: popt.c:1108
 msgid "aliases nested too deeply"
-msgstr ""
+msgstr "aliases ani�ados a un nivel demasiado profundo"
 
-#: popt.c:901
+#: popt.c:1110
 msgid "error in parameter quoting"
-msgstr ""
+msgstr "erro nas comi�as do par�metro"
 
-#: popt.c:903
+#: popt.c:1112
 msgid "invalid numeric value"
-msgstr ""
+msgstr "valor num�rico non v�lido"
 
-#: popt.c:905
+#: popt.c:1114
 msgid "number too large or too small"
+msgstr "n�mero demasiado grande ou pequeno"
+
+#: popt.c:1116
+msgid "memory allocation failed"
 msgstr ""
 
-#: popt.c:909
+#: popt.c:1120
 msgid "unknown error"
-msgstr ""
+msgstr "erro desco�ecido"
 
-#: popthelp.c:28
+#: popthelp.c:47
 msgid "Show this help message"
 msgstr "Amosar esta mensaxe de axuda"
 
-#: popthelp.c:29
+#: popthelp.c:48
 msgid "Display brief usage message"
 msgstr "Amosar brevemente o xeito de utilizaci�n"
 
-#: popthelp.c:60
+#: popthelp.c:51
+#, fuzzy
+msgid "Display option defaults in message"
+msgstr "Amosar brevemente o xeito de utilizaci�n"
+
+#: popthelp.c:93
 msgid "NONE"
-msgstr ""
+msgstr "NADA"
 
-#: popthelp.c:61
+#: popthelp.c:94
 msgid "VAL"
-msgstr ""
+msgstr "VAL"
 
-#: popthelp.c:62
+#: popthelp.c:95
 msgid "INT"
-msgstr ""
+msgstr "INT"
 
-#: popthelp.c:63
+#: popthelp.c:96
 msgid "LONG"
-msgstr ""
+msgstr "LONG"
 
-#: popthelp.c:64
+#: popthelp.c:97
 msgid "STRING"
-msgstr ""
+msgstr "CADEA"
 
-#: popthelp.c:65
+#: popthelp.c:98
 msgid "FLOAT"
-msgstr ""
+msgstr "FLOAT"
 
-#: popthelp.c:66
+#: popthelp.c:99
 msgid "DOUBLE"
-msgstr ""
+msgstr "DOUBLE"
 
-#: popthelp.c:67
+#: popthelp.c:100
 msgid "ARG"
-msgstr ""
+msgstr "ARG"
 
-#: popthelp.c:241
+#: popthelp.c:434
 msgid "Usage:"
-msgstr ""
+msgstr "Uso:"
 
-#: popthelp.c:260
+#: popthelp.c:456
 msgid "[OPTION...]"
-msgstr ""
+msgstr "[OPCI�N...]"
diff --git a/po/hu.po b/po/hu.po
index a0f69a7..fe4c7c8 100644
--- a/po/hu.po
+++ b/po/hu.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
-"Project-Id-Version: popt 1.6.1\n"
-"POT-Creation-Date: 2001-02-22 17:41-0500\n"
+"Project-Id-Version: popt 1.6.3\n"
+"POT-Creation-Date: 2001-07-16 21:53-0400\n"
 "PO-Revision-Date: 2000-08-03 23:26+0200\n"
 "Last-Translator: L�szl� N�meth <nemeth@qwertynet.hu>\n"
 "Language-Team: Hungarian\n"
@@ -13,87 +13,100 @@ msgstr ""
 msgid "unknown errno"
 msgstr ""
 
-#: popt.c:758
+#: popt.c:892
 #, c-format
 msgid "option type (%d) not implemented in popt\n"
 msgstr ""
 
-#: popt.c:893
+#: popt.c:1100
 msgid "missing argument"
 msgstr ""
 
-#: popt.c:895
+#: popt.c:1102
 msgid "unknown option"
 msgstr ""
 
-#: popt.c:897
+#: popt.c:1104
 msgid "mutually exclusive logical operations requested"
 msgstr ""
 
-#: popt.c:899
+#: popt.c:1106
+msgid "opt->arg should not be NULL"
+msgstr ""
+
+#: popt.c:1108
 msgid "aliases nested too deeply"
 msgstr ""
 
-#: popt.c:901
+#: popt.c:1110
 msgid "error in parameter quoting"
 msgstr ""
 
-#: popt.c:903
+#: popt.c:1112
 msgid "invalid numeric value"
 msgstr ""
 
-#: popt.c:905
+#: popt.c:1114
 msgid "number too large or too small"
 msgstr ""
 
-#: popt.c:909
+#: popt.c:1116
+msgid "memory allocation failed"
+msgstr ""
+
+#: popt.c:1120
 msgid "unknown error"
 msgstr ""
 
-#: popthelp.c:28
+#: popthelp.c:47
 msgid "Show this help message"
 msgstr "E s�g� megjelen�t�se"
 
-#: popthelp.c:29
+#: popthelp.c:48
 msgid "Display brief usage message"
 msgstr "R�vid haszn�lati utas�t�s megjelen�t�se"
 
-#: popthelp.c:60
+#: popthelp.c:51
+#, fuzzy
+msgid "Display option defaults in message"
+msgstr "R�vid haszn�lati utas�t�s megjelen�t�se"
+
+#: popthelp.c:93
 msgid "NONE"
 msgstr ""
 
-#: popthelp.c:61
+#: popthelp.c:94
 msgid "VAL"
 msgstr ""
 
-#: popthelp.c:62
+#: popthelp.c:95
 msgid "INT"
 msgstr ""
 
-#: popthelp.c:63
+#: popthelp.c:96
 msgid "LONG"
 msgstr ""
 
-#: popthelp.c:64
+#: popthelp.c:97
 msgid "STRING"
 msgstr ""
 
-#: popthelp.c:65
+#: popthelp.c:98
 msgid "FLOAT"
 msgstr ""
 
-#: popthelp.c:66
+#: popthelp.c:99
 msgid "DOUBLE"
 msgstr ""
 
-#: popthelp.c:67
+#: popthelp.c:100
 msgid "ARG"
 msgstr ""
 
-#: popthelp.c:241
+#: popthelp.c:434
 msgid "Usage:"
 msgstr ""
 
-#: popthelp.c:260
+#: popthelp.c:456
 msgid "[OPTION...]"
 msgstr ""
diff --git a/po/id.po b/po/id.po
index ae68916..9408ada 100644
--- a/po/id.po
+++ b/po/id.po
@@ -5,8 +5,8 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: popt 1.6.1\n"
-"POT-Creation-Date: 2001-02-22 17:41-0500\n"
+"Project-Id-Version: popt 1.6.3\n"
+"POT-Creation-Date: 2001-07-16 21:53-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -18,87 +18,99 @@ msgstr ""
 msgid "unknown errno"
 msgstr ""
 
-#: popt.c:758
+#: popt.c:892
 #, c-format
 msgid "option type (%d) not implemented in popt\n"
 msgstr ""
 
-#: popt.c:893
+#: popt.c:1100
 msgid "missing argument"
 msgstr ""
 
-#: popt.c:895
+#: popt.c:1102
 msgid "unknown option"
 msgstr ""
 
-#: popt.c:897
+#: popt.c:1104
 msgid "mutually exclusive logical operations requested"
 msgstr ""
 
-#: popt.c:899
+#: popt.c:1106
+msgid "opt->arg should not be NULL"
+msgstr ""
+
+#: popt.c:1108
 msgid "aliases nested too deeply"
 msgstr ""
 
-#: popt.c:901
+#: popt.c:1110
 msgid "error in parameter quoting"
 msgstr ""
 
-#: popt.c:903
+#: popt.c:1112
 msgid "invalid numeric value"
 msgstr ""
 
-#: popt.c:905
+#: popt.c:1114
 msgid "number too large or too small"
 msgstr ""
 
-#: popt.c:909
+#: popt.c:1116
+msgid "memory allocation failed"
+msgstr ""
+
+#: popt.c:1120
 msgid "unknown error"
 msgstr ""
 
-#: popthelp.c:28
+#: popthelp.c:47
 msgid "Show this help message"
 msgstr ""
 
-#: popthelp.c:29
+#: popthelp.c:48
 msgid "Display brief usage message"
 msgstr ""
 
-#: popthelp.c:60
+#: popthelp.c:51
+msgid "Display option defaults in message"
+msgstr ""
+
+#: popthelp.c:93
 msgid "NONE"
 msgstr ""
 
-#: popthelp.c:61
+#: popthelp.c:94
 msgid "VAL"
 msgstr ""
 
-#: popthelp.c:62
+#: popthelp.c:95
 msgid "INT"
 msgstr ""
 
-#: popthelp.c:63
+#: popthelp.c:96
 msgid "LONG"
 msgstr ""
 
-#: popthelp.c:64
+#: popthelp.c:97
 msgid "STRING"
 msgstr ""
 
-#: popthelp.c:65
+#: popthelp.c:98
 msgid "FLOAT"
 msgstr ""
 
-#: popthelp.c:66
+#: popthelp.c:99
 msgid "DOUBLE"
 msgstr ""
 
-#: popthelp.c:67
+#: popthelp.c:100
 msgid "ARG"
 msgstr ""
 
-#: popthelp.c:241
+#: popthelp.c:434
 msgid "Usage:"
 msgstr ""
 
-#: popthelp.c:260
+#: popthelp.c:456
 msgid "[OPTION...]"
 msgstr ""
diff --git a/po/is.po b/po/is.po
index faa18c6..7f078a3 100644
--- a/po/is.po
+++ b/po/is.po
@@ -1,8 +1,8 @@
 msgid ""
 msgstr ""
-"Project-Id-Version: popt 1.6.1\n"
-"POT-Creation-Date: 2001-02-22 17:41-0500\n"
-"PO-Revision-Date: 2000-06-16 02:12+0000\n"
+"Project-Id-Version: popt 1.6.3\n"
+"POT-Creation-Date: 2001-07-16 21:53-0400\n"
+"PO-Revision-Date: 2001-06-08 01:35+0000\n"
 "Last-Translator: Richard Allen <ra@hp.is>\n"
 "Language-Team: is <kde-isl@mmedia.is>\n"
 "MIME-Version: 1.0\n"
@@ -11,89 +11,101 @@ msgstr ""
 
 #: popt.c:29
 msgid "unknown errno"
-msgstr ""
+msgstr "��ekkt villun�mer"
 
-#: popt.c:758
+#: popt.c:892
 #, c-format
 msgid "option type (%d) not implemented in popt\n"
-msgstr ""
+msgstr "rofager�in (%d) er ekki studd � popt\n"
 
-#: popt.c:893
+#: popt.c:1100
 msgid "missing argument"
-msgstr ""
+msgstr "vantar vi�fang"
 
-#: popt.c:895
+#: popt.c:1102
 msgid "unknown option"
-msgstr ""
+msgstr "��ekktur rofi"
 
-#: popt.c:897
+#: popt.c:1104
 msgid "mutually exclusive logical operations requested"
-msgstr ""
+msgstr "be�i� um rofa sem sl�kkva hvor � ��rum"
+
+#: popt.c:1106
+msgid "opt->arg should not be NULL"
+msgstr "opt->arg �tti ekki a� vera NULL"
 
-#: popt.c:899
+#: popt.c:1108
 msgid "aliases nested too deeply"
-msgstr ""
+msgstr "al�asar of fl�knir"
 
-#: popt.c:901
+#: popt.c:1110
 msgid "error in parameter quoting"
-msgstr ""
+msgstr "villa � vi�f�ngum (g�salappir og svo frv.)"
 
-#: popt.c:903
+#: popt.c:1112
 msgid "invalid numeric value"
-msgstr ""
+msgstr "�gilt t�lulegt gildi"
 
-#: popt.c:905
+#: popt.c:1114
 msgid "number too large or too small"
-msgstr ""
+msgstr "talan of st�r e�a sm�"
+
+#: popt.c:1116
+msgid "memory allocation failed"
+msgstr "ekki t�kst a� taka fr� minni"
 
-#: popt.c:909
+#: popt.c:1120
 msgid "unknown error"
-msgstr ""
+msgstr "��ekkt villa"
 
-#: popthelp.c:28
+#: popthelp.c:47
 msgid "Show this help message"
 msgstr "S�na �essa hj�lp"
 
-#: popthelp.c:29
+#: popthelp.c:48
 msgid "Display brief usage message"
 msgstr "S�na stuttar notkunarlei�beiningar"
 
-#: popthelp.c:60
+#: popthelp.c:51
+msgid "Display option defaults in message"
+msgstr "S�na sj�lfgefin gildi rofa � skilabo�um"
+
+#: popthelp.c:93
 msgid "NONE"
-msgstr ""
+msgstr "ENGIN"
 
-#: popthelp.c:61
+#: popthelp.c:94
 msgid "VAL"
-msgstr ""
+msgstr "VAL"
 
-#: popthelp.c:62
+#: popthelp.c:95
 msgid "INT"
-msgstr ""
+msgstr "INT"
 
-#: popthelp.c:63
+#: popthelp.c:96
 msgid "LONG"
-msgstr ""
+msgstr "LONG"
 
-#: popthelp.c:64
+#: popthelp.c:97
 msgid "STRING"
-msgstr ""
+msgstr "STRING"
 
-#: popthelp.c:65
+#: popthelp.c:98
 msgid "FLOAT"
-msgstr ""
+msgstr "FLOAT"
 
-#: popthelp.c:66
+#: popthelp.c:99
 msgid "DOUBLE"
-msgstr ""
+msgstr "DOUBLE"
 
-#: popthelp.c:67
+#: popthelp.c:100
 msgid "ARG"
-msgstr ""
+msgstr "ARG"
 
-#: popthelp.c:241
+#: popthelp.c:434
 msgid "Usage:"
-msgstr ""
+msgstr "Notkun:"
 
-#: popthelp.c:260
+#: popthelp.c:456
 msgid "[OPTION...]"
-msgstr ""
+msgstr "[ROFI...]"
diff --git a/po/it.po b/po/it.po
index ae68916..9408ada 100644
--- a/po/it.po
+++ b/po/it.po
@@ -5,8 +5,8 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: popt 1.6.1\n"
-"POT-Creation-Date: 2001-02-22 17:41-0500\n"
+"Project-Id-Version: popt 1.6.3\n"
+"POT-Creation-Date: 2001-07-16 21:53-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -18,87 +18,99 @@ msgstr ""
 msgid "unknown errno"
 msgstr ""
 
-#: popt.c:758
+#: popt.c:892
 #, c-format
 msgid "option type (%d) not implemented in popt\n"
 msgstr ""
 
-#: popt.c:893
+#: popt.c:1100
 msgid "missing argument"
 msgstr ""
 
-#: popt.c:895
+#: popt.c:1102
 msgid "unknown option"
 msgstr ""
 
-#: popt.c:897
+#: popt.c:1104
 msgid "mutually exclusive logical operations requested"
 msgstr ""
 
-#: popt.c:899
+#: popt.c:1106
+msgid "opt->arg should not be NULL"
+msgstr ""
+
+#: popt.c:1108
 msgid "aliases nested too deeply"
 msgstr ""
 
-#: popt.c:901
+#: popt.c:1110
 msgid "error in parameter quoting"
 msgstr ""
 
-#: popt.c:903
+#: popt.c:1112
 msgid "invalid numeric value"
 msgstr ""
 
-#: popt.c:905
+#: popt.c:1114
 msgid "number too large or too small"
 msgstr ""
 
-#: popt.c:909
+#: popt.c:1116
+msgid "memory allocation failed"
+msgstr ""
+
+#: popt.c:1120
 msgid "unknown error"
 msgstr ""
 
-#: popthelp.c:28
+#: popthelp.c:47
 msgid "Show this help message"
 msgstr ""
 
-#: popthelp.c:29
+#: popthelp.c:48
 msgid "Display brief usage message"
 msgstr ""
 
-#: popthelp.c:60
+#: popthelp.c:51
+msgid "Display option defaults in message"
+msgstr ""
+
+#: popthelp.c:93
 msgid "NONE"
 msgstr ""
 
-#: popthelp.c:61
+#: popthelp.c:94
 msgid "VAL"
 msgstr ""
 
-#: popthelp.c:62
+#: popthelp.c:95
 msgid "INT"
 msgstr ""
 
-#: popthelp.c:63
+#: popthelp.c:96
 msgid "LONG"
 msgstr ""
 
-#: popthelp.c:64
+#: popthelp.c:97
 msgid "STRING"
 msgstr ""
 
-#: popthelp.c:65
+#: popthelp.c:98
 msgid "FLOAT"
 msgstr ""
 
-#: popthelp.c:66
+#: popthelp.c:99
 msgid "DOUBLE"
 msgstr ""
 
-#: popthelp.c:67
+#: popthelp.c:100
 msgid "ARG"
 msgstr ""
 
-#: popthelp.c:241
+#: popthelp.c:434
 msgid "Usage:"
 msgstr ""
 
-#: popthelp.c:260
+#: popthelp.c:456
 msgid "[OPTION...]"
 msgstr ""
diff --git a/po/ja.po b/po/ja.po
index ae68916..9408ada 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -5,8 +5,8 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: popt 1.6.1\n"
-"POT-Creation-Date: 2001-02-22 17:41-0500\n"
+"Project-Id-Version: popt 1.6.3\n"
+"POT-Creation-Date: 2001-07-16 21:53-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -18,87 +18,99 @@ msgstr ""
 msgid "unknown errno"
 msgstr ""
 
-#: popt.c:758
+#: popt.c:892
 #, c-format
 msgid "option type (%d) not implemented in popt\n"
 msgstr ""
 
-#: popt.c:893
+#: popt.c:1100
 msgid "missing argument"
 msgstr ""
 
-#: popt.c:895
+#: popt.c:1102
 msgid "unknown option"
 msgstr ""
 
-#: popt.c:897
+#: popt.c:1104
 msgid "mutually exclusive logical operations requested"
 msgstr ""
 
-#: popt.c:899
+#: popt.c:1106
+msgid "opt->arg should not be NULL"
+msgstr ""
+
+#: popt.c:1108
 msgid "aliases nested too deeply"
 msgstr ""
 
-#: popt.c:901
+#: popt.c:1110
 msgid "error in parameter quoting"
 msgstr ""
 
-#: popt.c:903
+#: popt.c:1112
 msgid "invalid numeric value"
 msgstr ""
 
-#: popt.c:905
+#: popt.c:1114
 msgid "number too large or too small"
 msgstr ""
 
-#: popt.c:909
+#: popt.c:1116
+msgid "memory allocation failed"
+msgstr ""
+
+#: popt.c:1120
 msgid "unknown error"
 msgstr ""
 
-#: popthelp.c:28
+#: popthelp.c:47
 msgid "Show this help message"
 msgstr ""
 
-#: popthelp.c:29
+#: popthelp.c:48
 msgid "Display brief usage message"
 msgstr ""
 
-#: popthelp.c:60
+#: popthelp.c:51
+msgid "Display option defaults in message"
+msgstr ""
+
+#: popthelp.c:93
 msgid "NONE"
 msgstr ""
 
-#: popthelp.c:61
+#: popthelp.c:94
 msgid "VAL"
 msgstr ""
 
-#: popthelp.c:62
+#: popthelp.c:95
 msgid "INT"
 msgstr ""
 
-#: popthelp.c:63
+#: popthelp.c:96
 msgid "LONG"
 msgstr ""
 
-#: popthelp.c:64
+#: popthelp.c:97
 msgid "STRING"
 msgstr ""
 
-#: popthelp.c:65
+#: popthelp.c:98
 msgid "FLOAT"
 msgstr ""
 
-#: popthelp.c:66
+#: popthelp.c:99
 msgid "DOUBLE"
 msgstr ""
 
-#: popthelp.c:67
+#: popthelp.c:100
 msgid "ARG"
 msgstr ""
 
-#: popthelp.c:241
+#: popthelp.c:434
 msgid "Usage:"
 msgstr ""
 
-#: popthelp.c:260
+#: popthelp.c:456
 msgid "[OPTION...]"
 msgstr ""
diff --git a/po/ko.po b/po/ko.po
index ae68916..7cc9d25 100644
--- a/po/ko.po
+++ b/po/ko.po
@@ -1,104 +1,111 @@
-# SOME DESCRIPTIVE TITLE.
-# Copyright (C) YEAR Free Software Foundation, Inc.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#
-#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: popt 1.6.1\n"
-"POT-Creation-Date: 2001-02-22 17:41-0500\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
+"Project-Id-Version: popt 1.6\n"
+"POT-Creation-Date: 2001-07-16 21:53-0400\n"
+"PO-Revision-Date: 2001-09-06 20:06+0900\n"
+"Last-Translator: Jong-Hoon Ryu <redhat4u@netian.com>\n"
+"Language-Team: GNU Translation project <ko@li.org>\n"
 "MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=CHARSET\n"
-"Content-Transfer-Encoding: ENCODING\n"
+"Content-Type: text/plain; charset=EUC-KR\n"
+"Content-Transfer-Encoding: 8-bit\n"
 
 #: popt.c:29
 msgid "unknown errno"
-msgstr ""
+msgstr "�� �� ���� �����ڵ�(errno) �Դϴ�"
 
-#: popt.c:758
+#: popt.c:892
 #, c-format
 msgid "option type (%d) not implemented in popt\n"
-msgstr ""
+msgstr "�ɼ� ���� (%d)�� popt���� ����� �� �����ϴ�\n"
 
-#: popt.c:893
+#: popt.c:1100
 msgid "missing argument"
-msgstr ""
+msgstr "�μ��� �������� �ʾҽ��ϴ�"
 
-#: popt.c:895
+#: popt.c:1102
 msgid "unknown option"
-msgstr ""
+msgstr "�� �� ���� �ɼ��Դϴ�"
 
-#: popt.c:897
+#: popt.c:1104
 msgid "mutually exclusive logical operations requested"
-msgstr ""
+msgstr "���ʿ� ��Ÿ�� ���� ������ �����Ǿ����ϴ�"
+
+#: popt.c:1106
+msgid "opt->arg should not be NULL"
+msgstr "�ɼ�->�μ��� NULL�� �Ǿ�� �ȵ˴ϴ�"
 
-#: popt.c:899
+#: popt.c:1108
 msgid "aliases nested too deeply"
-msgstr ""
+msgstr "��Ī(alias)�� �����ϰ� �����Ǿ����ϴ�"
 
-#: popt.c:901
+#: popt.c:1110
 msgid "error in parameter quoting"
-msgstr ""
+msgstr "�Ű������� ������ �ֽ��ϴ�"
 
-#: popt.c:903
+#: popt.c:1112
 msgid "invalid numeric value"
-msgstr ""
+msgstr "�߸��� ��ġ ���Դϴ�"
 
-#: popt.c:905
+#: popt.c:1114
 msgid "number too large or too small"
-msgstr ""
+msgstr "���ڰ� �ʹ� ũ�ų� �ʹ� �����ϴ�"
 
-#: popt.c:909
+#: popt.c:1116
+msgid "memory allocation failed"
+msgstr "�޸� �Ҵ翡 �����߽��ϴ�"
+
+#: popt.c:1120
 msgid "unknown error"
-msgstr ""
+msgstr "�� �� ���� �����Դϴ�"
 
-#: popthelp.c:28
+#: popthelp.c:47
 msgid "Show this help message"
-msgstr ""
+msgstr "�� ������ �����ݴϴ�"
 
-#: popthelp.c:29
+#: popthelp.c:48
 msgid "Display brief usage message"
-msgstr ""
+msgstr "������ ������ �����ݴϴ�"
+
+#: popthelp.c:51
+msgid "Display option defaults in message"
+msgstr "�⺻���� �ɼ��� �����ݴϴ�"
 
-#: popthelp.c:60
+#: popthelp.c:93
 msgid "NONE"
-msgstr ""
+msgstr "����(NONE)"
 
-#: popthelp.c:61
+#: popthelp.c:94
 msgid "VAL"
-msgstr ""
+msgstr "��(VAL)"
 
-#: popthelp.c:62
+#: popthelp.c:95
 msgid "INT"
-msgstr ""
+msgstr "����(INT)"
 
-#: popthelp.c:63
+#: popthelp.c:96
 msgid "LONG"
-msgstr ""
+msgstr "����(LONG)"
 
-#: popthelp.c:64
+#: popthelp.c:97
 msgid "STRING"
-msgstr ""
+msgstr "���ڿ�(STRING)"
 
-#: popthelp.c:65
+#: popthelp.c:98
 msgid "FLOAT"
-msgstr ""
+msgstr "�Ҽ�(FLOAT)"
 
-#: popthelp.c:66
+#: popthelp.c:99
 msgid "DOUBLE"
-msgstr ""
+msgstr "�Ҽ�(DOUBLE)"
 
-#: popthelp.c:67
+#: popthelp.c:100
 msgid "ARG"
-msgstr ""
+msgstr "�μ�(ARG)"
 
-#: popthelp.c:241
+#: popthelp.c:434
 msgid "Usage:"
-msgstr ""
+msgstr "����:"
 
-#: popthelp.c:260
+#: popthelp.c:456
 msgid "[OPTION...]"
-msgstr ""
+msgstr "[�ɼ�...]"
diff --git a/po/no.po b/po/no.po
index f83d266..442be77 100644
--- a/po/no.po
+++ b/po/no.po
@@ -1,8 +1,8 @@
 msgid ""
 msgstr ""
-"Project-Id-Version: popt 1.6.1\n"
-"POT-Creation-Date: 2001-02-22 17:41-0500\n"
-"PO-Revision-Date: 2000-06-21 16:11+02:00\n"
+"Project-Id-Version: popt 1.6.3\n"
+"POT-Creation-Date: 2001-07-16 21:53-0400\n"
+"PO-Revision-Date: 2001-06-27 11:05+0200\n"
 "Last-Translator: Kjartan Maraas <kmaraas@online.no>\n"
 "Language-Team: Norwegian <no@li.org>\n"
 "MIME-Version: 1.0\n"
@@ -11,89 +11,101 @@ msgstr ""
 
 #: popt.c:29
 msgid "unknown errno"
-msgstr ""
+msgstr "ukjent errno"
 
-#: popt.c:758
+#: popt.c:892
 #, c-format
 msgid "option type (%d) not implemented in popt\n"
-msgstr ""
+msgstr "flaggtype (%d) ikke implementert i popt\n"
 
-#: popt.c:893
+#: popt.c:1100
 msgid "missing argument"
-msgstr ""
+msgstr "manglende argument"
 
-#: popt.c:895
+#: popt.c:1102
 msgid "unknown option"
-msgstr ""
+msgstr "ukjent flagg"
 
-#: popt.c:897
+#: popt.c:1104
 msgid "mutually exclusive logical operations requested"
-msgstr ""
+msgstr "gjensidig eksluderende logiske operasjoner forespurt"
+
+#: popt.c:1106
+msgid "opt->arg should not be NULL"
+msgstr "opt->arg m� ikke v�re NULL"
 
-#: popt.c:899
+#: popt.c:1108
 msgid "aliases nested too deeply"
-msgstr ""
+msgstr "aliaser med for dype l�kker"
 
-#: popt.c:901
+#: popt.c:1110
 msgid "error in parameter quoting"
-msgstr ""
+msgstr "feil i parametersitering"
 
-#: popt.c:903
+#: popt.c:1112
 msgid "invalid numeric value"
-msgstr ""
+msgstr "ugyldig numerisk verdi"
 
-#: popt.c:905
+#: popt.c:1114
 msgid "number too large or too small"
-msgstr ""
+msgstr "tallet er for stort eller lite"
+
+#: popt.c:1116
+msgid "memory allocation failed"
+msgstr "minneallokering feilet"
 
-#: popt.c:909
+#: popt.c:1120
 msgid "unknown error"
-msgstr ""
+msgstr "ukjent feil"
 
-#: popthelp.c:28
+#: popthelp.c:47
 msgid "Show this help message"
 msgstr "Vis denne hjelpmeldingen"
 
-#: popthelp.c:29
+#: popthelp.c:48
 msgid "Display brief usage message"
 msgstr "Vis kort bruksmelding"
 
-#: popthelp.c:60
+#: popthelp.c:51
+msgid "Display option defaults in message"
+msgstr "Vis forvalgte flagg i melding"
+
+#: popthelp.c:93
 msgid "NONE"
-msgstr ""
+msgstr "INGEN"
 
-#: popthelp.c:61
+#: popthelp.c:94
 msgid "VAL"
-msgstr ""
+msgstr "VERDI"
 
-#: popthelp.c:62
+#: popthelp.c:95
 msgid "INT"
-msgstr ""
+msgstr "HELTALL"
 
-#: popthelp.c:63
+#: popthelp.c:96
 msgid "LONG"
-msgstr ""
+msgstr "LONG"
 
-#: popthelp.c:64
+#: popthelp.c:97
 msgid "STRING"
-msgstr ""
+msgstr "STRENG"
 
-#: popthelp.c:65
+#: popthelp.c:98
 msgid "FLOAT"
-msgstr ""
+msgstr "FLYTTALL"
 
-#: popthelp.c:66
+#: popthelp.c:99
 msgid "DOUBLE"
-msgstr ""
+msgstr "DOUBLE"
 
-#: popthelp.c:67
+#: popthelp.c:100
 msgid "ARG"
-msgstr ""
+msgstr "ARG"
 
-#: popthelp.c:241
+#: popthelp.c:434
 msgid "Usage:"
-msgstr ""
+msgstr "Bruk:"
 
-#: popthelp.c:260
+#: popthelp.c:456
 msgid "[OPTION...]"
-msgstr ""
+msgstr "[FLAGG...]"
diff --git a/po/pl.po b/po/pl.po
index ae68916..9408ada 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -5,8 +5,8 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: popt 1.6.1\n"
-"POT-Creation-Date: 2001-02-22 17:41-0500\n"
+"Project-Id-Version: popt 1.6.3\n"
+"POT-Creation-Date: 2001-07-16 21:53-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -18,87 +18,99 @@ msgstr ""
 msgid "unknown errno"
 msgstr ""
 
-#: popt.c:758
+#: popt.c:892
 #, c-format
 msgid "option type (%d) not implemented in popt\n"
 msgstr ""
 
-#: popt.c:893
+#: popt.c:1100
 msgid "missing argument"
 msgstr ""
 
-#: popt.c:895
+#: popt.c:1102
 msgid "unknown option"
 msgstr ""
 
-#: popt.c:897
+#: popt.c:1104
 msgid "mutually exclusive logical operations requested"
 msgstr ""
 
-#: popt.c:899
+#: popt.c:1106
+msgid "opt->arg should not be NULL"
+msgstr ""
+
+#: popt.c:1108
 msgid "aliases nested too deeply"
 msgstr ""
 
-#: popt.c:901
+#: popt.c:1110
 msgid "error in parameter quoting"
 msgstr ""
 
-#: popt.c:903
+#: popt.c:1112
 msgid "invalid numeric value"
 msgstr ""
 
-#: popt.c:905
+#: popt.c:1114
 msgid "number too large or too small"
 msgstr ""
 
-#: popt.c:909
+#: popt.c:1116
+msgid "memory allocation failed"
+msgstr ""
+
+#: popt.c:1120
 msgid "unknown error"
 msgstr ""
 
-#: popthelp.c:28
+#: popthelp.c:47
 msgid "Show this help message"
 msgstr ""
 
-#: popthelp.c:29
+#: popthelp.c:48
 msgid "Display brief usage message"
 msgstr ""
 
-#: popthelp.c:60
+#: popthelp.c:51
+msgid "Display option defaults in message"
+msgstr ""
+
+#: popthelp.c:93
 msgid "NONE"
 msgstr ""
 
-#: popthelp.c:61
+#: popthelp.c:94
 msgid "VAL"
 msgstr ""
 
-#: popthelp.c:62
+#: popthelp.c:95
 msgid "INT"
 msgstr ""
 
-#: popthelp.c:63
+#: popthelp.c:96
 msgid "LONG"
 msgstr ""
 
-#: popthelp.c:64
+#: popthelp.c:97
 msgid "STRING"
 msgstr ""
 
-#: popthelp.c:65
+#: popthelp.c:98
 msgid "FLOAT"
 msgstr ""
 
-#: popthelp.c:66
+#: popthelp.c:99
 msgid "DOUBLE"
 msgstr ""
 
-#: popthelp.c:67
+#: popthelp.c:100
 msgid "ARG"
 msgstr ""
 
-#: popthelp.c:241
+#: popthelp.c:434
 msgid "Usage:"
 msgstr ""
 
-#: popthelp.c:260
+#: popthelp.c:456
 msgid "[OPTION...]"
 msgstr ""
diff --git a/po/popt.pot b/po/popt.pot
index a9d365f..c64d707 100644
--- a/po/popt.pot
+++ b/po/popt.pot
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2001-07-16 22:58-0400\n"
+"POT-Creation-Date: 2001-07-16 21:53-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/po/pt.po b/po/pt.po
index 621a00a..d7561b7 100644
--- a/po/pt.po
+++ b/po/pt.po
@@ -1,8 +1,8 @@
 msgid ""
 msgstr ""
-"Project-Id-Version: popt 1.6.1\n"
-"POT-Creation-Date: 2001-02-22 17:41-0500\n"
-"PO-Revision-Date: 2000-06-22 01:02+01:00\n"
+"Project-Id-Version: popt 1.6.3\n"
+"POT-Creation-Date: 2001-07-16 21:53-0400\n"
+"PO-Revision-Date: 2001-01-21 19:31+00:00\n"
 "Last-Translator: Pedro Morais <morais@kde.org>\n"
 "Language-Team: pt <morais@kde.org>\n"
 "MIME-Version: 1.0\n"
@@ -11,89 +11,102 @@ msgstr ""
 
 #: popt.c:29
 msgid "unknown errno"
-msgstr ""
+msgstr "errno desconhecido"
 
-#: popt.c:758
+#: popt.c:892
 #, c-format
 msgid "option type (%d) not implemented in popt\n"
-msgstr ""
+msgstr "tipo de op��o (%d) n�o implementado no popt\n"
 
-#: popt.c:893
+#: popt.c:1100
 msgid "missing argument"
-msgstr ""
+msgstr "falta um argumento"
 
-#: popt.c:895
+#: popt.c:1102
 msgid "unknown option"
-msgstr ""
+msgstr "op��o desconhecida"
 
-#: popt.c:897
+#: popt.c:1104
 msgid "mutually exclusive logical operations requested"
+msgstr "foram pedidas opera��es l�gicas mutuamente exclusivas"
+
+#: popt.c:1106
+msgid "opt->arg should not be NULL"
 msgstr ""
 
-#: popt.c:899
+#: popt.c:1108
 msgid "aliases nested too deeply"
-msgstr ""
+msgstr "'aliases' demasiado aninhados"
 
-#: popt.c:901
+#: popt.c:1110
 msgid "error in parameter quoting"
-msgstr ""
+msgstr "erros no 'quoting' de par�metros"
 
-#: popt.c:903
+#: popt.c:1112
 msgid "invalid numeric value"
-msgstr ""
+msgstr "valor n�merico inv�lido"
 
-#: popt.c:905
+#: popt.c:1114
 msgid "number too large or too small"
+msgstr "n�mero demasiado grando ou pequeno"
+
+#: popt.c:1116
+msgid "memory allocation failed"
 msgstr ""
 
-#: popt.c:909
+#: popt.c:1120
 msgid "unknown error"
-msgstr ""
+msgstr "erro desconhecido"
 
-#: popthelp.c:28
+#: popthelp.c:47
 msgid "Show this help message"
 msgstr "Mostrar esta mensagem de ajuda"
 
-#: popthelp.c:29
+#: popthelp.c:48
 msgid "Display brief usage message"
 msgstr "Mostrar uma mensagem de utiliza��o sucinta"
 
-#: popthelp.c:60
+#: popthelp.c:51
+#, fuzzy
+msgid "Display option defaults in message"
+msgstr "Mostrar uma mensagem de utiliza��o sucinta"
+
+#: popthelp.c:93
 msgid "NONE"
-msgstr ""
+msgstr "NONE"
 
-#: popthelp.c:61
+#: popthelp.c:94
 msgid "VAL"
-msgstr ""
+msgstr "VAL"
 
-#: popthelp.c:62
+#: popthelp.c:95
 msgid "INT"
-msgstr ""
+msgstr "INT"
 
-#: popthelp.c:63
+#: popthelp.c:96
 msgid "LONG"
-msgstr ""
+msgstr "LONG"
 
-#: popthelp.c:64
+#: popthelp.c:97
 msgid "STRING"
-msgstr ""
+msgstr "STRING"
 
-#: popthelp.c:65
+#: popthelp.c:98
 msgid "FLOAT"
-msgstr ""
+msgstr "FLOAT"
 
-#: popthelp.c:66
+#: popthelp.c:99
 msgid "DOUBLE"
-msgstr ""
+msgstr "DOUBLE"
 
-#: popthelp.c:67
+#: popthelp.c:100
 msgid "ARG"
-msgstr ""
+msgstr "ARG"
 
-#: popthelp.c:241
+#: popthelp.c:434
 msgid "Usage:"
-msgstr ""
+msgstr "Utiliza��o:"
 
-#: popthelp.c:260
+#: popthelp.c:456
 msgid "[OPTION...]"
-msgstr ""
+msgstr "[OP��O...]"
diff --git a/po/pt_BR.po b/po/pt_BR.po
index ae68916..9408ada 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -5,8 +5,8 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: popt 1.6.1\n"
-"POT-Creation-Date: 2001-02-22 17:41-0500\n"
+"Project-Id-Version: popt 1.6.3\n"
+"POT-Creation-Date: 2001-07-16 21:53-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -18,87 +18,99 @@ msgstr ""
 msgid "unknown errno"
 msgstr ""
 
-#: popt.c:758
+#: popt.c:892
 #, c-format
 msgid "option type (%d) not implemented in popt\n"
 msgstr ""
 
-#: popt.c:893
+#: popt.c:1100
 msgid "missing argument"
 msgstr ""
 
-#: popt.c:895
+#: popt.c:1102
 msgid "unknown option"
 msgstr ""
 
-#: popt.c:897
+#: popt.c:1104
 msgid "mutually exclusive logical operations requested"
 msgstr ""
 
-#: popt.c:899
+#: popt.c:1106
+msgid "opt->arg should not be NULL"
+msgstr ""
+
+#: popt.c:1108
 msgid "aliases nested too deeply"
 msgstr ""
 
-#: popt.c:901
+#: popt.c:1110
 msgid "error in parameter quoting"
 msgstr ""
 
-#: popt.c:903
+#: popt.c:1112
 msgid "invalid numeric value"
 msgstr ""
 
-#: popt.c:905
+#: popt.c:1114
 msgid "number too large or too small"
 msgstr ""
 
-#: popt.c:909
+#: popt.c:1116
+msgid "memory allocation failed"
+msgstr ""
+
+#: popt.c:1120
 msgid "unknown error"
 msgstr ""
 
-#: popthelp.c:28
+#: popthelp.c:47
 msgid "Show this help message"
 msgstr ""
 
-#: popthelp.c:29
+#: popthelp.c:48
 msgid "Display brief usage message"
 msgstr ""
 
-#: popthelp.c:60
+#: popthelp.c:51
+msgid "Display option defaults in message"
+msgstr ""
+
+#: popthelp.c:93
 msgid "NONE"
 msgstr ""
 
-#: popthelp.c:61
+#: popthelp.c:94
 msgid "VAL"
 msgstr ""
 
-#: popthelp.c:62
+#: popthelp.c:95
 msgid "INT"
 msgstr ""
 
-#: popthelp.c:63
+#: popthelp.c:96
 msgid "LONG"
 msgstr ""
 
-#: popthelp.c:64
+#: popthelp.c:97
 msgid "STRING"
 msgstr ""
 
-#: popthelp.c:65
+#: popthelp.c:98
 msgid "FLOAT"
 msgstr ""
 
-#: popthelp.c:66
+#: popthelp.c:99
 msgid "DOUBLE"
 msgstr ""
 
-#: popthelp.c:67
+#: popthelp.c:100
 msgid "ARG"
 msgstr ""
 
-#: popthelp.c:241
+#: popthelp.c:434
 msgid "Usage:"
 msgstr ""
 
-#: popthelp.c:260
+#: popthelp.c:456
 msgid "[OPTION...]"
 msgstr ""
diff --git a/po/ro.po b/po/ro.po
index f36a58d..9d54554 100644
--- a/po/ro.po
+++ b/po/ro.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
-"Project-Id-Version: popt 1.6.1\n"
-"POT-Creation-Date: 2001-02-22 17:41-0500\n"
+"Project-Id-Version: popt 1.6.3\n"
+"POT-Creation-Date: 2001-07-16 21:53-0400\n"
 "PO-Revision-Date: 2000-06-14 23:23+EST\n"
 "Last-Translator: Cristian Gafton <gafton@redhat.com>\n"
 "Language-Team: Romanian <ro@li.org>\n"
@@ -13,88 +13,101 @@ msgstr ""
 msgid "unknown errno"
 msgstr "eroare necunoscuta"
 
-#: popt.c:758
+#: popt.c:892
 #, c-format
 msgid "option type (%d) not implemented in popt\n"
 msgstr "optiunea de tipul (%d) nu este implementata in popt\n"
 
-#: popt.c:893
+#: popt.c:1100
 msgid "missing argument"
 msgstr "argument lipsa"
 
-#: popt.c:895
+#: popt.c:1102
 msgid "unknown option"
 msgstr "optiune necunoscuta"
 
-#: popt.c:897
+#: popt.c:1104
 msgid "mutually exclusive logical operations requested"
 msgstr ""
 
-#: popt.c:899
+#: popt.c:1106
+msgid "opt->arg should not be NULL"
+msgstr ""
+
+#: popt.c:1108
 msgid "aliases nested too deeply"
 msgstr "recursivitate infinita la optiunile sinonime"
 
-#: popt.c:901
+#: popt.c:1110
 #, fuzzy
 msgid "error in parameter quoting"
 msgstr "eroare la insertie parametru"
 
-#: popt.c:903
+#: popt.c:1112
 msgid "invalid numeric value"
 msgstr "valoare numarica invalida"
 
-#: popt.c:905
+#: popt.c:1114
 msgid "number too large or too small"
 msgstr "numar prea mare sau prea mic"
 
-#: popt.c:909
+#: popt.c:1116
+msgid "memory allocation failed"
+msgstr ""
+
+#: popt.c:1120
 msgid "unknown error"
 msgstr "eroare necuinoscuta"
 
-#: popthelp.c:28
+#: popthelp.c:47
 msgid "Show this help message"
 msgstr "Afisare mesaj de help"
 
-#: popthelp.c:29
+#: popthelp.c:48
 msgid "Display brief usage message"
 msgstr "Afisare mesaj sintaxa sumar"
 
-#: popthelp.c:60
+#: popthelp.c:51
+#, fuzzy
+msgid "Display option defaults in message"
+msgstr "Afisare mesaj sintaxa sumar"
+
+#: popthelp.c:93
 msgid "NONE"
 msgstr ""
 
-#: popthelp.c:61
+#: popthelp.c:94
 msgid "VAL"
 msgstr ""
 
-#: popthelp.c:62
+#: popthelp.c:95
 msgid "INT"
 msgstr ""
 
-#: popthelp.c:63
+#: popthelp.c:96
 msgid "LONG"
 msgstr ""
 
-#: popthelp.c:64
+#: popthelp.c:97
 msgid "STRING"
 msgstr ""
 
-#: popthelp.c:65
+#: popthelp.c:98
 msgid "FLOAT"
 msgstr ""
 
-#: popthelp.c:66
+#: popthelp.c:99
 msgid "DOUBLE"
 msgstr ""
 
-#: popthelp.c:67
+#: popthelp.c:100
 msgid "ARG"
 msgstr ""
 
-#: popthelp.c:241
+#: popthelp.c:434
 msgid "Usage:"
 msgstr "Sintaxa:"
 
-#: popthelp.c:260
+#: popthelp.c:456
 msgid "[OPTION...]"
 msgstr "[OPTIUNE...]"
diff --git a/po/ru.po b/po/ru.po
index 5ff7be3..a571ec2 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -1,9 +1,9 @@
 msgid ""
 msgstr ""
-"Project-Id-Version: popt 1.6.1\n"
-"POT-Creation-Date: 2001-02-22 17:41-0500\n"
-"PO-Revision-Date: 2000-08-13 21:00+0300\n"
-"Last-Translator: Leon Kanter <leon@blackcatlinux.com>\n"
+"Project-Id-Version: popt 1.6.3\n"
+"POT-Creation-Date: 2001-07-16 21:53-0400\n"
+"PO-Revision-Date: 2001-07-05 21:00-0500\n"
+"Last-Translator: Eugene Kanter <eugene@blackcatlinux.com>\n"
 "Language-Team: Black Cat Linux Team <blackcat-support@blackcatlinux.com>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=koi8-r\n"
@@ -11,89 +11,101 @@ msgstr ""
 
 #: popt.c:29
 msgid "unknown errno"
-msgstr ""
+msgstr "����������� ����� ������"
 
-#: popt.c:758
+#: popt.c:892
 #, c-format
 msgid "option type (%d) not implemented in popt\n"
-msgstr ""
+msgstr "��������� ��������� (%d) � popt �� �������������\n"
 
-#: popt.c:893
+#: popt.c:1100
 msgid "missing argument"
-msgstr ""
+msgstr "�������� ��������"
 
-#: popt.c:895
+#: popt.c:1102
 msgid "unknown option"
-msgstr ""
+msgstr "����������� ��������"
 
-#: popt.c:897
+#: popt.c:1104
 msgid "mutually exclusive logical operations requested"
-msgstr ""
+msgstr "��������� ������� ����������� ���������� ��������"
+
+#: popt.c:1106
+msgid "opt->arg should not be NULL"
+msgstr "opt->arg �� ����� ���� NULL"
 
-#: popt.c:899
+#: popt.c:1108
 msgid "aliases nested too deeply"
-msgstr ""
+msgstr "�������� ������� ���������� �������� �����������"
 
-#: popt.c:901
+#: popt.c:1110
 msgid "error in parameter quoting"
-msgstr ""
+msgstr "�����a ��������� ���������� � �������"
 
-#: popt.c:903
+#: popt.c:1112
 msgid "invalid numeric value"
-msgstr ""
+msgstr "������������ �������� ��������"
 
-#: popt.c:905
+#: popt.c:1114
 msgid "number too large or too small"
-msgstr ""
+msgstr "�������� �������� �� ��������� ����������������"
+
+#: popt.c:1116
+msgid "memory allocation failed"
+msgstr "������ ��������� ������"
 
-#: popt.c:909
+#: popt.c:1120
 msgid "unknown error"
-msgstr ""
+msgstr "����������� ������"
 
-#: popthelp.c:28
+#: popthelp.c:47
 msgid "Show this help message"
 msgstr "�������� ��� ���������"
 
-#: popthelp.c:29
+#: popthelp.c:48
 msgid "Display brief usage message"
 msgstr "�������� ������� ���������� �� �������������"
 
-#: popthelp.c:60
+#: popthelp.c:51
+msgid "Display option defaults in message"
+msgstr "�������� ��������� �� ���������"
+
+#: popthelp.c:93
 msgid "NONE"
-msgstr ""
+msgstr "NONE"
 
-#: popthelp.c:61
+#: popthelp.c:94
 msgid "VAL"
-msgstr ""
+msgstr "VAL"
 
-#: popthelp.c:62
+#: popthelp.c:95
 msgid "INT"
-msgstr ""
+msgstr "INT"
 
-#: popthelp.c:63
+#: popthelp.c:96
 msgid "LONG"
-msgstr ""
+msgstr "LONG"
 
-#: popthelp.c:64
+#: popthelp.c:97
 msgid "STRING"
-msgstr ""
+msgstr "STRING"
 
-#: popthelp.c:65
+#: popthelp.c:98
 msgid "FLOAT"
-msgstr ""
+msgstr "FLOAT"
 
-#: popthelp.c:66
+#: popthelp.c:99
 msgid "DOUBLE"
-msgstr ""
+msgstr "DOUBLE"
 
-#: popthelp.c:67
+#: popthelp.c:100
 msgid "ARG"
-msgstr ""
+msgstr "ARG"
 
-#: popthelp.c:241
+#: popthelp.c:434
 msgid "Usage:"
-msgstr ""
+msgstr "�������������:"
 
-#: popthelp.c:260
+#: popthelp.c:456
 msgid "[OPTION...]"
-msgstr ""
+msgstr "[��������...]"
diff --git a/po/sk.po b/po/sk.po
index 4f3ba8b..835a717 100644
--- a/po/sk.po
+++ b/po/sk.po
@@ -4,8 +4,8 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: popt 1.6.1\n"
-"POT-Creation-Date: 2001-02-22 17:41-0500\n"
+"Project-Id-Version: popt 1.6.3\n"
+"POT-Creation-Date: 2001-07-16 21:53-0400\n"
 "PO-Revision-Date: 1999-08-04 21:40+0200\n"
 "Last-Translator: Stanislav Meduna <stano@eunet.sk>\n"
 "Language-Team: Slovak <sk-i18n@rak.isternet.sk>\n"
@@ -17,87 +17,100 @@ msgstr ""
 msgid "unknown errno"
 msgstr ""
 
-#: popt.c:758
+#: popt.c:892
 #, c-format
 msgid "option type (%d) not implemented in popt\n"
 msgstr ""
 
-#: popt.c:893
+#: popt.c:1100
 msgid "missing argument"
 msgstr ""
 
-#: popt.c:895
+#: popt.c:1102
 msgid "unknown option"
 msgstr ""
 
-#: popt.c:897
+#: popt.c:1104
 msgid "mutually exclusive logical operations requested"
 msgstr ""
 
-#: popt.c:899
+#: popt.c:1106
+msgid "opt->arg should not be NULL"
+msgstr ""
+
+#: popt.c:1108
 msgid "aliases nested too deeply"
 msgstr ""
 
-#: popt.c:901
+#: popt.c:1110
 msgid "error in parameter quoting"
 msgstr ""
 
-#: popt.c:903
+#: popt.c:1112
 msgid "invalid numeric value"
 msgstr ""
 
-#: popt.c:905
+#: popt.c:1114
 msgid "number too large or too small"
 msgstr ""
 
-#: popt.c:909
+#: popt.c:1116
+msgid "memory allocation failed"
+msgstr ""
+
+#: popt.c:1120
 msgid "unknown error"
 msgstr ""
 
-#: popthelp.c:28
+#: popthelp.c:47
 msgid "Show this help message"
 msgstr "Vyp�sa� t�to spr�vu"
 
-#: popthelp.c:29
+#: popthelp.c:48
 msgid "Display brief usage message"
 msgstr "Zobrazi� stru�n� n�vod na pou�itie"
 
-#: popthelp.c:60
+#: popthelp.c:51
+#, fuzzy
+msgid "Display option defaults in message"
+msgstr "Zobrazi� stru�n� n�vod na pou�itie"
+
+#: popthelp.c:93
 msgid "NONE"
 msgstr ""
 
-#: popthelp.c:61
+#: popthelp.c:94
 msgid "VAL"
 msgstr ""
 
-#: popthelp.c:62
+#: popthelp.c:95
 msgid "INT"
 msgstr ""
 
-#: popthelp.c:63
+#: popthelp.c:96
 msgid "LONG"
 msgstr ""
 
-#: popthelp.c:64
+#: popthelp.c:97
 msgid "STRING"
 msgstr ""
 
-#: popthelp.c:65
+#: popthelp.c:98
 msgid "FLOAT"
 msgstr ""
 
-#: popthelp.c:66
+#: popthelp.c:99
 msgid "DOUBLE"
 msgstr ""
 
-#: popthelp.c:67
+#: popthelp.c:100
 msgid "ARG"
 msgstr ""
 
-#: popthelp.c:241
+#: popthelp.c:434
 msgid "Usage:"
 msgstr ""
 
-#: popthelp.c:260
+#: popthelp.c:456
 msgid "[OPTION...]"
 msgstr ""
diff --git a/po/sl.po b/po/sl.po
index f0543ff..8a6d09c 100644
--- a/po/sl.po
+++ b/po/sl.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
-"Project-Id-Version: popt 1.6.1\n"
-"POT-Creation-Date: 2001-02-22 17:41-0500\n"
+"Project-Id-Version: popt 1.6.3\n"
+"POT-Creation-Date: 2001-07-16 21:53-0400\n"
 "PO-Revision-Date: 2000-09-05 12:30+0200\n"
 "Last-Translator: Roman Maurer <roman.maurer@hermes.si>\n"
 "Language-Team: Slovenian <sl@li.org>\n"
@@ -13,87 +13,100 @@ msgstr ""
 msgid "unknown errno"
 msgstr ""
 
-#: popt.c:758
+#: popt.c:892
 #, c-format
 msgid "option type (%d) not implemented in popt\n"
 msgstr ""
 
-#: popt.c:893
+#: popt.c:1100
 msgid "missing argument"
 msgstr ""
 
-#: popt.c:895
+#: popt.c:1102
 msgid "unknown option"
 msgstr ""
 
-#: popt.c:897
+#: popt.c:1104
 msgid "mutually exclusive logical operations requested"
 msgstr ""
 
-#: popt.c:899
+#: popt.c:1106
+msgid "opt->arg should not be NULL"
+msgstr ""
+
+#: popt.c:1108
 msgid "aliases nested too deeply"
 msgstr ""
 
-#: popt.c:901
+#: popt.c:1110
 msgid "error in parameter quoting"
 msgstr ""
 
-#: popt.c:903
+#: popt.c:1112
 msgid "invalid numeric value"
 msgstr ""
 
-#: popt.c:905
+#: popt.c:1114
 msgid "number too large or too small"
 msgstr ""
 
-#: popt.c:909
+#: popt.c:1116
+msgid "memory allocation failed"
+msgstr ""
+
+#: popt.c:1120
 msgid "unknown error"
 msgstr ""
 
-#: popthelp.c:28
+#: popthelp.c:47
 msgid "Show this help message"
 msgstr "Prika�i to sporo�ilo s pomo�jo"
 
-#: popthelp.c:29
+#: popthelp.c:48
 msgid "Display brief usage message"
 msgstr "Prika�i kratko sporo�ilo o uporabi"
 
-#: popthelp.c:60
+#: popthelp.c:51
+#, fuzzy
+msgid "Display option defaults in message"
+msgstr "Prika�i kratko sporo�ilo o uporabi"
+
+#: popthelp.c:93
 msgid "NONE"
 msgstr ""
 
-#: popthelp.c:61
+#: popthelp.c:94
 msgid "VAL"
 msgstr ""
 
-#: popthelp.c:62
+#: popthelp.c:95
 msgid "INT"
 msgstr ""
 
-#: popthelp.c:63
+#: popthelp.c:96
 msgid "LONG"
 msgstr ""
 
-#: popthelp.c:64
+#: popthelp.c:97
 msgid "STRING"
 msgstr ""
 
-#: popthelp.c:65
+#: popthelp.c:98
 msgid "FLOAT"
 msgstr ""
 
-#: popthelp.c:66
+#: popthelp.c:99
 msgid "DOUBLE"
 msgstr ""
 
-#: popthelp.c:67
+#: popthelp.c:100
 msgid "ARG"
 msgstr ""
 
-#: popthelp.c:241
+#: popthelp.c:434
 msgid "Usage:"
 msgstr ""
 
-#: popthelp.c:260
+#: popthelp.c:456
 msgid "[OPTION...]"
 msgstr ""
diff --git a/po/sr.po b/po/sr.po
index ae68916..9408ada 100644
--- a/po/sr.po
+++ b/po/sr.po
@@ -5,8 +5,8 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: popt 1.6.1\n"
-"POT-Creation-Date: 2001-02-22 17:41-0500\n"
+"Project-Id-Version: popt 1.6.3\n"
+"POT-Creation-Date: 2001-07-16 21:53-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -18,87 +18,99 @@ msgstr ""
 msgid "unknown errno"
 msgstr ""
 
-#: popt.c:758
+#: popt.c:892
 #, c-format
 msgid "option type (%d) not implemented in popt\n"
 msgstr ""
 
-#: popt.c:893
+#: popt.c:1100
 msgid "missing argument"
 msgstr ""
 
-#: popt.c:895
+#: popt.c:1102
 msgid "unknown option"
 msgstr ""
 
-#: popt.c:897
+#: popt.c:1104
 msgid "mutually exclusive logical operations requested"
 msgstr ""
 
-#: popt.c:899
+#: popt.c:1106
+msgid "opt->arg should not be NULL"
+msgstr ""
+
+#: popt.c:1108
 msgid "aliases nested too deeply"
 msgstr ""
 
-#: popt.c:901
+#: popt.c:1110
 msgid "error in parameter quoting"
 msgstr ""
 
-#: popt.c:903
+#: popt.c:1112
 msgid "invalid numeric value"
 msgstr ""
 
-#: popt.c:905
+#: popt.c:1114
 msgid "number too large or too small"
 msgstr ""
 
-#: popt.c:909
+#: popt.c:1116
+msgid "memory allocation failed"
+msgstr ""
+
+#: popt.c:1120
 msgid "unknown error"
 msgstr ""
 
-#: popthelp.c:28
+#: popthelp.c:47
 msgid "Show this help message"
 msgstr ""
 
-#: popthelp.c:29
+#: popthelp.c:48
 msgid "Display brief usage message"
 msgstr ""
 
-#: popthelp.c:60
+#: popthelp.c:51
+msgid "Display option defaults in message"
+msgstr ""
+
+#: popthelp.c:93
 msgid "NONE"
 msgstr ""
 
-#: popthelp.c:61
+#: popthelp.c:94
 msgid "VAL"
 msgstr ""
 
-#: popthelp.c:62
+#: popthelp.c:95
 msgid "INT"
 msgstr ""
 
-#: popthelp.c:63
+#: popthelp.c:96
 msgid "LONG"
 msgstr ""
 
-#: popthelp.c:64
+#: popthelp.c:97
 msgid "STRING"
 msgstr ""
 
-#: popthelp.c:65
+#: popthelp.c:98
 msgid "FLOAT"
 msgstr ""
 
-#: popthelp.c:66
+#: popthelp.c:99
 msgid "DOUBLE"
 msgstr ""
 
-#: popthelp.c:67
+#: popthelp.c:100
 msgid "ARG"
 msgstr ""
 
-#: popthelp.c:241
+#: popthelp.c:434
 msgid "Usage:"
 msgstr ""
 
-#: popthelp.c:260
+#: popthelp.c:456
 msgid "[OPTION...]"
 msgstr ""
diff --git a/po/sv.po b/po/sv.po
index 407c4d0..07b50f5 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -1,99 +1,111 @@
 msgid ""
 msgstr ""
-"Project-Id-Version: popt 1.6.1\n"
-"POT-Creation-Date: 2001-02-22 17:41-0500\n"
-"PO-Revision-Date: 2000-06-20 00:07+0200\n"
+"Project-Id-Version: popt 1.6.3\n"
+"POT-Creation-Date: 2001-07-16 21:53-0400\n"
+"PO-Revision-Date: 2001-07-12 22:26+0100\n"
 "Last-Translator: Christian Rose <menthos@menthos.com>\n"
 "Language-Team: Swedish <sv@li.org>\n"
 "MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=ISO-8859-1\n"
+"Content-Type: text/plain; charset=iso-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
 
 #: popt.c:29
 msgid "unknown errno"
-msgstr ""
+msgstr "ok�nt felnummer"
 
-#: popt.c:758
+#: popt.c:892
 #, c-format
 msgid "option type (%d) not implemented in popt\n"
-msgstr ""
+msgstr "flaggtypen (%d) �r inte implementerad i popt\n"
 
-#: popt.c:893
+#: popt.c:1100
 msgid "missing argument"
-msgstr ""
+msgstr "argument saknas"
 
-#: popt.c:895
+#: popt.c:1102
 msgid "unknown option"
-msgstr ""
+msgstr "ok�nd flagga"
 
-#: popt.c:897
+#: popt.c:1104
 msgid "mutually exclusive logical operations requested"
-msgstr ""
+msgstr "�msesidigt uteslutande logiska operationer beg�rdes"
+
+#: popt.c:1106
+msgid "opt->arg should not be NULL"
+msgstr "opt->arg f�r inte vara NULL"
 
-#: popt.c:899
+#: popt.c:1108
 msgid "aliases nested too deeply"
-msgstr ""
+msgstr "alias �r n�stlade f�r djupt"
 
-#: popt.c:901
+#: popt.c:1110
 msgid "error in parameter quoting"
-msgstr ""
+msgstr "fel i parametercitering"
 
-#: popt.c:903
+#: popt.c:1112
 msgid "invalid numeric value"
-msgstr ""
+msgstr "ogiltigt numeriskt v�rde"
 
-#: popt.c:905
+#: popt.c:1114
 msgid "number too large or too small"
-msgstr ""
+msgstr "talet f�r stort eller f�r litet"
+
+#: popt.c:1116
+msgid "memory allocation failed"
+msgstr "minnesallokering misslyckades"
 
-#: popt.c:909
+#: popt.c:1120
 msgid "unknown error"
-msgstr ""
+msgstr "ok�nt fel"
 
-#: popthelp.c:28
+#: popthelp.c:47
 msgid "Show this help message"
-msgstr "Visa detta hj�lpmeddelande"
+msgstr "Visa denna hj�lptext"
 
-#: popthelp.c:29
+#: popthelp.c:48
 msgid "Display brief usage message"
-msgstr "Visa ett kortfattat anv�ndningsmeddelande"
+msgstr "Visa en kortfattad anv�ndningstext"
 
-#: popthelp.c:60
+#: popthelp.c:51
+msgid "Display option defaults in message"
+msgstr "Visa standardalternativ f�r flaggor i meddelande"
+
+#: popthelp.c:93
 msgid "NONE"
-msgstr ""
+msgstr "INGET"
 
-#: popthelp.c:61
+#: popthelp.c:94
 msgid "VAL"
-msgstr ""
+msgstr "V�RDE"
 
-#: popthelp.c:62
+#: popthelp.c:95
 msgid "INT"
-msgstr ""
+msgstr "HELTAL"
 
-#: popthelp.c:63
+#: popthelp.c:96
 msgid "LONG"
-msgstr ""
+msgstr "L�NG"
 
-#: popthelp.c:64
+#: popthelp.c:97
 msgid "STRING"
-msgstr ""
+msgstr "STR�NG"
 
-#: popthelp.c:65
+#: popthelp.c:98
 msgid "FLOAT"
-msgstr ""
+msgstr "FLYTTAL"
 
-#: popthelp.c:66
+#: popthelp.c:99
 msgid "DOUBLE"
-msgstr ""
+msgstr "DUBBEL"
 
-#: popthelp.c:67
+#: popthelp.c:100
 msgid "ARG"
-msgstr ""
+msgstr "ARG"
 
-#: popthelp.c:241
+#: popthelp.c:434
 msgid "Usage:"
-msgstr ""
+msgstr "Anv�ndning:"
 
-#: popthelp.c:260
+#: popthelp.c:456
 msgid "[OPTION...]"
-msgstr ""
+msgstr "[FLAGGA...]"
diff --git a/po/tr.po b/po/tr.po
index 03c94a8..636c251 100644
--- a/po/tr.po
+++ b/po/tr.po
@@ -1,99 +1,112 @@
 msgid ""
 msgstr ""
-"Project-Id-Version: popt 1.6.1\n"
-"POT-Creation-Date: 2001-02-22 17:41-0500\n"
-"PO-Revision-Date: 2000-01-06 13:01+0100\n"
-"Last-Translator: G�rkem �etin <kabalak@gmx.net>\n"
-"Language-Team: Gelecek A.� <gorkem@gelecek.com.tr>\n"
+"Project-Id-Version: popt 1.6.3\n"
+"POT-Creation-Date: 2001-07-16 21:53-0400\n"
+"PO-Revision-Date: 2000-02-11 13:01+0200\n"
+"Last-Translator: Nilgun Belma Buguner <nilgun@technologist.com>\n"
+"Language-Team: Turkish <tr@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=iso8859-9\n"
 "Content-Transfer-Encoding: 8bit\n"
 
 #: popt.c:29
 msgid "unknown errno"
-msgstr ""
+msgstr "bilinmeyen hata no"
 
-#: popt.c:758
+#: popt.c:892
 #, c-format
 msgid "option type (%d) not implemented in popt\n"
-msgstr ""
+msgstr "se�enek t�r� (%d) popt i�in ge�ersiz\n"
 
-#: popt.c:893
+#: popt.c:1100
 msgid "missing argument"
-msgstr ""
+msgstr "arg�man eksik"
 
-#: popt.c:895
+#: popt.c:1102
 msgid "unknown option"
-msgstr ""
+msgstr "bilinmeyen se�enek"
 
-#: popt.c:897
+#: popt.c:1104
 msgid "mutually exclusive logical operations requested"
+msgstr "birbirini d��layan mant�ksal i�lemler istendi"
+
+#: popt.c:1106
+msgid "opt->arg should not be NULL"
 msgstr ""
 
-#: popt.c:899
+#: popt.c:1108
 msgid "aliases nested too deeply"
-msgstr ""
+msgstr "adlarda �ok fazla i�i�elikler"
 
-#: popt.c:901
+#: popt.c:1110
 msgid "error in parameter quoting"
-msgstr ""
+msgstr "parametrelerde t�rnak i�aretleme hatal� "
 
-#: popt.c:903
+#: popt.c:1112
 msgid "invalid numeric value"
-msgstr ""
+msgstr "say�sal de�er ge�ersiz"
 
-#: popt.c:905
+#: popt.c:1114
 msgid "number too large or too small"
+msgstr "say� ya �ok b�y�k ya da �ok k���k"
+
+#: popt.c:1116
+msgid "memory allocation failed"
 msgstr ""
 
-#: popt.c:909
+#: popt.c:1120
 msgid "unknown error"
-msgstr ""
+msgstr "bilinmeyen hata"
 
-#: popthelp.c:28
+#: popthelp.c:47
 msgid "Show this help message"
 msgstr "Bu yard�m iletisini g�sterir"
 
-#: popthelp.c:29
+#: popthelp.c:48
 msgid "Display brief usage message"
 msgstr "K�sa bir kullan�m iletisi g�ster"
 
-#: popthelp.c:60
+#: popthelp.c:51
+#, fuzzy
+msgid "Display option defaults in message"
+msgstr "K�sa bir kullan�m iletisi g�ster"
+
+#: popthelp.c:93
 msgid "NONE"
-msgstr ""
+msgstr "YOK"
 
-#: popthelp.c:61
+#: popthelp.c:94
 msgid "VAL"
-msgstr ""
+msgstr "DE�"
 
-#: popthelp.c:62
+#: popthelp.c:95
 msgid "INT"
-msgstr ""
+msgstr "INT"
 
-#: popthelp.c:63
+#: popthelp.c:96
 msgid "LONG"
-msgstr ""
+msgstr "LONG"
 
-#: popthelp.c:64
+#: popthelp.c:97
 msgid "STRING"
-msgstr ""
+msgstr "STRING"
 
-#: popthelp.c:65
+#: popthelp.c:98
 msgid "FLOAT"
-msgstr ""
+msgstr "FLOAT"
 
-#: popthelp.c:66
+#: popthelp.c:99
 msgid "DOUBLE"
-msgstr ""
+msgstr "DOUBLE"
 
-#: popthelp.c:67
+#: popthelp.c:100
 msgid "ARG"
-msgstr ""
+msgstr "ARG"
 
-#: popthelp.c:241
+#: popthelp.c:434
 msgid "Usage:"
-msgstr ""
+msgstr "Kullan�m�:"
 
-#: popthelp.c:260
+#: popthelp.c:456
 msgid "[OPTION...]"
-msgstr ""
+msgstr "[SE�ENEK...]"
diff --git a/po/uk.po b/po/uk.po
index 011fccc..20bb3c7 100644
--- a/po/uk.po
+++ b/po/uk.po
@@ -4,8 +4,8 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: popt 1.6.1\n"
-"POT-Creation-Date: 2001-02-22 17:41-0500\n"
+"Project-Id-Version: popt 1.6.3\n"
+"POT-Creation-Date: 2001-07-16 21:53-0400\n"
 "PO-Revision-Date: 1999-09-30 16:54+0200\n"
 "Last-Translator: Yuri Syrota <rasta@renome.rovno.ua>\n"
 "Language-Team: Ukrainian <uk@li.org>\n"
@@ -17,87 +17,100 @@ msgstr ""
 msgid "unknown errno"
 msgstr ""
 
-#: popt.c:758
+#: popt.c:892
 #, c-format
 msgid "option type (%d) not implemented in popt\n"
 msgstr ""
 
-#: popt.c:893
+#: popt.c:1100
 msgid "missing argument"
 msgstr ""
 
-#: popt.c:895
+#: popt.c:1102
 msgid "unknown option"
 msgstr ""
 
-#: popt.c:897
+#: popt.c:1104
 msgid "mutually exclusive logical operations requested"
 msgstr ""
 
-#: popt.c:899
+#: popt.c:1106
+msgid "opt->arg should not be NULL"
+msgstr ""
+
+#: popt.c:1108
 msgid "aliases nested too deeply"
 msgstr ""
 
-#: popt.c:901
+#: popt.c:1110
 msgid "error in parameter quoting"
 msgstr ""
 
-#: popt.c:903
+#: popt.c:1112
 msgid "invalid numeric value"
 msgstr ""
 
-#: popt.c:905
+#: popt.c:1114
 msgid "number too large or too small"
 msgstr ""
 
-#: popt.c:909
+#: popt.c:1116
+msgid "memory allocation failed"
+msgstr ""
+
+#: popt.c:1120
 msgid "unknown error"
 msgstr ""
 
-#: popthelp.c:28
+#: popthelp.c:47
 msgid "Show this help message"
 msgstr "�������� �� ��צ���"
 
-#: popthelp.c:29
+#: popthelp.c:48
 msgid "Display brief usage message"
 msgstr "�������� ������� ��צ��� ��� ������������"
 
-#: popthelp.c:60
+#: popthelp.c:51
+#, fuzzy
+msgid "Display option defaults in message"
+msgstr "�������� ������� ��צ��� ��� ������������"
+
+#: popthelp.c:93
 msgid "NONE"
 msgstr ""
 
-#: popthelp.c:61
+#: popthelp.c:94
 msgid "VAL"
 msgstr ""
 
-#: popthelp.c:62
+#: popthelp.c:95
 msgid "INT"
 msgstr ""
 
-#: popthelp.c:63
+#: popthelp.c:96
 msgid "LONG"
 msgstr ""
 
-#: popthelp.c:64
+#: popthelp.c:97
 msgid "STRING"
 msgstr ""
 
-#: popthelp.c:65
+#: popthelp.c:98
 msgid "FLOAT"
 msgstr ""
 
-#: popthelp.c:66
+#: popthelp.c:99
 msgid "DOUBLE"
 msgstr ""
 
-#: popthelp.c:67
+#: popthelp.c:100
 msgid "ARG"
 msgstr ""
 
-#: popthelp.c:241
+#: popthelp.c:434
 msgid "Usage:"
 msgstr ""
 
-#: popthelp.c:260
+#: popthelp.c:456
 msgid "[OPTION...]"
 msgstr ""
diff --git a/po/wa.po b/po/wa.po
index 5537215..9b9003b 100644
--- a/po/wa.po
+++ b/po/wa.po
@@ -8,8 +8,8 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: popt 1.6.1\n"
-"POT-Creation-Date: 2001-02-22 17:41-0500\n"
+"Project-Id-Version: popt 1.6.3\n"
+"POT-Creation-Date: 2001-07-16 21:53-0400\n"
 "PO-Revision-Date: 1999-03-18 23:11+0100\n"
 "Last-Translator: Nobody yet\n"
 "Language-Team: walon <linux-wa@chanae.alphanet.ch>\n"
@@ -21,87 +21,100 @@ msgstr ""
 msgid "unknown errno"
 msgstr ""
 
-#: popt.c:758
+#: popt.c:892
 #, c-format
 msgid "option type (%d) not implemented in popt\n"
 msgstr ""
 
-#: popt.c:893
+#: popt.c:1100
 msgid "missing argument"
 msgstr ""
 
-#: popt.c:895
+#: popt.c:1102
 msgid "unknown option"
 msgstr ""
 
-#: popt.c:897
+#: popt.c:1104
 msgid "mutually exclusive logical operations requested"
 msgstr ""
 
-#: popt.c:899
+#: popt.c:1106
+msgid "opt->arg should not be NULL"
+msgstr ""
+
+#: popt.c:1108
 msgid "aliases nested too deeply"
 msgstr ""
 
-#: popt.c:901
+#: popt.c:1110
 msgid "error in parameter quoting"
 msgstr ""
 
-#: popt.c:903
+#: popt.c:1112
 msgid "invalid numeric value"
 msgstr ""
 
-#: popt.c:905
+#: popt.c:1114
 msgid "number too large or too small"
 msgstr ""
 
-#: popt.c:909
+#: popt.c:1116
+msgid "memory allocation failed"
+msgstr ""
+
+#: popt.c:1120
 msgid "unknown error"
 msgstr ""
 
-#: popthelp.c:28
+#: popthelp.c:47
 msgid "Show this help message"
 msgstr "Mostrer ci messaedje d' aide chal"
 
-#: popthelp.c:29
+#: popthelp.c:48
 msgid "Display brief usage message"
 msgstr "Mostre on court messaedje so kmint vos � siervi"
 
-#: popthelp.c:60
+#: popthelp.c:51
+#, fuzzy
+msgid "Display option defaults in message"
+msgstr "Mostre on court messaedje so kmint vos � siervi"
+
+#: popthelp.c:93
 msgid "NONE"
 msgstr ""
 
-#: popthelp.c:61
+#: popthelp.c:94
 msgid "VAL"
 msgstr ""
 
-#: popthelp.c:62
+#: popthelp.c:95
 msgid "INT"
 msgstr ""
 
-#: popthelp.c:63
+#: popthelp.c:96
 msgid "LONG"
 msgstr ""
 
-#: popthelp.c:64
+#: popthelp.c:97
 msgid "STRING"
 msgstr ""
 
-#: popthelp.c:65
+#: popthelp.c:98
 msgid "FLOAT"
 msgstr ""
 
-#: popthelp.c:66
+#: popthelp.c:99
 msgid "DOUBLE"
 msgstr ""
 
-#: popthelp.c:67
+#: popthelp.c:100
 msgid "ARG"
 msgstr ""
 
-#: popthelp.c:241
+#: popthelp.c:434
 msgid "Usage:"
 msgstr ""
 
-#: popthelp.c:260
+#: popthelp.c:456
 msgid "[OPTION...]"
 msgstr ""
diff --git a/po/zh.po b/po/zh.po
index ae68916..9408ada 100644
--- a/po/zh.po
+++ b/po/zh.po
@@ -5,8 +5,8 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: popt 1.6.1\n"
-"POT-Creation-Date: 2001-02-22 17:41-0500\n"
+"Project-Id-Version: popt 1.6.3\n"
+"POT-Creation-Date: 2001-07-16 21:53-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -18,87 +18,99 @@ msgstr ""
 msgid "unknown errno"
 msgstr ""
 
-#: popt.c:758
+#: popt.c:892
 #, c-format
 msgid "option type (%d) not implemented in popt\n"
 msgstr ""
 
-#: popt.c:893
+#: popt.c:1100
 msgid "missing argument"
 msgstr ""
 
-#: popt.c:895
+#: popt.c:1102
 msgid "unknown option"
 msgstr ""
 
-#: popt.c:897
+#: popt.c:1104
 msgid "mutually exclusive logical operations requested"
 msgstr ""
 
-#: popt.c:899
+#: popt.c:1106
+msgid "opt->arg should not be NULL"
+msgstr ""
+
+#: popt.c:1108
 msgid "aliases nested too deeply"
 msgstr ""
 
-#: popt.c:901
+#: popt.c:1110
 msgid "error in parameter quoting"
 msgstr ""
 
-#: popt.c:903
+#: popt.c:1112
 msgid "invalid numeric value"
 msgstr ""
 
-#: popt.c:905
+#: popt.c:1114
 msgid "number too large or too small"
 msgstr ""
 
-#: popt.c:909
+#: popt.c:1116
+msgid "memory allocation failed"
+msgstr ""
+
+#: popt.c:1120
 msgid "unknown error"
 msgstr ""
 
-#: popthelp.c:28
+#: popthelp.c:47
 msgid "Show this help message"
 msgstr ""
 
-#: popthelp.c:29
+#: popthelp.c:48
 msgid "Display brief usage message"
 msgstr ""
 
-#: popthelp.c:60
+#: popthelp.c:51
+msgid "Display option defaults in message"
+msgstr ""
+
+#: popthelp.c:93
 msgid "NONE"
 msgstr ""
 
-#: popthelp.c:61
+#: popthelp.c:94
 msgid "VAL"
 msgstr ""
 
-#: popthelp.c:62
+#: popthelp.c:95
 msgid "INT"
 msgstr ""
 
-#: popthelp.c:63
+#: popthelp.c:96
 msgid "LONG"
 msgstr ""
 
-#: popthelp.c:64
+#: popthelp.c:97
 msgid "STRING"
 msgstr ""
 
-#: popthelp.c:65
+#: popthelp.c:98
 msgid "FLOAT"
 msgstr ""
 
-#: popthelp.c:66
+#: popthelp.c:99
 msgid "DOUBLE"
 msgstr ""
 
-#: popthelp.c:67
+#: popthelp.c:100
 msgid "ARG"
 msgstr ""
 
-#: popthelp.c:241
+#: popthelp.c:434
 msgid "Usage:"
 msgstr ""
 
-#: popthelp.c:260
+#: popthelp.c:456
 msgid "[OPTION...]"
 msgstr ""
diff --git a/po/zh_CN.GB2312.po b/po/zh_CN.GB2312.po
index 2545528..80da16a 100644
--- a/po/zh_CN.GB2312.po
+++ b/po/zh_CN.GB2312.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
-"Project-Id-Version: popt 1.6.1\n"
-"POT-Creation-Date: 2001-02-22 17:41-0500\n"
+"Project-Id-Version: popt 1.6.3\n"
+"POT-Creation-Date: 2001-07-16 21:53-0400\n"
 "PO-Revision-Date: 1999-11-11 05:04+0800\n"
 "Last-Translator: Dillion Chen <dillon.chen@turbolinux.com.cn>\n"
 "Language-Team: TLDN\n"
@@ -13,87 +13,100 @@ msgstr ""
 msgid "unknown errno"
 msgstr ""
 
-#: popt.c:758
+#: popt.c:892
 #, c-format
 msgid "option type (%d) not implemented in popt\n"
 msgstr ""
 
-#: popt.c:893
+#: popt.c:1100
 msgid "missing argument"
 msgstr ""
 
-#: popt.c:895
+#: popt.c:1102
 msgid "unknown option"
 msgstr ""
 
-#: popt.c:897
+#: popt.c:1104
 msgid "mutually exclusive logical operations requested"
 msgstr ""
 
-#: popt.c:899
+#: popt.c:1106
+msgid "opt->arg should not be NULL"
+msgstr ""
+
+#: popt.c:1108
 msgid "aliases nested too deeply"
 msgstr ""
 
-#: popt.c:901
+#: popt.c:1110
 msgid "error in parameter quoting"
 msgstr ""
 
-#: popt.c:903
+#: popt.c:1112
 msgid "invalid numeric value"
 msgstr ""
 
-#: popt.c:905
+#: popt.c:1114
 msgid "number too large or too small"
 msgstr ""
 
-#: popt.c:909
+#: popt.c:1116
+msgid "memory allocation failed"
+msgstr ""
+
+#: popt.c:1120
 msgid "unknown error"
 msgstr ""
 
-#: popthelp.c:28
+#: popthelp.c:47
 msgid "Show this help message"
 msgstr "��ʾ����������Ϣ"
 
-#: popthelp.c:29
+#: popthelp.c:48
 msgid "Display brief usage message"
 msgstr "��ʾ���ʹ����Ϣ"
 
-#: popthelp.c:60
+#: popthelp.c:51
+#, fuzzy
+msgid "Display option defaults in message"
+msgstr "��ʾ���ʹ����Ϣ"
+
+#: popthelp.c:93
 msgid "NONE"
 msgstr ""
 
-#: popthelp.c:61
+#: popthelp.c:94
 msgid "VAL"
 msgstr ""
 
-#: popthelp.c:62
+#: popthelp.c:95
 msgid "INT"
 msgstr ""
 
-#: popthelp.c:63
+#: popthelp.c:96
 msgid "LONG"
 msgstr ""
 
-#: popthelp.c:64
+#: popthelp.c:97
 msgid "STRING"
 msgstr ""
 
-#: popthelp.c:65
+#: popthelp.c:98
 msgid "FLOAT"
 msgstr ""
 
-#: popthelp.c:66
+#: popthelp.c:99
 msgid "DOUBLE"
 msgstr ""
 
-#: popthelp.c:67
+#: popthelp.c:100
 msgid "ARG"
 msgstr ""
 
-#: popthelp.c:241
+#: popthelp.c:434
 msgid "Usage:"
 msgstr ""
 
-#: popthelp.c:260
+#: popthelp.c:456
 msgid "[OPTION...]"
 msgstr ""
diff --git a/popt.3 b/popt.3
index 87e140c..5da0c1f 100644
--- a/popt.3
+++ b/popt.3
@@ -82,8 +82,8 @@ The popt library is highly portable and should work on any POSIX
 platform.  The latest version is distributed with rpm and is always available
 from: ftp://ftp.rpm.org/pub/rpm/dist.
 .sp
-It may be redistributed under either the GNU General Public License 
-or the GNU Library General Public License, at the distributor's discretion.
+It may be redistributed under the X consortium license, see the file COPYING
+in the popt source distribution for details.
 .SH "BASIC POPT USAGE"
 .SS "1. THE OPTION TABLE"
 Applications provide popt with information on their command-line 
diff --git a/popt.spec b/popt.spec
index 93dd393..6816d5c 100644
--- a/popt.spec
+++ b/popt.spec
@@ -4,7 +4,7 @@
 #
 Summary: A C library for parsing command line parameters.
 Name: popt
-Version: 1.7
+Version: 1.6.3
 Release: 0.1
 Copyright: X Consortium
 Group: System Environment/Libraries
-- 
Gitee


From 0a499c4d5caf98744db47e1bd932e2c5672b8a96 Mon Sep 17 00:00:00 2001
From: Jeff Johnson <n3npq@mac.com>
Date: Fri, 21 Sep 2001 15:07:36 +0000
Subject: [PATCH 318/667] - lclint-3.0.0.15 fiddles.

---
 po/cs.po           | 6 +++---
 po/da.po           | 6 +++---
 po/de.po           | 6 +++---
 po/es.po           | 6 +++---
 po/eu_ES.po        | 6 +++---
 po/fi.po           | 6 +++---
 po/fr.po           | 6 +++---
 po/gl.po           | 6 +++---
 po/hu.po           | 6 +++---
 po/id.po           | 6 +++---
 po/is.po           | 6 +++---
 po/it.po           | 6 +++---
 po/ja.po           | 6 +++---
 po/ko.po           | 6 +++---
 po/no.po           | 6 +++---
 po/pl.po           | 6 +++---
 po/popt.pot        | 6 +++---
 po/pt.po           | 6 +++---
 po/pt_BR.po        | 6 +++---
 po/ro.po           | 6 +++---
 po/ru.po           | 6 +++---
 po/sk.po           | 6 +++---
 po/sl.po           | 6 +++---
 po/sr.po           | 6 +++---
 po/sv.po           | 6 +++---
 po/tr.po           | 6 +++---
 po/uk.po           | 6 +++---
 po/wa.po           | 6 +++---
 po/zh.po           | 6 +++---
 po/zh_CN.GB2312.po | 6 +++---
 popthelp.c         | 4 ++++
 poptint.h          | 8 ++++----
 32 files changed, 98 insertions(+), 94 deletions(-)

diff --git a/po/cs.po b/po/cs.po
index 81feb86..64a7527 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.3\n"
-"POT-Creation-Date: 2001-07-16 21:53-0400\n"
+"POT-Creation-Date: 2001-09-21 10:20-0400\n"
 "PO-Revision-Date: 2001-07-24 00:03+0100\n"
 "Last-Translator: Milan Kerslager <kerslage@linux.cz>\n"
 "Language-Team: Czech <cs@li.org>\n"
@@ -102,10 +102,10 @@ msgstr "DOUBLE"
 msgid "ARG"
 msgstr "ARG"
 
-#: popthelp.c:434
+#: popthelp.c:438
 msgid "Usage:"
 msgstr "Pou�it�:"
 
-#: popthelp.c:456
+#: popthelp.c:460
 msgid "[OPTION...]"
 msgstr "[VOLBY...]"
diff --git a/po/da.po b/po/da.po
index 1443ade..456e961 100644
--- a/po/da.po
+++ b/po/da.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.3\n"
-"POT-Creation-Date: 2001-07-16 21:53-0400\n"
+"POT-Creation-Date: 2001-09-21 10:20-0400\n"
 "PO-Revision-Date: Sun Jan 21 2001 04:30:32+0200\n"
 "Last-Translator: Martin Hansen <mah@k64.dk>\n"
 "Language-Team: Dansk <dansk@klid.dk>\n"
@@ -104,10 +104,10 @@ msgstr "DOUBLE"
 msgid "ARG"
 msgstr "ARG"
 
-#: popthelp.c:434
+#: popthelp.c:438
 msgid "Usage:"
 msgstr "Brug:"
 
-#: popthelp.c:456
+#: popthelp.c:460
 msgid "[OPTION...]"
 msgstr "[TILVALG...]"
diff --git a/po/de.po b/po/de.po
index 9408ada..f055056 100644
--- a/po/de.po
+++ b/po/de.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.3\n"
-"POT-Creation-Date: 2001-07-16 21:53-0400\n"
+"POT-Creation-Date: 2001-09-21 10:20-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -107,10 +107,10 @@ msgstr ""
 msgid "ARG"
 msgstr ""
 
-#: popthelp.c:434
+#: popthelp.c:438
 msgid "Usage:"
 msgstr ""
 
-#: popthelp.c:456
+#: popthelp.c:460
 msgid "[OPTION...]"
 msgstr ""
diff --git a/po/es.po b/po/es.po
index 9e7b809..b09e8e7 100644
--- a/po/es.po
+++ b/po/es.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.3\n"
-"POT-Creation-Date: 2001-07-16 21:53-0400\n"
+"POT-Creation-Date: 2001-09-21 10:20-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Leandro Lucarella <luca@linuxmendoza.org.ar>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -108,10 +108,10 @@ msgstr "DOUBLE"
 msgid "ARG"
 msgstr "ARG"
 
-#: popthelp.c:434
+#: popthelp.c:438
 msgid "Usage:"
 msgstr "Modo de Uso:"
 
-#: popthelp.c:456
+#: popthelp.c:460
 msgid "[OPTION...]"
 msgstr "[OPCI�N...]"
diff --git a/po/eu_ES.po b/po/eu_ES.po
index 9408ada..f055056 100644
--- a/po/eu_ES.po
+++ b/po/eu_ES.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.3\n"
-"POT-Creation-Date: 2001-07-16 21:53-0400\n"
+"POT-Creation-Date: 2001-09-21 10:20-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -107,10 +107,10 @@ msgstr ""
 msgid "ARG"
 msgstr ""
 
-#: popthelp.c:434
+#: popthelp.c:438
 msgid "Usage:"
 msgstr ""
 
-#: popthelp.c:456
+#: popthelp.c:460
 msgid "[OPTION...]"
 msgstr ""
diff --git a/po/fi.po b/po/fi.po
index 9408ada..f055056 100644
--- a/po/fi.po
+++ b/po/fi.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.3\n"
-"POT-Creation-Date: 2001-07-16 21:53-0400\n"
+"POT-Creation-Date: 2001-09-21 10:20-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -107,10 +107,10 @@ msgstr ""
 msgid "ARG"
 msgstr ""
 
-#: popthelp.c:434
+#: popthelp.c:438
 msgid "Usage:"
 msgstr ""
 
-#: popthelp.c:456
+#: popthelp.c:460
 msgid "[OPTION...]"
 msgstr ""
diff --git a/po/fr.po b/po/fr.po
index 9408ada..f055056 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.3\n"
-"POT-Creation-Date: 2001-07-16 21:53-0400\n"
+"POT-Creation-Date: 2001-09-21 10:20-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -107,10 +107,10 @@ msgstr ""
 msgid "ARG"
 msgstr ""
 
-#: popthelp.c:434
+#: popthelp.c:438
 msgid "Usage:"
 msgstr ""
 
-#: popthelp.c:456
+#: popthelp.c:460
 msgid "[OPTION...]"
 msgstr ""
diff --git a/po/gl.po b/po/gl.po
index 237da1b..f83e87a 100644
--- a/po/gl.po
+++ b/po/gl.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.3\n"
-"POT-Creation-Date: 2001-07-16 21:53-0400\n"
+"POT-Creation-Date: 2001-09-21 10:20-0400\n"
 "PO-Revision-Date: 2001-01-17 01:01+0100\n"
 "Last-Translator: Jes�s Bravo �lvarez <jba@pobox.com>\n"
 "Language-Team: Galician <trasno@ceu.fi.udc.es>\n"
@@ -103,10 +103,10 @@ msgstr "DOUBLE"
 msgid "ARG"
 msgstr "ARG"
 
-#: popthelp.c:434
+#: popthelp.c:438
 msgid "Usage:"
 msgstr "Uso:"
 
-#: popthelp.c:456
+#: popthelp.c:460
 msgid "[OPTION...]"
 msgstr "[OPCI�N...]"
diff --git a/po/hu.po b/po/hu.po
index fe4c7c8..d35da39 100644
--- a/po/hu.po
+++ b/po/hu.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.3\n"
-"POT-Creation-Date: 2001-07-16 21:53-0400\n"
+"POT-Creation-Date: 2001-09-21 10:20-0400\n"
 "PO-Revision-Date: 2000-08-03 23:26+0200\n"
 "Last-Translator: L�szl� N�meth <nemeth@qwertynet.hu>\n"
 "Language-Team: Hungarian\n"
@@ -103,10 +103,10 @@ msgstr ""
 msgid "ARG"
 msgstr ""
 
-#: popthelp.c:434
+#: popthelp.c:438
 msgid "Usage:"
 msgstr ""
 
-#: popthelp.c:456
+#: popthelp.c:460
 msgid "[OPTION...]"
 msgstr ""
diff --git a/po/id.po b/po/id.po
index 9408ada..f055056 100644
--- a/po/id.po
+++ b/po/id.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.3\n"
-"POT-Creation-Date: 2001-07-16 21:53-0400\n"
+"POT-Creation-Date: 2001-09-21 10:20-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -107,10 +107,10 @@ msgstr ""
 msgid "ARG"
 msgstr ""
 
-#: popthelp.c:434
+#: popthelp.c:438
 msgid "Usage:"
 msgstr ""
 
-#: popthelp.c:456
+#: popthelp.c:460
 msgid "[OPTION...]"
 msgstr ""
diff --git a/po/is.po b/po/is.po
index 7f078a3..32d4a9b 100644
--- a/po/is.po
+++ b/po/is.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.3\n"
-"POT-Creation-Date: 2001-07-16 21:53-0400\n"
+"POT-Creation-Date: 2001-09-21 10:20-0400\n"
 "PO-Revision-Date: 2001-06-08 01:35+0000\n"
 "Last-Translator: Richard Allen <ra@hp.is>\n"
 "Language-Team: is <kde-isl@mmedia.is>\n"
@@ -102,10 +102,10 @@ msgstr "DOUBLE"
 msgid "ARG"
 msgstr "ARG"
 
-#: popthelp.c:434
+#: popthelp.c:438
 msgid "Usage:"
 msgstr "Notkun:"
 
-#: popthelp.c:456
+#: popthelp.c:460
 msgid "[OPTION...]"
 msgstr "[ROFI...]"
diff --git a/po/it.po b/po/it.po
index 9408ada..f055056 100644
--- a/po/it.po
+++ b/po/it.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.3\n"
-"POT-Creation-Date: 2001-07-16 21:53-0400\n"
+"POT-Creation-Date: 2001-09-21 10:20-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -107,10 +107,10 @@ msgstr ""
 msgid "ARG"
 msgstr ""
 
-#: popthelp.c:434
+#: popthelp.c:438
 msgid "Usage:"
 msgstr ""
 
-#: popthelp.c:456
+#: popthelp.c:460
 msgid "[OPTION...]"
 msgstr ""
diff --git a/po/ja.po b/po/ja.po
index 9408ada..f055056 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.3\n"
-"POT-Creation-Date: 2001-07-16 21:53-0400\n"
+"POT-Creation-Date: 2001-09-21 10:20-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -107,10 +107,10 @@ msgstr ""
 msgid "ARG"
 msgstr ""
 
-#: popthelp.c:434
+#: popthelp.c:438
 msgid "Usage:"
 msgstr ""
 
-#: popthelp.c:456
+#: popthelp.c:460
 msgid "[OPTION...]"
 msgstr ""
diff --git a/po/ko.po b/po/ko.po
index 7cc9d25..e5a8ce1 100644
--- a/po/ko.po
+++ b/po/ko.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6\n"
-"POT-Creation-Date: 2001-07-16 21:53-0400\n"
+"POT-Creation-Date: 2001-09-21 10:20-0400\n"
 "PO-Revision-Date: 2001-09-06 20:06+0900\n"
 "Last-Translator: Jong-Hoon Ryu <redhat4u@netian.com>\n"
 "Language-Team: GNU Translation project <ko@li.org>\n"
@@ -102,10 +102,10 @@ msgstr "
 msgid "ARG"
 msgstr "�μ�(ARG)"
 
-#: popthelp.c:434
+#: popthelp.c:438
 msgid "Usage:"
 msgstr "����:"
 
-#: popthelp.c:456
+#: popthelp.c:460
 msgid "[OPTION...]"
 msgstr "[�ɼ�...]"
diff --git a/po/no.po b/po/no.po
index 442be77..c49d75f 100644
--- a/po/no.po
+++ b/po/no.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.3\n"
-"POT-Creation-Date: 2001-07-16 21:53-0400\n"
+"POT-Creation-Date: 2001-09-21 10:20-0400\n"
 "PO-Revision-Date: 2001-06-27 11:05+0200\n"
 "Last-Translator: Kjartan Maraas <kmaraas@online.no>\n"
 "Language-Team: Norwegian <no@li.org>\n"
@@ -102,10 +102,10 @@ msgstr "DOUBLE"
 msgid "ARG"
 msgstr "ARG"
 
-#: popthelp.c:434
+#: popthelp.c:438
 msgid "Usage:"
 msgstr "Bruk:"
 
-#: popthelp.c:456
+#: popthelp.c:460
 msgid "[OPTION...]"
 msgstr "[FLAGG...]"
diff --git a/po/pl.po b/po/pl.po
index 9408ada..f055056 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.3\n"
-"POT-Creation-Date: 2001-07-16 21:53-0400\n"
+"POT-Creation-Date: 2001-09-21 10:20-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -107,10 +107,10 @@ msgstr ""
 msgid "ARG"
 msgstr ""
 
-#: popthelp.c:434
+#: popthelp.c:438
 msgid "Usage:"
 msgstr ""
 
-#: popthelp.c:456
+#: popthelp.c:460
 msgid "[OPTION...]"
 msgstr ""
diff --git a/po/popt.pot b/po/popt.pot
index c64d707..af2afa6 100644
--- a/po/popt.pot
+++ b/po/popt.pot
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2001-07-16 21:53-0400\n"
+"POT-Creation-Date: 2001-09-21 10:20-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -107,10 +107,10 @@ msgstr ""
 msgid "ARG"
 msgstr ""
 
-#: popthelp.c:434
+#: popthelp.c:438
 msgid "Usage:"
 msgstr ""
 
-#: popthelp.c:456
+#: popthelp.c:460
 msgid "[OPTION...]"
 msgstr ""
diff --git a/po/pt.po b/po/pt.po
index d7561b7..cb06e3b 100644
--- a/po/pt.po
+++ b/po/pt.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.3\n"
-"POT-Creation-Date: 2001-07-16 21:53-0400\n"
+"POT-Creation-Date: 2001-09-21 10:20-0400\n"
 "PO-Revision-Date: 2001-01-21 19:31+00:00\n"
 "Last-Translator: Pedro Morais <morais@kde.org>\n"
 "Language-Team: pt <morais@kde.org>\n"
@@ -103,10 +103,10 @@ msgstr "DOUBLE"
 msgid "ARG"
 msgstr "ARG"
 
-#: popthelp.c:434
+#: popthelp.c:438
 msgid "Usage:"
 msgstr "Utiliza��o:"
 
-#: popthelp.c:456
+#: popthelp.c:460
 msgid "[OPTION...]"
 msgstr "[OP��O...]"
diff --git a/po/pt_BR.po b/po/pt_BR.po
index 9408ada..f055056 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.3\n"
-"POT-Creation-Date: 2001-07-16 21:53-0400\n"
+"POT-Creation-Date: 2001-09-21 10:20-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -107,10 +107,10 @@ msgstr ""
 msgid "ARG"
 msgstr ""
 
-#: popthelp.c:434
+#: popthelp.c:438
 msgid "Usage:"
 msgstr ""
 
-#: popthelp.c:456
+#: popthelp.c:460
 msgid "[OPTION...]"
 msgstr ""
diff --git a/po/ro.po b/po/ro.po
index 9d54554..dfbd264 100644
--- a/po/ro.po
+++ b/po/ro.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.3\n"
-"POT-Creation-Date: 2001-07-16 21:53-0400\n"
+"POT-Creation-Date: 2001-09-21 10:20-0400\n"
 "PO-Revision-Date: 2000-06-14 23:23+EST\n"
 "Last-Translator: Cristian Gafton <gafton@redhat.com>\n"
 "Language-Team: Romanian <ro@li.org>\n"
@@ -104,10 +104,10 @@ msgstr ""
 msgid "ARG"
 msgstr ""
 
-#: popthelp.c:434
+#: popthelp.c:438
 msgid "Usage:"
 msgstr "Sintaxa:"
 
-#: popthelp.c:456
+#: popthelp.c:460
 msgid "[OPTION...]"
 msgstr "[OPTIUNE...]"
diff --git a/po/ru.po b/po/ru.po
index a571ec2..0ead579 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.3\n"
-"POT-Creation-Date: 2001-07-16 21:53-0400\n"
+"POT-Creation-Date: 2001-09-21 10:20-0400\n"
 "PO-Revision-Date: 2001-07-05 21:00-0500\n"
 "Last-Translator: Eugene Kanter <eugene@blackcatlinux.com>\n"
 "Language-Team: Black Cat Linux Team <blackcat-support@blackcatlinux.com>\n"
@@ -102,10 +102,10 @@ msgstr "DOUBLE"
 msgid "ARG"
 msgstr "ARG"
 
-#: popthelp.c:434
+#: popthelp.c:438
 msgid "Usage:"
 msgstr "�������������:"
 
-#: popthelp.c:456
+#: popthelp.c:460
 msgid "[OPTION...]"
 msgstr "[��������...]"
diff --git a/po/sk.po b/po/sk.po
index 835a717..3d80198 100644
--- a/po/sk.po
+++ b/po/sk.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.3\n"
-"POT-Creation-Date: 2001-07-16 21:53-0400\n"
+"POT-Creation-Date: 2001-09-21 10:20-0400\n"
 "PO-Revision-Date: 1999-08-04 21:40+0200\n"
 "Last-Translator: Stanislav Meduna <stano@eunet.sk>\n"
 "Language-Team: Slovak <sk-i18n@rak.isternet.sk>\n"
@@ -107,10 +107,10 @@ msgstr ""
 msgid "ARG"
 msgstr ""
 
-#: popthelp.c:434
+#: popthelp.c:438
 msgid "Usage:"
 msgstr ""
 
-#: popthelp.c:456
+#: popthelp.c:460
 msgid "[OPTION...]"
 msgstr ""
diff --git a/po/sl.po b/po/sl.po
index 8a6d09c..f276e47 100644
--- a/po/sl.po
+++ b/po/sl.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.3\n"
-"POT-Creation-Date: 2001-07-16 21:53-0400\n"
+"POT-Creation-Date: 2001-09-21 10:20-0400\n"
 "PO-Revision-Date: 2000-09-05 12:30+0200\n"
 "Last-Translator: Roman Maurer <roman.maurer@hermes.si>\n"
 "Language-Team: Slovenian <sl@li.org>\n"
@@ -103,10 +103,10 @@ msgstr ""
 msgid "ARG"
 msgstr ""
 
-#: popthelp.c:434
+#: popthelp.c:438
 msgid "Usage:"
 msgstr ""
 
-#: popthelp.c:456
+#: popthelp.c:460
 msgid "[OPTION...]"
 msgstr ""
diff --git a/po/sr.po b/po/sr.po
index 9408ada..f055056 100644
--- a/po/sr.po
+++ b/po/sr.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.3\n"
-"POT-Creation-Date: 2001-07-16 21:53-0400\n"
+"POT-Creation-Date: 2001-09-21 10:20-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -107,10 +107,10 @@ msgstr ""
 msgid "ARG"
 msgstr ""
 
-#: popthelp.c:434
+#: popthelp.c:438
 msgid "Usage:"
 msgstr ""
 
-#: popthelp.c:456
+#: popthelp.c:460
 msgid "[OPTION...]"
 msgstr ""
diff --git a/po/sv.po b/po/sv.po
index 07b50f5..ecf0c1e 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.3\n"
-"POT-Creation-Date: 2001-07-16 21:53-0400\n"
+"POT-Creation-Date: 2001-09-21 10:20-0400\n"
 "PO-Revision-Date: 2001-07-12 22:26+0100\n"
 "Last-Translator: Christian Rose <menthos@menthos.com>\n"
 "Language-Team: Swedish <sv@li.org>\n"
@@ -102,10 +102,10 @@ msgstr "DUBBEL"
 msgid "ARG"
 msgstr "ARG"
 
-#: popthelp.c:434
+#: popthelp.c:438
 msgid "Usage:"
 msgstr "Anv�ndning:"
 
-#: popthelp.c:456
+#: popthelp.c:460
 msgid "[OPTION...]"
 msgstr "[FLAGGA...]"
diff --git a/po/tr.po b/po/tr.po
index 636c251..e3501d3 100644
--- a/po/tr.po
+++ b/po/tr.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.3\n"
-"POT-Creation-Date: 2001-07-16 21:53-0400\n"
+"POT-Creation-Date: 2001-09-21 10:20-0400\n"
 "PO-Revision-Date: 2000-02-11 13:01+0200\n"
 "Last-Translator: Nilgun Belma Buguner <nilgun@technologist.com>\n"
 "Language-Team: Turkish <tr@li.org>\n"
@@ -103,10 +103,10 @@ msgstr "DOUBLE"
 msgid "ARG"
 msgstr "ARG"
 
-#: popthelp.c:434
+#: popthelp.c:438
 msgid "Usage:"
 msgstr "Kullan�m�:"
 
-#: popthelp.c:456
+#: popthelp.c:460
 msgid "[OPTION...]"
 msgstr "[SE�ENEK...]"
diff --git a/po/uk.po b/po/uk.po
index 20bb3c7..6f01fc3 100644
--- a/po/uk.po
+++ b/po/uk.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.3\n"
-"POT-Creation-Date: 2001-07-16 21:53-0400\n"
+"POT-Creation-Date: 2001-09-21 10:20-0400\n"
 "PO-Revision-Date: 1999-09-30 16:54+0200\n"
 "Last-Translator: Yuri Syrota <rasta@renome.rovno.ua>\n"
 "Language-Team: Ukrainian <uk@li.org>\n"
@@ -107,10 +107,10 @@ msgstr ""
 msgid "ARG"
 msgstr ""
 
-#: popthelp.c:434
+#: popthelp.c:438
 msgid "Usage:"
 msgstr ""
 
-#: popthelp.c:456
+#: popthelp.c:460
 msgid "[OPTION...]"
 msgstr ""
diff --git a/po/wa.po b/po/wa.po
index 9b9003b..3979baa 100644
--- a/po/wa.po
+++ b/po/wa.po
@@ -9,7 +9,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.3\n"
-"POT-Creation-Date: 2001-07-16 21:53-0400\n"
+"POT-Creation-Date: 2001-09-21 10:20-0400\n"
 "PO-Revision-Date: 1999-03-18 23:11+0100\n"
 "Last-Translator: Nobody yet\n"
 "Language-Team: walon <linux-wa@chanae.alphanet.ch>\n"
@@ -111,10 +111,10 @@ msgstr ""
 msgid "ARG"
 msgstr ""
 
-#: popthelp.c:434
+#: popthelp.c:438
 msgid "Usage:"
 msgstr ""
 
-#: popthelp.c:456
+#: popthelp.c:460
 msgid "[OPTION...]"
 msgstr ""
diff --git a/po/zh.po b/po/zh.po
index 9408ada..f055056 100644
--- a/po/zh.po
+++ b/po/zh.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.3\n"
-"POT-Creation-Date: 2001-07-16 21:53-0400\n"
+"POT-Creation-Date: 2001-09-21 10:20-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -107,10 +107,10 @@ msgstr ""
 msgid "ARG"
 msgstr ""
 
-#: popthelp.c:434
+#: popthelp.c:438
 msgid "Usage:"
 msgstr ""
 
-#: popthelp.c:456
+#: popthelp.c:460
 msgid "[OPTION...]"
 msgstr ""
diff --git a/po/zh_CN.GB2312.po b/po/zh_CN.GB2312.po
index 80da16a..0134a9a 100644
--- a/po/zh_CN.GB2312.po
+++ b/po/zh_CN.GB2312.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.3\n"
-"POT-Creation-Date: 2001-07-16 21:53-0400\n"
+"POT-Creation-Date: 2001-09-21 10:20-0400\n"
 "PO-Revision-Date: 1999-11-11 05:04+0800\n"
 "Last-Translator: Dillion Chen <dillon.chen@turbolinux.com.cn>\n"
 "Language-Team: TLDN\n"
@@ -103,10 +103,10 @@ msgstr ""
 msgid "ARG"
 msgstr ""
 
-#: popthelp.c:434
+#: popthelp.c:438
 msgid "Usage:"
 msgstr ""
 
-#: popthelp.c:456
+#: popthelp.c:460
 msgid "[OPTION...]"
 msgstr ""
diff --git a/popthelp.c b/popthelp.c
index d94b98e..81ee7b9 100644
--- a/popthelp.c
+++ b/popthelp.c
@@ -254,7 +254,9 @@ static void singleOptionHelp(FILE * fp, int maxLeftCol,
 		}
 		*le++ = '=';
 		if (negate) *le++ = '~';
+		/*@-formatconst@*/
 		le += sprintf(le, (ops ? "0x%lx" : "%ld"), aLong);
+		/*@=formatconst@*/
 		*le++ = ']';
 	    }	break;
 	    case POPT_ARG_INT:
@@ -301,7 +303,9 @@ static void singleOptionHelp(FILE * fp, int maxLeftCol,
 	ch++;
 
 	sprintf(format, "%%.%ds\n%%%ds", (int) (ch - help), indentLength);
+	/*@-formatconst@*/
 	fprintf(fp, format, help, " ");
+	/*@=formatconst@*/
 	help = ch;
 	while (isspace(*help) && *help) help++;
 	helpLength = strlen(help);
diff --git a/poptint.h b/poptint.h
index 089275e..18a6c4d 100644
--- a/poptint.h
+++ b/poptint.h
@@ -80,17 +80,17 @@ struct poptContext_s {
 #if defined(HAVE_GETTEXT) && !defined(__LCLINT__)
 #define _(foo) gettext(foo)
 #else
-#define _(foo) (foo)
+#define _(foo) foo
 #endif
 
 #if defined(HAVE_DGETTEXT) && !defined(__LCLINT__)
 #define D_(dom, str) dgettext(dom, str)
 #define POPT_(foo) D_("popt", foo)
 #else
-#define D_(dom, str) (str)
-#define POPT_(foo) (foo)
+#define D_(dom, str) str
+#define POPT_(foo) foo
 #endif
 
-#define N_(foo) (foo)
+#define N_(foo) foo
 
 #endif
-- 
Gitee


From e7a5dfdcbb37e596b39e78cc1ace90c160231019 Mon Sep 17 00:00:00 2001
From: Jeff Johnson <n3npq@mac.com>
Date: Mon, 24 Sep 2001 21:53:15 +0000
Subject: [PATCH 319/667] Move to lclint-3.0.0.15, revisit and clean up
 annotations. intl/: Add gettext orphans. popt/intl/: Add gettext orphans.
 beecrypt: Add beecrypt repository. rpmio/tdigest.c: Add beecrypt digest
 checks.

---
 intl/config.charset |  438 ++++++++++++++
 intl/dcigettext.c   | 1257 ++++++++++++++++++++++++++++++++++++++++
 intl/dcngettext.c   |   59 ++
 intl/dngettext.c    |   60 ++
 intl/libgnuintl.h   |  127 +++++
 intl/localcharset.c |  271 +++++++++
 intl/locale.alias   |   77 +++
 intl/ngettext.c     |   67 +++
 intl/plural.c       | 1325 +++++++++++++++++++++++++++++++++++++++++++
 intl/plural.y       |  412 ++++++++++++++
 intl/ref-add.sin    |   31 +
 intl/ref-del.sin    |   26 +
 12 files changed, 4150 insertions(+)
 create mode 100755 intl/config.charset
 create mode 100644 intl/dcigettext.c
 create mode 100644 intl/dcngettext.c
 create mode 100644 intl/dngettext.c
 create mode 100644 intl/libgnuintl.h
 create mode 100644 intl/localcharset.c
 create mode 100644 intl/locale.alias
 create mode 100644 intl/ngettext.c
 create mode 100644 intl/plural.c
 create mode 100644 intl/plural.y
 create mode 100644 intl/ref-add.sin
 create mode 100644 intl/ref-del.sin

diff --git a/intl/config.charset b/intl/config.charset
new file mode 100755
index 0000000..d6f3695
--- /dev/null
+++ b/intl/config.charset
@@ -0,0 +1,438 @@
+#! /bin/sh
+# Output a system dependent table of character encoding aliases.
+#
+#   Copyright (C) 2000-2001 Free Software Foundation, Inc.
+#
+#   This program is free software; you can redistribute it and/or modify it
+#   under the terms of the GNU Library General Public License as published
+#   by the Free Software Foundation; either version 2, or (at your option)
+#   any later version.
+#
+#   This program is distributed in the hope that it will be useful,
+#   but WITHOUT ANY WARRANTY; without even the implied warranty of
+#   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+#   Library General Public License for more details.
+#
+#   You should have received a copy of the GNU Library General Public
+#   License along with this program; if not, write to the Free Software
+#   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
+#   USA.
+#
+# The table consists of lines of the form
+#    ALIAS  CANONICAL
+#
+# ALIAS is the (system dependent) result of "nl_langinfo (CODESET)".
+# ALIAS is compared in a case sensitive way.
+#
+# CANONICAL is the GNU canonical name for this character encoding.
+# It must be an encoding supported by libiconv. Support by GNU libc is
+# also desirable. CANONICAL is case insensitive. Usually an upper case
+# MIME charset name is preferred.
+# The current list of GNU canonical charset names is as follows.
+#
+#       name                         used by which systems         a MIME name?
+#   ASCII, ANSI_X3.4-1968     glibc solaris freebsd
+#   ISO-8859-1                glibc aix hpux irix osf solaris freebsd   yes
+#   ISO-8859-2                glibc aix hpux irix osf solaris freebsd   yes
+#   ISO-8859-3                glibc                                     yes
+#   ISO-8859-4                osf solaris freebsd                       yes
+#   ISO-8859-5                glibc aix hpux irix osf solaris freebsd   yes
+#   ISO-8859-6                glibc aix hpux solaris                    yes
+#   ISO-8859-7                glibc aix hpux irix osf solaris           yes
+#   ISO-8859-8                glibc aix hpux osf solaris                yes
+#   ISO-8859-9                glibc aix hpux irix osf solaris           yes
+#   ISO-8859-13               glibc
+#   ISO-8859-15               glibc aix osf solaris freebsd
+#   KOI8-R                    glibc solaris freebsd                     yes
+#   KOI8-U                    glibc freebsd                             yes
+#   CP437                     dos
+#   CP775                     dos
+#   CP850                     aix osf dos
+#   CP852                     dos
+#   CP855                     dos
+#   CP856                     aix
+#   CP857                     dos
+#   CP861                     dos
+#   CP862                     dos
+#   CP864                     dos
+#   CP865                     dos
+#   CP866                     freebsd dos
+#   CP869                     dos
+#   CP874                     win32 dos
+#   CP922                     aix
+#   CP932                     aix win32 dos
+#   CP943                     aix
+#   CP949                     osf win32 dos
+#   CP950                     win32 dos
+#   CP1046                    aix
+#   CP1124                    aix
+#   CP1129                    aix
+#   CP1250                    win32
+#   CP1251                    glibc win32
+#   CP1252                    aix win32
+#   CP1253                    win32
+#   CP1254                    win32
+#   CP1255                    win32
+#   CP1256                    win32
+#   CP1257                    win32
+#   GB2312                    glibc aix hpux irix solaris freebsd       yes
+#   EUC-JP                    glibc aix hpux irix osf solaris freebsd   yes
+#   EUC-KR                    glibc aix hpux irix osf solaris freebsd   yes
+#   EUC-TW                    glibc aix hpux irix osf solaris
+#   BIG5                      glibc aix hpux osf solaris freebsd        yes
+#   BIG5HKSCS                 glibc
+#   GBK                       aix osf win32 dos
+#   GB18030                   glibc
+#   SJIS                      hpux osf solaris freebsd
+#   JOHAB                     glibc win32
+#   TIS-620                   glibc aix hpux osf solaris
+#   VISCII                    glibc                                     yes
+#   HP-ROMAN8                 hpux
+#   HP-ARABIC8                hpux
+#   HP-GREEK8                 hpux
+#   HP-HEBREW8                hpux
+#   HP-TURKISH8               hpux
+#   HP-KANA8                  hpux
+#   DEC-KANJI                 osf
+#   DEC-HANYU                 osf
+#   UTF-8                     glibc aix hpux osf solaris                yes
+#
+# Note: Names which are not marked as being a MIME name should not be used in
+# Internet protocols for information interchange (mail, news, etc.).
+#
+# Note: ASCII and ANSI_X3.4-1968 are synonymous canonical names. Applications
+# must understand both names and treat them as equivalent.
+#
+# The first argument passed to this file is the canonical host specification,
+#    CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM
+# or
+#    CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM
+
+host="$1"
+os=`echo "$host" | sed -e 's/^[^-]*-[^-]*-\(.*\)$/\1/'`
+echo "# This file contains a table of character encoding aliases,"
+echo "# suitable for operating system '${os}'."
+echo "# It was automatically generated from config.charset."
+# List of references, updated during installation:
+echo "# Packages using this file: "
+case "$os" in
+    linux* | *-gnu*)
+	# With glibc-2.1 or newer, we don't need any canonicalization,
+	# because glibc has iconv and both glibc and libiconv support all
+	# GNU canonical names directly. Therefore, the Makefile does not
+	# need to install the alias file at all.
+	# The following applies only to glibc-2.0.x and older libcs.
+	echo "ISO_646.IRV:1983 ASCII"
+	;;
+    aix*)
+	echo "ISO8859-1 ISO-8859-1"
+	echo "ISO8859-2 ISO-8859-2"
+	echo "ISO8859-5 ISO-8859-5"
+	echo "ISO8859-6 ISO-8859-6"
+	echo "ISO8859-7 ISO-8859-7"
+	echo "ISO8859-8 ISO-8859-8"
+	echo "ISO8859-9 ISO-8859-9"
+	echo "ISO8859-15 ISO-8859-15"
+	echo "IBM-850 CP850"
+	echo "IBM-856 CP856"
+	echo "IBM-921 ISO-8859-13"
+	echo "IBM-922 CP922"
+	echo "IBM-932 CP932"
+	echo "IBM-943 CP943"
+	echo "IBM-1046 CP1046"
+	echo "IBM-1124 CP1124"
+	echo "IBM-1129 CP1129"
+	echo "IBM-1252 CP1252"
+	echo "IBM-eucCN GB2312"
+	echo "IBM-eucJP EUC-JP"
+	echo "IBM-eucKR EUC-KR"
+	echo "IBM-eucTW EUC-TW"
+	echo "big5 BIG5"
+	echo "GBK GBK"
+	echo "TIS-620 TIS-620"
+	echo "UTF-8 UTF-8"
+	;;
+    hpux*)
+	echo "iso88591 ISO-8859-1"
+	echo "iso88592 ISO-8859-2"
+	echo "iso88595 ISO-8859-5"
+	echo "iso88596 ISO-8859-6"
+	echo "iso88597 ISO-8859-7"
+	echo "iso88598 ISO-8859-8"
+	echo "iso88599 ISO-8859-9"
+	echo "iso885915 ISO-8859-15"
+	echo "roman8 HP-ROMAN8"
+	echo "arabic8 HP-ARABIC8"
+	echo "greek8 HP-GREEK8"
+	echo "hebrew8 HP-HEBREW8"
+	echo "turkish8 HP-TURKISH8"
+	echo "kana8 HP-KANA8"
+	echo "tis620 TIS-620"
+	echo "big5 BIG5"
+	echo "eucJP EUC-JP"
+	echo "eucKR EUC-KR"
+	echo "eucTW EUC-TW"
+	echo "hp15CN GB2312"
+	#echo "ccdc ?" # what is this?
+	echo "SJIS SJIS"
+	echo "utf8 UTF-8"
+	;;
+    irix*)
+	echo "ISO8859-1 ISO-8859-1"
+	echo "ISO8859-2 ISO-8859-2"
+	echo "ISO8859-5 ISO-8859-5"
+	echo "ISO8859-7 ISO-8859-7"
+	echo "ISO8859-9 ISO-8859-9"
+	echo "eucCN GB2312"
+	echo "eucJP EUC-JP"
+	echo "eucKR EUC-KR"
+	echo "eucTW EUC-TW"
+	;;
+    osf*)
+	echo "ISO8859-1 ISO-8859-1"
+	echo "ISO8859-2 ISO-8859-2"
+	echo "ISO8859-4 ISO-8859-4"
+	echo "ISO8859-5 ISO-8859-5"
+	echo "ISO8859-7 ISO-8859-7"
+	echo "ISO8859-8 ISO-8859-8"
+	echo "ISO8859-9 ISO-8859-9"
+	echo "ISO8859-15 ISO-8859-15"
+	echo "cp850 CP850"
+	echo "big5 BIG5"
+	echo "dechanyu DEC-HANYU"
+	echo "dechanzi GB2312"
+	echo "deckanji DEC-KANJI"
+	echo "deckorean EUC-KR"
+	echo "eucJP EUC-JP"
+	echo "eucKR EUC-KR"
+	echo "eucTW EUC-TW"
+	echo "GBK GBK"
+	echo "KSC5601 CP949"
+	echo "sdeckanji EUC-JP"
+	echo "SJIS SJIS"
+	echo "TACTIS TIS-620"
+	echo "UTF-8 UTF-8"
+	;;
+    solaris*)
+	echo "646 ASCII"
+	echo "ISO8859-1 ISO-8859-1"
+	echo "ISO8859-2 ISO-8859-2"
+	echo "ISO8859-4 ISO-8859-4"
+	echo "ISO8859-5 ISO-8859-5"
+	echo "ISO8859-6 ISO-8859-6"
+	echo "ISO8859-7 ISO-8859-7"
+	echo "ISO8859-8 ISO-8859-8"
+	echo "ISO8859-9 ISO-8859-9"
+	echo "ISO8859-15 ISO-8859-15"
+	echo "koi8-r KOI8-R"
+	echo "BIG5 BIG5"
+	echo "gb2312 GB2312"
+	echo "cns11643 EUC-TW"
+	echo "5601 EUC-KR"
+	echo "eucJP EUC-JP"
+	echo "PCK SJIS"
+	echo "TIS620.2533 TIS-620"
+	#echo "sun_eu_greek ?" # what is this?
+	echo "UTF-8 UTF-8"
+	;;
+    freebsd*)
+	# FreeBSD 4.2 doesn't have nl_langinfo(CODESET); therefore
+	# localcharset.c falls back to using the full locale name
+	# from the environment variables.
+	echo "C ASCII"
+	echo "US-ASCII ASCII"
+	for l in la_LN lt_LN; do
+	  echo "$l.ASCII ASCII"
+	done
+	for l in da_DK de_AT de_CH de_DE en_AU en_CA en_GB en_US es_ES \
+	         fi_FI fr_BE fr_CA fr_CH fr_FR is_IS it_CH it_IT la_LN \
+	         lt_LN nl_BE nl_NL no_NO pt_PT sv_SE; do
+	  echo "$l.ISO_8859-1 ISO-8859-1"
+	  echo "$l.DIS_8859-15 ISO-8859-15"
+	done
+	for l in cs_CZ hr_HR hu_HU la_LN lt_LN pl_PL sl_SI; do
+	  echo "$l.ISO_8859-2 ISO-8859-2"
+	done
+	for l in la_LN lt_LT; do
+	  echo "$l.ISO_8859-4 ISO-8859-4"
+	done
+	for l in ru_RU ru_SU; do
+	  echo "$l.KOI8-R KOI8-R"
+	  echo "$l.ISO_8859-5 ISO-8859-5"
+	  echo "$l.CP866 CP866"
+	done
+	echo "uk_UA.KOI8-U KOI8-U"
+	echo "zh_TW.BIG5 BIG5"
+	echo "zh_TW.Big5 BIG5"
+	echo "zh_CN.EUC GB2312"
+	echo "ja_JP.EUC EUC-JP"
+	echo "ja_JP.SJIS SJIS"
+	echo "ja_JP.Shift_JIS SJIS"
+	echo "ko_KR.EUC EUC-KR"
+	;;
+    beos*)
+	# BeOS has a single locale, and it has UTF-8 encoding.
+	echo "* UTF-8"
+	;;
+    msdosdjgpp*)
+	# DJGPP 2.03 doesn't have nl_langinfo(CODESET); therefore
+	# localcharset.c falls back to using the full locale name
+	# from the environment variables.
+	echo "#"
+	echo "# The encodings given here may not all be correct."
+	echo "# If you find that the encoding given for your language and"
+	echo "# country is not the one your DOS machine actually uses, just"
+	echo "# correct it in this file, and send a mail to"
+	echo "# Juan Manuel Guerrero <st001906@hrz1.hrz.tu-darmstadt.de>"
+	echo "# and Bruno Haible <haible@clisp.cons.org>."
+	echo "#"
+	echo "C ASCII"
+	# ISO-8859-1 languages
+	echo "ca CP850"
+	echo "ca_ES CP850"
+	echo "da CP865"    # not CP850 ??
+	echo "da_DK CP865" # not CP850 ??
+	echo "de CP850"
+	echo "de_AT CP850"
+	echo "de_CH CP850"
+	echo "de_DE CP850"
+	echo "en CP850"
+	echo "en_AU CP850" # not CP437 ??
+	echo "en_CA CP850"
+	echo "en_GB CP850"
+	echo "en_NZ CP437"
+	echo "en_US CP437"
+	echo "en_ZA CP850" # not CP437 ??
+	echo "es CP850"
+	echo "es_AR CP850"
+	echo "es_BO CP850"
+	echo "es_CL CP850"
+	echo "es_CO CP850"
+	echo "es_CR CP850"
+	echo "es_CU CP850"
+	echo "es_DO CP850"
+	echo "es_EC CP850"
+	echo "es_ES CP850"
+	echo "es_GT CP850"
+	echo "es_HN CP850"
+	echo "es_MX CP850"
+	echo "es_NI CP850"
+	echo "es_PA CP850"
+	echo "es_PY CP850"
+	echo "es_PE CP850"
+	echo "es_SV CP850"
+	echo "es_UY CP850"
+	echo "es_VE CP850"
+	echo "et CP850"
+	echo "et_EE CP850"
+	echo "eu CP850"
+	echo "eu_ES CP850"
+	echo "fi CP850"
+	echo "fi_FI CP850"
+	echo "fr CP850"
+	echo "fr_BE CP850"
+	echo "fr_CA CP850"
+	echo "fr_CH CP850"
+	echo "fr_FR CP850"
+	echo "ga CP850"
+	echo "ga_IE CP850"
+	echo "gd CP850"
+	echo "gd_GB CP850"
+	echo "gl CP850"
+	echo "gl_ES CP850"
+	echo "id CP850"    # not CP437 ??
+	echo "id_ID CP850" # not CP437 ??
+	echo "is CP861"    # not CP850 ??
+	echo "is_IS CP861" # not CP850 ??
+	echo "it CP850"
+	echo "it_CH CP850"
+	echo "it_IT CP850"
+	echo "lt CP775"
+	echo "lt_LT CP775"
+	echo "lv CP775"
+	echo "lv_LV CP775"
+	echo "nb CP865"    # not CP850 ??
+	echo "nb_NO CP865" # not CP850 ??
+	echo "nl CP850"
+	echo "nl_BE CP850"
+	echo "nl_NL CP850"
+	echo "nn CP865"    # not CP850 ??
+	echo "nn_NO CP865" # not CP850 ??
+	echo "no CP865"    # not CP850 ??
+	echo "no_NO CP865" # not CP850 ??
+	echo "pt CP850"
+	echo "pt_BR CP850"
+	echo "pt_PT CP850"
+	echo "sv CP850"
+	echo "sv_SE CP850"
+	# ISO-8859-2 languages
+	echo "cs CP852"
+	echo "cs_CZ CP852"
+	echo "hr CP852"
+	echo "hr_HR CP852"
+	echo "hu CP852"
+	echo "hu_HU CP852"
+	echo "pl CP852"
+	echo "pl_PL CP852"
+	echo "ro CP852"
+	echo "ro_RO CP852"
+	echo "sk CP852"
+	echo "sk_SK CP852"
+	echo "sl CP852"
+	echo "sl_SI CP852"
+	echo "sq CP852"
+	echo "sq_AL CP852"
+	echo "sr CP852"    # CP852 or CP866 or CP855 ??
+	echo "sr_YU CP852" # CP852 or CP866 or CP855 ??
+	# ISO-8859-3 languages
+	echo "mt CP850"
+	echo "mt_MT CP850"
+	# ISO-8859-5 languages
+	echo "be CP866"
+	echo "be_BE CP866"
+	echo "bg CP866"    # not CP855 ??
+	echo "bg_BG CP866" # not CP855 ??
+	echo "mk CP866"    # not CP855 ??
+	echo "mk_MK CP866" # not CP855 ??
+	echo "ru KOI8-R"    # not CP866 ??
+	echo "ru_RU KOI8-R" # not CP866 ??
+	# ISO-8859-6 languages
+	echo "ar CP864"
+	echo "ar_AE CP864"
+	echo "ar_DZ CP864"
+	echo "ar_EG CP864"
+	echo "ar_IQ CP864"
+	echo "ar_IR CP864"
+	echo "ar_JO CP864"
+	echo "ar_KW CP864"
+	echo "ar_MA CP864"
+	echo "ar_OM CP864"
+	echo "ar_QA CP864"
+	echo "ar_SA CP864"
+	echo "ar_SY CP864"
+	# ISO-8859-7 languages
+	echo "el CP869"
+	echo "el_GR CP869"
+	# ISO-8859-8 languages
+	echo "he CP862"
+	echo "he_IL CP862"
+	# ISO-8859-9 languages
+	echo "tr CP857"
+	echo "tr_TR CP857"
+	# Japanese
+	echo "ja CP932"
+	echo "ja_JP CP932"
+	# Chinese
+	echo "zh_CN GBK"
+	echo "zh_TW CP950" # not CP938 ??
+	# Korean
+	echo "kr CP949"    # not CP934 ??
+	echo "kr_KR CP949" # not CP934 ??
+	# Thai
+	echo "th CP874"
+	echo "th_TH CP874"
+	# Other
+	echo "eo CP850"
+	echo "eo_EO CP850"
+	;;
+esac
diff --git a/intl/dcigettext.c b/intl/dcigettext.c
new file mode 100644
index 0000000..8456550
--- /dev/null
+++ b/intl/dcigettext.c
@@ -0,0 +1,1257 @@
+/* Implementation of the internal dcigettext function.
+   Copyright (C) 1995-1999, 2000, 2001 Free Software Foundation, Inc.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 2, or (at your option)
+   any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software Foundation,
+   Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
+
+/* Tell glibc's <string.h> to provide a prototype for mempcpy().
+   This must come before <config.h> because <config.h> may include
+   <features.h>, and once <features.h> has been included, it's too late.  */
+#ifndef _GNU_SOURCE
+# define _GNU_SOURCE	1
+#endif
+
+#ifdef HAVE_CONFIG_H
+# include <config.h>
+#endif
+
+#include <sys/types.h>
+
+#ifdef __GNUC__
+# define alloca __builtin_alloca
+# define HAVE_ALLOCA 1
+#else
+# if defined HAVE_ALLOCA_H || defined _LIBC
+#  include <alloca.h>
+# else
+#  ifdef _AIX
+ #pragma alloca
+#  else
+#   ifndef alloca
+char *alloca ();
+#   endif
+#  endif
+# endif
+#endif
+
+#include <errno.h>
+#ifndef errno
+extern int errno;
+#endif
+#ifndef __set_errno
+# define __set_errno(val) errno = (val)
+#endif
+
+#include <stddef.h>
+#include <stdlib.h>
+
+#include <string.h>
+#if !HAVE_STRCHR && !defined _LIBC
+# ifndef strchr
+#  define strchr index
+# endif
+#endif
+
+#if defined HAVE_UNISTD_H || defined _LIBC
+# include <unistd.h>
+#endif
+
+#include <locale.h>
+
+#if defined HAVE_SYS_PARAM_H || defined _LIBC
+# include <sys/param.h>
+#endif
+
+#include "gettextP.h"
+#ifdef _LIBC
+# include <libintl.h>
+#else
+# include "libgnuintl.h"
+#endif
+#include "hash-string.h"
+
+/* Thread safetyness.  */
+#ifdef _LIBC
+# include <bits/libc-lock.h>
+#else
+/* Provide dummy implementation if this is outside glibc.  */
+# define __libc_lock_define_initialized(CLASS, NAME)
+# define __libc_lock_lock(NAME)
+# define __libc_lock_unlock(NAME)
+# define __libc_rwlock_define_initialized(CLASS, NAME)
+# define __libc_rwlock_rdlock(NAME)
+# define __libc_rwlock_unlock(NAME)
+#endif
+
+/* Alignment of types.  */
+#if defined __GNUC__ && __GNUC__ >= 2
+# define alignof(TYPE) __alignof__ (TYPE)
+#else
+# define alignof(TYPE) \
+    ((int) &((struct { char dummy1; TYPE dummy2; } *) 0)->dummy2)
+#endif
+
+/* The internal variables in the standalone libintl.a must have different
+   names than the internal variables in GNU libc, otherwise programs
+   using libintl.a cannot be linked statically.  */
+#if !defined _LIBC
+# define _nl_default_default_domain _nl_default_default_domain__
+# define _nl_current_default_domain _nl_current_default_domain__
+# define _nl_default_dirname _nl_default_dirname__
+# define _nl_domain_bindings _nl_domain_bindings__
+#endif
+
+/* Some compilers, like SunOS4 cc, don't have offsetof in <stddef.h>.  */
+#ifndef offsetof
+# define offsetof(type,ident) ((size_t)&(((type*)0)->ident))
+#endif
+
+/* @@ end of prolog @@ */
+
+#ifdef _LIBC
+/* Rename the non ANSI C functions.  This is required by the standard
+   because some ANSI C functions will require linking with this object
+   file and the name space must not be polluted.  */
+# define getcwd __getcwd
+# ifndef stpcpy
+#  define stpcpy __stpcpy
+# endif
+# define tfind __tfind
+#else
+# if !defined HAVE_GETCWD
+char *getwd ();
+#  define getcwd(buf, max) getwd (buf)
+# else
+char *getcwd ();
+# endif
+# ifndef HAVE_STPCPY
+static char *stpcpy PARAMS ((char *dest, const char *src));
+# endif
+# ifndef HAVE_MEMPCPY
+static void *mempcpy PARAMS ((void *dest, const void *src, size_t n));
+# endif
+#endif
+
+/* Amount to increase buffer size by in each try.  */
+#define PATH_INCR 32
+
+/* The following is from pathmax.h.  */
+/* Non-POSIX BSD systems might have gcc's limits.h, which doesn't define
+   PATH_MAX but might cause redefinition warnings when sys/param.h is
+   later included (as on MORE/BSD 4.3).  */
+#if defined _POSIX_VERSION || (defined HAVE_LIMITS_H && !defined __GNUC__)
+# include <limits.h>
+#endif
+
+#ifndef _POSIX_PATH_MAX
+# define _POSIX_PATH_MAX 255
+#endif
+
+#if !defined PATH_MAX && defined _PC_PATH_MAX
+# define PATH_MAX (pathconf ("/", _PC_PATH_MAX) < 1 ? 1024 : pathconf ("/", _PC_PATH_MAX))
+#endif
+
+/* Don't include sys/param.h if it already has been.  */
+#if defined HAVE_SYS_PARAM_H && !defined PATH_MAX && !defined MAXPATHLEN
+# include <sys/param.h>
+#endif
+
+#if !defined PATH_MAX && defined MAXPATHLEN
+# define PATH_MAX MAXPATHLEN
+#endif
+
+#ifndef PATH_MAX
+# define PATH_MAX _POSIX_PATH_MAX
+#endif
+
+/* Pathname support.
+   ISSLASH(C)           tests whether C is a directory separator character.
+   IS_ABSOLUTE_PATH(P)  tests whether P is an absolute path.  If it is not,
+                        it may be concatenated to a directory pathname.
+   IS_PATH_WITH_DIR(P)  tests whether P contains a directory specification.
+ */
+#if defined _WIN32 || defined __WIN32__ || defined __EMX__ || defined __DJGPP__
+  /* Win32, OS/2, DOS */
+# define ISSLASH(C) ((C) == '/' || (C) == '\\')
+# define HAS_DEVICE(P) \
+    ((((P)[0] >= 'A' && (P)[0] <= 'Z') || ((P)[0] >= 'a' && (P)[0] <= 'z')) \
+     && (P)[1] == ':')
+# define IS_ABSOLUTE_PATH(P) (ISSLASH ((P)[0]) || HAS_DEVICE (P))
+# define IS_PATH_WITH_DIR(P) \
+    (strchr (P, '/') != NULL || strchr (P, '\\') != NULL || HAS_DEVICE (P))
+#else
+  /* Unix */
+# define ISSLASH(C) ((C) == '/')
+# define IS_ABSOLUTE_PATH(P) ISSLASH ((P)[0])
+# define IS_PATH_WITH_DIR(P) (strchr (P, '/') != NULL)
+#endif
+
+/* XPG3 defines the result of `setlocale (category, NULL)' as:
+   ``Directs `setlocale()' to query `category' and return the current
+     setting of `local'.''
+   However it does not specify the exact format.  Neither do SUSV2 and
+   ISO C 99.  So we can use this feature only on selected systems (e.g.
+   those using GNU C Library).  */
+#if defined _LIBC || (defined __GNU_LIBRARY__ && __GNU_LIBRARY__ >= 2)
+# define HAVE_LOCALE_NULL
+#endif
+
+/* This is the type used for the search tree where known translations
+   are stored.  */
+struct known_translation_t
+{
+  /* Domain in which to search.  */
+  char *domainname;
+
+  /* The category.  */
+  int category;
+
+  /* State of the catalog counter at the point the string was found.  */
+  int counter;
+
+  /* Catalog where the string was found.  */
+  struct loaded_l10nfile *domain;
+
+  /* And finally the translation.  */
+  const char *translation;
+  size_t translation_length;
+
+  /* Pointer to the string in question.  */
+  char msgid[ZERO];
+};
+
+/* Root of the search tree with known translations.  We can use this
+   only if the system provides the `tsearch' function family.  */
+#if defined HAVE_TSEARCH || defined _LIBC
+# include <search.h>
+
+static void *root;
+
+# ifdef _LIBC
+#  define tsearch __tsearch
+# endif
+
+/* Function to compare two entries in the table of known translations.  */
+static int transcmp PARAMS ((const void *p1, const void *p2));
+static int
+transcmp (p1, p2)
+     const void *p1;
+     const void *p2;
+{
+  const struct known_translation_t *s1;
+  const struct known_translation_t *s2;
+  int result;
+
+  s1 = (const struct known_translation_t *) p1;
+  s2 = (const struct known_translation_t *) p2;
+
+  result = strcmp (s1->msgid, s2->msgid);
+  if (result == 0)
+    {
+      result = strcmp (s1->domainname, s2->domainname);
+      if (result == 0)
+	/* We compare the category last (though this is the cheapest
+	   operation) since it is hopefully always the same (namely
+	   LC_MESSAGES).  */
+	result = s1->category - s2->category;
+    }
+
+  return result;
+}
+#endif
+
+/* Name of the default domain used for gettext(3) prior any call to
+   textdomain(3).  The default value for this is "messages".  */
+const char _nl_default_default_domain[] = "messages";
+
+/* Value used as the default domain for gettext(3).  */
+const char *_nl_current_default_domain = _nl_default_default_domain;
+
+/* Contains the default location of the message catalogs.  */
+const char _nl_default_dirname[] = LOCALEDIR;
+
+/* List with bindings of specific domains created by bindtextdomain()
+   calls.  */
+struct binding *_nl_domain_bindings;
+
+/* Prototypes for local functions.  */
+static char *plural_lookup PARAMS ((struct loaded_l10nfile *domain,
+				    unsigned long int n,
+				    const char *translation,
+				    size_t translation_len))
+     internal_function;
+static unsigned long int plural_eval PARAMS ((struct expression *pexp,
+					      unsigned long int n))
+     internal_function;
+static const char *category_to_name PARAMS ((int category)) internal_function;
+static const char *guess_category_value PARAMS ((int category,
+						 const char *categoryname))
+     internal_function;
+
+
+/* For those loosing systems which don't have `alloca' we have to add
+   some additional code emulating it.  */
+#ifdef HAVE_ALLOCA
+/* Nothing has to be done.  */
+# define ADD_BLOCK(list, address) /* nothing */
+# define FREE_BLOCKS(list) /* nothing */
+#else
+struct block_list
+{
+  void *address;
+  struct block_list *next;
+};
+# define ADD_BLOCK(list, addr)						      \
+  do {									      \
+    struct block_list *newp = (struct block_list *) malloc (sizeof (*newp));  \
+    /* If we cannot get a free block we cannot add the new element to	      \
+       the list.  */							      \
+    if (newp != NULL) {							      \
+      newp->address = (addr);						      \
+      newp->next = (list);						      \
+      (list) = newp;							      \
+    }									      \
+  } while (0)
+# define FREE_BLOCKS(list)						      \
+  do {									      \
+    while (list != NULL) {						      \
+      struct block_list *old = list;					      \
+      list = list->next;						      \
+      free (old);							      \
+    }									      \
+  } while (0)
+# undef alloca
+# define alloca(size) (malloc (size))
+#endif	/* have alloca */
+
+
+#ifdef _LIBC
+/* List of blocks allocated for translations.  */
+typedef struct transmem_list
+{
+  struct transmem_list *next;
+  char data[ZERO];
+} transmem_block_t;
+static struct transmem_list *transmem_list;
+#else
+typedef unsigned char transmem_block_t;
+#endif
+
+
+/* Names for the libintl functions are a problem.  They must not clash
+   with existing names and they should follow ANSI C.  But this source
+   code is also used in GNU C Library where the names have a __
+   prefix.  So we have to make a difference here.  */
+#ifdef _LIBC
+# define DCIGETTEXT __dcigettext
+#else
+# define DCIGETTEXT dcigettext__
+#endif
+
+/* Lock variable to protect the global data in the gettext implementation.  */
+#ifdef _LIBC
+__libc_rwlock_define_initialized (, _nl_state_lock)
+#endif
+
+/* Checking whether the binaries runs SUID must be done and glibc provides
+   easier methods therefore we make a difference here.  */
+#ifdef _LIBC
+# define ENABLE_SECURE __libc_enable_secure
+# define DETERMINE_SECURE
+#else
+# ifndef HAVE_GETUID
+#  define getuid() 0
+# endif
+# ifndef HAVE_GETGID
+#  define getgid() 0
+# endif
+# ifndef HAVE_GETEUID
+#  define geteuid() getuid()
+# endif
+# ifndef HAVE_GETEGID
+#  define getegid() getgid()
+# endif
+static int enable_secure;
+# define ENABLE_SECURE (enable_secure == 1)
+# define DETERMINE_SECURE \
+  if (enable_secure == 0)						      \
+    {									      \
+      if (getuid () != geteuid () || getgid () != getegid ())		      \
+	enable_secure = 1;						      \
+      else								      \
+	enable_secure = -1;						      \
+    }
+#endif
+
+/* Look up MSGID in the DOMAINNAME message catalog for the current
+   CATEGORY locale and, if PLURAL is nonzero, search over string
+   depending on the plural form determined by N.  */
+char *
+DCIGETTEXT (domainname, msgid1, msgid2, plural, n, category)
+     const char *domainname;
+     const char *msgid1;
+     const char *msgid2;
+     int plural;
+     unsigned long int n;
+     int category;
+{
+#ifndef HAVE_ALLOCA
+  struct block_list *block_list = NULL;
+#endif
+  struct loaded_l10nfile *domain;
+  struct binding *binding;
+  const char *categoryname;
+  const char *categoryvalue;
+  char *dirname, *xdomainname;
+  char *single_locale;
+  char *retval;
+  size_t retlen;
+  int saved_errno;
+#if defined HAVE_TSEARCH || defined _LIBC
+  struct known_translation_t *search;
+  struct known_translation_t **foundp = NULL;
+  size_t msgid_len;
+#endif
+  size_t domainname_len;
+
+  /* If no real MSGID is given return NULL.  */
+  if (msgid1 == NULL)
+    return NULL;
+
+  __libc_rwlock_rdlock (_nl_state_lock);
+
+  /* If DOMAINNAME is NULL, we are interested in the default domain.  If
+     CATEGORY is not LC_MESSAGES this might not make much sense but the
+     definition left this undefined.  */
+  if (domainname == NULL)
+    domainname = _nl_current_default_domain;
+
+#if defined HAVE_TSEARCH || defined _LIBC
+  msgid_len = strlen (msgid1) + 1;
+
+  /* Try to find the translation among those which we found at
+     some time.  */
+  search = (struct known_translation_t *)
+	   alloca (offsetof (struct known_translation_t, msgid) + msgid_len);
+  memcpy (search->msgid, msgid1, msgid_len);
+  search->domainname = (char *) domainname;
+  search->category = category;
+
+  foundp = (struct known_translation_t **) tfind (search, &root, transcmp);
+  if (foundp != NULL && (*foundp)->counter == _nl_msg_cat_cntr)
+    {
+      /* Now deal with plural.  */
+      if (plural)
+	retval = plural_lookup ((*foundp)->domain, n, (*foundp)->translation,
+				(*foundp)->translation_length);
+      else
+	retval = (char *) (*foundp)->translation;
+
+      __libc_rwlock_unlock (_nl_state_lock);
+      return retval;
+    }
+#endif
+
+  /* Preserve the `errno' value.  */
+  saved_errno = errno;
+
+  /* See whether this is a SUID binary or not.  */
+  DETERMINE_SECURE;
+
+  /* First find matching binding.  */
+  for (binding = _nl_domain_bindings; binding != NULL; binding = binding->next)
+    {
+      int compare = strcmp (domainname, binding->domainname);
+      if (compare == 0)
+	/* We found it!  */
+	break;
+      if (compare < 0)
+	{
+	  /* It is not in the list.  */
+	  binding = NULL;
+	  break;
+	}
+    }
+
+  if (binding == NULL)
+    dirname = (char *) _nl_default_dirname;
+  else if (IS_ABSOLUTE_PATH (binding->dirname))
+    dirname = binding->dirname;
+  else
+    {
+      /* We have a relative path.  Make it absolute now.  */
+      size_t dirname_len = strlen (binding->dirname) + 1;
+      size_t path_max;
+      char *ret;
+
+      path_max = (unsigned int) PATH_MAX;
+      path_max += 2;		/* The getcwd docs say to do this.  */
+
+      for (;;)
+	{
+	  dirname = (char *) alloca (path_max + dirname_len);
+	  ADD_BLOCK (block_list, dirname);
+
+	  __set_errno (0);
+	  ret = getcwd (dirname, path_max);
+	  if (ret != NULL || errno != ERANGE)
+	    break;
+
+	  path_max += path_max / 2;
+	  path_max += PATH_INCR;
+	}
+
+      if (ret == NULL)
+	{
+	  /* We cannot get the current working directory.  Don't signal an
+	     error but simply return the default string.  */
+	  FREE_BLOCKS (block_list);
+	  __set_errno (saved_errno);
+	  return (plural == 0
+		  ? (char *) msgid1
+		  /* Use the Germanic plural rule.  */
+		  : n == 1 ? (char *) msgid1 : (char *) msgid2);
+	}
+
+      stpcpy (stpcpy (strchr (dirname, '\0'), "/"), binding->dirname);
+    }
+
+  /* Now determine the symbolic name of CATEGORY and its value.  */
+  categoryname = category_to_name (category);
+  categoryvalue = guess_category_value (category, categoryname);
+
+  domainname_len = strlen (domainname);
+  xdomainname = (char *) alloca (strlen (categoryname)
+				 + domainname_len + 5);
+  ADD_BLOCK (block_list, xdomainname);
+
+  stpcpy (mempcpy (stpcpy (stpcpy (xdomainname, categoryname), "/"),
+		  domainname, domainname_len),
+	  ".mo");
+
+  /* Creating working area.  */
+  single_locale = (char *) alloca (strlen (categoryvalue) + 1);
+  ADD_BLOCK (block_list, single_locale);
+
+
+  /* Search for the given string.  This is a loop because we perhaps
+     got an ordered list of languages to consider for the translation.  */
+  while (1)
+    {
+      /* Make CATEGORYVALUE point to the next element of the list.  */
+      while (categoryvalue[0] != '\0' && categoryvalue[0] == ':')
+	++categoryvalue;
+      if (categoryvalue[0] == '\0')
+	{
+	  /* The whole contents of CATEGORYVALUE has been searched but
+	     no valid entry has been found.  We solve this situation
+	     by implicitly appending a "C" entry, i.e. no translation
+	     will take place.  */
+	  single_locale[0] = 'C';
+	  single_locale[1] = '\0';
+	}
+      else
+	{
+	  char *cp = single_locale;
+	  while (categoryvalue[0] != '\0' && categoryvalue[0] != ':')
+	    *cp++ = *categoryvalue++;
+	  *cp = '\0';
+
+	  /* When this is a SUID binary we must not allow accessing files
+	     outside the dedicated directories.  */
+	  if (ENABLE_SECURE && IS_PATH_WITH_DIR (single_locale))
+	    /* Ingore this entry.  */
+	    continue;
+	}
+
+      /* If the current locale value is C (or POSIX) we don't load a
+	 domain.  Return the MSGID.  */
+      if (strcmp (single_locale, "C") == 0
+	  || strcmp (single_locale, "POSIX") == 0)
+	{
+	  FREE_BLOCKS (block_list);
+	  __libc_rwlock_unlock (_nl_state_lock);
+	  __set_errno (saved_errno);
+	  return (plural == 0
+		  ? (char *) msgid1
+		  /* Use the Germanic plural rule.  */
+		  : n == 1 ? (char *) msgid1 : (char *) msgid2);
+	}
+
+
+      /* Find structure describing the message catalog matching the
+	 DOMAINNAME and CATEGORY.  */
+      domain = _nl_find_domain (dirname, single_locale, xdomainname, binding);
+
+      if (domain != NULL)
+	{
+	  retval = _nl_find_msg (domain, binding, msgid1, &retlen);
+
+	  if (retval == NULL)
+	    {
+	      int cnt;
+
+	      for (cnt = 0; domain->successor[cnt] != NULL; ++cnt)
+		{
+		  retval = _nl_find_msg (domain->successor[cnt], binding,
+					 msgid1, &retlen);
+
+		  if (retval != NULL)
+		    {
+		      domain = domain->successor[cnt];
+		      break;
+		    }
+		}
+	    }
+
+	  if (retval != NULL)
+	    {
+	      /* Found the translation of MSGID1 in domain DOMAIN:
+		 starting at RETVAL, RETLEN bytes.  */
+	      FREE_BLOCKS (block_list);
+	      __set_errno (saved_errno);
+#if defined HAVE_TSEARCH || defined _LIBC
+	      if (foundp == NULL)
+		{
+		  /* Create a new entry and add it to the search tree.  */
+		  struct known_translation_t *newp;
+
+		  newp = (struct known_translation_t *)
+		    malloc (offsetof (struct known_translation_t, msgid)
+			    + msgid_len + domainname_len + 1);
+		  if (newp != NULL)
+		    {
+		      newp->domainname =
+			mempcpy (newp->msgid, msgid1, msgid_len);
+		      memcpy (newp->domainname, domainname, domainname_len + 1);
+		      newp->category = category;
+		      newp->counter = _nl_msg_cat_cntr;
+		      newp->domain = domain;
+		      newp->translation = retval;
+		      newp->translation_length = retlen;
+
+		      /* Insert the entry in the search tree.  */
+		      foundp = (struct known_translation_t **)
+			tsearch (newp, &root, transcmp);
+		      if (foundp == NULL
+			  || __builtin_expect (*foundp != newp, 0))
+			/* The insert failed.  */
+			free (newp);
+		    }
+		}
+	      else
+		{
+		  /* We can update the existing entry.  */
+		  (*foundp)->counter = _nl_msg_cat_cntr;
+		  (*foundp)->domain = domain;
+		  (*foundp)->translation = retval;
+		  (*foundp)->translation_length = retlen;
+		}
+#endif
+	      /* Now deal with plural.  */
+	      if (plural)
+		retval = plural_lookup (domain, n, retval, retlen);
+
+	      __libc_rwlock_unlock (_nl_state_lock);
+	      return retval;
+	    }
+	}
+    }
+  /* NOTREACHED */
+}
+
+
+char *
+internal_function
+_nl_find_msg (domain_file, domainbinding, msgid, lengthp)
+     struct loaded_l10nfile *domain_file;
+     struct binding *domainbinding;
+     const char *msgid;
+     size_t *lengthp;
+{
+  struct loaded_domain *domain;
+  size_t act;
+  char *result;
+  size_t resultlen;
+
+  if (domain_file->decided == 0)
+    _nl_load_domain (domain_file, domainbinding);
+
+  if (domain_file->data == NULL)
+    return NULL;
+
+  domain = (struct loaded_domain *) domain_file->data;
+
+  /* Locate the MSGID and its translation.  */
+  if (domain->hash_size > 2 && domain->hash_tab != NULL)
+    {
+      /* Use the hashing table.  */
+      nls_uint32 len = strlen (msgid);
+      nls_uint32 hash_val = hash_string (msgid);
+      nls_uint32 idx = hash_val % domain->hash_size;
+      nls_uint32 incr = 1 + (hash_val % (domain->hash_size - 2));
+
+      while (1)
+	{
+	  nls_uint32 nstr = W (domain->must_swap, domain->hash_tab[idx]);
+
+	  if (nstr == 0)
+	    /* Hash table entry is empty.  */
+	    return NULL;
+
+	  /* Compare msgid with the original string at index nstr-1.
+	     We compare the lengths with >=, not ==, because plural entries
+	     are represented by strings with an embedded NUL.  */
+	  if (W (domain->must_swap, domain->orig_tab[nstr - 1].length) >= len
+	      && (strcmp (msgid,
+			  domain->data + W (domain->must_swap,
+					    domain->orig_tab[nstr - 1].offset))
+		  == 0))
+	    {
+	      act = nstr - 1;
+	      goto found;
+	    }
+
+	  if (idx >= domain->hash_size - incr)
+	    idx -= domain->hash_size - incr;
+	  else
+	    idx += incr;
+	}
+      /* NOTREACHED */
+    }
+  else
+    {
+      /* Try the default method:  binary search in the sorted array of
+	 messages.  */
+      size_t top, bottom;
+
+      bottom = 0;
+      top = domain->nstrings;
+      while (bottom < top)
+	{
+	  int cmp_val;
+
+	  act = (bottom + top) / 2;
+	  cmp_val = strcmp (msgid, (domain->data
+				    + W (domain->must_swap,
+					 domain->orig_tab[act].offset)));
+	  if (cmp_val < 0)
+	    top = act;
+	  else if (cmp_val > 0)
+	    bottom = act + 1;
+	  else
+	    goto found;
+	}
+      /* No translation was found.  */
+      return NULL;
+    }
+
+ found:
+  /* The translation was found at index ACT.  If we have to convert the
+     string to use a different character set, this is the time.  */
+  result = ((char *) domain->data
+	    + W (domain->must_swap, domain->trans_tab[act].offset));
+  resultlen = W (domain->must_swap, domain->trans_tab[act].length) + 1;
+
+#if defined _LIBC || HAVE_ICONV
+  if (domain->codeset_cntr
+      != (domainbinding != NULL ? domainbinding->codeset_cntr : 0))
+    {
+      /* The domain's codeset has changed through bind_textdomain_codeset()
+	 since the message catalog was initialized or last accessed.  We
+	 have to reinitialize the converter.  */
+      _nl_free_domain_conv (domain);
+      _nl_init_domain_conv (domain_file, domain, domainbinding);
+    }
+
+  if (
+# ifdef _LIBC
+      domain->conv != (__gconv_t) -1
+# else
+#  if HAVE_ICONV
+      domain->conv != (iconv_t) -1
+#  endif
+# endif
+      )
+    {
+      /* We are supposed to do a conversion.  First allocate an
+	 appropriate table with the same structure as the table
+	 of translations in the file, where we can put the pointers
+	 to the converted strings in.
+	 There is a slight complication with plural entries.  They
+	 are represented by consecutive NUL terminated strings.  We
+	 handle this case by converting RESULTLEN bytes, including
+	 NULs.  */
+
+      if (domain->conv_tab == NULL
+	  && ((domain->conv_tab = (char **) calloc (domain->nstrings,
+						    sizeof (char *)))
+	      == NULL))
+	/* Mark that we didn't succeed allocating a table.  */
+	domain->conv_tab = (char **) -1;
+
+      if (__builtin_expect (domain->conv_tab == (char **) -1, 0))
+	/* Nothing we can do, no more memory.  */
+	goto converted;
+
+      if (domain->conv_tab[act] == NULL)
+	{
+	  /* We haven't used this string so far, so it is not
+	     translated yet.  Do this now.  */
+	  /* We use a bit more efficient memory handling.
+	     We allocate always larger blocks which get used over
+	     time.  This is faster than many small allocations.   */
+	  __libc_lock_define_initialized (static, lock)
+# define INITIAL_BLOCK_SIZE	4080
+	  static unsigned char *freemem;
+	  static size_t freemem_size;
+
+	  const unsigned char *inbuf;
+	  unsigned char *outbuf;
+	  int malloc_count;
+# ifndef _LIBC
+	  transmem_block_t *transmem_list = NULL;
+# endif
+
+	  __libc_lock_lock (lock);
+
+	  inbuf = (const unsigned char *) result;
+	  outbuf = freemem + sizeof (size_t);
+
+	  malloc_count = 0;
+	  while (1)
+	    {
+	      transmem_block_t *newmem;
+# ifdef _LIBC
+	      size_t non_reversible;
+	      int res;
+
+	      if (freemem_size < sizeof (size_t))
+		goto resize_freemem;
+
+	      res = __gconv (domain->conv,
+			     &inbuf, inbuf + resultlen,
+			     &outbuf,
+			     outbuf + freemem_size - sizeof (size_t),
+			     &non_reversible);
+
+	      if (res == __GCONV_OK || res == __GCONV_EMPTY_INPUT)
+		break;
+
+	      if (res != __GCONV_FULL_OUTPUT)
+		{
+		  __libc_lock_unlock (lock);
+		  goto converted;
+		}
+
+	      inbuf = result;
+# else
+#  if HAVE_ICONV
+	      const char *inptr = (const char *) inbuf;
+	      size_t inleft = resultlen;
+	      char *outptr = (char *) outbuf;
+	      size_t outleft;
+
+	      if (freemem_size < sizeof (size_t))
+		goto resize_freemem;
+
+	      outleft = freemem_size - sizeof (size_t);
+	      if (iconv (domain->conv,
+			 (ICONV_CONST char **) &inptr, &inleft,
+			 &outptr, &outleft)
+		  != (size_t) (-1))
+		{
+		  outbuf = (unsigned char *) outptr;
+		  break;
+		}
+	      if (errno != E2BIG)
+		{
+		  __libc_lock_unlock (lock);
+		  goto converted;
+		}
+#  endif
+# endif
+
+	    resize_freemem:
+	      /* We must allocate a new buffer or resize the old one.  */
+	      if (malloc_count > 0)
+		{
+		  ++malloc_count;
+		  freemem_size = malloc_count * INITIAL_BLOCK_SIZE;
+		  newmem = (transmem_block_t *) realloc (transmem_list,
+							 freemem_size);
+# ifdef _LIBC
+		  if (newmem != NULL)
+		    transmem_list = transmem_list->next;
+		  else
+		    {
+		      struct transmem_list *old = transmem_list;
+
+		      transmem_list = transmem_list->next;
+		      free (old);
+		    }
+# endif
+		}
+	      else
+		{
+		  malloc_count = 1;
+		  freemem_size = INITIAL_BLOCK_SIZE;
+		  newmem = (transmem_block_t *) malloc (freemem_size);
+		}
+	      if (__builtin_expect (newmem == NULL, 0))
+		{
+		  freemem = NULL;
+		  freemem_size = 0;
+		  __libc_lock_unlock (lock);
+		  goto converted;
+		}
+
+# ifdef _LIBC
+	      /* Add the block to the list of blocks we have to free
+                 at some point.  */
+	      newmem->next = transmem_list;
+	      transmem_list = newmem;
+
+	      freemem = newmem->data;
+	      freemem_size -= offsetof (struct transmem_list, data);
+# else
+	      transmem_list = newmem;
+	      freemem = newmem;
+# endif
+
+	      outbuf = freemem + sizeof (size_t);
+	    }
+
+	  /* We have now in our buffer a converted string.  Put this
+	     into the table of conversions.  */
+	  *(size_t *) freemem = outbuf - freemem - sizeof (size_t);
+	  domain->conv_tab[act] = (char *) freemem;
+	  /* Shrink freemem, but keep it aligned.  */
+	  freemem_size -= outbuf - freemem;
+	  freemem = outbuf;
+	  freemem += freemem_size & (alignof (size_t) - 1);
+	  freemem_size = freemem_size & ~ (alignof (size_t) - 1);
+
+	  __libc_lock_unlock (lock);
+	}
+
+      /* Now domain->conv_tab[act] contains the translation of all
+	 the plural variants.  */
+      result = domain->conv_tab[act] + sizeof (size_t);
+      resultlen = *(size_t *) domain->conv_tab[act];
+    }
+
+ converted:
+  /* The result string is converted.  */
+
+#endif /* _LIBC || HAVE_ICONV */
+
+  *lengthp = resultlen;
+  return result;
+}
+
+
+/* Look up a plural variant.  */
+static char *
+internal_function
+plural_lookup (domain, n, translation, translation_len)
+     struct loaded_l10nfile *domain;
+     unsigned long int n;
+     const char *translation;
+     size_t translation_len;
+{
+  struct loaded_domain *domaindata = (struct loaded_domain *) domain->data;
+  unsigned long int index;
+  const char *p;
+
+  index = plural_eval (domaindata->plural, n);
+  if (index >= domaindata->nplurals)
+    /* This should never happen.  It means the plural expression and the
+       given maximum value do not match.  */
+    index = 0;
+
+  /* Skip INDEX strings at TRANSLATION.  */
+  p = translation;
+  while (index-- > 0)
+    {
+#ifdef _LIBC
+      p = __rawmemchr (p, '\0');
+#else
+      p = strchr (p, '\0');
+#endif
+      /* And skip over the NUL byte.  */
+      p++;
+
+      if (p >= translation + translation_len)
+	/* This should never happen.  It means the plural expression
+	   evaluated to a value larger than the number of variants
+	   available for MSGID1.  */
+	return (char *) translation;
+    }
+  return (char *) p;
+}
+
+
+/* Function to evaluate the plural expression and return an index value.  */
+static unsigned long int
+internal_function
+plural_eval (pexp, n)
+     struct expression *pexp;
+     unsigned long int n;
+{
+  switch (pexp->nargs)
+    {
+    case 0:
+      switch (pexp->operation)
+	{
+	case var:
+	  return n;
+	case num:
+	  return pexp->val.num;
+	default:
+	  break;
+	}
+      /* NOTREACHED */
+      break;
+    case 1:
+      {
+	/* pexp->operation must be lnot.  */
+	unsigned long int arg = plural_eval (pexp->val.args[0], n);
+	return ! arg;
+      }
+    case 2:
+      {
+	unsigned long int leftarg = plural_eval (pexp->val.args[0], n);
+	if (pexp->operation == lor)
+	  return leftarg || plural_eval (pexp->val.args[1], n);
+	else if (pexp->operation == land)
+	  return leftarg && plural_eval (pexp->val.args[1], n);
+	else
+	  {
+	    unsigned long int rightarg = plural_eval (pexp->val.args[1], n);
+
+	    switch (pexp->operation)
+	      {
+	      case mult:
+		return leftarg * rightarg;
+	      case divide:
+		return leftarg / rightarg;
+	      case module:
+		return leftarg % rightarg;
+	      case plus:
+		return leftarg + rightarg;
+	      case minus:
+		return leftarg - rightarg;
+	      case less_than:
+		return leftarg < rightarg;
+	      case greater_than:
+		return leftarg > rightarg;
+	      case less_or_equal:
+		return leftarg <= rightarg;
+	      case greater_or_equal:
+		return leftarg >= rightarg;
+	      case equal:
+		return leftarg == rightarg;
+	      case not_equal:
+		return leftarg != rightarg;
+	      default:
+		break;
+	      }
+	  }
+	/* NOTREACHED */
+	break;
+      }
+    case 3:
+      {
+	/* pexp->operation must be qmop.  */
+	unsigned long int boolarg = plural_eval (pexp->val.args[0], n);
+	return plural_eval (pexp->val.args[boolarg ? 1 : 2], n);
+      }
+    }
+  /* NOTREACHED */
+  return 0;
+}
+
+
+/* Return string representation of locale CATEGORY.  */
+static const char *
+internal_function
+category_to_name (category)
+     int category;
+{
+  const char *retval;
+
+  switch (category)
+  {
+#ifdef LC_COLLATE
+  case LC_COLLATE:
+    retval = "LC_COLLATE";
+    break;
+#endif
+#ifdef LC_CTYPE
+  case LC_CTYPE:
+    retval = "LC_CTYPE";
+    break;
+#endif
+#ifdef LC_MONETARY
+  case LC_MONETARY:
+    retval = "LC_MONETARY";
+    break;
+#endif
+#ifdef LC_NUMERIC
+  case LC_NUMERIC:
+    retval = "LC_NUMERIC";
+    break;
+#endif
+#ifdef LC_TIME
+  case LC_TIME:
+    retval = "LC_TIME";
+    break;
+#endif
+#ifdef LC_MESSAGES
+  case LC_MESSAGES:
+    retval = "LC_MESSAGES";
+    break;
+#endif
+#ifdef LC_RESPONSE
+  case LC_RESPONSE:
+    retval = "LC_RESPONSE";
+    break;
+#endif
+#ifdef LC_ALL
+  case LC_ALL:
+    /* This might not make sense but is perhaps better than any other
+       value.  */
+    retval = "LC_ALL";
+    break;
+#endif
+  default:
+    /* If you have a better idea for a default value let me know.  */
+    retval = "LC_XXX";
+  }
+
+  return retval;
+}
+
+/* Guess value of current locale from value of the environment variables.  */
+static const char *
+internal_function
+guess_category_value (category, categoryname)
+     int category;
+     const char *categoryname;
+{
+  const char *language;
+  const char *retval;
+
+  /* The highest priority value is the `LANGUAGE' environment
+     variable.  But we don't use the value if the currently selected
+     locale is the C locale.  This is a GNU extension.  */
+  language = getenv ("LANGUAGE");
+  if (language != NULL && language[0] == '\0')
+    language = NULL;
+
+  /* We have to proceed with the POSIX methods of looking to `LC_ALL',
+     `LC_xxx', and `LANG'.  On some systems this can be done by the
+     `setlocale' function itself.  */
+#if defined _LIBC || (defined HAVE_SETLOCALE && defined HAVE_LC_MESSAGES && defined HAVE_LOCALE_NULL)
+  retval = setlocale (category, NULL);
+#else
+  /* Setting of LC_ALL overwrites all other.  */
+  retval = getenv ("LC_ALL");
+  if (retval == NULL || retval[0] == '\0')
+    {
+      /* Next comes the name of the desired category.  */
+      retval = getenv (categoryname);
+      if (retval == NULL || retval[0] == '\0')
+	{
+	  /* Last possibility is the LANG environment variable.  */
+	  retval = getenv ("LANG");
+	  if (retval == NULL || retval[0] == '\0')
+	    /* We use C as the default domain.  POSIX says this is
+	       implementation defined.  */
+	    return "C";
+	}
+    }
+#endif
+
+  return language != NULL && strcmp (retval, "C") != 0 ? language : retval;
+}
+
+/* @@ begin of epilog @@ */
+
+/* We don't want libintl.a to depend on any other library.  So we
+   avoid the non-standard function stpcpy.  In GNU C Library this
+   function is available, though.  Also allow the symbol HAVE_STPCPY
+   to be defined.  */
+#if !_LIBC && !HAVE_STPCPY
+static char *
+stpcpy (dest, src)
+     char *dest;
+     const char *src;
+{
+  while ((*dest++ = *src++) != '\0')
+    /* Do nothing. */ ;
+  return dest - 1;
+}
+#endif
+
+#if !_LIBC && !HAVE_MEMPCPY
+static void *
+mempcpy (dest, src, n)
+     void *dest;
+     const void *src;
+     size_t n;
+{
+  return (void *) ((char *) memcpy (dest, src, n) + n);
+}
+#endif
+
+
+#ifdef _LIBC
+/* If we want to free all resources we have to do some work at
+   program's end.  */
+static void __attribute__ ((unused))
+free_mem (void)
+{
+  void *old;
+
+  while (_nl_domain_bindings != NULL)
+    {
+      struct binding *oldp = _nl_domain_bindings;
+      _nl_domain_bindings = _nl_domain_bindings->next;
+      if (oldp->dirname != _nl_default_dirname)
+	/* Yes, this is a pointer comparison.  */
+	free (oldp->dirname);
+      free (oldp->codeset);
+      free (oldp);
+    }
+
+  if (_nl_current_default_domain != _nl_default_default_domain)
+    /* Yes, again a pointer comparison.  */
+    free ((char *) _nl_current_default_domain);
+
+  /* Remove the search tree with the known translations.  */
+  __tdestroy (root, free);
+  root = NULL;
+
+  while (transmem_list != NULL)
+    {
+      old = transmem_list;
+      transmem_list = transmem_list->next;
+      free (old);
+    }
+}
+
+text_set_element (__libc_subfreeres, free_mem);
+#endif
diff --git a/intl/dcngettext.c b/intl/dcngettext.c
new file mode 100644
index 0000000..e5da257
--- /dev/null
+++ b/intl/dcngettext.c
@@ -0,0 +1,59 @@
+/* Implementation of the dcngettext(3) function.
+   Copyright (C) 1995-1999, 2000, 2001 Free Software Foundation, Inc.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 2, or (at your option)
+   any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software Foundation,
+   Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
+
+#ifdef HAVE_CONFIG_H
+# include <config.h>
+#endif
+
+#include "gettextP.h"
+#ifdef _LIBC
+# include <libintl.h>
+#else
+# include "libgnuintl.h"
+#endif
+
+/* @@ end of prolog @@ */
+
+/* Names for the libintl functions are a problem.  They must not clash
+   with existing names and they should follow ANSI C.  But this source
+   code is also used in GNU C Library where the names have a __
+   prefix.  So we have to make a difference here.  */
+#ifdef _LIBC
+# define DCNGETTEXT __dcngettext
+# define DCIGETTEXT __dcigettext
+#else
+# define DCNGETTEXT dcngettext__
+# define DCIGETTEXT dcigettext__
+#endif
+
+/* Look up MSGID in the DOMAINNAME message catalog for the current CATEGORY
+   locale.  */
+char *
+DCNGETTEXT (domainname, msgid1, msgid2, n, category)
+     const char *domainname;
+     const char *msgid1;
+     const char *msgid2;
+     unsigned long int n;
+     int category;
+{
+  return DCIGETTEXT (domainname, msgid1, msgid2, 1, n, category);
+}
+
+#ifdef _LIBC
+/* Alias for function name in GNU C Library.  */
+weak_alias (__dcngettext, dcngettext);
+#endif
diff --git a/intl/dngettext.c b/intl/dngettext.c
new file mode 100644
index 0000000..79aaa9a
--- /dev/null
+++ b/intl/dngettext.c
@@ -0,0 +1,60 @@
+/* Implementation of the dngettext(3) function.
+   Copyright (C) 1995-1997, 2000, 2001 Free Software Foundation, Inc.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 2, or (at your option)
+   any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software Foundation,
+   Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
+
+#ifdef HAVE_CONFIG_H
+# include <config.h>
+#endif
+
+#include <locale.h>
+
+#include "gettextP.h"
+#ifdef _LIBC
+# include <libintl.h>
+#else
+# include "libgnuintl.h"
+#endif
+
+/* @@ end of prolog @@ */
+
+/* Names for the libintl functions are a problem.  They must not clash
+   with existing names and they should follow ANSI C.  But this source
+   code is also used in GNU C Library where the names have a __
+   prefix.  So we have to make a difference here.  */
+#ifdef _LIBC
+# define DNGETTEXT __dngettext
+# define DCNGETTEXT __dcngettext
+#else
+# define DNGETTEXT dngettext__
+# define DCNGETTEXT dcngettext__
+#endif
+
+/* Look up MSGID in the DOMAINNAME message catalog of the current
+   LC_MESSAGES locale and skip message according to the plural form.  */
+char *
+DNGETTEXT (domainname, msgid1, msgid2, n)
+     const char *domainname;
+     const char *msgid1;
+     const char *msgid2;
+     unsigned long int n;
+{
+  return DCNGETTEXT (domainname, msgid1, msgid2, n, LC_MESSAGES);
+}
+
+#ifdef _LIBC
+/* Alias for function name in GNU C Library.  */
+weak_alias (__dngettext, dngettext);
+#endif
diff --git a/intl/libgnuintl.h b/intl/libgnuintl.h
new file mode 100644
index 0000000..577001a
--- /dev/null
+++ b/intl/libgnuintl.h
@@ -0,0 +1,127 @@
+/* Message catalogs for internationalization.
+   Copyright (C) 1995-1997, 2000, 2001 Free Software Foundation, Inc.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 2, or (at your option)
+   any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software Foundation,
+   Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
+
+#ifndef _LIBINTL_H
+#define _LIBINTL_H	1
+
+#include <locale.h>
+
+/* The LC_MESSAGES locale category is the category used by the functions
+   gettext() and dgettext().  It is specified in POSIX, but not in ANSI C.
+   On systems that don't define it, use an arbitrary value instead.
+   On Solaris, <locale.h> defines __LOCALE_H then includes <libintl.h> (i.e.
+   this file!) and then only defines LC_MESSAGES.  To avoid a redefinition
+   warning, don't define LC_MESSAGES in this case.  */
+#if !defined LC_MESSAGES && !defined __LOCALE_H
+# define LC_MESSAGES 1729
+#endif
+
+/* We define an additional symbol to signal that we use the GNU
+   implementation of gettext.  */
+#define __USE_GNU_GETTEXT 1
+
+/* Resolve a platform specific conflict on DJGPP.  GNU gettext takes
+   precedence over _conio_gettext.  */
+#ifdef __DJGPP__
+# undef gettext
+# define gettext gettext
+#endif
+
+#ifndef PARAMS
+# if __STDC__ || defined __cplusplus
+#  define PARAMS(args) args
+# else
+#  define PARAMS(args) ()
+# endif
+#endif
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/* Look up MSGID in the current default message catalog for the current
+   LC_MESSAGES locale.  If not found, returns MSGID itself (the default
+   text).  */
+extern char *gettext PARAMS ((const char *__msgid));
+
+/* Look up MSGID in the DOMAINNAME message catalog for the current
+   LC_MESSAGES locale.  */
+extern char *dgettext PARAMS ((const char *__domainname, const char *__msgid));
+
+/* Look up MSGID in the DOMAINNAME message catalog for the current CATEGORY
+   locale.  */
+extern char *dcgettext PARAMS ((const char *__domainname, const char *__msgid,
+				int __category));
+
+
+/* Similar to `gettext' but select the plural form corresponding to the
+   number N.  */
+extern char *ngettext PARAMS ((const char *__msgid1, const char *__msgid2,
+			       unsigned long int __n));
+
+/* Similar to `dgettext' but select the plural form corresponding to the
+   number N.  */
+extern char *dngettext PARAMS ((const char *__domainname, const char *__msgid1,
+				const char *__msgid2, unsigned long int __n));
+
+/* Similar to `dcgettext' but select the plural form corresponding to the
+   number N.  */
+extern char *dcngettext PARAMS ((const char *__domainname, const char *__msgid1,
+				 const char *__msgid2, unsigned long int __n,
+				 int __category));
+
+
+/* Set the current default message catalog to DOMAINNAME.
+   If DOMAINNAME is null, return the current default.
+   If DOMAINNAME is "", reset to the default of "messages".  */
+extern char *textdomain PARAMS ((const char *__domainname));
+
+/* Specify that the DOMAINNAME message catalog will be found
+   in DIRNAME rather than in the system locale data base.  */
+extern char *bindtextdomain PARAMS ((const char *__domainname,
+				     const char *__dirname));
+
+/* Specify the character encoding in which the messages from the
+   DOMAINNAME message catalog will be returned.  */
+extern char *bind_textdomain_codeset PARAMS ((const char *__domainname,
+					      const char *__codeset));
+
+
+/* Optimized version of the functions above.  */
+#if defined __OPTIMIZED
+/* These are macros, but could also be inline functions.  */
+
+# define gettext(msgid)							      \
+  dgettext (NULL, msgid)
+
+# define dgettext(domainname, msgid)					      \
+  dcgettext (domainname, msgid, LC_MESSAGES)
+
+# define ngettext(msgid1, msgid2, n)					      \
+  dngettext (NULL, msgid1, msgid2, n)
+
+# define dngettext(domainname, msgid1, msgid2, n)			      \
+  dcngettext (domainname, msgid1, msgid2, n, LC_MESSAGES)
+
+#endif /* Optimizing. */
+
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* libintl.h */
diff --git a/intl/localcharset.c b/intl/localcharset.c
new file mode 100644
index 0000000..22e09e4
--- /dev/null
+++ b/intl/localcharset.c
@@ -0,0 +1,271 @@
+/* Determine a canonical name for the current locale's character encoding.
+
+   Copyright (C) 2000-2001 Free Software Foundation, Inc.
+
+   This program is free software; you can redistribute it and/or modify it
+   under the terms of the GNU Library General Public License as published
+   by the Free Software Foundation; either version 2, or (at your option)
+   any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   Library General Public License for more details.
+
+   You should have received a copy of the GNU Library General Public
+   License along with this program; if not, write to the Free Software
+   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
+   USA.  */
+
+/* Written by Bruno Haible <haible@clisp.cons.org>.  */
+
+#ifdef HAVE_CONFIG_H
+# include <config.h>
+#endif
+
+#if HAVE_STDDEF_H
+# include <stddef.h>
+#endif
+
+#include <stdio.h>
+#if HAVE_STRING_H
+# include <string.h>
+#else
+# include <strings.h>
+#endif
+#if HAVE_STDLIB_H
+# include <stdlib.h>
+#endif
+
+#if defined _WIN32 || defined __WIN32__
+# undef WIN32   /* avoid warning on mingw32 */
+# define WIN32
+#endif
+
+#ifndef WIN32
+# if HAVE_LANGINFO_CODESET
+#  include <langinfo.h>
+# else
+#  if HAVE_SETLOCALE
+#   include <locale.h>
+#  endif
+# endif
+#else /* WIN32 */
+# define WIN32_LEAN_AND_MEAN
+# include <windows.h>
+#endif
+
+#ifndef DIRECTORY_SEPARATOR
+# define DIRECTORY_SEPARATOR '/'
+#endif
+
+#ifndef ISSLASH
+# define ISSLASH(C) ((C) == DIRECTORY_SEPARATOR)
+#endif
+
+/* The following static variable is declared 'volatile' to avoid a
+   possible multithread problem in the function get_charset_aliases. If we
+   are running in a threaded environment, and if two threads initialize
+   'charset_aliases' simultaneously, both will produce the same value,
+   and everything will be ok if the two assignments to 'charset_aliases'
+   are atomic. But I don't know what will happen if the two assignments mix.  */
+#if __STDC__ != 1
+# define volatile /* empty */
+#endif
+/* Pointer to the contents of the charset.alias file, if it has already been
+   read, else NULL.  Its format is:
+   ALIAS_1 '\0' CANONICAL_1 '\0' ... ALIAS_n '\0' CANONICAL_n '\0' '\0'  */
+static char * volatile charset_aliases;
+
+/* Return a pointer to the contents of the charset.alias file.  */
+static const char *
+get_charset_aliases ()
+{
+  char *cp;
+
+  cp = charset_aliases;
+  if (cp == NULL)
+    {
+#ifndef WIN32
+      FILE *fp;
+      const char *dir = LIBDIR;
+      const char *base = "charset.alias";
+      char *file_name;
+
+      /* Concatenate dir and base into freshly allocated file_name.  */
+      {
+	size_t dir_len = strlen (dir);
+	size_t base_len = strlen (base);
+	int add_slash = (dir_len > 0 && !ISSLASH (dir[dir_len - 1]));
+	file_name = (char *) malloc (dir_len + add_slash + base_len + 1);
+	if (file_name != NULL)
+	  {
+	    memcpy (file_name, dir, dir_len);
+	    if (add_slash)
+	      file_name[dir_len] = DIRECTORY_SEPARATOR;
+	    memcpy (file_name + dir_len + add_slash, base, base_len + 1);
+	  }
+      }
+
+      if (file_name == NULL || (fp = fopen (file_name, "r")) == NULL)
+	/* Out of memory or file not found, treat it as empty.  */
+	cp = "";
+      else
+	{
+	  /* Parse the file's contents.  */
+	  int c;
+	  char buf1[50+1];
+	  char buf2[50+1];
+	  char *res_ptr = NULL;
+	  size_t res_size = 0;
+	  size_t l1, l2;
+
+	  for (;;)
+	    {
+	      c = getc (fp);
+	      if (c == EOF)
+		break;
+	      if (c == '\n' || c == ' ' || c == '\t')
+		continue;
+	      if (c == '#')
+		{
+		  /* Skip comment, to end of line.  */
+		  do
+		    c = getc (fp);
+		  while (!(c == EOF || c == '\n'));
+		  if (c == EOF)
+		    break;
+		  continue;
+		}
+	      ungetc (c, fp);
+	      if (fscanf(fp, "%50s %50s", buf1, buf2) < 2)
+		break;
+	      l1 = strlen (buf1);
+	      l2 = strlen (buf2);
+	      if (res_size == 0)
+		{
+		  res_size = l1 + 1 + l2 + 1;
+		  res_ptr = malloc (res_size + 1);
+		}
+	      else
+		{
+		  res_size += l1 + 1 + l2 + 1;
+		  res_ptr = realloc (res_ptr, res_size + 1);
+		}
+	      if (res_ptr == NULL)
+		{
+		  /* Out of memory. */
+		  res_size = 0;
+		  break;
+		}
+	      strcpy (res_ptr + res_size - (l2 + 1) - (l1 + 1), buf1);
+	      strcpy (res_ptr + res_size - (l2 + 1), buf2);
+	    }
+	  fclose (fp);
+	  if (res_size == 0)
+	    cp = "";
+	  else
+	    {
+	      *(res_ptr + res_size) = '\0';
+	      cp = res_ptr;
+	    }
+	}
+
+      if (file_name != NULL)
+	free (file_name);
+
+#else /* WIN32 */
+
+      /* To avoid the troubles of installing a separate file in the same
+	 directory as the DLL and of retrieving the DLL's directory at
+	 runtime, simply inline the aliases here.  */
+
+      cp = "CP936" "\0" "GBK" "\0"
+	   "CP1361" "\0" "JOHAB" "\0";
+#endif
+
+      charset_aliases = cp;
+    }
+
+  return cp;
+}
+
+/* Determine the current locale's character encoding, and canonicalize it
+   into one of the canonical names listed in config.charset.
+   The result must not be freed; it is statically allocated.
+   If the canonical name cannot be determined, the result is a non-canonical
+   name.  */
+
+#ifdef STATIC
+STATIC
+#endif
+const char *
+locale_charset ()
+{
+  const char *codeset;
+  const char *aliases;
+
+#ifndef WIN32
+
+# if HAVE_LANGINFO_CODESET
+
+  /* Most systems support nl_langinfo (CODESET) nowadays.  */
+  codeset = nl_langinfo (CODESET);
+
+# else
+
+  /* On old systems which lack it, use setlocale or getenv.  */
+  const char *locale = NULL;
+
+  /* But most old systems don't have a complete set of locales.  Some
+     (like SunOS 4 or DJGPP) have only the C locale.  Therefore we don't
+     use setlocale here; it would return "C" when it doesn't support the
+     locale name the user has set.  */
+#  if HAVE_SETLOCALE && 0
+  locale = setlocale (LC_CTYPE, NULL);
+#  endif
+  if (locale == NULL || locale[0] == '\0')
+    {
+      locale = getenv ("LC_ALL");
+      if (locale == NULL || locale[0] == '\0')
+	{
+	  locale = getenv ("LC_CTYPE");
+	  if (locale == NULL || locale[0] == '\0')
+	    locale = getenv ("LANG");
+	}
+    }
+
+  /* On some old systems, one used to set locale = "iso8859_1". On others,
+     you set it to "language_COUNTRY.charset". In any case, we resolve it
+     through the charset.alias file.  */
+  codeset = locale;
+
+# endif
+
+#else /* WIN32 */
+
+  static char buf[2 + 10 + 1];
+
+  /* Win32 has a function returning the locale's codepage as a number.  */
+  sprintf (buf, "CP%u", GetACP ());
+  codeset = buf;
+
+#endif
+
+  if (codeset == NULL)
+    /* The canonical name cannot be determined.  */
+    codeset = "";
+
+  /* Resolve alias. */
+  for (aliases = get_charset_aliases ();
+       *aliases != '\0';
+       aliases += strlen (aliases) + 1, aliases += strlen (aliases) + 1)
+    if (strcmp (codeset, aliases) == 0
+	|| (aliases[0] == '*' && aliases[1] == '\0'))
+      {
+	codeset = aliases + strlen (aliases) + 1;
+	break;
+      }
+
+  return codeset;
+}
diff --git a/intl/locale.alias b/intl/locale.alias
new file mode 100644
index 0000000..48940f7
--- /dev/null
+++ b/intl/locale.alias
@@ -0,0 +1,77 @@
+# Locale name alias data base.
+# Copyright (C) 1996,1997,1998,1999,2000,2001 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+
+# The format of this file is the same as for the corresponding file of
+# the X Window System, which normally can be found in
+#	/usr/lib/X11/locale/locale.alias
+# A single line contains two fields: an alias and a substitution value.
+# All entries are case independent.
+
+# Note: This file is far from being complete.  If you have a value for
+# your own site which you think might be useful for others too, share
+# it with the rest of us.  Send it using the `glibcbug' script to
+# bugs@gnu.org.
+
+# Packages using this file: 
+
+bokmal		no_NO.ISO-8859-1
+bokm�l		no_NO.ISO-8859-1
+catalan		ca_ES.ISO-8859-1
+croatian	hr_HR.ISO-8859-2
+czech		cs_CZ.ISO-8859-2
+danish          da_DK.ISO-8859-1
+dansk		da_DK.ISO-8859-1
+deutsch		de_DE.ISO-8859-1
+dutch		nl_NL.ISO-8859-1
+eesti		et_EE.ISO-8859-1
+estonian	et_EE.ISO-8859-1
+finnish         fi_FI.ISO-8859-1
+fran�ais	fr_FR.ISO-8859-1
+french		fr_FR.ISO-8859-1
+galego		gl_ES.ISO-8859-1
+galician	gl_ES.ISO-8859-1
+german		de_DE.ISO-8859-1
+greek           el_GR.ISO-8859-7
+hebrew          iw_IL.ISO-8859-8
+hrvatski	hr_HR.ISO-8859-2
+hungarian       hu_HU.ISO-8859-2
+icelandic       is_IS.ISO-8859-1
+italian         it_IT.ISO-8859-1
+japanese	ja_JP.eucJP
+japanese.euc	ja_JP.eucJP
+ja_JP		ja_JP.eucJP
+ja_JP.ujis	ja_JP.eucJP
+japanese.sjis	ja_JP.SJIS
+korean		ko_KR.eucKR
+korean.euc 	ko_KR.eucKR
+ko_KR		ko_KR.eucKR
+lithuanian      lt_LT.ISO-8859-13
+nb_NO		no_NO.ISO-8859-1
+nb_NO.ISO-8859-1 no_NO.ISO-8859-1
+norwegian       no_NO.ISO-8859-1
+nynorsk		nn_NO.ISO-8859-1
+polish          pl_PL.ISO-8859-2
+portuguese      pt_PT.ISO-8859-1
+romanian        ro_RO.ISO-8859-2
+russian         ru_RU.ISO-8859-5
+slovak          sk_SK.ISO-8859-2
+slovene         sl_SI.ISO-8859-2
+slovenian       sl_SI.ISO-8859-2
+spanish         es_ES.ISO-8859-1
+swedish         sv_SE.ISO-8859-1
+thai		th_TH.TIS-620
+turkish         tr_TR.ISO-8859-9
diff --git a/intl/ngettext.c b/intl/ngettext.c
new file mode 100644
index 0000000..8b1fa02
--- /dev/null
+++ b/intl/ngettext.c
@@ -0,0 +1,67 @@
+/* Implementation of ngettext(3) function.
+   Copyright (C) 1995, 1997, 2000, 2001 Free Software Foundation, Inc.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 2, or (at your option)
+   any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software Foundation,
+   Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
+
+#ifdef HAVE_CONFIG_H
+# include <config.h>
+#endif
+
+#ifdef _LIBC
+# define __need_NULL
+# include <stddef.h>
+#else
+# include <stdlib.h>		/* Just for NULL.  */
+#endif
+
+#include "gettextP.h"
+#ifdef _LIBC
+# include <libintl.h>
+#else
+# include "libgnuintl.h"
+#endif
+
+#include <locale.h>
+
+/* @@ end of prolog @@ */
+
+/* Names for the libintl functions are a problem.  They must not clash
+   with existing names and they should follow ANSI C.  But this source
+   code is also used in GNU C Library where the names have a __
+   prefix.  So we have to make a difference here.  */
+#ifdef _LIBC
+# define NGETTEXT __ngettext
+# define DCNGETTEXT __dcngettext
+#else
+# define NGETTEXT ngettext__
+# define DCNGETTEXT dcngettext__
+#endif
+
+/* Look up MSGID in the current default message catalog for the current
+   LC_MESSAGES locale.  If not found, returns MSGID itself (the default
+   text).  */
+char *
+NGETTEXT (msgid1, msgid2, n)
+     const char *msgid1;
+     const char *msgid2;
+     unsigned long int n;
+{
+  return DCNGETTEXT (NULL, msgid1, msgid2, n, LC_MESSAGES);
+}
+
+#ifdef _LIBC
+/* Alias for function name in GNU C Library.  */
+weak_alias (__ngettext, ngettext);
+#endif
diff --git a/intl/plural.c b/intl/plural.c
new file mode 100644
index 0000000..8191335
--- /dev/null
+++ b/intl/plural.c
@@ -0,0 +1,1325 @@
+
+/*  A Bison parser, made from plural.y
+    by GNU Bison version 1.28  */
+
+#define YYBISON 1  /* Identify Bison output.  */
+
+#define yyparse __gettextparse
+#define yylex __gettextlex
+#define yyerror __gettexterror
+#define yylval __gettextlval
+#define yychar __gettextchar
+#define yydebug __gettextdebug
+#define yynerrs __gettextnerrs
+#define	EQUOP2	257
+#define	CMPOP2	258
+#define	ADDOP2	259
+#define	MULOP2	260
+#define	NUMBER	261
+
+#line 1 "plural.y"
+
+/* Expression parsing for plural form selection.
+   Copyright (C) 2000, 2001 Free Software Foundation, Inc.
+   Written by Ulrich Drepper <drepper@cygnus.com>, 2000.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 2, or (at your option)
+   any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software Foundation,
+   Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
+
+/* The bison generated parser uses alloca.  AIX 3 forces us to put this
+   declaration at the beginning of the file.  The declaration in bison's
+   skeleton file comes too late.  This must come before <config.h>
+   because <config.h> may include arbitrary system headers.  */
+#if defined _AIX && !defined __GNUC__
+ #pragma alloca
+#endif
+
+#ifdef HAVE_CONFIG_H
+# include <config.h>
+#endif
+
+#include <stdlib.h>
+#include "gettextP.h"
+
+/* Names for the libintl functions are a problem.  They must not clash
+   with existing names and they should follow ANSI C.  But this source
+   code is also used in GNU C Library where the names have a __
+   prefix.  So we have to make a difference here.  */
+#ifdef _LIBC
+# define FREE_EXPRESSION __gettext_free_exp
+#else
+# define FREE_EXPRESSION gettext_free_exp__
+# define __gettextparse gettextparse__
+#endif
+
+#define YYLEX_PARAM	&((struct parse_args *) arg)->cp
+#define YYPARSE_PARAM	arg
+
+#line 52 "plural.y"
+typedef union {
+  unsigned long int num;
+  enum operator op;
+  struct expression *exp;
+} YYSTYPE;
+#line 58 "plural.y"
+
+/* Prototypes for local functions.  */
+static struct expression *new_exp PARAMS ((int nargs, enum operator op,
+					   struct expression * const *args));
+static inline struct expression *new_exp_0 PARAMS ((enum operator op));
+static inline struct expression *new_exp_1 PARAMS ((enum operator op,
+						   struct expression *right));
+static struct expression *new_exp_2 PARAMS ((enum operator op,
+					     struct expression *left,
+					     struct expression *right));
+static inline struct expression *new_exp_3 PARAMS ((enum operator op,
+						   struct expression *bexp,
+						   struct expression *tbranch,
+						   struct expression *fbranch));
+static int yylex PARAMS ((YYSTYPE *lval, const char **pexp));
+static void yyerror PARAMS ((const char *str));
+
+/* Allocation of expressions.  */
+
+static struct expression *
+new_exp (nargs, op, args)
+     int nargs;
+     enum operator op;
+     struct expression * const *args;
+{
+  int i;
+  struct expression *newp;
+
+  /* If any of the argument could not be malloc'ed, just return NULL.  */
+  for (i = nargs - 1; i >= 0; i--)
+    if (args[i] == NULL)
+      goto fail;
+
+  /* Allocate a new expression.  */
+  newp = (struct expression *) malloc (sizeof (*newp));
+  if (newp != NULL)
+    {
+      newp->nargs = nargs;
+      newp->operation = op;
+      for (i = nargs - 1; i >= 0; i--)
+	newp->val.args[i] = args[i];
+      return newp;
+    }
+
+ fail:
+  for (i = nargs - 1; i >= 0; i--)
+    FREE_EXPRESSION (args[i]);
+
+  return NULL;
+}
+
+static inline struct expression *
+new_exp_0 (op)
+     enum operator op;
+{
+  return new_exp (0, op, NULL);
+}
+
+static inline struct expression *
+new_exp_1 (op, right)
+     enum operator op;
+     struct expression *right;
+{
+  struct expression *args[1];
+
+  args[0] = right;
+  return new_exp (1, op, args);
+}
+
+static struct expression *
+new_exp_2 (op, left, right)
+     enum operator op;
+     struct expression *left;
+     struct expression *right;
+{
+  struct expression *args[2];
+
+  args[0] = left;
+  args[1] = right;
+  return new_exp (2, op, args);
+}
+
+static inline struct expression *
+new_exp_3 (op, bexp, tbranch, fbranch)
+     enum operator op;
+     struct expression *bexp;
+     struct expression *tbranch;
+     struct expression *fbranch;
+{
+  struct expression *args[3];
+
+  args[0] = bexp;
+  args[1] = tbranch;
+  args[2] = fbranch;
+  return new_exp (3, op, args);
+}
+
+#include <stdio.h>
+
+#ifndef __cplusplus
+#ifndef __STDC__
+#define const
+#endif
+#endif
+
+
+
+#define	YYFINAL		27
+#define	YYFLAG		-32768
+#define	YYNTBASE	16
+
+#define YYTRANSLATE(x) ((unsigned)(x) <= 261 ? yytranslate[x] : 18)
+
+static const char yytranslate[] = {     0,
+     2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+     2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+     2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+     2,     2,    10,     2,     2,     2,     2,     5,     2,    14,
+    15,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+     2,     2,     2,     2,     2,     2,     2,    12,     2,     2,
+     2,     2,     3,     2,     2,     2,     2,     2,     2,     2,
+     2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+     2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+     2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+     2,     2,     2,     2,     2,     2,     2,     2,     2,    13,
+     2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+     2,     2,     2,     4,     2,     2,     2,     2,     2,     2,
+     2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+     2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+     2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+     2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+     2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+     2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+     2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+     2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+     2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+     2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+     2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+     2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+     2,     2,     2,     2,     2,     1,     6,     7,     8,     9,
+    11
+};
+
+#if YYDEBUG != 0
+static const short yyprhs[] = {     0,
+     0,     2,     8,    12,    16,    20,    24,    28,    32,    35,
+    37,    39
+};
+
+static const short yyrhs[] = {    17,
+     0,    17,     3,    17,    12,    17,     0,    17,     4,    17,
+     0,    17,     5,    17,     0,    17,     6,    17,     0,    17,
+     7,    17,     0,    17,     8,    17,     0,    17,     9,    17,
+     0,    10,    17,     0,    13,     0,    11,     0,    14,    17,
+    15,     0
+};
+
+#endif
+
+#if YYDEBUG != 0
+static const short yyrline[] = { 0,
+   177,   185,   189,   193,   197,   201,   205,   209,   213,   217,
+   221,   226
+};
+#endif
+
+
+#if YYDEBUG != 0 || defined (YYERROR_VERBOSE)
+
+static const char * const yytname[] = {   "$","error","$undefined.","'?'","'|'",
+"'&'","EQUOP2","CMPOP2","ADDOP2","MULOP2","'!'","NUMBER","':'","'n'","'('","')'",
+"start","exp", NULL
+};
+#endif
+
+static const short yyr1[] = {     0,
+    16,    17,    17,    17,    17,    17,    17,    17,    17,    17,
+    17,    17
+};
+
+static const short yyr2[] = {     0,
+     1,     5,     3,     3,     3,     3,     3,     3,     2,     1,
+     1,     3
+};
+
+static const short yydefact[] = {     0,
+     0,    11,    10,     0,     1,     9,     0,     0,     0,     0,
+     0,     0,     0,     0,    12,     0,     3,     4,     5,     6,
+     7,     8,     0,     2,     0,     0,     0
+};
+
+static const short yydefgoto[] = {    25,
+     5
+};
+
+static const short yypact[] = {    -9,
+    -9,-32768,-32768,    -9,    34,-32768,    11,    -9,    -9,    -9,
+    -9,    -9,    -9,    -9,-32768,    24,    39,    43,    16,    26,
+    -3,-32768,    -9,    34,    21,    53,-32768
+};
+
+static const short yypgoto[] = {-32768,
+    -1
+};
+
+
+#define	YYLAST		53
+
+
+static const short yytable[] = {     6,
+     1,     2,     7,     3,     4,    14,    16,    17,    18,    19,
+    20,    21,    22,     8,     9,    10,    11,    12,    13,    14,
+    26,    24,    12,    13,    14,    15,     8,     9,    10,    11,
+    12,    13,    14,    13,    14,    23,     8,     9,    10,    11,
+    12,    13,    14,    10,    11,    12,    13,    14,    11,    12,
+    13,    14,    27
+};
+
+static const short yycheck[] = {     1,
+    10,    11,     4,    13,    14,     9,     8,     9,    10,    11,
+    12,    13,    14,     3,     4,     5,     6,     7,     8,     9,
+     0,    23,     7,     8,     9,    15,     3,     4,     5,     6,
+     7,     8,     9,     8,     9,    12,     3,     4,     5,     6,
+     7,     8,     9,     5,     6,     7,     8,     9,     6,     7,
+     8,     9,     0
+};
+#define YYPURE 1
+
+/* -*-C-*-  Note some compilers choke on comments on `#line' lines.  */
+#line 3 "/home/haible/gnu/arch/linuxlibc6/share/bison.simple"
+/* This file comes from bison-1.28.  */
+
+/* Skeleton output parser for bison,
+   Copyright (C) 1984, 1989, 1990 Free Software Foundation, Inc.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 2, or (at your option)
+   any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 59 Temple Place - Suite 330,
+   Boston, MA 02111-1307, USA.  */
+
+/* As a special exception, when this file is copied by Bison into a
+   Bison output file, you may use that output file without restriction.
+   This special exception was added by the Free Software Foundation
+   in version 1.24 of Bison.  */
+
+/* This is the parser code that is written into each bison parser
+  when the %semantic_parser declaration is not specified in the grammar.
+  It was written by Richard Stallman by simplifying the hairy parser
+  used when %semantic_parser is specified.  */
+
+#ifndef YYSTACK_USE_ALLOCA
+#ifdef alloca
+#define YYSTACK_USE_ALLOCA
+#else /* alloca not defined */
+#ifdef __GNUC__
+#define YYSTACK_USE_ALLOCA
+#define alloca __builtin_alloca
+#else /* not GNU C.  */
+#if (!defined (__STDC__) && defined (sparc)) || defined (__sparc__) || defined (__sparc) || defined (__sgi) || (defined (__sun) && defined (__i386))
+#define YYSTACK_USE_ALLOCA
+#include <alloca.h>
+#else /* not sparc */
+/* We think this test detects Watcom and Microsoft C.  */
+/* This used to test MSDOS, but that is a bad idea
+   since that symbol is in the user namespace.  */
+#if (defined (_MSDOS) || defined (_MSDOS_)) && !defined (__TURBOC__)
+#if 0 /* No need for malloc.h, which pollutes the namespace;
+	 instead, just don't use alloca.  */
+#include <malloc.h>
+#endif
+#else /* not MSDOS, or __TURBOC__ */
+#if defined(_AIX)
+/* I don't know what this was needed for, but it pollutes the namespace.
+   So I turned it off.   rms, 2 May 1997.  */
+/* #include <malloc.h>  */
+ #pragma alloca
+#define YYSTACK_USE_ALLOCA
+#else /* not MSDOS, or __TURBOC__, or _AIX */
+#if 0
+#ifdef __hpux /* haible@ilog.fr says this works for HPUX 9.05 and up,
+		 and on HPUX 10.  Eventually we can turn this on.  */
+#define YYSTACK_USE_ALLOCA
+#define alloca __builtin_alloca
+#endif /* __hpux */
+#endif
+#endif /* not _AIX */
+#endif /* not MSDOS, or __TURBOC__ */
+#endif /* not sparc */
+#endif /* not GNU C */
+#endif /* alloca not defined */
+#endif /* YYSTACK_USE_ALLOCA not defined */
+
+#ifdef YYSTACK_USE_ALLOCA
+#define YYSTACK_ALLOC alloca
+#else
+#define YYSTACK_ALLOC malloc
+#endif
+
+/* Note: there must be only one dollar sign in this file.
+   It is replaced by the list of actions, each action
+   as one case of the switch.  */
+
+#define yyerrok		(yyerrstatus = 0)
+#define yyclearin	(yychar = YYEMPTY)
+#define YYEMPTY		-2
+#define YYEOF		0
+#define YYACCEPT	goto yyacceptlab
+#define YYABORT 	goto yyabortlab
+#define YYERROR		goto yyerrlab1
+/* Like YYERROR except do call yyerror.
+   This remains here temporarily to ease the
+   transition to the new meaning of YYERROR, for GCC.
+   Once GCC version 2 has supplanted version 1, this can go.  */
+#define YYFAIL		goto yyerrlab
+#define YYRECOVERING()  (!!yyerrstatus)
+#define YYBACKUP(token, value) \
+do								\
+  if (yychar == YYEMPTY && yylen == 1)				\
+    { yychar = (token), yylval = (value);			\
+      yychar1 = YYTRANSLATE (yychar);				\
+      YYPOPSTACK;						\
+      goto yybackup;						\
+    }								\
+  else								\
+    { yyerror ("syntax error: cannot back up"); YYERROR; }	\
+while (0)
+
+#define YYTERROR	1
+#define YYERRCODE	256
+
+#ifndef YYPURE
+#define YYLEX		yylex()
+#endif
+
+#ifdef YYPURE
+#ifdef YYLSP_NEEDED
+#ifdef YYLEX_PARAM
+#define YYLEX		yylex(&yylval, &yylloc, YYLEX_PARAM)
+#else
+#define YYLEX		yylex(&yylval, &yylloc)
+#endif
+#else /* not YYLSP_NEEDED */
+#ifdef YYLEX_PARAM
+#define YYLEX		yylex(&yylval, YYLEX_PARAM)
+#else
+#define YYLEX		yylex(&yylval)
+#endif
+#endif /* not YYLSP_NEEDED */
+#endif
+
+/* If nonreentrant, generate the variables here */
+
+#ifndef YYPURE
+
+int	yychar;			/*  the lookahead symbol		*/
+YYSTYPE	yylval;			/*  the semantic value of the		*/
+				/*  lookahead symbol			*/
+
+#ifdef YYLSP_NEEDED
+YYLTYPE yylloc;			/*  location data for the lookahead	*/
+				/*  symbol				*/
+#endif
+
+int yynerrs;			/*  number of parse errors so far       */
+#endif  /* not YYPURE */
+
+#if YYDEBUG != 0
+int yydebug;			/*  nonzero means print parse trace	*/
+/* Since this is uninitialized, it does not stop multiple parsers
+   from coexisting.  */
+#endif
+
+/*  YYINITDEPTH indicates the initial size of the parser's stacks	*/
+
+#ifndef	YYINITDEPTH
+#define YYINITDEPTH 200
+#endif
+
+/*  YYMAXDEPTH is the maximum size the stacks can grow to
+    (effective only if the built-in stack extension method is used).  */
+
+#if YYMAXDEPTH == 0
+#undef YYMAXDEPTH
+#endif
+
+#ifndef YYMAXDEPTH
+#define YYMAXDEPTH 10000
+#endif
+
+/* Define __yy_memcpy.  Note that the size argument
+   should be passed with type unsigned int, because that is what the non-GCC
+   definitions require.  With GCC, __builtin_memcpy takes an arg
+   of type size_t, but it can handle unsigned int.  */
+
+#if __GNUC__ > 1		/* GNU C and GNU C++ define this.  */
+#define __yy_memcpy(TO,FROM,COUNT)	__builtin_memcpy(TO,FROM,COUNT)
+#else				/* not GNU C or C++ */
+#ifndef __cplusplus
+
+/* This is the most reliable way to avoid incompatibilities
+   in available built-in functions on various systems.  */
+static void
+__yy_memcpy (to, from, count)
+     char *to;
+     char *from;
+     unsigned int count;
+{
+  register char *f = from;
+  register char *t = to;
+  register int i = count;
+
+  while (i-- > 0)
+    *t++ = *f++;
+}
+
+#else /* __cplusplus */
+
+/* This is the most reliable way to avoid incompatibilities
+   in available built-in functions on various systems.  */
+static void
+__yy_memcpy (char *to, char *from, unsigned int count)
+{
+  register char *t = to;
+  register char *f = from;
+  register int i = count;
+
+  while (i-- > 0)
+    *t++ = *f++;
+}
+
+#endif
+#endif
+
+#line 217 "/home/haible/gnu/arch/linuxlibc6/share/bison.simple"
+
+/* The user can define YYPARSE_PARAM as the name of an argument to be passed
+   into yyparse.  The argument should have type void *.
+   It should actually point to an object.
+   Grammar actions can access the variable by casting it
+   to the proper pointer type.  */
+
+#ifdef YYPARSE_PARAM
+#ifdef __cplusplus
+#define YYPARSE_PARAM_ARG void *YYPARSE_PARAM
+#define YYPARSE_PARAM_DECL
+#else /* not __cplusplus */
+#define YYPARSE_PARAM_ARG YYPARSE_PARAM
+#define YYPARSE_PARAM_DECL void *YYPARSE_PARAM;
+#endif /* not __cplusplus */
+#else /* not YYPARSE_PARAM */
+#define YYPARSE_PARAM_ARG
+#define YYPARSE_PARAM_DECL
+#endif /* not YYPARSE_PARAM */
+
+/* Prevent warning if -Wstrict-prototypes.  */
+#ifdef __GNUC__
+#ifdef YYPARSE_PARAM
+int yyparse (void *);
+#else
+int yyparse (void);
+#endif
+#endif
+
+int
+yyparse(YYPARSE_PARAM_ARG)
+     YYPARSE_PARAM_DECL
+{
+  register int yystate;
+  register int yyn;
+  register short *yyssp;
+  register YYSTYPE *yyvsp;
+  int yyerrstatus;	/*  number of tokens to shift before error messages enabled */
+  int yychar1 = 0;		/*  lookahead token as an internal (translated) token number */
+
+  short	yyssa[YYINITDEPTH];	/*  the state stack			*/
+  YYSTYPE yyvsa[YYINITDEPTH];	/*  the semantic value stack		*/
+
+  short *yyss = yyssa;		/*  refer to the stacks thru separate pointers */
+  YYSTYPE *yyvs = yyvsa;	/*  to allow yyoverflow to reallocate them elsewhere */
+
+#ifdef YYLSP_NEEDED
+  YYLTYPE yylsa[YYINITDEPTH];	/*  the location stack			*/
+  YYLTYPE *yyls = yylsa;
+  YYLTYPE *yylsp;
+
+#define YYPOPSTACK   (yyvsp--, yyssp--, yylsp--)
+#else
+#define YYPOPSTACK   (yyvsp--, yyssp--)
+#endif
+
+  int yystacksize = YYINITDEPTH;
+  int yyfree_stacks = 0;
+
+#ifdef YYPURE
+  int yychar;
+  YYSTYPE yylval;
+  int yynerrs;
+#ifdef YYLSP_NEEDED
+  YYLTYPE yylloc;
+#endif
+#endif
+
+  YYSTYPE yyval;		/*  the variable used to return		*/
+				/*  semantic values from the action	*/
+				/*  routines				*/
+
+  int yylen;
+
+#if YYDEBUG != 0
+  if (yydebug)
+    fprintf(stderr, "Starting parse\n");
+#endif
+
+  yystate = 0;
+  yyerrstatus = 0;
+  yynerrs = 0;
+  yychar = YYEMPTY;		/* Cause a token to be read.  */
+
+  /* Initialize stack pointers.
+     Waste one element of value and location stack
+     so that they stay on the same level as the state stack.
+     The wasted elements are never initialized.  */
+
+  yyssp = yyss - 1;
+  yyvsp = yyvs;
+#ifdef YYLSP_NEEDED
+  yylsp = yyls;
+#endif
+
+/* Push a new state, which is found in  yystate  .  */
+/* In all cases, when you get here, the value and location stacks
+   have just been pushed. so pushing a state here evens the stacks.  */
+yynewstate:
+
+  *++yyssp = yystate;
+
+  if (yyssp >= yyss + yystacksize - 1)
+    {
+      /* Give user a chance to reallocate the stack */
+      /* Use copies of these so that the &'s don't force the real ones into memory. */
+      YYSTYPE *yyvs1 = yyvs;
+      short *yyss1 = yyss;
+#ifdef YYLSP_NEEDED
+      YYLTYPE *yyls1 = yyls;
+#endif
+
+      /* Get the current used size of the three stacks, in elements.  */
+      int size = yyssp - yyss + 1;
+
+#ifdef yyoverflow
+      /* Each stack pointer address is followed by the size of
+	 the data in use in that stack, in bytes.  */
+#ifdef YYLSP_NEEDED
+      /* This used to be a conditional around just the two extra args,
+	 but that might be undefined if yyoverflow is a macro.  */
+      yyoverflow("parser stack overflow",
+		 &yyss1, size * sizeof (*yyssp),
+		 &yyvs1, size * sizeof (*yyvsp),
+		 &yyls1, size * sizeof (*yylsp),
+		 &yystacksize);
+#else
+      yyoverflow("parser stack overflow",
+		 &yyss1, size * sizeof (*yyssp),
+		 &yyvs1, size * sizeof (*yyvsp),
+		 &yystacksize);
+#endif
+
+      yyss = yyss1; yyvs = yyvs1;
+#ifdef YYLSP_NEEDED
+      yyls = yyls1;
+#endif
+#else /* no yyoverflow */
+      /* Extend the stack our own way.  */
+      if (yystacksize >= YYMAXDEPTH)
+	{
+	  yyerror("parser stack overflow");
+	  if (yyfree_stacks)
+	    {
+	      free (yyss);
+	      free (yyvs);
+#ifdef YYLSP_NEEDED
+	      free (yyls);
+#endif
+	    }
+	  return 2;
+	}
+      yystacksize *= 2;
+      if (yystacksize > YYMAXDEPTH)
+	yystacksize = YYMAXDEPTH;
+#ifndef YYSTACK_USE_ALLOCA
+      yyfree_stacks = 1;
+#endif
+      yyss = (short *) YYSTACK_ALLOC (yystacksize * sizeof (*yyssp));
+      __yy_memcpy ((char *)yyss, (char *)yyss1,
+		   size * (unsigned int) sizeof (*yyssp));
+      yyvs = (YYSTYPE *) YYSTACK_ALLOC (yystacksize * sizeof (*yyvsp));
+      __yy_memcpy ((char *)yyvs, (char *)yyvs1,
+		   size * (unsigned int) sizeof (*yyvsp));
+#ifdef YYLSP_NEEDED
+      yyls = (YYLTYPE *) YYSTACK_ALLOC (yystacksize * sizeof (*yylsp));
+      __yy_memcpy ((char *)yyls, (char *)yyls1,
+		   size * (unsigned int) sizeof (*yylsp));
+#endif
+#endif /* no yyoverflow */
+
+      yyssp = yyss + size - 1;
+      yyvsp = yyvs + size - 1;
+#ifdef YYLSP_NEEDED
+      yylsp = yyls + size - 1;
+#endif
+
+#if YYDEBUG != 0
+      if (yydebug)
+	fprintf(stderr, "Stack size increased to %d\n", yystacksize);
+#endif
+
+      if (yyssp >= yyss + yystacksize - 1)
+	YYABORT;
+    }
+
+#if YYDEBUG != 0
+  if (yydebug)
+    fprintf(stderr, "Entering state %d\n", yystate);
+#endif
+
+  goto yybackup;
+ yybackup:
+
+/* Do appropriate processing given the current state.  */
+/* Read a lookahead token if we need one and don't already have one.  */
+/* yyresume: */
+
+  /* First try to decide what to do without reference to lookahead token.  */
+
+  yyn = yypact[yystate];
+  if (yyn == YYFLAG)
+    goto yydefault;
+
+  /* Not known => get a lookahead token if don't already have one.  */
+
+  /* yychar is either YYEMPTY or YYEOF
+     or a valid token in external form.  */
+
+  if (yychar == YYEMPTY)
+    {
+#if YYDEBUG != 0
+      if (yydebug)
+	fprintf(stderr, "Reading a token: ");
+#endif
+      yychar = YYLEX;
+    }
+
+  /* Convert token to internal form (in yychar1) for indexing tables with */
+
+  if (yychar <= 0)		/* This means end of input. */
+    {
+      yychar1 = 0;
+      yychar = YYEOF;		/* Don't call YYLEX any more */
+
+#if YYDEBUG != 0
+      if (yydebug)
+	fprintf(stderr, "Now at end of input.\n");
+#endif
+    }
+  else
+    {
+      yychar1 = YYTRANSLATE(yychar);
+
+#if YYDEBUG != 0
+      if (yydebug)
+	{
+	  fprintf (stderr, "Next token is %d (%s", yychar, yytname[yychar1]);
+	  /* Give the individual parser a way to print the precise meaning
+	     of a token, for further debugging info.  */
+#ifdef YYPRINT
+	  YYPRINT (stderr, yychar, yylval);
+#endif
+	  fprintf (stderr, ")\n");
+	}
+#endif
+    }
+
+  yyn += yychar1;
+  if (yyn < 0 || yyn > YYLAST || yycheck[yyn] != yychar1)
+    goto yydefault;
+
+  yyn = yytable[yyn];
+
+  /* yyn is what to do for this token type in this state.
+     Negative => reduce, -yyn is rule number.
+     Positive => shift, yyn is new state.
+       New state is final state => don't bother to shift,
+       just return success.
+     0, or most negative number => error.  */
+
+  if (yyn < 0)
+    {
+      if (yyn == YYFLAG)
+	goto yyerrlab;
+      yyn = -yyn;
+      goto yyreduce;
+    }
+  else if (yyn == 0)
+    goto yyerrlab;
+
+  if (yyn == YYFINAL)
+    YYACCEPT;
+
+  /* Shift the lookahead token.  */
+
+#if YYDEBUG != 0
+  if (yydebug)
+    fprintf(stderr, "Shifting token %d (%s), ", yychar, yytname[yychar1]);
+#endif
+
+  /* Discard the token being shifted unless it is eof.  */
+  if (yychar != YYEOF)
+    yychar = YYEMPTY;
+
+  *++yyvsp = yylval;
+#ifdef YYLSP_NEEDED
+  *++yylsp = yylloc;
+#endif
+
+  /* count tokens shifted since error; after three, turn off error status.  */
+  if (yyerrstatus) yyerrstatus--;
+
+  yystate = yyn;
+  goto yynewstate;
+
+/* Do the default action for the current state.  */
+yydefault:
+
+  yyn = yydefact[yystate];
+  if (yyn == 0)
+    goto yyerrlab;
+
+/* Do a reduction.  yyn is the number of a rule to reduce with.  */
+yyreduce:
+  yylen = yyr2[yyn];
+  if (yylen > 0)
+    yyval = yyvsp[1-yylen]; /* implement default value of the action */
+
+#if YYDEBUG != 0
+  if (yydebug)
+    {
+      int i;
+
+      fprintf (stderr, "Reducing via rule %d (line %d), ",
+	       yyn, yyrline[yyn]);
+
+      /* Print the symbols being reduced, and their result.  */
+      for (i = yyprhs[yyn]; yyrhs[i] > 0; i++)
+	fprintf (stderr, "%s ", yytname[yyrhs[i]]);
+      fprintf (stderr, " -> %s\n", yytname[yyr1[yyn]]);
+    }
+#endif
+
+
+  switch (yyn) {
+
+case 1:
+#line 178 "plural.y"
+{
+	    if (yyvsp[0].exp == NULL)
+	      YYABORT;
+	    ((struct parse_args *) arg)->res = yyvsp[0].exp;
+	  ;
+    break;}
+case 2:
+#line 186 "plural.y"
+{
+	    yyval.exp = new_exp_3 (qmop, yyvsp[-4].exp, yyvsp[-2].exp, yyvsp[0].exp);
+	  ;
+    break;}
+case 3:
+#line 190 "plural.y"
+{
+	    yyval.exp = new_exp_2 (lor, yyvsp[-2].exp, yyvsp[0].exp);
+	  ;
+    break;}
+case 4:
+#line 194 "plural.y"
+{
+	    yyval.exp = new_exp_2 (land, yyvsp[-2].exp, yyvsp[0].exp);
+	  ;
+    break;}
+case 5:
+#line 198 "plural.y"
+{
+	    yyval.exp = new_exp_2 (yyvsp[-1].op, yyvsp[-2].exp, yyvsp[0].exp);
+	  ;
+    break;}
+case 6:
+#line 202 "plural.y"
+{
+	    yyval.exp = new_exp_2 (yyvsp[-1].op, yyvsp[-2].exp, yyvsp[0].exp);
+	  ;
+    break;}
+case 7:
+#line 206 "plural.y"
+{
+	    yyval.exp = new_exp_2 (yyvsp[-1].op, yyvsp[-2].exp, yyvsp[0].exp);
+	  ;
+    break;}
+case 8:
+#line 210 "plural.y"
+{
+	    yyval.exp = new_exp_2 (yyvsp[-1].op, yyvsp[-2].exp, yyvsp[0].exp);
+	  ;
+    break;}
+case 9:
+#line 214 "plural.y"
+{
+	    yyval.exp = new_exp_1 (lnot, yyvsp[0].exp);
+	  ;
+    break;}
+case 10:
+#line 218 "plural.y"
+{
+	    yyval.exp = new_exp_0 (var);
+	  ;
+    break;}
+case 11:
+#line 222 "plural.y"
+{
+	    if ((yyval.exp = new_exp_0 (num)) != NULL)
+	      yyval.exp->val.num = yyvsp[0].num;
+	  ;
+    break;}
+case 12:
+#line 227 "plural.y"
+{
+	    yyval.exp = yyvsp[-1].exp;
+	  ;
+    break;}
+}
+   /* the action file gets copied in in place of this dollarsign */
+#line 543 "/home/haible/gnu/arch/linuxlibc6/share/bison.simple"
+
+  yyvsp -= yylen;
+  yyssp -= yylen;
+#ifdef YYLSP_NEEDED
+  yylsp -= yylen;
+#endif
+
+#if YYDEBUG != 0
+  if (yydebug)
+    {
+      short *ssp1 = yyss - 1;
+      fprintf (stderr, "state stack now");
+      while (ssp1 != yyssp)
+	fprintf (stderr, " %d", *++ssp1);
+      fprintf (stderr, "\n");
+    }
+#endif
+
+  *++yyvsp = yyval;
+
+#ifdef YYLSP_NEEDED
+  yylsp++;
+  if (yylen == 0)
+    {
+      yylsp->first_line = yylloc.first_line;
+      yylsp->first_column = yylloc.first_column;
+      yylsp->last_line = (yylsp-1)->last_line;
+      yylsp->last_column = (yylsp-1)->last_column;
+      yylsp->text = 0;
+    }
+  else
+    {
+      yylsp->last_line = (yylsp+yylen-1)->last_line;
+      yylsp->last_column = (yylsp+yylen-1)->last_column;
+    }
+#endif
+
+  /* Now "shift" the result of the reduction.
+     Determine what state that goes to,
+     based on the state we popped back to
+     and the rule number reduced by.  */
+
+  yyn = yyr1[yyn];
+
+  yystate = yypgoto[yyn - YYNTBASE] + *yyssp;
+  if (yystate >= 0 && yystate <= YYLAST && yycheck[yystate] == *yyssp)
+    yystate = yytable[yystate];
+  else
+    yystate = yydefgoto[yyn - YYNTBASE];
+
+  goto yynewstate;
+
+yyerrlab:   /* here on detecting error */
+
+  if (! yyerrstatus)
+    /* If not already recovering from an error, report this error.  */
+    {
+      ++yynerrs;
+
+#ifdef YYERROR_VERBOSE
+      yyn = yypact[yystate];
+
+      if (yyn > YYFLAG && yyn < YYLAST)
+	{
+	  int size = 0;
+	  char *msg;
+	  int x, count;
+
+	  count = 0;
+	  /* Start X at -yyn if nec to avoid negative indexes in yycheck.  */
+	  for (x = (yyn < 0 ? -yyn : 0);
+	       x < (sizeof(yytname) / sizeof(char *)); x++)
+	    if (yycheck[x + yyn] == x)
+	      size += strlen(yytname[x]) + 15, count++;
+	  msg = (char *) malloc(size + 15);
+	  if (msg != 0)
+	    {
+	      strcpy(msg, "parse error");
+
+	      if (count < 5)
+		{
+		  count = 0;
+		  for (x = (yyn < 0 ? -yyn : 0);
+		       x < (sizeof(yytname) / sizeof(char *)); x++)
+		    if (yycheck[x + yyn] == x)
+		      {
+			strcat(msg, count == 0 ? ", expecting `" : " or `");
+			strcat(msg, yytname[x]);
+			strcat(msg, "'");
+			count++;
+		      }
+		}
+	      yyerror(msg);
+	      free(msg);
+	    }
+	  else
+	    yyerror ("parse error; also virtual memory exceeded");
+	}
+      else
+#endif /* YYERROR_VERBOSE */
+	yyerror("parse error");
+    }
+
+  goto yyerrlab1;
+yyerrlab1:   /* here on error raised explicitly by an action */
+
+  if (yyerrstatus == 3)
+    {
+      /* if just tried and failed to reuse lookahead token after an error, discard it.  */
+
+      /* return failure if at end of input */
+      if (yychar == YYEOF)
+	YYABORT;
+
+#if YYDEBUG != 0
+      if (yydebug)
+	fprintf(stderr, "Discarding token %d (%s).\n", yychar, yytname[yychar1]);
+#endif
+
+      yychar = YYEMPTY;
+    }
+
+  /* Else will try to reuse lookahead token
+     after shifting the error token.  */
+
+  yyerrstatus = 3;		/* Each real token shifted decrements this */
+
+  goto yyerrhandle;
+
+yyerrdefault:  /* current state does not do anything special for the error token. */
+
+#if 0
+  /* This is wrong; only states that explicitly want error tokens
+     should shift them.  */
+  yyn = yydefact[yystate];  /* If its default is to accept any token, ok.  Otherwise pop it.*/
+  if (yyn) goto yydefault;
+#endif
+
+yyerrpop:   /* pop the current state because it cannot handle the error token */
+
+  if (yyssp == yyss) YYABORT;
+  yyvsp--;
+  yystate = *--yyssp;
+#ifdef YYLSP_NEEDED
+  yylsp--;
+#endif
+
+#if YYDEBUG != 0
+  if (yydebug)
+    {
+      short *ssp1 = yyss - 1;
+      fprintf (stderr, "Error: state stack now");
+      while (ssp1 != yyssp)
+	fprintf (stderr, " %d", *++ssp1);
+      fprintf (stderr, "\n");
+    }
+#endif
+
+yyerrhandle:
+
+  yyn = yypact[yystate];
+  if (yyn == YYFLAG)
+    goto yyerrdefault;
+
+  yyn += YYTERROR;
+  if (yyn < 0 || yyn > YYLAST || yycheck[yyn] != YYTERROR)
+    goto yyerrdefault;
+
+  yyn = yytable[yyn];
+  if (yyn < 0)
+    {
+      if (yyn == YYFLAG)
+	goto yyerrpop;
+      yyn = -yyn;
+      goto yyreduce;
+    }
+  else if (yyn == 0)
+    goto yyerrpop;
+
+  if (yyn == YYFINAL)
+    YYACCEPT;
+
+#if YYDEBUG != 0
+  if (yydebug)
+    fprintf(stderr, "Shifting error token, ");
+#endif
+
+  *++yyvsp = yylval;
+#ifdef YYLSP_NEEDED
+  *++yylsp = yylloc;
+#endif
+
+  yystate = yyn;
+  goto yynewstate;
+
+ yyacceptlab:
+  /* YYACCEPT comes here.  */
+  if (yyfree_stacks)
+    {
+      free (yyss);
+      free (yyvs);
+#ifdef YYLSP_NEEDED
+      free (yyls);
+#endif
+    }
+  return 0;
+
+ yyabortlab:
+  /* YYABORT comes here.  */
+  if (yyfree_stacks)
+    {
+      free (yyss);
+      free (yyvs);
+#ifdef YYLSP_NEEDED
+      free (yyls);
+#endif
+    }
+  return 1;
+}
+#line 232 "plural.y"
+
+
+void
+internal_function
+FREE_EXPRESSION (exp)
+     struct expression *exp;
+{
+  if (exp == NULL)
+    return;
+
+  /* Handle the recursive case.  */
+  switch (exp->nargs)
+    {
+    case 3:
+      FREE_EXPRESSION (exp->val.args[2]);
+      /* FALLTHROUGH */
+    case 2:
+      FREE_EXPRESSION (exp->val.args[1]);
+      /* FALLTHROUGH */
+    case 1:
+      FREE_EXPRESSION (exp->val.args[0]);
+      /* FALLTHROUGH */
+    default:
+      break;
+    }
+
+  free (exp);
+}
+
+
+static int
+yylex (lval, pexp)
+     YYSTYPE *lval;
+     const char **pexp;
+{
+  const char *exp = *pexp;
+  int result;
+
+  while (1)
+    {
+      if (exp[0] == '\0')
+	{
+	  *pexp = exp;
+	  return YYEOF;
+	}
+
+      if (exp[0] != ' ' && exp[0] != '\t')
+	break;
+
+      ++exp;
+    }
+
+  result = *exp++;
+  switch (result)
+    {
+    case '0': case '1': case '2': case '3': case '4':
+    case '5': case '6': case '7': case '8': case '9':
+      {
+	unsigned long int n = result - '0';
+	while (exp[0] >= '0' && exp[0] <= '9')
+	  {
+	    n *= 10;
+	    n += exp[0] - '0';
+	    ++exp;
+	  }
+	lval->num = n;
+	result = NUMBER;
+      }
+      break;
+
+    case '=':
+      if (exp[0] == '=')
+	{
+	  ++exp;
+	  lval->op = equal;
+	  result = EQUOP2;
+	}
+      else
+	result = YYERRCODE;
+      break;
+
+    case '!':
+      if (exp[0] == '=')
+	{
+	  ++exp;
+	  lval->op = not_equal;
+	  result = EQUOP2;
+	}
+      break;
+
+    case '&':
+    case '|':
+      if (exp[0] == result)
+	++exp;
+      else
+	result = YYERRCODE;
+      break;
+
+    case '<':
+      if (exp[0] == '=')
+	{
+	  ++exp;
+	  lval->op = less_or_equal;
+	}
+      else
+	lval->op = less_than;
+      result = CMPOP2;
+      break;
+
+    case '>':
+      if (exp[0] == '=')
+	{
+	  ++exp;
+	  lval->op = greater_or_equal;
+	}
+      else
+	lval->op = greater_than;
+      result = CMPOP2;
+      break;
+
+    case '*':
+      lval->op = mult;
+      result = MULOP2;
+      break;
+
+    case '/':
+      lval->op = divide;
+      result = MULOP2;
+      break;
+
+    case '%':
+      lval->op = module;
+      result = MULOP2;
+      break;
+
+    case '+':
+      lval->op = plus;
+      result = ADDOP2;
+      break;
+
+    case '-':
+      lval->op = minus;
+      result = ADDOP2;
+      break;
+
+    case 'n':
+    case '?':
+    case ':':
+    case '(':
+    case ')':
+      /* Nothing, just return the character.  */
+      break;
+
+    case ';':
+    case '\n':
+    case '\0':
+      /* Be safe and let the user call this function again.  */
+      --exp;
+      result = YYEOF;
+      break;
+
+    default:
+      result = YYERRCODE;
+#if YYDEBUG != 0
+      --exp;
+#endif
+      break;
+    }
+
+  *pexp = exp;
+
+  return result;
+}
+
+
+static void
+yyerror (str)
+     const char *str;
+{
+  /* Do nothing.  We don't print error messages here.  */
+}
diff --git a/intl/plural.y b/intl/plural.y
new file mode 100644
index 0000000..42ffa0e
--- /dev/null
+++ b/intl/plural.y
@@ -0,0 +1,412 @@
+%{
+/* Expression parsing for plural form selection.
+   Copyright (C) 2000, 2001 Free Software Foundation, Inc.
+   Written by Ulrich Drepper <drepper@cygnus.com>, 2000.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 2, or (at your option)
+   any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software Foundation,
+   Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
+
+/* The bison generated parser uses alloca.  AIX 3 forces us to put this
+   declaration at the beginning of the file.  The declaration in bison's
+   skeleton file comes too late.  This must come before <config.h>
+   because <config.h> may include arbitrary system headers.  */
+#if defined _AIX && !defined __GNUC__
+ #pragma alloca
+#endif
+
+#ifdef HAVE_CONFIG_H
+# include <config.h>
+#endif
+
+#include <stdlib.h>
+#include "gettextP.h"
+
+/* Names for the libintl functions are a problem.  They must not clash
+   with existing names and they should follow ANSI C.  But this source
+   code is also used in GNU C Library where the names have a __
+   prefix.  So we have to make a difference here.  */
+#ifdef _LIBC
+# define FREE_EXPRESSION __gettext_free_exp
+#else
+# define FREE_EXPRESSION gettext_free_exp__
+# define __gettextparse gettextparse__
+#endif
+
+#define YYLEX_PARAM	&((struct parse_args *) arg)->cp
+#define YYPARSE_PARAM	arg
+%}
+%pure_parser
+%expect 10
+
+%union {
+  unsigned long int num;
+  enum operator op;
+  struct expression *exp;
+}
+
+%{
+/* Prototypes for local functions.  */
+static struct expression *new_exp PARAMS ((int nargs, enum operator op,
+					   struct expression * const *args));
+static inline struct expression *new_exp_0 PARAMS ((enum operator op));
+static inline struct expression *new_exp_1 PARAMS ((enum operator op,
+						   struct expression *right));
+static struct expression *new_exp_2 PARAMS ((enum operator op,
+					     struct expression *left,
+					     struct expression *right));
+static inline struct expression *new_exp_3 PARAMS ((enum operator op,
+						   struct expression *bexp,
+						   struct expression *tbranch,
+						   struct expression *fbranch));
+static int yylex PARAMS ((YYSTYPE *lval, const char **pexp));
+static void yyerror PARAMS ((const char *str));
+
+/* Allocation of expressions.  */
+
+static struct expression *
+new_exp (nargs, op, args)
+     int nargs;
+     enum operator op;
+     struct expression * const *args;
+{
+  int i;
+  struct expression *newp;
+
+  /* If any of the argument could not be malloc'ed, just return NULL.  */
+  for (i = nargs - 1; i >= 0; i--)
+    if (args[i] == NULL)
+      goto fail;
+
+  /* Allocate a new expression.  */
+  newp = (struct expression *) malloc (sizeof (*newp));
+  if (newp != NULL)
+    {
+      newp->nargs = nargs;
+      newp->operation = op;
+      for (i = nargs - 1; i >= 0; i--)
+	newp->val.args[i] = args[i];
+      return newp;
+    }
+
+ fail:
+  for (i = nargs - 1; i >= 0; i--)
+    FREE_EXPRESSION (args[i]);
+
+  return NULL;
+}
+
+static inline struct expression *
+new_exp_0 (op)
+     enum operator op;
+{
+  return new_exp (0, op, NULL);
+}
+
+static inline struct expression *
+new_exp_1 (op, right)
+     enum operator op;
+     struct expression *right;
+{
+  struct expression *args[1];
+
+  args[0] = right;
+  return new_exp (1, op, args);
+}
+
+static struct expression *
+new_exp_2 (op, left, right)
+     enum operator op;
+     struct expression *left;
+     struct expression *right;
+{
+  struct expression *args[2];
+
+  args[0] = left;
+  args[1] = right;
+  return new_exp (2, op, args);
+}
+
+static inline struct expression *
+new_exp_3 (op, bexp, tbranch, fbranch)
+     enum operator op;
+     struct expression *bexp;
+     struct expression *tbranch;
+     struct expression *fbranch;
+{
+  struct expression *args[3];
+
+  args[0] = bexp;
+  args[1] = tbranch;
+  args[2] = fbranch;
+  return new_exp (3, op, args);
+}
+
+%}
+
+/* This declares that all operators have the same associativity and the
+   precedence order as in C.  See [Harbison, Steele: C, A Reference Manual].
+   There is no unary minus and no bitwise operators.
+   Operators with the same syntactic behaviour have been merged into a single
+   token, to save space in the array generated by bison.  */
+%right '?'		/*   ?		*/
+%left '|'		/*   ||		*/
+%left '&'		/*   &&		*/
+%left EQUOP2		/*   == !=	*/
+%left CMPOP2		/*   < > <= >=	*/
+%left ADDOP2		/*   + -	*/
+%left MULOP2		/*   * / %	*/
+%right '!'		/*   !		*/
+
+%token <op> EQUOP2 CMPOP2 ADDOP2 MULOP2
+%token <num> NUMBER
+%type <exp> exp
+
+%%
+
+start:	  exp
+	  {
+	    if ($1 == NULL)
+	      YYABORT;
+	    ((struct parse_args *) arg)->res = $1;
+	  }
+	;
+
+exp:	  exp '?' exp ':' exp
+	  {
+	    $$ = new_exp_3 (qmop, $1, $3, $5);
+	  }
+	| exp '|' exp
+	  {
+	    $$ = new_exp_2 (lor, $1, $3);
+	  }
+	| exp '&' exp
+	  {
+	    $$ = new_exp_2 (land, $1, $3);
+	  }
+	| exp EQUOP2 exp
+	  {
+	    $$ = new_exp_2 ($2, $1, $3);
+	  }
+	| exp CMPOP2 exp
+	  {
+	    $$ = new_exp_2 ($2, $1, $3);
+	  }
+	| exp ADDOP2 exp
+	  {
+	    $$ = new_exp_2 ($2, $1, $3);
+	  }
+	| exp MULOP2 exp
+	  {
+	    $$ = new_exp_2 ($2, $1, $3);
+	  }
+	| '!' exp
+	  {
+	    $$ = new_exp_1 (lnot, $2);
+	  }
+	| 'n'
+	  {
+	    $$ = new_exp_0 (var);
+	  }
+	| NUMBER
+	  {
+	    if (($$ = new_exp_0 (num)) != NULL)
+	      $$->val.num = $1;
+	  }
+	| '(' exp ')'
+	  {
+	    $$ = $2;
+	  }
+	;
+
+%%
+
+void
+internal_function
+FREE_EXPRESSION (exp)
+     struct expression *exp;
+{
+  if (exp == NULL)
+    return;
+
+  /* Handle the recursive case.  */
+  switch (exp->nargs)
+    {
+    case 3:
+      FREE_EXPRESSION (exp->val.args[2]);
+      /* FALLTHROUGH */
+    case 2:
+      FREE_EXPRESSION (exp->val.args[1]);
+      /* FALLTHROUGH */
+    case 1:
+      FREE_EXPRESSION (exp->val.args[0]);
+      /* FALLTHROUGH */
+    default:
+      break;
+    }
+
+  free (exp);
+}
+
+
+static int
+yylex (lval, pexp)
+     YYSTYPE *lval;
+     const char **pexp;
+{
+  const char *exp = *pexp;
+  int result;
+
+  while (1)
+    {
+      if (exp[0] == '\0')
+	{
+	  *pexp = exp;
+	  return YYEOF;
+	}
+
+      if (exp[0] != ' ' && exp[0] != '\t')
+	break;
+
+      ++exp;
+    }
+
+  result = *exp++;
+  switch (result)
+    {
+    case '0': case '1': case '2': case '3': case '4':
+    case '5': case '6': case '7': case '8': case '9':
+      {
+	unsigned long int n = result - '0';
+	while (exp[0] >= '0' && exp[0] <= '9')
+	  {
+	    n *= 10;
+	    n += exp[0] - '0';
+	    ++exp;
+	  }
+	lval->num = n;
+	result = NUMBER;
+      }
+      break;
+
+    case '=':
+      if (exp[0] == '=')
+	{
+	  ++exp;
+	  lval->op = equal;
+	  result = EQUOP2;
+	}
+      else
+	result = YYERRCODE;
+      break;
+
+    case '!':
+      if (exp[0] == '=')
+	{
+	  ++exp;
+	  lval->op = not_equal;
+	  result = EQUOP2;
+	}
+      break;
+
+    case '&':
+    case '|':
+      if (exp[0] == result)
+	++exp;
+      else
+	result = YYERRCODE;
+      break;
+
+    case '<':
+      if (exp[0] == '=')
+	{
+	  ++exp;
+	  lval->op = less_or_equal;
+	}
+      else
+	lval->op = less_than;
+      result = CMPOP2;
+      break;
+
+    case '>':
+      if (exp[0] == '=')
+	{
+	  ++exp;
+	  lval->op = greater_or_equal;
+	}
+      else
+	lval->op = greater_than;
+      result = CMPOP2;
+      break;
+
+    case '*':
+      lval->op = mult;
+      result = MULOP2;
+      break;
+
+    case '/':
+      lval->op = divide;
+      result = MULOP2;
+      break;
+
+    case '%':
+      lval->op = module;
+      result = MULOP2;
+      break;
+
+    case '+':
+      lval->op = plus;
+      result = ADDOP2;
+      break;
+
+    case '-':
+      lval->op = minus;
+      result = ADDOP2;
+      break;
+
+    case 'n':
+    case '?':
+    case ':':
+    case '(':
+    case ')':
+      /* Nothing, just return the character.  */
+      break;
+
+    case ';':
+    case '\n':
+    case '\0':
+      /* Be safe and let the user call this function again.  */
+      --exp;
+      result = YYEOF;
+      break;
+
+    default:
+      result = YYERRCODE;
+#if YYDEBUG != 0
+      --exp;
+#endif
+      break;
+    }
+
+  *pexp = exp;
+
+  return result;
+}
+
+
+static void
+yyerror (str)
+     const char *str;
+{
+  /* Do nothing.  We don't print error messages here.  */
+}
diff --git a/intl/ref-add.sin b/intl/ref-add.sin
new file mode 100644
index 0000000..167374e
--- /dev/null
+++ b/intl/ref-add.sin
@@ -0,0 +1,31 @@
+# Add this package to a list of references stored in a text file.
+#
+#   Copyright (C) 2000 Free Software Foundation, Inc.
+#
+#   This program is free software; you can redistribute it and/or modify it
+#   under the terms of the GNU Library General Public License as published
+#   by the Free Software Foundation; either version 2, or (at your option)
+#   any later version.
+#
+#   This program is distributed in the hope that it will be useful,
+#   but WITHOUT ANY WARRANTY; without even the implied warranty of
+#   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+#   Library General Public License for more details.
+#
+#   You should have received a copy of the GNU Library General Public
+#   License along with this program; if not, write to the Free Software
+#   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
+#   USA.
+#
+# Written by Bruno Haible <haible@clisp.cons.org>.
+#
+/^# Packages using this file: / {
+  s/# Packages using this file://
+  ta
+  :a
+  s/ @PACKAGE@ / @PACKAGE@ /
+  tb
+  s/ $/ @PACKAGE@ /
+  :b
+  s/^/# Packages using this file:/
+}
diff --git a/intl/ref-del.sin b/intl/ref-del.sin
new file mode 100644
index 0000000..613cf37
--- /dev/null
+++ b/intl/ref-del.sin
@@ -0,0 +1,26 @@
+# Remove this package from a list of references stored in a text file.
+#
+#   Copyright (C) 2000 Free Software Foundation, Inc.
+#
+#   This program is free software; you can redistribute it and/or modify it
+#   under the terms of the GNU Library General Public License as published
+#   by the Free Software Foundation; either version 2, or (at your option)
+#   any later version.
+#
+#   This program is distributed in the hope that it will be useful,
+#   but WITHOUT ANY WARRANTY; without even the implied warranty of
+#   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+#   Library General Public License for more details.
+#
+#   You should have received a copy of the GNU Library General Public
+#   License along with this program; if not, write to the Free Software
+#   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
+#   USA.
+#
+# Written by Bruno Haible <haible@clisp.cons.org>.
+#
+/^# Packages using this file: / {
+  s/# Packages using this file://
+  s/ @PACKAGE@ / /
+  s/^/# Packages using this file:/
+}
-- 
Gitee


From 95cbf34136622168bab88fa0dedb0e4d312d1869 Mon Sep 17 00:00:00 2001
From: Jeff Johnson <n3npq@mac.com>
Date: Tue, 25 Sep 2001 03:03:51 +0000
Subject: [PATCH 320/667] - Start rpm-4.1. - Loosely wire beecrypt library into
 rpm.

---
 configure.in | 2 +-
 popt.spec    | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/configure.in b/configure.in
index cce8afd..bb7fbfd 100755
--- a/configure.in
+++ b/configure.in
@@ -2,7 +2,7 @@ AC_INIT(popt.h)
 AM_CONFIG_HEADER(config.h)
 AC_PREREQ(2.12)
 AC_CANONICAL_SYSTEM
-AM_INIT_AUTOMAKE(popt, 1.6.3)
+AM_INIT_AUTOMAKE(popt, 1.7)
 ALL_LINGUAS="cs da de es eu_ES fi fr gl hu id is it ja ko no pl pt pt_BR ro ru sk sl sr sv tr uk wa zh zh_CN.GB2312"
 
 AC_ISC_POSIX
diff --git a/popt.spec b/popt.spec
index 6816d5c..93dd393 100644
--- a/popt.spec
+++ b/popt.spec
@@ -4,7 +4,7 @@
 #
 Summary: A C library for parsing command line parameters.
 Name: popt
-Version: 1.6.3
+Version: 1.7
 Release: 0.1
 Copyright: X Consortium
 Group: System Environment/Libraries
-- 
Gitee


From 07cc1866f55f23aaaea865d1850e3017db5ad768 Mon Sep 17 00:00:00 2001
From: Jeff Johnson <n3npq@mac.com>
Date: Sat, 13 Oct 2001 19:36:29 +0000
Subject: [PATCH 321/667] - ratchet up to lclint "strict" level.

---
 po/cs.po           |  6 +++---
 po/da.po           |  6 +++---
 po/de.po           |  6 +++---
 po/es.po           |  6 +++---
 po/eu_ES.po        |  6 +++---
 po/fi.po           |  6 +++---
 po/fr.po           |  6 +++---
 po/gl.po           |  6 +++---
 po/hu.po           |  6 +++---
 po/id.po           |  6 +++---
 po/is.po           |  6 +++---
 po/it.po           |  6 +++---
 po/ja.po           |  6 +++---
 po/ko.po           |  6 +++---
 po/no.po           |  6 +++---
 po/pl.po           |  6 +++---
 po/popt.pot        |  6 +++---
 po/pt.po           |  6 +++---
 po/pt_BR.po        |  6 +++---
 po/ro.po           |  6 +++---
 po/ru.po           |  6 +++---
 po/sk.po           |  6 +++---
 po/sl.po           |  6 +++---
 po/sr.po           |  6 +++---
 po/sv.po           |  6 +++---
 po/tr.po           |  6 +++---
 po/uk.po           |  6 +++---
 po/wa.po           |  6 +++---
 po/zh.po           |  6 +++---
 po/zh_CN.GB2312.po |  6 +++---
 popthelp.c         | 15 +++++++++++----
 31 files changed, 101 insertions(+), 94 deletions(-)

diff --git a/po/cs.po b/po/cs.po
index 64a7527..68c30f5 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.3\n"
-"POT-Creation-Date: 2001-09-21 10:20-0400\n"
+"POT-Creation-Date: 2001-10-13 13:15-0400\n"
 "PO-Revision-Date: 2001-07-24 00:03+0100\n"
 "Last-Translator: Milan Kerslager <kerslage@linux.cz>\n"
 "Language-Team: Czech <cs@li.org>\n"
@@ -102,10 +102,10 @@ msgstr "DOUBLE"
 msgid "ARG"
 msgstr "ARG"
 
-#: popthelp.c:438
+#: popthelp.c:445
 msgid "Usage:"
 msgstr "Pou�it�:"
 
-#: popthelp.c:460
+#: popthelp.c:467
 msgid "[OPTION...]"
 msgstr "[VOLBY...]"
diff --git a/po/da.po b/po/da.po
index 456e961..8470262 100644
--- a/po/da.po
+++ b/po/da.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.3\n"
-"POT-Creation-Date: 2001-09-21 10:20-0400\n"
+"POT-Creation-Date: 2001-10-13 13:15-0400\n"
 "PO-Revision-Date: Sun Jan 21 2001 04:30:32+0200\n"
 "Last-Translator: Martin Hansen <mah@k64.dk>\n"
 "Language-Team: Dansk <dansk@klid.dk>\n"
@@ -104,10 +104,10 @@ msgstr "DOUBLE"
 msgid "ARG"
 msgstr "ARG"
 
-#: popthelp.c:438
+#: popthelp.c:445
 msgid "Usage:"
 msgstr "Brug:"
 
-#: popthelp.c:460
+#: popthelp.c:467
 msgid "[OPTION...]"
 msgstr "[TILVALG...]"
diff --git a/po/de.po b/po/de.po
index f055056..1d0703e 100644
--- a/po/de.po
+++ b/po/de.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.3\n"
-"POT-Creation-Date: 2001-09-21 10:20-0400\n"
+"POT-Creation-Date: 2001-10-13 13:15-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -107,10 +107,10 @@ msgstr ""
 msgid "ARG"
 msgstr ""
 
-#: popthelp.c:438
+#: popthelp.c:445
 msgid "Usage:"
 msgstr ""
 
-#: popthelp.c:460
+#: popthelp.c:467
 msgid "[OPTION...]"
 msgstr ""
diff --git a/po/es.po b/po/es.po
index b09e8e7..81bc84a 100644
--- a/po/es.po
+++ b/po/es.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.3\n"
-"POT-Creation-Date: 2001-09-21 10:20-0400\n"
+"POT-Creation-Date: 2001-10-13 13:15-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Leandro Lucarella <luca@linuxmendoza.org.ar>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -108,10 +108,10 @@ msgstr "DOUBLE"
 msgid "ARG"
 msgstr "ARG"
 
-#: popthelp.c:438
+#: popthelp.c:445
 msgid "Usage:"
 msgstr "Modo de Uso:"
 
-#: popthelp.c:460
+#: popthelp.c:467
 msgid "[OPTION...]"
 msgstr "[OPCI�N...]"
diff --git a/po/eu_ES.po b/po/eu_ES.po
index f055056..1d0703e 100644
--- a/po/eu_ES.po
+++ b/po/eu_ES.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.3\n"
-"POT-Creation-Date: 2001-09-21 10:20-0400\n"
+"POT-Creation-Date: 2001-10-13 13:15-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -107,10 +107,10 @@ msgstr ""
 msgid "ARG"
 msgstr ""
 
-#: popthelp.c:438
+#: popthelp.c:445
 msgid "Usage:"
 msgstr ""
 
-#: popthelp.c:460
+#: popthelp.c:467
 msgid "[OPTION...]"
 msgstr ""
diff --git a/po/fi.po b/po/fi.po
index f055056..1d0703e 100644
--- a/po/fi.po
+++ b/po/fi.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.3\n"
-"POT-Creation-Date: 2001-09-21 10:20-0400\n"
+"POT-Creation-Date: 2001-10-13 13:15-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -107,10 +107,10 @@ msgstr ""
 msgid "ARG"
 msgstr ""
 
-#: popthelp.c:438
+#: popthelp.c:445
 msgid "Usage:"
 msgstr ""
 
-#: popthelp.c:460
+#: popthelp.c:467
 msgid "[OPTION...]"
 msgstr ""
diff --git a/po/fr.po b/po/fr.po
index f055056..1d0703e 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.3\n"
-"POT-Creation-Date: 2001-09-21 10:20-0400\n"
+"POT-Creation-Date: 2001-10-13 13:15-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -107,10 +107,10 @@ msgstr ""
 msgid "ARG"
 msgstr ""
 
-#: popthelp.c:438
+#: popthelp.c:445
 msgid "Usage:"
 msgstr ""
 
-#: popthelp.c:460
+#: popthelp.c:467
 msgid "[OPTION...]"
 msgstr ""
diff --git a/po/gl.po b/po/gl.po
index f83e87a..4ce16e8 100644
--- a/po/gl.po
+++ b/po/gl.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.3\n"
-"POT-Creation-Date: 2001-09-21 10:20-0400\n"
+"POT-Creation-Date: 2001-10-13 13:15-0400\n"
 "PO-Revision-Date: 2001-01-17 01:01+0100\n"
 "Last-Translator: Jes�s Bravo �lvarez <jba@pobox.com>\n"
 "Language-Team: Galician <trasno@ceu.fi.udc.es>\n"
@@ -103,10 +103,10 @@ msgstr "DOUBLE"
 msgid "ARG"
 msgstr "ARG"
 
-#: popthelp.c:438
+#: popthelp.c:445
 msgid "Usage:"
 msgstr "Uso:"
 
-#: popthelp.c:460
+#: popthelp.c:467
 msgid "[OPTION...]"
 msgstr "[OPCI�N...]"
diff --git a/po/hu.po b/po/hu.po
index d35da39..6512fd8 100644
--- a/po/hu.po
+++ b/po/hu.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.3\n"
-"POT-Creation-Date: 2001-09-21 10:20-0400\n"
+"POT-Creation-Date: 2001-10-13 13:15-0400\n"
 "PO-Revision-Date: 2000-08-03 23:26+0200\n"
 "Last-Translator: L�szl� N�meth <nemeth@qwertynet.hu>\n"
 "Language-Team: Hungarian\n"
@@ -103,10 +103,10 @@ msgstr ""
 msgid "ARG"
 msgstr ""
 
-#: popthelp.c:438
+#: popthelp.c:445
 msgid "Usage:"
 msgstr ""
 
-#: popthelp.c:460
+#: popthelp.c:467
 msgid "[OPTION...]"
 msgstr ""
diff --git a/po/id.po b/po/id.po
index f055056..1d0703e 100644
--- a/po/id.po
+++ b/po/id.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.3\n"
-"POT-Creation-Date: 2001-09-21 10:20-0400\n"
+"POT-Creation-Date: 2001-10-13 13:15-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -107,10 +107,10 @@ msgstr ""
 msgid "ARG"
 msgstr ""
 
-#: popthelp.c:438
+#: popthelp.c:445
 msgid "Usage:"
 msgstr ""
 
-#: popthelp.c:460
+#: popthelp.c:467
 msgid "[OPTION...]"
 msgstr ""
diff --git a/po/is.po b/po/is.po
index 32d4a9b..4f1d046 100644
--- a/po/is.po
+++ b/po/is.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.3\n"
-"POT-Creation-Date: 2001-09-21 10:20-0400\n"
+"POT-Creation-Date: 2001-10-13 13:15-0400\n"
 "PO-Revision-Date: 2001-06-08 01:35+0000\n"
 "Last-Translator: Richard Allen <ra@hp.is>\n"
 "Language-Team: is <kde-isl@mmedia.is>\n"
@@ -102,10 +102,10 @@ msgstr "DOUBLE"
 msgid "ARG"
 msgstr "ARG"
 
-#: popthelp.c:438
+#: popthelp.c:445
 msgid "Usage:"
 msgstr "Notkun:"
 
-#: popthelp.c:460
+#: popthelp.c:467
 msgid "[OPTION...]"
 msgstr "[ROFI...]"
diff --git a/po/it.po b/po/it.po
index f055056..1d0703e 100644
--- a/po/it.po
+++ b/po/it.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.3\n"
-"POT-Creation-Date: 2001-09-21 10:20-0400\n"
+"POT-Creation-Date: 2001-10-13 13:15-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -107,10 +107,10 @@ msgstr ""
 msgid "ARG"
 msgstr ""
 
-#: popthelp.c:438
+#: popthelp.c:445
 msgid "Usage:"
 msgstr ""
 
-#: popthelp.c:460
+#: popthelp.c:467
 msgid "[OPTION...]"
 msgstr ""
diff --git a/po/ja.po b/po/ja.po
index f055056..1d0703e 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.3\n"
-"POT-Creation-Date: 2001-09-21 10:20-0400\n"
+"POT-Creation-Date: 2001-10-13 13:15-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -107,10 +107,10 @@ msgstr ""
 msgid "ARG"
 msgstr ""
 
-#: popthelp.c:438
+#: popthelp.c:445
 msgid "Usage:"
 msgstr ""
 
-#: popthelp.c:460
+#: popthelp.c:467
 msgid "[OPTION...]"
 msgstr ""
diff --git a/po/ko.po b/po/ko.po
index e5a8ce1..ed3a5be 100644
--- a/po/ko.po
+++ b/po/ko.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6\n"
-"POT-Creation-Date: 2001-09-21 10:20-0400\n"
+"POT-Creation-Date: 2001-10-13 13:15-0400\n"
 "PO-Revision-Date: 2001-09-06 20:06+0900\n"
 "Last-Translator: Jong-Hoon Ryu <redhat4u@netian.com>\n"
 "Language-Team: GNU Translation project <ko@li.org>\n"
@@ -102,10 +102,10 @@ msgstr "
 msgid "ARG"
 msgstr "�μ�(ARG)"
 
-#: popthelp.c:438
+#: popthelp.c:445
 msgid "Usage:"
 msgstr "����:"
 
-#: popthelp.c:460
+#: popthelp.c:467
 msgid "[OPTION...]"
 msgstr "[�ɼ�...]"
diff --git a/po/no.po b/po/no.po
index c49d75f..97b0e75 100644
--- a/po/no.po
+++ b/po/no.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.3\n"
-"POT-Creation-Date: 2001-09-21 10:20-0400\n"
+"POT-Creation-Date: 2001-10-13 13:15-0400\n"
 "PO-Revision-Date: 2001-06-27 11:05+0200\n"
 "Last-Translator: Kjartan Maraas <kmaraas@online.no>\n"
 "Language-Team: Norwegian <no@li.org>\n"
@@ -102,10 +102,10 @@ msgstr "DOUBLE"
 msgid "ARG"
 msgstr "ARG"
 
-#: popthelp.c:438
+#: popthelp.c:445
 msgid "Usage:"
 msgstr "Bruk:"
 
-#: popthelp.c:460
+#: popthelp.c:467
 msgid "[OPTION...]"
 msgstr "[FLAGG...]"
diff --git a/po/pl.po b/po/pl.po
index f055056..1d0703e 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.3\n"
-"POT-Creation-Date: 2001-09-21 10:20-0400\n"
+"POT-Creation-Date: 2001-10-13 13:15-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -107,10 +107,10 @@ msgstr ""
 msgid "ARG"
 msgstr ""
 
-#: popthelp.c:438
+#: popthelp.c:445
 msgid "Usage:"
 msgstr ""
 
-#: popthelp.c:460
+#: popthelp.c:467
 msgid "[OPTION...]"
 msgstr ""
diff --git a/po/popt.pot b/po/popt.pot
index af2afa6..75e5f3c 100644
--- a/po/popt.pot
+++ b/po/popt.pot
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2001-09-21 10:20-0400\n"
+"POT-Creation-Date: 2001-10-13 13:15-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -107,10 +107,10 @@ msgstr ""
 msgid "ARG"
 msgstr ""
 
-#: popthelp.c:438
+#: popthelp.c:445
 msgid "Usage:"
 msgstr ""
 
-#: popthelp.c:460
+#: popthelp.c:467
 msgid "[OPTION...]"
 msgstr ""
diff --git a/po/pt.po b/po/pt.po
index cb06e3b..2ead6de 100644
--- a/po/pt.po
+++ b/po/pt.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.3\n"
-"POT-Creation-Date: 2001-09-21 10:20-0400\n"
+"POT-Creation-Date: 2001-10-13 13:15-0400\n"
 "PO-Revision-Date: 2001-01-21 19:31+00:00\n"
 "Last-Translator: Pedro Morais <morais@kde.org>\n"
 "Language-Team: pt <morais@kde.org>\n"
@@ -103,10 +103,10 @@ msgstr "DOUBLE"
 msgid "ARG"
 msgstr "ARG"
 
-#: popthelp.c:438
+#: popthelp.c:445
 msgid "Usage:"
 msgstr "Utiliza��o:"
 
-#: popthelp.c:460
+#: popthelp.c:467
 msgid "[OPTION...]"
 msgstr "[OP��O...]"
diff --git a/po/pt_BR.po b/po/pt_BR.po
index f055056..1d0703e 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.3\n"
-"POT-Creation-Date: 2001-09-21 10:20-0400\n"
+"POT-Creation-Date: 2001-10-13 13:15-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -107,10 +107,10 @@ msgstr ""
 msgid "ARG"
 msgstr ""
 
-#: popthelp.c:438
+#: popthelp.c:445
 msgid "Usage:"
 msgstr ""
 
-#: popthelp.c:460
+#: popthelp.c:467
 msgid "[OPTION...]"
 msgstr ""
diff --git a/po/ro.po b/po/ro.po
index dfbd264..81768d2 100644
--- a/po/ro.po
+++ b/po/ro.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.3\n"
-"POT-Creation-Date: 2001-09-21 10:20-0400\n"
+"POT-Creation-Date: 2001-10-13 13:15-0400\n"
 "PO-Revision-Date: 2000-06-14 23:23+EST\n"
 "Last-Translator: Cristian Gafton <gafton@redhat.com>\n"
 "Language-Team: Romanian <ro@li.org>\n"
@@ -104,10 +104,10 @@ msgstr ""
 msgid "ARG"
 msgstr ""
 
-#: popthelp.c:438
+#: popthelp.c:445
 msgid "Usage:"
 msgstr "Sintaxa:"
 
-#: popthelp.c:460
+#: popthelp.c:467
 msgid "[OPTION...]"
 msgstr "[OPTIUNE...]"
diff --git a/po/ru.po b/po/ru.po
index 0ead579..3cd15fb 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.3\n"
-"POT-Creation-Date: 2001-09-21 10:20-0400\n"
+"POT-Creation-Date: 2001-10-13 13:15-0400\n"
 "PO-Revision-Date: 2001-07-05 21:00-0500\n"
 "Last-Translator: Eugene Kanter <eugene@blackcatlinux.com>\n"
 "Language-Team: Black Cat Linux Team <blackcat-support@blackcatlinux.com>\n"
@@ -102,10 +102,10 @@ msgstr "DOUBLE"
 msgid "ARG"
 msgstr "ARG"
 
-#: popthelp.c:438
+#: popthelp.c:445
 msgid "Usage:"
 msgstr "�������������:"
 
-#: popthelp.c:460
+#: popthelp.c:467
 msgid "[OPTION...]"
 msgstr "[��������...]"
diff --git a/po/sk.po b/po/sk.po
index 3d80198..6234823 100644
--- a/po/sk.po
+++ b/po/sk.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.3\n"
-"POT-Creation-Date: 2001-09-21 10:20-0400\n"
+"POT-Creation-Date: 2001-10-13 13:15-0400\n"
 "PO-Revision-Date: 1999-08-04 21:40+0200\n"
 "Last-Translator: Stanislav Meduna <stano@eunet.sk>\n"
 "Language-Team: Slovak <sk-i18n@rak.isternet.sk>\n"
@@ -107,10 +107,10 @@ msgstr ""
 msgid "ARG"
 msgstr ""
 
-#: popthelp.c:438
+#: popthelp.c:445
 msgid "Usage:"
 msgstr ""
 
-#: popthelp.c:460
+#: popthelp.c:467
 msgid "[OPTION...]"
 msgstr ""
diff --git a/po/sl.po b/po/sl.po
index f276e47..9e369bd 100644
--- a/po/sl.po
+++ b/po/sl.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.3\n"
-"POT-Creation-Date: 2001-09-21 10:20-0400\n"
+"POT-Creation-Date: 2001-10-13 13:15-0400\n"
 "PO-Revision-Date: 2000-09-05 12:30+0200\n"
 "Last-Translator: Roman Maurer <roman.maurer@hermes.si>\n"
 "Language-Team: Slovenian <sl@li.org>\n"
@@ -103,10 +103,10 @@ msgstr ""
 msgid "ARG"
 msgstr ""
 
-#: popthelp.c:438
+#: popthelp.c:445
 msgid "Usage:"
 msgstr ""
 
-#: popthelp.c:460
+#: popthelp.c:467
 msgid "[OPTION...]"
 msgstr ""
diff --git a/po/sr.po b/po/sr.po
index f055056..1d0703e 100644
--- a/po/sr.po
+++ b/po/sr.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.3\n"
-"POT-Creation-Date: 2001-09-21 10:20-0400\n"
+"POT-Creation-Date: 2001-10-13 13:15-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -107,10 +107,10 @@ msgstr ""
 msgid "ARG"
 msgstr ""
 
-#: popthelp.c:438
+#: popthelp.c:445
 msgid "Usage:"
 msgstr ""
 
-#: popthelp.c:460
+#: popthelp.c:467
 msgid "[OPTION...]"
 msgstr ""
diff --git a/po/sv.po b/po/sv.po
index ecf0c1e..9f4e925 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.3\n"
-"POT-Creation-Date: 2001-09-21 10:20-0400\n"
+"POT-Creation-Date: 2001-10-13 13:15-0400\n"
 "PO-Revision-Date: 2001-07-12 22:26+0100\n"
 "Last-Translator: Christian Rose <menthos@menthos.com>\n"
 "Language-Team: Swedish <sv@li.org>\n"
@@ -102,10 +102,10 @@ msgstr "DUBBEL"
 msgid "ARG"
 msgstr "ARG"
 
-#: popthelp.c:438
+#: popthelp.c:445
 msgid "Usage:"
 msgstr "Anv�ndning:"
 
-#: popthelp.c:460
+#: popthelp.c:467
 msgid "[OPTION...]"
 msgstr "[FLAGGA...]"
diff --git a/po/tr.po b/po/tr.po
index e3501d3..4bdd96a 100644
--- a/po/tr.po
+++ b/po/tr.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.3\n"
-"POT-Creation-Date: 2001-09-21 10:20-0400\n"
+"POT-Creation-Date: 2001-10-13 13:15-0400\n"
 "PO-Revision-Date: 2000-02-11 13:01+0200\n"
 "Last-Translator: Nilgun Belma Buguner <nilgun@technologist.com>\n"
 "Language-Team: Turkish <tr@li.org>\n"
@@ -103,10 +103,10 @@ msgstr "DOUBLE"
 msgid "ARG"
 msgstr "ARG"
 
-#: popthelp.c:438
+#: popthelp.c:445
 msgid "Usage:"
 msgstr "Kullan�m�:"
 
-#: popthelp.c:460
+#: popthelp.c:467
 msgid "[OPTION...]"
 msgstr "[SE�ENEK...]"
diff --git a/po/uk.po b/po/uk.po
index 6f01fc3..5018318 100644
--- a/po/uk.po
+++ b/po/uk.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.3\n"
-"POT-Creation-Date: 2001-09-21 10:20-0400\n"
+"POT-Creation-Date: 2001-10-13 13:15-0400\n"
 "PO-Revision-Date: 1999-09-30 16:54+0200\n"
 "Last-Translator: Yuri Syrota <rasta@renome.rovno.ua>\n"
 "Language-Team: Ukrainian <uk@li.org>\n"
@@ -107,10 +107,10 @@ msgstr ""
 msgid "ARG"
 msgstr ""
 
-#: popthelp.c:438
+#: popthelp.c:445
 msgid "Usage:"
 msgstr ""
 
-#: popthelp.c:460
+#: popthelp.c:467
 msgid "[OPTION...]"
 msgstr ""
diff --git a/po/wa.po b/po/wa.po
index 3979baa..1444d55 100644
--- a/po/wa.po
+++ b/po/wa.po
@@ -9,7 +9,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.3\n"
-"POT-Creation-Date: 2001-09-21 10:20-0400\n"
+"POT-Creation-Date: 2001-10-13 13:15-0400\n"
 "PO-Revision-Date: 1999-03-18 23:11+0100\n"
 "Last-Translator: Nobody yet\n"
 "Language-Team: walon <linux-wa@chanae.alphanet.ch>\n"
@@ -111,10 +111,10 @@ msgstr ""
 msgid "ARG"
 msgstr ""
 
-#: popthelp.c:438
+#: popthelp.c:445
 msgid "Usage:"
 msgstr ""
 
-#: popthelp.c:460
+#: popthelp.c:467
 msgid "[OPTION...]"
 msgstr ""
diff --git a/po/zh.po b/po/zh.po
index f055056..1d0703e 100644
--- a/po/zh.po
+++ b/po/zh.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.3\n"
-"POT-Creation-Date: 2001-09-21 10:20-0400\n"
+"POT-Creation-Date: 2001-10-13 13:15-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -107,10 +107,10 @@ msgstr ""
 msgid "ARG"
 msgstr ""
 
-#: popthelp.c:438
+#: popthelp.c:445
 msgid "Usage:"
 msgstr ""
 
-#: popthelp.c:460
+#: popthelp.c:467
 msgid "[OPTION...]"
 msgstr ""
diff --git a/po/zh_CN.GB2312.po b/po/zh_CN.GB2312.po
index 0134a9a..ccc1b1f 100644
--- a/po/zh_CN.GB2312.po
+++ b/po/zh_CN.GB2312.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.3\n"
-"POT-Creation-Date: 2001-09-21 10:20-0400\n"
+"POT-Creation-Date: 2001-10-13 13:15-0400\n"
 "PO-Revision-Date: 1999-11-11 05:04+0800\n"
 "Last-Translator: Dillion Chen <dillon.chen@turbolinux.com.cn>\n"
 "Language-Team: TLDN\n"
@@ -103,10 +103,10 @@ msgstr ""
 msgid "ARG"
 msgstr ""
 
-#: popthelp.c:438
+#: popthelp.c:445
 msgid "Usage:"
 msgstr ""
 
-#: popthelp.c:460
+#: popthelp.c:467
 msgid "[OPTION...]"
 msgstr ""
diff --git a/popthelp.c b/popthelp.c
index 81ee7b9..1dbe590 100644
--- a/popthelp.c
+++ b/popthelp.c
@@ -247,10 +247,17 @@ static void singleOptionHelp(FILE * fp, int maxLeftCol,
 		    break;
 		*le++ = '[';
 		switch (ops) {
-		case POPT_ARGFLAG_OR:	*le++ = '|';	break;
-		case POPT_ARGFLAG_AND:	*le++ = '&';	break;
-		case POPT_ARGFLAG_XOR:	*le++ = '^';	break;
-		default:				break;
+		case POPT_ARGFLAG_OR:
+		    *le++ = '|';
+		    /*@innerbreak@*/ break;
+		case POPT_ARGFLAG_AND:
+		    *le++ = '&';
+		    /*@innerbreak@*/ break;
+		case POPT_ARGFLAG_XOR:
+		    *le++ = '^';
+		    /*@innerbreak@*/ break;
+		default:
+		    /*@innerbreak@*/ break;
 		}
 		*le++ = '=';
 		if (negate) *le++ = '~';
-- 
Gitee


From 307ca01faaf85d2431be20e3acd1231b4ba4b759 Mon Sep 17 00:00:00 2001
From: Jeff Johnson <n3npq@mac.com>
Date: Sat, 13 Oct 2001 22:01:39 +0000
Subject: [PATCH 322/667] More lclint annotations.

---
 po/popt.pot  | 24 ++++++++++++------------
 popt.c       | 27 ++++++++++++++++-----------
 poptconfig.c |  6 +++---
 poptparse.c  |  4 ++--
 4 files changed, 33 insertions(+), 28 deletions(-)

diff --git a/po/popt.pot b/po/popt.pot
index 75e5f3c..349c304 100644
--- a/po/popt.pot
+++ b/po/popt.pot
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2001-10-13 13:15-0400\n"
+"POT-Creation-Date: 2001-10-13 17:57-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -18,48 +18,48 @@ msgstr ""
 msgid "unknown errno"
 msgstr ""
 
-#: popt.c:892
+#: popt.c:896
 #, c-format
 msgid "option type (%d) not implemented in popt\n"
 msgstr ""
 
-#: popt.c:1100
+#: popt.c:1105
 msgid "missing argument"
 msgstr ""
 
-#: popt.c:1102
+#: popt.c:1107
 msgid "unknown option"
 msgstr ""
 
-#: popt.c:1104
+#: popt.c:1109
 msgid "mutually exclusive logical operations requested"
 msgstr ""
 
-#: popt.c:1106
+#: popt.c:1111
 msgid "opt->arg should not be NULL"
 msgstr ""
 
-#: popt.c:1108
+#: popt.c:1113
 msgid "aliases nested too deeply"
 msgstr ""
 
-#: popt.c:1110
+#: popt.c:1115
 msgid "error in parameter quoting"
 msgstr ""
 
-#: popt.c:1112
+#: popt.c:1117
 msgid "invalid numeric value"
 msgstr ""
 
-#: popt.c:1114
+#: popt.c:1119
 msgid "number too large or too small"
 msgstr ""
 
-#: popt.c:1116
+#: popt.c:1121
 msgid "memory allocation failed"
 msgstr ""
 
-#: popt.c:1120
+#: popt.c:1125
 msgid "unknown error"
 msgstr ""
 
diff --git a/popt.c b/popt.c
index c4fa4ee..e90b08f 100644
--- a/popt.c
+++ b/popt.c
@@ -505,9 +505,12 @@ static const char * findNextArg(/*@special@*/ poptContext con,
 	if (os->next == os->argc && os == con->optionStack) break;
 	if (os->argv != NULL)
 	for (i = os->next; i < os->argc; i++) {
-	    if (os->argb && PBM_ISSET(i, os->argb)) continue;
-	    if (*os->argv[i] == '-') continue;
-	    if (--argx > 0) continue;
+	    if (os->argb && PBM_ISSET(i, os->argb))
+		/*@innercontinue@*/ continue;
+	    if (*os->argv[i] == '-')
+		/*@innercontinue@*/ continue;
+	    if (--argx > 0)
+		/*@innercontinue@*/ continue;
 	    arg = os->argv[i];
 	    if (delete_arg) {
 		if (os->argb == NULL) os->argb = PBM_ALLOC(os->argc);
@@ -540,14 +543,15 @@ expandNextArg(/*@special@*/ poptContext con, const char * s)
 #if 0	/* XXX can't do this */
 	case '\\':	/* escape */
 	    c = *s++;
-	    break;
+	    /*@switchbreak@*/ break;
 #endif
 	case '!':
 	    if (!(s[0] == '#' && s[1] == ':' && s[2] == '+'))
-		break;
+		/*@switchbreak@*/ break;
 	    /* XXX Make sure that findNextArg deletes only next arg. */
 	    if (a == NULL) {
-		if ((a = findNextArg(con, 1, 1)) == NULL) break;
+		if ((a = findNextArg(con, 1, 1)) == NULL)
+		    /*@switchbreak@*/ break;
 	    }
 	    s += 3;
 
@@ -558,9 +562,9 @@ expandNextArg(/*@special@*/ poptContext con, const char * s)
 	    te = t + strlen(t);
 	    strncpy(te, a, alen); te += alen;
 	    continue;
-	    /*@notreached@*/ break;
+	    /*@notreached@*/ /*@switchbreak@*/ break;
 	default:
-	    break;
+	    /*@switchbreak@*/ break;
 	}
 	*te++ = c;
     }
@@ -834,7 +838,7 @@ int poptGetNextOpt(poptContext con)
 		    /* XXX memory leak, hard to plug */
 		    *((const char **) opt->arg) = (con->os->nextArg)
 			? xstrdup(con->os->nextArg) : NULL;
-		    break;
+		    /*@switchbreak@*/ break;
 
 		case POPT_ARG_INT:
 		case POPT_ARG_LONG:
@@ -858,7 +862,7 @@ int poptGetNextOpt(poptContext con)
 			if (poptSaveInt(opt, aLong))
 			    return POPT_ERROR_BADOPERATION;
 		    }
-		}   break;
+		}   /*@switchbreak@*/ break;
 
 		case POPT_ARG_FLOAT:
 		case POPT_ARG_DOUBLE:
@@ -886,12 +890,13 @@ int poptGetNextOpt(poptContext con)
 			    return POPT_ERROR_OVERFLOW;
 			*((float *) opt->arg) = aDouble;
 		    }
-		}   break;
+		}   /*@switchbreak@*/ break;
 		default:
 		    fprintf(stdout,
 			POPT_("option type (%d) not implemented in popt\n"),
 			(opt->argInfo & POPT_ARG_MASK));
 		    exit(EXIT_FAILURE);
+		    /*@notreached@*/ /*@switchbreak@*/ break;
 		}
 	    }
 	}
diff --git a/poptconfig.c b/poptconfig.c
index 1801db6..bc902d4 100644
--- a/poptconfig.c
+++ b/poptconfig.c
@@ -126,7 +126,7 @@ int poptReadConfigFile(poptContext con, const char * fn)
 	    if (*dst && *dst != '#')
 		configLine(con, dst);
 	    chptr++;
-	    break;
+	    /*@switchbreak@*/ break;
 	  case '\\':
 	    *dst++ = *chptr++;
 	    if (chptr < end) {
@@ -136,10 +136,10 @@ int poptReadConfigFile(poptContext con, const char * fn)
 		else
 		    *dst++ = *chptr++;
 	    }
-	    break;
+	    /*@switchbreak@*/ break;
 	  default:
 	    *dst++ = *chptr++;
-	    break;
+	    /*@switchbreak@*/ break;
 	}
     }
     /*@=infloops@*/
diff --git a/poptparse.c b/poptparse.c
index fdce572..f9faae3 100644
--- a/poptparse.c
+++ b/poptparse.c
@@ -90,7 +90,7 @@ int poptParseArgvString(const char * s, int * argcPtr, const char *** argvPtr)
 	  case '"':
 	  case '\'':
 	    quote = *src;
-	    break;
+	    /*@switchbreak@*/ break;
 	  case '\\':
 	    src++;
 	    if (!*src) {
@@ -100,7 +100,7 @@ int poptParseArgvString(const char * s, int * argcPtr, const char *** argvPtr)
 	    /*@fallthrough@*/
 	  default:
 	    *buf++ = *src;
-	    break;
+	    /*@switchbreak@*/ break;
 	}
     }
 
-- 
Gitee


From 5aa76fa14d5acc1c0fe749044ea8650402f8c472 Mon Sep 17 00:00:00 2001
From: Jeff Johnson <n3npq@mac.com>
Date: Mon, 15 Oct 2001 03:22:53 +0000
Subject: [PATCH 323/667] lclint fiddles to annotate globals.

---
 po/cs.po           | 50 +++++++++++++++++++++++-----------------------
 po/da.po           | 50 +++++++++++++++++++++++-----------------------
 po/de.po           | 50 +++++++++++++++++++++++-----------------------
 po/es.po           | 50 +++++++++++++++++++++++-----------------------
 po/eu_ES.po        | 50 +++++++++++++++++++++++-----------------------
 po/fi.po           | 50 +++++++++++++++++++++++-----------------------
 po/fr.po           | 50 +++++++++++++++++++++++-----------------------
 po/gl.po           | 50 +++++++++++++++++++++++-----------------------
 po/hu.po           | 50 +++++++++++++++++++++++-----------------------
 po/id.po           | 50 +++++++++++++++++++++++-----------------------
 po/is.po           | 50 +++++++++++++++++++++++-----------------------
 po/it.po           | 50 +++++++++++++++++++++++-----------------------
 po/ja.po           | 50 +++++++++++++++++++++++-----------------------
 po/ko.po           | 50 +++++++++++++++++++++++-----------------------
 po/no.po           | 50 +++++++++++++++++++++++-----------------------
 po/pl.po           | 50 +++++++++++++++++++++++-----------------------
 po/popt.pot        | 50 +++++++++++++++++++++++-----------------------
 po/pt.po           | 50 +++++++++++++++++++++++-----------------------
 po/pt_BR.po        | 50 +++++++++++++++++++++++-----------------------
 po/ro.po           | 50 +++++++++++++++++++++++-----------------------
 po/ru.po           | 50 +++++++++++++++++++++++-----------------------
 po/sk.po           | 50 +++++++++++++++++++++++-----------------------
 po/sl.po           | 50 +++++++++++++++++++++++-----------------------
 po/sr.po           | 50 +++++++++++++++++++++++-----------------------
 po/sv.po           | 50 +++++++++++++++++++++++-----------------------
 po/tr.po           | 50 +++++++++++++++++++++++-----------------------
 po/uk.po           | 50 +++++++++++++++++++++++-----------------------
 po/wa.po           | 50 +++++++++++++++++++++++-----------------------
 po/zh.po           | 50 +++++++++++++++++++++++-----------------------
 po/zh_CN.GB2312.po | 50 +++++++++++++++++++++++-----------------------
 popt.c             | 10 ++++++++--
 popt.h             |  7 +++++++
 popthelp.c         | 13 ++++++++++++
 33 files changed, 778 insertions(+), 752 deletions(-)

diff --git a/po/cs.po b/po/cs.po
index 68c30f5..220e90e 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.3\n"
-"POT-Creation-Date: 2001-10-13 13:15-0400\n"
+"POT-Creation-Date: 2001-10-14 23:13-0400\n"
 "PO-Revision-Date: 2001-07-24 00:03+0100\n"
 "Last-Translator: Milan Kerslager <kerslage@linux.cz>\n"
 "Language-Team: Czech <cs@li.org>\n"
@@ -13,99 +13,99 @@ msgstr ""
 msgid "unknown errno"
 msgstr "nezn�m� ��slo chyby"
 
-#: popt.c:892
+#: popt.c:900
 #, c-format
 msgid "option type (%d) not implemented in popt\n"
 msgstr "volba (%d) nen� v popt implementov�na\n"
 
-#: popt.c:1100
+#: popt.c:1111
 msgid "missing argument"
 msgstr "chyb� argument"
 
-#: popt.c:1102
+#: popt.c:1113
 msgid "unknown option"
 msgstr "nezn�m� volba"
 
-#: popt.c:1104
+#: popt.c:1115
 msgid "mutually exclusive logical operations requested"
 msgstr "po�adov�ny vz�jemn� v�lu�n� logick� operace"
 
-#: popt.c:1106
+#: popt.c:1117
 msgid "opt->arg should not be NULL"
 msgstr "opt->arg nesm� b�t NULL"
 
-#: popt.c:1108
+#: popt.c:1119
 msgid "aliases nested too deeply"
 msgstr "aliasy vno�en� p��li� hluboko"
 
-#: popt.c:1110
+#: popt.c:1121
 msgid "error in parameter quoting"
 msgstr "chyba v quotov�n� parametr�"
 
-#: popt.c:1112
+#: popt.c:1123
 msgid "invalid numeric value"
 msgstr "chybn� numerick� hodnota"
 
-#: popt.c:1114
+#: popt.c:1125
 msgid "number too large or too small"
 msgstr "��slo je p��li� velk� nebo p��li� mal�"
 
-#: popt.c:1116
+#: popt.c:1127
 msgid "memory allocation failed"
 msgstr "selhala alokace pam�ti"
 
-#: popt.c:1120
+#: popt.c:1131
 msgid "unknown error"
 msgstr "nezn�m� chyba"
 
-#: popthelp.c:47
+#: popthelp.c:52
 msgid "Show this help message"
 msgstr "Vyp��e tuto n�pov�du"
 
-#: popthelp.c:48
+#: popthelp.c:53
 msgid "Display brief usage message"
 msgstr "Vyp��e kr�tk� n�vod k pou�it�"
 
-#: popthelp.c:51
+#: popthelp.c:56
 msgid "Display option defaults in message"
 msgstr "Zobrazit implicitn� volby ve zpr�v�"
 
-#: popthelp.c:93
+#: popthelp.c:98
 msgid "NONE"
 msgstr "NONE"
 
-#: popthelp.c:94
+#: popthelp.c:99
 msgid "VAL"
 msgstr "VAL"
 
-#: popthelp.c:95
+#: popthelp.c:100
 msgid "INT"
 msgstr "INT"
 
-#: popthelp.c:96
+#: popthelp.c:101
 msgid "LONG"
 msgstr "LONG"
 
-#: popthelp.c:97
+#: popthelp.c:102
 msgid "STRING"
 msgstr "STRING"
 
-#: popthelp.c:98
+#: popthelp.c:103
 msgid "FLOAT"
 msgstr "FLOAT"
 
-#: popthelp.c:99
+#: popthelp.c:104
 msgid "DOUBLE"
 msgstr "DOUBLE"
 
-#: popthelp.c:100
+#: popthelp.c:105
 msgid "ARG"
 msgstr "ARG"
 
-#: popthelp.c:445
+#: popthelp.c:454
 msgid "Usage:"
 msgstr "Pou�it�:"
 
-#: popthelp.c:467
+#: popthelp.c:476
 msgid "[OPTION...]"
 msgstr "[VOLBY...]"
diff --git a/po/da.po b/po/da.po
index 8470262..d82df53 100644
--- a/po/da.po
+++ b/po/da.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.3\n"
-"POT-Creation-Date: 2001-10-13 13:15-0400\n"
+"POT-Creation-Date: 2001-10-14 23:13-0400\n"
 "PO-Revision-Date: Sun Jan 21 2001 04:30:32+0200\n"
 "Last-Translator: Martin Hansen <mah@k64.dk>\n"
 "Language-Team: Dansk <dansk@klid.dk>\n"
@@ -14,100 +14,100 @@ msgstr ""
 msgid "unknown errno"
 msgstr "ukendt fejlnr."
 
-#: popt.c:892
+#: popt.c:900
 #, c-format
 msgid "option type (%d) not implemented in popt\n"
 msgstr "tilvalgstype (%d) er ikke implementeret i popt\n"
 
-#: popt.c:1100
+#: popt.c:1111
 msgid "missing argument"
 msgstr "mangler argument"
 
-#: popt.c:1102
+#: popt.c:1113
 msgid "unknown option"
 msgstr "ukendt tilvalg"
 
-#: popt.c:1104
+#: popt.c:1115
 msgid "mutually exclusive logical operations requested"
 msgstr "de �nskede handlinger udelukker hinanden"
 
-#: popt.c:1106
+#: popt.c:1117
 msgid "opt->arg should not be NULL"
 msgstr ""
 
-#: popt.c:1108
+#: popt.c:1119
 msgid "aliases nested too deeply"
 msgstr "aliaser er for dybt indlejret"
 
-#: popt.c:1110
+#: popt.c:1121
 msgid "error in parameter quoting"
 msgstr "fejl i parameter citering"
 
-#: popt.c:1112
+#: popt.c:1123
 msgid "invalid numeric value"
 msgstr "ugyldig numerisk v�rdi"
 
-#: popt.c:1114
+#: popt.c:1125
 msgid "number too large or too small"
 msgstr "nummer for stort, eller for lille"
 
-#: popt.c:1116
+#: popt.c:1127
 msgid "memory allocation failed"
 msgstr ""
 
-#: popt.c:1120
+#: popt.c:1131
 msgid "unknown error"
 msgstr "ukendt fejl"
 
-#: popthelp.c:47
+#: popthelp.c:52
 msgid "Show this help message"
 msgstr "Vis denne hj�lpemeddelelse"
 
-#: popthelp.c:48
+#: popthelp.c:53
 msgid "Display brief usage message"
 msgstr "Vis kortfattet brugsanvisning"
 
-#: popthelp.c:51
+#: popthelp.c:56
 #, fuzzy
 msgid "Display option defaults in message"
 msgstr "Vis kortfattet brugsanvisning"
 
-#: popthelp.c:93
+#: popthelp.c:98
 msgid "NONE"
 msgstr "INGEN"
 
-#: popthelp.c:94
+#: popthelp.c:99
 msgid "VAL"
 msgstr "VAL"
 
-#: popthelp.c:95
+#: popthelp.c:100
 msgid "INT"
 msgstr "INT"
 
-#: popthelp.c:96
+#: popthelp.c:101
 msgid "LONG"
 msgstr "LONG"
 
-#: popthelp.c:97
+#: popthelp.c:102
 msgid "STRING"
 msgstr "STRING"
 
-#: popthelp.c:98
+#: popthelp.c:103
 msgid "FLOAT"
 msgstr "FLOAT"
 
-#: popthelp.c:99
+#: popthelp.c:104
 msgid "DOUBLE"
 msgstr "DOUBLE"
 
-#: popthelp.c:100
+#: popthelp.c:105
 msgid "ARG"
 msgstr "ARG"
 
-#: popthelp.c:445
+#: popthelp.c:454
 msgid "Usage:"
 msgstr "Brug:"
 
-#: popthelp.c:467
+#: popthelp.c:476
 msgid "[OPTION...]"
 msgstr "[TILVALG...]"
diff --git a/po/de.po b/po/de.po
index 1d0703e..934225f 100644
--- a/po/de.po
+++ b/po/de.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.3\n"
-"POT-Creation-Date: 2001-10-13 13:15-0400\n"
+"POT-Creation-Date: 2001-10-14 23:13-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -18,99 +18,99 @@ msgstr ""
 msgid "unknown errno"
 msgstr ""
 
-#: popt.c:892
+#: popt.c:900
 #, c-format
 msgid "option type (%d) not implemented in popt\n"
 msgstr ""
 
-#: popt.c:1100
+#: popt.c:1111
 msgid "missing argument"
 msgstr ""
 
-#: popt.c:1102
+#: popt.c:1113
 msgid "unknown option"
 msgstr ""
 
-#: popt.c:1104
+#: popt.c:1115
 msgid "mutually exclusive logical operations requested"
 msgstr ""
 
-#: popt.c:1106
+#: popt.c:1117
 msgid "opt->arg should not be NULL"
 msgstr ""
 
-#: popt.c:1108
+#: popt.c:1119
 msgid "aliases nested too deeply"
 msgstr ""
 
-#: popt.c:1110
+#: popt.c:1121
 msgid "error in parameter quoting"
 msgstr ""
 
-#: popt.c:1112
+#: popt.c:1123
 msgid "invalid numeric value"
 msgstr ""
 
-#: popt.c:1114
+#: popt.c:1125
 msgid "number too large or too small"
 msgstr ""
 
-#: popt.c:1116
+#: popt.c:1127
 msgid "memory allocation failed"
 msgstr ""
 
-#: popt.c:1120
+#: popt.c:1131
 msgid "unknown error"
 msgstr ""
 
-#: popthelp.c:47
+#: popthelp.c:52
 msgid "Show this help message"
 msgstr ""
 
-#: popthelp.c:48
+#: popthelp.c:53
 msgid "Display brief usage message"
 msgstr ""
 
-#: popthelp.c:51
+#: popthelp.c:56
 msgid "Display option defaults in message"
 msgstr ""
 
-#: popthelp.c:93
+#: popthelp.c:98
 msgid "NONE"
 msgstr ""
 
-#: popthelp.c:94
+#: popthelp.c:99
 msgid "VAL"
 msgstr ""
 
-#: popthelp.c:95
+#: popthelp.c:100
 msgid "INT"
 msgstr ""
 
-#: popthelp.c:96
+#: popthelp.c:101
 msgid "LONG"
 msgstr ""
 
-#: popthelp.c:97
+#: popthelp.c:102
 msgid "STRING"
 msgstr ""
 
-#: popthelp.c:98
+#: popthelp.c:103
 msgid "FLOAT"
 msgstr ""
 
-#: popthelp.c:99
+#: popthelp.c:104
 msgid "DOUBLE"
 msgstr ""
 
-#: popthelp.c:100
+#: popthelp.c:105
 msgid "ARG"
 msgstr ""
 
-#: popthelp.c:445
+#: popthelp.c:454
 msgid "Usage:"
 msgstr ""
 
-#: popthelp.c:467
+#: popthelp.c:476
 msgid "[OPTION...]"
 msgstr ""
diff --git a/po/es.po b/po/es.po
index 81bc84a..f152443 100644
--- a/po/es.po
+++ b/po/es.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.3\n"
-"POT-Creation-Date: 2001-10-13 13:15-0400\n"
+"POT-Creation-Date: 2001-10-14 23:13-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Leandro Lucarella <luca@linuxmendoza.org.ar>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -18,100 +18,100 @@ msgstr ""
 msgid "unknown errno"
 msgstr "errno desconocido"
 
-#: popt.c:892
+#: popt.c:900
 #, c-format
 msgid "option type (%d) not implemented in popt\n"
 msgstr "tipo de opci�n (%d) no implementada en popt\n"
 
-#: popt.c:1100
+#: popt.c:1111
 msgid "missing argument"
 msgstr "falta argumento"
 
-#: popt.c:1102
+#: popt.c:1113
 msgid "unknown option"
 msgstr "opci�n desconocida"
 
-#: popt.c:1104
+#: popt.c:1115
 msgid "mutually exclusive logical operations requested"
 msgstr "requerida operaci�n l�gica mutuamente exclusiva"
 
-#: popt.c:1106
+#: popt.c:1117
 msgid "opt->arg should not be NULL"
 msgstr ""
 
-#: popt.c:1108
+#: popt.c:1119
 msgid "aliases nested too deeply"
 msgstr "alias anidados muy profundamente"
 
-#: popt.c:1110
+#: popt.c:1121
 msgid "error in parameter quoting"
 msgstr "error en cita de par�metros"
 
-#: popt.c:1112
+#: popt.c:1123
 msgid "invalid numeric value"
 msgstr "valor num�rico inv�lido"
 
-#: popt.c:1114
+#: popt.c:1125
 msgid "number too large or too small"
 msgstr "n�mero muy largo o muy peque�o"
 
-#: popt.c:1116
+#: popt.c:1127
 msgid "memory allocation failed"
 msgstr ""
 
-#: popt.c:1120
+#: popt.c:1131
 msgid "unknown error"
 msgstr "error desconocido"
 
-#: popthelp.c:47
+#: popthelp.c:52
 msgid "Show this help message"
 msgstr "Muestra este mensaje de ayuda"
 
-#: popthelp.c:48
+#: popthelp.c:53
 msgid "Display brief usage message"
 msgstr "Indica el modo de uso resumido"
 
-#: popthelp.c:51
+#: popthelp.c:56
 #, fuzzy
 msgid "Display option defaults in message"
 msgstr "Indica el modo de uso resumido"
 
-#: popthelp.c:93
+#: popthelp.c:98
 msgid "NONE"
 msgstr "NONE"
 
-#: popthelp.c:94
+#: popthelp.c:99
 msgid "VAL"
 msgstr "VAL"
 
-#: popthelp.c:95
+#: popthelp.c:100
 msgid "INT"
 msgstr "INT"
 
-#: popthelp.c:96
+#: popthelp.c:101
 msgid "LONG"
 msgstr "LONG"
 
-#: popthelp.c:97
+#: popthelp.c:102
 msgid "STRING"
 msgstr "STRING"
 
-#: popthelp.c:98
+#: popthelp.c:103
 msgid "FLOAT"
 msgstr "FLOAT"
 
-#: popthelp.c:99
+#: popthelp.c:104
 msgid "DOUBLE"
 msgstr "DOUBLE"
 
-#: popthelp.c:100
+#: popthelp.c:105
 msgid "ARG"
 msgstr "ARG"
 
-#: popthelp.c:445
+#: popthelp.c:454
 msgid "Usage:"
 msgstr "Modo de Uso:"
 
-#: popthelp.c:467
+#: popthelp.c:476
 msgid "[OPTION...]"
 msgstr "[OPCI�N...]"
diff --git a/po/eu_ES.po b/po/eu_ES.po
index 1d0703e..934225f 100644
--- a/po/eu_ES.po
+++ b/po/eu_ES.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.3\n"
-"POT-Creation-Date: 2001-10-13 13:15-0400\n"
+"POT-Creation-Date: 2001-10-14 23:13-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -18,99 +18,99 @@ msgstr ""
 msgid "unknown errno"
 msgstr ""
 
-#: popt.c:892
+#: popt.c:900
 #, c-format
 msgid "option type (%d) not implemented in popt\n"
 msgstr ""
 
-#: popt.c:1100
+#: popt.c:1111
 msgid "missing argument"
 msgstr ""
 
-#: popt.c:1102
+#: popt.c:1113
 msgid "unknown option"
 msgstr ""
 
-#: popt.c:1104
+#: popt.c:1115
 msgid "mutually exclusive logical operations requested"
 msgstr ""
 
-#: popt.c:1106
+#: popt.c:1117
 msgid "opt->arg should not be NULL"
 msgstr ""
 
-#: popt.c:1108
+#: popt.c:1119
 msgid "aliases nested too deeply"
 msgstr ""
 
-#: popt.c:1110
+#: popt.c:1121
 msgid "error in parameter quoting"
 msgstr ""
 
-#: popt.c:1112
+#: popt.c:1123
 msgid "invalid numeric value"
 msgstr ""
 
-#: popt.c:1114
+#: popt.c:1125
 msgid "number too large or too small"
 msgstr ""
 
-#: popt.c:1116
+#: popt.c:1127
 msgid "memory allocation failed"
 msgstr ""
 
-#: popt.c:1120
+#: popt.c:1131
 msgid "unknown error"
 msgstr ""
 
-#: popthelp.c:47
+#: popthelp.c:52
 msgid "Show this help message"
 msgstr ""
 
-#: popthelp.c:48
+#: popthelp.c:53
 msgid "Display brief usage message"
 msgstr ""
 
-#: popthelp.c:51
+#: popthelp.c:56
 msgid "Display option defaults in message"
 msgstr ""
 
-#: popthelp.c:93
+#: popthelp.c:98
 msgid "NONE"
 msgstr ""
 
-#: popthelp.c:94
+#: popthelp.c:99
 msgid "VAL"
 msgstr ""
 
-#: popthelp.c:95
+#: popthelp.c:100
 msgid "INT"
 msgstr ""
 
-#: popthelp.c:96
+#: popthelp.c:101
 msgid "LONG"
 msgstr ""
 
-#: popthelp.c:97
+#: popthelp.c:102
 msgid "STRING"
 msgstr ""
 
-#: popthelp.c:98
+#: popthelp.c:103
 msgid "FLOAT"
 msgstr ""
 
-#: popthelp.c:99
+#: popthelp.c:104
 msgid "DOUBLE"
 msgstr ""
 
-#: popthelp.c:100
+#: popthelp.c:105
 msgid "ARG"
 msgstr ""
 
-#: popthelp.c:445
+#: popthelp.c:454
 msgid "Usage:"
 msgstr ""
 
-#: popthelp.c:467
+#: popthelp.c:476
 msgid "[OPTION...]"
 msgstr ""
diff --git a/po/fi.po b/po/fi.po
index 1d0703e..934225f 100644
--- a/po/fi.po
+++ b/po/fi.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.3\n"
-"POT-Creation-Date: 2001-10-13 13:15-0400\n"
+"POT-Creation-Date: 2001-10-14 23:13-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -18,99 +18,99 @@ msgstr ""
 msgid "unknown errno"
 msgstr ""
 
-#: popt.c:892
+#: popt.c:900
 #, c-format
 msgid "option type (%d) not implemented in popt\n"
 msgstr ""
 
-#: popt.c:1100
+#: popt.c:1111
 msgid "missing argument"
 msgstr ""
 
-#: popt.c:1102
+#: popt.c:1113
 msgid "unknown option"
 msgstr ""
 
-#: popt.c:1104
+#: popt.c:1115
 msgid "mutually exclusive logical operations requested"
 msgstr ""
 
-#: popt.c:1106
+#: popt.c:1117
 msgid "opt->arg should not be NULL"
 msgstr ""
 
-#: popt.c:1108
+#: popt.c:1119
 msgid "aliases nested too deeply"
 msgstr ""
 
-#: popt.c:1110
+#: popt.c:1121
 msgid "error in parameter quoting"
 msgstr ""
 
-#: popt.c:1112
+#: popt.c:1123
 msgid "invalid numeric value"
 msgstr ""
 
-#: popt.c:1114
+#: popt.c:1125
 msgid "number too large or too small"
 msgstr ""
 
-#: popt.c:1116
+#: popt.c:1127
 msgid "memory allocation failed"
 msgstr ""
 
-#: popt.c:1120
+#: popt.c:1131
 msgid "unknown error"
 msgstr ""
 
-#: popthelp.c:47
+#: popthelp.c:52
 msgid "Show this help message"
 msgstr ""
 
-#: popthelp.c:48
+#: popthelp.c:53
 msgid "Display brief usage message"
 msgstr ""
 
-#: popthelp.c:51
+#: popthelp.c:56
 msgid "Display option defaults in message"
 msgstr ""
 
-#: popthelp.c:93
+#: popthelp.c:98
 msgid "NONE"
 msgstr ""
 
-#: popthelp.c:94
+#: popthelp.c:99
 msgid "VAL"
 msgstr ""
 
-#: popthelp.c:95
+#: popthelp.c:100
 msgid "INT"
 msgstr ""
 
-#: popthelp.c:96
+#: popthelp.c:101
 msgid "LONG"
 msgstr ""
 
-#: popthelp.c:97
+#: popthelp.c:102
 msgid "STRING"
 msgstr ""
 
-#: popthelp.c:98
+#: popthelp.c:103
 msgid "FLOAT"
 msgstr ""
 
-#: popthelp.c:99
+#: popthelp.c:104
 msgid "DOUBLE"
 msgstr ""
 
-#: popthelp.c:100
+#: popthelp.c:105
 msgid "ARG"
 msgstr ""
 
-#: popthelp.c:445
+#: popthelp.c:454
 msgid "Usage:"
 msgstr ""
 
-#: popthelp.c:467
+#: popthelp.c:476
 msgid "[OPTION...]"
 msgstr ""
diff --git a/po/fr.po b/po/fr.po
index 1d0703e..934225f 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.3\n"
-"POT-Creation-Date: 2001-10-13 13:15-0400\n"
+"POT-Creation-Date: 2001-10-14 23:13-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -18,99 +18,99 @@ msgstr ""
 msgid "unknown errno"
 msgstr ""
 
-#: popt.c:892
+#: popt.c:900
 #, c-format
 msgid "option type (%d) not implemented in popt\n"
 msgstr ""
 
-#: popt.c:1100
+#: popt.c:1111
 msgid "missing argument"
 msgstr ""
 
-#: popt.c:1102
+#: popt.c:1113
 msgid "unknown option"
 msgstr ""
 
-#: popt.c:1104
+#: popt.c:1115
 msgid "mutually exclusive logical operations requested"
 msgstr ""
 
-#: popt.c:1106
+#: popt.c:1117
 msgid "opt->arg should not be NULL"
 msgstr ""
 
-#: popt.c:1108
+#: popt.c:1119
 msgid "aliases nested too deeply"
 msgstr ""
 
-#: popt.c:1110
+#: popt.c:1121
 msgid "error in parameter quoting"
 msgstr ""
 
-#: popt.c:1112
+#: popt.c:1123
 msgid "invalid numeric value"
 msgstr ""
 
-#: popt.c:1114
+#: popt.c:1125
 msgid "number too large or too small"
 msgstr ""
 
-#: popt.c:1116
+#: popt.c:1127
 msgid "memory allocation failed"
 msgstr ""
 
-#: popt.c:1120
+#: popt.c:1131
 msgid "unknown error"
 msgstr ""
 
-#: popthelp.c:47
+#: popthelp.c:52
 msgid "Show this help message"
 msgstr ""
 
-#: popthelp.c:48
+#: popthelp.c:53
 msgid "Display brief usage message"
 msgstr ""
 
-#: popthelp.c:51
+#: popthelp.c:56
 msgid "Display option defaults in message"
 msgstr ""
 
-#: popthelp.c:93
+#: popthelp.c:98
 msgid "NONE"
 msgstr ""
 
-#: popthelp.c:94
+#: popthelp.c:99
 msgid "VAL"
 msgstr ""
 
-#: popthelp.c:95
+#: popthelp.c:100
 msgid "INT"
 msgstr ""
 
-#: popthelp.c:96
+#: popthelp.c:101
 msgid "LONG"
 msgstr ""
 
-#: popthelp.c:97
+#: popthelp.c:102
 msgid "STRING"
 msgstr ""
 
-#: popthelp.c:98
+#: popthelp.c:103
 msgid "FLOAT"
 msgstr ""
 
-#: popthelp.c:99
+#: popthelp.c:104
 msgid "DOUBLE"
 msgstr ""
 
-#: popthelp.c:100
+#: popthelp.c:105
 msgid "ARG"
 msgstr ""
 
-#: popthelp.c:445
+#: popthelp.c:454
 msgid "Usage:"
 msgstr ""
 
-#: popthelp.c:467
+#: popthelp.c:476
 msgid "[OPTION...]"
 msgstr ""
diff --git a/po/gl.po b/po/gl.po
index 4ce16e8..8ccc20d 100644
--- a/po/gl.po
+++ b/po/gl.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.3\n"
-"POT-Creation-Date: 2001-10-13 13:15-0400\n"
+"POT-Creation-Date: 2001-10-14 23:13-0400\n"
 "PO-Revision-Date: 2001-01-17 01:01+0100\n"
 "Last-Translator: Jes�s Bravo �lvarez <jba@pobox.com>\n"
 "Language-Team: Galician <trasno@ceu.fi.udc.es>\n"
@@ -13,100 +13,100 @@ msgstr ""
 msgid "unknown errno"
 msgstr "errno desco�ecido"
 
-#: popt.c:892
+#: popt.c:900
 #, c-format
 msgid "option type (%d) not implemented in popt\n"
 msgstr "tipo de opci�n (%d) non implementada en popt\n"
 
-#: popt.c:1100
+#: popt.c:1111
 msgid "missing argument"
 msgstr "falta un argumento"
 
-#: popt.c:1102
+#: popt.c:1113
 msgid "unknown option"
 msgstr "opci�n desco�ecida"
 
-#: popt.c:1104
+#: popt.c:1115
 msgid "mutually exclusive logical operations requested"
 msgstr "solicit�ronse operaci�ns l�xicas mutuamente exclu�ntes"
 
-#: popt.c:1106
+#: popt.c:1117
 msgid "opt->arg should not be NULL"
 msgstr ""
 
-#: popt.c:1108
+#: popt.c:1119
 msgid "aliases nested too deeply"
 msgstr "aliases ani�ados a un nivel demasiado profundo"
 
-#: popt.c:1110
+#: popt.c:1121
 msgid "error in parameter quoting"
 msgstr "erro nas comi�as do par�metro"
 
-#: popt.c:1112
+#: popt.c:1123
 msgid "invalid numeric value"
 msgstr "valor num�rico non v�lido"
 
-#: popt.c:1114
+#: popt.c:1125
 msgid "number too large or too small"
 msgstr "n�mero demasiado grande ou pequeno"
 
-#: popt.c:1116
+#: popt.c:1127
 msgid "memory allocation failed"
 msgstr ""
 
-#: popt.c:1120
+#: popt.c:1131
 msgid "unknown error"
 msgstr "erro desco�ecido"
 
-#: popthelp.c:47
+#: popthelp.c:52
 msgid "Show this help message"
 msgstr "Amosar esta mensaxe de axuda"
 
-#: popthelp.c:48
+#: popthelp.c:53
 msgid "Display brief usage message"
 msgstr "Amosar brevemente o xeito de utilizaci�n"
 
-#: popthelp.c:51
+#: popthelp.c:56
 #, fuzzy
 msgid "Display option defaults in message"
 msgstr "Amosar brevemente o xeito de utilizaci�n"
 
-#: popthelp.c:93
+#: popthelp.c:98
 msgid "NONE"
 msgstr "NADA"
 
-#: popthelp.c:94
+#: popthelp.c:99
 msgid "VAL"
 msgstr "VAL"
 
-#: popthelp.c:95
+#: popthelp.c:100
 msgid "INT"
 msgstr "INT"
 
-#: popthelp.c:96
+#: popthelp.c:101
 msgid "LONG"
 msgstr "LONG"
 
-#: popthelp.c:97
+#: popthelp.c:102
 msgid "STRING"
 msgstr "CADEA"
 
-#: popthelp.c:98
+#: popthelp.c:103
 msgid "FLOAT"
 msgstr "FLOAT"
 
-#: popthelp.c:99
+#: popthelp.c:104
 msgid "DOUBLE"
 msgstr "DOUBLE"
 
-#: popthelp.c:100
+#: popthelp.c:105
 msgid "ARG"
 msgstr "ARG"
 
-#: popthelp.c:445
+#: popthelp.c:454
 msgid "Usage:"
 msgstr "Uso:"
 
-#: popthelp.c:467
+#: popthelp.c:476
 msgid "[OPTION...]"
 msgstr "[OPCI�N...]"
diff --git a/po/hu.po b/po/hu.po
index 6512fd8..b6fe1be 100644
--- a/po/hu.po
+++ b/po/hu.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.3\n"
-"POT-Creation-Date: 2001-10-13 13:15-0400\n"
+"POT-Creation-Date: 2001-10-14 23:13-0400\n"
 "PO-Revision-Date: 2000-08-03 23:26+0200\n"
 "Last-Translator: L�szl� N�meth <nemeth@qwertynet.hu>\n"
 "Language-Team: Hungarian\n"
@@ -13,100 +13,100 @@ msgstr ""
 msgid "unknown errno"
 msgstr ""
 
-#: popt.c:892
+#: popt.c:900
 #, c-format
 msgid "option type (%d) not implemented in popt\n"
 msgstr ""
 
-#: popt.c:1100
+#: popt.c:1111
 msgid "missing argument"
 msgstr ""
 
-#: popt.c:1102
+#: popt.c:1113
 msgid "unknown option"
 msgstr ""
 
-#: popt.c:1104
+#: popt.c:1115
 msgid "mutually exclusive logical operations requested"
 msgstr ""
 
-#: popt.c:1106
+#: popt.c:1117
 msgid "opt->arg should not be NULL"
 msgstr ""
 
-#: popt.c:1108
+#: popt.c:1119
 msgid "aliases nested too deeply"
 msgstr ""
 
-#: popt.c:1110
+#: popt.c:1121
 msgid "error in parameter quoting"
 msgstr ""
 
-#: popt.c:1112
+#: popt.c:1123
 msgid "invalid numeric value"
 msgstr ""
 
-#: popt.c:1114
+#: popt.c:1125
 msgid "number too large or too small"
 msgstr ""
 
-#: popt.c:1116
+#: popt.c:1127
 msgid "memory allocation failed"
 msgstr ""
 
-#: popt.c:1120
+#: popt.c:1131
 msgid "unknown error"
 msgstr ""
 
-#: popthelp.c:47
+#: popthelp.c:52
 msgid "Show this help message"
 msgstr "E s�g� megjelen�t�se"
 
-#: popthelp.c:48
+#: popthelp.c:53
 msgid "Display brief usage message"
 msgstr "R�vid haszn�lati utas�t�s megjelen�t�se"
 
-#: popthelp.c:51
+#: popthelp.c:56
 #, fuzzy
 msgid "Display option defaults in message"
 msgstr "R�vid haszn�lati utas�t�s megjelen�t�se"
 
-#: popthelp.c:93
+#: popthelp.c:98
 msgid "NONE"
 msgstr ""
 
-#: popthelp.c:94
+#: popthelp.c:99
 msgid "VAL"
 msgstr ""
 
-#: popthelp.c:95
+#: popthelp.c:100
 msgid "INT"
 msgstr ""
 
-#: popthelp.c:96
+#: popthelp.c:101
 msgid "LONG"
 msgstr ""
 
-#: popthelp.c:97
+#: popthelp.c:102
 msgid "STRING"
 msgstr ""
 
-#: popthelp.c:98
+#: popthelp.c:103
 msgid "FLOAT"
 msgstr ""
 
-#: popthelp.c:99
+#: popthelp.c:104
 msgid "DOUBLE"
 msgstr ""
 
-#: popthelp.c:100
+#: popthelp.c:105
 msgid "ARG"
 msgstr ""
 
-#: popthelp.c:445
+#: popthelp.c:454
 msgid "Usage:"
 msgstr ""
 
-#: popthelp.c:467
+#: popthelp.c:476
 msgid "[OPTION...]"
 msgstr ""
diff --git a/po/id.po b/po/id.po
index 1d0703e..934225f 100644
--- a/po/id.po
+++ b/po/id.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.3\n"
-"POT-Creation-Date: 2001-10-13 13:15-0400\n"
+"POT-Creation-Date: 2001-10-14 23:13-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -18,99 +18,99 @@ msgstr ""
 msgid "unknown errno"
 msgstr ""
 
-#: popt.c:892
+#: popt.c:900
 #, c-format
 msgid "option type (%d) not implemented in popt\n"
 msgstr ""
 
-#: popt.c:1100
+#: popt.c:1111
 msgid "missing argument"
 msgstr ""
 
-#: popt.c:1102
+#: popt.c:1113
 msgid "unknown option"
 msgstr ""
 
-#: popt.c:1104
+#: popt.c:1115
 msgid "mutually exclusive logical operations requested"
 msgstr ""
 
-#: popt.c:1106
+#: popt.c:1117
 msgid "opt->arg should not be NULL"
 msgstr ""
 
-#: popt.c:1108
+#: popt.c:1119
 msgid "aliases nested too deeply"
 msgstr ""
 
-#: popt.c:1110
+#: popt.c:1121
 msgid "error in parameter quoting"
 msgstr ""
 
-#: popt.c:1112
+#: popt.c:1123
 msgid "invalid numeric value"
 msgstr ""
 
-#: popt.c:1114
+#: popt.c:1125
 msgid "number too large or too small"
 msgstr ""
 
-#: popt.c:1116
+#: popt.c:1127
 msgid "memory allocation failed"
 msgstr ""
 
-#: popt.c:1120
+#: popt.c:1131
 msgid "unknown error"
 msgstr ""
 
-#: popthelp.c:47
+#: popthelp.c:52
 msgid "Show this help message"
 msgstr ""
 
-#: popthelp.c:48
+#: popthelp.c:53
 msgid "Display brief usage message"
 msgstr ""
 
-#: popthelp.c:51
+#: popthelp.c:56
 msgid "Display option defaults in message"
 msgstr ""
 
-#: popthelp.c:93
+#: popthelp.c:98
 msgid "NONE"
 msgstr ""
 
-#: popthelp.c:94
+#: popthelp.c:99
 msgid "VAL"
 msgstr ""
 
-#: popthelp.c:95
+#: popthelp.c:100
 msgid "INT"
 msgstr ""
 
-#: popthelp.c:96
+#: popthelp.c:101
 msgid "LONG"
 msgstr ""
 
-#: popthelp.c:97
+#: popthelp.c:102
 msgid "STRING"
 msgstr ""
 
-#: popthelp.c:98
+#: popthelp.c:103
 msgid "FLOAT"
 msgstr ""
 
-#: popthelp.c:99
+#: popthelp.c:104
 msgid "DOUBLE"
 msgstr ""
 
-#: popthelp.c:100
+#: popthelp.c:105
 msgid "ARG"
 msgstr ""
 
-#: popthelp.c:445
+#: popthelp.c:454
 msgid "Usage:"
 msgstr ""
 
-#: popthelp.c:467
+#: popthelp.c:476
 msgid "[OPTION...]"
 msgstr ""
diff --git a/po/is.po b/po/is.po
index 4f1d046..d1af005 100644
--- a/po/is.po
+++ b/po/is.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.3\n"
-"POT-Creation-Date: 2001-10-13 13:15-0400\n"
+"POT-Creation-Date: 2001-10-14 23:13-0400\n"
 "PO-Revision-Date: 2001-06-08 01:35+0000\n"
 "Last-Translator: Richard Allen <ra@hp.is>\n"
 "Language-Team: is <kde-isl@mmedia.is>\n"
@@ -13,99 +13,99 @@ msgstr ""
 msgid "unknown errno"
 msgstr "��ekkt villun�mer"
 
-#: popt.c:892
+#: popt.c:900
 #, c-format
 msgid "option type (%d) not implemented in popt\n"
 msgstr "rofager�in (%d) er ekki studd � popt\n"
 
-#: popt.c:1100
+#: popt.c:1111
 msgid "missing argument"
 msgstr "vantar vi�fang"
 
-#: popt.c:1102
+#: popt.c:1113
 msgid "unknown option"
 msgstr "��ekktur rofi"
 
-#: popt.c:1104
+#: popt.c:1115
 msgid "mutually exclusive logical operations requested"
 msgstr "be�i� um rofa sem sl�kkva hvor � ��rum"
 
-#: popt.c:1106
+#: popt.c:1117
 msgid "opt->arg should not be NULL"
 msgstr "opt->arg �tti ekki a� vera NULL"
 
-#: popt.c:1108
+#: popt.c:1119
 msgid "aliases nested too deeply"
 msgstr "al�asar of fl�knir"
 
-#: popt.c:1110
+#: popt.c:1121
 msgid "error in parameter quoting"
 msgstr "villa � vi�f�ngum (g�salappir og svo frv.)"
 
-#: popt.c:1112
+#: popt.c:1123
 msgid "invalid numeric value"
 msgstr "�gilt t�lulegt gildi"
 
-#: popt.c:1114
+#: popt.c:1125
 msgid "number too large or too small"
 msgstr "talan of st�r e�a sm�"
 
-#: popt.c:1116
+#: popt.c:1127
 msgid "memory allocation failed"
 msgstr "ekki t�kst a� taka fr� minni"
 
-#: popt.c:1120
+#: popt.c:1131
 msgid "unknown error"
 msgstr "��ekkt villa"
 
-#: popthelp.c:47
+#: popthelp.c:52
 msgid "Show this help message"
 msgstr "S�na �essa hj�lp"
 
-#: popthelp.c:48
+#: popthelp.c:53
 msgid "Display brief usage message"
 msgstr "S�na stuttar notkunarlei�beiningar"
 
-#: popthelp.c:51
+#: popthelp.c:56
 msgid "Display option defaults in message"
 msgstr "S�na sj�lfgefin gildi rofa � skilabo�um"
 
-#: popthelp.c:93
+#: popthelp.c:98
 msgid "NONE"
 msgstr "ENGIN"
 
-#: popthelp.c:94
+#: popthelp.c:99
 msgid "VAL"
 msgstr "VAL"
 
-#: popthelp.c:95
+#: popthelp.c:100
 msgid "INT"
 msgstr "INT"
 
-#: popthelp.c:96
+#: popthelp.c:101
 msgid "LONG"
 msgstr "LONG"
 
-#: popthelp.c:97
+#: popthelp.c:102
 msgid "STRING"
 msgstr "STRING"
 
-#: popthelp.c:98
+#: popthelp.c:103
 msgid "FLOAT"
 msgstr "FLOAT"
 
-#: popthelp.c:99
+#: popthelp.c:104
 msgid "DOUBLE"
 msgstr "DOUBLE"
 
-#: popthelp.c:100
+#: popthelp.c:105
 msgid "ARG"
 msgstr "ARG"
 
-#: popthelp.c:445
+#: popthelp.c:454
 msgid "Usage:"
 msgstr "Notkun:"
 
-#: popthelp.c:467
+#: popthelp.c:476
 msgid "[OPTION...]"
 msgstr "[ROFI...]"
diff --git a/po/it.po b/po/it.po
index 1d0703e..934225f 100644
--- a/po/it.po
+++ b/po/it.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.3\n"
-"POT-Creation-Date: 2001-10-13 13:15-0400\n"
+"POT-Creation-Date: 2001-10-14 23:13-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -18,99 +18,99 @@ msgstr ""
 msgid "unknown errno"
 msgstr ""
 
-#: popt.c:892
+#: popt.c:900
 #, c-format
 msgid "option type (%d) not implemented in popt\n"
 msgstr ""
 
-#: popt.c:1100
+#: popt.c:1111
 msgid "missing argument"
 msgstr ""
 
-#: popt.c:1102
+#: popt.c:1113
 msgid "unknown option"
 msgstr ""
 
-#: popt.c:1104
+#: popt.c:1115
 msgid "mutually exclusive logical operations requested"
 msgstr ""
 
-#: popt.c:1106
+#: popt.c:1117
 msgid "opt->arg should not be NULL"
 msgstr ""
 
-#: popt.c:1108
+#: popt.c:1119
 msgid "aliases nested too deeply"
 msgstr ""
 
-#: popt.c:1110
+#: popt.c:1121
 msgid "error in parameter quoting"
 msgstr ""
 
-#: popt.c:1112
+#: popt.c:1123
 msgid "invalid numeric value"
 msgstr ""
 
-#: popt.c:1114
+#: popt.c:1125
 msgid "number too large or too small"
 msgstr ""
 
-#: popt.c:1116
+#: popt.c:1127
 msgid "memory allocation failed"
 msgstr ""
 
-#: popt.c:1120
+#: popt.c:1131
 msgid "unknown error"
 msgstr ""
 
-#: popthelp.c:47
+#: popthelp.c:52
 msgid "Show this help message"
 msgstr ""
 
-#: popthelp.c:48
+#: popthelp.c:53
 msgid "Display brief usage message"
 msgstr ""
 
-#: popthelp.c:51
+#: popthelp.c:56
 msgid "Display option defaults in message"
 msgstr ""
 
-#: popthelp.c:93
+#: popthelp.c:98
 msgid "NONE"
 msgstr ""
 
-#: popthelp.c:94
+#: popthelp.c:99
 msgid "VAL"
 msgstr ""
 
-#: popthelp.c:95
+#: popthelp.c:100
 msgid "INT"
 msgstr ""
 
-#: popthelp.c:96
+#: popthelp.c:101
 msgid "LONG"
 msgstr ""
 
-#: popthelp.c:97
+#: popthelp.c:102
 msgid "STRING"
 msgstr ""
 
-#: popthelp.c:98
+#: popthelp.c:103
 msgid "FLOAT"
 msgstr ""
 
-#: popthelp.c:99
+#: popthelp.c:104
 msgid "DOUBLE"
 msgstr ""
 
-#: popthelp.c:100
+#: popthelp.c:105
 msgid "ARG"
 msgstr ""
 
-#: popthelp.c:445
+#: popthelp.c:454
 msgid "Usage:"
 msgstr ""
 
-#: popthelp.c:467
+#: popthelp.c:476
 msgid "[OPTION...]"
 msgstr ""
diff --git a/po/ja.po b/po/ja.po
index 1d0703e..934225f 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.3\n"
-"POT-Creation-Date: 2001-10-13 13:15-0400\n"
+"POT-Creation-Date: 2001-10-14 23:13-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -18,99 +18,99 @@ msgstr ""
 msgid "unknown errno"
 msgstr ""
 
-#: popt.c:892
+#: popt.c:900
 #, c-format
 msgid "option type (%d) not implemented in popt\n"
 msgstr ""
 
-#: popt.c:1100
+#: popt.c:1111
 msgid "missing argument"
 msgstr ""
 
-#: popt.c:1102
+#: popt.c:1113
 msgid "unknown option"
 msgstr ""
 
-#: popt.c:1104
+#: popt.c:1115
 msgid "mutually exclusive logical operations requested"
 msgstr ""
 
-#: popt.c:1106
+#: popt.c:1117
 msgid "opt->arg should not be NULL"
 msgstr ""
 
-#: popt.c:1108
+#: popt.c:1119
 msgid "aliases nested too deeply"
 msgstr ""
 
-#: popt.c:1110
+#: popt.c:1121
 msgid "error in parameter quoting"
 msgstr ""
 
-#: popt.c:1112
+#: popt.c:1123
 msgid "invalid numeric value"
 msgstr ""
 
-#: popt.c:1114
+#: popt.c:1125
 msgid "number too large or too small"
 msgstr ""
 
-#: popt.c:1116
+#: popt.c:1127
 msgid "memory allocation failed"
 msgstr ""
 
-#: popt.c:1120
+#: popt.c:1131
 msgid "unknown error"
 msgstr ""
 
-#: popthelp.c:47
+#: popthelp.c:52
 msgid "Show this help message"
 msgstr ""
 
-#: popthelp.c:48
+#: popthelp.c:53
 msgid "Display brief usage message"
 msgstr ""
 
-#: popthelp.c:51
+#: popthelp.c:56
 msgid "Display option defaults in message"
 msgstr ""
 
-#: popthelp.c:93
+#: popthelp.c:98
 msgid "NONE"
 msgstr ""
 
-#: popthelp.c:94
+#: popthelp.c:99
 msgid "VAL"
 msgstr ""
 
-#: popthelp.c:95
+#: popthelp.c:100
 msgid "INT"
 msgstr ""
 
-#: popthelp.c:96
+#: popthelp.c:101
 msgid "LONG"
 msgstr ""
 
-#: popthelp.c:97
+#: popthelp.c:102
 msgid "STRING"
 msgstr ""
 
-#: popthelp.c:98
+#: popthelp.c:103
 msgid "FLOAT"
 msgstr ""
 
-#: popthelp.c:99
+#: popthelp.c:104
 msgid "DOUBLE"
 msgstr ""
 
-#: popthelp.c:100
+#: popthelp.c:105
 msgid "ARG"
 msgstr ""
 
-#: popthelp.c:445
+#: popthelp.c:454
 msgid "Usage:"
 msgstr ""
 
-#: popthelp.c:467
+#: popthelp.c:476
 msgid "[OPTION...]"
 msgstr ""
diff --git a/po/ko.po b/po/ko.po
index ed3a5be..1bffb7d 100644
--- a/po/ko.po
+++ b/po/ko.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6\n"
-"POT-Creation-Date: 2001-10-13 13:15-0400\n"
+"POT-Creation-Date: 2001-10-14 23:13-0400\n"
 "PO-Revision-Date: 2001-09-06 20:06+0900\n"
 "Last-Translator: Jong-Hoon Ryu <redhat4u@netian.com>\n"
 "Language-Team: GNU Translation project <ko@li.org>\n"
@@ -13,99 +13,99 @@ msgstr ""
 msgid "unknown errno"
 msgstr "�� �� ���� �����ڵ�(errno) �Դϴ�"
 
-#: popt.c:892
+#: popt.c:900
 #, c-format
 msgid "option type (%d) not implemented in popt\n"
 msgstr "�ɼ� ���� (%d)�� popt���� ����� �� �����ϴ�\n"
 
-#: popt.c:1100
+#: popt.c:1111
 msgid "missing argument"
 msgstr "�μ��� �������� �ʾҽ��ϴ�"
 
-#: popt.c:1102
+#: popt.c:1113
 msgid "unknown option"
 msgstr "�� �� ���� �ɼ��Դϴ�"
 
-#: popt.c:1104
+#: popt.c:1115
 msgid "mutually exclusive logical operations requested"
 msgstr "���ʿ� ��Ÿ�� ���� ������ �����Ǿ����ϴ�"
 
-#: popt.c:1106
+#: popt.c:1117
 msgid "opt->arg should not be NULL"
 msgstr "�ɼ�->�μ��� NULL�� �Ǿ�� �ȵ˴ϴ�"
 
-#: popt.c:1108
+#: popt.c:1119
 msgid "aliases nested too deeply"
 msgstr "��Ī(alias)�� �����ϰ� �����Ǿ����ϴ�"
 
-#: popt.c:1110
+#: popt.c:1121
 msgid "error in parameter quoting"
 msgstr "�Ű������� ������ �ֽ��ϴ�"
 
-#: popt.c:1112
+#: popt.c:1123
 msgid "invalid numeric value"
 msgstr "�߸��� ��ġ ���Դϴ�"
 
-#: popt.c:1114
+#: popt.c:1125
 msgid "number too large or too small"
 msgstr "���ڰ� �ʹ� ũ�ų� �ʹ� �����ϴ�"
 
-#: popt.c:1116
+#: popt.c:1127
 msgid "memory allocation failed"
 msgstr "�޸� �Ҵ翡 �����߽��ϴ�"
 
-#: popt.c:1120
+#: popt.c:1131
 msgid "unknown error"
 msgstr "�� �� ���� �����Դϴ�"
 
-#: popthelp.c:47
+#: popthelp.c:52
 msgid "Show this help message"
 msgstr "�� ������ �����ݴϴ�"
 
-#: popthelp.c:48
+#: popthelp.c:53
 msgid "Display brief usage message"
 msgstr "������ ������ �����ݴϴ�"
 
-#: popthelp.c:51
+#: popthelp.c:56
 msgid "Display option defaults in message"
 msgstr "�⺻���� �ɼ��� �����ݴϴ�"
 
-#: popthelp.c:93
+#: popthelp.c:98
 msgid "NONE"
 msgstr "����(NONE)"
 
-#: popthelp.c:94
+#: popthelp.c:99
 msgid "VAL"
 msgstr "��(VAL)"
 
-#: popthelp.c:95
+#: popthelp.c:100
 msgid "INT"
 msgstr "����(INT)"
 
-#: popthelp.c:96
+#: popthelp.c:101
 msgid "LONG"
 msgstr "����(LONG)"
 
-#: popthelp.c:97
+#: popthelp.c:102
 msgid "STRING"
 msgstr "���ڿ�(STRING)"
 
-#: popthelp.c:98
+#: popthelp.c:103
 msgid "FLOAT"
 msgstr "�Ҽ�(FLOAT)"
 
-#: popthelp.c:99
+#: popthelp.c:104
 msgid "DOUBLE"
 msgstr "�Ҽ�(DOUBLE)"
 
-#: popthelp.c:100
+#: popthelp.c:105
 msgid "ARG"
 msgstr "�μ�(ARG)"
 
-#: popthelp.c:445
+#: popthelp.c:454
 msgid "Usage:"
 msgstr "����:"
 
-#: popthelp.c:467
+#: popthelp.c:476
 msgid "[OPTION...]"
 msgstr "[�ɼ�...]"
diff --git a/po/no.po b/po/no.po
index 97b0e75..4f8e3ff 100644
--- a/po/no.po
+++ b/po/no.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.3\n"
-"POT-Creation-Date: 2001-10-13 13:15-0400\n"
+"POT-Creation-Date: 2001-10-14 23:13-0400\n"
 "PO-Revision-Date: 2001-06-27 11:05+0200\n"
 "Last-Translator: Kjartan Maraas <kmaraas@online.no>\n"
 "Language-Team: Norwegian <no@li.org>\n"
@@ -13,99 +13,99 @@ msgstr ""
 msgid "unknown errno"
 msgstr "ukjent errno"
 
-#: popt.c:892
+#: popt.c:900
 #, c-format
 msgid "option type (%d) not implemented in popt\n"
 msgstr "flaggtype (%d) ikke implementert i popt\n"
 
-#: popt.c:1100
+#: popt.c:1111
 msgid "missing argument"
 msgstr "manglende argument"
 
-#: popt.c:1102
+#: popt.c:1113
 msgid "unknown option"
 msgstr "ukjent flagg"
 
-#: popt.c:1104
+#: popt.c:1115
 msgid "mutually exclusive logical operations requested"
 msgstr "gjensidig eksluderende logiske operasjoner forespurt"
 
-#: popt.c:1106
+#: popt.c:1117
 msgid "opt->arg should not be NULL"
 msgstr "opt->arg m� ikke v�re NULL"
 
-#: popt.c:1108
+#: popt.c:1119
 msgid "aliases nested too deeply"
 msgstr "aliaser med for dype l�kker"
 
-#: popt.c:1110
+#: popt.c:1121
 msgid "error in parameter quoting"
 msgstr "feil i parametersitering"
 
-#: popt.c:1112
+#: popt.c:1123
 msgid "invalid numeric value"
 msgstr "ugyldig numerisk verdi"
 
-#: popt.c:1114
+#: popt.c:1125
 msgid "number too large or too small"
 msgstr "tallet er for stort eller lite"
 
-#: popt.c:1116
+#: popt.c:1127
 msgid "memory allocation failed"
 msgstr "minneallokering feilet"
 
-#: popt.c:1120
+#: popt.c:1131
 msgid "unknown error"
 msgstr "ukjent feil"
 
-#: popthelp.c:47
+#: popthelp.c:52
 msgid "Show this help message"
 msgstr "Vis denne hjelpmeldingen"
 
-#: popthelp.c:48
+#: popthelp.c:53
 msgid "Display brief usage message"
 msgstr "Vis kort bruksmelding"
 
-#: popthelp.c:51
+#: popthelp.c:56
 msgid "Display option defaults in message"
 msgstr "Vis forvalgte flagg i melding"
 
-#: popthelp.c:93
+#: popthelp.c:98
 msgid "NONE"
 msgstr "INGEN"
 
-#: popthelp.c:94
+#: popthelp.c:99
 msgid "VAL"
 msgstr "VERDI"
 
-#: popthelp.c:95
+#: popthelp.c:100
 msgid "INT"
 msgstr "HELTALL"
 
-#: popthelp.c:96
+#: popthelp.c:101
 msgid "LONG"
 msgstr "LONG"
 
-#: popthelp.c:97
+#: popthelp.c:102
 msgid "STRING"
 msgstr "STRENG"
 
-#: popthelp.c:98
+#: popthelp.c:103
 msgid "FLOAT"
 msgstr "FLYTTALL"
 
-#: popthelp.c:99
+#: popthelp.c:104
 msgid "DOUBLE"
 msgstr "DOUBLE"
 
-#: popthelp.c:100
+#: popthelp.c:105
 msgid "ARG"
 msgstr "ARG"
 
-#: popthelp.c:445
+#: popthelp.c:454
 msgid "Usage:"
 msgstr "Bruk:"
 
-#: popthelp.c:467
+#: popthelp.c:476
 msgid "[OPTION...]"
 msgstr "[FLAGG...]"
diff --git a/po/pl.po b/po/pl.po
index 1d0703e..934225f 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.3\n"
-"POT-Creation-Date: 2001-10-13 13:15-0400\n"
+"POT-Creation-Date: 2001-10-14 23:13-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -18,99 +18,99 @@ msgstr ""
 msgid "unknown errno"
 msgstr ""
 
-#: popt.c:892
+#: popt.c:900
 #, c-format
 msgid "option type (%d) not implemented in popt\n"
 msgstr ""
 
-#: popt.c:1100
+#: popt.c:1111
 msgid "missing argument"
 msgstr ""
 
-#: popt.c:1102
+#: popt.c:1113
 msgid "unknown option"
 msgstr ""
 
-#: popt.c:1104
+#: popt.c:1115
 msgid "mutually exclusive logical operations requested"
 msgstr ""
 
-#: popt.c:1106
+#: popt.c:1117
 msgid "opt->arg should not be NULL"
 msgstr ""
 
-#: popt.c:1108
+#: popt.c:1119
 msgid "aliases nested too deeply"
 msgstr ""
 
-#: popt.c:1110
+#: popt.c:1121
 msgid "error in parameter quoting"
 msgstr ""
 
-#: popt.c:1112
+#: popt.c:1123
 msgid "invalid numeric value"
 msgstr ""
 
-#: popt.c:1114
+#: popt.c:1125
 msgid "number too large or too small"
 msgstr ""
 
-#: popt.c:1116
+#: popt.c:1127
 msgid "memory allocation failed"
 msgstr ""
 
-#: popt.c:1120
+#: popt.c:1131
 msgid "unknown error"
 msgstr ""
 
-#: popthelp.c:47
+#: popthelp.c:52
 msgid "Show this help message"
 msgstr ""
 
-#: popthelp.c:48
+#: popthelp.c:53
 msgid "Display brief usage message"
 msgstr ""
 
-#: popthelp.c:51
+#: popthelp.c:56
 msgid "Display option defaults in message"
 msgstr ""
 
-#: popthelp.c:93
+#: popthelp.c:98
 msgid "NONE"
 msgstr ""
 
-#: popthelp.c:94
+#: popthelp.c:99
 msgid "VAL"
 msgstr ""
 
-#: popthelp.c:95
+#: popthelp.c:100
 msgid "INT"
 msgstr ""
 
-#: popthelp.c:96
+#: popthelp.c:101
 msgid "LONG"
 msgstr ""
 
-#: popthelp.c:97
+#: popthelp.c:102
 msgid "STRING"
 msgstr ""
 
-#: popthelp.c:98
+#: popthelp.c:103
 msgid "FLOAT"
 msgstr ""
 
-#: popthelp.c:99
+#: popthelp.c:104
 msgid "DOUBLE"
 msgstr ""
 
-#: popthelp.c:100
+#: popthelp.c:105
 msgid "ARG"
 msgstr ""
 
-#: popthelp.c:445
+#: popthelp.c:454
 msgid "Usage:"
 msgstr ""
 
-#: popthelp.c:467
+#: popthelp.c:476
 msgid "[OPTION...]"
 msgstr ""
diff --git a/po/popt.pot b/po/popt.pot
index 349c304..ca91a50 100644
--- a/po/popt.pot
+++ b/po/popt.pot
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2001-10-13 17:57-0400\n"
+"POT-Creation-Date: 2001-10-14 23:13-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -18,99 +18,99 @@ msgstr ""
 msgid "unknown errno"
 msgstr ""
 
-#: popt.c:896
+#: popt.c:900
 #, c-format
 msgid "option type (%d) not implemented in popt\n"
 msgstr ""
 
-#: popt.c:1105
+#: popt.c:1111
 msgid "missing argument"
 msgstr ""
 
-#: popt.c:1107
+#: popt.c:1113
 msgid "unknown option"
 msgstr ""
 
-#: popt.c:1109
+#: popt.c:1115
 msgid "mutually exclusive logical operations requested"
 msgstr ""
 
-#: popt.c:1111
+#: popt.c:1117
 msgid "opt->arg should not be NULL"
 msgstr ""
 
-#: popt.c:1113
+#: popt.c:1119
 msgid "aliases nested too deeply"
 msgstr ""
 
-#: popt.c:1115
+#: popt.c:1121
 msgid "error in parameter quoting"
 msgstr ""
 
-#: popt.c:1117
+#: popt.c:1123
 msgid "invalid numeric value"
 msgstr ""
 
-#: popt.c:1119
+#: popt.c:1125
 msgid "number too large or too small"
 msgstr ""
 
-#: popt.c:1121
+#: popt.c:1127
 msgid "memory allocation failed"
 msgstr ""
 
-#: popt.c:1125
+#: popt.c:1131
 msgid "unknown error"
 msgstr ""
 
-#: popthelp.c:47
+#: popthelp.c:52
 msgid "Show this help message"
 msgstr ""
 
-#: popthelp.c:48
+#: popthelp.c:53
 msgid "Display brief usage message"
 msgstr ""
 
-#: popthelp.c:51
+#: popthelp.c:56
 msgid "Display option defaults in message"
 msgstr ""
 
-#: popthelp.c:93
+#: popthelp.c:98
 msgid "NONE"
 msgstr ""
 
-#: popthelp.c:94
+#: popthelp.c:99
 msgid "VAL"
 msgstr ""
 
-#: popthelp.c:95
+#: popthelp.c:100
 msgid "INT"
 msgstr ""
 
-#: popthelp.c:96
+#: popthelp.c:101
 msgid "LONG"
 msgstr ""
 
-#: popthelp.c:97
+#: popthelp.c:102
 msgid "STRING"
 msgstr ""
 
-#: popthelp.c:98
+#: popthelp.c:103
 msgid "FLOAT"
 msgstr ""
 
-#: popthelp.c:99
+#: popthelp.c:104
 msgid "DOUBLE"
 msgstr ""
 
-#: popthelp.c:100
+#: popthelp.c:105
 msgid "ARG"
 msgstr ""
 
-#: popthelp.c:445
+#: popthelp.c:454
 msgid "Usage:"
 msgstr ""
 
-#: popthelp.c:467
+#: popthelp.c:476
 msgid "[OPTION...]"
 msgstr ""
diff --git a/po/pt.po b/po/pt.po
index 2ead6de..4d9d765 100644
--- a/po/pt.po
+++ b/po/pt.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.3\n"
-"POT-Creation-Date: 2001-10-13 13:15-0400\n"
+"POT-Creation-Date: 2001-10-14 23:13-0400\n"
 "PO-Revision-Date: 2001-01-21 19:31+00:00\n"
 "Last-Translator: Pedro Morais <morais@kde.org>\n"
 "Language-Team: pt <morais@kde.org>\n"
@@ -13,100 +13,100 @@ msgstr ""
 msgid "unknown errno"
 msgstr "errno desconhecido"
 
-#: popt.c:892
+#: popt.c:900
 #, c-format
 msgid "option type (%d) not implemented in popt\n"
 msgstr "tipo de op��o (%d) n�o implementado no popt\n"
 
-#: popt.c:1100
+#: popt.c:1111
 msgid "missing argument"
 msgstr "falta um argumento"
 
-#: popt.c:1102
+#: popt.c:1113
 msgid "unknown option"
 msgstr "op��o desconhecida"
 
-#: popt.c:1104
+#: popt.c:1115
 msgid "mutually exclusive logical operations requested"
 msgstr "foram pedidas opera��es l�gicas mutuamente exclusivas"
 
-#: popt.c:1106
+#: popt.c:1117
 msgid "opt->arg should not be NULL"
 msgstr ""
 
-#: popt.c:1108
+#: popt.c:1119
 msgid "aliases nested too deeply"
 msgstr "'aliases' demasiado aninhados"
 
-#: popt.c:1110
+#: popt.c:1121
 msgid "error in parameter quoting"
 msgstr "erros no 'quoting' de par�metros"
 
-#: popt.c:1112
+#: popt.c:1123
 msgid "invalid numeric value"
 msgstr "valor n�merico inv�lido"
 
-#: popt.c:1114
+#: popt.c:1125
 msgid "number too large or too small"
 msgstr "n�mero demasiado grando ou pequeno"
 
-#: popt.c:1116
+#: popt.c:1127
 msgid "memory allocation failed"
 msgstr ""
 
-#: popt.c:1120
+#: popt.c:1131
 msgid "unknown error"
 msgstr "erro desconhecido"
 
-#: popthelp.c:47
+#: popthelp.c:52
 msgid "Show this help message"
 msgstr "Mostrar esta mensagem de ajuda"
 
-#: popthelp.c:48
+#: popthelp.c:53
 msgid "Display brief usage message"
 msgstr "Mostrar uma mensagem de utiliza��o sucinta"
 
-#: popthelp.c:51
+#: popthelp.c:56
 #, fuzzy
 msgid "Display option defaults in message"
 msgstr "Mostrar uma mensagem de utiliza��o sucinta"
 
-#: popthelp.c:93
+#: popthelp.c:98
 msgid "NONE"
 msgstr "NONE"
 
-#: popthelp.c:94
+#: popthelp.c:99
 msgid "VAL"
 msgstr "VAL"
 
-#: popthelp.c:95
+#: popthelp.c:100
 msgid "INT"
 msgstr "INT"
 
-#: popthelp.c:96
+#: popthelp.c:101
 msgid "LONG"
 msgstr "LONG"
 
-#: popthelp.c:97
+#: popthelp.c:102
 msgid "STRING"
 msgstr "STRING"
 
-#: popthelp.c:98
+#: popthelp.c:103
 msgid "FLOAT"
 msgstr "FLOAT"
 
-#: popthelp.c:99
+#: popthelp.c:104
 msgid "DOUBLE"
 msgstr "DOUBLE"
 
-#: popthelp.c:100
+#: popthelp.c:105
 msgid "ARG"
 msgstr "ARG"
 
-#: popthelp.c:445
+#: popthelp.c:454
 msgid "Usage:"
 msgstr "Utiliza��o:"
 
-#: popthelp.c:467
+#: popthelp.c:476
 msgid "[OPTION...]"
 msgstr "[OP��O...]"
diff --git a/po/pt_BR.po b/po/pt_BR.po
index 1d0703e..934225f 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.3\n"
-"POT-Creation-Date: 2001-10-13 13:15-0400\n"
+"POT-Creation-Date: 2001-10-14 23:13-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -18,99 +18,99 @@ msgstr ""
 msgid "unknown errno"
 msgstr ""
 
-#: popt.c:892
+#: popt.c:900
 #, c-format
 msgid "option type (%d) not implemented in popt\n"
 msgstr ""
 
-#: popt.c:1100
+#: popt.c:1111
 msgid "missing argument"
 msgstr ""
 
-#: popt.c:1102
+#: popt.c:1113
 msgid "unknown option"
 msgstr ""
 
-#: popt.c:1104
+#: popt.c:1115
 msgid "mutually exclusive logical operations requested"
 msgstr ""
 
-#: popt.c:1106
+#: popt.c:1117
 msgid "opt->arg should not be NULL"
 msgstr ""
 
-#: popt.c:1108
+#: popt.c:1119
 msgid "aliases nested too deeply"
 msgstr ""
 
-#: popt.c:1110
+#: popt.c:1121
 msgid "error in parameter quoting"
 msgstr ""
 
-#: popt.c:1112
+#: popt.c:1123
 msgid "invalid numeric value"
 msgstr ""
 
-#: popt.c:1114
+#: popt.c:1125
 msgid "number too large or too small"
 msgstr ""
 
-#: popt.c:1116
+#: popt.c:1127
 msgid "memory allocation failed"
 msgstr ""
 
-#: popt.c:1120
+#: popt.c:1131
 msgid "unknown error"
 msgstr ""
 
-#: popthelp.c:47
+#: popthelp.c:52
 msgid "Show this help message"
 msgstr ""
 
-#: popthelp.c:48
+#: popthelp.c:53
 msgid "Display brief usage message"
 msgstr ""
 
-#: popthelp.c:51
+#: popthelp.c:56
 msgid "Display option defaults in message"
 msgstr ""
 
-#: popthelp.c:93
+#: popthelp.c:98
 msgid "NONE"
 msgstr ""
 
-#: popthelp.c:94
+#: popthelp.c:99
 msgid "VAL"
 msgstr ""
 
-#: popthelp.c:95
+#: popthelp.c:100
 msgid "INT"
 msgstr ""
 
-#: popthelp.c:96
+#: popthelp.c:101
 msgid "LONG"
 msgstr ""
 
-#: popthelp.c:97
+#: popthelp.c:102
 msgid "STRING"
 msgstr ""
 
-#: popthelp.c:98
+#: popthelp.c:103
 msgid "FLOAT"
 msgstr ""
 
-#: popthelp.c:99
+#: popthelp.c:104
 msgid "DOUBLE"
 msgstr ""
 
-#: popthelp.c:100
+#: popthelp.c:105
 msgid "ARG"
 msgstr ""
 
-#: popthelp.c:445
+#: popthelp.c:454
 msgid "Usage:"
 msgstr ""
 
-#: popthelp.c:467
+#: popthelp.c:476
 msgid "[OPTION...]"
 msgstr ""
diff --git a/po/ro.po b/po/ro.po
index 81768d2..3d013b3 100644
--- a/po/ro.po
+++ b/po/ro.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.3\n"
-"POT-Creation-Date: 2001-10-13 13:15-0400\n"
+"POT-Creation-Date: 2001-10-14 23:13-0400\n"
 "PO-Revision-Date: 2000-06-14 23:23+EST\n"
 "Last-Translator: Cristian Gafton <gafton@redhat.com>\n"
 "Language-Team: Romanian <ro@li.org>\n"
@@ -13,101 +13,101 @@ msgstr ""
 msgid "unknown errno"
 msgstr "eroare necunoscuta"
 
-#: popt.c:892
+#: popt.c:900
 #, c-format
 msgid "option type (%d) not implemented in popt\n"
 msgstr "optiunea de tipul (%d) nu este implementata in popt\n"
 
-#: popt.c:1100
+#: popt.c:1111
 msgid "missing argument"
 msgstr "argument lipsa"
 
-#: popt.c:1102
+#: popt.c:1113
 msgid "unknown option"
 msgstr "optiune necunoscuta"
 
-#: popt.c:1104
+#: popt.c:1115
 msgid "mutually exclusive logical operations requested"
 msgstr ""
 
-#: popt.c:1106
+#: popt.c:1117
 msgid "opt->arg should not be NULL"
 msgstr ""
 
-#: popt.c:1108
+#: popt.c:1119
 msgid "aliases nested too deeply"
 msgstr "recursivitate infinita la optiunile sinonime"
 
-#: popt.c:1110
+#: popt.c:1121
 #, fuzzy
 msgid "error in parameter quoting"
 msgstr "eroare la insertie parametru"
 
-#: popt.c:1112
+#: popt.c:1123
 msgid "invalid numeric value"
 msgstr "valoare numarica invalida"
 
-#: popt.c:1114
+#: popt.c:1125
 msgid "number too large or too small"
 msgstr "numar prea mare sau prea mic"
 
-#: popt.c:1116
+#: popt.c:1127
 msgid "memory allocation failed"
 msgstr ""
 
-#: popt.c:1120
+#: popt.c:1131
 msgid "unknown error"
 msgstr "eroare necuinoscuta"
 
-#: popthelp.c:47
+#: popthelp.c:52
 msgid "Show this help message"
 msgstr "Afisare mesaj de help"
 
-#: popthelp.c:48
+#: popthelp.c:53
 msgid "Display brief usage message"
 msgstr "Afisare mesaj sintaxa sumar"
 
-#: popthelp.c:51
+#: popthelp.c:56
 #, fuzzy
 msgid "Display option defaults in message"
 msgstr "Afisare mesaj sintaxa sumar"
 
-#: popthelp.c:93
+#: popthelp.c:98
 msgid "NONE"
 msgstr ""
 
-#: popthelp.c:94
+#: popthelp.c:99
 msgid "VAL"
 msgstr ""
 
-#: popthelp.c:95
+#: popthelp.c:100
 msgid "INT"
 msgstr ""
 
-#: popthelp.c:96
+#: popthelp.c:101
 msgid "LONG"
 msgstr ""
 
-#: popthelp.c:97
+#: popthelp.c:102
 msgid "STRING"
 msgstr ""
 
-#: popthelp.c:98
+#: popthelp.c:103
 msgid "FLOAT"
 msgstr ""
 
-#: popthelp.c:99
+#: popthelp.c:104
 msgid "DOUBLE"
 msgstr ""
 
-#: popthelp.c:100
+#: popthelp.c:105
 msgid "ARG"
 msgstr ""
 
-#: popthelp.c:445
+#: popthelp.c:454
 msgid "Usage:"
 msgstr "Sintaxa:"
 
-#: popthelp.c:467
+#: popthelp.c:476
 msgid "[OPTION...]"
 msgstr "[OPTIUNE...]"
diff --git a/po/ru.po b/po/ru.po
index 3cd15fb..aa0eb64 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.3\n"
-"POT-Creation-Date: 2001-10-13 13:15-0400\n"
+"POT-Creation-Date: 2001-10-14 23:13-0400\n"
 "PO-Revision-Date: 2001-07-05 21:00-0500\n"
 "Last-Translator: Eugene Kanter <eugene@blackcatlinux.com>\n"
 "Language-Team: Black Cat Linux Team <blackcat-support@blackcatlinux.com>\n"
@@ -13,99 +13,99 @@ msgstr ""
 msgid "unknown errno"
 msgstr "����������� ����� ������"
 
-#: popt.c:892
+#: popt.c:900
 #, c-format
 msgid "option type (%d) not implemented in popt\n"
 msgstr "��������� ��������� (%d) � popt �� �������������\n"
 
-#: popt.c:1100
+#: popt.c:1111
 msgid "missing argument"
 msgstr "�������� ��������"
 
-#: popt.c:1102
+#: popt.c:1113
 msgid "unknown option"
 msgstr "����������� ��������"
 
-#: popt.c:1104
+#: popt.c:1115
 msgid "mutually exclusive logical operations requested"
 msgstr "��������� ������� ����������� ���������� ��������"
 
-#: popt.c:1106
+#: popt.c:1117
 msgid "opt->arg should not be NULL"
 msgstr "opt->arg �� ����� ���� NULL"
 
-#: popt.c:1108
+#: popt.c:1119
 msgid "aliases nested too deeply"
 msgstr "�������� ������� ���������� �������� �����������"
 
-#: popt.c:1110
+#: popt.c:1121
 msgid "error in parameter quoting"
 msgstr "�����a ��������� ���������� � �������"
 
-#: popt.c:1112
+#: popt.c:1123
 msgid "invalid numeric value"
 msgstr "������������ �������� ��������"
 
-#: popt.c:1114
+#: popt.c:1125
 msgid "number too large or too small"
 msgstr "�������� �������� �� ��������� ����������������"
 
-#: popt.c:1116
+#: popt.c:1127
 msgid "memory allocation failed"
 msgstr "������ ��������� ������"
 
-#: popt.c:1120
+#: popt.c:1131
 msgid "unknown error"
 msgstr "����������� ������"
 
-#: popthelp.c:47
+#: popthelp.c:52
 msgid "Show this help message"
 msgstr "�������� ��� ���������"
 
-#: popthelp.c:48
+#: popthelp.c:53
 msgid "Display brief usage message"
 msgstr "�������� ������� ���������� �� �������������"
 
-#: popthelp.c:51
+#: popthelp.c:56
 msgid "Display option defaults in message"
 msgstr "�������� ��������� �� ���������"
 
-#: popthelp.c:93
+#: popthelp.c:98
 msgid "NONE"
 msgstr "NONE"
 
-#: popthelp.c:94
+#: popthelp.c:99
 msgid "VAL"
 msgstr "VAL"
 
-#: popthelp.c:95
+#: popthelp.c:100
 msgid "INT"
 msgstr "INT"
 
-#: popthelp.c:96
+#: popthelp.c:101
 msgid "LONG"
 msgstr "LONG"
 
-#: popthelp.c:97
+#: popthelp.c:102
 msgid "STRING"
 msgstr "STRING"
 
-#: popthelp.c:98
+#: popthelp.c:103
 msgid "FLOAT"
 msgstr "FLOAT"
 
-#: popthelp.c:99
+#: popthelp.c:104
 msgid "DOUBLE"
 msgstr "DOUBLE"
 
-#: popthelp.c:100
+#: popthelp.c:105
 msgid "ARG"
 msgstr "ARG"
 
-#: popthelp.c:445
+#: popthelp.c:454
 msgid "Usage:"
 msgstr "�������������:"
 
-#: popthelp.c:467
+#: popthelp.c:476
 msgid "[OPTION...]"
 msgstr "[��������...]"
diff --git a/po/sk.po b/po/sk.po
index 6234823..c9e9728 100644
--- a/po/sk.po
+++ b/po/sk.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.3\n"
-"POT-Creation-Date: 2001-10-13 13:15-0400\n"
+"POT-Creation-Date: 2001-10-14 23:13-0400\n"
 "PO-Revision-Date: 1999-08-04 21:40+0200\n"
 "Last-Translator: Stanislav Meduna <stano@eunet.sk>\n"
 "Language-Team: Slovak <sk-i18n@rak.isternet.sk>\n"
@@ -17,100 +17,100 @@ msgstr ""
 msgid "unknown errno"
 msgstr ""
 
-#: popt.c:892
+#: popt.c:900
 #, c-format
 msgid "option type (%d) not implemented in popt\n"
 msgstr ""
 
-#: popt.c:1100
+#: popt.c:1111
 msgid "missing argument"
 msgstr ""
 
-#: popt.c:1102
+#: popt.c:1113
 msgid "unknown option"
 msgstr ""
 
-#: popt.c:1104
+#: popt.c:1115
 msgid "mutually exclusive logical operations requested"
 msgstr ""
 
-#: popt.c:1106
+#: popt.c:1117
 msgid "opt->arg should not be NULL"
 msgstr ""
 
-#: popt.c:1108
+#: popt.c:1119
 msgid "aliases nested too deeply"
 msgstr ""
 
-#: popt.c:1110
+#: popt.c:1121
 msgid "error in parameter quoting"
 msgstr ""
 
-#: popt.c:1112
+#: popt.c:1123
 msgid "invalid numeric value"
 msgstr ""
 
-#: popt.c:1114
+#: popt.c:1125
 msgid "number too large or too small"
 msgstr ""
 
-#: popt.c:1116
+#: popt.c:1127
 msgid "memory allocation failed"
 msgstr ""
 
-#: popt.c:1120
+#: popt.c:1131
 msgid "unknown error"
 msgstr ""
 
-#: popthelp.c:47
+#: popthelp.c:52
 msgid "Show this help message"
 msgstr "Vyp�sa� t�to spr�vu"
 
-#: popthelp.c:48
+#: popthelp.c:53
 msgid "Display brief usage message"
 msgstr "Zobrazi� stru�n� n�vod na pou�itie"
 
-#: popthelp.c:51
+#: popthelp.c:56
 #, fuzzy
 msgid "Display option defaults in message"
 msgstr "Zobrazi� stru�n� n�vod na pou�itie"
 
-#: popthelp.c:93
+#: popthelp.c:98
 msgid "NONE"
 msgstr ""
 
-#: popthelp.c:94
+#: popthelp.c:99
 msgid "VAL"
 msgstr ""
 
-#: popthelp.c:95
+#: popthelp.c:100
 msgid "INT"
 msgstr ""
 
-#: popthelp.c:96
+#: popthelp.c:101
 msgid "LONG"
 msgstr ""
 
-#: popthelp.c:97
+#: popthelp.c:102
 msgid "STRING"
 msgstr ""
 
-#: popthelp.c:98
+#: popthelp.c:103
 msgid "FLOAT"
 msgstr ""
 
-#: popthelp.c:99
+#: popthelp.c:104
 msgid "DOUBLE"
 msgstr ""
 
-#: popthelp.c:100
+#: popthelp.c:105
 msgid "ARG"
 msgstr ""
 
-#: popthelp.c:445
+#: popthelp.c:454
 msgid "Usage:"
 msgstr ""
 
-#: popthelp.c:467
+#: popthelp.c:476
 msgid "[OPTION...]"
 msgstr ""
diff --git a/po/sl.po b/po/sl.po
index 9e369bd..4d49eba 100644
--- a/po/sl.po
+++ b/po/sl.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.3\n"
-"POT-Creation-Date: 2001-10-13 13:15-0400\n"
+"POT-Creation-Date: 2001-10-14 23:13-0400\n"
 "PO-Revision-Date: 2000-09-05 12:30+0200\n"
 "Last-Translator: Roman Maurer <roman.maurer@hermes.si>\n"
 "Language-Team: Slovenian <sl@li.org>\n"
@@ -13,100 +13,100 @@ msgstr ""
 msgid "unknown errno"
 msgstr ""
 
-#: popt.c:892
+#: popt.c:900
 #, c-format
 msgid "option type (%d) not implemented in popt\n"
 msgstr ""
 
-#: popt.c:1100
+#: popt.c:1111
 msgid "missing argument"
 msgstr ""
 
-#: popt.c:1102
+#: popt.c:1113
 msgid "unknown option"
 msgstr ""
 
-#: popt.c:1104
+#: popt.c:1115
 msgid "mutually exclusive logical operations requested"
 msgstr ""
 
-#: popt.c:1106
+#: popt.c:1117
 msgid "opt->arg should not be NULL"
 msgstr ""
 
-#: popt.c:1108
+#: popt.c:1119
 msgid "aliases nested too deeply"
 msgstr ""
 
-#: popt.c:1110
+#: popt.c:1121
 msgid "error in parameter quoting"
 msgstr ""
 
-#: popt.c:1112
+#: popt.c:1123
 msgid "invalid numeric value"
 msgstr ""
 
-#: popt.c:1114
+#: popt.c:1125
 msgid "number too large or too small"
 msgstr ""
 
-#: popt.c:1116
+#: popt.c:1127
 msgid "memory allocation failed"
 msgstr ""
 
-#: popt.c:1120
+#: popt.c:1131
 msgid "unknown error"
 msgstr ""
 
-#: popthelp.c:47
+#: popthelp.c:52
 msgid "Show this help message"
 msgstr "Prika�i to sporo�ilo s pomo�jo"
 
-#: popthelp.c:48
+#: popthelp.c:53
 msgid "Display brief usage message"
 msgstr "Prika�i kratko sporo�ilo o uporabi"
 
-#: popthelp.c:51
+#: popthelp.c:56
 #, fuzzy
 msgid "Display option defaults in message"
 msgstr "Prika�i kratko sporo�ilo o uporabi"
 
-#: popthelp.c:93
+#: popthelp.c:98
 msgid "NONE"
 msgstr ""
 
-#: popthelp.c:94
+#: popthelp.c:99
 msgid "VAL"
 msgstr ""
 
-#: popthelp.c:95
+#: popthelp.c:100
 msgid "INT"
 msgstr ""
 
-#: popthelp.c:96
+#: popthelp.c:101
 msgid "LONG"
 msgstr ""
 
-#: popthelp.c:97
+#: popthelp.c:102
 msgid "STRING"
 msgstr ""
 
-#: popthelp.c:98
+#: popthelp.c:103
 msgid "FLOAT"
 msgstr ""
 
-#: popthelp.c:99
+#: popthelp.c:104
 msgid "DOUBLE"
 msgstr ""
 
-#: popthelp.c:100
+#: popthelp.c:105
 msgid "ARG"
 msgstr ""
 
-#: popthelp.c:445
+#: popthelp.c:454
 msgid "Usage:"
 msgstr ""
 
-#: popthelp.c:467
+#: popthelp.c:476
 msgid "[OPTION...]"
 msgstr ""
diff --git a/po/sr.po b/po/sr.po
index 1d0703e..934225f 100644
--- a/po/sr.po
+++ b/po/sr.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.3\n"
-"POT-Creation-Date: 2001-10-13 13:15-0400\n"
+"POT-Creation-Date: 2001-10-14 23:13-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -18,99 +18,99 @@ msgstr ""
 msgid "unknown errno"
 msgstr ""
 
-#: popt.c:892
+#: popt.c:900
 #, c-format
 msgid "option type (%d) not implemented in popt\n"
 msgstr ""
 
-#: popt.c:1100
+#: popt.c:1111
 msgid "missing argument"
 msgstr ""
 
-#: popt.c:1102
+#: popt.c:1113
 msgid "unknown option"
 msgstr ""
 
-#: popt.c:1104
+#: popt.c:1115
 msgid "mutually exclusive logical operations requested"
 msgstr ""
 
-#: popt.c:1106
+#: popt.c:1117
 msgid "opt->arg should not be NULL"
 msgstr ""
 
-#: popt.c:1108
+#: popt.c:1119
 msgid "aliases nested too deeply"
 msgstr ""
 
-#: popt.c:1110
+#: popt.c:1121
 msgid "error in parameter quoting"
 msgstr ""
 
-#: popt.c:1112
+#: popt.c:1123
 msgid "invalid numeric value"
 msgstr ""
 
-#: popt.c:1114
+#: popt.c:1125
 msgid "number too large or too small"
 msgstr ""
 
-#: popt.c:1116
+#: popt.c:1127
 msgid "memory allocation failed"
 msgstr ""
 
-#: popt.c:1120
+#: popt.c:1131
 msgid "unknown error"
 msgstr ""
 
-#: popthelp.c:47
+#: popthelp.c:52
 msgid "Show this help message"
 msgstr ""
 
-#: popthelp.c:48
+#: popthelp.c:53
 msgid "Display brief usage message"
 msgstr ""
 
-#: popthelp.c:51
+#: popthelp.c:56
 msgid "Display option defaults in message"
 msgstr ""
 
-#: popthelp.c:93
+#: popthelp.c:98
 msgid "NONE"
 msgstr ""
 
-#: popthelp.c:94
+#: popthelp.c:99
 msgid "VAL"
 msgstr ""
 
-#: popthelp.c:95
+#: popthelp.c:100
 msgid "INT"
 msgstr ""
 
-#: popthelp.c:96
+#: popthelp.c:101
 msgid "LONG"
 msgstr ""
 
-#: popthelp.c:97
+#: popthelp.c:102
 msgid "STRING"
 msgstr ""
 
-#: popthelp.c:98
+#: popthelp.c:103
 msgid "FLOAT"
 msgstr ""
 
-#: popthelp.c:99
+#: popthelp.c:104
 msgid "DOUBLE"
 msgstr ""
 
-#: popthelp.c:100
+#: popthelp.c:105
 msgid "ARG"
 msgstr ""
 
-#: popthelp.c:445
+#: popthelp.c:454
 msgid "Usage:"
 msgstr ""
 
-#: popthelp.c:467
+#: popthelp.c:476
 msgid "[OPTION...]"
 msgstr ""
diff --git a/po/sv.po b/po/sv.po
index 9f4e925..b5e150e 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.3\n"
-"POT-Creation-Date: 2001-10-13 13:15-0400\n"
+"POT-Creation-Date: 2001-10-14 23:13-0400\n"
 "PO-Revision-Date: 2001-07-12 22:26+0100\n"
 "Last-Translator: Christian Rose <menthos@menthos.com>\n"
 "Language-Team: Swedish <sv@li.org>\n"
@@ -13,99 +13,99 @@ msgstr ""
 msgid "unknown errno"
 msgstr "ok�nt felnummer"
 
-#: popt.c:892
+#: popt.c:900
 #, c-format
 msgid "option type (%d) not implemented in popt\n"
 msgstr "flaggtypen (%d) �r inte implementerad i popt\n"
 
-#: popt.c:1100
+#: popt.c:1111
 msgid "missing argument"
 msgstr "argument saknas"
 
-#: popt.c:1102
+#: popt.c:1113
 msgid "unknown option"
 msgstr "ok�nd flagga"
 
-#: popt.c:1104
+#: popt.c:1115
 msgid "mutually exclusive logical operations requested"
 msgstr "�msesidigt uteslutande logiska operationer beg�rdes"
 
-#: popt.c:1106
+#: popt.c:1117
 msgid "opt->arg should not be NULL"
 msgstr "opt->arg f�r inte vara NULL"
 
-#: popt.c:1108
+#: popt.c:1119
 msgid "aliases nested too deeply"
 msgstr "alias �r n�stlade f�r djupt"
 
-#: popt.c:1110
+#: popt.c:1121
 msgid "error in parameter quoting"
 msgstr "fel i parametercitering"
 
-#: popt.c:1112
+#: popt.c:1123
 msgid "invalid numeric value"
 msgstr "ogiltigt numeriskt v�rde"
 
-#: popt.c:1114
+#: popt.c:1125
 msgid "number too large or too small"
 msgstr "talet f�r stort eller f�r litet"
 
-#: popt.c:1116
+#: popt.c:1127
 msgid "memory allocation failed"
 msgstr "minnesallokering misslyckades"
 
-#: popt.c:1120
+#: popt.c:1131
 msgid "unknown error"
 msgstr "ok�nt fel"
 
-#: popthelp.c:47
+#: popthelp.c:52
 msgid "Show this help message"
 msgstr "Visa denna hj�lptext"
 
-#: popthelp.c:48
+#: popthelp.c:53
 msgid "Display brief usage message"
 msgstr "Visa en kortfattad anv�ndningstext"
 
-#: popthelp.c:51
+#: popthelp.c:56
 msgid "Display option defaults in message"
 msgstr "Visa standardalternativ f�r flaggor i meddelande"
 
-#: popthelp.c:93
+#: popthelp.c:98
 msgid "NONE"
 msgstr "INGET"
 
-#: popthelp.c:94
+#: popthelp.c:99
 msgid "VAL"
 msgstr "V�RDE"
 
-#: popthelp.c:95
+#: popthelp.c:100
 msgid "INT"
 msgstr "HELTAL"
 
-#: popthelp.c:96
+#: popthelp.c:101
 msgid "LONG"
 msgstr "L�NG"
 
-#: popthelp.c:97
+#: popthelp.c:102
 msgid "STRING"
 msgstr "STR�NG"
 
-#: popthelp.c:98
+#: popthelp.c:103
 msgid "FLOAT"
 msgstr "FLYTTAL"
 
-#: popthelp.c:99
+#: popthelp.c:104
 msgid "DOUBLE"
 msgstr "DUBBEL"
 
-#: popthelp.c:100
+#: popthelp.c:105
 msgid "ARG"
 msgstr "ARG"
 
-#: popthelp.c:445
+#: popthelp.c:454
 msgid "Usage:"
 msgstr "Anv�ndning:"
 
-#: popthelp.c:467
+#: popthelp.c:476
 msgid "[OPTION...]"
 msgstr "[FLAGGA...]"
diff --git a/po/tr.po b/po/tr.po
index 4bdd96a..bdab0f6 100644
--- a/po/tr.po
+++ b/po/tr.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.3\n"
-"POT-Creation-Date: 2001-10-13 13:15-0400\n"
+"POT-Creation-Date: 2001-10-14 23:13-0400\n"
 "PO-Revision-Date: 2000-02-11 13:01+0200\n"
 "Last-Translator: Nilgun Belma Buguner <nilgun@technologist.com>\n"
 "Language-Team: Turkish <tr@li.org>\n"
@@ -13,100 +13,100 @@ msgstr ""
 msgid "unknown errno"
 msgstr "bilinmeyen hata no"
 
-#: popt.c:892
+#: popt.c:900
 #, c-format
 msgid "option type (%d) not implemented in popt\n"
 msgstr "se�enek t�r� (%d) popt i�in ge�ersiz\n"
 
-#: popt.c:1100
+#: popt.c:1111
 msgid "missing argument"
 msgstr "arg�man eksik"
 
-#: popt.c:1102
+#: popt.c:1113
 msgid "unknown option"
 msgstr "bilinmeyen se�enek"
 
-#: popt.c:1104
+#: popt.c:1115
 msgid "mutually exclusive logical operations requested"
 msgstr "birbirini d��layan mant�ksal i�lemler istendi"
 
-#: popt.c:1106
+#: popt.c:1117
 msgid "opt->arg should not be NULL"
 msgstr ""
 
-#: popt.c:1108
+#: popt.c:1119
 msgid "aliases nested too deeply"
 msgstr "adlarda �ok fazla i�i�elikler"
 
-#: popt.c:1110
+#: popt.c:1121
 msgid "error in parameter quoting"
 msgstr "parametrelerde t�rnak i�aretleme hatal� "
 
-#: popt.c:1112
+#: popt.c:1123
 msgid "invalid numeric value"
 msgstr "say�sal de�er ge�ersiz"
 
-#: popt.c:1114
+#: popt.c:1125
 msgid "number too large or too small"
 msgstr "say� ya �ok b�y�k ya da �ok k���k"
 
-#: popt.c:1116
+#: popt.c:1127
 msgid "memory allocation failed"
 msgstr ""
 
-#: popt.c:1120
+#: popt.c:1131
 msgid "unknown error"
 msgstr "bilinmeyen hata"
 
-#: popthelp.c:47
+#: popthelp.c:52
 msgid "Show this help message"
 msgstr "Bu yard�m iletisini g�sterir"
 
-#: popthelp.c:48
+#: popthelp.c:53
 msgid "Display brief usage message"
 msgstr "K�sa bir kullan�m iletisi g�ster"
 
-#: popthelp.c:51
+#: popthelp.c:56
 #, fuzzy
 msgid "Display option defaults in message"
 msgstr "K�sa bir kullan�m iletisi g�ster"
 
-#: popthelp.c:93
+#: popthelp.c:98
 msgid "NONE"
 msgstr "YOK"
 
-#: popthelp.c:94
+#: popthelp.c:99
 msgid "VAL"
 msgstr "DE�"
 
-#: popthelp.c:95
+#: popthelp.c:100
 msgid "INT"
 msgstr "INT"
 
-#: popthelp.c:96
+#: popthelp.c:101
 msgid "LONG"
 msgstr "LONG"
 
-#: popthelp.c:97
+#: popthelp.c:102
 msgid "STRING"
 msgstr "STRING"
 
-#: popthelp.c:98
+#: popthelp.c:103
 msgid "FLOAT"
 msgstr "FLOAT"
 
-#: popthelp.c:99
+#: popthelp.c:104
 msgid "DOUBLE"
 msgstr "DOUBLE"
 
-#: popthelp.c:100
+#: popthelp.c:105
 msgid "ARG"
 msgstr "ARG"
 
-#: popthelp.c:445
+#: popthelp.c:454
 msgid "Usage:"
 msgstr "Kullan�m�:"
 
-#: popthelp.c:467
+#: popthelp.c:476
 msgid "[OPTION...]"
 msgstr "[SE�ENEK...]"
diff --git a/po/uk.po b/po/uk.po
index 5018318..54fdc98 100644
--- a/po/uk.po
+++ b/po/uk.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.3\n"
-"POT-Creation-Date: 2001-10-13 13:15-0400\n"
+"POT-Creation-Date: 2001-10-14 23:13-0400\n"
 "PO-Revision-Date: 1999-09-30 16:54+0200\n"
 "Last-Translator: Yuri Syrota <rasta@renome.rovno.ua>\n"
 "Language-Team: Ukrainian <uk@li.org>\n"
@@ -17,100 +17,100 @@ msgstr ""
 msgid "unknown errno"
 msgstr ""
 
-#: popt.c:892
+#: popt.c:900
 #, c-format
 msgid "option type (%d) not implemented in popt\n"
 msgstr ""
 
-#: popt.c:1100
+#: popt.c:1111
 msgid "missing argument"
 msgstr ""
 
-#: popt.c:1102
+#: popt.c:1113
 msgid "unknown option"
 msgstr ""
 
-#: popt.c:1104
+#: popt.c:1115
 msgid "mutually exclusive logical operations requested"
 msgstr ""
 
-#: popt.c:1106
+#: popt.c:1117
 msgid "opt->arg should not be NULL"
 msgstr ""
 
-#: popt.c:1108
+#: popt.c:1119
 msgid "aliases nested too deeply"
 msgstr ""
 
-#: popt.c:1110
+#: popt.c:1121
 msgid "error in parameter quoting"
 msgstr ""
 
-#: popt.c:1112
+#: popt.c:1123
 msgid "invalid numeric value"
 msgstr ""
 
-#: popt.c:1114
+#: popt.c:1125
 msgid "number too large or too small"
 msgstr ""
 
-#: popt.c:1116
+#: popt.c:1127
 msgid "memory allocation failed"
 msgstr ""
 
-#: popt.c:1120
+#: popt.c:1131
 msgid "unknown error"
 msgstr ""
 
-#: popthelp.c:47
+#: popthelp.c:52
 msgid "Show this help message"
 msgstr "�������� �� ��צ���"
 
-#: popthelp.c:48
+#: popthelp.c:53
 msgid "Display brief usage message"
 msgstr "�������� ������� ��צ��� ��� ������������"
 
-#: popthelp.c:51
+#: popthelp.c:56
 #, fuzzy
 msgid "Display option defaults in message"
 msgstr "�������� ������� ��צ��� ��� ������������"
 
-#: popthelp.c:93
+#: popthelp.c:98
 msgid "NONE"
 msgstr ""
 
-#: popthelp.c:94
+#: popthelp.c:99
 msgid "VAL"
 msgstr ""
 
-#: popthelp.c:95
+#: popthelp.c:100
 msgid "INT"
 msgstr ""
 
-#: popthelp.c:96
+#: popthelp.c:101
 msgid "LONG"
 msgstr ""
 
-#: popthelp.c:97
+#: popthelp.c:102
 msgid "STRING"
 msgstr ""
 
-#: popthelp.c:98
+#: popthelp.c:103
 msgid "FLOAT"
 msgstr ""
 
-#: popthelp.c:99
+#: popthelp.c:104
 msgid "DOUBLE"
 msgstr ""
 
-#: popthelp.c:100
+#: popthelp.c:105
 msgid "ARG"
 msgstr ""
 
-#: popthelp.c:445
+#: popthelp.c:454
 msgid "Usage:"
 msgstr ""
 
-#: popthelp.c:467
+#: popthelp.c:476
 msgid "[OPTION...]"
 msgstr ""
diff --git a/po/wa.po b/po/wa.po
index 1444d55..ac4f361 100644
--- a/po/wa.po
+++ b/po/wa.po
@@ -9,7 +9,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.3\n"
-"POT-Creation-Date: 2001-10-13 13:15-0400\n"
+"POT-Creation-Date: 2001-10-14 23:13-0400\n"
 "PO-Revision-Date: 1999-03-18 23:11+0100\n"
 "Last-Translator: Nobody yet\n"
 "Language-Team: walon <linux-wa@chanae.alphanet.ch>\n"
@@ -21,100 +21,100 @@ msgstr ""
 msgid "unknown errno"
 msgstr ""
 
-#: popt.c:892
+#: popt.c:900
 #, c-format
 msgid "option type (%d) not implemented in popt\n"
 msgstr ""
 
-#: popt.c:1100
+#: popt.c:1111
 msgid "missing argument"
 msgstr ""
 
-#: popt.c:1102
+#: popt.c:1113
 msgid "unknown option"
 msgstr ""
 
-#: popt.c:1104
+#: popt.c:1115
 msgid "mutually exclusive logical operations requested"
 msgstr ""
 
-#: popt.c:1106
+#: popt.c:1117
 msgid "opt->arg should not be NULL"
 msgstr ""
 
-#: popt.c:1108
+#: popt.c:1119
 msgid "aliases nested too deeply"
 msgstr ""
 
-#: popt.c:1110
+#: popt.c:1121
 msgid "error in parameter quoting"
 msgstr ""
 
-#: popt.c:1112
+#: popt.c:1123
 msgid "invalid numeric value"
 msgstr ""
 
-#: popt.c:1114
+#: popt.c:1125
 msgid "number too large or too small"
 msgstr ""
 
-#: popt.c:1116
+#: popt.c:1127
 msgid "memory allocation failed"
 msgstr ""
 
-#: popt.c:1120
+#: popt.c:1131
 msgid "unknown error"
 msgstr ""
 
-#: popthelp.c:47
+#: popthelp.c:52
 msgid "Show this help message"
 msgstr "Mostrer ci messaedje d' aide chal"
 
-#: popthelp.c:48
+#: popthelp.c:53
 msgid "Display brief usage message"
 msgstr "Mostre on court messaedje so kmint vos � siervi"
 
-#: popthelp.c:51
+#: popthelp.c:56
 #, fuzzy
 msgid "Display option defaults in message"
 msgstr "Mostre on court messaedje so kmint vos � siervi"
 
-#: popthelp.c:93
+#: popthelp.c:98
 msgid "NONE"
 msgstr ""
 
-#: popthelp.c:94
+#: popthelp.c:99
 msgid "VAL"
 msgstr ""
 
-#: popthelp.c:95
+#: popthelp.c:100
 msgid "INT"
 msgstr ""
 
-#: popthelp.c:96
+#: popthelp.c:101
 msgid "LONG"
 msgstr ""
 
-#: popthelp.c:97
+#: popthelp.c:102
 msgid "STRING"
 msgstr ""
 
-#: popthelp.c:98
+#: popthelp.c:103
 msgid "FLOAT"
 msgstr ""
 
-#: popthelp.c:99
+#: popthelp.c:104
 msgid "DOUBLE"
 msgstr ""
 
-#: popthelp.c:100
+#: popthelp.c:105
 msgid "ARG"
 msgstr ""
 
-#: popthelp.c:445
+#: popthelp.c:454
 msgid "Usage:"
 msgstr ""
 
-#: popthelp.c:467
+#: popthelp.c:476
 msgid "[OPTION...]"
 msgstr ""
diff --git a/po/zh.po b/po/zh.po
index 1d0703e..934225f 100644
--- a/po/zh.po
+++ b/po/zh.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.3\n"
-"POT-Creation-Date: 2001-10-13 13:15-0400\n"
+"POT-Creation-Date: 2001-10-14 23:13-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -18,99 +18,99 @@ msgstr ""
 msgid "unknown errno"
 msgstr ""
 
-#: popt.c:892
+#: popt.c:900
 #, c-format
 msgid "option type (%d) not implemented in popt\n"
 msgstr ""
 
-#: popt.c:1100
+#: popt.c:1111
 msgid "missing argument"
 msgstr ""
 
-#: popt.c:1102
+#: popt.c:1113
 msgid "unknown option"
 msgstr ""
 
-#: popt.c:1104
+#: popt.c:1115
 msgid "mutually exclusive logical operations requested"
 msgstr ""
 
-#: popt.c:1106
+#: popt.c:1117
 msgid "opt->arg should not be NULL"
 msgstr ""
 
-#: popt.c:1108
+#: popt.c:1119
 msgid "aliases nested too deeply"
 msgstr ""
 
-#: popt.c:1110
+#: popt.c:1121
 msgid "error in parameter quoting"
 msgstr ""
 
-#: popt.c:1112
+#: popt.c:1123
 msgid "invalid numeric value"
 msgstr ""
 
-#: popt.c:1114
+#: popt.c:1125
 msgid "number too large or too small"
 msgstr ""
 
-#: popt.c:1116
+#: popt.c:1127
 msgid "memory allocation failed"
 msgstr ""
 
-#: popt.c:1120
+#: popt.c:1131
 msgid "unknown error"
 msgstr ""
 
-#: popthelp.c:47
+#: popthelp.c:52
 msgid "Show this help message"
 msgstr ""
 
-#: popthelp.c:48
+#: popthelp.c:53
 msgid "Display brief usage message"
 msgstr ""
 
-#: popthelp.c:51
+#: popthelp.c:56
 msgid "Display option defaults in message"
 msgstr ""
 
-#: popthelp.c:93
+#: popthelp.c:98
 msgid "NONE"
 msgstr ""
 
-#: popthelp.c:94
+#: popthelp.c:99
 msgid "VAL"
 msgstr ""
 
-#: popthelp.c:95
+#: popthelp.c:100
 msgid "INT"
 msgstr ""
 
-#: popthelp.c:96
+#: popthelp.c:101
 msgid "LONG"
 msgstr ""
 
-#: popthelp.c:97
+#: popthelp.c:102
 msgid "STRING"
 msgstr ""
 
-#: popthelp.c:98
+#: popthelp.c:103
 msgid "FLOAT"
 msgstr ""
 
-#: popthelp.c:99
+#: popthelp.c:104
 msgid "DOUBLE"
 msgstr ""
 
-#: popthelp.c:100
+#: popthelp.c:105
 msgid "ARG"
 msgstr ""
 
-#: popthelp.c:445
+#: popthelp.c:454
 msgid "Usage:"
 msgstr ""
 
-#: popthelp.c:467
+#: popthelp.c:476
 msgid "[OPTION...]"
 msgstr ""
diff --git a/po/zh_CN.GB2312.po b/po/zh_CN.GB2312.po
index ccc1b1f..f1b64c1 100644
--- a/po/zh_CN.GB2312.po
+++ b/po/zh_CN.GB2312.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.3\n"
-"POT-Creation-Date: 2001-10-13 13:15-0400\n"
+"POT-Creation-Date: 2001-10-14 23:13-0400\n"
 "PO-Revision-Date: 1999-11-11 05:04+0800\n"
 "Last-Translator: Dillion Chen <dillon.chen@turbolinux.com.cn>\n"
 "Language-Team: TLDN\n"
@@ -13,100 +13,100 @@ msgstr ""
 msgid "unknown errno"
 msgstr ""
 
-#: popt.c:892
+#: popt.c:900
 #, c-format
 msgid "option type (%d) not implemented in popt\n"
 msgstr ""
 
-#: popt.c:1100
+#: popt.c:1111
 msgid "missing argument"
 msgstr ""
 
-#: popt.c:1102
+#: popt.c:1113
 msgid "unknown option"
 msgstr ""
 
-#: popt.c:1104
+#: popt.c:1115
 msgid "mutually exclusive logical operations requested"
 msgstr ""
 
-#: popt.c:1106
+#: popt.c:1117
 msgid "opt->arg should not be NULL"
 msgstr ""
 
-#: popt.c:1108
+#: popt.c:1119
 msgid "aliases nested too deeply"
 msgstr ""
 
-#: popt.c:1110
+#: popt.c:1121
 msgid "error in parameter quoting"
 msgstr ""
 
-#: popt.c:1112
+#: popt.c:1123
 msgid "invalid numeric value"
 msgstr ""
 
-#: popt.c:1114
+#: popt.c:1125
 msgid "number too large or too small"
 msgstr ""
 
-#: popt.c:1116
+#: popt.c:1127
 msgid "memory allocation failed"
 msgstr ""
 
-#: popt.c:1120
+#: popt.c:1131
 msgid "unknown error"
 msgstr ""
 
-#: popthelp.c:47
+#: popthelp.c:52
 msgid "Show this help message"
 msgstr "��ʾ����������Ϣ"
 
-#: popthelp.c:48
+#: popthelp.c:53
 msgid "Display brief usage message"
 msgstr "��ʾ���ʹ����Ϣ"
 
-#: popthelp.c:51
+#: popthelp.c:56
 #, fuzzy
 msgid "Display option defaults in message"
 msgstr "��ʾ���ʹ����Ϣ"
 
-#: popthelp.c:93
+#: popthelp.c:98
 msgid "NONE"
 msgstr ""
 
-#: popthelp.c:94
+#: popthelp.c:99
 msgid "VAL"
 msgstr ""
 
-#: popthelp.c:95
+#: popthelp.c:100
 msgid "INT"
 msgstr ""
 
-#: popthelp.c:96
+#: popthelp.c:101
 msgid "LONG"
 msgstr ""
 
-#: popthelp.c:97
+#: popthelp.c:102
 msgid "STRING"
 msgstr ""
 
-#: popthelp.c:98
+#: popthelp.c:103
 msgid "FLOAT"
 msgstr ""
 
-#: popthelp.c:99
+#: popthelp.c:104
 msgid "DOUBLE"
 msgstr ""
 
-#: popthelp.c:100
+#: popthelp.c:105
 msgid "ARG"
 msgstr ""
 
-#: popthelp.c:445
+#: popthelp.c:454
 msgid "Usage:"
 msgstr ""
 
-#: popthelp.c:467
+#: popthelp.c:476
 msgid "[OPTION...]"
 msgstr ""
diff --git a/popt.c b/popt.c
index e90b08f..508c304 100644
--- a/popt.c
+++ b/popt.c
@@ -179,7 +179,9 @@ poptContext poptGetContext(const char * name, int argc, const char ** argv,
 	if (t) con->appName = strcpy(t, name);
     }
 
+    /*@-internalglobs@*/
     invokeCallbacksPRE(con, con->options);
+    /*@=internalglobs@*/
 
     return con;
 }
@@ -661,7 +663,9 @@ int poptGetNextOpt(poptContext con)
 	    cleanOSE(con->os--);
 	}
 	if (!con->os->nextCharArg && con->os->next == con->os->argc) {
+	    /*@-internalglobs@*/
 	    invokeCallbacksPOST(con, con->options);
+	    /*@=internalglobs@*/
 	    if (con->doExec) return execCommand(con);
 	    return -1;
 	}
@@ -901,9 +905,11 @@ int poptGetNextOpt(poptContext con)
 	    }
 	}
 
-	if (cb)
+	if (cb) {
+	    /*@-internalglobs@*/
 	    invokeCallbacksOPTION(con, con->options, opt, cbData, shorty);
-	else if (opt->val && ((opt->argInfo & POPT_ARG_MASK) != POPT_ARG_VAL))
+	    /*@=internalglobs@*/
+	} else if (opt->val && ((opt->argInfo & POPT_ARG_MASK) != POPT_ARG_VAL))
 	    done = 1;
 
 	if ((con->finalArgvCount + 2) >= (con->finalArgvAlloced)) {
diff --git a/popt.h b/popt.h
index cf61498..436f9f4 100644
--- a/popt.h
+++ b/popt.h
@@ -152,6 +152,7 @@ typedef struct poptItem_s {
 /**
  * Empty table marker to enable displaying popt alias/exec options.
  */
+/*@observer@*/ /*@checked@*/
 extern struct poptOption poptAliasOptions[];
 #define POPT_AUTOALIAS { NULL, '\0', POPT_ARG_INCLUDE_TABLE, poptAliasOptions, \
 			0, "Options implemented via popt alias/exec:", NULL },
@@ -159,6 +160,7 @@ extern struct poptOption poptAliasOptions[];
 /**
  * Auto help table options.
  */
+/*@observer@*/ /*@checked@*/
 extern struct poptOption poptHelpOptions[];
 #define POPT_AUTOHELP { NULL, '\0', POPT_ARG_INCLUDE_TABLE, poptHelpOptions, \
 			0, "Help options:", NULL },
@@ -226,6 +228,7 @@ void poptResetContext(/*@null@*/poptContext con)
  * @return		next option val, -1 on last item, POPT_ERROR_* on error
  */
 int poptGetNextOpt(/*@null@*/poptContext con)
+	/*@globals fileSystem@*/
 	/*@modifies con, fileSystem @*/;
 
 /*@-redecl@*/
@@ -317,6 +320,7 @@ int poptAddItem(poptContext con, poptItem newItem, int flags)
  * @return		0 on success, POPT_ERROR_ERRNO on failure
  */
 int poptReadConfigFile(poptContext con, const char * fn)
+	/*@globals fileSystem@*/
 	/*@modifies fileSystem,
 		con->execs, con->numExecs @*/;
 
@@ -327,6 +331,7 @@ int poptReadConfigFile(poptContext con, const char * fn)
  * @return		0 on success, POPT_ERROR_ERRNO on failure
  */
 int poptReadDefaultConfig(poptContext con, /*@unused@*/ int useEnv)
+	/*@globals fileSystem@*/
 	/*@modifies fileSystem,
 		con->execs, con->numExecs @*/;
 
@@ -387,6 +392,7 @@ void poptSetExecPath(poptContext con, const char * path, int allowAbsolute)
  * @param flags		(unused)
  */
 void poptPrintHelp(poptContext con, FILE * fp, /*@unused@*/ int flags)
+	/*@globals fileSystem @*/
 	/*@modifies *fp, fileSystem @*/;
 
 /** \ingroup popt
@@ -396,6 +402,7 @@ void poptPrintHelp(poptContext con, FILE * fp, /*@unused@*/ int flags)
  * @param flags		(unused)
  */
 void poptPrintUsage(poptContext con, FILE * fp, /*@unused@*/ int flags)
+	/*@globals fileSystem @*/
 	/*@modifies *fp, fileSystem @*/;
 
 /** \ingroup popt
diff --git a/popthelp.c b/popthelp.c
index 1dbe590..7e22354 100644
--- a/popthelp.c
+++ b/popthelp.c
@@ -19,6 +19,8 @@ static void displayArgs(poptContext con,
 		/*@unused@*/ enum poptCallbackReason foo,
 		struct poptOption * key, 
 		/*@unused@*/ const char * arg, /*@unused@*/ void * data)
+	/*@globals fileSystem@*/
+	/*@modifies fileSystem@*/
 {
     if (key->shortName == '?')
 	poptPrintHelp(con, stdout, 0);
@@ -28,12 +30,14 @@ static void displayArgs(poptContext con,
 }
 
 #ifdef	NOTYET
+/*@unchecked@*/
 static int show_option_defaults = 0;
 #endif
 
 /**
  * Empty table marker to enable displaying popt alias/exec options.
  */
+/*@observer@*/ /*@unchecked@*/
 struct poptOption poptAliasOptions[] = {
     POPT_TABLEEND
 };
@@ -42,6 +46,7 @@ struct poptOption poptAliasOptions[] = {
  * Auto help table options.
  */
 /*@-castfcnptr@*/
+/*@observer@*/ /*@unchecked@*/
 struct poptOption poptHelpOptions[] = {
   { NULL, '\0', POPT_ARG_CALLBACK, (void *)&displayArgs, '\0', NULL, NULL },
   { "help", '?', 0, NULL, '?', N_("Show this help message"), NULL },
@@ -176,6 +181,7 @@ singleOptionDefaultValue(int lineLength,
 static void singleOptionHelp(FILE * fp, int maxLeftCol, 
 		const struct poptOption * opt,
 		/*@null@*/ const char * translation_domain)
+	/*@globals fileSystem @*/
 	/*@modifies *fp, fileSystem @*/
 {
     int indentLength = maxLeftCol + 5;
@@ -376,6 +382,7 @@ static int maxArgWidth(const struct poptOption * opt,
 static void itemHelp(FILE * fp,
 		/*@null@*/ poptItem items, int nitems, int left,
 		/*@null@*/ const char * translation_domain)
+	/*@globals fileSystem @*/
 	/*@modifies *fp, fileSystem @*/
 {
     poptItem item;
@@ -399,6 +406,7 @@ static void itemHelp(FILE * fp,
 static void singleTableHelp(poptContext con, FILE * fp,
 		/*@null@*/ const struct poptOption * table, int left,
 		/*@null@*/ const char * translation_domain)
+	/*@globals fileSystem @*/
 	/*@modifies *fp, fileSystem @*/
 {
     const struct poptOption * opt;
@@ -437,6 +445,7 @@ static void singleTableHelp(poptContext con, FILE * fp,
  * @param fp		output file handle
  */
 static int showHelpIntro(poptContext con, FILE * fp)
+	/*@globals fileSystem @*/
 	/*@modifies *fp, fileSystem @*/
 {
     int len = 6;
@@ -478,6 +487,7 @@ void poptPrintHelp(poptContext con, FILE * fp, /*@unused@*/ int flags)
 static int singleOptionUsage(FILE * fp, int cursor, 
 		const struct poptOption * opt,
 		/*@null@*/ const char *translation_domain)
+	/*@globals fileSystem @*/
 	/*@modifies *fp, fileSystem @*/
 {
     int len = 3;
@@ -524,6 +534,7 @@ static int singleOptionUsage(FILE * fp, int cursor,
  */
 static int itemUsage(FILE * fp, int cursor, poptItem item, int nitems,
 		/*@null@*/ const char * translation_domain)
+	/*@globals fileSystem @*/
 	/*@modifies *fp, fileSystem @*/
 {
     int i;
@@ -553,6 +564,7 @@ static int itemUsage(FILE * fp, int cursor, poptItem item, int nitems,
 static int singleTableUsage(poptContext con, FILE * fp,
 		int cursor, const struct poptOption * opt,
 		/*@null@*/ const char * translation_domain)
+	/*@globals fileSystem @*/
 	/*@modifies *fp, fileSystem @*/
 {
     /*@-branchstate@*/		/* FIX: W2DO? */
@@ -583,6 +595,7 @@ static int singleTableUsage(poptContext con, FILE * fp,
  */
 static int showShortOptions(const struct poptOption * opt, FILE * fp,
 		/*@null@*/ char * str)
+	/*@globals fileSystem @*/
 	/*@modifies *str, *fp, fileSystem @*/
 {
     char * s = alloca(300);	/* larger then the ascii set */
-- 
Gitee


From ad8d86b43c36f605c4f9224879456567af1e3f6c Mon Sep 17 00:00:00 2001
From: Jeff Johnson <n3npq@mac.com>
Date: Mon, 15 Oct 2001 17:54:07 +0000
Subject: [PATCH 324/667] Explicit branchstate annotations.

---
 findme.h           |  2 +-
 po/cs.po           | 28 ++++++++++++++--------------
 po/da.po           | 28 ++++++++++++++--------------
 po/de.po           | 28 ++++++++++++++--------------
 po/es.po           | 28 ++++++++++++++--------------
 po/eu_ES.po        | 28 ++++++++++++++--------------
 po/fi.po           | 28 ++++++++++++++--------------
 po/fr.po           | 28 ++++++++++++++--------------
 po/gl.po           | 28 ++++++++++++++--------------
 po/hu.po           | 28 ++++++++++++++--------------
 po/id.po           | 28 ++++++++++++++--------------
 po/is.po           | 28 ++++++++++++++--------------
 po/it.po           | 28 ++++++++++++++--------------
 po/ja.po           | 28 ++++++++++++++--------------
 po/ko.po           | 28 ++++++++++++++--------------
 po/no.po           | 28 ++++++++++++++--------------
 po/pl.po           | 28 ++++++++++++++--------------
 po/popt.pot        | 28 ++++++++++++++--------------
 po/pt.po           | 28 ++++++++++++++--------------
 po/pt_BR.po        | 28 ++++++++++++++--------------
 po/ro.po           | 28 ++++++++++++++--------------
 po/ru.po           | 28 ++++++++++++++--------------
 po/sk.po           | 28 ++++++++++++++--------------
 po/sl.po           | 28 ++++++++++++++--------------
 po/sr.po           | 28 ++++++++++++++--------------
 po/sv.po           | 28 ++++++++++++++--------------
 po/tr.po           | 28 ++++++++++++++--------------
 po/uk.po           | 28 ++++++++++++++--------------
 po/wa.po           | 28 ++++++++++++++--------------
 po/zh.po           | 28 ++++++++++++++--------------
 po/zh_CN.GB2312.po | 28 ++++++++++++++--------------
 popt.c             | 15 +++++++++------
 popthelp.c         |  2 ++
 33 files changed, 432 insertions(+), 427 deletions(-)

diff --git a/findme.h b/findme.h
index bb54ec7..a016b86 100644
--- a/findme.h
+++ b/findme.h
@@ -15,6 +15,6 @@
  * @return		(malloc'd) absolute path to executable (or NULL)
  */
 /*@null@*/ const char * findProgramPath(/*@null@*/ const char * argv0)
-	/*@modifies fileSystem @*/;
+	/*@*/;
 
 #endif
diff --git a/po/cs.po b/po/cs.po
index 220e90e..82d1ee8 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.3\n"
-"POT-Creation-Date: 2001-10-14 23:13-0400\n"
+"POT-Creation-Date: 2001-10-15 13:39-0400\n"
 "PO-Revision-Date: 2001-07-24 00:03+0100\n"
 "Last-Translator: Milan Kerslager <kerslage@linux.cz>\n"
 "Language-Team: Czech <cs@li.org>\n"
@@ -13,48 +13,48 @@ msgstr ""
 msgid "unknown errno"
 msgstr "nezn�m� ��slo chyby"
 
-#: popt.c:900
+#: popt.c:903
 #, c-format
 msgid "option type (%d) not implemented in popt\n"
 msgstr "volba (%d) nen� v popt implementov�na\n"
 
-#: popt.c:1111
+#: popt.c:1114
 msgid "missing argument"
 msgstr "chyb� argument"
 
-#: popt.c:1113
+#: popt.c:1116
 msgid "unknown option"
 msgstr "nezn�m� volba"
 
-#: popt.c:1115
+#: popt.c:1118
 msgid "mutually exclusive logical operations requested"
 msgstr "po�adov�ny vz�jemn� v�lu�n� logick� operace"
 
-#: popt.c:1117
+#: popt.c:1120
 msgid "opt->arg should not be NULL"
 msgstr "opt->arg nesm� b�t NULL"
 
-#: popt.c:1119
+#: popt.c:1122
 msgid "aliases nested too deeply"
 msgstr "aliasy vno�en� p��li� hluboko"
 
-#: popt.c:1121
+#: popt.c:1124
 msgid "error in parameter quoting"
 msgstr "chyba v quotov�n� parametr�"
 
-#: popt.c:1123
+#: popt.c:1126
 msgid "invalid numeric value"
 msgstr "chybn� numerick� hodnota"
 
-#: popt.c:1125
+#: popt.c:1128
 msgid "number too large or too small"
 msgstr "��slo je p��li� velk� nebo p��li� mal�"
 
-#: popt.c:1127
+#: popt.c:1130
 msgid "memory allocation failed"
 msgstr "selhala alokace pam�ti"
 
-#: popt.c:1131
+#: popt.c:1134
 msgid "unknown error"
 msgstr "nezn�m� chyba"
 
@@ -102,10 +102,10 @@ msgstr "DOUBLE"
 msgid "ARG"
 msgstr "ARG"
 
-#: popthelp.c:454
+#: popthelp.c:456
 msgid "Usage:"
 msgstr "Pou�it�:"
 
-#: popthelp.c:476
+#: popthelp.c:478
 msgid "[OPTION...]"
 msgstr "[VOLBY...]"
diff --git a/po/da.po b/po/da.po
index d82df53..0c0abd1 100644
--- a/po/da.po
+++ b/po/da.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.3\n"
-"POT-Creation-Date: 2001-10-14 23:13-0400\n"
+"POT-Creation-Date: 2001-10-15 13:39-0400\n"
 "PO-Revision-Date: Sun Jan 21 2001 04:30:32+0200\n"
 "Last-Translator: Martin Hansen <mah@k64.dk>\n"
 "Language-Team: Dansk <dansk@klid.dk>\n"
@@ -14,48 +14,48 @@ msgstr ""
 msgid "unknown errno"
 msgstr "ukendt fejlnr."
 
-#: popt.c:900
+#: popt.c:903
 #, c-format
 msgid "option type (%d) not implemented in popt\n"
 msgstr "tilvalgstype (%d) er ikke implementeret i popt\n"
 
-#: popt.c:1111
+#: popt.c:1114
 msgid "missing argument"
 msgstr "mangler argument"
 
-#: popt.c:1113
+#: popt.c:1116
 msgid "unknown option"
 msgstr "ukendt tilvalg"
 
-#: popt.c:1115
+#: popt.c:1118
 msgid "mutually exclusive logical operations requested"
 msgstr "de �nskede handlinger udelukker hinanden"
 
-#: popt.c:1117
+#: popt.c:1120
 msgid "opt->arg should not be NULL"
 msgstr ""
 
-#: popt.c:1119
+#: popt.c:1122
 msgid "aliases nested too deeply"
 msgstr "aliaser er for dybt indlejret"
 
-#: popt.c:1121
+#: popt.c:1124
 msgid "error in parameter quoting"
 msgstr "fejl i parameter citering"
 
-#: popt.c:1123
+#: popt.c:1126
 msgid "invalid numeric value"
 msgstr "ugyldig numerisk v�rdi"
 
-#: popt.c:1125
+#: popt.c:1128
 msgid "number too large or too small"
 msgstr "nummer for stort, eller for lille"
 
-#: popt.c:1127
+#: popt.c:1130
 msgid "memory allocation failed"
 msgstr ""
 
-#: popt.c:1131
+#: popt.c:1134
 msgid "unknown error"
 msgstr "ukendt fejl"
 
@@ -104,10 +104,10 @@ msgstr "DOUBLE"
 msgid "ARG"
 msgstr "ARG"
 
-#: popthelp.c:454
+#: popthelp.c:456
 msgid "Usage:"
 msgstr "Brug:"
 
-#: popthelp.c:476
+#: popthelp.c:478
 msgid "[OPTION...]"
 msgstr "[TILVALG...]"
diff --git a/po/de.po b/po/de.po
index 934225f..83e97b1 100644
--- a/po/de.po
+++ b/po/de.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.3\n"
-"POT-Creation-Date: 2001-10-14 23:13-0400\n"
+"POT-Creation-Date: 2001-10-15 13:39-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -18,48 +18,48 @@ msgstr ""
 msgid "unknown errno"
 msgstr ""
 
-#: popt.c:900
+#: popt.c:903
 #, c-format
 msgid "option type (%d) not implemented in popt\n"
 msgstr ""
 
-#: popt.c:1111
+#: popt.c:1114
 msgid "missing argument"
 msgstr ""
 
-#: popt.c:1113
+#: popt.c:1116
 msgid "unknown option"
 msgstr ""
 
-#: popt.c:1115
+#: popt.c:1118
 msgid "mutually exclusive logical operations requested"
 msgstr ""
 
-#: popt.c:1117
+#: popt.c:1120
 msgid "opt->arg should not be NULL"
 msgstr ""
 
-#: popt.c:1119
+#: popt.c:1122
 msgid "aliases nested too deeply"
 msgstr ""
 
-#: popt.c:1121
+#: popt.c:1124
 msgid "error in parameter quoting"
 msgstr ""
 
-#: popt.c:1123
+#: popt.c:1126
 msgid "invalid numeric value"
 msgstr ""
 
-#: popt.c:1125
+#: popt.c:1128
 msgid "number too large or too small"
 msgstr ""
 
-#: popt.c:1127
+#: popt.c:1130
 msgid "memory allocation failed"
 msgstr ""
 
-#: popt.c:1131
+#: popt.c:1134
 msgid "unknown error"
 msgstr ""
 
@@ -107,10 +107,10 @@ msgstr ""
 msgid "ARG"
 msgstr ""
 
-#: popthelp.c:454
+#: popthelp.c:456
 msgid "Usage:"
 msgstr ""
 
-#: popthelp.c:476
+#: popthelp.c:478
 msgid "[OPTION...]"
 msgstr ""
diff --git a/po/es.po b/po/es.po
index f152443..5de427b 100644
--- a/po/es.po
+++ b/po/es.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.3\n"
-"POT-Creation-Date: 2001-10-14 23:13-0400\n"
+"POT-Creation-Date: 2001-10-15 13:39-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Leandro Lucarella <luca@linuxmendoza.org.ar>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -18,48 +18,48 @@ msgstr ""
 msgid "unknown errno"
 msgstr "errno desconocido"
 
-#: popt.c:900
+#: popt.c:903
 #, c-format
 msgid "option type (%d) not implemented in popt\n"
 msgstr "tipo de opci�n (%d) no implementada en popt\n"
 
-#: popt.c:1111
+#: popt.c:1114
 msgid "missing argument"
 msgstr "falta argumento"
 
-#: popt.c:1113
+#: popt.c:1116
 msgid "unknown option"
 msgstr "opci�n desconocida"
 
-#: popt.c:1115
+#: popt.c:1118
 msgid "mutually exclusive logical operations requested"
 msgstr "requerida operaci�n l�gica mutuamente exclusiva"
 
-#: popt.c:1117
+#: popt.c:1120
 msgid "opt->arg should not be NULL"
 msgstr ""
 
-#: popt.c:1119
+#: popt.c:1122
 msgid "aliases nested too deeply"
 msgstr "alias anidados muy profundamente"
 
-#: popt.c:1121
+#: popt.c:1124
 msgid "error in parameter quoting"
 msgstr "error en cita de par�metros"
 
-#: popt.c:1123
+#: popt.c:1126
 msgid "invalid numeric value"
 msgstr "valor num�rico inv�lido"
 
-#: popt.c:1125
+#: popt.c:1128
 msgid "number too large or too small"
 msgstr "n�mero muy largo o muy peque�o"
 
-#: popt.c:1127
+#: popt.c:1130
 msgid "memory allocation failed"
 msgstr ""
 
-#: popt.c:1131
+#: popt.c:1134
 msgid "unknown error"
 msgstr "error desconocido"
 
@@ -108,10 +108,10 @@ msgstr "DOUBLE"
 msgid "ARG"
 msgstr "ARG"
 
-#: popthelp.c:454
+#: popthelp.c:456
 msgid "Usage:"
 msgstr "Modo de Uso:"
 
-#: popthelp.c:476
+#: popthelp.c:478
 msgid "[OPTION...]"
 msgstr "[OPCI�N...]"
diff --git a/po/eu_ES.po b/po/eu_ES.po
index 934225f..83e97b1 100644
--- a/po/eu_ES.po
+++ b/po/eu_ES.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.3\n"
-"POT-Creation-Date: 2001-10-14 23:13-0400\n"
+"POT-Creation-Date: 2001-10-15 13:39-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -18,48 +18,48 @@ msgstr ""
 msgid "unknown errno"
 msgstr ""
 
-#: popt.c:900
+#: popt.c:903
 #, c-format
 msgid "option type (%d) not implemented in popt\n"
 msgstr ""
 
-#: popt.c:1111
+#: popt.c:1114
 msgid "missing argument"
 msgstr ""
 
-#: popt.c:1113
+#: popt.c:1116
 msgid "unknown option"
 msgstr ""
 
-#: popt.c:1115
+#: popt.c:1118
 msgid "mutually exclusive logical operations requested"
 msgstr ""
 
-#: popt.c:1117
+#: popt.c:1120
 msgid "opt->arg should not be NULL"
 msgstr ""
 
-#: popt.c:1119
+#: popt.c:1122
 msgid "aliases nested too deeply"
 msgstr ""
 
-#: popt.c:1121
+#: popt.c:1124
 msgid "error in parameter quoting"
 msgstr ""
 
-#: popt.c:1123
+#: popt.c:1126
 msgid "invalid numeric value"
 msgstr ""
 
-#: popt.c:1125
+#: popt.c:1128
 msgid "number too large or too small"
 msgstr ""
 
-#: popt.c:1127
+#: popt.c:1130
 msgid "memory allocation failed"
 msgstr ""
 
-#: popt.c:1131
+#: popt.c:1134
 msgid "unknown error"
 msgstr ""
 
@@ -107,10 +107,10 @@ msgstr ""
 msgid "ARG"
 msgstr ""
 
-#: popthelp.c:454
+#: popthelp.c:456
 msgid "Usage:"
 msgstr ""
 
-#: popthelp.c:476
+#: popthelp.c:478
 msgid "[OPTION...]"
 msgstr ""
diff --git a/po/fi.po b/po/fi.po
index 934225f..83e97b1 100644
--- a/po/fi.po
+++ b/po/fi.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.3\n"
-"POT-Creation-Date: 2001-10-14 23:13-0400\n"
+"POT-Creation-Date: 2001-10-15 13:39-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -18,48 +18,48 @@ msgstr ""
 msgid "unknown errno"
 msgstr ""
 
-#: popt.c:900
+#: popt.c:903
 #, c-format
 msgid "option type (%d) not implemented in popt\n"
 msgstr ""
 
-#: popt.c:1111
+#: popt.c:1114
 msgid "missing argument"
 msgstr ""
 
-#: popt.c:1113
+#: popt.c:1116
 msgid "unknown option"
 msgstr ""
 
-#: popt.c:1115
+#: popt.c:1118
 msgid "mutually exclusive logical operations requested"
 msgstr ""
 
-#: popt.c:1117
+#: popt.c:1120
 msgid "opt->arg should not be NULL"
 msgstr ""
 
-#: popt.c:1119
+#: popt.c:1122
 msgid "aliases nested too deeply"
 msgstr ""
 
-#: popt.c:1121
+#: popt.c:1124
 msgid "error in parameter quoting"
 msgstr ""
 
-#: popt.c:1123
+#: popt.c:1126
 msgid "invalid numeric value"
 msgstr ""
 
-#: popt.c:1125
+#: popt.c:1128
 msgid "number too large or too small"
 msgstr ""
 
-#: popt.c:1127
+#: popt.c:1130
 msgid "memory allocation failed"
 msgstr ""
 
-#: popt.c:1131
+#: popt.c:1134
 msgid "unknown error"
 msgstr ""
 
@@ -107,10 +107,10 @@ msgstr ""
 msgid "ARG"
 msgstr ""
 
-#: popthelp.c:454
+#: popthelp.c:456
 msgid "Usage:"
 msgstr ""
 
-#: popthelp.c:476
+#: popthelp.c:478
 msgid "[OPTION...]"
 msgstr ""
diff --git a/po/fr.po b/po/fr.po
index 934225f..83e97b1 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.3\n"
-"POT-Creation-Date: 2001-10-14 23:13-0400\n"
+"POT-Creation-Date: 2001-10-15 13:39-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -18,48 +18,48 @@ msgstr ""
 msgid "unknown errno"
 msgstr ""
 
-#: popt.c:900
+#: popt.c:903
 #, c-format
 msgid "option type (%d) not implemented in popt\n"
 msgstr ""
 
-#: popt.c:1111
+#: popt.c:1114
 msgid "missing argument"
 msgstr ""
 
-#: popt.c:1113
+#: popt.c:1116
 msgid "unknown option"
 msgstr ""
 
-#: popt.c:1115
+#: popt.c:1118
 msgid "mutually exclusive logical operations requested"
 msgstr ""
 
-#: popt.c:1117
+#: popt.c:1120
 msgid "opt->arg should not be NULL"
 msgstr ""
 
-#: popt.c:1119
+#: popt.c:1122
 msgid "aliases nested too deeply"
 msgstr ""
 
-#: popt.c:1121
+#: popt.c:1124
 msgid "error in parameter quoting"
 msgstr ""
 
-#: popt.c:1123
+#: popt.c:1126
 msgid "invalid numeric value"
 msgstr ""
 
-#: popt.c:1125
+#: popt.c:1128
 msgid "number too large or too small"
 msgstr ""
 
-#: popt.c:1127
+#: popt.c:1130
 msgid "memory allocation failed"
 msgstr ""
 
-#: popt.c:1131
+#: popt.c:1134
 msgid "unknown error"
 msgstr ""
 
@@ -107,10 +107,10 @@ msgstr ""
 msgid "ARG"
 msgstr ""
 
-#: popthelp.c:454
+#: popthelp.c:456
 msgid "Usage:"
 msgstr ""
 
-#: popthelp.c:476
+#: popthelp.c:478
 msgid "[OPTION...]"
 msgstr ""
diff --git a/po/gl.po b/po/gl.po
index 8ccc20d..ffe1994 100644
--- a/po/gl.po
+++ b/po/gl.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.3\n"
-"POT-Creation-Date: 2001-10-14 23:13-0400\n"
+"POT-Creation-Date: 2001-10-15 13:39-0400\n"
 "PO-Revision-Date: 2001-01-17 01:01+0100\n"
 "Last-Translator: Jes�s Bravo �lvarez <jba@pobox.com>\n"
 "Language-Team: Galician <trasno@ceu.fi.udc.es>\n"
@@ -13,48 +13,48 @@ msgstr ""
 msgid "unknown errno"
 msgstr "errno desco�ecido"
 
-#: popt.c:900
+#: popt.c:903
 #, c-format
 msgid "option type (%d) not implemented in popt\n"
 msgstr "tipo de opci�n (%d) non implementada en popt\n"
 
-#: popt.c:1111
+#: popt.c:1114
 msgid "missing argument"
 msgstr "falta un argumento"
 
-#: popt.c:1113
+#: popt.c:1116
 msgid "unknown option"
 msgstr "opci�n desco�ecida"
 
-#: popt.c:1115
+#: popt.c:1118
 msgid "mutually exclusive logical operations requested"
 msgstr "solicit�ronse operaci�ns l�xicas mutuamente exclu�ntes"
 
-#: popt.c:1117
+#: popt.c:1120
 msgid "opt->arg should not be NULL"
 msgstr ""
 
-#: popt.c:1119
+#: popt.c:1122
 msgid "aliases nested too deeply"
 msgstr "aliases ani�ados a un nivel demasiado profundo"
 
-#: popt.c:1121
+#: popt.c:1124
 msgid "error in parameter quoting"
 msgstr "erro nas comi�as do par�metro"
 
-#: popt.c:1123
+#: popt.c:1126
 msgid "invalid numeric value"
 msgstr "valor num�rico non v�lido"
 
-#: popt.c:1125
+#: popt.c:1128
 msgid "number too large or too small"
 msgstr "n�mero demasiado grande ou pequeno"
 
-#: popt.c:1127
+#: popt.c:1130
 msgid "memory allocation failed"
 msgstr ""
 
-#: popt.c:1131
+#: popt.c:1134
 msgid "unknown error"
 msgstr "erro desco�ecido"
 
@@ -103,10 +103,10 @@ msgstr "DOUBLE"
 msgid "ARG"
 msgstr "ARG"
 
-#: popthelp.c:454
+#: popthelp.c:456
 msgid "Usage:"
 msgstr "Uso:"
 
-#: popthelp.c:476
+#: popthelp.c:478
 msgid "[OPTION...]"
 msgstr "[OPCI�N...]"
diff --git a/po/hu.po b/po/hu.po
index b6fe1be..3d8a185 100644
--- a/po/hu.po
+++ b/po/hu.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.3\n"
-"POT-Creation-Date: 2001-10-14 23:13-0400\n"
+"POT-Creation-Date: 2001-10-15 13:39-0400\n"
 "PO-Revision-Date: 2000-08-03 23:26+0200\n"
 "Last-Translator: L�szl� N�meth <nemeth@qwertynet.hu>\n"
 "Language-Team: Hungarian\n"
@@ -13,48 +13,48 @@ msgstr ""
 msgid "unknown errno"
 msgstr ""
 
-#: popt.c:900
+#: popt.c:903
 #, c-format
 msgid "option type (%d) not implemented in popt\n"
 msgstr ""
 
-#: popt.c:1111
+#: popt.c:1114
 msgid "missing argument"
 msgstr ""
 
-#: popt.c:1113
+#: popt.c:1116
 msgid "unknown option"
 msgstr ""
 
-#: popt.c:1115
+#: popt.c:1118
 msgid "mutually exclusive logical operations requested"
 msgstr ""
 
-#: popt.c:1117
+#: popt.c:1120
 msgid "opt->arg should not be NULL"
 msgstr ""
 
-#: popt.c:1119
+#: popt.c:1122
 msgid "aliases nested too deeply"
 msgstr ""
 
-#: popt.c:1121
+#: popt.c:1124
 msgid "error in parameter quoting"
 msgstr ""
 
-#: popt.c:1123
+#: popt.c:1126
 msgid "invalid numeric value"
 msgstr ""
 
-#: popt.c:1125
+#: popt.c:1128
 msgid "number too large or too small"
 msgstr ""
 
-#: popt.c:1127
+#: popt.c:1130
 msgid "memory allocation failed"
 msgstr ""
 
-#: popt.c:1131
+#: popt.c:1134
 msgid "unknown error"
 msgstr ""
 
@@ -103,10 +103,10 @@ msgstr ""
 msgid "ARG"
 msgstr ""
 
-#: popthelp.c:454
+#: popthelp.c:456
 msgid "Usage:"
 msgstr ""
 
-#: popthelp.c:476
+#: popthelp.c:478
 msgid "[OPTION...]"
 msgstr ""
diff --git a/po/id.po b/po/id.po
index 934225f..83e97b1 100644
--- a/po/id.po
+++ b/po/id.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.3\n"
-"POT-Creation-Date: 2001-10-14 23:13-0400\n"
+"POT-Creation-Date: 2001-10-15 13:39-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -18,48 +18,48 @@ msgstr ""
 msgid "unknown errno"
 msgstr ""
 
-#: popt.c:900
+#: popt.c:903
 #, c-format
 msgid "option type (%d) not implemented in popt\n"
 msgstr ""
 
-#: popt.c:1111
+#: popt.c:1114
 msgid "missing argument"
 msgstr ""
 
-#: popt.c:1113
+#: popt.c:1116
 msgid "unknown option"
 msgstr ""
 
-#: popt.c:1115
+#: popt.c:1118
 msgid "mutually exclusive logical operations requested"
 msgstr ""
 
-#: popt.c:1117
+#: popt.c:1120
 msgid "opt->arg should not be NULL"
 msgstr ""
 
-#: popt.c:1119
+#: popt.c:1122
 msgid "aliases nested too deeply"
 msgstr ""
 
-#: popt.c:1121
+#: popt.c:1124
 msgid "error in parameter quoting"
 msgstr ""
 
-#: popt.c:1123
+#: popt.c:1126
 msgid "invalid numeric value"
 msgstr ""
 
-#: popt.c:1125
+#: popt.c:1128
 msgid "number too large or too small"
 msgstr ""
 
-#: popt.c:1127
+#: popt.c:1130
 msgid "memory allocation failed"
 msgstr ""
 
-#: popt.c:1131
+#: popt.c:1134
 msgid "unknown error"
 msgstr ""
 
@@ -107,10 +107,10 @@ msgstr ""
 msgid "ARG"
 msgstr ""
 
-#: popthelp.c:454
+#: popthelp.c:456
 msgid "Usage:"
 msgstr ""
 
-#: popthelp.c:476
+#: popthelp.c:478
 msgid "[OPTION...]"
 msgstr ""
diff --git a/po/is.po b/po/is.po
index d1af005..ca0b75c 100644
--- a/po/is.po
+++ b/po/is.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.3\n"
-"POT-Creation-Date: 2001-10-14 23:13-0400\n"
+"POT-Creation-Date: 2001-10-15 13:39-0400\n"
 "PO-Revision-Date: 2001-06-08 01:35+0000\n"
 "Last-Translator: Richard Allen <ra@hp.is>\n"
 "Language-Team: is <kde-isl@mmedia.is>\n"
@@ -13,48 +13,48 @@ msgstr ""
 msgid "unknown errno"
 msgstr "��ekkt villun�mer"
 
-#: popt.c:900
+#: popt.c:903
 #, c-format
 msgid "option type (%d) not implemented in popt\n"
 msgstr "rofager�in (%d) er ekki studd � popt\n"
 
-#: popt.c:1111
+#: popt.c:1114
 msgid "missing argument"
 msgstr "vantar vi�fang"
 
-#: popt.c:1113
+#: popt.c:1116
 msgid "unknown option"
 msgstr "��ekktur rofi"
 
-#: popt.c:1115
+#: popt.c:1118
 msgid "mutually exclusive logical operations requested"
 msgstr "be�i� um rofa sem sl�kkva hvor � ��rum"
 
-#: popt.c:1117
+#: popt.c:1120
 msgid "opt->arg should not be NULL"
 msgstr "opt->arg �tti ekki a� vera NULL"
 
-#: popt.c:1119
+#: popt.c:1122
 msgid "aliases nested too deeply"
 msgstr "al�asar of fl�knir"
 
-#: popt.c:1121
+#: popt.c:1124
 msgid "error in parameter quoting"
 msgstr "villa � vi�f�ngum (g�salappir og svo frv.)"
 
-#: popt.c:1123
+#: popt.c:1126
 msgid "invalid numeric value"
 msgstr "�gilt t�lulegt gildi"
 
-#: popt.c:1125
+#: popt.c:1128
 msgid "number too large or too small"
 msgstr "talan of st�r e�a sm�"
 
-#: popt.c:1127
+#: popt.c:1130
 msgid "memory allocation failed"
 msgstr "ekki t�kst a� taka fr� minni"
 
-#: popt.c:1131
+#: popt.c:1134
 msgid "unknown error"
 msgstr "��ekkt villa"
 
@@ -102,10 +102,10 @@ msgstr "DOUBLE"
 msgid "ARG"
 msgstr "ARG"
 
-#: popthelp.c:454
+#: popthelp.c:456
 msgid "Usage:"
 msgstr "Notkun:"
 
-#: popthelp.c:476
+#: popthelp.c:478
 msgid "[OPTION...]"
 msgstr "[ROFI...]"
diff --git a/po/it.po b/po/it.po
index 934225f..83e97b1 100644
--- a/po/it.po
+++ b/po/it.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.3\n"
-"POT-Creation-Date: 2001-10-14 23:13-0400\n"
+"POT-Creation-Date: 2001-10-15 13:39-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -18,48 +18,48 @@ msgstr ""
 msgid "unknown errno"
 msgstr ""
 
-#: popt.c:900
+#: popt.c:903
 #, c-format
 msgid "option type (%d) not implemented in popt\n"
 msgstr ""
 
-#: popt.c:1111
+#: popt.c:1114
 msgid "missing argument"
 msgstr ""
 
-#: popt.c:1113
+#: popt.c:1116
 msgid "unknown option"
 msgstr ""
 
-#: popt.c:1115
+#: popt.c:1118
 msgid "mutually exclusive logical operations requested"
 msgstr ""
 
-#: popt.c:1117
+#: popt.c:1120
 msgid "opt->arg should not be NULL"
 msgstr ""
 
-#: popt.c:1119
+#: popt.c:1122
 msgid "aliases nested too deeply"
 msgstr ""
 
-#: popt.c:1121
+#: popt.c:1124
 msgid "error in parameter quoting"
 msgstr ""
 
-#: popt.c:1123
+#: popt.c:1126
 msgid "invalid numeric value"
 msgstr ""
 
-#: popt.c:1125
+#: popt.c:1128
 msgid "number too large or too small"
 msgstr ""
 
-#: popt.c:1127
+#: popt.c:1130
 msgid "memory allocation failed"
 msgstr ""
 
-#: popt.c:1131
+#: popt.c:1134
 msgid "unknown error"
 msgstr ""
 
@@ -107,10 +107,10 @@ msgstr ""
 msgid "ARG"
 msgstr ""
 
-#: popthelp.c:454
+#: popthelp.c:456
 msgid "Usage:"
 msgstr ""
 
-#: popthelp.c:476
+#: popthelp.c:478
 msgid "[OPTION...]"
 msgstr ""
diff --git a/po/ja.po b/po/ja.po
index 934225f..83e97b1 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.3\n"
-"POT-Creation-Date: 2001-10-14 23:13-0400\n"
+"POT-Creation-Date: 2001-10-15 13:39-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -18,48 +18,48 @@ msgstr ""
 msgid "unknown errno"
 msgstr ""
 
-#: popt.c:900
+#: popt.c:903
 #, c-format
 msgid "option type (%d) not implemented in popt\n"
 msgstr ""
 
-#: popt.c:1111
+#: popt.c:1114
 msgid "missing argument"
 msgstr ""
 
-#: popt.c:1113
+#: popt.c:1116
 msgid "unknown option"
 msgstr ""
 
-#: popt.c:1115
+#: popt.c:1118
 msgid "mutually exclusive logical operations requested"
 msgstr ""
 
-#: popt.c:1117
+#: popt.c:1120
 msgid "opt->arg should not be NULL"
 msgstr ""
 
-#: popt.c:1119
+#: popt.c:1122
 msgid "aliases nested too deeply"
 msgstr ""
 
-#: popt.c:1121
+#: popt.c:1124
 msgid "error in parameter quoting"
 msgstr ""
 
-#: popt.c:1123
+#: popt.c:1126
 msgid "invalid numeric value"
 msgstr ""
 
-#: popt.c:1125
+#: popt.c:1128
 msgid "number too large or too small"
 msgstr ""
 
-#: popt.c:1127
+#: popt.c:1130
 msgid "memory allocation failed"
 msgstr ""
 
-#: popt.c:1131
+#: popt.c:1134
 msgid "unknown error"
 msgstr ""
 
@@ -107,10 +107,10 @@ msgstr ""
 msgid "ARG"
 msgstr ""
 
-#: popthelp.c:454
+#: popthelp.c:456
 msgid "Usage:"
 msgstr ""
 
-#: popthelp.c:476
+#: popthelp.c:478
 msgid "[OPTION...]"
 msgstr ""
diff --git a/po/ko.po b/po/ko.po
index 1bffb7d..002a277 100644
--- a/po/ko.po
+++ b/po/ko.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6\n"
-"POT-Creation-Date: 2001-10-14 23:13-0400\n"
+"POT-Creation-Date: 2001-10-15 13:39-0400\n"
 "PO-Revision-Date: 2001-09-06 20:06+0900\n"
 "Last-Translator: Jong-Hoon Ryu <redhat4u@netian.com>\n"
 "Language-Team: GNU Translation project <ko@li.org>\n"
@@ -13,48 +13,48 @@ msgstr ""
 msgid "unknown errno"
 msgstr "�� �� ���� �����ڵ�(errno) �Դϴ�"
 
-#: popt.c:900
+#: popt.c:903
 #, c-format
 msgid "option type (%d) not implemented in popt\n"
 msgstr "�ɼ� ���� (%d)�� popt���� ����� �� �����ϴ�\n"
 
-#: popt.c:1111
+#: popt.c:1114
 msgid "missing argument"
 msgstr "�μ��� �������� �ʾҽ��ϴ�"
 
-#: popt.c:1113
+#: popt.c:1116
 msgid "unknown option"
 msgstr "�� �� ���� �ɼ��Դϴ�"
 
-#: popt.c:1115
+#: popt.c:1118
 msgid "mutually exclusive logical operations requested"
 msgstr "���ʿ� ��Ÿ�� ���� ������ �����Ǿ����ϴ�"
 
-#: popt.c:1117
+#: popt.c:1120
 msgid "opt->arg should not be NULL"
 msgstr "�ɼ�->�μ��� NULL�� �Ǿ�� �ȵ˴ϴ�"
 
-#: popt.c:1119
+#: popt.c:1122
 msgid "aliases nested too deeply"
 msgstr "��Ī(alias)�� �����ϰ� �����Ǿ����ϴ�"
 
-#: popt.c:1121
+#: popt.c:1124
 msgid "error in parameter quoting"
 msgstr "�Ű������� ������ �ֽ��ϴ�"
 
-#: popt.c:1123
+#: popt.c:1126
 msgid "invalid numeric value"
 msgstr "�߸��� ��ġ ���Դϴ�"
 
-#: popt.c:1125
+#: popt.c:1128
 msgid "number too large or too small"
 msgstr "���ڰ� �ʹ� ũ�ų� �ʹ� �����ϴ�"
 
-#: popt.c:1127
+#: popt.c:1130
 msgid "memory allocation failed"
 msgstr "�޸� �Ҵ翡 �����߽��ϴ�"
 
-#: popt.c:1131
+#: popt.c:1134
 msgid "unknown error"
 msgstr "�� �� ���� �����Դϴ�"
 
@@ -102,10 +102,10 @@ msgstr "
 msgid "ARG"
 msgstr "�μ�(ARG)"
 
-#: popthelp.c:454
+#: popthelp.c:456
 msgid "Usage:"
 msgstr "����:"
 
-#: popthelp.c:476
+#: popthelp.c:478
 msgid "[OPTION...]"
 msgstr "[�ɼ�...]"
diff --git a/po/no.po b/po/no.po
index 4f8e3ff..5fb3994 100644
--- a/po/no.po
+++ b/po/no.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.3\n"
-"POT-Creation-Date: 2001-10-14 23:13-0400\n"
+"POT-Creation-Date: 2001-10-15 13:39-0400\n"
 "PO-Revision-Date: 2001-06-27 11:05+0200\n"
 "Last-Translator: Kjartan Maraas <kmaraas@online.no>\n"
 "Language-Team: Norwegian <no@li.org>\n"
@@ -13,48 +13,48 @@ msgstr ""
 msgid "unknown errno"
 msgstr "ukjent errno"
 
-#: popt.c:900
+#: popt.c:903
 #, c-format
 msgid "option type (%d) not implemented in popt\n"
 msgstr "flaggtype (%d) ikke implementert i popt\n"
 
-#: popt.c:1111
+#: popt.c:1114
 msgid "missing argument"
 msgstr "manglende argument"
 
-#: popt.c:1113
+#: popt.c:1116
 msgid "unknown option"
 msgstr "ukjent flagg"
 
-#: popt.c:1115
+#: popt.c:1118
 msgid "mutually exclusive logical operations requested"
 msgstr "gjensidig eksluderende logiske operasjoner forespurt"
 
-#: popt.c:1117
+#: popt.c:1120
 msgid "opt->arg should not be NULL"
 msgstr "opt->arg m� ikke v�re NULL"
 
-#: popt.c:1119
+#: popt.c:1122
 msgid "aliases nested too deeply"
 msgstr "aliaser med for dype l�kker"
 
-#: popt.c:1121
+#: popt.c:1124
 msgid "error in parameter quoting"
 msgstr "feil i parametersitering"
 
-#: popt.c:1123
+#: popt.c:1126
 msgid "invalid numeric value"
 msgstr "ugyldig numerisk verdi"
 
-#: popt.c:1125
+#: popt.c:1128
 msgid "number too large or too small"
 msgstr "tallet er for stort eller lite"
 
-#: popt.c:1127
+#: popt.c:1130
 msgid "memory allocation failed"
 msgstr "minneallokering feilet"
 
-#: popt.c:1131
+#: popt.c:1134
 msgid "unknown error"
 msgstr "ukjent feil"
 
@@ -102,10 +102,10 @@ msgstr "DOUBLE"
 msgid "ARG"
 msgstr "ARG"
 
-#: popthelp.c:454
+#: popthelp.c:456
 msgid "Usage:"
 msgstr "Bruk:"
 
-#: popthelp.c:476
+#: popthelp.c:478
 msgid "[OPTION...]"
 msgstr "[FLAGG...]"
diff --git a/po/pl.po b/po/pl.po
index 934225f..83e97b1 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.3\n"
-"POT-Creation-Date: 2001-10-14 23:13-0400\n"
+"POT-Creation-Date: 2001-10-15 13:39-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -18,48 +18,48 @@ msgstr ""
 msgid "unknown errno"
 msgstr ""
 
-#: popt.c:900
+#: popt.c:903
 #, c-format
 msgid "option type (%d) not implemented in popt\n"
 msgstr ""
 
-#: popt.c:1111
+#: popt.c:1114
 msgid "missing argument"
 msgstr ""
 
-#: popt.c:1113
+#: popt.c:1116
 msgid "unknown option"
 msgstr ""
 
-#: popt.c:1115
+#: popt.c:1118
 msgid "mutually exclusive logical operations requested"
 msgstr ""
 
-#: popt.c:1117
+#: popt.c:1120
 msgid "opt->arg should not be NULL"
 msgstr ""
 
-#: popt.c:1119
+#: popt.c:1122
 msgid "aliases nested too deeply"
 msgstr ""
 
-#: popt.c:1121
+#: popt.c:1124
 msgid "error in parameter quoting"
 msgstr ""
 
-#: popt.c:1123
+#: popt.c:1126
 msgid "invalid numeric value"
 msgstr ""
 
-#: popt.c:1125
+#: popt.c:1128
 msgid "number too large or too small"
 msgstr ""
 
-#: popt.c:1127
+#: popt.c:1130
 msgid "memory allocation failed"
 msgstr ""
 
-#: popt.c:1131
+#: popt.c:1134
 msgid "unknown error"
 msgstr ""
 
@@ -107,10 +107,10 @@ msgstr ""
 msgid "ARG"
 msgstr ""
 
-#: popthelp.c:454
+#: popthelp.c:456
 msgid "Usage:"
 msgstr ""
 
-#: popthelp.c:476
+#: popthelp.c:478
 msgid "[OPTION...]"
 msgstr ""
diff --git a/po/popt.pot b/po/popt.pot
index ca91a50..4efb27c 100644
--- a/po/popt.pot
+++ b/po/popt.pot
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2001-10-14 23:13-0400\n"
+"POT-Creation-Date: 2001-10-15 13:39-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -18,48 +18,48 @@ msgstr ""
 msgid "unknown errno"
 msgstr ""
 
-#: popt.c:900
+#: popt.c:903
 #, c-format
 msgid "option type (%d) not implemented in popt\n"
 msgstr ""
 
-#: popt.c:1111
+#: popt.c:1114
 msgid "missing argument"
 msgstr ""
 
-#: popt.c:1113
+#: popt.c:1116
 msgid "unknown option"
 msgstr ""
 
-#: popt.c:1115
+#: popt.c:1118
 msgid "mutually exclusive logical operations requested"
 msgstr ""
 
-#: popt.c:1117
+#: popt.c:1120
 msgid "opt->arg should not be NULL"
 msgstr ""
 
-#: popt.c:1119
+#: popt.c:1122
 msgid "aliases nested too deeply"
 msgstr ""
 
-#: popt.c:1121
+#: popt.c:1124
 msgid "error in parameter quoting"
 msgstr ""
 
-#: popt.c:1123
+#: popt.c:1126
 msgid "invalid numeric value"
 msgstr ""
 
-#: popt.c:1125
+#: popt.c:1128
 msgid "number too large or too small"
 msgstr ""
 
-#: popt.c:1127
+#: popt.c:1130
 msgid "memory allocation failed"
 msgstr ""
 
-#: popt.c:1131
+#: popt.c:1134
 msgid "unknown error"
 msgstr ""
 
@@ -107,10 +107,10 @@ msgstr ""
 msgid "ARG"
 msgstr ""
 
-#: popthelp.c:454
+#: popthelp.c:456
 msgid "Usage:"
 msgstr ""
 
-#: popthelp.c:476
+#: popthelp.c:478
 msgid "[OPTION...]"
 msgstr ""
diff --git a/po/pt.po b/po/pt.po
index 4d9d765..2c06755 100644
--- a/po/pt.po
+++ b/po/pt.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.3\n"
-"POT-Creation-Date: 2001-10-14 23:13-0400\n"
+"POT-Creation-Date: 2001-10-15 13:39-0400\n"
 "PO-Revision-Date: 2001-01-21 19:31+00:00\n"
 "Last-Translator: Pedro Morais <morais@kde.org>\n"
 "Language-Team: pt <morais@kde.org>\n"
@@ -13,48 +13,48 @@ msgstr ""
 msgid "unknown errno"
 msgstr "errno desconhecido"
 
-#: popt.c:900
+#: popt.c:903
 #, c-format
 msgid "option type (%d) not implemented in popt\n"
 msgstr "tipo de op��o (%d) n�o implementado no popt\n"
 
-#: popt.c:1111
+#: popt.c:1114
 msgid "missing argument"
 msgstr "falta um argumento"
 
-#: popt.c:1113
+#: popt.c:1116
 msgid "unknown option"
 msgstr "op��o desconhecida"
 
-#: popt.c:1115
+#: popt.c:1118
 msgid "mutually exclusive logical operations requested"
 msgstr "foram pedidas opera��es l�gicas mutuamente exclusivas"
 
-#: popt.c:1117
+#: popt.c:1120
 msgid "opt->arg should not be NULL"
 msgstr ""
 
-#: popt.c:1119
+#: popt.c:1122
 msgid "aliases nested too deeply"
 msgstr "'aliases' demasiado aninhados"
 
-#: popt.c:1121
+#: popt.c:1124
 msgid "error in parameter quoting"
 msgstr "erros no 'quoting' de par�metros"
 
-#: popt.c:1123
+#: popt.c:1126
 msgid "invalid numeric value"
 msgstr "valor n�merico inv�lido"
 
-#: popt.c:1125
+#: popt.c:1128
 msgid "number too large or too small"
 msgstr "n�mero demasiado grando ou pequeno"
 
-#: popt.c:1127
+#: popt.c:1130
 msgid "memory allocation failed"
 msgstr ""
 
-#: popt.c:1131
+#: popt.c:1134
 msgid "unknown error"
 msgstr "erro desconhecido"
 
@@ -103,10 +103,10 @@ msgstr "DOUBLE"
 msgid "ARG"
 msgstr "ARG"
 
-#: popthelp.c:454
+#: popthelp.c:456
 msgid "Usage:"
 msgstr "Utiliza��o:"
 
-#: popthelp.c:476
+#: popthelp.c:478
 msgid "[OPTION...]"
 msgstr "[OP��O...]"
diff --git a/po/pt_BR.po b/po/pt_BR.po
index 934225f..83e97b1 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.3\n"
-"POT-Creation-Date: 2001-10-14 23:13-0400\n"
+"POT-Creation-Date: 2001-10-15 13:39-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -18,48 +18,48 @@ msgstr ""
 msgid "unknown errno"
 msgstr ""
 
-#: popt.c:900
+#: popt.c:903
 #, c-format
 msgid "option type (%d) not implemented in popt\n"
 msgstr ""
 
-#: popt.c:1111
+#: popt.c:1114
 msgid "missing argument"
 msgstr ""
 
-#: popt.c:1113
+#: popt.c:1116
 msgid "unknown option"
 msgstr ""
 
-#: popt.c:1115
+#: popt.c:1118
 msgid "mutually exclusive logical operations requested"
 msgstr ""
 
-#: popt.c:1117
+#: popt.c:1120
 msgid "opt->arg should not be NULL"
 msgstr ""
 
-#: popt.c:1119
+#: popt.c:1122
 msgid "aliases nested too deeply"
 msgstr ""
 
-#: popt.c:1121
+#: popt.c:1124
 msgid "error in parameter quoting"
 msgstr ""
 
-#: popt.c:1123
+#: popt.c:1126
 msgid "invalid numeric value"
 msgstr ""
 
-#: popt.c:1125
+#: popt.c:1128
 msgid "number too large or too small"
 msgstr ""
 
-#: popt.c:1127
+#: popt.c:1130
 msgid "memory allocation failed"
 msgstr ""
 
-#: popt.c:1131
+#: popt.c:1134
 msgid "unknown error"
 msgstr ""
 
@@ -107,10 +107,10 @@ msgstr ""
 msgid "ARG"
 msgstr ""
 
-#: popthelp.c:454
+#: popthelp.c:456
 msgid "Usage:"
 msgstr ""
 
-#: popthelp.c:476
+#: popthelp.c:478
 msgid "[OPTION...]"
 msgstr ""
diff --git a/po/ro.po b/po/ro.po
index 3d013b3..346d818 100644
--- a/po/ro.po
+++ b/po/ro.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.3\n"
-"POT-Creation-Date: 2001-10-14 23:13-0400\n"
+"POT-Creation-Date: 2001-10-15 13:39-0400\n"
 "PO-Revision-Date: 2000-06-14 23:23+EST\n"
 "Last-Translator: Cristian Gafton <gafton@redhat.com>\n"
 "Language-Team: Romanian <ro@li.org>\n"
@@ -13,49 +13,49 @@ msgstr ""
 msgid "unknown errno"
 msgstr "eroare necunoscuta"
 
-#: popt.c:900
+#: popt.c:903
 #, c-format
 msgid "option type (%d) not implemented in popt\n"
 msgstr "optiunea de tipul (%d) nu este implementata in popt\n"
 
-#: popt.c:1111
+#: popt.c:1114
 msgid "missing argument"
 msgstr "argument lipsa"
 
-#: popt.c:1113
+#: popt.c:1116
 msgid "unknown option"
 msgstr "optiune necunoscuta"
 
-#: popt.c:1115
+#: popt.c:1118
 msgid "mutually exclusive logical operations requested"
 msgstr ""
 
-#: popt.c:1117
+#: popt.c:1120
 msgid "opt->arg should not be NULL"
 msgstr ""
 
-#: popt.c:1119
+#: popt.c:1122
 msgid "aliases nested too deeply"
 msgstr "recursivitate infinita la optiunile sinonime"
 
-#: popt.c:1121
+#: popt.c:1124
 #, fuzzy
 msgid "error in parameter quoting"
 msgstr "eroare la insertie parametru"
 
-#: popt.c:1123
+#: popt.c:1126
 msgid "invalid numeric value"
 msgstr "valoare numarica invalida"
 
-#: popt.c:1125
+#: popt.c:1128
 msgid "number too large or too small"
 msgstr "numar prea mare sau prea mic"
 
-#: popt.c:1127
+#: popt.c:1130
 msgid "memory allocation failed"
 msgstr ""
 
-#: popt.c:1131
+#: popt.c:1134
 msgid "unknown error"
 msgstr "eroare necuinoscuta"
 
@@ -104,10 +104,10 @@ msgstr ""
 msgid "ARG"
 msgstr ""
 
-#: popthelp.c:454
+#: popthelp.c:456
 msgid "Usage:"
 msgstr "Sintaxa:"
 
-#: popthelp.c:476
+#: popthelp.c:478
 msgid "[OPTION...]"
 msgstr "[OPTIUNE...]"
diff --git a/po/ru.po b/po/ru.po
index aa0eb64..62a3af2 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.3\n"
-"POT-Creation-Date: 2001-10-14 23:13-0400\n"
+"POT-Creation-Date: 2001-10-15 13:39-0400\n"
 "PO-Revision-Date: 2001-07-05 21:00-0500\n"
 "Last-Translator: Eugene Kanter <eugene@blackcatlinux.com>\n"
 "Language-Team: Black Cat Linux Team <blackcat-support@blackcatlinux.com>\n"
@@ -13,48 +13,48 @@ msgstr ""
 msgid "unknown errno"
 msgstr "����������� ����� ������"
 
-#: popt.c:900
+#: popt.c:903
 #, c-format
 msgid "option type (%d) not implemented in popt\n"
 msgstr "��������� ��������� (%d) � popt �� �������������\n"
 
-#: popt.c:1111
+#: popt.c:1114
 msgid "missing argument"
 msgstr "�������� ��������"
 
-#: popt.c:1113
+#: popt.c:1116
 msgid "unknown option"
 msgstr "����������� ��������"
 
-#: popt.c:1115
+#: popt.c:1118
 msgid "mutually exclusive logical operations requested"
 msgstr "��������� ������� ����������� ���������� ��������"
 
-#: popt.c:1117
+#: popt.c:1120
 msgid "opt->arg should not be NULL"
 msgstr "opt->arg �� ����� ���� NULL"
 
-#: popt.c:1119
+#: popt.c:1122
 msgid "aliases nested too deeply"
 msgstr "�������� ������� ���������� �������� �����������"
 
-#: popt.c:1121
+#: popt.c:1124
 msgid "error in parameter quoting"
 msgstr "�����a ��������� ���������� � �������"
 
-#: popt.c:1123
+#: popt.c:1126
 msgid "invalid numeric value"
 msgstr "������������ �������� ��������"
 
-#: popt.c:1125
+#: popt.c:1128
 msgid "number too large or too small"
 msgstr "�������� �������� �� ��������� ����������������"
 
-#: popt.c:1127
+#: popt.c:1130
 msgid "memory allocation failed"
 msgstr "������ ��������� ������"
 
-#: popt.c:1131
+#: popt.c:1134
 msgid "unknown error"
 msgstr "����������� ������"
 
@@ -102,10 +102,10 @@ msgstr "DOUBLE"
 msgid "ARG"
 msgstr "ARG"
 
-#: popthelp.c:454
+#: popthelp.c:456
 msgid "Usage:"
 msgstr "�������������:"
 
-#: popthelp.c:476
+#: popthelp.c:478
 msgid "[OPTION...]"
 msgstr "[��������...]"
diff --git a/po/sk.po b/po/sk.po
index c9e9728..4e92400 100644
--- a/po/sk.po
+++ b/po/sk.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.3\n"
-"POT-Creation-Date: 2001-10-14 23:13-0400\n"
+"POT-Creation-Date: 2001-10-15 13:39-0400\n"
 "PO-Revision-Date: 1999-08-04 21:40+0200\n"
 "Last-Translator: Stanislav Meduna <stano@eunet.sk>\n"
 "Language-Team: Slovak <sk-i18n@rak.isternet.sk>\n"
@@ -17,48 +17,48 @@ msgstr ""
 msgid "unknown errno"
 msgstr ""
 
-#: popt.c:900
+#: popt.c:903
 #, c-format
 msgid "option type (%d) not implemented in popt\n"
 msgstr ""
 
-#: popt.c:1111
+#: popt.c:1114
 msgid "missing argument"
 msgstr ""
 
-#: popt.c:1113
+#: popt.c:1116
 msgid "unknown option"
 msgstr ""
 
-#: popt.c:1115
+#: popt.c:1118
 msgid "mutually exclusive logical operations requested"
 msgstr ""
 
-#: popt.c:1117
+#: popt.c:1120
 msgid "opt->arg should not be NULL"
 msgstr ""
 
-#: popt.c:1119
+#: popt.c:1122
 msgid "aliases nested too deeply"
 msgstr ""
 
-#: popt.c:1121
+#: popt.c:1124
 msgid "error in parameter quoting"
 msgstr ""
 
-#: popt.c:1123
+#: popt.c:1126
 msgid "invalid numeric value"
 msgstr ""
 
-#: popt.c:1125
+#: popt.c:1128
 msgid "number too large or too small"
 msgstr ""
 
-#: popt.c:1127
+#: popt.c:1130
 msgid "memory allocation failed"
 msgstr ""
 
-#: popt.c:1131
+#: popt.c:1134
 msgid "unknown error"
 msgstr ""
 
@@ -107,10 +107,10 @@ msgstr ""
 msgid "ARG"
 msgstr ""
 
-#: popthelp.c:454
+#: popthelp.c:456
 msgid "Usage:"
 msgstr ""
 
-#: popthelp.c:476
+#: popthelp.c:478
 msgid "[OPTION...]"
 msgstr ""
diff --git a/po/sl.po b/po/sl.po
index 4d49eba..2f86bd7 100644
--- a/po/sl.po
+++ b/po/sl.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.3\n"
-"POT-Creation-Date: 2001-10-14 23:13-0400\n"
+"POT-Creation-Date: 2001-10-15 13:39-0400\n"
 "PO-Revision-Date: 2000-09-05 12:30+0200\n"
 "Last-Translator: Roman Maurer <roman.maurer@hermes.si>\n"
 "Language-Team: Slovenian <sl@li.org>\n"
@@ -13,48 +13,48 @@ msgstr ""
 msgid "unknown errno"
 msgstr ""
 
-#: popt.c:900
+#: popt.c:903
 #, c-format
 msgid "option type (%d) not implemented in popt\n"
 msgstr ""
 
-#: popt.c:1111
+#: popt.c:1114
 msgid "missing argument"
 msgstr ""
 
-#: popt.c:1113
+#: popt.c:1116
 msgid "unknown option"
 msgstr ""
 
-#: popt.c:1115
+#: popt.c:1118
 msgid "mutually exclusive logical operations requested"
 msgstr ""
 
-#: popt.c:1117
+#: popt.c:1120
 msgid "opt->arg should not be NULL"
 msgstr ""
 
-#: popt.c:1119
+#: popt.c:1122
 msgid "aliases nested too deeply"
 msgstr ""
 
-#: popt.c:1121
+#: popt.c:1124
 msgid "error in parameter quoting"
 msgstr ""
 
-#: popt.c:1123
+#: popt.c:1126
 msgid "invalid numeric value"
 msgstr ""
 
-#: popt.c:1125
+#: popt.c:1128
 msgid "number too large or too small"
 msgstr ""
 
-#: popt.c:1127
+#: popt.c:1130
 msgid "memory allocation failed"
 msgstr ""
 
-#: popt.c:1131
+#: popt.c:1134
 msgid "unknown error"
 msgstr ""
 
@@ -103,10 +103,10 @@ msgstr ""
 msgid "ARG"
 msgstr ""
 
-#: popthelp.c:454
+#: popthelp.c:456
 msgid "Usage:"
 msgstr ""
 
-#: popthelp.c:476
+#: popthelp.c:478
 msgid "[OPTION...]"
 msgstr ""
diff --git a/po/sr.po b/po/sr.po
index 934225f..83e97b1 100644
--- a/po/sr.po
+++ b/po/sr.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.3\n"
-"POT-Creation-Date: 2001-10-14 23:13-0400\n"
+"POT-Creation-Date: 2001-10-15 13:39-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -18,48 +18,48 @@ msgstr ""
 msgid "unknown errno"
 msgstr ""
 
-#: popt.c:900
+#: popt.c:903
 #, c-format
 msgid "option type (%d) not implemented in popt\n"
 msgstr ""
 
-#: popt.c:1111
+#: popt.c:1114
 msgid "missing argument"
 msgstr ""
 
-#: popt.c:1113
+#: popt.c:1116
 msgid "unknown option"
 msgstr ""
 
-#: popt.c:1115
+#: popt.c:1118
 msgid "mutually exclusive logical operations requested"
 msgstr ""
 
-#: popt.c:1117
+#: popt.c:1120
 msgid "opt->arg should not be NULL"
 msgstr ""
 
-#: popt.c:1119
+#: popt.c:1122
 msgid "aliases nested too deeply"
 msgstr ""
 
-#: popt.c:1121
+#: popt.c:1124
 msgid "error in parameter quoting"
 msgstr ""
 
-#: popt.c:1123
+#: popt.c:1126
 msgid "invalid numeric value"
 msgstr ""
 
-#: popt.c:1125
+#: popt.c:1128
 msgid "number too large or too small"
 msgstr ""
 
-#: popt.c:1127
+#: popt.c:1130
 msgid "memory allocation failed"
 msgstr ""
 
-#: popt.c:1131
+#: popt.c:1134
 msgid "unknown error"
 msgstr ""
 
@@ -107,10 +107,10 @@ msgstr ""
 msgid "ARG"
 msgstr ""
 
-#: popthelp.c:454
+#: popthelp.c:456
 msgid "Usage:"
 msgstr ""
 
-#: popthelp.c:476
+#: popthelp.c:478
 msgid "[OPTION...]"
 msgstr ""
diff --git a/po/sv.po b/po/sv.po
index b5e150e..fded47e 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.3\n"
-"POT-Creation-Date: 2001-10-14 23:13-0400\n"
+"POT-Creation-Date: 2001-10-15 13:39-0400\n"
 "PO-Revision-Date: 2001-07-12 22:26+0100\n"
 "Last-Translator: Christian Rose <menthos@menthos.com>\n"
 "Language-Team: Swedish <sv@li.org>\n"
@@ -13,48 +13,48 @@ msgstr ""
 msgid "unknown errno"
 msgstr "ok�nt felnummer"
 
-#: popt.c:900
+#: popt.c:903
 #, c-format
 msgid "option type (%d) not implemented in popt\n"
 msgstr "flaggtypen (%d) �r inte implementerad i popt\n"
 
-#: popt.c:1111
+#: popt.c:1114
 msgid "missing argument"
 msgstr "argument saknas"
 
-#: popt.c:1113
+#: popt.c:1116
 msgid "unknown option"
 msgstr "ok�nd flagga"
 
-#: popt.c:1115
+#: popt.c:1118
 msgid "mutually exclusive logical operations requested"
 msgstr "�msesidigt uteslutande logiska operationer beg�rdes"
 
-#: popt.c:1117
+#: popt.c:1120
 msgid "opt->arg should not be NULL"
 msgstr "opt->arg f�r inte vara NULL"
 
-#: popt.c:1119
+#: popt.c:1122
 msgid "aliases nested too deeply"
 msgstr "alias �r n�stlade f�r djupt"
 
-#: popt.c:1121
+#: popt.c:1124
 msgid "error in parameter quoting"
 msgstr "fel i parametercitering"
 
-#: popt.c:1123
+#: popt.c:1126
 msgid "invalid numeric value"
 msgstr "ogiltigt numeriskt v�rde"
 
-#: popt.c:1125
+#: popt.c:1128
 msgid "number too large or too small"
 msgstr "talet f�r stort eller f�r litet"
 
-#: popt.c:1127
+#: popt.c:1130
 msgid "memory allocation failed"
 msgstr "minnesallokering misslyckades"
 
-#: popt.c:1131
+#: popt.c:1134
 msgid "unknown error"
 msgstr "ok�nt fel"
 
@@ -102,10 +102,10 @@ msgstr "DUBBEL"
 msgid "ARG"
 msgstr "ARG"
 
-#: popthelp.c:454
+#: popthelp.c:456
 msgid "Usage:"
 msgstr "Anv�ndning:"
 
-#: popthelp.c:476
+#: popthelp.c:478
 msgid "[OPTION...]"
 msgstr "[FLAGGA...]"
diff --git a/po/tr.po b/po/tr.po
index bdab0f6..8208612 100644
--- a/po/tr.po
+++ b/po/tr.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.3\n"
-"POT-Creation-Date: 2001-10-14 23:13-0400\n"
+"POT-Creation-Date: 2001-10-15 13:39-0400\n"
 "PO-Revision-Date: 2000-02-11 13:01+0200\n"
 "Last-Translator: Nilgun Belma Buguner <nilgun@technologist.com>\n"
 "Language-Team: Turkish <tr@li.org>\n"
@@ -13,48 +13,48 @@ msgstr ""
 msgid "unknown errno"
 msgstr "bilinmeyen hata no"
 
-#: popt.c:900
+#: popt.c:903
 #, c-format
 msgid "option type (%d) not implemented in popt\n"
 msgstr "se�enek t�r� (%d) popt i�in ge�ersiz\n"
 
-#: popt.c:1111
+#: popt.c:1114
 msgid "missing argument"
 msgstr "arg�man eksik"
 
-#: popt.c:1113
+#: popt.c:1116
 msgid "unknown option"
 msgstr "bilinmeyen se�enek"
 
-#: popt.c:1115
+#: popt.c:1118
 msgid "mutually exclusive logical operations requested"
 msgstr "birbirini d��layan mant�ksal i�lemler istendi"
 
-#: popt.c:1117
+#: popt.c:1120
 msgid "opt->arg should not be NULL"
 msgstr ""
 
-#: popt.c:1119
+#: popt.c:1122
 msgid "aliases nested too deeply"
 msgstr "adlarda �ok fazla i�i�elikler"
 
-#: popt.c:1121
+#: popt.c:1124
 msgid "error in parameter quoting"
 msgstr "parametrelerde t�rnak i�aretleme hatal� "
 
-#: popt.c:1123
+#: popt.c:1126
 msgid "invalid numeric value"
 msgstr "say�sal de�er ge�ersiz"
 
-#: popt.c:1125
+#: popt.c:1128
 msgid "number too large or too small"
 msgstr "say� ya �ok b�y�k ya da �ok k���k"
 
-#: popt.c:1127
+#: popt.c:1130
 msgid "memory allocation failed"
 msgstr ""
 
-#: popt.c:1131
+#: popt.c:1134
 msgid "unknown error"
 msgstr "bilinmeyen hata"
 
@@ -103,10 +103,10 @@ msgstr "DOUBLE"
 msgid "ARG"
 msgstr "ARG"
 
-#: popthelp.c:454
+#: popthelp.c:456
 msgid "Usage:"
 msgstr "Kullan�m�:"
 
-#: popthelp.c:476
+#: popthelp.c:478
 msgid "[OPTION...]"
 msgstr "[SE�ENEK...]"
diff --git a/po/uk.po b/po/uk.po
index 54fdc98..944f7aa 100644
--- a/po/uk.po
+++ b/po/uk.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.3\n"
-"POT-Creation-Date: 2001-10-14 23:13-0400\n"
+"POT-Creation-Date: 2001-10-15 13:39-0400\n"
 "PO-Revision-Date: 1999-09-30 16:54+0200\n"
 "Last-Translator: Yuri Syrota <rasta@renome.rovno.ua>\n"
 "Language-Team: Ukrainian <uk@li.org>\n"
@@ -17,48 +17,48 @@ msgstr ""
 msgid "unknown errno"
 msgstr ""
 
-#: popt.c:900
+#: popt.c:903
 #, c-format
 msgid "option type (%d) not implemented in popt\n"
 msgstr ""
 
-#: popt.c:1111
+#: popt.c:1114
 msgid "missing argument"
 msgstr ""
 
-#: popt.c:1113
+#: popt.c:1116
 msgid "unknown option"
 msgstr ""
 
-#: popt.c:1115
+#: popt.c:1118
 msgid "mutually exclusive logical operations requested"
 msgstr ""
 
-#: popt.c:1117
+#: popt.c:1120
 msgid "opt->arg should not be NULL"
 msgstr ""
 
-#: popt.c:1119
+#: popt.c:1122
 msgid "aliases nested too deeply"
 msgstr ""
 
-#: popt.c:1121
+#: popt.c:1124
 msgid "error in parameter quoting"
 msgstr ""
 
-#: popt.c:1123
+#: popt.c:1126
 msgid "invalid numeric value"
 msgstr ""
 
-#: popt.c:1125
+#: popt.c:1128
 msgid "number too large or too small"
 msgstr ""
 
-#: popt.c:1127
+#: popt.c:1130
 msgid "memory allocation failed"
 msgstr ""
 
-#: popt.c:1131
+#: popt.c:1134
 msgid "unknown error"
 msgstr ""
 
@@ -107,10 +107,10 @@ msgstr ""
 msgid "ARG"
 msgstr ""
 
-#: popthelp.c:454
+#: popthelp.c:456
 msgid "Usage:"
 msgstr ""
 
-#: popthelp.c:476
+#: popthelp.c:478
 msgid "[OPTION...]"
 msgstr ""
diff --git a/po/wa.po b/po/wa.po
index ac4f361..9eb4f81 100644
--- a/po/wa.po
+++ b/po/wa.po
@@ -9,7 +9,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.3\n"
-"POT-Creation-Date: 2001-10-14 23:13-0400\n"
+"POT-Creation-Date: 2001-10-15 13:39-0400\n"
 "PO-Revision-Date: 1999-03-18 23:11+0100\n"
 "Last-Translator: Nobody yet\n"
 "Language-Team: walon <linux-wa@chanae.alphanet.ch>\n"
@@ -21,48 +21,48 @@ msgstr ""
 msgid "unknown errno"
 msgstr ""
 
-#: popt.c:900
+#: popt.c:903
 #, c-format
 msgid "option type (%d) not implemented in popt\n"
 msgstr ""
 
-#: popt.c:1111
+#: popt.c:1114
 msgid "missing argument"
 msgstr ""
 
-#: popt.c:1113
+#: popt.c:1116
 msgid "unknown option"
 msgstr ""
 
-#: popt.c:1115
+#: popt.c:1118
 msgid "mutually exclusive logical operations requested"
 msgstr ""
 
-#: popt.c:1117
+#: popt.c:1120
 msgid "opt->arg should not be NULL"
 msgstr ""
 
-#: popt.c:1119
+#: popt.c:1122
 msgid "aliases nested too deeply"
 msgstr ""
 
-#: popt.c:1121
+#: popt.c:1124
 msgid "error in parameter quoting"
 msgstr ""
 
-#: popt.c:1123
+#: popt.c:1126
 msgid "invalid numeric value"
 msgstr ""
 
-#: popt.c:1125
+#: popt.c:1128
 msgid "number too large or too small"
 msgstr ""
 
-#: popt.c:1127
+#: popt.c:1130
 msgid "memory allocation failed"
 msgstr ""
 
-#: popt.c:1131
+#: popt.c:1134
 msgid "unknown error"
 msgstr ""
 
@@ -111,10 +111,10 @@ msgstr ""
 msgid "ARG"
 msgstr ""
 
-#: popthelp.c:454
+#: popthelp.c:456
 msgid "Usage:"
 msgstr ""
 
-#: popthelp.c:476
+#: popthelp.c:478
 msgid "[OPTION...]"
 msgstr ""
diff --git a/po/zh.po b/po/zh.po
index 934225f..83e97b1 100644
--- a/po/zh.po
+++ b/po/zh.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.3\n"
-"POT-Creation-Date: 2001-10-14 23:13-0400\n"
+"POT-Creation-Date: 2001-10-15 13:39-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -18,48 +18,48 @@ msgstr ""
 msgid "unknown errno"
 msgstr ""
 
-#: popt.c:900
+#: popt.c:903
 #, c-format
 msgid "option type (%d) not implemented in popt\n"
 msgstr ""
 
-#: popt.c:1111
+#: popt.c:1114
 msgid "missing argument"
 msgstr ""
 
-#: popt.c:1113
+#: popt.c:1116
 msgid "unknown option"
 msgstr ""
 
-#: popt.c:1115
+#: popt.c:1118
 msgid "mutually exclusive logical operations requested"
 msgstr ""
 
-#: popt.c:1117
+#: popt.c:1120
 msgid "opt->arg should not be NULL"
 msgstr ""
 
-#: popt.c:1119
+#: popt.c:1122
 msgid "aliases nested too deeply"
 msgstr ""
 
-#: popt.c:1121
+#: popt.c:1124
 msgid "error in parameter quoting"
 msgstr ""
 
-#: popt.c:1123
+#: popt.c:1126
 msgid "invalid numeric value"
 msgstr ""
 
-#: popt.c:1125
+#: popt.c:1128
 msgid "number too large or too small"
 msgstr ""
 
-#: popt.c:1127
+#: popt.c:1130
 msgid "memory allocation failed"
 msgstr ""
 
-#: popt.c:1131
+#: popt.c:1134
 msgid "unknown error"
 msgstr ""
 
@@ -107,10 +107,10 @@ msgstr ""
 msgid "ARG"
 msgstr ""
 
-#: popthelp.c:454
+#: popthelp.c:456
 msgid "Usage:"
 msgstr ""
 
-#: popthelp.c:476
+#: popthelp.c:478
 msgid "[OPTION...]"
 msgstr ""
diff --git a/po/zh_CN.GB2312.po b/po/zh_CN.GB2312.po
index f1b64c1..f1fb6fb 100644
--- a/po/zh_CN.GB2312.po
+++ b/po/zh_CN.GB2312.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.3\n"
-"POT-Creation-Date: 2001-10-14 23:13-0400\n"
+"POT-Creation-Date: 2001-10-15 13:39-0400\n"
 "PO-Revision-Date: 1999-11-11 05:04+0800\n"
 "Last-Translator: Dillion Chen <dillon.chen@turbolinux.com.cn>\n"
 "Language-Team: TLDN\n"
@@ -13,48 +13,48 @@ msgstr ""
 msgid "unknown errno"
 msgstr ""
 
-#: popt.c:900
+#: popt.c:903
 #, c-format
 msgid "option type (%d) not implemented in popt\n"
 msgstr ""
 
-#: popt.c:1111
+#: popt.c:1114
 msgid "missing argument"
 msgstr ""
 
-#: popt.c:1113
+#: popt.c:1116
 msgid "unknown option"
 msgstr ""
 
-#: popt.c:1115
+#: popt.c:1118
 msgid "mutually exclusive logical operations requested"
 msgstr ""
 
-#: popt.c:1117
+#: popt.c:1120
 msgid "opt->arg should not be NULL"
 msgstr ""
 
-#: popt.c:1119
+#: popt.c:1122
 msgid "aliases nested too deeply"
 msgstr ""
 
-#: popt.c:1121
+#: popt.c:1124
 msgid "error in parameter quoting"
 msgstr ""
 
-#: popt.c:1123
+#: popt.c:1126
 msgid "invalid numeric value"
 msgstr ""
 
-#: popt.c:1125
+#: popt.c:1128
 msgid "number too large or too small"
 msgstr ""
 
-#: popt.c:1127
+#: popt.c:1130
 msgid "memory allocation failed"
 msgstr ""
 
-#: popt.c:1131
+#: popt.c:1134
 msgid "unknown error"
 msgstr ""
 
@@ -103,10 +103,10 @@ msgstr ""
 msgid "ARG"
 msgstr ""
 
-#: popthelp.c:454
+#: popthelp.c:456
 msgid "Usage:"
 msgstr ""
 
-#: popthelp.c:476
+#: popthelp.c:478
 msgid "[OPTION...]"
 msgstr ""
diff --git a/popt.c b/popt.c
index 508c304..c7ec5bf 100644
--- a/popt.c
+++ b/popt.c
@@ -52,6 +52,7 @@ void poptSetExecPath(poptContext con, const char * path, int allowAbsolute)
 }
 
 static void invokeCallbacksPRE(poptContext con, const struct poptOption * opt)
+	/*@globals internalState@*/
 	/*@modifies internalState@*/
 {
     if (opt != NULL)
@@ -74,6 +75,7 @@ static void invokeCallbacksPRE(poptContext con, const struct poptOption * opt)
 }
 
 static void invokeCallbacksPOST(poptContext con, const struct poptOption * opt)
+	/*@globals internalState@*/
 	/*@modifies internalState@*/
 {
     if (opt != NULL)
@@ -99,6 +101,7 @@ static void invokeCallbacksOPTION(poptContext con,
 				  const struct poptOption * opt,
 				  const struct poptOption * myOpt,
 				  /*@null@*/ const void * myData, int shorty)
+	/*@globals internalState@*/
 	/*@modifies internalState@*/
 {
     const struct poptOption * cbopt = NULL;
@@ -341,7 +344,7 @@ static int handleAlias(/*@special@*/ poptContext con,
 }
 
 static int execCommand(poptContext con)
-    /*@modifies fileSystem @*/
+    /*@*/
 {
     poptItem item = con->doExec;
     const char ** argv;
@@ -1032,20 +1035,20 @@ poptContext poptFreeContext(poptContext con)
     return con;
 }
 
-int poptAddAlias(poptContext con, struct poptAlias newAlias,
+int poptAddAlias(poptContext con, struct poptAlias alias,
 		/*@unused@*/ int flags)
 {
     poptItem item = alloca(sizeof(*item));
     memset(item, 0, sizeof(*item));
-    item->option.longName = newAlias.longName;
-    item->option.shortName = newAlias.shortName;
+    item->option.longName = alias.longName;
+    item->option.shortName = alias.shortName;
     item->option.argInfo = POPT_ARGFLAG_DOC_HIDDEN;
     item->option.arg = 0;
     item->option.val = 0;
     item->option.descrip = NULL;
     item->option.argDescrip = NULL;
-    item->argc = newAlias.argc;
-    item->argv = newAlias.argv;
+    item->argc = alias.argc;
+    item->argv = alias.argv;
     return poptAddItem(con, item, 0);
 }
 
diff --git a/popthelp.c b/popthelp.c
index 7e22354..853f529 100644
--- a/popthelp.c
+++ b/popthelp.c
@@ -220,6 +220,7 @@ static void singleOptionHelp(FILE * fp, int maxLeftCol,
 	    *le++ = '[';
 
 	/* Choose type of output */
+	/*@-branchstate@*/
 	if (opt->argInfo & POPT_ARGFLAG_SHOW_DEFAULT) {
 	    defs = singleOptionDefaultValue(lineLength, opt, translation_domain);
 	    if (defs) {
@@ -238,6 +239,7 @@ static void singleOptionHelp(FILE * fp, int maxLeftCol,
 		defs = t;
 	    }
 	}
+	/*@=branchstate@*/
 
 	if (opt->argDescrip == NULL) {
 	    switch (opt->argInfo & POPT_ARG_MASK) {
-- 
Gitee


From 95591e0e23a8bab6b1836b7c59b0fc49594b85f7 Mon Sep 17 00:00:00 2001
From: Jeff Johnson <n3npq@mac.com>
Date: Tue, 16 Oct 2001 14:58:58 +0000
Subject: [PATCH 325/667] More lclint annotations.

---
 po/popt.pot | 24 ++++++++++++------------
 popt.c      | 22 +++++++++++++++-------
 2 files changed, 27 insertions(+), 19 deletions(-)

diff --git a/po/popt.pot b/po/popt.pot
index 4efb27c..86265e3 100644
--- a/po/popt.pot
+++ b/po/popt.pot
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2001-10-15 13:39-0400\n"
+"POT-Creation-Date: 2001-10-16 10:48-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -18,48 +18,48 @@ msgstr ""
 msgid "unknown errno"
 msgstr ""
 
-#: popt.c:903
+#: popt.c:909
 #, c-format
 msgid "option type (%d) not implemented in popt\n"
 msgstr ""
 
-#: popt.c:1114
+#: popt.c:1120
 msgid "missing argument"
 msgstr ""
 
-#: popt.c:1116
+#: popt.c:1122
 msgid "unknown option"
 msgstr ""
 
-#: popt.c:1118
+#: popt.c:1124
 msgid "mutually exclusive logical operations requested"
 msgstr ""
 
-#: popt.c:1120
+#: popt.c:1126
 msgid "opt->arg should not be NULL"
 msgstr ""
 
-#: popt.c:1122
+#: popt.c:1128
 msgid "aliases nested too deeply"
 msgstr ""
 
-#: popt.c:1124
+#: popt.c:1130
 msgid "error in parameter quoting"
 msgstr ""
 
-#: popt.c:1126
+#: popt.c:1132
 msgid "invalid numeric value"
 msgstr ""
 
-#: popt.c:1128
+#: popt.c:1134
 msgid "number too large or too small"
 msgstr ""
 
-#: popt.c:1130
+#: popt.c:1136
 msgid "memory allocation failed"
 msgstr ""
 
-#: popt.c:1134
+#: popt.c:1140
 msgid "unknown error"
 msgstr ""
 
diff --git a/popt.c b/popt.c
index c7ec5bf..728bf8c 100644
--- a/popt.c
+++ b/popt.c
@@ -67,9 +67,9 @@ static void invokeCallbacksPRE(poptContext con, const struct poptOption * opt)
 	    poptCallbackType cb = (poptCallbackType)opt->arg;
 	    /*@=castfcnptr@*/
 	    /* Perform callback. */
-	    /*@-moduncon@*/
+	    /*@-moduncon -noeffectuncon @*/
 	    cb(con, POPT_CALLBACK_REASON_PRE, NULL, NULL, opt->descrip);
-	    /*@=moduncon@*/
+	    /*@=moduncon =noeffectuncon @*/
 	}
     }
 }
@@ -90,9 +90,9 @@ static void invokeCallbacksPOST(poptContext con, const struct poptOption * opt)
 	    poptCallbackType cb = (poptCallbackType)opt->arg;
 	    /*@=castfcnptr@*/
 	    /* Perform callback. */
-	    /*@-moduncon@*/
+	    /*@-moduncon -noeffectuncon @*/
 	    cb(con, POPT_CALLBACK_REASON_POST, NULL, NULL, opt->descrip);
-	    /*@=moduncon@*/
+	    /*@=moduncon =noeffectuncon @*/
 	}
     }
 }
@@ -130,10 +130,10 @@ static void invokeCallbacksOPTION(poptContext con,
 	    const void * cbData = (cbopt->descrip ? cbopt->descrip : myData);
 	    /* Perform callback. */
 	    if (cb != NULL) {	/* XXX program error */
-		/*@-moduncon@*/
+		/*@-moduncon -noeffectuncon @*/
 		cb(con, POPT_CALLBACK_REASON_OPTION, myOpt,
 			con->os->nextArg, cbData);
-		/*@=moduncon@*/
+		/*@=moduncon =noeffectuncon @*/
 	    }
 	    /* Terminate (unless explcitly continuing). */
 	    if (!(cbopt->argInfo & POPT_CBFLAG_CONTINUE))
@@ -160,7 +160,7 @@ poptContext poptGetContext(const char * name, int argc, const char ** argv,
     if (!(flags & POPT_CONTEXT_KEEP_FIRST))
 	con->os->next = 1;			/* skip argv[0] */
 
-    con->leftovers = calloc( (argc + 1), sizeof(char *) );
+    con->leftovers = calloc( (argc + 1), sizeof(*con->leftovers) );
     /*@-dependenttrans -assignexpose@*/	/* FIX: W2DO? */
     con->options = options;
     /*@=dependenttrans =assignexpose@*/
@@ -510,6 +510,7 @@ static const char * findNextArg(/*@special@*/ poptContext con,
 	if (os->next == os->argc && os == con->optionStack) break;
 	if (os->argv != NULL)
 	for (i = os->next; i < os->argc; i++) {
+	    /*@-sizeoftype@*/
 	    if (os->argb && PBM_ISSET(i, os->argb))
 		/*@innercontinue@*/ continue;
 	    if (*os->argv[i] == '-')
@@ -523,6 +524,7 @@ static const char * findNextArg(/*@special@*/ poptContext con,
 		PBM_SET(i, os->argb);
 	    }
 	    /*@innerbreak@*/ break;
+	    /*@=sizeoftype@*/
 	}
 	if (os > con->optionStack) os--;
     } while (arg == NULL);
@@ -583,10 +585,12 @@ static void poptStripArg(/*@special@*/ poptContext con, int which)
 	/*@defines con->arg_strip @*/
 	/*@modifies con @*/
 {
+    /*@-sizeoftype@*/
     if (con->arg_strip == NULL)
 	con->arg_strip = PBM_ALLOC(con->optionStack[0].argc);
     if (con->arg_strip != NULL)		/* XXX can't happen */
     PBM_SET(which, con->arg_strip);
+    /*@=sizeoftype@*/
 }
 
 static int poptSaveLong(const struct poptOption * opt, long aLong)
@@ -678,10 +682,12 @@ int poptGetNextOpt(poptContext con)
 	    char * localOptString, * optString;
 	    int thisopt;
 
+	    /*@-sizeoftype@*/
 	    if (con->os->argb && PBM_ISSET(con->os->next, con->os->argb)) {
 		con->os->next++;
 		continue;
 	    }
+	    /*@=sizeoftype@*/
 	    thisopt = con->os->next;
 	    if (con->os->argv != NULL)	/* XXX can't happen */
 	    origOptString = con->os->argv[con->os->next++];
@@ -1169,6 +1175,7 @@ int poptStrippedArgv(poptContext con, int argc, char ** argv)
     int j = 1;
     int i;
     
+    /*@-sizeoftype@*/
     if (con->arg_strip)
     for (i = 1; i < argc; i++) {
 	if (PBM_ISSET(i, con->arg_strip))
@@ -1181,6 +1188,7 @@ int poptStrippedArgv(poptContext con, int argc, char ** argv)
 	argv[j] = (j < numargs) ? argv[i] : NULL;
 	j++;
     }
+    /*@=sizeoftype@*/
     
     return numargs;
 }
-- 
Gitee


From 2f668fe36c984fc8cc5e571a2af41708f8b3b940 Mon Sep 17 00:00:00 2001
From: Jeff Johnson <n3npq@mac.com>
Date: Tue, 16 Oct 2001 17:42:19 +0000
Subject: [PATCH 326/667] Factor -type problems into explicit code annotations.

---
 popt.h       | 10 ++++++----
 poptconfig.c |  7 +++++++
 popthelp.c   |  2 ++
 3 files changed, 15 insertions(+), 4 deletions(-)

diff --git a/popt.h b/popt.h
index 436f9f4..bb6a867 100644
--- a/popt.h
+++ b/popt.h
@@ -9,10 +9,6 @@
 #ifndef H_POPT
 #define H_POPT
 
-#ifdef __cplusplus
-extern "C" {
-#endif
-
 #include <stdio.h>			/* for FILE * */
 
 #define POPT_OPTION_DEPTH	10
@@ -184,6 +180,11 @@ enum poptCallbackReason { POPT_CALLBACK_REASON_PRE,
 			  POPT_CALLBACK_REASON_POST,
 			  POPT_CALLBACK_REASON_OPTION };
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+/*@-type@*/
+
 /** \ingroup popt
  * Table callback prototype.
  * @param con		context
@@ -437,6 +438,7 @@ int poptStrippedArgv(poptContext con, int argc, char ** argv)
 	/*@modifies *argv @*/;
 /*@=fcnuse@*/
 
+/*@=type@*/
 #ifdef  __cplusplus
 }
 #endif
diff --git a/poptconfig.c b/poptconfig.c
index bc902d4..e553f86 100644
--- a/poptconfig.c
+++ b/poptconfig.c
@@ -13,7 +13,9 @@
 static void configLine(poptContext con, char * line)
 	/*@modifies con @*/
 {
+    /*@-type@*/
     int nameLength = strlen(con->appName);
+    /*@=type@*/
     const char * entryType;
     const char * opt;
     poptItem item = alloca(sizeof(*item));
@@ -21,7 +23,10 @@ static void configLine(poptContext con, char * line)
     
     memset(item, 0, sizeof(*item));
 
+    /*@-type@*/
     if (strncmp(line, con->appName, nameLength)) return;
+    /*@=type@*/
+
     line += nameLength;
     if (*line == '\0' || !isspace(*line)) return;
 
@@ -151,7 +156,9 @@ int poptReadDefaultConfig(poptContext con, /*@unused@*/ int useEnv) {
     char * fn, * home;
     int rc;
 
+    /*@-type@*/
     if (!con->appName) return 0;
+    /*@=type@*/
 
     rc = poptReadConfigFile(con, "/etc/popt");
     if (rc) return rc;
diff --git a/popthelp.c b/popthelp.c
index 853f529..e2e2eef 100644
--- a/popthelp.c
+++ b/popthelp.c
@@ -1,5 +1,6 @@
 /* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 4 -*- */
 
+/*@-type@*/
 /** \ingroup popt
  * \file popt/popthelp.c
  */
@@ -650,3 +651,4 @@ void poptSetOtherOptionHelp(poptContext con, const char * text)
     con->otherHelp = _free(con->otherHelp);
     con->otherHelp = xstrdup(text);
 }
+/*@=type@*/
-- 
Gitee


From c8517f07e063640a232fb672c1005324a6628562 Mon Sep 17 00:00:00 2001
From: Jeff Johnson <n3npq@mac.com>
Date: Wed, 17 Oct 2001 16:43:37 +0000
Subject: [PATCH 327/667] Converging on lclint-3.0.17 strict level.

---
 po/popt.pot  | 50 +++++++++++++++++++++++++-------------------------
 popt.c       |  2 ++
 poptconfig.c |  4 ++++
 3 files changed, 31 insertions(+), 25 deletions(-)

diff --git a/po/popt.pot b/po/popt.pot
index 86265e3..b8743a6 100644
--- a/po/popt.pot
+++ b/po/popt.pot
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2001-10-16 10:48-0400\n"
+"POT-Creation-Date: 2001-10-17 12:38-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -18,99 +18,99 @@ msgstr ""
 msgid "unknown errno"
 msgstr ""
 
-#: popt.c:909
+#: popt.c:911
 #, c-format
 msgid "option type (%d) not implemented in popt\n"
 msgstr ""
 
-#: popt.c:1120
+#: popt.c:1122
 msgid "missing argument"
 msgstr ""
 
-#: popt.c:1122
+#: popt.c:1124
 msgid "unknown option"
 msgstr ""
 
-#: popt.c:1124
+#: popt.c:1126
 msgid "mutually exclusive logical operations requested"
 msgstr ""
 
-#: popt.c:1126
+#: popt.c:1128
 msgid "opt->arg should not be NULL"
 msgstr ""
 
-#: popt.c:1128
+#: popt.c:1130
 msgid "aliases nested too deeply"
 msgstr ""
 
-#: popt.c:1130
+#: popt.c:1132
 msgid "error in parameter quoting"
 msgstr ""
 
-#: popt.c:1132
+#: popt.c:1134
 msgid "invalid numeric value"
 msgstr ""
 
-#: popt.c:1134
+#: popt.c:1136
 msgid "number too large or too small"
 msgstr ""
 
-#: popt.c:1136
+#: popt.c:1138
 msgid "memory allocation failed"
 msgstr ""
 
-#: popt.c:1140
+#: popt.c:1142
 msgid "unknown error"
 msgstr ""
 
-#: popthelp.c:52
+#: popthelp.c:53
 msgid "Show this help message"
 msgstr ""
 
-#: popthelp.c:53
+#: popthelp.c:54
 msgid "Display brief usage message"
 msgstr ""
 
-#: popthelp.c:56
+#: popthelp.c:57
 msgid "Display option defaults in message"
 msgstr ""
 
-#: popthelp.c:98
+#: popthelp.c:99
 msgid "NONE"
 msgstr ""
 
-#: popthelp.c:99
+#: popthelp.c:100
 msgid "VAL"
 msgstr ""
 
-#: popthelp.c:100
+#: popthelp.c:101
 msgid "INT"
 msgstr ""
 
-#: popthelp.c:101
+#: popthelp.c:102
 msgid "LONG"
 msgstr ""
 
-#: popthelp.c:102
+#: popthelp.c:103
 msgid "STRING"
 msgstr ""
 
-#: popthelp.c:103
+#: popthelp.c:104
 msgid "FLOAT"
 msgstr ""
 
-#: popthelp.c:104
+#: popthelp.c:105
 msgid "DOUBLE"
 msgstr ""
 
-#: popthelp.c:105
+#: popthelp.c:106
 msgid "ARG"
 msgstr ""
 
-#: popthelp.c:456
+#: popthelp.c:457
 msgid "Usage:"
 msgstr ""
 
-#: popthelp.c:478
+#: popthelp.c:479
 msgid "[OPTION...]"
 msgstr ""
diff --git a/popt.c b/popt.c
index 728bf8c..cd01a77 100644
--- a/popt.c
+++ b/popt.c
@@ -883,12 +883,14 @@ int poptGetNextOpt(poptContext con)
 		    char *end;
 
 		    if (con->os->nextArg) {
+			/*@-mods@*/
 			int saveerrno = errno;
 			errno = 0;
 			aDouble = strtod(con->os->nextArg, &end);
 			if (errno == ERANGE)
 			    return POPT_ERROR_OVERFLOW;
 			errno = saveerrno;
+			/*@=mods@*/
 			if (*end != '\0')
 			    return POPT_ERROR_BADNUMBER;
 		    }
diff --git a/poptconfig.c b/poptconfig.c
index e553f86..0c70471 100644
--- a/poptconfig.c
+++ b/poptconfig.c
@@ -103,7 +103,9 @@ int poptReadConfigFile(poptContext con, const char * fn)
     if (fileLength == -1 || lseek(fd, 0, 0) == -1) {
 	rc = errno;
 	(void) close(fd);
+	/*@-mods@*/
 	errno = rc;
+	/*@=mods@*/
 	return POPT_ERROR_ERRNO;
     }
 
@@ -111,7 +113,9 @@ int poptReadConfigFile(poptContext con, const char * fn)
     if (read(fd, (char *)file, fileLength) != fileLength) {
 	rc = errno;
 	(void) close(fd);
+	/*@-mods@*/
 	errno = rc;
+	/*@=mods@*/
 	return POPT_ERROR_ERRNO;
     }
     if (close(fd) == -1)
-- 
Gitee


From 89321c4a3a7cba75abbbd78bf1dad015e8a5e30e Mon Sep 17 00:00:00 2001
From: Jeff Johnson <n3npq@mac.com>
Date: Fri, 19 Oct 2001 19:51:33 +0000
Subject: [PATCH 328/667] - beecrypt is at least as good as pgp/gpg on verify,
 pull the plug.

---
 po/cs.po           | 50 +++++++++++++++++++++++-----------------------
 po/da.po           | 50 +++++++++++++++++++++++-----------------------
 po/de.po           | 50 +++++++++++++++++++++++-----------------------
 po/es.po           | 50 +++++++++++++++++++++++-----------------------
 po/eu_ES.po        | 50 +++++++++++++++++++++++-----------------------
 po/fi.po           | 50 +++++++++++++++++++++++-----------------------
 po/fr.po           | 50 +++++++++++++++++++++++-----------------------
 po/gl.po           | 50 +++++++++++++++++++++++-----------------------
 po/hu.po           | 50 +++++++++++++++++++++++-----------------------
 po/id.po           | 50 +++++++++++++++++++++++-----------------------
 po/is.po           | 50 +++++++++++++++++++++++-----------------------
 po/it.po           | 50 +++++++++++++++++++++++-----------------------
 po/ja.po           | 50 +++++++++++++++++++++++-----------------------
 po/ko.po           | 50 +++++++++++++++++++++++-----------------------
 po/no.po           | 50 +++++++++++++++++++++++-----------------------
 po/pl.po           | 50 +++++++++++++++++++++++-----------------------
 po/pt.po           | 50 +++++++++++++++++++++++-----------------------
 po/pt_BR.po        | 50 +++++++++++++++++++++++-----------------------
 po/ro.po           | 50 +++++++++++++++++++++++-----------------------
 po/ru.po           | 50 +++++++++++++++++++++++-----------------------
 po/sk.po           | 50 +++++++++++++++++++++++-----------------------
 po/sl.po           | 50 +++++++++++++++++++++++-----------------------
 po/sr.po           | 50 +++++++++++++++++++++++-----------------------
 po/sv.po           | 50 +++++++++++++++++++++++-----------------------
 po/tr.po           | 50 +++++++++++++++++++++++-----------------------
 po/uk.po           | 50 +++++++++++++++++++++++-----------------------
 po/wa.po           | 50 +++++++++++++++++++++++-----------------------
 po/zh.po           | 50 +++++++++++++++++++++++-----------------------
 po/zh_CN.GB2312.po | 50 +++++++++++++++++++++++-----------------------
 29 files changed, 725 insertions(+), 725 deletions(-)

diff --git a/po/cs.po b/po/cs.po
index 82d1ee8..84632ff 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.3\n"
-"POT-Creation-Date: 2001-10-15 13:39-0400\n"
+"POT-Creation-Date: 2001-10-17 12:38-0400\n"
 "PO-Revision-Date: 2001-07-24 00:03+0100\n"
 "Last-Translator: Milan Kerslager <kerslage@linux.cz>\n"
 "Language-Team: Czech <cs@li.org>\n"
@@ -13,99 +13,99 @@ msgstr ""
 msgid "unknown errno"
 msgstr "nezn�m� ��slo chyby"
 
-#: popt.c:903
+#: popt.c:911
 #, c-format
 msgid "option type (%d) not implemented in popt\n"
 msgstr "volba (%d) nen� v popt implementov�na\n"
 
-#: popt.c:1114
+#: popt.c:1122
 msgid "missing argument"
 msgstr "chyb� argument"
 
-#: popt.c:1116
+#: popt.c:1124
 msgid "unknown option"
 msgstr "nezn�m� volba"
 
-#: popt.c:1118
+#: popt.c:1126
 msgid "mutually exclusive logical operations requested"
 msgstr "po�adov�ny vz�jemn� v�lu�n� logick� operace"
 
-#: popt.c:1120
+#: popt.c:1128
 msgid "opt->arg should not be NULL"
 msgstr "opt->arg nesm� b�t NULL"
 
-#: popt.c:1122
+#: popt.c:1130
 msgid "aliases nested too deeply"
 msgstr "aliasy vno�en� p��li� hluboko"
 
-#: popt.c:1124
+#: popt.c:1132
 msgid "error in parameter quoting"
 msgstr "chyba v quotov�n� parametr�"
 
-#: popt.c:1126
+#: popt.c:1134
 msgid "invalid numeric value"
 msgstr "chybn� numerick� hodnota"
 
-#: popt.c:1128
+#: popt.c:1136
 msgid "number too large or too small"
 msgstr "��slo je p��li� velk� nebo p��li� mal�"
 
-#: popt.c:1130
+#: popt.c:1138
 msgid "memory allocation failed"
 msgstr "selhala alokace pam�ti"
 
-#: popt.c:1134
+#: popt.c:1142
 msgid "unknown error"
 msgstr "nezn�m� chyba"
 
-#: popthelp.c:52
+#: popthelp.c:53
 msgid "Show this help message"
 msgstr "Vyp��e tuto n�pov�du"
 
-#: popthelp.c:53
+#: popthelp.c:54
 msgid "Display brief usage message"
 msgstr "Vyp��e kr�tk� n�vod k pou�it�"
 
-#: popthelp.c:56
+#: popthelp.c:57
 msgid "Display option defaults in message"
 msgstr "Zobrazit implicitn� volby ve zpr�v�"
 
-#: popthelp.c:98
+#: popthelp.c:99
 msgid "NONE"
 msgstr "NONE"
 
-#: popthelp.c:99
+#: popthelp.c:100
 msgid "VAL"
 msgstr "VAL"
 
-#: popthelp.c:100
+#: popthelp.c:101
 msgid "INT"
 msgstr "INT"
 
-#: popthelp.c:101
+#: popthelp.c:102
 msgid "LONG"
 msgstr "LONG"
 
-#: popthelp.c:102
+#: popthelp.c:103
 msgid "STRING"
 msgstr "STRING"
 
-#: popthelp.c:103
+#: popthelp.c:104
 msgid "FLOAT"
 msgstr "FLOAT"
 
-#: popthelp.c:104
+#: popthelp.c:105
 msgid "DOUBLE"
 msgstr "DOUBLE"
 
-#: popthelp.c:105
+#: popthelp.c:106
 msgid "ARG"
 msgstr "ARG"
 
-#: popthelp.c:456
+#: popthelp.c:457
 msgid "Usage:"
 msgstr "Pou�it�:"
 
-#: popthelp.c:478
+#: popthelp.c:479
 msgid "[OPTION...]"
 msgstr "[VOLBY...]"
diff --git a/po/da.po b/po/da.po
index 0c0abd1..722fa9c 100644
--- a/po/da.po
+++ b/po/da.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.3\n"
-"POT-Creation-Date: 2001-10-15 13:39-0400\n"
+"POT-Creation-Date: 2001-10-17 12:38-0400\n"
 "PO-Revision-Date: Sun Jan 21 2001 04:30:32+0200\n"
 "Last-Translator: Martin Hansen <mah@k64.dk>\n"
 "Language-Team: Dansk <dansk@klid.dk>\n"
@@ -14,100 +14,100 @@ msgstr ""
 msgid "unknown errno"
 msgstr "ukendt fejlnr."
 
-#: popt.c:903
+#: popt.c:911
 #, c-format
 msgid "option type (%d) not implemented in popt\n"
 msgstr "tilvalgstype (%d) er ikke implementeret i popt\n"
 
-#: popt.c:1114
+#: popt.c:1122
 msgid "missing argument"
 msgstr "mangler argument"
 
-#: popt.c:1116
+#: popt.c:1124
 msgid "unknown option"
 msgstr "ukendt tilvalg"
 
-#: popt.c:1118
+#: popt.c:1126
 msgid "mutually exclusive logical operations requested"
 msgstr "de �nskede handlinger udelukker hinanden"
 
-#: popt.c:1120
+#: popt.c:1128
 msgid "opt->arg should not be NULL"
 msgstr ""
 
-#: popt.c:1122
+#: popt.c:1130
 msgid "aliases nested too deeply"
 msgstr "aliaser er for dybt indlejret"
 
-#: popt.c:1124
+#: popt.c:1132
 msgid "error in parameter quoting"
 msgstr "fejl i parameter citering"
 
-#: popt.c:1126
+#: popt.c:1134
 msgid "invalid numeric value"
 msgstr "ugyldig numerisk v�rdi"
 
-#: popt.c:1128
+#: popt.c:1136
 msgid "number too large or too small"
 msgstr "nummer for stort, eller for lille"
 
-#: popt.c:1130
+#: popt.c:1138
 msgid "memory allocation failed"
 msgstr ""
 
-#: popt.c:1134
+#: popt.c:1142
 msgid "unknown error"
 msgstr "ukendt fejl"
 
-#: popthelp.c:52
+#: popthelp.c:53
 msgid "Show this help message"
 msgstr "Vis denne hj�lpemeddelelse"
 
-#: popthelp.c:53
+#: popthelp.c:54
 msgid "Display brief usage message"
 msgstr "Vis kortfattet brugsanvisning"
 
-#: popthelp.c:56
+#: popthelp.c:57
 #, fuzzy
 msgid "Display option defaults in message"
 msgstr "Vis kortfattet brugsanvisning"
 
-#: popthelp.c:98
+#: popthelp.c:99
 msgid "NONE"
 msgstr "INGEN"
 
-#: popthelp.c:99
+#: popthelp.c:100
 msgid "VAL"
 msgstr "VAL"
 
-#: popthelp.c:100
+#: popthelp.c:101
 msgid "INT"
 msgstr "INT"
 
-#: popthelp.c:101
+#: popthelp.c:102
 msgid "LONG"
 msgstr "LONG"
 
-#: popthelp.c:102
+#: popthelp.c:103
 msgid "STRING"
 msgstr "STRING"
 
-#: popthelp.c:103
+#: popthelp.c:104
 msgid "FLOAT"
 msgstr "FLOAT"
 
-#: popthelp.c:104
+#: popthelp.c:105
 msgid "DOUBLE"
 msgstr "DOUBLE"
 
-#: popthelp.c:105
+#: popthelp.c:106
 msgid "ARG"
 msgstr "ARG"
 
-#: popthelp.c:456
+#: popthelp.c:457
 msgid "Usage:"
 msgstr "Brug:"
 
-#: popthelp.c:478
+#: popthelp.c:479
 msgid "[OPTION...]"
 msgstr "[TILVALG...]"
diff --git a/po/de.po b/po/de.po
index 83e97b1..3c39df2 100644
--- a/po/de.po
+++ b/po/de.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.3\n"
-"POT-Creation-Date: 2001-10-15 13:39-0400\n"
+"POT-Creation-Date: 2001-10-17 12:38-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -18,99 +18,99 @@ msgstr ""
 msgid "unknown errno"
 msgstr ""
 
-#: popt.c:903
+#: popt.c:911
 #, c-format
 msgid "option type (%d) not implemented in popt\n"
 msgstr ""
 
-#: popt.c:1114
+#: popt.c:1122
 msgid "missing argument"
 msgstr ""
 
-#: popt.c:1116
+#: popt.c:1124
 msgid "unknown option"
 msgstr ""
 
-#: popt.c:1118
+#: popt.c:1126
 msgid "mutually exclusive logical operations requested"
 msgstr ""
 
-#: popt.c:1120
+#: popt.c:1128
 msgid "opt->arg should not be NULL"
 msgstr ""
 
-#: popt.c:1122
+#: popt.c:1130
 msgid "aliases nested too deeply"
 msgstr ""
 
-#: popt.c:1124
+#: popt.c:1132
 msgid "error in parameter quoting"
 msgstr ""
 
-#: popt.c:1126
+#: popt.c:1134
 msgid "invalid numeric value"
 msgstr ""
 
-#: popt.c:1128
+#: popt.c:1136
 msgid "number too large or too small"
 msgstr ""
 
-#: popt.c:1130
+#: popt.c:1138
 msgid "memory allocation failed"
 msgstr ""
 
-#: popt.c:1134
+#: popt.c:1142
 msgid "unknown error"
 msgstr ""
 
-#: popthelp.c:52
+#: popthelp.c:53
 msgid "Show this help message"
 msgstr ""
 
-#: popthelp.c:53
+#: popthelp.c:54
 msgid "Display brief usage message"
 msgstr ""
 
-#: popthelp.c:56
+#: popthelp.c:57
 msgid "Display option defaults in message"
 msgstr ""
 
-#: popthelp.c:98
+#: popthelp.c:99
 msgid "NONE"
 msgstr ""
 
-#: popthelp.c:99
+#: popthelp.c:100
 msgid "VAL"
 msgstr ""
 
-#: popthelp.c:100
+#: popthelp.c:101
 msgid "INT"
 msgstr ""
 
-#: popthelp.c:101
+#: popthelp.c:102
 msgid "LONG"
 msgstr ""
 
-#: popthelp.c:102
+#: popthelp.c:103
 msgid "STRING"
 msgstr ""
 
-#: popthelp.c:103
+#: popthelp.c:104
 msgid "FLOAT"
 msgstr ""
 
-#: popthelp.c:104
+#: popthelp.c:105
 msgid "DOUBLE"
 msgstr ""
 
-#: popthelp.c:105
+#: popthelp.c:106
 msgid "ARG"
 msgstr ""
 
-#: popthelp.c:456
+#: popthelp.c:457
 msgid "Usage:"
 msgstr ""
 
-#: popthelp.c:478
+#: popthelp.c:479
 msgid "[OPTION...]"
 msgstr ""
diff --git a/po/es.po b/po/es.po
index 5de427b..2bfcfcf 100644
--- a/po/es.po
+++ b/po/es.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.3\n"
-"POT-Creation-Date: 2001-10-15 13:39-0400\n"
+"POT-Creation-Date: 2001-10-17 12:38-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Leandro Lucarella <luca@linuxmendoza.org.ar>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -18,100 +18,100 @@ msgstr ""
 msgid "unknown errno"
 msgstr "errno desconocido"
 
-#: popt.c:903
+#: popt.c:911
 #, c-format
 msgid "option type (%d) not implemented in popt\n"
 msgstr "tipo de opci�n (%d) no implementada en popt\n"
 
-#: popt.c:1114
+#: popt.c:1122
 msgid "missing argument"
 msgstr "falta argumento"
 
-#: popt.c:1116
+#: popt.c:1124
 msgid "unknown option"
 msgstr "opci�n desconocida"
 
-#: popt.c:1118
+#: popt.c:1126
 msgid "mutually exclusive logical operations requested"
 msgstr "requerida operaci�n l�gica mutuamente exclusiva"
 
-#: popt.c:1120
+#: popt.c:1128
 msgid "opt->arg should not be NULL"
 msgstr ""
 
-#: popt.c:1122
+#: popt.c:1130
 msgid "aliases nested too deeply"
 msgstr "alias anidados muy profundamente"
 
-#: popt.c:1124
+#: popt.c:1132
 msgid "error in parameter quoting"
 msgstr "error en cita de par�metros"
 
-#: popt.c:1126
+#: popt.c:1134
 msgid "invalid numeric value"
 msgstr "valor num�rico inv�lido"
 
-#: popt.c:1128
+#: popt.c:1136
 msgid "number too large or too small"
 msgstr "n�mero muy largo o muy peque�o"
 
-#: popt.c:1130
+#: popt.c:1138
 msgid "memory allocation failed"
 msgstr ""
 
-#: popt.c:1134
+#: popt.c:1142
 msgid "unknown error"
 msgstr "error desconocido"
 
-#: popthelp.c:52
+#: popthelp.c:53
 msgid "Show this help message"
 msgstr "Muestra este mensaje de ayuda"
 
-#: popthelp.c:53
+#: popthelp.c:54
 msgid "Display brief usage message"
 msgstr "Indica el modo de uso resumido"
 
-#: popthelp.c:56
+#: popthelp.c:57
 #, fuzzy
 msgid "Display option defaults in message"
 msgstr "Indica el modo de uso resumido"
 
-#: popthelp.c:98
+#: popthelp.c:99
 msgid "NONE"
 msgstr "NONE"
 
-#: popthelp.c:99
+#: popthelp.c:100
 msgid "VAL"
 msgstr "VAL"
 
-#: popthelp.c:100
+#: popthelp.c:101
 msgid "INT"
 msgstr "INT"
 
-#: popthelp.c:101
+#: popthelp.c:102
 msgid "LONG"
 msgstr "LONG"
 
-#: popthelp.c:102
+#: popthelp.c:103
 msgid "STRING"
 msgstr "STRING"
 
-#: popthelp.c:103
+#: popthelp.c:104
 msgid "FLOAT"
 msgstr "FLOAT"
 
-#: popthelp.c:104
+#: popthelp.c:105
 msgid "DOUBLE"
 msgstr "DOUBLE"
 
-#: popthelp.c:105
+#: popthelp.c:106
 msgid "ARG"
 msgstr "ARG"
 
-#: popthelp.c:456
+#: popthelp.c:457
 msgid "Usage:"
 msgstr "Modo de Uso:"
 
-#: popthelp.c:478
+#: popthelp.c:479
 msgid "[OPTION...]"
 msgstr "[OPCI�N...]"
diff --git a/po/eu_ES.po b/po/eu_ES.po
index 83e97b1..3c39df2 100644
--- a/po/eu_ES.po
+++ b/po/eu_ES.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.3\n"
-"POT-Creation-Date: 2001-10-15 13:39-0400\n"
+"POT-Creation-Date: 2001-10-17 12:38-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -18,99 +18,99 @@ msgstr ""
 msgid "unknown errno"
 msgstr ""
 
-#: popt.c:903
+#: popt.c:911
 #, c-format
 msgid "option type (%d) not implemented in popt\n"
 msgstr ""
 
-#: popt.c:1114
+#: popt.c:1122
 msgid "missing argument"
 msgstr ""
 
-#: popt.c:1116
+#: popt.c:1124
 msgid "unknown option"
 msgstr ""
 
-#: popt.c:1118
+#: popt.c:1126
 msgid "mutually exclusive logical operations requested"
 msgstr ""
 
-#: popt.c:1120
+#: popt.c:1128
 msgid "opt->arg should not be NULL"
 msgstr ""
 
-#: popt.c:1122
+#: popt.c:1130
 msgid "aliases nested too deeply"
 msgstr ""
 
-#: popt.c:1124
+#: popt.c:1132
 msgid "error in parameter quoting"
 msgstr ""
 
-#: popt.c:1126
+#: popt.c:1134
 msgid "invalid numeric value"
 msgstr ""
 
-#: popt.c:1128
+#: popt.c:1136
 msgid "number too large or too small"
 msgstr ""
 
-#: popt.c:1130
+#: popt.c:1138
 msgid "memory allocation failed"
 msgstr ""
 
-#: popt.c:1134
+#: popt.c:1142
 msgid "unknown error"
 msgstr ""
 
-#: popthelp.c:52
+#: popthelp.c:53
 msgid "Show this help message"
 msgstr ""
 
-#: popthelp.c:53
+#: popthelp.c:54
 msgid "Display brief usage message"
 msgstr ""
 
-#: popthelp.c:56
+#: popthelp.c:57
 msgid "Display option defaults in message"
 msgstr ""
 
-#: popthelp.c:98
+#: popthelp.c:99
 msgid "NONE"
 msgstr ""
 
-#: popthelp.c:99
+#: popthelp.c:100
 msgid "VAL"
 msgstr ""
 
-#: popthelp.c:100
+#: popthelp.c:101
 msgid "INT"
 msgstr ""
 
-#: popthelp.c:101
+#: popthelp.c:102
 msgid "LONG"
 msgstr ""
 
-#: popthelp.c:102
+#: popthelp.c:103
 msgid "STRING"
 msgstr ""
 
-#: popthelp.c:103
+#: popthelp.c:104
 msgid "FLOAT"
 msgstr ""
 
-#: popthelp.c:104
+#: popthelp.c:105
 msgid "DOUBLE"
 msgstr ""
 
-#: popthelp.c:105
+#: popthelp.c:106
 msgid "ARG"
 msgstr ""
 
-#: popthelp.c:456
+#: popthelp.c:457
 msgid "Usage:"
 msgstr ""
 
-#: popthelp.c:478
+#: popthelp.c:479
 msgid "[OPTION...]"
 msgstr ""
diff --git a/po/fi.po b/po/fi.po
index 83e97b1..3c39df2 100644
--- a/po/fi.po
+++ b/po/fi.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.3\n"
-"POT-Creation-Date: 2001-10-15 13:39-0400\n"
+"POT-Creation-Date: 2001-10-17 12:38-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -18,99 +18,99 @@ msgstr ""
 msgid "unknown errno"
 msgstr ""
 
-#: popt.c:903
+#: popt.c:911
 #, c-format
 msgid "option type (%d) not implemented in popt\n"
 msgstr ""
 
-#: popt.c:1114
+#: popt.c:1122
 msgid "missing argument"
 msgstr ""
 
-#: popt.c:1116
+#: popt.c:1124
 msgid "unknown option"
 msgstr ""
 
-#: popt.c:1118
+#: popt.c:1126
 msgid "mutually exclusive logical operations requested"
 msgstr ""
 
-#: popt.c:1120
+#: popt.c:1128
 msgid "opt->arg should not be NULL"
 msgstr ""
 
-#: popt.c:1122
+#: popt.c:1130
 msgid "aliases nested too deeply"
 msgstr ""
 
-#: popt.c:1124
+#: popt.c:1132
 msgid "error in parameter quoting"
 msgstr ""
 
-#: popt.c:1126
+#: popt.c:1134
 msgid "invalid numeric value"
 msgstr ""
 
-#: popt.c:1128
+#: popt.c:1136
 msgid "number too large or too small"
 msgstr ""
 
-#: popt.c:1130
+#: popt.c:1138
 msgid "memory allocation failed"
 msgstr ""
 
-#: popt.c:1134
+#: popt.c:1142
 msgid "unknown error"
 msgstr ""
 
-#: popthelp.c:52
+#: popthelp.c:53
 msgid "Show this help message"
 msgstr ""
 
-#: popthelp.c:53
+#: popthelp.c:54
 msgid "Display brief usage message"
 msgstr ""
 
-#: popthelp.c:56
+#: popthelp.c:57
 msgid "Display option defaults in message"
 msgstr ""
 
-#: popthelp.c:98
+#: popthelp.c:99
 msgid "NONE"
 msgstr ""
 
-#: popthelp.c:99
+#: popthelp.c:100
 msgid "VAL"
 msgstr ""
 
-#: popthelp.c:100
+#: popthelp.c:101
 msgid "INT"
 msgstr ""
 
-#: popthelp.c:101
+#: popthelp.c:102
 msgid "LONG"
 msgstr ""
 
-#: popthelp.c:102
+#: popthelp.c:103
 msgid "STRING"
 msgstr ""
 
-#: popthelp.c:103
+#: popthelp.c:104
 msgid "FLOAT"
 msgstr ""
 
-#: popthelp.c:104
+#: popthelp.c:105
 msgid "DOUBLE"
 msgstr ""
 
-#: popthelp.c:105
+#: popthelp.c:106
 msgid "ARG"
 msgstr ""
 
-#: popthelp.c:456
+#: popthelp.c:457
 msgid "Usage:"
 msgstr ""
 
-#: popthelp.c:478
+#: popthelp.c:479
 msgid "[OPTION...]"
 msgstr ""
diff --git a/po/fr.po b/po/fr.po
index 83e97b1..3c39df2 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.3\n"
-"POT-Creation-Date: 2001-10-15 13:39-0400\n"
+"POT-Creation-Date: 2001-10-17 12:38-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -18,99 +18,99 @@ msgstr ""
 msgid "unknown errno"
 msgstr ""
 
-#: popt.c:903
+#: popt.c:911
 #, c-format
 msgid "option type (%d) not implemented in popt\n"
 msgstr ""
 
-#: popt.c:1114
+#: popt.c:1122
 msgid "missing argument"
 msgstr ""
 
-#: popt.c:1116
+#: popt.c:1124
 msgid "unknown option"
 msgstr ""
 
-#: popt.c:1118
+#: popt.c:1126
 msgid "mutually exclusive logical operations requested"
 msgstr ""
 
-#: popt.c:1120
+#: popt.c:1128
 msgid "opt->arg should not be NULL"
 msgstr ""
 
-#: popt.c:1122
+#: popt.c:1130
 msgid "aliases nested too deeply"
 msgstr ""
 
-#: popt.c:1124
+#: popt.c:1132
 msgid "error in parameter quoting"
 msgstr ""
 
-#: popt.c:1126
+#: popt.c:1134
 msgid "invalid numeric value"
 msgstr ""
 
-#: popt.c:1128
+#: popt.c:1136
 msgid "number too large or too small"
 msgstr ""
 
-#: popt.c:1130
+#: popt.c:1138
 msgid "memory allocation failed"
 msgstr ""
 
-#: popt.c:1134
+#: popt.c:1142
 msgid "unknown error"
 msgstr ""
 
-#: popthelp.c:52
+#: popthelp.c:53
 msgid "Show this help message"
 msgstr ""
 
-#: popthelp.c:53
+#: popthelp.c:54
 msgid "Display brief usage message"
 msgstr ""
 
-#: popthelp.c:56
+#: popthelp.c:57
 msgid "Display option defaults in message"
 msgstr ""
 
-#: popthelp.c:98
+#: popthelp.c:99
 msgid "NONE"
 msgstr ""
 
-#: popthelp.c:99
+#: popthelp.c:100
 msgid "VAL"
 msgstr ""
 
-#: popthelp.c:100
+#: popthelp.c:101
 msgid "INT"
 msgstr ""
 
-#: popthelp.c:101
+#: popthelp.c:102
 msgid "LONG"
 msgstr ""
 
-#: popthelp.c:102
+#: popthelp.c:103
 msgid "STRING"
 msgstr ""
 
-#: popthelp.c:103
+#: popthelp.c:104
 msgid "FLOAT"
 msgstr ""
 
-#: popthelp.c:104
+#: popthelp.c:105
 msgid "DOUBLE"
 msgstr ""
 
-#: popthelp.c:105
+#: popthelp.c:106
 msgid "ARG"
 msgstr ""
 
-#: popthelp.c:456
+#: popthelp.c:457
 msgid "Usage:"
 msgstr ""
 
-#: popthelp.c:478
+#: popthelp.c:479
 msgid "[OPTION...]"
 msgstr ""
diff --git a/po/gl.po b/po/gl.po
index ffe1994..a0a6363 100644
--- a/po/gl.po
+++ b/po/gl.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.3\n"
-"POT-Creation-Date: 2001-10-15 13:39-0400\n"
+"POT-Creation-Date: 2001-10-17 12:38-0400\n"
 "PO-Revision-Date: 2001-01-17 01:01+0100\n"
 "Last-Translator: Jes�s Bravo �lvarez <jba@pobox.com>\n"
 "Language-Team: Galician <trasno@ceu.fi.udc.es>\n"
@@ -13,100 +13,100 @@ msgstr ""
 msgid "unknown errno"
 msgstr "errno desco�ecido"
 
-#: popt.c:903
+#: popt.c:911
 #, c-format
 msgid "option type (%d) not implemented in popt\n"
 msgstr "tipo de opci�n (%d) non implementada en popt\n"
 
-#: popt.c:1114
+#: popt.c:1122
 msgid "missing argument"
 msgstr "falta un argumento"
 
-#: popt.c:1116
+#: popt.c:1124
 msgid "unknown option"
 msgstr "opci�n desco�ecida"
 
-#: popt.c:1118
+#: popt.c:1126
 msgid "mutually exclusive logical operations requested"
 msgstr "solicit�ronse operaci�ns l�xicas mutuamente exclu�ntes"
 
-#: popt.c:1120
+#: popt.c:1128
 msgid "opt->arg should not be NULL"
 msgstr ""
 
-#: popt.c:1122
+#: popt.c:1130
 msgid "aliases nested too deeply"
 msgstr "aliases ani�ados a un nivel demasiado profundo"
 
-#: popt.c:1124
+#: popt.c:1132
 msgid "error in parameter quoting"
 msgstr "erro nas comi�as do par�metro"
 
-#: popt.c:1126
+#: popt.c:1134
 msgid "invalid numeric value"
 msgstr "valor num�rico non v�lido"
 
-#: popt.c:1128
+#: popt.c:1136
 msgid "number too large or too small"
 msgstr "n�mero demasiado grande ou pequeno"
 
-#: popt.c:1130
+#: popt.c:1138
 msgid "memory allocation failed"
 msgstr ""
 
-#: popt.c:1134
+#: popt.c:1142
 msgid "unknown error"
 msgstr "erro desco�ecido"
 
-#: popthelp.c:52
+#: popthelp.c:53
 msgid "Show this help message"
 msgstr "Amosar esta mensaxe de axuda"
 
-#: popthelp.c:53
+#: popthelp.c:54
 msgid "Display brief usage message"
 msgstr "Amosar brevemente o xeito de utilizaci�n"
 
-#: popthelp.c:56
+#: popthelp.c:57
 #, fuzzy
 msgid "Display option defaults in message"
 msgstr "Amosar brevemente o xeito de utilizaci�n"
 
-#: popthelp.c:98
+#: popthelp.c:99
 msgid "NONE"
 msgstr "NADA"
 
-#: popthelp.c:99
+#: popthelp.c:100
 msgid "VAL"
 msgstr "VAL"
 
-#: popthelp.c:100
+#: popthelp.c:101
 msgid "INT"
 msgstr "INT"
 
-#: popthelp.c:101
+#: popthelp.c:102
 msgid "LONG"
 msgstr "LONG"
 
-#: popthelp.c:102
+#: popthelp.c:103
 msgid "STRING"
 msgstr "CADEA"
 
-#: popthelp.c:103
+#: popthelp.c:104
 msgid "FLOAT"
 msgstr "FLOAT"
 
-#: popthelp.c:104
+#: popthelp.c:105
 msgid "DOUBLE"
 msgstr "DOUBLE"
 
-#: popthelp.c:105
+#: popthelp.c:106
 msgid "ARG"
 msgstr "ARG"
 
-#: popthelp.c:456
+#: popthelp.c:457
 msgid "Usage:"
 msgstr "Uso:"
 
-#: popthelp.c:478
+#: popthelp.c:479
 msgid "[OPTION...]"
 msgstr "[OPCI�N...]"
diff --git a/po/hu.po b/po/hu.po
index 3d8a185..2623def 100644
--- a/po/hu.po
+++ b/po/hu.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.3\n"
-"POT-Creation-Date: 2001-10-15 13:39-0400\n"
+"POT-Creation-Date: 2001-10-17 12:38-0400\n"
 "PO-Revision-Date: 2000-08-03 23:26+0200\n"
 "Last-Translator: L�szl� N�meth <nemeth@qwertynet.hu>\n"
 "Language-Team: Hungarian\n"
@@ -13,100 +13,100 @@ msgstr ""
 msgid "unknown errno"
 msgstr ""
 
-#: popt.c:903
+#: popt.c:911
 #, c-format
 msgid "option type (%d) not implemented in popt\n"
 msgstr ""
 
-#: popt.c:1114
+#: popt.c:1122
 msgid "missing argument"
 msgstr ""
 
-#: popt.c:1116
+#: popt.c:1124
 msgid "unknown option"
 msgstr ""
 
-#: popt.c:1118
+#: popt.c:1126
 msgid "mutually exclusive logical operations requested"
 msgstr ""
 
-#: popt.c:1120
+#: popt.c:1128
 msgid "opt->arg should not be NULL"
 msgstr ""
 
-#: popt.c:1122
+#: popt.c:1130
 msgid "aliases nested too deeply"
 msgstr ""
 
-#: popt.c:1124
+#: popt.c:1132
 msgid "error in parameter quoting"
 msgstr ""
 
-#: popt.c:1126
+#: popt.c:1134
 msgid "invalid numeric value"
 msgstr ""
 
-#: popt.c:1128
+#: popt.c:1136
 msgid "number too large or too small"
 msgstr ""
 
-#: popt.c:1130
+#: popt.c:1138
 msgid "memory allocation failed"
 msgstr ""
 
-#: popt.c:1134
+#: popt.c:1142
 msgid "unknown error"
 msgstr ""
 
-#: popthelp.c:52
+#: popthelp.c:53
 msgid "Show this help message"
 msgstr "E s�g� megjelen�t�se"
 
-#: popthelp.c:53
+#: popthelp.c:54
 msgid "Display brief usage message"
 msgstr "R�vid haszn�lati utas�t�s megjelen�t�se"
 
-#: popthelp.c:56
+#: popthelp.c:57
 #, fuzzy
 msgid "Display option defaults in message"
 msgstr "R�vid haszn�lati utas�t�s megjelen�t�se"
 
-#: popthelp.c:98
+#: popthelp.c:99
 msgid "NONE"
 msgstr ""
 
-#: popthelp.c:99
+#: popthelp.c:100
 msgid "VAL"
 msgstr ""
 
-#: popthelp.c:100
+#: popthelp.c:101
 msgid "INT"
 msgstr ""
 
-#: popthelp.c:101
+#: popthelp.c:102
 msgid "LONG"
 msgstr ""
 
-#: popthelp.c:102
+#: popthelp.c:103
 msgid "STRING"
 msgstr ""
 
-#: popthelp.c:103
+#: popthelp.c:104
 msgid "FLOAT"
 msgstr ""
 
-#: popthelp.c:104
+#: popthelp.c:105
 msgid "DOUBLE"
 msgstr ""
 
-#: popthelp.c:105
+#: popthelp.c:106
 msgid "ARG"
 msgstr ""
 
-#: popthelp.c:456
+#: popthelp.c:457
 msgid "Usage:"
 msgstr ""
 
-#: popthelp.c:478
+#: popthelp.c:479
 msgid "[OPTION...]"
 msgstr ""
diff --git a/po/id.po b/po/id.po
index 83e97b1..3c39df2 100644
--- a/po/id.po
+++ b/po/id.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.3\n"
-"POT-Creation-Date: 2001-10-15 13:39-0400\n"
+"POT-Creation-Date: 2001-10-17 12:38-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -18,99 +18,99 @@ msgstr ""
 msgid "unknown errno"
 msgstr ""
 
-#: popt.c:903
+#: popt.c:911
 #, c-format
 msgid "option type (%d) not implemented in popt\n"
 msgstr ""
 
-#: popt.c:1114
+#: popt.c:1122
 msgid "missing argument"
 msgstr ""
 
-#: popt.c:1116
+#: popt.c:1124
 msgid "unknown option"
 msgstr ""
 
-#: popt.c:1118
+#: popt.c:1126
 msgid "mutually exclusive logical operations requested"
 msgstr ""
 
-#: popt.c:1120
+#: popt.c:1128
 msgid "opt->arg should not be NULL"
 msgstr ""
 
-#: popt.c:1122
+#: popt.c:1130
 msgid "aliases nested too deeply"
 msgstr ""
 
-#: popt.c:1124
+#: popt.c:1132
 msgid "error in parameter quoting"
 msgstr ""
 
-#: popt.c:1126
+#: popt.c:1134
 msgid "invalid numeric value"
 msgstr ""
 
-#: popt.c:1128
+#: popt.c:1136
 msgid "number too large or too small"
 msgstr ""
 
-#: popt.c:1130
+#: popt.c:1138
 msgid "memory allocation failed"
 msgstr ""
 
-#: popt.c:1134
+#: popt.c:1142
 msgid "unknown error"
 msgstr ""
 
-#: popthelp.c:52
+#: popthelp.c:53
 msgid "Show this help message"
 msgstr ""
 
-#: popthelp.c:53
+#: popthelp.c:54
 msgid "Display brief usage message"
 msgstr ""
 
-#: popthelp.c:56
+#: popthelp.c:57
 msgid "Display option defaults in message"
 msgstr ""
 
-#: popthelp.c:98
+#: popthelp.c:99
 msgid "NONE"
 msgstr ""
 
-#: popthelp.c:99
+#: popthelp.c:100
 msgid "VAL"
 msgstr ""
 
-#: popthelp.c:100
+#: popthelp.c:101
 msgid "INT"
 msgstr ""
 
-#: popthelp.c:101
+#: popthelp.c:102
 msgid "LONG"
 msgstr ""
 
-#: popthelp.c:102
+#: popthelp.c:103
 msgid "STRING"
 msgstr ""
 
-#: popthelp.c:103
+#: popthelp.c:104
 msgid "FLOAT"
 msgstr ""
 
-#: popthelp.c:104
+#: popthelp.c:105
 msgid "DOUBLE"
 msgstr ""
 
-#: popthelp.c:105
+#: popthelp.c:106
 msgid "ARG"
 msgstr ""
 
-#: popthelp.c:456
+#: popthelp.c:457
 msgid "Usage:"
 msgstr ""
 
-#: popthelp.c:478
+#: popthelp.c:479
 msgid "[OPTION...]"
 msgstr ""
diff --git a/po/is.po b/po/is.po
index ca0b75c..cba0395 100644
--- a/po/is.po
+++ b/po/is.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.3\n"
-"POT-Creation-Date: 2001-10-15 13:39-0400\n"
+"POT-Creation-Date: 2001-10-17 12:38-0400\n"
 "PO-Revision-Date: 2001-06-08 01:35+0000\n"
 "Last-Translator: Richard Allen <ra@hp.is>\n"
 "Language-Team: is <kde-isl@mmedia.is>\n"
@@ -13,99 +13,99 @@ msgstr ""
 msgid "unknown errno"
 msgstr "��ekkt villun�mer"
 
-#: popt.c:903
+#: popt.c:911
 #, c-format
 msgid "option type (%d) not implemented in popt\n"
 msgstr "rofager�in (%d) er ekki studd � popt\n"
 
-#: popt.c:1114
+#: popt.c:1122
 msgid "missing argument"
 msgstr "vantar vi�fang"
 
-#: popt.c:1116
+#: popt.c:1124
 msgid "unknown option"
 msgstr "��ekktur rofi"
 
-#: popt.c:1118
+#: popt.c:1126
 msgid "mutually exclusive logical operations requested"
 msgstr "be�i� um rofa sem sl�kkva hvor � ��rum"
 
-#: popt.c:1120
+#: popt.c:1128
 msgid "opt->arg should not be NULL"
 msgstr "opt->arg �tti ekki a� vera NULL"
 
-#: popt.c:1122
+#: popt.c:1130
 msgid "aliases nested too deeply"
 msgstr "al�asar of fl�knir"
 
-#: popt.c:1124
+#: popt.c:1132
 msgid "error in parameter quoting"
 msgstr "villa � vi�f�ngum (g�salappir og svo frv.)"
 
-#: popt.c:1126
+#: popt.c:1134
 msgid "invalid numeric value"
 msgstr "�gilt t�lulegt gildi"
 
-#: popt.c:1128
+#: popt.c:1136
 msgid "number too large or too small"
 msgstr "talan of st�r e�a sm�"
 
-#: popt.c:1130
+#: popt.c:1138
 msgid "memory allocation failed"
 msgstr "ekki t�kst a� taka fr� minni"
 
-#: popt.c:1134
+#: popt.c:1142
 msgid "unknown error"
 msgstr "��ekkt villa"
 
-#: popthelp.c:52
+#: popthelp.c:53
 msgid "Show this help message"
 msgstr "S�na �essa hj�lp"
 
-#: popthelp.c:53
+#: popthelp.c:54
 msgid "Display brief usage message"
 msgstr "S�na stuttar notkunarlei�beiningar"
 
-#: popthelp.c:56
+#: popthelp.c:57
 msgid "Display option defaults in message"
 msgstr "S�na sj�lfgefin gildi rofa � skilabo�um"
 
-#: popthelp.c:98
+#: popthelp.c:99
 msgid "NONE"
 msgstr "ENGIN"
 
-#: popthelp.c:99
+#: popthelp.c:100
 msgid "VAL"
 msgstr "VAL"
 
-#: popthelp.c:100
+#: popthelp.c:101
 msgid "INT"
 msgstr "INT"
 
-#: popthelp.c:101
+#: popthelp.c:102
 msgid "LONG"
 msgstr "LONG"
 
-#: popthelp.c:102
+#: popthelp.c:103
 msgid "STRING"
 msgstr "STRING"
 
-#: popthelp.c:103
+#: popthelp.c:104
 msgid "FLOAT"
 msgstr "FLOAT"
 
-#: popthelp.c:104
+#: popthelp.c:105
 msgid "DOUBLE"
 msgstr "DOUBLE"
 
-#: popthelp.c:105
+#: popthelp.c:106
 msgid "ARG"
 msgstr "ARG"
 
-#: popthelp.c:456
+#: popthelp.c:457
 msgid "Usage:"
 msgstr "Notkun:"
 
-#: popthelp.c:478
+#: popthelp.c:479
 msgid "[OPTION...]"
 msgstr "[ROFI...]"
diff --git a/po/it.po b/po/it.po
index 83e97b1..3c39df2 100644
--- a/po/it.po
+++ b/po/it.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.3\n"
-"POT-Creation-Date: 2001-10-15 13:39-0400\n"
+"POT-Creation-Date: 2001-10-17 12:38-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -18,99 +18,99 @@ msgstr ""
 msgid "unknown errno"
 msgstr ""
 
-#: popt.c:903
+#: popt.c:911
 #, c-format
 msgid "option type (%d) not implemented in popt\n"
 msgstr ""
 
-#: popt.c:1114
+#: popt.c:1122
 msgid "missing argument"
 msgstr ""
 
-#: popt.c:1116
+#: popt.c:1124
 msgid "unknown option"
 msgstr ""
 
-#: popt.c:1118
+#: popt.c:1126
 msgid "mutually exclusive logical operations requested"
 msgstr ""
 
-#: popt.c:1120
+#: popt.c:1128
 msgid "opt->arg should not be NULL"
 msgstr ""
 
-#: popt.c:1122
+#: popt.c:1130
 msgid "aliases nested too deeply"
 msgstr ""
 
-#: popt.c:1124
+#: popt.c:1132
 msgid "error in parameter quoting"
 msgstr ""
 
-#: popt.c:1126
+#: popt.c:1134
 msgid "invalid numeric value"
 msgstr ""
 
-#: popt.c:1128
+#: popt.c:1136
 msgid "number too large or too small"
 msgstr ""
 
-#: popt.c:1130
+#: popt.c:1138
 msgid "memory allocation failed"
 msgstr ""
 
-#: popt.c:1134
+#: popt.c:1142
 msgid "unknown error"
 msgstr ""
 
-#: popthelp.c:52
+#: popthelp.c:53
 msgid "Show this help message"
 msgstr ""
 
-#: popthelp.c:53
+#: popthelp.c:54
 msgid "Display brief usage message"
 msgstr ""
 
-#: popthelp.c:56
+#: popthelp.c:57
 msgid "Display option defaults in message"
 msgstr ""
 
-#: popthelp.c:98
+#: popthelp.c:99
 msgid "NONE"
 msgstr ""
 
-#: popthelp.c:99
+#: popthelp.c:100
 msgid "VAL"
 msgstr ""
 
-#: popthelp.c:100
+#: popthelp.c:101
 msgid "INT"
 msgstr ""
 
-#: popthelp.c:101
+#: popthelp.c:102
 msgid "LONG"
 msgstr ""
 
-#: popthelp.c:102
+#: popthelp.c:103
 msgid "STRING"
 msgstr ""
 
-#: popthelp.c:103
+#: popthelp.c:104
 msgid "FLOAT"
 msgstr ""
 
-#: popthelp.c:104
+#: popthelp.c:105
 msgid "DOUBLE"
 msgstr ""
 
-#: popthelp.c:105
+#: popthelp.c:106
 msgid "ARG"
 msgstr ""
 
-#: popthelp.c:456
+#: popthelp.c:457
 msgid "Usage:"
 msgstr ""
 
-#: popthelp.c:478
+#: popthelp.c:479
 msgid "[OPTION...]"
 msgstr ""
diff --git a/po/ja.po b/po/ja.po
index 83e97b1..3c39df2 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.3\n"
-"POT-Creation-Date: 2001-10-15 13:39-0400\n"
+"POT-Creation-Date: 2001-10-17 12:38-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -18,99 +18,99 @@ msgstr ""
 msgid "unknown errno"
 msgstr ""
 
-#: popt.c:903
+#: popt.c:911
 #, c-format
 msgid "option type (%d) not implemented in popt\n"
 msgstr ""
 
-#: popt.c:1114
+#: popt.c:1122
 msgid "missing argument"
 msgstr ""
 
-#: popt.c:1116
+#: popt.c:1124
 msgid "unknown option"
 msgstr ""
 
-#: popt.c:1118
+#: popt.c:1126
 msgid "mutually exclusive logical operations requested"
 msgstr ""
 
-#: popt.c:1120
+#: popt.c:1128
 msgid "opt->arg should not be NULL"
 msgstr ""
 
-#: popt.c:1122
+#: popt.c:1130
 msgid "aliases nested too deeply"
 msgstr ""
 
-#: popt.c:1124
+#: popt.c:1132
 msgid "error in parameter quoting"
 msgstr ""
 
-#: popt.c:1126
+#: popt.c:1134
 msgid "invalid numeric value"
 msgstr ""
 
-#: popt.c:1128
+#: popt.c:1136
 msgid "number too large or too small"
 msgstr ""
 
-#: popt.c:1130
+#: popt.c:1138
 msgid "memory allocation failed"
 msgstr ""
 
-#: popt.c:1134
+#: popt.c:1142
 msgid "unknown error"
 msgstr ""
 
-#: popthelp.c:52
+#: popthelp.c:53
 msgid "Show this help message"
 msgstr ""
 
-#: popthelp.c:53
+#: popthelp.c:54
 msgid "Display brief usage message"
 msgstr ""
 
-#: popthelp.c:56
+#: popthelp.c:57
 msgid "Display option defaults in message"
 msgstr ""
 
-#: popthelp.c:98
+#: popthelp.c:99
 msgid "NONE"
 msgstr ""
 
-#: popthelp.c:99
+#: popthelp.c:100
 msgid "VAL"
 msgstr ""
 
-#: popthelp.c:100
+#: popthelp.c:101
 msgid "INT"
 msgstr ""
 
-#: popthelp.c:101
+#: popthelp.c:102
 msgid "LONG"
 msgstr ""
 
-#: popthelp.c:102
+#: popthelp.c:103
 msgid "STRING"
 msgstr ""
 
-#: popthelp.c:103
+#: popthelp.c:104
 msgid "FLOAT"
 msgstr ""
 
-#: popthelp.c:104
+#: popthelp.c:105
 msgid "DOUBLE"
 msgstr ""
 
-#: popthelp.c:105
+#: popthelp.c:106
 msgid "ARG"
 msgstr ""
 
-#: popthelp.c:456
+#: popthelp.c:457
 msgid "Usage:"
 msgstr ""
 
-#: popthelp.c:478
+#: popthelp.c:479
 msgid "[OPTION...]"
 msgstr ""
diff --git a/po/ko.po b/po/ko.po
index 002a277..68ee0e3 100644
--- a/po/ko.po
+++ b/po/ko.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6\n"
-"POT-Creation-Date: 2001-10-15 13:39-0400\n"
+"POT-Creation-Date: 2001-10-17 12:38-0400\n"
 "PO-Revision-Date: 2001-09-06 20:06+0900\n"
 "Last-Translator: Jong-Hoon Ryu <redhat4u@netian.com>\n"
 "Language-Team: GNU Translation project <ko@li.org>\n"
@@ -13,99 +13,99 @@ msgstr ""
 msgid "unknown errno"
 msgstr "�� �� ���� �����ڵ�(errno) �Դϴ�"
 
-#: popt.c:903
+#: popt.c:911
 #, c-format
 msgid "option type (%d) not implemented in popt\n"
 msgstr "�ɼ� ���� (%d)�� popt���� ����� �� �����ϴ�\n"
 
-#: popt.c:1114
+#: popt.c:1122
 msgid "missing argument"
 msgstr "�μ��� �������� �ʾҽ��ϴ�"
 
-#: popt.c:1116
+#: popt.c:1124
 msgid "unknown option"
 msgstr "�� �� ���� �ɼ��Դϴ�"
 
-#: popt.c:1118
+#: popt.c:1126
 msgid "mutually exclusive logical operations requested"
 msgstr "���ʿ� ��Ÿ�� ���� ������ �����Ǿ����ϴ�"
 
-#: popt.c:1120
+#: popt.c:1128
 msgid "opt->arg should not be NULL"
 msgstr "�ɼ�->�μ��� NULL�� �Ǿ�� �ȵ˴ϴ�"
 
-#: popt.c:1122
+#: popt.c:1130
 msgid "aliases nested too deeply"
 msgstr "��Ī(alias)�� �����ϰ� �����Ǿ����ϴ�"
 
-#: popt.c:1124
+#: popt.c:1132
 msgid "error in parameter quoting"
 msgstr "�Ű������� ������ �ֽ��ϴ�"
 
-#: popt.c:1126
+#: popt.c:1134
 msgid "invalid numeric value"
 msgstr "�߸��� ��ġ ���Դϴ�"
 
-#: popt.c:1128
+#: popt.c:1136
 msgid "number too large or too small"
 msgstr "���ڰ� �ʹ� ũ�ų� �ʹ� �����ϴ�"
 
-#: popt.c:1130
+#: popt.c:1138
 msgid "memory allocation failed"
 msgstr "�޸� �Ҵ翡 �����߽��ϴ�"
 
-#: popt.c:1134
+#: popt.c:1142
 msgid "unknown error"
 msgstr "�� �� ���� �����Դϴ�"
 
-#: popthelp.c:52
+#: popthelp.c:53
 msgid "Show this help message"
 msgstr "�� ������ �����ݴϴ�"
 
-#: popthelp.c:53
+#: popthelp.c:54
 msgid "Display brief usage message"
 msgstr "������ ������ �����ݴϴ�"
 
-#: popthelp.c:56
+#: popthelp.c:57
 msgid "Display option defaults in message"
 msgstr "�⺻���� �ɼ��� �����ݴϴ�"
 
-#: popthelp.c:98
+#: popthelp.c:99
 msgid "NONE"
 msgstr "����(NONE)"
 
-#: popthelp.c:99
+#: popthelp.c:100
 msgid "VAL"
 msgstr "��(VAL)"
 
-#: popthelp.c:100
+#: popthelp.c:101
 msgid "INT"
 msgstr "����(INT)"
 
-#: popthelp.c:101
+#: popthelp.c:102
 msgid "LONG"
 msgstr "����(LONG)"
 
-#: popthelp.c:102
+#: popthelp.c:103
 msgid "STRING"
 msgstr "���ڿ�(STRING)"
 
-#: popthelp.c:103
+#: popthelp.c:104
 msgid "FLOAT"
 msgstr "�Ҽ�(FLOAT)"
 
-#: popthelp.c:104
+#: popthelp.c:105
 msgid "DOUBLE"
 msgstr "�Ҽ�(DOUBLE)"
 
-#: popthelp.c:105
+#: popthelp.c:106
 msgid "ARG"
 msgstr "�μ�(ARG)"
 
-#: popthelp.c:456
+#: popthelp.c:457
 msgid "Usage:"
 msgstr "����:"
 
-#: popthelp.c:478
+#: popthelp.c:479
 msgid "[OPTION...]"
 msgstr "[�ɼ�...]"
diff --git a/po/no.po b/po/no.po
index 5fb3994..a9868e1 100644
--- a/po/no.po
+++ b/po/no.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.3\n"
-"POT-Creation-Date: 2001-10-15 13:39-0400\n"
+"POT-Creation-Date: 2001-10-17 12:38-0400\n"
 "PO-Revision-Date: 2001-06-27 11:05+0200\n"
 "Last-Translator: Kjartan Maraas <kmaraas@online.no>\n"
 "Language-Team: Norwegian <no@li.org>\n"
@@ -13,99 +13,99 @@ msgstr ""
 msgid "unknown errno"
 msgstr "ukjent errno"
 
-#: popt.c:903
+#: popt.c:911
 #, c-format
 msgid "option type (%d) not implemented in popt\n"
 msgstr "flaggtype (%d) ikke implementert i popt\n"
 
-#: popt.c:1114
+#: popt.c:1122
 msgid "missing argument"
 msgstr "manglende argument"
 
-#: popt.c:1116
+#: popt.c:1124
 msgid "unknown option"
 msgstr "ukjent flagg"
 
-#: popt.c:1118
+#: popt.c:1126
 msgid "mutually exclusive logical operations requested"
 msgstr "gjensidig eksluderende logiske operasjoner forespurt"
 
-#: popt.c:1120
+#: popt.c:1128
 msgid "opt->arg should not be NULL"
 msgstr "opt->arg m� ikke v�re NULL"
 
-#: popt.c:1122
+#: popt.c:1130
 msgid "aliases nested too deeply"
 msgstr "aliaser med for dype l�kker"
 
-#: popt.c:1124
+#: popt.c:1132
 msgid "error in parameter quoting"
 msgstr "feil i parametersitering"
 
-#: popt.c:1126
+#: popt.c:1134
 msgid "invalid numeric value"
 msgstr "ugyldig numerisk verdi"
 
-#: popt.c:1128
+#: popt.c:1136
 msgid "number too large or too small"
 msgstr "tallet er for stort eller lite"
 
-#: popt.c:1130
+#: popt.c:1138
 msgid "memory allocation failed"
 msgstr "minneallokering feilet"
 
-#: popt.c:1134
+#: popt.c:1142
 msgid "unknown error"
 msgstr "ukjent feil"
 
-#: popthelp.c:52
+#: popthelp.c:53
 msgid "Show this help message"
 msgstr "Vis denne hjelpmeldingen"
 
-#: popthelp.c:53
+#: popthelp.c:54
 msgid "Display brief usage message"
 msgstr "Vis kort bruksmelding"
 
-#: popthelp.c:56
+#: popthelp.c:57
 msgid "Display option defaults in message"
 msgstr "Vis forvalgte flagg i melding"
 
-#: popthelp.c:98
+#: popthelp.c:99
 msgid "NONE"
 msgstr "INGEN"
 
-#: popthelp.c:99
+#: popthelp.c:100
 msgid "VAL"
 msgstr "VERDI"
 
-#: popthelp.c:100
+#: popthelp.c:101
 msgid "INT"
 msgstr "HELTALL"
 
-#: popthelp.c:101
+#: popthelp.c:102
 msgid "LONG"
 msgstr "LONG"
 
-#: popthelp.c:102
+#: popthelp.c:103
 msgid "STRING"
 msgstr "STRENG"
 
-#: popthelp.c:103
+#: popthelp.c:104
 msgid "FLOAT"
 msgstr "FLYTTALL"
 
-#: popthelp.c:104
+#: popthelp.c:105
 msgid "DOUBLE"
 msgstr "DOUBLE"
 
-#: popthelp.c:105
+#: popthelp.c:106
 msgid "ARG"
 msgstr "ARG"
 
-#: popthelp.c:456
+#: popthelp.c:457
 msgid "Usage:"
 msgstr "Bruk:"
 
-#: popthelp.c:478
+#: popthelp.c:479
 msgid "[OPTION...]"
 msgstr "[FLAGG...]"
diff --git a/po/pl.po b/po/pl.po
index 83e97b1..3c39df2 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.3\n"
-"POT-Creation-Date: 2001-10-15 13:39-0400\n"
+"POT-Creation-Date: 2001-10-17 12:38-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -18,99 +18,99 @@ msgstr ""
 msgid "unknown errno"
 msgstr ""
 
-#: popt.c:903
+#: popt.c:911
 #, c-format
 msgid "option type (%d) not implemented in popt\n"
 msgstr ""
 
-#: popt.c:1114
+#: popt.c:1122
 msgid "missing argument"
 msgstr ""
 
-#: popt.c:1116
+#: popt.c:1124
 msgid "unknown option"
 msgstr ""
 
-#: popt.c:1118
+#: popt.c:1126
 msgid "mutually exclusive logical operations requested"
 msgstr ""
 
-#: popt.c:1120
+#: popt.c:1128
 msgid "opt->arg should not be NULL"
 msgstr ""
 
-#: popt.c:1122
+#: popt.c:1130
 msgid "aliases nested too deeply"
 msgstr ""
 
-#: popt.c:1124
+#: popt.c:1132
 msgid "error in parameter quoting"
 msgstr ""
 
-#: popt.c:1126
+#: popt.c:1134
 msgid "invalid numeric value"
 msgstr ""
 
-#: popt.c:1128
+#: popt.c:1136
 msgid "number too large or too small"
 msgstr ""
 
-#: popt.c:1130
+#: popt.c:1138
 msgid "memory allocation failed"
 msgstr ""
 
-#: popt.c:1134
+#: popt.c:1142
 msgid "unknown error"
 msgstr ""
 
-#: popthelp.c:52
+#: popthelp.c:53
 msgid "Show this help message"
 msgstr ""
 
-#: popthelp.c:53
+#: popthelp.c:54
 msgid "Display brief usage message"
 msgstr ""
 
-#: popthelp.c:56
+#: popthelp.c:57
 msgid "Display option defaults in message"
 msgstr ""
 
-#: popthelp.c:98
+#: popthelp.c:99
 msgid "NONE"
 msgstr ""
 
-#: popthelp.c:99
+#: popthelp.c:100
 msgid "VAL"
 msgstr ""
 
-#: popthelp.c:100
+#: popthelp.c:101
 msgid "INT"
 msgstr ""
 
-#: popthelp.c:101
+#: popthelp.c:102
 msgid "LONG"
 msgstr ""
 
-#: popthelp.c:102
+#: popthelp.c:103
 msgid "STRING"
 msgstr ""
 
-#: popthelp.c:103
+#: popthelp.c:104
 msgid "FLOAT"
 msgstr ""
 
-#: popthelp.c:104
+#: popthelp.c:105
 msgid "DOUBLE"
 msgstr ""
 
-#: popthelp.c:105
+#: popthelp.c:106
 msgid "ARG"
 msgstr ""
 
-#: popthelp.c:456
+#: popthelp.c:457
 msgid "Usage:"
 msgstr ""
 
-#: popthelp.c:478
+#: popthelp.c:479
 msgid "[OPTION...]"
 msgstr ""
diff --git a/po/pt.po b/po/pt.po
index 2c06755..0fc97d9 100644
--- a/po/pt.po
+++ b/po/pt.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.3\n"
-"POT-Creation-Date: 2001-10-15 13:39-0400\n"
+"POT-Creation-Date: 2001-10-17 12:38-0400\n"
 "PO-Revision-Date: 2001-01-21 19:31+00:00\n"
 "Last-Translator: Pedro Morais <morais@kde.org>\n"
 "Language-Team: pt <morais@kde.org>\n"
@@ -13,100 +13,100 @@ msgstr ""
 msgid "unknown errno"
 msgstr "errno desconhecido"
 
-#: popt.c:903
+#: popt.c:911
 #, c-format
 msgid "option type (%d) not implemented in popt\n"
 msgstr "tipo de op��o (%d) n�o implementado no popt\n"
 
-#: popt.c:1114
+#: popt.c:1122
 msgid "missing argument"
 msgstr "falta um argumento"
 
-#: popt.c:1116
+#: popt.c:1124
 msgid "unknown option"
 msgstr "op��o desconhecida"
 
-#: popt.c:1118
+#: popt.c:1126
 msgid "mutually exclusive logical operations requested"
 msgstr "foram pedidas opera��es l�gicas mutuamente exclusivas"
 
-#: popt.c:1120
+#: popt.c:1128
 msgid "opt->arg should not be NULL"
 msgstr ""
 
-#: popt.c:1122
+#: popt.c:1130
 msgid "aliases nested too deeply"
 msgstr "'aliases' demasiado aninhados"
 
-#: popt.c:1124
+#: popt.c:1132
 msgid "error in parameter quoting"
 msgstr "erros no 'quoting' de par�metros"
 
-#: popt.c:1126
+#: popt.c:1134
 msgid "invalid numeric value"
 msgstr "valor n�merico inv�lido"
 
-#: popt.c:1128
+#: popt.c:1136
 msgid "number too large or too small"
 msgstr "n�mero demasiado grando ou pequeno"
 
-#: popt.c:1130
+#: popt.c:1138
 msgid "memory allocation failed"
 msgstr ""
 
-#: popt.c:1134
+#: popt.c:1142
 msgid "unknown error"
 msgstr "erro desconhecido"
 
-#: popthelp.c:52
+#: popthelp.c:53
 msgid "Show this help message"
 msgstr "Mostrar esta mensagem de ajuda"
 
-#: popthelp.c:53
+#: popthelp.c:54
 msgid "Display brief usage message"
 msgstr "Mostrar uma mensagem de utiliza��o sucinta"
 
-#: popthelp.c:56
+#: popthelp.c:57
 #, fuzzy
 msgid "Display option defaults in message"
 msgstr "Mostrar uma mensagem de utiliza��o sucinta"
 
-#: popthelp.c:98
+#: popthelp.c:99
 msgid "NONE"
 msgstr "NONE"
 
-#: popthelp.c:99
+#: popthelp.c:100
 msgid "VAL"
 msgstr "VAL"
 
-#: popthelp.c:100
+#: popthelp.c:101
 msgid "INT"
 msgstr "INT"
 
-#: popthelp.c:101
+#: popthelp.c:102
 msgid "LONG"
 msgstr "LONG"
 
-#: popthelp.c:102
+#: popthelp.c:103
 msgid "STRING"
 msgstr "STRING"
 
-#: popthelp.c:103
+#: popthelp.c:104
 msgid "FLOAT"
 msgstr "FLOAT"
 
-#: popthelp.c:104
+#: popthelp.c:105
 msgid "DOUBLE"
 msgstr "DOUBLE"
 
-#: popthelp.c:105
+#: popthelp.c:106
 msgid "ARG"
 msgstr "ARG"
 
-#: popthelp.c:456
+#: popthelp.c:457
 msgid "Usage:"
 msgstr "Utiliza��o:"
 
-#: popthelp.c:478
+#: popthelp.c:479
 msgid "[OPTION...]"
 msgstr "[OP��O...]"
diff --git a/po/pt_BR.po b/po/pt_BR.po
index 83e97b1..3c39df2 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.3\n"
-"POT-Creation-Date: 2001-10-15 13:39-0400\n"
+"POT-Creation-Date: 2001-10-17 12:38-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -18,99 +18,99 @@ msgstr ""
 msgid "unknown errno"
 msgstr ""
 
-#: popt.c:903
+#: popt.c:911
 #, c-format
 msgid "option type (%d) not implemented in popt\n"
 msgstr ""
 
-#: popt.c:1114
+#: popt.c:1122
 msgid "missing argument"
 msgstr ""
 
-#: popt.c:1116
+#: popt.c:1124
 msgid "unknown option"
 msgstr ""
 
-#: popt.c:1118
+#: popt.c:1126
 msgid "mutually exclusive logical operations requested"
 msgstr ""
 
-#: popt.c:1120
+#: popt.c:1128
 msgid "opt->arg should not be NULL"
 msgstr ""
 
-#: popt.c:1122
+#: popt.c:1130
 msgid "aliases nested too deeply"
 msgstr ""
 
-#: popt.c:1124
+#: popt.c:1132
 msgid "error in parameter quoting"
 msgstr ""
 
-#: popt.c:1126
+#: popt.c:1134
 msgid "invalid numeric value"
 msgstr ""
 
-#: popt.c:1128
+#: popt.c:1136
 msgid "number too large or too small"
 msgstr ""
 
-#: popt.c:1130
+#: popt.c:1138
 msgid "memory allocation failed"
 msgstr ""
 
-#: popt.c:1134
+#: popt.c:1142
 msgid "unknown error"
 msgstr ""
 
-#: popthelp.c:52
+#: popthelp.c:53
 msgid "Show this help message"
 msgstr ""
 
-#: popthelp.c:53
+#: popthelp.c:54
 msgid "Display brief usage message"
 msgstr ""
 
-#: popthelp.c:56
+#: popthelp.c:57
 msgid "Display option defaults in message"
 msgstr ""
 
-#: popthelp.c:98
+#: popthelp.c:99
 msgid "NONE"
 msgstr ""
 
-#: popthelp.c:99
+#: popthelp.c:100
 msgid "VAL"
 msgstr ""
 
-#: popthelp.c:100
+#: popthelp.c:101
 msgid "INT"
 msgstr ""
 
-#: popthelp.c:101
+#: popthelp.c:102
 msgid "LONG"
 msgstr ""
 
-#: popthelp.c:102
+#: popthelp.c:103
 msgid "STRING"
 msgstr ""
 
-#: popthelp.c:103
+#: popthelp.c:104
 msgid "FLOAT"
 msgstr ""
 
-#: popthelp.c:104
+#: popthelp.c:105
 msgid "DOUBLE"
 msgstr ""
 
-#: popthelp.c:105
+#: popthelp.c:106
 msgid "ARG"
 msgstr ""
 
-#: popthelp.c:456
+#: popthelp.c:457
 msgid "Usage:"
 msgstr ""
 
-#: popthelp.c:478
+#: popthelp.c:479
 msgid "[OPTION...]"
 msgstr ""
diff --git a/po/ro.po b/po/ro.po
index 346d818..8451967 100644
--- a/po/ro.po
+++ b/po/ro.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.3\n"
-"POT-Creation-Date: 2001-10-15 13:39-0400\n"
+"POT-Creation-Date: 2001-10-17 12:38-0400\n"
 "PO-Revision-Date: 2000-06-14 23:23+EST\n"
 "Last-Translator: Cristian Gafton <gafton@redhat.com>\n"
 "Language-Team: Romanian <ro@li.org>\n"
@@ -13,101 +13,101 @@ msgstr ""
 msgid "unknown errno"
 msgstr "eroare necunoscuta"
 
-#: popt.c:903
+#: popt.c:911
 #, c-format
 msgid "option type (%d) not implemented in popt\n"
 msgstr "optiunea de tipul (%d) nu este implementata in popt\n"
 
-#: popt.c:1114
+#: popt.c:1122
 msgid "missing argument"
 msgstr "argument lipsa"
 
-#: popt.c:1116
+#: popt.c:1124
 msgid "unknown option"
 msgstr "optiune necunoscuta"
 
-#: popt.c:1118
+#: popt.c:1126
 msgid "mutually exclusive logical operations requested"
 msgstr ""
 
-#: popt.c:1120
+#: popt.c:1128
 msgid "opt->arg should not be NULL"
 msgstr ""
 
-#: popt.c:1122
+#: popt.c:1130
 msgid "aliases nested too deeply"
 msgstr "recursivitate infinita la optiunile sinonime"
 
-#: popt.c:1124
+#: popt.c:1132
 #, fuzzy
 msgid "error in parameter quoting"
 msgstr "eroare la insertie parametru"
 
-#: popt.c:1126
+#: popt.c:1134
 msgid "invalid numeric value"
 msgstr "valoare numarica invalida"
 
-#: popt.c:1128
+#: popt.c:1136
 msgid "number too large or too small"
 msgstr "numar prea mare sau prea mic"
 
-#: popt.c:1130
+#: popt.c:1138
 msgid "memory allocation failed"
 msgstr ""
 
-#: popt.c:1134
+#: popt.c:1142
 msgid "unknown error"
 msgstr "eroare necuinoscuta"
 
-#: popthelp.c:52
+#: popthelp.c:53
 msgid "Show this help message"
 msgstr "Afisare mesaj de help"
 
-#: popthelp.c:53
+#: popthelp.c:54
 msgid "Display brief usage message"
 msgstr "Afisare mesaj sintaxa sumar"
 
-#: popthelp.c:56
+#: popthelp.c:57
 #, fuzzy
 msgid "Display option defaults in message"
 msgstr "Afisare mesaj sintaxa sumar"
 
-#: popthelp.c:98
+#: popthelp.c:99
 msgid "NONE"
 msgstr ""
 
-#: popthelp.c:99
+#: popthelp.c:100
 msgid "VAL"
 msgstr ""
 
-#: popthelp.c:100
+#: popthelp.c:101
 msgid "INT"
 msgstr ""
 
-#: popthelp.c:101
+#: popthelp.c:102
 msgid "LONG"
 msgstr ""
 
-#: popthelp.c:102
+#: popthelp.c:103
 msgid "STRING"
 msgstr ""
 
-#: popthelp.c:103
+#: popthelp.c:104
 msgid "FLOAT"
 msgstr ""
 
-#: popthelp.c:104
+#: popthelp.c:105
 msgid "DOUBLE"
 msgstr ""
 
-#: popthelp.c:105
+#: popthelp.c:106
 msgid "ARG"
 msgstr ""
 
-#: popthelp.c:456
+#: popthelp.c:457
 msgid "Usage:"
 msgstr "Sintaxa:"
 
-#: popthelp.c:478
+#: popthelp.c:479
 msgid "[OPTION...]"
 msgstr "[OPTIUNE...]"
diff --git a/po/ru.po b/po/ru.po
index 62a3af2..048b7be 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.3\n"
-"POT-Creation-Date: 2001-10-15 13:39-0400\n"
+"POT-Creation-Date: 2001-10-17 12:38-0400\n"
 "PO-Revision-Date: 2001-07-05 21:00-0500\n"
 "Last-Translator: Eugene Kanter <eugene@blackcatlinux.com>\n"
 "Language-Team: Black Cat Linux Team <blackcat-support@blackcatlinux.com>\n"
@@ -13,99 +13,99 @@ msgstr ""
 msgid "unknown errno"
 msgstr "����������� ����� ������"
 
-#: popt.c:903
+#: popt.c:911
 #, c-format
 msgid "option type (%d) not implemented in popt\n"
 msgstr "��������� ��������� (%d) � popt �� �������������\n"
 
-#: popt.c:1114
+#: popt.c:1122
 msgid "missing argument"
 msgstr "�������� ��������"
 
-#: popt.c:1116
+#: popt.c:1124
 msgid "unknown option"
 msgstr "����������� ��������"
 
-#: popt.c:1118
+#: popt.c:1126
 msgid "mutually exclusive logical operations requested"
 msgstr "��������� ������� ����������� ���������� ��������"
 
-#: popt.c:1120
+#: popt.c:1128
 msgid "opt->arg should not be NULL"
 msgstr "opt->arg �� ����� ���� NULL"
 
-#: popt.c:1122
+#: popt.c:1130
 msgid "aliases nested too deeply"
 msgstr "�������� ������� ���������� �������� �����������"
 
-#: popt.c:1124
+#: popt.c:1132
 msgid "error in parameter quoting"
 msgstr "�����a ��������� ���������� � �������"
 
-#: popt.c:1126
+#: popt.c:1134
 msgid "invalid numeric value"
 msgstr "������������ �������� ��������"
 
-#: popt.c:1128
+#: popt.c:1136
 msgid "number too large or too small"
 msgstr "�������� �������� �� ��������� ����������������"
 
-#: popt.c:1130
+#: popt.c:1138
 msgid "memory allocation failed"
 msgstr "������ ��������� ������"
 
-#: popt.c:1134
+#: popt.c:1142
 msgid "unknown error"
 msgstr "����������� ������"
 
-#: popthelp.c:52
+#: popthelp.c:53
 msgid "Show this help message"
 msgstr "�������� ��� ���������"
 
-#: popthelp.c:53
+#: popthelp.c:54
 msgid "Display brief usage message"
 msgstr "�������� ������� ���������� �� �������������"
 
-#: popthelp.c:56
+#: popthelp.c:57
 msgid "Display option defaults in message"
 msgstr "�������� ��������� �� ���������"
 
-#: popthelp.c:98
+#: popthelp.c:99
 msgid "NONE"
 msgstr "NONE"
 
-#: popthelp.c:99
+#: popthelp.c:100
 msgid "VAL"
 msgstr "VAL"
 
-#: popthelp.c:100
+#: popthelp.c:101
 msgid "INT"
 msgstr "INT"
 
-#: popthelp.c:101
+#: popthelp.c:102
 msgid "LONG"
 msgstr "LONG"
 
-#: popthelp.c:102
+#: popthelp.c:103
 msgid "STRING"
 msgstr "STRING"
 
-#: popthelp.c:103
+#: popthelp.c:104
 msgid "FLOAT"
 msgstr "FLOAT"
 
-#: popthelp.c:104
+#: popthelp.c:105
 msgid "DOUBLE"
 msgstr "DOUBLE"
 
-#: popthelp.c:105
+#: popthelp.c:106
 msgid "ARG"
 msgstr "ARG"
 
-#: popthelp.c:456
+#: popthelp.c:457
 msgid "Usage:"
 msgstr "�������������:"
 
-#: popthelp.c:478
+#: popthelp.c:479
 msgid "[OPTION...]"
 msgstr "[��������...]"
diff --git a/po/sk.po b/po/sk.po
index 4e92400..1b022bd 100644
--- a/po/sk.po
+++ b/po/sk.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.3\n"
-"POT-Creation-Date: 2001-10-15 13:39-0400\n"
+"POT-Creation-Date: 2001-10-17 12:38-0400\n"
 "PO-Revision-Date: 1999-08-04 21:40+0200\n"
 "Last-Translator: Stanislav Meduna <stano@eunet.sk>\n"
 "Language-Team: Slovak <sk-i18n@rak.isternet.sk>\n"
@@ -17,100 +17,100 @@ msgstr ""
 msgid "unknown errno"
 msgstr ""
 
-#: popt.c:903
+#: popt.c:911
 #, c-format
 msgid "option type (%d) not implemented in popt\n"
 msgstr ""
 
-#: popt.c:1114
+#: popt.c:1122
 msgid "missing argument"
 msgstr ""
 
-#: popt.c:1116
+#: popt.c:1124
 msgid "unknown option"
 msgstr ""
 
-#: popt.c:1118
+#: popt.c:1126
 msgid "mutually exclusive logical operations requested"
 msgstr ""
 
-#: popt.c:1120
+#: popt.c:1128
 msgid "opt->arg should not be NULL"
 msgstr ""
 
-#: popt.c:1122
+#: popt.c:1130
 msgid "aliases nested too deeply"
 msgstr ""
 
-#: popt.c:1124
+#: popt.c:1132
 msgid "error in parameter quoting"
 msgstr ""
 
-#: popt.c:1126
+#: popt.c:1134
 msgid "invalid numeric value"
 msgstr ""
 
-#: popt.c:1128
+#: popt.c:1136
 msgid "number too large or too small"
 msgstr ""
 
-#: popt.c:1130
+#: popt.c:1138
 msgid "memory allocation failed"
 msgstr ""
 
-#: popt.c:1134
+#: popt.c:1142
 msgid "unknown error"
 msgstr ""
 
-#: popthelp.c:52
+#: popthelp.c:53
 msgid "Show this help message"
 msgstr "Vyp�sa� t�to spr�vu"
 
-#: popthelp.c:53
+#: popthelp.c:54
 msgid "Display brief usage message"
 msgstr "Zobrazi� stru�n� n�vod na pou�itie"
 
-#: popthelp.c:56
+#: popthelp.c:57
 #, fuzzy
 msgid "Display option defaults in message"
 msgstr "Zobrazi� stru�n� n�vod na pou�itie"
 
-#: popthelp.c:98
+#: popthelp.c:99
 msgid "NONE"
 msgstr ""
 
-#: popthelp.c:99
+#: popthelp.c:100
 msgid "VAL"
 msgstr ""
 
-#: popthelp.c:100
+#: popthelp.c:101
 msgid "INT"
 msgstr ""
 
-#: popthelp.c:101
+#: popthelp.c:102
 msgid "LONG"
 msgstr ""
 
-#: popthelp.c:102
+#: popthelp.c:103
 msgid "STRING"
 msgstr ""
 
-#: popthelp.c:103
+#: popthelp.c:104
 msgid "FLOAT"
 msgstr ""
 
-#: popthelp.c:104
+#: popthelp.c:105
 msgid "DOUBLE"
 msgstr ""
 
-#: popthelp.c:105
+#: popthelp.c:106
 msgid "ARG"
 msgstr ""
 
-#: popthelp.c:456
+#: popthelp.c:457
 msgid "Usage:"
 msgstr ""
 
-#: popthelp.c:478
+#: popthelp.c:479
 msgid "[OPTION...]"
 msgstr ""
diff --git a/po/sl.po b/po/sl.po
index 2f86bd7..bbb4b7c 100644
--- a/po/sl.po
+++ b/po/sl.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.3\n"
-"POT-Creation-Date: 2001-10-15 13:39-0400\n"
+"POT-Creation-Date: 2001-10-17 12:38-0400\n"
 "PO-Revision-Date: 2000-09-05 12:30+0200\n"
 "Last-Translator: Roman Maurer <roman.maurer@hermes.si>\n"
 "Language-Team: Slovenian <sl@li.org>\n"
@@ -13,100 +13,100 @@ msgstr ""
 msgid "unknown errno"
 msgstr ""
 
-#: popt.c:903
+#: popt.c:911
 #, c-format
 msgid "option type (%d) not implemented in popt\n"
 msgstr ""
 
-#: popt.c:1114
+#: popt.c:1122
 msgid "missing argument"
 msgstr ""
 
-#: popt.c:1116
+#: popt.c:1124
 msgid "unknown option"
 msgstr ""
 
-#: popt.c:1118
+#: popt.c:1126
 msgid "mutually exclusive logical operations requested"
 msgstr ""
 
-#: popt.c:1120
+#: popt.c:1128
 msgid "opt->arg should not be NULL"
 msgstr ""
 
-#: popt.c:1122
+#: popt.c:1130
 msgid "aliases nested too deeply"
 msgstr ""
 
-#: popt.c:1124
+#: popt.c:1132
 msgid "error in parameter quoting"
 msgstr ""
 
-#: popt.c:1126
+#: popt.c:1134
 msgid "invalid numeric value"
 msgstr ""
 
-#: popt.c:1128
+#: popt.c:1136
 msgid "number too large or too small"
 msgstr ""
 
-#: popt.c:1130
+#: popt.c:1138
 msgid "memory allocation failed"
 msgstr ""
 
-#: popt.c:1134
+#: popt.c:1142
 msgid "unknown error"
 msgstr ""
 
-#: popthelp.c:52
+#: popthelp.c:53
 msgid "Show this help message"
 msgstr "Prika�i to sporo�ilo s pomo�jo"
 
-#: popthelp.c:53
+#: popthelp.c:54
 msgid "Display brief usage message"
 msgstr "Prika�i kratko sporo�ilo o uporabi"
 
-#: popthelp.c:56
+#: popthelp.c:57
 #, fuzzy
 msgid "Display option defaults in message"
 msgstr "Prika�i kratko sporo�ilo o uporabi"
 
-#: popthelp.c:98
+#: popthelp.c:99
 msgid "NONE"
 msgstr ""
 
-#: popthelp.c:99
+#: popthelp.c:100
 msgid "VAL"
 msgstr ""
 
-#: popthelp.c:100
+#: popthelp.c:101
 msgid "INT"
 msgstr ""
 
-#: popthelp.c:101
+#: popthelp.c:102
 msgid "LONG"
 msgstr ""
 
-#: popthelp.c:102
+#: popthelp.c:103
 msgid "STRING"
 msgstr ""
 
-#: popthelp.c:103
+#: popthelp.c:104
 msgid "FLOAT"
 msgstr ""
 
-#: popthelp.c:104
+#: popthelp.c:105
 msgid "DOUBLE"
 msgstr ""
 
-#: popthelp.c:105
+#: popthelp.c:106
 msgid "ARG"
 msgstr ""
 
-#: popthelp.c:456
+#: popthelp.c:457
 msgid "Usage:"
 msgstr ""
 
-#: popthelp.c:478
+#: popthelp.c:479
 msgid "[OPTION...]"
 msgstr ""
diff --git a/po/sr.po b/po/sr.po
index 83e97b1..3c39df2 100644
--- a/po/sr.po
+++ b/po/sr.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.3\n"
-"POT-Creation-Date: 2001-10-15 13:39-0400\n"
+"POT-Creation-Date: 2001-10-17 12:38-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -18,99 +18,99 @@ msgstr ""
 msgid "unknown errno"
 msgstr ""
 
-#: popt.c:903
+#: popt.c:911
 #, c-format
 msgid "option type (%d) not implemented in popt\n"
 msgstr ""
 
-#: popt.c:1114
+#: popt.c:1122
 msgid "missing argument"
 msgstr ""
 
-#: popt.c:1116
+#: popt.c:1124
 msgid "unknown option"
 msgstr ""
 
-#: popt.c:1118
+#: popt.c:1126
 msgid "mutually exclusive logical operations requested"
 msgstr ""
 
-#: popt.c:1120
+#: popt.c:1128
 msgid "opt->arg should not be NULL"
 msgstr ""
 
-#: popt.c:1122
+#: popt.c:1130
 msgid "aliases nested too deeply"
 msgstr ""
 
-#: popt.c:1124
+#: popt.c:1132
 msgid "error in parameter quoting"
 msgstr ""
 
-#: popt.c:1126
+#: popt.c:1134
 msgid "invalid numeric value"
 msgstr ""
 
-#: popt.c:1128
+#: popt.c:1136
 msgid "number too large or too small"
 msgstr ""
 
-#: popt.c:1130
+#: popt.c:1138
 msgid "memory allocation failed"
 msgstr ""
 
-#: popt.c:1134
+#: popt.c:1142
 msgid "unknown error"
 msgstr ""
 
-#: popthelp.c:52
+#: popthelp.c:53
 msgid "Show this help message"
 msgstr ""
 
-#: popthelp.c:53
+#: popthelp.c:54
 msgid "Display brief usage message"
 msgstr ""
 
-#: popthelp.c:56
+#: popthelp.c:57
 msgid "Display option defaults in message"
 msgstr ""
 
-#: popthelp.c:98
+#: popthelp.c:99
 msgid "NONE"
 msgstr ""
 
-#: popthelp.c:99
+#: popthelp.c:100
 msgid "VAL"
 msgstr ""
 
-#: popthelp.c:100
+#: popthelp.c:101
 msgid "INT"
 msgstr ""
 
-#: popthelp.c:101
+#: popthelp.c:102
 msgid "LONG"
 msgstr ""
 
-#: popthelp.c:102
+#: popthelp.c:103
 msgid "STRING"
 msgstr ""
 
-#: popthelp.c:103
+#: popthelp.c:104
 msgid "FLOAT"
 msgstr ""
 
-#: popthelp.c:104
+#: popthelp.c:105
 msgid "DOUBLE"
 msgstr ""
 
-#: popthelp.c:105
+#: popthelp.c:106
 msgid "ARG"
 msgstr ""
 
-#: popthelp.c:456
+#: popthelp.c:457
 msgid "Usage:"
 msgstr ""
 
-#: popthelp.c:478
+#: popthelp.c:479
 msgid "[OPTION...]"
 msgstr ""
diff --git a/po/sv.po b/po/sv.po
index fded47e..b91c107 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.3\n"
-"POT-Creation-Date: 2001-10-15 13:39-0400\n"
+"POT-Creation-Date: 2001-10-17 12:38-0400\n"
 "PO-Revision-Date: 2001-07-12 22:26+0100\n"
 "Last-Translator: Christian Rose <menthos@menthos.com>\n"
 "Language-Team: Swedish <sv@li.org>\n"
@@ -13,99 +13,99 @@ msgstr ""
 msgid "unknown errno"
 msgstr "ok�nt felnummer"
 
-#: popt.c:903
+#: popt.c:911
 #, c-format
 msgid "option type (%d) not implemented in popt\n"
 msgstr "flaggtypen (%d) �r inte implementerad i popt\n"
 
-#: popt.c:1114
+#: popt.c:1122
 msgid "missing argument"
 msgstr "argument saknas"
 
-#: popt.c:1116
+#: popt.c:1124
 msgid "unknown option"
 msgstr "ok�nd flagga"
 
-#: popt.c:1118
+#: popt.c:1126
 msgid "mutually exclusive logical operations requested"
 msgstr "�msesidigt uteslutande logiska operationer beg�rdes"
 
-#: popt.c:1120
+#: popt.c:1128
 msgid "opt->arg should not be NULL"
 msgstr "opt->arg f�r inte vara NULL"
 
-#: popt.c:1122
+#: popt.c:1130
 msgid "aliases nested too deeply"
 msgstr "alias �r n�stlade f�r djupt"
 
-#: popt.c:1124
+#: popt.c:1132
 msgid "error in parameter quoting"
 msgstr "fel i parametercitering"
 
-#: popt.c:1126
+#: popt.c:1134
 msgid "invalid numeric value"
 msgstr "ogiltigt numeriskt v�rde"
 
-#: popt.c:1128
+#: popt.c:1136
 msgid "number too large or too small"
 msgstr "talet f�r stort eller f�r litet"
 
-#: popt.c:1130
+#: popt.c:1138
 msgid "memory allocation failed"
 msgstr "minnesallokering misslyckades"
 
-#: popt.c:1134
+#: popt.c:1142
 msgid "unknown error"
 msgstr "ok�nt fel"
 
-#: popthelp.c:52
+#: popthelp.c:53
 msgid "Show this help message"
 msgstr "Visa denna hj�lptext"
 
-#: popthelp.c:53
+#: popthelp.c:54
 msgid "Display brief usage message"
 msgstr "Visa en kortfattad anv�ndningstext"
 
-#: popthelp.c:56
+#: popthelp.c:57
 msgid "Display option defaults in message"
 msgstr "Visa standardalternativ f�r flaggor i meddelande"
 
-#: popthelp.c:98
+#: popthelp.c:99
 msgid "NONE"
 msgstr "INGET"
 
-#: popthelp.c:99
+#: popthelp.c:100
 msgid "VAL"
 msgstr "V�RDE"
 
-#: popthelp.c:100
+#: popthelp.c:101
 msgid "INT"
 msgstr "HELTAL"
 
-#: popthelp.c:101
+#: popthelp.c:102
 msgid "LONG"
 msgstr "L�NG"
 
-#: popthelp.c:102
+#: popthelp.c:103
 msgid "STRING"
 msgstr "STR�NG"
 
-#: popthelp.c:103
+#: popthelp.c:104
 msgid "FLOAT"
 msgstr "FLYTTAL"
 
-#: popthelp.c:104
+#: popthelp.c:105
 msgid "DOUBLE"
 msgstr "DUBBEL"
 
-#: popthelp.c:105
+#: popthelp.c:106
 msgid "ARG"
 msgstr "ARG"
 
-#: popthelp.c:456
+#: popthelp.c:457
 msgid "Usage:"
 msgstr "Anv�ndning:"
 
-#: popthelp.c:478
+#: popthelp.c:479
 msgid "[OPTION...]"
 msgstr "[FLAGGA...]"
diff --git a/po/tr.po b/po/tr.po
index 8208612..f57fa01 100644
--- a/po/tr.po
+++ b/po/tr.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.3\n"
-"POT-Creation-Date: 2001-10-15 13:39-0400\n"
+"POT-Creation-Date: 2001-10-17 12:38-0400\n"
 "PO-Revision-Date: 2000-02-11 13:01+0200\n"
 "Last-Translator: Nilgun Belma Buguner <nilgun@technologist.com>\n"
 "Language-Team: Turkish <tr@li.org>\n"
@@ -13,100 +13,100 @@ msgstr ""
 msgid "unknown errno"
 msgstr "bilinmeyen hata no"
 
-#: popt.c:903
+#: popt.c:911
 #, c-format
 msgid "option type (%d) not implemented in popt\n"
 msgstr "se�enek t�r� (%d) popt i�in ge�ersiz\n"
 
-#: popt.c:1114
+#: popt.c:1122
 msgid "missing argument"
 msgstr "arg�man eksik"
 
-#: popt.c:1116
+#: popt.c:1124
 msgid "unknown option"
 msgstr "bilinmeyen se�enek"
 
-#: popt.c:1118
+#: popt.c:1126
 msgid "mutually exclusive logical operations requested"
 msgstr "birbirini d��layan mant�ksal i�lemler istendi"
 
-#: popt.c:1120
+#: popt.c:1128
 msgid "opt->arg should not be NULL"
 msgstr ""
 
-#: popt.c:1122
+#: popt.c:1130
 msgid "aliases nested too deeply"
 msgstr "adlarda �ok fazla i�i�elikler"
 
-#: popt.c:1124
+#: popt.c:1132
 msgid "error in parameter quoting"
 msgstr "parametrelerde t�rnak i�aretleme hatal� "
 
-#: popt.c:1126
+#: popt.c:1134
 msgid "invalid numeric value"
 msgstr "say�sal de�er ge�ersiz"
 
-#: popt.c:1128
+#: popt.c:1136
 msgid "number too large or too small"
 msgstr "say� ya �ok b�y�k ya da �ok k���k"
 
-#: popt.c:1130
+#: popt.c:1138
 msgid "memory allocation failed"
 msgstr ""
 
-#: popt.c:1134
+#: popt.c:1142
 msgid "unknown error"
 msgstr "bilinmeyen hata"
 
-#: popthelp.c:52
+#: popthelp.c:53
 msgid "Show this help message"
 msgstr "Bu yard�m iletisini g�sterir"
 
-#: popthelp.c:53
+#: popthelp.c:54
 msgid "Display brief usage message"
 msgstr "K�sa bir kullan�m iletisi g�ster"
 
-#: popthelp.c:56
+#: popthelp.c:57
 #, fuzzy
 msgid "Display option defaults in message"
 msgstr "K�sa bir kullan�m iletisi g�ster"
 
-#: popthelp.c:98
+#: popthelp.c:99
 msgid "NONE"
 msgstr "YOK"
 
-#: popthelp.c:99
+#: popthelp.c:100
 msgid "VAL"
 msgstr "DE�"
 
-#: popthelp.c:100
+#: popthelp.c:101
 msgid "INT"
 msgstr "INT"
 
-#: popthelp.c:101
+#: popthelp.c:102
 msgid "LONG"
 msgstr "LONG"
 
-#: popthelp.c:102
+#: popthelp.c:103
 msgid "STRING"
 msgstr "STRING"
 
-#: popthelp.c:103
+#: popthelp.c:104
 msgid "FLOAT"
 msgstr "FLOAT"
 
-#: popthelp.c:104
+#: popthelp.c:105
 msgid "DOUBLE"
 msgstr "DOUBLE"
 
-#: popthelp.c:105
+#: popthelp.c:106
 msgid "ARG"
 msgstr "ARG"
 
-#: popthelp.c:456
+#: popthelp.c:457
 msgid "Usage:"
 msgstr "Kullan�m�:"
 
-#: popthelp.c:478
+#: popthelp.c:479
 msgid "[OPTION...]"
 msgstr "[SE�ENEK...]"
diff --git a/po/uk.po b/po/uk.po
index 944f7aa..4a3ef1a 100644
--- a/po/uk.po
+++ b/po/uk.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.3\n"
-"POT-Creation-Date: 2001-10-15 13:39-0400\n"
+"POT-Creation-Date: 2001-10-17 12:38-0400\n"
 "PO-Revision-Date: 1999-09-30 16:54+0200\n"
 "Last-Translator: Yuri Syrota <rasta@renome.rovno.ua>\n"
 "Language-Team: Ukrainian <uk@li.org>\n"
@@ -17,100 +17,100 @@ msgstr ""
 msgid "unknown errno"
 msgstr ""
 
-#: popt.c:903
+#: popt.c:911
 #, c-format
 msgid "option type (%d) not implemented in popt\n"
 msgstr ""
 
-#: popt.c:1114
+#: popt.c:1122
 msgid "missing argument"
 msgstr ""
 
-#: popt.c:1116
+#: popt.c:1124
 msgid "unknown option"
 msgstr ""
 
-#: popt.c:1118
+#: popt.c:1126
 msgid "mutually exclusive logical operations requested"
 msgstr ""
 
-#: popt.c:1120
+#: popt.c:1128
 msgid "opt->arg should not be NULL"
 msgstr ""
 
-#: popt.c:1122
+#: popt.c:1130
 msgid "aliases nested too deeply"
 msgstr ""
 
-#: popt.c:1124
+#: popt.c:1132
 msgid "error in parameter quoting"
 msgstr ""
 
-#: popt.c:1126
+#: popt.c:1134
 msgid "invalid numeric value"
 msgstr ""
 
-#: popt.c:1128
+#: popt.c:1136
 msgid "number too large or too small"
 msgstr ""
 
-#: popt.c:1130
+#: popt.c:1138
 msgid "memory allocation failed"
 msgstr ""
 
-#: popt.c:1134
+#: popt.c:1142
 msgid "unknown error"
 msgstr ""
 
-#: popthelp.c:52
+#: popthelp.c:53
 msgid "Show this help message"
 msgstr "�������� �� ��צ���"
 
-#: popthelp.c:53
+#: popthelp.c:54
 msgid "Display brief usage message"
 msgstr "�������� ������� ��צ��� ��� ������������"
 
-#: popthelp.c:56
+#: popthelp.c:57
 #, fuzzy
 msgid "Display option defaults in message"
 msgstr "�������� ������� ��צ��� ��� ������������"
 
-#: popthelp.c:98
+#: popthelp.c:99
 msgid "NONE"
 msgstr ""
 
-#: popthelp.c:99
+#: popthelp.c:100
 msgid "VAL"
 msgstr ""
 
-#: popthelp.c:100
+#: popthelp.c:101
 msgid "INT"
 msgstr ""
 
-#: popthelp.c:101
+#: popthelp.c:102
 msgid "LONG"
 msgstr ""
 
-#: popthelp.c:102
+#: popthelp.c:103
 msgid "STRING"
 msgstr ""
 
-#: popthelp.c:103
+#: popthelp.c:104
 msgid "FLOAT"
 msgstr ""
 
-#: popthelp.c:104
+#: popthelp.c:105
 msgid "DOUBLE"
 msgstr ""
 
-#: popthelp.c:105
+#: popthelp.c:106
 msgid "ARG"
 msgstr ""
 
-#: popthelp.c:456
+#: popthelp.c:457
 msgid "Usage:"
 msgstr ""
 
-#: popthelp.c:478
+#: popthelp.c:479
 msgid "[OPTION...]"
 msgstr ""
diff --git a/po/wa.po b/po/wa.po
index 9eb4f81..63cb648 100644
--- a/po/wa.po
+++ b/po/wa.po
@@ -9,7 +9,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.3\n"
-"POT-Creation-Date: 2001-10-15 13:39-0400\n"
+"POT-Creation-Date: 2001-10-17 12:38-0400\n"
 "PO-Revision-Date: 1999-03-18 23:11+0100\n"
 "Last-Translator: Nobody yet\n"
 "Language-Team: walon <linux-wa@chanae.alphanet.ch>\n"
@@ -21,100 +21,100 @@ msgstr ""
 msgid "unknown errno"
 msgstr ""
 
-#: popt.c:903
+#: popt.c:911
 #, c-format
 msgid "option type (%d) not implemented in popt\n"
 msgstr ""
 
-#: popt.c:1114
+#: popt.c:1122
 msgid "missing argument"
 msgstr ""
 
-#: popt.c:1116
+#: popt.c:1124
 msgid "unknown option"
 msgstr ""
 
-#: popt.c:1118
+#: popt.c:1126
 msgid "mutually exclusive logical operations requested"
 msgstr ""
 
-#: popt.c:1120
+#: popt.c:1128
 msgid "opt->arg should not be NULL"
 msgstr ""
 
-#: popt.c:1122
+#: popt.c:1130
 msgid "aliases nested too deeply"
 msgstr ""
 
-#: popt.c:1124
+#: popt.c:1132
 msgid "error in parameter quoting"
 msgstr ""
 
-#: popt.c:1126
+#: popt.c:1134
 msgid "invalid numeric value"
 msgstr ""
 
-#: popt.c:1128
+#: popt.c:1136
 msgid "number too large or too small"
 msgstr ""
 
-#: popt.c:1130
+#: popt.c:1138
 msgid "memory allocation failed"
 msgstr ""
 
-#: popt.c:1134
+#: popt.c:1142
 msgid "unknown error"
 msgstr ""
 
-#: popthelp.c:52
+#: popthelp.c:53
 msgid "Show this help message"
 msgstr "Mostrer ci messaedje d' aide chal"
 
-#: popthelp.c:53
+#: popthelp.c:54
 msgid "Display brief usage message"
 msgstr "Mostre on court messaedje so kmint vos � siervi"
 
-#: popthelp.c:56
+#: popthelp.c:57
 #, fuzzy
 msgid "Display option defaults in message"
 msgstr "Mostre on court messaedje so kmint vos � siervi"
 
-#: popthelp.c:98
+#: popthelp.c:99
 msgid "NONE"
 msgstr ""
 
-#: popthelp.c:99
+#: popthelp.c:100
 msgid "VAL"
 msgstr ""
 
-#: popthelp.c:100
+#: popthelp.c:101
 msgid "INT"
 msgstr ""
 
-#: popthelp.c:101
+#: popthelp.c:102
 msgid "LONG"
 msgstr ""
 
-#: popthelp.c:102
+#: popthelp.c:103
 msgid "STRING"
 msgstr ""
 
-#: popthelp.c:103
+#: popthelp.c:104
 msgid "FLOAT"
 msgstr ""
 
-#: popthelp.c:104
+#: popthelp.c:105
 msgid "DOUBLE"
 msgstr ""
 
-#: popthelp.c:105
+#: popthelp.c:106
 msgid "ARG"
 msgstr ""
 
-#: popthelp.c:456
+#: popthelp.c:457
 msgid "Usage:"
 msgstr ""
 
-#: popthelp.c:478
+#: popthelp.c:479
 msgid "[OPTION...]"
 msgstr ""
diff --git a/po/zh.po b/po/zh.po
index 83e97b1..3c39df2 100644
--- a/po/zh.po
+++ b/po/zh.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.3\n"
-"POT-Creation-Date: 2001-10-15 13:39-0400\n"
+"POT-Creation-Date: 2001-10-17 12:38-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -18,99 +18,99 @@ msgstr ""
 msgid "unknown errno"
 msgstr ""
 
-#: popt.c:903
+#: popt.c:911
 #, c-format
 msgid "option type (%d) not implemented in popt\n"
 msgstr ""
 
-#: popt.c:1114
+#: popt.c:1122
 msgid "missing argument"
 msgstr ""
 
-#: popt.c:1116
+#: popt.c:1124
 msgid "unknown option"
 msgstr ""
 
-#: popt.c:1118
+#: popt.c:1126
 msgid "mutually exclusive logical operations requested"
 msgstr ""
 
-#: popt.c:1120
+#: popt.c:1128
 msgid "opt->arg should not be NULL"
 msgstr ""
 
-#: popt.c:1122
+#: popt.c:1130
 msgid "aliases nested too deeply"
 msgstr ""
 
-#: popt.c:1124
+#: popt.c:1132
 msgid "error in parameter quoting"
 msgstr ""
 
-#: popt.c:1126
+#: popt.c:1134
 msgid "invalid numeric value"
 msgstr ""
 
-#: popt.c:1128
+#: popt.c:1136
 msgid "number too large or too small"
 msgstr ""
 
-#: popt.c:1130
+#: popt.c:1138
 msgid "memory allocation failed"
 msgstr ""
 
-#: popt.c:1134
+#: popt.c:1142
 msgid "unknown error"
 msgstr ""
 
-#: popthelp.c:52
+#: popthelp.c:53
 msgid "Show this help message"
 msgstr ""
 
-#: popthelp.c:53
+#: popthelp.c:54
 msgid "Display brief usage message"
 msgstr ""
 
-#: popthelp.c:56
+#: popthelp.c:57
 msgid "Display option defaults in message"
 msgstr ""
 
-#: popthelp.c:98
+#: popthelp.c:99
 msgid "NONE"
 msgstr ""
 
-#: popthelp.c:99
+#: popthelp.c:100
 msgid "VAL"
 msgstr ""
 
-#: popthelp.c:100
+#: popthelp.c:101
 msgid "INT"
 msgstr ""
 
-#: popthelp.c:101
+#: popthelp.c:102
 msgid "LONG"
 msgstr ""
 
-#: popthelp.c:102
+#: popthelp.c:103
 msgid "STRING"
 msgstr ""
 
-#: popthelp.c:103
+#: popthelp.c:104
 msgid "FLOAT"
 msgstr ""
 
-#: popthelp.c:104
+#: popthelp.c:105
 msgid "DOUBLE"
 msgstr ""
 
-#: popthelp.c:105
+#: popthelp.c:106
 msgid "ARG"
 msgstr ""
 
-#: popthelp.c:456
+#: popthelp.c:457
 msgid "Usage:"
 msgstr ""
 
-#: popthelp.c:478
+#: popthelp.c:479
 msgid "[OPTION...]"
 msgstr ""
diff --git a/po/zh_CN.GB2312.po b/po/zh_CN.GB2312.po
index f1fb6fb..6671364 100644
--- a/po/zh_CN.GB2312.po
+++ b/po/zh_CN.GB2312.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.3\n"
-"POT-Creation-Date: 2001-10-15 13:39-0400\n"
+"POT-Creation-Date: 2001-10-17 12:38-0400\n"
 "PO-Revision-Date: 1999-11-11 05:04+0800\n"
 "Last-Translator: Dillion Chen <dillon.chen@turbolinux.com.cn>\n"
 "Language-Team: TLDN\n"
@@ -13,100 +13,100 @@ msgstr ""
 msgid "unknown errno"
 msgstr ""
 
-#: popt.c:903
+#: popt.c:911
 #, c-format
 msgid "option type (%d) not implemented in popt\n"
 msgstr ""
 
-#: popt.c:1114
+#: popt.c:1122
 msgid "missing argument"
 msgstr ""
 
-#: popt.c:1116
+#: popt.c:1124
 msgid "unknown option"
 msgstr ""
 
-#: popt.c:1118
+#: popt.c:1126
 msgid "mutually exclusive logical operations requested"
 msgstr ""
 
-#: popt.c:1120
+#: popt.c:1128
 msgid "opt->arg should not be NULL"
 msgstr ""
 
-#: popt.c:1122
+#: popt.c:1130
 msgid "aliases nested too deeply"
 msgstr ""
 
-#: popt.c:1124
+#: popt.c:1132
 msgid "error in parameter quoting"
 msgstr ""
 
-#: popt.c:1126
+#: popt.c:1134
 msgid "invalid numeric value"
 msgstr ""
 
-#: popt.c:1128
+#: popt.c:1136
 msgid "number too large or too small"
 msgstr ""
 
-#: popt.c:1130
+#: popt.c:1138
 msgid "memory allocation failed"
 msgstr ""
 
-#: popt.c:1134
+#: popt.c:1142
 msgid "unknown error"
 msgstr ""
 
-#: popthelp.c:52
+#: popthelp.c:53
 msgid "Show this help message"
 msgstr "��ʾ����������Ϣ"
 
-#: popthelp.c:53
+#: popthelp.c:54
 msgid "Display brief usage message"
 msgstr "��ʾ���ʹ����Ϣ"
 
-#: popthelp.c:56
+#: popthelp.c:57
 #, fuzzy
 msgid "Display option defaults in message"
 msgstr "��ʾ���ʹ����Ϣ"
 
-#: popthelp.c:98
+#: popthelp.c:99
 msgid "NONE"
 msgstr ""
 
-#: popthelp.c:99
+#: popthelp.c:100
 msgid "VAL"
 msgstr ""
 
-#: popthelp.c:100
+#: popthelp.c:101
 msgid "INT"
 msgstr ""
 
-#: popthelp.c:101
+#: popthelp.c:102
 msgid "LONG"
 msgstr ""
 
-#: popthelp.c:102
+#: popthelp.c:103
 msgid "STRING"
 msgstr ""
 
-#: popthelp.c:103
+#: popthelp.c:104
 msgid "FLOAT"
 msgstr ""
 
-#: popthelp.c:104
+#: popthelp.c:105
 msgid "DOUBLE"
 msgstr ""
 
-#: popthelp.c:105
+#: popthelp.c:106
 msgid "ARG"
 msgstr ""
 
-#: popthelp.c:456
+#: popthelp.c:457
 msgid "Usage:"
 msgstr ""
 
-#: popthelp.c:478
+#: popthelp.c:479
 msgid "[OPTION...]"
 msgstr ""
-- 
Gitee


From 5366678a8b44076176171591b4b14a4ffbce62da Mon Sep 17 00:00:00 2001
From: Jeff Johnson <n3npq@mac.com>
Date: Sat, 8 Dec 2001 17:22:23 +0000
Subject: [PATCH 329/667] - lclint-3.0.0.19 fiddles.

---
 po/cs.po           | 2 +-
 po/da.po           | 2 +-
 po/de.po           | 2 +-
 po/es.po           | 2 +-
 po/eu_ES.po        | 2 +-
 po/fi.po           | 2 +-
 po/fr.po           | 2 +-
 po/gl.po           | 2 +-
 po/hu.po           | 2 +-
 po/id.po           | 2 +-
 po/is.po           | 2 +-
 po/it.po           | 2 +-
 po/ja.po           | 2 +-
 po/ko.po           | 2 +-
 po/no.po           | 2 +-
 po/pl.po           | 2 +-
 po/popt.pot        | 2 +-
 po/pt.po           | 2 +-
 po/pt_BR.po        | 2 +-
 po/ro.po           | 2 +-
 po/ru.po           | 2 +-
 po/sk.po           | 2 +-
 po/sl.po           | 2 +-
 po/sr.po           | 2 +-
 po/sv.po           | 2 +-
 po/tr.po           | 2 +-
 po/uk.po           | 2 +-
 po/wa.po           | 2 +-
 po/zh.po           | 2 +-
 po/zh_CN.GB2312.po | 2 +-
 poptconfig.c       | 3 ++-
 popthelp.c         | 2 +-
 poptparse.c        | 2 ++
 33 files changed, 35 insertions(+), 32 deletions(-)

diff --git a/po/cs.po b/po/cs.po
index 84632ff..010b1f4 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.3\n"
-"POT-Creation-Date: 2001-10-17 12:38-0400\n"
+"POT-Creation-Date: 2001-12-08 11:01-0500\n"
 "PO-Revision-Date: 2001-07-24 00:03+0100\n"
 "Last-Translator: Milan Kerslager <kerslage@linux.cz>\n"
 "Language-Team: Czech <cs@li.org>\n"
diff --git a/po/da.po b/po/da.po
index 722fa9c..8c91136 100644
--- a/po/da.po
+++ b/po/da.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.3\n"
-"POT-Creation-Date: 2001-10-17 12:38-0400\n"
+"POT-Creation-Date: 2001-12-08 11:01-0500\n"
 "PO-Revision-Date: Sun Jan 21 2001 04:30:32+0200\n"
 "Last-Translator: Martin Hansen <mah@k64.dk>\n"
 "Language-Team: Dansk <dansk@klid.dk>\n"
diff --git a/po/de.po b/po/de.po
index 3c39df2..aeb7c99 100644
--- a/po/de.po
+++ b/po/de.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.3\n"
-"POT-Creation-Date: 2001-10-17 12:38-0400\n"
+"POT-Creation-Date: 2001-12-08 11:01-0500\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/po/es.po b/po/es.po
index 2bfcfcf..3279bc0 100644
--- a/po/es.po
+++ b/po/es.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.3\n"
-"POT-Creation-Date: 2001-10-17 12:38-0400\n"
+"POT-Creation-Date: 2001-12-08 11:01-0500\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Leandro Lucarella <luca@linuxmendoza.org.ar>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/po/eu_ES.po b/po/eu_ES.po
index 3c39df2..aeb7c99 100644
--- a/po/eu_ES.po
+++ b/po/eu_ES.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.3\n"
-"POT-Creation-Date: 2001-10-17 12:38-0400\n"
+"POT-Creation-Date: 2001-12-08 11:01-0500\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/po/fi.po b/po/fi.po
index 3c39df2..aeb7c99 100644
--- a/po/fi.po
+++ b/po/fi.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.3\n"
-"POT-Creation-Date: 2001-10-17 12:38-0400\n"
+"POT-Creation-Date: 2001-12-08 11:01-0500\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/po/fr.po b/po/fr.po
index 3c39df2..aeb7c99 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.3\n"
-"POT-Creation-Date: 2001-10-17 12:38-0400\n"
+"POT-Creation-Date: 2001-12-08 11:01-0500\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/po/gl.po b/po/gl.po
index a0a6363..3991f4f 100644
--- a/po/gl.po
+++ b/po/gl.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.3\n"
-"POT-Creation-Date: 2001-10-17 12:38-0400\n"
+"POT-Creation-Date: 2001-12-08 11:01-0500\n"
 "PO-Revision-Date: 2001-01-17 01:01+0100\n"
 "Last-Translator: Jes�s Bravo �lvarez <jba@pobox.com>\n"
 "Language-Team: Galician <trasno@ceu.fi.udc.es>\n"
diff --git a/po/hu.po b/po/hu.po
index 2623def..fce9e23 100644
--- a/po/hu.po
+++ b/po/hu.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.3\n"
-"POT-Creation-Date: 2001-10-17 12:38-0400\n"
+"POT-Creation-Date: 2001-12-08 11:01-0500\n"
 "PO-Revision-Date: 2000-08-03 23:26+0200\n"
 "Last-Translator: L�szl� N�meth <nemeth@qwertynet.hu>\n"
 "Language-Team: Hungarian\n"
diff --git a/po/id.po b/po/id.po
index 3c39df2..aeb7c99 100644
--- a/po/id.po
+++ b/po/id.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.3\n"
-"POT-Creation-Date: 2001-10-17 12:38-0400\n"
+"POT-Creation-Date: 2001-12-08 11:01-0500\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/po/is.po b/po/is.po
index cba0395..f809095 100644
--- a/po/is.po
+++ b/po/is.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.3\n"
-"POT-Creation-Date: 2001-10-17 12:38-0400\n"
+"POT-Creation-Date: 2001-12-08 11:01-0500\n"
 "PO-Revision-Date: 2001-06-08 01:35+0000\n"
 "Last-Translator: Richard Allen <ra@hp.is>\n"
 "Language-Team: is <kde-isl@mmedia.is>\n"
diff --git a/po/it.po b/po/it.po
index 3c39df2..aeb7c99 100644
--- a/po/it.po
+++ b/po/it.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.3\n"
-"POT-Creation-Date: 2001-10-17 12:38-0400\n"
+"POT-Creation-Date: 2001-12-08 11:01-0500\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/po/ja.po b/po/ja.po
index 3c39df2..aeb7c99 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.3\n"
-"POT-Creation-Date: 2001-10-17 12:38-0400\n"
+"POT-Creation-Date: 2001-12-08 11:01-0500\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/po/ko.po b/po/ko.po
index 68ee0e3..d7e753b 100644
--- a/po/ko.po
+++ b/po/ko.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6\n"
-"POT-Creation-Date: 2001-10-17 12:38-0400\n"
+"POT-Creation-Date: 2001-12-08 11:01-0500\n"
 "PO-Revision-Date: 2001-09-06 20:06+0900\n"
 "Last-Translator: Jong-Hoon Ryu <redhat4u@netian.com>\n"
 "Language-Team: GNU Translation project <ko@li.org>\n"
diff --git a/po/no.po b/po/no.po
index a9868e1..8c3f3f3 100644
--- a/po/no.po
+++ b/po/no.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.3\n"
-"POT-Creation-Date: 2001-10-17 12:38-0400\n"
+"POT-Creation-Date: 2001-12-08 11:01-0500\n"
 "PO-Revision-Date: 2001-06-27 11:05+0200\n"
 "Last-Translator: Kjartan Maraas <kmaraas@online.no>\n"
 "Language-Team: Norwegian <no@li.org>\n"
diff --git a/po/pl.po b/po/pl.po
index 3c39df2..aeb7c99 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.3\n"
-"POT-Creation-Date: 2001-10-17 12:38-0400\n"
+"POT-Creation-Date: 2001-12-08 11:01-0500\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/po/popt.pot b/po/popt.pot
index b8743a6..9dd4104 100644
--- a/po/popt.pot
+++ b/po/popt.pot
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2001-10-17 12:38-0400\n"
+"POT-Creation-Date: 2001-12-08 11:01-0500\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/po/pt.po b/po/pt.po
index 0fc97d9..992d842 100644
--- a/po/pt.po
+++ b/po/pt.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.3\n"
-"POT-Creation-Date: 2001-10-17 12:38-0400\n"
+"POT-Creation-Date: 2001-12-08 11:01-0500\n"
 "PO-Revision-Date: 2001-01-21 19:31+00:00\n"
 "Last-Translator: Pedro Morais <morais@kde.org>\n"
 "Language-Team: pt <morais@kde.org>\n"
diff --git a/po/pt_BR.po b/po/pt_BR.po
index 3c39df2..aeb7c99 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.3\n"
-"POT-Creation-Date: 2001-10-17 12:38-0400\n"
+"POT-Creation-Date: 2001-12-08 11:01-0500\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/po/ro.po b/po/ro.po
index 8451967..34f2f17 100644
--- a/po/ro.po
+++ b/po/ro.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.3\n"
-"POT-Creation-Date: 2001-10-17 12:38-0400\n"
+"POT-Creation-Date: 2001-12-08 11:01-0500\n"
 "PO-Revision-Date: 2000-06-14 23:23+EST\n"
 "Last-Translator: Cristian Gafton <gafton@redhat.com>\n"
 "Language-Team: Romanian <ro@li.org>\n"
diff --git a/po/ru.po b/po/ru.po
index 048b7be..6d10916 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.3\n"
-"POT-Creation-Date: 2001-10-17 12:38-0400\n"
+"POT-Creation-Date: 2001-12-08 11:01-0500\n"
 "PO-Revision-Date: 2001-07-05 21:00-0500\n"
 "Last-Translator: Eugene Kanter <eugene@blackcatlinux.com>\n"
 "Language-Team: Black Cat Linux Team <blackcat-support@blackcatlinux.com>\n"
diff --git a/po/sk.po b/po/sk.po
index 1b022bd..118cc6a 100644
--- a/po/sk.po
+++ b/po/sk.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.3\n"
-"POT-Creation-Date: 2001-10-17 12:38-0400\n"
+"POT-Creation-Date: 2001-12-08 11:01-0500\n"
 "PO-Revision-Date: 1999-08-04 21:40+0200\n"
 "Last-Translator: Stanislav Meduna <stano@eunet.sk>\n"
 "Language-Team: Slovak <sk-i18n@rak.isternet.sk>\n"
diff --git a/po/sl.po b/po/sl.po
index bbb4b7c..e0daf0b 100644
--- a/po/sl.po
+++ b/po/sl.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.3\n"
-"POT-Creation-Date: 2001-10-17 12:38-0400\n"
+"POT-Creation-Date: 2001-12-08 11:01-0500\n"
 "PO-Revision-Date: 2000-09-05 12:30+0200\n"
 "Last-Translator: Roman Maurer <roman.maurer@hermes.si>\n"
 "Language-Team: Slovenian <sl@li.org>\n"
diff --git a/po/sr.po b/po/sr.po
index 3c39df2..aeb7c99 100644
--- a/po/sr.po
+++ b/po/sr.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.3\n"
-"POT-Creation-Date: 2001-10-17 12:38-0400\n"
+"POT-Creation-Date: 2001-12-08 11:01-0500\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/po/sv.po b/po/sv.po
index b91c107..d5f3bfd 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.3\n"
-"POT-Creation-Date: 2001-10-17 12:38-0400\n"
+"POT-Creation-Date: 2001-12-08 11:01-0500\n"
 "PO-Revision-Date: 2001-07-12 22:26+0100\n"
 "Last-Translator: Christian Rose <menthos@menthos.com>\n"
 "Language-Team: Swedish <sv@li.org>\n"
diff --git a/po/tr.po b/po/tr.po
index f57fa01..c434a05 100644
--- a/po/tr.po
+++ b/po/tr.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.3\n"
-"POT-Creation-Date: 2001-10-17 12:38-0400\n"
+"POT-Creation-Date: 2001-12-08 11:01-0500\n"
 "PO-Revision-Date: 2000-02-11 13:01+0200\n"
 "Last-Translator: Nilgun Belma Buguner <nilgun@technologist.com>\n"
 "Language-Team: Turkish <tr@li.org>\n"
diff --git a/po/uk.po b/po/uk.po
index 4a3ef1a..7c3dfc4 100644
--- a/po/uk.po
+++ b/po/uk.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.3\n"
-"POT-Creation-Date: 2001-10-17 12:38-0400\n"
+"POT-Creation-Date: 2001-12-08 11:01-0500\n"
 "PO-Revision-Date: 1999-09-30 16:54+0200\n"
 "Last-Translator: Yuri Syrota <rasta@renome.rovno.ua>\n"
 "Language-Team: Ukrainian <uk@li.org>\n"
diff --git a/po/wa.po b/po/wa.po
index 63cb648..9739f16 100644
--- a/po/wa.po
+++ b/po/wa.po
@@ -9,7 +9,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.3\n"
-"POT-Creation-Date: 2001-10-17 12:38-0400\n"
+"POT-Creation-Date: 2001-12-08 11:01-0500\n"
 "PO-Revision-Date: 1999-03-18 23:11+0100\n"
 "Last-Translator: Nobody yet\n"
 "Language-Team: walon <linux-wa@chanae.alphanet.ch>\n"
diff --git a/po/zh.po b/po/zh.po
index 3c39df2..aeb7c99 100644
--- a/po/zh.po
+++ b/po/zh.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.3\n"
-"POT-Creation-Date: 2001-10-17 12:38-0400\n"
+"POT-Creation-Date: 2001-12-08 11:01-0500\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/po/zh_CN.GB2312.po b/po/zh_CN.GB2312.po
index 6671364..1bd96fa 100644
--- a/po/zh_CN.GB2312.po
+++ b/po/zh_CN.GB2312.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.3\n"
-"POT-Creation-Date: 2001-10-17 12:38-0400\n"
+"POT-Creation-Date: 2001-12-08 11:01-0500\n"
 "PO-Revision-Date: 1999-11-11 05:04+0800\n"
 "Last-Translator: Dillion Chen <dillon.chen@turbolinux.com.cn>\n"
 "Language-Team: TLDN\n"
diff --git a/poptconfig.c b/poptconfig.c
index 0c70471..7f80ff0 100644
--- a/poptconfig.c
+++ b/poptconfig.c
@@ -44,10 +44,12 @@ static void configLine(poptContext con, char * line)
     while (*line != '\0' && isspace(*line)) line++;
     if (*line == '\0') return;
 
+    /*@-temptrans@*/ /* FIX: line alias is saved */
     if (opt[0] == '-' && opt[1] == '-')
 	item->option.longName = opt + 2;
     else if (opt[0] == '-' && opt[2] == '\0')
 	item->option.shortName = opt[1];
+    /*@=temptrans@*/
 
     if (poptParseArgvString(line, &item->argc, &item->argv)) return;
 
@@ -77,7 +79,6 @@ static void configLine(poptContext con, char * line)
 	item->argv[j] = NULL;
 	item->argc = j;
     }
-    
     /*@=modobserver@*/
 	
     if (!strcmp(entryType, "alias"))
diff --git a/popthelp.c b/popthelp.c
index e2e2eef..5befe63 100644
--- a/popthelp.c
+++ b/popthelp.c
@@ -123,7 +123,7 @@ singleOptionDefaultValue(int lineLength,
     char * le = malloc(4*lineLength + 1);
     char * l = le;
 
-    if (l == NULL) return NULL;	/* XXX can't happen */
+    if (le == NULL) return NULL;	/* XXX can't happen */
     *le = '\0';
     *le++ = '(';
     strcpy(le, defstr);	le += strlen(le);
diff --git a/poptparse.c b/poptparse.c
index f9faae3..2ffb7dd 100644
--- a/poptparse.c
+++ b/poptparse.c
@@ -32,10 +32,12 @@ int poptDupArgv(int argc, const char **argv,
     argv2 = (void *) dst;
     dst += (argc + 1) * sizeof(*argv);
 
+    /*@-branchstate@*/
     for (i = 0; i < argc; i++) {
 	argv2[i] = dst;
 	dst += strlen(strcpy(dst, argv[i])) + 1;
     }
+    /*@=branchstate@*/
     argv2[argc] = NULL;
 
     if (argvPtr) {
-- 
Gitee


From 4e1195d3773548bb29745fc961195229c82245f9 Mon Sep 17 00:00:00 2001
From: Jeff Johnson <n3npq@mac.com>
Date: Fri, 18 Jan 2002 22:52:06 +0000
Subject: [PATCH 330/667] - missing key(s) on keyring when verifying a
 signature is now an error. - remove dependency whiteout. - splint fiddles.

---
 .lclintrc          | 85 +++++++++++++++++++++++++++++++---------------
 findme.c           |  2 ++
 po/cs.po           | 28 +++++++--------
 po/da.po           | 28 +++++++--------
 po/de.po           | 28 +++++++--------
 po/es.po           | 28 +++++++--------
 po/eu_ES.po        | 28 +++++++--------
 po/fi.po           | 28 +++++++--------
 po/fr.po           | 28 +++++++--------
 po/gl.po           | 28 +++++++--------
 po/hu.po           | 28 +++++++--------
 po/id.po           | 28 +++++++--------
 po/is.po           | 28 +++++++--------
 po/it.po           | 28 +++++++--------
 po/ja.po           | 28 +++++++--------
 po/ko.po           | 28 +++++++--------
 po/no.po           | 28 +++++++--------
 po/pl.po           | 28 +++++++--------
 po/popt.pot        | 28 +++++++--------
 po/pt.po           | 28 +++++++--------
 po/pt_BR.po        | 28 +++++++--------
 po/ro.po           | 28 +++++++--------
 po/ru.po           | 28 +++++++--------
 po/sk.po           | 28 +++++++--------
 po/sl.po           | 28 +++++++--------
 po/sr.po           | 28 +++++++--------
 po/sv.po           | 28 +++++++--------
 po/tr.po           | 28 +++++++--------
 po/uk.po           | 28 +++++++--------
 po/wa.po           | 28 +++++++--------
 po/zh.po           | 28 +++++++--------
 po/zh_CN.GB2312.po | 28 +++++++--------
 popt.c             | 14 ++++++--
 poptconfig.c       |  2 ++
 popthelp.c         |  2 ++
 poptint.h          |  2 +-
 system.h           | 15 ++++++--
 37 files changed, 508 insertions(+), 454 deletions(-)

diff --git a/.lclintrc b/.lclintrc
index bf23f75..6a85d82 100644
--- a/.lclintrc
+++ b/.lclintrc
@@ -1,36 +1,65 @@
--I. -I./build -I./lib -I./rpmio -I./popt -DHAVE_CONFIG_H -D_GNU_SOURCE
+-I. -DHAVE_CONFIG_H -D_GNU_SOURCE
 
 +partial
++forcehints
 
 -warnunixlib
 -warnposix
 
 +unixlib
 
-# XXX ignore doxygen markings
--unrecogcomments
-
-# don't-bother-me-yet parameters
-#-branchstate		# painful
--mustfree		# alloca is painful
-
-# not-yet normal parameters
--boolops		# w->n
--predboolint		# w->n
--type			#
-
-# -weak paramaters
-#+boolint
-#-boolops
-#+ignorequals
-#+ignoresigns
-#-mustfree
-#+longintegral
-#+matchanyintegral
-#-nullpass
-#-observertrans
-#-predboolint
-#-predboolothers
-#-retvalint
-#-retvalother
-#-shiftsigned
+-unrecogcomments	# XXX ignore doxygen markings
+
++strict			# lclint level
+
+# --- +partial artifacts
+-declundef
+-exportheadervar
+-exportlocal
+
+-enummemuse
+-fcnuse
+-typeuse
+-varuse
+
+# --- not-yet at strict level
+-bitwisesigned		# pita
+-elseifcomplete		# 95 occurences
+-exportconst		# 839 occurences
+-exportfcn
+-exporttype
+-exportvar
+-fielduse		# 1 occurence <bits/sigset.h>
+-forblock		# tedious
+-ifblock		# tedious
+-incondefs		# <bits/{ipc,pthreadtypes}.h> heartburn
+-matchfields		# <bits/ipc.h> heartburn
+-namechecks		# tedious ANSI compliance checks
+-numenummembers 1024	# RPMTAG has 138 members
+-numstructfields 256	# Java jni.h has 229 fields
+-ptrarith		# tedious
+
+-compdestroy
+-mustdefine
+-shiftimplementation
+#-shiftnegative
+
+-strictops
+-strictusereleased
+-stringliterallen 4096	# redhat*PubKey's are big
+-whileblock		# tedious
+
+# --- not-yet at checks level
+-ansi-reserved
++enumint
+-mustfree
+-predboolptr
+-usedef
+
+# --- not-yet at standard level
+-boolops
+-predboolint
++boolint
++charint
++ignorequals
++matchanyintegral
diff --git a/findme.c b/findme.c
index f8d51bd..e98e061 100644
--- a/findme.c
+++ b/findme.c
@@ -28,6 +28,7 @@ const char * findProgramPath(const char * argv0) {
     strcpy(pathbuf, path);
 
     chptr = NULL;
+    /*@-branchstate@*/
     do {
 	if ((chptr = strchr(start, ':')))
 	    *chptr = '\0';
@@ -41,6 +42,7 @@ const char * findProgramPath(const char * argv0) {
 	else
 	    start = NULL;
     } while (start && *start);
+    /*@=branchstate@*/
 
     free(buf);
 
diff --git a/po/cs.po b/po/cs.po
index 010b1f4..994ee16 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.3\n"
-"POT-Creation-Date: 2001-12-08 11:01-0500\n"
+"POT-Creation-Date: 2002-01-18 16:12-0500\n"
 "PO-Revision-Date: 2001-07-24 00:03+0100\n"
 "Last-Translator: Milan Kerslager <kerslage@linux.cz>\n"
 "Language-Team: Czech <cs@li.org>\n"
@@ -13,48 +13,48 @@ msgstr ""
 msgid "unknown errno"
 msgstr "nezn�m� ��slo chyby"
 
-#: popt.c:911
+#: popt.c:917
 #, c-format
 msgid "option type (%d) not implemented in popt\n"
 msgstr "volba (%d) nen� v popt implementov�na\n"
 
-#: popt.c:1122
+#: popt.c:1132
 msgid "missing argument"
 msgstr "chyb� argument"
 
-#: popt.c:1124
+#: popt.c:1134
 msgid "unknown option"
 msgstr "nezn�m� volba"
 
-#: popt.c:1126
+#: popt.c:1136
 msgid "mutually exclusive logical operations requested"
 msgstr "po�adov�ny vz�jemn� v�lu�n� logick� operace"
 
-#: popt.c:1128
+#: popt.c:1138
 msgid "opt->arg should not be NULL"
 msgstr "opt->arg nesm� b�t NULL"
 
-#: popt.c:1130
+#: popt.c:1140
 msgid "aliases nested too deeply"
 msgstr "aliasy vno�en� p��li� hluboko"
 
-#: popt.c:1132
+#: popt.c:1142
 msgid "error in parameter quoting"
 msgstr "chyba v quotov�n� parametr�"
 
-#: popt.c:1134
+#: popt.c:1144
 msgid "invalid numeric value"
 msgstr "chybn� numerick� hodnota"
 
-#: popt.c:1136
+#: popt.c:1146
 msgid "number too large or too small"
 msgstr "��slo je p��li� velk� nebo p��li� mal�"
 
-#: popt.c:1138
+#: popt.c:1148
 msgid "memory allocation failed"
 msgstr "selhala alokace pam�ti"
 
-#: popt.c:1142
+#: popt.c:1152
 msgid "unknown error"
 msgstr "nezn�m� chyba"
 
@@ -102,10 +102,10 @@ msgstr "DOUBLE"
 msgid "ARG"
 msgstr "ARG"
 
-#: popthelp.c:457
+#: popthelp.c:459
 msgid "Usage:"
 msgstr "Pou�it�:"
 
-#: popthelp.c:479
+#: popthelp.c:481
 msgid "[OPTION...]"
 msgstr "[VOLBY...]"
diff --git a/po/da.po b/po/da.po
index 8c91136..a3dd547 100644
--- a/po/da.po
+++ b/po/da.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.3\n"
-"POT-Creation-Date: 2001-12-08 11:01-0500\n"
+"POT-Creation-Date: 2002-01-18 16:12-0500\n"
 "PO-Revision-Date: Sun Jan 21 2001 04:30:32+0200\n"
 "Last-Translator: Martin Hansen <mah@k64.dk>\n"
 "Language-Team: Dansk <dansk@klid.dk>\n"
@@ -14,48 +14,48 @@ msgstr ""
 msgid "unknown errno"
 msgstr "ukendt fejlnr."
 
-#: popt.c:911
+#: popt.c:917
 #, c-format
 msgid "option type (%d) not implemented in popt\n"
 msgstr "tilvalgstype (%d) er ikke implementeret i popt\n"
 
-#: popt.c:1122
+#: popt.c:1132
 msgid "missing argument"
 msgstr "mangler argument"
 
-#: popt.c:1124
+#: popt.c:1134
 msgid "unknown option"
 msgstr "ukendt tilvalg"
 
-#: popt.c:1126
+#: popt.c:1136
 msgid "mutually exclusive logical operations requested"
 msgstr "de �nskede handlinger udelukker hinanden"
 
-#: popt.c:1128
+#: popt.c:1138
 msgid "opt->arg should not be NULL"
 msgstr ""
 
-#: popt.c:1130
+#: popt.c:1140
 msgid "aliases nested too deeply"
 msgstr "aliaser er for dybt indlejret"
 
-#: popt.c:1132
+#: popt.c:1142
 msgid "error in parameter quoting"
 msgstr "fejl i parameter citering"
 
-#: popt.c:1134
+#: popt.c:1144
 msgid "invalid numeric value"
 msgstr "ugyldig numerisk v�rdi"
 
-#: popt.c:1136
+#: popt.c:1146
 msgid "number too large or too small"
 msgstr "nummer for stort, eller for lille"
 
-#: popt.c:1138
+#: popt.c:1148
 msgid "memory allocation failed"
 msgstr ""
 
-#: popt.c:1142
+#: popt.c:1152
 msgid "unknown error"
 msgstr "ukendt fejl"
 
@@ -104,10 +104,10 @@ msgstr "DOUBLE"
 msgid "ARG"
 msgstr "ARG"
 
-#: popthelp.c:457
+#: popthelp.c:459
 msgid "Usage:"
 msgstr "Brug:"
 
-#: popthelp.c:479
+#: popthelp.c:481
 msgid "[OPTION...]"
 msgstr "[TILVALG...]"
diff --git a/po/de.po b/po/de.po
index aeb7c99..6cfef98 100644
--- a/po/de.po
+++ b/po/de.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.3\n"
-"POT-Creation-Date: 2001-12-08 11:01-0500\n"
+"POT-Creation-Date: 2002-01-18 16:12-0500\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -18,48 +18,48 @@ msgstr ""
 msgid "unknown errno"
 msgstr ""
 
-#: popt.c:911
+#: popt.c:917
 #, c-format
 msgid "option type (%d) not implemented in popt\n"
 msgstr ""
 
-#: popt.c:1122
+#: popt.c:1132
 msgid "missing argument"
 msgstr ""
 
-#: popt.c:1124
+#: popt.c:1134
 msgid "unknown option"
 msgstr ""
 
-#: popt.c:1126
+#: popt.c:1136
 msgid "mutually exclusive logical operations requested"
 msgstr ""
 
-#: popt.c:1128
+#: popt.c:1138
 msgid "opt->arg should not be NULL"
 msgstr ""
 
-#: popt.c:1130
+#: popt.c:1140
 msgid "aliases nested too deeply"
 msgstr ""
 
-#: popt.c:1132
+#: popt.c:1142
 msgid "error in parameter quoting"
 msgstr ""
 
-#: popt.c:1134
+#: popt.c:1144
 msgid "invalid numeric value"
 msgstr ""
 
-#: popt.c:1136
+#: popt.c:1146
 msgid "number too large or too small"
 msgstr ""
 
-#: popt.c:1138
+#: popt.c:1148
 msgid "memory allocation failed"
 msgstr ""
 
-#: popt.c:1142
+#: popt.c:1152
 msgid "unknown error"
 msgstr ""
 
@@ -107,10 +107,10 @@ msgstr ""
 msgid "ARG"
 msgstr ""
 
-#: popthelp.c:457
+#: popthelp.c:459
 msgid "Usage:"
 msgstr ""
 
-#: popthelp.c:479
+#: popthelp.c:481
 msgid "[OPTION...]"
 msgstr ""
diff --git a/po/es.po b/po/es.po
index 3279bc0..a450415 100644
--- a/po/es.po
+++ b/po/es.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.3\n"
-"POT-Creation-Date: 2001-12-08 11:01-0500\n"
+"POT-Creation-Date: 2002-01-18 16:12-0500\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Leandro Lucarella <luca@linuxmendoza.org.ar>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -18,48 +18,48 @@ msgstr ""
 msgid "unknown errno"
 msgstr "errno desconocido"
 
-#: popt.c:911
+#: popt.c:917
 #, c-format
 msgid "option type (%d) not implemented in popt\n"
 msgstr "tipo de opci�n (%d) no implementada en popt\n"
 
-#: popt.c:1122
+#: popt.c:1132
 msgid "missing argument"
 msgstr "falta argumento"
 
-#: popt.c:1124
+#: popt.c:1134
 msgid "unknown option"
 msgstr "opci�n desconocida"
 
-#: popt.c:1126
+#: popt.c:1136
 msgid "mutually exclusive logical operations requested"
 msgstr "requerida operaci�n l�gica mutuamente exclusiva"
 
-#: popt.c:1128
+#: popt.c:1138
 msgid "opt->arg should not be NULL"
 msgstr ""
 
-#: popt.c:1130
+#: popt.c:1140
 msgid "aliases nested too deeply"
 msgstr "alias anidados muy profundamente"
 
-#: popt.c:1132
+#: popt.c:1142
 msgid "error in parameter quoting"
 msgstr "error en cita de par�metros"
 
-#: popt.c:1134
+#: popt.c:1144
 msgid "invalid numeric value"
 msgstr "valor num�rico inv�lido"
 
-#: popt.c:1136
+#: popt.c:1146
 msgid "number too large or too small"
 msgstr "n�mero muy largo o muy peque�o"
 
-#: popt.c:1138
+#: popt.c:1148
 msgid "memory allocation failed"
 msgstr ""
 
-#: popt.c:1142
+#: popt.c:1152
 msgid "unknown error"
 msgstr "error desconocido"
 
@@ -108,10 +108,10 @@ msgstr "DOUBLE"
 msgid "ARG"
 msgstr "ARG"
 
-#: popthelp.c:457
+#: popthelp.c:459
 msgid "Usage:"
 msgstr "Modo de Uso:"
 
-#: popthelp.c:479
+#: popthelp.c:481
 msgid "[OPTION...]"
 msgstr "[OPCI�N...]"
diff --git a/po/eu_ES.po b/po/eu_ES.po
index aeb7c99..6cfef98 100644
--- a/po/eu_ES.po
+++ b/po/eu_ES.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.3\n"
-"POT-Creation-Date: 2001-12-08 11:01-0500\n"
+"POT-Creation-Date: 2002-01-18 16:12-0500\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -18,48 +18,48 @@ msgstr ""
 msgid "unknown errno"
 msgstr ""
 
-#: popt.c:911
+#: popt.c:917
 #, c-format
 msgid "option type (%d) not implemented in popt\n"
 msgstr ""
 
-#: popt.c:1122
+#: popt.c:1132
 msgid "missing argument"
 msgstr ""
 
-#: popt.c:1124
+#: popt.c:1134
 msgid "unknown option"
 msgstr ""
 
-#: popt.c:1126
+#: popt.c:1136
 msgid "mutually exclusive logical operations requested"
 msgstr ""
 
-#: popt.c:1128
+#: popt.c:1138
 msgid "opt->arg should not be NULL"
 msgstr ""
 
-#: popt.c:1130
+#: popt.c:1140
 msgid "aliases nested too deeply"
 msgstr ""
 
-#: popt.c:1132
+#: popt.c:1142
 msgid "error in parameter quoting"
 msgstr ""
 
-#: popt.c:1134
+#: popt.c:1144
 msgid "invalid numeric value"
 msgstr ""
 
-#: popt.c:1136
+#: popt.c:1146
 msgid "number too large or too small"
 msgstr ""
 
-#: popt.c:1138
+#: popt.c:1148
 msgid "memory allocation failed"
 msgstr ""
 
-#: popt.c:1142
+#: popt.c:1152
 msgid "unknown error"
 msgstr ""
 
@@ -107,10 +107,10 @@ msgstr ""
 msgid "ARG"
 msgstr ""
 
-#: popthelp.c:457
+#: popthelp.c:459
 msgid "Usage:"
 msgstr ""
 
-#: popthelp.c:479
+#: popthelp.c:481
 msgid "[OPTION...]"
 msgstr ""
diff --git a/po/fi.po b/po/fi.po
index aeb7c99..6cfef98 100644
--- a/po/fi.po
+++ b/po/fi.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.3\n"
-"POT-Creation-Date: 2001-12-08 11:01-0500\n"
+"POT-Creation-Date: 2002-01-18 16:12-0500\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -18,48 +18,48 @@ msgstr ""
 msgid "unknown errno"
 msgstr ""
 
-#: popt.c:911
+#: popt.c:917
 #, c-format
 msgid "option type (%d) not implemented in popt\n"
 msgstr ""
 
-#: popt.c:1122
+#: popt.c:1132
 msgid "missing argument"
 msgstr ""
 
-#: popt.c:1124
+#: popt.c:1134
 msgid "unknown option"
 msgstr ""
 
-#: popt.c:1126
+#: popt.c:1136
 msgid "mutually exclusive logical operations requested"
 msgstr ""
 
-#: popt.c:1128
+#: popt.c:1138
 msgid "opt->arg should not be NULL"
 msgstr ""
 
-#: popt.c:1130
+#: popt.c:1140
 msgid "aliases nested too deeply"
 msgstr ""
 
-#: popt.c:1132
+#: popt.c:1142
 msgid "error in parameter quoting"
 msgstr ""
 
-#: popt.c:1134
+#: popt.c:1144
 msgid "invalid numeric value"
 msgstr ""
 
-#: popt.c:1136
+#: popt.c:1146
 msgid "number too large or too small"
 msgstr ""
 
-#: popt.c:1138
+#: popt.c:1148
 msgid "memory allocation failed"
 msgstr ""
 
-#: popt.c:1142
+#: popt.c:1152
 msgid "unknown error"
 msgstr ""
 
@@ -107,10 +107,10 @@ msgstr ""
 msgid "ARG"
 msgstr ""
 
-#: popthelp.c:457
+#: popthelp.c:459
 msgid "Usage:"
 msgstr ""
 
-#: popthelp.c:479
+#: popthelp.c:481
 msgid "[OPTION...]"
 msgstr ""
diff --git a/po/fr.po b/po/fr.po
index aeb7c99..6cfef98 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.3\n"
-"POT-Creation-Date: 2001-12-08 11:01-0500\n"
+"POT-Creation-Date: 2002-01-18 16:12-0500\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -18,48 +18,48 @@ msgstr ""
 msgid "unknown errno"
 msgstr ""
 
-#: popt.c:911
+#: popt.c:917
 #, c-format
 msgid "option type (%d) not implemented in popt\n"
 msgstr ""
 
-#: popt.c:1122
+#: popt.c:1132
 msgid "missing argument"
 msgstr ""
 
-#: popt.c:1124
+#: popt.c:1134
 msgid "unknown option"
 msgstr ""
 
-#: popt.c:1126
+#: popt.c:1136
 msgid "mutually exclusive logical operations requested"
 msgstr ""
 
-#: popt.c:1128
+#: popt.c:1138
 msgid "opt->arg should not be NULL"
 msgstr ""
 
-#: popt.c:1130
+#: popt.c:1140
 msgid "aliases nested too deeply"
 msgstr ""
 
-#: popt.c:1132
+#: popt.c:1142
 msgid "error in parameter quoting"
 msgstr ""
 
-#: popt.c:1134
+#: popt.c:1144
 msgid "invalid numeric value"
 msgstr ""
 
-#: popt.c:1136
+#: popt.c:1146
 msgid "number too large or too small"
 msgstr ""
 
-#: popt.c:1138
+#: popt.c:1148
 msgid "memory allocation failed"
 msgstr ""
 
-#: popt.c:1142
+#: popt.c:1152
 msgid "unknown error"
 msgstr ""
 
@@ -107,10 +107,10 @@ msgstr ""
 msgid "ARG"
 msgstr ""
 
-#: popthelp.c:457
+#: popthelp.c:459
 msgid "Usage:"
 msgstr ""
 
-#: popthelp.c:479
+#: popthelp.c:481
 msgid "[OPTION...]"
 msgstr ""
diff --git a/po/gl.po b/po/gl.po
index 3991f4f..e1ca10e 100644
--- a/po/gl.po
+++ b/po/gl.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.3\n"
-"POT-Creation-Date: 2001-12-08 11:01-0500\n"
+"POT-Creation-Date: 2002-01-18 16:12-0500\n"
 "PO-Revision-Date: 2001-01-17 01:01+0100\n"
 "Last-Translator: Jes�s Bravo �lvarez <jba@pobox.com>\n"
 "Language-Team: Galician <trasno@ceu.fi.udc.es>\n"
@@ -13,48 +13,48 @@ msgstr ""
 msgid "unknown errno"
 msgstr "errno desco�ecido"
 
-#: popt.c:911
+#: popt.c:917
 #, c-format
 msgid "option type (%d) not implemented in popt\n"
 msgstr "tipo de opci�n (%d) non implementada en popt\n"
 
-#: popt.c:1122
+#: popt.c:1132
 msgid "missing argument"
 msgstr "falta un argumento"
 
-#: popt.c:1124
+#: popt.c:1134
 msgid "unknown option"
 msgstr "opci�n desco�ecida"
 
-#: popt.c:1126
+#: popt.c:1136
 msgid "mutually exclusive logical operations requested"
 msgstr "solicit�ronse operaci�ns l�xicas mutuamente exclu�ntes"
 
-#: popt.c:1128
+#: popt.c:1138
 msgid "opt->arg should not be NULL"
 msgstr ""
 
-#: popt.c:1130
+#: popt.c:1140
 msgid "aliases nested too deeply"
 msgstr "aliases ani�ados a un nivel demasiado profundo"
 
-#: popt.c:1132
+#: popt.c:1142
 msgid "error in parameter quoting"
 msgstr "erro nas comi�as do par�metro"
 
-#: popt.c:1134
+#: popt.c:1144
 msgid "invalid numeric value"
 msgstr "valor num�rico non v�lido"
 
-#: popt.c:1136
+#: popt.c:1146
 msgid "number too large or too small"
 msgstr "n�mero demasiado grande ou pequeno"
 
-#: popt.c:1138
+#: popt.c:1148
 msgid "memory allocation failed"
 msgstr ""
 
-#: popt.c:1142
+#: popt.c:1152
 msgid "unknown error"
 msgstr "erro desco�ecido"
 
@@ -103,10 +103,10 @@ msgstr "DOUBLE"
 msgid "ARG"
 msgstr "ARG"
 
-#: popthelp.c:457
+#: popthelp.c:459
 msgid "Usage:"
 msgstr "Uso:"
 
-#: popthelp.c:479
+#: popthelp.c:481
 msgid "[OPTION...]"
 msgstr "[OPCI�N...]"
diff --git a/po/hu.po b/po/hu.po
index fce9e23..87c9c08 100644
--- a/po/hu.po
+++ b/po/hu.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.3\n"
-"POT-Creation-Date: 2001-12-08 11:01-0500\n"
+"POT-Creation-Date: 2002-01-18 16:12-0500\n"
 "PO-Revision-Date: 2000-08-03 23:26+0200\n"
 "Last-Translator: L�szl� N�meth <nemeth@qwertynet.hu>\n"
 "Language-Team: Hungarian\n"
@@ -13,48 +13,48 @@ msgstr ""
 msgid "unknown errno"
 msgstr ""
 
-#: popt.c:911
+#: popt.c:917
 #, c-format
 msgid "option type (%d) not implemented in popt\n"
 msgstr ""
 
-#: popt.c:1122
+#: popt.c:1132
 msgid "missing argument"
 msgstr ""
 
-#: popt.c:1124
+#: popt.c:1134
 msgid "unknown option"
 msgstr ""
 
-#: popt.c:1126
+#: popt.c:1136
 msgid "mutually exclusive logical operations requested"
 msgstr ""
 
-#: popt.c:1128
+#: popt.c:1138
 msgid "opt->arg should not be NULL"
 msgstr ""
 
-#: popt.c:1130
+#: popt.c:1140
 msgid "aliases nested too deeply"
 msgstr ""
 
-#: popt.c:1132
+#: popt.c:1142
 msgid "error in parameter quoting"
 msgstr ""
 
-#: popt.c:1134
+#: popt.c:1144
 msgid "invalid numeric value"
 msgstr ""
 
-#: popt.c:1136
+#: popt.c:1146
 msgid "number too large or too small"
 msgstr ""
 
-#: popt.c:1138
+#: popt.c:1148
 msgid "memory allocation failed"
 msgstr ""
 
-#: popt.c:1142
+#: popt.c:1152
 msgid "unknown error"
 msgstr ""
 
@@ -103,10 +103,10 @@ msgstr ""
 msgid "ARG"
 msgstr ""
 
-#: popthelp.c:457
+#: popthelp.c:459
 msgid "Usage:"
 msgstr ""
 
-#: popthelp.c:479
+#: popthelp.c:481
 msgid "[OPTION...]"
 msgstr ""
diff --git a/po/id.po b/po/id.po
index aeb7c99..6cfef98 100644
--- a/po/id.po
+++ b/po/id.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.3\n"
-"POT-Creation-Date: 2001-12-08 11:01-0500\n"
+"POT-Creation-Date: 2002-01-18 16:12-0500\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -18,48 +18,48 @@ msgstr ""
 msgid "unknown errno"
 msgstr ""
 
-#: popt.c:911
+#: popt.c:917
 #, c-format
 msgid "option type (%d) not implemented in popt\n"
 msgstr ""
 
-#: popt.c:1122
+#: popt.c:1132
 msgid "missing argument"
 msgstr ""
 
-#: popt.c:1124
+#: popt.c:1134
 msgid "unknown option"
 msgstr ""
 
-#: popt.c:1126
+#: popt.c:1136
 msgid "mutually exclusive logical operations requested"
 msgstr ""
 
-#: popt.c:1128
+#: popt.c:1138
 msgid "opt->arg should not be NULL"
 msgstr ""
 
-#: popt.c:1130
+#: popt.c:1140
 msgid "aliases nested too deeply"
 msgstr ""
 
-#: popt.c:1132
+#: popt.c:1142
 msgid "error in parameter quoting"
 msgstr ""
 
-#: popt.c:1134
+#: popt.c:1144
 msgid "invalid numeric value"
 msgstr ""
 
-#: popt.c:1136
+#: popt.c:1146
 msgid "number too large or too small"
 msgstr ""
 
-#: popt.c:1138
+#: popt.c:1148
 msgid "memory allocation failed"
 msgstr ""
 
-#: popt.c:1142
+#: popt.c:1152
 msgid "unknown error"
 msgstr ""
 
@@ -107,10 +107,10 @@ msgstr ""
 msgid "ARG"
 msgstr ""
 
-#: popthelp.c:457
+#: popthelp.c:459
 msgid "Usage:"
 msgstr ""
 
-#: popthelp.c:479
+#: popthelp.c:481
 msgid "[OPTION...]"
 msgstr ""
diff --git a/po/is.po b/po/is.po
index f809095..d638658 100644
--- a/po/is.po
+++ b/po/is.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.3\n"
-"POT-Creation-Date: 2001-12-08 11:01-0500\n"
+"POT-Creation-Date: 2002-01-18 16:12-0500\n"
 "PO-Revision-Date: 2001-06-08 01:35+0000\n"
 "Last-Translator: Richard Allen <ra@hp.is>\n"
 "Language-Team: is <kde-isl@mmedia.is>\n"
@@ -13,48 +13,48 @@ msgstr ""
 msgid "unknown errno"
 msgstr "��ekkt villun�mer"
 
-#: popt.c:911
+#: popt.c:917
 #, c-format
 msgid "option type (%d) not implemented in popt\n"
 msgstr "rofager�in (%d) er ekki studd � popt\n"
 
-#: popt.c:1122
+#: popt.c:1132
 msgid "missing argument"
 msgstr "vantar vi�fang"
 
-#: popt.c:1124
+#: popt.c:1134
 msgid "unknown option"
 msgstr "��ekktur rofi"
 
-#: popt.c:1126
+#: popt.c:1136
 msgid "mutually exclusive logical operations requested"
 msgstr "be�i� um rofa sem sl�kkva hvor � ��rum"
 
-#: popt.c:1128
+#: popt.c:1138
 msgid "opt->arg should not be NULL"
 msgstr "opt->arg �tti ekki a� vera NULL"
 
-#: popt.c:1130
+#: popt.c:1140
 msgid "aliases nested too deeply"
 msgstr "al�asar of fl�knir"
 
-#: popt.c:1132
+#: popt.c:1142
 msgid "error in parameter quoting"
 msgstr "villa � vi�f�ngum (g�salappir og svo frv.)"
 
-#: popt.c:1134
+#: popt.c:1144
 msgid "invalid numeric value"
 msgstr "�gilt t�lulegt gildi"
 
-#: popt.c:1136
+#: popt.c:1146
 msgid "number too large or too small"
 msgstr "talan of st�r e�a sm�"
 
-#: popt.c:1138
+#: popt.c:1148
 msgid "memory allocation failed"
 msgstr "ekki t�kst a� taka fr� minni"
 
-#: popt.c:1142
+#: popt.c:1152
 msgid "unknown error"
 msgstr "��ekkt villa"
 
@@ -102,10 +102,10 @@ msgstr "DOUBLE"
 msgid "ARG"
 msgstr "ARG"
 
-#: popthelp.c:457
+#: popthelp.c:459
 msgid "Usage:"
 msgstr "Notkun:"
 
-#: popthelp.c:479
+#: popthelp.c:481
 msgid "[OPTION...]"
 msgstr "[ROFI...]"
diff --git a/po/it.po b/po/it.po
index aeb7c99..6cfef98 100644
--- a/po/it.po
+++ b/po/it.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.3\n"
-"POT-Creation-Date: 2001-12-08 11:01-0500\n"
+"POT-Creation-Date: 2002-01-18 16:12-0500\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -18,48 +18,48 @@ msgstr ""
 msgid "unknown errno"
 msgstr ""
 
-#: popt.c:911
+#: popt.c:917
 #, c-format
 msgid "option type (%d) not implemented in popt\n"
 msgstr ""
 
-#: popt.c:1122
+#: popt.c:1132
 msgid "missing argument"
 msgstr ""
 
-#: popt.c:1124
+#: popt.c:1134
 msgid "unknown option"
 msgstr ""
 
-#: popt.c:1126
+#: popt.c:1136
 msgid "mutually exclusive logical operations requested"
 msgstr ""
 
-#: popt.c:1128
+#: popt.c:1138
 msgid "opt->arg should not be NULL"
 msgstr ""
 
-#: popt.c:1130
+#: popt.c:1140
 msgid "aliases nested too deeply"
 msgstr ""
 
-#: popt.c:1132
+#: popt.c:1142
 msgid "error in parameter quoting"
 msgstr ""
 
-#: popt.c:1134
+#: popt.c:1144
 msgid "invalid numeric value"
 msgstr ""
 
-#: popt.c:1136
+#: popt.c:1146
 msgid "number too large or too small"
 msgstr ""
 
-#: popt.c:1138
+#: popt.c:1148
 msgid "memory allocation failed"
 msgstr ""
 
-#: popt.c:1142
+#: popt.c:1152
 msgid "unknown error"
 msgstr ""
 
@@ -107,10 +107,10 @@ msgstr ""
 msgid "ARG"
 msgstr ""
 
-#: popthelp.c:457
+#: popthelp.c:459
 msgid "Usage:"
 msgstr ""
 
-#: popthelp.c:479
+#: popthelp.c:481
 msgid "[OPTION...]"
 msgstr ""
diff --git a/po/ja.po b/po/ja.po
index aeb7c99..6cfef98 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.3\n"
-"POT-Creation-Date: 2001-12-08 11:01-0500\n"
+"POT-Creation-Date: 2002-01-18 16:12-0500\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -18,48 +18,48 @@ msgstr ""
 msgid "unknown errno"
 msgstr ""
 
-#: popt.c:911
+#: popt.c:917
 #, c-format
 msgid "option type (%d) not implemented in popt\n"
 msgstr ""
 
-#: popt.c:1122
+#: popt.c:1132
 msgid "missing argument"
 msgstr ""
 
-#: popt.c:1124
+#: popt.c:1134
 msgid "unknown option"
 msgstr ""
 
-#: popt.c:1126
+#: popt.c:1136
 msgid "mutually exclusive logical operations requested"
 msgstr ""
 
-#: popt.c:1128
+#: popt.c:1138
 msgid "opt->arg should not be NULL"
 msgstr ""
 
-#: popt.c:1130
+#: popt.c:1140
 msgid "aliases nested too deeply"
 msgstr ""
 
-#: popt.c:1132
+#: popt.c:1142
 msgid "error in parameter quoting"
 msgstr ""
 
-#: popt.c:1134
+#: popt.c:1144
 msgid "invalid numeric value"
 msgstr ""
 
-#: popt.c:1136
+#: popt.c:1146
 msgid "number too large or too small"
 msgstr ""
 
-#: popt.c:1138
+#: popt.c:1148
 msgid "memory allocation failed"
 msgstr ""
 
-#: popt.c:1142
+#: popt.c:1152
 msgid "unknown error"
 msgstr ""
 
@@ -107,10 +107,10 @@ msgstr ""
 msgid "ARG"
 msgstr ""
 
-#: popthelp.c:457
+#: popthelp.c:459
 msgid "Usage:"
 msgstr ""
 
-#: popthelp.c:479
+#: popthelp.c:481
 msgid "[OPTION...]"
 msgstr ""
diff --git a/po/ko.po b/po/ko.po
index d7e753b..11d34a2 100644
--- a/po/ko.po
+++ b/po/ko.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6\n"
-"POT-Creation-Date: 2001-12-08 11:01-0500\n"
+"POT-Creation-Date: 2002-01-18 16:12-0500\n"
 "PO-Revision-Date: 2001-09-06 20:06+0900\n"
 "Last-Translator: Jong-Hoon Ryu <redhat4u@netian.com>\n"
 "Language-Team: GNU Translation project <ko@li.org>\n"
@@ -13,48 +13,48 @@ msgstr ""
 msgid "unknown errno"
 msgstr "�� �� ���� �����ڵ�(errno) �Դϴ�"
 
-#: popt.c:911
+#: popt.c:917
 #, c-format
 msgid "option type (%d) not implemented in popt\n"
 msgstr "�ɼ� ���� (%d)�� popt���� ����� �� �����ϴ�\n"
 
-#: popt.c:1122
+#: popt.c:1132
 msgid "missing argument"
 msgstr "�μ��� �������� �ʾҽ��ϴ�"
 
-#: popt.c:1124
+#: popt.c:1134
 msgid "unknown option"
 msgstr "�� �� ���� �ɼ��Դϴ�"
 
-#: popt.c:1126
+#: popt.c:1136
 msgid "mutually exclusive logical operations requested"
 msgstr "���ʿ� ��Ÿ�� ���� ������ �����Ǿ����ϴ�"
 
-#: popt.c:1128
+#: popt.c:1138
 msgid "opt->arg should not be NULL"
 msgstr "�ɼ�->�μ��� NULL�� �Ǿ�� �ȵ˴ϴ�"
 
-#: popt.c:1130
+#: popt.c:1140
 msgid "aliases nested too deeply"
 msgstr "��Ī(alias)�� �����ϰ� �����Ǿ����ϴ�"
 
-#: popt.c:1132
+#: popt.c:1142
 msgid "error in parameter quoting"
 msgstr "�Ű������� ������ �ֽ��ϴ�"
 
-#: popt.c:1134
+#: popt.c:1144
 msgid "invalid numeric value"
 msgstr "�߸��� ��ġ ���Դϴ�"
 
-#: popt.c:1136
+#: popt.c:1146
 msgid "number too large or too small"
 msgstr "���ڰ� �ʹ� ũ�ų� �ʹ� �����ϴ�"
 
-#: popt.c:1138
+#: popt.c:1148
 msgid "memory allocation failed"
 msgstr "�޸� �Ҵ翡 �����߽��ϴ�"
 
-#: popt.c:1142
+#: popt.c:1152
 msgid "unknown error"
 msgstr "�� �� ���� �����Դϴ�"
 
@@ -102,10 +102,10 @@ msgstr "
 msgid "ARG"
 msgstr "�μ�(ARG)"
 
-#: popthelp.c:457
+#: popthelp.c:459
 msgid "Usage:"
 msgstr "����:"
 
-#: popthelp.c:479
+#: popthelp.c:481
 msgid "[OPTION...]"
 msgstr "[�ɼ�...]"
diff --git a/po/no.po b/po/no.po
index 8c3f3f3..39f3824 100644
--- a/po/no.po
+++ b/po/no.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.3\n"
-"POT-Creation-Date: 2001-12-08 11:01-0500\n"
+"POT-Creation-Date: 2002-01-18 16:12-0500\n"
 "PO-Revision-Date: 2001-06-27 11:05+0200\n"
 "Last-Translator: Kjartan Maraas <kmaraas@online.no>\n"
 "Language-Team: Norwegian <no@li.org>\n"
@@ -13,48 +13,48 @@ msgstr ""
 msgid "unknown errno"
 msgstr "ukjent errno"
 
-#: popt.c:911
+#: popt.c:917
 #, c-format
 msgid "option type (%d) not implemented in popt\n"
 msgstr "flaggtype (%d) ikke implementert i popt\n"
 
-#: popt.c:1122
+#: popt.c:1132
 msgid "missing argument"
 msgstr "manglende argument"
 
-#: popt.c:1124
+#: popt.c:1134
 msgid "unknown option"
 msgstr "ukjent flagg"
 
-#: popt.c:1126
+#: popt.c:1136
 msgid "mutually exclusive logical operations requested"
 msgstr "gjensidig eksluderende logiske operasjoner forespurt"
 
-#: popt.c:1128
+#: popt.c:1138
 msgid "opt->arg should not be NULL"
 msgstr "opt->arg m� ikke v�re NULL"
 
-#: popt.c:1130
+#: popt.c:1140
 msgid "aliases nested too deeply"
 msgstr "aliaser med for dype l�kker"
 
-#: popt.c:1132
+#: popt.c:1142
 msgid "error in parameter quoting"
 msgstr "feil i parametersitering"
 
-#: popt.c:1134
+#: popt.c:1144
 msgid "invalid numeric value"
 msgstr "ugyldig numerisk verdi"
 
-#: popt.c:1136
+#: popt.c:1146
 msgid "number too large or too small"
 msgstr "tallet er for stort eller lite"
 
-#: popt.c:1138
+#: popt.c:1148
 msgid "memory allocation failed"
 msgstr "minneallokering feilet"
 
-#: popt.c:1142
+#: popt.c:1152
 msgid "unknown error"
 msgstr "ukjent feil"
 
@@ -102,10 +102,10 @@ msgstr "DOUBLE"
 msgid "ARG"
 msgstr "ARG"
 
-#: popthelp.c:457
+#: popthelp.c:459
 msgid "Usage:"
 msgstr "Bruk:"
 
-#: popthelp.c:479
+#: popthelp.c:481
 msgid "[OPTION...]"
 msgstr "[FLAGG...]"
diff --git a/po/pl.po b/po/pl.po
index aeb7c99..6cfef98 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.3\n"
-"POT-Creation-Date: 2001-12-08 11:01-0500\n"
+"POT-Creation-Date: 2002-01-18 16:12-0500\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -18,48 +18,48 @@ msgstr ""
 msgid "unknown errno"
 msgstr ""
 
-#: popt.c:911
+#: popt.c:917
 #, c-format
 msgid "option type (%d) not implemented in popt\n"
 msgstr ""
 
-#: popt.c:1122
+#: popt.c:1132
 msgid "missing argument"
 msgstr ""
 
-#: popt.c:1124
+#: popt.c:1134
 msgid "unknown option"
 msgstr ""
 
-#: popt.c:1126
+#: popt.c:1136
 msgid "mutually exclusive logical operations requested"
 msgstr ""
 
-#: popt.c:1128
+#: popt.c:1138
 msgid "opt->arg should not be NULL"
 msgstr ""
 
-#: popt.c:1130
+#: popt.c:1140
 msgid "aliases nested too deeply"
 msgstr ""
 
-#: popt.c:1132
+#: popt.c:1142
 msgid "error in parameter quoting"
 msgstr ""
 
-#: popt.c:1134
+#: popt.c:1144
 msgid "invalid numeric value"
 msgstr ""
 
-#: popt.c:1136
+#: popt.c:1146
 msgid "number too large or too small"
 msgstr ""
 
-#: popt.c:1138
+#: popt.c:1148
 msgid "memory allocation failed"
 msgstr ""
 
-#: popt.c:1142
+#: popt.c:1152
 msgid "unknown error"
 msgstr ""
 
@@ -107,10 +107,10 @@ msgstr ""
 msgid "ARG"
 msgstr ""
 
-#: popthelp.c:457
+#: popthelp.c:459
 msgid "Usage:"
 msgstr ""
 
-#: popthelp.c:479
+#: popthelp.c:481
 msgid "[OPTION...]"
 msgstr ""
diff --git a/po/popt.pot b/po/popt.pot
index 9dd4104..c66570d 100644
--- a/po/popt.pot
+++ b/po/popt.pot
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2001-12-08 11:01-0500\n"
+"POT-Creation-Date: 2002-01-18 16:12-0500\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -18,48 +18,48 @@ msgstr ""
 msgid "unknown errno"
 msgstr ""
 
-#: popt.c:911
+#: popt.c:917
 #, c-format
 msgid "option type (%d) not implemented in popt\n"
 msgstr ""
 
-#: popt.c:1122
+#: popt.c:1132
 msgid "missing argument"
 msgstr ""
 
-#: popt.c:1124
+#: popt.c:1134
 msgid "unknown option"
 msgstr ""
 
-#: popt.c:1126
+#: popt.c:1136
 msgid "mutually exclusive logical operations requested"
 msgstr ""
 
-#: popt.c:1128
+#: popt.c:1138
 msgid "opt->arg should not be NULL"
 msgstr ""
 
-#: popt.c:1130
+#: popt.c:1140
 msgid "aliases nested too deeply"
 msgstr ""
 
-#: popt.c:1132
+#: popt.c:1142
 msgid "error in parameter quoting"
 msgstr ""
 
-#: popt.c:1134
+#: popt.c:1144
 msgid "invalid numeric value"
 msgstr ""
 
-#: popt.c:1136
+#: popt.c:1146
 msgid "number too large or too small"
 msgstr ""
 
-#: popt.c:1138
+#: popt.c:1148
 msgid "memory allocation failed"
 msgstr ""
 
-#: popt.c:1142
+#: popt.c:1152
 msgid "unknown error"
 msgstr ""
 
@@ -107,10 +107,10 @@ msgstr ""
 msgid "ARG"
 msgstr ""
 
-#: popthelp.c:457
+#: popthelp.c:459
 msgid "Usage:"
 msgstr ""
 
-#: popthelp.c:479
+#: popthelp.c:481
 msgid "[OPTION...]"
 msgstr ""
diff --git a/po/pt.po b/po/pt.po
index 992d842..b6040c2 100644
--- a/po/pt.po
+++ b/po/pt.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.3\n"
-"POT-Creation-Date: 2001-12-08 11:01-0500\n"
+"POT-Creation-Date: 2002-01-18 16:12-0500\n"
 "PO-Revision-Date: 2001-01-21 19:31+00:00\n"
 "Last-Translator: Pedro Morais <morais@kde.org>\n"
 "Language-Team: pt <morais@kde.org>\n"
@@ -13,48 +13,48 @@ msgstr ""
 msgid "unknown errno"
 msgstr "errno desconhecido"
 
-#: popt.c:911
+#: popt.c:917
 #, c-format
 msgid "option type (%d) not implemented in popt\n"
 msgstr "tipo de op��o (%d) n�o implementado no popt\n"
 
-#: popt.c:1122
+#: popt.c:1132
 msgid "missing argument"
 msgstr "falta um argumento"
 
-#: popt.c:1124
+#: popt.c:1134
 msgid "unknown option"
 msgstr "op��o desconhecida"
 
-#: popt.c:1126
+#: popt.c:1136
 msgid "mutually exclusive logical operations requested"
 msgstr "foram pedidas opera��es l�gicas mutuamente exclusivas"
 
-#: popt.c:1128
+#: popt.c:1138
 msgid "opt->arg should not be NULL"
 msgstr ""
 
-#: popt.c:1130
+#: popt.c:1140
 msgid "aliases nested too deeply"
 msgstr "'aliases' demasiado aninhados"
 
-#: popt.c:1132
+#: popt.c:1142
 msgid "error in parameter quoting"
 msgstr "erros no 'quoting' de par�metros"
 
-#: popt.c:1134
+#: popt.c:1144
 msgid "invalid numeric value"
 msgstr "valor n�merico inv�lido"
 
-#: popt.c:1136
+#: popt.c:1146
 msgid "number too large or too small"
 msgstr "n�mero demasiado grando ou pequeno"
 
-#: popt.c:1138
+#: popt.c:1148
 msgid "memory allocation failed"
 msgstr ""
 
-#: popt.c:1142
+#: popt.c:1152
 msgid "unknown error"
 msgstr "erro desconhecido"
 
@@ -103,10 +103,10 @@ msgstr "DOUBLE"
 msgid "ARG"
 msgstr "ARG"
 
-#: popthelp.c:457
+#: popthelp.c:459
 msgid "Usage:"
 msgstr "Utiliza��o:"
 
-#: popthelp.c:479
+#: popthelp.c:481
 msgid "[OPTION...]"
 msgstr "[OP��O...]"
diff --git a/po/pt_BR.po b/po/pt_BR.po
index aeb7c99..6cfef98 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.3\n"
-"POT-Creation-Date: 2001-12-08 11:01-0500\n"
+"POT-Creation-Date: 2002-01-18 16:12-0500\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -18,48 +18,48 @@ msgstr ""
 msgid "unknown errno"
 msgstr ""
 
-#: popt.c:911
+#: popt.c:917
 #, c-format
 msgid "option type (%d) not implemented in popt\n"
 msgstr ""
 
-#: popt.c:1122
+#: popt.c:1132
 msgid "missing argument"
 msgstr ""
 
-#: popt.c:1124
+#: popt.c:1134
 msgid "unknown option"
 msgstr ""
 
-#: popt.c:1126
+#: popt.c:1136
 msgid "mutually exclusive logical operations requested"
 msgstr ""
 
-#: popt.c:1128
+#: popt.c:1138
 msgid "opt->arg should not be NULL"
 msgstr ""
 
-#: popt.c:1130
+#: popt.c:1140
 msgid "aliases nested too deeply"
 msgstr ""
 
-#: popt.c:1132
+#: popt.c:1142
 msgid "error in parameter quoting"
 msgstr ""
 
-#: popt.c:1134
+#: popt.c:1144
 msgid "invalid numeric value"
 msgstr ""
 
-#: popt.c:1136
+#: popt.c:1146
 msgid "number too large or too small"
 msgstr ""
 
-#: popt.c:1138
+#: popt.c:1148
 msgid "memory allocation failed"
 msgstr ""
 
-#: popt.c:1142
+#: popt.c:1152
 msgid "unknown error"
 msgstr ""
 
@@ -107,10 +107,10 @@ msgstr ""
 msgid "ARG"
 msgstr ""
 
-#: popthelp.c:457
+#: popthelp.c:459
 msgid "Usage:"
 msgstr ""
 
-#: popthelp.c:479
+#: popthelp.c:481
 msgid "[OPTION...]"
 msgstr ""
diff --git a/po/ro.po b/po/ro.po
index 34f2f17..7289ba9 100644
--- a/po/ro.po
+++ b/po/ro.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.3\n"
-"POT-Creation-Date: 2001-12-08 11:01-0500\n"
+"POT-Creation-Date: 2002-01-18 16:12-0500\n"
 "PO-Revision-Date: 2000-06-14 23:23+EST\n"
 "Last-Translator: Cristian Gafton <gafton@redhat.com>\n"
 "Language-Team: Romanian <ro@li.org>\n"
@@ -13,49 +13,49 @@ msgstr ""
 msgid "unknown errno"
 msgstr "eroare necunoscuta"
 
-#: popt.c:911
+#: popt.c:917
 #, c-format
 msgid "option type (%d) not implemented in popt\n"
 msgstr "optiunea de tipul (%d) nu este implementata in popt\n"
 
-#: popt.c:1122
+#: popt.c:1132
 msgid "missing argument"
 msgstr "argument lipsa"
 
-#: popt.c:1124
+#: popt.c:1134
 msgid "unknown option"
 msgstr "optiune necunoscuta"
 
-#: popt.c:1126
+#: popt.c:1136
 msgid "mutually exclusive logical operations requested"
 msgstr ""
 
-#: popt.c:1128
+#: popt.c:1138
 msgid "opt->arg should not be NULL"
 msgstr ""
 
-#: popt.c:1130
+#: popt.c:1140
 msgid "aliases nested too deeply"
 msgstr "recursivitate infinita la optiunile sinonime"
 
-#: popt.c:1132
+#: popt.c:1142
 #, fuzzy
 msgid "error in parameter quoting"
 msgstr "eroare la insertie parametru"
 
-#: popt.c:1134
+#: popt.c:1144
 msgid "invalid numeric value"
 msgstr "valoare numarica invalida"
 
-#: popt.c:1136
+#: popt.c:1146
 msgid "number too large or too small"
 msgstr "numar prea mare sau prea mic"
 
-#: popt.c:1138
+#: popt.c:1148
 msgid "memory allocation failed"
 msgstr ""
 
-#: popt.c:1142
+#: popt.c:1152
 msgid "unknown error"
 msgstr "eroare necuinoscuta"
 
@@ -104,10 +104,10 @@ msgstr ""
 msgid "ARG"
 msgstr ""
 
-#: popthelp.c:457
+#: popthelp.c:459
 msgid "Usage:"
 msgstr "Sintaxa:"
 
-#: popthelp.c:479
+#: popthelp.c:481
 msgid "[OPTION...]"
 msgstr "[OPTIUNE...]"
diff --git a/po/ru.po b/po/ru.po
index 6d10916..0655d86 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.3\n"
-"POT-Creation-Date: 2001-12-08 11:01-0500\n"
+"POT-Creation-Date: 2002-01-18 16:12-0500\n"
 "PO-Revision-Date: 2001-07-05 21:00-0500\n"
 "Last-Translator: Eugene Kanter <eugene@blackcatlinux.com>\n"
 "Language-Team: Black Cat Linux Team <blackcat-support@blackcatlinux.com>\n"
@@ -13,48 +13,48 @@ msgstr ""
 msgid "unknown errno"
 msgstr "����������� ����� ������"
 
-#: popt.c:911
+#: popt.c:917
 #, c-format
 msgid "option type (%d) not implemented in popt\n"
 msgstr "��������� ��������� (%d) � popt �� �������������\n"
 
-#: popt.c:1122
+#: popt.c:1132
 msgid "missing argument"
 msgstr "�������� ��������"
 
-#: popt.c:1124
+#: popt.c:1134
 msgid "unknown option"
 msgstr "����������� ��������"
 
-#: popt.c:1126
+#: popt.c:1136
 msgid "mutually exclusive logical operations requested"
 msgstr "��������� ������� ����������� ���������� ��������"
 
-#: popt.c:1128
+#: popt.c:1138
 msgid "opt->arg should not be NULL"
 msgstr "opt->arg �� ����� ���� NULL"
 
-#: popt.c:1130
+#: popt.c:1140
 msgid "aliases nested too deeply"
 msgstr "�������� ������� ���������� �������� �����������"
 
-#: popt.c:1132
+#: popt.c:1142
 msgid "error in parameter quoting"
 msgstr "�����a ��������� ���������� � �������"
 
-#: popt.c:1134
+#: popt.c:1144
 msgid "invalid numeric value"
 msgstr "������������ �������� ��������"
 
-#: popt.c:1136
+#: popt.c:1146
 msgid "number too large or too small"
 msgstr "�������� �������� �� ��������� ����������������"
 
-#: popt.c:1138
+#: popt.c:1148
 msgid "memory allocation failed"
 msgstr "������ ��������� ������"
 
-#: popt.c:1142
+#: popt.c:1152
 msgid "unknown error"
 msgstr "����������� ������"
 
@@ -102,10 +102,10 @@ msgstr "DOUBLE"
 msgid "ARG"
 msgstr "ARG"
 
-#: popthelp.c:457
+#: popthelp.c:459
 msgid "Usage:"
 msgstr "�������������:"
 
-#: popthelp.c:479
+#: popthelp.c:481
 msgid "[OPTION...]"
 msgstr "[��������...]"
diff --git a/po/sk.po b/po/sk.po
index 118cc6a..ea8c4ca 100644
--- a/po/sk.po
+++ b/po/sk.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.3\n"
-"POT-Creation-Date: 2001-12-08 11:01-0500\n"
+"POT-Creation-Date: 2002-01-18 16:12-0500\n"
 "PO-Revision-Date: 1999-08-04 21:40+0200\n"
 "Last-Translator: Stanislav Meduna <stano@eunet.sk>\n"
 "Language-Team: Slovak <sk-i18n@rak.isternet.sk>\n"
@@ -17,48 +17,48 @@ msgstr ""
 msgid "unknown errno"
 msgstr ""
 
-#: popt.c:911
+#: popt.c:917
 #, c-format
 msgid "option type (%d) not implemented in popt\n"
 msgstr ""
 
-#: popt.c:1122
+#: popt.c:1132
 msgid "missing argument"
 msgstr ""
 
-#: popt.c:1124
+#: popt.c:1134
 msgid "unknown option"
 msgstr ""
 
-#: popt.c:1126
+#: popt.c:1136
 msgid "mutually exclusive logical operations requested"
 msgstr ""
 
-#: popt.c:1128
+#: popt.c:1138
 msgid "opt->arg should not be NULL"
 msgstr ""
 
-#: popt.c:1130
+#: popt.c:1140
 msgid "aliases nested too deeply"
 msgstr ""
 
-#: popt.c:1132
+#: popt.c:1142
 msgid "error in parameter quoting"
 msgstr ""
 
-#: popt.c:1134
+#: popt.c:1144
 msgid "invalid numeric value"
 msgstr ""
 
-#: popt.c:1136
+#: popt.c:1146
 msgid "number too large or too small"
 msgstr ""
 
-#: popt.c:1138
+#: popt.c:1148
 msgid "memory allocation failed"
 msgstr ""
 
-#: popt.c:1142
+#: popt.c:1152
 msgid "unknown error"
 msgstr ""
 
@@ -107,10 +107,10 @@ msgstr ""
 msgid "ARG"
 msgstr ""
 
-#: popthelp.c:457
+#: popthelp.c:459
 msgid "Usage:"
 msgstr ""
 
-#: popthelp.c:479
+#: popthelp.c:481
 msgid "[OPTION...]"
 msgstr ""
diff --git a/po/sl.po b/po/sl.po
index e0daf0b..fe5f1e5 100644
--- a/po/sl.po
+++ b/po/sl.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.3\n"
-"POT-Creation-Date: 2001-12-08 11:01-0500\n"
+"POT-Creation-Date: 2002-01-18 16:12-0500\n"
 "PO-Revision-Date: 2000-09-05 12:30+0200\n"
 "Last-Translator: Roman Maurer <roman.maurer@hermes.si>\n"
 "Language-Team: Slovenian <sl@li.org>\n"
@@ -13,48 +13,48 @@ msgstr ""
 msgid "unknown errno"
 msgstr ""
 
-#: popt.c:911
+#: popt.c:917
 #, c-format
 msgid "option type (%d) not implemented in popt\n"
 msgstr ""
 
-#: popt.c:1122
+#: popt.c:1132
 msgid "missing argument"
 msgstr ""
 
-#: popt.c:1124
+#: popt.c:1134
 msgid "unknown option"
 msgstr ""
 
-#: popt.c:1126
+#: popt.c:1136
 msgid "mutually exclusive logical operations requested"
 msgstr ""
 
-#: popt.c:1128
+#: popt.c:1138
 msgid "opt->arg should not be NULL"
 msgstr ""
 
-#: popt.c:1130
+#: popt.c:1140
 msgid "aliases nested too deeply"
 msgstr ""
 
-#: popt.c:1132
+#: popt.c:1142
 msgid "error in parameter quoting"
 msgstr ""
 
-#: popt.c:1134
+#: popt.c:1144
 msgid "invalid numeric value"
 msgstr ""
 
-#: popt.c:1136
+#: popt.c:1146
 msgid "number too large or too small"
 msgstr ""
 
-#: popt.c:1138
+#: popt.c:1148
 msgid "memory allocation failed"
 msgstr ""
 
-#: popt.c:1142
+#: popt.c:1152
 msgid "unknown error"
 msgstr ""
 
@@ -103,10 +103,10 @@ msgstr ""
 msgid "ARG"
 msgstr ""
 
-#: popthelp.c:457
+#: popthelp.c:459
 msgid "Usage:"
 msgstr ""
 
-#: popthelp.c:479
+#: popthelp.c:481
 msgid "[OPTION...]"
 msgstr ""
diff --git a/po/sr.po b/po/sr.po
index aeb7c99..6cfef98 100644
--- a/po/sr.po
+++ b/po/sr.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.3\n"
-"POT-Creation-Date: 2001-12-08 11:01-0500\n"
+"POT-Creation-Date: 2002-01-18 16:12-0500\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -18,48 +18,48 @@ msgstr ""
 msgid "unknown errno"
 msgstr ""
 
-#: popt.c:911
+#: popt.c:917
 #, c-format
 msgid "option type (%d) not implemented in popt\n"
 msgstr ""
 
-#: popt.c:1122
+#: popt.c:1132
 msgid "missing argument"
 msgstr ""
 
-#: popt.c:1124
+#: popt.c:1134
 msgid "unknown option"
 msgstr ""
 
-#: popt.c:1126
+#: popt.c:1136
 msgid "mutually exclusive logical operations requested"
 msgstr ""
 
-#: popt.c:1128
+#: popt.c:1138
 msgid "opt->arg should not be NULL"
 msgstr ""
 
-#: popt.c:1130
+#: popt.c:1140
 msgid "aliases nested too deeply"
 msgstr ""
 
-#: popt.c:1132
+#: popt.c:1142
 msgid "error in parameter quoting"
 msgstr ""
 
-#: popt.c:1134
+#: popt.c:1144
 msgid "invalid numeric value"
 msgstr ""
 
-#: popt.c:1136
+#: popt.c:1146
 msgid "number too large or too small"
 msgstr ""
 
-#: popt.c:1138
+#: popt.c:1148
 msgid "memory allocation failed"
 msgstr ""
 
-#: popt.c:1142
+#: popt.c:1152
 msgid "unknown error"
 msgstr ""
 
@@ -107,10 +107,10 @@ msgstr ""
 msgid "ARG"
 msgstr ""
 
-#: popthelp.c:457
+#: popthelp.c:459
 msgid "Usage:"
 msgstr ""
 
-#: popthelp.c:479
+#: popthelp.c:481
 msgid "[OPTION...]"
 msgstr ""
diff --git a/po/sv.po b/po/sv.po
index d5f3bfd..e0b6a9f 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.3\n"
-"POT-Creation-Date: 2001-12-08 11:01-0500\n"
+"POT-Creation-Date: 2002-01-18 16:12-0500\n"
 "PO-Revision-Date: 2001-07-12 22:26+0100\n"
 "Last-Translator: Christian Rose <menthos@menthos.com>\n"
 "Language-Team: Swedish <sv@li.org>\n"
@@ -13,48 +13,48 @@ msgstr ""
 msgid "unknown errno"
 msgstr "ok�nt felnummer"
 
-#: popt.c:911
+#: popt.c:917
 #, c-format
 msgid "option type (%d) not implemented in popt\n"
 msgstr "flaggtypen (%d) �r inte implementerad i popt\n"
 
-#: popt.c:1122
+#: popt.c:1132
 msgid "missing argument"
 msgstr "argument saknas"
 
-#: popt.c:1124
+#: popt.c:1134
 msgid "unknown option"
 msgstr "ok�nd flagga"
 
-#: popt.c:1126
+#: popt.c:1136
 msgid "mutually exclusive logical operations requested"
 msgstr "�msesidigt uteslutande logiska operationer beg�rdes"
 
-#: popt.c:1128
+#: popt.c:1138
 msgid "opt->arg should not be NULL"
 msgstr "opt->arg f�r inte vara NULL"
 
-#: popt.c:1130
+#: popt.c:1140
 msgid "aliases nested too deeply"
 msgstr "alias �r n�stlade f�r djupt"
 
-#: popt.c:1132
+#: popt.c:1142
 msgid "error in parameter quoting"
 msgstr "fel i parametercitering"
 
-#: popt.c:1134
+#: popt.c:1144
 msgid "invalid numeric value"
 msgstr "ogiltigt numeriskt v�rde"
 
-#: popt.c:1136
+#: popt.c:1146
 msgid "number too large or too small"
 msgstr "talet f�r stort eller f�r litet"
 
-#: popt.c:1138
+#: popt.c:1148
 msgid "memory allocation failed"
 msgstr "minnesallokering misslyckades"
 
-#: popt.c:1142
+#: popt.c:1152
 msgid "unknown error"
 msgstr "ok�nt fel"
 
@@ -102,10 +102,10 @@ msgstr "DUBBEL"
 msgid "ARG"
 msgstr "ARG"
 
-#: popthelp.c:457
+#: popthelp.c:459
 msgid "Usage:"
 msgstr "Anv�ndning:"
 
-#: popthelp.c:479
+#: popthelp.c:481
 msgid "[OPTION...]"
 msgstr "[FLAGGA...]"
diff --git a/po/tr.po b/po/tr.po
index c434a05..3eb3d37 100644
--- a/po/tr.po
+++ b/po/tr.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.3\n"
-"POT-Creation-Date: 2001-12-08 11:01-0500\n"
+"POT-Creation-Date: 2002-01-18 16:12-0500\n"
 "PO-Revision-Date: 2000-02-11 13:01+0200\n"
 "Last-Translator: Nilgun Belma Buguner <nilgun@technologist.com>\n"
 "Language-Team: Turkish <tr@li.org>\n"
@@ -13,48 +13,48 @@ msgstr ""
 msgid "unknown errno"
 msgstr "bilinmeyen hata no"
 
-#: popt.c:911
+#: popt.c:917
 #, c-format
 msgid "option type (%d) not implemented in popt\n"
 msgstr "se�enek t�r� (%d) popt i�in ge�ersiz\n"
 
-#: popt.c:1122
+#: popt.c:1132
 msgid "missing argument"
 msgstr "arg�man eksik"
 
-#: popt.c:1124
+#: popt.c:1134
 msgid "unknown option"
 msgstr "bilinmeyen se�enek"
 
-#: popt.c:1126
+#: popt.c:1136
 msgid "mutually exclusive logical operations requested"
 msgstr "birbirini d��layan mant�ksal i�lemler istendi"
 
-#: popt.c:1128
+#: popt.c:1138
 msgid "opt->arg should not be NULL"
 msgstr ""
 
-#: popt.c:1130
+#: popt.c:1140
 msgid "aliases nested too deeply"
 msgstr "adlarda �ok fazla i�i�elikler"
 
-#: popt.c:1132
+#: popt.c:1142
 msgid "error in parameter quoting"
 msgstr "parametrelerde t�rnak i�aretleme hatal� "
 
-#: popt.c:1134
+#: popt.c:1144
 msgid "invalid numeric value"
 msgstr "say�sal de�er ge�ersiz"
 
-#: popt.c:1136
+#: popt.c:1146
 msgid "number too large or too small"
 msgstr "say� ya �ok b�y�k ya da �ok k���k"
 
-#: popt.c:1138
+#: popt.c:1148
 msgid "memory allocation failed"
 msgstr ""
 
-#: popt.c:1142
+#: popt.c:1152
 msgid "unknown error"
 msgstr "bilinmeyen hata"
 
@@ -103,10 +103,10 @@ msgstr "DOUBLE"
 msgid "ARG"
 msgstr "ARG"
 
-#: popthelp.c:457
+#: popthelp.c:459
 msgid "Usage:"
 msgstr "Kullan�m�:"
 
-#: popthelp.c:479
+#: popthelp.c:481
 msgid "[OPTION...]"
 msgstr "[SE�ENEK...]"
diff --git a/po/uk.po b/po/uk.po
index 7c3dfc4..4ddfa1d 100644
--- a/po/uk.po
+++ b/po/uk.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.3\n"
-"POT-Creation-Date: 2001-12-08 11:01-0500\n"
+"POT-Creation-Date: 2002-01-18 16:12-0500\n"
 "PO-Revision-Date: 1999-09-30 16:54+0200\n"
 "Last-Translator: Yuri Syrota <rasta@renome.rovno.ua>\n"
 "Language-Team: Ukrainian <uk@li.org>\n"
@@ -17,48 +17,48 @@ msgstr ""
 msgid "unknown errno"
 msgstr ""
 
-#: popt.c:911
+#: popt.c:917
 #, c-format
 msgid "option type (%d) not implemented in popt\n"
 msgstr ""
 
-#: popt.c:1122
+#: popt.c:1132
 msgid "missing argument"
 msgstr ""
 
-#: popt.c:1124
+#: popt.c:1134
 msgid "unknown option"
 msgstr ""
 
-#: popt.c:1126
+#: popt.c:1136
 msgid "mutually exclusive logical operations requested"
 msgstr ""
 
-#: popt.c:1128
+#: popt.c:1138
 msgid "opt->arg should not be NULL"
 msgstr ""
 
-#: popt.c:1130
+#: popt.c:1140
 msgid "aliases nested too deeply"
 msgstr ""
 
-#: popt.c:1132
+#: popt.c:1142
 msgid "error in parameter quoting"
 msgstr ""
 
-#: popt.c:1134
+#: popt.c:1144
 msgid "invalid numeric value"
 msgstr ""
 
-#: popt.c:1136
+#: popt.c:1146
 msgid "number too large or too small"
 msgstr ""
 
-#: popt.c:1138
+#: popt.c:1148
 msgid "memory allocation failed"
 msgstr ""
 
-#: popt.c:1142
+#: popt.c:1152
 msgid "unknown error"
 msgstr ""
 
@@ -107,10 +107,10 @@ msgstr ""
 msgid "ARG"
 msgstr ""
 
-#: popthelp.c:457
+#: popthelp.c:459
 msgid "Usage:"
 msgstr ""
 
-#: popthelp.c:479
+#: popthelp.c:481
 msgid "[OPTION...]"
 msgstr ""
diff --git a/po/wa.po b/po/wa.po
index 9739f16..b1b0d10 100644
--- a/po/wa.po
+++ b/po/wa.po
@@ -9,7 +9,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.3\n"
-"POT-Creation-Date: 2001-12-08 11:01-0500\n"
+"POT-Creation-Date: 2002-01-18 16:12-0500\n"
 "PO-Revision-Date: 1999-03-18 23:11+0100\n"
 "Last-Translator: Nobody yet\n"
 "Language-Team: walon <linux-wa@chanae.alphanet.ch>\n"
@@ -21,48 +21,48 @@ msgstr ""
 msgid "unknown errno"
 msgstr ""
 
-#: popt.c:911
+#: popt.c:917
 #, c-format
 msgid "option type (%d) not implemented in popt\n"
 msgstr ""
 
-#: popt.c:1122
+#: popt.c:1132
 msgid "missing argument"
 msgstr ""
 
-#: popt.c:1124
+#: popt.c:1134
 msgid "unknown option"
 msgstr ""
 
-#: popt.c:1126
+#: popt.c:1136
 msgid "mutually exclusive logical operations requested"
 msgstr ""
 
-#: popt.c:1128
+#: popt.c:1138
 msgid "opt->arg should not be NULL"
 msgstr ""
 
-#: popt.c:1130
+#: popt.c:1140
 msgid "aliases nested too deeply"
 msgstr ""
 
-#: popt.c:1132
+#: popt.c:1142
 msgid "error in parameter quoting"
 msgstr ""
 
-#: popt.c:1134
+#: popt.c:1144
 msgid "invalid numeric value"
 msgstr ""
 
-#: popt.c:1136
+#: popt.c:1146
 msgid "number too large or too small"
 msgstr ""
 
-#: popt.c:1138
+#: popt.c:1148
 msgid "memory allocation failed"
 msgstr ""
 
-#: popt.c:1142
+#: popt.c:1152
 msgid "unknown error"
 msgstr ""
 
@@ -111,10 +111,10 @@ msgstr ""
 msgid "ARG"
 msgstr ""
 
-#: popthelp.c:457
+#: popthelp.c:459
 msgid "Usage:"
 msgstr ""
 
-#: popthelp.c:479
+#: popthelp.c:481
 msgid "[OPTION...]"
 msgstr ""
diff --git a/po/zh.po b/po/zh.po
index aeb7c99..6cfef98 100644
--- a/po/zh.po
+++ b/po/zh.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.3\n"
-"POT-Creation-Date: 2001-12-08 11:01-0500\n"
+"POT-Creation-Date: 2002-01-18 16:12-0500\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -18,48 +18,48 @@ msgstr ""
 msgid "unknown errno"
 msgstr ""
 
-#: popt.c:911
+#: popt.c:917
 #, c-format
 msgid "option type (%d) not implemented in popt\n"
 msgstr ""
 
-#: popt.c:1122
+#: popt.c:1132
 msgid "missing argument"
 msgstr ""
 
-#: popt.c:1124
+#: popt.c:1134
 msgid "unknown option"
 msgstr ""
 
-#: popt.c:1126
+#: popt.c:1136
 msgid "mutually exclusive logical operations requested"
 msgstr ""
 
-#: popt.c:1128
+#: popt.c:1138
 msgid "opt->arg should not be NULL"
 msgstr ""
 
-#: popt.c:1130
+#: popt.c:1140
 msgid "aliases nested too deeply"
 msgstr ""
 
-#: popt.c:1132
+#: popt.c:1142
 msgid "error in parameter quoting"
 msgstr ""
 
-#: popt.c:1134
+#: popt.c:1144
 msgid "invalid numeric value"
 msgstr ""
 
-#: popt.c:1136
+#: popt.c:1146
 msgid "number too large or too small"
 msgstr ""
 
-#: popt.c:1138
+#: popt.c:1148
 msgid "memory allocation failed"
 msgstr ""
 
-#: popt.c:1142
+#: popt.c:1152
 msgid "unknown error"
 msgstr ""
 
@@ -107,10 +107,10 @@ msgstr ""
 msgid "ARG"
 msgstr ""
 
-#: popthelp.c:457
+#: popthelp.c:459
 msgid "Usage:"
 msgstr ""
 
-#: popthelp.c:479
+#: popthelp.c:481
 msgid "[OPTION...]"
 msgstr ""
diff --git a/po/zh_CN.GB2312.po b/po/zh_CN.GB2312.po
index 1bd96fa..8a54e4c 100644
--- a/po/zh_CN.GB2312.po
+++ b/po/zh_CN.GB2312.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.3\n"
-"POT-Creation-Date: 2001-12-08 11:01-0500\n"
+"POT-Creation-Date: 2002-01-18 16:12-0500\n"
 "PO-Revision-Date: 1999-11-11 05:04+0800\n"
 "Last-Translator: Dillion Chen <dillon.chen@turbolinux.com.cn>\n"
 "Language-Team: TLDN\n"
@@ -13,48 +13,48 @@ msgstr ""
 msgid "unknown errno"
 msgstr ""
 
-#: popt.c:911
+#: popt.c:917
 #, c-format
 msgid "option type (%d) not implemented in popt\n"
 msgstr ""
 
-#: popt.c:1122
+#: popt.c:1132
 msgid "missing argument"
 msgstr ""
 
-#: popt.c:1124
+#: popt.c:1134
 msgid "unknown option"
 msgstr ""
 
-#: popt.c:1126
+#: popt.c:1136
 msgid "mutually exclusive logical operations requested"
 msgstr ""
 
-#: popt.c:1128
+#: popt.c:1138
 msgid "opt->arg should not be NULL"
 msgstr ""
 
-#: popt.c:1130
+#: popt.c:1140
 msgid "aliases nested too deeply"
 msgstr ""
 
-#: popt.c:1132
+#: popt.c:1142
 msgid "error in parameter quoting"
 msgstr ""
 
-#: popt.c:1134
+#: popt.c:1144
 msgid "invalid numeric value"
 msgstr ""
 
-#: popt.c:1136
+#: popt.c:1146
 msgid "number too large or too small"
 msgstr ""
 
-#: popt.c:1138
+#: popt.c:1148
 msgid "memory allocation failed"
 msgstr ""
 
-#: popt.c:1142
+#: popt.c:1152
 msgid "unknown error"
 msgstr ""
 
@@ -103,10 +103,10 @@ msgstr ""
 msgid "ARG"
 msgstr ""
 
-#: popthelp.c:457
+#: popthelp.c:459
 msgid "Usage:"
 msgstr ""
 
-#: popthelp.c:479
+#: popthelp.c:481
 msgid "[OPTION...]"
 msgstr ""
diff --git a/popt.c b/popt.c
index cd01a77..962f973 100644
--- a/popt.c
+++ b/popt.c
@@ -49,6 +49,9 @@ void poptSetExecPath(poptContext con, const char * path, int allowAbsolute)
     con->execPath = _free(con->execPath);
     con->execPath = xstrdup(path);
     con->execAbsolute = allowAbsolute;
+    /*@-nullstate@*/ /* LCL: con->execPath can be NULL? */
+    return;
+    /*@=nullstate@*/
 }
 
 static void invokeCallbacksPRE(poptContext con, const struct poptOption * opt)
@@ -591,6 +594,9 @@ static void poptStripArg(/*@special@*/ poptContext con, int which)
     if (con->arg_strip != NULL)		/* XXX can't happen */
     PBM_SET(which, con->arg_strip);
     /*@=sizeoftype@*/
+    /*@-compdef@*/ /* LCL: con->arg_strip udefined? */
+    return;
+    /*@=compdef@*/
 }
 
 static int poptSaveLong(const struct poptOption * opt, long aLong)
@@ -763,6 +769,7 @@ int poptGetNextOpt(poptContext con)
 	}
 
 	/* Process next short option */
+	/*@-branchstate@*/		/* FIX: W2DO? */
 	if (con->os->nextCharArg) {
 	    origOptString = con->os->nextCharArg;
 
@@ -786,11 +793,10 @@ int poptGetNextOpt(poptContext con)
 	    shorty = 1;
 
 	    origOptString++;
-	    /*@-branchstate@*/		/* FIX: W2DO? */
 	    if (*origOptString != '\0')
 		con->os->nextCharArg = origOptString;
-	    /*@=branchstate@*/
 	}
+	/*@=branchstate@*/
 
 	if (opt == NULL) return POPT_ERROR_BADOPT;	/* XXX can't happen */
 	if (opt->arg && (opt->argInfo & POPT_ARG_MASK) == POPT_ARG_NONE) {
@@ -962,10 +968,12 @@ int poptGetNextOpt(poptContext con)
 const char * poptGetOptArg(poptContext con)
 {
     const char * ret = NULL;
+    /*@-branchstate@*/
     if (con) {
 	ret = con->os->nextArg;
 	con->os->nextArg = NULL;
     }
+    /*@=branchstate@*/
     return ret;
 }
 
@@ -1060,6 +1068,7 @@ int poptAddAlias(poptContext con, struct poptAlias alias,
     return poptAddItem(con, item, 0);
 }
 
+/*@-mustmod@*/ /* LCL: con not modified? */
 int poptAddItem(poptContext con, poptItem newItem, int flags)
 {
     poptItem * items, item;
@@ -1102,6 +1111,7 @@ int poptAddItem(poptContext con, poptItem newItem, int flags)
 
     return 0;
 }
+/*@=mustmod@*/
 
 const char * poptBadOption(poptContext con, int flags)
 {
diff --git a/poptconfig.c b/poptconfig.c
index 7f80ff0..58ccf01 100644
--- a/poptconfig.c
+++ b/poptconfig.c
@@ -81,10 +81,12 @@ static void configLine(poptContext con, char * line)
     }
     /*@=modobserver@*/
 	
+    /*@-nullstate@*/ /* FIX: item->argv[] may be NULL */
     if (!strcmp(entryType, "alias"))
 	(void) poptAddItem(con, item, 0);
     else if (!strcmp(entryType, "exec"))
 	(void) poptAddItem(con, item, 1);
+    /*@=nullstate@*/
 }
 /*@=compmempass@*/
 
diff --git a/popthelp.c b/popthelp.c
index 5befe63..17adc6f 100644
--- a/popthelp.c
+++ b/popthelp.c
@@ -330,7 +330,9 @@ static void singleOptionHelp(FILE * fp, int maxLeftCol,
     if (helpLength) fprintf(fp, "%s\n", help);
 
 out:
+    /*@-dependenttrans@*/
     defs = _free(defs);
+    /*@=dependenttrans@*/
     left = _free(left);
 }
 
diff --git a/poptint.h b/poptint.h
index 18a6c4d..30172fe 100644
--- a/poptint.h
+++ b/poptint.h
@@ -26,7 +26,7 @@ _free(/*@only@*/ /*@null@*/ const void * p)
 typedef	unsigned int __pbm_bits;
 #define	__PBM_NBITS		(8 * sizeof (__pbm_bits))
 #define	__PBM_IX(d)		((d) / __PBM_NBITS)
-#define __PBM_MASK(d)		((__pbm_bits) 1 << ((d) % __PBM_NBITS))
+#define __PBM_MASK(d)		((__pbm_bits) 1 << (((unsigned)(d)) % __PBM_NBITS))
 typedef struct {
     __pbm_bits bits[1];
 } pbm_set;
diff --git a/system.h b/system.h
index 2ff7588..338be45 100644
--- a/system.h
+++ b/system.h
@@ -25,6 +25,14 @@
 #include <libc.h>
 #endif
 
+#if defined(__LCLINT__)
+/*@-declundef -incondefs -redecl@*/ /* LCL: missing annotation */
+/*@only@*/ void * alloca (size_t __size)
+	/*@ensures MaxSet(result) == (__size - 1) @*/
+	/*@*/;
+/*@=declundef =incondefs =redecl@*/
+#endif
+
 /* AIX requires this to be the first thing in the file.  */ 
 #ifndef __GNUC__
 # if HAVE_ALLOCA_H
@@ -42,8 +50,10 @@ char *alloca ();
 #define alloca __builtin_alloca
 #endif
 
-#if !defined(__LCLINT__)
-/*@only@*/ char * xstrdup (const char *str);
+/*@-redecl -redef@*/
+/*@mayexit@*/ /*@only@*/ char * xstrdup (const char *str)
+	/*@*/;
+/*@=redecl =redef@*/
 
 #if HAVE_MCHECK_H && defined(__GNUC__)
 #define	vmefail()	(fprintf(stderr, "virtual memory exhausted.\n"), exit(EXIT_FAILURE), NULL)
@@ -51,7 +61,6 @@ char *alloca ();
 #else
 #define	xstrdup(_str)	strdup(_str)
 #endif  /* HAVE_MCHECK_H && defined(__GNUC__) */
-#endif /* !__LCLINT__ */
 
 
 #include "popt.h"
-- 
Gitee


From 9a23d0e293c6dc602a6ceddd94d0a78b21169c6c Mon Sep 17 00:00:00 2001
From: Jeff Johnson <n3npq@mac.com>
Date: Fri, 1 Feb 2002 15:20:25 +0000
Subject: [PATCH 331/667] - permit args to be hidden within
 %%__find_{requires,provides}. - a couple more perl.{prov,req} fiddles.

---
 README | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README b/README
index 7fccc83..0b5205b 100644
--- a/README
+++ b/README
@@ -5,7 +5,7 @@ to getopt(3), it contains a number of enhancements, including:
 	2) popt can parse arbitrary argv[] style arrays while 
 	   getopt(2) makes this quite difficult
 	3) popt allows users to alias command line arguments
-	4) popt provides convience functions for parsting strings
+	4) popt provides convience functions for parsing strings
 	   into argv[] style arrays
 
 popt is used by rpm, the Red Hat install program, and many other Red Hat
-- 
Gitee


From 6380c77cb2e219b049b51934b089c8c1be17053b Mon Sep 17 00:00:00 2001
From: Jeff Johnson <n3npq@mac.com>
Date: Sun, 10 Feb 2002 21:14:37 +0000
Subject: [PATCH 332/667] - make peace with automake et al in 8.0, ugh.

---
 ABOUT-NLS           | 324 ++++++++++++++++++++++++++++++++++
 acconfig.h          |  19 +-
 configure.in        |   5 +-
 depcomp             | 411 ++++++++++++++++++++++++++++++++++++++++++++
 install-sh          |  21 ++-
 intl/ChangeLog      |   4 +-
 intl/Makefile.in    |  23 +--
 intl/VERSION        |   2 +-
 intl/bindtextdom.c  |  17 +-
 intl/config.charset |  14 +-
 intl/dcgettext.c    |  17 +-
 intl/dcigettext.c   |  18 +-
 intl/dcngettext.c   |  17 +-
 intl/dgettext.c     |  17 +-
 intl/dngettext.c    |  17 +-
 intl/explodename.c  |  17 +-
 intl/finddomain.c   |  17 +-
 intl/gettext.c      |  17 +-
 intl/gettext.h      |  17 +-
 intl/gettextP.h     |  17 +-
 intl/hash-string.h  |  17 +-
 intl/intl-compat.c  |  27 +--
 intl/l10nflist.c    |  17 +-
 intl/libgettext.h   |  17 +-
 intl/libgnuintl.h   |  17 +-
 intl/libintl.h      | 182 --------------------
 intl/loadinfo.h     |  17 +-
 intl/loadmsgcat.c   |  17 +-
 intl/localcharset.c |   4 +-
 intl/locale.alias   |  19 +-
 intl/localealias.c  |  17 +-
 intl/ngettext.c     |  17 +-
 intl/plural.c       |  51 +++---
 intl/plural.y       |  17 +-
 intl/textdomain.c   |  17 +-
 missing             | 133 ++++++++++++--
 mkinstalldirs       |   4 +-
 po/ChangeLog        |   6 +
 po/Makefile.in.in   | 196 +++++++--------------
 39 files changed, 1209 insertions(+), 594 deletions(-)
 create mode 100644 ABOUT-NLS
 create mode 100755 depcomp
 delete mode 100644 intl/libintl.h
 create mode 100644 po/ChangeLog

diff --git a/ABOUT-NLS b/ABOUT-NLS
new file mode 100644
index 0000000..5fde45a
--- /dev/null
+++ b/ABOUT-NLS
@@ -0,0 +1,324 @@
+Notes on the Free Translation Project
+*************************************
+
+   Free software is going international!  The Free Translation Project
+is a way to get maintainers of free software, translators, and users all
+together, so that will gradually become able to speak many languages.
+A few packages already provide translations for their messages.
+
+   If you found this `ABOUT-NLS' file inside a distribution, you may
+assume that the distributed package does use GNU `gettext' internally,
+itself available at your nearest GNU archive site.  But you do _not_
+need to install GNU `gettext' prior to configuring, installing or using
+this package with messages translated.
+
+   Installers will find here some useful hints.  These notes also
+explain how users should proceed for getting the programs to use the
+available translations.  They tell how people wanting to contribute and
+work at translations should contact the appropriate team.
+
+   When reporting bugs in the `intl/' directory or bugs which may be
+related to internationalization, you should tell about the version of
+`gettext' which is used.  The information can be found in the
+`intl/VERSION' file, in internationalized packages.
+
+Quick configuration advice
+==========================
+
+   If you want to exploit the full power of internationalization, you
+should configure it using
+
+     ./configure --with-included-gettext
+
+to force usage of internationalizing routines provided within this
+package, despite the existence of internationalizing capabilities in the
+operating system where this package is being installed.  So far, only
+the `gettext' implementation in the GNU C library version 2 provides as
+many features (such as locale alias, message inheritance, automatic
+charset conversion or plural form handling) as the implementation here.
+It is also not possible to offer this additional functionality on top
+of a `catgets' implementation.  Future versions of GNU `gettext' will
+very likely convey even more functionality.  So it might be a good idea
+to change to GNU `gettext' as soon as possible.
+
+   So you need _not_ provide this option if you are using GNU libc 2 or
+you have installed a recent copy of the GNU gettext package with the
+included `libintl'.
+
+INSTALL Matters
+===============
+
+   Some packages are "localizable" when properly installed; the
+programs they contain can be made to speak your own native language.
+Most such packages use GNU `gettext'.  Other packages have their own
+ways to internationalization, predating GNU `gettext'.
+
+   By default, this package will be installed to allow translation of
+messages.  It will automatically detect whether the system already
+provides the GNU `gettext' functions.  If not, the GNU `gettext' own
+library will be used.  This library is wholly contained within this
+package, usually in the `intl/' subdirectory, so prior installation of
+the GNU `gettext' package is _not_ required.  Installers may use
+special options at configuration time for changing the default
+behaviour.  The commands:
+
+     ./configure --with-included-gettext
+     ./configure --disable-nls
+
+will respectively bypass any pre-existing `gettext' to use the
+internationalizing routines provided within this package, or else,
+_totally_ disable translation of messages.
+
+   When you already have GNU `gettext' installed on your system and run
+configure without an option for your new package, `configure' will
+probably detect the previously built and installed `libintl.a' file and
+will decide to use this.  This might be not what is desirable.  You
+should use the more recent version of the GNU `gettext' library.  I.e.
+if the file `intl/VERSION' shows that the library which comes with this
+package is more recent, you should use
+
+     ./configure --with-included-gettext
+
+to prevent auto-detection.
+
+   The configuration process will not test for the `catgets' function
+and therefore it will not be used.  The reason is that even an
+emulation of `gettext' on top of `catgets' could not provide all the
+extensions of the GNU `gettext' library.
+
+   Internationalized packages have usually many `po/LL.po' files, where
+LL gives an ISO 639 two-letter code identifying the language.  Unless
+translations have been forbidden at `configure' time by using the
+`--disable-nls' switch, all available translations are installed
+together with the package.  However, the environment variable `LINGUAS'
+may be set, prior to configuration, to limit the installed set.
+`LINGUAS' should then contain a space separated list of two-letter
+codes, stating which languages are allowed.
+
+Using This Package
+==================
+
+   As a user, if your language has been installed for this package, you
+only have to set the `LANG' environment variable to the appropriate
+`LL_CC' combination.  Here `LL' is an ISO 639 two-letter language code,
+and `CC' is an ISO 3166 two-letter country code.  For example, let's
+suppose that you speak German and live in Germany.  At the shell
+prompt, merely execute `setenv LANG de_DE' (in `csh'),
+`export LANG; LANG=de_DE' (in `sh') or `export LANG=de_DE' (in `bash').
+This can be done from your `.login' or `.profile' file, once and for
+all.
+
+   You might think that the country code specification is redundant.
+But in fact, some languages have dialects in different countries.  For
+example, `de_AT' is used for Austria, and `pt_BR' for Brazil.  The
+country code serves to distinguish the dialects.
+
+   Not all programs have translations for all languages.  By default, an
+English message is shown in place of a nonexistent translation.  If you
+understand other languages, you can set up a priority list of languages.
+This is done through a different environment variable, called
+`LANGUAGE'.  GNU `gettext' gives preference to `LANGUAGE' over `LANG'
+for the purpose of message handling, but you still need to have `LANG'
+set to the primary language; this is required by other parts of the
+system libraries.  For example, some Swedish users who would rather
+read translations in German than English for when Swedish is not
+available, set `LANGUAGE' to `sv:de' while leaving `LANG' to `sv_SE'.
+
+   In the `LANGUAGE' environment variable, but not in the `LANG'
+environment variable, `LL_CC' combinations can be abbreviated as `LL'
+to denote the language's main dialect.  For example, `de' is equivalent
+to `de_DE' (German as spoken in Germany), and `pt' to `pt_PT'
+(Portuguese as spoken in Portugal) in this context.
+
+Translating Teams
+=================
+
+   For the Free Translation Project to be a success, we need interested
+people who like their own language and write it well, and who are also
+able to synergize with other translators speaking the same language.
+Each translation team has its own mailing list.  The up-to-date list of
+teams can be found at the Free Translation Project's homepage,
+`http://www.iro.umontreal.ca/contrib/po/HTML/', in the "National teams"
+area.
+
+   If you'd like to volunteer to _work_ at translating messages, you
+should become a member of the translating team for your own language.
+The subscribing address is _not_ the same as the list itself, it has
+`-request' appended.  For example, speakers of Swedish can send a
+message to `sv-request@li.org', having this message body:
+
+     subscribe
+
+   Keep in mind that team members are expected to participate
+_actively_ in translations, or at solving translational difficulties,
+rather than merely lurking around.  If your team does not exist yet and
+you want to start one, or if you are unsure about what to do or how to
+get started, please write to `translation@iro.umontreal.ca' to reach the
+coordinator for all translator teams.
+
+   The English team is special.  It works at improving and uniformizing
+the terminology in use.  Proven linguistic skill are praised more than
+programming skill, here.
+
+Available Packages
+==================
+
+   Languages are not equally supported in all packages.  The following
+matrix shows the current state of internationalization, as of September
+2001.  The matrix shows, in regard of each package, for which languages
+PO files have been submitted to translation coordination, with a
+translation percentage of at least 50%.
+
+     Ready PO files    bg cs da de el en eo es et fi fr gl he hr id it ja
+                     +----------------------------------------------------+
+     a2ps            |          []             []    []                   |
+     bash            |          []       [] []       []                   |
+     bfd             |                                                    |
+     binutils        |                               []                   |
+     bison           |          []          [] []    []                [] |
+     clisp           |          []    []    []       []                   |
+     cpio            |       [] []          []       [] []                |
+     diffutils       |       [] []       [] []       [] []       []       |
+     enscript        |          []                   []                   |
+     error           |                      []       []                   |
+     fetchmail       |                                                    |
+     fileutils       |    [] [] [] []       []       [] []             [] |
+     findutils       |       [] []          [] []    [] []       [] []    |
+     flex            |       []             []       []                   |
+     freetype        |                                                    |
+     gas             |                                                    |
+     gawk            |                               []    []             |
+     gcal            |                                                    |
+     gcc             |                                                    |
+     gettext         |    [] [] [] []       []       [] []       [] [] [] |
+     gnupg           |          []       []    []    [] []          [] [] |
+     gprof           |                                                    |
+     grep            |    []    []       [] [] []    [] []          []    |
+     hello           |       [] [] []    [] [] [] [] [] []          [] [] |
+     id-utils        |       [] []                   []                   |
+     indent          |       [] []             []    [] []                |
+     jpilot          |                               []                   |
+     kbd             |                                                    |
+     ld              |                               []                   |
+     libc            |    [] [] [] []       []       [] []             [] |
+     lilypond        |                                                 [] |
+     lynx            |    [] [] []                                     [] |
+     m4              |    [] [] [] []                [] []       []    [] |
+     make            |       [] []          []       [] []             [] |
+     mysecretdiary   |          []                                        |
+     nano            |                      []          []       []       |
+     opcodes         |                                                    |
+     parted          |          []                      []             [] |
+     ptx             |       [] []          [] []    [] []       []       |
+     python          |                                                    |
+     recode          |       [] [] []    [] []       [] [] []       []    |
+     sed             |    [] [] [] []    []    []    [] [] []    [] [] [] |
+     sh-utils        |    [] [] [] []       [] []    [] []          [] [] |
+     sharutils       |    [] [] [] []       []       [] []             [] |
+     sketch          |                                                    |
+     soundtracker    |          []          []          []                |
+     sp              |                                                    |
+     tar             |    [] [] []          [] []    []             [] [] |
+     texinfo         |    [] [] []       []          []                [] |
+     textutils       |    [] [] [] []       []       [] []             [] |
+     util-linux      |    [] []                                           |
+     wdiff           |       [] []             []                         |
+     wget            |    [] [] [] []       [] []    [] [] []          [] |
+                     +----------------------------------------------------+
+                       bg cs da de el en eo es et fi fr gl he hr id it ja
+                        0 14 24 32 11  1  8 23 13  1 33 22  4  0  7  9 18
+     
+                       ko lv nb nl nn no pl pt pt_BR ru sk sl sv tr uk zh
+                     +----------------------------------------------------+
+     a2ps            |          []                   []    []             |  6
+     bash            |                                                    |  4
+     bfd             |                                                    |  0
+     binutils        |                                                    |  1
+     bison           |                               []                   |  6
+     clisp           |          []                                        |  5
+     cpio            | []       []       []     []   []                   | 10
+     diffutils       |                   []          []       [] []       | 11
+     enscript        |          []              []   []                   |  5
+     error           |                                  []       []       |  4
+     fetchmail       |                                                    |  0
+     fileutils       | []       []       []     []   [] [] [] [] []       | 17
+     findutils       | []       []       []     []   []    [] [] []       | 16
+     flex            | []                            []       []          |  6
+     freetype        |                                                    |  0
+     gas             |                                                    |  0
+     gawk            |                                           []       |  3
+     gcal            |                                                    |  0
+     gcc             |                                                    |  0
+     gettext         | []                []     []   []    [] [] []    [] | 18
+     gnupg           |                   []                   [] []       | 10
+     gprof           |                                                    |  0
+     grep            |                   []                [] [] []       | 12
+     hello           | [] [] [] []    [] []          [] []    [] [] []    | 22
+     id-utils        |          []                   []       []          |  6
+     indent          | []       []       []          [] []    [] []       | 12
+     jpilot          |                                                    |  1
+     kbd             |                                           []       |  1
+     ld              |                                                    |  1
+     libc            | []    []       [] []     []      []    [] []       | 16
+     lilypond        |          []                            []          |  3
+     lynx            |          []              []   []       []          |  8
+     m4              |          []       []          []       []          | 12
+     make            | []       []       []     []   []          []       | 12
+     mysecretdiary   |                                                    |  1
+     nano            |                                        []          |  4
+     opcodes         |                                           []       |  1
+     parted          |          []                   []                   |  5
+     ptx             |       [] []    [] [] []       []       [] []       | 15
+     python          |                                                    |  0
+     recode          |                   []          []    [] []          | 13
+     sed             |          []              []   [] [] [] [] []       | 19
+     sh-utils        |       [] []    [] []     []   [] [] [] [] []    [] | 21
+     sharutils       |          []                   []       []          | 11
+     sketch          |                                                    |  0
+     soundtracker    |                                                    |  3
+     sp              |                                                    |  0
+     tar             |       []       [] []     []         [] [] []       | 15
+     texinfo         |                               []                   |  7
+     textutils       |       [] []    [] []     []   [] [] []             | 16
+     util-linux      |                          []               []       |  4
+     wdiff           |                               [] []    [] []       |  7
+     wget            |          []                   [] [] [] [] [] []    | 17
+                     +----------------------------------------------------+
+       33 teams        ko lv nb nl nn no pl pt pt_BR ru sk sl sv tr uk zh
+       53 domains       9  1  6 20  0  6 17  1  13   25 10 11 23 21  2  2  387
+
+   Some counters in the preceding matrix are higher than the number of
+visible blocks let us expect.  This is because a few extra PO files are
+used for implementing regional variants of languages, or language
+dialects.
+
+   For a PO file in the matrix above to be effective, the package to
+which it applies should also have been internationalized and
+distributed as such by its maintainer.  There might be an observable
+lag between the mere existence a PO file and its wide availability in a
+distribution.
+
+   If September 2001 seems to be old, you may fetch a more recent copy
+of this `ABOUT-NLS' file on most GNU archive sites.  The most
+up-to-date matrix with full percentage details can be found at
+`http://www.iro.umontreal.ca/contrib/po/HTML/matrix.html'.
+
+Using `gettext' in new packages
+===============================
+
+   If you are writing a freely available program and want to
+internationalize it you are welcome to use GNU `gettext' in your
+package.  Of course you have to respect the GNU Library General Public
+License which covers the use of the GNU `gettext' library.  This means
+in particular that even non-free programs can use `libintl' as a shared
+library, whereas only free software can use `libintl' as a static
+library or use modified versions of `libintl'.
+
+   Once the sources are changed appropriately and the setup can handle
+to use of `gettext' the only thing missing are the translations.  The
+Free Translation Project is also available for packages which are not
+developed inside the GNU project.  Therefore the information given above
+applies also for every other Free Software Project.  Contact
+`translation@iro.umontreal.ca' to make the `.pot' files available to
+the translation teams.
+
diff --git a/acconfig.h b/acconfig.h
index 10965f1..fc84c34 100644
--- a/acconfig.h
+++ b/acconfig.h
@@ -16,7 +16,7 @@
    a given entry is in the file.
 
    Leave the following blank line there!!  Autoheader needs it.  */
-^L
+
 
 /* Define to the name of the distribution.  */
 #undef PACKAGE
@@ -27,25 +27,10 @@
 /* Define to 1 if ANSI function prototypes are usable.  */
 #undef PROTOTYPES
 
-/* Define to 1 if NLS is requested.  */
-#undef ENABLE_NLS
-
-/* Define as 1 if you have catgets and don't want to use GNU gettext.  */
-#undef HAVE_CATGETS
-
-/* Define as 1 if you have gettext and don't want to use GNU gettext.  */
-#undef HAVE_GETTEXT
-
-/* Define if your locale.h file contains LC_MESSAGES.  */
-#undef HAVE_LC_MESSAGES
-
-/* Define to 1 if you have the stpcpy function.  */
-#undef HAVE_STPCPY
-
 /* Absolute path to popt top_sourcedir. */
 #undef POPT_SOURCE_PATH
 
-^L
+
 /* Leave that blank line there!!  Autoheader needs it.
    If you're adding to this file, keep in mind:
    The entries are in sort -df order: alphabetical, case insensitive,
diff --git a/configure.in b/configure.in
index bb7fbfd..2910dd6 100755
--- a/configure.in
+++ b/configure.in
@@ -1,8 +1,9 @@
 AC_INIT(popt.h)
-AM_CONFIG_HEADER(config.h)
-AC_PREREQ(2.12)
 AC_CANONICAL_SYSTEM
+AC_PREREQ(2.12)
 AM_INIT_AUTOMAKE(popt, 1.7)
+AM_CONFIG_HEADER(config.h)
+
 ALL_LINGUAS="cs da de es eu_ES fi fr gl hu id is it ja ko no pl pt pt_BR ro ru sk sl sr sv tr uk wa zh zh_CN.GB2312"
 
 AC_ISC_POSIX
diff --git a/depcomp b/depcomp
new file mode 100755
index 0000000..6589965
--- /dev/null
+++ b/depcomp
@@ -0,0 +1,411 @@
+#! /bin/sh
+
+# depcomp - compile a program generating dependencies as side-effects
+# Copyright 1999, 2000 Free Software Foundation, Inc.
+
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+# 02111-1307, USA.
+
+# As a special exception to the GNU General Public License, if you
+# distribute this file as part of a program that contains a
+# configuration script generated by Autoconf, you may include it under
+# the same distribution terms that you use for the rest of that program.
+
+# Originally written by Alexandre Oliva <oliva@dcc.unicamp.br>.
+
+if test -z "$depmode" || test -z "$source" || test -z "$object"; then
+  echo "depcomp: Variables source, object and depmode must be set" 1>&2
+  exit 1
+fi
+# `libtool' can also be set to `yes' or `no'.
+
+depfile=${depfile-`echo "$object" | sed 's,\([^/]*\)$,.deps/\1,;s/\.\([^.]*\)$/.P\1/'`}
+tmpdepfile=${tmpdepfile-`echo "$depfile" | sed 's/\.\([^.]*\)$/.T\1/'`}
+
+rm -f "$tmpdepfile"
+
+# Some modes work just like other modes, but use different flags.  We
+# parameterize here, but still list the modes in the big case below,
+# to make depend.m4 easier to write.  Note that we *cannot* use a case
+# here, because this file can only contain one case statement.
+if test "$depmode" = hp; then
+  # HP compiler uses -M and no extra arg.
+  gccflag=-M
+  depmode=gcc
+fi
+
+if test "$depmode" = dashXmstdout; then
+   # This is just like dashmstdout with a different argument.
+   dashmflag=-xM
+   depmode=dashmstdout
+fi
+
+case "$depmode" in
+gcc3)
+## gcc 3 implements dependency tracking that does exactly what
+## we want.  Yay!  Note: for some reason libtool 1.4 doesn't like
+## it if -MD -MP comes after the -MF stuff.  Hmm.
+  "$@" -MT "$object" -MD -MP -MF "$tmpdepfile"
+  stat=$?
+  if test $stat -eq 0; then :
+  else
+    rm -f "$tmpdepfile"
+    exit $stat
+  fi
+  mv "$tmpdepfile" "$depfile"
+  ;;
+
+gcc)
+## There are various ways to get dependency output from gcc.  Here's
+## why we pick this rather obscure method:
+## - Don't want to use -MD because we'd like the dependencies to end
+##   up in a subdir.  Having to rename by hand is ugly.
+##   (We might end up doing this anyway to support other compilers.)
+## - The DEPENDENCIES_OUTPUT environment variable makes gcc act like
+##   -MM, not -M (despite what the docs say).
+## - Using -M directly means running the compiler twice (even worse
+##   than renaming).
+  if test -z "$gccflag"; then
+    gccflag=-MD,
+  fi
+  "$@" -Wp,"$gccflag$tmpdepfile"
+  stat=$?
+  if test $stat -eq 0; then :
+  else
+    rm -f "$tmpdepfile"
+    exit $stat
+  fi
+  rm -f "$depfile"
+  echo "$object : \\" > "$depfile"
+  alpha=ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz
+## The second -e expression handles DOS-style file names with drive letters.
+  sed -e 's/^[^:]*: / /' \
+      -e 's/^['$alpha']:\/[^:]*: / /' < "$tmpdepfile" >> "$depfile"
+## This next piece of magic avoids the `deleted header file' problem.
+## The problem is that when a header file which appears in a .P file
+## is deleted, the dependency causes make to die (because there is
+## typically no way to rebuild the header).  We avoid this by adding
+## dummy dependencies for each header file.  Too bad gcc doesn't do
+## this for us directly.
+  tr ' ' '
+' < "$tmpdepfile" |
+## Some versions of gcc put a space before the `:'.  On the theory
+## that the space means something, we add a space to the output as
+## well.
+## Some versions of the HPUX 10.20 sed can't process this invocation
+## correctly.  Breaking it into two sed invocations is a workaround.
+    sed -e 's/^\\$//' -e '/^$/d' -e '/:$/d' | sed -e 's/$/ :/' >> "$depfile"
+  rm -f "$tmpdepfile"
+  ;;
+
+hp)
+  # This case exists only to let depend.m4 do its work.  It works by
+  # looking at the text of this script.  This case will never be run,
+  # since it is checked for above.
+  exit 1
+  ;;
+
+sgi)
+  if test "$libtool" = yes; then
+    "$@" "-Wp,-MDupdate,$tmpdepfile"
+  else
+    "$@" -MDupdate "$tmpdepfile"
+  fi
+  stat=$?
+  if test $stat -eq 0; then :
+  else
+    rm -f "$tmpdepfile"
+    exit $stat
+  fi
+  rm -f "$depfile"
+
+  if test -f "$tmpdepfile"; then  # yes, the sourcefile depend on other files
+    echo "$object : \\" > "$depfile"
+
+    # Clip off the initial element (the dependent).  Don't try to be
+    # clever and replace this with sed code, as IRIX sed won't handle
+    # lines with more than a fixed number of characters (4096 in
+    # IRIX 6.2 sed, 8192 in IRIX 6.5).  We also remove comment lines;
+    # the IRIX cc adds comments like `#:fec' to the end of the
+    # dependency line.
+    tr ' ' '
+' < "$tmpdepfile" \
+    | sed -e 's/^.*\.o://' -e 's/#.*$//' -e '/^$/ d' | \
+    tr '
+' ' ' >> $depfile
+    echo >> $depfile
+
+    # The second pass generates a dummy entry for each header file.
+    tr ' ' '
+' < "$tmpdepfile" \
+   | sed -e 's/^.*\.o://' -e 's/#.*$//' -e '/^$/ d' -e 's/$/:/' \
+   >> $depfile
+  else
+    # The sourcefile does not contain any dependencies, so just
+    # store a dummy comment line, to avoid errors with the Makefile
+    # "include basename.Plo" scheme.
+    echo "#dummy" > "$depfile"
+  fi
+  rm -f "$tmpdepfile"
+  ;;
+
+aix)
+  # The C for AIX Compiler uses -M and outputs the dependencies
+  # in a .u file.  This file always lives in the current directory.
+  # Also, the AIX compiler puts `$object:' at the start of each line;
+  # $object doesn't have directory information.
+  stripped=`echo "$object" | sed -e 's,^.*/,,' -e 's/\(.*\)\..*$/\1/'`
+  tmpdepfile="$stripped.u"
+  outname="$stripped.o"
+  if test "$libtool" = yes; then
+    "$@" -Wc,-M
+  else
+    "$@" -M
+  fi
+
+  stat=$?
+  if test $stat -eq 0; then :
+  else
+    rm -f "$tmpdepfile"
+    exit $stat
+  fi
+
+  if test -f "$tmpdepfile"; then
+    # Each line is of the form `foo.o: dependent.h'.
+    # Do two passes, one to just change these to
+    # `$object: dependent.h' and one to simply `dependent.h:'.
+    sed -e "s,^$outname:,$object :," < "$tmpdepfile" > "$depfile"
+    sed -e "s,^$outname: \(.*\)$,\1:," < "$tmpdepfile" >> "$depfile"
+  else
+    # The sourcefile does not contain any dependencies, so just
+    # store a dummy comment line, to avoid errors with the Makefile
+    # "include basename.Plo" scheme.
+    echo "#dummy" > "$depfile"
+  fi
+  rm -f "$tmpdepfile"
+  ;;
+
+tru64)
+   # The Tru64 AIX compiler uses -MD to generate dependencies as a side
+   # effect.  `cc -MD -o foo.o ...' puts the dependencies into `foo.o.d'.
+   # At least on Alpha/Redhat 6.1, Compaq CCC V6.2-504 seems to put 
+   # dependencies in `foo.d' instead, so we check for that too.
+   # Subdirectories are respected.
+
+   tmpdepfile1="$object.d"
+   tmpdepfile2=`echo "$object" | sed -e 's/.o$/.d/'` 
+   if test "$libtool" = yes; then
+      "$@" -Wc,-MD
+   else
+      "$@" -MD
+   fi
+
+   stat=$?
+   if test $stat -eq 0; then :
+   else
+      rm -f "$tmpdepfile1" "$tmpdepfile2"
+      exit $stat
+   fi
+
+   if test -f "$tmpdepfile1"; then
+      tmpdepfile="$tmpdepfile1"
+   else
+      tmpdepfile="$tmpdepfile2"
+   fi
+   if test -f "$tmpdepfile"; then
+      sed -e "s,^.*\.[a-z]*:,$object:," < "$tmpdepfile" > "$depfile"
+      # That's a space and a tab in the [].
+      sed -e 's,^.*\.[a-z]*:[ 	]*,,' -e 's,$,:,' < "$tmpdepfile" >> "$depfile"
+   else
+      echo "#dummy" > "$depfile"
+   fi
+   rm -f "$tmpdepfile"
+   ;;
+
+#nosideeffect)
+  # This comment above is used by automake to tell side-effect
+  # dependency tracking mechanisms from slower ones.
+
+dashmstdout)
+  # Important note: in order to support this mode, a compiler *must*
+  # always write the proprocessed file to stdout, regardless of -o,
+  # because we must use -o when running libtool.
+  test -z "$dashmflag" && dashmflag=-M
+  ( IFS=" "
+    case " $* " in
+    *" --mode=compile "*) # this is libtool, let us make it quiet
+      for arg
+      do # cycle over the arguments
+        case "$arg" in
+	"--mode=compile")
+	  # insert --quiet before "--mode=compile"
+	  set fnord "$@" --quiet
+	  shift # fnord
+	  ;;
+	esac
+	set fnord "$@" "$arg"
+	shift # fnord
+	shift # "$arg"
+      done
+      ;;
+    esac
+    "$@" $dashmflag | sed 's:^[^:]*\:[ 	]*:'"$object"'\: :' > "$tmpdepfile"
+  ) &
+  proc=$!
+  "$@"
+  stat=$?
+  wait "$proc"
+  if test "$stat" != 0; then exit $stat; fi
+  rm -f "$depfile"
+  cat < "$tmpdepfile" > "$depfile"
+  tr ' ' '
+' < "$tmpdepfile" | \
+## Some versions of the HPUX 10.20 sed can't process this invocation
+## correctly.  Breaking it into two sed invocations is a workaround.
+    sed -e 's/^\\$//' -e '/^$/d' -e '/:$/d' | sed -e 's/$/ :/' >> "$depfile"
+  rm -f "$tmpdepfile"
+  ;;
+
+dashXmstdout)
+  # This case only exists to satisfy depend.m4.  It is never actually
+  # run, as this mode is specially recognized in the preamble.
+  exit 1
+  ;;
+
+makedepend)
+  # X makedepend
+  (
+    shift
+    cleared=no
+    for arg in "$@"; do
+      case $cleared in no)
+        set ""; shift
+	cleared=yes
+      esac
+      case "$arg" in
+        -D*|-I*)
+	  set fnord "$@" "$arg"; shift;;
+	-*)
+	  ;;
+	*)
+	  set fnord "$@" "$arg"; shift;;
+      esac
+    done
+    obj_suffix="`echo $object | sed 's/^.*\././'`"
+    touch "$tmpdepfile"
+    ${MAKEDEPEND-makedepend} 2>/dev/null -o"$obj_suffix" -f"$tmpdepfile" "$@"
+  ) &
+  proc=$!
+  "$@"
+  stat=$?
+  wait "$proc"
+  if test "$stat" != 0; then exit $stat; fi
+  rm -f "$depfile"
+  cat < "$tmpdepfile" > "$depfile"
+  tail +3 "$tmpdepfile" | tr ' ' '
+' | \
+## Some versions of the HPUX 10.20 sed can't process this invocation
+## correctly.  Breaking it into two sed invocations is a workaround.
+    sed -e 's/^\\$//' -e '/^$/d' -e '/:$/d' | sed -e 's/$/ :/' >> "$depfile"
+  rm -f "$tmpdepfile" "$tmpdepfile".bak
+  ;;
+
+cpp)
+  # Important note: in order to support this mode, a compiler *must*
+  # always write the proprocessed file to stdout, regardless of -o,
+  # because we must use -o when running libtool.
+  ( IFS=" "
+    case " $* " in
+    *" --mode=compile "*)
+      for arg
+      do # cycle over the arguments
+        case $arg in
+	"--mode=compile")
+	  # insert --quiet before "--mode=compile"
+	  set fnord "$@" --quiet
+	  shift # fnord
+	  ;;
+	esac
+	set fnord "$@" "$arg"
+	shift # fnord
+	shift # "$arg"
+      done
+      ;;
+    esac
+    "$@" -E |
+    sed -n '/^# [0-9][0-9]* "\([^"]*\)".*/ s:: \1 \\:p' |
+    sed '$ s: \\$::' > "$tmpdepfile"
+  ) &
+  proc=$!
+  "$@"
+  stat=$?
+  wait "$proc"
+  if test "$stat" != 0; then exit $stat; fi
+  rm -f "$depfile"
+  echo "$object : \\" > "$depfile"
+  cat < "$tmpdepfile" >> "$depfile"
+  sed < "$tmpdepfile" '/^$/d;s/^ //;s/ \\$//;s/$/ :/' >> "$depfile"
+  rm -f "$tmpdepfile"
+  ;;
+
+msvisualcpp)
+  # Important note: in order to support this mode, a compiler *must*
+  # always write the proprocessed file to stdout, regardless of -o,
+  # because we must use -o when running libtool.
+  ( IFS=" "
+    case " $* " in
+    *" --mode=compile "*)
+      for arg
+      do # cycle over the arguments
+        case $arg in
+	"--mode=compile")
+	  # insert --quiet before "--mode=compile"
+	  set fnord "$@" --quiet
+	  shift # fnord
+	  ;;
+	esac
+	set fnord "$@" "$arg"
+	shift # fnord
+	shift # "$arg"
+      done
+      ;;
+    esac
+    "$@" -E |
+    sed -n '/^#line [0-9][0-9]* "\([^"]*\)"/ s::echo "`cygpath -u \\"\1\\"`":p' | sort | uniq > "$tmpdepfile"
+  ) &
+  proc=$!
+  "$@"
+  stat=$?
+  wait "$proc"
+  if test "$stat" != 0; then exit $stat; fi
+  rm -f "$depfile"
+  echo "$object : \\" > "$depfile"
+  . "$tmpdepfile" | sed 's% %\\ %g' | sed -n '/^\(.*\)$/ s::	\1 \\:p' >> "$depfile"
+  echo "	" >> "$depfile"
+  . "$tmpdepfile" | sed 's% %\\ %g' | sed -n '/^\(.*\)$/ s::\1\::p' >> "$depfile"
+  rm -f "$tmpdepfile"
+  ;;
+
+none)
+  exec "$@"
+  ;;
+
+*)
+  echo "Unknown depmode $depmode" 1>&2
+  exit 1
+  ;;
+esac
+
+exit 0
diff --git a/install-sh b/install-sh
index 5871924..e9de238 100755
--- a/install-sh
+++ b/install-sh
@@ -1,15 +1,27 @@
-#! /bin/sh
+#!/bin/sh
 #
 # install - install a program, script, or datafile
-# This comes from X11R5.
+# This comes from X11R5 (mit/util/scripts/install.sh).
+#
+# Copyright 1991 by the Massachusetts Institute of Technology
+#
+# Permission to use, copy, modify, distribute, and sell this software and its
+# documentation for any purpose is hereby granted without fee, provided that
+# the above copyright notice appear in all copies and that both that
+# copyright notice and this permission notice appear in supporting
+# documentation, and that the name of M.I.T. not be used in advertising or
+# publicity pertaining to distribution of the software without specific,
+# written prior permission.  M.I.T. makes no representations about the
+# suitability of this software for any purpose.  It is provided "as is"
+# without express or implied warranty.
 #
 # Calling this script install-sh is preferred over install.sh, to prevent
 # `make' implicit rules from creating a file called install from it
 # when there is no Makefile.
 #
 # This script is compatible with the BSD install script, but was written
-# from scratch.
-#
+# from scratch.  It can only install one file at a time, a restriction
+# shared with many OS's install programs.
 
 
 # set DOITPROG to echo to test this script
@@ -106,6 +118,7 @@ if [ x"$dir_arg" != x ]; then
 	
 	if [ -d $dst ]; then
 		instcmd=:
+		chmodcmd=""
 	else
 		instcmd=mkdir
 	fi
diff --git a/intl/ChangeLog b/intl/ChangeLog
index df904de..84e2b37 100644
--- a/intl/ChangeLog
+++ b/intl/ChangeLog
@@ -1,4 +1,4 @@
-2001-05-23  GNU  <bug-gnu-utils@gnu.org>
+2001-09-13  GNU  <bug-gnu-utils@gnu.org>
 
-	* Version 0.10.38 released.
+	* Version 0.10.40 released.
 
diff --git a/intl/Makefile.in b/intl/Makefile.in
index 889ba23..19ed4a7 100644
--- a/intl/Makefile.in
+++ b/intl/Makefile.in
@@ -1,19 +1,20 @@
 # Makefile for directory with message catalog handling in GNU NLS Utilities.
 # Copyright (C) 1995-1998, 2000, 2001 Free Software Foundation, Inc.
 #
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
+# This program is free software; you can redistribute it and/or modify it
+# under the terms of the GNU Library General Public License as published
+# by the Free Software Foundation; either version 2, or (at your option)
 # any later version.
 #
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+# Library General Public License for more details.
 #
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+# You should have received a copy of the GNU Library General Public
+# License along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
+# USA.
 
 PACKAGE = @PACKAGE@
 VERSION = @VERSION@
@@ -74,7 +75,7 @@ DISTFILES.common = Makefile.in \
 config.charset locale.alias ref-add.sin ref-del.sin $(HEADERS) $(SOURCES)
 DISTFILES.generated = plural.c
 DISTFILES.normal = VERSION
-DISTFILES.gettext = libintl.glibc
+DISTFILES.gettext = COPYING.LIB-2 COPYING.LIB-2.1 libintl.glibc
 DISTFILES.obsolete = xopen-msg.sed linux-msg.sed po2tbl.sed.in cat-compat.c
 
 # Libtool's library version information for libintl.
@@ -184,7 +185,7 @@ install-data: all
 	  $(mkinstalldirs) $(DESTDIR)$(gettextsrcdir); \
 	  $(INSTALL_DATA) VERSION $(DESTDIR)$(gettextsrcdir)/VERSION; \
 	  $(INSTALL_DATA) ChangeLog.inst $(DESTDIR)$(gettextsrcdir)/ChangeLog; \
-	  dists="$(DISTFILES.common)"; \
+	  dists="COPYING.LIB-2 COPYING.LIB-2.1 $(DISTFILES.common)"; \
 	  for file in $$dists; do \
 	    $(INSTALL_DATA) $(srcdir)/$$file \
 			    $(DESTDIR)$(gettextsrcdir)/$$file; \
@@ -243,7 +244,7 @@ uninstall:
 	  : ; \
 	fi
 	if test "$(PACKAGE)" = "gettext"; then \
-	  for file in VERSION ChangeLog $(DISTFILES.common) $(DISTFILES.generated); do \
+	  for file in VERSION ChangeLog COPYING.LIB-2 COPYING.LIB-2.1 $(DISTFILES.common) $(DISTFILES.generated); do \
 	    rm -f $(DESTDIR)$(gettextsrcdir)/$$file; \
 	  done; \
 	else \
diff --git a/intl/VERSION b/intl/VERSION
index 268da64..cb8a01a 100644
--- a/intl/VERSION
+++ b/intl/VERSION
@@ -1 +1 @@
-GNU gettext library from gettext-0.10.38
+GNU gettext library from gettext-0.10.40
diff --git a/intl/bindtextdom.c b/intl/bindtextdom.c
index 7e5a74a..c6a9bd1 100644
--- a/intl/bindtextdom.c
+++ b/intl/bindtextdom.c
@@ -1,19 +1,20 @@
 /* Implementation of the bindtextdomain(3) function
    Copyright (C) 1995-1998, 2000, 2001 Free Software Foundation, Inc.
 
-   This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2, or (at your option)
+   This program is free software; you can redistribute it and/or modify it
+   under the terms of the GNU Library General Public License as published
+   by the Free Software Foundation; either version 2, or (at your option)
    any later version.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   Library General Public License for more details.
 
-   You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software Foundation,
-   Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
+   You should have received a copy of the GNU Library General Public
+   License along with this program; if not, write to the Free Software
+   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
+   USA.  */
 
 #ifdef HAVE_CONFIG_H
 # include <config.h>
diff --git a/intl/config.charset b/intl/config.charset
index d6f3695..f4f2611 100755
--- a/intl/config.charset
+++ b/intl/config.charset
@@ -80,10 +80,10 @@
 #   EUC-KR                    glibc aix hpux irix osf solaris freebsd   yes
 #   EUC-TW                    glibc aix hpux irix osf solaris
 #   BIG5                      glibc aix hpux osf solaris freebsd        yes
-#   BIG5HKSCS                 glibc
+#   BIG5-HKSCS                glibc
 #   GBK                       aix osf win32 dos
 #   GB18030                   glibc
-#   SJIS                      hpux osf solaris freebsd
+#   SHIFT_JIS                 hpux osf solaris freebsd                  yes
 #   JOHAB                     glibc win32
 #   TIS-620                   glibc aix hpux osf solaris
 #   VISCII                    glibc                                     yes
@@ -174,7 +174,7 @@ case "$os" in
 	echo "eucTW EUC-TW"
 	echo "hp15CN GB2312"
 	#echo "ccdc ?" # what is this?
-	echo "SJIS SJIS"
+	echo "SJIS SHIFT_JIS"
 	echo "utf8 UTF-8"
 	;;
     irix*)
@@ -209,7 +209,7 @@ case "$os" in
 	echo "GBK GBK"
 	echo "KSC5601 CP949"
 	echo "sdeckanji EUC-JP"
-	echo "SJIS SJIS"
+	echo "SJIS SHIFT_JIS"
 	echo "TACTIS TIS-620"
 	echo "UTF-8 UTF-8"
 	;;
@@ -230,7 +230,7 @@ case "$os" in
 	echo "cns11643 EUC-TW"
 	echo "5601 EUC-KR"
 	echo "eucJP EUC-JP"
-	echo "PCK SJIS"
+	echo "PCK SHIFT_JIS"
 	echo "TIS620.2533 TIS-620"
 	#echo "sun_eu_greek ?" # what is this?
 	echo "UTF-8 UTF-8"
@@ -266,8 +266,8 @@ case "$os" in
 	echo "zh_TW.Big5 BIG5"
 	echo "zh_CN.EUC GB2312"
 	echo "ja_JP.EUC EUC-JP"
-	echo "ja_JP.SJIS SJIS"
-	echo "ja_JP.Shift_JIS SJIS"
+	echo "ja_JP.SJIS SHIFT_JIS"
+	echo "ja_JP.Shift_JIS SHIFT_JIS"
 	echo "ko_KR.EUC EUC-KR"
 	;;
     beos*)
diff --git a/intl/dcgettext.c b/intl/dcgettext.c
index 469e78d..b7c9652 100644
--- a/intl/dcgettext.c
+++ b/intl/dcgettext.c
@@ -1,19 +1,20 @@
 /* Implementation of the dcgettext(3) function.
    Copyright (C) 1995-1999, 2000, 2001 Free Software Foundation, Inc.
 
-   This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2, or (at your option)
+   This program is free software; you can redistribute it and/or modify it
+   under the terms of the GNU Library General Public License as published
+   by the Free Software Foundation; either version 2, or (at your option)
    any later version.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   Library General Public License for more details.
 
-   You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software Foundation,
-   Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
+   You should have received a copy of the GNU Library General Public
+   License along with this program; if not, write to the Free Software
+   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
+   USA.  */
 
 #ifdef HAVE_CONFIG_H
 # include <config.h>
diff --git a/intl/dcigettext.c b/intl/dcigettext.c
index 8456550..6acde19 100644
--- a/intl/dcigettext.c
+++ b/intl/dcigettext.c
@@ -1,19 +1,20 @@
 /* Implementation of the internal dcigettext function.
    Copyright (C) 1995-1999, 2000, 2001 Free Software Foundation, Inc.
 
-   This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2, or (at your option)
+   This program is free software; you can redistribute it and/or modify it
+   under the terms of the GNU Library General Public License as published
+   by the Free Software Foundation; either version 2, or (at your option)
    any later version.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   Library General Public License for more details.
 
-   You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software Foundation,
-   Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
+   You should have received a copy of the GNU Library General Public
+   License along with this program; if not, write to the Free Software
+   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
+   USA.  */
 
 /* Tell glibc's <string.h> to provide a prototype for mempcpy().
    This must come before <config.h> because <config.h> may include
@@ -517,6 +518,7 @@ DCIGETTEXT (domainname, msgid1, msgid2, plural, n, category)
 	  /* We cannot get the current working directory.  Don't signal an
 	     error but simply return the default string.  */
 	  FREE_BLOCKS (block_list);
+	  __libc_rwlock_unlock (_nl_state_lock);
 	  __set_errno (saved_errno);
 	  return (plural == 0
 		  ? (char *) msgid1
diff --git a/intl/dcngettext.c b/intl/dcngettext.c
index e5da257..c16af21 100644
--- a/intl/dcngettext.c
+++ b/intl/dcngettext.c
@@ -1,19 +1,20 @@
 /* Implementation of the dcngettext(3) function.
    Copyright (C) 1995-1999, 2000, 2001 Free Software Foundation, Inc.
 
-   This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2, or (at your option)
+   This program is free software; you can redistribute it and/or modify it
+   under the terms of the GNU Library General Public License as published
+   by the Free Software Foundation; either version 2, or (at your option)
    any later version.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   Library General Public License for more details.
 
-   You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software Foundation,
-   Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
+   You should have received a copy of the GNU Library General Public
+   License along with this program; if not, write to the Free Software
+   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
+   USA.  */
 
 #ifdef HAVE_CONFIG_H
 # include <config.h>
diff --git a/intl/dgettext.c b/intl/dgettext.c
index c513041..3651207 100644
--- a/intl/dgettext.c
+++ b/intl/dgettext.c
@@ -1,19 +1,20 @@
 /* Implementation of the dgettext(3) function.
    Copyright (C) 1995-1997, 2000, 2001 Free Software Foundation, Inc.
 
-   This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2, or (at your option)
+   This program is free software; you can redistribute it and/or modify it
+   under the terms of the GNU Library General Public License as published
+   by the Free Software Foundation; either version 2, or (at your option)
    any later version.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   Library General Public License for more details.
 
-   You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software Foundation,
-   Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
+   You should have received a copy of the GNU Library General Public
+   License along with this program; if not, write to the Free Software
+   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
+   USA.  */
 
 #ifdef HAVE_CONFIG_H
 # include <config.h>
diff --git a/intl/dngettext.c b/intl/dngettext.c
index 79aaa9a..f214e95 100644
--- a/intl/dngettext.c
+++ b/intl/dngettext.c
@@ -1,19 +1,20 @@
 /* Implementation of the dngettext(3) function.
    Copyright (C) 1995-1997, 2000, 2001 Free Software Foundation, Inc.
 
-   This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2, or (at your option)
+   This program is free software; you can redistribute it and/or modify it
+   under the terms of the GNU Library General Public License as published
+   by the Free Software Foundation; either version 2, or (at your option)
    any later version.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   Library General Public License for more details.
 
-   You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software Foundation,
-   Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
+   You should have received a copy of the GNU Library General Public
+   License along with this program; if not, write to the Free Software
+   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
+   USA.  */
 
 #ifdef HAVE_CONFIG_H
 # include <config.h>
diff --git a/intl/explodename.c b/intl/explodename.c
index c4ddcc4..2985064 100644
--- a/intl/explodename.c
+++ b/intl/explodename.c
@@ -1,19 +1,20 @@
 /* Copyright (C) 1995-1998, 2000, 2001 Free Software Foundation, Inc.
    Contributed by Ulrich Drepper <drepper@gnu.ai.mit.edu>, 1995.
 
-   This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2, or (at your option)
+   This program is free software; you can redistribute it and/or modify it
+   under the terms of the GNU Library General Public License as published
+   by the Free Software Foundation; either version 2, or (at your option)
    any later version.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   Library General Public License for more details.
 
-   You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software Foundation,
-   Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
+   You should have received a copy of the GNU Library General Public
+   License along with this program; if not, write to the Free Software
+   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
+   USA.  */
 
 #ifdef HAVE_CONFIG_H
 # include <config.h>
diff --git a/intl/finddomain.c b/intl/finddomain.c
index 4882554..2f103d5 100644
--- a/intl/finddomain.c
+++ b/intl/finddomain.c
@@ -2,19 +2,20 @@
    Copyright (C) 1995-1999, 2000, 2001 Free Software Foundation, Inc.
    Written by Ulrich Drepper <drepper@gnu.org>, 1995.
 
-   This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2, or (at your option)
+   This program is free software; you can redistribute it and/or modify it
+   under the terms of the GNU Library General Public License as published
+   by the Free Software Foundation; either version 2, or (at your option)
    any later version.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   Library General Public License for more details.
 
-   You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software Foundation,
-   Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
+   You should have received a copy of the GNU Library General Public
+   License along with this program; if not, write to the Free Software
+   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
+   USA.  */
 
 #ifdef HAVE_CONFIG_H
 # include <config.h>
diff --git a/intl/gettext.c b/intl/gettext.c
index a640205..22a6c24 100644
--- a/intl/gettext.c
+++ b/intl/gettext.c
@@ -1,19 +1,20 @@
 /* Implementation of gettext(3) function.
    Copyright (C) 1995, 1997, 2000, 2001 Free Software Foundation, Inc.
 
-   This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2, or (at your option)
+   This program is free software; you can redistribute it and/or modify it
+   under the terms of the GNU Library General Public License as published
+   by the Free Software Foundation; either version 2, or (at your option)
    any later version.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   Library General Public License for more details.
 
-   You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software Foundation,
-   Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
+   You should have received a copy of the GNU Library General Public
+   License along with this program; if not, write to the Free Software
+   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
+   USA.  */
 
 #ifdef HAVE_CONFIG_H
 # include <config.h>
diff --git a/intl/gettext.h b/intl/gettext.h
index eb58890..6f5d760 100644
--- a/intl/gettext.h
+++ b/intl/gettext.h
@@ -1,19 +1,20 @@
 /* Description of GNU message catalog format: general file layout.
    Copyright (C) 1995, 1997, 2000, 2001 Free Software Foundation, Inc.
 
-   This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2, or (at your option)
+   This program is free software; you can redistribute it and/or modify it
+   under the terms of the GNU Library General Public License as published
+   by the Free Software Foundation; either version 2, or (at your option)
    any later version.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   Library General Public License for more details.
 
-   You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software Foundation,
-   Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
+   You should have received a copy of the GNU Library General Public
+   License along with this program; if not, write to the Free Software
+   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
+   USA.  */
 
 #ifndef _GETTEXT_H
 #define _GETTEXT_H 1
diff --git a/intl/gettextP.h b/intl/gettextP.h
index ee8ca48..43de1cd 100644
--- a/intl/gettextP.h
+++ b/intl/gettextP.h
@@ -2,19 +2,20 @@
    Copyright (C) 1995-1999, 2000, 2001 Free Software Foundation, Inc.
    Written by Ulrich Drepper <drepper@cygnus.com>, 1995.
 
-   This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2, or (at your option)
+   This program is free software; you can redistribute it and/or modify it
+   under the terms of the GNU Library General Public License as published
+   by the Free Software Foundation; either version 2, or (at your option)
    any later version.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   Library General Public License for more details.
 
-   You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software Foundation,
-   Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
+   You should have received a copy of the GNU Library General Public
+   License along with this program; if not, write to the Free Software
+   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
+   USA.  */
 
 #ifndef _GETTEXTP_H
 #define _GETTEXTP_H
diff --git a/intl/hash-string.h b/intl/hash-string.h
index 37d4ce1..ccb7acc 100644
--- a/intl/hash-string.h
+++ b/intl/hash-string.h
@@ -1,19 +1,20 @@
 /* Description of GNU message catalog format: string hashing function.
    Copyright (C) 1995, 1997, 1998, 2000, 2001 Free Software Foundation, Inc.
 
-   This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2, or (at your option)
+   This program is free software; you can redistribute it and/or modify it
+   under the terms of the GNU Library General Public License as published
+   by the Free Software Foundation; either version 2, or (at your option)
    any later version.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   Library General Public License for more details.
 
-   You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software Foundation,
-   Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
+   You should have received a copy of the GNU Library General Public
+   License along with this program; if not, write to the Free Software
+   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
+   USA.  */
 
 /* @@ end of prolog @@ */
 
diff --git a/intl/intl-compat.c b/intl/intl-compat.c
index b8edaa1..0a06ce9 100644
--- a/intl/intl-compat.c
+++ b/intl/intl-compat.c
@@ -2,19 +2,20 @@
    Library.
    Copyright (C) 1995, 2000, 2001 Software Foundation, Inc.
 
-This program is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
-any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program; if not, write to the Free Software
-Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
+   This program is free software; you can redistribute it and/or modify it
+   under the terms of the GNU Library General Public License as published
+   by the Free Software Foundation; either version 2, or (at your option)
+   any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   Library General Public License for more details.
+
+   You should have received a copy of the GNU Library General Public
+   License along with this program; if not, write to the Free Software
+   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
+   USA.  */
 
 #ifdef HAVE_CONFIG_H
 # include <config.h>
diff --git a/intl/l10nflist.c b/intl/l10nflist.c
index 557253e..533e94b 100644
--- a/intl/l10nflist.c
+++ b/intl/l10nflist.c
@@ -1,19 +1,20 @@
 /* Copyright (C) 1995-1999, 2000, 2001 Free Software Foundation, Inc.
    Contributed by Ulrich Drepper <drepper@gnu.ai.mit.edu>, 1995.
 
-   This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2, or (at your option)
+   This program is free software; you can redistribute it and/or modify it
+   under the terms of the GNU Library General Public License as published
+   by the Free Software Foundation; either version 2, or (at your option)
    any later version.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   Library General Public License for more details.
 
-   You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software Foundation,
-   Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
+   You should have received a copy of the GNU Library General Public
+   License along with this program; if not, write to the Free Software
+   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
+   USA.  */
 
 /* Tell glibc's <string.h> to provide a prototype for stpcpy().
    This must come before <config.h> because <config.h> may include
diff --git a/intl/libgettext.h b/intl/libgettext.h
index 553382c..c5be54a 100644
--- a/intl/libgettext.h
+++ b/intl/libgettext.h
@@ -1,19 +1,20 @@
 /* Convenience header for conditional use of GNU <libintl.h>.
    Copyright (C) 1995-1998, 2000, 2001 Free Software Foundation, Inc.
 
-   This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2, or (at your option)
+   This program is free software; you can redistribute it and/or modify it
+   under the terms of the GNU Library General Public License as published
+   by the Free Software Foundation; either version 2, or (at your option)
    any later version.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   Library General Public License for more details.
 
-   You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software Foundation,
-   Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
+   You should have received a copy of the GNU Library General Public
+   License along with this program; if not, write to the Free Software
+   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
+   USA.  */
 
 #ifndef _LIBGETTEXT_H
 #define _LIBGETTEXT_H 1
diff --git a/intl/libgnuintl.h b/intl/libgnuintl.h
index 577001a..f891deb 100644
--- a/intl/libgnuintl.h
+++ b/intl/libgnuintl.h
@@ -1,19 +1,20 @@
 /* Message catalogs for internationalization.
    Copyright (C) 1995-1997, 2000, 2001 Free Software Foundation, Inc.
 
-   This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2, or (at your option)
+   This program is free software; you can redistribute it and/or modify it
+   under the terms of the GNU Library General Public License as published
+   by the Free Software Foundation; either version 2, or (at your option)
    any later version.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   Library General Public License for more details.
 
-   You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software Foundation,
-   Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
+   You should have received a copy of the GNU Library General Public
+   License along with this program; if not, write to the Free Software
+   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
+   USA.  */
 
 #ifndef _LIBINTL_H
 #define _LIBINTL_H	1
diff --git a/intl/libintl.h b/intl/libintl.h
deleted file mode 100644
index 3a92960..0000000
--- a/intl/libintl.h
+++ /dev/null
@@ -1,182 +0,0 @@
-/* Message catalogs for internationalization.
-   Copyright (C) 1995, 1996, 1997, 1998 Free Software Foundation, Inc.
-
-   This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2, or (at your option)
-   any later version.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software Foundation,
-   Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
-
-/* Because on some systems (e.g. Solaris) we sometimes have to include
-   the systems libintl.h as well as this file we have more complex
-   include protection above.  But the systems header might perhaps also
-   define _LIBINTL_H and therefore we have to protect the definition here.  */
-
-#if !defined _LIBINTL_H || !defined _LIBGETTEXT_H
-#ifndef _LIBINTL_H
-# define _LIBINTL_H	1
-#endif
-#define _LIBGETTEXT_H	1
-
-/* We define an additional symbol to signal that we use the GNU
-   implementation of gettext.  */
-#define __USE_GNU_GETTEXT 1
-
-#include <sys/types.h>
-
-#if HAVE_LOCALE_H
-# include <locale.h>
-#endif
-
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/* @@ end of prolog @@ */
-
-#ifndef PARAMS
-# if __STDC__ || defined __cplusplus
-#  define PARAMS(args) args
-# else
-#  define PARAMS(args) ()
-# endif
-#endif
-
-#ifndef NULL
-# if !defined __cplusplus || defined __GNUC__
-#  define NULL ((void *) 0)
-# else
-#  define NULL (0)
-# endif
-#endif
-
-#if !HAVE_LC_MESSAGES
-/* This value determines the behaviour of the gettext() and dgettext()
-   function.  But some system does not have this defined.  Define it
-   to a default value.  */
-# define LC_MESSAGES (-1)
-#endif
-
-
-/* Declarations for gettext-using-catgets interface.  Derived from
-   Jim Meyering's libintl.h.  */
-struct _msg_ent
-{
-  const char *_msg;
-  int _msg_number;
-};
-
-
-#if HAVE_CATGETS
-/* These two variables are defined in the automatically by po-to-tbl.sed
-   generated file `cat-id-tbl.c'.  */
-extern const struct _msg_ent _msg_tbl[];
-extern int _msg_tbl_length;
-#endif
-
-
-/* For automatical extraction of messages sometimes no real
-   translation is needed.  Instead the string itself is the result.  */
-#define gettext_noop(Str) (Str)
-
-/* Look up MSGID in the current default message catalog for the current
-   LC_MESSAGES locale.  If not found, returns MSGID itself (the default
-   text).  */
-extern char *gettext PARAMS ((const char *__msgid));
-extern char *gettext__ PARAMS ((const char *__msgid));
-
-/* Look up MSGID in the DOMAINNAME message catalog for the current
-   LC_MESSAGES locale.  */
-extern char *dgettext PARAMS ((const char *__domainname, const char *__msgid));
-extern char *dgettext__ PARAMS ((const char *__domainname,
-				 const char *__msgid));
-
-/* Look up MSGID in the DOMAINNAME message catalog for the current CATEGORY
-   locale.  */
-extern char *dcgettext PARAMS ((const char *__domainname, const char *__msgid,
-				int __category));
-extern char *dcgettext__ PARAMS ((const char *__domainname,
-				  const char *__msgid, int __category));
-
-
-/* Set the current default message catalog to DOMAINNAME.
-   If DOMAINNAME is null, return the current default.
-   If DOMAINNAME is "", reset to the default of "messages".  */
-extern char *textdomain PARAMS ((const char *__domainname));
-extern char *textdomain__ PARAMS ((const char *__domainname));
-
-/* Specify that the DOMAINNAME message catalog will be found
-   in DIRNAME rather than in the system locale data base.  */
-extern char *bindtextdomain PARAMS ((const char *__domainname,
-				  const char *__dirname));
-extern char *bindtextdomain__ PARAMS ((const char *__domainname,
-				    const char *__dirname));
-
-#if ENABLE_NLS
-
-/* Solaris 2.3 has the gettext function but dcgettext is missing.
-   So we omit this optimization for Solaris 2.3.  BTW, Solaris 2.4
-   has dcgettext.  */
-# if !HAVE_CATGETS && (!HAVE_GETTEXT || HAVE_DCGETTEXT)
-
-#  define gettext(Msgid)						      \
-     dgettext (NULL, Msgid)
-
-#  define dgettext(Domainname, Msgid)					      \
-     dcgettext (Domainname, Msgid, LC_MESSAGES)
-
-#  if defined __GNUC__ && __GNUC__ == 2 && __GNUC_MINOR__ >= 7
-/* This global variable is defined in loadmsgcat.c.  We need a sign,
-   whether a new catalog was loaded, which can be associated with all
-   translations.  */
-extern int _nl_msg_cat_cntr;
-
-#   define dcgettext(Domainname, Msgid, Category)			      \
-  (__extension__							      \
-   ({									      \
-     char *__result;							      \
-     if (__builtin_constant_p (Msgid))					      \
-       {								      \
-	 static char *__translation__;					      \
-	 static int __catalog_counter__;				      \
-	 if (! __translation__ || __catalog_counter__ != _nl_msg_cat_cntr)    \
-	   {								      \
-	     __translation__ =						      \
-	       dcgettext__ (Domainname, Msgid, Category);		      \
-	     __catalog_counter__ = _nl_msg_cat_cntr;			      \
-	   }								      \
-	 __result = __translation__;					      \
-       }								      \
-     else								      \
-       __result = dcgettext__ (Domainname, Msgid, Category);		      \
-     __result;								      \
-    }))
-#  endif
-# endif
-
-#else
-
-# define gettext(Msgid) (Msgid)
-# define dgettext(Domainname, Msgid) (Msgid)
-# define dcgettext(Domainname, Msgid, Category) (Msgid)
-# define textdomain(Domainname) ((char *) Domainname)
-# define bindtextdomain(Domainname, Dirname) ((char *) Dirname)
-
-#endif
-
-/* @@ begin of epilog @@ */
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif
diff --git a/intl/loadinfo.h b/intl/loadinfo.h
index 5171a8f..b861260 100644
--- a/intl/loadinfo.h
+++ b/intl/loadinfo.h
@@ -2,19 +2,20 @@
    This file is part of the GNU C Library.
    Contributed by Ulrich Drepper <drepper@cygnus.com>, 1996.
 
-   This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2, or (at your option)
+   This program is free software; you can redistribute it and/or modify it
+   under the terms of the GNU Library General Public License as published
+   by the Free Software Foundation; either version 2, or (at your option)
    any later version.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   Library General Public License for more details.
 
-   You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software Foundation,
-   Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
+   You should have received a copy of the GNU Library General Public
+   License along with this program; if not, write to the Free Software
+   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
+   USA.  */
 
 #ifndef _LOADINFO_H
 #define _LOADINFO_H	1
diff --git a/intl/loadmsgcat.c b/intl/loadmsgcat.c
index d589243..f99ebee 100644
--- a/intl/loadmsgcat.c
+++ b/intl/loadmsgcat.c
@@ -1,19 +1,20 @@
 /* Load needed message catalogs.
    Copyright (C) 1995-1999, 2000, 2001 Free Software Foundation, Inc.
 
-   This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2, or (at your option)
+   This program is free software; you can redistribute it and/or modify it
+   under the terms of the GNU Library General Public License as published
+   by the Free Software Foundation; either version 2, or (at your option)
    any later version.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   Library General Public License for more details.
 
-   You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software Foundation,
-   Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
+   You should have received a copy of the GNU Library General Public
+   License along with this program; if not, write to the Free Software
+   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
+   USA.  */
 
 /* Tell glibc's <string.h> to provide a prototype for mempcpy().
    This must come before <config.h> because <config.h> may include
diff --git a/intl/localcharset.c b/intl/localcharset.c
index 22e09e4..61f8f3e 100644
--- a/intl/localcharset.c
+++ b/intl/localcharset.c
@@ -75,13 +75,13 @@
 /* Pointer to the contents of the charset.alias file, if it has already been
    read, else NULL.  Its format is:
    ALIAS_1 '\0' CANONICAL_1 '\0' ... ALIAS_n '\0' CANONICAL_n '\0' '\0'  */
-static char * volatile charset_aliases;
+static const char * volatile charset_aliases;
 
 /* Return a pointer to the contents of the charset.alias file.  */
 static const char *
 get_charset_aliases ()
 {
-  char *cp;
+  const char *cp;
 
   cp = charset_aliases;
   if (cp == NULL)
diff --git a/intl/locale.alias b/intl/locale.alias
index 48940f7..bd7b9b3 100644
--- a/intl/locale.alias
+++ b/intl/locale.alias
@@ -1,19 +1,20 @@
 # Locale name alias data base.
 # Copyright (C) 1996,1997,1998,1999,2000,2001 Free Software Foundation, Inc.
 #
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
+# This program is free software; you can redistribute it and/or modify it
+# under the terms of the GNU Library General Public License as published
+# by the Free Software Foundation; either version 2, or (at your option)
 # any later version.
 #
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+# Library General Public License for more details.
 #
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+# You should have received a copy of the GNU Library General Public
+# License along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
+# USA.
 
 # The format of this file is the same as for the corresponding file of
 # the X Window System, which normally can be found in
@@ -46,7 +47,7 @@ galego		gl_ES.ISO-8859-1
 galician	gl_ES.ISO-8859-1
 german		de_DE.ISO-8859-1
 greek           el_GR.ISO-8859-7
-hebrew          iw_IL.ISO-8859-8
+hebrew          he_IL.ISO-8859-8
 hrvatski	hr_HR.ISO-8859-2
 hungarian       hu_HU.ISO-8859-2
 icelandic       is_IS.ISO-8859-1
diff --git a/intl/localealias.c b/intl/localealias.c
index 76f19a9..91e7acc 100644
--- a/intl/localealias.c
+++ b/intl/localealias.c
@@ -1,19 +1,20 @@
 /* Handle aliases for locale names.
    Copyright (C) 1995-1999, 2000, 2001 Free Software Foundation, Inc.
 
-   This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2, or (at your option)
+   This program is free software; you can redistribute it and/or modify it
+   under the terms of the GNU Library General Public License as published
+   by the Free Software Foundation; either version 2, or (at your option)
    any later version.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   Library General Public License for more details.
 
-   You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software Foundation,
-   Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
+   You should have received a copy of the GNU Library General Public
+   License along with this program; if not, write to the Free Software
+   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
+   USA.  */
 
 /* Tell glibc's <string.h> to provide a prototype for mempcpy().
    This must come before <config.h> because <config.h> may include
diff --git a/intl/ngettext.c b/intl/ngettext.c
index 8b1fa02..fb3ec5a 100644
--- a/intl/ngettext.c
+++ b/intl/ngettext.c
@@ -1,19 +1,20 @@
 /* Implementation of ngettext(3) function.
    Copyright (C) 1995, 1997, 2000, 2001 Free Software Foundation, Inc.
 
-   This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2, or (at your option)
+   This program is free software; you can redistribute it and/or modify it
+   under the terms of the GNU Library General Public License as published
+   by the Free Software Foundation; either version 2, or (at your option)
    any later version.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   Library General Public License for more details.
 
-   You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software Foundation,
-   Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
+   You should have received a copy of the GNU Library General Public
+   License along with this program; if not, write to the Free Software
+   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
+   USA.  */
 
 #ifdef HAVE_CONFIG_H
 # include <config.h>
diff --git a/intl/plural.c b/intl/plural.c
index 8191335..640d43c 100644
--- a/intl/plural.c
+++ b/intl/plural.c
@@ -23,19 +23,20 @@
    Copyright (C) 2000, 2001 Free Software Foundation, Inc.
    Written by Ulrich Drepper <drepper@cygnus.com>, 2000.
 
-   This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2, or (at your option)
+   This program is free software; you can redistribute it and/or modify it
+   under the terms of the GNU Library General Public License as published
+   by the Free Software Foundation; either version 2, or (at your option)
    any later version.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   Library General Public License for more details.
 
-   You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software Foundation,
-   Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
+   You should have received a copy of the GNU Library General Public
+   License along with this program; if not, write to the Free Software
+   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
+   USA.  */
 
 /* The bison generated parser uses alloca.  AIX 3 forces us to put this
    declaration at the beginning of the file.  The declaration in bison's
@@ -66,13 +67,13 @@
 #define YYLEX_PARAM	&((struct parse_args *) arg)->cp
 #define YYPARSE_PARAM	arg
 
-#line 52 "plural.y"
+#line 53 "plural.y"
 typedef union {
   unsigned long int num;
   enum operator op;
   struct expression *exp;
 } YYSTYPE;
-#line 58 "plural.y"
+#line 59 "plural.y"
 
 /* Prototypes for local functions.  */
 static struct expression *new_exp PARAMS ((int nargs, enum operator op,
@@ -234,8 +235,8 @@ static const short yyrhs[] = {    17,
 
 #if YYDEBUG != 0
 static const short yyrline[] = { 0,
-   177,   185,   189,   193,   197,   201,   205,   209,   213,   217,
-   221,   226
+   178,   186,   190,   194,   198,   202,   206,   210,   214,   218,
+   222,   227
 };
 #endif
 
@@ -845,7 +846,7 @@ yyreduce:
   switch (yyn) {
 
 case 1:
-#line 178 "plural.y"
+#line 179 "plural.y"
 {
 	    if (yyvsp[0].exp == NULL)
 	      YYABORT;
@@ -853,68 +854,68 @@ case 1:
 	  ;
     break;}
 case 2:
-#line 186 "plural.y"
+#line 187 "plural.y"
 {
 	    yyval.exp = new_exp_3 (qmop, yyvsp[-4].exp, yyvsp[-2].exp, yyvsp[0].exp);
 	  ;
     break;}
 case 3:
-#line 190 "plural.y"
+#line 191 "plural.y"
 {
 	    yyval.exp = new_exp_2 (lor, yyvsp[-2].exp, yyvsp[0].exp);
 	  ;
     break;}
 case 4:
-#line 194 "plural.y"
+#line 195 "plural.y"
 {
 	    yyval.exp = new_exp_2 (land, yyvsp[-2].exp, yyvsp[0].exp);
 	  ;
     break;}
 case 5:
-#line 198 "plural.y"
+#line 199 "plural.y"
 {
 	    yyval.exp = new_exp_2 (yyvsp[-1].op, yyvsp[-2].exp, yyvsp[0].exp);
 	  ;
     break;}
 case 6:
-#line 202 "plural.y"
+#line 203 "plural.y"
 {
 	    yyval.exp = new_exp_2 (yyvsp[-1].op, yyvsp[-2].exp, yyvsp[0].exp);
 	  ;
     break;}
 case 7:
-#line 206 "plural.y"
+#line 207 "plural.y"
 {
 	    yyval.exp = new_exp_2 (yyvsp[-1].op, yyvsp[-2].exp, yyvsp[0].exp);
 	  ;
     break;}
 case 8:
-#line 210 "plural.y"
+#line 211 "plural.y"
 {
 	    yyval.exp = new_exp_2 (yyvsp[-1].op, yyvsp[-2].exp, yyvsp[0].exp);
 	  ;
     break;}
 case 9:
-#line 214 "plural.y"
+#line 215 "plural.y"
 {
 	    yyval.exp = new_exp_1 (lnot, yyvsp[0].exp);
 	  ;
     break;}
 case 10:
-#line 218 "plural.y"
+#line 219 "plural.y"
 {
 	    yyval.exp = new_exp_0 (var);
 	  ;
     break;}
 case 11:
-#line 222 "plural.y"
+#line 223 "plural.y"
 {
 	    if ((yyval.exp = new_exp_0 (num)) != NULL)
 	      yyval.exp->val.num = yyvsp[0].num;
 	  ;
     break;}
 case 12:
-#line 227 "plural.y"
+#line 228 "plural.y"
 {
 	    yyval.exp = yyvsp[-1].exp;
 	  ;
@@ -1141,7 +1142,7 @@ yyerrhandle:
     }
   return 1;
 }
-#line 232 "plural.y"
+#line 233 "plural.y"
 
 
 void
diff --git a/intl/plural.y b/intl/plural.y
index 42ffa0e..be049a6 100644
--- a/intl/plural.y
+++ b/intl/plural.y
@@ -3,19 +3,20 @@
    Copyright (C) 2000, 2001 Free Software Foundation, Inc.
    Written by Ulrich Drepper <drepper@cygnus.com>, 2000.
 
-   This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2, or (at your option)
+   This program is free software; you can redistribute it and/or modify it
+   under the terms of the GNU Library General Public License as published
+   by the Free Software Foundation; either version 2, or (at your option)
    any later version.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   Library General Public License for more details.
 
-   You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software Foundation,
-   Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
+   You should have received a copy of the GNU Library General Public
+   License along with this program; if not, write to the Free Software
+   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
+   USA.  */
 
 /* The bison generated parser uses alloca.  AIX 3 forces us to put this
    declaration at the beginning of the file.  The declaration in bison's
diff --git a/intl/textdomain.c b/intl/textdomain.c
index 05c2fd7..2e420ad 100644
--- a/intl/textdomain.c
+++ b/intl/textdomain.c
@@ -1,19 +1,20 @@
 /* Implementation of the textdomain(3) function.
    Copyright (C) 1995-1998, 2000, 2001 Free Software Foundation, Inc.
 
-   This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2, or (at your option)
+   This program is free software; you can redistribute it and/or modify it
+   under the terms of the GNU Library General Public License as published
+   by the Free Software Foundation; either version 2, or (at your option)
    any later version.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   Library General Public License for more details.
 
-   You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software Foundation,
-   Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
+   You should have received a copy of the GNU Library General Public
+   License along with this program; if not, write to the Free Software
+   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
+   USA.  */
 
 #ifdef HAVE_CONFIG_H
 # include <config.h>
diff --git a/missing b/missing
index cbe2b0e..0a7fb5a 100755
--- a/missing
+++ b/missing
@@ -1,7 +1,7 @@
 #! /bin/sh
 # Common stub for a few missing GNU programs while installing.
-# Copyright (C) 1996, 1997 Free Software Foundation, Inc.
-# Franc,ois Pinard <pinard@iro.umontreal.ca>, 1996.
+# Copyright 1996, 1997, 1999, 2000 Free Software Foundation, Inc.
+# Originally by Fran,cois Pinard <pinard@iro.umontreal.ca>, 1996.
 
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -18,11 +18,37 @@
 # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
 # 02111-1307, USA.
 
+# As a special exception to the GNU General Public License, if you
+# distribute this file as part of a program that contains a
+# configuration script generated by Autoconf, you may include it under
+# the same distribution terms that you use for the rest of that program.
+
 if test $# -eq 0; then
   echo 1>&2 "Try \`$0 --help' for more information"
   exit 1
 fi
 
+run=:
+
+# In the cases where this matters, `missing' is being run in the
+# srcdir already.
+if test -f configure.ac; then
+  configure_ac=configure.ac
+else
+  configure_ac=configure.in
+fi
+
+case "$1" in
+--run)
+  # Try to run requested program, and just exit if it succeeds.
+  run=
+  shift
+  "$@" && exit 0
+  ;;
+esac
+
+# If it does not exist, or fails to run (possibly an outdated version),
+# try to emulate it.
 case "$1" in
 
   -h|--h|--he|--hel|--help)
@@ -35,6 +61,7 @@ error status if there is no known handling for PROGRAM.
 Options:
   -h, --help      display this help and exit
   -v, --version   output version information and exit
+  --run           try to run the given command, and emulate it if it fails
 
 Supported PROGRAM values:
   aclocal      touch file \`aclocal.m4'
@@ -43,13 +70,15 @@ Supported PROGRAM values:
   automake     touch all \`Makefile.in' files
   bison        create \`y.tab.[ch]', if possible, from existing .[ch]
   flex         create \`lex.yy.c', if possible, from existing .c
+  help2man     touch the output file
   lex          create \`lex.yy.c', if possible, from existing .c
   makeinfo     touch the output file
+  tar          try tar, gnutar, gtar, then tar without non-portable flags
   yacc         create \`y.tab.[ch]', if possible, from existing .[ch]"
     ;;
 
   -v|--v|--ve|--ver|--vers|--versi|--versio|--version)
-    echo "missing - GNU libit 0.0"
+    echo "missing 0.3 - GNU automake"
     ;;
 
   -*)
@@ -61,7 +90,7 @@ Supported PROGRAM values:
   aclocal)
     echo 1>&2 "\
 WARNING: \`$1' is missing on your system.  You should only need it if
-         you modified \`acinclude.m4' or \`configure.in'.  You might want
+         you modified \`acinclude.m4' or \`${configure_ac}'.  You might want
          to install the \`Automake' and \`Perl' packages.  Grab them from
          any GNU archive site."
     touch aclocal.m4
@@ -70,7 +99,7 @@ WARNING: \`$1' is missing on your system.  You should only need it if
   autoconf)
     echo 1>&2 "\
 WARNING: \`$1' is missing on your system.  You should only need it if
-         you modified \`configure.in'.  You might want to install the
+         you modified \`${configure_ac}'.  You might want to install the
          \`Autoconf' and \`GNU m4' packages.  Grab them from any GNU
          archive site."
     touch configure
@@ -79,29 +108,31 @@ WARNING: \`$1' is missing on your system.  You should only need it if
   autoheader)
     echo 1>&2 "\
 WARNING: \`$1' is missing on your system.  You should only need it if
-         you modified \`acconfig.h' or \`configure.in'.  You might want
+         you modified \`acconfig.h' or \`${configure_ac}'.  You might want
          to install the \`Autoconf' and \`GNU m4' packages.  Grab them
          from any GNU archive site."
-    files=`sed -n 's/^[ ]*A[CM]_CONFIG_HEADER([^):]*:\([^)]*\)).*/\1/p' configure.in`
-    if test -z "$files"; then
-      files=`sed -n 's/^[ ]*A[CM]_CONFIG_HEADER(\([^):]*\)).*/\1/p' configure.in`
-      test -z "$files" || files="$files.in"
-    else
-      files=`echo "$files" | sed -e 's/:/ /g'`
-    fi
-    test -z "$files" && files="config.h.in"
-    touch $files
+    files=`sed -n 's/^[ ]*A[CM]_CONFIG_HEADER(\([^)]*\)).*/\1/p' ${configure_ac}`
+    test -z "$files" && files="config.h"
+    touch_files=
+    for f in $files; do
+      case "$f" in
+      *:*) touch_files="$touch_files "`echo "$f" |
+				       sed -e 's/^[^:]*://' -e 's/:.*//'`;;
+      *) touch_files="$touch_files $f.in";;
+      esac
+    done
+    touch $touch_files
     ;;
 
   automake)
     echo 1>&2 "\
 WARNING: \`$1' is missing on your system.  You should only need it if
-         you modified \`Makefile.am', \`acinclude.m4' or \`configure.in'.
+         you modified \`Makefile.am', \`acinclude.m4' or \`${configure_ac}'.
          You might want to install the \`Automake' and \`Perl' packages.
          Grab them from any GNU archive site."
-    find . -type f -name Makefile.am -print \
-      | sed 's/^\(.*\).am$/touch \1.in/' \
-      | sh
+    find . -type f -name Makefile.am -print |
+	   sed 's/\.am$/.in/' |
+	   while read f; do touch "$f"; done
     ;;
 
   bison|yacc)
@@ -157,7 +188,32 @@ WARNING: \`$1' is missing on your system.  You should only need it if
     fi
     ;;
 
+  help2man)
+    echo 1>&2 "\
+WARNING: \`$1' is missing on your system.  You should only need it if
+	 you modified a dependency of a manual page.  You may need the
+	 \`Help2man' package in order for those modifications to take
+	 effect.  You can get \`Help2man' from any GNU archive site."
+
+    file=`echo "$*" | sed -n 's/.*-o \([^ ]*\).*/\1/p'`
+    if test -z "$file"; then
+	file=`echo "$*" | sed -n 's/.*--output=\([^ ]*\).*/\1/p'`
+    fi
+    if [ -f "$file" ]; then
+	touch $file
+    else
+	test -z "$file" || exec >$file
+	echo ".ab help2man is required to generate this page"
+	exit 1
+    fi
+    ;;
+
   makeinfo)
+    if test -z "$run" && (makeinfo --version) > /dev/null 2>&1; then
+       # We have makeinfo, but it failed.
+       exit 1
+    fi
+
     echo 1>&2 "\
 WARNING: \`$1' is missing on your system.  You should only need it if
          you modified a \`.texi' or \`.texinfo' file, or any other file
@@ -173,6 +229,45 @@ WARNING: \`$1' is missing on your system.  You should only need it if
     touch $file
     ;;
 
+  tar)
+    shift
+    if test -n "$run"; then
+      echo 1>&2 "ERROR: \`tar' requires --run"
+      exit 1
+    fi
+
+    # We have already tried tar in the generic part.
+    # Look for gnutar/gtar before invocation to avoid ugly error
+    # messages.
+    if (gnutar --version > /dev/null 2>&1); then
+       gnutar ${1+"$@"} && exit 0
+    fi
+    if (gtar --version > /dev/null 2>&1); then
+       gtar ${1+"$@"} && exit 0
+    fi
+    firstarg="$1"
+    if shift; then
+	case "$firstarg" in
+	*o*)
+	    firstarg=`echo "$firstarg" | sed s/o//`
+	    tar "$firstarg" ${1+"$@"} && exit 0
+	    ;;
+	esac
+	case "$firstarg" in
+	*h*)
+	    firstarg=`echo "$firstarg" | sed s/h//`
+	    tar "$firstarg" ${1+"$@"} && exit 0
+	    ;;
+	esac
+    fi
+
+    echo 1>&2 "\
+WARNING: I can't seem to be able to run \`tar' with the given arguments.
+         You may want to install GNU tar or Free paxutils, or check the
+         command line arguments."
+    exit 1
+    ;;
+
   *)
     echo 1>&2 "\
 WARNING: \`$1' is needed, and you do not seem to have it handy on your
diff --git a/mkinstalldirs b/mkinstalldirs
index d73a061..12ea679 100755
--- a/mkinstalldirs
+++ b/mkinstalldirs
@@ -4,7 +4,7 @@
 # Created: 1993-05-16
 # Public domain
 
-# $Id: mkinstalldirs,v 1.1 1998/10/08 14:23:56 jbj Exp $
+# $Id: mkinstalldirs,v 1.2 2002/02/10 21:14:38 jbj Exp $
 
 errstatus=0
 
@@ -22,7 +22,7 @@ do
      esac
 
      if test ! -d "$pathcomp"; then
-        echo "mkdir $pathcomp" 1>&2
+        echo "mkdir $pathcomp"
 
         mkdir "$pathcomp" || lasterr=$?
 
diff --git a/po/ChangeLog b/po/ChangeLog
new file mode 100644
index 0000000..bc697cb
--- /dev/null
+++ b/po/ChangeLog
@@ -0,0 +1,6 @@
+2002-02-10  gettextize  <bug-gnu-utils@gnu.org>
+
+	* Makefile.in.in: Upgrade to gettext-0.10.40.
+	* cat-id-tbl.c: Remove file.
+	* stamp-cat-id: Remove file.
+
diff --git a/po/Makefile.in.in b/po/Makefile.in.in
index a11d0bb..32b7376 100644
--- a/po/Makefile.in.in
+++ b/po/Makefile.in.in
@@ -1,5 +1,5 @@
 # Makefile for program source directory in GNU NLS utilities package.
-# Copyright (C) 1995, 1996, 1997 by Ulrich Drepper <drepper@gnu.ai.mit.edu>
+# Copyright (C) 1995-1997, 2000, 2001 by Ulrich Drepper <drepper@gnu.ai.mit.edu>
 #
 # This file file be copied and used freely without restrictions.  It can
 # be used in projects which are not available under the GNU Public License
@@ -9,6 +9,10 @@
 PACKAGE = @PACKAGE@
 VERSION = @VERSION@
 
+# These two variables depend on the location of this directory.
+subdir = po
+top_builddir = ..
+
 SHELL = /bin/sh
 @SET_MAKE@
 
@@ -18,22 +22,20 @@ VPATH = @srcdir@
 
 prefix = @prefix@
 exec_prefix = @exec_prefix@
-datadir = $(prefix)/@DATADIRNAME@
+datadir = @datadir@
 localedir = $(datadir)/locale
-gnulocaledir = $(prefix)/share/locale
-gettextsrcdir = $(prefix)/share/gettext/po
-subdir = po
+gettextsrcdir = $(datadir)/gettext/po
 
 INSTALL = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
-MKINSTALLDIRS = $(top_srcdir)/@MKINSTALLDIRS@
+MKINSTALLDIRS = @MKINSTALLDIRS@
+mkinstalldirs = $(SHELL) `case "$(MKINSTALLDIRS)" in /*) echo "$(MKINSTALLDIRS)" ;; *) echo "$(top_builddir)/$(MKINSTALLDIRS)" ;; esac`
 
 CC = @CC@
-GENCAT = @GENCAT@
-GMSGFMT = PATH=../intl:$$PATH @GMSGFMT@
+GMSGFMT = @GMSGFMT@
 MSGFMT = @MSGFMT@
-XGETTEXT = PATH=../intl:$$PATH @XGETTEXT@
-MSGMERGE = PATH=../intl:$$PATH msgmerge
+XGETTEXT = @XGETTEXT@
+MSGMERGE = msgmerge
 
 DEFS = @DEFS@
 CFLAGS = @CFLAGS@
@@ -43,20 +45,17 @@ INCLUDES = -I.. -I$(top_srcdir)/intl
 
 COMPILE = $(CC) -c $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS) $(XCFLAGS)
 
-SOURCES = cat-id-tbl.c
 POFILES = @POFILES@
 GMOFILES = @GMOFILES@
-DISTFILES = Makefile.in.in POTFILES.in $(PACKAGE).pot \
-stamp-cat-id $(POFILES) $(GMOFILES) $(SOURCES)
+DISTFILES = ChangeLog Makefile.in.in POTFILES.in $(PACKAGE).pot \
+$(POFILES) $(GMOFILES)
 
 POTFILES = \
 
 CATALOGS = @CATALOGS@
-CATOBJEXT = @CATOBJEXT@
-INSTOBJEXT = @INSTOBJEXT@
 
 .SUFFIXES:
-.SUFFIXES: .c .o .po .pox .gmo .mo .msg .cat
+.SUFFIXES: .c .o .po .pox .gmo .mo
 
 .c.o:
 	$(COMPILE) $<
@@ -70,98 +69,55 @@ INSTOBJEXT = @INSTOBJEXT@
 
 .po.gmo:
 	file=$(srcdir)/`echo $* | sed 's,.*/,,'`.gmo \
-	  && rm -f $$file && $(GMSGFMT) -o $$file $<
-
-.po.cat:
-	sed -f ../intl/po2msg.sed < $< > $*.msg \
-	  && rm -f $@ && $(GENCAT) $@ $*.msg
+	  && rm -f $$file && $(GMSGFMT) --statistics -o $$file $<
 
 
 all: all-@USE_NLS@
 
-all-yes: cat-id-tbl.c $(CATALOGS)
+all-yes: $(CATALOGS)
 all-no:
 
-$(srcdir)/$(PACKAGE).pot: $(POTFILES)
+# Note: Target 'all' must not depend on target '$(srcdir)/$(PACKAGE).pot',
+# otherwise packages like GCC can not be built if only parts of the source
+# have been downloaded.
+
+$(srcdir)/$(PACKAGE).pot: $(POTFILES) $(srcdir)/POTFILES.in
 	$(XGETTEXT) --default-domain=$(PACKAGE) --directory=$(top_srcdir) \
-	  --add-comments --keyword=_ --keyword=N_ --keyword=POPT_ \
+	  --add-comments --keyword=_ --keyword=N_ \
 	  --files-from=$(srcdir)/POTFILES.in \
 	&& test ! -f $(PACKAGE).po \
 	   || ( rm -f $(srcdir)/$(PACKAGE).pot \
 		&& mv $(PACKAGE).po $(srcdir)/$(PACKAGE).pot )
 
-$(srcdir)/cat-id-tbl.c: stamp-cat-id; @:
-$(srcdir)/stamp-cat-id: $(PACKAGE).pot
-	rm -f cat-id-tbl.tmp
-	sed -f ../intl/po2tbl.sed $(srcdir)/$(PACKAGE).pot \
-		| sed -e "s/@PACKAGE NAME@/$(PACKAGE)/" > cat-id-tbl.tmp
-	if cmp -s cat-id-tbl.tmp $(srcdir)/cat-id-tbl.c; then \
-	  rm cat-id-tbl.tmp; \
-	else \
-	  echo cat-id-tbl.c changed; \
-	  rm -f $(srcdir)/cat-id-tbl.c; \
-	  mv cat-id-tbl.tmp $(srcdir)/cat-id-tbl.c; \
-	fi
-	cd $(srcdir) && rm -f stamp-cat-id && echo timestamp > stamp-cat-id
-
 
 install: install-exec install-data
 install-exec:
 install-data: install-data-@USE_NLS@
-install-data-no: all
-install-data-yes: all
-	if test -x "$(MKINSTALLDIRS)"; then \
-	  $(MKINSTALLDIRS) $(DESTDIR)$(datadir); \
+	if test "$(PACKAGE)" = "gettext"; then \
+	  $(mkinstalldirs) $(DESTDIR)$(gettextsrcdir); \
+	  $(INSTALL_DATA) $(srcdir)/Makefile.in.in \
+			  $(DESTDIR)$(gettextsrcdir)/Makefile.in.in; \
 	else \
-	  $(SHELL) $(top_srcdir)/mkinstalldirs $(DESTDIR)$(datadir); \
+	  : ; \
 	fi
+install-data-no: all
+install-data-yes: all
+	$(mkinstalldirs) $(DESTDIR)$(datadir)
 	@catalogs='$(CATALOGS)'; \
 	for cat in $$catalogs; do \
 	  cat=`basename $$cat`; \
-	  case "$$cat" in \
-	    *.gmo) destdir=$(DESTDIR)$(gnulocaledir);; \
-	    *)     destdir=$(DESTDIR)$(localedir);; \
-	  esac; \
-	  lang=`echo $$cat | sed 's/\$(CATOBJEXT)$$//'`; \
-	  dir=$$destdir/$$lang/LC_MESSAGES; \
-	  if test -r "$(MKINSTALLDIRS)"; then \
-	    $(MKINSTALLDIRS) $$dir; \
-	  else \
-	    $(SHELL) $(top_srcdir)/mkinstalldirs $$dir; \
-	  fi; \
+	  lang=`echo $$cat | sed 's/\.gmo$$//'`; \
+	  dir=$(localedir)/$$lang/LC_MESSAGES; \
+	  $(mkinstalldirs) $(DESTDIR)$$dir; \
 	  if test -r $$cat; then \
-	    $(INSTALL_DATA) $$cat $$dir/$(PACKAGE)$(INSTOBJEXT); \
-	    echo "installing $$cat as $$dir/$(PACKAGE)$(INSTOBJEXT)"; \
+	    $(INSTALL_DATA) $$cat $(DESTDIR)$$dir/$(PACKAGE).mo; \
+	    echo "installing $$cat as $(DESTDIR)$$dir/$(PACKAGE).mo"; \
 	  else \
-	    $(INSTALL_DATA) $(srcdir)/$$cat $$dir/$(PACKAGE)$(INSTOBJEXT); \
+	    $(INSTALL_DATA) $(srcdir)/$$cat $(DESTDIR)$$dir/$(PACKAGE).mo; \
 	    echo "installing $(srcdir)/$$cat as" \
-		 "$$dir/$(PACKAGE)$(INSTOBJEXT)"; \
-	  fi; \
-	  if test -r $$cat.m; then \
-	    $(INSTALL_DATA) $$cat.m $$dir/$(PACKAGE)$(INSTOBJEXT).m; \
-	    echo "installing $$cat.m as $$dir/$(PACKAGE)$(INSTOBJEXT).m"; \
-	  else \
-	    if test -r $(srcdir)/$$cat.m ; then \
-	      $(INSTALL_DATA) $(srcdir)/$$cat.m \
-		$$dir/$(PACKAGE)$(INSTOBJEXT).m; \
-	      echo "installing $(srcdir)/$$cat as" \
-		   "$$dir/$(PACKAGE)$(INSTOBJEXT).m"; \
-	    else \
-	      true; \
-	    fi; \
+		 "$(DESTDIR)$$dir/$(PACKAGE).mo"; \
 	  fi; \
 	done
-	if test "$(PACKAGE)" = "gettext"; then \
-	  if test -x "$(MKINSTALLDIRS)"; then \
-	    $(MKINSTALLDIRS) $(DESTDIR)$(gettextsrcdir); \
-	  else \
-	    $(SHELL) $(top_srcdir)/mkinstalldirs $(DESTDIR)$(gettextsrcdir); \
-	  fi; \
-	  $(INSTALL_DATA) $(srcdir)/Makefile.in.in \
-			  $(DESTDIR)$(gettextsrcdir)/Makefile.in.in; \
-	else \
-	  : ; \
-	fi
 
 # Define this as empty until I found a useful application.
 installcheck:
@@ -170,88 +126,68 @@ uninstall:
 	catalogs='$(CATALOGS)'; \
 	for cat in $$catalogs; do \
 	  cat=`basename $$cat`; \
-	  lang=`echo $$cat | sed 's/\$(CATOBJEXT)$$//'`; \
-	  rm -f $(DESTDIR)$(localedir)/$$lang/LC_MESSAGES/$(PACKAGE)$(INSTOBJEXT); \
-	  rm -f $(DESTDIR)$(localedir)/$$lang/LC_MESSAGES/$(PACKAGE)$(INSTOBJEXT).m; \
-	  rm -f $(DESTDIR)$(gnulocaledir)/$$lang/LC_MESSAGES/$(PACKAGE)$(INSTOBJEXT); \
-	  rm -f $(DESTDIR)$(gnulocaledir)/$$lang/LC_MESSAGES/$(PACKAGE)$(INSTOBJEXT).m; \
+	  lang=`echo $$cat | sed 's/\.gmo$$//'`; \
+	  rm -f $(DESTDIR)$(localedir)/$$lang/LC_MESSAGES/$(PACKAGE).mo; \
 	done
+	if test "$(PACKAGE)" = "gettext"; then \
+	  rm -f $(DESTDIR)$(gettextsrcdir)/Makefile.in.in; \
+	else \
+	  : ; \
+	fi
 
 check: all
 
-cat-id-tbl.o: ../intl/libgettext.h
-
 dvi info tags TAGS ID:
 
 mostlyclean:
-	rm -f core core.* *.pox $(PACKAGE).po *.old.po cat-id-tbl.tmp
+	rm -f core core.* *.pox $(PACKAGE).po *.new.po
 	rm -fr *.o
 
 clean: mostlyclean
 
 distclean: clean
-	rm -f Makefile Makefile.in POTFILES *.mo *.msg *.cat *.cat.m
+	rm -f Makefile Makefile.in POTFILES *.mo
 
 maintainer-clean: distclean
 	@echo "This command is intended for maintainers to use;"
 	@echo "it deletes files that may require special tools to rebuild."
 	rm -f $(GMOFILES)
 
-distdir = ../$(PACKAGE)-$(VERSION)/$(subdir)
-dist distdir: update-po $(DISTFILES)
+distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir)
+dist distdir:
+	$(MAKE) update-po
+	@$(MAKE) dist2
+# This is a separate target because 'update-po' must be executed before.
+dist2: $(DISTFILES)
 	dists="$(DISTFILES)"; \
 	for file in $$dists; do \
-	  ln $(srcdir)/$$file $(distdir) 2> /dev/null \
-	    || cp -p $(srcdir)/$$file $(distdir); \
+	  if test -f $$file; then dir=.; else dir=$(srcdir); fi; \
+	  cp -p $$dir/$$file $(distdir); \
 	done
 
 update-po: Makefile
 	$(MAKE) $(PACKAGE).pot
-	PATH=`pwd`/../intl:$$PATH; \
+	if test "$(PACKAGE)" = "gettext"; then PATH=`pwd`/../src:$$PATH; fi; \
 	cd $(srcdir); \
-	catalogs='$(CATALOGS)'; \
+	catalogs='$(GMOFILES)'; \
 	for cat in $$catalogs; do \
 	  cat=`basename $$cat`; \
-	  lang=`echo $$cat | sed 's/\$(CATOBJEXT)$$//'`; \
-	  mv $$lang.po $$lang.old.po; \
+	  lang=`echo $$cat | sed 's/\.gmo$$//'`; \
 	  echo "$$lang:"; \
-	  if $(MSGMERGE) $$lang.old.po $(PACKAGE).pot -o $$lang.po; then \
-	    rm -f $$lang.old.po; \
+	  if $(MSGMERGE) $$lang.po $(PACKAGE).pot -o $$lang.new.po; then \
+	    mv -f $$lang.new.po $$lang.po; \
 	  else \
 	    echo "msgmerge for $$cat failed!"; \
-	    rm -f $$lang.po; \
-	    mv $$lang.old.po $$lang.po; \
+	    rm -f $$lang.new.po; \
 	  fi; \
 	done
+	$(MAKE) update-gmo
 
-refresh-po: Makefile
-	catalogs='$(CATALOGS)'; \
-	for cat in $$catalogs; do \
-		lang=`echo $$cat | sed 's/\$(CATOBJEXT)$$//'`; \
-		if $(MSGMERGE) $$lang.po $(PACKAGE).pot > $$lang.pot ; then \
-			echo "$(MSGMERGE) of $$lang succeeded" ; \
-			mv -f $$lang.pot $$lang.po ; \
-		else \
-			echo "$(MSGMERGE) of $$lang failed" ; \
-			rm -f $$lang.pot ; \
-		fi \
-	done
+update-gmo: Makefile $(GMOFILES)
+	@:
 
-POTFILES: POTFILES.in
-	( if test 'x$(srcdir)' != 'x.'; then \
-	    posrcprefix='$(top_srcdir)/'; \
-	  else \
-	    posrcprefix="../"; \
-	  fi; \
-	  rm -f $@-t $@ \
-	    && (sed -e '/^#/d' -e '/^[ 	]*$$/d' \
-		    -e "s@.*@	$$posrcprefix& \\\\@" < $(srcdir)/$@.in \
-		| sed -e '$$s/\\$$//') > $@-t \
-	    && chmod a-w $@-t \
-	    && mv $@-t $@ )
-
-Makefile: Makefile.in.in ../config.status POTFILES
-	cd .. \
+Makefile: Makefile.in.in $(top_builddir)/config.status POTFILES.in
+	cd $(top_builddir) \
 	  && CONFIG_FILES=$(subdir)/$@.in CONFIG_HEADERS= \
 	       $(SHELL) ./config.status
 
-- 
Gitee


From f7e83399d29abd3a4c41bede047851e0ba7049cc Mon Sep 17 00:00:00 2001
From: Jeff Johnson <n3npq@mac.com>
Date: Wed, 6 Mar 2002 23:18:09 +0000
Subject: [PATCH 333/667] - add header DSA signature.

---
 acconfig.h | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/acconfig.h b/acconfig.h
index fc84c34..591a9c1 100644
--- a/acconfig.h
+++ b/acconfig.h
@@ -18,12 +18,6 @@
    Leave the following blank line there!!  Autoheader needs it.  */
 
 
-/* Define to the name of the distribution.  */
-#undef PACKAGE
-
-/* Define to the version of the distribution.  */
-#undef VERSION
-
 /* Define to 1 if ANSI function prototypes are usable.  */
 #undef PROTOTYPES
 
-- 
Gitee


From d788aff629f9653525d07c175a8aab563bf13822 Mon Sep 17 00:00:00 2001
From: Jeff Johnson <n3npq@mac.com>
Date: Tue, 12 Mar 2002 20:28:31 +0000
Subject: [PATCH 334/667] - permit --dbpath and --root with signature (i.e.
 --import) modes.

---
 popthelp.c | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/popthelp.c b/popthelp.c
index 17adc6f..07fae09 100644
--- a/popthelp.c
+++ b/popthelp.c
@@ -247,6 +247,7 @@ static void singleOptionHelp(FILE * fp, int maxLeftCol,
 	    case POPT_ARG_NONE:
 		break;
 	    case POPT_ARG_VAL:
+#ifdef	NOTNOW	/* XXX pug ugly nerdy output */
 	    {	long aLong = opt->val;
 		int ops = (opt->argInfo & POPT_ARGFLAG_LOGICALOPS);
 		int negate = (opt->argInfo & POPT_ARGFLAG_NOT);
@@ -274,7 +275,9 @@ static void singleOptionHelp(FILE * fp, int maxLeftCol,
 		le += sprintf(le, (ops ? "0x%lx" : "%ld"), aLong);
 		/*@=formatconst@*/
 		*le++ = ']';
-	    }	break;
+	    }
+#endif
+		break;
 	    case POPT_ARG_INT:
 	    case POPT_ARG_LONG:
 	    case POPT_ARG_FLOAT:
-- 
Gitee


From 0e237967c2ed0722cdfbdb2e23a64cd89b85d3de Mon Sep 17 00:00:00 2001
From: Jeff Johnson <n3npq@mac.com>
Date: Wed, 13 Mar 2002 18:00:16 +0000
Subject: [PATCH 335/667] Split transaction set handling into separate file,
 prepatory to devising some toy access methods.

---
 po/cs.po           | 131 +++++++++++++++++++--------------------------
 po/da.po           | 131 ++++++++++++++++++---------------------------
 po/de.po           |  91 +------------------------------
 po/es.po           | 131 ++++++++++++++++++---------------------------
 po/eu_ES.po        |  91 +------------------------------
 po/fi.po           |  91 +------------------------------
 po/fr.po           |  91 +------------------------------
 po/gl.po           | 131 ++++++++++++++++++---------------------------
 po/hu.po           |  91 +------------------------------
 po/id.po           |  91 +------------------------------
 po/is.po           | 131 +++++++++++++++++++--------------------------
 po/it.po           |  91 +------------------------------
 po/ja.po           |  91 +------------------------------
 po/ko.po           | 131 +++++++++++++++++++--------------------------
 po/no.po           | 131 +++++++++++++++++++--------------------------
 po/pl.po           |  91 +------------------------------
 po/popt.pot        |  91 +------------------------------
 po/pt.po           | 131 ++++++++++++++++++---------------------------
 po/pt_BR.po        |  91 +------------------------------
 po/ro.po           | 106 +++++++++---------------------------
 po/ru.po           | 131 +++++++++++++++++++--------------------------
 po/sk.po           |  91 +------------------------------
 po/sl.po           |  91 +------------------------------
 po/sr.po           |  91 +------------------------------
 po/sv.po           | 131 +++++++++++++++++++--------------------------
 po/tr.po           | 131 ++++++++++++++++++---------------------------
 po/uk.po           |  91 +------------------------------
 po/wa.po           |  91 +------------------------------
 po/zh.po           |  91 +------------------------------
 po/zh_CN.GB2312.po |  91 +------------------------------
 30 files changed, 622 insertions(+), 2563 deletions(-)

diff --git a/po/cs.po b/po/cs.po
index 994ee16..6a09338 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.3\n"
-"POT-Creation-Date: 2002-01-18 16:12-0500\n"
+"POT-Creation-Date: 2002-03-13 12:58-0500\n"
 "PO-Revision-Date: 2001-07-24 00:03+0100\n"
 "Last-Translator: Milan Kerslager <kerslage@linux.cz>\n"
 "Language-Team: Czech <cs@li.org>\n"
@@ -9,103 +9,80 @@ msgstr ""
 "Content-Type: text/plain; charset=iso-8859-2\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: popt.c:29
-msgid "unknown errno"
-msgstr "nezn�m� ��slo chyby"
+#: popthelp.c:53
+msgid "Show this help message"
+msgstr "Vyp��e tuto n�pov�du"
 
-#: popt.c:917
-#, c-format
-msgid "option type (%d) not implemented in popt\n"
-msgstr "volba (%d) nen� v popt implementov�na\n"
+#: popthelp.c:54
+msgid "Display brief usage message"
+msgstr "Vyp��e kr�tk� n�vod k pou�it�"
 
-#: popt.c:1132
-msgid "missing argument"
-msgstr "chyb� argument"
+#: popthelp.c:57
+msgid "Display option defaults in message"
+msgstr "Zobrazit implicitn� volby ve zpr�v�"
 
-#: popt.c:1134
-msgid "unknown option"
-msgstr "nezn�m� volba"
+#~ msgid "unknown errno"
+#~ msgstr "nezn�m� ��slo chyby"
 
-#: popt.c:1136
-msgid "mutually exclusive logical operations requested"
-msgstr "po�adov�ny vz�jemn� v�lu�n� logick� operace"
+#~ msgid "option type (%d) not implemented in popt\n"
+#~ msgstr "volba (%d) nen� v popt implementov�na\n"
 
-#: popt.c:1138
-msgid "opt->arg should not be NULL"
-msgstr "opt->arg nesm� b�t NULL"
+#~ msgid "missing argument"
+#~ msgstr "chyb� argument"
 
-#: popt.c:1140
-msgid "aliases nested too deeply"
-msgstr "aliasy vno�en� p��li� hluboko"
+#~ msgid "unknown option"
+#~ msgstr "nezn�m� volba"
 
-#: popt.c:1142
-msgid "error in parameter quoting"
-msgstr "chyba v quotov�n� parametr�"
+#~ msgid "mutually exclusive logical operations requested"
+#~ msgstr "po�adov�ny vz�jemn� v�lu�n� logick� operace"
 
-#: popt.c:1144
-msgid "invalid numeric value"
-msgstr "chybn� numerick� hodnota"
+#~ msgid "opt->arg should not be NULL"
+#~ msgstr "opt->arg nesm� b�t NULL"
 
-#: popt.c:1146
-msgid "number too large or too small"
-msgstr "��slo je p��li� velk� nebo p��li� mal�"
+#~ msgid "aliases nested too deeply"
+#~ msgstr "aliasy vno�en� p��li� hluboko"
 
-#: popt.c:1148
-msgid "memory allocation failed"
-msgstr "selhala alokace pam�ti"
+#~ msgid "error in parameter quoting"
+#~ msgstr "chyba v quotov�n� parametr�"
 
-#: popt.c:1152
-msgid "unknown error"
-msgstr "nezn�m� chyba"
+#~ msgid "invalid numeric value"
+#~ msgstr "chybn� numerick� hodnota"
 
-#: popthelp.c:53
-msgid "Show this help message"
-msgstr "Vyp��e tuto n�pov�du"
+#~ msgid "number too large or too small"
+#~ msgstr "��slo je p��li� velk� nebo p��li� mal�"
 
-#: popthelp.c:54
-msgid "Display brief usage message"
-msgstr "Vyp��e kr�tk� n�vod k pou�it�"
+#~ msgid "memory allocation failed"
+#~ msgstr "selhala alokace pam�ti"
 
-#: popthelp.c:57
-msgid "Display option defaults in message"
-msgstr "Zobrazit implicitn� volby ve zpr�v�"
+#~ msgid "unknown error"
+#~ msgstr "nezn�m� chyba"
 
-#: popthelp.c:99
-msgid "NONE"
-msgstr "NONE"
+#~ msgid "NONE"
+#~ msgstr "NONE"
 
-#: popthelp.c:100
-msgid "VAL"
-msgstr "VAL"
+#~ msgid "VAL"
+#~ msgstr "VAL"
 
-#: popthelp.c:101
-msgid "INT"
-msgstr "INT"
+#~ msgid "INT"
+#~ msgstr "INT"
 
-#: popthelp.c:102
-msgid "LONG"
-msgstr "LONG"
+#~ msgid "LONG"
+#~ msgstr "LONG"
 
-#: popthelp.c:103
-msgid "STRING"
-msgstr "STRING"
+#~ msgid "STRING"
+#~ msgstr "STRING"
 
-#: popthelp.c:104
-msgid "FLOAT"
-msgstr "FLOAT"
+#~ msgid "FLOAT"
+#~ msgstr "FLOAT"
 
-#: popthelp.c:105
-msgid "DOUBLE"
-msgstr "DOUBLE"
+#~ msgid "DOUBLE"
+#~ msgstr "DOUBLE"
 
-#: popthelp.c:106
-msgid "ARG"
-msgstr "ARG"
+#~ msgid "ARG"
+#~ msgstr "ARG"
 
-#: popthelp.c:459
-msgid "Usage:"
-msgstr "Pou�it�:"
+#~ msgid "Usage:"
+#~ msgstr "Pou�it�:"
 
-#: popthelp.c:481
-msgid "[OPTION...]"
-msgstr "[VOLBY...]"
+#~ msgid "[OPTION...]"
+#~ msgstr "[VOLBY...]"
diff --git a/po/da.po b/po/da.po
index a3dd547..b09e434 100644
--- a/po/da.po
+++ b/po/da.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.3\n"
-"POT-Creation-Date: 2002-01-18 16:12-0500\n"
+"POT-Creation-Date: 2002-03-13 12:58-0500\n"
 "PO-Revision-Date: Sun Jan 21 2001 04:30:32+0200\n"
 "Last-Translator: Martin Hansen <mah@k64.dk>\n"
 "Language-Team: Dansk <dansk@klid.dk>\n"
@@ -10,55 +10,6 @@ msgstr ""
 "Content-Transfer-Encoding: 8-bit\n"
 "X-Generator: KTranslator v 0.6.0\n"
 
-#: popt.c:29
-msgid "unknown errno"
-msgstr "ukendt fejlnr."
-
-#: popt.c:917
-#, c-format
-msgid "option type (%d) not implemented in popt\n"
-msgstr "tilvalgstype (%d) er ikke implementeret i popt\n"
-
-#: popt.c:1132
-msgid "missing argument"
-msgstr "mangler argument"
-
-#: popt.c:1134
-msgid "unknown option"
-msgstr "ukendt tilvalg"
-
-#: popt.c:1136
-msgid "mutually exclusive logical operations requested"
-msgstr "de �nskede handlinger udelukker hinanden"
-
-#: popt.c:1138
-msgid "opt->arg should not be NULL"
-msgstr ""
-
-#: popt.c:1140
-msgid "aliases nested too deeply"
-msgstr "aliaser er for dybt indlejret"
-
-#: popt.c:1142
-msgid "error in parameter quoting"
-msgstr "fejl i parameter citering"
-
-#: popt.c:1144
-msgid "invalid numeric value"
-msgstr "ugyldig numerisk v�rdi"
-
-#: popt.c:1146
-msgid "number too large or too small"
-msgstr "nummer for stort, eller for lille"
-
-#: popt.c:1148
-msgid "memory allocation failed"
-msgstr ""
-
-#: popt.c:1152
-msgid "unknown error"
-msgstr "ukendt fejl"
-
 #: popthelp.c:53
 msgid "Show this help message"
 msgstr "Vis denne hj�lpemeddelelse"
@@ -72,42 +23,62 @@ msgstr "Vis kortfattet brugsanvisning"
 msgid "Display option defaults in message"
 msgstr "Vis kortfattet brugsanvisning"
 
-#: popthelp.c:99
-msgid "NONE"
-msgstr "INGEN"
+#~ msgid "unknown errno"
+#~ msgstr "ukendt fejlnr."
+
+#~ msgid "option type (%d) not implemented in popt\n"
+#~ msgstr "tilvalgstype (%d) er ikke implementeret i popt\n"
+
+#~ msgid "missing argument"
+#~ msgstr "mangler argument"
+
+#~ msgid "unknown option"
+#~ msgstr "ukendt tilvalg"
+
+#~ msgid "mutually exclusive logical operations requested"
+#~ msgstr "de �nskede handlinger udelukker hinanden"
+
+#~ msgid "aliases nested too deeply"
+#~ msgstr "aliaser er for dybt indlejret"
+
+#~ msgid "error in parameter quoting"
+#~ msgstr "fejl i parameter citering"
+
+#~ msgid "invalid numeric value"
+#~ msgstr "ugyldig numerisk v�rdi"
+
+#~ msgid "number too large or too small"
+#~ msgstr "nummer for stort, eller for lille"
+
+#~ msgid "unknown error"
+#~ msgstr "ukendt fejl"
+
+#~ msgid "NONE"
+#~ msgstr "INGEN"
 
-#: popthelp.c:100
-msgid "VAL"
-msgstr "VAL"
+#~ msgid "VAL"
+#~ msgstr "VAL"
 
-#: popthelp.c:101
-msgid "INT"
-msgstr "INT"
+#~ msgid "INT"
+#~ msgstr "INT"
 
-#: popthelp.c:102
-msgid "LONG"
-msgstr "LONG"
+#~ msgid "LONG"
+#~ msgstr "LONG"
 
-#: popthelp.c:103
-msgid "STRING"
-msgstr "STRING"
+#~ msgid "STRING"
+#~ msgstr "STRING"
 
-#: popthelp.c:104
-msgid "FLOAT"
-msgstr "FLOAT"
+#~ msgid "FLOAT"
+#~ msgstr "FLOAT"
 
-#: popthelp.c:105
-msgid "DOUBLE"
-msgstr "DOUBLE"
+#~ msgid "DOUBLE"
+#~ msgstr "DOUBLE"
 
-#: popthelp.c:106
-msgid "ARG"
-msgstr "ARG"
+#~ msgid "ARG"
+#~ msgstr "ARG"
 
-#: popthelp.c:459
-msgid "Usage:"
-msgstr "Brug:"
+#~ msgid "Usage:"
+#~ msgstr "Brug:"
 
-#: popthelp.c:481
-msgid "[OPTION...]"
-msgstr "[TILVALG...]"
+#~ msgid "[OPTION...]"
+#~ msgstr "[TILVALG...]"
diff --git a/po/de.po b/po/de.po
index 6cfef98..d9ced64 100644
--- a/po/de.po
+++ b/po/de.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.3\n"
-"POT-Creation-Date: 2002-01-18 16:12-0500\n"
+"POT-Creation-Date: 2002-03-13 12:58-0500\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -14,55 +14,6 @@ msgstr ""
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: ENCODING\n"
 
-#: popt.c:29
-msgid "unknown errno"
-msgstr ""
-
-#: popt.c:917
-#, c-format
-msgid "option type (%d) not implemented in popt\n"
-msgstr ""
-
-#: popt.c:1132
-msgid "missing argument"
-msgstr ""
-
-#: popt.c:1134
-msgid "unknown option"
-msgstr ""
-
-#: popt.c:1136
-msgid "mutually exclusive logical operations requested"
-msgstr ""
-
-#: popt.c:1138
-msgid "opt->arg should not be NULL"
-msgstr ""
-
-#: popt.c:1140
-msgid "aliases nested too deeply"
-msgstr ""
-
-#: popt.c:1142
-msgid "error in parameter quoting"
-msgstr ""
-
-#: popt.c:1144
-msgid "invalid numeric value"
-msgstr ""
-
-#: popt.c:1146
-msgid "number too large or too small"
-msgstr ""
-
-#: popt.c:1148
-msgid "memory allocation failed"
-msgstr ""
-
-#: popt.c:1152
-msgid "unknown error"
-msgstr ""
-
 #: popthelp.c:53
 msgid "Show this help message"
 msgstr ""
@@ -74,43 +25,3 @@ msgstr ""
 #: popthelp.c:57
 msgid "Display option defaults in message"
 msgstr ""
-
-#: popthelp.c:99
-msgid "NONE"
-msgstr ""
-
-#: popthelp.c:100
-msgid "VAL"
-msgstr ""
-
-#: popthelp.c:101
-msgid "INT"
-msgstr ""
-
-#: popthelp.c:102
-msgid "LONG"
-msgstr ""
-
-#: popthelp.c:103
-msgid "STRING"
-msgstr ""
-
-#: popthelp.c:104
-msgid "FLOAT"
-msgstr ""
-
-#: popthelp.c:105
-msgid "DOUBLE"
-msgstr ""
-
-#: popthelp.c:106
-msgid "ARG"
-msgstr ""
-
-#: popthelp.c:459
-msgid "Usage:"
-msgstr ""
-
-#: popthelp.c:481
-msgid "[OPTION...]"
-msgstr ""
diff --git a/po/es.po b/po/es.po
index a450415..7d84d41 100644
--- a/po/es.po
+++ b/po/es.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.3\n"
-"POT-Creation-Date: 2002-01-18 16:12-0500\n"
+"POT-Creation-Date: 2002-03-13 12:58-0500\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Leandro Lucarella <luca@linuxmendoza.org.ar>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -14,55 +14,6 @@ msgstr ""
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: ENCODING\n"
 
-#: popt.c:29
-msgid "unknown errno"
-msgstr "errno desconocido"
-
-#: popt.c:917
-#, c-format
-msgid "option type (%d) not implemented in popt\n"
-msgstr "tipo de opci�n (%d) no implementada en popt\n"
-
-#: popt.c:1132
-msgid "missing argument"
-msgstr "falta argumento"
-
-#: popt.c:1134
-msgid "unknown option"
-msgstr "opci�n desconocida"
-
-#: popt.c:1136
-msgid "mutually exclusive logical operations requested"
-msgstr "requerida operaci�n l�gica mutuamente exclusiva"
-
-#: popt.c:1138
-msgid "opt->arg should not be NULL"
-msgstr ""
-
-#: popt.c:1140
-msgid "aliases nested too deeply"
-msgstr "alias anidados muy profundamente"
-
-#: popt.c:1142
-msgid "error in parameter quoting"
-msgstr "error en cita de par�metros"
-
-#: popt.c:1144
-msgid "invalid numeric value"
-msgstr "valor num�rico inv�lido"
-
-#: popt.c:1146
-msgid "number too large or too small"
-msgstr "n�mero muy largo o muy peque�o"
-
-#: popt.c:1148
-msgid "memory allocation failed"
-msgstr ""
-
-#: popt.c:1152
-msgid "unknown error"
-msgstr "error desconocido"
-
 #: popthelp.c:53
 msgid "Show this help message"
 msgstr "Muestra este mensaje de ayuda"
@@ -76,42 +27,62 @@ msgstr "Indica el modo de uso resumido"
 msgid "Display option defaults in message"
 msgstr "Indica el modo de uso resumido"
 
-#: popthelp.c:99
-msgid "NONE"
-msgstr "NONE"
+#~ msgid "unknown errno"
+#~ msgstr "errno desconocido"
+
+#~ msgid "option type (%d) not implemented in popt\n"
+#~ msgstr "tipo de opci�n (%d) no implementada en popt\n"
+
+#~ msgid "missing argument"
+#~ msgstr "falta argumento"
+
+#~ msgid "unknown option"
+#~ msgstr "opci�n desconocida"
+
+#~ msgid "mutually exclusive logical operations requested"
+#~ msgstr "requerida operaci�n l�gica mutuamente exclusiva"
+
+#~ msgid "aliases nested too deeply"
+#~ msgstr "alias anidados muy profundamente"
+
+#~ msgid "error in parameter quoting"
+#~ msgstr "error en cita de par�metros"
+
+#~ msgid "invalid numeric value"
+#~ msgstr "valor num�rico inv�lido"
+
+#~ msgid "number too large or too small"
+#~ msgstr "n�mero muy largo o muy peque�o"
+
+#~ msgid "unknown error"
+#~ msgstr "error desconocido"
+
+#~ msgid "NONE"
+#~ msgstr "NONE"
 
-#: popthelp.c:100
-msgid "VAL"
-msgstr "VAL"
+#~ msgid "VAL"
+#~ msgstr "VAL"
 
-#: popthelp.c:101
-msgid "INT"
-msgstr "INT"
+#~ msgid "INT"
+#~ msgstr "INT"
 
-#: popthelp.c:102
-msgid "LONG"
-msgstr "LONG"
+#~ msgid "LONG"
+#~ msgstr "LONG"
 
-#: popthelp.c:103
-msgid "STRING"
-msgstr "STRING"
+#~ msgid "STRING"
+#~ msgstr "STRING"
 
-#: popthelp.c:104
-msgid "FLOAT"
-msgstr "FLOAT"
+#~ msgid "FLOAT"
+#~ msgstr "FLOAT"
 
-#: popthelp.c:105
-msgid "DOUBLE"
-msgstr "DOUBLE"
+#~ msgid "DOUBLE"
+#~ msgstr "DOUBLE"
 
-#: popthelp.c:106
-msgid "ARG"
-msgstr "ARG"
+#~ msgid "ARG"
+#~ msgstr "ARG"
 
-#: popthelp.c:459
-msgid "Usage:"
-msgstr "Modo de Uso:"
+#~ msgid "Usage:"
+#~ msgstr "Modo de Uso:"
 
-#: popthelp.c:481
-msgid "[OPTION...]"
-msgstr "[OPCI�N...]"
+#~ msgid "[OPTION...]"
+#~ msgstr "[OPCI�N...]"
diff --git a/po/eu_ES.po b/po/eu_ES.po
index 6cfef98..d9ced64 100644
--- a/po/eu_ES.po
+++ b/po/eu_ES.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.3\n"
-"POT-Creation-Date: 2002-01-18 16:12-0500\n"
+"POT-Creation-Date: 2002-03-13 12:58-0500\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -14,55 +14,6 @@ msgstr ""
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: ENCODING\n"
 
-#: popt.c:29
-msgid "unknown errno"
-msgstr ""
-
-#: popt.c:917
-#, c-format
-msgid "option type (%d) not implemented in popt\n"
-msgstr ""
-
-#: popt.c:1132
-msgid "missing argument"
-msgstr ""
-
-#: popt.c:1134
-msgid "unknown option"
-msgstr ""
-
-#: popt.c:1136
-msgid "mutually exclusive logical operations requested"
-msgstr ""
-
-#: popt.c:1138
-msgid "opt->arg should not be NULL"
-msgstr ""
-
-#: popt.c:1140
-msgid "aliases nested too deeply"
-msgstr ""
-
-#: popt.c:1142
-msgid "error in parameter quoting"
-msgstr ""
-
-#: popt.c:1144
-msgid "invalid numeric value"
-msgstr ""
-
-#: popt.c:1146
-msgid "number too large or too small"
-msgstr ""
-
-#: popt.c:1148
-msgid "memory allocation failed"
-msgstr ""
-
-#: popt.c:1152
-msgid "unknown error"
-msgstr ""
-
 #: popthelp.c:53
 msgid "Show this help message"
 msgstr ""
@@ -74,43 +25,3 @@ msgstr ""
 #: popthelp.c:57
 msgid "Display option defaults in message"
 msgstr ""
-
-#: popthelp.c:99
-msgid "NONE"
-msgstr ""
-
-#: popthelp.c:100
-msgid "VAL"
-msgstr ""
-
-#: popthelp.c:101
-msgid "INT"
-msgstr ""
-
-#: popthelp.c:102
-msgid "LONG"
-msgstr ""
-
-#: popthelp.c:103
-msgid "STRING"
-msgstr ""
-
-#: popthelp.c:104
-msgid "FLOAT"
-msgstr ""
-
-#: popthelp.c:105
-msgid "DOUBLE"
-msgstr ""
-
-#: popthelp.c:106
-msgid "ARG"
-msgstr ""
-
-#: popthelp.c:459
-msgid "Usage:"
-msgstr ""
-
-#: popthelp.c:481
-msgid "[OPTION...]"
-msgstr ""
diff --git a/po/fi.po b/po/fi.po
index 6cfef98..d9ced64 100644
--- a/po/fi.po
+++ b/po/fi.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.3\n"
-"POT-Creation-Date: 2002-01-18 16:12-0500\n"
+"POT-Creation-Date: 2002-03-13 12:58-0500\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -14,55 +14,6 @@ msgstr ""
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: ENCODING\n"
 
-#: popt.c:29
-msgid "unknown errno"
-msgstr ""
-
-#: popt.c:917
-#, c-format
-msgid "option type (%d) not implemented in popt\n"
-msgstr ""
-
-#: popt.c:1132
-msgid "missing argument"
-msgstr ""
-
-#: popt.c:1134
-msgid "unknown option"
-msgstr ""
-
-#: popt.c:1136
-msgid "mutually exclusive logical operations requested"
-msgstr ""
-
-#: popt.c:1138
-msgid "opt->arg should not be NULL"
-msgstr ""
-
-#: popt.c:1140
-msgid "aliases nested too deeply"
-msgstr ""
-
-#: popt.c:1142
-msgid "error in parameter quoting"
-msgstr ""
-
-#: popt.c:1144
-msgid "invalid numeric value"
-msgstr ""
-
-#: popt.c:1146
-msgid "number too large or too small"
-msgstr ""
-
-#: popt.c:1148
-msgid "memory allocation failed"
-msgstr ""
-
-#: popt.c:1152
-msgid "unknown error"
-msgstr ""
-
 #: popthelp.c:53
 msgid "Show this help message"
 msgstr ""
@@ -74,43 +25,3 @@ msgstr ""
 #: popthelp.c:57
 msgid "Display option defaults in message"
 msgstr ""
-
-#: popthelp.c:99
-msgid "NONE"
-msgstr ""
-
-#: popthelp.c:100
-msgid "VAL"
-msgstr ""
-
-#: popthelp.c:101
-msgid "INT"
-msgstr ""
-
-#: popthelp.c:102
-msgid "LONG"
-msgstr ""
-
-#: popthelp.c:103
-msgid "STRING"
-msgstr ""
-
-#: popthelp.c:104
-msgid "FLOAT"
-msgstr ""
-
-#: popthelp.c:105
-msgid "DOUBLE"
-msgstr ""
-
-#: popthelp.c:106
-msgid "ARG"
-msgstr ""
-
-#: popthelp.c:459
-msgid "Usage:"
-msgstr ""
-
-#: popthelp.c:481
-msgid "[OPTION...]"
-msgstr ""
diff --git a/po/fr.po b/po/fr.po
index 6cfef98..d9ced64 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.3\n"
-"POT-Creation-Date: 2002-01-18 16:12-0500\n"
+"POT-Creation-Date: 2002-03-13 12:58-0500\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -14,55 +14,6 @@ msgstr ""
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: ENCODING\n"
 
-#: popt.c:29
-msgid "unknown errno"
-msgstr ""
-
-#: popt.c:917
-#, c-format
-msgid "option type (%d) not implemented in popt\n"
-msgstr ""
-
-#: popt.c:1132
-msgid "missing argument"
-msgstr ""
-
-#: popt.c:1134
-msgid "unknown option"
-msgstr ""
-
-#: popt.c:1136
-msgid "mutually exclusive logical operations requested"
-msgstr ""
-
-#: popt.c:1138
-msgid "opt->arg should not be NULL"
-msgstr ""
-
-#: popt.c:1140
-msgid "aliases nested too deeply"
-msgstr ""
-
-#: popt.c:1142
-msgid "error in parameter quoting"
-msgstr ""
-
-#: popt.c:1144
-msgid "invalid numeric value"
-msgstr ""
-
-#: popt.c:1146
-msgid "number too large or too small"
-msgstr ""
-
-#: popt.c:1148
-msgid "memory allocation failed"
-msgstr ""
-
-#: popt.c:1152
-msgid "unknown error"
-msgstr ""
-
 #: popthelp.c:53
 msgid "Show this help message"
 msgstr ""
@@ -74,43 +25,3 @@ msgstr ""
 #: popthelp.c:57
 msgid "Display option defaults in message"
 msgstr ""
-
-#: popthelp.c:99
-msgid "NONE"
-msgstr ""
-
-#: popthelp.c:100
-msgid "VAL"
-msgstr ""
-
-#: popthelp.c:101
-msgid "INT"
-msgstr ""
-
-#: popthelp.c:102
-msgid "LONG"
-msgstr ""
-
-#: popthelp.c:103
-msgid "STRING"
-msgstr ""
-
-#: popthelp.c:104
-msgid "FLOAT"
-msgstr ""
-
-#: popthelp.c:105
-msgid "DOUBLE"
-msgstr ""
-
-#: popthelp.c:106
-msgid "ARG"
-msgstr ""
-
-#: popthelp.c:459
-msgid "Usage:"
-msgstr ""
-
-#: popthelp.c:481
-msgid "[OPTION...]"
-msgstr ""
diff --git a/po/gl.po b/po/gl.po
index e1ca10e..46d2df4 100644
--- a/po/gl.po
+++ b/po/gl.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.3\n"
-"POT-Creation-Date: 2002-01-18 16:12-0500\n"
+"POT-Creation-Date: 2002-03-13 12:58-0500\n"
 "PO-Revision-Date: 2001-01-17 01:01+0100\n"
 "Last-Translator: Jes�s Bravo �lvarez <jba@pobox.com>\n"
 "Language-Team: Galician <trasno@ceu.fi.udc.es>\n"
@@ -9,55 +9,6 @@ msgstr ""
 "Content-Type: text/plain; charset=iso-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: popt.c:29
-msgid "unknown errno"
-msgstr "errno desco�ecido"
-
-#: popt.c:917
-#, c-format
-msgid "option type (%d) not implemented in popt\n"
-msgstr "tipo de opci�n (%d) non implementada en popt\n"
-
-#: popt.c:1132
-msgid "missing argument"
-msgstr "falta un argumento"
-
-#: popt.c:1134
-msgid "unknown option"
-msgstr "opci�n desco�ecida"
-
-#: popt.c:1136
-msgid "mutually exclusive logical operations requested"
-msgstr "solicit�ronse operaci�ns l�xicas mutuamente exclu�ntes"
-
-#: popt.c:1138
-msgid "opt->arg should not be NULL"
-msgstr ""
-
-#: popt.c:1140
-msgid "aliases nested too deeply"
-msgstr "aliases ani�ados a un nivel demasiado profundo"
-
-#: popt.c:1142
-msgid "error in parameter quoting"
-msgstr "erro nas comi�as do par�metro"
-
-#: popt.c:1144
-msgid "invalid numeric value"
-msgstr "valor num�rico non v�lido"
-
-#: popt.c:1146
-msgid "number too large or too small"
-msgstr "n�mero demasiado grande ou pequeno"
-
-#: popt.c:1148
-msgid "memory allocation failed"
-msgstr ""
-
-#: popt.c:1152
-msgid "unknown error"
-msgstr "erro desco�ecido"
-
 #: popthelp.c:53
 msgid "Show this help message"
 msgstr "Amosar esta mensaxe de axuda"
@@ -71,42 +22,62 @@ msgstr "Amosar brevemente o xeito de utilizaci
 msgid "Display option defaults in message"
 msgstr "Amosar brevemente o xeito de utilizaci�n"
 
-#: popthelp.c:99
-msgid "NONE"
-msgstr "NADA"
+#~ msgid "unknown errno"
+#~ msgstr "errno desco�ecido"
+
+#~ msgid "option type (%d) not implemented in popt\n"
+#~ msgstr "tipo de opci�n (%d) non implementada en popt\n"
+
+#~ msgid "missing argument"
+#~ msgstr "falta un argumento"
+
+#~ msgid "unknown option"
+#~ msgstr "opci�n desco�ecida"
+
+#~ msgid "mutually exclusive logical operations requested"
+#~ msgstr "solicit�ronse operaci�ns l�xicas mutuamente exclu�ntes"
+
+#~ msgid "aliases nested too deeply"
+#~ msgstr "aliases ani�ados a un nivel demasiado profundo"
+
+#~ msgid "error in parameter quoting"
+#~ msgstr "erro nas comi�as do par�metro"
+
+#~ msgid "invalid numeric value"
+#~ msgstr "valor num�rico non v�lido"
+
+#~ msgid "number too large or too small"
+#~ msgstr "n�mero demasiado grande ou pequeno"
+
+#~ msgid "unknown error"
+#~ msgstr "erro desco�ecido"
+
+#~ msgid "NONE"
+#~ msgstr "NADA"
 
-#: popthelp.c:100
-msgid "VAL"
-msgstr "VAL"
+#~ msgid "VAL"
+#~ msgstr "VAL"
 
-#: popthelp.c:101
-msgid "INT"
-msgstr "INT"
+#~ msgid "INT"
+#~ msgstr "INT"
 
-#: popthelp.c:102
-msgid "LONG"
-msgstr "LONG"
+#~ msgid "LONG"
+#~ msgstr "LONG"
 
-#: popthelp.c:103
-msgid "STRING"
-msgstr "CADEA"
+#~ msgid "STRING"
+#~ msgstr "CADEA"
 
-#: popthelp.c:104
-msgid "FLOAT"
-msgstr "FLOAT"
+#~ msgid "FLOAT"
+#~ msgstr "FLOAT"
 
-#: popthelp.c:105
-msgid "DOUBLE"
-msgstr "DOUBLE"
+#~ msgid "DOUBLE"
+#~ msgstr "DOUBLE"
 
-#: popthelp.c:106
-msgid "ARG"
-msgstr "ARG"
+#~ msgid "ARG"
+#~ msgstr "ARG"
 
-#: popthelp.c:459
-msgid "Usage:"
-msgstr "Uso:"
+#~ msgid "Usage:"
+#~ msgstr "Uso:"
 
-#: popthelp.c:481
-msgid "[OPTION...]"
-msgstr "[OPCI�N...]"
+#~ msgid "[OPTION...]"
+#~ msgstr "[OPCI�N...]"
diff --git a/po/hu.po b/po/hu.po
index 87c9c08..30eda3d 100644
--- a/po/hu.po
+++ b/po/hu.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.3\n"
-"POT-Creation-Date: 2002-01-18 16:12-0500\n"
+"POT-Creation-Date: 2002-03-13 12:58-0500\n"
 "PO-Revision-Date: 2000-08-03 23:26+0200\n"
 "Last-Translator: L�szl� N�meth <nemeth@qwertynet.hu>\n"
 "Language-Team: Hungarian\n"
@@ -9,55 +9,6 @@ msgstr ""
 "Content-Type: text/plain; charset=ISO-8859-2\n"
 "Content-Transfer-Encoding: 8-bit\n"
 
-#: popt.c:29
-msgid "unknown errno"
-msgstr ""
-
-#: popt.c:917
-#, c-format
-msgid "option type (%d) not implemented in popt\n"
-msgstr ""
-
-#: popt.c:1132
-msgid "missing argument"
-msgstr ""
-
-#: popt.c:1134
-msgid "unknown option"
-msgstr ""
-
-#: popt.c:1136
-msgid "mutually exclusive logical operations requested"
-msgstr ""
-
-#: popt.c:1138
-msgid "opt->arg should not be NULL"
-msgstr ""
-
-#: popt.c:1140
-msgid "aliases nested too deeply"
-msgstr ""
-
-#: popt.c:1142
-msgid "error in parameter quoting"
-msgstr ""
-
-#: popt.c:1144
-msgid "invalid numeric value"
-msgstr ""
-
-#: popt.c:1146
-msgid "number too large or too small"
-msgstr ""
-
-#: popt.c:1148
-msgid "memory allocation failed"
-msgstr ""
-
-#: popt.c:1152
-msgid "unknown error"
-msgstr ""
-
 #: popthelp.c:53
 msgid "Show this help message"
 msgstr "E s�g� megjelen�t�se"
@@ -70,43 +21,3 @@ msgstr "R
 #, fuzzy
 msgid "Display option defaults in message"
 msgstr "R�vid haszn�lati utas�t�s megjelen�t�se"
-
-#: popthelp.c:99
-msgid "NONE"
-msgstr ""
-
-#: popthelp.c:100
-msgid "VAL"
-msgstr ""
-
-#: popthelp.c:101
-msgid "INT"
-msgstr ""
-
-#: popthelp.c:102
-msgid "LONG"
-msgstr ""
-
-#: popthelp.c:103
-msgid "STRING"
-msgstr ""
-
-#: popthelp.c:104
-msgid "FLOAT"
-msgstr ""
-
-#: popthelp.c:105
-msgid "DOUBLE"
-msgstr ""
-
-#: popthelp.c:106
-msgid "ARG"
-msgstr ""
-
-#: popthelp.c:459
-msgid "Usage:"
-msgstr ""
-
-#: popthelp.c:481
-msgid "[OPTION...]"
-msgstr ""
diff --git a/po/id.po b/po/id.po
index 6cfef98..d9ced64 100644
--- a/po/id.po
+++ b/po/id.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.3\n"
-"POT-Creation-Date: 2002-01-18 16:12-0500\n"
+"POT-Creation-Date: 2002-03-13 12:58-0500\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -14,55 +14,6 @@ msgstr ""
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: ENCODING\n"
 
-#: popt.c:29
-msgid "unknown errno"
-msgstr ""
-
-#: popt.c:917
-#, c-format
-msgid "option type (%d) not implemented in popt\n"
-msgstr ""
-
-#: popt.c:1132
-msgid "missing argument"
-msgstr ""
-
-#: popt.c:1134
-msgid "unknown option"
-msgstr ""
-
-#: popt.c:1136
-msgid "mutually exclusive logical operations requested"
-msgstr ""
-
-#: popt.c:1138
-msgid "opt->arg should not be NULL"
-msgstr ""
-
-#: popt.c:1140
-msgid "aliases nested too deeply"
-msgstr ""
-
-#: popt.c:1142
-msgid "error in parameter quoting"
-msgstr ""
-
-#: popt.c:1144
-msgid "invalid numeric value"
-msgstr ""
-
-#: popt.c:1146
-msgid "number too large or too small"
-msgstr ""
-
-#: popt.c:1148
-msgid "memory allocation failed"
-msgstr ""
-
-#: popt.c:1152
-msgid "unknown error"
-msgstr ""
-
 #: popthelp.c:53
 msgid "Show this help message"
 msgstr ""
@@ -74,43 +25,3 @@ msgstr ""
 #: popthelp.c:57
 msgid "Display option defaults in message"
 msgstr ""
-
-#: popthelp.c:99
-msgid "NONE"
-msgstr ""
-
-#: popthelp.c:100
-msgid "VAL"
-msgstr ""
-
-#: popthelp.c:101
-msgid "INT"
-msgstr ""
-
-#: popthelp.c:102
-msgid "LONG"
-msgstr ""
-
-#: popthelp.c:103
-msgid "STRING"
-msgstr ""
-
-#: popthelp.c:104
-msgid "FLOAT"
-msgstr ""
-
-#: popthelp.c:105
-msgid "DOUBLE"
-msgstr ""
-
-#: popthelp.c:106
-msgid "ARG"
-msgstr ""
-
-#: popthelp.c:459
-msgid "Usage:"
-msgstr ""
-
-#: popthelp.c:481
-msgid "[OPTION...]"
-msgstr ""
diff --git a/po/is.po b/po/is.po
index d638658..33c2f66 100644
--- a/po/is.po
+++ b/po/is.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.3\n"
-"POT-Creation-Date: 2002-01-18 16:12-0500\n"
+"POT-Creation-Date: 2002-03-13 12:58-0500\n"
 "PO-Revision-Date: 2001-06-08 01:35+0000\n"
 "Last-Translator: Richard Allen <ra@hp.is>\n"
 "Language-Team: is <kde-isl@mmedia.is>\n"
@@ -9,103 +9,80 @@ msgstr ""
 "Content-Type: text/plain; charset=ISO-8859-1\n"
 "Content-Transfer-Encoding: 8-bit\n"
 
-#: popt.c:29
-msgid "unknown errno"
-msgstr "��ekkt villun�mer"
+#: popthelp.c:53
+msgid "Show this help message"
+msgstr "S�na �essa hj�lp"
 
-#: popt.c:917
-#, c-format
-msgid "option type (%d) not implemented in popt\n"
-msgstr "rofager�in (%d) er ekki studd � popt\n"
+#: popthelp.c:54
+msgid "Display brief usage message"
+msgstr "S�na stuttar notkunarlei�beiningar"
 
-#: popt.c:1132
-msgid "missing argument"
-msgstr "vantar vi�fang"
+#: popthelp.c:57
+msgid "Display option defaults in message"
+msgstr "S�na sj�lfgefin gildi rofa � skilabo�um"
 
-#: popt.c:1134
-msgid "unknown option"
-msgstr "��ekktur rofi"
+#~ msgid "unknown errno"
+#~ msgstr "��ekkt villun�mer"
 
-#: popt.c:1136
-msgid "mutually exclusive logical operations requested"
-msgstr "be�i� um rofa sem sl�kkva hvor � ��rum"
+#~ msgid "option type (%d) not implemented in popt\n"
+#~ msgstr "rofager�in (%d) er ekki studd � popt\n"
 
-#: popt.c:1138
-msgid "opt->arg should not be NULL"
-msgstr "opt->arg �tti ekki a� vera NULL"
+#~ msgid "missing argument"
+#~ msgstr "vantar vi�fang"
 
-#: popt.c:1140
-msgid "aliases nested too deeply"
-msgstr "al�asar of fl�knir"
+#~ msgid "unknown option"
+#~ msgstr "��ekktur rofi"
 
-#: popt.c:1142
-msgid "error in parameter quoting"
-msgstr "villa � vi�f�ngum (g�salappir og svo frv.)"
+#~ msgid "mutually exclusive logical operations requested"
+#~ msgstr "be�i� um rofa sem sl�kkva hvor � ��rum"
 
-#: popt.c:1144
-msgid "invalid numeric value"
-msgstr "�gilt t�lulegt gildi"
+#~ msgid "opt->arg should not be NULL"
+#~ msgstr "opt->arg �tti ekki a� vera NULL"
 
-#: popt.c:1146
-msgid "number too large or too small"
-msgstr "talan of st�r e�a sm�"
+#~ msgid "aliases nested too deeply"
+#~ msgstr "al�asar of fl�knir"
 
-#: popt.c:1148
-msgid "memory allocation failed"
-msgstr "ekki t�kst a� taka fr� minni"
+#~ msgid "error in parameter quoting"
+#~ msgstr "villa � vi�f�ngum (g�salappir og svo frv.)"
 
-#: popt.c:1152
-msgid "unknown error"
-msgstr "��ekkt villa"
+#~ msgid "invalid numeric value"
+#~ msgstr "�gilt t�lulegt gildi"
 
-#: popthelp.c:53
-msgid "Show this help message"
-msgstr "S�na �essa hj�lp"
+#~ msgid "number too large or too small"
+#~ msgstr "talan of st�r e�a sm�"
 
-#: popthelp.c:54
-msgid "Display brief usage message"
-msgstr "S�na stuttar notkunarlei�beiningar"
+#~ msgid "memory allocation failed"
+#~ msgstr "ekki t�kst a� taka fr� minni"
 
-#: popthelp.c:57
-msgid "Display option defaults in message"
-msgstr "S�na sj�lfgefin gildi rofa � skilabo�um"
+#~ msgid "unknown error"
+#~ msgstr "��ekkt villa"
 
-#: popthelp.c:99
-msgid "NONE"
-msgstr "ENGIN"
+#~ msgid "NONE"
+#~ msgstr "ENGIN"
 
-#: popthelp.c:100
-msgid "VAL"
-msgstr "VAL"
+#~ msgid "VAL"
+#~ msgstr "VAL"
 
-#: popthelp.c:101
-msgid "INT"
-msgstr "INT"
+#~ msgid "INT"
+#~ msgstr "INT"
 
-#: popthelp.c:102
-msgid "LONG"
-msgstr "LONG"
+#~ msgid "LONG"
+#~ msgstr "LONG"
 
-#: popthelp.c:103
-msgid "STRING"
-msgstr "STRING"
+#~ msgid "STRING"
+#~ msgstr "STRING"
 
-#: popthelp.c:104
-msgid "FLOAT"
-msgstr "FLOAT"
+#~ msgid "FLOAT"
+#~ msgstr "FLOAT"
 
-#: popthelp.c:105
-msgid "DOUBLE"
-msgstr "DOUBLE"
+#~ msgid "DOUBLE"
+#~ msgstr "DOUBLE"
 
-#: popthelp.c:106
-msgid "ARG"
-msgstr "ARG"
+#~ msgid "ARG"
+#~ msgstr "ARG"
 
-#: popthelp.c:459
-msgid "Usage:"
-msgstr "Notkun:"
+#~ msgid "Usage:"
+#~ msgstr "Notkun:"
 
-#: popthelp.c:481
-msgid "[OPTION...]"
-msgstr "[ROFI...]"
+#~ msgid "[OPTION...]"
+#~ msgstr "[ROFI...]"
diff --git a/po/it.po b/po/it.po
index 6cfef98..d9ced64 100644
--- a/po/it.po
+++ b/po/it.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.3\n"
-"POT-Creation-Date: 2002-01-18 16:12-0500\n"
+"POT-Creation-Date: 2002-03-13 12:58-0500\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -14,55 +14,6 @@ msgstr ""
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: ENCODING\n"
 
-#: popt.c:29
-msgid "unknown errno"
-msgstr ""
-
-#: popt.c:917
-#, c-format
-msgid "option type (%d) not implemented in popt\n"
-msgstr ""
-
-#: popt.c:1132
-msgid "missing argument"
-msgstr ""
-
-#: popt.c:1134
-msgid "unknown option"
-msgstr ""
-
-#: popt.c:1136
-msgid "mutually exclusive logical operations requested"
-msgstr ""
-
-#: popt.c:1138
-msgid "opt->arg should not be NULL"
-msgstr ""
-
-#: popt.c:1140
-msgid "aliases nested too deeply"
-msgstr ""
-
-#: popt.c:1142
-msgid "error in parameter quoting"
-msgstr ""
-
-#: popt.c:1144
-msgid "invalid numeric value"
-msgstr ""
-
-#: popt.c:1146
-msgid "number too large or too small"
-msgstr ""
-
-#: popt.c:1148
-msgid "memory allocation failed"
-msgstr ""
-
-#: popt.c:1152
-msgid "unknown error"
-msgstr ""
-
 #: popthelp.c:53
 msgid "Show this help message"
 msgstr ""
@@ -74,43 +25,3 @@ msgstr ""
 #: popthelp.c:57
 msgid "Display option defaults in message"
 msgstr ""
-
-#: popthelp.c:99
-msgid "NONE"
-msgstr ""
-
-#: popthelp.c:100
-msgid "VAL"
-msgstr ""
-
-#: popthelp.c:101
-msgid "INT"
-msgstr ""
-
-#: popthelp.c:102
-msgid "LONG"
-msgstr ""
-
-#: popthelp.c:103
-msgid "STRING"
-msgstr ""
-
-#: popthelp.c:104
-msgid "FLOAT"
-msgstr ""
-
-#: popthelp.c:105
-msgid "DOUBLE"
-msgstr ""
-
-#: popthelp.c:106
-msgid "ARG"
-msgstr ""
-
-#: popthelp.c:459
-msgid "Usage:"
-msgstr ""
-
-#: popthelp.c:481
-msgid "[OPTION...]"
-msgstr ""
diff --git a/po/ja.po b/po/ja.po
index 6cfef98..d9ced64 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.3\n"
-"POT-Creation-Date: 2002-01-18 16:12-0500\n"
+"POT-Creation-Date: 2002-03-13 12:58-0500\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -14,55 +14,6 @@ msgstr ""
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: ENCODING\n"
 
-#: popt.c:29
-msgid "unknown errno"
-msgstr ""
-
-#: popt.c:917
-#, c-format
-msgid "option type (%d) not implemented in popt\n"
-msgstr ""
-
-#: popt.c:1132
-msgid "missing argument"
-msgstr ""
-
-#: popt.c:1134
-msgid "unknown option"
-msgstr ""
-
-#: popt.c:1136
-msgid "mutually exclusive logical operations requested"
-msgstr ""
-
-#: popt.c:1138
-msgid "opt->arg should not be NULL"
-msgstr ""
-
-#: popt.c:1140
-msgid "aliases nested too deeply"
-msgstr ""
-
-#: popt.c:1142
-msgid "error in parameter quoting"
-msgstr ""
-
-#: popt.c:1144
-msgid "invalid numeric value"
-msgstr ""
-
-#: popt.c:1146
-msgid "number too large or too small"
-msgstr ""
-
-#: popt.c:1148
-msgid "memory allocation failed"
-msgstr ""
-
-#: popt.c:1152
-msgid "unknown error"
-msgstr ""
-
 #: popthelp.c:53
 msgid "Show this help message"
 msgstr ""
@@ -74,43 +25,3 @@ msgstr ""
 #: popthelp.c:57
 msgid "Display option defaults in message"
 msgstr ""
-
-#: popthelp.c:99
-msgid "NONE"
-msgstr ""
-
-#: popthelp.c:100
-msgid "VAL"
-msgstr ""
-
-#: popthelp.c:101
-msgid "INT"
-msgstr ""
-
-#: popthelp.c:102
-msgid "LONG"
-msgstr ""
-
-#: popthelp.c:103
-msgid "STRING"
-msgstr ""
-
-#: popthelp.c:104
-msgid "FLOAT"
-msgstr ""
-
-#: popthelp.c:105
-msgid "DOUBLE"
-msgstr ""
-
-#: popthelp.c:106
-msgid "ARG"
-msgstr ""
-
-#: popthelp.c:459
-msgid "Usage:"
-msgstr ""
-
-#: popthelp.c:481
-msgid "[OPTION...]"
-msgstr ""
diff --git a/po/ko.po b/po/ko.po
index 11d34a2..b013078 100644
--- a/po/ko.po
+++ b/po/ko.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6\n"
-"POT-Creation-Date: 2002-01-18 16:12-0500\n"
+"POT-Creation-Date: 2002-03-13 12:58-0500\n"
 "PO-Revision-Date: 2001-09-06 20:06+0900\n"
 "Last-Translator: Jong-Hoon Ryu <redhat4u@netian.com>\n"
 "Language-Team: GNU Translation project <ko@li.org>\n"
@@ -9,103 +9,80 @@ msgstr ""
 "Content-Type: text/plain; charset=EUC-KR\n"
 "Content-Transfer-Encoding: 8-bit\n"
 
-#: popt.c:29
-msgid "unknown errno"
-msgstr "�� �� ���� �����ڵ�(errno) �Դϴ�"
+#: popthelp.c:53
+msgid "Show this help message"
+msgstr "�� ������ �����ݴϴ�"
 
-#: popt.c:917
-#, c-format
-msgid "option type (%d) not implemented in popt\n"
-msgstr "�ɼ� ���� (%d)�� popt���� ����� �� �����ϴ�\n"
+#: popthelp.c:54
+msgid "Display brief usage message"
+msgstr "������ ������ �����ݴϴ�"
 
-#: popt.c:1132
-msgid "missing argument"
-msgstr "�μ��� �������� �ʾҽ��ϴ�"
+#: popthelp.c:57
+msgid "Display option defaults in message"
+msgstr "�⺻���� �ɼ��� �����ݴϴ�"
 
-#: popt.c:1134
-msgid "unknown option"
-msgstr "�� �� ���� �ɼ��Դϴ�"
+#~ msgid "unknown errno"
+#~ msgstr "�� �� ���� �����ڵ�(errno) �Դϴ�"
 
-#: popt.c:1136
-msgid "mutually exclusive logical operations requested"
-msgstr "���ʿ� ��Ÿ�� ���� ������ �����Ǿ����ϴ�"
+#~ msgid "option type (%d) not implemented in popt\n"
+#~ msgstr "�ɼ� ���� (%d)�� popt���� ����� �� �����ϴ�\n"
 
-#: popt.c:1138
-msgid "opt->arg should not be NULL"
-msgstr "�ɼ�->�μ��� NULL�� �Ǿ�� �ȵ˴ϴ�"
+#~ msgid "missing argument"
+#~ msgstr "�μ��� �������� �ʾҽ��ϴ�"
 
-#: popt.c:1140
-msgid "aliases nested too deeply"
-msgstr "��Ī(alias)�� �����ϰ� �����Ǿ����ϴ�"
+#~ msgid "unknown option"
+#~ msgstr "�� �� ���� �ɼ��Դϴ�"
 
-#: popt.c:1142
-msgid "error in parameter quoting"
-msgstr "�Ű������� ������ �ֽ��ϴ�"
+#~ msgid "mutually exclusive logical operations requested"
+#~ msgstr "���ʿ� ��Ÿ�� ���� ������ �����Ǿ����ϴ�"
 
-#: popt.c:1144
-msgid "invalid numeric value"
-msgstr "�߸��� ��ġ ���Դϴ�"
+#~ msgid "opt->arg should not be NULL"
+#~ msgstr "�ɼ�->�μ��� NULL�� �Ǿ�� �ȵ˴ϴ�"
 
-#: popt.c:1146
-msgid "number too large or too small"
-msgstr "���ڰ� �ʹ� ũ�ų� �ʹ� �����ϴ�"
+#~ msgid "aliases nested too deeply"
+#~ msgstr "��Ī(alias)�� �����ϰ� �����Ǿ����ϴ�"
 
-#: popt.c:1148
-msgid "memory allocation failed"
-msgstr "�޸� �Ҵ翡 �����߽��ϴ�"
+#~ msgid "error in parameter quoting"
+#~ msgstr "�Ű������� ������ �ֽ��ϴ�"
 
-#: popt.c:1152
-msgid "unknown error"
-msgstr "�� �� ���� �����Դϴ�"
+#~ msgid "invalid numeric value"
+#~ msgstr "�߸��� ��ġ ���Դϴ�"
 
-#: popthelp.c:53
-msgid "Show this help message"
-msgstr "�� ������ �����ݴϴ�"
+#~ msgid "number too large or too small"
+#~ msgstr "���ڰ� �ʹ� ũ�ų� �ʹ� �����ϴ�"
 
-#: popthelp.c:54
-msgid "Display brief usage message"
-msgstr "������ ������ �����ݴϴ�"
+#~ msgid "memory allocation failed"
+#~ msgstr "�޸� �Ҵ翡 �����߽��ϴ�"
 
-#: popthelp.c:57
-msgid "Display option defaults in message"
-msgstr "�⺻���� �ɼ��� �����ݴϴ�"
+#~ msgid "unknown error"
+#~ msgstr "�� �� ���� �����Դϴ�"
 
-#: popthelp.c:99
-msgid "NONE"
-msgstr "����(NONE)"
+#~ msgid "NONE"
+#~ msgstr "����(NONE)"
 
-#: popthelp.c:100
-msgid "VAL"
-msgstr "��(VAL)"
+#~ msgid "VAL"
+#~ msgstr "��(VAL)"
 
-#: popthelp.c:101
-msgid "INT"
-msgstr "����(INT)"
+#~ msgid "INT"
+#~ msgstr "����(INT)"
 
-#: popthelp.c:102
-msgid "LONG"
-msgstr "����(LONG)"
+#~ msgid "LONG"
+#~ msgstr "����(LONG)"
 
-#: popthelp.c:103
-msgid "STRING"
-msgstr "���ڿ�(STRING)"
+#~ msgid "STRING"
+#~ msgstr "���ڿ�(STRING)"
 
-#: popthelp.c:104
-msgid "FLOAT"
-msgstr "�Ҽ�(FLOAT)"
+#~ msgid "FLOAT"
+#~ msgstr "�Ҽ�(FLOAT)"
 
-#: popthelp.c:105
-msgid "DOUBLE"
-msgstr "�Ҽ�(DOUBLE)"
+#~ msgid "DOUBLE"
+#~ msgstr "�Ҽ�(DOUBLE)"
 
-#: popthelp.c:106
-msgid "ARG"
-msgstr "�μ�(ARG)"
+#~ msgid "ARG"
+#~ msgstr "�μ�(ARG)"
 
-#: popthelp.c:459
-msgid "Usage:"
-msgstr "����:"
+#~ msgid "Usage:"
+#~ msgstr "����:"
 
-#: popthelp.c:481
-msgid "[OPTION...]"
-msgstr "[�ɼ�...]"
+#~ msgid "[OPTION...]"
+#~ msgstr "[�ɼ�...]"
diff --git a/po/no.po b/po/no.po
index 39f3824..3572e8e 100644
--- a/po/no.po
+++ b/po/no.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.3\n"
-"POT-Creation-Date: 2002-01-18 16:12-0500\n"
+"POT-Creation-Date: 2002-03-13 12:58-0500\n"
 "PO-Revision-Date: 2001-06-27 11:05+0200\n"
 "Last-Translator: Kjartan Maraas <kmaraas@online.no>\n"
 "Language-Team: Norwegian <no@li.org>\n"
@@ -9,103 +9,80 @@ msgstr ""
 "Content-Type: text/plain; charset=iso-8859-1\n"
 "Content-Transfer-Encoding: 8-bit\n"
 
-#: popt.c:29
-msgid "unknown errno"
-msgstr "ukjent errno"
+#: popthelp.c:53
+msgid "Show this help message"
+msgstr "Vis denne hjelpmeldingen"
 
-#: popt.c:917
-#, c-format
-msgid "option type (%d) not implemented in popt\n"
-msgstr "flaggtype (%d) ikke implementert i popt\n"
+#: popthelp.c:54
+msgid "Display brief usage message"
+msgstr "Vis kort bruksmelding"
 
-#: popt.c:1132
-msgid "missing argument"
-msgstr "manglende argument"
+#: popthelp.c:57
+msgid "Display option defaults in message"
+msgstr "Vis forvalgte flagg i melding"
 
-#: popt.c:1134
-msgid "unknown option"
-msgstr "ukjent flagg"
+#~ msgid "unknown errno"
+#~ msgstr "ukjent errno"
 
-#: popt.c:1136
-msgid "mutually exclusive logical operations requested"
-msgstr "gjensidig eksluderende logiske operasjoner forespurt"
+#~ msgid "option type (%d) not implemented in popt\n"
+#~ msgstr "flaggtype (%d) ikke implementert i popt\n"
 
-#: popt.c:1138
-msgid "opt->arg should not be NULL"
-msgstr "opt->arg m� ikke v�re NULL"
+#~ msgid "missing argument"
+#~ msgstr "manglende argument"
 
-#: popt.c:1140
-msgid "aliases nested too deeply"
-msgstr "aliaser med for dype l�kker"
+#~ msgid "unknown option"
+#~ msgstr "ukjent flagg"
 
-#: popt.c:1142
-msgid "error in parameter quoting"
-msgstr "feil i parametersitering"
+#~ msgid "mutually exclusive logical operations requested"
+#~ msgstr "gjensidig eksluderende logiske operasjoner forespurt"
 
-#: popt.c:1144
-msgid "invalid numeric value"
-msgstr "ugyldig numerisk verdi"
+#~ msgid "opt->arg should not be NULL"
+#~ msgstr "opt->arg m� ikke v�re NULL"
 
-#: popt.c:1146
-msgid "number too large or too small"
-msgstr "tallet er for stort eller lite"
+#~ msgid "aliases nested too deeply"
+#~ msgstr "aliaser med for dype l�kker"
 
-#: popt.c:1148
-msgid "memory allocation failed"
-msgstr "minneallokering feilet"
+#~ msgid "error in parameter quoting"
+#~ msgstr "feil i parametersitering"
 
-#: popt.c:1152
-msgid "unknown error"
-msgstr "ukjent feil"
+#~ msgid "invalid numeric value"
+#~ msgstr "ugyldig numerisk verdi"
 
-#: popthelp.c:53
-msgid "Show this help message"
-msgstr "Vis denne hjelpmeldingen"
+#~ msgid "number too large or too small"
+#~ msgstr "tallet er for stort eller lite"
 
-#: popthelp.c:54
-msgid "Display brief usage message"
-msgstr "Vis kort bruksmelding"
+#~ msgid "memory allocation failed"
+#~ msgstr "minneallokering feilet"
 
-#: popthelp.c:57
-msgid "Display option defaults in message"
-msgstr "Vis forvalgte flagg i melding"
+#~ msgid "unknown error"
+#~ msgstr "ukjent feil"
 
-#: popthelp.c:99
-msgid "NONE"
-msgstr "INGEN"
+#~ msgid "NONE"
+#~ msgstr "INGEN"
 
-#: popthelp.c:100
-msgid "VAL"
-msgstr "VERDI"
+#~ msgid "VAL"
+#~ msgstr "VERDI"
 
-#: popthelp.c:101
-msgid "INT"
-msgstr "HELTALL"
+#~ msgid "INT"
+#~ msgstr "HELTALL"
 
-#: popthelp.c:102
-msgid "LONG"
-msgstr "LONG"
+#~ msgid "LONG"
+#~ msgstr "LONG"
 
-#: popthelp.c:103
-msgid "STRING"
-msgstr "STRENG"
+#~ msgid "STRING"
+#~ msgstr "STRENG"
 
-#: popthelp.c:104
-msgid "FLOAT"
-msgstr "FLYTTALL"
+#~ msgid "FLOAT"
+#~ msgstr "FLYTTALL"
 
-#: popthelp.c:105
-msgid "DOUBLE"
-msgstr "DOUBLE"
+#~ msgid "DOUBLE"
+#~ msgstr "DOUBLE"
 
-#: popthelp.c:106
-msgid "ARG"
-msgstr "ARG"
+#~ msgid "ARG"
+#~ msgstr "ARG"
 
-#: popthelp.c:459
-msgid "Usage:"
-msgstr "Bruk:"
+#~ msgid "Usage:"
+#~ msgstr "Bruk:"
 
-#: popthelp.c:481
-msgid "[OPTION...]"
-msgstr "[FLAGG...]"
+#~ msgid "[OPTION...]"
+#~ msgstr "[FLAGG...]"
diff --git a/po/pl.po b/po/pl.po
index 6cfef98..d9ced64 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.3\n"
-"POT-Creation-Date: 2002-01-18 16:12-0500\n"
+"POT-Creation-Date: 2002-03-13 12:58-0500\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -14,55 +14,6 @@ msgstr ""
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: ENCODING\n"
 
-#: popt.c:29
-msgid "unknown errno"
-msgstr ""
-
-#: popt.c:917
-#, c-format
-msgid "option type (%d) not implemented in popt\n"
-msgstr ""
-
-#: popt.c:1132
-msgid "missing argument"
-msgstr ""
-
-#: popt.c:1134
-msgid "unknown option"
-msgstr ""
-
-#: popt.c:1136
-msgid "mutually exclusive logical operations requested"
-msgstr ""
-
-#: popt.c:1138
-msgid "opt->arg should not be NULL"
-msgstr ""
-
-#: popt.c:1140
-msgid "aliases nested too deeply"
-msgstr ""
-
-#: popt.c:1142
-msgid "error in parameter quoting"
-msgstr ""
-
-#: popt.c:1144
-msgid "invalid numeric value"
-msgstr ""
-
-#: popt.c:1146
-msgid "number too large or too small"
-msgstr ""
-
-#: popt.c:1148
-msgid "memory allocation failed"
-msgstr ""
-
-#: popt.c:1152
-msgid "unknown error"
-msgstr ""
-
 #: popthelp.c:53
 msgid "Show this help message"
 msgstr ""
@@ -74,43 +25,3 @@ msgstr ""
 #: popthelp.c:57
 msgid "Display option defaults in message"
 msgstr ""
-
-#: popthelp.c:99
-msgid "NONE"
-msgstr ""
-
-#: popthelp.c:100
-msgid "VAL"
-msgstr ""
-
-#: popthelp.c:101
-msgid "INT"
-msgstr ""
-
-#: popthelp.c:102
-msgid "LONG"
-msgstr ""
-
-#: popthelp.c:103
-msgid "STRING"
-msgstr ""
-
-#: popthelp.c:104
-msgid "FLOAT"
-msgstr ""
-
-#: popthelp.c:105
-msgid "DOUBLE"
-msgstr ""
-
-#: popthelp.c:106
-msgid "ARG"
-msgstr ""
-
-#: popthelp.c:459
-msgid "Usage:"
-msgstr ""
-
-#: popthelp.c:481
-msgid "[OPTION...]"
-msgstr ""
diff --git a/po/popt.pot b/po/popt.pot
index c66570d..c0c056c 100644
--- a/po/popt.pot
+++ b/po/popt.pot
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2002-01-18 16:12-0500\n"
+"POT-Creation-Date: 2002-03-13 12:58-0500\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -14,55 +14,6 @@ msgstr ""
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: popt.c:29
-msgid "unknown errno"
-msgstr ""
-
-#: popt.c:917
-#, c-format
-msgid "option type (%d) not implemented in popt\n"
-msgstr ""
-
-#: popt.c:1132
-msgid "missing argument"
-msgstr ""
-
-#: popt.c:1134
-msgid "unknown option"
-msgstr ""
-
-#: popt.c:1136
-msgid "mutually exclusive logical operations requested"
-msgstr ""
-
-#: popt.c:1138
-msgid "opt->arg should not be NULL"
-msgstr ""
-
-#: popt.c:1140
-msgid "aliases nested too deeply"
-msgstr ""
-
-#: popt.c:1142
-msgid "error in parameter quoting"
-msgstr ""
-
-#: popt.c:1144
-msgid "invalid numeric value"
-msgstr ""
-
-#: popt.c:1146
-msgid "number too large or too small"
-msgstr ""
-
-#: popt.c:1148
-msgid "memory allocation failed"
-msgstr ""
-
-#: popt.c:1152
-msgid "unknown error"
-msgstr ""
-
 #: popthelp.c:53
 msgid "Show this help message"
 msgstr ""
@@ -74,43 +25,3 @@ msgstr ""
 #: popthelp.c:57
 msgid "Display option defaults in message"
 msgstr ""
-
-#: popthelp.c:99
-msgid "NONE"
-msgstr ""
-
-#: popthelp.c:100
-msgid "VAL"
-msgstr ""
-
-#: popthelp.c:101
-msgid "INT"
-msgstr ""
-
-#: popthelp.c:102
-msgid "LONG"
-msgstr ""
-
-#: popthelp.c:103
-msgid "STRING"
-msgstr ""
-
-#: popthelp.c:104
-msgid "FLOAT"
-msgstr ""
-
-#: popthelp.c:105
-msgid "DOUBLE"
-msgstr ""
-
-#: popthelp.c:106
-msgid "ARG"
-msgstr ""
-
-#: popthelp.c:459
-msgid "Usage:"
-msgstr ""
-
-#: popthelp.c:481
-msgid "[OPTION...]"
-msgstr ""
diff --git a/po/pt.po b/po/pt.po
index b6040c2..de63013 100644
--- a/po/pt.po
+++ b/po/pt.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.3\n"
-"POT-Creation-Date: 2002-01-18 16:12-0500\n"
+"POT-Creation-Date: 2002-03-13 12:58-0500\n"
 "PO-Revision-Date: 2001-01-21 19:31+00:00\n"
 "Last-Translator: Pedro Morais <morais@kde.org>\n"
 "Language-Team: pt <morais@kde.org>\n"
@@ -9,55 +9,6 @@ msgstr ""
 "Content-Type: text/plain; charset=iso-latin1\n"
 "Content-Transfer-Encoding: none\n"
 
-#: popt.c:29
-msgid "unknown errno"
-msgstr "errno desconhecido"
-
-#: popt.c:917
-#, c-format
-msgid "option type (%d) not implemented in popt\n"
-msgstr "tipo de op��o (%d) n�o implementado no popt\n"
-
-#: popt.c:1132
-msgid "missing argument"
-msgstr "falta um argumento"
-
-#: popt.c:1134
-msgid "unknown option"
-msgstr "op��o desconhecida"
-
-#: popt.c:1136
-msgid "mutually exclusive logical operations requested"
-msgstr "foram pedidas opera��es l�gicas mutuamente exclusivas"
-
-#: popt.c:1138
-msgid "opt->arg should not be NULL"
-msgstr ""
-
-#: popt.c:1140
-msgid "aliases nested too deeply"
-msgstr "'aliases' demasiado aninhados"
-
-#: popt.c:1142
-msgid "error in parameter quoting"
-msgstr "erros no 'quoting' de par�metros"
-
-#: popt.c:1144
-msgid "invalid numeric value"
-msgstr "valor n�merico inv�lido"
-
-#: popt.c:1146
-msgid "number too large or too small"
-msgstr "n�mero demasiado grando ou pequeno"
-
-#: popt.c:1148
-msgid "memory allocation failed"
-msgstr ""
-
-#: popt.c:1152
-msgid "unknown error"
-msgstr "erro desconhecido"
-
 #: popthelp.c:53
 msgid "Show this help message"
 msgstr "Mostrar esta mensagem de ajuda"
@@ -71,42 +22,62 @@ msgstr "Mostrar uma mensagem de utiliza
 msgid "Display option defaults in message"
 msgstr "Mostrar uma mensagem de utiliza��o sucinta"
 
-#: popthelp.c:99
-msgid "NONE"
-msgstr "NONE"
+#~ msgid "unknown errno"
+#~ msgstr "errno desconhecido"
+
+#~ msgid "option type (%d) not implemented in popt\n"
+#~ msgstr "tipo de op��o (%d) n�o implementado no popt\n"
+
+#~ msgid "missing argument"
+#~ msgstr "falta um argumento"
+
+#~ msgid "unknown option"
+#~ msgstr "op��o desconhecida"
+
+#~ msgid "mutually exclusive logical operations requested"
+#~ msgstr "foram pedidas opera��es l�gicas mutuamente exclusivas"
+
+#~ msgid "aliases nested too deeply"
+#~ msgstr "'aliases' demasiado aninhados"
+
+#~ msgid "error in parameter quoting"
+#~ msgstr "erros no 'quoting' de par�metros"
+
+#~ msgid "invalid numeric value"
+#~ msgstr "valor n�merico inv�lido"
+
+#~ msgid "number too large or too small"
+#~ msgstr "n�mero demasiado grando ou pequeno"
+
+#~ msgid "unknown error"
+#~ msgstr "erro desconhecido"
+
+#~ msgid "NONE"
+#~ msgstr "NONE"
 
-#: popthelp.c:100
-msgid "VAL"
-msgstr "VAL"
+#~ msgid "VAL"
+#~ msgstr "VAL"
 
-#: popthelp.c:101
-msgid "INT"
-msgstr "INT"
+#~ msgid "INT"
+#~ msgstr "INT"
 
-#: popthelp.c:102
-msgid "LONG"
-msgstr "LONG"
+#~ msgid "LONG"
+#~ msgstr "LONG"
 
-#: popthelp.c:103
-msgid "STRING"
-msgstr "STRING"
+#~ msgid "STRING"
+#~ msgstr "STRING"
 
-#: popthelp.c:104
-msgid "FLOAT"
-msgstr "FLOAT"
+#~ msgid "FLOAT"
+#~ msgstr "FLOAT"
 
-#: popthelp.c:105
-msgid "DOUBLE"
-msgstr "DOUBLE"
+#~ msgid "DOUBLE"
+#~ msgstr "DOUBLE"
 
-#: popthelp.c:106
-msgid "ARG"
-msgstr "ARG"
+#~ msgid "ARG"
+#~ msgstr "ARG"
 
-#: popthelp.c:459
-msgid "Usage:"
-msgstr "Utiliza��o:"
+#~ msgid "Usage:"
+#~ msgstr "Utiliza��o:"
 
-#: popthelp.c:481
-msgid "[OPTION...]"
-msgstr "[OP��O...]"
+#~ msgid "[OPTION...]"
+#~ msgstr "[OP��O...]"
diff --git a/po/pt_BR.po b/po/pt_BR.po
index 6cfef98..d9ced64 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.3\n"
-"POT-Creation-Date: 2002-01-18 16:12-0500\n"
+"POT-Creation-Date: 2002-03-13 12:58-0500\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -14,55 +14,6 @@ msgstr ""
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: ENCODING\n"
 
-#: popt.c:29
-msgid "unknown errno"
-msgstr ""
-
-#: popt.c:917
-#, c-format
-msgid "option type (%d) not implemented in popt\n"
-msgstr ""
-
-#: popt.c:1132
-msgid "missing argument"
-msgstr ""
-
-#: popt.c:1134
-msgid "unknown option"
-msgstr ""
-
-#: popt.c:1136
-msgid "mutually exclusive logical operations requested"
-msgstr ""
-
-#: popt.c:1138
-msgid "opt->arg should not be NULL"
-msgstr ""
-
-#: popt.c:1140
-msgid "aliases nested too deeply"
-msgstr ""
-
-#: popt.c:1142
-msgid "error in parameter quoting"
-msgstr ""
-
-#: popt.c:1144
-msgid "invalid numeric value"
-msgstr ""
-
-#: popt.c:1146
-msgid "number too large or too small"
-msgstr ""
-
-#: popt.c:1148
-msgid "memory allocation failed"
-msgstr ""
-
-#: popt.c:1152
-msgid "unknown error"
-msgstr ""
-
 #: popthelp.c:53
 msgid "Show this help message"
 msgstr ""
@@ -74,43 +25,3 @@ msgstr ""
 #: popthelp.c:57
 msgid "Display option defaults in message"
 msgstr ""
-
-#: popthelp.c:99
-msgid "NONE"
-msgstr ""
-
-#: popthelp.c:100
-msgid "VAL"
-msgstr ""
-
-#: popthelp.c:101
-msgid "INT"
-msgstr ""
-
-#: popthelp.c:102
-msgid "LONG"
-msgstr ""
-
-#: popthelp.c:103
-msgid "STRING"
-msgstr ""
-
-#: popthelp.c:104
-msgid "FLOAT"
-msgstr ""
-
-#: popthelp.c:105
-msgid "DOUBLE"
-msgstr ""
-
-#: popthelp.c:106
-msgid "ARG"
-msgstr ""
-
-#: popthelp.c:459
-msgid "Usage:"
-msgstr ""
-
-#: popthelp.c:481
-msgid "[OPTION...]"
-msgstr ""
diff --git a/po/ro.po b/po/ro.po
index 7289ba9..6f63708 100644
--- a/po/ro.po
+++ b/po/ro.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.3\n"
-"POT-Creation-Date: 2002-01-18 16:12-0500\n"
+"POT-Creation-Date: 2002-03-13 12:58-0500\n"
 "PO-Revision-Date: 2000-06-14 23:23+EST\n"
 "Last-Translator: Cristian Gafton <gafton@redhat.com>\n"
 "Language-Team: Romanian <ro@li.org>\n"
@@ -9,56 +9,6 @@ msgstr ""
 "Content-Type: text/plain; charset=ISO-8859-2\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: popt.c:29
-msgid "unknown errno"
-msgstr "eroare necunoscuta"
-
-#: popt.c:917
-#, c-format
-msgid "option type (%d) not implemented in popt\n"
-msgstr "optiunea de tipul (%d) nu este implementata in popt\n"
-
-#: popt.c:1132
-msgid "missing argument"
-msgstr "argument lipsa"
-
-#: popt.c:1134
-msgid "unknown option"
-msgstr "optiune necunoscuta"
-
-#: popt.c:1136
-msgid "mutually exclusive logical operations requested"
-msgstr ""
-
-#: popt.c:1138
-msgid "opt->arg should not be NULL"
-msgstr ""
-
-#: popt.c:1140
-msgid "aliases nested too deeply"
-msgstr "recursivitate infinita la optiunile sinonime"
-
-#: popt.c:1142
-#, fuzzy
-msgid "error in parameter quoting"
-msgstr "eroare la insertie parametru"
-
-#: popt.c:1144
-msgid "invalid numeric value"
-msgstr "valoare numarica invalida"
-
-#: popt.c:1146
-msgid "number too large or too small"
-msgstr "numar prea mare sau prea mic"
-
-#: popt.c:1148
-msgid "memory allocation failed"
-msgstr ""
-
-#: popt.c:1152
-msgid "unknown error"
-msgstr "eroare necuinoscuta"
-
 #: popthelp.c:53
 msgid "Show this help message"
 msgstr "Afisare mesaj de help"
@@ -72,42 +22,36 @@ msgstr "Afisare mesaj sintaxa sumar"
 msgid "Display option defaults in message"
 msgstr "Afisare mesaj sintaxa sumar"
 
-#: popthelp.c:99
-msgid "NONE"
-msgstr ""
+#~ msgid "unknown errno"
+#~ msgstr "eroare necunoscuta"
 
-#: popthelp.c:100
-msgid "VAL"
-msgstr ""
+#~ msgid "option type (%d) not implemented in popt\n"
+#~ msgstr "optiunea de tipul (%d) nu este implementata in popt\n"
 
-#: popthelp.c:101
-msgid "INT"
-msgstr ""
+#~ msgid "missing argument"
+#~ msgstr "argument lipsa"
 
-#: popthelp.c:102
-msgid "LONG"
-msgstr ""
+#~ msgid "unknown option"
+#~ msgstr "optiune necunoscuta"
 
-#: popthelp.c:103
-msgid "STRING"
-msgstr ""
+#~ msgid "aliases nested too deeply"
+#~ msgstr "recursivitate infinita la optiunile sinonime"
 
-#: popthelp.c:104
-msgid "FLOAT"
-msgstr ""
+#, fuzzy
+#~ msgid "error in parameter quoting"
+#~ msgstr "eroare la insertie parametru"
 
-#: popthelp.c:105
-msgid "DOUBLE"
-msgstr ""
+#~ msgid "invalid numeric value"
+#~ msgstr "valoare numarica invalida"
 
-#: popthelp.c:106
-msgid "ARG"
-msgstr ""
+#~ msgid "number too large or too small"
+#~ msgstr "numar prea mare sau prea mic"
+
+#~ msgid "unknown error"
+#~ msgstr "eroare necuinoscuta"
 
-#: popthelp.c:459
-msgid "Usage:"
-msgstr "Sintaxa:"
+#~ msgid "Usage:"
+#~ msgstr "Sintaxa:"
 
-#: popthelp.c:481
-msgid "[OPTION...]"
-msgstr "[OPTIUNE...]"
+#~ msgid "[OPTION...]"
+#~ msgstr "[OPTIUNE...]"
diff --git a/po/ru.po b/po/ru.po
index 0655d86..5f5e130 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.3\n"
-"POT-Creation-Date: 2002-01-18 16:12-0500\n"
+"POT-Creation-Date: 2002-03-13 12:58-0500\n"
 "PO-Revision-Date: 2001-07-05 21:00-0500\n"
 "Last-Translator: Eugene Kanter <eugene@blackcatlinux.com>\n"
 "Language-Team: Black Cat Linux Team <blackcat-support@blackcatlinux.com>\n"
@@ -9,103 +9,80 @@ msgstr ""
 "Content-Type: text/plain; charset=koi8-r\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: popt.c:29
-msgid "unknown errno"
-msgstr "����������� ����� ������"
+#: popthelp.c:53
+msgid "Show this help message"
+msgstr "�������� ��� ���������"
 
-#: popt.c:917
-#, c-format
-msgid "option type (%d) not implemented in popt\n"
-msgstr "��������� ��������� (%d) � popt �� �������������\n"
+#: popthelp.c:54
+msgid "Display brief usage message"
+msgstr "�������� ������� ���������� �� �������������"
 
-#: popt.c:1132
-msgid "missing argument"
-msgstr "�������� ��������"
+#: popthelp.c:57
+msgid "Display option defaults in message"
+msgstr "�������� ��������� �� ���������"
 
-#: popt.c:1134
-msgid "unknown option"
-msgstr "����������� ��������"
+#~ msgid "unknown errno"
+#~ msgstr "����������� ����� ������"
 
-#: popt.c:1136
-msgid "mutually exclusive logical operations requested"
-msgstr "��������� ������� ����������� ���������� ��������"
+#~ msgid "option type (%d) not implemented in popt\n"
+#~ msgstr "��������� ��������� (%d) � popt �� �������������\n"
 
-#: popt.c:1138
-msgid "opt->arg should not be NULL"
-msgstr "opt->arg �� ����� ���� NULL"
+#~ msgid "missing argument"
+#~ msgstr "�������� ��������"
 
-#: popt.c:1140
-msgid "aliases nested too deeply"
-msgstr "�������� ������� ���������� �������� �����������"
+#~ msgid "unknown option"
+#~ msgstr "����������� ��������"
 
-#: popt.c:1142
-msgid "error in parameter quoting"
-msgstr "�����a ��������� ���������� � �������"
+#~ msgid "mutually exclusive logical operations requested"
+#~ msgstr "��������� ������� ����������� ���������� ��������"
 
-#: popt.c:1144
-msgid "invalid numeric value"
-msgstr "������������ �������� ��������"
+#~ msgid "opt->arg should not be NULL"
+#~ msgstr "opt->arg �� ����� ���� NULL"
 
-#: popt.c:1146
-msgid "number too large or too small"
-msgstr "�������� �������� �� ��������� ����������������"
+#~ msgid "aliases nested too deeply"
+#~ msgstr "�������� ������� ���������� �������� �����������"
 
-#: popt.c:1148
-msgid "memory allocation failed"
-msgstr "������ ��������� ������"
+#~ msgid "error in parameter quoting"
+#~ msgstr "�����a ��������� ���������� � �������"
 
-#: popt.c:1152
-msgid "unknown error"
-msgstr "����������� ������"
+#~ msgid "invalid numeric value"
+#~ msgstr "������������ �������� ��������"
 
-#: popthelp.c:53
-msgid "Show this help message"
-msgstr "�������� ��� ���������"
+#~ msgid "number too large or too small"
+#~ msgstr "�������� �������� �� ��������� ����������������"
 
-#: popthelp.c:54
-msgid "Display brief usage message"
-msgstr "�������� ������� ���������� �� �������������"
+#~ msgid "memory allocation failed"
+#~ msgstr "������ ��������� ������"
 
-#: popthelp.c:57
-msgid "Display option defaults in message"
-msgstr "�������� ��������� �� ���������"
+#~ msgid "unknown error"
+#~ msgstr "����������� ������"
 
-#: popthelp.c:99
-msgid "NONE"
-msgstr "NONE"
+#~ msgid "NONE"
+#~ msgstr "NONE"
 
-#: popthelp.c:100
-msgid "VAL"
-msgstr "VAL"
+#~ msgid "VAL"
+#~ msgstr "VAL"
 
-#: popthelp.c:101
-msgid "INT"
-msgstr "INT"
+#~ msgid "INT"
+#~ msgstr "INT"
 
-#: popthelp.c:102
-msgid "LONG"
-msgstr "LONG"
+#~ msgid "LONG"
+#~ msgstr "LONG"
 
-#: popthelp.c:103
-msgid "STRING"
-msgstr "STRING"
+#~ msgid "STRING"
+#~ msgstr "STRING"
 
-#: popthelp.c:104
-msgid "FLOAT"
-msgstr "FLOAT"
+#~ msgid "FLOAT"
+#~ msgstr "FLOAT"
 
-#: popthelp.c:105
-msgid "DOUBLE"
-msgstr "DOUBLE"
+#~ msgid "DOUBLE"
+#~ msgstr "DOUBLE"
 
-#: popthelp.c:106
-msgid "ARG"
-msgstr "ARG"
+#~ msgid "ARG"
+#~ msgstr "ARG"
 
-#: popthelp.c:459
-msgid "Usage:"
-msgstr "�������������:"
+#~ msgid "Usage:"
+#~ msgstr "�������������:"
 
-#: popthelp.c:481
-msgid "[OPTION...]"
-msgstr "[��������...]"
+#~ msgid "[OPTION...]"
+#~ msgstr "[��������...]"
diff --git a/po/sk.po b/po/sk.po
index ea8c4ca..9c68ea3 100644
--- a/po/sk.po
+++ b/po/sk.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.3\n"
-"POT-Creation-Date: 2002-01-18 16:12-0500\n"
+"POT-Creation-Date: 2002-03-13 12:58-0500\n"
 "PO-Revision-Date: 1999-08-04 21:40+0200\n"
 "Last-Translator: Stanislav Meduna <stano@eunet.sk>\n"
 "Language-Team: Slovak <sk-i18n@rak.isternet.sk>\n"
@@ -13,55 +13,6 @@ msgstr ""
 "Content-Type: text/plain; charset=iso-8859-2\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: popt.c:29
-msgid "unknown errno"
-msgstr ""
-
-#: popt.c:917
-#, c-format
-msgid "option type (%d) not implemented in popt\n"
-msgstr ""
-
-#: popt.c:1132
-msgid "missing argument"
-msgstr ""
-
-#: popt.c:1134
-msgid "unknown option"
-msgstr ""
-
-#: popt.c:1136
-msgid "mutually exclusive logical operations requested"
-msgstr ""
-
-#: popt.c:1138
-msgid "opt->arg should not be NULL"
-msgstr ""
-
-#: popt.c:1140
-msgid "aliases nested too deeply"
-msgstr ""
-
-#: popt.c:1142
-msgid "error in parameter quoting"
-msgstr ""
-
-#: popt.c:1144
-msgid "invalid numeric value"
-msgstr ""
-
-#: popt.c:1146
-msgid "number too large or too small"
-msgstr ""
-
-#: popt.c:1148
-msgid "memory allocation failed"
-msgstr ""
-
-#: popt.c:1152
-msgid "unknown error"
-msgstr ""
-
 #: popthelp.c:53
 msgid "Show this help message"
 msgstr "Vyp�sa� t�to spr�vu"
@@ -74,43 +25,3 @@ msgstr "Zobrazi
 #, fuzzy
 msgid "Display option defaults in message"
 msgstr "Zobrazi� stru�n� n�vod na pou�itie"
-
-#: popthelp.c:99
-msgid "NONE"
-msgstr ""
-
-#: popthelp.c:100
-msgid "VAL"
-msgstr ""
-
-#: popthelp.c:101
-msgid "INT"
-msgstr ""
-
-#: popthelp.c:102
-msgid "LONG"
-msgstr ""
-
-#: popthelp.c:103
-msgid "STRING"
-msgstr ""
-
-#: popthelp.c:104
-msgid "FLOAT"
-msgstr ""
-
-#: popthelp.c:105
-msgid "DOUBLE"
-msgstr ""
-
-#: popthelp.c:106
-msgid "ARG"
-msgstr ""
-
-#: popthelp.c:459
-msgid "Usage:"
-msgstr ""
-
-#: popthelp.c:481
-msgid "[OPTION...]"
-msgstr ""
diff --git a/po/sl.po b/po/sl.po
index fe5f1e5..b40b3c0 100644
--- a/po/sl.po
+++ b/po/sl.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.3\n"
-"POT-Creation-Date: 2002-01-18 16:12-0500\n"
+"POT-Creation-Date: 2002-03-13 12:58-0500\n"
 "PO-Revision-Date: 2000-09-05 12:30+0200\n"
 "Last-Translator: Roman Maurer <roman.maurer@hermes.si>\n"
 "Language-Team: Slovenian <sl@li.org>\n"
@@ -9,55 +9,6 @@ msgstr ""
 "Content-Type: text/plain; charset=iso-8859-2\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: popt.c:29
-msgid "unknown errno"
-msgstr ""
-
-#: popt.c:917
-#, c-format
-msgid "option type (%d) not implemented in popt\n"
-msgstr ""
-
-#: popt.c:1132
-msgid "missing argument"
-msgstr ""
-
-#: popt.c:1134
-msgid "unknown option"
-msgstr ""
-
-#: popt.c:1136
-msgid "mutually exclusive logical operations requested"
-msgstr ""
-
-#: popt.c:1138
-msgid "opt->arg should not be NULL"
-msgstr ""
-
-#: popt.c:1140
-msgid "aliases nested too deeply"
-msgstr ""
-
-#: popt.c:1142
-msgid "error in parameter quoting"
-msgstr ""
-
-#: popt.c:1144
-msgid "invalid numeric value"
-msgstr ""
-
-#: popt.c:1146
-msgid "number too large or too small"
-msgstr ""
-
-#: popt.c:1148
-msgid "memory allocation failed"
-msgstr ""
-
-#: popt.c:1152
-msgid "unknown error"
-msgstr ""
-
 #: popthelp.c:53
 msgid "Show this help message"
 msgstr "Prika�i to sporo�ilo s pomo�jo"
@@ -70,43 +21,3 @@ msgstr "Prika
 #, fuzzy
 msgid "Display option defaults in message"
 msgstr "Prika�i kratko sporo�ilo o uporabi"
-
-#: popthelp.c:99
-msgid "NONE"
-msgstr ""
-
-#: popthelp.c:100
-msgid "VAL"
-msgstr ""
-
-#: popthelp.c:101
-msgid "INT"
-msgstr ""
-
-#: popthelp.c:102
-msgid "LONG"
-msgstr ""
-
-#: popthelp.c:103
-msgid "STRING"
-msgstr ""
-
-#: popthelp.c:104
-msgid "FLOAT"
-msgstr ""
-
-#: popthelp.c:105
-msgid "DOUBLE"
-msgstr ""
-
-#: popthelp.c:106
-msgid "ARG"
-msgstr ""
-
-#: popthelp.c:459
-msgid "Usage:"
-msgstr ""
-
-#: popthelp.c:481
-msgid "[OPTION...]"
-msgstr ""
diff --git a/po/sr.po b/po/sr.po
index 6cfef98..d9ced64 100644
--- a/po/sr.po
+++ b/po/sr.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.3\n"
-"POT-Creation-Date: 2002-01-18 16:12-0500\n"
+"POT-Creation-Date: 2002-03-13 12:58-0500\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -14,55 +14,6 @@ msgstr ""
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: ENCODING\n"
 
-#: popt.c:29
-msgid "unknown errno"
-msgstr ""
-
-#: popt.c:917
-#, c-format
-msgid "option type (%d) not implemented in popt\n"
-msgstr ""
-
-#: popt.c:1132
-msgid "missing argument"
-msgstr ""
-
-#: popt.c:1134
-msgid "unknown option"
-msgstr ""
-
-#: popt.c:1136
-msgid "mutually exclusive logical operations requested"
-msgstr ""
-
-#: popt.c:1138
-msgid "opt->arg should not be NULL"
-msgstr ""
-
-#: popt.c:1140
-msgid "aliases nested too deeply"
-msgstr ""
-
-#: popt.c:1142
-msgid "error in parameter quoting"
-msgstr ""
-
-#: popt.c:1144
-msgid "invalid numeric value"
-msgstr ""
-
-#: popt.c:1146
-msgid "number too large or too small"
-msgstr ""
-
-#: popt.c:1148
-msgid "memory allocation failed"
-msgstr ""
-
-#: popt.c:1152
-msgid "unknown error"
-msgstr ""
-
 #: popthelp.c:53
 msgid "Show this help message"
 msgstr ""
@@ -74,43 +25,3 @@ msgstr ""
 #: popthelp.c:57
 msgid "Display option defaults in message"
 msgstr ""
-
-#: popthelp.c:99
-msgid "NONE"
-msgstr ""
-
-#: popthelp.c:100
-msgid "VAL"
-msgstr ""
-
-#: popthelp.c:101
-msgid "INT"
-msgstr ""
-
-#: popthelp.c:102
-msgid "LONG"
-msgstr ""
-
-#: popthelp.c:103
-msgid "STRING"
-msgstr ""
-
-#: popthelp.c:104
-msgid "FLOAT"
-msgstr ""
-
-#: popthelp.c:105
-msgid "DOUBLE"
-msgstr ""
-
-#: popthelp.c:106
-msgid "ARG"
-msgstr ""
-
-#: popthelp.c:459
-msgid "Usage:"
-msgstr ""
-
-#: popthelp.c:481
-msgid "[OPTION...]"
-msgstr ""
diff --git a/po/sv.po b/po/sv.po
index e0b6a9f..3e7a019 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.3\n"
-"POT-Creation-Date: 2002-01-18 16:12-0500\n"
+"POT-Creation-Date: 2002-03-13 12:58-0500\n"
 "PO-Revision-Date: 2001-07-12 22:26+0100\n"
 "Last-Translator: Christian Rose <menthos@menthos.com>\n"
 "Language-Team: Swedish <sv@li.org>\n"
@@ -9,103 +9,80 @@ msgstr ""
 "Content-Type: text/plain; charset=iso-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: popt.c:29
-msgid "unknown errno"
-msgstr "ok�nt felnummer"
+#: popthelp.c:53
+msgid "Show this help message"
+msgstr "Visa denna hj�lptext"
 
-#: popt.c:917
-#, c-format
-msgid "option type (%d) not implemented in popt\n"
-msgstr "flaggtypen (%d) �r inte implementerad i popt\n"
+#: popthelp.c:54
+msgid "Display brief usage message"
+msgstr "Visa en kortfattad anv�ndningstext"
 
-#: popt.c:1132
-msgid "missing argument"
-msgstr "argument saknas"
+#: popthelp.c:57
+msgid "Display option defaults in message"
+msgstr "Visa standardalternativ f�r flaggor i meddelande"
 
-#: popt.c:1134
-msgid "unknown option"
-msgstr "ok�nd flagga"
+#~ msgid "unknown errno"
+#~ msgstr "ok�nt felnummer"
 
-#: popt.c:1136
-msgid "mutually exclusive logical operations requested"
-msgstr "�msesidigt uteslutande logiska operationer beg�rdes"
+#~ msgid "option type (%d) not implemented in popt\n"
+#~ msgstr "flaggtypen (%d) �r inte implementerad i popt\n"
 
-#: popt.c:1138
-msgid "opt->arg should not be NULL"
-msgstr "opt->arg f�r inte vara NULL"
+#~ msgid "missing argument"
+#~ msgstr "argument saknas"
 
-#: popt.c:1140
-msgid "aliases nested too deeply"
-msgstr "alias �r n�stlade f�r djupt"
+#~ msgid "unknown option"
+#~ msgstr "ok�nd flagga"
 
-#: popt.c:1142
-msgid "error in parameter quoting"
-msgstr "fel i parametercitering"
+#~ msgid "mutually exclusive logical operations requested"
+#~ msgstr "�msesidigt uteslutande logiska operationer beg�rdes"
 
-#: popt.c:1144
-msgid "invalid numeric value"
-msgstr "ogiltigt numeriskt v�rde"
+#~ msgid "opt->arg should not be NULL"
+#~ msgstr "opt->arg f�r inte vara NULL"
 
-#: popt.c:1146
-msgid "number too large or too small"
-msgstr "talet f�r stort eller f�r litet"
+#~ msgid "aliases nested too deeply"
+#~ msgstr "alias �r n�stlade f�r djupt"
 
-#: popt.c:1148
-msgid "memory allocation failed"
-msgstr "minnesallokering misslyckades"
+#~ msgid "error in parameter quoting"
+#~ msgstr "fel i parametercitering"
 
-#: popt.c:1152
-msgid "unknown error"
-msgstr "ok�nt fel"
+#~ msgid "invalid numeric value"
+#~ msgstr "ogiltigt numeriskt v�rde"
 
-#: popthelp.c:53
-msgid "Show this help message"
-msgstr "Visa denna hj�lptext"
+#~ msgid "number too large or too small"
+#~ msgstr "talet f�r stort eller f�r litet"
 
-#: popthelp.c:54
-msgid "Display brief usage message"
-msgstr "Visa en kortfattad anv�ndningstext"
+#~ msgid "memory allocation failed"
+#~ msgstr "minnesallokering misslyckades"
 
-#: popthelp.c:57
-msgid "Display option defaults in message"
-msgstr "Visa standardalternativ f�r flaggor i meddelande"
+#~ msgid "unknown error"
+#~ msgstr "ok�nt fel"
 
-#: popthelp.c:99
-msgid "NONE"
-msgstr "INGET"
+#~ msgid "NONE"
+#~ msgstr "INGET"
 
-#: popthelp.c:100
-msgid "VAL"
-msgstr "V�RDE"
+#~ msgid "VAL"
+#~ msgstr "V�RDE"
 
-#: popthelp.c:101
-msgid "INT"
-msgstr "HELTAL"
+#~ msgid "INT"
+#~ msgstr "HELTAL"
 
-#: popthelp.c:102
-msgid "LONG"
-msgstr "L�NG"
+#~ msgid "LONG"
+#~ msgstr "L�NG"
 
-#: popthelp.c:103
-msgid "STRING"
-msgstr "STR�NG"
+#~ msgid "STRING"
+#~ msgstr "STR�NG"
 
-#: popthelp.c:104
-msgid "FLOAT"
-msgstr "FLYTTAL"
+#~ msgid "FLOAT"
+#~ msgstr "FLYTTAL"
 
-#: popthelp.c:105
-msgid "DOUBLE"
-msgstr "DUBBEL"
+#~ msgid "DOUBLE"
+#~ msgstr "DUBBEL"
 
-#: popthelp.c:106
-msgid "ARG"
-msgstr "ARG"
+#~ msgid "ARG"
+#~ msgstr "ARG"
 
-#: popthelp.c:459
-msgid "Usage:"
-msgstr "Anv�ndning:"
+#~ msgid "Usage:"
+#~ msgstr "Anv�ndning:"
 
-#: popthelp.c:481
-msgid "[OPTION...]"
-msgstr "[FLAGGA...]"
+#~ msgid "[OPTION...]"
+#~ msgstr "[FLAGGA...]"
diff --git a/po/tr.po b/po/tr.po
index 3eb3d37..609f361 100644
--- a/po/tr.po
+++ b/po/tr.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.3\n"
-"POT-Creation-Date: 2002-01-18 16:12-0500\n"
+"POT-Creation-Date: 2002-03-13 12:58-0500\n"
 "PO-Revision-Date: 2000-02-11 13:01+0200\n"
 "Last-Translator: Nilgun Belma Buguner <nilgun@technologist.com>\n"
 "Language-Team: Turkish <tr@li.org>\n"
@@ -9,55 +9,6 @@ msgstr ""
 "Content-Type: text/plain; charset=iso8859-9\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: popt.c:29
-msgid "unknown errno"
-msgstr "bilinmeyen hata no"
-
-#: popt.c:917
-#, c-format
-msgid "option type (%d) not implemented in popt\n"
-msgstr "se�enek t�r� (%d) popt i�in ge�ersiz\n"
-
-#: popt.c:1132
-msgid "missing argument"
-msgstr "arg�man eksik"
-
-#: popt.c:1134
-msgid "unknown option"
-msgstr "bilinmeyen se�enek"
-
-#: popt.c:1136
-msgid "mutually exclusive logical operations requested"
-msgstr "birbirini d��layan mant�ksal i�lemler istendi"
-
-#: popt.c:1138
-msgid "opt->arg should not be NULL"
-msgstr ""
-
-#: popt.c:1140
-msgid "aliases nested too deeply"
-msgstr "adlarda �ok fazla i�i�elikler"
-
-#: popt.c:1142
-msgid "error in parameter quoting"
-msgstr "parametrelerde t�rnak i�aretleme hatal� "
-
-#: popt.c:1144
-msgid "invalid numeric value"
-msgstr "say�sal de�er ge�ersiz"
-
-#: popt.c:1146
-msgid "number too large or too small"
-msgstr "say� ya �ok b�y�k ya da �ok k���k"
-
-#: popt.c:1148
-msgid "memory allocation failed"
-msgstr ""
-
-#: popt.c:1152
-msgid "unknown error"
-msgstr "bilinmeyen hata"
-
 #: popthelp.c:53
 msgid "Show this help message"
 msgstr "Bu yard�m iletisini g�sterir"
@@ -71,42 +22,62 @@ msgstr "K
 msgid "Display option defaults in message"
 msgstr "K�sa bir kullan�m iletisi g�ster"
 
-#: popthelp.c:99
-msgid "NONE"
-msgstr "YOK"
+#~ msgid "unknown errno"
+#~ msgstr "bilinmeyen hata no"
+
+#~ msgid "option type (%d) not implemented in popt\n"
+#~ msgstr "se�enek t�r� (%d) popt i�in ge�ersiz\n"
+
+#~ msgid "missing argument"
+#~ msgstr "arg�man eksik"
+
+#~ msgid "unknown option"
+#~ msgstr "bilinmeyen se�enek"
+
+#~ msgid "mutually exclusive logical operations requested"
+#~ msgstr "birbirini d��layan mant�ksal i�lemler istendi"
+
+#~ msgid "aliases nested too deeply"
+#~ msgstr "adlarda �ok fazla i�i�elikler"
+
+#~ msgid "error in parameter quoting"
+#~ msgstr "parametrelerde t�rnak i�aretleme hatal� "
+
+#~ msgid "invalid numeric value"
+#~ msgstr "say�sal de�er ge�ersiz"
+
+#~ msgid "number too large or too small"
+#~ msgstr "say� ya �ok b�y�k ya da �ok k���k"
+
+#~ msgid "unknown error"
+#~ msgstr "bilinmeyen hata"
+
+#~ msgid "NONE"
+#~ msgstr "YOK"
 
-#: popthelp.c:100
-msgid "VAL"
-msgstr "DE�"
+#~ msgid "VAL"
+#~ msgstr "DE�"
 
-#: popthelp.c:101
-msgid "INT"
-msgstr "INT"
+#~ msgid "INT"
+#~ msgstr "INT"
 
-#: popthelp.c:102
-msgid "LONG"
-msgstr "LONG"
+#~ msgid "LONG"
+#~ msgstr "LONG"
 
-#: popthelp.c:103
-msgid "STRING"
-msgstr "STRING"
+#~ msgid "STRING"
+#~ msgstr "STRING"
 
-#: popthelp.c:104
-msgid "FLOAT"
-msgstr "FLOAT"
+#~ msgid "FLOAT"
+#~ msgstr "FLOAT"
 
-#: popthelp.c:105
-msgid "DOUBLE"
-msgstr "DOUBLE"
+#~ msgid "DOUBLE"
+#~ msgstr "DOUBLE"
 
-#: popthelp.c:106
-msgid "ARG"
-msgstr "ARG"
+#~ msgid "ARG"
+#~ msgstr "ARG"
 
-#: popthelp.c:459
-msgid "Usage:"
-msgstr "Kullan�m�:"
+#~ msgid "Usage:"
+#~ msgstr "Kullan�m�:"
 
-#: popthelp.c:481
-msgid "[OPTION...]"
-msgstr "[SE�ENEK...]"
+#~ msgid "[OPTION...]"
+#~ msgstr "[SE�ENEK...]"
diff --git a/po/uk.po b/po/uk.po
index 4ddfa1d..e9fe677 100644
--- a/po/uk.po
+++ b/po/uk.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.3\n"
-"POT-Creation-Date: 2002-01-18 16:12-0500\n"
+"POT-Creation-Date: 2002-03-13 12:58-0500\n"
 "PO-Revision-Date: 1999-09-30 16:54+0200\n"
 "Last-Translator: Yuri Syrota <rasta@renome.rovno.ua>\n"
 "Language-Team: Ukrainian <uk@li.org>\n"
@@ -13,55 +13,6 @@ msgstr ""
 "Content-Type: text/plain; charset=koi8-u\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: popt.c:29
-msgid "unknown errno"
-msgstr ""
-
-#: popt.c:917
-#, c-format
-msgid "option type (%d) not implemented in popt\n"
-msgstr ""
-
-#: popt.c:1132
-msgid "missing argument"
-msgstr ""
-
-#: popt.c:1134
-msgid "unknown option"
-msgstr ""
-
-#: popt.c:1136
-msgid "mutually exclusive logical operations requested"
-msgstr ""
-
-#: popt.c:1138
-msgid "opt->arg should not be NULL"
-msgstr ""
-
-#: popt.c:1140
-msgid "aliases nested too deeply"
-msgstr ""
-
-#: popt.c:1142
-msgid "error in parameter quoting"
-msgstr ""
-
-#: popt.c:1144
-msgid "invalid numeric value"
-msgstr ""
-
-#: popt.c:1146
-msgid "number too large or too small"
-msgstr ""
-
-#: popt.c:1148
-msgid "memory allocation failed"
-msgstr ""
-
-#: popt.c:1152
-msgid "unknown error"
-msgstr ""
-
 #: popthelp.c:53
 msgid "Show this help message"
 msgstr "�������� �� ��צ���"
@@ -74,43 +25,3 @@ msgstr "
 #, fuzzy
 msgid "Display option defaults in message"
 msgstr "�������� ������� ��צ��� ��� ������������"
-
-#: popthelp.c:99
-msgid "NONE"
-msgstr ""
-
-#: popthelp.c:100
-msgid "VAL"
-msgstr ""
-
-#: popthelp.c:101
-msgid "INT"
-msgstr ""
-
-#: popthelp.c:102
-msgid "LONG"
-msgstr ""
-
-#: popthelp.c:103
-msgid "STRING"
-msgstr ""
-
-#: popthelp.c:104
-msgid "FLOAT"
-msgstr ""
-
-#: popthelp.c:105
-msgid "DOUBLE"
-msgstr ""
-
-#: popthelp.c:106
-msgid "ARG"
-msgstr ""
-
-#: popthelp.c:459
-msgid "Usage:"
-msgstr ""
-
-#: popthelp.c:481
-msgid "[OPTION...]"
-msgstr ""
diff --git a/po/wa.po b/po/wa.po
index b1b0d10..2d12949 100644
--- a/po/wa.po
+++ b/po/wa.po
@@ -9,7 +9,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.3\n"
-"POT-Creation-Date: 2002-01-18 16:12-0500\n"
+"POT-Creation-Date: 2002-03-13 12:58-0500\n"
 "PO-Revision-Date: 1999-03-18 23:11+0100\n"
 "Last-Translator: Nobody yet\n"
 "Language-Team: walon <linux-wa@chanae.alphanet.ch>\n"
@@ -17,55 +17,6 @@ msgstr ""
 "Content-Type: text/plain; charset=iso-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: popt.c:29
-msgid "unknown errno"
-msgstr ""
-
-#: popt.c:917
-#, c-format
-msgid "option type (%d) not implemented in popt\n"
-msgstr ""
-
-#: popt.c:1132
-msgid "missing argument"
-msgstr ""
-
-#: popt.c:1134
-msgid "unknown option"
-msgstr ""
-
-#: popt.c:1136
-msgid "mutually exclusive logical operations requested"
-msgstr ""
-
-#: popt.c:1138
-msgid "opt->arg should not be NULL"
-msgstr ""
-
-#: popt.c:1140
-msgid "aliases nested too deeply"
-msgstr ""
-
-#: popt.c:1142
-msgid "error in parameter quoting"
-msgstr ""
-
-#: popt.c:1144
-msgid "invalid numeric value"
-msgstr ""
-
-#: popt.c:1146
-msgid "number too large or too small"
-msgstr ""
-
-#: popt.c:1148
-msgid "memory allocation failed"
-msgstr ""
-
-#: popt.c:1152
-msgid "unknown error"
-msgstr ""
-
 #: popthelp.c:53
 msgid "Show this help message"
 msgstr "Mostrer ci messaedje d' aide chal"
@@ -78,43 +29,3 @@ msgstr "Mostre on court messaedje so kmint vos 
 #, fuzzy
 msgid "Display option defaults in message"
 msgstr "Mostre on court messaedje so kmint vos � siervi"
-
-#: popthelp.c:99
-msgid "NONE"
-msgstr ""
-
-#: popthelp.c:100
-msgid "VAL"
-msgstr ""
-
-#: popthelp.c:101
-msgid "INT"
-msgstr ""
-
-#: popthelp.c:102
-msgid "LONG"
-msgstr ""
-
-#: popthelp.c:103
-msgid "STRING"
-msgstr ""
-
-#: popthelp.c:104
-msgid "FLOAT"
-msgstr ""
-
-#: popthelp.c:105
-msgid "DOUBLE"
-msgstr ""
-
-#: popthelp.c:106
-msgid "ARG"
-msgstr ""
-
-#: popthelp.c:459
-msgid "Usage:"
-msgstr ""
-
-#: popthelp.c:481
-msgid "[OPTION...]"
-msgstr ""
diff --git a/po/zh.po b/po/zh.po
index 6cfef98..d9ced64 100644
--- a/po/zh.po
+++ b/po/zh.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.3\n"
-"POT-Creation-Date: 2002-01-18 16:12-0500\n"
+"POT-Creation-Date: 2002-03-13 12:58-0500\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -14,55 +14,6 @@ msgstr ""
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: ENCODING\n"
 
-#: popt.c:29
-msgid "unknown errno"
-msgstr ""
-
-#: popt.c:917
-#, c-format
-msgid "option type (%d) not implemented in popt\n"
-msgstr ""
-
-#: popt.c:1132
-msgid "missing argument"
-msgstr ""
-
-#: popt.c:1134
-msgid "unknown option"
-msgstr ""
-
-#: popt.c:1136
-msgid "mutually exclusive logical operations requested"
-msgstr ""
-
-#: popt.c:1138
-msgid "opt->arg should not be NULL"
-msgstr ""
-
-#: popt.c:1140
-msgid "aliases nested too deeply"
-msgstr ""
-
-#: popt.c:1142
-msgid "error in parameter quoting"
-msgstr ""
-
-#: popt.c:1144
-msgid "invalid numeric value"
-msgstr ""
-
-#: popt.c:1146
-msgid "number too large or too small"
-msgstr ""
-
-#: popt.c:1148
-msgid "memory allocation failed"
-msgstr ""
-
-#: popt.c:1152
-msgid "unknown error"
-msgstr ""
-
 #: popthelp.c:53
 msgid "Show this help message"
 msgstr ""
@@ -74,43 +25,3 @@ msgstr ""
 #: popthelp.c:57
 msgid "Display option defaults in message"
 msgstr ""
-
-#: popthelp.c:99
-msgid "NONE"
-msgstr ""
-
-#: popthelp.c:100
-msgid "VAL"
-msgstr ""
-
-#: popthelp.c:101
-msgid "INT"
-msgstr ""
-
-#: popthelp.c:102
-msgid "LONG"
-msgstr ""
-
-#: popthelp.c:103
-msgid "STRING"
-msgstr ""
-
-#: popthelp.c:104
-msgid "FLOAT"
-msgstr ""
-
-#: popthelp.c:105
-msgid "DOUBLE"
-msgstr ""
-
-#: popthelp.c:106
-msgid "ARG"
-msgstr ""
-
-#: popthelp.c:459
-msgid "Usage:"
-msgstr ""
-
-#: popthelp.c:481
-msgid "[OPTION...]"
-msgstr ""
diff --git a/po/zh_CN.GB2312.po b/po/zh_CN.GB2312.po
index 8a54e4c..0f4f96e 100644
--- a/po/zh_CN.GB2312.po
+++ b/po/zh_CN.GB2312.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.3\n"
-"POT-Creation-Date: 2002-01-18 16:12-0500\n"
+"POT-Creation-Date: 2002-03-13 12:58-0500\n"
 "PO-Revision-Date: 1999-11-11 05:04+0800\n"
 "Last-Translator: Dillion Chen <dillon.chen@turbolinux.com.cn>\n"
 "Language-Team: TLDN\n"
@@ -9,55 +9,6 @@ msgstr ""
 "Content-Type: text/plain; charset=gb2312\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: popt.c:29
-msgid "unknown errno"
-msgstr ""
-
-#: popt.c:917
-#, c-format
-msgid "option type (%d) not implemented in popt\n"
-msgstr ""
-
-#: popt.c:1132
-msgid "missing argument"
-msgstr ""
-
-#: popt.c:1134
-msgid "unknown option"
-msgstr ""
-
-#: popt.c:1136
-msgid "mutually exclusive logical operations requested"
-msgstr ""
-
-#: popt.c:1138
-msgid "opt->arg should not be NULL"
-msgstr ""
-
-#: popt.c:1140
-msgid "aliases nested too deeply"
-msgstr ""
-
-#: popt.c:1142
-msgid "error in parameter quoting"
-msgstr ""
-
-#: popt.c:1144
-msgid "invalid numeric value"
-msgstr ""
-
-#: popt.c:1146
-msgid "number too large or too small"
-msgstr ""
-
-#: popt.c:1148
-msgid "memory allocation failed"
-msgstr ""
-
-#: popt.c:1152
-msgid "unknown error"
-msgstr ""
-
 #: popthelp.c:53
 msgid "Show this help message"
 msgstr "��ʾ����������Ϣ"
@@ -70,43 +21,3 @@ msgstr "
 #, fuzzy
 msgid "Display option defaults in message"
 msgstr "��ʾ���ʹ����Ϣ"
-
-#: popthelp.c:99
-msgid "NONE"
-msgstr ""
-
-#: popthelp.c:100
-msgid "VAL"
-msgstr ""
-
-#: popthelp.c:101
-msgid "INT"
-msgstr ""
-
-#: popthelp.c:102
-msgid "LONG"
-msgstr ""
-
-#: popthelp.c:103
-msgid "STRING"
-msgstr ""
-
-#: popthelp.c:104
-msgid "FLOAT"
-msgstr ""
-
-#: popthelp.c:105
-msgid "DOUBLE"
-msgstr ""
-
-#: popthelp.c:106
-msgid "ARG"
-msgstr ""
-
-#: popthelp.c:459
-msgid "Usage:"
-msgstr ""
-
-#: popthelp.c:481
-msgid "[OPTION...]"
-msgstr ""
-- 
Gitee


From 03ad4019f618244fecd578f4a3da7cf8fb76a1e3 Mon Sep 17 00:00:00 2001
From: Jeff Johnson <n3npq@mac.com>
Date: Mon, 8 Apr 2002 18:56:56 +0000
Subject: [PATCH 336/667] doxygen cleanup.

---
 configure.in       |  3 +--
 po/cs.po           |  8 ++++----
 po/da.po           |  8 ++++----
 po/de.po           |  8 ++++----
 po/es.po           | 22 +++++++++++-----------
 po/eu_ES.po        |  8 ++++----
 po/fi.po           |  8 ++++----
 po/fr.po           |  8 ++++----
 po/gl.po           |  8 ++++----
 po/hu.po           |  8 ++++----
 po/id.po           |  8 ++++----
 po/is.po           |  8 ++++----
 po/it.po           |  8 ++++----
 po/ja.po           |  8 ++++----
 po/ko.po           |  8 ++++----
 po/no.po           |  8 ++++----
 po/pl.po           |  8 ++++----
 po/popt.pot        | 11 ++++++-----
 po/pt_BR.po        |  8 ++++----
 po/ro.po           |  8 ++++----
 po/ru.po           |  8 ++++----
 po/sk.po           |  8 ++++----
 po/sl.po           |  8 ++++----
 po/sr.po           |  8 ++++----
 po/sv.po           |  8 ++++----
 po/tr.po           |  8 ++++----
 po/uk.po           |  8 ++++----
 po/wa.po           |  8 ++++----
 po/zh.po           |  8 ++++----
 po/zh_CN.GB2312.po |  8 ++++----
 popt.h             |  3 ++-
 popthelp.c         | 18 ++++++++++++++++++
 32 files changed, 146 insertions(+), 127 deletions(-)

diff --git a/configure.in b/configure.in
index 2910dd6..b00ba21 100755
--- a/configure.in
+++ b/configure.in
@@ -83,5 +83,4 @@ POPT_SOURCE_PATH="`pwd`"
 AC_DEFINE_UNQUOTED(POPT_SOURCE_PATH, "$POPT_SOURCE_PATH")
 AC_SUBST(POPT_SOURCE_PATH)
 
-AC_OUTPUT([Doxyfile Makefile intl/Makefile po/Makefile.in],
-	[sed -e "/POTFILES =/r po/POTFILES" po/Makefile.in > po/Makefile])
+AC_OUTPUT([Doxyfile Makefile intl/Makefile po/Makefile.in])
diff --git a/po/cs.po b/po/cs.po
index 6a09338..cd07509 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.3\n"
-"POT-Creation-Date: 2002-03-13 12:58-0500\n"
+"POT-Creation-Date: 2002-04-08 13:11-0400\n"
 "PO-Revision-Date: 2001-07-24 00:03+0100\n"
 "Last-Translator: Milan Kerslager <kerslage@linux.cz>\n"
 "Language-Team: Czech <cs@li.org>\n"
@@ -9,15 +9,15 @@ msgstr ""
 "Content-Type: text/plain; charset=iso-8859-2\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: popthelp.c:53
+#: popthelp.c:57
 msgid "Show this help message"
 msgstr "Vyp��e tuto n�pov�du"
 
-#: popthelp.c:54
+#: popthelp.c:58
 msgid "Display brief usage message"
 msgstr "Vyp��e kr�tk� n�vod k pou�it�"
 
-#: popthelp.c:57
+#: popthelp.c:61
 msgid "Display option defaults in message"
 msgstr "Zobrazit implicitn� volby ve zpr�v�"
 
diff --git a/po/da.po b/po/da.po
index b09e434..e32b17c 100644
--- a/po/da.po
+++ b/po/da.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.3\n"
-"POT-Creation-Date: 2002-03-13 12:58-0500\n"
+"POT-Creation-Date: 2002-04-08 13:11-0400\n"
 "PO-Revision-Date: Sun Jan 21 2001 04:30:32+0200\n"
 "Last-Translator: Martin Hansen <mah@k64.dk>\n"
 "Language-Team: Dansk <dansk@klid.dk>\n"
@@ -10,15 +10,15 @@ msgstr ""
 "Content-Transfer-Encoding: 8-bit\n"
 "X-Generator: KTranslator v 0.6.0\n"
 
-#: popthelp.c:53
+#: popthelp.c:57
 msgid "Show this help message"
 msgstr "Vis denne hj�lpemeddelelse"
 
-#: popthelp.c:54
+#: popthelp.c:58
 msgid "Display brief usage message"
 msgstr "Vis kortfattet brugsanvisning"
 
-#: popthelp.c:57
+#: popthelp.c:61
 #, fuzzy
 msgid "Display option defaults in message"
 msgstr "Vis kortfattet brugsanvisning"
diff --git a/po/de.po b/po/de.po
index d9ced64..fa89fb7 100644
--- a/po/de.po
+++ b/po/de.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.3\n"
-"POT-Creation-Date: 2002-03-13 12:58-0500\n"
+"POT-Creation-Date: 2002-04-08 13:11-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -14,14 +14,14 @@ msgstr ""
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: ENCODING\n"
 
-#: popthelp.c:53
+#: popthelp.c:57
 msgid "Show this help message"
 msgstr ""
 
-#: popthelp.c:54
+#: popthelp.c:58
 msgid "Display brief usage message"
 msgstr ""
 
-#: popthelp.c:57
+#: popthelp.c:61
 msgid "Display option defaults in message"
 msgstr ""
diff --git a/po/es.po b/po/es.po
index 7d84d41..79fdac3 100644
--- a/po/es.po
+++ b/po/es.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.3\n"
-"POT-Creation-Date: 2002-03-13 12:58-0500\n"
+"POT-Creation-Date: 2002-04-08 13:11-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Leandro Lucarella <luca@linuxmendoza.org.ar>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -14,15 +14,15 @@ msgstr ""
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: ENCODING\n"
 
-#: popthelp.c:53
+#: popthelp.c:57
 msgid "Show this help message"
 msgstr "Muestra este mensaje de ayuda"
 
-#: popthelp.c:54
+#: popthelp.c:58
 msgid "Display brief usage message"
 msgstr "Indica el modo de uso resumido"
 
-#: popthelp.c:57
+#: popthelp.c:61
 #, fuzzy
 msgid "Display option defaults in message"
 msgstr "Indica el modo de uso resumido"
@@ -31,28 +31,28 @@ msgstr "Indica el modo de uso resumido"
 #~ msgstr "errno desconocido"
 
 #~ msgid "option type (%d) not implemented in popt\n"
-#~ msgstr "tipo de opci�n (%d) no implementada en popt\n"
+#~ msgstr "tipo de opcin (%d) no implementada en popt\n"
 
 #~ msgid "missing argument"
 #~ msgstr "falta argumento"
 
 #~ msgid "unknown option"
-#~ msgstr "opci�n desconocida"
+#~ msgstr "opcin desconocida"
 
 #~ msgid "mutually exclusive logical operations requested"
-#~ msgstr "requerida operaci�n l�gica mutuamente exclusiva"
+#~ msgstr "requerida operacin lgica mutuamente exclusiva"
 
 #~ msgid "aliases nested too deeply"
 #~ msgstr "alias anidados muy profundamente"
 
 #~ msgid "error in parameter quoting"
-#~ msgstr "error en cita de par�metros"
+#~ msgstr "error en cita de parmetros"
 
 #~ msgid "invalid numeric value"
-#~ msgstr "valor num�rico inv�lido"
+#~ msgstr "valor numrico invlido"
 
 #~ msgid "number too large or too small"
-#~ msgstr "n�mero muy largo o muy peque�o"
+#~ msgstr "nmero muy largo o muy pequeo"
 
 #~ msgid "unknown error"
 #~ msgstr "error desconocido"
@@ -85,4 +85,4 @@ msgstr "Indica el modo de uso resumido"
 #~ msgstr "Modo de Uso:"
 
 #~ msgid "[OPTION...]"
-#~ msgstr "[OPCI�N...]"
+#~ msgstr "[OPCIN...]"
diff --git a/po/eu_ES.po b/po/eu_ES.po
index d9ced64..fa89fb7 100644
--- a/po/eu_ES.po
+++ b/po/eu_ES.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.3\n"
-"POT-Creation-Date: 2002-03-13 12:58-0500\n"
+"POT-Creation-Date: 2002-04-08 13:11-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -14,14 +14,14 @@ msgstr ""
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: ENCODING\n"
 
-#: popthelp.c:53
+#: popthelp.c:57
 msgid "Show this help message"
 msgstr ""
 
-#: popthelp.c:54
+#: popthelp.c:58
 msgid "Display brief usage message"
 msgstr ""
 
-#: popthelp.c:57
+#: popthelp.c:61
 msgid "Display option defaults in message"
 msgstr ""
diff --git a/po/fi.po b/po/fi.po
index d9ced64..fa89fb7 100644
--- a/po/fi.po
+++ b/po/fi.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.3\n"
-"POT-Creation-Date: 2002-03-13 12:58-0500\n"
+"POT-Creation-Date: 2002-04-08 13:11-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -14,14 +14,14 @@ msgstr ""
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: ENCODING\n"
 
-#: popthelp.c:53
+#: popthelp.c:57
 msgid "Show this help message"
 msgstr ""
 
-#: popthelp.c:54
+#: popthelp.c:58
 msgid "Display brief usage message"
 msgstr ""
 
-#: popthelp.c:57
+#: popthelp.c:61
 msgid "Display option defaults in message"
 msgstr ""
diff --git a/po/fr.po b/po/fr.po
index d9ced64..fa89fb7 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.3\n"
-"POT-Creation-Date: 2002-03-13 12:58-0500\n"
+"POT-Creation-Date: 2002-04-08 13:11-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -14,14 +14,14 @@ msgstr ""
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: ENCODING\n"
 
-#: popthelp.c:53
+#: popthelp.c:57
 msgid "Show this help message"
 msgstr ""
 
-#: popthelp.c:54
+#: popthelp.c:58
 msgid "Display brief usage message"
 msgstr ""
 
-#: popthelp.c:57
+#: popthelp.c:61
 msgid "Display option defaults in message"
 msgstr ""
diff --git a/po/gl.po b/po/gl.po
index 46d2df4..4a2024b 100644
--- a/po/gl.po
+++ b/po/gl.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.3\n"
-"POT-Creation-Date: 2002-03-13 12:58-0500\n"
+"POT-Creation-Date: 2002-04-08 13:11-0400\n"
 "PO-Revision-Date: 2001-01-17 01:01+0100\n"
 "Last-Translator: Jes�s Bravo �lvarez <jba@pobox.com>\n"
 "Language-Team: Galician <trasno@ceu.fi.udc.es>\n"
@@ -9,15 +9,15 @@ msgstr ""
 "Content-Type: text/plain; charset=iso-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: popthelp.c:53
+#: popthelp.c:57
 msgid "Show this help message"
 msgstr "Amosar esta mensaxe de axuda"
 
-#: popthelp.c:54
+#: popthelp.c:58
 msgid "Display brief usage message"
 msgstr "Amosar brevemente o xeito de utilizaci�n"
 
-#: popthelp.c:57
+#: popthelp.c:61
 #, fuzzy
 msgid "Display option defaults in message"
 msgstr "Amosar brevemente o xeito de utilizaci�n"
diff --git a/po/hu.po b/po/hu.po
index 30eda3d..c52942a 100644
--- a/po/hu.po
+++ b/po/hu.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.3\n"
-"POT-Creation-Date: 2002-03-13 12:58-0500\n"
+"POT-Creation-Date: 2002-04-08 13:11-0400\n"
 "PO-Revision-Date: 2000-08-03 23:26+0200\n"
 "Last-Translator: L�szl� N�meth <nemeth@qwertynet.hu>\n"
 "Language-Team: Hungarian\n"
@@ -9,15 +9,15 @@ msgstr ""
 "Content-Type: text/plain; charset=ISO-8859-2\n"
 "Content-Transfer-Encoding: 8-bit\n"
 
-#: popthelp.c:53
+#: popthelp.c:57
 msgid "Show this help message"
 msgstr "E s�g� megjelen�t�se"
 
-#: popthelp.c:54
+#: popthelp.c:58
 msgid "Display brief usage message"
 msgstr "R�vid haszn�lati utas�t�s megjelen�t�se"
 
-#: popthelp.c:57
+#: popthelp.c:61
 #, fuzzy
 msgid "Display option defaults in message"
 msgstr "R�vid haszn�lati utas�t�s megjelen�t�se"
diff --git a/po/id.po b/po/id.po
index d9ced64..fa89fb7 100644
--- a/po/id.po
+++ b/po/id.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.3\n"
-"POT-Creation-Date: 2002-03-13 12:58-0500\n"
+"POT-Creation-Date: 2002-04-08 13:11-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -14,14 +14,14 @@ msgstr ""
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: ENCODING\n"
 
-#: popthelp.c:53
+#: popthelp.c:57
 msgid "Show this help message"
 msgstr ""
 
-#: popthelp.c:54
+#: popthelp.c:58
 msgid "Display brief usage message"
 msgstr ""
 
-#: popthelp.c:57
+#: popthelp.c:61
 msgid "Display option defaults in message"
 msgstr ""
diff --git a/po/is.po b/po/is.po
index 33c2f66..1d1502e 100644
--- a/po/is.po
+++ b/po/is.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.3\n"
-"POT-Creation-Date: 2002-03-13 12:58-0500\n"
+"POT-Creation-Date: 2002-04-08 13:11-0400\n"
 "PO-Revision-Date: 2001-06-08 01:35+0000\n"
 "Last-Translator: Richard Allen <ra@hp.is>\n"
 "Language-Team: is <kde-isl@mmedia.is>\n"
@@ -9,15 +9,15 @@ msgstr ""
 "Content-Type: text/plain; charset=ISO-8859-1\n"
 "Content-Transfer-Encoding: 8-bit\n"
 
-#: popthelp.c:53
+#: popthelp.c:57
 msgid "Show this help message"
 msgstr "S�na �essa hj�lp"
 
-#: popthelp.c:54
+#: popthelp.c:58
 msgid "Display brief usage message"
 msgstr "S�na stuttar notkunarlei�beiningar"
 
-#: popthelp.c:57
+#: popthelp.c:61
 msgid "Display option defaults in message"
 msgstr "S�na sj�lfgefin gildi rofa � skilabo�um"
 
diff --git a/po/it.po b/po/it.po
index d9ced64..fa89fb7 100644
--- a/po/it.po
+++ b/po/it.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.3\n"
-"POT-Creation-Date: 2002-03-13 12:58-0500\n"
+"POT-Creation-Date: 2002-04-08 13:11-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -14,14 +14,14 @@ msgstr ""
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: ENCODING\n"
 
-#: popthelp.c:53
+#: popthelp.c:57
 msgid "Show this help message"
 msgstr ""
 
-#: popthelp.c:54
+#: popthelp.c:58
 msgid "Display brief usage message"
 msgstr ""
 
-#: popthelp.c:57
+#: popthelp.c:61
 msgid "Display option defaults in message"
 msgstr ""
diff --git a/po/ja.po b/po/ja.po
index d9ced64..fa89fb7 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.3\n"
-"POT-Creation-Date: 2002-03-13 12:58-0500\n"
+"POT-Creation-Date: 2002-04-08 13:11-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -14,14 +14,14 @@ msgstr ""
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: ENCODING\n"
 
-#: popthelp.c:53
+#: popthelp.c:57
 msgid "Show this help message"
 msgstr ""
 
-#: popthelp.c:54
+#: popthelp.c:58
 msgid "Display brief usage message"
 msgstr ""
 
-#: popthelp.c:57
+#: popthelp.c:61
 msgid "Display option defaults in message"
 msgstr ""
diff --git a/po/ko.po b/po/ko.po
index b013078..fa49e2a 100644
--- a/po/ko.po
+++ b/po/ko.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6\n"
-"POT-Creation-Date: 2002-03-13 12:58-0500\n"
+"POT-Creation-Date: 2002-04-08 13:11-0400\n"
 "PO-Revision-Date: 2001-09-06 20:06+0900\n"
 "Last-Translator: Jong-Hoon Ryu <redhat4u@netian.com>\n"
 "Language-Team: GNU Translation project <ko@li.org>\n"
@@ -9,15 +9,15 @@ msgstr ""
 "Content-Type: text/plain; charset=EUC-KR\n"
 "Content-Transfer-Encoding: 8-bit\n"
 
-#: popthelp.c:53
+#: popthelp.c:57
 msgid "Show this help message"
 msgstr "�� ������ �����ݴϴ�"
 
-#: popthelp.c:54
+#: popthelp.c:58
 msgid "Display brief usage message"
 msgstr "������ ������ �����ݴϴ�"
 
-#: popthelp.c:57
+#: popthelp.c:61
 msgid "Display option defaults in message"
 msgstr "�⺻���� �ɼ��� �����ݴϴ�"
 
diff --git a/po/no.po b/po/no.po
index 3572e8e..c2bf091 100644
--- a/po/no.po
+++ b/po/no.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.3\n"
-"POT-Creation-Date: 2002-03-13 12:58-0500\n"
+"POT-Creation-Date: 2002-04-08 13:11-0400\n"
 "PO-Revision-Date: 2001-06-27 11:05+0200\n"
 "Last-Translator: Kjartan Maraas <kmaraas@online.no>\n"
 "Language-Team: Norwegian <no@li.org>\n"
@@ -9,15 +9,15 @@ msgstr ""
 "Content-Type: text/plain; charset=iso-8859-1\n"
 "Content-Transfer-Encoding: 8-bit\n"
 
-#: popthelp.c:53
+#: popthelp.c:57
 msgid "Show this help message"
 msgstr "Vis denne hjelpmeldingen"
 
-#: popthelp.c:54
+#: popthelp.c:58
 msgid "Display brief usage message"
 msgstr "Vis kort bruksmelding"
 
-#: popthelp.c:57
+#: popthelp.c:61
 msgid "Display option defaults in message"
 msgstr "Vis forvalgte flagg i melding"
 
diff --git a/po/pl.po b/po/pl.po
index d9ced64..fa89fb7 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.3\n"
-"POT-Creation-Date: 2002-03-13 12:58-0500\n"
+"POT-Creation-Date: 2002-04-08 13:11-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -14,14 +14,14 @@ msgstr ""
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: ENCODING\n"
 
-#: popthelp.c:53
+#: popthelp.c:57
 msgid "Show this help message"
 msgstr ""
 
-#: popthelp.c:54
+#: popthelp.c:58
 msgid "Display brief usage message"
 msgstr ""
 
-#: popthelp.c:57
+#: popthelp.c:61
 msgid "Display option defaults in message"
 msgstr ""
diff --git a/po/popt.pot b/po/popt.pot
index c0c056c..5fdb8a8 100644
--- a/po/popt.pot
+++ b/po/popt.pot
@@ -1,12 +1,13 @@
 # SOME DESCRIPTIVE TITLE.
-# Copyright (C) YEAR Free Software Foundation, Inc.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 #
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2002-03-13 12:58-0500\n"
+"POT-Creation-Date: 2002-04-08 13:11-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -14,14 +15,14 @@ msgstr ""
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: popthelp.c:53
+#: popthelp.c:57
 msgid "Show this help message"
 msgstr ""
 
-#: popthelp.c:54
+#: popthelp.c:58
 msgid "Display brief usage message"
 msgstr ""
 
-#: popthelp.c:57
+#: popthelp.c:61
 msgid "Display option defaults in message"
 msgstr ""
diff --git a/po/pt_BR.po b/po/pt_BR.po
index d9ced64..fa89fb7 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.3\n"
-"POT-Creation-Date: 2002-03-13 12:58-0500\n"
+"POT-Creation-Date: 2002-04-08 13:11-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -14,14 +14,14 @@ msgstr ""
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: ENCODING\n"
 
-#: popthelp.c:53
+#: popthelp.c:57
 msgid "Show this help message"
 msgstr ""
 
-#: popthelp.c:54
+#: popthelp.c:58
 msgid "Display brief usage message"
 msgstr ""
 
-#: popthelp.c:57
+#: popthelp.c:61
 msgid "Display option defaults in message"
 msgstr ""
diff --git a/po/ro.po b/po/ro.po
index 6f63708..75a75b2 100644
--- a/po/ro.po
+++ b/po/ro.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.3\n"
-"POT-Creation-Date: 2002-03-13 12:58-0500\n"
+"POT-Creation-Date: 2002-04-08 13:11-0400\n"
 "PO-Revision-Date: 2000-06-14 23:23+EST\n"
 "Last-Translator: Cristian Gafton <gafton@redhat.com>\n"
 "Language-Team: Romanian <ro@li.org>\n"
@@ -9,15 +9,15 @@ msgstr ""
 "Content-Type: text/plain; charset=ISO-8859-2\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: popthelp.c:53
+#: popthelp.c:57
 msgid "Show this help message"
 msgstr "Afisare mesaj de help"
 
-#: popthelp.c:54
+#: popthelp.c:58
 msgid "Display brief usage message"
 msgstr "Afisare mesaj sintaxa sumar"
 
-#: popthelp.c:57
+#: popthelp.c:61
 #, fuzzy
 msgid "Display option defaults in message"
 msgstr "Afisare mesaj sintaxa sumar"
diff --git a/po/ru.po b/po/ru.po
index 5f5e130..408ffaf 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.3\n"
-"POT-Creation-Date: 2002-03-13 12:58-0500\n"
+"POT-Creation-Date: 2002-04-08 13:11-0400\n"
 "PO-Revision-Date: 2001-07-05 21:00-0500\n"
 "Last-Translator: Eugene Kanter <eugene@blackcatlinux.com>\n"
 "Language-Team: Black Cat Linux Team <blackcat-support@blackcatlinux.com>\n"
@@ -9,15 +9,15 @@ msgstr ""
 "Content-Type: text/plain; charset=koi8-r\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: popthelp.c:53
+#: popthelp.c:57
 msgid "Show this help message"
 msgstr "�������� ��� ���������"
 
-#: popthelp.c:54
+#: popthelp.c:58
 msgid "Display brief usage message"
 msgstr "�������� ������� ���������� �� �������������"
 
-#: popthelp.c:57
+#: popthelp.c:61
 msgid "Display option defaults in message"
 msgstr "�������� ��������� �� ���������"
 
diff --git a/po/sk.po b/po/sk.po
index 9c68ea3..cb00110 100644
--- a/po/sk.po
+++ b/po/sk.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.3\n"
-"POT-Creation-Date: 2002-03-13 12:58-0500\n"
+"POT-Creation-Date: 2002-04-08 13:11-0400\n"
 "PO-Revision-Date: 1999-08-04 21:40+0200\n"
 "Last-Translator: Stanislav Meduna <stano@eunet.sk>\n"
 "Language-Team: Slovak <sk-i18n@rak.isternet.sk>\n"
@@ -13,15 +13,15 @@ msgstr ""
 "Content-Type: text/plain; charset=iso-8859-2\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: popthelp.c:53
+#: popthelp.c:57
 msgid "Show this help message"
 msgstr "Vyp�sa� t�to spr�vu"
 
-#: popthelp.c:54
+#: popthelp.c:58
 msgid "Display brief usage message"
 msgstr "Zobrazi� stru�n� n�vod na pou�itie"
 
-#: popthelp.c:57
+#: popthelp.c:61
 #, fuzzy
 msgid "Display option defaults in message"
 msgstr "Zobrazi� stru�n� n�vod na pou�itie"
diff --git a/po/sl.po b/po/sl.po
index b40b3c0..0ba43a0 100644
--- a/po/sl.po
+++ b/po/sl.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.3\n"
-"POT-Creation-Date: 2002-03-13 12:58-0500\n"
+"POT-Creation-Date: 2002-04-08 13:11-0400\n"
 "PO-Revision-Date: 2000-09-05 12:30+0200\n"
 "Last-Translator: Roman Maurer <roman.maurer@hermes.si>\n"
 "Language-Team: Slovenian <sl@li.org>\n"
@@ -9,15 +9,15 @@ msgstr ""
 "Content-Type: text/plain; charset=iso-8859-2\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: popthelp.c:53
+#: popthelp.c:57
 msgid "Show this help message"
 msgstr "Prika�i to sporo�ilo s pomo�jo"
 
-#: popthelp.c:54
+#: popthelp.c:58
 msgid "Display brief usage message"
 msgstr "Prika�i kratko sporo�ilo o uporabi"
 
-#: popthelp.c:57
+#: popthelp.c:61
 #, fuzzy
 msgid "Display option defaults in message"
 msgstr "Prika�i kratko sporo�ilo o uporabi"
diff --git a/po/sr.po b/po/sr.po
index d9ced64..fa89fb7 100644
--- a/po/sr.po
+++ b/po/sr.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.3\n"
-"POT-Creation-Date: 2002-03-13 12:58-0500\n"
+"POT-Creation-Date: 2002-04-08 13:11-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -14,14 +14,14 @@ msgstr ""
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: ENCODING\n"
 
-#: popthelp.c:53
+#: popthelp.c:57
 msgid "Show this help message"
 msgstr ""
 
-#: popthelp.c:54
+#: popthelp.c:58
 msgid "Display brief usage message"
 msgstr ""
 
-#: popthelp.c:57
+#: popthelp.c:61
 msgid "Display option defaults in message"
 msgstr ""
diff --git a/po/sv.po b/po/sv.po
index 3e7a019..9257620 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.3\n"
-"POT-Creation-Date: 2002-03-13 12:58-0500\n"
+"POT-Creation-Date: 2002-04-08 13:11-0400\n"
 "PO-Revision-Date: 2001-07-12 22:26+0100\n"
 "Last-Translator: Christian Rose <menthos@menthos.com>\n"
 "Language-Team: Swedish <sv@li.org>\n"
@@ -9,15 +9,15 @@ msgstr ""
 "Content-Type: text/plain; charset=iso-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: popthelp.c:53
+#: popthelp.c:57
 msgid "Show this help message"
 msgstr "Visa denna hj�lptext"
 
-#: popthelp.c:54
+#: popthelp.c:58
 msgid "Display brief usage message"
 msgstr "Visa en kortfattad anv�ndningstext"
 
-#: popthelp.c:57
+#: popthelp.c:61
 msgid "Display option defaults in message"
 msgstr "Visa standardalternativ f�r flaggor i meddelande"
 
diff --git a/po/tr.po b/po/tr.po
index 609f361..b4b46ef 100644
--- a/po/tr.po
+++ b/po/tr.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.3\n"
-"POT-Creation-Date: 2002-03-13 12:58-0500\n"
+"POT-Creation-Date: 2002-04-08 13:11-0400\n"
 "PO-Revision-Date: 2000-02-11 13:01+0200\n"
 "Last-Translator: Nilgun Belma Buguner <nilgun@technologist.com>\n"
 "Language-Team: Turkish <tr@li.org>\n"
@@ -9,15 +9,15 @@ msgstr ""
 "Content-Type: text/plain; charset=iso8859-9\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: popthelp.c:53
+#: popthelp.c:57
 msgid "Show this help message"
 msgstr "Bu yard�m iletisini g�sterir"
 
-#: popthelp.c:54
+#: popthelp.c:58
 msgid "Display brief usage message"
 msgstr "K�sa bir kullan�m iletisi g�ster"
 
-#: popthelp.c:57
+#: popthelp.c:61
 #, fuzzy
 msgid "Display option defaults in message"
 msgstr "K�sa bir kullan�m iletisi g�ster"
diff --git a/po/uk.po b/po/uk.po
index e9fe677..b8fa17d 100644
--- a/po/uk.po
+++ b/po/uk.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.3\n"
-"POT-Creation-Date: 2002-03-13 12:58-0500\n"
+"POT-Creation-Date: 2002-04-08 13:11-0400\n"
 "PO-Revision-Date: 1999-09-30 16:54+0200\n"
 "Last-Translator: Yuri Syrota <rasta@renome.rovno.ua>\n"
 "Language-Team: Ukrainian <uk@li.org>\n"
@@ -13,15 +13,15 @@ msgstr ""
 "Content-Type: text/plain; charset=koi8-u\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: popthelp.c:53
+#: popthelp.c:57
 msgid "Show this help message"
 msgstr "�������� �� ��צ���"
 
-#: popthelp.c:54
+#: popthelp.c:58
 msgid "Display brief usage message"
 msgstr "�������� ������� ��צ��� ��� ������������"
 
-#: popthelp.c:57
+#: popthelp.c:61
 #, fuzzy
 msgid "Display option defaults in message"
 msgstr "�������� ������� ��צ��� ��� ������������"
diff --git a/po/wa.po b/po/wa.po
index 2d12949..fdb857f 100644
--- a/po/wa.po
+++ b/po/wa.po
@@ -9,7 +9,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.3\n"
-"POT-Creation-Date: 2002-03-13 12:58-0500\n"
+"POT-Creation-Date: 2002-04-08 13:11-0400\n"
 "PO-Revision-Date: 1999-03-18 23:11+0100\n"
 "Last-Translator: Nobody yet\n"
 "Language-Team: walon <linux-wa@chanae.alphanet.ch>\n"
@@ -17,15 +17,15 @@ msgstr ""
 "Content-Type: text/plain; charset=iso-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: popthelp.c:53
+#: popthelp.c:57
 msgid "Show this help message"
 msgstr "Mostrer ci messaedje d' aide chal"
 
-#: popthelp.c:54
+#: popthelp.c:58
 msgid "Display brief usage message"
 msgstr "Mostre on court messaedje so kmint vos � siervi"
 
-#: popthelp.c:57
+#: popthelp.c:61
 #, fuzzy
 msgid "Display option defaults in message"
 msgstr "Mostre on court messaedje so kmint vos � siervi"
diff --git a/po/zh.po b/po/zh.po
index d9ced64..fa89fb7 100644
--- a/po/zh.po
+++ b/po/zh.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.3\n"
-"POT-Creation-Date: 2002-03-13 12:58-0500\n"
+"POT-Creation-Date: 2002-04-08 13:11-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -14,14 +14,14 @@ msgstr ""
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: ENCODING\n"
 
-#: popthelp.c:53
+#: popthelp.c:57
 msgid "Show this help message"
 msgstr ""
 
-#: popthelp.c:54
+#: popthelp.c:58
 msgid "Display brief usage message"
 msgstr ""
 
-#: popthelp.c:57
+#: popthelp.c:61
 msgid "Display option defaults in message"
 msgstr ""
diff --git a/po/zh_CN.GB2312.po b/po/zh_CN.GB2312.po
index 0f4f96e..b24a7e9 100644
--- a/po/zh_CN.GB2312.po
+++ b/po/zh_CN.GB2312.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.3\n"
-"POT-Creation-Date: 2002-03-13 12:58-0500\n"
+"POT-Creation-Date: 2002-04-08 13:11-0400\n"
 "PO-Revision-Date: 1999-11-11 05:04+0800\n"
 "Last-Translator: Dillion Chen <dillon.chen@turbolinux.com.cn>\n"
 "Language-Team: TLDN\n"
@@ -9,15 +9,15 @@ msgstr ""
 "Content-Type: text/plain; charset=gb2312\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: popthelp.c:53
+#: popthelp.c:57
 msgid "Show this help message"
 msgstr "��ʾ����������Ϣ"
 
-#: popthelp.c:54
+#: popthelp.c:58
 msgid "Display brief usage message"
 msgstr "��ʾ���ʹ����Ϣ"
 
-#: popthelp.c:57
+#: popthelp.c:61
 #, fuzzy
 msgid "Display option defaults in message"
 msgstr "��ʾ���ʹ����Ϣ"
diff --git a/popt.h b/popt.h
index bb6a867..495cc99 100644
--- a/popt.h
+++ b/popt.h
@@ -268,6 +268,7 @@ int poptGetNextOpt(/*@null@*/poptContext con)
 /** \ingroup popt
  * Return the option which caused the most recent error.
  * @param con		context
+ * @param flags
  * @return		offending option
  */
 /*@observer@*/ const char * poptBadOption(/*@null@*/poptContext con, int flags)
@@ -307,7 +308,7 @@ int poptAddAlias(poptContext con, struct poptAlias alias, int flags)
 /** \ingroup popt
  * Add alias/exec item to context.
  * @param con		context
- * @param item		alias/exec item to add
+ * @param newItem	alias/exec item to add
  * @param flags		0 for alias, 1 for exec
  * @return		0 on success
  */
diff --git a/popthelp.c b/popthelp.c
index 07fae09..261740b 100644
--- a/popthelp.c
+++ b/popthelp.c
@@ -13,8 +13,12 @@
 #include "poptint.h"
 
 /**
+ * Display arguments.
  * @param con		context
+ * @param foo
  * @param key		option(s)
+ * @param arg
+ * @param data
  */
 static void displayArgs(poptContext con,
 		/*@unused@*/ enum poptCallbackReason foo,
@@ -108,8 +112,11 @@ getArgDescrip(const struct poptOption * opt,
 }
 
 /**
+ * Display default value for an option.
+ * @param lineLength
  * @param opt		option(s)
  * @param translation_domain	translation domain
+ * @return
  */
 static /*@only@*/ /*@null@*/ char *
 singleOptionDefaultValue(int lineLength,
@@ -175,7 +182,9 @@ singleOptionDefaultValue(int lineLength,
 }
 
 /**
+ * Display help text for an option.
  * @param fp		output file handle
+ * @param maxLeftCol
  * @param opt		option(s)
  * @param translation_domain	translation domain
  */
@@ -385,6 +394,7 @@ static int maxArgWidth(const struct poptOption * opt,
  * @param fp		output file handle
  * @param items		alias/exec array
  * @param nitems	no. of alias/exec entries
+ * @param left
  * @param translation_domain	translation domain
  */
 static void itemHelp(FILE * fp,
@@ -407,8 +417,11 @@ static void itemHelp(FILE * fp,
 }
 
 /**
+ * Display help text for a table of options.
+ * @param con		context
  * @param fp		output file handle
  * @param table		option(s)
+ * @param left
  * @param translation_domain	translation domain
  */
 static void singleTableHelp(poptContext con, FILE * fp,
@@ -489,6 +502,7 @@ void poptPrintHelp(poptContext con, FILE * fp, /*@unused@*/ int flags)
 
 /**
  * @param fp		output file handle
+ * @param cursor
  * @param opt		option(s)
  * @param translation_domain	translation domain
  */
@@ -536,6 +550,7 @@ static int singleOptionUsage(FILE * fp, int cursor,
 /**
  * Display popt alias and exec usage.
  * @param fp		output file handle
+ * @param cursor
  * @param item		alias/exec array
  * @param nitems	no. of ara/exec entries
  * @param translation_domain	translation domain
@@ -565,7 +580,10 @@ static int itemUsage(FILE * fp, int cursor, poptItem item, int nitems,
 }
 
 /**
+ * Display usage text for a table of options.
+ * @param con		context
  * @param fp		output file handle
+ * @param cursor
  * @param opt		option(s)
  * @param translation_domain	translation domain
  */
-- 
Gitee


From d8cf17bb002380452cf166af676e5c9833553f33 Mon Sep 17 00:00:00 2001
From: Jeff Johnson <n3npq@mac.com>
Date: Wed, 1 May 2002 22:13:24 +0000
Subject: [PATCH 337/667] - attempt to make peace with automake-1.6.1,
 autoconf-2.53. - rip out two layers of dbN gook, internal Berkeley db is here
 to stay.

---
 .cvsignore   |   5 +
 acconfig.h   |  32 ----
 autogen.sh   |   2 +-
 configure.in |   4 +-
 depcomp      | 411 ---------------------------------------------------
 install-sh   | 251 -------------------------------
 missing      | 283 -----------------------------------
 7 files changed, 9 insertions(+), 979 deletions(-)
 delete mode 100644 acconfig.h
 delete mode 100755 depcomp
 delete mode 100755 install-sh
 delete mode 100755 missing

diff --git a/.cvsignore b/.cvsignore
index 57687cd..bfe95bd 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -5,6 +5,7 @@ Doxyfile
 Makefile
 Makefile.in
 aclocal.m4
+autom4te-*.cache
 config.cache
 config.guess
 config.h
@@ -14,10 +15,14 @@ config.status
 config.sub
 configure
 doxygen
+depcomp
+install-sh
 libtool
 ltconfig
 ltmain.sh
+missing
 stamp-h
+stamp-h1
 stamp-h.in
 test1
 test2
diff --git a/acconfig.h b/acconfig.h
deleted file mode 100644
index 591a9c1..0000000
--- a/acconfig.h
+++ /dev/null
@@ -1,32 +0,0 @@
-/* (C) 1998-2000 Red Hat, Inc. -- Licensing details are in the COPYING
-   file accompanying popt source distributions, available from 
-   ftp://ftp.rpm.org/pub/rpm/dist. */
-
-/* acconfig.h
-   This file is in the public domain.
-
-   Descriptive text for the C preprocessor macros that
-   the distributed Autoconf macros can define.
-   No software package will use all of them; autoheader copies the ones
-   your configure.in uses into your configuration header file templates.
-
-   The entries are in sort -df order: alphabetical, case insensitive,
-   ignoring punctuation (such as underscores).  Although this order
-   can split up related entries, it makes it easier to check whether
-   a given entry is in the file.
-
-   Leave the following blank line there!!  Autoheader needs it.  */
-
-
-/* Define to 1 if ANSI function prototypes are usable.  */
-#undef PROTOTYPES
-
-/* Absolute path to popt top_sourcedir. */
-#undef POPT_SOURCE_PATH
-
-
-/* Leave that blank line there!!  Autoheader needs it.
-   If you're adding to this file, keep in mind:
-   The entries are in sort -df order: alphabetical, case insensitive,
-   ignoring punctuation (such as underscores).  */
-
diff --git a/autogen.sh b/autogen.sh
index 198b94b..0ccf997 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -9,7 +9,7 @@ cd "$srcdir"
 libtoolize --copy --force
 aclocal
 autoheader
-automake
+automake -a -c
 autoconf
 
 if [ "$1" = "--noconfigure" ]; then 
diff --git a/configure.in b/configure.in
index b00ba21..1cc70f6 100755
--- a/configure.in
+++ b/configure.in
@@ -1,6 +1,7 @@
 AC_INIT(popt.h)
 AC_CANONICAL_SYSTEM
 AC_PREREQ(2.12)
+AC_CONFIG_HEADERS
 AM_INIT_AUTOMAKE(popt, 1.7)
 AM_CONFIG_HEADER(config.h)
 
@@ -80,7 +81,8 @@ AC_CHECK_FUNC(setreuid, [], [
 AM_GNU_GETTEXT
 
 POPT_SOURCE_PATH="`pwd`"
-AC_DEFINE_UNQUOTED(POPT_SOURCE_PATH, "$POPT_SOURCE_PATH")
+AC_DEFINE_UNQUOTED(POPT_SOURCE_PATH, "$POPT_SOURCE_PATH",
+	[Full path to popt top_sourcedir.])
 AC_SUBST(POPT_SOURCE_PATH)
 
 AC_OUTPUT([Doxyfile Makefile intl/Makefile po/Makefile.in])
diff --git a/depcomp b/depcomp
deleted file mode 100755
index 6589965..0000000
--- a/depcomp
+++ /dev/null
@@ -1,411 +0,0 @@
-#! /bin/sh
-
-# depcomp - compile a program generating dependencies as side-effects
-# Copyright 1999, 2000 Free Software Foundation, Inc.
-
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-# 02111-1307, USA.
-
-# As a special exception to the GNU General Public License, if you
-# distribute this file as part of a program that contains a
-# configuration script generated by Autoconf, you may include it under
-# the same distribution terms that you use for the rest of that program.
-
-# Originally written by Alexandre Oliva <oliva@dcc.unicamp.br>.
-
-if test -z "$depmode" || test -z "$source" || test -z "$object"; then
-  echo "depcomp: Variables source, object and depmode must be set" 1>&2
-  exit 1
-fi
-# `libtool' can also be set to `yes' or `no'.
-
-depfile=${depfile-`echo "$object" | sed 's,\([^/]*\)$,.deps/\1,;s/\.\([^.]*\)$/.P\1/'`}
-tmpdepfile=${tmpdepfile-`echo "$depfile" | sed 's/\.\([^.]*\)$/.T\1/'`}
-
-rm -f "$tmpdepfile"
-
-# Some modes work just like other modes, but use different flags.  We
-# parameterize here, but still list the modes in the big case below,
-# to make depend.m4 easier to write.  Note that we *cannot* use a case
-# here, because this file can only contain one case statement.
-if test "$depmode" = hp; then
-  # HP compiler uses -M and no extra arg.
-  gccflag=-M
-  depmode=gcc
-fi
-
-if test "$depmode" = dashXmstdout; then
-   # This is just like dashmstdout with a different argument.
-   dashmflag=-xM
-   depmode=dashmstdout
-fi
-
-case "$depmode" in
-gcc3)
-## gcc 3 implements dependency tracking that does exactly what
-## we want.  Yay!  Note: for some reason libtool 1.4 doesn't like
-## it if -MD -MP comes after the -MF stuff.  Hmm.
-  "$@" -MT "$object" -MD -MP -MF "$tmpdepfile"
-  stat=$?
-  if test $stat -eq 0; then :
-  else
-    rm -f "$tmpdepfile"
-    exit $stat
-  fi
-  mv "$tmpdepfile" "$depfile"
-  ;;
-
-gcc)
-## There are various ways to get dependency output from gcc.  Here's
-## why we pick this rather obscure method:
-## - Don't want to use -MD because we'd like the dependencies to end
-##   up in a subdir.  Having to rename by hand is ugly.
-##   (We might end up doing this anyway to support other compilers.)
-## - The DEPENDENCIES_OUTPUT environment variable makes gcc act like
-##   -MM, not -M (despite what the docs say).
-## - Using -M directly means running the compiler twice (even worse
-##   than renaming).
-  if test -z "$gccflag"; then
-    gccflag=-MD,
-  fi
-  "$@" -Wp,"$gccflag$tmpdepfile"
-  stat=$?
-  if test $stat -eq 0; then :
-  else
-    rm -f "$tmpdepfile"
-    exit $stat
-  fi
-  rm -f "$depfile"
-  echo "$object : \\" > "$depfile"
-  alpha=ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz
-## The second -e expression handles DOS-style file names with drive letters.
-  sed -e 's/^[^:]*: / /' \
-      -e 's/^['$alpha']:\/[^:]*: / /' < "$tmpdepfile" >> "$depfile"
-## This next piece of magic avoids the `deleted header file' problem.
-## The problem is that when a header file which appears in a .P file
-## is deleted, the dependency causes make to die (because there is
-## typically no way to rebuild the header).  We avoid this by adding
-## dummy dependencies for each header file.  Too bad gcc doesn't do
-## this for us directly.
-  tr ' ' '
-' < "$tmpdepfile" |
-## Some versions of gcc put a space before the `:'.  On the theory
-## that the space means something, we add a space to the output as
-## well.
-## Some versions of the HPUX 10.20 sed can't process this invocation
-## correctly.  Breaking it into two sed invocations is a workaround.
-    sed -e 's/^\\$//' -e '/^$/d' -e '/:$/d' | sed -e 's/$/ :/' >> "$depfile"
-  rm -f "$tmpdepfile"
-  ;;
-
-hp)
-  # This case exists only to let depend.m4 do its work.  It works by
-  # looking at the text of this script.  This case will never be run,
-  # since it is checked for above.
-  exit 1
-  ;;
-
-sgi)
-  if test "$libtool" = yes; then
-    "$@" "-Wp,-MDupdate,$tmpdepfile"
-  else
-    "$@" -MDupdate "$tmpdepfile"
-  fi
-  stat=$?
-  if test $stat -eq 0; then :
-  else
-    rm -f "$tmpdepfile"
-    exit $stat
-  fi
-  rm -f "$depfile"
-
-  if test -f "$tmpdepfile"; then  # yes, the sourcefile depend on other files
-    echo "$object : \\" > "$depfile"
-
-    # Clip off the initial element (the dependent).  Don't try to be
-    # clever and replace this with sed code, as IRIX sed won't handle
-    # lines with more than a fixed number of characters (4096 in
-    # IRIX 6.2 sed, 8192 in IRIX 6.5).  We also remove comment lines;
-    # the IRIX cc adds comments like `#:fec' to the end of the
-    # dependency line.
-    tr ' ' '
-' < "$tmpdepfile" \
-    | sed -e 's/^.*\.o://' -e 's/#.*$//' -e '/^$/ d' | \
-    tr '
-' ' ' >> $depfile
-    echo >> $depfile
-
-    # The second pass generates a dummy entry for each header file.
-    tr ' ' '
-' < "$tmpdepfile" \
-   | sed -e 's/^.*\.o://' -e 's/#.*$//' -e '/^$/ d' -e 's/$/:/' \
-   >> $depfile
-  else
-    # The sourcefile does not contain any dependencies, so just
-    # store a dummy comment line, to avoid errors with the Makefile
-    # "include basename.Plo" scheme.
-    echo "#dummy" > "$depfile"
-  fi
-  rm -f "$tmpdepfile"
-  ;;
-
-aix)
-  # The C for AIX Compiler uses -M and outputs the dependencies
-  # in a .u file.  This file always lives in the current directory.
-  # Also, the AIX compiler puts `$object:' at the start of each line;
-  # $object doesn't have directory information.
-  stripped=`echo "$object" | sed -e 's,^.*/,,' -e 's/\(.*\)\..*$/\1/'`
-  tmpdepfile="$stripped.u"
-  outname="$stripped.o"
-  if test "$libtool" = yes; then
-    "$@" -Wc,-M
-  else
-    "$@" -M
-  fi
-
-  stat=$?
-  if test $stat -eq 0; then :
-  else
-    rm -f "$tmpdepfile"
-    exit $stat
-  fi
-
-  if test -f "$tmpdepfile"; then
-    # Each line is of the form `foo.o: dependent.h'.
-    # Do two passes, one to just change these to
-    # `$object: dependent.h' and one to simply `dependent.h:'.
-    sed -e "s,^$outname:,$object :," < "$tmpdepfile" > "$depfile"
-    sed -e "s,^$outname: \(.*\)$,\1:," < "$tmpdepfile" >> "$depfile"
-  else
-    # The sourcefile does not contain any dependencies, so just
-    # store a dummy comment line, to avoid errors with the Makefile
-    # "include basename.Plo" scheme.
-    echo "#dummy" > "$depfile"
-  fi
-  rm -f "$tmpdepfile"
-  ;;
-
-tru64)
-   # The Tru64 AIX compiler uses -MD to generate dependencies as a side
-   # effect.  `cc -MD -o foo.o ...' puts the dependencies into `foo.o.d'.
-   # At least on Alpha/Redhat 6.1, Compaq CCC V6.2-504 seems to put 
-   # dependencies in `foo.d' instead, so we check for that too.
-   # Subdirectories are respected.
-
-   tmpdepfile1="$object.d"
-   tmpdepfile2=`echo "$object" | sed -e 's/.o$/.d/'` 
-   if test "$libtool" = yes; then
-      "$@" -Wc,-MD
-   else
-      "$@" -MD
-   fi
-
-   stat=$?
-   if test $stat -eq 0; then :
-   else
-      rm -f "$tmpdepfile1" "$tmpdepfile2"
-      exit $stat
-   fi
-
-   if test -f "$tmpdepfile1"; then
-      tmpdepfile="$tmpdepfile1"
-   else
-      tmpdepfile="$tmpdepfile2"
-   fi
-   if test -f "$tmpdepfile"; then
-      sed -e "s,^.*\.[a-z]*:,$object:," < "$tmpdepfile" > "$depfile"
-      # That's a space and a tab in the [].
-      sed -e 's,^.*\.[a-z]*:[ 	]*,,' -e 's,$,:,' < "$tmpdepfile" >> "$depfile"
-   else
-      echo "#dummy" > "$depfile"
-   fi
-   rm -f "$tmpdepfile"
-   ;;
-
-#nosideeffect)
-  # This comment above is used by automake to tell side-effect
-  # dependency tracking mechanisms from slower ones.
-
-dashmstdout)
-  # Important note: in order to support this mode, a compiler *must*
-  # always write the proprocessed file to stdout, regardless of -o,
-  # because we must use -o when running libtool.
-  test -z "$dashmflag" && dashmflag=-M
-  ( IFS=" "
-    case " $* " in
-    *" --mode=compile "*) # this is libtool, let us make it quiet
-      for arg
-      do # cycle over the arguments
-        case "$arg" in
-	"--mode=compile")
-	  # insert --quiet before "--mode=compile"
-	  set fnord "$@" --quiet
-	  shift # fnord
-	  ;;
-	esac
-	set fnord "$@" "$arg"
-	shift # fnord
-	shift # "$arg"
-      done
-      ;;
-    esac
-    "$@" $dashmflag | sed 's:^[^:]*\:[ 	]*:'"$object"'\: :' > "$tmpdepfile"
-  ) &
-  proc=$!
-  "$@"
-  stat=$?
-  wait "$proc"
-  if test "$stat" != 0; then exit $stat; fi
-  rm -f "$depfile"
-  cat < "$tmpdepfile" > "$depfile"
-  tr ' ' '
-' < "$tmpdepfile" | \
-## Some versions of the HPUX 10.20 sed can't process this invocation
-## correctly.  Breaking it into two sed invocations is a workaround.
-    sed -e 's/^\\$//' -e '/^$/d' -e '/:$/d' | sed -e 's/$/ :/' >> "$depfile"
-  rm -f "$tmpdepfile"
-  ;;
-
-dashXmstdout)
-  # This case only exists to satisfy depend.m4.  It is never actually
-  # run, as this mode is specially recognized in the preamble.
-  exit 1
-  ;;
-
-makedepend)
-  # X makedepend
-  (
-    shift
-    cleared=no
-    for arg in "$@"; do
-      case $cleared in no)
-        set ""; shift
-	cleared=yes
-      esac
-      case "$arg" in
-        -D*|-I*)
-	  set fnord "$@" "$arg"; shift;;
-	-*)
-	  ;;
-	*)
-	  set fnord "$@" "$arg"; shift;;
-      esac
-    done
-    obj_suffix="`echo $object | sed 's/^.*\././'`"
-    touch "$tmpdepfile"
-    ${MAKEDEPEND-makedepend} 2>/dev/null -o"$obj_suffix" -f"$tmpdepfile" "$@"
-  ) &
-  proc=$!
-  "$@"
-  stat=$?
-  wait "$proc"
-  if test "$stat" != 0; then exit $stat; fi
-  rm -f "$depfile"
-  cat < "$tmpdepfile" > "$depfile"
-  tail +3 "$tmpdepfile" | tr ' ' '
-' | \
-## Some versions of the HPUX 10.20 sed can't process this invocation
-## correctly.  Breaking it into two sed invocations is a workaround.
-    sed -e 's/^\\$//' -e '/^$/d' -e '/:$/d' | sed -e 's/$/ :/' >> "$depfile"
-  rm -f "$tmpdepfile" "$tmpdepfile".bak
-  ;;
-
-cpp)
-  # Important note: in order to support this mode, a compiler *must*
-  # always write the proprocessed file to stdout, regardless of -o,
-  # because we must use -o when running libtool.
-  ( IFS=" "
-    case " $* " in
-    *" --mode=compile "*)
-      for arg
-      do # cycle over the arguments
-        case $arg in
-	"--mode=compile")
-	  # insert --quiet before "--mode=compile"
-	  set fnord "$@" --quiet
-	  shift # fnord
-	  ;;
-	esac
-	set fnord "$@" "$arg"
-	shift # fnord
-	shift # "$arg"
-      done
-      ;;
-    esac
-    "$@" -E |
-    sed -n '/^# [0-9][0-9]* "\([^"]*\)".*/ s:: \1 \\:p' |
-    sed '$ s: \\$::' > "$tmpdepfile"
-  ) &
-  proc=$!
-  "$@"
-  stat=$?
-  wait "$proc"
-  if test "$stat" != 0; then exit $stat; fi
-  rm -f "$depfile"
-  echo "$object : \\" > "$depfile"
-  cat < "$tmpdepfile" >> "$depfile"
-  sed < "$tmpdepfile" '/^$/d;s/^ //;s/ \\$//;s/$/ :/' >> "$depfile"
-  rm -f "$tmpdepfile"
-  ;;
-
-msvisualcpp)
-  # Important note: in order to support this mode, a compiler *must*
-  # always write the proprocessed file to stdout, regardless of -o,
-  # because we must use -o when running libtool.
-  ( IFS=" "
-    case " $* " in
-    *" --mode=compile "*)
-      for arg
-      do # cycle over the arguments
-        case $arg in
-	"--mode=compile")
-	  # insert --quiet before "--mode=compile"
-	  set fnord "$@" --quiet
-	  shift # fnord
-	  ;;
-	esac
-	set fnord "$@" "$arg"
-	shift # fnord
-	shift # "$arg"
-      done
-      ;;
-    esac
-    "$@" -E |
-    sed -n '/^#line [0-9][0-9]* "\([^"]*\)"/ s::echo "`cygpath -u \\"\1\\"`":p' | sort | uniq > "$tmpdepfile"
-  ) &
-  proc=$!
-  "$@"
-  stat=$?
-  wait "$proc"
-  if test "$stat" != 0; then exit $stat; fi
-  rm -f "$depfile"
-  echo "$object : \\" > "$depfile"
-  . "$tmpdepfile" | sed 's% %\\ %g' | sed -n '/^\(.*\)$/ s::	\1 \\:p' >> "$depfile"
-  echo "	" >> "$depfile"
-  . "$tmpdepfile" | sed 's% %\\ %g' | sed -n '/^\(.*\)$/ s::\1\::p' >> "$depfile"
-  rm -f "$tmpdepfile"
-  ;;
-
-none)
-  exec "$@"
-  ;;
-
-*)
-  echo "Unknown depmode $depmode" 1>&2
-  exit 1
-  ;;
-esac
-
-exit 0
diff --git a/install-sh b/install-sh
deleted file mode 100755
index e9de238..0000000
--- a/install-sh
+++ /dev/null
@@ -1,251 +0,0 @@
-#!/bin/sh
-#
-# install - install a program, script, or datafile
-# This comes from X11R5 (mit/util/scripts/install.sh).
-#
-# Copyright 1991 by the Massachusetts Institute of Technology
-#
-# Permission to use, copy, modify, distribute, and sell this software and its
-# documentation for any purpose is hereby granted without fee, provided that
-# the above copyright notice appear in all copies and that both that
-# copyright notice and this permission notice appear in supporting
-# documentation, and that the name of M.I.T. not be used in advertising or
-# publicity pertaining to distribution of the software without specific,
-# written prior permission.  M.I.T. makes no representations about the
-# suitability of this software for any purpose.  It is provided "as is"
-# without express or implied warranty.
-#
-# Calling this script install-sh is preferred over install.sh, to prevent
-# `make' implicit rules from creating a file called install from it
-# when there is no Makefile.
-#
-# This script is compatible with the BSD install script, but was written
-# from scratch.  It can only install one file at a time, a restriction
-# shared with many OS's install programs.
-
-
-# set DOITPROG to echo to test this script
-
-# Don't use :- since 4.3BSD and earlier shells don't like it.
-doit="${DOITPROG-}"
-
-
-# put in absolute paths if you don't have them in your path; or use env. vars.
-
-mvprog="${MVPROG-mv}"
-cpprog="${CPPROG-cp}"
-chmodprog="${CHMODPROG-chmod}"
-chownprog="${CHOWNPROG-chown}"
-chgrpprog="${CHGRPPROG-chgrp}"
-stripprog="${STRIPPROG-strip}"
-rmprog="${RMPROG-rm}"
-mkdirprog="${MKDIRPROG-mkdir}"
-
-transformbasename=""
-transform_arg=""
-instcmd="$mvprog"
-chmodcmd="$chmodprog 0755"
-chowncmd=""
-chgrpcmd=""
-stripcmd=""
-rmcmd="$rmprog -f"
-mvcmd="$mvprog"
-src=""
-dst=""
-dir_arg=""
-
-while [ x"$1" != x ]; do
-    case $1 in
-	-c) instcmd="$cpprog"
-	    shift
-	    continue;;
-
-	-d) dir_arg=true
-	    shift
-	    continue;;
-
-	-m) chmodcmd="$chmodprog $2"
-	    shift
-	    shift
-	    continue;;
-
-	-o) chowncmd="$chownprog $2"
-	    shift
-	    shift
-	    continue;;
-
-	-g) chgrpcmd="$chgrpprog $2"
-	    shift
-	    shift
-	    continue;;
-
-	-s) stripcmd="$stripprog"
-	    shift
-	    continue;;
-
-	-t=*) transformarg=`echo $1 | sed 's/-t=//'`
-	    shift
-	    continue;;
-
-	-b=*) transformbasename=`echo $1 | sed 's/-b=//'`
-	    shift
-	    continue;;
-
-	*)  if [ x"$src" = x ]
-	    then
-		src=$1
-	    else
-		# this colon is to work around a 386BSD /bin/sh bug
-		:
-		dst=$1
-	    fi
-	    shift
-	    continue;;
-    esac
-done
-
-if [ x"$src" = x ]
-then
-	echo "install:	no input file specified"
-	exit 1
-else
-	true
-fi
-
-if [ x"$dir_arg" != x ]; then
-	dst=$src
-	src=""
-	
-	if [ -d $dst ]; then
-		instcmd=:
-		chmodcmd=""
-	else
-		instcmd=mkdir
-	fi
-else
-
-# Waiting for this to be detected by the "$instcmd $src $dsttmp" command
-# might cause directories to be created, which would be especially bad 
-# if $src (and thus $dsttmp) contains '*'.
-
-	if [ -f $src -o -d $src ]
-	then
-		true
-	else
-		echo "install:  $src does not exist"
-		exit 1
-	fi
-	
-	if [ x"$dst" = x ]
-	then
-		echo "install:	no destination specified"
-		exit 1
-	else
-		true
-	fi
-
-# If destination is a directory, append the input filename; if your system
-# does not like double slashes in filenames, you may need to add some logic
-
-	if [ -d $dst ]
-	then
-		dst="$dst"/`basename $src`
-	else
-		true
-	fi
-fi
-
-## this sed command emulates the dirname command
-dstdir=`echo $dst | sed -e 's,[^/]*$,,;s,/$,,;s,^$,.,'`
-
-# Make sure that the destination directory exists.
-#  this part is taken from Noah Friedman's mkinstalldirs script
-
-# Skip lots of stat calls in the usual case.
-if [ ! -d "$dstdir" ]; then
-defaultIFS='	
-'
-IFS="${IFS-${defaultIFS}}"
-
-oIFS="${IFS}"
-# Some sh's can't handle IFS=/ for some reason.
-IFS='%'
-set - `echo ${dstdir} | sed -e 's@/@%@g' -e 's@^%@/@'`
-IFS="${oIFS}"
-
-pathcomp=''
-
-while [ $# -ne 0 ] ; do
-	pathcomp="${pathcomp}${1}"
-	shift
-
-	if [ ! -d "${pathcomp}" ] ;
-        then
-		$mkdirprog "${pathcomp}"
-	else
-		true
-	fi
-
-	pathcomp="${pathcomp}/"
-done
-fi
-
-if [ x"$dir_arg" != x ]
-then
-	$doit $instcmd $dst &&
-
-	if [ x"$chowncmd" != x ]; then $doit $chowncmd $dst; else true ; fi &&
-	if [ x"$chgrpcmd" != x ]; then $doit $chgrpcmd $dst; else true ; fi &&
-	if [ x"$stripcmd" != x ]; then $doit $stripcmd $dst; else true ; fi &&
-	if [ x"$chmodcmd" != x ]; then $doit $chmodcmd $dst; else true ; fi
-else
-
-# If we're going to rename the final executable, determine the name now.
-
-	if [ x"$transformarg" = x ] 
-	then
-		dstfile=`basename $dst`
-	else
-		dstfile=`basename $dst $transformbasename | 
-			sed $transformarg`$transformbasename
-	fi
-
-# don't allow the sed command to completely eliminate the filename
-
-	if [ x"$dstfile" = x ] 
-	then
-		dstfile=`basename $dst`
-	else
-		true
-	fi
-
-# Make a temp file name in the proper directory.
-
-	dsttmp=$dstdir/#inst.$$#
-
-# Move or copy the file name to the temp name
-
-	$doit $instcmd $src $dsttmp &&
-
-	trap "rm -f ${dsttmp}" 0 &&
-
-# and set any options; do chmod last to preserve setuid bits
-
-# If any of these fail, we abort the whole thing.  If we want to
-# ignore errors from any of these, just make sure not to ignore
-# errors from the above "$doit $instcmd $src $dsttmp" command.
-
-	if [ x"$chowncmd" != x ]; then $doit $chowncmd $dsttmp; else true;fi &&
-	if [ x"$chgrpcmd" != x ]; then $doit $chgrpcmd $dsttmp; else true;fi &&
-	if [ x"$stripcmd" != x ]; then $doit $stripcmd $dsttmp; else true;fi &&
-	if [ x"$chmodcmd" != x ]; then $doit $chmodcmd $dsttmp; else true;fi &&
-
-# Now rename the file to the real destination.
-
-	$doit $rmcmd -f $dstdir/$dstfile &&
-	$doit $mvcmd $dsttmp $dstdir/$dstfile 
-
-fi &&
-
-
-exit 0
diff --git a/missing b/missing
deleted file mode 100755
index 0a7fb5a..0000000
--- a/missing
+++ /dev/null
@@ -1,283 +0,0 @@
-#! /bin/sh
-# Common stub for a few missing GNU programs while installing.
-# Copyright 1996, 1997, 1999, 2000 Free Software Foundation, Inc.
-# Originally by Fran,cois Pinard <pinard@iro.umontreal.ca>, 1996.
-
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-# 02111-1307, USA.
-
-# As a special exception to the GNU General Public License, if you
-# distribute this file as part of a program that contains a
-# configuration script generated by Autoconf, you may include it under
-# the same distribution terms that you use for the rest of that program.
-
-if test $# -eq 0; then
-  echo 1>&2 "Try \`$0 --help' for more information"
-  exit 1
-fi
-
-run=:
-
-# In the cases where this matters, `missing' is being run in the
-# srcdir already.
-if test -f configure.ac; then
-  configure_ac=configure.ac
-else
-  configure_ac=configure.in
-fi
-
-case "$1" in
---run)
-  # Try to run requested program, and just exit if it succeeds.
-  run=
-  shift
-  "$@" && exit 0
-  ;;
-esac
-
-# If it does not exist, or fails to run (possibly an outdated version),
-# try to emulate it.
-case "$1" in
-
-  -h|--h|--he|--hel|--help)
-    echo "\
-$0 [OPTION]... PROGRAM [ARGUMENT]...
-
-Handle \`PROGRAM [ARGUMENT]...' for when PROGRAM is missing, or return an
-error status if there is no known handling for PROGRAM.
-
-Options:
-  -h, --help      display this help and exit
-  -v, --version   output version information and exit
-  --run           try to run the given command, and emulate it if it fails
-
-Supported PROGRAM values:
-  aclocal      touch file \`aclocal.m4'
-  autoconf     touch file \`configure'
-  autoheader   touch file \`config.h.in'
-  automake     touch all \`Makefile.in' files
-  bison        create \`y.tab.[ch]', if possible, from existing .[ch]
-  flex         create \`lex.yy.c', if possible, from existing .c
-  help2man     touch the output file
-  lex          create \`lex.yy.c', if possible, from existing .c
-  makeinfo     touch the output file
-  tar          try tar, gnutar, gtar, then tar without non-portable flags
-  yacc         create \`y.tab.[ch]', if possible, from existing .[ch]"
-    ;;
-
-  -v|--v|--ve|--ver|--vers|--versi|--versio|--version)
-    echo "missing 0.3 - GNU automake"
-    ;;
-
-  -*)
-    echo 1>&2 "$0: Unknown \`$1' option"
-    echo 1>&2 "Try \`$0 --help' for more information"
-    exit 1
-    ;;
-
-  aclocal)
-    echo 1>&2 "\
-WARNING: \`$1' is missing on your system.  You should only need it if
-         you modified \`acinclude.m4' or \`${configure_ac}'.  You might want
-         to install the \`Automake' and \`Perl' packages.  Grab them from
-         any GNU archive site."
-    touch aclocal.m4
-    ;;
-
-  autoconf)
-    echo 1>&2 "\
-WARNING: \`$1' is missing on your system.  You should only need it if
-         you modified \`${configure_ac}'.  You might want to install the
-         \`Autoconf' and \`GNU m4' packages.  Grab them from any GNU
-         archive site."
-    touch configure
-    ;;
-
-  autoheader)
-    echo 1>&2 "\
-WARNING: \`$1' is missing on your system.  You should only need it if
-         you modified \`acconfig.h' or \`${configure_ac}'.  You might want
-         to install the \`Autoconf' and \`GNU m4' packages.  Grab them
-         from any GNU archive site."
-    files=`sed -n 's/^[ ]*A[CM]_CONFIG_HEADER(\([^)]*\)).*/\1/p' ${configure_ac}`
-    test -z "$files" && files="config.h"
-    touch_files=
-    for f in $files; do
-      case "$f" in
-      *:*) touch_files="$touch_files "`echo "$f" |
-				       sed -e 's/^[^:]*://' -e 's/:.*//'`;;
-      *) touch_files="$touch_files $f.in";;
-      esac
-    done
-    touch $touch_files
-    ;;
-
-  automake)
-    echo 1>&2 "\
-WARNING: \`$1' is missing on your system.  You should only need it if
-         you modified \`Makefile.am', \`acinclude.m4' or \`${configure_ac}'.
-         You might want to install the \`Automake' and \`Perl' packages.
-         Grab them from any GNU archive site."
-    find . -type f -name Makefile.am -print |
-	   sed 's/\.am$/.in/' |
-	   while read f; do touch "$f"; done
-    ;;
-
-  bison|yacc)
-    echo 1>&2 "\
-WARNING: \`$1' is missing on your system.  You should only need it if
-         you modified a \`.y' file.  You may need the \`Bison' package
-         in order for those modifications to take effect.  You can get
-         \`Bison' from any GNU archive site."
-    rm -f y.tab.c y.tab.h
-    if [ $# -ne 1 ]; then
-        eval LASTARG="\${$#}"
-	case "$LASTARG" in
-	*.y)
-	    SRCFILE=`echo "$LASTARG" | sed 's/y$/c/'`
-	    if [ -f "$SRCFILE" ]; then
-	         cp "$SRCFILE" y.tab.c
-	    fi
-	    SRCFILE=`echo "$LASTARG" | sed 's/y$/h/'`
-	    if [ -f "$SRCFILE" ]; then
-	         cp "$SRCFILE" y.tab.h
-	    fi
-	  ;;
-	esac
-    fi
-    if [ ! -f y.tab.h ]; then
-	echo >y.tab.h
-    fi
-    if [ ! -f y.tab.c ]; then
-	echo 'main() { return 0; }' >y.tab.c
-    fi
-    ;;
-
-  lex|flex)
-    echo 1>&2 "\
-WARNING: \`$1' is missing on your system.  You should only need it if
-         you modified a \`.l' file.  You may need the \`Flex' package
-         in order for those modifications to take effect.  You can get
-         \`Flex' from any GNU archive site."
-    rm -f lex.yy.c
-    if [ $# -ne 1 ]; then
-        eval LASTARG="\${$#}"
-	case "$LASTARG" in
-	*.l)
-	    SRCFILE=`echo "$LASTARG" | sed 's/l$/c/'`
-	    if [ -f "$SRCFILE" ]; then
-	         cp "$SRCFILE" lex.yy.c
-	    fi
-	  ;;
-	esac
-    fi
-    if [ ! -f lex.yy.c ]; then
-	echo 'main() { return 0; }' >lex.yy.c
-    fi
-    ;;
-
-  help2man)
-    echo 1>&2 "\
-WARNING: \`$1' is missing on your system.  You should only need it if
-	 you modified a dependency of a manual page.  You may need the
-	 \`Help2man' package in order for those modifications to take
-	 effect.  You can get \`Help2man' from any GNU archive site."
-
-    file=`echo "$*" | sed -n 's/.*-o \([^ ]*\).*/\1/p'`
-    if test -z "$file"; then
-	file=`echo "$*" | sed -n 's/.*--output=\([^ ]*\).*/\1/p'`
-    fi
-    if [ -f "$file" ]; then
-	touch $file
-    else
-	test -z "$file" || exec >$file
-	echo ".ab help2man is required to generate this page"
-	exit 1
-    fi
-    ;;
-
-  makeinfo)
-    if test -z "$run" && (makeinfo --version) > /dev/null 2>&1; then
-       # We have makeinfo, but it failed.
-       exit 1
-    fi
-
-    echo 1>&2 "\
-WARNING: \`$1' is missing on your system.  You should only need it if
-         you modified a \`.texi' or \`.texinfo' file, or any other file
-         indirectly affecting the aspect of the manual.  The spurious
-         call might also be the consequence of using a buggy \`make' (AIX,
-         DU, IRIX).  You might want to install the \`Texinfo' package or
-         the \`GNU make' package.  Grab either from any GNU archive site."
-    file=`echo "$*" | sed -n 's/.*-o \([^ ]*\).*/\1/p'`
-    if test -z "$file"; then
-      file=`echo "$*" | sed 's/.* \([^ ]*\) *$/\1/'`
-      file=`sed -n '/^@setfilename/ { s/.* \([^ ]*\) *$/\1/; p; q; }' $file`
-    fi
-    touch $file
-    ;;
-
-  tar)
-    shift
-    if test -n "$run"; then
-      echo 1>&2 "ERROR: \`tar' requires --run"
-      exit 1
-    fi
-
-    # We have already tried tar in the generic part.
-    # Look for gnutar/gtar before invocation to avoid ugly error
-    # messages.
-    if (gnutar --version > /dev/null 2>&1); then
-       gnutar ${1+"$@"} && exit 0
-    fi
-    if (gtar --version > /dev/null 2>&1); then
-       gtar ${1+"$@"} && exit 0
-    fi
-    firstarg="$1"
-    if shift; then
-	case "$firstarg" in
-	*o*)
-	    firstarg=`echo "$firstarg" | sed s/o//`
-	    tar "$firstarg" ${1+"$@"} && exit 0
-	    ;;
-	esac
-	case "$firstarg" in
-	*h*)
-	    firstarg=`echo "$firstarg" | sed s/h//`
-	    tar "$firstarg" ${1+"$@"} && exit 0
-	    ;;
-	esac
-    fi
-
-    echo 1>&2 "\
-WARNING: I can't seem to be able to run \`tar' with the given arguments.
-         You may want to install GNU tar or Free paxutils, or check the
-         command line arguments."
-    exit 1
-    ;;
-
-  *)
-    echo 1>&2 "\
-WARNING: \`$1' is needed, and you do not seem to have it handy on your
-         system.  You might have modified some files without having the
-         proper tools for further handling them.  Check the \`README' file,
-         it often tells you about the needed prerequirements for installing
-         this package.  You may also peek at any GNU archive site, in case
-         some other package would contain this missing \`$1' program."
-    exit 1
-    ;;
-esac
-
-exit 0
-- 
Gitee


From 1feb07aa99c889abe643d7d2cd1b60d0a91825af Mon Sep 17 00:00:00 2001
From: Jeff Johnson <n3npq@mac.com>
Date: Mon, 6 May 2002 19:48:40 +0000
Subject: [PATCH 338/667] - rework most of rpmdb.c prepatory to implementing
 duplicates. - fix: 2 memory leaks in headerSprintf. - fix: db mire's access
 out-of-bounds memory.

---
 po/cs.po           | 2 +-
 po/da.po           | 2 +-
 po/de.po           | 2 +-
 po/es.po           | 2 +-
 po/eu_ES.po        | 2 +-
 po/fi.po           | 2 +-
 po/fr.po           | 2 +-
 po/gl.po           | 2 +-
 po/hu.po           | 2 +-
 po/id.po           | 2 +-
 po/is.po           | 2 +-
 po/it.po           | 2 +-
 po/ja.po           | 2 +-
 po/ko.po           | 2 +-
 po/no.po           | 2 +-
 po/pl.po           | 2 +-
 po/popt.pot        | 2 +-
 po/pt_BR.po        | 2 +-
 po/ro.po           | 2 +-
 po/ru.po           | 2 +-
 po/sk.po           | 2 +-
 po/sl.po           | 2 +-
 po/sr.po           | 2 +-
 po/sv.po           | 2 +-
 po/tr.po           | 2 +-
 po/uk.po           | 2 +-
 po/wa.po           | 2 +-
 po/zh.po           | 2 +-
 po/zh_CN.GB2312.po | 2 +-
 29 files changed, 29 insertions(+), 29 deletions(-)

diff --git a/po/cs.po b/po/cs.po
index cd07509..b42504b 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.3\n"
-"POT-Creation-Date: 2002-04-08 13:11-0400\n"
+"POT-Creation-Date: 2002-05-06 15:34-0400\n"
 "PO-Revision-Date: 2001-07-24 00:03+0100\n"
 "Last-Translator: Milan Kerslager <kerslage@linux.cz>\n"
 "Language-Team: Czech <cs@li.org>\n"
diff --git a/po/da.po b/po/da.po
index e32b17c..fc165e3 100644
--- a/po/da.po
+++ b/po/da.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.3\n"
-"POT-Creation-Date: 2002-04-08 13:11-0400\n"
+"POT-Creation-Date: 2002-05-06 15:34-0400\n"
 "PO-Revision-Date: Sun Jan 21 2001 04:30:32+0200\n"
 "Last-Translator: Martin Hansen <mah@k64.dk>\n"
 "Language-Team: Dansk <dansk@klid.dk>\n"
diff --git a/po/de.po b/po/de.po
index fa89fb7..203c754 100644
--- a/po/de.po
+++ b/po/de.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.3\n"
-"POT-Creation-Date: 2002-04-08 13:11-0400\n"
+"POT-Creation-Date: 2002-05-06 15:34-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/po/es.po b/po/es.po
index 79fdac3..625a116 100644
--- a/po/es.po
+++ b/po/es.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.3\n"
-"POT-Creation-Date: 2002-04-08 13:11-0400\n"
+"POT-Creation-Date: 2002-05-06 15:34-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Leandro Lucarella <luca@linuxmendoza.org.ar>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/po/eu_ES.po b/po/eu_ES.po
index fa89fb7..203c754 100644
--- a/po/eu_ES.po
+++ b/po/eu_ES.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.3\n"
-"POT-Creation-Date: 2002-04-08 13:11-0400\n"
+"POT-Creation-Date: 2002-05-06 15:34-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/po/fi.po b/po/fi.po
index fa89fb7..203c754 100644
--- a/po/fi.po
+++ b/po/fi.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.3\n"
-"POT-Creation-Date: 2002-04-08 13:11-0400\n"
+"POT-Creation-Date: 2002-05-06 15:34-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/po/fr.po b/po/fr.po
index fa89fb7..203c754 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.3\n"
-"POT-Creation-Date: 2002-04-08 13:11-0400\n"
+"POT-Creation-Date: 2002-05-06 15:34-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/po/gl.po b/po/gl.po
index 4a2024b..dac7820 100644
--- a/po/gl.po
+++ b/po/gl.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.3\n"
-"POT-Creation-Date: 2002-04-08 13:11-0400\n"
+"POT-Creation-Date: 2002-05-06 15:34-0400\n"
 "PO-Revision-Date: 2001-01-17 01:01+0100\n"
 "Last-Translator: Jes�s Bravo �lvarez <jba@pobox.com>\n"
 "Language-Team: Galician <trasno@ceu.fi.udc.es>\n"
diff --git a/po/hu.po b/po/hu.po
index c52942a..e495837 100644
--- a/po/hu.po
+++ b/po/hu.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.3\n"
-"POT-Creation-Date: 2002-04-08 13:11-0400\n"
+"POT-Creation-Date: 2002-05-06 15:34-0400\n"
 "PO-Revision-Date: 2000-08-03 23:26+0200\n"
 "Last-Translator: L�szl� N�meth <nemeth@qwertynet.hu>\n"
 "Language-Team: Hungarian\n"
diff --git a/po/id.po b/po/id.po
index fa89fb7..203c754 100644
--- a/po/id.po
+++ b/po/id.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.3\n"
-"POT-Creation-Date: 2002-04-08 13:11-0400\n"
+"POT-Creation-Date: 2002-05-06 15:34-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/po/is.po b/po/is.po
index 1d1502e..44bf3dd 100644
--- a/po/is.po
+++ b/po/is.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.3\n"
-"POT-Creation-Date: 2002-04-08 13:11-0400\n"
+"POT-Creation-Date: 2002-05-06 15:34-0400\n"
 "PO-Revision-Date: 2001-06-08 01:35+0000\n"
 "Last-Translator: Richard Allen <ra@hp.is>\n"
 "Language-Team: is <kde-isl@mmedia.is>\n"
diff --git a/po/it.po b/po/it.po
index fa89fb7..203c754 100644
--- a/po/it.po
+++ b/po/it.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.3\n"
-"POT-Creation-Date: 2002-04-08 13:11-0400\n"
+"POT-Creation-Date: 2002-05-06 15:34-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/po/ja.po b/po/ja.po
index fa89fb7..203c754 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.3\n"
-"POT-Creation-Date: 2002-04-08 13:11-0400\n"
+"POT-Creation-Date: 2002-05-06 15:34-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/po/ko.po b/po/ko.po
index fa49e2a..1e0b9e7 100644
--- a/po/ko.po
+++ b/po/ko.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6\n"
-"POT-Creation-Date: 2002-04-08 13:11-0400\n"
+"POT-Creation-Date: 2002-05-06 15:34-0400\n"
 "PO-Revision-Date: 2001-09-06 20:06+0900\n"
 "Last-Translator: Jong-Hoon Ryu <redhat4u@netian.com>\n"
 "Language-Team: GNU Translation project <ko@li.org>\n"
diff --git a/po/no.po b/po/no.po
index c2bf091..c9aabe3 100644
--- a/po/no.po
+++ b/po/no.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.3\n"
-"POT-Creation-Date: 2002-04-08 13:11-0400\n"
+"POT-Creation-Date: 2002-05-06 15:34-0400\n"
 "PO-Revision-Date: 2001-06-27 11:05+0200\n"
 "Last-Translator: Kjartan Maraas <kmaraas@online.no>\n"
 "Language-Team: Norwegian <no@li.org>\n"
diff --git a/po/pl.po b/po/pl.po
index fa89fb7..203c754 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.3\n"
-"POT-Creation-Date: 2002-04-08 13:11-0400\n"
+"POT-Creation-Date: 2002-05-06 15:34-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/po/popt.pot b/po/popt.pot
index 5fdb8a8..a8952cb 100644
--- a/po/popt.pot
+++ b/po/popt.pot
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2002-04-08 13:11-0400\n"
+"POT-Creation-Date: 2002-05-06 15:34-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/po/pt_BR.po b/po/pt_BR.po
index fa89fb7..203c754 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.3\n"
-"POT-Creation-Date: 2002-04-08 13:11-0400\n"
+"POT-Creation-Date: 2002-05-06 15:34-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/po/ro.po b/po/ro.po
index 75a75b2..61587e0 100644
--- a/po/ro.po
+++ b/po/ro.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.3\n"
-"POT-Creation-Date: 2002-04-08 13:11-0400\n"
+"POT-Creation-Date: 2002-05-06 15:34-0400\n"
 "PO-Revision-Date: 2000-06-14 23:23+EST\n"
 "Last-Translator: Cristian Gafton <gafton@redhat.com>\n"
 "Language-Team: Romanian <ro@li.org>\n"
diff --git a/po/ru.po b/po/ru.po
index 408ffaf..5ff1527 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.3\n"
-"POT-Creation-Date: 2002-04-08 13:11-0400\n"
+"POT-Creation-Date: 2002-05-06 15:34-0400\n"
 "PO-Revision-Date: 2001-07-05 21:00-0500\n"
 "Last-Translator: Eugene Kanter <eugene@blackcatlinux.com>\n"
 "Language-Team: Black Cat Linux Team <blackcat-support@blackcatlinux.com>\n"
diff --git a/po/sk.po b/po/sk.po
index cb00110..2f7c956 100644
--- a/po/sk.po
+++ b/po/sk.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.3\n"
-"POT-Creation-Date: 2002-04-08 13:11-0400\n"
+"POT-Creation-Date: 2002-05-06 15:34-0400\n"
 "PO-Revision-Date: 1999-08-04 21:40+0200\n"
 "Last-Translator: Stanislav Meduna <stano@eunet.sk>\n"
 "Language-Team: Slovak <sk-i18n@rak.isternet.sk>\n"
diff --git a/po/sl.po b/po/sl.po
index 0ba43a0..5d462f4 100644
--- a/po/sl.po
+++ b/po/sl.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.3\n"
-"POT-Creation-Date: 2002-04-08 13:11-0400\n"
+"POT-Creation-Date: 2002-05-06 15:34-0400\n"
 "PO-Revision-Date: 2000-09-05 12:30+0200\n"
 "Last-Translator: Roman Maurer <roman.maurer@hermes.si>\n"
 "Language-Team: Slovenian <sl@li.org>\n"
diff --git a/po/sr.po b/po/sr.po
index fa89fb7..203c754 100644
--- a/po/sr.po
+++ b/po/sr.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.3\n"
-"POT-Creation-Date: 2002-04-08 13:11-0400\n"
+"POT-Creation-Date: 2002-05-06 15:34-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/po/sv.po b/po/sv.po
index 9257620..2eb9a2d 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.3\n"
-"POT-Creation-Date: 2002-04-08 13:11-0400\n"
+"POT-Creation-Date: 2002-05-06 15:34-0400\n"
 "PO-Revision-Date: 2001-07-12 22:26+0100\n"
 "Last-Translator: Christian Rose <menthos@menthos.com>\n"
 "Language-Team: Swedish <sv@li.org>\n"
diff --git a/po/tr.po b/po/tr.po
index b4b46ef..7e91800 100644
--- a/po/tr.po
+++ b/po/tr.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.3\n"
-"POT-Creation-Date: 2002-04-08 13:11-0400\n"
+"POT-Creation-Date: 2002-05-06 15:34-0400\n"
 "PO-Revision-Date: 2000-02-11 13:01+0200\n"
 "Last-Translator: Nilgun Belma Buguner <nilgun@technologist.com>\n"
 "Language-Team: Turkish <tr@li.org>\n"
diff --git a/po/uk.po b/po/uk.po
index b8fa17d..83f8bdc 100644
--- a/po/uk.po
+++ b/po/uk.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.3\n"
-"POT-Creation-Date: 2002-04-08 13:11-0400\n"
+"POT-Creation-Date: 2002-05-06 15:34-0400\n"
 "PO-Revision-Date: 1999-09-30 16:54+0200\n"
 "Last-Translator: Yuri Syrota <rasta@renome.rovno.ua>\n"
 "Language-Team: Ukrainian <uk@li.org>\n"
diff --git a/po/wa.po b/po/wa.po
index fdb857f..0ed342d 100644
--- a/po/wa.po
+++ b/po/wa.po
@@ -9,7 +9,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.3\n"
-"POT-Creation-Date: 2002-04-08 13:11-0400\n"
+"POT-Creation-Date: 2002-05-06 15:34-0400\n"
 "PO-Revision-Date: 1999-03-18 23:11+0100\n"
 "Last-Translator: Nobody yet\n"
 "Language-Team: walon <linux-wa@chanae.alphanet.ch>\n"
diff --git a/po/zh.po b/po/zh.po
index fa89fb7..203c754 100644
--- a/po/zh.po
+++ b/po/zh.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.3\n"
-"POT-Creation-Date: 2002-04-08 13:11-0400\n"
+"POT-Creation-Date: 2002-05-06 15:34-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/po/zh_CN.GB2312.po b/po/zh_CN.GB2312.po
index b24a7e9..39f3475 100644
--- a/po/zh_CN.GB2312.po
+++ b/po/zh_CN.GB2312.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.3\n"
-"POT-Creation-Date: 2002-04-08 13:11-0400\n"
+"POT-Creation-Date: 2002-05-06 15:34-0400\n"
 "PO-Revision-Date: 1999-11-11 05:04+0800\n"
 "Last-Translator: Dillion Chen <dillon.chen@turbolinux.com.cn>\n"
 "Language-Team: TLDN\n"
-- 
Gitee


From 61bddb08b33ec32aebfe83d4462901e27c4b7af9 Mon Sep 17 00:00:00 2001
From: Jeff Johnson <n3npq@mac.com>
Date: Thu, 16 May 2002 16:56:10 +0000
Subject: [PATCH 339/667] - opaque (well mostly) rpmTransactionSet using
 methods.

---
 Makefile.am | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Makefile.am b/Makefile.am
index 8ffe164..af8113a 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -9,7 +9,7 @@ EXTRA_DIST = autogen.sh CHANGES $(man_MANS) popt.spec \
 
 SUBDIRS = intl po
 
-INCLUDES = -I$(top_srcdir)
+INCLUDES = -I. -I$(top_srcdir)
 
 noinst_HEADERS = findme.h poptint.h system.h
 
-- 
Gitee


From e2d5d995f611850a97a578c81f8fb374470e32cb Mon Sep 17 00:00:00 2001
From: Jeff Johnson <n3npq@mac.com>
Date: Sat, 1 Jun 2002 15:48:36 +0000
Subject: [PATCH 340/667] - fix: use getgrnam, not getpwnam, to convert gid ->
 group. - fix: avoid sign extension, use only 16 bits, when verifying rdev. -
 python: separate {add,del}Macro methods, prepare for macro dictionary. -
 i18n: copy current production PO files to top-of-stack.

---
 po/pt.po | 25 +++++++++++++++----------
 1 file changed, 15 insertions(+), 10 deletions(-)

diff --git a/po/pt.po b/po/pt.po
index de63013..48660fb 100644
--- a/po/pt.po
+++ b/po/pt.po
@@ -1,26 +1,25 @@
 msgid ""
 msgstr ""
-"Project-Id-Version: popt 1.6.3\n"
-"POT-Creation-Date: 2002-03-13 12:58-0500\n"
-"PO-Revision-Date: 2001-01-21 19:31+00:00\n"
+"Project-Id-Version: popt\n"
+"POT-Creation-Date: 2002-05-06 15:34-0400\n"
+"PO-Revision-Date: 2002-02-13 18:32+0000\n"
 "Last-Translator: Pedro Morais <morais@kde.org>\n"
 "Language-Team: pt <morais@kde.org>\n"
 "MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=iso-latin1\n"
-"Content-Transfer-Encoding: none\n"
+"Content-Type: text/plain; charset=iso-8859-1\n"
+"Content-Transfer-Encoding: 8bit\n"
 
-#: popthelp.c:53
+#: popthelp.c:57
 msgid "Show this help message"
 msgstr "Mostrar esta mensagem de ajuda"
 
-#: popthelp.c:54
+#: popthelp.c:58
 msgid "Display brief usage message"
 msgstr "Mostrar uma mensagem de utiliza��o sucinta"
 
-#: popthelp.c:57
-#, fuzzy
+#: popthelp.c:61
 msgid "Display option defaults in message"
-msgstr "Mostrar uma mensagem de utiliza��o sucinta"
+msgstr "Mostrar valor por omiss�o das op��es na mensagem"
 
 #~ msgid "unknown errno"
 #~ msgstr "errno desconhecido"
@@ -37,6 +36,9 @@ msgstr "Mostrar uma mensagem de utiliza
 #~ msgid "mutually exclusive logical operations requested"
 #~ msgstr "foram pedidas opera��es l�gicas mutuamente exclusivas"
 
+#~ msgid "opt->arg should not be NULL"
+#~ msgstr "opt->arg n�o deve ser NULL"
+
 #~ msgid "aliases nested too deeply"
 #~ msgstr "'aliases' demasiado aninhados"
 
@@ -49,6 +51,9 @@ msgstr "Mostrar uma mensagem de utiliza
 #~ msgid "number too large or too small"
 #~ msgstr "n�mero demasiado grando ou pequeno"
 
+#~ msgid "memory allocation failed"
+#~ msgstr "aloca��o de mem�ria falhou"
+
 #~ msgid "unknown error"
 #~ msgstr "erro desconhecido"
 
-- 
Gitee


From a797727c66e207d7dc43f382327307124260e874 Mon Sep 17 00:00:00 2001
From: Jeff Johnson <n3npq@mac.com>
Date: Sat, 15 Jun 2002 19:44:26 +0000
Subject: [PATCH 341/667] - beecrypt: merge changes from beecrypt-2.3.0. -
 beecrypt: merge doxygen markup with rpmapi doco. - beecrypt: revert cpu/arch
 compile option mixup (#66752).

---
 .lclintrc          |  69 ++++++++++----------------
 Makefile.am        |   2 +-
 po/cs.po           |   2 +-
 po/da.po           |   2 +-
 po/de.po           |   2 +-
 po/es.po           |   2 +-
 po/eu_ES.po        |   2 +-
 po/fi.po           |   2 +-
 po/fr.po           |   2 +-
 po/gl.po           |   2 +-
 po/hu.po           |   2 +-
 po/id.po           |   2 +-
 po/is.po           |   2 +-
 po/it.po           |   2 +-
 po/ja.po           |   2 +-
 po/ko.po           |   2 +-
 po/no.po           |   2 +-
 po/pl.po           |   2 +-
 po/popt.pot        |   2 +-
 po/pt.po           |   2 +-
 po/pt_BR.po        |   2 +-
 po/ro.po           |   2 +-
 po/ru.po           |   2 +-
 po/sk.po           |   2 +-
 po/sl.po           |   2 +-
 po/sr.po           |   2 +-
 po/sv.po           |   2 +-
 po/tr.po           |   2 +-
 po/uk.po           |   2 +-
 po/wa.po           |   2 +-
 po/zh.po           |   2 +-
 po/zh_CN.GB2312.po |   2 +-
 popt.c             |   9 +++-
 popt.h             |  22 +++++++--
 poptint.h          |  52 ++++++++++++++------
 test1.c            | 120 ++++++++++++++++++++++++++++++++-------------
 36 files changed, 204 insertions(+), 130 deletions(-)

diff --git a/.lclintrc b/.lclintrc
index 6a85d82..488dbf5 100644
--- a/.lclintrc
+++ b/.lclintrc
@@ -1,6 +1,6 @@
 -I. -DHAVE_CONFIG_H -D_GNU_SOURCE
 
-+partial
+#+partial
 +forcehints
 
 -warnunixlib
@@ -12,54 +12,37 @@
 
 +strict			# lclint level
 
-# --- +partial artifacts
--declundef
--exportheadervar
--exportlocal
+# --- in progress
+#+bounds		# 56
+#+boundswrite		# 40
 
--enummemuse
--fcnuse
--typeuse
--varuse
+# --- +partial artifacts
+-exportlocal		# 14
+-fcnuse			# 7
 
 # --- not-yet at strict level
--bitwisesigned		# pita
--elseifcomplete		# 95 occurences
--exportconst		# 839 occurences
--exportfcn
--exporttype
--exportvar
--fielduse		# 1 occurence <bits/sigset.h>
--forblock		# tedious
--ifblock		# tedious
--incondefs		# <bits/{ipc,pthreadtypes}.h> heartburn
--matchfields		# <bits/ipc.h> heartburn
--namechecks		# tedious ANSI compliance checks
--numenummembers 1024	# RPMTAG has 138 members
--numstructfields 256	# Java jni.h has 229 fields
--ptrarith		# tedious
+-bitwisesigned		# 75
+-elseifcomplete		# 18
+-exportfcn		# 25
+-globs			# 12 <ctype.h>
+-ifblock		# 202
+-incondefs		# 37 <bits/{ipc,pthreadtypes}.h> heartburn
+-namechecks		# 206
+-ptrarith		# 43
 
--compdestroy
--mustdefine
--shiftimplementation
-#-shiftnegative
+-mustdefine		# 10
+-shiftimplementation	# 120
 
--strictops
--strictusereleased
--stringliterallen 4096	# redhat*PubKey's are big
--whileblock		# tedious
+-strictops		# 16
+-whileblock		# 10
 
 # --- not-yet at checks level
--ansi-reserved
-+enumint
--mustfree
--predboolptr
--usedef
+-mustfree		# 52
+-predboolptr		# 62
+-usedef			# 1
 
 # --- not-yet at standard level
--boolops
--predboolint
-+boolint
-+charint
-+ignorequals
-+matchanyintegral
+-boolops		# 112
+-predboolint		# 30
++charint		# 3
++ignorequals		# 13
diff --git a/Makefile.am b/Makefile.am
index af8113a..25dcf50 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -40,7 +40,7 @@ sources:
 
 .PHONY: lclint
 lclint:
-	lclint ${DEFS} ${INCLUDES} ${libpopt_la_SOURCES}
+	lclint ${DEFS} ${INCLUDES} test1.c ${libpopt_la_SOURCES}
 
 CVSTAG = $(PACKAGE)-$(subst .,_,$(VERSION))
 
diff --git a/po/cs.po b/po/cs.po
index b42504b..1de2fdf 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.3\n"
-"POT-Creation-Date: 2002-05-06 15:34-0400\n"
+"POT-Creation-Date: 2002-06-15 10:10-0400\n"
 "PO-Revision-Date: 2001-07-24 00:03+0100\n"
 "Last-Translator: Milan Kerslager <kerslage@linux.cz>\n"
 "Language-Team: Czech <cs@li.org>\n"
diff --git a/po/da.po b/po/da.po
index fc165e3..b0ea5a5 100644
--- a/po/da.po
+++ b/po/da.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.3\n"
-"POT-Creation-Date: 2002-05-06 15:34-0400\n"
+"POT-Creation-Date: 2002-06-15 10:10-0400\n"
 "PO-Revision-Date: Sun Jan 21 2001 04:30:32+0200\n"
 "Last-Translator: Martin Hansen <mah@k64.dk>\n"
 "Language-Team: Dansk <dansk@klid.dk>\n"
diff --git a/po/de.po b/po/de.po
index 203c754..de352bc 100644
--- a/po/de.po
+++ b/po/de.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.3\n"
-"POT-Creation-Date: 2002-05-06 15:34-0400\n"
+"POT-Creation-Date: 2002-06-15 10:10-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/po/es.po b/po/es.po
index 625a116..17e65d8 100644
--- a/po/es.po
+++ b/po/es.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.3\n"
-"POT-Creation-Date: 2002-05-06 15:34-0400\n"
+"POT-Creation-Date: 2002-06-15 10:10-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Leandro Lucarella <luca@linuxmendoza.org.ar>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/po/eu_ES.po b/po/eu_ES.po
index 203c754..de352bc 100644
--- a/po/eu_ES.po
+++ b/po/eu_ES.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.3\n"
-"POT-Creation-Date: 2002-05-06 15:34-0400\n"
+"POT-Creation-Date: 2002-06-15 10:10-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/po/fi.po b/po/fi.po
index 203c754..de352bc 100644
--- a/po/fi.po
+++ b/po/fi.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.3\n"
-"POT-Creation-Date: 2002-05-06 15:34-0400\n"
+"POT-Creation-Date: 2002-06-15 10:10-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/po/fr.po b/po/fr.po
index 203c754..de352bc 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.3\n"
-"POT-Creation-Date: 2002-05-06 15:34-0400\n"
+"POT-Creation-Date: 2002-06-15 10:10-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/po/gl.po b/po/gl.po
index dac7820..971fffe 100644
--- a/po/gl.po
+++ b/po/gl.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.3\n"
-"POT-Creation-Date: 2002-05-06 15:34-0400\n"
+"POT-Creation-Date: 2002-06-15 10:10-0400\n"
 "PO-Revision-Date: 2001-01-17 01:01+0100\n"
 "Last-Translator: Jes�s Bravo �lvarez <jba@pobox.com>\n"
 "Language-Team: Galician <trasno@ceu.fi.udc.es>\n"
diff --git a/po/hu.po b/po/hu.po
index e495837..61ffcf7 100644
--- a/po/hu.po
+++ b/po/hu.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.3\n"
-"POT-Creation-Date: 2002-05-06 15:34-0400\n"
+"POT-Creation-Date: 2002-06-15 10:10-0400\n"
 "PO-Revision-Date: 2000-08-03 23:26+0200\n"
 "Last-Translator: L�szl� N�meth <nemeth@qwertynet.hu>\n"
 "Language-Team: Hungarian\n"
diff --git a/po/id.po b/po/id.po
index 203c754..de352bc 100644
--- a/po/id.po
+++ b/po/id.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.3\n"
-"POT-Creation-Date: 2002-05-06 15:34-0400\n"
+"POT-Creation-Date: 2002-06-15 10:10-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/po/is.po b/po/is.po
index 44bf3dd..df85fc3 100644
--- a/po/is.po
+++ b/po/is.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.3\n"
-"POT-Creation-Date: 2002-05-06 15:34-0400\n"
+"POT-Creation-Date: 2002-06-15 10:10-0400\n"
 "PO-Revision-Date: 2001-06-08 01:35+0000\n"
 "Last-Translator: Richard Allen <ra@hp.is>\n"
 "Language-Team: is <kde-isl@mmedia.is>\n"
diff --git a/po/it.po b/po/it.po
index 203c754..de352bc 100644
--- a/po/it.po
+++ b/po/it.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.3\n"
-"POT-Creation-Date: 2002-05-06 15:34-0400\n"
+"POT-Creation-Date: 2002-06-15 10:10-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/po/ja.po b/po/ja.po
index 203c754..de352bc 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.3\n"
-"POT-Creation-Date: 2002-05-06 15:34-0400\n"
+"POT-Creation-Date: 2002-06-15 10:10-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/po/ko.po b/po/ko.po
index 1e0b9e7..cd2c857 100644
--- a/po/ko.po
+++ b/po/ko.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6\n"
-"POT-Creation-Date: 2002-05-06 15:34-0400\n"
+"POT-Creation-Date: 2002-06-15 10:10-0400\n"
 "PO-Revision-Date: 2001-09-06 20:06+0900\n"
 "Last-Translator: Jong-Hoon Ryu <redhat4u@netian.com>\n"
 "Language-Team: GNU Translation project <ko@li.org>\n"
diff --git a/po/no.po b/po/no.po
index c9aabe3..5567063 100644
--- a/po/no.po
+++ b/po/no.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.3\n"
-"POT-Creation-Date: 2002-05-06 15:34-0400\n"
+"POT-Creation-Date: 2002-06-15 10:10-0400\n"
 "PO-Revision-Date: 2001-06-27 11:05+0200\n"
 "Last-Translator: Kjartan Maraas <kmaraas@online.no>\n"
 "Language-Team: Norwegian <no@li.org>\n"
diff --git a/po/pl.po b/po/pl.po
index 203c754..de352bc 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.3\n"
-"POT-Creation-Date: 2002-05-06 15:34-0400\n"
+"POT-Creation-Date: 2002-06-15 10:10-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/po/popt.pot b/po/popt.pot
index a8952cb..9d5a999 100644
--- a/po/popt.pot
+++ b/po/popt.pot
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2002-05-06 15:34-0400\n"
+"POT-Creation-Date: 2002-06-15 10:10-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/po/pt.po b/po/pt.po
index 48660fb..b88ba7b 100644
--- a/po/pt.po
+++ b/po/pt.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt\n"
-"POT-Creation-Date: 2002-05-06 15:34-0400\n"
+"POT-Creation-Date: 2002-06-15 10:10-0400\n"
 "PO-Revision-Date: 2002-02-13 18:32+0000\n"
 "Last-Translator: Pedro Morais <morais@kde.org>\n"
 "Language-Team: pt <morais@kde.org>\n"
diff --git a/po/pt_BR.po b/po/pt_BR.po
index 203c754..de352bc 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.3\n"
-"POT-Creation-Date: 2002-05-06 15:34-0400\n"
+"POT-Creation-Date: 2002-06-15 10:10-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/po/ro.po b/po/ro.po
index 61587e0..d4ee0c2 100644
--- a/po/ro.po
+++ b/po/ro.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.3\n"
-"POT-Creation-Date: 2002-05-06 15:34-0400\n"
+"POT-Creation-Date: 2002-06-15 10:10-0400\n"
 "PO-Revision-Date: 2000-06-14 23:23+EST\n"
 "Last-Translator: Cristian Gafton <gafton@redhat.com>\n"
 "Language-Team: Romanian <ro@li.org>\n"
diff --git a/po/ru.po b/po/ru.po
index 5ff1527..64f667f 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.3\n"
-"POT-Creation-Date: 2002-05-06 15:34-0400\n"
+"POT-Creation-Date: 2002-06-15 10:10-0400\n"
 "PO-Revision-Date: 2001-07-05 21:00-0500\n"
 "Last-Translator: Eugene Kanter <eugene@blackcatlinux.com>\n"
 "Language-Team: Black Cat Linux Team <blackcat-support@blackcatlinux.com>\n"
diff --git a/po/sk.po b/po/sk.po
index 2f7c956..622680d 100644
--- a/po/sk.po
+++ b/po/sk.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.3\n"
-"POT-Creation-Date: 2002-05-06 15:34-0400\n"
+"POT-Creation-Date: 2002-06-15 10:10-0400\n"
 "PO-Revision-Date: 1999-08-04 21:40+0200\n"
 "Last-Translator: Stanislav Meduna <stano@eunet.sk>\n"
 "Language-Team: Slovak <sk-i18n@rak.isternet.sk>\n"
diff --git a/po/sl.po b/po/sl.po
index 5d462f4..b2ddf92 100644
--- a/po/sl.po
+++ b/po/sl.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.3\n"
-"POT-Creation-Date: 2002-05-06 15:34-0400\n"
+"POT-Creation-Date: 2002-06-15 10:10-0400\n"
 "PO-Revision-Date: 2000-09-05 12:30+0200\n"
 "Last-Translator: Roman Maurer <roman.maurer@hermes.si>\n"
 "Language-Team: Slovenian <sl@li.org>\n"
diff --git a/po/sr.po b/po/sr.po
index 203c754..de352bc 100644
--- a/po/sr.po
+++ b/po/sr.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.3\n"
-"POT-Creation-Date: 2002-05-06 15:34-0400\n"
+"POT-Creation-Date: 2002-06-15 10:10-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/po/sv.po b/po/sv.po
index 2eb9a2d..d971640 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.3\n"
-"POT-Creation-Date: 2002-05-06 15:34-0400\n"
+"POT-Creation-Date: 2002-06-15 10:10-0400\n"
 "PO-Revision-Date: 2001-07-12 22:26+0100\n"
 "Last-Translator: Christian Rose <menthos@menthos.com>\n"
 "Language-Team: Swedish <sv@li.org>\n"
diff --git a/po/tr.po b/po/tr.po
index 7e91800..60df608 100644
--- a/po/tr.po
+++ b/po/tr.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.3\n"
-"POT-Creation-Date: 2002-05-06 15:34-0400\n"
+"POT-Creation-Date: 2002-06-15 10:10-0400\n"
 "PO-Revision-Date: 2000-02-11 13:01+0200\n"
 "Last-Translator: Nilgun Belma Buguner <nilgun@technologist.com>\n"
 "Language-Team: Turkish <tr@li.org>\n"
diff --git a/po/uk.po b/po/uk.po
index 83f8bdc..1034411 100644
--- a/po/uk.po
+++ b/po/uk.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.3\n"
-"POT-Creation-Date: 2002-05-06 15:34-0400\n"
+"POT-Creation-Date: 2002-06-15 10:10-0400\n"
 "PO-Revision-Date: 1999-09-30 16:54+0200\n"
 "Last-Translator: Yuri Syrota <rasta@renome.rovno.ua>\n"
 "Language-Team: Ukrainian <uk@li.org>\n"
diff --git a/po/wa.po b/po/wa.po
index 0ed342d..e725750 100644
--- a/po/wa.po
+++ b/po/wa.po
@@ -9,7 +9,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.3\n"
-"POT-Creation-Date: 2002-05-06 15:34-0400\n"
+"POT-Creation-Date: 2002-06-15 10:10-0400\n"
 "PO-Revision-Date: 1999-03-18 23:11+0100\n"
 "Last-Translator: Nobody yet\n"
 "Language-Team: walon <linux-wa@chanae.alphanet.ch>\n"
diff --git a/po/zh.po b/po/zh.po
index 203c754..de352bc 100644
--- a/po/zh.po
+++ b/po/zh.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.3\n"
-"POT-Creation-Date: 2002-05-06 15:34-0400\n"
+"POT-Creation-Date: 2002-06-15 10:10-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/po/zh_CN.GB2312.po b/po/zh_CN.GB2312.po
index 39f3475..3262546 100644
--- a/po/zh_CN.GB2312.po
+++ b/po/zh_CN.GB2312.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.3\n"
-"POT-Creation-Date: 2002-05-06 15:34-0400\n"
+"POT-Creation-Date: 2002-06-15 10:10-0400\n"
 "PO-Revision-Date: 1999-11-11 05:04+0800\n"
 "Last-Translator: Dillion Chen <dillon.chen@turbolinux.com.cn>\n"
 "Language-Team: TLDN\n"
diff --git a/popt.c b/popt.c
index 962f973..16bdbff 100644
--- a/popt.c
+++ b/popt.c
@@ -222,10 +222,11 @@ void poptResetContext(poptContext con)
     con->doExec = NULL;
 
     if (con->finalArgv != NULL)
-    for (i = 0; i < con->finalArgvCount; i++)
+    for (i = 0; i < con->finalArgvCount; i++) {
 	/*@-unqualifiedtrans@*/		/* FIX: typedef double indirection. */
 	con->finalArgv[i] = _free(con->finalArgv[i]);
 	/*@=unqualifiedtrans@*/
+    }
 
     con->finalArgvCount = 0;
     con->arg_strip = PBM_FREE(con->arg_strip);
@@ -296,7 +297,7 @@ static int handleExec(/*@special@*/ poptContext con,
 /* Only one of longName, shortName may be set at a time */
 static int handleAlias(/*@special@*/ poptContext con,
 		/*@null@*/ const char * longName, char shortName,
-		/*@keep@*/ /*@null@*/ const char * nextCharArg)
+		/*@exposed@*/ /*@null@*/ const char * nextCharArg)
 	/*@uses con->aliases, con->numAliases, con->optionStack, con->os,
 		con->os->currAlias, con->os->currAlias->option.longName @*/
 	/*@modifies con @*/
@@ -346,6 +347,7 @@ static int handleAlias(/*@special@*/ poptContext con,
     return (rc ? rc : 1);
 }
 
+/*@-bounds -boundswrite @*/
 static int execCommand(poptContext con)
     /*@*/
 {
@@ -417,6 +419,7 @@ static int execCommand(poptContext con)
 
     if (argv[0] == NULL)
 	return POPT_ERROR_NOARG;
+
 #ifdef MYDEBUG
     {	const char ** avp;
 	fprintf(stderr, "==> execvp(%s) argv[%d]:", argv[0], argc);
@@ -427,8 +430,10 @@ static int execCommand(poptContext con)
 #endif
 
     rc = execvp(argv[0], (char *const *)argv);
+
     return POPT_ERROR_ERRNO;
 }
+/*@=bounds =boundswrite @*/
 
 /*@observer@*/ /*@null@*/ static const struct poptOption *
 findOption(const struct poptOption * opt, /*@null@*/ const char * longName,
diff --git a/popt.h b/popt.h
index 495cc99..60d27e6 100644
--- a/popt.h
+++ b/popt.h
@@ -134,11 +134,13 @@ struct poptAlias {
 /** \ingroup popt
  * A popt alias or exec argument for poptAddItem().
  */
+/*@-exporttype@*/
 typedef struct poptItem_s {
     struct poptOption option;	/*!< alias/exec name(s) and description. */
     int argc;			/*!< (alias) no. of args. */
 /*@owned@*/ const char ** argv;	/*!< (alias) args, must be free()able. */
 } * poptItem;
+/*@=exporttype@*/
 
 /** \ingroup popt
  * \name Auto-generated help/usage
@@ -148,16 +150,20 @@ typedef struct poptItem_s {
 /**
  * Empty table marker to enable displaying popt alias/exec options.
  */
+/*@-exportvar@*/
 /*@observer@*/ /*@checked@*/
 extern struct poptOption poptAliasOptions[];
+/*@=exportvar@*/
 #define POPT_AUTOALIAS { NULL, '\0', POPT_ARG_INCLUDE_TABLE, poptAliasOptions, \
 			0, "Options implemented via popt alias/exec:", NULL },
 
 /**
  * Auto help table options.
  */
+/*@-exportvar@*/
 /*@observer@*/ /*@checked@*/
 extern struct poptOption poptHelpOptions[];
+/*@=exportvar@*/
 #define POPT_AUTOHELP { NULL, '\0', POPT_ARG_INCLUDE_TABLE, poptHelpOptions, \
 			0, "Help options:", NULL },
 
@@ -166,19 +172,25 @@ extern struct poptOption poptHelpOptions[];
 
 /** \ingroup popt
  */
+/*@-exporttype@*/
 typedef /*@abstract@*/ struct poptContext_s * poptContext;
+/*@=exporttype@*/
 
 /** \ingroup popt
  */
 #ifndef __cplusplus
-/*@-typeuse@*/
+/*@-exporttype -typeuse@*/
 typedef struct poptOption * poptOption;
-/*@=typeuse@*/
+/*@=exporttype =typeuse@*/
 #endif
 
-enum poptCallbackReason { POPT_CALLBACK_REASON_PRE, 
-			  POPT_CALLBACK_REASON_POST,
-			  POPT_CALLBACK_REASON_OPTION };
+/*@-exportconst@*/
+enum poptCallbackReason {
+    POPT_CALLBACK_REASON_PRE	= 0, 
+    POPT_CALLBACK_REASON_POST	= 1,
+    POPT_CALLBACK_REASON_OPTION = 2
+};
+/*@=exportconst@*/
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/poptint.h b/poptint.h
index 30172fe..a4f9147 100644
--- a/poptint.h
+++ b/poptint.h
@@ -23,13 +23,17 @@ _free(/*@only@*/ /*@null@*/ const void * p)
 }
 
 /* Bit mask macros. */
+/*@-exporttype@*/
 typedef	unsigned int __pbm_bits;
+/*@=exporttype@*/
 #define	__PBM_NBITS		(8 * sizeof (__pbm_bits))
 #define	__PBM_IX(d)		((d) / __PBM_NBITS)
 #define __PBM_MASK(d)		((__pbm_bits) 1 << (((unsigned)(d)) % __PBM_NBITS))
+/*@-exporttype@*/
 typedef struct {
     __pbm_bits bits[1];
 } pbm_set;
+/*@=exporttype@*/
 #define	__PBM_BITS(set)	((set)->bits)
 
 #define	PBM_ALLOC(d)	calloc(__PBM_IX (d) + 1, sizeof(__pbm_bits))
@@ -40,37 +44,53 @@ typedef struct {
 
 struct optionStackEntry {
     int argc;
-/*@only@*/ /*@null@*/ const char ** argv;
-/*@only@*/ /*@null@*/ pbm_set * argb;
+/*@only@*/ /*@null@*/
+    const char ** argv;
+/*@only@*/ /*@null@*/
+    pbm_set * argb;
     int next;
-/*@only@*/ /*@null@*/ const char * nextArg;
-/*@keep@*/ /*@null@*/ const char * nextCharArg;
-/*@dependent@*/ /*@null@*/ poptItem currAlias;
+/*@only@*/ /*@null@*/
+    const char * nextArg;
+/*@observer@*/ /*@null@*/
+    const char * nextCharArg;
+/*@dependent@*/ /*@null@*/
+    poptItem currAlias;
     int stuffed;
 };
 
 struct poptContext_s {
     struct optionStackEntry optionStack[POPT_OPTION_DEPTH];
-/*@dependent@*/ struct optionStackEntry * os;
-/*@owned@*/ /*@null@*/ const char ** leftovers;
+/*@dependent@*/
+    struct optionStackEntry * os;
+/*@owned@*/ /*@null@*/
+    const char ** leftovers;
     int numLeftovers;
     int nextLeftover;
-/*@keep@*/ const struct poptOption * options;
+/*@keep@*/
+    const struct poptOption * options;
     int restLeftover;
-/*@only@*/ /*@null@*/ const char * appName;
-/*@only@*/ /*@null@*/ poptItem aliases;
+/*@only@*/ /*@null@*/
+    const char * appName;
+/*@only@*/ /*@null@*/
+    poptItem aliases;
     int numAliases;
     int flags;
-/*@owned@*/ /*@null@*/ poptItem execs;
+/*@owned@*/ /*@null@*/
+    poptItem execs;
     int numExecs;
-/*@only@*/ /*@null@*/ const char ** finalArgv;
+/*@only@*/ /*@null@*/
+    const char ** finalArgv;
     int finalArgvCount;
     int finalArgvAlloced;
-/*@dependent@*/ /*@null@*/ poptItem doExec;
-/*@only@*/ const char * execPath;
+/*@dependent@*/ /*@null@*/
+    poptItem doExec;
+/*@only@*/
+    const char * execPath;
     int execAbsolute;
-/*@only@*/ const char * otherHelp;
-/*@null@*/ pbm_set * arg_strip;
+/*@only@*/
+    const char * otherHelp;
+/*@null@*/
+    pbm_set * arg_strip;
 };
 
 #ifdef HAVE_LIBINTL_H
diff --git a/test1.c b/test1.c
index ca5b3a6..d1bbc47 100644
--- a/test1.c
+++ b/test1.c
@@ -4,43 +4,71 @@
 
 #include "system.h"
 
+/*@unchecked@*/
 static int pass2 = 0;
-static void option_callback(poptContext con, enum poptCallbackReason reason,
-		     const struct poptOption * opt,
-		     char * arg, void * data) {
+static void option_callback(/*@unused@*/ poptContext con,
+		/*@unused@*/ enum poptCallbackReason reason,
+		const struct poptOption * opt,
+		char * arg, void * data)
+	/*@globals fileSystem @*/
+	/*@modifies fileSystem @*/
+{
     if (pass2)
 	fprintf(stdout, "callback: %c %s %s ", opt->val, (char *) data, arg);
 }
 
-int arg1 = 0;
-char * arg2 = "(none)";
-int arg3 = 0;
-int inc = 0;
-int shortopt = 0;
-
-int aVal = 141421;
-int bVal = 141421;
-int aFlag = 0;
-int bFlag = 0;
-
-int aInt = 271828;
-int bInt = 271828;
-long aLong = 738905609L;
-long bLong = 738905609L;
-float aFloat = 3.1415926535;
-float bFloat = 3.1415926535;
-double aDouble = 9.86960440108935861883;
-double bDouble = 9.86960440108935861883;
-char * oStr = (char *) -1;
-int singleDash = 0;
-
-char * lStr = "This tests default strings and exceeds the ... limit. "
+/*@unchecked@*/
+static int arg1 = 0;
+/*@unchecked@*/ /*@observer@*/
+static char * arg2 = "(none)";
+/*@unchecked@*/
+static int arg3 = 0;
+/*@unchecked@*/
+static int inc = 0;
+/*@unchecked@*/
+static int shortopt = 0;
+
+/*@unchecked@*/
+static int aVal = 141421;
+/*@unchecked@*/
+static int bVal = 141421;
+/*@unchecked@*/
+static int aFlag = 0;
+/*@unchecked@*/
+static int bFlag = 0;
+
+/*@unchecked@*/
+static int aInt = 271828;
+/*@unchecked@*/
+static int bInt = 271828;
+/*@unchecked@*/
+static long aLong = 738905609L;
+/*@unchecked@*/
+static long bLong = 738905609L;
+/*@unchecked@*/
+static float aFloat = 3.1415926535;
+/*@unchecked@*/
+static float bFloat = 3.1415926535;
+/*@unchecked@*/
+static double aDouble = 9.86960440108935861883;
+/*@unchecked@*/
+static double bDouble = 9.86960440108935861883;
+/*@unchecked@*/ /*@null@*/
+static char * oStr = (char *) -1;
+/*@unchecked@*/
+static int singleDash = 0;
+
+/*@unchecked@*/ /*@observer@*/
+static char * lStr =
+"This tests default strings and exceeds the ... limit. "
 "123456789+123456789+123456789+123456789+123456789+ "
 "123456789+123456789+123456789+123456789+123456789+ "
 "123456789+123456789+123456789+123456789+123456789+ "
 "123456789+123456789+123456789+123456789+123456789+ ";
-char * nStr = NULL; 
+/*@unchecked@*/ /*@null@*/
+static char * nStr = NULL; 
 
+/*@unchecked@*/
 static struct poptOption moreCallbackArgs[] = {
   { NULL, '\0', POPT_ARG_CALLBACK|POPT_CBFLAG_INC_DATA,
 	(void *)option_callback, 0,
@@ -50,8 +78,10 @@ static struct poptOption moreCallbackArgs[] = {
   POPT_TABLEEND
 };
 
+/*@unchecked@*/
 static struct poptOption callbackArgs[] = {
-  { NULL, '\0', POPT_ARG_CALLBACK, (void *)option_callback, 0, "sampledata" },
+  { NULL, '\0', POPT_ARG_CALLBACK, (void *)option_callback, 0,
+	"sampledata", NULL },
   { "cb", 'c', POPT_ARG_STRING, NULL, 'c',
 	"Test argument callbacks", NULL },
   { "longopt", '\0', 0, NULL, 'l',
@@ -59,13 +89,16 @@ static struct poptOption callbackArgs[] = {
   POPT_TABLEEND
 };
 
+/*@unchecked@*/
 static struct poptOption moreArgs[] = {
-  { "inc", 'I', 0, &inc, 0, "An included argument" },
+  { "inc", 'I', 0, &inc, 0, "An included argument", NULL },
   POPT_TABLEEND
 };
 
+/*@unchecked@*/
 static struct poptOption options[] = {
-  { NULL, '\0', POPT_ARG_INCLUDE_TABLE, &moreCallbackArgs, 0, "arg for cb2" },
+  { NULL, '\0', POPT_ARG_INCLUDE_TABLE, &moreCallbackArgs, 0,
+	"arg for cb2", NULL },
   { "arg1", '\0', 0, &arg1, 0, "First argument with a really long"
 	    " description. After all, we have to test argument help"
 	    " wrapping somehow, right?", NULL },
@@ -114,6 +147,12 @@ static struct poptOption options[] = {
 };
 
 static void resetVars(void)
+	/*@globals arg1, arg2, arg3, inc, shortopt,
+		aVal, aFlag, aInt, aLong, aFloat, aDouble,
+		oStr, singleDash, pass2 @*/
+	/*@modifies arg1, arg2, arg3, inc, shortopt,
+		aVal, aFlag, aInt, aLong, aFloat, aDouble,
+		oStr, singleDash, pass2 @*/
 {
     arg1 = 0;
     arg2 = "(none)";
@@ -135,7 +174,10 @@ static void resetVars(void)
     pass2 = 0;
 }
 
-int main(int argc, const char ** argv) {
+int main(int argc, const char ** argv)
+	/*@globals pass2, fileSystem @*/
+	/*@modifies pass2, fileSystem @*/
+{
     int rc;
     int ec = 0;
     poptContext optCon;
@@ -144,19 +186,27 @@ int main(int argc, const char ** argv) {
     int usage = 0;
 
 #if HAVE_MCHECK_H && HAVE_MTRACE
+    /*@-moduncon -noeffectuncon@*/
     mtrace();   /* Trace malloc only if MALLOC_TRACE=mtrace-output-file. */
+    /*@=moduncon =noeffectuncon@*/
 #endif
 
+/*@-modobserver@*/
     resetVars();
+/*@=modobserver@*/
+/*@-temptrans@*/
     optCon = poptGetContext("test1", argc, argv, options, 0);
-    poptReadConfigFile(optCon, "./test-poptrc");
+/*@=temptrans@*/
+    (void) poptReadConfigFile(optCon, "./test-poptrc");
 
 #if 1
     while ((rc = poptGetNextOpt(optCon)) > 0)	/* Read all the options ... */
-	;
+	{};
 
     poptResetContext(optCon);			/* ... and then start over. */
+/*@-modobserver@*/
     resetVars();
+/*@=modobserver@*/
 #endif
 
     pass2 = 1;
@@ -193,10 +243,12 @@ int main(int argc, const char ** argv) {
 	fprintf(stdout, " aInt: %d", aInt);
     if (aLong != bLong)
 	fprintf(stdout, " aLong: %ld", aLong);
+/*@-realcompare@*/
     if (aFloat != bFloat)
 	fprintf(stdout, " aFloat: %g", aFloat);
     if (aDouble != bDouble)
 	fprintf(stdout, " aDouble: %g", aDouble);
+/*@=realcompare@*/
     if (oStr != (char *)-1)
 	fprintf(stdout, " oStr: %s", (oStr ? oStr : "(none)"));
     if (singleDash)
@@ -216,7 +268,9 @@ int main(int argc, const char ** argv) {
 exit:
     optCon = poptFreeContext(optCon);
 #if HAVE_MCHECK_H && HAVE_MTRACE
+    /*@-moduncon -noeffectuncon@*/
     muntrace();   /* Trace malloc only if MALLOC_TRACE=mtrace-output-file. */
+    /*@=moduncon =noeffectuncon@*/
 #endif
     return ec;
 }
-- 
Gitee


From 1fedd69b697d2e205c7cea0e4db98982e7355aa2 Mon Sep 17 00:00:00 2001
From: Jeff Johnson <n3npq@mac.com>
Date: Wed, 19 Jun 2002 18:55:19 +0000
Subject: [PATCH 342/667] Annotate incondefs in source code.

---
 .lclintrc | 2 +-
 popt.h    | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/.lclintrc b/.lclintrc
index 488dbf5..6a70b04 100644
--- a/.lclintrc
+++ b/.lclintrc
@@ -26,12 +26,12 @@
 -exportfcn		# 25
 -globs			# 12 <ctype.h>
 -ifblock		# 202
--incondefs		# 37 <bits/{ipc,pthreadtypes}.h> heartburn
 -namechecks		# 206
 -ptrarith		# 43
 
 -mustdefine		# 10
 -shiftimplementation	# 120
+-sys-dir-errors
 
 -strictops		# 16
 -whileblock		# 10
diff --git a/popt.h b/popt.h
index 60d27e6..c756061 100644
--- a/popt.h
+++ b/popt.h
@@ -151,7 +151,7 @@ typedef struct poptItem_s {
  * Empty table marker to enable displaying popt alias/exec options.
  */
 /*@-exportvar@*/
-/*@observer@*/ /*@checked@*/
+/*@unchecked@*/ /*@observer@*/
 extern struct poptOption poptAliasOptions[];
 /*@=exportvar@*/
 #define POPT_AUTOALIAS { NULL, '\0', POPT_ARG_INCLUDE_TABLE, poptAliasOptions, \
@@ -161,7 +161,7 @@ extern struct poptOption poptAliasOptions[];
  * Auto help table options.
  */
 /*@-exportvar@*/
-/*@observer@*/ /*@checked@*/
+/*@unchecked@*/ /*@observer@*/
 extern struct poptOption poptHelpOptions[];
 /*@=exportvar@*/
 #define POPT_AUTOHELP { NULL, '\0', POPT_ARG_INCLUDE_TABLE, poptHelpOptions, \
-- 
Gitee


From 8540754e579f89cda881e8c1d9ce33a3856c6afd Mon Sep 17 00:00:00 2001
From: Jeff Johnson <n3npq@mac.com>
Date: Sat, 22 Jun 2002 18:51:58 +0000
Subject: [PATCH 343/667] Factor bounds checking annotations into source code.

---
 .cvsignore   |  1 +
 .lclintrc    |  2 +-
 Makefile.am  |  5 +++++
 popt.c       | 20 ++++++++++++++++++++
 poptconfig.c |  4 ++++
 popthelp.c   |  7 +++++++
 poptparse.c  |  4 ++++
 system.h     | 10 ++++++++++
 8 files changed, 52 insertions(+), 1 deletion(-)

diff --git a/.cvsignore b/.cvsignore
index bfe95bd..996c662 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -27,5 +27,6 @@ stamp-h.in
 test1
 test2
 *.la
+*.lcd
 *.lo
 popt-*.tar.gz
diff --git a/.lclintrc b/.lclintrc
index 6a70b04..a3d22bc 100644
--- a/.lclintrc
+++ b/.lclintrc
@@ -14,7 +14,7 @@
 
 # --- in progress
 #+bounds		# 56
-#+boundswrite		# 40
++boundswrite		# 40
 
 # --- +partial artifacts
 -exportlocal		# 14
diff --git a/Makefile.am b/Makefile.am
index 25dcf50..7565e7c 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -34,6 +34,11 @@ libpopt_la_SOURCES = popt.c findme.c poptparse.c poptconfig.c popthelp.c
 
 man_MANS = popt.3
 
+BUILT_SOURCES = popt.lcd
+
+popt.lcd: Makefile.am ${libpopt_la_SOURCES} ${include_HEADERS} ${noinst_HEADERS}
+	lclint -dump $@ ${libpopt_la_SOURCES}
+
 .PHONY:	sources
 sources:
 	@echo $(libpopt_la_SOURCES:%=popt/%)
diff --git a/popt.c b/popt.c
index 16bdbff..e4d6d31 100644
--- a/popt.c
+++ b/popt.c
@@ -202,6 +202,7 @@ static void cleanOSE(/*@special@*/ struct optionStackEntry *os)
     os->argb = PBM_FREE(os->argb);
 }
 
+/*@-boundswrite@*/
 void poptResetContext(poptContext con)
 {
     int i;
@@ -234,8 +235,10 @@ void poptResetContext(poptContext con)
     return;
     /*@=nullstate@*/
 }
+/*@=boundswrite@*/
 
 /* Only one of longName, shortName should be set, not both. */
+/*@-boundswrite@*/
 static int handleExec(/*@special@*/ poptContext con,
 		/*@null@*/ const char * longName, char shortName)
 	/*@uses con->execs, con->numExecs, con->flags, con->doExec,
@@ -293,6 +296,7 @@ static int handleExec(/*@special@*/ poptContext con,
     return 1;
     /*@=nullstate@*/
 }
+/*@=boundswrite@*/
 
 /* Only one of longName, shortName may be set at a time */
 static int handleAlias(/*@special@*/ poptContext con,
@@ -435,6 +439,7 @@ static int execCommand(poptContext con)
 }
 /*@=bounds =boundswrite @*/
 
+/*@-boundswrite@*/
 /*@observer@*/ /*@null@*/ static const struct poptOption *
 findOption(const struct poptOption * opt, /*@null@*/ const char * longName,
 		char shortName,
@@ -501,6 +506,7 @@ findOption(const struct poptOption * opt, /*@null@*/ const char * longName,
 
     return opt;
 }
+/*@=boundswrite@*/
 
 static const char * findNextArg(/*@special@*/ poptContext con,
 		unsigned argx, int delete_arg)
@@ -539,6 +545,7 @@ static const char * findNextArg(/*@special@*/ poptContext con,
     return arg;
 }
 
+/*@-boundswrite@*/
 static /*@only@*/ /*@null@*/ const char *
 expandNextArg(/*@special@*/ poptContext con, const char * s)
 	/*@uses con->optionStack, con->os,
@@ -587,6 +594,7 @@ expandNextArg(/*@special@*/ poptContext con, const char * s)
     t = realloc(t, strlen(t) + 1);	/* XXX memory leak, hard to plug */
     return t;
 }
+/*@=boundswrite@*/
 
 static void poptStripArg(/*@special@*/ poptContext con, int which)
 	/*@uses con->arg_strip, con->optionStack @*/
@@ -604,6 +612,7 @@ static void poptStripArg(/*@special@*/ poptContext con, int which)
     /*@=compdef@*/
 }
 
+/*@-boundswrite@*/
 static int poptSaveLong(const struct poptOption * opt, long aLong)
 	/*@modifies opt->arg @*/
 {
@@ -631,7 +640,9 @@ static int poptSaveLong(const struct poptOption * opt, long aLong)
     }
     return 0;
 }
+/*@=boundswrite@*/
 
+/*@-boundswrite@*/
 static int poptSaveInt(const struct poptOption * opt, long aLong)
 	/*@modifies opt->arg @*/
 {
@@ -659,7 +670,9 @@ static int poptSaveInt(const struct poptOption * opt, long aLong)
     }
     return 0;
 }
+/*@=boundswrite@*/
 
+/*@-boundswrite@*/
 /* returns 'val' element, -1 on last item, POPT_ERROR_* on error */
 int poptGetNextOpt(poptContext con)
 {
@@ -969,6 +982,7 @@ int poptGetNextOpt(poptContext con)
 
     return (opt ? opt->val : -1);	/* XXX can't happen */
 }
+/*@=boundswrite@*/
 
 const char * poptGetOptArg(poptContext con)
 {
@@ -998,6 +1012,7 @@ const char * poptPeekArg(poptContext con)
     return ret;
 }
 
+/*@-boundswrite@*/
 const char ** poptGetArgs(poptContext con)
 {
     if (con == NULL ||
@@ -1011,6 +1026,7 @@ const char ** poptGetArgs(poptContext con)
     return (con->leftovers + con->nextLeftover);
     /*@=nullret =nullstate @*/
 }
+/*@=boundswrite@*/
 
 poptContext poptFreeContext(poptContext con)
 {
@@ -1073,6 +1089,7 @@ int poptAddAlias(poptContext con, struct poptAlias alias,
     return poptAddItem(con, item, 0);
 }
 
+/*@-boundswrite@*/
 /*@-mustmod@*/ /* LCL: con not modified? */
 int poptAddItem(poptContext con, poptItem newItem, int flags)
 {
@@ -1117,6 +1134,7 @@ int poptAddItem(poptContext con, poptItem newItem, int flags)
     return 0;
 }
 /*@=mustmod@*/
+/*@=boundswrite@*/
 
 const char * poptBadOption(poptContext con, int flags)
 {
@@ -1186,6 +1204,7 @@ const char * poptGetInvocationName(poptContext con)
     return (con->os->argv ? con->os->argv[0] : "");
 }
 
+/*@-boundswrite@*/
 int poptStrippedArgv(poptContext con, int argc, char ** argv)
 {
     int numargs = argc;
@@ -1209,3 +1228,4 @@ int poptStrippedArgv(poptContext con, int argc, char ** argv)
     
     return numargs;
 }
+/*@=boundswrite@*/
diff --git a/poptconfig.c b/poptconfig.c
index 58ccf01..7739649 100644
--- a/poptconfig.c
+++ b/poptconfig.c
@@ -21,6 +21,7 @@ static void configLine(poptContext con, char * line)
     poptItem item = alloca(sizeof(*item));
     int i, j;
     
+/*@-boundswrite@*/
     memset(item, 0, sizeof(*item));
 
     /*@-type@*/
@@ -80,6 +81,7 @@ static void configLine(poptContext con, char * line)
 	item->argc = j;
     }
     /*@=modobserver@*/
+/*@=boundswrite@*/
 	
     /*@-nullstate@*/ /* FIX: item->argv[] may be NULL */
     if (!strcmp(entryType, "alias"))
@@ -124,6 +126,7 @@ int poptReadConfigFile(poptContext con, const char * fn)
     if (close(fd) == -1)
 	return POPT_ERROR_ERRNO;
 
+/*@-boundswrite@*/
     dst = buf = alloca(fileLength + 1);
 
     chptr = file;
@@ -155,6 +158,7 @@ int poptReadConfigFile(poptContext con, const char * fn)
 	}
     }
     /*@=infloops@*/
+/*@=boundswrite@*/
 
     return 0;
 }
diff --git a/popthelp.c b/popthelp.c
index 261740b..5f9d54f 100644
--- a/popthelp.c
+++ b/popthelp.c
@@ -131,6 +131,7 @@ singleOptionDefaultValue(int lineLength,
     char * l = le;
 
     if (le == NULL) return NULL;	/* XXX can't happen */
+/*@-boundswrite@*/
     *le = '\0';
     *le++ = '(';
     strcpy(le, defstr);	le += strlen(le);
@@ -177,6 +178,7 @@ singleOptionDefaultValue(int lineLength,
     }
     *le++ = ')';
     *le = '\0';
+/*@=boundswrite@*/
 
     return l;
 }
@@ -207,6 +209,7 @@ static void singleOptionHelp(FILE * fp, int maxLeftCol,
     if (opt->longName)	nb += strlen(opt->longName);
     if (argDescrip)	nb += strlen(argDescrip);
 
+/*@-boundswrite@*/
     left = malloc(nb);
     if (left == NULL) return;	/* XXX can't happen */
     left[0] = '\0';
@@ -223,6 +226,7 @@ static void singleOptionHelp(FILE * fp, int maxLeftCol,
 		((opt->argInfo & POPT_ARGFLAG_ONEDASH) ? "-" : "--"),
 		opt->longName);
     if (!*left) goto out;
+
     if (argDescrip) {
 	char * le = left + strlen(left);
 
@@ -306,6 +310,7 @@ static void singleOptionHelp(FILE * fp, int maxLeftCol,
 	    *le++ = ']';
 	*le = '\0';
     }
+/*@=boundswrite@*/
 
     if (help)
 	fprintf(fp,"  %-*s   ", maxLeftCol, left);
@@ -634,6 +639,7 @@ static int showShortOptions(const struct poptOption * opt, FILE * fp,
     }
     /*@=branchstate@*/
 
+/*@-boundswrite@*/
     if (opt != NULL)
     for (; (opt->longName || opt->shortName || opt->arg); opt++) {
 	if (opt->shortName && !(opt->argInfo & POPT_ARG_MASK))
@@ -642,6 +648,7 @@ static int showShortOptions(const struct poptOption * opt, FILE * fp,
 	    if (opt->arg)	/* XXX program error */
 		(void) showShortOptions(opt->arg, fp, str);
     } 
+/*@=boundswrite@*/
 
     if (s != str || *s != '\0')
 	return 0;
diff --git a/poptparse.c b/poptparse.c
index 2ffb7dd..2071601 100644
--- a/poptparse.c
+++ b/poptparse.c
@@ -10,6 +10,7 @@
 
 #define POPT_ARGV_ARRAY_GROW_DELTA 5
 
+/*@-boundswrite@*/
 int poptDupArgv(int argc, const char **argv,
 		int * argcPtr, const char *** argvPtr)
 {
@@ -50,7 +51,9 @@ int poptDupArgv(int argc, const char **argv,
 	*argcPtr = argc;
     return 0;
 }
+/*@=boundswrite@*/
 
+/*@-bounds@*/
 int poptParseArgvString(const char * s, int * argcPtr, const char *** argvPtr)
 {
     const char * src;
@@ -116,3 +119,4 @@ exit:
     if (argv) free(argv);
     return rc;
 }
+/*@=bounds@*/
diff --git a/system.h b/system.h
index 338be45..1d1b9da 100644
--- a/system.h
+++ b/system.h
@@ -2,7 +2,17 @@
 #include "config.h"
 #endif
 
+#if defined (__GLIBC__) && defined(__LCLINT__)
+/*@-declundef@*/
+/*@unchecked@*/
+extern __const __int32_t *__ctype_tolower;
+/*@unchecked@*/
+extern __const __int32_t *__ctype_toupper;
+/*@=declundef@*/
+#endif
+
 #include <ctype.h>
+
 #include <errno.h>
 #include <fcntl.h>
 #include <limits.h>
-- 
Gitee


From 6946a6546afed3f5551c792110e506093b2c8973 Mon Sep 17 00:00:00 2001
From: Jeff Johnson <n3npq@mac.com>
Date: Tue, 25 Jun 2002 18:44:40 +0000
Subject: [PATCH 344/667] - python: link internal libelf (if used) directly
 into rpmmodule.so.

---
 Makefile.am        | 2 +-
 po/cs.po           | 2 +-
 po/da.po           | 2 +-
 po/de.po           | 2 +-
 po/es.po           | 2 +-
 po/eu_ES.po        | 2 +-
 po/fi.po           | 2 +-
 po/fr.po           | 2 +-
 po/gl.po           | 2 +-
 po/hu.po           | 2 +-
 po/id.po           | 2 +-
 po/is.po           | 2 +-
 po/it.po           | 2 +-
 po/ja.po           | 2 +-
 po/ko.po           | 2 +-
 po/no.po           | 2 +-
 po/pl.po           | 2 +-
 po/popt.pot        | 2 +-
 po/pt.po           | 2 +-
 po/pt_BR.po        | 2 +-
 po/ro.po           | 2 +-
 po/ru.po           | 2 +-
 po/sk.po           | 2 +-
 po/sl.po           | 2 +-
 po/sr.po           | 2 +-
 po/sv.po           | 2 +-
 po/tr.po           | 2 +-
 po/uk.po           | 2 +-
 po/wa.po           | 2 +-
 po/zh.po           | 2 +-
 po/zh_CN.GB2312.po | 2 +-
 31 files changed, 31 insertions(+), 31 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index 7565e7c..98af48e 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -34,7 +34,7 @@ libpopt_la_SOURCES = popt.c findme.c poptparse.c poptconfig.c popthelp.c
 
 man_MANS = popt.3
 
-BUILT_SOURCES = popt.lcd
+#BUILT_SOURCES = popt.lcd
 
 popt.lcd: Makefile.am ${libpopt_la_SOURCES} ${include_HEADERS} ${noinst_HEADERS}
 	lclint -dump $@ ${libpopt_la_SOURCES}
diff --git a/po/cs.po b/po/cs.po
index 1de2fdf..9bc30c7 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.3\n"
-"POT-Creation-Date: 2002-06-15 10:10-0400\n"
+"POT-Creation-Date: 2002-06-24 13:05-0400\n"
 "PO-Revision-Date: 2001-07-24 00:03+0100\n"
 "Last-Translator: Milan Kerslager <kerslage@linux.cz>\n"
 "Language-Team: Czech <cs@li.org>\n"
diff --git a/po/da.po b/po/da.po
index b0ea5a5..f120c24 100644
--- a/po/da.po
+++ b/po/da.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.3\n"
-"POT-Creation-Date: 2002-06-15 10:10-0400\n"
+"POT-Creation-Date: 2002-06-24 13:05-0400\n"
 "PO-Revision-Date: Sun Jan 21 2001 04:30:32+0200\n"
 "Last-Translator: Martin Hansen <mah@k64.dk>\n"
 "Language-Team: Dansk <dansk@klid.dk>\n"
diff --git a/po/de.po b/po/de.po
index de352bc..c409116 100644
--- a/po/de.po
+++ b/po/de.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.3\n"
-"POT-Creation-Date: 2002-06-15 10:10-0400\n"
+"POT-Creation-Date: 2002-06-24 13:05-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/po/es.po b/po/es.po
index 17e65d8..642d3f7 100644
--- a/po/es.po
+++ b/po/es.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.3\n"
-"POT-Creation-Date: 2002-06-15 10:10-0400\n"
+"POT-Creation-Date: 2002-06-24 13:05-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Leandro Lucarella <luca@linuxmendoza.org.ar>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/po/eu_ES.po b/po/eu_ES.po
index de352bc..c409116 100644
--- a/po/eu_ES.po
+++ b/po/eu_ES.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.3\n"
-"POT-Creation-Date: 2002-06-15 10:10-0400\n"
+"POT-Creation-Date: 2002-06-24 13:05-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/po/fi.po b/po/fi.po
index de352bc..c409116 100644
--- a/po/fi.po
+++ b/po/fi.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.3\n"
-"POT-Creation-Date: 2002-06-15 10:10-0400\n"
+"POT-Creation-Date: 2002-06-24 13:05-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/po/fr.po b/po/fr.po
index de352bc..c409116 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.3\n"
-"POT-Creation-Date: 2002-06-15 10:10-0400\n"
+"POT-Creation-Date: 2002-06-24 13:05-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/po/gl.po b/po/gl.po
index 971fffe..17e7fba 100644
--- a/po/gl.po
+++ b/po/gl.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.3\n"
-"POT-Creation-Date: 2002-06-15 10:10-0400\n"
+"POT-Creation-Date: 2002-06-24 13:05-0400\n"
 "PO-Revision-Date: 2001-01-17 01:01+0100\n"
 "Last-Translator: Jes�s Bravo �lvarez <jba@pobox.com>\n"
 "Language-Team: Galician <trasno@ceu.fi.udc.es>\n"
diff --git a/po/hu.po b/po/hu.po
index 61ffcf7..2eed893 100644
--- a/po/hu.po
+++ b/po/hu.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.3\n"
-"POT-Creation-Date: 2002-06-15 10:10-0400\n"
+"POT-Creation-Date: 2002-06-24 13:05-0400\n"
 "PO-Revision-Date: 2000-08-03 23:26+0200\n"
 "Last-Translator: L�szl� N�meth <nemeth@qwertynet.hu>\n"
 "Language-Team: Hungarian\n"
diff --git a/po/id.po b/po/id.po
index de352bc..c409116 100644
--- a/po/id.po
+++ b/po/id.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.3\n"
-"POT-Creation-Date: 2002-06-15 10:10-0400\n"
+"POT-Creation-Date: 2002-06-24 13:05-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/po/is.po b/po/is.po
index df85fc3..f3e12cc 100644
--- a/po/is.po
+++ b/po/is.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.3\n"
-"POT-Creation-Date: 2002-06-15 10:10-0400\n"
+"POT-Creation-Date: 2002-06-24 13:05-0400\n"
 "PO-Revision-Date: 2001-06-08 01:35+0000\n"
 "Last-Translator: Richard Allen <ra@hp.is>\n"
 "Language-Team: is <kde-isl@mmedia.is>\n"
diff --git a/po/it.po b/po/it.po
index de352bc..c409116 100644
--- a/po/it.po
+++ b/po/it.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.3\n"
-"POT-Creation-Date: 2002-06-15 10:10-0400\n"
+"POT-Creation-Date: 2002-06-24 13:05-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/po/ja.po b/po/ja.po
index de352bc..c409116 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.3\n"
-"POT-Creation-Date: 2002-06-15 10:10-0400\n"
+"POT-Creation-Date: 2002-06-24 13:05-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/po/ko.po b/po/ko.po
index cd2c857..981711f 100644
--- a/po/ko.po
+++ b/po/ko.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6\n"
-"POT-Creation-Date: 2002-06-15 10:10-0400\n"
+"POT-Creation-Date: 2002-06-24 13:05-0400\n"
 "PO-Revision-Date: 2001-09-06 20:06+0900\n"
 "Last-Translator: Jong-Hoon Ryu <redhat4u@netian.com>\n"
 "Language-Team: GNU Translation project <ko@li.org>\n"
diff --git a/po/no.po b/po/no.po
index 5567063..d4b4f03 100644
--- a/po/no.po
+++ b/po/no.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.3\n"
-"POT-Creation-Date: 2002-06-15 10:10-0400\n"
+"POT-Creation-Date: 2002-06-24 13:05-0400\n"
 "PO-Revision-Date: 2001-06-27 11:05+0200\n"
 "Last-Translator: Kjartan Maraas <kmaraas@online.no>\n"
 "Language-Team: Norwegian <no@li.org>\n"
diff --git a/po/pl.po b/po/pl.po
index de352bc..c409116 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.3\n"
-"POT-Creation-Date: 2002-06-15 10:10-0400\n"
+"POT-Creation-Date: 2002-06-24 13:05-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/po/popt.pot b/po/popt.pot
index 9d5a999..4f52fea 100644
--- a/po/popt.pot
+++ b/po/popt.pot
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2002-06-15 10:10-0400\n"
+"POT-Creation-Date: 2002-06-24 13:05-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/po/pt.po b/po/pt.po
index b88ba7b..ab49c28 100644
--- a/po/pt.po
+++ b/po/pt.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt\n"
-"POT-Creation-Date: 2002-06-15 10:10-0400\n"
+"POT-Creation-Date: 2002-06-24 13:05-0400\n"
 "PO-Revision-Date: 2002-02-13 18:32+0000\n"
 "Last-Translator: Pedro Morais <morais@kde.org>\n"
 "Language-Team: pt <morais@kde.org>\n"
diff --git a/po/pt_BR.po b/po/pt_BR.po
index de352bc..c409116 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.3\n"
-"POT-Creation-Date: 2002-06-15 10:10-0400\n"
+"POT-Creation-Date: 2002-06-24 13:05-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/po/ro.po b/po/ro.po
index d4ee0c2..b9faa77 100644
--- a/po/ro.po
+++ b/po/ro.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.3\n"
-"POT-Creation-Date: 2002-06-15 10:10-0400\n"
+"POT-Creation-Date: 2002-06-24 13:05-0400\n"
 "PO-Revision-Date: 2000-06-14 23:23+EST\n"
 "Last-Translator: Cristian Gafton <gafton@redhat.com>\n"
 "Language-Team: Romanian <ro@li.org>\n"
diff --git a/po/ru.po b/po/ru.po
index 64f667f..4792ff5 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.3\n"
-"POT-Creation-Date: 2002-06-15 10:10-0400\n"
+"POT-Creation-Date: 2002-06-24 13:05-0400\n"
 "PO-Revision-Date: 2001-07-05 21:00-0500\n"
 "Last-Translator: Eugene Kanter <eugene@blackcatlinux.com>\n"
 "Language-Team: Black Cat Linux Team <blackcat-support@blackcatlinux.com>\n"
diff --git a/po/sk.po b/po/sk.po
index 622680d..6ea8c62 100644
--- a/po/sk.po
+++ b/po/sk.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.3\n"
-"POT-Creation-Date: 2002-06-15 10:10-0400\n"
+"POT-Creation-Date: 2002-06-24 13:05-0400\n"
 "PO-Revision-Date: 1999-08-04 21:40+0200\n"
 "Last-Translator: Stanislav Meduna <stano@eunet.sk>\n"
 "Language-Team: Slovak <sk-i18n@rak.isternet.sk>\n"
diff --git a/po/sl.po b/po/sl.po
index b2ddf92..9b7fff9 100644
--- a/po/sl.po
+++ b/po/sl.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.3\n"
-"POT-Creation-Date: 2002-06-15 10:10-0400\n"
+"POT-Creation-Date: 2002-06-24 13:05-0400\n"
 "PO-Revision-Date: 2000-09-05 12:30+0200\n"
 "Last-Translator: Roman Maurer <roman.maurer@hermes.si>\n"
 "Language-Team: Slovenian <sl@li.org>\n"
diff --git a/po/sr.po b/po/sr.po
index de352bc..c409116 100644
--- a/po/sr.po
+++ b/po/sr.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.3\n"
-"POT-Creation-Date: 2002-06-15 10:10-0400\n"
+"POT-Creation-Date: 2002-06-24 13:05-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/po/sv.po b/po/sv.po
index d971640..2f0ea05 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.3\n"
-"POT-Creation-Date: 2002-06-15 10:10-0400\n"
+"POT-Creation-Date: 2002-06-24 13:05-0400\n"
 "PO-Revision-Date: 2001-07-12 22:26+0100\n"
 "Last-Translator: Christian Rose <menthos@menthos.com>\n"
 "Language-Team: Swedish <sv@li.org>\n"
diff --git a/po/tr.po b/po/tr.po
index 60df608..6768a6c 100644
--- a/po/tr.po
+++ b/po/tr.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.3\n"
-"POT-Creation-Date: 2002-06-15 10:10-0400\n"
+"POT-Creation-Date: 2002-06-24 13:05-0400\n"
 "PO-Revision-Date: 2000-02-11 13:01+0200\n"
 "Last-Translator: Nilgun Belma Buguner <nilgun@technologist.com>\n"
 "Language-Team: Turkish <tr@li.org>\n"
diff --git a/po/uk.po b/po/uk.po
index 1034411..858ca1b 100644
--- a/po/uk.po
+++ b/po/uk.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.3\n"
-"POT-Creation-Date: 2002-06-15 10:10-0400\n"
+"POT-Creation-Date: 2002-06-24 13:05-0400\n"
 "PO-Revision-Date: 1999-09-30 16:54+0200\n"
 "Last-Translator: Yuri Syrota <rasta@renome.rovno.ua>\n"
 "Language-Team: Ukrainian <uk@li.org>\n"
diff --git a/po/wa.po b/po/wa.po
index e725750..536653d 100644
--- a/po/wa.po
+++ b/po/wa.po
@@ -9,7 +9,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.3\n"
-"POT-Creation-Date: 2002-06-15 10:10-0400\n"
+"POT-Creation-Date: 2002-06-24 13:05-0400\n"
 "PO-Revision-Date: 1999-03-18 23:11+0100\n"
 "Last-Translator: Nobody yet\n"
 "Language-Team: walon <linux-wa@chanae.alphanet.ch>\n"
diff --git a/po/zh.po b/po/zh.po
index de352bc..c409116 100644
--- a/po/zh.po
+++ b/po/zh.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.3\n"
-"POT-Creation-Date: 2002-06-15 10:10-0400\n"
+"POT-Creation-Date: 2002-06-24 13:05-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/po/zh_CN.GB2312.po b/po/zh_CN.GB2312.po
index 3262546..831017d 100644
--- a/po/zh_CN.GB2312.po
+++ b/po/zh_CN.GB2312.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.3\n"
-"POT-Creation-Date: 2002-06-15 10:10-0400\n"
+"POT-Creation-Date: 2002-06-24 13:05-0400\n"
 "PO-Revision-Date: 1999-11-11 05:04+0800\n"
 "Last-Translator: Dillion Chen <dillon.chen@turbolinux.com.cn>\n"
 "Language-Team: TLDN\n"
-- 
Gitee


From a141273d69e6731c55d2fed30ab9d6c452910f8e Mon Sep 17 00:00:00 2001
From: Jeff Johnson <n3npq@mac.com>
Date: Tue, 2 Jul 2002 23:54:38 +0000
Subject: [PATCH 345/667] Add boundsread annotations throughout, enable +bounds
 checking. Start narrowing the scope of bounds annotations by adding more
 annotations.

---
 .lclintrc  | 3 +--
 popt.c     | 2 ++
 popthelp.c | 4 ++++
 test1.c    | 2 ++
 4 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/.lclintrc b/.lclintrc
index a3d22bc..49aac97 100644
--- a/.lclintrc
+++ b/.lclintrc
@@ -13,8 +13,7 @@
 +strict			# lclint level
 
 # --- in progress
-#+bounds		# 56
-+boundswrite		# 40
++bounds
 
 # --- +partial artifacts
 -exportlocal		# 14
diff --git a/popt.c b/popt.c
index e4d6d31..d2dffa7 100644
--- a/popt.c
+++ b/popt.c
@@ -335,8 +335,10 @@ static int handleAlias(/*@special@*/ poptContext con,
     if ((con->os - con->optionStack + 1) == POPT_OPTION_DEPTH)
 	return POPT_ERROR_OPTSTOODEEP;
 
+/*@-boundsread@*/
     if (nextCharArg && *nextCharArg)
 	con->os->nextCharArg = nextCharArg;
+/*@=boundsread@*/
 
     con->os++;
     con->os->next = 0;
diff --git a/popthelp.c b/popthelp.c
index 5f9d54f..801dca5 100644
--- a/popthelp.c
+++ b/popthelp.c
@@ -325,6 +325,7 @@ static void singleOptionHelp(FILE * fp, int maxLeftCol,
     }
 
     helpLength = strlen(help);
+/*@-boundsread@*/
     while (helpLength > lineLength) {
 	const char * ch;
 	char format[10];
@@ -343,6 +344,7 @@ static void singleOptionHelp(FILE * fp, int maxLeftCol,
 	while (isspace(*help) && *help) help++;
 	helpLength = strlen(help);
     }
+/*@=boundsread@*/
 
     if (helpLength) fprintf(fp, "%s\n", help);
 
@@ -479,9 +481,11 @@ static int showHelpIntro(poptContext con, FILE * fp)
 
     fprintf(fp, POPT_("Usage:"));
     if (!(con->flags & POPT_CONTEXT_KEEP_FIRST)) {
+/*@-boundsread@*/
 	/*@-nullderef@*/	/* LCL: wazzup? */
 	fn = con->optionStack->argv[0];
 	/*@=nullderef@*/
+/*@=boundsread@*/
 	if (fn == NULL) return len;
 	if (strchr(fn, '/')) fn = strrchr(fn, '/') + 1;
 	fprintf(fp, " %s", fn);
diff --git a/test1.c b/test1.c
index d1bbc47..8d84144 100644
--- a/test1.c
+++ b/test1.c
@@ -254,6 +254,7 @@ int main(int argc, const char ** argv)
     if (singleDash)
 	fprintf(stdout, " -");
 
+/*@-boundsread@*/
     rest = poptGetArgs(optCon);
     if (rest) {
 	fprintf(stdout, " rest:");
@@ -262,6 +263,7 @@ int main(int argc, const char ** argv)
 	    rest++;
 	}
     }
+/*@=boundsread@*/
 
     fprintf(stdout, "\n");
 
-- 
Gitee


From 3d5b22747e862f0dc5f1c23839bc627e259b8659 Mon Sep 17 00:00:00 2001
From: Jeff Johnson <n3npq@mac.com>
Date: Wed, 3 Jul 2002 14:02:43 +0000
Subject: [PATCH 346/667] - use rpmfi in showQueryPackage(), eliminating
 headerGetEntry().

---
 po/cs.po           | 2 +-
 po/da.po           | 2 +-
 po/de.po           | 2 +-
 po/es.po           | 2 +-
 po/eu_ES.po        | 2 +-
 po/fi.po           | 2 +-
 po/fr.po           | 2 +-
 po/gl.po           | 2 +-
 po/hu.po           | 2 +-
 po/id.po           | 2 +-
 po/is.po           | 2 +-
 po/it.po           | 2 +-
 po/ja.po           | 2 +-
 po/ko.po           | 2 +-
 po/no.po           | 2 +-
 po/pl.po           | 2 +-
 po/popt.pot        | 2 +-
 po/pt.po           | 2 +-
 po/pt_BR.po        | 2 +-
 po/ro.po           | 2 +-
 po/ru.po           | 2 +-
 po/sk.po           | 2 +-
 po/sl.po           | 2 +-
 po/sr.po           | 2 +-
 po/sv.po           | 2 +-
 po/tr.po           | 2 +-
 po/uk.po           | 2 +-
 po/wa.po           | 2 +-
 po/zh.po           | 2 +-
 po/zh_CN.GB2312.po | 2 +-
 30 files changed, 30 insertions(+), 30 deletions(-)

diff --git a/po/cs.po b/po/cs.po
index 9bc30c7..1f046f4 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.3\n"
-"POT-Creation-Date: 2002-06-24 13:05-0400\n"
+"POT-Creation-Date: 2002-07-03 09:55-0400\n"
 "PO-Revision-Date: 2001-07-24 00:03+0100\n"
 "Last-Translator: Milan Kerslager <kerslage@linux.cz>\n"
 "Language-Team: Czech <cs@li.org>\n"
diff --git a/po/da.po b/po/da.po
index f120c24..eb5513d 100644
--- a/po/da.po
+++ b/po/da.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.3\n"
-"POT-Creation-Date: 2002-06-24 13:05-0400\n"
+"POT-Creation-Date: 2002-07-03 09:55-0400\n"
 "PO-Revision-Date: Sun Jan 21 2001 04:30:32+0200\n"
 "Last-Translator: Martin Hansen <mah@k64.dk>\n"
 "Language-Team: Dansk <dansk@klid.dk>\n"
diff --git a/po/de.po b/po/de.po
index c409116..1adc6f2 100644
--- a/po/de.po
+++ b/po/de.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.3\n"
-"POT-Creation-Date: 2002-06-24 13:05-0400\n"
+"POT-Creation-Date: 2002-07-03 09:55-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/po/es.po b/po/es.po
index 642d3f7..9e3b1e7 100644
--- a/po/es.po
+++ b/po/es.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.3\n"
-"POT-Creation-Date: 2002-06-24 13:05-0400\n"
+"POT-Creation-Date: 2002-07-03 09:55-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Leandro Lucarella <luca@linuxmendoza.org.ar>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/po/eu_ES.po b/po/eu_ES.po
index c409116..1adc6f2 100644
--- a/po/eu_ES.po
+++ b/po/eu_ES.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.3\n"
-"POT-Creation-Date: 2002-06-24 13:05-0400\n"
+"POT-Creation-Date: 2002-07-03 09:55-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/po/fi.po b/po/fi.po
index c409116..1adc6f2 100644
--- a/po/fi.po
+++ b/po/fi.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.3\n"
-"POT-Creation-Date: 2002-06-24 13:05-0400\n"
+"POT-Creation-Date: 2002-07-03 09:55-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/po/fr.po b/po/fr.po
index c409116..1adc6f2 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.3\n"
-"POT-Creation-Date: 2002-06-24 13:05-0400\n"
+"POT-Creation-Date: 2002-07-03 09:55-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/po/gl.po b/po/gl.po
index 17e7fba..17e686b 100644
--- a/po/gl.po
+++ b/po/gl.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.3\n"
-"POT-Creation-Date: 2002-06-24 13:05-0400\n"
+"POT-Creation-Date: 2002-07-03 09:55-0400\n"
 "PO-Revision-Date: 2001-01-17 01:01+0100\n"
 "Last-Translator: Jes�s Bravo �lvarez <jba@pobox.com>\n"
 "Language-Team: Galician <trasno@ceu.fi.udc.es>\n"
diff --git a/po/hu.po b/po/hu.po
index 2eed893..b00c165 100644
--- a/po/hu.po
+++ b/po/hu.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.3\n"
-"POT-Creation-Date: 2002-06-24 13:05-0400\n"
+"POT-Creation-Date: 2002-07-03 09:55-0400\n"
 "PO-Revision-Date: 2000-08-03 23:26+0200\n"
 "Last-Translator: L�szl� N�meth <nemeth@qwertynet.hu>\n"
 "Language-Team: Hungarian\n"
diff --git a/po/id.po b/po/id.po
index c409116..1adc6f2 100644
--- a/po/id.po
+++ b/po/id.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.3\n"
-"POT-Creation-Date: 2002-06-24 13:05-0400\n"
+"POT-Creation-Date: 2002-07-03 09:55-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/po/is.po b/po/is.po
index f3e12cc..046d542 100644
--- a/po/is.po
+++ b/po/is.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.3\n"
-"POT-Creation-Date: 2002-06-24 13:05-0400\n"
+"POT-Creation-Date: 2002-07-03 09:55-0400\n"
 "PO-Revision-Date: 2001-06-08 01:35+0000\n"
 "Last-Translator: Richard Allen <ra@hp.is>\n"
 "Language-Team: is <kde-isl@mmedia.is>\n"
diff --git a/po/it.po b/po/it.po
index c409116..1adc6f2 100644
--- a/po/it.po
+++ b/po/it.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.3\n"
-"POT-Creation-Date: 2002-06-24 13:05-0400\n"
+"POT-Creation-Date: 2002-07-03 09:55-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/po/ja.po b/po/ja.po
index c409116..1adc6f2 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.3\n"
-"POT-Creation-Date: 2002-06-24 13:05-0400\n"
+"POT-Creation-Date: 2002-07-03 09:55-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/po/ko.po b/po/ko.po
index 981711f..50c4eac 100644
--- a/po/ko.po
+++ b/po/ko.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6\n"
-"POT-Creation-Date: 2002-06-24 13:05-0400\n"
+"POT-Creation-Date: 2002-07-03 09:55-0400\n"
 "PO-Revision-Date: 2001-09-06 20:06+0900\n"
 "Last-Translator: Jong-Hoon Ryu <redhat4u@netian.com>\n"
 "Language-Team: GNU Translation project <ko@li.org>\n"
diff --git a/po/no.po b/po/no.po
index d4b4f03..e3c9c5e 100644
--- a/po/no.po
+++ b/po/no.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.3\n"
-"POT-Creation-Date: 2002-06-24 13:05-0400\n"
+"POT-Creation-Date: 2002-07-03 09:55-0400\n"
 "PO-Revision-Date: 2001-06-27 11:05+0200\n"
 "Last-Translator: Kjartan Maraas <kmaraas@online.no>\n"
 "Language-Team: Norwegian <no@li.org>\n"
diff --git a/po/pl.po b/po/pl.po
index c409116..1adc6f2 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.3\n"
-"POT-Creation-Date: 2002-06-24 13:05-0400\n"
+"POT-Creation-Date: 2002-07-03 09:55-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/po/popt.pot b/po/popt.pot
index 4f52fea..a7319ec 100644
--- a/po/popt.pot
+++ b/po/popt.pot
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2002-06-24 13:05-0400\n"
+"POT-Creation-Date: 2002-07-03 09:55-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/po/pt.po b/po/pt.po
index ab49c28..1c048a8 100644
--- a/po/pt.po
+++ b/po/pt.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt\n"
-"POT-Creation-Date: 2002-06-24 13:05-0400\n"
+"POT-Creation-Date: 2002-07-03 09:55-0400\n"
 "PO-Revision-Date: 2002-02-13 18:32+0000\n"
 "Last-Translator: Pedro Morais <morais@kde.org>\n"
 "Language-Team: pt <morais@kde.org>\n"
diff --git a/po/pt_BR.po b/po/pt_BR.po
index c409116..1adc6f2 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.3\n"
-"POT-Creation-Date: 2002-06-24 13:05-0400\n"
+"POT-Creation-Date: 2002-07-03 09:55-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/po/ro.po b/po/ro.po
index b9faa77..6957fa2 100644
--- a/po/ro.po
+++ b/po/ro.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.3\n"
-"POT-Creation-Date: 2002-06-24 13:05-0400\n"
+"POT-Creation-Date: 2002-07-03 09:55-0400\n"
 "PO-Revision-Date: 2000-06-14 23:23+EST\n"
 "Last-Translator: Cristian Gafton <gafton@redhat.com>\n"
 "Language-Team: Romanian <ro@li.org>\n"
diff --git a/po/ru.po b/po/ru.po
index 4792ff5..96b9112 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.3\n"
-"POT-Creation-Date: 2002-06-24 13:05-0400\n"
+"POT-Creation-Date: 2002-07-03 09:55-0400\n"
 "PO-Revision-Date: 2001-07-05 21:00-0500\n"
 "Last-Translator: Eugene Kanter <eugene@blackcatlinux.com>\n"
 "Language-Team: Black Cat Linux Team <blackcat-support@blackcatlinux.com>\n"
diff --git a/po/sk.po b/po/sk.po
index 6ea8c62..61a9c28 100644
--- a/po/sk.po
+++ b/po/sk.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.3\n"
-"POT-Creation-Date: 2002-06-24 13:05-0400\n"
+"POT-Creation-Date: 2002-07-03 09:55-0400\n"
 "PO-Revision-Date: 1999-08-04 21:40+0200\n"
 "Last-Translator: Stanislav Meduna <stano@eunet.sk>\n"
 "Language-Team: Slovak <sk-i18n@rak.isternet.sk>\n"
diff --git a/po/sl.po b/po/sl.po
index 9b7fff9..a5898e0 100644
--- a/po/sl.po
+++ b/po/sl.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.3\n"
-"POT-Creation-Date: 2002-06-24 13:05-0400\n"
+"POT-Creation-Date: 2002-07-03 09:55-0400\n"
 "PO-Revision-Date: 2000-09-05 12:30+0200\n"
 "Last-Translator: Roman Maurer <roman.maurer@hermes.si>\n"
 "Language-Team: Slovenian <sl@li.org>\n"
diff --git a/po/sr.po b/po/sr.po
index c409116..1adc6f2 100644
--- a/po/sr.po
+++ b/po/sr.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.3\n"
-"POT-Creation-Date: 2002-06-24 13:05-0400\n"
+"POT-Creation-Date: 2002-07-03 09:55-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/po/sv.po b/po/sv.po
index 2f0ea05..e5e7c13 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.3\n"
-"POT-Creation-Date: 2002-06-24 13:05-0400\n"
+"POT-Creation-Date: 2002-07-03 09:55-0400\n"
 "PO-Revision-Date: 2001-07-12 22:26+0100\n"
 "Last-Translator: Christian Rose <menthos@menthos.com>\n"
 "Language-Team: Swedish <sv@li.org>\n"
diff --git a/po/tr.po b/po/tr.po
index 6768a6c..50d51c4 100644
--- a/po/tr.po
+++ b/po/tr.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.3\n"
-"POT-Creation-Date: 2002-06-24 13:05-0400\n"
+"POT-Creation-Date: 2002-07-03 09:55-0400\n"
 "PO-Revision-Date: 2000-02-11 13:01+0200\n"
 "Last-Translator: Nilgun Belma Buguner <nilgun@technologist.com>\n"
 "Language-Team: Turkish <tr@li.org>\n"
diff --git a/po/uk.po b/po/uk.po
index 858ca1b..b2d5068 100644
--- a/po/uk.po
+++ b/po/uk.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.3\n"
-"POT-Creation-Date: 2002-06-24 13:05-0400\n"
+"POT-Creation-Date: 2002-07-03 09:55-0400\n"
 "PO-Revision-Date: 1999-09-30 16:54+0200\n"
 "Last-Translator: Yuri Syrota <rasta@renome.rovno.ua>\n"
 "Language-Team: Ukrainian <uk@li.org>\n"
diff --git a/po/wa.po b/po/wa.po
index 536653d..32a5f64 100644
--- a/po/wa.po
+++ b/po/wa.po
@@ -9,7 +9,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.3\n"
-"POT-Creation-Date: 2002-06-24 13:05-0400\n"
+"POT-Creation-Date: 2002-07-03 09:55-0400\n"
 "PO-Revision-Date: 1999-03-18 23:11+0100\n"
 "Last-Translator: Nobody yet\n"
 "Language-Team: walon <linux-wa@chanae.alphanet.ch>\n"
diff --git a/po/zh.po b/po/zh.po
index c409116..1adc6f2 100644
--- a/po/zh.po
+++ b/po/zh.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.3\n"
-"POT-Creation-Date: 2002-06-24 13:05-0400\n"
+"POT-Creation-Date: 2002-07-03 09:55-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/po/zh_CN.GB2312.po b/po/zh_CN.GB2312.po
index 831017d..c26ec2c 100644
--- a/po/zh_CN.GB2312.po
+++ b/po/zh_CN.GB2312.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.3\n"
-"POT-Creation-Date: 2002-06-24 13:05-0400\n"
+"POT-Creation-Date: 2002-07-03 09:55-0400\n"
 "PO-Revision-Date: 1999-11-11 05:04+0800\n"
 "Last-Translator: Dillion Chen <dillon.chen@turbolinux.com.cn>\n"
 "Language-Team: TLDN\n"
-- 
Gitee


From 89465e0c9e13a20f3983e8cdac41315ee65176fe Mon Sep 17 00:00:00 2001
From: Jeff Johnson <n3npq@mac.com>
Date: Mon, 8 Jul 2002 14:21:27 +0000
Subject: [PATCH 347/667] Propagate splint-3.0.1.7 close(2) internalState
 annotation throughout.

---
 popt.c  |  3 ++-
 popt.h  | 16 ++++++++--------
 test1.c |  4 ++--
 3 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/popt.c b/popt.c
index d2dffa7..d4b2dc2 100644
--- a/popt.c
+++ b/popt.c
@@ -355,7 +355,8 @@ static int handleAlias(/*@special@*/ poptContext con,
 
 /*@-bounds -boundswrite @*/
 static int execCommand(poptContext con)
-    /*@*/
+	/*@globals internalState @*/
+	/*@modifies internalState @*/
 {
     poptItem item = con->doExec;
     const char ** argv;
diff --git a/popt.h b/popt.h
index c756061..fad30bc 100644
--- a/popt.h
+++ b/popt.h
@@ -241,8 +241,8 @@ void poptResetContext(/*@null@*/poptContext con)
  * @return		next option val, -1 on last item, POPT_ERROR_* on error
  */
 int poptGetNextOpt(/*@null@*/poptContext con)
-	/*@globals fileSystem@*/
-	/*@modifies con, fileSystem @*/;
+	/*@globals fileSystem, internalState @*/
+	/*@modifies con, fileSystem, internalState @*/;
 
 /*@-redecl@*/
 /** \ingroup popt
@@ -334,9 +334,9 @@ int poptAddItem(poptContext con, poptItem newItem, int flags)
  * @return		0 on success, POPT_ERROR_ERRNO on failure
  */
 int poptReadConfigFile(poptContext con, const char * fn)
-	/*@globals fileSystem@*/
-	/*@modifies fileSystem,
-		con->execs, con->numExecs @*/;
+	/*@globals fileSystem, internalState @*/
+	/*@modifies con->execs, con->numExecs,
+		fileSystem, internalState @*/;
 
 /** \ingroup popt
  * Read default configuration from /etc/popt and $HOME/.popt.
@@ -345,9 +345,9 @@ int poptReadConfigFile(poptContext con, const char * fn)
  * @return		0 on success, POPT_ERROR_ERRNO on failure
  */
 int poptReadDefaultConfig(poptContext con, /*@unused@*/ int useEnv)
-	/*@globals fileSystem@*/
-	/*@modifies fileSystem,
-		con->execs, con->numExecs @*/;
+	/*@globals fileSystem, internalState @*/
+	/*@modifies con->execs, con->numExecs,
+		fileSystem, internalState @*/;
 
 /** \ingroup popt
  * Duplicate an argument array.
diff --git a/test1.c b/test1.c
index 8d84144..a41ee09 100644
--- a/test1.c
+++ b/test1.c
@@ -175,8 +175,8 @@ static void resetVars(void)
 }
 
 int main(int argc, const char ** argv)
-	/*@globals pass2, fileSystem @*/
-	/*@modifies pass2, fileSystem @*/
+	/*@globals pass2, fileSystem, internalState @*/
+	/*@modifies pass2, fileSystem, internalState @*/
 {
     int rc;
     int ec = 0;
-- 
Gitee


From 50219ea7c85cdd5ac2d4a3fe2f1bf39da0cb12dd Mon Sep 17 00:00:00 2001
From: Jeff Johnson <n3npq@mac.com>
Date: Tue, 9 Jul 2002 15:36:41 +0000
Subject: [PATCH 348/667] - placeholders for manifest constants for SuSE patch
 packages.

---
 po/cs.po           | 2 +-
 po/da.po           | 2 +-
 po/de.po           | 2 +-
 po/es.po           | 2 +-
 po/eu_ES.po        | 2 +-
 po/fi.po           | 2 +-
 po/fr.po           | 2 +-
 po/gl.po           | 2 +-
 po/hu.po           | 2 +-
 po/id.po           | 2 +-
 po/is.po           | 2 +-
 po/it.po           | 2 +-
 po/ja.po           | 2 +-
 po/ko.po           | 2 +-
 po/no.po           | 2 +-
 po/pl.po           | 2 +-
 po/popt.pot        | 2 +-
 po/pt.po           | 2 +-
 po/pt_BR.po        | 2 +-
 po/ro.po           | 2 +-
 po/ru.po           | 2 +-
 po/sk.po           | 2 +-
 po/sl.po           | 2 +-
 po/sr.po           | 2 +-
 po/sv.po           | 2 +-
 po/tr.po           | 2 +-
 po/uk.po           | 2 +-
 po/wa.po           | 2 +-
 po/zh.po           | 2 +-
 po/zh_CN.GB2312.po | 2 +-
 30 files changed, 30 insertions(+), 30 deletions(-)

diff --git a/po/cs.po b/po/cs.po
index 1f046f4..ce7da72 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.3\n"
-"POT-Creation-Date: 2002-07-03 09:55-0400\n"
+"POT-Creation-Date: 2002-07-09 11:35-0400\n"
 "PO-Revision-Date: 2001-07-24 00:03+0100\n"
 "Last-Translator: Milan Kerslager <kerslage@linux.cz>\n"
 "Language-Team: Czech <cs@li.org>\n"
diff --git a/po/da.po b/po/da.po
index eb5513d..8dc0755 100644
--- a/po/da.po
+++ b/po/da.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.3\n"
-"POT-Creation-Date: 2002-07-03 09:55-0400\n"
+"POT-Creation-Date: 2002-07-09 11:35-0400\n"
 "PO-Revision-Date: Sun Jan 21 2001 04:30:32+0200\n"
 "Last-Translator: Martin Hansen <mah@k64.dk>\n"
 "Language-Team: Dansk <dansk@klid.dk>\n"
diff --git a/po/de.po b/po/de.po
index 1adc6f2..d86c78e 100644
--- a/po/de.po
+++ b/po/de.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.3\n"
-"POT-Creation-Date: 2002-07-03 09:55-0400\n"
+"POT-Creation-Date: 2002-07-09 11:35-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/po/es.po b/po/es.po
index 9e3b1e7..83a57df 100644
--- a/po/es.po
+++ b/po/es.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.3\n"
-"POT-Creation-Date: 2002-07-03 09:55-0400\n"
+"POT-Creation-Date: 2002-07-09 11:35-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Leandro Lucarella <luca@linuxmendoza.org.ar>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/po/eu_ES.po b/po/eu_ES.po
index 1adc6f2..d86c78e 100644
--- a/po/eu_ES.po
+++ b/po/eu_ES.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.3\n"
-"POT-Creation-Date: 2002-07-03 09:55-0400\n"
+"POT-Creation-Date: 2002-07-09 11:35-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/po/fi.po b/po/fi.po
index 1adc6f2..d86c78e 100644
--- a/po/fi.po
+++ b/po/fi.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.3\n"
-"POT-Creation-Date: 2002-07-03 09:55-0400\n"
+"POT-Creation-Date: 2002-07-09 11:35-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/po/fr.po b/po/fr.po
index 1adc6f2..d86c78e 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.3\n"
-"POT-Creation-Date: 2002-07-03 09:55-0400\n"
+"POT-Creation-Date: 2002-07-09 11:35-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/po/gl.po b/po/gl.po
index 17e686b..5046517 100644
--- a/po/gl.po
+++ b/po/gl.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.3\n"
-"POT-Creation-Date: 2002-07-03 09:55-0400\n"
+"POT-Creation-Date: 2002-07-09 11:35-0400\n"
 "PO-Revision-Date: 2001-01-17 01:01+0100\n"
 "Last-Translator: Jes�s Bravo �lvarez <jba@pobox.com>\n"
 "Language-Team: Galician <trasno@ceu.fi.udc.es>\n"
diff --git a/po/hu.po b/po/hu.po
index b00c165..6a86100 100644
--- a/po/hu.po
+++ b/po/hu.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.3\n"
-"POT-Creation-Date: 2002-07-03 09:55-0400\n"
+"POT-Creation-Date: 2002-07-09 11:35-0400\n"
 "PO-Revision-Date: 2000-08-03 23:26+0200\n"
 "Last-Translator: L�szl� N�meth <nemeth@qwertynet.hu>\n"
 "Language-Team: Hungarian\n"
diff --git a/po/id.po b/po/id.po
index 1adc6f2..d86c78e 100644
--- a/po/id.po
+++ b/po/id.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.3\n"
-"POT-Creation-Date: 2002-07-03 09:55-0400\n"
+"POT-Creation-Date: 2002-07-09 11:35-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/po/is.po b/po/is.po
index 046d542..625baa7 100644
--- a/po/is.po
+++ b/po/is.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.3\n"
-"POT-Creation-Date: 2002-07-03 09:55-0400\n"
+"POT-Creation-Date: 2002-07-09 11:35-0400\n"
 "PO-Revision-Date: 2001-06-08 01:35+0000\n"
 "Last-Translator: Richard Allen <ra@hp.is>\n"
 "Language-Team: is <kde-isl@mmedia.is>\n"
diff --git a/po/it.po b/po/it.po
index 1adc6f2..d86c78e 100644
--- a/po/it.po
+++ b/po/it.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.3\n"
-"POT-Creation-Date: 2002-07-03 09:55-0400\n"
+"POT-Creation-Date: 2002-07-09 11:35-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/po/ja.po b/po/ja.po
index 1adc6f2..d86c78e 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.3\n"
-"POT-Creation-Date: 2002-07-03 09:55-0400\n"
+"POT-Creation-Date: 2002-07-09 11:35-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/po/ko.po b/po/ko.po
index 50c4eac..4a7ee96 100644
--- a/po/ko.po
+++ b/po/ko.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6\n"
-"POT-Creation-Date: 2002-07-03 09:55-0400\n"
+"POT-Creation-Date: 2002-07-09 11:35-0400\n"
 "PO-Revision-Date: 2001-09-06 20:06+0900\n"
 "Last-Translator: Jong-Hoon Ryu <redhat4u@netian.com>\n"
 "Language-Team: GNU Translation project <ko@li.org>\n"
diff --git a/po/no.po b/po/no.po
index e3c9c5e..5a336c0 100644
--- a/po/no.po
+++ b/po/no.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.3\n"
-"POT-Creation-Date: 2002-07-03 09:55-0400\n"
+"POT-Creation-Date: 2002-07-09 11:35-0400\n"
 "PO-Revision-Date: 2001-06-27 11:05+0200\n"
 "Last-Translator: Kjartan Maraas <kmaraas@online.no>\n"
 "Language-Team: Norwegian <no@li.org>\n"
diff --git a/po/pl.po b/po/pl.po
index 1adc6f2..d86c78e 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.3\n"
-"POT-Creation-Date: 2002-07-03 09:55-0400\n"
+"POT-Creation-Date: 2002-07-09 11:35-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/po/popt.pot b/po/popt.pot
index a7319ec..2ddcdad 100644
--- a/po/popt.pot
+++ b/po/popt.pot
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2002-07-03 09:55-0400\n"
+"POT-Creation-Date: 2002-07-09 11:35-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/po/pt.po b/po/pt.po
index 1c048a8..01b766f 100644
--- a/po/pt.po
+++ b/po/pt.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt\n"
-"POT-Creation-Date: 2002-07-03 09:55-0400\n"
+"POT-Creation-Date: 2002-07-09 11:35-0400\n"
 "PO-Revision-Date: 2002-02-13 18:32+0000\n"
 "Last-Translator: Pedro Morais <morais@kde.org>\n"
 "Language-Team: pt <morais@kde.org>\n"
diff --git a/po/pt_BR.po b/po/pt_BR.po
index 1adc6f2..d86c78e 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.3\n"
-"POT-Creation-Date: 2002-07-03 09:55-0400\n"
+"POT-Creation-Date: 2002-07-09 11:35-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/po/ro.po b/po/ro.po
index 6957fa2..60ca30f 100644
--- a/po/ro.po
+++ b/po/ro.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.3\n"
-"POT-Creation-Date: 2002-07-03 09:55-0400\n"
+"POT-Creation-Date: 2002-07-09 11:35-0400\n"
 "PO-Revision-Date: 2000-06-14 23:23+EST\n"
 "Last-Translator: Cristian Gafton <gafton@redhat.com>\n"
 "Language-Team: Romanian <ro@li.org>\n"
diff --git a/po/ru.po b/po/ru.po
index 96b9112..cb14cd5 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.3\n"
-"POT-Creation-Date: 2002-07-03 09:55-0400\n"
+"POT-Creation-Date: 2002-07-09 11:35-0400\n"
 "PO-Revision-Date: 2001-07-05 21:00-0500\n"
 "Last-Translator: Eugene Kanter <eugene@blackcatlinux.com>\n"
 "Language-Team: Black Cat Linux Team <blackcat-support@blackcatlinux.com>\n"
diff --git a/po/sk.po b/po/sk.po
index 61a9c28..7bdbd0d 100644
--- a/po/sk.po
+++ b/po/sk.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.3\n"
-"POT-Creation-Date: 2002-07-03 09:55-0400\n"
+"POT-Creation-Date: 2002-07-09 11:35-0400\n"
 "PO-Revision-Date: 1999-08-04 21:40+0200\n"
 "Last-Translator: Stanislav Meduna <stano@eunet.sk>\n"
 "Language-Team: Slovak <sk-i18n@rak.isternet.sk>\n"
diff --git a/po/sl.po b/po/sl.po
index a5898e0..887c5b5 100644
--- a/po/sl.po
+++ b/po/sl.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.3\n"
-"POT-Creation-Date: 2002-07-03 09:55-0400\n"
+"POT-Creation-Date: 2002-07-09 11:35-0400\n"
 "PO-Revision-Date: 2000-09-05 12:30+0200\n"
 "Last-Translator: Roman Maurer <roman.maurer@hermes.si>\n"
 "Language-Team: Slovenian <sl@li.org>\n"
diff --git a/po/sr.po b/po/sr.po
index 1adc6f2..d86c78e 100644
--- a/po/sr.po
+++ b/po/sr.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.3\n"
-"POT-Creation-Date: 2002-07-03 09:55-0400\n"
+"POT-Creation-Date: 2002-07-09 11:35-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/po/sv.po b/po/sv.po
index e5e7c13..f288d79 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.3\n"
-"POT-Creation-Date: 2002-07-03 09:55-0400\n"
+"POT-Creation-Date: 2002-07-09 11:35-0400\n"
 "PO-Revision-Date: 2001-07-12 22:26+0100\n"
 "Last-Translator: Christian Rose <menthos@menthos.com>\n"
 "Language-Team: Swedish <sv@li.org>\n"
diff --git a/po/tr.po b/po/tr.po
index 50d51c4..ca8f6a6 100644
--- a/po/tr.po
+++ b/po/tr.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.3\n"
-"POT-Creation-Date: 2002-07-03 09:55-0400\n"
+"POT-Creation-Date: 2002-07-09 11:35-0400\n"
 "PO-Revision-Date: 2000-02-11 13:01+0200\n"
 "Last-Translator: Nilgun Belma Buguner <nilgun@technologist.com>\n"
 "Language-Team: Turkish <tr@li.org>\n"
diff --git a/po/uk.po b/po/uk.po
index b2d5068..8fae535 100644
--- a/po/uk.po
+++ b/po/uk.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.3\n"
-"POT-Creation-Date: 2002-07-03 09:55-0400\n"
+"POT-Creation-Date: 2002-07-09 11:35-0400\n"
 "PO-Revision-Date: 1999-09-30 16:54+0200\n"
 "Last-Translator: Yuri Syrota <rasta@renome.rovno.ua>\n"
 "Language-Team: Ukrainian <uk@li.org>\n"
diff --git a/po/wa.po b/po/wa.po
index 32a5f64..50483e6 100644
--- a/po/wa.po
+++ b/po/wa.po
@@ -9,7 +9,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.3\n"
-"POT-Creation-Date: 2002-07-03 09:55-0400\n"
+"POT-Creation-Date: 2002-07-09 11:35-0400\n"
 "PO-Revision-Date: 1999-03-18 23:11+0100\n"
 "Last-Translator: Nobody yet\n"
 "Language-Team: walon <linux-wa@chanae.alphanet.ch>\n"
diff --git a/po/zh.po b/po/zh.po
index 1adc6f2..d86c78e 100644
--- a/po/zh.po
+++ b/po/zh.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.3\n"
-"POT-Creation-Date: 2002-07-03 09:55-0400\n"
+"POT-Creation-Date: 2002-07-09 11:35-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/po/zh_CN.GB2312.po b/po/zh_CN.GB2312.po
index c26ec2c..f484099 100644
--- a/po/zh_CN.GB2312.po
+++ b/po/zh_CN.GB2312.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.3\n"
-"POT-Creation-Date: 2002-07-03 09:55-0400\n"
+"POT-Creation-Date: 2002-07-09 11:35-0400\n"
 "PO-Revision-Date: 1999-11-11 05:04+0800\n"
 "Last-Translator: Dillion Chen <dillon.chen@turbolinux.com.cn>\n"
 "Language-Team: TLDN\n"
-- 
Gitee


From 3021b5113389916889902b46249562f136ee843d Mon Sep 17 00:00:00 2001
From: Jeff Johnson <n3npq@mac.com>
Date: Sat, 13 Jul 2002 19:18:43 +0000
Subject: [PATCH 349/667] - popt: mingw32 portability configure check (#67911).

---
 configure.in | 2 +-
 poptconfig.c | 5 ++++-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/configure.in b/configure.in
index 1cc70f6..ce0c80d 100755
--- a/configure.in
+++ b/configure.in
@@ -73,7 +73,7 @@ then
   AC_MSG_RESULT(yes)
 fi
 
-AC_CHECK_FUNCS(strerror mtrace)
+AC_CHECK_FUNCS(strerror mtrace getuid geteuid)
 AC_CHECK_FUNC(setreuid, [], [
     AC_CHECK_LIB(ucb, setreuid, [if echo $LIBS | grep -- -lucb >/dev/null ;then :; else LIBS="$LIBS -lc -lucb" USEUCB=y;fi])
 ])
diff --git a/poptconfig.c b/poptconfig.c
index 7739649..f622bb7 100644
--- a/poptconfig.c
+++ b/poptconfig.c
@@ -163,7 +163,8 @@ int poptReadConfigFile(poptContext con, const char * fn)
     return 0;
 }
 
-int poptReadDefaultConfig(poptContext con, /*@unused@*/ int useEnv) {
+int poptReadDefaultConfig(poptContext con, /*@unused@*/ int useEnv)
+{
     char * fn, * home;
     int rc;
 
@@ -173,7 +174,9 @@ int poptReadDefaultConfig(poptContext con, /*@unused@*/ int useEnv) {
 
     rc = poptReadConfigFile(con, "/etc/popt");
     if (rc) return rc;
+#if defined(HAVE_GETUID) && defined(HAVE_GETEUID)
     if (getuid() != geteuid()) return 0;
+#endif
 
     if ((home = getenv("HOME"))) {
 	fn = alloca(strlen(home) + 20);
-- 
Gitee


From 78fad3541a5ad946cddd744ae014472398bd7f48 Mon Sep 17 00:00:00 2001
From: Jeff Johnson <n3npq@mac.com>
Date: Sun, 14 Jul 2002 21:24:27 +0000
Subject: [PATCH 350/667] - python: sanity check fixes on rpmts/rpmte methods.

---
 .lclintrc          | 1 +
 po/cs.po           | 2 +-
 po/da.po           | 2 +-
 po/de.po           | 2 +-
 po/es.po           | 2 +-
 po/eu_ES.po        | 2 +-
 po/fi.po           | 2 +-
 po/fr.po           | 2 +-
 po/gl.po           | 2 +-
 po/hu.po           | 2 +-
 po/id.po           | 2 +-
 po/is.po           | 2 +-
 po/it.po           | 2 +-
 po/ja.po           | 2 +-
 po/ko.po           | 2 +-
 po/no.po           | 2 +-
 po/pl.po           | 2 +-
 po/popt.pot        | 2 +-
 po/pt.po           | 2 +-
 po/pt_BR.po        | 2 +-
 po/ro.po           | 2 +-
 po/ru.po           | 2 +-
 po/sk.po           | 2 +-
 po/sl.po           | 2 +-
 po/sr.po           | 2 +-
 po/sv.po           | 2 +-
 po/tr.po           | 2 +-
 po/uk.po           | 2 +-
 po/wa.po           | 2 +-
 po/zh.po           | 2 +-
 po/zh_CN.GB2312.po | 2 +-
 31 files changed, 31 insertions(+), 30 deletions(-)

diff --git a/.lclintrc b/.lclintrc
index 49aac97..e429478 100644
--- a/.lclintrc
+++ b/.lclintrc
@@ -14,6 +14,7 @@
 
 # --- in progress
 +bounds
+-bufferoverflowhigh
 
 # --- +partial artifacts
 -exportlocal		# 14
diff --git a/po/cs.po b/po/cs.po
index ce7da72..7d7e66d 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.3\n"
-"POT-Creation-Date: 2002-07-09 11:35-0400\n"
+"POT-Creation-Date: 2002-07-14 10:58-0400\n"
 "PO-Revision-Date: 2001-07-24 00:03+0100\n"
 "Last-Translator: Milan Kerslager <kerslage@linux.cz>\n"
 "Language-Team: Czech <cs@li.org>\n"
diff --git a/po/da.po b/po/da.po
index 8dc0755..9b159e2 100644
--- a/po/da.po
+++ b/po/da.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.3\n"
-"POT-Creation-Date: 2002-07-09 11:35-0400\n"
+"POT-Creation-Date: 2002-07-14 10:58-0400\n"
 "PO-Revision-Date: Sun Jan 21 2001 04:30:32+0200\n"
 "Last-Translator: Martin Hansen <mah@k64.dk>\n"
 "Language-Team: Dansk <dansk@klid.dk>\n"
diff --git a/po/de.po b/po/de.po
index d86c78e..9cf7ac3 100644
--- a/po/de.po
+++ b/po/de.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.3\n"
-"POT-Creation-Date: 2002-07-09 11:35-0400\n"
+"POT-Creation-Date: 2002-07-14 10:58-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/po/es.po b/po/es.po
index 83a57df..7209a4e 100644
--- a/po/es.po
+++ b/po/es.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.3\n"
-"POT-Creation-Date: 2002-07-09 11:35-0400\n"
+"POT-Creation-Date: 2002-07-14 10:58-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Leandro Lucarella <luca@linuxmendoza.org.ar>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/po/eu_ES.po b/po/eu_ES.po
index d86c78e..9cf7ac3 100644
--- a/po/eu_ES.po
+++ b/po/eu_ES.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.3\n"
-"POT-Creation-Date: 2002-07-09 11:35-0400\n"
+"POT-Creation-Date: 2002-07-14 10:58-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/po/fi.po b/po/fi.po
index d86c78e..9cf7ac3 100644
--- a/po/fi.po
+++ b/po/fi.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.3\n"
-"POT-Creation-Date: 2002-07-09 11:35-0400\n"
+"POT-Creation-Date: 2002-07-14 10:58-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/po/fr.po b/po/fr.po
index d86c78e..9cf7ac3 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.3\n"
-"POT-Creation-Date: 2002-07-09 11:35-0400\n"
+"POT-Creation-Date: 2002-07-14 10:58-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/po/gl.po b/po/gl.po
index 5046517..820d8e8 100644
--- a/po/gl.po
+++ b/po/gl.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.3\n"
-"POT-Creation-Date: 2002-07-09 11:35-0400\n"
+"POT-Creation-Date: 2002-07-14 10:58-0400\n"
 "PO-Revision-Date: 2001-01-17 01:01+0100\n"
 "Last-Translator: Jes�s Bravo �lvarez <jba@pobox.com>\n"
 "Language-Team: Galician <trasno@ceu.fi.udc.es>\n"
diff --git a/po/hu.po b/po/hu.po
index 6a86100..cac9622 100644
--- a/po/hu.po
+++ b/po/hu.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.3\n"
-"POT-Creation-Date: 2002-07-09 11:35-0400\n"
+"POT-Creation-Date: 2002-07-14 10:58-0400\n"
 "PO-Revision-Date: 2000-08-03 23:26+0200\n"
 "Last-Translator: L�szl� N�meth <nemeth@qwertynet.hu>\n"
 "Language-Team: Hungarian\n"
diff --git a/po/id.po b/po/id.po
index d86c78e..9cf7ac3 100644
--- a/po/id.po
+++ b/po/id.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.3\n"
-"POT-Creation-Date: 2002-07-09 11:35-0400\n"
+"POT-Creation-Date: 2002-07-14 10:58-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/po/is.po b/po/is.po
index 625baa7..d10ed7c 100644
--- a/po/is.po
+++ b/po/is.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.3\n"
-"POT-Creation-Date: 2002-07-09 11:35-0400\n"
+"POT-Creation-Date: 2002-07-14 10:58-0400\n"
 "PO-Revision-Date: 2001-06-08 01:35+0000\n"
 "Last-Translator: Richard Allen <ra@hp.is>\n"
 "Language-Team: is <kde-isl@mmedia.is>\n"
diff --git a/po/it.po b/po/it.po
index d86c78e..9cf7ac3 100644
--- a/po/it.po
+++ b/po/it.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.3\n"
-"POT-Creation-Date: 2002-07-09 11:35-0400\n"
+"POT-Creation-Date: 2002-07-14 10:58-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/po/ja.po b/po/ja.po
index d86c78e..9cf7ac3 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.3\n"
-"POT-Creation-Date: 2002-07-09 11:35-0400\n"
+"POT-Creation-Date: 2002-07-14 10:58-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/po/ko.po b/po/ko.po
index 4a7ee96..192bc6d 100644
--- a/po/ko.po
+++ b/po/ko.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6\n"
-"POT-Creation-Date: 2002-07-09 11:35-0400\n"
+"POT-Creation-Date: 2002-07-14 10:58-0400\n"
 "PO-Revision-Date: 2001-09-06 20:06+0900\n"
 "Last-Translator: Jong-Hoon Ryu <redhat4u@netian.com>\n"
 "Language-Team: GNU Translation project <ko@li.org>\n"
diff --git a/po/no.po b/po/no.po
index 5a336c0..d89a819 100644
--- a/po/no.po
+++ b/po/no.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.3\n"
-"POT-Creation-Date: 2002-07-09 11:35-0400\n"
+"POT-Creation-Date: 2002-07-14 10:58-0400\n"
 "PO-Revision-Date: 2001-06-27 11:05+0200\n"
 "Last-Translator: Kjartan Maraas <kmaraas@online.no>\n"
 "Language-Team: Norwegian <no@li.org>\n"
diff --git a/po/pl.po b/po/pl.po
index d86c78e..9cf7ac3 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.3\n"
-"POT-Creation-Date: 2002-07-09 11:35-0400\n"
+"POT-Creation-Date: 2002-07-14 10:58-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/po/popt.pot b/po/popt.pot
index 2ddcdad..6a0ccc9 100644
--- a/po/popt.pot
+++ b/po/popt.pot
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2002-07-09 11:35-0400\n"
+"POT-Creation-Date: 2002-07-14 10:58-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/po/pt.po b/po/pt.po
index 01b766f..91fff7e 100644
--- a/po/pt.po
+++ b/po/pt.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt\n"
-"POT-Creation-Date: 2002-07-09 11:35-0400\n"
+"POT-Creation-Date: 2002-07-14 10:58-0400\n"
 "PO-Revision-Date: 2002-02-13 18:32+0000\n"
 "Last-Translator: Pedro Morais <morais@kde.org>\n"
 "Language-Team: pt <morais@kde.org>\n"
diff --git a/po/pt_BR.po b/po/pt_BR.po
index d86c78e..9cf7ac3 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.3\n"
-"POT-Creation-Date: 2002-07-09 11:35-0400\n"
+"POT-Creation-Date: 2002-07-14 10:58-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/po/ro.po b/po/ro.po
index 60ca30f..14c4a31 100644
--- a/po/ro.po
+++ b/po/ro.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.3\n"
-"POT-Creation-Date: 2002-07-09 11:35-0400\n"
+"POT-Creation-Date: 2002-07-14 10:58-0400\n"
 "PO-Revision-Date: 2000-06-14 23:23+EST\n"
 "Last-Translator: Cristian Gafton <gafton@redhat.com>\n"
 "Language-Team: Romanian <ro@li.org>\n"
diff --git a/po/ru.po b/po/ru.po
index cb14cd5..05e236d 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.3\n"
-"POT-Creation-Date: 2002-07-09 11:35-0400\n"
+"POT-Creation-Date: 2002-07-14 10:58-0400\n"
 "PO-Revision-Date: 2001-07-05 21:00-0500\n"
 "Last-Translator: Eugene Kanter <eugene@blackcatlinux.com>\n"
 "Language-Team: Black Cat Linux Team <blackcat-support@blackcatlinux.com>\n"
diff --git a/po/sk.po b/po/sk.po
index 7bdbd0d..7034950 100644
--- a/po/sk.po
+++ b/po/sk.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.3\n"
-"POT-Creation-Date: 2002-07-09 11:35-0400\n"
+"POT-Creation-Date: 2002-07-14 10:58-0400\n"
 "PO-Revision-Date: 1999-08-04 21:40+0200\n"
 "Last-Translator: Stanislav Meduna <stano@eunet.sk>\n"
 "Language-Team: Slovak <sk-i18n@rak.isternet.sk>\n"
diff --git a/po/sl.po b/po/sl.po
index 887c5b5..e5613e0 100644
--- a/po/sl.po
+++ b/po/sl.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.3\n"
-"POT-Creation-Date: 2002-07-09 11:35-0400\n"
+"POT-Creation-Date: 2002-07-14 10:58-0400\n"
 "PO-Revision-Date: 2000-09-05 12:30+0200\n"
 "Last-Translator: Roman Maurer <roman.maurer@hermes.si>\n"
 "Language-Team: Slovenian <sl@li.org>\n"
diff --git a/po/sr.po b/po/sr.po
index d86c78e..9cf7ac3 100644
--- a/po/sr.po
+++ b/po/sr.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.3\n"
-"POT-Creation-Date: 2002-07-09 11:35-0400\n"
+"POT-Creation-Date: 2002-07-14 10:58-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/po/sv.po b/po/sv.po
index f288d79..e0c91d6 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.3\n"
-"POT-Creation-Date: 2002-07-09 11:35-0400\n"
+"POT-Creation-Date: 2002-07-14 10:58-0400\n"
 "PO-Revision-Date: 2001-07-12 22:26+0100\n"
 "Last-Translator: Christian Rose <menthos@menthos.com>\n"
 "Language-Team: Swedish <sv@li.org>\n"
diff --git a/po/tr.po b/po/tr.po
index ca8f6a6..c51b46d 100644
--- a/po/tr.po
+++ b/po/tr.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.3\n"
-"POT-Creation-Date: 2002-07-09 11:35-0400\n"
+"POT-Creation-Date: 2002-07-14 10:58-0400\n"
 "PO-Revision-Date: 2000-02-11 13:01+0200\n"
 "Last-Translator: Nilgun Belma Buguner <nilgun@technologist.com>\n"
 "Language-Team: Turkish <tr@li.org>\n"
diff --git a/po/uk.po b/po/uk.po
index 8fae535..ac541bf 100644
--- a/po/uk.po
+++ b/po/uk.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.3\n"
-"POT-Creation-Date: 2002-07-09 11:35-0400\n"
+"POT-Creation-Date: 2002-07-14 10:58-0400\n"
 "PO-Revision-Date: 1999-09-30 16:54+0200\n"
 "Last-Translator: Yuri Syrota <rasta@renome.rovno.ua>\n"
 "Language-Team: Ukrainian <uk@li.org>\n"
diff --git a/po/wa.po b/po/wa.po
index 50483e6..bd7fdfd 100644
--- a/po/wa.po
+++ b/po/wa.po
@@ -9,7 +9,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.3\n"
-"POT-Creation-Date: 2002-07-09 11:35-0400\n"
+"POT-Creation-Date: 2002-07-14 10:58-0400\n"
 "PO-Revision-Date: 1999-03-18 23:11+0100\n"
 "Last-Translator: Nobody yet\n"
 "Language-Team: walon <linux-wa@chanae.alphanet.ch>\n"
diff --git a/po/zh.po b/po/zh.po
index d86c78e..9cf7ac3 100644
--- a/po/zh.po
+++ b/po/zh.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.3\n"
-"POT-Creation-Date: 2002-07-09 11:35-0400\n"
+"POT-Creation-Date: 2002-07-14 10:58-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/po/zh_CN.GB2312.po b/po/zh_CN.GB2312.po
index f484099..94d5bc0 100644
--- a/po/zh_CN.GB2312.po
+++ b/po/zh_CN.GB2312.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.3\n"
-"POT-Creation-Date: 2002-07-09 11:35-0400\n"
+"POT-Creation-Date: 2002-07-14 10:58-0400\n"
 "PO-Revision-Date: 1999-11-11 05:04+0800\n"
 "Last-Translator: Dillion Chen <dillon.chen@turbolinux.com.cn>\n"
 "Language-Team: TLDN\n"
-- 
Gitee


From 2489c1972285b17013c1a87826adfb88cfa4f643 Mon Sep 17 00:00:00 2001
From: Jeff Johnson <n3npq@mac.com>
Date: Mon, 15 Jul 2002 21:15:22 +0000
Subject: [PATCH 351/667] Clarify intl licensing.

---
 intl/COPYING.LIB | 481 +++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 481 insertions(+)
 create mode 100644 intl/COPYING.LIB

diff --git a/intl/COPYING.LIB b/intl/COPYING.LIB
new file mode 100644
index 0000000..92b8903
--- /dev/null
+++ b/intl/COPYING.LIB
@@ -0,0 +1,481 @@
+		  GNU LIBRARY GENERAL PUBLIC LICENSE
+		       Version 2, June 1991
+
+ Copyright (C) 1991 Free Software Foundation, Inc.
+    		    59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+[This is the first released version of the library GPL.  It is
+ numbered 2 because it goes with version 2 of the ordinary GPL.]
+
+			    Preamble
+
+  The licenses for most software are designed to take away your
+freedom to share and change it.  By contrast, the GNU General Public
+Licenses are intended to guarantee your freedom to share and change
+free software--to make sure the software is free for all its users.
+
+  This license, the Library General Public License, applies to some
+specially designated Free Software Foundation software, and to any
+other libraries whose authors decide to use it.  You can use it for
+your libraries, too.
+
+  When we speak of free software, we are referring to freedom, not
+price.  Our General Public Licenses are designed to make sure that you
+have the freedom to distribute copies of free software (and charge for
+this service if you wish), that you receive source code or can get it
+if you want it, that you can change the software or use pieces of it
+in new free programs; and that you know you can do these things.
+
+  To protect your rights, we need to make restrictions that forbid
+anyone to deny you these rights or to ask you to surrender the rights.
+These restrictions translate to certain responsibilities for you if
+you distribute copies of the library, or if you modify it.
+
+  For example, if you distribute copies of the library, whether gratis
+or for a fee, you must give the recipients all the rights that we gave
+you.  You must make sure that they, too, receive or can get the source
+code.  If you link a program with the library, you must provide
+complete object files to the recipients so that they can relink them
+with the library, after making changes to the library and recompiling
+it.  And you must show them these terms so they know their rights.
+
+  Our method of protecting your rights has two steps: (1) copyright
+the library, and (2) offer you this license which gives you legal
+permission to copy, distribute and/or modify the library.
+
+  Also, for each distributor's protection, we want to make certain
+that everyone understands that there is no warranty for this free
+library.  If the library is modified by someone else and passed on, we
+want its recipients to know that what they have is not the original
+version, so that any problems introduced by others will not reflect on
+the original authors' reputations.
+
+  Finally, any free program is threatened constantly by software
+patents.  We wish to avoid the danger that companies distributing free
+software will individually obtain patent licenses, thus in effect
+transforming the program into proprietary software.  To prevent this,
+we have made it clear that any patent must be licensed for everyone's
+free use or not licensed at all.
+
+  Most GNU software, including some libraries, is covered by the ordinary
+GNU General Public License, which was designed for utility programs.  This
+license, the GNU Library General Public License, applies to certain
+designated libraries.  This license is quite different from the ordinary
+one; be sure to read it in full, and don't assume that anything in it is
+the same as in the ordinary license.
+
+  The reason we have a separate public license for some libraries is that
+they blur the distinction we usually make between modifying or adding to a
+program and simply using it.  Linking a program with a library, without
+changing the library, is in some sense simply using the library, and is
+analogous to running a utility program or application program.  However, in
+a textual and legal sense, the linked executable is a combined work, a
+derivative of the original library, and the ordinary General Public License
+treats it as such.
+
+  Because of this blurred distinction, using the ordinary General
+Public License for libraries did not effectively promote software
+sharing, because most developers did not use the libraries.  We
+concluded that weaker conditions might promote sharing better.
+
+  However, unrestricted linking of non-free programs would deprive the
+users of those programs of all benefit from the free status of the
+libraries themselves.  This Library General Public License is intended to
+permit developers of non-free programs to use free libraries, while
+preserving your freedom as a user of such programs to change the free
+libraries that are incorporated in them.  (We have not seen how to achieve
+this as regards changes in header files, but we have achieved it as regards
+changes in the actual functions of the Library.)  The hope is that this
+will lead to faster development of free libraries.
+
+  The precise terms and conditions for copying, distribution and
+modification follow.  Pay close attention to the difference between a
+"work based on the library" and a "work that uses the library".  The
+former contains code derived from the library, while the latter only
+works together with the library.
+
+  Note that it is possible for a library to be covered by the ordinary
+General Public License rather than by this special one.
+
+		  GNU LIBRARY GENERAL PUBLIC LICENSE
+   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
+
+  0. This License Agreement applies to any software library which
+contains a notice placed by the copyright holder or other authorized
+party saying it may be distributed under the terms of this Library
+General Public License (also called "this License").  Each licensee is
+addressed as "you".
+
+  A "library" means a collection of software functions and/or data
+prepared so as to be conveniently linked with application programs
+(which use some of those functions and data) to form executables.
+
+  The "Library", below, refers to any such software library or work
+which has been distributed under these terms.  A "work based on the
+Library" means either the Library or any derivative work under
+copyright law: that is to say, a work containing the Library or a
+portion of it, either verbatim or with modifications and/or translated
+straightforwardly into another language.  (Hereinafter, translation is
+included without limitation in the term "modification".)
+
+  "Source code" for a work means the preferred form of the work for
+making modifications to it.  For a library, complete source code means
+all the source code for all modules it contains, plus any associated
+interface definition files, plus the scripts used to control compilation
+and installation of the library.
+
+  Activities other than copying, distribution and modification are not
+covered by this License; they are outside its scope.  The act of
+running a program using the Library is not restricted, and output from
+such a program is covered only if its contents constitute a work based
+on the Library (independent of the use of the Library in a tool for
+writing it).  Whether that is true depends on what the Library does
+and what the program that uses the Library does.
+  
+  1. You may copy and distribute verbatim copies of the Library's
+complete source code as you receive it, in any medium, provided that
+you conspicuously and appropriately publish on each copy an
+appropriate copyright notice and disclaimer of warranty; keep intact
+all the notices that refer to this License and to the absence of any
+warranty; and distribute a copy of this License along with the
+Library.
+
+  You may charge a fee for the physical act of transferring a copy,
+and you may at your option offer warranty protection in exchange for a
+fee.
+
+  2. You may modify your copy or copies of the Library or any portion
+of it, thus forming a work based on the Library, and copy and
+distribute such modifications or work under the terms of Section 1
+above, provided that you also meet all of these conditions:
+
+    a) The modified work must itself be a software library.
+
+    b) You must cause the files modified to carry prominent notices
+    stating that you changed the files and the date of any change.
+
+    c) You must cause the whole of the work to be licensed at no
+    charge to all third parties under the terms of this License.
+
+    d) If a facility in the modified Library refers to a function or a
+    table of data to be supplied by an application program that uses
+    the facility, other than as an argument passed when the facility
+    is invoked, then you must make a good faith effort to ensure that,
+    in the event an application does not supply such function or
+    table, the facility still operates, and performs whatever part of
+    its purpose remains meaningful.
+
+    (For example, a function in a library to compute square roots has
+    a purpose that is entirely well-defined independent of the
+    application.  Therefore, Subsection 2d requires that any
+    application-supplied function or table used by this function must
+    be optional: if the application does not supply it, the square
+    root function must still compute square roots.)
+
+These requirements apply to the modified work as a whole.  If
+identifiable sections of that work are not derived from the Library,
+and can be reasonably considered independent and separate works in
+themselves, then this License, and its terms, do not apply to those
+sections when you distribute them as separate works.  But when you
+distribute the same sections as part of a whole which is a work based
+on the Library, the distribution of the whole must be on the terms of
+this License, whose permissions for other licensees extend to the
+entire whole, and thus to each and every part regardless of who wrote
+it.
+
+Thus, it is not the intent of this section to claim rights or contest
+your rights to work written entirely by you; rather, the intent is to
+exercise the right to control the distribution of derivative or
+collective works based on the Library.
+
+In addition, mere aggregation of another work not based on the Library
+with the Library (or with a work based on the Library) on a volume of
+a storage or distribution medium does not bring the other work under
+the scope of this License.
+
+  3. You may opt to apply the terms of the ordinary GNU General Public
+License instead of this License to a given copy of the Library.  To do
+this, you must alter all the notices that refer to this License, so
+that they refer to the ordinary GNU General Public License, version 2,
+instead of to this License.  (If a newer version than version 2 of the
+ordinary GNU General Public License has appeared, then you can specify
+that version instead if you wish.)  Do not make any other change in
+these notices.
+
+  Once this change is made in a given copy, it is irreversible for
+that copy, so the ordinary GNU General Public License applies to all
+subsequent copies and derivative works made from that copy.
+
+  This option is useful when you wish to copy part of the code of
+the Library into a program that is not a library.
+
+  4. You may copy and distribute the Library (or a portion or
+derivative of it, under Section 2) in object code or executable form
+under the terms of Sections 1 and 2 above provided that you accompany
+it with the complete corresponding machine-readable source code, which
+must be distributed under the terms of Sections 1 and 2 above on a
+medium customarily used for software interchange.
+
+  If distribution of object code is made by offering access to copy
+from a designated place, then offering equivalent access to copy the
+source code from the same place satisfies the requirement to
+distribute the source code, even though third parties are not
+compelled to copy the source along with the object code.
+
+  5. A program that contains no derivative of any portion of the
+Library, but is designed to work with the Library by being compiled or
+linked with it, is called a "work that uses the Library".  Such a
+work, in isolation, is not a derivative work of the Library, and
+therefore falls outside the scope of this License.
+
+  However, linking a "work that uses the Library" with the Library
+creates an executable that is a derivative of the Library (because it
+contains portions of the Library), rather than a "work that uses the
+library".  The executable is therefore covered by this License.
+Section 6 states terms for distribution of such executables.
+
+  When a "work that uses the Library" uses material from a header file
+that is part of the Library, the object code for the work may be a
+derivative work of the Library even though the source code is not.
+Whether this is true is especially significant if the work can be
+linked without the Library, or if the work is itself a library.  The
+threshold for this to be true is not precisely defined by law.
+
+  If such an object file uses only numerical parameters, data
+structure layouts and accessors, and small macros and small inline
+functions (ten lines or less in length), then the use of the object
+file is unrestricted, regardless of whether it is legally a derivative
+work.  (Executables containing this object code plus portions of the
+Library will still fall under Section 6.)
+
+  Otherwise, if the work is a derivative of the Library, you may
+distribute the object code for the work under the terms of Section 6.
+Any executables containing that work also fall under Section 6,
+whether or not they are linked directly with the Library itself.
+
+  6. As an exception to the Sections above, you may also compile or
+link a "work that uses the Library" with the Library to produce a
+work containing portions of the Library, and distribute that work
+under terms of your choice, provided that the terms permit
+modification of the work for the customer's own use and reverse
+engineering for debugging such modifications.
+
+  You must give prominent notice with each copy of the work that the
+Library is used in it and that the Library and its use are covered by
+this License.  You must supply a copy of this License.  If the work
+during execution displays copyright notices, you must include the
+copyright notice for the Library among them, as well as a reference
+directing the user to the copy of this License.  Also, you must do one
+of these things:
+
+    a) Accompany the work with the complete corresponding
+    machine-readable source code for the Library including whatever
+    changes were used in the work (which must be distributed under
+    Sections 1 and 2 above); and, if the work is an executable linked
+    with the Library, with the complete machine-readable "work that
+    uses the Library", as object code and/or source code, so that the
+    user can modify the Library and then relink to produce a modified
+    executable containing the modified Library.  (It is understood
+    that the user who changes the contents of definitions files in the
+    Library will not necessarily be able to recompile the application
+    to use the modified definitions.)
+
+    b) Accompany the work with a written offer, valid for at
+    least three years, to give the same user the materials
+    specified in Subsection 6a, above, for a charge no more
+    than the cost of performing this distribution.
+
+    c) If distribution of the work is made by offering access to copy
+    from a designated place, offer equivalent access to copy the above
+    specified materials from the same place.
+
+    d) Verify that the user has already received a copy of these
+    materials or that you have already sent this user a copy.
+
+  For an executable, the required form of the "work that uses the
+Library" must include any data and utility programs needed for
+reproducing the executable from it.  However, as a special exception,
+the source code distributed need not include anything that is normally
+distributed (in either source or binary form) with the major
+components (compiler, kernel, and so on) of the operating system on
+which the executable runs, unless that component itself accompanies
+the executable.
+
+  It may happen that this requirement contradicts the license
+restrictions of other proprietary libraries that do not normally
+accompany the operating system.  Such a contradiction means you cannot
+use both them and the Library together in an executable that you
+distribute.
+
+  7. You may place library facilities that are a work based on the
+Library side-by-side in a single library together with other library
+facilities not covered by this License, and distribute such a combined
+library, provided that the separate distribution of the work based on
+the Library and of the other library facilities is otherwise
+permitted, and provided that you do these two things:
+
+    a) Accompany the combined library with a copy of the same work
+    based on the Library, uncombined with any other library
+    facilities.  This must be distributed under the terms of the
+    Sections above.
+
+    b) Give prominent notice with the combined library of the fact
+    that part of it is a work based on the Library, and explaining
+    where to find the accompanying uncombined form of the same work.
+
+  8. You may not copy, modify, sublicense, link with, or distribute
+the Library except as expressly provided under this License.  Any
+attempt otherwise to copy, modify, sublicense, link with, or
+distribute the Library is void, and will automatically terminate your
+rights under this License.  However, parties who have received copies,
+or rights, from you under this License will not have their licenses
+terminated so long as such parties remain in full compliance.
+
+  9. You are not required to accept this License, since you have not
+signed it.  However, nothing else grants you permission to modify or
+distribute the Library or its derivative works.  These actions are
+prohibited by law if you do not accept this License.  Therefore, by
+modifying or distributing the Library (or any work based on the
+Library), you indicate your acceptance of this License to do so, and
+all its terms and conditions for copying, distributing or modifying
+the Library or works based on it.
+
+  10. Each time you redistribute the Library (or any work based on the
+Library), the recipient automatically receives a license from the
+original licensor to copy, distribute, link with or modify the Library
+subject to these terms and conditions.  You may not impose any further
+restrictions on the recipients' exercise of the rights granted herein.
+You are not responsible for enforcing compliance by third parties to
+this License.
+
+  11. If, as a consequence of a court judgment or allegation of patent
+infringement or for any other reason (not limited to patent issues),
+conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License.  If you cannot
+distribute so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you
+may not distribute the Library at all.  For example, if a patent
+license would not permit royalty-free redistribution of the Library by
+all those who receive copies directly or indirectly through you, then
+the only way you could satisfy both it and this License would be to
+refrain entirely from distribution of the Library.
+
+If any portion of this section is held invalid or unenforceable under any
+particular circumstance, the balance of the section is intended to apply,
+and the section as a whole is intended to apply in other circumstances.
+
+It is not the purpose of this section to induce you to infringe any
+patents or other property right claims or to contest validity of any
+such claims; this section has the sole purpose of protecting the
+integrity of the free software distribution system which is
+implemented by public license practices.  Many people have made
+generous contributions to the wide range of software distributed
+through that system in reliance on consistent application of that
+system; it is up to the author/donor to decide if he or she is willing
+to distribute software through any other system and a licensee cannot
+impose that choice.
+
+This section is intended to make thoroughly clear what is believed to
+be a consequence of the rest of this License.
+
+  12. If the distribution and/or use of the Library is restricted in
+certain countries either by patents or by copyrighted interfaces, the
+original copyright holder who places the Library under this License may add
+an explicit geographical distribution limitation excluding those countries,
+so that distribution is permitted only in or among countries not thus
+excluded.  In such case, this License incorporates the limitation as if
+written in the body of this License.
+
+  13. The Free Software Foundation may publish revised and/or new
+versions of the Library General Public License from time to time.
+Such new versions will be similar in spirit to the present version,
+but may differ in detail to address new problems or concerns.
+
+Each version is given a distinguishing version number.  If the Library
+specifies a version number of this License which applies to it and
+"any later version", you have the option of following the terms and
+conditions either of that version or of any later version published by
+the Free Software Foundation.  If the Library does not specify a
+license version number, you may choose any version ever published by
+the Free Software Foundation.
+
+  14. If you wish to incorporate parts of the Library into other free
+programs whose distribution conditions are incompatible with these,
+write to the author to ask for permission.  For software which is
+copyrighted by the Free Software Foundation, write to the Free
+Software Foundation; we sometimes make exceptions for this.  Our
+decision will be guided by the two goals of preserving the free status
+of all derivatives of our free software and of promoting the sharing
+and reuse of software generally.
+
+			    NO WARRANTY
+
+  15. BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO
+WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW.
+EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR
+OTHER PARTIES PROVIDE THE LIBRARY "AS IS" WITHOUT WARRANTY OF ANY
+KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE
+LIBRARY IS WITH YOU.  SHOULD THE LIBRARY PROVE DEFECTIVE, YOU ASSUME
+THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
+
+  16. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN
+WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY
+AND/OR REDISTRIBUTE THE LIBRARY AS PERMITTED ABOVE, BE LIABLE TO YOU
+FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR
+CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE
+LIBRARY (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING
+RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A
+FAILURE OF THE LIBRARY TO OPERATE WITH ANY OTHER SOFTWARE), EVEN IF
+SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
+DAMAGES.
+
+		     END OF TERMS AND CONDITIONS
+
+           How to Apply These Terms to Your New Libraries
+
+  If you develop a new library, and you want it to be of the greatest
+possible use to the public, we recommend making it free software that
+everyone can redistribute and change.  You can do so by permitting
+redistribution under these terms (or, alternatively, under the terms of the
+ordinary General Public License).
+
+  To apply these terms, attach the following notices to the library.  It is
+safest to attach them to the start of each source file to most effectively
+convey the exclusion of warranty; and each file should have at least the
+"copyright" line and a pointer to where the full notice is found.
+
+    <one line to give the library's name and a brief idea of what it does.>
+    Copyright (C) <year>  <name of author>
+
+    This library is free software; you can redistribute it and/or
+    modify it under the terms of the GNU Library General Public
+    License as published by the Free Software Foundation; either
+    version 2 of the License, or (at your option) any later version.
+
+    This library is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+    Library General Public License for more details.
+
+    You should have received a copy of the GNU Library General Public
+    License along with this library; if not, write to the Free
+    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+
+Also add information on how to contact you by electronic and paper mail.
+
+You should also get your employer (if you work as a programmer) or your
+school, if any, to sign a "copyright disclaimer" for the library, if
+necessary.  Here is a sample; alter the names:
+
+  Yoyodyne, Inc., hereby disclaims all copyright interest in the
+  library `Frob' (a library for tweaking knobs) written by James Random Hacker.
+
+  <signature of Ty Coon>, 1 April 1990
+  Ty Coon, President of Vice
+
+That's all there is to it!
-- 
Gitee


From 8c55d8fded0ce03cb762904dafbcccedaaf8684e Mon Sep 17 00:00:00 2001
From: Jeff Johnson <n3npq@mac.com>
Date: Sat, 20 Jul 2002 19:04:08 +0000
Subject: [PATCH 352/667] - popt: parse file into string of options (#56860).

---
 .cvsignore           |   2 +
 Makefile.am          |   5 +-
 po/cs.po             |   2 +-
 po/da.po             |   2 +-
 po/de.po             |   2 +-
 po/es.po             |   2 +-
 po/eu_ES.po          |   2 +-
 po/fi.po             |   2 +-
 po/fr.po             |   2 +-
 po/gl.po             |   2 +-
 po/hu.po             |   2 +-
 po/id.po             |   2 +-
 po/is.po             |   2 +-
 po/it.po             |   2 +-
 po/ja.po             |   2 +-
 po/ko.po             |   2 +-
 po/no.po             |   2 +-
 po/pl.po             |   2 +-
 po/popt.pot          |   2 +-
 po/pt.po             |   2 +-
 po/pt_BR.po          |   2 +-
 po/ro.po             |   2 +-
 po/ru.po             |   2 +-
 po/sk.po             |   2 +-
 po/sl.po             |   2 +-
 po/sr.po             |   2 +-
 po/sv.po             |   2 +-
 po/tr.po             |   2 +-
 po/uk.po             |   2 +-
 po/wa.po             |   2 +-
 po/zh.po             |   2 +-
 po/zh_CN.GB2312.po   |   2 +-
 popt.c               |  48 +++++-----
 popt.h               |  80 +++++++++++++++++
 poptparse.c          | 105 ++++++++++++++++++++++
 test3-data/01.answer |  10 +++
 test3-data/01.input  |  13 +++
 test3-data/02.answer |   1 +
 test3-data/02.input  |   2 +
 test3-data/03.answer |  70 +++++++++++++++
 test3-data/03.input  | 210 +++++++++++++++++++++++++++++++++++++++++++
 test3.c              |  48 ++++++++++
 testit.sh            |  28 ++++++
 43 files changed, 625 insertions(+), 57 deletions(-)
 create mode 100644 test3-data/01.answer
 create mode 100644 test3-data/01.input
 create mode 100644 test3-data/02.answer
 create mode 100644 test3-data/02.input
 create mode 100644 test3-data/03.answer
 create mode 100644 test3-data/03.input
 create mode 100644 test3.c

diff --git a/.cvsignore b/.cvsignore
index 996c662..de99415 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -26,7 +26,9 @@ stamp-h1
 stamp-h.in
 test1
 test2
+test3
 *.la
 *.lcd
 *.lo
+*.swp
 popt-*.tar.gz
diff --git a/Makefile.am b/Makefile.am
index 98af48e..6bf6c13 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -13,13 +13,16 @@ INCLUDES = -I. -I$(top_srcdir)
 
 noinst_HEADERS = findme.h poptint.h system.h
 
-noinst_PROGRAMS = test1 test2
+noinst_PROGRAMS = test1 test2 test3
 test1_SOURCES = test1.c
 test1_LDFLAGS = -all-static
 test1_LDADD = $(lib_LTLIBRARIES)
 test2_SOURCES = test2.c
 test2_LDFLAGS = -all-static
 test2_LDADD = $(lib_LTLIBRARIES)
+test3_SOURCES = test3.c
+test3_LDFLAGS = -all-static
+test3_LDADD = $(lib_LTLIBRARIES)
 
 noinst_SCRIPTS = testit.sh
 
diff --git a/po/cs.po b/po/cs.po
index 7d7e66d..40bbdf4 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.3\n"
-"POT-Creation-Date: 2002-07-14 10:58-0400\n"
+"POT-Creation-Date: 2002-07-20 15:04-0400\n"
 "PO-Revision-Date: 2001-07-24 00:03+0100\n"
 "Last-Translator: Milan Kerslager <kerslage@linux.cz>\n"
 "Language-Team: Czech <cs@li.org>\n"
diff --git a/po/da.po b/po/da.po
index 9b159e2..92c6987 100644
--- a/po/da.po
+++ b/po/da.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.3\n"
-"POT-Creation-Date: 2002-07-14 10:58-0400\n"
+"POT-Creation-Date: 2002-07-20 15:04-0400\n"
 "PO-Revision-Date: Sun Jan 21 2001 04:30:32+0200\n"
 "Last-Translator: Martin Hansen <mah@k64.dk>\n"
 "Language-Team: Dansk <dansk@klid.dk>\n"
diff --git a/po/de.po b/po/de.po
index 9cf7ac3..e973070 100644
--- a/po/de.po
+++ b/po/de.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.3\n"
-"POT-Creation-Date: 2002-07-14 10:58-0400\n"
+"POT-Creation-Date: 2002-07-20 15:04-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/po/es.po b/po/es.po
index 7209a4e..53a05a5 100644
--- a/po/es.po
+++ b/po/es.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.3\n"
-"POT-Creation-Date: 2002-07-14 10:58-0400\n"
+"POT-Creation-Date: 2002-07-20 15:04-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Leandro Lucarella <luca@linuxmendoza.org.ar>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/po/eu_ES.po b/po/eu_ES.po
index 9cf7ac3..e973070 100644
--- a/po/eu_ES.po
+++ b/po/eu_ES.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.3\n"
-"POT-Creation-Date: 2002-07-14 10:58-0400\n"
+"POT-Creation-Date: 2002-07-20 15:04-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/po/fi.po b/po/fi.po
index 9cf7ac3..e973070 100644
--- a/po/fi.po
+++ b/po/fi.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.3\n"
-"POT-Creation-Date: 2002-07-14 10:58-0400\n"
+"POT-Creation-Date: 2002-07-20 15:04-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/po/fr.po b/po/fr.po
index 9cf7ac3..e973070 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.3\n"
-"POT-Creation-Date: 2002-07-14 10:58-0400\n"
+"POT-Creation-Date: 2002-07-20 15:04-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/po/gl.po b/po/gl.po
index 820d8e8..f2a23ad 100644
--- a/po/gl.po
+++ b/po/gl.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.3\n"
-"POT-Creation-Date: 2002-07-14 10:58-0400\n"
+"POT-Creation-Date: 2002-07-20 15:04-0400\n"
 "PO-Revision-Date: 2001-01-17 01:01+0100\n"
 "Last-Translator: Jes�s Bravo �lvarez <jba@pobox.com>\n"
 "Language-Team: Galician <trasno@ceu.fi.udc.es>\n"
diff --git a/po/hu.po b/po/hu.po
index cac9622..4a985cf 100644
--- a/po/hu.po
+++ b/po/hu.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.3\n"
-"POT-Creation-Date: 2002-07-14 10:58-0400\n"
+"POT-Creation-Date: 2002-07-20 15:04-0400\n"
 "PO-Revision-Date: 2000-08-03 23:26+0200\n"
 "Last-Translator: L�szl� N�meth <nemeth@qwertynet.hu>\n"
 "Language-Team: Hungarian\n"
diff --git a/po/id.po b/po/id.po
index 9cf7ac3..e973070 100644
--- a/po/id.po
+++ b/po/id.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.3\n"
-"POT-Creation-Date: 2002-07-14 10:58-0400\n"
+"POT-Creation-Date: 2002-07-20 15:04-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/po/is.po b/po/is.po
index d10ed7c..0686373 100644
--- a/po/is.po
+++ b/po/is.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.3\n"
-"POT-Creation-Date: 2002-07-14 10:58-0400\n"
+"POT-Creation-Date: 2002-07-20 15:04-0400\n"
 "PO-Revision-Date: 2001-06-08 01:35+0000\n"
 "Last-Translator: Richard Allen <ra@hp.is>\n"
 "Language-Team: is <kde-isl@mmedia.is>\n"
diff --git a/po/it.po b/po/it.po
index 9cf7ac3..e973070 100644
--- a/po/it.po
+++ b/po/it.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.3\n"
-"POT-Creation-Date: 2002-07-14 10:58-0400\n"
+"POT-Creation-Date: 2002-07-20 15:04-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/po/ja.po b/po/ja.po
index 9cf7ac3..e973070 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.3\n"
-"POT-Creation-Date: 2002-07-14 10:58-0400\n"
+"POT-Creation-Date: 2002-07-20 15:04-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/po/ko.po b/po/ko.po
index 192bc6d..7e5b1af 100644
--- a/po/ko.po
+++ b/po/ko.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6\n"
-"POT-Creation-Date: 2002-07-14 10:58-0400\n"
+"POT-Creation-Date: 2002-07-20 15:04-0400\n"
 "PO-Revision-Date: 2001-09-06 20:06+0900\n"
 "Last-Translator: Jong-Hoon Ryu <redhat4u@netian.com>\n"
 "Language-Team: GNU Translation project <ko@li.org>\n"
diff --git a/po/no.po b/po/no.po
index d89a819..5501a12 100644
--- a/po/no.po
+++ b/po/no.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.3\n"
-"POT-Creation-Date: 2002-07-14 10:58-0400\n"
+"POT-Creation-Date: 2002-07-20 15:04-0400\n"
 "PO-Revision-Date: 2001-06-27 11:05+0200\n"
 "Last-Translator: Kjartan Maraas <kmaraas@online.no>\n"
 "Language-Team: Norwegian <no@li.org>\n"
diff --git a/po/pl.po b/po/pl.po
index 9cf7ac3..e973070 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.3\n"
-"POT-Creation-Date: 2002-07-14 10:58-0400\n"
+"POT-Creation-Date: 2002-07-20 15:04-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/po/popt.pot b/po/popt.pot
index 6a0ccc9..b60a954 100644
--- a/po/popt.pot
+++ b/po/popt.pot
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2002-07-14 10:58-0400\n"
+"POT-Creation-Date: 2002-07-20 15:04-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/po/pt.po b/po/pt.po
index 91fff7e..54f91d1 100644
--- a/po/pt.po
+++ b/po/pt.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt\n"
-"POT-Creation-Date: 2002-07-14 10:58-0400\n"
+"POT-Creation-Date: 2002-07-20 15:04-0400\n"
 "PO-Revision-Date: 2002-02-13 18:32+0000\n"
 "Last-Translator: Pedro Morais <morais@kde.org>\n"
 "Language-Team: pt <morais@kde.org>\n"
diff --git a/po/pt_BR.po b/po/pt_BR.po
index 9cf7ac3..e973070 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.3\n"
-"POT-Creation-Date: 2002-07-14 10:58-0400\n"
+"POT-Creation-Date: 2002-07-20 15:04-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/po/ro.po b/po/ro.po
index 14c4a31..88a5dfc 100644
--- a/po/ro.po
+++ b/po/ro.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.3\n"
-"POT-Creation-Date: 2002-07-14 10:58-0400\n"
+"POT-Creation-Date: 2002-07-20 15:04-0400\n"
 "PO-Revision-Date: 2000-06-14 23:23+EST\n"
 "Last-Translator: Cristian Gafton <gafton@redhat.com>\n"
 "Language-Team: Romanian <ro@li.org>\n"
diff --git a/po/ru.po b/po/ru.po
index 05e236d..c8e0cc5 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.3\n"
-"POT-Creation-Date: 2002-07-14 10:58-0400\n"
+"POT-Creation-Date: 2002-07-20 15:04-0400\n"
 "PO-Revision-Date: 2001-07-05 21:00-0500\n"
 "Last-Translator: Eugene Kanter <eugene@blackcatlinux.com>\n"
 "Language-Team: Black Cat Linux Team <blackcat-support@blackcatlinux.com>\n"
diff --git a/po/sk.po b/po/sk.po
index 7034950..d521434 100644
--- a/po/sk.po
+++ b/po/sk.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.3\n"
-"POT-Creation-Date: 2002-07-14 10:58-0400\n"
+"POT-Creation-Date: 2002-07-20 15:04-0400\n"
 "PO-Revision-Date: 1999-08-04 21:40+0200\n"
 "Last-Translator: Stanislav Meduna <stano@eunet.sk>\n"
 "Language-Team: Slovak <sk-i18n@rak.isternet.sk>\n"
diff --git a/po/sl.po b/po/sl.po
index e5613e0..d32e36c 100644
--- a/po/sl.po
+++ b/po/sl.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.3\n"
-"POT-Creation-Date: 2002-07-14 10:58-0400\n"
+"POT-Creation-Date: 2002-07-20 15:04-0400\n"
 "PO-Revision-Date: 2000-09-05 12:30+0200\n"
 "Last-Translator: Roman Maurer <roman.maurer@hermes.si>\n"
 "Language-Team: Slovenian <sl@li.org>\n"
diff --git a/po/sr.po b/po/sr.po
index 9cf7ac3..e973070 100644
--- a/po/sr.po
+++ b/po/sr.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.3\n"
-"POT-Creation-Date: 2002-07-14 10:58-0400\n"
+"POT-Creation-Date: 2002-07-20 15:04-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/po/sv.po b/po/sv.po
index e0c91d6..c7b3062 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.3\n"
-"POT-Creation-Date: 2002-07-14 10:58-0400\n"
+"POT-Creation-Date: 2002-07-20 15:04-0400\n"
 "PO-Revision-Date: 2001-07-12 22:26+0100\n"
 "Last-Translator: Christian Rose <menthos@menthos.com>\n"
 "Language-Team: Swedish <sv@li.org>\n"
diff --git a/po/tr.po b/po/tr.po
index c51b46d..d958fd1 100644
--- a/po/tr.po
+++ b/po/tr.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.3\n"
-"POT-Creation-Date: 2002-07-14 10:58-0400\n"
+"POT-Creation-Date: 2002-07-20 15:04-0400\n"
 "PO-Revision-Date: 2000-02-11 13:01+0200\n"
 "Last-Translator: Nilgun Belma Buguner <nilgun@technologist.com>\n"
 "Language-Team: Turkish <tr@li.org>\n"
diff --git a/po/uk.po b/po/uk.po
index ac541bf..4c47cb5 100644
--- a/po/uk.po
+++ b/po/uk.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.3\n"
-"POT-Creation-Date: 2002-07-14 10:58-0400\n"
+"POT-Creation-Date: 2002-07-20 15:04-0400\n"
 "PO-Revision-Date: 1999-09-30 16:54+0200\n"
 "Last-Translator: Yuri Syrota <rasta@renome.rovno.ua>\n"
 "Language-Team: Ukrainian <uk@li.org>\n"
diff --git a/po/wa.po b/po/wa.po
index bd7fdfd..6db9d08 100644
--- a/po/wa.po
+++ b/po/wa.po
@@ -9,7 +9,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.3\n"
-"POT-Creation-Date: 2002-07-14 10:58-0400\n"
+"POT-Creation-Date: 2002-07-20 15:04-0400\n"
 "PO-Revision-Date: 1999-03-18 23:11+0100\n"
 "Last-Translator: Nobody yet\n"
 "Language-Team: walon <linux-wa@chanae.alphanet.ch>\n"
diff --git a/po/zh.po b/po/zh.po
index 9cf7ac3..e973070 100644
--- a/po/zh.po
+++ b/po/zh.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.3\n"
-"POT-Creation-Date: 2002-07-14 10:58-0400\n"
+"POT-Creation-Date: 2002-07-20 15:04-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/po/zh_CN.GB2312.po b/po/zh_CN.GB2312.po
index 94d5bc0..4f3deeb 100644
--- a/po/zh_CN.GB2312.po
+++ b/po/zh_CN.GB2312.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.3\n"
-"POT-Creation-Date: 2002-07-14 10:58-0400\n"
+"POT-Creation-Date: 2002-07-20 15:04-0400\n"
 "PO-Revision-Date: 1999-11-11 05:04+0800\n"
 "Last-Translator: Dillion Chen <dillon.chen@turbolinux.com.cn>\n"
 "Language-Team: TLDN\n"
diff --git a/popt.c b/popt.c
index d4b2dc2..d71e2bf 100644
--- a/popt.c
+++ b/popt.c
@@ -615,27 +615,26 @@ static void poptStripArg(/*@special@*/ poptContext con, int which)
     /*@=compdef@*/
 }
 
-/*@-boundswrite@*/
-static int poptSaveLong(const struct poptOption * opt, long aLong)
-	/*@modifies opt->arg @*/
+int poptSaveLong(long * arg, int argInfo, long aLong)
 {
-    if (opt->arg == NULL)
+    /* XXX Check alignment, may fail on funky platforms. */
+    if (arg == NULL || (((unsigned long)arg) & (sizeof(*arg)-1)))
 	return POPT_ERROR_NULLARG;
 
-    if (opt->argInfo & POPT_ARGFLAG_NOT)
+    if (argInfo & POPT_ARGFLAG_NOT)
 	aLong = ~aLong;
-    switch (opt->argInfo & POPT_ARGFLAG_LOGICALOPS) {
+    switch (argInfo & POPT_ARGFLAG_LOGICALOPS) {
     case 0:
-	*((long *) opt->arg) = aLong;
+	*arg = aLong;
 	break;
     case POPT_ARGFLAG_OR:
-	*((long *) opt->arg) |= aLong;
+	*arg |= aLong;
 	break;
     case POPT_ARGFLAG_AND:
-	*((long *) opt->arg) &= aLong;
+	*arg &= aLong;
 	break;
     case POPT_ARGFLAG_XOR:
-	*((long *) opt->arg) ^= aLong;
+	*arg ^= aLong;
 	break;
     default:
 	return POPT_ERROR_BADOPERATION;
@@ -643,29 +642,27 @@ static int poptSaveLong(const struct poptOption * opt, long aLong)
     }
     return 0;
 }
-/*@=boundswrite@*/
 
-/*@-boundswrite@*/
-static int poptSaveInt(const struct poptOption * opt, long aLong)
-	/*@modifies opt->arg @*/
+int poptSaveInt(/*@null@*/ int * arg, int argInfo, long aLong)
 {
-    if (opt->arg == NULL)
+    /* XXX Check alignment, may fail on funky platforms. */
+    if (arg == NULL || (((unsigned long)arg) & (sizeof(*arg)-1)))
 	return POPT_ERROR_NULLARG;
 
-    if (opt->argInfo & POPT_ARGFLAG_NOT)
+    if (argInfo & POPT_ARGFLAG_NOT)
 	aLong = ~aLong;
-    switch (opt->argInfo & POPT_ARGFLAG_LOGICALOPS) {
+    switch (argInfo & POPT_ARGFLAG_LOGICALOPS) {
     case 0:
-	*((int *) opt->arg) = aLong;
+	*arg = aLong;
 	break;
     case POPT_ARGFLAG_OR:
-	*((int *) opt->arg) |= aLong;
+	*arg |= aLong;
 	break;
     case POPT_ARGFLAG_AND:
-	*((int *) opt->arg) &= aLong;
+	*arg &= aLong;
 	break;
     case POPT_ARGFLAG_XOR:
-	*((int *) opt->arg) ^= aLong;
+	*arg ^= aLong;
 	break;
     default:
 	return POPT_ERROR_BADOPERATION;
@@ -673,7 +670,6 @@ static int poptSaveInt(const struct poptOption * opt, long aLong)
     }
     return 0;
 }
-/*@=boundswrite@*/
 
 /*@-boundswrite@*/
 /* returns 'val' element, -1 on last item, POPT_ERROR_* on error */
@@ -821,11 +817,11 @@ int poptGetNextOpt(poptContext con)
 
 	if (opt == NULL) return POPT_ERROR_BADOPT;	/* XXX can't happen */
 	if (opt->arg && (opt->argInfo & POPT_ARG_MASK) == POPT_ARG_NONE) {
-	    if (poptSaveInt(opt, 1L))
+	    if (poptSaveInt((int *)opt->arg, opt->argInfo, 1L))
 		return POPT_ERROR_BADOPERATION;
 	} else if ((opt->argInfo & POPT_ARG_MASK) == POPT_ARG_VAL) {
 	    if (opt->arg) {
-		if (poptSaveInt(opt, (long)opt->val))
+		if (poptSaveInt((int *)opt->arg, opt->argInfo, (long)opt->val))
 		    return POPT_ERROR_BADOPERATION;
 	    }
 	} else if ((opt->argInfo & POPT_ARG_MASK) != POPT_ARG_NONE) {
@@ -894,12 +890,12 @@ int poptGetNextOpt(poptContext con)
 		    if ((opt->argInfo & POPT_ARG_MASK) == POPT_ARG_LONG) {
 			if (aLong == LONG_MIN || aLong == LONG_MAX)
 			    return POPT_ERROR_OVERFLOW;
-			if (poptSaveLong(opt, aLong))
+			if (poptSaveLong((long *)opt->arg, opt->argInfo, aLong))
 			    return POPT_ERROR_BADOPERATION;
 		    } else {
 			if (aLong > INT_MAX || aLong < INT_MIN)
 			    return POPT_ERROR_OVERFLOW;
-			if (poptSaveInt(opt, aLong))
+			if (poptSaveInt((int *)opt->arg, opt->argInfo, aLong))
 			    return POPT_ERROR_BADOPERATION;
 		    }
 		}   /*@switchbreak@*/ break;
diff --git a/popt.h b/popt.h
index fad30bc..c1a3115 100644
--- a/popt.h
+++ b/popt.h
@@ -380,6 +380,58 @@ int poptParseArgvString(const char * s,
 		/*@out@*/ int * argcPtr, /*@out@*/ const char *** argvPtr)
 	/*@modifies *argcPtr, *argvPtr @*/;
 
+/** \ingroup popt
+ * Parses an input configuration file and returns an string that is a 
+ * command line.  For use with popt.  You must free the return value when done.
+ *
+ * Given the file:
+\verbatim
+# this line is ignored
+    #   this one too
+aaa
+  bbb
+    ccc   
+bla=bla
+
+this_is   =   fdsafdas
+     bad_line=        
+  reall bad line  
+  reall bad line  = again
+5555=   55555   
+  test = with lots of spaces
+\endverbatim
+*
+* The result is:
+\verbatim
+--aaa --bbb --ccc --bla="bla" --this_is="fdsafdas" --5555="55555" --test="with lots of spaces"
+\endverbatim
+*
+* Passing this to poptParseArgvString() yields an argv of:
+\verbatim
+'--aaa'
+'--bbb' 
+'--ccc' 
+'--bla=bla' 
+'--this_is=fdsafdas' 
+'--5555=55555' 
+'--test=with lots of spaces' 
+\endverbatim
+ *
+ * @bug NULL is returned if file line is too long.
+ * @bug Silently ignores invalid lines.
+ *
+ * @param fp		file handle to read
+ * @param *argstrp	return string of options (malloc'd)
+ * @param flags		unused
+ * @return		0 on success
+ * @see			poptParseArgvString
+ */
+/*@-fcnuse@*/
+int poptConfigFileToString(FILE *fp, /*@out@*/ char ** argstrp, int flags)
+	/*@globals fileSystem @*/
+	/*@modifies *fp, *argstrp, fileSystem @*/;
+/*@=fcnuse@*/
+
 /** \ingroup popt
  * Return formatted error string for popt failure.
  * @param error		popt error
@@ -451,6 +503,34 @@ int poptStrippedArgv(poptContext con, int argc, char ** argv)
 	/*@modifies *argv @*/;
 /*@=fcnuse@*/
 
+/**
+ * Save a long, performing logical operation with value.
+ * @warning Alignment check may be too strict on certain platorms.
+ * @param arg		integer pointer, aligned on int boundary.
+ * @param argInfo	logical operation (see POPT_ARGFLAG_*)
+ * @param aLong		value to use
+ * @return		0 on success, POPT_ERROR_NULLARG/POPT_ERROR_BADOPERATION
+ */
+/*@-incondefs@*/
+int poptSaveLong(/*@null@*/ long * arg, int argInfo, long aLong)
+	/*@modifies *arg @*/
+	/*@requires maxSet(arg) >= 0 /\ maxRead(arg) == 0 @*/;
+/*@=incondefs@*/
+
+/**
+ * Save an integer, performing logical operation with value.
+ * @warning Alignment check may be too strict on certain platorms.
+ * @param arg		integer pointer, aligned on int boundary.
+ * @param argInfo	logical operation (see POPT_ARGFLAG_*)
+ * @param aLong		value to use
+ * @return		0 on success, POPT_ERROR_NULLARG/POPT_ERROR_BADOPERATION
+ */
+/*@-incondefs@*/
+int poptSaveInt(/*@null@*/ int * arg, int argInfo, long aLong)
+	/*@modifies *arg @*/
+	/*@requires maxSet(arg) >= 0 /\ maxRead(arg) == 0 @*/;
+/*@=incondefs@*/
+
 /*@=type@*/
 #ifdef  __cplusplus
 }
diff --git a/poptparse.c b/poptparse.c
index 2071601..0a75f8b 100644
--- a/poptparse.c
+++ b/poptparse.c
@@ -120,3 +120,108 @@ exit:
     return rc;
 }
 /*@=bounds@*/
+
+/* still in the dev stage.
+ * return values, perhaps 1== file erro
+ * 2== line to long
+ * 3== umm.... more?
+ */
+int poptConfigFileToString(FILE *fp, char ** argstrp, /*@unused@*/ int flags)
+{
+    char line[999];
+    char * argstr;
+    char * p;
+    char * q;
+    char * x;
+    int t;
+    int argvlen = 0;
+    size_t maxlinelen = sizeof(line);
+    size_t linelen;
+    int maxargvlen = 480;
+    int linenum = 0;
+
+    *argstrp = NULL;
+
+    /*   |   this_is   =   our_line
+     *	     p             q      x
+     */
+
+    if (fp == NULL)
+	return POPT_ERROR_NULLARG;
+
+    argstr = calloc(maxargvlen, sizeof(*argstr));
+    if (argstr == NULL) return POPT_ERROR_MALLOC;
+
+    while (fgets(line, (int)maxlinelen, fp) != NULL) {
+	linenum++;
+	p = line;
+
+	/* loop until first non-space char or EOL */
+	while( *p != '\0' && isspace(*p) )
+	    p++;
+
+	linelen = strlen(p);
+	if (linelen >= maxlinelen-1)
+	    return POPT_ERROR_OVERFLOW;	/* XXX line too long */
+
+	if (*p == '\0' || *p == '\n') continue;	/* line is empty */
+	if (*p == '#') continue;		/* comment line */
+
+	q = p;
+
+	while (*q != '\0' && (!isspace(*q)) && *q != '=')
+	    q++;
+
+	if (isspace(*q)) {
+	    /* a space after the name, find next non space */
+	    *q++='\0';
+	    while( *q != '\0' && isspace((int)*q) ) q++;
+	}
+	if (*q == '\0') {
+	    /* single command line option (ie, no name=val, just name) */
+	    q[-1] = '\0';		/* kill off newline from fgets() call */
+	    argvlen += (t = q - p) + (sizeof(" --")-1);
+	    if (argvlen >= maxargvlen) {
+		maxargvlen = (t > maxargvlen) ? t*2 : maxargvlen*2;
+		argstr = realloc(argstr, maxargvlen);
+		if (argstr == NULL) return POPT_ERROR_MALLOC;
+	    }
+	    strcat(argstr, " --");
+	    strcat(argstr, p);
+	    continue;
+	}
+	if (*q != '=')
+	    continue;	/* XXX for now, silently ignore bogus line */
+		
+	/* *q is an equal sign. */
+	*q++ = '\0';
+
+	/* find next non-space letter of value */
+	while (*q != '\0' && isspace(*q))
+	    q++;
+	if (*q == '\0')
+	    continue;	/* XXX silently ignore missing value */
+
+	/* now, loop and strip all ending whitespace */
+	x = p + linelen;
+	while (isspace(*--x))
+	    *x = 0;	/* null out last char if space (including fgets() NL) */
+
+	/* rest of line accept */
+	t = x - p;
+	argvlen += t + (sizeof("' --='")-1);
+	if (argvlen >= maxargvlen) {
+	    maxargvlen = (t > maxargvlen) ? t*2 : maxargvlen*2;
+	    argstr = realloc(argstr, maxargvlen);
+	    if (argstr == NULL) return POPT_ERROR_MALLOC;
+	}
+	strcat(argstr, " --");
+	strcat(argstr, p);
+	strcat(argstr, "=\"");
+	strcat(argstr, q);
+	strcat(argstr, "\"");
+    }
+
+    *argstrp = argstr;
+    return 0;
+}
diff --git a/test3-data/01.answer b/test3-data/01.answer
new file mode 100644
index 0000000..bd95a38
--- /dev/null
+++ b/test3-data/01.answer
@@ -0,0 +1,10 @@
+single string: ' --aaa --bbb --ccc --bla="bla" --this_is="fdsafdas" --5555="55555" --test="with lots of spaces"'
+popt array: size=7
+'--aaa'
+'--bbb'
+'--ccc'
+'--bla=bla'
+'--this_is=fdsafdas'
+'--5555=55555'
+'--test=with lots of spaces'
+
diff --git a/test3-data/01.input b/test3-data/01.input
new file mode 100644
index 0000000..157ed05
--- /dev/null
+++ b/test3-data/01.input
@@ -0,0 +1,13 @@
+# this line is ignored
+    #   this one too
+aaa
+  bbb
+    ccc   
+bla=bla
+
+this_is   =   fdsafdas
+      bad_line=        
+  reall bad line  
+  reall bad line  = again
+5555=   55555   
+   test = with lots of spaces
diff --git a/test3-data/02.answer b/test3-data/02.answer
new file mode 100644
index 0000000..309011a
--- /dev/null
+++ b/test3-data/02.answer
@@ -0,0 +1 @@
+cannot parse test3-data/02.input. ret=-18
diff --git a/test3-data/02.input b/test3-data/02.input
new file mode 100644
index 0000000..ed57744
--- /dev/null
+++ b/test3-data/02.input
@@ -0,0 +1,2 @@
+# this next line has 999 letters.  this should cause an abort.
+xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
diff --git a/test3-data/03.answer b/test3-data/03.answer
new file mode 100644
index 0000000..085fe6a
--- /dev/null
+++ b/test3-data/03.answer
@@ -0,0 +1,70 @@
+single string: ' --confversion="1.0.0.0" --expires="19:57:56 03/16/01" --sessions="-1" --hostid="72738c36" --hostid="80b0cafb" --hostid="80c104e4" --hostid="80cf520f" --hostid="809fc805" --port="6666" --realservername="goya:554" --realserverip="127.0.0.1:554" --sdmux="0" --runtimeconf="1" --soc="1" --socaddr="127.0.0.1" --socconntimeout="3" --socqport="4110" --socuport="4111" --loadtest="0" --tunnelssmport="5541" --allowtcptransport="0" --realrevpkts="0" --asmrules="4;" --maxasmtime="10" --asmwaittime="4" --asmcalctime="4" --maxletswitchtime="20" --setbw="6;" --setbwblocktime="15" --asmsetbwtime="3" --setbwwaittime="1" --inputmaxsetbw="100" --encratemaxsetbw="100" --livesetbwdelta="2" --encrate="34000" --maxoutproberate="85" --maxoutencrate="140" --minoutencrate="108" --erprgamma="70" --utp="15" --nbalpha="77" --bbalpha="83" --tsfrequency="10" --recoveryrate="140" --maxbuffer="2000" --csmbuffer="12000" --probedelta="120" --numprobes="4" --probebuffpkts="5" --probeinterval="600000" --clientlog="2" --loglevel="2" --monitor="0" --testmode="0" --emulator="0" --emuaddr="127.0.0.1" --emuport="4200" --auxsvr="0" --mngsvrip="127.0.0.1" --mngsvrport="15550" --ssmip="127.0.0.1" --auxsvrport="14445" --auxsvrchkfreq="2" --auxsvrchkperiod="60;" --simulation="0" --netbuffer="5" --siminterval="3"'
+popt array: size=67
+'--confversion=1.0.0.0'
+'--expires=19:57:56 03/16/01'
+'--sessions=-1'
+'--hostid=72738c36'
+'--hostid=80b0cafb'
+'--hostid=80c104e4'
+'--hostid=80cf520f'
+'--hostid=809fc805'
+'--port=6666'
+'--realservername=goya:554'
+'--realserverip=127.0.0.1:554'
+'--sdmux=0'
+'--runtimeconf=1'
+'--soc=1'
+'--socaddr=127.0.0.1'
+'--socconntimeout=3'
+'--socqport=4110'
+'--socuport=4111'
+'--loadtest=0'
+'--tunnelssmport=5541'
+'--allowtcptransport=0'
+'--realrevpkts=0'
+'--asmrules=4;'
+'--maxasmtime=10'
+'--asmwaittime=4'
+'--asmcalctime=4'
+'--maxletswitchtime=20'
+'--setbw=6;'
+'--setbwblocktime=15'
+'--asmsetbwtime=3'
+'--setbwwaittime=1'
+'--inputmaxsetbw=100'
+'--encratemaxsetbw=100'
+'--livesetbwdelta=2'
+'--encrate=34000'
+'--maxoutproberate=85'
+'--maxoutencrate=140'
+'--minoutencrate=108'
+'--erprgamma=70'
+'--utp=15'
+'--nbalpha=77'
+'--bbalpha=83'
+'--tsfrequency=10'
+'--recoveryrate=140'
+'--maxbuffer=2000'
+'--csmbuffer=12000'
+'--probedelta=120'
+'--numprobes=4'
+'--probebuffpkts=5'
+'--probeinterval=600000'
+'--clientlog=2'
+'--loglevel=2'
+'--monitor=0'
+'--testmode=0'
+'--emulator=0'
+'--emuaddr=127.0.0.1'
+'--emuport=4200'
+'--auxsvr=0'
+'--mngsvrip=127.0.0.1'
+'--mngsvrport=15550'
+'--ssmip=127.0.0.1'
+'--auxsvrport=14445'
+'--auxsvrchkfreq=2'
+'--auxsvrchkperiod=60;'
+'--simulation=0'
+'--netbuffer=5'
+'--siminterval=3'
+
diff --git a/test3-data/03.input b/test3-data/03.input
new file mode 100644
index 0000000..34a7347
--- /dev/null
+++ b/test3-data/03.input
@@ -0,0 +1,210 @@
+#
+# WARNING: NO LINE IN THIS FILE SHOULD BE LONGER THAN 999 characters!
+#
+# a vague real world example
+#
+# the vers no of this file. useful for debug
+confversion=1.0.0.0
+
+# date and time of expiry of this license
+expires=19:57:56 03/16/01
+
+# max no of simultaneous sessions
+sessions=-1
+
+# hostid(s) of licensed host(s): matisse
+hostid=72738c36
+
+# degas (exodus)
+hostid=80b0cafb
+
+# max
+hostid=80c104e4
+
+# breton
+hostid=80cf520f
+
+# vaneyck
+hostid=809fc805
+
+# port at which SSM should listen (unless -p)
+port=6666
+
+# the name of the realserver that we proxy for
+realservername=goya:554
+
+# the ip addr of real server we proxy fo
+realserverip=127.0.0.1:554
+
+# are we using an SDMUX to receive rev STP pkts?
+sdmux=0
+
+# allow run time config through TCP connection
+runtimeconf=1
+
+# should we connect to SOC for delivinit/update etc?
+soc=1
+
+# address of the SOC
+socaddr=127.0.0.1
+
+# no of secs before we timeout SOC connection
+socconntimeout=3
+
+# SOC port for sending delivinit query
+socqport=4110
+
+# SOC port for sending delivery update
+socuport=4111
+
+# run in load test mode? (ignore player disconnect)
+loadtest=0
+
+# port of SSM to redirect to on probe bw < desc bw
+tunnelssmport=5541
+
+# allow TCP (RTSP interleaved) streaming?
+allowtcptransport=0
+
+# enable RDT rev packets?
+realrevpkts=0
+
+# allow asm switches? 0=no,1=yes,2=all within maxasmtime,3=1 within maxasmtime
+# 4=same as 2 but also whenever told by CSM after maxasmtime+tell CSM
+asmrules=4;
+# max time to which we will allow asm switches
+maxasmtime=10
+
+# time to wait after switch before starting below
+asmwaittime=4
+
+# time over which to calc post asm switch input rate
+asmcalctime=4
+
+# time after LETSWITCH within which to permit switch
+maxletswitchtime=20
+
+# change setbw? 0=no,1=block,2=sub w/1st,3=sub w/curr,4=tell CSM,5=allow w/asm
+# 6=sub w/cur enc rate & tell CSM & generate setbw on switch
+setbw=6;
+# minimum time between setbw requests from player
+setbwblocktime=15
+
+# max time within which we allow post asm setbw
+asmsetbwtime=3
+
+# post switch wait time (secs) before we send setbw
+setbwwaittime=1
+
+# max setbw as % of [init/post switch] input rate
+inputmaxsetbw=100
+
+# max setbw as % of current encoding rate
+encratemaxsetbw=100
+
+# % increase in encratemaxsetbw for live streams
+livesetbwdelta=2
+
+# temporarily here. encoding rate bits/sec
+encrate=34000
+
+# max output rate = maxoutproberate % probe rate
+maxoutproberate=85
+
+# max output rate = maxoutencrate % curr enc rate
+maxoutencrate=140
+
+# worst case outrate. should be > encratemaxsetbw
+minoutencrate=108
+
+# max out rate = er+erprgamma%(maxoutpr%pr-er)
+erprgamma=70
+
+# the CSM UTP: % loss above which CSM will enter CC
+utp=15
+
+# CSM alpha for narrowband
+nbalpha=77
+
+# CSM alpha for broadband
+bbalpha=83
+
+# periodic sendTS? 0 = sendTS only at SR_COMPUTE
+tsfrequency=10
+
+# SReoc as a % of the encoding rate
+recoveryrate=140
+
+# maximum server side buffer (in packets)
+maxbuffer=2000
+
+# client side buffer (in milliseconds)
+csmbuffer=12000
+
+# probe bw > probedelta % describe bw for us to work
+probedelta=120
+
+# the number of probes to do at the beginning
+numprobes=4
+
+# number of packets to burst during each probe
+probebuffpkts=5
+
+# time (in microsecs) interval between probes
+probeinterval=600000
+
+# client logs to none(0),disk(1),soc(2),both(3)
+clientlog=2
+
+# 0=none,1=brief,2=detailed,3=extensive
+loglevel=2
+
+# connected to monitor?
+monitor=0
+
+# 0=none, 1=test
+testmode=0
+
+# are we using the emulator?
+emulator=0
+
+# emulator IP address
+emuaddr=127.0.0.1
+
+# emulator TCP control port to connect to
+emuport=4200
+
+#
+# aux serv config
+#
+# start aux server? 0=no, 1=yes
+auxsvr=0
+
+# IP address of mgmt server
+mngsvrip=127.0.0.1
+
+# port where mgmt server listens
+mngsvrport=15550
+
+# IP address of SSM that we are monitoring
+ssmip=127.0.0.1
+
+# port where aux server should listen
+auxsvrport=14445
+
+# frequency of aux server checks
+auxsvrchkfreq=2
+
+auxsvrchkperiod=60;
+#
+# congestion simulation info
+#
+# congestion simulation?
+simulation=0
+
+# size of the network buffer
+netbuffer=5
+
+# time (in secs) between drop rate recalculation
+siminterval=3
+
diff --git a/test3.c b/test3.c
new file mode 100644
index 0000000..5290a9a
--- /dev/null
+++ b/test3.c
@@ -0,0 +1,48 @@
+// vim:ts=8:sts=4
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <errno.h>
+#include <string.h>
+#include <popt.h>
+
+int main (int argc, char **argv) {
+    char *out;
+    int newargc, j, f, ret;
+    char **newargv;
+    FILE *fp;
+
+    if (argc == 1) {
+	printf ("usage: test-popt file_1 file_2 ...\n");
+	printf ("you may specify many files\n");
+	exit (1);
+    }
+
+    for (f = 1; f < argc; f++) {
+	fp = fopen (argv[f], "r");
+	if (fp == NULL) {
+	    printf ("cannot read file %s.  errno=%s\n", argv[f],
+		strerror(errno));
+	    continue;
+	}
+
+	ret = poptConfigFileToString (fp, &out, 0);
+	if (ret != 0) {
+	    printf ("cannot parse %s. ret=%d\n", argv[f], ret);
+	    continue;
+	}
+
+	printf ("single string: '%s'\n", out);
+
+	poptParseArgvString (out, &newargc, &newargv);
+
+	printf ("popt array: size=%d\n", newargc);
+	for (j = 0; j < newargc; j++)
+	    printf ("'%s'\n", newargv[j]);
+
+	printf ("\n");
+	free(out);
+	fclose (fp);
+    }
+    return 0;
+}
diff --git a/testit.sh b/testit.sh
index 534a135..ecb4b79 100755
--- a/testit.sh
+++ b/testit.sh
@@ -14,6 +14,30 @@ run() {
     fi
 }
 
+run_diff() {
+    prog=$1; shift
+    name=$1; shift
+    in_file=$1; shift
+    answer_file=$1; shift
+
+    out=$builddir/tmp.out
+    diff_file=$builddir/tmp.diff
+
+    echo Running test $name.
+
+    $builddir/$prog $in_file > $out
+    ret=$?
+    diff $out $answer_file > $diff_file
+    diff_ret=$?
+
+    if [ "$diff_ret" != "0" ]; then
+       echo "Test \"$name\" failed output is in $out, diff is:"
+       cat $diff_file
+       exit 2
+    fi
+    rm $out $diff_file
+}
+
 builddir=`pwd`
 srcdir=$builddir
 cd ${srcdir}
@@ -68,5 +92,9 @@ run test1 "test1 - 38" "arg1: 0 arg2: (none) oStr: yadda" --optional yadda
 run test1 "test1 - 39" "arg1: 0 arg2: (none) oStr: ping rest: pong" --optional=ping pong
 run test1 "test1 - 40" "arg1: 0 arg2: (none) oStr: ping rest: pong" --optional ping pong
 
+run_diff test3 "test3 - 41" test3-data/01.input test3-data/01.answer
+run_diff test3 "test3 - 42" test3-data/02.input test3-data/02.answer
+run_diff test3 "test3 - 43" test3-data/03.input test3-data/03.answer
+
 echo ""
 echo "Passed."
-- 
Gitee


From 41a332de86301981d1dd08551dfe495126624361 Mon Sep 17 00:00:00 2001
From: Jeff Johnson <n3npq@mac.com>
Date: Sun, 21 Jul 2002 14:17:23 +0000
Subject: [PATCH 353/667] Update to gettext/intl license.

---
 intl/COPYING.LIB-2.1 | 515 +++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 515 insertions(+)
 create mode 100644 intl/COPYING.LIB-2.1

diff --git a/intl/COPYING.LIB-2.1 b/intl/COPYING.LIB-2.1
new file mode 100644
index 0000000..c4792dd
--- /dev/null
+++ b/intl/COPYING.LIB-2.1
@@ -0,0 +1,515 @@
+
+                  GNU LESSER GENERAL PUBLIC LICENSE
+                       Version 2.1, February 1999
+
+ Copyright (C) 1991, 1999 Free Software Foundation, Inc.
+     59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+[This is the first released version of the Lesser GPL.  It also counts
+ as the successor of the GNU Library Public License, version 2, hence
+ the version number 2.1.]
+
+                            Preamble
+
+  The licenses for most software are designed to take away your
+freedom to share and change it.  By contrast, the GNU General Public
+Licenses are intended to guarantee your freedom to share and change
+free software--to make sure the software is free for all its users.
+
+  This license, the Lesser General Public License, applies to some
+specially designated software packages--typically libraries--of the
+Free Software Foundation and other authors who decide to use it.  You
+can use it too, but we suggest you first think carefully about whether
+this license or the ordinary General Public License is the better
+strategy to use in any particular case, based on the explanations
+below.
+
+  When we speak of free software, we are referring to freedom of use,
+not price.  Our General Public Licenses are designed to make sure that
+you have the freedom to distribute copies of free software (and charge
+for this service if you wish); that you receive source code or can get
+it if you want it; that you can change the software and use pieces of
+it in new free programs; and that you are informed that you can do
+these things.
+
+  To protect your rights, we need to make restrictions that forbid
+distributors to deny you these rights or to ask you to surrender these
+rights.  These restrictions translate to certain responsibilities for
+you if you distribute copies of the library or if you modify it.
+
+  For example, if you distribute copies of the library, whether gratis
+or for a fee, you must give the recipients all the rights that we gave
+you.  You must make sure that they, too, receive or can get the source
+code.  If you link other code with the library, you must provide
+complete object files to the recipients, so that they can relink them
+with the library after making changes to the library and recompiling
+it.  And you must show them these terms so they know their rights.
+
+  We protect your rights with a two-step method: (1) we copyright the
+library, and (2) we offer you this license, which gives you legal
+permission to copy, distribute and/or modify the library.
+
+  To protect each distributor, we want to make it very clear that
+there is no warranty for the free library.  Also, if the library is
+modified by someone else and passed on, the recipients should know
+that what they have is not the original version, so that the original
+author's reputation will not be affected by problems that might be
+introduced by others.
+^L
+  Finally, software patents pose a constant threat to the existence of
+any free program.  We wish to make sure that a company cannot
+effectively restrict the users of a free program by obtaining a
+restrictive license from a patent holder.  Therefore, we insist that
+any patent license obtained for a version of the library must be
+consistent with the full freedom of use specified in this license.
+
+  Most GNU software, including some libraries, is covered by the
+ordinary GNU General Public License.  This license, the GNU Lesser
+General Public License, applies to certain designated libraries, and
+is quite different from the ordinary General Public License.  We use
+this license for certain libraries in order to permit linking those
+libraries into non-free programs.
+
+  When a program is linked with a library, whether statically or using
+a shared library, the combination of the two is legally speaking a
+combined work, a derivative of the original library.  The ordinary
+General Public License therefore permits such linking only if the
+entire combination fits its criteria of freedom.  The Lesser General
+Public License permits more lax criteria for linking other code with
+the library.
+
+  We call this license the "Lesser" General Public License because it
+does Less to protect the user's freedom than the ordinary General
+Public License.  It also provides other free software developers Less
+of an advantage over competing non-free programs.  These disadvantages
+are the reason we use the ordinary General Public License for many
+libraries.  However, the Lesser license provides advantages in certain
+special circumstances.
+
+  For example, on rare occasions, there may be a special need to
+encourage the widest possible use of a certain library, so that it
+becomes
+a de-facto standard.  To achieve this, non-free programs must be
+allowed to use the library.  A more frequent case is that a free
+library does the same job as widely used non-free libraries.  In this
+case, there is little to gain by limiting the free library to free
+software only, so we use the Lesser General Public License.
+
+  In other cases, permission to use a particular library in non-free
+programs enables a greater number of people to use a large body of
+free software.  For example, permission to use the GNU C Library in
+non-free programs enables many more people to use the whole GNU
+operating system, as well as its variant, the GNU/Linux operating
+system.
+
+  Although the Lesser General Public License is Less protective of the
+users' freedom, it does ensure that the user of a program that is
+linked with the Library has the freedom and the wherewithal to run
+that program using a modified version of the Library.
+
+  The precise terms and conditions for copying, distribution and
+modification follow.  Pay close attention to the difference between a
+"work based on the library" and a "work that uses the library".  The
+former contains code derived from the library, whereas the latter must
+be combined with the library in order to run.
+^L
+                  GNU LESSER GENERAL PUBLIC LICENSE
+   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
+
+  0. This License Agreement applies to any software library or other
+program which contains a notice placed by the copyright holder or
+other authorized party saying it may be distributed under the terms of
+this Lesser General Public License (also called "this License").
+Each licensee is addressed as "you".
+
+  A "library" means a collection of software functions and/or data
+prepared so as to be conveniently linked with application programs
+(which use some of those functions and data) to form executables.
+
+  The "Library", below, refers to any such software library or work
+which has been distributed under these terms.  A "work based on the
+Library" means either the Library or any derivative work under
+copyright law: that is to say, a work containing the Library or a
+portion of it, either verbatim or with modifications and/or translated
+straightforwardly into another language.  (Hereinafter, translation is
+included without limitation in the term "modification".)
+
+  "Source code" for a work means the preferred form of the work for
+making modifications to it.  For a library, complete source code means
+all the source code for all modules it contains, plus any associated
+interface definition files, plus the scripts used to control
+compilation
+and installation of the library.
+
+  Activities other than copying, distribution and modification are not
+covered by this License; they are outside its scope.  The act of
+running a program using the Library is not restricted, and output from
+such a program is covered only if its contents constitute a work based
+on the Library (independent of the use of the Library in a tool for
+writing it).  Whether that is true depends on what the Library does
+and what the program that uses the Library does.
+
+  1. You may copy and distribute verbatim copies of the Library's
+complete source code as you receive it, in any medium, provided that
+you conspicuously and appropriately publish on each copy an
+appropriate copyright notice and disclaimer of warranty; keep intact
+all the notices that refer to this License and to the absence of any
+warranty; and distribute a copy of this License along with the
+Library.
+
+  You may charge a fee for the physical act of transferring a copy,
+and you may at your option offer warranty protection in exchange for a
+fee.
+
+  2. You may modify your copy or copies of the Library or any portion
+of it, thus forming a work based on the Library, and copy and
+distribute such modifications or work under the terms of Section 1
+above, provided that you also meet all of these conditions:
+
+    a) The modified work must itself be a software library.
+
+    b) You must cause the files modified to carry prominent notices
+    stating that you changed the files and the date of any change.
+
+    c) You must cause the whole of the work to be licensed at no
+    charge to all third parties under the terms of this License.
+
+    d) If a facility in the modified Library refers to a function or a
+    table of data to be supplied by an application program that uses
+    the facility, other than as an argument passed when the facility
+    is invoked, then you must make a good faith effort to ensure that,
+    in the event an application does not supply such function or
+    table, the facility still operates, and performs whatever part of
+    its purpose remains meaningful.
+
+    (For example, a function in a library to compute square roots has
+    a purpose that is entirely well-defined independent of the
+    application.  Therefore, Subsection 2d requires that any
+    application-supplied function or table used by this function must
+    be optional: if the application does not supply it, the square
+    root function must still compute square roots.)
+
+These requirements apply to the modified work as a whole.  If
+identifiable sections of that work are not derived from the Library,
+and can be reasonably considered independent and separate works in
+themselves, then this License, and its terms, do not apply to those
+sections when you distribute them as separate works.  But when you
+distribute the same sections as part of a whole which is a work based
+on the Library, the distribution of the whole must be on the terms of
+this License, whose permissions for other licensees extend to the
+entire whole, and thus to each and every part regardless of who wrote
+it.
+
+Thus, it is not the intent of this section to claim rights or contest
+your rights to work written entirely by you; rather, the intent is to
+exercise the right to control the distribution of derivative or
+collective works based on the Library.
+
+In addition, mere aggregation of another work not based on the Library
+with the Library (or with a work based on the Library) on a volume of
+a storage or distribution medium does not bring the other work under
+the scope of this License.
+
+  3. You may opt to apply the terms of the ordinary GNU General Public
+License instead of this License to a given copy of the Library.  To do
+this, you must alter all the notices that refer to this License, so
+that they refer to the ordinary GNU General Public License, version 2,
+instead of to this License.  (If a newer version than version 2 of the
+ordinary GNU General Public License has appeared, then you can specify
+that version instead if you wish.)  Do not make any other change in
+these notices.
+^L
+  Once this change is made in a given copy, it is irreversible for
+that copy, so the ordinary GNU General Public License applies to all
+subsequent copies and derivative works made from that copy.
+
+  This option is useful when you wish to copy part of the code of
+the Library into a program that is not a library.
+
+  4. You may copy and distribute the Library (or a portion or
+derivative of it, under Section 2) in object code or executable form
+under the terms of Sections 1 and 2 above provided that you accompany
+it with the complete corresponding machine-readable source code, which
+must be distributed under the terms of Sections 1 and 2 above on a
+medium customarily used for software interchange.
+
+  If distribution of object code is made by offering access to copy
+from a designated place, then offering equivalent access to copy the
+source code from the same place satisfies the requirement to
+distribute the source code, even though third parties are not
+compelled to copy the source along with the object code.
+
+  5. A program that contains no derivative of any portion of the
+Library, but is designed to work with the Library by being compiled or
+linked with it, is called a "work that uses the Library".  Such a
+work, in isolation, is not a derivative work of the Library, and
+therefore falls outside the scope of this License.
+
+  However, linking a "work that uses the Library" with the Library
+creates an executable that is a derivative of the Library (because it
+contains portions of the Library), rather than a "work that uses the
+library".  The executable is therefore covered by this License.
+Section 6 states terms for distribution of such executables.
+
+  When a "work that uses the Library" uses material from a header file
+that is part of the Library, the object code for the work may be a
+derivative work of the Library even though the source code is not.
+Whether this is true is especially significant if the work can be
+linked without the Library, or if the work is itself a library.  The
+threshold for this to be true is not precisely defined by law.
+
+  If such an object file uses only numerical parameters, data
+structure layouts and accessors, and small macros and small inline
+functions (ten lines or less in length), then the use of the object
+file is unrestricted, regardless of whether it is legally a derivative
+work.  (Executables containing this object code plus portions of the
+Library will still fall under Section 6.)
+
+  Otherwise, if the work is a derivative of the Library, you may
+distribute the object code for the work under the terms of Section 6.
+Any executables containing that work also fall under Section 6,
+whether or not they are linked directly with the Library itself.
+^L
+  6. As an exception to the Sections above, you may also combine or
+link a "work that uses the Library" with the Library to produce a
+work containing portions of the Library, and distribute that work
+under terms of your choice, provided that the terms permit
+modification of the work for the customer's own use and reverse
+engineering for debugging such modifications.
+
+  You must give prominent notice with each copy of the work that the
+Library is used in it and that the Library and its use are covered by
+this License.  You must supply a copy of this License.  If the work
+during execution displays copyright notices, you must include the
+copyright notice for the Library among them, as well as a reference
+directing the user to the copy of this License.  Also, you must do one
+of these things:
+
+    a) Accompany the work with the complete corresponding
+    machine-readable source code for the Library including whatever
+    changes were used in the work (which must be distributed under
+    Sections 1 and 2 above); and, if the work is an executable linked
+    with the Library, with the complete machine-readable "work that
+    uses the Library", as object code and/or source code, so that the
+    user can modify the Library and then relink to produce a modified
+    executable containing the modified Library.  (It is understood
+    that the user who changes the contents of definitions files in the
+    Library will not necessarily be able to recompile the application
+    to use the modified definitions.)
+
+    b) Use a suitable shared library mechanism for linking with the
+    Library.  A suitable mechanism is one that (1) uses at run time a
+    copy of the library already present on the user's computer system,
+    rather than copying library functions into the executable, and (2)
+    will operate properly with a modified version of the library, if
+    the user installs one, as long as the modified version is
+    interface-compatible with the version that the work was made with.
+
+    c) Accompany the work with a written offer, valid for at
+    least three years, to give the same user the materials
+    specified in Subsection 6a, above, for a charge no more
+    than the cost of performing this distribution.
+
+    d) If distribution of the work is made by offering access to copy
+    from a designated place, offer equivalent access to copy the above
+    specified materials from the same place.
+
+    e) Verify that the user has already received a copy of these
+    materials or that you have already sent this user a copy.
+
+  For an executable, the required form of the "work that uses the
+Library" must include any data and utility programs needed for
+reproducing the executable from it.  However, as a special exception,
+the materials to be distributed need not include anything that is
+normally distributed (in either source or binary form) with the major
+components (compiler, kernel, and so on) of the operating system on
+which the executable runs, unless that component itself accompanies
+the executable.
+
+  It may happen that this requirement contradicts the license
+restrictions of other proprietary libraries that do not normally
+accompany the operating system.  Such a contradiction means you cannot
+use both them and the Library together in an executable that you
+distribute.
+^L
+  7. You may place library facilities that are a work based on the
+Library side-by-side in a single library together with other library
+facilities not covered by this License, and distribute such a combined
+library, provided that the separate distribution of the work based on
+the Library and of the other library facilities is otherwise
+permitted, and provided that you do these two things:
+
+    a) Accompany the combined library with a copy of the same work
+    based on the Library, uncombined with any other library
+    facilities.  This must be distributed under the terms of the
+    Sections above.
+
+    b) Give prominent notice with the combined library of the fact
+    that part of it is a work based on the Library, and explaining
+    where to find the accompanying uncombined form of the same work.
+
+  8. You may not copy, modify, sublicense, link with, or distribute
+the Library except as expressly provided under this License.  Any
+attempt otherwise to copy, modify, sublicense, link with, or
+distribute the Library is void, and will automatically terminate your
+rights under this License.  However, parties who have received copies,
+or rights, from you under this License will not have their licenses
+terminated so long as such parties remain in full compliance.
+
+  9. You are not required to accept this License, since you have not
+signed it.  However, nothing else grants you permission to modify or
+distribute the Library or its derivative works.  These actions are
+prohibited by law if you do not accept this License.  Therefore, by
+modifying or distributing the Library (or any work based on the
+Library), you indicate your acceptance of this License to do so, and
+all its terms and conditions for copying, distributing or modifying
+the Library or works based on it.
+
+  10. Each time you redistribute the Library (or any work based on the
+Library), the recipient automatically receives a license from the
+original licensor to copy, distribute, link with or modify the Library
+subject to these terms and conditions.  You may not impose any further
+restrictions on the recipients' exercise of the rights granted herein.
+You are not responsible for enforcing compliance by third parties with
+this License.
+^L
+  11. If, as a consequence of a court judgment or allegation of patent
+infringement or for any other reason (not limited to patent issues),
+conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License.  If you cannot
+distribute so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you
+may not distribute the Library at all.  For example, if a patent
+license would not permit royalty-free redistribution of the Library by
+all those who receive copies directly or indirectly through you, then
+the only way you could satisfy both it and this License would be to
+refrain entirely from distribution of the Library.
+
+If any portion of this section is held invalid or unenforceable under
+any particular circumstance, the balance of the section is intended to
+apply, and the section as a whole is intended to apply in other
+circumstances.
+
+It is not the purpose of this section to induce you to infringe any
+patents or other property right claims or to contest validity of any
+such claims; this section has the sole purpose of protecting the
+integrity of the free software distribution system which is
+implemented by public license practices.  Many people have made
+generous contributions to the wide range of software distributed
+through that system in reliance on consistent application of that
+system; it is up to the author/donor to decide if he or she is willing
+to distribute software through any other system and a licensee cannot
+impose that choice.
+
+This section is intended to make thoroughly clear what is believed to
+be a consequence of the rest of this License.
+
+  12. If the distribution and/or use of the Library is restricted in
+certain countries either by patents or by copyrighted interfaces, the
+original copyright holder who places the Library under this License
+may add an explicit geographical distribution limitation excluding those
+countries, so that distribution is permitted only in or among
+countries not thus excluded.  In such case, this License incorporates
+the limitation as if written in the body of this License.
+
+  13. The Free Software Foundation may publish revised and/or new
+versions of the Lesser General Public License from time to time.
+Such new versions will be similar in spirit to the present version,
+but may differ in detail to address new problems or concerns.
+
+Each version is given a distinguishing version number.  If the Library
+specifies a version number of this License which applies to it and
+"any later version", you have the option of following the terms and
+conditions either of that version or of any later version published by
+the Free Software Foundation.  If the Library does not specify a
+license version number, you may choose any version ever published by
+the Free Software Foundation.
+^L
+  14. If you wish to incorporate parts of the Library into other free
+programs whose distribution conditions are incompatible with these,
+write to the author to ask for permission.  For software which is
+copyrighted by the Free Software Foundation, write to the Free
+Software Foundation; we sometimes make exceptions for this.  Our
+decision will be guided by the two goals of preserving the free status
+of all derivatives of our free software and of promoting the sharing
+and reuse of software generally.
+
+                            NO WARRANTY
+
+  15. BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO
+WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW.
+EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR
+OTHER PARTIES PROVIDE THE LIBRARY "AS IS" WITHOUT WARRANTY OF ANY
+KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE
+LIBRARY IS WITH YOU.  SHOULD THE LIBRARY PROVE DEFECTIVE, YOU ASSUME
+THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
+
+  16. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN
+WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY
+AND/OR REDISTRIBUTE THE LIBRARY AS PERMITTED ABOVE, BE LIABLE TO YOU
+FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR
+CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE
+LIBRARY (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING
+RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A
+FAILURE OF THE LIBRARY TO OPERATE WITH ANY OTHER SOFTWARE), EVEN IF
+SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
+DAMAGES.
+
+                     END OF TERMS AND CONDITIONS
+^L
+           How to Apply These Terms to Your New Libraries
+
+  If you develop a new library, and you want it to be of the greatest
+possible use to the public, we recommend making it free software that
+everyone can redistribute and change.  You can do so by permitting
+redistribution under these terms (or, alternatively, under the terms
+of the ordinary General Public License).
+
+  To apply these terms, attach the following notices to the library.
+It is safest to attach them to the start of each source file to most
+effectively convey the exclusion of warranty; and each file should
+have at least the "copyright" line and a pointer to where the full
+notice is found.
+
+
+    <one line to give the library's name and a brief idea of what it
+does.>
+    Copyright (C) <year>  <name of author>
+
+    This library is free software; you can redistribute it and/or
+    modify it under the terms of the GNU Lesser General Public
+    License as published by the Free Software Foundation; either
+    version 2 of the License, or (at your option) any later version.
+
+    This library is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+    Lesser General Public License for more details.
+
+    You should have received a copy of the GNU Lesser General Public
+    License along with this library; if not, write to the Free Software
+    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307  USA
+
+Also add information on how to contact you by electronic and paper
+mail.
+
+You should also get your employer (if you work as a programmer) or
+your
+school, if any, to sign a "copyright disclaimer" for the library, if
+necessary.  Here is a sample; alter the names:
+
+  Yoyodyne, Inc., hereby disclaims all copyright interest in the
+  library `Frob' (a library for tweaking knobs) written by James
+Random Hacker.
+
+  <signature of Ty Coon>, 1 April 1990
+  Ty Coon, President of Vice
+
+That's all there is to it!
+
+
-- 
Gitee


From c276ee72194cbbcc105f48f57af158195fe51161 Mon Sep 17 00:00:00 2001
From: Jeff Johnson <n3npq@mac.com>
Date: Sun, 21 Jul 2002 14:21:15 +0000
Subject: [PATCH 354/667] Update to gettext-0.11.2-3 intl contents.

---
 intl/{COPYING.LIB => COPYING.LIB-2.0} |   7 +-
 intl/ChangeLog                        |   4 +-
 intl/Makefile.in                      |  58 ++-
 intl/VERSION                          |   2 +-
 intl/bindtextdom.c                    |   6 +-
 intl/config.charset                   |  24 +-
 intl/dcgettext.c                      |   3 +-
 intl/dcigettext.c                     | 151 ++----
 intl/dcngettext.c                     |   3 +-
 intl/dgettext.c                       |   4 +-
 intl/dngettext.c                      |   4 +-
 intl/eval-plural.h                    | 106 ++++
 intl/gettext.c                        |   4 +-
 intl/gettextP.h                       |  69 +--
 intl/gmo.h                            | 100 ++++
 intl/hash-string.h                    |   2 +-
 intl/l10nflist.c                      |  26 +-
 intl/libgnuintl.h                     |  60 ++-
 intl/loadinfo.h                       |  14 +-
 intl/loadmsgcat.c                     | 144 +-----
 intl/localcharset.c                   |  94 +++-
 intl/localealias.c                    |  43 +-
 intl/localename.c                     | 694 ++++++++++++++++++++++++++
 intl/ngettext.c                       |   4 +-
 intl/os2compat.c                      |  98 ++++
 intl/os2compat.h                      |  46 ++
 intl/osdep.c                          |  24 +
 intl/plural-exp.c                     | 156 ++++++
 intl/plural-exp.h                     | 126 +++++
 intl/plural.c                         |  58 +--
 intl/plural.y                         |  20 +-
 intl/textdomain.c                     |   8 +-
 32 files changed, 1701 insertions(+), 461 deletions(-)
 rename intl/{COPYING.LIB => COPYING.LIB-2.0} (99%)
 create mode 100644 intl/eval-plural.h
 create mode 100644 intl/gmo.h
 create mode 100644 intl/localename.c
 create mode 100644 intl/os2compat.c
 create mode 100644 intl/os2compat.h
 create mode 100644 intl/osdep.c
 create mode 100644 intl/plural-exp.c
 create mode 100644 intl/plural-exp.h

diff --git a/intl/COPYING.LIB b/intl/COPYING.LIB-2.0
similarity index 99%
rename from intl/COPYING.LIB
rename to intl/COPYING.LIB-2.0
index 92b8903..161a3d1 100644
--- a/intl/COPYING.LIB
+++ b/intl/COPYING.LIB-2.0
@@ -2,7 +2,7 @@
 		       Version 2, June 1991
 
  Copyright (C) 1991 Free Software Foundation, Inc.
-    		    59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
  Everyone is permitted to copy and distribute verbatim copies
  of this license document, but changing it is not allowed.
 
@@ -436,7 +436,7 @@ DAMAGES.
 
 		     END OF TERMS AND CONDITIONS
 
-           How to Apply These Terms to Your New Libraries
+     Appendix: How to Apply These Terms to Your New Libraries
 
   If you develop a new library, and you want it to be of the greatest
 possible use to the public, we recommend making it free software that
@@ -464,7 +464,8 @@ convey the exclusion of warranty; and each file should have at least the
 
     You should have received a copy of the GNU Library General Public
     License along with this library; if not, write to the Free
-    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+    Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
+    MA 02111-1307, USA
 
 Also add information on how to contact you by electronic and paper mail.
 
diff --git a/intl/ChangeLog b/intl/ChangeLog
index 84e2b37..c75d30c 100644
--- a/intl/ChangeLog
+++ b/intl/ChangeLog
@@ -1,4 +1,4 @@
-2001-09-13  GNU  <bug-gnu-utils@gnu.org>
+2002-04-24  GNU  <bug-gnu-gettext@gnu.org>
 
-	* Version 0.10.40 released.
+	* Version 0.11.2 released.
 
diff --git a/intl/Makefile.in b/intl/Makefile.in
index 19ed4a7..5b1cf2f 100644
--- a/intl/Makefile.in
+++ b/intl/Makefile.in
@@ -1,5 +1,5 @@
 # Makefile for directory with message catalog handling in GNU NLS Utilities.
-# Copyright (C) 1995-1998, 2000, 2001 Free Software Foundation, Inc.
+# Copyright (C) 1995-1998, 2000-2002 Free Software Foundation, Inc.
 #
 # This program is free software; you can redistribute it and/or modify it
 # under the terms of the GNU Library General Public License as published
@@ -52,38 +52,39 @@ YACC = @INTLBISON@ -y -d
 YFLAGS = --name-prefix=__gettext
 
 DEFS = -DLOCALEDIR=\"$(localedir)\" -DLOCALE_ALIAS_PATH=\"$(aliaspath)\" \
--DLIBDIR=\"$(libdir)\" @DEFS@
+-DLIBDIR=\"$(libdir)\" -DIN_LIBINTL @DEFS@
 CPPFLAGS = @CPPFLAGS@
 CFLAGS = @CFLAGS@
 LDFLAGS = @LDFLAGS@
 
 COMPILE = $(CC) -c $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS) $(XCFLAGS)
 
-HEADERS = $(COMHDRS) libgnuintl.h libgettext.h loadinfo.h
-COMHDRS = gettext.h gettextP.h hash-string.h
+HEADERS = $(COMHDRS) libgnuintl.h loadinfo.h
+COMHDRS = gmo.h gettextP.h hash-string.h plural-exp.h eval-plural.h os2compat.h
 SOURCES = $(COMSRCS) intl-compat.c
 COMSRCS = bindtextdom.c dcgettext.c dgettext.c gettext.c \
 finddomain.c loadmsgcat.c localealias.c textdomain.c l10nflist.c \
 explodename.c dcigettext.c dcngettext.c dngettext.c ngettext.c plural.y \
-localcharset.c
+plural-exp.c localcharset.c localename.c osdep.c os2compat.c
 OBJECTS = @INTLOBJS@ bindtextdom.$lo dcgettext.$lo dgettext.$lo gettext.$lo \
 finddomain.$lo loadmsgcat.$lo localealias.$lo textdomain.$lo l10nflist.$lo \
 explodename.$lo dcigettext.$lo dcngettext.$lo dngettext.$lo ngettext.$lo \
-plural.$lo localcharset.$lo
+plural.$lo plural-exp.$lo localcharset.$lo localename.$lo osdep.$lo
 GETTOBJS = intl-compat.$lo
 DISTFILES.common = Makefile.in \
 config.charset locale.alias ref-add.sin ref-del.sin $(HEADERS) $(SOURCES)
 DISTFILES.generated = plural.c
 DISTFILES.normal = VERSION
-DISTFILES.gettext = COPYING.LIB-2 COPYING.LIB-2.1 libintl.glibc
-DISTFILES.obsolete = xopen-msg.sed linux-msg.sed po2tbl.sed.in cat-compat.c
+DISTFILES.gettext = COPYING.LIB-2.0 COPYING.LIB-2.1 libintl.glibc
+DISTFILES.obsolete = xopen-msg.sed linux-msg.sed po2tbl.sed.in cat-compat.c \
+COPYING.LIB-2 gettext.h libgettext.h plural-eval.c
 
 # Libtool's library version information for libintl.
 # Before making a gettext release, the gettext maintainer must change this
 # according to the libtool documentation, section "Library interface versions".
 # Maintainers of other packages that include the intl directory must *not*
 # change these values.
-LTV_CURRENT=1
+LTV_CURRENT=2
 LTV_REVISION=1
 LTV_AGE=0
 
@@ -118,7 +119,7 @@ libintl.a libgnuintl.a: $(OBJECTS)
 libintl.la libgnuintl.la: $(OBJECTS)
 	$(LIBTOOL) --mode=link \
 	  $(CC) $(CPPFLAGS) $(CFLAGS) $(XCFLAGS) $(LDFLAGS) -o $@ \
-	  $(OBJECTS) @LIBICONV@ \
+	  $(OBJECTS) @LTLIBICONV@ -lc \
 	  -version-info $(LTV_CURRENT):$(LTV_REVISION):$(LTV_AGE) \
 	  -rpath $(libdir) \
 	  -no-undefined
@@ -152,7 +153,7 @@ install-exec: all
 	  : ; \
 	fi
 	if test '@USE_INCLUDED_LIBINTL@' = yes; then \
-	  $(mkinstalldirs) $(DESTDIR)$(libdir); \
+	  test @GLIBC21@ != no || $(mkinstalldirs) $(DESTDIR)$(libdir); \
 	  temp=$(DESTDIR)$(libdir)/t-charset.alias; \
 	  dest=$(DESTDIR)$(libdir)/charset.alias; \
 	  if test -f $(DESTDIR)$(libdir)/charset.alias; then \
@@ -185,7 +186,7 @@ install-data: all
 	  $(mkinstalldirs) $(DESTDIR)$(gettextsrcdir); \
 	  $(INSTALL_DATA) VERSION $(DESTDIR)$(gettextsrcdir)/VERSION; \
 	  $(INSTALL_DATA) ChangeLog.inst $(DESTDIR)$(gettextsrcdir)/ChangeLog; \
-	  dists="COPYING.LIB-2 COPYING.LIB-2.1 $(DISTFILES.common)"; \
+	  dists="COPYING.LIB-2.0 COPYING.LIB-2.1 $(DISTFILES.common)"; \
 	  for file in $$dists; do \
 	    $(INSTALL_DATA) $(srcdir)/$$file \
 			    $(DESTDIR)$(gettextsrcdir)/$$file; \
@@ -205,6 +206,27 @@ install-data: all
 	  : ; \
 	fi
 
+install-strip: install
+
+installdirs:
+	if test "$(PACKAGE)" = "gettext" \
+	   && test '@INTLOBJS@' = '$(GETTOBJS)'; then \
+	  $(mkinstalldirs) $(DESTDIR)$(libdir) $(DESTDIR)$(includedir); \
+	else \
+	  : ; \
+	fi
+	if test '@USE_INCLUDED_LIBINTL@' = yes; then \
+	  test @GLIBC21@ != no || $(mkinstalldirs) $(DESTDIR)$(libdir); \
+	  $(mkinstalldirs) $(DESTDIR)$(localedir); \
+	else \
+	  : ; \
+	fi
+	if test "$(PACKAGE)" = "gettext"; then \
+	  $(mkinstalldirs) $(DESTDIR)$(gettextsrcdir); \
+	else \
+	  : ; \
+	fi
+
 # Define this as empty until I found a useful application.
 installcheck:
 
@@ -244,7 +266,7 @@ uninstall:
 	  : ; \
 	fi
 	if test "$(PACKAGE)" = "gettext"; then \
-	  for file in VERSION ChangeLog COPYING.LIB-2 COPYING.LIB-2.1 $(DISTFILES.common) $(DISTFILES.generated); do \
+	  for file in VERSION ChangeLog COPYING.LIB-2.0 COPYING.LIB-2.1 $(DISTFILES.common) $(DISTFILES.generated); do \
 	    rm -f $(DESTDIR)$(gettextsrcdir)/$$file; \
 	  done; \
 	else \
@@ -254,8 +276,11 @@ uninstall:
 info dvi:
 
 $(OBJECTS): ../config.h libgnuintl.h
-bindtextdom.$lo finddomain.$lo loadmsgcat.$lo: gettextP.h gettext.h loadinfo.h
-dcgettext.$lo: gettextP.h gettext.h hash-string.h loadinfo.h
+bindtextdom.$lo dcgettext.$lo dcigettext.$lo dcngettext.$lo dgettext.$lo dngettext.$lo finddomain.$lo gettext.$lo intl-compat.$lo loadmsgcat.$lo localealias.$lo ngettext.$lo textdomain.$lo: gettextP.h gmo.h loadinfo.h
+dcigettext.$lo: hash-string.h
+explodename.$lo l10nflist.$lo: loadinfo.h
+dcigettext.$lo loadmsgcat.$lo plural.$lo plural-exp.$lo: plural-exp.h
+dcigettext.$lo: eval-plural.h
 
 tags: TAGS
 
@@ -300,8 +325,7 @@ dist distdir: Makefile
 	$(MAKE) $(DISTFILES.common) $(DISTFILES.generated) $$additional; \
 	for file in ChangeLog $(DISTFILES.common) $(DISTFILES.generated) $$additional; do \
 	  if test -f $$file; then dir=.; else dir=$(srcdir); fi; \
-	  ln $$dir/$$file $(distdir) 2> /dev/null \
-	    || cp -p $$dir/$$file $(distdir); \
+	  cp -p $$dir/$$file $(distdir); \
 	done
 
 Makefile: Makefile.in ../config.status
diff --git a/intl/VERSION b/intl/VERSION
index cb8a01a..657e73b 100644
--- a/intl/VERSION
+++ b/intl/VERSION
@@ -1 +1 @@
-GNU gettext library from gettext-0.10.40
+GNU gettext library from gettext-0.11.2
diff --git a/intl/bindtextdom.c b/intl/bindtextdom.c
index c6a9bd1..a3c233d 100644
--- a/intl/bindtextdom.c
+++ b/intl/bindtextdom.c
@@ -1,5 +1,5 @@
 /* Implementation of the bindtextdomain(3) function
-   Copyright (C) 1995-1998, 2000, 2001 Free Software Foundation, Inc.
+   Copyright (C) 1995-1998, 2000, 2001, 2002 Free Software Foundation, Inc.
 
    This program is free software; you can redistribute it and/or modify it
    under the terms of the GNU Library General Public License as published
@@ -63,7 +63,7 @@ extern const char _nl_default_dirname[];
 extern struct binding *_nl_domain_bindings;
 
 /* Lock variable to protect the global data in the gettext implementation.  */
-__libc_rwlock_define (extern, _nl_state_lock)
+__libc_rwlock_define (extern, _nl_state_lock attribute_hidden)
 
 
 /* Names for the libintl functions are a problem.  They must not clash
@@ -85,7 +85,7 @@ __libc_rwlock_define (extern, _nl_state_lock)
 static void set_binding_values PARAMS ((const char *domainname,
 					const char **dirnamep,
 					const char **codesetp));
-     
+
 /* Specifies the directory name *DIRNAMEP and the output codeset *CODESETP
    to be used for the DOMAINNAME message catalog.
    If *DIRNAMEP or *CODESETP is NULL, the corresponding attribute is not
diff --git a/intl/config.charset b/intl/config.charset
index f4f2611..0a1a68d 100755
--- a/intl/config.charset
+++ b/intl/config.charset
@@ -1,7 +1,7 @@
 #! /bin/sh
 # Output a system dependent table of character encoding aliases.
 #
-#   Copyright (C) 2000-2001 Free Software Foundation, Inc.
+#   Copyright (C) 2000-2002 Free Software Foundation, Inc.
 #
 #   This program is free software; you can redistribute it and/or modify it
 #   under the terms of the GNU Library General Public License as published
@@ -235,10 +235,12 @@ case "$os" in
 	#echo "sun_eu_greek ?" # what is this?
 	echo "UTF-8 UTF-8"
 	;;
-    freebsd*)
+    freebsd* | os2*)
 	# FreeBSD 4.2 doesn't have nl_langinfo(CODESET); therefore
 	# localcharset.c falls back to using the full locale name
 	# from the environment variables.
+	# Likewise for OS/2. OS/2 has XFree86 just like FreeBSD. Just
+	# reuse FreeBSD's locale data for OS/2.
 	echo "C ASCII"
 	echo "US-ASCII ASCII"
 	for l in la_LN lt_LN; do
@@ -270,6 +272,20 @@ case "$os" in
 	echo "ja_JP.Shift_JIS SHIFT_JIS"
 	echo "ko_KR.EUC EUC-KR"
 	;;
+    netbsd*)
+	echo "646 ASCII"
+	echo "ISO8859-1 ISO-8859-1"
+	echo "ISO8859-2 ISO-8859-2"
+	echo "ISO8859-4 ISO-8859-4"
+	echo "ISO8859-5 ISO-8859-5"
+	echo "ISO8859-15 ISO-8859-15"
+	echo "eucCN GB2312"
+	echo "eucJP EUC-JP"
+	echo "eucKR EUC-KR"
+	echo "eucTW EUC-TW"
+	echo "BIG5 BIG5"
+	echo "SJIS SHIFT_JIS"
+	;;
     beos*)
 	# BeOS has a single locale, and it has UTF-8 encoding.
 	echo "* UTF-8"
@@ -394,8 +410,8 @@ case "$os" in
 	echo "bg_BG CP866" # not CP855 ??
 	echo "mk CP866"    # not CP855 ??
 	echo "mk_MK CP866" # not CP855 ??
-	echo "ru KOI8-R"    # not CP866 ??
-	echo "ru_RU KOI8-R" # not CP866 ??
+	echo "ru CP866"
+	echo "ru_RU CP866"
 	# ISO-8859-6 languages
 	echo "ar CP864"
 	echo "ar_AE CP864"
diff --git a/intl/dcgettext.c b/intl/dcgettext.c
index b7c9652..70ee3ba 100644
--- a/intl/dcgettext.c
+++ b/intl/dcgettext.c
@@ -1,5 +1,5 @@
 /* Implementation of the dcgettext(3) function.
-   Copyright (C) 1995-1999, 2000, 2001 Free Software Foundation, Inc.
+   Copyright (C) 1995-1999, 2000, 2001, 2002 Free Software Foundation, Inc.
 
    This program is free software; you can redistribute it and/or modify it
    under the terms of the GNU Library General Public License as published
@@ -54,5 +54,6 @@ DCGETTEXT (domainname, msgid, category)
 
 #ifdef _LIBC
 /* Alias for function name in GNU C Library.  */
+INTDEF(__dcgettext)
 weak_alias (__dcgettext, dcgettext);
 #endif
diff --git a/intl/dcigettext.c b/intl/dcigettext.c
index 6acde19..afbb181 100644
--- a/intl/dcigettext.c
+++ b/intl/dcigettext.c
@@ -1,5 +1,5 @@
 /* Implementation of the internal dcigettext function.
-   Copyright (C) 1995-1999, 2000, 2001 Free Software Foundation, Inc.
+   Copyright (C) 1995-1999, 2000-2002 Free Software Foundation, Inc.
 
    This program is free software; you can redistribute it and/or modify it
    under the terms of the GNU Library General Public License as published
@@ -56,13 +56,7 @@ extern int errno;
 
 #include <stddef.h>
 #include <stdlib.h>
-
 #include <string.h>
-#if !HAVE_STRCHR && !defined _LIBC
-# ifndef strchr
-#  define strchr index
-# endif
-#endif
 
 #if defined HAVE_UNISTD_H || defined _LIBC
 # include <unistd.h>
@@ -75,6 +69,7 @@ extern int errno;
 #endif
 
 #include "gettextP.h"
+#include "plural-exp.h"
 #ifdef _LIBC
 # include <libintl.h>
 #else
@@ -198,16 +193,6 @@ static void *mempcpy PARAMS ((void *dest, const void *src, size_t n));
 # define IS_PATH_WITH_DIR(P) (strchr (P, '/') != NULL)
 #endif
 
-/* XPG3 defines the result of `setlocale (category, NULL)' as:
-   ``Directs `setlocale()' to query `category' and return the current
-     setting of `local'.''
-   However it does not specify the exact format.  Neither do SUSV2 and
-   ISO C 99.  So we can use this feature only on selected systems (e.g.
-   those using GNU C Library).  */
-#if defined _LIBC || (defined __GNU_LIBRARY__ && __GNU_LIBRARY__ >= 2)
-# define HAVE_LOCALE_NULL
-#endif
-
 /* This is the type used for the search tree where known translations
    are stored.  */
 struct known_translation_t
@@ -274,13 +259,18 @@ transcmp (p1, p2)
 
 /* Name of the default domain used for gettext(3) prior any call to
    textdomain(3).  The default value for this is "messages".  */
-const char _nl_default_default_domain[] = "messages";
+const char _nl_default_default_domain[] attribute_hidden = "messages";
 
 /* Value used as the default domain for gettext(3).  */
-const char *_nl_current_default_domain = _nl_default_default_domain;
+const char *_nl_current_default_domain attribute_hidden
+     = _nl_default_default_domain;
 
 /* Contains the default location of the message catalogs.  */
+#if defined __EMX__
+extern const char _nl_default_dirname[];
+#else
 const char _nl_default_dirname[] = LOCALEDIR;
+#endif
 
 /* List with bindings of specific domains created by bindtextdomain()
    calls.  */
@@ -292,9 +282,6 @@ static char *plural_lookup PARAMS ((struct loaded_l10nfile *domain,
 				    const char *translation,
 				    size_t translation_len))
      internal_function;
-static unsigned long int plural_eval PARAMS ((struct expression *pexp,
-					      unsigned long int n))
-     internal_function;
 static const char *category_to_name PARAMS ((int category)) internal_function;
 static const char *guess_category_value PARAMS ((int category,
 						 const char *categoryname))
@@ -362,7 +349,7 @@ typedef unsigned char transmem_block_t;
 
 /* Lock variable to protect the global data in the gettext implementation.  */
 #ifdef _LIBC
-__libc_rwlock_define_initialized (, _nl_state_lock)
+__libc_rwlock_define_initialized (, _nl_state_lock attribute_hidden)
 #endif
 
 /* Checking whether the binaries runs SUID must be done and glibc provides
@@ -395,6 +382,9 @@ static int enable_secure;
     }
 #endif
 
+/* Get the function to evaluate the plural expression.  */
+#include "eval-plural.h"
+
 /* Look up MSGID in the DOMAINNAME message catalog for the current
    CATEGORY locale and, if PLURAL is nonzero, search over string
    depending on the plural form determined by N.  */
@@ -438,6 +428,12 @@ DCIGETTEXT (domainname, msgid1, msgid2, plural, n, category)
   if (domainname == NULL)
     domainname = _nl_current_default_domain;
 
+  /* OS/2 specific: backward compatibility with older libintl versions  */
+#ifdef LC_MESSAGES_COMPAT
+  if (category == LC_MESSAGES_COMPAT)
+    category = LC_MESSAGES;
+#endif
+
 #if defined HAVE_TSEARCH || defined _LIBC
   msgid_len = strlen (msgid1) + 1;
 
@@ -1005,87 +1001,6 @@ plural_lookup (domain, n, translation, translation_len)
 }
 
 
-/* Function to evaluate the plural expression and return an index value.  */
-static unsigned long int
-internal_function
-plural_eval (pexp, n)
-     struct expression *pexp;
-     unsigned long int n;
-{
-  switch (pexp->nargs)
-    {
-    case 0:
-      switch (pexp->operation)
-	{
-	case var:
-	  return n;
-	case num:
-	  return pexp->val.num;
-	default:
-	  break;
-	}
-      /* NOTREACHED */
-      break;
-    case 1:
-      {
-	/* pexp->operation must be lnot.  */
-	unsigned long int arg = plural_eval (pexp->val.args[0], n);
-	return ! arg;
-      }
-    case 2:
-      {
-	unsigned long int leftarg = plural_eval (pexp->val.args[0], n);
-	if (pexp->operation == lor)
-	  return leftarg || plural_eval (pexp->val.args[1], n);
-	else if (pexp->operation == land)
-	  return leftarg && plural_eval (pexp->val.args[1], n);
-	else
-	  {
-	    unsigned long int rightarg = plural_eval (pexp->val.args[1], n);
-
-	    switch (pexp->operation)
-	      {
-	      case mult:
-		return leftarg * rightarg;
-	      case divide:
-		return leftarg / rightarg;
-	      case module:
-		return leftarg % rightarg;
-	      case plus:
-		return leftarg + rightarg;
-	      case minus:
-		return leftarg - rightarg;
-	      case less_than:
-		return leftarg < rightarg;
-	      case greater_than:
-		return leftarg > rightarg;
-	      case less_or_equal:
-		return leftarg <= rightarg;
-	      case greater_or_equal:
-		return leftarg >= rightarg;
-	      case equal:
-		return leftarg == rightarg;
-	      case not_equal:
-		return leftarg != rightarg;
-	      default:
-		break;
-	      }
-	  }
-	/* NOTREACHED */
-	break;
-      }
-    case 3:
-      {
-	/* pexp->operation must be qmop.  */
-	unsigned long int boolarg = plural_eval (pexp->val.args[0], n);
-	return plural_eval (pexp->val.args[boolarg ? 1 : 2], n);
-      }
-    }
-  /* NOTREACHED */
-  return 0;
-}
-
-
 /* Return string representation of locale CATEGORY.  */
 static const char *
 internal_function
@@ -1166,27 +1081,21 @@ guess_category_value (category, categoryname)
   /* We have to proceed with the POSIX methods of looking to `LC_ALL',
      `LC_xxx', and `LANG'.  On some systems this can be done by the
      `setlocale' function itself.  */
-#if defined _LIBC || (defined HAVE_SETLOCALE && defined HAVE_LC_MESSAGES && defined HAVE_LOCALE_NULL)
+#ifdef _LIBC
   retval = setlocale (category, NULL);
 #else
-  /* Setting of LC_ALL overwrites all other.  */
-  retval = getenv ("LC_ALL");
-  if (retval == NULL || retval[0] == '\0')
-    {
-      /* Next comes the name of the desired category.  */
-      retval = getenv (categoryname);
-      if (retval == NULL || retval[0] == '\0')
-	{
-	  /* Last possibility is the LANG environment variable.  */
-	  retval = getenv ("LANG");
-	  if (retval == NULL || retval[0] == '\0')
-	    /* We use C as the default domain.  POSIX says this is
-	       implementation defined.  */
-	    return "C";
-	}
-    }
+  retval = _nl_locale_name (category, categoryname);
 #endif
 
+  /* Ignore LANGUAGE if the locale is set to "C" because
+     1. "C" locale usually uses the ASCII encoding, and most international
+	messages use non-ASCII characters. These characters get displayed
+	as question marks (if using glibc's iconv()) or as invalid 8-bit
+	characters (because other iconv()s refuse to convert most non-ASCII
+	characters to ASCII). In any case, the output is ugly.
+     2. The precise output of some programs in the "C" locale is specified
+	by POSIX and should not depend on environment variables like
+	"LANGUAGE".  We allow such programs to use gettext().  */
   return language != NULL && strcmp (retval, "C") != 0 ? language : retval;
 }
 
diff --git a/intl/dcngettext.c b/intl/dcngettext.c
index c16af21..d31ff9b 100644
--- a/intl/dcngettext.c
+++ b/intl/dcngettext.c
@@ -1,5 +1,5 @@
 /* Implementation of the dcngettext(3) function.
-   Copyright (C) 1995-1999, 2000, 2001 Free Software Foundation, Inc.
+   Copyright (C) 1995-1999, 2000, 2001, 2002 Free Software Foundation, Inc.
 
    This program is free software; you can redistribute it and/or modify it
    under the terms of the GNU Library General Public License as published
@@ -56,5 +56,6 @@ DCNGETTEXT (domainname, msgid1, msgid2, n, category)
 
 #ifdef _LIBC
 /* Alias for function name in GNU C Library.  */
+INTDEF(__dcngettext)
 weak_alias (__dcngettext, dcngettext);
 #endif
diff --git a/intl/dgettext.c b/intl/dgettext.c
index 3651207..17b0442 100644
--- a/intl/dgettext.c
+++ b/intl/dgettext.c
@@ -1,5 +1,5 @@
 /* Implementation of the dgettext(3) function.
-   Copyright (C) 1995-1997, 2000, 2001 Free Software Foundation, Inc.
+   Copyright (C) 1995-1997, 2000, 2001, 2002 Free Software Foundation, Inc.
 
    This program is free software; you can redistribute it and/or modify it
    under the terms of the GNU Library General Public License as published
@@ -37,7 +37,7 @@
    prefix.  So we have to make a difference here.  */
 #ifdef _LIBC
 # define DGETTEXT __dgettext
-# define DCGETTEXT __dcgettext
+# define DCGETTEXT INTUSE(__dcgettext)
 #else
 # define DGETTEXT dgettext__
 # define DCGETTEXT dcgettext__
diff --git a/intl/dngettext.c b/intl/dngettext.c
index f214e95..2b9ff88 100644
--- a/intl/dngettext.c
+++ b/intl/dngettext.c
@@ -1,5 +1,5 @@
 /* Implementation of the dngettext(3) function.
-   Copyright (C) 1995-1997, 2000, 2001 Free Software Foundation, Inc.
+   Copyright (C) 1995-1997, 2000, 2001, 2002 Free Software Foundation, Inc.
 
    This program is free software; you can redistribute it and/or modify it
    under the terms of the GNU Library General Public License as published
@@ -37,7 +37,7 @@
    prefix.  So we have to make a difference here.  */
 #ifdef _LIBC
 # define DNGETTEXT __dngettext
-# define DCNGETTEXT __dcngettext
+# define DCNGETTEXT INTUSE(__dcngettext)
 #else
 # define DNGETTEXT dngettext__
 # define DCNGETTEXT dcngettext__
diff --git a/intl/eval-plural.h b/intl/eval-plural.h
new file mode 100644
index 0000000..44f4934
--- /dev/null
+++ b/intl/eval-plural.h
@@ -0,0 +1,106 @@
+/* Plural expression evaluation.
+   Copyright (C) 2000-2002 Free Software Foundation, Inc.
+
+   This program is free software; you can redistribute it and/or modify it
+   under the terms of the GNU Library General Public License as published
+   by the Free Software Foundation; either version 2, or (at your option)
+   any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   Library General Public License for more details.
+
+   You should have received a copy of the GNU Library General Public
+   License along with this program; if not, write to the Free Software
+   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
+   USA.  */
+
+#ifndef STATIC
+#define STATIC static
+#endif
+
+/* Evaluate the plural expression and return an index value.  */
+STATIC unsigned long int plural_eval PARAMS ((struct expression *pexp,
+					      unsigned long int n))
+     internal_function;
+
+STATIC
+unsigned long int
+internal_function
+plural_eval (pexp, n)
+     struct expression *pexp;
+     unsigned long int n;
+{
+  switch (pexp->nargs)
+    {
+    case 0:
+      switch (pexp->operation)
+	{
+	case var:
+	  return n;
+	case num:
+	  return pexp->val.num;
+	default:
+	  break;
+	}
+      /* NOTREACHED */
+      break;
+    case 1:
+      {
+	/* pexp->operation must be lnot.  */
+	unsigned long int arg = plural_eval (pexp->val.args[0], n);
+	return ! arg;
+      }
+    case 2:
+      {
+	unsigned long int leftarg = plural_eval (pexp->val.args[0], n);
+	if (pexp->operation == lor)
+	  return leftarg || plural_eval (pexp->val.args[1], n);
+	else if (pexp->operation == land)
+	  return leftarg && plural_eval (pexp->val.args[1], n);
+	else
+	  {
+	    unsigned long int rightarg = plural_eval (pexp->val.args[1], n);
+
+	    switch (pexp->operation)
+	      {
+	      case mult:
+		return leftarg * rightarg;
+	      case divide:
+		return leftarg / rightarg;
+	      case module:
+		return leftarg % rightarg;
+	      case plus:
+		return leftarg + rightarg;
+	      case minus:
+		return leftarg - rightarg;
+	      case less_than:
+		return leftarg < rightarg;
+	      case greater_than:
+		return leftarg > rightarg;
+	      case less_or_equal:
+		return leftarg <= rightarg;
+	      case greater_or_equal:
+		return leftarg >= rightarg;
+	      case equal:
+		return leftarg == rightarg;
+	      case not_equal:
+		return leftarg != rightarg;
+	      default:
+		break;
+	      }
+	  }
+	/* NOTREACHED */
+	break;
+      }
+    case 3:
+      {
+	/* pexp->operation must be qmop.  */
+	unsigned long int boolarg = plural_eval (pexp->val.args[0], n);
+	return plural_eval (pexp->val.args[boolarg ? 1 : 2], n);
+      }
+    }
+  /* NOTREACHED */
+  return 0;
+}
diff --git a/intl/gettext.c b/intl/gettext.c
index 22a6c24..e52d8ae 100644
--- a/intl/gettext.c
+++ b/intl/gettext.c
@@ -1,5 +1,5 @@
 /* Implementation of gettext(3) function.
-   Copyright (C) 1995, 1997, 2000, 2001 Free Software Foundation, Inc.
+   Copyright (C) 1995, 1997, 2000, 2001, 2002 Free Software Foundation, Inc.
 
    This program is free software; you can redistribute it and/or modify it
    under the terms of the GNU Library General Public License as published
@@ -42,7 +42,7 @@
    prefix.  So we have to make a difference here.  */
 #ifdef _LIBC
 # define GETTEXT __gettext
-# define DCGETTEXT __dcgettext
+# define DCGETTEXT INTUSE(__dcgettext)
 #else
 # define GETTEXT gettext__
 # define DCGETTEXT dcgettext__
diff --git a/intl/gettextP.h b/intl/gettextP.h
index 43de1cd..4e3a5b2 100644
--- a/intl/gettextP.h
+++ b/intl/gettextP.h
@@ -1,5 +1,5 @@
 /* Header describing internals of libintl library.
-   Copyright (C) 1995-1999, 2000, 2001 Free Software Foundation, Inc.
+   Copyright (C) 1995-1999, 2000-2002 Free Software Foundation, Inc.
    Written by Ulrich Drepper <drepper@cygnus.com>, 1995.
 
    This program is free software; you can redistribute it and/or modify it
@@ -32,12 +32,12 @@
 
 #include "loadinfo.h"
 
-#include "gettext.h"		/* Get nls_uint32.  */
+#include "gmo.h"		/* Get nls_uint32.  */
 
 /* @@ end of prolog @@ */
 
 #ifndef PARAMS
-# if __STDC__
+# if __STDC__ || defined __GNUC__ || defined __SUNPRO_C || defined __cplusplus || __PROTOTYPES
 #  define PARAMS(args) args
 # else
 #  define PARAMS(args) ()
@@ -48,6 +48,10 @@
 # define internal_function
 #endif
 
+#ifndef attribute_hidden
+# define attribute_hidden
+#endif
+
 /* Tell the compiler when a conditional or integer expression is
    almost always true or almost always false.  */
 #ifndef HAVE_BUILTIN_EXPECT
@@ -72,51 +76,6 @@ SWAP (i)
 #endif
 
 
-/* This is the representation of the expressions to determine the
-   plural form.  */
-struct expression
-{
-  int nargs;			/* Number of arguments.  */
-  enum operator
-  {
-    /* Without arguments:  */
-    var,			/* The variable "n".  */
-    num,			/* Decimal number.  */
-    /* Unary operators:  */
-    lnot,			/* Logical NOT.  */
-    /* Binary operators:  */
-    mult,			/* Multiplication.  */
-    divide,			/* Division.  */
-    module,			/* Module operation.  */
-    plus,			/* Addition.  */
-    minus,			/* Subtraction.  */
-    less_than,			/* Comparison.  */
-    greater_than,		/* Comparison.  */
-    less_or_equal,		/* Comparison.  */
-    greater_or_equal,		/* Comparison.  */
-    equal,			/* Comparision for equality.  */
-    not_equal,			/* Comparision for inequality.  */
-    land,			/* Logical AND.  */
-    lor,			/* Logical OR.  */
-    /* Ternary operators:  */
-    qmop			/* Question mark operator.  */
-  } operation;
-  union
-  {
-    unsigned long int num;	/* Number value for `num'.  */
-    struct expression *args[3];	/* Up to three arguments.  */
-  } val;
-};
-
-/* This is the data structure to pass information to the parser and get
-   the result in a thread-safe way.  */
-struct parse_args
-{
-  const char *cp;
-  struct expression *res;
-};
-
-
 /* The representation of an opened message catalog.  */
 struct loaded_domain
 {
@@ -167,6 +126,10 @@ struct binding
    This variable is part of the external ABI of the GNU libintl.  */
 extern int _nl_msg_cat_cntr;
 
+#ifndef _LIBC
+const char *_nl_locale_name PARAMS ((int category, const char *categoryname));
+#endif
+
 struct loaded_l10nfile *_nl_find_domain PARAMS ((const char *__dirname,
 						 char *__locale,
 						 const char *__domainname,
@@ -237,16 +200,6 @@ extern char *bind_textdomain_codeset__ PARAMS ((const char *__domainname,
 						const char *__codeset));
 #endif
 
-#ifdef _LIBC
-extern void __gettext_free_exp PARAMS ((struct expression *exp))
-     internal_function;
-extern int __gettextparse PARAMS ((void *arg));
-#else
-extern void gettext_free_exp__ PARAMS ((struct expression *exp))
-     internal_function;
-extern int gettextparse__ PARAMS ((void *arg));
-#endif
-
 /* @@ begin of epilog @@ */
 
 #endif /* gettextP.h  */
diff --git a/intl/gmo.h b/intl/gmo.h
new file mode 100644
index 0000000..f05ae47
--- /dev/null
+++ b/intl/gmo.h
@@ -0,0 +1,100 @@
+/* Description of GNU message catalog format: general file layout.
+   Copyright (C) 1995, 1997, 2000, 2001 Free Software Foundation, Inc.
+
+   This program is free software; you can redistribute it and/or modify it
+   under the terms of the GNU Library General Public License as published
+   by the Free Software Foundation; either version 2, or (at your option)
+   any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   Library General Public License for more details.
+
+   You should have received a copy of the GNU Library General Public
+   License along with this program; if not, write to the Free Software
+   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
+   USA.  */
+
+#ifndef _GETTEXT_H
+#define _GETTEXT_H 1
+
+#include <limits.h>
+
+/* @@ end of prolog @@ */
+
+/* The magic number of the GNU message catalog format.  */
+#define _MAGIC 0x950412de
+#define _MAGIC_SWAPPED 0xde120495
+
+/* Revision number of the currently used .mo (binary) file format.  */
+#define MO_REVISION_NUMBER 0
+
+/* The following contortions are an attempt to use the C preprocessor
+   to determine an unsigned integral type that is 32 bits wide.  An
+   alternative approach is to use autoconf's AC_CHECK_SIZEOF macro, but
+   as of version autoconf-2.13, the AC_CHECK_SIZEOF macro doesn't work
+   when cross-compiling.  */
+
+#if __STDC__
+# define UINT_MAX_32_BITS 4294967295U
+#else
+# define UINT_MAX_32_BITS 0xFFFFFFFF
+#endif
+
+/* If UINT_MAX isn't defined, assume it's a 32-bit type.
+   This should be valid for all systems GNU cares about because
+   that doesn't include 16-bit systems, and only modern systems
+   (that certainly have <limits.h>) have 64+-bit integral types.  */
+
+#ifndef UINT_MAX
+# define UINT_MAX UINT_MAX_32_BITS
+#endif
+
+#if UINT_MAX == UINT_MAX_32_BITS
+typedef unsigned nls_uint32;
+#else
+# if USHRT_MAX == UINT_MAX_32_BITS
+typedef unsigned short nls_uint32;
+# else
+#  if ULONG_MAX == UINT_MAX_32_BITS
+typedef unsigned long nls_uint32;
+#  else
+  /* The following line is intended to throw an error.  Using #error is
+     not portable enough.  */
+  "Cannot determine unsigned 32-bit data type."
+#  endif
+# endif
+#endif
+
+
+/* Header for binary .mo file format.  */
+struct mo_file_header
+{
+  /* The magic number.  */
+  nls_uint32 magic;
+  /* The revision number of the file format.  */
+  nls_uint32 revision;
+  /* The number of strings pairs.  */
+  nls_uint32 nstrings;
+  /* Offset of table with start offsets of original strings.  */
+  nls_uint32 orig_tab_offset;
+  /* Offset of table with start offsets of translation strings.  */
+  nls_uint32 trans_tab_offset;
+  /* Size of hashing table.  */
+  nls_uint32 hash_tab_size;
+  /* Offset of first hashing entry.  */
+  nls_uint32 hash_tab_offset;
+};
+
+struct string_desc
+{
+  /* Length of addressed string.  */
+  nls_uint32 length;
+  /* Offset of string in file.  */
+  nls_uint32 offset;
+};
+
+/* @@ begin of epilog @@ */
+
+#endif	/* gettext.h  */
diff --git a/intl/hash-string.h b/intl/hash-string.h
index ccb7acc..b267a87 100644
--- a/intl/hash-string.h
+++ b/intl/hash-string.h
@@ -19,7 +19,7 @@
 /* @@ end of prolog @@ */
 
 #ifndef PARAMS
-# if __STDC__
+# if __STDC__ || defined __GNUC__ || defined __SUNPRO_C || defined __cplusplus || __PROTOTYPES
 #  define PARAMS(Args) Args
 # else
 #  define PARAMS(Args) ()
diff --git a/intl/l10nflist.c b/intl/l10nflist.c
index 533e94b..d861912 100644
--- a/intl/l10nflist.c
+++ b/intl/l10nflist.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1995-1999, 2000, 2001 Free Software Foundation, Inc.
+/* Copyright (C) 1995-1999, 2000, 2001, 2002 Free Software Foundation, Inc.
    Contributed by Ulrich Drepper <drepper@gnu.ai.mit.edu>, 1995.
 
    This program is free software; you can redistribute it and/or modify it
@@ -28,11 +28,6 @@
 #endif
 
 #include <string.h>
-#if !HAVE_STRCHR && !defined _LIBC
-# ifndef strchr
-#  define strchr index
-# endif
-#endif
 
 #if defined _LIBC || defined HAVE_ARGZ_H
 # include <argz.h>
@@ -90,6 +85,10 @@ argz_count__ (argz, len)
 }
 # undef __argz_count
 # define __argz_count(argz, len) argz_count__ (argz, len)
+#else
+# ifdef _LIBC
+#  define __argz_count(argz, len) INTUSE(__argz_count) (argz, len)
+# endif
 #endif	/* !_LIBC && !HAVE___ARGZ_COUNT */
 
 #if !defined _LIBC && !defined HAVE___ARGZ_STRINGIFY
@@ -114,6 +113,11 @@ argz_stringify__ (argz, len, sep)
 }
 # undef __argz_stringify
 # define __argz_stringify(argz, len, sep) argz_stringify__ (argz, len, sep)
+#else
+# ifdef _LIBC
+#  define __argz_stringify(argz, len, sep) \
+  INTUSE(__argz_stringify) (argz, len, sep)
+# endif
 #endif	/* !_LIBC && !HAVE___ARGZ_STRINGIFY */
 
 #if !defined _LIBC && !defined HAVE___ARGZ_NEXT
@@ -356,11 +360,11 @@ _nl_normalize_codeset (codeset, name_len)
   size_t cnt;
 
   for (cnt = 0; cnt < name_len; ++cnt)
-    if (isalnum (codeset[cnt]))
+    if (isalnum ((unsigned char) codeset[cnt]))
       {
 	++len;
 
-	if (isalpha (codeset[cnt]))
+	if (isalpha ((unsigned char) codeset[cnt]))
 	  only_digit = 0;
       }
 
@@ -374,9 +378,9 @@ _nl_normalize_codeset (codeset, name_len)
 	wp = retval;
 
       for (cnt = 0; cnt < name_len; ++cnt)
-	if (isalpha (codeset[cnt]))
-	  *wp++ = tolower (codeset[cnt]);
-	else if (isdigit (codeset[cnt]))
+	if (isalpha ((unsigned char) codeset[cnt]))
+	  *wp++ = tolower ((unsigned char) codeset[cnt]);
+	else if (isdigit ((unsigned char) codeset[cnt]))
 	  *wp++ = codeset[cnt];
 
       *wp = '\0';
diff --git a/intl/libgnuintl.h b/intl/libgnuintl.h
index f891deb..1387e70 100644
--- a/intl/libgnuintl.h
+++ b/intl/libgnuintl.h
@@ -1,5 +1,5 @@
 /* Message catalogs for internationalization.
-   Copyright (C) 1995-1997, 2000, 2001 Free Software Foundation, Inc.
+   Copyright (C) 1995-1997, 2000-2002 Free Software Foundation, Inc.
 
    This program is free software; you can redistribute it and/or modify it
    under the terms of the GNU Library General Public License as published
@@ -24,10 +24,11 @@
 /* The LC_MESSAGES locale category is the category used by the functions
    gettext() and dgettext().  It is specified in POSIX, but not in ANSI C.
    On systems that don't define it, use an arbitrary value instead.
-   On Solaris, <locale.h> defines __LOCALE_H then includes <libintl.h> (i.e.
-   this file!) and then only defines LC_MESSAGES.  To avoid a redefinition
-   warning, don't define LC_MESSAGES in this case.  */
-#if !defined LC_MESSAGES && !defined __LOCALE_H
+   On Solaris, <locale.h> defines __LOCALE_H (or _LOCALE_H in Solaris 2.5)
+   then includes <libintl.h> (i.e. this file!) and then only defines
+   LC_MESSAGES.  To avoid a redefinition warning, don't define LC_MESSAGES
+   in this case.  */
+#if !defined LC_MESSAGES && !(defined __LOCALE_H || (defined _LOCALE_H && defined __sun))
 # define LC_MESSAGES 1729
 #endif
 
@@ -42,11 +43,13 @@
 # define gettext gettext
 #endif
 
-#ifndef PARAMS
-# if __STDC__ || defined __cplusplus
-#  define PARAMS(args) args
+/* Use _INTL_PARAMS, not PARAMS, in order to avoid clashes with identifiers
+   used by programs.  Similarly, test __PROTOTYPES, not PROTOTYPES.  */
+#ifndef _INTL_PARAMS
+# if __STDC__ || defined __GNUC__ || defined __SUNPRO_C || defined __cplusplus || __PROTOTYPES
+#  define _INTL_PARAMS(args) args
 # else
-#  define PARAMS(args) ()
+#  define _INTL_PARAMS(args) ()
 # endif
 #endif
 
@@ -57,49 +60,56 @@ extern "C" {
 /* Look up MSGID in the current default message catalog for the current
    LC_MESSAGES locale.  If not found, returns MSGID itself (the default
    text).  */
-extern char *gettext PARAMS ((const char *__msgid));
+extern char *gettext _INTL_PARAMS ((const char *__msgid));
 
 /* Look up MSGID in the DOMAINNAME message catalog for the current
    LC_MESSAGES locale.  */
-extern char *dgettext PARAMS ((const char *__domainname, const char *__msgid));
+extern char *dgettext _INTL_PARAMS ((const char *__domainname,
+				     const char *__msgid));
 
 /* Look up MSGID in the DOMAINNAME message catalog for the current CATEGORY
    locale.  */
-extern char *dcgettext PARAMS ((const char *__domainname, const char *__msgid,
-				int __category));
+extern char *dcgettext _INTL_PARAMS ((const char *__domainname,
+				      const char *__msgid,
+				      int __category));
 
 
 /* Similar to `gettext' but select the plural form corresponding to the
    number N.  */
-extern char *ngettext PARAMS ((const char *__msgid1, const char *__msgid2,
-			       unsigned long int __n));
+extern char *ngettext _INTL_PARAMS ((const char *__msgid1,
+				     const char *__msgid2,
+				     unsigned long int __n));
 
 /* Similar to `dgettext' but select the plural form corresponding to the
    number N.  */
-extern char *dngettext PARAMS ((const char *__domainname, const char *__msgid1,
-				const char *__msgid2, unsigned long int __n));
+extern char *dngettext _INTL_PARAMS ((const char *__domainname,
+				      const char *__msgid1,
+				      const char *__msgid2,
+				      unsigned long int __n));
 
 /* Similar to `dcgettext' but select the plural form corresponding to the
    number N.  */
-extern char *dcngettext PARAMS ((const char *__domainname, const char *__msgid1,
-				 const char *__msgid2, unsigned long int __n,
-				 int __category));
+extern char *dcngettext _INTL_PARAMS ((const char *__domainname,
+				       const char *__msgid1,
+				       const char *__msgid2,
+				       unsigned long int __n,
+				       int __category));
 
 
 /* Set the current default message catalog to DOMAINNAME.
    If DOMAINNAME is null, return the current default.
    If DOMAINNAME is "", reset to the default of "messages".  */
-extern char *textdomain PARAMS ((const char *__domainname));
+extern char *textdomain _INTL_PARAMS ((const char *__domainname));
 
 /* Specify that the DOMAINNAME message catalog will be found
    in DIRNAME rather than in the system locale data base.  */
-extern char *bindtextdomain PARAMS ((const char *__domainname,
-				     const char *__dirname));
+extern char *bindtextdomain _INTL_PARAMS ((const char *__domainname,
+					   const char *__dirname));
 
 /* Specify the character encoding in which the messages from the
    DOMAINNAME message catalog will be returned.  */
-extern char *bind_textdomain_codeset PARAMS ((const char *__domainname,
-					      const char *__codeset));
+extern char *bind_textdomain_codeset _INTL_PARAMS ((const char *__domainname,
+						    const char *__codeset));
 
 
 /* Optimized version of the functions above.  */
diff --git a/intl/loadinfo.h b/intl/loadinfo.h
index b861260..d180962 100644
--- a/intl/loadinfo.h
+++ b/intl/loadinfo.h
@@ -20,8 +20,20 @@
 #ifndef _LOADINFO_H
 #define _LOADINFO_H	1
 
+/* Declarations of locale dependent catalog lookup functions.
+   Implemented in
+
+     localealias.c    Possibly replace a locale name by another.
+     explodename.c    Split a locale name into its various fields.
+     l10nflist.c      Generate a list of filenames of possible message catalogs.
+     finddomain.c     Find and open the relevant message catalogs.
+
+   The main function _nl_find_domain() in finddomain.c is declared
+   in gettextP.h.
+ */
+
 #ifndef PARAMS
-# if __STDC__
+# if __STDC__ || defined __GNUC__ || defined __SUNPRO_C || defined __cplusplus || __PROTOTYPES
 #  define PARAMS(args) args
 # else
 #  define PARAMS(args) ()
diff --git a/intl/loadmsgcat.c b/intl/loadmsgcat.c
index f99ebee..76130ed 100644
--- a/intl/loadmsgcat.c
+++ b/intl/loadmsgcat.c
@@ -71,8 +71,9 @@ char *alloca ();
 # undef HAVE_MMAP
 #endif
 
-#include "gettext.h"
+#include "gmo.h"
 #include "gettextP.h"
+#include "plural-exp.h"
 
 #ifdef _LIBC
 # include "../locale/localeinfo.h"
@@ -91,16 +92,6 @@ char *alloca ();
 # define munmap __munmap
 #endif
 
-/* Names for the libintl functions are a problem.  They must not clash
-   with existing names and they should follow ANSI C.  But this source
-   code is also used in GNU C Library where the names have a __
-   prefix.  So we have to make a difference here.  */
-#ifdef _LIBC
-# define PLURAL_PARSE __gettextparse
-#else
-# define PLURAL_PARSE gettextparse__
-#endif
-
 /* For those losing systems which don't have `alloca' we have to add
    some additional code emulating it.  */
 #ifdef HAVE_ALLOCA
@@ -132,73 +123,6 @@ char *alloca ();
    cached by one of GCC's features.  */
 int _nl_msg_cat_cntr;
 
-#if (defined __GNUC__ && !defined __APPLE_CC__) \
-    || (defined __STDC_VERSION__ && __STDC_VERSION__ >= 199901L)
-
-/* These structs are the constant expression for the germanic plural
-   form determination.  It represents the expression  "n != 1".  */
-static const struct expression plvar =
-{
-  .nargs = 0,
-  .operation = var,
-};
-static const struct expression plone =
-{
-  .nargs = 0,
-  .operation = num,
-  .val =
-  {
-    .num = 1
-  }
-};
-static struct expression germanic_plural =
-{
-  .nargs = 2,
-  .operation = not_equal,
-  .val =
-  {
-    .args =
-    {
-      [0] = (struct expression *) &plvar,
-      [1] = (struct expression *) &plone
-    }
-  }
-};
-
-# define INIT_GERMANIC_PLURAL()
-
-#else
-
-/* For compilers without support for ISO C 99 struct/union initializers:
-   Initialization at run-time.  */
-
-static struct expression plvar;
-static struct expression plone;
-static struct expression germanic_plural;
-
-static void
-init_germanic_plural ()
-{
-  if (plone.val.num == 0)
-    {
-      plvar.nargs = 0;
-      plvar.operation = var;
-
-      plone.nargs = 0;
-      plone.operation = num;
-      plone.val.num = 1;
-
-      germanic_plural.nargs = 2;
-      germanic_plural.operation = not_equal;
-      germanic_plural.val.args[0] = &plvar;
-      germanic_plural.val.args[1] = &plone;
-    }
-}
-
-# define INIT_GERMANIC_PLURAL() init_germanic_plural ()
-
-#endif
-
 
 /* Initialize the codeset dependent parts of an opened message catalog.
    Return the header entry.  */
@@ -271,7 +195,7 @@ _nl_init_domain_conv (domain_file, domain, domainbinding)
 		  outcharset = (*_nl_current[LC_CTYPE])->values[_NL_ITEM_INDEX (CODESET)].string;
 # else
 #  if HAVE_ICONV
-		  extern const char *locale_charset (void);
+		  extern const char *locale_charset PARAMS ((void));
 		  outcharset = locale_charset ();
 #  endif
 # endif
@@ -288,8 +212,10 @@ _nl_init_domain_conv (domain_file, domain, domainbinding)
 	    domain->conv = (__gconv_t) -1;
 # else
 #  if HAVE_ICONV
-	  /* When using GNU libiconv, we want to use transliteration.  */
-#   if _LIBICONV_VERSION >= 0x0105
+	  /* When using GNU libc >= 2.2 or GNU libiconv >= 1.5,
+	     we want to use transliteration.  */
+#   if (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 2) || __GLIBC__ > 2 \
+       || _LIBICONV_VERSION >= 0x0105
 	  len = strlen (outcharset);
 	  {
 	    char *tmp = (char *) alloca (len + 10 + 1);
@@ -299,7 +225,8 @@ _nl_init_domain_conv (domain_file, domain, domainbinding)
 	  }
 #   endif
 	  domain->conv = iconv_open (outcharset, charset);
-#   if _LIBICONV_VERSION >= 0x0105
+#   if (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 2) || __GLIBC__ > 2 \
+       || _LIBICONV_VERSION >= 0x0105
 	  freea (outcharset);
 #   endif
 #  endif
@@ -491,56 +418,7 @@ _nl_load_domain (domain_file, domainbinding)
   nullentry = _nl_init_domain_conv (domain_file, domain, domainbinding);
 
   /* Also look for a plural specification.  */
-  if (nullentry != NULL)
-    {
-      const char *plural;
-      const char *nplurals;
-
-      plural = strstr (nullentry, "plural=");
-      nplurals = strstr (nullentry, "nplurals=");
-      if (plural == NULL || nplurals == NULL)
-	goto no_plural;
-      else
-	{
-	  /* First get the number.  */
-	  char *endp;
-	  unsigned long int n;
-	  struct parse_args args;
-
-	  nplurals += 9;
-	  while (*nplurals != '\0' && isspace (*nplurals))
-	    ++nplurals;
-#if defined HAVE_STRTOUL || defined _LIBC
-	  n = strtoul (nplurals, &endp, 10);
-#else
-	  for (endp = nplurals, n = 0; *endp >= '0' && *endp <= '9'; endp++)
-	    n = n * 10 + (*endp - '0');
-#endif
-	  domain->nplurals = n;
-	  if (nplurals == endp)
-	    goto no_plural;
-
-	  /* Due to the restrictions bison imposes onto the interface of the
-	     scanner function we have to put the input string and the result
-	     passed up from the parser into the same structure which address
-	     is passed down to the parser.  */
-	  plural += 7;
-	  args.cp = plural;
-	  if (PLURAL_PARSE (&args) != 0)
-	    goto no_plural;
-	  domain->plural = args.res;
-	}
-    }
-  else
-    {
-      /* By default we are using the Germanic form: singular form only
-         for `one', the plural form otherwise.  Yes, this is also what
-         English is using since English is a Germanic language.  */
-    no_plural:
-      INIT_GERMANIC_PLURAL ();
-      domain->plural = &germanic_plural;
-      domain->nplurals = 2;
-    }
+  EXTRACT_PLURAL_EXPRESSION (nullentry, &domain->plural, &domain->nplurals);
 }
 
 
@@ -550,7 +428,7 @@ internal_function
 _nl_unload_domain (domain)
      struct loaded_domain *domain;
 {
-  if (domain->plural != &germanic_plural)
+  if (domain->plural != &__gettext_germanic_plural)
     __gettext_free_exp (domain->plural);
 
   _nl_free_domain_conv (domain);
diff --git a/intl/localcharset.c b/intl/localcharset.c
index 61f8f3e..bc5587b 100644
--- a/intl/localcharset.c
+++ b/intl/localcharset.c
@@ -1,6 +1,6 @@
 /* Determine a canonical name for the current locale's character encoding.
 
-   Copyright (C) 2000-2001 Free Software Foundation, Inc.
+   Copyright (C) 2000-2002 Free Software Foundation, Inc.
 
    This program is free software; you can redistribute it and/or modify it
    under the terms of the GNU Library General Public License as published
@@ -42,7 +42,12 @@
 # define WIN32
 #endif
 
-#ifndef WIN32
+#if defined __EMX__
+/* Assume EMX program runs on OS/2, even if compiled under DOS.  */
+# define OS2
+#endif
+
+#if !defined WIN32
 # if HAVE_LANGINFO_CODESET
 #  include <langinfo.h>
 # else
@@ -50,10 +55,19 @@
 #   include <locale.h>
 #  endif
 # endif
-#else /* WIN32 */
+#elif defined WIN32
 # define WIN32_LEAN_AND_MEAN
 # include <windows.h>
 #endif
+#if defined OS2
+# define INCL_DOS
+# include <os2.h>
+#endif
+
+#if defined _WIN32 || defined __WIN32__ || defined __EMX__ || defined __DJGPP__
+  /* Win32, OS/2, DOS */
+# define ISSLASH(C) ((C) == '/' || (C) == '\\')
+#endif
 
 #ifndef DIRECTORY_SEPARATOR
 # define DIRECTORY_SEPARATOR '/'
@@ -63,6 +77,11 @@
 # define ISSLASH(C) ((C) == DIRECTORY_SEPARATOR)
 #endif
 
+#ifdef HAVE_GETC_UNLOCKED
+# undef getc
+# define getc getc_unlocked
+#endif
+
 /* The following static variable is declared 'volatile' to avoid a
    possible multithread problem in the function get_charset_aliases. If we
    are running in a threaded environment, and if two threads initialize
@@ -86,7 +105,7 @@ get_charset_aliases ()
   cp = charset_aliases;
   if (cp == NULL)
     {
-#ifndef WIN32
+#if !defined WIN32
       FILE *fp;
       const char *dir = LIBDIR;
       const char *base = "charset.alias";
@@ -138,19 +157,19 @@ get_charset_aliases ()
 		  continue;
 		}
 	      ungetc (c, fp);
-	      if (fscanf(fp, "%50s %50s", buf1, buf2) < 2)
+	      if (fscanf (fp, "%50s %50s", buf1, buf2) < 2)
 		break;
 	      l1 = strlen (buf1);
 	      l2 = strlen (buf2);
 	      if (res_size == 0)
 		{
 		  res_size = l1 + 1 + l2 + 1;
-		  res_ptr = malloc (res_size + 1);
+		  res_ptr = (char *) malloc (res_size + 1);
 		}
 	      else
 		{
 		  res_size += l1 + 1 + l2 + 1;
-		  res_ptr = realloc (res_ptr, res_size + 1);
+		  res_ptr = (char *) realloc (res_ptr, res_size + 1);
 		}
 	      if (res_ptr == NULL)
 		{
@@ -174,14 +193,16 @@ get_charset_aliases ()
       if (file_name != NULL)
 	free (file_name);
 
-#else /* WIN32 */
+#else
 
       /* To avoid the troubles of installing a separate file in the same
 	 directory as the DLL and of retrieving the DLL's directory at
 	 runtime, simply inline the aliases here.  */
 
+# if defined WIN32
       cp = "CP936" "\0" "GBK" "\0"
 	   "CP1361" "\0" "JOHAB" "\0";
+# endif
 #endif
 
       charset_aliases = cp;
@@ -205,7 +226,7 @@ locale_charset ()
   const char *codeset;
   const char *aliases;
 
-#ifndef WIN32
+#if !(defined WIN32 || defined OS2)
 
 # if HAVE_LANGINFO_CODESET
 
@@ -242,7 +263,7 @@ locale_charset ()
 
 # endif
 
-#else /* WIN32 */
+#elif defined WIN32
 
   static char buf[2 + 10 + 1];
 
@@ -250,6 +271,59 @@ locale_charset ()
   sprintf (buf, "CP%u", GetACP ());
   codeset = buf;
 
+#elif defined OS2
+
+  const char *locale;
+  static char buf[2 + 10 + 1];
+  ULONG cp[3];
+  ULONG cplen;
+
+  /* Allow user to override the codeset, as set in the operating system,
+     with standard language environment variables.  */
+  locale = getenv ("LC_ALL");
+  if (locale == NULL || locale[0] == '\0')
+    {
+      locale = getenv ("LC_CTYPE");
+      if (locale == NULL || locale[0] == '\0')
+	locale = getenv ("LANG");
+    }
+  if (locale != NULL && locale[0] != '\0')
+    {
+      /* If the locale name contains an encoding after the dot, return it.  */
+      const char *dot = strchr (locale, '.');
+
+      if (dot != NULL)
+	{
+	  const char *modifier;
+
+	  dot++;
+	  /* Look for the possible @... trailer and remove it, if any.  */
+	  modifier = strchr (dot, '@');
+	  if (modifier == NULL)
+	    return dot;
+	  if (modifier - dot < sizeof (buf))
+	    {
+	      memcpy (buf, dot, modifier - dot);
+	      buf [modifier - dot] = '\0';
+	      return buf;
+	    }
+	}
+
+      /* Resolve through the charset.alias file.  */
+      codeset = locale;
+    }
+  else
+    {
+      /* OS/2 has a function returning the locale's codepage as a number.  */
+      if (DosQueryCp (sizeof (cp), cp, &cplen))
+	codeset = "";
+      else
+	{
+	  sprintf (buf, "CP%u", cp[0]);
+	  codeset = buf;
+	}
+    }
+
 #endif
 
   if (codeset == NULL)
diff --git a/intl/localealias.c b/intl/localealias.c
index 91e7acc..456e41e 100644
--- a/intl/localealias.c
+++ b/intl/localealias.c
@@ -29,6 +29,9 @@
 
 #include <ctype.h>
 #include <stdio.h>
+#if defined _LIBC || defined HAVE___FSETLOCKING
+# include <stdio_ext.h>
+#endif
 #include <sys/types.h>
 
 #ifdef __GNUC__
@@ -49,13 +52,7 @@ char *alloca ();
 #endif
 
 #include <stdlib.h>
-
 #include <string.h>
-#if !HAVE_STRCHR && !defined _LIBC
-# ifndef strchr
-#  define strchr index
-# endif
-#endif
 
 #include "gettextP.h"
 
@@ -71,6 +68,7 @@ char *alloca ();
 #  define mempcpy __mempcpy
 # endif
 # define HAVE_MEMPCPY	1
+# define HAVE___FSETLOCKING	1
 
 /* We need locking here since we can be called from different places.  */
 # include <bits/libc-lock.h>
@@ -82,6 +80,15 @@ __libc_lock_define_initialized (static, lock);
 # define internal_function
 #endif
 
+/* Some optimizations for glibc.  */
+#ifdef _LIBC
+# define FEOF(fp)		feof_unlocked (fp)
+# define FGETS(buf, n, fp)	fgets_unlocked (buf, n, fp)
+#else
+# define FEOF(fp)		feof (fp)
+# define FGETS(buf, n, fp)	fgets (buf, n, fp)
+#endif
+
 /* For those losing systems which don't have `alloca' we have to add
    some additional code emulating it.  */
 #ifdef HAVE_ALLOCA
@@ -128,7 +135,7 @@ const char *
 _nl_expand_alias (name)
     const char *name;
 {
-  static const char *locale_alias_path = LOCALE_ALIAS_PATH;
+  static const char *locale_alias_path;
   struct alias_map *retval;
   const char *result = NULL;
   size_t added;
@@ -137,6 +144,9 @@ _nl_expand_alias (name)
   __libc_lock_lock (lock);
 #endif
 
+  if (locale_alias_path == NULL)
+    locale_alias_path = LOCALE_ALIAS_PATH;
+
   do
     {
       struct alias_map item;
@@ -212,8 +222,13 @@ read_alias_file (fname, fname_len)
   if (fp == NULL)
     return 0;
 
+#ifdef HAVE___FSETLOCKING
+  /* No threads present.  */
+  __fsetlocking (fp, FSETLOCKING_BYCALLER);
+#endif
+
   added = 0;
-  while (!feof (fp))
+  while (!FEOF (fp))
     {
       /* It is a reasonable approach to use a fix buffer here because
 	 a) we are only interested in the first two fields
@@ -225,7 +240,7 @@ read_alias_file (fname, fname_len)
       char *value;
       char *cp;
 
-      if (fgets (buf, sizeof buf, fp) == NULL)
+      if (FGETS (buf, sizeof buf, fp) == NULL)
 	/* EOF reached.  */
 	break;
 
@@ -235,7 +250,7 @@ read_alias_file (fname, fname_len)
 	{
 	  char altbuf[BUFSIZ];
 	  do
-	    if (fgets (altbuf, sizeof altbuf, fp) == NULL)
+	    if (FGETS (altbuf, sizeof altbuf, fp) == NULL)
 	      /* Make sure the inner loop will be left.  The outer loop
 		 will exit at the `feof' test.  */
 	      break;
@@ -244,21 +259,21 @@ read_alias_file (fname, fname_len)
 
       cp = buf;
       /* Ignore leading white space.  */
-      while (isspace (cp[0]))
+      while (isspace ((unsigned char) cp[0]))
 	++cp;
 
       /* A leading '#' signals a comment line.  */
       if (cp[0] != '\0' && cp[0] != '#')
 	{
 	  alias = cp++;
-	  while (cp[0] != '\0' && !isspace (cp[0]))
+	  while (cp[0] != '\0' && !isspace ((unsigned char) cp[0]))
 	    ++cp;
 	  /* Terminate alias name.  */
 	  if (cp[0] != '\0')
 	    *cp++ = '\0';
 
 	  /* Now look for the beginning of the value.  */
-	  while (isspace (cp[0]))
+	  while (isspace ((unsigned char) cp[0]))
 	    ++cp;
 
 	  if (cp[0] != '\0')
@@ -267,7 +282,7 @@ read_alias_file (fname, fname_len)
 	      size_t value_len;
 
 	      value = cp++;
-	      while (cp[0] != '\0' && !isspace (cp[0]))
+	      while (cp[0] != '\0' && !isspace ((unsigned char) cp[0]))
 		++cp;
 	      /* Terminate value.  */
 	      if (cp[0] == '\n')
diff --git a/intl/localename.c b/intl/localename.c
new file mode 100644
index 0000000..a724198
--- /dev/null
+++ b/intl/localename.c
@@ -0,0 +1,694 @@
+/* Determine the current selected locale.
+   Copyright (C) 1995-1999, 2000-2002 Free Software Foundation, Inc.
+
+   This program is free software; you can redistribute it and/or modify it
+   under the terms of the GNU Library General Public License as published
+   by the Free Software Foundation; either version 2, or (at your option)
+   any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   Library General Public License for more details.
+
+   You should have received a copy of the GNU Library General Public
+   License along with this program; if not, write to the Free Software
+   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
+   USA.  */
+
+/* Written by Ulrich Drepper <drepper@gnu.org>, 1995.  */
+/* Win32 code written by Tor Lillqvist <tml@iki.fi>.  */
+
+#ifdef HAVE_CONFIG_H
+# include <config.h>
+#endif
+
+#include <stdlib.h>
+#include <locale.h>
+
+#if defined _WIN32 || defined __WIN32__
+# undef WIN32   /* avoid warning on mingw32 */
+# define WIN32
+#endif
+
+#ifdef WIN32
+# define WIN32_LEAN_AND_MEAN
+# include <windows.h>
+/* Mingw headers don't have latest language and sublanguage codes.  */
+# ifndef LANG_AFRIKAANS
+# define LANG_AFRIKAANS 0x36
+# endif
+# ifndef LANG_ALBANIAN
+# define LANG_ALBANIAN 0x1c
+# endif
+# ifndef LANG_ARABIC
+# define LANG_ARABIC 0x01
+# endif
+# ifndef LANG_ARMENIAN
+# define LANG_ARMENIAN 0x2b
+# endif
+# ifndef LANG_ASSAMESE
+# define LANG_ASSAMESE 0x4d
+# endif
+# ifndef LANG_AZERI
+# define LANG_AZERI 0x2c
+# endif
+# ifndef LANG_BASQUE
+# define LANG_BASQUE 0x2d
+# endif
+# ifndef LANG_BELARUSIAN
+# define LANG_BELARUSIAN 0x23
+# endif
+# ifndef LANG_BENGALI
+# define LANG_BENGALI 0x45
+# endif
+# ifndef LANG_CATALAN
+# define LANG_CATALAN 0x03
+# endif
+# ifndef LANG_ESTONIAN
+# define LANG_ESTONIAN 0x25
+# endif
+# ifndef LANG_FAEROESE
+# define LANG_FAEROESE 0x38
+# endif
+# ifndef LANG_FARSI
+# define LANG_FARSI 0x29
+# endif
+# ifndef LANG_GEORGIAN
+# define LANG_GEORGIAN 0x37
+# endif
+# ifndef LANG_GUJARATI
+# define LANG_GUJARATI 0x47
+# endif
+# ifndef LANG_HEBREW
+# define LANG_HEBREW 0x0d
+# endif
+# ifndef LANG_HINDI
+# define LANG_HINDI 0x39
+# endif
+# ifndef LANG_INDONESIAN
+# define LANG_INDONESIAN 0x21
+# endif
+# ifndef LANG_KANNADA
+# define LANG_KANNADA 0x4b
+# endif
+# ifndef LANG_KASHMIRI
+# define LANG_KASHMIRI 0x60
+# endif
+# ifndef LANG_KAZAK
+# define LANG_KAZAK 0x3f
+# endif
+# ifndef LANG_KONKANI
+# define LANG_KONKANI 0x57
+# endif
+# ifndef LANG_LATVIAN
+# define LANG_LATVIAN 0x26
+# endif
+# ifndef LANG_LITHUANIAN
+# define LANG_LITHUANIAN 0x27
+# endif
+# ifndef LANG_MACEDONIAN
+# define LANG_MACEDONIAN 0x2f
+# endif
+# ifndef LANG_MALAY
+# define LANG_MALAY 0x3e
+# endif
+# ifndef LANG_MALAYALAM
+# define LANG_MALAYALAM 0x4c
+# endif
+# ifndef LANG_MANIPURI
+# define LANG_MANIPURI 0x58
+# endif
+# ifndef LANG_MARATHI
+# define LANG_MARATHI 0x4e
+# endif
+# ifndef LANG_NEPALI
+# define LANG_NEPALI 0x61
+# endif
+# ifndef LANG_ORIYA
+# define LANG_ORIYA 0x48
+# endif
+# ifndef LANG_PUNJABI
+# define LANG_PUNJABI 0x46
+# endif
+# ifndef LANG_SANSKRIT
+# define LANG_SANSKRIT 0x4f
+# endif
+# ifndef LANG_SERBIAN
+# define LANG_SERBIAN 0x1a
+# endif
+# ifndef LANG_SINDHI
+# define LANG_SINDHI 0x59
+# endif
+# ifndef LANG_SLOVAK
+# define LANG_SLOVAK 0x1b
+# endif
+# ifndef LANG_SWAHILI
+# define LANG_SWAHILI 0x41
+# endif
+# ifndef LANG_TAMIL
+# define LANG_TAMIL 0x49
+# endif
+# ifndef LANG_TATAR
+# define LANG_TATAR 0x44
+# endif
+# ifndef LANG_TELUGU
+# define LANG_TELUGU 0x4a
+# endif
+# ifndef LANG_THAI
+# define LANG_THAI 0x1e
+# endif
+# ifndef LANG_UKRAINIAN
+# define LANG_UKRAINIAN 0x22
+# endif
+# ifndef LANG_URDU
+# define LANG_URDU 0x20
+# endif
+# ifndef LANG_UZBEK
+# define LANG_UZBEK 0x43
+# endif
+# ifndef LANG_VIETNAMESE
+# define LANG_VIETNAMESE 0x2a
+# endif
+# ifndef SUBLANG_ARABIC_SAUDI_ARABIA
+# define SUBLANG_ARABIC_SAUDI_ARABIA 0x01
+# endif
+# ifndef SUBLANG_ARABIC_IRAQ
+# define SUBLANG_ARABIC_IRAQ 0x02
+# endif
+# ifndef SUBLANG_ARABIC_EGYPT
+# define SUBLANG_ARABIC_EGYPT 0x03
+# endif
+# ifndef SUBLANG_ARABIC_LIBYA
+# define SUBLANG_ARABIC_LIBYA 0x04
+# endif
+# ifndef SUBLANG_ARABIC_ALGERIA
+# define SUBLANG_ARABIC_ALGERIA 0x05
+# endif
+# ifndef SUBLANG_ARABIC_MOROCCO
+# define SUBLANG_ARABIC_MOROCCO 0x06
+# endif
+# ifndef SUBLANG_ARABIC_TUNISIA
+# define SUBLANG_ARABIC_TUNISIA 0x07
+# endif
+# ifndef SUBLANG_ARABIC_OMAN
+# define SUBLANG_ARABIC_OMAN 0x08
+# endif
+# ifndef SUBLANG_ARABIC_YEMEN
+# define SUBLANG_ARABIC_YEMEN 0x09
+# endif
+# ifndef SUBLANG_ARABIC_SYRIA
+# define SUBLANG_ARABIC_SYRIA 0x0a
+# endif
+# ifndef SUBLANG_ARABIC_JORDAN
+# define SUBLANG_ARABIC_JORDAN 0x0b
+# endif
+# ifndef SUBLANG_ARABIC_LEBANON
+# define SUBLANG_ARABIC_LEBANON 0x0c
+# endif
+# ifndef SUBLANG_ARABIC_KUWAIT
+# define SUBLANG_ARABIC_KUWAIT 0x0d
+# endif
+# ifndef SUBLANG_ARABIC_UAE
+# define SUBLANG_ARABIC_UAE 0x0e
+# endif
+# ifndef SUBLANG_ARABIC_BAHRAIN
+# define SUBLANG_ARABIC_BAHRAIN 0x0f
+# endif
+# ifndef SUBLANG_ARABIC_QATAR
+# define SUBLANG_ARABIC_QATAR 0x10
+# endif
+# ifndef SUBLANG_AZERI_LATIN
+# define SUBLANG_AZERI_LATIN 0x01
+# endif
+# ifndef SUBLANG_AZERI_CYRILLIC
+# define SUBLANG_AZERI_CYRILLIC 0x02
+# endif
+# ifndef SUBLANG_CHINESE_MACAU
+# define SUBLANG_CHINESE_MACAU 0x05
+# endif
+# ifndef SUBLANG_ENGLISH_SOUTH_AFRICA
+# define SUBLANG_ENGLISH_SOUTH_AFRICA 0x07
+# endif
+# ifndef SUBLANG_ENGLISH_JAMAICA
+# define SUBLANG_ENGLISH_JAMAICA 0x08
+# endif
+# ifndef SUBLANG_ENGLISH_CARIBBEAN
+# define SUBLANG_ENGLISH_CARIBBEAN 0x09
+# endif
+# ifndef SUBLANG_ENGLISH_BELIZE
+# define SUBLANG_ENGLISH_BELIZE 0x0a
+# endif
+# ifndef SUBLANG_ENGLISH_TRINIDAD
+# define SUBLANG_ENGLISH_TRINIDAD 0x0b
+# endif
+# ifndef SUBLANG_ENGLISH_ZIMBABWE
+# define SUBLANG_ENGLISH_ZIMBABWE 0x0c
+# endif
+# ifndef SUBLANG_ENGLISH_PHILIPPINES
+# define SUBLANG_ENGLISH_PHILIPPINES 0x0d
+# endif
+# ifndef SUBLANG_FRENCH_LUXEMBOURG
+# define SUBLANG_FRENCH_LUXEMBOURG 0x05
+# endif
+# ifndef SUBLANG_FRENCH_MONACO
+# define SUBLANG_FRENCH_MONACO 0x06
+# endif
+# ifndef SUBLANG_GERMAN_LUXEMBOURG
+# define SUBLANG_GERMAN_LUXEMBOURG 0x04
+# endif
+# ifndef SUBLANG_GERMAN_LIECHTENSTEIN
+# define SUBLANG_GERMAN_LIECHTENSTEIN 0x05
+# endif
+# ifndef SUBLANG_KASHMIRI_INDIA
+# define SUBLANG_KASHMIRI_INDIA 0x02
+# endif
+# ifndef SUBLANG_MALAY_MALAYSIA
+# define SUBLANG_MALAY_MALAYSIA 0x01
+# endif
+# ifndef SUBLANG_MALAY_BRUNEI_DARUSSALAM
+# define SUBLANG_MALAY_BRUNEI_DARUSSALAM 0x02
+# endif
+# ifndef SUBLANG_NEPALI_INDIA
+# define SUBLANG_NEPALI_INDIA 0x02
+# endif
+# ifndef SUBLANG_SERBIAN_LATIN
+# define SUBLANG_SERBIAN_LATIN 0x02
+# endif
+# ifndef SUBLANG_SERBIAN_CYRILLIC
+# define SUBLANG_SERBIAN_CYRILLIC 0x03
+# endif
+# ifndef SUBLANG_SPANISH_GUATEMALA
+# define SUBLANG_SPANISH_GUATEMALA 0x04
+# endif
+# ifndef SUBLANG_SPANISH_COSTA_RICA
+# define SUBLANG_SPANISH_COSTA_RICA 0x05
+# endif
+# ifndef SUBLANG_SPANISH_PANAMA
+# define SUBLANG_SPANISH_PANAMA 0x06
+# endif
+# ifndef SUBLANG_SPANISH_DOMINICAN_REPUBLIC
+# define SUBLANG_SPANISH_DOMINICAN_REPUBLIC 0x07
+# endif
+# ifndef SUBLANG_SPANISH_VENEZUELA
+# define SUBLANG_SPANISH_VENEZUELA 0x08
+# endif
+# ifndef SUBLANG_SPANISH_COLOMBIA
+# define SUBLANG_SPANISH_COLOMBIA 0x09
+# endif
+# ifndef SUBLANG_SPANISH_PERU
+# define SUBLANG_SPANISH_PERU 0x0a
+# endif
+# ifndef SUBLANG_SPANISH_ARGENTINA
+# define SUBLANG_SPANISH_ARGENTINA 0x0b
+# endif
+# ifndef SUBLANG_SPANISH_ECUADOR
+# define SUBLANG_SPANISH_ECUADOR 0x0c
+# endif
+# ifndef SUBLANG_SPANISH_CHILE
+# define SUBLANG_SPANISH_CHILE 0x0d
+# endif
+# ifndef SUBLANG_SPANISH_URUGUAY
+# define SUBLANG_SPANISH_URUGUAY 0x0e
+# endif
+# ifndef SUBLANG_SPANISH_PARAGUAY
+# define SUBLANG_SPANISH_PARAGUAY 0x0f
+# endif
+# ifndef SUBLANG_SPANISH_BOLIVIA
+# define SUBLANG_SPANISH_BOLIVIA 0x10
+# endif
+# ifndef SUBLANG_SPANISH_EL_SALVADOR
+# define SUBLANG_SPANISH_EL_SALVADOR 0x11
+# endif
+# ifndef SUBLANG_SPANISH_HONDURAS
+# define SUBLANG_SPANISH_HONDURAS 0x12
+# endif
+# ifndef SUBLANG_SPANISH_NICARAGUA
+# define SUBLANG_SPANISH_NICARAGUA 0x13
+# endif
+# ifndef SUBLANG_SPANISH_PUERTO_RICO
+# define SUBLANG_SPANISH_PUERTO_RICO 0x14
+# endif
+# ifndef SUBLANG_SWEDISH_FINLAND
+# define SUBLANG_SWEDISH_FINLAND 0x02
+# endif
+# ifndef SUBLANG_URDU_PAKISTAN
+# define SUBLANG_URDU_PAKISTAN 0x01
+# endif
+# ifndef SUBLANG_URDU_INDIA
+# define SUBLANG_URDU_INDIA 0x02
+# endif
+# ifndef SUBLANG_UZBEK_LATIN
+# define SUBLANG_UZBEK_LATIN 0x01
+# endif
+# ifndef SUBLANG_UZBEK_CYRILLIC
+# define SUBLANG_UZBEK_CYRILLIC 0x02
+# endif
+#endif
+
+/* XPG3 defines the result of 'setlocale (category, NULL)' as:
+   "Directs 'setlocale()' to query 'category' and return the current
+    setting of 'local'."
+   However it does not specify the exact format.  Neither do SUSV2 and
+   ISO C 99.  So we can use this feature only on selected systems (e.g.
+   those using GNU C Library).  */
+#if defined _LIBC || (defined __GNU_LIBRARY__ && __GNU_LIBRARY__ >= 2)
+# define HAVE_LOCALE_NULL
+#endif
+
+/* Determine the current locale's name, and canonicalize it into XPG syntax
+     language[_territory[.codeset]][@modifier]
+   The codeset part in the result is not reliable; the locale_charset()
+   should be used for codeset information instead.
+   The result must not be freed; it is statically allocated.  */
+
+const char *
+_nl_locale_name (category, categoryname)
+     int category;
+     const char *categoryname;
+{
+  const char *retval;
+
+#ifndef WIN32
+
+  /* Use the POSIX methods of looking to 'LC_ALL', 'LC_xxx', and 'LANG'.
+     On some systems this can be done by the 'setlocale' function itself.  */
+# if defined HAVE_SETLOCALE && defined HAVE_LC_MESSAGES && defined HAVE_LOCALE_NULL
+  retval = setlocale (category, NULL);
+# else
+  /* Setting of LC_ALL overwrites all other.  */
+  retval = getenv ("LC_ALL");
+  if (retval == NULL || retval[0] == '\0')
+    {
+      /* Next comes the name of the desired category.  */
+      retval = getenv (categoryname);
+      if (retval == NULL || retval[0] == '\0')
+	{
+	  /* Last possibility is the LANG environment variable.  */
+	  retval = getenv ("LANG");
+	  if (retval == NULL || retval[0] == '\0')
+	    /* We use C as the default domain.  POSIX says this is
+	       implementation defined.  */
+	    retval = "C";
+	}
+    }
+# endif
+
+  return retval;
+
+#else /* WIN32 */
+
+  /* Return an XPG style locale name language[_territory][@modifier].
+     Don't even bother determining the codeset; it's not useful in this
+     context, because message catalogs are not specific to a single
+     codeset.  */
+
+  LCID lcid;
+  LANGID langid;
+  int primary, sub;
+
+  /* Let the user override the system settings through environment
+     variables, as on POSIX systems.  */
+  retval = getenv ("LC_ALL");
+  if (retval != NULL && retval[0] != '\0')
+    return retval;
+  retval = getenv (categoryname);
+  if (retval != NULL && retval[0] != '\0')
+    return retval;
+  retval = getenv ("LANG");
+  if (retval != NULL && retval[0] != '\0')
+    return retval;
+
+  /* Use native Win32 API locale ID.  */
+  lcid = GetThreadLocale ();
+
+  /* Strip off the sorting rules, keep only the language part.  */
+  langid = LANGIDFROMLCID (lcid);
+
+  /* Split into language and territory part.  */
+  primary = PRIMARYLANGID (langid);
+  sub = SUBLANGID (langid);
+  switch (primary)
+    {
+    case LANG_AFRIKAANS: return "af_ZA";
+    case LANG_ALBANIAN: return "sq_AL";
+    case LANG_ARABIC:
+      switch (sub)
+	{
+	case SUBLANG_ARABIC_SAUDI_ARABIA: return "ar_SA";
+	case SUBLANG_ARABIC_IRAQ: return "ar_IQ";
+	case SUBLANG_ARABIC_EGYPT: return "ar_EG";
+	case SUBLANG_ARABIC_LIBYA: return "ar_LY";
+	case SUBLANG_ARABIC_ALGERIA: return "ar_DZ";
+	case SUBLANG_ARABIC_MOROCCO: return "ar_MA";
+	case SUBLANG_ARABIC_TUNISIA: return "ar_TN";
+	case SUBLANG_ARABIC_OMAN: return "ar_OM";
+	case SUBLANG_ARABIC_YEMEN: return "ar_YE";
+	case SUBLANG_ARABIC_SYRIA: return "ar_SY";
+	case SUBLANG_ARABIC_JORDAN: return "ar_JO";
+	case SUBLANG_ARABIC_LEBANON: return "ar_LB";
+	case SUBLANG_ARABIC_KUWAIT: return "ar_KW";
+	case SUBLANG_ARABIC_UAE: return "ar_AE";
+	case SUBLANG_ARABIC_BAHRAIN: return "ar_BH";
+	case SUBLANG_ARABIC_QATAR: return "ar_QA";
+	}
+      return "ar";
+    case LANG_ARMENIAN: return "hy_AM";
+    case LANG_ASSAMESE: return "as_IN";
+    case LANG_AZERI:
+      switch (sub)
+	{
+	/* FIXME: Adjust this when Azerbaijani locales appear on Unix.  */
+	case SUBLANG_AZERI_LATIN: return "az_AZ@latin";
+	case SUBLANG_AZERI_CYRILLIC: return "az_AZ@cyrillic";
+	}
+      return "az";
+    case LANG_BASQUE:
+      return "eu"; /* Ambiguous: could be "eu_ES" or "eu_FR".  */
+    case LANG_BELARUSIAN: return "be_BY";
+    case LANG_BENGALI: return "bn_IN";
+    case LANG_BULGARIAN: return "bg_BG";
+    case LANG_CATALAN: return "ca_ES";
+    case LANG_CHINESE:
+      switch (sub)
+	{
+	case SUBLANG_CHINESE_TRADITIONAL: return "zh_TW";
+	case SUBLANG_CHINESE_SIMPLIFIED: return "zh_CN";
+	case SUBLANG_CHINESE_HONGKONG: return "zh_HK";
+	case SUBLANG_CHINESE_SINGAPORE: return "zh_SG";
+	case SUBLANG_CHINESE_MACAU: return "zh_MO";
+	}
+      return "zh";
+    case LANG_CROATIAN:		/* LANG_CROATIAN == LANG_SERBIAN
+				 * What used to be called Serbo-Croatian
+				 * should really now be two separate
+				 * languages because of political reasons.
+				 * (Says tml, who knows nothing about Serbian
+				 * or Croatian.)
+				 * (I can feel those flames coming already.)
+				 */
+      switch (sub)
+	{
+	/* FIXME: How to distinguish Croatian and Latin Serbian locales?  */
+	case SUBLANG_SERBIAN_LATIN: return "sr_YU";
+	case SUBLANG_SERBIAN_CYRILLIC: return "sr_YU@cyrillic";
+	default: return "hr_HR";
+	}
+    case LANG_CZECH: return "cs_CZ";
+    case LANG_DANISH: return "da_DK";
+    case LANG_DUTCH:
+      switch (sub)
+	{
+	case SUBLANG_DUTCH: return "nl_NL";
+	case SUBLANG_DUTCH_BELGIAN: return "nl_BE";
+	}
+      return "nl";
+    case LANG_ENGLISH:
+      switch (sub)
+	{
+	/* SUBLANG_ENGLISH_US == SUBLANG_DEFAULT. Heh. I thought
+	 * English was the language spoken in England.
+	 * Oh well.
+	 */
+	case SUBLANG_ENGLISH_US: return "en_US";
+	case SUBLANG_ENGLISH_UK: return "en_GB";
+	case SUBLANG_ENGLISH_AUS: return "en_AU";
+	case SUBLANG_ENGLISH_CAN: return "en_CA";
+	case SUBLANG_ENGLISH_NZ: return "en_NZ";
+	case SUBLANG_ENGLISH_EIRE: return "en_IE";
+	case SUBLANG_ENGLISH_SOUTH_AFRICA: return "en_ZA";
+	case SUBLANG_ENGLISH_JAMAICA: return "en_JM";
+	case SUBLANG_ENGLISH_CARIBBEAN: return "en_GD"; /* Grenada? */
+	case SUBLANG_ENGLISH_BELIZE: return "en_BZ";
+	case SUBLANG_ENGLISH_TRINIDAD: return "en_TT";
+	case SUBLANG_ENGLISH_ZIMBABWE: return "en_ZW";
+	case SUBLANG_ENGLISH_PHILIPPINES: return "en_PH";
+	}
+      return "en";
+    case LANG_ESTONIAN: return "et_EE";
+    case LANG_FAEROESE: return "fo_FO";
+    case LANG_FARSI: return "fa_IR";
+    case LANG_FINNISH: return "fi_FI";
+    case LANG_FRENCH:
+      switch (sub)
+	{
+	case SUBLANG_FRENCH: return "fr_FR";
+	case SUBLANG_FRENCH_BELGIAN: return "fr_BE";
+	case SUBLANG_FRENCH_CANADIAN: return "fr_CA";
+	case SUBLANG_FRENCH_SWISS: return "fr_CH";
+	case SUBLANG_FRENCH_LUXEMBOURG: return "fr_LU";
+	case SUBLANG_FRENCH_MONACO: return "fr_MC";
+	}
+      return "fr";
+    case LANG_GEORGIAN: return "ka_GE";
+    case LANG_GERMAN:
+      switch (sub)
+	{
+	case SUBLANG_GERMAN: return "de_DE";
+	case SUBLANG_GERMAN_SWISS: return "de_CH";
+	case SUBLANG_GERMAN_AUSTRIAN: return "de_AT";
+	case SUBLANG_GERMAN_LUXEMBOURG: return "de_LU";
+	case SUBLANG_GERMAN_LIECHTENSTEIN: return "de_LI";
+	}
+      return "de";
+    case LANG_GREEK: return "el_GR";
+    case LANG_GUJARATI: return "gu_IN";
+    case LANG_HEBREW: return "he_IL";
+    case LANG_HINDI: return "hi_IN";
+    case LANG_HUNGARIAN: return "hu_HU";
+    case LANG_ICELANDIC: return "is_IS";
+    case LANG_INDONESIAN: return "id_ID";
+    case LANG_ITALIAN:
+      switch (sub)
+	{
+	case SUBLANG_ITALIAN: return "it_IT";
+	case SUBLANG_ITALIAN_SWISS: return "it_CH";
+	}
+      return "it";
+    case LANG_JAPANESE: return "ja_JP";
+    case LANG_KANNADA: return "kn_IN";
+    case LANG_KASHMIRI:
+      switch (sub)
+	{
+	case SUBLANG_DEFAULT: return "ks_PK";
+	case SUBLANG_KASHMIRI_INDIA: return "ks_IN";
+	}
+      return "ks";
+    case LANG_KAZAK: return "kk_KZ";
+    case LANG_KONKANI:
+      /* FIXME: Adjust this when such locales appear on Unix.  */
+      return "kok_IN";
+    case LANG_KOREAN: return "ko_KR";
+    case LANG_LATVIAN: return "lv_LV";
+    case LANG_LITHUANIAN: return "lt_LT";
+    case LANG_MACEDONIAN: return "mk_MK";
+    case LANG_MALAY:
+      switch (sub)
+	{
+	case SUBLANG_MALAY_MALAYSIA: return "ms_MY";
+	case SUBLANG_MALAY_BRUNEI_DARUSSALAM: return "ms_BN";
+	}
+      return "ms";
+    case LANG_MALAYALAM: return "ml_IN";
+    case LANG_MANIPURI:
+      /* FIXME: Adjust this when such locales appear on Unix.  */
+      return "mni_IN";
+    case LANG_MARATHI: return "mr_IN";
+    case LANG_NEPALI:
+      switch (sub)
+	{
+	case SUBLANG_DEFAULT: return "ne_NP";
+	case SUBLANG_NEPALI_INDIA: return "ne_IN";
+	}
+      return "ne";
+    case LANG_NORWEGIAN:
+      switch (sub)
+	{
+	case SUBLANG_NORWEGIAN_BOKMAL: return "no_NO";
+	case SUBLANG_NORWEGIAN_NYNORSK: return "nn_NO";
+	}
+      return "no";
+    case LANG_ORIYA: return "or_IN";
+    case LANG_POLISH: return "pl_PL";
+    case LANG_PORTUGUESE:
+      switch (sub)
+	{
+	case SUBLANG_PORTUGUESE: return "pt_PT";
+	/* Hmm. SUBLANG_PORTUGUESE_BRAZILIAN == SUBLANG_DEFAULT.
+	   Same phenomenon as SUBLANG_ENGLISH_US == SUBLANG_DEFAULT. */
+	case SUBLANG_PORTUGUESE_BRAZILIAN: return "pt_BR";
+	}
+      return "pt";
+    case LANG_PUNJABI: return "pa_IN";
+    case LANG_ROMANIAN: return "ro_RO";
+    case LANG_RUSSIAN:
+      return "ru"; /* Ambiguous: could be "ru_RU" or "ru_UA".  */
+    case LANG_SANSKRIT: return "sa_IN";
+    case LANG_SINDHI: return "sd";
+    case LANG_SLOVAK: return "sk_SK";
+    case LANG_SLOVENIAN: return "sl_SI";
+    case LANG_SORBIAN:
+      /* FIXME: Adjust this when such locales appear on Unix.  */
+      return "wen_DE";
+    case LANG_SPANISH:
+      switch (sub)
+	{
+	case SUBLANG_SPANISH: return "es_ES";
+	case SUBLANG_SPANISH_MEXICAN: return "es_MX";
+	case SUBLANG_SPANISH_MODERN:
+	  return "es_ES@modern";	/* not seen on Unix */
+	case SUBLANG_SPANISH_GUATEMALA: return "es_GT";
+	case SUBLANG_SPANISH_COSTA_RICA: return "es_CR";
+	case SUBLANG_SPANISH_PANAMA: return "es_PA";
+	case SUBLANG_SPANISH_DOMINICAN_REPUBLIC: return "es_DO";
+	case SUBLANG_SPANISH_VENEZUELA: return "es_VE";
+	case SUBLANG_SPANISH_COLOMBIA: return "es_CO";
+	case SUBLANG_SPANISH_PERU: return "es_PE";
+	case SUBLANG_SPANISH_ARGENTINA: return "es_AR";
+	case SUBLANG_SPANISH_ECUADOR: return "es_EC";
+	case SUBLANG_SPANISH_CHILE: return "es_CL";
+	case SUBLANG_SPANISH_URUGUAY: return "es_UY";
+	case SUBLANG_SPANISH_PARAGUAY: return "es_PY";
+	case SUBLANG_SPANISH_BOLIVIA: return "es_BO";
+	case SUBLANG_SPANISH_EL_SALVADOR: return "es_SV";
+	case SUBLANG_SPANISH_HONDURAS: return "es_HN";
+	case SUBLANG_SPANISH_NICARAGUA: return "es_NI";
+	case SUBLANG_SPANISH_PUERTO_RICO: return "es_PR";
+	}
+      return "es";
+    case LANG_SWAHILI: return "sw";
+    case LANG_SWEDISH:
+      switch (sub)
+	{
+	case SUBLANG_DEFAULT: return "sv_SE";
+	case SUBLANG_SWEDISH_FINLAND: return "sv_FI";
+	}
+      return "sv";
+    case LANG_TAMIL:
+      return "ta"; /* Ambiguous: could be "ta_IN" or "ta_LK" or "ta_SG".  */
+    case LANG_TATAR: return "tt";
+    case LANG_TELUGU: return "te_IN";
+    case LANG_THAI: return "th_TH";
+    case LANG_TURKISH: return "tr_TR";
+    case LANG_UKRAINIAN: return "uk_UA";
+    case LANG_URDU:
+      switch (sub)
+	{
+	case SUBLANG_URDU_PAKISTAN: return "ur_PK";
+	case SUBLANG_URDU_INDIA: return "ur_IN";
+	}
+      return "ur";
+    case LANG_UZBEK:
+      switch (sub)
+	{
+	/* FIXME: Adjust this when Uzbek locales appear on Unix.  */
+	case SUBLANG_UZBEK_LATIN: return "uz_UZ@latin";
+	case SUBLANG_UZBEK_CYRILLIC: return "uz_UZ@cyrillic";
+	}
+      return "uz";
+    case LANG_VIETNAMESE: return "vi_VN";
+    default: return "C";
+    }
+
+#endif
+}
diff --git a/intl/ngettext.c b/intl/ngettext.c
index fb3ec5a..b42ff6a 100644
--- a/intl/ngettext.c
+++ b/intl/ngettext.c
@@ -1,5 +1,5 @@
 /* Implementation of ngettext(3) function.
-   Copyright (C) 1995, 1997, 2000, 2001 Free Software Foundation, Inc.
+   Copyright (C) 1995, 1997, 2000, 2001, 2002 Free Software Foundation, Inc.
 
    This program is free software; you can redistribute it and/or modify it
    under the terms of the GNU Library General Public License as published
@@ -44,7 +44,7 @@
    prefix.  So we have to make a difference here.  */
 #ifdef _LIBC
 # define NGETTEXT __ngettext
-# define DCNGETTEXT __dcngettext
+# define DCNGETTEXT INTUSE(__dcngettext)
 #else
 # define NGETTEXT ngettext__
 # define DCNGETTEXT dcngettext__
diff --git a/intl/os2compat.c b/intl/os2compat.c
new file mode 100644
index 0000000..3ca8266
--- /dev/null
+++ b/intl/os2compat.c
@@ -0,0 +1,98 @@
+/* OS/2 compatibility functions.
+   Copyright (C) 2001-2002 Free Software Foundation, Inc.
+
+   This program is free software; you can redistribute it and/or modify it
+   under the terms of the GNU Library General Public License as published
+   by the Free Software Foundation; either version 2, or (at your option)
+   any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   Library General Public License for more details.
+
+   You should have received a copy of the GNU Library General Public
+   License along with this program; if not, write to the Free Software
+   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
+   USA.  */
+
+#define OS2_AWARE
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
+#include <stdlib.h>
+#include <string.h>
+#include <sys/param.h>
+
+/* A version of getenv() that works from DLLs */
+extern unsigned long DosScanEnv (const unsigned char *pszName, unsigned char **ppszValue);
+
+char *
+_nl_getenv (const char *name)
+{
+  unsigned char *value;
+  if (DosScanEnv (name, &value))
+    return NULL;
+  else
+    return value;
+}
+
+/* A fixed size buffer.  */
+char _nl_default_dirname__[MAXPATHLEN+1];
+
+char *_nlos2_libdir = NULL;
+char *_nlos2_localealiaspath = NULL;
+char *_nlos2_localedir = NULL;
+
+static __attribute__((constructor)) void
+nlos2_initialize ()
+{
+  char *root = getenv ("UNIXROOT");
+  char *gnulocaledir = getenv ("GNULOCALEDIR");
+
+  _nlos2_libdir = gnulocaledir;
+  if (!_nlos2_libdir)
+    {
+      if (root)
+        {
+          size_t sl = strlen (root);
+          _nlos2_libdir = (char *) malloc (sl + strlen (LIBDIR) + 1);
+          memcpy (_nlos2_libdir, root, sl);
+          memcpy (_nlos2_libdir + sl, LIBDIR, strlen (LIBDIR) + 1);
+        }
+      else
+        _nlos2_libdir = LIBDIR;
+    }
+
+  _nlos2_localealiaspath = gnulocaledir;
+  if (!_nlos2_localealiaspath)
+    {
+      if (root)
+        {
+          size_t sl = strlen (root);
+          _nlos2_localealiaspath = (char *) malloc (sl + strlen (LOCALE_ALIAS_PATH) + 1);
+          memcpy (_nlos2_localealiaspath, root, sl);
+          memcpy (_nlos2_localealiaspath + sl, LOCALE_ALIAS_PATH, strlen (LOCALE_ALIAS_PATH) + 1);
+        }
+     else
+        _nlos2_localealiaspath = LOCALE_ALIAS_PATH;
+    }
+
+  _nlos2_localedir = gnulocaledir;
+  if (!_nlos2_localedir)
+    {
+      if (root)
+        {
+          size_t sl = strlen (root);
+          _nlos2_localedir = (char *) malloc (sl + strlen (LOCALEDIR) + 1);
+          memcpy (_nlos2_localedir, root, sl);
+          memcpy (_nlos2_localedir + sl, LOCALEDIR, strlen (LOCALEDIR) + 1);
+        }
+      else
+        _nlos2_localedir = LOCALEDIR;
+    }
+
+  if (strlen (_nlos2_localedir) <= MAXPATHLEN)
+    strcpy (_nl_default_dirname__, _nlos2_localedir);
+}
diff --git a/intl/os2compat.h b/intl/os2compat.h
new file mode 100644
index 0000000..4f74e8c
--- /dev/null
+++ b/intl/os2compat.h
@@ -0,0 +1,46 @@
+/* OS/2 compatibility defines.
+   This file is intended to be included from config.h
+   Copyright (C) 2001-2002 Free Software Foundation, Inc.
+
+   This program is free software; you can redistribute it and/or modify it
+   under the terms of the GNU Library General Public License as published
+   by the Free Software Foundation; either version 2, or (at your option)
+   any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   Library General Public License for more details.
+
+   You should have received a copy of the GNU Library General Public
+   License along with this program; if not, write to the Free Software
+   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
+   USA.  */
+
+/* When included from os2compat.h we need all the original definitions */
+#ifndef OS2_AWARE
+
+#undef LIBDIR
+#define LIBDIR			_nlos2_libdir
+extern char *_nlos2_libdir;
+
+#undef LOCALEDIR
+#define LOCALEDIR		_nlos2_localedir
+extern char *_nlos2_localedir;
+
+#undef LOCALE_ALIAS_PATH
+#define LOCALE_ALIAS_PATH	_nlos2_localealiaspath
+extern char *_nlos2_localealiaspath;
+
+#endif
+
+#undef HAVE_STRCASECMP
+#define HAVE_STRCASECMP 1
+#define strcasecmp stricmp
+#define strncasecmp strnicmp
+
+/* We have our own getenv() which works even if library is compiled as DLL */
+#define getenv _nl_getenv
+
+/* Older versions of gettext used -1 as the value of LC_MESSAGES */
+#define LC_MESSAGES_COMPAT (-1)
diff --git a/intl/osdep.c b/intl/osdep.c
new file mode 100644
index 0000000..b372598
--- /dev/null
+++ b/intl/osdep.c
@@ -0,0 +1,24 @@
+/* OS dependent parts of libintl.
+   Copyright (C) 2001-2002 Free Software Foundation, Inc.
+
+   This program is free software; you can redistribute it and/or modify it
+   under the terms of the GNU Library General Public License as published
+   by the Free Software Foundation; either version 2, or (at your option)
+   any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   Library General Public License for more details.
+
+   You should have received a copy of the GNU Library General Public
+   License along with this program; if not, write to the Free Software
+   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
+   USA.  */
+
+#if defined __EMX__
+# include "os2compat.c"
+#else
+/* Avoid AIX compiler warning.  */
+typedef int dummy;
+#endif
diff --git a/intl/plural-exp.c b/intl/plural-exp.c
new file mode 100644
index 0000000..c937c01
--- /dev/null
+++ b/intl/plural-exp.c
@@ -0,0 +1,156 @@
+/* Expression parsing for plural form selection.
+   Copyright (C) 2000, 2001 Free Software Foundation, Inc.
+   Written by Ulrich Drepper <drepper@cygnus.com>, 2000.
+
+   This program is free software; you can redistribute it and/or modify it
+   under the terms of the GNU Library General Public License as published
+   by the Free Software Foundation; either version 2, or (at your option)
+   any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   Library General Public License for more details.
+
+   You should have received a copy of the GNU Library General Public
+   License along with this program; if not, write to the Free Software
+   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
+   USA.  */
+
+#ifdef HAVE_CONFIG_H
+# include <config.h>
+#endif
+
+#include <ctype.h>
+#include <stdlib.h>
+#include <string.h>
+
+#include "plural-exp.h"
+
+#if (defined __GNUC__ && !defined __APPLE_CC__) \
+    || (defined __STDC_VERSION__ && __STDC_VERSION__ >= 199901L)
+
+/* These structs are the constant expression for the germanic plural
+   form determination.  It represents the expression  "n != 1".  */
+static const struct expression plvar =
+{
+  .nargs = 0,
+  .operation = var,
+};
+static const struct expression plone =
+{
+  .nargs = 0,
+  .operation = num,
+  .val =
+  {
+    .num = 1
+  }
+};
+struct expression GERMANIC_PLURAL =
+{
+  .nargs = 2,
+  .operation = not_equal,
+  .val =
+  {
+    .args =
+    {
+      [0] = (struct expression *) &plvar,
+      [1] = (struct expression *) &plone
+    }
+  }
+};
+
+# define INIT_GERMANIC_PLURAL()
+
+#else
+
+/* For compilers without support for ISO C 99 struct/union initializers:
+   Initialization at run-time.  */
+
+static struct expression plvar;
+static struct expression plone;
+struct expression GERMANIC_PLURAL;
+
+static void
+init_germanic_plural ()
+{
+  if (plone.val.num == 0)
+    {
+      plvar.nargs = 0;
+      plvar.operation = var;
+
+      plone.nargs = 0;
+      plone.operation = num;
+      plone.val.num = 1;
+
+      GERMANIC_PLURAL.nargs = 2;
+      GERMANIC_PLURAL.operation = not_equal;
+      GERMANIC_PLURAL.val.args[0] = &plvar;
+      GERMANIC_PLURAL.val.args[1] = &plone;
+    }
+}
+
+# define INIT_GERMANIC_PLURAL() init_germanic_plural ()
+
+#endif
+
+void
+internal_function
+EXTRACT_PLURAL_EXPRESSION (nullentry, pluralp, npluralsp)
+     const char *nullentry;
+     struct expression **pluralp;
+     unsigned long int *npluralsp;
+{
+  if (nullentry != NULL)
+    {
+      const char *plural;
+      const char *nplurals;
+
+      plural = strstr (nullentry, "plural=");
+      nplurals = strstr (nullentry, "nplurals=");
+      if (plural == NULL || nplurals == NULL)
+	goto no_plural;
+      else
+	{
+	  char *endp;
+	  unsigned long int n;
+	  struct parse_args args;
+
+	  /* First get the number.  */
+	  nplurals += 9;
+	  while (*nplurals != '\0' && isspace ((unsigned char) *nplurals))
+	    ++nplurals;
+	  if (!(*nplurals >= '0' && *nplurals <= '9'))
+	    goto no_plural;
+#if defined HAVE_STRTOUL || defined _LIBC
+	  n = strtoul (nplurals, &endp, 10);
+#else
+	  for (endp = nplurals, n = 0; *endp >= '0' && *endp <= '9'; endp++)
+	    n = n * 10 + (*endp - '0');
+#endif
+	  if (nplurals == endp)
+	    goto no_plural;
+	  *npluralsp = n;
+
+	  /* Due to the restrictions bison imposes onto the interface of the
+	     scanner function we have to put the input string and the result
+	     passed up from the parser into the same structure which address
+	     is passed down to the parser.  */
+	  plural += 7;
+	  args.cp = plural;
+	  if (PLURAL_PARSE (&args) != 0)
+	    goto no_plural;
+	  *pluralp = args.res;
+	}
+    }
+  else
+    {
+      /* By default we are using the Germanic form: singular form only
+         for `one', the plural form otherwise.  Yes, this is also what
+         English is using since English is a Germanic language.  */
+    no_plural:
+      INIT_GERMANIC_PLURAL ();
+      *pluralp = &GERMANIC_PLURAL;
+      *npluralsp = 2;
+    }
+}
diff --git a/intl/plural-exp.h b/intl/plural-exp.h
new file mode 100644
index 0000000..93cdaef
--- /dev/null
+++ b/intl/plural-exp.h
@@ -0,0 +1,126 @@
+/* Expression parsing and evaluation for plural form selection.
+   Copyright (C) 2000, 2001, 2002 Free Software Foundation, Inc.
+   Written by Ulrich Drepper <drepper@cygnus.com>, 2000.
+
+   This program is free software; you can redistribute it and/or modify it
+   under the terms of the GNU Library General Public License as published
+   by the Free Software Foundation; either version 2, or (at your option)
+   any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   Library General Public License for more details.
+
+   You should have received a copy of the GNU Library General Public
+   License along with this program; if not, write to the Free Software
+   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
+   USA.  */
+
+#ifndef _PLURAL_EXP_H
+#define _PLURAL_EXP_H
+
+#ifndef PARAMS
+# if __STDC__ || defined __GNUC__ || defined __SUNPRO_C || defined __cplusplus || __PROTOTYPES
+#  define PARAMS(args) args
+# else
+#  define PARAMS(args) ()
+# endif
+#endif
+
+#ifndef internal_function
+# define internal_function
+#endif
+
+#ifndef attribute_hidden
+# define attribute_hidden
+#endif
+
+
+/* This is the representation of the expressions to determine the
+   plural form.  */
+struct expression
+{
+  int nargs;			/* Number of arguments.  */
+  enum operator
+  {
+    /* Without arguments:  */
+    var,			/* The variable "n".  */
+    num,			/* Decimal number.  */
+    /* Unary operators:  */
+    lnot,			/* Logical NOT.  */
+    /* Binary operators:  */
+    mult,			/* Multiplication.  */
+    divide,			/* Division.  */
+    module,			/* Modulo operation.  */
+    plus,			/* Addition.  */
+    minus,			/* Subtraction.  */
+    less_than,			/* Comparison.  */
+    greater_than,		/* Comparison.  */
+    less_or_equal,		/* Comparison.  */
+    greater_or_equal,		/* Comparison.  */
+    equal,			/* Comparison for equality.  */
+    not_equal,			/* Comparison for inequality.  */
+    land,			/* Logical AND.  */
+    lor,			/* Logical OR.  */
+    /* Ternary operators:  */
+    qmop			/* Question mark operator.  */
+  } operation;
+  union
+  {
+    unsigned long int num;	/* Number value for `num'.  */
+    struct expression *args[3];	/* Up to three arguments.  */
+  } val;
+};
+
+/* This is the data structure to pass information to the parser and get
+   the result in a thread-safe way.  */
+struct parse_args
+{
+  const char *cp;
+  struct expression *res;
+};
+
+
+/* Names for the libintl functions are a problem.  This source code is used
+   1. in the GNU C Library library,
+   2. in the GNU libintl library,
+   3. in the GNU gettext tools.
+   The function names in each situation must be different, to allow for
+   binary incompatible changes in 'struct expression'.  Furthermore,
+   1. in the GNU C Library library, the names have a __ prefix,
+   2.+3. in the GNU libintl library and in the GNU gettext tools, the names
+         must follow ANSI C and not start with __.
+   So we have to distinguish the three cases.  */
+#ifdef _LIBC
+# define FREE_EXPRESSION __gettext_free_exp
+# define PLURAL_PARSE __gettextparse
+# define GERMANIC_PLURAL __gettext_germanic_plural
+# define EXTRACT_PLURAL_EXPRESSION __gettext_extract_plural
+#elif defined (IN_LIBINTL)
+# define FREE_EXPRESSION gettext_free_exp__
+# define PLURAL_PARSE gettextparse__
+# define GERMANIC_PLURAL gettext_germanic_plural__
+# define EXTRACT_PLURAL_EXPRESSION gettext_extract_plural__
+#else
+# define FREE_EXPRESSION free_plural_expression
+# define PLURAL_PARSE parse_plural_expression
+# define GERMANIC_PLURAL germanic_plural
+# define EXTRACT_PLURAL_EXPRESSION extract_plural_expression
+#endif
+
+extern void FREE_EXPRESSION PARAMS ((struct expression *exp))
+     internal_function;
+extern int PLURAL_PARSE PARAMS ((void *arg));
+extern struct expression GERMANIC_PLURAL attribute_hidden;
+extern void EXTRACT_PLURAL_EXPRESSION PARAMS ((const char *nullentry,
+					       struct expression **pluralp,
+					       unsigned long int *npluralsp))
+     internal_function;
+
+#if !defined (_LIBC) && !defined (IN_LIBINTL)
+extern unsigned long int plural_eval PARAMS ((struct expression *pexp,
+					      unsigned long int n));
+#endif
+
+#endif /* _PLURAL_EXP_H */
diff --git a/intl/plural.c b/intl/plural.c
index 640d43c..c9ff63f 100644
--- a/intl/plural.c
+++ b/intl/plural.c
@@ -50,30 +50,26 @@
 # include <config.h>
 #endif
 
+#include <stddef.h>
 #include <stdlib.h>
-#include "gettextP.h"
-
-/* Names for the libintl functions are a problem.  They must not clash
-   with existing names and they should follow ANSI C.  But this source
-   code is also used in GNU C Library where the names have a __
-   prefix.  So we have to make a difference here.  */
-#ifdef _LIBC
-# define FREE_EXPRESSION __gettext_free_exp
-#else
-# define FREE_EXPRESSION gettext_free_exp__
-# define __gettextparse gettextparse__
+#include "plural-exp.h"
+
+/* The main function generated by the parser is called __gettextparse,
+   but we want it to be called PLURAL_PARSE.  */
+#ifndef _LIBC
+# define __gettextparse PLURAL_PARSE
 #endif
 
 #define YYLEX_PARAM	&((struct parse_args *) arg)->cp
 #define YYPARSE_PARAM	arg
 
-#line 53 "plural.y"
+#line 49 "plural.y"
 typedef union {
   unsigned long int num;
   enum operator op;
   struct expression *exp;
 } YYSTYPE;
-#line 59 "plural.y"
+#line 55 "plural.y"
 
 /* Prototypes for local functions.  */
 static struct expression *new_exp PARAMS ((int nargs, enum operator op,
@@ -235,8 +231,8 @@ static const short yyrhs[] = {    17,
 
 #if YYDEBUG != 0
 static const short yyrline[] = { 0,
-   178,   186,   190,   194,   198,   202,   206,   210,   214,   218,
-   222,   227
+   174,   182,   186,   190,   194,   198,   202,   206,   210,   214,
+   218,   223
 };
 #endif
 
@@ -303,7 +299,7 @@ static const short yycheck[] = {     1,
 #define YYPURE 1
 
 /* -*-C-*-  Note some compilers choke on comments on `#line' lines.  */
-#line 3 "/home/haible/gnu/arch/linuxlibc6/share/bison.simple"
+#line 3 "/usr/local/share/bison.simple"
 /* This file comes from bison-1.28.  */
 
 /* Skeleton output parser for bison,
@@ -517,7 +513,7 @@ __yy_memcpy (char *to, char *from, unsigned int count)
 #endif
 #endif
 
-#line 217 "/home/haible/gnu/arch/linuxlibc6/share/bison.simple"
+#line 217 "/usr/local/share/bison.simple"
 
 /* The user can define YYPARSE_PARAM as the name of an argument to be passed
    into yyparse.  The argument should have type void *.
@@ -846,7 +842,7 @@ yyreduce:
   switch (yyn) {
 
 case 1:
-#line 179 "plural.y"
+#line 175 "plural.y"
 {
 	    if (yyvsp[0].exp == NULL)
 	      YYABORT;
@@ -854,75 +850,75 @@ case 1:
 	  ;
     break;}
 case 2:
-#line 187 "plural.y"
+#line 183 "plural.y"
 {
 	    yyval.exp = new_exp_3 (qmop, yyvsp[-4].exp, yyvsp[-2].exp, yyvsp[0].exp);
 	  ;
     break;}
 case 3:
-#line 191 "plural.y"
+#line 187 "plural.y"
 {
 	    yyval.exp = new_exp_2 (lor, yyvsp[-2].exp, yyvsp[0].exp);
 	  ;
     break;}
 case 4:
-#line 195 "plural.y"
+#line 191 "plural.y"
 {
 	    yyval.exp = new_exp_2 (land, yyvsp[-2].exp, yyvsp[0].exp);
 	  ;
     break;}
 case 5:
-#line 199 "plural.y"
+#line 195 "plural.y"
 {
 	    yyval.exp = new_exp_2 (yyvsp[-1].op, yyvsp[-2].exp, yyvsp[0].exp);
 	  ;
     break;}
 case 6:
-#line 203 "plural.y"
+#line 199 "plural.y"
 {
 	    yyval.exp = new_exp_2 (yyvsp[-1].op, yyvsp[-2].exp, yyvsp[0].exp);
 	  ;
     break;}
 case 7:
-#line 207 "plural.y"
+#line 203 "plural.y"
 {
 	    yyval.exp = new_exp_2 (yyvsp[-1].op, yyvsp[-2].exp, yyvsp[0].exp);
 	  ;
     break;}
 case 8:
-#line 211 "plural.y"
+#line 207 "plural.y"
 {
 	    yyval.exp = new_exp_2 (yyvsp[-1].op, yyvsp[-2].exp, yyvsp[0].exp);
 	  ;
     break;}
 case 9:
-#line 215 "plural.y"
+#line 211 "plural.y"
 {
 	    yyval.exp = new_exp_1 (lnot, yyvsp[0].exp);
 	  ;
     break;}
 case 10:
-#line 219 "plural.y"
+#line 215 "plural.y"
 {
 	    yyval.exp = new_exp_0 (var);
 	  ;
     break;}
 case 11:
-#line 223 "plural.y"
+#line 219 "plural.y"
 {
 	    if ((yyval.exp = new_exp_0 (num)) != NULL)
 	      yyval.exp->val.num = yyvsp[0].num;
 	  ;
     break;}
 case 12:
-#line 228 "plural.y"
+#line 224 "plural.y"
 {
 	    yyval.exp = yyvsp[-1].exp;
 	  ;
     break;}
 }
    /* the action file gets copied in in place of this dollarsign */
-#line 543 "/home/haible/gnu/arch/linuxlibc6/share/bison.simple"
+#line 543 "/usr/local/share/bison.simple"
 
   yyvsp -= yylen;
   yyssp -= yylen;
@@ -1142,7 +1138,7 @@ yyerrhandle:
     }
   return 1;
 }
-#line 233 "plural.y"
+#line 229 "plural.y"
 
 
 void
diff --git a/intl/plural.y b/intl/plural.y
index be049a6..616b7c1 100644
--- a/intl/plural.y
+++ b/intl/plural.y
@@ -30,25 +30,21 @@
 # include <config.h>
 #endif
 
+#include <stddef.h>
 #include <stdlib.h>
-#include "gettextP.h"
-
-/* Names for the libintl functions are a problem.  They must not clash
-   with existing names and they should follow ANSI C.  But this source
-   code is also used in GNU C Library where the names have a __
-   prefix.  So we have to make a difference here.  */
-#ifdef _LIBC
-# define FREE_EXPRESSION __gettext_free_exp
-#else
-# define FREE_EXPRESSION gettext_free_exp__
-# define __gettextparse gettextparse__
+#include "plural-exp.h"
+
+/* The main function generated by the parser is called __gettextparse,
+   but we want it to be called PLURAL_PARSE.  */
+#ifndef _LIBC
+# define __gettextparse PLURAL_PARSE
 #endif
 
 #define YYLEX_PARAM	&((struct parse_args *) arg)->cp
 #define YYPARSE_PARAM	arg
 %}
 %pure_parser
-%expect 10
+%expect 7
 
 %union {
   unsigned long int num;
diff --git a/intl/textdomain.c b/intl/textdomain.c
index 2e420ad..8fb4ea0 100644
--- a/intl/textdomain.c
+++ b/intl/textdomain.c
@@ -1,5 +1,5 @@
 /* Implementation of the textdomain(3) function.
-   Copyright (C) 1995-1998, 2000, 2001 Free Software Foundation, Inc.
+   Copyright (C) 1995-1998, 2000, 2001, 2002 Free Software Foundation, Inc.
 
    This program is free software; you can redistribute it and/or modify it
    under the terms of the GNU Library General Public License as published
@@ -51,10 +51,10 @@
 /* @@ end of prolog @@ */
 
 /* Name of the default text domain.  */
-extern const char _nl_default_default_domain[];
+extern const char _nl_default_default_domain[] attribute_hidden;
 
 /* Default text domain in which entries for gettext(3) are to be found.  */
-extern const char *_nl_current_default_domain;
+extern const char *_nl_current_default_domain attribute_hidden;
 
 
 /* Names for the libintl functions are a problem.  They must not clash
@@ -71,7 +71,7 @@ extern const char *_nl_current_default_domain;
 #endif
 
 /* Lock variable to protect the global data in the gettext implementation.  */
-__libc_rwlock_define (extern, _nl_state_lock)
+__libc_rwlock_define (extern, _nl_state_lock attribute_hidden)
 
 /* Set the current default message catalog to DOMAINNAME.
    If DOMAINNAME is null, return the current default.
-- 
Gitee


From ccce22cf978cf15200ebd92e94d5375a505ae53f Mon Sep 17 00:00:00 2001
From: Jeff Johnson <n3npq@mac.com>
Date: Sun, 21 Jul 2002 14:23:20 +0000
Subject: [PATCH 355/667] Remove obsolete files.

---
 intl/gettext.h    | 102 ----------------------------------------------
 intl/libgettext.h |  49 ----------------------
 2 files changed, 151 deletions(-)
 delete mode 100644 intl/gettext.h
 delete mode 100644 intl/libgettext.h

diff --git a/intl/gettext.h b/intl/gettext.h
deleted file mode 100644
index 6f5d760..0000000
--- a/intl/gettext.h
+++ /dev/null
@@ -1,102 +0,0 @@
-/* Description of GNU message catalog format: general file layout.
-   Copyright (C) 1995, 1997, 2000, 2001 Free Software Foundation, Inc.
-
-   This program is free software; you can redistribute it and/or modify it
-   under the terms of the GNU Library General Public License as published
-   by the Free Software Foundation; either version 2, or (at your option)
-   any later version.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   Library General Public License for more details.
-
-   You should have received a copy of the GNU Library General Public
-   License along with this program; if not, write to the Free Software
-   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
-   USA.  */
-
-#ifndef _GETTEXT_H
-#define _GETTEXT_H 1
-
-#if HAVE_LIMITS_H || _LIBC
-# include <limits.h>
-#endif
-
-/* @@ end of prolog @@ */
-
-/* The magic number of the GNU message catalog format.  */
-#define _MAGIC 0x950412de
-#define _MAGIC_SWAPPED 0xde120495
-
-/* Revision number of the currently used .mo (binary) file format.  */
-#define MO_REVISION_NUMBER 0
-
-/* The following contortions are an attempt to use the C preprocessor
-   to determine an unsigned integral type that is 32 bits wide.  An
-   alternative approach is to use autoconf's AC_CHECK_SIZEOF macro, but
-   as of version autoconf-2.13, the AC_CHECK_SIZEOF macro doesn't work
-   when cross-compiling.  */
-
-#if __STDC__
-# define UINT_MAX_32_BITS 4294967295U
-#else
-# define UINT_MAX_32_BITS 0xFFFFFFFF
-#endif
-
-/* If UINT_MAX isn't defined, assume it's a 32-bit type.
-   This should be valid for all systems GNU cares about because
-   that doesn't include 16-bit systems, and only modern systems
-   (that certainly have <limits.h>) have 64+-bit integral types.  */
-
-#ifndef UINT_MAX
-# define UINT_MAX UINT_MAX_32_BITS
-#endif
-
-#if UINT_MAX == UINT_MAX_32_BITS
-typedef unsigned nls_uint32;
-#else
-# if USHRT_MAX == UINT_MAX_32_BITS
-typedef unsigned short nls_uint32;
-# else
-#  if ULONG_MAX == UINT_MAX_32_BITS
-typedef unsigned long nls_uint32;
-#  else
-  /* The following line is intended to throw an error.  Using #error is
-     not portable enough.  */
-  "Cannot determine unsigned 32-bit data type."
-#  endif
-# endif
-#endif
-
-
-/* Header for binary .mo file format.  */
-struct mo_file_header
-{
-  /* The magic number.  */
-  nls_uint32 magic;
-  /* The revision number of the file format.  */
-  nls_uint32 revision;
-  /* The number of strings pairs.  */
-  nls_uint32 nstrings;
-  /* Offset of table with start offsets of original strings.  */
-  nls_uint32 orig_tab_offset;
-  /* Offset of table with start offsets of translation strings.  */
-  nls_uint32 trans_tab_offset;
-  /* Size of hashing table.  */
-  nls_uint32 hash_tab_size;
-  /* Offset of first hashing entry.  */
-  nls_uint32 hash_tab_offset;
-};
-
-struct string_desc
-{
-  /* Length of addressed string.  */
-  nls_uint32 length;
-  /* Offset of string in file.  */
-  nls_uint32 offset;
-};
-
-/* @@ begin of epilog @@ */
-
-#endif	/* gettext.h  */
diff --git a/intl/libgettext.h b/intl/libgettext.h
deleted file mode 100644
index c5be54a..0000000
--- a/intl/libgettext.h
+++ /dev/null
@@ -1,49 +0,0 @@
-/* Convenience header for conditional use of GNU <libintl.h>.
-   Copyright (C) 1995-1998, 2000, 2001 Free Software Foundation, Inc.
-
-   This program is free software; you can redistribute it and/or modify it
-   under the terms of the GNU Library General Public License as published
-   by the Free Software Foundation; either version 2, or (at your option)
-   any later version.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   Library General Public License for more details.
-
-   You should have received a copy of the GNU Library General Public
-   License along with this program; if not, write to the Free Software
-   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
-   USA.  */
-
-#ifndef _LIBGETTEXT_H
-#define _LIBGETTEXT_H 1
-
-/* NLS can be disabled through the configure --disable-nls option.  */
-#if ENABLE_NLS
-
-/* Get declarations of GNU message catalog functions.  */
-# include <libintl.h>
-
-#else
-
-# define gettext(Msgid) (Msgid)
-# define dgettext(Domainname, Msgid) (Msgid)
-# define dcgettext(Domainname, Msgid, Category) (Msgid)
-# define ngettext(Msgid1, Msgid2, N) \
-    ((N) == 1 ? (char *) (Msgid1) : (char *) (Msgid2))
-# define dngettext(Domainname, Msgid1, Msgid2, N) \
-    ((N) == 1 ? (char *) (Msgid1) : (char *) (Msgid2))
-# define dcngettext(Domainname, Msgid1, Msgid2, N, Category) \
-    ((N) == 1 ? (char *) (Msgid1) : (char *) (Msgid2))
-# define textdomain(Domainname) ((char *) (Domainname))
-# define bindtextdomain(Domainname, Dirname) ((char *) (Dirname))
-# define bind_textdomain_codeset(Domainname, Codeset) ((char *) (Codeset))
-
-#endif
-
-/* For automatical extraction of messages sometimes no real
-   translation is needed.  Instead the string itself is the result.  */
-#define gettext_noop(Str) (Str)
-
-#endif /* _LIBGETTEXT_H */
-- 
Gitee


From 1eb631a04cb2bc1b53cf054ab30ca0b923d90f13 Mon Sep 17 00:00:00 2001
From: Jeff Johnson <n3npq@mac.com>
Date: Wed, 24 Jul 2002 16:21:59 +0000
Subject: [PATCH 356/667] - verify signatures/digests retrieved through
 rpmdbNextIterator(). - imbue %ghost with missingok attribute with --verify
 (#68933).

---
 poptint.h | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/poptint.h b/poptint.h
index a4f9147..e612e92 100644
--- a/poptint.h
+++ b/poptint.h
@@ -23,17 +23,17 @@ _free(/*@only@*/ /*@null@*/ const void * p)
 }
 
 /* Bit mask macros. */
-/*@-exporttype@*/
+/*@-exporttype -redef @*/
 typedef	unsigned int __pbm_bits;
-/*@=exporttype@*/
+/*@=exporttype =redef @*/
 #define	__PBM_NBITS		(8 * sizeof (__pbm_bits))
 #define	__PBM_IX(d)		((d) / __PBM_NBITS)
 #define __PBM_MASK(d)		((__pbm_bits) 1 << (((unsigned)(d)) % __PBM_NBITS))
-/*@-exporttype@*/
+/*@-exporttype -redef @*/
 typedef struct {
     __pbm_bits bits[1];
 } pbm_set;
-/*@=exporttype@*/
+/*@=exporttype =redef @*/
 #define	__PBM_BITS(set)	((set)->bits)
 
 #define	PBM_ALLOC(d)	calloc(__PBM_IX (d) + 1, sizeof(__pbm_bits))
-- 
Gitee


From 8732b4747d37481084cf626e056bee2b90376e64 Mon Sep 17 00:00:00 2001
From: Jeff Johnson <n3npq@mac.com>
Date: Thu, 25 Jul 2002 17:03:11 +0000
Subject: [PATCH 357/667] - python: remove the old initdb/rebuilddb methods,
 use ts.fooDB(). - python: 1st crack at backport to 1.5.2.

---
 po/cs.po           | 2 +-
 po/da.po           | 2 +-
 po/de.po           | 2 +-
 po/es.po           | 2 +-
 po/eu_ES.po        | 2 +-
 po/fi.po           | 2 +-
 po/fr.po           | 2 +-
 po/gl.po           | 2 +-
 po/hu.po           | 2 +-
 po/id.po           | 2 +-
 po/is.po           | 2 +-
 po/it.po           | 2 +-
 po/ja.po           | 2 +-
 po/ko.po           | 2 +-
 po/no.po           | 2 +-
 po/pl.po           | 2 +-
 po/popt.pot        | 2 +-
 po/pt.po           | 2 +-
 po/pt_BR.po        | 2 +-
 po/ro.po           | 2 +-
 po/ru.po           | 2 +-
 po/sk.po           | 2 +-
 po/sl.po           | 2 +-
 po/sr.po           | 2 +-
 po/sv.po           | 2 +-
 po/tr.po           | 2 +-
 po/uk.po           | 2 +-
 po/wa.po           | 2 +-
 po/zh.po           | 2 +-
 po/zh_CN.GB2312.po | 2 +-
 popthelp.c         | 8 +++++---
 31 files changed, 35 insertions(+), 33 deletions(-)

diff --git a/po/cs.po b/po/cs.po
index 40bbdf4..c86cd32 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.3\n"
-"POT-Creation-Date: 2002-07-20 15:04-0400\n"
+"POT-Creation-Date: 2002-07-25 11:05-0400\n"
 "PO-Revision-Date: 2001-07-24 00:03+0100\n"
 "Last-Translator: Milan Kerslager <kerslage@linux.cz>\n"
 "Language-Team: Czech <cs@li.org>\n"
diff --git a/po/da.po b/po/da.po
index 92c6987..974b4ff 100644
--- a/po/da.po
+++ b/po/da.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.3\n"
-"POT-Creation-Date: 2002-07-20 15:04-0400\n"
+"POT-Creation-Date: 2002-07-25 11:05-0400\n"
 "PO-Revision-Date: Sun Jan 21 2001 04:30:32+0200\n"
 "Last-Translator: Martin Hansen <mah@k64.dk>\n"
 "Language-Team: Dansk <dansk@klid.dk>\n"
diff --git a/po/de.po b/po/de.po
index e973070..7bd8231 100644
--- a/po/de.po
+++ b/po/de.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.3\n"
-"POT-Creation-Date: 2002-07-20 15:04-0400\n"
+"POT-Creation-Date: 2002-07-25 11:05-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/po/es.po b/po/es.po
index 53a05a5..bbbf7ed 100644
--- a/po/es.po
+++ b/po/es.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.3\n"
-"POT-Creation-Date: 2002-07-20 15:04-0400\n"
+"POT-Creation-Date: 2002-07-25 11:05-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Leandro Lucarella <luca@linuxmendoza.org.ar>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/po/eu_ES.po b/po/eu_ES.po
index e973070..7bd8231 100644
--- a/po/eu_ES.po
+++ b/po/eu_ES.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.3\n"
-"POT-Creation-Date: 2002-07-20 15:04-0400\n"
+"POT-Creation-Date: 2002-07-25 11:05-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/po/fi.po b/po/fi.po
index e973070..7bd8231 100644
--- a/po/fi.po
+++ b/po/fi.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.3\n"
-"POT-Creation-Date: 2002-07-20 15:04-0400\n"
+"POT-Creation-Date: 2002-07-25 11:05-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/po/fr.po b/po/fr.po
index e973070..7bd8231 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.3\n"
-"POT-Creation-Date: 2002-07-20 15:04-0400\n"
+"POT-Creation-Date: 2002-07-25 11:05-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/po/gl.po b/po/gl.po
index f2a23ad..d058039 100644
--- a/po/gl.po
+++ b/po/gl.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.3\n"
-"POT-Creation-Date: 2002-07-20 15:04-0400\n"
+"POT-Creation-Date: 2002-07-25 11:05-0400\n"
 "PO-Revision-Date: 2001-01-17 01:01+0100\n"
 "Last-Translator: Jes�s Bravo �lvarez <jba@pobox.com>\n"
 "Language-Team: Galician <trasno@ceu.fi.udc.es>\n"
diff --git a/po/hu.po b/po/hu.po
index 4a985cf..0f19c64 100644
--- a/po/hu.po
+++ b/po/hu.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.3\n"
-"POT-Creation-Date: 2002-07-20 15:04-0400\n"
+"POT-Creation-Date: 2002-07-25 11:05-0400\n"
 "PO-Revision-Date: 2000-08-03 23:26+0200\n"
 "Last-Translator: L�szl� N�meth <nemeth@qwertynet.hu>\n"
 "Language-Team: Hungarian\n"
diff --git a/po/id.po b/po/id.po
index e973070..7bd8231 100644
--- a/po/id.po
+++ b/po/id.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.3\n"
-"POT-Creation-Date: 2002-07-20 15:04-0400\n"
+"POT-Creation-Date: 2002-07-25 11:05-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/po/is.po b/po/is.po
index 0686373..6cf08c8 100644
--- a/po/is.po
+++ b/po/is.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.3\n"
-"POT-Creation-Date: 2002-07-20 15:04-0400\n"
+"POT-Creation-Date: 2002-07-25 11:05-0400\n"
 "PO-Revision-Date: 2001-06-08 01:35+0000\n"
 "Last-Translator: Richard Allen <ra@hp.is>\n"
 "Language-Team: is <kde-isl@mmedia.is>\n"
diff --git a/po/it.po b/po/it.po
index e973070..7bd8231 100644
--- a/po/it.po
+++ b/po/it.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.3\n"
-"POT-Creation-Date: 2002-07-20 15:04-0400\n"
+"POT-Creation-Date: 2002-07-25 11:05-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/po/ja.po b/po/ja.po
index e973070..7bd8231 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.3\n"
-"POT-Creation-Date: 2002-07-20 15:04-0400\n"
+"POT-Creation-Date: 2002-07-25 11:05-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/po/ko.po b/po/ko.po
index 7e5b1af..6d273f7 100644
--- a/po/ko.po
+++ b/po/ko.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6\n"
-"POT-Creation-Date: 2002-07-20 15:04-0400\n"
+"POT-Creation-Date: 2002-07-25 11:05-0400\n"
 "PO-Revision-Date: 2001-09-06 20:06+0900\n"
 "Last-Translator: Jong-Hoon Ryu <redhat4u@netian.com>\n"
 "Language-Team: GNU Translation project <ko@li.org>\n"
diff --git a/po/no.po b/po/no.po
index 5501a12..ee34aa8 100644
--- a/po/no.po
+++ b/po/no.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.3\n"
-"POT-Creation-Date: 2002-07-20 15:04-0400\n"
+"POT-Creation-Date: 2002-07-25 11:05-0400\n"
 "PO-Revision-Date: 2001-06-27 11:05+0200\n"
 "Last-Translator: Kjartan Maraas <kmaraas@online.no>\n"
 "Language-Team: Norwegian <no@li.org>\n"
diff --git a/po/pl.po b/po/pl.po
index e973070..7bd8231 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.3\n"
-"POT-Creation-Date: 2002-07-20 15:04-0400\n"
+"POT-Creation-Date: 2002-07-25 11:05-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/po/popt.pot b/po/popt.pot
index b60a954..98699ad 100644
--- a/po/popt.pot
+++ b/po/popt.pot
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2002-07-20 15:04-0400\n"
+"POT-Creation-Date: 2002-07-25 11:05-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/po/pt.po b/po/pt.po
index 54f91d1..156435f 100644
--- a/po/pt.po
+++ b/po/pt.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt\n"
-"POT-Creation-Date: 2002-07-20 15:04-0400\n"
+"POT-Creation-Date: 2002-07-25 11:05-0400\n"
 "PO-Revision-Date: 2002-02-13 18:32+0000\n"
 "Last-Translator: Pedro Morais <morais@kde.org>\n"
 "Language-Team: pt <morais@kde.org>\n"
diff --git a/po/pt_BR.po b/po/pt_BR.po
index e973070..7bd8231 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.3\n"
-"POT-Creation-Date: 2002-07-20 15:04-0400\n"
+"POT-Creation-Date: 2002-07-25 11:05-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/po/ro.po b/po/ro.po
index 88a5dfc..e6a8b34 100644
--- a/po/ro.po
+++ b/po/ro.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.3\n"
-"POT-Creation-Date: 2002-07-20 15:04-0400\n"
+"POT-Creation-Date: 2002-07-25 11:05-0400\n"
 "PO-Revision-Date: 2000-06-14 23:23+EST\n"
 "Last-Translator: Cristian Gafton <gafton@redhat.com>\n"
 "Language-Team: Romanian <ro@li.org>\n"
diff --git a/po/ru.po b/po/ru.po
index c8e0cc5..a7d719e 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.3\n"
-"POT-Creation-Date: 2002-07-20 15:04-0400\n"
+"POT-Creation-Date: 2002-07-25 11:05-0400\n"
 "PO-Revision-Date: 2001-07-05 21:00-0500\n"
 "Last-Translator: Eugene Kanter <eugene@blackcatlinux.com>\n"
 "Language-Team: Black Cat Linux Team <blackcat-support@blackcatlinux.com>\n"
diff --git a/po/sk.po b/po/sk.po
index d521434..69dc5e4 100644
--- a/po/sk.po
+++ b/po/sk.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.3\n"
-"POT-Creation-Date: 2002-07-20 15:04-0400\n"
+"POT-Creation-Date: 2002-07-25 11:05-0400\n"
 "PO-Revision-Date: 1999-08-04 21:40+0200\n"
 "Last-Translator: Stanislav Meduna <stano@eunet.sk>\n"
 "Language-Team: Slovak <sk-i18n@rak.isternet.sk>\n"
diff --git a/po/sl.po b/po/sl.po
index d32e36c..ea5ea88 100644
--- a/po/sl.po
+++ b/po/sl.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.3\n"
-"POT-Creation-Date: 2002-07-20 15:04-0400\n"
+"POT-Creation-Date: 2002-07-25 11:05-0400\n"
 "PO-Revision-Date: 2000-09-05 12:30+0200\n"
 "Last-Translator: Roman Maurer <roman.maurer@hermes.si>\n"
 "Language-Team: Slovenian <sl@li.org>\n"
diff --git a/po/sr.po b/po/sr.po
index e973070..7bd8231 100644
--- a/po/sr.po
+++ b/po/sr.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.3\n"
-"POT-Creation-Date: 2002-07-20 15:04-0400\n"
+"POT-Creation-Date: 2002-07-25 11:05-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/po/sv.po b/po/sv.po
index c7b3062..1bf94d1 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.3\n"
-"POT-Creation-Date: 2002-07-20 15:04-0400\n"
+"POT-Creation-Date: 2002-07-25 11:05-0400\n"
 "PO-Revision-Date: 2001-07-12 22:26+0100\n"
 "Last-Translator: Christian Rose <menthos@menthos.com>\n"
 "Language-Team: Swedish <sv@li.org>\n"
diff --git a/po/tr.po b/po/tr.po
index d958fd1..ea33233 100644
--- a/po/tr.po
+++ b/po/tr.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.3\n"
-"POT-Creation-Date: 2002-07-20 15:04-0400\n"
+"POT-Creation-Date: 2002-07-25 11:05-0400\n"
 "PO-Revision-Date: 2000-02-11 13:01+0200\n"
 "Last-Translator: Nilgun Belma Buguner <nilgun@technologist.com>\n"
 "Language-Team: Turkish <tr@li.org>\n"
diff --git a/po/uk.po b/po/uk.po
index 4c47cb5..32bfb6e 100644
--- a/po/uk.po
+++ b/po/uk.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.3\n"
-"POT-Creation-Date: 2002-07-20 15:04-0400\n"
+"POT-Creation-Date: 2002-07-25 11:05-0400\n"
 "PO-Revision-Date: 1999-09-30 16:54+0200\n"
 "Last-Translator: Yuri Syrota <rasta@renome.rovno.ua>\n"
 "Language-Team: Ukrainian <uk@li.org>\n"
diff --git a/po/wa.po b/po/wa.po
index 6db9d08..4752ade 100644
--- a/po/wa.po
+++ b/po/wa.po
@@ -9,7 +9,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.3\n"
-"POT-Creation-Date: 2002-07-20 15:04-0400\n"
+"POT-Creation-Date: 2002-07-25 11:05-0400\n"
 "PO-Revision-Date: 1999-03-18 23:11+0100\n"
 "Last-Translator: Nobody yet\n"
 "Language-Team: walon <linux-wa@chanae.alphanet.ch>\n"
diff --git a/po/zh.po b/po/zh.po
index e973070..7bd8231 100644
--- a/po/zh.po
+++ b/po/zh.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.3\n"
-"POT-Creation-Date: 2002-07-20 15:04-0400\n"
+"POT-Creation-Date: 2002-07-25 11:05-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/po/zh_CN.GB2312.po b/po/zh_CN.GB2312.po
index 4f3deeb..b7cf54c 100644
--- a/po/zh_CN.GB2312.po
+++ b/po/zh_CN.GB2312.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.3\n"
-"POT-Creation-Date: 2002-07-20 15:04-0400\n"
+"POT-Creation-Date: 2002-07-25 11:05-0400\n"
 "PO-Revision-Date: 1999-11-11 05:04+0800\n"
 "Last-Translator: Dillion Chen <dillon.chen@turbolinux.com.cn>\n"
 "Language-Team: TLDN\n"
diff --git a/popthelp.c b/popthelp.c
index 801dca5..bb00e92 100644
--- a/popthelp.c
+++ b/popthelp.c
@@ -15,10 +15,10 @@
 /**
  * Display arguments.
  * @param con		context
- * @param foo
+ * @param foo		(unused)
  * @param key		option(s)
- * @param arg
- * @param data
+ * @param arg		(unused)
+ * @param data		(unused)
  */
 static void displayArgs(poptContext con,
 		/*@unused@*/ enum poptCallbackReason foo,
@@ -526,6 +526,7 @@ static int singleOptionUsage(FILE * fp, int cursor,
     const char * item = shortStr;
     const char * argDescrip = getArgDescrip(opt, translation_domain);
 
+fprintf(stderr, "*** singleOptionUsage(%p,%d,%p,%p)\n", fp, cursor, opt, translation_domain);
     if (opt->shortName!= '\0' ) {
 	if (!(opt->argInfo & POPT_ARG_MASK)) 
 	    return cursor;	/* we did these already */
@@ -602,6 +603,7 @@ static int singleTableUsage(poptContext con, FILE * fp,
 	/*@globals fileSystem @*/
 	/*@modifies *fp, fileSystem @*/
 {
+fprintf(stderr, "*** singleTableUsage(%p,%p,%d,%p,%p)\n", con, fp, cursor, opt, translation_domain);
     /*@-branchstate@*/		/* FIX: W2DO? */
     if (opt != NULL)
     for (; (opt->longName || opt->shortName || opt->arg) ; opt++) {
-- 
Gitee


From b7dc133115111f832d0fcfb62133a68f4d0bc288 Mon Sep 17 00:00:00 2001
From: Jeff Johnson <n3npq@mac.com>
Date: Thu, 25 Jul 2002 18:50:08 +0000
Subject: [PATCH 358/667] - popt: fix --usage (#62234).

---
 po/cs.po           |  2 +-
 po/da.po           |  2 +-
 po/de.po           |  2 +-
 po/es.po           |  2 +-
 po/eu_ES.po        |  2 +-
 po/fi.po           |  2 +-
 po/fr.po           |  2 +-
 po/gl.po           |  2 +-
 po/hu.po           |  2 +-
 po/id.po           |  2 +-
 po/is.po           |  2 +-
 po/it.po           |  2 +-
 po/ja.po           |  2 +-
 po/ko.po           |  2 +-
 po/no.po           |  2 +-
 po/pl.po           |  2 +-
 po/popt.pot        |  2 +-
 po/pt.po           |  2 +-
 po/pt_BR.po        |  2 +-
 po/ro.po           |  2 +-
 po/ru.po           |  2 +-
 po/sk.po           |  2 +-
 po/sl.po           |  2 +-
 po/sr.po           |  2 +-
 po/sv.po           |  2 +-
 po/tr.po           |  2 +-
 po/uk.po           |  2 +-
 po/wa.po           |  2 +-
 po/zh.po           |  2 +-
 po/zh_CN.GB2312.po |  2 +-
 popthelp.c         | 35 ++++++++++++++++++++++-------------
 31 files changed, 52 insertions(+), 43 deletions(-)

diff --git a/po/cs.po b/po/cs.po
index c86cd32..95285b6 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.3\n"
-"POT-Creation-Date: 2002-07-25 11:05-0400\n"
+"POT-Creation-Date: 2002-07-25 14:27-0400\n"
 "PO-Revision-Date: 2001-07-24 00:03+0100\n"
 "Last-Translator: Milan Kerslager <kerslage@linux.cz>\n"
 "Language-Team: Czech <cs@li.org>\n"
diff --git a/po/da.po b/po/da.po
index 974b4ff..8db09dd 100644
--- a/po/da.po
+++ b/po/da.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.3\n"
-"POT-Creation-Date: 2002-07-25 11:05-0400\n"
+"POT-Creation-Date: 2002-07-25 14:27-0400\n"
 "PO-Revision-Date: Sun Jan 21 2001 04:30:32+0200\n"
 "Last-Translator: Martin Hansen <mah@k64.dk>\n"
 "Language-Team: Dansk <dansk@klid.dk>\n"
diff --git a/po/de.po b/po/de.po
index 7bd8231..736af41 100644
--- a/po/de.po
+++ b/po/de.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.3\n"
-"POT-Creation-Date: 2002-07-25 11:05-0400\n"
+"POT-Creation-Date: 2002-07-25 14:27-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/po/es.po b/po/es.po
index bbbf7ed..2f08e70 100644
--- a/po/es.po
+++ b/po/es.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.3\n"
-"POT-Creation-Date: 2002-07-25 11:05-0400\n"
+"POT-Creation-Date: 2002-07-25 14:27-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Leandro Lucarella <luca@linuxmendoza.org.ar>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/po/eu_ES.po b/po/eu_ES.po
index 7bd8231..736af41 100644
--- a/po/eu_ES.po
+++ b/po/eu_ES.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.3\n"
-"POT-Creation-Date: 2002-07-25 11:05-0400\n"
+"POT-Creation-Date: 2002-07-25 14:27-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/po/fi.po b/po/fi.po
index 7bd8231..736af41 100644
--- a/po/fi.po
+++ b/po/fi.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.3\n"
-"POT-Creation-Date: 2002-07-25 11:05-0400\n"
+"POT-Creation-Date: 2002-07-25 14:27-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/po/fr.po b/po/fr.po
index 7bd8231..736af41 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.3\n"
-"POT-Creation-Date: 2002-07-25 11:05-0400\n"
+"POT-Creation-Date: 2002-07-25 14:27-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/po/gl.po b/po/gl.po
index d058039..52fb006 100644
--- a/po/gl.po
+++ b/po/gl.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.3\n"
-"POT-Creation-Date: 2002-07-25 11:05-0400\n"
+"POT-Creation-Date: 2002-07-25 14:27-0400\n"
 "PO-Revision-Date: 2001-01-17 01:01+0100\n"
 "Last-Translator: Jes�s Bravo �lvarez <jba@pobox.com>\n"
 "Language-Team: Galician <trasno@ceu.fi.udc.es>\n"
diff --git a/po/hu.po b/po/hu.po
index 0f19c64..c6495bb 100644
--- a/po/hu.po
+++ b/po/hu.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.3\n"
-"POT-Creation-Date: 2002-07-25 11:05-0400\n"
+"POT-Creation-Date: 2002-07-25 14:27-0400\n"
 "PO-Revision-Date: 2000-08-03 23:26+0200\n"
 "Last-Translator: L�szl� N�meth <nemeth@qwertynet.hu>\n"
 "Language-Team: Hungarian\n"
diff --git a/po/id.po b/po/id.po
index 7bd8231..736af41 100644
--- a/po/id.po
+++ b/po/id.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.3\n"
-"POT-Creation-Date: 2002-07-25 11:05-0400\n"
+"POT-Creation-Date: 2002-07-25 14:27-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/po/is.po b/po/is.po
index 6cf08c8..eee26a0 100644
--- a/po/is.po
+++ b/po/is.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.3\n"
-"POT-Creation-Date: 2002-07-25 11:05-0400\n"
+"POT-Creation-Date: 2002-07-25 14:27-0400\n"
 "PO-Revision-Date: 2001-06-08 01:35+0000\n"
 "Last-Translator: Richard Allen <ra@hp.is>\n"
 "Language-Team: is <kde-isl@mmedia.is>\n"
diff --git a/po/it.po b/po/it.po
index 7bd8231..736af41 100644
--- a/po/it.po
+++ b/po/it.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.3\n"
-"POT-Creation-Date: 2002-07-25 11:05-0400\n"
+"POT-Creation-Date: 2002-07-25 14:27-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/po/ja.po b/po/ja.po
index 7bd8231..736af41 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.3\n"
-"POT-Creation-Date: 2002-07-25 11:05-0400\n"
+"POT-Creation-Date: 2002-07-25 14:27-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/po/ko.po b/po/ko.po
index 6d273f7..bdcb332 100644
--- a/po/ko.po
+++ b/po/ko.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6\n"
-"POT-Creation-Date: 2002-07-25 11:05-0400\n"
+"POT-Creation-Date: 2002-07-25 14:27-0400\n"
 "PO-Revision-Date: 2001-09-06 20:06+0900\n"
 "Last-Translator: Jong-Hoon Ryu <redhat4u@netian.com>\n"
 "Language-Team: GNU Translation project <ko@li.org>\n"
diff --git a/po/no.po b/po/no.po
index ee34aa8..50473e2 100644
--- a/po/no.po
+++ b/po/no.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.3\n"
-"POT-Creation-Date: 2002-07-25 11:05-0400\n"
+"POT-Creation-Date: 2002-07-25 14:27-0400\n"
 "PO-Revision-Date: 2001-06-27 11:05+0200\n"
 "Last-Translator: Kjartan Maraas <kmaraas@online.no>\n"
 "Language-Team: Norwegian <no@li.org>\n"
diff --git a/po/pl.po b/po/pl.po
index 7bd8231..736af41 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.3\n"
-"POT-Creation-Date: 2002-07-25 11:05-0400\n"
+"POT-Creation-Date: 2002-07-25 14:27-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/po/popt.pot b/po/popt.pot
index 98699ad..1e7c603 100644
--- a/po/popt.pot
+++ b/po/popt.pot
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2002-07-25 11:05-0400\n"
+"POT-Creation-Date: 2002-07-25 14:27-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/po/pt.po b/po/pt.po
index 156435f..87c0065 100644
--- a/po/pt.po
+++ b/po/pt.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt\n"
-"POT-Creation-Date: 2002-07-25 11:05-0400\n"
+"POT-Creation-Date: 2002-07-25 14:27-0400\n"
 "PO-Revision-Date: 2002-02-13 18:32+0000\n"
 "Last-Translator: Pedro Morais <morais@kde.org>\n"
 "Language-Team: pt <morais@kde.org>\n"
diff --git a/po/pt_BR.po b/po/pt_BR.po
index 7bd8231..736af41 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.3\n"
-"POT-Creation-Date: 2002-07-25 11:05-0400\n"
+"POT-Creation-Date: 2002-07-25 14:27-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/po/ro.po b/po/ro.po
index e6a8b34..f4fd8c1 100644
--- a/po/ro.po
+++ b/po/ro.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.3\n"
-"POT-Creation-Date: 2002-07-25 11:05-0400\n"
+"POT-Creation-Date: 2002-07-25 14:27-0400\n"
 "PO-Revision-Date: 2000-06-14 23:23+EST\n"
 "Last-Translator: Cristian Gafton <gafton@redhat.com>\n"
 "Language-Team: Romanian <ro@li.org>\n"
diff --git a/po/ru.po b/po/ru.po
index a7d719e..d3e7880 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.3\n"
-"POT-Creation-Date: 2002-07-25 11:05-0400\n"
+"POT-Creation-Date: 2002-07-25 14:27-0400\n"
 "PO-Revision-Date: 2001-07-05 21:00-0500\n"
 "Last-Translator: Eugene Kanter <eugene@blackcatlinux.com>\n"
 "Language-Team: Black Cat Linux Team <blackcat-support@blackcatlinux.com>\n"
diff --git a/po/sk.po b/po/sk.po
index 69dc5e4..2690d92 100644
--- a/po/sk.po
+++ b/po/sk.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.3\n"
-"POT-Creation-Date: 2002-07-25 11:05-0400\n"
+"POT-Creation-Date: 2002-07-25 14:27-0400\n"
 "PO-Revision-Date: 1999-08-04 21:40+0200\n"
 "Last-Translator: Stanislav Meduna <stano@eunet.sk>\n"
 "Language-Team: Slovak <sk-i18n@rak.isternet.sk>\n"
diff --git a/po/sl.po b/po/sl.po
index ea5ea88..0f97240 100644
--- a/po/sl.po
+++ b/po/sl.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.3\n"
-"POT-Creation-Date: 2002-07-25 11:05-0400\n"
+"POT-Creation-Date: 2002-07-25 14:27-0400\n"
 "PO-Revision-Date: 2000-09-05 12:30+0200\n"
 "Last-Translator: Roman Maurer <roman.maurer@hermes.si>\n"
 "Language-Team: Slovenian <sl@li.org>\n"
diff --git a/po/sr.po b/po/sr.po
index 7bd8231..736af41 100644
--- a/po/sr.po
+++ b/po/sr.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.3\n"
-"POT-Creation-Date: 2002-07-25 11:05-0400\n"
+"POT-Creation-Date: 2002-07-25 14:27-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/po/sv.po b/po/sv.po
index 1bf94d1..5a6f9ae 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.3\n"
-"POT-Creation-Date: 2002-07-25 11:05-0400\n"
+"POT-Creation-Date: 2002-07-25 14:27-0400\n"
 "PO-Revision-Date: 2001-07-12 22:26+0100\n"
 "Last-Translator: Christian Rose <menthos@menthos.com>\n"
 "Language-Team: Swedish <sv@li.org>\n"
diff --git a/po/tr.po b/po/tr.po
index ea33233..371eb50 100644
--- a/po/tr.po
+++ b/po/tr.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.3\n"
-"POT-Creation-Date: 2002-07-25 11:05-0400\n"
+"POT-Creation-Date: 2002-07-25 14:27-0400\n"
 "PO-Revision-Date: 2000-02-11 13:01+0200\n"
 "Last-Translator: Nilgun Belma Buguner <nilgun@technologist.com>\n"
 "Language-Team: Turkish <tr@li.org>\n"
diff --git a/po/uk.po b/po/uk.po
index 32bfb6e..a8b5f62 100644
--- a/po/uk.po
+++ b/po/uk.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.3\n"
-"POT-Creation-Date: 2002-07-25 11:05-0400\n"
+"POT-Creation-Date: 2002-07-25 14:27-0400\n"
 "PO-Revision-Date: 1999-09-30 16:54+0200\n"
 "Last-Translator: Yuri Syrota <rasta@renome.rovno.ua>\n"
 "Language-Team: Ukrainian <uk@li.org>\n"
diff --git a/po/wa.po b/po/wa.po
index 4752ade..b48a4de 100644
--- a/po/wa.po
+++ b/po/wa.po
@@ -9,7 +9,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.3\n"
-"POT-Creation-Date: 2002-07-25 11:05-0400\n"
+"POT-Creation-Date: 2002-07-25 14:27-0400\n"
 "PO-Revision-Date: 1999-03-18 23:11+0100\n"
 "Last-Translator: Nobody yet\n"
 "Language-Team: walon <linux-wa@chanae.alphanet.ch>\n"
diff --git a/po/zh.po b/po/zh.po
index 7bd8231..736af41 100644
--- a/po/zh.po
+++ b/po/zh.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.3\n"
-"POT-Creation-Date: 2002-07-25 11:05-0400\n"
+"POT-Creation-Date: 2002-07-25 14:27-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/po/zh_CN.GB2312.po b/po/zh_CN.GB2312.po
index b7cf54c..6522f81 100644
--- a/po/zh_CN.GB2312.po
+++ b/po/zh_CN.GB2312.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.3\n"
-"POT-Creation-Date: 2002-07-25 11:05-0400\n"
+"POT-Creation-Date: 2002-07-25 14:27-0400\n"
 "PO-Revision-Date: 1999-11-11 05:04+0800\n"
 "Last-Translator: Dillion Chen <dillon.chen@turbolinux.com.cn>\n"
 "Language-Team: TLDN\n"
diff --git a/popthelp.c b/popthelp.c
index bb00e92..94af481 100644
--- a/popthelp.c
+++ b/popthelp.c
@@ -521,24 +521,26 @@ static int singleOptionUsage(FILE * fp, int cursor,
 	/*@globals fileSystem @*/
 	/*@modifies *fp, fileSystem @*/
 {
-    int len = 3;
+    int len = 4;
     char shortStr[2] = { '\0', '\0' };
     const char * item = shortStr;
     const char * argDescrip = getArgDescrip(opt, translation_domain);
 
-fprintf(stderr, "*** singleOptionUsage(%p,%d,%p,%p)\n", fp, cursor, opt, translation_domain);
-    if (opt->shortName!= '\0' ) {
-	if (!(opt->argInfo & POPT_ARG_MASK)) 
-	    return cursor;	/* we did these already */
+    if (opt->shortName != '\0' && opt->longName != NULL) {
+	len += 2;
+	if (!(opt->argInfo & POPT_ARGFLAG_ONEDASH)) len++;
+	len += strlen(opt->longName);
+    } else if (opt->shortName != '\0') {
 	len++;
 	shortStr[0] = opt->shortName;
 	shortStr[1] = '\0';
     } else if (opt->longName) {
-	len += 1 + strlen(opt->longName);
+	len += strlen(opt->longName);
+	if (!(opt->argInfo & POPT_ARGFLAG_ONEDASH)) len++;
 	item = opt->longName;
     }
 
-    if (len == 3) return cursor;
+    if (len == 4) return cursor;
 
     if (argDescrip) 
 	len += strlen(argDescrip) + 1;
@@ -548,11 +550,19 @@ fprintf(stderr, "*** singleOptionUsage(%p,%d,%p,%p)\n", fp, cursor, opt, transla
 	cursor = 7;
     } 
 
-    fprintf(fp, " [-%s%s%s%s]",
-	((opt->shortName || (opt->argInfo & POPT_ARGFLAG_ONEDASH)) ? "" : "-"),
-	item,
-	(argDescrip ? (opt->shortName != '\0' ? " " : "=") : ""),
-	(argDescrip ? argDescrip : ""));
+    if (opt->shortName && opt->longName) {
+	fprintf(fp, " [-%c|-%s%s%s%s]",
+	    opt->shortName, ((opt->argInfo & POPT_ARGFLAG_ONEDASH) ? "" : "-"),
+	    opt->longName,
+	    (argDescrip ? " " : ""),
+	    (argDescrip ? argDescrip : ""));
+    } else {
+	fprintf(fp, " [-%s%s%s%s]",
+	    ((opt->shortName || (opt->argInfo & POPT_ARGFLAG_ONEDASH)) ? "" : "-"),
+	    item,
+	    (argDescrip ? (opt->shortName != '\0' ? " " : "=") : ""),
+	    (argDescrip ? argDescrip : ""));
+    }
 
     return cursor + len + 1;
 }
@@ -603,7 +613,6 @@ static int singleTableUsage(poptContext con, FILE * fp,
 	/*@globals fileSystem @*/
 	/*@modifies *fp, fileSystem @*/
 {
-fprintf(stderr, "*** singleTableUsage(%p,%p,%d,%p,%p)\n", con, fp, cursor, opt, translation_domain);
     /*@-branchstate@*/		/* FIX: W2DO? */
     if (opt != NULL)
     for (; (opt->longName || opt->shortName || opt->arg) ; opt++) {
-- 
Gitee


From dc017806670d34b1a657782be6aa447f7c29a7b9 Mon Sep 17 00:00:00 2001
From: Jeff Johnson <n3npq@mac.com>
Date: Sun, 28 Jul 2002 00:42:34 +0000
Subject: [PATCH 359/667] - popt: display sub-table options only once on
 --usage. - wire --nosignatures et al as common options, rework CLI options.

---
 po/cs.po           |  2 +-
 po/da.po           |  2 +-
 po/de.po           |  2 +-
 po/es.po           |  2 +-
 po/eu_ES.po        |  2 +-
 po/fi.po           |  2 +-
 po/fr.po           |  2 +-
 po/gl.po           |  2 +-
 po/hu.po           |  2 +-
 po/id.po           |  2 +-
 po/is.po           |  2 +-
 po/it.po           |  2 +-
 po/ja.po           |  2 +-
 po/ko.po           |  2 +-
 po/no.po           |  2 +-
 po/pl.po           |  2 +-
 po/popt.pot        |  2 +-
 po/pt.po           |  2 +-
 po/pt_BR.po        |  2 +-
 po/ro.po           |  2 +-
 po/ru.po           |  2 +-
 po/sk.po           |  2 +-
 po/sl.po           |  2 +-
 po/sr.po           |  2 +-
 po/sv.po           |  2 +-
 po/tr.po           |  2 +-
 po/uk.po           |  2 +-
 po/wa.po           |  2 +-
 po/zh.po           |  2 +-
 po/zh_CN.GB2312.po |  2 +-
 popthelp.c         | 49 ++++++++++++++++++++++++++++++++++++++++------
 31 files changed, 73 insertions(+), 36 deletions(-)

diff --git a/po/cs.po b/po/cs.po
index 95285b6..921f8c8 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.3\n"
-"POT-Creation-Date: 2002-07-25 14:27-0400\n"
+"POT-Creation-Date: 2002-07-27 20:40-0400\n"
 "PO-Revision-Date: 2001-07-24 00:03+0100\n"
 "Last-Translator: Milan Kerslager <kerslage@linux.cz>\n"
 "Language-Team: Czech <cs@li.org>\n"
diff --git a/po/da.po b/po/da.po
index 8db09dd..270c579 100644
--- a/po/da.po
+++ b/po/da.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.3\n"
-"POT-Creation-Date: 2002-07-25 14:27-0400\n"
+"POT-Creation-Date: 2002-07-27 20:40-0400\n"
 "PO-Revision-Date: Sun Jan 21 2001 04:30:32+0200\n"
 "Last-Translator: Martin Hansen <mah@k64.dk>\n"
 "Language-Team: Dansk <dansk@klid.dk>\n"
diff --git a/po/de.po b/po/de.po
index 736af41..b9a3f06 100644
--- a/po/de.po
+++ b/po/de.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.3\n"
-"POT-Creation-Date: 2002-07-25 14:27-0400\n"
+"POT-Creation-Date: 2002-07-27 20:40-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/po/es.po b/po/es.po
index 2f08e70..2ba0de1 100644
--- a/po/es.po
+++ b/po/es.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.3\n"
-"POT-Creation-Date: 2002-07-25 14:27-0400\n"
+"POT-Creation-Date: 2002-07-27 20:40-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Leandro Lucarella <luca@linuxmendoza.org.ar>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/po/eu_ES.po b/po/eu_ES.po
index 736af41..b9a3f06 100644
--- a/po/eu_ES.po
+++ b/po/eu_ES.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.3\n"
-"POT-Creation-Date: 2002-07-25 14:27-0400\n"
+"POT-Creation-Date: 2002-07-27 20:40-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/po/fi.po b/po/fi.po
index 736af41..b9a3f06 100644
--- a/po/fi.po
+++ b/po/fi.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.3\n"
-"POT-Creation-Date: 2002-07-25 14:27-0400\n"
+"POT-Creation-Date: 2002-07-27 20:40-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/po/fr.po b/po/fr.po
index 736af41..b9a3f06 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.3\n"
-"POT-Creation-Date: 2002-07-25 14:27-0400\n"
+"POT-Creation-Date: 2002-07-27 20:40-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/po/gl.po b/po/gl.po
index 52fb006..1a16940 100644
--- a/po/gl.po
+++ b/po/gl.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.3\n"
-"POT-Creation-Date: 2002-07-25 14:27-0400\n"
+"POT-Creation-Date: 2002-07-27 20:40-0400\n"
 "PO-Revision-Date: 2001-01-17 01:01+0100\n"
 "Last-Translator: Jes�s Bravo �lvarez <jba@pobox.com>\n"
 "Language-Team: Galician <trasno@ceu.fi.udc.es>\n"
diff --git a/po/hu.po b/po/hu.po
index c6495bb..b1f0bcd 100644
--- a/po/hu.po
+++ b/po/hu.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.3\n"
-"POT-Creation-Date: 2002-07-25 14:27-0400\n"
+"POT-Creation-Date: 2002-07-27 20:40-0400\n"
 "PO-Revision-Date: 2000-08-03 23:26+0200\n"
 "Last-Translator: L�szl� N�meth <nemeth@qwertynet.hu>\n"
 "Language-Team: Hungarian\n"
diff --git a/po/id.po b/po/id.po
index 736af41..b9a3f06 100644
--- a/po/id.po
+++ b/po/id.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.3\n"
-"POT-Creation-Date: 2002-07-25 14:27-0400\n"
+"POT-Creation-Date: 2002-07-27 20:40-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/po/is.po b/po/is.po
index eee26a0..7df805b 100644
--- a/po/is.po
+++ b/po/is.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.3\n"
-"POT-Creation-Date: 2002-07-25 14:27-0400\n"
+"POT-Creation-Date: 2002-07-27 20:40-0400\n"
 "PO-Revision-Date: 2001-06-08 01:35+0000\n"
 "Last-Translator: Richard Allen <ra@hp.is>\n"
 "Language-Team: is <kde-isl@mmedia.is>\n"
diff --git a/po/it.po b/po/it.po
index 736af41..b9a3f06 100644
--- a/po/it.po
+++ b/po/it.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.3\n"
-"POT-Creation-Date: 2002-07-25 14:27-0400\n"
+"POT-Creation-Date: 2002-07-27 20:40-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/po/ja.po b/po/ja.po
index 736af41..b9a3f06 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.3\n"
-"POT-Creation-Date: 2002-07-25 14:27-0400\n"
+"POT-Creation-Date: 2002-07-27 20:40-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/po/ko.po b/po/ko.po
index bdcb332..59b1eca 100644
--- a/po/ko.po
+++ b/po/ko.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6\n"
-"POT-Creation-Date: 2002-07-25 14:27-0400\n"
+"POT-Creation-Date: 2002-07-27 20:40-0400\n"
 "PO-Revision-Date: 2001-09-06 20:06+0900\n"
 "Last-Translator: Jong-Hoon Ryu <redhat4u@netian.com>\n"
 "Language-Team: GNU Translation project <ko@li.org>\n"
diff --git a/po/no.po b/po/no.po
index 50473e2..1249d2e 100644
--- a/po/no.po
+++ b/po/no.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.3\n"
-"POT-Creation-Date: 2002-07-25 14:27-0400\n"
+"POT-Creation-Date: 2002-07-27 20:40-0400\n"
 "PO-Revision-Date: 2001-06-27 11:05+0200\n"
 "Last-Translator: Kjartan Maraas <kmaraas@online.no>\n"
 "Language-Team: Norwegian <no@li.org>\n"
diff --git a/po/pl.po b/po/pl.po
index 736af41..b9a3f06 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.3\n"
-"POT-Creation-Date: 2002-07-25 14:27-0400\n"
+"POT-Creation-Date: 2002-07-27 20:40-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/po/popt.pot b/po/popt.pot
index 1e7c603..2d3892e 100644
--- a/po/popt.pot
+++ b/po/popt.pot
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2002-07-25 14:27-0400\n"
+"POT-Creation-Date: 2002-07-27 20:40-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/po/pt.po b/po/pt.po
index 87c0065..59b5883 100644
--- a/po/pt.po
+++ b/po/pt.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt\n"
-"POT-Creation-Date: 2002-07-25 14:27-0400\n"
+"POT-Creation-Date: 2002-07-27 20:40-0400\n"
 "PO-Revision-Date: 2002-02-13 18:32+0000\n"
 "Last-Translator: Pedro Morais <morais@kde.org>\n"
 "Language-Team: pt <morais@kde.org>\n"
diff --git a/po/pt_BR.po b/po/pt_BR.po
index 736af41..b9a3f06 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.3\n"
-"POT-Creation-Date: 2002-07-25 14:27-0400\n"
+"POT-Creation-Date: 2002-07-27 20:40-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/po/ro.po b/po/ro.po
index f4fd8c1..4d130b1 100644
--- a/po/ro.po
+++ b/po/ro.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.3\n"
-"POT-Creation-Date: 2002-07-25 14:27-0400\n"
+"POT-Creation-Date: 2002-07-27 20:40-0400\n"
 "PO-Revision-Date: 2000-06-14 23:23+EST\n"
 "Last-Translator: Cristian Gafton <gafton@redhat.com>\n"
 "Language-Team: Romanian <ro@li.org>\n"
diff --git a/po/ru.po b/po/ru.po
index d3e7880..bc5a7c6 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.3\n"
-"POT-Creation-Date: 2002-07-25 14:27-0400\n"
+"POT-Creation-Date: 2002-07-27 20:40-0400\n"
 "PO-Revision-Date: 2001-07-05 21:00-0500\n"
 "Last-Translator: Eugene Kanter <eugene@blackcatlinux.com>\n"
 "Language-Team: Black Cat Linux Team <blackcat-support@blackcatlinux.com>\n"
diff --git a/po/sk.po b/po/sk.po
index 2690d92..8d7e5e9 100644
--- a/po/sk.po
+++ b/po/sk.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.3\n"
-"POT-Creation-Date: 2002-07-25 14:27-0400\n"
+"POT-Creation-Date: 2002-07-27 20:40-0400\n"
 "PO-Revision-Date: 1999-08-04 21:40+0200\n"
 "Last-Translator: Stanislav Meduna <stano@eunet.sk>\n"
 "Language-Team: Slovak <sk-i18n@rak.isternet.sk>\n"
diff --git a/po/sl.po b/po/sl.po
index 0f97240..eb04365 100644
--- a/po/sl.po
+++ b/po/sl.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.3\n"
-"POT-Creation-Date: 2002-07-25 14:27-0400\n"
+"POT-Creation-Date: 2002-07-27 20:40-0400\n"
 "PO-Revision-Date: 2000-09-05 12:30+0200\n"
 "Last-Translator: Roman Maurer <roman.maurer@hermes.si>\n"
 "Language-Team: Slovenian <sl@li.org>\n"
diff --git a/po/sr.po b/po/sr.po
index 736af41..b9a3f06 100644
--- a/po/sr.po
+++ b/po/sr.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.3\n"
-"POT-Creation-Date: 2002-07-25 14:27-0400\n"
+"POT-Creation-Date: 2002-07-27 20:40-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/po/sv.po b/po/sv.po
index 5a6f9ae..e6d8365 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.3\n"
-"POT-Creation-Date: 2002-07-25 14:27-0400\n"
+"POT-Creation-Date: 2002-07-27 20:40-0400\n"
 "PO-Revision-Date: 2001-07-12 22:26+0100\n"
 "Last-Translator: Christian Rose <menthos@menthos.com>\n"
 "Language-Team: Swedish <sv@li.org>\n"
diff --git a/po/tr.po b/po/tr.po
index 371eb50..6943953 100644
--- a/po/tr.po
+++ b/po/tr.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.3\n"
-"POT-Creation-Date: 2002-07-25 14:27-0400\n"
+"POT-Creation-Date: 2002-07-27 20:40-0400\n"
 "PO-Revision-Date: 2000-02-11 13:01+0200\n"
 "Last-Translator: Nilgun Belma Buguner <nilgun@technologist.com>\n"
 "Language-Team: Turkish <tr@li.org>\n"
diff --git a/po/uk.po b/po/uk.po
index a8b5f62..bfcacce 100644
--- a/po/uk.po
+++ b/po/uk.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.3\n"
-"POT-Creation-Date: 2002-07-25 14:27-0400\n"
+"POT-Creation-Date: 2002-07-27 20:40-0400\n"
 "PO-Revision-Date: 1999-09-30 16:54+0200\n"
 "Last-Translator: Yuri Syrota <rasta@renome.rovno.ua>\n"
 "Language-Team: Ukrainian <uk@li.org>\n"
diff --git a/po/wa.po b/po/wa.po
index b48a4de..cae7721 100644
--- a/po/wa.po
+++ b/po/wa.po
@@ -9,7 +9,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.3\n"
-"POT-Creation-Date: 2002-07-25 14:27-0400\n"
+"POT-Creation-Date: 2002-07-27 20:40-0400\n"
 "PO-Revision-Date: 1999-03-18 23:11+0100\n"
 "Last-Translator: Nobody yet\n"
 "Language-Team: walon <linux-wa@chanae.alphanet.ch>\n"
diff --git a/po/zh.po b/po/zh.po
index 736af41..b9a3f06 100644
--- a/po/zh.po
+++ b/po/zh.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.3\n"
-"POT-Creation-Date: 2002-07-25 14:27-0400\n"
+"POT-Creation-Date: 2002-07-27 20:40-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/po/zh_CN.GB2312.po b/po/zh_CN.GB2312.po
index 6522f81..107e433 100644
--- a/po/zh_CN.GB2312.po
+++ b/po/zh_CN.GB2312.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.3\n"
-"POT-Creation-Date: 2002-07-25 14:27-0400\n"
+"POT-Creation-Date: 2002-07-27 20:40-0400\n"
 "PO-Revision-Date: 1999-11-11 05:04+0800\n"
 "Last-Translator: Dillion Chen <dillon.chen@turbolinux.com.cn>\n"
 "Language-Team: TLDN\n"
diff --git a/popthelp.c b/popthelp.c
index 94af481..f40b740 100644
--- a/popthelp.c
+++ b/popthelp.c
@@ -101,7 +101,11 @@ getArgDescrip(const struct poptOption * opt,
 
     switch (opt->argInfo & POPT_ARG_MASK) {
     case POPT_ARG_NONE:		return POPT_("NONE");
+#ifdef	DYING
     case POPT_ARG_VAL:		return POPT_("VAL");
+#else
+    case POPT_ARG_VAL:		return NULL;
+#endif
     case POPT_ARG_INT:		return POPT_("INT");
     case POPT_ARG_LONG:		return POPT_("LONG");
     case POPT_ARG_STRING:	return POPT_("STRING");
@@ -599,6 +603,16 @@ static int itemUsage(FILE * fp, int cursor, poptItem item, int nitems,
     return cursor;
 }
 
+/**
+ * Keep track of option tables already processed.
+ */
+typedef struct poptDone_s {
+    int nopts;
+    int maxopts;
+/*@observer@*/
+    const void ** opts;
+} * poptDone;
+
 /**
  * Display usage text for a table of options.
  * @param con		context
@@ -606,10 +620,13 @@ static int itemUsage(FILE * fp, int cursor, poptItem item, int nitems,
  * @param cursor
  * @param opt		option(s)
  * @param translation_domain	translation domain
+ * @param done		tables already processed
+ * @return
  */
 static int singleTableUsage(poptContext con, FILE * fp,
 		int cursor, const struct poptOption * opt,
-		/*@null@*/ const char * translation_domain)
+		/*@null@*/ const char * translation_domain,
+		poptDone done)
 	/*@globals fileSystem @*/
 	/*@modifies *fp, fileSystem @*/
 {
@@ -619,9 +636,21 @@ static int singleTableUsage(poptContext con, FILE * fp,
         if ((opt->argInfo & POPT_ARG_MASK) == POPT_ARG_INTL_DOMAIN) {
 	    translation_domain = (const char *)opt->arg;
 	} else if ((opt->argInfo & POPT_ARG_MASK) == POPT_ARG_INCLUDE_TABLE) {
-	    if (opt->arg)	/* XXX program error */
+	    int i = 0;
+	    if (done)
+	    for (i = 0; i < done->nopts; i++) {
+		const void * that = done->opts[i];
+		if (that == NULL || that != opt->arg)
+		    continue;
+		break;
+	    }
+	    /* Skip if this table has already been processed. */
+	    if (opt->arg == NULL || i < done->nopts)
+		continue;
+	    if (done->nopts < done->maxopts)
+		done->opts[done->nopts++] = (const void *) opt->arg;
 	    cursor = singleTableUsage(con, fp, cursor, opt->arg,
-			translation_domain);
+			translation_domain, done);
 	} else if ((opt->longName || opt->shortName) &&
 		 !(opt->argInfo & POPT_ARGFLAG_DOC_HIDDEN)) {
 	    cursor = singleOptionUsage(fp, cursor, opt, translation_domain);
@@ -634,6 +663,7 @@ static int singleTableUsage(poptContext con, FILE * fp,
 
 /**
  * Return concatenated short options for display.
+ * @todo Sub-tables should be recursed.
  * @param opt		option(s)
  * @param fp		output file handle
  * @retval str		concatenation of short options
@@ -674,13 +704,20 @@ static int showShortOptions(const struct poptOption * opt, FILE * fp,
 
 void poptPrintUsage(poptContext con, FILE * fp, /*@unused@*/ int flags)
 {
+    poptDone done = memset(alloca(sizeof(*done)), 0, sizeof(*done));
     int cursor;
 
+    done->nopts = 0;
+    done->maxopts = 64;
+    cursor = done->maxopts * sizeof(*done->opts);
+    done->opts = memset(alloca(cursor), 0, cursor);
+    done->opts[done->nopts++] = (const void *) con->options;
+
     cursor = showHelpIntro(con, fp);
     cursor += showShortOptions(con->options, fp, NULL);
-    (void) singleTableUsage(con, fp, cursor, con->options, NULL);
-    (void) itemUsage(fp, cursor, con->aliases, con->numAliases, NULL);
-    (void) itemUsage(fp, cursor, con->execs, con->numExecs, NULL);
+    cursor = singleTableUsage(con, fp, cursor, con->options, NULL, done);
+    cursor = itemUsage(fp, cursor, con->aliases, con->numAliases, NULL);
+    cursor = itemUsage(fp, cursor, con->execs, con->numExecs, NULL);
 
     if (con->otherHelp) {
 	cursor += strlen(con->otherHelp) + 1;
-- 
Gitee


From 7237250b3e095308f16245993e63f104ff7f46d0 Mon Sep 17 00:00:00 2001
From: Jeff Johnson <n3npq@mac.com>
Date: Sun, 28 Jul 2002 14:52:33 +0000
Subject: [PATCH 360/667] - python: don't segfault in ts.GetKeys() on erased
 packages. resurrect build modes. add undocumented debugging options.

---
 popt.h     |  2 ++
 popthelp.c | 40 +++++++++++++++++++++++-----------------
 2 files changed, 25 insertions(+), 17 deletions(-)

diff --git a/popt.h b/popt.h
index c1a3115..7e87e86 100644
--- a/popt.h
+++ b/popt.h
@@ -232,8 +232,10 @@ typedef void (*poptCallbackType) (poptContext con,
  * Reinitialize popt context.
  * @param con		context
  */
+/*@-exportlocal@*/
 void poptResetContext(/*@null@*/poptContext con)
 	/*@modifies con @*/;
+/*@=exportlocal@*/
 
 /** \ingroup popt
  * Return value of next option found.
diff --git a/popthelp.c b/popthelp.c
index f40b740..6b07e34 100644
--- a/popthelp.c
+++ b/popthelp.c
@@ -554,7 +554,7 @@ static int singleOptionUsage(FILE * fp, int cursor,
 	cursor = 7;
     } 
 
-    if (opt->shortName && opt->longName) {
+    if (opt->longName && opt->shortName) {
 	fprintf(fp, " [-%c|-%s%s%s%s]",
 	    opt->shortName, ((opt->argInfo & POPT_ARGFLAG_ONEDASH) ? "" : "-"),
 	    opt->longName,
@@ -609,7 +609,6 @@ static int itemUsage(FILE * fp, int cursor, poptItem item, int nitems,
 typedef struct poptDone_s {
     int nopts;
     int maxopts;
-/*@observer@*/
     const void ** opts;
 } * poptDone;
 
@@ -623,12 +622,12 @@ typedef struct poptDone_s {
  * @param done		tables already processed
  * @return
  */
-static int singleTableUsage(poptContext con, FILE * fp,
-		int cursor, const struct poptOption * opt,
+static int singleTableUsage(poptContext con, FILE * fp, int cursor,
+		/*@null@*/ const struct poptOption * opt,
 		/*@null@*/ const char * translation_domain,
-		poptDone done)
+		/*@null@*/ poptDone done)
 	/*@globals fileSystem @*/
-	/*@modifies *fp, fileSystem @*/
+	/*@modifies *fp, done, fileSystem @*/
 {
     /*@-branchstate@*/		/* FIX: W2DO? */
     if (opt != NULL)
@@ -636,19 +635,24 @@ static int singleTableUsage(poptContext con, FILE * fp,
         if ((opt->argInfo & POPT_ARG_MASK) == POPT_ARG_INTL_DOMAIN) {
 	    translation_domain = (const char *)opt->arg;
 	} else if ((opt->argInfo & POPT_ARG_MASK) == POPT_ARG_INCLUDE_TABLE) {
-	    int i = 0;
-	    if (done)
-	    for (i = 0; i < done->nopts; i++) {
-		const void * that = done->opts[i];
-		if (that == NULL || that != opt->arg)
+	    if (done) {
+		int i = 0;
+		for (i = 0; i < done->nopts; i++) {
+/*@-boundsread@*/
+		    const void * that = done->opts[i];
+/*@=boundsread@*/
+		    if (that == NULL || that != opt->arg)
+			/*@innercontinue@*/ continue;
+		    /*@innerbreak@*/ break;
+		}
+		/* Skip if this table has already been processed. */
+		if (opt->arg == NULL || i < done->nopts)
 		    continue;
-		break;
+/*@-boundswrite@*/
+		if (done->nopts < done->maxopts)
+		    done->opts[done->nopts++] = (const void *) opt->arg;
+/*@=boundswrite@*/
 	    }
-	    /* Skip if this table has already been processed. */
-	    if (opt->arg == NULL || i < done->nopts)
-		continue;
-	    if (done->nopts < done->maxopts)
-		done->opts[done->nopts++] = (const void *) opt->arg;
 	    cursor = singleTableUsage(con, fp, cursor, opt->arg,
 			translation_domain, done);
 	} else if ((opt->longName || opt->shortName) &&
@@ -710,8 +714,10 @@ void poptPrintUsage(poptContext con, FILE * fp, /*@unused@*/ int flags)
     done->nopts = 0;
     done->maxopts = 64;
     cursor = done->maxopts * sizeof(*done->opts);
+/*@-boundswrite@*/
     done->opts = memset(alloca(cursor), 0, cursor);
     done->opts[done->nopts++] = (const void *) con->options;
+/*@=boundswrite@*/
 
     cursor = showHelpIntro(con, fp);
     cursor += showShortOptions(con->options, fp, NULL);
-- 
Gitee


From 19da7642d662970ce60c04899e9d48d9d8a262ac Mon Sep 17 00:00:00 2001
From: Jeff Johnson <n3npq@mac.com>
Date: Mon, 29 Jul 2002 23:06:07 +0000
Subject: [PATCH 361/667] - update trpm. - factor all mode-specific options
 into mode-specific tables. - treat an unspecified epoch as Epoch: 0
 everywhere.

---
 popt.c | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/popt.c b/popt.c
index d71e2bf..812861e 100644
--- a/popt.c
+++ b/popt.c
@@ -18,6 +18,11 @@
 #include "findme.h"
 #include "poptint.h"
 
+#ifdef	MYDEBUG
+/*@unchecked@*/
+int _popt_debug = 0;
+#endif
+
 #ifndef HAVE_STRERROR
 static char * strerror(int errno) {
     extern int sys_nerr;
@@ -427,7 +432,8 @@ static int execCommand(poptContext con)
     if (argv[0] == NULL)
 	return POPT_ERROR_NOARG;
 
-#ifdef MYDEBUG
+#ifdef	MYDEBUG
+if (_popt_debug)
     {	const char ** avp;
 	fprintf(stderr, "==> execvp(%s) argv[%d]:", argv[0], argc);
 	for (avp = argv; *avp; avp++)
-- 
Gitee


From d7fd9768e8c70d9684bb6a3cc127fa6674236be8 Mon Sep 17 00:00:00 2001
From: Jeff Johnson <n3npq@mac.com>
Date: Mon, 29 Jul 2002 23:08:58 +0000
Subject: [PATCH 362/667] Orphans.

---
 po/cs.po           | 2 +-
 po/da.po           | 2 +-
 po/de.po           | 2 +-
 po/es.po           | 2 +-
 po/eu_ES.po        | 2 +-
 po/fi.po           | 2 +-
 po/fr.po           | 2 +-
 po/gl.po           | 2 +-
 po/hu.po           | 2 +-
 po/id.po           | 2 +-
 po/is.po           | 2 +-
 po/it.po           | 2 +-
 po/ja.po           | 2 +-
 po/ko.po           | 2 +-
 po/no.po           | 2 +-
 po/pl.po           | 2 +-
 po/popt.pot        | 2 +-
 po/pt.po           | 2 +-
 po/pt_BR.po        | 2 +-
 po/ro.po           | 2 +-
 po/ru.po           | 2 +-
 po/sk.po           | 2 +-
 po/sl.po           | 2 +-
 po/sr.po           | 2 +-
 po/sv.po           | 2 +-
 po/tr.po           | 2 +-
 po/uk.po           | 2 +-
 po/wa.po           | 2 +-
 po/zh.po           | 2 +-
 po/zh_CN.GB2312.po | 2 +-
 30 files changed, 30 insertions(+), 30 deletions(-)

diff --git a/po/cs.po b/po/cs.po
index 921f8c8..8406a0a 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.3\n"
-"POT-Creation-Date: 2002-07-27 20:40-0400\n"
+"POT-Creation-Date: 2002-07-29 19:07-0400\n"
 "PO-Revision-Date: 2001-07-24 00:03+0100\n"
 "Last-Translator: Milan Kerslager <kerslage@linux.cz>\n"
 "Language-Team: Czech <cs@li.org>\n"
diff --git a/po/da.po b/po/da.po
index 270c579..79bf30e 100644
--- a/po/da.po
+++ b/po/da.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.3\n"
-"POT-Creation-Date: 2002-07-27 20:40-0400\n"
+"POT-Creation-Date: 2002-07-29 19:07-0400\n"
 "PO-Revision-Date: Sun Jan 21 2001 04:30:32+0200\n"
 "Last-Translator: Martin Hansen <mah@k64.dk>\n"
 "Language-Team: Dansk <dansk@klid.dk>\n"
diff --git a/po/de.po b/po/de.po
index b9a3f06..ef3d05b 100644
--- a/po/de.po
+++ b/po/de.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.3\n"
-"POT-Creation-Date: 2002-07-27 20:40-0400\n"
+"POT-Creation-Date: 2002-07-29 19:07-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/po/es.po b/po/es.po
index 2ba0de1..24c04fc 100644
--- a/po/es.po
+++ b/po/es.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.3\n"
-"POT-Creation-Date: 2002-07-27 20:40-0400\n"
+"POT-Creation-Date: 2002-07-29 19:07-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Leandro Lucarella <luca@linuxmendoza.org.ar>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/po/eu_ES.po b/po/eu_ES.po
index b9a3f06..ef3d05b 100644
--- a/po/eu_ES.po
+++ b/po/eu_ES.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.3\n"
-"POT-Creation-Date: 2002-07-27 20:40-0400\n"
+"POT-Creation-Date: 2002-07-29 19:07-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/po/fi.po b/po/fi.po
index b9a3f06..ef3d05b 100644
--- a/po/fi.po
+++ b/po/fi.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.3\n"
-"POT-Creation-Date: 2002-07-27 20:40-0400\n"
+"POT-Creation-Date: 2002-07-29 19:07-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/po/fr.po b/po/fr.po
index b9a3f06..ef3d05b 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.3\n"
-"POT-Creation-Date: 2002-07-27 20:40-0400\n"
+"POT-Creation-Date: 2002-07-29 19:07-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/po/gl.po b/po/gl.po
index 1a16940..2581996 100644
--- a/po/gl.po
+++ b/po/gl.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.3\n"
-"POT-Creation-Date: 2002-07-27 20:40-0400\n"
+"POT-Creation-Date: 2002-07-29 19:07-0400\n"
 "PO-Revision-Date: 2001-01-17 01:01+0100\n"
 "Last-Translator: Jes�s Bravo �lvarez <jba@pobox.com>\n"
 "Language-Team: Galician <trasno@ceu.fi.udc.es>\n"
diff --git a/po/hu.po b/po/hu.po
index b1f0bcd..6d3d37f 100644
--- a/po/hu.po
+++ b/po/hu.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.3\n"
-"POT-Creation-Date: 2002-07-27 20:40-0400\n"
+"POT-Creation-Date: 2002-07-29 19:07-0400\n"
 "PO-Revision-Date: 2000-08-03 23:26+0200\n"
 "Last-Translator: L�szl� N�meth <nemeth@qwertynet.hu>\n"
 "Language-Team: Hungarian\n"
diff --git a/po/id.po b/po/id.po
index b9a3f06..ef3d05b 100644
--- a/po/id.po
+++ b/po/id.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.3\n"
-"POT-Creation-Date: 2002-07-27 20:40-0400\n"
+"POT-Creation-Date: 2002-07-29 19:07-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/po/is.po b/po/is.po
index 7df805b..dadc2a1 100644
--- a/po/is.po
+++ b/po/is.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.3\n"
-"POT-Creation-Date: 2002-07-27 20:40-0400\n"
+"POT-Creation-Date: 2002-07-29 19:07-0400\n"
 "PO-Revision-Date: 2001-06-08 01:35+0000\n"
 "Last-Translator: Richard Allen <ra@hp.is>\n"
 "Language-Team: is <kde-isl@mmedia.is>\n"
diff --git a/po/it.po b/po/it.po
index b9a3f06..ef3d05b 100644
--- a/po/it.po
+++ b/po/it.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.3\n"
-"POT-Creation-Date: 2002-07-27 20:40-0400\n"
+"POT-Creation-Date: 2002-07-29 19:07-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/po/ja.po b/po/ja.po
index b9a3f06..ef3d05b 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.3\n"
-"POT-Creation-Date: 2002-07-27 20:40-0400\n"
+"POT-Creation-Date: 2002-07-29 19:07-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/po/ko.po b/po/ko.po
index 59b1eca..485de2d 100644
--- a/po/ko.po
+++ b/po/ko.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6\n"
-"POT-Creation-Date: 2002-07-27 20:40-0400\n"
+"POT-Creation-Date: 2002-07-29 19:07-0400\n"
 "PO-Revision-Date: 2001-09-06 20:06+0900\n"
 "Last-Translator: Jong-Hoon Ryu <redhat4u@netian.com>\n"
 "Language-Team: GNU Translation project <ko@li.org>\n"
diff --git a/po/no.po b/po/no.po
index 1249d2e..924c343 100644
--- a/po/no.po
+++ b/po/no.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.3\n"
-"POT-Creation-Date: 2002-07-27 20:40-0400\n"
+"POT-Creation-Date: 2002-07-29 19:07-0400\n"
 "PO-Revision-Date: 2001-06-27 11:05+0200\n"
 "Last-Translator: Kjartan Maraas <kmaraas@online.no>\n"
 "Language-Team: Norwegian <no@li.org>\n"
diff --git a/po/pl.po b/po/pl.po
index b9a3f06..ef3d05b 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.3\n"
-"POT-Creation-Date: 2002-07-27 20:40-0400\n"
+"POT-Creation-Date: 2002-07-29 19:07-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/po/popt.pot b/po/popt.pot
index 2d3892e..a80be16 100644
--- a/po/popt.pot
+++ b/po/popt.pot
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2002-07-27 20:40-0400\n"
+"POT-Creation-Date: 2002-07-29 19:07-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/po/pt.po b/po/pt.po
index 59b5883..a8373b3 100644
--- a/po/pt.po
+++ b/po/pt.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt\n"
-"POT-Creation-Date: 2002-07-27 20:40-0400\n"
+"POT-Creation-Date: 2002-07-29 19:07-0400\n"
 "PO-Revision-Date: 2002-02-13 18:32+0000\n"
 "Last-Translator: Pedro Morais <morais@kde.org>\n"
 "Language-Team: pt <morais@kde.org>\n"
diff --git a/po/pt_BR.po b/po/pt_BR.po
index b9a3f06..ef3d05b 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.3\n"
-"POT-Creation-Date: 2002-07-27 20:40-0400\n"
+"POT-Creation-Date: 2002-07-29 19:07-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/po/ro.po b/po/ro.po
index 4d130b1..1cc41aa 100644
--- a/po/ro.po
+++ b/po/ro.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.3\n"
-"POT-Creation-Date: 2002-07-27 20:40-0400\n"
+"POT-Creation-Date: 2002-07-29 19:07-0400\n"
 "PO-Revision-Date: 2000-06-14 23:23+EST\n"
 "Last-Translator: Cristian Gafton <gafton@redhat.com>\n"
 "Language-Team: Romanian <ro@li.org>\n"
diff --git a/po/ru.po b/po/ru.po
index bc5a7c6..ae78a1f 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.3\n"
-"POT-Creation-Date: 2002-07-27 20:40-0400\n"
+"POT-Creation-Date: 2002-07-29 19:07-0400\n"
 "PO-Revision-Date: 2001-07-05 21:00-0500\n"
 "Last-Translator: Eugene Kanter <eugene@blackcatlinux.com>\n"
 "Language-Team: Black Cat Linux Team <blackcat-support@blackcatlinux.com>\n"
diff --git a/po/sk.po b/po/sk.po
index 8d7e5e9..8dba4f8 100644
--- a/po/sk.po
+++ b/po/sk.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.3\n"
-"POT-Creation-Date: 2002-07-27 20:40-0400\n"
+"POT-Creation-Date: 2002-07-29 19:07-0400\n"
 "PO-Revision-Date: 1999-08-04 21:40+0200\n"
 "Last-Translator: Stanislav Meduna <stano@eunet.sk>\n"
 "Language-Team: Slovak <sk-i18n@rak.isternet.sk>\n"
diff --git a/po/sl.po b/po/sl.po
index eb04365..f0aa58d 100644
--- a/po/sl.po
+++ b/po/sl.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.3\n"
-"POT-Creation-Date: 2002-07-27 20:40-0400\n"
+"POT-Creation-Date: 2002-07-29 19:07-0400\n"
 "PO-Revision-Date: 2000-09-05 12:30+0200\n"
 "Last-Translator: Roman Maurer <roman.maurer@hermes.si>\n"
 "Language-Team: Slovenian <sl@li.org>\n"
diff --git a/po/sr.po b/po/sr.po
index b9a3f06..ef3d05b 100644
--- a/po/sr.po
+++ b/po/sr.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.3\n"
-"POT-Creation-Date: 2002-07-27 20:40-0400\n"
+"POT-Creation-Date: 2002-07-29 19:07-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/po/sv.po b/po/sv.po
index e6d8365..3b4c088 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.3\n"
-"POT-Creation-Date: 2002-07-27 20:40-0400\n"
+"POT-Creation-Date: 2002-07-29 19:07-0400\n"
 "PO-Revision-Date: 2001-07-12 22:26+0100\n"
 "Last-Translator: Christian Rose <menthos@menthos.com>\n"
 "Language-Team: Swedish <sv@li.org>\n"
diff --git a/po/tr.po b/po/tr.po
index 6943953..e91d290 100644
--- a/po/tr.po
+++ b/po/tr.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.3\n"
-"POT-Creation-Date: 2002-07-27 20:40-0400\n"
+"POT-Creation-Date: 2002-07-29 19:07-0400\n"
 "PO-Revision-Date: 2000-02-11 13:01+0200\n"
 "Last-Translator: Nilgun Belma Buguner <nilgun@technologist.com>\n"
 "Language-Team: Turkish <tr@li.org>\n"
diff --git a/po/uk.po b/po/uk.po
index bfcacce..351aa97 100644
--- a/po/uk.po
+++ b/po/uk.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.3\n"
-"POT-Creation-Date: 2002-07-27 20:40-0400\n"
+"POT-Creation-Date: 2002-07-29 19:07-0400\n"
 "PO-Revision-Date: 1999-09-30 16:54+0200\n"
 "Last-Translator: Yuri Syrota <rasta@renome.rovno.ua>\n"
 "Language-Team: Ukrainian <uk@li.org>\n"
diff --git a/po/wa.po b/po/wa.po
index cae7721..86046ee 100644
--- a/po/wa.po
+++ b/po/wa.po
@@ -9,7 +9,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.3\n"
-"POT-Creation-Date: 2002-07-27 20:40-0400\n"
+"POT-Creation-Date: 2002-07-29 19:07-0400\n"
 "PO-Revision-Date: 1999-03-18 23:11+0100\n"
 "Last-Translator: Nobody yet\n"
 "Language-Team: walon <linux-wa@chanae.alphanet.ch>\n"
diff --git a/po/zh.po b/po/zh.po
index b9a3f06..ef3d05b 100644
--- a/po/zh.po
+++ b/po/zh.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.3\n"
-"POT-Creation-Date: 2002-07-27 20:40-0400\n"
+"POT-Creation-Date: 2002-07-29 19:07-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/po/zh_CN.GB2312.po b/po/zh_CN.GB2312.po
index 107e433..0e9ea35 100644
--- a/po/zh_CN.GB2312.po
+++ b/po/zh_CN.GB2312.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.3\n"
-"POT-Creation-Date: 2002-07-27 20:40-0400\n"
+"POT-Creation-Date: 2002-07-29 19:07-0400\n"
 "PO-Revision-Date: 1999-11-11 05:04+0800\n"
 "Last-Translator: Dillion Chen <dillon.chen@turbolinux.com.cn>\n"
 "Language-Team: TLDN\n"
-- 
Gitee


From ac7fee24ff10648039ea68f4c3a8c3b861e0c155 Mon Sep 17 00:00:00 2001
From: Jeff Johnson <n3npq@mac.com>
Date: Wed, 31 Jul 2002 13:12:45 +0000
Subject: [PATCH 363/667] - make --querytags a common option, fix errant regex
 (#70135). - db3: increase mpool and cachesize, compile w/o --enable-debug.

---
 po/cs.po           | 2 +-
 po/da.po           | 2 +-
 po/de.po           | 2 +-
 po/es.po           | 2 +-
 po/eu_ES.po        | 2 +-
 po/fi.po           | 2 +-
 po/fr.po           | 2 +-
 po/gl.po           | 2 +-
 po/hu.po           | 2 +-
 po/id.po           | 2 +-
 po/is.po           | 2 +-
 po/it.po           | 2 +-
 po/ja.po           | 2 +-
 po/ko.po           | 2 +-
 po/no.po           | 2 +-
 po/pl.po           | 2 +-
 po/popt.pot        | 2 +-
 po/pt.po           | 2 +-
 po/pt_BR.po        | 2 +-
 po/ro.po           | 2 +-
 po/ru.po           | 2 +-
 po/sk.po           | 2 +-
 po/sl.po           | 2 +-
 po/sr.po           | 2 +-
 po/sv.po           | 2 +-
 po/tr.po           | 2 +-
 po/uk.po           | 2 +-
 po/wa.po           | 2 +-
 po/zh.po           | 2 +-
 po/zh_CN.GB2312.po | 2 +-
 30 files changed, 30 insertions(+), 30 deletions(-)

diff --git a/po/cs.po b/po/cs.po
index 8406a0a..2f8273c 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.3\n"
-"POT-Creation-Date: 2002-07-29 19:07-0400\n"
+"POT-Creation-Date: 2002-07-31 09:10-0400\n"
 "PO-Revision-Date: 2001-07-24 00:03+0100\n"
 "Last-Translator: Milan Kerslager <kerslage@linux.cz>\n"
 "Language-Team: Czech <cs@li.org>\n"
diff --git a/po/da.po b/po/da.po
index 79bf30e..b0c864a 100644
--- a/po/da.po
+++ b/po/da.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.3\n"
-"POT-Creation-Date: 2002-07-29 19:07-0400\n"
+"POT-Creation-Date: 2002-07-31 09:10-0400\n"
 "PO-Revision-Date: Sun Jan 21 2001 04:30:32+0200\n"
 "Last-Translator: Martin Hansen <mah@k64.dk>\n"
 "Language-Team: Dansk <dansk@klid.dk>\n"
diff --git a/po/de.po b/po/de.po
index ef3d05b..04e1f30 100644
--- a/po/de.po
+++ b/po/de.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.3\n"
-"POT-Creation-Date: 2002-07-29 19:07-0400\n"
+"POT-Creation-Date: 2002-07-31 09:10-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/po/es.po b/po/es.po
index 24c04fc..ddcaa7d 100644
--- a/po/es.po
+++ b/po/es.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.3\n"
-"POT-Creation-Date: 2002-07-29 19:07-0400\n"
+"POT-Creation-Date: 2002-07-31 09:10-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Leandro Lucarella <luca@linuxmendoza.org.ar>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/po/eu_ES.po b/po/eu_ES.po
index ef3d05b..04e1f30 100644
--- a/po/eu_ES.po
+++ b/po/eu_ES.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.3\n"
-"POT-Creation-Date: 2002-07-29 19:07-0400\n"
+"POT-Creation-Date: 2002-07-31 09:10-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/po/fi.po b/po/fi.po
index ef3d05b..04e1f30 100644
--- a/po/fi.po
+++ b/po/fi.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.3\n"
-"POT-Creation-Date: 2002-07-29 19:07-0400\n"
+"POT-Creation-Date: 2002-07-31 09:10-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/po/fr.po b/po/fr.po
index ef3d05b..04e1f30 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.3\n"
-"POT-Creation-Date: 2002-07-29 19:07-0400\n"
+"POT-Creation-Date: 2002-07-31 09:10-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/po/gl.po b/po/gl.po
index 2581996..9dc81dd 100644
--- a/po/gl.po
+++ b/po/gl.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.3\n"
-"POT-Creation-Date: 2002-07-29 19:07-0400\n"
+"POT-Creation-Date: 2002-07-31 09:10-0400\n"
 "PO-Revision-Date: 2001-01-17 01:01+0100\n"
 "Last-Translator: Jes�s Bravo �lvarez <jba@pobox.com>\n"
 "Language-Team: Galician <trasno@ceu.fi.udc.es>\n"
diff --git a/po/hu.po b/po/hu.po
index 6d3d37f..300ebb6 100644
--- a/po/hu.po
+++ b/po/hu.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.3\n"
-"POT-Creation-Date: 2002-07-29 19:07-0400\n"
+"POT-Creation-Date: 2002-07-31 09:10-0400\n"
 "PO-Revision-Date: 2000-08-03 23:26+0200\n"
 "Last-Translator: L�szl� N�meth <nemeth@qwertynet.hu>\n"
 "Language-Team: Hungarian\n"
diff --git a/po/id.po b/po/id.po
index ef3d05b..04e1f30 100644
--- a/po/id.po
+++ b/po/id.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.3\n"
-"POT-Creation-Date: 2002-07-29 19:07-0400\n"
+"POT-Creation-Date: 2002-07-31 09:10-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/po/is.po b/po/is.po
index dadc2a1..d9cc2ea 100644
--- a/po/is.po
+++ b/po/is.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.3\n"
-"POT-Creation-Date: 2002-07-29 19:07-0400\n"
+"POT-Creation-Date: 2002-07-31 09:10-0400\n"
 "PO-Revision-Date: 2001-06-08 01:35+0000\n"
 "Last-Translator: Richard Allen <ra@hp.is>\n"
 "Language-Team: is <kde-isl@mmedia.is>\n"
diff --git a/po/it.po b/po/it.po
index ef3d05b..04e1f30 100644
--- a/po/it.po
+++ b/po/it.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.3\n"
-"POT-Creation-Date: 2002-07-29 19:07-0400\n"
+"POT-Creation-Date: 2002-07-31 09:10-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/po/ja.po b/po/ja.po
index ef3d05b..04e1f30 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.3\n"
-"POT-Creation-Date: 2002-07-29 19:07-0400\n"
+"POT-Creation-Date: 2002-07-31 09:10-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/po/ko.po b/po/ko.po
index 485de2d..c0b7431 100644
--- a/po/ko.po
+++ b/po/ko.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6\n"
-"POT-Creation-Date: 2002-07-29 19:07-0400\n"
+"POT-Creation-Date: 2002-07-31 09:10-0400\n"
 "PO-Revision-Date: 2001-09-06 20:06+0900\n"
 "Last-Translator: Jong-Hoon Ryu <redhat4u@netian.com>\n"
 "Language-Team: GNU Translation project <ko@li.org>\n"
diff --git a/po/no.po b/po/no.po
index 924c343..887aaf9 100644
--- a/po/no.po
+++ b/po/no.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.3\n"
-"POT-Creation-Date: 2002-07-29 19:07-0400\n"
+"POT-Creation-Date: 2002-07-31 09:10-0400\n"
 "PO-Revision-Date: 2001-06-27 11:05+0200\n"
 "Last-Translator: Kjartan Maraas <kmaraas@online.no>\n"
 "Language-Team: Norwegian <no@li.org>\n"
diff --git a/po/pl.po b/po/pl.po
index ef3d05b..04e1f30 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.3\n"
-"POT-Creation-Date: 2002-07-29 19:07-0400\n"
+"POT-Creation-Date: 2002-07-31 09:10-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/po/popt.pot b/po/popt.pot
index a80be16..3835131 100644
--- a/po/popt.pot
+++ b/po/popt.pot
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2002-07-29 19:07-0400\n"
+"POT-Creation-Date: 2002-07-31 09:10-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/po/pt.po b/po/pt.po
index a8373b3..354518b 100644
--- a/po/pt.po
+++ b/po/pt.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt\n"
-"POT-Creation-Date: 2002-07-29 19:07-0400\n"
+"POT-Creation-Date: 2002-07-31 09:10-0400\n"
 "PO-Revision-Date: 2002-02-13 18:32+0000\n"
 "Last-Translator: Pedro Morais <morais@kde.org>\n"
 "Language-Team: pt <morais@kde.org>\n"
diff --git a/po/pt_BR.po b/po/pt_BR.po
index ef3d05b..04e1f30 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.3\n"
-"POT-Creation-Date: 2002-07-29 19:07-0400\n"
+"POT-Creation-Date: 2002-07-31 09:10-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/po/ro.po b/po/ro.po
index 1cc41aa..f73f9c8 100644
--- a/po/ro.po
+++ b/po/ro.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.3\n"
-"POT-Creation-Date: 2002-07-29 19:07-0400\n"
+"POT-Creation-Date: 2002-07-31 09:10-0400\n"
 "PO-Revision-Date: 2000-06-14 23:23+EST\n"
 "Last-Translator: Cristian Gafton <gafton@redhat.com>\n"
 "Language-Team: Romanian <ro@li.org>\n"
diff --git a/po/ru.po b/po/ru.po
index ae78a1f..d7b2861 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.3\n"
-"POT-Creation-Date: 2002-07-29 19:07-0400\n"
+"POT-Creation-Date: 2002-07-31 09:10-0400\n"
 "PO-Revision-Date: 2001-07-05 21:00-0500\n"
 "Last-Translator: Eugene Kanter <eugene@blackcatlinux.com>\n"
 "Language-Team: Black Cat Linux Team <blackcat-support@blackcatlinux.com>\n"
diff --git a/po/sk.po b/po/sk.po
index 8dba4f8..b09fbae 100644
--- a/po/sk.po
+++ b/po/sk.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.3\n"
-"POT-Creation-Date: 2002-07-29 19:07-0400\n"
+"POT-Creation-Date: 2002-07-31 09:10-0400\n"
 "PO-Revision-Date: 1999-08-04 21:40+0200\n"
 "Last-Translator: Stanislav Meduna <stano@eunet.sk>\n"
 "Language-Team: Slovak <sk-i18n@rak.isternet.sk>\n"
diff --git a/po/sl.po b/po/sl.po
index f0aa58d..910e691 100644
--- a/po/sl.po
+++ b/po/sl.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.3\n"
-"POT-Creation-Date: 2002-07-29 19:07-0400\n"
+"POT-Creation-Date: 2002-07-31 09:10-0400\n"
 "PO-Revision-Date: 2000-09-05 12:30+0200\n"
 "Last-Translator: Roman Maurer <roman.maurer@hermes.si>\n"
 "Language-Team: Slovenian <sl@li.org>\n"
diff --git a/po/sr.po b/po/sr.po
index ef3d05b..04e1f30 100644
--- a/po/sr.po
+++ b/po/sr.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.3\n"
-"POT-Creation-Date: 2002-07-29 19:07-0400\n"
+"POT-Creation-Date: 2002-07-31 09:10-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/po/sv.po b/po/sv.po
index 3b4c088..3192080 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.3\n"
-"POT-Creation-Date: 2002-07-29 19:07-0400\n"
+"POT-Creation-Date: 2002-07-31 09:10-0400\n"
 "PO-Revision-Date: 2001-07-12 22:26+0100\n"
 "Last-Translator: Christian Rose <menthos@menthos.com>\n"
 "Language-Team: Swedish <sv@li.org>\n"
diff --git a/po/tr.po b/po/tr.po
index e91d290..7a6fdad 100644
--- a/po/tr.po
+++ b/po/tr.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.3\n"
-"POT-Creation-Date: 2002-07-29 19:07-0400\n"
+"POT-Creation-Date: 2002-07-31 09:10-0400\n"
 "PO-Revision-Date: 2000-02-11 13:01+0200\n"
 "Last-Translator: Nilgun Belma Buguner <nilgun@technologist.com>\n"
 "Language-Team: Turkish <tr@li.org>\n"
diff --git a/po/uk.po b/po/uk.po
index 351aa97..1d44fed 100644
--- a/po/uk.po
+++ b/po/uk.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.3\n"
-"POT-Creation-Date: 2002-07-29 19:07-0400\n"
+"POT-Creation-Date: 2002-07-31 09:10-0400\n"
 "PO-Revision-Date: 1999-09-30 16:54+0200\n"
 "Last-Translator: Yuri Syrota <rasta@renome.rovno.ua>\n"
 "Language-Team: Ukrainian <uk@li.org>\n"
diff --git a/po/wa.po b/po/wa.po
index 86046ee..3967878 100644
--- a/po/wa.po
+++ b/po/wa.po
@@ -9,7 +9,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.3\n"
-"POT-Creation-Date: 2002-07-29 19:07-0400\n"
+"POT-Creation-Date: 2002-07-31 09:10-0400\n"
 "PO-Revision-Date: 1999-03-18 23:11+0100\n"
 "Last-Translator: Nobody yet\n"
 "Language-Team: walon <linux-wa@chanae.alphanet.ch>\n"
diff --git a/po/zh.po b/po/zh.po
index ef3d05b..04e1f30 100644
--- a/po/zh.po
+++ b/po/zh.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.3\n"
-"POT-Creation-Date: 2002-07-29 19:07-0400\n"
+"POT-Creation-Date: 2002-07-31 09:10-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/po/zh_CN.GB2312.po b/po/zh_CN.GB2312.po
index 0e9ea35..dc75670 100644
--- a/po/zh_CN.GB2312.po
+++ b/po/zh_CN.GB2312.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.3\n"
-"POT-Creation-Date: 2002-07-29 19:07-0400\n"
+"POT-Creation-Date: 2002-07-31 09:10-0400\n"
 "PO-Revision-Date: 1999-11-11 05:04+0800\n"
 "Last-Translator: Dillion Chen <dillon.chen@turbolinux.com.cn>\n"
 "Language-Team: TLDN\n"
-- 
Gitee


From 305f916bfbd5b685908bd80c01236659dbd1dce1 Mon Sep 17 00:00:00 2001
From: Jeff Johnson <n3npq@mac.com>
Date: Sun, 11 Aug 2002 17:17:55 +0000
Subject: [PATCH 364/667] Re-add the POPT_ keywod to xgettext text extraction.

---
 po/Makefile.in.in  |   2 +-
 po/cs.po           | 131 ++++++++++++++++++++++++++-------------------
 po/da.po           | 131 +++++++++++++++++++++++++++------------------
 po/de.po           |  91 ++++++++++++++++++++++++++++++-
 po/es.po           | 131 +++++++++++++++++++++++++++------------------
 po/eu_ES.po        |  91 ++++++++++++++++++++++++++++++-
 po/fi.po           |  91 ++++++++++++++++++++++++++++++-
 po/fr.po           |  91 ++++++++++++++++++++++++++++++-
 po/gl.po           | 131 +++++++++++++++++++++++++++------------------
 po/hu.po           |  91 ++++++++++++++++++++++++++++++-
 po/id.po           |  91 ++++++++++++++++++++++++++++++-
 po/is.po           | 131 ++++++++++++++++++++++++++-------------------
 po/it.po           |  91 ++++++++++++++++++++++++++++++-
 po/ja.po           |  91 ++++++++++++++++++++++++++++++-
 po/ko.po           | 131 ++++++++++++++++++++++++++-------------------
 po/no.po           | 131 ++++++++++++++++++++++++++-------------------
 po/pl.po           |  91 ++++++++++++++++++++++++++++++-
 po/popt.pot        |  91 ++++++++++++++++++++++++++++++-
 po/pt.po           | 131 ++++++++++++++++++++++++++-------------------
 po/pt_BR.po        |  91 ++++++++++++++++++++++++++++++-
 po/ro.po           | 106 +++++++++++++++++++++++++++---------
 po/ru.po           | 131 ++++++++++++++++++++++++++-------------------
 po/sk.po           |  91 ++++++++++++++++++++++++++++++-
 po/sl.po           |  91 ++++++++++++++++++++++++++++++-
 po/sr.po           |  91 ++++++++++++++++++++++++++++++-
 po/sv.po           | 131 ++++++++++++++++++++++++++-------------------
 po/tr.po           | 131 +++++++++++++++++++++++++++------------------
 po/uk.po           |  91 ++++++++++++++++++++++++++++++-
 po/wa.po           |  91 ++++++++++++++++++++++++++++++-
 po/zh.po           |  91 ++++++++++++++++++++++++++++++-
 po/zh_CN.GB2312.po |  91 ++++++++++++++++++++++++++++++-
 31 files changed, 2561 insertions(+), 626 deletions(-)

diff --git a/po/Makefile.in.in b/po/Makefile.in.in
index 32b7376..1f6d6a4 100644
--- a/po/Makefile.in.in
+++ b/po/Makefile.in.in
@@ -83,7 +83,7 @@ all-no:
 
 $(srcdir)/$(PACKAGE).pot: $(POTFILES) $(srcdir)/POTFILES.in
 	$(XGETTEXT) --default-domain=$(PACKAGE) --directory=$(top_srcdir) \
-	  --add-comments --keyword=_ --keyword=N_ \
+	  --add-comments --keyword=_ --keyword=N_ --keyword=POPT_ \
 	  --files-from=$(srcdir)/POTFILES.in \
 	&& test ! -f $(PACKAGE).po \
 	   || ( rm -f $(srcdir)/$(PACKAGE).pot \
diff --git a/po/cs.po b/po/cs.po
index 2f8273c..237d8d8 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.3\n"
-"POT-Creation-Date: 2002-07-31 09:10-0400\n"
+"POT-Creation-Date: 2002-08-10 12:40-0400\n"
 "PO-Revision-Date: 2001-07-24 00:03+0100\n"
 "Last-Translator: Milan Kerslager <kerslage@linux.cz>\n"
 "Language-Team: Czech <cs@li.org>\n"
@@ -9,80 +9,103 @@ msgstr ""
 "Content-Type: text/plain; charset=iso-8859-2\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: popthelp.c:57
-msgid "Show this help message"
-msgstr "Vyp��e tuto n�pov�du"
+#: popt.c:34
+msgid "unknown errno"
+msgstr "nezn�m� ��slo chyby"
 
-#: popthelp.c:58
-msgid "Display brief usage message"
-msgstr "Vyp��e kr�tk� n�vod k pou�it�"
+#: popt.c:940
+#, c-format
+msgid "option type (%d) not implemented in popt\n"
+msgstr "volba (%d) nen� v popt implementov�na\n"
 
-#: popthelp.c:61
-msgid "Display option defaults in message"
-msgstr "Zobrazit implicitn� volby ve zpr�v�"
+#: popt.c:1160
+msgid "missing argument"
+msgstr "chyb� argument"
 
-#~ msgid "unknown errno"
-#~ msgstr "nezn�m� ��slo chyby"
+#: popt.c:1162
+msgid "unknown option"
+msgstr "nezn�m� volba"
 
-#~ msgid "option type (%d) not implemented in popt\n"
-#~ msgstr "volba (%d) nen� v popt implementov�na\n"
+#: popt.c:1164
+msgid "mutually exclusive logical operations requested"
+msgstr "po�adov�ny vz�jemn� v�lu�n� logick� operace"
 
-#~ msgid "missing argument"
-#~ msgstr "chyb� argument"
+#: popt.c:1166
+msgid "opt->arg should not be NULL"
+msgstr "opt->arg nesm� b�t NULL"
 
-#~ msgid "unknown option"
-#~ msgstr "nezn�m� volba"
+#: popt.c:1168
+msgid "aliases nested too deeply"
+msgstr "aliasy vno�en� p��li� hluboko"
 
-#~ msgid "mutually exclusive logical operations requested"
-#~ msgstr "po�adov�ny vz�jemn� v�lu�n� logick� operace"
+#: popt.c:1170
+msgid "error in parameter quoting"
+msgstr "chyba v quotov�n� parametr�"
 
-#~ msgid "opt->arg should not be NULL"
-#~ msgstr "opt->arg nesm� b�t NULL"
+#: popt.c:1172
+msgid "invalid numeric value"
+msgstr "chybn� numerick� hodnota"
 
-#~ msgid "aliases nested too deeply"
-#~ msgstr "aliasy vno�en� p��li� hluboko"
+#: popt.c:1174
+msgid "number too large or too small"
+msgstr "��slo je p��li� velk� nebo p��li� mal�"
 
-#~ msgid "error in parameter quoting"
-#~ msgstr "chyba v quotov�n� parametr�"
+#: popt.c:1176
+msgid "memory allocation failed"
+msgstr "selhala alokace pam�ti"
 
-#~ msgid "invalid numeric value"
-#~ msgstr "chybn� numerick� hodnota"
+#: popt.c:1180
+msgid "unknown error"
+msgstr "nezn�m� chyba"
 
-#~ msgid "number too large or too small"
-#~ msgstr "��slo je p��li� velk� nebo p��li� mal�"
+#: popthelp.c:57
+msgid "Show this help message"
+msgstr "Vyp��e tuto n�pov�du"
 
-#~ msgid "memory allocation failed"
-#~ msgstr "selhala alokace pam�ti"
+#: popthelp.c:58
+msgid "Display brief usage message"
+msgstr "Vyp��e kr�tk� n�vod k pou�it�"
 
-#~ msgid "unknown error"
-#~ msgstr "nezn�m� chyba"
+#: popthelp.c:61
+msgid "Display option defaults in message"
+msgstr "Zobrazit implicitn� volby ve zpr�v�"
 
-#~ msgid "NONE"
-#~ msgstr "NONE"
+#: popthelp.c:103
+msgid "NONE"
+msgstr "NONE"
 
-#~ msgid "VAL"
-#~ msgstr "VAL"
+#: popthelp.c:105
+msgid "VAL"
+msgstr "VAL"
 
-#~ msgid "INT"
-#~ msgstr "INT"
+#: popthelp.c:109
+msgid "INT"
+msgstr "INT"
 
-#~ msgid "LONG"
-#~ msgstr "LONG"
+#: popthelp.c:110
+msgid "LONG"
+msgstr "LONG"
 
-#~ msgid "STRING"
-#~ msgstr "STRING"
+#: popthelp.c:111
+msgid "STRING"
+msgstr "STRING"
 
-#~ msgid "FLOAT"
-#~ msgstr "FLOAT"
+#: popthelp.c:112
+msgid "FLOAT"
+msgstr "FLOAT"
 
-#~ msgid "DOUBLE"
-#~ msgstr "DOUBLE"
+#: popthelp.c:113
+msgid "DOUBLE"
+msgstr "DOUBLE"
 
-#~ msgid "ARG"
-#~ msgstr "ARG"
+#: popthelp.c:114
+msgid "ARG"
+msgstr "ARG"
 
-#~ msgid "Usage:"
-#~ msgstr "Pou�it�:"
+#: popthelp.c:486
+msgid "Usage:"
+msgstr "Pou�it�:"
 
-#~ msgid "[OPTION...]"
-#~ msgstr "[VOLBY...]"
+#: popthelp.c:510
+msgid "[OPTION...]"
+msgstr "[VOLBY...]"
diff --git a/po/da.po b/po/da.po
index b0c864a..49f7450 100644
--- a/po/da.po
+++ b/po/da.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.3\n"
-"POT-Creation-Date: 2002-07-31 09:10-0400\n"
+"POT-Creation-Date: 2002-08-10 12:40-0400\n"
 "PO-Revision-Date: Sun Jan 21 2001 04:30:32+0200\n"
 "Last-Translator: Martin Hansen <mah@k64.dk>\n"
 "Language-Team: Dansk <dansk@klid.dk>\n"
@@ -10,75 +10,104 @@ msgstr ""
 "Content-Transfer-Encoding: 8-bit\n"
 "X-Generator: KTranslator v 0.6.0\n"
 
-#: popthelp.c:57
-msgid "Show this help message"
-msgstr "Vis denne hj�lpemeddelelse"
+#: popt.c:34
+msgid "unknown errno"
+msgstr "ukendt fejlnr."
 
-#: popthelp.c:58
-msgid "Display brief usage message"
-msgstr "Vis kortfattet brugsanvisning"
+#: popt.c:940
+#, c-format
+msgid "option type (%d) not implemented in popt\n"
+msgstr "tilvalgstype (%d) er ikke implementeret i popt\n"
 
-#: popthelp.c:61
-#, fuzzy
-msgid "Display option defaults in message"
-msgstr "Vis kortfattet brugsanvisning"
+#: popt.c:1160
+msgid "missing argument"
+msgstr "mangler argument"
+
+#: popt.c:1162
+msgid "unknown option"
+msgstr "ukendt tilvalg"
+
+#: popt.c:1164
+msgid "mutually exclusive logical operations requested"
+msgstr "de �nskede handlinger udelukker hinanden"
 
-#~ msgid "unknown errno"
-#~ msgstr "ukendt fejlnr."
+#: popt.c:1166
+msgid "opt->arg should not be NULL"
+msgstr ""
 
-#~ msgid "option type (%d) not implemented in popt\n"
-#~ msgstr "tilvalgstype (%d) er ikke implementeret i popt\n"
+#: popt.c:1168
+msgid "aliases nested too deeply"
+msgstr "aliaser er for dybt indlejret"
 
-#~ msgid "missing argument"
-#~ msgstr "mangler argument"
+#: popt.c:1170
+msgid "error in parameter quoting"
+msgstr "fejl i parameter citering"
 
-#~ msgid "unknown option"
-#~ msgstr "ukendt tilvalg"
+#: popt.c:1172
+msgid "invalid numeric value"
+msgstr "ugyldig numerisk v�rdi"
 
-#~ msgid "mutually exclusive logical operations requested"
-#~ msgstr "de �nskede handlinger udelukker hinanden"
+#: popt.c:1174
+msgid "number too large or too small"
+msgstr "nummer for stort, eller for lille"
 
-#~ msgid "aliases nested too deeply"
-#~ msgstr "aliaser er for dybt indlejret"
+#: popt.c:1176
+msgid "memory allocation failed"
+msgstr ""
 
-#~ msgid "error in parameter quoting"
-#~ msgstr "fejl i parameter citering"
+#: popt.c:1180
+msgid "unknown error"
+msgstr "ukendt fejl"
 
-#~ msgid "invalid numeric value"
-#~ msgstr "ugyldig numerisk v�rdi"
+#: popthelp.c:57
+msgid "Show this help message"
+msgstr "Vis denne hj�lpemeddelelse"
 
-#~ msgid "number too large or too small"
-#~ msgstr "nummer for stort, eller for lille"
+#: popthelp.c:58
+msgid "Display brief usage message"
+msgstr "Vis kortfattet brugsanvisning"
 
-#~ msgid "unknown error"
-#~ msgstr "ukendt fejl"
+#: popthelp.c:61
+#, fuzzy
+msgid "Display option defaults in message"
+msgstr "Vis kortfattet brugsanvisning"
 
-#~ msgid "NONE"
-#~ msgstr "INGEN"
+#: popthelp.c:103
+msgid "NONE"
+msgstr "INGEN"
 
-#~ msgid "VAL"
-#~ msgstr "VAL"
+#: popthelp.c:105
+msgid "VAL"
+msgstr "VAL"
 
-#~ msgid "INT"
-#~ msgstr "INT"
+#: popthelp.c:109
+msgid "INT"
+msgstr "INT"
 
-#~ msgid "LONG"
-#~ msgstr "LONG"
+#: popthelp.c:110
+msgid "LONG"
+msgstr "LONG"
 
-#~ msgid "STRING"
-#~ msgstr "STRING"
+#: popthelp.c:111
+msgid "STRING"
+msgstr "STRING"
 
-#~ msgid "FLOAT"
-#~ msgstr "FLOAT"
+#: popthelp.c:112
+msgid "FLOAT"
+msgstr "FLOAT"
 
-#~ msgid "DOUBLE"
-#~ msgstr "DOUBLE"
+#: popthelp.c:113
+msgid "DOUBLE"
+msgstr "DOUBLE"
 
-#~ msgid "ARG"
-#~ msgstr "ARG"
+#: popthelp.c:114
+msgid "ARG"
+msgstr "ARG"
 
-#~ msgid "Usage:"
-#~ msgstr "Brug:"
+#: popthelp.c:486
+msgid "Usage:"
+msgstr "Brug:"
 
-#~ msgid "[OPTION...]"
-#~ msgstr "[TILVALG...]"
+#: popthelp.c:510
+msgid "[OPTION...]"
+msgstr "[TILVALG...]"
diff --git a/po/de.po b/po/de.po
index 04e1f30..5b022b9 100644
--- a/po/de.po
+++ b/po/de.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.3\n"
-"POT-Creation-Date: 2002-07-31 09:10-0400\n"
+"POT-Creation-Date: 2002-08-10 12:40-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -14,6 +14,55 @@ msgstr ""
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: ENCODING\n"
 
+#: popt.c:34
+msgid "unknown errno"
+msgstr ""
+
+#: popt.c:940
+#, c-format
+msgid "option type (%d) not implemented in popt\n"
+msgstr ""
+
+#: popt.c:1160
+msgid "missing argument"
+msgstr ""
+
+#: popt.c:1162
+msgid "unknown option"
+msgstr ""
+
+#: popt.c:1164
+msgid "mutually exclusive logical operations requested"
+msgstr ""
+
+#: popt.c:1166
+msgid "opt->arg should not be NULL"
+msgstr ""
+
+#: popt.c:1168
+msgid "aliases nested too deeply"
+msgstr ""
+
+#: popt.c:1170
+msgid "error in parameter quoting"
+msgstr ""
+
+#: popt.c:1172
+msgid "invalid numeric value"
+msgstr ""
+
+#: popt.c:1174
+msgid "number too large or too small"
+msgstr ""
+
+#: popt.c:1176
+msgid "memory allocation failed"
+msgstr ""
+
+#: popt.c:1180
+msgid "unknown error"
+msgstr ""
+
 #: popthelp.c:57
 msgid "Show this help message"
 msgstr ""
@@ -25,3 +74,43 @@ msgstr ""
 #: popthelp.c:61
 msgid "Display option defaults in message"
 msgstr ""
+
+#: popthelp.c:103
+msgid "NONE"
+msgstr ""
+
+#: popthelp.c:105
+msgid "VAL"
+msgstr ""
+
+#: popthelp.c:109
+msgid "INT"
+msgstr ""
+
+#: popthelp.c:110
+msgid "LONG"
+msgstr ""
+
+#: popthelp.c:111
+msgid "STRING"
+msgstr ""
+
+#: popthelp.c:112
+msgid "FLOAT"
+msgstr ""
+
+#: popthelp.c:113
+msgid "DOUBLE"
+msgstr ""
+
+#: popthelp.c:114
+msgid "ARG"
+msgstr ""
+
+#: popthelp.c:486
+msgid "Usage:"
+msgstr ""
+
+#: popthelp.c:510
+msgid "[OPTION...]"
+msgstr ""
diff --git a/po/es.po b/po/es.po
index ddcaa7d..958cca7 100644
--- a/po/es.po
+++ b/po/es.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.3\n"
-"POT-Creation-Date: 2002-07-31 09:10-0400\n"
+"POT-Creation-Date: 2002-08-10 12:40-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Leandro Lucarella <luca@linuxmendoza.org.ar>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -14,75 +14,104 @@ msgstr ""
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: ENCODING\n"
 
-#: popthelp.c:57
-msgid "Show this help message"
-msgstr "Muestra este mensaje de ayuda"
+#: popt.c:34
+msgid "unknown errno"
+msgstr "errno desconocido"
 
-#: popthelp.c:58
-msgid "Display brief usage message"
-msgstr "Indica el modo de uso resumido"
+#: popt.c:940
+#, c-format
+msgid "option type (%d) not implemented in popt\n"
+msgstr "tipo de opcin (%d) no implementada en popt\n"
 
-#: popthelp.c:61
-#, fuzzy
-msgid "Display option defaults in message"
-msgstr "Indica el modo de uso resumido"
+#: popt.c:1160
+msgid "missing argument"
+msgstr "falta argumento"
+
+#: popt.c:1162
+msgid "unknown option"
+msgstr "opcin desconocida"
+
+#: popt.c:1164
+msgid "mutually exclusive logical operations requested"
+msgstr "requerida operacin lgica mutuamente exclusiva"
 
-#~ msgid "unknown errno"
-#~ msgstr "errno desconocido"
+#: popt.c:1166
+msgid "opt->arg should not be NULL"
+msgstr ""
 
-#~ msgid "option type (%d) not implemented in popt\n"
-#~ msgstr "tipo de opcin (%d) no implementada en popt\n"
+#: popt.c:1168
+msgid "aliases nested too deeply"
+msgstr "alias anidados muy profundamente"
 
-#~ msgid "missing argument"
-#~ msgstr "falta argumento"
+#: popt.c:1170
+msgid "error in parameter quoting"
+msgstr "error en cita de parmetros"
 
-#~ msgid "unknown option"
-#~ msgstr "opcin desconocida"
+#: popt.c:1172
+msgid "invalid numeric value"
+msgstr "valor numrico invlido"
 
-#~ msgid "mutually exclusive logical operations requested"
-#~ msgstr "requerida operacin lgica mutuamente exclusiva"
+#: popt.c:1174
+msgid "number too large or too small"
+msgstr "nmero muy largo o muy pequeo"
 
-#~ msgid "aliases nested too deeply"
-#~ msgstr "alias anidados muy profundamente"
+#: popt.c:1176
+msgid "memory allocation failed"
+msgstr ""
 
-#~ msgid "error in parameter quoting"
-#~ msgstr "error en cita de parmetros"
+#: popt.c:1180
+msgid "unknown error"
+msgstr "error desconocido"
 
-#~ msgid "invalid numeric value"
-#~ msgstr "valor numrico invlido"
+#: popthelp.c:57
+msgid "Show this help message"
+msgstr "Muestra este mensaje de ayuda"
 
-#~ msgid "number too large or too small"
-#~ msgstr "nmero muy largo o muy pequeo"
+#: popthelp.c:58
+msgid "Display brief usage message"
+msgstr "Indica el modo de uso resumido"
 
-#~ msgid "unknown error"
-#~ msgstr "error desconocido"
+#: popthelp.c:61
+#, fuzzy
+msgid "Display option defaults in message"
+msgstr "Indica el modo de uso resumido"
 
-#~ msgid "NONE"
-#~ msgstr "NONE"
+#: popthelp.c:103
+msgid "NONE"
+msgstr "NONE"
 
-#~ msgid "VAL"
-#~ msgstr "VAL"
+#: popthelp.c:105
+msgid "VAL"
+msgstr "VAL"
 
-#~ msgid "INT"
-#~ msgstr "INT"
+#: popthelp.c:109
+msgid "INT"
+msgstr "INT"
 
-#~ msgid "LONG"
-#~ msgstr "LONG"
+#: popthelp.c:110
+msgid "LONG"
+msgstr "LONG"
 
-#~ msgid "STRING"
-#~ msgstr "STRING"
+#: popthelp.c:111
+msgid "STRING"
+msgstr "STRING"
 
-#~ msgid "FLOAT"
-#~ msgstr "FLOAT"
+#: popthelp.c:112
+msgid "FLOAT"
+msgstr "FLOAT"
 
-#~ msgid "DOUBLE"
-#~ msgstr "DOUBLE"
+#: popthelp.c:113
+msgid "DOUBLE"
+msgstr "DOUBLE"
 
-#~ msgid "ARG"
-#~ msgstr "ARG"
+#: popthelp.c:114
+msgid "ARG"
+msgstr "ARG"
 
-#~ msgid "Usage:"
-#~ msgstr "Modo de Uso:"
+#: popthelp.c:486
+msgid "Usage:"
+msgstr "Modo de Uso:"
 
-#~ msgid "[OPTION...]"
-#~ msgstr "[OPCIN...]"
+#: popthelp.c:510
+msgid "[OPTION...]"
+msgstr "[OPCIN...]"
diff --git a/po/eu_ES.po b/po/eu_ES.po
index 04e1f30..5b022b9 100644
--- a/po/eu_ES.po
+++ b/po/eu_ES.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.3\n"
-"POT-Creation-Date: 2002-07-31 09:10-0400\n"
+"POT-Creation-Date: 2002-08-10 12:40-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -14,6 +14,55 @@ msgstr ""
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: ENCODING\n"
 
+#: popt.c:34
+msgid "unknown errno"
+msgstr ""
+
+#: popt.c:940
+#, c-format
+msgid "option type (%d) not implemented in popt\n"
+msgstr ""
+
+#: popt.c:1160
+msgid "missing argument"
+msgstr ""
+
+#: popt.c:1162
+msgid "unknown option"
+msgstr ""
+
+#: popt.c:1164
+msgid "mutually exclusive logical operations requested"
+msgstr ""
+
+#: popt.c:1166
+msgid "opt->arg should not be NULL"
+msgstr ""
+
+#: popt.c:1168
+msgid "aliases nested too deeply"
+msgstr ""
+
+#: popt.c:1170
+msgid "error in parameter quoting"
+msgstr ""
+
+#: popt.c:1172
+msgid "invalid numeric value"
+msgstr ""
+
+#: popt.c:1174
+msgid "number too large or too small"
+msgstr ""
+
+#: popt.c:1176
+msgid "memory allocation failed"
+msgstr ""
+
+#: popt.c:1180
+msgid "unknown error"
+msgstr ""
+
 #: popthelp.c:57
 msgid "Show this help message"
 msgstr ""
@@ -25,3 +74,43 @@ msgstr ""
 #: popthelp.c:61
 msgid "Display option defaults in message"
 msgstr ""
+
+#: popthelp.c:103
+msgid "NONE"
+msgstr ""
+
+#: popthelp.c:105
+msgid "VAL"
+msgstr ""
+
+#: popthelp.c:109
+msgid "INT"
+msgstr ""
+
+#: popthelp.c:110
+msgid "LONG"
+msgstr ""
+
+#: popthelp.c:111
+msgid "STRING"
+msgstr ""
+
+#: popthelp.c:112
+msgid "FLOAT"
+msgstr ""
+
+#: popthelp.c:113
+msgid "DOUBLE"
+msgstr ""
+
+#: popthelp.c:114
+msgid "ARG"
+msgstr ""
+
+#: popthelp.c:486
+msgid "Usage:"
+msgstr ""
+
+#: popthelp.c:510
+msgid "[OPTION...]"
+msgstr ""
diff --git a/po/fi.po b/po/fi.po
index 04e1f30..5b022b9 100644
--- a/po/fi.po
+++ b/po/fi.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.3\n"
-"POT-Creation-Date: 2002-07-31 09:10-0400\n"
+"POT-Creation-Date: 2002-08-10 12:40-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -14,6 +14,55 @@ msgstr ""
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: ENCODING\n"
 
+#: popt.c:34
+msgid "unknown errno"
+msgstr ""
+
+#: popt.c:940
+#, c-format
+msgid "option type (%d) not implemented in popt\n"
+msgstr ""
+
+#: popt.c:1160
+msgid "missing argument"
+msgstr ""
+
+#: popt.c:1162
+msgid "unknown option"
+msgstr ""
+
+#: popt.c:1164
+msgid "mutually exclusive logical operations requested"
+msgstr ""
+
+#: popt.c:1166
+msgid "opt->arg should not be NULL"
+msgstr ""
+
+#: popt.c:1168
+msgid "aliases nested too deeply"
+msgstr ""
+
+#: popt.c:1170
+msgid "error in parameter quoting"
+msgstr ""
+
+#: popt.c:1172
+msgid "invalid numeric value"
+msgstr ""
+
+#: popt.c:1174
+msgid "number too large or too small"
+msgstr ""
+
+#: popt.c:1176
+msgid "memory allocation failed"
+msgstr ""
+
+#: popt.c:1180
+msgid "unknown error"
+msgstr ""
+
 #: popthelp.c:57
 msgid "Show this help message"
 msgstr ""
@@ -25,3 +74,43 @@ msgstr ""
 #: popthelp.c:61
 msgid "Display option defaults in message"
 msgstr ""
+
+#: popthelp.c:103
+msgid "NONE"
+msgstr ""
+
+#: popthelp.c:105
+msgid "VAL"
+msgstr ""
+
+#: popthelp.c:109
+msgid "INT"
+msgstr ""
+
+#: popthelp.c:110
+msgid "LONG"
+msgstr ""
+
+#: popthelp.c:111
+msgid "STRING"
+msgstr ""
+
+#: popthelp.c:112
+msgid "FLOAT"
+msgstr ""
+
+#: popthelp.c:113
+msgid "DOUBLE"
+msgstr ""
+
+#: popthelp.c:114
+msgid "ARG"
+msgstr ""
+
+#: popthelp.c:486
+msgid "Usage:"
+msgstr ""
+
+#: popthelp.c:510
+msgid "[OPTION...]"
+msgstr ""
diff --git a/po/fr.po b/po/fr.po
index 04e1f30..5b022b9 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.3\n"
-"POT-Creation-Date: 2002-07-31 09:10-0400\n"
+"POT-Creation-Date: 2002-08-10 12:40-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -14,6 +14,55 @@ msgstr ""
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: ENCODING\n"
 
+#: popt.c:34
+msgid "unknown errno"
+msgstr ""
+
+#: popt.c:940
+#, c-format
+msgid "option type (%d) not implemented in popt\n"
+msgstr ""
+
+#: popt.c:1160
+msgid "missing argument"
+msgstr ""
+
+#: popt.c:1162
+msgid "unknown option"
+msgstr ""
+
+#: popt.c:1164
+msgid "mutually exclusive logical operations requested"
+msgstr ""
+
+#: popt.c:1166
+msgid "opt->arg should not be NULL"
+msgstr ""
+
+#: popt.c:1168
+msgid "aliases nested too deeply"
+msgstr ""
+
+#: popt.c:1170
+msgid "error in parameter quoting"
+msgstr ""
+
+#: popt.c:1172
+msgid "invalid numeric value"
+msgstr ""
+
+#: popt.c:1174
+msgid "number too large or too small"
+msgstr ""
+
+#: popt.c:1176
+msgid "memory allocation failed"
+msgstr ""
+
+#: popt.c:1180
+msgid "unknown error"
+msgstr ""
+
 #: popthelp.c:57
 msgid "Show this help message"
 msgstr ""
@@ -25,3 +74,43 @@ msgstr ""
 #: popthelp.c:61
 msgid "Display option defaults in message"
 msgstr ""
+
+#: popthelp.c:103
+msgid "NONE"
+msgstr ""
+
+#: popthelp.c:105
+msgid "VAL"
+msgstr ""
+
+#: popthelp.c:109
+msgid "INT"
+msgstr ""
+
+#: popthelp.c:110
+msgid "LONG"
+msgstr ""
+
+#: popthelp.c:111
+msgid "STRING"
+msgstr ""
+
+#: popthelp.c:112
+msgid "FLOAT"
+msgstr ""
+
+#: popthelp.c:113
+msgid "DOUBLE"
+msgstr ""
+
+#: popthelp.c:114
+msgid "ARG"
+msgstr ""
+
+#: popthelp.c:486
+msgid "Usage:"
+msgstr ""
+
+#: popthelp.c:510
+msgid "[OPTION...]"
+msgstr ""
diff --git a/po/gl.po b/po/gl.po
index 9dc81dd..f1ad4f3 100644
--- a/po/gl.po
+++ b/po/gl.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.3\n"
-"POT-Creation-Date: 2002-07-31 09:10-0400\n"
+"POT-Creation-Date: 2002-08-10 12:40-0400\n"
 "PO-Revision-Date: 2001-01-17 01:01+0100\n"
 "Last-Translator: Jes�s Bravo �lvarez <jba@pobox.com>\n"
 "Language-Team: Galician <trasno@ceu.fi.udc.es>\n"
@@ -9,75 +9,104 @@ msgstr ""
 "Content-Type: text/plain; charset=iso-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: popthelp.c:57
-msgid "Show this help message"
-msgstr "Amosar esta mensaxe de axuda"
+#: popt.c:34
+msgid "unknown errno"
+msgstr "errno desco�ecido"
 
-#: popthelp.c:58
-msgid "Display brief usage message"
-msgstr "Amosar brevemente o xeito de utilizaci�n"
+#: popt.c:940
+#, c-format
+msgid "option type (%d) not implemented in popt\n"
+msgstr "tipo de opci�n (%d) non implementada en popt\n"
 
-#: popthelp.c:61
-#, fuzzy
-msgid "Display option defaults in message"
-msgstr "Amosar brevemente o xeito de utilizaci�n"
+#: popt.c:1160
+msgid "missing argument"
+msgstr "falta un argumento"
+
+#: popt.c:1162
+msgid "unknown option"
+msgstr "opci�n desco�ecida"
+
+#: popt.c:1164
+msgid "mutually exclusive logical operations requested"
+msgstr "solicit�ronse operaci�ns l�xicas mutuamente exclu�ntes"
 
-#~ msgid "unknown errno"
-#~ msgstr "errno desco�ecido"
+#: popt.c:1166
+msgid "opt->arg should not be NULL"
+msgstr ""
 
-#~ msgid "option type (%d) not implemented in popt\n"
-#~ msgstr "tipo de opci�n (%d) non implementada en popt\n"
+#: popt.c:1168
+msgid "aliases nested too deeply"
+msgstr "aliases ani�ados a un nivel demasiado profundo"
 
-#~ msgid "missing argument"
-#~ msgstr "falta un argumento"
+#: popt.c:1170
+msgid "error in parameter quoting"
+msgstr "erro nas comi�as do par�metro"
 
-#~ msgid "unknown option"
-#~ msgstr "opci�n desco�ecida"
+#: popt.c:1172
+msgid "invalid numeric value"
+msgstr "valor num�rico non v�lido"
 
-#~ msgid "mutually exclusive logical operations requested"
-#~ msgstr "solicit�ronse operaci�ns l�xicas mutuamente exclu�ntes"
+#: popt.c:1174
+msgid "number too large or too small"
+msgstr "n�mero demasiado grande ou pequeno"
 
-#~ msgid "aliases nested too deeply"
-#~ msgstr "aliases ani�ados a un nivel demasiado profundo"
+#: popt.c:1176
+msgid "memory allocation failed"
+msgstr ""
 
-#~ msgid "error in parameter quoting"
-#~ msgstr "erro nas comi�as do par�metro"
+#: popt.c:1180
+msgid "unknown error"
+msgstr "erro desco�ecido"
 
-#~ msgid "invalid numeric value"
-#~ msgstr "valor num�rico non v�lido"
+#: popthelp.c:57
+msgid "Show this help message"
+msgstr "Amosar esta mensaxe de axuda"
 
-#~ msgid "number too large or too small"
-#~ msgstr "n�mero demasiado grande ou pequeno"
+#: popthelp.c:58
+msgid "Display brief usage message"
+msgstr "Amosar brevemente o xeito de utilizaci�n"
 
-#~ msgid "unknown error"
-#~ msgstr "erro desco�ecido"
+#: popthelp.c:61
+#, fuzzy
+msgid "Display option defaults in message"
+msgstr "Amosar brevemente o xeito de utilizaci�n"
 
-#~ msgid "NONE"
-#~ msgstr "NADA"
+#: popthelp.c:103
+msgid "NONE"
+msgstr "NADA"
 
-#~ msgid "VAL"
-#~ msgstr "VAL"
+#: popthelp.c:105
+msgid "VAL"
+msgstr "VAL"
 
-#~ msgid "INT"
-#~ msgstr "INT"
+#: popthelp.c:109
+msgid "INT"
+msgstr "INT"
 
-#~ msgid "LONG"
-#~ msgstr "LONG"
+#: popthelp.c:110
+msgid "LONG"
+msgstr "LONG"
 
-#~ msgid "STRING"
-#~ msgstr "CADEA"
+#: popthelp.c:111
+msgid "STRING"
+msgstr "CADEA"
 
-#~ msgid "FLOAT"
-#~ msgstr "FLOAT"
+#: popthelp.c:112
+msgid "FLOAT"
+msgstr "FLOAT"
 
-#~ msgid "DOUBLE"
-#~ msgstr "DOUBLE"
+#: popthelp.c:113
+msgid "DOUBLE"
+msgstr "DOUBLE"
 
-#~ msgid "ARG"
-#~ msgstr "ARG"
+#: popthelp.c:114
+msgid "ARG"
+msgstr "ARG"
 
-#~ msgid "Usage:"
-#~ msgstr "Uso:"
+#: popthelp.c:486
+msgid "Usage:"
+msgstr "Uso:"
 
-#~ msgid "[OPTION...]"
-#~ msgstr "[OPCI�N...]"
+#: popthelp.c:510
+msgid "[OPTION...]"
+msgstr "[OPCI�N...]"
diff --git a/po/hu.po b/po/hu.po
index 300ebb6..686b904 100644
--- a/po/hu.po
+++ b/po/hu.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.3\n"
-"POT-Creation-Date: 2002-07-31 09:10-0400\n"
+"POT-Creation-Date: 2002-08-10 12:40-0400\n"
 "PO-Revision-Date: 2000-08-03 23:26+0200\n"
 "Last-Translator: L�szl� N�meth <nemeth@qwertynet.hu>\n"
 "Language-Team: Hungarian\n"
@@ -9,6 +9,55 @@ msgstr ""
 "Content-Type: text/plain; charset=ISO-8859-2\n"
 "Content-Transfer-Encoding: 8-bit\n"
 
+#: popt.c:34
+msgid "unknown errno"
+msgstr ""
+
+#: popt.c:940
+#, c-format
+msgid "option type (%d) not implemented in popt\n"
+msgstr ""
+
+#: popt.c:1160
+msgid "missing argument"
+msgstr ""
+
+#: popt.c:1162
+msgid "unknown option"
+msgstr ""
+
+#: popt.c:1164
+msgid "mutually exclusive logical operations requested"
+msgstr ""
+
+#: popt.c:1166
+msgid "opt->arg should not be NULL"
+msgstr ""
+
+#: popt.c:1168
+msgid "aliases nested too deeply"
+msgstr ""
+
+#: popt.c:1170
+msgid "error in parameter quoting"
+msgstr ""
+
+#: popt.c:1172
+msgid "invalid numeric value"
+msgstr ""
+
+#: popt.c:1174
+msgid "number too large or too small"
+msgstr ""
+
+#: popt.c:1176
+msgid "memory allocation failed"
+msgstr ""
+
+#: popt.c:1180
+msgid "unknown error"
+msgstr ""
+
 #: popthelp.c:57
 msgid "Show this help message"
 msgstr "E s�g� megjelen�t�se"
@@ -21,3 +70,43 @@ msgstr "R
 #, fuzzy
 msgid "Display option defaults in message"
 msgstr "R�vid haszn�lati utas�t�s megjelen�t�se"
+
+#: popthelp.c:103
+msgid "NONE"
+msgstr ""
+
+#: popthelp.c:105
+msgid "VAL"
+msgstr ""
+
+#: popthelp.c:109
+msgid "INT"
+msgstr ""
+
+#: popthelp.c:110
+msgid "LONG"
+msgstr ""
+
+#: popthelp.c:111
+msgid "STRING"
+msgstr ""
+
+#: popthelp.c:112
+msgid "FLOAT"
+msgstr ""
+
+#: popthelp.c:113
+msgid "DOUBLE"
+msgstr ""
+
+#: popthelp.c:114
+msgid "ARG"
+msgstr ""
+
+#: popthelp.c:486
+msgid "Usage:"
+msgstr ""
+
+#: popthelp.c:510
+msgid "[OPTION...]"
+msgstr ""
diff --git a/po/id.po b/po/id.po
index 04e1f30..5b022b9 100644
--- a/po/id.po
+++ b/po/id.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.3\n"
-"POT-Creation-Date: 2002-07-31 09:10-0400\n"
+"POT-Creation-Date: 2002-08-10 12:40-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -14,6 +14,55 @@ msgstr ""
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: ENCODING\n"
 
+#: popt.c:34
+msgid "unknown errno"
+msgstr ""
+
+#: popt.c:940
+#, c-format
+msgid "option type (%d) not implemented in popt\n"
+msgstr ""
+
+#: popt.c:1160
+msgid "missing argument"
+msgstr ""
+
+#: popt.c:1162
+msgid "unknown option"
+msgstr ""
+
+#: popt.c:1164
+msgid "mutually exclusive logical operations requested"
+msgstr ""
+
+#: popt.c:1166
+msgid "opt->arg should not be NULL"
+msgstr ""
+
+#: popt.c:1168
+msgid "aliases nested too deeply"
+msgstr ""
+
+#: popt.c:1170
+msgid "error in parameter quoting"
+msgstr ""
+
+#: popt.c:1172
+msgid "invalid numeric value"
+msgstr ""
+
+#: popt.c:1174
+msgid "number too large or too small"
+msgstr ""
+
+#: popt.c:1176
+msgid "memory allocation failed"
+msgstr ""
+
+#: popt.c:1180
+msgid "unknown error"
+msgstr ""
+
 #: popthelp.c:57
 msgid "Show this help message"
 msgstr ""
@@ -25,3 +74,43 @@ msgstr ""
 #: popthelp.c:61
 msgid "Display option defaults in message"
 msgstr ""
+
+#: popthelp.c:103
+msgid "NONE"
+msgstr ""
+
+#: popthelp.c:105
+msgid "VAL"
+msgstr ""
+
+#: popthelp.c:109
+msgid "INT"
+msgstr ""
+
+#: popthelp.c:110
+msgid "LONG"
+msgstr ""
+
+#: popthelp.c:111
+msgid "STRING"
+msgstr ""
+
+#: popthelp.c:112
+msgid "FLOAT"
+msgstr ""
+
+#: popthelp.c:113
+msgid "DOUBLE"
+msgstr ""
+
+#: popthelp.c:114
+msgid "ARG"
+msgstr ""
+
+#: popthelp.c:486
+msgid "Usage:"
+msgstr ""
+
+#: popthelp.c:510
+msgid "[OPTION...]"
+msgstr ""
diff --git a/po/is.po b/po/is.po
index d9cc2ea..43a74ca 100644
--- a/po/is.po
+++ b/po/is.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.3\n"
-"POT-Creation-Date: 2002-07-31 09:10-0400\n"
+"POT-Creation-Date: 2002-08-10 12:40-0400\n"
 "PO-Revision-Date: 2001-06-08 01:35+0000\n"
 "Last-Translator: Richard Allen <ra@hp.is>\n"
 "Language-Team: is <kde-isl@mmedia.is>\n"
@@ -9,80 +9,103 @@ msgstr ""
 "Content-Type: text/plain; charset=ISO-8859-1\n"
 "Content-Transfer-Encoding: 8-bit\n"
 
-#: popthelp.c:57
-msgid "Show this help message"
-msgstr "S�na �essa hj�lp"
+#: popt.c:34
+msgid "unknown errno"
+msgstr "��ekkt villun�mer"
 
-#: popthelp.c:58
-msgid "Display brief usage message"
-msgstr "S�na stuttar notkunarlei�beiningar"
+#: popt.c:940
+#, c-format
+msgid "option type (%d) not implemented in popt\n"
+msgstr "rofager�in (%d) er ekki studd � popt\n"
 
-#: popthelp.c:61
-msgid "Display option defaults in message"
-msgstr "S�na sj�lfgefin gildi rofa � skilabo�um"
+#: popt.c:1160
+msgid "missing argument"
+msgstr "vantar vi�fang"
 
-#~ msgid "unknown errno"
-#~ msgstr "��ekkt villun�mer"
+#: popt.c:1162
+msgid "unknown option"
+msgstr "��ekktur rofi"
 
-#~ msgid "option type (%d) not implemented in popt\n"
-#~ msgstr "rofager�in (%d) er ekki studd � popt\n"
+#: popt.c:1164
+msgid "mutually exclusive logical operations requested"
+msgstr "be�i� um rofa sem sl�kkva hvor � ��rum"
 
-#~ msgid "missing argument"
-#~ msgstr "vantar vi�fang"
+#: popt.c:1166
+msgid "opt->arg should not be NULL"
+msgstr "opt->arg �tti ekki a� vera NULL"
 
-#~ msgid "unknown option"
-#~ msgstr "��ekktur rofi"
+#: popt.c:1168
+msgid "aliases nested too deeply"
+msgstr "al�asar of fl�knir"
 
-#~ msgid "mutually exclusive logical operations requested"
-#~ msgstr "be�i� um rofa sem sl�kkva hvor � ��rum"
+#: popt.c:1170
+msgid "error in parameter quoting"
+msgstr "villa � vi�f�ngum (g�salappir og svo frv.)"
 
-#~ msgid "opt->arg should not be NULL"
-#~ msgstr "opt->arg �tti ekki a� vera NULL"
+#: popt.c:1172
+msgid "invalid numeric value"
+msgstr "�gilt t�lulegt gildi"
 
-#~ msgid "aliases nested too deeply"
-#~ msgstr "al�asar of fl�knir"
+#: popt.c:1174
+msgid "number too large or too small"
+msgstr "talan of st�r e�a sm�"
 
-#~ msgid "error in parameter quoting"
-#~ msgstr "villa � vi�f�ngum (g�salappir og svo frv.)"
+#: popt.c:1176
+msgid "memory allocation failed"
+msgstr "ekki t�kst a� taka fr� minni"
 
-#~ msgid "invalid numeric value"
-#~ msgstr "�gilt t�lulegt gildi"
+#: popt.c:1180
+msgid "unknown error"
+msgstr "��ekkt villa"
 
-#~ msgid "number too large or too small"
-#~ msgstr "talan of st�r e�a sm�"
+#: popthelp.c:57
+msgid "Show this help message"
+msgstr "S�na �essa hj�lp"
 
-#~ msgid "memory allocation failed"
-#~ msgstr "ekki t�kst a� taka fr� minni"
+#: popthelp.c:58
+msgid "Display brief usage message"
+msgstr "S�na stuttar notkunarlei�beiningar"
 
-#~ msgid "unknown error"
-#~ msgstr "��ekkt villa"
+#: popthelp.c:61
+msgid "Display option defaults in message"
+msgstr "S�na sj�lfgefin gildi rofa � skilabo�um"
 
-#~ msgid "NONE"
-#~ msgstr "ENGIN"
+#: popthelp.c:103
+msgid "NONE"
+msgstr "ENGIN"
 
-#~ msgid "VAL"
-#~ msgstr "VAL"
+#: popthelp.c:105
+msgid "VAL"
+msgstr "VAL"
 
-#~ msgid "INT"
-#~ msgstr "INT"
+#: popthelp.c:109
+msgid "INT"
+msgstr "INT"
 
-#~ msgid "LONG"
-#~ msgstr "LONG"
+#: popthelp.c:110
+msgid "LONG"
+msgstr "LONG"
 
-#~ msgid "STRING"
-#~ msgstr "STRING"
+#: popthelp.c:111
+msgid "STRING"
+msgstr "STRING"
 
-#~ msgid "FLOAT"
-#~ msgstr "FLOAT"
+#: popthelp.c:112
+msgid "FLOAT"
+msgstr "FLOAT"
 
-#~ msgid "DOUBLE"
-#~ msgstr "DOUBLE"
+#: popthelp.c:113
+msgid "DOUBLE"
+msgstr "DOUBLE"
 
-#~ msgid "ARG"
-#~ msgstr "ARG"
+#: popthelp.c:114
+msgid "ARG"
+msgstr "ARG"
 
-#~ msgid "Usage:"
-#~ msgstr "Notkun:"
+#: popthelp.c:486
+msgid "Usage:"
+msgstr "Notkun:"
 
-#~ msgid "[OPTION...]"
-#~ msgstr "[ROFI...]"
+#: popthelp.c:510
+msgid "[OPTION...]"
+msgstr "[ROFI...]"
diff --git a/po/it.po b/po/it.po
index 04e1f30..5b022b9 100644
--- a/po/it.po
+++ b/po/it.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.3\n"
-"POT-Creation-Date: 2002-07-31 09:10-0400\n"
+"POT-Creation-Date: 2002-08-10 12:40-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -14,6 +14,55 @@ msgstr ""
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: ENCODING\n"
 
+#: popt.c:34
+msgid "unknown errno"
+msgstr ""
+
+#: popt.c:940
+#, c-format
+msgid "option type (%d) not implemented in popt\n"
+msgstr ""
+
+#: popt.c:1160
+msgid "missing argument"
+msgstr ""
+
+#: popt.c:1162
+msgid "unknown option"
+msgstr ""
+
+#: popt.c:1164
+msgid "mutually exclusive logical operations requested"
+msgstr ""
+
+#: popt.c:1166
+msgid "opt->arg should not be NULL"
+msgstr ""
+
+#: popt.c:1168
+msgid "aliases nested too deeply"
+msgstr ""
+
+#: popt.c:1170
+msgid "error in parameter quoting"
+msgstr ""
+
+#: popt.c:1172
+msgid "invalid numeric value"
+msgstr ""
+
+#: popt.c:1174
+msgid "number too large or too small"
+msgstr ""
+
+#: popt.c:1176
+msgid "memory allocation failed"
+msgstr ""
+
+#: popt.c:1180
+msgid "unknown error"
+msgstr ""
+
 #: popthelp.c:57
 msgid "Show this help message"
 msgstr ""
@@ -25,3 +74,43 @@ msgstr ""
 #: popthelp.c:61
 msgid "Display option defaults in message"
 msgstr ""
+
+#: popthelp.c:103
+msgid "NONE"
+msgstr ""
+
+#: popthelp.c:105
+msgid "VAL"
+msgstr ""
+
+#: popthelp.c:109
+msgid "INT"
+msgstr ""
+
+#: popthelp.c:110
+msgid "LONG"
+msgstr ""
+
+#: popthelp.c:111
+msgid "STRING"
+msgstr ""
+
+#: popthelp.c:112
+msgid "FLOAT"
+msgstr ""
+
+#: popthelp.c:113
+msgid "DOUBLE"
+msgstr ""
+
+#: popthelp.c:114
+msgid "ARG"
+msgstr ""
+
+#: popthelp.c:486
+msgid "Usage:"
+msgstr ""
+
+#: popthelp.c:510
+msgid "[OPTION...]"
+msgstr ""
diff --git a/po/ja.po b/po/ja.po
index 04e1f30..5b022b9 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.3\n"
-"POT-Creation-Date: 2002-07-31 09:10-0400\n"
+"POT-Creation-Date: 2002-08-10 12:40-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -14,6 +14,55 @@ msgstr ""
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: ENCODING\n"
 
+#: popt.c:34
+msgid "unknown errno"
+msgstr ""
+
+#: popt.c:940
+#, c-format
+msgid "option type (%d) not implemented in popt\n"
+msgstr ""
+
+#: popt.c:1160
+msgid "missing argument"
+msgstr ""
+
+#: popt.c:1162
+msgid "unknown option"
+msgstr ""
+
+#: popt.c:1164
+msgid "mutually exclusive logical operations requested"
+msgstr ""
+
+#: popt.c:1166
+msgid "opt->arg should not be NULL"
+msgstr ""
+
+#: popt.c:1168
+msgid "aliases nested too deeply"
+msgstr ""
+
+#: popt.c:1170
+msgid "error in parameter quoting"
+msgstr ""
+
+#: popt.c:1172
+msgid "invalid numeric value"
+msgstr ""
+
+#: popt.c:1174
+msgid "number too large or too small"
+msgstr ""
+
+#: popt.c:1176
+msgid "memory allocation failed"
+msgstr ""
+
+#: popt.c:1180
+msgid "unknown error"
+msgstr ""
+
 #: popthelp.c:57
 msgid "Show this help message"
 msgstr ""
@@ -25,3 +74,43 @@ msgstr ""
 #: popthelp.c:61
 msgid "Display option defaults in message"
 msgstr ""
+
+#: popthelp.c:103
+msgid "NONE"
+msgstr ""
+
+#: popthelp.c:105
+msgid "VAL"
+msgstr ""
+
+#: popthelp.c:109
+msgid "INT"
+msgstr ""
+
+#: popthelp.c:110
+msgid "LONG"
+msgstr ""
+
+#: popthelp.c:111
+msgid "STRING"
+msgstr ""
+
+#: popthelp.c:112
+msgid "FLOAT"
+msgstr ""
+
+#: popthelp.c:113
+msgid "DOUBLE"
+msgstr ""
+
+#: popthelp.c:114
+msgid "ARG"
+msgstr ""
+
+#: popthelp.c:486
+msgid "Usage:"
+msgstr ""
+
+#: popthelp.c:510
+msgid "[OPTION...]"
+msgstr ""
diff --git a/po/ko.po b/po/ko.po
index c0b7431..eb808f8 100644
--- a/po/ko.po
+++ b/po/ko.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6\n"
-"POT-Creation-Date: 2002-07-31 09:10-0400\n"
+"POT-Creation-Date: 2002-08-10 12:40-0400\n"
 "PO-Revision-Date: 2001-09-06 20:06+0900\n"
 "Last-Translator: Jong-Hoon Ryu <redhat4u@netian.com>\n"
 "Language-Team: GNU Translation project <ko@li.org>\n"
@@ -9,80 +9,103 @@ msgstr ""
 "Content-Type: text/plain; charset=EUC-KR\n"
 "Content-Transfer-Encoding: 8-bit\n"
 
-#: popthelp.c:57
-msgid "Show this help message"
-msgstr "�� ������ �����ݴϴ�"
+#: popt.c:34
+msgid "unknown errno"
+msgstr "�� �� ���� �����ڵ�(errno) �Դϴ�"
 
-#: popthelp.c:58
-msgid "Display brief usage message"
-msgstr "������ ������ �����ݴϴ�"
+#: popt.c:940
+#, c-format
+msgid "option type (%d) not implemented in popt\n"
+msgstr "�ɼ� ���� (%d)�� popt���� ����� �� �����ϴ�\n"
 
-#: popthelp.c:61
-msgid "Display option defaults in message"
-msgstr "�⺻���� �ɼ��� �����ݴϴ�"
+#: popt.c:1160
+msgid "missing argument"
+msgstr "�μ��� �������� �ʾҽ��ϴ�"
 
-#~ msgid "unknown errno"
-#~ msgstr "�� �� ���� �����ڵ�(errno) �Դϴ�"
+#: popt.c:1162
+msgid "unknown option"
+msgstr "�� �� ���� �ɼ��Դϴ�"
 
-#~ msgid "option type (%d) not implemented in popt\n"
-#~ msgstr "�ɼ� ���� (%d)�� popt���� ����� �� �����ϴ�\n"
+#: popt.c:1164
+msgid "mutually exclusive logical operations requested"
+msgstr "���ʿ� ��Ÿ�� ���� ������ �����Ǿ����ϴ�"
 
-#~ msgid "missing argument"
-#~ msgstr "�μ��� �������� �ʾҽ��ϴ�"
+#: popt.c:1166
+msgid "opt->arg should not be NULL"
+msgstr "�ɼ�->�μ��� NULL�� �Ǿ�� �ȵ˴ϴ�"
 
-#~ msgid "unknown option"
-#~ msgstr "�� �� ���� �ɼ��Դϴ�"
+#: popt.c:1168
+msgid "aliases nested too deeply"
+msgstr "��Ī(alias)�� �����ϰ� �����Ǿ����ϴ�"
 
-#~ msgid "mutually exclusive logical operations requested"
-#~ msgstr "���ʿ� ��Ÿ�� ���� ������ �����Ǿ����ϴ�"
+#: popt.c:1170
+msgid "error in parameter quoting"
+msgstr "�Ű������� ������ �ֽ��ϴ�"
 
-#~ msgid "opt->arg should not be NULL"
-#~ msgstr "�ɼ�->�μ��� NULL�� �Ǿ�� �ȵ˴ϴ�"
+#: popt.c:1172
+msgid "invalid numeric value"
+msgstr "�߸��� ��ġ ���Դϴ�"
 
-#~ msgid "aliases nested too deeply"
-#~ msgstr "��Ī(alias)�� �����ϰ� �����Ǿ����ϴ�"
+#: popt.c:1174
+msgid "number too large or too small"
+msgstr "���ڰ� �ʹ� ũ�ų� �ʹ� �����ϴ�"
 
-#~ msgid "error in parameter quoting"
-#~ msgstr "�Ű������� ������ �ֽ��ϴ�"
+#: popt.c:1176
+msgid "memory allocation failed"
+msgstr "�޸� �Ҵ翡 �����߽��ϴ�"
 
-#~ msgid "invalid numeric value"
-#~ msgstr "�߸��� ��ġ ���Դϴ�"
+#: popt.c:1180
+msgid "unknown error"
+msgstr "�� �� ���� �����Դϴ�"
 
-#~ msgid "number too large or too small"
-#~ msgstr "���ڰ� �ʹ� ũ�ų� �ʹ� �����ϴ�"
+#: popthelp.c:57
+msgid "Show this help message"
+msgstr "�� ������ �����ݴϴ�"
 
-#~ msgid "memory allocation failed"
-#~ msgstr "�޸� �Ҵ翡 �����߽��ϴ�"
+#: popthelp.c:58
+msgid "Display brief usage message"
+msgstr "������ ������ �����ݴϴ�"
 
-#~ msgid "unknown error"
-#~ msgstr "�� �� ���� �����Դϴ�"
+#: popthelp.c:61
+msgid "Display option defaults in message"
+msgstr "�⺻���� �ɼ��� �����ݴϴ�"
 
-#~ msgid "NONE"
-#~ msgstr "����(NONE)"
+#: popthelp.c:103
+msgid "NONE"
+msgstr "����(NONE)"
 
-#~ msgid "VAL"
-#~ msgstr "��(VAL)"
+#: popthelp.c:105
+msgid "VAL"
+msgstr "��(VAL)"
 
-#~ msgid "INT"
-#~ msgstr "����(INT)"
+#: popthelp.c:109
+msgid "INT"
+msgstr "����(INT)"
 
-#~ msgid "LONG"
-#~ msgstr "����(LONG)"
+#: popthelp.c:110
+msgid "LONG"
+msgstr "����(LONG)"
 
-#~ msgid "STRING"
-#~ msgstr "���ڿ�(STRING)"
+#: popthelp.c:111
+msgid "STRING"
+msgstr "���ڿ�(STRING)"
 
-#~ msgid "FLOAT"
-#~ msgstr "�Ҽ�(FLOAT)"
+#: popthelp.c:112
+msgid "FLOAT"
+msgstr "�Ҽ�(FLOAT)"
 
-#~ msgid "DOUBLE"
-#~ msgstr "�Ҽ�(DOUBLE)"
+#: popthelp.c:113
+msgid "DOUBLE"
+msgstr "�Ҽ�(DOUBLE)"
 
-#~ msgid "ARG"
-#~ msgstr "�μ�(ARG)"
+#: popthelp.c:114
+msgid "ARG"
+msgstr "�μ�(ARG)"
 
-#~ msgid "Usage:"
-#~ msgstr "����:"
+#: popthelp.c:486
+msgid "Usage:"
+msgstr "����:"
 
-#~ msgid "[OPTION...]"
-#~ msgstr "[�ɼ�...]"
+#: popthelp.c:510
+msgid "[OPTION...]"
+msgstr "[�ɼ�...]"
diff --git a/po/no.po b/po/no.po
index 887aaf9..6683c80 100644
--- a/po/no.po
+++ b/po/no.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.3\n"
-"POT-Creation-Date: 2002-07-31 09:10-0400\n"
+"POT-Creation-Date: 2002-08-10 12:40-0400\n"
 "PO-Revision-Date: 2001-06-27 11:05+0200\n"
 "Last-Translator: Kjartan Maraas <kmaraas@online.no>\n"
 "Language-Team: Norwegian <no@li.org>\n"
@@ -9,80 +9,103 @@ msgstr ""
 "Content-Type: text/plain; charset=iso-8859-1\n"
 "Content-Transfer-Encoding: 8-bit\n"
 
-#: popthelp.c:57
-msgid "Show this help message"
-msgstr "Vis denne hjelpmeldingen"
+#: popt.c:34
+msgid "unknown errno"
+msgstr "ukjent errno"
 
-#: popthelp.c:58
-msgid "Display brief usage message"
-msgstr "Vis kort bruksmelding"
+#: popt.c:940
+#, c-format
+msgid "option type (%d) not implemented in popt\n"
+msgstr "flaggtype (%d) ikke implementert i popt\n"
 
-#: popthelp.c:61
-msgid "Display option defaults in message"
-msgstr "Vis forvalgte flagg i melding"
+#: popt.c:1160
+msgid "missing argument"
+msgstr "manglende argument"
 
-#~ msgid "unknown errno"
-#~ msgstr "ukjent errno"
+#: popt.c:1162
+msgid "unknown option"
+msgstr "ukjent flagg"
 
-#~ msgid "option type (%d) not implemented in popt\n"
-#~ msgstr "flaggtype (%d) ikke implementert i popt\n"
+#: popt.c:1164
+msgid "mutually exclusive logical operations requested"
+msgstr "gjensidig eksluderende logiske operasjoner forespurt"
 
-#~ msgid "missing argument"
-#~ msgstr "manglende argument"
+#: popt.c:1166
+msgid "opt->arg should not be NULL"
+msgstr "opt->arg m� ikke v�re NULL"
 
-#~ msgid "unknown option"
-#~ msgstr "ukjent flagg"
+#: popt.c:1168
+msgid "aliases nested too deeply"
+msgstr "aliaser med for dype l�kker"
 
-#~ msgid "mutually exclusive logical operations requested"
-#~ msgstr "gjensidig eksluderende logiske operasjoner forespurt"
+#: popt.c:1170
+msgid "error in parameter quoting"
+msgstr "feil i parametersitering"
 
-#~ msgid "opt->arg should not be NULL"
-#~ msgstr "opt->arg m� ikke v�re NULL"
+#: popt.c:1172
+msgid "invalid numeric value"
+msgstr "ugyldig numerisk verdi"
 
-#~ msgid "aliases nested too deeply"
-#~ msgstr "aliaser med for dype l�kker"
+#: popt.c:1174
+msgid "number too large or too small"
+msgstr "tallet er for stort eller lite"
 
-#~ msgid "error in parameter quoting"
-#~ msgstr "feil i parametersitering"
+#: popt.c:1176
+msgid "memory allocation failed"
+msgstr "minneallokering feilet"
 
-#~ msgid "invalid numeric value"
-#~ msgstr "ugyldig numerisk verdi"
+#: popt.c:1180
+msgid "unknown error"
+msgstr "ukjent feil"
 
-#~ msgid "number too large or too small"
-#~ msgstr "tallet er for stort eller lite"
+#: popthelp.c:57
+msgid "Show this help message"
+msgstr "Vis denne hjelpmeldingen"
 
-#~ msgid "memory allocation failed"
-#~ msgstr "minneallokering feilet"
+#: popthelp.c:58
+msgid "Display brief usage message"
+msgstr "Vis kort bruksmelding"
 
-#~ msgid "unknown error"
-#~ msgstr "ukjent feil"
+#: popthelp.c:61
+msgid "Display option defaults in message"
+msgstr "Vis forvalgte flagg i melding"
 
-#~ msgid "NONE"
-#~ msgstr "INGEN"
+#: popthelp.c:103
+msgid "NONE"
+msgstr "INGEN"
 
-#~ msgid "VAL"
-#~ msgstr "VERDI"
+#: popthelp.c:105
+msgid "VAL"
+msgstr "VERDI"
 
-#~ msgid "INT"
-#~ msgstr "HELTALL"
+#: popthelp.c:109
+msgid "INT"
+msgstr "HELTALL"
 
-#~ msgid "LONG"
-#~ msgstr "LONG"
+#: popthelp.c:110
+msgid "LONG"
+msgstr "LONG"
 
-#~ msgid "STRING"
-#~ msgstr "STRENG"
+#: popthelp.c:111
+msgid "STRING"
+msgstr "STRENG"
 
-#~ msgid "FLOAT"
-#~ msgstr "FLYTTALL"
+#: popthelp.c:112
+msgid "FLOAT"
+msgstr "FLYTTALL"
 
-#~ msgid "DOUBLE"
-#~ msgstr "DOUBLE"
+#: popthelp.c:113
+msgid "DOUBLE"
+msgstr "DOUBLE"
 
-#~ msgid "ARG"
-#~ msgstr "ARG"
+#: popthelp.c:114
+msgid "ARG"
+msgstr "ARG"
 
-#~ msgid "Usage:"
-#~ msgstr "Bruk:"
+#: popthelp.c:486
+msgid "Usage:"
+msgstr "Bruk:"
 
-#~ msgid "[OPTION...]"
-#~ msgstr "[FLAGG...]"
+#: popthelp.c:510
+msgid "[OPTION...]"
+msgstr "[FLAGG...]"
diff --git a/po/pl.po b/po/pl.po
index 04e1f30..5b022b9 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.3\n"
-"POT-Creation-Date: 2002-07-31 09:10-0400\n"
+"POT-Creation-Date: 2002-08-10 12:40-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -14,6 +14,55 @@ msgstr ""
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: ENCODING\n"
 
+#: popt.c:34
+msgid "unknown errno"
+msgstr ""
+
+#: popt.c:940
+#, c-format
+msgid "option type (%d) not implemented in popt\n"
+msgstr ""
+
+#: popt.c:1160
+msgid "missing argument"
+msgstr ""
+
+#: popt.c:1162
+msgid "unknown option"
+msgstr ""
+
+#: popt.c:1164
+msgid "mutually exclusive logical operations requested"
+msgstr ""
+
+#: popt.c:1166
+msgid "opt->arg should not be NULL"
+msgstr ""
+
+#: popt.c:1168
+msgid "aliases nested too deeply"
+msgstr ""
+
+#: popt.c:1170
+msgid "error in parameter quoting"
+msgstr ""
+
+#: popt.c:1172
+msgid "invalid numeric value"
+msgstr ""
+
+#: popt.c:1174
+msgid "number too large or too small"
+msgstr ""
+
+#: popt.c:1176
+msgid "memory allocation failed"
+msgstr ""
+
+#: popt.c:1180
+msgid "unknown error"
+msgstr ""
+
 #: popthelp.c:57
 msgid "Show this help message"
 msgstr ""
@@ -25,3 +74,43 @@ msgstr ""
 #: popthelp.c:61
 msgid "Display option defaults in message"
 msgstr ""
+
+#: popthelp.c:103
+msgid "NONE"
+msgstr ""
+
+#: popthelp.c:105
+msgid "VAL"
+msgstr ""
+
+#: popthelp.c:109
+msgid "INT"
+msgstr ""
+
+#: popthelp.c:110
+msgid "LONG"
+msgstr ""
+
+#: popthelp.c:111
+msgid "STRING"
+msgstr ""
+
+#: popthelp.c:112
+msgid "FLOAT"
+msgstr ""
+
+#: popthelp.c:113
+msgid "DOUBLE"
+msgstr ""
+
+#: popthelp.c:114
+msgid "ARG"
+msgstr ""
+
+#: popthelp.c:486
+msgid "Usage:"
+msgstr ""
+
+#: popthelp.c:510
+msgid "[OPTION...]"
+msgstr ""
diff --git a/po/popt.pot b/po/popt.pot
index 3835131..523d030 100644
--- a/po/popt.pot
+++ b/po/popt.pot
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2002-07-31 09:10-0400\n"
+"POT-Creation-Date: 2002-08-10 12:40-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -15,6 +15,55 @@ msgstr ""
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: 8bit\n"
 
+#: popt.c:34
+msgid "unknown errno"
+msgstr ""
+
+#: popt.c:940
+#, c-format
+msgid "option type (%d) not implemented in popt\n"
+msgstr ""
+
+#: popt.c:1160
+msgid "missing argument"
+msgstr ""
+
+#: popt.c:1162
+msgid "unknown option"
+msgstr ""
+
+#: popt.c:1164
+msgid "mutually exclusive logical operations requested"
+msgstr ""
+
+#: popt.c:1166
+msgid "opt->arg should not be NULL"
+msgstr ""
+
+#: popt.c:1168
+msgid "aliases nested too deeply"
+msgstr ""
+
+#: popt.c:1170
+msgid "error in parameter quoting"
+msgstr ""
+
+#: popt.c:1172
+msgid "invalid numeric value"
+msgstr ""
+
+#: popt.c:1174
+msgid "number too large or too small"
+msgstr ""
+
+#: popt.c:1176
+msgid "memory allocation failed"
+msgstr ""
+
+#: popt.c:1180
+msgid "unknown error"
+msgstr ""
+
 #: popthelp.c:57
 msgid "Show this help message"
 msgstr ""
@@ -26,3 +75,43 @@ msgstr ""
 #: popthelp.c:61
 msgid "Display option defaults in message"
 msgstr ""
+
+#: popthelp.c:103
+msgid "NONE"
+msgstr ""
+
+#: popthelp.c:105
+msgid "VAL"
+msgstr ""
+
+#: popthelp.c:109
+msgid "INT"
+msgstr ""
+
+#: popthelp.c:110
+msgid "LONG"
+msgstr ""
+
+#: popthelp.c:111
+msgid "STRING"
+msgstr ""
+
+#: popthelp.c:112
+msgid "FLOAT"
+msgstr ""
+
+#: popthelp.c:113
+msgid "DOUBLE"
+msgstr ""
+
+#: popthelp.c:114
+msgid "ARG"
+msgstr ""
+
+#: popthelp.c:486
+msgid "Usage:"
+msgstr ""
+
+#: popthelp.c:510
+msgid "[OPTION...]"
+msgstr ""
diff --git a/po/pt.po b/po/pt.po
index 354518b..db759fb 100644
--- a/po/pt.po
+++ b/po/pt.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt\n"
-"POT-Creation-Date: 2002-07-31 09:10-0400\n"
+"POT-Creation-Date: 2002-08-10 12:40-0400\n"
 "PO-Revision-Date: 2002-02-13 18:32+0000\n"
 "Last-Translator: Pedro Morais <morais@kde.org>\n"
 "Language-Team: pt <morais@kde.org>\n"
@@ -9,80 +9,103 @@ msgstr ""
 "Content-Type: text/plain; charset=iso-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: popthelp.c:57
-msgid "Show this help message"
-msgstr "Mostrar esta mensagem de ajuda"
+#: popt.c:34
+msgid "unknown errno"
+msgstr "errno desconhecido"
 
-#: popthelp.c:58
-msgid "Display brief usage message"
-msgstr "Mostrar uma mensagem de utiliza��o sucinta"
+#: popt.c:940
+#, c-format
+msgid "option type (%d) not implemented in popt\n"
+msgstr "tipo de op��o (%d) n�o implementado no popt\n"
 
-#: popthelp.c:61
-msgid "Display option defaults in message"
-msgstr "Mostrar valor por omiss�o das op��es na mensagem"
+#: popt.c:1160
+msgid "missing argument"
+msgstr "falta um argumento"
 
-#~ msgid "unknown errno"
-#~ msgstr "errno desconhecido"
+#: popt.c:1162
+msgid "unknown option"
+msgstr "op��o desconhecida"
 
-#~ msgid "option type (%d) not implemented in popt\n"
-#~ msgstr "tipo de op��o (%d) n�o implementado no popt\n"
+#: popt.c:1164
+msgid "mutually exclusive logical operations requested"
+msgstr "foram pedidas opera��es l�gicas mutuamente exclusivas"
 
-#~ msgid "missing argument"
-#~ msgstr "falta um argumento"
+#: popt.c:1166
+msgid "opt->arg should not be NULL"
+msgstr "opt->arg n�o deve ser NULL"
 
-#~ msgid "unknown option"
-#~ msgstr "op��o desconhecida"
+#: popt.c:1168
+msgid "aliases nested too deeply"
+msgstr "'aliases' demasiado aninhados"
 
-#~ msgid "mutually exclusive logical operations requested"
-#~ msgstr "foram pedidas opera��es l�gicas mutuamente exclusivas"
+#: popt.c:1170
+msgid "error in parameter quoting"
+msgstr "erros no 'quoting' de par�metros"
 
-#~ msgid "opt->arg should not be NULL"
-#~ msgstr "opt->arg n�o deve ser NULL"
+#: popt.c:1172
+msgid "invalid numeric value"
+msgstr "valor n�merico inv�lido"
 
-#~ msgid "aliases nested too deeply"
-#~ msgstr "'aliases' demasiado aninhados"
+#: popt.c:1174
+msgid "number too large or too small"
+msgstr "n�mero demasiado grando ou pequeno"
 
-#~ msgid "error in parameter quoting"
-#~ msgstr "erros no 'quoting' de par�metros"
+#: popt.c:1176
+msgid "memory allocation failed"
+msgstr "aloca��o de mem�ria falhou"
 
-#~ msgid "invalid numeric value"
-#~ msgstr "valor n�merico inv�lido"
+#: popt.c:1180
+msgid "unknown error"
+msgstr "erro desconhecido"
 
-#~ msgid "number too large or too small"
-#~ msgstr "n�mero demasiado grando ou pequeno"
+#: popthelp.c:57
+msgid "Show this help message"
+msgstr "Mostrar esta mensagem de ajuda"
 
-#~ msgid "memory allocation failed"
-#~ msgstr "aloca��o de mem�ria falhou"
+#: popthelp.c:58
+msgid "Display brief usage message"
+msgstr "Mostrar uma mensagem de utiliza��o sucinta"
 
-#~ msgid "unknown error"
-#~ msgstr "erro desconhecido"
+#: popthelp.c:61
+msgid "Display option defaults in message"
+msgstr "Mostrar valor por omiss�o das op��es na mensagem"
 
-#~ msgid "NONE"
-#~ msgstr "NONE"
+#: popthelp.c:103
+msgid "NONE"
+msgstr "NONE"
 
-#~ msgid "VAL"
-#~ msgstr "VAL"
+#: popthelp.c:105
+msgid "VAL"
+msgstr "VAL"
 
-#~ msgid "INT"
-#~ msgstr "INT"
+#: popthelp.c:109
+msgid "INT"
+msgstr "INT"
 
-#~ msgid "LONG"
-#~ msgstr "LONG"
+#: popthelp.c:110
+msgid "LONG"
+msgstr "LONG"
 
-#~ msgid "STRING"
-#~ msgstr "STRING"
+#: popthelp.c:111
+msgid "STRING"
+msgstr "STRING"
 
-#~ msgid "FLOAT"
-#~ msgstr "FLOAT"
+#: popthelp.c:112
+msgid "FLOAT"
+msgstr "FLOAT"
 
-#~ msgid "DOUBLE"
-#~ msgstr "DOUBLE"
+#: popthelp.c:113
+msgid "DOUBLE"
+msgstr "DOUBLE"
 
-#~ msgid "ARG"
-#~ msgstr "ARG"
+#: popthelp.c:114
+msgid "ARG"
+msgstr "ARG"
 
-#~ msgid "Usage:"
-#~ msgstr "Utiliza��o:"
+#: popthelp.c:486
+msgid "Usage:"
+msgstr "Utiliza��o:"
 
-#~ msgid "[OPTION...]"
-#~ msgstr "[OP��O...]"
+#: popthelp.c:510
+msgid "[OPTION...]"
+msgstr "[OP��O...]"
diff --git a/po/pt_BR.po b/po/pt_BR.po
index 04e1f30..5b022b9 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.3\n"
-"POT-Creation-Date: 2002-07-31 09:10-0400\n"
+"POT-Creation-Date: 2002-08-10 12:40-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -14,6 +14,55 @@ msgstr ""
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: ENCODING\n"
 
+#: popt.c:34
+msgid "unknown errno"
+msgstr ""
+
+#: popt.c:940
+#, c-format
+msgid "option type (%d) not implemented in popt\n"
+msgstr ""
+
+#: popt.c:1160
+msgid "missing argument"
+msgstr ""
+
+#: popt.c:1162
+msgid "unknown option"
+msgstr ""
+
+#: popt.c:1164
+msgid "mutually exclusive logical operations requested"
+msgstr ""
+
+#: popt.c:1166
+msgid "opt->arg should not be NULL"
+msgstr ""
+
+#: popt.c:1168
+msgid "aliases nested too deeply"
+msgstr ""
+
+#: popt.c:1170
+msgid "error in parameter quoting"
+msgstr ""
+
+#: popt.c:1172
+msgid "invalid numeric value"
+msgstr ""
+
+#: popt.c:1174
+msgid "number too large or too small"
+msgstr ""
+
+#: popt.c:1176
+msgid "memory allocation failed"
+msgstr ""
+
+#: popt.c:1180
+msgid "unknown error"
+msgstr ""
+
 #: popthelp.c:57
 msgid "Show this help message"
 msgstr ""
@@ -25,3 +74,43 @@ msgstr ""
 #: popthelp.c:61
 msgid "Display option defaults in message"
 msgstr ""
+
+#: popthelp.c:103
+msgid "NONE"
+msgstr ""
+
+#: popthelp.c:105
+msgid "VAL"
+msgstr ""
+
+#: popthelp.c:109
+msgid "INT"
+msgstr ""
+
+#: popthelp.c:110
+msgid "LONG"
+msgstr ""
+
+#: popthelp.c:111
+msgid "STRING"
+msgstr ""
+
+#: popthelp.c:112
+msgid "FLOAT"
+msgstr ""
+
+#: popthelp.c:113
+msgid "DOUBLE"
+msgstr ""
+
+#: popthelp.c:114
+msgid "ARG"
+msgstr ""
+
+#: popthelp.c:486
+msgid "Usage:"
+msgstr ""
+
+#: popthelp.c:510
+msgid "[OPTION...]"
+msgstr ""
diff --git a/po/ro.po b/po/ro.po
index f73f9c8..2f28f68 100644
--- a/po/ro.po
+++ b/po/ro.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.3\n"
-"POT-Creation-Date: 2002-07-31 09:10-0400\n"
+"POT-Creation-Date: 2002-08-10 12:40-0400\n"
 "PO-Revision-Date: 2000-06-14 23:23+EST\n"
 "Last-Translator: Cristian Gafton <gafton@redhat.com>\n"
 "Language-Team: Romanian <ro@li.org>\n"
@@ -9,6 +9,56 @@ msgstr ""
 "Content-Type: text/plain; charset=ISO-8859-2\n"
 "Content-Transfer-Encoding: 8bit\n"
 
+#: popt.c:34
+msgid "unknown errno"
+msgstr "eroare necunoscuta"
+
+#: popt.c:940
+#, c-format
+msgid "option type (%d) not implemented in popt\n"
+msgstr "optiunea de tipul (%d) nu este implementata in popt\n"
+
+#: popt.c:1160
+msgid "missing argument"
+msgstr "argument lipsa"
+
+#: popt.c:1162
+msgid "unknown option"
+msgstr "optiune necunoscuta"
+
+#: popt.c:1164
+msgid "mutually exclusive logical operations requested"
+msgstr ""
+
+#: popt.c:1166
+msgid "opt->arg should not be NULL"
+msgstr ""
+
+#: popt.c:1168
+msgid "aliases nested too deeply"
+msgstr "recursivitate infinita la optiunile sinonime"
+
+#: popt.c:1170
+#, fuzzy
+msgid "error in parameter quoting"
+msgstr "eroare la insertie parametru"
+
+#: popt.c:1172
+msgid "invalid numeric value"
+msgstr "valoare numarica invalida"
+
+#: popt.c:1174
+msgid "number too large or too small"
+msgstr "numar prea mare sau prea mic"
+
+#: popt.c:1176
+msgid "memory allocation failed"
+msgstr ""
+
+#: popt.c:1180
+msgid "unknown error"
+msgstr "eroare necuinoscuta"
+
 #: popthelp.c:57
 msgid "Show this help message"
 msgstr "Afisare mesaj de help"
@@ -22,36 +72,42 @@ msgstr "Afisare mesaj sintaxa sumar"
 msgid "Display option defaults in message"
 msgstr "Afisare mesaj sintaxa sumar"
 
-#~ msgid "unknown errno"
-#~ msgstr "eroare necunoscuta"
-
-#~ msgid "option type (%d) not implemented in popt\n"
-#~ msgstr "optiunea de tipul (%d) nu este implementata in popt\n"
+#: popthelp.c:103
+msgid "NONE"
+msgstr ""
 
-#~ msgid "missing argument"
-#~ msgstr "argument lipsa"
+#: popthelp.c:105
+msgid "VAL"
+msgstr ""
 
-#~ msgid "unknown option"
-#~ msgstr "optiune necunoscuta"
+#: popthelp.c:109
+msgid "INT"
+msgstr ""
 
-#~ msgid "aliases nested too deeply"
-#~ msgstr "recursivitate infinita la optiunile sinonime"
+#: popthelp.c:110
+msgid "LONG"
+msgstr ""
 
-#, fuzzy
-#~ msgid "error in parameter quoting"
-#~ msgstr "eroare la insertie parametru"
+#: popthelp.c:111
+msgid "STRING"
+msgstr ""
 
-#~ msgid "invalid numeric value"
-#~ msgstr "valoare numarica invalida"
+#: popthelp.c:112
+msgid "FLOAT"
+msgstr ""
 
-#~ msgid "number too large or too small"
-#~ msgstr "numar prea mare sau prea mic"
+#: popthelp.c:113
+msgid "DOUBLE"
+msgstr ""
 
-#~ msgid "unknown error"
-#~ msgstr "eroare necuinoscuta"
+#: popthelp.c:114
+msgid "ARG"
+msgstr ""
 
-#~ msgid "Usage:"
-#~ msgstr "Sintaxa:"
+#: popthelp.c:486
+msgid "Usage:"
+msgstr "Sintaxa:"
 
-#~ msgid "[OPTION...]"
-#~ msgstr "[OPTIUNE...]"
+#: popthelp.c:510
+msgid "[OPTION...]"
+msgstr "[OPTIUNE...]"
diff --git a/po/ru.po b/po/ru.po
index d7b2861..e4eed6c 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.3\n"
-"POT-Creation-Date: 2002-07-31 09:10-0400\n"
+"POT-Creation-Date: 2002-08-10 12:40-0400\n"
 "PO-Revision-Date: 2001-07-05 21:00-0500\n"
 "Last-Translator: Eugene Kanter <eugene@blackcatlinux.com>\n"
 "Language-Team: Black Cat Linux Team <blackcat-support@blackcatlinux.com>\n"
@@ -9,80 +9,103 @@ msgstr ""
 "Content-Type: text/plain; charset=koi8-r\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: popthelp.c:57
-msgid "Show this help message"
-msgstr "�������� ��� ���������"
+#: popt.c:34
+msgid "unknown errno"
+msgstr "����������� ����� ������"
 
-#: popthelp.c:58
-msgid "Display brief usage message"
-msgstr "�������� ������� ���������� �� �������������"
+#: popt.c:940
+#, c-format
+msgid "option type (%d) not implemented in popt\n"
+msgstr "��������� ��������� (%d) � popt �� �������������\n"
 
-#: popthelp.c:61
-msgid "Display option defaults in message"
-msgstr "�������� ��������� �� ���������"
+#: popt.c:1160
+msgid "missing argument"
+msgstr "�������� ��������"
 
-#~ msgid "unknown errno"
-#~ msgstr "����������� ����� ������"
+#: popt.c:1162
+msgid "unknown option"
+msgstr "����������� ��������"
 
-#~ msgid "option type (%d) not implemented in popt\n"
-#~ msgstr "��������� ��������� (%d) � popt �� �������������\n"
+#: popt.c:1164
+msgid "mutually exclusive logical operations requested"
+msgstr "��������� ������� ����������� ���������� ��������"
 
-#~ msgid "missing argument"
-#~ msgstr "�������� ��������"
+#: popt.c:1166
+msgid "opt->arg should not be NULL"
+msgstr "opt->arg �� ����� ���� NULL"
 
-#~ msgid "unknown option"
-#~ msgstr "����������� ��������"
+#: popt.c:1168
+msgid "aliases nested too deeply"
+msgstr "�������� ������� ���������� �������� �����������"
 
-#~ msgid "mutually exclusive logical operations requested"
-#~ msgstr "��������� ������� ����������� ���������� ��������"
+#: popt.c:1170
+msgid "error in parameter quoting"
+msgstr "�����a ��������� ���������� � �������"
 
-#~ msgid "opt->arg should not be NULL"
-#~ msgstr "opt->arg �� ����� ���� NULL"
+#: popt.c:1172
+msgid "invalid numeric value"
+msgstr "������������ �������� ��������"
 
-#~ msgid "aliases nested too deeply"
-#~ msgstr "�������� ������� ���������� �������� �����������"
+#: popt.c:1174
+msgid "number too large or too small"
+msgstr "�������� �������� �� ��������� ����������������"
 
-#~ msgid "error in parameter quoting"
-#~ msgstr "�����a ��������� ���������� � �������"
+#: popt.c:1176
+msgid "memory allocation failed"
+msgstr "������ ��������� ������"
 
-#~ msgid "invalid numeric value"
-#~ msgstr "������������ �������� ��������"
+#: popt.c:1180
+msgid "unknown error"
+msgstr "����������� ������"
 
-#~ msgid "number too large or too small"
-#~ msgstr "�������� �������� �� ��������� ����������������"
+#: popthelp.c:57
+msgid "Show this help message"
+msgstr "�������� ��� ���������"
 
-#~ msgid "memory allocation failed"
-#~ msgstr "������ ��������� ������"
+#: popthelp.c:58
+msgid "Display brief usage message"
+msgstr "�������� ������� ���������� �� �������������"
 
-#~ msgid "unknown error"
-#~ msgstr "����������� ������"
+#: popthelp.c:61
+msgid "Display option defaults in message"
+msgstr "�������� ��������� �� ���������"
 
-#~ msgid "NONE"
-#~ msgstr "NONE"
+#: popthelp.c:103
+msgid "NONE"
+msgstr "NONE"
 
-#~ msgid "VAL"
-#~ msgstr "VAL"
+#: popthelp.c:105
+msgid "VAL"
+msgstr "VAL"
 
-#~ msgid "INT"
-#~ msgstr "INT"
+#: popthelp.c:109
+msgid "INT"
+msgstr "INT"
 
-#~ msgid "LONG"
-#~ msgstr "LONG"
+#: popthelp.c:110
+msgid "LONG"
+msgstr "LONG"
 
-#~ msgid "STRING"
-#~ msgstr "STRING"
+#: popthelp.c:111
+msgid "STRING"
+msgstr "STRING"
 
-#~ msgid "FLOAT"
-#~ msgstr "FLOAT"
+#: popthelp.c:112
+msgid "FLOAT"
+msgstr "FLOAT"
 
-#~ msgid "DOUBLE"
-#~ msgstr "DOUBLE"
+#: popthelp.c:113
+msgid "DOUBLE"
+msgstr "DOUBLE"
 
-#~ msgid "ARG"
-#~ msgstr "ARG"
+#: popthelp.c:114
+msgid "ARG"
+msgstr "ARG"
 
-#~ msgid "Usage:"
-#~ msgstr "�������������:"
+#: popthelp.c:486
+msgid "Usage:"
+msgstr "�������������:"
 
-#~ msgid "[OPTION...]"
-#~ msgstr "[��������...]"
+#: popthelp.c:510
+msgid "[OPTION...]"
+msgstr "[��������...]"
diff --git a/po/sk.po b/po/sk.po
index b09fbae..b7fd26f 100644
--- a/po/sk.po
+++ b/po/sk.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.3\n"
-"POT-Creation-Date: 2002-07-31 09:10-0400\n"
+"POT-Creation-Date: 2002-08-10 12:40-0400\n"
 "PO-Revision-Date: 1999-08-04 21:40+0200\n"
 "Last-Translator: Stanislav Meduna <stano@eunet.sk>\n"
 "Language-Team: Slovak <sk-i18n@rak.isternet.sk>\n"
@@ -13,6 +13,55 @@ msgstr ""
 "Content-Type: text/plain; charset=iso-8859-2\n"
 "Content-Transfer-Encoding: 8bit\n"
 
+#: popt.c:34
+msgid "unknown errno"
+msgstr ""
+
+#: popt.c:940
+#, c-format
+msgid "option type (%d) not implemented in popt\n"
+msgstr ""
+
+#: popt.c:1160
+msgid "missing argument"
+msgstr ""
+
+#: popt.c:1162
+msgid "unknown option"
+msgstr ""
+
+#: popt.c:1164
+msgid "mutually exclusive logical operations requested"
+msgstr ""
+
+#: popt.c:1166
+msgid "opt->arg should not be NULL"
+msgstr ""
+
+#: popt.c:1168
+msgid "aliases nested too deeply"
+msgstr ""
+
+#: popt.c:1170
+msgid "error in parameter quoting"
+msgstr ""
+
+#: popt.c:1172
+msgid "invalid numeric value"
+msgstr ""
+
+#: popt.c:1174
+msgid "number too large or too small"
+msgstr ""
+
+#: popt.c:1176
+msgid "memory allocation failed"
+msgstr ""
+
+#: popt.c:1180
+msgid "unknown error"
+msgstr ""
+
 #: popthelp.c:57
 msgid "Show this help message"
 msgstr "Vyp�sa� t�to spr�vu"
@@ -25,3 +74,43 @@ msgstr "Zobrazi
 #, fuzzy
 msgid "Display option defaults in message"
 msgstr "Zobrazi� stru�n� n�vod na pou�itie"
+
+#: popthelp.c:103
+msgid "NONE"
+msgstr ""
+
+#: popthelp.c:105
+msgid "VAL"
+msgstr ""
+
+#: popthelp.c:109
+msgid "INT"
+msgstr ""
+
+#: popthelp.c:110
+msgid "LONG"
+msgstr ""
+
+#: popthelp.c:111
+msgid "STRING"
+msgstr ""
+
+#: popthelp.c:112
+msgid "FLOAT"
+msgstr ""
+
+#: popthelp.c:113
+msgid "DOUBLE"
+msgstr ""
+
+#: popthelp.c:114
+msgid "ARG"
+msgstr ""
+
+#: popthelp.c:486
+msgid "Usage:"
+msgstr ""
+
+#: popthelp.c:510
+msgid "[OPTION...]"
+msgstr ""
diff --git a/po/sl.po b/po/sl.po
index 910e691..9239758 100644
--- a/po/sl.po
+++ b/po/sl.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.3\n"
-"POT-Creation-Date: 2002-07-31 09:10-0400\n"
+"POT-Creation-Date: 2002-08-10 12:40-0400\n"
 "PO-Revision-Date: 2000-09-05 12:30+0200\n"
 "Last-Translator: Roman Maurer <roman.maurer@hermes.si>\n"
 "Language-Team: Slovenian <sl@li.org>\n"
@@ -9,6 +9,55 @@ msgstr ""
 "Content-Type: text/plain; charset=iso-8859-2\n"
 "Content-Transfer-Encoding: 8bit\n"
 
+#: popt.c:34
+msgid "unknown errno"
+msgstr ""
+
+#: popt.c:940
+#, c-format
+msgid "option type (%d) not implemented in popt\n"
+msgstr ""
+
+#: popt.c:1160
+msgid "missing argument"
+msgstr ""
+
+#: popt.c:1162
+msgid "unknown option"
+msgstr ""
+
+#: popt.c:1164
+msgid "mutually exclusive logical operations requested"
+msgstr ""
+
+#: popt.c:1166
+msgid "opt->arg should not be NULL"
+msgstr ""
+
+#: popt.c:1168
+msgid "aliases nested too deeply"
+msgstr ""
+
+#: popt.c:1170
+msgid "error in parameter quoting"
+msgstr ""
+
+#: popt.c:1172
+msgid "invalid numeric value"
+msgstr ""
+
+#: popt.c:1174
+msgid "number too large or too small"
+msgstr ""
+
+#: popt.c:1176
+msgid "memory allocation failed"
+msgstr ""
+
+#: popt.c:1180
+msgid "unknown error"
+msgstr ""
+
 #: popthelp.c:57
 msgid "Show this help message"
 msgstr "Prika�i to sporo�ilo s pomo�jo"
@@ -21,3 +70,43 @@ msgstr "Prika
 #, fuzzy
 msgid "Display option defaults in message"
 msgstr "Prika�i kratko sporo�ilo o uporabi"
+
+#: popthelp.c:103
+msgid "NONE"
+msgstr ""
+
+#: popthelp.c:105
+msgid "VAL"
+msgstr ""
+
+#: popthelp.c:109
+msgid "INT"
+msgstr ""
+
+#: popthelp.c:110
+msgid "LONG"
+msgstr ""
+
+#: popthelp.c:111
+msgid "STRING"
+msgstr ""
+
+#: popthelp.c:112
+msgid "FLOAT"
+msgstr ""
+
+#: popthelp.c:113
+msgid "DOUBLE"
+msgstr ""
+
+#: popthelp.c:114
+msgid "ARG"
+msgstr ""
+
+#: popthelp.c:486
+msgid "Usage:"
+msgstr ""
+
+#: popthelp.c:510
+msgid "[OPTION...]"
+msgstr ""
diff --git a/po/sr.po b/po/sr.po
index 04e1f30..5b022b9 100644
--- a/po/sr.po
+++ b/po/sr.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.3\n"
-"POT-Creation-Date: 2002-07-31 09:10-0400\n"
+"POT-Creation-Date: 2002-08-10 12:40-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -14,6 +14,55 @@ msgstr ""
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: ENCODING\n"
 
+#: popt.c:34
+msgid "unknown errno"
+msgstr ""
+
+#: popt.c:940
+#, c-format
+msgid "option type (%d) not implemented in popt\n"
+msgstr ""
+
+#: popt.c:1160
+msgid "missing argument"
+msgstr ""
+
+#: popt.c:1162
+msgid "unknown option"
+msgstr ""
+
+#: popt.c:1164
+msgid "mutually exclusive logical operations requested"
+msgstr ""
+
+#: popt.c:1166
+msgid "opt->arg should not be NULL"
+msgstr ""
+
+#: popt.c:1168
+msgid "aliases nested too deeply"
+msgstr ""
+
+#: popt.c:1170
+msgid "error in parameter quoting"
+msgstr ""
+
+#: popt.c:1172
+msgid "invalid numeric value"
+msgstr ""
+
+#: popt.c:1174
+msgid "number too large or too small"
+msgstr ""
+
+#: popt.c:1176
+msgid "memory allocation failed"
+msgstr ""
+
+#: popt.c:1180
+msgid "unknown error"
+msgstr ""
+
 #: popthelp.c:57
 msgid "Show this help message"
 msgstr ""
@@ -25,3 +74,43 @@ msgstr ""
 #: popthelp.c:61
 msgid "Display option defaults in message"
 msgstr ""
+
+#: popthelp.c:103
+msgid "NONE"
+msgstr ""
+
+#: popthelp.c:105
+msgid "VAL"
+msgstr ""
+
+#: popthelp.c:109
+msgid "INT"
+msgstr ""
+
+#: popthelp.c:110
+msgid "LONG"
+msgstr ""
+
+#: popthelp.c:111
+msgid "STRING"
+msgstr ""
+
+#: popthelp.c:112
+msgid "FLOAT"
+msgstr ""
+
+#: popthelp.c:113
+msgid "DOUBLE"
+msgstr ""
+
+#: popthelp.c:114
+msgid "ARG"
+msgstr ""
+
+#: popthelp.c:486
+msgid "Usage:"
+msgstr ""
+
+#: popthelp.c:510
+msgid "[OPTION...]"
+msgstr ""
diff --git a/po/sv.po b/po/sv.po
index 3192080..10403de 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.3\n"
-"POT-Creation-Date: 2002-07-31 09:10-0400\n"
+"POT-Creation-Date: 2002-08-10 12:40-0400\n"
 "PO-Revision-Date: 2001-07-12 22:26+0100\n"
 "Last-Translator: Christian Rose <menthos@menthos.com>\n"
 "Language-Team: Swedish <sv@li.org>\n"
@@ -9,80 +9,103 @@ msgstr ""
 "Content-Type: text/plain; charset=iso-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: popthelp.c:57
-msgid "Show this help message"
-msgstr "Visa denna hj�lptext"
+#: popt.c:34
+msgid "unknown errno"
+msgstr "ok�nt felnummer"
 
-#: popthelp.c:58
-msgid "Display brief usage message"
-msgstr "Visa en kortfattad anv�ndningstext"
+#: popt.c:940
+#, c-format
+msgid "option type (%d) not implemented in popt\n"
+msgstr "flaggtypen (%d) �r inte implementerad i popt\n"
 
-#: popthelp.c:61
-msgid "Display option defaults in message"
-msgstr "Visa standardalternativ f�r flaggor i meddelande"
+#: popt.c:1160
+msgid "missing argument"
+msgstr "argument saknas"
 
-#~ msgid "unknown errno"
-#~ msgstr "ok�nt felnummer"
+#: popt.c:1162
+msgid "unknown option"
+msgstr "ok�nd flagga"
 
-#~ msgid "option type (%d) not implemented in popt\n"
-#~ msgstr "flaggtypen (%d) �r inte implementerad i popt\n"
+#: popt.c:1164
+msgid "mutually exclusive logical operations requested"
+msgstr "�msesidigt uteslutande logiska operationer beg�rdes"
 
-#~ msgid "missing argument"
-#~ msgstr "argument saknas"
+#: popt.c:1166
+msgid "opt->arg should not be NULL"
+msgstr "opt->arg f�r inte vara NULL"
 
-#~ msgid "unknown option"
-#~ msgstr "ok�nd flagga"
+#: popt.c:1168
+msgid "aliases nested too deeply"
+msgstr "alias �r n�stlade f�r djupt"
 
-#~ msgid "mutually exclusive logical operations requested"
-#~ msgstr "�msesidigt uteslutande logiska operationer beg�rdes"
+#: popt.c:1170
+msgid "error in parameter quoting"
+msgstr "fel i parametercitering"
 
-#~ msgid "opt->arg should not be NULL"
-#~ msgstr "opt->arg f�r inte vara NULL"
+#: popt.c:1172
+msgid "invalid numeric value"
+msgstr "ogiltigt numeriskt v�rde"
 
-#~ msgid "aliases nested too deeply"
-#~ msgstr "alias �r n�stlade f�r djupt"
+#: popt.c:1174
+msgid "number too large or too small"
+msgstr "talet f�r stort eller f�r litet"
 
-#~ msgid "error in parameter quoting"
-#~ msgstr "fel i parametercitering"
+#: popt.c:1176
+msgid "memory allocation failed"
+msgstr "minnesallokering misslyckades"
 
-#~ msgid "invalid numeric value"
-#~ msgstr "ogiltigt numeriskt v�rde"
+#: popt.c:1180
+msgid "unknown error"
+msgstr "ok�nt fel"
 
-#~ msgid "number too large or too small"
-#~ msgstr "talet f�r stort eller f�r litet"
+#: popthelp.c:57
+msgid "Show this help message"
+msgstr "Visa denna hj�lptext"
 
-#~ msgid "memory allocation failed"
-#~ msgstr "minnesallokering misslyckades"
+#: popthelp.c:58
+msgid "Display brief usage message"
+msgstr "Visa en kortfattad anv�ndningstext"
 
-#~ msgid "unknown error"
-#~ msgstr "ok�nt fel"
+#: popthelp.c:61
+msgid "Display option defaults in message"
+msgstr "Visa standardalternativ f�r flaggor i meddelande"
 
-#~ msgid "NONE"
-#~ msgstr "INGET"
+#: popthelp.c:103
+msgid "NONE"
+msgstr "INGET"
 
-#~ msgid "VAL"
-#~ msgstr "V�RDE"
+#: popthelp.c:105
+msgid "VAL"
+msgstr "V�RDE"
 
-#~ msgid "INT"
-#~ msgstr "HELTAL"
+#: popthelp.c:109
+msgid "INT"
+msgstr "HELTAL"
 
-#~ msgid "LONG"
-#~ msgstr "L�NG"
+#: popthelp.c:110
+msgid "LONG"
+msgstr "L�NG"
 
-#~ msgid "STRING"
-#~ msgstr "STR�NG"
+#: popthelp.c:111
+msgid "STRING"
+msgstr "STR�NG"
 
-#~ msgid "FLOAT"
-#~ msgstr "FLYTTAL"
+#: popthelp.c:112
+msgid "FLOAT"
+msgstr "FLYTTAL"
 
-#~ msgid "DOUBLE"
-#~ msgstr "DUBBEL"
+#: popthelp.c:113
+msgid "DOUBLE"
+msgstr "DUBBEL"
 
-#~ msgid "ARG"
-#~ msgstr "ARG"
+#: popthelp.c:114
+msgid "ARG"
+msgstr "ARG"
 
-#~ msgid "Usage:"
-#~ msgstr "Anv�ndning:"
+#: popthelp.c:486
+msgid "Usage:"
+msgstr "Anv�ndning:"
 
-#~ msgid "[OPTION...]"
-#~ msgstr "[FLAGGA...]"
+#: popthelp.c:510
+msgid "[OPTION...]"
+msgstr "[FLAGGA...]"
diff --git a/po/tr.po b/po/tr.po
index 7a6fdad..58217e0 100644
--- a/po/tr.po
+++ b/po/tr.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.3\n"
-"POT-Creation-Date: 2002-07-31 09:10-0400\n"
+"POT-Creation-Date: 2002-08-10 12:40-0400\n"
 "PO-Revision-Date: 2000-02-11 13:01+0200\n"
 "Last-Translator: Nilgun Belma Buguner <nilgun@technologist.com>\n"
 "Language-Team: Turkish <tr@li.org>\n"
@@ -9,75 +9,104 @@ msgstr ""
 "Content-Type: text/plain; charset=iso8859-9\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: popthelp.c:57
-msgid "Show this help message"
-msgstr "Bu yard�m iletisini g�sterir"
+#: popt.c:34
+msgid "unknown errno"
+msgstr "bilinmeyen hata no"
 
-#: popthelp.c:58
-msgid "Display brief usage message"
-msgstr "K�sa bir kullan�m iletisi g�ster"
+#: popt.c:940
+#, c-format
+msgid "option type (%d) not implemented in popt\n"
+msgstr "se�enek t�r� (%d) popt i�in ge�ersiz\n"
 
-#: popthelp.c:61
-#, fuzzy
-msgid "Display option defaults in message"
-msgstr "K�sa bir kullan�m iletisi g�ster"
+#: popt.c:1160
+msgid "missing argument"
+msgstr "arg�man eksik"
+
+#: popt.c:1162
+msgid "unknown option"
+msgstr "bilinmeyen se�enek"
+
+#: popt.c:1164
+msgid "mutually exclusive logical operations requested"
+msgstr "birbirini d��layan mant�ksal i�lemler istendi"
 
-#~ msgid "unknown errno"
-#~ msgstr "bilinmeyen hata no"
+#: popt.c:1166
+msgid "opt->arg should not be NULL"
+msgstr ""
 
-#~ msgid "option type (%d) not implemented in popt\n"
-#~ msgstr "se�enek t�r� (%d) popt i�in ge�ersiz\n"
+#: popt.c:1168
+msgid "aliases nested too deeply"
+msgstr "adlarda �ok fazla i�i�elikler"
 
-#~ msgid "missing argument"
-#~ msgstr "arg�man eksik"
+#: popt.c:1170
+msgid "error in parameter quoting"
+msgstr "parametrelerde t�rnak i�aretleme hatal� "
 
-#~ msgid "unknown option"
-#~ msgstr "bilinmeyen se�enek"
+#: popt.c:1172
+msgid "invalid numeric value"
+msgstr "say�sal de�er ge�ersiz"
 
-#~ msgid "mutually exclusive logical operations requested"
-#~ msgstr "birbirini d��layan mant�ksal i�lemler istendi"
+#: popt.c:1174
+msgid "number too large or too small"
+msgstr "say� ya �ok b�y�k ya da �ok k���k"
 
-#~ msgid "aliases nested too deeply"
-#~ msgstr "adlarda �ok fazla i�i�elikler"
+#: popt.c:1176
+msgid "memory allocation failed"
+msgstr ""
 
-#~ msgid "error in parameter quoting"
-#~ msgstr "parametrelerde t�rnak i�aretleme hatal� "
+#: popt.c:1180
+msgid "unknown error"
+msgstr "bilinmeyen hata"
 
-#~ msgid "invalid numeric value"
-#~ msgstr "say�sal de�er ge�ersiz"
+#: popthelp.c:57
+msgid "Show this help message"
+msgstr "Bu yard�m iletisini g�sterir"
 
-#~ msgid "number too large or too small"
-#~ msgstr "say� ya �ok b�y�k ya da �ok k���k"
+#: popthelp.c:58
+msgid "Display brief usage message"
+msgstr "K�sa bir kullan�m iletisi g�ster"
 
-#~ msgid "unknown error"
-#~ msgstr "bilinmeyen hata"
+#: popthelp.c:61
+#, fuzzy
+msgid "Display option defaults in message"
+msgstr "K�sa bir kullan�m iletisi g�ster"
 
-#~ msgid "NONE"
-#~ msgstr "YOK"
+#: popthelp.c:103
+msgid "NONE"
+msgstr "YOK"
 
-#~ msgid "VAL"
-#~ msgstr "DE�"
+#: popthelp.c:105
+msgid "VAL"
+msgstr "DE�"
 
-#~ msgid "INT"
-#~ msgstr "INT"
+#: popthelp.c:109
+msgid "INT"
+msgstr "INT"
 
-#~ msgid "LONG"
-#~ msgstr "LONG"
+#: popthelp.c:110
+msgid "LONG"
+msgstr "LONG"
 
-#~ msgid "STRING"
-#~ msgstr "STRING"
+#: popthelp.c:111
+msgid "STRING"
+msgstr "STRING"
 
-#~ msgid "FLOAT"
-#~ msgstr "FLOAT"
+#: popthelp.c:112
+msgid "FLOAT"
+msgstr "FLOAT"
 
-#~ msgid "DOUBLE"
-#~ msgstr "DOUBLE"
+#: popthelp.c:113
+msgid "DOUBLE"
+msgstr "DOUBLE"
 
-#~ msgid "ARG"
-#~ msgstr "ARG"
+#: popthelp.c:114
+msgid "ARG"
+msgstr "ARG"
 
-#~ msgid "Usage:"
-#~ msgstr "Kullan�m�:"
+#: popthelp.c:486
+msgid "Usage:"
+msgstr "Kullan�m�:"
 
-#~ msgid "[OPTION...]"
-#~ msgstr "[SE�ENEK...]"
+#: popthelp.c:510
+msgid "[OPTION...]"
+msgstr "[SE�ENEK...]"
diff --git a/po/uk.po b/po/uk.po
index 1d44fed..bff1e84 100644
--- a/po/uk.po
+++ b/po/uk.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.3\n"
-"POT-Creation-Date: 2002-07-31 09:10-0400\n"
+"POT-Creation-Date: 2002-08-10 12:40-0400\n"
 "PO-Revision-Date: 1999-09-30 16:54+0200\n"
 "Last-Translator: Yuri Syrota <rasta@renome.rovno.ua>\n"
 "Language-Team: Ukrainian <uk@li.org>\n"
@@ -13,6 +13,55 @@ msgstr ""
 "Content-Type: text/plain; charset=koi8-u\n"
 "Content-Transfer-Encoding: 8bit\n"
 
+#: popt.c:34
+msgid "unknown errno"
+msgstr ""
+
+#: popt.c:940
+#, c-format
+msgid "option type (%d) not implemented in popt\n"
+msgstr ""
+
+#: popt.c:1160
+msgid "missing argument"
+msgstr ""
+
+#: popt.c:1162
+msgid "unknown option"
+msgstr ""
+
+#: popt.c:1164
+msgid "mutually exclusive logical operations requested"
+msgstr ""
+
+#: popt.c:1166
+msgid "opt->arg should not be NULL"
+msgstr ""
+
+#: popt.c:1168
+msgid "aliases nested too deeply"
+msgstr ""
+
+#: popt.c:1170
+msgid "error in parameter quoting"
+msgstr ""
+
+#: popt.c:1172
+msgid "invalid numeric value"
+msgstr ""
+
+#: popt.c:1174
+msgid "number too large or too small"
+msgstr ""
+
+#: popt.c:1176
+msgid "memory allocation failed"
+msgstr ""
+
+#: popt.c:1180
+msgid "unknown error"
+msgstr ""
+
 #: popthelp.c:57
 msgid "Show this help message"
 msgstr "�������� �� ��צ���"
@@ -25,3 +74,43 @@ msgstr "
 #, fuzzy
 msgid "Display option defaults in message"
 msgstr "�������� ������� ��צ��� ��� ������������"
+
+#: popthelp.c:103
+msgid "NONE"
+msgstr ""
+
+#: popthelp.c:105
+msgid "VAL"
+msgstr ""
+
+#: popthelp.c:109
+msgid "INT"
+msgstr ""
+
+#: popthelp.c:110
+msgid "LONG"
+msgstr ""
+
+#: popthelp.c:111
+msgid "STRING"
+msgstr ""
+
+#: popthelp.c:112
+msgid "FLOAT"
+msgstr ""
+
+#: popthelp.c:113
+msgid "DOUBLE"
+msgstr ""
+
+#: popthelp.c:114
+msgid "ARG"
+msgstr ""
+
+#: popthelp.c:486
+msgid "Usage:"
+msgstr ""
+
+#: popthelp.c:510
+msgid "[OPTION...]"
+msgstr ""
diff --git a/po/wa.po b/po/wa.po
index 3967878..c311b70 100644
--- a/po/wa.po
+++ b/po/wa.po
@@ -9,7 +9,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.3\n"
-"POT-Creation-Date: 2002-07-31 09:10-0400\n"
+"POT-Creation-Date: 2002-08-10 12:40-0400\n"
 "PO-Revision-Date: 1999-03-18 23:11+0100\n"
 "Last-Translator: Nobody yet\n"
 "Language-Team: walon <linux-wa@chanae.alphanet.ch>\n"
@@ -17,6 +17,55 @@ msgstr ""
 "Content-Type: text/plain; charset=iso-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
 
+#: popt.c:34
+msgid "unknown errno"
+msgstr ""
+
+#: popt.c:940
+#, c-format
+msgid "option type (%d) not implemented in popt\n"
+msgstr ""
+
+#: popt.c:1160
+msgid "missing argument"
+msgstr ""
+
+#: popt.c:1162
+msgid "unknown option"
+msgstr ""
+
+#: popt.c:1164
+msgid "mutually exclusive logical operations requested"
+msgstr ""
+
+#: popt.c:1166
+msgid "opt->arg should not be NULL"
+msgstr ""
+
+#: popt.c:1168
+msgid "aliases nested too deeply"
+msgstr ""
+
+#: popt.c:1170
+msgid "error in parameter quoting"
+msgstr ""
+
+#: popt.c:1172
+msgid "invalid numeric value"
+msgstr ""
+
+#: popt.c:1174
+msgid "number too large or too small"
+msgstr ""
+
+#: popt.c:1176
+msgid "memory allocation failed"
+msgstr ""
+
+#: popt.c:1180
+msgid "unknown error"
+msgstr ""
+
 #: popthelp.c:57
 msgid "Show this help message"
 msgstr "Mostrer ci messaedje d' aide chal"
@@ -29,3 +78,43 @@ msgstr "Mostre on court messaedje so kmint vos 
 #, fuzzy
 msgid "Display option defaults in message"
 msgstr "Mostre on court messaedje so kmint vos � siervi"
+
+#: popthelp.c:103
+msgid "NONE"
+msgstr ""
+
+#: popthelp.c:105
+msgid "VAL"
+msgstr ""
+
+#: popthelp.c:109
+msgid "INT"
+msgstr ""
+
+#: popthelp.c:110
+msgid "LONG"
+msgstr ""
+
+#: popthelp.c:111
+msgid "STRING"
+msgstr ""
+
+#: popthelp.c:112
+msgid "FLOAT"
+msgstr ""
+
+#: popthelp.c:113
+msgid "DOUBLE"
+msgstr ""
+
+#: popthelp.c:114
+msgid "ARG"
+msgstr ""
+
+#: popthelp.c:486
+msgid "Usage:"
+msgstr ""
+
+#: popthelp.c:510
+msgid "[OPTION...]"
+msgstr ""
diff --git a/po/zh.po b/po/zh.po
index 04e1f30..5b022b9 100644
--- a/po/zh.po
+++ b/po/zh.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.3\n"
-"POT-Creation-Date: 2002-07-31 09:10-0400\n"
+"POT-Creation-Date: 2002-08-10 12:40-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -14,6 +14,55 @@ msgstr ""
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: ENCODING\n"
 
+#: popt.c:34
+msgid "unknown errno"
+msgstr ""
+
+#: popt.c:940
+#, c-format
+msgid "option type (%d) not implemented in popt\n"
+msgstr ""
+
+#: popt.c:1160
+msgid "missing argument"
+msgstr ""
+
+#: popt.c:1162
+msgid "unknown option"
+msgstr ""
+
+#: popt.c:1164
+msgid "mutually exclusive logical operations requested"
+msgstr ""
+
+#: popt.c:1166
+msgid "opt->arg should not be NULL"
+msgstr ""
+
+#: popt.c:1168
+msgid "aliases nested too deeply"
+msgstr ""
+
+#: popt.c:1170
+msgid "error in parameter quoting"
+msgstr ""
+
+#: popt.c:1172
+msgid "invalid numeric value"
+msgstr ""
+
+#: popt.c:1174
+msgid "number too large or too small"
+msgstr ""
+
+#: popt.c:1176
+msgid "memory allocation failed"
+msgstr ""
+
+#: popt.c:1180
+msgid "unknown error"
+msgstr ""
+
 #: popthelp.c:57
 msgid "Show this help message"
 msgstr ""
@@ -25,3 +74,43 @@ msgstr ""
 #: popthelp.c:61
 msgid "Display option defaults in message"
 msgstr ""
+
+#: popthelp.c:103
+msgid "NONE"
+msgstr ""
+
+#: popthelp.c:105
+msgid "VAL"
+msgstr ""
+
+#: popthelp.c:109
+msgid "INT"
+msgstr ""
+
+#: popthelp.c:110
+msgid "LONG"
+msgstr ""
+
+#: popthelp.c:111
+msgid "STRING"
+msgstr ""
+
+#: popthelp.c:112
+msgid "FLOAT"
+msgstr ""
+
+#: popthelp.c:113
+msgid "DOUBLE"
+msgstr ""
+
+#: popthelp.c:114
+msgid "ARG"
+msgstr ""
+
+#: popthelp.c:486
+msgid "Usage:"
+msgstr ""
+
+#: popthelp.c:510
+msgid "[OPTION...]"
+msgstr ""
diff --git a/po/zh_CN.GB2312.po b/po/zh_CN.GB2312.po
index dc75670..ef6220f 100644
--- a/po/zh_CN.GB2312.po
+++ b/po/zh_CN.GB2312.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.3\n"
-"POT-Creation-Date: 2002-07-31 09:10-0400\n"
+"POT-Creation-Date: 2002-08-10 12:40-0400\n"
 "PO-Revision-Date: 1999-11-11 05:04+0800\n"
 "Last-Translator: Dillion Chen <dillon.chen@turbolinux.com.cn>\n"
 "Language-Team: TLDN\n"
@@ -9,6 +9,55 @@ msgstr ""
 "Content-Type: text/plain; charset=gb2312\n"
 "Content-Transfer-Encoding: 8bit\n"
 
+#: popt.c:34
+msgid "unknown errno"
+msgstr ""
+
+#: popt.c:940
+#, c-format
+msgid "option type (%d) not implemented in popt\n"
+msgstr ""
+
+#: popt.c:1160
+msgid "missing argument"
+msgstr ""
+
+#: popt.c:1162
+msgid "unknown option"
+msgstr ""
+
+#: popt.c:1164
+msgid "mutually exclusive logical operations requested"
+msgstr ""
+
+#: popt.c:1166
+msgid "opt->arg should not be NULL"
+msgstr ""
+
+#: popt.c:1168
+msgid "aliases nested too deeply"
+msgstr ""
+
+#: popt.c:1170
+msgid "error in parameter quoting"
+msgstr ""
+
+#: popt.c:1172
+msgid "invalid numeric value"
+msgstr ""
+
+#: popt.c:1174
+msgid "number too large or too small"
+msgstr ""
+
+#: popt.c:1176
+msgid "memory allocation failed"
+msgstr ""
+
+#: popt.c:1180
+msgid "unknown error"
+msgstr ""
+
 #: popthelp.c:57
 msgid "Show this help message"
 msgstr "��ʾ����������Ϣ"
@@ -21,3 +70,43 @@ msgstr "
 #, fuzzy
 msgid "Display option defaults in message"
 msgstr "��ʾ���ʹ����Ϣ"
+
+#: popthelp.c:103
+msgid "NONE"
+msgstr ""
+
+#: popthelp.c:105
+msgid "VAL"
+msgstr ""
+
+#: popthelp.c:109
+msgid "INT"
+msgstr ""
+
+#: popthelp.c:110
+msgid "LONG"
+msgstr ""
+
+#: popthelp.c:111
+msgid "STRING"
+msgstr ""
+
+#: popthelp.c:112
+msgid "FLOAT"
+msgstr ""
+
+#: popthelp.c:113
+msgid "DOUBLE"
+msgstr ""
+
+#: popthelp.c:114
+msgid "ARG"
+msgstr ""
+
+#: popthelp.c:486
+msgid "Usage:"
+msgstr ""
+
+#: popthelp.c:510
+msgid "[OPTION...]"
+msgstr ""
-- 
Gitee


From 3ff9d7ff0c7cbb2fc1cfa1d7b30fa153326ab526 Mon Sep 17 00:00:00 2001
From: Jeff Johnson <n3npq@mac.com>
Date: Thu, 22 Aug 2002 16:34:52 +0000
Subject: [PATCH 365/667] Update popt internal copyright messages.

---
 findme.c     | 2 +-
 popt.c       | 2 +-
 poptconfig.c | 2 +-
 popthelp.c   | 6 +++---
 poptparse.c  | 2 +-
 test1.c      | 2 +-
 6 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/findme.c b/findme.c
index e98e061..a950e50 100644
--- a/findme.c
+++ b/findme.c
@@ -2,7 +2,7 @@
  * \file popt/findme.c
  */
 
-/* (C) 1998-2000 Red Hat, Inc. -- Licensing details are in the COPYING
+/* (C) 1998-2002 Red Hat, Inc. -- Licensing details are in the COPYING
    file accompanying popt source distributions, available from 
    ftp://ftp.rpm.org/pub/rpm/dist. */
 
diff --git a/popt.c b/popt.c
index 812861e..eb81c72 100644
--- a/popt.c
+++ b/popt.c
@@ -2,7 +2,7 @@
  * \file popt/popt.c
  */
 
-/* (C) 19982000 Red Hat, Inc. -- Licensing details are in the COPYING
+/* (C) 1998-2002 Red Hat, Inc. -- Licensing details are in the COPYING
    file accompanying popt source distributions, available from
    ftp://ftp.rpm.org/pub/rpm/dist */
 
diff --git a/poptconfig.c b/poptconfig.c
index f622bb7..a600a92 100644
--- a/poptconfig.c
+++ b/poptconfig.c
@@ -2,7 +2,7 @@
  * \file popt/poptconfig.c
  */
 
-/* (C) 1998-2000 Red Hat, Inc. -- Licensing details are in the COPYING
+/* (C) 1998-2002 Red Hat, Inc. -- Licensing details are in the COPYING
    file accompanying popt source distributions, available from 
    ftp://ftp.rpm.org/pub/rpm/dist. */
 
diff --git a/popthelp.c b/popthelp.c
index 6b07e34..485fecd 100644
--- a/popthelp.c
+++ b/popthelp.c
@@ -5,7 +5,7 @@
  * \file popt/popthelp.c
  */
 
-/* (C) 1998-2000 Red Hat, Inc. -- Licensing details are in the COPYING
+/* (C) 1998-2002 Red Hat, Inc. -- Licensing details are in the COPYING
    file accompanying popt source distributions, available from 
    ftp://ftp.rpm.org/pub/rpm/dist. */
 
@@ -87,7 +87,7 @@ getTableTranslationDomain(/*@null@*/ const struct poptOption *table)
  */
 /*@observer@*/ /*@null@*/ static const char *const
 getArgDescrip(const struct poptOption * opt,
-		/*@-paramuse@*/		/* FIX: wazzup? */
+		/*@-paramuse@*/ /* FIX: i18n macros disabled with lclint */
 		/*@null@*/ const char * translation_domain)
 		/*@=paramuse@*/
 	/*@*/
@@ -125,7 +125,7 @@ getArgDescrip(const struct poptOption * opt,
 static /*@only@*/ /*@null@*/ char *
 singleOptionDefaultValue(int lineLength,
 		const struct poptOption * opt,
-		/*@-paramuse@*/	/* FIX: i18n macros disable with lclint */
+		/*@-paramuse@*/ /* FIX: i18n macros disabled with lclint */
 		/*@null@*/ const char * translation_domain)
 		/*@=paramuse@*/
 	/*@*/
diff --git a/poptparse.c b/poptparse.c
index 0a75f8b..a0dea80 100644
--- a/poptparse.c
+++ b/poptparse.c
@@ -2,7 +2,7 @@
  * \file popt/poptparse.c
  */
 
-/* (C) 1998-2000 Red Hat, Inc. -- Licensing details are in the COPYING
+/* (C) 1998-2002 Red Hat, Inc. -- Licensing details are in the COPYING
    file accompanying popt source distributions, available from 
    ftp://ftp.rpm.org/pub/rpm/dist. */
 
diff --git a/test1.c b/test1.c
index a41ee09..eeeb916 100644
--- a/test1.c
+++ b/test1.c
@@ -1,4 +1,4 @@
-/* (C) 1998-2000 Red Hat, Inc. -- Licensing details are in the COPYING
+/* (C) 1998-2002 Red Hat, Inc. -- Licensing details are in the COPYING
    file accompanying popt source distributions, available from
    ftp://ftp.rpm.org/pub/rpm/dist. */
 
-- 
Gitee


From c952917e56373e3ceca4177305f32fea6cf57a16 Mon Sep 17 00:00:00 2001
From: Jeff Johnson <n3npq@mac.com>
Date: Mon, 26 Aug 2002 17:52:12 +0000
Subject: [PATCH 366/667] Update ru.po.

---
 po/cs.po           | 2 +-
 po/da.po           | 2 +-
 po/de.po           | 2 +-
 po/es.po           | 2 +-
 po/eu_ES.po        | 2 +-
 po/fi.po           | 2 +-
 po/fr.po           | 2 +-
 po/gl.po           | 2 +-
 po/hu.po           | 2 +-
 po/id.po           | 2 +-
 po/is.po           | 2 +-
 po/it.po           | 2 +-
 po/ja.po           | 2 +-
 po/ko.po           | 2 +-
 po/no.po           | 2 +-
 po/pl.po           | 2 +-
 po/popt.pot        | 2 +-
 po/pt.po           | 2 +-
 po/pt_BR.po        | 2 +-
 po/ro.po           | 2 +-
 po/ru.po           | 2 +-
 po/sk.po           | 2 +-
 po/sl.po           | 2 +-
 po/sr.po           | 2 +-
 po/sv.po           | 2 +-
 po/tr.po           | 2 +-
 po/uk.po           | 2 +-
 po/wa.po           | 2 +-
 po/zh.po           | 2 +-
 po/zh_CN.GB2312.po | 2 +-
 30 files changed, 30 insertions(+), 30 deletions(-)

diff --git a/po/cs.po b/po/cs.po
index 237d8d8..c0aa01f 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.3\n"
-"POT-Creation-Date: 2002-08-10 12:40-0400\n"
+"POT-Creation-Date: 2002-08-26 12:38-0400\n"
 "PO-Revision-Date: 2001-07-24 00:03+0100\n"
 "Last-Translator: Milan Kerslager <kerslage@linux.cz>\n"
 "Language-Team: Czech <cs@li.org>\n"
diff --git a/po/da.po b/po/da.po
index 49f7450..a171780 100644
--- a/po/da.po
+++ b/po/da.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.3\n"
-"POT-Creation-Date: 2002-08-10 12:40-0400\n"
+"POT-Creation-Date: 2002-08-26 12:38-0400\n"
 "PO-Revision-Date: Sun Jan 21 2001 04:30:32+0200\n"
 "Last-Translator: Martin Hansen <mah@k64.dk>\n"
 "Language-Team: Dansk <dansk@klid.dk>\n"
diff --git a/po/de.po b/po/de.po
index 5b022b9..9457c74 100644
--- a/po/de.po
+++ b/po/de.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.3\n"
-"POT-Creation-Date: 2002-08-10 12:40-0400\n"
+"POT-Creation-Date: 2002-08-26 12:38-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/po/es.po b/po/es.po
index 958cca7..a44e1e5 100644
--- a/po/es.po
+++ b/po/es.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.3\n"
-"POT-Creation-Date: 2002-08-10 12:40-0400\n"
+"POT-Creation-Date: 2002-08-26 12:38-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Leandro Lucarella <luca@linuxmendoza.org.ar>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/po/eu_ES.po b/po/eu_ES.po
index 5b022b9..9457c74 100644
--- a/po/eu_ES.po
+++ b/po/eu_ES.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.3\n"
-"POT-Creation-Date: 2002-08-10 12:40-0400\n"
+"POT-Creation-Date: 2002-08-26 12:38-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/po/fi.po b/po/fi.po
index 5b022b9..9457c74 100644
--- a/po/fi.po
+++ b/po/fi.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.3\n"
-"POT-Creation-Date: 2002-08-10 12:40-0400\n"
+"POT-Creation-Date: 2002-08-26 12:38-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/po/fr.po b/po/fr.po
index 5b022b9..9457c74 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.3\n"
-"POT-Creation-Date: 2002-08-10 12:40-0400\n"
+"POT-Creation-Date: 2002-08-26 12:38-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/po/gl.po b/po/gl.po
index f1ad4f3..130ecde 100644
--- a/po/gl.po
+++ b/po/gl.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.3\n"
-"POT-Creation-Date: 2002-08-10 12:40-0400\n"
+"POT-Creation-Date: 2002-08-26 12:38-0400\n"
 "PO-Revision-Date: 2001-01-17 01:01+0100\n"
 "Last-Translator: Jes�s Bravo �lvarez <jba@pobox.com>\n"
 "Language-Team: Galician <trasno@ceu.fi.udc.es>\n"
diff --git a/po/hu.po b/po/hu.po
index 686b904..3046b53 100644
--- a/po/hu.po
+++ b/po/hu.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.3\n"
-"POT-Creation-Date: 2002-08-10 12:40-0400\n"
+"POT-Creation-Date: 2002-08-26 12:38-0400\n"
 "PO-Revision-Date: 2000-08-03 23:26+0200\n"
 "Last-Translator: L�szl� N�meth <nemeth@qwertynet.hu>\n"
 "Language-Team: Hungarian\n"
diff --git a/po/id.po b/po/id.po
index 5b022b9..9457c74 100644
--- a/po/id.po
+++ b/po/id.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.3\n"
-"POT-Creation-Date: 2002-08-10 12:40-0400\n"
+"POT-Creation-Date: 2002-08-26 12:38-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/po/is.po b/po/is.po
index 43a74ca..1610ddd 100644
--- a/po/is.po
+++ b/po/is.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.3\n"
-"POT-Creation-Date: 2002-08-10 12:40-0400\n"
+"POT-Creation-Date: 2002-08-26 12:38-0400\n"
 "PO-Revision-Date: 2001-06-08 01:35+0000\n"
 "Last-Translator: Richard Allen <ra@hp.is>\n"
 "Language-Team: is <kde-isl@mmedia.is>\n"
diff --git a/po/it.po b/po/it.po
index 5b022b9..9457c74 100644
--- a/po/it.po
+++ b/po/it.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.3\n"
-"POT-Creation-Date: 2002-08-10 12:40-0400\n"
+"POT-Creation-Date: 2002-08-26 12:38-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/po/ja.po b/po/ja.po
index 5b022b9..9457c74 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.3\n"
-"POT-Creation-Date: 2002-08-10 12:40-0400\n"
+"POT-Creation-Date: 2002-08-26 12:38-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/po/ko.po b/po/ko.po
index eb808f8..f1b1e58 100644
--- a/po/ko.po
+++ b/po/ko.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6\n"
-"POT-Creation-Date: 2002-08-10 12:40-0400\n"
+"POT-Creation-Date: 2002-08-26 12:38-0400\n"
 "PO-Revision-Date: 2001-09-06 20:06+0900\n"
 "Last-Translator: Jong-Hoon Ryu <redhat4u@netian.com>\n"
 "Language-Team: GNU Translation project <ko@li.org>\n"
diff --git a/po/no.po b/po/no.po
index 6683c80..2045a2c 100644
--- a/po/no.po
+++ b/po/no.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.3\n"
-"POT-Creation-Date: 2002-08-10 12:40-0400\n"
+"POT-Creation-Date: 2002-08-26 12:38-0400\n"
 "PO-Revision-Date: 2001-06-27 11:05+0200\n"
 "Last-Translator: Kjartan Maraas <kmaraas@online.no>\n"
 "Language-Team: Norwegian <no@li.org>\n"
diff --git a/po/pl.po b/po/pl.po
index 5b022b9..9457c74 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.3\n"
-"POT-Creation-Date: 2002-08-10 12:40-0400\n"
+"POT-Creation-Date: 2002-08-26 12:38-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/po/popt.pot b/po/popt.pot
index 523d030..7a9bb30 100644
--- a/po/popt.pot
+++ b/po/popt.pot
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2002-08-10 12:40-0400\n"
+"POT-Creation-Date: 2002-08-26 12:38-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/po/pt.po b/po/pt.po
index db759fb..82e1799 100644
--- a/po/pt.po
+++ b/po/pt.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt\n"
-"POT-Creation-Date: 2002-08-10 12:40-0400\n"
+"POT-Creation-Date: 2002-08-26 12:38-0400\n"
 "PO-Revision-Date: 2002-02-13 18:32+0000\n"
 "Last-Translator: Pedro Morais <morais@kde.org>\n"
 "Language-Team: pt <morais@kde.org>\n"
diff --git a/po/pt_BR.po b/po/pt_BR.po
index 5b022b9..9457c74 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.3\n"
-"POT-Creation-Date: 2002-08-10 12:40-0400\n"
+"POT-Creation-Date: 2002-08-26 12:38-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/po/ro.po b/po/ro.po
index 2f28f68..e38c89d 100644
--- a/po/ro.po
+++ b/po/ro.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.3\n"
-"POT-Creation-Date: 2002-08-10 12:40-0400\n"
+"POT-Creation-Date: 2002-08-26 12:38-0400\n"
 "PO-Revision-Date: 2000-06-14 23:23+EST\n"
 "Last-Translator: Cristian Gafton <gafton@redhat.com>\n"
 "Language-Team: Romanian <ro@li.org>\n"
diff --git a/po/ru.po b/po/ru.po
index e4eed6c..4aecbe5 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.3\n"
-"POT-Creation-Date: 2002-08-10 12:40-0400\n"
+"POT-Creation-Date: 2002-08-26 12:38-0400\n"
 "PO-Revision-Date: 2001-07-05 21:00-0500\n"
 "Last-Translator: Eugene Kanter <eugene@blackcatlinux.com>\n"
 "Language-Team: Black Cat Linux Team <blackcat-support@blackcatlinux.com>\n"
diff --git a/po/sk.po b/po/sk.po
index b7fd26f..4d5774b 100644
--- a/po/sk.po
+++ b/po/sk.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.3\n"
-"POT-Creation-Date: 2002-08-10 12:40-0400\n"
+"POT-Creation-Date: 2002-08-26 12:38-0400\n"
 "PO-Revision-Date: 1999-08-04 21:40+0200\n"
 "Last-Translator: Stanislav Meduna <stano@eunet.sk>\n"
 "Language-Team: Slovak <sk-i18n@rak.isternet.sk>\n"
diff --git a/po/sl.po b/po/sl.po
index 9239758..e96f48a 100644
--- a/po/sl.po
+++ b/po/sl.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.3\n"
-"POT-Creation-Date: 2002-08-10 12:40-0400\n"
+"POT-Creation-Date: 2002-08-26 12:38-0400\n"
 "PO-Revision-Date: 2000-09-05 12:30+0200\n"
 "Last-Translator: Roman Maurer <roman.maurer@hermes.si>\n"
 "Language-Team: Slovenian <sl@li.org>\n"
diff --git a/po/sr.po b/po/sr.po
index 5b022b9..9457c74 100644
--- a/po/sr.po
+++ b/po/sr.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.3\n"
-"POT-Creation-Date: 2002-08-10 12:40-0400\n"
+"POT-Creation-Date: 2002-08-26 12:38-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/po/sv.po b/po/sv.po
index 10403de..5d10b36 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.3\n"
-"POT-Creation-Date: 2002-08-10 12:40-0400\n"
+"POT-Creation-Date: 2002-08-26 12:38-0400\n"
 "PO-Revision-Date: 2001-07-12 22:26+0100\n"
 "Last-Translator: Christian Rose <menthos@menthos.com>\n"
 "Language-Team: Swedish <sv@li.org>\n"
diff --git a/po/tr.po b/po/tr.po
index 58217e0..9d1ccf6 100644
--- a/po/tr.po
+++ b/po/tr.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.3\n"
-"POT-Creation-Date: 2002-08-10 12:40-0400\n"
+"POT-Creation-Date: 2002-08-26 12:38-0400\n"
 "PO-Revision-Date: 2000-02-11 13:01+0200\n"
 "Last-Translator: Nilgun Belma Buguner <nilgun@technologist.com>\n"
 "Language-Team: Turkish <tr@li.org>\n"
diff --git a/po/uk.po b/po/uk.po
index bff1e84..d21a16e 100644
--- a/po/uk.po
+++ b/po/uk.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.3\n"
-"POT-Creation-Date: 2002-08-10 12:40-0400\n"
+"POT-Creation-Date: 2002-08-26 12:38-0400\n"
 "PO-Revision-Date: 1999-09-30 16:54+0200\n"
 "Last-Translator: Yuri Syrota <rasta@renome.rovno.ua>\n"
 "Language-Team: Ukrainian <uk@li.org>\n"
diff --git a/po/wa.po b/po/wa.po
index c311b70..f0df8b4 100644
--- a/po/wa.po
+++ b/po/wa.po
@@ -9,7 +9,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.3\n"
-"POT-Creation-Date: 2002-08-10 12:40-0400\n"
+"POT-Creation-Date: 2002-08-26 12:38-0400\n"
 "PO-Revision-Date: 1999-03-18 23:11+0100\n"
 "Last-Translator: Nobody yet\n"
 "Language-Team: walon <linux-wa@chanae.alphanet.ch>\n"
diff --git a/po/zh.po b/po/zh.po
index 5b022b9..9457c74 100644
--- a/po/zh.po
+++ b/po/zh.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.3\n"
-"POT-Creation-Date: 2002-08-10 12:40-0400\n"
+"POT-Creation-Date: 2002-08-26 12:38-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/po/zh_CN.GB2312.po b/po/zh_CN.GB2312.po
index ef6220f..0d58551 100644
--- a/po/zh_CN.GB2312.po
+++ b/po/zh_CN.GB2312.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.3\n"
-"POT-Creation-Date: 2002-08-10 12:40-0400\n"
+"POT-Creation-Date: 2002-08-26 12:38-0400\n"
 "PO-Revision-Date: 1999-11-11 05:04+0800\n"
 "Last-Translator: Dillion Chen <dillon.chen@turbolinux.com.cn>\n"
 "Language-Team: TLDN\n"
-- 
Gitee


From 1ec8d03253e0487aeb04e4707f5c944acd7876fb Mon Sep 17 00:00:00 2001
From: Jeff Johnson <n3npq@mac.com>
Date: Mon, 26 Aug 2002 18:56:12 +0000
Subject: [PATCH 367/667] - set cachesize without a dbenv, the default is far
 too small. - db: don't return EACCES on db->close w/o environment. - unify
 cachesize configuration, with (or without) a dbenv. - comments regarding
 unsupported (yet) db-4.1.17 functionality.

---
 configure.in => configure.ac | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
 rename configure.in => configure.ac (98%)

diff --git a/configure.in b/configure.ac
similarity index 98%
rename from configure.in
rename to configure.ac
index ce0c80d..7b20ce6 100755
--- a/configure.in
+++ b/configure.ac
@@ -2,7 +2,7 @@ AC_INIT(popt.h)
 AC_CANONICAL_SYSTEM
 AC_PREREQ(2.12)
 AC_CONFIG_HEADERS
-AM_INIT_AUTOMAKE(popt, 1.7)
+AM_INIT_AUTOMAKE(popt, 1.8)
 AM_CONFIG_HEADER(config.h)
 
 ALL_LINGUAS="cs da de es eu_ES fi fr gl hu id is it ja ko no pl pt pt_BR ro ru sk sl sr sv tr uk wa zh zh_CN.GB2312"
-- 
Gitee


From 831702a4f3129d9f560ced074d7d7522305a6430 Mon Sep 17 00:00:00 2001
From: Jeff Johnson <n3npq@mac.com>
Date: Sat, 31 Aug 2002 22:39:37 +0000
Subject: [PATCH 368/667] Sync with rpm-4.1.

---
 poptint.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/poptint.h b/poptint.h
index e612e92..5d308ef 100644
--- a/poptint.h
+++ b/poptint.h
@@ -103,7 +103,7 @@ struct poptContext_s {
 #define _(foo) foo
 #endif
 
-#if defined(HAVE_DGETTEXT) && !defined(__LCLINT__)
+#if defined(HAVE_DCGETTEXT) && !defined(__LCLINT__)
 #define D_(dom, str) dgettext(dom, str)
 #define POPT_(foo) D_("popt", foo)
 #else
-- 
Gitee


From 2113561447b3ead16c611367fe591cde61349b1b Mon Sep 17 00:00:00 2001
From: Jeff Johnson <n3npq@mac.com>
Date: Mon, 16 Sep 2002 13:17:30 +0000
Subject: [PATCH 369/667] The char array 'format' sometimes get 10 characters
 and when strcpy is done on it, strcpy tries to add a '/0' to it beyond the
 capacity. Not sure why, but, the const char *ch gets bad address. Anyway,
 format should be atleast 11 chars to accommodate strings like "%.34s\n%42s"
 and a terminating '\0'.

---
 popthelp.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/popthelp.c b/popthelp.c
index 485fecd..4d8f0ef 100644
--- a/popthelp.c
+++ b/popthelp.c
@@ -332,7 +332,7 @@ static void singleOptionHelp(FILE * fp, int maxLeftCol,
 /*@-boundsread@*/
     while (helpLength > lineLength) {
 	const char * ch;
-	char format[10];
+	char format[16];
 
 	ch = help + lineLength - 1;
 	while (ch > help && !isspace(*ch)) ch--;
-- 
Gitee


From 8d4dc33e75a6f7665b80ed16353ec6cd75a45135 Mon Sep 17 00:00:00 2001
From: Jeff Johnson <n3npq@mac.com>
Date: Wed, 9 Oct 2002 19:07:44 +0000
Subject: [PATCH 370/667] - fix: use size_t consistently, avoid segfault on
 ia64.

---
 Makefile.am | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Makefile.am b/Makefile.am
index 6bf6c13..b947f12 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -3,7 +3,7 @@
 AUTOMAKE_OPTIONS = 1.4 foreign
 
 EXTRA_DIST = autogen.sh CHANGES $(man_MANS) popt.spec \
-	testit.sh test-poptrc \
+	testit.sh test-poptrc test3-data/0* \
 	po/*.in po/*.po po/popt.pot \
 	popt.ps
 
-- 
Gitee


From ebb1b7eaba7c33bdc04e436aa26ec579aed52648 Mon Sep 17 00:00:00 2001
From: Jeff Johnson <n3npq@mac.com>
Date: Wed, 16 Oct 2002 17:58:06 +0000
Subject: [PATCH 371/667] - dump libelf, gulp elfutils, for now. - python:
 permit headers to be hashed. - use %%{_lib} for libraries. - include
 file-3.39 (with homebrewed) libfmagic, for now.

---
 po/cs.po           | 2 +-
 po/da.po           | 2 +-
 po/de.po           | 2 +-
 po/es.po           | 2 +-
 po/eu_ES.po        | 2 +-
 po/fi.po           | 2 +-
 po/fr.po           | 2 +-
 po/gl.po           | 2 +-
 po/hu.po           | 2 +-
 po/id.po           | 2 +-
 po/is.po           | 2 +-
 po/it.po           | 2 +-
 po/ja.po           | 2 +-
 po/ko.po           | 2 +-
 po/no.po           | 2 +-
 po/pl.po           | 2 +-
 po/popt.pot        | 2 +-
 po/pt.po           | 2 +-
 po/pt_BR.po        | 2 +-
 po/ro.po           | 2 +-
 po/ru.po           | 2 +-
 po/sk.po           | 2 +-
 po/sl.po           | 2 +-
 po/sr.po           | 2 +-
 po/sv.po           | 2 +-
 po/tr.po           | 2 +-
 po/uk.po           | 2 +-
 po/wa.po           | 2 +-
 po/zh.po           | 2 +-
 po/zh_CN.GB2312.po | 2 +-
 30 files changed, 30 insertions(+), 30 deletions(-)

diff --git a/po/cs.po b/po/cs.po
index c0aa01f..5c0a727 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.3\n"
-"POT-Creation-Date: 2002-08-26 12:38-0400\n"
+"POT-Creation-Date: 2002-10-15 15:04-0400\n"
 "PO-Revision-Date: 2001-07-24 00:03+0100\n"
 "Last-Translator: Milan Kerslager <kerslage@linux.cz>\n"
 "Language-Team: Czech <cs@li.org>\n"
diff --git a/po/da.po b/po/da.po
index a171780..86c9ec5 100644
--- a/po/da.po
+++ b/po/da.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.3\n"
-"POT-Creation-Date: 2002-08-26 12:38-0400\n"
+"POT-Creation-Date: 2002-10-15 15:04-0400\n"
 "PO-Revision-Date: Sun Jan 21 2001 04:30:32+0200\n"
 "Last-Translator: Martin Hansen <mah@k64.dk>\n"
 "Language-Team: Dansk <dansk@klid.dk>\n"
diff --git a/po/de.po b/po/de.po
index 9457c74..1f8a6ea 100644
--- a/po/de.po
+++ b/po/de.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.3\n"
-"POT-Creation-Date: 2002-08-26 12:38-0400\n"
+"POT-Creation-Date: 2002-10-15 15:04-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/po/es.po b/po/es.po
index a44e1e5..64de6c5 100644
--- a/po/es.po
+++ b/po/es.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.3\n"
-"POT-Creation-Date: 2002-08-26 12:38-0400\n"
+"POT-Creation-Date: 2002-10-15 15:04-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Leandro Lucarella <luca@linuxmendoza.org.ar>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/po/eu_ES.po b/po/eu_ES.po
index 9457c74..1f8a6ea 100644
--- a/po/eu_ES.po
+++ b/po/eu_ES.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.3\n"
-"POT-Creation-Date: 2002-08-26 12:38-0400\n"
+"POT-Creation-Date: 2002-10-15 15:04-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/po/fi.po b/po/fi.po
index 9457c74..1f8a6ea 100644
--- a/po/fi.po
+++ b/po/fi.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.3\n"
-"POT-Creation-Date: 2002-08-26 12:38-0400\n"
+"POT-Creation-Date: 2002-10-15 15:04-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/po/fr.po b/po/fr.po
index 9457c74..1f8a6ea 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.3\n"
-"POT-Creation-Date: 2002-08-26 12:38-0400\n"
+"POT-Creation-Date: 2002-10-15 15:04-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/po/gl.po b/po/gl.po
index 130ecde..ec11825 100644
--- a/po/gl.po
+++ b/po/gl.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.3\n"
-"POT-Creation-Date: 2002-08-26 12:38-0400\n"
+"POT-Creation-Date: 2002-10-15 15:04-0400\n"
 "PO-Revision-Date: 2001-01-17 01:01+0100\n"
 "Last-Translator: Jes�s Bravo �lvarez <jba@pobox.com>\n"
 "Language-Team: Galician <trasno@ceu.fi.udc.es>\n"
diff --git a/po/hu.po b/po/hu.po
index 3046b53..cdef01d 100644
--- a/po/hu.po
+++ b/po/hu.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.3\n"
-"POT-Creation-Date: 2002-08-26 12:38-0400\n"
+"POT-Creation-Date: 2002-10-15 15:04-0400\n"
 "PO-Revision-Date: 2000-08-03 23:26+0200\n"
 "Last-Translator: L�szl� N�meth <nemeth@qwertynet.hu>\n"
 "Language-Team: Hungarian\n"
diff --git a/po/id.po b/po/id.po
index 9457c74..1f8a6ea 100644
--- a/po/id.po
+++ b/po/id.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.3\n"
-"POT-Creation-Date: 2002-08-26 12:38-0400\n"
+"POT-Creation-Date: 2002-10-15 15:04-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/po/is.po b/po/is.po
index 1610ddd..2db56bd 100644
--- a/po/is.po
+++ b/po/is.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.3\n"
-"POT-Creation-Date: 2002-08-26 12:38-0400\n"
+"POT-Creation-Date: 2002-10-15 15:04-0400\n"
 "PO-Revision-Date: 2001-06-08 01:35+0000\n"
 "Last-Translator: Richard Allen <ra@hp.is>\n"
 "Language-Team: is <kde-isl@mmedia.is>\n"
diff --git a/po/it.po b/po/it.po
index 9457c74..1f8a6ea 100644
--- a/po/it.po
+++ b/po/it.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.3\n"
-"POT-Creation-Date: 2002-08-26 12:38-0400\n"
+"POT-Creation-Date: 2002-10-15 15:04-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/po/ja.po b/po/ja.po
index 9457c74..1f8a6ea 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.3\n"
-"POT-Creation-Date: 2002-08-26 12:38-0400\n"
+"POT-Creation-Date: 2002-10-15 15:04-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/po/ko.po b/po/ko.po
index f1b1e58..bab37d2 100644
--- a/po/ko.po
+++ b/po/ko.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6\n"
-"POT-Creation-Date: 2002-08-26 12:38-0400\n"
+"POT-Creation-Date: 2002-10-15 15:04-0400\n"
 "PO-Revision-Date: 2001-09-06 20:06+0900\n"
 "Last-Translator: Jong-Hoon Ryu <redhat4u@netian.com>\n"
 "Language-Team: GNU Translation project <ko@li.org>\n"
diff --git a/po/no.po b/po/no.po
index 2045a2c..1ad2a84 100644
--- a/po/no.po
+++ b/po/no.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.3\n"
-"POT-Creation-Date: 2002-08-26 12:38-0400\n"
+"POT-Creation-Date: 2002-10-15 15:04-0400\n"
 "PO-Revision-Date: 2001-06-27 11:05+0200\n"
 "Last-Translator: Kjartan Maraas <kmaraas@online.no>\n"
 "Language-Team: Norwegian <no@li.org>\n"
diff --git a/po/pl.po b/po/pl.po
index 9457c74..1f8a6ea 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.3\n"
-"POT-Creation-Date: 2002-08-26 12:38-0400\n"
+"POT-Creation-Date: 2002-10-15 15:04-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/po/popt.pot b/po/popt.pot
index 7a9bb30..90647e9 100644
--- a/po/popt.pot
+++ b/po/popt.pot
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2002-08-26 12:38-0400\n"
+"POT-Creation-Date: 2002-10-15 15:04-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/po/pt.po b/po/pt.po
index 82e1799..c92072c 100644
--- a/po/pt.po
+++ b/po/pt.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt\n"
-"POT-Creation-Date: 2002-08-26 12:38-0400\n"
+"POT-Creation-Date: 2002-10-15 15:04-0400\n"
 "PO-Revision-Date: 2002-02-13 18:32+0000\n"
 "Last-Translator: Pedro Morais <morais@kde.org>\n"
 "Language-Team: pt <morais@kde.org>\n"
diff --git a/po/pt_BR.po b/po/pt_BR.po
index 9457c74..1f8a6ea 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.3\n"
-"POT-Creation-Date: 2002-08-26 12:38-0400\n"
+"POT-Creation-Date: 2002-10-15 15:04-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/po/ro.po b/po/ro.po
index e38c89d..73fb29c 100644
--- a/po/ro.po
+++ b/po/ro.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.3\n"
-"POT-Creation-Date: 2002-08-26 12:38-0400\n"
+"POT-Creation-Date: 2002-10-15 15:04-0400\n"
 "PO-Revision-Date: 2000-06-14 23:23+EST\n"
 "Last-Translator: Cristian Gafton <gafton@redhat.com>\n"
 "Language-Team: Romanian <ro@li.org>\n"
diff --git a/po/ru.po b/po/ru.po
index 4aecbe5..38b09d4 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.3\n"
-"POT-Creation-Date: 2002-08-26 12:38-0400\n"
+"POT-Creation-Date: 2002-10-15 15:04-0400\n"
 "PO-Revision-Date: 2001-07-05 21:00-0500\n"
 "Last-Translator: Eugene Kanter <eugene@blackcatlinux.com>\n"
 "Language-Team: Black Cat Linux Team <blackcat-support@blackcatlinux.com>\n"
diff --git a/po/sk.po b/po/sk.po
index 4d5774b..b22f438 100644
--- a/po/sk.po
+++ b/po/sk.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.3\n"
-"POT-Creation-Date: 2002-08-26 12:38-0400\n"
+"POT-Creation-Date: 2002-10-15 15:04-0400\n"
 "PO-Revision-Date: 1999-08-04 21:40+0200\n"
 "Last-Translator: Stanislav Meduna <stano@eunet.sk>\n"
 "Language-Team: Slovak <sk-i18n@rak.isternet.sk>\n"
diff --git a/po/sl.po b/po/sl.po
index e96f48a..f01f4b7 100644
--- a/po/sl.po
+++ b/po/sl.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.3\n"
-"POT-Creation-Date: 2002-08-26 12:38-0400\n"
+"POT-Creation-Date: 2002-10-15 15:04-0400\n"
 "PO-Revision-Date: 2000-09-05 12:30+0200\n"
 "Last-Translator: Roman Maurer <roman.maurer@hermes.si>\n"
 "Language-Team: Slovenian <sl@li.org>\n"
diff --git a/po/sr.po b/po/sr.po
index 9457c74..1f8a6ea 100644
--- a/po/sr.po
+++ b/po/sr.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.3\n"
-"POT-Creation-Date: 2002-08-26 12:38-0400\n"
+"POT-Creation-Date: 2002-10-15 15:04-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/po/sv.po b/po/sv.po
index 5d10b36..357d73a 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.3\n"
-"POT-Creation-Date: 2002-08-26 12:38-0400\n"
+"POT-Creation-Date: 2002-10-15 15:04-0400\n"
 "PO-Revision-Date: 2001-07-12 22:26+0100\n"
 "Last-Translator: Christian Rose <menthos@menthos.com>\n"
 "Language-Team: Swedish <sv@li.org>\n"
diff --git a/po/tr.po b/po/tr.po
index 9d1ccf6..3412ed7 100644
--- a/po/tr.po
+++ b/po/tr.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.3\n"
-"POT-Creation-Date: 2002-08-26 12:38-0400\n"
+"POT-Creation-Date: 2002-10-15 15:04-0400\n"
 "PO-Revision-Date: 2000-02-11 13:01+0200\n"
 "Last-Translator: Nilgun Belma Buguner <nilgun@technologist.com>\n"
 "Language-Team: Turkish <tr@li.org>\n"
diff --git a/po/uk.po b/po/uk.po
index d21a16e..b07c8d8 100644
--- a/po/uk.po
+++ b/po/uk.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.3\n"
-"POT-Creation-Date: 2002-08-26 12:38-0400\n"
+"POT-Creation-Date: 2002-10-15 15:04-0400\n"
 "PO-Revision-Date: 1999-09-30 16:54+0200\n"
 "Last-Translator: Yuri Syrota <rasta@renome.rovno.ua>\n"
 "Language-Team: Ukrainian <uk@li.org>\n"
diff --git a/po/wa.po b/po/wa.po
index f0df8b4..004db61 100644
--- a/po/wa.po
+++ b/po/wa.po
@@ -9,7 +9,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.3\n"
-"POT-Creation-Date: 2002-08-26 12:38-0400\n"
+"POT-Creation-Date: 2002-10-15 15:04-0400\n"
 "PO-Revision-Date: 1999-03-18 23:11+0100\n"
 "Last-Translator: Nobody yet\n"
 "Language-Team: walon <linux-wa@chanae.alphanet.ch>\n"
diff --git a/po/zh.po b/po/zh.po
index 9457c74..1f8a6ea 100644
--- a/po/zh.po
+++ b/po/zh.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.3\n"
-"POT-Creation-Date: 2002-08-26 12:38-0400\n"
+"POT-Creation-Date: 2002-10-15 15:04-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/po/zh_CN.GB2312.po b/po/zh_CN.GB2312.po
index 0d58551..79206cc 100644
--- a/po/zh_CN.GB2312.po
+++ b/po/zh_CN.GB2312.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.3\n"
-"POT-Creation-Date: 2002-08-26 12:38-0400\n"
+"POT-Creation-Date: 2002-10-15 15:04-0400\n"
 "PO-Revision-Date: 1999-11-11 05:04+0800\n"
 "Last-Translator: Dillion Chen <dillon.chen@turbolinux.com.cn>\n"
 "Language-Team: TLDN\n"
-- 
Gitee


From c71cdcc0ae8cffb2e647d49cd2f3ad51946dbd6c Mon Sep 17 00:00:00 2001
From: Jeff Johnson <n3npq@mac.com>
Date: Thu, 24 Oct 2002 21:37:04 +0000
Subject: [PATCH 372/667] - add /usr/lib/rpm/rpmdeps. - add /usr/lib/rpm/magic.

---
 .cvsignore | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.cvsignore b/.cvsignore
index de99415..d53c854 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -5,7 +5,7 @@ Doxyfile
 Makefile
 Makefile.in
 aclocal.m4
-autom4te-*.cache
+autom4te*
 config.cache
 config.guess
 config.h
-- 
Gitee


From 7fd748e6ffd47fdb663194d4f1d910c64cc8097e Mon Sep 17 00:00:00 2001
From: Jeff Johnson <n3npq@mac.com>
Date: Tue, 19 Nov 2002 18:40:49 +0000
Subject: [PATCH 373/667] - add AC_SYS_LARGFILE throughout. - statically link
 rpmdeps against (internal) libfmagic.

---
 configure.ac | 1 +
 1 file changed, 1 insertion(+)

diff --git a/configure.ac b/configure.ac
index 7b20ce6..ce49069 100755
--- a/configure.ac
+++ b/configure.ac
@@ -12,6 +12,7 @@ AC_ISC_POSIX
 AC_PROG_CC
 AC_GCC_TRADITIONAL
 AM_C_PROTOTYPES
+AC_SYS_LARGEFILE
 
 dnl AM_DISABLE_SHARED
 AM_PROG_LIBTOOL
-- 
Gitee


From 437869fcc50a44ca95b7315bb1ed246707c39916 Mon Sep 17 00:00:00 2001
From: Jeff Johnson <n3npq@mac.com>
Date: Sun, 1 Dec 2002 21:34:07 +0000
Subject: [PATCH 374/667] - use usrlib_LTLIBRARIES to install directly in
 /usr/lib64 instead.

---
 .lclintrc => .splintrc |  0
 Makefile.am            | 18 +++++++++++-------
 configure.ac           |  7 +++++++
 3 files changed, 18 insertions(+), 7 deletions(-)
 rename .lclintrc => .splintrc (100%)

diff --git a/.lclintrc b/.splintrc
similarity index 100%
rename from .lclintrc
rename to .splintrc
diff --git a/Makefile.am b/Makefile.am
index b947f12..5d9862c 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -2,6 +2,8 @@
 
 AUTOMAKE_OPTIONS = 1.4 foreign
 
+LINT = splint
+
 EXTRA_DIST = autogen.sh CHANGES $(man_MANS) popt.spec \
 	testit.sh test-poptrc test3-data/0* \
 	po/*.in po/*.po po/popt.pot \
@@ -16,13 +18,13 @@ noinst_HEADERS = findme.h poptint.h system.h
 noinst_PROGRAMS = test1 test2 test3
 test1_SOURCES = test1.c
 test1_LDFLAGS = -all-static
-test1_LDADD = $(lib_LTLIBRARIES)
+test1_LDADD = $(usrlib_LTLIBRARIES)
 test2_SOURCES = test2.c
 test2_LDFLAGS = -all-static
-test2_LDADD = $(lib_LTLIBRARIES)
+test2_LDADD = $(usrlib_LTLIBRARIES)
 test3_SOURCES = test3.c
 test3_LDFLAGS = -all-static
-test3_LDADD = $(lib_LTLIBRARIES)
+test3_LDADD = $(usrlib_LTLIBRARIES)
 
 noinst_SCRIPTS = testit.sh
 
@@ -32,7 +34,9 @@ test1="./test1"
 TESTS = testit.sh
 
 include_HEADERS = popt.h
-lib_LTLIBRARIES = libpopt.la
+
+usrlibdir = $(libdir)@MARK64@
+usrlib_LTLIBRARIES = libpopt.la
 libpopt_la_SOURCES = popt.c findme.c poptparse.c poptconfig.c popthelp.c
 
 man_MANS = popt.3
@@ -46,9 +50,9 @@ popt.lcd: Makefile.am ${libpopt_la_SOURCES} ${include_HEADERS} ${noinst_HEADERS}
 sources:
 	@echo $(libpopt_la_SOURCES:%=popt/%)
 
-.PHONY: lclint
-lclint:
-	lclint ${DEFS} ${INCLUDES} test1.c ${libpopt_la_SOURCES}
+.PHONY: lint
+lint:
+	$(LINT) ${DEFS} ${INCLUDES} test1.c ${libpopt_la_SOURCES}
 
 CVSTAG = $(PACKAGE)-$(subst .,_,$(VERSION))
 
diff --git a/configure.ac b/configure.ac
index ce49069..d8dccee 100755
--- a/configure.ac
+++ b/configure.ac
@@ -51,6 +51,13 @@ else
 fi
 AC_SUBST(TARGET)
 
+dnl XXX Choose /usr/lib or /usr/lib64 for library installs.
+MARK64=
+case "${target_cpu}" in
+x86_64*)        MARK64=64 ;;
+esac
+AC_SUBST(MARK64)
+
 AC_CHECK_HEADERS(alloca.h float.h libintl.h mcheck.h unistd.h)
 AC_MSG_CHECKING(for /usr/ucblib in LIBS)
 if test -d /usr/ucblib ; then
-- 
Gitee


From cfbf1493ab84f794f0bdd2a9da5199b6f573376d Mon Sep 17 00:00:00 2001
From: Elliot Lee <sopwith@redhat.com>
Date: Fri, 6 Dec 2002 02:09:57 +0000
Subject: [PATCH 375/667] part two

---
 configure.ac | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/configure.ac b/configure.ac
index d8dccee..b7a8d7f 100755
--- a/configure.ac
+++ b/configure.ac
@@ -54,7 +54,7 @@ AC_SUBST(TARGET)
 dnl XXX Choose /usr/lib or /usr/lib64 for library installs.
 MARK64=
 case "${target_cpu}" in
-x86_64*)        MARK64=64 ;;
+x86_64*|powerpc64*|ppc64*|sparc64*|s390x*)        MARK64=64 ;;
 esac
 AC_SUBST(MARK64)
 
-- 
Gitee


From fa369598b65079c56a182cd40023d20b13b138d3 Mon Sep 17 00:00:00 2001
From: Jeff Johnson <n3npq@mac.com>
Date: Thu, 16 Jan 2003 16:34:02 +0000
Subject: [PATCH 376/667] Nitpicky fix.

---
 test3.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test3.c b/test3.c
index 5290a9a..8eacd3c 100644
--- a/test3.c
+++ b/test3.c
@@ -1,4 +1,4 @@
-// vim:ts=8:sts=4
+/* vim:ts=8:sts=4 */
 
 #include <stdio.h>
 #include <stdlib.h>
-- 
Gitee


From 3907c3d26845e124969a47a28d80d62b31a15b26 Mon Sep 17 00:00:00 2001
From: Jeff Johnson <n3npq@mac.com>
Date: Thu, 6 Feb 2003 16:53:43 +0000
Subject: [PATCH 377/667] - popt: diddle doxygen/splint annotations, corrected
 doco.

---
 .splintrc |  1 -
 popt.h    | 50 +++++++++++++++++++++++++++-----------------------
 2 files changed, 27 insertions(+), 24 deletions(-)

diff --git a/.splintrc b/.splintrc
index e429478..c14d548 100644
--- a/.splintrc
+++ b/.splintrc
@@ -17,7 +17,6 @@
 -bufferoverflowhigh
 
 # --- +partial artifacts
--exportlocal		# 14
 -fcnuse			# 7
 
 # --- not-yet at strict level
diff --git a/popt.h b/popt.h
index 7e87e86..7c84f30 100644
--- a/popt.h
+++ b/popt.h
@@ -112,23 +112,29 @@
 /** \ingroup popt
  */
 struct poptOption {
-/*@observer@*/ /*@null@*/ const char * longName; /*!< may be NULL */
-    char shortName;			/*!< may be '\0' */
+/*@observer@*/ /*@null@*/
+    const char * longName;	/*!< may be NULL */
+    char shortName;		/*!< may be '\0' */
     int argInfo;
-/*@shared@*/ /*@null@*/ void * arg;	/*!< depends on argInfo */
+/*@shared@*/ /*@null@*/
+    void * arg;			/*!< depends on argInfo */
     int val;			/*!< 0 means don't return, just update flag */
-/*@observer@*/ /*@null@*/ const char * descrip;	/*!< description for autohelp -- may be NULL */
-/*@observer@*/ /*@null@*/ const char * argDescrip; /*!< argument description for autohelp */
+/*@observer@*/ /*@null@*/
+    const char * descrip;	/*!< description for autohelp -- may be NULL */
+/*@observer@*/ /*@null@*/
+    const char * argDescrip;	/*!< argument description for autohelp */
 };
 
 /** \ingroup popt
  * A popt alias argument for poptAddAlias().
  */
 struct poptAlias {
-/*@owned@*/ /*@null@*/ const char * longName;	/*!< may be NULL */
+/*@owned@*/ /*@null@*/
+    const char * longName;	/*!< may be NULL */
     char shortName;		/*!< may be '\0' */
     int argc;
-/*@owned@*/ const char ** argv;	/*!< must be free()able */
+/*@owned@*/
+    const char ** argv;		/*!< must be free()able */
 };
 
 /** \ingroup popt
@@ -138,7 +144,8 @@ struct poptAlias {
 typedef struct poptItem_s {
     struct poptOption option;	/*!< alias/exec name(s) and description. */
     int argc;			/*!< (alias) no. of args. */
-/*@owned@*/ const char ** argv;	/*!< (alias) args, must be free()able. */
+/*@owned@*/
+    const char ** argv;		/*!< (alias) args, must be free()able. */
 } * poptItem;
 /*@=exporttype@*/
 
@@ -214,7 +221,7 @@ typedef void (*poptCallbackType) (poptContext con,
 
 /** \ingroup popt
  * Initialize popt context.
- * @param name
+ * @param name		context name (usually argv[0] program name)
  * @param argc		no. of arguments
  * @param argv		argument array
  * @param options	address of popt option table
@@ -232,10 +239,9 @@ typedef void (*poptCallbackType) (poptContext con,
  * Reinitialize popt context.
  * @param con		context
  */
-/*@-exportlocal@*/
+/*@unused@*/
 void poptResetContext(/*@null@*/poptContext con)
 	/*@modifies con @*/;
-/*@=exportlocal@*/
 
 /** \ingroup popt
  * Return value of next option found.
@@ -246,27 +252,26 @@ int poptGetNextOpt(/*@null@*/poptContext con)
 	/*@globals fileSystem, internalState @*/
 	/*@modifies con, fileSystem, internalState @*/;
 
-/*@-redecl@*/
 /** \ingroup popt
  * Return next option argument (if any).
  * @param con		context
- * @return		option argument, NULL if no more options are available
+ * @return		option argument, NULL if no argument is available
  */
 /*@observer@*/ /*@null@*/ const char * poptGetOptArg(/*@null@*/poptContext con)
 	/*@modifies con @*/;
 
 /** \ingroup popt
- * Return current option's argument.
+ * Return next argument.
  * @param con		context
- * @return		option argument, NULL if no more options are available
+ * @return		next argument, NULL if no argument is available
  */
 /*@observer@*/ /*@null@*/ const char * poptGetArg(/*@null@*/poptContext con)
 	/*@modifies con @*/;
 
 /** \ingroup popt
- * Peek at current option's argument.
+ * Peek at current argument.
  * @param con		context
- * @return		option argument
+ * @return		current argument, NULL if no argument is available
  */
 /*@observer@*/ /*@null@*/ const char * poptPeekArg(/*@null@*/poptContext con)
 	/*@*/;
@@ -274,7 +279,7 @@ int poptGetNextOpt(/*@null@*/poptContext con)
 /** \ingroup popt
  * Return remaining arguments.
  * @param con		context
- * @return		argument array, terminated with NULL
+ * @return		argument array, NULL terminated
  */
 /*@observer@*/ /*@null@*/ const char ** poptGetArgs(/*@null@*/poptContext con)
 	/*@modifies con @*/;
@@ -287,7 +292,6 @@ int poptGetNextOpt(/*@null@*/poptContext con)
  */
 /*@observer@*/ const char * poptBadOption(/*@null@*/poptContext con, int flags)
 	/*@*/;
-/*@=redecl@*/
 
 /** \ingroup popt
  * Destroy context.
@@ -439,10 +443,8 @@ int poptConfigFileToString(FILE *fp, /*@out@*/ char ** argstrp, int flags)
  * @param error		popt error
  * @return		error string
  */
-/*@-redecl@*/
 /*@observer@*/ const char *const poptStrerror(const int error)
 	/*@*/;
-/*@=redecl@*/
 
 /** \ingroup popt
  * Limit search for executables.
@@ -488,10 +490,10 @@ void poptSetOtherOptionHelp(poptContext con, const char * text)
  * @param con		context
  * @return		argv[0]
  */
-/*@-redecl -fcnuse@*/
+/*@-fcnuse@*/
 /*@observer@*/ const char * poptGetInvocationName(poptContext con)
 	/*@*/;
-/*@=redecl =fcnuse@*/
+/*@=fcnuse@*/
 
 /** \ingroup popt
  * Shuffle argv pointers to remove stripped args, returns new argc.
@@ -514,6 +516,7 @@ int poptStrippedArgv(poptContext con, int argc, char ** argv)
  * @return		0 on success, POPT_ERROR_NULLARG/POPT_ERROR_BADOPERATION
  */
 /*@-incondefs@*/
+/*@unused@*/
 int poptSaveLong(/*@null@*/ long * arg, int argInfo, long aLong)
 	/*@modifies *arg @*/
 	/*@requires maxSet(arg) >= 0 /\ maxRead(arg) == 0 @*/;
@@ -528,6 +531,7 @@ int poptSaveLong(/*@null@*/ long * arg, int argInfo, long aLong)
  * @return		0 on success, POPT_ERROR_NULLARG/POPT_ERROR_BADOPERATION
  */
 /*@-incondefs@*/
+/*@unused@*/
 int poptSaveInt(/*@null@*/ int * arg, int argInfo, long aLong)
 	/*@modifies *arg @*/
 	/*@requires maxSet(arg) >= 0 /\ maxRead(arg) == 0 @*/;
-- 
Gitee


From 213ea402e7f72eb51edee9c1bbce5e76ddf65632 Mon Sep 17 00:00:00 2001
From: Jeff Johnson <n3npq@mac.com>
Date: Tue, 18 Mar 2003 17:48:19 +0000
Subject: [PATCH 378/667] - fix: short option help missing string terminator.

---
 popthelp.c | 28 ++++++++++++----------------
 1 file changed, 12 insertions(+), 16 deletions(-)

diff --git a/popthelp.c b/popthelp.c
index 4d8f0ef..14b07b2 100644
--- a/popthelp.c
+++ b/popthelp.c
@@ -677,33 +677,29 @@ static int showShortOptions(const struct poptOption * opt, FILE * fp,
 		/*@null@*/ char * str)
 	/*@globals fileSystem @*/
 	/*@modifies *str, *fp, fileSystem @*/
+	/*@requires maxRead(str) >= 0 @*/
 {
-    char * s = alloca(300);	/* larger then the ascii set */
-
-    s[0] = '\0';
-    /*@-branchstate@*/		/* FIX: W2DO? */
-    if (str == NULL) {
-	memset(s, 0, sizeof(s));
-	str = s;
-    }
-    /*@=branchstate@*/
+    /* bufsize larger then the ascii set, lazy alloca on top level call. */
+    char * s = (str != NULL ? str : memset(alloca(300), 0, 300));
+    int len = 0;
 
 /*@-boundswrite@*/
     if (opt != NULL)
     for (; (opt->longName || opt->shortName || opt->arg); opt++) {
 	if (opt->shortName && !(opt->argInfo & POPT_ARG_MASK))
-	    str[strlen(str)] = opt->shortName;
+	    s[strlen(s)] = opt->shortName;
 	else if ((opt->argInfo & POPT_ARG_MASK) == POPT_ARG_INCLUDE_TABLE)
 	    if (opt->arg)	/* XXX program error */
-		(void) showShortOptions(opt->arg, fp, str);
+		len = showShortOptions(opt->arg, fp, s);
     } 
 /*@=boundswrite@*/
 
-    if (s != str || *s != '\0')
-	return 0;
-
-    fprintf(fp, " [-%s]", s);
-    return strlen(s) + 4;
+    /* On return to top level, print the short options, return print length. */
+    if (s == str && *s != '\0') {
+	fprintf(fp, " [-%s]", s);
+	len = strlen(s) + sizeof(" [-]")-1;
+    }
+    return len;
 }
 
 void poptPrintUsage(poptContext con, FILE * fp, /*@unused@*/ int flags)
-- 
Gitee


From 9a089422d742fb062babf9f0299ad3ee7a0fc6ad Mon Sep 17 00:00:00 2001
From: Jeff Johnson <n3npq@mac.com>
Date: Wed, 19 Mar 2003 16:06:19 +0000
Subject: [PATCH 379/667] - unify signal handling in librpmio, use condvar to
 deliver signal.

---
 po/cs.po           | 2 +-
 po/da.po           | 2 +-
 po/de.po           | 2 +-
 po/es.po           | 2 +-
 po/eu_ES.po        | 2 +-
 po/fi.po           | 2 +-
 po/fr.po           | 2 +-
 po/gl.po           | 2 +-
 po/hu.po           | 2 +-
 po/id.po           | 2 +-
 po/is.po           | 2 +-
 po/it.po           | 2 +-
 po/ja.po           | 2 +-
 po/ko.po           | 2 +-
 po/no.po           | 2 +-
 po/pl.po           | 2 +-
 po/popt.pot        | 2 +-
 po/pt.po           | 2 +-
 po/pt_BR.po        | 2 +-
 po/ro.po           | 2 +-
 po/ru.po           | 2 +-
 po/sk.po           | 2 +-
 po/sl.po           | 2 +-
 po/sr.po           | 2 +-
 po/sv.po           | 2 +-
 po/tr.po           | 2 +-
 po/uk.po           | 2 +-
 po/wa.po           | 2 +-
 po/zh.po           | 2 +-
 po/zh_CN.GB2312.po | 2 +-
 30 files changed, 30 insertions(+), 30 deletions(-)

diff --git a/po/cs.po b/po/cs.po
index 5c0a727..4147cbc 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.3\n"
-"POT-Creation-Date: 2002-10-15 15:04-0400\n"
+"POT-Creation-Date: 2003-03-19 11:03-0500\n"
 "PO-Revision-Date: 2001-07-24 00:03+0100\n"
 "Last-Translator: Milan Kerslager <kerslage@linux.cz>\n"
 "Language-Team: Czech <cs@li.org>\n"
diff --git a/po/da.po b/po/da.po
index 86c9ec5..53f0a32 100644
--- a/po/da.po
+++ b/po/da.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.3\n"
-"POT-Creation-Date: 2002-10-15 15:04-0400\n"
+"POT-Creation-Date: 2003-03-19 11:03-0500\n"
 "PO-Revision-Date: Sun Jan 21 2001 04:30:32+0200\n"
 "Last-Translator: Martin Hansen <mah@k64.dk>\n"
 "Language-Team: Dansk <dansk@klid.dk>\n"
diff --git a/po/de.po b/po/de.po
index 1f8a6ea..56db8fe 100644
--- a/po/de.po
+++ b/po/de.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.3\n"
-"POT-Creation-Date: 2002-10-15 15:04-0400\n"
+"POT-Creation-Date: 2003-03-19 11:03-0500\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/po/es.po b/po/es.po
index 64de6c5..e2c50b7 100644
--- a/po/es.po
+++ b/po/es.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.3\n"
-"POT-Creation-Date: 2002-10-15 15:04-0400\n"
+"POT-Creation-Date: 2003-03-19 11:03-0500\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Leandro Lucarella <luca@linuxmendoza.org.ar>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/po/eu_ES.po b/po/eu_ES.po
index 1f8a6ea..56db8fe 100644
--- a/po/eu_ES.po
+++ b/po/eu_ES.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.3\n"
-"POT-Creation-Date: 2002-10-15 15:04-0400\n"
+"POT-Creation-Date: 2003-03-19 11:03-0500\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/po/fi.po b/po/fi.po
index 1f8a6ea..56db8fe 100644
--- a/po/fi.po
+++ b/po/fi.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.3\n"
-"POT-Creation-Date: 2002-10-15 15:04-0400\n"
+"POT-Creation-Date: 2003-03-19 11:03-0500\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/po/fr.po b/po/fr.po
index 1f8a6ea..56db8fe 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.3\n"
-"POT-Creation-Date: 2002-10-15 15:04-0400\n"
+"POT-Creation-Date: 2003-03-19 11:03-0500\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/po/gl.po b/po/gl.po
index ec11825..b052100 100644
--- a/po/gl.po
+++ b/po/gl.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.3\n"
-"POT-Creation-Date: 2002-10-15 15:04-0400\n"
+"POT-Creation-Date: 2003-03-19 11:03-0500\n"
 "PO-Revision-Date: 2001-01-17 01:01+0100\n"
 "Last-Translator: Jes�s Bravo �lvarez <jba@pobox.com>\n"
 "Language-Team: Galician <trasno@ceu.fi.udc.es>\n"
diff --git a/po/hu.po b/po/hu.po
index cdef01d..b0930ff 100644
--- a/po/hu.po
+++ b/po/hu.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.3\n"
-"POT-Creation-Date: 2002-10-15 15:04-0400\n"
+"POT-Creation-Date: 2003-03-19 11:03-0500\n"
 "PO-Revision-Date: 2000-08-03 23:26+0200\n"
 "Last-Translator: L�szl� N�meth <nemeth@qwertynet.hu>\n"
 "Language-Team: Hungarian\n"
diff --git a/po/id.po b/po/id.po
index 1f8a6ea..56db8fe 100644
--- a/po/id.po
+++ b/po/id.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.3\n"
-"POT-Creation-Date: 2002-10-15 15:04-0400\n"
+"POT-Creation-Date: 2003-03-19 11:03-0500\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/po/is.po b/po/is.po
index 2db56bd..a8ecaaf 100644
--- a/po/is.po
+++ b/po/is.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.3\n"
-"POT-Creation-Date: 2002-10-15 15:04-0400\n"
+"POT-Creation-Date: 2003-03-19 11:03-0500\n"
 "PO-Revision-Date: 2001-06-08 01:35+0000\n"
 "Last-Translator: Richard Allen <ra@hp.is>\n"
 "Language-Team: is <kde-isl@mmedia.is>\n"
diff --git a/po/it.po b/po/it.po
index 1f8a6ea..56db8fe 100644
--- a/po/it.po
+++ b/po/it.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.3\n"
-"POT-Creation-Date: 2002-10-15 15:04-0400\n"
+"POT-Creation-Date: 2003-03-19 11:03-0500\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/po/ja.po b/po/ja.po
index 1f8a6ea..56db8fe 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.3\n"
-"POT-Creation-Date: 2002-10-15 15:04-0400\n"
+"POT-Creation-Date: 2003-03-19 11:03-0500\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/po/ko.po b/po/ko.po
index bab37d2..3fb4ded 100644
--- a/po/ko.po
+++ b/po/ko.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6\n"
-"POT-Creation-Date: 2002-10-15 15:04-0400\n"
+"POT-Creation-Date: 2003-03-19 11:03-0500\n"
 "PO-Revision-Date: 2001-09-06 20:06+0900\n"
 "Last-Translator: Jong-Hoon Ryu <redhat4u@netian.com>\n"
 "Language-Team: GNU Translation project <ko@li.org>\n"
diff --git a/po/no.po b/po/no.po
index 1ad2a84..bbaa51c 100644
--- a/po/no.po
+++ b/po/no.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.3\n"
-"POT-Creation-Date: 2002-10-15 15:04-0400\n"
+"POT-Creation-Date: 2003-03-19 11:03-0500\n"
 "PO-Revision-Date: 2001-06-27 11:05+0200\n"
 "Last-Translator: Kjartan Maraas <kmaraas@online.no>\n"
 "Language-Team: Norwegian <no@li.org>\n"
diff --git a/po/pl.po b/po/pl.po
index 1f8a6ea..56db8fe 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.3\n"
-"POT-Creation-Date: 2002-10-15 15:04-0400\n"
+"POT-Creation-Date: 2003-03-19 11:03-0500\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/po/popt.pot b/po/popt.pot
index 90647e9..7adb48c 100644
--- a/po/popt.pot
+++ b/po/popt.pot
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2002-10-15 15:04-0400\n"
+"POT-Creation-Date: 2003-03-19 11:03-0500\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/po/pt.po b/po/pt.po
index c92072c..e3d85e2 100644
--- a/po/pt.po
+++ b/po/pt.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt\n"
-"POT-Creation-Date: 2002-10-15 15:04-0400\n"
+"POT-Creation-Date: 2003-03-19 11:03-0500\n"
 "PO-Revision-Date: 2002-02-13 18:32+0000\n"
 "Last-Translator: Pedro Morais <morais@kde.org>\n"
 "Language-Team: pt <morais@kde.org>\n"
diff --git a/po/pt_BR.po b/po/pt_BR.po
index 1f8a6ea..56db8fe 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.3\n"
-"POT-Creation-Date: 2002-10-15 15:04-0400\n"
+"POT-Creation-Date: 2003-03-19 11:03-0500\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/po/ro.po b/po/ro.po
index 73fb29c..a60e9fd 100644
--- a/po/ro.po
+++ b/po/ro.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.3\n"
-"POT-Creation-Date: 2002-10-15 15:04-0400\n"
+"POT-Creation-Date: 2003-03-19 11:03-0500\n"
 "PO-Revision-Date: 2000-06-14 23:23+EST\n"
 "Last-Translator: Cristian Gafton <gafton@redhat.com>\n"
 "Language-Team: Romanian <ro@li.org>\n"
diff --git a/po/ru.po b/po/ru.po
index 38b09d4..3aee845 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.3\n"
-"POT-Creation-Date: 2002-10-15 15:04-0400\n"
+"POT-Creation-Date: 2003-03-19 11:03-0500\n"
 "PO-Revision-Date: 2001-07-05 21:00-0500\n"
 "Last-Translator: Eugene Kanter <eugene@blackcatlinux.com>\n"
 "Language-Team: Black Cat Linux Team <blackcat-support@blackcatlinux.com>\n"
diff --git a/po/sk.po b/po/sk.po
index b22f438..a91a986 100644
--- a/po/sk.po
+++ b/po/sk.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.3\n"
-"POT-Creation-Date: 2002-10-15 15:04-0400\n"
+"POT-Creation-Date: 2003-03-19 11:03-0500\n"
 "PO-Revision-Date: 1999-08-04 21:40+0200\n"
 "Last-Translator: Stanislav Meduna <stano@eunet.sk>\n"
 "Language-Team: Slovak <sk-i18n@rak.isternet.sk>\n"
diff --git a/po/sl.po b/po/sl.po
index f01f4b7..8907b2f 100644
--- a/po/sl.po
+++ b/po/sl.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.3\n"
-"POT-Creation-Date: 2002-10-15 15:04-0400\n"
+"POT-Creation-Date: 2003-03-19 11:03-0500\n"
 "PO-Revision-Date: 2000-09-05 12:30+0200\n"
 "Last-Translator: Roman Maurer <roman.maurer@hermes.si>\n"
 "Language-Team: Slovenian <sl@li.org>\n"
diff --git a/po/sr.po b/po/sr.po
index 1f8a6ea..56db8fe 100644
--- a/po/sr.po
+++ b/po/sr.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.3\n"
-"POT-Creation-Date: 2002-10-15 15:04-0400\n"
+"POT-Creation-Date: 2003-03-19 11:03-0500\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/po/sv.po b/po/sv.po
index 357d73a..43a1155 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.3\n"
-"POT-Creation-Date: 2002-10-15 15:04-0400\n"
+"POT-Creation-Date: 2003-03-19 11:03-0500\n"
 "PO-Revision-Date: 2001-07-12 22:26+0100\n"
 "Last-Translator: Christian Rose <menthos@menthos.com>\n"
 "Language-Team: Swedish <sv@li.org>\n"
diff --git a/po/tr.po b/po/tr.po
index 3412ed7..bfb7e06 100644
--- a/po/tr.po
+++ b/po/tr.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.3\n"
-"POT-Creation-Date: 2002-10-15 15:04-0400\n"
+"POT-Creation-Date: 2003-03-19 11:03-0500\n"
 "PO-Revision-Date: 2000-02-11 13:01+0200\n"
 "Last-Translator: Nilgun Belma Buguner <nilgun@technologist.com>\n"
 "Language-Team: Turkish <tr@li.org>\n"
diff --git a/po/uk.po b/po/uk.po
index b07c8d8..fa295d6 100644
--- a/po/uk.po
+++ b/po/uk.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.3\n"
-"POT-Creation-Date: 2002-10-15 15:04-0400\n"
+"POT-Creation-Date: 2003-03-19 11:03-0500\n"
 "PO-Revision-Date: 1999-09-30 16:54+0200\n"
 "Last-Translator: Yuri Syrota <rasta@renome.rovno.ua>\n"
 "Language-Team: Ukrainian <uk@li.org>\n"
diff --git a/po/wa.po b/po/wa.po
index 004db61..715ebd6 100644
--- a/po/wa.po
+++ b/po/wa.po
@@ -9,7 +9,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.3\n"
-"POT-Creation-Date: 2002-10-15 15:04-0400\n"
+"POT-Creation-Date: 2003-03-19 11:03-0500\n"
 "PO-Revision-Date: 1999-03-18 23:11+0100\n"
 "Last-Translator: Nobody yet\n"
 "Language-Team: walon <linux-wa@chanae.alphanet.ch>\n"
diff --git a/po/zh.po b/po/zh.po
index 1f8a6ea..56db8fe 100644
--- a/po/zh.po
+++ b/po/zh.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.3\n"
-"POT-Creation-Date: 2002-10-15 15:04-0400\n"
+"POT-Creation-Date: 2003-03-19 11:03-0500\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/po/zh_CN.GB2312.po b/po/zh_CN.GB2312.po
index 79206cc..33601d3 100644
--- a/po/zh_CN.GB2312.po
+++ b/po/zh_CN.GB2312.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.3\n"
-"POT-Creation-Date: 2002-10-15 15:04-0400\n"
+"POT-Creation-Date: 2003-03-19 11:03-0500\n"
 "PO-Revision-Date: 1999-11-11 05:04+0800\n"
 "Last-Translator: Dillion Chen <dillon.chen@turbolinux.com.cn>\n"
 "Language-Team: TLDN\n"
-- 
Gitee


From 3e2aaec2498898ea33d3e18cfd543986e6bedd68 Mon Sep 17 00:00:00 2001
From: Jeff Johnson <n3npq@mac.com>
Date: Thu, 20 Mar 2003 23:44:19 +0000
Subject: [PATCH 380/667] Make sure that $(RPM_BUILD_ROOT}/usr/lib is 1st
 libarry searched. Bump popt version.

---
 configure.ac | 2 +-
 popt.spec    | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/configure.ac b/configure.ac
index b7a8d7f..9170776 100755
--- a/configure.ac
+++ b/configure.ac
@@ -2,7 +2,7 @@ AC_INIT(popt.h)
 AC_CANONICAL_SYSTEM
 AC_PREREQ(2.12)
 AC_CONFIG_HEADERS
-AM_INIT_AUTOMAKE(popt, 1.8)
+AM_INIT_AUTOMAKE(popt, 1.9)
 AM_CONFIG_HEADER(config.h)
 
 ALL_LINGUAS="cs da de es eu_ES fi fr gl hu id is it ja ko no pl pt pt_BR ro ru sk sl sr sv tr uk wa zh zh_CN.GB2312"
diff --git a/popt.spec b/popt.spec
index 93dd393..f84fabd 100644
--- a/popt.spec
+++ b/popt.spec
@@ -4,7 +4,7 @@
 #
 Summary: A C library for parsing command line parameters.
 Name: popt
-Version: 1.7
+Version: 1.9
 Release: 0.1
 Copyright: X Consortium
 Group: System Environment/Libraries
-- 
Gitee


From e82047fba676686670679605c49b495c36737654 Mon Sep 17 00:00:00 2001
From: Jeff Johnson <n3npq@mac.com>
Date: Wed, 30 Apr 2003 01:03:33 +0000
Subject: [PATCH 381/667] beecrypt-3.0.0 merge: doxygen pass.

---
 .splintrc  | 2 +-
 popthelp.c | 5 ++++-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/.splintrc b/.splintrc
index c14d548..3f9490c 100644
--- a/.splintrc
+++ b/.splintrc
@@ -3,7 +3,7 @@
 #+partial
 +forcehints
 
--warnunixlib
+#-warnunixlib
 -warnposix
 
 +unixlib
diff --git a/popthelp.c b/popthelp.c
index 14b07b2..34b5044 100644
--- a/popthelp.c
+++ b/popthelp.c
@@ -324,9 +324,12 @@ static void singleOptionHelp(FILE * fp, int maxLeftCol,
     }
 
     left = _free(left);
+/*@-branchstate@*/
     if (defs) {
-	help = defs; defs = NULL;
+	help = defs;
+	defs = NULL;
     }
+/*@=branchstate@*/
 
     helpLength = strlen(help);
 /*@-boundsread@*/
-- 
Gitee


From adde677fcda9f81d2615fbb80213efdde89ed06f Mon Sep 17 00:00:00 2001
From: Jeff Johnson <n3npq@mac.com>
Date: Wed, 30 Apr 2003 20:04:58 +0000
Subject: [PATCH 382/667] splint fiddles.

---
 configure.ac |  5 +++--
 findme.c     |  3 ++-
 popt.c       | 40 ++++++++++++++++++++++------------------
 popt.h       | 31 ++++++++++++++++++++-----------
 poptconfig.c | 22 +++++++---------------
 popthelp.c   | 23 +++++++++++++----------
 poptint.h    |  2 +-
 system.h     |  9 ++++++---
 8 files changed, 74 insertions(+), 61 deletions(-)

diff --git a/configure.ac b/configure.ac
index 9170776..ac8f764 100755
--- a/configure.ac
+++ b/configure.ac
@@ -81,16 +81,17 @@ then
   AC_MSG_RESULT(yes)
 fi
 
-AC_CHECK_FUNCS(strerror mtrace getuid geteuid)
 AC_CHECK_FUNC(setreuid, [], [
     AC_CHECK_LIB(ucb, setreuid, [if echo $LIBS | grep -- -lucb >/dev/null ;then :; else LIBS="$LIBS -lc -lucb" USEUCB=y;fi])
 ])
+AC_CHECK_FUNCS(getuid geteuid mtrace __secure_getenv setregid strerror)
+
 
 AM_GNU_GETTEXT
 
 POPT_SOURCE_PATH="`pwd`"
 AC_DEFINE_UNQUOTED(POPT_SOURCE_PATH, "$POPT_SOURCE_PATH",
-	[Full path to popt top_sourcedir.])
+	[Full path to popt top_srcdir.])
 AC_SUBST(POPT_SOURCE_PATH)
 
 AC_OUTPUT([Doxyfile Makefile intl/Makefile po/Makefile.in])
diff --git a/findme.c b/findme.c
index a950e50..c4aaabc 100644
--- a/findme.c
+++ b/findme.c
@@ -9,7 +9,8 @@
 #include "system.h"
 #include "findme.h"
 
-const char * findProgramPath(const char * argv0) {
+const char * findProgramPath(const char * argv0)
+{
     char * path = getenv("PATH");
     char * pathbuf;
     char * start, * chptr;
diff --git a/popt.c b/popt.c
index eb81c72..f306bd2 100644
--- a/popt.c
+++ b/popt.c
@@ -23,8 +23,9 @@
 int _popt_debug = 0;
 #endif
 
-#ifndef HAVE_STRERROR
-static char * strerror(int errno) {
+#if !defined(HAVE_STRERROR) && !defined(__LCLINT__)
+static char * strerror(int errno)
+{
     extern int sys_nerr;
     extern char * sys_errlist[];
 
@@ -36,7 +37,8 @@ static char * strerror(int errno) {
 #endif
 
 #ifdef MYDEBUG
-/*@unused@*/ static void prtcon(const char *msg, poptContext con)
+/*@unused@*/
+static void prtcon(const char *msg, poptContext con)
 {
     if (msg) fprintf(stderr, "%s", msg);
     fprintf(stderr, "\tcon %p os %p nextCharArg \"%s\" nextArg \"%s\" argv[%d] \"%s\"\n",
@@ -54,7 +56,7 @@ void poptSetExecPath(poptContext con, const char * path, int allowAbsolute)
     con->execPath = _free(con->execPath);
     con->execPath = xstrdup(path);
     con->execAbsolute = allowAbsolute;
-    /*@-nullstate@*/ /* LCL: con->execPath can be NULL? */
+    /*@-nullstate@*/ /* LCL: con->execPath not NULL */
     return;
     /*@=nullstate@*/
 }
@@ -75,9 +77,9 @@ static void invokeCallbacksPRE(poptContext con, const struct poptOption * opt)
 	    poptCallbackType cb = (poptCallbackType)opt->arg;
 	    /*@=castfcnptr@*/
 	    /* Perform callback. */
-	    /*@-moduncon -noeffectuncon @*/
+	    /*@-noeffectuncon @*/
 	    cb(con, POPT_CALLBACK_REASON_PRE, NULL, NULL, opt->descrip);
-	    /*@=moduncon =noeffectuncon @*/
+	    /*@=noeffectuncon @*/
 	}
     }
 }
@@ -98,9 +100,9 @@ static void invokeCallbacksPOST(poptContext con, const struct poptOption * opt)
 	    poptCallbackType cb = (poptCallbackType)opt->arg;
 	    /*@=castfcnptr@*/
 	    /* Perform callback. */
-	    /*@-moduncon -noeffectuncon @*/
+	    /*@-noeffectuncon @*/
 	    cb(con, POPT_CALLBACK_REASON_POST, NULL, NULL, opt->descrip);
-	    /*@=moduncon =noeffectuncon @*/
+	    /*@=noeffectuncon @*/
 	}
     }
 }
@@ -138,10 +140,10 @@ static void invokeCallbacksOPTION(poptContext con,
 	    const void * cbData = (cbopt->descrip ? cbopt->descrip : myData);
 	    /* Perform callback. */
 	    if (cb != NULL) {	/* XXX program error */
-		/*@-moduncon -noeffectuncon @*/
+		/*@-noeffectuncon @*/
 		cb(con, POPT_CALLBACK_REASON_OPTION, myOpt,
 			con->os->nextArg, cbData);
-		/*@=moduncon =noeffectuncon @*/
+		/*@=noeffectuncon @*/
 	    }
 	    /* Terminate (unless explcitly continuing). */
 	    if (!(cbopt->argInfo & POPT_CBFLAG_CONTINUE))
@@ -377,15 +379,14 @@ static int execCommand(poptContext con)
 
     argv = malloc(sizeof(*argv) *
 			(6 + item->argc + con->numLeftovers + con->finalArgvCount));
-    if (argv == NULL) return POPT_ERROR_MALLOC;	/* XXX can't happen */
+    if (argv == NULL) return POPT_ERROR_MALLOC;
 
-    if (!strchr(item->argv[0], '/') && con->execPath) {
+    if (!strchr(item->argv[0], '/') && con->execPath != NULL) {
 	char *s = alloca(strlen(con->execPath) + strlen(item->argv[0]) + sizeof("/"));
 	sprintf(s, "%s/%s", con->execPath, item->argv[0]);
 	argv[argc] = s;
-    } else {
+    } else
 	argv[argc] = findProgramPath(item->argv[0]);
-    }
     if (argv[argc++] == NULL) return POPT_ERROR_NOARG;
 
     if (item->argc > 1) {
@@ -400,9 +401,6 @@ static int execCommand(poptContext con)
     }
 
     if (con->leftovers != NULL && con->numLeftovers > 0) {
-#if 0
-	argv[argc++] = "--";
-#endif
 	memcpy(argv + argc, con->leftovers, sizeof(*argv) * con->numLeftovers);
 	argc += con->numLeftovers;
     }
@@ -410,6 +408,8 @@ static int execCommand(poptContext con)
     argv[argc] = NULL;
 
 #ifdef __hpux
+    rc = setresgid(getgid(), getgid(),-1);
+    if (rc) return POPT_ERROR_ERRNO;
     rc = setresuid(getuid(), getuid(),-1);
     if (rc) return POPT_ERROR_ERRNO;
 #else
@@ -419,10 +419,14 @@ static int execCommand(poptContext con)
  * XXX	from Norbert Warmuth <nwarmuth@privat.circular.de>
  */
 #if defined(HAVE_SETUID)
+    rc = setgid(getgid());
+    if (rc) return POPT_ERROR_ERRNO;
     rc = setuid(getuid());
     if (rc) return POPT_ERROR_ERRNO;
 #elif defined (HAVE_SETREUID)
-    rc = setreuid(getuid(), getuid()); /*hlauer: not portable to hpux9.01 */
+    rc = setregid(getgid(), getgid());
+    if (rc) return POPT_ERROR_ERRNO;
+    rc = setreuid(getuid(), getuid());
     if (rc) return POPT_ERROR_ERRNO;
 #else
     ; /* Can't drop privileges */
diff --git a/popt.h b/popt.h
index 7c84f30..d55c0fe 100644
--- a/popt.h
+++ b/popt.h
@@ -217,7 +217,8 @@ typedef void (*poptCallbackType) (poptContext con,
 		/*@null@*/ const struct poptOption * opt,
 		/*@null@*/ const char * arg,
 		/*@null@*/ const void * data)
-	/*@*/;
+	/*@globals internalState @*/
+	/*@modifies internalState @*/;
 
 /** \ingroup popt
  * Initialize popt context.
@@ -257,7 +258,8 @@ int poptGetNextOpt(/*@null@*/poptContext con)
  * @param con		context
  * @return		option argument, NULL if no argument is available
  */
-/*@observer@*/ /*@null@*/ const char * poptGetOptArg(/*@null@*/poptContext con)
+/*@observer@*/ /*@null@*/
+const char * poptGetOptArg(/*@null@*/poptContext con)
 	/*@modifies con @*/;
 
 /** \ingroup popt
@@ -265,7 +267,8 @@ int poptGetNextOpt(/*@null@*/poptContext con)
  * @param con		context
  * @return		next argument, NULL if no argument is available
  */
-/*@observer@*/ /*@null@*/ const char * poptGetArg(/*@null@*/poptContext con)
+/*@observer@*/ /*@null@*/
+const char * poptGetArg(/*@null@*/poptContext con)
 	/*@modifies con @*/;
 
 /** \ingroup popt
@@ -273,7 +276,8 @@ int poptGetNextOpt(/*@null@*/poptContext con)
  * @param con		context
  * @return		current argument, NULL if no argument is available
  */
-/*@observer@*/ /*@null@*/ const char * poptPeekArg(/*@null@*/poptContext con)
+/*@observer@*/ /*@null@*/
+const char * poptPeekArg(/*@null@*/poptContext con)
 	/*@*/;
 
 /** \ingroup popt
@@ -281,7 +285,8 @@ int poptGetNextOpt(/*@null@*/poptContext con)
  * @param con		context
  * @return		argument array, NULL terminated
  */
-/*@observer@*/ /*@null@*/ const char ** poptGetArgs(/*@null@*/poptContext con)
+/*@observer@*/ /*@null@*/
+const char ** poptGetArgs(/*@null@*/poptContext con)
 	/*@modifies con @*/;
 
 /** \ingroup popt
@@ -290,7 +295,8 @@ int poptGetNextOpt(/*@null@*/poptContext con)
  * @param flags
  * @return		offending option
  */
-/*@observer@*/ const char * poptBadOption(/*@null@*/poptContext con, int flags)
+/*@observer@*/
+const char * poptBadOption(/*@null@*/poptContext con, int flags)
 	/*@*/;
 
 /** \ingroup popt
@@ -298,7 +304,8 @@ int poptGetNextOpt(/*@null@*/poptContext con)
  * @param con		context
  * @return		NULL always
  */
-/*@null@*/ poptContext poptFreeContext( /*@only@*/ /*@null@*/ poptContext con)
+/*@null@*/
+poptContext poptFreeContext( /*@only@*/ /*@null@*/ poptContext con)
 	/*@modifies con @*/;
 
 /** \ingroup popt
@@ -340,9 +347,9 @@ int poptAddItem(poptContext con, poptItem newItem, int flags)
  * @return		0 on success, POPT_ERROR_ERRNO on failure
  */
 int poptReadConfigFile(poptContext con, const char * fn)
-	/*@globals fileSystem, internalState @*/
+	/*@globals errno, fileSystem, internalState @*/
 	/*@modifies con->execs, con->numExecs,
-		fileSystem, internalState @*/;
+		errno, fileSystem, internalState @*/;
 
 /** \ingroup popt
  * Read default configuration from /etc/popt and $HOME/.popt.
@@ -443,7 +450,8 @@ int poptConfigFileToString(FILE *fp, /*@out@*/ char ** argstrp, int flags)
  * @param error		popt error
  * @return		error string
  */
-/*@observer@*/ const char *const poptStrerror(const int error)
+/*@observer@*/
+const char *const poptStrerror(const int error)
 	/*@*/;
 
 /** \ingroup popt
@@ -491,7 +499,8 @@ void poptSetOtherOptionHelp(poptContext con, const char * text)
  * @return		argv[0]
  */
 /*@-fcnuse@*/
-/*@observer@*/ const char * poptGetInvocationName(poptContext con)
+/*@observer@*/
+const char * poptGetInvocationName(poptContext con)
 	/*@*/;
 /*@=fcnuse@*/
 
diff --git a/poptconfig.c b/poptconfig.c
index a600a92..e5cba45 100644
--- a/poptconfig.c
+++ b/poptconfig.c
@@ -8,25 +8,26 @@
 
 #include "system.h"
 #include "poptint.h"
+/*@access poptContext @*/
 
 /*@-compmempass@*/	/* FIX: item->option.longName kept, not dependent. */
 static void configLine(poptContext con, char * line)
 	/*@modifies con @*/
 {
-    /*@-type@*/
-    int nameLength = strlen(con->appName);
-    /*@=type@*/
+    size_t nameLength;
     const char * entryType;
     const char * opt;
     poptItem item = alloca(sizeof(*item));
     int i, j;
+
+    if (con->appName == NULL)
+	return;
+    nameLength = strlen(con->appName);
     
 /*@-boundswrite@*/
     memset(item, 0, sizeof(*item));
 
-    /*@-type@*/
     if (strncmp(line, con->appName, nameLength)) return;
-    /*@=type@*/
 
     line += nameLength;
     if (*line == '\0' || !isspace(*line)) return;
@@ -108,9 +109,7 @@ int poptReadConfigFile(poptContext con, const char * fn)
     if (fileLength == -1 || lseek(fd, 0, 0) == -1) {
 	rc = errno;
 	(void) close(fd);
-	/*@-mods@*/
 	errno = rc;
-	/*@=mods@*/
 	return POPT_ERROR_ERRNO;
     }
 
@@ -118,9 +117,7 @@ int poptReadConfigFile(poptContext con, const char * fn)
     if (read(fd, (char *)file, fileLength) != fileLength) {
 	rc = errno;
 	(void) close(fd);
-	/*@-mods@*/
 	errno = rc;
-	/*@=mods@*/
 	return POPT_ERROR_ERRNO;
     }
     if (close(fd) == -1)
@@ -168,15 +165,10 @@ int poptReadDefaultConfig(poptContext con, /*@unused@*/ int useEnv)
     char * fn, * home;
     int rc;
 
-    /*@-type@*/
-    if (!con->appName) return 0;
-    /*@=type@*/
+    if (con->appName == NULL) return 0;
 
     rc = poptReadConfigFile(con, "/etc/popt");
     if (rc) return rc;
-#if defined(HAVE_GETUID) && defined(HAVE_GETEUID)
-    if (getuid() != geteuid()) return 0;
-#endif
 
     if ((home = getenv("HOME"))) {
 	fn = alloca(strlen(home) + 20);
diff --git a/popthelp.c b/popthelp.c
index 34b5044..c7dd151 100644
--- a/popthelp.c
+++ b/popthelp.c
@@ -1,6 +1,5 @@
 /* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 4 -*- */
 
-/*@-type@*/
 /** \ingroup popt
  * \file popt/popthelp.c
  */
@@ -12,6 +11,8 @@
 #include "system.h"
 #include "poptint.h"
 
+/*@access poptContext@*/
+
 /**
  * Display arguments.
  * @param con		context
@@ -204,7 +205,7 @@ static void singleOptionHelp(FILE * fp, int maxLeftCol,
     int lineLength = 79 - indentLength;
     const char * help = D_(translation_domain, opt->descrip);
     const char * argDescrip = getArgDescrip(opt, translation_domain);
-    int helpLength;
+    size_t helpLength;
     char * defs = NULL;
     char * left;
     int nb = maxLeftCol + 1;
@@ -489,9 +490,9 @@ static int showHelpIntro(poptContext con, FILE * fp)
     fprintf(fp, POPT_("Usage:"));
     if (!(con->flags & POPT_CONTEXT_KEEP_FIRST)) {
 /*@-boundsread@*/
-	/*@-nullderef@*/	/* LCL: wazzup? */
+	/*@-nullderef -type@*/	/* LCL: wazzup? */
 	fn = con->optionStack->argv[0];
-	/*@=nullderef@*/
+	/*@=nullderef =type@*/
 /*@=boundsread@*/
 	if (fn == NULL) return len;
 	if (strchr(fn, '/')) fn = strrchr(fn, '/') + 1;
@@ -522,13 +523,13 @@ void poptPrintHelp(poptContext con, FILE * fp, /*@unused@*/ int flags)
  * @param opt		option(s)
  * @param translation_domain	translation domain
  */
-static int singleOptionUsage(FILE * fp, int cursor, 
+static size_t singleOptionUsage(FILE * fp, size_t cursor, 
 		const struct poptOption * opt,
 		/*@null@*/ const char *translation_domain)
 	/*@globals fileSystem @*/
 	/*@modifies *fp, fileSystem @*/
 {
-    int len = 4;
+    size_t len = 4;
     char shortStr[2] = { '\0', '\0' };
     const char * item = shortStr;
     const char * argDescrip = getArgDescrip(opt, translation_domain);
@@ -582,7 +583,8 @@ static int singleOptionUsage(FILE * fp, int cursor,
  * @param nitems	no. of ara/exec entries
  * @param translation_domain	translation domain
  */
-static int itemUsage(FILE * fp, int cursor, poptItem item, int nitems,
+static size_t itemUsage(FILE * fp, size_t cursor,
+		/*@null@*/ poptItem item, int nitems,
 		/*@null@*/ const char * translation_domain)
 	/*@globals fileSystem @*/
 	/*@modifies *fp, fileSystem @*/
@@ -625,7 +627,7 @@ typedef struct poptDone_s {
  * @param done		tables already processed
  * @return
  */
-static int singleTableUsage(poptContext con, FILE * fp, int cursor,
+static size_t singleTableUsage(poptContext con, FILE * fp, size_t cursor,
 		/*@null@*/ const struct poptOption * opt,
 		/*@null@*/ const char * translation_domain,
 		/*@null@*/ poptDone done)
@@ -708,14 +710,16 @@ static int showShortOptions(const struct poptOption * opt, FILE * fp,
 void poptPrintUsage(poptContext con, FILE * fp, /*@unused@*/ int flags)
 {
     poptDone done = memset(alloca(sizeof(*done)), 0, sizeof(*done));
-    int cursor;
+    size_t cursor;
 
     done->nopts = 0;
     done->maxopts = 64;
     cursor = done->maxopts * sizeof(*done->opts);
 /*@-boundswrite@*/
     done->opts = memset(alloca(cursor), 0, cursor);
+    /*@-keeptrans@*/
     done->opts[done->nopts++] = (const void *) con->options;
+    /*@=keeptrans@*/
 /*@=boundswrite@*/
 
     cursor = showHelpIntro(con, fp);
@@ -738,4 +742,3 @@ void poptSetOtherOptionHelp(poptContext con, const char * text)
     con->otherHelp = _free(con->otherHelp);
     con->otherHelp = xstrdup(text);
 }
-/*@=type@*/
diff --git a/poptint.h b/poptint.h
index 5d308ef..5e75712 100644
--- a/poptint.h
+++ b/poptint.h
@@ -87,7 +87,7 @@ struct poptContext_s {
 /*@only@*/
     const char * execPath;
     int execAbsolute;
-/*@only@*/
+/*@only@*/ /*@relnull@*/
     const char * otherHelp;
 /*@null@*/
     pbm_set * arg_strip;
diff --git a/system.h b/system.h
index 1d1b9da..685860c 100644
--- a/system.h
+++ b/system.h
@@ -36,11 +36,11 @@ extern __const __int32_t *__ctype_toupper;
 #endif
 
 #if defined(__LCLINT__)
-/*@-declundef -incondefs -redecl@*/ /* LCL: missing annotation */
-/*@only@*/ void * alloca (size_t __size)
+/*@-declundef -incondefs @*/ /* LCL: missing annotation */
+/*@only@*/ /*@out@*/ void * alloca (size_t __size)
 	/*@ensures MaxSet(result) == (__size - 1) @*/
 	/*@*/;
-/*@=declundef =incondefs =redecl@*/
+/*@=declundef =incondefs @*/
 #endif
 
 /* AIX requires this to be the first thing in the file.  */ 
@@ -72,5 +72,8 @@ char *alloca ();
 #define	xstrdup(_str)	strdup(_str)
 #endif  /* HAVE_MCHECK_H && defined(__GNUC__) */
 
+#if HAVE___SECURE_GETENV && !defined(__LCLINT__)
+#define	getenv(_s)	__secure_getenv(_s)
+#endif
 
 #include "popt.h"
-- 
Gitee


From 085fef50e53c9489544c78f802fd6f897d69dfbd Mon Sep 17 00:00:00 2001
From: Jeff Johnson <n3npq@mac.com>
Date: Mon, 16 Jun 2003 16:06:39 +0000
Subject: [PATCH 383/667] Update from PLD.

---
 po/pl.po | 127 +++++++++++++++++++++++++++++--------------------------
 1 file changed, 67 insertions(+), 60 deletions(-)

diff --git a/po/pl.po b/po/pl.po
index 56db8fe..69066ea 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -1,116 +1,123 @@
-# SOME DESCRIPTIVE TITLE.
+# Polish translation for popt.
 # Copyright (C) YEAR Free Software Foundation, Inc.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+# Jakub Bogusz <qboosh@pld.org.pl>, 2002.
 #
-#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: popt 1.6.3\n"
-"POT-Creation-Date: 2003-03-19 11:03-0500\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
+"Project-Id-Version: popt 1.9-20030515\n"
+"POT-Creation-Date: 2003-05-15 18:57+0200\n"
+"PO-Revision-Date: 2003-06-08 20:32+0200\n"
+"Last-Translator: Jakub Bogusz <qboosh@pld.org.pl>\n"
+"Language-Team: Polish <translation-team-pl@lists.sourceforge.net>\n"
 "MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=CHARSET\n"
-"Content-Transfer-Encoding: ENCODING\n"
+"Content-Type: text/plain; charset=iso-8859-2\n"
+"Content-Transfer-Encoding: 8bit\n"
 
-#: popt.c:34
+#: popt.c:35
 msgid "unknown errno"
-msgstr ""
+msgstr "nieznane errno"
 
-#: popt.c:940
+#: popt.c:944
 #, c-format
 msgid "option type (%d) not implemented in popt\n"
-msgstr ""
+msgstr "rodzaj opcji (%d) nie zaimplementowany w popt\n"
 
-#: popt.c:1160
+#: popt.c:1164
 msgid "missing argument"
-msgstr ""
+msgstr "brak parametru"
 
-#: popt.c:1162
+#: popt.c:1166
 msgid "unknown option"
-msgstr ""
+msgstr "nieznana opcja"
 
-#: popt.c:1164
+#: popt.c:1168
 msgid "mutually exclusive logical operations requested"
-msgstr ""
+msgstr "��danie wykluczaj�cych si� operacji"
 
-#: popt.c:1166
+#: popt.c:1170
 msgid "opt->arg should not be NULL"
-msgstr ""
+msgstr "opt->arg nie mo�e by� NULL"
 
-#: popt.c:1168
+#: popt.c:1172
 msgid "aliases nested too deeply"
-msgstr ""
+msgstr "zbyt du�e zag��bienie alias�w"
 
-#: popt.c:1170
+#: popt.c:1174
 msgid "error in parameter quoting"
-msgstr ""
+msgstr "b��d w cytowaniu parametru"
 
-#: popt.c:1172
+#: popt.c:1176
 msgid "invalid numeric value"
-msgstr ""
+msgstr "b��dna warto�� liczbowa"
 
-#: popt.c:1174
+#: popt.c:1178
 msgid "number too large or too small"
-msgstr ""
+msgstr "liczba zbyt du�a lub zbyt ma�a"
 
-#: popt.c:1176
+#: popt.c:1180
 msgid "memory allocation failed"
-msgstr ""
+msgstr "b��d alokacji pami�ci"
 
-#: popt.c:1180
+#: popt.c:1184
 msgid "unknown error"
-msgstr ""
+msgstr "nieznany b��d"
 
-#: popthelp.c:57
+#: popthelp.c:58
 msgid "Show this help message"
-msgstr ""
+msgstr "Poka� t� pomoc"
 
-#: popthelp.c:58
+#: popthelp.c:59
 msgid "Display brief usage message"
-msgstr ""
+msgstr "Wy�wietl skr�cony spos�b u�ycia"
 
-#: popthelp.c:61
+#: popthelp.c:62
 msgid "Display option defaults in message"
-msgstr ""
+msgstr "Wy�wietl domy�lne opcje w opisie"
 
-#: popthelp.c:103
+#: popthelp.c:104
 msgid "NONE"
-msgstr ""
+msgstr "BRAK"
 
-#: popthelp.c:105
+#: popthelp.c:106
 msgid "VAL"
-msgstr ""
+msgstr "WART"
 
-#: popthelp.c:109
+#: popthelp.c:110
 msgid "INT"
-msgstr ""
+msgstr "INT"
 
-#: popthelp.c:110
+#: popthelp.c:111
 msgid "LONG"
-msgstr ""
+msgstr "LONG"
 
-#: popthelp.c:111
+#: popthelp.c:112
 msgid "STRING"
-msgstr ""
+msgstr "�A�CUCH"
 
-#: popthelp.c:112
+#: popthelp.c:113
 msgid "FLOAT"
-msgstr ""
+msgstr "FLOAT"
 
-#: popthelp.c:113
+#: popthelp.c:114
 msgid "DOUBLE"
-msgstr ""
+msgstr "DOUBLE"
 
-#: popthelp.c:114
+#: popthelp.c:115
 msgid "ARG"
-msgstr ""
+msgstr "PARAM"
 
-#: popthelp.c:486
+#: popthelp.c:490
 msgid "Usage:"
-msgstr ""
+msgstr "Sk�adnia:"
 
-#: popthelp.c:510
+#: popthelp.c:514
 msgid "[OPTION...]"
-msgstr ""
+msgstr "[OPCJA...]"
+
+#: popt.h:158
+msgid "Options implemented via popt alias/exec:"
+msgstr "Opcje zaimplementowane poprzez popt alias/exec:"
+
+#: popt.h:168
+msgid "Help options:"
+msgstr "Opcje pomocy:"
-- 
Gitee


From b22a9eecc675e6d0a596e43a820072b82339bad9 Mon Sep 17 00:00:00 2001
From: Jeff Johnson <n3npq@mac.com>
Date: Tue, 24 Jun 2003 19:29:36 +0000
Subject: [PATCH 384/667] Sanity.

---
 po/fr.po | 75 ++++++++++++++++++++++++++++++--------------------------
 1 file changed, 40 insertions(+), 35 deletions(-)

diff --git a/po/fr.po b/po/fr.po
index 56db8fe..7e9994e 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -1,116 +1,121 @@
-# SOME DESCRIPTIVE TITLE.
-# Copyright (C) YEAR Free Software Foundation, Inc.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+# A French translation for rpm messages
+# Copyright (C) 2003 Free Software Foundation, Inc.
+# This file is distributed under the same license as the RPM package.
+# RPM French Translation <rpm-fr@livna.org>, 2003.
+# JBJ : THANX A LOT !!!
+#
+# N'hésitez pas à m'envoyez un courriel si vous avez des
+# suggestions/corrections.
 #
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: popt 1.6.3\n"
-"POT-Creation-Date: 2003-03-19 11:03-0500\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
+"Project-Id-Version: popt 1.8.1\n"
+"POT-Creation-Date: 2003-03-19 12:16-0500\n"
+"PO-Revision-Date: 2003-06-22 23:43+0200\n"
+"Last-Translator: RPM French Translation <rpm-fr@livna.org>\n"
+"Language-Team: RPM French Translation <rpm-fr@livna.org>\n"
 "MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=CHARSET\n"
-"Content-Transfer-Encoding: ENCODING\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8-bit\n"
 
 #: popt.c:34
 msgid "unknown errno"
-msgstr ""
+msgstr "errno inconnu"
 
 #: popt.c:940
 #, c-format
 msgid "option type (%d) not implemented in popt\n"
-msgstr ""
+msgstr "type(%d) d'option non implémenté dans popt\n"
 
 #: popt.c:1160
 msgid "missing argument"
-msgstr ""
+msgstr "argument manquant"
 
 #: popt.c:1162
 msgid "unknown option"
-msgstr ""
+msgstr "option iconnue"
 
 #: popt.c:1164
 msgid "mutually exclusive logical operations requested"
-msgstr ""
+msgstr "opérations logiques mutuellement exclusives requises"
 
 #: popt.c:1166
 msgid "opt->arg should not be NULL"
-msgstr ""
+msgstr "opt->arg ne devrait pas être NULL"
 
 #: popt.c:1168
 msgid "aliases nested too deeply"
-msgstr ""
+msgstr "les alias sont trop entremellés"
 
 #: popt.c:1170
 msgid "error in parameter quoting"
-msgstr ""
+msgstr "erreur en citant les paramètres"
 
 #: popt.c:1172
 msgid "invalid numeric value"
-msgstr ""
+msgstr "valeur numérique invalide"
 
 #: popt.c:1174
 msgid "number too large or too small"
-msgstr ""
+msgstr "nombre trop grand ou trop petit"
 
 #: popt.c:1176
 msgid "memory allocation failed"
-msgstr ""
+msgstr "échec de l'allocation de mémoire"
 
 #: popt.c:1180
 msgid "unknown error"
-msgstr ""
+msgstr "erreur inconnue"
 
 #: popthelp.c:57
 msgid "Show this help message"
-msgstr ""
+msgstr "Montre ce message d'aide"
 
 #: popthelp.c:58
 msgid "Display brief usage message"
-msgstr ""
+msgstr "Affiche un bref descriptif de l'utilisation"
 
 #: popthelp.c:61
 msgid "Display option defaults in message"
-msgstr ""
+msgstr "Afficher les valeurs par défaut des options dans le message"
 
 #: popthelp.c:103
 msgid "NONE"
-msgstr ""
+msgstr "RIEN"
 
 #: popthelp.c:105
 msgid "VAL"
-msgstr ""
+msgstr "VAL"
 
 #: popthelp.c:109
 msgid "INT"
-msgstr ""
+msgstr "ENTIER"
 
 #: popthelp.c:110
 msgid "LONG"
-msgstr ""
+msgstr "LONG"
 
 #: popthelp.c:111
 msgid "STRING"
-msgstr ""
+msgstr "CHAINE"
 
 #: popthelp.c:112
 msgid "FLOAT"
-msgstr ""
+msgstr "FLOTTANT"
 
 #: popthelp.c:113
 msgid "DOUBLE"
-msgstr ""
+msgstr "DOUBLE"
 
 #: popthelp.c:114
 msgid "ARG"
-msgstr ""
+msgstr "ARG"
 
 #: popthelp.c:486
 msgid "Usage:"
-msgstr ""
+msgstr "Utilisation:"
 
 #: popthelp.c:510
 msgid "[OPTION...]"
-msgstr ""
+msgstr "[OPTION...]"
-- 
Gitee


From 8f142395fe5737e180ef7eb881a96d5a14db4601 Mon Sep 17 00:00:00 2001
From: Jeff Johnson <n3npq@mac.com>
Date: Sun, 23 Nov 2003 19:52:37 +0000
Subject: [PATCH 385/667] Merge changes from rpm-4.2.1 development.

---
 .splintrc  |  3 ---
 popt.h     | 12 ++++++++----
 popthelp.c |  3 +++
 system.h   |  6 ++++--
 4 files changed, 15 insertions(+), 9 deletions(-)

diff --git a/.splintrc b/.splintrc
index 3f9490c..e027765 100644
--- a/.splintrc
+++ b/.splintrc
@@ -3,7 +3,6 @@
 #+partial
 +forcehints
 
-#-warnunixlib
 -warnposix
 
 +unixlib
@@ -17,13 +16,11 @@
 -bufferoverflowhigh
 
 # --- +partial artifacts
--fcnuse			# 7
 
 # --- not-yet at strict level
 -bitwisesigned		# 75
 -elseifcomplete		# 18
 -exportfcn		# 25
--globs			# 12 <ctype.h>
 -ifblock		# 202
 -namechecks		# 206
 -ptrarith		# 43
diff --git a/popt.h b/popt.h
index d55c0fe..7be75de 100644
--- a/popt.h
+++ b/popt.h
@@ -229,7 +229,8 @@ typedef void (*poptCallbackType) (poptContext con,
  * @param flags		or'd POPT_CONTEXT_* bits
  * @return		initialized popt context
  */
-/*@only@*/ /*@null@*/ poptContext poptGetContext(
+/*@only@*/ /*@null@*/
+poptContext poptGetContext(
 		/*@dependent@*/ /*@keep@*/ const char * name,
 		int argc, /*@dependent@*/ /*@keep@*/ const char ** argv,
 		/*@dependent@*/ /*@keep@*/ const struct poptOption * options,
@@ -258,7 +259,7 @@ int poptGetNextOpt(/*@null@*/poptContext con)
  * @param con		context
  * @return		option argument, NULL if no argument is available
  */
-/*@observer@*/ /*@null@*/
+/*@observer@*/ /*@null@*/ /*@unused@*/
 const char * poptGetOptArg(/*@null@*/poptContext con)
 	/*@modifies con @*/;
 
@@ -267,7 +268,7 @@ const char * poptGetOptArg(/*@null@*/poptContext con)
  * @param con		context
  * @return		next argument, NULL if no argument is available
  */
-/*@observer@*/ /*@null@*/
+/*@observer@*/ /*@null@*/ /*@unused@*/
 const char * poptGetArg(/*@null@*/poptContext con)
 	/*@modifies con @*/;
 
@@ -276,7 +277,7 @@ const char * poptGetArg(/*@null@*/poptContext con)
  * @param con		context
  * @return		current argument, NULL if no argument is available
  */
-/*@observer@*/ /*@null@*/
+/*@observer@*/ /*@null@*/ /*@unused@*/
 const char * poptPeekArg(/*@null@*/poptContext con)
 	/*@*/;
 
@@ -314,6 +315,7 @@ poptContext poptFreeContext( /*@only@*/ /*@null@*/ poptContext con)
  * @param argv		argument array, NULL terminated
  * @return		0 on success, POPT_ERROR_OPTSTOODEEP on failure
  */
+/*@unused@*/
 int poptStuffArgs(poptContext con, /*@keep@*/ const char ** argv)
 	/*@modifies con @*/;
 
@@ -357,6 +359,7 @@ int poptReadConfigFile(poptContext con, const char * fn)
  * @param useEnv	(unused)
  * @return		0 on success, POPT_ERROR_ERRNO on failure
  */
+/*@unused@*/
 int poptReadDefaultConfig(poptContext con, /*@unused@*/ int useEnv)
 	/*@globals fileSystem, internalState @*/
 	/*@modifies con->execs, con->numExecs,
@@ -460,6 +463,7 @@ const char *const poptStrerror(const int error)
  * @param path		single path to search for executables
  * @param allowAbsolute	absolute paths only?
  */
+/*@unused@*/
 void poptSetExecPath(poptContext con, const char * path, int allowAbsolute)
 	/*@modifies con @*/;
 
diff --git a/popthelp.c b/popthelp.c
index c7dd151..8d4ab6a 100644
--- a/popthelp.c
+++ b/popthelp.c
@@ -54,6 +54,9 @@ struct poptOption poptAliasOptions[] = {
 /*@-castfcnptr@*/
 /*@observer@*/ /*@unchecked@*/
 struct poptOption poptHelpOptions[] = {
+/*@-readonlytrans@*/
+  { NULL, '\0', POPT_ARG_INTL_DOMAIN, PACKAGE, 0, NULL, NULL},
+/*@=readonlytrans@*/
   { NULL, '\0', POPT_ARG_CALLBACK, (void *)&displayArgs, '\0', NULL, NULL },
   { "help", '?', 0, NULL, '?', N_("Show this help message"), NULL },
   { "usage", '\0', 0, NULL, 'u', N_("Display brief usage message"), NULL },
diff --git a/system.h b/system.h
index 685860c..c3d46cb 100644
--- a/system.h
+++ b/system.h
@@ -37,7 +37,8 @@ extern __const __int32_t *__ctype_toupper;
 
 #if defined(__LCLINT__)
 /*@-declundef -incondefs @*/ /* LCL: missing annotation */
-/*@only@*/ /*@out@*/ void * alloca (size_t __size)
+/*@only@*/ /*@out@*/
+void * alloca (size_t __size)
 	/*@ensures MaxSet(result) == (__size - 1) @*/
 	/*@*/;
 /*@=declundef =incondefs @*/
@@ -61,7 +62,8 @@ char *alloca ();
 #endif
 
 /*@-redecl -redef@*/
-/*@mayexit@*/ /*@only@*/ char * xstrdup (const char *str)
+/*@mayexit@*/ /*@only@*/ /*@unused@*/
+char * xstrdup (const char *str)
 	/*@*/;
 /*@=redecl =redef@*/
 
-- 
Gitee


From 090e8b28b490793b77435cc427747b1bf6821208 Mon Sep 17 00:00:00 2001
From: Jeff Johnson <n3npq@mac.com>
Date: Thu, 11 Dec 2003 19:10:57 +0000
Subject: [PATCH 386/667] - only internal Berkeley db from now on. - revive
 "make dist".

---
 po/cs.po           | 53 +++++++++++++++++++++++-----------------------
 po/da.po           | 53 +++++++++++++++++++++++-----------------------
 po/de.po           | 53 +++++++++++++++++++++++-----------------------
 po/es.po           | 53 +++++++++++++++++++++++-----------------------
 po/eu_ES.po        | 53 +++++++++++++++++++++++-----------------------
 po/fi.po           | 53 +++++++++++++++++++++++-----------------------
 po/fr.po           | 53 +++++++++++++++++++++++-----------------------
 po/gl.po           | 53 +++++++++++++++++++++++-----------------------
 po/hu.po           | 53 +++++++++++++++++++++++-----------------------
 po/id.po           | 53 +++++++++++++++++++++++-----------------------
 po/is.po           | 53 +++++++++++++++++++++++-----------------------
 po/it.po           | 53 +++++++++++++++++++++++-----------------------
 po/ja.po           | 53 +++++++++++++++++++++++-----------------------
 po/ko.po           | 53 +++++++++++++++++++++++-----------------------
 po/no.po           | 53 +++++++++++++++++++++++-----------------------
 po/pl.po           | 39 +++++++++++++++++-----------------
 po/popt.pot        | 53 +++++++++++++++++++++++-----------------------
 po/pt.po           | 53 +++++++++++++++++++++++-----------------------
 po/pt_BR.po        | 53 +++++++++++++++++++++++-----------------------
 po/ro.po           | 53 +++++++++++++++++++++++-----------------------
 po/ru.po           | 53 +++++++++++++++++++++++-----------------------
 po/sk.po           | 53 +++++++++++++++++++++++-----------------------
 po/sl.po           | 53 +++++++++++++++++++++++-----------------------
 po/sr.po           | 53 +++++++++++++++++++++++-----------------------
 po/sv.po           | 53 +++++++++++++++++++++++-----------------------
 po/tr.po           | 53 +++++++++++++++++++++++-----------------------
 po/uk.po           | 53 +++++++++++++++++++++++-----------------------
 po/wa.po           | 53 +++++++++++++++++++++++-----------------------
 po/zh.po           | 53 +++++++++++++++++++++++-----------------------
 po/zh_CN.GB2312.po | 53 +++++++++++++++++++++++-----------------------
 30 files changed, 802 insertions(+), 774 deletions(-)

diff --git a/po/cs.po b/po/cs.po
index 4147cbc..b5f4d1f 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -1,7 +1,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.3\n"
-"POT-Creation-Date: 2003-03-19 11:03-0500\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2003-12-07 15:21-0500\n"
 "PO-Revision-Date: 2001-07-24 00:03+0100\n"
 "Last-Translator: Milan Kerslager <kerslage@linux.cz>\n"
 "Language-Team: Czech <cs@li.org>\n"
@@ -9,103 +10,103 @@ msgstr ""
 "Content-Type: text/plain; charset=iso-8859-2\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: popt.c:34
+#: popt.c:35
 msgid "unknown errno"
 msgstr "nezn�m� ��slo chyby"
 
-#: popt.c:940
+#: popt.c:944
 #, c-format
 msgid "option type (%d) not implemented in popt\n"
 msgstr "volba (%d) nen� v popt implementov�na\n"
 
-#: popt.c:1160
+#: popt.c:1164
 msgid "missing argument"
 msgstr "chyb� argument"
 
-#: popt.c:1162
+#: popt.c:1166
 msgid "unknown option"
 msgstr "nezn�m� volba"
 
-#: popt.c:1164
+#: popt.c:1168
 msgid "mutually exclusive logical operations requested"
 msgstr "po�adov�ny vz�jemn� v�lu�n� logick� operace"
 
-#: popt.c:1166
+#: popt.c:1170
 msgid "opt->arg should not be NULL"
 msgstr "opt->arg nesm� b�t NULL"
 
-#: popt.c:1168
+#: popt.c:1172
 msgid "aliases nested too deeply"
 msgstr "aliasy vno�en� p��li� hluboko"
 
-#: popt.c:1170
+#: popt.c:1174
 msgid "error in parameter quoting"
 msgstr "chyba v quotov�n� parametr�"
 
-#: popt.c:1172
+#: popt.c:1176
 msgid "invalid numeric value"
 msgstr "chybn� numerick� hodnota"
 
-#: popt.c:1174
+#: popt.c:1178
 msgid "number too large or too small"
 msgstr "��slo je p��li� velk� nebo p��li� mal�"
 
-#: popt.c:1176
+#: popt.c:1180
 msgid "memory allocation failed"
 msgstr "selhala alokace pam�ti"
 
-#: popt.c:1180
+#: popt.c:1184
 msgid "unknown error"
 msgstr "nezn�m� chyba"
 
-#: popthelp.c:57
+#: popthelp.c:61
 msgid "Show this help message"
 msgstr "Vyp��e tuto n�pov�du"
 
-#: popthelp.c:58
+#: popthelp.c:62
 msgid "Display brief usage message"
 msgstr "Vyp��e kr�tk� n�vod k pou�it�"
 
-#: popthelp.c:61
+#: popthelp.c:65
 msgid "Display option defaults in message"
 msgstr "Zobrazit implicitn� volby ve zpr�v�"
 
-#: popthelp.c:103
+#: popthelp.c:107
 msgid "NONE"
 msgstr "NONE"
 
-#: popthelp.c:105
+#: popthelp.c:109
 msgid "VAL"
 msgstr "VAL"
 
-#: popthelp.c:109
+#: popthelp.c:113
 msgid "INT"
 msgstr "INT"
 
-#: popthelp.c:110
+#: popthelp.c:114
 msgid "LONG"
 msgstr "LONG"
 
-#: popthelp.c:111
+#: popthelp.c:115
 msgid "STRING"
 msgstr "STRING"
 
-#: popthelp.c:112
+#: popthelp.c:116
 msgid "FLOAT"
 msgstr "FLOAT"
 
-#: popthelp.c:113
+#: popthelp.c:117
 msgid "DOUBLE"
 msgstr "DOUBLE"
 
-#: popthelp.c:114
+#: popthelp.c:118
 msgid "ARG"
 msgstr "ARG"
 
-#: popthelp.c:486
+#: popthelp.c:493
 msgid "Usage:"
 msgstr "Pou�it�:"
 
-#: popthelp.c:510
+#: popthelp.c:517
 msgid "[OPTION...]"
 msgstr "[VOLBY...]"
diff --git a/po/da.po b/po/da.po
index 53f0a32..f0f9023 100644
--- a/po/da.po
+++ b/po/da.po
@@ -1,7 +1,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.3\n"
-"POT-Creation-Date: 2003-03-19 11:03-0500\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2003-12-07 15:21-0500\n"
 "PO-Revision-Date: Sun Jan 21 2001 04:30:32+0200\n"
 "Last-Translator: Martin Hansen <mah@k64.dk>\n"
 "Language-Team: Dansk <dansk@klid.dk>\n"
@@ -10,104 +11,104 @@ msgstr ""
 "Content-Transfer-Encoding: 8-bit\n"
 "X-Generator: KTranslator v 0.6.0\n"
 
-#: popt.c:34
+#: popt.c:35
 msgid "unknown errno"
 msgstr "ukendt fejlnr."
 
-#: popt.c:940
+#: popt.c:944
 #, c-format
 msgid "option type (%d) not implemented in popt\n"
 msgstr "tilvalgstype (%d) er ikke implementeret i popt\n"
 
-#: popt.c:1160
+#: popt.c:1164
 msgid "missing argument"
 msgstr "mangler argument"
 
-#: popt.c:1162
+#: popt.c:1166
 msgid "unknown option"
 msgstr "ukendt tilvalg"
 
-#: popt.c:1164
+#: popt.c:1168
 msgid "mutually exclusive logical operations requested"
 msgstr "de �nskede handlinger udelukker hinanden"
 
-#: popt.c:1166
+#: popt.c:1170
 msgid "opt->arg should not be NULL"
 msgstr ""
 
-#: popt.c:1168
+#: popt.c:1172
 msgid "aliases nested too deeply"
 msgstr "aliaser er for dybt indlejret"
 
-#: popt.c:1170
+#: popt.c:1174
 msgid "error in parameter quoting"
 msgstr "fejl i parameter citering"
 
-#: popt.c:1172
+#: popt.c:1176
 msgid "invalid numeric value"
 msgstr "ugyldig numerisk v�rdi"
 
-#: popt.c:1174
+#: popt.c:1178
 msgid "number too large or too small"
 msgstr "nummer for stort, eller for lille"
 
-#: popt.c:1176
+#: popt.c:1180
 msgid "memory allocation failed"
 msgstr ""
 
-#: popt.c:1180
+#: popt.c:1184
 msgid "unknown error"
 msgstr "ukendt fejl"
 
-#: popthelp.c:57
+#: popthelp.c:61
 msgid "Show this help message"
 msgstr "Vis denne hj�lpemeddelelse"
 
-#: popthelp.c:58
+#: popthelp.c:62
 msgid "Display brief usage message"
 msgstr "Vis kortfattet brugsanvisning"
 
-#: popthelp.c:61
+#: popthelp.c:65
 #, fuzzy
 msgid "Display option defaults in message"
 msgstr "Vis kortfattet brugsanvisning"
 
-#: popthelp.c:103
+#: popthelp.c:107
 msgid "NONE"
 msgstr "INGEN"
 
-#: popthelp.c:105
+#: popthelp.c:109
 msgid "VAL"
 msgstr "VAL"
 
-#: popthelp.c:109
+#: popthelp.c:113
 msgid "INT"
 msgstr "INT"
 
-#: popthelp.c:110
+#: popthelp.c:114
 msgid "LONG"
 msgstr "LONG"
 
-#: popthelp.c:111
+#: popthelp.c:115
 msgid "STRING"
 msgstr "STRING"
 
-#: popthelp.c:112
+#: popthelp.c:116
 msgid "FLOAT"
 msgstr "FLOAT"
 
-#: popthelp.c:113
+#: popthelp.c:117
 msgid "DOUBLE"
 msgstr "DOUBLE"
 
-#: popthelp.c:114
+#: popthelp.c:118
 msgid "ARG"
 msgstr "ARG"
 
-#: popthelp.c:486
+#: popthelp.c:493
 msgid "Usage:"
 msgstr "Brug:"
 
-#: popthelp.c:510
+#: popthelp.c:517
 msgid "[OPTION...]"
 msgstr "[TILVALG...]"
diff --git a/po/de.po b/po/de.po
index 56db8fe..7cce06e 100644
--- a/po/de.po
+++ b/po/de.po
@@ -6,7 +6,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.3\n"
-"POT-Creation-Date: 2003-03-19 11:03-0500\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2003-12-07 15:21-0500\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -14,103 +15,103 @@ msgstr ""
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: ENCODING\n"
 
-#: popt.c:34
+#: popt.c:35
 msgid "unknown errno"
 msgstr ""
 
-#: popt.c:940
+#: popt.c:944
 #, c-format
 msgid "option type (%d) not implemented in popt\n"
 msgstr ""
 
-#: popt.c:1160
+#: popt.c:1164
 msgid "missing argument"
 msgstr ""
 
-#: popt.c:1162
+#: popt.c:1166
 msgid "unknown option"
 msgstr ""
 
-#: popt.c:1164
+#: popt.c:1168
 msgid "mutually exclusive logical operations requested"
 msgstr ""
 
-#: popt.c:1166
+#: popt.c:1170
 msgid "opt->arg should not be NULL"
 msgstr ""
 
-#: popt.c:1168
+#: popt.c:1172
 msgid "aliases nested too deeply"
 msgstr ""
 
-#: popt.c:1170
+#: popt.c:1174
 msgid "error in parameter quoting"
 msgstr ""
 
-#: popt.c:1172
+#: popt.c:1176
 msgid "invalid numeric value"
 msgstr ""
 
-#: popt.c:1174
+#: popt.c:1178
 msgid "number too large or too small"
 msgstr ""
 
-#: popt.c:1176
+#: popt.c:1180
 msgid "memory allocation failed"
 msgstr ""
 
-#: popt.c:1180
+#: popt.c:1184
 msgid "unknown error"
 msgstr ""
 
-#: popthelp.c:57
+#: popthelp.c:61
 msgid "Show this help message"
 msgstr ""
 
-#: popthelp.c:58
+#: popthelp.c:62
 msgid "Display brief usage message"
 msgstr ""
 
-#: popthelp.c:61
+#: popthelp.c:65
 msgid "Display option defaults in message"
 msgstr ""
 
-#: popthelp.c:103
+#: popthelp.c:107
 msgid "NONE"
 msgstr ""
 
-#: popthelp.c:105
+#: popthelp.c:109
 msgid "VAL"
 msgstr ""
 
-#: popthelp.c:109
+#: popthelp.c:113
 msgid "INT"
 msgstr ""
 
-#: popthelp.c:110
+#: popthelp.c:114
 msgid "LONG"
 msgstr ""
 
-#: popthelp.c:111
+#: popthelp.c:115
 msgid "STRING"
 msgstr ""
 
-#: popthelp.c:112
+#: popthelp.c:116
 msgid "FLOAT"
 msgstr ""
 
-#: popthelp.c:113
+#: popthelp.c:117
 msgid "DOUBLE"
 msgstr ""
 
-#: popthelp.c:114
+#: popthelp.c:118
 msgid "ARG"
 msgstr ""
 
-#: popthelp.c:486
+#: popthelp.c:493
 msgid "Usage:"
 msgstr ""
 
-#: popthelp.c:510
+#: popthelp.c:517
 msgid "[OPTION...]"
 msgstr ""
diff --git a/po/es.po b/po/es.po
index e2c50b7..09c65c6 100644
--- a/po/es.po
+++ b/po/es.po
@@ -6,7 +6,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.3\n"
-"POT-Creation-Date: 2003-03-19 11:03-0500\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2003-12-07 15:21-0500\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Leandro Lucarella <luca@linuxmendoza.org.ar>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -14,104 +15,104 @@ msgstr ""
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: ENCODING\n"
 
-#: popt.c:34
+#: popt.c:35
 msgid "unknown errno"
 msgstr "errno desconocido"
 
-#: popt.c:940
+#: popt.c:944
 #, c-format
 msgid "option type (%d) not implemented in popt\n"
 msgstr "tipo de opcin (%d) no implementada en popt\n"
 
-#: popt.c:1160
+#: popt.c:1164
 msgid "missing argument"
 msgstr "falta argumento"
 
-#: popt.c:1162
+#: popt.c:1166
 msgid "unknown option"
 msgstr "opcin desconocida"
 
-#: popt.c:1164
+#: popt.c:1168
 msgid "mutually exclusive logical operations requested"
 msgstr "requerida operacin lgica mutuamente exclusiva"
 
-#: popt.c:1166
+#: popt.c:1170
 msgid "opt->arg should not be NULL"
 msgstr ""
 
-#: popt.c:1168
+#: popt.c:1172
 msgid "aliases nested too deeply"
 msgstr "alias anidados muy profundamente"
 
-#: popt.c:1170
+#: popt.c:1174
 msgid "error in parameter quoting"
 msgstr "error en cita de parmetros"
 
-#: popt.c:1172
+#: popt.c:1176
 msgid "invalid numeric value"
 msgstr "valor numrico invlido"
 
-#: popt.c:1174
+#: popt.c:1178
 msgid "number too large or too small"
 msgstr "nmero muy largo o muy pequeo"
 
-#: popt.c:1176
+#: popt.c:1180
 msgid "memory allocation failed"
 msgstr ""
 
-#: popt.c:1180
+#: popt.c:1184
 msgid "unknown error"
 msgstr "error desconocido"
 
-#: popthelp.c:57
+#: popthelp.c:61
 msgid "Show this help message"
 msgstr "Muestra este mensaje de ayuda"
 
-#: popthelp.c:58
+#: popthelp.c:62
 msgid "Display brief usage message"
 msgstr "Indica el modo de uso resumido"
 
-#: popthelp.c:61
+#: popthelp.c:65
 #, fuzzy
 msgid "Display option defaults in message"
 msgstr "Indica el modo de uso resumido"
 
-#: popthelp.c:103
+#: popthelp.c:107
 msgid "NONE"
 msgstr "NONE"
 
-#: popthelp.c:105
+#: popthelp.c:109
 msgid "VAL"
 msgstr "VAL"
 
-#: popthelp.c:109
+#: popthelp.c:113
 msgid "INT"
 msgstr "INT"
 
-#: popthelp.c:110
+#: popthelp.c:114
 msgid "LONG"
 msgstr "LONG"
 
-#: popthelp.c:111
+#: popthelp.c:115
 msgid "STRING"
 msgstr "STRING"
 
-#: popthelp.c:112
+#: popthelp.c:116
 msgid "FLOAT"
 msgstr "FLOAT"
 
-#: popthelp.c:113
+#: popthelp.c:117
 msgid "DOUBLE"
 msgstr "DOUBLE"
 
-#: popthelp.c:114
+#: popthelp.c:118
 msgid "ARG"
 msgstr "ARG"
 
-#: popthelp.c:486
+#: popthelp.c:493
 msgid "Usage:"
 msgstr "Modo de Uso:"
 
-#: popthelp.c:510
+#: popthelp.c:517
 msgid "[OPTION...]"
 msgstr "[OPCIN...]"
diff --git a/po/eu_ES.po b/po/eu_ES.po
index 56db8fe..7cce06e 100644
--- a/po/eu_ES.po
+++ b/po/eu_ES.po
@@ -6,7 +6,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.3\n"
-"POT-Creation-Date: 2003-03-19 11:03-0500\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2003-12-07 15:21-0500\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -14,103 +15,103 @@ msgstr ""
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: ENCODING\n"
 
-#: popt.c:34
+#: popt.c:35
 msgid "unknown errno"
 msgstr ""
 
-#: popt.c:940
+#: popt.c:944
 #, c-format
 msgid "option type (%d) not implemented in popt\n"
 msgstr ""
 
-#: popt.c:1160
+#: popt.c:1164
 msgid "missing argument"
 msgstr ""
 
-#: popt.c:1162
+#: popt.c:1166
 msgid "unknown option"
 msgstr ""
 
-#: popt.c:1164
+#: popt.c:1168
 msgid "mutually exclusive logical operations requested"
 msgstr ""
 
-#: popt.c:1166
+#: popt.c:1170
 msgid "opt->arg should not be NULL"
 msgstr ""
 
-#: popt.c:1168
+#: popt.c:1172
 msgid "aliases nested too deeply"
 msgstr ""
 
-#: popt.c:1170
+#: popt.c:1174
 msgid "error in parameter quoting"
 msgstr ""
 
-#: popt.c:1172
+#: popt.c:1176
 msgid "invalid numeric value"
 msgstr ""
 
-#: popt.c:1174
+#: popt.c:1178
 msgid "number too large or too small"
 msgstr ""
 
-#: popt.c:1176
+#: popt.c:1180
 msgid "memory allocation failed"
 msgstr ""
 
-#: popt.c:1180
+#: popt.c:1184
 msgid "unknown error"
 msgstr ""
 
-#: popthelp.c:57
+#: popthelp.c:61
 msgid "Show this help message"
 msgstr ""
 
-#: popthelp.c:58
+#: popthelp.c:62
 msgid "Display brief usage message"
 msgstr ""
 
-#: popthelp.c:61
+#: popthelp.c:65
 msgid "Display option defaults in message"
 msgstr ""
 
-#: popthelp.c:103
+#: popthelp.c:107
 msgid "NONE"
 msgstr ""
 
-#: popthelp.c:105
+#: popthelp.c:109
 msgid "VAL"
 msgstr ""
 
-#: popthelp.c:109
+#: popthelp.c:113
 msgid "INT"
 msgstr ""
 
-#: popthelp.c:110
+#: popthelp.c:114
 msgid "LONG"
 msgstr ""
 
-#: popthelp.c:111
+#: popthelp.c:115
 msgid "STRING"
 msgstr ""
 
-#: popthelp.c:112
+#: popthelp.c:116
 msgid "FLOAT"
 msgstr ""
 
-#: popthelp.c:113
+#: popthelp.c:117
 msgid "DOUBLE"
 msgstr ""
 
-#: popthelp.c:114
+#: popthelp.c:118
 msgid "ARG"
 msgstr ""
 
-#: popthelp.c:486
+#: popthelp.c:493
 msgid "Usage:"
 msgstr ""
 
-#: popthelp.c:510
+#: popthelp.c:517
 msgid "[OPTION...]"
 msgstr ""
diff --git a/po/fi.po b/po/fi.po
index 56db8fe..7cce06e 100644
--- a/po/fi.po
+++ b/po/fi.po
@@ -6,7 +6,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.3\n"
-"POT-Creation-Date: 2003-03-19 11:03-0500\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2003-12-07 15:21-0500\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -14,103 +15,103 @@ msgstr ""
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: ENCODING\n"
 
-#: popt.c:34
+#: popt.c:35
 msgid "unknown errno"
 msgstr ""
 
-#: popt.c:940
+#: popt.c:944
 #, c-format
 msgid "option type (%d) not implemented in popt\n"
 msgstr ""
 
-#: popt.c:1160
+#: popt.c:1164
 msgid "missing argument"
 msgstr ""
 
-#: popt.c:1162
+#: popt.c:1166
 msgid "unknown option"
 msgstr ""
 
-#: popt.c:1164
+#: popt.c:1168
 msgid "mutually exclusive logical operations requested"
 msgstr ""
 
-#: popt.c:1166
+#: popt.c:1170
 msgid "opt->arg should not be NULL"
 msgstr ""
 
-#: popt.c:1168
+#: popt.c:1172
 msgid "aliases nested too deeply"
 msgstr ""
 
-#: popt.c:1170
+#: popt.c:1174
 msgid "error in parameter quoting"
 msgstr ""
 
-#: popt.c:1172
+#: popt.c:1176
 msgid "invalid numeric value"
 msgstr ""
 
-#: popt.c:1174
+#: popt.c:1178
 msgid "number too large or too small"
 msgstr ""
 
-#: popt.c:1176
+#: popt.c:1180
 msgid "memory allocation failed"
 msgstr ""
 
-#: popt.c:1180
+#: popt.c:1184
 msgid "unknown error"
 msgstr ""
 
-#: popthelp.c:57
+#: popthelp.c:61
 msgid "Show this help message"
 msgstr ""
 
-#: popthelp.c:58
+#: popthelp.c:62
 msgid "Display brief usage message"
 msgstr ""
 
-#: popthelp.c:61
+#: popthelp.c:65
 msgid "Display option defaults in message"
 msgstr ""
 
-#: popthelp.c:103
+#: popthelp.c:107
 msgid "NONE"
 msgstr ""
 
-#: popthelp.c:105
+#: popthelp.c:109
 msgid "VAL"
 msgstr ""
 
-#: popthelp.c:109
+#: popthelp.c:113
 msgid "INT"
 msgstr ""
 
-#: popthelp.c:110
+#: popthelp.c:114
 msgid "LONG"
 msgstr ""
 
-#: popthelp.c:111
+#: popthelp.c:115
 msgid "STRING"
 msgstr ""
 
-#: popthelp.c:112
+#: popthelp.c:116
 msgid "FLOAT"
 msgstr ""
 
-#: popthelp.c:113
+#: popthelp.c:117
 msgid "DOUBLE"
 msgstr ""
 
-#: popthelp.c:114
+#: popthelp.c:118
 msgid "ARG"
 msgstr ""
 
-#: popthelp.c:486
+#: popthelp.c:493
 msgid "Usage:"
 msgstr ""
 
-#: popthelp.c:510
+#: popthelp.c:517
 msgid "[OPTION...]"
 msgstr ""
diff --git a/po/fr.po b/po/fr.po
index 7e9994e..21bcfe3 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -11,7 +11,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.8.1\n"
-"POT-Creation-Date: 2003-03-19 12:16-0500\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2003-12-07 15:21-0500\n"
 "PO-Revision-Date: 2003-06-22 23:43+0200\n"
 "Last-Translator: RPM French Translation <rpm-fr@livna.org>\n"
 "Language-Team: RPM French Translation <rpm-fr@livna.org>\n"
@@ -19,103 +20,103 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8-bit\n"
 
-#: popt.c:34
+#: popt.c:35
 msgid "unknown errno"
 msgstr "errno inconnu"
 
-#: popt.c:940
+#: popt.c:944
 #, c-format
 msgid "option type (%d) not implemented in popt\n"
 msgstr "type(%d) d'option non implémenté dans popt\n"
 
-#: popt.c:1160
+#: popt.c:1164
 msgid "missing argument"
 msgstr "argument manquant"
 
-#: popt.c:1162
+#: popt.c:1166
 msgid "unknown option"
 msgstr "option iconnue"
 
-#: popt.c:1164
+#: popt.c:1168
 msgid "mutually exclusive logical operations requested"
 msgstr "opérations logiques mutuellement exclusives requises"
 
-#: popt.c:1166
+#: popt.c:1170
 msgid "opt->arg should not be NULL"
 msgstr "opt->arg ne devrait pas être NULL"
 
-#: popt.c:1168
+#: popt.c:1172
 msgid "aliases nested too deeply"
 msgstr "les alias sont trop entremellés"
 
-#: popt.c:1170
+#: popt.c:1174
 msgid "error in parameter quoting"
 msgstr "erreur en citant les paramètres"
 
-#: popt.c:1172
+#: popt.c:1176
 msgid "invalid numeric value"
 msgstr "valeur numérique invalide"
 
-#: popt.c:1174
+#: popt.c:1178
 msgid "number too large or too small"
 msgstr "nombre trop grand ou trop petit"
 
-#: popt.c:1176
+#: popt.c:1180
 msgid "memory allocation failed"
 msgstr "échec de l'allocation de mémoire"
 
-#: popt.c:1180
+#: popt.c:1184
 msgid "unknown error"
 msgstr "erreur inconnue"
 
-#: popthelp.c:57
+#: popthelp.c:61
 msgid "Show this help message"
 msgstr "Montre ce message d'aide"
 
-#: popthelp.c:58
+#: popthelp.c:62
 msgid "Display brief usage message"
 msgstr "Affiche un bref descriptif de l'utilisation"
 
-#: popthelp.c:61
+#: popthelp.c:65
 msgid "Display option defaults in message"
 msgstr "Afficher les valeurs par défaut des options dans le message"
 
-#: popthelp.c:103
+#: popthelp.c:107
 msgid "NONE"
 msgstr "RIEN"
 
-#: popthelp.c:105
+#: popthelp.c:109
 msgid "VAL"
 msgstr "VAL"
 
-#: popthelp.c:109
+#: popthelp.c:113
 msgid "INT"
 msgstr "ENTIER"
 
-#: popthelp.c:110
+#: popthelp.c:114
 msgid "LONG"
 msgstr "LONG"
 
-#: popthelp.c:111
+#: popthelp.c:115
 msgid "STRING"
 msgstr "CHAINE"
 
-#: popthelp.c:112
+#: popthelp.c:116
 msgid "FLOAT"
 msgstr "FLOTTANT"
 
-#: popthelp.c:113
+#: popthelp.c:117
 msgid "DOUBLE"
 msgstr "DOUBLE"
 
-#: popthelp.c:114
+#: popthelp.c:118
 msgid "ARG"
 msgstr "ARG"
 
-#: popthelp.c:486
+#: popthelp.c:493
 msgid "Usage:"
 msgstr "Utilisation:"
 
-#: popthelp.c:510
+#: popthelp.c:517
 msgid "[OPTION...]"
 msgstr "[OPTION...]"
diff --git a/po/gl.po b/po/gl.po
index b052100..f9bbca2 100644
--- a/po/gl.po
+++ b/po/gl.po
@@ -1,7 +1,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.3\n"
-"POT-Creation-Date: 2003-03-19 11:03-0500\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2003-12-07 15:21-0500\n"
 "PO-Revision-Date: 2001-01-17 01:01+0100\n"
 "Last-Translator: Jes�s Bravo �lvarez <jba@pobox.com>\n"
 "Language-Team: Galician <trasno@ceu.fi.udc.es>\n"
@@ -9,104 +10,104 @@ msgstr ""
 "Content-Type: text/plain; charset=iso-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: popt.c:34
+#: popt.c:35
 msgid "unknown errno"
 msgstr "errno desco�ecido"
 
-#: popt.c:940
+#: popt.c:944
 #, c-format
 msgid "option type (%d) not implemented in popt\n"
 msgstr "tipo de opci�n (%d) non implementada en popt\n"
 
-#: popt.c:1160
+#: popt.c:1164
 msgid "missing argument"
 msgstr "falta un argumento"
 
-#: popt.c:1162
+#: popt.c:1166
 msgid "unknown option"
 msgstr "opci�n desco�ecida"
 
-#: popt.c:1164
+#: popt.c:1168
 msgid "mutually exclusive logical operations requested"
 msgstr "solicit�ronse operaci�ns l�xicas mutuamente exclu�ntes"
 
-#: popt.c:1166
+#: popt.c:1170
 msgid "opt->arg should not be NULL"
 msgstr ""
 
-#: popt.c:1168
+#: popt.c:1172
 msgid "aliases nested too deeply"
 msgstr "aliases ani�ados a un nivel demasiado profundo"
 
-#: popt.c:1170
+#: popt.c:1174
 msgid "error in parameter quoting"
 msgstr "erro nas comi�as do par�metro"
 
-#: popt.c:1172
+#: popt.c:1176
 msgid "invalid numeric value"
 msgstr "valor num�rico non v�lido"
 
-#: popt.c:1174
+#: popt.c:1178
 msgid "number too large or too small"
 msgstr "n�mero demasiado grande ou pequeno"
 
-#: popt.c:1176
+#: popt.c:1180
 msgid "memory allocation failed"
 msgstr ""
 
-#: popt.c:1180
+#: popt.c:1184
 msgid "unknown error"
 msgstr "erro desco�ecido"
 
-#: popthelp.c:57
+#: popthelp.c:61
 msgid "Show this help message"
 msgstr "Amosar esta mensaxe de axuda"
 
-#: popthelp.c:58
+#: popthelp.c:62
 msgid "Display brief usage message"
 msgstr "Amosar brevemente o xeito de utilizaci�n"
 
-#: popthelp.c:61
+#: popthelp.c:65
 #, fuzzy
 msgid "Display option defaults in message"
 msgstr "Amosar brevemente o xeito de utilizaci�n"
 
-#: popthelp.c:103
+#: popthelp.c:107
 msgid "NONE"
 msgstr "NADA"
 
-#: popthelp.c:105
+#: popthelp.c:109
 msgid "VAL"
 msgstr "VAL"
 
-#: popthelp.c:109
+#: popthelp.c:113
 msgid "INT"
 msgstr "INT"
 
-#: popthelp.c:110
+#: popthelp.c:114
 msgid "LONG"
 msgstr "LONG"
 
-#: popthelp.c:111
+#: popthelp.c:115
 msgid "STRING"
 msgstr "CADEA"
 
-#: popthelp.c:112
+#: popthelp.c:116
 msgid "FLOAT"
 msgstr "FLOAT"
 
-#: popthelp.c:113
+#: popthelp.c:117
 msgid "DOUBLE"
 msgstr "DOUBLE"
 
-#: popthelp.c:114
+#: popthelp.c:118
 msgid "ARG"
 msgstr "ARG"
 
-#: popthelp.c:486
+#: popthelp.c:493
 msgid "Usage:"
 msgstr "Uso:"
 
-#: popthelp.c:510
+#: popthelp.c:517
 msgid "[OPTION...]"
 msgstr "[OPCI�N...]"
diff --git a/po/hu.po b/po/hu.po
index b0930ff..08f15d5 100644
--- a/po/hu.po
+++ b/po/hu.po
@@ -1,7 +1,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.3\n"
-"POT-Creation-Date: 2003-03-19 11:03-0500\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2003-12-07 15:21-0500\n"
 "PO-Revision-Date: 2000-08-03 23:26+0200\n"
 "Last-Translator: L�szl� N�meth <nemeth@qwertynet.hu>\n"
 "Language-Team: Hungarian\n"
@@ -9,104 +10,104 @@ msgstr ""
 "Content-Type: text/plain; charset=ISO-8859-2\n"
 "Content-Transfer-Encoding: 8-bit\n"
 
-#: popt.c:34
+#: popt.c:35
 msgid "unknown errno"
 msgstr ""
 
-#: popt.c:940
+#: popt.c:944
 #, c-format
 msgid "option type (%d) not implemented in popt\n"
 msgstr ""
 
-#: popt.c:1160
+#: popt.c:1164
 msgid "missing argument"
 msgstr ""
 
-#: popt.c:1162
+#: popt.c:1166
 msgid "unknown option"
 msgstr ""
 
-#: popt.c:1164
+#: popt.c:1168
 msgid "mutually exclusive logical operations requested"
 msgstr ""
 
-#: popt.c:1166
+#: popt.c:1170
 msgid "opt->arg should not be NULL"
 msgstr ""
 
-#: popt.c:1168
+#: popt.c:1172
 msgid "aliases nested too deeply"
 msgstr ""
 
-#: popt.c:1170
+#: popt.c:1174
 msgid "error in parameter quoting"
 msgstr ""
 
-#: popt.c:1172
+#: popt.c:1176
 msgid "invalid numeric value"
 msgstr ""
 
-#: popt.c:1174
+#: popt.c:1178
 msgid "number too large or too small"
 msgstr ""
 
-#: popt.c:1176
+#: popt.c:1180
 msgid "memory allocation failed"
 msgstr ""
 
-#: popt.c:1180
+#: popt.c:1184
 msgid "unknown error"
 msgstr ""
 
-#: popthelp.c:57
+#: popthelp.c:61
 msgid "Show this help message"
 msgstr "E s�g� megjelen�t�se"
 
-#: popthelp.c:58
+#: popthelp.c:62
 msgid "Display brief usage message"
 msgstr "R�vid haszn�lati utas�t�s megjelen�t�se"
 
-#: popthelp.c:61
+#: popthelp.c:65
 #, fuzzy
 msgid "Display option defaults in message"
 msgstr "R�vid haszn�lati utas�t�s megjelen�t�se"
 
-#: popthelp.c:103
+#: popthelp.c:107
 msgid "NONE"
 msgstr ""
 
-#: popthelp.c:105
+#: popthelp.c:109
 msgid "VAL"
 msgstr ""
 
-#: popthelp.c:109
+#: popthelp.c:113
 msgid "INT"
 msgstr ""
 
-#: popthelp.c:110
+#: popthelp.c:114
 msgid "LONG"
 msgstr ""
 
-#: popthelp.c:111
+#: popthelp.c:115
 msgid "STRING"
 msgstr ""
 
-#: popthelp.c:112
+#: popthelp.c:116
 msgid "FLOAT"
 msgstr ""
 
-#: popthelp.c:113
+#: popthelp.c:117
 msgid "DOUBLE"
 msgstr ""
 
-#: popthelp.c:114
+#: popthelp.c:118
 msgid "ARG"
 msgstr ""
 
-#: popthelp.c:486
+#: popthelp.c:493
 msgid "Usage:"
 msgstr ""
 
-#: popthelp.c:510
+#: popthelp.c:517
 msgid "[OPTION...]"
 msgstr ""
diff --git a/po/id.po b/po/id.po
index 56db8fe..7cce06e 100644
--- a/po/id.po
+++ b/po/id.po
@@ -6,7 +6,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.3\n"
-"POT-Creation-Date: 2003-03-19 11:03-0500\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2003-12-07 15:21-0500\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -14,103 +15,103 @@ msgstr ""
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: ENCODING\n"
 
-#: popt.c:34
+#: popt.c:35
 msgid "unknown errno"
 msgstr ""
 
-#: popt.c:940
+#: popt.c:944
 #, c-format
 msgid "option type (%d) not implemented in popt\n"
 msgstr ""
 
-#: popt.c:1160
+#: popt.c:1164
 msgid "missing argument"
 msgstr ""
 
-#: popt.c:1162
+#: popt.c:1166
 msgid "unknown option"
 msgstr ""
 
-#: popt.c:1164
+#: popt.c:1168
 msgid "mutually exclusive logical operations requested"
 msgstr ""
 
-#: popt.c:1166
+#: popt.c:1170
 msgid "opt->arg should not be NULL"
 msgstr ""
 
-#: popt.c:1168
+#: popt.c:1172
 msgid "aliases nested too deeply"
 msgstr ""
 
-#: popt.c:1170
+#: popt.c:1174
 msgid "error in parameter quoting"
 msgstr ""
 
-#: popt.c:1172
+#: popt.c:1176
 msgid "invalid numeric value"
 msgstr ""
 
-#: popt.c:1174
+#: popt.c:1178
 msgid "number too large or too small"
 msgstr ""
 
-#: popt.c:1176
+#: popt.c:1180
 msgid "memory allocation failed"
 msgstr ""
 
-#: popt.c:1180
+#: popt.c:1184
 msgid "unknown error"
 msgstr ""
 
-#: popthelp.c:57
+#: popthelp.c:61
 msgid "Show this help message"
 msgstr ""
 
-#: popthelp.c:58
+#: popthelp.c:62
 msgid "Display brief usage message"
 msgstr ""
 
-#: popthelp.c:61
+#: popthelp.c:65
 msgid "Display option defaults in message"
 msgstr ""
 
-#: popthelp.c:103
+#: popthelp.c:107
 msgid "NONE"
 msgstr ""
 
-#: popthelp.c:105
+#: popthelp.c:109
 msgid "VAL"
 msgstr ""
 
-#: popthelp.c:109
+#: popthelp.c:113
 msgid "INT"
 msgstr ""
 
-#: popthelp.c:110
+#: popthelp.c:114
 msgid "LONG"
 msgstr ""
 
-#: popthelp.c:111
+#: popthelp.c:115
 msgid "STRING"
 msgstr ""
 
-#: popthelp.c:112
+#: popthelp.c:116
 msgid "FLOAT"
 msgstr ""
 
-#: popthelp.c:113
+#: popthelp.c:117
 msgid "DOUBLE"
 msgstr ""
 
-#: popthelp.c:114
+#: popthelp.c:118
 msgid "ARG"
 msgstr ""
 
-#: popthelp.c:486
+#: popthelp.c:493
 msgid "Usage:"
 msgstr ""
 
-#: popthelp.c:510
+#: popthelp.c:517
 msgid "[OPTION...]"
 msgstr ""
diff --git a/po/is.po b/po/is.po
index a8ecaaf..f68db48 100644
--- a/po/is.po
+++ b/po/is.po
@@ -1,7 +1,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.3\n"
-"POT-Creation-Date: 2003-03-19 11:03-0500\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2003-12-07 15:21-0500\n"
 "PO-Revision-Date: 2001-06-08 01:35+0000\n"
 "Last-Translator: Richard Allen <ra@hp.is>\n"
 "Language-Team: is <kde-isl@mmedia.is>\n"
@@ -9,103 +10,103 @@ msgstr ""
 "Content-Type: text/plain; charset=ISO-8859-1\n"
 "Content-Transfer-Encoding: 8-bit\n"
 
-#: popt.c:34
+#: popt.c:35
 msgid "unknown errno"
 msgstr "��ekkt villun�mer"
 
-#: popt.c:940
+#: popt.c:944
 #, c-format
 msgid "option type (%d) not implemented in popt\n"
 msgstr "rofager�in (%d) er ekki studd � popt\n"
 
-#: popt.c:1160
+#: popt.c:1164
 msgid "missing argument"
 msgstr "vantar vi�fang"
 
-#: popt.c:1162
+#: popt.c:1166
 msgid "unknown option"
 msgstr "��ekktur rofi"
 
-#: popt.c:1164
+#: popt.c:1168
 msgid "mutually exclusive logical operations requested"
 msgstr "be�i� um rofa sem sl�kkva hvor � ��rum"
 
-#: popt.c:1166
+#: popt.c:1170
 msgid "opt->arg should not be NULL"
 msgstr "opt->arg �tti ekki a� vera NULL"
 
-#: popt.c:1168
+#: popt.c:1172
 msgid "aliases nested too deeply"
 msgstr "al�asar of fl�knir"
 
-#: popt.c:1170
+#: popt.c:1174
 msgid "error in parameter quoting"
 msgstr "villa � vi�f�ngum (g�salappir og svo frv.)"
 
-#: popt.c:1172
+#: popt.c:1176
 msgid "invalid numeric value"
 msgstr "�gilt t�lulegt gildi"
 
-#: popt.c:1174
+#: popt.c:1178
 msgid "number too large or too small"
 msgstr "talan of st�r e�a sm�"
 
-#: popt.c:1176
+#: popt.c:1180
 msgid "memory allocation failed"
 msgstr "ekki t�kst a� taka fr� minni"
 
-#: popt.c:1180
+#: popt.c:1184
 msgid "unknown error"
 msgstr "��ekkt villa"
 
-#: popthelp.c:57
+#: popthelp.c:61
 msgid "Show this help message"
 msgstr "S�na �essa hj�lp"
 
-#: popthelp.c:58
+#: popthelp.c:62
 msgid "Display brief usage message"
 msgstr "S�na stuttar notkunarlei�beiningar"
 
-#: popthelp.c:61
+#: popthelp.c:65
 msgid "Display option defaults in message"
 msgstr "S�na sj�lfgefin gildi rofa � skilabo�um"
 
-#: popthelp.c:103
+#: popthelp.c:107
 msgid "NONE"
 msgstr "ENGIN"
 
-#: popthelp.c:105
+#: popthelp.c:109
 msgid "VAL"
 msgstr "VAL"
 
-#: popthelp.c:109
+#: popthelp.c:113
 msgid "INT"
 msgstr "INT"
 
-#: popthelp.c:110
+#: popthelp.c:114
 msgid "LONG"
 msgstr "LONG"
 
-#: popthelp.c:111
+#: popthelp.c:115
 msgid "STRING"
 msgstr "STRING"
 
-#: popthelp.c:112
+#: popthelp.c:116
 msgid "FLOAT"
 msgstr "FLOAT"
 
-#: popthelp.c:113
+#: popthelp.c:117
 msgid "DOUBLE"
 msgstr "DOUBLE"
 
-#: popthelp.c:114
+#: popthelp.c:118
 msgid "ARG"
 msgstr "ARG"
 
-#: popthelp.c:486
+#: popthelp.c:493
 msgid "Usage:"
 msgstr "Notkun:"
 
-#: popthelp.c:510
+#: popthelp.c:517
 msgid "[OPTION...]"
 msgstr "[ROFI...]"
diff --git a/po/it.po b/po/it.po
index 56db8fe..7cce06e 100644
--- a/po/it.po
+++ b/po/it.po
@@ -6,7 +6,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.3\n"
-"POT-Creation-Date: 2003-03-19 11:03-0500\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2003-12-07 15:21-0500\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -14,103 +15,103 @@ msgstr ""
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: ENCODING\n"
 
-#: popt.c:34
+#: popt.c:35
 msgid "unknown errno"
 msgstr ""
 
-#: popt.c:940
+#: popt.c:944
 #, c-format
 msgid "option type (%d) not implemented in popt\n"
 msgstr ""
 
-#: popt.c:1160
+#: popt.c:1164
 msgid "missing argument"
 msgstr ""
 
-#: popt.c:1162
+#: popt.c:1166
 msgid "unknown option"
 msgstr ""
 
-#: popt.c:1164
+#: popt.c:1168
 msgid "mutually exclusive logical operations requested"
 msgstr ""
 
-#: popt.c:1166
+#: popt.c:1170
 msgid "opt->arg should not be NULL"
 msgstr ""
 
-#: popt.c:1168
+#: popt.c:1172
 msgid "aliases nested too deeply"
 msgstr ""
 
-#: popt.c:1170
+#: popt.c:1174
 msgid "error in parameter quoting"
 msgstr ""
 
-#: popt.c:1172
+#: popt.c:1176
 msgid "invalid numeric value"
 msgstr ""
 
-#: popt.c:1174
+#: popt.c:1178
 msgid "number too large or too small"
 msgstr ""
 
-#: popt.c:1176
+#: popt.c:1180
 msgid "memory allocation failed"
 msgstr ""
 
-#: popt.c:1180
+#: popt.c:1184
 msgid "unknown error"
 msgstr ""
 
-#: popthelp.c:57
+#: popthelp.c:61
 msgid "Show this help message"
 msgstr ""
 
-#: popthelp.c:58
+#: popthelp.c:62
 msgid "Display brief usage message"
 msgstr ""
 
-#: popthelp.c:61
+#: popthelp.c:65
 msgid "Display option defaults in message"
 msgstr ""
 
-#: popthelp.c:103
+#: popthelp.c:107
 msgid "NONE"
 msgstr ""
 
-#: popthelp.c:105
+#: popthelp.c:109
 msgid "VAL"
 msgstr ""
 
-#: popthelp.c:109
+#: popthelp.c:113
 msgid "INT"
 msgstr ""
 
-#: popthelp.c:110
+#: popthelp.c:114
 msgid "LONG"
 msgstr ""
 
-#: popthelp.c:111
+#: popthelp.c:115
 msgid "STRING"
 msgstr ""
 
-#: popthelp.c:112
+#: popthelp.c:116
 msgid "FLOAT"
 msgstr ""
 
-#: popthelp.c:113
+#: popthelp.c:117
 msgid "DOUBLE"
 msgstr ""
 
-#: popthelp.c:114
+#: popthelp.c:118
 msgid "ARG"
 msgstr ""
 
-#: popthelp.c:486
+#: popthelp.c:493
 msgid "Usage:"
 msgstr ""
 
-#: popthelp.c:510
+#: popthelp.c:517
 msgid "[OPTION...]"
 msgstr ""
diff --git a/po/ja.po b/po/ja.po
index 56db8fe..7cce06e 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -6,7 +6,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.3\n"
-"POT-Creation-Date: 2003-03-19 11:03-0500\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2003-12-07 15:21-0500\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -14,103 +15,103 @@ msgstr ""
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: ENCODING\n"
 
-#: popt.c:34
+#: popt.c:35
 msgid "unknown errno"
 msgstr ""
 
-#: popt.c:940
+#: popt.c:944
 #, c-format
 msgid "option type (%d) not implemented in popt\n"
 msgstr ""
 
-#: popt.c:1160
+#: popt.c:1164
 msgid "missing argument"
 msgstr ""
 
-#: popt.c:1162
+#: popt.c:1166
 msgid "unknown option"
 msgstr ""
 
-#: popt.c:1164
+#: popt.c:1168
 msgid "mutually exclusive logical operations requested"
 msgstr ""
 
-#: popt.c:1166
+#: popt.c:1170
 msgid "opt->arg should not be NULL"
 msgstr ""
 
-#: popt.c:1168
+#: popt.c:1172
 msgid "aliases nested too deeply"
 msgstr ""
 
-#: popt.c:1170
+#: popt.c:1174
 msgid "error in parameter quoting"
 msgstr ""
 
-#: popt.c:1172
+#: popt.c:1176
 msgid "invalid numeric value"
 msgstr ""
 
-#: popt.c:1174
+#: popt.c:1178
 msgid "number too large or too small"
 msgstr ""
 
-#: popt.c:1176
+#: popt.c:1180
 msgid "memory allocation failed"
 msgstr ""
 
-#: popt.c:1180
+#: popt.c:1184
 msgid "unknown error"
 msgstr ""
 
-#: popthelp.c:57
+#: popthelp.c:61
 msgid "Show this help message"
 msgstr ""
 
-#: popthelp.c:58
+#: popthelp.c:62
 msgid "Display brief usage message"
 msgstr ""
 
-#: popthelp.c:61
+#: popthelp.c:65
 msgid "Display option defaults in message"
 msgstr ""
 
-#: popthelp.c:103
+#: popthelp.c:107
 msgid "NONE"
 msgstr ""
 
-#: popthelp.c:105
+#: popthelp.c:109
 msgid "VAL"
 msgstr ""
 
-#: popthelp.c:109
+#: popthelp.c:113
 msgid "INT"
 msgstr ""
 
-#: popthelp.c:110
+#: popthelp.c:114
 msgid "LONG"
 msgstr ""
 
-#: popthelp.c:111
+#: popthelp.c:115
 msgid "STRING"
 msgstr ""
 
-#: popthelp.c:112
+#: popthelp.c:116
 msgid "FLOAT"
 msgstr ""
 
-#: popthelp.c:113
+#: popthelp.c:117
 msgid "DOUBLE"
 msgstr ""
 
-#: popthelp.c:114
+#: popthelp.c:118
 msgid "ARG"
 msgstr ""
 
-#: popthelp.c:486
+#: popthelp.c:493
 msgid "Usage:"
 msgstr ""
 
-#: popthelp.c:510
+#: popthelp.c:517
 msgid "[OPTION...]"
 msgstr ""
diff --git a/po/ko.po b/po/ko.po
index 3fb4ded..c3b64a2 100644
--- a/po/ko.po
+++ b/po/ko.po
@@ -1,7 +1,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6\n"
-"POT-Creation-Date: 2003-03-19 11:03-0500\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2003-12-07 15:21-0500\n"
 "PO-Revision-Date: 2001-09-06 20:06+0900\n"
 "Last-Translator: Jong-Hoon Ryu <redhat4u@netian.com>\n"
 "Language-Team: GNU Translation project <ko@li.org>\n"
@@ -9,103 +10,103 @@ msgstr ""
 "Content-Type: text/plain; charset=EUC-KR\n"
 "Content-Transfer-Encoding: 8-bit\n"
 
-#: popt.c:34
+#: popt.c:35
 msgid "unknown errno"
 msgstr "�� �� ���� �����ڵ�(errno) �Դϴ�"
 
-#: popt.c:940
+#: popt.c:944
 #, c-format
 msgid "option type (%d) not implemented in popt\n"
 msgstr "�ɼ� ���� (%d)�� popt���� ����� �� �����ϴ�\n"
 
-#: popt.c:1160
+#: popt.c:1164
 msgid "missing argument"
 msgstr "�μ��� �������� �ʾҽ��ϴ�"
 
-#: popt.c:1162
+#: popt.c:1166
 msgid "unknown option"
 msgstr "�� �� ���� �ɼ��Դϴ�"
 
-#: popt.c:1164
+#: popt.c:1168
 msgid "mutually exclusive logical operations requested"
 msgstr "���ʿ� ��Ÿ�� ���� ������ �����Ǿ����ϴ�"
 
-#: popt.c:1166
+#: popt.c:1170
 msgid "opt->arg should not be NULL"
 msgstr "�ɼ�->�μ��� NULL�� �Ǿ�� �ȵ˴ϴ�"
 
-#: popt.c:1168
+#: popt.c:1172
 msgid "aliases nested too deeply"
 msgstr "��Ī(alias)�� �����ϰ� �����Ǿ����ϴ�"
 
-#: popt.c:1170
+#: popt.c:1174
 msgid "error in parameter quoting"
 msgstr "�Ű������� ������ �ֽ��ϴ�"
 
-#: popt.c:1172
+#: popt.c:1176
 msgid "invalid numeric value"
 msgstr "�߸��� ��ġ ���Դϴ�"
 
-#: popt.c:1174
+#: popt.c:1178
 msgid "number too large or too small"
 msgstr "���ڰ� �ʹ� ũ�ų� �ʹ� �����ϴ�"
 
-#: popt.c:1176
+#: popt.c:1180
 msgid "memory allocation failed"
 msgstr "�޸� �Ҵ翡 �����߽��ϴ�"
 
-#: popt.c:1180
+#: popt.c:1184
 msgid "unknown error"
 msgstr "�� �� ���� �����Դϴ�"
 
-#: popthelp.c:57
+#: popthelp.c:61
 msgid "Show this help message"
 msgstr "�� ������ �����ݴϴ�"
 
-#: popthelp.c:58
+#: popthelp.c:62
 msgid "Display brief usage message"
 msgstr "������ ������ �����ݴϴ�"
 
-#: popthelp.c:61
+#: popthelp.c:65
 msgid "Display option defaults in message"
 msgstr "�⺻���� �ɼ��� �����ݴϴ�"
 
-#: popthelp.c:103
+#: popthelp.c:107
 msgid "NONE"
 msgstr "����(NONE)"
 
-#: popthelp.c:105
+#: popthelp.c:109
 msgid "VAL"
 msgstr "��(VAL)"
 
-#: popthelp.c:109
+#: popthelp.c:113
 msgid "INT"
 msgstr "����(INT)"
 
-#: popthelp.c:110
+#: popthelp.c:114
 msgid "LONG"
 msgstr "����(LONG)"
 
-#: popthelp.c:111
+#: popthelp.c:115
 msgid "STRING"
 msgstr "���ڿ�(STRING)"
 
-#: popthelp.c:112
+#: popthelp.c:116
 msgid "FLOAT"
 msgstr "�Ҽ�(FLOAT)"
 
-#: popthelp.c:113
+#: popthelp.c:117
 msgid "DOUBLE"
 msgstr "�Ҽ�(DOUBLE)"
 
-#: popthelp.c:114
+#: popthelp.c:118
 msgid "ARG"
 msgstr "�μ�(ARG)"
 
-#: popthelp.c:486
+#: popthelp.c:493
 msgid "Usage:"
 msgstr "����:"
 
-#: popthelp.c:510
+#: popthelp.c:517
 msgid "[OPTION...]"
 msgstr "[�ɼ�...]"
diff --git a/po/no.po b/po/no.po
index bbaa51c..4773d64 100644
--- a/po/no.po
+++ b/po/no.po
@@ -1,7 +1,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.3\n"
-"POT-Creation-Date: 2003-03-19 11:03-0500\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2003-12-07 15:21-0500\n"
 "PO-Revision-Date: 2001-06-27 11:05+0200\n"
 "Last-Translator: Kjartan Maraas <kmaraas@online.no>\n"
 "Language-Team: Norwegian <no@li.org>\n"
@@ -9,103 +10,103 @@ msgstr ""
 "Content-Type: text/plain; charset=iso-8859-1\n"
 "Content-Transfer-Encoding: 8-bit\n"
 
-#: popt.c:34
+#: popt.c:35
 msgid "unknown errno"
 msgstr "ukjent errno"
 
-#: popt.c:940
+#: popt.c:944
 #, c-format
 msgid "option type (%d) not implemented in popt\n"
 msgstr "flaggtype (%d) ikke implementert i popt\n"
 
-#: popt.c:1160
+#: popt.c:1164
 msgid "missing argument"
 msgstr "manglende argument"
 
-#: popt.c:1162
+#: popt.c:1166
 msgid "unknown option"
 msgstr "ukjent flagg"
 
-#: popt.c:1164
+#: popt.c:1168
 msgid "mutually exclusive logical operations requested"
 msgstr "gjensidig eksluderende logiske operasjoner forespurt"
 
-#: popt.c:1166
+#: popt.c:1170
 msgid "opt->arg should not be NULL"
 msgstr "opt->arg m� ikke v�re NULL"
 
-#: popt.c:1168
+#: popt.c:1172
 msgid "aliases nested too deeply"
 msgstr "aliaser med for dype l�kker"
 
-#: popt.c:1170
+#: popt.c:1174
 msgid "error in parameter quoting"
 msgstr "feil i parametersitering"
 
-#: popt.c:1172
+#: popt.c:1176
 msgid "invalid numeric value"
 msgstr "ugyldig numerisk verdi"
 
-#: popt.c:1174
+#: popt.c:1178
 msgid "number too large or too small"
 msgstr "tallet er for stort eller lite"
 
-#: popt.c:1176
+#: popt.c:1180
 msgid "memory allocation failed"
 msgstr "minneallokering feilet"
 
-#: popt.c:1180
+#: popt.c:1184
 msgid "unknown error"
 msgstr "ukjent feil"
 
-#: popthelp.c:57
+#: popthelp.c:61
 msgid "Show this help message"
 msgstr "Vis denne hjelpmeldingen"
 
-#: popthelp.c:58
+#: popthelp.c:62
 msgid "Display brief usage message"
 msgstr "Vis kort bruksmelding"
 
-#: popthelp.c:61
+#: popthelp.c:65
 msgid "Display option defaults in message"
 msgstr "Vis forvalgte flagg i melding"
 
-#: popthelp.c:103
+#: popthelp.c:107
 msgid "NONE"
 msgstr "INGEN"
 
-#: popthelp.c:105
+#: popthelp.c:109
 msgid "VAL"
 msgstr "VERDI"
 
-#: popthelp.c:109
+#: popthelp.c:113
 msgid "INT"
 msgstr "HELTALL"
 
-#: popthelp.c:110
+#: popthelp.c:114
 msgid "LONG"
 msgstr "LONG"
 
-#: popthelp.c:111
+#: popthelp.c:115
 msgid "STRING"
 msgstr "STRENG"
 
-#: popthelp.c:112
+#: popthelp.c:116
 msgid "FLOAT"
 msgstr "FLYTTALL"
 
-#: popthelp.c:113
+#: popthelp.c:117
 msgid "DOUBLE"
 msgstr "DOUBLE"
 
-#: popthelp.c:114
+#: popthelp.c:118
 msgid "ARG"
 msgstr "ARG"
 
-#: popthelp.c:486
+#: popthelp.c:493
 msgid "Usage:"
 msgstr "Bruk:"
 
-#: popthelp.c:510
+#: popthelp.c:517
 msgid "[OPTION...]"
 msgstr "[FLAGG...]"
diff --git a/po/pl.po b/po/pl.po
index 69066ea..ef4ca4e 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -5,7 +5,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.9-20030515\n"
-"POT-Creation-Date: 2003-05-15 18:57+0200\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2003-12-07 15:21-0500\n"
 "PO-Revision-Date: 2003-06-08 20:32+0200\n"
 "Last-Translator: Jakub Bogusz <qboosh@pld.org.pl>\n"
 "Language-Team: Polish <translation-team-pl@lists.sourceforge.net>\n"
@@ -62,62 +63,60 @@ msgstr "b
 msgid "unknown error"
 msgstr "nieznany b��d"
 
-#: popthelp.c:58
+#: popthelp.c:61
 msgid "Show this help message"
 msgstr "Poka� t� pomoc"
 
-#: popthelp.c:59
+#: popthelp.c:62
 msgid "Display brief usage message"
 msgstr "Wy�wietl skr�cony spos�b u�ycia"
 
-#: popthelp.c:62
+#: popthelp.c:65
 msgid "Display option defaults in message"
 msgstr "Wy�wietl domy�lne opcje w opisie"
 
-#: popthelp.c:104
+#: popthelp.c:107
 msgid "NONE"
 msgstr "BRAK"
 
-#: popthelp.c:106
+#: popthelp.c:109
 msgid "VAL"
 msgstr "WART"
 
-#: popthelp.c:110
+#: popthelp.c:113
 msgid "INT"
 msgstr "INT"
 
-#: popthelp.c:111
+#: popthelp.c:114
 msgid "LONG"
 msgstr "LONG"
 
-#: popthelp.c:112
+#: popthelp.c:115
 msgid "STRING"
 msgstr "�A�CUCH"
 
-#: popthelp.c:113
+#: popthelp.c:116
 msgid "FLOAT"
 msgstr "FLOAT"
 
-#: popthelp.c:114
+#: popthelp.c:117
 msgid "DOUBLE"
 msgstr "DOUBLE"
 
-#: popthelp.c:115
+#: popthelp.c:118
 msgid "ARG"
 msgstr "PARAM"
 
-#: popthelp.c:490
+#: popthelp.c:493
 msgid "Usage:"
 msgstr "Sk�adnia:"
 
-#: popthelp.c:514
+#: popthelp.c:517
 msgid "[OPTION...]"
 msgstr "[OPCJA...]"
 
-#: popt.h:158
-msgid "Options implemented via popt alias/exec:"
-msgstr "Opcje zaimplementowane poprzez popt alias/exec:"
+#~ msgid "Options implemented via popt alias/exec:"
+#~ msgstr "Opcje zaimplementowane poprzez popt alias/exec:"
 
-#: popt.h:168
-msgid "Help options:"
-msgstr "Opcje pomocy:"
+#~ msgid "Help options:"
+#~ msgstr "Opcje pomocy:"
diff --git a/po/popt.pot b/po/popt.pot
index 7adb48c..176e818 100644
--- a/po/popt.pot
+++ b/po/popt.pot
@@ -7,7 +7,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2003-03-19 11:03-0500\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2003-12-07 15:21-0500\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -15,103 +16,103 @@ msgstr ""
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: popt.c:34
+#: popt.c:35
 msgid "unknown errno"
 msgstr ""
 
-#: popt.c:940
+#: popt.c:944
 #, c-format
 msgid "option type (%d) not implemented in popt\n"
 msgstr ""
 
-#: popt.c:1160
+#: popt.c:1164
 msgid "missing argument"
 msgstr ""
 
-#: popt.c:1162
+#: popt.c:1166
 msgid "unknown option"
 msgstr ""
 
-#: popt.c:1164
+#: popt.c:1168
 msgid "mutually exclusive logical operations requested"
 msgstr ""
 
-#: popt.c:1166
+#: popt.c:1170
 msgid "opt->arg should not be NULL"
 msgstr ""
 
-#: popt.c:1168
+#: popt.c:1172
 msgid "aliases nested too deeply"
 msgstr ""
 
-#: popt.c:1170
+#: popt.c:1174
 msgid "error in parameter quoting"
 msgstr ""
 
-#: popt.c:1172
+#: popt.c:1176
 msgid "invalid numeric value"
 msgstr ""
 
-#: popt.c:1174
+#: popt.c:1178
 msgid "number too large or too small"
 msgstr ""
 
-#: popt.c:1176
+#: popt.c:1180
 msgid "memory allocation failed"
 msgstr ""
 
-#: popt.c:1180
+#: popt.c:1184
 msgid "unknown error"
 msgstr ""
 
-#: popthelp.c:57
+#: popthelp.c:61
 msgid "Show this help message"
 msgstr ""
 
-#: popthelp.c:58
+#: popthelp.c:62
 msgid "Display brief usage message"
 msgstr ""
 
-#: popthelp.c:61
+#: popthelp.c:65
 msgid "Display option defaults in message"
 msgstr ""
 
-#: popthelp.c:103
+#: popthelp.c:107
 msgid "NONE"
 msgstr ""
 
-#: popthelp.c:105
+#: popthelp.c:109
 msgid "VAL"
 msgstr ""
 
-#: popthelp.c:109
+#: popthelp.c:113
 msgid "INT"
 msgstr ""
 
-#: popthelp.c:110
+#: popthelp.c:114
 msgid "LONG"
 msgstr ""
 
-#: popthelp.c:111
+#: popthelp.c:115
 msgid "STRING"
 msgstr ""
 
-#: popthelp.c:112
+#: popthelp.c:116
 msgid "FLOAT"
 msgstr ""
 
-#: popthelp.c:113
+#: popthelp.c:117
 msgid "DOUBLE"
 msgstr ""
 
-#: popthelp.c:114
+#: popthelp.c:118
 msgid "ARG"
 msgstr ""
 
-#: popthelp.c:486
+#: popthelp.c:493
 msgid "Usage:"
 msgstr ""
 
-#: popthelp.c:510
+#: popthelp.c:517
 msgid "[OPTION...]"
 msgstr ""
diff --git a/po/pt.po b/po/pt.po
index e3d85e2..458e648 100644
--- a/po/pt.po
+++ b/po/pt.po
@@ -1,7 +1,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt\n"
-"POT-Creation-Date: 2003-03-19 11:03-0500\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2003-12-07 15:21-0500\n"
 "PO-Revision-Date: 2002-02-13 18:32+0000\n"
 "Last-Translator: Pedro Morais <morais@kde.org>\n"
 "Language-Team: pt <morais@kde.org>\n"
@@ -9,103 +10,103 @@ msgstr ""
 "Content-Type: text/plain; charset=iso-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: popt.c:34
+#: popt.c:35
 msgid "unknown errno"
 msgstr "errno desconhecido"
 
-#: popt.c:940
+#: popt.c:944
 #, c-format
 msgid "option type (%d) not implemented in popt\n"
 msgstr "tipo de op��o (%d) n�o implementado no popt\n"
 
-#: popt.c:1160
+#: popt.c:1164
 msgid "missing argument"
 msgstr "falta um argumento"
 
-#: popt.c:1162
+#: popt.c:1166
 msgid "unknown option"
 msgstr "op��o desconhecida"
 
-#: popt.c:1164
+#: popt.c:1168
 msgid "mutually exclusive logical operations requested"
 msgstr "foram pedidas opera��es l�gicas mutuamente exclusivas"
 
-#: popt.c:1166
+#: popt.c:1170
 msgid "opt->arg should not be NULL"
 msgstr "opt->arg n�o deve ser NULL"
 
-#: popt.c:1168
+#: popt.c:1172
 msgid "aliases nested too deeply"
 msgstr "'aliases' demasiado aninhados"
 
-#: popt.c:1170
+#: popt.c:1174
 msgid "error in parameter quoting"
 msgstr "erros no 'quoting' de par�metros"
 
-#: popt.c:1172
+#: popt.c:1176
 msgid "invalid numeric value"
 msgstr "valor n�merico inv�lido"
 
-#: popt.c:1174
+#: popt.c:1178
 msgid "number too large or too small"
 msgstr "n�mero demasiado grando ou pequeno"
 
-#: popt.c:1176
+#: popt.c:1180
 msgid "memory allocation failed"
 msgstr "aloca��o de mem�ria falhou"
 
-#: popt.c:1180
+#: popt.c:1184
 msgid "unknown error"
 msgstr "erro desconhecido"
 
-#: popthelp.c:57
+#: popthelp.c:61
 msgid "Show this help message"
 msgstr "Mostrar esta mensagem de ajuda"
 
-#: popthelp.c:58
+#: popthelp.c:62
 msgid "Display brief usage message"
 msgstr "Mostrar uma mensagem de utiliza��o sucinta"
 
-#: popthelp.c:61
+#: popthelp.c:65
 msgid "Display option defaults in message"
 msgstr "Mostrar valor por omiss�o das op��es na mensagem"
 
-#: popthelp.c:103
+#: popthelp.c:107
 msgid "NONE"
 msgstr "NONE"
 
-#: popthelp.c:105
+#: popthelp.c:109
 msgid "VAL"
 msgstr "VAL"
 
-#: popthelp.c:109
+#: popthelp.c:113
 msgid "INT"
 msgstr "INT"
 
-#: popthelp.c:110
+#: popthelp.c:114
 msgid "LONG"
 msgstr "LONG"
 
-#: popthelp.c:111
+#: popthelp.c:115
 msgid "STRING"
 msgstr "STRING"
 
-#: popthelp.c:112
+#: popthelp.c:116
 msgid "FLOAT"
 msgstr "FLOAT"
 
-#: popthelp.c:113
+#: popthelp.c:117
 msgid "DOUBLE"
 msgstr "DOUBLE"
 
-#: popthelp.c:114
+#: popthelp.c:118
 msgid "ARG"
 msgstr "ARG"
 
-#: popthelp.c:486
+#: popthelp.c:493
 msgid "Usage:"
 msgstr "Utiliza��o:"
 
-#: popthelp.c:510
+#: popthelp.c:517
 msgid "[OPTION...]"
 msgstr "[OP��O...]"
diff --git a/po/pt_BR.po b/po/pt_BR.po
index 56db8fe..7cce06e 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -6,7 +6,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.3\n"
-"POT-Creation-Date: 2003-03-19 11:03-0500\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2003-12-07 15:21-0500\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -14,103 +15,103 @@ msgstr ""
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: ENCODING\n"
 
-#: popt.c:34
+#: popt.c:35
 msgid "unknown errno"
 msgstr ""
 
-#: popt.c:940
+#: popt.c:944
 #, c-format
 msgid "option type (%d) not implemented in popt\n"
 msgstr ""
 
-#: popt.c:1160
+#: popt.c:1164
 msgid "missing argument"
 msgstr ""
 
-#: popt.c:1162
+#: popt.c:1166
 msgid "unknown option"
 msgstr ""
 
-#: popt.c:1164
+#: popt.c:1168
 msgid "mutually exclusive logical operations requested"
 msgstr ""
 
-#: popt.c:1166
+#: popt.c:1170
 msgid "opt->arg should not be NULL"
 msgstr ""
 
-#: popt.c:1168
+#: popt.c:1172
 msgid "aliases nested too deeply"
 msgstr ""
 
-#: popt.c:1170
+#: popt.c:1174
 msgid "error in parameter quoting"
 msgstr ""
 
-#: popt.c:1172
+#: popt.c:1176
 msgid "invalid numeric value"
 msgstr ""
 
-#: popt.c:1174
+#: popt.c:1178
 msgid "number too large or too small"
 msgstr ""
 
-#: popt.c:1176
+#: popt.c:1180
 msgid "memory allocation failed"
 msgstr ""
 
-#: popt.c:1180
+#: popt.c:1184
 msgid "unknown error"
 msgstr ""
 
-#: popthelp.c:57
+#: popthelp.c:61
 msgid "Show this help message"
 msgstr ""
 
-#: popthelp.c:58
+#: popthelp.c:62
 msgid "Display brief usage message"
 msgstr ""
 
-#: popthelp.c:61
+#: popthelp.c:65
 msgid "Display option defaults in message"
 msgstr ""
 
-#: popthelp.c:103
+#: popthelp.c:107
 msgid "NONE"
 msgstr ""
 
-#: popthelp.c:105
+#: popthelp.c:109
 msgid "VAL"
 msgstr ""
 
-#: popthelp.c:109
+#: popthelp.c:113
 msgid "INT"
 msgstr ""
 
-#: popthelp.c:110
+#: popthelp.c:114
 msgid "LONG"
 msgstr ""
 
-#: popthelp.c:111
+#: popthelp.c:115
 msgid "STRING"
 msgstr ""
 
-#: popthelp.c:112
+#: popthelp.c:116
 msgid "FLOAT"
 msgstr ""
 
-#: popthelp.c:113
+#: popthelp.c:117
 msgid "DOUBLE"
 msgstr ""
 
-#: popthelp.c:114
+#: popthelp.c:118
 msgid "ARG"
 msgstr ""
 
-#: popthelp.c:486
+#: popthelp.c:493
 msgid "Usage:"
 msgstr ""
 
-#: popthelp.c:510
+#: popthelp.c:517
 msgid "[OPTION...]"
 msgstr ""
diff --git a/po/ro.po b/po/ro.po
index a60e9fd..4c68c56 100644
--- a/po/ro.po
+++ b/po/ro.po
@@ -1,7 +1,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.3\n"
-"POT-Creation-Date: 2003-03-19 11:03-0500\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2003-12-07 15:21-0500\n"
 "PO-Revision-Date: 2000-06-14 23:23+EST\n"
 "Last-Translator: Cristian Gafton <gafton@redhat.com>\n"
 "Language-Team: Romanian <ro@li.org>\n"
@@ -9,105 +10,105 @@ msgstr ""
 "Content-Type: text/plain; charset=ISO-8859-2\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: popt.c:34
+#: popt.c:35
 msgid "unknown errno"
 msgstr "eroare necunoscuta"
 
-#: popt.c:940
+#: popt.c:944
 #, c-format
 msgid "option type (%d) not implemented in popt\n"
 msgstr "optiunea de tipul (%d) nu este implementata in popt\n"
 
-#: popt.c:1160
+#: popt.c:1164
 msgid "missing argument"
 msgstr "argument lipsa"
 
-#: popt.c:1162
+#: popt.c:1166
 msgid "unknown option"
 msgstr "optiune necunoscuta"
 
-#: popt.c:1164
+#: popt.c:1168
 msgid "mutually exclusive logical operations requested"
 msgstr ""
 
-#: popt.c:1166
+#: popt.c:1170
 msgid "opt->arg should not be NULL"
 msgstr ""
 
-#: popt.c:1168
+#: popt.c:1172
 msgid "aliases nested too deeply"
 msgstr "recursivitate infinita la optiunile sinonime"
 
-#: popt.c:1170
+#: popt.c:1174
 #, fuzzy
 msgid "error in parameter quoting"
 msgstr "eroare la insertie parametru"
 
-#: popt.c:1172
+#: popt.c:1176
 msgid "invalid numeric value"
 msgstr "valoare numarica invalida"
 
-#: popt.c:1174
+#: popt.c:1178
 msgid "number too large or too small"
 msgstr "numar prea mare sau prea mic"
 
-#: popt.c:1176
+#: popt.c:1180
 msgid "memory allocation failed"
 msgstr ""
 
-#: popt.c:1180
+#: popt.c:1184
 msgid "unknown error"
 msgstr "eroare necuinoscuta"
 
-#: popthelp.c:57
+#: popthelp.c:61
 msgid "Show this help message"
 msgstr "Afisare mesaj de help"
 
-#: popthelp.c:58
+#: popthelp.c:62
 msgid "Display brief usage message"
 msgstr "Afisare mesaj sintaxa sumar"
 
-#: popthelp.c:61
+#: popthelp.c:65
 #, fuzzy
 msgid "Display option defaults in message"
 msgstr "Afisare mesaj sintaxa sumar"
 
-#: popthelp.c:103
+#: popthelp.c:107
 msgid "NONE"
 msgstr ""
 
-#: popthelp.c:105
+#: popthelp.c:109
 msgid "VAL"
 msgstr ""
 
-#: popthelp.c:109
+#: popthelp.c:113
 msgid "INT"
 msgstr ""
 
-#: popthelp.c:110
+#: popthelp.c:114
 msgid "LONG"
 msgstr ""
 
-#: popthelp.c:111
+#: popthelp.c:115
 msgid "STRING"
 msgstr ""
 
-#: popthelp.c:112
+#: popthelp.c:116
 msgid "FLOAT"
 msgstr ""
 
-#: popthelp.c:113
+#: popthelp.c:117
 msgid "DOUBLE"
 msgstr ""
 
-#: popthelp.c:114
+#: popthelp.c:118
 msgid "ARG"
 msgstr ""
 
-#: popthelp.c:486
+#: popthelp.c:493
 msgid "Usage:"
 msgstr "Sintaxa:"
 
-#: popthelp.c:510
+#: popthelp.c:517
 msgid "[OPTION...]"
 msgstr "[OPTIUNE...]"
diff --git a/po/ru.po b/po/ru.po
index 3aee845..c6ff1cc 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -1,7 +1,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.3\n"
-"POT-Creation-Date: 2003-03-19 11:03-0500\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2003-12-07 15:21-0500\n"
 "PO-Revision-Date: 2001-07-05 21:00-0500\n"
 "Last-Translator: Eugene Kanter <eugene@blackcatlinux.com>\n"
 "Language-Team: Black Cat Linux Team <blackcat-support@blackcatlinux.com>\n"
@@ -9,103 +10,103 @@ msgstr ""
 "Content-Type: text/plain; charset=koi8-r\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: popt.c:34
+#: popt.c:35
 msgid "unknown errno"
 msgstr "����������� ����� ������"
 
-#: popt.c:940
+#: popt.c:944
 #, c-format
 msgid "option type (%d) not implemented in popt\n"
 msgstr "��������� ��������� (%d) � popt �� �������������\n"
 
-#: popt.c:1160
+#: popt.c:1164
 msgid "missing argument"
 msgstr "�������� ��������"
 
-#: popt.c:1162
+#: popt.c:1166
 msgid "unknown option"
 msgstr "����������� ��������"
 
-#: popt.c:1164
+#: popt.c:1168
 msgid "mutually exclusive logical operations requested"
 msgstr "��������� ������� ����������� ���������� ��������"
 
-#: popt.c:1166
+#: popt.c:1170
 msgid "opt->arg should not be NULL"
 msgstr "opt->arg �� ����� ���� NULL"
 
-#: popt.c:1168
+#: popt.c:1172
 msgid "aliases nested too deeply"
 msgstr "�������� ������� ���������� �������� �����������"
 
-#: popt.c:1170
+#: popt.c:1174
 msgid "error in parameter quoting"
 msgstr "�����a ��������� ���������� � �������"
 
-#: popt.c:1172
+#: popt.c:1176
 msgid "invalid numeric value"
 msgstr "������������ �������� ��������"
 
-#: popt.c:1174
+#: popt.c:1178
 msgid "number too large or too small"
 msgstr "�������� �������� �� ��������� ����������������"
 
-#: popt.c:1176
+#: popt.c:1180
 msgid "memory allocation failed"
 msgstr "������ ��������� ������"
 
-#: popt.c:1180
+#: popt.c:1184
 msgid "unknown error"
 msgstr "����������� ������"
 
-#: popthelp.c:57
+#: popthelp.c:61
 msgid "Show this help message"
 msgstr "�������� ��� ���������"
 
-#: popthelp.c:58
+#: popthelp.c:62
 msgid "Display brief usage message"
 msgstr "�������� ������� ���������� �� �������������"
 
-#: popthelp.c:61
+#: popthelp.c:65
 msgid "Display option defaults in message"
 msgstr "�������� ��������� �� ���������"
 
-#: popthelp.c:103
+#: popthelp.c:107
 msgid "NONE"
 msgstr "NONE"
 
-#: popthelp.c:105
+#: popthelp.c:109
 msgid "VAL"
 msgstr "VAL"
 
-#: popthelp.c:109
+#: popthelp.c:113
 msgid "INT"
 msgstr "INT"
 
-#: popthelp.c:110
+#: popthelp.c:114
 msgid "LONG"
 msgstr "LONG"
 
-#: popthelp.c:111
+#: popthelp.c:115
 msgid "STRING"
 msgstr "STRING"
 
-#: popthelp.c:112
+#: popthelp.c:116
 msgid "FLOAT"
 msgstr "FLOAT"
 
-#: popthelp.c:113
+#: popthelp.c:117
 msgid "DOUBLE"
 msgstr "DOUBLE"
 
-#: popthelp.c:114
+#: popthelp.c:118
 msgid "ARG"
 msgstr "ARG"
 
-#: popthelp.c:486
+#: popthelp.c:493
 msgid "Usage:"
 msgstr "�������������:"
 
-#: popthelp.c:510
+#: popthelp.c:517
 msgid "[OPTION...]"
 msgstr "[��������...]"
diff --git a/po/sk.po b/po/sk.po
index a91a986..5898923 100644
--- a/po/sk.po
+++ b/po/sk.po
@@ -5,7 +5,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.3\n"
-"POT-Creation-Date: 2003-03-19 11:03-0500\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2003-12-07 15:21-0500\n"
 "PO-Revision-Date: 1999-08-04 21:40+0200\n"
 "Last-Translator: Stanislav Meduna <stano@eunet.sk>\n"
 "Language-Team: Slovak <sk-i18n@rak.isternet.sk>\n"
@@ -13,104 +14,104 @@ msgstr ""
 "Content-Type: text/plain; charset=iso-8859-2\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: popt.c:34
+#: popt.c:35
 msgid "unknown errno"
 msgstr ""
 
-#: popt.c:940
+#: popt.c:944
 #, c-format
 msgid "option type (%d) not implemented in popt\n"
 msgstr ""
 
-#: popt.c:1160
+#: popt.c:1164
 msgid "missing argument"
 msgstr ""
 
-#: popt.c:1162
+#: popt.c:1166
 msgid "unknown option"
 msgstr ""
 
-#: popt.c:1164
+#: popt.c:1168
 msgid "mutually exclusive logical operations requested"
 msgstr ""
 
-#: popt.c:1166
+#: popt.c:1170
 msgid "opt->arg should not be NULL"
 msgstr ""
 
-#: popt.c:1168
+#: popt.c:1172
 msgid "aliases nested too deeply"
 msgstr ""
 
-#: popt.c:1170
+#: popt.c:1174
 msgid "error in parameter quoting"
 msgstr ""
 
-#: popt.c:1172
+#: popt.c:1176
 msgid "invalid numeric value"
 msgstr ""
 
-#: popt.c:1174
+#: popt.c:1178
 msgid "number too large or too small"
 msgstr ""
 
-#: popt.c:1176
+#: popt.c:1180
 msgid "memory allocation failed"
 msgstr ""
 
-#: popt.c:1180
+#: popt.c:1184
 msgid "unknown error"
 msgstr ""
 
-#: popthelp.c:57
+#: popthelp.c:61
 msgid "Show this help message"
 msgstr "Vyp�sa� t�to spr�vu"
 
-#: popthelp.c:58
+#: popthelp.c:62
 msgid "Display brief usage message"
 msgstr "Zobrazi� stru�n� n�vod na pou�itie"
 
-#: popthelp.c:61
+#: popthelp.c:65
 #, fuzzy
 msgid "Display option defaults in message"
 msgstr "Zobrazi� stru�n� n�vod na pou�itie"
 
-#: popthelp.c:103
+#: popthelp.c:107
 msgid "NONE"
 msgstr ""
 
-#: popthelp.c:105
+#: popthelp.c:109
 msgid "VAL"
 msgstr ""
 
-#: popthelp.c:109
+#: popthelp.c:113
 msgid "INT"
 msgstr ""
 
-#: popthelp.c:110
+#: popthelp.c:114
 msgid "LONG"
 msgstr ""
 
-#: popthelp.c:111
+#: popthelp.c:115
 msgid "STRING"
 msgstr ""
 
-#: popthelp.c:112
+#: popthelp.c:116
 msgid "FLOAT"
 msgstr ""
 
-#: popthelp.c:113
+#: popthelp.c:117
 msgid "DOUBLE"
 msgstr ""
 
-#: popthelp.c:114
+#: popthelp.c:118
 msgid "ARG"
 msgstr ""
 
-#: popthelp.c:486
+#: popthelp.c:493
 msgid "Usage:"
 msgstr ""
 
-#: popthelp.c:510
+#: popthelp.c:517
 msgid "[OPTION...]"
 msgstr ""
diff --git a/po/sl.po b/po/sl.po
index 8907b2f..369f312 100644
--- a/po/sl.po
+++ b/po/sl.po
@@ -1,7 +1,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.3\n"
-"POT-Creation-Date: 2003-03-19 11:03-0500\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2003-12-07 15:21-0500\n"
 "PO-Revision-Date: 2000-09-05 12:30+0200\n"
 "Last-Translator: Roman Maurer <roman.maurer@hermes.si>\n"
 "Language-Team: Slovenian <sl@li.org>\n"
@@ -9,104 +10,104 @@ msgstr ""
 "Content-Type: text/plain; charset=iso-8859-2\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: popt.c:34
+#: popt.c:35
 msgid "unknown errno"
 msgstr ""
 
-#: popt.c:940
+#: popt.c:944
 #, c-format
 msgid "option type (%d) not implemented in popt\n"
 msgstr ""
 
-#: popt.c:1160
+#: popt.c:1164
 msgid "missing argument"
 msgstr ""
 
-#: popt.c:1162
+#: popt.c:1166
 msgid "unknown option"
 msgstr ""
 
-#: popt.c:1164
+#: popt.c:1168
 msgid "mutually exclusive logical operations requested"
 msgstr ""
 
-#: popt.c:1166
+#: popt.c:1170
 msgid "opt->arg should not be NULL"
 msgstr ""
 
-#: popt.c:1168
+#: popt.c:1172
 msgid "aliases nested too deeply"
 msgstr ""
 
-#: popt.c:1170
+#: popt.c:1174
 msgid "error in parameter quoting"
 msgstr ""
 
-#: popt.c:1172
+#: popt.c:1176
 msgid "invalid numeric value"
 msgstr ""
 
-#: popt.c:1174
+#: popt.c:1178
 msgid "number too large or too small"
 msgstr ""
 
-#: popt.c:1176
+#: popt.c:1180
 msgid "memory allocation failed"
 msgstr ""
 
-#: popt.c:1180
+#: popt.c:1184
 msgid "unknown error"
 msgstr ""
 
-#: popthelp.c:57
+#: popthelp.c:61
 msgid "Show this help message"
 msgstr "Prika�i to sporo�ilo s pomo�jo"
 
-#: popthelp.c:58
+#: popthelp.c:62
 msgid "Display brief usage message"
 msgstr "Prika�i kratko sporo�ilo o uporabi"
 
-#: popthelp.c:61
+#: popthelp.c:65
 #, fuzzy
 msgid "Display option defaults in message"
 msgstr "Prika�i kratko sporo�ilo o uporabi"
 
-#: popthelp.c:103
+#: popthelp.c:107
 msgid "NONE"
 msgstr ""
 
-#: popthelp.c:105
+#: popthelp.c:109
 msgid "VAL"
 msgstr ""
 
-#: popthelp.c:109
+#: popthelp.c:113
 msgid "INT"
 msgstr ""
 
-#: popthelp.c:110
+#: popthelp.c:114
 msgid "LONG"
 msgstr ""
 
-#: popthelp.c:111
+#: popthelp.c:115
 msgid "STRING"
 msgstr ""
 
-#: popthelp.c:112
+#: popthelp.c:116
 msgid "FLOAT"
 msgstr ""
 
-#: popthelp.c:113
+#: popthelp.c:117
 msgid "DOUBLE"
 msgstr ""
 
-#: popthelp.c:114
+#: popthelp.c:118
 msgid "ARG"
 msgstr ""
 
-#: popthelp.c:486
+#: popthelp.c:493
 msgid "Usage:"
 msgstr ""
 
-#: popthelp.c:510
+#: popthelp.c:517
 msgid "[OPTION...]"
 msgstr ""
diff --git a/po/sr.po b/po/sr.po
index 56db8fe..7cce06e 100644
--- a/po/sr.po
+++ b/po/sr.po
@@ -6,7 +6,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.3\n"
-"POT-Creation-Date: 2003-03-19 11:03-0500\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2003-12-07 15:21-0500\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -14,103 +15,103 @@ msgstr ""
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: ENCODING\n"
 
-#: popt.c:34
+#: popt.c:35
 msgid "unknown errno"
 msgstr ""
 
-#: popt.c:940
+#: popt.c:944
 #, c-format
 msgid "option type (%d) not implemented in popt\n"
 msgstr ""
 
-#: popt.c:1160
+#: popt.c:1164
 msgid "missing argument"
 msgstr ""
 
-#: popt.c:1162
+#: popt.c:1166
 msgid "unknown option"
 msgstr ""
 
-#: popt.c:1164
+#: popt.c:1168
 msgid "mutually exclusive logical operations requested"
 msgstr ""
 
-#: popt.c:1166
+#: popt.c:1170
 msgid "opt->arg should not be NULL"
 msgstr ""
 
-#: popt.c:1168
+#: popt.c:1172
 msgid "aliases nested too deeply"
 msgstr ""
 
-#: popt.c:1170
+#: popt.c:1174
 msgid "error in parameter quoting"
 msgstr ""
 
-#: popt.c:1172
+#: popt.c:1176
 msgid "invalid numeric value"
 msgstr ""
 
-#: popt.c:1174
+#: popt.c:1178
 msgid "number too large or too small"
 msgstr ""
 
-#: popt.c:1176
+#: popt.c:1180
 msgid "memory allocation failed"
 msgstr ""
 
-#: popt.c:1180
+#: popt.c:1184
 msgid "unknown error"
 msgstr ""
 
-#: popthelp.c:57
+#: popthelp.c:61
 msgid "Show this help message"
 msgstr ""
 
-#: popthelp.c:58
+#: popthelp.c:62
 msgid "Display brief usage message"
 msgstr ""
 
-#: popthelp.c:61
+#: popthelp.c:65
 msgid "Display option defaults in message"
 msgstr ""
 
-#: popthelp.c:103
+#: popthelp.c:107
 msgid "NONE"
 msgstr ""
 
-#: popthelp.c:105
+#: popthelp.c:109
 msgid "VAL"
 msgstr ""
 
-#: popthelp.c:109
+#: popthelp.c:113
 msgid "INT"
 msgstr ""
 
-#: popthelp.c:110
+#: popthelp.c:114
 msgid "LONG"
 msgstr ""
 
-#: popthelp.c:111
+#: popthelp.c:115
 msgid "STRING"
 msgstr ""
 
-#: popthelp.c:112
+#: popthelp.c:116
 msgid "FLOAT"
 msgstr ""
 
-#: popthelp.c:113
+#: popthelp.c:117
 msgid "DOUBLE"
 msgstr ""
 
-#: popthelp.c:114
+#: popthelp.c:118
 msgid "ARG"
 msgstr ""
 
-#: popthelp.c:486
+#: popthelp.c:493
 msgid "Usage:"
 msgstr ""
 
-#: popthelp.c:510
+#: popthelp.c:517
 msgid "[OPTION...]"
 msgstr ""
diff --git a/po/sv.po b/po/sv.po
index 43a1155..0f1d816 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -1,7 +1,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.3\n"
-"POT-Creation-Date: 2003-03-19 11:03-0500\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2003-12-07 15:21-0500\n"
 "PO-Revision-Date: 2001-07-12 22:26+0100\n"
 "Last-Translator: Christian Rose <menthos@menthos.com>\n"
 "Language-Team: Swedish <sv@li.org>\n"
@@ -9,103 +10,103 @@ msgstr ""
 "Content-Type: text/plain; charset=iso-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: popt.c:34
+#: popt.c:35
 msgid "unknown errno"
 msgstr "ok�nt felnummer"
 
-#: popt.c:940
+#: popt.c:944
 #, c-format
 msgid "option type (%d) not implemented in popt\n"
 msgstr "flaggtypen (%d) �r inte implementerad i popt\n"
 
-#: popt.c:1160
+#: popt.c:1164
 msgid "missing argument"
 msgstr "argument saknas"
 
-#: popt.c:1162
+#: popt.c:1166
 msgid "unknown option"
 msgstr "ok�nd flagga"
 
-#: popt.c:1164
+#: popt.c:1168
 msgid "mutually exclusive logical operations requested"
 msgstr "�msesidigt uteslutande logiska operationer beg�rdes"
 
-#: popt.c:1166
+#: popt.c:1170
 msgid "opt->arg should not be NULL"
 msgstr "opt->arg f�r inte vara NULL"
 
-#: popt.c:1168
+#: popt.c:1172
 msgid "aliases nested too deeply"
 msgstr "alias �r n�stlade f�r djupt"
 
-#: popt.c:1170
+#: popt.c:1174
 msgid "error in parameter quoting"
 msgstr "fel i parametercitering"
 
-#: popt.c:1172
+#: popt.c:1176
 msgid "invalid numeric value"
 msgstr "ogiltigt numeriskt v�rde"
 
-#: popt.c:1174
+#: popt.c:1178
 msgid "number too large or too small"
 msgstr "talet f�r stort eller f�r litet"
 
-#: popt.c:1176
+#: popt.c:1180
 msgid "memory allocation failed"
 msgstr "minnesallokering misslyckades"
 
-#: popt.c:1180
+#: popt.c:1184
 msgid "unknown error"
 msgstr "ok�nt fel"
 
-#: popthelp.c:57
+#: popthelp.c:61
 msgid "Show this help message"
 msgstr "Visa denna hj�lptext"
 
-#: popthelp.c:58
+#: popthelp.c:62
 msgid "Display brief usage message"
 msgstr "Visa en kortfattad anv�ndningstext"
 
-#: popthelp.c:61
+#: popthelp.c:65
 msgid "Display option defaults in message"
 msgstr "Visa standardalternativ f�r flaggor i meddelande"
 
-#: popthelp.c:103
+#: popthelp.c:107
 msgid "NONE"
 msgstr "INGET"
 
-#: popthelp.c:105
+#: popthelp.c:109
 msgid "VAL"
 msgstr "V�RDE"
 
-#: popthelp.c:109
+#: popthelp.c:113
 msgid "INT"
 msgstr "HELTAL"
 
-#: popthelp.c:110
+#: popthelp.c:114
 msgid "LONG"
 msgstr "L�NG"
 
-#: popthelp.c:111
+#: popthelp.c:115
 msgid "STRING"
 msgstr "STR�NG"
 
-#: popthelp.c:112
+#: popthelp.c:116
 msgid "FLOAT"
 msgstr "FLYTTAL"
 
-#: popthelp.c:113
+#: popthelp.c:117
 msgid "DOUBLE"
 msgstr "DUBBEL"
 
-#: popthelp.c:114
+#: popthelp.c:118
 msgid "ARG"
 msgstr "ARG"
 
-#: popthelp.c:486
+#: popthelp.c:493
 msgid "Usage:"
 msgstr "Anv�ndning:"
 
-#: popthelp.c:510
+#: popthelp.c:517
 msgid "[OPTION...]"
 msgstr "[FLAGGA...]"
diff --git a/po/tr.po b/po/tr.po
index bfb7e06..0b5f813 100644
--- a/po/tr.po
+++ b/po/tr.po
@@ -1,7 +1,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.3\n"
-"POT-Creation-Date: 2003-03-19 11:03-0500\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2003-12-07 15:21-0500\n"
 "PO-Revision-Date: 2000-02-11 13:01+0200\n"
 "Last-Translator: Nilgun Belma Buguner <nilgun@technologist.com>\n"
 "Language-Team: Turkish <tr@li.org>\n"
@@ -9,104 +10,104 @@ msgstr ""
 "Content-Type: text/plain; charset=iso8859-9\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: popt.c:34
+#: popt.c:35
 msgid "unknown errno"
 msgstr "bilinmeyen hata no"
 
-#: popt.c:940
+#: popt.c:944
 #, c-format
 msgid "option type (%d) not implemented in popt\n"
 msgstr "se�enek t�r� (%d) popt i�in ge�ersiz\n"
 
-#: popt.c:1160
+#: popt.c:1164
 msgid "missing argument"
 msgstr "arg�man eksik"
 
-#: popt.c:1162
+#: popt.c:1166
 msgid "unknown option"
 msgstr "bilinmeyen se�enek"
 
-#: popt.c:1164
+#: popt.c:1168
 msgid "mutually exclusive logical operations requested"
 msgstr "birbirini d��layan mant�ksal i�lemler istendi"
 
-#: popt.c:1166
+#: popt.c:1170
 msgid "opt->arg should not be NULL"
 msgstr ""
 
-#: popt.c:1168
+#: popt.c:1172
 msgid "aliases nested too deeply"
 msgstr "adlarda �ok fazla i�i�elikler"
 
-#: popt.c:1170
+#: popt.c:1174
 msgid "error in parameter quoting"
 msgstr "parametrelerde t�rnak i�aretleme hatal� "
 
-#: popt.c:1172
+#: popt.c:1176
 msgid "invalid numeric value"
 msgstr "say�sal de�er ge�ersiz"
 
-#: popt.c:1174
+#: popt.c:1178
 msgid "number too large or too small"
 msgstr "say� ya �ok b�y�k ya da �ok k���k"
 
-#: popt.c:1176
+#: popt.c:1180
 msgid "memory allocation failed"
 msgstr ""
 
-#: popt.c:1180
+#: popt.c:1184
 msgid "unknown error"
 msgstr "bilinmeyen hata"
 
-#: popthelp.c:57
+#: popthelp.c:61
 msgid "Show this help message"
 msgstr "Bu yard�m iletisini g�sterir"
 
-#: popthelp.c:58
+#: popthelp.c:62
 msgid "Display brief usage message"
 msgstr "K�sa bir kullan�m iletisi g�ster"
 
-#: popthelp.c:61
+#: popthelp.c:65
 #, fuzzy
 msgid "Display option defaults in message"
 msgstr "K�sa bir kullan�m iletisi g�ster"
 
-#: popthelp.c:103
+#: popthelp.c:107
 msgid "NONE"
 msgstr "YOK"
 
-#: popthelp.c:105
+#: popthelp.c:109
 msgid "VAL"
 msgstr "DE�"
 
-#: popthelp.c:109
+#: popthelp.c:113
 msgid "INT"
 msgstr "INT"
 
-#: popthelp.c:110
+#: popthelp.c:114
 msgid "LONG"
 msgstr "LONG"
 
-#: popthelp.c:111
+#: popthelp.c:115
 msgid "STRING"
 msgstr "STRING"
 
-#: popthelp.c:112
+#: popthelp.c:116
 msgid "FLOAT"
 msgstr "FLOAT"
 
-#: popthelp.c:113
+#: popthelp.c:117
 msgid "DOUBLE"
 msgstr "DOUBLE"
 
-#: popthelp.c:114
+#: popthelp.c:118
 msgid "ARG"
 msgstr "ARG"
 
-#: popthelp.c:486
+#: popthelp.c:493
 msgid "Usage:"
 msgstr "Kullan�m�:"
 
-#: popthelp.c:510
+#: popthelp.c:517
 msgid "[OPTION...]"
 msgstr "[SE�ENEK...]"
diff --git a/po/uk.po b/po/uk.po
index fa295d6..50ee2fa 100644
--- a/po/uk.po
+++ b/po/uk.po
@@ -5,7 +5,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.3\n"
-"POT-Creation-Date: 2003-03-19 11:03-0500\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2003-12-07 15:21-0500\n"
 "PO-Revision-Date: 1999-09-30 16:54+0200\n"
 "Last-Translator: Yuri Syrota <rasta@renome.rovno.ua>\n"
 "Language-Team: Ukrainian <uk@li.org>\n"
@@ -13,104 +14,104 @@ msgstr ""
 "Content-Type: text/plain; charset=koi8-u\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: popt.c:34
+#: popt.c:35
 msgid "unknown errno"
 msgstr ""
 
-#: popt.c:940
+#: popt.c:944
 #, c-format
 msgid "option type (%d) not implemented in popt\n"
 msgstr ""
 
-#: popt.c:1160
+#: popt.c:1164
 msgid "missing argument"
 msgstr ""
 
-#: popt.c:1162
+#: popt.c:1166
 msgid "unknown option"
 msgstr ""
 
-#: popt.c:1164
+#: popt.c:1168
 msgid "mutually exclusive logical operations requested"
 msgstr ""
 
-#: popt.c:1166
+#: popt.c:1170
 msgid "opt->arg should not be NULL"
 msgstr ""
 
-#: popt.c:1168
+#: popt.c:1172
 msgid "aliases nested too deeply"
 msgstr ""
 
-#: popt.c:1170
+#: popt.c:1174
 msgid "error in parameter quoting"
 msgstr ""
 
-#: popt.c:1172
+#: popt.c:1176
 msgid "invalid numeric value"
 msgstr ""
 
-#: popt.c:1174
+#: popt.c:1178
 msgid "number too large or too small"
 msgstr ""
 
-#: popt.c:1176
+#: popt.c:1180
 msgid "memory allocation failed"
 msgstr ""
 
-#: popt.c:1180
+#: popt.c:1184
 msgid "unknown error"
 msgstr ""
 
-#: popthelp.c:57
+#: popthelp.c:61
 msgid "Show this help message"
 msgstr "�������� �� ��צ���"
 
-#: popthelp.c:58
+#: popthelp.c:62
 msgid "Display brief usage message"
 msgstr "�������� ������� ��צ��� ��� ������������"
 
-#: popthelp.c:61
+#: popthelp.c:65
 #, fuzzy
 msgid "Display option defaults in message"
 msgstr "�������� ������� ��צ��� ��� ������������"
 
-#: popthelp.c:103
+#: popthelp.c:107
 msgid "NONE"
 msgstr ""
 
-#: popthelp.c:105
+#: popthelp.c:109
 msgid "VAL"
 msgstr ""
 
-#: popthelp.c:109
+#: popthelp.c:113
 msgid "INT"
 msgstr ""
 
-#: popthelp.c:110
+#: popthelp.c:114
 msgid "LONG"
 msgstr ""
 
-#: popthelp.c:111
+#: popthelp.c:115
 msgid "STRING"
 msgstr ""
 
-#: popthelp.c:112
+#: popthelp.c:116
 msgid "FLOAT"
 msgstr ""
 
-#: popthelp.c:113
+#: popthelp.c:117
 msgid "DOUBLE"
 msgstr ""
 
-#: popthelp.c:114
+#: popthelp.c:118
 msgid "ARG"
 msgstr ""
 
-#: popthelp.c:486
+#: popthelp.c:493
 msgid "Usage:"
 msgstr ""
 
-#: popthelp.c:510
+#: popthelp.c:517
 msgid "[OPTION...]"
 msgstr ""
diff --git a/po/wa.po b/po/wa.po
index 715ebd6..5e3ddd5 100644
--- a/po/wa.po
+++ b/po/wa.po
@@ -9,7 +9,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.3\n"
-"POT-Creation-Date: 2003-03-19 11:03-0500\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2003-12-07 15:21-0500\n"
 "PO-Revision-Date: 1999-03-18 23:11+0100\n"
 "Last-Translator: Nobody yet\n"
 "Language-Team: walon <linux-wa@chanae.alphanet.ch>\n"
@@ -17,104 +18,104 @@ msgstr ""
 "Content-Type: text/plain; charset=iso-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: popt.c:34
+#: popt.c:35
 msgid "unknown errno"
 msgstr ""
 
-#: popt.c:940
+#: popt.c:944
 #, c-format
 msgid "option type (%d) not implemented in popt\n"
 msgstr ""
 
-#: popt.c:1160
+#: popt.c:1164
 msgid "missing argument"
 msgstr ""
 
-#: popt.c:1162
+#: popt.c:1166
 msgid "unknown option"
 msgstr ""
 
-#: popt.c:1164
+#: popt.c:1168
 msgid "mutually exclusive logical operations requested"
 msgstr ""
 
-#: popt.c:1166
+#: popt.c:1170
 msgid "opt->arg should not be NULL"
 msgstr ""
 
-#: popt.c:1168
+#: popt.c:1172
 msgid "aliases nested too deeply"
 msgstr ""
 
-#: popt.c:1170
+#: popt.c:1174
 msgid "error in parameter quoting"
 msgstr ""
 
-#: popt.c:1172
+#: popt.c:1176
 msgid "invalid numeric value"
 msgstr ""
 
-#: popt.c:1174
+#: popt.c:1178
 msgid "number too large or too small"
 msgstr ""
 
-#: popt.c:1176
+#: popt.c:1180
 msgid "memory allocation failed"
 msgstr ""
 
-#: popt.c:1180
+#: popt.c:1184
 msgid "unknown error"
 msgstr ""
 
-#: popthelp.c:57
+#: popthelp.c:61
 msgid "Show this help message"
 msgstr "Mostrer ci messaedje d' aide chal"
 
-#: popthelp.c:58
+#: popthelp.c:62
 msgid "Display brief usage message"
 msgstr "Mostre on court messaedje so kmint vos � siervi"
 
-#: popthelp.c:61
+#: popthelp.c:65
 #, fuzzy
 msgid "Display option defaults in message"
 msgstr "Mostre on court messaedje so kmint vos � siervi"
 
-#: popthelp.c:103
+#: popthelp.c:107
 msgid "NONE"
 msgstr ""
 
-#: popthelp.c:105
+#: popthelp.c:109
 msgid "VAL"
 msgstr ""
 
-#: popthelp.c:109
+#: popthelp.c:113
 msgid "INT"
 msgstr ""
 
-#: popthelp.c:110
+#: popthelp.c:114
 msgid "LONG"
 msgstr ""
 
-#: popthelp.c:111
+#: popthelp.c:115
 msgid "STRING"
 msgstr ""
 
-#: popthelp.c:112
+#: popthelp.c:116
 msgid "FLOAT"
 msgstr ""
 
-#: popthelp.c:113
+#: popthelp.c:117
 msgid "DOUBLE"
 msgstr ""
 
-#: popthelp.c:114
+#: popthelp.c:118
 msgid "ARG"
 msgstr ""
 
-#: popthelp.c:486
+#: popthelp.c:493
 msgid "Usage:"
 msgstr ""
 
-#: popthelp.c:510
+#: popthelp.c:517
 msgid "[OPTION...]"
 msgstr ""
diff --git a/po/zh.po b/po/zh.po
index 56db8fe..7cce06e 100644
--- a/po/zh.po
+++ b/po/zh.po
@@ -6,7 +6,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.3\n"
-"POT-Creation-Date: 2003-03-19 11:03-0500\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2003-12-07 15:21-0500\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -14,103 +15,103 @@ msgstr ""
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: ENCODING\n"
 
-#: popt.c:34
+#: popt.c:35
 msgid "unknown errno"
 msgstr ""
 
-#: popt.c:940
+#: popt.c:944
 #, c-format
 msgid "option type (%d) not implemented in popt\n"
 msgstr ""
 
-#: popt.c:1160
+#: popt.c:1164
 msgid "missing argument"
 msgstr ""
 
-#: popt.c:1162
+#: popt.c:1166
 msgid "unknown option"
 msgstr ""
 
-#: popt.c:1164
+#: popt.c:1168
 msgid "mutually exclusive logical operations requested"
 msgstr ""
 
-#: popt.c:1166
+#: popt.c:1170
 msgid "opt->arg should not be NULL"
 msgstr ""
 
-#: popt.c:1168
+#: popt.c:1172
 msgid "aliases nested too deeply"
 msgstr ""
 
-#: popt.c:1170
+#: popt.c:1174
 msgid "error in parameter quoting"
 msgstr ""
 
-#: popt.c:1172
+#: popt.c:1176
 msgid "invalid numeric value"
 msgstr ""
 
-#: popt.c:1174
+#: popt.c:1178
 msgid "number too large or too small"
 msgstr ""
 
-#: popt.c:1176
+#: popt.c:1180
 msgid "memory allocation failed"
 msgstr ""
 
-#: popt.c:1180
+#: popt.c:1184
 msgid "unknown error"
 msgstr ""
 
-#: popthelp.c:57
+#: popthelp.c:61
 msgid "Show this help message"
 msgstr ""
 
-#: popthelp.c:58
+#: popthelp.c:62
 msgid "Display brief usage message"
 msgstr ""
 
-#: popthelp.c:61
+#: popthelp.c:65
 msgid "Display option defaults in message"
 msgstr ""
 
-#: popthelp.c:103
+#: popthelp.c:107
 msgid "NONE"
 msgstr ""
 
-#: popthelp.c:105
+#: popthelp.c:109
 msgid "VAL"
 msgstr ""
 
-#: popthelp.c:109
+#: popthelp.c:113
 msgid "INT"
 msgstr ""
 
-#: popthelp.c:110
+#: popthelp.c:114
 msgid "LONG"
 msgstr ""
 
-#: popthelp.c:111
+#: popthelp.c:115
 msgid "STRING"
 msgstr ""
 
-#: popthelp.c:112
+#: popthelp.c:116
 msgid "FLOAT"
 msgstr ""
 
-#: popthelp.c:113
+#: popthelp.c:117
 msgid "DOUBLE"
 msgstr ""
 
-#: popthelp.c:114
+#: popthelp.c:118
 msgid "ARG"
 msgstr ""
 
-#: popthelp.c:486
+#: popthelp.c:493
 msgid "Usage:"
 msgstr ""
 
-#: popthelp.c:510
+#: popthelp.c:517
 msgid "[OPTION...]"
 msgstr ""
diff --git a/po/zh_CN.GB2312.po b/po/zh_CN.GB2312.po
index 33601d3..7d37818 100644
--- a/po/zh_CN.GB2312.po
+++ b/po/zh_CN.GB2312.po
@@ -1,7 +1,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.3\n"
-"POT-Creation-Date: 2003-03-19 11:03-0500\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2003-12-07 15:21-0500\n"
 "PO-Revision-Date: 1999-11-11 05:04+0800\n"
 "Last-Translator: Dillion Chen <dillon.chen@turbolinux.com.cn>\n"
 "Language-Team: TLDN\n"
@@ -9,104 +10,104 @@ msgstr ""
 "Content-Type: text/plain; charset=gb2312\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: popt.c:34
+#: popt.c:35
 msgid "unknown errno"
 msgstr ""
 
-#: popt.c:940
+#: popt.c:944
 #, c-format
 msgid "option type (%d) not implemented in popt\n"
 msgstr ""
 
-#: popt.c:1160
+#: popt.c:1164
 msgid "missing argument"
 msgstr ""
 
-#: popt.c:1162
+#: popt.c:1166
 msgid "unknown option"
 msgstr ""
 
-#: popt.c:1164
+#: popt.c:1168
 msgid "mutually exclusive logical operations requested"
 msgstr ""
 
-#: popt.c:1166
+#: popt.c:1170
 msgid "opt->arg should not be NULL"
 msgstr ""
 
-#: popt.c:1168
+#: popt.c:1172
 msgid "aliases nested too deeply"
 msgstr ""
 
-#: popt.c:1170
+#: popt.c:1174
 msgid "error in parameter quoting"
 msgstr ""
 
-#: popt.c:1172
+#: popt.c:1176
 msgid "invalid numeric value"
 msgstr ""
 
-#: popt.c:1174
+#: popt.c:1178
 msgid "number too large or too small"
 msgstr ""
 
-#: popt.c:1176
+#: popt.c:1180
 msgid "memory allocation failed"
 msgstr ""
 
-#: popt.c:1180
+#: popt.c:1184
 msgid "unknown error"
 msgstr ""
 
-#: popthelp.c:57
+#: popthelp.c:61
 msgid "Show this help message"
 msgstr "��ʾ����������Ϣ"
 
-#: popthelp.c:58
+#: popthelp.c:62
 msgid "Display brief usage message"
 msgstr "��ʾ���ʹ����Ϣ"
 
-#: popthelp.c:61
+#: popthelp.c:65
 #, fuzzy
 msgid "Display option defaults in message"
 msgstr "��ʾ���ʹ����Ϣ"
 
-#: popthelp.c:103
+#: popthelp.c:107
 msgid "NONE"
 msgstr ""
 
-#: popthelp.c:105
+#: popthelp.c:109
 msgid "VAL"
 msgstr ""
 
-#: popthelp.c:109
+#: popthelp.c:113
 msgid "INT"
 msgstr ""
 
-#: popthelp.c:110
+#: popthelp.c:114
 msgid "LONG"
 msgstr ""
 
-#: popthelp.c:111
+#: popthelp.c:115
 msgid "STRING"
 msgstr ""
 
-#: popthelp.c:112
+#: popthelp.c:116
 msgid "FLOAT"
 msgstr ""
 
-#: popthelp.c:113
+#: popthelp.c:117
 msgid "DOUBLE"
 msgstr ""
 
-#: popthelp.c:114
+#: popthelp.c:118
 msgid "ARG"
 msgstr ""
 
-#: popthelp.c:486
+#: popthelp.c:493
 msgid "Usage:"
 msgstr ""
 
-#: popthelp.c:510
+#: popthelp.c:517
 msgid "[OPTION...]"
 msgstr ""
-- 
Gitee


From eeac327f71b16d76279de3601b87e317a0e2f856 Mon Sep 17 00:00:00 2001
From: Jeff Johnson <n3npq@mac.com>
Date: Mon, 22 Dec 2003 21:09:40 +0000
Subject: [PATCH 387/667] - test build with methods needed for selinux.

---
 po/Makefile.in.in | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/po/Makefile.in.in b/po/Makefile.in.in
index 1f6d6a4..f7c63af 100644
--- a/po/Makefile.in.in
+++ b/po/Makefile.in.in
@@ -29,7 +29,7 @@ gettextsrcdir = $(datadir)/gettext/po
 INSTALL = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
 MKINSTALLDIRS = @MKINSTALLDIRS@
-mkinstalldirs = $(SHELL) `case "$(MKINSTALLDIRS)" in /*) echo "$(MKINSTALLDIRS)" ;; *) echo "$(top_builddir)/$(MKINSTALLDIRS)" ;; esac`
+mkinstalldirs = $(SHELL) `case "$(MKINSTALLDIRS)" in /*) echo "$(MKINSTALLDIRS)" ;; *) echo "$(top_builddir)/mkinstalldirs" ;; esac`
 
 CC = @CC@
 GMSGFMT = @GMSGFMT@
-- 
Gitee


From c0b17e839c7833e6696fb630609c081717fcc2b5 Mon Sep 17 00:00:00 2001
From: Jeff Johnson <n3npq@mac.com>
Date: Fri, 26 Dec 2003 15:09:26 +0000
Subject: [PATCH 388/667] Sick hack to preserve the pretense that popt has an
 ABI.

---
 popt.c     | 20 ++++++++++++++++----
 popt.h     |  6 ++++++
 popthelp.c | 15 +++++++++++++++
 3 files changed, 37 insertions(+), 4 deletions(-)

diff --git a/popt.c b/popt.c
index f306bd2..357e01b 100644
--- a/popt.c
+++ b/popt.c
@@ -69,8 +69,11 @@ static void invokeCallbacksPRE(poptContext con, const struct poptOption * opt)
     for (; opt->longName || opt->shortName || opt->arg; opt++) {
 	if (opt->arg == NULL) continue;		/* XXX program error. */
 	if ((opt->argInfo & POPT_ARG_MASK) == POPT_ARG_INCLUDE_TABLE) {
+	    void * arg = opt->arg;
+	    /* XXX sick hack to preserve pretense of ABI. */
+	    if (arg == poptHelpOptions) arg = poptHelpOptionsI18N;
 	    /* Recurse on included sub-tables. */
-	    invokeCallbacksPRE(con, opt->arg);
+	    invokeCallbacksPRE(con, arg);
 	} else if ((opt->argInfo & POPT_ARG_MASK) == POPT_ARG_CALLBACK &&
 		   (opt->argInfo & POPT_CBFLAG_PRE))
 	{   /*@-castfcnptr@*/
@@ -92,8 +95,11 @@ static void invokeCallbacksPOST(poptContext con, const struct poptOption * opt)
     for (; opt->longName || opt->shortName || opt->arg; opt++) {
 	if (opt->arg == NULL) continue;		/* XXX program error. */
 	if ((opt->argInfo & POPT_ARG_MASK) == POPT_ARG_INCLUDE_TABLE) {
+	    void * arg = opt->arg;
+	    /* XXX sick hack to preserve pretense of ABI. */
+	    if (arg == poptHelpOptions) arg = poptHelpOptionsI18N;
 	    /* Recurse on included sub-tables. */
-	    invokeCallbacksPOST(con, opt->arg);
+	    invokeCallbacksPOST(con, arg);
 	} else if ((opt->argInfo & POPT_ARG_MASK) == POPT_ARG_CALLBACK &&
 		   (opt->argInfo & POPT_CBFLAG_POST))
 	{   /*@-castfcnptr@*/
@@ -119,6 +125,9 @@ static void invokeCallbacksOPTION(poptContext con,
     if (opt != NULL)
     for (; opt->longName || opt->shortName || opt->arg; opt++) {
 	if ((opt->argInfo & POPT_ARG_MASK) == POPT_ARG_INCLUDE_TABLE) {
+	    void * arg = opt->arg;
+	    /* XXX sick hack to preserve pretense of ABI. */
+	    if (arg == poptHelpOptions) arg = poptHelpOptionsI18N;
 	    /* Recurse on included sub-tables. */
 	    if (opt->arg != NULL)	/* XXX program error */
 		invokeCallbacksOPTION(con, opt->arg, myOpt, myData, shorty);
@@ -471,10 +480,13 @@ findOption(const struct poptOption * opt, /*@null@*/ const char * longName,
 
 	if ((opt->argInfo & POPT_ARG_MASK) == POPT_ARG_INCLUDE_TABLE) {
 	    const struct poptOption * opt2;
+	    void * arg = opt->arg;
 
+	    /* XXX sick hack to preserve pretense of ABI. */
+	    if (arg == poptHelpOptions) arg = poptHelpOptionsI18N;
 	    /* Recurse on included sub-tables. */
-	    if (opt->arg == NULL) continue;	/* XXX program error */
-	    opt2 = findOption(opt->arg, longName, shortName, callback,
+	    if (arg == NULL) continue;	/* XXX program error */
+	    opt2 = findOption(arg, longName, shortName, callback,
 			      callbackData, singleDash);
 	    if (opt2 == NULL) continue;
 	    /* Sub-table data will be inheirited if no data yet. */
diff --git a/popt.h b/popt.h
index 7be75de..3eac333 100644
--- a/popt.h
+++ b/popt.h
@@ -171,6 +171,12 @@ extern struct poptOption poptAliasOptions[];
 /*@unchecked@*/ /*@observer@*/
 extern struct poptOption poptHelpOptions[];
 /*@=exportvar@*/
+
+/*@-exportvar@*/
+/*@unchecked@*/ /*@observer@*/
+extern struct poptOption * poptHelpOptionsI18N;
+/*@=exportvar@*/
+
 #define POPT_AUTOHELP { NULL, '\0', POPT_ARG_INCLUDE_TABLE, poptHelpOptions, \
 			0, "Help options:", NULL },
 
diff --git a/popthelp.c b/popthelp.c
index 8d4ab6a..c8b98ab 100644
--- a/popthelp.c
+++ b/popthelp.c
@@ -54,6 +54,18 @@ struct poptOption poptAliasOptions[] = {
 /*@-castfcnptr@*/
 /*@observer@*/ /*@unchecked@*/
 struct poptOption poptHelpOptions[] = {
+  { NULL, '\0', POPT_ARG_CALLBACK, (void *)&displayArgs, '\0', NULL, NULL },
+  { "help", '?', 0, NULL, '?', N_("Show this help message"), NULL },
+  { "usage", '\0', 0, NULL, 'u', N_("Display brief usage message"), NULL },
+#ifdef	NOTYET
+  { "defaults", '\0', POPT_ARG_NONE, &show_option_defaults, 0,
+	N_("Display option defaults in message"), NULL },
+#endif
+    POPT_TABLEEND
+} ;
+
+/*@observer@*/ /*@unchecked@*/
+static struct poptOption poptHelpOptions2[] = {
 /*@-readonlytrans@*/
   { NULL, '\0', POPT_ARG_INTL_DOMAIN, PACKAGE, 0, NULL, NULL},
 /*@=readonlytrans@*/
@@ -66,6 +78,9 @@ struct poptOption poptHelpOptions[] = {
 #endif
     POPT_TABLEEND
 } ;
+
+/*@observer@*/ /*@unchecked@*/
+struct poptOption * poptHelpOptionsI18N = poptHelpOptions2;
 /*@=castfcnptr@*/
 
 /**
-- 
Gitee


From 9e92c6fabf046153a51079cad1bf0c28ae49de66 Mon Sep 17 00:00:00 2001
From: Jeff Johnson <n3npq@mac.com>
Date: Fri, 26 Dec 2003 17:56:05 +0000
Subject: [PATCH 389/667] use '=' iff long option (#108924).

---
 popthelp.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/popthelp.c b/popthelp.c
index c8b98ab..240692f 100644
--- a/popthelp.c
+++ b/popthelp.c
@@ -305,7 +305,7 @@ static void singleOptionHelp(FILE * fp, int maxLeftCol,
 		default:
 		    /*@innerbreak@*/ break;
 		}
-		*le++ = '=';
+		*le++ = (opt->longName != NULL ? '=' : ' ');
 		if (negate) *le++ = '~';
 		/*@-formatconst@*/
 		le += sprintf(le, (ops ? "0x%lx" : "%ld"), aLong);
@@ -319,7 +319,7 @@ static void singleOptionHelp(FILE * fp, int maxLeftCol,
 	    case POPT_ARG_FLOAT:
 	    case POPT_ARG_DOUBLE:
 	    case POPT_ARG_STRING:
-		*le++ = '=';
+		*le++ = (opt->longName != NULL ? '=' : ' ');
 		strcpy(le, argDescrip);		le += strlen(le);
 		break;
 	    default:
-- 
Gitee


From ce758d4b45514ea12d89ba6f0c9ee32cd677f56b Mon Sep 17 00:00:00 2001
From: Jeff Johnson <n3npq@mac.com>
Date: Sat, 27 Dec 2003 02:40:25 +0000
Subject: [PATCH 390/667] splint fiddles.

---
 popt.c | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/popt.c b/popt.c
index 357e01b..5226062 100644
--- a/popt.c
+++ b/popt.c
@@ -70,8 +70,10 @@ static void invokeCallbacksPRE(poptContext con, const struct poptOption * opt)
 	if (opt->arg == NULL) continue;		/* XXX program error. */
 	if ((opt->argInfo & POPT_ARG_MASK) == POPT_ARG_INCLUDE_TABLE) {
 	    void * arg = opt->arg;
+/*@-branchstate@*/
 	    /* XXX sick hack to preserve pretense of ABI. */
 	    if (arg == poptHelpOptions) arg = poptHelpOptionsI18N;
+/*@=branchstate@*/
 	    /* Recurse on included sub-tables. */
 	    invokeCallbacksPRE(con, arg);
 	} else if ((opt->argInfo & POPT_ARG_MASK) == POPT_ARG_CALLBACK &&
@@ -96,8 +98,10 @@ static void invokeCallbacksPOST(poptContext con, const struct poptOption * opt)
 	if (opt->arg == NULL) continue;		/* XXX program error. */
 	if ((opt->argInfo & POPT_ARG_MASK) == POPT_ARG_INCLUDE_TABLE) {
 	    void * arg = opt->arg;
+/*@-branchstate@*/
 	    /* XXX sick hack to preserve pretense of ABI. */
 	    if (arg == poptHelpOptions) arg = poptHelpOptionsI18N;
+/*@=branchstate@*/
 	    /* Recurse on included sub-tables. */
 	    invokeCallbacksPOST(con, arg);
 	} else if ((opt->argInfo & POPT_ARG_MASK) == POPT_ARG_CALLBACK &&
@@ -126,8 +130,10 @@ static void invokeCallbacksOPTION(poptContext con,
     for (; opt->longName || opt->shortName || opt->arg; opt++) {
 	if ((opt->argInfo & POPT_ARG_MASK) == POPT_ARG_INCLUDE_TABLE) {
 	    void * arg = opt->arg;
+/*@-branchstate@*/
 	    /* XXX sick hack to preserve pretense of ABI. */
 	    if (arg == poptHelpOptions) arg = poptHelpOptionsI18N;
+/*@=branchstate@*/
 	    /* Recurse on included sub-tables. */
 	    if (opt->arg != NULL)	/* XXX program error */
 		invokeCallbacksOPTION(con, opt->arg, myOpt, myData, shorty);
@@ -482,8 +488,10 @@ findOption(const struct poptOption * opt, /*@null@*/ const char * longName,
 	    const struct poptOption * opt2;
 	    void * arg = opt->arg;
 
+/*@-branchstate@*/
 	    /* XXX sick hack to preserve pretense of ABI. */
 	    if (arg == poptHelpOptions) arg = poptHelpOptionsI18N;
+/*@=branchstate@*/
 	    /* Recurse on included sub-tables. */
 	    if (arg == NULL) continue;	/* XXX program error */
 	    opt2 = findOption(arg, longName, shortName, callback,
-- 
Gitee


From 9e43662cbcbe49273b69fc095f40b346cda29282 Mon Sep 17 00:00:00 2001
From: Jeff Johnson <n3npq@mac.com>
Date: Tue, 30 Dec 2003 13:15:47 +0000
Subject: [PATCH 391/667] - spelling corrections (#112728).

---
 po/cs.po           | 50 +++++++++++++++++++++++-----------------------
 po/da.po           | 50 +++++++++++++++++++++++-----------------------
 po/de.po           | 50 +++++++++++++++++++++++-----------------------
 po/es.po           | 50 +++++++++++++++++++++++-----------------------
 po/eu_ES.po        | 50 +++++++++++++++++++++++-----------------------
 po/fi.po           | 50 +++++++++++++++++++++++-----------------------
 po/fr.po           | 50 +++++++++++++++++++++++-----------------------
 po/gl.po           | 50 +++++++++++++++++++++++-----------------------
 po/hu.po           | 50 +++++++++++++++++++++++-----------------------
 po/id.po           | 50 +++++++++++++++++++++++-----------------------
 po/is.po           | 50 +++++++++++++++++++++++-----------------------
 po/it.po           | 50 +++++++++++++++++++++++-----------------------
 po/ja.po           | 50 +++++++++++++++++++++++-----------------------
 po/ko.po           | 50 +++++++++++++++++++++++-----------------------
 po/no.po           | 50 +++++++++++++++++++++++-----------------------
 po/pl.po           | 50 +++++++++++++++++++++++-----------------------
 po/popt.pot        | 50 +++++++++++++++++++++++-----------------------
 po/pt.po           | 50 +++++++++++++++++++++++-----------------------
 po/pt_BR.po        | 50 +++++++++++++++++++++++-----------------------
 po/ro.po           | 50 +++++++++++++++++++++++-----------------------
 po/ru.po           | 50 +++++++++++++++++++++++-----------------------
 po/sk.po           | 50 +++++++++++++++++++++++-----------------------
 po/sl.po           | 50 +++++++++++++++++++++++-----------------------
 po/sr.po           | 50 +++++++++++++++++++++++-----------------------
 po/sv.po           | 50 +++++++++++++++++++++++-----------------------
 po/tr.po           | 50 +++++++++++++++++++++++-----------------------
 po/uk.po           | 50 +++++++++++++++++++++++-----------------------
 po/wa.po           | 50 +++++++++++++++++++++++-----------------------
 po/zh.po           | 50 +++++++++++++++++++++++-----------------------
 po/zh_CN.GB2312.po | 50 +++++++++++++++++++++++-----------------------
 30 files changed, 750 insertions(+), 750 deletions(-)

diff --git a/po/cs.po b/po/cs.po
index b5f4d1f..71ed365 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.3\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2003-12-07 15:21-0500\n"
+"POT-Creation-Date: 2003-12-30 08:12-0500\n"
 "PO-Revision-Date: 2001-07-24 00:03+0100\n"
 "Last-Translator: Milan Kerslager <kerslage@linux.cz>\n"
 "Language-Team: Czech <cs@li.org>\n"
@@ -14,99 +14,99 @@ msgstr ""
 msgid "unknown errno"
 msgstr "nezn�m� ��slo chyby"
 
-#: popt.c:944
+#: popt.c:964
 #, c-format
 msgid "option type (%d) not implemented in popt\n"
 msgstr "volba (%d) nen� v popt implementov�na\n"
 
-#: popt.c:1164
+#: popt.c:1184
 msgid "missing argument"
 msgstr "chyb� argument"
 
-#: popt.c:1166
+#: popt.c:1186
 msgid "unknown option"
 msgstr "nezn�m� volba"
 
-#: popt.c:1168
+#: popt.c:1188
 msgid "mutually exclusive logical operations requested"
 msgstr "po�adov�ny vz�jemn� v�lu�n� logick� operace"
 
-#: popt.c:1170
+#: popt.c:1190
 msgid "opt->arg should not be NULL"
 msgstr "opt->arg nesm� b�t NULL"
 
-#: popt.c:1172
+#: popt.c:1192
 msgid "aliases nested too deeply"
 msgstr "aliasy vno�en� p��li� hluboko"
 
-#: popt.c:1174
+#: popt.c:1194
 msgid "error in parameter quoting"
 msgstr "chyba v quotov�n� parametr�"
 
-#: popt.c:1176
+#: popt.c:1196
 msgid "invalid numeric value"
 msgstr "chybn� numerick� hodnota"
 
-#: popt.c:1178
+#: popt.c:1198
 msgid "number too large or too small"
 msgstr "��slo je p��li� velk� nebo p��li� mal�"
 
-#: popt.c:1180
+#: popt.c:1200
 msgid "memory allocation failed"
 msgstr "selhala alokace pam�ti"
 
-#: popt.c:1184
+#: popt.c:1204
 msgid "unknown error"
 msgstr "nezn�m� chyba"
 
-#: popthelp.c:61
+#: popthelp.c:58 popthelp.c:73
 msgid "Show this help message"
 msgstr "Vyp��e tuto n�pov�du"
 
-#: popthelp.c:62
+#: popthelp.c:59 popthelp.c:74
 msgid "Display brief usage message"
 msgstr "Vyp��e kr�tk� n�vod k pou�it�"
 
-#: popthelp.c:65
+#: popthelp.c:62 popthelp.c:77
 msgid "Display option defaults in message"
 msgstr "Zobrazit implicitn� volby ve zpr�v�"
 
-#: popthelp.c:107
+#: popthelp.c:122
 msgid "NONE"
 msgstr "NONE"
 
-#: popthelp.c:109
+#: popthelp.c:124
 msgid "VAL"
 msgstr "VAL"
 
-#: popthelp.c:113
+#: popthelp.c:128
 msgid "INT"
 msgstr "INT"
 
-#: popthelp.c:114
+#: popthelp.c:129
 msgid "LONG"
 msgstr "LONG"
 
-#: popthelp.c:115
+#: popthelp.c:130
 msgid "STRING"
 msgstr "STRING"
 
-#: popthelp.c:116
+#: popthelp.c:131
 msgid "FLOAT"
 msgstr "FLOAT"
 
-#: popthelp.c:117
+#: popthelp.c:132
 msgid "DOUBLE"
 msgstr "DOUBLE"
 
-#: popthelp.c:118
+#: popthelp.c:133
 msgid "ARG"
 msgstr "ARG"
 
-#: popthelp.c:493
+#: popthelp.c:508
 msgid "Usage:"
 msgstr "Pou�it�:"
 
-#: popthelp.c:517
+#: popthelp.c:532
 msgid "[OPTION...]"
 msgstr "[VOLBY...]"
diff --git a/po/da.po b/po/da.po
index f0f9023..79182cf 100644
--- a/po/da.po
+++ b/po/da.po
@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.3\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2003-12-07 15:21-0500\n"
+"POT-Creation-Date: 2003-12-30 08:12-0500\n"
 "PO-Revision-Date: Sun Jan 21 2001 04:30:32+0200\n"
 "Last-Translator: Martin Hansen <mah@k64.dk>\n"
 "Language-Team: Dansk <dansk@klid.dk>\n"
@@ -15,100 +15,100 @@ msgstr ""
 msgid "unknown errno"
 msgstr "ukendt fejlnr."
 
-#: popt.c:944
+#: popt.c:964
 #, c-format
 msgid "option type (%d) not implemented in popt\n"
 msgstr "tilvalgstype (%d) er ikke implementeret i popt\n"
 
-#: popt.c:1164
+#: popt.c:1184
 msgid "missing argument"
 msgstr "mangler argument"
 
-#: popt.c:1166
+#: popt.c:1186
 msgid "unknown option"
 msgstr "ukendt tilvalg"
 
-#: popt.c:1168
+#: popt.c:1188
 msgid "mutually exclusive logical operations requested"
 msgstr "de �nskede handlinger udelukker hinanden"
 
-#: popt.c:1170
+#: popt.c:1190
 msgid "opt->arg should not be NULL"
 msgstr ""
 
-#: popt.c:1172
+#: popt.c:1192
 msgid "aliases nested too deeply"
 msgstr "aliaser er for dybt indlejret"
 
-#: popt.c:1174
+#: popt.c:1194
 msgid "error in parameter quoting"
 msgstr "fejl i parameter citering"
 
-#: popt.c:1176
+#: popt.c:1196
 msgid "invalid numeric value"
 msgstr "ugyldig numerisk v�rdi"
 
-#: popt.c:1178
+#: popt.c:1198
 msgid "number too large or too small"
 msgstr "nummer for stort, eller for lille"
 
-#: popt.c:1180
+#: popt.c:1200
 msgid "memory allocation failed"
 msgstr ""
 
-#: popt.c:1184
+#: popt.c:1204
 msgid "unknown error"
 msgstr "ukendt fejl"
 
-#: popthelp.c:61
+#: popthelp.c:58 popthelp.c:73
 msgid "Show this help message"
 msgstr "Vis denne hj�lpemeddelelse"
 
-#: popthelp.c:62
+#: popthelp.c:59 popthelp.c:74
 msgid "Display brief usage message"
 msgstr "Vis kortfattet brugsanvisning"
 
-#: popthelp.c:65
+#: popthelp.c:62 popthelp.c:77
 #, fuzzy
 msgid "Display option defaults in message"
 msgstr "Vis kortfattet brugsanvisning"
 
-#: popthelp.c:107
+#: popthelp.c:122
 msgid "NONE"
 msgstr "INGEN"
 
-#: popthelp.c:109
+#: popthelp.c:124
 msgid "VAL"
 msgstr "VAL"
 
-#: popthelp.c:113
+#: popthelp.c:128
 msgid "INT"
 msgstr "INT"
 
-#: popthelp.c:114
+#: popthelp.c:129
 msgid "LONG"
 msgstr "LONG"
 
-#: popthelp.c:115
+#: popthelp.c:130
 msgid "STRING"
 msgstr "STRING"
 
-#: popthelp.c:116
+#: popthelp.c:131
 msgid "FLOAT"
 msgstr "FLOAT"
 
-#: popthelp.c:117
+#: popthelp.c:132
 msgid "DOUBLE"
 msgstr "DOUBLE"
 
-#: popthelp.c:118
+#: popthelp.c:133
 msgid "ARG"
 msgstr "ARG"
 
-#: popthelp.c:493
+#: popthelp.c:508
 msgid "Usage:"
 msgstr "Brug:"
 
-#: popthelp.c:517
+#: popthelp.c:532
 msgid "[OPTION...]"
 msgstr "[TILVALG...]"
diff --git a/po/de.po b/po/de.po
index 7cce06e..44701c9 100644
--- a/po/de.po
+++ b/po/de.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.3\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2003-12-07 15:21-0500\n"
+"POT-Creation-Date: 2003-12-30 08:12-0500\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -19,99 +19,99 @@ msgstr ""
 msgid "unknown errno"
 msgstr ""
 
-#: popt.c:944
+#: popt.c:964
 #, c-format
 msgid "option type (%d) not implemented in popt\n"
 msgstr ""
 
-#: popt.c:1164
+#: popt.c:1184
 msgid "missing argument"
 msgstr ""
 
-#: popt.c:1166
+#: popt.c:1186
 msgid "unknown option"
 msgstr ""
 
-#: popt.c:1168
+#: popt.c:1188
 msgid "mutually exclusive logical operations requested"
 msgstr ""
 
-#: popt.c:1170
+#: popt.c:1190
 msgid "opt->arg should not be NULL"
 msgstr ""
 
-#: popt.c:1172
+#: popt.c:1192
 msgid "aliases nested too deeply"
 msgstr ""
 
-#: popt.c:1174
+#: popt.c:1194
 msgid "error in parameter quoting"
 msgstr ""
 
-#: popt.c:1176
+#: popt.c:1196
 msgid "invalid numeric value"
 msgstr ""
 
-#: popt.c:1178
+#: popt.c:1198
 msgid "number too large or too small"
 msgstr ""
 
-#: popt.c:1180
+#: popt.c:1200
 msgid "memory allocation failed"
 msgstr ""
 
-#: popt.c:1184
+#: popt.c:1204
 msgid "unknown error"
 msgstr ""
 
-#: popthelp.c:61
+#: popthelp.c:58 popthelp.c:73
 msgid "Show this help message"
 msgstr ""
 
-#: popthelp.c:62
+#: popthelp.c:59 popthelp.c:74
 msgid "Display brief usage message"
 msgstr ""
 
-#: popthelp.c:65
+#: popthelp.c:62 popthelp.c:77
 msgid "Display option defaults in message"
 msgstr ""
 
-#: popthelp.c:107
+#: popthelp.c:122
 msgid "NONE"
 msgstr ""
 
-#: popthelp.c:109
+#: popthelp.c:124
 msgid "VAL"
 msgstr ""
 
-#: popthelp.c:113
+#: popthelp.c:128
 msgid "INT"
 msgstr ""
 
-#: popthelp.c:114
+#: popthelp.c:129
 msgid "LONG"
 msgstr ""
 
-#: popthelp.c:115
+#: popthelp.c:130
 msgid "STRING"
 msgstr ""
 
-#: popthelp.c:116
+#: popthelp.c:131
 msgid "FLOAT"
 msgstr ""
 
-#: popthelp.c:117
+#: popthelp.c:132
 msgid "DOUBLE"
 msgstr ""
 
-#: popthelp.c:118
+#: popthelp.c:133
 msgid "ARG"
 msgstr ""
 
-#: popthelp.c:493
+#: popthelp.c:508
 msgid "Usage:"
 msgstr ""
 
-#: popthelp.c:517
+#: popthelp.c:532
 msgid "[OPTION...]"
 msgstr ""
diff --git a/po/es.po b/po/es.po
index 09c65c6..ed248cf 100644
--- a/po/es.po
+++ b/po/es.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.3\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2003-12-07 15:21-0500\n"
+"POT-Creation-Date: 2003-12-30 08:12-0500\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Leandro Lucarella <luca@linuxmendoza.org.ar>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -19,100 +19,100 @@ msgstr ""
 msgid "unknown errno"
 msgstr "errno desconocido"
 
-#: popt.c:944
+#: popt.c:964
 #, c-format
 msgid "option type (%d) not implemented in popt\n"
 msgstr "tipo de opcin (%d) no implementada en popt\n"
 
-#: popt.c:1164
+#: popt.c:1184
 msgid "missing argument"
 msgstr "falta argumento"
 
-#: popt.c:1166
+#: popt.c:1186
 msgid "unknown option"
 msgstr "opcin desconocida"
 
-#: popt.c:1168
+#: popt.c:1188
 msgid "mutually exclusive logical operations requested"
 msgstr "requerida operacin lgica mutuamente exclusiva"
 
-#: popt.c:1170
+#: popt.c:1190
 msgid "opt->arg should not be NULL"
 msgstr ""
 
-#: popt.c:1172
+#: popt.c:1192
 msgid "aliases nested too deeply"
 msgstr "alias anidados muy profundamente"
 
-#: popt.c:1174
+#: popt.c:1194
 msgid "error in parameter quoting"
 msgstr "error en cita de parmetros"
 
-#: popt.c:1176
+#: popt.c:1196
 msgid "invalid numeric value"
 msgstr "valor numrico invlido"
 
-#: popt.c:1178
+#: popt.c:1198
 msgid "number too large or too small"
 msgstr "nmero muy largo o muy pequeo"
 
-#: popt.c:1180
+#: popt.c:1200
 msgid "memory allocation failed"
 msgstr ""
 
-#: popt.c:1184
+#: popt.c:1204
 msgid "unknown error"
 msgstr "error desconocido"
 
-#: popthelp.c:61
+#: popthelp.c:58 popthelp.c:73
 msgid "Show this help message"
 msgstr "Muestra este mensaje de ayuda"
 
-#: popthelp.c:62
+#: popthelp.c:59 popthelp.c:74
 msgid "Display brief usage message"
 msgstr "Indica el modo de uso resumido"
 
-#: popthelp.c:65
+#: popthelp.c:62 popthelp.c:77
 #, fuzzy
 msgid "Display option defaults in message"
 msgstr "Indica el modo de uso resumido"
 
-#: popthelp.c:107
+#: popthelp.c:122
 msgid "NONE"
 msgstr "NONE"
 
-#: popthelp.c:109
+#: popthelp.c:124
 msgid "VAL"
 msgstr "VAL"
 
-#: popthelp.c:113
+#: popthelp.c:128
 msgid "INT"
 msgstr "INT"
 
-#: popthelp.c:114
+#: popthelp.c:129
 msgid "LONG"
 msgstr "LONG"
 
-#: popthelp.c:115
+#: popthelp.c:130
 msgid "STRING"
 msgstr "STRING"
 
-#: popthelp.c:116
+#: popthelp.c:131
 msgid "FLOAT"
 msgstr "FLOAT"
 
-#: popthelp.c:117
+#: popthelp.c:132
 msgid "DOUBLE"
 msgstr "DOUBLE"
 
-#: popthelp.c:118
+#: popthelp.c:133
 msgid "ARG"
 msgstr "ARG"
 
-#: popthelp.c:493
+#: popthelp.c:508
 msgid "Usage:"
 msgstr "Modo de Uso:"
 
-#: popthelp.c:517
+#: popthelp.c:532
 msgid "[OPTION...]"
 msgstr "[OPCIN...]"
diff --git a/po/eu_ES.po b/po/eu_ES.po
index 7cce06e..44701c9 100644
--- a/po/eu_ES.po
+++ b/po/eu_ES.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.3\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2003-12-07 15:21-0500\n"
+"POT-Creation-Date: 2003-12-30 08:12-0500\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -19,99 +19,99 @@ msgstr ""
 msgid "unknown errno"
 msgstr ""
 
-#: popt.c:944
+#: popt.c:964
 #, c-format
 msgid "option type (%d) not implemented in popt\n"
 msgstr ""
 
-#: popt.c:1164
+#: popt.c:1184
 msgid "missing argument"
 msgstr ""
 
-#: popt.c:1166
+#: popt.c:1186
 msgid "unknown option"
 msgstr ""
 
-#: popt.c:1168
+#: popt.c:1188
 msgid "mutually exclusive logical operations requested"
 msgstr ""
 
-#: popt.c:1170
+#: popt.c:1190
 msgid "opt->arg should not be NULL"
 msgstr ""
 
-#: popt.c:1172
+#: popt.c:1192
 msgid "aliases nested too deeply"
 msgstr ""
 
-#: popt.c:1174
+#: popt.c:1194
 msgid "error in parameter quoting"
 msgstr ""
 
-#: popt.c:1176
+#: popt.c:1196
 msgid "invalid numeric value"
 msgstr ""
 
-#: popt.c:1178
+#: popt.c:1198
 msgid "number too large or too small"
 msgstr ""
 
-#: popt.c:1180
+#: popt.c:1200
 msgid "memory allocation failed"
 msgstr ""
 
-#: popt.c:1184
+#: popt.c:1204
 msgid "unknown error"
 msgstr ""
 
-#: popthelp.c:61
+#: popthelp.c:58 popthelp.c:73
 msgid "Show this help message"
 msgstr ""
 
-#: popthelp.c:62
+#: popthelp.c:59 popthelp.c:74
 msgid "Display brief usage message"
 msgstr ""
 
-#: popthelp.c:65
+#: popthelp.c:62 popthelp.c:77
 msgid "Display option defaults in message"
 msgstr ""
 
-#: popthelp.c:107
+#: popthelp.c:122
 msgid "NONE"
 msgstr ""
 
-#: popthelp.c:109
+#: popthelp.c:124
 msgid "VAL"
 msgstr ""
 
-#: popthelp.c:113
+#: popthelp.c:128
 msgid "INT"
 msgstr ""
 
-#: popthelp.c:114
+#: popthelp.c:129
 msgid "LONG"
 msgstr ""
 
-#: popthelp.c:115
+#: popthelp.c:130
 msgid "STRING"
 msgstr ""
 
-#: popthelp.c:116
+#: popthelp.c:131
 msgid "FLOAT"
 msgstr ""
 
-#: popthelp.c:117
+#: popthelp.c:132
 msgid "DOUBLE"
 msgstr ""
 
-#: popthelp.c:118
+#: popthelp.c:133
 msgid "ARG"
 msgstr ""
 
-#: popthelp.c:493
+#: popthelp.c:508
 msgid "Usage:"
 msgstr ""
 
-#: popthelp.c:517
+#: popthelp.c:532
 msgid "[OPTION...]"
 msgstr ""
diff --git a/po/fi.po b/po/fi.po
index 7cce06e..44701c9 100644
--- a/po/fi.po
+++ b/po/fi.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.3\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2003-12-07 15:21-0500\n"
+"POT-Creation-Date: 2003-12-30 08:12-0500\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -19,99 +19,99 @@ msgstr ""
 msgid "unknown errno"
 msgstr ""
 
-#: popt.c:944
+#: popt.c:964
 #, c-format
 msgid "option type (%d) not implemented in popt\n"
 msgstr ""
 
-#: popt.c:1164
+#: popt.c:1184
 msgid "missing argument"
 msgstr ""
 
-#: popt.c:1166
+#: popt.c:1186
 msgid "unknown option"
 msgstr ""
 
-#: popt.c:1168
+#: popt.c:1188
 msgid "mutually exclusive logical operations requested"
 msgstr ""
 
-#: popt.c:1170
+#: popt.c:1190
 msgid "opt->arg should not be NULL"
 msgstr ""
 
-#: popt.c:1172
+#: popt.c:1192
 msgid "aliases nested too deeply"
 msgstr ""
 
-#: popt.c:1174
+#: popt.c:1194
 msgid "error in parameter quoting"
 msgstr ""
 
-#: popt.c:1176
+#: popt.c:1196
 msgid "invalid numeric value"
 msgstr ""
 
-#: popt.c:1178
+#: popt.c:1198
 msgid "number too large or too small"
 msgstr ""
 
-#: popt.c:1180
+#: popt.c:1200
 msgid "memory allocation failed"
 msgstr ""
 
-#: popt.c:1184
+#: popt.c:1204
 msgid "unknown error"
 msgstr ""
 
-#: popthelp.c:61
+#: popthelp.c:58 popthelp.c:73
 msgid "Show this help message"
 msgstr ""
 
-#: popthelp.c:62
+#: popthelp.c:59 popthelp.c:74
 msgid "Display brief usage message"
 msgstr ""
 
-#: popthelp.c:65
+#: popthelp.c:62 popthelp.c:77
 msgid "Display option defaults in message"
 msgstr ""
 
-#: popthelp.c:107
+#: popthelp.c:122
 msgid "NONE"
 msgstr ""
 
-#: popthelp.c:109
+#: popthelp.c:124
 msgid "VAL"
 msgstr ""
 
-#: popthelp.c:113
+#: popthelp.c:128
 msgid "INT"
 msgstr ""
 
-#: popthelp.c:114
+#: popthelp.c:129
 msgid "LONG"
 msgstr ""
 
-#: popthelp.c:115
+#: popthelp.c:130
 msgid "STRING"
 msgstr ""
 
-#: popthelp.c:116
+#: popthelp.c:131
 msgid "FLOAT"
 msgstr ""
 
-#: popthelp.c:117
+#: popthelp.c:132
 msgid "DOUBLE"
 msgstr ""
 
-#: popthelp.c:118
+#: popthelp.c:133
 msgid "ARG"
 msgstr ""
 
-#: popthelp.c:493
+#: popthelp.c:508
 msgid "Usage:"
 msgstr ""
 
-#: popthelp.c:517
+#: popthelp.c:532
 msgid "[OPTION...]"
 msgstr ""
diff --git a/po/fr.po b/po/fr.po
index 21bcfe3..f543cdc 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -12,7 +12,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.8.1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2003-12-07 15:21-0500\n"
+"POT-Creation-Date: 2003-12-30 08:12-0500\n"
 "PO-Revision-Date: 2003-06-22 23:43+0200\n"
 "Last-Translator: RPM French Translation <rpm-fr@livna.org>\n"
 "Language-Team: RPM French Translation <rpm-fr@livna.org>\n"
@@ -24,99 +24,99 @@ msgstr ""
 msgid "unknown errno"
 msgstr "errno inconnu"
 
-#: popt.c:944
+#: popt.c:964
 #, c-format
 msgid "option type (%d) not implemented in popt\n"
 msgstr "type(%d) d'option non implémenté dans popt\n"
 
-#: popt.c:1164
+#: popt.c:1184
 msgid "missing argument"
 msgstr "argument manquant"
 
-#: popt.c:1166
+#: popt.c:1186
 msgid "unknown option"
 msgstr "option iconnue"
 
-#: popt.c:1168
+#: popt.c:1188
 msgid "mutually exclusive logical operations requested"
 msgstr "opérations logiques mutuellement exclusives requises"
 
-#: popt.c:1170
+#: popt.c:1190
 msgid "opt->arg should not be NULL"
 msgstr "opt->arg ne devrait pas être NULL"
 
-#: popt.c:1172
+#: popt.c:1192
 msgid "aliases nested too deeply"
 msgstr "les alias sont trop entremellés"
 
-#: popt.c:1174
+#: popt.c:1194
 msgid "error in parameter quoting"
 msgstr "erreur en citant les paramètres"
 
-#: popt.c:1176
+#: popt.c:1196
 msgid "invalid numeric value"
 msgstr "valeur numérique invalide"
 
-#: popt.c:1178
+#: popt.c:1198
 msgid "number too large or too small"
 msgstr "nombre trop grand ou trop petit"
 
-#: popt.c:1180
+#: popt.c:1200
 msgid "memory allocation failed"
 msgstr "échec de l'allocation de mémoire"
 
-#: popt.c:1184
+#: popt.c:1204
 msgid "unknown error"
 msgstr "erreur inconnue"
 
-#: popthelp.c:61
+#: popthelp.c:58 popthelp.c:73
 msgid "Show this help message"
 msgstr "Montre ce message d'aide"
 
-#: popthelp.c:62
+#: popthelp.c:59 popthelp.c:74
 msgid "Display brief usage message"
 msgstr "Affiche un bref descriptif de l'utilisation"
 
-#: popthelp.c:65
+#: popthelp.c:62 popthelp.c:77
 msgid "Display option defaults in message"
 msgstr "Afficher les valeurs par défaut des options dans le message"
 
-#: popthelp.c:107
+#: popthelp.c:122
 msgid "NONE"
 msgstr "RIEN"
 
-#: popthelp.c:109
+#: popthelp.c:124
 msgid "VAL"
 msgstr "VAL"
 
-#: popthelp.c:113
+#: popthelp.c:128
 msgid "INT"
 msgstr "ENTIER"
 
-#: popthelp.c:114
+#: popthelp.c:129
 msgid "LONG"
 msgstr "LONG"
 
-#: popthelp.c:115
+#: popthelp.c:130
 msgid "STRING"
 msgstr "CHAINE"
 
-#: popthelp.c:116
+#: popthelp.c:131
 msgid "FLOAT"
 msgstr "FLOTTANT"
 
-#: popthelp.c:117
+#: popthelp.c:132
 msgid "DOUBLE"
 msgstr "DOUBLE"
 
-#: popthelp.c:118
+#: popthelp.c:133
 msgid "ARG"
 msgstr "ARG"
 
-#: popthelp.c:493
+#: popthelp.c:508
 msgid "Usage:"
 msgstr "Utilisation:"
 
-#: popthelp.c:517
+#: popthelp.c:532
 msgid "[OPTION...]"
 msgstr "[OPTION...]"
diff --git a/po/gl.po b/po/gl.po
index f9bbca2..cadd96a 100644
--- a/po/gl.po
+++ b/po/gl.po
@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.3\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2003-12-07 15:21-0500\n"
+"POT-Creation-Date: 2003-12-30 08:12-0500\n"
 "PO-Revision-Date: 2001-01-17 01:01+0100\n"
 "Last-Translator: Jes�s Bravo �lvarez <jba@pobox.com>\n"
 "Language-Team: Galician <trasno@ceu.fi.udc.es>\n"
@@ -14,100 +14,100 @@ msgstr ""
 msgid "unknown errno"
 msgstr "errno desco�ecido"
 
-#: popt.c:944
+#: popt.c:964
 #, c-format
 msgid "option type (%d) not implemented in popt\n"
 msgstr "tipo de opci�n (%d) non implementada en popt\n"
 
-#: popt.c:1164
+#: popt.c:1184
 msgid "missing argument"
 msgstr "falta un argumento"
 
-#: popt.c:1166
+#: popt.c:1186
 msgid "unknown option"
 msgstr "opci�n desco�ecida"
 
-#: popt.c:1168
+#: popt.c:1188
 msgid "mutually exclusive logical operations requested"
 msgstr "solicit�ronse operaci�ns l�xicas mutuamente exclu�ntes"
 
-#: popt.c:1170
+#: popt.c:1190
 msgid "opt->arg should not be NULL"
 msgstr ""
 
-#: popt.c:1172
+#: popt.c:1192
 msgid "aliases nested too deeply"
 msgstr "aliases ani�ados a un nivel demasiado profundo"
 
-#: popt.c:1174
+#: popt.c:1194
 msgid "error in parameter quoting"
 msgstr "erro nas comi�as do par�metro"
 
-#: popt.c:1176
+#: popt.c:1196
 msgid "invalid numeric value"
 msgstr "valor num�rico non v�lido"
 
-#: popt.c:1178
+#: popt.c:1198
 msgid "number too large or too small"
 msgstr "n�mero demasiado grande ou pequeno"
 
-#: popt.c:1180
+#: popt.c:1200
 msgid "memory allocation failed"
 msgstr ""
 
-#: popt.c:1184
+#: popt.c:1204
 msgid "unknown error"
 msgstr "erro desco�ecido"
 
-#: popthelp.c:61
+#: popthelp.c:58 popthelp.c:73
 msgid "Show this help message"
 msgstr "Amosar esta mensaxe de axuda"
 
-#: popthelp.c:62
+#: popthelp.c:59 popthelp.c:74
 msgid "Display brief usage message"
 msgstr "Amosar brevemente o xeito de utilizaci�n"
 
-#: popthelp.c:65
+#: popthelp.c:62 popthelp.c:77
 #, fuzzy
 msgid "Display option defaults in message"
 msgstr "Amosar brevemente o xeito de utilizaci�n"
 
-#: popthelp.c:107
+#: popthelp.c:122
 msgid "NONE"
 msgstr "NADA"
 
-#: popthelp.c:109
+#: popthelp.c:124
 msgid "VAL"
 msgstr "VAL"
 
-#: popthelp.c:113
+#: popthelp.c:128
 msgid "INT"
 msgstr "INT"
 
-#: popthelp.c:114
+#: popthelp.c:129
 msgid "LONG"
 msgstr "LONG"
 
-#: popthelp.c:115
+#: popthelp.c:130
 msgid "STRING"
 msgstr "CADEA"
 
-#: popthelp.c:116
+#: popthelp.c:131
 msgid "FLOAT"
 msgstr "FLOAT"
 
-#: popthelp.c:117
+#: popthelp.c:132
 msgid "DOUBLE"
 msgstr "DOUBLE"
 
-#: popthelp.c:118
+#: popthelp.c:133
 msgid "ARG"
 msgstr "ARG"
 
-#: popthelp.c:493
+#: popthelp.c:508
 msgid "Usage:"
 msgstr "Uso:"
 
-#: popthelp.c:517
+#: popthelp.c:532
 msgid "[OPTION...]"
 msgstr "[OPCI�N...]"
diff --git a/po/hu.po b/po/hu.po
index 08f15d5..cb75f46 100644
--- a/po/hu.po
+++ b/po/hu.po
@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.3\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2003-12-07 15:21-0500\n"
+"POT-Creation-Date: 2003-12-30 08:12-0500\n"
 "PO-Revision-Date: 2000-08-03 23:26+0200\n"
 "Last-Translator: L�szl� N�meth <nemeth@qwertynet.hu>\n"
 "Language-Team: Hungarian\n"
@@ -14,100 +14,100 @@ msgstr ""
 msgid "unknown errno"
 msgstr ""
 
-#: popt.c:944
+#: popt.c:964
 #, c-format
 msgid "option type (%d) not implemented in popt\n"
 msgstr ""
 
-#: popt.c:1164
+#: popt.c:1184
 msgid "missing argument"
 msgstr ""
 
-#: popt.c:1166
+#: popt.c:1186
 msgid "unknown option"
 msgstr ""
 
-#: popt.c:1168
+#: popt.c:1188
 msgid "mutually exclusive logical operations requested"
 msgstr ""
 
-#: popt.c:1170
+#: popt.c:1190
 msgid "opt->arg should not be NULL"
 msgstr ""
 
-#: popt.c:1172
+#: popt.c:1192
 msgid "aliases nested too deeply"
 msgstr ""
 
-#: popt.c:1174
+#: popt.c:1194
 msgid "error in parameter quoting"
 msgstr ""
 
-#: popt.c:1176
+#: popt.c:1196
 msgid "invalid numeric value"
 msgstr ""
 
-#: popt.c:1178
+#: popt.c:1198
 msgid "number too large or too small"
 msgstr ""
 
-#: popt.c:1180
+#: popt.c:1200
 msgid "memory allocation failed"
 msgstr ""
 
-#: popt.c:1184
+#: popt.c:1204
 msgid "unknown error"
 msgstr ""
 
-#: popthelp.c:61
+#: popthelp.c:58 popthelp.c:73
 msgid "Show this help message"
 msgstr "E s�g� megjelen�t�se"
 
-#: popthelp.c:62
+#: popthelp.c:59 popthelp.c:74
 msgid "Display brief usage message"
 msgstr "R�vid haszn�lati utas�t�s megjelen�t�se"
 
-#: popthelp.c:65
+#: popthelp.c:62 popthelp.c:77
 #, fuzzy
 msgid "Display option defaults in message"
 msgstr "R�vid haszn�lati utas�t�s megjelen�t�se"
 
-#: popthelp.c:107
+#: popthelp.c:122
 msgid "NONE"
 msgstr ""
 
-#: popthelp.c:109
+#: popthelp.c:124
 msgid "VAL"
 msgstr ""
 
-#: popthelp.c:113
+#: popthelp.c:128
 msgid "INT"
 msgstr ""
 
-#: popthelp.c:114
+#: popthelp.c:129
 msgid "LONG"
 msgstr ""
 
-#: popthelp.c:115
+#: popthelp.c:130
 msgid "STRING"
 msgstr ""
 
-#: popthelp.c:116
+#: popthelp.c:131
 msgid "FLOAT"
 msgstr ""
 
-#: popthelp.c:117
+#: popthelp.c:132
 msgid "DOUBLE"
 msgstr ""
 
-#: popthelp.c:118
+#: popthelp.c:133
 msgid "ARG"
 msgstr ""
 
-#: popthelp.c:493
+#: popthelp.c:508
 msgid "Usage:"
 msgstr ""
 
-#: popthelp.c:517
+#: popthelp.c:532
 msgid "[OPTION...]"
 msgstr ""
diff --git a/po/id.po b/po/id.po
index 7cce06e..44701c9 100644
--- a/po/id.po
+++ b/po/id.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.3\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2003-12-07 15:21-0500\n"
+"POT-Creation-Date: 2003-12-30 08:12-0500\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -19,99 +19,99 @@ msgstr ""
 msgid "unknown errno"
 msgstr ""
 
-#: popt.c:944
+#: popt.c:964
 #, c-format
 msgid "option type (%d) not implemented in popt\n"
 msgstr ""
 
-#: popt.c:1164
+#: popt.c:1184
 msgid "missing argument"
 msgstr ""
 
-#: popt.c:1166
+#: popt.c:1186
 msgid "unknown option"
 msgstr ""
 
-#: popt.c:1168
+#: popt.c:1188
 msgid "mutually exclusive logical operations requested"
 msgstr ""
 
-#: popt.c:1170
+#: popt.c:1190
 msgid "opt->arg should not be NULL"
 msgstr ""
 
-#: popt.c:1172
+#: popt.c:1192
 msgid "aliases nested too deeply"
 msgstr ""
 
-#: popt.c:1174
+#: popt.c:1194
 msgid "error in parameter quoting"
 msgstr ""
 
-#: popt.c:1176
+#: popt.c:1196
 msgid "invalid numeric value"
 msgstr ""
 
-#: popt.c:1178
+#: popt.c:1198
 msgid "number too large or too small"
 msgstr ""
 
-#: popt.c:1180
+#: popt.c:1200
 msgid "memory allocation failed"
 msgstr ""
 
-#: popt.c:1184
+#: popt.c:1204
 msgid "unknown error"
 msgstr ""
 
-#: popthelp.c:61
+#: popthelp.c:58 popthelp.c:73
 msgid "Show this help message"
 msgstr ""
 
-#: popthelp.c:62
+#: popthelp.c:59 popthelp.c:74
 msgid "Display brief usage message"
 msgstr ""
 
-#: popthelp.c:65
+#: popthelp.c:62 popthelp.c:77
 msgid "Display option defaults in message"
 msgstr ""
 
-#: popthelp.c:107
+#: popthelp.c:122
 msgid "NONE"
 msgstr ""
 
-#: popthelp.c:109
+#: popthelp.c:124
 msgid "VAL"
 msgstr ""
 
-#: popthelp.c:113
+#: popthelp.c:128
 msgid "INT"
 msgstr ""
 
-#: popthelp.c:114
+#: popthelp.c:129
 msgid "LONG"
 msgstr ""
 
-#: popthelp.c:115
+#: popthelp.c:130
 msgid "STRING"
 msgstr ""
 
-#: popthelp.c:116
+#: popthelp.c:131
 msgid "FLOAT"
 msgstr ""
 
-#: popthelp.c:117
+#: popthelp.c:132
 msgid "DOUBLE"
 msgstr ""
 
-#: popthelp.c:118
+#: popthelp.c:133
 msgid "ARG"
 msgstr ""
 
-#: popthelp.c:493
+#: popthelp.c:508
 msgid "Usage:"
 msgstr ""
 
-#: popthelp.c:517
+#: popthelp.c:532
 msgid "[OPTION...]"
 msgstr ""
diff --git a/po/is.po b/po/is.po
index f68db48..ea00ac1 100644
--- a/po/is.po
+++ b/po/is.po
@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.3\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2003-12-07 15:21-0500\n"
+"POT-Creation-Date: 2003-12-30 08:12-0500\n"
 "PO-Revision-Date: 2001-06-08 01:35+0000\n"
 "Last-Translator: Richard Allen <ra@hp.is>\n"
 "Language-Team: is <kde-isl@mmedia.is>\n"
@@ -14,99 +14,99 @@ msgstr ""
 msgid "unknown errno"
 msgstr "��ekkt villun�mer"
 
-#: popt.c:944
+#: popt.c:964
 #, c-format
 msgid "option type (%d) not implemented in popt\n"
 msgstr "rofager�in (%d) er ekki studd � popt\n"
 
-#: popt.c:1164
+#: popt.c:1184
 msgid "missing argument"
 msgstr "vantar vi�fang"
 
-#: popt.c:1166
+#: popt.c:1186
 msgid "unknown option"
 msgstr "��ekktur rofi"
 
-#: popt.c:1168
+#: popt.c:1188
 msgid "mutually exclusive logical operations requested"
 msgstr "be�i� um rofa sem sl�kkva hvor � ��rum"
 
-#: popt.c:1170
+#: popt.c:1190
 msgid "opt->arg should not be NULL"
 msgstr "opt->arg �tti ekki a� vera NULL"
 
-#: popt.c:1172
+#: popt.c:1192
 msgid "aliases nested too deeply"
 msgstr "al�asar of fl�knir"
 
-#: popt.c:1174
+#: popt.c:1194
 msgid "error in parameter quoting"
 msgstr "villa � vi�f�ngum (g�salappir og svo frv.)"
 
-#: popt.c:1176
+#: popt.c:1196
 msgid "invalid numeric value"
 msgstr "�gilt t�lulegt gildi"
 
-#: popt.c:1178
+#: popt.c:1198
 msgid "number too large or too small"
 msgstr "talan of st�r e�a sm�"
 
-#: popt.c:1180
+#: popt.c:1200
 msgid "memory allocation failed"
 msgstr "ekki t�kst a� taka fr� minni"
 
-#: popt.c:1184
+#: popt.c:1204
 msgid "unknown error"
 msgstr "��ekkt villa"
 
-#: popthelp.c:61
+#: popthelp.c:58 popthelp.c:73
 msgid "Show this help message"
 msgstr "S�na �essa hj�lp"
 
-#: popthelp.c:62
+#: popthelp.c:59 popthelp.c:74
 msgid "Display brief usage message"
 msgstr "S�na stuttar notkunarlei�beiningar"
 
-#: popthelp.c:65
+#: popthelp.c:62 popthelp.c:77
 msgid "Display option defaults in message"
 msgstr "S�na sj�lfgefin gildi rofa � skilabo�um"
 
-#: popthelp.c:107
+#: popthelp.c:122
 msgid "NONE"
 msgstr "ENGIN"
 
-#: popthelp.c:109
+#: popthelp.c:124
 msgid "VAL"
 msgstr "VAL"
 
-#: popthelp.c:113
+#: popthelp.c:128
 msgid "INT"
 msgstr "INT"
 
-#: popthelp.c:114
+#: popthelp.c:129
 msgid "LONG"
 msgstr "LONG"
 
-#: popthelp.c:115
+#: popthelp.c:130
 msgid "STRING"
 msgstr "STRING"
 
-#: popthelp.c:116
+#: popthelp.c:131
 msgid "FLOAT"
 msgstr "FLOAT"
 
-#: popthelp.c:117
+#: popthelp.c:132
 msgid "DOUBLE"
 msgstr "DOUBLE"
 
-#: popthelp.c:118
+#: popthelp.c:133
 msgid "ARG"
 msgstr "ARG"
 
-#: popthelp.c:493
+#: popthelp.c:508
 msgid "Usage:"
 msgstr "Notkun:"
 
-#: popthelp.c:517
+#: popthelp.c:532
 msgid "[OPTION...]"
 msgstr "[ROFI...]"
diff --git a/po/it.po b/po/it.po
index 7cce06e..44701c9 100644
--- a/po/it.po
+++ b/po/it.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.3\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2003-12-07 15:21-0500\n"
+"POT-Creation-Date: 2003-12-30 08:12-0500\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -19,99 +19,99 @@ msgstr ""
 msgid "unknown errno"
 msgstr ""
 
-#: popt.c:944
+#: popt.c:964
 #, c-format
 msgid "option type (%d) not implemented in popt\n"
 msgstr ""
 
-#: popt.c:1164
+#: popt.c:1184
 msgid "missing argument"
 msgstr ""
 
-#: popt.c:1166
+#: popt.c:1186
 msgid "unknown option"
 msgstr ""
 
-#: popt.c:1168
+#: popt.c:1188
 msgid "mutually exclusive logical operations requested"
 msgstr ""
 
-#: popt.c:1170
+#: popt.c:1190
 msgid "opt->arg should not be NULL"
 msgstr ""
 
-#: popt.c:1172
+#: popt.c:1192
 msgid "aliases nested too deeply"
 msgstr ""
 
-#: popt.c:1174
+#: popt.c:1194
 msgid "error in parameter quoting"
 msgstr ""
 
-#: popt.c:1176
+#: popt.c:1196
 msgid "invalid numeric value"
 msgstr ""
 
-#: popt.c:1178
+#: popt.c:1198
 msgid "number too large or too small"
 msgstr ""
 
-#: popt.c:1180
+#: popt.c:1200
 msgid "memory allocation failed"
 msgstr ""
 
-#: popt.c:1184
+#: popt.c:1204
 msgid "unknown error"
 msgstr ""
 
-#: popthelp.c:61
+#: popthelp.c:58 popthelp.c:73
 msgid "Show this help message"
 msgstr ""
 
-#: popthelp.c:62
+#: popthelp.c:59 popthelp.c:74
 msgid "Display brief usage message"
 msgstr ""
 
-#: popthelp.c:65
+#: popthelp.c:62 popthelp.c:77
 msgid "Display option defaults in message"
 msgstr ""
 
-#: popthelp.c:107
+#: popthelp.c:122
 msgid "NONE"
 msgstr ""
 
-#: popthelp.c:109
+#: popthelp.c:124
 msgid "VAL"
 msgstr ""
 
-#: popthelp.c:113
+#: popthelp.c:128
 msgid "INT"
 msgstr ""
 
-#: popthelp.c:114
+#: popthelp.c:129
 msgid "LONG"
 msgstr ""
 
-#: popthelp.c:115
+#: popthelp.c:130
 msgid "STRING"
 msgstr ""
 
-#: popthelp.c:116
+#: popthelp.c:131
 msgid "FLOAT"
 msgstr ""
 
-#: popthelp.c:117
+#: popthelp.c:132
 msgid "DOUBLE"
 msgstr ""
 
-#: popthelp.c:118
+#: popthelp.c:133
 msgid "ARG"
 msgstr ""
 
-#: popthelp.c:493
+#: popthelp.c:508
 msgid "Usage:"
 msgstr ""
 
-#: popthelp.c:517
+#: popthelp.c:532
 msgid "[OPTION...]"
 msgstr ""
diff --git a/po/ja.po b/po/ja.po
index 7cce06e..44701c9 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.3\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2003-12-07 15:21-0500\n"
+"POT-Creation-Date: 2003-12-30 08:12-0500\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -19,99 +19,99 @@ msgstr ""
 msgid "unknown errno"
 msgstr ""
 
-#: popt.c:944
+#: popt.c:964
 #, c-format
 msgid "option type (%d) not implemented in popt\n"
 msgstr ""
 
-#: popt.c:1164
+#: popt.c:1184
 msgid "missing argument"
 msgstr ""
 
-#: popt.c:1166
+#: popt.c:1186
 msgid "unknown option"
 msgstr ""
 
-#: popt.c:1168
+#: popt.c:1188
 msgid "mutually exclusive logical operations requested"
 msgstr ""
 
-#: popt.c:1170
+#: popt.c:1190
 msgid "opt->arg should not be NULL"
 msgstr ""
 
-#: popt.c:1172
+#: popt.c:1192
 msgid "aliases nested too deeply"
 msgstr ""
 
-#: popt.c:1174
+#: popt.c:1194
 msgid "error in parameter quoting"
 msgstr ""
 
-#: popt.c:1176
+#: popt.c:1196
 msgid "invalid numeric value"
 msgstr ""
 
-#: popt.c:1178
+#: popt.c:1198
 msgid "number too large or too small"
 msgstr ""
 
-#: popt.c:1180
+#: popt.c:1200
 msgid "memory allocation failed"
 msgstr ""
 
-#: popt.c:1184
+#: popt.c:1204
 msgid "unknown error"
 msgstr ""
 
-#: popthelp.c:61
+#: popthelp.c:58 popthelp.c:73
 msgid "Show this help message"
 msgstr ""
 
-#: popthelp.c:62
+#: popthelp.c:59 popthelp.c:74
 msgid "Display brief usage message"
 msgstr ""
 
-#: popthelp.c:65
+#: popthelp.c:62 popthelp.c:77
 msgid "Display option defaults in message"
 msgstr ""
 
-#: popthelp.c:107
+#: popthelp.c:122
 msgid "NONE"
 msgstr ""
 
-#: popthelp.c:109
+#: popthelp.c:124
 msgid "VAL"
 msgstr ""
 
-#: popthelp.c:113
+#: popthelp.c:128
 msgid "INT"
 msgstr ""
 
-#: popthelp.c:114
+#: popthelp.c:129
 msgid "LONG"
 msgstr ""
 
-#: popthelp.c:115
+#: popthelp.c:130
 msgid "STRING"
 msgstr ""
 
-#: popthelp.c:116
+#: popthelp.c:131
 msgid "FLOAT"
 msgstr ""
 
-#: popthelp.c:117
+#: popthelp.c:132
 msgid "DOUBLE"
 msgstr ""
 
-#: popthelp.c:118
+#: popthelp.c:133
 msgid "ARG"
 msgstr ""
 
-#: popthelp.c:493
+#: popthelp.c:508
 msgid "Usage:"
 msgstr ""
 
-#: popthelp.c:517
+#: popthelp.c:532
 msgid "[OPTION...]"
 msgstr ""
diff --git a/po/ko.po b/po/ko.po
index c3b64a2..98517b7 100644
--- a/po/ko.po
+++ b/po/ko.po
@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2003-12-07 15:21-0500\n"
+"POT-Creation-Date: 2003-12-30 08:12-0500\n"
 "PO-Revision-Date: 2001-09-06 20:06+0900\n"
 "Last-Translator: Jong-Hoon Ryu <redhat4u@netian.com>\n"
 "Language-Team: GNU Translation project <ko@li.org>\n"
@@ -14,99 +14,99 @@ msgstr ""
 msgid "unknown errno"
 msgstr "�� �� ���� �����ڵ�(errno) �Դϴ�"
 
-#: popt.c:944
+#: popt.c:964
 #, c-format
 msgid "option type (%d) not implemented in popt\n"
 msgstr "�ɼ� ���� (%d)�� popt���� ����� �� �����ϴ�\n"
 
-#: popt.c:1164
+#: popt.c:1184
 msgid "missing argument"
 msgstr "�μ��� �������� �ʾҽ��ϴ�"
 
-#: popt.c:1166
+#: popt.c:1186
 msgid "unknown option"
 msgstr "�� �� ���� �ɼ��Դϴ�"
 
-#: popt.c:1168
+#: popt.c:1188
 msgid "mutually exclusive logical operations requested"
 msgstr "���ʿ� ��Ÿ�� ���� ������ �����Ǿ����ϴ�"
 
-#: popt.c:1170
+#: popt.c:1190
 msgid "opt->arg should not be NULL"
 msgstr "�ɼ�->�μ��� NULL�� �Ǿ�� �ȵ˴ϴ�"
 
-#: popt.c:1172
+#: popt.c:1192
 msgid "aliases nested too deeply"
 msgstr "��Ī(alias)�� �����ϰ� �����Ǿ����ϴ�"
 
-#: popt.c:1174
+#: popt.c:1194
 msgid "error in parameter quoting"
 msgstr "�Ű������� ������ �ֽ��ϴ�"
 
-#: popt.c:1176
+#: popt.c:1196
 msgid "invalid numeric value"
 msgstr "�߸��� ��ġ ���Դϴ�"
 
-#: popt.c:1178
+#: popt.c:1198
 msgid "number too large or too small"
 msgstr "���ڰ� �ʹ� ũ�ų� �ʹ� �����ϴ�"
 
-#: popt.c:1180
+#: popt.c:1200
 msgid "memory allocation failed"
 msgstr "�޸� �Ҵ翡 �����߽��ϴ�"
 
-#: popt.c:1184
+#: popt.c:1204
 msgid "unknown error"
 msgstr "�� �� ���� �����Դϴ�"
 
-#: popthelp.c:61
+#: popthelp.c:58 popthelp.c:73
 msgid "Show this help message"
 msgstr "�� ������ �����ݴϴ�"
 
-#: popthelp.c:62
+#: popthelp.c:59 popthelp.c:74
 msgid "Display brief usage message"
 msgstr "������ ������ �����ݴϴ�"
 
-#: popthelp.c:65
+#: popthelp.c:62 popthelp.c:77
 msgid "Display option defaults in message"
 msgstr "�⺻���� �ɼ��� �����ݴϴ�"
 
-#: popthelp.c:107
+#: popthelp.c:122
 msgid "NONE"
 msgstr "����(NONE)"
 
-#: popthelp.c:109
+#: popthelp.c:124
 msgid "VAL"
 msgstr "��(VAL)"
 
-#: popthelp.c:113
+#: popthelp.c:128
 msgid "INT"
 msgstr "����(INT)"
 
-#: popthelp.c:114
+#: popthelp.c:129
 msgid "LONG"
 msgstr "����(LONG)"
 
-#: popthelp.c:115
+#: popthelp.c:130
 msgid "STRING"
 msgstr "���ڿ�(STRING)"
 
-#: popthelp.c:116
+#: popthelp.c:131
 msgid "FLOAT"
 msgstr "�Ҽ�(FLOAT)"
 
-#: popthelp.c:117
+#: popthelp.c:132
 msgid "DOUBLE"
 msgstr "�Ҽ�(DOUBLE)"
 
-#: popthelp.c:118
+#: popthelp.c:133
 msgid "ARG"
 msgstr "�μ�(ARG)"
 
-#: popthelp.c:493
+#: popthelp.c:508
 msgid "Usage:"
 msgstr "����:"
 
-#: popthelp.c:517
+#: popthelp.c:532
 msgid "[OPTION...]"
 msgstr "[�ɼ�...]"
diff --git a/po/no.po b/po/no.po
index 4773d64..3e855da 100644
--- a/po/no.po
+++ b/po/no.po
@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.3\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2003-12-07 15:21-0500\n"
+"POT-Creation-Date: 2003-12-30 08:12-0500\n"
 "PO-Revision-Date: 2001-06-27 11:05+0200\n"
 "Last-Translator: Kjartan Maraas <kmaraas@online.no>\n"
 "Language-Team: Norwegian <no@li.org>\n"
@@ -14,99 +14,99 @@ msgstr ""
 msgid "unknown errno"
 msgstr "ukjent errno"
 
-#: popt.c:944
+#: popt.c:964
 #, c-format
 msgid "option type (%d) not implemented in popt\n"
 msgstr "flaggtype (%d) ikke implementert i popt\n"
 
-#: popt.c:1164
+#: popt.c:1184
 msgid "missing argument"
 msgstr "manglende argument"
 
-#: popt.c:1166
+#: popt.c:1186
 msgid "unknown option"
 msgstr "ukjent flagg"
 
-#: popt.c:1168
+#: popt.c:1188
 msgid "mutually exclusive logical operations requested"
 msgstr "gjensidig eksluderende logiske operasjoner forespurt"
 
-#: popt.c:1170
+#: popt.c:1190
 msgid "opt->arg should not be NULL"
 msgstr "opt->arg m� ikke v�re NULL"
 
-#: popt.c:1172
+#: popt.c:1192
 msgid "aliases nested too deeply"
 msgstr "aliaser med for dype l�kker"
 
-#: popt.c:1174
+#: popt.c:1194
 msgid "error in parameter quoting"
 msgstr "feil i parametersitering"
 
-#: popt.c:1176
+#: popt.c:1196
 msgid "invalid numeric value"
 msgstr "ugyldig numerisk verdi"
 
-#: popt.c:1178
+#: popt.c:1198
 msgid "number too large or too small"
 msgstr "tallet er for stort eller lite"
 
-#: popt.c:1180
+#: popt.c:1200
 msgid "memory allocation failed"
 msgstr "minneallokering feilet"
 
-#: popt.c:1184
+#: popt.c:1204
 msgid "unknown error"
 msgstr "ukjent feil"
 
-#: popthelp.c:61
+#: popthelp.c:58 popthelp.c:73
 msgid "Show this help message"
 msgstr "Vis denne hjelpmeldingen"
 
-#: popthelp.c:62
+#: popthelp.c:59 popthelp.c:74
 msgid "Display brief usage message"
 msgstr "Vis kort bruksmelding"
 
-#: popthelp.c:65
+#: popthelp.c:62 popthelp.c:77
 msgid "Display option defaults in message"
 msgstr "Vis forvalgte flagg i melding"
 
-#: popthelp.c:107
+#: popthelp.c:122
 msgid "NONE"
 msgstr "INGEN"
 
-#: popthelp.c:109
+#: popthelp.c:124
 msgid "VAL"
 msgstr "VERDI"
 
-#: popthelp.c:113
+#: popthelp.c:128
 msgid "INT"
 msgstr "HELTALL"
 
-#: popthelp.c:114
+#: popthelp.c:129
 msgid "LONG"
 msgstr "LONG"
 
-#: popthelp.c:115
+#: popthelp.c:130
 msgid "STRING"
 msgstr "STRENG"
 
-#: popthelp.c:116
+#: popthelp.c:131
 msgid "FLOAT"
 msgstr "FLYTTALL"
 
-#: popthelp.c:117
+#: popthelp.c:132
 msgid "DOUBLE"
 msgstr "DOUBLE"
 
-#: popthelp.c:118
+#: popthelp.c:133
 msgid "ARG"
 msgstr "ARG"
 
-#: popthelp.c:493
+#: popthelp.c:508
 msgid "Usage:"
 msgstr "Bruk:"
 
-#: popthelp.c:517
+#: popthelp.c:532
 msgid "[OPTION...]"
 msgstr "[FLAGG...]"
diff --git a/po/pl.po b/po/pl.po
index ef4ca4e..30a8767 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.9-20030515\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2003-12-07 15:21-0500\n"
+"POT-Creation-Date: 2003-12-30 08:12-0500\n"
 "PO-Revision-Date: 2003-06-08 20:32+0200\n"
 "Last-Translator: Jakub Bogusz <qboosh@pld.org.pl>\n"
 "Language-Team: Polish <translation-team-pl@lists.sourceforge.net>\n"
@@ -18,100 +18,100 @@ msgstr ""
 msgid "unknown errno"
 msgstr "nieznane errno"
 
-#: popt.c:944
+#: popt.c:964
 #, c-format
 msgid "option type (%d) not implemented in popt\n"
 msgstr "rodzaj opcji (%d) nie zaimplementowany w popt\n"
 
-#: popt.c:1164
+#: popt.c:1184
 msgid "missing argument"
 msgstr "brak parametru"
 
-#: popt.c:1166
+#: popt.c:1186
 msgid "unknown option"
 msgstr "nieznana opcja"
 
-#: popt.c:1168
+#: popt.c:1188
 msgid "mutually exclusive logical operations requested"
 msgstr "��danie wykluczaj�cych si� operacji"
 
-#: popt.c:1170
+#: popt.c:1190
 msgid "opt->arg should not be NULL"
 msgstr "opt->arg nie mo�e by� NULL"
 
-#: popt.c:1172
+#: popt.c:1192
 msgid "aliases nested too deeply"
 msgstr "zbyt du�e zag��bienie alias�w"
 
-#: popt.c:1174
+#: popt.c:1194
 msgid "error in parameter quoting"
 msgstr "b��d w cytowaniu parametru"
 
-#: popt.c:1176
+#: popt.c:1196
 msgid "invalid numeric value"
 msgstr "b��dna warto�� liczbowa"
 
-#: popt.c:1178
+#: popt.c:1198
 msgid "number too large or too small"
 msgstr "liczba zbyt du�a lub zbyt ma�a"
 
-#: popt.c:1180
+#: popt.c:1200
 msgid "memory allocation failed"
 msgstr "b��d alokacji pami�ci"
 
-#: popt.c:1184
+#: popt.c:1204
 msgid "unknown error"
 msgstr "nieznany b��d"
 
-#: popthelp.c:61
+#: popthelp.c:58 popthelp.c:73
 msgid "Show this help message"
 msgstr "Poka� t� pomoc"
 
-#: popthelp.c:62
+#: popthelp.c:59 popthelp.c:74
 msgid "Display brief usage message"
 msgstr "Wy�wietl skr�cony spos�b u�ycia"
 
-#: popthelp.c:65
+#: popthelp.c:62 popthelp.c:77
 msgid "Display option defaults in message"
 msgstr "Wy�wietl domy�lne opcje w opisie"
 
-#: popthelp.c:107
+#: popthelp.c:122
 msgid "NONE"
 msgstr "BRAK"
 
-#: popthelp.c:109
+#: popthelp.c:124
 msgid "VAL"
 msgstr "WART"
 
-#: popthelp.c:113
+#: popthelp.c:128
 msgid "INT"
 msgstr "INT"
 
-#: popthelp.c:114
+#: popthelp.c:129
 msgid "LONG"
 msgstr "LONG"
 
-#: popthelp.c:115
+#: popthelp.c:130
 msgid "STRING"
 msgstr "�A�CUCH"
 
-#: popthelp.c:116
+#: popthelp.c:131
 msgid "FLOAT"
 msgstr "FLOAT"
 
-#: popthelp.c:117
+#: popthelp.c:132
 msgid "DOUBLE"
 msgstr "DOUBLE"
 
-#: popthelp.c:118
+#: popthelp.c:133
 msgid "ARG"
 msgstr "PARAM"
 
-#: popthelp.c:493
+#: popthelp.c:508
 msgid "Usage:"
 msgstr "Sk�adnia:"
 
-#: popthelp.c:517
+#: popthelp.c:532
 msgid "[OPTION...]"
 msgstr "[OPCJA...]"
 
diff --git a/po/popt.pot b/po/popt.pot
index 176e818..f75465a 100644
--- a/po/popt.pot
+++ b/po/popt.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2003-12-07 15:21-0500\n"
+"POT-Creation-Date: 2003-12-30 08:12-0500\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -20,99 +20,99 @@ msgstr ""
 msgid "unknown errno"
 msgstr ""
 
-#: popt.c:944
+#: popt.c:964
 #, c-format
 msgid "option type (%d) not implemented in popt\n"
 msgstr ""
 
-#: popt.c:1164
+#: popt.c:1184
 msgid "missing argument"
 msgstr ""
 
-#: popt.c:1166
+#: popt.c:1186
 msgid "unknown option"
 msgstr ""
 
-#: popt.c:1168
+#: popt.c:1188
 msgid "mutually exclusive logical operations requested"
 msgstr ""
 
-#: popt.c:1170
+#: popt.c:1190
 msgid "opt->arg should not be NULL"
 msgstr ""
 
-#: popt.c:1172
+#: popt.c:1192
 msgid "aliases nested too deeply"
 msgstr ""
 
-#: popt.c:1174
+#: popt.c:1194
 msgid "error in parameter quoting"
 msgstr ""
 
-#: popt.c:1176
+#: popt.c:1196
 msgid "invalid numeric value"
 msgstr ""
 
-#: popt.c:1178
+#: popt.c:1198
 msgid "number too large or too small"
 msgstr ""
 
-#: popt.c:1180
+#: popt.c:1200
 msgid "memory allocation failed"
 msgstr ""
 
-#: popt.c:1184
+#: popt.c:1204
 msgid "unknown error"
 msgstr ""
 
-#: popthelp.c:61
+#: popthelp.c:58 popthelp.c:73
 msgid "Show this help message"
 msgstr ""
 
-#: popthelp.c:62
+#: popthelp.c:59 popthelp.c:74
 msgid "Display brief usage message"
 msgstr ""
 
-#: popthelp.c:65
+#: popthelp.c:62 popthelp.c:77
 msgid "Display option defaults in message"
 msgstr ""
 
-#: popthelp.c:107
+#: popthelp.c:122
 msgid "NONE"
 msgstr ""
 
-#: popthelp.c:109
+#: popthelp.c:124
 msgid "VAL"
 msgstr ""
 
-#: popthelp.c:113
+#: popthelp.c:128
 msgid "INT"
 msgstr ""
 
-#: popthelp.c:114
+#: popthelp.c:129
 msgid "LONG"
 msgstr ""
 
-#: popthelp.c:115
+#: popthelp.c:130
 msgid "STRING"
 msgstr ""
 
-#: popthelp.c:116
+#: popthelp.c:131
 msgid "FLOAT"
 msgstr ""
 
-#: popthelp.c:117
+#: popthelp.c:132
 msgid "DOUBLE"
 msgstr ""
 
-#: popthelp.c:118
+#: popthelp.c:133
 msgid "ARG"
 msgstr ""
 
-#: popthelp.c:493
+#: popthelp.c:508
 msgid "Usage:"
 msgstr ""
 
-#: popthelp.c:517
+#: popthelp.c:532
 msgid "[OPTION...]"
 msgstr ""
diff --git a/po/pt.po b/po/pt.po
index 458e648..341f4c2 100644
--- a/po/pt.po
+++ b/po/pt.po
@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: popt\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2003-12-07 15:21-0500\n"
+"POT-Creation-Date: 2003-12-30 08:12-0500\n"
 "PO-Revision-Date: 2002-02-13 18:32+0000\n"
 "Last-Translator: Pedro Morais <morais@kde.org>\n"
 "Language-Team: pt <morais@kde.org>\n"
@@ -14,99 +14,99 @@ msgstr ""
 msgid "unknown errno"
 msgstr "errno desconhecido"
 
-#: popt.c:944
+#: popt.c:964
 #, c-format
 msgid "option type (%d) not implemented in popt\n"
 msgstr "tipo de op��o (%d) n�o implementado no popt\n"
 
-#: popt.c:1164
+#: popt.c:1184
 msgid "missing argument"
 msgstr "falta um argumento"
 
-#: popt.c:1166
+#: popt.c:1186
 msgid "unknown option"
 msgstr "op��o desconhecida"
 
-#: popt.c:1168
+#: popt.c:1188
 msgid "mutually exclusive logical operations requested"
 msgstr "foram pedidas opera��es l�gicas mutuamente exclusivas"
 
-#: popt.c:1170
+#: popt.c:1190
 msgid "opt->arg should not be NULL"
 msgstr "opt->arg n�o deve ser NULL"
 
-#: popt.c:1172
+#: popt.c:1192
 msgid "aliases nested too deeply"
 msgstr "'aliases' demasiado aninhados"
 
-#: popt.c:1174
+#: popt.c:1194
 msgid "error in parameter quoting"
 msgstr "erros no 'quoting' de par�metros"
 
-#: popt.c:1176
+#: popt.c:1196
 msgid "invalid numeric value"
 msgstr "valor n�merico inv�lido"
 
-#: popt.c:1178
+#: popt.c:1198
 msgid "number too large or too small"
 msgstr "n�mero demasiado grando ou pequeno"
 
-#: popt.c:1180
+#: popt.c:1200
 msgid "memory allocation failed"
 msgstr "aloca��o de mem�ria falhou"
 
-#: popt.c:1184
+#: popt.c:1204
 msgid "unknown error"
 msgstr "erro desconhecido"
 
-#: popthelp.c:61
+#: popthelp.c:58 popthelp.c:73
 msgid "Show this help message"
 msgstr "Mostrar esta mensagem de ajuda"
 
-#: popthelp.c:62
+#: popthelp.c:59 popthelp.c:74
 msgid "Display brief usage message"
 msgstr "Mostrar uma mensagem de utiliza��o sucinta"
 
-#: popthelp.c:65
+#: popthelp.c:62 popthelp.c:77
 msgid "Display option defaults in message"
 msgstr "Mostrar valor por omiss�o das op��es na mensagem"
 
-#: popthelp.c:107
+#: popthelp.c:122
 msgid "NONE"
 msgstr "NONE"
 
-#: popthelp.c:109
+#: popthelp.c:124
 msgid "VAL"
 msgstr "VAL"
 
-#: popthelp.c:113
+#: popthelp.c:128
 msgid "INT"
 msgstr "INT"
 
-#: popthelp.c:114
+#: popthelp.c:129
 msgid "LONG"
 msgstr "LONG"
 
-#: popthelp.c:115
+#: popthelp.c:130
 msgid "STRING"
 msgstr "STRING"
 
-#: popthelp.c:116
+#: popthelp.c:131
 msgid "FLOAT"
 msgstr "FLOAT"
 
-#: popthelp.c:117
+#: popthelp.c:132
 msgid "DOUBLE"
 msgstr "DOUBLE"
 
-#: popthelp.c:118
+#: popthelp.c:133
 msgid "ARG"
 msgstr "ARG"
 
-#: popthelp.c:493
+#: popthelp.c:508
 msgid "Usage:"
 msgstr "Utiliza��o:"
 
-#: popthelp.c:517
+#: popthelp.c:532
 msgid "[OPTION...]"
 msgstr "[OP��O...]"
diff --git a/po/pt_BR.po b/po/pt_BR.po
index 7cce06e..44701c9 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.3\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2003-12-07 15:21-0500\n"
+"POT-Creation-Date: 2003-12-30 08:12-0500\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -19,99 +19,99 @@ msgstr ""
 msgid "unknown errno"
 msgstr ""
 
-#: popt.c:944
+#: popt.c:964
 #, c-format
 msgid "option type (%d) not implemented in popt\n"
 msgstr ""
 
-#: popt.c:1164
+#: popt.c:1184
 msgid "missing argument"
 msgstr ""
 
-#: popt.c:1166
+#: popt.c:1186
 msgid "unknown option"
 msgstr ""
 
-#: popt.c:1168
+#: popt.c:1188
 msgid "mutually exclusive logical operations requested"
 msgstr ""
 
-#: popt.c:1170
+#: popt.c:1190
 msgid "opt->arg should not be NULL"
 msgstr ""
 
-#: popt.c:1172
+#: popt.c:1192
 msgid "aliases nested too deeply"
 msgstr ""
 
-#: popt.c:1174
+#: popt.c:1194
 msgid "error in parameter quoting"
 msgstr ""
 
-#: popt.c:1176
+#: popt.c:1196
 msgid "invalid numeric value"
 msgstr ""
 
-#: popt.c:1178
+#: popt.c:1198
 msgid "number too large or too small"
 msgstr ""
 
-#: popt.c:1180
+#: popt.c:1200
 msgid "memory allocation failed"
 msgstr ""
 
-#: popt.c:1184
+#: popt.c:1204
 msgid "unknown error"
 msgstr ""
 
-#: popthelp.c:61
+#: popthelp.c:58 popthelp.c:73
 msgid "Show this help message"
 msgstr ""
 
-#: popthelp.c:62
+#: popthelp.c:59 popthelp.c:74
 msgid "Display brief usage message"
 msgstr ""
 
-#: popthelp.c:65
+#: popthelp.c:62 popthelp.c:77
 msgid "Display option defaults in message"
 msgstr ""
 
-#: popthelp.c:107
+#: popthelp.c:122
 msgid "NONE"
 msgstr ""
 
-#: popthelp.c:109
+#: popthelp.c:124
 msgid "VAL"
 msgstr ""
 
-#: popthelp.c:113
+#: popthelp.c:128
 msgid "INT"
 msgstr ""
 
-#: popthelp.c:114
+#: popthelp.c:129
 msgid "LONG"
 msgstr ""
 
-#: popthelp.c:115
+#: popthelp.c:130
 msgid "STRING"
 msgstr ""
 
-#: popthelp.c:116
+#: popthelp.c:131
 msgid "FLOAT"
 msgstr ""
 
-#: popthelp.c:117
+#: popthelp.c:132
 msgid "DOUBLE"
 msgstr ""
 
-#: popthelp.c:118
+#: popthelp.c:133
 msgid "ARG"
 msgstr ""
 
-#: popthelp.c:493
+#: popthelp.c:508
 msgid "Usage:"
 msgstr ""
 
-#: popthelp.c:517
+#: popthelp.c:532
 msgid "[OPTION...]"
 msgstr ""
diff --git a/po/ro.po b/po/ro.po
index 4c68c56..a285571 100644
--- a/po/ro.po
+++ b/po/ro.po
@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.3\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2003-12-07 15:21-0500\n"
+"POT-Creation-Date: 2003-12-30 08:12-0500\n"
 "PO-Revision-Date: 2000-06-14 23:23+EST\n"
 "Last-Translator: Cristian Gafton <gafton@redhat.com>\n"
 "Language-Team: Romanian <ro@li.org>\n"
@@ -14,101 +14,101 @@ msgstr ""
 msgid "unknown errno"
 msgstr "eroare necunoscuta"
 
-#: popt.c:944
+#: popt.c:964
 #, c-format
 msgid "option type (%d) not implemented in popt\n"
 msgstr "optiunea de tipul (%d) nu este implementata in popt\n"
 
-#: popt.c:1164
+#: popt.c:1184
 msgid "missing argument"
 msgstr "argument lipsa"
 
-#: popt.c:1166
+#: popt.c:1186
 msgid "unknown option"
 msgstr "optiune necunoscuta"
 
-#: popt.c:1168
+#: popt.c:1188
 msgid "mutually exclusive logical operations requested"
 msgstr ""
 
-#: popt.c:1170
+#: popt.c:1190
 msgid "opt->arg should not be NULL"
 msgstr ""
 
-#: popt.c:1172
+#: popt.c:1192
 msgid "aliases nested too deeply"
 msgstr "recursivitate infinita la optiunile sinonime"
 
-#: popt.c:1174
+#: popt.c:1194
 #, fuzzy
 msgid "error in parameter quoting"
 msgstr "eroare la insertie parametru"
 
-#: popt.c:1176
+#: popt.c:1196
 msgid "invalid numeric value"
 msgstr "valoare numarica invalida"
 
-#: popt.c:1178
+#: popt.c:1198
 msgid "number too large or too small"
 msgstr "numar prea mare sau prea mic"
 
-#: popt.c:1180
+#: popt.c:1200
 msgid "memory allocation failed"
 msgstr ""
 
-#: popt.c:1184
+#: popt.c:1204
 msgid "unknown error"
 msgstr "eroare necuinoscuta"
 
-#: popthelp.c:61
+#: popthelp.c:58 popthelp.c:73
 msgid "Show this help message"
 msgstr "Afisare mesaj de help"
 
-#: popthelp.c:62
+#: popthelp.c:59 popthelp.c:74
 msgid "Display brief usage message"
 msgstr "Afisare mesaj sintaxa sumar"
 
-#: popthelp.c:65
+#: popthelp.c:62 popthelp.c:77
 #, fuzzy
 msgid "Display option defaults in message"
 msgstr "Afisare mesaj sintaxa sumar"
 
-#: popthelp.c:107
+#: popthelp.c:122
 msgid "NONE"
 msgstr ""
 
-#: popthelp.c:109
+#: popthelp.c:124
 msgid "VAL"
 msgstr ""
 
-#: popthelp.c:113
+#: popthelp.c:128
 msgid "INT"
 msgstr ""
 
-#: popthelp.c:114
+#: popthelp.c:129
 msgid "LONG"
 msgstr ""
 
-#: popthelp.c:115
+#: popthelp.c:130
 msgid "STRING"
 msgstr ""
 
-#: popthelp.c:116
+#: popthelp.c:131
 msgid "FLOAT"
 msgstr ""
 
-#: popthelp.c:117
+#: popthelp.c:132
 msgid "DOUBLE"
 msgstr ""
 
-#: popthelp.c:118
+#: popthelp.c:133
 msgid "ARG"
 msgstr ""
 
-#: popthelp.c:493
+#: popthelp.c:508
 msgid "Usage:"
 msgstr "Sintaxa:"
 
-#: popthelp.c:517
+#: popthelp.c:532
 msgid "[OPTION...]"
 msgstr "[OPTIUNE...]"
diff --git a/po/ru.po b/po/ru.po
index c6ff1cc..8c6893d 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.3\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2003-12-07 15:21-0500\n"
+"POT-Creation-Date: 2003-12-30 08:12-0500\n"
 "PO-Revision-Date: 2001-07-05 21:00-0500\n"
 "Last-Translator: Eugene Kanter <eugene@blackcatlinux.com>\n"
 "Language-Team: Black Cat Linux Team <blackcat-support@blackcatlinux.com>\n"
@@ -14,99 +14,99 @@ msgstr ""
 msgid "unknown errno"
 msgstr "����������� ����� ������"
 
-#: popt.c:944
+#: popt.c:964
 #, c-format
 msgid "option type (%d) not implemented in popt\n"
 msgstr "��������� ��������� (%d) � popt �� �������������\n"
 
-#: popt.c:1164
+#: popt.c:1184
 msgid "missing argument"
 msgstr "�������� ��������"
 
-#: popt.c:1166
+#: popt.c:1186
 msgid "unknown option"
 msgstr "����������� ��������"
 
-#: popt.c:1168
+#: popt.c:1188
 msgid "mutually exclusive logical operations requested"
 msgstr "��������� ������� ����������� ���������� ��������"
 
-#: popt.c:1170
+#: popt.c:1190
 msgid "opt->arg should not be NULL"
 msgstr "opt->arg �� ����� ���� NULL"
 
-#: popt.c:1172
+#: popt.c:1192
 msgid "aliases nested too deeply"
 msgstr "�������� ������� ���������� �������� �����������"
 
-#: popt.c:1174
+#: popt.c:1194
 msgid "error in parameter quoting"
 msgstr "�����a ��������� ���������� � �������"
 
-#: popt.c:1176
+#: popt.c:1196
 msgid "invalid numeric value"
 msgstr "������������ �������� ��������"
 
-#: popt.c:1178
+#: popt.c:1198
 msgid "number too large or too small"
 msgstr "�������� �������� �� ��������� ����������������"
 
-#: popt.c:1180
+#: popt.c:1200
 msgid "memory allocation failed"
 msgstr "������ ��������� ������"
 
-#: popt.c:1184
+#: popt.c:1204
 msgid "unknown error"
 msgstr "����������� ������"
 
-#: popthelp.c:61
+#: popthelp.c:58 popthelp.c:73
 msgid "Show this help message"
 msgstr "�������� ��� ���������"
 
-#: popthelp.c:62
+#: popthelp.c:59 popthelp.c:74
 msgid "Display brief usage message"
 msgstr "�������� ������� ���������� �� �������������"
 
-#: popthelp.c:65
+#: popthelp.c:62 popthelp.c:77
 msgid "Display option defaults in message"
 msgstr "�������� ��������� �� ���������"
 
-#: popthelp.c:107
+#: popthelp.c:122
 msgid "NONE"
 msgstr "NONE"
 
-#: popthelp.c:109
+#: popthelp.c:124
 msgid "VAL"
 msgstr "VAL"
 
-#: popthelp.c:113
+#: popthelp.c:128
 msgid "INT"
 msgstr "INT"
 
-#: popthelp.c:114
+#: popthelp.c:129
 msgid "LONG"
 msgstr "LONG"
 
-#: popthelp.c:115
+#: popthelp.c:130
 msgid "STRING"
 msgstr "STRING"
 
-#: popthelp.c:116
+#: popthelp.c:131
 msgid "FLOAT"
 msgstr "FLOAT"
 
-#: popthelp.c:117
+#: popthelp.c:132
 msgid "DOUBLE"
 msgstr "DOUBLE"
 
-#: popthelp.c:118
+#: popthelp.c:133
 msgid "ARG"
 msgstr "ARG"
 
-#: popthelp.c:493
+#: popthelp.c:508
 msgid "Usage:"
 msgstr "�������������:"
 
-#: popthelp.c:517
+#: popthelp.c:532
 msgid "[OPTION...]"
 msgstr "[��������...]"
diff --git a/po/sk.po b/po/sk.po
index 5898923..478ce97 100644
--- a/po/sk.po
+++ b/po/sk.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.3\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2003-12-07 15:21-0500\n"
+"POT-Creation-Date: 2003-12-30 08:12-0500\n"
 "PO-Revision-Date: 1999-08-04 21:40+0200\n"
 "Last-Translator: Stanislav Meduna <stano@eunet.sk>\n"
 "Language-Team: Slovak <sk-i18n@rak.isternet.sk>\n"
@@ -18,100 +18,100 @@ msgstr ""
 msgid "unknown errno"
 msgstr ""
 
-#: popt.c:944
+#: popt.c:964
 #, c-format
 msgid "option type (%d) not implemented in popt\n"
 msgstr ""
 
-#: popt.c:1164
+#: popt.c:1184
 msgid "missing argument"
 msgstr ""
 
-#: popt.c:1166
+#: popt.c:1186
 msgid "unknown option"
 msgstr ""
 
-#: popt.c:1168
+#: popt.c:1188
 msgid "mutually exclusive logical operations requested"
 msgstr ""
 
-#: popt.c:1170
+#: popt.c:1190
 msgid "opt->arg should not be NULL"
 msgstr ""
 
-#: popt.c:1172
+#: popt.c:1192
 msgid "aliases nested too deeply"
 msgstr ""
 
-#: popt.c:1174
+#: popt.c:1194
 msgid "error in parameter quoting"
 msgstr ""
 
-#: popt.c:1176
+#: popt.c:1196
 msgid "invalid numeric value"
 msgstr ""
 
-#: popt.c:1178
+#: popt.c:1198
 msgid "number too large or too small"
 msgstr ""
 
-#: popt.c:1180
+#: popt.c:1200
 msgid "memory allocation failed"
 msgstr ""
 
-#: popt.c:1184
+#: popt.c:1204
 msgid "unknown error"
 msgstr ""
 
-#: popthelp.c:61
+#: popthelp.c:58 popthelp.c:73
 msgid "Show this help message"
 msgstr "Vyp�sa� t�to spr�vu"
 
-#: popthelp.c:62
+#: popthelp.c:59 popthelp.c:74
 msgid "Display brief usage message"
 msgstr "Zobrazi� stru�n� n�vod na pou�itie"
 
-#: popthelp.c:65
+#: popthelp.c:62 popthelp.c:77
 #, fuzzy
 msgid "Display option defaults in message"
 msgstr "Zobrazi� stru�n� n�vod na pou�itie"
 
-#: popthelp.c:107
+#: popthelp.c:122
 msgid "NONE"
 msgstr ""
 
-#: popthelp.c:109
+#: popthelp.c:124
 msgid "VAL"
 msgstr ""
 
-#: popthelp.c:113
+#: popthelp.c:128
 msgid "INT"
 msgstr ""
 
-#: popthelp.c:114
+#: popthelp.c:129
 msgid "LONG"
 msgstr ""
 
-#: popthelp.c:115
+#: popthelp.c:130
 msgid "STRING"
 msgstr ""
 
-#: popthelp.c:116
+#: popthelp.c:131
 msgid "FLOAT"
 msgstr ""
 
-#: popthelp.c:117
+#: popthelp.c:132
 msgid "DOUBLE"
 msgstr ""
 
-#: popthelp.c:118
+#: popthelp.c:133
 msgid "ARG"
 msgstr ""
 
-#: popthelp.c:493
+#: popthelp.c:508
 msgid "Usage:"
 msgstr ""
 
-#: popthelp.c:517
+#: popthelp.c:532
 msgid "[OPTION...]"
 msgstr ""
diff --git a/po/sl.po b/po/sl.po
index 369f312..6c3e467 100644
--- a/po/sl.po
+++ b/po/sl.po
@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.3\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2003-12-07 15:21-0500\n"
+"POT-Creation-Date: 2003-12-30 08:12-0500\n"
 "PO-Revision-Date: 2000-09-05 12:30+0200\n"
 "Last-Translator: Roman Maurer <roman.maurer@hermes.si>\n"
 "Language-Team: Slovenian <sl@li.org>\n"
@@ -14,100 +14,100 @@ msgstr ""
 msgid "unknown errno"
 msgstr ""
 
-#: popt.c:944
+#: popt.c:964
 #, c-format
 msgid "option type (%d) not implemented in popt\n"
 msgstr ""
 
-#: popt.c:1164
+#: popt.c:1184
 msgid "missing argument"
 msgstr ""
 
-#: popt.c:1166
+#: popt.c:1186
 msgid "unknown option"
 msgstr ""
 
-#: popt.c:1168
+#: popt.c:1188
 msgid "mutually exclusive logical operations requested"
 msgstr ""
 
-#: popt.c:1170
+#: popt.c:1190
 msgid "opt->arg should not be NULL"
 msgstr ""
 
-#: popt.c:1172
+#: popt.c:1192
 msgid "aliases nested too deeply"
 msgstr ""
 
-#: popt.c:1174
+#: popt.c:1194
 msgid "error in parameter quoting"
 msgstr ""
 
-#: popt.c:1176
+#: popt.c:1196
 msgid "invalid numeric value"
 msgstr ""
 
-#: popt.c:1178
+#: popt.c:1198
 msgid "number too large or too small"
 msgstr ""
 
-#: popt.c:1180
+#: popt.c:1200
 msgid "memory allocation failed"
 msgstr ""
 
-#: popt.c:1184
+#: popt.c:1204
 msgid "unknown error"
 msgstr ""
 
-#: popthelp.c:61
+#: popthelp.c:58 popthelp.c:73
 msgid "Show this help message"
 msgstr "Prika�i to sporo�ilo s pomo�jo"
 
-#: popthelp.c:62
+#: popthelp.c:59 popthelp.c:74
 msgid "Display brief usage message"
 msgstr "Prika�i kratko sporo�ilo o uporabi"
 
-#: popthelp.c:65
+#: popthelp.c:62 popthelp.c:77
 #, fuzzy
 msgid "Display option defaults in message"
 msgstr "Prika�i kratko sporo�ilo o uporabi"
 
-#: popthelp.c:107
+#: popthelp.c:122
 msgid "NONE"
 msgstr ""
 
-#: popthelp.c:109
+#: popthelp.c:124
 msgid "VAL"
 msgstr ""
 
-#: popthelp.c:113
+#: popthelp.c:128
 msgid "INT"
 msgstr ""
 
-#: popthelp.c:114
+#: popthelp.c:129
 msgid "LONG"
 msgstr ""
 
-#: popthelp.c:115
+#: popthelp.c:130
 msgid "STRING"
 msgstr ""
 
-#: popthelp.c:116
+#: popthelp.c:131
 msgid "FLOAT"
 msgstr ""
 
-#: popthelp.c:117
+#: popthelp.c:132
 msgid "DOUBLE"
 msgstr ""
 
-#: popthelp.c:118
+#: popthelp.c:133
 msgid "ARG"
 msgstr ""
 
-#: popthelp.c:493
+#: popthelp.c:508
 msgid "Usage:"
 msgstr ""
 
-#: popthelp.c:517
+#: popthelp.c:532
 msgid "[OPTION...]"
 msgstr ""
diff --git a/po/sr.po b/po/sr.po
index 7cce06e..44701c9 100644
--- a/po/sr.po
+++ b/po/sr.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.3\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2003-12-07 15:21-0500\n"
+"POT-Creation-Date: 2003-12-30 08:12-0500\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -19,99 +19,99 @@ msgstr ""
 msgid "unknown errno"
 msgstr ""
 
-#: popt.c:944
+#: popt.c:964
 #, c-format
 msgid "option type (%d) not implemented in popt\n"
 msgstr ""
 
-#: popt.c:1164
+#: popt.c:1184
 msgid "missing argument"
 msgstr ""
 
-#: popt.c:1166
+#: popt.c:1186
 msgid "unknown option"
 msgstr ""
 
-#: popt.c:1168
+#: popt.c:1188
 msgid "mutually exclusive logical operations requested"
 msgstr ""
 
-#: popt.c:1170
+#: popt.c:1190
 msgid "opt->arg should not be NULL"
 msgstr ""
 
-#: popt.c:1172
+#: popt.c:1192
 msgid "aliases nested too deeply"
 msgstr ""
 
-#: popt.c:1174
+#: popt.c:1194
 msgid "error in parameter quoting"
 msgstr ""
 
-#: popt.c:1176
+#: popt.c:1196
 msgid "invalid numeric value"
 msgstr ""
 
-#: popt.c:1178
+#: popt.c:1198
 msgid "number too large or too small"
 msgstr ""
 
-#: popt.c:1180
+#: popt.c:1200
 msgid "memory allocation failed"
 msgstr ""
 
-#: popt.c:1184
+#: popt.c:1204
 msgid "unknown error"
 msgstr ""
 
-#: popthelp.c:61
+#: popthelp.c:58 popthelp.c:73
 msgid "Show this help message"
 msgstr ""
 
-#: popthelp.c:62
+#: popthelp.c:59 popthelp.c:74
 msgid "Display brief usage message"
 msgstr ""
 
-#: popthelp.c:65
+#: popthelp.c:62 popthelp.c:77
 msgid "Display option defaults in message"
 msgstr ""
 
-#: popthelp.c:107
+#: popthelp.c:122
 msgid "NONE"
 msgstr ""
 
-#: popthelp.c:109
+#: popthelp.c:124
 msgid "VAL"
 msgstr ""
 
-#: popthelp.c:113
+#: popthelp.c:128
 msgid "INT"
 msgstr ""
 
-#: popthelp.c:114
+#: popthelp.c:129
 msgid "LONG"
 msgstr ""
 
-#: popthelp.c:115
+#: popthelp.c:130
 msgid "STRING"
 msgstr ""
 
-#: popthelp.c:116
+#: popthelp.c:131
 msgid "FLOAT"
 msgstr ""
 
-#: popthelp.c:117
+#: popthelp.c:132
 msgid "DOUBLE"
 msgstr ""
 
-#: popthelp.c:118
+#: popthelp.c:133
 msgid "ARG"
 msgstr ""
 
-#: popthelp.c:493
+#: popthelp.c:508
 msgid "Usage:"
 msgstr ""
 
-#: popthelp.c:517
+#: popthelp.c:532
 msgid "[OPTION...]"
 msgstr ""
diff --git a/po/sv.po b/po/sv.po
index 0f1d816..92ffc3d 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.3\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2003-12-07 15:21-0500\n"
+"POT-Creation-Date: 2003-12-30 08:12-0500\n"
 "PO-Revision-Date: 2001-07-12 22:26+0100\n"
 "Last-Translator: Christian Rose <menthos@menthos.com>\n"
 "Language-Team: Swedish <sv@li.org>\n"
@@ -14,99 +14,99 @@ msgstr ""
 msgid "unknown errno"
 msgstr "ok�nt felnummer"
 
-#: popt.c:944
+#: popt.c:964
 #, c-format
 msgid "option type (%d) not implemented in popt\n"
 msgstr "flaggtypen (%d) �r inte implementerad i popt\n"
 
-#: popt.c:1164
+#: popt.c:1184
 msgid "missing argument"
 msgstr "argument saknas"
 
-#: popt.c:1166
+#: popt.c:1186
 msgid "unknown option"
 msgstr "ok�nd flagga"
 
-#: popt.c:1168
+#: popt.c:1188
 msgid "mutually exclusive logical operations requested"
 msgstr "�msesidigt uteslutande logiska operationer beg�rdes"
 
-#: popt.c:1170
+#: popt.c:1190
 msgid "opt->arg should not be NULL"
 msgstr "opt->arg f�r inte vara NULL"
 
-#: popt.c:1172
+#: popt.c:1192
 msgid "aliases nested too deeply"
 msgstr "alias �r n�stlade f�r djupt"
 
-#: popt.c:1174
+#: popt.c:1194
 msgid "error in parameter quoting"
 msgstr "fel i parametercitering"
 
-#: popt.c:1176
+#: popt.c:1196
 msgid "invalid numeric value"
 msgstr "ogiltigt numeriskt v�rde"
 
-#: popt.c:1178
+#: popt.c:1198
 msgid "number too large or too small"
 msgstr "talet f�r stort eller f�r litet"
 
-#: popt.c:1180
+#: popt.c:1200
 msgid "memory allocation failed"
 msgstr "minnesallokering misslyckades"
 
-#: popt.c:1184
+#: popt.c:1204
 msgid "unknown error"
 msgstr "ok�nt fel"
 
-#: popthelp.c:61
+#: popthelp.c:58 popthelp.c:73
 msgid "Show this help message"
 msgstr "Visa denna hj�lptext"
 
-#: popthelp.c:62
+#: popthelp.c:59 popthelp.c:74
 msgid "Display brief usage message"
 msgstr "Visa en kortfattad anv�ndningstext"
 
-#: popthelp.c:65
+#: popthelp.c:62 popthelp.c:77
 msgid "Display option defaults in message"
 msgstr "Visa standardalternativ f�r flaggor i meddelande"
 
-#: popthelp.c:107
+#: popthelp.c:122
 msgid "NONE"
 msgstr "INGET"
 
-#: popthelp.c:109
+#: popthelp.c:124
 msgid "VAL"
 msgstr "V�RDE"
 
-#: popthelp.c:113
+#: popthelp.c:128
 msgid "INT"
 msgstr "HELTAL"
 
-#: popthelp.c:114
+#: popthelp.c:129
 msgid "LONG"
 msgstr "L�NG"
 
-#: popthelp.c:115
+#: popthelp.c:130
 msgid "STRING"
 msgstr "STR�NG"
 
-#: popthelp.c:116
+#: popthelp.c:131
 msgid "FLOAT"
 msgstr "FLYTTAL"
 
-#: popthelp.c:117
+#: popthelp.c:132
 msgid "DOUBLE"
 msgstr "DUBBEL"
 
-#: popthelp.c:118
+#: popthelp.c:133
 msgid "ARG"
 msgstr "ARG"
 
-#: popthelp.c:493
+#: popthelp.c:508
 msgid "Usage:"
 msgstr "Anv�ndning:"
 
-#: popthelp.c:517
+#: popthelp.c:532
 msgid "[OPTION...]"
 msgstr "[FLAGGA...]"
diff --git a/po/tr.po b/po/tr.po
index 0b5f813..5dd2c10 100644
--- a/po/tr.po
+++ b/po/tr.po
@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.3\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2003-12-07 15:21-0500\n"
+"POT-Creation-Date: 2003-12-30 08:12-0500\n"
 "PO-Revision-Date: 2000-02-11 13:01+0200\n"
 "Last-Translator: Nilgun Belma Buguner <nilgun@technologist.com>\n"
 "Language-Team: Turkish <tr@li.org>\n"
@@ -14,100 +14,100 @@ msgstr ""
 msgid "unknown errno"
 msgstr "bilinmeyen hata no"
 
-#: popt.c:944
+#: popt.c:964
 #, c-format
 msgid "option type (%d) not implemented in popt\n"
 msgstr "se�enek t�r� (%d) popt i�in ge�ersiz\n"
 
-#: popt.c:1164
+#: popt.c:1184
 msgid "missing argument"
 msgstr "arg�man eksik"
 
-#: popt.c:1166
+#: popt.c:1186
 msgid "unknown option"
 msgstr "bilinmeyen se�enek"
 
-#: popt.c:1168
+#: popt.c:1188
 msgid "mutually exclusive logical operations requested"
 msgstr "birbirini d��layan mant�ksal i�lemler istendi"
 
-#: popt.c:1170
+#: popt.c:1190
 msgid "opt->arg should not be NULL"
 msgstr ""
 
-#: popt.c:1172
+#: popt.c:1192
 msgid "aliases nested too deeply"
 msgstr "adlarda �ok fazla i�i�elikler"
 
-#: popt.c:1174
+#: popt.c:1194
 msgid "error in parameter quoting"
 msgstr "parametrelerde t�rnak i�aretleme hatal� "
 
-#: popt.c:1176
+#: popt.c:1196
 msgid "invalid numeric value"
 msgstr "say�sal de�er ge�ersiz"
 
-#: popt.c:1178
+#: popt.c:1198
 msgid "number too large or too small"
 msgstr "say� ya �ok b�y�k ya da �ok k���k"
 
-#: popt.c:1180
+#: popt.c:1200
 msgid "memory allocation failed"
 msgstr ""
 
-#: popt.c:1184
+#: popt.c:1204
 msgid "unknown error"
 msgstr "bilinmeyen hata"
 
-#: popthelp.c:61
+#: popthelp.c:58 popthelp.c:73
 msgid "Show this help message"
 msgstr "Bu yard�m iletisini g�sterir"
 
-#: popthelp.c:62
+#: popthelp.c:59 popthelp.c:74
 msgid "Display brief usage message"
 msgstr "K�sa bir kullan�m iletisi g�ster"
 
-#: popthelp.c:65
+#: popthelp.c:62 popthelp.c:77
 #, fuzzy
 msgid "Display option defaults in message"
 msgstr "K�sa bir kullan�m iletisi g�ster"
 
-#: popthelp.c:107
+#: popthelp.c:122
 msgid "NONE"
 msgstr "YOK"
 
-#: popthelp.c:109
+#: popthelp.c:124
 msgid "VAL"
 msgstr "DE�"
 
-#: popthelp.c:113
+#: popthelp.c:128
 msgid "INT"
 msgstr "INT"
 
-#: popthelp.c:114
+#: popthelp.c:129
 msgid "LONG"
 msgstr "LONG"
 
-#: popthelp.c:115
+#: popthelp.c:130
 msgid "STRING"
 msgstr "STRING"
 
-#: popthelp.c:116
+#: popthelp.c:131
 msgid "FLOAT"
 msgstr "FLOAT"
 
-#: popthelp.c:117
+#: popthelp.c:132
 msgid "DOUBLE"
 msgstr "DOUBLE"
 
-#: popthelp.c:118
+#: popthelp.c:133
 msgid "ARG"
 msgstr "ARG"
 
-#: popthelp.c:493
+#: popthelp.c:508
 msgid "Usage:"
 msgstr "Kullan�m�:"
 
-#: popthelp.c:517
+#: popthelp.c:532
 msgid "[OPTION...]"
 msgstr "[SE�ENEK...]"
diff --git a/po/uk.po b/po/uk.po
index 50ee2fa..85bdacf 100644
--- a/po/uk.po
+++ b/po/uk.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.3\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2003-12-07 15:21-0500\n"
+"POT-Creation-Date: 2003-12-30 08:12-0500\n"
 "PO-Revision-Date: 1999-09-30 16:54+0200\n"
 "Last-Translator: Yuri Syrota <rasta@renome.rovno.ua>\n"
 "Language-Team: Ukrainian <uk@li.org>\n"
@@ -18,100 +18,100 @@ msgstr ""
 msgid "unknown errno"
 msgstr ""
 
-#: popt.c:944
+#: popt.c:964
 #, c-format
 msgid "option type (%d) not implemented in popt\n"
 msgstr ""
 
-#: popt.c:1164
+#: popt.c:1184
 msgid "missing argument"
 msgstr ""
 
-#: popt.c:1166
+#: popt.c:1186
 msgid "unknown option"
 msgstr ""
 
-#: popt.c:1168
+#: popt.c:1188
 msgid "mutually exclusive logical operations requested"
 msgstr ""
 
-#: popt.c:1170
+#: popt.c:1190
 msgid "opt->arg should not be NULL"
 msgstr ""
 
-#: popt.c:1172
+#: popt.c:1192
 msgid "aliases nested too deeply"
 msgstr ""
 
-#: popt.c:1174
+#: popt.c:1194
 msgid "error in parameter quoting"
 msgstr ""
 
-#: popt.c:1176
+#: popt.c:1196
 msgid "invalid numeric value"
 msgstr ""
 
-#: popt.c:1178
+#: popt.c:1198
 msgid "number too large or too small"
 msgstr ""
 
-#: popt.c:1180
+#: popt.c:1200
 msgid "memory allocation failed"
 msgstr ""
 
-#: popt.c:1184
+#: popt.c:1204
 msgid "unknown error"
 msgstr ""
 
-#: popthelp.c:61
+#: popthelp.c:58 popthelp.c:73
 msgid "Show this help message"
 msgstr "�������� �� ��צ���"
 
-#: popthelp.c:62
+#: popthelp.c:59 popthelp.c:74
 msgid "Display brief usage message"
 msgstr "�������� ������� ��צ��� ��� ������������"
 
-#: popthelp.c:65
+#: popthelp.c:62 popthelp.c:77
 #, fuzzy
 msgid "Display option defaults in message"
 msgstr "�������� ������� ��צ��� ��� ������������"
 
-#: popthelp.c:107
+#: popthelp.c:122
 msgid "NONE"
 msgstr ""
 
-#: popthelp.c:109
+#: popthelp.c:124
 msgid "VAL"
 msgstr ""
 
-#: popthelp.c:113
+#: popthelp.c:128
 msgid "INT"
 msgstr ""
 
-#: popthelp.c:114
+#: popthelp.c:129
 msgid "LONG"
 msgstr ""
 
-#: popthelp.c:115
+#: popthelp.c:130
 msgid "STRING"
 msgstr ""
 
-#: popthelp.c:116
+#: popthelp.c:131
 msgid "FLOAT"
 msgstr ""
 
-#: popthelp.c:117
+#: popthelp.c:132
 msgid "DOUBLE"
 msgstr ""
 
-#: popthelp.c:118
+#: popthelp.c:133
 msgid "ARG"
 msgstr ""
 
-#: popthelp.c:493
+#: popthelp.c:508
 msgid "Usage:"
 msgstr ""
 
-#: popthelp.c:517
+#: popthelp.c:532
 msgid "[OPTION...]"
 msgstr ""
diff --git a/po/wa.po b/po/wa.po
index 5e3ddd5..8d06066 100644
--- a/po/wa.po
+++ b/po/wa.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.3\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2003-12-07 15:21-0500\n"
+"POT-Creation-Date: 2003-12-30 08:12-0500\n"
 "PO-Revision-Date: 1999-03-18 23:11+0100\n"
 "Last-Translator: Nobody yet\n"
 "Language-Team: walon <linux-wa@chanae.alphanet.ch>\n"
@@ -22,100 +22,100 @@ msgstr ""
 msgid "unknown errno"
 msgstr ""
 
-#: popt.c:944
+#: popt.c:964
 #, c-format
 msgid "option type (%d) not implemented in popt\n"
 msgstr ""
 
-#: popt.c:1164
+#: popt.c:1184
 msgid "missing argument"
 msgstr ""
 
-#: popt.c:1166
+#: popt.c:1186
 msgid "unknown option"
 msgstr ""
 
-#: popt.c:1168
+#: popt.c:1188
 msgid "mutually exclusive logical operations requested"
 msgstr ""
 
-#: popt.c:1170
+#: popt.c:1190
 msgid "opt->arg should not be NULL"
 msgstr ""
 
-#: popt.c:1172
+#: popt.c:1192
 msgid "aliases nested too deeply"
 msgstr ""
 
-#: popt.c:1174
+#: popt.c:1194
 msgid "error in parameter quoting"
 msgstr ""
 
-#: popt.c:1176
+#: popt.c:1196
 msgid "invalid numeric value"
 msgstr ""
 
-#: popt.c:1178
+#: popt.c:1198
 msgid "number too large or too small"
 msgstr ""
 
-#: popt.c:1180
+#: popt.c:1200
 msgid "memory allocation failed"
 msgstr ""
 
-#: popt.c:1184
+#: popt.c:1204
 msgid "unknown error"
 msgstr ""
 
-#: popthelp.c:61
+#: popthelp.c:58 popthelp.c:73
 msgid "Show this help message"
 msgstr "Mostrer ci messaedje d' aide chal"
 
-#: popthelp.c:62
+#: popthelp.c:59 popthelp.c:74
 msgid "Display brief usage message"
 msgstr "Mostre on court messaedje so kmint vos � siervi"
 
-#: popthelp.c:65
+#: popthelp.c:62 popthelp.c:77
 #, fuzzy
 msgid "Display option defaults in message"
 msgstr "Mostre on court messaedje so kmint vos � siervi"
 
-#: popthelp.c:107
+#: popthelp.c:122
 msgid "NONE"
 msgstr ""
 
-#: popthelp.c:109
+#: popthelp.c:124
 msgid "VAL"
 msgstr ""
 
-#: popthelp.c:113
+#: popthelp.c:128
 msgid "INT"
 msgstr ""
 
-#: popthelp.c:114
+#: popthelp.c:129
 msgid "LONG"
 msgstr ""
 
-#: popthelp.c:115
+#: popthelp.c:130
 msgid "STRING"
 msgstr ""
 
-#: popthelp.c:116
+#: popthelp.c:131
 msgid "FLOAT"
 msgstr ""
 
-#: popthelp.c:117
+#: popthelp.c:132
 msgid "DOUBLE"
 msgstr ""
 
-#: popthelp.c:118
+#: popthelp.c:133
 msgid "ARG"
 msgstr ""
 
-#: popthelp.c:493
+#: popthelp.c:508
 msgid "Usage:"
 msgstr ""
 
-#: popthelp.c:517
+#: popthelp.c:532
 msgid "[OPTION...]"
 msgstr ""
diff --git a/po/zh.po b/po/zh.po
index 7cce06e..44701c9 100644
--- a/po/zh.po
+++ b/po/zh.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.3\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2003-12-07 15:21-0500\n"
+"POT-Creation-Date: 2003-12-30 08:12-0500\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -19,99 +19,99 @@ msgstr ""
 msgid "unknown errno"
 msgstr ""
 
-#: popt.c:944
+#: popt.c:964
 #, c-format
 msgid "option type (%d) not implemented in popt\n"
 msgstr ""
 
-#: popt.c:1164
+#: popt.c:1184
 msgid "missing argument"
 msgstr ""
 
-#: popt.c:1166
+#: popt.c:1186
 msgid "unknown option"
 msgstr ""
 
-#: popt.c:1168
+#: popt.c:1188
 msgid "mutually exclusive logical operations requested"
 msgstr ""
 
-#: popt.c:1170
+#: popt.c:1190
 msgid "opt->arg should not be NULL"
 msgstr ""
 
-#: popt.c:1172
+#: popt.c:1192
 msgid "aliases nested too deeply"
 msgstr ""
 
-#: popt.c:1174
+#: popt.c:1194
 msgid "error in parameter quoting"
 msgstr ""
 
-#: popt.c:1176
+#: popt.c:1196
 msgid "invalid numeric value"
 msgstr ""
 
-#: popt.c:1178
+#: popt.c:1198
 msgid "number too large or too small"
 msgstr ""
 
-#: popt.c:1180
+#: popt.c:1200
 msgid "memory allocation failed"
 msgstr ""
 
-#: popt.c:1184
+#: popt.c:1204
 msgid "unknown error"
 msgstr ""
 
-#: popthelp.c:61
+#: popthelp.c:58 popthelp.c:73
 msgid "Show this help message"
 msgstr ""
 
-#: popthelp.c:62
+#: popthelp.c:59 popthelp.c:74
 msgid "Display brief usage message"
 msgstr ""
 
-#: popthelp.c:65
+#: popthelp.c:62 popthelp.c:77
 msgid "Display option defaults in message"
 msgstr ""
 
-#: popthelp.c:107
+#: popthelp.c:122
 msgid "NONE"
 msgstr ""
 
-#: popthelp.c:109
+#: popthelp.c:124
 msgid "VAL"
 msgstr ""
 
-#: popthelp.c:113
+#: popthelp.c:128
 msgid "INT"
 msgstr ""
 
-#: popthelp.c:114
+#: popthelp.c:129
 msgid "LONG"
 msgstr ""
 
-#: popthelp.c:115
+#: popthelp.c:130
 msgid "STRING"
 msgstr ""
 
-#: popthelp.c:116
+#: popthelp.c:131
 msgid "FLOAT"
 msgstr ""
 
-#: popthelp.c:117
+#: popthelp.c:132
 msgid "DOUBLE"
 msgstr ""
 
-#: popthelp.c:118
+#: popthelp.c:133
 msgid "ARG"
 msgstr ""
 
-#: popthelp.c:493
+#: popthelp.c:508
 msgid "Usage:"
 msgstr ""
 
-#: popthelp.c:517
+#: popthelp.c:532
 msgid "[OPTION...]"
 msgstr ""
diff --git a/po/zh_CN.GB2312.po b/po/zh_CN.GB2312.po
index 7d37818..ed43590 100644
--- a/po/zh_CN.GB2312.po
+++ b/po/zh_CN.GB2312.po
@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.3\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2003-12-07 15:21-0500\n"
+"POT-Creation-Date: 2003-12-30 08:12-0500\n"
 "PO-Revision-Date: 1999-11-11 05:04+0800\n"
 "Last-Translator: Dillion Chen <dillon.chen@turbolinux.com.cn>\n"
 "Language-Team: TLDN\n"
@@ -14,100 +14,100 @@ msgstr ""
 msgid "unknown errno"
 msgstr ""
 
-#: popt.c:944
+#: popt.c:964
 #, c-format
 msgid "option type (%d) not implemented in popt\n"
 msgstr ""
 
-#: popt.c:1164
+#: popt.c:1184
 msgid "missing argument"
 msgstr ""
 
-#: popt.c:1166
+#: popt.c:1186
 msgid "unknown option"
 msgstr ""
 
-#: popt.c:1168
+#: popt.c:1188
 msgid "mutually exclusive logical operations requested"
 msgstr ""
 
-#: popt.c:1170
+#: popt.c:1190
 msgid "opt->arg should not be NULL"
 msgstr ""
 
-#: popt.c:1172
+#: popt.c:1192
 msgid "aliases nested too deeply"
 msgstr ""
 
-#: popt.c:1174
+#: popt.c:1194
 msgid "error in parameter quoting"
 msgstr ""
 
-#: popt.c:1176
+#: popt.c:1196
 msgid "invalid numeric value"
 msgstr ""
 
-#: popt.c:1178
+#: popt.c:1198
 msgid "number too large or too small"
 msgstr ""
 
-#: popt.c:1180
+#: popt.c:1200
 msgid "memory allocation failed"
 msgstr ""
 
-#: popt.c:1184
+#: popt.c:1204
 msgid "unknown error"
 msgstr ""
 
-#: popthelp.c:61
+#: popthelp.c:58 popthelp.c:73
 msgid "Show this help message"
 msgstr "��ʾ����������Ϣ"
 
-#: popthelp.c:62
+#: popthelp.c:59 popthelp.c:74
 msgid "Display brief usage message"
 msgstr "��ʾ���ʹ����Ϣ"
 
-#: popthelp.c:65
+#: popthelp.c:62 popthelp.c:77
 #, fuzzy
 msgid "Display option defaults in message"
 msgstr "��ʾ���ʹ����Ϣ"
 
-#: popthelp.c:107
+#: popthelp.c:122
 msgid "NONE"
 msgstr ""
 
-#: popthelp.c:109
+#: popthelp.c:124
 msgid "VAL"
 msgstr ""
 
-#: popthelp.c:113
+#: popthelp.c:128
 msgid "INT"
 msgstr ""
 
-#: popthelp.c:114
+#: popthelp.c:129
 msgid "LONG"
 msgstr ""
 
-#: popthelp.c:115
+#: popthelp.c:130
 msgid "STRING"
 msgstr ""
 
-#: popthelp.c:116
+#: popthelp.c:131
 msgid "FLOAT"
 msgstr ""
 
-#: popthelp.c:117
+#: popthelp.c:132
 msgid "DOUBLE"
 msgstr ""
 
-#: popthelp.c:118
+#: popthelp.c:133
 msgid "ARG"
 msgstr ""
 
-#: popthelp.c:493
+#: popthelp.c:508
 msgid "Usage:"
 msgstr ""
 
-#: popthelp.c:517
+#: popthelp.c:532
 msgid "[OPTION...]"
 msgstr ""
-- 
Gitee


From 9ea0724bb0e5cdc21e62f0f34fbe83afa8d42102 Mon Sep 17 00:00:00 2001
From: Jeff Johnson <n3npq@mac.com>
Date: Tue, 30 Dec 2003 20:31:05 +0000
Subject: [PATCH 392/667] - pad to display length, not strlen, for i18n popt
 args (#106240).

---
 popthelp.c | 102 ++++++++++++++++++++++++++++++++++++++++-------------
 1 file changed, 77 insertions(+), 25 deletions(-)

diff --git a/popthelp.c b/popthelp.c
index 240692f..872ea79 100644
--- a/popthelp.c
+++ b/popthelp.c
@@ -9,6 +9,11 @@
    ftp://ftp.rpm.org/pub/rpm/dist. */
 
 #include "system.h"
+
+#define	POPT_WCHAR_HACK
+#ifdef 	POPT_WCHAR_HACK
+#include <wchar.h>			/* for mbsrtowcs */
+#endif
 #include "poptint.h"
 
 /*@access poptContext@*/
@@ -57,10 +62,6 @@ struct poptOption poptHelpOptions[] = {
   { NULL, '\0', POPT_ARG_CALLBACK, (void *)&displayArgs, '\0', NULL, NULL },
   { "help", '?', 0, NULL, '?', N_("Show this help message"), NULL },
   { "usage", '\0', 0, NULL, 'u', N_("Display brief usage message"), NULL },
-#ifdef	NOTYET
-  { "defaults", '\0', POPT_ARG_NONE, &show_option_defaults, 0,
-	N_("Display option defaults in message"), NULL },
-#endif
     POPT_TABLEEND
 } ;
 
@@ -136,13 +137,13 @@ getArgDescrip(const struct poptOption * opt,
 
 /**
  * Display default value for an option.
- * @param lineLength
+ * @param lineLength	display positions remaining
  * @param opt		option(s)
  * @param translation_domain	translation domain
  * @return
  */
 static /*@only@*/ /*@null@*/ char *
-singleOptionDefaultValue(int lineLength,
+singleOptionDefaultValue(size_t lineLength,
 		const struct poptOption * opt,
 		/*@-paramuse@*/ /* FIX: i18n macros disabled with lclint */
 		/*@null@*/ const char * translation_domain)
@@ -209,24 +210,25 @@ singleOptionDefaultValue(int lineLength,
 /**
  * Display help text for an option.
  * @param fp		output file handle
- * @param maxLeftCol
+ * @param maxLeftCol	largest argument display width
  * @param opt		option(s)
  * @param translation_domain	translation domain
  */
-static void singleOptionHelp(FILE * fp, int maxLeftCol, 
+static void singleOptionHelp(FILE * fp, size_t maxLeftCol, 
 		const struct poptOption * opt,
 		/*@null@*/ const char * translation_domain)
 	/*@globals fileSystem @*/
 	/*@modifies *fp, fileSystem @*/
 {
-    int indentLength = maxLeftCol + 5;
-    int lineLength = 79 - indentLength;
+    size_t indentLength = maxLeftCol + 5;
+    size_t lineLength = 79 - indentLength;
     const char * help = D_(translation_domain, opt->descrip);
     const char * argDescrip = getArgDescrip(opt, translation_domain);
     size_t helpLength;
     char * defs = NULL;
     char * left;
-    int nb = maxLeftCol + 1;
+    size_t nb = maxLeftCol + 1;
+    int displaypad = 0;
 
     /* Make sure there's more than enough room in target buffer. */
     if (opt->longName)	nb += strlen(opt->longName);
@@ -326,8 +328,25 @@ static void singleOptionHelp(FILE * fp, int maxLeftCol,
 		break;
 	    }
 	} else {
+	    size_t lelen;
+
 	    *le++ = '=';
-	    strcpy(le, argDescrip);		le += strlen(le);
+	    strcpy(le, argDescrip);
+	    lelen = strlen(le);
+	    le += lelen;
+
+#ifdef	POPT_WCHAR_HACK
+	    {	const char * scopy = argDescrip;
+		mbstate_t t;
+		size_t n;
+
+		memset (&t, '\0', sizeof (t));	/* In initial state.  */
+		/* Determine number of characters.  */
+		n = mbsrtowcs (NULL, &scopy, strlen(scopy), &t);
+
+		displaypad = (lelen-n);
+	    }
+#endif
 	}
 	if (opt->argInfo & POPT_ARGFLAG_OPTIONAL)
 	    *le++ = ']';
@@ -336,7 +355,7 @@ static void singleOptionHelp(FILE * fp, int maxLeftCol,
 /*@=boundswrite@*/
 
     if (help)
-	fprintf(fp,"  %-*s   ", maxLeftCol, left);
+	fprintf(fp,"  %-*s   ", maxLeftCol+displaypad, left);
     else {
 	fprintf(fp,"  %s\n", left); 
 	goto out;
@@ -382,15 +401,17 @@ out:
 }
 
 /**
+ * Find display width for longest argument string.
  * @param opt		option(s)
  * @param translation_domain	translation domain
+ * @return		display width
  */
-static int maxArgWidth(const struct poptOption * opt,
+static size_t maxArgWidth(const struct poptOption * opt,
 		       /*@null@*/ const char * translation_domain)
 	/*@*/
 {
-    int max = 0;
-    int len = 0;
+    size_t max = 0;
+    size_t len = 0;
     const char * s;
     
     if (opt != NULL)
@@ -410,8 +431,24 @@ static int maxArgWidth(const struct poptOption * opt,
 	    }
 
 	    s = getArgDescrip(opt, translation_domain);
+
+#ifdef POPT_WCHAR_HACK
+	    /* XXX Calculate no. of display characters. */
+	    if (s) {
+		const char * scopy = s;
+		mbstate_t t;
+		size_t n;
+
+		memset (&t, '\0', sizeof (t));	/* In initial state.  */
+		/* Determine number of characters.  */
+		n = mbsrtowcs (NULL, &scopy, strlen(scopy), &t);
+		len += sizeof("=")-1 + n;
+	    }
+#else
 	    if (s)
 		len += sizeof("=")-1 + strlen(s);
+#endif
+
 	    if (opt->argInfo & POPT_ARGFLAG_OPTIONAL) len += sizeof("[]")-1;
 	    if (len > max) max = len;
 	}
@@ -427,11 +464,11 @@ static int maxArgWidth(const struct poptOption * opt,
  * @param fp		output file handle
  * @param items		alias/exec array
  * @param nitems	no. of alias/exec entries
- * @param left
+ * @param left		largest argument display width
  * @param translation_domain	translation domain
  */
 static void itemHelp(FILE * fp,
-		/*@null@*/ poptItem items, int nitems, int left,
+		/*@null@*/ poptItem items, int nitems, size_t left,
 		/*@null@*/ const char * translation_domain)
 	/*@globals fileSystem @*/
 	/*@modifies *fp, fileSystem @*/
@@ -454,11 +491,11 @@ static void itemHelp(FILE * fp,
  * @param con		context
  * @param fp		output file handle
  * @param table		option(s)
- * @param left
+ * @param left		largest argument display width
  * @param translation_domain	translation domain
  */
 static void singleTableHelp(poptContext con, FILE * fp,
-		/*@null@*/ const struct poptOption * table, int left,
+		/*@null@*/ const struct poptOption * table, size_t left,
 		/*@null@*/ const char * translation_domain)
 	/*@globals fileSystem @*/
 	/*@modifies *fp, fileSystem @*/
@@ -523,7 +560,7 @@ static int showHelpIntro(poptContext con, FILE * fp)
 
 void poptPrintHelp(poptContext con, FILE * fp, /*@unused@*/ int flags)
 {
-    int leftColWidth;
+    size_t leftColWidth;
 
     (void) showHelpIntro(con, fp);
     if (con->otherHelp)
@@ -536,8 +573,9 @@ void poptPrintHelp(poptContext con, FILE * fp, /*@unused@*/ int flags)
 }
 
 /**
+ * Display usage text for an option.
  * @param fp		output file handle
- * @param cursor
+ * @param cursor	current display position
  * @param opt		option(s)
  * @param translation_domain	translation domain
  */
@@ -568,8 +606,22 @@ static size_t singleOptionUsage(FILE * fp, size_t cursor,
 
     if (len == 4) return cursor;
 
+#ifdef POPT_WCHAR_HACK
+    /* XXX Calculate no. of display characters. */
+    if (argDescrip) {
+	const char * scopy = argDescrip;
+	mbstate_t t;
+	size_t n;
+
+	memset (&t, '\0', sizeof (t));	/* In initial state.  */
+	/* Determine number of characters.  */
+	n = mbsrtowcs (NULL, &scopy, strlen(scopy), &t);
+	len += sizeof("=")-1 + n;
+    }
+#else
     if (argDescrip) 
-	len += strlen(argDescrip) + 1;
+	len += sizeof("=")-1 + strlen(argDescrip);
+#endif
 
     if ((cursor + len) > 79) {
 	fprintf(fp, "\n       ");
@@ -596,7 +648,7 @@ static size_t singleOptionUsage(FILE * fp, size_t cursor,
 /**
  * Display popt alias and exec usage.
  * @param fp		output file handle
- * @param cursor
+ * @param cursor	current display position
  * @param item		alias/exec array
  * @param nitems	no. of ara/exec entries
  * @param translation_domain	translation domain
@@ -639,7 +691,7 @@ typedef struct poptDone_s {
  * Display usage text for a table of options.
  * @param con		context
  * @param fp		output file handle
- * @param cursor
+ * @param cursor	current display position
  * @param opt		option(s)
  * @param translation_domain	translation domain
  * @param done		tables already processed
-- 
Gitee


From 038d65668ae40f1d2bfb4768f21af6c5d07effbe Mon Sep 17 00:00:00 2001
From: Jeff Johnson <n3npq@mac.com>
Date: Thu, 26 Feb 2004 01:20:53 +0000
Subject: [PATCH 393/667] splint fiddles.

---
 popthelp.c | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

diff --git a/popthelp.c b/popthelp.c
index 872ea79..5f10a5f 100644
--- a/popthelp.c
+++ b/popthelp.c
@@ -13,6 +13,7 @@
 #define	POPT_WCHAR_HACK
 #ifdef 	POPT_WCHAR_HACK
 #include <wchar.h>			/* for mbsrtowcs */
+/*@access mbstate_t @*/
 #endif
 #include "poptint.h"
 
@@ -340,11 +341,11 @@ static void singleOptionHelp(FILE * fp, size_t maxLeftCol,
 		mbstate_t t;
 		size_t n;
 
-		memset (&t, '\0', sizeof (t));	/* In initial state.  */
+		memset ((void *)&t, '\0', sizeof (t));	/* In initial state.  */
 		/* Determine number of characters.  */
 		n = mbsrtowcs (NULL, &scopy, strlen(scopy), &t);
 
-		displaypad = (lelen-n);
+		displaypad = (int) (lelen-n);
 	    }
 #endif
 	}
@@ -381,7 +382,7 @@ static void singleOptionHelp(FILE * fp, size_t maxLeftCol,
 	while (ch > (help + 1) && isspace(*ch)) ch--;
 	ch++;
 
-	sprintf(format, "%%.%ds\n%%%ds", (int) (ch - help), indentLength);
+	sprintf(format, "%%.%ds\n%%%ds", (int) (ch - help), (int) indentLength);
 	/*@-formatconst@*/
 	fprintf(fp, format, help, " ");
 	/*@=formatconst@*/
@@ -439,7 +440,9 @@ static size_t maxArgWidth(const struct poptOption * opt,
 		mbstate_t t;
 		size_t n;
 
-		memset (&t, '\0', sizeof (t));	/* In initial state.  */
+/*@-boundswrite@*/
+		memset ((void *)&t, '\0', sizeof (t));	/* In initial state.  */
+/*@=boundswrite@*/
 		/* Determine number of characters.  */
 		n = mbsrtowcs (NULL, &scopy, strlen(scopy), &t);
 		len += sizeof("=")-1 + n;
@@ -613,7 +616,9 @@ static size_t singleOptionUsage(FILE * fp, size_t cursor,
 	mbstate_t t;
 	size_t n;
 
-	memset (&t, '\0', sizeof (t));	/* In initial state.  */
+/*@-boundswrite@*/
+	memset ((void *)&t, '\0', sizeof (t));	/* In initial state.  */
+/*@=boundswrite@*/
 	/* Determine number of characters.  */
 	n = mbsrtowcs (NULL, &scopy, strlen(scopy), &t);
 	len += sizeof("=")-1 + n;
-- 
Gitee


From 96fdd70b520f899735ad359655109607157fec7f Mon Sep 17 00:00:00 2001
From: Jeff Johnson <n3npq@mac.com>
Date: Tue, 2 Mar 2004 01:32:26 +0000
Subject: [PATCH 394/667] - permit globs in macrofiles: directive (#117217).

---
 po/cs.po           | 30 +++++++++++++++---------------
 po/da.po           | 30 +++++++++++++++---------------
 po/de.po           | 30 +++++++++++++++---------------
 po/es.po           | 30 +++++++++++++++---------------
 po/eu_ES.po        | 30 +++++++++++++++---------------
 po/fi.po           | 30 +++++++++++++++---------------
 po/fr.po           | 30 +++++++++++++++---------------
 po/gl.po           | 30 +++++++++++++++---------------
 po/hu.po           | 30 +++++++++++++++---------------
 po/id.po           | 30 +++++++++++++++---------------
 po/is.po           | 30 +++++++++++++++---------------
 po/it.po           | 30 +++++++++++++++---------------
 po/ja.po           | 30 +++++++++++++++---------------
 po/ko.po           | 30 +++++++++++++++---------------
 po/no.po           | 30 +++++++++++++++---------------
 po/pl.po           | 30 +++++++++++++++---------------
 po/popt.pot        | 29 ++++++++++++++---------------
 po/pt.po           | 30 +++++++++++++++---------------
 po/pt_BR.po        | 30 +++++++++++++++---------------
 po/ro.po           | 30 +++++++++++++++---------------
 po/ru.po           | 30 +++++++++++++++---------------
 po/sk.po           | 30 +++++++++++++++---------------
 po/sl.po           | 30 +++++++++++++++---------------
 po/sr.po           | 30 +++++++++++++++---------------
 po/sv.po           | 30 +++++++++++++++---------------
 po/tr.po           | 30 +++++++++++++++---------------
 po/uk.po           | 30 +++++++++++++++---------------
 po/wa.po           | 30 +++++++++++++++---------------
 po/zh.po           | 30 +++++++++++++++---------------
 po/zh_CN.GB2312.po | 30 +++++++++++++++---------------
 30 files changed, 449 insertions(+), 450 deletions(-)

diff --git a/po/cs.po b/po/cs.po
index 71ed365..a681d01 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -1,14 +1,14 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.3\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2003-12-30 08:12-0500\n"
+"POT-Creation-Date: 2004-02-29 07:48-0500\n"
 "PO-Revision-Date: 2001-07-24 00:03+0100\n"
 "Last-Translator: Milan Kerslager <kerslage@linux.cz>\n"
 "Language-Team: Czech <cs@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=iso-8859-2\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Report-Msgid-Bugs-To: \n"
 
 #: popt.c:35
 msgid "unknown errno"
@@ -59,54 +59,54 @@ msgstr "selhala alokace pam
 msgid "unknown error"
 msgstr "nezn�m� chyba"
 
-#: popthelp.c:58 popthelp.c:73
+#: popthelp.c:64 popthelp.c:75
 msgid "Show this help message"
 msgstr "Vyp��e tuto n�pov�du"
 
-#: popthelp.c:59 popthelp.c:74
+#: popthelp.c:65 popthelp.c:76
 msgid "Display brief usage message"
 msgstr "Vyp��e kr�tk� n�vod k pou�it�"
 
-#: popthelp.c:62 popthelp.c:77
+#: popthelp.c:79
 msgid "Display option defaults in message"
 msgstr "Zobrazit implicitn� volby ve zpr�v�"
 
-#: popthelp.c:122
+#: popthelp.c:124
 msgid "NONE"
 msgstr "NONE"
 
-#: popthelp.c:124
+#: popthelp.c:126
 msgid "VAL"
 msgstr "VAL"
 
-#: popthelp.c:128
+#: popthelp.c:130
 msgid "INT"
 msgstr "INT"
 
-#: popthelp.c:129
+#: popthelp.c:131
 msgid "LONG"
 msgstr "LONG"
 
-#: popthelp.c:130
+#: popthelp.c:132
 msgid "STRING"
 msgstr "STRING"
 
-#: popthelp.c:131
+#: popthelp.c:133
 msgid "FLOAT"
 msgstr "FLOAT"
 
-#: popthelp.c:132
+#: popthelp.c:134
 msgid "DOUBLE"
 msgstr "DOUBLE"
 
-#: popthelp.c:133
+#: popthelp.c:135
 msgid "ARG"
 msgstr "ARG"
 
-#: popthelp.c:508
+#: popthelp.c:548
 msgid "Usage:"
 msgstr "Pou�it�:"
 
-#: popthelp.c:532
+#: popthelp.c:572
 msgid "[OPTION...]"
 msgstr "[VOLBY...]"
diff --git a/po/da.po b/po/da.po
index 79182cf..4245bbb 100644
--- a/po/da.po
+++ b/po/da.po
@@ -1,14 +1,14 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.3\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2003-12-30 08:12-0500\n"
+"POT-Creation-Date: 2004-02-29 07:48-0500\n"
 "PO-Revision-Date: Sun Jan 21 2001 04:30:32+0200\n"
 "Last-Translator: Martin Hansen <mah@k64.dk>\n"
 "Language-Team: Dansk <dansk@klid.dk>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=ISO-8859-1\n"
 "Content-Transfer-Encoding: 8-bit\n"
+"Report-Msgid-Bugs-To: \n"
 "X-Generator: KTranslator v 0.6.0\n"
 
 #: popt.c:35
@@ -60,55 +60,55 @@ msgstr ""
 msgid "unknown error"
 msgstr "ukendt fejl"
 
-#: popthelp.c:58 popthelp.c:73
+#: popthelp.c:64 popthelp.c:75
 msgid "Show this help message"
 msgstr "Vis denne hj�lpemeddelelse"
 
-#: popthelp.c:59 popthelp.c:74
+#: popthelp.c:65 popthelp.c:76
 msgid "Display brief usage message"
 msgstr "Vis kortfattet brugsanvisning"
 
-#: popthelp.c:62 popthelp.c:77
+#: popthelp.c:79
 #, fuzzy
 msgid "Display option defaults in message"
 msgstr "Vis kortfattet brugsanvisning"
 
-#: popthelp.c:122
+#: popthelp.c:124
 msgid "NONE"
 msgstr "INGEN"
 
-#: popthelp.c:124
+#: popthelp.c:126
 msgid "VAL"
 msgstr "VAL"
 
-#: popthelp.c:128
+#: popthelp.c:130
 msgid "INT"
 msgstr "INT"
 
-#: popthelp.c:129
+#: popthelp.c:131
 msgid "LONG"
 msgstr "LONG"
 
-#: popthelp.c:130
+#: popthelp.c:132
 msgid "STRING"
 msgstr "STRING"
 
-#: popthelp.c:131
+#: popthelp.c:133
 msgid "FLOAT"
 msgstr "FLOAT"
 
-#: popthelp.c:132
+#: popthelp.c:134
 msgid "DOUBLE"
 msgstr "DOUBLE"
 
-#: popthelp.c:133
+#: popthelp.c:135
 msgid "ARG"
 msgstr "ARG"
 
-#: popthelp.c:508
+#: popthelp.c:548
 msgid "Usage:"
 msgstr "Brug:"
 
-#: popthelp.c:532
+#: popthelp.c:572
 msgid "[OPTION...]"
 msgstr "[TILVALG...]"
diff --git a/po/de.po b/po/de.po
index 44701c9..c689f24 100644
--- a/po/de.po
+++ b/po/de.po
@@ -6,14 +6,14 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.3\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2003-12-30 08:12-0500\n"
+"POT-Creation-Date: 2004-02-29 07:48-0500\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: ENCODING\n"
+"Report-Msgid-Bugs-To: \n"
 
 #: popt.c:35
 msgid "unknown errno"
@@ -64,54 +64,54 @@ msgstr ""
 msgid "unknown error"
 msgstr ""
 
-#: popthelp.c:58 popthelp.c:73
+#: popthelp.c:64 popthelp.c:75
 msgid "Show this help message"
 msgstr ""
 
-#: popthelp.c:59 popthelp.c:74
+#: popthelp.c:65 popthelp.c:76
 msgid "Display brief usage message"
 msgstr ""
 
-#: popthelp.c:62 popthelp.c:77
+#: popthelp.c:79
 msgid "Display option defaults in message"
 msgstr ""
 
-#: popthelp.c:122
+#: popthelp.c:124
 msgid "NONE"
 msgstr ""
 
-#: popthelp.c:124
+#: popthelp.c:126
 msgid "VAL"
 msgstr ""
 
-#: popthelp.c:128
+#: popthelp.c:130
 msgid "INT"
 msgstr ""
 
-#: popthelp.c:129
+#: popthelp.c:131
 msgid "LONG"
 msgstr ""
 
-#: popthelp.c:130
+#: popthelp.c:132
 msgid "STRING"
 msgstr ""
 
-#: popthelp.c:131
+#: popthelp.c:133
 msgid "FLOAT"
 msgstr ""
 
-#: popthelp.c:132
+#: popthelp.c:134
 msgid "DOUBLE"
 msgstr ""
 
-#: popthelp.c:133
+#: popthelp.c:135
 msgid "ARG"
 msgstr ""
 
-#: popthelp.c:508
+#: popthelp.c:548
 msgid "Usage:"
 msgstr ""
 
-#: popthelp.c:532
+#: popthelp.c:572
 msgid "[OPTION...]"
 msgstr ""
diff --git a/po/es.po b/po/es.po
index ed248cf..c83b3ca 100644
--- a/po/es.po
+++ b/po/es.po
@@ -6,14 +6,14 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.3\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2003-12-30 08:12-0500\n"
+"POT-Creation-Date: 2004-02-29 07:48-0500\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Leandro Lucarella <luca@linuxmendoza.org.ar>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: ENCODING\n"
+"Report-Msgid-Bugs-To: \n"
 
 #: popt.c:35
 msgid "unknown errno"
@@ -64,55 +64,55 @@ msgstr ""
 msgid "unknown error"
 msgstr "error desconocido"
 
-#: popthelp.c:58 popthelp.c:73
+#: popthelp.c:64 popthelp.c:75
 msgid "Show this help message"
 msgstr "Muestra este mensaje de ayuda"
 
-#: popthelp.c:59 popthelp.c:74
+#: popthelp.c:65 popthelp.c:76
 msgid "Display brief usage message"
 msgstr "Indica el modo de uso resumido"
 
-#: popthelp.c:62 popthelp.c:77
+#: popthelp.c:79
 #, fuzzy
 msgid "Display option defaults in message"
 msgstr "Indica el modo de uso resumido"
 
-#: popthelp.c:122
+#: popthelp.c:124
 msgid "NONE"
 msgstr "NONE"
 
-#: popthelp.c:124
+#: popthelp.c:126
 msgid "VAL"
 msgstr "VAL"
 
-#: popthelp.c:128
+#: popthelp.c:130
 msgid "INT"
 msgstr "INT"
 
-#: popthelp.c:129
+#: popthelp.c:131
 msgid "LONG"
 msgstr "LONG"
 
-#: popthelp.c:130
+#: popthelp.c:132
 msgid "STRING"
 msgstr "STRING"
 
-#: popthelp.c:131
+#: popthelp.c:133
 msgid "FLOAT"
 msgstr "FLOAT"
 
-#: popthelp.c:132
+#: popthelp.c:134
 msgid "DOUBLE"
 msgstr "DOUBLE"
 
-#: popthelp.c:133
+#: popthelp.c:135
 msgid "ARG"
 msgstr "ARG"
 
-#: popthelp.c:508
+#: popthelp.c:548
 msgid "Usage:"
 msgstr "Modo de Uso:"
 
-#: popthelp.c:532
+#: popthelp.c:572
 msgid "[OPTION...]"
 msgstr "[OPCIN...]"
diff --git a/po/eu_ES.po b/po/eu_ES.po
index 44701c9..c689f24 100644
--- a/po/eu_ES.po
+++ b/po/eu_ES.po
@@ -6,14 +6,14 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.3\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2003-12-30 08:12-0500\n"
+"POT-Creation-Date: 2004-02-29 07:48-0500\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: ENCODING\n"
+"Report-Msgid-Bugs-To: \n"
 
 #: popt.c:35
 msgid "unknown errno"
@@ -64,54 +64,54 @@ msgstr ""
 msgid "unknown error"
 msgstr ""
 
-#: popthelp.c:58 popthelp.c:73
+#: popthelp.c:64 popthelp.c:75
 msgid "Show this help message"
 msgstr ""
 
-#: popthelp.c:59 popthelp.c:74
+#: popthelp.c:65 popthelp.c:76
 msgid "Display brief usage message"
 msgstr ""
 
-#: popthelp.c:62 popthelp.c:77
+#: popthelp.c:79
 msgid "Display option defaults in message"
 msgstr ""
 
-#: popthelp.c:122
+#: popthelp.c:124
 msgid "NONE"
 msgstr ""
 
-#: popthelp.c:124
+#: popthelp.c:126
 msgid "VAL"
 msgstr ""
 
-#: popthelp.c:128
+#: popthelp.c:130
 msgid "INT"
 msgstr ""
 
-#: popthelp.c:129
+#: popthelp.c:131
 msgid "LONG"
 msgstr ""
 
-#: popthelp.c:130
+#: popthelp.c:132
 msgid "STRING"
 msgstr ""
 
-#: popthelp.c:131
+#: popthelp.c:133
 msgid "FLOAT"
 msgstr ""
 
-#: popthelp.c:132
+#: popthelp.c:134
 msgid "DOUBLE"
 msgstr ""
 
-#: popthelp.c:133
+#: popthelp.c:135
 msgid "ARG"
 msgstr ""
 
-#: popthelp.c:508
+#: popthelp.c:548
 msgid "Usage:"
 msgstr ""
 
-#: popthelp.c:532
+#: popthelp.c:572
 msgid "[OPTION...]"
 msgstr ""
diff --git a/po/fi.po b/po/fi.po
index 44701c9..c689f24 100644
--- a/po/fi.po
+++ b/po/fi.po
@@ -6,14 +6,14 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.3\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2003-12-30 08:12-0500\n"
+"POT-Creation-Date: 2004-02-29 07:48-0500\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: ENCODING\n"
+"Report-Msgid-Bugs-To: \n"
 
 #: popt.c:35
 msgid "unknown errno"
@@ -64,54 +64,54 @@ msgstr ""
 msgid "unknown error"
 msgstr ""
 
-#: popthelp.c:58 popthelp.c:73
+#: popthelp.c:64 popthelp.c:75
 msgid "Show this help message"
 msgstr ""
 
-#: popthelp.c:59 popthelp.c:74
+#: popthelp.c:65 popthelp.c:76
 msgid "Display brief usage message"
 msgstr ""
 
-#: popthelp.c:62 popthelp.c:77
+#: popthelp.c:79
 msgid "Display option defaults in message"
 msgstr ""
 
-#: popthelp.c:122
+#: popthelp.c:124
 msgid "NONE"
 msgstr ""
 
-#: popthelp.c:124
+#: popthelp.c:126
 msgid "VAL"
 msgstr ""
 
-#: popthelp.c:128
+#: popthelp.c:130
 msgid "INT"
 msgstr ""
 
-#: popthelp.c:129
+#: popthelp.c:131
 msgid "LONG"
 msgstr ""
 
-#: popthelp.c:130
+#: popthelp.c:132
 msgid "STRING"
 msgstr ""
 
-#: popthelp.c:131
+#: popthelp.c:133
 msgid "FLOAT"
 msgstr ""
 
-#: popthelp.c:132
+#: popthelp.c:134
 msgid "DOUBLE"
 msgstr ""
 
-#: popthelp.c:133
+#: popthelp.c:135
 msgid "ARG"
 msgstr ""
 
-#: popthelp.c:508
+#: popthelp.c:548
 msgid "Usage:"
 msgstr ""
 
-#: popthelp.c:532
+#: popthelp.c:572
 msgid "[OPTION...]"
 msgstr ""
diff --git a/po/fr.po b/po/fr.po
index f543cdc..04f0908 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -11,14 +11,14 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.8.1\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2003-12-30 08:12-0500\n"
+"POT-Creation-Date: 2004-02-29 07:48-0500\n"
 "PO-Revision-Date: 2003-06-22 23:43+0200\n"
 "Last-Translator: RPM French Translation <rpm-fr@livna.org>\n"
 "Language-Team: RPM French Translation <rpm-fr@livna.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8-bit\n"
+"Report-Msgid-Bugs-To: \n"
 
 #: popt.c:35
 msgid "unknown errno"
@@ -69,54 +69,54 @@ msgstr "échec de l'allocation de mémoire"
 msgid "unknown error"
 msgstr "erreur inconnue"
 
-#: popthelp.c:58 popthelp.c:73
+#: popthelp.c:64 popthelp.c:75
 msgid "Show this help message"
 msgstr "Montre ce message d'aide"
 
-#: popthelp.c:59 popthelp.c:74
+#: popthelp.c:65 popthelp.c:76
 msgid "Display brief usage message"
 msgstr "Affiche un bref descriptif de l'utilisation"
 
-#: popthelp.c:62 popthelp.c:77
+#: popthelp.c:79
 msgid "Display option defaults in message"
 msgstr "Afficher les valeurs par défaut des options dans le message"
 
-#: popthelp.c:122
+#: popthelp.c:124
 msgid "NONE"
 msgstr "RIEN"
 
-#: popthelp.c:124
+#: popthelp.c:126
 msgid "VAL"
 msgstr "VAL"
 
-#: popthelp.c:128
+#: popthelp.c:130
 msgid "INT"
 msgstr "ENTIER"
 
-#: popthelp.c:129
+#: popthelp.c:131
 msgid "LONG"
 msgstr "LONG"
 
-#: popthelp.c:130
+#: popthelp.c:132
 msgid "STRING"
 msgstr "CHAINE"
 
-#: popthelp.c:131
+#: popthelp.c:133
 msgid "FLOAT"
 msgstr "FLOTTANT"
 
-#: popthelp.c:132
+#: popthelp.c:134
 msgid "DOUBLE"
 msgstr "DOUBLE"
 
-#: popthelp.c:133
+#: popthelp.c:135
 msgid "ARG"
 msgstr "ARG"
 
-#: popthelp.c:508
+#: popthelp.c:548
 msgid "Usage:"
 msgstr "Utilisation:"
 
-#: popthelp.c:532
+#: popthelp.c:572
 msgid "[OPTION...]"
 msgstr "[OPTION...]"
diff --git a/po/gl.po b/po/gl.po
index cadd96a..c9fbfd8 100644
--- a/po/gl.po
+++ b/po/gl.po
@@ -1,14 +1,14 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.3\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2003-12-30 08:12-0500\n"
+"POT-Creation-Date: 2004-02-29 07:48-0500\n"
 "PO-Revision-Date: 2001-01-17 01:01+0100\n"
 "Last-Translator: Jes�s Bravo �lvarez <jba@pobox.com>\n"
 "Language-Team: Galician <trasno@ceu.fi.udc.es>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=iso-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Report-Msgid-Bugs-To: \n"
 
 #: popt.c:35
 msgid "unknown errno"
@@ -59,55 +59,55 @@ msgstr ""
 msgid "unknown error"
 msgstr "erro desco�ecido"
 
-#: popthelp.c:58 popthelp.c:73
+#: popthelp.c:64 popthelp.c:75
 msgid "Show this help message"
 msgstr "Amosar esta mensaxe de axuda"
 
-#: popthelp.c:59 popthelp.c:74
+#: popthelp.c:65 popthelp.c:76
 msgid "Display brief usage message"
 msgstr "Amosar brevemente o xeito de utilizaci�n"
 
-#: popthelp.c:62 popthelp.c:77
+#: popthelp.c:79
 #, fuzzy
 msgid "Display option defaults in message"
 msgstr "Amosar brevemente o xeito de utilizaci�n"
 
-#: popthelp.c:122
+#: popthelp.c:124
 msgid "NONE"
 msgstr "NADA"
 
-#: popthelp.c:124
+#: popthelp.c:126
 msgid "VAL"
 msgstr "VAL"
 
-#: popthelp.c:128
+#: popthelp.c:130
 msgid "INT"
 msgstr "INT"
 
-#: popthelp.c:129
+#: popthelp.c:131
 msgid "LONG"
 msgstr "LONG"
 
-#: popthelp.c:130
+#: popthelp.c:132
 msgid "STRING"
 msgstr "CADEA"
 
-#: popthelp.c:131
+#: popthelp.c:133
 msgid "FLOAT"
 msgstr "FLOAT"
 
-#: popthelp.c:132
+#: popthelp.c:134
 msgid "DOUBLE"
 msgstr "DOUBLE"
 
-#: popthelp.c:133
+#: popthelp.c:135
 msgid "ARG"
 msgstr "ARG"
 
-#: popthelp.c:508
+#: popthelp.c:548
 msgid "Usage:"
 msgstr "Uso:"
 
-#: popthelp.c:532
+#: popthelp.c:572
 msgid "[OPTION...]"
 msgstr "[OPCI�N...]"
diff --git a/po/hu.po b/po/hu.po
index cb75f46..550c065 100644
--- a/po/hu.po
+++ b/po/hu.po
@@ -1,14 +1,14 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.3\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2003-12-30 08:12-0500\n"
+"POT-Creation-Date: 2004-02-29 07:48-0500\n"
 "PO-Revision-Date: 2000-08-03 23:26+0200\n"
 "Last-Translator: L�szl� N�meth <nemeth@qwertynet.hu>\n"
 "Language-Team: Hungarian\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=ISO-8859-2\n"
 "Content-Transfer-Encoding: 8-bit\n"
+"Report-Msgid-Bugs-To: \n"
 
 #: popt.c:35
 msgid "unknown errno"
@@ -59,55 +59,55 @@ msgstr ""
 msgid "unknown error"
 msgstr ""
 
-#: popthelp.c:58 popthelp.c:73
+#: popthelp.c:64 popthelp.c:75
 msgid "Show this help message"
 msgstr "E s�g� megjelen�t�se"
 
-#: popthelp.c:59 popthelp.c:74
+#: popthelp.c:65 popthelp.c:76
 msgid "Display brief usage message"
 msgstr "R�vid haszn�lati utas�t�s megjelen�t�se"
 
-#: popthelp.c:62 popthelp.c:77
+#: popthelp.c:79
 #, fuzzy
 msgid "Display option defaults in message"
 msgstr "R�vid haszn�lati utas�t�s megjelen�t�se"
 
-#: popthelp.c:122
+#: popthelp.c:124
 msgid "NONE"
 msgstr ""
 
-#: popthelp.c:124
+#: popthelp.c:126
 msgid "VAL"
 msgstr ""
 
-#: popthelp.c:128
+#: popthelp.c:130
 msgid "INT"
 msgstr ""
 
-#: popthelp.c:129
+#: popthelp.c:131
 msgid "LONG"
 msgstr ""
 
-#: popthelp.c:130
+#: popthelp.c:132
 msgid "STRING"
 msgstr ""
 
-#: popthelp.c:131
+#: popthelp.c:133
 msgid "FLOAT"
 msgstr ""
 
-#: popthelp.c:132
+#: popthelp.c:134
 msgid "DOUBLE"
 msgstr ""
 
-#: popthelp.c:133
+#: popthelp.c:135
 msgid "ARG"
 msgstr ""
 
-#: popthelp.c:508
+#: popthelp.c:548
 msgid "Usage:"
 msgstr ""
 
-#: popthelp.c:532
+#: popthelp.c:572
 msgid "[OPTION...]"
 msgstr ""
diff --git a/po/id.po b/po/id.po
index 44701c9..c689f24 100644
--- a/po/id.po
+++ b/po/id.po
@@ -6,14 +6,14 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.3\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2003-12-30 08:12-0500\n"
+"POT-Creation-Date: 2004-02-29 07:48-0500\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: ENCODING\n"
+"Report-Msgid-Bugs-To: \n"
 
 #: popt.c:35
 msgid "unknown errno"
@@ -64,54 +64,54 @@ msgstr ""
 msgid "unknown error"
 msgstr ""
 
-#: popthelp.c:58 popthelp.c:73
+#: popthelp.c:64 popthelp.c:75
 msgid "Show this help message"
 msgstr ""
 
-#: popthelp.c:59 popthelp.c:74
+#: popthelp.c:65 popthelp.c:76
 msgid "Display brief usage message"
 msgstr ""
 
-#: popthelp.c:62 popthelp.c:77
+#: popthelp.c:79
 msgid "Display option defaults in message"
 msgstr ""
 
-#: popthelp.c:122
+#: popthelp.c:124
 msgid "NONE"
 msgstr ""
 
-#: popthelp.c:124
+#: popthelp.c:126
 msgid "VAL"
 msgstr ""
 
-#: popthelp.c:128
+#: popthelp.c:130
 msgid "INT"
 msgstr ""
 
-#: popthelp.c:129
+#: popthelp.c:131
 msgid "LONG"
 msgstr ""
 
-#: popthelp.c:130
+#: popthelp.c:132
 msgid "STRING"
 msgstr ""
 
-#: popthelp.c:131
+#: popthelp.c:133
 msgid "FLOAT"
 msgstr ""
 
-#: popthelp.c:132
+#: popthelp.c:134
 msgid "DOUBLE"
 msgstr ""
 
-#: popthelp.c:133
+#: popthelp.c:135
 msgid "ARG"
 msgstr ""
 
-#: popthelp.c:508
+#: popthelp.c:548
 msgid "Usage:"
 msgstr ""
 
-#: popthelp.c:532
+#: popthelp.c:572
 msgid "[OPTION...]"
 msgstr ""
diff --git a/po/is.po b/po/is.po
index ea00ac1..0b3c9d5 100644
--- a/po/is.po
+++ b/po/is.po
@@ -1,14 +1,14 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.3\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2003-12-30 08:12-0500\n"
+"POT-Creation-Date: 2004-02-29 07:48-0500\n"
 "PO-Revision-Date: 2001-06-08 01:35+0000\n"
 "Last-Translator: Richard Allen <ra@hp.is>\n"
 "Language-Team: is <kde-isl@mmedia.is>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=ISO-8859-1\n"
 "Content-Transfer-Encoding: 8-bit\n"
+"Report-Msgid-Bugs-To: \n"
 
 #: popt.c:35
 msgid "unknown errno"
@@ -59,54 +59,54 @@ msgstr "ekki t
 msgid "unknown error"
 msgstr "��ekkt villa"
 
-#: popthelp.c:58 popthelp.c:73
+#: popthelp.c:64 popthelp.c:75
 msgid "Show this help message"
 msgstr "S�na �essa hj�lp"
 
-#: popthelp.c:59 popthelp.c:74
+#: popthelp.c:65 popthelp.c:76
 msgid "Display brief usage message"
 msgstr "S�na stuttar notkunarlei�beiningar"
 
-#: popthelp.c:62 popthelp.c:77
+#: popthelp.c:79
 msgid "Display option defaults in message"
 msgstr "S�na sj�lfgefin gildi rofa � skilabo�um"
 
-#: popthelp.c:122
+#: popthelp.c:124
 msgid "NONE"
 msgstr "ENGIN"
 
-#: popthelp.c:124
+#: popthelp.c:126
 msgid "VAL"
 msgstr "VAL"
 
-#: popthelp.c:128
+#: popthelp.c:130
 msgid "INT"
 msgstr "INT"
 
-#: popthelp.c:129
+#: popthelp.c:131
 msgid "LONG"
 msgstr "LONG"
 
-#: popthelp.c:130
+#: popthelp.c:132
 msgid "STRING"
 msgstr "STRING"
 
-#: popthelp.c:131
+#: popthelp.c:133
 msgid "FLOAT"
 msgstr "FLOAT"
 
-#: popthelp.c:132
+#: popthelp.c:134
 msgid "DOUBLE"
 msgstr "DOUBLE"
 
-#: popthelp.c:133
+#: popthelp.c:135
 msgid "ARG"
 msgstr "ARG"
 
-#: popthelp.c:508
+#: popthelp.c:548
 msgid "Usage:"
 msgstr "Notkun:"
 
-#: popthelp.c:532
+#: popthelp.c:572
 msgid "[OPTION...]"
 msgstr "[ROFI...]"
diff --git a/po/it.po b/po/it.po
index 44701c9..c689f24 100644
--- a/po/it.po
+++ b/po/it.po
@@ -6,14 +6,14 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.3\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2003-12-30 08:12-0500\n"
+"POT-Creation-Date: 2004-02-29 07:48-0500\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: ENCODING\n"
+"Report-Msgid-Bugs-To: \n"
 
 #: popt.c:35
 msgid "unknown errno"
@@ -64,54 +64,54 @@ msgstr ""
 msgid "unknown error"
 msgstr ""
 
-#: popthelp.c:58 popthelp.c:73
+#: popthelp.c:64 popthelp.c:75
 msgid "Show this help message"
 msgstr ""
 
-#: popthelp.c:59 popthelp.c:74
+#: popthelp.c:65 popthelp.c:76
 msgid "Display brief usage message"
 msgstr ""
 
-#: popthelp.c:62 popthelp.c:77
+#: popthelp.c:79
 msgid "Display option defaults in message"
 msgstr ""
 
-#: popthelp.c:122
+#: popthelp.c:124
 msgid "NONE"
 msgstr ""
 
-#: popthelp.c:124
+#: popthelp.c:126
 msgid "VAL"
 msgstr ""
 
-#: popthelp.c:128
+#: popthelp.c:130
 msgid "INT"
 msgstr ""
 
-#: popthelp.c:129
+#: popthelp.c:131
 msgid "LONG"
 msgstr ""
 
-#: popthelp.c:130
+#: popthelp.c:132
 msgid "STRING"
 msgstr ""
 
-#: popthelp.c:131
+#: popthelp.c:133
 msgid "FLOAT"
 msgstr ""
 
-#: popthelp.c:132
+#: popthelp.c:134
 msgid "DOUBLE"
 msgstr ""
 
-#: popthelp.c:133
+#: popthelp.c:135
 msgid "ARG"
 msgstr ""
 
-#: popthelp.c:508
+#: popthelp.c:548
 msgid "Usage:"
 msgstr ""
 
-#: popthelp.c:532
+#: popthelp.c:572
 msgid "[OPTION...]"
 msgstr ""
diff --git a/po/ja.po b/po/ja.po
index 44701c9..c689f24 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -6,14 +6,14 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.3\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2003-12-30 08:12-0500\n"
+"POT-Creation-Date: 2004-02-29 07:48-0500\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: ENCODING\n"
+"Report-Msgid-Bugs-To: \n"
 
 #: popt.c:35
 msgid "unknown errno"
@@ -64,54 +64,54 @@ msgstr ""
 msgid "unknown error"
 msgstr ""
 
-#: popthelp.c:58 popthelp.c:73
+#: popthelp.c:64 popthelp.c:75
 msgid "Show this help message"
 msgstr ""
 
-#: popthelp.c:59 popthelp.c:74
+#: popthelp.c:65 popthelp.c:76
 msgid "Display brief usage message"
 msgstr ""
 
-#: popthelp.c:62 popthelp.c:77
+#: popthelp.c:79
 msgid "Display option defaults in message"
 msgstr ""
 
-#: popthelp.c:122
+#: popthelp.c:124
 msgid "NONE"
 msgstr ""
 
-#: popthelp.c:124
+#: popthelp.c:126
 msgid "VAL"
 msgstr ""
 
-#: popthelp.c:128
+#: popthelp.c:130
 msgid "INT"
 msgstr ""
 
-#: popthelp.c:129
+#: popthelp.c:131
 msgid "LONG"
 msgstr ""
 
-#: popthelp.c:130
+#: popthelp.c:132
 msgid "STRING"
 msgstr ""
 
-#: popthelp.c:131
+#: popthelp.c:133
 msgid "FLOAT"
 msgstr ""
 
-#: popthelp.c:132
+#: popthelp.c:134
 msgid "DOUBLE"
 msgstr ""
 
-#: popthelp.c:133
+#: popthelp.c:135
 msgid "ARG"
 msgstr ""
 
-#: popthelp.c:508
+#: popthelp.c:548
 msgid "Usage:"
 msgstr ""
 
-#: popthelp.c:532
+#: popthelp.c:572
 msgid "[OPTION...]"
 msgstr ""
diff --git a/po/ko.po b/po/ko.po
index 98517b7..dfe8f83 100644
--- a/po/ko.po
+++ b/po/ko.po
@@ -1,14 +1,14 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2003-12-30 08:12-0500\n"
+"POT-Creation-Date: 2004-02-29 07:48-0500\n"
 "PO-Revision-Date: 2001-09-06 20:06+0900\n"
 "Last-Translator: Jong-Hoon Ryu <redhat4u@netian.com>\n"
 "Language-Team: GNU Translation project <ko@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=EUC-KR\n"
 "Content-Transfer-Encoding: 8-bit\n"
+"Report-Msgid-Bugs-To: \n"
 
 #: popt.c:35
 msgid "unknown errno"
@@ -59,54 +59,54 @@ msgstr "
 msgid "unknown error"
 msgstr "�� �� ���� �����Դϴ�"
 
-#: popthelp.c:58 popthelp.c:73
+#: popthelp.c:64 popthelp.c:75
 msgid "Show this help message"
 msgstr "�� ������ �����ݴϴ�"
 
-#: popthelp.c:59 popthelp.c:74
+#: popthelp.c:65 popthelp.c:76
 msgid "Display brief usage message"
 msgstr "������ ������ �����ݴϴ�"
 
-#: popthelp.c:62 popthelp.c:77
+#: popthelp.c:79
 msgid "Display option defaults in message"
 msgstr "�⺻���� �ɼ��� �����ݴϴ�"
 
-#: popthelp.c:122
+#: popthelp.c:124
 msgid "NONE"
 msgstr "����(NONE)"
 
-#: popthelp.c:124
+#: popthelp.c:126
 msgid "VAL"
 msgstr "��(VAL)"
 
-#: popthelp.c:128
+#: popthelp.c:130
 msgid "INT"
 msgstr "����(INT)"
 
-#: popthelp.c:129
+#: popthelp.c:131
 msgid "LONG"
 msgstr "����(LONG)"
 
-#: popthelp.c:130
+#: popthelp.c:132
 msgid "STRING"
 msgstr "���ڿ�(STRING)"
 
-#: popthelp.c:131
+#: popthelp.c:133
 msgid "FLOAT"
 msgstr "�Ҽ�(FLOAT)"
 
-#: popthelp.c:132
+#: popthelp.c:134
 msgid "DOUBLE"
 msgstr "�Ҽ�(DOUBLE)"
 
-#: popthelp.c:133
+#: popthelp.c:135
 msgid "ARG"
 msgstr "�μ�(ARG)"
 
-#: popthelp.c:508
+#: popthelp.c:548
 msgid "Usage:"
 msgstr "����:"
 
-#: popthelp.c:532
+#: popthelp.c:572
 msgid "[OPTION...]"
 msgstr "[�ɼ�...]"
diff --git a/po/no.po b/po/no.po
index 3e855da..419af66 100644
--- a/po/no.po
+++ b/po/no.po
@@ -1,14 +1,14 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.3\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2003-12-30 08:12-0500\n"
+"POT-Creation-Date: 2004-02-29 07:48-0500\n"
 "PO-Revision-Date: 2001-06-27 11:05+0200\n"
 "Last-Translator: Kjartan Maraas <kmaraas@online.no>\n"
 "Language-Team: Norwegian <no@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=iso-8859-1\n"
 "Content-Transfer-Encoding: 8-bit\n"
+"Report-Msgid-Bugs-To: \n"
 
 #: popt.c:35
 msgid "unknown errno"
@@ -59,54 +59,54 @@ msgstr "minneallokering feilet"
 msgid "unknown error"
 msgstr "ukjent feil"
 
-#: popthelp.c:58 popthelp.c:73
+#: popthelp.c:64 popthelp.c:75
 msgid "Show this help message"
 msgstr "Vis denne hjelpmeldingen"
 
-#: popthelp.c:59 popthelp.c:74
+#: popthelp.c:65 popthelp.c:76
 msgid "Display brief usage message"
 msgstr "Vis kort bruksmelding"
 
-#: popthelp.c:62 popthelp.c:77
+#: popthelp.c:79
 msgid "Display option defaults in message"
 msgstr "Vis forvalgte flagg i melding"
 
-#: popthelp.c:122
+#: popthelp.c:124
 msgid "NONE"
 msgstr "INGEN"
 
-#: popthelp.c:124
+#: popthelp.c:126
 msgid "VAL"
 msgstr "VERDI"
 
-#: popthelp.c:128
+#: popthelp.c:130
 msgid "INT"
 msgstr "HELTALL"
 
-#: popthelp.c:129
+#: popthelp.c:131
 msgid "LONG"
 msgstr "LONG"
 
-#: popthelp.c:130
+#: popthelp.c:132
 msgid "STRING"
 msgstr "STRENG"
 
-#: popthelp.c:131
+#: popthelp.c:133
 msgid "FLOAT"
 msgstr "FLYTTALL"
 
-#: popthelp.c:132
+#: popthelp.c:134
 msgid "DOUBLE"
 msgstr "DOUBLE"
 
-#: popthelp.c:133
+#: popthelp.c:135
 msgid "ARG"
 msgstr "ARG"
 
-#: popthelp.c:508
+#: popthelp.c:548
 msgid "Usage:"
 msgstr "Bruk:"
 
-#: popthelp.c:532
+#: popthelp.c:572
 msgid "[OPTION...]"
 msgstr "[FLAGG...]"
diff --git a/po/pl.po b/po/pl.po
index 30a8767..79ece5b 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -5,14 +5,14 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.9-20030515\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2003-12-30 08:12-0500\n"
+"POT-Creation-Date: 2004-02-29 07:48-0500\n"
 "PO-Revision-Date: 2003-06-08 20:32+0200\n"
 "Last-Translator: Jakub Bogusz <qboosh@pld.org.pl>\n"
 "Language-Team: Polish <translation-team-pl@lists.sourceforge.net>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=iso-8859-2\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Report-Msgid-Bugs-To: \n"
 
 #: popt.c:35
 msgid "unknown errno"
@@ -63,55 +63,55 @@ msgstr "b
 msgid "unknown error"
 msgstr "nieznany b��d"
 
-#: popthelp.c:58 popthelp.c:73
+#: popthelp.c:64 popthelp.c:75
 msgid "Show this help message"
 msgstr "Poka� t� pomoc"
 
-#: popthelp.c:59 popthelp.c:74
+#: popthelp.c:65 popthelp.c:76
 msgid "Display brief usage message"
 msgstr "Wy�wietl skr�cony spos�b u�ycia"
 
-#: popthelp.c:62 popthelp.c:77
+#: popthelp.c:79
 msgid "Display option defaults in message"
 msgstr "Wy�wietl domy�lne opcje w opisie"
 
-#: popthelp.c:122
+#: popthelp.c:124
 msgid "NONE"
 msgstr "BRAK"
 
-#: popthelp.c:124
+#: popthelp.c:126
 msgid "VAL"
 msgstr "WART"
 
-#: popthelp.c:128
+#: popthelp.c:130
 msgid "INT"
 msgstr "INT"
 
-#: popthelp.c:129
+#: popthelp.c:131
 msgid "LONG"
 msgstr "LONG"
 
-#: popthelp.c:130
+#: popthelp.c:132
 msgid "STRING"
 msgstr "�A�CUCH"
 
-#: popthelp.c:131
+#: popthelp.c:133
 msgid "FLOAT"
 msgstr "FLOAT"
 
-#: popthelp.c:132
+#: popthelp.c:134
 msgid "DOUBLE"
 msgstr "DOUBLE"
 
-#: popthelp.c:133
+#: popthelp.c:135
 msgid "ARG"
 msgstr "PARAM"
 
-#: popthelp.c:508
+#: popthelp.c:548
 msgid "Usage:"
 msgstr "Sk�adnia:"
 
-#: popthelp.c:532
+#: popthelp.c:572
 msgid "[OPTION...]"
 msgstr "[OPCJA...]"
 
diff --git a/po/popt.pot b/po/popt.pot
index f75465a..670c404 100644
--- a/po/popt.pot
+++ b/po/popt.pot
@@ -7,8 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2003-12-30 08:12-0500\n"
+"POT-Creation-Date: 2004-02-29 07:48-0500\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -65,54 +64,54 @@ msgstr ""
 msgid "unknown error"
 msgstr ""
 
-#: popthelp.c:58 popthelp.c:73
+#: popthelp.c:64 popthelp.c:75
 msgid "Show this help message"
 msgstr ""
 
-#: popthelp.c:59 popthelp.c:74
+#: popthelp.c:65 popthelp.c:76
 msgid "Display brief usage message"
 msgstr ""
 
-#: popthelp.c:62 popthelp.c:77
+#: popthelp.c:79
 msgid "Display option defaults in message"
 msgstr ""
 
-#: popthelp.c:122
+#: popthelp.c:124
 msgid "NONE"
 msgstr ""
 
-#: popthelp.c:124
+#: popthelp.c:126
 msgid "VAL"
 msgstr ""
 
-#: popthelp.c:128
+#: popthelp.c:130
 msgid "INT"
 msgstr ""
 
-#: popthelp.c:129
+#: popthelp.c:131
 msgid "LONG"
 msgstr ""
 
-#: popthelp.c:130
+#: popthelp.c:132
 msgid "STRING"
 msgstr ""
 
-#: popthelp.c:131
+#: popthelp.c:133
 msgid "FLOAT"
 msgstr ""
 
-#: popthelp.c:132
+#: popthelp.c:134
 msgid "DOUBLE"
 msgstr ""
 
-#: popthelp.c:133
+#: popthelp.c:135
 msgid "ARG"
 msgstr ""
 
-#: popthelp.c:508
+#: popthelp.c:548
 msgid "Usage:"
 msgstr ""
 
-#: popthelp.c:532
+#: popthelp.c:572
 msgid "[OPTION...]"
 msgstr ""
diff --git a/po/pt.po b/po/pt.po
index 341f4c2..e315985 100644
--- a/po/pt.po
+++ b/po/pt.po
@@ -1,14 +1,14 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2003-12-30 08:12-0500\n"
+"POT-Creation-Date: 2004-02-29 07:48-0500\n"
 "PO-Revision-Date: 2002-02-13 18:32+0000\n"
 "Last-Translator: Pedro Morais <morais@kde.org>\n"
 "Language-Team: pt <morais@kde.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=iso-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Report-Msgid-Bugs-To: \n"
 
 #: popt.c:35
 msgid "unknown errno"
@@ -59,54 +59,54 @@ msgstr "aloca
 msgid "unknown error"
 msgstr "erro desconhecido"
 
-#: popthelp.c:58 popthelp.c:73
+#: popthelp.c:64 popthelp.c:75
 msgid "Show this help message"
 msgstr "Mostrar esta mensagem de ajuda"
 
-#: popthelp.c:59 popthelp.c:74
+#: popthelp.c:65 popthelp.c:76
 msgid "Display brief usage message"
 msgstr "Mostrar uma mensagem de utiliza��o sucinta"
 
-#: popthelp.c:62 popthelp.c:77
+#: popthelp.c:79
 msgid "Display option defaults in message"
 msgstr "Mostrar valor por omiss�o das op��es na mensagem"
 
-#: popthelp.c:122
+#: popthelp.c:124
 msgid "NONE"
 msgstr "NONE"
 
-#: popthelp.c:124
+#: popthelp.c:126
 msgid "VAL"
 msgstr "VAL"
 
-#: popthelp.c:128
+#: popthelp.c:130
 msgid "INT"
 msgstr "INT"
 
-#: popthelp.c:129
+#: popthelp.c:131
 msgid "LONG"
 msgstr "LONG"
 
-#: popthelp.c:130
+#: popthelp.c:132
 msgid "STRING"
 msgstr "STRING"
 
-#: popthelp.c:131
+#: popthelp.c:133
 msgid "FLOAT"
 msgstr "FLOAT"
 
-#: popthelp.c:132
+#: popthelp.c:134
 msgid "DOUBLE"
 msgstr "DOUBLE"
 
-#: popthelp.c:133
+#: popthelp.c:135
 msgid "ARG"
 msgstr "ARG"
 
-#: popthelp.c:508
+#: popthelp.c:548
 msgid "Usage:"
 msgstr "Utiliza��o:"
 
-#: popthelp.c:532
+#: popthelp.c:572
 msgid "[OPTION...]"
 msgstr "[OP��O...]"
diff --git a/po/pt_BR.po b/po/pt_BR.po
index 44701c9..c689f24 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -6,14 +6,14 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.3\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2003-12-30 08:12-0500\n"
+"POT-Creation-Date: 2004-02-29 07:48-0500\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: ENCODING\n"
+"Report-Msgid-Bugs-To: \n"
 
 #: popt.c:35
 msgid "unknown errno"
@@ -64,54 +64,54 @@ msgstr ""
 msgid "unknown error"
 msgstr ""
 
-#: popthelp.c:58 popthelp.c:73
+#: popthelp.c:64 popthelp.c:75
 msgid "Show this help message"
 msgstr ""
 
-#: popthelp.c:59 popthelp.c:74
+#: popthelp.c:65 popthelp.c:76
 msgid "Display brief usage message"
 msgstr ""
 
-#: popthelp.c:62 popthelp.c:77
+#: popthelp.c:79
 msgid "Display option defaults in message"
 msgstr ""
 
-#: popthelp.c:122
+#: popthelp.c:124
 msgid "NONE"
 msgstr ""
 
-#: popthelp.c:124
+#: popthelp.c:126
 msgid "VAL"
 msgstr ""
 
-#: popthelp.c:128
+#: popthelp.c:130
 msgid "INT"
 msgstr ""
 
-#: popthelp.c:129
+#: popthelp.c:131
 msgid "LONG"
 msgstr ""
 
-#: popthelp.c:130
+#: popthelp.c:132
 msgid "STRING"
 msgstr ""
 
-#: popthelp.c:131
+#: popthelp.c:133
 msgid "FLOAT"
 msgstr ""
 
-#: popthelp.c:132
+#: popthelp.c:134
 msgid "DOUBLE"
 msgstr ""
 
-#: popthelp.c:133
+#: popthelp.c:135
 msgid "ARG"
 msgstr ""
 
-#: popthelp.c:508
+#: popthelp.c:548
 msgid "Usage:"
 msgstr ""
 
-#: popthelp.c:532
+#: popthelp.c:572
 msgid "[OPTION...]"
 msgstr ""
diff --git a/po/ro.po b/po/ro.po
index a285571..6cb8546 100644
--- a/po/ro.po
+++ b/po/ro.po
@@ -1,14 +1,14 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.3\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2003-12-30 08:12-0500\n"
+"POT-Creation-Date: 2004-02-29 07:48-0500\n"
 "PO-Revision-Date: 2000-06-14 23:23+EST\n"
 "Last-Translator: Cristian Gafton <gafton@redhat.com>\n"
 "Language-Team: Romanian <ro@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=ISO-8859-2\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Report-Msgid-Bugs-To: \n"
 
 #: popt.c:35
 msgid "unknown errno"
@@ -60,55 +60,55 @@ msgstr ""
 msgid "unknown error"
 msgstr "eroare necuinoscuta"
 
-#: popthelp.c:58 popthelp.c:73
+#: popthelp.c:64 popthelp.c:75
 msgid "Show this help message"
 msgstr "Afisare mesaj de help"
 
-#: popthelp.c:59 popthelp.c:74
+#: popthelp.c:65 popthelp.c:76
 msgid "Display brief usage message"
 msgstr "Afisare mesaj sintaxa sumar"
 
-#: popthelp.c:62 popthelp.c:77
+#: popthelp.c:79
 #, fuzzy
 msgid "Display option defaults in message"
 msgstr "Afisare mesaj sintaxa sumar"
 
-#: popthelp.c:122
+#: popthelp.c:124
 msgid "NONE"
 msgstr ""
 
-#: popthelp.c:124
+#: popthelp.c:126
 msgid "VAL"
 msgstr ""
 
-#: popthelp.c:128
+#: popthelp.c:130
 msgid "INT"
 msgstr ""
 
-#: popthelp.c:129
+#: popthelp.c:131
 msgid "LONG"
 msgstr ""
 
-#: popthelp.c:130
+#: popthelp.c:132
 msgid "STRING"
 msgstr ""
 
-#: popthelp.c:131
+#: popthelp.c:133
 msgid "FLOAT"
 msgstr ""
 
-#: popthelp.c:132
+#: popthelp.c:134
 msgid "DOUBLE"
 msgstr ""
 
-#: popthelp.c:133
+#: popthelp.c:135
 msgid "ARG"
 msgstr ""
 
-#: popthelp.c:508
+#: popthelp.c:548
 msgid "Usage:"
 msgstr "Sintaxa:"
 
-#: popthelp.c:532
+#: popthelp.c:572
 msgid "[OPTION...]"
 msgstr "[OPTIUNE...]"
diff --git a/po/ru.po b/po/ru.po
index 8c6893d..6289aa3 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -1,14 +1,14 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.3\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2003-12-30 08:12-0500\n"
+"POT-Creation-Date: 2004-02-29 07:48-0500\n"
 "PO-Revision-Date: 2001-07-05 21:00-0500\n"
 "Last-Translator: Eugene Kanter <eugene@blackcatlinux.com>\n"
 "Language-Team: Black Cat Linux Team <blackcat-support@blackcatlinux.com>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=koi8-r\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Report-Msgid-Bugs-To: \n"
 
 #: popt.c:35
 msgid "unknown errno"
@@ -59,54 +59,54 @@ msgstr "
 msgid "unknown error"
 msgstr "����������� ������"
 
-#: popthelp.c:58 popthelp.c:73
+#: popthelp.c:64 popthelp.c:75
 msgid "Show this help message"
 msgstr "�������� ��� ���������"
 
-#: popthelp.c:59 popthelp.c:74
+#: popthelp.c:65 popthelp.c:76
 msgid "Display brief usage message"
 msgstr "�������� ������� ���������� �� �������������"
 
-#: popthelp.c:62 popthelp.c:77
+#: popthelp.c:79
 msgid "Display option defaults in message"
 msgstr "�������� ��������� �� ���������"
 
-#: popthelp.c:122
+#: popthelp.c:124
 msgid "NONE"
 msgstr "NONE"
 
-#: popthelp.c:124
+#: popthelp.c:126
 msgid "VAL"
 msgstr "VAL"
 
-#: popthelp.c:128
+#: popthelp.c:130
 msgid "INT"
 msgstr "INT"
 
-#: popthelp.c:129
+#: popthelp.c:131
 msgid "LONG"
 msgstr "LONG"
 
-#: popthelp.c:130
+#: popthelp.c:132
 msgid "STRING"
 msgstr "STRING"
 
-#: popthelp.c:131
+#: popthelp.c:133
 msgid "FLOAT"
 msgstr "FLOAT"
 
-#: popthelp.c:132
+#: popthelp.c:134
 msgid "DOUBLE"
 msgstr "DOUBLE"
 
-#: popthelp.c:133
+#: popthelp.c:135
 msgid "ARG"
 msgstr "ARG"
 
-#: popthelp.c:508
+#: popthelp.c:548
 msgid "Usage:"
 msgstr "�������������:"
 
-#: popthelp.c:532
+#: popthelp.c:572
 msgid "[OPTION...]"
 msgstr "[��������...]"
diff --git a/po/sk.po b/po/sk.po
index 478ce97..4c4b75f 100644
--- a/po/sk.po
+++ b/po/sk.po
@@ -5,14 +5,14 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.3\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2003-12-30 08:12-0500\n"
+"POT-Creation-Date: 2004-02-29 07:48-0500\n"
 "PO-Revision-Date: 1999-08-04 21:40+0200\n"
 "Last-Translator: Stanislav Meduna <stano@eunet.sk>\n"
 "Language-Team: Slovak <sk-i18n@rak.isternet.sk>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=iso-8859-2\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Report-Msgid-Bugs-To: \n"
 
 #: popt.c:35
 msgid "unknown errno"
@@ -63,55 +63,55 @@ msgstr ""
 msgid "unknown error"
 msgstr ""
 
-#: popthelp.c:58 popthelp.c:73
+#: popthelp.c:64 popthelp.c:75
 msgid "Show this help message"
 msgstr "Vyp�sa� t�to spr�vu"
 
-#: popthelp.c:59 popthelp.c:74
+#: popthelp.c:65 popthelp.c:76
 msgid "Display brief usage message"
 msgstr "Zobrazi� stru�n� n�vod na pou�itie"
 
-#: popthelp.c:62 popthelp.c:77
+#: popthelp.c:79
 #, fuzzy
 msgid "Display option defaults in message"
 msgstr "Zobrazi� stru�n� n�vod na pou�itie"
 
-#: popthelp.c:122
+#: popthelp.c:124
 msgid "NONE"
 msgstr ""
 
-#: popthelp.c:124
+#: popthelp.c:126
 msgid "VAL"
 msgstr ""
 
-#: popthelp.c:128
+#: popthelp.c:130
 msgid "INT"
 msgstr ""
 
-#: popthelp.c:129
+#: popthelp.c:131
 msgid "LONG"
 msgstr ""
 
-#: popthelp.c:130
+#: popthelp.c:132
 msgid "STRING"
 msgstr ""
 
-#: popthelp.c:131
+#: popthelp.c:133
 msgid "FLOAT"
 msgstr ""
 
-#: popthelp.c:132
+#: popthelp.c:134
 msgid "DOUBLE"
 msgstr ""
 
-#: popthelp.c:133
+#: popthelp.c:135
 msgid "ARG"
 msgstr ""
 
-#: popthelp.c:508
+#: popthelp.c:548
 msgid "Usage:"
 msgstr ""
 
-#: popthelp.c:532
+#: popthelp.c:572
 msgid "[OPTION...]"
 msgstr ""
diff --git a/po/sl.po b/po/sl.po
index 6c3e467..5c8e4c6 100644
--- a/po/sl.po
+++ b/po/sl.po
@@ -1,14 +1,14 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.3\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2003-12-30 08:12-0500\n"
+"POT-Creation-Date: 2004-02-29 07:48-0500\n"
 "PO-Revision-Date: 2000-09-05 12:30+0200\n"
 "Last-Translator: Roman Maurer <roman.maurer@hermes.si>\n"
 "Language-Team: Slovenian <sl@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=iso-8859-2\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Report-Msgid-Bugs-To: \n"
 
 #: popt.c:35
 msgid "unknown errno"
@@ -59,55 +59,55 @@ msgstr ""
 msgid "unknown error"
 msgstr ""
 
-#: popthelp.c:58 popthelp.c:73
+#: popthelp.c:64 popthelp.c:75
 msgid "Show this help message"
 msgstr "Prika�i to sporo�ilo s pomo�jo"
 
-#: popthelp.c:59 popthelp.c:74
+#: popthelp.c:65 popthelp.c:76
 msgid "Display brief usage message"
 msgstr "Prika�i kratko sporo�ilo o uporabi"
 
-#: popthelp.c:62 popthelp.c:77
+#: popthelp.c:79
 #, fuzzy
 msgid "Display option defaults in message"
 msgstr "Prika�i kratko sporo�ilo o uporabi"
 
-#: popthelp.c:122
+#: popthelp.c:124
 msgid "NONE"
 msgstr ""
 
-#: popthelp.c:124
+#: popthelp.c:126
 msgid "VAL"
 msgstr ""
 
-#: popthelp.c:128
+#: popthelp.c:130
 msgid "INT"
 msgstr ""
 
-#: popthelp.c:129
+#: popthelp.c:131
 msgid "LONG"
 msgstr ""
 
-#: popthelp.c:130
+#: popthelp.c:132
 msgid "STRING"
 msgstr ""
 
-#: popthelp.c:131
+#: popthelp.c:133
 msgid "FLOAT"
 msgstr ""
 
-#: popthelp.c:132
+#: popthelp.c:134
 msgid "DOUBLE"
 msgstr ""
 
-#: popthelp.c:133
+#: popthelp.c:135
 msgid "ARG"
 msgstr ""
 
-#: popthelp.c:508
+#: popthelp.c:548
 msgid "Usage:"
 msgstr ""
 
-#: popthelp.c:532
+#: popthelp.c:572
 msgid "[OPTION...]"
 msgstr ""
diff --git a/po/sr.po b/po/sr.po
index 44701c9..c689f24 100644
--- a/po/sr.po
+++ b/po/sr.po
@@ -6,14 +6,14 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.3\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2003-12-30 08:12-0500\n"
+"POT-Creation-Date: 2004-02-29 07:48-0500\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: ENCODING\n"
+"Report-Msgid-Bugs-To: \n"
 
 #: popt.c:35
 msgid "unknown errno"
@@ -64,54 +64,54 @@ msgstr ""
 msgid "unknown error"
 msgstr ""
 
-#: popthelp.c:58 popthelp.c:73
+#: popthelp.c:64 popthelp.c:75
 msgid "Show this help message"
 msgstr ""
 
-#: popthelp.c:59 popthelp.c:74
+#: popthelp.c:65 popthelp.c:76
 msgid "Display brief usage message"
 msgstr ""
 
-#: popthelp.c:62 popthelp.c:77
+#: popthelp.c:79
 msgid "Display option defaults in message"
 msgstr ""
 
-#: popthelp.c:122
+#: popthelp.c:124
 msgid "NONE"
 msgstr ""
 
-#: popthelp.c:124
+#: popthelp.c:126
 msgid "VAL"
 msgstr ""
 
-#: popthelp.c:128
+#: popthelp.c:130
 msgid "INT"
 msgstr ""
 
-#: popthelp.c:129
+#: popthelp.c:131
 msgid "LONG"
 msgstr ""
 
-#: popthelp.c:130
+#: popthelp.c:132
 msgid "STRING"
 msgstr ""
 
-#: popthelp.c:131
+#: popthelp.c:133
 msgid "FLOAT"
 msgstr ""
 
-#: popthelp.c:132
+#: popthelp.c:134
 msgid "DOUBLE"
 msgstr ""
 
-#: popthelp.c:133
+#: popthelp.c:135
 msgid "ARG"
 msgstr ""
 
-#: popthelp.c:508
+#: popthelp.c:548
 msgid "Usage:"
 msgstr ""
 
-#: popthelp.c:532
+#: popthelp.c:572
 msgid "[OPTION...]"
 msgstr ""
diff --git a/po/sv.po b/po/sv.po
index 92ffc3d..f3e98d8 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -1,14 +1,14 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.3\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2003-12-30 08:12-0500\n"
+"POT-Creation-Date: 2004-02-29 07:48-0500\n"
 "PO-Revision-Date: 2001-07-12 22:26+0100\n"
 "Last-Translator: Christian Rose <menthos@menthos.com>\n"
 "Language-Team: Swedish <sv@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=iso-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Report-Msgid-Bugs-To: \n"
 
 #: popt.c:35
 msgid "unknown errno"
@@ -59,54 +59,54 @@ msgstr "minnesallokering misslyckades"
 msgid "unknown error"
 msgstr "ok�nt fel"
 
-#: popthelp.c:58 popthelp.c:73
+#: popthelp.c:64 popthelp.c:75
 msgid "Show this help message"
 msgstr "Visa denna hj�lptext"
 
-#: popthelp.c:59 popthelp.c:74
+#: popthelp.c:65 popthelp.c:76
 msgid "Display brief usage message"
 msgstr "Visa en kortfattad anv�ndningstext"
 
-#: popthelp.c:62 popthelp.c:77
+#: popthelp.c:79
 msgid "Display option defaults in message"
 msgstr "Visa standardalternativ f�r flaggor i meddelande"
 
-#: popthelp.c:122
+#: popthelp.c:124
 msgid "NONE"
 msgstr "INGET"
 
-#: popthelp.c:124
+#: popthelp.c:126
 msgid "VAL"
 msgstr "V�RDE"
 
-#: popthelp.c:128
+#: popthelp.c:130
 msgid "INT"
 msgstr "HELTAL"
 
-#: popthelp.c:129
+#: popthelp.c:131
 msgid "LONG"
 msgstr "L�NG"
 
-#: popthelp.c:130
+#: popthelp.c:132
 msgid "STRING"
 msgstr "STR�NG"
 
-#: popthelp.c:131
+#: popthelp.c:133
 msgid "FLOAT"
 msgstr "FLYTTAL"
 
-#: popthelp.c:132
+#: popthelp.c:134
 msgid "DOUBLE"
 msgstr "DUBBEL"
 
-#: popthelp.c:133
+#: popthelp.c:135
 msgid "ARG"
 msgstr "ARG"
 
-#: popthelp.c:508
+#: popthelp.c:548
 msgid "Usage:"
 msgstr "Anv�ndning:"
 
-#: popthelp.c:532
+#: popthelp.c:572
 msgid "[OPTION...]"
 msgstr "[FLAGGA...]"
diff --git a/po/tr.po b/po/tr.po
index 5dd2c10..49fbc1d 100644
--- a/po/tr.po
+++ b/po/tr.po
@@ -1,14 +1,14 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.3\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2003-12-30 08:12-0500\n"
+"POT-Creation-Date: 2004-02-29 07:48-0500\n"
 "PO-Revision-Date: 2000-02-11 13:01+0200\n"
 "Last-Translator: Nilgun Belma Buguner <nilgun@technologist.com>\n"
 "Language-Team: Turkish <tr@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=iso8859-9\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Report-Msgid-Bugs-To: \n"
 
 #: popt.c:35
 msgid "unknown errno"
@@ -59,55 +59,55 @@ msgstr ""
 msgid "unknown error"
 msgstr "bilinmeyen hata"
 
-#: popthelp.c:58 popthelp.c:73
+#: popthelp.c:64 popthelp.c:75
 msgid "Show this help message"
 msgstr "Bu yard�m iletisini g�sterir"
 
-#: popthelp.c:59 popthelp.c:74
+#: popthelp.c:65 popthelp.c:76
 msgid "Display brief usage message"
 msgstr "K�sa bir kullan�m iletisi g�ster"
 
-#: popthelp.c:62 popthelp.c:77
+#: popthelp.c:79
 #, fuzzy
 msgid "Display option defaults in message"
 msgstr "K�sa bir kullan�m iletisi g�ster"
 
-#: popthelp.c:122
+#: popthelp.c:124
 msgid "NONE"
 msgstr "YOK"
 
-#: popthelp.c:124
+#: popthelp.c:126
 msgid "VAL"
 msgstr "DE�"
 
-#: popthelp.c:128
+#: popthelp.c:130
 msgid "INT"
 msgstr "INT"
 
-#: popthelp.c:129
+#: popthelp.c:131
 msgid "LONG"
 msgstr "LONG"
 
-#: popthelp.c:130
+#: popthelp.c:132
 msgid "STRING"
 msgstr "STRING"
 
-#: popthelp.c:131
+#: popthelp.c:133
 msgid "FLOAT"
 msgstr "FLOAT"
 
-#: popthelp.c:132
+#: popthelp.c:134
 msgid "DOUBLE"
 msgstr "DOUBLE"
 
-#: popthelp.c:133
+#: popthelp.c:135
 msgid "ARG"
 msgstr "ARG"
 
-#: popthelp.c:508
+#: popthelp.c:548
 msgid "Usage:"
 msgstr "Kullan�m�:"
 
-#: popthelp.c:532
+#: popthelp.c:572
 msgid "[OPTION...]"
 msgstr "[SE�ENEK...]"
diff --git a/po/uk.po b/po/uk.po
index 85bdacf..0ddd5b9 100644
--- a/po/uk.po
+++ b/po/uk.po
@@ -5,14 +5,14 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.3\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2003-12-30 08:12-0500\n"
+"POT-Creation-Date: 2004-02-29 07:48-0500\n"
 "PO-Revision-Date: 1999-09-30 16:54+0200\n"
 "Last-Translator: Yuri Syrota <rasta@renome.rovno.ua>\n"
 "Language-Team: Ukrainian <uk@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=koi8-u\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Report-Msgid-Bugs-To: \n"
 
 #: popt.c:35
 msgid "unknown errno"
@@ -63,55 +63,55 @@ msgstr ""
 msgid "unknown error"
 msgstr ""
 
-#: popthelp.c:58 popthelp.c:73
+#: popthelp.c:64 popthelp.c:75
 msgid "Show this help message"
 msgstr "�������� �� ��צ���"
 
-#: popthelp.c:59 popthelp.c:74
+#: popthelp.c:65 popthelp.c:76
 msgid "Display brief usage message"
 msgstr "�������� ������� ��צ��� ��� ������������"
 
-#: popthelp.c:62 popthelp.c:77
+#: popthelp.c:79
 #, fuzzy
 msgid "Display option defaults in message"
 msgstr "�������� ������� ��צ��� ��� ������������"
 
-#: popthelp.c:122
+#: popthelp.c:124
 msgid "NONE"
 msgstr ""
 
-#: popthelp.c:124
+#: popthelp.c:126
 msgid "VAL"
 msgstr ""
 
-#: popthelp.c:128
+#: popthelp.c:130
 msgid "INT"
 msgstr ""
 
-#: popthelp.c:129
+#: popthelp.c:131
 msgid "LONG"
 msgstr ""
 
-#: popthelp.c:130
+#: popthelp.c:132
 msgid "STRING"
 msgstr ""
 
-#: popthelp.c:131
+#: popthelp.c:133
 msgid "FLOAT"
 msgstr ""
 
-#: popthelp.c:132
+#: popthelp.c:134
 msgid "DOUBLE"
 msgstr ""
 
-#: popthelp.c:133
+#: popthelp.c:135
 msgid "ARG"
 msgstr ""
 
-#: popthelp.c:508
+#: popthelp.c:548
 msgid "Usage:"
 msgstr ""
 
-#: popthelp.c:532
+#: popthelp.c:572
 msgid "[OPTION...]"
 msgstr ""
diff --git a/po/wa.po b/po/wa.po
index 8d06066..6176007 100644
--- a/po/wa.po
+++ b/po/wa.po
@@ -9,14 +9,14 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.3\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2003-12-30 08:12-0500\n"
+"POT-Creation-Date: 2004-02-29 07:48-0500\n"
 "PO-Revision-Date: 1999-03-18 23:11+0100\n"
 "Last-Translator: Nobody yet\n"
 "Language-Team: walon <linux-wa@chanae.alphanet.ch>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=iso-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Report-Msgid-Bugs-To: \n"
 
 #: popt.c:35
 msgid "unknown errno"
@@ -67,55 +67,55 @@ msgstr ""
 msgid "unknown error"
 msgstr ""
 
-#: popthelp.c:58 popthelp.c:73
+#: popthelp.c:64 popthelp.c:75
 msgid "Show this help message"
 msgstr "Mostrer ci messaedje d' aide chal"
 
-#: popthelp.c:59 popthelp.c:74
+#: popthelp.c:65 popthelp.c:76
 msgid "Display brief usage message"
 msgstr "Mostre on court messaedje so kmint vos � siervi"
 
-#: popthelp.c:62 popthelp.c:77
+#: popthelp.c:79
 #, fuzzy
 msgid "Display option defaults in message"
 msgstr "Mostre on court messaedje so kmint vos � siervi"
 
-#: popthelp.c:122
+#: popthelp.c:124
 msgid "NONE"
 msgstr ""
 
-#: popthelp.c:124
+#: popthelp.c:126
 msgid "VAL"
 msgstr ""
 
-#: popthelp.c:128
+#: popthelp.c:130
 msgid "INT"
 msgstr ""
 
-#: popthelp.c:129
+#: popthelp.c:131
 msgid "LONG"
 msgstr ""
 
-#: popthelp.c:130
+#: popthelp.c:132
 msgid "STRING"
 msgstr ""
 
-#: popthelp.c:131
+#: popthelp.c:133
 msgid "FLOAT"
 msgstr ""
 
-#: popthelp.c:132
+#: popthelp.c:134
 msgid "DOUBLE"
 msgstr ""
 
-#: popthelp.c:133
+#: popthelp.c:135
 msgid "ARG"
 msgstr ""
 
-#: popthelp.c:508
+#: popthelp.c:548
 msgid "Usage:"
 msgstr ""
 
-#: popthelp.c:532
+#: popthelp.c:572
 msgid "[OPTION...]"
 msgstr ""
diff --git a/po/zh.po b/po/zh.po
index 44701c9..c689f24 100644
--- a/po/zh.po
+++ b/po/zh.po
@@ -6,14 +6,14 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.3\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2003-12-30 08:12-0500\n"
+"POT-Creation-Date: 2004-02-29 07:48-0500\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: ENCODING\n"
+"Report-Msgid-Bugs-To: \n"
 
 #: popt.c:35
 msgid "unknown errno"
@@ -64,54 +64,54 @@ msgstr ""
 msgid "unknown error"
 msgstr ""
 
-#: popthelp.c:58 popthelp.c:73
+#: popthelp.c:64 popthelp.c:75
 msgid "Show this help message"
 msgstr ""
 
-#: popthelp.c:59 popthelp.c:74
+#: popthelp.c:65 popthelp.c:76
 msgid "Display brief usage message"
 msgstr ""
 
-#: popthelp.c:62 popthelp.c:77
+#: popthelp.c:79
 msgid "Display option defaults in message"
 msgstr ""
 
-#: popthelp.c:122
+#: popthelp.c:124
 msgid "NONE"
 msgstr ""
 
-#: popthelp.c:124
+#: popthelp.c:126
 msgid "VAL"
 msgstr ""
 
-#: popthelp.c:128
+#: popthelp.c:130
 msgid "INT"
 msgstr ""
 
-#: popthelp.c:129
+#: popthelp.c:131
 msgid "LONG"
 msgstr ""
 
-#: popthelp.c:130
+#: popthelp.c:132
 msgid "STRING"
 msgstr ""
 
-#: popthelp.c:131
+#: popthelp.c:133
 msgid "FLOAT"
 msgstr ""
 
-#: popthelp.c:132
+#: popthelp.c:134
 msgid "DOUBLE"
 msgstr ""
 
-#: popthelp.c:133
+#: popthelp.c:135
 msgid "ARG"
 msgstr ""
 
-#: popthelp.c:508
+#: popthelp.c:548
 msgid "Usage:"
 msgstr ""
 
-#: popthelp.c:532
+#: popthelp.c:572
 msgid "[OPTION...]"
 msgstr ""
diff --git a/po/zh_CN.GB2312.po b/po/zh_CN.GB2312.po
index ed43590..691ffe1 100644
--- a/po/zh_CN.GB2312.po
+++ b/po/zh_CN.GB2312.po
@@ -1,14 +1,14 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.3\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2003-12-30 08:12-0500\n"
+"POT-Creation-Date: 2004-02-29 07:48-0500\n"
 "PO-Revision-Date: 1999-11-11 05:04+0800\n"
 "Last-Translator: Dillion Chen <dillon.chen@turbolinux.com.cn>\n"
 "Language-Team: TLDN\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=gb2312\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Report-Msgid-Bugs-To: \n"
 
 #: popt.c:35
 msgid "unknown errno"
@@ -59,55 +59,55 @@ msgstr ""
 msgid "unknown error"
 msgstr ""
 
-#: popthelp.c:58 popthelp.c:73
+#: popthelp.c:64 popthelp.c:75
 msgid "Show this help message"
 msgstr "��ʾ����������Ϣ"
 
-#: popthelp.c:59 popthelp.c:74
+#: popthelp.c:65 popthelp.c:76
 msgid "Display brief usage message"
 msgstr "��ʾ���ʹ����Ϣ"
 
-#: popthelp.c:62 popthelp.c:77
+#: popthelp.c:79
 #, fuzzy
 msgid "Display option defaults in message"
 msgstr "��ʾ���ʹ����Ϣ"
 
-#: popthelp.c:122
+#: popthelp.c:124
 msgid "NONE"
 msgstr ""
 
-#: popthelp.c:124
+#: popthelp.c:126
 msgid "VAL"
 msgstr ""
 
-#: popthelp.c:128
+#: popthelp.c:130
 msgid "INT"
 msgstr ""
 
-#: popthelp.c:129
+#: popthelp.c:131
 msgid "LONG"
 msgstr ""
 
-#: popthelp.c:130
+#: popthelp.c:132
 msgid "STRING"
 msgstr ""
 
-#: popthelp.c:131
+#: popthelp.c:133
 msgid "FLOAT"
 msgstr ""
 
-#: popthelp.c:132
+#: popthelp.c:134
 msgid "DOUBLE"
 msgstr ""
 
-#: popthelp.c:133
+#: popthelp.c:135
 msgid "ARG"
 msgstr ""
 
-#: popthelp.c:508
+#: popthelp.c:548
 msgid "Usage:"
 msgstr ""
 
-#: popthelp.c:532
+#: popthelp.c:572
 msgid "[OPTION...]"
 msgstr ""
-- 
Gitee


From 45425d069878a2c7cc54b5733242267316c3aadc Mon Sep 17 00:00:00 2001
From: Jeff Johnson <n3npq@mac.com>
Date: Wed, 20 Oct 2004 10:19:34 +0000
Subject: [PATCH 395/667] Doxygen fiddles.

---
 popt.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/popt.h b/popt.h
index 3eac333..9872a5e 100644
--- a/popt.h
+++ b/popt.h
@@ -131,7 +131,7 @@ struct poptOption {
 struct poptAlias {
 /*@owned@*/ /*@null@*/
     const char * longName;	/*!< may be NULL */
-    char shortName;		/*!< may be '\0' */
+    char shortName;		/*!< may be NUL */
     int argc;
 /*@owned@*/
     const char ** argv;		/*!< must be free()able */
-- 
Gitee


From 1a33a97ff0074ecc3bf5b99fbbc0320d3a5a8640 Mon Sep 17 00:00:00 2001
From: Jeff Johnson <n3npq@mac.com>
Date: Wed, 20 Oct 2004 10:31:47 +0000
Subject: [PATCH 396/667] Add lua to doxygen.

---
 popt.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/popt.h b/popt.h
index 9872a5e..663fd3b 100644
--- a/popt.h
+++ b/popt.h
@@ -114,7 +114,7 @@
 struct poptOption {
 /*@observer@*/ /*@null@*/
     const char * longName;	/*!< may be NULL */
-    char shortName;		/*!< may be '\0' */
+    char shortName;		/*!< may be NUL */
     int argInfo;
 /*@shared@*/ /*@null@*/
     void * arg;			/*!< depends on argInfo */
-- 
Gitee


From 53df3a92d8a62cc425ecf9b36e70f2dfed424072 Mon Sep 17 00:00:00 2001
From: Jeff Johnson <n3npq@mac.com>
Date: Wed, 27 Oct 2004 22:57:17 +0000
Subject: [PATCH 397/667] Build rpm-4.4-0.1 packages.

---
 po/cs.po           | 2 +-
 po/da.po           | 2 +-
 po/de.po           | 2 +-
 po/es.po           | 2 +-
 po/eu_ES.po        | 2 +-
 po/fi.po           | 2 +-
 po/fr.po           | 2 +-
 po/gl.po           | 2 +-
 po/hu.po           | 2 +-
 po/id.po           | 2 +-
 po/is.po           | 2 +-
 po/it.po           | 2 +-
 po/ja.po           | 2 +-
 po/ko.po           | 2 +-
 po/no.po           | 2 +-
 po/pl.po           | 2 +-
 po/pt.po           | 2 +-
 po/pt_BR.po        | 2 +-
 po/ro.po           | 2 +-
 po/ru.po           | 2 +-
 po/sk.po           | 2 +-
 po/sl.po           | 2 +-
 po/sr.po           | 2 +-
 po/sv.po           | 2 +-
 po/tr.po           | 2 +-
 po/uk.po           | 2 +-
 po/wa.po           | 2 +-
 po/zh.po           | 2 +-
 po/zh_CN.GB2312.po | 2 +-
 29 files changed, 29 insertions(+), 29 deletions(-)

diff --git a/po/cs.po b/po/cs.po
index a681d01..20b4ec8 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -1,6 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.3\n"
+"Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2004-02-29 07:48-0500\n"
 "PO-Revision-Date: 2001-07-24 00:03+0100\n"
 "Last-Translator: Milan Kerslager <kerslage@linux.cz>\n"
@@ -8,7 +9,6 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=iso-8859-2\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Report-Msgid-Bugs-To: \n"
 
 #: popt.c:35
 msgid "unknown errno"
diff --git a/po/da.po b/po/da.po
index 4245bbb..f8e9e70 100644
--- a/po/da.po
+++ b/po/da.po
@@ -1,6 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.3\n"
+"Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2004-02-29 07:48-0500\n"
 "PO-Revision-Date: Sun Jan 21 2001 04:30:32+0200\n"
 "Last-Translator: Martin Hansen <mah@k64.dk>\n"
@@ -8,7 +9,6 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=ISO-8859-1\n"
 "Content-Transfer-Encoding: 8-bit\n"
-"Report-Msgid-Bugs-To: \n"
 "X-Generator: KTranslator v 0.6.0\n"
 
 #: popt.c:35
diff --git a/po/de.po b/po/de.po
index c689f24..df3d2ae 100644
--- a/po/de.po
+++ b/po/de.po
@@ -6,6 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.3\n"
+"Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2004-02-29 07:48-0500\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
@@ -13,7 +14,6 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: ENCODING\n"
-"Report-Msgid-Bugs-To: \n"
 
 #: popt.c:35
 msgid "unknown errno"
diff --git a/po/es.po b/po/es.po
index c83b3ca..c263994 100644
--- a/po/es.po
+++ b/po/es.po
@@ -6,6 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.3\n"
+"Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2004-02-29 07:48-0500\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Leandro Lucarella <luca@linuxmendoza.org.ar>\n"
@@ -13,7 +14,6 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: ENCODING\n"
-"Report-Msgid-Bugs-To: \n"
 
 #: popt.c:35
 msgid "unknown errno"
diff --git a/po/eu_ES.po b/po/eu_ES.po
index c689f24..df3d2ae 100644
--- a/po/eu_ES.po
+++ b/po/eu_ES.po
@@ -6,6 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.3\n"
+"Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2004-02-29 07:48-0500\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
@@ -13,7 +14,6 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: ENCODING\n"
-"Report-Msgid-Bugs-To: \n"
 
 #: popt.c:35
 msgid "unknown errno"
diff --git a/po/fi.po b/po/fi.po
index c689f24..df3d2ae 100644
--- a/po/fi.po
+++ b/po/fi.po
@@ -6,6 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.3\n"
+"Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2004-02-29 07:48-0500\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
@@ -13,7 +14,6 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: ENCODING\n"
-"Report-Msgid-Bugs-To: \n"
 
 #: popt.c:35
 msgid "unknown errno"
diff --git a/po/fr.po b/po/fr.po
index 04f0908..06bde25 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -11,6 +11,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.8.1\n"
+"Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2004-02-29 07:48-0500\n"
 "PO-Revision-Date: 2003-06-22 23:43+0200\n"
 "Last-Translator: RPM French Translation <rpm-fr@livna.org>\n"
@@ -18,7 +19,6 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8-bit\n"
-"Report-Msgid-Bugs-To: \n"
 
 #: popt.c:35
 msgid "unknown errno"
diff --git a/po/gl.po b/po/gl.po
index c9fbfd8..0f783f8 100644
--- a/po/gl.po
+++ b/po/gl.po
@@ -1,6 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.3\n"
+"Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2004-02-29 07:48-0500\n"
 "PO-Revision-Date: 2001-01-17 01:01+0100\n"
 "Last-Translator: Jes�s Bravo �lvarez <jba@pobox.com>\n"
@@ -8,7 +9,6 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=iso-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Report-Msgid-Bugs-To: \n"
 
 #: popt.c:35
 msgid "unknown errno"
diff --git a/po/hu.po b/po/hu.po
index 550c065..0cd41f2 100644
--- a/po/hu.po
+++ b/po/hu.po
@@ -1,6 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.3\n"
+"Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2004-02-29 07:48-0500\n"
 "PO-Revision-Date: 2000-08-03 23:26+0200\n"
 "Last-Translator: L�szl� N�meth <nemeth@qwertynet.hu>\n"
@@ -8,7 +9,6 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=ISO-8859-2\n"
 "Content-Transfer-Encoding: 8-bit\n"
-"Report-Msgid-Bugs-To: \n"
 
 #: popt.c:35
 msgid "unknown errno"
diff --git a/po/id.po b/po/id.po
index c689f24..df3d2ae 100644
--- a/po/id.po
+++ b/po/id.po
@@ -6,6 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.3\n"
+"Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2004-02-29 07:48-0500\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
@@ -13,7 +14,6 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: ENCODING\n"
-"Report-Msgid-Bugs-To: \n"
 
 #: popt.c:35
 msgid "unknown errno"
diff --git a/po/is.po b/po/is.po
index 0b3c9d5..4a117ad 100644
--- a/po/is.po
+++ b/po/is.po
@@ -1,6 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.3\n"
+"Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2004-02-29 07:48-0500\n"
 "PO-Revision-Date: 2001-06-08 01:35+0000\n"
 "Last-Translator: Richard Allen <ra@hp.is>\n"
@@ -8,7 +9,6 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=ISO-8859-1\n"
 "Content-Transfer-Encoding: 8-bit\n"
-"Report-Msgid-Bugs-To: \n"
 
 #: popt.c:35
 msgid "unknown errno"
diff --git a/po/it.po b/po/it.po
index c689f24..df3d2ae 100644
--- a/po/it.po
+++ b/po/it.po
@@ -6,6 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.3\n"
+"Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2004-02-29 07:48-0500\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
@@ -13,7 +14,6 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: ENCODING\n"
-"Report-Msgid-Bugs-To: \n"
 
 #: popt.c:35
 msgid "unknown errno"
diff --git a/po/ja.po b/po/ja.po
index c689f24..df3d2ae 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -6,6 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.3\n"
+"Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2004-02-29 07:48-0500\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
@@ -13,7 +14,6 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: ENCODING\n"
-"Report-Msgid-Bugs-To: \n"
 
 #: popt.c:35
 msgid "unknown errno"
diff --git a/po/ko.po b/po/ko.po
index dfe8f83..e50db53 100644
--- a/po/ko.po
+++ b/po/ko.po
@@ -1,6 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6\n"
+"Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2004-02-29 07:48-0500\n"
 "PO-Revision-Date: 2001-09-06 20:06+0900\n"
 "Last-Translator: Jong-Hoon Ryu <redhat4u@netian.com>\n"
@@ -8,7 +9,6 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=EUC-KR\n"
 "Content-Transfer-Encoding: 8-bit\n"
-"Report-Msgid-Bugs-To: \n"
 
 #: popt.c:35
 msgid "unknown errno"
diff --git a/po/no.po b/po/no.po
index 419af66..3872b99 100644
--- a/po/no.po
+++ b/po/no.po
@@ -1,6 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.3\n"
+"Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2004-02-29 07:48-0500\n"
 "PO-Revision-Date: 2001-06-27 11:05+0200\n"
 "Last-Translator: Kjartan Maraas <kmaraas@online.no>\n"
@@ -8,7 +9,6 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=iso-8859-1\n"
 "Content-Transfer-Encoding: 8-bit\n"
-"Report-Msgid-Bugs-To: \n"
 
 #: popt.c:35
 msgid "unknown errno"
diff --git a/po/pl.po b/po/pl.po
index 79ece5b..c2c9032 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -5,6 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.9-20030515\n"
+"Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2004-02-29 07:48-0500\n"
 "PO-Revision-Date: 2003-06-08 20:32+0200\n"
 "Last-Translator: Jakub Bogusz <qboosh@pld.org.pl>\n"
@@ -12,7 +13,6 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=iso-8859-2\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Report-Msgid-Bugs-To: \n"
 
 #: popt.c:35
 msgid "unknown errno"
diff --git a/po/pt.po b/po/pt.po
index e315985..ecd8a3b 100644
--- a/po/pt.po
+++ b/po/pt.po
@@ -1,6 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt\n"
+"Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2004-02-29 07:48-0500\n"
 "PO-Revision-Date: 2002-02-13 18:32+0000\n"
 "Last-Translator: Pedro Morais <morais@kde.org>\n"
@@ -8,7 +9,6 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=iso-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Report-Msgid-Bugs-To: \n"
 
 #: popt.c:35
 msgid "unknown errno"
diff --git a/po/pt_BR.po b/po/pt_BR.po
index c689f24..df3d2ae 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -6,6 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.3\n"
+"Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2004-02-29 07:48-0500\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
@@ -13,7 +14,6 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: ENCODING\n"
-"Report-Msgid-Bugs-To: \n"
 
 #: popt.c:35
 msgid "unknown errno"
diff --git a/po/ro.po b/po/ro.po
index 6cb8546..83f7976 100644
--- a/po/ro.po
+++ b/po/ro.po
@@ -1,6 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.3\n"
+"Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2004-02-29 07:48-0500\n"
 "PO-Revision-Date: 2000-06-14 23:23+EST\n"
 "Last-Translator: Cristian Gafton <gafton@redhat.com>\n"
@@ -8,7 +9,6 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=ISO-8859-2\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Report-Msgid-Bugs-To: \n"
 
 #: popt.c:35
 msgid "unknown errno"
diff --git a/po/ru.po b/po/ru.po
index 6289aa3..728df7d 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -1,6 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.3\n"
+"Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2004-02-29 07:48-0500\n"
 "PO-Revision-Date: 2001-07-05 21:00-0500\n"
 "Last-Translator: Eugene Kanter <eugene@blackcatlinux.com>\n"
@@ -8,7 +9,6 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=koi8-r\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Report-Msgid-Bugs-To: \n"
 
 #: popt.c:35
 msgid "unknown errno"
diff --git a/po/sk.po b/po/sk.po
index 4c4b75f..aa48f9d 100644
--- a/po/sk.po
+++ b/po/sk.po
@@ -5,6 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.3\n"
+"Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2004-02-29 07:48-0500\n"
 "PO-Revision-Date: 1999-08-04 21:40+0200\n"
 "Last-Translator: Stanislav Meduna <stano@eunet.sk>\n"
@@ -12,7 +13,6 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=iso-8859-2\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Report-Msgid-Bugs-To: \n"
 
 #: popt.c:35
 msgid "unknown errno"
diff --git a/po/sl.po b/po/sl.po
index 5c8e4c6..65d6260 100644
--- a/po/sl.po
+++ b/po/sl.po
@@ -1,6 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.3\n"
+"Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2004-02-29 07:48-0500\n"
 "PO-Revision-Date: 2000-09-05 12:30+0200\n"
 "Last-Translator: Roman Maurer <roman.maurer@hermes.si>\n"
@@ -8,7 +9,6 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=iso-8859-2\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Report-Msgid-Bugs-To: \n"
 
 #: popt.c:35
 msgid "unknown errno"
diff --git a/po/sr.po b/po/sr.po
index c689f24..df3d2ae 100644
--- a/po/sr.po
+++ b/po/sr.po
@@ -6,6 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.3\n"
+"Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2004-02-29 07:48-0500\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
@@ -13,7 +14,6 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: ENCODING\n"
-"Report-Msgid-Bugs-To: \n"
 
 #: popt.c:35
 msgid "unknown errno"
diff --git a/po/sv.po b/po/sv.po
index f3e98d8..087dbbe 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -1,6 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.3\n"
+"Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2004-02-29 07:48-0500\n"
 "PO-Revision-Date: 2001-07-12 22:26+0100\n"
 "Last-Translator: Christian Rose <menthos@menthos.com>\n"
@@ -8,7 +9,6 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=iso-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Report-Msgid-Bugs-To: \n"
 
 #: popt.c:35
 msgid "unknown errno"
diff --git a/po/tr.po b/po/tr.po
index 49fbc1d..ab97780 100644
--- a/po/tr.po
+++ b/po/tr.po
@@ -1,6 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.3\n"
+"Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2004-02-29 07:48-0500\n"
 "PO-Revision-Date: 2000-02-11 13:01+0200\n"
 "Last-Translator: Nilgun Belma Buguner <nilgun@technologist.com>\n"
@@ -8,7 +9,6 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=iso8859-9\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Report-Msgid-Bugs-To: \n"
 
 #: popt.c:35
 msgid "unknown errno"
diff --git a/po/uk.po b/po/uk.po
index 0ddd5b9..7864ad4 100644
--- a/po/uk.po
+++ b/po/uk.po
@@ -5,6 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.3\n"
+"Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2004-02-29 07:48-0500\n"
 "PO-Revision-Date: 1999-09-30 16:54+0200\n"
 "Last-Translator: Yuri Syrota <rasta@renome.rovno.ua>\n"
@@ -12,7 +13,6 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=koi8-u\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Report-Msgid-Bugs-To: \n"
 
 #: popt.c:35
 msgid "unknown errno"
diff --git a/po/wa.po b/po/wa.po
index 6176007..6d6740c 100644
--- a/po/wa.po
+++ b/po/wa.po
@@ -9,6 +9,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.3\n"
+"Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2004-02-29 07:48-0500\n"
 "PO-Revision-Date: 1999-03-18 23:11+0100\n"
 "Last-Translator: Nobody yet\n"
@@ -16,7 +17,6 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=iso-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Report-Msgid-Bugs-To: \n"
 
 #: popt.c:35
 msgid "unknown errno"
diff --git a/po/zh.po b/po/zh.po
index c689f24..df3d2ae 100644
--- a/po/zh.po
+++ b/po/zh.po
@@ -6,6 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.3\n"
+"Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2004-02-29 07:48-0500\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
@@ -13,7 +14,6 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: ENCODING\n"
-"Report-Msgid-Bugs-To: \n"
 
 #: popt.c:35
 msgid "unknown errno"
diff --git a/po/zh_CN.GB2312.po b/po/zh_CN.GB2312.po
index 691ffe1..96fdf05 100644
--- a/po/zh_CN.GB2312.po
+++ b/po/zh_CN.GB2312.po
@@ -1,6 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.3\n"
+"Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2004-02-29 07:48-0500\n"
 "PO-Revision-Date: 1999-11-11 05:04+0800\n"
 "Last-Translator: Dillion Chen <dillon.chen@turbolinux.com.cn>\n"
@@ -8,7 +9,6 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=gb2312\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Report-Msgid-Bugs-To: \n"
 
 #: popt.c:35
 msgid "unknown errno"
-- 
Gitee


From 32e7648de81aa13401b7db7b9029c18c2ebf9e32 Mon Sep 17 00:00:00 2001
From: Jeff Johnson <n3npq@mac.com>
Date: Thu, 28 Oct 2004 23:57:36 +0000
Subject: [PATCH 398/667] - bump popt to version to 1.10.

---
 configure.ac | 2 +-
 popt.spec    | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/configure.ac b/configure.ac
index ac8f764..5935014 100755
--- a/configure.ac
+++ b/configure.ac
@@ -2,7 +2,7 @@ AC_INIT(popt.h)
 AC_CANONICAL_SYSTEM
 AC_PREREQ(2.12)
 AC_CONFIG_HEADERS
-AM_INIT_AUTOMAKE(popt, 1.9)
+AM_INIT_AUTOMAKE(popt, 1.10)
 AM_CONFIG_HEADER(config.h)
 
 ALL_LINGUAS="cs da de es eu_ES fi fr gl hu id is it ja ko no pl pt pt_BR ro ru sk sl sr sv tr uk wa zh zh_CN.GB2312"
diff --git a/popt.spec b/popt.spec
index f84fabd..df33aaa 100644
--- a/popt.spec
+++ b/popt.spec
@@ -4,9 +4,9 @@
 #
 Summary: A C library for parsing command line parameters.
 Name: popt
-Version: 1.9
+Version: 1.10
 Release: 0.1
-Copyright: X Consortium
+License: X Consortium
 Group: System Environment/Libraries
 Source: ftp://ftp.redhat.com/pub/redhat/code/popt/popt-%{version}.tar.gz
 BuildRoot: /var/tmp/%{name}root
-- 
Gitee


From b2feef5bf8c979aea26a05fb1cdf92b541844ec1 Mon Sep 17 00:00:00 2001
From: Jeff Johnson <n3npq@mac.com>
Date: Tue, 4 Jan 2005 19:25:24 +0000
Subject: [PATCH 399/667] - mac os x patches (#133611, #133612, #134637).

---
 Makefile.am | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index 5d9862c..3c2e618 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -17,13 +17,13 @@ noinst_HEADERS = findme.h poptint.h system.h
 
 noinst_PROGRAMS = test1 test2 test3
 test1_SOURCES = test1.c
-test1_LDFLAGS = -all-static
+test1_LDFLAGS = 
 test1_LDADD = $(usrlib_LTLIBRARIES)
 test2_SOURCES = test2.c
-test2_LDFLAGS = -all-static
+test2_LDFLAGS = 
 test2_LDADD = $(usrlib_LTLIBRARIES)
 test3_SOURCES = test3.c
-test3_LDFLAGS = -all-static
+test3_LDFLAGS = 
 test3_LDADD = $(usrlib_LTLIBRARIES)
 
 noinst_SCRIPTS = testit.sh
-- 
Gitee


From 1d5bd47566ffbe93073bdd7220e7fe2156d1e4f7 Mon Sep 17 00:00:00 2001
From: Jeff Johnson <n3npq@mac.com>
Date: Mon, 17 Jan 2005 17:10:32 +0000
Subject: [PATCH 400/667] Mac OS X fiddles.

---
 Makefile.am |  2 ++
 autogen.sh  | 12 +++++++++++-
 2 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/Makefile.am b/Makefile.am
index 3c2e618..59414db 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -37,7 +37,9 @@ include_HEADERS = popt.h
 
 usrlibdir = $(libdir)@MARK64@
 usrlib_LTLIBRARIES = libpopt.la
+
 libpopt_la_SOURCES = popt.c findme.c poptparse.c poptconfig.c popthelp.c
+libpopt_la_LDFLAGS = @INTLLIBS@
 
 man_MANS = popt.3
 
diff --git a/autogen.sh b/autogen.sh
index 0ccf997..c4a69a8 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -5,8 +5,18 @@ test -z "$srcdir" && srcdir=.
 
 THEDIR="`pwd`"
 
+libtoolize=`which glibtoolize`
+case $libtoolize in
+/*) ;;
+*)  libtoolize=`which libtoolize`
+    case $libtoolize in
+    /*) ;;
+    *)  libtoolize=libtoolize
+    esac
+esac
+
 cd "$srcdir"
-libtoolize --copy --force
+$libtoolize --copy --force
 aclocal
 autoheader
 automake -a -c
-- 
Gitee


From ea3996df6dbc17cb0738ec6a6aa0030a63c918bb Mon Sep 17 00:00:00 2001
From: Jeff Johnson <n3npq@mac.com>
Date: Mon, 17 Jan 2005 22:12:08 +0000
Subject: [PATCH 401/667] Spew glibtoolize which(1) failure to /dev/null.

---
 autogen.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/autogen.sh b/autogen.sh
index c4a69a8..cded311 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -5,10 +5,10 @@ test -z "$srcdir" && srcdir=.
 
 THEDIR="`pwd`"
 
-libtoolize=`which glibtoolize`
+libtoolize=`which glibtoolize 2>/dev/null`
 case $libtoolize in
 /*) ;;
-*)  libtoolize=`which libtoolize`
+*)  libtoolize=`which libtoolize 2>/dev/null`
     case $libtoolize in
     /*) ;;
     *)  libtoolize=libtoolize
-- 
Gitee


From d00925a896a4a1e9326e61df42cc382032f33f65 Mon Sep 17 00:00:00 2001
From: Jeff Johnson <n3npq@mac.com>
Date: Mon, 21 Feb 2005 15:23:30 +0000
Subject: [PATCH 402/667] Blueprint against rpm-4.4.1 changes.

---
 configure.ac | 2 +-
 popt.spec    | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/configure.ac b/configure.ac
index 5935014..c72ad1e 100755
--- a/configure.ac
+++ b/configure.ac
@@ -2,7 +2,7 @@ AC_INIT(popt.h)
 AC_CANONICAL_SYSTEM
 AC_PREREQ(2.12)
 AC_CONFIG_HEADERS
-AM_INIT_AUTOMAKE(popt, 1.10)
+AM_INIT_AUTOMAKE(popt, 1.10.2)
 AM_CONFIG_HEADER(config.h)
 
 ALL_LINGUAS="cs da de es eu_ES fi fr gl hu id is it ja ko no pl pt pt_BR ro ru sk sl sr sv tr uk wa zh zh_CN.GB2312"
diff --git a/popt.spec b/popt.spec
index df33aaa..5a029a4 100644
--- a/popt.spec
+++ b/popt.spec
@@ -4,7 +4,7 @@
 #
 Summary: A C library for parsing command line parameters.
 Name: popt
-Version: 1.10
+Version: 1.10.2
 Release: 0.1
 License: X Consortium
 Group: System Environment/Libraries
-- 
Gitee


From cb9e1226714c654cadf8d094389b0140a258e88c Mon Sep 17 00:00:00 2001
From: Paul Nasrat <pnasrat@redhat.com>
Date: Tue, 24 May 2005 15:36:01 +0000
Subject: [PATCH 403/667] Update translation changes from rpm-4_4

---
 configure.ac                     |   2 +-
 po/zh_CN.po                      |  93 ++++++++++++++++++++
 po/{zh_CN.GB2312.po => zh_TW.po} | 143 +++++++++++++------------------
 3 files changed, 154 insertions(+), 84 deletions(-)
 create mode 100644 po/zh_CN.po
 rename po/{zh_CN.GB2312.po => zh_TW.po} (42%)

diff --git a/configure.ac b/configure.ac
index c72ad1e..28b2611 100755
--- a/configure.ac
+++ b/configure.ac
@@ -5,7 +5,7 @@ AC_CONFIG_HEADERS
 AM_INIT_AUTOMAKE(popt, 1.10.2)
 AM_CONFIG_HEADER(config.h)
 
-ALL_LINGUAS="cs da de es eu_ES fi fr gl hu id is it ja ko no pl pt pt_BR ro ru sk sl sr sv tr uk wa zh zh_CN.GB2312"
+ALL_LINGUAS="cs da de es eu_ES fi fr gl hu id is it ja ko no pl pt pt_BR ro ru sk sl sr sv tr uk wa zh zh_CN zh_TW"
 
 AC_ISC_POSIX
 
diff --git a/po/zh_CN.po b/po/zh_CN.po
new file mode 100644
index 0000000..9128fa1
--- /dev/null
+++ b/po/zh_CN.po
@@ -0,0 +1,93 @@
+# translation of translation.po to 
+# Traditional Chinese Messages for popt
+# Copyright (C) 2005 Free Software Foundation, Inc.
+# Wei-Lun Chao <chaoweilun@pcmail.com.tw>, 2005.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: translation\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2005-03-31 13:55+0100\n"
+"PO-Revision-Date: 2005-05-20 15:53+1000\n"
+"Last-Translator: \n"
+"Language-Team:  <zh@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Generator: KBabel 1.9.1\n"
+
+msgid "ARG"
+msgstr "ARG"
+
+msgid "DOUBLE"
+msgstr "DOUBLE"
+
+msgid "Display brief usage message"
+msgstr "显示简短的使用说明"
+
+msgid "Display option defaults in message"
+msgstr "在信息中显示默认的选项"
+
+msgid "FLOAT"
+msgstr "FLOAT"
+
+msgid "INT"
+msgstr "INT"
+
+msgid "LONG"
+msgstr "LONG"
+
+msgid "NONE"
+msgstr "NONE"
+
+msgid "STRING"
+msgstr "STRING"
+
+msgid "Show this help message"
+msgstr "显示这个帮助信息"
+
+msgid "Usage:"
+msgstr "用法:"
+
+msgid "VAL"
+msgstr "VAL"
+
+msgid "[OPTION...]"
+msgstr "[选项...]"
+
+msgid "aliases nested too deeply"
+msgstr "别名嵌套太深"
+
+msgid "error in parameter quoting"
+msgstr "参数引号错误"
+
+msgid "invalid numeric value"
+msgstr "无效的数值"
+
+msgid "memory allocation failed"
+msgstr "内存分配错误"
+
+msgid "missing argument"
+msgstr "缺少参数"
+
+msgid "mutually exclusive logical operations requested"
+msgstr "需要 XOR 逻辑运算"
+
+msgid "number too large or too small"
+msgstr "数值太大或太小"
+
+msgid "opt->arg should not be NULL"
+msgstr "opt->arg 不应该为 NULL"
+
+msgid "option type (%d) not implemented in popt\n"
+msgstr "选项类别 (%d) 沒有在 popt 中实现\n"
+
+msgid "unknown errno"
+msgstr "未知的错误"
+
+msgid "unknown error"
+msgstr "未知的错误"
+
+msgid "unknown option"
+msgstr "未知的选项"
+
diff --git a/po/zh_CN.GB2312.po b/po/zh_TW.po
similarity index 42%
rename from po/zh_CN.GB2312.po
rename to po/zh_TW.po
index 96fdf05..a9c2560 100644
--- a/po/zh_CN.GB2312.po
+++ b/po/zh_TW.po
@@ -1,113 +1,90 @@
+# Traditional Chinese Messages for popt
+# Copyright (C) 2005 Free Software Foundation, Inc.
+# Wei-Lun Chao <chaoweilun@pcmail.com.tw>, 2005
+#
 msgid ""
 msgstr ""
-"Project-Id-Version: popt 1.6.3\n"
+"Project-Id-Version: popt 1.10.1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-02-29 07:48-0500\n"
-"PO-Revision-Date: 1999-11-11 05:04+0800\n"
-"Last-Translator: Dillion Chen <dillon.chen@turbolinux.com.cn>\n"
-"Language-Team: TLDN\n"
+"POT-Creation-Date: 2005-03-31 13:55+0100\n"
+"PO-Revision-Date: 2005-04-08 17:52+0800\n"
+"Last-Translator: Wei-Lun Chao <chaoweilun@pcmail.com.tw>\n"
+"Language-Team: zh_TW <zh-l10n@linux.org.tw>\n"
 "MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=gb2312\n"
+"Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: popt.c:35
-msgid "unknown errno"
-msgstr ""
+msgid "ARG"
+msgstr "ARG"
 
-#: popt.c:964
-#, c-format
-msgid "option type (%d) not implemented in popt\n"
-msgstr ""
+msgid "DOUBLE"
+msgstr "DOUBLE"
 
-#: popt.c:1184
-msgid "missing argument"
-msgstr ""
+msgid "Display brief usage message"
+msgstr "顯示簡短的使用說明"
 
-#: popt.c:1186
-msgid "unknown option"
-msgstr ""
+msgid "Display option defaults in message"
+msgstr "在訊息中顯示預設選項"
 
-#: popt.c:1188
-msgid "mutually exclusive logical operations requested"
-msgstr ""
+msgid "FLOAT"
+msgstr "FLOAT"
 
-#: popt.c:1190
-msgid "opt->arg should not be NULL"
-msgstr ""
+msgid "INT"
+msgstr "INT"
 
-#: popt.c:1192
-msgid "aliases nested too deeply"
-msgstr ""
+msgid "LONG"
+msgstr "LONG"
 
-#: popt.c:1194
-msgid "error in parameter quoting"
-msgstr ""
+msgid "NONE"
+msgstr "NONE"
 
-#: popt.c:1196
-msgid "invalid numeric value"
-msgstr ""
+msgid "STRING"
+msgstr "STRING"
 
-#: popt.c:1198
-msgid "number too large or too small"
-msgstr ""
+msgid "Show this help message"
+msgstr "顯示本說明訊息"
 
-#: popt.c:1200
-msgid "memory allocation failed"
-msgstr ""
+msgid "Usage:"
+msgstr "用法:"
 
-#: popt.c:1204
-msgid "unknown error"
-msgstr ""
+msgid "VAL"
+msgstr "VAL"
 
-#: popthelp.c:64 popthelp.c:75
-msgid "Show this help message"
-msgstr "��ʾ����������Ϣ"
+msgid "[OPTION...]"
+msgstr "[選項...]"
 
-#: popthelp.c:65 popthelp.c:76
-msgid "Display brief usage message"
-msgstr "��ʾ���ʹ����Ϣ"
+msgid "aliases nested too deeply"
+msgstr "巢狀別名太深"
 
-#: popthelp.c:79
-#, fuzzy
-msgid "Display option defaults in message"
-msgstr "��ʾ���ʹ����Ϣ"
+msgid "error in parameter quoting"
+msgstr "參數引號錯誤"
 
-#: popthelp.c:124
-msgid "NONE"
-msgstr ""
+msgid "invalid numeric value"
+msgstr "不正確的數值"
 
-#: popthelp.c:126
-msgid "VAL"
-msgstr ""
+msgid "memory allocation failed"
+msgstr "記憶體配置錯誤"
 
-#: popthelp.c:130
-msgid "INT"
-msgstr ""
+msgid "missing argument"
+msgstr "缺少引數"
 
-#: popthelp.c:131
-msgid "LONG"
-msgstr ""
+msgid "mutually exclusive logical operations requested"
+msgstr "需要相互獨立的邏輯運算"
 
-#: popthelp.c:132
-msgid "STRING"
-msgstr ""
+msgid "number too large or too small"
+msgstr "數字太大或太小"
 
-#: popthelp.c:133
-msgid "FLOAT"
-msgstr ""
+msgid "opt->arg should not be NULL"
+msgstr "opt->arg 不應為 NULL"
 
-#: popthelp.c:134
-msgid "DOUBLE"
-msgstr ""
+msgid "option type (%d) not implemented in popt\n"
+msgstr "選項類型 (%d) 沒有在 popt 中實作\n"
 
-#: popthelp.c:135
-msgid "ARG"
-msgstr ""
+msgid "unknown errno"
+msgstr "未知的錯誤"
 
-#: popthelp.c:548
-msgid "Usage:"
-msgstr ""
+msgid "unknown error"
+msgstr "未知的錯誤"
 
-#: popthelp.c:572
-msgid "[OPTION...]"
-msgstr ""
+msgid "unknown option"
+msgstr "未知的選項"
-- 
Gitee


From ea5597c19139f5212016a8f2df6019b561c7dcb9 Mon Sep 17 00:00:00 2001
From: Jeff Johnson <n3npq@mac.com>
Date: Wed, 5 Oct 2005 20:27:14 +0000
Subject: [PATCH 404/667] Merge blueprinting against rpm-4_4 in progress.

---
 Makefile.am | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Makefile.am b/Makefile.am
index 59414db..af97931 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -46,7 +46,7 @@ man_MANS = popt.3
 #BUILT_SOURCES = popt.lcd
 
 popt.lcd: Makefile.am ${libpopt_la_SOURCES} ${include_HEADERS} ${noinst_HEADERS}
-	lclint -dump $@ ${libpopt_la_SOURCES}
+	$(LINT) -dump $@ ${libpopt_la_SOURCES}
 
 .PHONY:	sources
 sources:
-- 
Gitee


From 149f325ff8125f8454629da2a64f7677e9165c89 Mon Sep 17 00:00:00 2001
From: Jeff Johnson <n3npq@mac.com>
Date: Fri, 25 May 2007 17:36:23 +0000
Subject: [PATCH 405/667] Bring in rpm.org changes to HEAD.

---
 ABOUT-NLS         | 1107 +++++++++++++++++++++++++++++++++------
 Doxyfile.in       | 1252 ++++++++++++++++++++++++++++++++++++---------
 Makefile.am       |   16 +-
 configure.ac      |   56 +-
 findme.c          |    4 +-
 intl/Makefile.in  |  417 +++++++++++----
 po/ChangeLog      |   14 +-
 po/Makefile.in.in |  389 ++++++++++----
 po/POTFILES.in    |    1 +
 po/cs.po          |   60 ++-
 po/da.po          |   60 ++-
 po/de.po          |  127 ++---
 po/es.po          |   62 ++-
 po/eu_ES.po       |   62 ++-
 po/fi.po          |   62 ++-
 po/fr.po          |   60 ++-
 po/gl.po          |   60 ++-
 po/hu.po          |   60 ++-
 po/id.po          |   62 ++-
 po/is.po          |   60 ++-
 po/it.po          |   62 ++-
 po/ja.po          |  127 ++---
 po/ko.po          |   60 ++-
 po/no.po          |   60 ++-
 po/pl.po          |   66 +--
 po/popt.pot       |   62 ++-
 po/pt.po          |   60 ++-
 po/pt_BR.po       |   62 ++-
 po/ro.po          |   60 ++-
 po/ru.po          |   60 ++-
 po/sk.po          |   60 ++-
 po/sl.po          |   60 ++-
 po/sr.po          |   62 ++-
 po/sv.po          |   60 ++-
 po/tr.po          |   60 ++-
 po/uk.po          |   60 ++-
 po/wa.po          |   60 ++-
 po/zh.po          |   62 ++-
 po/zh_CN.po       |  135 +++--
 po/zh_TW.po       |  136 +++--
 popt.c            |  182 ++++---
 popt.h            |   99 ++--
 popt.spec         |    2 +-
 poptconfig.c      |   16 +-
 popthelp.c        |   81 +--
 poptint.h         |    8 +-
 poptparse.c       |   14 +-
 system.h          |    4 +
 test1.c           |    8 +-
 test3.c           |    4 +-
 testit.sh         |    4 +-
 51 files changed, 4100 insertions(+), 1747 deletions(-)

diff --git a/ABOUT-NLS b/ABOUT-NLS
index 5fde45a..ec20977 100644
--- a/ABOUT-NLS
+++ b/ABOUT-NLS
@@ -1,10 +1,11 @@
-Notes on the Free Translation Project
-*************************************
+1 Notes on the Free Translation Project
+***************************************
 
-   Free software is going international!  The Free Translation Project
-is a way to get maintainers of free software, translators, and users all
-together, so that will gradually become able to speak many languages.
-A few packages already provide translations for their messages.
+Free software is going international!  The Free Translation Project is
+a way to get maintainers of free software, translators, and users all
+together, so that free software will gradually become able to speak many
+languages.  A few packages already provide translations for their
+messages.
 
    If you found this `ABOUT-NLS' file inside a distribution, you may
 assume that the distributed package does use GNU `gettext' internally,
@@ -15,17 +16,17 @@ this package with messages translated.
    Installers will find here some useful hints.  These notes also
 explain how users should proceed for getting the programs to use the
 available translations.  They tell how people wanting to contribute and
-work at translations should contact the appropriate team.
+work on translations can contact the appropriate team.
 
    When reporting bugs in the `intl/' directory or bugs which may be
 related to internationalization, you should tell about the version of
 `gettext' which is used.  The information can be found in the
 `intl/VERSION' file, in internationalized packages.
 
-Quick configuration advice
-==========================
+1.1 Quick configuration advice
+==============================
 
-   If you want to exploit the full power of internationalization, you
+If you want to exploit the full power of internationalization, you
 should configure it using
 
      ./configure --with-included-gettext
@@ -45,37 +46,37 @@ to change to GNU `gettext' as soon as possible.
 you have installed a recent copy of the GNU gettext package with the
 included `libintl'.
 
-INSTALL Matters
-===============
+1.2 INSTALL Matters
+===================
 
-   Some packages are "localizable" when properly installed; the
-programs they contain can be made to speak your own native language.
-Most such packages use GNU `gettext'.  Other packages have their own
-ways to internationalization, predating GNU `gettext'.
+Some packages are "localizable" when properly installed; the programs
+they contain can be made to speak your own native language.  Most such
+packages use GNU `gettext'.  Other packages have their own ways to
+internationalization, predating GNU `gettext'.
 
    By default, this package will be installed to allow translation of
 messages.  It will automatically detect whether the system already
-provides the GNU `gettext' functions.  If not, the GNU `gettext' own
-library will be used.  This library is wholly contained within this
-package, usually in the `intl/' subdirectory, so prior installation of
-the GNU `gettext' package is _not_ required.  Installers may use
-special options at configuration time for changing the default
-behaviour.  The commands:
+provides the GNU `gettext' functions.  If not, the included GNU
+`gettext' library will be used.  This library is wholly contained
+within this package, usually in the `intl/' subdirectory, so prior
+installation of the GNU `gettext' package is _not_ required.
+Installers may use special options at configuration time for changing
+the default behaviour.  The commands:
 
      ./configure --with-included-gettext
      ./configure --disable-nls
 
-will respectively bypass any pre-existing `gettext' to use the
+will, respectively, bypass any pre-existing `gettext' to use the
 internationalizing routines provided within this package, or else,
 _totally_ disable translation of messages.
 
    When you already have GNU `gettext' installed on your system and run
 configure without an option for your new package, `configure' will
 probably detect the previously built and installed `libintl.a' file and
-will decide to use this.  This might be not what is desirable.  You
-should use the more recent version of the GNU `gettext' library.  I.e.
-if the file `intl/VERSION' shows that the library which comes with this
-package is more recent, you should use
+will decide to use this.  This might not be desirable.  You should use
+the more recent version of the GNU `gettext' library.  I.e. if the file
+`intl/VERSION' shows that the library which comes with this package is
+more recent, you should use
 
      ./configure --with-included-gettext
 
@@ -86,7 +87,7 @@ and therefore it will not be used.  The reason is that even an
 emulation of `gettext' on top of `catgets' could not provide all the
 extensions of the GNU `gettext' library.
 
-   Internationalized packages have usually many `po/LL.po' files, where
+   Internationalized packages usually have many `po/LL.po' files, where
 LL gives an ISO 639 two-letter code identifying the language.  Unless
 translations have been forbidden at `configure' time by using the
 `--disable-nls' switch, all available translations are installed
@@ -95,10 +96,10 @@ may be set, prior to configuration, to limit the installed set.
 `LINGUAS' should then contain a space separated list of two-letter
 codes, stating which languages are allowed.
 
-Using This Package
-==================
+1.3 Using This Package
+======================
 
-   As a user, if your language has been installed for this package, you
+As a user, if your language has been installed for this package, you
 only have to set the `LANG' environment variable to the appropriate
 `LL_CC' combination.  Here `LL' is an ISO 639 two-letter language code,
 and `CC' is an ISO 3166 two-letter country code.  For example, let's
@@ -113,6 +114,13 @@ But in fact, some languages have dialects in different countries.  For
 example, `de_AT' is used for Austria, and `pt_BR' for Brazil.  The
 country code serves to distinguish the dialects.
 
+   The locale naming convention of `LL_CC', with `LL' denoting the
+language and `CC' denoting the country, is the one use on systems based
+on GNU libc.  On other systems, some variations of this scheme are
+used, such as `LL' or `LL_CC.ENCODING'.  You can get the list of
+locales supported by your system for your language by running the
+command `locale -a | grep '^LL''.
+
    Not all programs have translations for all languages.  By default, an
 English message is shown in place of a nonexistent translation.  If you
 understand other languages, you can set up a priority list of languages.
@@ -124,16 +132,23 @@ system libraries.  For example, some Swedish users who would rather
 read translations in German than English for when Swedish is not
 available, set `LANGUAGE' to `sv:de' while leaving `LANG' to `sv_SE'.
 
+   Special advice for Norwegian users: The language code for Norwegian
+bokma*l changed from `no' to `nb' recently (in 2003).  During the
+transition period, while some message catalogs for this language are
+installed under `nb' and some older ones under `no', it's recommended
+for Norwegian users to set `LANGUAGE' to `nb:no' so that both newer and
+older translations are used.
+
    In the `LANGUAGE' environment variable, but not in the `LANG'
 environment variable, `LL_CC' combinations can be abbreviated as `LL'
 to denote the language's main dialect.  For example, `de' is equivalent
 to `de_DE' (German as spoken in Germany), and `pt' to `pt_PT'
 (Portuguese as spoken in Portugal) in this context.
 
-Translating Teams
-=================
+1.4 Translating Teams
+=====================
 
-   For the Free Translation Project to be a success, we need interested
+For the Free Translation Project to be a success, we need interested
 people who like their own language and write it well, and who are also
 able to synergize with other translators speaking the same language.
 Each translation team has its own mailing list.  The up-to-date list of
@@ -157,135 +172,897 @@ get started, please write to `translation@iro.umontreal.ca' to reach the
 coordinator for all translator teams.
 
    The English team is special.  It works at improving and uniformizing
-the terminology in use.  Proven linguistic skill are praised more than
-programming skill, here.
+the terminology in use.  Proven linguistic skills are praised more than
+programming skills, here.
 
-Available Packages
-==================
+1.5 Available Packages
+======================
 
-   Languages are not equally supported in all packages.  The following
-matrix shows the current state of internationalization, as of September
-2001.  The matrix shows, in regard of each package, for which languages
+Languages are not equally supported in all packages.  The following
+matrix shows the current state of internationalization, as of October
+2006.  The matrix shows, in regard of each package, for which languages
 PO files have been submitted to translation coordination, with a
 translation percentage of at least 50%.
 
-     Ready PO files    bg cs da de el en eo es et fi fr gl he hr id it ja
-                     +----------------------------------------------------+
-     a2ps            |          []             []    []                   |
-     bash            |          []       [] []       []                   |
-     bfd             |                                                    |
-     binutils        |                               []                   |
-     bison           |          []          [] []    []                [] |
-     clisp           |          []    []    []       []                   |
-     cpio            |       [] []          []       [] []                |
-     diffutils       |       [] []       [] []       [] []       []       |
-     enscript        |          []                   []                   |
-     error           |                      []       []                   |
-     fetchmail       |                                                    |
-     fileutils       |    [] [] [] []       []       [] []             [] |
-     findutils       |       [] []          [] []    [] []       [] []    |
-     flex            |       []             []       []                   |
-     freetype        |                                                    |
-     gas             |                                                    |
-     gawk            |                               []    []             |
-     gcal            |                                                    |
-     gcc             |                                                    |
-     gettext         |    [] [] [] []       []       [] []       [] [] [] |
-     gnupg           |          []       []    []    [] []          [] [] |
-     gprof           |                                                    |
-     grep            |    []    []       [] [] []    [] []          []    |
-     hello           |       [] [] []    [] [] [] [] [] []          [] [] |
-     id-utils        |       [] []                   []                   |
-     indent          |       [] []             []    [] []                |
-     jpilot          |                               []                   |
-     kbd             |                                                    |
-     ld              |                               []                   |
-     libc            |    [] [] [] []       []       [] []             [] |
-     lilypond        |                                                 [] |
-     lynx            |    [] [] []                                     [] |
-     m4              |    [] [] [] []                [] []       []    [] |
-     make            |       [] []          []       [] []             [] |
-     mysecretdiary   |          []                                        |
-     nano            |                      []          []       []       |
-     opcodes         |                                                    |
-     parted          |          []                      []             [] |
-     ptx             |       [] []          [] []    [] []       []       |
-     python          |                                                    |
-     recode          |       [] [] []    [] []       [] [] []       []    |
-     sed             |    [] [] [] []    []    []    [] [] []    [] [] [] |
-     sh-utils        |    [] [] [] []       [] []    [] []          [] [] |
-     sharutils       |    [] [] [] []       []       [] []             [] |
-     sketch          |                                                    |
-     soundtracker    |          []          []          []                |
-     sp              |                                                    |
-     tar             |    [] [] []          [] []    []             [] [] |
-     texinfo         |    [] [] []       []          []                [] |
-     textutils       |    [] [] [] []       []       [] []             [] |
-     util-linux      |    [] []                                           |
-     wdiff           |       [] []             []                         |
-     wget            |    [] [] [] []       [] []    [] [] []          [] |
-                     +----------------------------------------------------+
-                       bg cs da de el en eo es et fi fr gl he hr id it ja
-                        0 14 24 32 11  1  8 23 13  1 33 22  4  0  7  9 18
-     
-                       ko lv nb nl nn no pl pt pt_BR ru sk sl sv tr uk zh
-                     +----------------------------------------------------+
-     a2ps            |          []                   []    []             |  6
-     bash            |                                                    |  4
-     bfd             |                                                    |  0
-     binutils        |                                                    |  1
-     bison           |                               []                   |  6
-     clisp           |          []                                        |  5
-     cpio            | []       []       []     []   []                   | 10
-     diffutils       |                   []          []       [] []       | 11
-     enscript        |          []              []   []                   |  5
-     error           |                                  []       []       |  4
-     fetchmail       |                                                    |  0
-     fileutils       | []       []       []     []   [] [] [] [] []       | 17
-     findutils       | []       []       []     []   []    [] [] []       | 16
-     flex            | []                            []       []          |  6
-     freetype        |                                                    |  0
-     gas             |                                                    |  0
-     gawk            |                                           []       |  3
-     gcal            |                                                    |  0
-     gcc             |                                                    |  0
-     gettext         | []                []     []   []    [] [] []    [] | 18
-     gnupg           |                   []                   [] []       | 10
-     gprof           |                                                    |  0
-     grep            |                   []                [] [] []       | 12
-     hello           | [] [] [] []    [] []          [] []    [] [] []    | 22
-     id-utils        |          []                   []       []          |  6
-     indent          | []       []       []          [] []    [] []       | 12
-     jpilot          |                                                    |  1
-     kbd             |                                           []       |  1
-     ld              |                                                    |  1
-     libc            | []    []       [] []     []      []    [] []       | 16
-     lilypond        |          []                            []          |  3
-     lynx            |          []              []   []       []          |  8
-     m4              |          []       []          []       []          | 12
-     make            | []       []       []     []   []          []       | 12
-     mysecretdiary   |                                                    |  1
-     nano            |                                        []          |  4
-     opcodes         |                                           []       |  1
-     parted          |          []                   []                   |  5
-     ptx             |       [] []    [] [] []       []       [] []       | 15
-     python          |                                                    |  0
-     recode          |                   []          []    [] []          | 13
-     sed             |          []              []   [] [] [] [] []       | 19
-     sh-utils        |       [] []    [] []     []   [] [] [] [] []    [] | 21
-     sharutils       |          []                   []       []          | 11
-     sketch          |                                                    |  0
-     soundtracker    |                                                    |  3
-     sp              |                                                    |  0
-     tar             |       []       [] []     []         [] [] []       | 15
-     texinfo         |                               []                   |  7
-     textutils       |       [] []    [] []     []   [] [] []             | 16
-     util-linux      |                          []               []       |  4
-     wdiff           |                               [] []    [] []       |  7
-     wget            |          []                   [] [] [] [] [] []    | 17
-                     +----------------------------------------------------+
-       33 teams        ko lv nb nl nn no pl pt pt_BR ru sk sl sv tr uk zh
-       53 domains       9  1  6 20  0  6 17  1  13   25 10 11 23 21  2  2  387
+     Ready PO files       af am ar az be bg bs ca cs cy da de el en en_GB eo
+                        +----------------------------------------------------+
+     GNUnet             |                                  []                |
+     a2ps               |             []                [] [] []     []      |
+     aegis              |                                  ()                |
+     ant-phone          |                                  ()                |
+     anubis             |                                  []                |
+     ap-utils           |                                                    |
+     aspell             |                      [] []    [] []        []      |
+     bash               |                      []          []             [] |
+     batchelor          |                                  []                |
+     bfd                |                                                    |
+     bibshelf           |                                  []                |
+     binutils           |                               []                   |
+     bison              |                               [] []                |
+     bison-runtime      |                                                    |
+     bluez-pin          | []                      []       [] []          [] |
+     cflow              |                               []                   |
+     clisp              |                                  []    []          |
+     console-tools      |                         []       []                |
+     coreutils          |                []    []          []                |
+     cpio               |                                                    |
+     cpplib             |                      []       [] []                |
+     cryptonit          |                                  []                |
+     darkstat           |                []             () []                |
+     dialog             |                      [] [] [] [] [] []             |
+     diffutils          |                      [] []    [] [] []          [] |
+     doodle             |                                  []                |
+     e2fsprogs          |                         []       []                |
+     enscript           |                      []       [] []        []      |
+     error              |                      []       [] []        []      |
+     fetchmail          |                      []       [] () []             |
+     fileutils          |                               [] []                |
+     findutils          |                []    []       []                   |
+     flex               |                      []       [] []                |
+     fslint             |                                  []                |
+     gas                |                                                    |
+     gawk               |                      []       [] []                |
+     gbiff              |                                  []                |
+     gcal               |                      []                            |
+     gcc                |                                  []                |
+     gettext-examples   | []                   []          [] []          [] |
+     gettext-runtime    |             []       []       [] []             [] |
+     gettext-tools      |                      []          []                |
+     gimp-print         |                         []    [] []        []      |
+     gip                |                []                                  |
+     gliv               |                                  []                |
+     glunarclock        |                []                                  |
+     gmult              | []                               []                |
+     gnubiff            |                                  ()                |
+     gnucash            |                                  () ()     []      |
+     gnucash-glossary   |                               [] ()                |
+     gnuedu             |                                                    |
+     gnulib             | []          [] []    []       [] []                |
+     gnunet-gtk         |                                                    |
+     gnutls             |                                                    |
+     gpe-aerial         |                         []       []                |
+     gpe-beam           |                         []       []                |
+     gpe-calendar       |                                                    |
+     gpe-clock          |                         []       []                |
+     gpe-conf           |                         []       []                |
+     gpe-contacts       |                                                    |
+     gpe-edit           |                         []                         |
+     gpe-filemanager    |                                                    |
+     gpe-go             |                         []                         |
+     gpe-login          |                         []       []                |
+     gpe-ownerinfo      |                         []       []                |
+     gpe-package        |                                                    |
+     gpe-sketchbook     |                         []       []                |
+     gpe-su             |                         []       []                |
+     gpe-taskmanager    |                         []       []                |
+     gpe-timesheet      |                         []                         |
+     gpe-today          |                         []       []                |
+     gpe-todo           |                                                    |
+     gphoto2            |                         []    [] []        []      |
+     gprof              |                               [] []                |
+     gpsdrive           |                                  ()    ()          |
+     gramadoir          | []                               []                |
+     grep               | []          [] []    []          [] []             |
+     gretl              |                                                    |
+     gsasl              |                                                    |
+     gss                |                                                    |
+     gst-plugins        | []                   [] []    []                   |
+     gst-plugins-base   |                []    []       []                   |
+     gst-plugins-good   | []       []    []    [] []    []           []      |
+     gstreamer          | []             []    [] []    [] []        []      |
+     gtick              |                                  ()                |
+     gtkam              |                         []    [] []                |
+     gtkorphan          |                []                []                |
+     gtkspell           |             []                   [] []          [] |
+     gutenprint         |                               []                   |
+     hello              |                []    []       [] []             [] |
+     id-utils           |                               [] []                |
+     impost             |                                                    |
+     indent             |                      []          []             [] |
+     iso_3166           |                                  []             [] |
+     iso_3166_2         |                                                    |
+     iso_4217           |                                  []                |
+     iso_639            |                                  []             [] |
+     jpilot             |                         []                         |
+     jtag               |                                                    |
+     jwhois             |                                                    |
+     kbd                |                         []    [] [] []             |
+     keytouch           |                                                    |
+     keytouch-editor    |                                                    |
+     keytouch-keyboa... |                                                    |
+     latrine            |                                  ()                |
+     ld                 |                               []                   |
+     leafpad            |                []    [] []       [] []             |
+     libc               |                      [] []    [] [] []             |
+     libexif            |                                  []                |
+     libextractor       |                                  []                |
+     libgpewidget       |                         []    [] []                |
+     libgpg-error       |                                  []                |
+     libgphoto2         |                               [] []                |
+     libgphoto2_port    |                               [] []                |
+     libgsasl           |                                                    |
+     libiconv           |                                  []             [] |
+     libidn             |                               []                [] |
+     lifelines          |                               [] ()                |
+     lilypond           |                                  []                |
+     lingoteach         |                                                    |
+     lynx               |                      [] []    [] []                |
+     m4                 |                         []    [] [] []             |
+     mailutils          |                      []                            |
+     make               |                               [] []                |
+     man-db             |                      [] ()    [] []                |
+     minicom            |                         []    [] []                |
+     mysecretdiary      |                               [] []                |
+     nano               |                []    []          []                |
+     nano_1_0           |                      [] ()    [] []                |
+     opcodes            |                                  []                |
+     parted             |                                                    |
+     pilot-qof          |                                            []      |
+     psmisc             |                []                                  |
+     pwdutils           |                                                    |
+     python             |                                                    |
+     qof                |                                                    |
+     radius             |                      []                            |
+     recode             |             []       []       [] [] []          [] |
+     rpm                |                         []    []                   |
+     screem             |                                                    |
+     scrollkeeper       |          [] []       [] [] [] [] []        []      |
+     sed                |                      []          []             [] |
+     sh-utils           |                               [] []                |
+     shared-mime-info   |                []       []                 []   [] |
+     sharutils          |                []    [] []    [] [] []             |
+     shishi             |                                                    |
+     silky              |                                                    |
+     skencil            |                               [] ()                |
+     sketch             |                               [] ()                |
+     solfege            |                                                    |
+     soundtracker       |                               [] []                |
+     sp                 |                                  []                |
+     stardict           |                         []                         |
+     system-tools-ba... |       []       [] [] [] []    [] [] []     []      |
+     tar                |                []                                  |
+     texinfo            |                               [] []             [] |
+     textutils          |                      []       [] []                |
+     tin                |                                  ()        ()      |
+     tp-robot           |                                  []                |
+     tuxpaint           | []             []             [] []        []      |
+     unicode-han-tra... |                                                    |
+     unicode-transla... |                                                    |
+     util-linux         |                      [] []    [] []                |
+     vorbis-tools       |             []          []    []           []      |
+     wastesedge         |                                  ()                |
+     wdiff              |                      []       [] []        []      |
+     wget               |                      []          []                |
+     xchat              |             [] []    []          [] []     []      |
+     xkeyboard-config   |                                                    |
+     xpad               |                []             []                   |
+                        +----------------------------------------------------+
+                          af am ar az be bg bs ca cs cy da de el en en_GB eo
+                          10  0  1  2  9 22  1 42 41  2 60 95 16  1  17   16
+
+                          es et eu fa fi fr  ga gl gu he hi hr hu id is it
+                        +--------------------------------------------------+
+     GNUnet             |                                                  |
+     a2ps               |    []       [] []                             () |
+     aegis              |                                                  |
+     ant-phone          |                []                                |
+     anubis             |                []                                |
+     ap-utils           |             [] []                                |
+     aspell             |                []  []                         [] |
+     bash               | []             []                    []          |
+     batchelor          |                []  []                            |
+     bfd                | []                                               |
+     bibshelf           | []                 []                         [] |
+     binutils           | []          [] []                                |
+     bison              | [] []          []  []                   []    [] |
+     bison-runtime      |    []          []  []                   []    [] |
+     bluez-pin          |             [] []  []                [] []       |
+     cflow              |                    []                            |
+     clisp              | []             []                                |
+     console-tools      |                                                  |
+     coreutils          | [] []       [] []  []                []          |
+     cpio               | []             []  []                            |
+     cpplib             | []             []                                |
+     cryptonit          |                []                                |
+     darkstat           | []             ()  []                [] []       |
+     dialog             | [] [] []    [] []  []                []       [] |
+     diffutils          | []          [] []  [] []    []       [] []    [] |
+     doodle             |                    []                         [] |
+     e2fsprogs          | []             []                             [] |
+     enscript           |                []  []             []             |
+     error              | []          [] []  []                []          |
+     fetchmail          | []                                               |
+     fileutils          | [] []          []  []                []       [] |
+     findutils          |    []          []  []                []          |
+     flex               | []             []  []                            |
+     fslint             |                []                                |
+     gas                | []             []                                |
+     gawk               | []             []  []       []                   |
+     gbiff              |                []                                |
+     gcal               | []             []                                |
+     gcc                | []                                               |
+     gettext-examples   | []             []  []                [] []    [] |
+     gettext-runtime    | []          [] []  []                   []    [] |
+     gettext-tools      | []             []                             [] |
+     gimp-print         | []             []                                |
+     gip                | []    []       []                                |
+     gliv               |                ()                                |
+     glunarclock        |             []     []                []          |
+     gmult              |       []       []                             [] |
+     gnubiff            |                ()                             () |
+     gnucash            | ()             ()                    ()          |
+     gnucash-glossary   | []                                            [] |
+     gnuedu             | []                                               |
+     gnulib             | [] [] []    [] []  [] []             []          |
+     gnunet-gtk         |                                                  |
+     gnutls             |                                                  |
+     gpe-aerial         | []             []                                |
+     gpe-beam           | []             []                                |
+     gpe-calendar       |                                                  |
+     gpe-clock          | []          [] []                    []          |
+     gpe-conf           |                []                                |
+     gpe-contacts       | []             []                                |
+     gpe-edit           | []             []                    [] []       |
+     gpe-filemanager    | []                                               |
+     gpe-go             | []             []                    []          |
+     gpe-login          | []             []                    []          |
+     gpe-ownerinfo      | []          [] []                    [] []       |
+     gpe-package        | []                                               |
+     gpe-sketchbook     | []             []                                |
+     gpe-su             | []          [] []                    []          |
+     gpe-taskmanager    | []          [] []                                |
+     gpe-timesheet      | []             []  []                   []       |
+     gpe-today          | []          [] []  []                            |
+     gpe-todo           | []                                               |
+     gphoto2            | []          [] []                    []       [] |
+     gprof              | []             []  []                   []       |
+     gpsdrive           | ()             ()                    []       () |
+     gramadoir          |                []  []                            |
+     grep               | [] [] []    [] []  [] []    []    [] [] []    [] |
+     gretl              | []             []                             [] |
+     gsasl              |                    []                   []       |
+     gss                |                []                                |
+     gst-plugins        |                []                    []       [] |
+     gst-plugins-base   |                                      []       [] |
+     gst-plugins-good   |       []                             []       [] |
+     gstreamer          |             []                       []       [] |
+     gtick              |                    []                            |
+     gtkam              | []             []                    []       [] |
+     gtkorphan          |                []                             [] |
+     gtkspell           | []    []    [] []  []                         [] |
+     gutenprint         |                                      []          |
+     hello              | [] [] [] [] [] []  [] []    []    [] [] []    [] |
+     id-utils           |                []  []                [] []    [] |
+     impost             |                []  []                            |
+     indent             | [] [] []    [] []  [] []             [] []    [] |
+     iso_3166           |             [] []                    []          |
+     iso_3166_2         |                []                                |
+     iso_4217           |    []       []        []             []          |
+     iso_639            |          [] [] []  []                []          |
+     jpilot             | []             []                                |
+     jtag               |                []                                |
+     jwhois             | []             []                    [] []    [] |
+     kbd                | []             []                                |
+     keytouch           |                    []                            |
+     keytouch-editor    |                    []                            |
+     keytouch-keyboa... |                    []                            |
+     latrine            |                []  []                         [] |
+     ld                 | []             []                                |
+     leafpad            | []             []  []       []       []       [] |
+     libc               | []          [] []     []             []          |
+     libexif            | []                                               |
+     libextractor       |                    []                            |
+     libgpewidget       | []             []  []                [] []       |
+     libgpg-error       |                                                  |
+     libgphoto2         | []             []                             [] |
+     libgphoto2_port    |                []                             [] |
+     libgsasl           |                []  []                            |
+     libiconv           |    []              []                            |
+     libidn             |                []                             [] |
+     lifelines          |                ()                                |
+     lilypond           |                []                                |
+     lingoteach         |                []                       []    [] |
+     lynx               |    []                                []       [] |
+     m4                 |                []  [] []                []       |
+     mailutils          | []             []                                |
+     make               | []          [] []  [] []    []    []    []       |
+     man-db             | ()                                               |
+     minicom            | []          [] []                    []          |
+     mysecretdiary      | []             []                       []       |
+     nano               | []    []       []  []                []       [] |
+     nano_1_0           | []             []     []                []    [] |
+     opcodes            | []          [] []  []                            |
+     parted             | []             []                       []    [] |
+     pilot-qof          |                                                  |
+     psmisc             |       []                             []       [] |
+     pwdutils           |                                                  |
+     python             |                                                  |
+     qof                |                                         []       |
+     radius             | []             []                                |
+     recode             | []             []  [] []    []       [] []    [] |
+     rpm                |                []                       []       |
+     screem             |                                                  |
+     scrollkeeper       | []          []                       []          |
+     sed                | [] []          []  []                []          |
+     sh-utils           | [] []       [] []  []                []       [] |
+     shared-mime-info   | []    []    [] []                    []       [] |
+     sharutils          | [] []       [] []  [] []             []       [] |
+     shishi             |                                                  |
+     silky              |                []                                |
+     skencil            | []             []                                |
+     sketch             | []             []                                |
+     solfege            |                                               [] |
+     soundtracker       | []             []                             [] |
+     sp                 |                []                                |
+     stardict           |                                      []          |
+     system-tools-ba... | []    []    [] []                 [] [] []    [] |
+     tar                | [] []       [] []  []                []       [] |
+     texinfo            |                []           []                   |
+     textutils          | []             []  [] []             []          |
+     tin                |    []          ()                                |
+     tp-robot           |             [] []  []                []          |
+     tuxpaint           |                    []                []          |
+     unicode-han-tra... |                                                  |
+     unicode-transla... |                []  []                            |
+     util-linux         | [] []       [] []                    [] []    [] |
+     vorbis-tools       | []             []                                |
+     wastesedge         |                ()                                |
+     wdiff              | [] []          []  [] []             [] []    [] |
+     wget               |    []       [] []  []             [] [] []    [] |
+     xchat              | []    []    [] []        []    []    []       [] |
+     xkeyboard-config   |             [] []                    []       [] |
+     xpad               | []                 []                []          |
+                        +--------------------------------------------------+
+                          es et eu fa fi fr  ga gl gu he hi hr hu id is it
+                          88 22 14  2 40 115 61 14  1  8  1  6 59 31  0 52
+
+                          ja ko ku ky lg lt lv mk mn ms mt nb ne nl nn no
+                        +-------------------------------------------------+
+     GNUnet             |                                                 |
+     a2ps               |    ()                      []          []    () |
+     aegis              |                                        ()       |
+     ant-phone          |                                        []       |
+     anubis             |                            []    []    []       |
+     ap-utils           |                            []                   |
+     aspell             |                         []             []       |
+     bash               |                                        []       |
+     batchelor          |                            []          []       |
+     bfd                |                                                 |
+     bibshelf           |                            []                   |
+     binutils           |                                                 |
+     bison              |                            []    []    []       |
+     bison-runtime      |                            []    []    []       |
+     bluez-pin          |       []                   []          []       |
+     cflow              |                                                 |
+     clisp              |                                        []       |
+     console-tools      |                                                 |
+     coreutils          |                                        []       |
+     cpio               |                                                 |
+     cpplib             |                                        []       |
+     cryptonit          |                                        []       |
+     darkstat           |                            []          []       |
+     dialog             |                            []          []       |
+     diffutils          | []                         []          []       |
+     doodle             |                                                 |
+     e2fsprogs          |                                        []       |
+     enscript           |                                        []       |
+     error              |                                        []       |
+     fetchmail          | []                                     []       |
+     fileutils          | []          []                                  |
+     findutils          |                                        []       |
+     flex               |    []                                  []       |
+     fslint             |                            []          []       |
+     gas                |                                                 |
+     gawk               | []                                     []       |
+     gbiff              |                                        []       |
+     gcal               |                                                 |
+     gcc                |                                                 |
+     gettext-examples   | []                                     []       |
+     gettext-runtime    | [] []                                  []       |
+     gettext-tools      | [] []                                           |
+     gimp-print         | []                                     []       |
+     gip                |                            []          []       |
+     gliv               |                                        []       |
+     glunarclock        |                            []          []       |
+     gmult              | []                         []                   |
+     gnubiff            |                                                 |
+     gnucash            | ()                               ()             |
+     gnucash-glossary   |                                        []       |
+     gnuedu             |                                                 |
+     gnulib             | [] []                      []          []       |
+     gnunet-gtk         |                                                 |
+     gnutls             |                                                 |
+     gpe-aerial         |                                        []       |
+     gpe-beam           |                                        []       |
+     gpe-calendar       | []                                              |
+     gpe-clock          | [] []                                  []       |
+     gpe-conf           |    []                                  []       |
+     gpe-contacts       |    []                                           |
+     gpe-edit           | [] []                                  []       |
+     gpe-filemanager    | [] []                                           |
+     gpe-go             | [] []                                  []       |
+     gpe-login          | [] []                                  []       |
+     gpe-ownerinfo      | []                                     []       |
+     gpe-package        | [] []                                           |
+     gpe-sketchbook     |    []                                  []       |
+     gpe-su             | [] []                                  []       |
+     gpe-taskmanager    | [] [] []                               []       |
+     gpe-timesheet      |                                        []       |
+     gpe-today          | []                                     []       |
+     gpe-todo           | []                                              |
+     gphoto2            | []                                     []       |
+     gprof              |                                                 |
+     gpsdrive           | ()                                     ()    () |
+     gramadoir          |                                        ()       |
+     grep               | []       []                      []    []       |
+     gretl              |                                                 |
+     gsasl              |                                        []       |
+     gss                |                                                 |
+     gst-plugins        |                                        []       |
+     gst-plugins-base   |                                                 |
+     gst-plugins-good   |                                        []       |
+     gstreamer          |                                        []       |
+     gtick              |                                                 |
+     gtkam              | []                                              |
+     gtkorphan          |                                        []       |
+     gtkspell           |                         []             []       |
+     gutenprint         |                                                 |
+     hello              | [] []                      []    []    [] []    |
+     id-utils           |                                        []       |
+     impost             |                                                 |
+     indent             | []                                     []       |
+     iso_3166           |                                        []       |
+     iso_3166_2         |                                        []       |
+     iso_4217           | []                      []             []       |
+     iso_639            | []                                     []       |
+     jpilot             | ()                                     ()    () |
+     jtag               |                                                 |
+     jwhois             |                                        []       |
+     kbd                |                                        []       |
+     keytouch           |                                        []       |
+     keytouch-editor    |                                                 |
+     keytouch-keyboa... |                                                 |
+     latrine            |                                        []       |
+     ld                 |                                                 |
+     leafpad            | []             []                               |
+     libc               | [] []                            []    []    [] |
+     libexif            |                                                 |
+     libextractor       |                                                 |
+     libgpewidget       |                                        []       |
+     libgpg-error       |                                                 |
+     libgphoto2         | []                                              |
+     libgphoto2_port    | []                                              |
+     libgsasl           |                                        []       |
+     libiconv           |                                                 |
+     libidn             | []                                     []       |
+     lifelines          |                                        []       |
+     lilypond           |                                                 |
+     lingoteach         |                                        []       |
+     lynx               | []                                     []       |
+     m4                 | []                                     []       |
+     mailutils          |                                                 |
+     make               | [] []                                  []       |
+     man-db             | ()                                              |
+     minicom            | []                                              |
+     mysecretdiary      |                                        []       |
+     nano               |                            []    []    []       |
+     nano_1_0           |                            []    []       []    |
+     opcodes            |                                        []       |
+     parted             | []                                     []       |
+     pilot-qof          |                                                 |
+     psmisc             | []                               []    []       |
+     pwdutils           |                                                 |
+     python             |                                                 |
+     qof                |                                                 |
+     radius             |                                                 |
+     recode             |                                        []       |
+     rpm                | [] []                                           |
+     screem             | []                                              |
+     scrollkeeper       |                                  [] [] [] []    |
+     sed                | []                                     []       |
+     sh-utils           | []                               []             |
+     shared-mime-info   |    []          []                []    [] []    |
+     sharutils          | []                                     []       |
+     shishi             |                                                 |
+     silky              |                                        []       |
+     skencil            |                                                 |
+     sketch             |                                                 |
+     solfege            |                                                 |
+     soundtracker       |                                                 |
+     sp                 | ()                                              |
+     stardict           |                      []                []       |
+     system-tools-ba... | [] []          []                      []       |
+     tar                | []       []                            []       |
+     texinfo            | []                               []    []       |
+     textutils          | [] []                            []             |
+     tin                |                                                 |
+     tp-robot           |                                        []       |
+     tuxpaint           |                                           []    |
+     unicode-han-tra... |                                                 |
+     unicode-transla... |                                                 |
+     util-linux         | []                                     []       |
+     vorbis-tools       |                                        []       |
+     wastesedge         |                                        []       |
+     wdiff              |                            []    []             |
+     wget               | []                                     []       |
+     xchat              | [] []                []                []       |
+     xkeyboard-config   |                                        []       |
+     xpad               |    []                      []          []       |
+                        +-------------------------------------------------+
+                          ja ko ku ky lg lt lv mk mn ms mt nb ne nl nn no
+                          52 24  2  2  1  3  0  2  3 21  0 15  1 97  5  1
+
+                          nso or pa pl pt pt_BR rm ro ru rw sk sl sq sr sv  ta
+                        +------------------------------------------------------+
+     GNUnet             |                                                      |
+     a2ps               |           ()     []      [] []       []    [] []     |
+     aegis              |                          () ()                       |
+     ant-phone          |                          []                   []     |
+     anubis             |           []             [] []                       |
+     ap-utils           |           ()                                         |
+     aspell             |                          [] []                       |
+     bash               |                  []      [] []                       |
+     batchelor          |                          []                   []     |
+     bfd                |                                                      |
+     bibshelf           |                                               []     |
+     binutils           |                             []                []     |
+     bison              |           []     []      [] []                []     |
+     bison-runtime      |           []             []          []       []     |
+     bluez-pin          |           []     []   [] [] []    [] []    [] []     |
+     cflow              |           []                                         |
+     clisp              |                             []                       |
+     console-tools      |                             []                       |
+     coreutils          |           []                []       []       []     |
+     cpio               |           []                []                []     |
+     cpplib             |                                               []     |
+     cryptonit          |                  []                           []     |
+     darkstat           |           []     []      []       []       [] []     |
+     dialog             |           [] []  []   [] [] [] []          [] []     |
+     diffutils          |           []     []      [] []             [] []     |
+     doodle             |                                         []    []     |
+     e2fsprogs          |           []                                  []     |
+     enscript           |                  []      [] []       []       []     |
+     error              |                  []      []       []          []     |
+     fetchmail          |           []                []          []           |
+     fileutils          |           []             [] []       []       []     |
+     findutils          |           [] []          []       [] []       []     |
+     flex               |           []     []      [] []                []     |
+     fslint             |                  []      []                [] []     |
+     gas                |                                                      |
+     gawk               |           []     []      []                   []     |
+     gbiff              |                          []                          |
+     gcal               |                                               []     |
+     gcc                |                                               []     |
+     gettext-examples   |           [] []          [] []    [] []    [] []     |
+     gettext-runtime    |           [] []          [] []    [] []    [] []     |
+     gettext-tools      |           []             [] []    [] []    [] []     |
+     gimp-print         |                                   []          []     |
+     gip                |                       []          []       [] []     |
+     gliv               |                  []      []       []          []     |
+     glunarclock        |                  []      [] []    []       [] []     |
+     gmult              |                       [] []                [] []     |
+     gnubiff            |                          ()                          |
+     gnucash            |           ()                                  []     |
+     gnucash-glossary   |              []                   []          []     |
+     gnuedu             |                                                      |
+     gnulib             |           []             [] []       []       []     |
+     gnunet-gtk         |                                               []     |
+     gnutls             |           []                                  []     |
+     gpe-aerial         |              []  []      [] []       []    [] []     |
+     gpe-beam           |              []  []      [] []       []    [] []     |
+     gpe-calendar       |                             []                       |
+     gpe-clock          |              []  []      [] []    [] []    [] []     |
+     gpe-conf           |              []  []      [] []    [] []       []     |
+     gpe-contacts       |                          [] []       []    [] []     |
+     gpe-edit           |              []  []      [] []    [] []    [] []     |
+     gpe-filemanager    |                                      []       []     |
+     gpe-go             |                  []      [] []       []    [] []     |
+     gpe-login          |              []  []      [] []    [] []    [] []     |
+     gpe-ownerinfo      |              []  []      [] []    [] []    [] []     |
+     gpe-package        |                                      []       []     |
+     gpe-sketchbook     |              []  []      [] []    [] []    [] []     |
+     gpe-su             |              []  []      [] []    [] []    [] []     |
+     gpe-taskmanager    |              []  []      [] []    [] []    [] []     |
+     gpe-timesheet      |              []  []      [] []    [] []    [] []     |
+     gpe-today          |              []  []      [] []    [] []    [] []     |
+     gpe-todo           |                             []       []    [] []     |
+     gphoto2            |           []             []       []       [] []     |
+     gprof              |                  []      []                   []     |
+     gpsdrive           |        []                []                   []     |
+     gramadoir          |                                   []          []     |
+     grep               |           [] []  []      [] []       []    [] []     |
+     gretl              |           []                                         |
+     gsasl              |           []                               [] []     |
+     gss                |           []             []                   []     |
+     gst-plugins        |     []                                  [] [] []     |
+     gst-plugins-base   |                                               []     |
+     gst-plugins-good   |     []                                  [] [] []     |
+     gstreamer          |                                         [] [] []     |
+     gtick              |                             []                       |
+     gtkam              |           []     []         []                []     |
+     gtkorphan          |                                               []     |
+     gtkspell           |                  []   [] [] []    [] []    [] []     |
+     gutenprint         |                                               []     |
+     hello              |           []     []      [] []    [] []    [] []     |
+     id-utils           |                  []      [] []                []     |
+     impost             |                                               []     |
+     indent             |                  []      [] []    []       [] []     |
+     iso_3166           |              []                []    [] [] [] []     |
+     iso_3166_2         |                                                      |
+     iso_4217           |                                []    []    [] []     |
+     iso_639            |                                []    []    [] []     |
+     jpilot             |                                                      |
+     jtag               |                                   []                 |
+     jwhois             |           []     []      []                   []     |
+     kbd                |           []             []                   []     |
+     keytouch           |                                               []     |
+     keytouch-editor    |                                               []     |
+     keytouch-keyboa... |                                               []     |
+     latrine            |                          []                   []     |
+     ld                 |                                               []     |
+     leafpad            |           [] []             []    []          []  [] |
+     libc               |           []     []         []    []          []     |
+     libexif            |           []                                         |
+     libextractor       |                          []                   []     |
+     libgpewidget       |              []  []      []       [] []    [] []     |
+     libgpg-error       |           []             []                          |
+     libgphoto2         |           []                                         |
+     libgphoto2_port    |           []                []                []     |
+     libgsasl           |           []             []                [] []     |
+     libiconv           |                                      []    []        |
+     libidn             |           []                               [] ()     |
+     lifelines          |           []                                  []     |
+     lilypond           |                                                      |
+     lingoteach         |                  []                                  |
+     lynx               |                  []         []                []     |
+     m4                 |           []     []      [] []                []     |
+     mailutils          |           []             [] []                []     |
+     make               |           []     []         []                []     |
+     man-db             |                          []                   []     |
+     minicom            |           []     []      [] []                []     |
+     mysecretdiary      |                  []      [] []                []     |
+     nano               |                  []      []                   []     |
+     nano_1_0           |           []             [] []                []     |
+     opcodes            |                          []                   []     |
+     parted             |           []                                         |
+     pilot-qof          |                                               []     |
+     psmisc             |           []                                  []     |
+     pwdutils           |           []                                  []     |
+     python             |                                                      |
+     qof                |                  []                           []     |
+     radius             |           []                []                       |
+     recode             |           [] []  []      [] []       []       []     |
+     rpm                |           [] []             []                []     |
+     screem             |                                                      |
+     scrollkeeper       |           []             [] []    []    [] [] []     |
+     sed                |           [] []  []      [] []    [] []    [] []     |
+     sh-utils           |                             []       []    []        |
+     shared-mime-info   |              []  []                     [] [] []     |
+     sharutils          |           []                []             [] []     |
+     shishi             |           []                                         |
+     silky              |                                   []                 |
+     skencil            |              []  []                           []     |
+     sketch             |              []  []                           []     |
+     solfege            |                                               []     |
+     soundtracker       |                                   []          []     |
+     sp                 |                                                      |
+     stardict           |                             []    []          []     |
+     system-tools-ba... |        [] [] []  []      []             [] [] []  [] |
+     tar                |           []             [] []       []       []     |
+     texinfo            |           []             [] []                []     |
+     textutils          |                             []       []       []     |
+     tin                |                             ()                       |
+     tp-robot           |                             []                       |
+     tuxpaint           |              []                      [] [] [] []     |
+     unicode-han-tra... |                                                      |
+     unicode-transla... |                                                      |
+     util-linux         |                  []         []       []       []     |
+     vorbis-tools       |                          [] []                       |
+     wastesedge         |                                                      |
+     wdiff              |           []     []      [] []    []          []     |
+     wget               |              []             []    []          []     |
+     xchat              |        []                   []    [] [] [] [] []     |
+     xkeyboard-config   |                                      []       []     |
+     xpad               |                                   [] []       []     |
+                        +------------------------------------------------------+
+                          nso or pa pl pt pt_BR rm ro ru rw sk sl sq sr sv  ta
+                           0   2  3 58 30  54    5 73 72  4 40 46 11 50 128  2
+
+                          tg th tk tr uk ven vi  wa xh zh_CN zh_HK zh_TW zu
+                        +---------------------------------------------------+
+     GNUnet             |                    []                             |  2
+     a2ps               |          [] []     []                             | 19
+     aegis              |                                                   |  0
+     ant-phone          |          []        []                             |  6
+     anubis             |          [] []     []                             | 11
+     ap-utils           |             ()     []                             |  4
+     aspell             |             []     []  []                         | 15
+     bash               |                    []                             | 11
+     batchelor          |          []        []                             |  9
+     bfd                |                                                   |  1
+     bibshelf           |                    []                             |  7
+     binutils           |          []        []                     []      |  9
+     bison              |          []        []                     []      | 19
+     bison-runtime      |                    []         []          []      | 15
+     bluez-pin          |          [] []     []  []     []          []      | 28
+     cflow              |             []     []                             |  5
+     clisp              |                                                   |  6
+     console-tools      |          []        []                             |  5
+     coreutils          |          []        []                             | 16
+     cpio               |          [] []     []                             |  9
+     cpplib             |          []        []         []          []      | 11
+     cryptonit          |                                                   |  5
+     darkstat           |                    []         ()          ()      | 15
+     dialog             |          [] []     []         []          []      | 30
+     diffutils          |          []        []         []          []      | 28
+     doodle             |                    []                             |  6
+     e2fsprogs          |          []        []                             | 10
+     enscript           |          [] []     []                             | 16
+     error              |          []        []         []          []      | 18
+     fetchmail          |          []        []                             | 12
+     fileutils          |          []                   []          []      | 18
+     findutils          |          []        []                     []      | 17
+     flex               |          []        []                             | 15
+     fslint             |                    []                             |  9
+     gas                |          []                                       |  3
+     gawk               |          []        []                             | 15
+     gbiff              |                    []                             |  5
+     gcal               |          []                                       |  5
+     gcc                |          []                   []          []      |  6
+     gettext-examples   |          [] []     []         []    []    []      | 27
+     gettext-runtime    |          [] []     []         []    []    []      | 28
+     gettext-tools      |          [] []     []         []          []      | 19
+     gimp-print         |             []     []                             | 12
+     gip                |                    []                     []      | 12
+     gliv               |          []        []                             |  8
+     glunarclock        |                    []  []                 []      | 15
+     gmult              |          []        []         []          []      | 15
+     gnubiff            |                    []                             |  1
+     gnucash            |          ()                                       |  2
+     gnucash-glossary   |                    []                     []      |  9
+     gnuedu             |                    []                             |  2
+     gnulib             |          [] []     []         []          []      | 28
+     gnunet-gtk         |                                                   |  1
+     gnutls             |                                                   |  2
+     gpe-aerial         |                    []         []                  | 14
+     gpe-beam           |                    []         []                  | 14
+     gpe-calendar       |                    []                             |  3
+     gpe-clock          |          []        []  []     []                  | 21
+     gpe-conf           |                    []         []                  | 14
+     gpe-contacts       |                    []         []                  | 10
+     gpe-edit           |          []        []  []                 []      | 20
+     gpe-filemanager    |                    []                             |  6
+     gpe-go             |          []        []                             | 15
+     gpe-login          |          []        []  []     []          []      | 21
+     gpe-ownerinfo      |          []        []         []          []      | 21
+     gpe-package        |                    []                             |  6
+     gpe-sketchbook     |          []        []                             | 16
+     gpe-su             |          []        []         []                  | 20
+     gpe-taskmanager    |          []        []         []                  | 20
+     gpe-timesheet      |          []        []         []          []      | 18
+     gpe-today          |          []        []  []     []          []      | 21
+     gpe-todo           |                    []                             |  7
+     gphoto2            |             []     []         []          []      | 20
+     gprof              |          []        []                             | 11
+     gpsdrive           |                                                   |  4
+     gramadoir          |                    []                             |  7
+     grep               |          [] []     []                     []      | 34
+     gretl              |                                                   |  4
+     gsasl              |                    []         []                  |  8
+     gss                |                    []                             |  5
+     gst-plugins        |             []     []                     []      | 15
+     gst-plugins-base   |             []     []         []                  |  9
+     gst-plugins-good   |             []     []         []    []    []      | 20
+     gstreamer          |          [] []     []                             | 17
+     gtick              |                    []                             |  3
+     gtkam              |                    []                             | 13
+     gtkorphan          |                    []                             |  7
+     gtkspell           |             []     []  []     []    []    []      | 26
+     gutenprint         |                                                   |  3
+     hello              |          [] []     []         []          []      | 37
+     id-utils           |          []        []                             | 14
+     impost             |                    []                             |  4
+     indent             |          []        []         []          []      | 25
+     iso_3166           |       [] []        []               []            | 16
+     iso_3166_2         |                                                   |  2
+     iso_4217           |          []        []                             | 14
+     iso_639            |                    []                             | 14
+     jpilot             |          [] []     []         []                  |  7
+     jtag               |                    []                             |  3
+     jwhois             |          []        []                     []      | 13
+     kbd                |          []        []                             | 12
+     keytouch           |                    []                             |  4
+     keytouch-editor    |                                                   |  2
+     keytouch-keyboa... |                    []                             |  3
+     latrine            |          []        []                             |  8
+     ld                 |          []        []         []          []      |  8
+     leafpad            |          []        []         []          []      | 23
+     libc               |          []                   []          []      | 23
+     libexif            |                    []                             |  4
+     libextractor       |                    []                             |  5
+     libgpewidget       |                    []  []     []                  | 19
+     libgpg-error       |                    []                             |  4
+     libgphoto2         |             []                                    |  8
+     libgphoto2_port    |             []     []                     []      | 11
+     libgsasl           |                    []                             |  8
+     libiconv           |                    []                             |  7
+     libidn             |                    []         []                  | 10
+     lifelines          |                                                   |  4
+     lilypond           |                                                   |  2
+     lingoteach         |                    []                             |  6
+     lynx               |          [] []     []                             | 15
+     m4                 |                    []         []          []      | 18
+     mailutils          |             []                                    |  8
+     make               |          []        []         []                  | 20
+     man-db             |                    []                             |  6
+     minicom            |                    []                             | 14
+     mysecretdiary      |          []        []                             | 12
+     nano               |                    []                     []      | 17
+     nano_1_0           |          [] []     []                             | 18
+     opcodes            |          []        []                             | 10
+     parted             |          [] []                            []      | 10
+     pilot-qof          |                    []                             |  3
+     psmisc             |                    []                             | 10
+     pwdutils           |                    []                             |  3
+     python             |                                                   |  0
+     qof                |                    []                             |  4
+     radius             |             []                                    |  6
+     recode             |          []        []         []                  | 25
+     rpm                |          [] []     []                     []      | 14
+     screem             |                    []                             |  2
+     scrollkeeper       |          [] []     []                     []      | 26
+     sed                |          []        []                     []      | 22
+     sh-utils           |          []                                       | 15
+     shared-mime-info   |             []     []         []          []      | 24
+     sharutils          |          []        []                     []      | 23
+     shishi             |                                                   |  1
+     silky              |                    []                             |  4
+     skencil            |                    []                             |  7
+     sketch             |                                                   |  6
+     solfege            |                                                   |  2
+     soundtracker       |          []        []                             |  9
+     sp                 |          []                                       |  3
+     stardict           |             []     []         []          []      | 11
+     system-tools-ba... |    []    [] []     []     []  []          []      | 37
+     tar                |          [] []     []                     []      | 20
+     texinfo            |          []        []         []                  | 15
+     textutils          |          []                   []          []      | 17
+     tin                |                                                   |  1
+     tp-robot           |                    []         []          []      | 10
+     tuxpaint           |                    []  []                 []      | 16
+     unicode-han-tra... |                                                   |  0
+     unicode-transla... |                                                   |  2
+     util-linux         |          [] []     []                             | 20
+     vorbis-tools       |             []     []                             | 11
+     wastesedge         |                                                   |  1
+     wdiff              |          []        []                             | 22
+     wget               |          []        []                     []      | 19
+     xchat              |             []     []         []          []      | 29
+     xkeyboard-config   |          [] []     []                     []      | 11
+     xpad               |                    []         []          []      | 14
+                        +---------------------------------------------------+
+       77 teams           tg th tk tr uk ven vi  wa xh zh_CN zh_HK zh_TW zu
+      170 domains          0  1  1 77 39  0  136 10  1  48     5    54    0  2028
 
    Some counters in the preceding matrix are higher than the number of
 visible blocks let us expect.  This is because a few extra PO files are
@@ -298,15 +1075,15 @@ distributed as such by its maintainer.  There might be an observable
 lag between the mere existence a PO file and its wide availability in a
 distribution.
 
-   If September 2001 seems to be old, you may fetch a more recent copy
-of this `ABOUT-NLS' file on most GNU archive sites.  The most
-up-to-date matrix with full percentage details can be found at
+   If October 2006 seems to be old, you may fetch a more recent copy of
+this `ABOUT-NLS' file on most GNU archive sites.  The most up-to-date
+matrix with full percentage details can be found at
 `http://www.iro.umontreal.ca/contrib/po/HTML/matrix.html'.
 
-Using `gettext' in new packages
-===============================
+1.6 Using `gettext' in new packages
+===================================
 
-   If you are writing a freely available program and want to
+If you are writing a freely available program and want to
 internationalize it you are welcome to use GNU `gettext' in your
 package.  Of course you have to respect the GNU Library General Public
 License which covers the use of the GNU `gettext' library.  This means
@@ -315,7 +1092,7 @@ library, whereas only free software can use `libintl' as a static
 library or use modified versions of `libintl'.
 
    Once the sources are changed appropriately and the setup can handle
-to use of `gettext' the only thing missing are the translations.  The
+the use of `gettext' the only thing missing are the translations.  The
 Free Translation Project is also available for packages which are not
 developed inside the GNU project.  Therefore the information given above
 applies also for every other Free Software Project.  Contact
diff --git a/Doxyfile.in b/Doxyfile.in
index eb92e86..9c521dd 100644
--- a/Doxyfile.in
+++ b/Doxyfile.in
@@ -1,171 +1,454 @@
-# Doxyfile 1.0.0
+# Doxyfile 1.4.6
 
-# This file describes the settings to be used by doxygen for a project
+# This file describes the settings to be used by the documentation system
+# doxygen (www.doxygen.org) for a project
 #
 # All text after a hash (#) is considered a comment and will be ignored
 # The format is:
 #       TAG = value [value, ...]
+# For lists items can also be appended using:
+#       TAG += value [value, ...]
 # Values that contain spaces should be placed between quotes (" ")
 
 #---------------------------------------------------------------------------
-# General configuration options
+# Project related configuration options
 #---------------------------------------------------------------------------
 
-# The PROJECT_NAME tag is a single word (or a sequence of word surrounded
-# by quotes) that should identify the project. 
+# The PROJECT_NAME tag is a single word (or a sequence of words surrounded 
+# by quotes) that should identify the project.
 
-PROJECT_NAME         = @PACKAGE@
+PROJECT_NAME           = @PACKAGE@
 
-# The PROJECT_NUMBER tag can be used to enter a project or revision number.
+# The PROJECT_NUMBER tag can be used to enter a project or revision number. 
 # This could be handy for archiving the generated documentation or 
 # if some version control system is used.
 
-PROJECT_NUMBER       = @VERSION@
+PROJECT_NUMBER         = @VERSION@
 
 # The OUTPUT_DIRECTORY tag is used to specify the (relative or absolute) 
 # base path where the generated documentation will be put. 
 # If a relative path is entered, it will be relative to the location 
 # where doxygen was started. If left blank the current directory will be used.
 
-OUTPUT_DIRECTORY     = doxygen
+OUTPUT_DIRECTORY       = doxygen
 
-# The OUTPUT_LANGUAGE tag is used to specify the language in which all
-# documentation generated by doxygen is written. Doxygen will use this
-# information to generate all constant output in the proper language.
+# If the CREATE_SUBDIRS tag is set to YES, then doxygen will create 
+# 4096 sub-directories (in 2 levels) under the output directory of each output 
+# format and will distribute the generated files over these directories. 
+# Enabling this option can be useful when feeding doxygen a huge amount of 
+# source files, where putting all generated files in the same directory would 
+# otherwise cause performance problems for the file system.
+
+CREATE_SUBDIRS         = NO
+
+# The OUTPUT_LANGUAGE tag is used to specify the language in which all 
+# documentation generated by doxygen is written. Doxygen will use this 
+# information to generate all constant output in the proper language. 
 # The default language is English, other supported languages are: 
-# Dutch, French, Italian, Czech, Swedish, German and Japanese
+# Brazilian, Catalan, Chinese, Chinese-Traditional, Croatian, Czech, Danish, 
+# Dutch, Finnish, French, German, Greek, Hungarian, Italian, Japanese, 
+# Japanese-en (Japanese with English messages), Korean, Korean-en, Norwegian, 
+# Polish, Portuguese, Romanian, Russian, Serbian, Slovak, Slovene, Spanish, 
+# Swedish, and Ukrainian.
 
-OUTPUT_LANGUAGE      = English
+OUTPUT_LANGUAGE        = English
 
-# The QUIET tag can be used to turn on/off the messages that are generated
-# by doxygen. Possible values are YES and NO. If left blank NO is used.
+# This tag can be used to specify the encoding used in the generated output. 
+# The encoding is not always determined by the language that is chosen, 
+# but also whether or not the output is meant for Windows or non-Windows users. 
+# In case there is a difference, setting the USE_WINDOWS_ENCODING tag to YES 
+# forces the Windows encoding (this is the default for the Windows binary), 
+# whereas setting the tag to NO uses a Unix-style encoding (the default for 
+# all platforms other than Windows).
 
-QUIET                = NO
+USE_WINDOWS_ENCODING   = NO
 
-# The WARNINGS tag can be used to turn on/off the warning messages that are
-# generated by doxygen. Possible values are YES and NO. If left blank
-# NO is used.
+# If the BRIEF_MEMBER_DESC tag is set to YES (the default) Doxygen will 
+# include brief member descriptions after the members that are listed in 
+# the file and class documentation (similar to JavaDoc). 
+# Set to NO to disable this.
 
-WARNINGS             = YES
+BRIEF_MEMBER_DESC      = YES
 
-# The DISABLE_INDEX tag can be used to turn on/off the condensed index at
-# top of each HTML page. The value NO (the default) enables the index and
-# the value YES disables it.
+# If the REPEAT_BRIEF tag is set to YES (the default) Doxygen will prepend 
+# the brief description of a member or function before the detailed description. 
+# Note: if both HIDE_UNDOC_MEMBERS and BRIEF_MEMBER_DESC are set to NO, the 
+# brief descriptions will be completely suppressed.
+
+REPEAT_BRIEF           = YES
+
+# This tag implements a quasi-intelligent brief description abbreviator 
+# that is used to form the text in various listings. Each string 
+# in this list, if found as the leading text of the brief description, will be 
+# stripped from the text and the result after processing the whole list, is 
+# used as the annotated text. Otherwise, the brief description is used as-is. 
+# If left blank, the following values are used ("$name" is automatically 
+# replaced with the name of the entity): "The $name class" "The $name widget" 
+# "The $name file" "is" "provides" "specifies" "contains" 
+# "represents" "a" "an" "the"
+
+ABBREVIATE_BRIEF       = 
+
+# If the ALWAYS_DETAILED_SEC and REPEAT_BRIEF tags are both set to YES then 
+# Doxygen will generate a detailed section even if there is only a brief 
+# description.
+
+ALWAYS_DETAILED_SEC    = NO
+
+# If the INLINE_INHERITED_MEMB tag is set to YES, doxygen will show all 
+# inherited members of a class in the documentation of that class as if those 
+# members were ordinary class members. Constructors, destructors and assignment 
+# operators of the base classes will not be shown.
+
+INLINE_INHERITED_MEMB  = NO
+
+# If the FULL_PATH_NAMES tag is set to YES then Doxygen will prepend the full 
+# path before files name in the file list and in the header files. If set 
+# to NO the shortest path that makes the file name unique will be used.
+
+FULL_PATH_NAMES        = YES
+
+# If the FULL_PATH_NAMES tag is set to YES then the STRIP_FROM_PATH tag 
+# can be used to strip a user-defined part of the path. Stripping is 
+# only done if one of the specified strings matches the left-hand part of 
+# the path. The tag can be used to show relative paths in the file list. 
+# If left blank the directory from which doxygen is run is used as the 
+# path to strip.
+
+STRIP_FROM_PATH        = @top_srcdir@/
+
+# The STRIP_FROM_INC_PATH tag can be used to strip a user-defined part of 
+# the path mentioned in the documentation of a class, which tells 
+# the reader which header file to include in order to use a class. 
+# If left blank only the name of the header file containing the class 
+# definition is used. Otherwise one should specify the include paths that 
+# are normally passed to the compiler using the -I flag.
+ 
+STRIP_FROM_INC_PATH    = @top_srcdir@/
+
+# If the SHORT_NAMES tag is set to YES, doxygen will generate much shorter 
+# (but less readable) file names. This can be useful is your file systems 
+# doesn't support long names like on DOS, Mac, or CD-ROM.
+
+SHORT_NAMES            = NO
+
+# If the JAVADOC_AUTOBRIEF tag is set to YES then Doxygen 
+# will interpret the first line (until the first dot) of a JavaDoc-style 
+# comment as the brief description. If set to NO, the JavaDoc 
+# comments will behave just like the Qt-style comments (thus requiring an 
+# explicit @brief command for a brief description.
+
+JAVADOC_AUTOBRIEF      = YES
+
+# The MULTILINE_CPP_IS_BRIEF tag can be set to YES to make Doxygen 
+# treat a multi-line C++ special comment block (i.e. a block of //! or /// 
+# comments) as a brief description. This used to be the default behaviour. 
+# The new default is to treat a multi-line C++ comment block as a detailed 
+# description. Set this tag to YES if you prefer the old behaviour instead.
+
+MULTILINE_CPP_IS_BRIEF = NO
+
+# If the DETAILS_AT_TOP tag is set to YES then Doxygen 
+# will output the detailed description near the top, like JavaDoc.
+# If set to NO, the detailed description appears after the member 
+# documentation.
+
+DETAILS_AT_TOP         = NO
+
+# If the INHERIT_DOCS tag is set to YES (the default) then an undocumented 
+# member inherits the documentation from any documented member that it 
+# re-implements.
+
+INHERIT_DOCS           = YES
 
-DISABLE_INDEX        = NO
+# If the SEPARATE_MEMBER_PAGES tag is set to YES, then doxygen will produce 
+# a new page for each member. If set to NO, the documentation of a member will 
+# be part of the file/class/namespace that contains it.
 
-# If the EXTRACT_ALL tag is set to YES all classes and functions will be
-# included in the documentation, even if no documentation was available.
+SEPARATE_MEMBER_PAGES  = NO
 
-EXTRACT_ALL          = YES
+# The TAB_SIZE tag can be used to set the number of spaces in a tab. 
+# Doxygen uses this value to replace tabs by spaces in code fragments.
+
+TAB_SIZE               = 8
+
+# This tag can be used to specify a number of aliases that acts 
+# as commands in the documentation. An alias has the form "name=value". 
+# For example adding "sideeffect=\par Side Effects:\n" will allow you to 
+# put the command \sideeffect (or @sideeffect) in the documentation, which 
+# will result in a user-defined paragraph with heading "Side Effects:". 
+# You can put \n's in the value part of an alias to insert newlines.
+
+ALIASES                = 
+
+# Set the OPTIMIZE_OUTPUT_FOR_C tag to YES if your project consists of C 
+# sources only. Doxygen will then generate output that is more tailored for C. 
+# For instance, some of the names that are used will be different. The list 
+# of all members will be omitted, etc.
+
+OPTIMIZE_OUTPUT_FOR_C  = YES
+
+# Set the OPTIMIZE_OUTPUT_JAVA tag to YES if your project consists of Java 
+# sources only. Doxygen will then generate output that is more tailored for Java. 
+# For instance, namespaces will be presented as packages, qualified scopes 
+# will look different, etc.
+
+OPTIMIZE_OUTPUT_JAVA   = NO
+
+# If you use STL classes (i.e. std::string, std::vector, etc.) but do not want to 
+# include (a tag file for) the STL sources as input, then you should 
+# set this tag to YES in order to let doxygen match functions declarations and 
+# definitions whose arguments contain STL classes (e.g. func(std::string); v.s. 
+# func(std::string) {}). This also make the inheritance and collaboration 
+# diagrams that involve STL classes more complete and accurate.
+
+BUILTIN_STL_SUPPORT    = NO
+
+# If member grouping is used in the documentation and the DISTRIBUTE_GROUP_DOC 
+# tag is set to YES, then doxygen will reuse the documentation of the first 
+# member in the group (if any) for the other members of the group. By default 
+# all members of a group must be documented explicitly.
+
+DISTRIBUTE_GROUP_DOC   = NO
+
+# Set the SUBGROUPING tag to YES (the default) to allow class member groups of 
+# the same type (for instance a group of public functions) to be put as a 
+# subgroup of that type (e.g. under the Public Functions section). Set it to 
+# NO to prevent subgrouping. Alternatively, this can be done per class using 
+# the \nosubgrouping command.
+
+SUBGROUPING            = YES
+
+#---------------------------------------------------------------------------
+# Build related configuration options
+#---------------------------------------------------------------------------
 
-# If the EXTRACT_PRIVATE tag is set to YES all private members of a class
+# If the EXTRACT_ALL tag is set to YES doxygen will assume all entities in 
+# documentation are documented, even if no documentation was available. 
+# Private class members and static file members will be hidden unless 
+# the EXTRACT_PRIVATE and EXTRACT_STATIC tags are set to YES
+
+EXTRACT_ALL            = YES
+
+# If the EXTRACT_PRIVATE tag is set to YES all private members of a class 
 # will be included in the documentation.
 
-EXTRACT_PRIVATE      = NO
+EXTRACT_PRIVATE        = NO
 
-# If the HIDE_UNDOC_MEMBERS tag is set to YES, Doxygen will hide all
-# undocumented members inside documented classes or files.
+# If the EXTRACT_STATIC tag is set to YES all static members of a file 
+# will be included in the documentation.
 
-HIDE_UNDOC_MEMBERS   = NO
+EXTRACT_STATIC         = YES
 
-# If the HIDE_UNDOC_CLASSESS tag is set to YES, Doxygen will hide all
-# undocumented classes.
+# If the EXTRACT_LOCAL_CLASSES tag is set to YES classes (and structs) 
+# defined locally in source files will be included in the documentation. 
+# If set to NO only classes defined in header files are included.
 
-HIDE_UNDOC_CLASSES   = NO
+EXTRACT_LOCAL_CLASSES  = YES
 
-# If the BRIEF_MEMBER_DESC tag is set to YES (the default) Doxygen will
-# include brief member descriptions after the members that are listed in 
-# the file and class documentation (similar to JavaDoc).
-# Set to NO to disable this.
+# This flag is only useful for Objective-C code. When set to YES local 
+# methods, which are defined in the implementation section but not in 
+# the interface are included in the documentation. 
+# If set to NO (the default) only methods in the interface are included.
 
-BRIEF_MEMBER_DESC    = YES
+EXTRACT_LOCAL_METHODS  = NO
 
-# If the REPEAT_BRIEF tag is set to YES (the default) Doxygen will prepend
-# the brief description of a member or function before the detailed description.
-# Note: if both HIDE_UNDOC_MEMBERS and BRIEF_MEMBER_DESC are set to NO, the 
-# brief descriptions will be completely suppressed.
+# If the HIDE_UNDOC_MEMBERS tag is set to YES, Doxygen will hide all 
+# undocumented members of documented classes, files or namespaces. 
+# If set to NO (the default) these members will be included in the 
+# various overviews, but no documentation section is generated. 
+# This option has no effect if EXTRACT_ALL is enabled.
 
-REPEAT_BRIEF         = YES
+HIDE_UNDOC_MEMBERS     = NO
 
-# If the ALWAYS_DETAILS_SEC and REPEAT_BRIEF tags are both set to YES then
-# Doxygen will generate a detailed section even if there is only a brief
-# description.
+# If the HIDE_UNDOC_CLASSES tag is set to YES, Doxygen will hide all 
+# undocumented classes that are normally visible in the class hierarchy. 
+# If set to NO (the default) these classes will be included in the various 
+# overviews. This option has no effect if EXTRACT_ALL is enabled.
 
-ALWAYS_DETAILED_SEC  = NO
+HIDE_UNDOC_CLASSES     = NO
 
-# If the FULL_PATH_NAMES tag is set to YES then Doxygen will prepend the full
-# path before files name in the file list and in the header files. If set
-# to NO the shortest path that makes the file name unique will be used.
+# If the HIDE_FRIEND_COMPOUNDS tag is set to YES, Doxygen will hide all 
+# friend (class|struct|union) declarations. 
+# If set to NO (the default) these declarations will be included in the 
+# documentation.
 
-FULL_PATH_NAMES      = YES
+HIDE_FRIEND_COMPOUNDS  = NO
 
-# If the FULL_PATH_NAMES tag is set to YES then the STRIP_FROM_PATH tag
-# can be used to strip a user defined part of the path. Stripping is
-# only done if one of the specified strings matches the left-hand part of
-# the path.
+# If the HIDE_IN_BODY_DOCS tag is set to YES, Doxygen will hide any 
+# documentation blocks found inside the body of a function. 
+# If set to NO (the default) these blocks will be appended to the 
+# function's detailed documentation block.
 
-STRIP_FROM_PATH      = @POPT_SOURCE_PATH@/
+HIDE_IN_BODY_DOCS      = NO
 
-# The INTERNAL_DOCS tag determines if documentation
+# The INTERNAL_DOCS tag determines if documentation 
 # that is typed after a \internal command is included. If the tag is set 
-# to NO (the default) then the documentation will be excluded.
+# to NO (the default) then the documentation will be excluded. 
 # Set it to YES to include the internal documentation.
 
-INTERNAL_DOCS        = NO
+INTERNAL_DOCS          = YES
 
-# If the CLASS_DIAGRAMS tag is set to YES (the default) Doxygen will
-# generate a class diagram (in Html and LaTeX) for classes with base or
-# super classes. Setting the tag to NO turns the diagrams off.
+# If the CASE_SENSE_NAMES tag is set to NO then Doxygen will only generate 
+# file names in lower-case letters. If set to YES upper-case letters are also 
+# allowed. This is useful if you have classes or files whose names only differ 
+# in case and if your file system supports case sensitive file names. Windows 
+# and Mac users are advised to set this option to NO.
 
-CLASS_DIAGRAMS       = YES
+CASE_SENSE_NAMES       = YES
 
-# If the SOURCE_BROWSER tag is set to YES then a list of source files will
-# be generated. Documented entities will be cross-referenced with these sources.
+# If the HIDE_SCOPE_NAMES tag is set to NO (the default) then Doxygen 
+# will show members with their full class and namespace scopes in the 
+# documentation. If set to YES the scope will be hidden.
 
-SOURCE_BROWSER       = YES
+HIDE_SCOPE_NAMES       = NO
 
-# Setting the INLINE_SOURCES tag to YES will include the body
-# of functions and classes directly in the documentation.
+# If the SHOW_INCLUDE_FILES tag is set to YES (the default) then Doxygen 
+# will put a list of the files that are included by a file in the documentation 
+# of that file.
 
-INLINE_SOURCES       = NO
+SHOW_INCLUDE_FILES     = YES
 
-# If the CASE_SENSE_NAMES tag is set to NO (the default) then Doxygen
-# will only generate file names in lower case letters. If set to
-# YES upper case letters are also allowed. This is useful if you have
-# classes or files whose names only differ in case and if your file system
-# supports case sensitive file names.
+# If the INLINE_INFO tag is set to YES (the default) then a tag [inline] 
+# is inserted in the documentation for inline members.
 
-CASE_SENSE_NAMES     = NO
+INLINE_INFO            = YES
 
-# If the VERBATIM_HEADERS tag is set to YES (the default) then Doxygen
-# will generate a verbatim copy of the header file for each class for
-# which an include is specified. Set to NO to disable this.
+# If the SORT_MEMBER_DOCS tag is set to YES (the default) then doxygen 
+# will sort the (detailed) documentation of file and class members 
+# alphabetically by member name. If set to NO the members will appear in 
+# declaration order.
 
-VERBATIM_HEADERS     = YES
+SORT_MEMBER_DOCS       = YES
 
-# If the JAVADOC_AUTOBRIEF tag is set to YES (the default) then Doxygen
-# will interpret the first line (until the first dot) of a JavaDoc-style
-# comment as the brief description. If set to NO, the Javadoc-style will
-# behave just like the Qt-style comments.
+# If the SORT_BRIEF_DOCS tag is set to YES then doxygen will sort the 
+# brief documentation of file, namespace and class members alphabetically 
+# by member name. If set to NO (the default) the members will appear in 
+# declaration order.
 
-JAVADOC_AUTOBRIEF    = YES
+SORT_BRIEF_DOCS        = NO
 
-# if the INHERIT_DOCS tag is set to YES (the default) then an undocumented
-# member inherits the documentation from any documented member that it
-# reimplements.
+# If the SORT_BY_SCOPE_NAME tag is set to YES, the class list will be 
+# sorted by fully-qualified names, including namespaces. If set to 
+# NO (the default), the class list will be sorted only by class name, 
+# not including the namespace part. 
+# Note: This option is not very useful if HIDE_SCOPE_NAMES is set to YES.
+# Note: This option applies only to the class list, not to the 
+# alphabetical list.
 
-INHERIT_DOCS         = YES
+SORT_BY_SCOPE_NAME     = NO
 
-# if the INLINE_INFO tag is set to YES (the default) then a tag [inline]
-# is inserted in the documentation for inline members.
+# The GENERATE_TODOLIST tag can be used to enable (YES) or 
+# disable (NO) the todo list. This list is created by putting \todo 
+# commands in the documentation.
 
-INLINE_INFO          = YES
+GENERATE_TODOLIST      = YES
 
-# the TAB_SIZE tag can be used to set the number of spaces in a tab.
-# Doxygen uses this value to replace tabs by spaces in code fragments.
+# The GENERATE_TESTLIST tag can be used to enable (YES) or 
+# disable (NO) the test list. This list is created by putting \test 
+# commands in the documentation.
+
+GENERATE_TESTLIST      = YES
+
+# The GENERATE_BUGLIST tag can be used to enable (YES) or 
+# disable (NO) the bug list. This list is created by putting \bug 
+# commands in the documentation.
 
-TAB_SIZE             = 8
+GENERATE_BUGLIST       = YES
+
+# The GENERATE_DEPRECATEDLIST tag can be used to enable (YES) or 
+# disable (NO) the deprecated list. This list is created by putting 
+# \deprecated commands in the documentation.
+
+GENERATE_DEPRECATEDLIST= YES
+
+# The ENABLED_SECTIONS tag can be used to enable conditional 
+# documentation sections, marked by \if sectionname ... \endif.
+
+ENABLED_SECTIONS       = 
+
+# The MAX_INITIALIZER_LINES tag determines the maximum number of lines 
+# the initial value of a variable or define consists of for it to appear in 
+# the documentation. If the initializer consists of more lines than specified 
+# here it will be hidden. Use a value of 0 to hide initializers completely. 
+# The appearance of the initializer of individual variables and defines in the 
+# documentation can be controlled using \showinitializer or \hideinitializer 
+# command in the documentation regardless of this setting.
+
+MAX_INITIALIZER_LINES  = 30
+
+# Set the SHOW_USED_FILES tag to NO to disable the list of files generated 
+# at the bottom of the documentation of classes and structs. If set to YES the 
+# list will mention the files that were used to generate the documentation.
+
+SHOW_USED_FILES        = YES
+
+# If the sources in your project are distributed over multiple directories 
+# then setting the SHOW_DIRECTORIES tag to YES will show the directory hierarchy 
+# in the documentation. The default is NO.
+
+SHOW_DIRECTORIES       = NO
+
+# The FILE_VERSION_FILTER tag can be used to specify a program or script that 
+# doxygen should invoke to get the current version for each file (typically from the 
+# version control system). Doxygen will invoke the program by executing (via 
+# popen()) the command <command> <input-file>, where <command> is the value of 
+# the FILE_VERSION_FILTER tag, and <input-file> is the name of an input file 
+# provided by doxygen. Whatever the program writes to standard output 
+# is used as the file version. See the manual for examples.
+
+FILE_VERSION_FILTER    = 
+
+#---------------------------------------------------------------------------
+# configuration options related to warning and progress messages
+#---------------------------------------------------------------------------
+
+# The QUIET tag can be used to turn on/off the messages that are generated 
+# by doxygen. Possible values are YES and NO. If left blank NO is used.
+
+QUIET                  = NO
+
+# The WARNINGS tag can be used to turn on/off the warning messages that are 
+# generated by doxygen. Possible values are YES and NO. If left blank 
+# NO is used.
+
+WARNINGS               = YES
+
+# If WARN_IF_UNDOCUMENTED is set to YES, then doxygen will generate warnings 
+# for undocumented members. If EXTRACT_ALL is set to YES then this flag will 
+# automatically be disabled.
+
+WARN_IF_UNDOCUMENTED   = YES
+
+# If WARN_IF_DOC_ERROR is set to YES, doxygen will generate warnings for 
+# potential errors in the documentation, such as not documenting some 
+# parameters in a documented function, or documenting parameters that 
+# don't exist or using markup commands wrongly.
+
+WARN_IF_DOC_ERROR      = YES
+
+# This WARN_NO_PARAMDOC option can be abled to get warnings for 
+# functions that are documented, but have no documentation for their parameters 
+# or return value. If set to NO (the default) doxygen will only warn about 
+# wrong or incomplete parameter documentation, but not about the absence of 
+# documentation.
+
+WARN_NO_PARAMDOC       = NO
+
+# The WARN_FORMAT tag determines the format of the warning messages that 
+# doxygen can produce. The string should contain the $file, $line, and $text 
+# tags, which will be replaced by the file and line number from which the 
+# warning originated and the warning text. Optionally the format may contain 
+# $version, which will be replaced by the version of the file (if it could 
+# be obtained via FILE_VERSION_FILTER)
+
+WARN_FORMAT            = "$file:$line: $text"
+
+# The WARN_LOGFILE tag can be used to specify a file to which warning 
+# and error messages should be written. If left blank the output is written 
+# to stderr.
+
+WARN_LOGFILE           = 
 
 #---------------------------------------------------------------------------
 # configuration options related to the input files
@@ -176,300 +459,789 @@ TAB_SIZE             = 8
 # directories like "/usr/src/myproject". Separate the files or directories 
 # with spaces.
 
-INPUT                = \
-	./findme.c \
-	./findme.h \
-	./popt.c \
-	./popt.h \
-	./poptconfig.c \
-	./popthelp.c \
-	./poptint.h \
-	./poptparse.c \
-	./system.h
+INPUT                  = \
+                        ./findme.c \
+                        ./findme.h \
+                        ./popt.c \
+                        ./popt.h \
+                        ./poptconfig.c \
+                        ./popthelp.c \
+                        ./poptint.h \
+                        ./poptparse.c \
+			./system.h
 
 # If the value of the INPUT tag contains directories, you can use the 
 # FILE_PATTERNS tag to specify one or more wildcard pattern (like *.cpp 
 # and *.h) to filter out the source-files in the directories. If left 
-# blank all files are included.
+# blank the following patterns are tested: 
+# *.c *.cc *.cxx *.cpp *.c++ *.java *.ii *.ixx *.ipp *.i++ *.inl *.h *.hh *.hxx 
+# *.hpp *.h++ *.idl *.odl *.cs *.php *.php3 *.inc *.m *.mm *.py
 
-FILE_PATTERNS        = *.c *.h
+FILE_PATTERNS          = *.c \
+                         *.h
 
-# The RECURSIVE tag can be used to turn specify whether or not subdirectories
-# should be searched for input files as well. Possible values are YES and NO.
+# The RECURSIVE tag can be used to turn specify whether or not subdirectories 
+# should be searched for input files as well. Possible values are YES and NO. 
 # If left blank NO is used.
 
-RECURSIVE            = NO
+RECURSIVE              = NO
 
-# The EXCLUDE tag can be used to specify files and/or directories that should
+# The EXCLUDE tag can be used to specify files and/or directories that should 
 # excluded from the INPUT source files. This way you can easily exclude a 
 # subdirectory from a directory tree whose root is specified with the INPUT tag.
 
-EXCLUDE              =
+EXCLUDE                = 
+
+# The EXCLUDE_SYMLINKS tag can be used select whether or not files or 
+# directories that are symbolic links (a Unix filesystem feature) are excluded 
+# from the input.
 
-# If the value of the INPUT tag contains directories, you can use the
-# EXCLUDE_PATTERNS tag to specify one or more wildcard patterns to exclude
-# certain files from those directories.
+EXCLUDE_SYMLINKS       = NO
 
-EXCLUDE_PATTERNS     =
+# If the value of the INPUT tag contains directories, you can use the 
+# EXCLUDE_PATTERNS tag to specify one or more wildcard patterns to exclude 
+# certain files from those directories. Note that the wildcards are matched 
+# against the file with absolute path, so to exclude all test directories 
+# for example use the pattern */test/*
+
+EXCLUDE_PATTERNS       = 
 
 # The EXAMPLE_PATH tag can be used to specify one or more files or 
 # directories that contain example code fragments that are included (see 
 # the \include command).
 
-EXAMPLE_PATH         =
+EXAMPLE_PATH           = 
 
-# If the value of the EXAMPLE_PATH tag contains directories, you can use the
+# If the value of the EXAMPLE_PATH tag contains directories, you can use the 
 # EXAMPLE_PATTERNS tag to specify one or more wildcard pattern (like *.cpp 
 # and *.h) to filter out the source-files in the directories. If left 
 # blank all files are included.
 
-EXAMPLE_PATTERNS     =
+EXAMPLE_PATTERNS       = 
+
+# If the EXAMPLE_RECURSIVE tag is set to YES then subdirectories will be 
+# searched for input files to be used with the \include or \dontinclude 
+# commands irrespective of the value of the RECURSIVE tag. 
+# Possible values are YES and NO. If left blank NO is used.
+
+EXAMPLE_RECURSIVE      = NO
 
 # The IMAGE_PATH tag can be used to specify one or more files or 
 # directories that contain image that are included in the documentation (see 
 # the \image command).
 
-IMAGE_PATH           =
+IMAGE_PATH             = 
 
-# The INPUT_FILTER tag can be used to specify a program that doxygen should
+# The INPUT_FILTER tag can be used to specify a program that doxygen should 
 # invoke to filter for each input file. Doxygen will invoke the filter program 
-# by executing (via popen()) the command <filter> <input-file>, where <filter>
-# is the value of the INPUT_FILTER tag, and <input-file> is the name of an
-# input file. Doxygen will then use the output that the filter program writes
-# to standard output.
+# by executing (via popen()) the command <filter> <input-file>, where <filter> 
+# is the value of the INPUT_FILTER tag, and <input-file> is the name of an 
+# input file. Doxygen will then use the output that the filter program writes 
+# to standard output.  If FILTER_PATTERNS is specified, this tag will be 
+# ignored.
+
+INPUT_FILTER           = 
+
+# The FILTER_PATTERNS tag can be used to specify filters on a per file pattern 
+# basis.  Doxygen will compare the file name with each pattern and apply the 
+# filter if there is a match.  The filters are a list of the form: 
+# pattern=filter (like *.cpp=my_cpp_filter). See INPUT_FILTER for further 
+# info on how filters are used. If FILTER_PATTERNS is empty, INPUT_FILTER 
+# is applied to all files.
+
+FILTER_PATTERNS        = 
+
+# If the FILTER_SOURCE_FILES tag is set to YES, the input filter (if set using 
+# INPUT_FILTER) will be used to filter the input files when producing source 
+# files to browse (i.e. when SOURCE_BROWSER is set to YES).
+
+FILTER_SOURCE_FILES    = NO
+
+#---------------------------------------------------------------------------
+# configuration options related to source browsing
+#---------------------------------------------------------------------------
+
+# If the SOURCE_BROWSER tag is set to YES then a list of source files will 
+# be generated. Documented entities will be cross-referenced with these sources. 
+# Note: To get rid of all source code in the generated output, make sure also 
+# VERBATIM_HEADERS is set to NO.
+
+SOURCE_BROWSER         = YES
+
+# Setting the INLINE_SOURCES tag to YES will include the body 
+# of functions and classes directly in the documentation.
+
+INLINE_SOURCES         = NO
+
+# Setting the STRIP_CODE_COMMENTS tag to YES (the default) will instruct 
+# doxygen to hide any special comment blocks from generated source code 
+# fragments. Normal C and C++ comments will always remain visible.
+
+STRIP_CODE_COMMENTS    = YES
+
+# If the REFERENCED_BY_RELATION tag is set to YES (the default) 
+# then for each documented function all documented 
+# functions referencing it will be listed.
+
+REFERENCED_BY_RELATION = YES
+
+# If the REFERENCES_RELATION tag is set to YES (the default) 
+# then for each documented function all documented entities 
+# called/used by that function will be listed.
+
+REFERENCES_RELATION    = YES
+
+# If the USE_HTAGS tag is set to YES then the references to source code 
+# will point to the HTML generated by the htags(1) tool instead of doxygen 
+# built-in source browser. The htags tool is part of GNU's global source 
+# tagging system (see http://www.gnu.org/software/global/global.html). You 
+# will need version 4.8.6 or higher.
+
+USE_HTAGS              = NO
+
+# If the VERBATIM_HEADERS tag is set to YES (the default) then Doxygen 
+# will generate a verbatim copy of the header file for each class for 
+# which an include is specified. Set to NO to disable this.
+
+VERBATIM_HEADERS       = YES
+
+#---------------------------------------------------------------------------
+# configuration options related to the alphabetical class index
+#---------------------------------------------------------------------------
+
+# If the ALPHABETICAL_INDEX tag is set to YES, an alphabetical index 
+# of all compounds will be generated. Enable this if the project 
+# contains a lot of classes, structs, unions or interfaces.
 
-INPUT_FILTER         =
+ALPHABETICAL_INDEX     = NO
+
+# If the alphabetical index is enabled (see ALPHABETICAL_INDEX) then 
+# the COLS_IN_ALPHA_INDEX tag can be used to specify the number of columns 
+# in which this list will be split (can be a number in the range [1..20])
+
+COLS_IN_ALPHA_INDEX    = 5
+
+# In case all classes in a project start with a common prefix, all 
+# classes will be put under the same header in the alphabetical index. 
+# The IGNORE_PREFIX tag can be used to specify one or more prefixes that 
+# should be ignored while generating the index headers.
+
+IGNORE_PREFIX          = 
 
 #---------------------------------------------------------------------------
 # configuration options related to the HTML output
 #---------------------------------------------------------------------------
 
-# If the GENERATE_HTML tag is set to YES (the default) Doxygen will
-# generate HTML output
+# If the GENERATE_HTML tag is set to YES (the default) Doxygen will 
+# generate HTML output.
 
-GENERATE_HTML        = YES
+GENERATE_HTML          = YES
 
-# The HTML_OUTPUT tag is used to specify where the HTML docs will be put.
-# If a relative path is entered the value of OUTPUT_DIRECTORY will be
+# The HTML_OUTPUT tag is used to specify where the HTML docs will be put. 
+# If a relative path is entered the value of OUTPUT_DIRECTORY will be 
 # put in front of it. If left blank `html' will be used as the default path.
 
-HTML_OUTPUT          =
+HTML_OUTPUT            = html
+
+# The HTML_FILE_EXTENSION tag can be used to specify the file extension for 
+# each generated HTML page (for example: .htm,.php,.asp). If it is left blank 
+# doxygen will generate files with .html extension.
+
+HTML_FILE_EXTENSION    = .html
 
 # The HTML_HEADER tag can be used to specify a personal HTML header for 
 # each generated HTML page. If it is left blank doxygen will generate a 
 # standard header.
 
-HTML_HEADER          =
+HTML_HEADER            = 
 
 # The HTML_FOOTER tag can be used to specify a personal HTML footer for 
 # each generated HTML page. If it is left blank doxygen will generate a 
 # standard footer.
 
-HTML_FOOTER          =
+HTML_FOOTER            = 
 
-# The HTML_STYLESHEET tag can be used to specify a user defined cascading
+# The HTML_STYLESHEET tag can be used to specify a user-defined cascading 
 # style sheet that is used by each HTML page. It can be used to 
-# fine-tune the look of the HTML output. If the tag is left blank doxygen
-# will generate a default style sheet
+# fine-tune the look of the HTML output. If the tag is left blank doxygen 
+# will generate a default style sheet. Note that doxygen will try to copy 
+# the style sheet file to the HTML output directory, so don't put your own 
+# stylesheet in the HTML output directory as well, or it will be erased!
 
-HTML_STYLESHEET      =
+HTML_STYLESHEET        = 
 
-# If the HTML_ALIGN_MEMBERS tag is set to YES, the members of classes,
-# files or namespaces will be aligned in HTML using tables. If set to
+# If the HTML_ALIGN_MEMBERS tag is set to YES, the members of classes, 
+# files or namespaces will be aligned in HTML using tables. If set to 
 # NO a bullet list will be used.
 
-HTML_ALIGN_MEMBERS   = YES
+HTML_ALIGN_MEMBERS     = YES
 
-# If the GENERATE_HTMLHELP tag is set to YES, additional index files
-# will be generated that can be used as input for tools like the
-# Microsoft HTML help workshop to generate a compressed HTML help file (.chm)
+# If the GENERATE_HTMLHELP tag is set to YES, additional index files 
+# will be generated that can be used as input for tools like the 
+# Microsoft HTML help workshop to generate a compressed HTML help file (.chm) 
 # of the generated HTML documentation.
 
-GENERATE_HTMLHELP    = NO
+GENERATE_HTMLHELP      = NO
 
-# If the ALPHABETICAL_INDEX tag is set to YES, an alphabetical index
-# of all compounds will be generated. Enable this if the project
-# contains a lot of classes, structs, unions or interfaces.
+# If the GENERATE_HTMLHELP tag is set to YES, the CHM_FILE tag can 
+# be used to specify the file name of the resulting .chm file. You 
+# can add a path in front of the file if the result should not be 
+# written to the html output directory.
 
-ALPHABETICAL_INDEX   = NO
+CHM_FILE               = 
 
-# If the alphabetical index is enabled (see ALPHABETICAL_INDEX) then
-# the COLS_IN_ALPHA_INDEX tag can be used to specify the number of columns
-# in which this list will be split (can be a number in the range [1..20])
+# If the GENERATE_HTMLHELP tag is set to YES, the HHC_LOCATION tag can 
+# be used to specify the location (absolute path including file name) of 
+# the HTML help compiler (hhc.exe). If non-empty doxygen will try to run 
+# the HTML help compiler on the generated index.hhp.
 
-COLS_IN_ALPHA_INDEX  = 5
+HHC_LOCATION           = 
+
+# If the GENERATE_HTMLHELP tag is set to YES, the GENERATE_CHI flag 
+# controls if a separate .chi index file is generated (YES) or that 
+# it should be included in the master .chm file (NO).
+
+GENERATE_CHI           = NO
+
+# If the GENERATE_HTMLHELP tag is set to YES, the BINARY_TOC flag 
+# controls whether a binary table of contents is generated (YES) or a 
+# normal table of contents (NO) in the .chm file.
+
+BINARY_TOC             = NO
+
+# The TOC_EXPAND flag can be set to YES to add extra items for group members 
+# to the contents of the HTML help documentation and to the tree view.
+
+TOC_EXPAND             = NO
+
+# The DISABLE_INDEX tag can be used to turn on/off the condensed index at 
+# top of each HTML page. The value NO (the default) enables the index and 
+# the value YES disables it.
+
+DISABLE_INDEX          = NO
+
+# This tag can be used to set the number of enum values (range [1..20]) 
+# that doxygen will group on one line in the generated HTML documentation.
+
+ENUM_VALUES_PER_LINE   = 4
+
+# If the GENERATE_TREEVIEW tag is set to YES, a side panel will be
+# generated containing a tree-like index structure (just like the one that 
+# is generated for HTML Help). For this to work a browser that supports 
+# JavaScript, DHTML, CSS and frames is required (for instance Mozilla 1.0+, 
+# Netscape 6.0+, Internet explorer 5.0+, or Konqueror). Windows users are 
+# probably better off using the HTML help feature.
+
+GENERATE_TREEVIEW      = NO
+
+# If the treeview is enabled (see GENERATE_TREEVIEW) then this tag can be 
+# used to set the initial width (in pixels) of the frame in which the tree 
+# is shown.
+
+TREEVIEW_WIDTH         = 250
 
 #---------------------------------------------------------------------------
 # configuration options related to the LaTeX output
 #---------------------------------------------------------------------------
 
-# If the GENERATE_LATEX tag is set to YES (the default) Doxygen will
+# If the GENERATE_LATEX tag is set to YES (the default) Doxygen will 
 # generate Latex output.
 
-GENERATE_LATEX       = NO
+GENERATE_LATEX         = NO
 
-# The LATEX_OUTPUT tag is used to specify where the LaTeX docs will be put.
-# If a relative path is entered the value of OUTPUT_DIRECTORY will be
+# The LATEX_OUTPUT tag is used to specify where the LaTeX docs will be put. 
+# If a relative path is entered the value of OUTPUT_DIRECTORY will be 
 # put in front of it. If left blank `latex' will be used as the default path.
 
-LATEX_OUTPUT         =
+LATEX_OUTPUT           = latex
+
+# The LATEX_CMD_NAME tag can be used to specify the LaTeX command name to be 
+# invoked. If left blank `latex' will be used as the default command name.
 
-# If the COMPACT_LATEX tag is set to YES Doxygen generates more compact
-# LaTeX documents. This may be useful for small projects and may help to
+LATEX_CMD_NAME         = latex
+
+# The MAKEINDEX_CMD_NAME tag can be used to specify the command name to 
+# generate index for LaTeX. If left blank `makeindex' will be used as the 
+# default command name.
+
+MAKEINDEX_CMD_NAME     = makeindex
+
+# If the COMPACT_LATEX tag is set to YES Doxygen generates more compact 
+# LaTeX documents. This may be useful for small projects and may help to 
 # save some trees in general.
 
-COMPACT_LATEX        = NO
+COMPACT_LATEX          = NO
 
-# The PAPER_TYPE tag can be used to set the paper type that is used
+# The PAPER_TYPE tag can be used to set the paper type that is used 
 # by the printer. Possible values are: a4, a4wide, letter, legal and 
 # executive. If left blank a4wide will be used.
 
-PAPER_TYPE           = a4wide
+PAPER_TYPE             = letter
 
-# The EXTRA_PACKAGES tag can be to specify one or more names of LaTeX
+# The EXTRA_PACKAGES tag can be to specify one or more names of LaTeX 
 # packages that should be included in the LaTeX output.
 
-EXTRA_PACKAGES       =
+EXTRA_PACKAGES         = 
 
 # The LATEX_HEADER tag can be used to specify a personal LaTeX header for 
-# the generated latex document. The header should contain everything until
+# the generated latex document. The header should contain everything until 
 # the first chapter. If it is left blank doxygen will generate a 
 # standard header. Notice: only use this tag if you know what you are doing!
 
-LATEX_HEADER         =
+LATEX_HEADER           = 
 
-# If the PDF_HYPERLINKS tag is set to YES, the LaTeX that is generated
-# is prepared for conversion to pdf (using ps2pdf). The pdf file will
-# contain links (just like the HTML output) instead of page references
+# If the PDF_HYPERLINKS tag is set to YES, the LaTeX that is generated 
+# is prepared for conversion to pdf (using ps2pdf). The pdf file will 
+# contain links (just like the HTML output) instead of page references 
 # This makes the output suitable for online browsing using a pdf viewer.
 
-PDF_HYPERLINKS       = NO
+PDF_HYPERLINKS         = YES
+
+# If the USE_PDFLATEX tag is set to YES, pdflatex will be used instead of 
+# plain latex in the generated Makefile. Set this option to YES to get a 
+# higher quality PDF documentation.
+
+USE_PDFLATEX           = YES
+
+# If the LATEX_BATCHMODE tag is set to YES, doxygen will add the \\batchmode. 
+# command to the generated LaTeX files. This will instruct LaTeX to keep 
+# running if errors occur, instead of asking the user for help. 
+# This option is also used when generating formulas in HTML.
+
+LATEX_BATCHMODE        = NO
+
+# If LATEX_HIDE_INDICES is set to YES then doxygen will not 
+# include the index chapters (such as File Index, Compound Index, etc.) 
+# in the output.
+
+LATEX_HIDE_INDICES     = NO
+
+#---------------------------------------------------------------------------
+# configuration options related to the RTF output
+#---------------------------------------------------------------------------
+
+# If the GENERATE_RTF tag is set to YES Doxygen will generate RTF output 
+# The RTF output is optimized for Word 97 and may not look very pretty with 
+# other RTF readers or editors.
+
+GENERATE_RTF           = NO
+
+# The RTF_OUTPUT tag is used to specify where the RTF docs will be put. 
+# If a relative path is entered the value of OUTPUT_DIRECTORY will be 
+# put in front of it. If left blank `rtf' will be used as the default path.
+
+RTF_OUTPUT             = rtf
+
+# If the COMPACT_RTF tag is set to YES Doxygen generates more compact 
+# RTF documents. This may be useful for small projects and may help to 
+# save some trees in general.
+
+COMPACT_RTF            = NO
+
+# If the RTF_HYPERLINKS tag is set to YES, the RTF that is generated 
+# will contain hyperlink fields. The RTF file will 
+# contain links (just like the HTML output) instead of page references. 
+# This makes the output suitable for online browsing using WORD or other 
+# programs which support those fields. 
+# Note: wordpad (write) and others do not support links.
+
+RTF_HYPERLINKS         = NO
+
+# Load stylesheet definitions from file. Syntax is similar to doxygen's 
+# config file, i.e. a series of assignments. You only have to provide 
+# replacements, missing definitions are set to their default value.
+
+RTF_STYLESHEET_FILE    = 
+
+# Set optional variables used in the generation of an rtf document. 
+# Syntax is similar to doxygen's config file.
+
+RTF_EXTENSIONS_FILE    = 
 
 #---------------------------------------------------------------------------
 # configuration options related to the man page output
 #---------------------------------------------------------------------------
 
-# If the GENERATE_MAN tag is set to YES (the default) Doxygen will
+# If the GENERATE_MAN tag is set to YES (the default) Doxygen will 
 # generate man pages
 
-GENERATE_MAN         = YES
+GENERATE_MAN           = YES
 
-# The MAN_OUTPUT tag is used to specify where the man pages will be put.
-# If a relative path is entered the value of OUTPUT_DIRECTORY will be
+# The MAN_OUTPUT tag is used to specify where the man pages will be put. 
+# If a relative path is entered the value of OUTPUT_DIRECTORY will be 
 # put in front of it. If left blank `man' will be used as the default path.
 
-MAN_OUTPUT           =
+MAN_OUTPUT             = man
 
-# The MAN_EXTENSION tag determines the extension that is added to
+# The MAN_EXTENSION tag determines the extension that is added to 
 # the generated man pages (default is the subroutine's section .3)
 
-MAN_EXTENSION        = .3
+MAN_EXTENSION          = .3
+
+# If the MAN_LINKS tag is set to YES and Doxygen generates man output, 
+# then it will generate one additional man file for each entity 
+# documented in the real man page(s). These additional files 
+# only source the real man page, but without them the man command 
+# would be unable to find the correct page. The default is NO.
+
+MAN_LINKS              = NO
+
+#---------------------------------------------------------------------------
+# configuration options related to the XML output
+#---------------------------------------------------------------------------
+
+# If the GENERATE_XML tag is set to YES Doxygen will 
+# generate an XML file that captures the structure of 
+# the code including all documentation.
+
+GENERATE_XML           = NO
+
+# The XML_OUTPUT tag is used to specify where the XML pages will be put. 
+# If a relative path is entered the value of OUTPUT_DIRECTORY will be 
+# put in front of it. If left blank `xml' will be used as the default path.
+
+XML_OUTPUT             = xml
+
+# The XML_SCHEMA tag can be used to specify an XML schema, 
+# which can be used by a validating XML parser to check the 
+# syntax of the XML files.
+
+XML_SCHEMA             = 
+
+# The XML_DTD tag can be used to specify an XML DTD, 
+# which can be used by a validating XML parser to check the 
+# syntax of the XML files.
+
+XML_DTD                = 
+
+# If the XML_PROGRAMLISTING tag is set to YES Doxygen will 
+# dump the program listings (including syntax highlighting 
+# and cross-referencing information) to the XML output. Note that 
+# enabling this will significantly increase the size of the XML output.
+
+XML_PROGRAMLISTING     = YES
+
+#---------------------------------------------------------------------------
+# configuration options for the AutoGen Definitions output
+#---------------------------------------------------------------------------
+
+# If the GENERATE_AUTOGEN_DEF tag is set to YES Doxygen will 
+# generate an AutoGen Definitions (see autogen.sf.net) file 
+# that captures the structure of the code including all 
+# documentation. Note that this feature is still experimental 
+# and incomplete at the moment.
+
+GENERATE_AUTOGEN_DEF   = NO
 
 #---------------------------------------------------------------------------
-# Configuration options related to the preprocessor 
+# configuration options related to the Perl module output
 #---------------------------------------------------------------------------
 
-# If the ENABLE_PREPROCESSING tag is set to YES (the default) Doxygen will
-# evaluate all C-preprocessor directives found in the sources and include
+# If the GENERATE_PERLMOD tag is set to YES Doxygen will 
+# generate a Perl module file that captures the structure of 
+# the code including all documentation. Note that this 
+# feature is still experimental and incomplete at the 
+# moment.
+
+GENERATE_PERLMOD       = NO
+
+# If the PERLMOD_LATEX tag is set to YES Doxygen will generate 
+# the necessary Makefile rules, Perl scripts and LaTeX code to be able 
+# to generate PDF and DVI output from the Perl module output.
+
+PERLMOD_LATEX          = NO
+
+# If the PERLMOD_PRETTY tag is set to YES the Perl module output will be 
+# nicely formatted so it can be parsed by a human reader.  This is useful 
+# if you want to understand what is going on.  On the other hand, if this 
+# tag is set to NO the size of the Perl module output will be much smaller 
+# and Perl will parse it just the same.
+
+PERLMOD_PRETTY         = YES
+
+# The names of the make variables in the generated doxyrules.make file 
+# are prefixed with the string contained in PERLMOD_MAKEVAR_PREFIX. 
+# This is useful so different doxyrules.make files included by the same 
+# Makefile don't overwrite each other's variables.
+
+PERLMOD_MAKEVAR_PREFIX = 
+
+#---------------------------------------------------------------------------
+# Configuration options related to the preprocessor   
+#---------------------------------------------------------------------------
+
+# If the ENABLE_PREPROCESSING tag is set to YES (the default) Doxygen will 
+# evaluate all C-preprocessor directives found in the sources and include 
 # files.
 
-ENABLE_PREPROCESSING = YES
+ENABLE_PREPROCESSING   = YES
 
-# If the MACRO_EXPANSION tag is set to YES Doxygen will expand all macro
+# If the MACRO_EXPANSION tag is set to YES Doxygen will expand all macro 
 # names in the source code. If set to NO (the default) only conditional 
-# compilation will be performed.
+# compilation will be performed. Macro expansion can be done in a controlled 
+# way by setting EXPAND_ONLY_PREDEF to YES.
+
+MACRO_EXPANSION        = YES
+
+# If the EXPAND_ONLY_PREDEF and MACRO_EXPANSION tags are both set to YES 
+# then the macro expansion is limited to the macros specified with the 
+# PREDEFINED and EXPAND_AS_DEFINED tags.
 
-MACRO_EXPANSION      = YES
+EXPAND_ONLY_PREDEF     = NO
 
-# If the SEARCH_INCLUDES tag is set to YES (the default) the includes files
+# If the SEARCH_INCLUDES tag is set to YES (the default) the includes files 
 # in the INCLUDE_PATH (see below) will be search if a #include is found.
 
-SEARCH_INCLUDES      = YES
+SEARCH_INCLUDES        = YES
 
-# The INCLUDE_PATH tag can be used to specify one or more directories that
-# contain include files that are not input files but should be processed by
+# The INCLUDE_PATH tag can be used to specify one or more directories that 
+# contain include files that are not input files but should be processed by 
 # the preprocessor.
 
-INCLUDE_PATH         =
+INCLUDE_PATH           = 
 
-# The PREDEFINED tag can be used to specify one or more macro names that
-# are defined before the preprocessor is started (similar to the -D option of
-# gcc). The argument of the tag is a list of macros of the form: name
+# You can use the INCLUDE_FILE_PATTERNS tag to specify one or more wildcard 
+# patterns (like *.h and *.hpp) to filter out the header-files in the 
+# directories. If left blank, the patterns specified with FILE_PATTERNS will 
+# be used.
+
+INCLUDE_FILE_PATTERNS  = 
+
+# The PREDEFINED tag can be used to specify one or more macro names that 
+# are defined before the preprocessor is started (similar to the -D option of 
+# gcc). The argument of the tag is a list of macros of the form: name 
 # or name=definition (no spaces). If the definition and the = are 
-# omitted =1 is assumed.
+# omitted =1 is assumed. To prevent a macro definition from being 
+# undefined via #undef or recursively expanded use the := operator 
+# instead of the = operator.
 
-PREDEFINED           =
+PREDEFINED             = 
 
-# If the EXPAND_ONLY_PREDEF and MACRO_EXPANSION tags are both set to YES
-# then the macro expansion is limited to the macros specified with the
-# PREDEFINED tag.
+# If the MACRO_EXPANSION and EXPAND_ONLY_PREDEF tags are set to YES then 
+# this tag can be used to specify a list of macro names that should be expanded. 
+# The macro definition that is found in the sources will be used. 
+# Use the PREDEFINED tag if you want to use a different macro definition.
 
-EXPAND_ONLY_PREDEF   = NO
+EXPAND_AS_DEFINED      = 
 
-#---------------------------------------------------------------------------
-# Configuration options related to external references 
-#---------------------------------------------------------------------------
+# If the SKIP_FUNCTION_MACROS tag is set to YES (the default) then 
+# doxygen's preprocessor will remove all function-like macros that are alone 
+# on a line, have an all uppercase name, and do not end with a semicolon. Such 
+# function macros are typically used for boiler-plate code, and will confuse 
+# the parser if not removed.
 
-# The TAGFILES tag can be used to specify one or more tagfiles. 
+SKIP_FUNCTION_MACROS   = YES
 
-TAGFILES             =
+#---------------------------------------------------------------------------
+# Configuration::additions related to external references   
+#---------------------------------------------------------------------------
 
-# When a file name is specified after GENERATE_TAGFILE, doxygen will create
+# The TAGFILES option can be used to specify one or more tagfiles. 
+# Optionally an initial location of the external documentation 
+# can be added for each tagfile. The format of a tag file without 
+# this location is as follows: 
+#   TAGFILES = file1 file2 ... 
+# Adding location for the tag files is done as follows: 
+#   TAGFILES = file1=loc1 "file2 = loc2" ... 
+# where "loc1" and "loc2" can be relative or absolute paths or 
+# URLs. If a location is present for each tag, the installdox tool 
+# does not have to be run to correct the links.
+# Note that each tag file must have a unique name
+# (where the name does NOT include the path)
+# If a tag file is not located in the directory in which doxygen 
+# is run, you must also specify the path to the tagfile here.
+
+TAGFILES               = 
+
+# When a file name is specified after GENERATE_TAGFILE, doxygen will create 
 # a tag file that is based on the input files it reads.
 
-GENERATE_TAGFILE     =
+GENERATE_TAGFILE       = Doxytags
 
-# If the ALLEXTERNALS tag is set to YES all external classes will be listed
-# in the class index. If set to NO only the inherited external classes
+# If the ALLEXTERNALS tag is set to YES all external classes will be listed 
+# in the class index. If set to NO only the inherited external classes 
 # will be listed.
 
-ALLEXTERNALS         = NO
+ALLEXTERNALS           = NO
+
+# If the EXTERNAL_GROUPS tag is set to YES all external groups will be listed 
+# in the modules index. If set to NO, only the current project's groups will 
+# be listed.
+
+EXTERNAL_GROUPS        = YES
 
-# The PERL_PATH should be the absolute path and name of the perl script
+# The PERL_PATH should be the absolute path and name of the perl script 
 # interpreter (i.e. the result of `which perl').
 
-PERL_PATH            = /usr/bin/perl
+PERL_PATH              = /usr/bin/perl
 
 #---------------------------------------------------------------------------
-# Configuration options related to the search engine 
+# Configuration options related to the dot tool   
 #---------------------------------------------------------------------------
 
-# The SEARCHENGINE tag specifies whether or not a search engine should be 
-# used. If set to NO the values of all tags below this one will be ignored.
+# If the CLASS_DIAGRAMS tag is set to YES (the default) Doxygen will 
+# generate a inheritance diagram (in HTML, RTF and LaTeX) for classes with base 
+# or super classes. Setting the tag to NO turns the diagrams off. Note that 
+# this option is superseded by the HAVE_DOT option below. This is only a 
+# fallback. It is recommended to install and use dot, since it yields more 
+# powerful graphs.
+
+CLASS_DIAGRAMS         = YES
+
+# If set to YES, the inheritance and collaboration graphs will hide 
+# inheritance and usage relations if the target is undocumented 
+# or is not a class.
+
+HIDE_UNDOC_RELATIONS   = YES
+
+# If you set the HAVE_DOT tag to YES then doxygen will assume the dot tool is 
+# available from the path. This tool is part of Graphviz, a graph visualization 
+# toolkit from AT&T and Lucent Bell Labs. The other options in this section 
+# have no effect if this option is set to NO (the default)
+
+HAVE_DOT               = YES
+
+# If the CLASS_GRAPH and HAVE_DOT tags are set to YES then doxygen 
+# will generate a graph for each documented class showing the direct and 
+# indirect inheritance relations. Setting this tag to YES will force the 
+# the CLASS_DIAGRAMS tag to NO.
 
-SEARCHENGINE         = NO
+CLASS_GRAPH            = YES
 
-# The CGI_NAME tag should be the name of the CGI script that
-# starts the search engine (doxysearch) with the correct parameters.
-# A script with this name will be generated by doxygen.
+# If the COLLABORATION_GRAPH and HAVE_DOT tags are set to YES then doxygen 
+# will generate a graph for each documented class showing the direct and 
+# indirect implementation dependencies (inheritance, containment, and 
+# class references variables) of the class with other documented classes.
 
-CGI_NAME             = search.cgi
+COLLABORATION_GRAPH    = YES
 
-# The CGI_URL tag should be the absolute URL to the directory where the
-# cgi binaries are located. See the documentation of your http daemon for 
-# details.
+# If the GROUP_GRAPHS and HAVE_DOT tags are set to YES then doxygen 
+# will generate a graph for groups, showing the direct groups dependencies
 
-CGI_URL              =
+GROUP_GRAPHS           = YES
 
-# The DOC_URL tag should be the absolute URL to the directory where the
-# documentation is located. If left blank the absolute path to the 
-# documentation, with file:// prepended to it, will be used.
+# If the UML_LOOK tag is set to YES doxygen will generate inheritance and 
+# collaboration diagrams in a style similar to the OMG's Unified Modeling 
+# Language.
 
-DOC_URL              =
+UML_LOOK               = NO
 
-# The DOC_ABSPATH tag should be the absolute path to the directory where the
-# documentation is located. If left blank the directory on the local machine
-# will be used.
+# If set to YES, the inheritance and collaboration graphs will show the 
+# relations between templates and their instances.
 
-DOC_ABSPATH          =
+TEMPLATE_RELATIONS     = YES
 
-# The BIN_ABSPATH tag must point to the directory where the doxysearch binary
-# is installed.
+# If the ENABLE_PREPROCESSING, SEARCH_INCLUDES, INCLUDE_GRAPH, and HAVE_DOT 
+# tags are set to YES then doxygen will generate a graph for each documented 
+# file showing the direct and indirect include dependencies of the file with 
+# other documented files.
 
-BIN_ABSPATH          = /usr/local/bin/
+INCLUDE_GRAPH          = YES
 
-# The EXT_DOC_PATHS tag can be used to specify one or more paths to 
-# documentation generated for other projects. This allows doxysearch to search
-# the documentation for these projects as well.
+# If the ENABLE_PREPROCESSING, SEARCH_INCLUDES, INCLUDED_BY_GRAPH, and 
+# HAVE_DOT tags are set to YES then doxygen will generate a graph for each 
+# documented header file showing the documented files that directly or 
+# indirectly include this file.
+
+INCLUDED_BY_GRAPH      = YES
+
+# If the CALL_GRAPH and HAVE_DOT tags are set to YES then doxygen will 
+# generate a call dependency graph for every global function or class method. 
+# Note that enabling this option will significantly increase the time of a run. 
+# So in most cases it will be better to enable call graphs for selected 
+# functions only using the \callgraph command.
+
+CALL_GRAPH             = NO
+
+# If the GRAPHICAL_HIERARCHY and HAVE_DOT tags are set to YES then doxygen 
+# will graphical hierarchy of all classes instead of a textual one.
+
+GRAPHICAL_HIERARCHY    = YES
+
+# If the DIRECTORY_GRAPH, SHOW_DIRECTORIES and HAVE_DOT tags are set to YES 
+# then doxygen will show the dependencies a directory has on other directories 
+# in a graphical way. The dependency relations are determined by the #include
+# relations between the files in the directories.
+
+DIRECTORY_GRAPH        = YES
+
+# The DOT_IMAGE_FORMAT tag can be used to set the image format of the images 
+# generated by dot. Possible values are png, jpg, or gif
+# If left blank png will be used.
+
+DOT_IMAGE_FORMAT       = png
+
+# The tag DOT_PATH can be used to specify the path where the dot tool can be 
+# found. If left blank, it is assumed the dot tool can be found in the path.
+
+DOT_PATH               = 
+
+# The DOTFILE_DIRS tag can be used to specify one or more directories that 
+# contain dot files that are included in the documentation (see the 
+# \dotfile command).
+
+DOTFILE_DIRS           = 
+
+# The MAX_DOT_GRAPH_WIDTH tag can be used to set the maximum allowed width 
+# (in pixels) of the graphs generated by dot. If a graph becomes larger than 
+# this value, doxygen will try to truncate the graph, so that it fits within 
+# the specified constraint. Beware that most browsers cannot cope with very 
+# large images.
+
+MAX_DOT_GRAPH_WIDTH    = 1024
+
+# The MAX_DOT_GRAPH_HEIGHT tag can be used to set the maximum allows height 
+# (in pixels) of the graphs generated by dot. If a graph becomes larger than 
+# this value, doxygen will try to truncate the graph, so that it fits within 
+# the specified constraint. Beware that most browsers cannot cope with very 
+# large images.
+
+MAX_DOT_GRAPH_HEIGHT   = 1024
+
+# The MAX_DOT_GRAPH_DEPTH tag can be used to set the maximum depth of the 
+# graphs generated by dot. A depth value of 3 means that only nodes reachable 
+# from the root by following a path via at most 3 edges will be shown. Nodes 
+# that lay further from the root node will be omitted. Note that setting this 
+# option to 1 or 2 may greatly reduce the computation time needed for large 
+# code bases. Also note that a graph may be further truncated if the graph's 
+# image dimensions are not sufficient to fit the graph (see MAX_DOT_GRAPH_WIDTH 
+# and MAX_DOT_GRAPH_HEIGHT). If 0 is used for the depth value (the default), 
+# the graph is not depth-constrained.
+
+MAX_DOT_GRAPH_DEPTH    = 0
+
+# Set the DOT_TRANSPARENT tag to YES to generate images with a transparent 
+# background. This is disabled by default, which results in a white background. 
+# Warning: Depending on the platform used, enabling this option may lead to 
+# badly anti-aliased labels on the edges of a graph (i.e. they become hard to 
+# read).
+
+DOT_TRANSPARENT        = NO
+
+# Set the DOT_MULTI_TARGETS tag to YES allow dot to generate multiple output 
+# files in one run (i.e. multiple -o and -T options on the command line). This 
+# makes dot run faster, but since only newer versions of dot (>1.8.10) 
+# support this, this feature is disabled by default.
+
+DOT_MULTI_TARGETS      = NO
+
+# If the GENERATE_LEGEND tag is set to YES (the default) Doxygen will 
+# generate a legend page explaining the meaning of the various boxes and 
+# arrows in the dot generated graphs.
+
+GENERATE_LEGEND        = YES
+
+# If the DOT_CLEANUP tag is set to YES (the default) Doxygen will 
+# remove the intermediate dot files that are used to generate 
+# the various graphs.
+
+DOT_CLEANUP            = YES
+
+#---------------------------------------------------------------------------
+# Configuration::additions related to the search engine   
+#---------------------------------------------------------------------------
+
+# The SEARCHENGINE tag specifies whether or not a search engine should be 
+# used. If set to NO the values of all tags below this one will be ignored.
 
-EXT_DOC_PATHS        =
+SEARCHENGINE           = NO
diff --git a/Makefile.am b/Makefile.am
index af97931..63ce37f 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -4,12 +4,12 @@ AUTOMAKE_OPTIONS = 1.4 foreign
 
 LINT = splint
 
-EXTRA_DIST = autogen.sh CHANGES $(man_MANS) popt.spec \
+EXTRA_DIST = config.rpath m4/ChangeLog  autogen.sh CHANGES $(man_MANS) popt.spec libpopt.vers \
 	testit.sh test-poptrc test3-data/0* \
 	po/*.in po/*.po po/popt.pot \
 	popt.ps
 
-SUBDIRS = intl po
+SUBDIRS = po
 
 INCLUDES = -I. -I$(top_srcdir)
 
@@ -38,15 +38,19 @@ include_HEADERS = popt.h
 usrlibdir = $(libdir)@MARK64@
 usrlib_LTLIBRARIES = libpopt.la
 
-libpopt_la_SOURCES = popt.c findme.c poptparse.c poptconfig.c popthelp.c
-libpopt_la_LDFLAGS = @INTLLIBS@
+libpopt_la_SOURCES = popt.c findme.c poptparse.c poptconfig.c popthelp.c poptint.c
+libpopt_la_LDFLAGS = -no-undefined @LTLIBINTL@
+
+if HAVE_LD_VERSION_SCRIPT
+libpopt_la_LDFLAGS += -Wl,--version-script=$(srcdir)/libpopt.vers
+endif
 
 man_MANS = popt.3
 
 #BUILT_SOURCES = popt.lcd
 
 popt.lcd: Makefile.am ${libpopt_la_SOURCES} ${include_HEADERS} ${noinst_HEADERS}
-	$(LINT) -dump $@ ${libpopt_la_SOURCES}
+	lclint -dump $@ ${libpopt_la_SOURCES}
 
 .PHONY:	sources
 sources:
@@ -80,3 +84,5 @@ doxygen: Doxyfile
 	rm -rf doxygen
 	mkdir -p doxygen
 	doxygen
+
+ACLOCAL_AMFLAGS = -I m4
diff --git a/configure.ac b/configure.ac
index 28b2611..073d8e7 100755
--- a/configure.ac
+++ b/configure.ac
@@ -1,9 +1,16 @@
 AC_INIT(popt.h)
 AC_CANONICAL_SYSTEM
 AC_PREREQ(2.12)
-AC_CONFIG_HEADERS
-AM_INIT_AUTOMAKE(popt, 1.10.2)
-AM_CONFIG_HEADER(config.h)
+AC_CONFIG_HEADERS([config.h])
+AM_INIT_AUTOMAKE(popt, 1.10.9)
+
+# Library code modified:                              REVISION++
+# Interfaces changed/added/removed:   CURRENT++       REVISION=0
+# Interfaces added:                             AGE++
+# Interfaces removed:                           AGE=0
+AC_SUBST(LT_CURRENT, 0)
+AC_SUBST(LT_REVISION, 0)
+AC_SUBST(LT_AGE, 8)
 
 ALL_LINGUAS="cs da de es eu_ES fi fr gl hu id is it ja ko no pl pt pt_BR ro ru sk sl sr sv tr uk wa zh zh_CN zh_TW"
 
@@ -53,24 +60,33 @@ AC_SUBST(TARGET)
 
 dnl XXX Choose /usr/lib or /usr/lib64 for library installs.
 MARK64=
-case "${target_cpu}" in
-x86_64*|powerpc64*|ppc64*|sparc64*|s390x*)        MARK64=64 ;;
-esac
+if ! echo "${libdir}" | grep -q '64$' ; then
+    case "${target_cpu}" in
+    x86_64*|powerpc64*|ppc64*|sparc64*|s390x*) MARK64=64 ;;
+    esac
+fi
 AC_SUBST(MARK64)
 
 AC_CHECK_HEADERS(alloca.h float.h libintl.h mcheck.h unistd.h)
-AC_MSG_CHECKING(for /usr/ucblib in LIBS)
-if test -d /usr/ucblib ; then
-	if test "$build" = "mips-sni-sysv4" ; then
-		addlib /usr/ccs/lib -lc
-	fi
-
-	addlib /usr/ucblib
-	
-	AC_MSG_RESULT(yes)
-else
-	AC_MSG_RESULT(no)
-fi
+
+# For some systems we know that we have ld_version scripts.
+# Use it then as default.
+have_ld_version_script=no
+case "${host}" in
+    *-*-linux*)
+        have_ld_version_script=yes
+        ;;
+    *-*-gnu*)
+        have_ld_version_script=yes
+        ;;
+esac
+AC_ARG_ENABLE([ld-version-script],
+              AC_HELP_STRING([--enable-ld-version-script],
+                             [enable/disable use of linker version script.
+                              (default is system dependent)]),
+              [have_ld_version_script=$enableval],
+              [ : ] )
+AM_CONDITIONAL(HAVE_LD_VERSION_SCRIPT, test "$have_ld_version_script" = "yes")
 
 if test ! -f ../rpm.c
 then
@@ -87,11 +103,11 @@ AC_CHECK_FUNC(setreuid, [], [
 AC_CHECK_FUNCS(getuid geteuid mtrace __secure_getenv setregid strerror)
 
 
-AM_GNU_GETTEXT
+AM_GNU_GETTEXT([external])
 
 POPT_SOURCE_PATH="`pwd`"
 AC_DEFINE_UNQUOTED(POPT_SOURCE_PATH, "$POPT_SOURCE_PATH",
 	[Full path to popt top_srcdir.])
 AC_SUBST(POPT_SOURCE_PATH)
 
-AC_OUTPUT([Doxyfile Makefile intl/Makefile po/Makefile.in])
+AC_OUTPUT([Doxyfile Makefile po/Makefile.in intl/Makefile])
diff --git a/findme.c b/findme.c
index c4aaabc..4649092 100644
--- a/findme.c
+++ b/findme.c
@@ -29,7 +29,7 @@ const char * findProgramPath(const char * argv0)
     strcpy(pathbuf, path);
 
     chptr = NULL;
-    /*@-branchstate@*/
+/*@-branchstate@*/
     do {
 	if ((chptr = strchr(start, ':')))
 	    *chptr = '\0';
@@ -43,7 +43,7 @@ const char * findProgramPath(const char * argv0)
 	else
 	    start = NULL;
     } while (start && *start);
-    /*@=branchstate@*/
+/*@=branchstate@*/
 
     free(buf);
 
diff --git a/intl/Makefile.in b/intl/Makefile.in
index 5b1cf2f..525922e 100644
--- a/intl/Makefile.in
+++ b/intl/Makefile.in
@@ -1,5 +1,5 @@
-# Makefile for directory with message catalog handling in GNU NLS Utilities.
-# Copyright (C) 1995-1998, 2000-2002 Free Software Foundation, Inc.
+# Makefile for directory with message catalog handling library of GNU gettext
+# Copyright (C) 1995-1998, 2000-2006 Free Software Foundation, Inc.
 #
 # This program is free software; you can redistribute it and/or modify it
 # under the terms of the GNU Library General Public License as published
@@ -13,7 +13,7 @@
 #
 # You should have received a copy of the GNU Library General Public
 # License along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
 # USA.
 
 PACKAGE = @PACKAGE@
@@ -24,13 +24,25 @@ SHELL = /bin/sh
 srcdir = @srcdir@
 top_srcdir = @top_srcdir@
 top_builddir = ..
-VPATH = @srcdir@
+
+# The VPATH variables allows builds with $builddir != $srcdir, assuming a
+# 'make' program that supports VPATH (such as GNU make). This line is removed
+# by autoconf automatically when "$(srcdir)" = ".".
+# In this directory, the VPATH handling is particular:
+# 1. If INTL_LIBTOOL_SUFFIX_PREFIX is 'l' (indicating a build with libtool),
+#    the .c -> .lo rules carefully use $(srcdir), so that VPATH can be omitted.
+# 2. If PACKAGE = gettext-tools, VPATH _must_ be omitted, because otherwise
+#    'make' does the wrong thing if GNU gettext was configured with
+#    "./configure --srcdir=`pwd`", namely it gets confused by the .lo and .la
+#    files it finds in srcdir = ../../gettext-runtime/intl.
+VPATH = $(srcdir)
 
 prefix = @prefix@
 exec_prefix = @exec_prefix@
 transform = @program_transform_name@
 libdir = @libdir@
 includedir = @includedir@
+datarootdir = @datarootdir@
 datadir = @datadir@
 localedir = $(datadir)/locale
 gettextsrcdir = $(datadir)/gettext/intl
@@ -39,8 +51,18 @@ subdir = intl
 
 INSTALL = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
-MKINSTALLDIRS = @MKINSTALLDIRS@
-mkinstalldirs = $(SHELL) `case "$(MKINSTALLDIRS)" in /*) echo "$(MKINSTALLDIRS)" ;; *) echo "$(top_builddir)/$(MKINSTALLDIRS)" ;; esac`
+
+# We use $(mkdir_p).
+# In automake <= 1.9.x, $(mkdir_p) is defined either as "mkdir -p --" or as
+# "$(mkinstalldirs)" or as "$(install_sh) -d". For these automake versions,
+# @install_sh@ does not start with $(SHELL), so we add it.
+# In automake >= 1.10, @mkdir_p@ is derived from ${MKDIR_P}, which is defined
+# either as "/path/to/mkdir -p" or ".../install-sh -c -d". For these automake
+# versions, $(mkinstalldirs) and $(install_sh) are unused.
+mkinstalldirs = $(SHELL) @install_sh@ -d
+install_sh = $(SHELL) @install_sh@
+MKDIR_P = @MKDIR_P@
+mkdir_p = @mkdir_p@
 
 l = @INTL_LIBTOOL_SUFFIX_PREFIX@
 
@@ -51,59 +73,107 @@ RANLIB = @RANLIB@
 YACC = @INTLBISON@ -y -d
 YFLAGS = --name-prefix=__gettext
 
+# -DBUILDING_LIBINTL: Change expansion of LIBINTL_DLL_EXPORTED macro.
+# -DBUILDING_DLL: Change expansion of RELOCATABLE_DLL_EXPORTED macro.
 DEFS = -DLOCALEDIR=\"$(localedir)\" -DLOCALE_ALIAS_PATH=\"$(aliaspath)\" \
--DLIBDIR=\"$(libdir)\" -DIN_LIBINTL @DEFS@
+-DLIBDIR=\"$(libdir)\" -DBUILDING_LIBINTL -DBUILDING_DLL -DIN_LIBINTL \
+-DENABLE_RELOCATABLE=1 -DIN_LIBRARY -DINSTALLDIR=\"$(libdir)\" -DNO_XMALLOC \
+-Dset_relocation_prefix=libintl_set_relocation_prefix \
+-Drelocate=libintl_relocate \
+-DDEPENDS_ON_LIBICONV=1 @DEFS@
 CPPFLAGS = @CPPFLAGS@
-CFLAGS = @CFLAGS@
-LDFLAGS = @LDFLAGS@
+CFLAGS = @CFLAGS@ @CFLAG_VISIBILITY@
+LDFLAGS = @LDFLAGS@ $(LDFLAGS_@WOE32DLL@)
+LDFLAGS_yes = -Wl,--export-all-symbols
+LDFLAGS_no =
+LIBS = @LIBS@
 
 COMPILE = $(CC) -c $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS) $(XCFLAGS)
 
-HEADERS = $(COMHDRS) libgnuintl.h loadinfo.h
-COMHDRS = gmo.h gettextP.h hash-string.h plural-exp.h eval-plural.h os2compat.h
-SOURCES = $(COMSRCS) intl-compat.c
-COMSRCS = bindtextdom.c dcgettext.c dgettext.c gettext.c \
-finddomain.c loadmsgcat.c localealias.c textdomain.c l10nflist.c \
-explodename.c dcigettext.c dcngettext.c dngettext.c ngettext.c plural.y \
-plural-exp.c localcharset.c localename.c osdep.c os2compat.c
-OBJECTS = @INTLOBJS@ bindtextdom.$lo dcgettext.$lo dgettext.$lo gettext.$lo \
-finddomain.$lo loadmsgcat.$lo localealias.$lo textdomain.$lo l10nflist.$lo \
-explodename.$lo dcigettext.$lo dcngettext.$lo dngettext.$lo ngettext.$lo \
-plural.$lo plural-exp.$lo localcharset.$lo localename.$lo osdep.$lo
-GETTOBJS = intl-compat.$lo
+HEADERS = \
+  gmo.h \
+  gettextP.h \
+  hash-string.h \
+  loadinfo.h \
+  plural-exp.h \
+  eval-plural.h \
+  localcharset.h \
+  lock.h \
+  relocatable.h \
+  xsize.h \
+  printf-args.h printf-args.c \
+  printf-parse.h wprintf-parse.h printf-parse.c \
+  vasnprintf.h vasnwprintf.h vasnprintf.c \
+  os2compat.h \
+  libgnuintl.h.in
+SOURCES = \
+  bindtextdom.c \
+  dcgettext.c \
+  dgettext.c \
+  gettext.c \
+  finddomain.c \
+  hash-string.c \
+  loadmsgcat.c \
+  localealias.c \
+  textdomain.c \
+  l10nflist.c \
+  explodename.c \
+  dcigettext.c \
+  dcngettext.c \
+  dngettext.c \
+  ngettext.c \
+  plural.y \
+  plural-exp.c \
+  localcharset.c \
+  lock.c \
+  relocatable.c \
+  langprefs.c \
+  localename.c \
+  log.c \
+  printf.c \
+  version.c \
+  osdep.c \
+  os2compat.c \
+  intl-exports.c \
+  intl-compat.c
+OBJECTS = \
+  bindtextdom.$lo \
+  dcgettext.$lo \
+  dgettext.$lo \
+  gettext.$lo \
+  finddomain.$lo \
+  hash-string.$lo \
+  loadmsgcat.$lo \
+  localealias.$lo \
+  textdomain.$lo \
+  l10nflist.$lo \
+  explodename.$lo \
+  dcigettext.$lo \
+  dcngettext.$lo \
+  dngettext.$lo \
+  ngettext.$lo \
+  plural.$lo \
+  plural-exp.$lo \
+  localcharset.$lo \
+  lock.$lo \
+  relocatable.$lo \
+  langprefs.$lo \
+  localename.$lo \
+  log.$lo \
+  printf.$lo \
+  version.$lo \
+  osdep.$lo \
+  intl-compat.$lo
 DISTFILES.common = Makefile.in \
-config.charset locale.alias ref-add.sin ref-del.sin $(HEADERS) $(SOURCES)
+config.charset locale.alias ref-add.sin ref-del.sin export.h \
+$(HEADERS) $(SOURCES)
 DISTFILES.generated = plural.c
 DISTFILES.normal = VERSION
-DISTFILES.gettext = COPYING.LIB-2.0 COPYING.LIB-2.1 libintl.glibc
+DISTFILES.gettext = COPYING.LIB-2.0 COPYING.LIB-2.1 libintl.glibc README.woe32
 DISTFILES.obsolete = xopen-msg.sed linux-msg.sed po2tbl.sed.in cat-compat.c \
-COPYING.LIB-2 gettext.h libgettext.h plural-eval.c
-
-# Libtool's library version information for libintl.
-# Before making a gettext release, the gettext maintainer must change this
-# according to the libtool documentation, section "Library interface versions".
-# Maintainers of other packages that include the intl directory must *not*
-# change these values.
-LTV_CURRENT=2
-LTV_REVISION=1
-LTV_AGE=0
-
-.SUFFIXES:
-.SUFFIXES: .c .y .o .lo .sin .sed
-.c.o:
-	$(COMPILE) $<
-.c.lo:
-	$(LIBTOOL) --mode=compile $(COMPILE) $<
-
-.y.c:
-	$(YACC) $(YFLAGS) --output $@ $<
-	rm -f $*.h
-
-.sin.sed:
-	sed -e '/^#/d' -e 's/@''PACKAGE''@/@PACKAGE@/g' $< > t-$@
-	mv t-$@ $@
-
-INCLUDES = -I.. -I. -I$(top_srcdir)/intl
+COPYING.LIB-2 gettext.h libgettext.h plural-eval.c libgnuintl.h \
+libgnuintl.h_vms Makefile.vms libgnuintl.h.msvc-static \
+libgnuintl.h.msvc-shared Makefile.msvc
 
 all: all-@USE_INCLUDED_LIBINTL@
 all-yes: libintl.$la libintl.h charset.alias ref-add.sed ref-del.sed
@@ -119,23 +189,125 @@ libintl.a libgnuintl.a: $(OBJECTS)
 libintl.la libgnuintl.la: $(OBJECTS)
 	$(LIBTOOL) --mode=link \
 	  $(CC) $(CPPFLAGS) $(CFLAGS) $(XCFLAGS) $(LDFLAGS) -o $@ \
-	  $(OBJECTS) @LTLIBICONV@ -lc \
+	  $(OBJECTS) @LTLIBICONV@ @INTL_MACOSX_LIBS@ $(LIBS) @LTLIBTHREAD@ -lc \
 	  -version-info $(LTV_CURRENT):$(LTV_REVISION):$(LTV_AGE) \
 	  -rpath $(libdir) \
 	  -no-undefined
 
-libintl.h: libgnuintl.h
-	cp $(srcdir)/libgnuintl.h libintl.h
+# Libtool's library version information for libintl.
+# Before making a gettext release, the gettext maintainer must change this
+# according to the libtool documentation, section "Library interface versions".
+# Maintainers of other packages that include the intl directory must *not*
+# change these values.
+LTV_CURRENT=8
+LTV_REVISION=1
+LTV_AGE=0
+
+.SUFFIXES:
+.SUFFIXES: .c .y .o .lo .sin .sed
 
-charset.alias: config.charset
+.c.o:
+	$(COMPILE) $<
+
+.y.c:
+	$(YACC) $(YFLAGS) --output $@ $<
+	rm -f $*.h
+
+bindtextdom.lo: $(srcdir)/bindtextdom.c
+	$(LIBTOOL) --mode=compile $(COMPILE) $(srcdir)/bindtextdom.c
+dcgettext.lo: $(srcdir)/dcgettext.c
+	$(LIBTOOL) --mode=compile $(COMPILE) $(srcdir)/dcgettext.c
+dgettext.lo: $(srcdir)/dgettext.c
+	$(LIBTOOL) --mode=compile $(COMPILE) $(srcdir)/dgettext.c
+gettext.lo: $(srcdir)/gettext.c
+	$(LIBTOOL) --mode=compile $(COMPILE) $(srcdir)/gettext.c
+finddomain.lo: $(srcdir)/finddomain.c
+	$(LIBTOOL) --mode=compile $(COMPILE) $(srcdir)/finddomain.c
+hash-string.lo: $(srcdir)/hash-string.c
+	$(LIBTOOL) --mode=compile $(COMPILE) $(srcdir)/hash-string.c
+loadmsgcat.lo: $(srcdir)/loadmsgcat.c
+	$(LIBTOOL) --mode=compile $(COMPILE) $(srcdir)/loadmsgcat.c
+localealias.lo: $(srcdir)/localealias.c
+	$(LIBTOOL) --mode=compile $(COMPILE) $(srcdir)/localealias.c
+textdomain.lo: $(srcdir)/textdomain.c
+	$(LIBTOOL) --mode=compile $(COMPILE) $(srcdir)/textdomain.c
+l10nflist.lo: $(srcdir)/l10nflist.c
+	$(LIBTOOL) --mode=compile $(COMPILE) $(srcdir)/l10nflist.c
+explodename.lo: $(srcdir)/explodename.c
+	$(LIBTOOL) --mode=compile $(COMPILE) $(srcdir)/explodename.c
+dcigettext.lo: $(srcdir)/dcigettext.c
+	$(LIBTOOL) --mode=compile $(COMPILE) $(srcdir)/dcigettext.c
+dcngettext.lo: $(srcdir)/dcngettext.c
+	$(LIBTOOL) --mode=compile $(COMPILE) $(srcdir)/dcngettext.c
+dngettext.lo: $(srcdir)/dngettext.c
+	$(LIBTOOL) --mode=compile $(COMPILE) $(srcdir)/dngettext.c
+ngettext.lo: $(srcdir)/ngettext.c
+	$(LIBTOOL) --mode=compile $(COMPILE) $(srcdir)/ngettext.c
+plural.lo: $(srcdir)/plural.c
+	$(LIBTOOL) --mode=compile $(COMPILE) $(srcdir)/plural.c
+plural-exp.lo: $(srcdir)/plural-exp.c
+	$(LIBTOOL) --mode=compile $(COMPILE) $(srcdir)/plural-exp.c
+localcharset.lo: $(srcdir)/localcharset.c
+	$(LIBTOOL) --mode=compile $(COMPILE) $(srcdir)/localcharset.c
+lock.lo: $(srcdir)/lock.c
+	$(LIBTOOL) --mode=compile $(COMPILE) $(srcdir)/lock.c
+relocatable.lo: $(srcdir)/relocatable.c
+	$(LIBTOOL) --mode=compile $(COMPILE) $(srcdir)/relocatable.c
+langprefs.lo: $(srcdir)/langprefs.c
+	$(LIBTOOL) --mode=compile $(COMPILE) $(srcdir)/langprefs.c
+localename.lo: $(srcdir)/localename.c
+	$(LIBTOOL) --mode=compile $(COMPILE) $(srcdir)/localename.c
+log.lo: $(srcdir)/log.c
+	$(LIBTOOL) --mode=compile $(COMPILE) $(srcdir)/log.c
+printf.lo: $(srcdir)/printf.c
+	$(LIBTOOL) --mode=compile $(COMPILE) $(srcdir)/printf.c
+version.lo: $(srcdir)/version.c
+	$(LIBTOOL) --mode=compile $(COMPILE) $(srcdir)/version.c
+osdep.lo: $(srcdir)/osdep.c
+	$(LIBTOOL) --mode=compile $(COMPILE) $(srcdir)/osdep.c
+intl-compat.lo: $(srcdir)/intl-compat.c
+	$(LIBTOOL) --mode=compile $(COMPILE) $(srcdir)/intl-compat.c
+
+ref-add.sed: $(srcdir)/ref-add.sin
+	sed -e '/^#/d' -e 's/@''PACKAGE''@/@PACKAGE@/g' $(srcdir)/ref-add.sin > t-ref-add.sed
+	mv t-ref-add.sed ref-add.sed
+ref-del.sed: $(srcdir)/ref-del.sin
+	sed -e '/^#/d' -e 's/@''PACKAGE''@/@PACKAGE@/g' $(srcdir)/ref-del.sin > t-ref-del.sed
+	mv t-ref-del.sed ref-del.sed
+
+INCLUDES = -I. -I$(srcdir) -I..
+
+libgnuintl.h: $(srcdir)/libgnuintl.h.in
+	sed -e '/IN_LIBGLOCALE/d' \
+	    -e 's,@''HAVE_POSIX_PRINTF''@,@HAVE_POSIX_PRINTF@,g' \
+	    -e 's,@''HAVE_ASPRINTF''@,@HAVE_ASPRINTF@,g' \
+	    -e 's,@''HAVE_SNPRINTF''@,@HAVE_SNPRINTF@,g' \
+	    -e 's,@''HAVE_WPRINTF''@,@HAVE_WPRINTF@,g' \
+	  < $(srcdir)/libgnuintl.h.in \
+	| if test '@WOE32DLL@' = yes; then \
+	    sed -e 's/extern \([^()]*\);/extern __declspec (dllimport) \1;/'; \
+	  else \
+	    cat; \
+	  fi \
+	| sed -e 's/extern \([^"]\)/extern LIBINTL_DLL_EXPORTED \1/' \
+	      -e "/#define _LIBINTL_H/r $(srcdir)/export.h" \
+	| sed -e 's,@''HAVE_VISIBILITY''@,@HAVE_VISIBILITY@,g' \
+	  > libgnuintl.h
+
+libintl.h: $(srcdir)/libgnuintl.h.in
+	sed -e '/IN_LIBGLOCALE/d' \
+	    -e 's,@''HAVE_POSIX_PRINTF''@,@HAVE_POSIX_PRINTF@,g' \
+	    -e 's,@''HAVE_ASPRINTF''@,@HAVE_ASPRINTF@,g' \
+	    -e 's,@''HAVE_SNPRINTF''@,@HAVE_SNPRINTF@,g' \
+	    -e 's,@''HAVE_WPRINTF''@,@HAVE_WPRINTF@,g' \
+	  < $(srcdir)/libgnuintl.h.in > libintl.h
+
+charset.alias: $(srcdir)/config.charset
 	$(SHELL) $(srcdir)/config.charset '@host@' > t-$@
 	mv t-$@ $@
 
 check: all
 
-# This installation goal is only used in GNU gettext.  Packages which
-# only use the library should use install instead.
-
 # We must not install the libintl.h/libintl.a files if we are on a
 # system which has the GNU gettext() function in its C library or in a
 # separate library.
@@ -143,17 +315,36 @@ check: all
 # package, you have to use `configure --with-included-gettext'.
 install: install-exec install-data
 install-exec: all
-	if test "$(PACKAGE)" = "gettext" \
-	   && test '@INTLOBJS@' = '$(GETTOBJS)'; then \
-	  $(mkinstalldirs) $(DESTDIR)$(libdir) $(DESTDIR)$(includedir); \
+	if { test "$(PACKAGE)" = "gettext-runtime" || test "$(PACKAGE)" = "gettext-tools"; } \
+	   && test '@USE_INCLUDED_LIBINTL@' = yes; then \
+	  $(mkdir_p) $(DESTDIR)$(libdir) $(DESTDIR)$(includedir); \
 	  $(INSTALL_DATA) libintl.h $(DESTDIR)$(includedir)/libintl.h; \
 	  $(LIBTOOL) --mode=install \
 	    $(INSTALL_DATA) libintl.$la $(DESTDIR)$(libdir)/libintl.$la; \
+	  if test "@RELOCATABLE@" = yes; then \
+	    dependencies=`sed -n -e 's,^dependency_libs=\(.*\),\1,p' < $(DESTDIR)$(libdir)/libintl.la | sed -e "s,^',," -e "s,'\$$,,"`; \
+	    if test -n "$$dependencies"; then \
+	      rm -f $(DESTDIR)$(libdir)/libintl.la; \
+	    fi; \
+	  fi; \
+	else \
+	  : ; \
+	fi
+	if test "$(PACKAGE)" = "gettext-tools" \
+	   && test '@USE_INCLUDED_LIBINTL@' = no \
+	   && test @GLIBC2@ != no; then \
+	  $(mkdir_p) $(DESTDIR)$(libdir); \
+	  $(LIBTOOL) --mode=install \
+	    $(INSTALL_DATA) libgnuintl.$la $(DESTDIR)$(libdir)/libgnuintl.$la; \
+	  rm -f $(DESTDIR)$(libdir)/preloadable_libintl.so; \
+	  $(INSTALL_DATA) $(DESTDIR)$(libdir)/libgnuintl.so $(DESTDIR)$(libdir)/preloadable_libintl.so; \
+	  $(LIBTOOL) --mode=uninstall \
+	    rm -f $(DESTDIR)$(libdir)/libgnuintl.$la; \
 	else \
 	  : ; \
 	fi
 	if test '@USE_INCLUDED_LIBINTL@' = yes; then \
-	  test @GLIBC21@ != no || $(mkinstalldirs) $(DESTDIR)$(libdir); \
+	  test @GLIBC21@ != no || $(mkdir_p) $(DESTDIR)$(libdir); \
 	  temp=$(DESTDIR)$(libdir)/t-charset.alias; \
 	  dest=$(DESTDIR)$(libdir)/charset.alias; \
 	  if test -f $(DESTDIR)$(libdir)/charset.alias; then \
@@ -169,7 +360,7 @@ install-exec: all
 	      rm -f $$temp; \
 	    fi; \
 	  fi; \
-	  $(mkinstalldirs) $(DESTDIR)$(localedir); \
+	  $(mkdir_p) $(DESTDIR)$(localedir); \
 	  test -f $(DESTDIR)$(localedir)/locale.alias \
 	    && orig=$(DESTDIR)$(localedir)/locale.alias \
 	    || orig=$(srcdir)/locale.alias; \
@@ -182,8 +373,8 @@ install-exec: all
 	  : ; \
 	fi
 install-data: all
-	if test "$(PACKAGE)" = "gettext"; then \
-	  $(mkinstalldirs) $(DESTDIR)$(gettextsrcdir); \
+	if test "$(PACKAGE)" = "gettext-tools"; then \
+	  $(mkdir_p) $(DESTDIR)$(gettextsrcdir); \
 	  $(INSTALL_DATA) VERSION $(DESTDIR)$(gettextsrcdir)/VERSION; \
 	  $(INSTALL_DATA) ChangeLog.inst $(DESTDIR)$(gettextsrcdir)/ChangeLog; \
 	  dists="COPYING.LIB-2.0 COPYING.LIB-2.1 $(DISTFILES.common)"; \
@@ -209,20 +400,27 @@ install-data: all
 install-strip: install
 
 installdirs:
-	if test "$(PACKAGE)" = "gettext" \
-	   && test '@INTLOBJS@' = '$(GETTOBJS)'; then \
-	  $(mkinstalldirs) $(DESTDIR)$(libdir) $(DESTDIR)$(includedir); \
+	if { test "$(PACKAGE)" = "gettext-runtime" || test "$(PACKAGE)" = "gettext-tools"; } \
+	   && test '@USE_INCLUDED_LIBINTL@' = yes; then \
+	  $(mkdir_p) $(DESTDIR)$(libdir) $(DESTDIR)$(includedir); \
+	else \
+	  : ; \
+	fi
+	if test "$(PACKAGE)" = "gettext-tools" \
+	   && test '@USE_INCLUDED_LIBINTL@' = no \
+	   && test @GLIBC2@ != no; then \
+	  $(mkdir_p) $(DESTDIR)$(libdir); \
 	else \
 	  : ; \
 	fi
 	if test '@USE_INCLUDED_LIBINTL@' = yes; then \
-	  test @GLIBC21@ != no || $(mkinstalldirs) $(DESTDIR)$(libdir); \
-	  $(mkinstalldirs) $(DESTDIR)$(localedir); \
+	  test @GLIBC21@ != no || $(mkdir_p) $(DESTDIR)$(libdir); \
+	  $(mkdir_p) $(DESTDIR)$(localedir); \
 	else \
 	  : ; \
 	fi
-	if test "$(PACKAGE)" = "gettext"; then \
-	  $(mkinstalldirs) $(DESTDIR)$(gettextsrcdir); \
+	if test "$(PACKAGE)" = "gettext-tools"; then \
+	  $(mkdir_p) $(DESTDIR)$(gettextsrcdir); \
 	else \
 	  : ; \
 	fi
@@ -231,14 +429,21 @@ installdirs:
 installcheck:
 
 uninstall:
-	if test "$(PACKAGE)" = "gettext" \
-	   && test '@INTLOBJS@' = '$(GETTOBJS)'; then \
+	if { test "$(PACKAGE)" = "gettext-runtime" || test "$(PACKAGE)" = "gettext-tools"; } \
+	   && test '@USE_INCLUDED_LIBINTL@' = yes; then \
 	  rm -f $(DESTDIR)$(includedir)/libintl.h; \
 	  $(LIBTOOL) --mode=uninstall \
 	    rm -f $(DESTDIR)$(libdir)/libintl.$la; \
 	else \
 	  : ; \
 	fi
+	if test "$(PACKAGE)" = "gettext-tools" \
+	   && test '@USE_INCLUDED_LIBINTL@' = no \
+	   && test @GLIBC2@ != no; then \
+	  rm -f $(DESTDIR)$(libdir)/preloadable_libintl.so; \
+	else \
+	  : ; \
+	fi
 	if test '@USE_INCLUDED_LIBINTL@' = yes; then \
 	  if test -f $(DESTDIR)$(libdir)/charset.alias; then \
 	    temp=$(DESTDIR)$(libdir)/t-charset.alias; \
@@ -265,7 +470,7 @@ uninstall:
 	else \
 	  : ; \
 	fi
-	if test "$(PACKAGE)" = "gettext"; then \
+	if test "$(PACKAGE)" = "gettext-tools"; then \
 	  for file in VERSION ChangeLog COPYING.LIB-2.0 COPYING.LIB-2.1 $(DISTFILES.common) $(DISTFILES.generated); do \
 	    rm -f $(DESTDIR)$(gettextsrcdir)/$$file; \
 	  done; \
@@ -273,20 +478,34 @@ uninstall:
 	  : ; \
 	fi
 
-info dvi:
+info dvi ps pdf html:
 
 $(OBJECTS): ../config.h libgnuintl.h
-bindtextdom.$lo dcgettext.$lo dcigettext.$lo dcngettext.$lo dgettext.$lo dngettext.$lo finddomain.$lo gettext.$lo intl-compat.$lo loadmsgcat.$lo localealias.$lo ngettext.$lo textdomain.$lo: gettextP.h gmo.h loadinfo.h
-dcigettext.$lo: hash-string.h
-explodename.$lo l10nflist.$lo: loadinfo.h
-dcigettext.$lo loadmsgcat.$lo plural.$lo plural-exp.$lo: plural-exp.h
-dcigettext.$lo: eval-plural.h
+bindtextdom.$lo dcgettext.$lo dcigettext.$lo dcngettext.$lo dgettext.$lo dngettext.$lo finddomain.$lo gettext.$lo intl-compat.$lo loadmsgcat.$lo localealias.$lo ngettext.$lo textdomain.$lo: $(srcdir)/gettextP.h $(srcdir)/gmo.h $(srcdir)/loadinfo.h
+hash-string.$lo dcigettext.$lo loadmsgcat.$lo: $(srcdir)/hash-string.h
+explodename.$lo l10nflist.$lo: $(srcdir)/loadinfo.h
+dcigettext.$lo loadmsgcat.$lo plural.$lo plural-exp.$lo: $(srcdir)/plural-exp.h
+dcigettext.$lo: $(srcdir)/eval-plural.h
+localcharset.$lo: $(srcdir)/localcharset.h
+bindtextdom.$lo dcigettext.$lo finddomain.$lo loadmsgcat.$lo localealias.$lo lock.$lo log.$lo: $(srcdir)/lock.h
+localealias.$lo localcharset.$lo relocatable.$lo: $(srcdir)/relocatable.h
+printf.$lo: $(srcdir)/printf-args.h $(srcdir)/printf-args.c $(srcdir)/printf-parse.h $(srcdir)/wprintf-parse.h $(srcdir)/xsize.h $(srcdir)/printf-parse.c $(srcdir)/vasnprintf.h $(srcdir)/vasnwprintf.h $(srcdir)/vasnprintf.c
+
+# A bison-2.1 generated plural.c includes <libintl.h> if ENABLE_NLS.
+PLURAL_DEPS_yes = libintl.h
+PLURAL_DEPS_no =
+plural.$lo: $(PLURAL_DEPS_@USE_INCLUDED_LIBINTL@)
 
 tags: TAGS
 
 TAGS: $(HEADERS) $(SOURCES)
 	here=`pwd`; cd $(srcdir) && etags -o $$here/TAGS $(HEADERS) $(SOURCES)
 
+ctags: CTAGS
+
+CTAGS: $(HEADERS) $(SOURCES)
+	here=`pwd`; cd $(srcdir) && ctags -o $$here/CTAGS $(HEADERS) $(SOURCES)
+
 id: ID
 
 ID: $(HEADERS) $(SOURCES)
@@ -294,15 +513,15 @@ ID: $(HEADERS) $(SOURCES)
 
 
 mostlyclean:
-	rm -f *.a *.la *.o *.lo core core.*
-	rm -f libintl.h charset.alias ref-add.sed ref-del.sed
+	rm -f *.a *.la *.o *.obj *.lo core core.*
+	rm -f libgnuintl.h libintl.h charset.alias ref-add.sed ref-del.sed
 	rm -f -r .libs _libs
 
 clean: mostlyclean
 
 distclean: clean
 	rm -f Makefile ID TAGS
-	if test "$(PACKAGE)" = gettext; then \
+	if test "$(PACKAGE)" = "gettext-runtime" || test "$(PACKAGE)" = "gettext-tools"; then \
 	  rm -f ChangeLog.inst $(DISTFILES.normal); \
 	else \
 	  : ; \
@@ -317,20 +536,26 @@ maintainer-clean: distclean
 # other files which should not be distributed in other packages.
 distdir = ../$(PACKAGE)-$(VERSION)/$(subdir)
 dist distdir: Makefile
-	if test "$(PACKAGE)" = gettext; then \
-	  additional="$(DISTFILES.gettext)"; \
+	if test "$(PACKAGE)" = "gettext-tools"; then \
+	  : ; \
 	else \
-	  additional="$(DISTFILES.normal)"; \
-	fi; \
-	$(MAKE) $(DISTFILES.common) $(DISTFILES.generated) $$additional; \
-	for file in ChangeLog $(DISTFILES.common) $(DISTFILES.generated) $$additional; do \
-	  if test -f $$file; then dir=.; else dir=$(srcdir); fi; \
-	  cp -p $$dir/$$file $(distdir); \
-	done
-
-Makefile: Makefile.in ../config.status
-	cd .. \
-	  && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
+	  if test "$(PACKAGE)" = "gettext-runtime"; then \
+	    additional="$(DISTFILES.gettext)"; \
+	  else \
+	    additional="$(DISTFILES.normal)"; \
+	  fi; \
+	  $(MAKE) $(DISTFILES.common) $(DISTFILES.generated) $$additional; \
+	  for file in ChangeLog $(DISTFILES.common) $(DISTFILES.generated) $$additional; do \
+	    if test -f $$file; then dir=.; else dir=$(srcdir); fi; \
+	    cp -p $$dir/$$file $(distdir) || test $$file = Makefile.in || exit 1; \
+	  done; \
+	fi
+
+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+	cd $(top_builddir) && $(SHELL) ./config.status
+# This would be more efficient, but doesn't work any more with autoconf-2.57,
+# when AC_CONFIG_FILES([intl/Makefile:somedir/Makefile.in]) is used.
+#	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
 
 # Tell versions [3.59,3.63) of GNU make not to export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
diff --git a/po/ChangeLog b/po/ChangeLog
index bc697cb..4daed2d 100644
--- a/po/ChangeLog
+++ b/po/ChangeLog
@@ -1,6 +1,12 @@
-2002-02-10  gettextize  <bug-gnu-utils@gnu.org>
+2006-12-08  gettextize  <bug-gnu-gettext@gnu.org>
 
-	* Makefile.in.in: Upgrade to gettext-0.10.40.
-	* cat-id-tbl.c: Remove file.
-	* stamp-cat-id: Remove file.
+	* Makefile.in.in: New file, from gettext-0.16.
+	* boldquot.sed: New file, from gettext-0.16.
+	* en@boldquot.header: New file, from gettext-0.16.
+	* en@quot.header: New file, from gettext-0.16.
+	* insert-header.sin: New file, from gettext-0.16.
+	* quot.sed: New file, from gettext-0.16.
+	* remove-potcdate.sin: New file, from gettext-0.16.
+	* Rules-quot: New file, from gettext-0.16.
+	* POTFILES.in: New file.
 
diff --git a/po/Makefile.in.in b/po/Makefile.in.in
index f7c63af..5022b8b 100644
--- a/po/Makefile.in.in
+++ b/po/Makefile.in.in
@@ -1,17 +1,18 @@
-# Makefile for program source directory in GNU NLS utilities package.
-# Copyright (C) 1995-1997, 2000, 2001 by Ulrich Drepper <drepper@gnu.ai.mit.edu>
+# Makefile for PO directory in any package using GNU gettext.
+# Copyright (C) 1995-1997, 2000-2006 by Ulrich Drepper <drepper@gnu.ai.mit.edu>
 #
-# This file file be copied and used freely without restrictions.  It can
-# be used in projects which are not available under the GNU Public License
-# but which still want to provide support for the GNU gettext functionality.
-# Please note that the actual code is *not* freely available.
+# This file can be copied and used freely without restrictions.  It can
+# be used in projects which are not available under the GNU General Public
+# License but which still want to provide support for the GNU gettext
+# functionality.
+# Please note that the actual code of GNU gettext is covered by the GNU
+# General Public License and is *not* in the public domain.
+#
+# Origin: gettext-0.16
 
 PACKAGE = @PACKAGE@
 VERSION = @VERSION@
-
-# These two variables depend on the location of this directory.
-subdir = po
-top_builddir = ..
+PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
 
 SHELL = /bin/sh
 @SET_MAKE@
@@ -22,125 +23,290 @@ VPATH = @srcdir@
 
 prefix = @prefix@
 exec_prefix = @exec_prefix@
+datarootdir = @datarootdir@
 datadir = @datadir@
-localedir = $(datadir)/locale
+localedir = @localedir@
 gettextsrcdir = $(datadir)/gettext/po
 
 INSTALL = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
-MKINSTALLDIRS = @MKINSTALLDIRS@
-mkinstalldirs = $(SHELL) `case "$(MKINSTALLDIRS)" in /*) echo "$(MKINSTALLDIRS)" ;; *) echo "$(top_builddir)/mkinstalldirs" ;; esac`
 
-CC = @CC@
-GMSGFMT = @GMSGFMT@
-MSGFMT = @MSGFMT@
-XGETTEXT = @XGETTEXT@
+# We use $(mkdir_p).
+# In automake <= 1.9.x, $(mkdir_p) is defined either as "mkdir -p --" or as
+# "$(mkinstalldirs)" or as "$(install_sh) -d". For these automake versions,
+# @install_sh@ does not start with $(SHELL), so we add it.
+# In automake >= 1.10, @mkdir_p@ is derived from ${MKDIR_P}, which is defined
+# either as "/path/to/mkdir -p" or ".../install-sh -c -d". For these automake
+# versions, $(mkinstalldirs) and $(install_sh) are unused.
+mkinstalldirs = $(SHELL) @install_sh@ -d
+install_sh = $(SHELL) @install_sh@
+MKDIR_P = @MKDIR_P@
+mkdir_p = @mkdir_p@
+
+GMSGFMT_ = @GMSGFMT@
+GMSGFMT_no = @GMSGFMT@
+GMSGFMT_yes = @GMSGFMT_015@
+GMSGFMT = $(GMSGFMT_$(USE_MSGCTXT))
+MSGFMT_ = @MSGFMT@
+MSGFMT_no = @MSGFMT@
+MSGFMT_yes = @MSGFMT_015@
+MSGFMT = $(MSGFMT_$(USE_MSGCTXT))
+XGETTEXT_ = @XGETTEXT@
+XGETTEXT_no = @XGETTEXT@
+XGETTEXT_yes = @XGETTEXT_015@
+XGETTEXT = $(XGETTEXT_$(USE_MSGCTXT))
 MSGMERGE = msgmerge
-
-DEFS = @DEFS@
-CFLAGS = @CFLAGS@
-CPPFLAGS = @CPPFLAGS@
-
-INCLUDES = -I.. -I$(top_srcdir)/intl
-
-COMPILE = $(CC) -c $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS) $(XCFLAGS)
+MSGMERGE_UPDATE = @MSGMERGE@ --update
+MSGINIT = msginit
+MSGCONV = msgconv
+MSGFILTER = msgfilter
 
 POFILES = @POFILES@
 GMOFILES = @GMOFILES@
-DISTFILES = ChangeLog Makefile.in.in POTFILES.in $(PACKAGE).pot \
-$(POFILES) $(GMOFILES)
+UPDATEPOFILES = @UPDATEPOFILES@
+DUMMYPOFILES = @DUMMYPOFILES@
+DISTFILES.common = Makefile.in.in remove-potcdate.sin \
+$(DISTFILES.common.extra1) $(DISTFILES.common.extra2) $(DISTFILES.common.extra3)
+DISTFILES = $(DISTFILES.common) Makevars POTFILES.in \
+$(POFILES) $(GMOFILES) \
+$(DISTFILES.extra1) $(DISTFILES.extra2) $(DISTFILES.extra3)
 
 POTFILES = \
 
 CATALOGS = @CATALOGS@
 
-.SUFFIXES:
-.SUFFIXES: .c .o .po .pox .gmo .mo
-
-.c.o:
-	$(COMPILE) $<
+# Makevars gets inserted here. (Don't remove this line!)
 
-.po.pox:
-	$(MAKE) $(PACKAGE).pot
-	$(MSGMERGE) $< $(srcdir)/$(PACKAGE).pot -o $*.pox
+.SUFFIXES:
+.SUFFIXES: .po .gmo .mo .sed .sin .nop .po-create .po-update
 
 .po.mo:
-	$(MSGFMT) -o $@ $<
+	@echo "$(MSGFMT) -c -o $@ $<"; \
+	$(MSGFMT) -c -o t-$@ $< && mv t-$@ $@
 
 .po.gmo:
-	file=$(srcdir)/`echo $* | sed 's,.*/,,'`.gmo \
-	  && rm -f $$file && $(GMSGFMT) --statistics -o $$file $<
+	@lang=`echo $* | sed -e 's,.*/,,'`; \
+	test "$(srcdir)" = . && cdcmd="" || cdcmd="cd $(srcdir) && "; \
+	echo "$${cdcmd}rm -f $${lang}.gmo && $(GMSGFMT) -c --statistics -o $${lang}.gmo $${lang}.po"; \
+	cd $(srcdir) && rm -f $${lang}.gmo && $(GMSGFMT) -c --statistics -o t-$${lang}.gmo $${lang}.po && mv t-$${lang}.gmo $${lang}.gmo
+
+.sin.sed:
+	sed -e '/^#/d' $< > t-$@
+	mv t-$@ $@
 
 
 all: all-@USE_NLS@
 
-all-yes: $(CATALOGS)
+all-yes: stamp-po
 all-no:
 
-# Note: Target 'all' must not depend on target '$(srcdir)/$(PACKAGE).pot',
+# $(srcdir)/$(DOMAIN).pot is only created when needed. When xgettext finds no
+# internationalized messages, no $(srcdir)/$(DOMAIN).pot is created (because
+# we don't want to bother translators with empty POT files). We assume that
+# LINGUAS is empty in this case, i.e. $(POFILES) and $(GMOFILES) are empty.
+# In this case, stamp-po is a nop (i.e. a phony target).
+
+# stamp-po is a timestamp denoting the last time at which the CATALOGS have
+# been loosely updated. Its purpose is that when a developer or translator
+# checks out the package via CVS, and the $(DOMAIN).pot file is not in CVS,
+# "make" will update the $(DOMAIN).pot and the $(CATALOGS), but subsequent
+# invocations of "make" will do nothing. This timestamp would not be necessary
+# if updating the $(CATALOGS) would always touch them; however, the rule for
+# $(POFILES) has been designed to not touch files that don't need to be
+# changed.
+stamp-po: $(srcdir)/$(DOMAIN).pot
+	test ! -f $(srcdir)/$(DOMAIN).pot || \
+	  test -z "$(GMOFILES)" || $(MAKE) $(GMOFILES)
+	@test ! -f $(srcdir)/$(DOMAIN).pot || { \
+	  echo "touch stamp-po" && \
+	  echo timestamp > stamp-poT && \
+	  mv stamp-poT stamp-po; \
+	}
+
+# Note: Target 'all' must not depend on target '$(DOMAIN).pot-update',
 # otherwise packages like GCC can not be built if only parts of the source
 # have been downloaded.
 
-$(srcdir)/$(PACKAGE).pot: $(POTFILES) $(srcdir)/POTFILES.in
-	$(XGETTEXT) --default-domain=$(PACKAGE) --directory=$(top_srcdir) \
-	  --add-comments --keyword=_ --keyword=N_ --keyword=POPT_ \
+# This target rebuilds $(DOMAIN).pot; it is an expensive operation.
+# Note that $(DOMAIN).pot is not touched if it doesn't need to be changed.
+$(DOMAIN).pot-update: $(POTFILES) $(srcdir)/POTFILES.in remove-potcdate.sed
+	if test -n '$(MSGID_BUGS_ADDRESS)' || test '$(PACKAGE_BUGREPORT)' = '@'PACKAGE_BUGREPORT'@'; then \
+	  msgid_bugs_address='$(MSGID_BUGS_ADDRESS)'; \
+	else \
+	  msgid_bugs_address='$(PACKAGE_BUGREPORT)'; \
+	fi; \
+	$(XGETTEXT) --default-domain=$(DOMAIN) --directory=$(top_srcdir) \
+	  --add-comments=TRANSLATORS: $(XGETTEXT_OPTIONS) \
 	  --files-from=$(srcdir)/POTFILES.in \
-	&& test ! -f $(PACKAGE).po \
-	   || ( rm -f $(srcdir)/$(PACKAGE).pot \
-		&& mv $(PACKAGE).po $(srcdir)/$(PACKAGE).pot )
+	  --copyright-holder='$(COPYRIGHT_HOLDER)' \
+	  --msgid-bugs-address="$$msgid_bugs_address"
+	test ! -f $(DOMAIN).po || { \
+	  if test -f $(srcdir)/$(DOMAIN).pot; then \
+	    sed -f remove-potcdate.sed < $(srcdir)/$(DOMAIN).pot > $(DOMAIN).1po && \
+	    sed -f remove-potcdate.sed < $(DOMAIN).po > $(DOMAIN).2po && \
+	    if cmp $(DOMAIN).1po $(DOMAIN).2po >/dev/null 2>&1; then \
+	      rm -f $(DOMAIN).1po $(DOMAIN).2po $(DOMAIN).po; \
+	    else \
+	      rm -f $(DOMAIN).1po $(DOMAIN).2po $(srcdir)/$(DOMAIN).pot && \
+	      mv $(DOMAIN).po $(srcdir)/$(DOMAIN).pot; \
+	    fi; \
+	  else \
+	    mv $(DOMAIN).po $(srcdir)/$(DOMAIN).pot; \
+	  fi; \
+	}
+
+# This rule has no dependencies: we don't need to update $(DOMAIN).pot at
+# every "make" invocation, only create it when it is missing.
+# Only "make $(DOMAIN).pot-update" or "make dist" will force an update.
+$(srcdir)/$(DOMAIN).pot:
+	$(MAKE) $(DOMAIN).pot-update
+
+# This target rebuilds a PO file if $(DOMAIN).pot has changed.
+# Note that a PO file is not touched if it doesn't need to be changed.
+$(POFILES): $(srcdir)/$(DOMAIN).pot
+	@lang=`echo $@ | sed -e 's,.*/,,' -e 's/\.po$$//'`; \
+	if test -f "$(srcdir)/$${lang}.po"; then \
+	  test "$(srcdir)" = . && cdcmd="" || cdcmd="cd $(srcdir) && "; \
+	  echo "$${cdcmd}$(MSGMERGE_UPDATE) $${lang}.po $(DOMAIN).pot"; \
+	  cd $(srcdir) && $(MSGMERGE_UPDATE) $${lang}.po $(DOMAIN).pot; \
+	else \
+	  $(MAKE) $${lang}.po-create; \
+	fi
 
 
 install: install-exec install-data
 install-exec:
 install-data: install-data-@USE_NLS@
-	if test "$(PACKAGE)" = "gettext"; then \
-	  $(mkinstalldirs) $(DESTDIR)$(gettextsrcdir); \
-	  $(INSTALL_DATA) $(srcdir)/Makefile.in.in \
-			  $(DESTDIR)$(gettextsrcdir)/Makefile.in.in; \
+	if test "$(PACKAGE)" = "gettext-tools"; then \
+	  $(mkdir_p) $(DESTDIR)$(gettextsrcdir); \
+	  for file in $(DISTFILES.common) Makevars.template; do \
+	    $(INSTALL_DATA) $(srcdir)/$$file \
+			    $(DESTDIR)$(gettextsrcdir)/$$file; \
+	  done; \
+	  for file in Makevars; do \
+	    rm -f $(DESTDIR)$(gettextsrcdir)/$$file; \
+	  done; \
 	else \
 	  : ; \
 	fi
 install-data-no: all
 install-data-yes: all
-	$(mkinstalldirs) $(DESTDIR)$(datadir)
+	$(mkdir_p) $(DESTDIR)$(datadir)
 	@catalogs='$(CATALOGS)'; \
 	for cat in $$catalogs; do \
 	  cat=`basename $$cat`; \
-	  lang=`echo $$cat | sed 's/\.gmo$$//'`; \
+	  lang=`echo $$cat | sed -e 's/\.gmo$$//'`; \
 	  dir=$(localedir)/$$lang/LC_MESSAGES; \
-	  $(mkinstalldirs) $(DESTDIR)$$dir; \
-	  if test -r $$cat; then \
-	    $(INSTALL_DATA) $$cat $(DESTDIR)$$dir/$(PACKAGE).mo; \
-	    echo "installing $$cat as $(DESTDIR)$$dir/$(PACKAGE).mo"; \
-	  else \
-	    $(INSTALL_DATA) $(srcdir)/$$cat $(DESTDIR)$$dir/$(PACKAGE).mo; \
-	    echo "installing $(srcdir)/$$cat as" \
-		 "$(DESTDIR)$$dir/$(PACKAGE).mo"; \
-	  fi; \
+	  $(mkdir_p) $(DESTDIR)$$dir; \
+	  if test -r $$cat; then realcat=$$cat; else realcat=$(srcdir)/$$cat; fi; \
+	  $(INSTALL_DATA) $$realcat $(DESTDIR)$$dir/$(DOMAIN).mo; \
+	  echo "installing $$realcat as $(DESTDIR)$$dir/$(DOMAIN).mo"; \
+	  for lc in '' $(EXTRA_LOCALE_CATEGORIES); do \
+	    if test -n "$$lc"; then \
+	      if (cd $(DESTDIR)$(localedir)/$$lang && LC_ALL=C ls -l -d $$lc 2>/dev/null) | grep ' -> ' >/dev/null; then \
+	        link=`cd $(DESTDIR)$(localedir)/$$lang && LC_ALL=C ls -l -d $$lc | sed -e 's/^.* -> //'`; \
+	        mv $(DESTDIR)$(localedir)/$$lang/$$lc $(DESTDIR)$(localedir)/$$lang/$$lc.old; \
+	        mkdir $(DESTDIR)$(localedir)/$$lang/$$lc; \
+	        (cd $(DESTDIR)$(localedir)/$$lang/$$lc.old && \
+	         for file in *; do \
+	           if test -f $$file; then \
+	             ln -s ../$$link/$$file $(DESTDIR)$(localedir)/$$lang/$$lc/$$file; \
+	           fi; \
+	         done); \
+	        rm -f $(DESTDIR)$(localedir)/$$lang/$$lc.old; \
+	      else \
+	        if test -d $(DESTDIR)$(localedir)/$$lang/$$lc; then \
+	          :; \
+	        else \
+	          rm -f $(DESTDIR)$(localedir)/$$lang/$$lc; \
+	          mkdir $(DESTDIR)$(localedir)/$$lang/$$lc; \
+	        fi; \
+	      fi; \
+	      rm -f $(DESTDIR)$(localedir)/$$lang/$$lc/$(DOMAIN).mo; \
+	      ln -s ../LC_MESSAGES/$(DOMAIN).mo $(DESTDIR)$(localedir)/$$lang/$$lc/$(DOMAIN).mo 2>/dev/null || \
+	      ln $(DESTDIR)$(localedir)/$$lang/LC_MESSAGES/$(DOMAIN).mo $(DESTDIR)$(localedir)/$$lang/$$lc/$(DOMAIN).mo 2>/dev/null || \
+	      cp -p $(DESTDIR)$(localedir)/$$lang/LC_MESSAGES/$(DOMAIN).mo $(DESTDIR)$(localedir)/$$lang/$$lc/$(DOMAIN).mo; \
+	      echo "installing $$realcat link as $(DESTDIR)$(localedir)/$$lang/$$lc/$(DOMAIN).mo"; \
+	    fi; \
+	  done; \
 	done
 
-# Define this as empty until I found a useful application.
-installcheck:
+install-strip: install
 
-uninstall:
-	catalogs='$(CATALOGS)'; \
+installdirs: installdirs-exec installdirs-data
+installdirs-exec:
+installdirs-data: installdirs-data-@USE_NLS@
+	if test "$(PACKAGE)" = "gettext-tools"; then \
+	  $(mkdir_p) $(DESTDIR)$(gettextsrcdir); \
+	else \
+	  : ; \
+	fi
+installdirs-data-no:
+installdirs-data-yes:
+	$(mkdir_p) $(DESTDIR)$(datadir)
+	@catalogs='$(CATALOGS)'; \
 	for cat in $$catalogs; do \
 	  cat=`basename $$cat`; \
-	  lang=`echo $$cat | sed 's/\.gmo$$//'`; \
-	  rm -f $(DESTDIR)$(localedir)/$$lang/LC_MESSAGES/$(PACKAGE).mo; \
+	  lang=`echo $$cat | sed -e 's/\.gmo$$//'`; \
+	  dir=$(localedir)/$$lang/LC_MESSAGES; \
+	  $(mkdir_p) $(DESTDIR)$$dir; \
+	  for lc in '' $(EXTRA_LOCALE_CATEGORIES); do \
+	    if test -n "$$lc"; then \
+	      if (cd $(DESTDIR)$(localedir)/$$lang && LC_ALL=C ls -l -d $$lc 2>/dev/null) | grep ' -> ' >/dev/null; then \
+	        link=`cd $(DESTDIR)$(localedir)/$$lang && LC_ALL=C ls -l -d $$lc | sed -e 's/^.* -> //'`; \
+	        mv $(DESTDIR)$(localedir)/$$lang/$$lc $(DESTDIR)$(localedir)/$$lang/$$lc.old; \
+	        mkdir $(DESTDIR)$(localedir)/$$lang/$$lc; \
+	        (cd $(DESTDIR)$(localedir)/$$lang/$$lc.old && \
+	         for file in *; do \
+	           if test -f $$file; then \
+	             ln -s ../$$link/$$file $(DESTDIR)$(localedir)/$$lang/$$lc/$$file; \
+	           fi; \
+	         done); \
+	        rm -f $(DESTDIR)$(localedir)/$$lang/$$lc.old; \
+	      else \
+	        if test -d $(DESTDIR)$(localedir)/$$lang/$$lc; then \
+	          :; \
+	        else \
+	          rm -f $(DESTDIR)$(localedir)/$$lang/$$lc; \
+	          mkdir $(DESTDIR)$(localedir)/$$lang/$$lc; \
+	        fi; \
+	      fi; \
+	    fi; \
+	  done; \
 	done
-	if test "$(PACKAGE)" = "gettext"; then \
-	  rm -f $(DESTDIR)$(gettextsrcdir)/Makefile.in.in; \
+
+# Define this as empty until I found a useful application.
+installcheck:
+
+uninstall: uninstall-exec uninstall-data
+uninstall-exec:
+uninstall-data: uninstall-data-@USE_NLS@
+	if test "$(PACKAGE)" = "gettext-tools"; then \
+	  for file in $(DISTFILES.common) Makevars.template; do \
+	    rm -f $(DESTDIR)$(gettextsrcdir)/$$file; \
+	  done; \
 	else \
 	  : ; \
 	fi
+uninstall-data-no:
+uninstall-data-yes:
+	catalogs='$(CATALOGS)'; \
+	for cat in $$catalogs; do \
+	  cat=`basename $$cat`; \
+	  lang=`echo $$cat | sed -e 's/\.gmo$$//'`; \
+	  for lc in LC_MESSAGES $(EXTRA_LOCALE_CATEGORIES); do \
+	    rm -f $(DESTDIR)$(localedir)/$$lang/$$lc/$(DOMAIN).mo; \
+	  done; \
+	done
 
 check: all
 
-dvi info tags TAGS ID:
+info dvi ps pdf html tags TAGS ctags CTAGS ID:
 
 mostlyclean:
-	rm -f core core.* *.pox $(PACKAGE).po *.new.po
+	rm -f remove-potcdate.sed
+	rm -f stamp-poT
+	rm -f core core.* $(DOMAIN).po $(DOMAIN).1po $(DOMAIN).2po *.new.po
 	rm -fr *.o
 
 clean: mostlyclean
@@ -151,45 +317,86 @@ distclean: clean
 maintainer-clean: distclean
 	@echo "This command is intended for maintainers to use;"
 	@echo "it deletes files that may require special tools to rebuild."
-	rm -f $(GMOFILES)
+	rm -f stamp-po $(GMOFILES)
 
 distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir)
 dist distdir:
 	$(MAKE) update-po
 	@$(MAKE) dist2
 # This is a separate target because 'update-po' must be executed before.
-dist2: $(DISTFILES)
+dist2: stamp-po $(DISTFILES)
 	dists="$(DISTFILES)"; \
+	if test "$(PACKAGE)" = "gettext-tools"; then \
+	  dists="$$dists Makevars.template"; \
+	fi; \
+	if test -f $(srcdir)/$(DOMAIN).pot; then \
+	  dists="$$dists $(DOMAIN).pot stamp-po"; \
+	fi; \
+	if test -f $(srcdir)/ChangeLog; then \
+	  dists="$$dists ChangeLog"; \
+	fi; \
+	for i in 0 1 2 3 4 5 6 7 8 9; do \
+	  if test -f $(srcdir)/ChangeLog.$$i; then \
+	    dists="$$dists ChangeLog.$$i"; \
+	  fi; \
+	done; \
+	if test -f $(srcdir)/LINGUAS; then dists="$$dists LINGUAS"; fi; \
 	for file in $$dists; do \
-	  if test -f $$file; then dir=.; else dir=$(srcdir); fi; \
-	  cp -p $$dir/$$file $(distdir); \
+	  if test -f $$file; then \
+	    cp -p $$file $(distdir) || exit 1; \
+	  else \
+	    cp -p $(srcdir)/$$file $(distdir) || exit 1; \
+	  fi; \
 	done
 
 update-po: Makefile
-	$(MAKE) $(PACKAGE).pot
-	if test "$(PACKAGE)" = "gettext"; then PATH=`pwd`/../src:$$PATH; fi; \
+	$(MAKE) $(DOMAIN).pot-update
+	test -z "$(UPDATEPOFILES)" || $(MAKE) $(UPDATEPOFILES)
+	$(MAKE) update-gmo
+
+# General rule for creating PO files.
+
+.nop.po-create:
+	@lang=`echo $@ | sed -e 's/\.po-create$$//'`; \
+	echo "File $$lang.po does not exist. If you are a translator, you can create it through 'msginit'." 1>&2; \
+	exit 1
+
+# General rule for updating PO files.
+
+.nop.po-update:
+	@lang=`echo $@ | sed -e 's/\.po-update$$//'`; \
+	if test "$(PACKAGE)" = "gettext-tools"; then PATH=`pwd`/../src:$$PATH; fi; \
+	tmpdir=`pwd`; \
+	echo "$$lang:"; \
+	test "$(srcdir)" = . && cdcmd="" || cdcmd="cd $(srcdir) && "; \
+	echo "$${cdcmd}$(MSGMERGE) $$lang.po $(DOMAIN).pot -o $$lang.new.po"; \
 	cd $(srcdir); \
-	catalogs='$(GMOFILES)'; \
-	for cat in $$catalogs; do \
-	  cat=`basename $$cat`; \
-	  lang=`echo $$cat | sed 's/\.gmo$$//'`; \
-	  echo "$$lang:"; \
-	  if $(MSGMERGE) $$lang.po $(PACKAGE).pot -o $$lang.new.po; then \
-	    mv -f $$lang.new.po $$lang.po; \
+	if $(MSGMERGE) $$lang.po $(DOMAIN).pot -o $$tmpdir/$$lang.new.po; then \
+	  if cmp $$lang.po $$tmpdir/$$lang.new.po >/dev/null 2>&1; then \
+	    rm -f $$tmpdir/$$lang.new.po; \
 	  else \
-	    echo "msgmerge for $$cat failed!"; \
-	    rm -f $$lang.new.po; \
+	    if mv -f $$tmpdir/$$lang.new.po $$lang.po; then \
+	      :; \
+	    else \
+	      echo "msgmerge for $$lang.po failed: cannot move $$tmpdir/$$lang.new.po to $$lang.po" 1>&2; \
+	      exit 1; \
+	    fi; \
 	  fi; \
-	done
-	$(MAKE) update-gmo
+	else \
+	  echo "msgmerge for $$lang.po failed!" 1>&2; \
+	  rm -f $$tmpdir/$$lang.new.po; \
+	fi
+
+$(DUMMYPOFILES):
 
 update-gmo: Makefile $(GMOFILES)
 	@:
 
-Makefile: Makefile.in.in $(top_builddir)/config.status POTFILES.in
+Makefile: Makefile.in.in Makevars $(top_builddir)/config.status @POMAKEFILEDEPS@
 	cd $(top_builddir) \
-	  && CONFIG_FILES=$(subdir)/$@.in CONFIG_HEADERS= \
-	       $(SHELL) ./config.status
+	  && $(SHELL) ./config.status $(subdir)/$@.in po-directories
+
+force:
 
 # Tell versions [3.59,3.63) of GNU make not to export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
diff --git a/po/POTFILES.in b/po/POTFILES.in
index a1eddf7..2e2af76 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -4,6 +4,7 @@
 
 findme.c
 popt.c
+popt.h
 poptconfig.c
 popthelp.c
 poptparse.c
diff --git a/po/cs.po b/po/cs.po
index 20b4ec8..f94e7bd 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -1,8 +1,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.3\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-02-29 07:48-0500\n"
+"Report-Msgid-Bugs-To: <rpm-devel@lists.dulug.duke.edu>\n"
+"POT-Creation-Date: 2007-01-21 14:25-0500\n"
 "PO-Revision-Date: 2001-07-24 00:03+0100\n"
 "Last-Translator: Milan Kerslager <kerslage@linux.cz>\n"
 "Language-Team: Czech <cs@li.org>\n"
@@ -14,99 +14,107 @@ msgstr ""
 msgid "unknown errno"
 msgstr "nezn�m� ��slo chyby"
 
-#: popt.c:964
+#: popt.c:996
 #, c-format
 msgid "option type (%d) not implemented in popt\n"
 msgstr "volba (%d) nen� v popt implementov�na\n"
 
-#: popt.c:1184
+#: popt.c:1208
 msgid "missing argument"
 msgstr "chyb� argument"
 
-#: popt.c:1186
+#: popt.c:1210
 msgid "unknown option"
 msgstr "nezn�m� volba"
 
-#: popt.c:1188
+#: popt.c:1212
 msgid "mutually exclusive logical operations requested"
 msgstr "po�adov�ny vz�jemn� v�lu�n� logick� operace"
 
-#: popt.c:1190
+#: popt.c:1214
 msgid "opt->arg should not be NULL"
 msgstr "opt->arg nesm� b�t NULL"
 
-#: popt.c:1192
+#: popt.c:1216
 msgid "aliases nested too deeply"
 msgstr "aliasy vno�en� p��li� hluboko"
 
-#: popt.c:1194
+#: popt.c:1218
 msgid "error in parameter quoting"
 msgstr "chyba v quotov�n� parametr�"
 
-#: popt.c:1196
+#: popt.c:1220
 msgid "invalid numeric value"
 msgstr "chybn� numerick� hodnota"
 
-#: popt.c:1198
+#: popt.c:1222
 msgid "number too large or too small"
 msgstr "��slo je p��li� velk� nebo p��li� mal�"
 
-#: popt.c:1200
+#: popt.c:1224
 msgid "memory allocation failed"
 msgstr "selhala alokace pam�ti"
 
-#: popt.c:1204
+#: popt.c:1228
 msgid "unknown error"
 msgstr "nezn�m� chyba"
 
-#: popthelp.c:64 popthelp.c:75
+#: popt.h:172
+msgid "Options implemented via popt alias/exec:"
+msgstr ""
+
+#: popt.h:188
+msgid "Help options:"
+msgstr ""
+
+#: popthelp.c:68 popthelp.c:79
 msgid "Show this help message"
 msgstr "Vyp��e tuto n�pov�du"
 
-#: popthelp.c:65 popthelp.c:76
+#: popthelp.c:69 popthelp.c:80
 msgid "Display brief usage message"
 msgstr "Vyp��e kr�tk� n�vod k pou�it�"
 
-#: popthelp.c:79
+#: popthelp.c:83
 msgid "Display option defaults in message"
 msgstr "Zobrazit implicitn� volby ve zpr�v�"
 
-#: popthelp.c:124
+#: popthelp.c:128
 msgid "NONE"
 msgstr "NONE"
 
-#: popthelp.c:126
+#: popthelp.c:130
 msgid "VAL"
 msgstr "VAL"
 
-#: popthelp.c:130
+#: popthelp.c:134
 msgid "INT"
 msgstr "INT"
 
-#: popthelp.c:131
+#: popthelp.c:135
 msgid "LONG"
 msgstr "LONG"
 
-#: popthelp.c:132
+#: popthelp.c:136
 msgid "STRING"
 msgstr "STRING"
 
-#: popthelp.c:133
+#: popthelp.c:137
 msgid "FLOAT"
 msgstr "FLOAT"
 
-#: popthelp.c:134
+#: popthelp.c:138
 msgid "DOUBLE"
 msgstr "DOUBLE"
 
-#: popthelp.c:135
+#: popthelp.c:139
 msgid "ARG"
 msgstr "ARG"
 
-#: popthelp.c:548
+#: popthelp.c:552
 msgid "Usage:"
 msgstr "Pou�it�:"
 
-#: popthelp.c:572
+#: popthelp.c:576
 msgid "[OPTION...]"
 msgstr "[VOLBY...]"
diff --git a/po/da.po b/po/da.po
index f8e9e70..9f9e972 100644
--- a/po/da.po
+++ b/po/da.po
@@ -1,8 +1,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.3\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-02-29 07:48-0500\n"
+"Report-Msgid-Bugs-To: <rpm-devel@lists.dulug.duke.edu>\n"
+"POT-Creation-Date: 2007-01-21 14:25-0500\n"
 "PO-Revision-Date: Sun Jan 21 2001 04:30:32+0200\n"
 "Last-Translator: Martin Hansen <mah@k64.dk>\n"
 "Language-Team: Dansk <dansk@klid.dk>\n"
@@ -15,100 +15,108 @@ msgstr ""
 msgid "unknown errno"
 msgstr "ukendt fejlnr."
 
-#: popt.c:964
+#: popt.c:996
 #, c-format
 msgid "option type (%d) not implemented in popt\n"
 msgstr "tilvalgstype (%d) er ikke implementeret i popt\n"
 
-#: popt.c:1184
+#: popt.c:1208
 msgid "missing argument"
 msgstr "mangler argument"
 
-#: popt.c:1186
+#: popt.c:1210
 msgid "unknown option"
 msgstr "ukendt tilvalg"
 
-#: popt.c:1188
+#: popt.c:1212
 msgid "mutually exclusive logical operations requested"
 msgstr "de �nskede handlinger udelukker hinanden"
 
-#: popt.c:1190
+#: popt.c:1214
 msgid "opt->arg should not be NULL"
 msgstr ""
 
-#: popt.c:1192
+#: popt.c:1216
 msgid "aliases nested too deeply"
 msgstr "aliaser er for dybt indlejret"
 
-#: popt.c:1194
+#: popt.c:1218
 msgid "error in parameter quoting"
 msgstr "fejl i parameter citering"
 
-#: popt.c:1196
+#: popt.c:1220
 msgid "invalid numeric value"
 msgstr "ugyldig numerisk v�rdi"
 
-#: popt.c:1198
+#: popt.c:1222
 msgid "number too large or too small"
 msgstr "nummer for stort, eller for lille"
 
-#: popt.c:1200
+#: popt.c:1224
 msgid "memory allocation failed"
 msgstr ""
 
-#: popt.c:1204
+#: popt.c:1228
 msgid "unknown error"
 msgstr "ukendt fejl"
 
-#: popthelp.c:64 popthelp.c:75
+#: popt.h:172
+msgid "Options implemented via popt alias/exec:"
+msgstr ""
+
+#: popt.h:188
+msgid "Help options:"
+msgstr ""
+
+#: popthelp.c:68 popthelp.c:79
 msgid "Show this help message"
 msgstr "Vis denne hj�lpemeddelelse"
 
-#: popthelp.c:65 popthelp.c:76
+#: popthelp.c:69 popthelp.c:80
 msgid "Display brief usage message"
 msgstr "Vis kortfattet brugsanvisning"
 
-#: popthelp.c:79
+#: popthelp.c:83
 #, fuzzy
 msgid "Display option defaults in message"
 msgstr "Vis kortfattet brugsanvisning"
 
-#: popthelp.c:124
+#: popthelp.c:128
 msgid "NONE"
 msgstr "INGEN"
 
-#: popthelp.c:126
+#: popthelp.c:130
 msgid "VAL"
 msgstr "VAL"
 
-#: popthelp.c:130
+#: popthelp.c:134
 msgid "INT"
 msgstr "INT"
 
-#: popthelp.c:131
+#: popthelp.c:135
 msgid "LONG"
 msgstr "LONG"
 
-#: popthelp.c:132
+#: popthelp.c:136
 msgid "STRING"
 msgstr "STRING"
 
-#: popthelp.c:133
+#: popthelp.c:137
 msgid "FLOAT"
 msgstr "FLOAT"
 
-#: popthelp.c:134
+#: popthelp.c:138
 msgid "DOUBLE"
 msgstr "DOUBLE"
 
-#: popthelp.c:135
+#: popthelp.c:139
 msgid "ARG"
 msgstr "ARG"
 
-#: popthelp.c:548
+#: popthelp.c:552
 msgid "Usage:"
 msgstr "Brug:"
 
-#: popthelp.c:572
+#: popthelp.c:576
 msgid "[OPTION...]"
 msgstr "[TILVALG...]"
diff --git a/po/de.po b/po/de.po
index df3d2ae..784eabc 100644
--- a/po/de.po
+++ b/po/de.po
@@ -1,117 +1,124 @@
-# SOME DESCRIPTIVE TITLE.
-# Copyright (C) YEAR Free Software Foundation, Inc.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+# Translation of popt to German (Deutsch)
+# This file is distributed under the same license as the popt package.
+# Robert Scheck <rpm@robert-scheck.de>, 2004-2007.
 #
-#, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.3\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-02-29 07:48-0500\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
+"Report-Msgid-Bugs-To: <rpm-devel@lists.dulug.duke.edu>\n"
+"POT-Creation-Date: 2007-01-21 14:25-0500\n"
+"PO-Revision-Date: 2007-02-17 21:00+0100\n"
+"Last-Translator: Robert Scheck <rpm@robert-scheck.de>\n"
+"Language-Team: German <de@li.org>\n"
 "MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=CHARSET\n"
-"Content-Transfer-Encoding: ENCODING\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
 
 #: popt.c:35
 msgid "unknown errno"
-msgstr ""
+msgstr "Unbekannte Fehler-Nummer"
 
-#: popt.c:964
+#: popt.c:996
 #, c-format
 msgid "option type (%d) not implemented in popt\n"
-msgstr ""
+msgstr "Optionstyp (%d) ist in popt nicht vorhanden\n"
 
-#: popt.c:1184
+#: popt.c:1208
 msgid "missing argument"
-msgstr ""
+msgstr "Fehlendes Argument"
 
-#: popt.c:1186
+#: popt.c:1210
 msgid "unknown option"
-msgstr ""
+msgstr "Unbekannte Option"
 
-#: popt.c:1188
+#: popt.c:1212
 msgid "mutually exclusive logical operations requested"
-msgstr ""
+msgstr "Gegenseitig ausschließende logische Operatoren"
 
-#: popt.c:1190
+#: popt.c:1214
 msgid "opt->arg should not be NULL"
-msgstr ""
+msgstr "opt->arg sollte nicht NULL sein"
 
-#: popt.c:1192
+#: popt.c:1216
 msgid "aliases nested too deeply"
-msgstr ""
+msgstr "Aliase zu tief verschachtelt"
 
-#: popt.c:1194
+#: popt.c:1218
 msgid "error in parameter quoting"
-msgstr ""
+msgstr "Fehler beim Quotieren der Parameter"
 
-#: popt.c:1196
+#: popt.c:1220
 msgid "invalid numeric value"
-msgstr ""
+msgstr "Ungültiger nummerischer Wert"
 
-#: popt.c:1198
+#: popt.c:1222
 msgid "number too large or too small"
-msgstr ""
+msgstr "Nummer zu groß oder zu klein"
 
-#: popt.c:1200
+#: popt.c:1224
 msgid "memory allocation failed"
-msgstr ""
+msgstr "Speicherzuordnung fehlgeschlagen"
 
-#: popt.c:1204
+#: popt.c:1228
 msgid "unknown error"
-msgstr ""
+msgstr "Unbekannter Fehler"
+
+#: popt.h:172
+msgid "Options implemented via popt alias/exec:"
+msgstr "Optionen über popt alias/exec implementiert:"
 
-#: popthelp.c:64 popthelp.c:75
+#: popt.h:188
+msgid "Help options:"
+msgstr "Hilfe-Optionen:"
+
+#: popthelp.c:68 popthelp.c:79
 msgid "Show this help message"
-msgstr ""
+msgstr "Zeigt diese Hilfe an"
 
-#: popthelp.c:65 popthelp.c:76
+#: popthelp.c:69 popthelp.c:80
 msgid "Display brief usage message"
-msgstr ""
+msgstr "Zeigt eine kurze Verwendungsinformation"
 
-#: popthelp.c:79
+#: popthelp.c:83
 msgid "Display option defaults in message"
-msgstr ""
+msgstr "Zeigt die Standardeinstellungen an"
 
-#: popthelp.c:124
+#: popthelp.c:128
 msgid "NONE"
-msgstr ""
+msgstr "NICHTS"
 
-#: popthelp.c:126
+#: popthelp.c:130
 msgid "VAL"
-msgstr ""
+msgstr "WERT"
 
-#: popthelp.c:130
+#: popthelp.c:134
 msgid "INT"
-msgstr ""
+msgstr "INTEGER"
 
-#: popthelp.c:131
+#: popthelp.c:135
 msgid "LONG"
-msgstr ""
+msgstr "LONG"
 
-#: popthelp.c:132
+#: popthelp.c:136
 msgid "STRING"
-msgstr ""
+msgstr "STRING"
 
-#: popthelp.c:133
+#: popthelp.c:137
 msgid "FLOAT"
-msgstr ""
+msgstr "FLOAT"
 
-#: popthelp.c:134
+#: popthelp.c:138
 msgid "DOUBLE"
-msgstr ""
+msgstr "DOUBLE"
 
-#: popthelp.c:135
+#: popthelp.c:139
 msgid "ARG"
-msgstr ""
+msgstr "ARGUMENT"
 
-#: popthelp.c:548
+#: popthelp.c:552
 msgid "Usage:"
-msgstr ""
+msgstr "Verwendung:"
 
-#: popthelp.c:572
+#: popthelp.c:576
 msgid "[OPTION...]"
-msgstr ""
+msgstr "[OPTION...]"
diff --git a/po/es.po b/po/es.po
index c263994..24fd51d 100644
--- a/po/es.po
+++ b/po/es.po
@@ -6,113 +6,121 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.3\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-02-29 07:48-0500\n"
+"Report-Msgid-Bugs-To: <rpm-devel@lists.dulug.duke.edu>\n"
+"POT-Creation-Date: 2007-01-21 14:25-0500\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Leandro Lucarella <luca@linuxmendoza.org.ar>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=CHARSET\n"
+"Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: ENCODING\n"
 
 #: popt.c:35
 msgid "unknown errno"
 msgstr "errno desconocido"
 
-#: popt.c:964
+#: popt.c:996
 #, c-format
 msgid "option type (%d) not implemented in popt\n"
 msgstr "tipo de opcin (%d) no implementada en popt\n"
 
-#: popt.c:1184
+#: popt.c:1208
 msgid "missing argument"
 msgstr "falta argumento"
 
-#: popt.c:1186
+#: popt.c:1210
 msgid "unknown option"
 msgstr "opcin desconocida"
 
-#: popt.c:1188
+#: popt.c:1212
 msgid "mutually exclusive logical operations requested"
 msgstr "requerida operacin lgica mutuamente exclusiva"
 
-#: popt.c:1190
+#: popt.c:1214
 msgid "opt->arg should not be NULL"
 msgstr ""
 
-#: popt.c:1192
+#: popt.c:1216
 msgid "aliases nested too deeply"
 msgstr "alias anidados muy profundamente"
 
-#: popt.c:1194
+#: popt.c:1218
 msgid "error in parameter quoting"
 msgstr "error en cita de parmetros"
 
-#: popt.c:1196
+#: popt.c:1220
 msgid "invalid numeric value"
 msgstr "valor numrico invlido"
 
-#: popt.c:1198
+#: popt.c:1222
 msgid "number too large or too small"
 msgstr "nmero muy largo o muy pequeo"
 
-#: popt.c:1200
+#: popt.c:1224
 msgid "memory allocation failed"
 msgstr ""
 
-#: popt.c:1204
+#: popt.c:1228
 msgid "unknown error"
 msgstr "error desconocido"
 
-#: popthelp.c:64 popthelp.c:75
+#: popt.h:172
+msgid "Options implemented via popt alias/exec:"
+msgstr ""
+
+#: popt.h:188
+msgid "Help options:"
+msgstr ""
+
+#: popthelp.c:68 popthelp.c:79
 msgid "Show this help message"
 msgstr "Muestra este mensaje de ayuda"
 
-#: popthelp.c:65 popthelp.c:76
+#: popthelp.c:69 popthelp.c:80
 msgid "Display brief usage message"
 msgstr "Indica el modo de uso resumido"
 
-#: popthelp.c:79
+#: popthelp.c:83
 #, fuzzy
 msgid "Display option defaults in message"
 msgstr "Indica el modo de uso resumido"
 
-#: popthelp.c:124
+#: popthelp.c:128
 msgid "NONE"
 msgstr "NONE"
 
-#: popthelp.c:126
+#: popthelp.c:130
 msgid "VAL"
 msgstr "VAL"
 
-#: popthelp.c:130
+#: popthelp.c:134
 msgid "INT"
 msgstr "INT"
 
-#: popthelp.c:131
+#: popthelp.c:135
 msgid "LONG"
 msgstr "LONG"
 
-#: popthelp.c:132
+#: popthelp.c:136
 msgid "STRING"
 msgstr "STRING"
 
-#: popthelp.c:133
+#: popthelp.c:137
 msgid "FLOAT"
 msgstr "FLOAT"
 
-#: popthelp.c:134
+#: popthelp.c:138
 msgid "DOUBLE"
 msgstr "DOUBLE"
 
-#: popthelp.c:135
+#: popthelp.c:139
 msgid "ARG"
 msgstr "ARG"
 
-#: popthelp.c:548
+#: popthelp.c:552
 msgid "Usage:"
 msgstr "Modo de Uso:"
 
-#: popthelp.c:572
+#: popthelp.c:576
 msgid "[OPTION...]"
 msgstr "[OPCIN...]"
diff --git a/po/eu_ES.po b/po/eu_ES.po
index df3d2ae..78ab7a1 100644
--- a/po/eu_ES.po
+++ b/po/eu_ES.po
@@ -6,112 +6,120 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.3\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-02-29 07:48-0500\n"
+"Report-Msgid-Bugs-To: <rpm-devel@lists.dulug.duke.edu>\n"
+"POT-Creation-Date: 2007-01-21 14:25-0500\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=CHARSET\n"
+"Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: ENCODING\n"
 
 #: popt.c:35
 msgid "unknown errno"
 msgstr ""
 
-#: popt.c:964
+#: popt.c:996
 #, c-format
 msgid "option type (%d) not implemented in popt\n"
 msgstr ""
 
-#: popt.c:1184
+#: popt.c:1208
 msgid "missing argument"
 msgstr ""
 
-#: popt.c:1186
+#: popt.c:1210
 msgid "unknown option"
 msgstr ""
 
-#: popt.c:1188
+#: popt.c:1212
 msgid "mutually exclusive logical operations requested"
 msgstr ""
 
-#: popt.c:1190
+#: popt.c:1214
 msgid "opt->arg should not be NULL"
 msgstr ""
 
-#: popt.c:1192
+#: popt.c:1216
 msgid "aliases nested too deeply"
 msgstr ""
 
-#: popt.c:1194
+#: popt.c:1218
 msgid "error in parameter quoting"
 msgstr ""
 
-#: popt.c:1196
+#: popt.c:1220
 msgid "invalid numeric value"
 msgstr ""
 
-#: popt.c:1198
+#: popt.c:1222
 msgid "number too large or too small"
 msgstr ""
 
-#: popt.c:1200
+#: popt.c:1224
 msgid "memory allocation failed"
 msgstr ""
 
-#: popt.c:1204
+#: popt.c:1228
 msgid "unknown error"
 msgstr ""
 
-#: popthelp.c:64 popthelp.c:75
+#: popt.h:172
+msgid "Options implemented via popt alias/exec:"
+msgstr ""
+
+#: popt.h:188
+msgid "Help options:"
+msgstr ""
+
+#: popthelp.c:68 popthelp.c:79
 msgid "Show this help message"
 msgstr ""
 
-#: popthelp.c:65 popthelp.c:76
+#: popthelp.c:69 popthelp.c:80
 msgid "Display brief usage message"
 msgstr ""
 
-#: popthelp.c:79
+#: popthelp.c:83
 msgid "Display option defaults in message"
 msgstr ""
 
-#: popthelp.c:124
+#: popthelp.c:128
 msgid "NONE"
 msgstr ""
 
-#: popthelp.c:126
+#: popthelp.c:130
 msgid "VAL"
 msgstr ""
 
-#: popthelp.c:130
+#: popthelp.c:134
 msgid "INT"
 msgstr ""
 
-#: popthelp.c:131
+#: popthelp.c:135
 msgid "LONG"
 msgstr ""
 
-#: popthelp.c:132
+#: popthelp.c:136
 msgid "STRING"
 msgstr ""
 
-#: popthelp.c:133
+#: popthelp.c:137
 msgid "FLOAT"
 msgstr ""
 
-#: popthelp.c:134
+#: popthelp.c:138
 msgid "DOUBLE"
 msgstr ""
 
-#: popthelp.c:135
+#: popthelp.c:139
 msgid "ARG"
 msgstr ""
 
-#: popthelp.c:548
+#: popthelp.c:552
 msgid "Usage:"
 msgstr ""
 
-#: popthelp.c:572
+#: popthelp.c:576
 msgid "[OPTION...]"
 msgstr ""
diff --git a/po/fi.po b/po/fi.po
index df3d2ae..78ab7a1 100644
--- a/po/fi.po
+++ b/po/fi.po
@@ -6,112 +6,120 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.3\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-02-29 07:48-0500\n"
+"Report-Msgid-Bugs-To: <rpm-devel@lists.dulug.duke.edu>\n"
+"POT-Creation-Date: 2007-01-21 14:25-0500\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=CHARSET\n"
+"Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: ENCODING\n"
 
 #: popt.c:35
 msgid "unknown errno"
 msgstr ""
 
-#: popt.c:964
+#: popt.c:996
 #, c-format
 msgid "option type (%d) not implemented in popt\n"
 msgstr ""
 
-#: popt.c:1184
+#: popt.c:1208
 msgid "missing argument"
 msgstr ""
 
-#: popt.c:1186
+#: popt.c:1210
 msgid "unknown option"
 msgstr ""
 
-#: popt.c:1188
+#: popt.c:1212
 msgid "mutually exclusive logical operations requested"
 msgstr ""
 
-#: popt.c:1190
+#: popt.c:1214
 msgid "opt->arg should not be NULL"
 msgstr ""
 
-#: popt.c:1192
+#: popt.c:1216
 msgid "aliases nested too deeply"
 msgstr ""
 
-#: popt.c:1194
+#: popt.c:1218
 msgid "error in parameter quoting"
 msgstr ""
 
-#: popt.c:1196
+#: popt.c:1220
 msgid "invalid numeric value"
 msgstr ""
 
-#: popt.c:1198
+#: popt.c:1222
 msgid "number too large or too small"
 msgstr ""
 
-#: popt.c:1200
+#: popt.c:1224
 msgid "memory allocation failed"
 msgstr ""
 
-#: popt.c:1204
+#: popt.c:1228
 msgid "unknown error"
 msgstr ""
 
-#: popthelp.c:64 popthelp.c:75
+#: popt.h:172
+msgid "Options implemented via popt alias/exec:"
+msgstr ""
+
+#: popt.h:188
+msgid "Help options:"
+msgstr ""
+
+#: popthelp.c:68 popthelp.c:79
 msgid "Show this help message"
 msgstr ""
 
-#: popthelp.c:65 popthelp.c:76
+#: popthelp.c:69 popthelp.c:80
 msgid "Display brief usage message"
 msgstr ""
 
-#: popthelp.c:79
+#: popthelp.c:83
 msgid "Display option defaults in message"
 msgstr ""
 
-#: popthelp.c:124
+#: popthelp.c:128
 msgid "NONE"
 msgstr ""
 
-#: popthelp.c:126
+#: popthelp.c:130
 msgid "VAL"
 msgstr ""
 
-#: popthelp.c:130
+#: popthelp.c:134
 msgid "INT"
 msgstr ""
 
-#: popthelp.c:131
+#: popthelp.c:135
 msgid "LONG"
 msgstr ""
 
-#: popthelp.c:132
+#: popthelp.c:136
 msgid "STRING"
 msgstr ""
 
-#: popthelp.c:133
+#: popthelp.c:137
 msgid "FLOAT"
 msgstr ""
 
-#: popthelp.c:134
+#: popthelp.c:138
 msgid "DOUBLE"
 msgstr ""
 
-#: popthelp.c:135
+#: popthelp.c:139
 msgid "ARG"
 msgstr ""
 
-#: popthelp.c:548
+#: popthelp.c:552
 msgid "Usage:"
 msgstr ""
 
-#: popthelp.c:572
+#: popthelp.c:576
 msgid "[OPTION...]"
 msgstr ""
diff --git a/po/fr.po b/po/fr.po
index 06bde25..ed933de 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -11,8 +11,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.8.1\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-02-29 07:48-0500\n"
+"Report-Msgid-Bugs-To: <rpm-devel@lists.dulug.duke.edu>\n"
+"POT-Creation-Date: 2007-01-21 14:25-0500\n"
 "PO-Revision-Date: 2003-06-22 23:43+0200\n"
 "Last-Translator: RPM French Translation <rpm-fr@livna.org>\n"
 "Language-Team: RPM French Translation <rpm-fr@livna.org>\n"
@@ -24,99 +24,107 @@ msgstr ""
 msgid "unknown errno"
 msgstr "errno inconnu"
 
-#: popt.c:964
+#: popt.c:996
 #, c-format
 msgid "option type (%d) not implemented in popt\n"
 msgstr "type(%d) d'option non implémenté dans popt\n"
 
-#: popt.c:1184
+#: popt.c:1208
 msgid "missing argument"
 msgstr "argument manquant"
 
-#: popt.c:1186
+#: popt.c:1210
 msgid "unknown option"
 msgstr "option iconnue"
 
-#: popt.c:1188
+#: popt.c:1212
 msgid "mutually exclusive logical operations requested"
 msgstr "opérations logiques mutuellement exclusives requises"
 
-#: popt.c:1190
+#: popt.c:1214
 msgid "opt->arg should not be NULL"
 msgstr "opt->arg ne devrait pas être NULL"
 
-#: popt.c:1192
+#: popt.c:1216
 msgid "aliases nested too deeply"
 msgstr "les alias sont trop entremellés"
 
-#: popt.c:1194
+#: popt.c:1218
 msgid "error in parameter quoting"
 msgstr "erreur en citant les paramètres"
 
-#: popt.c:1196
+#: popt.c:1220
 msgid "invalid numeric value"
 msgstr "valeur numérique invalide"
 
-#: popt.c:1198
+#: popt.c:1222
 msgid "number too large or too small"
 msgstr "nombre trop grand ou trop petit"
 
-#: popt.c:1200
+#: popt.c:1224
 msgid "memory allocation failed"
 msgstr "échec de l'allocation de mémoire"
 
-#: popt.c:1204
+#: popt.c:1228
 msgid "unknown error"
 msgstr "erreur inconnue"
 
-#: popthelp.c:64 popthelp.c:75
+#: popt.h:172
+msgid "Options implemented via popt alias/exec:"
+msgstr ""
+
+#: popt.h:188
+msgid "Help options:"
+msgstr ""
+
+#: popthelp.c:68 popthelp.c:79
 msgid "Show this help message"
 msgstr "Montre ce message d'aide"
 
-#: popthelp.c:65 popthelp.c:76
+#: popthelp.c:69 popthelp.c:80
 msgid "Display brief usage message"
 msgstr "Affiche un bref descriptif de l'utilisation"
 
-#: popthelp.c:79
+#: popthelp.c:83
 msgid "Display option defaults in message"
 msgstr "Afficher les valeurs par défaut des options dans le message"
 
-#: popthelp.c:124
+#: popthelp.c:128
 msgid "NONE"
 msgstr "RIEN"
 
-#: popthelp.c:126
+#: popthelp.c:130
 msgid "VAL"
 msgstr "VAL"
 
-#: popthelp.c:130
+#: popthelp.c:134
 msgid "INT"
 msgstr "ENTIER"
 
-#: popthelp.c:131
+#: popthelp.c:135
 msgid "LONG"
 msgstr "LONG"
 
-#: popthelp.c:132
+#: popthelp.c:136
 msgid "STRING"
 msgstr "CHAINE"
 
-#: popthelp.c:133
+#: popthelp.c:137
 msgid "FLOAT"
 msgstr "FLOTTANT"
 
-#: popthelp.c:134
+#: popthelp.c:138
 msgid "DOUBLE"
 msgstr "DOUBLE"
 
-#: popthelp.c:135
+#: popthelp.c:139
 msgid "ARG"
 msgstr "ARG"
 
-#: popthelp.c:548
+#: popthelp.c:552
 msgid "Usage:"
 msgstr "Utilisation:"
 
-#: popthelp.c:572
+#: popthelp.c:576
 msgid "[OPTION...]"
 msgstr "[OPTION...]"
diff --git a/po/gl.po b/po/gl.po
index 0f783f8..af5ec71 100644
--- a/po/gl.po
+++ b/po/gl.po
@@ -1,8 +1,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.3\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-02-29 07:48-0500\n"
+"Report-Msgid-Bugs-To: <rpm-devel@lists.dulug.duke.edu>\n"
+"POT-Creation-Date: 2007-01-21 14:25-0500\n"
 "PO-Revision-Date: 2001-01-17 01:01+0100\n"
 "Last-Translator: Jes�s Bravo �lvarez <jba@pobox.com>\n"
 "Language-Team: Galician <trasno@ceu.fi.udc.es>\n"
@@ -14,100 +14,108 @@ msgstr ""
 msgid "unknown errno"
 msgstr "errno desco�ecido"
 
-#: popt.c:964
+#: popt.c:996
 #, c-format
 msgid "option type (%d) not implemented in popt\n"
 msgstr "tipo de opci�n (%d) non implementada en popt\n"
 
-#: popt.c:1184
+#: popt.c:1208
 msgid "missing argument"
 msgstr "falta un argumento"
 
-#: popt.c:1186
+#: popt.c:1210
 msgid "unknown option"
 msgstr "opci�n desco�ecida"
 
-#: popt.c:1188
+#: popt.c:1212
 msgid "mutually exclusive logical operations requested"
 msgstr "solicit�ronse operaci�ns l�xicas mutuamente exclu�ntes"
 
-#: popt.c:1190
+#: popt.c:1214
 msgid "opt->arg should not be NULL"
 msgstr ""
 
-#: popt.c:1192
+#: popt.c:1216
 msgid "aliases nested too deeply"
 msgstr "aliases ani�ados a un nivel demasiado profundo"
 
-#: popt.c:1194
+#: popt.c:1218
 msgid "error in parameter quoting"
 msgstr "erro nas comi�as do par�metro"
 
-#: popt.c:1196
+#: popt.c:1220
 msgid "invalid numeric value"
 msgstr "valor num�rico non v�lido"
 
-#: popt.c:1198
+#: popt.c:1222
 msgid "number too large or too small"
 msgstr "n�mero demasiado grande ou pequeno"
 
-#: popt.c:1200
+#: popt.c:1224
 msgid "memory allocation failed"
 msgstr ""
 
-#: popt.c:1204
+#: popt.c:1228
 msgid "unknown error"
 msgstr "erro desco�ecido"
 
-#: popthelp.c:64 popthelp.c:75
+#: popt.h:172
+msgid "Options implemented via popt alias/exec:"
+msgstr ""
+
+#: popt.h:188
+msgid "Help options:"
+msgstr ""
+
+#: popthelp.c:68 popthelp.c:79
 msgid "Show this help message"
 msgstr "Amosar esta mensaxe de axuda"
 
-#: popthelp.c:65 popthelp.c:76
+#: popthelp.c:69 popthelp.c:80
 msgid "Display brief usage message"
 msgstr "Amosar brevemente o xeito de utilizaci�n"
 
-#: popthelp.c:79
+#: popthelp.c:83
 #, fuzzy
 msgid "Display option defaults in message"
 msgstr "Amosar brevemente o xeito de utilizaci�n"
 
-#: popthelp.c:124
+#: popthelp.c:128
 msgid "NONE"
 msgstr "NADA"
 
-#: popthelp.c:126
+#: popthelp.c:130
 msgid "VAL"
 msgstr "VAL"
 
-#: popthelp.c:130
+#: popthelp.c:134
 msgid "INT"
 msgstr "INT"
 
-#: popthelp.c:131
+#: popthelp.c:135
 msgid "LONG"
 msgstr "LONG"
 
-#: popthelp.c:132
+#: popthelp.c:136
 msgid "STRING"
 msgstr "CADEA"
 
-#: popthelp.c:133
+#: popthelp.c:137
 msgid "FLOAT"
 msgstr "FLOAT"
 
-#: popthelp.c:134
+#: popthelp.c:138
 msgid "DOUBLE"
 msgstr "DOUBLE"
 
-#: popthelp.c:135
+#: popthelp.c:139
 msgid "ARG"
 msgstr "ARG"
 
-#: popthelp.c:548
+#: popthelp.c:552
 msgid "Usage:"
 msgstr "Uso:"
 
-#: popthelp.c:572
+#: popthelp.c:576
 msgid "[OPTION...]"
 msgstr "[OPCI�N...]"
diff --git a/po/hu.po b/po/hu.po
index 0cd41f2..74fb502 100644
--- a/po/hu.po
+++ b/po/hu.po
@@ -1,8 +1,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.3\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-02-29 07:48-0500\n"
+"Report-Msgid-Bugs-To: <rpm-devel@lists.dulug.duke.edu>\n"
+"POT-Creation-Date: 2007-01-21 14:25-0500\n"
 "PO-Revision-Date: 2000-08-03 23:26+0200\n"
 "Last-Translator: L�szl� N�meth <nemeth@qwertynet.hu>\n"
 "Language-Team: Hungarian\n"
@@ -14,100 +14,108 @@ msgstr ""
 msgid "unknown errno"
 msgstr ""
 
-#: popt.c:964
+#: popt.c:996
 #, c-format
 msgid "option type (%d) not implemented in popt\n"
 msgstr ""
 
-#: popt.c:1184
+#: popt.c:1208
 msgid "missing argument"
 msgstr ""
 
-#: popt.c:1186
+#: popt.c:1210
 msgid "unknown option"
 msgstr ""
 
-#: popt.c:1188
+#: popt.c:1212
 msgid "mutually exclusive logical operations requested"
 msgstr ""
 
-#: popt.c:1190
+#: popt.c:1214
 msgid "opt->arg should not be NULL"
 msgstr ""
 
-#: popt.c:1192
+#: popt.c:1216
 msgid "aliases nested too deeply"
 msgstr ""
 
-#: popt.c:1194
+#: popt.c:1218
 msgid "error in parameter quoting"
 msgstr ""
 
-#: popt.c:1196
+#: popt.c:1220
 msgid "invalid numeric value"
 msgstr ""
 
-#: popt.c:1198
+#: popt.c:1222
 msgid "number too large or too small"
 msgstr ""
 
-#: popt.c:1200
+#: popt.c:1224
 msgid "memory allocation failed"
 msgstr ""
 
-#: popt.c:1204
+#: popt.c:1228
 msgid "unknown error"
 msgstr ""
 
-#: popthelp.c:64 popthelp.c:75
+#: popt.h:172
+msgid "Options implemented via popt alias/exec:"
+msgstr ""
+
+#: popt.h:188
+msgid "Help options:"
+msgstr ""
+
+#: popthelp.c:68 popthelp.c:79
 msgid "Show this help message"
 msgstr "E s�g� megjelen�t�se"
 
-#: popthelp.c:65 popthelp.c:76
+#: popthelp.c:69 popthelp.c:80
 msgid "Display brief usage message"
 msgstr "R�vid haszn�lati utas�t�s megjelen�t�se"
 
-#: popthelp.c:79
+#: popthelp.c:83
 #, fuzzy
 msgid "Display option defaults in message"
 msgstr "R�vid haszn�lati utas�t�s megjelen�t�se"
 
-#: popthelp.c:124
+#: popthelp.c:128
 msgid "NONE"
 msgstr ""
 
-#: popthelp.c:126
+#: popthelp.c:130
 msgid "VAL"
 msgstr ""
 
-#: popthelp.c:130
+#: popthelp.c:134
 msgid "INT"
 msgstr ""
 
-#: popthelp.c:131
+#: popthelp.c:135
 msgid "LONG"
 msgstr ""
 
-#: popthelp.c:132
+#: popthelp.c:136
 msgid "STRING"
 msgstr ""
 
-#: popthelp.c:133
+#: popthelp.c:137
 msgid "FLOAT"
 msgstr ""
 
-#: popthelp.c:134
+#: popthelp.c:138
 msgid "DOUBLE"
 msgstr ""
 
-#: popthelp.c:135
+#: popthelp.c:139
 msgid "ARG"
 msgstr ""
 
-#: popthelp.c:548
+#: popthelp.c:552
 msgid "Usage:"
 msgstr ""
 
-#: popthelp.c:572
+#: popthelp.c:576
 msgid "[OPTION...]"
 msgstr ""
diff --git a/po/id.po b/po/id.po
index df3d2ae..78ab7a1 100644
--- a/po/id.po
+++ b/po/id.po
@@ -6,112 +6,120 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.3\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-02-29 07:48-0500\n"
+"Report-Msgid-Bugs-To: <rpm-devel@lists.dulug.duke.edu>\n"
+"POT-Creation-Date: 2007-01-21 14:25-0500\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=CHARSET\n"
+"Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: ENCODING\n"
 
 #: popt.c:35
 msgid "unknown errno"
 msgstr ""
 
-#: popt.c:964
+#: popt.c:996
 #, c-format
 msgid "option type (%d) not implemented in popt\n"
 msgstr ""
 
-#: popt.c:1184
+#: popt.c:1208
 msgid "missing argument"
 msgstr ""
 
-#: popt.c:1186
+#: popt.c:1210
 msgid "unknown option"
 msgstr ""
 
-#: popt.c:1188
+#: popt.c:1212
 msgid "mutually exclusive logical operations requested"
 msgstr ""
 
-#: popt.c:1190
+#: popt.c:1214
 msgid "opt->arg should not be NULL"
 msgstr ""
 
-#: popt.c:1192
+#: popt.c:1216
 msgid "aliases nested too deeply"
 msgstr ""
 
-#: popt.c:1194
+#: popt.c:1218
 msgid "error in parameter quoting"
 msgstr ""
 
-#: popt.c:1196
+#: popt.c:1220
 msgid "invalid numeric value"
 msgstr ""
 
-#: popt.c:1198
+#: popt.c:1222
 msgid "number too large or too small"
 msgstr ""
 
-#: popt.c:1200
+#: popt.c:1224
 msgid "memory allocation failed"
 msgstr ""
 
-#: popt.c:1204
+#: popt.c:1228
 msgid "unknown error"
 msgstr ""
 
-#: popthelp.c:64 popthelp.c:75
+#: popt.h:172
+msgid "Options implemented via popt alias/exec:"
+msgstr ""
+
+#: popt.h:188
+msgid "Help options:"
+msgstr ""
+
+#: popthelp.c:68 popthelp.c:79
 msgid "Show this help message"
 msgstr ""
 
-#: popthelp.c:65 popthelp.c:76
+#: popthelp.c:69 popthelp.c:80
 msgid "Display brief usage message"
 msgstr ""
 
-#: popthelp.c:79
+#: popthelp.c:83
 msgid "Display option defaults in message"
 msgstr ""
 
-#: popthelp.c:124
+#: popthelp.c:128
 msgid "NONE"
 msgstr ""
 
-#: popthelp.c:126
+#: popthelp.c:130
 msgid "VAL"
 msgstr ""
 
-#: popthelp.c:130
+#: popthelp.c:134
 msgid "INT"
 msgstr ""
 
-#: popthelp.c:131
+#: popthelp.c:135
 msgid "LONG"
 msgstr ""
 
-#: popthelp.c:132
+#: popthelp.c:136
 msgid "STRING"
 msgstr ""
 
-#: popthelp.c:133
+#: popthelp.c:137
 msgid "FLOAT"
 msgstr ""
 
-#: popthelp.c:134
+#: popthelp.c:138
 msgid "DOUBLE"
 msgstr ""
 
-#: popthelp.c:135
+#: popthelp.c:139
 msgid "ARG"
 msgstr ""
 
-#: popthelp.c:548
+#: popthelp.c:552
 msgid "Usage:"
 msgstr ""
 
-#: popthelp.c:572
+#: popthelp.c:576
 msgid "[OPTION...]"
 msgstr ""
diff --git a/po/is.po b/po/is.po
index 4a117ad..8dfd398 100644
--- a/po/is.po
+++ b/po/is.po
@@ -1,8 +1,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.3\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-02-29 07:48-0500\n"
+"Report-Msgid-Bugs-To: <rpm-devel@lists.dulug.duke.edu>\n"
+"POT-Creation-Date: 2007-01-21 14:25-0500\n"
 "PO-Revision-Date: 2001-06-08 01:35+0000\n"
 "Last-Translator: Richard Allen <ra@hp.is>\n"
 "Language-Team: is <kde-isl@mmedia.is>\n"
@@ -14,99 +14,107 @@ msgstr ""
 msgid "unknown errno"
 msgstr "��ekkt villun�mer"
 
-#: popt.c:964
+#: popt.c:996
 #, c-format
 msgid "option type (%d) not implemented in popt\n"
 msgstr "rofager�in (%d) er ekki studd � popt\n"
 
-#: popt.c:1184
+#: popt.c:1208
 msgid "missing argument"
 msgstr "vantar vi�fang"
 
-#: popt.c:1186
+#: popt.c:1210
 msgid "unknown option"
 msgstr "��ekktur rofi"
 
-#: popt.c:1188
+#: popt.c:1212
 msgid "mutually exclusive logical operations requested"
 msgstr "be�i� um rofa sem sl�kkva hvor � ��rum"
 
-#: popt.c:1190
+#: popt.c:1214
 msgid "opt->arg should not be NULL"
 msgstr "opt->arg �tti ekki a� vera NULL"
 
-#: popt.c:1192
+#: popt.c:1216
 msgid "aliases nested too deeply"
 msgstr "al�asar of fl�knir"
 
-#: popt.c:1194
+#: popt.c:1218
 msgid "error in parameter quoting"
 msgstr "villa � vi�f�ngum (g�salappir og svo frv.)"
 
-#: popt.c:1196
+#: popt.c:1220
 msgid "invalid numeric value"
 msgstr "�gilt t�lulegt gildi"
 
-#: popt.c:1198
+#: popt.c:1222
 msgid "number too large or too small"
 msgstr "talan of st�r e�a sm�"
 
-#: popt.c:1200
+#: popt.c:1224
 msgid "memory allocation failed"
 msgstr "ekki t�kst a� taka fr� minni"
 
-#: popt.c:1204
+#: popt.c:1228
 msgid "unknown error"
 msgstr "��ekkt villa"
 
-#: popthelp.c:64 popthelp.c:75
+#: popt.h:172
+msgid "Options implemented via popt alias/exec:"
+msgstr ""
+
+#: popt.h:188
+msgid "Help options:"
+msgstr ""
+
+#: popthelp.c:68 popthelp.c:79
 msgid "Show this help message"
 msgstr "S�na �essa hj�lp"
 
-#: popthelp.c:65 popthelp.c:76
+#: popthelp.c:69 popthelp.c:80
 msgid "Display brief usage message"
 msgstr "S�na stuttar notkunarlei�beiningar"
 
-#: popthelp.c:79
+#: popthelp.c:83
 msgid "Display option defaults in message"
 msgstr "S�na sj�lfgefin gildi rofa � skilabo�um"
 
-#: popthelp.c:124
+#: popthelp.c:128
 msgid "NONE"
 msgstr "ENGIN"
 
-#: popthelp.c:126
+#: popthelp.c:130
 msgid "VAL"
 msgstr "VAL"
 
-#: popthelp.c:130
+#: popthelp.c:134
 msgid "INT"
 msgstr "INT"
 
-#: popthelp.c:131
+#: popthelp.c:135
 msgid "LONG"
 msgstr "LONG"
 
-#: popthelp.c:132
+#: popthelp.c:136
 msgid "STRING"
 msgstr "STRING"
 
-#: popthelp.c:133
+#: popthelp.c:137
 msgid "FLOAT"
 msgstr "FLOAT"
 
-#: popthelp.c:134
+#: popthelp.c:138
 msgid "DOUBLE"
 msgstr "DOUBLE"
 
-#: popthelp.c:135
+#: popthelp.c:139
 msgid "ARG"
 msgstr "ARG"
 
-#: popthelp.c:548
+#: popthelp.c:552
 msgid "Usage:"
 msgstr "Notkun:"
 
-#: popthelp.c:572
+#: popthelp.c:576
 msgid "[OPTION...]"
 msgstr "[ROFI...]"
diff --git a/po/it.po b/po/it.po
index df3d2ae..78ab7a1 100644
--- a/po/it.po
+++ b/po/it.po
@@ -6,112 +6,120 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.3\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-02-29 07:48-0500\n"
+"Report-Msgid-Bugs-To: <rpm-devel@lists.dulug.duke.edu>\n"
+"POT-Creation-Date: 2007-01-21 14:25-0500\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=CHARSET\n"
+"Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: ENCODING\n"
 
 #: popt.c:35
 msgid "unknown errno"
 msgstr ""
 
-#: popt.c:964
+#: popt.c:996
 #, c-format
 msgid "option type (%d) not implemented in popt\n"
 msgstr ""
 
-#: popt.c:1184
+#: popt.c:1208
 msgid "missing argument"
 msgstr ""
 
-#: popt.c:1186
+#: popt.c:1210
 msgid "unknown option"
 msgstr ""
 
-#: popt.c:1188
+#: popt.c:1212
 msgid "mutually exclusive logical operations requested"
 msgstr ""
 
-#: popt.c:1190
+#: popt.c:1214
 msgid "opt->arg should not be NULL"
 msgstr ""
 
-#: popt.c:1192
+#: popt.c:1216
 msgid "aliases nested too deeply"
 msgstr ""
 
-#: popt.c:1194
+#: popt.c:1218
 msgid "error in parameter quoting"
 msgstr ""
 
-#: popt.c:1196
+#: popt.c:1220
 msgid "invalid numeric value"
 msgstr ""
 
-#: popt.c:1198
+#: popt.c:1222
 msgid "number too large or too small"
 msgstr ""
 
-#: popt.c:1200
+#: popt.c:1224
 msgid "memory allocation failed"
 msgstr ""
 
-#: popt.c:1204
+#: popt.c:1228
 msgid "unknown error"
 msgstr ""
 
-#: popthelp.c:64 popthelp.c:75
+#: popt.h:172
+msgid "Options implemented via popt alias/exec:"
+msgstr ""
+
+#: popt.h:188
+msgid "Help options:"
+msgstr ""
+
+#: popthelp.c:68 popthelp.c:79
 msgid "Show this help message"
 msgstr ""
 
-#: popthelp.c:65 popthelp.c:76
+#: popthelp.c:69 popthelp.c:80
 msgid "Display brief usage message"
 msgstr ""
 
-#: popthelp.c:79
+#: popthelp.c:83
 msgid "Display option defaults in message"
 msgstr ""
 
-#: popthelp.c:124
+#: popthelp.c:128
 msgid "NONE"
 msgstr ""
 
-#: popthelp.c:126
+#: popthelp.c:130
 msgid "VAL"
 msgstr ""
 
-#: popthelp.c:130
+#: popthelp.c:134
 msgid "INT"
 msgstr ""
 
-#: popthelp.c:131
+#: popthelp.c:135
 msgid "LONG"
 msgstr ""
 
-#: popthelp.c:132
+#: popthelp.c:136
 msgid "STRING"
 msgstr ""
 
-#: popthelp.c:133
+#: popthelp.c:137
 msgid "FLOAT"
 msgstr ""
 
-#: popthelp.c:134
+#: popthelp.c:138
 msgid "DOUBLE"
 msgstr ""
 
-#: popthelp.c:135
+#: popthelp.c:139
 msgid "ARG"
 msgstr ""
 
-#: popthelp.c:548
+#: popthelp.c:552
 msgid "Usage:"
 msgstr ""
 
-#: popthelp.c:572
+#: popthelp.c:576
 msgid "[OPTION...]"
 msgstr ""
diff --git a/po/ja.po b/po/ja.po
index df3d2ae..11f1a6a 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -1,117 +1,124 @@
-# SOME DESCRIPTIVE TITLE.
-# Copyright (C) YEAR Free Software Foundation, Inc.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+# rpm ja.po
+# Copyright (C) 2003 Free Software Foundation, Inc.
+# Yukihiro Nakai <ynakai@redhat.com>, 2003
 #
-#, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.3\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-02-29 07:48-0500\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
+"Report-Msgid-Bugs-To: <rpm-devel@lists.dulug.duke.edu>\n"
+"POT-Creation-Date: 2007-01-21 14:25-0500\n"
+"PO-Revision-Date: 2003--8-25 19:00+0900\n"
+"Last-Translator: Yukihiro Nakai <ynakai@redhat.com>\n"
+"Language-Team: Japanese <ja@li.org>\n"
 "MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=CHARSET\n"
-"Content-Transfer-Encoding: ENCODING\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
 
 #: popt.c:35
 msgid "unknown errno"
-msgstr ""
+msgstr "不明なエラー番号"
 
-#: popt.c:964
+#: popt.c:996
 #, c-format
 msgid "option type (%d) not implemented in popt\n"
-msgstr ""
+msgstr "オプションタイプ (%d) はpoptには実装されていません\n"
 
-#: popt.c:1184
+#: popt.c:1208
 msgid "missing argument"
-msgstr ""
+msgstr "引数がありません"
 
-#: popt.c:1186
+#: popt.c:1210
 msgid "unknown option"
-msgstr ""
+msgstr "不明なオプション"
 
-#: popt.c:1188
+#: popt.c:1212
 msgid "mutually exclusive logical operations requested"
-msgstr ""
+msgstr "排他的な悪ぺーレーションが必要です"
 
-#: popt.c:1190
+#: popt.c:1214
 msgid "opt->arg should not be NULL"
-msgstr ""
+msgstr "opt->argはNULLではいけません"
 
-#: popt.c:1192
+#: popt.c:1216
 msgid "aliases nested too deeply"
-msgstr ""
+msgstr "エイリアスのネストが深すぎます"
 
-#: popt.c:1194
+#: popt.c:1218
 msgid "error in parameter quoting"
-msgstr ""
+msgstr "パラメータのクオート付けでエラー"
 
-#: popt.c:1196
+#: popt.c:1220
 msgid "invalid numeric value"
-msgstr ""
+msgstr "不正な数値"
 
-#: popt.c:1198
+#: popt.c:1222
 msgid "number too large or too small"
-msgstr ""
+msgstr "数値が大きすぎるか小さすぎます"
 
-#: popt.c:1200
+#: popt.c:1224
 msgid "memory allocation failed"
-msgstr ""
+msgstr "メモリ確保に失敗しました"
 
-#: popt.c:1204
+#: popt.c:1228
 msgid "unknown error"
-msgstr ""
+msgstr "不明なエラー"
+
+#: popt.h:172
+msgid "Options implemented via popt alias/exec:"
+msgstr "poptのalias/execで実装されているオプション:"
 
-#: popthelp.c:64 popthelp.c:75
+#: popt.h:188
+msgid "Help options:"
+msgstr "ヘルプオプション:"
+
+#: popthelp.c:68 popthelp.c:79
 msgid "Show this help message"
-msgstr ""
+msgstr "このヘルプメッセージを表示します"
 
-#: popthelp.c:65 popthelp.c:76
+#: popthelp.c:69 popthelp.c:80
 msgid "Display brief usage message"
-msgstr ""
+msgstr "使い方の概要を表示します"
 
-#: popthelp.c:79
+#: popthelp.c:83
 msgid "Display option defaults in message"
-msgstr ""
+msgstr "オプションのデフォルト値をメッセージに表示します"
 
-#: popthelp.c:124
+#: popthelp.c:128
 msgid "NONE"
-msgstr ""
+msgstr "なし"
 
-#: popthelp.c:126
+#: popthelp.c:130
 msgid "VAL"
-msgstr ""
+msgstr "値"
 
-#: popthelp.c:130
+#: popthelp.c:134
 msgid "INT"
-msgstr ""
+msgstr "INT"
 
-#: popthelp.c:131
+#: popthelp.c:135
 msgid "LONG"
-msgstr ""
+msgstr "LONG"
 
-#: popthelp.c:132
+#: popthelp.c:136
 msgid "STRING"
-msgstr ""
+msgstr "文字列"
 
-#: popthelp.c:133
+#: popthelp.c:137
 msgid "FLOAT"
-msgstr ""
+msgstr "FLOAT"
 
-#: popthelp.c:134
+#: popthelp.c:138
 msgid "DOUBLE"
-msgstr ""
+msgstr "DOUBLE"
 
-#: popthelp.c:135
+#: popthelp.c:139
 msgid "ARG"
-msgstr ""
+msgstr "ARG"
 
-#: popthelp.c:548
+#: popthelp.c:552
 msgid "Usage:"
-msgstr ""
+msgstr "使い方:"
 
-#: popthelp.c:572
+#: popthelp.c:576
 msgid "[OPTION...]"
-msgstr ""
+msgstr "[オプション...]"
diff --git a/po/ko.po b/po/ko.po
index e50db53..1069aa7 100644
--- a/po/ko.po
+++ b/po/ko.po
@@ -1,8 +1,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-02-29 07:48-0500\n"
+"Report-Msgid-Bugs-To: <rpm-devel@lists.dulug.duke.edu>\n"
+"POT-Creation-Date: 2007-01-21 14:25-0500\n"
 "PO-Revision-Date: 2001-09-06 20:06+0900\n"
 "Last-Translator: Jong-Hoon Ryu <redhat4u@netian.com>\n"
 "Language-Team: GNU Translation project <ko@li.org>\n"
@@ -14,99 +14,107 @@ msgstr ""
 msgid "unknown errno"
 msgstr "�� �� ���� �����ڵ�(errno) �Դϴ�"
 
-#: popt.c:964
+#: popt.c:996
 #, c-format
 msgid "option type (%d) not implemented in popt\n"
 msgstr "�ɼ� ���� (%d)�� popt���� ����� �� �����ϴ�\n"
 
-#: popt.c:1184
+#: popt.c:1208
 msgid "missing argument"
 msgstr "�μ��� �������� �ʾҽ��ϴ�"
 
-#: popt.c:1186
+#: popt.c:1210
 msgid "unknown option"
 msgstr "�� �� ���� �ɼ��Դϴ�"
 
-#: popt.c:1188
+#: popt.c:1212
 msgid "mutually exclusive logical operations requested"
 msgstr "���ʿ� ��Ÿ�� ���� ������ �����Ǿ����ϴ�"
 
-#: popt.c:1190
+#: popt.c:1214
 msgid "opt->arg should not be NULL"
 msgstr "�ɼ�->�μ��� NULL�� �Ǿ�� �ȵ˴ϴ�"
 
-#: popt.c:1192
+#: popt.c:1216
 msgid "aliases nested too deeply"
 msgstr "��Ī(alias)�� �����ϰ� �����Ǿ����ϴ�"
 
-#: popt.c:1194
+#: popt.c:1218
 msgid "error in parameter quoting"
 msgstr "�Ű������� ������ �ֽ��ϴ�"
 
-#: popt.c:1196
+#: popt.c:1220
 msgid "invalid numeric value"
 msgstr "�߸��� ��ġ ���Դϴ�"
 
-#: popt.c:1198
+#: popt.c:1222
 msgid "number too large or too small"
 msgstr "���ڰ� �ʹ� ũ�ų� �ʹ� �����ϴ�"
 
-#: popt.c:1200
+#: popt.c:1224
 msgid "memory allocation failed"
 msgstr "�޸� �Ҵ翡 �����߽��ϴ�"
 
-#: popt.c:1204
+#: popt.c:1228
 msgid "unknown error"
 msgstr "�� �� ���� �����Դϴ�"
 
-#: popthelp.c:64 popthelp.c:75
+#: popt.h:172
+msgid "Options implemented via popt alias/exec:"
+msgstr ""
+
+#: popt.h:188
+msgid "Help options:"
+msgstr ""
+
+#: popthelp.c:68 popthelp.c:79
 msgid "Show this help message"
 msgstr "�� ������ �����ݴϴ�"
 
-#: popthelp.c:65 popthelp.c:76
+#: popthelp.c:69 popthelp.c:80
 msgid "Display brief usage message"
 msgstr "������ ������ �����ݴϴ�"
 
-#: popthelp.c:79
+#: popthelp.c:83
 msgid "Display option defaults in message"
 msgstr "�⺻���� �ɼ��� �����ݴϴ�"
 
-#: popthelp.c:124
+#: popthelp.c:128
 msgid "NONE"
 msgstr "����(NONE)"
 
-#: popthelp.c:126
+#: popthelp.c:130
 msgid "VAL"
 msgstr "��(VAL)"
 
-#: popthelp.c:130
+#: popthelp.c:134
 msgid "INT"
 msgstr "����(INT)"
 
-#: popthelp.c:131
+#: popthelp.c:135
 msgid "LONG"
 msgstr "����(LONG)"
 
-#: popthelp.c:132
+#: popthelp.c:136
 msgid "STRING"
 msgstr "���ڿ�(STRING)"
 
-#: popthelp.c:133
+#: popthelp.c:137
 msgid "FLOAT"
 msgstr "�Ҽ�(FLOAT)"
 
-#: popthelp.c:134
+#: popthelp.c:138
 msgid "DOUBLE"
 msgstr "�Ҽ�(DOUBLE)"
 
-#: popthelp.c:135
+#: popthelp.c:139
 msgid "ARG"
 msgstr "�μ�(ARG)"
 
-#: popthelp.c:548
+#: popthelp.c:552
 msgid "Usage:"
 msgstr "����:"
 
-#: popthelp.c:572
+#: popthelp.c:576
 msgid "[OPTION...]"
 msgstr "[�ɼ�...]"
diff --git a/po/no.po b/po/no.po
index 3872b99..c281df7 100644
--- a/po/no.po
+++ b/po/no.po
@@ -1,8 +1,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.3\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-02-29 07:48-0500\n"
+"Report-Msgid-Bugs-To: <rpm-devel@lists.dulug.duke.edu>\n"
+"POT-Creation-Date: 2007-01-21 14:25-0500\n"
 "PO-Revision-Date: 2001-06-27 11:05+0200\n"
 "Last-Translator: Kjartan Maraas <kmaraas@online.no>\n"
 "Language-Team: Norwegian <no@li.org>\n"
@@ -14,99 +14,107 @@ msgstr ""
 msgid "unknown errno"
 msgstr "ukjent errno"
 
-#: popt.c:964
+#: popt.c:996
 #, c-format
 msgid "option type (%d) not implemented in popt\n"
 msgstr "flaggtype (%d) ikke implementert i popt\n"
 
-#: popt.c:1184
+#: popt.c:1208
 msgid "missing argument"
 msgstr "manglende argument"
 
-#: popt.c:1186
+#: popt.c:1210
 msgid "unknown option"
 msgstr "ukjent flagg"
 
-#: popt.c:1188
+#: popt.c:1212
 msgid "mutually exclusive logical operations requested"
 msgstr "gjensidig eksluderende logiske operasjoner forespurt"
 
-#: popt.c:1190
+#: popt.c:1214
 msgid "opt->arg should not be NULL"
 msgstr "opt->arg m� ikke v�re NULL"
 
-#: popt.c:1192
+#: popt.c:1216
 msgid "aliases nested too deeply"
 msgstr "aliaser med for dype l�kker"
 
-#: popt.c:1194
+#: popt.c:1218
 msgid "error in parameter quoting"
 msgstr "feil i parametersitering"
 
-#: popt.c:1196
+#: popt.c:1220
 msgid "invalid numeric value"
 msgstr "ugyldig numerisk verdi"
 
-#: popt.c:1198
+#: popt.c:1222
 msgid "number too large or too small"
 msgstr "tallet er for stort eller lite"
 
-#: popt.c:1200
+#: popt.c:1224
 msgid "memory allocation failed"
 msgstr "minneallokering feilet"
 
-#: popt.c:1204
+#: popt.c:1228
 msgid "unknown error"
 msgstr "ukjent feil"
 
-#: popthelp.c:64 popthelp.c:75
+#: popt.h:172
+msgid "Options implemented via popt alias/exec:"
+msgstr ""
+
+#: popt.h:188
+msgid "Help options:"
+msgstr ""
+
+#: popthelp.c:68 popthelp.c:79
 msgid "Show this help message"
 msgstr "Vis denne hjelpmeldingen"
 
-#: popthelp.c:65 popthelp.c:76
+#: popthelp.c:69 popthelp.c:80
 msgid "Display brief usage message"
 msgstr "Vis kort bruksmelding"
 
-#: popthelp.c:79
+#: popthelp.c:83
 msgid "Display option defaults in message"
 msgstr "Vis forvalgte flagg i melding"
 
-#: popthelp.c:124
+#: popthelp.c:128
 msgid "NONE"
 msgstr "INGEN"
 
-#: popthelp.c:126
+#: popthelp.c:130
 msgid "VAL"
 msgstr "VERDI"
 
-#: popthelp.c:130
+#: popthelp.c:134
 msgid "INT"
 msgstr "HELTALL"
 
-#: popthelp.c:131
+#: popthelp.c:135
 msgid "LONG"
 msgstr "LONG"
 
-#: popthelp.c:132
+#: popthelp.c:136
 msgid "STRING"
 msgstr "STRENG"
 
-#: popthelp.c:133
+#: popthelp.c:137
 msgid "FLOAT"
 msgstr "FLYTTALL"
 
-#: popthelp.c:134
+#: popthelp.c:138
 msgid "DOUBLE"
 msgstr "DOUBLE"
 
-#: popthelp.c:135
+#: popthelp.c:139
 msgid "ARG"
 msgstr "ARG"
 
-#: popthelp.c:548
+#: popthelp.c:552
 msgid "Usage:"
 msgstr "Bruk:"
 
-#: popthelp.c:572
+#: popthelp.c:576
 msgid "[OPTION...]"
 msgstr "[FLAGG...]"
diff --git a/po/pl.po b/po/pl.po
index c2c9032..c3ffcc3 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -5,8 +5,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.9-20030515\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-02-29 07:48-0500\n"
+"Report-Msgid-Bugs-To: <rpm-devel@lists.dulug.duke.edu>\n"
+"POT-Creation-Date: 2007-01-21 14:25-0500\n"
 "PO-Revision-Date: 2003-06-08 20:32+0200\n"
 "Last-Translator: Jakub Bogusz <qboosh@pld.org.pl>\n"
 "Language-Team: Polish <translation-team-pl@lists.sourceforge.net>\n"
@@ -18,105 +18,107 @@ msgstr ""
 msgid "unknown errno"
 msgstr "nieznane errno"
 
-#: popt.c:964
+#: popt.c:996
 #, c-format
 msgid "option type (%d) not implemented in popt\n"
 msgstr "rodzaj opcji (%d) nie zaimplementowany w popt\n"
 
-#: popt.c:1184
+#: popt.c:1208
 msgid "missing argument"
 msgstr "brak parametru"
 
-#: popt.c:1186
+#: popt.c:1210
 msgid "unknown option"
 msgstr "nieznana opcja"
 
-#: popt.c:1188
+#: popt.c:1212
 msgid "mutually exclusive logical operations requested"
 msgstr "��danie wykluczaj�cych si� operacji"
 
-#: popt.c:1190
+#: popt.c:1214
 msgid "opt->arg should not be NULL"
 msgstr "opt->arg nie mo�e by� NULL"
 
-#: popt.c:1192
+#: popt.c:1216
 msgid "aliases nested too deeply"
 msgstr "zbyt du�e zag��bienie alias�w"
 
-#: popt.c:1194
+#: popt.c:1218
 msgid "error in parameter quoting"
 msgstr "b��d w cytowaniu parametru"
 
-#: popt.c:1196
+#: popt.c:1220
 msgid "invalid numeric value"
 msgstr "b��dna warto�� liczbowa"
 
-#: popt.c:1198
+#: popt.c:1222
 msgid "number too large or too small"
 msgstr "liczba zbyt du�a lub zbyt ma�a"
 
-#: popt.c:1200
+#: popt.c:1224
 msgid "memory allocation failed"
 msgstr "b��d alokacji pami�ci"
 
-#: popt.c:1204
+#: popt.c:1228
 msgid "unknown error"
 msgstr "nieznany b��d"
 
-#: popthelp.c:64 popthelp.c:75
+#: popt.h:172
+msgid "Options implemented via popt alias/exec:"
+msgstr "Opcje zaimplementowane poprzez popt alias/exec:"
+
+#: popt.h:188
+msgid "Help options:"
+msgstr "Opcje pomocy:"
+
+#: popthelp.c:68 popthelp.c:79
 msgid "Show this help message"
 msgstr "Poka� t� pomoc"
 
-#: popthelp.c:65 popthelp.c:76
+#: popthelp.c:69 popthelp.c:80
 msgid "Display brief usage message"
 msgstr "Wy�wietl skr�cony spos�b u�ycia"
 
-#: popthelp.c:79
+#: popthelp.c:83
 msgid "Display option defaults in message"
 msgstr "Wy�wietl domy�lne opcje w opisie"
 
-#: popthelp.c:124
+#: popthelp.c:128
 msgid "NONE"
 msgstr "BRAK"
 
-#: popthelp.c:126
+#: popthelp.c:130
 msgid "VAL"
 msgstr "WART"
 
-#: popthelp.c:130
+#: popthelp.c:134
 msgid "INT"
 msgstr "INT"
 
-#: popthelp.c:131
+#: popthelp.c:135
 msgid "LONG"
 msgstr "LONG"
 
-#: popthelp.c:132
+#: popthelp.c:136
 msgid "STRING"
 msgstr "�A�CUCH"
 
-#: popthelp.c:133
+#: popthelp.c:137
 msgid "FLOAT"
 msgstr "FLOAT"
 
-#: popthelp.c:134
+#: popthelp.c:138
 msgid "DOUBLE"
 msgstr "DOUBLE"
 
-#: popthelp.c:135
+#: popthelp.c:139
 msgid "ARG"
 msgstr "PARAM"
 
-#: popthelp.c:548
+#: popthelp.c:552
 msgid "Usage:"
 msgstr "Sk�adnia:"
 
-#: popthelp.c:572
+#: popthelp.c:576
 msgid "[OPTION...]"
 msgstr "[OPCJA...]"
-
-#~ msgid "Options implemented via popt alias/exec:"
-#~ msgstr "Opcje zaimplementowane poprzez popt alias/exec:"
-
-#~ msgid "Help options:"
-#~ msgstr "Opcje pomocy:"
diff --git a/po/popt.pot b/po/popt.pot
index 670c404..8017da4 100644
--- a/po/popt.pot
+++ b/po/popt.pot
@@ -1,13 +1,13 @@
 # SOME DESCRIPTIVE TITLE.
-# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
-# This file is distributed under the same license as the PACKAGE package.
+# This file is put in the public domain.
 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 #
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2004-02-29 07:48-0500\n"
+"Report-Msgid-Bugs-To: <rpm-devel@lists.dulug.duke.edu>\n"
+"POT-Creation-Date: 2007-01-21 14:25-0500\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -19,99 +19,107 @@ msgstr ""
 msgid "unknown errno"
 msgstr ""
 
-#: popt.c:964
+#: popt.c:996
 #, c-format
 msgid "option type (%d) not implemented in popt\n"
 msgstr ""
 
-#: popt.c:1184
+#: popt.c:1208
 msgid "missing argument"
 msgstr ""
 
-#: popt.c:1186
+#: popt.c:1210
 msgid "unknown option"
 msgstr ""
 
-#: popt.c:1188
+#: popt.c:1212
 msgid "mutually exclusive logical operations requested"
 msgstr ""
 
-#: popt.c:1190
+#: popt.c:1214
 msgid "opt->arg should not be NULL"
 msgstr ""
 
-#: popt.c:1192
+#: popt.c:1216
 msgid "aliases nested too deeply"
 msgstr ""
 
-#: popt.c:1194
+#: popt.c:1218
 msgid "error in parameter quoting"
 msgstr ""
 
-#: popt.c:1196
+#: popt.c:1220
 msgid "invalid numeric value"
 msgstr ""
 
-#: popt.c:1198
+#: popt.c:1222
 msgid "number too large or too small"
 msgstr ""
 
-#: popt.c:1200
+#: popt.c:1224
 msgid "memory allocation failed"
 msgstr ""
 
-#: popt.c:1204
+#: popt.c:1228
 msgid "unknown error"
 msgstr ""
 
-#: popthelp.c:64 popthelp.c:75
+#: popt.h:172
+msgid "Options implemented via popt alias/exec:"
+msgstr ""
+
+#: popt.h:188
+msgid "Help options:"
+msgstr ""
+
+#: popthelp.c:68 popthelp.c:79
 msgid "Show this help message"
 msgstr ""
 
-#: popthelp.c:65 popthelp.c:76
+#: popthelp.c:69 popthelp.c:80
 msgid "Display brief usage message"
 msgstr ""
 
-#: popthelp.c:79
+#: popthelp.c:83
 msgid "Display option defaults in message"
 msgstr ""
 
-#: popthelp.c:124
+#: popthelp.c:128
 msgid "NONE"
 msgstr ""
 
-#: popthelp.c:126
+#: popthelp.c:130
 msgid "VAL"
 msgstr ""
 
-#: popthelp.c:130
+#: popthelp.c:134
 msgid "INT"
 msgstr ""
 
-#: popthelp.c:131
+#: popthelp.c:135
 msgid "LONG"
 msgstr ""
 
-#: popthelp.c:132
+#: popthelp.c:136
 msgid "STRING"
 msgstr ""
 
-#: popthelp.c:133
+#: popthelp.c:137
 msgid "FLOAT"
 msgstr ""
 
-#: popthelp.c:134
+#: popthelp.c:138
 msgid "DOUBLE"
 msgstr ""
 
-#: popthelp.c:135
+#: popthelp.c:139
 msgid "ARG"
 msgstr ""
 
-#: popthelp.c:548
+#: popthelp.c:552
 msgid "Usage:"
 msgstr ""
 
-#: popthelp.c:572
+#: popthelp.c:576
 msgid "[OPTION...]"
 msgstr ""
diff --git a/po/pt.po b/po/pt.po
index ecd8a3b..017e3f9 100644
--- a/po/pt.po
+++ b/po/pt.po
@@ -1,8 +1,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-02-29 07:48-0500\n"
+"Report-Msgid-Bugs-To: <rpm-devel@lists.dulug.duke.edu>\n"
+"POT-Creation-Date: 2007-01-21 14:25-0500\n"
 "PO-Revision-Date: 2002-02-13 18:32+0000\n"
 "Last-Translator: Pedro Morais <morais@kde.org>\n"
 "Language-Team: pt <morais@kde.org>\n"
@@ -14,99 +14,107 @@ msgstr ""
 msgid "unknown errno"
 msgstr "errno desconhecido"
 
-#: popt.c:964
+#: popt.c:996
 #, c-format
 msgid "option type (%d) not implemented in popt\n"
 msgstr "tipo de op��o (%d) n�o implementado no popt\n"
 
-#: popt.c:1184
+#: popt.c:1208
 msgid "missing argument"
 msgstr "falta um argumento"
 
-#: popt.c:1186
+#: popt.c:1210
 msgid "unknown option"
 msgstr "op��o desconhecida"
 
-#: popt.c:1188
+#: popt.c:1212
 msgid "mutually exclusive logical operations requested"
 msgstr "foram pedidas opera��es l�gicas mutuamente exclusivas"
 
-#: popt.c:1190
+#: popt.c:1214
 msgid "opt->arg should not be NULL"
 msgstr "opt->arg n�o deve ser NULL"
 
-#: popt.c:1192
+#: popt.c:1216
 msgid "aliases nested too deeply"
 msgstr "'aliases' demasiado aninhados"
 
-#: popt.c:1194
+#: popt.c:1218
 msgid "error in parameter quoting"
 msgstr "erros no 'quoting' de par�metros"
 
-#: popt.c:1196
+#: popt.c:1220
 msgid "invalid numeric value"
 msgstr "valor n�merico inv�lido"
 
-#: popt.c:1198
+#: popt.c:1222
 msgid "number too large or too small"
 msgstr "n�mero demasiado grando ou pequeno"
 
-#: popt.c:1200
+#: popt.c:1224
 msgid "memory allocation failed"
 msgstr "aloca��o de mem�ria falhou"
 
-#: popt.c:1204
+#: popt.c:1228
 msgid "unknown error"
 msgstr "erro desconhecido"
 
-#: popthelp.c:64 popthelp.c:75
+#: popt.h:172
+msgid "Options implemented via popt alias/exec:"
+msgstr ""
+
+#: popt.h:188
+msgid "Help options:"
+msgstr ""
+
+#: popthelp.c:68 popthelp.c:79
 msgid "Show this help message"
 msgstr "Mostrar esta mensagem de ajuda"
 
-#: popthelp.c:65 popthelp.c:76
+#: popthelp.c:69 popthelp.c:80
 msgid "Display brief usage message"
 msgstr "Mostrar uma mensagem de utiliza��o sucinta"
 
-#: popthelp.c:79
+#: popthelp.c:83
 msgid "Display option defaults in message"
 msgstr "Mostrar valor por omiss�o das op��es na mensagem"
 
-#: popthelp.c:124
+#: popthelp.c:128
 msgid "NONE"
 msgstr "NONE"
 
-#: popthelp.c:126
+#: popthelp.c:130
 msgid "VAL"
 msgstr "VAL"
 
-#: popthelp.c:130
+#: popthelp.c:134
 msgid "INT"
 msgstr "INT"
 
-#: popthelp.c:131
+#: popthelp.c:135
 msgid "LONG"
 msgstr "LONG"
 
-#: popthelp.c:132
+#: popthelp.c:136
 msgid "STRING"
 msgstr "STRING"
 
-#: popthelp.c:133
+#: popthelp.c:137
 msgid "FLOAT"
 msgstr "FLOAT"
 
-#: popthelp.c:134
+#: popthelp.c:138
 msgid "DOUBLE"
 msgstr "DOUBLE"
 
-#: popthelp.c:135
+#: popthelp.c:139
 msgid "ARG"
 msgstr "ARG"
 
-#: popthelp.c:548
+#: popthelp.c:552
 msgid "Usage:"
 msgstr "Utiliza��o:"
 
-#: popthelp.c:572
+#: popthelp.c:576
 msgid "[OPTION...]"
 msgstr "[OP��O...]"
diff --git a/po/pt_BR.po b/po/pt_BR.po
index df3d2ae..78ab7a1 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -6,112 +6,120 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.3\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-02-29 07:48-0500\n"
+"Report-Msgid-Bugs-To: <rpm-devel@lists.dulug.duke.edu>\n"
+"POT-Creation-Date: 2007-01-21 14:25-0500\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=CHARSET\n"
+"Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: ENCODING\n"
 
 #: popt.c:35
 msgid "unknown errno"
 msgstr ""
 
-#: popt.c:964
+#: popt.c:996
 #, c-format
 msgid "option type (%d) not implemented in popt\n"
 msgstr ""
 
-#: popt.c:1184
+#: popt.c:1208
 msgid "missing argument"
 msgstr ""
 
-#: popt.c:1186
+#: popt.c:1210
 msgid "unknown option"
 msgstr ""
 
-#: popt.c:1188
+#: popt.c:1212
 msgid "mutually exclusive logical operations requested"
 msgstr ""
 
-#: popt.c:1190
+#: popt.c:1214
 msgid "opt->arg should not be NULL"
 msgstr ""
 
-#: popt.c:1192
+#: popt.c:1216
 msgid "aliases nested too deeply"
 msgstr ""
 
-#: popt.c:1194
+#: popt.c:1218
 msgid "error in parameter quoting"
 msgstr ""
 
-#: popt.c:1196
+#: popt.c:1220
 msgid "invalid numeric value"
 msgstr ""
 
-#: popt.c:1198
+#: popt.c:1222
 msgid "number too large or too small"
 msgstr ""
 
-#: popt.c:1200
+#: popt.c:1224
 msgid "memory allocation failed"
 msgstr ""
 
-#: popt.c:1204
+#: popt.c:1228
 msgid "unknown error"
 msgstr ""
 
-#: popthelp.c:64 popthelp.c:75
+#: popt.h:172
+msgid "Options implemented via popt alias/exec:"
+msgstr ""
+
+#: popt.h:188
+msgid "Help options:"
+msgstr ""
+
+#: popthelp.c:68 popthelp.c:79
 msgid "Show this help message"
 msgstr ""
 
-#: popthelp.c:65 popthelp.c:76
+#: popthelp.c:69 popthelp.c:80
 msgid "Display brief usage message"
 msgstr ""
 
-#: popthelp.c:79
+#: popthelp.c:83
 msgid "Display option defaults in message"
 msgstr ""
 
-#: popthelp.c:124
+#: popthelp.c:128
 msgid "NONE"
 msgstr ""
 
-#: popthelp.c:126
+#: popthelp.c:130
 msgid "VAL"
 msgstr ""
 
-#: popthelp.c:130
+#: popthelp.c:134
 msgid "INT"
 msgstr ""
 
-#: popthelp.c:131
+#: popthelp.c:135
 msgid "LONG"
 msgstr ""
 
-#: popthelp.c:132
+#: popthelp.c:136
 msgid "STRING"
 msgstr ""
 
-#: popthelp.c:133
+#: popthelp.c:137
 msgid "FLOAT"
 msgstr ""
 
-#: popthelp.c:134
+#: popthelp.c:138
 msgid "DOUBLE"
 msgstr ""
 
-#: popthelp.c:135
+#: popthelp.c:139
 msgid "ARG"
 msgstr ""
 
-#: popthelp.c:548
+#: popthelp.c:552
 msgid "Usage:"
 msgstr ""
 
-#: popthelp.c:572
+#: popthelp.c:576
 msgid "[OPTION...]"
 msgstr ""
diff --git a/po/ro.po b/po/ro.po
index 83f7976..9e182fe 100644
--- a/po/ro.po
+++ b/po/ro.po
@@ -1,8 +1,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.3\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-02-29 07:48-0500\n"
+"Report-Msgid-Bugs-To: <rpm-devel@lists.dulug.duke.edu>\n"
+"POT-Creation-Date: 2007-01-21 14:25-0500\n"
 "PO-Revision-Date: 2000-06-14 23:23+EST\n"
 "Last-Translator: Cristian Gafton <gafton@redhat.com>\n"
 "Language-Team: Romanian <ro@li.org>\n"
@@ -14,101 +14,109 @@ msgstr ""
 msgid "unknown errno"
 msgstr "eroare necunoscuta"
 
-#: popt.c:964
+#: popt.c:996
 #, c-format
 msgid "option type (%d) not implemented in popt\n"
 msgstr "optiunea de tipul (%d) nu este implementata in popt\n"
 
-#: popt.c:1184
+#: popt.c:1208
 msgid "missing argument"
 msgstr "argument lipsa"
 
-#: popt.c:1186
+#: popt.c:1210
 msgid "unknown option"
 msgstr "optiune necunoscuta"
 
-#: popt.c:1188
+#: popt.c:1212
 msgid "mutually exclusive logical operations requested"
 msgstr ""
 
-#: popt.c:1190
+#: popt.c:1214
 msgid "opt->arg should not be NULL"
 msgstr ""
 
-#: popt.c:1192
+#: popt.c:1216
 msgid "aliases nested too deeply"
 msgstr "recursivitate infinita la optiunile sinonime"
 
-#: popt.c:1194
+#: popt.c:1218
 #, fuzzy
 msgid "error in parameter quoting"
 msgstr "eroare la insertie parametru"
 
-#: popt.c:1196
+#: popt.c:1220
 msgid "invalid numeric value"
 msgstr "valoare numarica invalida"
 
-#: popt.c:1198
+#: popt.c:1222
 msgid "number too large or too small"
 msgstr "numar prea mare sau prea mic"
 
-#: popt.c:1200
+#: popt.c:1224
 msgid "memory allocation failed"
 msgstr ""
 
-#: popt.c:1204
+#: popt.c:1228
 msgid "unknown error"
 msgstr "eroare necuinoscuta"
 
-#: popthelp.c:64 popthelp.c:75
+#: popt.h:172
+msgid "Options implemented via popt alias/exec:"
+msgstr ""
+
+#: popt.h:188
+msgid "Help options:"
+msgstr ""
+
+#: popthelp.c:68 popthelp.c:79
 msgid "Show this help message"
 msgstr "Afisare mesaj de help"
 
-#: popthelp.c:65 popthelp.c:76
+#: popthelp.c:69 popthelp.c:80
 msgid "Display brief usage message"
 msgstr "Afisare mesaj sintaxa sumar"
 
-#: popthelp.c:79
+#: popthelp.c:83
 #, fuzzy
 msgid "Display option defaults in message"
 msgstr "Afisare mesaj sintaxa sumar"
 
-#: popthelp.c:124
+#: popthelp.c:128
 msgid "NONE"
 msgstr ""
 
-#: popthelp.c:126
+#: popthelp.c:130
 msgid "VAL"
 msgstr ""
 
-#: popthelp.c:130
+#: popthelp.c:134
 msgid "INT"
 msgstr ""
 
-#: popthelp.c:131
+#: popthelp.c:135
 msgid "LONG"
 msgstr ""
 
-#: popthelp.c:132
+#: popthelp.c:136
 msgid "STRING"
 msgstr ""
 
-#: popthelp.c:133
+#: popthelp.c:137
 msgid "FLOAT"
 msgstr ""
 
-#: popthelp.c:134
+#: popthelp.c:138
 msgid "DOUBLE"
 msgstr ""
 
-#: popthelp.c:135
+#: popthelp.c:139
 msgid "ARG"
 msgstr ""
 
-#: popthelp.c:548
+#: popthelp.c:552
 msgid "Usage:"
 msgstr "Sintaxa:"
 
-#: popthelp.c:572
+#: popthelp.c:576
 msgid "[OPTION...]"
 msgstr "[OPTIUNE...]"
diff --git a/po/ru.po b/po/ru.po
index 728df7d..bd77409 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -1,8 +1,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.3\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-02-29 07:48-0500\n"
+"Report-Msgid-Bugs-To: <rpm-devel@lists.dulug.duke.edu>\n"
+"POT-Creation-Date: 2007-01-21 14:25-0500\n"
 "PO-Revision-Date: 2001-07-05 21:00-0500\n"
 "Last-Translator: Eugene Kanter <eugene@blackcatlinux.com>\n"
 "Language-Team: Black Cat Linux Team <blackcat-support@blackcatlinux.com>\n"
@@ -14,99 +14,107 @@ msgstr ""
 msgid "unknown errno"
 msgstr "����������� ����� ������"
 
-#: popt.c:964
+#: popt.c:996
 #, c-format
 msgid "option type (%d) not implemented in popt\n"
 msgstr "��������� ��������� (%d) � popt �� �������������\n"
 
-#: popt.c:1184
+#: popt.c:1208
 msgid "missing argument"
 msgstr "�������� ��������"
 
-#: popt.c:1186
+#: popt.c:1210
 msgid "unknown option"
 msgstr "����������� ��������"
 
-#: popt.c:1188
+#: popt.c:1212
 msgid "mutually exclusive logical operations requested"
 msgstr "��������� ������� ����������� ���������� ��������"
 
-#: popt.c:1190
+#: popt.c:1214
 msgid "opt->arg should not be NULL"
 msgstr "opt->arg �� ����� ���� NULL"
 
-#: popt.c:1192
+#: popt.c:1216
 msgid "aliases nested too deeply"
 msgstr "�������� ������� ���������� �������� �����������"
 
-#: popt.c:1194
+#: popt.c:1218
 msgid "error in parameter quoting"
 msgstr "�����a ��������� ���������� � �������"
 
-#: popt.c:1196
+#: popt.c:1220
 msgid "invalid numeric value"
 msgstr "������������ �������� ��������"
 
-#: popt.c:1198
+#: popt.c:1222
 msgid "number too large or too small"
 msgstr "�������� �������� �� ��������� ����������������"
 
-#: popt.c:1200
+#: popt.c:1224
 msgid "memory allocation failed"
 msgstr "������ ��������� ������"
 
-#: popt.c:1204
+#: popt.c:1228
 msgid "unknown error"
 msgstr "����������� ������"
 
-#: popthelp.c:64 popthelp.c:75
+#: popt.h:172
+msgid "Options implemented via popt alias/exec:"
+msgstr ""
+
+#: popt.h:188
+msgid "Help options:"
+msgstr ""
+
+#: popthelp.c:68 popthelp.c:79
 msgid "Show this help message"
 msgstr "�������� ��� ���������"
 
-#: popthelp.c:65 popthelp.c:76
+#: popthelp.c:69 popthelp.c:80
 msgid "Display brief usage message"
 msgstr "�������� ������� ���������� �� �������������"
 
-#: popthelp.c:79
+#: popthelp.c:83
 msgid "Display option defaults in message"
 msgstr "�������� ��������� �� ���������"
 
-#: popthelp.c:124
+#: popthelp.c:128
 msgid "NONE"
 msgstr "NONE"
 
-#: popthelp.c:126
+#: popthelp.c:130
 msgid "VAL"
 msgstr "VAL"
 
-#: popthelp.c:130
+#: popthelp.c:134
 msgid "INT"
 msgstr "INT"
 
-#: popthelp.c:131
+#: popthelp.c:135
 msgid "LONG"
 msgstr "LONG"
 
-#: popthelp.c:132
+#: popthelp.c:136
 msgid "STRING"
 msgstr "STRING"
 
-#: popthelp.c:133
+#: popthelp.c:137
 msgid "FLOAT"
 msgstr "FLOAT"
 
-#: popthelp.c:134
+#: popthelp.c:138
 msgid "DOUBLE"
 msgstr "DOUBLE"
 
-#: popthelp.c:135
+#: popthelp.c:139
 msgid "ARG"
 msgstr "ARG"
 
-#: popthelp.c:548
+#: popthelp.c:552
 msgid "Usage:"
 msgstr "�������������:"
 
-#: popthelp.c:572
+#: popthelp.c:576
 msgid "[OPTION...]"
 msgstr "[��������...]"
diff --git a/po/sk.po b/po/sk.po
index aa48f9d..714a768 100644
--- a/po/sk.po
+++ b/po/sk.po
@@ -5,8 +5,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.3\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-02-29 07:48-0500\n"
+"Report-Msgid-Bugs-To: <rpm-devel@lists.dulug.duke.edu>\n"
+"POT-Creation-Date: 2007-01-21 14:25-0500\n"
 "PO-Revision-Date: 1999-08-04 21:40+0200\n"
 "Last-Translator: Stanislav Meduna <stano@eunet.sk>\n"
 "Language-Team: Slovak <sk-i18n@rak.isternet.sk>\n"
@@ -18,100 +18,108 @@ msgstr ""
 msgid "unknown errno"
 msgstr ""
 
-#: popt.c:964
+#: popt.c:996
 #, c-format
 msgid "option type (%d) not implemented in popt\n"
 msgstr ""
 
-#: popt.c:1184
+#: popt.c:1208
 msgid "missing argument"
 msgstr ""
 
-#: popt.c:1186
+#: popt.c:1210
 msgid "unknown option"
 msgstr ""
 
-#: popt.c:1188
+#: popt.c:1212
 msgid "mutually exclusive logical operations requested"
 msgstr ""
 
-#: popt.c:1190
+#: popt.c:1214
 msgid "opt->arg should not be NULL"
 msgstr ""
 
-#: popt.c:1192
+#: popt.c:1216
 msgid "aliases nested too deeply"
 msgstr ""
 
-#: popt.c:1194
+#: popt.c:1218
 msgid "error in parameter quoting"
 msgstr ""
 
-#: popt.c:1196
+#: popt.c:1220
 msgid "invalid numeric value"
 msgstr ""
 
-#: popt.c:1198
+#: popt.c:1222
 msgid "number too large or too small"
 msgstr ""
 
-#: popt.c:1200
+#: popt.c:1224
 msgid "memory allocation failed"
 msgstr ""
 
-#: popt.c:1204
+#: popt.c:1228
 msgid "unknown error"
 msgstr ""
 
-#: popthelp.c:64 popthelp.c:75
+#: popt.h:172
+msgid "Options implemented via popt alias/exec:"
+msgstr ""
+
+#: popt.h:188
+msgid "Help options:"
+msgstr ""
+
+#: popthelp.c:68 popthelp.c:79
 msgid "Show this help message"
 msgstr "Vyp�sa� t�to spr�vu"
 
-#: popthelp.c:65 popthelp.c:76
+#: popthelp.c:69 popthelp.c:80
 msgid "Display brief usage message"
 msgstr "Zobrazi� stru�n� n�vod na pou�itie"
 
-#: popthelp.c:79
+#: popthelp.c:83
 #, fuzzy
 msgid "Display option defaults in message"
 msgstr "Zobrazi� stru�n� n�vod na pou�itie"
 
-#: popthelp.c:124
+#: popthelp.c:128
 msgid "NONE"
 msgstr ""
 
-#: popthelp.c:126
+#: popthelp.c:130
 msgid "VAL"
 msgstr ""
 
-#: popthelp.c:130
+#: popthelp.c:134
 msgid "INT"
 msgstr ""
 
-#: popthelp.c:131
+#: popthelp.c:135
 msgid "LONG"
 msgstr ""
 
-#: popthelp.c:132
+#: popthelp.c:136
 msgid "STRING"
 msgstr ""
 
-#: popthelp.c:133
+#: popthelp.c:137
 msgid "FLOAT"
 msgstr ""
 
-#: popthelp.c:134
+#: popthelp.c:138
 msgid "DOUBLE"
 msgstr ""
 
-#: popthelp.c:135
+#: popthelp.c:139
 msgid "ARG"
 msgstr ""
 
-#: popthelp.c:548
+#: popthelp.c:552
 msgid "Usage:"
 msgstr ""
 
-#: popthelp.c:572
+#: popthelp.c:576
 msgid "[OPTION...]"
 msgstr ""
diff --git a/po/sl.po b/po/sl.po
index 65d6260..54c0370 100644
--- a/po/sl.po
+++ b/po/sl.po
@@ -1,8 +1,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.3\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-02-29 07:48-0500\n"
+"Report-Msgid-Bugs-To: <rpm-devel@lists.dulug.duke.edu>\n"
+"POT-Creation-Date: 2007-01-21 14:25-0500\n"
 "PO-Revision-Date: 2000-09-05 12:30+0200\n"
 "Last-Translator: Roman Maurer <roman.maurer@hermes.si>\n"
 "Language-Team: Slovenian <sl@li.org>\n"
@@ -14,100 +14,108 @@ msgstr ""
 msgid "unknown errno"
 msgstr ""
 
-#: popt.c:964
+#: popt.c:996
 #, c-format
 msgid "option type (%d) not implemented in popt\n"
 msgstr ""
 
-#: popt.c:1184
+#: popt.c:1208
 msgid "missing argument"
 msgstr ""
 
-#: popt.c:1186
+#: popt.c:1210
 msgid "unknown option"
 msgstr ""
 
-#: popt.c:1188
+#: popt.c:1212
 msgid "mutually exclusive logical operations requested"
 msgstr ""
 
-#: popt.c:1190
+#: popt.c:1214
 msgid "opt->arg should not be NULL"
 msgstr ""
 
-#: popt.c:1192
+#: popt.c:1216
 msgid "aliases nested too deeply"
 msgstr ""
 
-#: popt.c:1194
+#: popt.c:1218
 msgid "error in parameter quoting"
 msgstr ""
 
-#: popt.c:1196
+#: popt.c:1220
 msgid "invalid numeric value"
 msgstr ""
 
-#: popt.c:1198
+#: popt.c:1222
 msgid "number too large or too small"
 msgstr ""
 
-#: popt.c:1200
+#: popt.c:1224
 msgid "memory allocation failed"
 msgstr ""
 
-#: popt.c:1204
+#: popt.c:1228
 msgid "unknown error"
 msgstr ""
 
-#: popthelp.c:64 popthelp.c:75
+#: popt.h:172
+msgid "Options implemented via popt alias/exec:"
+msgstr ""
+
+#: popt.h:188
+msgid "Help options:"
+msgstr ""
+
+#: popthelp.c:68 popthelp.c:79
 msgid "Show this help message"
 msgstr "Prika�i to sporo�ilo s pomo�jo"
 
-#: popthelp.c:65 popthelp.c:76
+#: popthelp.c:69 popthelp.c:80
 msgid "Display brief usage message"
 msgstr "Prika�i kratko sporo�ilo o uporabi"
 
-#: popthelp.c:79
+#: popthelp.c:83
 #, fuzzy
 msgid "Display option defaults in message"
 msgstr "Prika�i kratko sporo�ilo o uporabi"
 
-#: popthelp.c:124
+#: popthelp.c:128
 msgid "NONE"
 msgstr ""
 
-#: popthelp.c:126
+#: popthelp.c:130
 msgid "VAL"
 msgstr ""
 
-#: popthelp.c:130
+#: popthelp.c:134
 msgid "INT"
 msgstr ""
 
-#: popthelp.c:131
+#: popthelp.c:135
 msgid "LONG"
 msgstr ""
 
-#: popthelp.c:132
+#: popthelp.c:136
 msgid "STRING"
 msgstr ""
 
-#: popthelp.c:133
+#: popthelp.c:137
 msgid "FLOAT"
 msgstr ""
 
-#: popthelp.c:134
+#: popthelp.c:138
 msgid "DOUBLE"
 msgstr ""
 
-#: popthelp.c:135
+#: popthelp.c:139
 msgid "ARG"
 msgstr ""
 
-#: popthelp.c:548
+#: popthelp.c:552
 msgid "Usage:"
 msgstr ""
 
-#: popthelp.c:572
+#: popthelp.c:576
 msgid "[OPTION...]"
 msgstr ""
diff --git a/po/sr.po b/po/sr.po
index df3d2ae..78ab7a1 100644
--- a/po/sr.po
+++ b/po/sr.po
@@ -6,112 +6,120 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.3\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-02-29 07:48-0500\n"
+"Report-Msgid-Bugs-To: <rpm-devel@lists.dulug.duke.edu>\n"
+"POT-Creation-Date: 2007-01-21 14:25-0500\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=CHARSET\n"
+"Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: ENCODING\n"
 
 #: popt.c:35
 msgid "unknown errno"
 msgstr ""
 
-#: popt.c:964
+#: popt.c:996
 #, c-format
 msgid "option type (%d) not implemented in popt\n"
 msgstr ""
 
-#: popt.c:1184
+#: popt.c:1208
 msgid "missing argument"
 msgstr ""
 
-#: popt.c:1186
+#: popt.c:1210
 msgid "unknown option"
 msgstr ""
 
-#: popt.c:1188
+#: popt.c:1212
 msgid "mutually exclusive logical operations requested"
 msgstr ""
 
-#: popt.c:1190
+#: popt.c:1214
 msgid "opt->arg should not be NULL"
 msgstr ""
 
-#: popt.c:1192
+#: popt.c:1216
 msgid "aliases nested too deeply"
 msgstr ""
 
-#: popt.c:1194
+#: popt.c:1218
 msgid "error in parameter quoting"
 msgstr ""
 
-#: popt.c:1196
+#: popt.c:1220
 msgid "invalid numeric value"
 msgstr ""
 
-#: popt.c:1198
+#: popt.c:1222
 msgid "number too large or too small"
 msgstr ""
 
-#: popt.c:1200
+#: popt.c:1224
 msgid "memory allocation failed"
 msgstr ""
 
-#: popt.c:1204
+#: popt.c:1228
 msgid "unknown error"
 msgstr ""
 
-#: popthelp.c:64 popthelp.c:75
+#: popt.h:172
+msgid "Options implemented via popt alias/exec:"
+msgstr ""
+
+#: popt.h:188
+msgid "Help options:"
+msgstr ""
+
+#: popthelp.c:68 popthelp.c:79
 msgid "Show this help message"
 msgstr ""
 
-#: popthelp.c:65 popthelp.c:76
+#: popthelp.c:69 popthelp.c:80
 msgid "Display brief usage message"
 msgstr ""
 
-#: popthelp.c:79
+#: popthelp.c:83
 msgid "Display option defaults in message"
 msgstr ""
 
-#: popthelp.c:124
+#: popthelp.c:128
 msgid "NONE"
 msgstr ""
 
-#: popthelp.c:126
+#: popthelp.c:130
 msgid "VAL"
 msgstr ""
 
-#: popthelp.c:130
+#: popthelp.c:134
 msgid "INT"
 msgstr ""
 
-#: popthelp.c:131
+#: popthelp.c:135
 msgid "LONG"
 msgstr ""
 
-#: popthelp.c:132
+#: popthelp.c:136
 msgid "STRING"
 msgstr ""
 
-#: popthelp.c:133
+#: popthelp.c:137
 msgid "FLOAT"
 msgstr ""
 
-#: popthelp.c:134
+#: popthelp.c:138
 msgid "DOUBLE"
 msgstr ""
 
-#: popthelp.c:135
+#: popthelp.c:139
 msgid "ARG"
 msgstr ""
 
-#: popthelp.c:548
+#: popthelp.c:552
 msgid "Usage:"
 msgstr ""
 
-#: popthelp.c:572
+#: popthelp.c:576
 msgid "[OPTION...]"
 msgstr ""
diff --git a/po/sv.po b/po/sv.po
index 087dbbe..1b527fc 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -1,8 +1,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.3\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-02-29 07:48-0500\n"
+"Report-Msgid-Bugs-To: <rpm-devel@lists.dulug.duke.edu>\n"
+"POT-Creation-Date: 2007-01-21 14:25-0500\n"
 "PO-Revision-Date: 2001-07-12 22:26+0100\n"
 "Last-Translator: Christian Rose <menthos@menthos.com>\n"
 "Language-Team: Swedish <sv@li.org>\n"
@@ -14,99 +14,107 @@ msgstr ""
 msgid "unknown errno"
 msgstr "ok�nt felnummer"
 
-#: popt.c:964
+#: popt.c:996
 #, c-format
 msgid "option type (%d) not implemented in popt\n"
 msgstr "flaggtypen (%d) �r inte implementerad i popt\n"
 
-#: popt.c:1184
+#: popt.c:1208
 msgid "missing argument"
 msgstr "argument saknas"
 
-#: popt.c:1186
+#: popt.c:1210
 msgid "unknown option"
 msgstr "ok�nd flagga"
 
-#: popt.c:1188
+#: popt.c:1212
 msgid "mutually exclusive logical operations requested"
 msgstr "�msesidigt uteslutande logiska operationer beg�rdes"
 
-#: popt.c:1190
+#: popt.c:1214
 msgid "opt->arg should not be NULL"
 msgstr "opt->arg f�r inte vara NULL"
 
-#: popt.c:1192
+#: popt.c:1216
 msgid "aliases nested too deeply"
 msgstr "alias �r n�stlade f�r djupt"
 
-#: popt.c:1194
+#: popt.c:1218
 msgid "error in parameter quoting"
 msgstr "fel i parametercitering"
 
-#: popt.c:1196
+#: popt.c:1220
 msgid "invalid numeric value"
 msgstr "ogiltigt numeriskt v�rde"
 
-#: popt.c:1198
+#: popt.c:1222
 msgid "number too large or too small"
 msgstr "talet f�r stort eller f�r litet"
 
-#: popt.c:1200
+#: popt.c:1224
 msgid "memory allocation failed"
 msgstr "minnesallokering misslyckades"
 
-#: popt.c:1204
+#: popt.c:1228
 msgid "unknown error"
 msgstr "ok�nt fel"
 
-#: popthelp.c:64 popthelp.c:75
+#: popt.h:172
+msgid "Options implemented via popt alias/exec:"
+msgstr ""
+
+#: popt.h:188
+msgid "Help options:"
+msgstr ""
+
+#: popthelp.c:68 popthelp.c:79
 msgid "Show this help message"
 msgstr "Visa denna hj�lptext"
 
-#: popthelp.c:65 popthelp.c:76
+#: popthelp.c:69 popthelp.c:80
 msgid "Display brief usage message"
 msgstr "Visa en kortfattad anv�ndningstext"
 
-#: popthelp.c:79
+#: popthelp.c:83
 msgid "Display option defaults in message"
 msgstr "Visa standardalternativ f�r flaggor i meddelande"
 
-#: popthelp.c:124
+#: popthelp.c:128
 msgid "NONE"
 msgstr "INGET"
 
-#: popthelp.c:126
+#: popthelp.c:130
 msgid "VAL"
 msgstr "V�RDE"
 
-#: popthelp.c:130
+#: popthelp.c:134
 msgid "INT"
 msgstr "HELTAL"
 
-#: popthelp.c:131
+#: popthelp.c:135
 msgid "LONG"
 msgstr "L�NG"
 
-#: popthelp.c:132
+#: popthelp.c:136
 msgid "STRING"
 msgstr "STR�NG"
 
-#: popthelp.c:133
+#: popthelp.c:137
 msgid "FLOAT"
 msgstr "FLYTTAL"
 
-#: popthelp.c:134
+#: popthelp.c:138
 msgid "DOUBLE"
 msgstr "DUBBEL"
 
-#: popthelp.c:135
+#: popthelp.c:139
 msgid "ARG"
 msgstr "ARG"
 
-#: popthelp.c:548
+#: popthelp.c:552
 msgid "Usage:"
 msgstr "Anv�ndning:"
 
-#: popthelp.c:572
+#: popthelp.c:576
 msgid "[OPTION...]"
 msgstr "[FLAGGA...]"
diff --git a/po/tr.po b/po/tr.po
index ab97780..5e42797 100644
--- a/po/tr.po
+++ b/po/tr.po
@@ -1,8 +1,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.3\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-02-29 07:48-0500\n"
+"Report-Msgid-Bugs-To: <rpm-devel@lists.dulug.duke.edu>\n"
+"POT-Creation-Date: 2007-01-21 14:25-0500\n"
 "PO-Revision-Date: 2000-02-11 13:01+0200\n"
 "Last-Translator: Nilgun Belma Buguner <nilgun@technologist.com>\n"
 "Language-Team: Turkish <tr@li.org>\n"
@@ -14,100 +14,108 @@ msgstr ""
 msgid "unknown errno"
 msgstr "bilinmeyen hata no"
 
-#: popt.c:964
+#: popt.c:996
 #, c-format
 msgid "option type (%d) not implemented in popt\n"
 msgstr "se�enek t�r� (%d) popt i�in ge�ersiz\n"
 
-#: popt.c:1184
+#: popt.c:1208
 msgid "missing argument"
 msgstr "arg�man eksik"
 
-#: popt.c:1186
+#: popt.c:1210
 msgid "unknown option"
 msgstr "bilinmeyen se�enek"
 
-#: popt.c:1188
+#: popt.c:1212
 msgid "mutually exclusive logical operations requested"
 msgstr "birbirini d��layan mant�ksal i�lemler istendi"
 
-#: popt.c:1190
+#: popt.c:1214
 msgid "opt->arg should not be NULL"
 msgstr ""
 
-#: popt.c:1192
+#: popt.c:1216
 msgid "aliases nested too deeply"
 msgstr "adlarda �ok fazla i�i�elikler"
 
-#: popt.c:1194
+#: popt.c:1218
 msgid "error in parameter quoting"
 msgstr "parametrelerde t�rnak i�aretleme hatal� "
 
-#: popt.c:1196
+#: popt.c:1220
 msgid "invalid numeric value"
 msgstr "say�sal de�er ge�ersiz"
 
-#: popt.c:1198
+#: popt.c:1222
 msgid "number too large or too small"
 msgstr "say� ya �ok b�y�k ya da �ok k���k"
 
-#: popt.c:1200
+#: popt.c:1224
 msgid "memory allocation failed"
 msgstr ""
 
-#: popt.c:1204
+#: popt.c:1228
 msgid "unknown error"
 msgstr "bilinmeyen hata"
 
-#: popthelp.c:64 popthelp.c:75
+#: popt.h:172
+msgid "Options implemented via popt alias/exec:"
+msgstr ""
+
+#: popt.h:188
+msgid "Help options:"
+msgstr ""
+
+#: popthelp.c:68 popthelp.c:79
 msgid "Show this help message"
 msgstr "Bu yard�m iletisini g�sterir"
 
-#: popthelp.c:65 popthelp.c:76
+#: popthelp.c:69 popthelp.c:80
 msgid "Display brief usage message"
 msgstr "K�sa bir kullan�m iletisi g�ster"
 
-#: popthelp.c:79
+#: popthelp.c:83
 #, fuzzy
 msgid "Display option defaults in message"
 msgstr "K�sa bir kullan�m iletisi g�ster"
 
-#: popthelp.c:124
+#: popthelp.c:128
 msgid "NONE"
 msgstr "YOK"
 
-#: popthelp.c:126
+#: popthelp.c:130
 msgid "VAL"
 msgstr "DE�"
 
-#: popthelp.c:130
+#: popthelp.c:134
 msgid "INT"
 msgstr "INT"
 
-#: popthelp.c:131
+#: popthelp.c:135
 msgid "LONG"
 msgstr "LONG"
 
-#: popthelp.c:132
+#: popthelp.c:136
 msgid "STRING"
 msgstr "STRING"
 
-#: popthelp.c:133
+#: popthelp.c:137
 msgid "FLOAT"
 msgstr "FLOAT"
 
-#: popthelp.c:134
+#: popthelp.c:138
 msgid "DOUBLE"
 msgstr "DOUBLE"
 
-#: popthelp.c:135
+#: popthelp.c:139
 msgid "ARG"
 msgstr "ARG"
 
-#: popthelp.c:548
+#: popthelp.c:552
 msgid "Usage:"
 msgstr "Kullan�m�:"
 
-#: popthelp.c:572
+#: popthelp.c:576
 msgid "[OPTION...]"
 msgstr "[SE�ENEK...]"
diff --git a/po/uk.po b/po/uk.po
index 7864ad4..cc793c6 100644
--- a/po/uk.po
+++ b/po/uk.po
@@ -5,8 +5,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.3\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-02-29 07:48-0500\n"
+"Report-Msgid-Bugs-To: <rpm-devel@lists.dulug.duke.edu>\n"
+"POT-Creation-Date: 2007-01-21 14:25-0500\n"
 "PO-Revision-Date: 1999-09-30 16:54+0200\n"
 "Last-Translator: Yuri Syrota <rasta@renome.rovno.ua>\n"
 "Language-Team: Ukrainian <uk@li.org>\n"
@@ -18,100 +18,108 @@ msgstr ""
 msgid "unknown errno"
 msgstr ""
 
-#: popt.c:964
+#: popt.c:996
 #, c-format
 msgid "option type (%d) not implemented in popt\n"
 msgstr ""
 
-#: popt.c:1184
+#: popt.c:1208
 msgid "missing argument"
 msgstr ""
 
-#: popt.c:1186
+#: popt.c:1210
 msgid "unknown option"
 msgstr ""
 
-#: popt.c:1188
+#: popt.c:1212
 msgid "mutually exclusive logical operations requested"
 msgstr ""
 
-#: popt.c:1190
+#: popt.c:1214
 msgid "opt->arg should not be NULL"
 msgstr ""
 
-#: popt.c:1192
+#: popt.c:1216
 msgid "aliases nested too deeply"
 msgstr ""
 
-#: popt.c:1194
+#: popt.c:1218
 msgid "error in parameter quoting"
 msgstr ""
 
-#: popt.c:1196
+#: popt.c:1220
 msgid "invalid numeric value"
 msgstr ""
 
-#: popt.c:1198
+#: popt.c:1222
 msgid "number too large or too small"
 msgstr ""
 
-#: popt.c:1200
+#: popt.c:1224
 msgid "memory allocation failed"
 msgstr ""
 
-#: popt.c:1204
+#: popt.c:1228
 msgid "unknown error"
 msgstr ""
 
-#: popthelp.c:64 popthelp.c:75
+#: popt.h:172
+msgid "Options implemented via popt alias/exec:"
+msgstr ""
+
+#: popt.h:188
+msgid "Help options:"
+msgstr ""
+
+#: popthelp.c:68 popthelp.c:79
 msgid "Show this help message"
 msgstr "�������� �� ��צ���"
 
-#: popthelp.c:65 popthelp.c:76
+#: popthelp.c:69 popthelp.c:80
 msgid "Display brief usage message"
 msgstr "�������� ������� ��צ��� ��� ������������"
 
-#: popthelp.c:79
+#: popthelp.c:83
 #, fuzzy
 msgid "Display option defaults in message"
 msgstr "�������� ������� ��צ��� ��� ������������"
 
-#: popthelp.c:124
+#: popthelp.c:128
 msgid "NONE"
 msgstr ""
 
-#: popthelp.c:126
+#: popthelp.c:130
 msgid "VAL"
 msgstr ""
 
-#: popthelp.c:130
+#: popthelp.c:134
 msgid "INT"
 msgstr ""
 
-#: popthelp.c:131
+#: popthelp.c:135
 msgid "LONG"
 msgstr ""
 
-#: popthelp.c:132
+#: popthelp.c:136
 msgid "STRING"
 msgstr ""
 
-#: popthelp.c:133
+#: popthelp.c:137
 msgid "FLOAT"
 msgstr ""
 
-#: popthelp.c:134
+#: popthelp.c:138
 msgid "DOUBLE"
 msgstr ""
 
-#: popthelp.c:135
+#: popthelp.c:139
 msgid "ARG"
 msgstr ""
 
-#: popthelp.c:548
+#: popthelp.c:552
 msgid "Usage:"
 msgstr ""
 
-#: popthelp.c:572
+#: popthelp.c:576
 msgid "[OPTION...]"
 msgstr ""
diff --git a/po/wa.po b/po/wa.po
index 6d6740c..2fbc61f 100644
--- a/po/wa.po
+++ b/po/wa.po
@@ -9,8 +9,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.3\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-02-29 07:48-0500\n"
+"Report-Msgid-Bugs-To: <rpm-devel@lists.dulug.duke.edu>\n"
+"POT-Creation-Date: 2007-01-21 14:25-0500\n"
 "PO-Revision-Date: 1999-03-18 23:11+0100\n"
 "Last-Translator: Nobody yet\n"
 "Language-Team: walon <linux-wa@chanae.alphanet.ch>\n"
@@ -22,100 +22,108 @@ msgstr ""
 msgid "unknown errno"
 msgstr ""
 
-#: popt.c:964
+#: popt.c:996
 #, c-format
 msgid "option type (%d) not implemented in popt\n"
 msgstr ""
 
-#: popt.c:1184
+#: popt.c:1208
 msgid "missing argument"
 msgstr ""
 
-#: popt.c:1186
+#: popt.c:1210
 msgid "unknown option"
 msgstr ""
 
-#: popt.c:1188
+#: popt.c:1212
 msgid "mutually exclusive logical operations requested"
 msgstr ""
 
-#: popt.c:1190
+#: popt.c:1214
 msgid "opt->arg should not be NULL"
 msgstr ""
 
-#: popt.c:1192
+#: popt.c:1216
 msgid "aliases nested too deeply"
 msgstr ""
 
-#: popt.c:1194
+#: popt.c:1218
 msgid "error in parameter quoting"
 msgstr ""
 
-#: popt.c:1196
+#: popt.c:1220
 msgid "invalid numeric value"
 msgstr ""
 
-#: popt.c:1198
+#: popt.c:1222
 msgid "number too large or too small"
 msgstr ""
 
-#: popt.c:1200
+#: popt.c:1224
 msgid "memory allocation failed"
 msgstr ""
 
-#: popt.c:1204
+#: popt.c:1228
 msgid "unknown error"
 msgstr ""
 
-#: popthelp.c:64 popthelp.c:75
+#: popt.h:172
+msgid "Options implemented via popt alias/exec:"
+msgstr ""
+
+#: popt.h:188
+msgid "Help options:"
+msgstr ""
+
+#: popthelp.c:68 popthelp.c:79
 msgid "Show this help message"
 msgstr "Mostrer ci messaedje d' aide chal"
 
-#: popthelp.c:65 popthelp.c:76
+#: popthelp.c:69 popthelp.c:80
 msgid "Display brief usage message"
 msgstr "Mostre on court messaedje so kmint vos � siervi"
 
-#: popthelp.c:79
+#: popthelp.c:83
 #, fuzzy
 msgid "Display option defaults in message"
 msgstr "Mostre on court messaedje so kmint vos � siervi"
 
-#: popthelp.c:124
+#: popthelp.c:128
 msgid "NONE"
 msgstr ""
 
-#: popthelp.c:126
+#: popthelp.c:130
 msgid "VAL"
 msgstr ""
 
-#: popthelp.c:130
+#: popthelp.c:134
 msgid "INT"
 msgstr ""
 
-#: popthelp.c:131
+#: popthelp.c:135
 msgid "LONG"
 msgstr ""
 
-#: popthelp.c:132
+#: popthelp.c:136
 msgid "STRING"
 msgstr ""
 
-#: popthelp.c:133
+#: popthelp.c:137
 msgid "FLOAT"
 msgstr ""
 
-#: popthelp.c:134
+#: popthelp.c:138
 msgid "DOUBLE"
 msgstr ""
 
-#: popthelp.c:135
+#: popthelp.c:139
 msgid "ARG"
 msgstr ""
 
-#: popthelp.c:548
+#: popthelp.c:552
 msgid "Usage:"
 msgstr ""
 
-#: popthelp.c:572
+#: popthelp.c:576
 msgid "[OPTION...]"
 msgstr ""
diff --git a/po/zh.po b/po/zh.po
index df3d2ae..78ab7a1 100644
--- a/po/zh.po
+++ b/po/zh.po
@@ -6,112 +6,120 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.3\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-02-29 07:48-0500\n"
+"Report-Msgid-Bugs-To: <rpm-devel@lists.dulug.duke.edu>\n"
+"POT-Creation-Date: 2007-01-21 14:25-0500\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=CHARSET\n"
+"Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: ENCODING\n"
 
 #: popt.c:35
 msgid "unknown errno"
 msgstr ""
 
-#: popt.c:964
+#: popt.c:996
 #, c-format
 msgid "option type (%d) not implemented in popt\n"
 msgstr ""
 
-#: popt.c:1184
+#: popt.c:1208
 msgid "missing argument"
 msgstr ""
 
-#: popt.c:1186
+#: popt.c:1210
 msgid "unknown option"
 msgstr ""
 
-#: popt.c:1188
+#: popt.c:1212
 msgid "mutually exclusive logical operations requested"
 msgstr ""
 
-#: popt.c:1190
+#: popt.c:1214
 msgid "opt->arg should not be NULL"
 msgstr ""
 
-#: popt.c:1192
+#: popt.c:1216
 msgid "aliases nested too deeply"
 msgstr ""
 
-#: popt.c:1194
+#: popt.c:1218
 msgid "error in parameter quoting"
 msgstr ""
 
-#: popt.c:1196
+#: popt.c:1220
 msgid "invalid numeric value"
 msgstr ""
 
-#: popt.c:1198
+#: popt.c:1222
 msgid "number too large or too small"
 msgstr ""
 
-#: popt.c:1200
+#: popt.c:1224
 msgid "memory allocation failed"
 msgstr ""
 
-#: popt.c:1204
+#: popt.c:1228
 msgid "unknown error"
 msgstr ""
 
-#: popthelp.c:64 popthelp.c:75
+#: popt.h:172
+msgid "Options implemented via popt alias/exec:"
+msgstr ""
+
+#: popt.h:188
+msgid "Help options:"
+msgstr ""
+
+#: popthelp.c:68 popthelp.c:79
 msgid "Show this help message"
 msgstr ""
 
-#: popthelp.c:65 popthelp.c:76
+#: popthelp.c:69 popthelp.c:80
 msgid "Display brief usage message"
 msgstr ""
 
-#: popthelp.c:79
+#: popthelp.c:83
 msgid "Display option defaults in message"
 msgstr ""
 
-#: popthelp.c:124
+#: popthelp.c:128
 msgid "NONE"
 msgstr ""
 
-#: popthelp.c:126
+#: popthelp.c:130
 msgid "VAL"
 msgstr ""
 
-#: popthelp.c:130
+#: popthelp.c:134
 msgid "INT"
 msgstr ""
 
-#: popthelp.c:131
+#: popthelp.c:135
 msgid "LONG"
 msgstr ""
 
-#: popthelp.c:132
+#: popthelp.c:136
 msgid "STRING"
 msgstr ""
 
-#: popthelp.c:133
+#: popthelp.c:137
 msgid "FLOAT"
 msgstr ""
 
-#: popthelp.c:134
+#: popthelp.c:138
 msgid "DOUBLE"
 msgstr ""
 
-#: popthelp.c:135
+#: popthelp.c:139
 msgid "ARG"
 msgstr ""
 
-#: popthelp.c:548
+#: popthelp.c:552
 msgid "Usage:"
 msgstr ""
 
-#: popthelp.c:572
+#: popthelp.c:576
 msgid "[OPTION...]"
 msgstr ""
diff --git a/po/zh_CN.po b/po/zh_CN.po
index 9128fa1..0930d01 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -6,8 +6,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: translation\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-03-31 13:55+0100\n"
+"Report-Msgid-Bugs-To: <rpm-devel@lists.dulug.duke.edu>\n"
+"POT-Creation-Date: 2007-01-21 14:25-0500\n"
 "PO-Revision-Date: 2005-05-20 15:53+1000\n"
 "Last-Translator: \n"
 "Language-Team:  <zh@li.org>\n"
@@ -16,78 +16,111 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.9.1\n"
 
-msgid "ARG"
-msgstr "ARG"
-
-msgid "DOUBLE"
-msgstr "DOUBLE"
-
-msgid "Display brief usage message"
-msgstr "显示简短的使用说明"
-
-msgid "Display option defaults in message"
-msgstr "在信息中显示默认的选项"
-
-msgid "FLOAT"
-msgstr "FLOAT"
-
-msgid "INT"
-msgstr "INT"
-
-msgid "LONG"
-msgstr "LONG"
-
-msgid "NONE"
-msgstr "NONE"
+#: popt.c:35
+msgid "unknown errno"
+msgstr "未知的错误"
 
-msgid "STRING"
-msgstr "STRING"
+#: popt.c:996
+#, c-format
+msgid "option type (%d) not implemented in popt\n"
+msgstr "选项类别 (%d) 沒有在 popt 中实现\n"
 
-msgid "Show this help message"
-msgstr "显示这个帮助信息"
+#: popt.c:1208
+msgid "missing argument"
+msgstr "缺少参数"
 
-msgid "Usage:"
-msgstr "用法:"
+#: popt.c:1210
+msgid "unknown option"
+msgstr "未知的选项"
 
-msgid "VAL"
-msgstr "VAL"
+#: popt.c:1212
+msgid "mutually exclusive logical operations requested"
+msgstr "需要 XOR 逻辑运算"
 
-msgid "[OPTION...]"
-msgstr "[选项...]"
+#: popt.c:1214
+msgid "opt->arg should not be NULL"
+msgstr "opt->arg 不应该为 NULL"
 
+#: popt.c:1216
 msgid "aliases nested too deeply"
 msgstr "别名嵌套太深"
 
+#: popt.c:1218
 msgid "error in parameter quoting"
 msgstr "参数引号错误"
 
+#: popt.c:1220
 msgid "invalid numeric value"
 msgstr "无效的数值"
 
+#: popt.c:1222
+msgid "number too large or too small"
+msgstr "数值太大或太小"
+
+#: popt.c:1224
 msgid "memory allocation failed"
 msgstr "内存分配错误"
 
-msgid "missing argument"
-msgstr "缺少参数"
+#: popt.c:1228
+msgid "unknown error"
+msgstr "未知的错误"
 
-msgid "mutually exclusive logical operations requested"
-msgstr "需要 XOR 逻辑运算"
+#: popt.h:172
+msgid "Options implemented via popt alias/exec:"
+msgstr ""
 
-msgid "number too large or too small"
-msgstr "数值太大或太小"
+#: popt.h:188
+msgid "Help options:"
+msgstr ""
 
-msgid "opt->arg should not be NULL"
-msgstr "opt->arg 不应该为 NULL"
+#: popthelp.c:68 popthelp.c:79
+msgid "Show this help message"
+msgstr "显示这个帮助信息"
 
-msgid "option type (%d) not implemented in popt\n"
-msgstr "选项类别 (%d) 沒有在 popt 中实现\n"
+#: popthelp.c:69 popthelp.c:80
+msgid "Display brief usage message"
+msgstr "显示简短的使用说明"
 
-msgid "unknown errno"
-msgstr "未知的错误"
+#: popthelp.c:83
+msgid "Display option defaults in message"
+msgstr "在信息中显示默认的选项"
 
-msgid "unknown error"
-msgstr "未知的错误"
+#: popthelp.c:128
+msgid "NONE"
+msgstr "NONE"
 
-msgid "unknown option"
-msgstr "未知的选项"
+#: popthelp.c:130
+msgid "VAL"
+msgstr "VAL"
 
+#: popthelp.c:134
+msgid "INT"
+msgstr "INT"
+
+#: popthelp.c:135
+msgid "LONG"
+msgstr "LONG"
+
+#: popthelp.c:136
+msgid "STRING"
+msgstr "STRING"
+
+#: popthelp.c:137
+msgid "FLOAT"
+msgstr "FLOAT"
+
+#: popthelp.c:138
+msgid "DOUBLE"
+msgstr "DOUBLE"
+
+#: popthelp.c:139
+msgid "ARG"
+msgstr "ARG"
+
+#: popthelp.c:552
+msgid "Usage:"
+msgstr "用法:"
+
+#: popthelp.c:576
+msgid "[OPTION...]"
+msgstr "[选项...]"
diff --git a/po/zh_TW.po b/po/zh_TW.po
index a9c2560..1074b3d 100644
--- a/po/zh_TW.po
+++ b/po/zh_TW.po
@@ -5,8 +5,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.10.1\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-03-31 13:55+0100\n"
+"Report-Msgid-Bugs-To: <rpm-devel@lists.dulug.duke.edu>\n"
+"POT-Creation-Date: 2007-01-21 14:25-0500\n"
 "PO-Revision-Date: 2005-04-08 17:52+0800\n"
 "Last-Translator: Wei-Lun Chao <chaoweilun@pcmail.com.tw>\n"
 "Language-Team: zh_TW <zh-l10n@linux.org.tw>\n"
@@ -14,77 +14,111 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-msgid "ARG"
-msgstr "ARG"
-
-msgid "DOUBLE"
-msgstr "DOUBLE"
-
-msgid "Display brief usage message"
-msgstr "顯示簡短的使用說明"
-
-msgid "Display option defaults in message"
-msgstr "在訊息中顯示預設選項"
-
-msgid "FLOAT"
-msgstr "FLOAT"
-
-msgid "INT"
-msgstr "INT"
-
-msgid "LONG"
-msgstr "LONG"
-
-msgid "NONE"
-msgstr "NONE"
+#: popt.c:35
+msgid "unknown errno"
+msgstr "未知的錯誤"
 
-msgid "STRING"
-msgstr "STRING"
+#: popt.c:996
+#, c-format
+msgid "option type (%d) not implemented in popt\n"
+msgstr "選項類型 (%d) 沒有在 popt 中實作\n"
 
-msgid "Show this help message"
-msgstr "顯示本說明訊息"
+#: popt.c:1208
+msgid "missing argument"
+msgstr "缺少引數"
 
-msgid "Usage:"
-msgstr "用法:"
+#: popt.c:1210
+msgid "unknown option"
+msgstr "未知的選項"
 
-msgid "VAL"
-msgstr "VAL"
+#: popt.c:1212
+msgid "mutually exclusive logical operations requested"
+msgstr "需要相互獨立的邏輯運算"
 
-msgid "[OPTION...]"
-msgstr "[選項...]"
+#: popt.c:1214
+msgid "opt->arg should not be NULL"
+msgstr "opt->arg 不應為 NULL"
 
+#: popt.c:1216
 msgid "aliases nested too deeply"
 msgstr "巢狀別名太深"
 
+#: popt.c:1218
 msgid "error in parameter quoting"
 msgstr "參數引號錯誤"
 
+#: popt.c:1220
 msgid "invalid numeric value"
 msgstr "不正確的數值"
 
+#: popt.c:1222
+msgid "number too large or too small"
+msgstr "數字太大或太小"
+
+#: popt.c:1224
 msgid "memory allocation failed"
 msgstr "記憶體配置錯誤"
 
-msgid "missing argument"
-msgstr "缺少引數"
+#: popt.c:1228
+msgid "unknown error"
+msgstr "未知的錯誤"
 
-msgid "mutually exclusive logical operations requested"
-msgstr "需要相互獨立的邏輯運算"
+#: popt.h:172
+msgid "Options implemented via popt alias/exec:"
+msgstr ""
 
-msgid "number too large or too small"
-msgstr "數字太大或太小"
+#: popt.h:188
+msgid "Help options:"
+msgstr ""
 
-msgid "opt->arg should not be NULL"
-msgstr "opt->arg 不應為 NULL"
+#: popthelp.c:68 popthelp.c:79
+msgid "Show this help message"
+msgstr "顯示本說明訊息"
 
-msgid "option type (%d) not implemented in popt\n"
-msgstr "選項類型 (%d) 沒有在 popt 中實作\n"
+#: popthelp.c:69 popthelp.c:80
+msgid "Display brief usage message"
+msgstr "顯示簡短的使用說明"
 
-msgid "unknown errno"
-msgstr "未知的錯誤"
+#: popthelp.c:83
+msgid "Display option defaults in message"
+msgstr "在訊息中顯示預設選項"
 
-msgid "unknown error"
-msgstr "未知的錯誤"
+#: popthelp.c:128
+msgid "NONE"
+msgstr "NONE"
 
-msgid "unknown option"
-msgstr "未知的選項"
+#: popthelp.c:130
+msgid "VAL"
+msgstr "VAL"
+
+#: popthelp.c:134
+msgid "INT"
+msgstr "INT"
+
+#: popthelp.c:135
+msgid "LONG"
+msgstr "LONG"
+
+#: popthelp.c:136
+msgid "STRING"
+msgstr "STRING"
+
+#: popthelp.c:137
+msgid "FLOAT"
+msgstr "FLOAT"
+
+#: popthelp.c:138
+msgid "DOUBLE"
+msgstr "DOUBLE"
+
+#: popthelp.c:139
+msgid "ARG"
+msgstr "ARG"
+
+#: popthelp.c:552
+msgid "Usage:"
+msgstr "用法:"
+
+#: popthelp.c:576
+msgid "[OPTION...]"
+msgstr "[選項...]"
diff --git a/popt.c b/popt.c
index 5226062..bcb8713 100644
--- a/popt.c
+++ b/popt.c
@@ -56,9 +56,9 @@ void poptSetExecPath(poptContext con, const char * path, int allowAbsolute)
     con->execPath = _free(con->execPath);
     con->execPath = xstrdup(path);
     con->execAbsolute = allowAbsolute;
-    /*@-nullstate@*/ /* LCL: con->execPath not NULL */
+/*@-nullstate@*/ /* LCL: con->execPath not NULL */
     return;
-    /*@=nullstate@*/
+/*@=nullstate@*/
 }
 
 static void invokeCallbacksPRE(poptContext con, const struct poptOption * opt)
@@ -144,10 +144,8 @@ static void invokeCallbacksOPTION(poptContext con,
 	} else if (cbopt != NULL &&
 		   ((myOpt->shortName && opt->shortName && shorty &&
 			myOpt->shortName == opt->shortName) ||
-		    (myOpt->longName && opt->longName &&
-		/*@-nullpass@*/		/* LCL: opt->longName != NULL */
+		    (myOpt->longName != NULL && opt->longName != NULL &&
 			!strcmp(myOpt->longName, opt->longName)))
-		/*@=nullpass@*/
 		   )
 	{   /*@-castfcnptr@*/
 	    poptCallbackType cb = (poptCallbackType)cbopt->arg;
@@ -168,7 +166,7 @@ static void invokeCallbacksOPTION(poptContext con,
 }
 
 poptContext poptGetContext(const char * name, int argc, const char ** argv,
-			   const struct poptOption * options, int flags)
+			   const struct poptOption * options, unsigned int flags)
 {
     poptContext con = malloc(sizeof(*con));
 
@@ -177,18 +175,18 @@ poptContext poptGetContext(const char * name, int argc, const char ** argv,
 
     con->os = con->optionStack;
     con->os->argc = argc;
-    /*@-dependenttrans -assignexpose@*/	/* FIX: W2DO? */
+/*@-dependenttrans -assignexpose@*/	/* FIX: W2DO? */
     con->os->argv = argv;
-    /*@=dependenttrans =assignexpose@*/
+/*@=dependenttrans =assignexpose@*/
     con->os->argb = NULL;
 
     if (!(flags & POPT_CONTEXT_KEEP_FIRST))
 	con->os->next = 1;			/* skip argv[0] */
 
     con->leftovers = calloc( (argc + 1), sizeof(*con->leftovers) );
-    /*@-dependenttrans -assignexpose@*/	/* FIX: W2DO? */
+/*@-dependenttrans -assignexpose@*/	/* FIX: W2DO? */
     con->options = options;
-    /*@=dependenttrans =assignexpose@*/
+/*@=dependenttrans =assignexpose@*/
     con->aliases = NULL;
     con->numAliases = 0;
     con->flags = flags;
@@ -207,9 +205,9 @@ poptContext poptGetContext(const char * name, int argc, const char ** argv,
 	if (t) con->appName = strcpy(t, name);
     }
 
-    /*@-internalglobs@*/
+/*@-internalglobs@*/
     invokeCallbacksPRE(con, con->options);
-    /*@=internalglobs@*/
+/*@=internalglobs@*/
 
     return con;
 }
@@ -246,16 +244,16 @@ void poptResetContext(poptContext con)
 
     if (con->finalArgv != NULL)
     for (i = 0; i < con->finalArgvCount; i++) {
-	/*@-unqualifiedtrans@*/		/* FIX: typedef double indirection. */
+/*@-unqualifiedtrans@*/		/* FIX: typedef double indirection. */
 	con->finalArgv[i] = _free(con->finalArgv[i]);
-	/*@=unqualifiedtrans@*/
+/*@=unqualifiedtrans@*/
     }
 
     con->finalArgvCount = 0;
     con->arg_strip = PBM_FREE(con->arg_strip);
-    /*@-nullstate@*/	/* FIX: con->finalArgv != NULL */
+/*@-nullstate@*/	/* FIX: con->finalArgv != NULL */
     return;
-    /*@=nullstate@*/
+/*@=nullstate@*/
 }
 /*@=boundswrite@*/
 
@@ -314,9 +312,7 @@ static int handleExec(/*@special@*/ poptContext con,
 	    con->finalArgv[i] = NULL;
     }
 
-    /*@-nullstate@*/	/* FIX: con->finalArgv[] == NULL */
     return 1;
-    /*@=nullstate@*/
 }
 /*@=boundswrite@*/
 
@@ -422,7 +418,7 @@ static int execCommand(poptContext con)
 
     argv[argc] = NULL;
 
-#ifdef __hpux
+#if defined(hpux) || defined(__hpux)
     rc = setresgid(getgid(), getgid(),-1);
     if (rc) return POPT_ERROR_ERRNO;
     rc = setresuid(getuid(), getuid(),-1);
@@ -500,17 +496,15 @@ findOption(const struct poptOption * opt, /*@null@*/ const char * longName,
 	    /* Sub-table data will be inheirited if no data yet. */
 	    if (!(callback && *callback)) return opt2;
 	    if (!(callbackData && *callbackData == NULL)) return opt2;
-	    /*@-observertrans -dependenttrans @*/
+/*@-observertrans -dependenttrans @*/
 	    *callbackData = opt->descrip;
-	    /*@=observertrans =dependenttrans @*/
+/*@=observertrans =dependenttrans @*/
 	    return opt2;
 	} else if ((opt->argInfo & POPT_ARG_MASK) == POPT_ARG_CALLBACK) {
 	    cb = opt;
-	} else if (longName && opt->longName &&
+	} else if (longName != NULL && opt->longName != NULL &&
 		   (!singleDash || (opt->argInfo & POPT_ARGFLAG_ONEDASH)) &&
-		/*@-nullpass@*/		/* LCL: opt->longName != NULL */
 		   !strcmp(longName, opt->longName))
-		/*@=nullpass@*/
 	{
 	    break;
 	} else if (shortName && shortName == opt->shortName) {
@@ -518,9 +512,10 @@ findOption(const struct poptOption * opt, /*@null@*/ const char * longName,
 	}
     }
 
-    if (!opt->longName && !opt->shortName)
+    if (opt->longName == NULL && !opt->shortName)
 	return NULL;
-    /*@-modobserver -mods @*/
+
+/*@-modobserver -mods @*/
     if (callback) *callback = NULL;
     if (callbackData) *callbackData = NULL;
     if (cb) {
@@ -530,12 +525,12 @@ findOption(const struct poptOption * opt, /*@null@*/ const char * longName,
 	/*@=castfcnptr@*/
 	if (!(cb->argInfo & POPT_CBFLAG_INC_DATA)) {
 	    if (callbackData)
-		/*@-observertrans@*/	/* FIX: typedef double indirection. */
+/*@-observertrans@*/	/* FIX: typedef double indirection. */
 		*callbackData = cb->descrip;
-		/*@=observertrans@*/
+/*@=observertrans@*/
 	}
     }
-    /*@=modobserver =mods @*/
+/*@=modobserver =mods @*/
 
     return opt;
 }
@@ -557,7 +552,7 @@ static const char * findNextArg(/*@special@*/ poptContext con,
 	if (os->next == os->argc && os == con->optionStack) break;
 	if (os->argv != NULL)
 	for (i = os->next; i < os->argc; i++) {
-	    /*@-sizeoftype@*/
+/*@-sizeoftype@*/
 	    if (os->argb && PBM_ISSET(i, os->argb))
 		/*@innercontinue@*/ continue;
 	    if (*os->argv[i] == '-')
@@ -571,7 +566,7 @@ static const char * findNextArg(/*@special@*/ poptContext con,
 		PBM_SET(i, os->argb);
 	    }
 	    /*@innerbreak@*/ break;
-	    /*@=sizeoftype@*/
+/*@=sizeoftype@*/
 	}
 	if (os > con->optionStack) os--;
     } while (arg == NULL);
@@ -605,7 +600,7 @@ expandNextArg(/*@special@*/ poptContext con, const char * s)
 		/*@switchbreak@*/ break;
 	    /* XXX Make sure that findNextArg deletes only next arg. */
 	    if (a == NULL) {
-		if ((a = findNextArg(con, 1, 1)) == NULL)
+		if ((a = findNextArg(con, 1U, 1)) == NULL)
 		    /*@switchbreak@*/ break;
 	    }
 	    s += 3;
@@ -634,23 +629,35 @@ static void poptStripArg(/*@special@*/ poptContext con, int which)
 	/*@defines con->arg_strip @*/
 	/*@modifies con @*/
 {
-    /*@-sizeoftype@*/
+/*@-sizeoftype@*/
     if (con->arg_strip == NULL)
 	con->arg_strip = PBM_ALLOC(con->optionStack[0].argc);
     if (con->arg_strip != NULL)		/* XXX can't happen */
     PBM_SET(which, con->arg_strip);
-    /*@=sizeoftype@*/
-    /*@-compdef@*/ /* LCL: con->arg_strip udefined? */
+/*@=sizeoftype@*/
+/*@-compdef@*/ /* LCL: con->arg_strip undefined? */
     return;
-    /*@=compdef@*/
+/*@=compdef@*/
 }
 
-int poptSaveLong(long * arg, int argInfo, long aLong)
+/*@unchecked@*/
+static unsigned int seed = 0;
+
+/*@-bitwisesigned@*/	/* LCL: logical ops with unsigned. */
+int poptSaveLong(long * arg, unsigned int argInfo, long aLong)
 {
     /* XXX Check alignment, may fail on funky platforms. */
     if (arg == NULL || (((unsigned long)arg) & (sizeof(*arg)-1)))
 	return POPT_ERROR_NULLARG;
 
+    if (aLong != 0 && argInfo & POPT_ARGFLAG_RANDOM) {
+	if (!seed) {
+	    srandom((unsigned)getpid());
+	    srandom((unsigned)random());
+	}
+	aLong = random() % (aLong > 0 ? aLong : -aLong);
+	aLong++;
+    }
     if (argInfo & POPT_ARGFLAG_NOT)
 	aLong = ~aLong;
     switch (argInfo & POPT_ARGFLAG_LOGICALOPS) {
@@ -672,13 +679,23 @@ int poptSaveLong(long * arg, int argInfo, long aLong)
     }
     return 0;
 }
+/*@=bitwisesigned@*/
 
-int poptSaveInt(/*@null@*/ int * arg, int argInfo, long aLong)
+/*@-bitwisesigned@*/	/* LCL: logical ops with unsigned. */
+int poptSaveInt(/*@null@*/ int * arg, unsigned int argInfo, long aLong)
 {
     /* XXX Check alignment, may fail on funky platforms. */
     if (arg == NULL || (((unsigned long)arg) & (sizeof(*arg)-1)))
 	return POPT_ERROR_NULLARG;
 
+    if (aLong != 0 && argInfo & POPT_ARGFLAG_RANDOM) {
+	if (!seed) {
+	    srandom((unsigned)getpid());
+	    srandom((unsigned)random());
+	}
+	aLong = random() % (aLong > 0 ? aLong : -aLong);
+	aLong++;
+    }
     if (argInfo & POPT_ARGFLAG_NOT)
 	aLong = ~aLong;
     switch (argInfo & POPT_ARGFLAG_LOGICALOPS) {
@@ -700,6 +717,7 @@ int poptSaveInt(/*@null@*/ int * arg, int argInfo, long aLong)
     }
     return 0;
 }
+/*@=bitwisesigned@*/
 
 /*@-boundswrite@*/
 /* returns 'val' element, -1 on last item, POPT_ERROR_* on error */
@@ -723,9 +741,15 @@ int poptGetNextOpt(poptContext con)
 	    cleanOSE(con->os--);
 	}
 	if (!con->os->nextCharArg && con->os->next == con->os->argc) {
-	    /*@-internalglobs@*/
 	    invokeCallbacksPOST(con, con->options);
-	    /*@=internalglobs@*/
+
+	    if (con->maincall) {
+		/*@-noeffectuncon @*/
+		(void) (*con->maincall) (con->finalArgvCount, con->finalArgv);
+		/*@=noeffectuncon @*/
+		return -1;
+	    }
+
 	    if (con->doExec) return execCommand(con);
 	    return -1;
 	}
@@ -735,12 +759,12 @@ int poptGetNextOpt(poptContext con)
 	    char * localOptString, * optString;
 	    int thisopt;
 
-	    /*@-sizeoftype@*/
+/*@-sizeoftype@*/
 	    if (con->os->argb && PBM_ISSET(con->os->next, con->os->argb)) {
 		con->os->next++;
 		continue;
 	    }
-	    /*@=sizeoftype@*/
+/*@=sizeoftype@*/
 	    thisopt = con->os->next;
 	    if (con->os->argv != NULL)	/* XXX can't happen */
 	    origOptString = con->os->argv[con->os->next++];
@@ -748,7 +772,9 @@ int poptGetNextOpt(poptContext con)
 	    if (origOptString == NULL)	/* XXX can't happen */
 		return POPT_ERROR_BADOPT;
 
-	    if (con->restLeftover || *origOptString != '-') {
+	    if (con->restLeftover || *origOptString != '-' ||
+		(*origOptString == '-' && origOptString[1] == '\0'))
+	    {
 		if (con->flags & POPT_CONTEXT_POSIXMEHARDER)
 		    con->restLeftover = 1;
 		if (con->flags & POPT_CONTEXT_ARG_OPTS) {
@@ -816,7 +842,7 @@ int poptGetNextOpt(poptContext con)
 	}
 
 	/* Process next short option */
-	/*@-branchstate@*/		/* FIX: W2DO? */
+/*@-branchstate@*/		/* FIX: W2DO? */
 	if (con->os->nextCharArg) {
 	    origOptString = con->os->nextCharArg;
 
@@ -843,7 +869,7 @@ int poptGetNextOpt(poptContext con)
 	    if (*origOptString != '\0')
 		con->os->nextCharArg = origOptString;
 	}
-	/*@=branchstate@*/
+/*@=branchstate@*/
 
 	if (opt == NULL) return POPT_ERROR_BADOPT;	/* XXX can't happen */
 	if (opt->arg && (opt->argInfo & POPT_ARG_MASK) == POPT_ARG_NONE) {
@@ -856,9 +882,7 @@ int poptGetNextOpt(poptContext con)
 	    }
 	} else if ((opt->argInfo & POPT_ARG_MASK) != POPT_ARG_NONE) {
 	    con->os->nextArg = _free(con->os->nextArg);
-	    /*@-usedef@*/	/* FIX: W2DO? */
 	    if (longArg) {
-	    /*@=usedef@*/
 		longArg = expandNextArg(con, longArg);
 		con->os->nextArg = longArg;
 	    } else if (con->os->nextCharArg) {
@@ -872,9 +896,7 @@ int poptGetNextOpt(poptContext con)
 		}
 		if (con->os->next == con->os->argc) {
 		    if (!(opt->argInfo & POPT_ARGFLAG_OPTIONAL))
-			/*@-compdef@*/	/* FIX: con->os->argv not defined */
 			return POPT_ERROR_NOARG;
-			/*@=compdef@*/
 		    con->os->nextArg = NULL;
 		} else {
 
@@ -889,10 +911,15 @@ int poptGetNextOpt(poptContext con)
 		    }
 		
 		    if (con->os->argv != NULL) {	/* XXX can't happen */
-			/* XXX watchout: subtle side-effects live here. */
-			longArg = con->os->argv[con->os->next++];
-			longArg = expandNextArg(con, longArg);
-			con->os->nextArg = longArg;
+			if (opt->argInfo & POPT_ARGFLAG_OPTIONAL &&
+			    con->os->argv[con->os->next][0] == '-') {
+			    con->os->nextArg = NULL;
+			} else {
+			    /* XXX watchout: subtle side-effects live here. */
+			    longArg = con->os->argv[con->os->next++];
+			    longArg = expandNextArg(con, longArg);
+			    con->os->nextArg = longArg;
+			}
 		    }
 		}
 	    }
@@ -936,14 +963,14 @@ int poptGetNextOpt(poptContext con)
 		    char *end;
 
 		    if (con->os->nextArg) {
-			/*@-mods@*/
+/*@-mods@*/
 			int saveerrno = errno;
 			errno = 0;
 			aDouble = strtod(con->os->nextArg, &end);
 			if (errno == ERANGE)
 			    return POPT_ERROR_OVERFLOW;
 			errno = saveerrno;
-			/*@=mods@*/
+/*@=mods@*/
 			if (*end != '\0')
 			    return POPT_ERROR_BADNUMBER;
 		    }
@@ -959,6 +986,11 @@ int poptGetNextOpt(poptContext con)
 			*((float *) opt->arg) = aDouble;
 		    }
 		}   /*@switchbreak@*/ break;
+		case POPT_ARG_MAINCALL:
+/*@-type@*/
+		    con->maincall = opt->arg;
+/*@=type@*/
+		    /*@switchbreak@*/ break;
 		default:
 		    fprintf(stdout,
 			POPT_("option type (%d) not implemented in popt\n"),
@@ -969,11 +1001,9 @@ int poptGetNextOpt(poptContext con)
 	    }
 	}
 
-	if (cb) {
-	    /*@-internalglobs@*/
+	if (cb)
 	    invokeCallbacksOPTION(con, con->options, opt, cbData, shorty);
-	    /*@=internalglobs@*/
-	} else if (opt->val && ((opt->argInfo & POPT_ARG_MASK) != POPT_ARG_VAL))
+	else if (opt->val && ((opt->argInfo & POPT_ARG_MASK) != POPT_ARG_VAL))
 	    done = 1;
 
 	if ((con->finalArgvCount + 2) >= (con->finalArgvAlloced)) {
@@ -1001,11 +1031,9 @@ int poptGetNextOpt(poptContext con)
 	else if ((opt->argInfo & POPT_ARG_MASK) == POPT_ARG_VAL)
 	    /*@-ifempty@*/ ; /*@=ifempty@*/
 	else if ((opt->argInfo & POPT_ARG_MASK) != POPT_ARG_NONE) {
-	    if (con->finalArgv != NULL && con->os->nextArg)
+	    if (con->finalArgv != NULL && con->os->nextArg != NULL)
 	        con->finalArgv[con->finalArgvCount++] =
-			/*@-nullpass@*/	/* LCL: con->os->nextArg != NULL */
 			xstrdup(con->os->nextArg);
-			/*@=nullpass@*/
 	}
     }
 
@@ -1016,12 +1044,12 @@ int poptGetNextOpt(poptContext con)
 const char * poptGetOptArg(poptContext con)
 {
     const char * ret = NULL;
-    /*@-branchstate@*/
+/*@-branchstate@*/
     if (con) {
 	ret = con->os->nextArg;
 	con->os->nextArg = NULL;
     }
-    /*@=branchstate@*/
+/*@=branchstate@*/
     return ret;
 }
 
@@ -1051,9 +1079,9 @@ const char ** poptGetArgs(poptContext con)
     /* some apps like [like RPM ;-) ] need this NULL terminated */
     con->leftovers[con->numLeftovers] = NULL;
 
-    /*@-nullret -nullstate @*/	/* FIX: typedef double indirection. */
+/*@-nullret -nullstate @*/	/* FIX: typedef double indirection. */
     return (con->leftovers + con->nextLeftover);
-    /*@=nullret =nullstate @*/
+/*@=nullret =nullstate @*/
 }
 /*@=boundswrite@*/
 
@@ -1069,11 +1097,11 @@ poptContext poptFreeContext(poptContext con)
     if (con->aliases != NULL)
     for (i = 0; i < con->numAliases; i++) {
 	item = con->aliases + i;
-	/*@-modobserver -observertrans -dependenttrans@*/
+/*@-modobserver -observertrans -dependenttrans@*/
 	item->option.longName = _free(item->option.longName);
 	item->option.descrip = _free(item->option.descrip);
 	item->option.argDescrip = _free(item->option.argDescrip);
-	/*@=modobserver =observertrans =dependenttrans@*/
+/*@=modobserver =observertrans =dependenttrans@*/
 	item->argv = _free(item->argv);
     }
     con->aliases = _free(con->aliases);
@@ -1081,11 +1109,11 @@ poptContext poptFreeContext(poptContext con)
     if (con->execs != NULL)
     for (i = 0; i < con->numExecs; i++) {
 	item = con->execs + i;
-	/*@-modobserver -observertrans -dependenttrans@*/
+/*@-modobserver -observertrans -dependenttrans@*/
 	item->option.longName = _free(item->option.longName);
 	item->option.descrip = _free(item->option.descrip);
 	item->option.argDescrip = _free(item->option.argDescrip);
-	/*@=modobserver =observertrans =dependenttrans@*/
+/*@=modobserver =observertrans =dependenttrans@*/
 	item->argv = _free(item->argv);
     }
     con->execs = _free(con->execs);
@@ -1119,7 +1147,6 @@ int poptAddAlias(poptContext con, struct poptAlias alias,
 }
 
 /*@-boundswrite@*/
-/*@-mustmod@*/ /* LCL: con not modified? */
 int poptAddItem(poptContext con, poptItem newItem, int flags)
 {
     poptItem * items, item;
@@ -1162,22 +1189,19 @@ int poptAddItem(poptContext con, poptItem newItem, int flags)
 
     return 0;
 }
-/*@=mustmod@*/
 /*@=boundswrite@*/
 
-const char * poptBadOption(poptContext con, int flags)
+const char * poptBadOption(poptContext con, unsigned int flags)
 {
     struct optionStackEntry * os = NULL;
 
     if (con != NULL)
 	os = (flags & POPT_BADOPTION_NOALIAS) ? con->optionStack : con->os;
 
-    /*@-nullderef@*/	/* LCL: os->argv != NULL */
-    return (os && os->argv ? os->argv[os->next - 1] : NULL);
-    /*@=nullderef@*/
+    return (os != NULL && os->argv != NULL ? os->argv[os->next - 1] : NULL);
 }
 
-const char *const poptStrerror(const int error)
+const char * poptStrerror(const int error)
 {
     switch (error) {
       case POPT_ERROR_NOARG:
@@ -1240,7 +1264,7 @@ int poptStrippedArgv(poptContext con, int argc, char ** argv)
     int j = 1;
     int i;
     
-    /*@-sizeoftype@*/
+/*@-sizeoftype@*/
     if (con->arg_strip)
     for (i = 1; i < argc; i++) {
 	if (PBM_ISSET(i, con->arg_strip))
@@ -1253,7 +1277,7 @@ int poptStrippedArgv(poptContext con, int argc, char ** argv)
 	argv[j] = (j < numargs) ? argv[i] : NULL;
 	j++;
     }
-    /*@=sizeoftype@*/
+/*@=sizeoftype@*/
     
     return numargs;
 }
diff --git a/popt.h b/popt.h
index 663fd3b..c829717 100644
--- a/popt.h
+++ b/popt.h
@@ -17,41 +17,43 @@
  * \name Arg type identifiers
  */
 /*@{*/
-#define POPT_ARG_NONE		0	/*!< no arg */
-#define POPT_ARG_STRING		1	/*!< arg will be saved as string */
-#define POPT_ARG_INT		2	/*!< arg will be converted to int */
-#define POPT_ARG_LONG		3	/*!< arg will be converted to long */
-#define POPT_ARG_INCLUDE_TABLE	4	/*!< arg points to table */
-#define POPT_ARG_CALLBACK	5	/*!< table-wide callback... must be
+#define POPT_ARG_NONE		 0U	/*!< no arg */
+#define POPT_ARG_STRING		 1U	/*!< arg will be saved as string */
+#define POPT_ARG_INT		 2U	/*!< arg will be converted to int */
+#define POPT_ARG_LONG		 3U	/*!< arg will be converted to long */
+#define POPT_ARG_INCLUDE_TABLE	 4U	/*!< arg points to table */
+#define POPT_ARG_CALLBACK	 5U	/*!< table-wide callback... must be
 					   set first in table; arg points 
 					   to callback, descrip points to 
 					   callback data to pass */
-#define POPT_ARG_INTL_DOMAIN    6       /*!< set the translation domain
+#define POPT_ARG_INTL_DOMAIN     6U	/*!< set the translation domain
 					   for this table and any
 					   included tables; arg points
 					   to the domain string */
-#define POPT_ARG_VAL		7	/*!< arg should take value val */
-#define	POPT_ARG_FLOAT		8	/*!< arg will be converted to float */
-#define	POPT_ARG_DOUBLE		9	/*!< arg will be converted to double */
+#define POPT_ARG_VAL		 7U	/*!< arg should take value val */
+#define	POPT_ARG_FLOAT		 8U	/*!< arg will be converted to float */
+#define	POPT_ARG_DOUBLE		 9U	/*!< arg will be converted to double */
 
-#define POPT_ARG_MASK		0x0000FFFF
+#define POPT_ARG_MAINCALL	10U 	/*!< return (*arg) (argc, argv) */
+
+#define POPT_ARG_MASK		0x0000FFFFU
 /*@}*/
 
 /** \ingroup popt
  * \name Arg modifiers
  */
 /*@{*/
-#define POPT_ARGFLAG_ONEDASH	0x80000000  /*!< allow -longoption */
-#define POPT_ARGFLAG_DOC_HIDDEN 0x40000000  /*!< don't show in help/usage */
-#define POPT_ARGFLAG_STRIP	0x20000000  /*!< strip this arg from argv(only applies to long args) */
-#define	POPT_ARGFLAG_OPTIONAL	0x10000000  /*!< arg may be missing */
-
-#define	POPT_ARGFLAG_OR		0x08000000  /*!< arg will be or'ed */
-#define	POPT_ARGFLAG_NOR	0x09000000  /*!< arg will be nor'ed */
-#define	POPT_ARGFLAG_AND	0x04000000  /*!< arg will be and'ed */
-#define	POPT_ARGFLAG_NAND	0x05000000  /*!< arg will be nand'ed */
-#define	POPT_ARGFLAG_XOR	0x02000000  /*!< arg will be xor'ed */
-#define	POPT_ARGFLAG_NOT	0x01000000  /*!< arg will be negated */
+#define POPT_ARGFLAG_ONEDASH	0x80000000U  /*!< allow -longoption */
+#define POPT_ARGFLAG_DOC_HIDDEN 0x40000000U  /*!< don't show in help/usage */
+#define POPT_ARGFLAG_STRIP	0x20000000U  /*!< strip this arg from argv(only applies to long args) */
+#define	POPT_ARGFLAG_OPTIONAL	0x10000000U  /*!< arg may be missing */
+
+#define	POPT_ARGFLAG_OR		0x08000000U  /*!< arg will be or'ed */
+#define	POPT_ARGFLAG_NOR	0x09000000U  /*!< arg will be nor'ed */
+#define	POPT_ARGFLAG_AND	0x04000000U  /*!< arg will be and'ed */
+#define	POPT_ARGFLAG_NAND	0x05000000U  /*!< arg will be nand'ed */
+#define	POPT_ARGFLAG_XOR	0x02000000U  /*!< arg will be xor'ed */
+#define	POPT_ARGFLAG_NOT	0x01000000U  /*!< arg will be negated */
 #define POPT_ARGFLAG_LOGICALOPS \
         (POPT_ARGFLAG_OR|POPT_ARGFLAG_AND|POPT_ARGFLAG_XOR)
 
@@ -60,7 +62,8 @@
 #define	POPT_BIT_CLR	(POPT_ARG_VAL|POPT_ARGFLAG_NAND)
 					/*!< clear arg bit(s) */
 
-#define	POPT_ARGFLAG_SHOW_DEFAULT 0x00800000 /*!< show default value in --help */
+#define	POPT_ARGFLAG_SHOW_DEFAULT 0x00800000U /*!< show default value in --help */
+#define	POPT_ARGFLAG_RANDOM	0x00400000U  /*<! random value in [1,arg] */
 
 /*@}*/
 
@@ -68,12 +71,12 @@
  * \name Callback modifiers
  */
 /*@{*/
-#define POPT_CBFLAG_PRE		0x80000000  /*!< call the callback before parse */
-#define POPT_CBFLAG_POST	0x40000000  /*!< call the callback after parse */
-#define POPT_CBFLAG_INC_DATA	0x20000000  /*!< use data from the include line,
+#define POPT_CBFLAG_PRE		0x80000000U  /*!< call the callback before parse */
+#define POPT_CBFLAG_POST	0x40000000U  /*!< call the callback after parse */
+#define POPT_CBFLAG_INC_DATA	0x20000000U  /*!< use data from the include line,
 					       not the subtable */
-#define POPT_CBFLAG_SKIPOPTION	0x10000000  /*!< don't callback with option */
-#define POPT_CBFLAG_CONTINUE	0x08000000  /*!< continue callbacks with option */
+#define POPT_CBFLAG_SKIPOPTION	0x10000000U  /*!< don't callback with option */
+#define POPT_CBFLAG_CONTINUE	0x08000000U  /*!< continue callbacks with option */
 /*@}*/
 
 /** \ingroup popt
@@ -96,17 +99,17 @@
  * \name poptBadOption() flags
  */
 /*@{*/
-#define POPT_BADOPTION_NOALIAS  (1 << 0)  /*!< don't go into an alias */
+#define POPT_BADOPTION_NOALIAS  (1U << 0)  /*!< don't go into an alias */
 /*@}*/
 
 /** \ingroup popt
  * \name poptGetContext() flags
  */
 /*@{*/
-#define POPT_CONTEXT_NO_EXEC	(1 << 0)  /*!< ignore exec expansions */
-#define POPT_CONTEXT_KEEP_FIRST	(1 << 1)  /*!< pay attention to argv[0] */
-#define POPT_CONTEXT_POSIXMEHARDER (1 << 2) /*!< options can't follow args */
-#define POPT_CONTEXT_ARG_OPTS	(1 << 4) /*!< return args as options with value 0 */
+#define POPT_CONTEXT_NO_EXEC	(1U << 0)  /*!< ignore exec expansions */
+#define POPT_CONTEXT_KEEP_FIRST	(1U << 1)  /*!< pay attention to argv[0] */
+#define POPT_CONTEXT_POSIXMEHARDER (1U << 2) /*!< options can't follow args */
+#define POPT_CONTEXT_ARG_OPTS	(1U << 4) /*!< return args as options with value 0 */
 /*@}*/
 
 /** \ingroup popt
@@ -115,7 +118,7 @@ struct poptOption {
 /*@observer@*/ /*@null@*/
     const char * longName;	/*!< may be NULL */
     char shortName;		/*!< may be NUL */
-    int argInfo;
+    unsigned int argInfo;
 /*@shared@*/ /*@null@*/
     void * arg;			/*!< depends on argInfo */
     int val;			/*!< 0 means don't return, just update flag */
@@ -154,6 +157,10 @@ typedef struct poptItem_s {
  */
 /*@{*/
 
+#if !defined(N_)
+#define	N_(foo)	foo
+#endif
+
 /**
  * Empty table marker to enable displaying popt alias/exec options.
  */
@@ -162,7 +169,7 @@ typedef struct poptItem_s {
 extern struct poptOption poptAliasOptions[];
 /*@=exportvar@*/
 #define POPT_AUTOALIAS { NULL, '\0', POPT_ARG_INCLUDE_TABLE, poptAliasOptions, \
-			0, "Options implemented via popt alias/exec:", NULL },
+			0, N_("Options implemented via popt alias/exec:"), NULL },
 
 /**
  * Auto help table options.
@@ -178,9 +185,9 @@ extern struct poptOption * poptHelpOptionsI18N;
 /*@=exportvar@*/
 
 #define POPT_AUTOHELP { NULL, '\0', POPT_ARG_INCLUDE_TABLE, poptHelpOptions, \
-			0, "Help options:", NULL },
+			0, N_("Help options:"), NULL },
 
-#define POPT_TABLEEND { NULL, '\0', 0, 0, 0, NULL, NULL }
+#define POPT_TABLEEND { NULL, '\0', 0, NULL, 0, NULL, NULL }
 /*@}*/
 
 /** \ingroup popt
@@ -197,6 +204,8 @@ typedef struct poptOption * poptOption;
 /*@=exporttype =typeuse@*/
 #endif
 
+/** \ingroup popt
+ */
 /*@-exportconst@*/
 enum poptCallbackReason {
     POPT_CALLBACK_REASON_PRE	= 0, 
@@ -240,7 +249,7 @@ poptContext poptGetContext(
 		/*@dependent@*/ /*@keep@*/ const char * name,
 		int argc, /*@dependent@*/ /*@keep@*/ const char ** argv,
 		/*@dependent@*/ /*@keep@*/ const struct poptOption * options,
-		int flags)
+		unsigned int flags)
 	/*@*/;
 
 /** \ingroup popt
@@ -303,7 +312,7 @@ const char ** poptGetArgs(/*@null@*/poptContext con)
  * @return		offending option
  */
 /*@observer@*/
-const char * poptBadOption(/*@null@*/poptContext con, int flags)
+const char * poptBadOption(/*@null@*/poptContext con, unsigned int flags)
 	/*@*/;
 
 /** \ingroup popt
@@ -460,7 +469,7 @@ int poptConfigFileToString(FILE *fp, /*@out@*/ char ** argstrp, int flags)
  * @return		error string
  */
 /*@observer@*/
-const char *const poptStrerror(const int error)
+const char * poptStrerror(const int error)
 	/*@*/;
 
 /** \ingroup popt
@@ -536,8 +545,9 @@ int poptStrippedArgv(poptContext con, int argc, char ** argv)
  */
 /*@-incondefs@*/
 /*@unused@*/
-int poptSaveLong(/*@null@*/ long * arg, int argInfo, long aLong)
-	/*@modifies *arg @*/
+int poptSaveLong(/*@null@*/ long * arg, unsigned int argInfo, long aLong)
+	/*@globals internalState @*/
+	/*@modifies *arg, internalState @*/
 	/*@requires maxSet(arg) >= 0 /\ maxRead(arg) == 0 @*/;
 /*@=incondefs@*/
 
@@ -551,8 +561,9 @@ int poptSaveLong(/*@null@*/ long * arg, int argInfo, long aLong)
  */
 /*@-incondefs@*/
 /*@unused@*/
-int poptSaveInt(/*@null@*/ int * arg, int argInfo, long aLong)
-	/*@modifies *arg @*/
+int poptSaveInt(/*@null@*/ int * arg, unsigned int argInfo, long aLong)
+	/*@globals internalState @*/
+	/*@modifies *arg, internalState @*/
 	/*@requires maxSet(arg) >= 0 /\ maxRead(arg) == 0 @*/;
 /*@=incondefs@*/
 
diff --git a/popt.spec b/popt.spec
index 5a029a4..511e015 100644
--- a/popt.spec
+++ b/popt.spec
@@ -4,7 +4,7 @@
 #
 Summary: A C library for parsing command line parameters.
 Name: popt
-Version: 1.10.2
+Version: 1.10.7
 Release: 0.1
 License: X Consortium
 Group: System Environment/Libraries
diff --git a/poptconfig.c b/poptconfig.c
index e5cba45..0112f86 100644
--- a/poptconfig.c
+++ b/poptconfig.c
@@ -46,16 +46,16 @@ static void configLine(poptContext con, char * line)
     while (*line != '\0' && isspace(*line)) line++;
     if (*line == '\0') return;
 
-    /*@-temptrans@*/ /* FIX: line alias is saved */
+/*@-temptrans@*/ /* FIX: line alias is saved */
     if (opt[0] == '-' && opt[1] == '-')
 	item->option.longName = opt + 2;
     else if (opt[0] == '-' && opt[2] == '\0')
 	item->option.shortName = opt[1];
-    /*@=temptrans@*/
+/*@=temptrans@*/
 
     if (poptParseArgvString(line, &item->argc, &item->argv)) return;
 
-    /*@-modobserver@*/
+/*@-modobserver@*/
     item->option.argInfo = POPT_ARGFLAG_DOC_HIDDEN;
     for (i = 0, j = 0; i < item->argc; i++, j++) {
 	const char * f;
@@ -81,15 +81,15 @@ static void configLine(poptContext con, char * line)
 	item->argv[j] = NULL;
 	item->argc = j;
     }
-    /*@=modobserver@*/
+/*@=modobserver@*/
 /*@=boundswrite@*/
 	
-    /*@-nullstate@*/ /* FIX: item->argv[] may be NULL */
+/*@-nullstate@*/ /* FIX: item->argv[] may be NULL */
     if (!strcmp(entryType, "alias"))
 	(void) poptAddItem(con, item, 0);
     else if (!strcmp(entryType, "exec"))
 	(void) poptAddItem(con, item, 1);
-    /*@=nullstate@*/
+/*@=nullstate@*/
 }
 /*@=compmempass@*/
 
@@ -128,7 +128,7 @@ int poptReadConfigFile(poptContext con, const char * fn)
 
     chptr = file;
     end = (file + fileLength);
-    /*@-infloops@*/	/* LCL: can't detect chptr++ */
+/*@-infloops@*/	/* LCL: can't detect chptr++ */
     while (chptr < end) {
 	switch (*chptr) {
 	  case '\n':
@@ -154,7 +154,7 @@ int poptReadConfigFile(poptContext con, const char * fn)
 	    /*@switchbreak@*/ break;
 	}
     }
-    /*@=infloops@*/
+/*@=infloops@*/
 /*@=boundswrite@*/
 
     return 0;
diff --git a/popthelp.c b/popthelp.c
index 5f10a5f..51c20a9 100644
--- a/popthelp.c
+++ b/popthelp.c
@@ -19,6 +19,8 @@
 
 /*@access poptContext@*/
 
+#define	_POPTHELP_MAXLINE	((size_t)79)
+
 /**
  * Display arguments.
  * @param con		context
@@ -27,17 +29,19 @@
  * @param arg		(unused)
  * @param data		(unused)
  */
+/*@exits@*/
 static void displayArgs(poptContext con,
 		/*@unused@*/ enum poptCallbackReason foo,
 		struct poptOption * key, 
 		/*@unused@*/ const char * arg, /*@unused@*/ void * data)
 	/*@globals fileSystem@*/
-	/*@modifies fileSystem@*/
+	/*@modifies con, fileSystem@*/
 {
     if (key->shortName == '?')
 	poptPrintHelp(con, stdout, 0);
     else
 	poptPrintUsage(con, stdout, 0);
+/*@i@*/ con = poptFreeContext(con);		/* XXX keep valgrind happy */
     exit(0);
 }
 
@@ -60,9 +64,9 @@ struct poptOption poptAliasOptions[] = {
 /*@-castfcnptr@*/
 /*@observer@*/ /*@unchecked@*/
 struct poptOption poptHelpOptions[] = {
-  { NULL, '\0', POPT_ARG_CALLBACK, (void *)&displayArgs, '\0', NULL, NULL },
-  { "help", '?', 0, NULL, '?', N_("Show this help message"), NULL },
-  { "usage", '\0', 0, NULL, 'u', N_("Display brief usage message"), NULL },
+  { NULL, '\0', POPT_ARG_CALLBACK, (void *)&displayArgs, 0, NULL, NULL },
+  { "help", '?', 0, NULL, (int)'?', N_("Show this help message"), NULL },
+  { "usage", '\0', 0, NULL, (int)'u', N_("Display brief usage message"), NULL },
     POPT_TABLEEND
 } ;
 
@@ -71,9 +75,9 @@ static struct poptOption poptHelpOptions2[] = {
 /*@-readonlytrans@*/
   { NULL, '\0', POPT_ARG_INTL_DOMAIN, PACKAGE, 0, NULL, NULL},
 /*@=readonlytrans@*/
-  { NULL, '\0', POPT_ARG_CALLBACK, (void *)&displayArgs, '\0', NULL, NULL },
-  { "help", '?', 0, NULL, '?', N_("Show this help message"), NULL },
-  { "usage", '\0', 0, NULL, 'u', N_("Display brief usage message"), NULL },
+  { NULL, '\0', POPT_ARG_CALLBACK, (void *)&displayArgs, 0, NULL, NULL },
+  { "help", '?', 0, NULL, (int)'?', N_("Show this help message"), NULL },
+  { "usage", '\0', 0, NULL, (int)'u', N_("Display brief usage message"), NULL },
 #ifdef	NOTYET
   { "defaults", '\0', POPT_ARG_NONE, &show_option_defaults, 0,
 	N_("Display option defaults in message"), NULL },
@@ -88,7 +92,7 @@ struct poptOption * poptHelpOptionsI18N = poptHelpOptions2;
 /**
  * @param table		option(s)
  */
-/*@observer@*/ /*@null@*/ static const char *const
+/*@observer@*/ /*@null@*/ static const char *
 getTableTranslationDomain(/*@null@*/ const struct poptOption *table)
 	/*@*/
 {
@@ -106,7 +110,7 @@ getTableTranslationDomain(/*@null@*/ const struct poptOption *table)
  * @param opt		option(s)
  * @param translation_domain	translation domain
  */
-/*@observer@*/ /*@null@*/ static const char *const
+/*@observer@*/ /*@null@*/ static const char *
 getArgDescrip(const struct poptOption * opt,
 		/*@-paramuse@*/ /* FIX: i18n macros disabled with lclint */
 		/*@null@*/ const char * translation_domain)
@@ -222,7 +226,7 @@ static void singleOptionHelp(FILE * fp, size_t maxLeftCol,
 	/*@modifies *fp, fileSystem @*/
 {
     size_t indentLength = maxLeftCol + 5;
-    size_t lineLength = 79 - indentLength;
+    size_t lineLength = _POPTHELP_MAXLINE - indentLength;
     const char * help = D_(translation_domain, opt->descrip);
     const char * argDescrip = getArgDescrip(opt, translation_domain);
     size_t helpLength;
@@ -260,7 +264,7 @@ static void singleOptionHelp(FILE * fp, size_t maxLeftCol,
 	    *le++ = '[';
 
 	/* Choose type of output */
-	/*@-branchstate@*/
+/*@-branchstate@*/
 	if (opt->argInfo & POPT_ARGFLAG_SHOW_DEFAULT) {
 	    defs = singleOptionDefaultValue(lineLength, opt, translation_domain);
 	    if (defs) {
@@ -279,7 +283,7 @@ static void singleOptionHelp(FILE * fp, size_t maxLeftCol,
 		defs = t;
 	    }
 	}
-	/*@=branchstate@*/
+/*@=branchstate@*/
 
 	if (opt->argDescrip == NULL) {
 	    switch (opt->argInfo & POPT_ARG_MASK) {
@@ -341,7 +345,7 @@ static void singleOptionHelp(FILE * fp, size_t maxLeftCol,
 		mbstate_t t;
 		size_t n;
 
-		memset ((void *)&t, '\0', sizeof (t));	/* In initial state.  */
+		memset ((void *)&t, 0, sizeof (t));	/* In initial state.  */
 		/* Determine number of characters.  */
 		n = mbsrtowcs (NULL, &scopy, strlen(scopy), &t);
 
@@ -356,7 +360,7 @@ static void singleOptionHelp(FILE * fp, size_t maxLeftCol,
 /*@=boundswrite@*/
 
     if (help)
-	fprintf(fp,"  %-*s   ", maxLeftCol+displaypad, left);
+	fprintf(fp,"  %-*s   ", (int)(maxLeftCol+displaypad), left);
     else {
 	fprintf(fp,"  %s\n", left); 
 	goto out;
@@ -366,9 +370,7 @@ static void singleOptionHelp(FILE * fp, size_t maxLeftCol,
 /*@-branchstate@*/
     if (defs) {
 	help = defs;
-	defs = NULL;
     }
-/*@=branchstate@*/
 
     helpLength = strlen(help);
 /*@-boundsread@*/
@@ -391,8 +393,10 @@ static void singleOptionHelp(FILE * fp, size_t maxLeftCol,
 	helpLength = strlen(help);
     }
 /*@=boundsread@*/
+/*@=branchstate@*/
 
     if (helpLength) fprintf(fp, "%s\n", help);
+    help = NULL;
 
 out:
     /*@-dependenttrans@*/
@@ -441,7 +445,7 @@ static size_t maxArgWidth(const struct poptOption * opt,
 		size_t n;
 
 /*@-boundswrite@*/
-		memset ((void *)&t, '\0', sizeof (t));	/* In initial state.  */
+		memset ((void *)&t, 0, sizeof (t));	/* In initial state.  */
 /*@=boundswrite@*/
 		/* Determine number of characters.  */
 		n = mbsrtowcs (NULL, &scopy, strlen(scopy), &t);
@@ -528,7 +532,7 @@ static void singleTableHelp(poptContext con, FILE * fp,
 	    sub_transdom = translation_domain;
 	    
 	if (opt->descrip)
-	    fprintf(fp, "\n%s\n", D_(sub_transdom, opt->descrip));
+	    POPT_fprintf(fp, "\n%s\n", D_(sub_transdom, opt->descrip));
 
 	singleTableHelp(con, fp, opt->arg, left, sub_transdom);
     }
@@ -538,19 +542,19 @@ static void singleTableHelp(poptContext con, FILE * fp,
  * @param con		context
  * @param fp		output file handle
  */
-static int showHelpIntro(poptContext con, FILE * fp)
+static size_t showHelpIntro(poptContext con, FILE * fp)
 	/*@globals fileSystem @*/
 	/*@modifies *fp, fileSystem @*/
 {
-    int len = 6;
+    size_t len = (size_t)6;
     const char * fn;
 
     fprintf(fp, POPT_("Usage:"));
     if (!(con->flags & POPT_CONTEXT_KEEP_FIRST)) {
 /*@-boundsread@*/
-	/*@-nullderef -type@*/	/* LCL: wazzup? */
+/*@-type@*/	/* LCL: wazzup? */
 	fn = con->optionStack->argv[0];
-	/*@=nullderef =type@*/
+/*@=type@*/
 /*@=boundsread@*/
 	if (fn == NULL) return len;
 	if (strchr(fn, '/')) fn = strrchr(fn, '/') + 1;
@@ -588,26 +592,30 @@ static size_t singleOptionUsage(FILE * fp, size_t cursor,
 	/*@globals fileSystem @*/
 	/*@modifies *fp, fileSystem @*/
 {
-    size_t len = 4;
+    size_t len = (size_t)4;
     char shortStr[2] = { '\0', '\0' };
     const char * item = shortStr;
     const char * argDescrip = getArgDescrip(opt, translation_domain);
+    int bingo = 0;
 
     if (opt->shortName != '\0' && opt->longName != NULL) {
 	len += 2;
 	if (!(opt->argInfo & POPT_ARGFLAG_ONEDASH)) len++;
 	len += strlen(opt->longName);
+	bingo++;
     } else if (opt->shortName != '\0') {
 	len++;
 	shortStr[0] = opt->shortName;
 	shortStr[1] = '\0';
+	bingo++;
     } else if (opt->longName) {
 	len += strlen(opt->longName);
 	if (!(opt->argInfo & POPT_ARGFLAG_ONEDASH)) len++;
 	item = opt->longName;
+	bingo++;
     }
 
-    if (len == 4) return cursor;
+    if (!bingo) return cursor;
 
 #ifdef POPT_WCHAR_HACK
     /* XXX Calculate no. of display characters. */
@@ -617,7 +625,7 @@ static size_t singleOptionUsage(FILE * fp, size_t cursor,
 	size_t n;
 
 /*@-boundswrite@*/
-	memset ((void *)&t, '\0', sizeof (t));	/* In initial state.  */
+	memset ((void *)&t, 0, sizeof (t));	/* In initial state.  */
 /*@=boundswrite@*/
 	/* Determine number of characters.  */
 	n = mbsrtowcs (NULL, &scopy, strlen(scopy), &t);
@@ -628,9 +636,9 @@ static size_t singleOptionUsage(FILE * fp, size_t cursor,
 	len += sizeof("=")-1 + strlen(argDescrip);
 #endif
 
-    if ((cursor + len) > 79) {
+    if ((cursor + len) > _POPTHELP_MAXLINE) {
 	fprintf(fp, "\n       ");
-	cursor = 7;
+	cursor = (size_t)7;
     } 
 
     if (opt->longName && opt->shortName) {
@@ -666,7 +674,7 @@ static size_t itemUsage(FILE * fp, size_t cursor,
 {
     int i;
 
-    /*@-branchstate@*/		/* FIX: W2DO? */
+/*@-branchstate@*/		/* FIX: W2DO? */
     if (item != NULL)
     for (i = 0; i < nitems; i++, item++) {
 	const struct poptOption * opt;
@@ -678,7 +686,7 @@ static size_t itemUsage(FILE * fp, size_t cursor,
 	    cursor = singleOptionUsage(fp, cursor, opt, translation_domain);
 	}
     }
-    /*@=branchstate@*/
+/*@=branchstate@*/
 
     return cursor;
 }
@@ -709,7 +717,7 @@ static size_t singleTableUsage(poptContext con, FILE * fp, size_t cursor,
 	/*@globals fileSystem @*/
 	/*@modifies *fp, done, fileSystem @*/
 {
-    /*@-branchstate@*/		/* FIX: W2DO? */
+/*@-branchstate@*/		/* FIX: W2DO? */
     if (opt != NULL)
     for (; (opt->longName || opt->shortName || opt->arg) ; opt++) {
         if ((opt->argInfo & POPT_ARG_MASK) == POPT_ARG_INTL_DOMAIN) {
@@ -740,7 +748,7 @@ static size_t singleTableUsage(poptContext con, FILE * fp, size_t cursor,
 	    cursor = singleOptionUsage(fp, cursor, opt, translation_domain);
 	}
     }
-    /*@=branchstate@*/
+/*@=branchstate@*/
 
     return cursor;
 }
@@ -753,15 +761,16 @@ static size_t singleTableUsage(poptContext con, FILE * fp, size_t cursor,
  * @retval str		concatenation of short options
  * @return		length of display string
  */
-static int showShortOptions(const struct poptOption * opt, FILE * fp,
+static size_t showShortOptions(const struct poptOption * opt, FILE * fp,
 		/*@null@*/ char * str)
 	/*@globals fileSystem @*/
 	/*@modifies *str, *fp, fileSystem @*/
 	/*@requires maxRead(str) >= 0 @*/
 {
     /* bufsize larger then the ascii set, lazy alloca on top level call. */
-    char * s = (str != NULL ? str : memset(alloca(300), 0, 300));
-    int len = 0;
+    size_t nb = (size_t)300;
+    char * s = (str != NULL ? str : memset(alloca(nb), 0, nb));
+    size_t len = (size_t)0;
 
 /*@-boundswrite@*/
     if (opt != NULL)
@@ -775,7 +784,7 @@ static int showShortOptions(const struct poptOption * opt, FILE * fp,
 /*@=boundswrite@*/
 
     /* On return to top level, print the short options, return print length. */
-    if (s == str && *s != '\0') {
+    if (s != str && *s != '\0') {
 	fprintf(fp, " [-%s]", s);
 	len = strlen(s) + sizeof(" [-]")-1;
     }
@@ -805,7 +814,7 @@ void poptPrintUsage(poptContext con, FILE * fp, /*@unused@*/ int flags)
 
     if (con->otherHelp) {
 	cursor += strlen(con->otherHelp) + 1;
-	if (cursor > 79) fprintf(fp, "\n       ");
+	if (cursor > _POPTHELP_MAXLINE) fprintf(fp, "\n       ");
 	fprintf(fp, " %s", con->otherHelp);
     }
 
diff --git a/poptint.h b/poptint.h
index 5e75712..dae91bc 100644
--- a/poptint.h
+++ b/poptint.h
@@ -74,7 +74,7 @@ struct poptContext_s {
 /*@only@*/ /*@null@*/
     poptItem aliases;
     int numAliases;
-    int flags;
+    unsigned int flags;
 /*@owned@*/ /*@null@*/
     poptItem execs;
     int numExecs;
@@ -82,6 +82,7 @@ struct poptContext_s {
     const char ** finalArgv;
     int finalArgvCount;
     int finalArgvAlloced;
+    int (*maincall) (int argc, const char **argv);
 /*@dependent@*/ /*@null@*/
     poptItem doExec;
 /*@only@*/
@@ -113,4 +114,9 @@ struct poptContext_s {
 
 #define N_(foo) foo
 
+#define POPT_WARNING "(popt): Warning **: "
+
+int   POPT_fprintf (FILE* steam, const char *format, ...);
+char *POPT_prev_char (const char *str);
+
 #endif
diff --git a/poptparse.c b/poptparse.c
index a0dea80..f7190c4 100644
--- a/poptparse.c
+++ b/poptparse.c
@@ -33,12 +33,12 @@ int poptDupArgv(int argc, const char **argv,
     argv2 = (void *) dst;
     dst += (argc + 1) * sizeof(*argv);
 
-    /*@-branchstate@*/
+/*@-branchstate@*/
     for (i = 0; i < argc; i++) {
 	argv2[i] = dst;
 	dst += strlen(strcpy(dst, argv[i])) + 1;
     }
-    /*@=branchstate@*/
+/*@=branchstate@*/
     argv2[argc] = NULL;
 
     if (argvPtr) {
@@ -61,7 +61,7 @@ int poptParseArgvString(const char * s, int * argcPtr, const char *** argvPtr)
     int argvAlloced = POPT_ARGV_ARRAY_GROW_DELTA;
     const char ** argv = malloc(sizeof(*argv) * argvAlloced);
     int argc = 0;
-    int buflen = strlen(s) + 1;
+    size_t buflen = strlen(s) + 1;
     char * buf = memset(alloca(buflen), 0, buflen);
     int rc = POPT_ERROR_MALLOC;
 
@@ -133,11 +133,11 @@ int poptConfigFileToString(FILE *fp, char ** argstrp, /*@unused@*/ int flags)
     char * p;
     char * q;
     char * x;
-    int t;
-    int argvlen = 0;
+    size_t t;
+    size_t argvlen = 0;
     size_t maxlinelen = sizeof(line);
     size_t linelen;
-    int maxargvlen = 480;
+    size_t maxargvlen = (size_t)480;
     int linenum = 0;
 
     *argstrp = NULL;
@@ -205,7 +205,7 @@ int poptConfigFileToString(FILE *fp, char ** argstrp, /*@unused@*/ int flags)
 	/* now, loop and strip all ending whitespace */
 	x = p + linelen;
 	while (isspace(*--x))
-	    *x = 0;	/* null out last char if space (including fgets() NL) */
+	    *x = '\0';	/* null out last char if space (including fgets() NL) */
 
 	/* rest of line accept */
 	t = x - p;
diff --git a/system.h b/system.h
index c3d46cb..649f8c4 100644
--- a/system.h
+++ b/system.h
@@ -1,3 +1,7 @@
+/**
+ * \file popt/system.h
+ */
+
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
diff --git a/test1.c b/test1.c
index eeeb916..4819150 100644
--- a/test1.c
+++ b/test1.c
@@ -73,7 +73,7 @@ static struct poptOption moreCallbackArgs[] = {
   { NULL, '\0', POPT_ARG_CALLBACK|POPT_CBFLAG_INC_DATA,
 	(void *)option_callback, 0,
 	NULL, NULL },
-  { "cb2", 'c', POPT_ARG_STRING, NULL, 'c',
+  { "cb2", 'c', POPT_ARG_STRING, NULL, (int)'c',
 	"Test argument callbacks", NULL },
   POPT_TABLEEND
 };
@@ -82,9 +82,9 @@ static struct poptOption moreCallbackArgs[] = {
 static struct poptOption callbackArgs[] = {
   { NULL, '\0', POPT_ARG_CALLBACK, (void *)option_callback, 0,
 	"sampledata", NULL },
-  { "cb", 'c', POPT_ARG_STRING, NULL, 'c',
+  { "cb", 'c', POPT_ARG_STRING, NULL, (int)'c',
 	"Test argument callbacks", NULL },
-  { "longopt", '\0', 0, NULL, 'l',
+  { "longopt", '\0', 0, NULL, (int)'l',
 	"Unused option for help testing", NULL },
   POPT_TABLEEND
 };
@@ -245,7 +245,7 @@ int main(int argc, const char ** argv)
 	fprintf(stdout, " aLong: %ld", aLong);
 /*@-realcompare@*/
     if (aFloat != bFloat)
-	fprintf(stdout, " aFloat: %g", aFloat);
+	fprintf(stdout, " aFloat: %g", (double)aFloat);
     if (aDouble != bDouble)
 	fprintf(stdout, " aDouble: %g", aDouble);
 /*@=realcompare@*/
diff --git a/test3.c b/test3.c
index 8eacd3c..4c8a75c 100644
--- a/test3.c
+++ b/test3.c
@@ -1,5 +1,3 @@
-/* vim:ts=8:sts=4 */
-
 #include <stdio.h>
 #include <stdlib.h>
 #include <errno.h>
@@ -9,7 +7,7 @@
 int main (int argc, char **argv) {
     char *out;
     int newargc, j, f, ret;
-    char **newargv;
+    const char **newargv;
     FILE *fp;
 
     if (argc == 1) {
diff --git a/testit.sh b/testit.sh
index ecb4b79..822237d 100755
--- a/testit.sh
+++ b/testit.sh
@@ -76,8 +76,8 @@ run test1 "test1 - 23" "--echo-args -a" --echo-args -e -a
 run test1 "test1 - 24" "arg1: 0 arg2: (none) short: 1" -onedash
 run test1 "test1 - 25" "arg1: 0 arg2: (none) short: 1" --onedash
 run test1 "test1 - 26" "callback: c arg for cb2 foo arg1: 0 arg2: (none)" --cb2 foo
-run test1 "test1 - 27" "arg1: 0 arg2: (none) -" -
-run test1 "test1 - 28" "arg1: 0 arg2: foo -" - -2 foo
+run test1 "test1 - 27" "arg1: 0 arg2: (none) rest: -" -
+run test1 "test1 - 28" "arg1: 0 arg2: foo rest: -" - -2 foo
 run test1 "test1 - 29" "arg1: 0 arg2: bbbb" --arg2=aaaa -2 bbbb
 run test1 "test1 - 30" "arg1: 0 arg2: 'foo bingo' rest: boggle" --grab bingo boggle
 run test1 "test1 - 31" "arg1: 0 arg2: 'foo bar' rest: boggle" --grabbar boggle
-- 
Gitee


From 25af650235d52167c4e423094a6855799622eb20 Mon Sep 17 00:00:00 2001
From: Jeff Johnson <n3npq@mac.com>
Date: Fri, 25 May 2007 17:59:34 +0000
Subject: [PATCH 406/667] Eliminate the deletions.

---
 intl/.cvsignore      |    6 -
 intl/COPYING.LIB-2.0 |  482 ---------------
 intl/COPYING.LIB-2.1 |  515 ----------------
 intl/ChangeLog       |    4 -
 intl/VERSION         |    1 -
 intl/bindtextdom.c   |  369 ------------
 intl/config.charset  |  454 ---------------
 intl/dcgettext.c     |   59 --
 intl/dcigettext.c    | 1168 -------------------------------------
 intl/dcngettext.c    |   61 --
 intl/dgettext.c      |   59 --
 intl/dngettext.c     |   61 --
 intl/eval-plural.h   |  106 ----
 intl/explodename.c   |  192 ------
 intl/finddomain.c    |  198 -------
 intl/gettext.c       |   64 --
 intl/gettextP.h      |  205 -------
 intl/gmo.h           |  100 ----
 intl/hash-string.h   |   59 --
 intl/intl-compat.c   |  166 ------
 intl/l10nflist.c     |  409 -------------
 intl/libgnuintl.h    |  138 -----
 intl/loadinfo.h      |  121 ----
 intl/loadmsgcat.c    |  445 --------------
 intl/localcharset.c  |  345 -----------
 intl/locale.alias    |   78 ---
 intl/localealias.c   |  419 -------------
 intl/localename.c    |  694 ----------------------
 intl/ngettext.c      |   68 ---
 intl/os2compat.c     |   98 ----
 intl/os2compat.h     |   46 --
 intl/osdep.c         |   24 -
 intl/plural-exp.c    |  156 -----
 intl/plural-exp.h    |  126 ----
 intl/plural.c        | 1322 ------------------------------------------
 intl/plural.y        |  409 -------------
 intl/ref-add.sin     |   31 -
 intl/ref-del.sin     |   26 -
 intl/textdomain.c    |  142 -----
 39 files changed, 9426 deletions(-)
 delete mode 100644 intl/.cvsignore
 delete mode 100644 intl/COPYING.LIB-2.0
 delete mode 100644 intl/COPYING.LIB-2.1
 delete mode 100644 intl/ChangeLog
 delete mode 100644 intl/VERSION
 delete mode 100644 intl/bindtextdom.c
 delete mode 100755 intl/config.charset
 delete mode 100644 intl/dcgettext.c
 delete mode 100644 intl/dcigettext.c
 delete mode 100644 intl/dcngettext.c
 delete mode 100644 intl/dgettext.c
 delete mode 100644 intl/dngettext.c
 delete mode 100644 intl/eval-plural.h
 delete mode 100644 intl/explodename.c
 delete mode 100644 intl/finddomain.c
 delete mode 100644 intl/gettext.c
 delete mode 100644 intl/gettextP.h
 delete mode 100644 intl/gmo.h
 delete mode 100644 intl/hash-string.h
 delete mode 100644 intl/intl-compat.c
 delete mode 100644 intl/l10nflist.c
 delete mode 100644 intl/libgnuintl.h
 delete mode 100644 intl/loadinfo.h
 delete mode 100644 intl/loadmsgcat.c
 delete mode 100644 intl/localcharset.c
 delete mode 100644 intl/locale.alias
 delete mode 100644 intl/localealias.c
 delete mode 100644 intl/localename.c
 delete mode 100644 intl/ngettext.c
 delete mode 100644 intl/os2compat.c
 delete mode 100644 intl/os2compat.h
 delete mode 100644 intl/osdep.c
 delete mode 100644 intl/plural-exp.c
 delete mode 100644 intl/plural-exp.h
 delete mode 100644 intl/plural.c
 delete mode 100644 intl/plural.y
 delete mode 100644 intl/ref-add.sin
 delete mode 100644 intl/ref-del.sin
 delete mode 100644 intl/textdomain.c

diff --git a/intl/.cvsignore b/intl/.cvsignore
deleted file mode 100644
index 0f61936..0000000
--- a/intl/.cvsignore
+++ /dev/null
@@ -1,6 +0,0 @@
-Makefile
-po2tbl.sed
-charset.alias
-libintl.h
-ref-add.sed
-ref-del.sed
diff --git a/intl/COPYING.LIB-2.0 b/intl/COPYING.LIB-2.0
deleted file mode 100644
index 161a3d1..0000000
--- a/intl/COPYING.LIB-2.0
+++ /dev/null
@@ -1,482 +0,0 @@
-		  GNU LIBRARY GENERAL PUBLIC LICENSE
-		       Version 2, June 1991
-
- Copyright (C) 1991 Free Software Foundation, Inc.
- 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
- Everyone is permitted to copy and distribute verbatim copies
- of this license document, but changing it is not allowed.
-
-[This is the first released version of the library GPL.  It is
- numbered 2 because it goes with version 2 of the ordinary GPL.]
-
-			    Preamble
-
-  The licenses for most software are designed to take away your
-freedom to share and change it.  By contrast, the GNU General Public
-Licenses are intended to guarantee your freedom to share and change
-free software--to make sure the software is free for all its users.
-
-  This license, the Library General Public License, applies to some
-specially designated Free Software Foundation software, and to any
-other libraries whose authors decide to use it.  You can use it for
-your libraries, too.
-
-  When we speak of free software, we are referring to freedom, not
-price.  Our General Public Licenses are designed to make sure that you
-have the freedom to distribute copies of free software (and charge for
-this service if you wish), that you receive source code or can get it
-if you want it, that you can change the software or use pieces of it
-in new free programs; and that you know you can do these things.
-
-  To protect your rights, we need to make restrictions that forbid
-anyone to deny you these rights or to ask you to surrender the rights.
-These restrictions translate to certain responsibilities for you if
-you distribute copies of the library, or if you modify it.
-
-  For example, if you distribute copies of the library, whether gratis
-or for a fee, you must give the recipients all the rights that we gave
-you.  You must make sure that they, too, receive or can get the source
-code.  If you link a program with the library, you must provide
-complete object files to the recipients so that they can relink them
-with the library, after making changes to the library and recompiling
-it.  And you must show them these terms so they know their rights.
-
-  Our method of protecting your rights has two steps: (1) copyright
-the library, and (2) offer you this license which gives you legal
-permission to copy, distribute and/or modify the library.
-
-  Also, for each distributor's protection, we want to make certain
-that everyone understands that there is no warranty for this free
-library.  If the library is modified by someone else and passed on, we
-want its recipients to know that what they have is not the original
-version, so that any problems introduced by others will not reflect on
-the original authors' reputations.
-
-  Finally, any free program is threatened constantly by software
-patents.  We wish to avoid the danger that companies distributing free
-software will individually obtain patent licenses, thus in effect
-transforming the program into proprietary software.  To prevent this,
-we have made it clear that any patent must be licensed for everyone's
-free use or not licensed at all.
-
-  Most GNU software, including some libraries, is covered by the ordinary
-GNU General Public License, which was designed for utility programs.  This
-license, the GNU Library General Public License, applies to certain
-designated libraries.  This license is quite different from the ordinary
-one; be sure to read it in full, and don't assume that anything in it is
-the same as in the ordinary license.
-
-  The reason we have a separate public license for some libraries is that
-they blur the distinction we usually make between modifying or adding to a
-program and simply using it.  Linking a program with a library, without
-changing the library, is in some sense simply using the library, and is
-analogous to running a utility program or application program.  However, in
-a textual and legal sense, the linked executable is a combined work, a
-derivative of the original library, and the ordinary General Public License
-treats it as such.
-
-  Because of this blurred distinction, using the ordinary General
-Public License for libraries did not effectively promote software
-sharing, because most developers did not use the libraries.  We
-concluded that weaker conditions might promote sharing better.
-
-  However, unrestricted linking of non-free programs would deprive the
-users of those programs of all benefit from the free status of the
-libraries themselves.  This Library General Public License is intended to
-permit developers of non-free programs to use free libraries, while
-preserving your freedom as a user of such programs to change the free
-libraries that are incorporated in them.  (We have not seen how to achieve
-this as regards changes in header files, but we have achieved it as regards
-changes in the actual functions of the Library.)  The hope is that this
-will lead to faster development of free libraries.
-
-  The precise terms and conditions for copying, distribution and
-modification follow.  Pay close attention to the difference between a
-"work based on the library" and a "work that uses the library".  The
-former contains code derived from the library, while the latter only
-works together with the library.
-
-  Note that it is possible for a library to be covered by the ordinary
-General Public License rather than by this special one.
-
-		  GNU LIBRARY GENERAL PUBLIC LICENSE
-   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
-
-  0. This License Agreement applies to any software library which
-contains a notice placed by the copyright holder or other authorized
-party saying it may be distributed under the terms of this Library
-General Public License (also called "this License").  Each licensee is
-addressed as "you".
-
-  A "library" means a collection of software functions and/or data
-prepared so as to be conveniently linked with application programs
-(which use some of those functions and data) to form executables.
-
-  The "Library", below, refers to any such software library or work
-which has been distributed under these terms.  A "work based on the
-Library" means either the Library or any derivative work under
-copyright law: that is to say, a work containing the Library or a
-portion of it, either verbatim or with modifications and/or translated
-straightforwardly into another language.  (Hereinafter, translation is
-included without limitation in the term "modification".)
-
-  "Source code" for a work means the preferred form of the work for
-making modifications to it.  For a library, complete source code means
-all the source code for all modules it contains, plus any associated
-interface definition files, plus the scripts used to control compilation
-and installation of the library.
-
-  Activities other than copying, distribution and modification are not
-covered by this License; they are outside its scope.  The act of
-running a program using the Library is not restricted, and output from
-such a program is covered only if its contents constitute a work based
-on the Library (independent of the use of the Library in a tool for
-writing it).  Whether that is true depends on what the Library does
-and what the program that uses the Library does.
-  
-  1. You may copy and distribute verbatim copies of the Library's
-complete source code as you receive it, in any medium, provided that
-you conspicuously and appropriately publish on each copy an
-appropriate copyright notice and disclaimer of warranty; keep intact
-all the notices that refer to this License and to the absence of any
-warranty; and distribute a copy of this License along with the
-Library.
-
-  You may charge a fee for the physical act of transferring a copy,
-and you may at your option offer warranty protection in exchange for a
-fee.
-
-  2. You may modify your copy or copies of the Library or any portion
-of it, thus forming a work based on the Library, and copy and
-distribute such modifications or work under the terms of Section 1
-above, provided that you also meet all of these conditions:
-
-    a) The modified work must itself be a software library.
-
-    b) You must cause the files modified to carry prominent notices
-    stating that you changed the files and the date of any change.
-
-    c) You must cause the whole of the work to be licensed at no
-    charge to all third parties under the terms of this License.
-
-    d) If a facility in the modified Library refers to a function or a
-    table of data to be supplied by an application program that uses
-    the facility, other than as an argument passed when the facility
-    is invoked, then you must make a good faith effort to ensure that,
-    in the event an application does not supply such function or
-    table, the facility still operates, and performs whatever part of
-    its purpose remains meaningful.
-
-    (For example, a function in a library to compute square roots has
-    a purpose that is entirely well-defined independent of the
-    application.  Therefore, Subsection 2d requires that any
-    application-supplied function or table used by this function must
-    be optional: if the application does not supply it, the square
-    root function must still compute square roots.)
-
-These requirements apply to the modified work as a whole.  If
-identifiable sections of that work are not derived from the Library,
-and can be reasonably considered independent and separate works in
-themselves, then this License, and its terms, do not apply to those
-sections when you distribute them as separate works.  But when you
-distribute the same sections as part of a whole which is a work based
-on the Library, the distribution of the whole must be on the terms of
-this License, whose permissions for other licensees extend to the
-entire whole, and thus to each and every part regardless of who wrote
-it.
-
-Thus, it is not the intent of this section to claim rights or contest
-your rights to work written entirely by you; rather, the intent is to
-exercise the right to control the distribution of derivative or
-collective works based on the Library.
-
-In addition, mere aggregation of another work not based on the Library
-with the Library (or with a work based on the Library) on a volume of
-a storage or distribution medium does not bring the other work under
-the scope of this License.
-
-  3. You may opt to apply the terms of the ordinary GNU General Public
-License instead of this License to a given copy of the Library.  To do
-this, you must alter all the notices that refer to this License, so
-that they refer to the ordinary GNU General Public License, version 2,
-instead of to this License.  (If a newer version than version 2 of the
-ordinary GNU General Public License has appeared, then you can specify
-that version instead if you wish.)  Do not make any other change in
-these notices.
-
-  Once this change is made in a given copy, it is irreversible for
-that copy, so the ordinary GNU General Public License applies to all
-subsequent copies and derivative works made from that copy.
-
-  This option is useful when you wish to copy part of the code of
-the Library into a program that is not a library.
-
-  4. You may copy and distribute the Library (or a portion or
-derivative of it, under Section 2) in object code or executable form
-under the terms of Sections 1 and 2 above provided that you accompany
-it with the complete corresponding machine-readable source code, which
-must be distributed under the terms of Sections 1 and 2 above on a
-medium customarily used for software interchange.
-
-  If distribution of object code is made by offering access to copy
-from a designated place, then offering equivalent access to copy the
-source code from the same place satisfies the requirement to
-distribute the source code, even though third parties are not
-compelled to copy the source along with the object code.
-
-  5. A program that contains no derivative of any portion of the
-Library, but is designed to work with the Library by being compiled or
-linked with it, is called a "work that uses the Library".  Such a
-work, in isolation, is not a derivative work of the Library, and
-therefore falls outside the scope of this License.
-
-  However, linking a "work that uses the Library" with the Library
-creates an executable that is a derivative of the Library (because it
-contains portions of the Library), rather than a "work that uses the
-library".  The executable is therefore covered by this License.
-Section 6 states terms for distribution of such executables.
-
-  When a "work that uses the Library" uses material from a header file
-that is part of the Library, the object code for the work may be a
-derivative work of the Library even though the source code is not.
-Whether this is true is especially significant if the work can be
-linked without the Library, or if the work is itself a library.  The
-threshold for this to be true is not precisely defined by law.
-
-  If such an object file uses only numerical parameters, data
-structure layouts and accessors, and small macros and small inline
-functions (ten lines or less in length), then the use of the object
-file is unrestricted, regardless of whether it is legally a derivative
-work.  (Executables containing this object code plus portions of the
-Library will still fall under Section 6.)
-
-  Otherwise, if the work is a derivative of the Library, you may
-distribute the object code for the work under the terms of Section 6.
-Any executables containing that work also fall under Section 6,
-whether or not they are linked directly with the Library itself.
-
-  6. As an exception to the Sections above, you may also compile or
-link a "work that uses the Library" with the Library to produce a
-work containing portions of the Library, and distribute that work
-under terms of your choice, provided that the terms permit
-modification of the work for the customer's own use and reverse
-engineering for debugging such modifications.
-
-  You must give prominent notice with each copy of the work that the
-Library is used in it and that the Library and its use are covered by
-this License.  You must supply a copy of this License.  If the work
-during execution displays copyright notices, you must include the
-copyright notice for the Library among them, as well as a reference
-directing the user to the copy of this License.  Also, you must do one
-of these things:
-
-    a) Accompany the work with the complete corresponding
-    machine-readable source code for the Library including whatever
-    changes were used in the work (which must be distributed under
-    Sections 1 and 2 above); and, if the work is an executable linked
-    with the Library, with the complete machine-readable "work that
-    uses the Library", as object code and/or source code, so that the
-    user can modify the Library and then relink to produce a modified
-    executable containing the modified Library.  (It is understood
-    that the user who changes the contents of definitions files in the
-    Library will not necessarily be able to recompile the application
-    to use the modified definitions.)
-
-    b) Accompany the work with a written offer, valid for at
-    least three years, to give the same user the materials
-    specified in Subsection 6a, above, for a charge no more
-    than the cost of performing this distribution.
-
-    c) If distribution of the work is made by offering access to copy
-    from a designated place, offer equivalent access to copy the above
-    specified materials from the same place.
-
-    d) Verify that the user has already received a copy of these
-    materials or that you have already sent this user a copy.
-
-  For an executable, the required form of the "work that uses the
-Library" must include any data and utility programs needed for
-reproducing the executable from it.  However, as a special exception,
-the source code distributed need not include anything that is normally
-distributed (in either source or binary form) with the major
-components (compiler, kernel, and so on) of the operating system on
-which the executable runs, unless that component itself accompanies
-the executable.
-
-  It may happen that this requirement contradicts the license
-restrictions of other proprietary libraries that do not normally
-accompany the operating system.  Such a contradiction means you cannot
-use both them and the Library together in an executable that you
-distribute.
-
-  7. You may place library facilities that are a work based on the
-Library side-by-side in a single library together with other library
-facilities not covered by this License, and distribute such a combined
-library, provided that the separate distribution of the work based on
-the Library and of the other library facilities is otherwise
-permitted, and provided that you do these two things:
-
-    a) Accompany the combined library with a copy of the same work
-    based on the Library, uncombined with any other library
-    facilities.  This must be distributed under the terms of the
-    Sections above.
-
-    b) Give prominent notice with the combined library of the fact
-    that part of it is a work based on the Library, and explaining
-    where to find the accompanying uncombined form of the same work.
-
-  8. You may not copy, modify, sublicense, link with, or distribute
-the Library except as expressly provided under this License.  Any
-attempt otherwise to copy, modify, sublicense, link with, or
-distribute the Library is void, and will automatically terminate your
-rights under this License.  However, parties who have received copies,
-or rights, from you under this License will not have their licenses
-terminated so long as such parties remain in full compliance.
-
-  9. You are not required to accept this License, since you have not
-signed it.  However, nothing else grants you permission to modify or
-distribute the Library or its derivative works.  These actions are
-prohibited by law if you do not accept this License.  Therefore, by
-modifying or distributing the Library (or any work based on the
-Library), you indicate your acceptance of this License to do so, and
-all its terms and conditions for copying, distributing or modifying
-the Library or works based on it.
-
-  10. Each time you redistribute the Library (or any work based on the
-Library), the recipient automatically receives a license from the
-original licensor to copy, distribute, link with or modify the Library
-subject to these terms and conditions.  You may not impose any further
-restrictions on the recipients' exercise of the rights granted herein.
-You are not responsible for enforcing compliance by third parties to
-this License.
-
-  11. If, as a consequence of a court judgment or allegation of patent
-infringement or for any other reason (not limited to patent issues),
-conditions are imposed on you (whether by court order, agreement or
-otherwise) that contradict the conditions of this License, they do not
-excuse you from the conditions of this License.  If you cannot
-distribute so as to satisfy simultaneously your obligations under this
-License and any other pertinent obligations, then as a consequence you
-may not distribute the Library at all.  For example, if a patent
-license would not permit royalty-free redistribution of the Library by
-all those who receive copies directly or indirectly through you, then
-the only way you could satisfy both it and this License would be to
-refrain entirely from distribution of the Library.
-
-If any portion of this section is held invalid or unenforceable under any
-particular circumstance, the balance of the section is intended to apply,
-and the section as a whole is intended to apply in other circumstances.
-
-It is not the purpose of this section to induce you to infringe any
-patents or other property right claims or to contest validity of any
-such claims; this section has the sole purpose of protecting the
-integrity of the free software distribution system which is
-implemented by public license practices.  Many people have made
-generous contributions to the wide range of software distributed
-through that system in reliance on consistent application of that
-system; it is up to the author/donor to decide if he or she is willing
-to distribute software through any other system and a licensee cannot
-impose that choice.
-
-This section is intended to make thoroughly clear what is believed to
-be a consequence of the rest of this License.
-
-  12. If the distribution and/or use of the Library is restricted in
-certain countries either by patents or by copyrighted interfaces, the
-original copyright holder who places the Library under this License may add
-an explicit geographical distribution limitation excluding those countries,
-so that distribution is permitted only in or among countries not thus
-excluded.  In such case, this License incorporates the limitation as if
-written in the body of this License.
-
-  13. The Free Software Foundation may publish revised and/or new
-versions of the Library General Public License from time to time.
-Such new versions will be similar in spirit to the present version,
-but may differ in detail to address new problems or concerns.
-
-Each version is given a distinguishing version number.  If the Library
-specifies a version number of this License which applies to it and
-"any later version", you have the option of following the terms and
-conditions either of that version or of any later version published by
-the Free Software Foundation.  If the Library does not specify a
-license version number, you may choose any version ever published by
-the Free Software Foundation.
-
-  14. If you wish to incorporate parts of the Library into other free
-programs whose distribution conditions are incompatible with these,
-write to the author to ask for permission.  For software which is
-copyrighted by the Free Software Foundation, write to the Free
-Software Foundation; we sometimes make exceptions for this.  Our
-decision will be guided by the two goals of preserving the free status
-of all derivatives of our free software and of promoting the sharing
-and reuse of software generally.
-
-			    NO WARRANTY
-
-  15. BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO
-WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW.
-EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR
-OTHER PARTIES PROVIDE THE LIBRARY "AS IS" WITHOUT WARRANTY OF ANY
-KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE
-LIBRARY IS WITH YOU.  SHOULD THE LIBRARY PROVE DEFECTIVE, YOU ASSUME
-THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
-
-  16. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN
-WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY
-AND/OR REDISTRIBUTE THE LIBRARY AS PERMITTED ABOVE, BE LIABLE TO YOU
-FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR
-CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE
-LIBRARY (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING
-RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A
-FAILURE OF THE LIBRARY TO OPERATE WITH ANY OTHER SOFTWARE), EVEN IF
-SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
-DAMAGES.
-
-		     END OF TERMS AND CONDITIONS
-
-     Appendix: How to Apply These Terms to Your New Libraries
-
-  If you develop a new library, and you want it to be of the greatest
-possible use to the public, we recommend making it free software that
-everyone can redistribute and change.  You can do so by permitting
-redistribution under these terms (or, alternatively, under the terms of the
-ordinary General Public License).
-
-  To apply these terms, attach the following notices to the library.  It is
-safest to attach them to the start of each source file to most effectively
-convey the exclusion of warranty; and each file should have at least the
-"copyright" line and a pointer to where the full notice is found.
-
-    <one line to give the library's name and a brief idea of what it does.>
-    Copyright (C) <year>  <name of author>
-
-    This library is free software; you can redistribute it and/or
-    modify it under the terms of the GNU Library General Public
-    License as published by the Free Software Foundation; either
-    version 2 of the License, or (at your option) any later version.
-
-    This library is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-    Library General Public License for more details.
-
-    You should have received a copy of the GNU Library General Public
-    License along with this library; if not, write to the Free
-    Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
-    MA 02111-1307, USA
-
-Also add information on how to contact you by electronic and paper mail.
-
-You should also get your employer (if you work as a programmer) or your
-school, if any, to sign a "copyright disclaimer" for the library, if
-necessary.  Here is a sample; alter the names:
-
-  Yoyodyne, Inc., hereby disclaims all copyright interest in the
-  library `Frob' (a library for tweaking knobs) written by James Random Hacker.
-
-  <signature of Ty Coon>, 1 April 1990
-  Ty Coon, President of Vice
-
-That's all there is to it!
diff --git a/intl/COPYING.LIB-2.1 b/intl/COPYING.LIB-2.1
deleted file mode 100644
index c4792dd..0000000
--- a/intl/COPYING.LIB-2.1
+++ /dev/null
@@ -1,515 +0,0 @@
-
-                  GNU LESSER GENERAL PUBLIC LICENSE
-                       Version 2.1, February 1999
-
- Copyright (C) 1991, 1999 Free Software Foundation, Inc.
-     59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- Everyone is permitted to copy and distribute verbatim copies
- of this license document, but changing it is not allowed.
-
-[This is the first released version of the Lesser GPL.  It also counts
- as the successor of the GNU Library Public License, version 2, hence
- the version number 2.1.]
-
-                            Preamble
-
-  The licenses for most software are designed to take away your
-freedom to share and change it.  By contrast, the GNU General Public
-Licenses are intended to guarantee your freedom to share and change
-free software--to make sure the software is free for all its users.
-
-  This license, the Lesser General Public License, applies to some
-specially designated software packages--typically libraries--of the
-Free Software Foundation and other authors who decide to use it.  You
-can use it too, but we suggest you first think carefully about whether
-this license or the ordinary General Public License is the better
-strategy to use in any particular case, based on the explanations
-below.
-
-  When we speak of free software, we are referring to freedom of use,
-not price.  Our General Public Licenses are designed to make sure that
-you have the freedom to distribute copies of free software (and charge
-for this service if you wish); that you receive source code or can get
-it if you want it; that you can change the software and use pieces of
-it in new free programs; and that you are informed that you can do
-these things.
-
-  To protect your rights, we need to make restrictions that forbid
-distributors to deny you these rights or to ask you to surrender these
-rights.  These restrictions translate to certain responsibilities for
-you if you distribute copies of the library or if you modify it.
-
-  For example, if you distribute copies of the library, whether gratis
-or for a fee, you must give the recipients all the rights that we gave
-you.  You must make sure that they, too, receive or can get the source
-code.  If you link other code with the library, you must provide
-complete object files to the recipients, so that they can relink them
-with the library after making changes to the library and recompiling
-it.  And you must show them these terms so they know their rights.
-
-  We protect your rights with a two-step method: (1) we copyright the
-library, and (2) we offer you this license, which gives you legal
-permission to copy, distribute and/or modify the library.
-
-  To protect each distributor, we want to make it very clear that
-there is no warranty for the free library.  Also, if the library is
-modified by someone else and passed on, the recipients should know
-that what they have is not the original version, so that the original
-author's reputation will not be affected by problems that might be
-introduced by others.
-^L
-  Finally, software patents pose a constant threat to the existence of
-any free program.  We wish to make sure that a company cannot
-effectively restrict the users of a free program by obtaining a
-restrictive license from a patent holder.  Therefore, we insist that
-any patent license obtained for a version of the library must be
-consistent with the full freedom of use specified in this license.
-
-  Most GNU software, including some libraries, is covered by the
-ordinary GNU General Public License.  This license, the GNU Lesser
-General Public License, applies to certain designated libraries, and
-is quite different from the ordinary General Public License.  We use
-this license for certain libraries in order to permit linking those
-libraries into non-free programs.
-
-  When a program is linked with a library, whether statically or using
-a shared library, the combination of the two is legally speaking a
-combined work, a derivative of the original library.  The ordinary
-General Public License therefore permits such linking only if the
-entire combination fits its criteria of freedom.  The Lesser General
-Public License permits more lax criteria for linking other code with
-the library.
-
-  We call this license the "Lesser" General Public License because it
-does Less to protect the user's freedom than the ordinary General
-Public License.  It also provides other free software developers Less
-of an advantage over competing non-free programs.  These disadvantages
-are the reason we use the ordinary General Public License for many
-libraries.  However, the Lesser license provides advantages in certain
-special circumstances.
-
-  For example, on rare occasions, there may be a special need to
-encourage the widest possible use of a certain library, so that it
-becomes
-a de-facto standard.  To achieve this, non-free programs must be
-allowed to use the library.  A more frequent case is that a free
-library does the same job as widely used non-free libraries.  In this
-case, there is little to gain by limiting the free library to free
-software only, so we use the Lesser General Public License.
-
-  In other cases, permission to use a particular library in non-free
-programs enables a greater number of people to use a large body of
-free software.  For example, permission to use the GNU C Library in
-non-free programs enables many more people to use the whole GNU
-operating system, as well as its variant, the GNU/Linux operating
-system.
-
-  Although the Lesser General Public License is Less protective of the
-users' freedom, it does ensure that the user of a program that is
-linked with the Library has the freedom and the wherewithal to run
-that program using a modified version of the Library.
-
-  The precise terms and conditions for copying, distribution and
-modification follow.  Pay close attention to the difference between a
-"work based on the library" and a "work that uses the library".  The
-former contains code derived from the library, whereas the latter must
-be combined with the library in order to run.
-^L
-                  GNU LESSER GENERAL PUBLIC LICENSE
-   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
-
-  0. This License Agreement applies to any software library or other
-program which contains a notice placed by the copyright holder or
-other authorized party saying it may be distributed under the terms of
-this Lesser General Public License (also called "this License").
-Each licensee is addressed as "you".
-
-  A "library" means a collection of software functions and/or data
-prepared so as to be conveniently linked with application programs
-(which use some of those functions and data) to form executables.
-
-  The "Library", below, refers to any such software library or work
-which has been distributed under these terms.  A "work based on the
-Library" means either the Library or any derivative work under
-copyright law: that is to say, a work containing the Library or a
-portion of it, either verbatim or with modifications and/or translated
-straightforwardly into another language.  (Hereinafter, translation is
-included without limitation in the term "modification".)
-
-  "Source code" for a work means the preferred form of the work for
-making modifications to it.  For a library, complete source code means
-all the source code for all modules it contains, plus any associated
-interface definition files, plus the scripts used to control
-compilation
-and installation of the library.
-
-  Activities other than copying, distribution and modification are not
-covered by this License; they are outside its scope.  The act of
-running a program using the Library is not restricted, and output from
-such a program is covered only if its contents constitute a work based
-on the Library (independent of the use of the Library in a tool for
-writing it).  Whether that is true depends on what the Library does
-and what the program that uses the Library does.
-
-  1. You may copy and distribute verbatim copies of the Library's
-complete source code as you receive it, in any medium, provided that
-you conspicuously and appropriately publish on each copy an
-appropriate copyright notice and disclaimer of warranty; keep intact
-all the notices that refer to this License and to the absence of any
-warranty; and distribute a copy of this License along with the
-Library.
-
-  You may charge a fee for the physical act of transferring a copy,
-and you may at your option offer warranty protection in exchange for a
-fee.
-
-  2. You may modify your copy or copies of the Library or any portion
-of it, thus forming a work based on the Library, and copy and
-distribute such modifications or work under the terms of Section 1
-above, provided that you also meet all of these conditions:
-
-    a) The modified work must itself be a software library.
-
-    b) You must cause the files modified to carry prominent notices
-    stating that you changed the files and the date of any change.
-
-    c) You must cause the whole of the work to be licensed at no
-    charge to all third parties under the terms of this License.
-
-    d) If a facility in the modified Library refers to a function or a
-    table of data to be supplied by an application program that uses
-    the facility, other than as an argument passed when the facility
-    is invoked, then you must make a good faith effort to ensure that,
-    in the event an application does not supply such function or
-    table, the facility still operates, and performs whatever part of
-    its purpose remains meaningful.
-
-    (For example, a function in a library to compute square roots has
-    a purpose that is entirely well-defined independent of the
-    application.  Therefore, Subsection 2d requires that any
-    application-supplied function or table used by this function must
-    be optional: if the application does not supply it, the square
-    root function must still compute square roots.)
-
-These requirements apply to the modified work as a whole.  If
-identifiable sections of that work are not derived from the Library,
-and can be reasonably considered independent and separate works in
-themselves, then this License, and its terms, do not apply to those
-sections when you distribute them as separate works.  But when you
-distribute the same sections as part of a whole which is a work based
-on the Library, the distribution of the whole must be on the terms of
-this License, whose permissions for other licensees extend to the
-entire whole, and thus to each and every part regardless of who wrote
-it.
-
-Thus, it is not the intent of this section to claim rights or contest
-your rights to work written entirely by you; rather, the intent is to
-exercise the right to control the distribution of derivative or
-collective works based on the Library.
-
-In addition, mere aggregation of another work not based on the Library
-with the Library (or with a work based on the Library) on a volume of
-a storage or distribution medium does not bring the other work under
-the scope of this License.
-
-  3. You may opt to apply the terms of the ordinary GNU General Public
-License instead of this License to a given copy of the Library.  To do
-this, you must alter all the notices that refer to this License, so
-that they refer to the ordinary GNU General Public License, version 2,
-instead of to this License.  (If a newer version than version 2 of the
-ordinary GNU General Public License has appeared, then you can specify
-that version instead if you wish.)  Do not make any other change in
-these notices.
-^L
-  Once this change is made in a given copy, it is irreversible for
-that copy, so the ordinary GNU General Public License applies to all
-subsequent copies and derivative works made from that copy.
-
-  This option is useful when you wish to copy part of the code of
-the Library into a program that is not a library.
-
-  4. You may copy and distribute the Library (or a portion or
-derivative of it, under Section 2) in object code or executable form
-under the terms of Sections 1 and 2 above provided that you accompany
-it with the complete corresponding machine-readable source code, which
-must be distributed under the terms of Sections 1 and 2 above on a
-medium customarily used for software interchange.
-
-  If distribution of object code is made by offering access to copy
-from a designated place, then offering equivalent access to copy the
-source code from the same place satisfies the requirement to
-distribute the source code, even though third parties are not
-compelled to copy the source along with the object code.
-
-  5. A program that contains no derivative of any portion of the
-Library, but is designed to work with the Library by being compiled or
-linked with it, is called a "work that uses the Library".  Such a
-work, in isolation, is not a derivative work of the Library, and
-therefore falls outside the scope of this License.
-
-  However, linking a "work that uses the Library" with the Library
-creates an executable that is a derivative of the Library (because it
-contains portions of the Library), rather than a "work that uses the
-library".  The executable is therefore covered by this License.
-Section 6 states terms for distribution of such executables.
-
-  When a "work that uses the Library" uses material from a header file
-that is part of the Library, the object code for the work may be a
-derivative work of the Library even though the source code is not.
-Whether this is true is especially significant if the work can be
-linked without the Library, or if the work is itself a library.  The
-threshold for this to be true is not precisely defined by law.
-
-  If such an object file uses only numerical parameters, data
-structure layouts and accessors, and small macros and small inline
-functions (ten lines or less in length), then the use of the object
-file is unrestricted, regardless of whether it is legally a derivative
-work.  (Executables containing this object code plus portions of the
-Library will still fall under Section 6.)
-
-  Otherwise, if the work is a derivative of the Library, you may
-distribute the object code for the work under the terms of Section 6.
-Any executables containing that work also fall under Section 6,
-whether or not they are linked directly with the Library itself.
-^L
-  6. As an exception to the Sections above, you may also combine or
-link a "work that uses the Library" with the Library to produce a
-work containing portions of the Library, and distribute that work
-under terms of your choice, provided that the terms permit
-modification of the work for the customer's own use and reverse
-engineering for debugging such modifications.
-
-  You must give prominent notice with each copy of the work that the
-Library is used in it and that the Library and its use are covered by
-this License.  You must supply a copy of this License.  If the work
-during execution displays copyright notices, you must include the
-copyright notice for the Library among them, as well as a reference
-directing the user to the copy of this License.  Also, you must do one
-of these things:
-
-    a) Accompany the work with the complete corresponding
-    machine-readable source code for the Library including whatever
-    changes were used in the work (which must be distributed under
-    Sections 1 and 2 above); and, if the work is an executable linked
-    with the Library, with the complete machine-readable "work that
-    uses the Library", as object code and/or source code, so that the
-    user can modify the Library and then relink to produce a modified
-    executable containing the modified Library.  (It is understood
-    that the user who changes the contents of definitions files in the
-    Library will not necessarily be able to recompile the application
-    to use the modified definitions.)
-
-    b) Use a suitable shared library mechanism for linking with the
-    Library.  A suitable mechanism is one that (1) uses at run time a
-    copy of the library already present on the user's computer system,
-    rather than copying library functions into the executable, and (2)
-    will operate properly with a modified version of the library, if
-    the user installs one, as long as the modified version is
-    interface-compatible with the version that the work was made with.
-
-    c) Accompany the work with a written offer, valid for at
-    least three years, to give the same user the materials
-    specified in Subsection 6a, above, for a charge no more
-    than the cost of performing this distribution.
-
-    d) If distribution of the work is made by offering access to copy
-    from a designated place, offer equivalent access to copy the above
-    specified materials from the same place.
-
-    e) Verify that the user has already received a copy of these
-    materials or that you have already sent this user a copy.
-
-  For an executable, the required form of the "work that uses the
-Library" must include any data and utility programs needed for
-reproducing the executable from it.  However, as a special exception,
-the materials to be distributed need not include anything that is
-normally distributed (in either source or binary form) with the major
-components (compiler, kernel, and so on) of the operating system on
-which the executable runs, unless that component itself accompanies
-the executable.
-
-  It may happen that this requirement contradicts the license
-restrictions of other proprietary libraries that do not normally
-accompany the operating system.  Such a contradiction means you cannot
-use both them and the Library together in an executable that you
-distribute.
-^L
-  7. You may place library facilities that are a work based on the
-Library side-by-side in a single library together with other library
-facilities not covered by this License, and distribute such a combined
-library, provided that the separate distribution of the work based on
-the Library and of the other library facilities is otherwise
-permitted, and provided that you do these two things:
-
-    a) Accompany the combined library with a copy of the same work
-    based on the Library, uncombined with any other library
-    facilities.  This must be distributed under the terms of the
-    Sections above.
-
-    b) Give prominent notice with the combined library of the fact
-    that part of it is a work based on the Library, and explaining
-    where to find the accompanying uncombined form of the same work.
-
-  8. You may not copy, modify, sublicense, link with, or distribute
-the Library except as expressly provided under this License.  Any
-attempt otherwise to copy, modify, sublicense, link with, or
-distribute the Library is void, and will automatically terminate your
-rights under this License.  However, parties who have received copies,
-or rights, from you under this License will not have their licenses
-terminated so long as such parties remain in full compliance.
-
-  9. You are not required to accept this License, since you have not
-signed it.  However, nothing else grants you permission to modify or
-distribute the Library or its derivative works.  These actions are
-prohibited by law if you do not accept this License.  Therefore, by
-modifying or distributing the Library (or any work based on the
-Library), you indicate your acceptance of this License to do so, and
-all its terms and conditions for copying, distributing or modifying
-the Library or works based on it.
-
-  10. Each time you redistribute the Library (or any work based on the
-Library), the recipient automatically receives a license from the
-original licensor to copy, distribute, link with or modify the Library
-subject to these terms and conditions.  You may not impose any further
-restrictions on the recipients' exercise of the rights granted herein.
-You are not responsible for enforcing compliance by third parties with
-this License.
-^L
-  11. If, as a consequence of a court judgment or allegation of patent
-infringement or for any other reason (not limited to patent issues),
-conditions are imposed on you (whether by court order, agreement or
-otherwise) that contradict the conditions of this License, they do not
-excuse you from the conditions of this License.  If you cannot
-distribute so as to satisfy simultaneously your obligations under this
-License and any other pertinent obligations, then as a consequence you
-may not distribute the Library at all.  For example, if a patent
-license would not permit royalty-free redistribution of the Library by
-all those who receive copies directly or indirectly through you, then
-the only way you could satisfy both it and this License would be to
-refrain entirely from distribution of the Library.
-
-If any portion of this section is held invalid or unenforceable under
-any particular circumstance, the balance of the section is intended to
-apply, and the section as a whole is intended to apply in other
-circumstances.
-
-It is not the purpose of this section to induce you to infringe any
-patents or other property right claims or to contest validity of any
-such claims; this section has the sole purpose of protecting the
-integrity of the free software distribution system which is
-implemented by public license practices.  Many people have made
-generous contributions to the wide range of software distributed
-through that system in reliance on consistent application of that
-system; it is up to the author/donor to decide if he or she is willing
-to distribute software through any other system and a licensee cannot
-impose that choice.
-
-This section is intended to make thoroughly clear what is believed to
-be a consequence of the rest of this License.
-
-  12. If the distribution and/or use of the Library is restricted in
-certain countries either by patents or by copyrighted interfaces, the
-original copyright holder who places the Library under this License
-may add an explicit geographical distribution limitation excluding those
-countries, so that distribution is permitted only in or among
-countries not thus excluded.  In such case, this License incorporates
-the limitation as if written in the body of this License.
-
-  13. The Free Software Foundation may publish revised and/or new
-versions of the Lesser General Public License from time to time.
-Such new versions will be similar in spirit to the present version,
-but may differ in detail to address new problems or concerns.
-
-Each version is given a distinguishing version number.  If the Library
-specifies a version number of this License which applies to it and
-"any later version", you have the option of following the terms and
-conditions either of that version or of any later version published by
-the Free Software Foundation.  If the Library does not specify a
-license version number, you may choose any version ever published by
-the Free Software Foundation.
-^L
-  14. If you wish to incorporate parts of the Library into other free
-programs whose distribution conditions are incompatible with these,
-write to the author to ask for permission.  For software which is
-copyrighted by the Free Software Foundation, write to the Free
-Software Foundation; we sometimes make exceptions for this.  Our
-decision will be guided by the two goals of preserving the free status
-of all derivatives of our free software and of promoting the sharing
-and reuse of software generally.
-
-                            NO WARRANTY
-
-  15. BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO
-WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW.
-EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR
-OTHER PARTIES PROVIDE THE LIBRARY "AS IS" WITHOUT WARRANTY OF ANY
-KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE
-LIBRARY IS WITH YOU.  SHOULD THE LIBRARY PROVE DEFECTIVE, YOU ASSUME
-THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
-
-  16. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN
-WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY
-AND/OR REDISTRIBUTE THE LIBRARY AS PERMITTED ABOVE, BE LIABLE TO YOU
-FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR
-CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE
-LIBRARY (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING
-RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A
-FAILURE OF THE LIBRARY TO OPERATE WITH ANY OTHER SOFTWARE), EVEN IF
-SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
-DAMAGES.
-
-                     END OF TERMS AND CONDITIONS
-^L
-           How to Apply These Terms to Your New Libraries
-
-  If you develop a new library, and you want it to be of the greatest
-possible use to the public, we recommend making it free software that
-everyone can redistribute and change.  You can do so by permitting
-redistribution under these terms (or, alternatively, under the terms
-of the ordinary General Public License).
-
-  To apply these terms, attach the following notices to the library.
-It is safest to attach them to the start of each source file to most
-effectively convey the exclusion of warranty; and each file should
-have at least the "copyright" line and a pointer to where the full
-notice is found.
-
-
-    <one line to give the library's name and a brief idea of what it
-does.>
-    Copyright (C) <year>  <name of author>
-
-    This library is free software; you can redistribute it and/or
-    modify it under the terms of the GNU Lesser General Public
-    License as published by the Free Software Foundation; either
-    version 2 of the License, or (at your option) any later version.
-
-    This library is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-    Lesser General Public License for more details.
-
-    You should have received a copy of the GNU Lesser General Public
-    License along with this library; if not, write to the Free Software
-    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307  USA
-
-Also add information on how to contact you by electronic and paper
-mail.
-
-You should also get your employer (if you work as a programmer) or
-your
-school, if any, to sign a "copyright disclaimer" for the library, if
-necessary.  Here is a sample; alter the names:
-
-  Yoyodyne, Inc., hereby disclaims all copyright interest in the
-  library `Frob' (a library for tweaking knobs) written by James
-Random Hacker.
-
-  <signature of Ty Coon>, 1 April 1990
-  Ty Coon, President of Vice
-
-That's all there is to it!
-
-
diff --git a/intl/ChangeLog b/intl/ChangeLog
deleted file mode 100644
index c75d30c..0000000
--- a/intl/ChangeLog
+++ /dev/null
@@ -1,4 +0,0 @@
-2002-04-24  GNU  <bug-gnu-gettext@gnu.org>
-
-	* Version 0.11.2 released.
-
diff --git a/intl/VERSION b/intl/VERSION
deleted file mode 100644
index 657e73b..0000000
--- a/intl/VERSION
+++ /dev/null
@@ -1 +0,0 @@
-GNU gettext library from gettext-0.11.2
diff --git a/intl/bindtextdom.c b/intl/bindtextdom.c
deleted file mode 100644
index a3c233d..0000000
--- a/intl/bindtextdom.c
+++ /dev/null
@@ -1,369 +0,0 @@
-/* Implementation of the bindtextdomain(3) function
-   Copyright (C) 1995-1998, 2000, 2001, 2002 Free Software Foundation, Inc.
-
-   This program is free software; you can redistribute it and/or modify it
-   under the terms of the GNU Library General Public License as published
-   by the Free Software Foundation; either version 2, or (at your option)
-   any later version.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   Library General Public License for more details.
-
-   You should have received a copy of the GNU Library General Public
-   License along with this program; if not, write to the Free Software
-   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
-   USA.  */
-
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
-
-#include <stddef.h>
-#include <stdlib.h>
-#include <string.h>
-
-#ifdef _LIBC
-# include <libintl.h>
-#else
-# include "libgnuintl.h"
-#endif
-#include "gettextP.h"
-
-#ifdef _LIBC
-/* We have to handle multi-threaded applications.  */
-# include <bits/libc-lock.h>
-#else
-/* Provide dummy implementation if this is outside glibc.  */
-# define __libc_rwlock_define(CLASS, NAME)
-# define __libc_rwlock_wrlock(NAME)
-# define __libc_rwlock_unlock(NAME)
-#endif
-
-/* The internal variables in the standalone libintl.a must have different
-   names than the internal variables in GNU libc, otherwise programs
-   using libintl.a cannot be linked statically.  */
-#if !defined _LIBC
-# define _nl_default_dirname _nl_default_dirname__
-# define _nl_domain_bindings _nl_domain_bindings__
-#endif
-
-/* Some compilers, like SunOS4 cc, don't have offsetof in <stddef.h>.  */
-#ifndef offsetof
-# define offsetof(type,ident) ((size_t)&(((type*)0)->ident))
-#endif
-
-/* @@ end of prolog @@ */
-
-/* Contains the default location of the message catalogs.  */
-extern const char _nl_default_dirname[];
-
-/* List with bindings of specific domains.  */
-extern struct binding *_nl_domain_bindings;
-
-/* Lock variable to protect the global data in the gettext implementation.  */
-__libc_rwlock_define (extern, _nl_state_lock attribute_hidden)
-
-
-/* Names for the libintl functions are a problem.  They must not clash
-   with existing names and they should follow ANSI C.  But this source
-   code is also used in GNU C Library where the names have a __
-   prefix.  So we have to make a difference here.  */
-#ifdef _LIBC
-# define BINDTEXTDOMAIN __bindtextdomain
-# define BIND_TEXTDOMAIN_CODESET __bind_textdomain_codeset
-# ifndef strdup
-#  define strdup(str) __strdup (str)
-# endif
-#else
-# define BINDTEXTDOMAIN bindtextdomain__
-# define BIND_TEXTDOMAIN_CODESET bind_textdomain_codeset__
-#endif
-
-/* Prototypes for local functions.  */
-static void set_binding_values PARAMS ((const char *domainname,
-					const char **dirnamep,
-					const char **codesetp));
-
-/* Specifies the directory name *DIRNAMEP and the output codeset *CODESETP
-   to be used for the DOMAINNAME message catalog.
-   If *DIRNAMEP or *CODESETP is NULL, the corresponding attribute is not
-   modified, only the current value is returned.
-   If DIRNAMEP or CODESETP is NULL, the corresponding attribute is neither
-   modified nor returned.  */
-static void
-set_binding_values (domainname, dirnamep, codesetp)
-     const char *domainname;
-     const char **dirnamep;
-     const char **codesetp;
-{
-  struct binding *binding;
-  int modified;
-
-  /* Some sanity checks.  */
-  if (domainname == NULL || domainname[0] == '\0')
-    {
-      if (dirnamep)
-	*dirnamep = NULL;
-      if (codesetp)
-	*codesetp = NULL;
-      return;
-    }
-
-  __libc_rwlock_wrlock (_nl_state_lock);
-
-  modified = 0;
-
-  for (binding = _nl_domain_bindings; binding != NULL; binding = binding->next)
-    {
-      int compare = strcmp (domainname, binding->domainname);
-      if (compare == 0)
-	/* We found it!  */
-	break;
-      if (compare < 0)
-	{
-	  /* It is not in the list.  */
-	  binding = NULL;
-	  break;
-	}
-    }
-
-  if (binding != NULL)
-    {
-      if (dirnamep)
-	{
-	  const char *dirname = *dirnamep;
-
-	  if (dirname == NULL)
-	    /* The current binding has be to returned.  */
-	    *dirnamep = binding->dirname;
-	  else
-	    {
-	      /* The domain is already bound.  If the new value and the old
-		 one are equal we simply do nothing.  Otherwise replace the
-		 old binding.  */
-	      char *result = binding->dirname;
-	      if (strcmp (dirname, result) != 0)
-		{
-		  if (strcmp (dirname, _nl_default_dirname) == 0)
-		    result = (char *) _nl_default_dirname;
-		  else
-		    {
-#if defined _LIBC || defined HAVE_STRDUP
-		      result = strdup (dirname);
-#else
-		      size_t len = strlen (dirname) + 1;
-		      result = (char *) malloc (len);
-		      if (__builtin_expect (result != NULL, 1))
-			memcpy (result, dirname, len);
-#endif
-		    }
-
-		  if (__builtin_expect (result != NULL, 1))
-		    {
-		      if (binding->dirname != _nl_default_dirname)
-			free (binding->dirname);
-
-		      binding->dirname = result;
-		      modified = 1;
-		    }
-		}
-	      *dirnamep = result;
-	    }
-	}
-
-      if (codesetp)
-	{
-	  const char *codeset = *codesetp;
-
-	  if (codeset == NULL)
-	    /* The current binding has be to returned.  */
-	    *codesetp = binding->codeset;
-	  else
-	    {
-	      /* The domain is already bound.  If the new value and the old
-		 one are equal we simply do nothing.  Otherwise replace the
-		 old binding.  */
-	      char *result = binding->codeset;
-	      if (result == NULL || strcmp (codeset, result) != 0)
-		{
-#if defined _LIBC || defined HAVE_STRDUP
-		  result = strdup (codeset);
-#else
-		  size_t len = strlen (codeset) + 1;
-		  result = (char *) malloc (len);
-		  if (__builtin_expect (result != NULL, 1))
-		    memcpy (result, codeset, len);
-#endif
-
-		  if (__builtin_expect (result != NULL, 1))
-		    {
-		      if (binding->codeset != NULL)
-			free (binding->codeset);
-
-		      binding->codeset = result;
-		      binding->codeset_cntr++;
-		      modified = 1;
-		    }
-		}
-	      *codesetp = result;
-	    }
-	}
-    }
-  else if ((dirnamep == NULL || *dirnamep == NULL)
-	   && (codesetp == NULL || *codesetp == NULL))
-    {
-      /* Simply return the default values.  */
-      if (dirnamep)
-	*dirnamep = _nl_default_dirname;
-      if (codesetp)
-	*codesetp = NULL;
-    }
-  else
-    {
-      /* We have to create a new binding.  */
-      size_t len = strlen (domainname) + 1;
-      struct binding *new_binding =
-	(struct binding *) malloc (offsetof (struct binding, domainname) + len);
-
-      if (__builtin_expect (new_binding == NULL, 0))
-	goto failed;
-
-      memcpy (new_binding->domainname, domainname, len);
-
-      if (dirnamep)
-	{
-	  const char *dirname = *dirnamep;
-
-	  if (dirname == NULL)
-	    /* The default value.  */
-	    dirname = _nl_default_dirname;
-	  else
-	    {
-	      if (strcmp (dirname, _nl_default_dirname) == 0)
-		dirname = _nl_default_dirname;
-	      else
-		{
-		  char *result;
-#if defined _LIBC || defined HAVE_STRDUP
-		  result = strdup (dirname);
-		  if (__builtin_expect (result == NULL, 0))
-		    goto failed_dirname;
-#else
-		  size_t len = strlen (dirname) + 1;
-		  result = (char *) malloc (len);
-		  if (__builtin_expect (result == NULL, 0))
-		    goto failed_dirname;
-		  memcpy (result, dirname, len);
-#endif
-		  dirname = result;
-		}
-	    }
-	  *dirnamep = dirname;
-	  new_binding->dirname = (char *) dirname;
-	}
-      else
-	/* The default value.  */
-	new_binding->dirname = (char *) _nl_default_dirname;
-
-      new_binding->codeset_cntr = 0;
-
-      if (codesetp)
-	{
-	  const char *codeset = *codesetp;
-
-	  if (codeset != NULL)
-	    {
-	      char *result;
-
-#if defined _LIBC || defined HAVE_STRDUP
-	      result = strdup (codeset);
-	      if (__builtin_expect (result == NULL, 0))
-		goto failed_codeset;
-#else
-	      size_t len = strlen (codeset) + 1;
-	      result = (char *) malloc (len);
-	      if (__builtin_expect (result == NULL, 0))
-		goto failed_codeset;
-	      memcpy (result, codeset, len);
-#endif
-	      codeset = result;
-	      new_binding->codeset_cntr++;
-	    }
-	  *codesetp = codeset;
-	  new_binding->codeset = (char *) codeset;
-	}
-      else
-	new_binding->codeset = NULL;
-
-      /* Now enqueue it.  */
-      if (_nl_domain_bindings == NULL
-	  || strcmp (domainname, _nl_domain_bindings->domainname) < 0)
-	{
-	  new_binding->next = _nl_domain_bindings;
-	  _nl_domain_bindings = new_binding;
-	}
-      else
-	{
-	  binding = _nl_domain_bindings;
-	  while (binding->next != NULL
-		 && strcmp (domainname, binding->next->domainname) > 0)
-	    binding = binding->next;
-
-	  new_binding->next = binding->next;
-	  binding->next = new_binding;
-	}
-
-      modified = 1;
-
-      /* Here we deal with memory allocation failures.  */
-      if (0)
-	{
-	failed_codeset:
-	  if (new_binding->dirname != _nl_default_dirname)
-	    free (new_binding->dirname);
-	failed_dirname:
-	  free (new_binding);
-	failed:
-	  if (dirnamep)
-	    *dirnamep = NULL;
-	  if (codesetp)
-	    *codesetp = NULL;
-	}
-    }
-
-  /* If we modified any binding, we flush the caches.  */
-  if (modified)
-    ++_nl_msg_cat_cntr;
-
-  __libc_rwlock_unlock (_nl_state_lock);
-}
-
-/* Specify that the DOMAINNAME message catalog will be found
-   in DIRNAME rather than in the system locale data base.  */
-char *
-BINDTEXTDOMAIN (domainname, dirname)
-     const char *domainname;
-     const char *dirname;
-{
-  set_binding_values (domainname, &dirname, NULL);
-  return (char *) dirname;
-}
-
-/* Specify the character encoding in which the messages from the
-   DOMAINNAME message catalog will be returned.  */
-char *
-BIND_TEXTDOMAIN_CODESET (domainname, codeset)
-     const char *domainname;
-     const char *codeset;
-{
-  set_binding_values (domainname, NULL, &codeset);
-  return (char *) codeset;
-}
-
-#ifdef _LIBC
-/* Aliases for function names in GNU C Library.  */
-weak_alias (__bindtextdomain, bindtextdomain);
-weak_alias (__bind_textdomain_codeset, bind_textdomain_codeset);
-#endif
diff --git a/intl/config.charset b/intl/config.charset
deleted file mode 100755
index 0a1a68d..0000000
--- a/intl/config.charset
+++ /dev/null
@@ -1,454 +0,0 @@
-#! /bin/sh
-# Output a system dependent table of character encoding aliases.
-#
-#   Copyright (C) 2000-2002 Free Software Foundation, Inc.
-#
-#   This program is free software; you can redistribute it and/or modify it
-#   under the terms of the GNU Library General Public License as published
-#   by the Free Software Foundation; either version 2, or (at your option)
-#   any later version.
-#
-#   This program is distributed in the hope that it will be useful,
-#   but WITHOUT ANY WARRANTY; without even the implied warranty of
-#   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-#   Library General Public License for more details.
-#
-#   You should have received a copy of the GNU Library General Public
-#   License along with this program; if not, write to the Free Software
-#   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
-#   USA.
-#
-# The table consists of lines of the form
-#    ALIAS  CANONICAL
-#
-# ALIAS is the (system dependent) result of "nl_langinfo (CODESET)".
-# ALIAS is compared in a case sensitive way.
-#
-# CANONICAL is the GNU canonical name for this character encoding.
-# It must be an encoding supported by libiconv. Support by GNU libc is
-# also desirable. CANONICAL is case insensitive. Usually an upper case
-# MIME charset name is preferred.
-# The current list of GNU canonical charset names is as follows.
-#
-#       name                         used by which systems         a MIME name?
-#   ASCII, ANSI_X3.4-1968     glibc solaris freebsd
-#   ISO-8859-1                glibc aix hpux irix osf solaris freebsd   yes
-#   ISO-8859-2                glibc aix hpux irix osf solaris freebsd   yes
-#   ISO-8859-3                glibc                                     yes
-#   ISO-8859-4                osf solaris freebsd                       yes
-#   ISO-8859-5                glibc aix hpux irix osf solaris freebsd   yes
-#   ISO-8859-6                glibc aix hpux solaris                    yes
-#   ISO-8859-7                glibc aix hpux irix osf solaris           yes
-#   ISO-8859-8                glibc aix hpux osf solaris                yes
-#   ISO-8859-9                glibc aix hpux irix osf solaris           yes
-#   ISO-8859-13               glibc
-#   ISO-8859-15               glibc aix osf solaris freebsd
-#   KOI8-R                    glibc solaris freebsd                     yes
-#   KOI8-U                    glibc freebsd                             yes
-#   CP437                     dos
-#   CP775                     dos
-#   CP850                     aix osf dos
-#   CP852                     dos
-#   CP855                     dos
-#   CP856                     aix
-#   CP857                     dos
-#   CP861                     dos
-#   CP862                     dos
-#   CP864                     dos
-#   CP865                     dos
-#   CP866                     freebsd dos
-#   CP869                     dos
-#   CP874                     win32 dos
-#   CP922                     aix
-#   CP932                     aix win32 dos
-#   CP943                     aix
-#   CP949                     osf win32 dos
-#   CP950                     win32 dos
-#   CP1046                    aix
-#   CP1124                    aix
-#   CP1129                    aix
-#   CP1250                    win32
-#   CP1251                    glibc win32
-#   CP1252                    aix win32
-#   CP1253                    win32
-#   CP1254                    win32
-#   CP1255                    win32
-#   CP1256                    win32
-#   CP1257                    win32
-#   GB2312                    glibc aix hpux irix solaris freebsd       yes
-#   EUC-JP                    glibc aix hpux irix osf solaris freebsd   yes
-#   EUC-KR                    glibc aix hpux irix osf solaris freebsd   yes
-#   EUC-TW                    glibc aix hpux irix osf solaris
-#   BIG5                      glibc aix hpux osf solaris freebsd        yes
-#   BIG5-HKSCS                glibc
-#   GBK                       aix osf win32 dos
-#   GB18030                   glibc
-#   SHIFT_JIS                 hpux osf solaris freebsd                  yes
-#   JOHAB                     glibc win32
-#   TIS-620                   glibc aix hpux osf solaris
-#   VISCII                    glibc                                     yes
-#   HP-ROMAN8                 hpux
-#   HP-ARABIC8                hpux
-#   HP-GREEK8                 hpux
-#   HP-HEBREW8                hpux
-#   HP-TURKISH8               hpux
-#   HP-KANA8                  hpux
-#   DEC-KANJI                 osf
-#   DEC-HANYU                 osf
-#   UTF-8                     glibc aix hpux osf solaris                yes
-#
-# Note: Names which are not marked as being a MIME name should not be used in
-# Internet protocols for information interchange (mail, news, etc.).
-#
-# Note: ASCII and ANSI_X3.4-1968 are synonymous canonical names. Applications
-# must understand both names and treat them as equivalent.
-#
-# The first argument passed to this file is the canonical host specification,
-#    CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM
-# or
-#    CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM
-
-host="$1"
-os=`echo "$host" | sed -e 's/^[^-]*-[^-]*-\(.*\)$/\1/'`
-echo "# This file contains a table of character encoding aliases,"
-echo "# suitable for operating system '${os}'."
-echo "# It was automatically generated from config.charset."
-# List of references, updated during installation:
-echo "# Packages using this file: "
-case "$os" in
-    linux* | *-gnu*)
-	# With glibc-2.1 or newer, we don't need any canonicalization,
-	# because glibc has iconv and both glibc and libiconv support all
-	# GNU canonical names directly. Therefore, the Makefile does not
-	# need to install the alias file at all.
-	# The following applies only to glibc-2.0.x and older libcs.
-	echo "ISO_646.IRV:1983 ASCII"
-	;;
-    aix*)
-	echo "ISO8859-1 ISO-8859-1"
-	echo "ISO8859-2 ISO-8859-2"
-	echo "ISO8859-5 ISO-8859-5"
-	echo "ISO8859-6 ISO-8859-6"
-	echo "ISO8859-7 ISO-8859-7"
-	echo "ISO8859-8 ISO-8859-8"
-	echo "ISO8859-9 ISO-8859-9"
-	echo "ISO8859-15 ISO-8859-15"
-	echo "IBM-850 CP850"
-	echo "IBM-856 CP856"
-	echo "IBM-921 ISO-8859-13"
-	echo "IBM-922 CP922"
-	echo "IBM-932 CP932"
-	echo "IBM-943 CP943"
-	echo "IBM-1046 CP1046"
-	echo "IBM-1124 CP1124"
-	echo "IBM-1129 CP1129"
-	echo "IBM-1252 CP1252"
-	echo "IBM-eucCN GB2312"
-	echo "IBM-eucJP EUC-JP"
-	echo "IBM-eucKR EUC-KR"
-	echo "IBM-eucTW EUC-TW"
-	echo "big5 BIG5"
-	echo "GBK GBK"
-	echo "TIS-620 TIS-620"
-	echo "UTF-8 UTF-8"
-	;;
-    hpux*)
-	echo "iso88591 ISO-8859-1"
-	echo "iso88592 ISO-8859-2"
-	echo "iso88595 ISO-8859-5"
-	echo "iso88596 ISO-8859-6"
-	echo "iso88597 ISO-8859-7"
-	echo "iso88598 ISO-8859-8"
-	echo "iso88599 ISO-8859-9"
-	echo "iso885915 ISO-8859-15"
-	echo "roman8 HP-ROMAN8"
-	echo "arabic8 HP-ARABIC8"
-	echo "greek8 HP-GREEK8"
-	echo "hebrew8 HP-HEBREW8"
-	echo "turkish8 HP-TURKISH8"
-	echo "kana8 HP-KANA8"
-	echo "tis620 TIS-620"
-	echo "big5 BIG5"
-	echo "eucJP EUC-JP"
-	echo "eucKR EUC-KR"
-	echo "eucTW EUC-TW"
-	echo "hp15CN GB2312"
-	#echo "ccdc ?" # what is this?
-	echo "SJIS SHIFT_JIS"
-	echo "utf8 UTF-8"
-	;;
-    irix*)
-	echo "ISO8859-1 ISO-8859-1"
-	echo "ISO8859-2 ISO-8859-2"
-	echo "ISO8859-5 ISO-8859-5"
-	echo "ISO8859-7 ISO-8859-7"
-	echo "ISO8859-9 ISO-8859-9"
-	echo "eucCN GB2312"
-	echo "eucJP EUC-JP"
-	echo "eucKR EUC-KR"
-	echo "eucTW EUC-TW"
-	;;
-    osf*)
-	echo "ISO8859-1 ISO-8859-1"
-	echo "ISO8859-2 ISO-8859-2"
-	echo "ISO8859-4 ISO-8859-4"
-	echo "ISO8859-5 ISO-8859-5"
-	echo "ISO8859-7 ISO-8859-7"
-	echo "ISO8859-8 ISO-8859-8"
-	echo "ISO8859-9 ISO-8859-9"
-	echo "ISO8859-15 ISO-8859-15"
-	echo "cp850 CP850"
-	echo "big5 BIG5"
-	echo "dechanyu DEC-HANYU"
-	echo "dechanzi GB2312"
-	echo "deckanji DEC-KANJI"
-	echo "deckorean EUC-KR"
-	echo "eucJP EUC-JP"
-	echo "eucKR EUC-KR"
-	echo "eucTW EUC-TW"
-	echo "GBK GBK"
-	echo "KSC5601 CP949"
-	echo "sdeckanji EUC-JP"
-	echo "SJIS SHIFT_JIS"
-	echo "TACTIS TIS-620"
-	echo "UTF-8 UTF-8"
-	;;
-    solaris*)
-	echo "646 ASCII"
-	echo "ISO8859-1 ISO-8859-1"
-	echo "ISO8859-2 ISO-8859-2"
-	echo "ISO8859-4 ISO-8859-4"
-	echo "ISO8859-5 ISO-8859-5"
-	echo "ISO8859-6 ISO-8859-6"
-	echo "ISO8859-7 ISO-8859-7"
-	echo "ISO8859-8 ISO-8859-8"
-	echo "ISO8859-9 ISO-8859-9"
-	echo "ISO8859-15 ISO-8859-15"
-	echo "koi8-r KOI8-R"
-	echo "BIG5 BIG5"
-	echo "gb2312 GB2312"
-	echo "cns11643 EUC-TW"
-	echo "5601 EUC-KR"
-	echo "eucJP EUC-JP"
-	echo "PCK SHIFT_JIS"
-	echo "TIS620.2533 TIS-620"
-	#echo "sun_eu_greek ?" # what is this?
-	echo "UTF-8 UTF-8"
-	;;
-    freebsd* | os2*)
-	# FreeBSD 4.2 doesn't have nl_langinfo(CODESET); therefore
-	# localcharset.c falls back to using the full locale name
-	# from the environment variables.
-	# Likewise for OS/2. OS/2 has XFree86 just like FreeBSD. Just
-	# reuse FreeBSD's locale data for OS/2.
-	echo "C ASCII"
-	echo "US-ASCII ASCII"
-	for l in la_LN lt_LN; do
-	  echo "$l.ASCII ASCII"
-	done
-	for l in da_DK de_AT de_CH de_DE en_AU en_CA en_GB en_US es_ES \
-	         fi_FI fr_BE fr_CA fr_CH fr_FR is_IS it_CH it_IT la_LN \
-	         lt_LN nl_BE nl_NL no_NO pt_PT sv_SE; do
-	  echo "$l.ISO_8859-1 ISO-8859-1"
-	  echo "$l.DIS_8859-15 ISO-8859-15"
-	done
-	for l in cs_CZ hr_HR hu_HU la_LN lt_LN pl_PL sl_SI; do
-	  echo "$l.ISO_8859-2 ISO-8859-2"
-	done
-	for l in la_LN lt_LT; do
-	  echo "$l.ISO_8859-4 ISO-8859-4"
-	done
-	for l in ru_RU ru_SU; do
-	  echo "$l.KOI8-R KOI8-R"
-	  echo "$l.ISO_8859-5 ISO-8859-5"
-	  echo "$l.CP866 CP866"
-	done
-	echo "uk_UA.KOI8-U KOI8-U"
-	echo "zh_TW.BIG5 BIG5"
-	echo "zh_TW.Big5 BIG5"
-	echo "zh_CN.EUC GB2312"
-	echo "ja_JP.EUC EUC-JP"
-	echo "ja_JP.SJIS SHIFT_JIS"
-	echo "ja_JP.Shift_JIS SHIFT_JIS"
-	echo "ko_KR.EUC EUC-KR"
-	;;
-    netbsd*)
-	echo "646 ASCII"
-	echo "ISO8859-1 ISO-8859-1"
-	echo "ISO8859-2 ISO-8859-2"
-	echo "ISO8859-4 ISO-8859-4"
-	echo "ISO8859-5 ISO-8859-5"
-	echo "ISO8859-15 ISO-8859-15"
-	echo "eucCN GB2312"
-	echo "eucJP EUC-JP"
-	echo "eucKR EUC-KR"
-	echo "eucTW EUC-TW"
-	echo "BIG5 BIG5"
-	echo "SJIS SHIFT_JIS"
-	;;
-    beos*)
-	# BeOS has a single locale, and it has UTF-8 encoding.
-	echo "* UTF-8"
-	;;
-    msdosdjgpp*)
-	# DJGPP 2.03 doesn't have nl_langinfo(CODESET); therefore
-	# localcharset.c falls back to using the full locale name
-	# from the environment variables.
-	echo "#"
-	echo "# The encodings given here may not all be correct."
-	echo "# If you find that the encoding given for your language and"
-	echo "# country is not the one your DOS machine actually uses, just"
-	echo "# correct it in this file, and send a mail to"
-	echo "# Juan Manuel Guerrero <st001906@hrz1.hrz.tu-darmstadt.de>"
-	echo "# and Bruno Haible <haible@clisp.cons.org>."
-	echo "#"
-	echo "C ASCII"
-	# ISO-8859-1 languages
-	echo "ca CP850"
-	echo "ca_ES CP850"
-	echo "da CP865"    # not CP850 ??
-	echo "da_DK CP865" # not CP850 ??
-	echo "de CP850"
-	echo "de_AT CP850"
-	echo "de_CH CP850"
-	echo "de_DE CP850"
-	echo "en CP850"
-	echo "en_AU CP850" # not CP437 ??
-	echo "en_CA CP850"
-	echo "en_GB CP850"
-	echo "en_NZ CP437"
-	echo "en_US CP437"
-	echo "en_ZA CP850" # not CP437 ??
-	echo "es CP850"
-	echo "es_AR CP850"
-	echo "es_BO CP850"
-	echo "es_CL CP850"
-	echo "es_CO CP850"
-	echo "es_CR CP850"
-	echo "es_CU CP850"
-	echo "es_DO CP850"
-	echo "es_EC CP850"
-	echo "es_ES CP850"
-	echo "es_GT CP850"
-	echo "es_HN CP850"
-	echo "es_MX CP850"
-	echo "es_NI CP850"
-	echo "es_PA CP850"
-	echo "es_PY CP850"
-	echo "es_PE CP850"
-	echo "es_SV CP850"
-	echo "es_UY CP850"
-	echo "es_VE CP850"
-	echo "et CP850"
-	echo "et_EE CP850"
-	echo "eu CP850"
-	echo "eu_ES CP850"
-	echo "fi CP850"
-	echo "fi_FI CP850"
-	echo "fr CP850"
-	echo "fr_BE CP850"
-	echo "fr_CA CP850"
-	echo "fr_CH CP850"
-	echo "fr_FR CP850"
-	echo "ga CP850"
-	echo "ga_IE CP850"
-	echo "gd CP850"
-	echo "gd_GB CP850"
-	echo "gl CP850"
-	echo "gl_ES CP850"
-	echo "id CP850"    # not CP437 ??
-	echo "id_ID CP850" # not CP437 ??
-	echo "is CP861"    # not CP850 ??
-	echo "is_IS CP861" # not CP850 ??
-	echo "it CP850"
-	echo "it_CH CP850"
-	echo "it_IT CP850"
-	echo "lt CP775"
-	echo "lt_LT CP775"
-	echo "lv CP775"
-	echo "lv_LV CP775"
-	echo "nb CP865"    # not CP850 ??
-	echo "nb_NO CP865" # not CP850 ??
-	echo "nl CP850"
-	echo "nl_BE CP850"
-	echo "nl_NL CP850"
-	echo "nn CP865"    # not CP850 ??
-	echo "nn_NO CP865" # not CP850 ??
-	echo "no CP865"    # not CP850 ??
-	echo "no_NO CP865" # not CP850 ??
-	echo "pt CP850"
-	echo "pt_BR CP850"
-	echo "pt_PT CP850"
-	echo "sv CP850"
-	echo "sv_SE CP850"
-	# ISO-8859-2 languages
-	echo "cs CP852"
-	echo "cs_CZ CP852"
-	echo "hr CP852"
-	echo "hr_HR CP852"
-	echo "hu CP852"
-	echo "hu_HU CP852"
-	echo "pl CP852"
-	echo "pl_PL CP852"
-	echo "ro CP852"
-	echo "ro_RO CP852"
-	echo "sk CP852"
-	echo "sk_SK CP852"
-	echo "sl CP852"
-	echo "sl_SI CP852"
-	echo "sq CP852"
-	echo "sq_AL CP852"
-	echo "sr CP852"    # CP852 or CP866 or CP855 ??
-	echo "sr_YU CP852" # CP852 or CP866 or CP855 ??
-	# ISO-8859-3 languages
-	echo "mt CP850"
-	echo "mt_MT CP850"
-	# ISO-8859-5 languages
-	echo "be CP866"
-	echo "be_BE CP866"
-	echo "bg CP866"    # not CP855 ??
-	echo "bg_BG CP866" # not CP855 ??
-	echo "mk CP866"    # not CP855 ??
-	echo "mk_MK CP866" # not CP855 ??
-	echo "ru CP866"
-	echo "ru_RU CP866"
-	# ISO-8859-6 languages
-	echo "ar CP864"
-	echo "ar_AE CP864"
-	echo "ar_DZ CP864"
-	echo "ar_EG CP864"
-	echo "ar_IQ CP864"
-	echo "ar_IR CP864"
-	echo "ar_JO CP864"
-	echo "ar_KW CP864"
-	echo "ar_MA CP864"
-	echo "ar_OM CP864"
-	echo "ar_QA CP864"
-	echo "ar_SA CP864"
-	echo "ar_SY CP864"
-	# ISO-8859-7 languages
-	echo "el CP869"
-	echo "el_GR CP869"
-	# ISO-8859-8 languages
-	echo "he CP862"
-	echo "he_IL CP862"
-	# ISO-8859-9 languages
-	echo "tr CP857"
-	echo "tr_TR CP857"
-	# Japanese
-	echo "ja CP932"
-	echo "ja_JP CP932"
-	# Chinese
-	echo "zh_CN GBK"
-	echo "zh_TW CP950" # not CP938 ??
-	# Korean
-	echo "kr CP949"    # not CP934 ??
-	echo "kr_KR CP949" # not CP934 ??
-	# Thai
-	echo "th CP874"
-	echo "th_TH CP874"
-	# Other
-	echo "eo CP850"
-	echo "eo_EO CP850"
-	;;
-esac
diff --git a/intl/dcgettext.c b/intl/dcgettext.c
deleted file mode 100644
index 70ee3ba..0000000
--- a/intl/dcgettext.c
+++ /dev/null
@@ -1,59 +0,0 @@
-/* Implementation of the dcgettext(3) function.
-   Copyright (C) 1995-1999, 2000, 2001, 2002 Free Software Foundation, Inc.
-
-   This program is free software; you can redistribute it and/or modify it
-   under the terms of the GNU Library General Public License as published
-   by the Free Software Foundation; either version 2, or (at your option)
-   any later version.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   Library General Public License for more details.
-
-   You should have received a copy of the GNU Library General Public
-   License along with this program; if not, write to the Free Software
-   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
-   USA.  */
-
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
-
-#include "gettextP.h"
-#ifdef _LIBC
-# include <libintl.h>
-#else
-# include "libgnuintl.h"
-#endif
-
-/* @@ end of prolog @@ */
-
-/* Names for the libintl functions are a problem.  They must not clash
-   with existing names and they should follow ANSI C.  But this source
-   code is also used in GNU C Library where the names have a __
-   prefix.  So we have to make a difference here.  */
-#ifdef _LIBC
-# define DCGETTEXT __dcgettext
-# define DCIGETTEXT __dcigettext
-#else
-# define DCGETTEXT dcgettext__
-# define DCIGETTEXT dcigettext__
-#endif
-
-/* Look up MSGID in the DOMAINNAME message catalog for the current CATEGORY
-   locale.  */
-char *
-DCGETTEXT (domainname, msgid, category)
-     const char *domainname;
-     const char *msgid;
-     int category;
-{
-  return DCIGETTEXT (domainname, msgid, NULL, 0, 0, category);
-}
-
-#ifdef _LIBC
-/* Alias for function name in GNU C Library.  */
-INTDEF(__dcgettext)
-weak_alias (__dcgettext, dcgettext);
-#endif
diff --git a/intl/dcigettext.c b/intl/dcigettext.c
deleted file mode 100644
index afbb181..0000000
--- a/intl/dcigettext.c
+++ /dev/null
@@ -1,1168 +0,0 @@
-/* Implementation of the internal dcigettext function.
-   Copyright (C) 1995-1999, 2000-2002 Free Software Foundation, Inc.
-
-   This program is free software; you can redistribute it and/or modify it
-   under the terms of the GNU Library General Public License as published
-   by the Free Software Foundation; either version 2, or (at your option)
-   any later version.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   Library General Public License for more details.
-
-   You should have received a copy of the GNU Library General Public
-   License along with this program; if not, write to the Free Software
-   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
-   USA.  */
-
-/* Tell glibc's <string.h> to provide a prototype for mempcpy().
-   This must come before <config.h> because <config.h> may include
-   <features.h>, and once <features.h> has been included, it's too late.  */
-#ifndef _GNU_SOURCE
-# define _GNU_SOURCE	1
-#endif
-
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
-
-#include <sys/types.h>
-
-#ifdef __GNUC__
-# define alloca __builtin_alloca
-# define HAVE_ALLOCA 1
-#else
-# if defined HAVE_ALLOCA_H || defined _LIBC
-#  include <alloca.h>
-# else
-#  ifdef _AIX
- #pragma alloca
-#  else
-#   ifndef alloca
-char *alloca ();
-#   endif
-#  endif
-# endif
-#endif
-
-#include <errno.h>
-#ifndef errno
-extern int errno;
-#endif
-#ifndef __set_errno
-# define __set_errno(val) errno = (val)
-#endif
-
-#include <stddef.h>
-#include <stdlib.h>
-#include <string.h>
-
-#if defined HAVE_UNISTD_H || defined _LIBC
-# include <unistd.h>
-#endif
-
-#include <locale.h>
-
-#if defined HAVE_SYS_PARAM_H || defined _LIBC
-# include <sys/param.h>
-#endif
-
-#include "gettextP.h"
-#include "plural-exp.h"
-#ifdef _LIBC
-# include <libintl.h>
-#else
-# include "libgnuintl.h"
-#endif
-#include "hash-string.h"
-
-/* Thread safetyness.  */
-#ifdef _LIBC
-# include <bits/libc-lock.h>
-#else
-/* Provide dummy implementation if this is outside glibc.  */
-# define __libc_lock_define_initialized(CLASS, NAME)
-# define __libc_lock_lock(NAME)
-# define __libc_lock_unlock(NAME)
-# define __libc_rwlock_define_initialized(CLASS, NAME)
-# define __libc_rwlock_rdlock(NAME)
-# define __libc_rwlock_unlock(NAME)
-#endif
-
-/* Alignment of types.  */
-#if defined __GNUC__ && __GNUC__ >= 2
-# define alignof(TYPE) __alignof__ (TYPE)
-#else
-# define alignof(TYPE) \
-    ((int) &((struct { char dummy1; TYPE dummy2; } *) 0)->dummy2)
-#endif
-
-/* The internal variables in the standalone libintl.a must have different
-   names than the internal variables in GNU libc, otherwise programs
-   using libintl.a cannot be linked statically.  */
-#if !defined _LIBC
-# define _nl_default_default_domain _nl_default_default_domain__
-# define _nl_current_default_domain _nl_current_default_domain__
-# define _nl_default_dirname _nl_default_dirname__
-# define _nl_domain_bindings _nl_domain_bindings__
-#endif
-
-/* Some compilers, like SunOS4 cc, don't have offsetof in <stddef.h>.  */
-#ifndef offsetof
-# define offsetof(type,ident) ((size_t)&(((type*)0)->ident))
-#endif
-
-/* @@ end of prolog @@ */
-
-#ifdef _LIBC
-/* Rename the non ANSI C functions.  This is required by the standard
-   because some ANSI C functions will require linking with this object
-   file and the name space must not be polluted.  */
-# define getcwd __getcwd
-# ifndef stpcpy
-#  define stpcpy __stpcpy
-# endif
-# define tfind __tfind
-#else
-# if !defined HAVE_GETCWD
-char *getwd ();
-#  define getcwd(buf, max) getwd (buf)
-# else
-char *getcwd ();
-# endif
-# ifndef HAVE_STPCPY
-static char *stpcpy PARAMS ((char *dest, const char *src));
-# endif
-# ifndef HAVE_MEMPCPY
-static void *mempcpy PARAMS ((void *dest, const void *src, size_t n));
-# endif
-#endif
-
-/* Amount to increase buffer size by in each try.  */
-#define PATH_INCR 32
-
-/* The following is from pathmax.h.  */
-/* Non-POSIX BSD systems might have gcc's limits.h, which doesn't define
-   PATH_MAX but might cause redefinition warnings when sys/param.h is
-   later included (as on MORE/BSD 4.3).  */
-#if defined _POSIX_VERSION || (defined HAVE_LIMITS_H && !defined __GNUC__)
-# include <limits.h>
-#endif
-
-#ifndef _POSIX_PATH_MAX
-# define _POSIX_PATH_MAX 255
-#endif
-
-#if !defined PATH_MAX && defined _PC_PATH_MAX
-# define PATH_MAX (pathconf ("/", _PC_PATH_MAX) < 1 ? 1024 : pathconf ("/", _PC_PATH_MAX))
-#endif
-
-/* Don't include sys/param.h if it already has been.  */
-#if defined HAVE_SYS_PARAM_H && !defined PATH_MAX && !defined MAXPATHLEN
-# include <sys/param.h>
-#endif
-
-#if !defined PATH_MAX && defined MAXPATHLEN
-# define PATH_MAX MAXPATHLEN
-#endif
-
-#ifndef PATH_MAX
-# define PATH_MAX _POSIX_PATH_MAX
-#endif
-
-/* Pathname support.
-   ISSLASH(C)           tests whether C is a directory separator character.
-   IS_ABSOLUTE_PATH(P)  tests whether P is an absolute path.  If it is not,
-                        it may be concatenated to a directory pathname.
-   IS_PATH_WITH_DIR(P)  tests whether P contains a directory specification.
- */
-#if defined _WIN32 || defined __WIN32__ || defined __EMX__ || defined __DJGPP__
-  /* Win32, OS/2, DOS */
-# define ISSLASH(C) ((C) == '/' || (C) == '\\')
-# define HAS_DEVICE(P) \
-    ((((P)[0] >= 'A' && (P)[0] <= 'Z') || ((P)[0] >= 'a' && (P)[0] <= 'z')) \
-     && (P)[1] == ':')
-# define IS_ABSOLUTE_PATH(P) (ISSLASH ((P)[0]) || HAS_DEVICE (P))
-# define IS_PATH_WITH_DIR(P) \
-    (strchr (P, '/') != NULL || strchr (P, '\\') != NULL || HAS_DEVICE (P))
-#else
-  /* Unix */
-# define ISSLASH(C) ((C) == '/')
-# define IS_ABSOLUTE_PATH(P) ISSLASH ((P)[0])
-# define IS_PATH_WITH_DIR(P) (strchr (P, '/') != NULL)
-#endif
-
-/* This is the type used for the search tree where known translations
-   are stored.  */
-struct known_translation_t
-{
-  /* Domain in which to search.  */
-  char *domainname;
-
-  /* The category.  */
-  int category;
-
-  /* State of the catalog counter at the point the string was found.  */
-  int counter;
-
-  /* Catalog where the string was found.  */
-  struct loaded_l10nfile *domain;
-
-  /* And finally the translation.  */
-  const char *translation;
-  size_t translation_length;
-
-  /* Pointer to the string in question.  */
-  char msgid[ZERO];
-};
-
-/* Root of the search tree with known translations.  We can use this
-   only if the system provides the `tsearch' function family.  */
-#if defined HAVE_TSEARCH || defined _LIBC
-# include <search.h>
-
-static void *root;
-
-# ifdef _LIBC
-#  define tsearch __tsearch
-# endif
-
-/* Function to compare two entries in the table of known translations.  */
-static int transcmp PARAMS ((const void *p1, const void *p2));
-static int
-transcmp (p1, p2)
-     const void *p1;
-     const void *p2;
-{
-  const struct known_translation_t *s1;
-  const struct known_translation_t *s2;
-  int result;
-
-  s1 = (const struct known_translation_t *) p1;
-  s2 = (const struct known_translation_t *) p2;
-
-  result = strcmp (s1->msgid, s2->msgid);
-  if (result == 0)
-    {
-      result = strcmp (s1->domainname, s2->domainname);
-      if (result == 0)
-	/* We compare the category last (though this is the cheapest
-	   operation) since it is hopefully always the same (namely
-	   LC_MESSAGES).  */
-	result = s1->category - s2->category;
-    }
-
-  return result;
-}
-#endif
-
-/* Name of the default domain used for gettext(3) prior any call to
-   textdomain(3).  The default value for this is "messages".  */
-const char _nl_default_default_domain[] attribute_hidden = "messages";
-
-/* Value used as the default domain for gettext(3).  */
-const char *_nl_current_default_domain attribute_hidden
-     = _nl_default_default_domain;
-
-/* Contains the default location of the message catalogs.  */
-#if defined __EMX__
-extern const char _nl_default_dirname[];
-#else
-const char _nl_default_dirname[] = LOCALEDIR;
-#endif
-
-/* List with bindings of specific domains created by bindtextdomain()
-   calls.  */
-struct binding *_nl_domain_bindings;
-
-/* Prototypes for local functions.  */
-static char *plural_lookup PARAMS ((struct loaded_l10nfile *domain,
-				    unsigned long int n,
-				    const char *translation,
-				    size_t translation_len))
-     internal_function;
-static const char *category_to_name PARAMS ((int category)) internal_function;
-static const char *guess_category_value PARAMS ((int category,
-						 const char *categoryname))
-     internal_function;
-
-
-/* For those loosing systems which don't have `alloca' we have to add
-   some additional code emulating it.  */
-#ifdef HAVE_ALLOCA
-/* Nothing has to be done.  */
-# define ADD_BLOCK(list, address) /* nothing */
-# define FREE_BLOCKS(list) /* nothing */
-#else
-struct block_list
-{
-  void *address;
-  struct block_list *next;
-};
-# define ADD_BLOCK(list, addr)						      \
-  do {									      \
-    struct block_list *newp = (struct block_list *) malloc (sizeof (*newp));  \
-    /* If we cannot get a free block we cannot add the new element to	      \
-       the list.  */							      \
-    if (newp != NULL) {							      \
-      newp->address = (addr);						      \
-      newp->next = (list);						      \
-      (list) = newp;							      \
-    }									      \
-  } while (0)
-# define FREE_BLOCKS(list)						      \
-  do {									      \
-    while (list != NULL) {						      \
-      struct block_list *old = list;					      \
-      list = list->next;						      \
-      free (old);							      \
-    }									      \
-  } while (0)
-# undef alloca
-# define alloca(size) (malloc (size))
-#endif	/* have alloca */
-
-
-#ifdef _LIBC
-/* List of blocks allocated for translations.  */
-typedef struct transmem_list
-{
-  struct transmem_list *next;
-  char data[ZERO];
-} transmem_block_t;
-static struct transmem_list *transmem_list;
-#else
-typedef unsigned char transmem_block_t;
-#endif
-
-
-/* Names for the libintl functions are a problem.  They must not clash
-   with existing names and they should follow ANSI C.  But this source
-   code is also used in GNU C Library where the names have a __
-   prefix.  So we have to make a difference here.  */
-#ifdef _LIBC
-# define DCIGETTEXT __dcigettext
-#else
-# define DCIGETTEXT dcigettext__
-#endif
-
-/* Lock variable to protect the global data in the gettext implementation.  */
-#ifdef _LIBC
-__libc_rwlock_define_initialized (, _nl_state_lock attribute_hidden)
-#endif
-
-/* Checking whether the binaries runs SUID must be done and glibc provides
-   easier methods therefore we make a difference here.  */
-#ifdef _LIBC
-# define ENABLE_SECURE __libc_enable_secure
-# define DETERMINE_SECURE
-#else
-# ifndef HAVE_GETUID
-#  define getuid() 0
-# endif
-# ifndef HAVE_GETGID
-#  define getgid() 0
-# endif
-# ifndef HAVE_GETEUID
-#  define geteuid() getuid()
-# endif
-# ifndef HAVE_GETEGID
-#  define getegid() getgid()
-# endif
-static int enable_secure;
-# define ENABLE_SECURE (enable_secure == 1)
-# define DETERMINE_SECURE \
-  if (enable_secure == 0)						      \
-    {									      \
-      if (getuid () != geteuid () || getgid () != getegid ())		      \
-	enable_secure = 1;						      \
-      else								      \
-	enable_secure = -1;						      \
-    }
-#endif
-
-/* Get the function to evaluate the plural expression.  */
-#include "eval-plural.h"
-
-/* Look up MSGID in the DOMAINNAME message catalog for the current
-   CATEGORY locale and, if PLURAL is nonzero, search over string
-   depending on the plural form determined by N.  */
-char *
-DCIGETTEXT (domainname, msgid1, msgid2, plural, n, category)
-     const char *domainname;
-     const char *msgid1;
-     const char *msgid2;
-     int plural;
-     unsigned long int n;
-     int category;
-{
-#ifndef HAVE_ALLOCA
-  struct block_list *block_list = NULL;
-#endif
-  struct loaded_l10nfile *domain;
-  struct binding *binding;
-  const char *categoryname;
-  const char *categoryvalue;
-  char *dirname, *xdomainname;
-  char *single_locale;
-  char *retval;
-  size_t retlen;
-  int saved_errno;
-#if defined HAVE_TSEARCH || defined _LIBC
-  struct known_translation_t *search;
-  struct known_translation_t **foundp = NULL;
-  size_t msgid_len;
-#endif
-  size_t domainname_len;
-
-  /* If no real MSGID is given return NULL.  */
-  if (msgid1 == NULL)
-    return NULL;
-
-  __libc_rwlock_rdlock (_nl_state_lock);
-
-  /* If DOMAINNAME is NULL, we are interested in the default domain.  If
-     CATEGORY is not LC_MESSAGES this might not make much sense but the
-     definition left this undefined.  */
-  if (domainname == NULL)
-    domainname = _nl_current_default_domain;
-
-  /* OS/2 specific: backward compatibility with older libintl versions  */
-#ifdef LC_MESSAGES_COMPAT
-  if (category == LC_MESSAGES_COMPAT)
-    category = LC_MESSAGES;
-#endif
-
-#if defined HAVE_TSEARCH || defined _LIBC
-  msgid_len = strlen (msgid1) + 1;
-
-  /* Try to find the translation among those which we found at
-     some time.  */
-  search = (struct known_translation_t *)
-	   alloca (offsetof (struct known_translation_t, msgid) + msgid_len);
-  memcpy (search->msgid, msgid1, msgid_len);
-  search->domainname = (char *) domainname;
-  search->category = category;
-
-  foundp = (struct known_translation_t **) tfind (search, &root, transcmp);
-  if (foundp != NULL && (*foundp)->counter == _nl_msg_cat_cntr)
-    {
-      /* Now deal with plural.  */
-      if (plural)
-	retval = plural_lookup ((*foundp)->domain, n, (*foundp)->translation,
-				(*foundp)->translation_length);
-      else
-	retval = (char *) (*foundp)->translation;
-
-      __libc_rwlock_unlock (_nl_state_lock);
-      return retval;
-    }
-#endif
-
-  /* Preserve the `errno' value.  */
-  saved_errno = errno;
-
-  /* See whether this is a SUID binary or not.  */
-  DETERMINE_SECURE;
-
-  /* First find matching binding.  */
-  for (binding = _nl_domain_bindings; binding != NULL; binding = binding->next)
-    {
-      int compare = strcmp (domainname, binding->domainname);
-      if (compare == 0)
-	/* We found it!  */
-	break;
-      if (compare < 0)
-	{
-	  /* It is not in the list.  */
-	  binding = NULL;
-	  break;
-	}
-    }
-
-  if (binding == NULL)
-    dirname = (char *) _nl_default_dirname;
-  else if (IS_ABSOLUTE_PATH (binding->dirname))
-    dirname = binding->dirname;
-  else
-    {
-      /* We have a relative path.  Make it absolute now.  */
-      size_t dirname_len = strlen (binding->dirname) + 1;
-      size_t path_max;
-      char *ret;
-
-      path_max = (unsigned int) PATH_MAX;
-      path_max += 2;		/* The getcwd docs say to do this.  */
-
-      for (;;)
-	{
-	  dirname = (char *) alloca (path_max + dirname_len);
-	  ADD_BLOCK (block_list, dirname);
-
-	  __set_errno (0);
-	  ret = getcwd (dirname, path_max);
-	  if (ret != NULL || errno != ERANGE)
-	    break;
-
-	  path_max += path_max / 2;
-	  path_max += PATH_INCR;
-	}
-
-      if (ret == NULL)
-	{
-	  /* We cannot get the current working directory.  Don't signal an
-	     error but simply return the default string.  */
-	  FREE_BLOCKS (block_list);
-	  __libc_rwlock_unlock (_nl_state_lock);
-	  __set_errno (saved_errno);
-	  return (plural == 0
-		  ? (char *) msgid1
-		  /* Use the Germanic plural rule.  */
-		  : n == 1 ? (char *) msgid1 : (char *) msgid2);
-	}
-
-      stpcpy (stpcpy (strchr (dirname, '\0'), "/"), binding->dirname);
-    }
-
-  /* Now determine the symbolic name of CATEGORY and its value.  */
-  categoryname = category_to_name (category);
-  categoryvalue = guess_category_value (category, categoryname);
-
-  domainname_len = strlen (domainname);
-  xdomainname = (char *) alloca (strlen (categoryname)
-				 + domainname_len + 5);
-  ADD_BLOCK (block_list, xdomainname);
-
-  stpcpy (mempcpy (stpcpy (stpcpy (xdomainname, categoryname), "/"),
-		  domainname, domainname_len),
-	  ".mo");
-
-  /* Creating working area.  */
-  single_locale = (char *) alloca (strlen (categoryvalue) + 1);
-  ADD_BLOCK (block_list, single_locale);
-
-
-  /* Search for the given string.  This is a loop because we perhaps
-     got an ordered list of languages to consider for the translation.  */
-  while (1)
-    {
-      /* Make CATEGORYVALUE point to the next element of the list.  */
-      while (categoryvalue[0] != '\0' && categoryvalue[0] == ':')
-	++categoryvalue;
-      if (categoryvalue[0] == '\0')
-	{
-	  /* The whole contents of CATEGORYVALUE has been searched but
-	     no valid entry has been found.  We solve this situation
-	     by implicitly appending a "C" entry, i.e. no translation
-	     will take place.  */
-	  single_locale[0] = 'C';
-	  single_locale[1] = '\0';
-	}
-      else
-	{
-	  char *cp = single_locale;
-	  while (categoryvalue[0] != '\0' && categoryvalue[0] != ':')
-	    *cp++ = *categoryvalue++;
-	  *cp = '\0';
-
-	  /* When this is a SUID binary we must not allow accessing files
-	     outside the dedicated directories.  */
-	  if (ENABLE_SECURE && IS_PATH_WITH_DIR (single_locale))
-	    /* Ingore this entry.  */
-	    continue;
-	}
-
-      /* If the current locale value is C (or POSIX) we don't load a
-	 domain.  Return the MSGID.  */
-      if (strcmp (single_locale, "C") == 0
-	  || strcmp (single_locale, "POSIX") == 0)
-	{
-	  FREE_BLOCKS (block_list);
-	  __libc_rwlock_unlock (_nl_state_lock);
-	  __set_errno (saved_errno);
-	  return (plural == 0
-		  ? (char *) msgid1
-		  /* Use the Germanic plural rule.  */
-		  : n == 1 ? (char *) msgid1 : (char *) msgid2);
-	}
-
-
-      /* Find structure describing the message catalog matching the
-	 DOMAINNAME and CATEGORY.  */
-      domain = _nl_find_domain (dirname, single_locale, xdomainname, binding);
-
-      if (domain != NULL)
-	{
-	  retval = _nl_find_msg (domain, binding, msgid1, &retlen);
-
-	  if (retval == NULL)
-	    {
-	      int cnt;
-
-	      for (cnt = 0; domain->successor[cnt] != NULL; ++cnt)
-		{
-		  retval = _nl_find_msg (domain->successor[cnt], binding,
-					 msgid1, &retlen);
-
-		  if (retval != NULL)
-		    {
-		      domain = domain->successor[cnt];
-		      break;
-		    }
-		}
-	    }
-
-	  if (retval != NULL)
-	    {
-	      /* Found the translation of MSGID1 in domain DOMAIN:
-		 starting at RETVAL, RETLEN bytes.  */
-	      FREE_BLOCKS (block_list);
-	      __set_errno (saved_errno);
-#if defined HAVE_TSEARCH || defined _LIBC
-	      if (foundp == NULL)
-		{
-		  /* Create a new entry and add it to the search tree.  */
-		  struct known_translation_t *newp;
-
-		  newp = (struct known_translation_t *)
-		    malloc (offsetof (struct known_translation_t, msgid)
-			    + msgid_len + domainname_len + 1);
-		  if (newp != NULL)
-		    {
-		      newp->domainname =
-			mempcpy (newp->msgid, msgid1, msgid_len);
-		      memcpy (newp->domainname, domainname, domainname_len + 1);
-		      newp->category = category;
-		      newp->counter = _nl_msg_cat_cntr;
-		      newp->domain = domain;
-		      newp->translation = retval;
-		      newp->translation_length = retlen;
-
-		      /* Insert the entry in the search tree.  */
-		      foundp = (struct known_translation_t **)
-			tsearch (newp, &root, transcmp);
-		      if (foundp == NULL
-			  || __builtin_expect (*foundp != newp, 0))
-			/* The insert failed.  */
-			free (newp);
-		    }
-		}
-	      else
-		{
-		  /* We can update the existing entry.  */
-		  (*foundp)->counter = _nl_msg_cat_cntr;
-		  (*foundp)->domain = domain;
-		  (*foundp)->translation = retval;
-		  (*foundp)->translation_length = retlen;
-		}
-#endif
-	      /* Now deal with plural.  */
-	      if (plural)
-		retval = plural_lookup (domain, n, retval, retlen);
-
-	      __libc_rwlock_unlock (_nl_state_lock);
-	      return retval;
-	    }
-	}
-    }
-  /* NOTREACHED */
-}
-
-
-char *
-internal_function
-_nl_find_msg (domain_file, domainbinding, msgid, lengthp)
-     struct loaded_l10nfile *domain_file;
-     struct binding *domainbinding;
-     const char *msgid;
-     size_t *lengthp;
-{
-  struct loaded_domain *domain;
-  size_t act;
-  char *result;
-  size_t resultlen;
-
-  if (domain_file->decided == 0)
-    _nl_load_domain (domain_file, domainbinding);
-
-  if (domain_file->data == NULL)
-    return NULL;
-
-  domain = (struct loaded_domain *) domain_file->data;
-
-  /* Locate the MSGID and its translation.  */
-  if (domain->hash_size > 2 && domain->hash_tab != NULL)
-    {
-      /* Use the hashing table.  */
-      nls_uint32 len = strlen (msgid);
-      nls_uint32 hash_val = hash_string (msgid);
-      nls_uint32 idx = hash_val % domain->hash_size;
-      nls_uint32 incr = 1 + (hash_val % (domain->hash_size - 2));
-
-      while (1)
-	{
-	  nls_uint32 nstr = W (domain->must_swap, domain->hash_tab[idx]);
-
-	  if (nstr == 0)
-	    /* Hash table entry is empty.  */
-	    return NULL;
-
-	  /* Compare msgid with the original string at index nstr-1.
-	     We compare the lengths with >=, not ==, because plural entries
-	     are represented by strings with an embedded NUL.  */
-	  if (W (domain->must_swap, domain->orig_tab[nstr - 1].length) >= len
-	      && (strcmp (msgid,
-			  domain->data + W (domain->must_swap,
-					    domain->orig_tab[nstr - 1].offset))
-		  == 0))
-	    {
-	      act = nstr - 1;
-	      goto found;
-	    }
-
-	  if (idx >= domain->hash_size - incr)
-	    idx -= domain->hash_size - incr;
-	  else
-	    idx += incr;
-	}
-      /* NOTREACHED */
-    }
-  else
-    {
-      /* Try the default method:  binary search in the sorted array of
-	 messages.  */
-      size_t top, bottom;
-
-      bottom = 0;
-      top = domain->nstrings;
-      while (bottom < top)
-	{
-	  int cmp_val;
-
-	  act = (bottom + top) / 2;
-	  cmp_val = strcmp (msgid, (domain->data
-				    + W (domain->must_swap,
-					 domain->orig_tab[act].offset)));
-	  if (cmp_val < 0)
-	    top = act;
-	  else if (cmp_val > 0)
-	    bottom = act + 1;
-	  else
-	    goto found;
-	}
-      /* No translation was found.  */
-      return NULL;
-    }
-
- found:
-  /* The translation was found at index ACT.  If we have to convert the
-     string to use a different character set, this is the time.  */
-  result = ((char *) domain->data
-	    + W (domain->must_swap, domain->trans_tab[act].offset));
-  resultlen = W (domain->must_swap, domain->trans_tab[act].length) + 1;
-
-#if defined _LIBC || HAVE_ICONV
-  if (domain->codeset_cntr
-      != (domainbinding != NULL ? domainbinding->codeset_cntr : 0))
-    {
-      /* The domain's codeset has changed through bind_textdomain_codeset()
-	 since the message catalog was initialized or last accessed.  We
-	 have to reinitialize the converter.  */
-      _nl_free_domain_conv (domain);
-      _nl_init_domain_conv (domain_file, domain, domainbinding);
-    }
-
-  if (
-# ifdef _LIBC
-      domain->conv != (__gconv_t) -1
-# else
-#  if HAVE_ICONV
-      domain->conv != (iconv_t) -1
-#  endif
-# endif
-      )
-    {
-      /* We are supposed to do a conversion.  First allocate an
-	 appropriate table with the same structure as the table
-	 of translations in the file, where we can put the pointers
-	 to the converted strings in.
-	 There is a slight complication with plural entries.  They
-	 are represented by consecutive NUL terminated strings.  We
-	 handle this case by converting RESULTLEN bytes, including
-	 NULs.  */
-
-      if (domain->conv_tab == NULL
-	  && ((domain->conv_tab = (char **) calloc (domain->nstrings,
-						    sizeof (char *)))
-	      == NULL))
-	/* Mark that we didn't succeed allocating a table.  */
-	domain->conv_tab = (char **) -1;
-
-      if (__builtin_expect (domain->conv_tab == (char **) -1, 0))
-	/* Nothing we can do, no more memory.  */
-	goto converted;
-
-      if (domain->conv_tab[act] == NULL)
-	{
-	  /* We haven't used this string so far, so it is not
-	     translated yet.  Do this now.  */
-	  /* We use a bit more efficient memory handling.
-	     We allocate always larger blocks which get used over
-	     time.  This is faster than many small allocations.   */
-	  __libc_lock_define_initialized (static, lock)
-# define INITIAL_BLOCK_SIZE	4080
-	  static unsigned char *freemem;
-	  static size_t freemem_size;
-
-	  const unsigned char *inbuf;
-	  unsigned char *outbuf;
-	  int malloc_count;
-# ifndef _LIBC
-	  transmem_block_t *transmem_list = NULL;
-# endif
-
-	  __libc_lock_lock (lock);
-
-	  inbuf = (const unsigned char *) result;
-	  outbuf = freemem + sizeof (size_t);
-
-	  malloc_count = 0;
-	  while (1)
-	    {
-	      transmem_block_t *newmem;
-# ifdef _LIBC
-	      size_t non_reversible;
-	      int res;
-
-	      if (freemem_size < sizeof (size_t))
-		goto resize_freemem;
-
-	      res = __gconv (domain->conv,
-			     &inbuf, inbuf + resultlen,
-			     &outbuf,
-			     outbuf + freemem_size - sizeof (size_t),
-			     &non_reversible);
-
-	      if (res == __GCONV_OK || res == __GCONV_EMPTY_INPUT)
-		break;
-
-	      if (res != __GCONV_FULL_OUTPUT)
-		{
-		  __libc_lock_unlock (lock);
-		  goto converted;
-		}
-
-	      inbuf = result;
-# else
-#  if HAVE_ICONV
-	      const char *inptr = (const char *) inbuf;
-	      size_t inleft = resultlen;
-	      char *outptr = (char *) outbuf;
-	      size_t outleft;
-
-	      if (freemem_size < sizeof (size_t))
-		goto resize_freemem;
-
-	      outleft = freemem_size - sizeof (size_t);
-	      if (iconv (domain->conv,
-			 (ICONV_CONST char **) &inptr, &inleft,
-			 &outptr, &outleft)
-		  != (size_t) (-1))
-		{
-		  outbuf = (unsigned char *) outptr;
-		  break;
-		}
-	      if (errno != E2BIG)
-		{
-		  __libc_lock_unlock (lock);
-		  goto converted;
-		}
-#  endif
-# endif
-
-	    resize_freemem:
-	      /* We must allocate a new buffer or resize the old one.  */
-	      if (malloc_count > 0)
-		{
-		  ++malloc_count;
-		  freemem_size = malloc_count * INITIAL_BLOCK_SIZE;
-		  newmem = (transmem_block_t *) realloc (transmem_list,
-							 freemem_size);
-# ifdef _LIBC
-		  if (newmem != NULL)
-		    transmem_list = transmem_list->next;
-		  else
-		    {
-		      struct transmem_list *old = transmem_list;
-
-		      transmem_list = transmem_list->next;
-		      free (old);
-		    }
-# endif
-		}
-	      else
-		{
-		  malloc_count = 1;
-		  freemem_size = INITIAL_BLOCK_SIZE;
-		  newmem = (transmem_block_t *) malloc (freemem_size);
-		}
-	      if (__builtin_expect (newmem == NULL, 0))
-		{
-		  freemem = NULL;
-		  freemem_size = 0;
-		  __libc_lock_unlock (lock);
-		  goto converted;
-		}
-
-# ifdef _LIBC
-	      /* Add the block to the list of blocks we have to free
-                 at some point.  */
-	      newmem->next = transmem_list;
-	      transmem_list = newmem;
-
-	      freemem = newmem->data;
-	      freemem_size -= offsetof (struct transmem_list, data);
-# else
-	      transmem_list = newmem;
-	      freemem = newmem;
-# endif
-
-	      outbuf = freemem + sizeof (size_t);
-	    }
-
-	  /* We have now in our buffer a converted string.  Put this
-	     into the table of conversions.  */
-	  *(size_t *) freemem = outbuf - freemem - sizeof (size_t);
-	  domain->conv_tab[act] = (char *) freemem;
-	  /* Shrink freemem, but keep it aligned.  */
-	  freemem_size -= outbuf - freemem;
-	  freemem = outbuf;
-	  freemem += freemem_size & (alignof (size_t) - 1);
-	  freemem_size = freemem_size & ~ (alignof (size_t) - 1);
-
-	  __libc_lock_unlock (lock);
-	}
-
-      /* Now domain->conv_tab[act] contains the translation of all
-	 the plural variants.  */
-      result = domain->conv_tab[act] + sizeof (size_t);
-      resultlen = *(size_t *) domain->conv_tab[act];
-    }
-
- converted:
-  /* The result string is converted.  */
-
-#endif /* _LIBC || HAVE_ICONV */
-
-  *lengthp = resultlen;
-  return result;
-}
-
-
-/* Look up a plural variant.  */
-static char *
-internal_function
-plural_lookup (domain, n, translation, translation_len)
-     struct loaded_l10nfile *domain;
-     unsigned long int n;
-     const char *translation;
-     size_t translation_len;
-{
-  struct loaded_domain *domaindata = (struct loaded_domain *) domain->data;
-  unsigned long int index;
-  const char *p;
-
-  index = plural_eval (domaindata->plural, n);
-  if (index >= domaindata->nplurals)
-    /* This should never happen.  It means the plural expression and the
-       given maximum value do not match.  */
-    index = 0;
-
-  /* Skip INDEX strings at TRANSLATION.  */
-  p = translation;
-  while (index-- > 0)
-    {
-#ifdef _LIBC
-      p = __rawmemchr (p, '\0');
-#else
-      p = strchr (p, '\0');
-#endif
-      /* And skip over the NUL byte.  */
-      p++;
-
-      if (p >= translation + translation_len)
-	/* This should never happen.  It means the plural expression
-	   evaluated to a value larger than the number of variants
-	   available for MSGID1.  */
-	return (char *) translation;
-    }
-  return (char *) p;
-}
-
-
-/* Return string representation of locale CATEGORY.  */
-static const char *
-internal_function
-category_to_name (category)
-     int category;
-{
-  const char *retval;
-
-  switch (category)
-  {
-#ifdef LC_COLLATE
-  case LC_COLLATE:
-    retval = "LC_COLLATE";
-    break;
-#endif
-#ifdef LC_CTYPE
-  case LC_CTYPE:
-    retval = "LC_CTYPE";
-    break;
-#endif
-#ifdef LC_MONETARY
-  case LC_MONETARY:
-    retval = "LC_MONETARY";
-    break;
-#endif
-#ifdef LC_NUMERIC
-  case LC_NUMERIC:
-    retval = "LC_NUMERIC";
-    break;
-#endif
-#ifdef LC_TIME
-  case LC_TIME:
-    retval = "LC_TIME";
-    break;
-#endif
-#ifdef LC_MESSAGES
-  case LC_MESSAGES:
-    retval = "LC_MESSAGES";
-    break;
-#endif
-#ifdef LC_RESPONSE
-  case LC_RESPONSE:
-    retval = "LC_RESPONSE";
-    break;
-#endif
-#ifdef LC_ALL
-  case LC_ALL:
-    /* This might not make sense but is perhaps better than any other
-       value.  */
-    retval = "LC_ALL";
-    break;
-#endif
-  default:
-    /* If you have a better idea for a default value let me know.  */
-    retval = "LC_XXX";
-  }
-
-  return retval;
-}
-
-/* Guess value of current locale from value of the environment variables.  */
-static const char *
-internal_function
-guess_category_value (category, categoryname)
-     int category;
-     const char *categoryname;
-{
-  const char *language;
-  const char *retval;
-
-  /* The highest priority value is the `LANGUAGE' environment
-     variable.  But we don't use the value if the currently selected
-     locale is the C locale.  This is a GNU extension.  */
-  language = getenv ("LANGUAGE");
-  if (language != NULL && language[0] == '\0')
-    language = NULL;
-
-  /* We have to proceed with the POSIX methods of looking to `LC_ALL',
-     `LC_xxx', and `LANG'.  On some systems this can be done by the
-     `setlocale' function itself.  */
-#ifdef _LIBC
-  retval = setlocale (category, NULL);
-#else
-  retval = _nl_locale_name (category, categoryname);
-#endif
-
-  /* Ignore LANGUAGE if the locale is set to "C" because
-     1. "C" locale usually uses the ASCII encoding, and most international
-	messages use non-ASCII characters. These characters get displayed
-	as question marks (if using glibc's iconv()) or as invalid 8-bit
-	characters (because other iconv()s refuse to convert most non-ASCII
-	characters to ASCII). In any case, the output is ugly.
-     2. The precise output of some programs in the "C" locale is specified
-	by POSIX and should not depend on environment variables like
-	"LANGUAGE".  We allow such programs to use gettext().  */
-  return language != NULL && strcmp (retval, "C") != 0 ? language : retval;
-}
-
-/* @@ begin of epilog @@ */
-
-/* We don't want libintl.a to depend on any other library.  So we
-   avoid the non-standard function stpcpy.  In GNU C Library this
-   function is available, though.  Also allow the symbol HAVE_STPCPY
-   to be defined.  */
-#if !_LIBC && !HAVE_STPCPY
-static char *
-stpcpy (dest, src)
-     char *dest;
-     const char *src;
-{
-  while ((*dest++ = *src++) != '\0')
-    /* Do nothing. */ ;
-  return dest - 1;
-}
-#endif
-
-#if !_LIBC && !HAVE_MEMPCPY
-static void *
-mempcpy (dest, src, n)
-     void *dest;
-     const void *src;
-     size_t n;
-{
-  return (void *) ((char *) memcpy (dest, src, n) + n);
-}
-#endif
-
-
-#ifdef _LIBC
-/* If we want to free all resources we have to do some work at
-   program's end.  */
-static void __attribute__ ((unused))
-free_mem (void)
-{
-  void *old;
-
-  while (_nl_domain_bindings != NULL)
-    {
-      struct binding *oldp = _nl_domain_bindings;
-      _nl_domain_bindings = _nl_domain_bindings->next;
-      if (oldp->dirname != _nl_default_dirname)
-	/* Yes, this is a pointer comparison.  */
-	free (oldp->dirname);
-      free (oldp->codeset);
-      free (oldp);
-    }
-
-  if (_nl_current_default_domain != _nl_default_default_domain)
-    /* Yes, again a pointer comparison.  */
-    free ((char *) _nl_current_default_domain);
-
-  /* Remove the search tree with the known translations.  */
-  __tdestroy (root, free);
-  root = NULL;
-
-  while (transmem_list != NULL)
-    {
-      old = transmem_list;
-      transmem_list = transmem_list->next;
-      free (old);
-    }
-}
-
-text_set_element (__libc_subfreeres, free_mem);
-#endif
diff --git a/intl/dcngettext.c b/intl/dcngettext.c
deleted file mode 100644
index d31ff9b..0000000
--- a/intl/dcngettext.c
+++ /dev/null
@@ -1,61 +0,0 @@
-/* Implementation of the dcngettext(3) function.
-   Copyright (C) 1995-1999, 2000, 2001, 2002 Free Software Foundation, Inc.
-
-   This program is free software; you can redistribute it and/or modify it
-   under the terms of the GNU Library General Public License as published
-   by the Free Software Foundation; either version 2, or (at your option)
-   any later version.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   Library General Public License for more details.
-
-   You should have received a copy of the GNU Library General Public
-   License along with this program; if not, write to the Free Software
-   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
-   USA.  */
-
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
-
-#include "gettextP.h"
-#ifdef _LIBC
-# include <libintl.h>
-#else
-# include "libgnuintl.h"
-#endif
-
-/* @@ end of prolog @@ */
-
-/* Names for the libintl functions are a problem.  They must not clash
-   with existing names and they should follow ANSI C.  But this source
-   code is also used in GNU C Library where the names have a __
-   prefix.  So we have to make a difference here.  */
-#ifdef _LIBC
-# define DCNGETTEXT __dcngettext
-# define DCIGETTEXT __dcigettext
-#else
-# define DCNGETTEXT dcngettext__
-# define DCIGETTEXT dcigettext__
-#endif
-
-/* Look up MSGID in the DOMAINNAME message catalog for the current CATEGORY
-   locale.  */
-char *
-DCNGETTEXT (domainname, msgid1, msgid2, n, category)
-     const char *domainname;
-     const char *msgid1;
-     const char *msgid2;
-     unsigned long int n;
-     int category;
-{
-  return DCIGETTEXT (domainname, msgid1, msgid2, 1, n, category);
-}
-
-#ifdef _LIBC
-/* Alias for function name in GNU C Library.  */
-INTDEF(__dcngettext)
-weak_alias (__dcngettext, dcngettext);
-#endif
diff --git a/intl/dgettext.c b/intl/dgettext.c
deleted file mode 100644
index 17b0442..0000000
--- a/intl/dgettext.c
+++ /dev/null
@@ -1,59 +0,0 @@
-/* Implementation of the dgettext(3) function.
-   Copyright (C) 1995-1997, 2000, 2001, 2002 Free Software Foundation, Inc.
-
-   This program is free software; you can redistribute it and/or modify it
-   under the terms of the GNU Library General Public License as published
-   by the Free Software Foundation; either version 2, or (at your option)
-   any later version.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   Library General Public License for more details.
-
-   You should have received a copy of the GNU Library General Public
-   License along with this program; if not, write to the Free Software
-   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
-   USA.  */
-
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
-
-#include <locale.h>
-
-#include "gettextP.h"
-#ifdef _LIBC
-# include <libintl.h>
-#else
-# include "libgnuintl.h"
-#endif
-
-/* @@ end of prolog @@ */
-
-/* Names for the libintl functions are a problem.  They must not clash
-   with existing names and they should follow ANSI C.  But this source
-   code is also used in GNU C Library where the names have a __
-   prefix.  So we have to make a difference here.  */
-#ifdef _LIBC
-# define DGETTEXT __dgettext
-# define DCGETTEXT INTUSE(__dcgettext)
-#else
-# define DGETTEXT dgettext__
-# define DCGETTEXT dcgettext__
-#endif
-
-/* Look up MSGID in the DOMAINNAME message catalog of the current
-   LC_MESSAGES locale.  */
-char *
-DGETTEXT (domainname, msgid)
-     const char *domainname;
-     const char *msgid;
-{
-  return DCGETTEXT (domainname, msgid, LC_MESSAGES);
-}
-
-#ifdef _LIBC
-/* Alias for function name in GNU C Library.  */
-weak_alias (__dgettext, dgettext);
-#endif
diff --git a/intl/dngettext.c b/intl/dngettext.c
deleted file mode 100644
index 2b9ff88..0000000
--- a/intl/dngettext.c
+++ /dev/null
@@ -1,61 +0,0 @@
-/* Implementation of the dngettext(3) function.
-   Copyright (C) 1995-1997, 2000, 2001, 2002 Free Software Foundation, Inc.
-
-   This program is free software; you can redistribute it and/or modify it
-   under the terms of the GNU Library General Public License as published
-   by the Free Software Foundation; either version 2, or (at your option)
-   any later version.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   Library General Public License for more details.
-
-   You should have received a copy of the GNU Library General Public
-   License along with this program; if not, write to the Free Software
-   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
-   USA.  */
-
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
-
-#include <locale.h>
-
-#include "gettextP.h"
-#ifdef _LIBC
-# include <libintl.h>
-#else
-# include "libgnuintl.h"
-#endif
-
-/* @@ end of prolog @@ */
-
-/* Names for the libintl functions are a problem.  They must not clash
-   with existing names and they should follow ANSI C.  But this source
-   code is also used in GNU C Library where the names have a __
-   prefix.  So we have to make a difference here.  */
-#ifdef _LIBC
-# define DNGETTEXT __dngettext
-# define DCNGETTEXT INTUSE(__dcngettext)
-#else
-# define DNGETTEXT dngettext__
-# define DCNGETTEXT dcngettext__
-#endif
-
-/* Look up MSGID in the DOMAINNAME message catalog of the current
-   LC_MESSAGES locale and skip message according to the plural form.  */
-char *
-DNGETTEXT (domainname, msgid1, msgid2, n)
-     const char *domainname;
-     const char *msgid1;
-     const char *msgid2;
-     unsigned long int n;
-{
-  return DCNGETTEXT (domainname, msgid1, msgid2, n, LC_MESSAGES);
-}
-
-#ifdef _LIBC
-/* Alias for function name in GNU C Library.  */
-weak_alias (__dngettext, dngettext);
-#endif
diff --git a/intl/eval-plural.h b/intl/eval-plural.h
deleted file mode 100644
index 44f4934..0000000
--- a/intl/eval-plural.h
+++ /dev/null
@@ -1,106 +0,0 @@
-/* Plural expression evaluation.
-   Copyright (C) 2000-2002 Free Software Foundation, Inc.
-
-   This program is free software; you can redistribute it and/or modify it
-   under the terms of the GNU Library General Public License as published
-   by the Free Software Foundation; either version 2, or (at your option)
-   any later version.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   Library General Public License for more details.
-
-   You should have received a copy of the GNU Library General Public
-   License along with this program; if not, write to the Free Software
-   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
-   USA.  */
-
-#ifndef STATIC
-#define STATIC static
-#endif
-
-/* Evaluate the plural expression and return an index value.  */
-STATIC unsigned long int plural_eval PARAMS ((struct expression *pexp,
-					      unsigned long int n))
-     internal_function;
-
-STATIC
-unsigned long int
-internal_function
-plural_eval (pexp, n)
-     struct expression *pexp;
-     unsigned long int n;
-{
-  switch (pexp->nargs)
-    {
-    case 0:
-      switch (pexp->operation)
-	{
-	case var:
-	  return n;
-	case num:
-	  return pexp->val.num;
-	default:
-	  break;
-	}
-      /* NOTREACHED */
-      break;
-    case 1:
-      {
-	/* pexp->operation must be lnot.  */
-	unsigned long int arg = plural_eval (pexp->val.args[0], n);
-	return ! arg;
-      }
-    case 2:
-      {
-	unsigned long int leftarg = plural_eval (pexp->val.args[0], n);
-	if (pexp->operation == lor)
-	  return leftarg || plural_eval (pexp->val.args[1], n);
-	else if (pexp->operation == land)
-	  return leftarg && plural_eval (pexp->val.args[1], n);
-	else
-	  {
-	    unsigned long int rightarg = plural_eval (pexp->val.args[1], n);
-
-	    switch (pexp->operation)
-	      {
-	      case mult:
-		return leftarg * rightarg;
-	      case divide:
-		return leftarg / rightarg;
-	      case module:
-		return leftarg % rightarg;
-	      case plus:
-		return leftarg + rightarg;
-	      case minus:
-		return leftarg - rightarg;
-	      case less_than:
-		return leftarg < rightarg;
-	      case greater_than:
-		return leftarg > rightarg;
-	      case less_or_equal:
-		return leftarg <= rightarg;
-	      case greater_or_equal:
-		return leftarg >= rightarg;
-	      case equal:
-		return leftarg == rightarg;
-	      case not_equal:
-		return leftarg != rightarg;
-	      default:
-		break;
-	      }
-	  }
-	/* NOTREACHED */
-	break;
-      }
-    case 3:
-      {
-	/* pexp->operation must be qmop.  */
-	unsigned long int boolarg = plural_eval (pexp->val.args[0], n);
-	return plural_eval (pexp->val.args[boolarg ? 1 : 2], n);
-      }
-    }
-  /* NOTREACHED */
-  return 0;
-}
diff --git a/intl/explodename.c b/intl/explodename.c
deleted file mode 100644
index 2985064..0000000
--- a/intl/explodename.c
+++ /dev/null
@@ -1,192 +0,0 @@
-/* Copyright (C) 1995-1998, 2000, 2001 Free Software Foundation, Inc.
-   Contributed by Ulrich Drepper <drepper@gnu.ai.mit.edu>, 1995.
-
-   This program is free software; you can redistribute it and/or modify it
-   under the terms of the GNU Library General Public License as published
-   by the Free Software Foundation; either version 2, or (at your option)
-   any later version.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   Library General Public License for more details.
-
-   You should have received a copy of the GNU Library General Public
-   License along with this program; if not, write to the Free Software
-   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
-   USA.  */
-
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
-
-#include <stdlib.h>
-#include <string.h>
-#include <sys/types.h>
-
-#include "loadinfo.h"
-
-/* On some strange systems still no definition of NULL is found.  Sigh!  */
-#ifndef NULL
-# if defined __STDC__ && __STDC__
-#  define NULL ((void *) 0)
-# else
-#  define NULL 0
-# endif
-#endif
-
-/* @@ end of prolog @@ */
-
-char *
-_nl_find_language (name)
-     const char *name;
-{
-  while (name[0] != '\0' && name[0] != '_' && name[0] != '@'
-	 && name[0] != '+' && name[0] != ',')
-    ++name;
-
-  return (char *) name;
-}
-
-
-int
-_nl_explode_name (name, language, modifier, territory, codeset,
-		  normalized_codeset, special, sponsor, revision)
-     char *name;
-     const char **language;
-     const char **modifier;
-     const char **territory;
-     const char **codeset;
-     const char **normalized_codeset;
-     const char **special;
-     const char **sponsor;
-     const char **revision;
-{
-  enum { undecided, xpg, cen } syntax;
-  char *cp;
-  int mask;
-
-  *modifier = NULL;
-  *territory = NULL;
-  *codeset = NULL;
-  *normalized_codeset = NULL;
-  *special = NULL;
-  *sponsor = NULL;
-  *revision = NULL;
-
-  /* Now we determine the single parts of the locale name.  First
-     look for the language.  Termination symbols are `_' and `@' if
-     we use XPG4 style, and `_', `+', and `,' if we use CEN syntax.  */
-  mask = 0;
-  syntax = undecided;
-  *language = cp = name;
-  cp = _nl_find_language (*language);
-
-  if (*language == cp)
-    /* This does not make sense: language has to be specified.  Use
-       this entry as it is without exploding.  Perhaps it is an alias.  */
-    cp = strchr (*language, '\0');
-  else if (cp[0] == '_')
-    {
-      /* Next is the territory.  */
-      cp[0] = '\0';
-      *territory = ++cp;
-
-      while (cp[0] != '\0' && cp[0] != '.' && cp[0] != '@'
-	     && cp[0] != '+' && cp[0] != ',' && cp[0] != '_')
-	++cp;
-
-      mask |= TERRITORY;
-
-      if (cp[0] == '.')
-	{
-	  /* Next is the codeset.  */
-	  syntax = xpg;
-	  cp[0] = '\0';
-	  *codeset = ++cp;
-
-	  while (cp[0] != '\0' && cp[0] != '@')
-	    ++cp;
-
-	  mask |= XPG_CODESET;
-
-	  if (*codeset != cp && (*codeset)[0] != '\0')
-	    {
-	      *normalized_codeset = _nl_normalize_codeset (*codeset,
-							   cp - *codeset);
-	      if (strcmp (*codeset, *normalized_codeset) == 0)
-		free ((char *) *normalized_codeset);
-	      else
-		mask |= XPG_NORM_CODESET;
-	    }
-	}
-    }
-
-  if (cp[0] == '@' || (syntax != xpg && cp[0] == '+'))
-    {
-      /* Next is the modifier.  */
-      syntax = cp[0] == '@' ? xpg : cen;
-      cp[0] = '\0';
-      *modifier = ++cp;
-
-      while (syntax == cen && cp[0] != '\0' && cp[0] != '+'
-	     && cp[0] != ',' && cp[0] != '_')
-	++cp;
-
-      mask |= XPG_MODIFIER | CEN_AUDIENCE;
-    }
-
-  if (syntax != xpg && (cp[0] == '+' || cp[0] == ',' || cp[0] == '_'))
-    {
-      syntax = cen;
-
-      if (cp[0] == '+')
-	{
- 	  /* Next is special application (CEN syntax).  */
-	  cp[0] = '\0';
-	  *special = ++cp;
-
-	  while (cp[0] != '\0' && cp[0] != ',' && cp[0] != '_')
-	    ++cp;
-
-	  mask |= CEN_SPECIAL;
-	}
-
-      if (cp[0] == ',')
-	{
- 	  /* Next is sponsor (CEN syntax).  */
-	  cp[0] = '\0';
-	  *sponsor = ++cp;
-
-	  while (cp[0] != '\0' && cp[0] != '_')
-	    ++cp;
-
-	  mask |= CEN_SPONSOR;
-	}
-
-      if (cp[0] == '_')
-	{
- 	  /* Next is revision (CEN syntax).  */
-	  cp[0] = '\0';
-	  *revision = ++cp;
-
-	  mask |= CEN_REVISION;
-	}
-    }
-
-  /* For CEN syntax values it might be important to have the
-     separator character in the file name, not for XPG syntax.  */
-  if (syntax == xpg)
-    {
-      if (*territory != NULL && (*territory)[0] == '\0')
-	mask &= ~TERRITORY;
-
-      if (*codeset != NULL && (*codeset)[0] == '\0')
-	mask &= ~XPG_CODESET;
-
-      if (*modifier != NULL && (*modifier)[0] == '\0')
-	mask &= ~XPG_MODIFIER;
-    }
-
-  return mask;
-}
diff --git a/intl/finddomain.c b/intl/finddomain.c
deleted file mode 100644
index 2f103d5..0000000
--- a/intl/finddomain.c
+++ /dev/null
@@ -1,198 +0,0 @@
-/* Handle list of needed message catalogs
-   Copyright (C) 1995-1999, 2000, 2001 Free Software Foundation, Inc.
-   Written by Ulrich Drepper <drepper@gnu.org>, 1995.
-
-   This program is free software; you can redistribute it and/or modify it
-   under the terms of the GNU Library General Public License as published
-   by the Free Software Foundation; either version 2, or (at your option)
-   any later version.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   Library General Public License for more details.
-
-   You should have received a copy of the GNU Library General Public
-   License along with this program; if not, write to the Free Software
-   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
-   USA.  */
-
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
-
-#include <stdio.h>
-#include <sys/types.h>
-#include <stdlib.h>
-#include <string.h>
-
-#if defined HAVE_UNISTD_H || defined _LIBC
-# include <unistd.h>
-#endif
-
-#include "gettextP.h"
-#ifdef _LIBC
-# include <libintl.h>
-#else
-# include "libgnuintl.h"
-#endif
-
-/* @@ end of prolog @@ */
-/* List of already loaded domains.  */
-static struct loaded_l10nfile *_nl_loaded_domains;
-
-
-/* Return a data structure describing the message catalog described by
-   the DOMAINNAME and CATEGORY parameters with respect to the currently
-   established bindings.  */
-struct loaded_l10nfile *
-internal_function
-_nl_find_domain (dirname, locale, domainname, domainbinding)
-     const char *dirname;
-     char *locale;
-     const char *domainname;
-     struct binding *domainbinding;
-{
-  struct loaded_l10nfile *retval;
-  const char *language;
-  const char *modifier;
-  const char *territory;
-  const char *codeset;
-  const char *normalized_codeset;
-  const char *special;
-  const char *sponsor;
-  const char *revision;
-  const char *alias_value;
-  int mask;
-
-  /* LOCALE can consist of up to four recognized parts for the XPG syntax:
-
-		language[_territory[.codeset]][@modifier]
-
-     and six parts for the CEN syntax:
-
-	language[_territory][+audience][+special][,[sponsor][_revision]]
-
-     Beside the first part all of them are allowed to be missing.  If
-     the full specified locale is not found, the less specific one are
-     looked for.  The various parts will be stripped off according to
-     the following order:
-		(1) revision
-		(2) sponsor
-		(3) special
-		(4) codeset
-		(5) normalized codeset
-		(6) territory
-		(7) audience/modifier
-   */
-
-  /* If we have already tested for this locale entry there has to
-     be one data set in the list of loaded domains.  */
-  retval = _nl_make_l10nflist (&_nl_loaded_domains, dirname,
-			       strlen (dirname) + 1, 0, locale, NULL, NULL,
-			       NULL, NULL, NULL, NULL, NULL, domainname, 0);
-  if (retval != NULL)
-    {
-      /* We know something about this locale.  */
-      int cnt;
-
-      if (retval->decided == 0)
-	_nl_load_domain (retval, domainbinding);
-
-      if (retval->data != NULL)
-	return retval;
-
-      for (cnt = 0; retval->successor[cnt] != NULL; ++cnt)
-	{
-	  if (retval->successor[cnt]->decided == 0)
-	    _nl_load_domain (retval->successor[cnt], domainbinding);
-
-	  if (retval->successor[cnt]->data != NULL)
-	    break;
-	}
-      return cnt >= 0 ? retval : NULL;
-      /* NOTREACHED */
-    }
-
-  /* See whether the locale value is an alias.  If yes its value
-     *overwrites* the alias name.  No test for the original value is
-     done.  */
-  alias_value = _nl_expand_alias (locale);
-  if (alias_value != NULL)
-    {
-#if defined _LIBC || defined HAVE_STRDUP
-      locale = strdup (alias_value);
-      if (locale == NULL)
-	return NULL;
-#else
-      size_t len = strlen (alias_value) + 1;
-      locale = (char *) malloc (len);
-      if (locale == NULL)
-	return NULL;
-
-      memcpy (locale, alias_value, len);
-#endif
-    }
-
-  /* Now we determine the single parts of the locale name.  First
-     look for the language.  Termination symbols are `_' and `@' if
-     we use XPG4 style, and `_', `+', and `,' if we use CEN syntax.  */
-  mask = _nl_explode_name (locale, &language, &modifier, &territory,
-			   &codeset, &normalized_codeset, &special,
-			   &sponsor, &revision);
-
-  /* Create all possible locale entries which might be interested in
-     generalization.  */
-  retval = _nl_make_l10nflist (&_nl_loaded_domains, dirname,
-			       strlen (dirname) + 1, mask, language, territory,
-			       codeset, normalized_codeset, modifier, special,
-			       sponsor, revision, domainname, 1);
-  if (retval == NULL)
-    /* This means we are out of core.  */
-    return NULL;
-
-  if (retval->decided == 0)
-    _nl_load_domain (retval, domainbinding);
-  if (retval->data == NULL)
-    {
-      int cnt;
-      for (cnt = 0; retval->successor[cnt] != NULL; ++cnt)
-	{
-	  if (retval->successor[cnt]->decided == 0)
-	    _nl_load_domain (retval->successor[cnt], domainbinding);
-	  if (retval->successor[cnt]->data != NULL)
-	    break;
-	}
-    }
-
-  /* The room for an alias was dynamically allocated.  Free it now.  */
-  if (alias_value != NULL)
-    free (locale);
-
-  /* The space for normalized_codeset is dynamically allocated.  Free it.  */
-  if (mask & XPG_NORM_CODESET)
-    free ((void *) normalized_codeset);
-
-  return retval;
-}
-
-
-#ifdef _LIBC
-static void __attribute__ ((unused))
-free_mem (void)
-{
-  struct loaded_l10nfile *runp = _nl_loaded_domains;
-
-  while (runp != NULL)
-    {
-      struct loaded_l10nfile *here = runp;
-      if (runp->data != NULL)
-	_nl_unload_domain ((struct loaded_domain *) runp->data);
-      runp = runp->next;
-      free ((char *) here->filename);
-      free (here);
-    }
-}
-
-text_set_element (__libc_subfreeres, free_mem);
-#endif
diff --git a/intl/gettext.c b/intl/gettext.c
deleted file mode 100644
index e52d8ae..0000000
--- a/intl/gettext.c
+++ /dev/null
@@ -1,64 +0,0 @@
-/* Implementation of gettext(3) function.
-   Copyright (C) 1995, 1997, 2000, 2001, 2002 Free Software Foundation, Inc.
-
-   This program is free software; you can redistribute it and/or modify it
-   under the terms of the GNU Library General Public License as published
-   by the Free Software Foundation; either version 2, or (at your option)
-   any later version.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   Library General Public License for more details.
-
-   You should have received a copy of the GNU Library General Public
-   License along with this program; if not, write to the Free Software
-   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
-   USA.  */
-
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
-
-#ifdef _LIBC
-# define __need_NULL
-# include <stddef.h>
-#else
-# include <stdlib.h>		/* Just for NULL.  */
-#endif
-
-#include "gettextP.h"
-#ifdef _LIBC
-# include <libintl.h>
-#else
-# include "libgnuintl.h"
-#endif
-
-/* @@ end of prolog @@ */
-
-/* Names for the libintl functions are a problem.  They must not clash
-   with existing names and they should follow ANSI C.  But this source
-   code is also used in GNU C Library where the names have a __
-   prefix.  So we have to make a difference here.  */
-#ifdef _LIBC
-# define GETTEXT __gettext
-# define DCGETTEXT INTUSE(__dcgettext)
-#else
-# define GETTEXT gettext__
-# define DCGETTEXT dcgettext__
-#endif
-
-/* Look up MSGID in the current default message catalog for the current
-   LC_MESSAGES locale.  If not found, returns MSGID itself (the default
-   text).  */
-char *
-GETTEXT (msgid)
-     const char *msgid;
-{
-  return DCGETTEXT (NULL, msgid, LC_MESSAGES);
-}
-
-#ifdef _LIBC
-/* Alias for function name in GNU C Library.  */
-weak_alias (__gettext, gettext);
-#endif
diff --git a/intl/gettextP.h b/intl/gettextP.h
deleted file mode 100644
index 4e3a5b2..0000000
--- a/intl/gettextP.h
+++ /dev/null
@@ -1,205 +0,0 @@
-/* Header describing internals of libintl library.
-   Copyright (C) 1995-1999, 2000-2002 Free Software Foundation, Inc.
-   Written by Ulrich Drepper <drepper@cygnus.com>, 1995.
-
-   This program is free software; you can redistribute it and/or modify it
-   under the terms of the GNU Library General Public License as published
-   by the Free Software Foundation; either version 2, or (at your option)
-   any later version.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   Library General Public License for more details.
-
-   You should have received a copy of the GNU Library General Public
-   License along with this program; if not, write to the Free Software
-   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
-   USA.  */
-
-#ifndef _GETTEXTP_H
-#define _GETTEXTP_H
-
-#include <stddef.h>		/* Get size_t.  */
-
-#ifdef _LIBC
-# include "../iconv/gconv_int.h"
-#else
-# if HAVE_ICONV
-#  include <iconv.h>
-# endif
-#endif
-
-#include "loadinfo.h"
-
-#include "gmo.h"		/* Get nls_uint32.  */
-
-/* @@ end of prolog @@ */
-
-#ifndef PARAMS
-# if __STDC__ || defined __GNUC__ || defined __SUNPRO_C || defined __cplusplus || __PROTOTYPES
-#  define PARAMS(args) args
-# else
-#  define PARAMS(args) ()
-# endif
-#endif
-
-#ifndef internal_function
-# define internal_function
-#endif
-
-#ifndef attribute_hidden
-# define attribute_hidden
-#endif
-
-/* Tell the compiler when a conditional or integer expression is
-   almost always true or almost always false.  */
-#ifndef HAVE_BUILTIN_EXPECT
-# define __builtin_expect(expr, val) (expr)
-#endif
-
-#ifndef W
-# define W(flag, data) ((flag) ? SWAP (data) : (data))
-#endif
-
-
-#ifdef _LIBC
-# include <byteswap.h>
-# define SWAP(i) bswap_32 (i)
-#else
-static inline nls_uint32
-SWAP (i)
-     nls_uint32 i;
-{
-  return (i << 24) | ((i & 0xff00) << 8) | ((i >> 8) & 0xff00) | (i >> 24);
-}
-#endif
-
-
-/* The representation of an opened message catalog.  */
-struct loaded_domain
-{
-  const char *data;
-  int use_mmap;
-  size_t mmap_size;
-  int must_swap;
-  nls_uint32 nstrings;
-  struct string_desc *orig_tab;
-  struct string_desc *trans_tab;
-  nls_uint32 hash_size;
-  nls_uint32 *hash_tab;
-  int codeset_cntr;
-#ifdef _LIBC
-  __gconv_t conv;
-#else
-# if HAVE_ICONV
-  iconv_t conv;
-# endif
-#endif
-  char **conv_tab;
-
-  struct expression *plural;
-  unsigned long int nplurals;
-};
-
-/* We want to allocate a string at the end of the struct.  But ISO C
-   doesn't allow zero sized arrays.  */
-#ifdef __GNUC__
-# define ZERO 0
-#else
-# define ZERO 1
-#endif
-
-/* A set of settings bound to a message domain.  Used to store settings
-   from bindtextdomain() and bind_textdomain_codeset().  */
-struct binding
-{
-  struct binding *next;
-  char *dirname;
-  int codeset_cntr;	/* Incremented each time codeset changes.  */
-  char *codeset;
-  char domainname[ZERO];
-};
-
-/* A counter which is incremented each time some previous translations
-   become invalid.
-   This variable is part of the external ABI of the GNU libintl.  */
-extern int _nl_msg_cat_cntr;
-
-#ifndef _LIBC
-const char *_nl_locale_name PARAMS ((int category, const char *categoryname));
-#endif
-
-struct loaded_l10nfile *_nl_find_domain PARAMS ((const char *__dirname,
-						 char *__locale,
-						 const char *__domainname,
-					      struct binding *__domainbinding))
-     internal_function;
-void _nl_load_domain PARAMS ((struct loaded_l10nfile *__domain,
-			      struct binding *__domainbinding))
-     internal_function;
-void _nl_unload_domain PARAMS ((struct loaded_domain *__domain))
-     internal_function;
-const char *_nl_init_domain_conv PARAMS ((struct loaded_l10nfile *__domain_file,
-					  struct loaded_domain *__domain,
-					  struct binding *__domainbinding))
-     internal_function;
-void _nl_free_domain_conv PARAMS ((struct loaded_domain *__domain))
-     internal_function;
-
-char *_nl_find_msg PARAMS ((struct loaded_l10nfile *domain_file,
-			    struct binding *domainbinding,
-			    const char *msgid, size_t *lengthp))
-     internal_function;
-
-#ifdef _LIBC
-extern char *__gettext PARAMS ((const char *__msgid));
-extern char *__dgettext PARAMS ((const char *__domainname,
-				 const char *__msgid));
-extern char *__dcgettext PARAMS ((const char *__domainname,
-				  const char *__msgid, int __category));
-extern char *__ngettext PARAMS ((const char *__msgid1, const char *__msgid2,
-				 unsigned long int __n));
-extern char *__dngettext PARAMS ((const char *__domainname,
-				  const char *__msgid1, const char *__msgid2,
-				  unsigned long int n));
-extern char *__dcngettext PARAMS ((const char *__domainname,
-				   const char *__msgid1, const char *__msgid2,
-				   unsigned long int __n, int __category));
-extern char *__dcigettext PARAMS ((const char *__domainname,
-				   const char *__msgid1, const char *__msgid2,
-				   int __plural, unsigned long int __n,
-				   int __category));
-extern char *__textdomain PARAMS ((const char *__domainname));
-extern char *__bindtextdomain PARAMS ((const char *__domainname,
-				       const char *__dirname));
-extern char *__bind_textdomain_codeset PARAMS ((const char *__domainname,
-						const char *__codeset));
-#else
-extern char *gettext__ PARAMS ((const char *__msgid));
-extern char *dgettext__ PARAMS ((const char *__domainname,
-				 const char *__msgid));
-extern char *dcgettext__ PARAMS ((const char *__domainname,
-				  const char *__msgid, int __category));
-extern char *ngettext__ PARAMS ((const char *__msgid1, const char *__msgid2,
-				 unsigned long int __n));
-extern char *dngettext__ PARAMS ((const char *__domainname,
-				  const char *__msgid1, const char *__msgid2,
-				  unsigned long int __n));
-extern char *dcngettext__ PARAMS ((const char *__domainname,
-				   const char *__msgid1, const char *__msgid2,
-				   unsigned long int __n, int __category));
-extern char *dcigettext__ PARAMS ((const char *__domainname,
-				   const char *__msgid1, const char *__msgid2,
-				   int __plural, unsigned long int __n,
-				   int __category));
-extern char *textdomain__ PARAMS ((const char *__domainname));
-extern char *bindtextdomain__ PARAMS ((const char *__domainname,
-				       const char *__dirname));
-extern char *bind_textdomain_codeset__ PARAMS ((const char *__domainname,
-						const char *__codeset));
-#endif
-
-/* @@ begin of epilog @@ */
-
-#endif /* gettextP.h  */
diff --git a/intl/gmo.h b/intl/gmo.h
deleted file mode 100644
index f05ae47..0000000
--- a/intl/gmo.h
+++ /dev/null
@@ -1,100 +0,0 @@
-/* Description of GNU message catalog format: general file layout.
-   Copyright (C) 1995, 1997, 2000, 2001 Free Software Foundation, Inc.
-
-   This program is free software; you can redistribute it and/or modify it
-   under the terms of the GNU Library General Public License as published
-   by the Free Software Foundation; either version 2, or (at your option)
-   any later version.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   Library General Public License for more details.
-
-   You should have received a copy of the GNU Library General Public
-   License along with this program; if not, write to the Free Software
-   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
-   USA.  */
-
-#ifndef _GETTEXT_H
-#define _GETTEXT_H 1
-
-#include <limits.h>
-
-/* @@ end of prolog @@ */
-
-/* The magic number of the GNU message catalog format.  */
-#define _MAGIC 0x950412de
-#define _MAGIC_SWAPPED 0xde120495
-
-/* Revision number of the currently used .mo (binary) file format.  */
-#define MO_REVISION_NUMBER 0
-
-/* The following contortions are an attempt to use the C preprocessor
-   to determine an unsigned integral type that is 32 bits wide.  An
-   alternative approach is to use autoconf's AC_CHECK_SIZEOF macro, but
-   as of version autoconf-2.13, the AC_CHECK_SIZEOF macro doesn't work
-   when cross-compiling.  */
-
-#if __STDC__
-# define UINT_MAX_32_BITS 4294967295U
-#else
-# define UINT_MAX_32_BITS 0xFFFFFFFF
-#endif
-
-/* If UINT_MAX isn't defined, assume it's a 32-bit type.
-   This should be valid for all systems GNU cares about because
-   that doesn't include 16-bit systems, and only modern systems
-   (that certainly have <limits.h>) have 64+-bit integral types.  */
-
-#ifndef UINT_MAX
-# define UINT_MAX UINT_MAX_32_BITS
-#endif
-
-#if UINT_MAX == UINT_MAX_32_BITS
-typedef unsigned nls_uint32;
-#else
-# if USHRT_MAX == UINT_MAX_32_BITS
-typedef unsigned short nls_uint32;
-# else
-#  if ULONG_MAX == UINT_MAX_32_BITS
-typedef unsigned long nls_uint32;
-#  else
-  /* The following line is intended to throw an error.  Using #error is
-     not portable enough.  */
-  "Cannot determine unsigned 32-bit data type."
-#  endif
-# endif
-#endif
-
-
-/* Header for binary .mo file format.  */
-struct mo_file_header
-{
-  /* The magic number.  */
-  nls_uint32 magic;
-  /* The revision number of the file format.  */
-  nls_uint32 revision;
-  /* The number of strings pairs.  */
-  nls_uint32 nstrings;
-  /* Offset of table with start offsets of original strings.  */
-  nls_uint32 orig_tab_offset;
-  /* Offset of table with start offsets of translation strings.  */
-  nls_uint32 trans_tab_offset;
-  /* Size of hashing table.  */
-  nls_uint32 hash_tab_size;
-  /* Offset of first hashing entry.  */
-  nls_uint32 hash_tab_offset;
-};
-
-struct string_desc
-{
-  /* Length of addressed string.  */
-  nls_uint32 length;
-  /* Offset of string in file.  */
-  nls_uint32 offset;
-};
-
-/* @@ begin of epilog @@ */
-
-#endif	/* gettext.h  */
diff --git a/intl/hash-string.h b/intl/hash-string.h
deleted file mode 100644
index b267a87..0000000
--- a/intl/hash-string.h
+++ /dev/null
@@ -1,59 +0,0 @@
-/* Description of GNU message catalog format: string hashing function.
-   Copyright (C) 1995, 1997, 1998, 2000, 2001 Free Software Foundation, Inc.
-
-   This program is free software; you can redistribute it and/or modify it
-   under the terms of the GNU Library General Public License as published
-   by the Free Software Foundation; either version 2, or (at your option)
-   any later version.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   Library General Public License for more details.
-
-   You should have received a copy of the GNU Library General Public
-   License along with this program; if not, write to the Free Software
-   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
-   USA.  */
-
-/* @@ end of prolog @@ */
-
-#ifndef PARAMS
-# if __STDC__ || defined __GNUC__ || defined __SUNPRO_C || defined __cplusplus || __PROTOTYPES
-#  define PARAMS(Args) Args
-# else
-#  define PARAMS(Args) ()
-# endif
-#endif
-
-/* We assume to have `unsigned long int' value with at least 32 bits.  */
-#define HASHWORDBITS 32
-
-
-/* Defines the so called `hashpjw' function by P.J. Weinberger
-   [see Aho/Sethi/Ullman, COMPILERS: Principles, Techniques and Tools,
-   1986, 1987 Bell Telephone Laboratories, Inc.]  */
-static unsigned long int hash_string PARAMS ((const char *__str_param));
-
-static inline unsigned long int
-hash_string (str_param)
-     const char *str_param;
-{
-  unsigned long int hval, g;
-  const char *str = str_param;
-
-  /* Compute the hash value for the given string.  */
-  hval = 0;
-  while (*str != '\0')
-    {
-      hval <<= 4;
-      hval += (unsigned long int) *str++;
-      g = hval & ((unsigned long int) 0xf << (HASHWORDBITS - 4));
-      if (g != 0)
-	{
-	  hval ^= g >> (HASHWORDBITS - 8);
-	  hval ^= g;
-	}
-    }
-  return hval;
-}
diff --git a/intl/intl-compat.c b/intl/intl-compat.c
deleted file mode 100644
index 0a06ce9..0000000
--- a/intl/intl-compat.c
+++ /dev/null
@@ -1,166 +0,0 @@
-/* intl-compat.c - Stub functions to call gettext functions from GNU gettext
-   Library.
-   Copyright (C) 1995, 2000, 2001 Software Foundation, Inc.
-
-   This program is free software; you can redistribute it and/or modify it
-   under the terms of the GNU Library General Public License as published
-   by the Free Software Foundation; either version 2, or (at your option)
-   any later version.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   Library General Public License for more details.
-
-   You should have received a copy of the GNU Library General Public
-   License along with this program; if not, write to the Free Software
-   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
-   USA.  */
-
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
-
-#include "libgnuintl.h"
-#include "gettextP.h"
-
-/* @@ end of prolog @@ */
-
-/* This file redirects the gettext functions (without prefix or suffix) to
-   those defined in the included GNU gettext library (with "__" suffix).
-   It is compiled into libintl when the included GNU gettext library is
-   configured --with-included-gettext.
-
-   This redirection works also in the case that the system C library or
-   the system libintl library contain gettext/textdomain/... functions.
-   If it didn't, we would need to add preprocessor level redirections to
-   libgnuintl.h of the following form:
-
-#    define gettext gettext__
-#    define dgettext dgettext__
-#    define dcgettext dcgettext__
-#    define ngettext ngettext__
-#    define dngettext dngettext__
-#    define dcngettext dcngettext__
-#    define textdomain textdomain__
-#    define bindtextdomain bindtextdomain__
-#    define bind_textdomain_codeset bind_textdomain_codeset__
-
-   How does this redirection work? There are two cases.
-   A. When libintl.a is linked into an executable, it works because
-      functions defined in the executable always override functions in
-      the shared libraries.
-   B. When libintl.so is used, it works because
-      1. those systems defining gettext/textdomain/... in the C library
-         (namely, Solaris 2.4 and newer, and GNU libc 2.0 and newer) are
-         ELF systems and define these symbols as weak, thus explicitly
-         letting other shared libraries override it.
-      2. those systems defining gettext/textdomain/... in a standalone
-         libintl.so library (namely, Solaris 2.3 and newer) have this
-         shared library in /usr/lib, and the linker will search /usr/lib
-         *after* the directory where the GNU gettext library is installed.
-
-   A third case, namely when libintl.a is linked into a shared library
-   whose name is not libintl.so, is not supported. In this case, on
-   Solaris, when -lintl precedes the linker option for the shared library
-   containing GNU gettext, the system's gettext would indeed override
-   the GNU gettext. Anyone doing this kind of stuff must be clever enough
-   to 1. compile libintl.a with -fPIC, 2. remove -lintl from his linker
-   command line.  */
-
-
-#undef gettext
-#undef dgettext
-#undef dcgettext
-#undef ngettext
-#undef dngettext
-#undef dcngettext
-#undef textdomain
-#undef bindtextdomain
-#undef bind_textdomain_codeset
-
-
-char *
-gettext (msgid)
-     const char *msgid;
-{
-  return gettext__ (msgid);
-}
-
-
-char *
-dgettext (domainname, msgid)
-     const char *domainname;
-     const char *msgid;
-{
-  return dgettext__ (domainname, msgid);
-}
-
-
-char *
-dcgettext (domainname, msgid, category)
-     const char *domainname;
-     const char *msgid;
-     int category;
-{
-  return dcgettext__ (domainname, msgid, category);
-}
-
-
-char *
-ngettext (msgid1, msgid2, n)
-     const char *msgid1;
-     const char *msgid2;
-     unsigned long int n;
-{
-  return ngettext__ (msgid1, msgid2, n);
-}
-
-
-char *
-dngettext (domainname, msgid1, msgid2, n)
-     const char *domainname;
-     const char *msgid1;
-     const char *msgid2;
-     unsigned long int n;
-{
-  return dngettext__ (domainname, msgid1, msgid2, n);
-}
-
-
-char *
-dcngettext (domainname, msgid1, msgid2, n, category)
-     const char *domainname;
-     const char *msgid1;
-     const char *msgid2;
-     unsigned long int n;
-     int category;
-{
-  return dcngettext__ (domainname, msgid1, msgid2, n, category);
-}
-
-
-char *
-textdomain (domainname)
-     const char *domainname;
-{
-  return textdomain__ (domainname);
-}
-
-
-char *
-bindtextdomain (domainname, dirname)
-     const char *domainname;
-     const char *dirname;
-{
-  return bindtextdomain__ (domainname, dirname);
-}
-
-
-char *
-bind_textdomain_codeset (domainname, codeset)
-     const char *domainname;
-     const char *codeset;
-{
-  return bind_textdomain_codeset__ (domainname, codeset);
-}
diff --git a/intl/l10nflist.c b/intl/l10nflist.c
deleted file mode 100644
index d861912..0000000
--- a/intl/l10nflist.c
+++ /dev/null
@@ -1,409 +0,0 @@
-/* Copyright (C) 1995-1999, 2000, 2001, 2002 Free Software Foundation, Inc.
-   Contributed by Ulrich Drepper <drepper@gnu.ai.mit.edu>, 1995.
-
-   This program is free software; you can redistribute it and/or modify it
-   under the terms of the GNU Library General Public License as published
-   by the Free Software Foundation; either version 2, or (at your option)
-   any later version.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   Library General Public License for more details.
-
-   You should have received a copy of the GNU Library General Public
-   License along with this program; if not, write to the Free Software
-   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
-   USA.  */
-
-/* Tell glibc's <string.h> to provide a prototype for stpcpy().
-   This must come before <config.h> because <config.h> may include
-   <features.h>, and once <features.h> has been included, it's too late.  */
-#ifndef _GNU_SOURCE
-# define _GNU_SOURCE	1
-#endif
-
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
-
-#include <string.h>
-
-#if defined _LIBC || defined HAVE_ARGZ_H
-# include <argz.h>
-#endif
-#include <ctype.h>
-#include <sys/types.h>
-#include <stdlib.h>
-
-#include "loadinfo.h"
-
-/* On some strange systems still no definition of NULL is found.  Sigh!  */
-#ifndef NULL
-# if defined __STDC__ && __STDC__
-#  define NULL ((void *) 0)
-# else
-#  define NULL 0
-# endif
-#endif
-
-/* @@ end of prolog @@ */
-
-#ifdef _LIBC
-/* Rename the non ANSI C functions.  This is required by the standard
-   because some ANSI C functions will require linking with this object
-   file and the name space must not be polluted.  */
-# ifndef stpcpy
-#  define stpcpy(dest, src) __stpcpy(dest, src)
-# endif
-#else
-# ifndef HAVE_STPCPY
-static char *stpcpy PARAMS ((char *dest, const char *src));
-# endif
-#endif
-
-/* Define function which are usually not available.  */
-
-#if !defined _LIBC && !defined HAVE___ARGZ_COUNT
-/* Returns the number of strings in ARGZ.  */
-static size_t argz_count__ PARAMS ((const char *argz, size_t len));
-
-static size_t
-argz_count__ (argz, len)
-     const char *argz;
-     size_t len;
-{
-  size_t count = 0;
-  while (len > 0)
-    {
-      size_t part_len = strlen (argz);
-      argz += part_len + 1;
-      len -= part_len + 1;
-      count++;
-    }
-  return count;
-}
-# undef __argz_count
-# define __argz_count(argz, len) argz_count__ (argz, len)
-#else
-# ifdef _LIBC
-#  define __argz_count(argz, len) INTUSE(__argz_count) (argz, len)
-# endif
-#endif	/* !_LIBC && !HAVE___ARGZ_COUNT */
-
-#if !defined _LIBC && !defined HAVE___ARGZ_STRINGIFY
-/* Make '\0' separated arg vector ARGZ printable by converting all the '\0's
-   except the last into the character SEP.  */
-static void argz_stringify__ PARAMS ((char *argz, size_t len, int sep));
-
-static void
-argz_stringify__ (argz, len, sep)
-     char *argz;
-     size_t len;
-     int sep;
-{
-  while (len > 0)
-    {
-      size_t part_len = strlen (argz);
-      argz += part_len;
-      len -= part_len + 1;
-      if (len > 0)
-	*argz++ = sep;
-    }
-}
-# undef __argz_stringify
-# define __argz_stringify(argz, len, sep) argz_stringify__ (argz, len, sep)
-#else
-# ifdef _LIBC
-#  define __argz_stringify(argz, len, sep) \
-  INTUSE(__argz_stringify) (argz, len, sep)
-# endif
-#endif	/* !_LIBC && !HAVE___ARGZ_STRINGIFY */
-
-#if !defined _LIBC && !defined HAVE___ARGZ_NEXT
-static char *argz_next__ PARAMS ((char *argz, size_t argz_len,
-				  const char *entry));
-
-static char *
-argz_next__ (argz, argz_len, entry)
-     char *argz;
-     size_t argz_len;
-     const char *entry;
-{
-  if (entry)
-    {
-      if (entry < argz + argz_len)
-        entry = strchr (entry, '\0') + 1;
-
-      return entry >= argz + argz_len ? NULL : (char *) entry;
-    }
-  else
-    if (argz_len > 0)
-      return argz;
-    else
-      return 0;
-}
-# undef __argz_next
-# define __argz_next(argz, len, entry) argz_next__ (argz, len, entry)
-#endif	/* !_LIBC && !HAVE___ARGZ_NEXT */
-
-
-/* Return number of bits set in X.  */
-static int pop PARAMS ((int x));
-
-static inline int
-pop (x)
-     int x;
-{
-  /* We assume that no more than 16 bits are used.  */
-  x = ((x & ~0x5555) >> 1) + (x & 0x5555);
-  x = ((x & ~0x3333) >> 2) + (x & 0x3333);
-  x = ((x >> 4) + x) & 0x0f0f;
-  x = ((x >> 8) + x) & 0xff;
-
-  return x;
-}
-
-
-struct loaded_l10nfile *
-_nl_make_l10nflist (l10nfile_list, dirlist, dirlist_len, mask, language,
-		    territory, codeset, normalized_codeset, modifier, special,
-		    sponsor, revision, filename, do_allocate)
-     struct loaded_l10nfile **l10nfile_list;
-     const char *dirlist;
-     size_t dirlist_len;
-     int mask;
-     const char *language;
-     const char *territory;
-     const char *codeset;
-     const char *normalized_codeset;
-     const char *modifier;
-     const char *special;
-     const char *sponsor;
-     const char *revision;
-     const char *filename;
-     int do_allocate;
-{
-  char *abs_filename;
-  struct loaded_l10nfile *last = NULL;
-  struct loaded_l10nfile *retval;
-  char *cp;
-  size_t entries;
-  int cnt;
-
-  /* Allocate room for the full file name.  */
-  abs_filename = (char *) malloc (dirlist_len
-				  + strlen (language)
-				  + ((mask & TERRITORY) != 0
-				     ? strlen (territory) + 1 : 0)
-				  + ((mask & XPG_CODESET) != 0
-				     ? strlen (codeset) + 1 : 0)
-				  + ((mask & XPG_NORM_CODESET) != 0
-				     ? strlen (normalized_codeset) + 1 : 0)
-				  + (((mask & XPG_MODIFIER) != 0
-				      || (mask & CEN_AUDIENCE) != 0)
-				     ? strlen (modifier) + 1 : 0)
-				  + ((mask & CEN_SPECIAL) != 0
-				     ? strlen (special) + 1 : 0)
-				  + (((mask & CEN_SPONSOR) != 0
-				      || (mask & CEN_REVISION) != 0)
-				     ? (1 + ((mask & CEN_SPONSOR) != 0
-					     ? strlen (sponsor) + 1 : 0)
-					+ ((mask & CEN_REVISION) != 0
-					   ? strlen (revision) + 1 : 0)) : 0)
-				  + 1 + strlen (filename) + 1);
-
-  if (abs_filename == NULL)
-    return NULL;
-
-  retval = NULL;
-  last = NULL;
-
-  /* Construct file name.  */
-  memcpy (abs_filename, dirlist, dirlist_len);
-  __argz_stringify (abs_filename, dirlist_len, PATH_SEPARATOR);
-  cp = abs_filename + (dirlist_len - 1);
-  *cp++ = '/';
-  cp = stpcpy (cp, language);
-
-  if ((mask & TERRITORY) != 0)
-    {
-      *cp++ = '_';
-      cp = stpcpy (cp, territory);
-    }
-  if ((mask & XPG_CODESET) != 0)
-    {
-      *cp++ = '.';
-      cp = stpcpy (cp, codeset);
-    }
-  if ((mask & XPG_NORM_CODESET) != 0)
-    {
-      *cp++ = '.';
-      cp = stpcpy (cp, normalized_codeset);
-    }
-  if ((mask & (XPG_MODIFIER | CEN_AUDIENCE)) != 0)
-    {
-      /* This component can be part of both syntaces but has different
-	 leading characters.  For CEN we use `+', else `@'.  */
-      *cp++ = (mask & CEN_AUDIENCE) != 0 ? '+' : '@';
-      cp = stpcpy (cp, modifier);
-    }
-  if ((mask & CEN_SPECIAL) != 0)
-    {
-      *cp++ = '+';
-      cp = stpcpy (cp, special);
-    }
-  if ((mask & (CEN_SPONSOR | CEN_REVISION)) != 0)
-    {
-      *cp++ = ',';
-      if ((mask & CEN_SPONSOR) != 0)
-	cp = stpcpy (cp, sponsor);
-      if ((mask & CEN_REVISION) != 0)
-	{
-	  *cp++ = '_';
-	  cp = stpcpy (cp, revision);
-	}
-    }
-
-  *cp++ = '/';
-  stpcpy (cp, filename);
-
-  /* Look in list of already loaded domains whether it is already
-     available.  */
-  last = NULL;
-  for (retval = *l10nfile_list; retval != NULL; retval = retval->next)
-    if (retval->filename != NULL)
-      {
-	int compare = strcmp (retval->filename, abs_filename);
-	if (compare == 0)
-	  /* We found it!  */
-	  break;
-	if (compare < 0)
-	  {
-	    /* It's not in the list.  */
-	    retval = NULL;
-	    break;
-	  }
-
-	last = retval;
-      }
-
-  if (retval != NULL || do_allocate == 0)
-    {
-      free (abs_filename);
-      return retval;
-    }
-
-  retval = (struct loaded_l10nfile *)
-    malloc (sizeof (*retval) + (__argz_count (dirlist, dirlist_len)
-				* (1 << pop (mask))
-				* sizeof (struct loaded_l10nfile *)));
-  if (retval == NULL)
-    return NULL;
-
-  retval->filename = abs_filename;
-  retval->decided = (__argz_count (dirlist, dirlist_len) != 1
-		     || ((mask & XPG_CODESET) != 0
-			 && (mask & XPG_NORM_CODESET) != 0));
-  retval->data = NULL;
-
-  if (last == NULL)
-    {
-      retval->next = *l10nfile_list;
-      *l10nfile_list = retval;
-    }
-  else
-    {
-      retval->next = last->next;
-      last->next = retval;
-    }
-
-  entries = 0;
-  /* If the DIRLIST is a real list the RETVAL entry corresponds not to
-     a real file.  So we have to use the DIRLIST separation mechanism
-     of the inner loop.  */
-  cnt = __argz_count (dirlist, dirlist_len) == 1 ? mask - 1 : mask;
-  for (; cnt >= 0; --cnt)
-    if ((cnt & ~mask) == 0
-	&& ((cnt & CEN_SPECIFIC) == 0 || (cnt & XPG_SPECIFIC) == 0)
-	&& ((cnt & XPG_CODESET) == 0 || (cnt & XPG_NORM_CODESET) == 0))
-      {
-	/* Iterate over all elements of the DIRLIST.  */
-	char *dir = NULL;
-
-	while ((dir = __argz_next ((char *) dirlist, dirlist_len, dir))
-	       != NULL)
-	  retval->successor[entries++]
-	    = _nl_make_l10nflist (l10nfile_list, dir, strlen (dir) + 1, cnt,
-				  language, territory, codeset,
-				  normalized_codeset, modifier, special,
-				  sponsor, revision, filename, 1);
-      }
-  retval->successor[entries] = NULL;
-
-  return retval;
-}
-
-/* Normalize codeset name.  There is no standard for the codeset
-   names.  Normalization allows the user to use any of the common
-   names.  The return value is dynamically allocated and has to be
-   freed by the caller.  */
-const char *
-_nl_normalize_codeset (codeset, name_len)
-     const char *codeset;
-     size_t name_len;
-{
-  int len = 0;
-  int only_digit = 1;
-  char *retval;
-  char *wp;
-  size_t cnt;
-
-  for (cnt = 0; cnt < name_len; ++cnt)
-    if (isalnum ((unsigned char) codeset[cnt]))
-      {
-	++len;
-
-	if (isalpha ((unsigned char) codeset[cnt]))
-	  only_digit = 0;
-      }
-
-  retval = (char *) malloc ((only_digit ? 3 : 0) + len + 1);
-
-  if (retval != NULL)
-    {
-      if (only_digit)
-	wp = stpcpy (retval, "iso");
-      else
-	wp = retval;
-
-      for (cnt = 0; cnt < name_len; ++cnt)
-	if (isalpha ((unsigned char) codeset[cnt]))
-	  *wp++ = tolower ((unsigned char) codeset[cnt]);
-	else if (isdigit ((unsigned char) codeset[cnt]))
-	  *wp++ = codeset[cnt];
-
-      *wp = '\0';
-    }
-
-  return (const char *) retval;
-}
-
-
-/* @@ begin of epilog @@ */
-
-/* We don't want libintl.a to depend on any other library.  So we
-   avoid the non-standard function stpcpy.  In GNU C Library this
-   function is available, though.  Also allow the symbol HAVE_STPCPY
-   to be defined.  */
-#if !_LIBC && !HAVE_STPCPY
-static char *
-stpcpy (dest, src)
-     char *dest;
-     const char *src;
-{
-  while ((*dest++ = *src++) != '\0')
-    /* Do nothing. */ ;
-  return dest - 1;
-}
-#endif
diff --git a/intl/libgnuintl.h b/intl/libgnuintl.h
deleted file mode 100644
index 1387e70..0000000
--- a/intl/libgnuintl.h
+++ /dev/null
@@ -1,138 +0,0 @@
-/* Message catalogs for internationalization.
-   Copyright (C) 1995-1997, 2000-2002 Free Software Foundation, Inc.
-
-   This program is free software; you can redistribute it and/or modify it
-   under the terms of the GNU Library General Public License as published
-   by the Free Software Foundation; either version 2, or (at your option)
-   any later version.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   Library General Public License for more details.
-
-   You should have received a copy of the GNU Library General Public
-   License along with this program; if not, write to the Free Software
-   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
-   USA.  */
-
-#ifndef _LIBINTL_H
-#define _LIBINTL_H	1
-
-#include <locale.h>
-
-/* The LC_MESSAGES locale category is the category used by the functions
-   gettext() and dgettext().  It is specified in POSIX, but not in ANSI C.
-   On systems that don't define it, use an arbitrary value instead.
-   On Solaris, <locale.h> defines __LOCALE_H (or _LOCALE_H in Solaris 2.5)
-   then includes <libintl.h> (i.e. this file!) and then only defines
-   LC_MESSAGES.  To avoid a redefinition warning, don't define LC_MESSAGES
-   in this case.  */
-#if !defined LC_MESSAGES && !(defined __LOCALE_H || (defined _LOCALE_H && defined __sun))
-# define LC_MESSAGES 1729
-#endif
-
-/* We define an additional symbol to signal that we use the GNU
-   implementation of gettext.  */
-#define __USE_GNU_GETTEXT 1
-
-/* Resolve a platform specific conflict on DJGPP.  GNU gettext takes
-   precedence over _conio_gettext.  */
-#ifdef __DJGPP__
-# undef gettext
-# define gettext gettext
-#endif
-
-/* Use _INTL_PARAMS, not PARAMS, in order to avoid clashes with identifiers
-   used by programs.  Similarly, test __PROTOTYPES, not PROTOTYPES.  */
-#ifndef _INTL_PARAMS
-# if __STDC__ || defined __GNUC__ || defined __SUNPRO_C || defined __cplusplus || __PROTOTYPES
-#  define _INTL_PARAMS(args) args
-# else
-#  define _INTL_PARAMS(args) ()
-# endif
-#endif
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/* Look up MSGID in the current default message catalog for the current
-   LC_MESSAGES locale.  If not found, returns MSGID itself (the default
-   text).  */
-extern char *gettext _INTL_PARAMS ((const char *__msgid));
-
-/* Look up MSGID in the DOMAINNAME message catalog for the current
-   LC_MESSAGES locale.  */
-extern char *dgettext _INTL_PARAMS ((const char *__domainname,
-				     const char *__msgid));
-
-/* Look up MSGID in the DOMAINNAME message catalog for the current CATEGORY
-   locale.  */
-extern char *dcgettext _INTL_PARAMS ((const char *__domainname,
-				      const char *__msgid,
-				      int __category));
-
-
-/* Similar to `gettext' but select the plural form corresponding to the
-   number N.  */
-extern char *ngettext _INTL_PARAMS ((const char *__msgid1,
-				     const char *__msgid2,
-				     unsigned long int __n));
-
-/* Similar to `dgettext' but select the plural form corresponding to the
-   number N.  */
-extern char *dngettext _INTL_PARAMS ((const char *__domainname,
-				      const char *__msgid1,
-				      const char *__msgid2,
-				      unsigned long int __n));
-
-/* Similar to `dcgettext' but select the plural form corresponding to the
-   number N.  */
-extern char *dcngettext _INTL_PARAMS ((const char *__domainname,
-				       const char *__msgid1,
-				       const char *__msgid2,
-				       unsigned long int __n,
-				       int __category));
-
-
-/* Set the current default message catalog to DOMAINNAME.
-   If DOMAINNAME is null, return the current default.
-   If DOMAINNAME is "", reset to the default of "messages".  */
-extern char *textdomain _INTL_PARAMS ((const char *__domainname));
-
-/* Specify that the DOMAINNAME message catalog will be found
-   in DIRNAME rather than in the system locale data base.  */
-extern char *bindtextdomain _INTL_PARAMS ((const char *__domainname,
-					   const char *__dirname));
-
-/* Specify the character encoding in which the messages from the
-   DOMAINNAME message catalog will be returned.  */
-extern char *bind_textdomain_codeset _INTL_PARAMS ((const char *__domainname,
-						    const char *__codeset));
-
-
-/* Optimized version of the functions above.  */
-#if defined __OPTIMIZED
-/* These are macros, but could also be inline functions.  */
-
-# define gettext(msgid)							      \
-  dgettext (NULL, msgid)
-
-# define dgettext(domainname, msgid)					      \
-  dcgettext (domainname, msgid, LC_MESSAGES)
-
-# define ngettext(msgid1, msgid2, n)					      \
-  dngettext (NULL, msgid1, msgid2, n)
-
-# define dngettext(domainname, msgid1, msgid2, n)			      \
-  dcngettext (domainname, msgid1, msgid2, n, LC_MESSAGES)
-
-#endif /* Optimizing. */
-
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* libintl.h */
diff --git a/intl/loadinfo.h b/intl/loadinfo.h
deleted file mode 100644
index d180962..0000000
--- a/intl/loadinfo.h
+++ /dev/null
@@ -1,121 +0,0 @@
-/* Copyright (C) 1996-1999, 2000, 2001 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-   Contributed by Ulrich Drepper <drepper@cygnus.com>, 1996.
-
-   This program is free software; you can redistribute it and/or modify it
-   under the terms of the GNU Library General Public License as published
-   by the Free Software Foundation; either version 2, or (at your option)
-   any later version.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   Library General Public License for more details.
-
-   You should have received a copy of the GNU Library General Public
-   License along with this program; if not, write to the Free Software
-   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
-   USA.  */
-
-#ifndef _LOADINFO_H
-#define _LOADINFO_H	1
-
-/* Declarations of locale dependent catalog lookup functions.
-   Implemented in
-
-     localealias.c    Possibly replace a locale name by another.
-     explodename.c    Split a locale name into its various fields.
-     l10nflist.c      Generate a list of filenames of possible message catalogs.
-     finddomain.c     Find and open the relevant message catalogs.
-
-   The main function _nl_find_domain() in finddomain.c is declared
-   in gettextP.h.
- */
-
-#ifndef PARAMS
-# if __STDC__ || defined __GNUC__ || defined __SUNPRO_C || defined __cplusplus || __PROTOTYPES
-#  define PARAMS(args) args
-# else
-#  define PARAMS(args) ()
-# endif
-#endif
-
-#ifndef internal_function
-# define internal_function
-#endif
-
-/* Tell the compiler when a conditional or integer expression is
-   almost always true or almost always false.  */
-#ifndef HAVE_BUILTIN_EXPECT
-# define __builtin_expect(expr, val) (expr)
-#endif
-
-/* Separator in PATH like lists of pathnames.  */
-#if defined _WIN32 || defined __WIN32__ || defined __EMX__ || defined __DJGPP__
-  /* Win32, OS/2, DOS */
-# define PATH_SEPARATOR ';'
-#else
-  /* Unix */
-# define PATH_SEPARATOR ':'
-#endif
-
-/* Encoding of locale name parts.  */
-#define CEN_REVISION		1
-#define CEN_SPONSOR		2
-#define CEN_SPECIAL		4
-#define XPG_NORM_CODESET	8
-#define XPG_CODESET		16
-#define TERRITORY		32
-#define CEN_AUDIENCE		64
-#define XPG_MODIFIER		128
-
-#define CEN_SPECIFIC	(CEN_REVISION|CEN_SPONSOR|CEN_SPECIAL|CEN_AUDIENCE)
-#define XPG_SPECIFIC	(XPG_CODESET|XPG_NORM_CODESET|XPG_MODIFIER)
-
-
-struct loaded_l10nfile
-{
-  const char *filename;
-  int decided;
-
-  const void *data;
-
-  struct loaded_l10nfile *next;
-  struct loaded_l10nfile *successor[1];
-};
-
-
-/* Normalize codeset name.  There is no standard for the codeset
-   names.  Normalization allows the user to use any of the common
-   names.  The return value is dynamically allocated and has to be
-   freed by the caller.  */
-extern const char *_nl_normalize_codeset PARAMS ((const char *codeset,
-						  size_t name_len));
-
-extern struct loaded_l10nfile *
-_nl_make_l10nflist PARAMS ((struct loaded_l10nfile **l10nfile_list,
-			    const char *dirlist, size_t dirlist_len, int mask,
-			    const char *language, const char *territory,
-			    const char *codeset,
-			    const char *normalized_codeset,
-			    const char *modifier, const char *special,
-			    const char *sponsor, const char *revision,
-			    const char *filename, int do_allocate));
-
-
-extern const char *_nl_expand_alias PARAMS ((const char *name));
-
-/* normalized_codeset is dynamically allocated and has to be freed by
-   the caller.  */
-extern int _nl_explode_name PARAMS ((char *name, const char **language,
-				     const char **modifier,
-				     const char **territory,
-				     const char **codeset,
-				     const char **normalized_codeset,
-				     const char **special,
-				     const char **sponsor,
-				     const char **revision));
-
-extern char *_nl_find_language PARAMS ((const char *name));
-
-#endif	/* loadinfo.h */
diff --git a/intl/loadmsgcat.c b/intl/loadmsgcat.c
deleted file mode 100644
index 76130ed..0000000
--- a/intl/loadmsgcat.c
+++ /dev/null
@@ -1,445 +0,0 @@
-/* Load needed message catalogs.
-   Copyright (C) 1995-1999, 2000, 2001 Free Software Foundation, Inc.
-
-   This program is free software; you can redistribute it and/or modify it
-   under the terms of the GNU Library General Public License as published
-   by the Free Software Foundation; either version 2, or (at your option)
-   any later version.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   Library General Public License for more details.
-
-   You should have received a copy of the GNU Library General Public
-   License along with this program; if not, write to the Free Software
-   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
-   USA.  */
-
-/* Tell glibc's <string.h> to provide a prototype for mempcpy().
-   This must come before <config.h> because <config.h> may include
-   <features.h>, and once <features.h> has been included, it's too late.  */
-#ifndef _GNU_SOURCE
-# define _GNU_SOURCE    1
-#endif
-
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
-
-#include <ctype.h>
-#include <errno.h>
-#include <fcntl.h>
-#include <sys/types.h>
-#include <sys/stat.h>
-
-#ifdef __GNUC__
-# define alloca __builtin_alloca
-# define HAVE_ALLOCA 1
-#else
-# if defined HAVE_ALLOCA_H || defined _LIBC
-#  include <alloca.h>
-# else
-#  ifdef _AIX
- #pragma alloca
-#  else
-#   ifndef alloca
-char *alloca ();
-#   endif
-#  endif
-# endif
-#endif
-
-#include <stdlib.h>
-#include <string.h>
-
-#if defined HAVE_UNISTD_H || defined _LIBC
-# include <unistd.h>
-#endif
-
-#ifdef _LIBC
-# include <langinfo.h>
-# include <locale.h>
-#endif
-
-#if (defined HAVE_MMAP && defined HAVE_MUNMAP && !defined DISALLOW_MMAP) \
-    || (defined _LIBC && defined _POSIX_MAPPED_FILES)
-# include <sys/mman.h>
-# undef HAVE_MMAP
-# define HAVE_MMAP	1
-#else
-# undef HAVE_MMAP
-#endif
-
-#include "gmo.h"
-#include "gettextP.h"
-#include "plural-exp.h"
-
-#ifdef _LIBC
-# include "../locale/localeinfo.h"
-#endif
-
-/* @@ end of prolog @@ */
-
-#ifdef _LIBC
-/* Rename the non ISO C functions.  This is required by the standard
-   because some ISO C functions will require linking with this object
-   file and the name space must not be polluted.  */
-# define open   __open
-# define close  __close
-# define read   __read
-# define mmap   __mmap
-# define munmap __munmap
-#endif
-
-/* For those losing systems which don't have `alloca' we have to add
-   some additional code emulating it.  */
-#ifdef HAVE_ALLOCA
-# define freea(p) /* nothing */
-#else
-# define alloca(n) malloc (n)
-# define freea(p) free (p)
-#endif
-
-/* For systems that distinguish between text and binary I/O.
-   O_BINARY is usually declared in <fcntl.h>. */
-#if !defined O_BINARY && defined _O_BINARY
-  /* For MSC-compatible compilers.  */
-# define O_BINARY _O_BINARY
-# define O_TEXT _O_TEXT
-#endif
-#ifdef __BEOS__
-  /* BeOS 5 has O_BINARY and O_TEXT, but they have no effect.  */
-# undef O_BINARY
-# undef O_TEXT
-#endif
-/* On reasonable systems, binary I/O is the default.  */
-#ifndef O_BINARY
-# define O_BINARY 0
-#endif
-
-/* We need a sign, whether a new catalog was loaded, which can be associated
-   with all translations.  This is important if the translations are
-   cached by one of GCC's features.  */
-int _nl_msg_cat_cntr;
-
-
-/* Initialize the codeset dependent parts of an opened message catalog.
-   Return the header entry.  */
-const char *
-internal_function
-_nl_init_domain_conv (domain_file, domain, domainbinding)
-     struct loaded_l10nfile *domain_file;
-     struct loaded_domain *domain;
-     struct binding *domainbinding;
-{
-  /* Find out about the character set the file is encoded with.
-     This can be found (in textual form) in the entry "".  If this
-     entry does not exist or if this does not contain the `charset='
-     information, we will assume the charset matches the one the
-     current locale and we don't have to perform any conversion.  */
-  char *nullentry;
-  size_t nullentrylen;
-
-  /* Preinitialize fields, to avoid recursion during _nl_find_msg.  */
-  domain->codeset_cntr =
-    (domainbinding != NULL ? domainbinding->codeset_cntr : 0);
-#ifdef _LIBC
-  domain->conv = (__gconv_t) -1;
-#else
-# if HAVE_ICONV
-  domain->conv = (iconv_t) -1;
-# endif
-#endif
-  domain->conv_tab = NULL;
-
-  /* Get the header entry.  */
-  nullentry = _nl_find_msg (domain_file, domainbinding, "", &nullentrylen);
-
-  if (nullentry != NULL)
-    {
-#if defined _LIBC || HAVE_ICONV
-      const char *charsetstr;
-
-      charsetstr = strstr (nullentry, "charset=");
-      if (charsetstr != NULL)
-	{
-	  size_t len;
-	  char *charset;
-	  const char *outcharset;
-
-	  charsetstr += strlen ("charset=");
-	  len = strcspn (charsetstr, " \t\n");
-
-	  charset = (char *) alloca (len + 1);
-# if defined _LIBC || HAVE_MEMPCPY
-	  *((char *) mempcpy (charset, charsetstr, len)) = '\0';
-# else
-	  memcpy (charset, charsetstr, len);
-	  charset[len] = '\0';
-# endif
-
-	  /* The output charset should normally be determined by the
-	     locale.  But sometimes the locale is not used or not correctly
-	     set up, so we provide a possibility for the user to override
-	     this.  Moreover, the value specified through
-	     bind_textdomain_codeset overrides both.  */
-	  if (domainbinding != NULL && domainbinding->codeset != NULL)
-	    outcharset = domainbinding->codeset;
-	  else
-	    {
-	      outcharset = getenv ("OUTPUT_CHARSET");
-	      if (outcharset == NULL || outcharset[0] == '\0')
-		{
-# ifdef _LIBC
-		  outcharset = (*_nl_current[LC_CTYPE])->values[_NL_ITEM_INDEX (CODESET)].string;
-# else
-#  if HAVE_ICONV
-		  extern const char *locale_charset PARAMS ((void));
-		  outcharset = locale_charset ();
-#  endif
-# endif
-		}
-	    }
-
-# ifdef _LIBC
-	  /* We always want to use transliteration.  */
-	  outcharset = norm_add_slashes (outcharset, "TRANSLIT");
-	  charset = norm_add_slashes (charset, NULL);
-	  if (__gconv_open (outcharset, charset, &domain->conv,
-			    GCONV_AVOID_NOCONV)
-	      != __GCONV_OK)
-	    domain->conv = (__gconv_t) -1;
-# else
-#  if HAVE_ICONV
-	  /* When using GNU libc >= 2.2 or GNU libiconv >= 1.5,
-	     we want to use transliteration.  */
-#   if (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 2) || __GLIBC__ > 2 \
-       || _LIBICONV_VERSION >= 0x0105
-	  len = strlen (outcharset);
-	  {
-	    char *tmp = (char *) alloca (len + 10 + 1);
-	    memcpy (tmp, outcharset, len);
-	    memcpy (tmp + len, "//TRANSLIT", 10 + 1);
-	    outcharset = tmp;
-	  }
-#   endif
-	  domain->conv = iconv_open (outcharset, charset);
-#   if (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 2) || __GLIBC__ > 2 \
-       || _LIBICONV_VERSION >= 0x0105
-	  freea (outcharset);
-#   endif
-#  endif
-# endif
-
-	  freea (charset);
-	}
-#endif /* _LIBC || HAVE_ICONV */
-    }
-
-  return nullentry;
-}
-
-/* Frees the codeset dependent parts of an opened message catalog.  */
-void
-internal_function
-_nl_free_domain_conv (domain)
-     struct loaded_domain *domain;
-{
-  if (domain->conv_tab != NULL && domain->conv_tab != (char **) -1)
-    free (domain->conv_tab);
-
-#ifdef _LIBC
-  if (domain->conv != (__gconv_t) -1)
-    __gconv_close (domain->conv);
-#else
-# if HAVE_ICONV
-  if (domain->conv != (iconv_t) -1)
-    iconv_close (domain->conv);
-# endif
-#endif
-}
-
-/* Load the message catalogs specified by FILENAME.  If it is no valid
-   message catalog do nothing.  */
-void
-internal_function
-_nl_load_domain (domain_file, domainbinding)
-     struct loaded_l10nfile *domain_file;
-     struct binding *domainbinding;
-{
-  int fd;
-  size_t size;
-#ifdef _LIBC
-  struct stat64 st;
-#else
-  struct stat st;
-#endif
-  struct mo_file_header *data = (struct mo_file_header *) -1;
-  int use_mmap = 0;
-  struct loaded_domain *domain;
-  const char *nullentry;
-
-  domain_file->decided = 1;
-  domain_file->data = NULL;
-
-  /* Note that it would be useless to store domainbinding in domain_file
-     because domainbinding might be == NULL now but != NULL later (after
-     a call to bind_textdomain_codeset).  */
-
-  /* If the record does not represent a valid locale the FILENAME
-     might be NULL.  This can happen when according to the given
-     specification the locale file name is different for XPG and CEN
-     syntax.  */
-  if (domain_file->filename == NULL)
-    return;
-
-  /* Try to open the addressed file.  */
-  fd = open (domain_file->filename, O_RDONLY | O_BINARY);
-  if (fd == -1)
-    return;
-
-  /* We must know about the size of the file.  */
-  if (
-#ifdef _LIBC
-      __builtin_expect (fstat64 (fd, &st) != 0, 0)
-#else
-      __builtin_expect (fstat (fd, &st) != 0, 0)
-#endif
-      || __builtin_expect ((size = (size_t) st.st_size) != st.st_size, 0)
-      || __builtin_expect (size < sizeof (struct mo_file_header), 0))
-    {
-      /* Something went wrong.  */
-      close (fd);
-      return;
-    }
-
-#ifdef HAVE_MMAP
-  /* Now we are ready to load the file.  If mmap() is available we try
-     this first.  If not available or it failed we try to load it.  */
-  data = (struct mo_file_header *) mmap (NULL, size, PROT_READ,
-					 MAP_PRIVATE, fd, 0);
-
-  if (__builtin_expect (data != (struct mo_file_header *) -1, 1))
-    {
-      /* mmap() call was successful.  */
-      close (fd);
-      use_mmap = 1;
-    }
-#endif
-
-  /* If the data is not yet available (i.e. mmap'ed) we try to load
-     it manually.  */
-  if (data == (struct mo_file_header *) -1)
-    {
-      size_t to_read;
-      char *read_ptr;
-
-      data = (struct mo_file_header *) malloc (size);
-      if (data == NULL)
-	return;
-
-      to_read = size;
-      read_ptr = (char *) data;
-      do
-	{
-	  long int nb = (long int) read (fd, read_ptr, to_read);
-	  if (nb <= 0)
-	    {
-#ifdef EINTR
-	      if (nb == -1 && errno == EINTR)
-		continue;
-#endif
-	      close (fd);
-	      return;
-	    }
-	  read_ptr += nb;
-	  to_read -= nb;
-	}
-      while (to_read > 0);
-
-      close (fd);
-    }
-
-  /* Using the magic number we can test whether it really is a message
-     catalog file.  */
-  if (__builtin_expect (data->magic != _MAGIC && data->magic != _MAGIC_SWAPPED,
-			0))
-    {
-      /* The magic number is wrong: not a message catalog file.  */
-#ifdef HAVE_MMAP
-      if (use_mmap)
-	munmap ((caddr_t) data, size);
-      else
-#endif
-	free (data);
-      return;
-    }
-
-  domain = (struct loaded_domain *) malloc (sizeof (struct loaded_domain));
-  if (domain == NULL)
-    return;
-  domain_file->data = domain;
-
-  domain->data = (char *) data;
-  domain->use_mmap = use_mmap;
-  domain->mmap_size = size;
-  domain->must_swap = data->magic != _MAGIC;
-
-  /* Fill in the information about the available tables.  */
-  switch (W (domain->must_swap, data->revision))
-    {
-    case 0:
-      domain->nstrings = W (domain->must_swap, data->nstrings);
-      domain->orig_tab = (struct string_desc *)
-	((char *) data + W (domain->must_swap, data->orig_tab_offset));
-      domain->trans_tab = (struct string_desc *)
-	((char *) data + W (domain->must_swap, data->trans_tab_offset));
-      domain->hash_size = W (domain->must_swap, data->hash_tab_size);
-      domain->hash_tab = (nls_uint32 *)
-	((char *) data + W (domain->must_swap, data->hash_tab_offset));
-      break;
-    default:
-      /* This is an invalid revision.  */
-#ifdef HAVE_MMAP
-      if (use_mmap)
-	munmap ((caddr_t) data, size);
-      else
-#endif
-	free (data);
-      free (domain);
-      domain_file->data = NULL;
-      return;
-    }
-
-  /* Now initialize the character set converter from the character set
-     the file is encoded with (found in the header entry) to the domain's
-     specified character set or the locale's character set.  */
-  nullentry = _nl_init_domain_conv (domain_file, domain, domainbinding);
-
-  /* Also look for a plural specification.  */
-  EXTRACT_PLURAL_EXPRESSION (nullentry, &domain->plural, &domain->nplurals);
-}
-
-
-#ifdef _LIBC
-void
-internal_function
-_nl_unload_domain (domain)
-     struct loaded_domain *domain;
-{
-  if (domain->plural != &__gettext_germanic_plural)
-    __gettext_free_exp (domain->plural);
-
-  _nl_free_domain_conv (domain);
-
-# ifdef _POSIX_MAPPED_FILES
-  if (domain->use_mmap)
-    munmap ((caddr_t) domain->data, domain->mmap_size);
-  else
-# endif	/* _POSIX_MAPPED_FILES */
-    free ((void *) domain->data);
-
-  free (domain);
-}
-#endif
diff --git a/intl/localcharset.c b/intl/localcharset.c
deleted file mode 100644
index bc5587b..0000000
--- a/intl/localcharset.c
+++ /dev/null
@@ -1,345 +0,0 @@
-/* Determine a canonical name for the current locale's character encoding.
-
-   Copyright (C) 2000-2002 Free Software Foundation, Inc.
-
-   This program is free software; you can redistribute it and/or modify it
-   under the terms of the GNU Library General Public License as published
-   by the Free Software Foundation; either version 2, or (at your option)
-   any later version.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   Library General Public License for more details.
-
-   You should have received a copy of the GNU Library General Public
-   License along with this program; if not, write to the Free Software
-   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
-   USA.  */
-
-/* Written by Bruno Haible <haible@clisp.cons.org>.  */
-
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
-
-#if HAVE_STDDEF_H
-# include <stddef.h>
-#endif
-
-#include <stdio.h>
-#if HAVE_STRING_H
-# include <string.h>
-#else
-# include <strings.h>
-#endif
-#if HAVE_STDLIB_H
-# include <stdlib.h>
-#endif
-
-#if defined _WIN32 || defined __WIN32__
-# undef WIN32   /* avoid warning on mingw32 */
-# define WIN32
-#endif
-
-#if defined __EMX__
-/* Assume EMX program runs on OS/2, even if compiled under DOS.  */
-# define OS2
-#endif
-
-#if !defined WIN32
-# if HAVE_LANGINFO_CODESET
-#  include <langinfo.h>
-# else
-#  if HAVE_SETLOCALE
-#   include <locale.h>
-#  endif
-# endif
-#elif defined WIN32
-# define WIN32_LEAN_AND_MEAN
-# include <windows.h>
-#endif
-#if defined OS2
-# define INCL_DOS
-# include <os2.h>
-#endif
-
-#if defined _WIN32 || defined __WIN32__ || defined __EMX__ || defined __DJGPP__
-  /* Win32, OS/2, DOS */
-# define ISSLASH(C) ((C) == '/' || (C) == '\\')
-#endif
-
-#ifndef DIRECTORY_SEPARATOR
-# define DIRECTORY_SEPARATOR '/'
-#endif
-
-#ifndef ISSLASH
-# define ISSLASH(C) ((C) == DIRECTORY_SEPARATOR)
-#endif
-
-#ifdef HAVE_GETC_UNLOCKED
-# undef getc
-# define getc getc_unlocked
-#endif
-
-/* The following static variable is declared 'volatile' to avoid a
-   possible multithread problem in the function get_charset_aliases. If we
-   are running in a threaded environment, and if two threads initialize
-   'charset_aliases' simultaneously, both will produce the same value,
-   and everything will be ok if the two assignments to 'charset_aliases'
-   are atomic. But I don't know what will happen if the two assignments mix.  */
-#if __STDC__ != 1
-# define volatile /* empty */
-#endif
-/* Pointer to the contents of the charset.alias file, if it has already been
-   read, else NULL.  Its format is:
-   ALIAS_1 '\0' CANONICAL_1 '\0' ... ALIAS_n '\0' CANONICAL_n '\0' '\0'  */
-static const char * volatile charset_aliases;
-
-/* Return a pointer to the contents of the charset.alias file.  */
-static const char *
-get_charset_aliases ()
-{
-  const char *cp;
-
-  cp = charset_aliases;
-  if (cp == NULL)
-    {
-#if !defined WIN32
-      FILE *fp;
-      const char *dir = LIBDIR;
-      const char *base = "charset.alias";
-      char *file_name;
-
-      /* Concatenate dir and base into freshly allocated file_name.  */
-      {
-	size_t dir_len = strlen (dir);
-	size_t base_len = strlen (base);
-	int add_slash = (dir_len > 0 && !ISSLASH (dir[dir_len - 1]));
-	file_name = (char *) malloc (dir_len + add_slash + base_len + 1);
-	if (file_name != NULL)
-	  {
-	    memcpy (file_name, dir, dir_len);
-	    if (add_slash)
-	      file_name[dir_len] = DIRECTORY_SEPARATOR;
-	    memcpy (file_name + dir_len + add_slash, base, base_len + 1);
-	  }
-      }
-
-      if (file_name == NULL || (fp = fopen (file_name, "r")) == NULL)
-	/* Out of memory or file not found, treat it as empty.  */
-	cp = "";
-      else
-	{
-	  /* Parse the file's contents.  */
-	  int c;
-	  char buf1[50+1];
-	  char buf2[50+1];
-	  char *res_ptr = NULL;
-	  size_t res_size = 0;
-	  size_t l1, l2;
-
-	  for (;;)
-	    {
-	      c = getc (fp);
-	      if (c == EOF)
-		break;
-	      if (c == '\n' || c == ' ' || c == '\t')
-		continue;
-	      if (c == '#')
-		{
-		  /* Skip comment, to end of line.  */
-		  do
-		    c = getc (fp);
-		  while (!(c == EOF || c == '\n'));
-		  if (c == EOF)
-		    break;
-		  continue;
-		}
-	      ungetc (c, fp);
-	      if (fscanf (fp, "%50s %50s", buf1, buf2) < 2)
-		break;
-	      l1 = strlen (buf1);
-	      l2 = strlen (buf2);
-	      if (res_size == 0)
-		{
-		  res_size = l1 + 1 + l2 + 1;
-		  res_ptr = (char *) malloc (res_size + 1);
-		}
-	      else
-		{
-		  res_size += l1 + 1 + l2 + 1;
-		  res_ptr = (char *) realloc (res_ptr, res_size + 1);
-		}
-	      if (res_ptr == NULL)
-		{
-		  /* Out of memory. */
-		  res_size = 0;
-		  break;
-		}
-	      strcpy (res_ptr + res_size - (l2 + 1) - (l1 + 1), buf1);
-	      strcpy (res_ptr + res_size - (l2 + 1), buf2);
-	    }
-	  fclose (fp);
-	  if (res_size == 0)
-	    cp = "";
-	  else
-	    {
-	      *(res_ptr + res_size) = '\0';
-	      cp = res_ptr;
-	    }
-	}
-
-      if (file_name != NULL)
-	free (file_name);
-
-#else
-
-      /* To avoid the troubles of installing a separate file in the same
-	 directory as the DLL and of retrieving the DLL's directory at
-	 runtime, simply inline the aliases here.  */
-
-# if defined WIN32
-      cp = "CP936" "\0" "GBK" "\0"
-	   "CP1361" "\0" "JOHAB" "\0";
-# endif
-#endif
-
-      charset_aliases = cp;
-    }
-
-  return cp;
-}
-
-/* Determine the current locale's character encoding, and canonicalize it
-   into one of the canonical names listed in config.charset.
-   The result must not be freed; it is statically allocated.
-   If the canonical name cannot be determined, the result is a non-canonical
-   name.  */
-
-#ifdef STATIC
-STATIC
-#endif
-const char *
-locale_charset ()
-{
-  const char *codeset;
-  const char *aliases;
-
-#if !(defined WIN32 || defined OS2)
-
-# if HAVE_LANGINFO_CODESET
-
-  /* Most systems support nl_langinfo (CODESET) nowadays.  */
-  codeset = nl_langinfo (CODESET);
-
-# else
-
-  /* On old systems which lack it, use setlocale or getenv.  */
-  const char *locale = NULL;
-
-  /* But most old systems don't have a complete set of locales.  Some
-     (like SunOS 4 or DJGPP) have only the C locale.  Therefore we don't
-     use setlocale here; it would return "C" when it doesn't support the
-     locale name the user has set.  */
-#  if HAVE_SETLOCALE && 0
-  locale = setlocale (LC_CTYPE, NULL);
-#  endif
-  if (locale == NULL || locale[0] == '\0')
-    {
-      locale = getenv ("LC_ALL");
-      if (locale == NULL || locale[0] == '\0')
-	{
-	  locale = getenv ("LC_CTYPE");
-	  if (locale == NULL || locale[0] == '\0')
-	    locale = getenv ("LANG");
-	}
-    }
-
-  /* On some old systems, one used to set locale = "iso8859_1". On others,
-     you set it to "language_COUNTRY.charset". In any case, we resolve it
-     through the charset.alias file.  */
-  codeset = locale;
-
-# endif
-
-#elif defined WIN32
-
-  static char buf[2 + 10 + 1];
-
-  /* Win32 has a function returning the locale's codepage as a number.  */
-  sprintf (buf, "CP%u", GetACP ());
-  codeset = buf;
-
-#elif defined OS2
-
-  const char *locale;
-  static char buf[2 + 10 + 1];
-  ULONG cp[3];
-  ULONG cplen;
-
-  /* Allow user to override the codeset, as set in the operating system,
-     with standard language environment variables.  */
-  locale = getenv ("LC_ALL");
-  if (locale == NULL || locale[0] == '\0')
-    {
-      locale = getenv ("LC_CTYPE");
-      if (locale == NULL || locale[0] == '\0')
-	locale = getenv ("LANG");
-    }
-  if (locale != NULL && locale[0] != '\0')
-    {
-      /* If the locale name contains an encoding after the dot, return it.  */
-      const char *dot = strchr (locale, '.');
-
-      if (dot != NULL)
-	{
-	  const char *modifier;
-
-	  dot++;
-	  /* Look for the possible @... trailer and remove it, if any.  */
-	  modifier = strchr (dot, '@');
-	  if (modifier == NULL)
-	    return dot;
-	  if (modifier - dot < sizeof (buf))
-	    {
-	      memcpy (buf, dot, modifier - dot);
-	      buf [modifier - dot] = '\0';
-	      return buf;
-	    }
-	}
-
-      /* Resolve through the charset.alias file.  */
-      codeset = locale;
-    }
-  else
-    {
-      /* OS/2 has a function returning the locale's codepage as a number.  */
-      if (DosQueryCp (sizeof (cp), cp, &cplen))
-	codeset = "";
-      else
-	{
-	  sprintf (buf, "CP%u", cp[0]);
-	  codeset = buf;
-	}
-    }
-
-#endif
-
-  if (codeset == NULL)
-    /* The canonical name cannot be determined.  */
-    codeset = "";
-
-  /* Resolve alias. */
-  for (aliases = get_charset_aliases ();
-       *aliases != '\0';
-       aliases += strlen (aliases) + 1, aliases += strlen (aliases) + 1)
-    if (strcmp (codeset, aliases) == 0
-	|| (aliases[0] == '*' && aliases[1] == '\0'))
-      {
-	codeset = aliases + strlen (aliases) + 1;
-	break;
-      }
-
-  return codeset;
-}
diff --git a/intl/locale.alias b/intl/locale.alias
deleted file mode 100644
index bd7b9b3..0000000
--- a/intl/locale.alias
+++ /dev/null
@@ -1,78 +0,0 @@
-# Locale name alias data base.
-# Copyright (C) 1996,1997,1998,1999,2000,2001 Free Software Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify it
-# under the terms of the GNU Library General Public License as published
-# by the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# Library General Public License for more details.
-#
-# You should have received a copy of the GNU Library General Public
-# License along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
-# USA.
-
-# The format of this file is the same as for the corresponding file of
-# the X Window System, which normally can be found in
-#	/usr/lib/X11/locale/locale.alias
-# A single line contains two fields: an alias and a substitution value.
-# All entries are case independent.
-
-# Note: This file is far from being complete.  If you have a value for
-# your own site which you think might be useful for others too, share
-# it with the rest of us.  Send it using the `glibcbug' script to
-# bugs@gnu.org.
-
-# Packages using this file: 
-
-bokmal		no_NO.ISO-8859-1
-bokm�l		no_NO.ISO-8859-1
-catalan		ca_ES.ISO-8859-1
-croatian	hr_HR.ISO-8859-2
-czech		cs_CZ.ISO-8859-2
-danish          da_DK.ISO-8859-1
-dansk		da_DK.ISO-8859-1
-deutsch		de_DE.ISO-8859-1
-dutch		nl_NL.ISO-8859-1
-eesti		et_EE.ISO-8859-1
-estonian	et_EE.ISO-8859-1
-finnish         fi_FI.ISO-8859-1
-fran�ais	fr_FR.ISO-8859-1
-french		fr_FR.ISO-8859-1
-galego		gl_ES.ISO-8859-1
-galician	gl_ES.ISO-8859-1
-german		de_DE.ISO-8859-1
-greek           el_GR.ISO-8859-7
-hebrew          he_IL.ISO-8859-8
-hrvatski	hr_HR.ISO-8859-2
-hungarian       hu_HU.ISO-8859-2
-icelandic       is_IS.ISO-8859-1
-italian         it_IT.ISO-8859-1
-japanese	ja_JP.eucJP
-japanese.euc	ja_JP.eucJP
-ja_JP		ja_JP.eucJP
-ja_JP.ujis	ja_JP.eucJP
-japanese.sjis	ja_JP.SJIS
-korean		ko_KR.eucKR
-korean.euc 	ko_KR.eucKR
-ko_KR		ko_KR.eucKR
-lithuanian      lt_LT.ISO-8859-13
-nb_NO		no_NO.ISO-8859-1
-nb_NO.ISO-8859-1 no_NO.ISO-8859-1
-norwegian       no_NO.ISO-8859-1
-nynorsk		nn_NO.ISO-8859-1
-polish          pl_PL.ISO-8859-2
-portuguese      pt_PT.ISO-8859-1
-romanian        ro_RO.ISO-8859-2
-russian         ru_RU.ISO-8859-5
-slovak          sk_SK.ISO-8859-2
-slovene         sl_SI.ISO-8859-2
-slovenian       sl_SI.ISO-8859-2
-spanish         es_ES.ISO-8859-1
-swedish         sv_SE.ISO-8859-1
-thai		th_TH.TIS-620
-turkish         tr_TR.ISO-8859-9
diff --git a/intl/localealias.c b/intl/localealias.c
deleted file mode 100644
index 456e41e..0000000
--- a/intl/localealias.c
+++ /dev/null
@@ -1,419 +0,0 @@
-/* Handle aliases for locale names.
-   Copyright (C) 1995-1999, 2000, 2001 Free Software Foundation, Inc.
-
-   This program is free software; you can redistribute it and/or modify it
-   under the terms of the GNU Library General Public License as published
-   by the Free Software Foundation; either version 2, or (at your option)
-   any later version.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   Library General Public License for more details.
-
-   You should have received a copy of the GNU Library General Public
-   License along with this program; if not, write to the Free Software
-   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
-   USA.  */
-
-/* Tell glibc's <string.h> to provide a prototype for mempcpy().
-   This must come before <config.h> because <config.h> may include
-   <features.h>, and once <features.h> has been included, it's too late.  */
-#ifndef _GNU_SOURCE
-# define _GNU_SOURCE    1
-#endif
-
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
-
-#include <ctype.h>
-#include <stdio.h>
-#if defined _LIBC || defined HAVE___FSETLOCKING
-# include <stdio_ext.h>
-#endif
-#include <sys/types.h>
-
-#ifdef __GNUC__
-# define alloca __builtin_alloca
-# define HAVE_ALLOCA 1
-#else
-# if defined HAVE_ALLOCA_H || defined _LIBC
-#  include <alloca.h>
-# else
-#  ifdef _AIX
- #pragma alloca
-#  else
-#   ifndef alloca
-char *alloca ();
-#   endif
-#  endif
-# endif
-#endif
-
-#include <stdlib.h>
-#include <string.h>
-
-#include "gettextP.h"
-
-/* @@ end of prolog @@ */
-
-#ifdef _LIBC
-/* Rename the non ANSI C functions.  This is required by the standard
-   because some ANSI C functions will require linking with this object
-   file and the name space must not be polluted.  */
-# define strcasecmp __strcasecmp
-
-# ifndef mempcpy
-#  define mempcpy __mempcpy
-# endif
-# define HAVE_MEMPCPY	1
-# define HAVE___FSETLOCKING	1
-
-/* We need locking here since we can be called from different places.  */
-# include <bits/libc-lock.h>
-
-__libc_lock_define_initialized (static, lock);
-#endif
-
-#ifndef internal_function
-# define internal_function
-#endif
-
-/* Some optimizations for glibc.  */
-#ifdef _LIBC
-# define FEOF(fp)		feof_unlocked (fp)
-# define FGETS(buf, n, fp)	fgets_unlocked (buf, n, fp)
-#else
-# define FEOF(fp)		feof (fp)
-# define FGETS(buf, n, fp)	fgets (buf, n, fp)
-#endif
-
-/* For those losing systems which don't have `alloca' we have to add
-   some additional code emulating it.  */
-#ifdef HAVE_ALLOCA
-# define freea(p) /* nothing */
-#else
-# define alloca(n) malloc (n)
-# define freea(p) free (p)
-#endif
-
-#if defined _LIBC_REENTRANT || defined HAVE_FGETS_UNLOCKED
-# undef fgets
-# define fgets(buf, len, s) fgets_unlocked (buf, len, s)
-#endif
-#if defined _LIBC_REENTRANT || defined HAVE_FEOF_UNLOCKED
-# undef feof
-# define feof(s) feof_unlocked (s)
-#endif
-
-
-struct alias_map
-{
-  const char *alias;
-  const char *value;
-};
-
-
-static char *string_space;
-static size_t string_space_act;
-static size_t string_space_max;
-static struct alias_map *map;
-static size_t nmap;
-static size_t maxmap;
-
-
-/* Prototypes for local functions.  */
-static size_t read_alias_file PARAMS ((const char *fname, int fname_len))
-     internal_function;
-static int extend_alias_table PARAMS ((void));
-static int alias_compare PARAMS ((const struct alias_map *map1,
-				  const struct alias_map *map2));
-
-
-const char *
-_nl_expand_alias (name)
-    const char *name;
-{
-  static const char *locale_alias_path;
-  struct alias_map *retval;
-  const char *result = NULL;
-  size_t added;
-
-#ifdef _LIBC
-  __libc_lock_lock (lock);
-#endif
-
-  if (locale_alias_path == NULL)
-    locale_alias_path = LOCALE_ALIAS_PATH;
-
-  do
-    {
-      struct alias_map item;
-
-      item.alias = name;
-
-      if (nmap > 0)
-	retval = (struct alias_map *) bsearch (&item, map, nmap,
-					       sizeof (struct alias_map),
-					       (int (*) PARAMS ((const void *,
-								 const void *))
-						) alias_compare);
-      else
-	retval = NULL;
-
-      /* We really found an alias.  Return the value.  */
-      if (retval != NULL)
-	{
-	  result = retval->value;
-	  break;
-	}
-
-      /* Perhaps we can find another alias file.  */
-      added = 0;
-      while (added == 0 && locale_alias_path[0] != '\0')
-	{
-	  const char *start;
-
-	  while (locale_alias_path[0] == PATH_SEPARATOR)
-	    ++locale_alias_path;
-	  start = locale_alias_path;
-
-	  while (locale_alias_path[0] != '\0'
-		 && locale_alias_path[0] != PATH_SEPARATOR)
-	    ++locale_alias_path;
-
-	  if (start < locale_alias_path)
-	    added = read_alias_file (start, locale_alias_path - start);
-	}
-    }
-  while (added != 0);
-
-#ifdef _LIBC
-  __libc_lock_unlock (lock);
-#endif
-
-  return result;
-}
-
-
-static size_t
-internal_function
-read_alias_file (fname, fname_len)
-     const char *fname;
-     int fname_len;
-{
-  FILE *fp;
-  char *full_fname;
-  size_t added;
-  static const char aliasfile[] = "/locale.alias";
-
-  full_fname = (char *) alloca (fname_len + sizeof aliasfile);
-#ifdef HAVE_MEMPCPY
-  mempcpy (mempcpy (full_fname, fname, fname_len),
-	   aliasfile, sizeof aliasfile);
-#else
-  memcpy (full_fname, fname, fname_len);
-  memcpy (&full_fname[fname_len], aliasfile, sizeof aliasfile);
-#endif
-
-  fp = fopen (full_fname, "r");
-  freea (full_fname);
-  if (fp == NULL)
-    return 0;
-
-#ifdef HAVE___FSETLOCKING
-  /* No threads present.  */
-  __fsetlocking (fp, FSETLOCKING_BYCALLER);
-#endif
-
-  added = 0;
-  while (!FEOF (fp))
-    {
-      /* It is a reasonable approach to use a fix buffer here because
-	 a) we are only interested in the first two fields
-	 b) these fields must be usable as file names and so must not
-	    be that long
-       */
-      char buf[BUFSIZ];
-      char *alias;
-      char *value;
-      char *cp;
-
-      if (FGETS (buf, sizeof buf, fp) == NULL)
-	/* EOF reached.  */
-	break;
-
-      /* Possibly not the whole line fits into the buffer.  Ignore
-	 the rest of the line.  */
-      if (strchr (buf, '\n') == NULL)
-	{
-	  char altbuf[BUFSIZ];
-	  do
-	    if (FGETS (altbuf, sizeof altbuf, fp) == NULL)
-	      /* Make sure the inner loop will be left.  The outer loop
-		 will exit at the `feof' test.  */
-	      break;
-	  while (strchr (altbuf, '\n') == NULL);
-	}
-
-      cp = buf;
-      /* Ignore leading white space.  */
-      while (isspace ((unsigned char) cp[0]))
-	++cp;
-
-      /* A leading '#' signals a comment line.  */
-      if (cp[0] != '\0' && cp[0] != '#')
-	{
-	  alias = cp++;
-	  while (cp[0] != '\0' && !isspace ((unsigned char) cp[0]))
-	    ++cp;
-	  /* Terminate alias name.  */
-	  if (cp[0] != '\0')
-	    *cp++ = '\0';
-
-	  /* Now look for the beginning of the value.  */
-	  while (isspace ((unsigned char) cp[0]))
-	    ++cp;
-
-	  if (cp[0] != '\0')
-	    {
-	      size_t alias_len;
-	      size_t value_len;
-
-	      value = cp++;
-	      while (cp[0] != '\0' && !isspace ((unsigned char) cp[0]))
-		++cp;
-	      /* Terminate value.  */
-	      if (cp[0] == '\n')
-		{
-		  /* This has to be done to make the following test
-		     for the end of line possible.  We are looking for
-		     the terminating '\n' which do not overwrite here.  */
-		  *cp++ = '\0';
-		  *cp = '\n';
-		}
-	      else if (cp[0] != '\0')
-		*cp++ = '\0';
-
-	      if (nmap >= maxmap)
-		if (__builtin_expect (extend_alias_table (), 0))
-		  return added;
-
-	      alias_len = strlen (alias) + 1;
-	      value_len = strlen (value) + 1;
-
-	      if (string_space_act + alias_len + value_len > string_space_max)
-		{
-		  /* Increase size of memory pool.  */
-		  size_t new_size = (string_space_max
-				     + (alias_len + value_len > 1024
-					? alias_len + value_len : 1024));
-		  char *new_pool = (char *) realloc (string_space, new_size);
-		  if (new_pool == NULL)
-		    return added;
-
-		  if (__builtin_expect (string_space != new_pool, 0))
-		    {
-		      size_t i;
-
-		      for (i = 0; i < nmap; i++)
-			{
-			  map[i].alias += new_pool - string_space;
-			  map[i].value += new_pool - string_space;
-			}
-		    }
-
-		  string_space = new_pool;
-		  string_space_max = new_size;
-		}
-
-	      map[nmap].alias = memcpy (&string_space[string_space_act],
-					alias, alias_len);
-	      string_space_act += alias_len;
-
-	      map[nmap].value = memcpy (&string_space[string_space_act],
-					value, value_len);
-	      string_space_act += value_len;
-
-	      ++nmap;
-	      ++added;
-	    }
-	}
-    }
-
-  /* Should we test for ferror()?  I think we have to silently ignore
-     errors.  --drepper  */
-  fclose (fp);
-
-  if (added > 0)
-    qsort (map, nmap, sizeof (struct alias_map),
-	   (int (*) PARAMS ((const void *, const void *))) alias_compare);
-
-  return added;
-}
-
-
-static int
-extend_alias_table ()
-{
-  size_t new_size;
-  struct alias_map *new_map;
-
-  new_size = maxmap == 0 ? 100 : 2 * maxmap;
-  new_map = (struct alias_map *) realloc (map, (new_size
-						* sizeof (struct alias_map)));
-  if (new_map == NULL)
-    /* Simply don't extend: we don't have any more core.  */
-    return -1;
-
-  map = new_map;
-  maxmap = new_size;
-  return 0;
-}
-
-
-#ifdef _LIBC
-static void __attribute__ ((unused))
-free_mem (void)
-{
-  if (string_space != NULL)
-    free (string_space);
-  if (map != NULL)
-    free (map);
-}
-text_set_element (__libc_subfreeres, free_mem);
-#endif
-
-
-static int
-alias_compare (map1, map2)
-     const struct alias_map *map1;
-     const struct alias_map *map2;
-{
-#if defined _LIBC || defined HAVE_STRCASECMP
-  return strcasecmp (map1->alias, map2->alias);
-#else
-  const unsigned char *p1 = (const unsigned char *) map1->alias;
-  const unsigned char *p2 = (const unsigned char *) map2->alias;
-  unsigned char c1, c2;
-
-  if (p1 == p2)
-    return 0;
-
-  do
-    {
-      /* I know this seems to be odd but the tolower() function in
-	 some systems libc cannot handle nonalpha characters.  */
-      c1 = isupper (*p1) ? tolower (*p1) : *p1;
-      c2 = isupper (*p2) ? tolower (*p2) : *p2;
-      if (c1 == '\0')
-	break;
-      ++p1;
-      ++p2;
-    }
-  while (c1 == c2);
-
-  return c1 - c2;
-#endif
-}
diff --git a/intl/localename.c b/intl/localename.c
deleted file mode 100644
index a724198..0000000
--- a/intl/localename.c
+++ /dev/null
@@ -1,694 +0,0 @@
-/* Determine the current selected locale.
-   Copyright (C) 1995-1999, 2000-2002 Free Software Foundation, Inc.
-
-   This program is free software; you can redistribute it and/or modify it
-   under the terms of the GNU Library General Public License as published
-   by the Free Software Foundation; either version 2, or (at your option)
-   any later version.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   Library General Public License for more details.
-
-   You should have received a copy of the GNU Library General Public
-   License along with this program; if not, write to the Free Software
-   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
-   USA.  */
-
-/* Written by Ulrich Drepper <drepper@gnu.org>, 1995.  */
-/* Win32 code written by Tor Lillqvist <tml@iki.fi>.  */
-
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
-
-#include <stdlib.h>
-#include <locale.h>
-
-#if defined _WIN32 || defined __WIN32__
-# undef WIN32   /* avoid warning on mingw32 */
-# define WIN32
-#endif
-
-#ifdef WIN32
-# define WIN32_LEAN_AND_MEAN
-# include <windows.h>
-/* Mingw headers don't have latest language and sublanguage codes.  */
-# ifndef LANG_AFRIKAANS
-# define LANG_AFRIKAANS 0x36
-# endif
-# ifndef LANG_ALBANIAN
-# define LANG_ALBANIAN 0x1c
-# endif
-# ifndef LANG_ARABIC
-# define LANG_ARABIC 0x01
-# endif
-# ifndef LANG_ARMENIAN
-# define LANG_ARMENIAN 0x2b
-# endif
-# ifndef LANG_ASSAMESE
-# define LANG_ASSAMESE 0x4d
-# endif
-# ifndef LANG_AZERI
-# define LANG_AZERI 0x2c
-# endif
-# ifndef LANG_BASQUE
-# define LANG_BASQUE 0x2d
-# endif
-# ifndef LANG_BELARUSIAN
-# define LANG_BELARUSIAN 0x23
-# endif
-# ifndef LANG_BENGALI
-# define LANG_BENGALI 0x45
-# endif
-# ifndef LANG_CATALAN
-# define LANG_CATALAN 0x03
-# endif
-# ifndef LANG_ESTONIAN
-# define LANG_ESTONIAN 0x25
-# endif
-# ifndef LANG_FAEROESE
-# define LANG_FAEROESE 0x38
-# endif
-# ifndef LANG_FARSI
-# define LANG_FARSI 0x29
-# endif
-# ifndef LANG_GEORGIAN
-# define LANG_GEORGIAN 0x37
-# endif
-# ifndef LANG_GUJARATI
-# define LANG_GUJARATI 0x47
-# endif
-# ifndef LANG_HEBREW
-# define LANG_HEBREW 0x0d
-# endif
-# ifndef LANG_HINDI
-# define LANG_HINDI 0x39
-# endif
-# ifndef LANG_INDONESIAN
-# define LANG_INDONESIAN 0x21
-# endif
-# ifndef LANG_KANNADA
-# define LANG_KANNADA 0x4b
-# endif
-# ifndef LANG_KASHMIRI
-# define LANG_KASHMIRI 0x60
-# endif
-# ifndef LANG_KAZAK
-# define LANG_KAZAK 0x3f
-# endif
-# ifndef LANG_KONKANI
-# define LANG_KONKANI 0x57
-# endif
-# ifndef LANG_LATVIAN
-# define LANG_LATVIAN 0x26
-# endif
-# ifndef LANG_LITHUANIAN
-# define LANG_LITHUANIAN 0x27
-# endif
-# ifndef LANG_MACEDONIAN
-# define LANG_MACEDONIAN 0x2f
-# endif
-# ifndef LANG_MALAY
-# define LANG_MALAY 0x3e
-# endif
-# ifndef LANG_MALAYALAM
-# define LANG_MALAYALAM 0x4c
-# endif
-# ifndef LANG_MANIPURI
-# define LANG_MANIPURI 0x58
-# endif
-# ifndef LANG_MARATHI
-# define LANG_MARATHI 0x4e
-# endif
-# ifndef LANG_NEPALI
-# define LANG_NEPALI 0x61
-# endif
-# ifndef LANG_ORIYA
-# define LANG_ORIYA 0x48
-# endif
-# ifndef LANG_PUNJABI
-# define LANG_PUNJABI 0x46
-# endif
-# ifndef LANG_SANSKRIT
-# define LANG_SANSKRIT 0x4f
-# endif
-# ifndef LANG_SERBIAN
-# define LANG_SERBIAN 0x1a
-# endif
-# ifndef LANG_SINDHI
-# define LANG_SINDHI 0x59
-# endif
-# ifndef LANG_SLOVAK
-# define LANG_SLOVAK 0x1b
-# endif
-# ifndef LANG_SWAHILI
-# define LANG_SWAHILI 0x41
-# endif
-# ifndef LANG_TAMIL
-# define LANG_TAMIL 0x49
-# endif
-# ifndef LANG_TATAR
-# define LANG_TATAR 0x44
-# endif
-# ifndef LANG_TELUGU
-# define LANG_TELUGU 0x4a
-# endif
-# ifndef LANG_THAI
-# define LANG_THAI 0x1e
-# endif
-# ifndef LANG_UKRAINIAN
-# define LANG_UKRAINIAN 0x22
-# endif
-# ifndef LANG_URDU
-# define LANG_URDU 0x20
-# endif
-# ifndef LANG_UZBEK
-# define LANG_UZBEK 0x43
-# endif
-# ifndef LANG_VIETNAMESE
-# define LANG_VIETNAMESE 0x2a
-# endif
-# ifndef SUBLANG_ARABIC_SAUDI_ARABIA
-# define SUBLANG_ARABIC_SAUDI_ARABIA 0x01
-# endif
-# ifndef SUBLANG_ARABIC_IRAQ
-# define SUBLANG_ARABIC_IRAQ 0x02
-# endif
-# ifndef SUBLANG_ARABIC_EGYPT
-# define SUBLANG_ARABIC_EGYPT 0x03
-# endif
-# ifndef SUBLANG_ARABIC_LIBYA
-# define SUBLANG_ARABIC_LIBYA 0x04
-# endif
-# ifndef SUBLANG_ARABIC_ALGERIA
-# define SUBLANG_ARABIC_ALGERIA 0x05
-# endif
-# ifndef SUBLANG_ARABIC_MOROCCO
-# define SUBLANG_ARABIC_MOROCCO 0x06
-# endif
-# ifndef SUBLANG_ARABIC_TUNISIA
-# define SUBLANG_ARABIC_TUNISIA 0x07
-# endif
-# ifndef SUBLANG_ARABIC_OMAN
-# define SUBLANG_ARABIC_OMAN 0x08
-# endif
-# ifndef SUBLANG_ARABIC_YEMEN
-# define SUBLANG_ARABIC_YEMEN 0x09
-# endif
-# ifndef SUBLANG_ARABIC_SYRIA
-# define SUBLANG_ARABIC_SYRIA 0x0a
-# endif
-# ifndef SUBLANG_ARABIC_JORDAN
-# define SUBLANG_ARABIC_JORDAN 0x0b
-# endif
-# ifndef SUBLANG_ARABIC_LEBANON
-# define SUBLANG_ARABIC_LEBANON 0x0c
-# endif
-# ifndef SUBLANG_ARABIC_KUWAIT
-# define SUBLANG_ARABIC_KUWAIT 0x0d
-# endif
-# ifndef SUBLANG_ARABIC_UAE
-# define SUBLANG_ARABIC_UAE 0x0e
-# endif
-# ifndef SUBLANG_ARABIC_BAHRAIN
-# define SUBLANG_ARABIC_BAHRAIN 0x0f
-# endif
-# ifndef SUBLANG_ARABIC_QATAR
-# define SUBLANG_ARABIC_QATAR 0x10
-# endif
-# ifndef SUBLANG_AZERI_LATIN
-# define SUBLANG_AZERI_LATIN 0x01
-# endif
-# ifndef SUBLANG_AZERI_CYRILLIC
-# define SUBLANG_AZERI_CYRILLIC 0x02
-# endif
-# ifndef SUBLANG_CHINESE_MACAU
-# define SUBLANG_CHINESE_MACAU 0x05
-# endif
-# ifndef SUBLANG_ENGLISH_SOUTH_AFRICA
-# define SUBLANG_ENGLISH_SOUTH_AFRICA 0x07
-# endif
-# ifndef SUBLANG_ENGLISH_JAMAICA
-# define SUBLANG_ENGLISH_JAMAICA 0x08
-# endif
-# ifndef SUBLANG_ENGLISH_CARIBBEAN
-# define SUBLANG_ENGLISH_CARIBBEAN 0x09
-# endif
-# ifndef SUBLANG_ENGLISH_BELIZE
-# define SUBLANG_ENGLISH_BELIZE 0x0a
-# endif
-# ifndef SUBLANG_ENGLISH_TRINIDAD
-# define SUBLANG_ENGLISH_TRINIDAD 0x0b
-# endif
-# ifndef SUBLANG_ENGLISH_ZIMBABWE
-# define SUBLANG_ENGLISH_ZIMBABWE 0x0c
-# endif
-# ifndef SUBLANG_ENGLISH_PHILIPPINES
-# define SUBLANG_ENGLISH_PHILIPPINES 0x0d
-# endif
-# ifndef SUBLANG_FRENCH_LUXEMBOURG
-# define SUBLANG_FRENCH_LUXEMBOURG 0x05
-# endif
-# ifndef SUBLANG_FRENCH_MONACO
-# define SUBLANG_FRENCH_MONACO 0x06
-# endif
-# ifndef SUBLANG_GERMAN_LUXEMBOURG
-# define SUBLANG_GERMAN_LUXEMBOURG 0x04
-# endif
-# ifndef SUBLANG_GERMAN_LIECHTENSTEIN
-# define SUBLANG_GERMAN_LIECHTENSTEIN 0x05
-# endif
-# ifndef SUBLANG_KASHMIRI_INDIA
-# define SUBLANG_KASHMIRI_INDIA 0x02
-# endif
-# ifndef SUBLANG_MALAY_MALAYSIA
-# define SUBLANG_MALAY_MALAYSIA 0x01
-# endif
-# ifndef SUBLANG_MALAY_BRUNEI_DARUSSALAM
-# define SUBLANG_MALAY_BRUNEI_DARUSSALAM 0x02
-# endif
-# ifndef SUBLANG_NEPALI_INDIA
-# define SUBLANG_NEPALI_INDIA 0x02
-# endif
-# ifndef SUBLANG_SERBIAN_LATIN
-# define SUBLANG_SERBIAN_LATIN 0x02
-# endif
-# ifndef SUBLANG_SERBIAN_CYRILLIC
-# define SUBLANG_SERBIAN_CYRILLIC 0x03
-# endif
-# ifndef SUBLANG_SPANISH_GUATEMALA
-# define SUBLANG_SPANISH_GUATEMALA 0x04
-# endif
-# ifndef SUBLANG_SPANISH_COSTA_RICA
-# define SUBLANG_SPANISH_COSTA_RICA 0x05
-# endif
-# ifndef SUBLANG_SPANISH_PANAMA
-# define SUBLANG_SPANISH_PANAMA 0x06
-# endif
-# ifndef SUBLANG_SPANISH_DOMINICAN_REPUBLIC
-# define SUBLANG_SPANISH_DOMINICAN_REPUBLIC 0x07
-# endif
-# ifndef SUBLANG_SPANISH_VENEZUELA
-# define SUBLANG_SPANISH_VENEZUELA 0x08
-# endif
-# ifndef SUBLANG_SPANISH_COLOMBIA
-# define SUBLANG_SPANISH_COLOMBIA 0x09
-# endif
-# ifndef SUBLANG_SPANISH_PERU
-# define SUBLANG_SPANISH_PERU 0x0a
-# endif
-# ifndef SUBLANG_SPANISH_ARGENTINA
-# define SUBLANG_SPANISH_ARGENTINA 0x0b
-# endif
-# ifndef SUBLANG_SPANISH_ECUADOR
-# define SUBLANG_SPANISH_ECUADOR 0x0c
-# endif
-# ifndef SUBLANG_SPANISH_CHILE
-# define SUBLANG_SPANISH_CHILE 0x0d
-# endif
-# ifndef SUBLANG_SPANISH_URUGUAY
-# define SUBLANG_SPANISH_URUGUAY 0x0e
-# endif
-# ifndef SUBLANG_SPANISH_PARAGUAY
-# define SUBLANG_SPANISH_PARAGUAY 0x0f
-# endif
-# ifndef SUBLANG_SPANISH_BOLIVIA
-# define SUBLANG_SPANISH_BOLIVIA 0x10
-# endif
-# ifndef SUBLANG_SPANISH_EL_SALVADOR
-# define SUBLANG_SPANISH_EL_SALVADOR 0x11
-# endif
-# ifndef SUBLANG_SPANISH_HONDURAS
-# define SUBLANG_SPANISH_HONDURAS 0x12
-# endif
-# ifndef SUBLANG_SPANISH_NICARAGUA
-# define SUBLANG_SPANISH_NICARAGUA 0x13
-# endif
-# ifndef SUBLANG_SPANISH_PUERTO_RICO
-# define SUBLANG_SPANISH_PUERTO_RICO 0x14
-# endif
-# ifndef SUBLANG_SWEDISH_FINLAND
-# define SUBLANG_SWEDISH_FINLAND 0x02
-# endif
-# ifndef SUBLANG_URDU_PAKISTAN
-# define SUBLANG_URDU_PAKISTAN 0x01
-# endif
-# ifndef SUBLANG_URDU_INDIA
-# define SUBLANG_URDU_INDIA 0x02
-# endif
-# ifndef SUBLANG_UZBEK_LATIN
-# define SUBLANG_UZBEK_LATIN 0x01
-# endif
-# ifndef SUBLANG_UZBEK_CYRILLIC
-# define SUBLANG_UZBEK_CYRILLIC 0x02
-# endif
-#endif
-
-/* XPG3 defines the result of 'setlocale (category, NULL)' as:
-   "Directs 'setlocale()' to query 'category' and return the current
-    setting of 'local'."
-   However it does not specify the exact format.  Neither do SUSV2 and
-   ISO C 99.  So we can use this feature only on selected systems (e.g.
-   those using GNU C Library).  */
-#if defined _LIBC || (defined __GNU_LIBRARY__ && __GNU_LIBRARY__ >= 2)
-# define HAVE_LOCALE_NULL
-#endif
-
-/* Determine the current locale's name, and canonicalize it into XPG syntax
-     language[_territory[.codeset]][@modifier]
-   The codeset part in the result is not reliable; the locale_charset()
-   should be used for codeset information instead.
-   The result must not be freed; it is statically allocated.  */
-
-const char *
-_nl_locale_name (category, categoryname)
-     int category;
-     const char *categoryname;
-{
-  const char *retval;
-
-#ifndef WIN32
-
-  /* Use the POSIX methods of looking to 'LC_ALL', 'LC_xxx', and 'LANG'.
-     On some systems this can be done by the 'setlocale' function itself.  */
-# if defined HAVE_SETLOCALE && defined HAVE_LC_MESSAGES && defined HAVE_LOCALE_NULL
-  retval = setlocale (category, NULL);
-# else
-  /* Setting of LC_ALL overwrites all other.  */
-  retval = getenv ("LC_ALL");
-  if (retval == NULL || retval[0] == '\0')
-    {
-      /* Next comes the name of the desired category.  */
-      retval = getenv (categoryname);
-      if (retval == NULL || retval[0] == '\0')
-	{
-	  /* Last possibility is the LANG environment variable.  */
-	  retval = getenv ("LANG");
-	  if (retval == NULL || retval[0] == '\0')
-	    /* We use C as the default domain.  POSIX says this is
-	       implementation defined.  */
-	    retval = "C";
-	}
-    }
-# endif
-
-  return retval;
-
-#else /* WIN32 */
-
-  /* Return an XPG style locale name language[_territory][@modifier].
-     Don't even bother determining the codeset; it's not useful in this
-     context, because message catalogs are not specific to a single
-     codeset.  */
-
-  LCID lcid;
-  LANGID langid;
-  int primary, sub;
-
-  /* Let the user override the system settings through environment
-     variables, as on POSIX systems.  */
-  retval = getenv ("LC_ALL");
-  if (retval != NULL && retval[0] != '\0')
-    return retval;
-  retval = getenv (categoryname);
-  if (retval != NULL && retval[0] != '\0')
-    return retval;
-  retval = getenv ("LANG");
-  if (retval != NULL && retval[0] != '\0')
-    return retval;
-
-  /* Use native Win32 API locale ID.  */
-  lcid = GetThreadLocale ();
-
-  /* Strip off the sorting rules, keep only the language part.  */
-  langid = LANGIDFROMLCID (lcid);
-
-  /* Split into language and territory part.  */
-  primary = PRIMARYLANGID (langid);
-  sub = SUBLANGID (langid);
-  switch (primary)
-    {
-    case LANG_AFRIKAANS: return "af_ZA";
-    case LANG_ALBANIAN: return "sq_AL";
-    case LANG_ARABIC:
-      switch (sub)
-	{
-	case SUBLANG_ARABIC_SAUDI_ARABIA: return "ar_SA";
-	case SUBLANG_ARABIC_IRAQ: return "ar_IQ";
-	case SUBLANG_ARABIC_EGYPT: return "ar_EG";
-	case SUBLANG_ARABIC_LIBYA: return "ar_LY";
-	case SUBLANG_ARABIC_ALGERIA: return "ar_DZ";
-	case SUBLANG_ARABIC_MOROCCO: return "ar_MA";
-	case SUBLANG_ARABIC_TUNISIA: return "ar_TN";
-	case SUBLANG_ARABIC_OMAN: return "ar_OM";
-	case SUBLANG_ARABIC_YEMEN: return "ar_YE";
-	case SUBLANG_ARABIC_SYRIA: return "ar_SY";
-	case SUBLANG_ARABIC_JORDAN: return "ar_JO";
-	case SUBLANG_ARABIC_LEBANON: return "ar_LB";
-	case SUBLANG_ARABIC_KUWAIT: return "ar_KW";
-	case SUBLANG_ARABIC_UAE: return "ar_AE";
-	case SUBLANG_ARABIC_BAHRAIN: return "ar_BH";
-	case SUBLANG_ARABIC_QATAR: return "ar_QA";
-	}
-      return "ar";
-    case LANG_ARMENIAN: return "hy_AM";
-    case LANG_ASSAMESE: return "as_IN";
-    case LANG_AZERI:
-      switch (sub)
-	{
-	/* FIXME: Adjust this when Azerbaijani locales appear on Unix.  */
-	case SUBLANG_AZERI_LATIN: return "az_AZ@latin";
-	case SUBLANG_AZERI_CYRILLIC: return "az_AZ@cyrillic";
-	}
-      return "az";
-    case LANG_BASQUE:
-      return "eu"; /* Ambiguous: could be "eu_ES" or "eu_FR".  */
-    case LANG_BELARUSIAN: return "be_BY";
-    case LANG_BENGALI: return "bn_IN";
-    case LANG_BULGARIAN: return "bg_BG";
-    case LANG_CATALAN: return "ca_ES";
-    case LANG_CHINESE:
-      switch (sub)
-	{
-	case SUBLANG_CHINESE_TRADITIONAL: return "zh_TW";
-	case SUBLANG_CHINESE_SIMPLIFIED: return "zh_CN";
-	case SUBLANG_CHINESE_HONGKONG: return "zh_HK";
-	case SUBLANG_CHINESE_SINGAPORE: return "zh_SG";
-	case SUBLANG_CHINESE_MACAU: return "zh_MO";
-	}
-      return "zh";
-    case LANG_CROATIAN:		/* LANG_CROATIAN == LANG_SERBIAN
-				 * What used to be called Serbo-Croatian
-				 * should really now be two separate
-				 * languages because of political reasons.
-				 * (Says tml, who knows nothing about Serbian
-				 * or Croatian.)
-				 * (I can feel those flames coming already.)
-				 */
-      switch (sub)
-	{
-	/* FIXME: How to distinguish Croatian and Latin Serbian locales?  */
-	case SUBLANG_SERBIAN_LATIN: return "sr_YU";
-	case SUBLANG_SERBIAN_CYRILLIC: return "sr_YU@cyrillic";
-	default: return "hr_HR";
-	}
-    case LANG_CZECH: return "cs_CZ";
-    case LANG_DANISH: return "da_DK";
-    case LANG_DUTCH:
-      switch (sub)
-	{
-	case SUBLANG_DUTCH: return "nl_NL";
-	case SUBLANG_DUTCH_BELGIAN: return "nl_BE";
-	}
-      return "nl";
-    case LANG_ENGLISH:
-      switch (sub)
-	{
-	/* SUBLANG_ENGLISH_US == SUBLANG_DEFAULT. Heh. I thought
-	 * English was the language spoken in England.
-	 * Oh well.
-	 */
-	case SUBLANG_ENGLISH_US: return "en_US";
-	case SUBLANG_ENGLISH_UK: return "en_GB";
-	case SUBLANG_ENGLISH_AUS: return "en_AU";
-	case SUBLANG_ENGLISH_CAN: return "en_CA";
-	case SUBLANG_ENGLISH_NZ: return "en_NZ";
-	case SUBLANG_ENGLISH_EIRE: return "en_IE";
-	case SUBLANG_ENGLISH_SOUTH_AFRICA: return "en_ZA";
-	case SUBLANG_ENGLISH_JAMAICA: return "en_JM";
-	case SUBLANG_ENGLISH_CARIBBEAN: return "en_GD"; /* Grenada? */
-	case SUBLANG_ENGLISH_BELIZE: return "en_BZ";
-	case SUBLANG_ENGLISH_TRINIDAD: return "en_TT";
-	case SUBLANG_ENGLISH_ZIMBABWE: return "en_ZW";
-	case SUBLANG_ENGLISH_PHILIPPINES: return "en_PH";
-	}
-      return "en";
-    case LANG_ESTONIAN: return "et_EE";
-    case LANG_FAEROESE: return "fo_FO";
-    case LANG_FARSI: return "fa_IR";
-    case LANG_FINNISH: return "fi_FI";
-    case LANG_FRENCH:
-      switch (sub)
-	{
-	case SUBLANG_FRENCH: return "fr_FR";
-	case SUBLANG_FRENCH_BELGIAN: return "fr_BE";
-	case SUBLANG_FRENCH_CANADIAN: return "fr_CA";
-	case SUBLANG_FRENCH_SWISS: return "fr_CH";
-	case SUBLANG_FRENCH_LUXEMBOURG: return "fr_LU";
-	case SUBLANG_FRENCH_MONACO: return "fr_MC";
-	}
-      return "fr";
-    case LANG_GEORGIAN: return "ka_GE";
-    case LANG_GERMAN:
-      switch (sub)
-	{
-	case SUBLANG_GERMAN: return "de_DE";
-	case SUBLANG_GERMAN_SWISS: return "de_CH";
-	case SUBLANG_GERMAN_AUSTRIAN: return "de_AT";
-	case SUBLANG_GERMAN_LUXEMBOURG: return "de_LU";
-	case SUBLANG_GERMAN_LIECHTENSTEIN: return "de_LI";
-	}
-      return "de";
-    case LANG_GREEK: return "el_GR";
-    case LANG_GUJARATI: return "gu_IN";
-    case LANG_HEBREW: return "he_IL";
-    case LANG_HINDI: return "hi_IN";
-    case LANG_HUNGARIAN: return "hu_HU";
-    case LANG_ICELANDIC: return "is_IS";
-    case LANG_INDONESIAN: return "id_ID";
-    case LANG_ITALIAN:
-      switch (sub)
-	{
-	case SUBLANG_ITALIAN: return "it_IT";
-	case SUBLANG_ITALIAN_SWISS: return "it_CH";
-	}
-      return "it";
-    case LANG_JAPANESE: return "ja_JP";
-    case LANG_KANNADA: return "kn_IN";
-    case LANG_KASHMIRI:
-      switch (sub)
-	{
-	case SUBLANG_DEFAULT: return "ks_PK";
-	case SUBLANG_KASHMIRI_INDIA: return "ks_IN";
-	}
-      return "ks";
-    case LANG_KAZAK: return "kk_KZ";
-    case LANG_KONKANI:
-      /* FIXME: Adjust this when such locales appear on Unix.  */
-      return "kok_IN";
-    case LANG_KOREAN: return "ko_KR";
-    case LANG_LATVIAN: return "lv_LV";
-    case LANG_LITHUANIAN: return "lt_LT";
-    case LANG_MACEDONIAN: return "mk_MK";
-    case LANG_MALAY:
-      switch (sub)
-	{
-	case SUBLANG_MALAY_MALAYSIA: return "ms_MY";
-	case SUBLANG_MALAY_BRUNEI_DARUSSALAM: return "ms_BN";
-	}
-      return "ms";
-    case LANG_MALAYALAM: return "ml_IN";
-    case LANG_MANIPURI:
-      /* FIXME: Adjust this when such locales appear on Unix.  */
-      return "mni_IN";
-    case LANG_MARATHI: return "mr_IN";
-    case LANG_NEPALI:
-      switch (sub)
-	{
-	case SUBLANG_DEFAULT: return "ne_NP";
-	case SUBLANG_NEPALI_INDIA: return "ne_IN";
-	}
-      return "ne";
-    case LANG_NORWEGIAN:
-      switch (sub)
-	{
-	case SUBLANG_NORWEGIAN_BOKMAL: return "no_NO";
-	case SUBLANG_NORWEGIAN_NYNORSK: return "nn_NO";
-	}
-      return "no";
-    case LANG_ORIYA: return "or_IN";
-    case LANG_POLISH: return "pl_PL";
-    case LANG_PORTUGUESE:
-      switch (sub)
-	{
-	case SUBLANG_PORTUGUESE: return "pt_PT";
-	/* Hmm. SUBLANG_PORTUGUESE_BRAZILIAN == SUBLANG_DEFAULT.
-	   Same phenomenon as SUBLANG_ENGLISH_US == SUBLANG_DEFAULT. */
-	case SUBLANG_PORTUGUESE_BRAZILIAN: return "pt_BR";
-	}
-      return "pt";
-    case LANG_PUNJABI: return "pa_IN";
-    case LANG_ROMANIAN: return "ro_RO";
-    case LANG_RUSSIAN:
-      return "ru"; /* Ambiguous: could be "ru_RU" or "ru_UA".  */
-    case LANG_SANSKRIT: return "sa_IN";
-    case LANG_SINDHI: return "sd";
-    case LANG_SLOVAK: return "sk_SK";
-    case LANG_SLOVENIAN: return "sl_SI";
-    case LANG_SORBIAN:
-      /* FIXME: Adjust this when such locales appear on Unix.  */
-      return "wen_DE";
-    case LANG_SPANISH:
-      switch (sub)
-	{
-	case SUBLANG_SPANISH: return "es_ES";
-	case SUBLANG_SPANISH_MEXICAN: return "es_MX";
-	case SUBLANG_SPANISH_MODERN:
-	  return "es_ES@modern";	/* not seen on Unix */
-	case SUBLANG_SPANISH_GUATEMALA: return "es_GT";
-	case SUBLANG_SPANISH_COSTA_RICA: return "es_CR";
-	case SUBLANG_SPANISH_PANAMA: return "es_PA";
-	case SUBLANG_SPANISH_DOMINICAN_REPUBLIC: return "es_DO";
-	case SUBLANG_SPANISH_VENEZUELA: return "es_VE";
-	case SUBLANG_SPANISH_COLOMBIA: return "es_CO";
-	case SUBLANG_SPANISH_PERU: return "es_PE";
-	case SUBLANG_SPANISH_ARGENTINA: return "es_AR";
-	case SUBLANG_SPANISH_ECUADOR: return "es_EC";
-	case SUBLANG_SPANISH_CHILE: return "es_CL";
-	case SUBLANG_SPANISH_URUGUAY: return "es_UY";
-	case SUBLANG_SPANISH_PARAGUAY: return "es_PY";
-	case SUBLANG_SPANISH_BOLIVIA: return "es_BO";
-	case SUBLANG_SPANISH_EL_SALVADOR: return "es_SV";
-	case SUBLANG_SPANISH_HONDURAS: return "es_HN";
-	case SUBLANG_SPANISH_NICARAGUA: return "es_NI";
-	case SUBLANG_SPANISH_PUERTO_RICO: return "es_PR";
-	}
-      return "es";
-    case LANG_SWAHILI: return "sw";
-    case LANG_SWEDISH:
-      switch (sub)
-	{
-	case SUBLANG_DEFAULT: return "sv_SE";
-	case SUBLANG_SWEDISH_FINLAND: return "sv_FI";
-	}
-      return "sv";
-    case LANG_TAMIL:
-      return "ta"; /* Ambiguous: could be "ta_IN" or "ta_LK" or "ta_SG".  */
-    case LANG_TATAR: return "tt";
-    case LANG_TELUGU: return "te_IN";
-    case LANG_THAI: return "th_TH";
-    case LANG_TURKISH: return "tr_TR";
-    case LANG_UKRAINIAN: return "uk_UA";
-    case LANG_URDU:
-      switch (sub)
-	{
-	case SUBLANG_URDU_PAKISTAN: return "ur_PK";
-	case SUBLANG_URDU_INDIA: return "ur_IN";
-	}
-      return "ur";
-    case LANG_UZBEK:
-      switch (sub)
-	{
-	/* FIXME: Adjust this when Uzbek locales appear on Unix.  */
-	case SUBLANG_UZBEK_LATIN: return "uz_UZ@latin";
-	case SUBLANG_UZBEK_CYRILLIC: return "uz_UZ@cyrillic";
-	}
-      return "uz";
-    case LANG_VIETNAMESE: return "vi_VN";
-    default: return "C";
-    }
-
-#endif
-}
diff --git a/intl/ngettext.c b/intl/ngettext.c
deleted file mode 100644
index b42ff6a..0000000
--- a/intl/ngettext.c
+++ /dev/null
@@ -1,68 +0,0 @@
-/* Implementation of ngettext(3) function.
-   Copyright (C) 1995, 1997, 2000, 2001, 2002 Free Software Foundation, Inc.
-
-   This program is free software; you can redistribute it and/or modify it
-   under the terms of the GNU Library General Public License as published
-   by the Free Software Foundation; either version 2, or (at your option)
-   any later version.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   Library General Public License for more details.
-
-   You should have received a copy of the GNU Library General Public
-   License along with this program; if not, write to the Free Software
-   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
-   USA.  */
-
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
-
-#ifdef _LIBC
-# define __need_NULL
-# include <stddef.h>
-#else
-# include <stdlib.h>		/* Just for NULL.  */
-#endif
-
-#include "gettextP.h"
-#ifdef _LIBC
-# include <libintl.h>
-#else
-# include "libgnuintl.h"
-#endif
-
-#include <locale.h>
-
-/* @@ end of prolog @@ */
-
-/* Names for the libintl functions are a problem.  They must not clash
-   with existing names and they should follow ANSI C.  But this source
-   code is also used in GNU C Library where the names have a __
-   prefix.  So we have to make a difference here.  */
-#ifdef _LIBC
-# define NGETTEXT __ngettext
-# define DCNGETTEXT INTUSE(__dcngettext)
-#else
-# define NGETTEXT ngettext__
-# define DCNGETTEXT dcngettext__
-#endif
-
-/* Look up MSGID in the current default message catalog for the current
-   LC_MESSAGES locale.  If not found, returns MSGID itself (the default
-   text).  */
-char *
-NGETTEXT (msgid1, msgid2, n)
-     const char *msgid1;
-     const char *msgid2;
-     unsigned long int n;
-{
-  return DCNGETTEXT (NULL, msgid1, msgid2, n, LC_MESSAGES);
-}
-
-#ifdef _LIBC
-/* Alias for function name in GNU C Library.  */
-weak_alias (__ngettext, ngettext);
-#endif
diff --git a/intl/os2compat.c b/intl/os2compat.c
deleted file mode 100644
index 3ca8266..0000000
--- a/intl/os2compat.c
+++ /dev/null
@@ -1,98 +0,0 @@
-/* OS/2 compatibility functions.
-   Copyright (C) 2001-2002 Free Software Foundation, Inc.
-
-   This program is free software; you can redistribute it and/or modify it
-   under the terms of the GNU Library General Public License as published
-   by the Free Software Foundation; either version 2, or (at your option)
-   any later version.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   Library General Public License for more details.
-
-   You should have received a copy of the GNU Library General Public
-   License along with this program; if not, write to the Free Software
-   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
-   USA.  */
-
-#define OS2_AWARE
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
-#include <stdlib.h>
-#include <string.h>
-#include <sys/param.h>
-
-/* A version of getenv() that works from DLLs */
-extern unsigned long DosScanEnv (const unsigned char *pszName, unsigned char **ppszValue);
-
-char *
-_nl_getenv (const char *name)
-{
-  unsigned char *value;
-  if (DosScanEnv (name, &value))
-    return NULL;
-  else
-    return value;
-}
-
-/* A fixed size buffer.  */
-char _nl_default_dirname__[MAXPATHLEN+1];
-
-char *_nlos2_libdir = NULL;
-char *_nlos2_localealiaspath = NULL;
-char *_nlos2_localedir = NULL;
-
-static __attribute__((constructor)) void
-nlos2_initialize ()
-{
-  char *root = getenv ("UNIXROOT");
-  char *gnulocaledir = getenv ("GNULOCALEDIR");
-
-  _nlos2_libdir = gnulocaledir;
-  if (!_nlos2_libdir)
-    {
-      if (root)
-        {
-          size_t sl = strlen (root);
-          _nlos2_libdir = (char *) malloc (sl + strlen (LIBDIR) + 1);
-          memcpy (_nlos2_libdir, root, sl);
-          memcpy (_nlos2_libdir + sl, LIBDIR, strlen (LIBDIR) + 1);
-        }
-      else
-        _nlos2_libdir = LIBDIR;
-    }
-
-  _nlos2_localealiaspath = gnulocaledir;
-  if (!_nlos2_localealiaspath)
-    {
-      if (root)
-        {
-          size_t sl = strlen (root);
-          _nlos2_localealiaspath = (char *) malloc (sl + strlen (LOCALE_ALIAS_PATH) + 1);
-          memcpy (_nlos2_localealiaspath, root, sl);
-          memcpy (_nlos2_localealiaspath + sl, LOCALE_ALIAS_PATH, strlen (LOCALE_ALIAS_PATH) + 1);
-        }
-     else
-        _nlos2_localealiaspath = LOCALE_ALIAS_PATH;
-    }
-
-  _nlos2_localedir = gnulocaledir;
-  if (!_nlos2_localedir)
-    {
-      if (root)
-        {
-          size_t sl = strlen (root);
-          _nlos2_localedir = (char *) malloc (sl + strlen (LOCALEDIR) + 1);
-          memcpy (_nlos2_localedir, root, sl);
-          memcpy (_nlos2_localedir + sl, LOCALEDIR, strlen (LOCALEDIR) + 1);
-        }
-      else
-        _nlos2_localedir = LOCALEDIR;
-    }
-
-  if (strlen (_nlos2_localedir) <= MAXPATHLEN)
-    strcpy (_nl_default_dirname__, _nlos2_localedir);
-}
diff --git a/intl/os2compat.h b/intl/os2compat.h
deleted file mode 100644
index 4f74e8c..0000000
--- a/intl/os2compat.h
+++ /dev/null
@@ -1,46 +0,0 @@
-/* OS/2 compatibility defines.
-   This file is intended to be included from config.h
-   Copyright (C) 2001-2002 Free Software Foundation, Inc.
-
-   This program is free software; you can redistribute it and/or modify it
-   under the terms of the GNU Library General Public License as published
-   by the Free Software Foundation; either version 2, or (at your option)
-   any later version.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   Library General Public License for more details.
-
-   You should have received a copy of the GNU Library General Public
-   License along with this program; if not, write to the Free Software
-   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
-   USA.  */
-
-/* When included from os2compat.h we need all the original definitions */
-#ifndef OS2_AWARE
-
-#undef LIBDIR
-#define LIBDIR			_nlos2_libdir
-extern char *_nlos2_libdir;
-
-#undef LOCALEDIR
-#define LOCALEDIR		_nlos2_localedir
-extern char *_nlos2_localedir;
-
-#undef LOCALE_ALIAS_PATH
-#define LOCALE_ALIAS_PATH	_nlos2_localealiaspath
-extern char *_nlos2_localealiaspath;
-
-#endif
-
-#undef HAVE_STRCASECMP
-#define HAVE_STRCASECMP 1
-#define strcasecmp stricmp
-#define strncasecmp strnicmp
-
-/* We have our own getenv() which works even if library is compiled as DLL */
-#define getenv _nl_getenv
-
-/* Older versions of gettext used -1 as the value of LC_MESSAGES */
-#define LC_MESSAGES_COMPAT (-1)
diff --git a/intl/osdep.c b/intl/osdep.c
deleted file mode 100644
index b372598..0000000
--- a/intl/osdep.c
+++ /dev/null
@@ -1,24 +0,0 @@
-/* OS dependent parts of libintl.
-   Copyright (C) 2001-2002 Free Software Foundation, Inc.
-
-   This program is free software; you can redistribute it and/or modify it
-   under the terms of the GNU Library General Public License as published
-   by the Free Software Foundation; either version 2, or (at your option)
-   any later version.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   Library General Public License for more details.
-
-   You should have received a copy of the GNU Library General Public
-   License along with this program; if not, write to the Free Software
-   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
-   USA.  */
-
-#if defined __EMX__
-# include "os2compat.c"
-#else
-/* Avoid AIX compiler warning.  */
-typedef int dummy;
-#endif
diff --git a/intl/plural-exp.c b/intl/plural-exp.c
deleted file mode 100644
index c937c01..0000000
--- a/intl/plural-exp.c
+++ /dev/null
@@ -1,156 +0,0 @@
-/* Expression parsing for plural form selection.
-   Copyright (C) 2000, 2001 Free Software Foundation, Inc.
-   Written by Ulrich Drepper <drepper@cygnus.com>, 2000.
-
-   This program is free software; you can redistribute it and/or modify it
-   under the terms of the GNU Library General Public License as published
-   by the Free Software Foundation; either version 2, or (at your option)
-   any later version.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   Library General Public License for more details.
-
-   You should have received a copy of the GNU Library General Public
-   License along with this program; if not, write to the Free Software
-   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
-   USA.  */
-
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
-
-#include <ctype.h>
-#include <stdlib.h>
-#include <string.h>
-
-#include "plural-exp.h"
-
-#if (defined __GNUC__ && !defined __APPLE_CC__) \
-    || (defined __STDC_VERSION__ && __STDC_VERSION__ >= 199901L)
-
-/* These structs are the constant expression for the germanic plural
-   form determination.  It represents the expression  "n != 1".  */
-static const struct expression plvar =
-{
-  .nargs = 0,
-  .operation = var,
-};
-static const struct expression plone =
-{
-  .nargs = 0,
-  .operation = num,
-  .val =
-  {
-    .num = 1
-  }
-};
-struct expression GERMANIC_PLURAL =
-{
-  .nargs = 2,
-  .operation = not_equal,
-  .val =
-  {
-    .args =
-    {
-      [0] = (struct expression *) &plvar,
-      [1] = (struct expression *) &plone
-    }
-  }
-};
-
-# define INIT_GERMANIC_PLURAL()
-
-#else
-
-/* For compilers without support for ISO C 99 struct/union initializers:
-   Initialization at run-time.  */
-
-static struct expression plvar;
-static struct expression plone;
-struct expression GERMANIC_PLURAL;
-
-static void
-init_germanic_plural ()
-{
-  if (plone.val.num == 0)
-    {
-      plvar.nargs = 0;
-      plvar.operation = var;
-
-      plone.nargs = 0;
-      plone.operation = num;
-      plone.val.num = 1;
-
-      GERMANIC_PLURAL.nargs = 2;
-      GERMANIC_PLURAL.operation = not_equal;
-      GERMANIC_PLURAL.val.args[0] = &plvar;
-      GERMANIC_PLURAL.val.args[1] = &plone;
-    }
-}
-
-# define INIT_GERMANIC_PLURAL() init_germanic_plural ()
-
-#endif
-
-void
-internal_function
-EXTRACT_PLURAL_EXPRESSION (nullentry, pluralp, npluralsp)
-     const char *nullentry;
-     struct expression **pluralp;
-     unsigned long int *npluralsp;
-{
-  if (nullentry != NULL)
-    {
-      const char *plural;
-      const char *nplurals;
-
-      plural = strstr (nullentry, "plural=");
-      nplurals = strstr (nullentry, "nplurals=");
-      if (plural == NULL || nplurals == NULL)
-	goto no_plural;
-      else
-	{
-	  char *endp;
-	  unsigned long int n;
-	  struct parse_args args;
-
-	  /* First get the number.  */
-	  nplurals += 9;
-	  while (*nplurals != '\0' && isspace ((unsigned char) *nplurals))
-	    ++nplurals;
-	  if (!(*nplurals >= '0' && *nplurals <= '9'))
-	    goto no_plural;
-#if defined HAVE_STRTOUL || defined _LIBC
-	  n = strtoul (nplurals, &endp, 10);
-#else
-	  for (endp = nplurals, n = 0; *endp >= '0' && *endp <= '9'; endp++)
-	    n = n * 10 + (*endp - '0');
-#endif
-	  if (nplurals == endp)
-	    goto no_plural;
-	  *npluralsp = n;
-
-	  /* Due to the restrictions bison imposes onto the interface of the
-	     scanner function we have to put the input string and the result
-	     passed up from the parser into the same structure which address
-	     is passed down to the parser.  */
-	  plural += 7;
-	  args.cp = plural;
-	  if (PLURAL_PARSE (&args) != 0)
-	    goto no_plural;
-	  *pluralp = args.res;
-	}
-    }
-  else
-    {
-      /* By default we are using the Germanic form: singular form only
-         for `one', the plural form otherwise.  Yes, this is also what
-         English is using since English is a Germanic language.  */
-    no_plural:
-      INIT_GERMANIC_PLURAL ();
-      *pluralp = &GERMANIC_PLURAL;
-      *npluralsp = 2;
-    }
-}
diff --git a/intl/plural-exp.h b/intl/plural-exp.h
deleted file mode 100644
index 93cdaef..0000000
--- a/intl/plural-exp.h
+++ /dev/null
@@ -1,126 +0,0 @@
-/* Expression parsing and evaluation for plural form selection.
-   Copyright (C) 2000, 2001, 2002 Free Software Foundation, Inc.
-   Written by Ulrich Drepper <drepper@cygnus.com>, 2000.
-
-   This program is free software; you can redistribute it and/or modify it
-   under the terms of the GNU Library General Public License as published
-   by the Free Software Foundation; either version 2, or (at your option)
-   any later version.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   Library General Public License for more details.
-
-   You should have received a copy of the GNU Library General Public
-   License along with this program; if not, write to the Free Software
-   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
-   USA.  */
-
-#ifndef _PLURAL_EXP_H
-#define _PLURAL_EXP_H
-
-#ifndef PARAMS
-# if __STDC__ || defined __GNUC__ || defined __SUNPRO_C || defined __cplusplus || __PROTOTYPES
-#  define PARAMS(args) args
-# else
-#  define PARAMS(args) ()
-# endif
-#endif
-
-#ifndef internal_function
-# define internal_function
-#endif
-
-#ifndef attribute_hidden
-# define attribute_hidden
-#endif
-
-
-/* This is the representation of the expressions to determine the
-   plural form.  */
-struct expression
-{
-  int nargs;			/* Number of arguments.  */
-  enum operator
-  {
-    /* Without arguments:  */
-    var,			/* The variable "n".  */
-    num,			/* Decimal number.  */
-    /* Unary operators:  */
-    lnot,			/* Logical NOT.  */
-    /* Binary operators:  */
-    mult,			/* Multiplication.  */
-    divide,			/* Division.  */
-    module,			/* Modulo operation.  */
-    plus,			/* Addition.  */
-    minus,			/* Subtraction.  */
-    less_than,			/* Comparison.  */
-    greater_than,		/* Comparison.  */
-    less_or_equal,		/* Comparison.  */
-    greater_or_equal,		/* Comparison.  */
-    equal,			/* Comparison for equality.  */
-    not_equal,			/* Comparison for inequality.  */
-    land,			/* Logical AND.  */
-    lor,			/* Logical OR.  */
-    /* Ternary operators:  */
-    qmop			/* Question mark operator.  */
-  } operation;
-  union
-  {
-    unsigned long int num;	/* Number value for `num'.  */
-    struct expression *args[3];	/* Up to three arguments.  */
-  } val;
-};
-
-/* This is the data structure to pass information to the parser and get
-   the result in a thread-safe way.  */
-struct parse_args
-{
-  const char *cp;
-  struct expression *res;
-};
-
-
-/* Names for the libintl functions are a problem.  This source code is used
-   1. in the GNU C Library library,
-   2. in the GNU libintl library,
-   3. in the GNU gettext tools.
-   The function names in each situation must be different, to allow for
-   binary incompatible changes in 'struct expression'.  Furthermore,
-   1. in the GNU C Library library, the names have a __ prefix,
-   2.+3. in the GNU libintl library and in the GNU gettext tools, the names
-         must follow ANSI C and not start with __.
-   So we have to distinguish the three cases.  */
-#ifdef _LIBC
-# define FREE_EXPRESSION __gettext_free_exp
-# define PLURAL_PARSE __gettextparse
-# define GERMANIC_PLURAL __gettext_germanic_plural
-# define EXTRACT_PLURAL_EXPRESSION __gettext_extract_plural
-#elif defined (IN_LIBINTL)
-# define FREE_EXPRESSION gettext_free_exp__
-# define PLURAL_PARSE gettextparse__
-# define GERMANIC_PLURAL gettext_germanic_plural__
-# define EXTRACT_PLURAL_EXPRESSION gettext_extract_plural__
-#else
-# define FREE_EXPRESSION free_plural_expression
-# define PLURAL_PARSE parse_plural_expression
-# define GERMANIC_PLURAL germanic_plural
-# define EXTRACT_PLURAL_EXPRESSION extract_plural_expression
-#endif
-
-extern void FREE_EXPRESSION PARAMS ((struct expression *exp))
-     internal_function;
-extern int PLURAL_PARSE PARAMS ((void *arg));
-extern struct expression GERMANIC_PLURAL attribute_hidden;
-extern void EXTRACT_PLURAL_EXPRESSION PARAMS ((const char *nullentry,
-					       struct expression **pluralp,
-					       unsigned long int *npluralsp))
-     internal_function;
-
-#if !defined (_LIBC) && !defined (IN_LIBINTL)
-extern unsigned long int plural_eval PARAMS ((struct expression *pexp,
-					      unsigned long int n));
-#endif
-
-#endif /* _PLURAL_EXP_H */
diff --git a/intl/plural.c b/intl/plural.c
deleted file mode 100644
index c9ff63f..0000000
--- a/intl/plural.c
+++ /dev/null
@@ -1,1322 +0,0 @@
-
-/*  A Bison parser, made from plural.y
-    by GNU Bison version 1.28  */
-
-#define YYBISON 1  /* Identify Bison output.  */
-
-#define yyparse __gettextparse
-#define yylex __gettextlex
-#define yyerror __gettexterror
-#define yylval __gettextlval
-#define yychar __gettextchar
-#define yydebug __gettextdebug
-#define yynerrs __gettextnerrs
-#define	EQUOP2	257
-#define	CMPOP2	258
-#define	ADDOP2	259
-#define	MULOP2	260
-#define	NUMBER	261
-
-#line 1 "plural.y"
-
-/* Expression parsing for plural form selection.
-   Copyright (C) 2000, 2001 Free Software Foundation, Inc.
-   Written by Ulrich Drepper <drepper@cygnus.com>, 2000.
-
-   This program is free software; you can redistribute it and/or modify it
-   under the terms of the GNU Library General Public License as published
-   by the Free Software Foundation; either version 2, or (at your option)
-   any later version.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   Library General Public License for more details.
-
-   You should have received a copy of the GNU Library General Public
-   License along with this program; if not, write to the Free Software
-   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
-   USA.  */
-
-/* The bison generated parser uses alloca.  AIX 3 forces us to put this
-   declaration at the beginning of the file.  The declaration in bison's
-   skeleton file comes too late.  This must come before <config.h>
-   because <config.h> may include arbitrary system headers.  */
-#if defined _AIX && !defined __GNUC__
- #pragma alloca
-#endif
-
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
-
-#include <stddef.h>
-#include <stdlib.h>
-#include "plural-exp.h"
-
-/* The main function generated by the parser is called __gettextparse,
-   but we want it to be called PLURAL_PARSE.  */
-#ifndef _LIBC
-# define __gettextparse PLURAL_PARSE
-#endif
-
-#define YYLEX_PARAM	&((struct parse_args *) arg)->cp
-#define YYPARSE_PARAM	arg
-
-#line 49 "plural.y"
-typedef union {
-  unsigned long int num;
-  enum operator op;
-  struct expression *exp;
-} YYSTYPE;
-#line 55 "plural.y"
-
-/* Prototypes for local functions.  */
-static struct expression *new_exp PARAMS ((int nargs, enum operator op,
-					   struct expression * const *args));
-static inline struct expression *new_exp_0 PARAMS ((enum operator op));
-static inline struct expression *new_exp_1 PARAMS ((enum operator op,
-						   struct expression *right));
-static struct expression *new_exp_2 PARAMS ((enum operator op,
-					     struct expression *left,
-					     struct expression *right));
-static inline struct expression *new_exp_3 PARAMS ((enum operator op,
-						   struct expression *bexp,
-						   struct expression *tbranch,
-						   struct expression *fbranch));
-static int yylex PARAMS ((YYSTYPE *lval, const char **pexp));
-static void yyerror PARAMS ((const char *str));
-
-/* Allocation of expressions.  */
-
-static struct expression *
-new_exp (nargs, op, args)
-     int nargs;
-     enum operator op;
-     struct expression * const *args;
-{
-  int i;
-  struct expression *newp;
-
-  /* If any of the argument could not be malloc'ed, just return NULL.  */
-  for (i = nargs - 1; i >= 0; i--)
-    if (args[i] == NULL)
-      goto fail;
-
-  /* Allocate a new expression.  */
-  newp = (struct expression *) malloc (sizeof (*newp));
-  if (newp != NULL)
-    {
-      newp->nargs = nargs;
-      newp->operation = op;
-      for (i = nargs - 1; i >= 0; i--)
-	newp->val.args[i] = args[i];
-      return newp;
-    }
-
- fail:
-  for (i = nargs - 1; i >= 0; i--)
-    FREE_EXPRESSION (args[i]);
-
-  return NULL;
-}
-
-static inline struct expression *
-new_exp_0 (op)
-     enum operator op;
-{
-  return new_exp (0, op, NULL);
-}
-
-static inline struct expression *
-new_exp_1 (op, right)
-     enum operator op;
-     struct expression *right;
-{
-  struct expression *args[1];
-
-  args[0] = right;
-  return new_exp (1, op, args);
-}
-
-static struct expression *
-new_exp_2 (op, left, right)
-     enum operator op;
-     struct expression *left;
-     struct expression *right;
-{
-  struct expression *args[2];
-
-  args[0] = left;
-  args[1] = right;
-  return new_exp (2, op, args);
-}
-
-static inline struct expression *
-new_exp_3 (op, bexp, tbranch, fbranch)
-     enum operator op;
-     struct expression *bexp;
-     struct expression *tbranch;
-     struct expression *fbranch;
-{
-  struct expression *args[3];
-
-  args[0] = bexp;
-  args[1] = tbranch;
-  args[2] = fbranch;
-  return new_exp (3, op, args);
-}
-
-#include <stdio.h>
-
-#ifndef __cplusplus
-#ifndef __STDC__
-#define const
-#endif
-#endif
-
-
-
-#define	YYFINAL		27
-#define	YYFLAG		-32768
-#define	YYNTBASE	16
-
-#define YYTRANSLATE(x) ((unsigned)(x) <= 261 ? yytranslate[x] : 18)
-
-static const char yytranslate[] = {     0,
-     2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-     2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-     2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-     2,     2,    10,     2,     2,     2,     2,     5,     2,    14,
-    15,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-     2,     2,     2,     2,     2,     2,     2,    12,     2,     2,
-     2,     2,     3,     2,     2,     2,     2,     2,     2,     2,
-     2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-     2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-     2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-     2,     2,     2,     2,     2,     2,     2,     2,     2,    13,
-     2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-     2,     2,     2,     4,     2,     2,     2,     2,     2,     2,
-     2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-     2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-     2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-     2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-     2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-     2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-     2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-     2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-     2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-     2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-     2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-     2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-     2,     2,     2,     2,     2,     1,     6,     7,     8,     9,
-    11
-};
-
-#if YYDEBUG != 0
-static const short yyprhs[] = {     0,
-     0,     2,     8,    12,    16,    20,    24,    28,    32,    35,
-    37,    39
-};
-
-static const short yyrhs[] = {    17,
-     0,    17,     3,    17,    12,    17,     0,    17,     4,    17,
-     0,    17,     5,    17,     0,    17,     6,    17,     0,    17,
-     7,    17,     0,    17,     8,    17,     0,    17,     9,    17,
-     0,    10,    17,     0,    13,     0,    11,     0,    14,    17,
-    15,     0
-};
-
-#endif
-
-#if YYDEBUG != 0
-static const short yyrline[] = { 0,
-   174,   182,   186,   190,   194,   198,   202,   206,   210,   214,
-   218,   223
-};
-#endif
-
-
-#if YYDEBUG != 0 || defined (YYERROR_VERBOSE)
-
-static const char * const yytname[] = {   "$","error","$undefined.","'?'","'|'",
-"'&'","EQUOP2","CMPOP2","ADDOP2","MULOP2","'!'","NUMBER","':'","'n'","'('","')'",
-"start","exp", NULL
-};
-#endif
-
-static const short yyr1[] = {     0,
-    16,    17,    17,    17,    17,    17,    17,    17,    17,    17,
-    17,    17
-};
-
-static const short yyr2[] = {     0,
-     1,     5,     3,     3,     3,     3,     3,     3,     2,     1,
-     1,     3
-};
-
-static const short yydefact[] = {     0,
-     0,    11,    10,     0,     1,     9,     0,     0,     0,     0,
-     0,     0,     0,     0,    12,     0,     3,     4,     5,     6,
-     7,     8,     0,     2,     0,     0,     0
-};
-
-static const short yydefgoto[] = {    25,
-     5
-};
-
-static const short yypact[] = {    -9,
-    -9,-32768,-32768,    -9,    34,-32768,    11,    -9,    -9,    -9,
-    -9,    -9,    -9,    -9,-32768,    24,    39,    43,    16,    26,
-    -3,-32768,    -9,    34,    21,    53,-32768
-};
-
-static const short yypgoto[] = {-32768,
-    -1
-};
-
-
-#define	YYLAST		53
-
-
-static const short yytable[] = {     6,
-     1,     2,     7,     3,     4,    14,    16,    17,    18,    19,
-    20,    21,    22,     8,     9,    10,    11,    12,    13,    14,
-    26,    24,    12,    13,    14,    15,     8,     9,    10,    11,
-    12,    13,    14,    13,    14,    23,     8,     9,    10,    11,
-    12,    13,    14,    10,    11,    12,    13,    14,    11,    12,
-    13,    14,    27
-};
-
-static const short yycheck[] = {     1,
-    10,    11,     4,    13,    14,     9,     8,     9,    10,    11,
-    12,    13,    14,     3,     4,     5,     6,     7,     8,     9,
-     0,    23,     7,     8,     9,    15,     3,     4,     5,     6,
-     7,     8,     9,     8,     9,    12,     3,     4,     5,     6,
-     7,     8,     9,     5,     6,     7,     8,     9,     6,     7,
-     8,     9,     0
-};
-#define YYPURE 1
-
-/* -*-C-*-  Note some compilers choke on comments on `#line' lines.  */
-#line 3 "/usr/local/share/bison.simple"
-/* This file comes from bison-1.28.  */
-
-/* Skeleton output parser for bison,
-   Copyright (C) 1984, 1989, 1990 Free Software Foundation, Inc.
-
-   This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2, or (at your option)
-   any later version.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA.  */
-
-/* As a special exception, when this file is copied by Bison into a
-   Bison output file, you may use that output file without restriction.
-   This special exception was added by the Free Software Foundation
-   in version 1.24 of Bison.  */
-
-/* This is the parser code that is written into each bison parser
-  when the %semantic_parser declaration is not specified in the grammar.
-  It was written by Richard Stallman by simplifying the hairy parser
-  used when %semantic_parser is specified.  */
-
-#ifndef YYSTACK_USE_ALLOCA
-#ifdef alloca
-#define YYSTACK_USE_ALLOCA
-#else /* alloca not defined */
-#ifdef __GNUC__
-#define YYSTACK_USE_ALLOCA
-#define alloca __builtin_alloca
-#else /* not GNU C.  */
-#if (!defined (__STDC__) && defined (sparc)) || defined (__sparc__) || defined (__sparc) || defined (__sgi) || (defined (__sun) && defined (__i386))
-#define YYSTACK_USE_ALLOCA
-#include <alloca.h>
-#else /* not sparc */
-/* We think this test detects Watcom and Microsoft C.  */
-/* This used to test MSDOS, but that is a bad idea
-   since that symbol is in the user namespace.  */
-#if (defined (_MSDOS) || defined (_MSDOS_)) && !defined (__TURBOC__)
-#if 0 /* No need for malloc.h, which pollutes the namespace;
-	 instead, just don't use alloca.  */
-#include <malloc.h>
-#endif
-#else /* not MSDOS, or __TURBOC__ */
-#if defined(_AIX)
-/* I don't know what this was needed for, but it pollutes the namespace.
-   So I turned it off.   rms, 2 May 1997.  */
-/* #include <malloc.h>  */
- #pragma alloca
-#define YYSTACK_USE_ALLOCA
-#else /* not MSDOS, or __TURBOC__, or _AIX */
-#if 0
-#ifdef __hpux /* haible@ilog.fr says this works for HPUX 9.05 and up,
-		 and on HPUX 10.  Eventually we can turn this on.  */
-#define YYSTACK_USE_ALLOCA
-#define alloca __builtin_alloca
-#endif /* __hpux */
-#endif
-#endif /* not _AIX */
-#endif /* not MSDOS, or __TURBOC__ */
-#endif /* not sparc */
-#endif /* not GNU C */
-#endif /* alloca not defined */
-#endif /* YYSTACK_USE_ALLOCA not defined */
-
-#ifdef YYSTACK_USE_ALLOCA
-#define YYSTACK_ALLOC alloca
-#else
-#define YYSTACK_ALLOC malloc
-#endif
-
-/* Note: there must be only one dollar sign in this file.
-   It is replaced by the list of actions, each action
-   as one case of the switch.  */
-
-#define yyerrok		(yyerrstatus = 0)
-#define yyclearin	(yychar = YYEMPTY)
-#define YYEMPTY		-2
-#define YYEOF		0
-#define YYACCEPT	goto yyacceptlab
-#define YYABORT 	goto yyabortlab
-#define YYERROR		goto yyerrlab1
-/* Like YYERROR except do call yyerror.
-   This remains here temporarily to ease the
-   transition to the new meaning of YYERROR, for GCC.
-   Once GCC version 2 has supplanted version 1, this can go.  */
-#define YYFAIL		goto yyerrlab
-#define YYRECOVERING()  (!!yyerrstatus)
-#define YYBACKUP(token, value) \
-do								\
-  if (yychar == YYEMPTY && yylen == 1)				\
-    { yychar = (token), yylval = (value);			\
-      yychar1 = YYTRANSLATE (yychar);				\
-      YYPOPSTACK;						\
-      goto yybackup;						\
-    }								\
-  else								\
-    { yyerror ("syntax error: cannot back up"); YYERROR; }	\
-while (0)
-
-#define YYTERROR	1
-#define YYERRCODE	256
-
-#ifndef YYPURE
-#define YYLEX		yylex()
-#endif
-
-#ifdef YYPURE
-#ifdef YYLSP_NEEDED
-#ifdef YYLEX_PARAM
-#define YYLEX		yylex(&yylval, &yylloc, YYLEX_PARAM)
-#else
-#define YYLEX		yylex(&yylval, &yylloc)
-#endif
-#else /* not YYLSP_NEEDED */
-#ifdef YYLEX_PARAM
-#define YYLEX		yylex(&yylval, YYLEX_PARAM)
-#else
-#define YYLEX		yylex(&yylval)
-#endif
-#endif /* not YYLSP_NEEDED */
-#endif
-
-/* If nonreentrant, generate the variables here */
-
-#ifndef YYPURE
-
-int	yychar;			/*  the lookahead symbol		*/
-YYSTYPE	yylval;			/*  the semantic value of the		*/
-				/*  lookahead symbol			*/
-
-#ifdef YYLSP_NEEDED
-YYLTYPE yylloc;			/*  location data for the lookahead	*/
-				/*  symbol				*/
-#endif
-
-int yynerrs;			/*  number of parse errors so far       */
-#endif  /* not YYPURE */
-
-#if YYDEBUG != 0
-int yydebug;			/*  nonzero means print parse trace	*/
-/* Since this is uninitialized, it does not stop multiple parsers
-   from coexisting.  */
-#endif
-
-/*  YYINITDEPTH indicates the initial size of the parser's stacks	*/
-
-#ifndef	YYINITDEPTH
-#define YYINITDEPTH 200
-#endif
-
-/*  YYMAXDEPTH is the maximum size the stacks can grow to
-    (effective only if the built-in stack extension method is used).  */
-
-#if YYMAXDEPTH == 0
-#undef YYMAXDEPTH
-#endif
-
-#ifndef YYMAXDEPTH
-#define YYMAXDEPTH 10000
-#endif
-
-/* Define __yy_memcpy.  Note that the size argument
-   should be passed with type unsigned int, because that is what the non-GCC
-   definitions require.  With GCC, __builtin_memcpy takes an arg
-   of type size_t, but it can handle unsigned int.  */
-
-#if __GNUC__ > 1		/* GNU C and GNU C++ define this.  */
-#define __yy_memcpy(TO,FROM,COUNT)	__builtin_memcpy(TO,FROM,COUNT)
-#else				/* not GNU C or C++ */
-#ifndef __cplusplus
-
-/* This is the most reliable way to avoid incompatibilities
-   in available built-in functions on various systems.  */
-static void
-__yy_memcpy (to, from, count)
-     char *to;
-     char *from;
-     unsigned int count;
-{
-  register char *f = from;
-  register char *t = to;
-  register int i = count;
-
-  while (i-- > 0)
-    *t++ = *f++;
-}
-
-#else /* __cplusplus */
-
-/* This is the most reliable way to avoid incompatibilities
-   in available built-in functions on various systems.  */
-static void
-__yy_memcpy (char *to, char *from, unsigned int count)
-{
-  register char *t = to;
-  register char *f = from;
-  register int i = count;
-
-  while (i-- > 0)
-    *t++ = *f++;
-}
-
-#endif
-#endif
-
-#line 217 "/usr/local/share/bison.simple"
-
-/* The user can define YYPARSE_PARAM as the name of an argument to be passed
-   into yyparse.  The argument should have type void *.
-   It should actually point to an object.
-   Grammar actions can access the variable by casting it
-   to the proper pointer type.  */
-
-#ifdef YYPARSE_PARAM
-#ifdef __cplusplus
-#define YYPARSE_PARAM_ARG void *YYPARSE_PARAM
-#define YYPARSE_PARAM_DECL
-#else /* not __cplusplus */
-#define YYPARSE_PARAM_ARG YYPARSE_PARAM
-#define YYPARSE_PARAM_DECL void *YYPARSE_PARAM;
-#endif /* not __cplusplus */
-#else /* not YYPARSE_PARAM */
-#define YYPARSE_PARAM_ARG
-#define YYPARSE_PARAM_DECL
-#endif /* not YYPARSE_PARAM */
-
-/* Prevent warning if -Wstrict-prototypes.  */
-#ifdef __GNUC__
-#ifdef YYPARSE_PARAM
-int yyparse (void *);
-#else
-int yyparse (void);
-#endif
-#endif
-
-int
-yyparse(YYPARSE_PARAM_ARG)
-     YYPARSE_PARAM_DECL
-{
-  register int yystate;
-  register int yyn;
-  register short *yyssp;
-  register YYSTYPE *yyvsp;
-  int yyerrstatus;	/*  number of tokens to shift before error messages enabled */
-  int yychar1 = 0;		/*  lookahead token as an internal (translated) token number */
-
-  short	yyssa[YYINITDEPTH];	/*  the state stack			*/
-  YYSTYPE yyvsa[YYINITDEPTH];	/*  the semantic value stack		*/
-
-  short *yyss = yyssa;		/*  refer to the stacks thru separate pointers */
-  YYSTYPE *yyvs = yyvsa;	/*  to allow yyoverflow to reallocate them elsewhere */
-
-#ifdef YYLSP_NEEDED
-  YYLTYPE yylsa[YYINITDEPTH];	/*  the location stack			*/
-  YYLTYPE *yyls = yylsa;
-  YYLTYPE *yylsp;
-
-#define YYPOPSTACK   (yyvsp--, yyssp--, yylsp--)
-#else
-#define YYPOPSTACK   (yyvsp--, yyssp--)
-#endif
-
-  int yystacksize = YYINITDEPTH;
-  int yyfree_stacks = 0;
-
-#ifdef YYPURE
-  int yychar;
-  YYSTYPE yylval;
-  int yynerrs;
-#ifdef YYLSP_NEEDED
-  YYLTYPE yylloc;
-#endif
-#endif
-
-  YYSTYPE yyval;		/*  the variable used to return		*/
-				/*  semantic values from the action	*/
-				/*  routines				*/
-
-  int yylen;
-
-#if YYDEBUG != 0
-  if (yydebug)
-    fprintf(stderr, "Starting parse\n");
-#endif
-
-  yystate = 0;
-  yyerrstatus = 0;
-  yynerrs = 0;
-  yychar = YYEMPTY;		/* Cause a token to be read.  */
-
-  /* Initialize stack pointers.
-     Waste one element of value and location stack
-     so that they stay on the same level as the state stack.
-     The wasted elements are never initialized.  */
-
-  yyssp = yyss - 1;
-  yyvsp = yyvs;
-#ifdef YYLSP_NEEDED
-  yylsp = yyls;
-#endif
-
-/* Push a new state, which is found in  yystate  .  */
-/* In all cases, when you get here, the value and location stacks
-   have just been pushed. so pushing a state here evens the stacks.  */
-yynewstate:
-
-  *++yyssp = yystate;
-
-  if (yyssp >= yyss + yystacksize - 1)
-    {
-      /* Give user a chance to reallocate the stack */
-      /* Use copies of these so that the &'s don't force the real ones into memory. */
-      YYSTYPE *yyvs1 = yyvs;
-      short *yyss1 = yyss;
-#ifdef YYLSP_NEEDED
-      YYLTYPE *yyls1 = yyls;
-#endif
-
-      /* Get the current used size of the three stacks, in elements.  */
-      int size = yyssp - yyss + 1;
-
-#ifdef yyoverflow
-      /* Each stack pointer address is followed by the size of
-	 the data in use in that stack, in bytes.  */
-#ifdef YYLSP_NEEDED
-      /* This used to be a conditional around just the two extra args,
-	 but that might be undefined if yyoverflow is a macro.  */
-      yyoverflow("parser stack overflow",
-		 &yyss1, size * sizeof (*yyssp),
-		 &yyvs1, size * sizeof (*yyvsp),
-		 &yyls1, size * sizeof (*yylsp),
-		 &yystacksize);
-#else
-      yyoverflow("parser stack overflow",
-		 &yyss1, size * sizeof (*yyssp),
-		 &yyvs1, size * sizeof (*yyvsp),
-		 &yystacksize);
-#endif
-
-      yyss = yyss1; yyvs = yyvs1;
-#ifdef YYLSP_NEEDED
-      yyls = yyls1;
-#endif
-#else /* no yyoverflow */
-      /* Extend the stack our own way.  */
-      if (yystacksize >= YYMAXDEPTH)
-	{
-	  yyerror("parser stack overflow");
-	  if (yyfree_stacks)
-	    {
-	      free (yyss);
-	      free (yyvs);
-#ifdef YYLSP_NEEDED
-	      free (yyls);
-#endif
-	    }
-	  return 2;
-	}
-      yystacksize *= 2;
-      if (yystacksize > YYMAXDEPTH)
-	yystacksize = YYMAXDEPTH;
-#ifndef YYSTACK_USE_ALLOCA
-      yyfree_stacks = 1;
-#endif
-      yyss = (short *) YYSTACK_ALLOC (yystacksize * sizeof (*yyssp));
-      __yy_memcpy ((char *)yyss, (char *)yyss1,
-		   size * (unsigned int) sizeof (*yyssp));
-      yyvs = (YYSTYPE *) YYSTACK_ALLOC (yystacksize * sizeof (*yyvsp));
-      __yy_memcpy ((char *)yyvs, (char *)yyvs1,
-		   size * (unsigned int) sizeof (*yyvsp));
-#ifdef YYLSP_NEEDED
-      yyls = (YYLTYPE *) YYSTACK_ALLOC (yystacksize * sizeof (*yylsp));
-      __yy_memcpy ((char *)yyls, (char *)yyls1,
-		   size * (unsigned int) sizeof (*yylsp));
-#endif
-#endif /* no yyoverflow */
-
-      yyssp = yyss + size - 1;
-      yyvsp = yyvs + size - 1;
-#ifdef YYLSP_NEEDED
-      yylsp = yyls + size - 1;
-#endif
-
-#if YYDEBUG != 0
-      if (yydebug)
-	fprintf(stderr, "Stack size increased to %d\n", yystacksize);
-#endif
-
-      if (yyssp >= yyss + yystacksize - 1)
-	YYABORT;
-    }
-
-#if YYDEBUG != 0
-  if (yydebug)
-    fprintf(stderr, "Entering state %d\n", yystate);
-#endif
-
-  goto yybackup;
- yybackup:
-
-/* Do appropriate processing given the current state.  */
-/* Read a lookahead token if we need one and don't already have one.  */
-/* yyresume: */
-
-  /* First try to decide what to do without reference to lookahead token.  */
-
-  yyn = yypact[yystate];
-  if (yyn == YYFLAG)
-    goto yydefault;
-
-  /* Not known => get a lookahead token if don't already have one.  */
-
-  /* yychar is either YYEMPTY or YYEOF
-     or a valid token in external form.  */
-
-  if (yychar == YYEMPTY)
-    {
-#if YYDEBUG != 0
-      if (yydebug)
-	fprintf(stderr, "Reading a token: ");
-#endif
-      yychar = YYLEX;
-    }
-
-  /* Convert token to internal form (in yychar1) for indexing tables with */
-
-  if (yychar <= 0)		/* This means end of input. */
-    {
-      yychar1 = 0;
-      yychar = YYEOF;		/* Don't call YYLEX any more */
-
-#if YYDEBUG != 0
-      if (yydebug)
-	fprintf(stderr, "Now at end of input.\n");
-#endif
-    }
-  else
-    {
-      yychar1 = YYTRANSLATE(yychar);
-
-#if YYDEBUG != 0
-      if (yydebug)
-	{
-	  fprintf (stderr, "Next token is %d (%s", yychar, yytname[yychar1]);
-	  /* Give the individual parser a way to print the precise meaning
-	     of a token, for further debugging info.  */
-#ifdef YYPRINT
-	  YYPRINT (stderr, yychar, yylval);
-#endif
-	  fprintf (stderr, ")\n");
-	}
-#endif
-    }
-
-  yyn += yychar1;
-  if (yyn < 0 || yyn > YYLAST || yycheck[yyn] != yychar1)
-    goto yydefault;
-
-  yyn = yytable[yyn];
-
-  /* yyn is what to do for this token type in this state.
-     Negative => reduce, -yyn is rule number.
-     Positive => shift, yyn is new state.
-       New state is final state => don't bother to shift,
-       just return success.
-     0, or most negative number => error.  */
-
-  if (yyn < 0)
-    {
-      if (yyn == YYFLAG)
-	goto yyerrlab;
-      yyn = -yyn;
-      goto yyreduce;
-    }
-  else if (yyn == 0)
-    goto yyerrlab;
-
-  if (yyn == YYFINAL)
-    YYACCEPT;
-
-  /* Shift the lookahead token.  */
-
-#if YYDEBUG != 0
-  if (yydebug)
-    fprintf(stderr, "Shifting token %d (%s), ", yychar, yytname[yychar1]);
-#endif
-
-  /* Discard the token being shifted unless it is eof.  */
-  if (yychar != YYEOF)
-    yychar = YYEMPTY;
-
-  *++yyvsp = yylval;
-#ifdef YYLSP_NEEDED
-  *++yylsp = yylloc;
-#endif
-
-  /* count tokens shifted since error; after three, turn off error status.  */
-  if (yyerrstatus) yyerrstatus--;
-
-  yystate = yyn;
-  goto yynewstate;
-
-/* Do the default action for the current state.  */
-yydefault:
-
-  yyn = yydefact[yystate];
-  if (yyn == 0)
-    goto yyerrlab;
-
-/* Do a reduction.  yyn is the number of a rule to reduce with.  */
-yyreduce:
-  yylen = yyr2[yyn];
-  if (yylen > 0)
-    yyval = yyvsp[1-yylen]; /* implement default value of the action */
-
-#if YYDEBUG != 0
-  if (yydebug)
-    {
-      int i;
-
-      fprintf (stderr, "Reducing via rule %d (line %d), ",
-	       yyn, yyrline[yyn]);
-
-      /* Print the symbols being reduced, and their result.  */
-      for (i = yyprhs[yyn]; yyrhs[i] > 0; i++)
-	fprintf (stderr, "%s ", yytname[yyrhs[i]]);
-      fprintf (stderr, " -> %s\n", yytname[yyr1[yyn]]);
-    }
-#endif
-
-
-  switch (yyn) {
-
-case 1:
-#line 175 "plural.y"
-{
-	    if (yyvsp[0].exp == NULL)
-	      YYABORT;
-	    ((struct parse_args *) arg)->res = yyvsp[0].exp;
-	  ;
-    break;}
-case 2:
-#line 183 "plural.y"
-{
-	    yyval.exp = new_exp_3 (qmop, yyvsp[-4].exp, yyvsp[-2].exp, yyvsp[0].exp);
-	  ;
-    break;}
-case 3:
-#line 187 "plural.y"
-{
-	    yyval.exp = new_exp_2 (lor, yyvsp[-2].exp, yyvsp[0].exp);
-	  ;
-    break;}
-case 4:
-#line 191 "plural.y"
-{
-	    yyval.exp = new_exp_2 (land, yyvsp[-2].exp, yyvsp[0].exp);
-	  ;
-    break;}
-case 5:
-#line 195 "plural.y"
-{
-	    yyval.exp = new_exp_2 (yyvsp[-1].op, yyvsp[-2].exp, yyvsp[0].exp);
-	  ;
-    break;}
-case 6:
-#line 199 "plural.y"
-{
-	    yyval.exp = new_exp_2 (yyvsp[-1].op, yyvsp[-2].exp, yyvsp[0].exp);
-	  ;
-    break;}
-case 7:
-#line 203 "plural.y"
-{
-	    yyval.exp = new_exp_2 (yyvsp[-1].op, yyvsp[-2].exp, yyvsp[0].exp);
-	  ;
-    break;}
-case 8:
-#line 207 "plural.y"
-{
-	    yyval.exp = new_exp_2 (yyvsp[-1].op, yyvsp[-2].exp, yyvsp[0].exp);
-	  ;
-    break;}
-case 9:
-#line 211 "plural.y"
-{
-	    yyval.exp = new_exp_1 (lnot, yyvsp[0].exp);
-	  ;
-    break;}
-case 10:
-#line 215 "plural.y"
-{
-	    yyval.exp = new_exp_0 (var);
-	  ;
-    break;}
-case 11:
-#line 219 "plural.y"
-{
-	    if ((yyval.exp = new_exp_0 (num)) != NULL)
-	      yyval.exp->val.num = yyvsp[0].num;
-	  ;
-    break;}
-case 12:
-#line 224 "plural.y"
-{
-	    yyval.exp = yyvsp[-1].exp;
-	  ;
-    break;}
-}
-   /* the action file gets copied in in place of this dollarsign */
-#line 543 "/usr/local/share/bison.simple"
-
-  yyvsp -= yylen;
-  yyssp -= yylen;
-#ifdef YYLSP_NEEDED
-  yylsp -= yylen;
-#endif
-
-#if YYDEBUG != 0
-  if (yydebug)
-    {
-      short *ssp1 = yyss - 1;
-      fprintf (stderr, "state stack now");
-      while (ssp1 != yyssp)
-	fprintf (stderr, " %d", *++ssp1);
-      fprintf (stderr, "\n");
-    }
-#endif
-
-  *++yyvsp = yyval;
-
-#ifdef YYLSP_NEEDED
-  yylsp++;
-  if (yylen == 0)
-    {
-      yylsp->first_line = yylloc.first_line;
-      yylsp->first_column = yylloc.first_column;
-      yylsp->last_line = (yylsp-1)->last_line;
-      yylsp->last_column = (yylsp-1)->last_column;
-      yylsp->text = 0;
-    }
-  else
-    {
-      yylsp->last_line = (yylsp+yylen-1)->last_line;
-      yylsp->last_column = (yylsp+yylen-1)->last_column;
-    }
-#endif
-
-  /* Now "shift" the result of the reduction.
-     Determine what state that goes to,
-     based on the state we popped back to
-     and the rule number reduced by.  */
-
-  yyn = yyr1[yyn];
-
-  yystate = yypgoto[yyn - YYNTBASE] + *yyssp;
-  if (yystate >= 0 && yystate <= YYLAST && yycheck[yystate] == *yyssp)
-    yystate = yytable[yystate];
-  else
-    yystate = yydefgoto[yyn - YYNTBASE];
-
-  goto yynewstate;
-
-yyerrlab:   /* here on detecting error */
-
-  if (! yyerrstatus)
-    /* If not already recovering from an error, report this error.  */
-    {
-      ++yynerrs;
-
-#ifdef YYERROR_VERBOSE
-      yyn = yypact[yystate];
-
-      if (yyn > YYFLAG && yyn < YYLAST)
-	{
-	  int size = 0;
-	  char *msg;
-	  int x, count;
-
-	  count = 0;
-	  /* Start X at -yyn if nec to avoid negative indexes in yycheck.  */
-	  for (x = (yyn < 0 ? -yyn : 0);
-	       x < (sizeof(yytname) / sizeof(char *)); x++)
-	    if (yycheck[x + yyn] == x)
-	      size += strlen(yytname[x]) + 15, count++;
-	  msg = (char *) malloc(size + 15);
-	  if (msg != 0)
-	    {
-	      strcpy(msg, "parse error");
-
-	      if (count < 5)
-		{
-		  count = 0;
-		  for (x = (yyn < 0 ? -yyn : 0);
-		       x < (sizeof(yytname) / sizeof(char *)); x++)
-		    if (yycheck[x + yyn] == x)
-		      {
-			strcat(msg, count == 0 ? ", expecting `" : " or `");
-			strcat(msg, yytname[x]);
-			strcat(msg, "'");
-			count++;
-		      }
-		}
-	      yyerror(msg);
-	      free(msg);
-	    }
-	  else
-	    yyerror ("parse error; also virtual memory exceeded");
-	}
-      else
-#endif /* YYERROR_VERBOSE */
-	yyerror("parse error");
-    }
-
-  goto yyerrlab1;
-yyerrlab1:   /* here on error raised explicitly by an action */
-
-  if (yyerrstatus == 3)
-    {
-      /* if just tried and failed to reuse lookahead token after an error, discard it.  */
-
-      /* return failure if at end of input */
-      if (yychar == YYEOF)
-	YYABORT;
-
-#if YYDEBUG != 0
-      if (yydebug)
-	fprintf(stderr, "Discarding token %d (%s).\n", yychar, yytname[yychar1]);
-#endif
-
-      yychar = YYEMPTY;
-    }
-
-  /* Else will try to reuse lookahead token
-     after shifting the error token.  */
-
-  yyerrstatus = 3;		/* Each real token shifted decrements this */
-
-  goto yyerrhandle;
-
-yyerrdefault:  /* current state does not do anything special for the error token. */
-
-#if 0
-  /* This is wrong; only states that explicitly want error tokens
-     should shift them.  */
-  yyn = yydefact[yystate];  /* If its default is to accept any token, ok.  Otherwise pop it.*/
-  if (yyn) goto yydefault;
-#endif
-
-yyerrpop:   /* pop the current state because it cannot handle the error token */
-
-  if (yyssp == yyss) YYABORT;
-  yyvsp--;
-  yystate = *--yyssp;
-#ifdef YYLSP_NEEDED
-  yylsp--;
-#endif
-
-#if YYDEBUG != 0
-  if (yydebug)
-    {
-      short *ssp1 = yyss - 1;
-      fprintf (stderr, "Error: state stack now");
-      while (ssp1 != yyssp)
-	fprintf (stderr, " %d", *++ssp1);
-      fprintf (stderr, "\n");
-    }
-#endif
-
-yyerrhandle:
-
-  yyn = yypact[yystate];
-  if (yyn == YYFLAG)
-    goto yyerrdefault;
-
-  yyn += YYTERROR;
-  if (yyn < 0 || yyn > YYLAST || yycheck[yyn] != YYTERROR)
-    goto yyerrdefault;
-
-  yyn = yytable[yyn];
-  if (yyn < 0)
-    {
-      if (yyn == YYFLAG)
-	goto yyerrpop;
-      yyn = -yyn;
-      goto yyreduce;
-    }
-  else if (yyn == 0)
-    goto yyerrpop;
-
-  if (yyn == YYFINAL)
-    YYACCEPT;
-
-#if YYDEBUG != 0
-  if (yydebug)
-    fprintf(stderr, "Shifting error token, ");
-#endif
-
-  *++yyvsp = yylval;
-#ifdef YYLSP_NEEDED
-  *++yylsp = yylloc;
-#endif
-
-  yystate = yyn;
-  goto yynewstate;
-
- yyacceptlab:
-  /* YYACCEPT comes here.  */
-  if (yyfree_stacks)
-    {
-      free (yyss);
-      free (yyvs);
-#ifdef YYLSP_NEEDED
-      free (yyls);
-#endif
-    }
-  return 0;
-
- yyabortlab:
-  /* YYABORT comes here.  */
-  if (yyfree_stacks)
-    {
-      free (yyss);
-      free (yyvs);
-#ifdef YYLSP_NEEDED
-      free (yyls);
-#endif
-    }
-  return 1;
-}
-#line 229 "plural.y"
-
-
-void
-internal_function
-FREE_EXPRESSION (exp)
-     struct expression *exp;
-{
-  if (exp == NULL)
-    return;
-
-  /* Handle the recursive case.  */
-  switch (exp->nargs)
-    {
-    case 3:
-      FREE_EXPRESSION (exp->val.args[2]);
-      /* FALLTHROUGH */
-    case 2:
-      FREE_EXPRESSION (exp->val.args[1]);
-      /* FALLTHROUGH */
-    case 1:
-      FREE_EXPRESSION (exp->val.args[0]);
-      /* FALLTHROUGH */
-    default:
-      break;
-    }
-
-  free (exp);
-}
-
-
-static int
-yylex (lval, pexp)
-     YYSTYPE *lval;
-     const char **pexp;
-{
-  const char *exp = *pexp;
-  int result;
-
-  while (1)
-    {
-      if (exp[0] == '\0')
-	{
-	  *pexp = exp;
-	  return YYEOF;
-	}
-
-      if (exp[0] != ' ' && exp[0] != '\t')
-	break;
-
-      ++exp;
-    }
-
-  result = *exp++;
-  switch (result)
-    {
-    case '0': case '1': case '2': case '3': case '4':
-    case '5': case '6': case '7': case '8': case '9':
-      {
-	unsigned long int n = result - '0';
-	while (exp[0] >= '0' && exp[0] <= '9')
-	  {
-	    n *= 10;
-	    n += exp[0] - '0';
-	    ++exp;
-	  }
-	lval->num = n;
-	result = NUMBER;
-      }
-      break;
-
-    case '=':
-      if (exp[0] == '=')
-	{
-	  ++exp;
-	  lval->op = equal;
-	  result = EQUOP2;
-	}
-      else
-	result = YYERRCODE;
-      break;
-
-    case '!':
-      if (exp[0] == '=')
-	{
-	  ++exp;
-	  lval->op = not_equal;
-	  result = EQUOP2;
-	}
-      break;
-
-    case '&':
-    case '|':
-      if (exp[0] == result)
-	++exp;
-      else
-	result = YYERRCODE;
-      break;
-
-    case '<':
-      if (exp[0] == '=')
-	{
-	  ++exp;
-	  lval->op = less_or_equal;
-	}
-      else
-	lval->op = less_than;
-      result = CMPOP2;
-      break;
-
-    case '>':
-      if (exp[0] == '=')
-	{
-	  ++exp;
-	  lval->op = greater_or_equal;
-	}
-      else
-	lval->op = greater_than;
-      result = CMPOP2;
-      break;
-
-    case '*':
-      lval->op = mult;
-      result = MULOP2;
-      break;
-
-    case '/':
-      lval->op = divide;
-      result = MULOP2;
-      break;
-
-    case '%':
-      lval->op = module;
-      result = MULOP2;
-      break;
-
-    case '+':
-      lval->op = plus;
-      result = ADDOP2;
-      break;
-
-    case '-':
-      lval->op = minus;
-      result = ADDOP2;
-      break;
-
-    case 'n':
-    case '?':
-    case ':':
-    case '(':
-    case ')':
-      /* Nothing, just return the character.  */
-      break;
-
-    case ';':
-    case '\n':
-    case '\0':
-      /* Be safe and let the user call this function again.  */
-      --exp;
-      result = YYEOF;
-      break;
-
-    default:
-      result = YYERRCODE;
-#if YYDEBUG != 0
-      --exp;
-#endif
-      break;
-    }
-
-  *pexp = exp;
-
-  return result;
-}
-
-
-static void
-yyerror (str)
-     const char *str;
-{
-  /* Do nothing.  We don't print error messages here.  */
-}
diff --git a/intl/plural.y b/intl/plural.y
deleted file mode 100644
index 616b7c1..0000000
--- a/intl/plural.y
+++ /dev/null
@@ -1,409 +0,0 @@
-%{
-/* Expression parsing for plural form selection.
-   Copyright (C) 2000, 2001 Free Software Foundation, Inc.
-   Written by Ulrich Drepper <drepper@cygnus.com>, 2000.
-
-   This program is free software; you can redistribute it and/or modify it
-   under the terms of the GNU Library General Public License as published
-   by the Free Software Foundation; either version 2, or (at your option)
-   any later version.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   Library General Public License for more details.
-
-   You should have received a copy of the GNU Library General Public
-   License along with this program; if not, write to the Free Software
-   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
-   USA.  */
-
-/* The bison generated parser uses alloca.  AIX 3 forces us to put this
-   declaration at the beginning of the file.  The declaration in bison's
-   skeleton file comes too late.  This must come before <config.h>
-   because <config.h> may include arbitrary system headers.  */
-#if defined _AIX && !defined __GNUC__
- #pragma alloca
-#endif
-
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
-
-#include <stddef.h>
-#include <stdlib.h>
-#include "plural-exp.h"
-
-/* The main function generated by the parser is called __gettextparse,
-   but we want it to be called PLURAL_PARSE.  */
-#ifndef _LIBC
-# define __gettextparse PLURAL_PARSE
-#endif
-
-#define YYLEX_PARAM	&((struct parse_args *) arg)->cp
-#define YYPARSE_PARAM	arg
-%}
-%pure_parser
-%expect 7
-
-%union {
-  unsigned long int num;
-  enum operator op;
-  struct expression *exp;
-}
-
-%{
-/* Prototypes for local functions.  */
-static struct expression *new_exp PARAMS ((int nargs, enum operator op,
-					   struct expression * const *args));
-static inline struct expression *new_exp_0 PARAMS ((enum operator op));
-static inline struct expression *new_exp_1 PARAMS ((enum operator op,
-						   struct expression *right));
-static struct expression *new_exp_2 PARAMS ((enum operator op,
-					     struct expression *left,
-					     struct expression *right));
-static inline struct expression *new_exp_3 PARAMS ((enum operator op,
-						   struct expression *bexp,
-						   struct expression *tbranch,
-						   struct expression *fbranch));
-static int yylex PARAMS ((YYSTYPE *lval, const char **pexp));
-static void yyerror PARAMS ((const char *str));
-
-/* Allocation of expressions.  */
-
-static struct expression *
-new_exp (nargs, op, args)
-     int nargs;
-     enum operator op;
-     struct expression * const *args;
-{
-  int i;
-  struct expression *newp;
-
-  /* If any of the argument could not be malloc'ed, just return NULL.  */
-  for (i = nargs - 1; i >= 0; i--)
-    if (args[i] == NULL)
-      goto fail;
-
-  /* Allocate a new expression.  */
-  newp = (struct expression *) malloc (sizeof (*newp));
-  if (newp != NULL)
-    {
-      newp->nargs = nargs;
-      newp->operation = op;
-      for (i = nargs - 1; i >= 0; i--)
-	newp->val.args[i] = args[i];
-      return newp;
-    }
-
- fail:
-  for (i = nargs - 1; i >= 0; i--)
-    FREE_EXPRESSION (args[i]);
-
-  return NULL;
-}
-
-static inline struct expression *
-new_exp_0 (op)
-     enum operator op;
-{
-  return new_exp (0, op, NULL);
-}
-
-static inline struct expression *
-new_exp_1 (op, right)
-     enum operator op;
-     struct expression *right;
-{
-  struct expression *args[1];
-
-  args[0] = right;
-  return new_exp (1, op, args);
-}
-
-static struct expression *
-new_exp_2 (op, left, right)
-     enum operator op;
-     struct expression *left;
-     struct expression *right;
-{
-  struct expression *args[2];
-
-  args[0] = left;
-  args[1] = right;
-  return new_exp (2, op, args);
-}
-
-static inline struct expression *
-new_exp_3 (op, bexp, tbranch, fbranch)
-     enum operator op;
-     struct expression *bexp;
-     struct expression *tbranch;
-     struct expression *fbranch;
-{
-  struct expression *args[3];
-
-  args[0] = bexp;
-  args[1] = tbranch;
-  args[2] = fbranch;
-  return new_exp (3, op, args);
-}
-
-%}
-
-/* This declares that all operators have the same associativity and the
-   precedence order as in C.  See [Harbison, Steele: C, A Reference Manual].
-   There is no unary minus and no bitwise operators.
-   Operators with the same syntactic behaviour have been merged into a single
-   token, to save space in the array generated by bison.  */
-%right '?'		/*   ?		*/
-%left '|'		/*   ||		*/
-%left '&'		/*   &&		*/
-%left EQUOP2		/*   == !=	*/
-%left CMPOP2		/*   < > <= >=	*/
-%left ADDOP2		/*   + -	*/
-%left MULOP2		/*   * / %	*/
-%right '!'		/*   !		*/
-
-%token <op> EQUOP2 CMPOP2 ADDOP2 MULOP2
-%token <num> NUMBER
-%type <exp> exp
-
-%%
-
-start:	  exp
-	  {
-	    if ($1 == NULL)
-	      YYABORT;
-	    ((struct parse_args *) arg)->res = $1;
-	  }
-	;
-
-exp:	  exp '?' exp ':' exp
-	  {
-	    $$ = new_exp_3 (qmop, $1, $3, $5);
-	  }
-	| exp '|' exp
-	  {
-	    $$ = new_exp_2 (lor, $1, $3);
-	  }
-	| exp '&' exp
-	  {
-	    $$ = new_exp_2 (land, $1, $3);
-	  }
-	| exp EQUOP2 exp
-	  {
-	    $$ = new_exp_2 ($2, $1, $3);
-	  }
-	| exp CMPOP2 exp
-	  {
-	    $$ = new_exp_2 ($2, $1, $3);
-	  }
-	| exp ADDOP2 exp
-	  {
-	    $$ = new_exp_2 ($2, $1, $3);
-	  }
-	| exp MULOP2 exp
-	  {
-	    $$ = new_exp_2 ($2, $1, $3);
-	  }
-	| '!' exp
-	  {
-	    $$ = new_exp_1 (lnot, $2);
-	  }
-	| 'n'
-	  {
-	    $$ = new_exp_0 (var);
-	  }
-	| NUMBER
-	  {
-	    if (($$ = new_exp_0 (num)) != NULL)
-	      $$->val.num = $1;
-	  }
-	| '(' exp ')'
-	  {
-	    $$ = $2;
-	  }
-	;
-
-%%
-
-void
-internal_function
-FREE_EXPRESSION (exp)
-     struct expression *exp;
-{
-  if (exp == NULL)
-    return;
-
-  /* Handle the recursive case.  */
-  switch (exp->nargs)
-    {
-    case 3:
-      FREE_EXPRESSION (exp->val.args[2]);
-      /* FALLTHROUGH */
-    case 2:
-      FREE_EXPRESSION (exp->val.args[1]);
-      /* FALLTHROUGH */
-    case 1:
-      FREE_EXPRESSION (exp->val.args[0]);
-      /* FALLTHROUGH */
-    default:
-      break;
-    }
-
-  free (exp);
-}
-
-
-static int
-yylex (lval, pexp)
-     YYSTYPE *lval;
-     const char **pexp;
-{
-  const char *exp = *pexp;
-  int result;
-
-  while (1)
-    {
-      if (exp[0] == '\0')
-	{
-	  *pexp = exp;
-	  return YYEOF;
-	}
-
-      if (exp[0] != ' ' && exp[0] != '\t')
-	break;
-
-      ++exp;
-    }
-
-  result = *exp++;
-  switch (result)
-    {
-    case '0': case '1': case '2': case '3': case '4':
-    case '5': case '6': case '7': case '8': case '9':
-      {
-	unsigned long int n = result - '0';
-	while (exp[0] >= '0' && exp[0] <= '9')
-	  {
-	    n *= 10;
-	    n += exp[0] - '0';
-	    ++exp;
-	  }
-	lval->num = n;
-	result = NUMBER;
-      }
-      break;
-
-    case '=':
-      if (exp[0] == '=')
-	{
-	  ++exp;
-	  lval->op = equal;
-	  result = EQUOP2;
-	}
-      else
-	result = YYERRCODE;
-      break;
-
-    case '!':
-      if (exp[0] == '=')
-	{
-	  ++exp;
-	  lval->op = not_equal;
-	  result = EQUOP2;
-	}
-      break;
-
-    case '&':
-    case '|':
-      if (exp[0] == result)
-	++exp;
-      else
-	result = YYERRCODE;
-      break;
-
-    case '<':
-      if (exp[0] == '=')
-	{
-	  ++exp;
-	  lval->op = less_or_equal;
-	}
-      else
-	lval->op = less_than;
-      result = CMPOP2;
-      break;
-
-    case '>':
-      if (exp[0] == '=')
-	{
-	  ++exp;
-	  lval->op = greater_or_equal;
-	}
-      else
-	lval->op = greater_than;
-      result = CMPOP2;
-      break;
-
-    case '*':
-      lval->op = mult;
-      result = MULOP2;
-      break;
-
-    case '/':
-      lval->op = divide;
-      result = MULOP2;
-      break;
-
-    case '%':
-      lval->op = module;
-      result = MULOP2;
-      break;
-
-    case '+':
-      lval->op = plus;
-      result = ADDOP2;
-      break;
-
-    case '-':
-      lval->op = minus;
-      result = ADDOP2;
-      break;
-
-    case 'n':
-    case '?':
-    case ':':
-    case '(':
-    case ')':
-      /* Nothing, just return the character.  */
-      break;
-
-    case ';':
-    case '\n':
-    case '\0':
-      /* Be safe and let the user call this function again.  */
-      --exp;
-      result = YYEOF;
-      break;
-
-    default:
-      result = YYERRCODE;
-#if YYDEBUG != 0
-      --exp;
-#endif
-      break;
-    }
-
-  *pexp = exp;
-
-  return result;
-}
-
-
-static void
-yyerror (str)
-     const char *str;
-{
-  /* Do nothing.  We don't print error messages here.  */
-}
diff --git a/intl/ref-add.sin b/intl/ref-add.sin
deleted file mode 100644
index 167374e..0000000
--- a/intl/ref-add.sin
+++ /dev/null
@@ -1,31 +0,0 @@
-# Add this package to a list of references stored in a text file.
-#
-#   Copyright (C) 2000 Free Software Foundation, Inc.
-#
-#   This program is free software; you can redistribute it and/or modify it
-#   under the terms of the GNU Library General Public License as published
-#   by the Free Software Foundation; either version 2, or (at your option)
-#   any later version.
-#
-#   This program is distributed in the hope that it will be useful,
-#   but WITHOUT ANY WARRANTY; without even the implied warranty of
-#   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-#   Library General Public License for more details.
-#
-#   You should have received a copy of the GNU Library General Public
-#   License along with this program; if not, write to the Free Software
-#   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
-#   USA.
-#
-# Written by Bruno Haible <haible@clisp.cons.org>.
-#
-/^# Packages using this file: / {
-  s/# Packages using this file://
-  ta
-  :a
-  s/ @PACKAGE@ / @PACKAGE@ /
-  tb
-  s/ $/ @PACKAGE@ /
-  :b
-  s/^/# Packages using this file:/
-}
diff --git a/intl/ref-del.sin b/intl/ref-del.sin
deleted file mode 100644
index 613cf37..0000000
--- a/intl/ref-del.sin
+++ /dev/null
@@ -1,26 +0,0 @@
-# Remove this package from a list of references stored in a text file.
-#
-#   Copyright (C) 2000 Free Software Foundation, Inc.
-#
-#   This program is free software; you can redistribute it and/or modify it
-#   under the terms of the GNU Library General Public License as published
-#   by the Free Software Foundation; either version 2, or (at your option)
-#   any later version.
-#
-#   This program is distributed in the hope that it will be useful,
-#   but WITHOUT ANY WARRANTY; without even the implied warranty of
-#   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-#   Library General Public License for more details.
-#
-#   You should have received a copy of the GNU Library General Public
-#   License along with this program; if not, write to the Free Software
-#   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
-#   USA.
-#
-# Written by Bruno Haible <haible@clisp.cons.org>.
-#
-/^# Packages using this file: / {
-  s/# Packages using this file://
-  s/ @PACKAGE@ / /
-  s/^/# Packages using this file:/
-}
diff --git a/intl/textdomain.c b/intl/textdomain.c
deleted file mode 100644
index 8fb4ea0..0000000
--- a/intl/textdomain.c
+++ /dev/null
@@ -1,142 +0,0 @@
-/* Implementation of the textdomain(3) function.
-   Copyright (C) 1995-1998, 2000, 2001, 2002 Free Software Foundation, Inc.
-
-   This program is free software; you can redistribute it and/or modify it
-   under the terms of the GNU Library General Public License as published
-   by the Free Software Foundation; either version 2, or (at your option)
-   any later version.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   Library General Public License for more details.
-
-   You should have received a copy of the GNU Library General Public
-   License along with this program; if not, write to the Free Software
-   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
-   USA.  */
-
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
-
-#include <stdlib.h>
-#include <string.h>
-
-#ifdef _LIBC
-# include <libintl.h>
-#else
-# include "libgnuintl.h"
-#endif
-#include "gettextP.h"
-
-#ifdef _LIBC
-/* We have to handle multi-threaded applications.  */
-# include <bits/libc-lock.h>
-#else
-/* Provide dummy implementation if this is outside glibc.  */
-# define __libc_rwlock_define(CLASS, NAME)
-# define __libc_rwlock_wrlock(NAME)
-# define __libc_rwlock_unlock(NAME)
-#endif
-
-/* The internal variables in the standalone libintl.a must have different
-   names than the internal variables in GNU libc, otherwise programs
-   using libintl.a cannot be linked statically.  */
-#if !defined _LIBC
-# define _nl_default_default_domain _nl_default_default_domain__
-# define _nl_current_default_domain _nl_current_default_domain__
-#endif
-
-/* @@ end of prolog @@ */
-
-/* Name of the default text domain.  */
-extern const char _nl_default_default_domain[] attribute_hidden;
-
-/* Default text domain in which entries for gettext(3) are to be found.  */
-extern const char *_nl_current_default_domain attribute_hidden;
-
-
-/* Names for the libintl functions are a problem.  They must not clash
-   with existing names and they should follow ANSI C.  But this source
-   code is also used in GNU C Library where the names have a __
-   prefix.  So we have to make a difference here.  */
-#ifdef _LIBC
-# define TEXTDOMAIN __textdomain
-# ifndef strdup
-#  define strdup(str) __strdup (str)
-# endif
-#else
-# define TEXTDOMAIN textdomain__
-#endif
-
-/* Lock variable to protect the global data in the gettext implementation.  */
-__libc_rwlock_define (extern, _nl_state_lock attribute_hidden)
-
-/* Set the current default message catalog to DOMAINNAME.
-   If DOMAINNAME is null, return the current default.
-   If DOMAINNAME is "", reset to the default of "messages".  */
-char *
-TEXTDOMAIN (domainname)
-     const char *domainname;
-{
-  char *new_domain;
-  char *old_domain;
-
-  /* A NULL pointer requests the current setting.  */
-  if (domainname == NULL)
-    return (char *) _nl_current_default_domain;
-
-  __libc_rwlock_wrlock (_nl_state_lock);
-
-  old_domain = (char *) _nl_current_default_domain;
-
-  /* If domain name is the null string set to default domain "messages".  */
-  if (domainname[0] == '\0'
-      || strcmp (domainname, _nl_default_default_domain) == 0)
-    {
-      _nl_current_default_domain = _nl_default_default_domain;
-      new_domain = (char *) _nl_current_default_domain;
-    }
-  else if (strcmp (domainname, old_domain) == 0)
-    /* This can happen and people will use it to signal that some
-       environment variable changed.  */
-    new_domain = old_domain;
-  else
-    {
-      /* If the following malloc fails `_nl_current_default_domain'
-	 will be NULL.  This value will be returned and so signals we
-	 are out of core.  */
-#if defined _LIBC || defined HAVE_STRDUP
-      new_domain = strdup (domainname);
-#else
-      size_t len = strlen (domainname) + 1;
-      new_domain = (char *) malloc (len);
-      if (new_domain != NULL)
-	memcpy (new_domain, domainname, len);
-#endif
-
-      if (new_domain != NULL)
-	_nl_current_default_domain = new_domain;
-    }
-
-  /* We use this possibility to signal a change of the loaded catalogs
-     since this is most likely the case and there is no other easy we
-     to do it.  Do it only when the call was successful.  */
-  if (new_domain != NULL)
-    {
-      ++_nl_msg_cat_cntr;
-
-      if (old_domain != new_domain && old_domain != _nl_default_default_domain)
-	free (old_domain);
-    }
-
-  __libc_rwlock_unlock (_nl_state_lock);
-
-  return new_domain;
-}
-
-#ifdef _LIBC
-/* Alias for function name in GNU C Library.  */
-weak_alias (__textdomain, textdomain);
-#endif
-- 
Gitee


From eae85f25cb3862737d4c7f7cb570e6db0a1df0fb Mon Sep 17 00:00:00 2001
From: Jeff Johnson <n3npq@mac.com>
Date: Fri, 25 May 2007 18:34:14 +0000
Subject: [PATCH 407/667] Add new files.

---
 libpopt.vers |  38 ++++++++++++++
 poptint.c    | 142 +++++++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 180 insertions(+)
 create mode 100644 libpopt.vers
 create mode 100644 poptint.c

diff --git a/libpopt.vers b/libpopt.vers
new file mode 100644
index 0000000..2b69faa
--- /dev/null
+++ b/libpopt.vers
@@ -0,0 +1,38 @@
+LIBPOPT_0
+{
+  global:
+    findProgramPath;
+    _fini;
+    _init;
+    poptAddAlias;
+    poptAddItem;
+    poptAliasOptions;
+    poptBadOption;
+    poptConfigFileToString;
+    poptDupArgv;
+    poptFreeContext;
+    poptGetArg;
+    poptGetArgs;
+    poptGetContext;
+    poptGetInvocationName;
+    poptGetNextOpt;
+    poptGetOptArg;
+    poptHelpOptions;
+    poptHelpOptionsI18N;
+    poptParseArgvString;
+    poptPeekArg;
+    poptPrintHelp;
+    poptPrintUsage;
+    poptReadConfigFile;
+    poptReadDefaultConfig;
+    poptResetContext;
+    poptSaveInt;
+    poptSaveLong;
+    poptSetExecPath;
+    poptSetOtherOptionHelp;
+    poptStrerror;
+    poptStrippedArgv;
+    poptStuffArgs;
+  local:
+    *;
+};
diff --git a/poptint.c b/poptint.c
new file mode 100644
index 0000000..36999e7
--- /dev/null
+++ b/poptint.c
@@ -0,0 +1,142 @@
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
+#include <stdio.h>
+#include <stdarg.h>
+#include <errno.h>
+#include <iconv.h>
+#ifdef HAVE_LANGINFO_H
+#include <langinfo.h>
+#endif
+
+#include "system.h"
+#include "poptint.h"
+
+#define STD_VFPRINTF(stream, format, args, retval) \
+  va_start ((args), (format)); \
+  (retval) = vfprintf ((stream), (format), (args)); \
+  va_end ((args));
+
+static char *
+strdup_locale_from_utf8 (char *buffer)
+{
+  char *codeset = NULL;
+  char *pout = NULL, *dest_str;
+  iconv_t fd;
+  int ib, ob, dest_size;
+  int done, is_error;
+  size_t err, used;
+
+  if (!buffer)
+    return NULL;
+
+#ifdef HAVE_LANGINFO_H
+  codeset = nl_langinfo (CODESET);
+#endif
+
+  if (codeset &&
+      strcmp (codeset, "UTF-8") &&
+      (fd = iconv_open (codeset, "UTF-8")) != (iconv_t)-1) {
+    char *pin = buffer;
+    char *shift_pin = NULL;
+
+    iconv (fd, NULL, (size_t*)&ib, &pout, (size_t*)&ob);
+    ib = strlen (buffer);
+    dest_size = ob = ib;
+    dest_str = pout = malloc ((dest_size + 1) * sizeof (char));
+    done = is_error = 0;
+    while (!done && !is_error) {
+      err = iconv (fd, (const char**)&pin, (size_t*)&ib, &pout, (size_t*)&ob);
+
+      if (err == (size_t)-1) {
+        switch (errno) {
+        case EINVAL:
+          done = 1;
+          break;
+        case E2BIG:
+          used = pout - dest_str;
+          dest_size *= 2;
+          dest_str = realloc (dest_str, (dest_size + 1) * sizeof (char));
+          pout = dest_str + used;
+          ob = dest_size - used;
+          break;
+        case EILSEQ:
+          is_error = 1;
+          break;
+        default:
+          is_error = 1;
+          break;
+        }
+      } else {
+        if (!shift_pin) {
+          shift_pin = pin;
+          pin = NULL;
+          ib = 0;
+        } else {
+          done = 1;
+        }
+      }
+    }
+    iconv_close (fd);
+    *pout = '\0';
+    dest_str = strdup (dest_str);
+  } else {
+    dest_str = strdup (buffer);
+  }
+
+  return dest_str;
+}
+
+static char *
+strdup_vprintf (const char *format, va_list ap)
+{
+  char *buffer = NULL;
+  char c;
+
+  buffer = calloc (sizeof (char), vsnprintf (&c, 1, format, ap) + 1);
+  vsprintf (buffer, format, ap);
+
+  return buffer;
+}
+
+char *
+POPT_prev_char (const char *str)
+{
+  char *p = (char*)str;
+
+  while (1) {
+    p--;
+    if ((*p & 0xc0) != 0x80)
+      return (char *)p;
+  }
+}
+
+int
+POPT_fprintf (FILE* stream, const char *format, ...)
+{
+  int retval = 0;
+  va_list args;
+  char *buffer = NULL;
+  char *locale_str = NULL;
+
+  va_start (args, format);
+  buffer = strdup_vprintf (format, args);
+  va_end (args);
+
+  locale_str = strdup_locale_from_utf8 (buffer);
+  if (locale_str) {
+    retval = fprintf (stream, "%s", locale_str);
+    free (locale_str);
+  } else {
+    fprintf (stderr, POPT_WARNING "%s\n", "Invalid UTF-8");
+    retval = fprintf (stream, "%s", buffer);
+  }
+  free (buffer);
+
+  return retval;
+
+}
+
+#undef STD_VFPRINTF
+
-- 
Gitee


From f9486c0a20127dcc72d586c5c9d7b9fd25fecdc9 Mon Sep 17 00:00:00 2001
From: Jeff Johnson <n3npq@mac.com>
Date: Wed, 30 May 2007 02:45:46 +0000
Subject: [PATCH 408/667] Blue print HEAD against rpm-4_5 branch.

---
 .splintrc              |   6 +-
 config.rpath           | 614 +++++++++++++++++++++++++++++++++++++++++
 po/.cvsignore          |   1 +
 po/Makevars            |  41 +++
 po/Rules-quot          |  47 ++++
 po/boldquot.sed        |  10 +
 po/en@boldquot.header  |  25 ++
 po/en@quot.header      |  22 ++
 po/insert-header.sin   |  23 ++
 po/quot.sed            |   6 +
 po/remove-potcdate.sed |  11 +
 po/remove-potcdate.sin |  19 ++
 12 files changed, 821 insertions(+), 4 deletions(-)
 create mode 100755 config.rpath
 create mode 100644 po/Makevars
 create mode 100644 po/Rules-quot
 create mode 100644 po/boldquot.sed
 create mode 100644 po/en@boldquot.header
 create mode 100644 po/en@quot.header
 create mode 100644 po/insert-header.sin
 create mode 100644 po/quot.sed
 create mode 100644 po/remove-potcdate.sed
 create mode 100644 po/remove-potcdate.sin

diff --git a/.splintrc b/.splintrc
index e027765..ffc264c 100644
--- a/.splintrc
+++ b/.splintrc
@@ -18,7 +18,6 @@
 # --- +partial artifacts
 
 # --- not-yet at strict level
--bitwisesigned		# 75
 -elseifcomplete		# 18
 -exportfcn		# 25
 -ifblock		# 202
@@ -39,6 +38,5 @@
 
 # --- not-yet at standard level
 -boolops		# 112
--predboolint		# 30
-+charint		# 3
-+ignorequals		# 13
+-predboolint		# 38
++ignorequals		# 17
diff --git a/config.rpath b/config.rpath
new file mode 100755
index 0000000..c492a93
--- /dev/null
+++ b/config.rpath
@@ -0,0 +1,614 @@
+#! /bin/sh
+# Output a system dependent set of variables, describing how to set the
+# run time search path of shared libraries in an executable.
+#
+#   Copyright 1996-2006 Free Software Foundation, Inc.
+#   Taken from GNU libtool, 2001
+#   Originally by Gordon Matzigkeit <gord@gnu.ai.mit.edu>, 1996
+#
+#   This file is free software; the Free Software Foundation gives
+#   unlimited permission to copy and/or distribute it, with or without
+#   modifications, as long as this notice is preserved.
+#
+# The first argument passed to this file is the canonical host specification,
+#    CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM
+# or
+#    CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM
+# The environment variables CC, GCC, LDFLAGS, LD, with_gnu_ld
+# should be set by the caller.
+#
+# The set of defined variables is at the end of this script.
+
+# Known limitations:
+# - On IRIX 6.5 with CC="cc", the run time search patch must not be longer
+#   than 256 bytes, otherwise the compiler driver will dump core. The only
+#   known workaround is to choose shorter directory names for the build
+#   directory and/or the installation directory.
+
+# All known linkers require a `.a' archive for static linking (except MSVC,
+# which needs '.lib').
+libext=a
+shrext=.so
+
+host="$1"
+host_cpu=`echo "$host" | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
+host_vendor=`echo "$host" | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
+host_os=`echo "$host" | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
+
+# Code taken from libtool.m4's _LT_CC_BASENAME.
+
+for cc_temp in $CC""; do
+  case $cc_temp in
+    compile | *[\\/]compile | ccache | *[\\/]ccache ) ;;
+    distcc | *[\\/]distcc | purify | *[\\/]purify ) ;;
+    \-*) ;;
+    *) break;;
+  esac
+done
+cc_basename=`echo "$cc_temp" | sed -e 's%^.*/%%'`
+
+# Code taken from libtool.m4's AC_LIBTOOL_PROG_COMPILER_PIC.
+
+wl=
+if test "$GCC" = yes; then
+  wl='-Wl,'
+else
+  case "$host_os" in
+    aix*)
+      wl='-Wl,'
+      ;;
+    darwin*)
+      case $cc_basename in
+        xlc*)
+          wl='-Wl,'
+          ;;
+      esac
+      ;;
+    mingw* | pw32* | os2*)
+      ;;
+    hpux9* | hpux10* | hpux11*)
+      wl='-Wl,'
+      ;;
+    irix5* | irix6* | nonstopux*)
+      wl='-Wl,'
+      ;;
+    newsos6)
+      ;;
+    linux*)
+      case $cc_basename in
+        icc* | ecc*)
+          wl='-Wl,'
+          ;;
+        pgcc | pgf77 | pgf90)
+          wl='-Wl,'
+          ;;
+        ccc*)
+          wl='-Wl,'
+          ;;
+        como)
+          wl='-lopt='
+          ;;
+        *)
+          case `$CC -V 2>&1 | sed 5q` in
+            *Sun\ C*)
+              wl='-Wl,'
+              ;;
+          esac
+          ;;
+      esac
+      ;;
+    osf3* | osf4* | osf5*)
+      wl='-Wl,'
+      ;;
+    sco3.2v5*)
+      ;;
+    solaris*)
+      wl='-Wl,'
+      ;;
+    sunos4*)
+      wl='-Qoption ld '
+      ;;
+    sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*)
+      wl='-Wl,'
+      ;;
+    sysv4*MP*)
+      ;;
+    unicos*)
+      wl='-Wl,'
+      ;;
+    uts4*)
+      ;;
+  esac
+fi
+
+# Code taken from libtool.m4's AC_LIBTOOL_PROG_LD_SHLIBS.
+
+hardcode_libdir_flag_spec=
+hardcode_libdir_separator=
+hardcode_direct=no
+hardcode_minus_L=no
+
+case "$host_os" in
+  cygwin* | mingw* | pw32*)
+    # FIXME: the MSVC++ port hasn't been tested in a loooong time
+    # When not using gcc, we currently assume that we are using
+    # Microsoft Visual C++.
+    if test "$GCC" != yes; then
+      with_gnu_ld=no
+    fi
+    ;;
+  interix*)
+    # we just hope/assume this is gcc and not c89 (= MSVC++)
+    with_gnu_ld=yes
+    ;;
+  openbsd*)
+    with_gnu_ld=no
+    ;;
+esac
+
+ld_shlibs=yes
+if test "$with_gnu_ld" = yes; then
+  # Set some defaults for GNU ld with shared library support. These
+  # are reset later if shared libraries are not supported. Putting them
+  # here allows them to be overridden if necessary.
+  # Unlike libtool, we use -rpath here, not --rpath, since the documented
+  # option of GNU ld is called -rpath, not --rpath.
+  hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
+  case "$host_os" in
+    aix3* | aix4* | aix5*)
+      # On AIX/PPC, the GNU linker is very broken
+      if test "$host_cpu" != ia64; then
+        ld_shlibs=no
+      fi
+      ;;
+    amigaos*)
+      hardcode_libdir_flag_spec='-L$libdir'
+      hardcode_minus_L=yes
+      # Samuel A. Falvo II <kc5tja@dolphin.openprojects.net> reports
+      # that the semantics of dynamic libraries on AmigaOS, at least up
+      # to version 4, is to share data among multiple programs linked
+      # with the same dynamic library.  Since this doesn't match the
+      # behavior of shared libraries on other platforms, we cannot use
+      # them.
+      ld_shlibs=no
+      ;;
+    beos*)
+      if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
+        :
+      else
+        ld_shlibs=no
+      fi
+      ;;
+    cygwin* | mingw* | pw32*)
+      # hardcode_libdir_flag_spec is actually meaningless, as there is
+      # no search path for DLLs.
+      hardcode_libdir_flag_spec='-L$libdir'
+      if $LD --help 2>&1 | grep 'auto-import' > /dev/null; then
+        :
+      else
+        ld_shlibs=no
+      fi
+      ;;
+    interix3*)
+      hardcode_direct=no
+      hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
+      ;;
+    linux*)
+      if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
+        :
+      else
+        ld_shlibs=no
+      fi
+      ;;
+    netbsd*)
+      ;;
+    solaris*)
+      if $LD -v 2>&1 | grep 'BFD 2\.8' > /dev/null; then
+        ld_shlibs=no
+      elif $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
+        :
+      else
+        ld_shlibs=no
+      fi
+      ;;
+    sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX*)
+      case `$LD -v 2>&1` in
+        *\ [01].* | *\ 2.[0-9].* | *\ 2.1[0-5].*)
+          ld_shlibs=no
+          ;;
+        *)
+          if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
+            hardcode_libdir_flag_spec='`test -z "$SCOABSPATH" && echo ${wl}-rpath,$libdir`'
+          else
+            ld_shlibs=no
+          fi
+          ;;
+      esac
+      ;;
+    sunos4*)
+      hardcode_direct=yes
+      ;;
+    *)
+      if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
+        :
+      else
+        ld_shlibs=no
+      fi
+      ;;
+  esac
+  if test "$ld_shlibs" = no; then
+    hardcode_libdir_flag_spec=
+  fi
+else
+  case "$host_os" in
+    aix3*)
+      # Note: this linker hardcodes the directories in LIBPATH if there
+      # are no directories specified by -L.
+      hardcode_minus_L=yes
+      if test "$GCC" = yes; then
+        # Neither direct hardcoding nor static linking is supported with a
+        # broken collect2.
+        hardcode_direct=unsupported
+      fi
+      ;;
+    aix4* | aix5*)
+      if test "$host_cpu" = ia64; then
+        # On IA64, the linker does run time linking by default, so we don't
+        # have to do anything special.
+        aix_use_runtimelinking=no
+      else
+        aix_use_runtimelinking=no
+        # Test if we are trying to use run time linking or normal
+        # AIX style linking. If -brtl is somewhere in LDFLAGS, we
+        # need to do runtime linking.
+        case $host_os in aix4.[23]|aix4.[23].*|aix5*)
+          for ld_flag in $LDFLAGS; do
+            if (test $ld_flag = "-brtl" || test $ld_flag = "-Wl,-brtl"); then
+              aix_use_runtimelinking=yes
+              break
+            fi
+          done
+          ;;
+        esac
+      fi
+      hardcode_direct=yes
+      hardcode_libdir_separator=':'
+      if test "$GCC" = yes; then
+        case $host_os in aix4.[012]|aix4.[012].*)
+          collect2name=`${CC} -print-prog-name=collect2`
+          if test -f "$collect2name" && \
+            strings "$collect2name" | grep resolve_lib_name >/dev/null
+          then
+            # We have reworked collect2
+            hardcode_direct=yes
+          else
+            # We have old collect2
+            hardcode_direct=unsupported
+            hardcode_minus_L=yes
+            hardcode_libdir_flag_spec='-L$libdir'
+            hardcode_libdir_separator=
+          fi
+          ;;
+        esac
+      fi
+      # Begin _LT_AC_SYS_LIBPATH_AIX.
+      echo 'int main () { return 0; }' > conftest.c
+      ${CC} ${LDFLAGS} conftest.c -o conftest
+      aix_libpath=`dump -H conftest 2>/dev/null | sed -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0  *\(.*\)$/\1/; p; }
+}'`
+      if test -z "$aix_libpath"; then
+        aix_libpath=`dump -HX64 conftest 2>/dev/null | sed -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0  *\(.*\)$/\1/; p; }
+}'`
+      fi
+      if test -z "$aix_libpath"; then
+        aix_libpath="/usr/lib:/lib"
+      fi
+      rm -f conftest.c conftest
+      # End _LT_AC_SYS_LIBPATH_AIX.
+      if test "$aix_use_runtimelinking" = yes; then
+        hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath"
+      else
+        if test "$host_cpu" = ia64; then
+          hardcode_libdir_flag_spec='${wl}-R $libdir:/usr/lib:/lib'
+        else
+          hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath"
+        fi
+      fi
+      ;;
+    amigaos*)
+      hardcode_libdir_flag_spec='-L$libdir'
+      hardcode_minus_L=yes
+      # see comment about different semantics on the GNU ld section
+      ld_shlibs=no
+      ;;
+    bsdi[45]*)
+      ;;
+    cygwin* | mingw* | pw32*)
+      # When not using gcc, we currently assume that we are using
+      # Microsoft Visual C++.
+      # hardcode_libdir_flag_spec is actually meaningless, as there is
+      # no search path for DLLs.
+      hardcode_libdir_flag_spec=' '
+      libext=lib
+      ;;
+    darwin* | rhapsody*)
+      hardcode_direct=no
+      if test "$GCC" = yes ; then
+        :
+      else
+        case $cc_basename in
+          xlc*)
+            ;;
+          *)
+            ld_shlibs=no
+            ;;
+        esac
+      fi
+      ;;
+    dgux*)
+      hardcode_libdir_flag_spec='-L$libdir'
+      ;;
+    freebsd1*)
+      ld_shlibs=no
+      ;;
+    freebsd2.2*)
+      hardcode_libdir_flag_spec='-R$libdir'
+      hardcode_direct=yes
+      ;;
+    freebsd2*)
+      hardcode_direct=yes
+      hardcode_minus_L=yes
+      ;;
+    freebsd* | kfreebsd*-gnu | dragonfly*)
+      hardcode_libdir_flag_spec='-R$libdir'
+      hardcode_direct=yes
+      ;;
+    hpux9*)
+      hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir'
+      hardcode_libdir_separator=:
+      hardcode_direct=yes
+      # hardcode_minus_L: Not really in the search PATH,
+      # but as the default location of the library.
+      hardcode_minus_L=yes
+      ;;
+    hpux10*)
+      if test "$with_gnu_ld" = no; then
+        hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir'
+        hardcode_libdir_separator=:
+        hardcode_direct=yes
+        # hardcode_minus_L: Not really in the search PATH,
+        # but as the default location of the library.
+        hardcode_minus_L=yes
+      fi
+      ;;
+    hpux11*)
+      if test "$with_gnu_ld" = no; then
+        hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir'
+        hardcode_libdir_separator=:
+        case $host_cpu in
+          hppa*64*|ia64*)
+            hardcode_direct=no
+            ;;
+          *)
+            hardcode_direct=yes
+            # hardcode_minus_L: Not really in the search PATH,
+            # but as the default location of the library.
+            hardcode_minus_L=yes
+            ;;
+        esac
+      fi
+      ;;
+    irix5* | irix6* | nonstopux*)
+      hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
+      hardcode_libdir_separator=:
+      ;;
+    netbsd*)
+      hardcode_libdir_flag_spec='-R$libdir'
+      hardcode_direct=yes
+      ;;
+    newsos6)
+      hardcode_direct=yes
+      hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
+      hardcode_libdir_separator=:
+      ;;
+    openbsd*)
+      hardcode_direct=yes
+      if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
+        hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
+      else
+        case "$host_os" in
+          openbsd[01].* | openbsd2.[0-7] | openbsd2.[0-7].*)
+            hardcode_libdir_flag_spec='-R$libdir'
+            ;;
+          *)
+            hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
+            ;;
+        esac
+      fi
+      ;;
+    os2*)
+      hardcode_libdir_flag_spec='-L$libdir'
+      hardcode_minus_L=yes
+      ;;
+    osf3*)
+      hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
+      hardcode_libdir_separator=:
+      ;;
+    osf4* | osf5*)
+      if test "$GCC" = yes; then
+        hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
+      else
+        # Both cc and cxx compiler support -rpath directly
+        hardcode_libdir_flag_spec='-rpath $libdir'
+      fi
+      hardcode_libdir_separator=:
+      ;;
+    solaris*)
+      hardcode_libdir_flag_spec='-R$libdir'
+      ;;
+    sunos4*)
+      hardcode_libdir_flag_spec='-L$libdir'
+      hardcode_direct=yes
+      hardcode_minus_L=yes
+      ;;
+    sysv4)
+      case $host_vendor in
+        sni)
+          hardcode_direct=yes # is this really true???
+          ;;
+        siemens)
+          hardcode_direct=no
+          ;;
+        motorola)
+          hardcode_direct=no #Motorola manual says yes, but my tests say they lie
+          ;;
+      esac
+      ;;
+    sysv4.3*)
+      ;;
+    sysv4*MP*)
+      if test -d /usr/nec; then
+        ld_shlibs=yes
+      fi
+      ;;
+    sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[01].[10]* | unixware7*)
+      ;;
+    sysv5* | sco3.2v5* | sco5v6*)
+      hardcode_libdir_flag_spec='`test -z "$SCOABSPATH" && echo ${wl}-R,$libdir`'
+      hardcode_libdir_separator=':'
+      ;;
+    uts4*)
+      hardcode_libdir_flag_spec='-L$libdir'
+      ;;
+    *)
+      ld_shlibs=no
+      ;;
+  esac
+fi
+
+# Check dynamic linker characteristics
+# Code taken from libtool.m4's AC_LIBTOOL_SYS_DYNAMIC_LINKER.
+libname_spec='lib$name'
+case "$host_os" in
+  aix3*)
+    ;;
+  aix4* | aix5*)
+    ;;
+  amigaos*)
+    ;;
+  beos*)
+    ;;
+  bsdi[45]*)
+    ;;
+  cygwin* | mingw* | pw32*)
+    shrext=.dll
+    ;;
+  darwin* | rhapsody*)
+    shrext=.dylib
+    ;;
+  dgux*)
+    ;;
+  freebsd1*)
+    ;;
+  kfreebsd*-gnu)
+    ;;
+  freebsd* | dragonfly*)
+    ;;
+  gnu*)
+    ;;
+  hpux9* | hpux10* | hpux11*)
+    case $host_cpu in
+      ia64*)
+        shrext=.so
+        ;;
+      hppa*64*)
+        shrext=.sl
+        ;;
+      *)
+        shrext=.sl
+        ;;
+    esac
+    ;;
+  interix3*)
+    ;;
+  irix5* | irix6* | nonstopux*)
+    case "$host_os" in
+      irix5* | nonstopux*)
+        libsuff= shlibsuff=
+        ;;
+      *)
+        case $LD in
+          *-32|*"-32 "|*-melf32bsmip|*"-melf32bsmip ") libsuff= shlibsuff= ;;
+          *-n32|*"-n32 "|*-melf32bmipn32|*"-melf32bmipn32 ") libsuff=32 shlibsuff=N32 ;;
+          *-64|*"-64 "|*-melf64bmip|*"-melf64bmip ") libsuff=64 shlibsuff=64 ;;
+          *) libsuff= shlibsuff= ;;
+        esac
+        ;;
+    esac
+    ;;
+  linux*oldld* | linux*aout* | linux*coff*)
+    ;;
+  linux*)
+    ;;
+  knetbsd*-gnu)
+    ;;
+  netbsd*)
+    ;;
+  newsos6)
+    ;;
+  nto-qnx*)
+    ;;
+  openbsd*)
+    ;;
+  os2*)
+    libname_spec='$name'
+    shrext=.dll
+    ;;
+  osf3* | osf4* | osf5*)
+    ;;
+  solaris*)
+    ;;
+  sunos4*)
+    ;;
+  sysv4 | sysv4.3*)
+    ;;
+  sysv4*MP*)
+    ;;
+  sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*)
+    ;;
+  uts4*)
+    ;;
+esac
+
+sed_quote_subst='s/\(["`$\\]\)/\\\1/g'
+escaped_wl=`echo "X$wl" | sed -e 's/^X//' -e "$sed_quote_subst"`
+shlibext=`echo "$shrext" | sed -e 's,^\.,,'`
+escaped_hardcode_libdir_flag_spec=`echo "X$hardcode_libdir_flag_spec" | sed -e 's/^X//' -e "$sed_quote_subst"`
+
+LC_ALL=C sed -e 's/^\([a-zA-Z0-9_]*\)=/acl_cv_\1=/' <<EOF
+
+# How to pass a linker flag through the compiler.
+wl="$escaped_wl"
+
+# Static library suffix (normally "a").
+libext="$libext"
+
+# Shared library suffix (normally "so").
+shlibext="$shlibext"
+
+# Flag to hardcode \$libdir into a binary during linking.
+# This must work even if \$libdir does not exist.
+hardcode_libdir_flag_spec="$escaped_hardcode_libdir_flag_spec"
+
+# Whether we need a single -rpath flag with a separated argument.
+hardcode_libdir_separator="$hardcode_libdir_separator"
+
+# Set to yes if using DIR/libNAME.so during linking hardcodes DIR into the
+# resulting binary.
+hardcode_direct="$hardcode_direct"
+
+# Set to yes if using the -LDIR flag during linking hardcodes DIR into the
+# resulting binary.
+hardcode_minus_L="$hardcode_minus_L"
+
+EOF
diff --git a/po/.cvsignore b/po/.cvsignore
index 557ce8d..6cdefee 100644
--- a/po/.cvsignore
+++ b/po/.cvsignore
@@ -2,6 +2,7 @@ Makefile
 Makefile.in
 POTFILES
 stamp-cat-id
+stamp-po
 cat-id-tbl.c
 *.mo
 *.gmo
diff --git a/po/Makevars b/po/Makevars
new file mode 100644
index 0000000..3e0de10
--- /dev/null
+++ b/po/Makevars
@@ -0,0 +1,41 @@
+# Makefile variables for PO directory in any package using GNU gettext.
+
+# Usually the message domain is the same as the package name.
+DOMAIN = $(PACKAGE)
+
+# These two variables depend on the location of this directory.
+subdir = po
+top_builddir = ..
+
+# These options get passed to xgettext.
+XGETTEXT_OPTIONS = --keyword=_ --keyword=N_ --keyword=POPT_
+
+# This is the copyright holder that gets inserted into the header of the
+# $(DOMAIN).pot file.  Set this to the copyright holder of the surrounding
+# package.  (Note that the msgstr strings, extracted from the package's
+# sources, belong to the copyright holder of the package.)  Translators are
+# expected to transfer the copyright for their translations to this person
+# or entity, or to disclaim their copyright.  The empty string stands for
+# the public domain; in this case the translators are expected to disclaim
+# their copyright.
+COPYRIGHT_HOLDER =
+
+# This is the email address or URL to which the translators shall report
+# bugs in the untranslated strings:
+# - Strings which are not entire sentences, see the maintainer guidelines
+#   in the GNU gettext documentation, section 'Preparing Strings'.
+# - Strings which use unclear terms or require additional context to be
+#   understood.
+# - Strings which make invalid assumptions about notation of date, time or
+#   money.
+# - Pluralisation problems.
+# - Incorrect English spelling.
+# - Incorrect formatting.
+# It can be your email address, or a mailing list address where translators
+# can write to without being subscribed, or the URL of a web page through
+# which the translators can contact you.
+MSGID_BUGS_ADDRESS = <rpm-devel@lists.dulug.duke.edu>
+
+# This is the list of locale categories, beyond LC_MESSAGES, for which the
+# message catalogs shall be used.  It is usually empty.
+EXTRA_LOCALE_CATEGORIES =
diff --git a/po/Rules-quot b/po/Rules-quot
new file mode 100644
index 0000000..9c2a995
--- /dev/null
+++ b/po/Rules-quot
@@ -0,0 +1,47 @@
+# Special Makefile rules for English message catalogs with quotation marks.
+
+DISTFILES.common.extra1 = quot.sed boldquot.sed en@quot.header en@boldquot.header insert-header.sin Rules-quot
+
+.SUFFIXES: .insert-header .po-update-en
+
+en@quot.po-create:
+	$(MAKE) en@quot.po-update
+en@boldquot.po-create:
+	$(MAKE) en@boldquot.po-update
+
+en@quot.po-update: en@quot.po-update-en
+en@boldquot.po-update: en@boldquot.po-update-en
+
+.insert-header.po-update-en:
+	@lang=`echo $@ | sed -e 's/\.po-update-en$$//'`; \
+	if test "$(PACKAGE)" = "gettext"; then PATH=`pwd`/../src:$$PATH; GETTEXTLIBDIR=`cd $(top_srcdir)/src && pwd`; export GETTEXTLIBDIR; fi; \
+	tmpdir=`pwd`; \
+	echo "$$lang:"; \
+	ll=`echo $$lang | sed -e 's/@.*//'`; \
+	LC_ALL=C; export LC_ALL; \
+	cd $(srcdir); \
+	if $(MSGINIT) -i $(DOMAIN).pot --no-translator -l $$ll -o - 2>/dev/null | sed -f $$tmpdir/$$lang.insert-header | $(MSGCONV) -t UTF-8 | $(MSGFILTER) sed -f `echo $$lang | sed -e 's/.*@//'`.sed 2>/dev/null > $$tmpdir/$$lang.new.po; then \
+	  if cmp $$lang.po $$tmpdir/$$lang.new.po >/dev/null 2>&1; then \
+	    rm -f $$tmpdir/$$lang.new.po; \
+	  else \
+	    if mv -f $$tmpdir/$$lang.new.po $$lang.po; then \
+	      :; \
+	    else \
+	      echo "creation of $$lang.po failed: cannot move $$tmpdir/$$lang.new.po to $$lang.po" 1>&2; \
+	      exit 1; \
+	    fi; \
+	  fi; \
+	else \
+	  echo "creation of $$lang.po failed!" 1>&2; \
+	  rm -f $$tmpdir/$$lang.new.po; \
+	fi
+
+en@quot.insert-header: insert-header.sin
+	sed -e '/^#/d' -e 's/HEADER/en@quot.header/g' $(srcdir)/insert-header.sin > en@quot.insert-header
+
+en@boldquot.insert-header: insert-header.sin
+	sed -e '/^#/d' -e 's/HEADER/en@boldquot.header/g' $(srcdir)/insert-header.sin > en@boldquot.insert-header
+
+mostlyclean: mostlyclean-quot
+mostlyclean-quot:
+	rm -f *.insert-header
diff --git a/po/boldquot.sed b/po/boldquot.sed
new file mode 100644
index 0000000..4b937aa
--- /dev/null
+++ b/po/boldquot.sed
@@ -0,0 +1,10 @@
+s/"\([^"]*\)"/“\1”/g
+s/`\([^`']*\)'/‘\1’/g
+s/ '\([^`']*\)' / ‘\1’ /g
+s/ '\([^`']*\)'$/ ‘\1’/g
+s/^'\([^`']*\)' /‘\1’ /g
+s/“”/""/g
+s/“/“/g
+s/”/”/g
+s/‘/‘/g
+s/’/’/g
diff --git a/po/en@boldquot.header b/po/en@boldquot.header
new file mode 100644
index 0000000..fedb6a0
--- /dev/null
+++ b/po/en@boldquot.header
@@ -0,0 +1,25 @@
+# All this catalog "translates" are quotation characters.
+# The msgids must be ASCII and therefore cannot contain real quotation
+# characters, only substitutes like grave accent (0x60), apostrophe (0x27)
+# and double quote (0x22). These substitutes look strange; see
+# http://www.cl.cam.ac.uk/~mgk25/ucs/quotes.html
+#
+# This catalog translates grave accent (0x60) and apostrophe (0x27) to
+# left single quotation mark (U+2018) and right single quotation mark (U+2019).
+# It also translates pairs of apostrophe (0x27) to
+# left single quotation mark (U+2018) and right single quotation mark (U+2019)
+# and pairs of quotation mark (0x22) to
+# left double quotation mark (U+201C) and right double quotation mark (U+201D).
+#
+# When output to an UTF-8 terminal, the quotation characters appear perfectly.
+# When output to an ISO-8859-1 terminal, the single quotation marks are
+# transliterated to apostrophes (by iconv in glibc 2.2 or newer) or to
+# grave/acute accent (by libiconv), and the double quotation marks are
+# transliterated to 0x22.
+# When output to an ASCII terminal, the single quotation marks are
+# transliterated to apostrophes, and the double quotation marks are
+# transliterated to 0x22.
+#
+# This catalog furthermore displays the text between the quotation marks in
+# bold face, assuming the VT100/XTerm escape sequences.
+#
diff --git a/po/en@quot.header b/po/en@quot.header
new file mode 100644
index 0000000..a9647fc
--- /dev/null
+++ b/po/en@quot.header
@@ -0,0 +1,22 @@
+# All this catalog "translates" are quotation characters.
+# The msgids must be ASCII and therefore cannot contain real quotation
+# characters, only substitutes like grave accent (0x60), apostrophe (0x27)
+# and double quote (0x22). These substitutes look strange; see
+# http://www.cl.cam.ac.uk/~mgk25/ucs/quotes.html
+#
+# This catalog translates grave accent (0x60) and apostrophe (0x27) to
+# left single quotation mark (U+2018) and right single quotation mark (U+2019).
+# It also translates pairs of apostrophe (0x27) to
+# left single quotation mark (U+2018) and right single quotation mark (U+2019)
+# and pairs of quotation mark (0x22) to
+# left double quotation mark (U+201C) and right double quotation mark (U+201D).
+#
+# When output to an UTF-8 terminal, the quotation characters appear perfectly.
+# When output to an ISO-8859-1 terminal, the single quotation marks are
+# transliterated to apostrophes (by iconv in glibc 2.2 or newer) or to
+# grave/acute accent (by libiconv), and the double quotation marks are
+# transliterated to 0x22.
+# When output to an ASCII terminal, the single quotation marks are
+# transliterated to apostrophes, and the double quotation marks are
+# transliterated to 0x22.
+#
diff --git a/po/insert-header.sin b/po/insert-header.sin
new file mode 100644
index 0000000..b26de01
--- /dev/null
+++ b/po/insert-header.sin
@@ -0,0 +1,23 @@
+# Sed script that inserts the file called HEADER before the header entry.
+#
+# At each occurrence of a line starting with "msgid ", we execute the following
+# commands. At the first occurrence, insert the file. At the following
+# occurrences, do nothing. The distinction between the first and the following
+# occurrences is achieved by looking at the hold space.
+/^msgid /{
+x
+# Test if the hold space is empty.
+s/m/m/
+ta
+# Yes it was empty. First occurrence. Read the file.
+r HEADER
+# Output the file's contents by reading the next line. But don't lose the
+# current line while doing this.
+g
+N
+bb
+:a
+# The hold space was nonempty. Following occurrences. Do nothing.
+x
+:b
+}
diff --git a/po/quot.sed b/po/quot.sed
new file mode 100644
index 0000000..0122c46
--- /dev/null
+++ b/po/quot.sed
@@ -0,0 +1,6 @@
+s/"\([^"]*\)"/“\1”/g
+s/`\([^`']*\)'/‘\1’/g
+s/ '\([^`']*\)' / ‘\1’ /g
+s/ '\([^`']*\)'$/ ‘\1’/g
+s/^'\([^`']*\)' /‘\1’ /g
+s/“”/""/g
diff --git a/po/remove-potcdate.sed b/po/remove-potcdate.sed
new file mode 100644
index 0000000..edb38d7
--- /dev/null
+++ b/po/remove-potcdate.sed
@@ -0,0 +1,11 @@
+/^"POT-Creation-Date: .*"$/{
+x
+s/P/P/
+ta
+g
+d
+bb
+:a
+x
+:b
+}
diff --git a/po/remove-potcdate.sin b/po/remove-potcdate.sin
new file mode 100644
index 0000000..2436c49
--- /dev/null
+++ b/po/remove-potcdate.sin
@@ -0,0 +1,19 @@
+# Sed script that remove the POT-Creation-Date line in the header entry
+# from a POT file.
+#
+# The distinction between the first and the following occurrences of the
+# pattern is achieved by looking at the hold space.
+/^"POT-Creation-Date: .*"$/{
+x
+# Test if the hold space is empty.
+s/P/P/
+ta
+# Yes it was empty. First occurrence. Remove the line.
+g
+d
+bb
+:a
+# The hold space was nonempty. Following occurrences. Do nothing.
+x
+:b
+}
-- 
Gitee


From ee1bcade7095c615666b809db3062531d816d4d2 Mon Sep 17 00:00:00 2001
From: Arkadiusz Miskiewicz <arekm@pld-linux.org>
Date: Tue, 5 Jun 2007 19:44:28 +0000
Subject: [PATCH 409/667] Drop autogenerated or autocopied files. Run
 gettextize which copies needed files.

---
 autogen.sh             |   1 +
 config.rpath           | 614 -----------------------------------------
 configure.ac           |   2 +-
 intl/Makefile.in       | 562 -------------------------------------
 mkinstalldirs          |  40 ---
 po/.cvsignore          |   5 +
 po/ChangeLog           |  12 -
 po/Makefile.in.in      | 403 ---------------------------
 po/Rules-quot          |  47 ----
 po/boldquot.sed        |  10 -
 po/en@boldquot.header  |  25 --
 po/en@quot.header      |  22 --
 po/insert-header.sin   |  23 --
 po/quot.sed            |   6 -
 po/remove-potcdate.sed |  11 -
 po/remove-potcdate.sin |  19 --
 16 files changed, 7 insertions(+), 1795 deletions(-)
 delete mode 100755 config.rpath
 delete mode 100644 intl/Makefile.in
 delete mode 100755 mkinstalldirs
 delete mode 100644 po/ChangeLog
 delete mode 100644 po/Makefile.in.in
 delete mode 100644 po/Rules-quot
 delete mode 100644 po/boldquot.sed
 delete mode 100644 po/en@boldquot.header
 delete mode 100644 po/en@quot.header
 delete mode 100644 po/insert-header.sin
 delete mode 100644 po/quot.sed
 delete mode 100644 po/remove-potcdate.sed
 delete mode 100644 po/remove-potcdate.sin

diff --git a/autogen.sh b/autogen.sh
index cded311..93ed6e7 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -16,6 +16,7 @@ case $libtoolize in
 esac
 
 cd "$srcdir"
+gettextize --copy --force --intl
 $libtoolize --copy --force
 aclocal
 autoheader
diff --git a/config.rpath b/config.rpath
deleted file mode 100755
index c492a93..0000000
--- a/config.rpath
+++ /dev/null
@@ -1,614 +0,0 @@
-#! /bin/sh
-# Output a system dependent set of variables, describing how to set the
-# run time search path of shared libraries in an executable.
-#
-#   Copyright 1996-2006 Free Software Foundation, Inc.
-#   Taken from GNU libtool, 2001
-#   Originally by Gordon Matzigkeit <gord@gnu.ai.mit.edu>, 1996
-#
-#   This file is free software; the Free Software Foundation gives
-#   unlimited permission to copy and/or distribute it, with or without
-#   modifications, as long as this notice is preserved.
-#
-# The first argument passed to this file is the canonical host specification,
-#    CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM
-# or
-#    CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM
-# The environment variables CC, GCC, LDFLAGS, LD, with_gnu_ld
-# should be set by the caller.
-#
-# The set of defined variables is at the end of this script.
-
-# Known limitations:
-# - On IRIX 6.5 with CC="cc", the run time search patch must not be longer
-#   than 256 bytes, otherwise the compiler driver will dump core. The only
-#   known workaround is to choose shorter directory names for the build
-#   directory and/or the installation directory.
-
-# All known linkers require a `.a' archive for static linking (except MSVC,
-# which needs '.lib').
-libext=a
-shrext=.so
-
-host="$1"
-host_cpu=`echo "$host" | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
-host_vendor=`echo "$host" | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
-host_os=`echo "$host" | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
-
-# Code taken from libtool.m4's _LT_CC_BASENAME.
-
-for cc_temp in $CC""; do
-  case $cc_temp in
-    compile | *[\\/]compile | ccache | *[\\/]ccache ) ;;
-    distcc | *[\\/]distcc | purify | *[\\/]purify ) ;;
-    \-*) ;;
-    *) break;;
-  esac
-done
-cc_basename=`echo "$cc_temp" | sed -e 's%^.*/%%'`
-
-# Code taken from libtool.m4's AC_LIBTOOL_PROG_COMPILER_PIC.
-
-wl=
-if test "$GCC" = yes; then
-  wl='-Wl,'
-else
-  case "$host_os" in
-    aix*)
-      wl='-Wl,'
-      ;;
-    darwin*)
-      case $cc_basename in
-        xlc*)
-          wl='-Wl,'
-          ;;
-      esac
-      ;;
-    mingw* | pw32* | os2*)
-      ;;
-    hpux9* | hpux10* | hpux11*)
-      wl='-Wl,'
-      ;;
-    irix5* | irix6* | nonstopux*)
-      wl='-Wl,'
-      ;;
-    newsos6)
-      ;;
-    linux*)
-      case $cc_basename in
-        icc* | ecc*)
-          wl='-Wl,'
-          ;;
-        pgcc | pgf77 | pgf90)
-          wl='-Wl,'
-          ;;
-        ccc*)
-          wl='-Wl,'
-          ;;
-        como)
-          wl='-lopt='
-          ;;
-        *)
-          case `$CC -V 2>&1 | sed 5q` in
-            *Sun\ C*)
-              wl='-Wl,'
-              ;;
-          esac
-          ;;
-      esac
-      ;;
-    osf3* | osf4* | osf5*)
-      wl='-Wl,'
-      ;;
-    sco3.2v5*)
-      ;;
-    solaris*)
-      wl='-Wl,'
-      ;;
-    sunos4*)
-      wl='-Qoption ld '
-      ;;
-    sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*)
-      wl='-Wl,'
-      ;;
-    sysv4*MP*)
-      ;;
-    unicos*)
-      wl='-Wl,'
-      ;;
-    uts4*)
-      ;;
-  esac
-fi
-
-# Code taken from libtool.m4's AC_LIBTOOL_PROG_LD_SHLIBS.
-
-hardcode_libdir_flag_spec=
-hardcode_libdir_separator=
-hardcode_direct=no
-hardcode_minus_L=no
-
-case "$host_os" in
-  cygwin* | mingw* | pw32*)
-    # FIXME: the MSVC++ port hasn't been tested in a loooong time
-    # When not using gcc, we currently assume that we are using
-    # Microsoft Visual C++.
-    if test "$GCC" != yes; then
-      with_gnu_ld=no
-    fi
-    ;;
-  interix*)
-    # we just hope/assume this is gcc and not c89 (= MSVC++)
-    with_gnu_ld=yes
-    ;;
-  openbsd*)
-    with_gnu_ld=no
-    ;;
-esac
-
-ld_shlibs=yes
-if test "$with_gnu_ld" = yes; then
-  # Set some defaults for GNU ld with shared library support. These
-  # are reset later if shared libraries are not supported. Putting them
-  # here allows them to be overridden if necessary.
-  # Unlike libtool, we use -rpath here, not --rpath, since the documented
-  # option of GNU ld is called -rpath, not --rpath.
-  hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
-  case "$host_os" in
-    aix3* | aix4* | aix5*)
-      # On AIX/PPC, the GNU linker is very broken
-      if test "$host_cpu" != ia64; then
-        ld_shlibs=no
-      fi
-      ;;
-    amigaos*)
-      hardcode_libdir_flag_spec='-L$libdir'
-      hardcode_minus_L=yes
-      # Samuel A. Falvo II <kc5tja@dolphin.openprojects.net> reports
-      # that the semantics of dynamic libraries on AmigaOS, at least up
-      # to version 4, is to share data among multiple programs linked
-      # with the same dynamic library.  Since this doesn't match the
-      # behavior of shared libraries on other platforms, we cannot use
-      # them.
-      ld_shlibs=no
-      ;;
-    beos*)
-      if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
-        :
-      else
-        ld_shlibs=no
-      fi
-      ;;
-    cygwin* | mingw* | pw32*)
-      # hardcode_libdir_flag_spec is actually meaningless, as there is
-      # no search path for DLLs.
-      hardcode_libdir_flag_spec='-L$libdir'
-      if $LD --help 2>&1 | grep 'auto-import' > /dev/null; then
-        :
-      else
-        ld_shlibs=no
-      fi
-      ;;
-    interix3*)
-      hardcode_direct=no
-      hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
-      ;;
-    linux*)
-      if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
-        :
-      else
-        ld_shlibs=no
-      fi
-      ;;
-    netbsd*)
-      ;;
-    solaris*)
-      if $LD -v 2>&1 | grep 'BFD 2\.8' > /dev/null; then
-        ld_shlibs=no
-      elif $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
-        :
-      else
-        ld_shlibs=no
-      fi
-      ;;
-    sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX*)
-      case `$LD -v 2>&1` in
-        *\ [01].* | *\ 2.[0-9].* | *\ 2.1[0-5].*)
-          ld_shlibs=no
-          ;;
-        *)
-          if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
-            hardcode_libdir_flag_spec='`test -z "$SCOABSPATH" && echo ${wl}-rpath,$libdir`'
-          else
-            ld_shlibs=no
-          fi
-          ;;
-      esac
-      ;;
-    sunos4*)
-      hardcode_direct=yes
-      ;;
-    *)
-      if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
-        :
-      else
-        ld_shlibs=no
-      fi
-      ;;
-  esac
-  if test "$ld_shlibs" = no; then
-    hardcode_libdir_flag_spec=
-  fi
-else
-  case "$host_os" in
-    aix3*)
-      # Note: this linker hardcodes the directories in LIBPATH if there
-      # are no directories specified by -L.
-      hardcode_minus_L=yes
-      if test "$GCC" = yes; then
-        # Neither direct hardcoding nor static linking is supported with a
-        # broken collect2.
-        hardcode_direct=unsupported
-      fi
-      ;;
-    aix4* | aix5*)
-      if test "$host_cpu" = ia64; then
-        # On IA64, the linker does run time linking by default, so we don't
-        # have to do anything special.
-        aix_use_runtimelinking=no
-      else
-        aix_use_runtimelinking=no
-        # Test if we are trying to use run time linking or normal
-        # AIX style linking. If -brtl is somewhere in LDFLAGS, we
-        # need to do runtime linking.
-        case $host_os in aix4.[23]|aix4.[23].*|aix5*)
-          for ld_flag in $LDFLAGS; do
-            if (test $ld_flag = "-brtl" || test $ld_flag = "-Wl,-brtl"); then
-              aix_use_runtimelinking=yes
-              break
-            fi
-          done
-          ;;
-        esac
-      fi
-      hardcode_direct=yes
-      hardcode_libdir_separator=':'
-      if test "$GCC" = yes; then
-        case $host_os in aix4.[012]|aix4.[012].*)
-          collect2name=`${CC} -print-prog-name=collect2`
-          if test -f "$collect2name" && \
-            strings "$collect2name" | grep resolve_lib_name >/dev/null
-          then
-            # We have reworked collect2
-            hardcode_direct=yes
-          else
-            # We have old collect2
-            hardcode_direct=unsupported
-            hardcode_minus_L=yes
-            hardcode_libdir_flag_spec='-L$libdir'
-            hardcode_libdir_separator=
-          fi
-          ;;
-        esac
-      fi
-      # Begin _LT_AC_SYS_LIBPATH_AIX.
-      echo 'int main () { return 0; }' > conftest.c
-      ${CC} ${LDFLAGS} conftest.c -o conftest
-      aix_libpath=`dump -H conftest 2>/dev/null | sed -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0  *\(.*\)$/\1/; p; }
-}'`
-      if test -z "$aix_libpath"; then
-        aix_libpath=`dump -HX64 conftest 2>/dev/null | sed -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0  *\(.*\)$/\1/; p; }
-}'`
-      fi
-      if test -z "$aix_libpath"; then
-        aix_libpath="/usr/lib:/lib"
-      fi
-      rm -f conftest.c conftest
-      # End _LT_AC_SYS_LIBPATH_AIX.
-      if test "$aix_use_runtimelinking" = yes; then
-        hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath"
-      else
-        if test "$host_cpu" = ia64; then
-          hardcode_libdir_flag_spec='${wl}-R $libdir:/usr/lib:/lib'
-        else
-          hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath"
-        fi
-      fi
-      ;;
-    amigaos*)
-      hardcode_libdir_flag_spec='-L$libdir'
-      hardcode_minus_L=yes
-      # see comment about different semantics on the GNU ld section
-      ld_shlibs=no
-      ;;
-    bsdi[45]*)
-      ;;
-    cygwin* | mingw* | pw32*)
-      # When not using gcc, we currently assume that we are using
-      # Microsoft Visual C++.
-      # hardcode_libdir_flag_spec is actually meaningless, as there is
-      # no search path for DLLs.
-      hardcode_libdir_flag_spec=' '
-      libext=lib
-      ;;
-    darwin* | rhapsody*)
-      hardcode_direct=no
-      if test "$GCC" = yes ; then
-        :
-      else
-        case $cc_basename in
-          xlc*)
-            ;;
-          *)
-            ld_shlibs=no
-            ;;
-        esac
-      fi
-      ;;
-    dgux*)
-      hardcode_libdir_flag_spec='-L$libdir'
-      ;;
-    freebsd1*)
-      ld_shlibs=no
-      ;;
-    freebsd2.2*)
-      hardcode_libdir_flag_spec='-R$libdir'
-      hardcode_direct=yes
-      ;;
-    freebsd2*)
-      hardcode_direct=yes
-      hardcode_minus_L=yes
-      ;;
-    freebsd* | kfreebsd*-gnu | dragonfly*)
-      hardcode_libdir_flag_spec='-R$libdir'
-      hardcode_direct=yes
-      ;;
-    hpux9*)
-      hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir'
-      hardcode_libdir_separator=:
-      hardcode_direct=yes
-      # hardcode_minus_L: Not really in the search PATH,
-      # but as the default location of the library.
-      hardcode_minus_L=yes
-      ;;
-    hpux10*)
-      if test "$with_gnu_ld" = no; then
-        hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir'
-        hardcode_libdir_separator=:
-        hardcode_direct=yes
-        # hardcode_minus_L: Not really in the search PATH,
-        # but as the default location of the library.
-        hardcode_minus_L=yes
-      fi
-      ;;
-    hpux11*)
-      if test "$with_gnu_ld" = no; then
-        hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir'
-        hardcode_libdir_separator=:
-        case $host_cpu in
-          hppa*64*|ia64*)
-            hardcode_direct=no
-            ;;
-          *)
-            hardcode_direct=yes
-            # hardcode_minus_L: Not really in the search PATH,
-            # but as the default location of the library.
-            hardcode_minus_L=yes
-            ;;
-        esac
-      fi
-      ;;
-    irix5* | irix6* | nonstopux*)
-      hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
-      hardcode_libdir_separator=:
-      ;;
-    netbsd*)
-      hardcode_libdir_flag_spec='-R$libdir'
-      hardcode_direct=yes
-      ;;
-    newsos6)
-      hardcode_direct=yes
-      hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
-      hardcode_libdir_separator=:
-      ;;
-    openbsd*)
-      hardcode_direct=yes
-      if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
-        hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
-      else
-        case "$host_os" in
-          openbsd[01].* | openbsd2.[0-7] | openbsd2.[0-7].*)
-            hardcode_libdir_flag_spec='-R$libdir'
-            ;;
-          *)
-            hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
-            ;;
-        esac
-      fi
-      ;;
-    os2*)
-      hardcode_libdir_flag_spec='-L$libdir'
-      hardcode_minus_L=yes
-      ;;
-    osf3*)
-      hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
-      hardcode_libdir_separator=:
-      ;;
-    osf4* | osf5*)
-      if test "$GCC" = yes; then
-        hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
-      else
-        # Both cc and cxx compiler support -rpath directly
-        hardcode_libdir_flag_spec='-rpath $libdir'
-      fi
-      hardcode_libdir_separator=:
-      ;;
-    solaris*)
-      hardcode_libdir_flag_spec='-R$libdir'
-      ;;
-    sunos4*)
-      hardcode_libdir_flag_spec='-L$libdir'
-      hardcode_direct=yes
-      hardcode_minus_L=yes
-      ;;
-    sysv4)
-      case $host_vendor in
-        sni)
-          hardcode_direct=yes # is this really true???
-          ;;
-        siemens)
-          hardcode_direct=no
-          ;;
-        motorola)
-          hardcode_direct=no #Motorola manual says yes, but my tests say they lie
-          ;;
-      esac
-      ;;
-    sysv4.3*)
-      ;;
-    sysv4*MP*)
-      if test -d /usr/nec; then
-        ld_shlibs=yes
-      fi
-      ;;
-    sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[01].[10]* | unixware7*)
-      ;;
-    sysv5* | sco3.2v5* | sco5v6*)
-      hardcode_libdir_flag_spec='`test -z "$SCOABSPATH" && echo ${wl}-R,$libdir`'
-      hardcode_libdir_separator=':'
-      ;;
-    uts4*)
-      hardcode_libdir_flag_spec='-L$libdir'
-      ;;
-    *)
-      ld_shlibs=no
-      ;;
-  esac
-fi
-
-# Check dynamic linker characteristics
-# Code taken from libtool.m4's AC_LIBTOOL_SYS_DYNAMIC_LINKER.
-libname_spec='lib$name'
-case "$host_os" in
-  aix3*)
-    ;;
-  aix4* | aix5*)
-    ;;
-  amigaos*)
-    ;;
-  beos*)
-    ;;
-  bsdi[45]*)
-    ;;
-  cygwin* | mingw* | pw32*)
-    shrext=.dll
-    ;;
-  darwin* | rhapsody*)
-    shrext=.dylib
-    ;;
-  dgux*)
-    ;;
-  freebsd1*)
-    ;;
-  kfreebsd*-gnu)
-    ;;
-  freebsd* | dragonfly*)
-    ;;
-  gnu*)
-    ;;
-  hpux9* | hpux10* | hpux11*)
-    case $host_cpu in
-      ia64*)
-        shrext=.so
-        ;;
-      hppa*64*)
-        shrext=.sl
-        ;;
-      *)
-        shrext=.sl
-        ;;
-    esac
-    ;;
-  interix3*)
-    ;;
-  irix5* | irix6* | nonstopux*)
-    case "$host_os" in
-      irix5* | nonstopux*)
-        libsuff= shlibsuff=
-        ;;
-      *)
-        case $LD in
-          *-32|*"-32 "|*-melf32bsmip|*"-melf32bsmip ") libsuff= shlibsuff= ;;
-          *-n32|*"-n32 "|*-melf32bmipn32|*"-melf32bmipn32 ") libsuff=32 shlibsuff=N32 ;;
-          *-64|*"-64 "|*-melf64bmip|*"-melf64bmip ") libsuff=64 shlibsuff=64 ;;
-          *) libsuff= shlibsuff= ;;
-        esac
-        ;;
-    esac
-    ;;
-  linux*oldld* | linux*aout* | linux*coff*)
-    ;;
-  linux*)
-    ;;
-  knetbsd*-gnu)
-    ;;
-  netbsd*)
-    ;;
-  newsos6)
-    ;;
-  nto-qnx*)
-    ;;
-  openbsd*)
-    ;;
-  os2*)
-    libname_spec='$name'
-    shrext=.dll
-    ;;
-  osf3* | osf4* | osf5*)
-    ;;
-  solaris*)
-    ;;
-  sunos4*)
-    ;;
-  sysv4 | sysv4.3*)
-    ;;
-  sysv4*MP*)
-    ;;
-  sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*)
-    ;;
-  uts4*)
-    ;;
-esac
-
-sed_quote_subst='s/\(["`$\\]\)/\\\1/g'
-escaped_wl=`echo "X$wl" | sed -e 's/^X//' -e "$sed_quote_subst"`
-shlibext=`echo "$shrext" | sed -e 's,^\.,,'`
-escaped_hardcode_libdir_flag_spec=`echo "X$hardcode_libdir_flag_spec" | sed -e 's/^X//' -e "$sed_quote_subst"`
-
-LC_ALL=C sed -e 's/^\([a-zA-Z0-9_]*\)=/acl_cv_\1=/' <<EOF
-
-# How to pass a linker flag through the compiler.
-wl="$escaped_wl"
-
-# Static library suffix (normally "a").
-libext="$libext"
-
-# Shared library suffix (normally "so").
-shlibext="$shlibext"
-
-# Flag to hardcode \$libdir into a binary during linking.
-# This must work even if \$libdir does not exist.
-hardcode_libdir_flag_spec="$escaped_hardcode_libdir_flag_spec"
-
-# Whether we need a single -rpath flag with a separated argument.
-hardcode_libdir_separator="$hardcode_libdir_separator"
-
-# Set to yes if using DIR/libNAME.so during linking hardcodes DIR into the
-# resulting binary.
-hardcode_direct="$hardcode_direct"
-
-# Set to yes if using the -LDIR flag during linking hardcodes DIR into the
-# resulting binary.
-hardcode_minus_L="$hardcode_minus_L"
-
-EOF
diff --git a/configure.ac b/configure.ac
index 073d8e7..8d4cfcb 100755
--- a/configure.ac
+++ b/configure.ac
@@ -110,4 +110,4 @@ AC_DEFINE_UNQUOTED(POPT_SOURCE_PATH, "$POPT_SOURCE_PATH",
 	[Full path to popt top_srcdir.])
 AC_SUBST(POPT_SOURCE_PATH)
 
-AC_OUTPUT([Doxyfile Makefile po/Makefile.in intl/Makefile])
+AC_OUTPUT([Doxyfile Makefile])
diff --git a/intl/Makefile.in b/intl/Makefile.in
deleted file mode 100644
index 525922e..0000000
--- a/intl/Makefile.in
+++ /dev/null
@@ -1,562 +0,0 @@
-# Makefile for directory with message catalog handling library of GNU gettext
-# Copyright (C) 1995-1998, 2000-2006 Free Software Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify it
-# under the terms of the GNU Library General Public License as published
-# by the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# Library General Public License for more details.
-#
-# You should have received a copy of the GNU Library General Public
-# License along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
-# USA.
-
-PACKAGE = @PACKAGE@
-VERSION = @VERSION@
-
-SHELL = /bin/sh
-
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
-top_builddir = ..
-
-# The VPATH variables allows builds with $builddir != $srcdir, assuming a
-# 'make' program that supports VPATH (such as GNU make). This line is removed
-# by autoconf automatically when "$(srcdir)" = ".".
-# In this directory, the VPATH handling is particular:
-# 1. If INTL_LIBTOOL_SUFFIX_PREFIX is 'l' (indicating a build with libtool),
-#    the .c -> .lo rules carefully use $(srcdir), so that VPATH can be omitted.
-# 2. If PACKAGE = gettext-tools, VPATH _must_ be omitted, because otherwise
-#    'make' does the wrong thing if GNU gettext was configured with
-#    "./configure --srcdir=`pwd`", namely it gets confused by the .lo and .la
-#    files it finds in srcdir = ../../gettext-runtime/intl.
-VPATH = $(srcdir)
-
-prefix = @prefix@
-exec_prefix = @exec_prefix@
-transform = @program_transform_name@
-libdir = @libdir@
-includedir = @includedir@
-datarootdir = @datarootdir@
-datadir = @datadir@
-localedir = $(datadir)/locale
-gettextsrcdir = $(datadir)/gettext/intl
-aliaspath = $(localedir)
-subdir = intl
-
-INSTALL = @INSTALL@
-INSTALL_DATA = @INSTALL_DATA@
-
-# We use $(mkdir_p).
-# In automake <= 1.9.x, $(mkdir_p) is defined either as "mkdir -p --" or as
-# "$(mkinstalldirs)" or as "$(install_sh) -d". For these automake versions,
-# @install_sh@ does not start with $(SHELL), so we add it.
-# In automake >= 1.10, @mkdir_p@ is derived from ${MKDIR_P}, which is defined
-# either as "/path/to/mkdir -p" or ".../install-sh -c -d". For these automake
-# versions, $(mkinstalldirs) and $(install_sh) are unused.
-mkinstalldirs = $(SHELL) @install_sh@ -d
-install_sh = $(SHELL) @install_sh@
-MKDIR_P = @MKDIR_P@
-mkdir_p = @mkdir_p@
-
-l = @INTL_LIBTOOL_SUFFIX_PREFIX@
-
-AR = ar
-CC = @CC@
-LIBTOOL = @LIBTOOL@
-RANLIB = @RANLIB@
-YACC = @INTLBISON@ -y -d
-YFLAGS = --name-prefix=__gettext
-
-# -DBUILDING_LIBINTL: Change expansion of LIBINTL_DLL_EXPORTED macro.
-# -DBUILDING_DLL: Change expansion of RELOCATABLE_DLL_EXPORTED macro.
-DEFS = -DLOCALEDIR=\"$(localedir)\" -DLOCALE_ALIAS_PATH=\"$(aliaspath)\" \
--DLIBDIR=\"$(libdir)\" -DBUILDING_LIBINTL -DBUILDING_DLL -DIN_LIBINTL \
--DENABLE_RELOCATABLE=1 -DIN_LIBRARY -DINSTALLDIR=\"$(libdir)\" -DNO_XMALLOC \
--Dset_relocation_prefix=libintl_set_relocation_prefix \
--Drelocate=libintl_relocate \
--DDEPENDS_ON_LIBICONV=1 @DEFS@
-CPPFLAGS = @CPPFLAGS@
-CFLAGS = @CFLAGS@ @CFLAG_VISIBILITY@
-LDFLAGS = @LDFLAGS@ $(LDFLAGS_@WOE32DLL@)
-LDFLAGS_yes = -Wl,--export-all-symbols
-LDFLAGS_no =
-LIBS = @LIBS@
-
-COMPILE = $(CC) -c $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS) $(XCFLAGS)
-
-HEADERS = \
-  gmo.h \
-  gettextP.h \
-  hash-string.h \
-  loadinfo.h \
-  plural-exp.h \
-  eval-plural.h \
-  localcharset.h \
-  lock.h \
-  relocatable.h \
-  xsize.h \
-  printf-args.h printf-args.c \
-  printf-parse.h wprintf-parse.h printf-parse.c \
-  vasnprintf.h vasnwprintf.h vasnprintf.c \
-  os2compat.h \
-  libgnuintl.h.in
-SOURCES = \
-  bindtextdom.c \
-  dcgettext.c \
-  dgettext.c \
-  gettext.c \
-  finddomain.c \
-  hash-string.c \
-  loadmsgcat.c \
-  localealias.c \
-  textdomain.c \
-  l10nflist.c \
-  explodename.c \
-  dcigettext.c \
-  dcngettext.c \
-  dngettext.c \
-  ngettext.c \
-  plural.y \
-  plural-exp.c \
-  localcharset.c \
-  lock.c \
-  relocatable.c \
-  langprefs.c \
-  localename.c \
-  log.c \
-  printf.c \
-  version.c \
-  osdep.c \
-  os2compat.c \
-  intl-exports.c \
-  intl-compat.c
-OBJECTS = \
-  bindtextdom.$lo \
-  dcgettext.$lo \
-  dgettext.$lo \
-  gettext.$lo \
-  finddomain.$lo \
-  hash-string.$lo \
-  loadmsgcat.$lo \
-  localealias.$lo \
-  textdomain.$lo \
-  l10nflist.$lo \
-  explodename.$lo \
-  dcigettext.$lo \
-  dcngettext.$lo \
-  dngettext.$lo \
-  ngettext.$lo \
-  plural.$lo \
-  plural-exp.$lo \
-  localcharset.$lo \
-  lock.$lo \
-  relocatable.$lo \
-  langprefs.$lo \
-  localename.$lo \
-  log.$lo \
-  printf.$lo \
-  version.$lo \
-  osdep.$lo \
-  intl-compat.$lo
-DISTFILES.common = Makefile.in \
-config.charset locale.alias ref-add.sin ref-del.sin export.h \
-$(HEADERS) $(SOURCES)
-DISTFILES.generated = plural.c
-DISTFILES.normal = VERSION
-DISTFILES.gettext = COPYING.LIB-2.0 COPYING.LIB-2.1 libintl.glibc README.woe32
-DISTFILES.obsolete = xopen-msg.sed linux-msg.sed po2tbl.sed.in cat-compat.c \
-COPYING.LIB-2 gettext.h libgettext.h plural-eval.c libgnuintl.h \
-libgnuintl.h_vms Makefile.vms libgnuintl.h.msvc-static \
-libgnuintl.h.msvc-shared Makefile.msvc
-
-all: all-@USE_INCLUDED_LIBINTL@
-all-yes: libintl.$la libintl.h charset.alias ref-add.sed ref-del.sed
-all-no: all-no-@BUILD_INCLUDED_LIBINTL@
-all-no-yes: libgnuintl.$la
-all-no-no:
-
-libintl.a libgnuintl.a: $(OBJECTS)
-	rm -f $@
-	$(AR) cru $@ $(OBJECTS)
-	$(RANLIB) $@
-
-libintl.la libgnuintl.la: $(OBJECTS)
-	$(LIBTOOL) --mode=link \
-	  $(CC) $(CPPFLAGS) $(CFLAGS) $(XCFLAGS) $(LDFLAGS) -o $@ \
-	  $(OBJECTS) @LTLIBICONV@ @INTL_MACOSX_LIBS@ $(LIBS) @LTLIBTHREAD@ -lc \
-	  -version-info $(LTV_CURRENT):$(LTV_REVISION):$(LTV_AGE) \
-	  -rpath $(libdir) \
-	  -no-undefined
-
-# Libtool's library version information for libintl.
-# Before making a gettext release, the gettext maintainer must change this
-# according to the libtool documentation, section "Library interface versions".
-# Maintainers of other packages that include the intl directory must *not*
-# change these values.
-LTV_CURRENT=8
-LTV_REVISION=1
-LTV_AGE=0
-
-.SUFFIXES:
-.SUFFIXES: .c .y .o .lo .sin .sed
-
-.c.o:
-	$(COMPILE) $<
-
-.y.c:
-	$(YACC) $(YFLAGS) --output $@ $<
-	rm -f $*.h
-
-bindtextdom.lo: $(srcdir)/bindtextdom.c
-	$(LIBTOOL) --mode=compile $(COMPILE) $(srcdir)/bindtextdom.c
-dcgettext.lo: $(srcdir)/dcgettext.c
-	$(LIBTOOL) --mode=compile $(COMPILE) $(srcdir)/dcgettext.c
-dgettext.lo: $(srcdir)/dgettext.c
-	$(LIBTOOL) --mode=compile $(COMPILE) $(srcdir)/dgettext.c
-gettext.lo: $(srcdir)/gettext.c
-	$(LIBTOOL) --mode=compile $(COMPILE) $(srcdir)/gettext.c
-finddomain.lo: $(srcdir)/finddomain.c
-	$(LIBTOOL) --mode=compile $(COMPILE) $(srcdir)/finddomain.c
-hash-string.lo: $(srcdir)/hash-string.c
-	$(LIBTOOL) --mode=compile $(COMPILE) $(srcdir)/hash-string.c
-loadmsgcat.lo: $(srcdir)/loadmsgcat.c
-	$(LIBTOOL) --mode=compile $(COMPILE) $(srcdir)/loadmsgcat.c
-localealias.lo: $(srcdir)/localealias.c
-	$(LIBTOOL) --mode=compile $(COMPILE) $(srcdir)/localealias.c
-textdomain.lo: $(srcdir)/textdomain.c
-	$(LIBTOOL) --mode=compile $(COMPILE) $(srcdir)/textdomain.c
-l10nflist.lo: $(srcdir)/l10nflist.c
-	$(LIBTOOL) --mode=compile $(COMPILE) $(srcdir)/l10nflist.c
-explodename.lo: $(srcdir)/explodename.c
-	$(LIBTOOL) --mode=compile $(COMPILE) $(srcdir)/explodename.c
-dcigettext.lo: $(srcdir)/dcigettext.c
-	$(LIBTOOL) --mode=compile $(COMPILE) $(srcdir)/dcigettext.c
-dcngettext.lo: $(srcdir)/dcngettext.c
-	$(LIBTOOL) --mode=compile $(COMPILE) $(srcdir)/dcngettext.c
-dngettext.lo: $(srcdir)/dngettext.c
-	$(LIBTOOL) --mode=compile $(COMPILE) $(srcdir)/dngettext.c
-ngettext.lo: $(srcdir)/ngettext.c
-	$(LIBTOOL) --mode=compile $(COMPILE) $(srcdir)/ngettext.c
-plural.lo: $(srcdir)/plural.c
-	$(LIBTOOL) --mode=compile $(COMPILE) $(srcdir)/plural.c
-plural-exp.lo: $(srcdir)/plural-exp.c
-	$(LIBTOOL) --mode=compile $(COMPILE) $(srcdir)/plural-exp.c
-localcharset.lo: $(srcdir)/localcharset.c
-	$(LIBTOOL) --mode=compile $(COMPILE) $(srcdir)/localcharset.c
-lock.lo: $(srcdir)/lock.c
-	$(LIBTOOL) --mode=compile $(COMPILE) $(srcdir)/lock.c
-relocatable.lo: $(srcdir)/relocatable.c
-	$(LIBTOOL) --mode=compile $(COMPILE) $(srcdir)/relocatable.c
-langprefs.lo: $(srcdir)/langprefs.c
-	$(LIBTOOL) --mode=compile $(COMPILE) $(srcdir)/langprefs.c
-localename.lo: $(srcdir)/localename.c
-	$(LIBTOOL) --mode=compile $(COMPILE) $(srcdir)/localename.c
-log.lo: $(srcdir)/log.c
-	$(LIBTOOL) --mode=compile $(COMPILE) $(srcdir)/log.c
-printf.lo: $(srcdir)/printf.c
-	$(LIBTOOL) --mode=compile $(COMPILE) $(srcdir)/printf.c
-version.lo: $(srcdir)/version.c
-	$(LIBTOOL) --mode=compile $(COMPILE) $(srcdir)/version.c
-osdep.lo: $(srcdir)/osdep.c
-	$(LIBTOOL) --mode=compile $(COMPILE) $(srcdir)/osdep.c
-intl-compat.lo: $(srcdir)/intl-compat.c
-	$(LIBTOOL) --mode=compile $(COMPILE) $(srcdir)/intl-compat.c
-
-ref-add.sed: $(srcdir)/ref-add.sin
-	sed -e '/^#/d' -e 's/@''PACKAGE''@/@PACKAGE@/g' $(srcdir)/ref-add.sin > t-ref-add.sed
-	mv t-ref-add.sed ref-add.sed
-ref-del.sed: $(srcdir)/ref-del.sin
-	sed -e '/^#/d' -e 's/@''PACKAGE''@/@PACKAGE@/g' $(srcdir)/ref-del.sin > t-ref-del.sed
-	mv t-ref-del.sed ref-del.sed
-
-INCLUDES = -I. -I$(srcdir) -I..
-
-libgnuintl.h: $(srcdir)/libgnuintl.h.in
-	sed -e '/IN_LIBGLOCALE/d' \
-	    -e 's,@''HAVE_POSIX_PRINTF''@,@HAVE_POSIX_PRINTF@,g' \
-	    -e 's,@''HAVE_ASPRINTF''@,@HAVE_ASPRINTF@,g' \
-	    -e 's,@''HAVE_SNPRINTF''@,@HAVE_SNPRINTF@,g' \
-	    -e 's,@''HAVE_WPRINTF''@,@HAVE_WPRINTF@,g' \
-	  < $(srcdir)/libgnuintl.h.in \
-	| if test '@WOE32DLL@' = yes; then \
-	    sed -e 's/extern \([^()]*\);/extern __declspec (dllimport) \1;/'; \
-	  else \
-	    cat; \
-	  fi \
-	| sed -e 's/extern \([^"]\)/extern LIBINTL_DLL_EXPORTED \1/' \
-	      -e "/#define _LIBINTL_H/r $(srcdir)/export.h" \
-	| sed -e 's,@''HAVE_VISIBILITY''@,@HAVE_VISIBILITY@,g' \
-	  > libgnuintl.h
-
-libintl.h: $(srcdir)/libgnuintl.h.in
-	sed -e '/IN_LIBGLOCALE/d' \
-	    -e 's,@''HAVE_POSIX_PRINTF''@,@HAVE_POSIX_PRINTF@,g' \
-	    -e 's,@''HAVE_ASPRINTF''@,@HAVE_ASPRINTF@,g' \
-	    -e 's,@''HAVE_SNPRINTF''@,@HAVE_SNPRINTF@,g' \
-	    -e 's,@''HAVE_WPRINTF''@,@HAVE_WPRINTF@,g' \
-	  < $(srcdir)/libgnuintl.h.in > libintl.h
-
-charset.alias: $(srcdir)/config.charset
-	$(SHELL) $(srcdir)/config.charset '@host@' > t-$@
-	mv t-$@ $@
-
-check: all
-
-# We must not install the libintl.h/libintl.a files if we are on a
-# system which has the GNU gettext() function in its C library or in a
-# separate library.
-# If you want to use the one which comes with this version of the
-# package, you have to use `configure --with-included-gettext'.
-install: install-exec install-data
-install-exec: all
-	if { test "$(PACKAGE)" = "gettext-runtime" || test "$(PACKAGE)" = "gettext-tools"; } \
-	   && test '@USE_INCLUDED_LIBINTL@' = yes; then \
-	  $(mkdir_p) $(DESTDIR)$(libdir) $(DESTDIR)$(includedir); \
-	  $(INSTALL_DATA) libintl.h $(DESTDIR)$(includedir)/libintl.h; \
-	  $(LIBTOOL) --mode=install \
-	    $(INSTALL_DATA) libintl.$la $(DESTDIR)$(libdir)/libintl.$la; \
-	  if test "@RELOCATABLE@" = yes; then \
-	    dependencies=`sed -n -e 's,^dependency_libs=\(.*\),\1,p' < $(DESTDIR)$(libdir)/libintl.la | sed -e "s,^',," -e "s,'\$$,,"`; \
-	    if test -n "$$dependencies"; then \
-	      rm -f $(DESTDIR)$(libdir)/libintl.la; \
-	    fi; \
-	  fi; \
-	else \
-	  : ; \
-	fi
-	if test "$(PACKAGE)" = "gettext-tools" \
-	   && test '@USE_INCLUDED_LIBINTL@' = no \
-	   && test @GLIBC2@ != no; then \
-	  $(mkdir_p) $(DESTDIR)$(libdir); \
-	  $(LIBTOOL) --mode=install \
-	    $(INSTALL_DATA) libgnuintl.$la $(DESTDIR)$(libdir)/libgnuintl.$la; \
-	  rm -f $(DESTDIR)$(libdir)/preloadable_libintl.so; \
-	  $(INSTALL_DATA) $(DESTDIR)$(libdir)/libgnuintl.so $(DESTDIR)$(libdir)/preloadable_libintl.so; \
-	  $(LIBTOOL) --mode=uninstall \
-	    rm -f $(DESTDIR)$(libdir)/libgnuintl.$la; \
-	else \
-	  : ; \
-	fi
-	if test '@USE_INCLUDED_LIBINTL@' = yes; then \
-	  test @GLIBC21@ != no || $(mkdir_p) $(DESTDIR)$(libdir); \
-	  temp=$(DESTDIR)$(libdir)/t-charset.alias; \
-	  dest=$(DESTDIR)$(libdir)/charset.alias; \
-	  if test -f $(DESTDIR)$(libdir)/charset.alias; then \
-	    orig=$(DESTDIR)$(libdir)/charset.alias; \
-	    sed -f ref-add.sed $$orig > $$temp; \
-	    $(INSTALL_DATA) $$temp $$dest; \
-	    rm -f $$temp; \
-	  else \
-	    if test @GLIBC21@ = no; then \
-	      orig=charset.alias; \
-	      sed -f ref-add.sed $$orig > $$temp; \
-	      $(INSTALL_DATA) $$temp $$dest; \
-	      rm -f $$temp; \
-	    fi; \
-	  fi; \
-	  $(mkdir_p) $(DESTDIR)$(localedir); \
-	  test -f $(DESTDIR)$(localedir)/locale.alias \
-	    && orig=$(DESTDIR)$(localedir)/locale.alias \
-	    || orig=$(srcdir)/locale.alias; \
-	  temp=$(DESTDIR)$(localedir)/t-locale.alias; \
-	  dest=$(DESTDIR)$(localedir)/locale.alias; \
-	  sed -f ref-add.sed $$orig > $$temp; \
-	  $(INSTALL_DATA) $$temp $$dest; \
-	  rm -f $$temp; \
-	else \
-	  : ; \
-	fi
-install-data: all
-	if test "$(PACKAGE)" = "gettext-tools"; then \
-	  $(mkdir_p) $(DESTDIR)$(gettextsrcdir); \
-	  $(INSTALL_DATA) VERSION $(DESTDIR)$(gettextsrcdir)/VERSION; \
-	  $(INSTALL_DATA) ChangeLog.inst $(DESTDIR)$(gettextsrcdir)/ChangeLog; \
-	  dists="COPYING.LIB-2.0 COPYING.LIB-2.1 $(DISTFILES.common)"; \
-	  for file in $$dists; do \
-	    $(INSTALL_DATA) $(srcdir)/$$file \
-			    $(DESTDIR)$(gettextsrcdir)/$$file; \
-	  done; \
-	  chmod a+x $(DESTDIR)$(gettextsrcdir)/config.charset; \
-	  dists="$(DISTFILES.generated)"; \
-	  for file in $$dists; do \
-	    if test -f $$file; then dir=.; else dir=$(srcdir); fi; \
-	    $(INSTALL_DATA) $$dir/$$file \
-			    $(DESTDIR)$(gettextsrcdir)/$$file; \
-	  done; \
-	  dists="$(DISTFILES.obsolete)"; \
-	  for file in $$dists; do \
-	    rm -f $(DESTDIR)$(gettextsrcdir)/$$file; \
-	  done; \
-	else \
-	  : ; \
-	fi
-
-install-strip: install
-
-installdirs:
-	if { test "$(PACKAGE)" = "gettext-runtime" || test "$(PACKAGE)" = "gettext-tools"; } \
-	   && test '@USE_INCLUDED_LIBINTL@' = yes; then \
-	  $(mkdir_p) $(DESTDIR)$(libdir) $(DESTDIR)$(includedir); \
-	else \
-	  : ; \
-	fi
-	if test "$(PACKAGE)" = "gettext-tools" \
-	   && test '@USE_INCLUDED_LIBINTL@' = no \
-	   && test @GLIBC2@ != no; then \
-	  $(mkdir_p) $(DESTDIR)$(libdir); \
-	else \
-	  : ; \
-	fi
-	if test '@USE_INCLUDED_LIBINTL@' = yes; then \
-	  test @GLIBC21@ != no || $(mkdir_p) $(DESTDIR)$(libdir); \
-	  $(mkdir_p) $(DESTDIR)$(localedir); \
-	else \
-	  : ; \
-	fi
-	if test "$(PACKAGE)" = "gettext-tools"; then \
-	  $(mkdir_p) $(DESTDIR)$(gettextsrcdir); \
-	else \
-	  : ; \
-	fi
-
-# Define this as empty until I found a useful application.
-installcheck:
-
-uninstall:
-	if { test "$(PACKAGE)" = "gettext-runtime" || test "$(PACKAGE)" = "gettext-tools"; } \
-	   && test '@USE_INCLUDED_LIBINTL@' = yes; then \
-	  rm -f $(DESTDIR)$(includedir)/libintl.h; \
-	  $(LIBTOOL) --mode=uninstall \
-	    rm -f $(DESTDIR)$(libdir)/libintl.$la; \
-	else \
-	  : ; \
-	fi
-	if test "$(PACKAGE)" = "gettext-tools" \
-	   && test '@USE_INCLUDED_LIBINTL@' = no \
-	   && test @GLIBC2@ != no; then \
-	  rm -f $(DESTDIR)$(libdir)/preloadable_libintl.so; \
-	else \
-	  : ; \
-	fi
-	if test '@USE_INCLUDED_LIBINTL@' = yes; then \
-	  if test -f $(DESTDIR)$(libdir)/charset.alias; then \
-	    temp=$(DESTDIR)$(libdir)/t-charset.alias; \
-	    dest=$(DESTDIR)$(libdir)/charset.alias; \
-	    sed -f ref-del.sed $$dest > $$temp; \
-	    if grep '^# Packages using this file: $$' $$temp > /dev/null; then \
-	      rm -f $$dest; \
-	    else \
-	      $(INSTALL_DATA) $$temp $$dest; \
-	    fi; \
-	    rm -f $$temp; \
-	  fi; \
-	  if test -f $(DESTDIR)$(localedir)/locale.alias; then \
-	    temp=$(DESTDIR)$(localedir)/t-locale.alias; \
-	    dest=$(DESTDIR)$(localedir)/locale.alias; \
-	    sed -f ref-del.sed $$dest > $$temp; \
-	    if grep '^# Packages using this file: $$' $$temp > /dev/null; then \
-	      rm -f $$dest; \
-	    else \
-	      $(INSTALL_DATA) $$temp $$dest; \
-	    fi; \
-	    rm -f $$temp; \
-	  fi; \
-	else \
-	  : ; \
-	fi
-	if test "$(PACKAGE)" = "gettext-tools"; then \
-	  for file in VERSION ChangeLog COPYING.LIB-2.0 COPYING.LIB-2.1 $(DISTFILES.common) $(DISTFILES.generated); do \
-	    rm -f $(DESTDIR)$(gettextsrcdir)/$$file; \
-	  done; \
-	else \
-	  : ; \
-	fi
-
-info dvi ps pdf html:
-
-$(OBJECTS): ../config.h libgnuintl.h
-bindtextdom.$lo dcgettext.$lo dcigettext.$lo dcngettext.$lo dgettext.$lo dngettext.$lo finddomain.$lo gettext.$lo intl-compat.$lo loadmsgcat.$lo localealias.$lo ngettext.$lo textdomain.$lo: $(srcdir)/gettextP.h $(srcdir)/gmo.h $(srcdir)/loadinfo.h
-hash-string.$lo dcigettext.$lo loadmsgcat.$lo: $(srcdir)/hash-string.h
-explodename.$lo l10nflist.$lo: $(srcdir)/loadinfo.h
-dcigettext.$lo loadmsgcat.$lo plural.$lo plural-exp.$lo: $(srcdir)/plural-exp.h
-dcigettext.$lo: $(srcdir)/eval-plural.h
-localcharset.$lo: $(srcdir)/localcharset.h
-bindtextdom.$lo dcigettext.$lo finddomain.$lo loadmsgcat.$lo localealias.$lo lock.$lo log.$lo: $(srcdir)/lock.h
-localealias.$lo localcharset.$lo relocatable.$lo: $(srcdir)/relocatable.h
-printf.$lo: $(srcdir)/printf-args.h $(srcdir)/printf-args.c $(srcdir)/printf-parse.h $(srcdir)/wprintf-parse.h $(srcdir)/xsize.h $(srcdir)/printf-parse.c $(srcdir)/vasnprintf.h $(srcdir)/vasnwprintf.h $(srcdir)/vasnprintf.c
-
-# A bison-2.1 generated plural.c includes <libintl.h> if ENABLE_NLS.
-PLURAL_DEPS_yes = libintl.h
-PLURAL_DEPS_no =
-plural.$lo: $(PLURAL_DEPS_@USE_INCLUDED_LIBINTL@)
-
-tags: TAGS
-
-TAGS: $(HEADERS) $(SOURCES)
-	here=`pwd`; cd $(srcdir) && etags -o $$here/TAGS $(HEADERS) $(SOURCES)
-
-ctags: CTAGS
-
-CTAGS: $(HEADERS) $(SOURCES)
-	here=`pwd`; cd $(srcdir) && ctags -o $$here/CTAGS $(HEADERS) $(SOURCES)
-
-id: ID
-
-ID: $(HEADERS) $(SOURCES)
-	here=`pwd`; cd $(srcdir) && mkid -f$$here/ID $(HEADERS) $(SOURCES)
-
-
-mostlyclean:
-	rm -f *.a *.la *.o *.obj *.lo core core.*
-	rm -f libgnuintl.h libintl.h charset.alias ref-add.sed ref-del.sed
-	rm -f -r .libs _libs
-
-clean: mostlyclean
-
-distclean: clean
-	rm -f Makefile ID TAGS
-	if test "$(PACKAGE)" = "gettext-runtime" || test "$(PACKAGE)" = "gettext-tools"; then \
-	  rm -f ChangeLog.inst $(DISTFILES.normal); \
-	else \
-	  : ; \
-	fi
-
-maintainer-clean: distclean
-	@echo "This command is intended for maintainers to use;"
-	@echo "it deletes files that may require special tools to rebuild."
-
-
-# GNU gettext needs not contain the file `VERSION' but contains some
-# other files which should not be distributed in other packages.
-distdir = ../$(PACKAGE)-$(VERSION)/$(subdir)
-dist distdir: Makefile
-	if test "$(PACKAGE)" = "gettext-tools"; then \
-	  : ; \
-	else \
-	  if test "$(PACKAGE)" = "gettext-runtime"; then \
-	    additional="$(DISTFILES.gettext)"; \
-	  else \
-	    additional="$(DISTFILES.normal)"; \
-	  fi; \
-	  $(MAKE) $(DISTFILES.common) $(DISTFILES.generated) $$additional; \
-	  for file in ChangeLog $(DISTFILES.common) $(DISTFILES.generated) $$additional; do \
-	    if test -f $$file; then dir=.; else dir=$(srcdir); fi; \
-	    cp -p $$dir/$$file $(distdir) || test $$file = Makefile.in || exit 1; \
-	  done; \
-	fi
-
-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
-	cd $(top_builddir) && $(SHELL) ./config.status
-# This would be more efficient, but doesn't work any more with autoconf-2.57,
-# when AC_CONFIG_FILES([intl/Makefile:somedir/Makefile.in]) is used.
-#	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
-
-# Tell versions [3.59,3.63) of GNU make not to export all variables.
-# Otherwise a system limit (for SysV at least) may be exceeded.
-.NOEXPORT:
diff --git a/mkinstalldirs b/mkinstalldirs
deleted file mode 100755
index 12ea679..0000000
--- a/mkinstalldirs
+++ /dev/null
@@ -1,40 +0,0 @@
-#! /bin/sh
-# mkinstalldirs --- make directory hierarchy
-# Author: Noah Friedman <friedman@prep.ai.mit.edu>
-# Created: 1993-05-16
-# Public domain
-
-# $Id: mkinstalldirs,v 1.2 2002/02/10 21:14:38 jbj Exp $
-
-errstatus=0
-
-for file
-do
-   set fnord `echo ":$file" | sed -ne 's/^:\//#/;s/^://;s/\// /g;s/^#/\//;p'`
-   shift
-
-   pathcomp=
-   for d
-   do
-     pathcomp="$pathcomp$d"
-     case "$pathcomp" in
-       -* ) pathcomp=./$pathcomp ;;
-     esac
-
-     if test ! -d "$pathcomp"; then
-        echo "mkdir $pathcomp"
-
-        mkdir "$pathcomp" || lasterr=$?
-
-        if test ! -d "$pathcomp"; then
-  	  errstatus=$lasterr
-        fi
-     fi
-
-     pathcomp="$pathcomp/"
-   done
-done
-
-exit $errstatus
-
-# mkinstalldirs ends here
diff --git a/po/.cvsignore b/po/.cvsignore
index 6cdefee..cfc2251 100644
--- a/po/.cvsignore
+++ b/po/.cvsignore
@@ -1,8 +1,13 @@
 Makefile
 Makefile.in
+Makefile.in.in
+Makevars.template
 POTFILES
 stamp-cat-id
 stamp-po
 cat-id-tbl.c
+*.header
 *.mo
 *.gmo
+*.sed
+*.sin
diff --git a/po/ChangeLog b/po/ChangeLog
deleted file mode 100644
index 4daed2d..0000000
--- a/po/ChangeLog
+++ /dev/null
@@ -1,12 +0,0 @@
-2006-12-08  gettextize  <bug-gnu-gettext@gnu.org>
-
-	* Makefile.in.in: New file, from gettext-0.16.
-	* boldquot.sed: New file, from gettext-0.16.
-	* en@boldquot.header: New file, from gettext-0.16.
-	* en@quot.header: New file, from gettext-0.16.
-	* insert-header.sin: New file, from gettext-0.16.
-	* quot.sed: New file, from gettext-0.16.
-	* remove-potcdate.sin: New file, from gettext-0.16.
-	* Rules-quot: New file, from gettext-0.16.
-	* POTFILES.in: New file.
-
diff --git a/po/Makefile.in.in b/po/Makefile.in.in
deleted file mode 100644
index 5022b8b..0000000
--- a/po/Makefile.in.in
+++ /dev/null
@@ -1,403 +0,0 @@
-# Makefile for PO directory in any package using GNU gettext.
-# Copyright (C) 1995-1997, 2000-2006 by Ulrich Drepper <drepper@gnu.ai.mit.edu>
-#
-# This file can be copied and used freely without restrictions.  It can
-# be used in projects which are not available under the GNU General Public
-# License but which still want to provide support for the GNU gettext
-# functionality.
-# Please note that the actual code of GNU gettext is covered by the GNU
-# General Public License and is *not* in the public domain.
-#
-# Origin: gettext-0.16
-
-PACKAGE = @PACKAGE@
-VERSION = @VERSION@
-PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
-
-SHELL = /bin/sh
-@SET_MAKE@
-
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
-VPATH = @srcdir@
-
-prefix = @prefix@
-exec_prefix = @exec_prefix@
-datarootdir = @datarootdir@
-datadir = @datadir@
-localedir = @localedir@
-gettextsrcdir = $(datadir)/gettext/po
-
-INSTALL = @INSTALL@
-INSTALL_DATA = @INSTALL_DATA@
-
-# We use $(mkdir_p).
-# In automake <= 1.9.x, $(mkdir_p) is defined either as "mkdir -p --" or as
-# "$(mkinstalldirs)" or as "$(install_sh) -d". For these automake versions,
-# @install_sh@ does not start with $(SHELL), so we add it.
-# In automake >= 1.10, @mkdir_p@ is derived from ${MKDIR_P}, which is defined
-# either as "/path/to/mkdir -p" or ".../install-sh -c -d". For these automake
-# versions, $(mkinstalldirs) and $(install_sh) are unused.
-mkinstalldirs = $(SHELL) @install_sh@ -d
-install_sh = $(SHELL) @install_sh@
-MKDIR_P = @MKDIR_P@
-mkdir_p = @mkdir_p@
-
-GMSGFMT_ = @GMSGFMT@
-GMSGFMT_no = @GMSGFMT@
-GMSGFMT_yes = @GMSGFMT_015@
-GMSGFMT = $(GMSGFMT_$(USE_MSGCTXT))
-MSGFMT_ = @MSGFMT@
-MSGFMT_no = @MSGFMT@
-MSGFMT_yes = @MSGFMT_015@
-MSGFMT = $(MSGFMT_$(USE_MSGCTXT))
-XGETTEXT_ = @XGETTEXT@
-XGETTEXT_no = @XGETTEXT@
-XGETTEXT_yes = @XGETTEXT_015@
-XGETTEXT = $(XGETTEXT_$(USE_MSGCTXT))
-MSGMERGE = msgmerge
-MSGMERGE_UPDATE = @MSGMERGE@ --update
-MSGINIT = msginit
-MSGCONV = msgconv
-MSGFILTER = msgfilter
-
-POFILES = @POFILES@
-GMOFILES = @GMOFILES@
-UPDATEPOFILES = @UPDATEPOFILES@
-DUMMYPOFILES = @DUMMYPOFILES@
-DISTFILES.common = Makefile.in.in remove-potcdate.sin \
-$(DISTFILES.common.extra1) $(DISTFILES.common.extra2) $(DISTFILES.common.extra3)
-DISTFILES = $(DISTFILES.common) Makevars POTFILES.in \
-$(POFILES) $(GMOFILES) \
-$(DISTFILES.extra1) $(DISTFILES.extra2) $(DISTFILES.extra3)
-
-POTFILES = \
-
-CATALOGS = @CATALOGS@
-
-# Makevars gets inserted here. (Don't remove this line!)
-
-.SUFFIXES:
-.SUFFIXES: .po .gmo .mo .sed .sin .nop .po-create .po-update
-
-.po.mo:
-	@echo "$(MSGFMT) -c -o $@ $<"; \
-	$(MSGFMT) -c -o t-$@ $< && mv t-$@ $@
-
-.po.gmo:
-	@lang=`echo $* | sed -e 's,.*/,,'`; \
-	test "$(srcdir)" = . && cdcmd="" || cdcmd="cd $(srcdir) && "; \
-	echo "$${cdcmd}rm -f $${lang}.gmo && $(GMSGFMT) -c --statistics -o $${lang}.gmo $${lang}.po"; \
-	cd $(srcdir) && rm -f $${lang}.gmo && $(GMSGFMT) -c --statistics -o t-$${lang}.gmo $${lang}.po && mv t-$${lang}.gmo $${lang}.gmo
-
-.sin.sed:
-	sed -e '/^#/d' $< > t-$@
-	mv t-$@ $@
-
-
-all: all-@USE_NLS@
-
-all-yes: stamp-po
-all-no:
-
-# $(srcdir)/$(DOMAIN).pot is only created when needed. When xgettext finds no
-# internationalized messages, no $(srcdir)/$(DOMAIN).pot is created (because
-# we don't want to bother translators with empty POT files). We assume that
-# LINGUAS is empty in this case, i.e. $(POFILES) and $(GMOFILES) are empty.
-# In this case, stamp-po is a nop (i.e. a phony target).
-
-# stamp-po is a timestamp denoting the last time at which the CATALOGS have
-# been loosely updated. Its purpose is that when a developer or translator
-# checks out the package via CVS, and the $(DOMAIN).pot file is not in CVS,
-# "make" will update the $(DOMAIN).pot and the $(CATALOGS), but subsequent
-# invocations of "make" will do nothing. This timestamp would not be necessary
-# if updating the $(CATALOGS) would always touch them; however, the rule for
-# $(POFILES) has been designed to not touch files that don't need to be
-# changed.
-stamp-po: $(srcdir)/$(DOMAIN).pot
-	test ! -f $(srcdir)/$(DOMAIN).pot || \
-	  test -z "$(GMOFILES)" || $(MAKE) $(GMOFILES)
-	@test ! -f $(srcdir)/$(DOMAIN).pot || { \
-	  echo "touch stamp-po" && \
-	  echo timestamp > stamp-poT && \
-	  mv stamp-poT stamp-po; \
-	}
-
-# Note: Target 'all' must not depend on target '$(DOMAIN).pot-update',
-# otherwise packages like GCC can not be built if only parts of the source
-# have been downloaded.
-
-# This target rebuilds $(DOMAIN).pot; it is an expensive operation.
-# Note that $(DOMAIN).pot is not touched if it doesn't need to be changed.
-$(DOMAIN).pot-update: $(POTFILES) $(srcdir)/POTFILES.in remove-potcdate.sed
-	if test -n '$(MSGID_BUGS_ADDRESS)' || test '$(PACKAGE_BUGREPORT)' = '@'PACKAGE_BUGREPORT'@'; then \
-	  msgid_bugs_address='$(MSGID_BUGS_ADDRESS)'; \
-	else \
-	  msgid_bugs_address='$(PACKAGE_BUGREPORT)'; \
-	fi; \
-	$(XGETTEXT) --default-domain=$(DOMAIN) --directory=$(top_srcdir) \
-	  --add-comments=TRANSLATORS: $(XGETTEXT_OPTIONS) \
-	  --files-from=$(srcdir)/POTFILES.in \
-	  --copyright-holder='$(COPYRIGHT_HOLDER)' \
-	  --msgid-bugs-address="$$msgid_bugs_address"
-	test ! -f $(DOMAIN).po || { \
-	  if test -f $(srcdir)/$(DOMAIN).pot; then \
-	    sed -f remove-potcdate.sed < $(srcdir)/$(DOMAIN).pot > $(DOMAIN).1po && \
-	    sed -f remove-potcdate.sed < $(DOMAIN).po > $(DOMAIN).2po && \
-	    if cmp $(DOMAIN).1po $(DOMAIN).2po >/dev/null 2>&1; then \
-	      rm -f $(DOMAIN).1po $(DOMAIN).2po $(DOMAIN).po; \
-	    else \
-	      rm -f $(DOMAIN).1po $(DOMAIN).2po $(srcdir)/$(DOMAIN).pot && \
-	      mv $(DOMAIN).po $(srcdir)/$(DOMAIN).pot; \
-	    fi; \
-	  else \
-	    mv $(DOMAIN).po $(srcdir)/$(DOMAIN).pot; \
-	  fi; \
-	}
-
-# This rule has no dependencies: we don't need to update $(DOMAIN).pot at
-# every "make" invocation, only create it when it is missing.
-# Only "make $(DOMAIN).pot-update" or "make dist" will force an update.
-$(srcdir)/$(DOMAIN).pot:
-	$(MAKE) $(DOMAIN).pot-update
-
-# This target rebuilds a PO file if $(DOMAIN).pot has changed.
-# Note that a PO file is not touched if it doesn't need to be changed.
-$(POFILES): $(srcdir)/$(DOMAIN).pot
-	@lang=`echo $@ | sed -e 's,.*/,,' -e 's/\.po$$//'`; \
-	if test -f "$(srcdir)/$${lang}.po"; then \
-	  test "$(srcdir)" = . && cdcmd="" || cdcmd="cd $(srcdir) && "; \
-	  echo "$${cdcmd}$(MSGMERGE_UPDATE) $${lang}.po $(DOMAIN).pot"; \
-	  cd $(srcdir) && $(MSGMERGE_UPDATE) $${lang}.po $(DOMAIN).pot; \
-	else \
-	  $(MAKE) $${lang}.po-create; \
-	fi
-
-
-install: install-exec install-data
-install-exec:
-install-data: install-data-@USE_NLS@
-	if test "$(PACKAGE)" = "gettext-tools"; then \
-	  $(mkdir_p) $(DESTDIR)$(gettextsrcdir); \
-	  for file in $(DISTFILES.common) Makevars.template; do \
-	    $(INSTALL_DATA) $(srcdir)/$$file \
-			    $(DESTDIR)$(gettextsrcdir)/$$file; \
-	  done; \
-	  for file in Makevars; do \
-	    rm -f $(DESTDIR)$(gettextsrcdir)/$$file; \
-	  done; \
-	else \
-	  : ; \
-	fi
-install-data-no: all
-install-data-yes: all
-	$(mkdir_p) $(DESTDIR)$(datadir)
-	@catalogs='$(CATALOGS)'; \
-	for cat in $$catalogs; do \
-	  cat=`basename $$cat`; \
-	  lang=`echo $$cat | sed -e 's/\.gmo$$//'`; \
-	  dir=$(localedir)/$$lang/LC_MESSAGES; \
-	  $(mkdir_p) $(DESTDIR)$$dir; \
-	  if test -r $$cat; then realcat=$$cat; else realcat=$(srcdir)/$$cat; fi; \
-	  $(INSTALL_DATA) $$realcat $(DESTDIR)$$dir/$(DOMAIN).mo; \
-	  echo "installing $$realcat as $(DESTDIR)$$dir/$(DOMAIN).mo"; \
-	  for lc in '' $(EXTRA_LOCALE_CATEGORIES); do \
-	    if test -n "$$lc"; then \
-	      if (cd $(DESTDIR)$(localedir)/$$lang && LC_ALL=C ls -l -d $$lc 2>/dev/null) | grep ' -> ' >/dev/null; then \
-	        link=`cd $(DESTDIR)$(localedir)/$$lang && LC_ALL=C ls -l -d $$lc | sed -e 's/^.* -> //'`; \
-	        mv $(DESTDIR)$(localedir)/$$lang/$$lc $(DESTDIR)$(localedir)/$$lang/$$lc.old; \
-	        mkdir $(DESTDIR)$(localedir)/$$lang/$$lc; \
-	        (cd $(DESTDIR)$(localedir)/$$lang/$$lc.old && \
-	         for file in *; do \
-	           if test -f $$file; then \
-	             ln -s ../$$link/$$file $(DESTDIR)$(localedir)/$$lang/$$lc/$$file; \
-	           fi; \
-	         done); \
-	        rm -f $(DESTDIR)$(localedir)/$$lang/$$lc.old; \
-	      else \
-	        if test -d $(DESTDIR)$(localedir)/$$lang/$$lc; then \
-	          :; \
-	        else \
-	          rm -f $(DESTDIR)$(localedir)/$$lang/$$lc; \
-	          mkdir $(DESTDIR)$(localedir)/$$lang/$$lc; \
-	        fi; \
-	      fi; \
-	      rm -f $(DESTDIR)$(localedir)/$$lang/$$lc/$(DOMAIN).mo; \
-	      ln -s ../LC_MESSAGES/$(DOMAIN).mo $(DESTDIR)$(localedir)/$$lang/$$lc/$(DOMAIN).mo 2>/dev/null || \
-	      ln $(DESTDIR)$(localedir)/$$lang/LC_MESSAGES/$(DOMAIN).mo $(DESTDIR)$(localedir)/$$lang/$$lc/$(DOMAIN).mo 2>/dev/null || \
-	      cp -p $(DESTDIR)$(localedir)/$$lang/LC_MESSAGES/$(DOMAIN).mo $(DESTDIR)$(localedir)/$$lang/$$lc/$(DOMAIN).mo; \
-	      echo "installing $$realcat link as $(DESTDIR)$(localedir)/$$lang/$$lc/$(DOMAIN).mo"; \
-	    fi; \
-	  done; \
-	done
-
-install-strip: install
-
-installdirs: installdirs-exec installdirs-data
-installdirs-exec:
-installdirs-data: installdirs-data-@USE_NLS@
-	if test "$(PACKAGE)" = "gettext-tools"; then \
-	  $(mkdir_p) $(DESTDIR)$(gettextsrcdir); \
-	else \
-	  : ; \
-	fi
-installdirs-data-no:
-installdirs-data-yes:
-	$(mkdir_p) $(DESTDIR)$(datadir)
-	@catalogs='$(CATALOGS)'; \
-	for cat in $$catalogs; do \
-	  cat=`basename $$cat`; \
-	  lang=`echo $$cat | sed -e 's/\.gmo$$//'`; \
-	  dir=$(localedir)/$$lang/LC_MESSAGES; \
-	  $(mkdir_p) $(DESTDIR)$$dir; \
-	  for lc in '' $(EXTRA_LOCALE_CATEGORIES); do \
-	    if test -n "$$lc"; then \
-	      if (cd $(DESTDIR)$(localedir)/$$lang && LC_ALL=C ls -l -d $$lc 2>/dev/null) | grep ' -> ' >/dev/null; then \
-	        link=`cd $(DESTDIR)$(localedir)/$$lang && LC_ALL=C ls -l -d $$lc | sed -e 's/^.* -> //'`; \
-	        mv $(DESTDIR)$(localedir)/$$lang/$$lc $(DESTDIR)$(localedir)/$$lang/$$lc.old; \
-	        mkdir $(DESTDIR)$(localedir)/$$lang/$$lc; \
-	        (cd $(DESTDIR)$(localedir)/$$lang/$$lc.old && \
-	         for file in *; do \
-	           if test -f $$file; then \
-	             ln -s ../$$link/$$file $(DESTDIR)$(localedir)/$$lang/$$lc/$$file; \
-	           fi; \
-	         done); \
-	        rm -f $(DESTDIR)$(localedir)/$$lang/$$lc.old; \
-	      else \
-	        if test -d $(DESTDIR)$(localedir)/$$lang/$$lc; then \
-	          :; \
-	        else \
-	          rm -f $(DESTDIR)$(localedir)/$$lang/$$lc; \
-	          mkdir $(DESTDIR)$(localedir)/$$lang/$$lc; \
-	        fi; \
-	      fi; \
-	    fi; \
-	  done; \
-	done
-
-# Define this as empty until I found a useful application.
-installcheck:
-
-uninstall: uninstall-exec uninstall-data
-uninstall-exec:
-uninstall-data: uninstall-data-@USE_NLS@
-	if test "$(PACKAGE)" = "gettext-tools"; then \
-	  for file in $(DISTFILES.common) Makevars.template; do \
-	    rm -f $(DESTDIR)$(gettextsrcdir)/$$file; \
-	  done; \
-	else \
-	  : ; \
-	fi
-uninstall-data-no:
-uninstall-data-yes:
-	catalogs='$(CATALOGS)'; \
-	for cat in $$catalogs; do \
-	  cat=`basename $$cat`; \
-	  lang=`echo $$cat | sed -e 's/\.gmo$$//'`; \
-	  for lc in LC_MESSAGES $(EXTRA_LOCALE_CATEGORIES); do \
-	    rm -f $(DESTDIR)$(localedir)/$$lang/$$lc/$(DOMAIN).mo; \
-	  done; \
-	done
-
-check: all
-
-info dvi ps pdf html tags TAGS ctags CTAGS ID:
-
-mostlyclean:
-	rm -f remove-potcdate.sed
-	rm -f stamp-poT
-	rm -f core core.* $(DOMAIN).po $(DOMAIN).1po $(DOMAIN).2po *.new.po
-	rm -fr *.o
-
-clean: mostlyclean
-
-distclean: clean
-	rm -f Makefile Makefile.in POTFILES *.mo
-
-maintainer-clean: distclean
-	@echo "This command is intended for maintainers to use;"
-	@echo "it deletes files that may require special tools to rebuild."
-	rm -f stamp-po $(GMOFILES)
-
-distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir)
-dist distdir:
-	$(MAKE) update-po
-	@$(MAKE) dist2
-# This is a separate target because 'update-po' must be executed before.
-dist2: stamp-po $(DISTFILES)
-	dists="$(DISTFILES)"; \
-	if test "$(PACKAGE)" = "gettext-tools"; then \
-	  dists="$$dists Makevars.template"; \
-	fi; \
-	if test -f $(srcdir)/$(DOMAIN).pot; then \
-	  dists="$$dists $(DOMAIN).pot stamp-po"; \
-	fi; \
-	if test -f $(srcdir)/ChangeLog; then \
-	  dists="$$dists ChangeLog"; \
-	fi; \
-	for i in 0 1 2 3 4 5 6 7 8 9; do \
-	  if test -f $(srcdir)/ChangeLog.$$i; then \
-	    dists="$$dists ChangeLog.$$i"; \
-	  fi; \
-	done; \
-	if test -f $(srcdir)/LINGUAS; then dists="$$dists LINGUAS"; fi; \
-	for file in $$dists; do \
-	  if test -f $$file; then \
-	    cp -p $$file $(distdir) || exit 1; \
-	  else \
-	    cp -p $(srcdir)/$$file $(distdir) || exit 1; \
-	  fi; \
-	done
-
-update-po: Makefile
-	$(MAKE) $(DOMAIN).pot-update
-	test -z "$(UPDATEPOFILES)" || $(MAKE) $(UPDATEPOFILES)
-	$(MAKE) update-gmo
-
-# General rule for creating PO files.
-
-.nop.po-create:
-	@lang=`echo $@ | sed -e 's/\.po-create$$//'`; \
-	echo "File $$lang.po does not exist. If you are a translator, you can create it through 'msginit'." 1>&2; \
-	exit 1
-
-# General rule for updating PO files.
-
-.nop.po-update:
-	@lang=`echo $@ | sed -e 's/\.po-update$$//'`; \
-	if test "$(PACKAGE)" = "gettext-tools"; then PATH=`pwd`/../src:$$PATH; fi; \
-	tmpdir=`pwd`; \
-	echo "$$lang:"; \
-	test "$(srcdir)" = . && cdcmd="" || cdcmd="cd $(srcdir) && "; \
-	echo "$${cdcmd}$(MSGMERGE) $$lang.po $(DOMAIN).pot -o $$lang.new.po"; \
-	cd $(srcdir); \
-	if $(MSGMERGE) $$lang.po $(DOMAIN).pot -o $$tmpdir/$$lang.new.po; then \
-	  if cmp $$lang.po $$tmpdir/$$lang.new.po >/dev/null 2>&1; then \
-	    rm -f $$tmpdir/$$lang.new.po; \
-	  else \
-	    if mv -f $$tmpdir/$$lang.new.po $$lang.po; then \
-	      :; \
-	    else \
-	      echo "msgmerge for $$lang.po failed: cannot move $$tmpdir/$$lang.new.po to $$lang.po" 1>&2; \
-	      exit 1; \
-	    fi; \
-	  fi; \
-	else \
-	  echo "msgmerge for $$lang.po failed!" 1>&2; \
-	  rm -f $$tmpdir/$$lang.new.po; \
-	fi
-
-$(DUMMYPOFILES):
-
-update-gmo: Makefile $(GMOFILES)
-	@:
-
-Makefile: Makefile.in.in Makevars $(top_builddir)/config.status @POMAKEFILEDEPS@
-	cd $(top_builddir) \
-	  && $(SHELL) ./config.status $(subdir)/$@.in po-directories
-
-force:
-
-# Tell versions [3.59,3.63) of GNU make not to export all variables.
-# Otherwise a system limit (for SysV at least) may be exceeded.
-.NOEXPORT:
diff --git a/po/Rules-quot b/po/Rules-quot
deleted file mode 100644
index 9c2a995..0000000
--- a/po/Rules-quot
+++ /dev/null
@@ -1,47 +0,0 @@
-# Special Makefile rules for English message catalogs with quotation marks.
-
-DISTFILES.common.extra1 = quot.sed boldquot.sed en@quot.header en@boldquot.header insert-header.sin Rules-quot
-
-.SUFFIXES: .insert-header .po-update-en
-
-en@quot.po-create:
-	$(MAKE) en@quot.po-update
-en@boldquot.po-create:
-	$(MAKE) en@boldquot.po-update
-
-en@quot.po-update: en@quot.po-update-en
-en@boldquot.po-update: en@boldquot.po-update-en
-
-.insert-header.po-update-en:
-	@lang=`echo $@ | sed -e 's/\.po-update-en$$//'`; \
-	if test "$(PACKAGE)" = "gettext"; then PATH=`pwd`/../src:$$PATH; GETTEXTLIBDIR=`cd $(top_srcdir)/src && pwd`; export GETTEXTLIBDIR; fi; \
-	tmpdir=`pwd`; \
-	echo "$$lang:"; \
-	ll=`echo $$lang | sed -e 's/@.*//'`; \
-	LC_ALL=C; export LC_ALL; \
-	cd $(srcdir); \
-	if $(MSGINIT) -i $(DOMAIN).pot --no-translator -l $$ll -o - 2>/dev/null | sed -f $$tmpdir/$$lang.insert-header | $(MSGCONV) -t UTF-8 | $(MSGFILTER) sed -f `echo $$lang | sed -e 's/.*@//'`.sed 2>/dev/null > $$tmpdir/$$lang.new.po; then \
-	  if cmp $$lang.po $$tmpdir/$$lang.new.po >/dev/null 2>&1; then \
-	    rm -f $$tmpdir/$$lang.new.po; \
-	  else \
-	    if mv -f $$tmpdir/$$lang.new.po $$lang.po; then \
-	      :; \
-	    else \
-	      echo "creation of $$lang.po failed: cannot move $$tmpdir/$$lang.new.po to $$lang.po" 1>&2; \
-	      exit 1; \
-	    fi; \
-	  fi; \
-	else \
-	  echo "creation of $$lang.po failed!" 1>&2; \
-	  rm -f $$tmpdir/$$lang.new.po; \
-	fi
-
-en@quot.insert-header: insert-header.sin
-	sed -e '/^#/d' -e 's/HEADER/en@quot.header/g' $(srcdir)/insert-header.sin > en@quot.insert-header
-
-en@boldquot.insert-header: insert-header.sin
-	sed -e '/^#/d' -e 's/HEADER/en@boldquot.header/g' $(srcdir)/insert-header.sin > en@boldquot.insert-header
-
-mostlyclean: mostlyclean-quot
-mostlyclean-quot:
-	rm -f *.insert-header
diff --git a/po/boldquot.sed b/po/boldquot.sed
deleted file mode 100644
index 4b937aa..0000000
--- a/po/boldquot.sed
+++ /dev/null
@@ -1,10 +0,0 @@
-s/"\([^"]*\)"/“\1”/g
-s/`\([^`']*\)'/‘\1’/g
-s/ '\([^`']*\)' / ‘\1’ /g
-s/ '\([^`']*\)'$/ ‘\1’/g
-s/^'\([^`']*\)' /‘\1’ /g
-s/“”/""/g
-s/“/“/g
-s/”/”/g
-s/‘/‘/g
-s/’/’/g
diff --git a/po/en@boldquot.header b/po/en@boldquot.header
deleted file mode 100644
index fedb6a0..0000000
--- a/po/en@boldquot.header
+++ /dev/null
@@ -1,25 +0,0 @@
-# All this catalog "translates" are quotation characters.
-# The msgids must be ASCII and therefore cannot contain real quotation
-# characters, only substitutes like grave accent (0x60), apostrophe (0x27)
-# and double quote (0x22). These substitutes look strange; see
-# http://www.cl.cam.ac.uk/~mgk25/ucs/quotes.html
-#
-# This catalog translates grave accent (0x60) and apostrophe (0x27) to
-# left single quotation mark (U+2018) and right single quotation mark (U+2019).
-# It also translates pairs of apostrophe (0x27) to
-# left single quotation mark (U+2018) and right single quotation mark (U+2019)
-# and pairs of quotation mark (0x22) to
-# left double quotation mark (U+201C) and right double quotation mark (U+201D).
-#
-# When output to an UTF-8 terminal, the quotation characters appear perfectly.
-# When output to an ISO-8859-1 terminal, the single quotation marks are
-# transliterated to apostrophes (by iconv in glibc 2.2 or newer) or to
-# grave/acute accent (by libiconv), and the double quotation marks are
-# transliterated to 0x22.
-# When output to an ASCII terminal, the single quotation marks are
-# transliterated to apostrophes, and the double quotation marks are
-# transliterated to 0x22.
-#
-# This catalog furthermore displays the text between the quotation marks in
-# bold face, assuming the VT100/XTerm escape sequences.
-#
diff --git a/po/en@quot.header b/po/en@quot.header
deleted file mode 100644
index a9647fc..0000000
--- a/po/en@quot.header
+++ /dev/null
@@ -1,22 +0,0 @@
-# All this catalog "translates" are quotation characters.
-# The msgids must be ASCII and therefore cannot contain real quotation
-# characters, only substitutes like grave accent (0x60), apostrophe (0x27)
-# and double quote (0x22). These substitutes look strange; see
-# http://www.cl.cam.ac.uk/~mgk25/ucs/quotes.html
-#
-# This catalog translates grave accent (0x60) and apostrophe (0x27) to
-# left single quotation mark (U+2018) and right single quotation mark (U+2019).
-# It also translates pairs of apostrophe (0x27) to
-# left single quotation mark (U+2018) and right single quotation mark (U+2019)
-# and pairs of quotation mark (0x22) to
-# left double quotation mark (U+201C) and right double quotation mark (U+201D).
-#
-# When output to an UTF-8 terminal, the quotation characters appear perfectly.
-# When output to an ISO-8859-1 terminal, the single quotation marks are
-# transliterated to apostrophes (by iconv in glibc 2.2 or newer) or to
-# grave/acute accent (by libiconv), and the double quotation marks are
-# transliterated to 0x22.
-# When output to an ASCII terminal, the single quotation marks are
-# transliterated to apostrophes, and the double quotation marks are
-# transliterated to 0x22.
-#
diff --git a/po/insert-header.sin b/po/insert-header.sin
deleted file mode 100644
index b26de01..0000000
--- a/po/insert-header.sin
+++ /dev/null
@@ -1,23 +0,0 @@
-# Sed script that inserts the file called HEADER before the header entry.
-#
-# At each occurrence of a line starting with "msgid ", we execute the following
-# commands. At the first occurrence, insert the file. At the following
-# occurrences, do nothing. The distinction between the first and the following
-# occurrences is achieved by looking at the hold space.
-/^msgid /{
-x
-# Test if the hold space is empty.
-s/m/m/
-ta
-# Yes it was empty. First occurrence. Read the file.
-r HEADER
-# Output the file's contents by reading the next line. But don't lose the
-# current line while doing this.
-g
-N
-bb
-:a
-# The hold space was nonempty. Following occurrences. Do nothing.
-x
-:b
-}
diff --git a/po/quot.sed b/po/quot.sed
deleted file mode 100644
index 0122c46..0000000
--- a/po/quot.sed
+++ /dev/null
@@ -1,6 +0,0 @@
-s/"\([^"]*\)"/“\1”/g
-s/`\([^`']*\)'/‘\1’/g
-s/ '\([^`']*\)' / ‘\1’ /g
-s/ '\([^`']*\)'$/ ‘\1’/g
-s/^'\([^`']*\)' /‘\1’ /g
-s/“”/""/g
diff --git a/po/remove-potcdate.sed b/po/remove-potcdate.sed
deleted file mode 100644
index edb38d7..0000000
--- a/po/remove-potcdate.sed
+++ /dev/null
@@ -1,11 +0,0 @@
-/^"POT-Creation-Date: .*"$/{
-x
-s/P/P/
-ta
-g
-d
-bb
-:a
-x
-:b
-}
diff --git a/po/remove-potcdate.sin b/po/remove-potcdate.sin
deleted file mode 100644
index 2436c49..0000000
--- a/po/remove-potcdate.sin
+++ /dev/null
@@ -1,19 +0,0 @@
-# Sed script that remove the POT-Creation-Date line in the header entry
-# from a POT file.
-#
-# The distinction between the first and the following occurrences of the
-# pattern is achieved by looking at the hold space.
-/^"POT-Creation-Date: .*"$/{
-x
-# Test if the hold space is empty.
-s/P/P/
-ta
-# Yes it was empty. First occurrence. Remove the line.
-g
-d
-bb
-:a
-# The hold space was nonempty. Following occurrences. Do nothing.
-x
-:b
-}
-- 
Gitee


From 5f9c8255b257e7dd8ba1a79803520088c932d0af Mon Sep 17 00:00:00 2001
From: Arkadiusz Miskiewicz <arekm@pld-linux.org>
Date: Tue, 5 Jun 2007 20:31:17 +0000
Subject: [PATCH 410/667] Include m4 macros from m4/.

---
 autogen.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/autogen.sh b/autogen.sh
index 93ed6e7..e991a47 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -18,7 +18,7 @@ esac
 cd "$srcdir"
 gettextize --copy --force --intl
 $libtoolize --copy --force
-aclocal
+aclocal -I m4
 autoheader
 automake -a -c
 autoconf
-- 
Gitee


From 4a288d35daf99aac10f3559e5c8fd96584811bc1 Mon Sep 17 00:00:00 2001
From: Jeff Johnson <n3npq@mac.com>
Date: Sat, 9 Jun 2007 19:07:59 +0000
Subject: [PATCH 411/667] - protottype headerGetEntry 4th arg as void *, not
 void **.

---
 Makefile.am  | 2 +-
 configure.ac | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index 63ce37f..c74716a 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -4,7 +4,7 @@ AUTOMAKE_OPTIONS = 1.4 foreign
 
 LINT = splint
 
-EXTRA_DIST = config.rpath m4/ChangeLog  autogen.sh CHANGES $(man_MANS) popt.spec libpopt.vers \
+EXTRA_DIST = config.rpath m4/ChangeLog  config.rpath m4/ChangeLog  autogen.sh CHANGES $(man_MANS) popt.spec libpopt.vers \
 	testit.sh test-poptrc test3-data/0* \
 	po/*.in po/*.po po/popt.pot \
 	popt.ps
diff --git a/configure.ac b/configure.ac
index 8d4cfcb..d40fc2f 100755
--- a/configure.ac
+++ b/configure.ac
@@ -110,4 +110,4 @@ AC_DEFINE_UNQUOTED(POPT_SOURCE_PATH, "$POPT_SOURCE_PATH",
 	[Full path to popt top_srcdir.])
 AC_SUBST(POPT_SOURCE_PATH)
 
-AC_OUTPUT([Doxyfile Makefile])
+AC_OUTPUT([Doxyfile Makefile intl/Makefile po/Makefile.in])
-- 
Gitee


From 6ee617beca19928013f3f1decf64e3a80ad12652 Mon Sep 17 00:00:00 2001
From: Jeff Johnson <n3npq@mac.com>
Date: Sat, 9 Jun 2007 22:14:24 +0000
Subject: [PATCH 412/667] modernize popt autocrap.

---
 .cvsignore    |    3 +
 ABOUT-NLS     | 1101 -------------------------------------------------
 Makefile.am   |    2 +-
 autogen.sh    |    2 +-
 configure.ac  |   29 +-
 po/.cvsignore |    2 +
 6 files changed, 21 insertions(+), 1118 deletions(-)
 delete mode 100644 ABOUT-NLS

diff --git a/.cvsignore b/.cvsignore
index d53c854..1ee4333 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1,6 +1,7 @@
 .deps
 .depend
 .libs
+ChangeLog
 Doxyfile
 Makefile
 Makefile.in
@@ -11,6 +12,7 @@ config.guess
 config.h
 config.h.in
 config.log
+config.rpath
 config.status
 config.sub
 configure
@@ -20,6 +22,7 @@ install-sh
 libtool
 ltconfig
 ltmain.sh
+m4
 missing
 stamp-h
 stamp-h1
diff --git a/ABOUT-NLS b/ABOUT-NLS
deleted file mode 100644
index ec20977..0000000
--- a/ABOUT-NLS
+++ /dev/null
@@ -1,1101 +0,0 @@
-1 Notes on the Free Translation Project
-***************************************
-
-Free software is going international!  The Free Translation Project is
-a way to get maintainers of free software, translators, and users all
-together, so that free software will gradually become able to speak many
-languages.  A few packages already provide translations for their
-messages.
-
-   If you found this `ABOUT-NLS' file inside a distribution, you may
-assume that the distributed package does use GNU `gettext' internally,
-itself available at your nearest GNU archive site.  But you do _not_
-need to install GNU `gettext' prior to configuring, installing or using
-this package with messages translated.
-
-   Installers will find here some useful hints.  These notes also
-explain how users should proceed for getting the programs to use the
-available translations.  They tell how people wanting to contribute and
-work on translations can contact the appropriate team.
-
-   When reporting bugs in the `intl/' directory or bugs which may be
-related to internationalization, you should tell about the version of
-`gettext' which is used.  The information can be found in the
-`intl/VERSION' file, in internationalized packages.
-
-1.1 Quick configuration advice
-==============================
-
-If you want to exploit the full power of internationalization, you
-should configure it using
-
-     ./configure --with-included-gettext
-
-to force usage of internationalizing routines provided within this
-package, despite the existence of internationalizing capabilities in the
-operating system where this package is being installed.  So far, only
-the `gettext' implementation in the GNU C library version 2 provides as
-many features (such as locale alias, message inheritance, automatic
-charset conversion or plural form handling) as the implementation here.
-It is also not possible to offer this additional functionality on top
-of a `catgets' implementation.  Future versions of GNU `gettext' will
-very likely convey even more functionality.  So it might be a good idea
-to change to GNU `gettext' as soon as possible.
-
-   So you need _not_ provide this option if you are using GNU libc 2 or
-you have installed a recent copy of the GNU gettext package with the
-included `libintl'.
-
-1.2 INSTALL Matters
-===================
-
-Some packages are "localizable" when properly installed; the programs
-they contain can be made to speak your own native language.  Most such
-packages use GNU `gettext'.  Other packages have their own ways to
-internationalization, predating GNU `gettext'.
-
-   By default, this package will be installed to allow translation of
-messages.  It will automatically detect whether the system already
-provides the GNU `gettext' functions.  If not, the included GNU
-`gettext' library will be used.  This library is wholly contained
-within this package, usually in the `intl/' subdirectory, so prior
-installation of the GNU `gettext' package is _not_ required.
-Installers may use special options at configuration time for changing
-the default behaviour.  The commands:
-
-     ./configure --with-included-gettext
-     ./configure --disable-nls
-
-will, respectively, bypass any pre-existing `gettext' to use the
-internationalizing routines provided within this package, or else,
-_totally_ disable translation of messages.
-
-   When you already have GNU `gettext' installed on your system and run
-configure without an option for your new package, `configure' will
-probably detect the previously built and installed `libintl.a' file and
-will decide to use this.  This might not be desirable.  You should use
-the more recent version of the GNU `gettext' library.  I.e. if the file
-`intl/VERSION' shows that the library which comes with this package is
-more recent, you should use
-
-     ./configure --with-included-gettext
-
-to prevent auto-detection.
-
-   The configuration process will not test for the `catgets' function
-and therefore it will not be used.  The reason is that even an
-emulation of `gettext' on top of `catgets' could not provide all the
-extensions of the GNU `gettext' library.
-
-   Internationalized packages usually have many `po/LL.po' files, where
-LL gives an ISO 639 two-letter code identifying the language.  Unless
-translations have been forbidden at `configure' time by using the
-`--disable-nls' switch, all available translations are installed
-together with the package.  However, the environment variable `LINGUAS'
-may be set, prior to configuration, to limit the installed set.
-`LINGUAS' should then contain a space separated list of two-letter
-codes, stating which languages are allowed.
-
-1.3 Using This Package
-======================
-
-As a user, if your language has been installed for this package, you
-only have to set the `LANG' environment variable to the appropriate
-`LL_CC' combination.  Here `LL' is an ISO 639 two-letter language code,
-and `CC' is an ISO 3166 two-letter country code.  For example, let's
-suppose that you speak German and live in Germany.  At the shell
-prompt, merely execute `setenv LANG de_DE' (in `csh'),
-`export LANG; LANG=de_DE' (in `sh') or `export LANG=de_DE' (in `bash').
-This can be done from your `.login' or `.profile' file, once and for
-all.
-
-   You might think that the country code specification is redundant.
-But in fact, some languages have dialects in different countries.  For
-example, `de_AT' is used for Austria, and `pt_BR' for Brazil.  The
-country code serves to distinguish the dialects.
-
-   The locale naming convention of `LL_CC', with `LL' denoting the
-language and `CC' denoting the country, is the one use on systems based
-on GNU libc.  On other systems, some variations of this scheme are
-used, such as `LL' or `LL_CC.ENCODING'.  You can get the list of
-locales supported by your system for your language by running the
-command `locale -a | grep '^LL''.
-
-   Not all programs have translations for all languages.  By default, an
-English message is shown in place of a nonexistent translation.  If you
-understand other languages, you can set up a priority list of languages.
-This is done through a different environment variable, called
-`LANGUAGE'.  GNU `gettext' gives preference to `LANGUAGE' over `LANG'
-for the purpose of message handling, but you still need to have `LANG'
-set to the primary language; this is required by other parts of the
-system libraries.  For example, some Swedish users who would rather
-read translations in German than English for when Swedish is not
-available, set `LANGUAGE' to `sv:de' while leaving `LANG' to `sv_SE'.
-
-   Special advice for Norwegian users: The language code for Norwegian
-bokma*l changed from `no' to `nb' recently (in 2003).  During the
-transition period, while some message catalogs for this language are
-installed under `nb' and some older ones under `no', it's recommended
-for Norwegian users to set `LANGUAGE' to `nb:no' so that both newer and
-older translations are used.
-
-   In the `LANGUAGE' environment variable, but not in the `LANG'
-environment variable, `LL_CC' combinations can be abbreviated as `LL'
-to denote the language's main dialect.  For example, `de' is equivalent
-to `de_DE' (German as spoken in Germany), and `pt' to `pt_PT'
-(Portuguese as spoken in Portugal) in this context.
-
-1.4 Translating Teams
-=====================
-
-For the Free Translation Project to be a success, we need interested
-people who like their own language and write it well, and who are also
-able to synergize with other translators speaking the same language.
-Each translation team has its own mailing list.  The up-to-date list of
-teams can be found at the Free Translation Project's homepage,
-`http://www.iro.umontreal.ca/contrib/po/HTML/', in the "National teams"
-area.
-
-   If you'd like to volunteer to _work_ at translating messages, you
-should become a member of the translating team for your own language.
-The subscribing address is _not_ the same as the list itself, it has
-`-request' appended.  For example, speakers of Swedish can send a
-message to `sv-request@li.org', having this message body:
-
-     subscribe
-
-   Keep in mind that team members are expected to participate
-_actively_ in translations, or at solving translational difficulties,
-rather than merely lurking around.  If your team does not exist yet and
-you want to start one, or if you are unsure about what to do or how to
-get started, please write to `translation@iro.umontreal.ca' to reach the
-coordinator for all translator teams.
-
-   The English team is special.  It works at improving and uniformizing
-the terminology in use.  Proven linguistic skills are praised more than
-programming skills, here.
-
-1.5 Available Packages
-======================
-
-Languages are not equally supported in all packages.  The following
-matrix shows the current state of internationalization, as of October
-2006.  The matrix shows, in regard of each package, for which languages
-PO files have been submitted to translation coordination, with a
-translation percentage of at least 50%.
-
-     Ready PO files       af am ar az be bg bs ca cs cy da de el en en_GB eo
-                        +----------------------------------------------------+
-     GNUnet             |                                  []                |
-     a2ps               |             []                [] [] []     []      |
-     aegis              |                                  ()                |
-     ant-phone          |                                  ()                |
-     anubis             |                                  []                |
-     ap-utils           |                                                    |
-     aspell             |                      [] []    [] []        []      |
-     bash               |                      []          []             [] |
-     batchelor          |                                  []                |
-     bfd                |                                                    |
-     bibshelf           |                                  []                |
-     binutils           |                               []                   |
-     bison              |                               [] []                |
-     bison-runtime      |                                                    |
-     bluez-pin          | []                      []       [] []          [] |
-     cflow              |                               []                   |
-     clisp              |                                  []    []          |
-     console-tools      |                         []       []                |
-     coreutils          |                []    []          []                |
-     cpio               |                                                    |
-     cpplib             |                      []       [] []                |
-     cryptonit          |                                  []                |
-     darkstat           |                []             () []                |
-     dialog             |                      [] [] [] [] [] []             |
-     diffutils          |                      [] []    [] [] []          [] |
-     doodle             |                                  []                |
-     e2fsprogs          |                         []       []                |
-     enscript           |                      []       [] []        []      |
-     error              |                      []       [] []        []      |
-     fetchmail          |                      []       [] () []             |
-     fileutils          |                               [] []                |
-     findutils          |                []    []       []                   |
-     flex               |                      []       [] []                |
-     fslint             |                                  []                |
-     gas                |                                                    |
-     gawk               |                      []       [] []                |
-     gbiff              |                                  []                |
-     gcal               |                      []                            |
-     gcc                |                                  []                |
-     gettext-examples   | []                   []          [] []          [] |
-     gettext-runtime    |             []       []       [] []             [] |
-     gettext-tools      |                      []          []                |
-     gimp-print         |                         []    [] []        []      |
-     gip                |                []                                  |
-     gliv               |                                  []                |
-     glunarclock        |                []                                  |
-     gmult              | []                               []                |
-     gnubiff            |                                  ()                |
-     gnucash            |                                  () ()     []      |
-     gnucash-glossary   |                               [] ()                |
-     gnuedu             |                                                    |
-     gnulib             | []          [] []    []       [] []                |
-     gnunet-gtk         |                                                    |
-     gnutls             |                                                    |
-     gpe-aerial         |                         []       []                |
-     gpe-beam           |                         []       []                |
-     gpe-calendar       |                                                    |
-     gpe-clock          |                         []       []                |
-     gpe-conf           |                         []       []                |
-     gpe-contacts       |                                                    |
-     gpe-edit           |                         []                         |
-     gpe-filemanager    |                                                    |
-     gpe-go             |                         []                         |
-     gpe-login          |                         []       []                |
-     gpe-ownerinfo      |                         []       []                |
-     gpe-package        |                                                    |
-     gpe-sketchbook     |                         []       []                |
-     gpe-su             |                         []       []                |
-     gpe-taskmanager    |                         []       []                |
-     gpe-timesheet      |                         []                         |
-     gpe-today          |                         []       []                |
-     gpe-todo           |                                                    |
-     gphoto2            |                         []    [] []        []      |
-     gprof              |                               [] []                |
-     gpsdrive           |                                  ()    ()          |
-     gramadoir          | []                               []                |
-     grep               | []          [] []    []          [] []             |
-     gretl              |                                                    |
-     gsasl              |                                                    |
-     gss                |                                                    |
-     gst-plugins        | []                   [] []    []                   |
-     gst-plugins-base   |                []    []       []                   |
-     gst-plugins-good   | []       []    []    [] []    []           []      |
-     gstreamer          | []             []    [] []    [] []        []      |
-     gtick              |                                  ()                |
-     gtkam              |                         []    [] []                |
-     gtkorphan          |                []                []                |
-     gtkspell           |             []                   [] []          [] |
-     gutenprint         |                               []                   |
-     hello              |                []    []       [] []             [] |
-     id-utils           |                               [] []                |
-     impost             |                                                    |
-     indent             |                      []          []             [] |
-     iso_3166           |                                  []             [] |
-     iso_3166_2         |                                                    |
-     iso_4217           |                                  []                |
-     iso_639            |                                  []             [] |
-     jpilot             |                         []                         |
-     jtag               |                                                    |
-     jwhois             |                                                    |
-     kbd                |                         []    [] [] []             |
-     keytouch           |                                                    |
-     keytouch-editor    |                                                    |
-     keytouch-keyboa... |                                                    |
-     latrine            |                                  ()                |
-     ld                 |                               []                   |
-     leafpad            |                []    [] []       [] []             |
-     libc               |                      [] []    [] [] []             |
-     libexif            |                                  []                |
-     libextractor       |                                  []                |
-     libgpewidget       |                         []    [] []                |
-     libgpg-error       |                                  []                |
-     libgphoto2         |                               [] []                |
-     libgphoto2_port    |                               [] []                |
-     libgsasl           |                                                    |
-     libiconv           |                                  []             [] |
-     libidn             |                               []                [] |
-     lifelines          |                               [] ()                |
-     lilypond           |                                  []                |
-     lingoteach         |                                                    |
-     lynx               |                      [] []    [] []                |
-     m4                 |                         []    [] [] []             |
-     mailutils          |                      []                            |
-     make               |                               [] []                |
-     man-db             |                      [] ()    [] []                |
-     minicom            |                         []    [] []                |
-     mysecretdiary      |                               [] []                |
-     nano               |                []    []          []                |
-     nano_1_0           |                      [] ()    [] []                |
-     opcodes            |                                  []                |
-     parted             |                                                    |
-     pilot-qof          |                                            []      |
-     psmisc             |                []                                  |
-     pwdutils           |                                                    |
-     python             |                                                    |
-     qof                |                                                    |
-     radius             |                      []                            |
-     recode             |             []       []       [] [] []          [] |
-     rpm                |                         []    []                   |
-     screem             |                                                    |
-     scrollkeeper       |          [] []       [] [] [] [] []        []      |
-     sed                |                      []          []             [] |
-     sh-utils           |                               [] []                |
-     shared-mime-info   |                []       []                 []   [] |
-     sharutils          |                []    [] []    [] [] []             |
-     shishi             |                                                    |
-     silky              |                                                    |
-     skencil            |                               [] ()                |
-     sketch             |                               [] ()                |
-     solfege            |                                                    |
-     soundtracker       |                               [] []                |
-     sp                 |                                  []                |
-     stardict           |                         []                         |
-     system-tools-ba... |       []       [] [] [] []    [] [] []     []      |
-     tar                |                []                                  |
-     texinfo            |                               [] []             [] |
-     textutils          |                      []       [] []                |
-     tin                |                                  ()        ()      |
-     tp-robot           |                                  []                |
-     tuxpaint           | []             []             [] []        []      |
-     unicode-han-tra... |                                                    |
-     unicode-transla... |                                                    |
-     util-linux         |                      [] []    [] []                |
-     vorbis-tools       |             []          []    []           []      |
-     wastesedge         |                                  ()                |
-     wdiff              |                      []       [] []        []      |
-     wget               |                      []          []                |
-     xchat              |             [] []    []          [] []     []      |
-     xkeyboard-config   |                                                    |
-     xpad               |                []             []                   |
-                        +----------------------------------------------------+
-                          af am ar az be bg bs ca cs cy da de el en en_GB eo
-                          10  0  1  2  9 22  1 42 41  2 60 95 16  1  17   16
-
-                          es et eu fa fi fr  ga gl gu he hi hr hu id is it
-                        +--------------------------------------------------+
-     GNUnet             |                                                  |
-     a2ps               |    []       [] []                             () |
-     aegis              |                                                  |
-     ant-phone          |                []                                |
-     anubis             |                []                                |
-     ap-utils           |             [] []                                |
-     aspell             |                []  []                         [] |
-     bash               | []             []                    []          |
-     batchelor          |                []  []                            |
-     bfd                | []                                               |
-     bibshelf           | []                 []                         [] |
-     binutils           | []          [] []                                |
-     bison              | [] []          []  []                   []    [] |
-     bison-runtime      |    []          []  []                   []    [] |
-     bluez-pin          |             [] []  []                [] []       |
-     cflow              |                    []                            |
-     clisp              | []             []                                |
-     console-tools      |                                                  |
-     coreutils          | [] []       [] []  []                []          |
-     cpio               | []             []  []                            |
-     cpplib             | []             []                                |
-     cryptonit          |                []                                |
-     darkstat           | []             ()  []                [] []       |
-     dialog             | [] [] []    [] []  []                []       [] |
-     diffutils          | []          [] []  [] []    []       [] []    [] |
-     doodle             |                    []                         [] |
-     e2fsprogs          | []             []                             [] |
-     enscript           |                []  []             []             |
-     error              | []          [] []  []                []          |
-     fetchmail          | []                                               |
-     fileutils          | [] []          []  []                []       [] |
-     findutils          |    []          []  []                []          |
-     flex               | []             []  []                            |
-     fslint             |                []                                |
-     gas                | []             []                                |
-     gawk               | []             []  []       []                   |
-     gbiff              |                []                                |
-     gcal               | []             []                                |
-     gcc                | []                                               |
-     gettext-examples   | []             []  []                [] []    [] |
-     gettext-runtime    | []          [] []  []                   []    [] |
-     gettext-tools      | []             []                             [] |
-     gimp-print         | []             []                                |
-     gip                | []    []       []                                |
-     gliv               |                ()                                |
-     glunarclock        |             []     []                []          |
-     gmult              |       []       []                             [] |
-     gnubiff            |                ()                             () |
-     gnucash            | ()             ()                    ()          |
-     gnucash-glossary   | []                                            [] |
-     gnuedu             | []                                               |
-     gnulib             | [] [] []    [] []  [] []             []          |
-     gnunet-gtk         |                                                  |
-     gnutls             |                                                  |
-     gpe-aerial         | []             []                                |
-     gpe-beam           | []             []                                |
-     gpe-calendar       |                                                  |
-     gpe-clock          | []          [] []                    []          |
-     gpe-conf           |                []                                |
-     gpe-contacts       | []             []                                |
-     gpe-edit           | []             []                    [] []       |
-     gpe-filemanager    | []                                               |
-     gpe-go             | []             []                    []          |
-     gpe-login          | []             []                    []          |
-     gpe-ownerinfo      | []          [] []                    [] []       |
-     gpe-package        | []                                               |
-     gpe-sketchbook     | []             []                                |
-     gpe-su             | []          [] []                    []          |
-     gpe-taskmanager    | []          [] []                                |
-     gpe-timesheet      | []             []  []                   []       |
-     gpe-today          | []          [] []  []                            |
-     gpe-todo           | []                                               |
-     gphoto2            | []          [] []                    []       [] |
-     gprof              | []             []  []                   []       |
-     gpsdrive           | ()             ()                    []       () |
-     gramadoir          |                []  []                            |
-     grep               | [] [] []    [] []  [] []    []    [] [] []    [] |
-     gretl              | []             []                             [] |
-     gsasl              |                    []                   []       |
-     gss                |                []                                |
-     gst-plugins        |                []                    []       [] |
-     gst-plugins-base   |                                      []       [] |
-     gst-plugins-good   |       []                             []       [] |
-     gstreamer          |             []                       []       [] |
-     gtick              |                    []                            |
-     gtkam              | []             []                    []       [] |
-     gtkorphan          |                []                             [] |
-     gtkspell           | []    []    [] []  []                         [] |
-     gutenprint         |                                      []          |
-     hello              | [] [] [] [] [] []  [] []    []    [] [] []    [] |
-     id-utils           |                []  []                [] []    [] |
-     impost             |                []  []                            |
-     indent             | [] [] []    [] []  [] []             [] []    [] |
-     iso_3166           |             [] []                    []          |
-     iso_3166_2         |                []                                |
-     iso_4217           |    []       []        []             []          |
-     iso_639            |          [] [] []  []                []          |
-     jpilot             | []             []                                |
-     jtag               |                []                                |
-     jwhois             | []             []                    [] []    [] |
-     kbd                | []             []                                |
-     keytouch           |                    []                            |
-     keytouch-editor    |                    []                            |
-     keytouch-keyboa... |                    []                            |
-     latrine            |                []  []                         [] |
-     ld                 | []             []                                |
-     leafpad            | []             []  []       []       []       [] |
-     libc               | []          [] []     []             []          |
-     libexif            | []                                               |
-     libextractor       |                    []                            |
-     libgpewidget       | []             []  []                [] []       |
-     libgpg-error       |                                                  |
-     libgphoto2         | []             []                             [] |
-     libgphoto2_port    |                []                             [] |
-     libgsasl           |                []  []                            |
-     libiconv           |    []              []                            |
-     libidn             |                []                             [] |
-     lifelines          |                ()                                |
-     lilypond           |                []                                |
-     lingoteach         |                []                       []    [] |
-     lynx               |    []                                []       [] |
-     m4                 |                []  [] []                []       |
-     mailutils          | []             []                                |
-     make               | []          [] []  [] []    []    []    []       |
-     man-db             | ()                                               |
-     minicom            | []          [] []                    []          |
-     mysecretdiary      | []             []                       []       |
-     nano               | []    []       []  []                []       [] |
-     nano_1_0           | []             []     []                []    [] |
-     opcodes            | []          [] []  []                            |
-     parted             | []             []                       []    [] |
-     pilot-qof          |                                                  |
-     psmisc             |       []                             []       [] |
-     pwdutils           |                                                  |
-     python             |                                                  |
-     qof                |                                         []       |
-     radius             | []             []                                |
-     recode             | []             []  [] []    []       [] []    [] |
-     rpm                |                []                       []       |
-     screem             |                                                  |
-     scrollkeeper       | []          []                       []          |
-     sed                | [] []          []  []                []          |
-     sh-utils           | [] []       [] []  []                []       [] |
-     shared-mime-info   | []    []    [] []                    []       [] |
-     sharutils          | [] []       [] []  [] []             []       [] |
-     shishi             |                                                  |
-     silky              |                []                                |
-     skencil            | []             []                                |
-     sketch             | []             []                                |
-     solfege            |                                               [] |
-     soundtracker       | []             []                             [] |
-     sp                 |                []                                |
-     stardict           |                                      []          |
-     system-tools-ba... | []    []    [] []                 [] [] []    [] |
-     tar                | [] []       [] []  []                []       [] |
-     texinfo            |                []           []                   |
-     textutils          | []             []  [] []             []          |
-     tin                |    []          ()                                |
-     tp-robot           |             [] []  []                []          |
-     tuxpaint           |                    []                []          |
-     unicode-han-tra... |                                                  |
-     unicode-transla... |                []  []                            |
-     util-linux         | [] []       [] []                    [] []    [] |
-     vorbis-tools       | []             []                                |
-     wastesedge         |                ()                                |
-     wdiff              | [] []          []  [] []             [] []    [] |
-     wget               |    []       [] []  []             [] [] []    [] |
-     xchat              | []    []    [] []        []    []    []       [] |
-     xkeyboard-config   |             [] []                    []       [] |
-     xpad               | []                 []                []          |
-                        +--------------------------------------------------+
-                          es et eu fa fi fr  ga gl gu he hi hr hu id is it
-                          88 22 14  2 40 115 61 14  1  8  1  6 59 31  0 52
-
-                          ja ko ku ky lg lt lv mk mn ms mt nb ne nl nn no
-                        +-------------------------------------------------+
-     GNUnet             |                                                 |
-     a2ps               |    ()                      []          []    () |
-     aegis              |                                        ()       |
-     ant-phone          |                                        []       |
-     anubis             |                            []    []    []       |
-     ap-utils           |                            []                   |
-     aspell             |                         []             []       |
-     bash               |                                        []       |
-     batchelor          |                            []          []       |
-     bfd                |                                                 |
-     bibshelf           |                            []                   |
-     binutils           |                                                 |
-     bison              |                            []    []    []       |
-     bison-runtime      |                            []    []    []       |
-     bluez-pin          |       []                   []          []       |
-     cflow              |                                                 |
-     clisp              |                                        []       |
-     console-tools      |                                                 |
-     coreutils          |                                        []       |
-     cpio               |                                                 |
-     cpplib             |                                        []       |
-     cryptonit          |                                        []       |
-     darkstat           |                            []          []       |
-     dialog             |                            []          []       |
-     diffutils          | []                         []          []       |
-     doodle             |                                                 |
-     e2fsprogs          |                                        []       |
-     enscript           |                                        []       |
-     error              |                                        []       |
-     fetchmail          | []                                     []       |
-     fileutils          | []          []                                  |
-     findutils          |                                        []       |
-     flex               |    []                                  []       |
-     fslint             |                            []          []       |
-     gas                |                                                 |
-     gawk               | []                                     []       |
-     gbiff              |                                        []       |
-     gcal               |                                                 |
-     gcc                |                                                 |
-     gettext-examples   | []                                     []       |
-     gettext-runtime    | [] []                                  []       |
-     gettext-tools      | [] []                                           |
-     gimp-print         | []                                     []       |
-     gip                |                            []          []       |
-     gliv               |                                        []       |
-     glunarclock        |                            []          []       |
-     gmult              | []                         []                   |
-     gnubiff            |                                                 |
-     gnucash            | ()                               ()             |
-     gnucash-glossary   |                                        []       |
-     gnuedu             |                                                 |
-     gnulib             | [] []                      []          []       |
-     gnunet-gtk         |                                                 |
-     gnutls             |                                                 |
-     gpe-aerial         |                                        []       |
-     gpe-beam           |                                        []       |
-     gpe-calendar       | []                                              |
-     gpe-clock          | [] []                                  []       |
-     gpe-conf           |    []                                  []       |
-     gpe-contacts       |    []                                           |
-     gpe-edit           | [] []                                  []       |
-     gpe-filemanager    | [] []                                           |
-     gpe-go             | [] []                                  []       |
-     gpe-login          | [] []                                  []       |
-     gpe-ownerinfo      | []                                     []       |
-     gpe-package        | [] []                                           |
-     gpe-sketchbook     |    []                                  []       |
-     gpe-su             | [] []                                  []       |
-     gpe-taskmanager    | [] [] []                               []       |
-     gpe-timesheet      |                                        []       |
-     gpe-today          | []                                     []       |
-     gpe-todo           | []                                              |
-     gphoto2            | []                                     []       |
-     gprof              |                                                 |
-     gpsdrive           | ()                                     ()    () |
-     gramadoir          |                                        ()       |
-     grep               | []       []                      []    []       |
-     gretl              |                                                 |
-     gsasl              |                                        []       |
-     gss                |                                                 |
-     gst-plugins        |                                        []       |
-     gst-plugins-base   |                                                 |
-     gst-plugins-good   |                                        []       |
-     gstreamer          |                                        []       |
-     gtick              |                                                 |
-     gtkam              | []                                              |
-     gtkorphan          |                                        []       |
-     gtkspell           |                         []             []       |
-     gutenprint         |                                                 |
-     hello              | [] []                      []    []    [] []    |
-     id-utils           |                                        []       |
-     impost             |                                                 |
-     indent             | []                                     []       |
-     iso_3166           |                                        []       |
-     iso_3166_2         |                                        []       |
-     iso_4217           | []                      []             []       |
-     iso_639            | []                                     []       |
-     jpilot             | ()                                     ()    () |
-     jtag               |                                                 |
-     jwhois             |                                        []       |
-     kbd                |                                        []       |
-     keytouch           |                                        []       |
-     keytouch-editor    |                                                 |
-     keytouch-keyboa... |                                                 |
-     latrine            |                                        []       |
-     ld                 |                                                 |
-     leafpad            | []             []                               |
-     libc               | [] []                            []    []    [] |
-     libexif            |                                                 |
-     libextractor       |                                                 |
-     libgpewidget       |                                        []       |
-     libgpg-error       |                                                 |
-     libgphoto2         | []                                              |
-     libgphoto2_port    | []                                              |
-     libgsasl           |                                        []       |
-     libiconv           |                                                 |
-     libidn             | []                                     []       |
-     lifelines          |                                        []       |
-     lilypond           |                                                 |
-     lingoteach         |                                        []       |
-     lynx               | []                                     []       |
-     m4                 | []                                     []       |
-     mailutils          |                                                 |
-     make               | [] []                                  []       |
-     man-db             | ()                                              |
-     minicom            | []                                              |
-     mysecretdiary      |                                        []       |
-     nano               |                            []    []    []       |
-     nano_1_0           |                            []    []       []    |
-     opcodes            |                                        []       |
-     parted             | []                                     []       |
-     pilot-qof          |                                                 |
-     psmisc             | []                               []    []       |
-     pwdutils           |                                                 |
-     python             |                                                 |
-     qof                |                                                 |
-     radius             |                                                 |
-     recode             |                                        []       |
-     rpm                | [] []                                           |
-     screem             | []                                              |
-     scrollkeeper       |                                  [] [] [] []    |
-     sed                | []                                     []       |
-     sh-utils           | []                               []             |
-     shared-mime-info   |    []          []                []    [] []    |
-     sharutils          | []                                     []       |
-     shishi             |                                                 |
-     silky              |                                        []       |
-     skencil            |                                                 |
-     sketch             |                                                 |
-     solfege            |                                                 |
-     soundtracker       |                                                 |
-     sp                 | ()                                              |
-     stardict           |                      []                []       |
-     system-tools-ba... | [] []          []                      []       |
-     tar                | []       []                            []       |
-     texinfo            | []                               []    []       |
-     textutils          | [] []                            []             |
-     tin                |                                                 |
-     tp-robot           |                                        []       |
-     tuxpaint           |                                           []    |
-     unicode-han-tra... |                                                 |
-     unicode-transla... |                                                 |
-     util-linux         | []                                     []       |
-     vorbis-tools       |                                        []       |
-     wastesedge         |                                        []       |
-     wdiff              |                            []    []             |
-     wget               | []                                     []       |
-     xchat              | [] []                []                []       |
-     xkeyboard-config   |                                        []       |
-     xpad               |    []                      []          []       |
-                        +-------------------------------------------------+
-                          ja ko ku ky lg lt lv mk mn ms mt nb ne nl nn no
-                          52 24  2  2  1  3  0  2  3 21  0 15  1 97  5  1
-
-                          nso or pa pl pt pt_BR rm ro ru rw sk sl sq sr sv  ta
-                        +------------------------------------------------------+
-     GNUnet             |                                                      |
-     a2ps               |           ()     []      [] []       []    [] []     |
-     aegis              |                          () ()                       |
-     ant-phone          |                          []                   []     |
-     anubis             |           []             [] []                       |
-     ap-utils           |           ()                                         |
-     aspell             |                          [] []                       |
-     bash               |                  []      [] []                       |
-     batchelor          |                          []                   []     |
-     bfd                |                                                      |
-     bibshelf           |                                               []     |
-     binutils           |                             []                []     |
-     bison              |           []     []      [] []                []     |
-     bison-runtime      |           []             []          []       []     |
-     bluez-pin          |           []     []   [] [] []    [] []    [] []     |
-     cflow              |           []                                         |
-     clisp              |                             []                       |
-     console-tools      |                             []                       |
-     coreutils          |           []                []       []       []     |
-     cpio               |           []                []                []     |
-     cpplib             |                                               []     |
-     cryptonit          |                  []                           []     |
-     darkstat           |           []     []      []       []       [] []     |
-     dialog             |           [] []  []   [] [] [] []          [] []     |
-     diffutils          |           []     []      [] []             [] []     |
-     doodle             |                                         []    []     |
-     e2fsprogs          |           []                                  []     |
-     enscript           |                  []      [] []       []       []     |
-     error              |                  []      []       []          []     |
-     fetchmail          |           []                []          []           |
-     fileutils          |           []             [] []       []       []     |
-     findutils          |           [] []          []       [] []       []     |
-     flex               |           []     []      [] []                []     |
-     fslint             |                  []      []                [] []     |
-     gas                |                                                      |
-     gawk               |           []     []      []                   []     |
-     gbiff              |                          []                          |
-     gcal               |                                               []     |
-     gcc                |                                               []     |
-     gettext-examples   |           [] []          [] []    [] []    [] []     |
-     gettext-runtime    |           [] []          [] []    [] []    [] []     |
-     gettext-tools      |           []             [] []    [] []    [] []     |
-     gimp-print         |                                   []          []     |
-     gip                |                       []          []       [] []     |
-     gliv               |                  []      []       []          []     |
-     glunarclock        |                  []      [] []    []       [] []     |
-     gmult              |                       [] []                [] []     |
-     gnubiff            |                          ()                          |
-     gnucash            |           ()                                  []     |
-     gnucash-glossary   |              []                   []          []     |
-     gnuedu             |                                                      |
-     gnulib             |           []             [] []       []       []     |
-     gnunet-gtk         |                                               []     |
-     gnutls             |           []                                  []     |
-     gpe-aerial         |              []  []      [] []       []    [] []     |
-     gpe-beam           |              []  []      [] []       []    [] []     |
-     gpe-calendar       |                             []                       |
-     gpe-clock          |              []  []      [] []    [] []    [] []     |
-     gpe-conf           |              []  []      [] []    [] []       []     |
-     gpe-contacts       |                          [] []       []    [] []     |
-     gpe-edit           |              []  []      [] []    [] []    [] []     |
-     gpe-filemanager    |                                      []       []     |
-     gpe-go             |                  []      [] []       []    [] []     |
-     gpe-login          |              []  []      [] []    [] []    [] []     |
-     gpe-ownerinfo      |              []  []      [] []    [] []    [] []     |
-     gpe-package        |                                      []       []     |
-     gpe-sketchbook     |              []  []      [] []    [] []    [] []     |
-     gpe-su             |              []  []      [] []    [] []    [] []     |
-     gpe-taskmanager    |              []  []      [] []    [] []    [] []     |
-     gpe-timesheet      |              []  []      [] []    [] []    [] []     |
-     gpe-today          |              []  []      [] []    [] []    [] []     |
-     gpe-todo           |                             []       []    [] []     |
-     gphoto2            |           []             []       []       [] []     |
-     gprof              |                  []      []                   []     |
-     gpsdrive           |        []                []                   []     |
-     gramadoir          |                                   []          []     |
-     grep               |           [] []  []      [] []       []    [] []     |
-     gretl              |           []                                         |
-     gsasl              |           []                               [] []     |
-     gss                |           []             []                   []     |
-     gst-plugins        |     []                                  [] [] []     |
-     gst-plugins-base   |                                               []     |
-     gst-plugins-good   |     []                                  [] [] []     |
-     gstreamer          |                                         [] [] []     |
-     gtick              |                             []                       |
-     gtkam              |           []     []         []                []     |
-     gtkorphan          |                                               []     |
-     gtkspell           |                  []   [] [] []    [] []    [] []     |
-     gutenprint         |                                               []     |
-     hello              |           []     []      [] []    [] []    [] []     |
-     id-utils           |                  []      [] []                []     |
-     impost             |                                               []     |
-     indent             |                  []      [] []    []       [] []     |
-     iso_3166           |              []                []    [] [] [] []     |
-     iso_3166_2         |                                                      |
-     iso_4217           |                                []    []    [] []     |
-     iso_639            |                                []    []    [] []     |
-     jpilot             |                                                      |
-     jtag               |                                   []                 |
-     jwhois             |           []     []      []                   []     |
-     kbd                |           []             []                   []     |
-     keytouch           |                                               []     |
-     keytouch-editor    |                                               []     |
-     keytouch-keyboa... |                                               []     |
-     latrine            |                          []                   []     |
-     ld                 |                                               []     |
-     leafpad            |           [] []             []    []          []  [] |
-     libc               |           []     []         []    []          []     |
-     libexif            |           []                                         |
-     libextractor       |                          []                   []     |
-     libgpewidget       |              []  []      []       [] []    [] []     |
-     libgpg-error       |           []             []                          |
-     libgphoto2         |           []                                         |
-     libgphoto2_port    |           []                []                []     |
-     libgsasl           |           []             []                [] []     |
-     libiconv           |                                      []    []        |
-     libidn             |           []                               [] ()     |
-     lifelines          |           []                                  []     |
-     lilypond           |                                                      |
-     lingoteach         |                  []                                  |
-     lynx               |                  []         []                []     |
-     m4                 |           []     []      [] []                []     |
-     mailutils          |           []             [] []                []     |
-     make               |           []     []         []                []     |
-     man-db             |                          []                   []     |
-     minicom            |           []     []      [] []                []     |
-     mysecretdiary      |                  []      [] []                []     |
-     nano               |                  []      []                   []     |
-     nano_1_0           |           []             [] []                []     |
-     opcodes            |                          []                   []     |
-     parted             |           []                                         |
-     pilot-qof          |                                               []     |
-     psmisc             |           []                                  []     |
-     pwdutils           |           []                                  []     |
-     python             |                                                      |
-     qof                |                  []                           []     |
-     radius             |           []                []                       |
-     recode             |           [] []  []      [] []       []       []     |
-     rpm                |           [] []             []                []     |
-     screem             |                                                      |
-     scrollkeeper       |           []             [] []    []    [] [] []     |
-     sed                |           [] []  []      [] []    [] []    [] []     |
-     sh-utils           |                             []       []    []        |
-     shared-mime-info   |              []  []                     [] [] []     |
-     sharutils          |           []                []             [] []     |
-     shishi             |           []                                         |
-     silky              |                                   []                 |
-     skencil            |              []  []                           []     |
-     sketch             |              []  []                           []     |
-     solfege            |                                               []     |
-     soundtracker       |                                   []          []     |
-     sp                 |                                                      |
-     stardict           |                             []    []          []     |
-     system-tools-ba... |        [] [] []  []      []             [] [] []  [] |
-     tar                |           []             [] []       []       []     |
-     texinfo            |           []             [] []                []     |
-     textutils          |                             []       []       []     |
-     tin                |                             ()                       |
-     tp-robot           |                             []                       |
-     tuxpaint           |              []                      [] [] [] []     |
-     unicode-han-tra... |                                                      |
-     unicode-transla... |                                                      |
-     util-linux         |                  []         []       []       []     |
-     vorbis-tools       |                          [] []                       |
-     wastesedge         |                                                      |
-     wdiff              |           []     []      [] []    []          []     |
-     wget               |              []             []    []          []     |
-     xchat              |        []                   []    [] [] [] [] []     |
-     xkeyboard-config   |                                      []       []     |
-     xpad               |                                   [] []       []     |
-                        +------------------------------------------------------+
-                          nso or pa pl pt pt_BR rm ro ru rw sk sl sq sr sv  ta
-                           0   2  3 58 30  54    5 73 72  4 40 46 11 50 128  2
-
-                          tg th tk tr uk ven vi  wa xh zh_CN zh_HK zh_TW zu
-                        +---------------------------------------------------+
-     GNUnet             |                    []                             |  2
-     a2ps               |          [] []     []                             | 19
-     aegis              |                                                   |  0
-     ant-phone          |          []        []                             |  6
-     anubis             |          [] []     []                             | 11
-     ap-utils           |             ()     []                             |  4
-     aspell             |             []     []  []                         | 15
-     bash               |                    []                             | 11
-     batchelor          |          []        []                             |  9
-     bfd                |                                                   |  1
-     bibshelf           |                    []                             |  7
-     binutils           |          []        []                     []      |  9
-     bison              |          []        []                     []      | 19
-     bison-runtime      |                    []         []          []      | 15
-     bluez-pin          |          [] []     []  []     []          []      | 28
-     cflow              |             []     []                             |  5
-     clisp              |                                                   |  6
-     console-tools      |          []        []                             |  5
-     coreutils          |          []        []                             | 16
-     cpio               |          [] []     []                             |  9
-     cpplib             |          []        []         []          []      | 11
-     cryptonit          |                                                   |  5
-     darkstat           |                    []         ()          ()      | 15
-     dialog             |          [] []     []         []          []      | 30
-     diffutils          |          []        []         []          []      | 28
-     doodle             |                    []                             |  6
-     e2fsprogs          |          []        []                             | 10
-     enscript           |          [] []     []                             | 16
-     error              |          []        []         []          []      | 18
-     fetchmail          |          []        []                             | 12
-     fileutils          |          []                   []          []      | 18
-     findutils          |          []        []                     []      | 17
-     flex               |          []        []                             | 15
-     fslint             |                    []                             |  9
-     gas                |          []                                       |  3
-     gawk               |          []        []                             | 15
-     gbiff              |                    []                             |  5
-     gcal               |          []                                       |  5
-     gcc                |          []                   []          []      |  6
-     gettext-examples   |          [] []     []         []    []    []      | 27
-     gettext-runtime    |          [] []     []         []    []    []      | 28
-     gettext-tools      |          [] []     []         []          []      | 19
-     gimp-print         |             []     []                             | 12
-     gip                |                    []                     []      | 12
-     gliv               |          []        []                             |  8
-     glunarclock        |                    []  []                 []      | 15
-     gmult              |          []        []         []          []      | 15
-     gnubiff            |                    []                             |  1
-     gnucash            |          ()                                       |  2
-     gnucash-glossary   |                    []                     []      |  9
-     gnuedu             |                    []                             |  2
-     gnulib             |          [] []     []         []          []      | 28
-     gnunet-gtk         |                                                   |  1
-     gnutls             |                                                   |  2
-     gpe-aerial         |                    []         []                  | 14
-     gpe-beam           |                    []         []                  | 14
-     gpe-calendar       |                    []                             |  3
-     gpe-clock          |          []        []  []     []                  | 21
-     gpe-conf           |                    []         []                  | 14
-     gpe-contacts       |                    []         []                  | 10
-     gpe-edit           |          []        []  []                 []      | 20
-     gpe-filemanager    |                    []                             |  6
-     gpe-go             |          []        []                             | 15
-     gpe-login          |          []        []  []     []          []      | 21
-     gpe-ownerinfo      |          []        []         []          []      | 21
-     gpe-package        |                    []                             |  6
-     gpe-sketchbook     |          []        []                             | 16
-     gpe-su             |          []        []         []                  | 20
-     gpe-taskmanager    |          []        []         []                  | 20
-     gpe-timesheet      |          []        []         []          []      | 18
-     gpe-today          |          []        []  []     []          []      | 21
-     gpe-todo           |                    []                             |  7
-     gphoto2            |             []     []         []          []      | 20
-     gprof              |          []        []                             | 11
-     gpsdrive           |                                                   |  4
-     gramadoir          |                    []                             |  7
-     grep               |          [] []     []                     []      | 34
-     gretl              |                                                   |  4
-     gsasl              |                    []         []                  |  8
-     gss                |                    []                             |  5
-     gst-plugins        |             []     []                     []      | 15
-     gst-plugins-base   |             []     []         []                  |  9
-     gst-plugins-good   |             []     []         []    []    []      | 20
-     gstreamer          |          [] []     []                             | 17
-     gtick              |                    []                             |  3
-     gtkam              |                    []                             | 13
-     gtkorphan          |                    []                             |  7
-     gtkspell           |             []     []  []     []    []    []      | 26
-     gutenprint         |                                                   |  3
-     hello              |          [] []     []         []          []      | 37
-     id-utils           |          []        []                             | 14
-     impost             |                    []                             |  4
-     indent             |          []        []         []          []      | 25
-     iso_3166           |       [] []        []               []            | 16
-     iso_3166_2         |                                                   |  2
-     iso_4217           |          []        []                             | 14
-     iso_639            |                    []                             | 14
-     jpilot             |          [] []     []         []                  |  7
-     jtag               |                    []                             |  3
-     jwhois             |          []        []                     []      | 13
-     kbd                |          []        []                             | 12
-     keytouch           |                    []                             |  4
-     keytouch-editor    |                                                   |  2
-     keytouch-keyboa... |                    []                             |  3
-     latrine            |          []        []                             |  8
-     ld                 |          []        []         []          []      |  8
-     leafpad            |          []        []         []          []      | 23
-     libc               |          []                   []          []      | 23
-     libexif            |                    []                             |  4
-     libextractor       |                    []                             |  5
-     libgpewidget       |                    []  []     []                  | 19
-     libgpg-error       |                    []                             |  4
-     libgphoto2         |             []                                    |  8
-     libgphoto2_port    |             []     []                     []      | 11
-     libgsasl           |                    []                             |  8
-     libiconv           |                    []                             |  7
-     libidn             |                    []         []                  | 10
-     lifelines          |                                                   |  4
-     lilypond           |                                                   |  2
-     lingoteach         |                    []                             |  6
-     lynx               |          [] []     []                             | 15
-     m4                 |                    []         []          []      | 18
-     mailutils          |             []                                    |  8
-     make               |          []        []         []                  | 20
-     man-db             |                    []                             |  6
-     minicom            |                    []                             | 14
-     mysecretdiary      |          []        []                             | 12
-     nano               |                    []                     []      | 17
-     nano_1_0           |          [] []     []                             | 18
-     opcodes            |          []        []                             | 10
-     parted             |          [] []                            []      | 10
-     pilot-qof          |                    []                             |  3
-     psmisc             |                    []                             | 10
-     pwdutils           |                    []                             |  3
-     python             |                                                   |  0
-     qof                |                    []                             |  4
-     radius             |             []                                    |  6
-     recode             |          []        []         []                  | 25
-     rpm                |          [] []     []                     []      | 14
-     screem             |                    []                             |  2
-     scrollkeeper       |          [] []     []                     []      | 26
-     sed                |          []        []                     []      | 22
-     sh-utils           |          []                                       | 15
-     shared-mime-info   |             []     []         []          []      | 24
-     sharutils          |          []        []                     []      | 23
-     shishi             |                                                   |  1
-     silky              |                    []                             |  4
-     skencil            |                    []                             |  7
-     sketch             |                                                   |  6
-     solfege            |                                                   |  2
-     soundtracker       |          []        []                             |  9
-     sp                 |          []                                       |  3
-     stardict           |             []     []         []          []      | 11
-     system-tools-ba... |    []    [] []     []     []  []          []      | 37
-     tar                |          [] []     []                     []      | 20
-     texinfo            |          []        []         []                  | 15
-     textutils          |          []                   []          []      | 17
-     tin                |                                                   |  1
-     tp-robot           |                    []         []          []      | 10
-     tuxpaint           |                    []  []                 []      | 16
-     unicode-han-tra... |                                                   |  0
-     unicode-transla... |                                                   |  2
-     util-linux         |          [] []     []                             | 20
-     vorbis-tools       |             []     []                             | 11
-     wastesedge         |                                                   |  1
-     wdiff              |          []        []                             | 22
-     wget               |          []        []                     []      | 19
-     xchat              |             []     []         []          []      | 29
-     xkeyboard-config   |          [] []     []                     []      | 11
-     xpad               |                    []         []          []      | 14
-                        +---------------------------------------------------+
-       77 teams           tg th tk tr uk ven vi  wa xh zh_CN zh_HK zh_TW zu
-      170 domains          0  1  1 77 39  0  136 10  1  48     5    54    0  2028
-
-   Some counters in the preceding matrix are higher than the number of
-visible blocks let us expect.  This is because a few extra PO files are
-used for implementing regional variants of languages, or language
-dialects.
-
-   For a PO file in the matrix above to be effective, the package to
-which it applies should also have been internationalized and
-distributed as such by its maintainer.  There might be an observable
-lag between the mere existence a PO file and its wide availability in a
-distribution.
-
-   If October 2006 seems to be old, you may fetch a more recent copy of
-this `ABOUT-NLS' file on most GNU archive sites.  The most up-to-date
-matrix with full percentage details can be found at
-`http://www.iro.umontreal.ca/contrib/po/HTML/matrix.html'.
-
-1.6 Using `gettext' in new packages
-===================================
-
-If you are writing a freely available program and want to
-internationalize it you are welcome to use GNU `gettext' in your
-package.  Of course you have to respect the GNU Library General Public
-License which covers the use of the GNU `gettext' library.  This means
-in particular that even non-free programs can use `libintl' as a shared
-library, whereas only free software can use `libintl' as a static
-library or use modified versions of `libintl'.
-
-   Once the sources are changed appropriately and the setup can handle
-the use of `gettext' the only thing missing are the translations.  The
-Free Translation Project is also available for packages which are not
-developed inside the GNU project.  Therefore the information given above
-applies also for every other Free Software Project.  Contact
-`translation@iro.umontreal.ca' to make the `.pot' files available to
-the translation teams.
-
diff --git a/Makefile.am b/Makefile.am
index c74716a..14a4266 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -4,7 +4,7 @@ AUTOMAKE_OPTIONS = 1.4 foreign
 
 LINT = splint
 
-EXTRA_DIST = config.rpath m4/ChangeLog  config.rpath m4/ChangeLog  autogen.sh CHANGES $(man_MANS) popt.spec libpopt.vers \
+EXTRA_DIST = config.rpath m4/ChangeLog  m4/ChangeLog  config.rpath m4/ChangeLog  config.rpath m4/ChangeLog  autogen.sh CHANGES $(man_MANS) popt.spec libpopt.vers \
 	testit.sh test-poptrc test3-data/0* \
 	po/*.in po/*.po po/popt.pot \
 	popt.ps
diff --git a/autogen.sh b/autogen.sh
index e991a47..ad46219 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -16,7 +16,7 @@ case $libtoolize in
 esac
 
 cd "$srcdir"
-gettextize --copy --force --intl
+[ -f po/Makefile.in.in ] || gettextize --copy --force --intl
 $libtoolize --copy --force
 aclocal -I m4
 autoheader
diff --git a/configure.ac b/configure.ac
index d40fc2f..42c0801 100755
--- a/configure.ac
+++ b/configure.ac
@@ -1,8 +1,8 @@
-AC_INIT(popt.h)
-AC_CANONICAL_SYSTEM
-AC_PREREQ(2.12)
+AC_PREREQ(2.57)
+AC_INIT(popt, 1.11, popt-devel@rpm5.org)
+AC_CANONICAL_TARGET
+AC_CONFIG_SRCDIR([popt.h])
 AC_CONFIG_HEADERS([config.h])
-AM_INIT_AUTOMAKE(popt, 1.10.9)
 
 # Library code modified:                              REVISION++
 # Interfaces changed/added/removed:   CURRENT++       REVISION=0
@@ -12,24 +12,24 @@ AC_SUBST(LT_CURRENT, 0)
 AC_SUBST(LT_REVISION, 0)
 AC_SUBST(LT_AGE, 8)
 
-ALL_LINGUAS="cs da de es eu_ES fi fr gl hu id is it ja ko no pl pt pt_BR ro ru sk sl sr sv tr uk wa zh zh_CN zh_TW"
+AM_INIT_AUTOMAKE([foreign])
 
-AC_ISC_POSIX
+ALL_LINGUAS="cs da de es eu_ES fi fr gl hu id is it ja ko no pl pt pt_BR ro ru sk sl sr sv tr uk wa zh zh_CN zh_TW"
 
 AC_PROG_CC
-AC_GCC_TRADITIONAL
-AM_C_PROTOTYPES
-AC_SYS_LARGEFILE
-
-dnl AM_DISABLE_SHARED
-AM_PROG_LIBTOOL
-
 AC_PROG_INSTALL
+AC_PROG_LIBTOOL
 
 if test "X$CC" = Xgcc; then
     CFLAGS="-Wall $CFLAGS"
 fi
 
+AC_GCC_TRADITIONAL
+AC_SYS_LARGEFILE
+
+AC_ISC_POSIX
+AM_C_PROTOTYPES
+
 dnl XXX lose rpm libs
 LIBS=
 addlib() {
@@ -102,7 +102,6 @@ AC_CHECK_FUNC(setreuid, [], [
 ])
 AC_CHECK_FUNCS(getuid geteuid mtrace __secure_getenv setregid strerror)
 
-
 AM_GNU_GETTEXT([external])
 
 POPT_SOURCE_PATH="`pwd`"
@@ -110,4 +109,4 @@ AC_DEFINE_UNQUOTED(POPT_SOURCE_PATH, "$POPT_SOURCE_PATH",
 	[Full path to popt top_srcdir.])
 AC_SUBST(POPT_SOURCE_PATH)
 
-AC_OUTPUT([Doxyfile Makefile intl/Makefile po/Makefile.in])
+AC_OUTPUT([Doxyfile Makefile po/Makefile.in])
diff --git a/po/.cvsignore b/po/.cvsignore
index cfc2251..da8d08d 100644
--- a/po/.cvsignore
+++ b/po/.cvsignore
@@ -1,8 +1,10 @@
+ChangeLog
 Makefile
 Makefile.in
 Makefile.in.in
 Makevars.template
 POTFILES
+Rules-quot
 stamp-cat-id
 stamp-po
 cat-id-tbl.c
-- 
Gitee


From a4e782c7cb305a625cb82815cf356f65208a1613 Mon Sep 17 00:00:00 2001
From: Jeff Johnson <n3npq@mac.com>
Date: Sat, 9 Jun 2007 22:20:24 +0000
Subject: [PATCH 413/667] Un-gettextized version of configure.ac.

---
 configure.ac | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/configure.ac b/configure.ac
index 42c0801..d312023 100755
--- a/configure.ac
+++ b/configure.ac
@@ -109,4 +109,4 @@ AC_DEFINE_UNQUOTED(POPT_SOURCE_PATH, "$POPT_SOURCE_PATH",
 	[Full path to popt top_srcdir.])
 AC_SUBST(POPT_SOURCE_PATH)
 
-AC_OUTPUT([Doxyfile Makefile po/Makefile.in])
+AC_OUTPUT([Doxyfile Makefile])
-- 
Gitee


From 4c4d25d825cb8868f44360c4ec22d7022bc84074 Mon Sep 17 00:00:00 2001
From: Jeff Johnson <n3npq@mac.com>
Date: Sat, 9 Jun 2007 22:23:53 +0000
Subject: [PATCH 414/667] Ungettextized version of Makefile.am.

---
 Makefile.am | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Makefile.am b/Makefile.am
index 14a4266..3d8f0d5 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -4,7 +4,7 @@ AUTOMAKE_OPTIONS = 1.4 foreign
 
 LINT = splint
 
-EXTRA_DIST = config.rpath m4/ChangeLog  m4/ChangeLog  config.rpath m4/ChangeLog  config.rpath m4/ChangeLog  autogen.sh CHANGES $(man_MANS) popt.spec libpopt.vers \
+EXTRA_DIST = autogen.sh CHANGES $(man_MANS) popt.spec libpopt.vers \
 	testit.sh test-poptrc test3-data/0* \
 	po/*.in po/*.po po/popt.pot \
 	popt.ps
-- 
Gitee


From 21f97e12554d3e35348e9be14f00b7743bb11b06 Mon Sep 17 00:00:00 2001
From: Jeff Johnson <n3npq@mac.com>
Date: Sat, 9 Jun 2007 23:50:07 +0000
Subject: [PATCH 415/667] prepare popt-1.11 for release.

---
 .cvsignore |  3 +++
 popt.spec  | 28 +++++++++++++---------------
 2 files changed, 16 insertions(+), 15 deletions(-)

diff --git a/.cvsignore b/.cvsignore
index 1ee4333..5af65ad 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1,6 +1,7 @@
 .deps
 .depend
 .libs
+ABOUT-NLS
 ChangeLog
 Doxyfile
 Makefile
@@ -19,11 +20,13 @@ configure
 doxygen
 depcomp
 install-sh
+intl
 libtool
 ltconfig
 ltmain.sh
 m4
 missing
+mkinstalldirs
 stamp-h
 stamp-h1
 stamp-h.in
diff --git a/popt.spec b/popt.spec
index 511e015..f6e0276 100644
--- a/popt.spec
+++ b/popt.spec
@@ -1,15 +1,11 @@
-#
-# Note: popt is now an rpm sub-package (including libpopt.so*) so you probably
-# shouldn't need to use this spec file to package popt anymore.
-#
 Summary: A C library for parsing command line parameters.
 Name: popt
-Version: 1.10.7
-Release: 0.1
+Version: 1.11
+Release: 1
 License: X Consortium
 Group: System Environment/Libraries
-Source: ftp://ftp.redhat.com/pub/redhat/code/popt/popt-%{version}.tar.gz
-BuildRoot: /var/tmp/%{name}root
+Source: http://rpm5.org/v/files/popt/%{name}-%{version}.tar.gz
+BuildRoot: %{_tmppath}/%{name}-root
 
 %description
 Popt is a C library for parsing command line parameters.  Popt
@@ -28,25 +24,27 @@ capabilities.
 %setup -q
 
 %build
-#CFLAGS="$RPM_OPT_FLAGS" ./configure --prefix=/usr
-
 %configure
 make
 
 %install
+rm -rf $RPM_BUILD_ROOT
 make DESTDIR=$RPM_BUILD_ROOT install
+%find_lang popt
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-%files
+%files -f popt.lang
 %defattr(-,root,root)
-%{_prefix}/lib/libpopt.*
-%{_prefix}/include/popt.h
-%{_prefix}/man/man3/popt.3
-%{_prefix}/share/locale/*/LC_MESSAGES/popt.mo
+%{_libdir}/libpopt.*
+%{_includedir}/popt.h
+%{_mandir}/man3/popt.3*
 
 %changelog
+* Sat Jun  9 2007 Jeff Johnson <jbj@rpm5.org>
+- release popt-1.11 through rpm5.org.
+
 * Thu Dec 10 1998 Michael Johnson <johnsonm@redhat.com>
 - released 1.2.2; see CHANGES
 
-- 
Gitee


From c14a6725959410c13304a707d610d7878383328b Mon Sep 17 00:00:00 2001
From: Jeff Johnson <n3npq@mac.com>
Date: Sun, 10 Jun 2007 00:15:01 +0000
Subject: [PATCH 416/667] update to latest text from rpm.spec.

---
 popt.spec | 19 ++++++++-----------
 1 file changed, 8 insertions(+), 11 deletions(-)

diff --git a/popt.spec b/popt.spec
index f6e0276..fdef2ac 100644
--- a/popt.spec
+++ b/popt.spec
@@ -8,17 +8,14 @@ Source: http://rpm5.org/v/files/popt/%{name}-%{version}.tar.gz
 BuildRoot: %{_tmppath}/%{name}-root
 
 %description
-Popt is a C library for parsing command line parameters.  Popt
-was heavily influenced by the getopt() and getopt_long() functions,
-but it improves on them by allowing more powerful argument expansion.
-Popt can parse arbitrary argv[] style arrays and automatically set
-variables based on command line arguments.  Popt allows command
-line arguments to be aliased via configuration files and includes
-utility functions for parsing arbitrary strings into argv[] arrays
-using shell-like rules.
-
-Install popt if you're a C programmer and you'd like to use its
-capabilities.
+Popt is a C library for parsing command line parameters. Popt was
+heavily influenced by the getopt() and getopt_long() functions, but it
+improves on them by allowing more powerful argument expansion. Popt
+can parse arbitrary argv[] style arrays and automatically set
+variables based on command line arguments. Popt allows command line
+arguments to be aliased via configuration files and includes utility
+functions for parsing arbitrary strings into argv[] arrays using
+shell-like rules.
 
 %prep
 %setup -q
-- 
Gitee


From cd30a8169448924504b844b7f40705cc629d35cb Mon Sep 17 00:00:00 2001
From: "Ralf S. Engelschall" <rse@engelschall.com>
Date: Mon, 11 Jun 2007 06:14:11 +0000
Subject: [PATCH 417/667] plug two obvious memory holes (actually there are
 even more in the same function inside #ifdef/#endif but I don't want to
 change the code too much at this point)

---
 popt.c | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/popt.c b/popt.c
index bcb8713..317623e 100644
--- a/popt.c
+++ b/popt.c
@@ -398,7 +398,10 @@ static int execCommand(poptContext con)
 	argv[argc] = s;
     } else
 	argv[argc] = findProgramPath(item->argv[0]);
-    if (argv[argc++] == NULL) return POPT_ERROR_NOARG;
+    if (argv[argc++] == NULL) {
+	free(argv);
+	return POPT_ERROR_NOARG;
+    }
 
     if (item->argc > 1) {
 	memcpy(argv + argc, item->argv + 1, sizeof(*argv) * (item->argc - 1));
@@ -444,8 +447,10 @@ static int execCommand(poptContext con)
 #endif
 #endif
 
-    if (argv[0] == NULL)
+    if (argv[0] == NULL) {
+	free(argv);
 	return POPT_ERROR_NOARG;
+    }
 
 #ifdef	MYDEBUG
 if (_popt_debug)
-- 
Gitee


From 8bd4df3c2a4f4c40635e9f79134d0cab7580aab8 Mon Sep 17 00:00:00 2001
From: Jeff Johnson <n3npq@mac.com>
Date: Mon, 11 Jun 2007 09:36:41 +0000
Subject: [PATCH 418/667] plug the other memory leaks too.

---
 popt.c | 27 +++++++++++++++------------
 1 file changed, 15 insertions(+), 12 deletions(-)

diff --git a/popt.c b/popt.c
index 317623e..f7c70b1 100644
--- a/popt.c
+++ b/popt.c
@@ -377,9 +377,10 @@ static int execCommand(poptContext con)
 	/*@modifies internalState @*/
 {
     poptItem item = con->doExec;
-    const char ** argv;
+    const char ** argv = NULL;
     int argc = 0;
     int rc;
+    int ec = POPT_ERROR_ERRNO;
 
     if (item == NULL) /*XXX can't happen*/
 	return POPT_ERROR_NOARG;
@@ -399,8 +400,8 @@ static int execCommand(poptContext con)
     } else
 	argv[argc] = findProgramPath(item->argv[0]);
     if (argv[argc++] == NULL) {
-	free(argv);
-	return POPT_ERROR_NOARG;
+	ec = POPT_ERROR_NOARG;
+	goto exit;
     }
 
     if (item->argc > 1) {
@@ -423,9 +424,9 @@ static int execCommand(poptContext con)
 
 #if defined(hpux) || defined(__hpux)
     rc = setresgid(getgid(), getgid(),-1);
-    if (rc) return POPT_ERROR_ERRNO;
+    if (rc) goto exit;
     rc = setresuid(getuid(), getuid(),-1);
-    if (rc) return POPT_ERROR_ERRNO;
+    if (rc) goto exit;
 #else
 /*
  * XXX " ... on BSD systems setuid() should be preferred over setreuid()"
@@ -434,22 +435,22 @@ static int execCommand(poptContext con)
  */
 #if defined(HAVE_SETUID)
     rc = setgid(getgid());
-    if (rc) return POPT_ERROR_ERRNO;
+    if (rc) goto exit;
     rc = setuid(getuid());
-    if (rc) return POPT_ERROR_ERRNO;
+    if (rc) goto exit;
 #elif defined (HAVE_SETREUID)
     rc = setregid(getgid(), getgid());
-    if (rc) return POPT_ERROR_ERRNO;
+    if (rc) goto exit;
     rc = setreuid(getuid(), getuid());
-    if (rc) return POPT_ERROR_ERRNO;
+    if (rc) goto exit;
 #else
     ; /* Can't drop privileges */
 #endif
 #endif
 
     if (argv[0] == NULL) {
-	free(argv);
-	return POPT_ERROR_NOARG;
+	ec = POPT_ERROR_NOARG;
+	goto exit;
     }
 
 #ifdef	MYDEBUG
@@ -464,7 +465,9 @@ if (_popt_debug)
 
     rc = execvp(argv[0], (char *const *)argv);
 
-    return POPT_ERROR_ERRNO;
+exit:
+    if (argv) free(argv);
+    return ec;
 }
 /*@=bounds =boundswrite @*/
 
-- 
Gitee


From 0bfea85d8d5e2553c35c5123a706ddce389dbc19 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?G=C3=B6ran=20Uddeborg?= <goeran@uddeborg.se>
Date: Tue, 12 Jun 2007 20:07:49 +0000
Subject: [PATCH 419/667]  Updated translations.

---
 po/sv.po | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/po/sv.po b/po/sv.po
index 1b527fc..53bcf7f 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -1,11 +1,11 @@
 msgid ""
 msgstr ""
-"Project-Id-Version: popt 1.6.3\n"
+"Project-Id-Version: popt\n"
 "Report-Msgid-Bugs-To: <rpm-devel@lists.dulug.duke.edu>\n"
 "POT-Creation-Date: 2007-01-21 14:25-0500\n"
-"PO-Revision-Date: 2001-07-12 22:26+0100\n"
-"Last-Translator: Christian Rose <menthos@menthos.com>\n"
-"Language-Team: Swedish <sv@li.org>\n"
+"PO-Revision-Date: 2007-06-12 22:00+0200\n"
+"Last-Translator: G�ran Uddeborg <goeran@uddeborg.se>\n"
+"Language-Team: Swedish <tp-sv@listor.tp-sv.se>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=iso-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -61,11 +61,11 @@ msgstr "ok
 
 #: popt.h:172
 msgid "Options implemented via popt alias/exec:"
-msgstr ""
+msgstr "Flaggor implementerade via popt-alias/exec:"
 
 #: popt.h:188
 msgid "Help options:"
-msgstr ""
+msgstr "Hj�lpflaggor:"
 
 #: popthelp.c:68 popthelp.c:79
 msgid "Show this help message"
-- 
Gitee


From 8c2b063b9b139dd5d2acd79fb50f6c6484cfb225 Mon Sep 17 00:00:00 2001
From: "Ralf S. Engelschall" <rse@engelschall.com>
Date: Thu, 14 Jun 2007 06:42:07 +0000
Subject: [PATCH 420/667] Fix building POPT directly from CVS sources.

The ultimate golden rule of "the content of versioned files should be
_never_ changed during a regular building from source" was horribly
broken by gettextize which assumes that if po/Makefile.in.in is still
not present (which is the case after a checkout as we do not version
such a generated file) it can feel free to update Makefile.am and
configure.am, even if it doubles entries there.

Here skipping the call to gettextize in case po/Makefile.in.in does
not exists doesn't really help _initially_ at all. It just helps on
subsequent calls. To no longer break the rule one either has to fix
gettextize upstream (it should not blindly append po/Makefile.in.in to
"AC_OUTPUT" in configure.ac and "po" to "SUBDIRS" in Makefile.am in
if it is _already present_ there) or we have to workaround locally by
explicitly reversing its results. As we do not control gettextize, we
now reverse the results. I have chosen to use perl(1) instead of sed(1)
here as perl(1) is already used by Automake (so it is available anyway)
and it allows us to revert the changes with shorter calls on the CLI.

Additionally, let's call gettextize _after_ libtoolize to prevent
gettextize from complaining about a missing config.guess and config.sub.
Also, add config.rpath to Makefile.am as this is a required file,
generated by gettextize, too. Finally, pass --no-changelog to gettextize
as we really don't need a useless generated m4/ChangeLog distributed
with POPT.

This way one can now (again) do a fresh checkout of the popt/ module
and build POPT really out-of-the-box and without having versioned files
garbled up, too.
---
 Makefile.am  | 2 +-
 autogen.sh   | 4 +++-
 configure.ac | 2 +-
 3 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index 3d8f0d5..f1c7099 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -4,7 +4,7 @@ AUTOMAKE_OPTIONS = 1.4 foreign
 
 LINT = splint
 
-EXTRA_DIST = autogen.sh CHANGES $(man_MANS) popt.spec libpopt.vers \
+EXTRA_DIST = config.rpath autogen.sh CHANGES $(man_MANS) popt.spec libpopt.vers \
 	testit.sh test-poptrc test3-data/0* \
 	po/*.in po/*.po po/popt.pot \
 	popt.ps
diff --git a/autogen.sh b/autogen.sh
index ad46219..e1867b7 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -16,8 +16,10 @@ case $libtoolize in
 esac
 
 cd "$srcdir"
-[ -f po/Makefile.in.in ] || gettextize --copy --force --intl
 $libtoolize --copy --force
+gettextize --copy --force --no-changelog
+perl -p -i~ -e 's/(po\/Makefile\.in)\s+po\/Makefile\.in/$1/' configure.ac
+perl -p -i~ -e 's/(SUBDIRS\s+=\s+po)\s+po/$1/' Makefile.am
 aclocal -I m4
 autoheader
 automake -a -c
diff --git a/configure.ac b/configure.ac
index d312023..42c0801 100755
--- a/configure.ac
+++ b/configure.ac
@@ -109,4 +109,4 @@ AC_DEFINE_UNQUOTED(POPT_SOURCE_PATH, "$POPT_SOURCE_PATH",
 	[Full path to popt top_srcdir.])
 AC_SUBST(POPT_SOURCE_PATH)
 
-AC_OUTPUT([Doxyfile Makefile])
+AC_OUTPUT([Doxyfile Makefile po/Makefile.in])
-- 
Gitee


From 1c2aba6721282d537e53eefe128286ecb2f909b1 Mon Sep 17 00:00:00 2001
From: "Ralf S. Engelschall" <rse@engelschall.com>
Date: Thu, 14 Jun 2007 07:21:45 +0000
Subject: [PATCH 421/667] Fix iconv(3) usage.

POPT assumed that iconv(3) is available all the time. This is not
the case. It _might_ be available (and then indicated by the #define
HAVE_ICONV from gettext) if NLS is enabled. But if NLS is disabled
(--disable-nls) then the gettext NLS stuff not even _checks_ for an
available iconv(3) and hence it cannot even be used with an explicit
--with-libiconv-prefix, etc. Hence we POPT can use iconv(3) only for its
UTF-8 fiddling if HAVE_ICONV is defined.
---
 poptint.c | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/poptint.c b/poptint.c
index 36999e7..cab8ce0 100644
--- a/poptint.c
+++ b/poptint.c
@@ -5,7 +5,9 @@
 #include <stdio.h>
 #include <stdarg.h>
 #include <errno.h>
+#ifdef HAVE_ICONV
 #include <iconv.h>
+#endif
 #ifdef HAVE_LANGINFO_H
 #include <langinfo.h>
 #endif
@@ -18,6 +20,7 @@
   (retval) = vfprintf ((stream), (format), (args)); \
   va_end ((args));
 
+#ifdef HAVE_ICONV
 static char *
 strdup_locale_from_utf8 (char *buffer)
 {
@@ -87,6 +90,7 @@ strdup_locale_from_utf8 (char *buffer)
 
   return dest_str;
 }
+#endif
 
 static char *
 strdup_vprintf (const char *format, va_list ap)
@@ -124,14 +128,18 @@ POPT_fprintf (FILE* stream, const char *format, ...)
   buffer = strdup_vprintf (format, args);
   va_end (args);
 
+#ifdef HAVE_ICONV
   locale_str = strdup_locale_from_utf8 (buffer);
   if (locale_str) {
     retval = fprintf (stream, "%s", locale_str);
     free (locale_str);
   } else {
     fprintf (stderr, POPT_WARNING "%s\n", "Invalid UTF-8");
+#endif
     retval = fprintf (stream, "%s", buffer);
+#ifdef HAVE_ICONV
   }
+#endif
   free (buffer);
 
   return retval;
-- 
Gitee


From 8d35bfe0652bbe6f9c2875ac9029048a74bc5dfb Mon Sep 17 00:00:00 2001
From: "Ralf S. Engelschall" <rse@engelschall.com>
Date: Thu, 14 Jun 2007 07:51:32 +0000
Subject: [PATCH 422/667] cosmetics: fix indentation to remove confusion in the
 eye of the reader ;-)

---
 popt.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/popt.c b/popt.c
index f7c70b1..b57a3ba 100644
--- a/popt.c
+++ b/popt.c
@@ -571,7 +571,7 @@ static const char * findNextArg(/*@special@*/ poptContext con,
 	    if (delete_arg) {
 		if (os->argb == NULL) os->argb = PBM_ALLOC(os->argc);
 		if (os->argb != NULL)	/* XXX can't happen */
-		PBM_SET(i, os->argb);
+		    PBM_SET(i, os->argb);
 	    }
 	    /*@innerbreak@*/ break;
 /*@=sizeoftype@*/
-- 
Gitee


From e48f91820b364edddd7fbe9bd7f1d52e0d7a44e2 Mon Sep 17 00:00:00 2001
From: "Ralf S. Engelschall" <rse@engelschall.com>
Date: Thu, 14 Jun 2007 07:54:52 +0000
Subject: [PATCH 423/667] declare iconv(3) related variable under HAVE_ICONV
 only

---
 poptint.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/poptint.c b/poptint.c
index cab8ce0..227a500 100644
--- a/poptint.c
+++ b/poptint.c
@@ -122,7 +122,9 @@ POPT_fprintf (FILE* stream, const char *format, ...)
   int retval = 0;
   va_list args;
   char *buffer = NULL;
+#ifdef HAVE_ICONV
   char *locale_str = NULL;
+#endif
 
   va_start (args, format);
   buffer = strdup_vprintf (format, args);
-- 
Gitee


From bf9621c159f50e28cd604b5355e83a9ee9d3b1cb Mon Sep 17 00:00:00 2001
From: "Ralf S. Engelschall" <rse@engelschall.com>
Date: Thu, 14 Jun 2007 08:00:39 +0000
Subject: [PATCH 424/667] fix one more indentation which has catched my eye
 while I glanced over the POPT sources

---
 popthelp.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/popthelp.c b/popthelp.c
index 51c20a9..e2c5502 100644
--- a/popthelp.c
+++ b/popthelp.c
@@ -423,7 +423,7 @@ static size_t maxArgWidth(const struct poptOption * opt,
     while (opt->longName || opt->shortName || opt->arg) {
 	if ((opt->argInfo & POPT_ARG_MASK) == POPT_ARG_INCLUDE_TABLE) {
 	    if (opt->arg)	/* XXX program error */
-	    len = maxArgWidth(opt->arg, translation_domain);
+	        len = maxArgWidth(opt->arg, translation_domain);
 	    if (len > max) max = len;
 	} else if (!(opt->argInfo & POPT_ARGFLAG_DOC_HIDDEN)) {
 	    len = sizeof("  ")-1;
-- 
Gitee


From 4ae38b5290ad1ac92031d6bcc8905c16d2db4265 Mon Sep 17 00:00:00 2001
From: "Ralf S. Engelschall" <rse@engelschall.com>
Date: Thu, 14 Jun 2007 08:04:38 +0000
Subject: [PATCH 425/667] remove an unused line numbering variable

---
 poptparse.c | 2 --
 1 file changed, 2 deletions(-)

diff --git a/poptparse.c b/poptparse.c
index f7190c4..98ad37c 100644
--- a/poptparse.c
+++ b/poptparse.c
@@ -138,7 +138,6 @@ int poptConfigFileToString(FILE *fp, char ** argstrp, /*@unused@*/ int flags)
     size_t maxlinelen = sizeof(line);
     size_t linelen;
     size_t maxargvlen = (size_t)480;
-    int linenum = 0;
 
     *argstrp = NULL;
 
@@ -153,7 +152,6 @@ int poptConfigFileToString(FILE *fp, char ** argstrp, /*@unused@*/ int flags)
     if (argstr == NULL) return POPT_ERROR_MALLOC;
 
     while (fgets(line, (int)maxlinelen, fp) != NULL) {
-	linenum++;
 	p = line;
 
 	/* loop until first non-space char or EOL */
-- 
Gitee


From 05b474bf00eb3ca9919cc81d73f56dd1549eec18 Mon Sep 17 00:00:00 2001
From: "Ralf S. Engelschall" <rse@engelschall.com>
Date: Thu, 14 Jun 2007 08:08:30 +0000
Subject: [PATCH 426/667] the POPT_ARG_CALLBACK argument 'displayArgs' is
 already a function as in ISO C the plain use of a function name always
 coerces into a function pointer. The use oft the '&' is both confusing and
 useless (and perhaps some compilers might even at least warn about this bad
 usage).

---
 popthelp.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/popthelp.c b/popthelp.c
index e2c5502..eaf8f16 100644
--- a/popthelp.c
+++ b/popthelp.c
@@ -64,7 +64,7 @@ struct poptOption poptAliasOptions[] = {
 /*@-castfcnptr@*/
 /*@observer@*/ /*@unchecked@*/
 struct poptOption poptHelpOptions[] = {
-  { NULL, '\0', POPT_ARG_CALLBACK, (void *)&displayArgs, 0, NULL, NULL },
+  { NULL, '\0', POPT_ARG_CALLBACK, (void *)displayArgs, 0, NULL, NULL },
   { "help", '?', 0, NULL, (int)'?', N_("Show this help message"), NULL },
   { "usage", '\0', 0, NULL, (int)'u', N_("Display brief usage message"), NULL },
     POPT_TABLEEND
@@ -75,7 +75,7 @@ static struct poptOption poptHelpOptions2[] = {
 /*@-readonlytrans@*/
   { NULL, '\0', POPT_ARG_INTL_DOMAIN, PACKAGE, 0, NULL, NULL},
 /*@=readonlytrans@*/
-  { NULL, '\0', POPT_ARG_CALLBACK, (void *)&displayArgs, 0, NULL, NULL },
+  { NULL, '\0', POPT_ARG_CALLBACK, (void *)displayArgs, 0, NULL, NULL },
   { "help", '?', 0, NULL, (int)'?', N_("Show this help message"), NULL },
   { "usage", '\0', 0, NULL, (int)'u', N_("Display brief usage message"), NULL },
 #ifdef	NOTYET
-- 
Gitee


From ee773401f56ca3f688c4f729becc88a4ee73fdb2 Mon Sep 17 00:00:00 2001
From: "Ralf S. Engelschall" <rse@engelschall.com>
Date: Thu, 14 Jun 2007 08:11:52 +0000
Subject: [PATCH 427/667] HAVE_MCHECK_H and HAVE_MTRACE are Autoconf
 AC_DEFINEs. Those are not permitted to be checked directly as values, as
 their value 1 is just set _IF_ the variable is defined. If the variable is
 not defined the plain use in an #if clause causes compiler warnings or even
 errors as this is invalid use. AC_DEFINE always have to be checked with
 defined() only except we can be sure that it is defined (but even then its
 value is always 1 and hence no need to check this, too)

---
 test1.c | 4 ++--
 test2.c | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/test1.c b/test1.c
index 4819150..b1bf27a 100644
--- a/test1.c
+++ b/test1.c
@@ -185,7 +185,7 @@ int main(int argc, const char ** argv)
     int help = 0;
     int usage = 0;
 
-#if HAVE_MCHECK_H && HAVE_MTRACE
+#if defined(HAVE_MCHECK_H) && defined(HAVE_MTRACE)
     /*@-moduncon -noeffectuncon@*/
     mtrace();   /* Trace malloc only if MALLOC_TRACE=mtrace-output-file. */
     /*@=moduncon =noeffectuncon@*/
@@ -269,7 +269,7 @@ int main(int argc, const char ** argv)
 
 exit:
     optCon = poptFreeContext(optCon);
-#if HAVE_MCHECK_H && HAVE_MTRACE
+#if defined(HAVE_MCHECK_H) && defined(HAVE_MTRACE)
     /*@-moduncon -noeffectuncon@*/
     muntrace();   /* Trace malloc only if MALLOC_TRACE=mtrace-output-file. */
     /*@=moduncon =noeffectuncon@*/
diff --git a/test2.c b/test2.c
index afac1c6..8414b90 100644
--- a/test2.c
+++ b/test2.c
@@ -123,7 +123,7 @@ main(int argc, const char ** argv) {
     optionsTable[1].arg = databaseOptionsTable;
     optionsTable[2].arg = userOptionsTable;
 
-#if HAVE_MCHECK_H && HAVE_MTRACE
+#if defined(HAVE_MCHECK_H) && defined(HAVE_MTRACE)
     mtrace();   /* Trace malloc only if MALLOC_TRACE=mtrace-output-file. */
 #endif
 
-- 
Gitee


From 854984086a74eada6de0e16da4e0f4a90adfd167 Mon Sep 17 00:00:00 2001
From: "Ralf S. Engelschall" <rse@engelschall.com>
Date: Thu, 14 Jun 2007 08:16:01 +0000
Subject: [PATCH 428/667] fix more incorrect or at least unclean usages of
 Autoconf HAVE_XXX pre-processor defines

---
 popt.c   |  2 +-
 system.h | 12 ++++++------
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/popt.c b/popt.c
index b57a3ba..5a48227 100644
--- a/popt.c
+++ b/popt.c
@@ -10,7 +10,7 @@
 
 #include "system.h"
 
-#if HAVE_FLOAT_H
+#ifdef HAVE_FLOAT_H
 #include <float.h>
 #endif
 #include <math.h>
diff --git a/system.h b/system.h
index 649f8c4..594b383 100644
--- a/system.h
+++ b/system.h
@@ -21,7 +21,7 @@ extern __const __int32_t *__ctype_toupper;
 #include <fcntl.h>
 #include <limits.h>
 
-#if HAVE_MCHECK_H 
+#ifdef HAVE_MCHECK_H
 #include <mcheck.h>
 #endif
 
@@ -29,7 +29,7 @@ extern __const __int32_t *__ctype_toupper;
 #include <stdlib.h>
 #include <string.h>
 
-#if HAVE_UNISTD_H
+#ifdef HAVE_UNISTD_H
 #include <unistd.h>
 #endif
 
@@ -50,7 +50,7 @@ void * alloca (size_t __size)
 
 /* AIX requires this to be the first thing in the file.  */ 
 #ifndef __GNUC__
-# if HAVE_ALLOCA_H
+# ifdef HAVE_ALLOCA_H
 #  include <alloca.h>
 # else
 #  ifdef _AIX
@@ -71,14 +71,14 @@ char * xstrdup (const char *str)
 	/*@*/;
 /*@=redecl =redef@*/
 
-#if HAVE_MCHECK_H && defined(__GNUC__)
+#if defined(HAVE_MCHECK_H) && defined(__GNUC__)
 #define	vmefail()	(fprintf(stderr, "virtual memory exhausted.\n"), exit(EXIT_FAILURE), NULL)
 #define xstrdup(_str)   (strcpy((malloc(strlen(_str)+1) ? : vmefail()), (_str)))
 #else
 #define	xstrdup(_str)	strdup(_str)
-#endif  /* HAVE_MCHECK_H && defined(__GNUC__) */
+#endif  /* defined(HAVE_MCHECK_H) && defined(__GNUC__) */
 
-#if HAVE___SECURE_GETENV && !defined(__LCLINT__)
+#if defined(HAVE___SECURE_GETENV) && !defined(__LCLINT__)
 #define	getenv(_s)	__secure_getenv(_s)
 #endif
 
-- 
Gitee


From 5f32b1f2464fa84133db44321e395d33d08baa59 Mon Sep 17 00:00:00 2001
From: "Ralf S. Engelschall" <rse@engelschall.com>
Date: Thu, 14 Jun 2007 08:22:43 +0000
Subject: [PATCH 429/667] Prevent namespace pollution via internal function
 "findProgramPath". Prefix it with the "POPT_" prefix which two other internal
 functions "POPT_fprintf" and "POPT_prev_char" already use. This way the
 resulting libpopt is namespace clean again as it contains only externally
 visible symbols with either "popt" or "POPT_" prefixes.

---
 findme.c | 2 +-
 findme.h | 2 +-
 popt.c   | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/findme.c b/findme.c
index 4649092..4817f52 100644
--- a/findme.c
+++ b/findme.c
@@ -9,7 +9,7 @@
 #include "system.h"
 #include "findme.h"
 
-const char * findProgramPath(const char * argv0)
+const char * POPT_findProgramPath(const char * argv0)
 {
     char * path = getenv("PATH");
     char * pathbuf;
diff --git a/findme.h b/findme.h
index a016b86..a92c3fa 100644
--- a/findme.h
+++ b/findme.h
@@ -14,7 +14,7 @@
  * @param argv0		name of executable
  * @return		(malloc'd) absolute path to executable (or NULL)
  */
-/*@null@*/ const char * findProgramPath(/*@null@*/ const char * argv0)
+/*@null@*/ const char * POPT_findProgramPath(/*@null@*/ const char * argv0)
 	/*@*/;
 
 #endif
diff --git a/popt.c b/popt.c
index 5a48227..5f70e91 100644
--- a/popt.c
+++ b/popt.c
@@ -398,7 +398,7 @@ static int execCommand(poptContext con)
 	sprintf(s, "%s/%s", con->execPath, item->argv[0]);
 	argv[argc] = s;
     } else
-	argv[argc] = findProgramPath(item->argv[0]);
+	argv[argc] = POPT_findProgramPath(item->argv[0]);
     if (argv[argc++] == NULL) {
 	ec = POPT_ERROR_NOARG;
 	goto exit;
-- 
Gitee


From 2d76ef36733aba681263a3d4c03c47a842d9a80b Mon Sep 17 00:00:00 2001
From: "Ralf S. Engelschall" <rse@engelschall.com>
Date: Thu, 14 Jun 2007 08:27:53 +0000
Subject: [PATCH 430/667] cleanup the README

---
 README | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

diff --git a/README b/README
index 0b5205b..c66432d 100644
--- a/README
+++ b/README
@@ -1,18 +1,16 @@
-This is the popt command line option parsing library. While it is similiar
+This is the popt(3) command line option parsing library. While it is similiar
 to getopt(3), it contains a number of enhancements, including:
 
 	1) popt is fully reentrant
 	2) popt can parse arbitrary argv[] style arrays while 
-	   getopt(2) makes this quite difficult
+	   getopt(3) makes this quite difficult
 	3) popt allows users to alias command line arguments
 	4) popt provides convience functions for parsing strings
 	   into argv[] style arrays
 
-popt is used by rpm, the Red Hat install program, and many other Red Hat
-utilities, all of which provide excellent examples of how to use popt. 
-Complete documentation on popt is available in popt.ps (included in this
+Complete documentation on popt(3) is available in popt.ps (included in this
 tarball), which is excerpted with permission from the book "Linux
-Application Development" by Michael K. Johnson and Erik Troan (availble
+Application Development" by Michael K. Johnson and Erik Troan (available
 from Addison Wesley in May, 1998).
 
-Comments on popt should be addressed to ewt@redhat.com.
+Comments on popt should be addressed to popt-devel@rpm5.org.
-- 
Gitee


From 0da50f7aca19de81396a61e18e897bf7e6919991 Mon Sep 17 00:00:00 2001
From: "Ralf S. Engelschall" <rse@engelschall.com>
Date: Thu, 14 Jun 2007 08:32:58 +0000
Subject: [PATCH 431/667] fix path

---
 popt.spec | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/popt.spec b/popt.spec
index fdef2ac..0b0ff5c 100644
--- a/popt.spec
+++ b/popt.spec
@@ -4,7 +4,7 @@ Version: 1.11
 Release: 1
 License: X Consortium
 Group: System Environment/Libraries
-Source: http://rpm5.org/v/files/popt/%{name}-%{version}.tar.gz
+Source: http://rpm5.org/files/popt/%{name}-%{version}.tar.gz
 BuildRoot: %{_tmppath}/%{name}-root
 
 %description
-- 
Gitee


From 948dcbab8976f662ad36414a4f4a55b71791aa67 Mon Sep 17 00:00:00 2001
From: "Ralf S. Engelschall" <rse@engelschall.com>
Date: Thu, 14 Jun 2007 13:31:10 +0000
Subject: [PATCH 432/667] POPT still used alloca(3), a usually machine-,
 compiler-, and system-dependent and especially non-POSIX (and hence less
 portable) function whose use is even discouraged on lots of Unix platforms.
 This IMHO is unnecessarily unportable for a reusable library like POPT.

So, for maximum portability, replace all uses of alloca(3) with either
standard POSIX malloc(3) and calloc(3) calls, by plain stack based
variable declarations or by entirely avoiding the need for an extra
buffer (as in the use of the internal findOption() function).
---
 configure.ac |  2 +-
 findme.c     | 19 +++++++++++++------
 popt.c       | 43 +++++++++++++++++++++----------------------
 poptconfig.c | 21 ++++++++++++++-------
 popthelp.c   | 16 ++++++++++++----
 poptparse.c  |  5 ++++-
 system.h     | 26 --------------------------
 7 files changed, 65 insertions(+), 67 deletions(-)

diff --git a/configure.ac b/configure.ac
index 42c0801..e6f1e5b 100755
--- a/configure.ac
+++ b/configure.ac
@@ -67,7 +67,7 @@ if ! echo "${libdir}" | grep -q '64$' ; then
 fi
 AC_SUBST(MARK64)
 
-AC_CHECK_HEADERS(alloca.h float.h libintl.h mcheck.h unistd.h)
+AC_CHECK_HEADERS(float.h libintl.h mcheck.h unistd.h)
 
 # For some systems we know that we have ld_version scripts.
 # Use it then as default.
diff --git a/findme.c b/findme.c
index 4817f52..9a80d2d 100644
--- a/findme.c
+++ b/findme.c
@@ -12,9 +12,9 @@
 const char * POPT_findProgramPath(const char * argv0)
 {
     char * path = getenv("PATH");
-    char * pathbuf;
+    char * pathbuf = NULL;
     char * start, * chptr;
-    char * buf;
+    char * buf = NULL;
 
     if (argv0 == NULL) return NULL;	/* XXX can't happen */
     /* If there is a / in the argv[0], it has to be an absolute path */
@@ -23,9 +23,10 @@ const char * POPT_findProgramPath(const char * argv0)
 
     if (path == NULL) return NULL;
 
-    start = pathbuf = alloca(strlen(path) + 1);
+    start = pathbuf = malloc(strlen(path) + 1);
+    if (pathbuf == NULL) goto exit;
     buf = malloc(strlen(path) + strlen(argv0) + sizeof("/"));
-    if (buf == NULL) return NULL;	/* XXX can't happen */
+    if (buf == NULL) goto exit;
     strcpy(pathbuf, path);
 
     chptr = NULL;
@@ -35,8 +36,10 @@ const char * POPT_findProgramPath(const char * argv0)
 	    *chptr = '\0';
 	sprintf(buf, "%s/%s", start, argv0);
 
-	if (!access(buf, X_OK))
+	if (!access(buf, X_OK)) {
+	    free(pathbuf);
 	    return buf;
+	}
 
 	if (chptr) 
 	    start = chptr + 1;
@@ -45,7 +48,11 @@ const char * POPT_findProgramPath(const char * argv0)
     } while (start && *start);
 /*@=branchstate@*/
 
-    free(buf);
+exit:
+    if (pathbuf)
+        free(pathbuf);
+    if (buf)
+        free(buf);
 
     return NULL;
 }
diff --git a/popt.c b/popt.c
index 5f70e91..244ecce 100644
--- a/popt.c
+++ b/popt.c
@@ -394,8 +394,9 @@ static int execCommand(poptContext con)
     if (argv == NULL) return POPT_ERROR_MALLOC;
 
     if (!strchr(item->argv[0], '/') && con->execPath != NULL) {
-	char *s = alloca(strlen(con->execPath) + strlen(item->argv[0]) + sizeof("/"));
-	sprintf(s, "%s/%s", con->execPath, item->argv[0]);
+	char *s = malloc(strlen(con->execPath) + strlen(item->argv[0]) + sizeof("/"));
+	if (s)
+	    sprintf(s, "%s/%s", con->execPath, item->argv[-1]);
 	argv[argc] = s;
     } else
 	argv[argc] = POPT_findProgramPath(item->argv[0]);
@@ -448,11 +449,6 @@ static int execCommand(poptContext con)
 #endif
 #endif
 
-    if (argv[0] == NULL) {
-	ec = POPT_ERROR_NOARG;
-	goto exit;
-    }
-
 #ifdef	MYDEBUG
 if (_popt_debug)
     {	const char ** avp;
@@ -466,14 +462,18 @@ if (_popt_debug)
     rc = execvp(argv[0], (char *const *)argv);
 
 exit:
-    if (argv) free(argv);
+    if (argv) {
+        if (argv[0])
+            free((void *)argv[0]);
+        free(argv);
+    }
     return ec;
 }
 /*@=bounds =boundswrite @*/
 
 /*@-boundswrite@*/
 /*@observer@*/ /*@null@*/ static const struct poptOption *
-findOption(const struct poptOption * opt, /*@null@*/ const char * longName,
+findOption(const struct poptOption * opt, /*@null@*/ const char * longName, int longNameLen,
 		char shortName,
 		/*@null@*/ /*@out@*/ poptCallbackType * callback,
 		/*@null@*/ /*@out@*/ const void ** callbackData,
@@ -498,7 +498,7 @@ findOption(const struct poptOption * opt, /*@null@*/ const char * longName,
 /*@=branchstate@*/
 	    /* Recurse on included sub-tables. */
 	    if (arg == NULL) continue;	/* XXX program error */
-	    opt2 = findOption(arg, longName, shortName, callback,
+	    opt2 = findOption(arg, longName, longNameLen, shortName, callback,
 			      callbackData, singleDash);
 	    if (opt2 == NULL) continue;
 	    /* Sub-table data will be inheirited if no data yet. */
@@ -512,7 +512,7 @@ findOption(const struct poptOption * opt, /*@null@*/ const char * longName,
 	    cb = opt;
 	} else if (longName != NULL && opt->longName != NULL &&
 		   (!singleDash || (opt->argInfo & POPT_ARGFLAG_ONEDASH)) &&
-		   !strcmp(longName, opt->longName))
+		   (!strncmp(longName, opt->longName, longNameLen) && strlen(opt->longName) == longNameLen))
 	{
 	    break;
 	} else if (shortName && shortName == opt->shortName) {
@@ -764,7 +764,8 @@ int poptGetNextOpt(poptContext con)
 
 	/* Process next long option */
 	if (!con->os->nextCharArg) {
-	    char * localOptString, * optString;
+	    char * optString;
+            int optStringLen;
 	    int thisopt;
 
 /*@-sizeoftype@*/
@@ -795,8 +796,7 @@ int poptGetNextOpt(poptContext con)
 	    }
 
 	    /* Make a copy we can hack at */
-	    localOptString = optString =
-		strcpy(alloca(strlen(origOptString) + 1), origOptString);
+	    optString = origOptString;
 
 	    if (optString[0] == '\0')
 		return POPT_ERROR_BADOPT;
@@ -824,13 +824,11 @@ int poptGetNextOpt(poptContext con)
 		/* Check for "--long=arg" option. */
 		for (oe = optString; *oe && *oe != '='; oe++)
 		    {};
-		if (*oe == '=') {
-		    *oe++ = '\0';
-		    /* XXX longArg is mapped back to persistent storage. */
-		    longArg = origOptString + (oe - localOptString);
-		}
+		optStringLen = oe - optString;
+		if (*oe == '=')
+		    longArg = oe + 1;
 
-		opt = findOption(con->options, optString, '\0', &cb, &cbData,
+		opt = findOption(con->options, optString, optStringLen, '\0', &cb, &cbData,
 				 singleDash);
 		if (!opt && !singleDash)
 		    return POPT_ERROR_BADOPT;
@@ -867,7 +865,7 @@ int poptGetNextOpt(poptContext con)
 		continue;
 	    }
 
-	    opt = findOption(con->options, NULL, *origOptString, &cb,
+	    opt = findOption(con->options, NULL, 0, *origOptString, &cb,
 			     &cbData, 0);
 	    if (!opt)
 		return POPT_ERROR_BADOPT;
@@ -1140,7 +1138,8 @@ poptContext poptFreeContext(poptContext con)
 int poptAddAlias(poptContext con, struct poptAlias alias,
 		/*@unused@*/ int flags)
 {
-    poptItem item = alloca(sizeof(*item));
+    struct poptItem_s item_buf;
+    poptItem item = &item_buf;
     memset(item, 0, sizeof(*item));
     item->option.longName = alias.longName;
     item->option.shortName = alias.shortName;
diff --git a/poptconfig.c b/poptconfig.c
index 0112f86..e84e607 100644
--- a/poptconfig.c
+++ b/poptconfig.c
@@ -17,7 +17,8 @@ static void configLine(poptContext con, char * line)
     size_t nameLength;
     const char * entryType;
     const char * opt;
-    poptItem item = alloca(sizeof(*item));
+    struct poptItem_s item_buf;
+    poptItem item = &item_buf;
     int i, j;
 
     if (con->appName == NULL)
@@ -95,8 +96,8 @@ static void configLine(poptContext con, char * line)
 
 int poptReadConfigFile(poptContext con, const char * fn)
 {
-    const char * file, * chptr, * end;
-    char * buf;
+    char * file = NULL, * chptr, * end;
+    char * buf = NULL;
 /*@dependent@*/ char * dst;
     int fd, rc;
     off_t fileLength;
@@ -113,18 +114,20 @@ int poptReadConfigFile(poptContext con, const char * fn)
 	return POPT_ERROR_ERRNO;
     }
 
-    file = alloca(fileLength + 1);
+    file = malloc(fileLength + 1);
     if (read(fd, (char *)file, fileLength) != fileLength) {
 	rc = errno;
 	(void) close(fd);
 	errno = rc;
 	return POPT_ERROR_ERRNO;
     }
-    if (close(fd) == -1)
+    if (close(fd) == -1) {
+	free(file);
 	return POPT_ERROR_ERRNO;
+    }
 
 /*@-boundswrite@*/
-    dst = buf = alloca(fileLength + 1);
+    dst = buf = malloc(fileLength + 1);
 
     chptr = file;
     end = (file + fileLength);
@@ -157,6 +160,9 @@ int poptReadConfigFile(poptContext con, const char * fn)
 /*@=infloops@*/
 /*@=boundswrite@*/
 
+    free(file);
+    free(buf);
+
     return 0;
 }
 
@@ -171,10 +177,11 @@ int poptReadDefaultConfig(poptContext con, /*@unused@*/ int useEnv)
     if (rc) return rc;
 
     if ((home = getenv("HOME"))) {
-	fn = alloca(strlen(home) + 20);
+	fn = malloc(strlen(home) + 20);
 	strcpy(fn, home);
 	strcat(fn, "/.popt");
 	rc = poptReadConfigFile(con, fn);
+	free(fn);
 	if (rc) return rc;
     }
 
diff --git a/popthelp.c b/popthelp.c
index eaf8f16..5d5c80e 100644
--- a/popthelp.c
+++ b/popthelp.c
@@ -767,11 +767,14 @@ static size_t showShortOptions(const struct poptOption * opt, FILE * fp,
 	/*@modifies *str, *fp, fileSystem @*/
 	/*@requires maxRead(str) >= 0 @*/
 {
-    /* bufsize larger then the ascii set, lazy alloca on top level call. */
+    /* bufsize larger then the ascii set, lazy allocation on top level call. */
     size_t nb = (size_t)300;
-    char * s = (str != NULL ? str : memset(alloca(nb), 0, nb));
+    char * s = (str != NULL ? str : calloc(1, nb));
     size_t len = (size_t)0;
 
+    if (s == NULL)
+	return 0;
+
 /*@-boundswrite@*/
     if (opt != NULL)
     for (; (opt->longName || opt->shortName || opt->arg); opt++) {
@@ -788,19 +791,23 @@ static size_t showShortOptions(const struct poptOption * opt, FILE * fp,
 	fprintf(fp, " [-%s]", s);
 	len = strlen(s) + sizeof(" [-]")-1;
     }
+    if (s != str)
+	free(s);
     return len;
 }
 
 void poptPrintUsage(poptContext con, FILE * fp, /*@unused@*/ int flags)
 {
-    poptDone done = memset(alloca(sizeof(*done)), 0, sizeof(*done));
+    struct poptDone_s done_buf;
+    poptDone done = &done_buf;
     size_t cursor;
 
+    memset(done, 0, sizeof(*done));
     done->nopts = 0;
     done->maxopts = 64;
     cursor = done->maxopts * sizeof(*done->opts);
 /*@-boundswrite@*/
-    done->opts = memset(alloca(cursor), 0, cursor);
+    done->opts = calloc(1, cursor);
     /*@-keeptrans@*/
     done->opts[done->nopts++] = (const void *) con->options;
     /*@=keeptrans@*/
@@ -819,6 +826,7 @@ void poptPrintUsage(poptContext con, FILE * fp, /*@unused@*/ int flags)
     }
 
     fprintf(fp, "\n");
+    free(done->opts);
 }
 
 void poptSetOtherOptionHelp(poptContext con, const char * text)
diff --git a/poptparse.c b/poptparse.c
index 98ad37c..6b3b891 100644
--- a/poptparse.c
+++ b/poptparse.c
@@ -62,10 +62,12 @@ int poptParseArgvString(const char * s, int * argcPtr, const char *** argvPtr)
     const char ** argv = malloc(sizeof(*argv) * argvAlloced);
     int argc = 0;
     size_t buflen = strlen(s) + 1;
-    char * buf = memset(alloca(buflen), 0, buflen);
+    char * buf, * bufOrig = NULL;
     int rc = POPT_ERROR_MALLOC;
 
     if (argv == NULL) return rc;
+    buf = bufOrig = calloc(1, buflen);
+    if (buf == NULL) return rc;
     argv[argc] = buf;
 
     for (src = s; *src != '\0'; src++) {
@@ -116,6 +118,7 @@ int poptParseArgvString(const char * s, int * argcPtr, const char *** argvPtr)
     rc = poptDupArgv(argc, argv, argcPtr, argvPtr);
 
 exit:
+    if (bufOrig) free(bufOrig);
     if (argv) free(argv);
     return rc;
 }
diff --git a/system.h b/system.h
index 594b383..233b58d 100644
--- a/system.h
+++ b/system.h
@@ -39,32 +39,6 @@ extern __const __int32_t *__ctype_toupper;
 #include <libc.h>
 #endif
 
-#if defined(__LCLINT__)
-/*@-declundef -incondefs @*/ /* LCL: missing annotation */
-/*@only@*/ /*@out@*/
-void * alloca (size_t __size)
-	/*@ensures MaxSet(result) == (__size - 1) @*/
-	/*@*/;
-/*@=declundef =incondefs @*/
-#endif
-
-/* AIX requires this to be the first thing in the file.  */ 
-#ifndef __GNUC__
-# ifdef HAVE_ALLOCA_H
-#  include <alloca.h>
-# else
-#  ifdef _AIX
-#pragma alloca
-#  else
-#   ifndef alloca /* predefined by HP cc +Olibcalls */
-char *alloca ();
-#   endif
-#  endif
-# endif
-#elif defined(__GNUC__) && defined(__STRICT_ANSI__)
-#define alloca __builtin_alloca
-#endif
-
 /*@-redecl -redef@*/
 /*@mayexit@*/ /*@only@*/ /*@unused@*/
 char * xstrdup (const char *str)
-- 
Gitee


From 6796cef14c9182eeab19e0034667321de58d411b Mon Sep 17 00:00:00 2001
From: "Ralf S. Engelschall" <rse@engelschall.com>
Date: Thu, 14 Jun 2007 13:33:22 +0000
Subject: [PATCH 433/667] re-generate the .po files to match the updated source
 lines

---
 po/cs.po    | 24 ++++++++++++------------
 po/da.po    | 24 ++++++++++++------------
 po/de.po    | 24 ++++++++++++------------
 po/es.po    | 24 ++++++++++++------------
 po/eu_ES.po | 24 ++++++++++++------------
 po/fi.po    | 24 ++++++++++++------------
 po/fr.po    | 24 ++++++++++++------------
 po/gl.po    | 24 ++++++++++++------------
 po/hu.po    | 24 ++++++++++++------------
 po/id.po    | 24 ++++++++++++------------
 po/is.po    | 24 ++++++++++++------------
 po/it.po    | 24 ++++++++++++------------
 po/ja.po    | 24 ++++++++++++------------
 po/ko.po    | 24 ++++++++++++------------
 po/no.po    | 24 ++++++++++++------------
 po/pl.po    | 24 ++++++++++++------------
 po/popt.pot | 24 ++++++++++++------------
 po/pt.po    | 24 ++++++++++++------------
 po/pt_BR.po | 24 ++++++++++++------------
 po/ro.po    | 24 ++++++++++++------------
 po/ru.po    | 24 ++++++++++++------------
 po/sk.po    | 24 ++++++++++++------------
 po/sl.po    | 24 ++++++++++++------------
 po/sr.po    | 24 ++++++++++++------------
 po/sv.po    | 24 ++++++++++++------------
 po/tr.po    | 24 ++++++++++++------------
 po/uk.po    | 24 ++++++++++++------------
 po/wa.po    | 24 ++++++++++++------------
 po/zh.po    | 24 ++++++++++++------------
 po/zh_CN.po | 24 ++++++++++++------------
 po/zh_TW.po | 24 ++++++++++++------------
 31 files changed, 372 insertions(+), 372 deletions(-)

diff --git a/po/cs.po b/po/cs.po
index f94e7bd..1615168 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.3\n"
 "Report-Msgid-Bugs-To: <rpm-devel@lists.dulug.duke.edu>\n"
-"POT-Creation-Date: 2007-01-21 14:25-0500\n"
+"POT-Creation-Date: 2007-06-14 15:31+0200\n"
 "PO-Revision-Date: 2001-07-24 00:03+0100\n"
 "Last-Translator: Milan Kerslager <kerslage@linux.cz>\n"
 "Language-Team: Czech <cs@li.org>\n"
@@ -14,48 +14,48 @@ msgstr ""
 msgid "unknown errno"
 msgstr "nezn�m� ��slo chyby"
 
-#: popt.c:996
+#: popt.c:1002
 #, c-format
 msgid "option type (%d) not implemented in popt\n"
 msgstr "volba (%d) nen� v popt implementov�na\n"
 
-#: popt.c:1208
+#: popt.c:1215
 msgid "missing argument"
 msgstr "chyb� argument"
 
-#: popt.c:1210
+#: popt.c:1217
 msgid "unknown option"
 msgstr "nezn�m� volba"
 
-#: popt.c:1212
+#: popt.c:1219
 msgid "mutually exclusive logical operations requested"
 msgstr "po�adov�ny vz�jemn� v�lu�n� logick� operace"
 
-#: popt.c:1214
+#: popt.c:1221
 msgid "opt->arg should not be NULL"
 msgstr "opt->arg nesm� b�t NULL"
 
-#: popt.c:1216
+#: popt.c:1223
 msgid "aliases nested too deeply"
 msgstr "aliasy vno�en� p��li� hluboko"
 
-#: popt.c:1218
+#: popt.c:1225
 msgid "error in parameter quoting"
 msgstr "chyba v quotov�n� parametr�"
 
-#: popt.c:1220
+#: popt.c:1227
 msgid "invalid numeric value"
 msgstr "chybn� numerick� hodnota"
 
-#: popt.c:1222
+#: popt.c:1229
 msgid "number too large or too small"
 msgstr "��slo je p��li� velk� nebo p��li� mal�"
 
-#: popt.c:1224
+#: popt.c:1231
 msgid "memory allocation failed"
 msgstr "selhala alokace pam�ti"
 
-#: popt.c:1228
+#: popt.c:1235
 msgid "unknown error"
 msgstr "nezn�m� chyba"
 
diff --git a/po/da.po b/po/da.po
index 9f9e972..56987fa 100644
--- a/po/da.po
+++ b/po/da.po
@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.3\n"
 "Report-Msgid-Bugs-To: <rpm-devel@lists.dulug.duke.edu>\n"
-"POT-Creation-Date: 2007-01-21 14:25-0500\n"
+"POT-Creation-Date: 2007-06-14 15:31+0200\n"
 "PO-Revision-Date: Sun Jan 21 2001 04:30:32+0200\n"
 "Last-Translator: Martin Hansen <mah@k64.dk>\n"
 "Language-Team: Dansk <dansk@klid.dk>\n"
@@ -15,48 +15,48 @@ msgstr ""
 msgid "unknown errno"
 msgstr "ukendt fejlnr."
 
-#: popt.c:996
+#: popt.c:1002
 #, c-format
 msgid "option type (%d) not implemented in popt\n"
 msgstr "tilvalgstype (%d) er ikke implementeret i popt\n"
 
-#: popt.c:1208
+#: popt.c:1215
 msgid "missing argument"
 msgstr "mangler argument"
 
-#: popt.c:1210
+#: popt.c:1217
 msgid "unknown option"
 msgstr "ukendt tilvalg"
 
-#: popt.c:1212
+#: popt.c:1219
 msgid "mutually exclusive logical operations requested"
 msgstr "de �nskede handlinger udelukker hinanden"
 
-#: popt.c:1214
+#: popt.c:1221
 msgid "opt->arg should not be NULL"
 msgstr ""
 
-#: popt.c:1216
+#: popt.c:1223
 msgid "aliases nested too deeply"
 msgstr "aliaser er for dybt indlejret"
 
-#: popt.c:1218
+#: popt.c:1225
 msgid "error in parameter quoting"
 msgstr "fejl i parameter citering"
 
-#: popt.c:1220
+#: popt.c:1227
 msgid "invalid numeric value"
 msgstr "ugyldig numerisk v�rdi"
 
-#: popt.c:1222
+#: popt.c:1229
 msgid "number too large or too small"
 msgstr "nummer for stort, eller for lille"
 
-#: popt.c:1224
+#: popt.c:1231
 msgid "memory allocation failed"
 msgstr ""
 
-#: popt.c:1228
+#: popt.c:1235
 msgid "unknown error"
 msgstr "ukendt fejl"
 
diff --git a/po/de.po b/po/de.po
index 784eabc..68d15e0 100644
--- a/po/de.po
+++ b/po/de.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.3\n"
 "Report-Msgid-Bugs-To: <rpm-devel@lists.dulug.duke.edu>\n"
-"POT-Creation-Date: 2007-01-21 14:25-0500\n"
+"POT-Creation-Date: 2007-06-14 15:31+0200\n"
 "PO-Revision-Date: 2007-02-17 21:00+0100\n"
 "Last-Translator: Robert Scheck <rpm@robert-scheck.de>\n"
 "Language-Team: German <de@li.org>\n"
@@ -18,48 +18,48 @@ msgstr ""
 msgid "unknown errno"
 msgstr "Unbekannte Fehler-Nummer"
 
-#: popt.c:996
+#: popt.c:1002
 #, c-format
 msgid "option type (%d) not implemented in popt\n"
 msgstr "Optionstyp (%d) ist in popt nicht vorhanden\n"
 
-#: popt.c:1208
+#: popt.c:1215
 msgid "missing argument"
 msgstr "Fehlendes Argument"
 
-#: popt.c:1210
+#: popt.c:1217
 msgid "unknown option"
 msgstr "Unbekannte Option"
 
-#: popt.c:1212
+#: popt.c:1219
 msgid "mutually exclusive logical operations requested"
 msgstr "Gegenseitig ausschließende logische Operatoren"
 
-#: popt.c:1214
+#: popt.c:1221
 msgid "opt->arg should not be NULL"
 msgstr "opt->arg sollte nicht NULL sein"
 
-#: popt.c:1216
+#: popt.c:1223
 msgid "aliases nested too deeply"
 msgstr "Aliase zu tief verschachtelt"
 
-#: popt.c:1218
+#: popt.c:1225
 msgid "error in parameter quoting"
 msgstr "Fehler beim Quotieren der Parameter"
 
-#: popt.c:1220
+#: popt.c:1227
 msgid "invalid numeric value"
 msgstr "Ungültiger nummerischer Wert"
 
-#: popt.c:1222
+#: popt.c:1229
 msgid "number too large or too small"
 msgstr "Nummer zu groß oder zu klein"
 
-#: popt.c:1224
+#: popt.c:1231
 msgid "memory allocation failed"
 msgstr "Speicherzuordnung fehlgeschlagen"
 
-#: popt.c:1228
+#: popt.c:1235
 msgid "unknown error"
 msgstr "Unbekannter Fehler"
 
diff --git a/po/es.po b/po/es.po
index 24fd51d..a8d41cb 100644
--- a/po/es.po
+++ b/po/es.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.3\n"
 "Report-Msgid-Bugs-To: <rpm-devel@lists.dulug.duke.edu>\n"
-"POT-Creation-Date: 2007-01-21 14:25-0500\n"
+"POT-Creation-Date: 2007-06-14 15:31+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Leandro Lucarella <luca@linuxmendoza.org.ar>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -19,48 +19,48 @@ msgstr ""
 msgid "unknown errno"
 msgstr "errno desconocido"
 
-#: popt.c:996
+#: popt.c:1002
 #, c-format
 msgid "option type (%d) not implemented in popt\n"
 msgstr "tipo de opcin (%d) no implementada en popt\n"
 
-#: popt.c:1208
+#: popt.c:1215
 msgid "missing argument"
 msgstr "falta argumento"
 
-#: popt.c:1210
+#: popt.c:1217
 msgid "unknown option"
 msgstr "opcin desconocida"
 
-#: popt.c:1212
+#: popt.c:1219
 msgid "mutually exclusive logical operations requested"
 msgstr "requerida operacin lgica mutuamente exclusiva"
 
-#: popt.c:1214
+#: popt.c:1221
 msgid "opt->arg should not be NULL"
 msgstr ""
 
-#: popt.c:1216
+#: popt.c:1223
 msgid "aliases nested too deeply"
 msgstr "alias anidados muy profundamente"
 
-#: popt.c:1218
+#: popt.c:1225
 msgid "error in parameter quoting"
 msgstr "error en cita de parmetros"
 
-#: popt.c:1220
+#: popt.c:1227
 msgid "invalid numeric value"
 msgstr "valor numrico invlido"
 
-#: popt.c:1222
+#: popt.c:1229
 msgid "number too large or too small"
 msgstr "nmero muy largo o muy pequeo"
 
-#: popt.c:1224
+#: popt.c:1231
 msgid "memory allocation failed"
 msgstr ""
 
-#: popt.c:1228
+#: popt.c:1235
 msgid "unknown error"
 msgstr "error desconocido"
 
diff --git a/po/eu_ES.po b/po/eu_ES.po
index 78ab7a1..7215026 100644
--- a/po/eu_ES.po
+++ b/po/eu_ES.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.3\n"
 "Report-Msgid-Bugs-To: <rpm-devel@lists.dulug.duke.edu>\n"
-"POT-Creation-Date: 2007-01-21 14:25-0500\n"
+"POT-Creation-Date: 2007-06-14 15:31+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -19,48 +19,48 @@ msgstr ""
 msgid "unknown errno"
 msgstr ""
 
-#: popt.c:996
+#: popt.c:1002
 #, c-format
 msgid "option type (%d) not implemented in popt\n"
 msgstr ""
 
-#: popt.c:1208
+#: popt.c:1215
 msgid "missing argument"
 msgstr ""
 
-#: popt.c:1210
+#: popt.c:1217
 msgid "unknown option"
 msgstr ""
 
-#: popt.c:1212
+#: popt.c:1219
 msgid "mutually exclusive logical operations requested"
 msgstr ""
 
-#: popt.c:1214
+#: popt.c:1221
 msgid "opt->arg should not be NULL"
 msgstr ""
 
-#: popt.c:1216
+#: popt.c:1223
 msgid "aliases nested too deeply"
 msgstr ""
 
-#: popt.c:1218
+#: popt.c:1225
 msgid "error in parameter quoting"
 msgstr ""
 
-#: popt.c:1220
+#: popt.c:1227
 msgid "invalid numeric value"
 msgstr ""
 
-#: popt.c:1222
+#: popt.c:1229
 msgid "number too large or too small"
 msgstr ""
 
-#: popt.c:1224
+#: popt.c:1231
 msgid "memory allocation failed"
 msgstr ""
 
-#: popt.c:1228
+#: popt.c:1235
 msgid "unknown error"
 msgstr ""
 
diff --git a/po/fi.po b/po/fi.po
index 78ab7a1..7215026 100644
--- a/po/fi.po
+++ b/po/fi.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.3\n"
 "Report-Msgid-Bugs-To: <rpm-devel@lists.dulug.duke.edu>\n"
-"POT-Creation-Date: 2007-01-21 14:25-0500\n"
+"POT-Creation-Date: 2007-06-14 15:31+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -19,48 +19,48 @@ msgstr ""
 msgid "unknown errno"
 msgstr ""
 
-#: popt.c:996
+#: popt.c:1002
 #, c-format
 msgid "option type (%d) not implemented in popt\n"
 msgstr ""
 
-#: popt.c:1208
+#: popt.c:1215
 msgid "missing argument"
 msgstr ""
 
-#: popt.c:1210
+#: popt.c:1217
 msgid "unknown option"
 msgstr ""
 
-#: popt.c:1212
+#: popt.c:1219
 msgid "mutually exclusive logical operations requested"
 msgstr ""
 
-#: popt.c:1214
+#: popt.c:1221
 msgid "opt->arg should not be NULL"
 msgstr ""
 
-#: popt.c:1216
+#: popt.c:1223
 msgid "aliases nested too deeply"
 msgstr ""
 
-#: popt.c:1218
+#: popt.c:1225
 msgid "error in parameter quoting"
 msgstr ""
 
-#: popt.c:1220
+#: popt.c:1227
 msgid "invalid numeric value"
 msgstr ""
 
-#: popt.c:1222
+#: popt.c:1229
 msgid "number too large or too small"
 msgstr ""
 
-#: popt.c:1224
+#: popt.c:1231
 msgid "memory allocation failed"
 msgstr ""
 
-#: popt.c:1228
+#: popt.c:1235
 msgid "unknown error"
 msgstr ""
 
diff --git a/po/fr.po b/po/fr.po
index ed933de..ee73594 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -12,7 +12,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.8.1\n"
 "Report-Msgid-Bugs-To: <rpm-devel@lists.dulug.duke.edu>\n"
-"POT-Creation-Date: 2007-01-21 14:25-0500\n"
+"POT-Creation-Date: 2007-06-14 15:31+0200\n"
 "PO-Revision-Date: 2003-06-22 23:43+0200\n"
 "Last-Translator: RPM French Translation <rpm-fr@livna.org>\n"
 "Language-Team: RPM French Translation <rpm-fr@livna.org>\n"
@@ -24,48 +24,48 @@ msgstr ""
 msgid "unknown errno"
 msgstr "errno inconnu"
 
-#: popt.c:996
+#: popt.c:1002
 #, c-format
 msgid "option type (%d) not implemented in popt\n"
 msgstr "type(%d) d'option non implémenté dans popt\n"
 
-#: popt.c:1208
+#: popt.c:1215
 msgid "missing argument"
 msgstr "argument manquant"
 
-#: popt.c:1210
+#: popt.c:1217
 msgid "unknown option"
 msgstr "option iconnue"
 
-#: popt.c:1212
+#: popt.c:1219
 msgid "mutually exclusive logical operations requested"
 msgstr "opérations logiques mutuellement exclusives requises"
 
-#: popt.c:1214
+#: popt.c:1221
 msgid "opt->arg should not be NULL"
 msgstr "opt->arg ne devrait pas être NULL"
 
-#: popt.c:1216
+#: popt.c:1223
 msgid "aliases nested too deeply"
 msgstr "les alias sont trop entremellés"
 
-#: popt.c:1218
+#: popt.c:1225
 msgid "error in parameter quoting"
 msgstr "erreur en citant les paramètres"
 
-#: popt.c:1220
+#: popt.c:1227
 msgid "invalid numeric value"
 msgstr "valeur numérique invalide"
 
-#: popt.c:1222
+#: popt.c:1229
 msgid "number too large or too small"
 msgstr "nombre trop grand ou trop petit"
 
-#: popt.c:1224
+#: popt.c:1231
 msgid "memory allocation failed"
 msgstr "échec de l'allocation de mémoire"
 
-#: popt.c:1228
+#: popt.c:1235
 msgid "unknown error"
 msgstr "erreur inconnue"
 
diff --git a/po/gl.po b/po/gl.po
index af5ec71..5201e9b 100644
--- a/po/gl.po
+++ b/po/gl.po
@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.3\n"
 "Report-Msgid-Bugs-To: <rpm-devel@lists.dulug.duke.edu>\n"
-"POT-Creation-Date: 2007-01-21 14:25-0500\n"
+"POT-Creation-Date: 2007-06-14 15:31+0200\n"
 "PO-Revision-Date: 2001-01-17 01:01+0100\n"
 "Last-Translator: Jes�s Bravo �lvarez <jba@pobox.com>\n"
 "Language-Team: Galician <trasno@ceu.fi.udc.es>\n"
@@ -14,48 +14,48 @@ msgstr ""
 msgid "unknown errno"
 msgstr "errno desco�ecido"
 
-#: popt.c:996
+#: popt.c:1002
 #, c-format
 msgid "option type (%d) not implemented in popt\n"
 msgstr "tipo de opci�n (%d) non implementada en popt\n"
 
-#: popt.c:1208
+#: popt.c:1215
 msgid "missing argument"
 msgstr "falta un argumento"
 
-#: popt.c:1210
+#: popt.c:1217
 msgid "unknown option"
 msgstr "opci�n desco�ecida"
 
-#: popt.c:1212
+#: popt.c:1219
 msgid "mutually exclusive logical operations requested"
 msgstr "solicit�ronse operaci�ns l�xicas mutuamente exclu�ntes"
 
-#: popt.c:1214
+#: popt.c:1221
 msgid "opt->arg should not be NULL"
 msgstr ""
 
-#: popt.c:1216
+#: popt.c:1223
 msgid "aliases nested too deeply"
 msgstr "aliases ani�ados a un nivel demasiado profundo"
 
-#: popt.c:1218
+#: popt.c:1225
 msgid "error in parameter quoting"
 msgstr "erro nas comi�as do par�metro"
 
-#: popt.c:1220
+#: popt.c:1227
 msgid "invalid numeric value"
 msgstr "valor num�rico non v�lido"
 
-#: popt.c:1222
+#: popt.c:1229
 msgid "number too large or too small"
 msgstr "n�mero demasiado grande ou pequeno"
 
-#: popt.c:1224
+#: popt.c:1231
 msgid "memory allocation failed"
 msgstr ""
 
-#: popt.c:1228
+#: popt.c:1235
 msgid "unknown error"
 msgstr "erro desco�ecido"
 
diff --git a/po/hu.po b/po/hu.po
index 74fb502..5460712 100644
--- a/po/hu.po
+++ b/po/hu.po
@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.3\n"
 "Report-Msgid-Bugs-To: <rpm-devel@lists.dulug.duke.edu>\n"
-"POT-Creation-Date: 2007-01-21 14:25-0500\n"
+"POT-Creation-Date: 2007-06-14 15:31+0200\n"
 "PO-Revision-Date: 2000-08-03 23:26+0200\n"
 "Last-Translator: L�szl� N�meth <nemeth@qwertynet.hu>\n"
 "Language-Team: Hungarian\n"
@@ -14,48 +14,48 @@ msgstr ""
 msgid "unknown errno"
 msgstr ""
 
-#: popt.c:996
+#: popt.c:1002
 #, c-format
 msgid "option type (%d) not implemented in popt\n"
 msgstr ""
 
-#: popt.c:1208
+#: popt.c:1215
 msgid "missing argument"
 msgstr ""
 
-#: popt.c:1210
+#: popt.c:1217
 msgid "unknown option"
 msgstr ""
 
-#: popt.c:1212
+#: popt.c:1219
 msgid "mutually exclusive logical operations requested"
 msgstr ""
 
-#: popt.c:1214
+#: popt.c:1221
 msgid "opt->arg should not be NULL"
 msgstr ""
 
-#: popt.c:1216
+#: popt.c:1223
 msgid "aliases nested too deeply"
 msgstr ""
 
-#: popt.c:1218
+#: popt.c:1225
 msgid "error in parameter quoting"
 msgstr ""
 
-#: popt.c:1220
+#: popt.c:1227
 msgid "invalid numeric value"
 msgstr ""
 
-#: popt.c:1222
+#: popt.c:1229
 msgid "number too large or too small"
 msgstr ""
 
-#: popt.c:1224
+#: popt.c:1231
 msgid "memory allocation failed"
 msgstr ""
 
-#: popt.c:1228
+#: popt.c:1235
 msgid "unknown error"
 msgstr ""
 
diff --git a/po/id.po b/po/id.po
index 78ab7a1..7215026 100644
--- a/po/id.po
+++ b/po/id.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.3\n"
 "Report-Msgid-Bugs-To: <rpm-devel@lists.dulug.duke.edu>\n"
-"POT-Creation-Date: 2007-01-21 14:25-0500\n"
+"POT-Creation-Date: 2007-06-14 15:31+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -19,48 +19,48 @@ msgstr ""
 msgid "unknown errno"
 msgstr ""
 
-#: popt.c:996
+#: popt.c:1002
 #, c-format
 msgid "option type (%d) not implemented in popt\n"
 msgstr ""
 
-#: popt.c:1208
+#: popt.c:1215
 msgid "missing argument"
 msgstr ""
 
-#: popt.c:1210
+#: popt.c:1217
 msgid "unknown option"
 msgstr ""
 
-#: popt.c:1212
+#: popt.c:1219
 msgid "mutually exclusive logical operations requested"
 msgstr ""
 
-#: popt.c:1214
+#: popt.c:1221
 msgid "opt->arg should not be NULL"
 msgstr ""
 
-#: popt.c:1216
+#: popt.c:1223
 msgid "aliases nested too deeply"
 msgstr ""
 
-#: popt.c:1218
+#: popt.c:1225
 msgid "error in parameter quoting"
 msgstr ""
 
-#: popt.c:1220
+#: popt.c:1227
 msgid "invalid numeric value"
 msgstr ""
 
-#: popt.c:1222
+#: popt.c:1229
 msgid "number too large or too small"
 msgstr ""
 
-#: popt.c:1224
+#: popt.c:1231
 msgid "memory allocation failed"
 msgstr ""
 
-#: popt.c:1228
+#: popt.c:1235
 msgid "unknown error"
 msgstr ""
 
diff --git a/po/is.po b/po/is.po
index 8dfd398..00c7d2b 100644
--- a/po/is.po
+++ b/po/is.po
@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.3\n"
 "Report-Msgid-Bugs-To: <rpm-devel@lists.dulug.duke.edu>\n"
-"POT-Creation-Date: 2007-01-21 14:25-0500\n"
+"POT-Creation-Date: 2007-06-14 15:31+0200\n"
 "PO-Revision-Date: 2001-06-08 01:35+0000\n"
 "Last-Translator: Richard Allen <ra@hp.is>\n"
 "Language-Team: is <kde-isl@mmedia.is>\n"
@@ -14,48 +14,48 @@ msgstr ""
 msgid "unknown errno"
 msgstr "��ekkt villun�mer"
 
-#: popt.c:996
+#: popt.c:1002
 #, c-format
 msgid "option type (%d) not implemented in popt\n"
 msgstr "rofager�in (%d) er ekki studd � popt\n"
 
-#: popt.c:1208
+#: popt.c:1215
 msgid "missing argument"
 msgstr "vantar vi�fang"
 
-#: popt.c:1210
+#: popt.c:1217
 msgid "unknown option"
 msgstr "��ekktur rofi"
 
-#: popt.c:1212
+#: popt.c:1219
 msgid "mutually exclusive logical operations requested"
 msgstr "be�i� um rofa sem sl�kkva hvor � ��rum"
 
-#: popt.c:1214
+#: popt.c:1221
 msgid "opt->arg should not be NULL"
 msgstr "opt->arg �tti ekki a� vera NULL"
 
-#: popt.c:1216
+#: popt.c:1223
 msgid "aliases nested too deeply"
 msgstr "al�asar of fl�knir"
 
-#: popt.c:1218
+#: popt.c:1225
 msgid "error in parameter quoting"
 msgstr "villa � vi�f�ngum (g�salappir og svo frv.)"
 
-#: popt.c:1220
+#: popt.c:1227
 msgid "invalid numeric value"
 msgstr "�gilt t�lulegt gildi"
 
-#: popt.c:1222
+#: popt.c:1229
 msgid "number too large or too small"
 msgstr "talan of st�r e�a sm�"
 
-#: popt.c:1224
+#: popt.c:1231
 msgid "memory allocation failed"
 msgstr "ekki t�kst a� taka fr� minni"
 
-#: popt.c:1228
+#: popt.c:1235
 msgid "unknown error"
 msgstr "��ekkt villa"
 
diff --git a/po/it.po b/po/it.po
index 78ab7a1..7215026 100644
--- a/po/it.po
+++ b/po/it.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.3\n"
 "Report-Msgid-Bugs-To: <rpm-devel@lists.dulug.duke.edu>\n"
-"POT-Creation-Date: 2007-01-21 14:25-0500\n"
+"POT-Creation-Date: 2007-06-14 15:31+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -19,48 +19,48 @@ msgstr ""
 msgid "unknown errno"
 msgstr ""
 
-#: popt.c:996
+#: popt.c:1002
 #, c-format
 msgid "option type (%d) not implemented in popt\n"
 msgstr ""
 
-#: popt.c:1208
+#: popt.c:1215
 msgid "missing argument"
 msgstr ""
 
-#: popt.c:1210
+#: popt.c:1217
 msgid "unknown option"
 msgstr ""
 
-#: popt.c:1212
+#: popt.c:1219
 msgid "mutually exclusive logical operations requested"
 msgstr ""
 
-#: popt.c:1214
+#: popt.c:1221
 msgid "opt->arg should not be NULL"
 msgstr ""
 
-#: popt.c:1216
+#: popt.c:1223
 msgid "aliases nested too deeply"
 msgstr ""
 
-#: popt.c:1218
+#: popt.c:1225
 msgid "error in parameter quoting"
 msgstr ""
 
-#: popt.c:1220
+#: popt.c:1227
 msgid "invalid numeric value"
 msgstr ""
 
-#: popt.c:1222
+#: popt.c:1229
 msgid "number too large or too small"
 msgstr ""
 
-#: popt.c:1224
+#: popt.c:1231
 msgid "memory allocation failed"
 msgstr ""
 
-#: popt.c:1228
+#: popt.c:1235
 msgid "unknown error"
 msgstr ""
 
diff --git a/po/ja.po b/po/ja.po
index 11f1a6a..77d7550 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.3\n"
 "Report-Msgid-Bugs-To: <rpm-devel@lists.dulug.duke.edu>\n"
-"POT-Creation-Date: 2007-01-21 14:25-0500\n"
+"POT-Creation-Date: 2007-06-14 15:31+0200\n"
 "PO-Revision-Date: 2003--8-25 19:00+0900\n"
 "Last-Translator: Yukihiro Nakai <ynakai@redhat.com>\n"
 "Language-Team: Japanese <ja@li.org>\n"
@@ -18,48 +18,48 @@ msgstr ""
 msgid "unknown errno"
 msgstr "不明なエラー番号"
 
-#: popt.c:996
+#: popt.c:1002
 #, c-format
 msgid "option type (%d) not implemented in popt\n"
 msgstr "オプションタイプ (%d) はpoptには実装されていません\n"
 
-#: popt.c:1208
+#: popt.c:1215
 msgid "missing argument"
 msgstr "引数がありません"
 
-#: popt.c:1210
+#: popt.c:1217
 msgid "unknown option"
 msgstr "不明なオプション"
 
-#: popt.c:1212
+#: popt.c:1219
 msgid "mutually exclusive logical operations requested"
 msgstr "排他的な悪ぺーレーションが必要です"
 
-#: popt.c:1214
+#: popt.c:1221
 msgid "opt->arg should not be NULL"
 msgstr "opt->argはNULLではいけません"
 
-#: popt.c:1216
+#: popt.c:1223
 msgid "aliases nested too deeply"
 msgstr "エイリアスのネストが深すぎます"
 
-#: popt.c:1218
+#: popt.c:1225
 msgid "error in parameter quoting"
 msgstr "パラメータのクオート付けでエラー"
 
-#: popt.c:1220
+#: popt.c:1227
 msgid "invalid numeric value"
 msgstr "不正な数値"
 
-#: popt.c:1222
+#: popt.c:1229
 msgid "number too large or too small"
 msgstr "数値が大きすぎるか小さすぎます"
 
-#: popt.c:1224
+#: popt.c:1231
 msgid "memory allocation failed"
 msgstr "メモリ確保に失敗しました"
 
-#: popt.c:1228
+#: popt.c:1235
 msgid "unknown error"
 msgstr "不明なエラー"
 
diff --git a/po/ko.po b/po/ko.po
index 1069aa7..ea435ff 100644
--- a/po/ko.po
+++ b/po/ko.po
@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6\n"
 "Report-Msgid-Bugs-To: <rpm-devel@lists.dulug.duke.edu>\n"
-"POT-Creation-Date: 2007-01-21 14:25-0500\n"
+"POT-Creation-Date: 2007-06-14 15:31+0200\n"
 "PO-Revision-Date: 2001-09-06 20:06+0900\n"
 "Last-Translator: Jong-Hoon Ryu <redhat4u@netian.com>\n"
 "Language-Team: GNU Translation project <ko@li.org>\n"
@@ -14,48 +14,48 @@ msgstr ""
 msgid "unknown errno"
 msgstr "�� �� ���� �����ڵ�(errno) �Դϴ�"
 
-#: popt.c:996
+#: popt.c:1002
 #, c-format
 msgid "option type (%d) not implemented in popt\n"
 msgstr "�ɼ� ���� (%d)�� popt���� ����� �� �����ϴ�\n"
 
-#: popt.c:1208
+#: popt.c:1215
 msgid "missing argument"
 msgstr "�μ��� �������� �ʾҽ��ϴ�"
 
-#: popt.c:1210
+#: popt.c:1217
 msgid "unknown option"
 msgstr "�� �� ���� �ɼ��Դϴ�"
 
-#: popt.c:1212
+#: popt.c:1219
 msgid "mutually exclusive logical operations requested"
 msgstr "���ʿ� ��Ÿ�� ���� ������ �����Ǿ����ϴ�"
 
-#: popt.c:1214
+#: popt.c:1221
 msgid "opt->arg should not be NULL"
 msgstr "�ɼ�->�μ��� NULL�� �Ǿ�� �ȵ˴ϴ�"
 
-#: popt.c:1216
+#: popt.c:1223
 msgid "aliases nested too deeply"
 msgstr "��Ī(alias)�� �����ϰ� �����Ǿ����ϴ�"
 
-#: popt.c:1218
+#: popt.c:1225
 msgid "error in parameter quoting"
 msgstr "�Ű������� ������ �ֽ��ϴ�"
 
-#: popt.c:1220
+#: popt.c:1227
 msgid "invalid numeric value"
 msgstr "�߸��� ��ġ ���Դϴ�"
 
-#: popt.c:1222
+#: popt.c:1229
 msgid "number too large or too small"
 msgstr "���ڰ� �ʹ� ũ�ų� �ʹ� �����ϴ�"
 
-#: popt.c:1224
+#: popt.c:1231
 msgid "memory allocation failed"
 msgstr "�޸� �Ҵ翡 �����߽��ϴ�"
 
-#: popt.c:1228
+#: popt.c:1235
 msgid "unknown error"
 msgstr "�� �� ���� �����Դϴ�"
 
diff --git a/po/no.po b/po/no.po
index c281df7..3c7bfd0 100644
--- a/po/no.po
+++ b/po/no.po
@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.3\n"
 "Report-Msgid-Bugs-To: <rpm-devel@lists.dulug.duke.edu>\n"
-"POT-Creation-Date: 2007-01-21 14:25-0500\n"
+"POT-Creation-Date: 2007-06-14 15:31+0200\n"
 "PO-Revision-Date: 2001-06-27 11:05+0200\n"
 "Last-Translator: Kjartan Maraas <kmaraas@online.no>\n"
 "Language-Team: Norwegian <no@li.org>\n"
@@ -14,48 +14,48 @@ msgstr ""
 msgid "unknown errno"
 msgstr "ukjent errno"
 
-#: popt.c:996
+#: popt.c:1002
 #, c-format
 msgid "option type (%d) not implemented in popt\n"
 msgstr "flaggtype (%d) ikke implementert i popt\n"
 
-#: popt.c:1208
+#: popt.c:1215
 msgid "missing argument"
 msgstr "manglende argument"
 
-#: popt.c:1210
+#: popt.c:1217
 msgid "unknown option"
 msgstr "ukjent flagg"
 
-#: popt.c:1212
+#: popt.c:1219
 msgid "mutually exclusive logical operations requested"
 msgstr "gjensidig eksluderende logiske operasjoner forespurt"
 
-#: popt.c:1214
+#: popt.c:1221
 msgid "opt->arg should not be NULL"
 msgstr "opt->arg m� ikke v�re NULL"
 
-#: popt.c:1216
+#: popt.c:1223
 msgid "aliases nested too deeply"
 msgstr "aliaser med for dype l�kker"
 
-#: popt.c:1218
+#: popt.c:1225
 msgid "error in parameter quoting"
 msgstr "feil i parametersitering"
 
-#: popt.c:1220
+#: popt.c:1227
 msgid "invalid numeric value"
 msgstr "ugyldig numerisk verdi"
 
-#: popt.c:1222
+#: popt.c:1229
 msgid "number too large or too small"
 msgstr "tallet er for stort eller lite"
 
-#: popt.c:1224
+#: popt.c:1231
 msgid "memory allocation failed"
 msgstr "minneallokering feilet"
 
-#: popt.c:1228
+#: popt.c:1235
 msgid "unknown error"
 msgstr "ukjent feil"
 
diff --git a/po/pl.po b/po/pl.po
index c3ffcc3..cee135d 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.9-20030515\n"
 "Report-Msgid-Bugs-To: <rpm-devel@lists.dulug.duke.edu>\n"
-"POT-Creation-Date: 2007-01-21 14:25-0500\n"
+"POT-Creation-Date: 2007-06-14 15:31+0200\n"
 "PO-Revision-Date: 2003-06-08 20:32+0200\n"
 "Last-Translator: Jakub Bogusz <qboosh@pld.org.pl>\n"
 "Language-Team: Polish <translation-team-pl@lists.sourceforge.net>\n"
@@ -18,48 +18,48 @@ msgstr ""
 msgid "unknown errno"
 msgstr "nieznane errno"
 
-#: popt.c:996
+#: popt.c:1002
 #, c-format
 msgid "option type (%d) not implemented in popt\n"
 msgstr "rodzaj opcji (%d) nie zaimplementowany w popt\n"
 
-#: popt.c:1208
+#: popt.c:1215
 msgid "missing argument"
 msgstr "brak parametru"
 
-#: popt.c:1210
+#: popt.c:1217
 msgid "unknown option"
 msgstr "nieznana opcja"
 
-#: popt.c:1212
+#: popt.c:1219
 msgid "mutually exclusive logical operations requested"
 msgstr "��danie wykluczaj�cych si� operacji"
 
-#: popt.c:1214
+#: popt.c:1221
 msgid "opt->arg should not be NULL"
 msgstr "opt->arg nie mo�e by� NULL"
 
-#: popt.c:1216
+#: popt.c:1223
 msgid "aliases nested too deeply"
 msgstr "zbyt du�e zag��bienie alias�w"
 
-#: popt.c:1218
+#: popt.c:1225
 msgid "error in parameter quoting"
 msgstr "b��d w cytowaniu parametru"
 
-#: popt.c:1220
+#: popt.c:1227
 msgid "invalid numeric value"
 msgstr "b��dna warto�� liczbowa"
 
-#: popt.c:1222
+#: popt.c:1229
 msgid "number too large or too small"
 msgstr "liczba zbyt du�a lub zbyt ma�a"
 
-#: popt.c:1224
+#: popt.c:1231
 msgid "memory allocation failed"
 msgstr "b��d alokacji pami�ci"
 
-#: popt.c:1228
+#: popt.c:1235
 msgid "unknown error"
 msgstr "nieznany b��d"
 
diff --git a/po/popt.pot b/po/popt.pot
index 8017da4..b8822d6 100644
--- a/po/popt.pot
+++ b/po/popt.pot
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: <rpm-devel@lists.dulug.duke.edu>\n"
-"POT-Creation-Date: 2007-01-21 14:25-0500\n"
+"POT-Creation-Date: 2007-06-14 15:31+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -19,48 +19,48 @@ msgstr ""
 msgid "unknown errno"
 msgstr ""
 
-#: popt.c:996
+#: popt.c:1002
 #, c-format
 msgid "option type (%d) not implemented in popt\n"
 msgstr ""
 
-#: popt.c:1208
+#: popt.c:1215
 msgid "missing argument"
 msgstr ""
 
-#: popt.c:1210
+#: popt.c:1217
 msgid "unknown option"
 msgstr ""
 
-#: popt.c:1212
+#: popt.c:1219
 msgid "mutually exclusive logical operations requested"
 msgstr ""
 
-#: popt.c:1214
+#: popt.c:1221
 msgid "opt->arg should not be NULL"
 msgstr ""
 
-#: popt.c:1216
+#: popt.c:1223
 msgid "aliases nested too deeply"
 msgstr ""
 
-#: popt.c:1218
+#: popt.c:1225
 msgid "error in parameter quoting"
 msgstr ""
 
-#: popt.c:1220
+#: popt.c:1227
 msgid "invalid numeric value"
 msgstr ""
 
-#: popt.c:1222
+#: popt.c:1229
 msgid "number too large or too small"
 msgstr ""
 
-#: popt.c:1224
+#: popt.c:1231
 msgid "memory allocation failed"
 msgstr ""
 
-#: popt.c:1228
+#: popt.c:1235
 msgid "unknown error"
 msgstr ""
 
diff --git a/po/pt.po b/po/pt.po
index 017e3f9..9dd6614 100644
--- a/po/pt.po
+++ b/po/pt.po
@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: popt\n"
 "Report-Msgid-Bugs-To: <rpm-devel@lists.dulug.duke.edu>\n"
-"POT-Creation-Date: 2007-01-21 14:25-0500\n"
+"POT-Creation-Date: 2007-06-14 15:31+0200\n"
 "PO-Revision-Date: 2002-02-13 18:32+0000\n"
 "Last-Translator: Pedro Morais <morais@kde.org>\n"
 "Language-Team: pt <morais@kde.org>\n"
@@ -14,48 +14,48 @@ msgstr ""
 msgid "unknown errno"
 msgstr "errno desconhecido"
 
-#: popt.c:996
+#: popt.c:1002
 #, c-format
 msgid "option type (%d) not implemented in popt\n"
 msgstr "tipo de op��o (%d) n�o implementado no popt\n"
 
-#: popt.c:1208
+#: popt.c:1215
 msgid "missing argument"
 msgstr "falta um argumento"
 
-#: popt.c:1210
+#: popt.c:1217
 msgid "unknown option"
 msgstr "op��o desconhecida"
 
-#: popt.c:1212
+#: popt.c:1219
 msgid "mutually exclusive logical operations requested"
 msgstr "foram pedidas opera��es l�gicas mutuamente exclusivas"
 
-#: popt.c:1214
+#: popt.c:1221
 msgid "opt->arg should not be NULL"
 msgstr "opt->arg n�o deve ser NULL"
 
-#: popt.c:1216
+#: popt.c:1223
 msgid "aliases nested too deeply"
 msgstr "'aliases' demasiado aninhados"
 
-#: popt.c:1218
+#: popt.c:1225
 msgid "error in parameter quoting"
 msgstr "erros no 'quoting' de par�metros"
 
-#: popt.c:1220
+#: popt.c:1227
 msgid "invalid numeric value"
 msgstr "valor n�merico inv�lido"
 
-#: popt.c:1222
+#: popt.c:1229
 msgid "number too large or too small"
 msgstr "n�mero demasiado grando ou pequeno"
 
-#: popt.c:1224
+#: popt.c:1231
 msgid "memory allocation failed"
 msgstr "aloca��o de mem�ria falhou"
 
-#: popt.c:1228
+#: popt.c:1235
 msgid "unknown error"
 msgstr "erro desconhecido"
 
diff --git a/po/pt_BR.po b/po/pt_BR.po
index 78ab7a1..7215026 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.3\n"
 "Report-Msgid-Bugs-To: <rpm-devel@lists.dulug.duke.edu>\n"
-"POT-Creation-Date: 2007-01-21 14:25-0500\n"
+"POT-Creation-Date: 2007-06-14 15:31+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -19,48 +19,48 @@ msgstr ""
 msgid "unknown errno"
 msgstr ""
 
-#: popt.c:996
+#: popt.c:1002
 #, c-format
 msgid "option type (%d) not implemented in popt\n"
 msgstr ""
 
-#: popt.c:1208
+#: popt.c:1215
 msgid "missing argument"
 msgstr ""
 
-#: popt.c:1210
+#: popt.c:1217
 msgid "unknown option"
 msgstr ""
 
-#: popt.c:1212
+#: popt.c:1219
 msgid "mutually exclusive logical operations requested"
 msgstr ""
 
-#: popt.c:1214
+#: popt.c:1221
 msgid "opt->arg should not be NULL"
 msgstr ""
 
-#: popt.c:1216
+#: popt.c:1223
 msgid "aliases nested too deeply"
 msgstr ""
 
-#: popt.c:1218
+#: popt.c:1225
 msgid "error in parameter quoting"
 msgstr ""
 
-#: popt.c:1220
+#: popt.c:1227
 msgid "invalid numeric value"
 msgstr ""
 
-#: popt.c:1222
+#: popt.c:1229
 msgid "number too large or too small"
 msgstr ""
 
-#: popt.c:1224
+#: popt.c:1231
 msgid "memory allocation failed"
 msgstr ""
 
-#: popt.c:1228
+#: popt.c:1235
 msgid "unknown error"
 msgstr ""
 
diff --git a/po/ro.po b/po/ro.po
index 9e182fe..bfc980e 100644
--- a/po/ro.po
+++ b/po/ro.po
@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.3\n"
 "Report-Msgid-Bugs-To: <rpm-devel@lists.dulug.duke.edu>\n"
-"POT-Creation-Date: 2007-01-21 14:25-0500\n"
+"POT-Creation-Date: 2007-06-14 15:31+0200\n"
 "PO-Revision-Date: 2000-06-14 23:23+EST\n"
 "Last-Translator: Cristian Gafton <gafton@redhat.com>\n"
 "Language-Team: Romanian <ro@li.org>\n"
@@ -14,49 +14,49 @@ msgstr ""
 msgid "unknown errno"
 msgstr "eroare necunoscuta"
 
-#: popt.c:996
+#: popt.c:1002
 #, c-format
 msgid "option type (%d) not implemented in popt\n"
 msgstr "optiunea de tipul (%d) nu este implementata in popt\n"
 
-#: popt.c:1208
+#: popt.c:1215
 msgid "missing argument"
 msgstr "argument lipsa"
 
-#: popt.c:1210
+#: popt.c:1217
 msgid "unknown option"
 msgstr "optiune necunoscuta"
 
-#: popt.c:1212
+#: popt.c:1219
 msgid "mutually exclusive logical operations requested"
 msgstr ""
 
-#: popt.c:1214
+#: popt.c:1221
 msgid "opt->arg should not be NULL"
 msgstr ""
 
-#: popt.c:1216
+#: popt.c:1223
 msgid "aliases nested too deeply"
 msgstr "recursivitate infinita la optiunile sinonime"
 
-#: popt.c:1218
+#: popt.c:1225
 #, fuzzy
 msgid "error in parameter quoting"
 msgstr "eroare la insertie parametru"
 
-#: popt.c:1220
+#: popt.c:1227
 msgid "invalid numeric value"
 msgstr "valoare numarica invalida"
 
-#: popt.c:1222
+#: popt.c:1229
 msgid "number too large or too small"
 msgstr "numar prea mare sau prea mic"
 
-#: popt.c:1224
+#: popt.c:1231
 msgid "memory allocation failed"
 msgstr ""
 
-#: popt.c:1228
+#: popt.c:1235
 msgid "unknown error"
 msgstr "eroare necuinoscuta"
 
diff --git a/po/ru.po b/po/ru.po
index bd77409..e19546d 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.3\n"
 "Report-Msgid-Bugs-To: <rpm-devel@lists.dulug.duke.edu>\n"
-"POT-Creation-Date: 2007-01-21 14:25-0500\n"
+"POT-Creation-Date: 2007-06-14 15:31+0200\n"
 "PO-Revision-Date: 2001-07-05 21:00-0500\n"
 "Last-Translator: Eugene Kanter <eugene@blackcatlinux.com>\n"
 "Language-Team: Black Cat Linux Team <blackcat-support@blackcatlinux.com>\n"
@@ -14,48 +14,48 @@ msgstr ""
 msgid "unknown errno"
 msgstr "����������� ����� ������"
 
-#: popt.c:996
+#: popt.c:1002
 #, c-format
 msgid "option type (%d) not implemented in popt\n"
 msgstr "��������� ��������� (%d) � popt �� �������������\n"
 
-#: popt.c:1208
+#: popt.c:1215
 msgid "missing argument"
 msgstr "�������� ��������"
 
-#: popt.c:1210
+#: popt.c:1217
 msgid "unknown option"
 msgstr "����������� ��������"
 
-#: popt.c:1212
+#: popt.c:1219
 msgid "mutually exclusive logical operations requested"
 msgstr "��������� ������� ����������� ���������� ��������"
 
-#: popt.c:1214
+#: popt.c:1221
 msgid "opt->arg should not be NULL"
 msgstr "opt->arg �� ����� ���� NULL"
 
-#: popt.c:1216
+#: popt.c:1223
 msgid "aliases nested too deeply"
 msgstr "�������� ������� ���������� �������� �����������"
 
-#: popt.c:1218
+#: popt.c:1225
 msgid "error in parameter quoting"
 msgstr "�����a ��������� ���������� � �������"
 
-#: popt.c:1220
+#: popt.c:1227
 msgid "invalid numeric value"
 msgstr "������������ �������� ��������"
 
-#: popt.c:1222
+#: popt.c:1229
 msgid "number too large or too small"
 msgstr "�������� �������� �� ��������� ����������������"
 
-#: popt.c:1224
+#: popt.c:1231
 msgid "memory allocation failed"
 msgstr "������ ��������� ������"
 
-#: popt.c:1228
+#: popt.c:1235
 msgid "unknown error"
 msgstr "����������� ������"
 
diff --git a/po/sk.po b/po/sk.po
index 714a768..e2148ec 100644
--- a/po/sk.po
+++ b/po/sk.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.3\n"
 "Report-Msgid-Bugs-To: <rpm-devel@lists.dulug.duke.edu>\n"
-"POT-Creation-Date: 2007-01-21 14:25-0500\n"
+"POT-Creation-Date: 2007-06-14 15:31+0200\n"
 "PO-Revision-Date: 1999-08-04 21:40+0200\n"
 "Last-Translator: Stanislav Meduna <stano@eunet.sk>\n"
 "Language-Team: Slovak <sk-i18n@rak.isternet.sk>\n"
@@ -18,48 +18,48 @@ msgstr ""
 msgid "unknown errno"
 msgstr ""
 
-#: popt.c:996
+#: popt.c:1002
 #, c-format
 msgid "option type (%d) not implemented in popt\n"
 msgstr ""
 
-#: popt.c:1208
+#: popt.c:1215
 msgid "missing argument"
 msgstr ""
 
-#: popt.c:1210
+#: popt.c:1217
 msgid "unknown option"
 msgstr ""
 
-#: popt.c:1212
+#: popt.c:1219
 msgid "mutually exclusive logical operations requested"
 msgstr ""
 
-#: popt.c:1214
+#: popt.c:1221
 msgid "opt->arg should not be NULL"
 msgstr ""
 
-#: popt.c:1216
+#: popt.c:1223
 msgid "aliases nested too deeply"
 msgstr ""
 
-#: popt.c:1218
+#: popt.c:1225
 msgid "error in parameter quoting"
 msgstr ""
 
-#: popt.c:1220
+#: popt.c:1227
 msgid "invalid numeric value"
 msgstr ""
 
-#: popt.c:1222
+#: popt.c:1229
 msgid "number too large or too small"
 msgstr ""
 
-#: popt.c:1224
+#: popt.c:1231
 msgid "memory allocation failed"
 msgstr ""
 
-#: popt.c:1228
+#: popt.c:1235
 msgid "unknown error"
 msgstr ""
 
diff --git a/po/sl.po b/po/sl.po
index 54c0370..447f611 100644
--- a/po/sl.po
+++ b/po/sl.po
@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.3\n"
 "Report-Msgid-Bugs-To: <rpm-devel@lists.dulug.duke.edu>\n"
-"POT-Creation-Date: 2007-01-21 14:25-0500\n"
+"POT-Creation-Date: 2007-06-14 15:31+0200\n"
 "PO-Revision-Date: 2000-09-05 12:30+0200\n"
 "Last-Translator: Roman Maurer <roman.maurer@hermes.si>\n"
 "Language-Team: Slovenian <sl@li.org>\n"
@@ -14,48 +14,48 @@ msgstr ""
 msgid "unknown errno"
 msgstr ""
 
-#: popt.c:996
+#: popt.c:1002
 #, c-format
 msgid "option type (%d) not implemented in popt\n"
 msgstr ""
 
-#: popt.c:1208
+#: popt.c:1215
 msgid "missing argument"
 msgstr ""
 
-#: popt.c:1210
+#: popt.c:1217
 msgid "unknown option"
 msgstr ""
 
-#: popt.c:1212
+#: popt.c:1219
 msgid "mutually exclusive logical operations requested"
 msgstr ""
 
-#: popt.c:1214
+#: popt.c:1221
 msgid "opt->arg should not be NULL"
 msgstr ""
 
-#: popt.c:1216
+#: popt.c:1223
 msgid "aliases nested too deeply"
 msgstr ""
 
-#: popt.c:1218
+#: popt.c:1225
 msgid "error in parameter quoting"
 msgstr ""
 
-#: popt.c:1220
+#: popt.c:1227
 msgid "invalid numeric value"
 msgstr ""
 
-#: popt.c:1222
+#: popt.c:1229
 msgid "number too large or too small"
 msgstr ""
 
-#: popt.c:1224
+#: popt.c:1231
 msgid "memory allocation failed"
 msgstr ""
 
-#: popt.c:1228
+#: popt.c:1235
 msgid "unknown error"
 msgstr ""
 
diff --git a/po/sr.po b/po/sr.po
index 78ab7a1..7215026 100644
--- a/po/sr.po
+++ b/po/sr.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.3\n"
 "Report-Msgid-Bugs-To: <rpm-devel@lists.dulug.duke.edu>\n"
-"POT-Creation-Date: 2007-01-21 14:25-0500\n"
+"POT-Creation-Date: 2007-06-14 15:31+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -19,48 +19,48 @@ msgstr ""
 msgid "unknown errno"
 msgstr ""
 
-#: popt.c:996
+#: popt.c:1002
 #, c-format
 msgid "option type (%d) not implemented in popt\n"
 msgstr ""
 
-#: popt.c:1208
+#: popt.c:1215
 msgid "missing argument"
 msgstr ""
 
-#: popt.c:1210
+#: popt.c:1217
 msgid "unknown option"
 msgstr ""
 
-#: popt.c:1212
+#: popt.c:1219
 msgid "mutually exclusive logical operations requested"
 msgstr ""
 
-#: popt.c:1214
+#: popt.c:1221
 msgid "opt->arg should not be NULL"
 msgstr ""
 
-#: popt.c:1216
+#: popt.c:1223
 msgid "aliases nested too deeply"
 msgstr ""
 
-#: popt.c:1218
+#: popt.c:1225
 msgid "error in parameter quoting"
 msgstr ""
 
-#: popt.c:1220
+#: popt.c:1227
 msgid "invalid numeric value"
 msgstr ""
 
-#: popt.c:1222
+#: popt.c:1229
 msgid "number too large or too small"
 msgstr ""
 
-#: popt.c:1224
+#: popt.c:1231
 msgid "memory allocation failed"
 msgstr ""
 
-#: popt.c:1228
+#: popt.c:1235
 msgid "unknown error"
 msgstr ""
 
diff --git a/po/sv.po b/po/sv.po
index 53bcf7f..89bc9de 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: popt\n"
 "Report-Msgid-Bugs-To: <rpm-devel@lists.dulug.duke.edu>\n"
-"POT-Creation-Date: 2007-01-21 14:25-0500\n"
+"POT-Creation-Date: 2007-06-14 15:31+0200\n"
 "PO-Revision-Date: 2007-06-12 22:00+0200\n"
 "Last-Translator: G�ran Uddeborg <goeran@uddeborg.se>\n"
 "Language-Team: Swedish <tp-sv@listor.tp-sv.se>\n"
@@ -14,48 +14,48 @@ msgstr ""
 msgid "unknown errno"
 msgstr "ok�nt felnummer"
 
-#: popt.c:996
+#: popt.c:1002
 #, c-format
 msgid "option type (%d) not implemented in popt\n"
 msgstr "flaggtypen (%d) �r inte implementerad i popt\n"
 
-#: popt.c:1208
+#: popt.c:1215
 msgid "missing argument"
 msgstr "argument saknas"
 
-#: popt.c:1210
+#: popt.c:1217
 msgid "unknown option"
 msgstr "ok�nd flagga"
 
-#: popt.c:1212
+#: popt.c:1219
 msgid "mutually exclusive logical operations requested"
 msgstr "�msesidigt uteslutande logiska operationer beg�rdes"
 
-#: popt.c:1214
+#: popt.c:1221
 msgid "opt->arg should not be NULL"
 msgstr "opt->arg f�r inte vara NULL"
 
-#: popt.c:1216
+#: popt.c:1223
 msgid "aliases nested too deeply"
 msgstr "alias �r n�stlade f�r djupt"
 
-#: popt.c:1218
+#: popt.c:1225
 msgid "error in parameter quoting"
 msgstr "fel i parametercitering"
 
-#: popt.c:1220
+#: popt.c:1227
 msgid "invalid numeric value"
 msgstr "ogiltigt numeriskt v�rde"
 
-#: popt.c:1222
+#: popt.c:1229
 msgid "number too large or too small"
 msgstr "talet f�r stort eller f�r litet"
 
-#: popt.c:1224
+#: popt.c:1231
 msgid "memory allocation failed"
 msgstr "minnesallokering misslyckades"
 
-#: popt.c:1228
+#: popt.c:1235
 msgid "unknown error"
 msgstr "ok�nt fel"
 
diff --git a/po/tr.po b/po/tr.po
index 5e42797..03f5de4 100644
--- a/po/tr.po
+++ b/po/tr.po
@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.3\n"
 "Report-Msgid-Bugs-To: <rpm-devel@lists.dulug.duke.edu>\n"
-"POT-Creation-Date: 2007-01-21 14:25-0500\n"
+"POT-Creation-Date: 2007-06-14 15:31+0200\n"
 "PO-Revision-Date: 2000-02-11 13:01+0200\n"
 "Last-Translator: Nilgun Belma Buguner <nilgun@technologist.com>\n"
 "Language-Team: Turkish <tr@li.org>\n"
@@ -14,48 +14,48 @@ msgstr ""
 msgid "unknown errno"
 msgstr "bilinmeyen hata no"
 
-#: popt.c:996
+#: popt.c:1002
 #, c-format
 msgid "option type (%d) not implemented in popt\n"
 msgstr "se�enek t�r� (%d) popt i�in ge�ersiz\n"
 
-#: popt.c:1208
+#: popt.c:1215
 msgid "missing argument"
 msgstr "arg�man eksik"
 
-#: popt.c:1210
+#: popt.c:1217
 msgid "unknown option"
 msgstr "bilinmeyen se�enek"
 
-#: popt.c:1212
+#: popt.c:1219
 msgid "mutually exclusive logical operations requested"
 msgstr "birbirini d��layan mant�ksal i�lemler istendi"
 
-#: popt.c:1214
+#: popt.c:1221
 msgid "opt->arg should not be NULL"
 msgstr ""
 
-#: popt.c:1216
+#: popt.c:1223
 msgid "aliases nested too deeply"
 msgstr "adlarda �ok fazla i�i�elikler"
 
-#: popt.c:1218
+#: popt.c:1225
 msgid "error in parameter quoting"
 msgstr "parametrelerde t�rnak i�aretleme hatal� "
 
-#: popt.c:1220
+#: popt.c:1227
 msgid "invalid numeric value"
 msgstr "say�sal de�er ge�ersiz"
 
-#: popt.c:1222
+#: popt.c:1229
 msgid "number too large or too small"
 msgstr "say� ya �ok b�y�k ya da �ok k���k"
 
-#: popt.c:1224
+#: popt.c:1231
 msgid "memory allocation failed"
 msgstr ""
 
-#: popt.c:1228
+#: popt.c:1235
 msgid "unknown error"
 msgstr "bilinmeyen hata"
 
diff --git a/po/uk.po b/po/uk.po
index cc793c6..8d83d2f 100644
--- a/po/uk.po
+++ b/po/uk.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.3\n"
 "Report-Msgid-Bugs-To: <rpm-devel@lists.dulug.duke.edu>\n"
-"POT-Creation-Date: 2007-01-21 14:25-0500\n"
+"POT-Creation-Date: 2007-06-14 15:31+0200\n"
 "PO-Revision-Date: 1999-09-30 16:54+0200\n"
 "Last-Translator: Yuri Syrota <rasta@renome.rovno.ua>\n"
 "Language-Team: Ukrainian <uk@li.org>\n"
@@ -18,48 +18,48 @@ msgstr ""
 msgid "unknown errno"
 msgstr ""
 
-#: popt.c:996
+#: popt.c:1002
 #, c-format
 msgid "option type (%d) not implemented in popt\n"
 msgstr ""
 
-#: popt.c:1208
+#: popt.c:1215
 msgid "missing argument"
 msgstr ""
 
-#: popt.c:1210
+#: popt.c:1217
 msgid "unknown option"
 msgstr ""
 
-#: popt.c:1212
+#: popt.c:1219
 msgid "mutually exclusive logical operations requested"
 msgstr ""
 
-#: popt.c:1214
+#: popt.c:1221
 msgid "opt->arg should not be NULL"
 msgstr ""
 
-#: popt.c:1216
+#: popt.c:1223
 msgid "aliases nested too deeply"
 msgstr ""
 
-#: popt.c:1218
+#: popt.c:1225
 msgid "error in parameter quoting"
 msgstr ""
 
-#: popt.c:1220
+#: popt.c:1227
 msgid "invalid numeric value"
 msgstr ""
 
-#: popt.c:1222
+#: popt.c:1229
 msgid "number too large or too small"
 msgstr ""
 
-#: popt.c:1224
+#: popt.c:1231
 msgid "memory allocation failed"
 msgstr ""
 
-#: popt.c:1228
+#: popt.c:1235
 msgid "unknown error"
 msgstr ""
 
diff --git a/po/wa.po b/po/wa.po
index 2fbc61f..47fb2b4 100644
--- a/po/wa.po
+++ b/po/wa.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.3\n"
 "Report-Msgid-Bugs-To: <rpm-devel@lists.dulug.duke.edu>\n"
-"POT-Creation-Date: 2007-01-21 14:25-0500\n"
+"POT-Creation-Date: 2007-06-14 15:31+0200\n"
 "PO-Revision-Date: 1999-03-18 23:11+0100\n"
 "Last-Translator: Nobody yet\n"
 "Language-Team: walon <linux-wa@chanae.alphanet.ch>\n"
@@ -22,48 +22,48 @@ msgstr ""
 msgid "unknown errno"
 msgstr ""
 
-#: popt.c:996
+#: popt.c:1002
 #, c-format
 msgid "option type (%d) not implemented in popt\n"
 msgstr ""
 
-#: popt.c:1208
+#: popt.c:1215
 msgid "missing argument"
 msgstr ""
 
-#: popt.c:1210
+#: popt.c:1217
 msgid "unknown option"
 msgstr ""
 
-#: popt.c:1212
+#: popt.c:1219
 msgid "mutually exclusive logical operations requested"
 msgstr ""
 
-#: popt.c:1214
+#: popt.c:1221
 msgid "opt->arg should not be NULL"
 msgstr ""
 
-#: popt.c:1216
+#: popt.c:1223
 msgid "aliases nested too deeply"
 msgstr ""
 
-#: popt.c:1218
+#: popt.c:1225
 msgid "error in parameter quoting"
 msgstr ""
 
-#: popt.c:1220
+#: popt.c:1227
 msgid "invalid numeric value"
 msgstr ""
 
-#: popt.c:1222
+#: popt.c:1229
 msgid "number too large or too small"
 msgstr ""
 
-#: popt.c:1224
+#: popt.c:1231
 msgid "memory allocation failed"
 msgstr ""
 
-#: popt.c:1228
+#: popt.c:1235
 msgid "unknown error"
 msgstr ""
 
diff --git a/po/zh.po b/po/zh.po
index 78ab7a1..7215026 100644
--- a/po/zh.po
+++ b/po/zh.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.6.3\n"
 "Report-Msgid-Bugs-To: <rpm-devel@lists.dulug.duke.edu>\n"
-"POT-Creation-Date: 2007-01-21 14:25-0500\n"
+"POT-Creation-Date: 2007-06-14 15:31+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -19,48 +19,48 @@ msgstr ""
 msgid "unknown errno"
 msgstr ""
 
-#: popt.c:996
+#: popt.c:1002
 #, c-format
 msgid "option type (%d) not implemented in popt\n"
 msgstr ""
 
-#: popt.c:1208
+#: popt.c:1215
 msgid "missing argument"
 msgstr ""
 
-#: popt.c:1210
+#: popt.c:1217
 msgid "unknown option"
 msgstr ""
 
-#: popt.c:1212
+#: popt.c:1219
 msgid "mutually exclusive logical operations requested"
 msgstr ""
 
-#: popt.c:1214
+#: popt.c:1221
 msgid "opt->arg should not be NULL"
 msgstr ""
 
-#: popt.c:1216
+#: popt.c:1223
 msgid "aliases nested too deeply"
 msgstr ""
 
-#: popt.c:1218
+#: popt.c:1225
 msgid "error in parameter quoting"
 msgstr ""
 
-#: popt.c:1220
+#: popt.c:1227
 msgid "invalid numeric value"
 msgstr ""
 
-#: popt.c:1222
+#: popt.c:1229
 msgid "number too large or too small"
 msgstr ""
 
-#: popt.c:1224
+#: popt.c:1231
 msgid "memory allocation failed"
 msgstr ""
 
-#: popt.c:1228
+#: popt.c:1235
 msgid "unknown error"
 msgstr ""
 
diff --git a/po/zh_CN.po b/po/zh_CN.po
index 0930d01..c73a0cd 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: translation\n"
 "Report-Msgid-Bugs-To: <rpm-devel@lists.dulug.duke.edu>\n"
-"POT-Creation-Date: 2007-01-21 14:25-0500\n"
+"POT-Creation-Date: 2007-06-14 15:31+0200\n"
 "PO-Revision-Date: 2005-05-20 15:53+1000\n"
 "Last-Translator: \n"
 "Language-Team:  <zh@li.org>\n"
@@ -20,48 +20,48 @@ msgstr ""
 msgid "unknown errno"
 msgstr "未知的错误"
 
-#: popt.c:996
+#: popt.c:1002
 #, c-format
 msgid "option type (%d) not implemented in popt\n"
 msgstr "选项类别 (%d) 沒有在 popt 中实现\n"
 
-#: popt.c:1208
+#: popt.c:1215
 msgid "missing argument"
 msgstr "缺少参数"
 
-#: popt.c:1210
+#: popt.c:1217
 msgid "unknown option"
 msgstr "未知的选项"
 
-#: popt.c:1212
+#: popt.c:1219
 msgid "mutually exclusive logical operations requested"
 msgstr "需要 XOR 逻辑运算"
 
-#: popt.c:1214
+#: popt.c:1221
 msgid "opt->arg should not be NULL"
 msgstr "opt->arg 不应该为 NULL"
 
-#: popt.c:1216
+#: popt.c:1223
 msgid "aliases nested too deeply"
 msgstr "别名嵌套太深"
 
-#: popt.c:1218
+#: popt.c:1225
 msgid "error in parameter quoting"
 msgstr "参数引号错误"
 
-#: popt.c:1220
+#: popt.c:1227
 msgid "invalid numeric value"
 msgstr "无效的数值"
 
-#: popt.c:1222
+#: popt.c:1229
 msgid "number too large or too small"
 msgstr "数值太大或太小"
 
-#: popt.c:1224
+#: popt.c:1231
 msgid "memory allocation failed"
 msgstr "内存分配错误"
 
-#: popt.c:1228
+#: popt.c:1235
 msgid "unknown error"
 msgstr "未知的错误"
 
diff --git a/po/zh_TW.po b/po/zh_TW.po
index 1074b3d..a518a95 100644
--- a/po/zh_TW.po
+++ b/po/zh_TW.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.10.1\n"
 "Report-Msgid-Bugs-To: <rpm-devel@lists.dulug.duke.edu>\n"
-"POT-Creation-Date: 2007-01-21 14:25-0500\n"
+"POT-Creation-Date: 2007-06-14 15:31+0200\n"
 "PO-Revision-Date: 2005-04-08 17:52+0800\n"
 "Last-Translator: Wei-Lun Chao <chaoweilun@pcmail.com.tw>\n"
 "Language-Team: zh_TW <zh-l10n@linux.org.tw>\n"
@@ -18,48 +18,48 @@ msgstr ""
 msgid "unknown errno"
 msgstr "未知的錯誤"
 
-#: popt.c:996
+#: popt.c:1002
 #, c-format
 msgid "option type (%d) not implemented in popt\n"
 msgstr "選項類型 (%d) 沒有在 popt 中實作\n"
 
-#: popt.c:1208
+#: popt.c:1215
 msgid "missing argument"
 msgstr "缺少引數"
 
-#: popt.c:1210
+#: popt.c:1217
 msgid "unknown option"
 msgstr "未知的選項"
 
-#: popt.c:1212
+#: popt.c:1219
 msgid "mutually exclusive logical operations requested"
 msgstr "需要相互獨立的邏輯運算"
 
-#: popt.c:1214
+#: popt.c:1221
 msgid "opt->arg should not be NULL"
 msgstr "opt->arg 不應為 NULL"
 
-#: popt.c:1216
+#: popt.c:1223
 msgid "aliases nested too deeply"
 msgstr "巢狀別名太深"
 
-#: popt.c:1218
+#: popt.c:1225
 msgid "error in parameter quoting"
 msgstr "參數引號錯誤"
 
-#: popt.c:1220
+#: popt.c:1227
 msgid "invalid numeric value"
 msgstr "不正確的數值"
 
-#: popt.c:1222
+#: popt.c:1229
 msgid "number too large or too small"
 msgstr "數字太大或太小"
 
-#: popt.c:1224
+#: popt.c:1231
 msgid "memory allocation failed"
 msgstr "記憶體配置錯誤"
 
-#: popt.c:1228
+#: popt.c:1235
 msgid "unknown error"
 msgstr "未知的錯誤"
 
-- 
Gitee


From ffd7e824febc41c95425ede1ed30561132638503 Mon Sep 17 00:00:00 2001
From: Jeff Johnson <n3npq@mac.com>
Date: Thu, 14 Jun 2007 14:12:41 +0000
Subject: [PATCH 434/667] update version and conteact address.

---
 po/cs.po    | 4 ++--
 po/da.po    | 4 ++--
 po/de.po    | 4 ++--
 po/es.po    | 4 ++--
 po/eu_ES.po | 4 ++--
 po/fi.po    | 4 ++--
 po/fr.po    | 4 ++--
 po/gl.po    | 4 ++--
 po/hu.po    | 4 ++--
 po/id.po    | 4 ++--
 po/is.po    | 4 ++--
 po/it.po    | 4 ++--
 po/ja.po    | 4 ++--
 po/ko.po    | 4 ++--
 po/no.po    | 4 ++--
 po/pl.po    | 4 ++--
 po/pt.po    | 4 ++--
 po/pt_BR.po | 4 ++--
 po/ro.po    | 4 ++--
 po/ru.po    | 4 ++--
 po/sk.po    | 4 ++--
 po/sl.po    | 4 ++--
 po/sr.po    | 4 ++--
 po/sv.po    | 4 ++--
 po/tr.po    | 4 ++--
 po/uk.po    | 4 ++--
 po/wa.po    | 4 ++--
 po/zh.po    | 4 ++--
 po/zh_CN.po | 4 ++--
 po/zh_TW.po | 4 ++--
 30 files changed, 60 insertions(+), 60 deletions(-)

diff --git a/po/cs.po b/po/cs.po
index 1615168..82f9a0c 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
-"Project-Id-Version: popt 1.6.3\n"
-"Report-Msgid-Bugs-To: <rpm-devel@lists.dulug.duke.edu>\n"
+"Project-Id-Version: popt 1.11\n"
+"Report-Msgid-Bugs-To: <popt-devel@rpm5.org>\n"
 "POT-Creation-Date: 2007-06-14 15:31+0200\n"
 "PO-Revision-Date: 2001-07-24 00:03+0100\n"
 "Last-Translator: Milan Kerslager <kerslage@linux.cz>\n"
diff --git a/po/da.po b/po/da.po
index 56987fa..6d0a9e1 100644
--- a/po/da.po
+++ b/po/da.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
-"Project-Id-Version: popt 1.6.3\n"
-"Report-Msgid-Bugs-To: <rpm-devel@lists.dulug.duke.edu>\n"
+"Project-Id-Version: popt 1.11\n"
+"Report-Msgid-Bugs-To: <popt-devel@rpm5.org>\n"
 "POT-Creation-Date: 2007-06-14 15:31+0200\n"
 "PO-Revision-Date: Sun Jan 21 2001 04:30:32+0200\n"
 "Last-Translator: Martin Hansen <mah@k64.dk>\n"
diff --git a/po/de.po b/po/de.po
index 68d15e0..ce2f7e9 100644
--- a/po/de.po
+++ b/po/de.po
@@ -4,8 +4,8 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: popt 1.6.3\n"
-"Report-Msgid-Bugs-To: <rpm-devel@lists.dulug.duke.edu>\n"
+"Project-Id-Version: popt 1.11\n"
+"Report-Msgid-Bugs-To: <popt-devel@rpm5.org>\n"
 "POT-Creation-Date: 2007-06-14 15:31+0200\n"
 "PO-Revision-Date: 2007-02-17 21:00+0100\n"
 "Last-Translator: Robert Scheck <rpm@robert-scheck.de>\n"
diff --git a/po/es.po b/po/es.po
index a8d41cb..97380d2 100644
--- a/po/es.po
+++ b/po/es.po
@@ -5,8 +5,8 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: popt 1.6.3\n"
-"Report-Msgid-Bugs-To: <rpm-devel@lists.dulug.duke.edu>\n"
+"Project-Id-Version: popt 1.11\n"
+"Report-Msgid-Bugs-To: <popt-devel@rpm5.org>\n"
 "POT-Creation-Date: 2007-06-14 15:31+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Leandro Lucarella <luca@linuxmendoza.org.ar>\n"
diff --git a/po/eu_ES.po b/po/eu_ES.po
index 7215026..6006f8e 100644
--- a/po/eu_ES.po
+++ b/po/eu_ES.po
@@ -5,8 +5,8 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: popt 1.6.3\n"
-"Report-Msgid-Bugs-To: <rpm-devel@lists.dulug.duke.edu>\n"
+"Project-Id-Version: popt 1.11\n"
+"Report-Msgid-Bugs-To: <popt-devel@rpm5.org>\n"
 "POT-Creation-Date: 2007-06-14 15:31+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
diff --git a/po/fi.po b/po/fi.po
index 7215026..6006f8e 100644
--- a/po/fi.po
+++ b/po/fi.po
@@ -5,8 +5,8 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: popt 1.6.3\n"
-"Report-Msgid-Bugs-To: <rpm-devel@lists.dulug.duke.edu>\n"
+"Project-Id-Version: popt 1.11\n"
+"Report-Msgid-Bugs-To: <popt-devel@rpm5.org>\n"
 "POT-Creation-Date: 2007-06-14 15:31+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
diff --git a/po/fr.po b/po/fr.po
index ee73594..d6671e2 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -10,8 +10,8 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: popt 1.8.1\n"
-"Report-Msgid-Bugs-To: <rpm-devel@lists.dulug.duke.edu>\n"
+"Project-Id-Version: popt 1.11\n"
+"Report-Msgid-Bugs-To: <popt-devel@rpm5.org>\n"
 "POT-Creation-Date: 2007-06-14 15:31+0200\n"
 "PO-Revision-Date: 2003-06-22 23:43+0200\n"
 "Last-Translator: RPM French Translation <rpm-fr@livna.org>\n"
diff --git a/po/gl.po b/po/gl.po
index 5201e9b..0d86e81 100644
--- a/po/gl.po
+++ b/po/gl.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
-"Project-Id-Version: popt 1.6.3\n"
-"Report-Msgid-Bugs-To: <rpm-devel@lists.dulug.duke.edu>\n"
+"Project-Id-Version: popt 1.11\n"
+"Report-Msgid-Bugs-To: <popt-devel@rpm5.org>\n"
 "POT-Creation-Date: 2007-06-14 15:31+0200\n"
 "PO-Revision-Date: 2001-01-17 01:01+0100\n"
 "Last-Translator: Jes�s Bravo �lvarez <jba@pobox.com>\n"
diff --git a/po/hu.po b/po/hu.po
index 5460712..03913c9 100644
--- a/po/hu.po
+++ b/po/hu.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
-"Project-Id-Version: popt 1.6.3\n"
-"Report-Msgid-Bugs-To: <rpm-devel@lists.dulug.duke.edu>\n"
+"Project-Id-Version: popt 1.11\n"
+"Report-Msgid-Bugs-To: <popt-devel@rpm5.org>\n"
 "POT-Creation-Date: 2007-06-14 15:31+0200\n"
 "PO-Revision-Date: 2000-08-03 23:26+0200\n"
 "Last-Translator: L�szl� N�meth <nemeth@qwertynet.hu>\n"
diff --git a/po/id.po b/po/id.po
index 7215026..6006f8e 100644
--- a/po/id.po
+++ b/po/id.po
@@ -5,8 +5,8 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: popt 1.6.3\n"
-"Report-Msgid-Bugs-To: <rpm-devel@lists.dulug.duke.edu>\n"
+"Project-Id-Version: popt 1.11\n"
+"Report-Msgid-Bugs-To: <popt-devel@rpm5.org>\n"
 "POT-Creation-Date: 2007-06-14 15:31+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
diff --git a/po/is.po b/po/is.po
index 00c7d2b..c0fcd0f 100644
--- a/po/is.po
+++ b/po/is.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
-"Project-Id-Version: popt 1.6.3\n"
-"Report-Msgid-Bugs-To: <rpm-devel@lists.dulug.duke.edu>\n"
+"Project-Id-Version: popt 1.11\n"
+"Report-Msgid-Bugs-To: <popt-devel@rpm5.org>\n"
 "POT-Creation-Date: 2007-06-14 15:31+0200\n"
 "PO-Revision-Date: 2001-06-08 01:35+0000\n"
 "Last-Translator: Richard Allen <ra@hp.is>\n"
diff --git a/po/it.po b/po/it.po
index 7215026..6006f8e 100644
--- a/po/it.po
+++ b/po/it.po
@@ -5,8 +5,8 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: popt 1.6.3\n"
-"Report-Msgid-Bugs-To: <rpm-devel@lists.dulug.duke.edu>\n"
+"Project-Id-Version: popt 1.11\n"
+"Report-Msgid-Bugs-To: <popt-devel@rpm5.org>\n"
 "POT-Creation-Date: 2007-06-14 15:31+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
diff --git a/po/ja.po b/po/ja.po
index 77d7550..df0babf 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -4,8 +4,8 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: popt 1.6.3\n"
-"Report-Msgid-Bugs-To: <rpm-devel@lists.dulug.duke.edu>\n"
+"Project-Id-Version: popt 1.11\n"
+"Report-Msgid-Bugs-To: <popt-devel@rpm5.org>\n"
 "POT-Creation-Date: 2007-06-14 15:31+0200\n"
 "PO-Revision-Date: 2003--8-25 19:00+0900\n"
 "Last-Translator: Yukihiro Nakai <ynakai@redhat.com>\n"
diff --git a/po/ko.po b/po/ko.po
index ea435ff..30408fc 100644
--- a/po/ko.po
+++ b/po/ko.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
-"Project-Id-Version: popt 1.6\n"
-"Report-Msgid-Bugs-To: <rpm-devel@lists.dulug.duke.edu>\n"
+"Project-Id-Version: popt 1.11\n"
+"Report-Msgid-Bugs-To: <popt-devel@rpm5.org>\n"
 "POT-Creation-Date: 2007-06-14 15:31+0200\n"
 "PO-Revision-Date: 2001-09-06 20:06+0900\n"
 "Last-Translator: Jong-Hoon Ryu <redhat4u@netian.com>\n"
diff --git a/po/no.po b/po/no.po
index 3c7bfd0..21ccdbb 100644
--- a/po/no.po
+++ b/po/no.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
-"Project-Id-Version: popt 1.6.3\n"
-"Report-Msgid-Bugs-To: <rpm-devel@lists.dulug.duke.edu>\n"
+"Project-Id-Version: popt 1.11\n"
+"Report-Msgid-Bugs-To: <popt-devel@rpm5.org>\n"
 "POT-Creation-Date: 2007-06-14 15:31+0200\n"
 "PO-Revision-Date: 2001-06-27 11:05+0200\n"
 "Last-Translator: Kjartan Maraas <kmaraas@online.no>\n"
diff --git a/po/pl.po b/po/pl.po
index cee135d..eec4928 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -4,8 +4,8 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: popt 1.9-20030515\n"
-"Report-Msgid-Bugs-To: <rpm-devel@lists.dulug.duke.edu>\n"
+"Project-Id-Version: popt 1.11\n"
+"Report-Msgid-Bugs-To: <popt-devel@rpm5.org>\n"
 "POT-Creation-Date: 2007-06-14 15:31+0200\n"
 "PO-Revision-Date: 2003-06-08 20:32+0200\n"
 "Last-Translator: Jakub Bogusz <qboosh@pld.org.pl>\n"
diff --git a/po/pt.po b/po/pt.po
index 9dd6614..964f07d 100644
--- a/po/pt.po
+++ b/po/pt.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
-"Project-Id-Version: popt\n"
-"Report-Msgid-Bugs-To: <rpm-devel@lists.dulug.duke.edu>\n"
+"Project-Id-Version: popt 1.11\n"
+"Report-Msgid-Bugs-To: <popt-devel@rpm5.org>\n"
 "POT-Creation-Date: 2007-06-14 15:31+0200\n"
 "PO-Revision-Date: 2002-02-13 18:32+0000\n"
 "Last-Translator: Pedro Morais <morais@kde.org>\n"
diff --git a/po/pt_BR.po b/po/pt_BR.po
index 7215026..6006f8e 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -5,8 +5,8 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: popt 1.6.3\n"
-"Report-Msgid-Bugs-To: <rpm-devel@lists.dulug.duke.edu>\n"
+"Project-Id-Version: popt 1.11\n"
+"Report-Msgid-Bugs-To: <popt-devel@rpm5.org>\n"
 "POT-Creation-Date: 2007-06-14 15:31+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
diff --git a/po/ro.po b/po/ro.po
index bfc980e..af3742e 100644
--- a/po/ro.po
+++ b/po/ro.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
-"Project-Id-Version: popt 1.6.3\n"
-"Report-Msgid-Bugs-To: <rpm-devel@lists.dulug.duke.edu>\n"
+"Project-Id-Version: popt 1.11\n"
+"Report-Msgid-Bugs-To: <popt-devel@rpm5.org>\n"
 "POT-Creation-Date: 2007-06-14 15:31+0200\n"
 "PO-Revision-Date: 2000-06-14 23:23+EST\n"
 "Last-Translator: Cristian Gafton <gafton@redhat.com>\n"
diff --git a/po/ru.po b/po/ru.po
index e19546d..aa4ca75 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
-"Project-Id-Version: popt 1.6.3\n"
-"Report-Msgid-Bugs-To: <rpm-devel@lists.dulug.duke.edu>\n"
+"Project-Id-Version: popt 1.11\n"
+"Report-Msgid-Bugs-To: <popt-devel@rpm5.org>\n"
 "POT-Creation-Date: 2007-06-14 15:31+0200\n"
 "PO-Revision-Date: 2001-07-05 21:00-0500\n"
 "Last-Translator: Eugene Kanter <eugene@blackcatlinux.com>\n"
diff --git a/po/sk.po b/po/sk.po
index e2148ec..739ae01 100644
--- a/po/sk.po
+++ b/po/sk.po
@@ -4,8 +4,8 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: popt 1.6.3\n"
-"Report-Msgid-Bugs-To: <rpm-devel@lists.dulug.duke.edu>\n"
+"Project-Id-Version: popt 1.11\n"
+"Report-Msgid-Bugs-To: <popt-devel@rpm5.org>\n"
 "POT-Creation-Date: 2007-06-14 15:31+0200\n"
 "PO-Revision-Date: 1999-08-04 21:40+0200\n"
 "Last-Translator: Stanislav Meduna <stano@eunet.sk>\n"
diff --git a/po/sl.po b/po/sl.po
index 447f611..d25104c 100644
--- a/po/sl.po
+++ b/po/sl.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
-"Project-Id-Version: popt 1.6.3\n"
-"Report-Msgid-Bugs-To: <rpm-devel@lists.dulug.duke.edu>\n"
+"Project-Id-Version: popt 1.11\n"
+"Report-Msgid-Bugs-To: <popt-devel@rpm5.org>\n"
 "POT-Creation-Date: 2007-06-14 15:31+0200\n"
 "PO-Revision-Date: 2000-09-05 12:30+0200\n"
 "Last-Translator: Roman Maurer <roman.maurer@hermes.si>\n"
diff --git a/po/sr.po b/po/sr.po
index 7215026..6006f8e 100644
--- a/po/sr.po
+++ b/po/sr.po
@@ -5,8 +5,8 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: popt 1.6.3\n"
-"Report-Msgid-Bugs-To: <rpm-devel@lists.dulug.duke.edu>\n"
+"Project-Id-Version: popt 1.11\n"
+"Report-Msgid-Bugs-To: <popt-devel@rpm5.org>\n"
 "POT-Creation-Date: 2007-06-14 15:31+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
diff --git a/po/sv.po b/po/sv.po
index 89bc9de..6bb82dc 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
-"Project-Id-Version: popt\n"
-"Report-Msgid-Bugs-To: <rpm-devel@lists.dulug.duke.edu>\n"
+"Project-Id-Version: popt 1.11\n"
+"Report-Msgid-Bugs-To: <popt-devel@rpm5.org>\n"
 "POT-Creation-Date: 2007-06-14 15:31+0200\n"
 "PO-Revision-Date: 2007-06-12 22:00+0200\n"
 "Last-Translator: G�ran Uddeborg <goeran@uddeborg.se>\n"
diff --git a/po/tr.po b/po/tr.po
index 03f5de4..f350402 100644
--- a/po/tr.po
+++ b/po/tr.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
-"Project-Id-Version: popt 1.6.3\n"
-"Report-Msgid-Bugs-To: <rpm-devel@lists.dulug.duke.edu>\n"
+"Project-Id-Version: popt 1.11\n"
+"Report-Msgid-Bugs-To: <popt-devel@rpm5.org>\n"
 "POT-Creation-Date: 2007-06-14 15:31+0200\n"
 "PO-Revision-Date: 2000-02-11 13:01+0200\n"
 "Last-Translator: Nilgun Belma Buguner <nilgun@technologist.com>\n"
diff --git a/po/uk.po b/po/uk.po
index 8d83d2f..81b1a1e 100644
--- a/po/uk.po
+++ b/po/uk.po
@@ -4,8 +4,8 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: popt 1.6.3\n"
-"Report-Msgid-Bugs-To: <rpm-devel@lists.dulug.duke.edu>\n"
+"Project-Id-Version: popt 1.11\n"
+"Report-Msgid-Bugs-To: <popt-devel@rpm5.org>\n"
 "POT-Creation-Date: 2007-06-14 15:31+0200\n"
 "PO-Revision-Date: 1999-09-30 16:54+0200\n"
 "Last-Translator: Yuri Syrota <rasta@renome.rovno.ua>\n"
diff --git a/po/wa.po b/po/wa.po
index 47fb2b4..5230622 100644
--- a/po/wa.po
+++ b/po/wa.po
@@ -8,8 +8,8 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: popt 1.6.3\n"
-"Report-Msgid-Bugs-To: <rpm-devel@lists.dulug.duke.edu>\n"
+"Project-Id-Version: popt 1.11\n"
+"Report-Msgid-Bugs-To: <popt-devel@rpm5.org>\n"
 "POT-Creation-Date: 2007-06-14 15:31+0200\n"
 "PO-Revision-Date: 1999-03-18 23:11+0100\n"
 "Last-Translator: Nobody yet\n"
diff --git a/po/zh.po b/po/zh.po
index 7215026..6006f8e 100644
--- a/po/zh.po
+++ b/po/zh.po
@@ -5,8 +5,8 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: popt 1.6.3\n"
-"Report-Msgid-Bugs-To: <rpm-devel@lists.dulug.duke.edu>\n"
+"Project-Id-Version: popt 1.11\n"
+"Report-Msgid-Bugs-To: <popt-devel@rpm5.org>\n"
 "POT-Creation-Date: 2007-06-14 15:31+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
diff --git a/po/zh_CN.po b/po/zh_CN.po
index c73a0cd..b0a7a1f 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -5,8 +5,8 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: translation\n"
-"Report-Msgid-Bugs-To: <rpm-devel@lists.dulug.duke.edu>\n"
+"Project-Id-Version: popt 1.11\n"
+"Report-Msgid-Bugs-To: <popt-devel@rpm5.org>\n"
 "POT-Creation-Date: 2007-06-14 15:31+0200\n"
 "PO-Revision-Date: 2005-05-20 15:53+1000\n"
 "Last-Translator: \n"
diff --git a/po/zh_TW.po b/po/zh_TW.po
index a518a95..655c4fb 100644
--- a/po/zh_TW.po
+++ b/po/zh_TW.po
@@ -4,8 +4,8 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: popt 1.10.1\n"
-"Report-Msgid-Bugs-To: <rpm-devel@lists.dulug.duke.edu>\n"
+"Project-Id-Version: popt 1.11\n"
+"Report-Msgid-Bugs-To: <popt-devel@rpm5.org>\n"
 "POT-Creation-Date: 2007-06-14 15:31+0200\n"
 "PO-Revision-Date: 2005-04-08 17:52+0800\n"
 "Last-Translator: Wei-Lun Chao <chaoweilun@pcmail.com.tw>\n"
-- 
Gitee


From 225294766e62f91202f45cfa73c4e6d17c7a43ba Mon Sep 17 00:00:00 2001
From: Jeff Johnson <n3npq@mac.com>
Date: Thu, 14 Jun 2007 15:01:26 +0000
Subject: [PATCH 435/667] release popt-1.11.

---
 Makefile.am | 2 +-
 po/cs.po    | 2 +-
 po/da.po    | 2 +-
 po/de.po    | 2 +-
 po/es.po    | 2 +-
 po/eu_ES.po | 2 +-
 po/fi.po    | 2 +-
 po/fr.po    | 2 +-
 po/gl.po    | 2 +-
 po/hu.po    | 2 +-
 po/id.po    | 2 +-
 po/is.po    | 2 +-
 po/it.po    | 2 +-
 po/ja.po    | 2 +-
 po/ko.po    | 2 +-
 po/no.po    | 2 +-
 po/pl.po    | 2 +-
 po/pt.po    | 2 +-
 po/pt_BR.po | 2 +-
 po/ro.po    | 2 +-
 po/ru.po    | 2 +-
 po/sk.po    | 2 +-
 po/sl.po    | 2 +-
 po/sr.po    | 2 +-
 po/sv.po    | 2 +-
 po/tr.po    | 2 +-
 po/uk.po    | 2 +-
 po/wa.po    | 2 +-
 po/zh.po    | 2 +-
 po/zh_CN.po | 2 +-
 po/zh_TW.po | 2 +-
 31 files changed, 31 insertions(+), 31 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index f1c7099..c79f301 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -4,7 +4,7 @@ AUTOMAKE_OPTIONS = 1.4 foreign
 
 LINT = splint
 
-EXTRA_DIST = config.rpath autogen.sh CHANGES $(man_MANS) popt.spec libpopt.vers \
+EXTRA_DIST = config.rpath  config.rpath autogen.sh CHANGES $(man_MANS) popt.spec libpopt.vers \
 	testit.sh test-poptrc test3-data/0* \
 	po/*.in po/*.po po/popt.pot \
 	popt.ps
diff --git a/po/cs.po b/po/cs.po
index 82f9a0c..2cddf31 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.11\n"
-"Report-Msgid-Bugs-To: <popt-devel@rpm5.org>\n"
+"Report-Msgid-Bugs-To: <rpm-devel@lists.dulug.duke.edu>\n"
 "POT-Creation-Date: 2007-06-14 15:31+0200\n"
 "PO-Revision-Date: 2001-07-24 00:03+0100\n"
 "Last-Translator: Milan Kerslager <kerslage@linux.cz>\n"
diff --git a/po/da.po b/po/da.po
index 6d0a9e1..a90ded7 100644
--- a/po/da.po
+++ b/po/da.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.11\n"
-"Report-Msgid-Bugs-To: <popt-devel@rpm5.org>\n"
+"Report-Msgid-Bugs-To: <rpm-devel@lists.dulug.duke.edu>\n"
 "POT-Creation-Date: 2007-06-14 15:31+0200\n"
 "PO-Revision-Date: Sun Jan 21 2001 04:30:32+0200\n"
 "Last-Translator: Martin Hansen <mah@k64.dk>\n"
diff --git a/po/de.po b/po/de.po
index ce2f7e9..e6ac3ca 100644
--- a/po/de.po
+++ b/po/de.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.11\n"
-"Report-Msgid-Bugs-To: <popt-devel@rpm5.org>\n"
+"Report-Msgid-Bugs-To: <rpm-devel@lists.dulug.duke.edu>\n"
 "POT-Creation-Date: 2007-06-14 15:31+0200\n"
 "PO-Revision-Date: 2007-02-17 21:00+0100\n"
 "Last-Translator: Robert Scheck <rpm@robert-scheck.de>\n"
diff --git a/po/es.po b/po/es.po
index 97380d2..ad4beb7 100644
--- a/po/es.po
+++ b/po/es.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.11\n"
-"Report-Msgid-Bugs-To: <popt-devel@rpm5.org>\n"
+"Report-Msgid-Bugs-To: <rpm-devel@lists.dulug.duke.edu>\n"
 "POT-Creation-Date: 2007-06-14 15:31+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Leandro Lucarella <luca@linuxmendoza.org.ar>\n"
diff --git a/po/eu_ES.po b/po/eu_ES.po
index 6006f8e..7457c0a 100644
--- a/po/eu_ES.po
+++ b/po/eu_ES.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.11\n"
-"Report-Msgid-Bugs-To: <popt-devel@rpm5.org>\n"
+"Report-Msgid-Bugs-To: <rpm-devel@lists.dulug.duke.edu>\n"
 "POT-Creation-Date: 2007-06-14 15:31+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
diff --git a/po/fi.po b/po/fi.po
index 6006f8e..7457c0a 100644
--- a/po/fi.po
+++ b/po/fi.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.11\n"
-"Report-Msgid-Bugs-To: <popt-devel@rpm5.org>\n"
+"Report-Msgid-Bugs-To: <rpm-devel@lists.dulug.duke.edu>\n"
 "POT-Creation-Date: 2007-06-14 15:31+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
diff --git a/po/fr.po b/po/fr.po
index d6671e2..095a4c8 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -11,7 +11,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.11\n"
-"Report-Msgid-Bugs-To: <popt-devel@rpm5.org>\n"
+"Report-Msgid-Bugs-To: <rpm-devel@lists.dulug.duke.edu>\n"
 "POT-Creation-Date: 2007-06-14 15:31+0200\n"
 "PO-Revision-Date: 2003-06-22 23:43+0200\n"
 "Last-Translator: RPM French Translation <rpm-fr@livna.org>\n"
diff --git a/po/gl.po b/po/gl.po
index 0d86e81..53cbf32 100644
--- a/po/gl.po
+++ b/po/gl.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.11\n"
-"Report-Msgid-Bugs-To: <popt-devel@rpm5.org>\n"
+"Report-Msgid-Bugs-To: <rpm-devel@lists.dulug.duke.edu>\n"
 "POT-Creation-Date: 2007-06-14 15:31+0200\n"
 "PO-Revision-Date: 2001-01-17 01:01+0100\n"
 "Last-Translator: Jes�s Bravo �lvarez <jba@pobox.com>\n"
diff --git a/po/hu.po b/po/hu.po
index 03913c9..442e9cc 100644
--- a/po/hu.po
+++ b/po/hu.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.11\n"
-"Report-Msgid-Bugs-To: <popt-devel@rpm5.org>\n"
+"Report-Msgid-Bugs-To: <rpm-devel@lists.dulug.duke.edu>\n"
 "POT-Creation-Date: 2007-06-14 15:31+0200\n"
 "PO-Revision-Date: 2000-08-03 23:26+0200\n"
 "Last-Translator: L�szl� N�meth <nemeth@qwertynet.hu>\n"
diff --git a/po/id.po b/po/id.po
index 6006f8e..7457c0a 100644
--- a/po/id.po
+++ b/po/id.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.11\n"
-"Report-Msgid-Bugs-To: <popt-devel@rpm5.org>\n"
+"Report-Msgid-Bugs-To: <rpm-devel@lists.dulug.duke.edu>\n"
 "POT-Creation-Date: 2007-06-14 15:31+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
diff --git a/po/is.po b/po/is.po
index c0fcd0f..7fd5445 100644
--- a/po/is.po
+++ b/po/is.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.11\n"
-"Report-Msgid-Bugs-To: <popt-devel@rpm5.org>\n"
+"Report-Msgid-Bugs-To: <rpm-devel@lists.dulug.duke.edu>\n"
 "POT-Creation-Date: 2007-06-14 15:31+0200\n"
 "PO-Revision-Date: 2001-06-08 01:35+0000\n"
 "Last-Translator: Richard Allen <ra@hp.is>\n"
diff --git a/po/it.po b/po/it.po
index 6006f8e..7457c0a 100644
--- a/po/it.po
+++ b/po/it.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.11\n"
-"Report-Msgid-Bugs-To: <popt-devel@rpm5.org>\n"
+"Report-Msgid-Bugs-To: <rpm-devel@lists.dulug.duke.edu>\n"
 "POT-Creation-Date: 2007-06-14 15:31+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
diff --git a/po/ja.po b/po/ja.po
index df0babf..aad098d 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.11\n"
-"Report-Msgid-Bugs-To: <popt-devel@rpm5.org>\n"
+"Report-Msgid-Bugs-To: <rpm-devel@lists.dulug.duke.edu>\n"
 "POT-Creation-Date: 2007-06-14 15:31+0200\n"
 "PO-Revision-Date: 2003--8-25 19:00+0900\n"
 "Last-Translator: Yukihiro Nakai <ynakai@redhat.com>\n"
diff --git a/po/ko.po b/po/ko.po
index 30408fc..590e298 100644
--- a/po/ko.po
+++ b/po/ko.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.11\n"
-"Report-Msgid-Bugs-To: <popt-devel@rpm5.org>\n"
+"Report-Msgid-Bugs-To: <rpm-devel@lists.dulug.duke.edu>\n"
 "POT-Creation-Date: 2007-06-14 15:31+0200\n"
 "PO-Revision-Date: 2001-09-06 20:06+0900\n"
 "Last-Translator: Jong-Hoon Ryu <redhat4u@netian.com>\n"
diff --git a/po/no.po b/po/no.po
index 21ccdbb..72c0897 100644
--- a/po/no.po
+++ b/po/no.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.11\n"
-"Report-Msgid-Bugs-To: <popt-devel@rpm5.org>\n"
+"Report-Msgid-Bugs-To: <rpm-devel@lists.dulug.duke.edu>\n"
 "POT-Creation-Date: 2007-06-14 15:31+0200\n"
 "PO-Revision-Date: 2001-06-27 11:05+0200\n"
 "Last-Translator: Kjartan Maraas <kmaraas@online.no>\n"
diff --git a/po/pl.po b/po/pl.po
index eec4928..9fc1943 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.11\n"
-"Report-Msgid-Bugs-To: <popt-devel@rpm5.org>\n"
+"Report-Msgid-Bugs-To: <rpm-devel@lists.dulug.duke.edu>\n"
 "POT-Creation-Date: 2007-06-14 15:31+0200\n"
 "PO-Revision-Date: 2003-06-08 20:32+0200\n"
 "Last-Translator: Jakub Bogusz <qboosh@pld.org.pl>\n"
diff --git a/po/pt.po b/po/pt.po
index 964f07d..cdbab09 100644
--- a/po/pt.po
+++ b/po/pt.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.11\n"
-"Report-Msgid-Bugs-To: <popt-devel@rpm5.org>\n"
+"Report-Msgid-Bugs-To: <rpm-devel@lists.dulug.duke.edu>\n"
 "POT-Creation-Date: 2007-06-14 15:31+0200\n"
 "PO-Revision-Date: 2002-02-13 18:32+0000\n"
 "Last-Translator: Pedro Morais <morais@kde.org>\n"
diff --git a/po/pt_BR.po b/po/pt_BR.po
index 6006f8e..7457c0a 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.11\n"
-"Report-Msgid-Bugs-To: <popt-devel@rpm5.org>\n"
+"Report-Msgid-Bugs-To: <rpm-devel@lists.dulug.duke.edu>\n"
 "POT-Creation-Date: 2007-06-14 15:31+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
diff --git a/po/ro.po b/po/ro.po
index af3742e..56d1094 100644
--- a/po/ro.po
+++ b/po/ro.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.11\n"
-"Report-Msgid-Bugs-To: <popt-devel@rpm5.org>\n"
+"Report-Msgid-Bugs-To: <rpm-devel@lists.dulug.duke.edu>\n"
 "POT-Creation-Date: 2007-06-14 15:31+0200\n"
 "PO-Revision-Date: 2000-06-14 23:23+EST\n"
 "Last-Translator: Cristian Gafton <gafton@redhat.com>\n"
diff --git a/po/ru.po b/po/ru.po
index aa4ca75..b8d8d2c 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.11\n"
-"Report-Msgid-Bugs-To: <popt-devel@rpm5.org>\n"
+"Report-Msgid-Bugs-To: <rpm-devel@lists.dulug.duke.edu>\n"
 "POT-Creation-Date: 2007-06-14 15:31+0200\n"
 "PO-Revision-Date: 2001-07-05 21:00-0500\n"
 "Last-Translator: Eugene Kanter <eugene@blackcatlinux.com>\n"
diff --git a/po/sk.po b/po/sk.po
index 739ae01..50598c3 100644
--- a/po/sk.po
+++ b/po/sk.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.11\n"
-"Report-Msgid-Bugs-To: <popt-devel@rpm5.org>\n"
+"Report-Msgid-Bugs-To: <rpm-devel@lists.dulug.duke.edu>\n"
 "POT-Creation-Date: 2007-06-14 15:31+0200\n"
 "PO-Revision-Date: 1999-08-04 21:40+0200\n"
 "Last-Translator: Stanislav Meduna <stano@eunet.sk>\n"
diff --git a/po/sl.po b/po/sl.po
index d25104c..108390d 100644
--- a/po/sl.po
+++ b/po/sl.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.11\n"
-"Report-Msgid-Bugs-To: <popt-devel@rpm5.org>\n"
+"Report-Msgid-Bugs-To: <rpm-devel@lists.dulug.duke.edu>\n"
 "POT-Creation-Date: 2007-06-14 15:31+0200\n"
 "PO-Revision-Date: 2000-09-05 12:30+0200\n"
 "Last-Translator: Roman Maurer <roman.maurer@hermes.si>\n"
diff --git a/po/sr.po b/po/sr.po
index 6006f8e..7457c0a 100644
--- a/po/sr.po
+++ b/po/sr.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.11\n"
-"Report-Msgid-Bugs-To: <popt-devel@rpm5.org>\n"
+"Report-Msgid-Bugs-To: <rpm-devel@lists.dulug.duke.edu>\n"
 "POT-Creation-Date: 2007-06-14 15:31+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
diff --git a/po/sv.po b/po/sv.po
index 6bb82dc..660fbc4 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.11\n"
-"Report-Msgid-Bugs-To: <popt-devel@rpm5.org>\n"
+"Report-Msgid-Bugs-To: <rpm-devel@lists.dulug.duke.edu>\n"
 "POT-Creation-Date: 2007-06-14 15:31+0200\n"
 "PO-Revision-Date: 2007-06-12 22:00+0200\n"
 "Last-Translator: G�ran Uddeborg <goeran@uddeborg.se>\n"
diff --git a/po/tr.po b/po/tr.po
index f350402..88c7723 100644
--- a/po/tr.po
+++ b/po/tr.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.11\n"
-"Report-Msgid-Bugs-To: <popt-devel@rpm5.org>\n"
+"Report-Msgid-Bugs-To: <rpm-devel@lists.dulug.duke.edu>\n"
 "POT-Creation-Date: 2007-06-14 15:31+0200\n"
 "PO-Revision-Date: 2000-02-11 13:01+0200\n"
 "Last-Translator: Nilgun Belma Buguner <nilgun@technologist.com>\n"
diff --git a/po/uk.po b/po/uk.po
index 81b1a1e..12e8874 100644
--- a/po/uk.po
+++ b/po/uk.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.11\n"
-"Report-Msgid-Bugs-To: <popt-devel@rpm5.org>\n"
+"Report-Msgid-Bugs-To: <rpm-devel@lists.dulug.duke.edu>\n"
 "POT-Creation-Date: 2007-06-14 15:31+0200\n"
 "PO-Revision-Date: 1999-09-30 16:54+0200\n"
 "Last-Translator: Yuri Syrota <rasta@renome.rovno.ua>\n"
diff --git a/po/wa.po b/po/wa.po
index 5230622..191270f 100644
--- a/po/wa.po
+++ b/po/wa.po
@@ -9,7 +9,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.11\n"
-"Report-Msgid-Bugs-To: <popt-devel@rpm5.org>\n"
+"Report-Msgid-Bugs-To: <rpm-devel@lists.dulug.duke.edu>\n"
 "POT-Creation-Date: 2007-06-14 15:31+0200\n"
 "PO-Revision-Date: 1999-03-18 23:11+0100\n"
 "Last-Translator: Nobody yet\n"
diff --git a/po/zh.po b/po/zh.po
index 6006f8e..7457c0a 100644
--- a/po/zh.po
+++ b/po/zh.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.11\n"
-"Report-Msgid-Bugs-To: <popt-devel@rpm5.org>\n"
+"Report-Msgid-Bugs-To: <rpm-devel@lists.dulug.duke.edu>\n"
 "POT-Creation-Date: 2007-06-14 15:31+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
diff --git a/po/zh_CN.po b/po/zh_CN.po
index b0a7a1f..93ee3e2 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.11\n"
-"Report-Msgid-Bugs-To: <popt-devel@rpm5.org>\n"
+"Report-Msgid-Bugs-To: <rpm-devel@lists.dulug.duke.edu>\n"
 "POT-Creation-Date: 2007-06-14 15:31+0200\n"
 "PO-Revision-Date: 2005-05-20 15:53+1000\n"
 "Last-Translator: \n"
diff --git a/po/zh_TW.po b/po/zh_TW.po
index 655c4fb..f6a9a92 100644
--- a/po/zh_TW.po
+++ b/po/zh_TW.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.11\n"
-"Report-Msgid-Bugs-To: <popt-devel@rpm5.org>\n"
+"Report-Msgid-Bugs-To: <rpm-devel@lists.dulug.duke.edu>\n"
 "POT-Creation-Date: 2007-06-14 15:31+0200\n"
 "PO-Revision-Date: 2005-04-08 17:52+0800\n"
 "Last-Translator: Wei-Lun Chao <chaoweilun@pcmail.com.tw>\n"
-- 
Gitee


From 0d82e653e386618b55d01364198405a229aafb11 Mon Sep 17 00:00:00 2001
From: "Ralf S. Engelschall" <rse@engelschall.com>
Date: Thu, 14 Jun 2007 15:58:12 +0000
Subject: [PATCH 436/667] resolve a remaining 'const' issue

---
 popt.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/popt.c b/popt.c
index 244ecce..a9b1bd3 100644
--- a/popt.c
+++ b/popt.c
@@ -764,7 +764,7 @@ int poptGetNextOpt(poptContext con)
 
 	/* Process next long option */
 	if (!con->os->nextCharArg) {
-	    char * optString;
+	    const char * optString;
             int optStringLen;
 	    int thisopt;
 
@@ -805,7 +805,7 @@ int poptGetNextOpt(poptContext con)
 		con->restLeftover = 1;
 		continue;
 	    } else {
-		char *oe;
+		const char *oe;
 		int singleDash;
 
 		optString++;
-- 
Gitee


From 9044a92c40bb70adc9c4a8a945493f3c05d7bc6d Mon Sep 17 00:00:00 2001
From: Jeff Johnson <n3npq@mac.com>
Date: Thu, 14 Jun 2007 18:18:00 +0000
Subject: [PATCH 437/667] Add BR: gettext.

---
 popt.spec | 1 +
 1 file changed, 1 insertion(+)

diff --git a/popt.spec b/popt.spec
index 0b0ff5c..bf16bed 100644
--- a/popt.spec
+++ b/popt.spec
@@ -5,6 +5,7 @@ Release: 1
 License: X Consortium
 Group: System Environment/Libraries
 Source: http://rpm5.org/files/popt/%{name}-%{version}.tar.gz
+BuildRequires: gettext
 BuildRoot: %{_tmppath}/%{name}-root
 
 %description
-- 
Gitee


From 3edb08cfa82d2da6ab47126b3893ce8ded90a5dd Mon Sep 17 00:00:00 2001
From: Arkadiusz Miskiewicz <arekm@pld-linux.org>
Date: Thu, 14 Jun 2007 21:14:45 +0000
Subject: [PATCH 438/667] Drop empty/broken translations.

---
 configure.ac |   2 +-
 po/fi.po     | 125 --------------------------------------------------
 po/id.po     | 125 --------------------------------------------------
 po/it.po     | 125 --------------------------------------------------
 po/pt_BR.po  | 125 --------------------------------------------------
 po/sr.po     | 125 --------------------------------------------------
 po/zh.po     | 125 --------------------------------------------------
 po/zh_CN.po  | 126 ---------------------------------------------------
 po/zh_TW.po  | 124 --------------------------------------------------
 9 files changed, 1 insertion(+), 1001 deletions(-)
 delete mode 100644 po/fi.po
 delete mode 100644 po/id.po
 delete mode 100644 po/it.po
 delete mode 100644 po/pt_BR.po
 delete mode 100644 po/sr.po
 delete mode 100644 po/zh.po
 delete mode 100644 po/zh_CN.po
 delete mode 100644 po/zh_TW.po

diff --git a/configure.ac b/configure.ac
index e6f1e5b..f4c9dfd 100755
--- a/configure.ac
+++ b/configure.ac
@@ -14,7 +14,7 @@ AC_SUBST(LT_AGE, 8)
 
 AM_INIT_AUTOMAKE([foreign])
 
-ALL_LINGUAS="cs da de es eu_ES fi fr gl hu id is it ja ko no pl pt pt_BR ro ru sk sl sr sv tr uk wa zh zh_CN zh_TW"
+ALL_LINGUAS="cs da de es eu_ES fr gl hu is ja ko no pl pt ro ru sk sl sv tr uk wa"
 
 AC_PROG_CC
 AC_PROG_INSTALL
diff --git a/po/fi.po b/po/fi.po
deleted file mode 100644
index 7457c0a..0000000
--- a/po/fi.po
+++ /dev/null
@@ -1,125 +0,0 @@
-# SOME DESCRIPTIVE TITLE.
-# Copyright (C) YEAR Free Software Foundation, Inc.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#
-#, fuzzy
-msgid ""
-msgstr ""
-"Project-Id-Version: popt 1.11\n"
-"Report-Msgid-Bugs-To: <rpm-devel@lists.dulug.duke.edu>\n"
-"POT-Creation-Date: 2007-06-14 15:31+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: ENCODING\n"
-
-#: popt.c:35
-msgid "unknown errno"
-msgstr ""
-
-#: popt.c:1002
-#, c-format
-msgid "option type (%d) not implemented in popt\n"
-msgstr ""
-
-#: popt.c:1215
-msgid "missing argument"
-msgstr ""
-
-#: popt.c:1217
-msgid "unknown option"
-msgstr ""
-
-#: popt.c:1219
-msgid "mutually exclusive logical operations requested"
-msgstr ""
-
-#: popt.c:1221
-msgid "opt->arg should not be NULL"
-msgstr ""
-
-#: popt.c:1223
-msgid "aliases nested too deeply"
-msgstr ""
-
-#: popt.c:1225
-msgid "error in parameter quoting"
-msgstr ""
-
-#: popt.c:1227
-msgid "invalid numeric value"
-msgstr ""
-
-#: popt.c:1229
-msgid "number too large or too small"
-msgstr ""
-
-#: popt.c:1231
-msgid "memory allocation failed"
-msgstr ""
-
-#: popt.c:1235
-msgid "unknown error"
-msgstr ""
-
-#: popt.h:172
-msgid "Options implemented via popt alias/exec:"
-msgstr ""
-
-#: popt.h:188
-msgid "Help options:"
-msgstr ""
-
-#: popthelp.c:68 popthelp.c:79
-msgid "Show this help message"
-msgstr ""
-
-#: popthelp.c:69 popthelp.c:80
-msgid "Display brief usage message"
-msgstr ""
-
-#: popthelp.c:83
-msgid "Display option defaults in message"
-msgstr ""
-
-#: popthelp.c:128
-msgid "NONE"
-msgstr ""
-
-#: popthelp.c:130
-msgid "VAL"
-msgstr ""
-
-#: popthelp.c:134
-msgid "INT"
-msgstr ""
-
-#: popthelp.c:135
-msgid "LONG"
-msgstr ""
-
-#: popthelp.c:136
-msgid "STRING"
-msgstr ""
-
-#: popthelp.c:137
-msgid "FLOAT"
-msgstr ""
-
-#: popthelp.c:138
-msgid "DOUBLE"
-msgstr ""
-
-#: popthelp.c:139
-msgid "ARG"
-msgstr ""
-
-#: popthelp.c:552
-msgid "Usage:"
-msgstr ""
-
-#: popthelp.c:576
-msgid "[OPTION...]"
-msgstr ""
diff --git a/po/id.po b/po/id.po
deleted file mode 100644
index 7457c0a..0000000
--- a/po/id.po
+++ /dev/null
@@ -1,125 +0,0 @@
-# SOME DESCRIPTIVE TITLE.
-# Copyright (C) YEAR Free Software Foundation, Inc.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#
-#, fuzzy
-msgid ""
-msgstr ""
-"Project-Id-Version: popt 1.11\n"
-"Report-Msgid-Bugs-To: <rpm-devel@lists.dulug.duke.edu>\n"
-"POT-Creation-Date: 2007-06-14 15:31+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: ENCODING\n"
-
-#: popt.c:35
-msgid "unknown errno"
-msgstr ""
-
-#: popt.c:1002
-#, c-format
-msgid "option type (%d) not implemented in popt\n"
-msgstr ""
-
-#: popt.c:1215
-msgid "missing argument"
-msgstr ""
-
-#: popt.c:1217
-msgid "unknown option"
-msgstr ""
-
-#: popt.c:1219
-msgid "mutually exclusive logical operations requested"
-msgstr ""
-
-#: popt.c:1221
-msgid "opt->arg should not be NULL"
-msgstr ""
-
-#: popt.c:1223
-msgid "aliases nested too deeply"
-msgstr ""
-
-#: popt.c:1225
-msgid "error in parameter quoting"
-msgstr ""
-
-#: popt.c:1227
-msgid "invalid numeric value"
-msgstr ""
-
-#: popt.c:1229
-msgid "number too large or too small"
-msgstr ""
-
-#: popt.c:1231
-msgid "memory allocation failed"
-msgstr ""
-
-#: popt.c:1235
-msgid "unknown error"
-msgstr ""
-
-#: popt.h:172
-msgid "Options implemented via popt alias/exec:"
-msgstr ""
-
-#: popt.h:188
-msgid "Help options:"
-msgstr ""
-
-#: popthelp.c:68 popthelp.c:79
-msgid "Show this help message"
-msgstr ""
-
-#: popthelp.c:69 popthelp.c:80
-msgid "Display brief usage message"
-msgstr ""
-
-#: popthelp.c:83
-msgid "Display option defaults in message"
-msgstr ""
-
-#: popthelp.c:128
-msgid "NONE"
-msgstr ""
-
-#: popthelp.c:130
-msgid "VAL"
-msgstr ""
-
-#: popthelp.c:134
-msgid "INT"
-msgstr ""
-
-#: popthelp.c:135
-msgid "LONG"
-msgstr ""
-
-#: popthelp.c:136
-msgid "STRING"
-msgstr ""
-
-#: popthelp.c:137
-msgid "FLOAT"
-msgstr ""
-
-#: popthelp.c:138
-msgid "DOUBLE"
-msgstr ""
-
-#: popthelp.c:139
-msgid "ARG"
-msgstr ""
-
-#: popthelp.c:552
-msgid "Usage:"
-msgstr ""
-
-#: popthelp.c:576
-msgid "[OPTION...]"
-msgstr ""
diff --git a/po/it.po b/po/it.po
deleted file mode 100644
index 7457c0a..0000000
--- a/po/it.po
+++ /dev/null
@@ -1,125 +0,0 @@
-# SOME DESCRIPTIVE TITLE.
-# Copyright (C) YEAR Free Software Foundation, Inc.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#
-#, fuzzy
-msgid ""
-msgstr ""
-"Project-Id-Version: popt 1.11\n"
-"Report-Msgid-Bugs-To: <rpm-devel@lists.dulug.duke.edu>\n"
-"POT-Creation-Date: 2007-06-14 15:31+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: ENCODING\n"
-
-#: popt.c:35
-msgid "unknown errno"
-msgstr ""
-
-#: popt.c:1002
-#, c-format
-msgid "option type (%d) not implemented in popt\n"
-msgstr ""
-
-#: popt.c:1215
-msgid "missing argument"
-msgstr ""
-
-#: popt.c:1217
-msgid "unknown option"
-msgstr ""
-
-#: popt.c:1219
-msgid "mutually exclusive logical operations requested"
-msgstr ""
-
-#: popt.c:1221
-msgid "opt->arg should not be NULL"
-msgstr ""
-
-#: popt.c:1223
-msgid "aliases nested too deeply"
-msgstr ""
-
-#: popt.c:1225
-msgid "error in parameter quoting"
-msgstr ""
-
-#: popt.c:1227
-msgid "invalid numeric value"
-msgstr ""
-
-#: popt.c:1229
-msgid "number too large or too small"
-msgstr ""
-
-#: popt.c:1231
-msgid "memory allocation failed"
-msgstr ""
-
-#: popt.c:1235
-msgid "unknown error"
-msgstr ""
-
-#: popt.h:172
-msgid "Options implemented via popt alias/exec:"
-msgstr ""
-
-#: popt.h:188
-msgid "Help options:"
-msgstr ""
-
-#: popthelp.c:68 popthelp.c:79
-msgid "Show this help message"
-msgstr ""
-
-#: popthelp.c:69 popthelp.c:80
-msgid "Display brief usage message"
-msgstr ""
-
-#: popthelp.c:83
-msgid "Display option defaults in message"
-msgstr ""
-
-#: popthelp.c:128
-msgid "NONE"
-msgstr ""
-
-#: popthelp.c:130
-msgid "VAL"
-msgstr ""
-
-#: popthelp.c:134
-msgid "INT"
-msgstr ""
-
-#: popthelp.c:135
-msgid "LONG"
-msgstr ""
-
-#: popthelp.c:136
-msgid "STRING"
-msgstr ""
-
-#: popthelp.c:137
-msgid "FLOAT"
-msgstr ""
-
-#: popthelp.c:138
-msgid "DOUBLE"
-msgstr ""
-
-#: popthelp.c:139
-msgid "ARG"
-msgstr ""
-
-#: popthelp.c:552
-msgid "Usage:"
-msgstr ""
-
-#: popthelp.c:576
-msgid "[OPTION...]"
-msgstr ""
diff --git a/po/pt_BR.po b/po/pt_BR.po
deleted file mode 100644
index 7457c0a..0000000
--- a/po/pt_BR.po
+++ /dev/null
@@ -1,125 +0,0 @@
-# SOME DESCRIPTIVE TITLE.
-# Copyright (C) YEAR Free Software Foundation, Inc.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#
-#, fuzzy
-msgid ""
-msgstr ""
-"Project-Id-Version: popt 1.11\n"
-"Report-Msgid-Bugs-To: <rpm-devel@lists.dulug.duke.edu>\n"
-"POT-Creation-Date: 2007-06-14 15:31+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: ENCODING\n"
-
-#: popt.c:35
-msgid "unknown errno"
-msgstr ""
-
-#: popt.c:1002
-#, c-format
-msgid "option type (%d) not implemented in popt\n"
-msgstr ""
-
-#: popt.c:1215
-msgid "missing argument"
-msgstr ""
-
-#: popt.c:1217
-msgid "unknown option"
-msgstr ""
-
-#: popt.c:1219
-msgid "mutually exclusive logical operations requested"
-msgstr ""
-
-#: popt.c:1221
-msgid "opt->arg should not be NULL"
-msgstr ""
-
-#: popt.c:1223
-msgid "aliases nested too deeply"
-msgstr ""
-
-#: popt.c:1225
-msgid "error in parameter quoting"
-msgstr ""
-
-#: popt.c:1227
-msgid "invalid numeric value"
-msgstr ""
-
-#: popt.c:1229
-msgid "number too large or too small"
-msgstr ""
-
-#: popt.c:1231
-msgid "memory allocation failed"
-msgstr ""
-
-#: popt.c:1235
-msgid "unknown error"
-msgstr ""
-
-#: popt.h:172
-msgid "Options implemented via popt alias/exec:"
-msgstr ""
-
-#: popt.h:188
-msgid "Help options:"
-msgstr ""
-
-#: popthelp.c:68 popthelp.c:79
-msgid "Show this help message"
-msgstr ""
-
-#: popthelp.c:69 popthelp.c:80
-msgid "Display brief usage message"
-msgstr ""
-
-#: popthelp.c:83
-msgid "Display option defaults in message"
-msgstr ""
-
-#: popthelp.c:128
-msgid "NONE"
-msgstr ""
-
-#: popthelp.c:130
-msgid "VAL"
-msgstr ""
-
-#: popthelp.c:134
-msgid "INT"
-msgstr ""
-
-#: popthelp.c:135
-msgid "LONG"
-msgstr ""
-
-#: popthelp.c:136
-msgid "STRING"
-msgstr ""
-
-#: popthelp.c:137
-msgid "FLOAT"
-msgstr ""
-
-#: popthelp.c:138
-msgid "DOUBLE"
-msgstr ""
-
-#: popthelp.c:139
-msgid "ARG"
-msgstr ""
-
-#: popthelp.c:552
-msgid "Usage:"
-msgstr ""
-
-#: popthelp.c:576
-msgid "[OPTION...]"
-msgstr ""
diff --git a/po/sr.po b/po/sr.po
deleted file mode 100644
index 7457c0a..0000000
--- a/po/sr.po
+++ /dev/null
@@ -1,125 +0,0 @@
-# SOME DESCRIPTIVE TITLE.
-# Copyright (C) YEAR Free Software Foundation, Inc.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#
-#, fuzzy
-msgid ""
-msgstr ""
-"Project-Id-Version: popt 1.11\n"
-"Report-Msgid-Bugs-To: <rpm-devel@lists.dulug.duke.edu>\n"
-"POT-Creation-Date: 2007-06-14 15:31+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: ENCODING\n"
-
-#: popt.c:35
-msgid "unknown errno"
-msgstr ""
-
-#: popt.c:1002
-#, c-format
-msgid "option type (%d) not implemented in popt\n"
-msgstr ""
-
-#: popt.c:1215
-msgid "missing argument"
-msgstr ""
-
-#: popt.c:1217
-msgid "unknown option"
-msgstr ""
-
-#: popt.c:1219
-msgid "mutually exclusive logical operations requested"
-msgstr ""
-
-#: popt.c:1221
-msgid "opt->arg should not be NULL"
-msgstr ""
-
-#: popt.c:1223
-msgid "aliases nested too deeply"
-msgstr ""
-
-#: popt.c:1225
-msgid "error in parameter quoting"
-msgstr ""
-
-#: popt.c:1227
-msgid "invalid numeric value"
-msgstr ""
-
-#: popt.c:1229
-msgid "number too large or too small"
-msgstr ""
-
-#: popt.c:1231
-msgid "memory allocation failed"
-msgstr ""
-
-#: popt.c:1235
-msgid "unknown error"
-msgstr ""
-
-#: popt.h:172
-msgid "Options implemented via popt alias/exec:"
-msgstr ""
-
-#: popt.h:188
-msgid "Help options:"
-msgstr ""
-
-#: popthelp.c:68 popthelp.c:79
-msgid "Show this help message"
-msgstr ""
-
-#: popthelp.c:69 popthelp.c:80
-msgid "Display brief usage message"
-msgstr ""
-
-#: popthelp.c:83
-msgid "Display option defaults in message"
-msgstr ""
-
-#: popthelp.c:128
-msgid "NONE"
-msgstr ""
-
-#: popthelp.c:130
-msgid "VAL"
-msgstr ""
-
-#: popthelp.c:134
-msgid "INT"
-msgstr ""
-
-#: popthelp.c:135
-msgid "LONG"
-msgstr ""
-
-#: popthelp.c:136
-msgid "STRING"
-msgstr ""
-
-#: popthelp.c:137
-msgid "FLOAT"
-msgstr ""
-
-#: popthelp.c:138
-msgid "DOUBLE"
-msgstr ""
-
-#: popthelp.c:139
-msgid "ARG"
-msgstr ""
-
-#: popthelp.c:552
-msgid "Usage:"
-msgstr ""
-
-#: popthelp.c:576
-msgid "[OPTION...]"
-msgstr ""
diff --git a/po/zh.po b/po/zh.po
deleted file mode 100644
index 7457c0a..0000000
--- a/po/zh.po
+++ /dev/null
@@ -1,125 +0,0 @@
-# SOME DESCRIPTIVE TITLE.
-# Copyright (C) YEAR Free Software Foundation, Inc.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#
-#, fuzzy
-msgid ""
-msgstr ""
-"Project-Id-Version: popt 1.11\n"
-"Report-Msgid-Bugs-To: <rpm-devel@lists.dulug.duke.edu>\n"
-"POT-Creation-Date: 2007-06-14 15:31+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: ENCODING\n"
-
-#: popt.c:35
-msgid "unknown errno"
-msgstr ""
-
-#: popt.c:1002
-#, c-format
-msgid "option type (%d) not implemented in popt\n"
-msgstr ""
-
-#: popt.c:1215
-msgid "missing argument"
-msgstr ""
-
-#: popt.c:1217
-msgid "unknown option"
-msgstr ""
-
-#: popt.c:1219
-msgid "mutually exclusive logical operations requested"
-msgstr ""
-
-#: popt.c:1221
-msgid "opt->arg should not be NULL"
-msgstr ""
-
-#: popt.c:1223
-msgid "aliases nested too deeply"
-msgstr ""
-
-#: popt.c:1225
-msgid "error in parameter quoting"
-msgstr ""
-
-#: popt.c:1227
-msgid "invalid numeric value"
-msgstr ""
-
-#: popt.c:1229
-msgid "number too large or too small"
-msgstr ""
-
-#: popt.c:1231
-msgid "memory allocation failed"
-msgstr ""
-
-#: popt.c:1235
-msgid "unknown error"
-msgstr ""
-
-#: popt.h:172
-msgid "Options implemented via popt alias/exec:"
-msgstr ""
-
-#: popt.h:188
-msgid "Help options:"
-msgstr ""
-
-#: popthelp.c:68 popthelp.c:79
-msgid "Show this help message"
-msgstr ""
-
-#: popthelp.c:69 popthelp.c:80
-msgid "Display brief usage message"
-msgstr ""
-
-#: popthelp.c:83
-msgid "Display option defaults in message"
-msgstr ""
-
-#: popthelp.c:128
-msgid "NONE"
-msgstr ""
-
-#: popthelp.c:130
-msgid "VAL"
-msgstr ""
-
-#: popthelp.c:134
-msgid "INT"
-msgstr ""
-
-#: popthelp.c:135
-msgid "LONG"
-msgstr ""
-
-#: popthelp.c:136
-msgid "STRING"
-msgstr ""
-
-#: popthelp.c:137
-msgid "FLOAT"
-msgstr ""
-
-#: popthelp.c:138
-msgid "DOUBLE"
-msgstr ""
-
-#: popthelp.c:139
-msgid "ARG"
-msgstr ""
-
-#: popthelp.c:552
-msgid "Usage:"
-msgstr ""
-
-#: popthelp.c:576
-msgid "[OPTION...]"
-msgstr ""
diff --git a/po/zh_CN.po b/po/zh_CN.po
deleted file mode 100644
index 93ee3e2..0000000
--- a/po/zh_CN.po
+++ /dev/null
@@ -1,126 +0,0 @@
-# translation of translation.po to 
-# Traditional Chinese Messages for popt
-# Copyright (C) 2005 Free Software Foundation, Inc.
-# Wei-Lun Chao <chaoweilun@pcmail.com.tw>, 2005.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: popt 1.11\n"
-"Report-Msgid-Bugs-To: <rpm-devel@lists.dulug.duke.edu>\n"
-"POT-Creation-Date: 2007-06-14 15:31+0200\n"
-"PO-Revision-Date: 2005-05-20 15:53+1000\n"
-"Last-Translator: \n"
-"Language-Team:  <zh@li.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: KBabel 1.9.1\n"
-
-#: popt.c:35
-msgid "unknown errno"
-msgstr "未知的错误"
-
-#: popt.c:1002
-#, c-format
-msgid "option type (%d) not implemented in popt\n"
-msgstr "选项类别 (%d) 沒有在 popt 中实现\n"
-
-#: popt.c:1215
-msgid "missing argument"
-msgstr "缺少参数"
-
-#: popt.c:1217
-msgid "unknown option"
-msgstr "未知的选项"
-
-#: popt.c:1219
-msgid "mutually exclusive logical operations requested"
-msgstr "需要 XOR 逻辑运算"
-
-#: popt.c:1221
-msgid "opt->arg should not be NULL"
-msgstr "opt->arg 不应该为 NULL"
-
-#: popt.c:1223
-msgid "aliases nested too deeply"
-msgstr "别名嵌套太深"
-
-#: popt.c:1225
-msgid "error in parameter quoting"
-msgstr "参数引号错误"
-
-#: popt.c:1227
-msgid "invalid numeric value"
-msgstr "无效的数值"
-
-#: popt.c:1229
-msgid "number too large or too small"
-msgstr "数值太大或太小"
-
-#: popt.c:1231
-msgid "memory allocation failed"
-msgstr "内存分配错误"
-
-#: popt.c:1235
-msgid "unknown error"
-msgstr "未知的错误"
-
-#: popt.h:172
-msgid "Options implemented via popt alias/exec:"
-msgstr ""
-
-#: popt.h:188
-msgid "Help options:"
-msgstr ""
-
-#: popthelp.c:68 popthelp.c:79
-msgid "Show this help message"
-msgstr "显示这个帮助信息"
-
-#: popthelp.c:69 popthelp.c:80
-msgid "Display brief usage message"
-msgstr "显示简短的使用说明"
-
-#: popthelp.c:83
-msgid "Display option defaults in message"
-msgstr "在信息中显示默认的选项"
-
-#: popthelp.c:128
-msgid "NONE"
-msgstr "NONE"
-
-#: popthelp.c:130
-msgid "VAL"
-msgstr "VAL"
-
-#: popthelp.c:134
-msgid "INT"
-msgstr "INT"
-
-#: popthelp.c:135
-msgid "LONG"
-msgstr "LONG"
-
-#: popthelp.c:136
-msgid "STRING"
-msgstr "STRING"
-
-#: popthelp.c:137
-msgid "FLOAT"
-msgstr "FLOAT"
-
-#: popthelp.c:138
-msgid "DOUBLE"
-msgstr "DOUBLE"
-
-#: popthelp.c:139
-msgid "ARG"
-msgstr "ARG"
-
-#: popthelp.c:552
-msgid "Usage:"
-msgstr "用法:"
-
-#: popthelp.c:576
-msgid "[OPTION...]"
-msgstr "[选项...]"
diff --git a/po/zh_TW.po b/po/zh_TW.po
deleted file mode 100644
index f6a9a92..0000000
--- a/po/zh_TW.po
+++ /dev/null
@@ -1,124 +0,0 @@
-# Traditional Chinese Messages for popt
-# Copyright (C) 2005 Free Software Foundation, Inc.
-# Wei-Lun Chao <chaoweilun@pcmail.com.tw>, 2005
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: popt 1.11\n"
-"Report-Msgid-Bugs-To: <rpm-devel@lists.dulug.duke.edu>\n"
-"POT-Creation-Date: 2007-06-14 15:31+0200\n"
-"PO-Revision-Date: 2005-04-08 17:52+0800\n"
-"Last-Translator: Wei-Lun Chao <chaoweilun@pcmail.com.tw>\n"
-"Language-Team: zh_TW <zh-l10n@linux.org.tw>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-
-#: popt.c:35
-msgid "unknown errno"
-msgstr "未知的錯誤"
-
-#: popt.c:1002
-#, c-format
-msgid "option type (%d) not implemented in popt\n"
-msgstr "選項類型 (%d) 沒有在 popt 中實作\n"
-
-#: popt.c:1215
-msgid "missing argument"
-msgstr "缺少引數"
-
-#: popt.c:1217
-msgid "unknown option"
-msgstr "未知的選項"
-
-#: popt.c:1219
-msgid "mutually exclusive logical operations requested"
-msgstr "需要相互獨立的邏輯運算"
-
-#: popt.c:1221
-msgid "opt->arg should not be NULL"
-msgstr "opt->arg 不應為 NULL"
-
-#: popt.c:1223
-msgid "aliases nested too deeply"
-msgstr "巢狀別名太深"
-
-#: popt.c:1225
-msgid "error in parameter quoting"
-msgstr "參數引號錯誤"
-
-#: popt.c:1227
-msgid "invalid numeric value"
-msgstr "不正確的數值"
-
-#: popt.c:1229
-msgid "number too large or too small"
-msgstr "數字太大或太小"
-
-#: popt.c:1231
-msgid "memory allocation failed"
-msgstr "記憶體配置錯誤"
-
-#: popt.c:1235
-msgid "unknown error"
-msgstr "未知的錯誤"
-
-#: popt.h:172
-msgid "Options implemented via popt alias/exec:"
-msgstr ""
-
-#: popt.h:188
-msgid "Help options:"
-msgstr ""
-
-#: popthelp.c:68 popthelp.c:79
-msgid "Show this help message"
-msgstr "顯示本說明訊息"
-
-#: popthelp.c:69 popthelp.c:80
-msgid "Display brief usage message"
-msgstr "顯示簡短的使用說明"
-
-#: popthelp.c:83
-msgid "Display option defaults in message"
-msgstr "在訊息中顯示預設選項"
-
-#: popthelp.c:128
-msgid "NONE"
-msgstr "NONE"
-
-#: popthelp.c:130
-msgid "VAL"
-msgstr "VAL"
-
-#: popthelp.c:134
-msgid "INT"
-msgstr "INT"
-
-#: popthelp.c:135
-msgid "LONG"
-msgstr "LONG"
-
-#: popthelp.c:136
-msgid "STRING"
-msgstr "STRING"
-
-#: popthelp.c:137
-msgid "FLOAT"
-msgstr "FLOAT"
-
-#: popthelp.c:138
-msgid "DOUBLE"
-msgstr "DOUBLE"
-
-#: popthelp.c:139
-msgid "ARG"
-msgstr "ARG"
-
-#: popthelp.c:552
-msgid "Usage:"
-msgstr "用法:"
-
-#: popthelp.c:576
-msgid "[OPTION...]"
-msgstr "[選項...]"
-- 
Gitee


From cf3e7d30ff607585c07306b0243f31e6133cc015 Mon Sep 17 00:00:00 2001
From: Jeff Johnson <n3npq@mac.com>
Date: Fri, 15 Jun 2007 12:41:14 +0000
Subject: [PATCH 439/667] linux amd64/ppc cannot reuse a va_list. make a copy
 instead.

---
 poptint.c | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/poptint.c b/poptint.c
index 227a500..d327377 100644
--- a/poptint.c
+++ b/poptint.c
@@ -97,9 +97,12 @@ strdup_vprintf (const char *format, va_list ap)
 {
   char *buffer = NULL;
   char c;
+  va_list apc;
+
+  va_copy(apc, ap);	/* XXX linux amd64/ppc needs a copy. */
 
   buffer = calloc (sizeof (char), vsnprintf (&c, 1, format, ap) + 1);
-  vsprintf (buffer, format, ap);
+  vsprintf (buffer, format, apc);
 
   return buffer;
 }
-- 
Gitee


From 59377235e2126b5840ba067f1e938da91adb7bad Mon Sep 17 00:00:00 2001
From: Arkadiusz Miskiewicz <arekm@pld-linux.org>
Date: Fri, 15 Jun 2007 12:47:37 +0000
Subject: [PATCH 440/667] va_end on copy.

---
 poptint.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/poptint.c b/poptint.c
index d327377..42b5cf4 100644
--- a/poptint.c
+++ b/poptint.c
@@ -104,6 +104,8 @@ strdup_vprintf (const char *format, va_list ap)
   buffer = calloc (sizeof (char), vsnprintf (&c, 1, format, ap) + 1);
   vsprintf (buffer, format, apc);
 
+  va_end(apc);
+
   return buffer;
 }
 
-- 
Gitee


From 3aab68e1a81b999e3e028b144d5e3b2ad1299008 Mon Sep 17 00:00:00 2001
From: Jeff Johnson <n3npq@mac.com>
Date: Fri, 15 Jun 2007 12:49:56 +0000
Subject: [PATCH 441/667] match va_copy with a va_end. remove the GNOMEish
 warning.

---
 poptint.c | 2 +-
 poptint.h | 2 --
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/poptint.c b/poptint.c
index 42b5cf4..279c401 100644
--- a/poptint.c
+++ b/poptint.c
@@ -103,6 +103,7 @@ strdup_vprintf (const char *format, va_list ap)
 
   buffer = calloc (sizeof (char), vsnprintf (&c, 1, format, ap) + 1);
   vsprintf (buffer, format, apc);
+  va_end(apc);
 
   va_end(apc);
 
@@ -141,7 +142,6 @@ POPT_fprintf (FILE* stream, const char *format, ...)
     retval = fprintf (stream, "%s", locale_str);
     free (locale_str);
   } else {
-    fprintf (stderr, POPT_WARNING "%s\n", "Invalid UTF-8");
 #endif
     retval = fprintf (stream, "%s", buffer);
 #ifdef HAVE_ICONV
diff --git a/poptint.h b/poptint.h
index dae91bc..f525a2a 100644
--- a/poptint.h
+++ b/poptint.h
@@ -114,8 +114,6 @@ struct poptContext_s {
 
 #define N_(foo) foo
 
-#define POPT_WARNING "(popt): Warning **: "
-
 int   POPT_fprintf (FILE* steam, const char *format, ...);
 char *POPT_prev_char (const char *str);
 
-- 
Gitee


From 7d546750902e8c2238e630994d2790308f5f4bfe Mon Sep 17 00:00:00 2001
From: "Ralf S. Engelschall" <rse@engelschall.com>
Date: Fri, 15 Jun 2007 13:50:12 +0000
Subject: [PATCH 442/667] a single va_end is sufficient

---
 poptint.c | 1 -
 1 file changed, 1 deletion(-)

diff --git a/poptint.c b/poptint.c
index 279c401..bafd465 100644
--- a/poptint.c
+++ b/poptint.c
@@ -103,7 +103,6 @@ strdup_vprintf (const char *format, va_list ap)
 
   buffer = calloc (sizeof (char), vsnprintf (&c, 1, format, ap) + 1);
   vsprintf (buffer, format, apc);
-  va_end(apc);
 
   va_end(apc);
 
-- 
Gitee


From d0d5fd45e56a4b04fd032e7f273bb44b431eb7da Mon Sep 17 00:00:00 2001
From: "Ralf S. Engelschall" <rse@engelschall.com>
Date: Fri, 15 Jun 2007 14:06:06 +0000
Subject: [PATCH 443/667] fix portability by providing the necessary Autoconf
 glue for the use of the (still) too unportable C99 va_copy function

---
 acinclude.m4 | 113 +++++++++++++++++++++++++++++++++++++++++++++++++++
 configure.ac |   1 +
 2 files changed, 114 insertions(+)
 create mode 100644 acinclude.m4

diff --git a/acinclude.m4 b/acinclude.m4
new file mode 100644
index 0000000..cebdf72
--- /dev/null
+++ b/acinclude.m4
@@ -0,0 +1,113 @@
+dnl ##
+dnl ##  acinclude.m4 -- additional source for aclocal(1)
+dnl ##
+
+dnl ##
+dnl ##  Check for C99 va_copy() implementation
+dnl ##  (and provide fallback implementation if neccessary)
+dnl ##
+dnl ##  configure.in:
+dnl ##    AC_CHECK_VA_COPY
+dnl ##  foo.c:
+dnl ##    #include "config.h"
+dnl ##    [...]
+dnl ##    va_copy(d,s)
+dnl ##
+dnl ##  This check is rather complex: first because we really have to
+dnl ##  try various possible implementations in sequence and second, we
+dnl ##  cannot define a macro in config.h with parameters directly.
+dnl ##
+
+dnl #   test program for va_copy() implementation
+changequote(<<,>>)
+m4_define(__va_copy_test, <<[
+#include <stdlib.h>
+#include <stdarg.h>
+#include <string.h>
+#define DO_VA_COPY(d, s) $1
+void test(char *str, ...)
+{
+    va_list ap, ap2;
+    int i;
+    va_start(ap, str);
+    DO_VA_COPY(ap2, ap);
+    for (i = 1; i <= 9; i++) {
+        int k = (int)va_arg(ap, int);
+        if (k != i)
+            abort();
+    }
+    DO_VA_COPY(ap, ap2);
+    for (i = 1; i <= 9; i++) {
+        int k = (int)va_arg(ap, int);
+        if (k != i)
+            abort();
+    }
+    va_end(ap);
+}
+int main(int argc, char *argv[])
+{
+    test("test", 1, 2, 3, 4, 5, 6, 7, 8, 9);
+    exit(0);
+}
+]>>)
+changequote([,])
+
+dnl #   test driver for va_copy() implementation
+m4_define(__va_copy_check, [
+    AH_VERBATIM($1,
+[/* Predefined possible va_copy() implementation (id: $1) */
+#define __VA_COPY_USE_$1(d, s) $2])
+    if test ".$ac_cv_va_copy" = .; then
+        AC_TRY_RUN(__va_copy_test($2), [ac_cv_va_copy="$1"])
+    fi
+])
+
+dnl #   Autoconf check for va_copy() implementation checking
+AC_DEFUN([AC_CHECK_VA_COPY],[
+  dnl #   provide Autoconf display check message
+  AC_MSG_CHECKING(for va_copy() function)
+  dnl #   check for various implementations in priorized sequence   
+  AC_CACHE_VAL(ac_cv_va_copy, [
+    ac_cv_va_copy=""
+    dnl #   1. check for standardized C99 macro
+    __va_copy_check(C99, [va_copy((d), (s))])
+    dnl #   2. check for alternative/deprecated GCC macro
+    __va_copy_check(GCM, [VA_COPY((d), (s))])
+    dnl #   3. check for internal GCC macro (high-level define)
+    __va_copy_check(GCH, [__va_copy((d), (s))])
+    dnl #   4. check for internal GCC macro (built-in function)
+    __va_copy_check(GCB, [__builtin_va_copy((d), (s))])
+    dnl #   5. check for assignment approach (assuming va_list is a struct)
+    __va_copy_check(ASS, [do { (d) = (s); } while (0)])
+    dnl #   6. check for assignment approach (assuming va_list is a pointer)
+    __va_copy_check(ASP, [do { *(d) = *(s); } while (0)])
+    dnl #   7. check for memory copying approach (assuming va_list is a struct)
+    __va_copy_check(CPS, [memcpy((void *)&(d), (void *)&(s)), sizeof((s))])
+    dnl #   8. check for memory copying approach (assuming va_list is a pointer)
+    __va_copy_check(CPP, [memcpy((void *)(d), (void *)(s)), sizeof(*(s))])
+    if test ".$ac_cv_va_copy" = .; then
+        AC_ERROR([no working implementation found])
+    fi
+  ])
+  dnl #   optionally activate the fallback implementation
+  if test ".$ac_cv_va_copy" = ".C99"; then
+      AC_DEFINE(HAVE_VA_COPY, 1, [Define if va_copy() macro exists (and no fallback implementation is required)])
+  fi
+  dnl #   declare which fallback implementation to actually use
+  AC_DEFINE_UNQUOTED([__VA_COPY_USE], [__VA_COPY_USE_$ac_cv_va_copy],
+      [Define to id of used va_copy() implementation])
+  dnl #   provide activation hook for fallback implementation
+  AH_VERBATIM([__VA_COPY_ACTIVATION],
+[/* Optional va_copy() implementation activation */
+#ifndef HAVE_VA_COPY
+#define va_copy(d, s) __VA_COPY_USE(d, s)
+#endif
+])
+  dnl #   provide Autoconf display result message
+  if test ".$ac_cv_va_copy" = ".C99"; then
+      AC_MSG_RESULT([yes])
+  else
+      AC_MSG_RESULT([no (using fallback implementation)])
+  fi
+])
+
diff --git a/configure.ac b/configure.ac
index f4c9dfd..3694c32 100755
--- a/configure.ac
+++ b/configure.ac
@@ -29,6 +29,7 @@ AC_SYS_LARGEFILE
 
 AC_ISC_POSIX
 AM_C_PROTOTYPES
+AC_CHECK_VA_COPY
 
 dnl XXX lose rpm libs
 LIBS=
-- 
Gitee


From f2754c7394bba39e9999c106148aa3dcb3110db5 Mon Sep 17 00:00:00 2001
From: Jeff Johnson <n3npq@mac.com>
Date: Fri, 22 Jun 2007 00:02:01 +0000
Subject: [PATCH 444/667] - fix index thinko.

---
 CHANGES | 3 +++
 popt.c  | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/CHANGES b/CHANGES
index db16a5f..238c7c7 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,6 @@
+1.11 -> 1.11.1
+    - jbj: fix index thinko.
+    
 1.5 -> 1.6
 	- add ability to perform callbacks for every, not just first, match.
 
diff --git a/popt.c b/popt.c
index a9b1bd3..66d5e26 100644
--- a/popt.c
+++ b/popt.c
@@ -396,7 +396,7 @@ static int execCommand(poptContext con)
     if (!strchr(item->argv[0], '/') && con->execPath != NULL) {
 	char *s = malloc(strlen(con->execPath) + strlen(item->argv[0]) + sizeof("/"));
 	if (s)
-	    sprintf(s, "%s/%s", con->execPath, item->argv[-1]);
+	    sprintf(s, "%s/%s", con->execPath, item->argv[0]);
 	argv[argc] = s;
     } else
 	argv[argc] = POPT_findProgramPath(item->argv[0]);
-- 
Gitee


From 149787677dd58ad5f01d866ea658c938b6ac7d92 Mon Sep 17 00:00:00 2001
From: "Ralf S. Engelschall" <rse@engelschall.com>
Date: Mon, 2 Jul 2007 08:58:48 +0000
Subject: [PATCH 445/667] Before attempting to read the hard-coded /etc/popt
 file try to read in the installation-prefix-aware <sysconfdir>/popt, please.

---
 configure.ac | 4 ++++
 poptconfig.c | 3 +++
 2 files changed, 7 insertions(+)

diff --git a/configure.ac b/configure.ac
index 3694c32..d300abf 100755
--- a/configure.ac
+++ b/configure.ac
@@ -105,6 +105,10 @@ AC_CHECK_FUNCS(getuid geteuid mtrace __secure_getenv setregid strerror)
 
 AM_GNU_GETTEXT([external])
 
+popt_sysconfdir="${sysconfdir}"
+eval "popt_sysconfdir=\"${popt_sysconfdir}\"" # expand contained ${prefix}
+AC_DEFINE_UNQUOTED([POPT_SYSCONFDIR], ["$popt_sysconfdir"], [Full path to default POPT configuration directory])
+
 POPT_SOURCE_PATH="`pwd`"
 AC_DEFINE_UNQUOTED(POPT_SOURCE_PATH, "$POPT_SOURCE_PATH",
 	[Full path to popt top_srcdir.])
diff --git a/poptconfig.c b/poptconfig.c
index e84e607..5697c17 100644
--- a/poptconfig.c
+++ b/poptconfig.c
@@ -173,6 +173,9 @@ int poptReadDefaultConfig(poptContext con, /*@unused@*/ int useEnv)
 
     if (con->appName == NULL) return 0;
 
+    rc = poptReadConfigFile(con, POPT_SYSCONFDIR "/popt");
+    if (rc) return rc;
+
     rc = poptReadConfigFile(con, "/etc/popt");
     if (rc) return rc;
 
-- 
Gitee


From 3d9d28854b4dfcaf8ff744fbc5126f0572408455 Mon Sep 17 00:00:00 2001
From: Arkadiusz Miskiewicz <arekm@pld-linux.org>
Date: Wed, 11 Jul 2007 08:00:12 +0000
Subject: [PATCH 446/667] Convert to UTF8, update copyright year, update qboosh
 email address, fix Usage translation.

---
 po/pl.po | 36 ++++++++++++++++++------------------
 1 file changed, 18 insertions(+), 18 deletions(-)

diff --git a/po/pl.po b/po/pl.po
index 9fc1943..c46ef7f 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -1,17 +1,17 @@
 # Polish translation for popt.
-# Copyright (C) YEAR Free Software Foundation, Inc.
-# Jakub Bogusz <qboosh@pld.org.pl>, 2002.
+# Copyright (C) 2002 Free Software Foundation, Inc.
+# Jakub Bogusz <qboosh@pld-linux.org>, 2002.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.11\n"
-"Report-Msgid-Bugs-To: <rpm-devel@lists.dulug.duke.edu>\n"
+"Report-Msgid-Bugs-To: <rpm-devel@rpm5.org>\n"
 "POT-Creation-Date: 2007-06-14 15:31+0200\n"
 "PO-Revision-Date: 2003-06-08 20:32+0200\n"
-"Last-Translator: Jakub Bogusz <qboosh@pld.org.pl>\n"
+"Last-Translator: Jakub Bogusz <qboosh@pld-linux.org>\n"
 "Language-Team: Polish <translation-team-pl@lists.sourceforge.net>\n"
 "MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=iso-8859-2\n"
+"Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
 #: popt.c:35
@@ -33,35 +33,35 @@ msgstr "nieznana opcja"
 
 #: popt.c:1219
 msgid "mutually exclusive logical operations requested"
-msgstr "��danie wykluczaj�cych si� operacji"
+msgstr "żądanie wykluczających się operacji"
 
 #: popt.c:1221
 msgid "opt->arg should not be NULL"
-msgstr "opt->arg nie mo�e by� NULL"
+msgstr "opt->arg nie może być NULL"
 
 #: popt.c:1223
 msgid "aliases nested too deeply"
-msgstr "zbyt du�e zag��bienie alias�w"
+msgstr "zbyt duże zagłębienie aliasów"
 
 #: popt.c:1225
 msgid "error in parameter quoting"
-msgstr "b��d w cytowaniu parametru"
+msgstr "błąd w cytowaniu parametru"
 
 #: popt.c:1227
 msgid "invalid numeric value"
-msgstr "b��dna warto�� liczbowa"
+msgstr "błędna wartość liczbowa"
 
 #: popt.c:1229
 msgid "number too large or too small"
-msgstr "liczba zbyt du�a lub zbyt ma�a"
+msgstr "liczba zbyt duża lub zbyt mała"
 
 #: popt.c:1231
 msgid "memory allocation failed"
-msgstr "b��d alokacji pami�ci"
+msgstr "błąd alokacji pamięci"
 
 #: popt.c:1235
 msgid "unknown error"
-msgstr "nieznany b��d"
+msgstr "nieznany błąd"
 
 #: popt.h:172
 msgid "Options implemented via popt alias/exec:"
@@ -73,15 +73,15 @@ msgstr "Opcje pomocy:"
 
 #: popthelp.c:68 popthelp.c:79
 msgid "Show this help message"
-msgstr "Poka� t� pomoc"
+msgstr "Pokaż tą pomoc"
 
 #: popthelp.c:69 popthelp.c:80
 msgid "Display brief usage message"
-msgstr "Wy�wietl skr�cony spos�b u�ycia"
+msgstr "Wyświetl skrócony sposób użycia"
 
 #: popthelp.c:83
 msgid "Display option defaults in message"
-msgstr "Wy�wietl domy�lne opcje w opisie"
+msgstr "Wyświetl domyślne opcje w opisie"
 
 #: popthelp.c:128
 msgid "NONE"
@@ -101,7 +101,7 @@ msgstr "LONG"
 
 #: popthelp.c:136
 msgid "STRING"
-msgstr "�A�CUCH"
+msgstr "ŁAŃCUCH"
 
 #: popthelp.c:137
 msgid "FLOAT"
@@ -117,7 +117,7 @@ msgstr "PARAM"
 
 #: popthelp.c:552
 msgid "Usage:"
-msgstr "Sk�adnia:"
+msgstr "Użycie:"
 
 #: popthelp.c:576
 msgid "[OPTION...]"
-- 
Gitee


From 03e88656e622961d7eec78d6f40c8878526f57ca Mon Sep 17 00:00:00 2001
From: Jeff Johnson <n3npq@mac.com>
Date: Thu, 12 Jul 2007 17:22:44 +0000
Subject: [PATCH 447/667] - plug a memory leak.

---
 CHANGES     | 3 ++-
 poptparse.c | 4 +++-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/CHANGES b/CHANGES
index 238c7c7..239a778 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,4 +1,5 @@
-1.11 -> 1.11.1
+1.11 -> 1.12
+    - jbj: plug a memory leak.
     - jbj: fix index thinko.
     
 1.5 -> 1.6
diff --git a/poptparse.c b/poptparse.c
index 6b3b891..02c5baa 100644
--- a/poptparse.c
+++ b/poptparse.c
@@ -162,8 +162,10 @@ int poptConfigFileToString(FILE *fp, char ** argstrp, /*@unused@*/ int flags)
 	    p++;
 
 	linelen = strlen(p);
-	if (linelen >= maxlinelen-1)
+	if (linelen >= maxlinelen-1) {
+	    free(argstr);
 	    return POPT_ERROR_OVERFLOW;	/* XXX line too long */
+	}
 
 	if (*p == '\0' || *p == '\n') continue;	/* line is empty */
 	if (*p == '#') continue;		/* comment line */
-- 
Gitee


From 8f968c47fe46684101ea0a2e564fab75a75c2216 Mon Sep 17 00:00:00 2001
From: Jeff Johnson <n3npq@mac.com>
Date: Fri, 13 Jul 2007 12:24:00 +0000
Subject: [PATCH 448/667] plug another memory leak on an error retrun path.

---
 poptparse.c | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/poptparse.c b/poptparse.c
index 02c5baa..9064253 100644
--- a/poptparse.c
+++ b/poptparse.c
@@ -67,7 +67,10 @@ int poptParseArgvString(const char * s, int * argcPtr, const char *** argvPtr)
 
     if (argv == NULL) return rc;
     buf = bufOrig = calloc(1, buflen);
-    if (buf == NULL) return rc;
+    if (buf == NULL) {
+	free(argv);
+	return rc;
+    }
     argv[argc] = buf;
 
     for (src = s; *src != '\0'; src++) {
-- 
Gitee


From 167def65358574168a462548153d195d04cc4d93 Mon Sep 17 00:00:00 2001
From: Jeff Johnson <n3npq@mac.com>
Date: Fri, 13 Jul 2007 12:45:24 +0000
Subject: [PATCH 449/667] prepare for popt-1.12 release.

---
 configure.ac | 2 +-
 popt.spec    | 5 ++++-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/configure.ac b/configure.ac
index d300abf..6a6fc14 100755
--- a/configure.ac
+++ b/configure.ac
@@ -1,5 +1,5 @@
 AC_PREREQ(2.57)
-AC_INIT(popt, 1.11, popt-devel@rpm5.org)
+AC_INIT(popt, 1.12, popt-devel@rpm5.org)
 AC_CANONICAL_TARGET
 AC_CONFIG_SRCDIR([popt.h])
 AC_CONFIG_HEADERS([config.h])
diff --git a/popt.spec b/popt.spec
index bf16bed..8fbe66b 100644
--- a/popt.spec
+++ b/popt.spec
@@ -1,6 +1,6 @@
 Summary: A C library for parsing command line parameters.
 Name: popt
-Version: 1.11
+Version: 1.12
 Release: 1
 License: X Consortium
 Group: System Environment/Libraries
@@ -40,6 +40,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man3/popt.3*
 
 %changelog
+* Tue Jul 10 2007 Jeff Johnson <jbj@rpm5.org>
+- release popt-1.12 through rpm5.org.
+
 * Sat Jun  9 2007 Jeff Johnson <jbj@rpm5.org>
 - release popt-1.11 through rpm5.org.
 
-- 
Gitee


From 3e7569b98dd27f9ad24fb5ef5709e406b00d82f4 Mon Sep 17 00:00:00 2001
From: Jeff Johnson <n3npq@mac.com>
Date: Sat, 14 Jul 2007 07:16:17 +0000
Subject: [PATCH 450/667] - add vi.po (Translation Project).

---
 CHANGES      |   1 +
 configure.ac |   2 +-
 po/pl.po     |   2 +-
 po/vi.po     | 126 +++++++++++++++++++++++++++++++++++++++++++++++++++
 4 files changed, 129 insertions(+), 2 deletions(-)
 create mode 100644 po/vi.po

diff --git a/CHANGES b/CHANGES
index 239a778..38cf884 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,6 +1,7 @@
 1.11 -> 1.12
     - jbj: plug a memory leak.
     - jbj: fix index thinko.
+    - jbj: add vi.po (Translation Project).
     
 1.5 -> 1.6
 	- add ability to perform callbacks for every, not just first, match.
diff --git a/configure.ac b/configure.ac
index 6a6fc14..8d0d650 100755
--- a/configure.ac
+++ b/configure.ac
@@ -14,7 +14,7 @@ AC_SUBST(LT_AGE, 8)
 
 AM_INIT_AUTOMAKE([foreign])
 
-ALL_LINGUAS="cs da de es eu_ES fr gl hu is ja ko no pl pt ro ru sk sl sv tr uk wa"
+ALL_LINGUAS="cs da de es eu_ES fr gl hu is ja ko no pl pt ro ru sk sl sv tr uk vi wa"
 
 AC_PROG_CC
 AC_PROG_INSTALL
diff --git a/po/pl.po b/po/pl.po
index c46ef7f..9dfb971 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.11\n"
-"Report-Msgid-Bugs-To: <rpm-devel@rpm5.org>\n"
+"Report-Msgid-Bugs-To: <rpm-devel@lists.dulug.duke.edu>\n"
 "POT-Creation-Date: 2007-06-14 15:31+0200\n"
 "PO-Revision-Date: 2003-06-08 20:32+0200\n"
 "Last-Translator: Jakub Bogusz <qboosh@pld-linux.org>\n"
diff --git a/po/vi.po b/po/vi.po
new file mode 100644
index 0000000..b4fb3fb
--- /dev/null
+++ b/po/vi.po
@@ -0,0 +1,126 @@
+# Vietnamese translation for POPT.
+# Copyright © 2007 Free Software Foundation, Inc.
+# Clytie Siddall <clytie@riverland.net.au>, 2007
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: popt 1.11\n"
+"Report-Msgid-Bugs-To: <rpm-devel@lists.dulug.duke.edu>\n"
+"POT-Creation-Date: 2007-06-14 15:31+0200\n"
+"PO-Revision-Date: 2007-07-12 22:37+0930\n"
+"Last-Translator: Clytie Siddall <clytie@riverland.net.au>\n"
+"Language-Team: Vietnamese <vi-VN@googlegroups.com>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+"X-Generator: LocFactoryEditor 1.7b1\n"
+
+#: popt.c:35
+msgid "unknown errno"
+msgstr "số hiệu lỗi không rõ"
+
+#: popt.c:1002
+#, c-format
+msgid "option type (%d) not implemented in popt\n"
+msgstr "kiểu tùy chọn (%d) chưa được thực hiện trong popt\n"
+
+#: popt.c:1215
+msgid "missing argument"
+msgstr "thiếu đối số"
+
+#: popt.c:1217
+msgid "unknown option"
+msgstr "tùy chọn không rõ"
+
+#: popt.c:1219
+msgid "mutually exclusive logical operations requested"
+msgstr "các thao tác hợp lý loại từ lẫn nhau được yêu cầu"
+
+#: popt.c:1221
+msgid "opt->arg should not be NULL"
+msgstr "« tùy chọn->đối số » không thể vô giá trị"
+
+#: popt.c:1223
+msgid "aliases nested too deeply"
+msgstr "các bí danh lồng nhau quá sâu"
+
+#: popt.c:1225
+msgid "error in parameter quoting"
+msgstr "gặp lỗi trong lời trích dẫn tham số"
+
+#: popt.c:1227
+msgid "invalid numeric value"
+msgstr "giá trị thuộc số không hợp lệ"
+
+#: popt.c:1229
+msgid "number too large or too small"
+msgstr "con số quá lớn hay quá nhỏ"
+
+#: popt.c:1231
+msgid "memory allocation failed"
+msgstr "lỗi cấp phát bộ nhớ"
+
+#: popt.c:1235
+msgid "unknown error"
+msgstr "lỗi không rõ"
+
+#: popt.h:172
+msgid "Options implemented via popt alias/exec:"
+msgstr "Các tùy chọn được thực hiện thông qua popt alias/exec:"
+
+#: popt.h:188
+msgid "Help options:"
+msgstr "Tùy chọn trợ giúp:"
+
+#: popthelp.c:68 popthelp.c:79
+msgid "Show this help message"
+msgstr "Xem thông điệp trợ giúp này"
+
+#: popthelp.c:69 popthelp.c:80
+msgid "Display brief usage message"
+msgstr "Hiển thị thông điệp cách sử dụng ngắn"
+
+#: popthelp.c:83
+msgid "Display option defaults in message"
+msgstr "Hiển thị các giá trị mặc định của tùy chọn trong thông điệp"
+
+#: popthelp.c:128
+msgid "NONE"
+msgstr "KHÔNG CÓ"
+
+#: popthelp.c:130
+msgid "VAL"
+msgstr "GIÁ TRỊ"
+
+#: popthelp.c:134
+msgid "INT"
+msgstr "SỐ NGUYÊN"
+
+#: popthelp.c:135
+msgid "LONG"
+msgstr "DÀI"
+
+#: popthelp.c:136
+msgid "STRING"
+msgstr "CHUỖI"
+
+#: popthelp.c:137
+msgid "FLOAT"
+msgstr "NỔI"
+
+#: popthelp.c:138
+msgid "DOUBLE"
+msgstr "ĐÔI"
+
+#: popthelp.c:139
+msgid "ARG"
+msgstr "ĐỐI SỐ"
+
+#: popthelp.c:552
+msgid "Usage:"
+msgstr "Cách sử dụng:"
+
+#: popthelp.c:576
+msgid "[OPTION...]"
+msgstr "[TÙY_CHỌN...]"
-- 
Gitee


From 517f714804e73618c96d8daff5637ff892edff0a Mon Sep 17 00:00:00 2001
From: Jeff Johnson <n3npq@mac.com>
Date: Sat, 14 Jul 2007 07:23:07 +0000
Subject: [PATCH 451/667] - add nl.po (Translation Project).

---
 CHANGES  |   1 +
 po/nl.po | 129 +++++++++++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 130 insertions(+)
 create mode 100644 po/nl.po

diff --git a/CHANGES b/CHANGES
index 38cf884..220cf2e 100644
--- a/CHANGES
+++ b/CHANGES
@@ -2,6 +2,7 @@
     - jbj: plug a memory leak.
     - jbj: fix index thinko.
     - jbj: add vi.po (Translation Project).
+    - jbj: add nl.po (Translation Project).
     
 1.5 -> 1.6
 	- add ability to perform callbacks for every, not just first, match.
diff --git a/po/nl.po b/po/nl.po
new file mode 100644
index 0000000..a5aa065
--- /dev/null
+++ b/po/nl.po
@@ -0,0 +1,129 @@
+# Dutch messages for popt.
+# This file is put in the public domain.
+# Tim Van Holder <tim.van.holder@telenet.be>, 2007.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: popt 1.11\n"
+"Report-Msgid-Bugs-To: <rpm-devel@lists.dulug.duke.edu>\n"
+"POT-Creation-Date: 2007-06-14 15:31+0200\n"
+"PO-Revision-Date: 2007-06-29 17:38+0200\n"
+"Last-Translator: Tim Van Holder <tim.van.holder@telenet.be>\n"
+"Language-Team: Dutch <vertaling@vrijschrift.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=utf-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+# of "onbekende errno-waarde"?
+#: popt.c:35
+msgid "unknown errno"
+msgstr "onbekende errno"
+
+#: popt.c:1002
+#, c-format
+msgid "option type (%d) not implemented in popt\n"
+msgstr "optietype (%d) niet geïmplementeerd in popt\n"
+
+#: popt.c:1215
+msgid "missing argument"
+msgstr "ontbrekend argument"
+
+#: popt.c:1217
+msgid "unknown option"
+msgstr "onbekende optie"
+
+#: popt.c:1219
+msgid "mutually exclusive logical operations requested"
+msgstr "wederzijds uitgesloten logische operatoren gevraagd"
+
+#: popt.c:1221
+msgid "opt->arg should not be NULL"
+msgstr "opt->arg zou niet NULL mogen zijn"
+
+#: popt.c:1223
+msgid "aliases nested too deeply"
+msgstr "aliassen te diep genest"
+
+# of toch beter "quoting" behouden?
+#: popt.c:1225
+msgid "error in parameter quoting"
+msgstr "fout in aanhaling van parameters"
+
+#: popt.c:1227
+msgid "invalid numeric value"
+msgstr "ongelige numerische waarde"
+
+#: popt.c:1229
+msgid "number too large or too small"
+msgstr "getal te klein of te groot"
+
+#: popt.c:1231
+msgid "memory allocation failed"
+msgstr "geheugenreservatie mislukt"
+
+#: popt.c:1235
+msgid "unknown error"
+msgstr "onbekende fout"
+
+#: popt.h:172
+msgid "Options implemented via popt alias/exec:"
+msgstr "Opties geïmplementeerd d.m.v. popt alias/exec:"
+
+# of "Help-opties:"?
+#: popt.h:188
+msgid "Help options:"
+msgstr "Hulp-opties:"
+
+#: popthelp.c:68 popthelp.c:79
+msgid "Show this help message"
+msgstr "Toon deze hulptekst"
+
+#: popthelp.c:69 popthelp.c:80
+msgid "Display brief usage message"
+msgstr "Toon korte tekst over gebruik"
+
+#: popthelp.c:83
+msgid "Display option defaults in message"
+msgstr "Toon standaardwaarden van opties in de tekst"
+
+#: popthelp.c:128
+msgid "NONE"
+msgstr "GEEN"
+
+#: popthelp.c:130
+msgid "VAL"
+msgstr "WAARDE"
+
+#: popthelp.c:134
+msgid "INT"
+msgstr "INT"
+
+#: popthelp.c:135
+msgid "LONG"
+msgstr "LONG"
+
+# TEKENREEKS lijkt me niet gepast; dus ofwel STRING behouden, ofwel TEKST
+#: popthelp.c:136
+msgid "STRING"
+msgstr "TEKST"
+
+#: popthelp.c:137
+msgid "FLOAT"
+msgstr "FLOAT"
+
+#: popthelp.c:138
+msgid "DOUBLE"
+msgstr "DOUBLE"
+
+# of hier ARGUMENT van maken?
+#: popthelp.c:139
+msgid "ARG"
+msgstr "ARG"
+
+#: popthelp.c:552
+msgid "Usage:"
+msgstr "Gebruik:"
+
+#: popthelp.c:576
+msgid "[OPTION...]"
+msgstr "[OPTIE...]"
-- 
Gitee


From ad1a4018d6f3e27f9dba4db6a1f9f5fd3c1820dd Mon Sep 17 00:00:00 2001
From: Jeff Johnson <n3npq@mac.com>
Date: Sat, 14 Jul 2007 13:14:45 +0000
Subject: [PATCH 452/667] correct e-maill addresses.

---
 po/cs.po    | 2 +-
 po/da.po    | 2 +-
 po/de.po    | 2 +-
 po/es.po    | 2 +-
 po/eu_ES.po | 2 +-
 po/fr.po    | 2 +-
 po/gl.po    | 2 +-
 po/hu.po    | 2 +-
 po/is.po    | 2 +-
 po/ja.po    | 2 +-
 po/ko.po    | 2 +-
 po/nl.po    | 2 +-
 po/no.po    | 2 +-
 po/pl.po    | 2 +-
 po/popt.pot | 2 +-
 po/pt.po    | 2 +-
 po/ro.po    | 2 +-
 po/ru.po    | 2 +-
 po/sk.po    | 2 +-
 po/sl.po    | 2 +-
 po/sv.po    | 2 +-
 po/tr.po    | 2 +-
 po/uk.po    | 2 +-
 po/vi.po    | 2 +-
 po/wa.po    | 2 +-
 25 files changed, 25 insertions(+), 25 deletions(-)

diff --git a/po/cs.po b/po/cs.po
index 2cddf31..82f9a0c 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.11\n"
-"Report-Msgid-Bugs-To: <rpm-devel@lists.dulug.duke.edu>\n"
+"Report-Msgid-Bugs-To: <popt-devel@rpm5.org>\n"
 "POT-Creation-Date: 2007-06-14 15:31+0200\n"
 "PO-Revision-Date: 2001-07-24 00:03+0100\n"
 "Last-Translator: Milan Kerslager <kerslage@linux.cz>\n"
diff --git a/po/da.po b/po/da.po
index a90ded7..6d0a9e1 100644
--- a/po/da.po
+++ b/po/da.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.11\n"
-"Report-Msgid-Bugs-To: <rpm-devel@lists.dulug.duke.edu>\n"
+"Report-Msgid-Bugs-To: <popt-devel@rpm5.org>\n"
 "POT-Creation-Date: 2007-06-14 15:31+0200\n"
 "PO-Revision-Date: Sun Jan 21 2001 04:30:32+0200\n"
 "Last-Translator: Martin Hansen <mah@k64.dk>\n"
diff --git a/po/de.po b/po/de.po
index e6ac3ca..ce2f7e9 100644
--- a/po/de.po
+++ b/po/de.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.11\n"
-"Report-Msgid-Bugs-To: <rpm-devel@lists.dulug.duke.edu>\n"
+"Report-Msgid-Bugs-To: <popt-devel@rpm5.org>\n"
 "POT-Creation-Date: 2007-06-14 15:31+0200\n"
 "PO-Revision-Date: 2007-02-17 21:00+0100\n"
 "Last-Translator: Robert Scheck <rpm@robert-scheck.de>\n"
diff --git a/po/es.po b/po/es.po
index ad4beb7..97380d2 100644
--- a/po/es.po
+++ b/po/es.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.11\n"
-"Report-Msgid-Bugs-To: <rpm-devel@lists.dulug.duke.edu>\n"
+"Report-Msgid-Bugs-To: <popt-devel@rpm5.org>\n"
 "POT-Creation-Date: 2007-06-14 15:31+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Leandro Lucarella <luca@linuxmendoza.org.ar>\n"
diff --git a/po/eu_ES.po b/po/eu_ES.po
index 7457c0a..6006f8e 100644
--- a/po/eu_ES.po
+++ b/po/eu_ES.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.11\n"
-"Report-Msgid-Bugs-To: <rpm-devel@lists.dulug.duke.edu>\n"
+"Report-Msgid-Bugs-To: <popt-devel@rpm5.org>\n"
 "POT-Creation-Date: 2007-06-14 15:31+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
diff --git a/po/fr.po b/po/fr.po
index 095a4c8..d6671e2 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -11,7 +11,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.11\n"
-"Report-Msgid-Bugs-To: <rpm-devel@lists.dulug.duke.edu>\n"
+"Report-Msgid-Bugs-To: <popt-devel@rpm5.org>\n"
 "POT-Creation-Date: 2007-06-14 15:31+0200\n"
 "PO-Revision-Date: 2003-06-22 23:43+0200\n"
 "Last-Translator: RPM French Translation <rpm-fr@livna.org>\n"
diff --git a/po/gl.po b/po/gl.po
index 53cbf32..0d86e81 100644
--- a/po/gl.po
+++ b/po/gl.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.11\n"
-"Report-Msgid-Bugs-To: <rpm-devel@lists.dulug.duke.edu>\n"
+"Report-Msgid-Bugs-To: <popt-devel@rpm5.org>\n"
 "POT-Creation-Date: 2007-06-14 15:31+0200\n"
 "PO-Revision-Date: 2001-01-17 01:01+0100\n"
 "Last-Translator: Jes�s Bravo �lvarez <jba@pobox.com>\n"
diff --git a/po/hu.po b/po/hu.po
index 442e9cc..03913c9 100644
--- a/po/hu.po
+++ b/po/hu.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.11\n"
-"Report-Msgid-Bugs-To: <rpm-devel@lists.dulug.duke.edu>\n"
+"Report-Msgid-Bugs-To: <popt-devel@rpm5.org>\n"
 "POT-Creation-Date: 2007-06-14 15:31+0200\n"
 "PO-Revision-Date: 2000-08-03 23:26+0200\n"
 "Last-Translator: L�szl� N�meth <nemeth@qwertynet.hu>\n"
diff --git a/po/is.po b/po/is.po
index 7fd5445..c0fcd0f 100644
--- a/po/is.po
+++ b/po/is.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.11\n"
-"Report-Msgid-Bugs-To: <rpm-devel@lists.dulug.duke.edu>\n"
+"Report-Msgid-Bugs-To: <popt-devel@rpm5.org>\n"
 "POT-Creation-Date: 2007-06-14 15:31+0200\n"
 "PO-Revision-Date: 2001-06-08 01:35+0000\n"
 "Last-Translator: Richard Allen <ra@hp.is>\n"
diff --git a/po/ja.po b/po/ja.po
index aad098d..df0babf 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.11\n"
-"Report-Msgid-Bugs-To: <rpm-devel@lists.dulug.duke.edu>\n"
+"Report-Msgid-Bugs-To: <popt-devel@rpm5.org>\n"
 "POT-Creation-Date: 2007-06-14 15:31+0200\n"
 "PO-Revision-Date: 2003--8-25 19:00+0900\n"
 "Last-Translator: Yukihiro Nakai <ynakai@redhat.com>\n"
diff --git a/po/ko.po b/po/ko.po
index 590e298..30408fc 100644
--- a/po/ko.po
+++ b/po/ko.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.11\n"
-"Report-Msgid-Bugs-To: <rpm-devel@lists.dulug.duke.edu>\n"
+"Report-Msgid-Bugs-To: <popt-devel@rpm5.org>\n"
 "POT-Creation-Date: 2007-06-14 15:31+0200\n"
 "PO-Revision-Date: 2001-09-06 20:06+0900\n"
 "Last-Translator: Jong-Hoon Ryu <redhat4u@netian.com>\n"
diff --git a/po/nl.po b/po/nl.po
index a5aa065..98b209e 100644
--- a/po/nl.po
+++ b/po/nl.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.11\n"
-"Report-Msgid-Bugs-To: <rpm-devel@lists.dulug.duke.edu>\n"
+"Report-Msgid-Bugs-To: <popt-devel@rpm5.org>\n"
 "POT-Creation-Date: 2007-06-14 15:31+0200\n"
 "PO-Revision-Date: 2007-06-29 17:38+0200\n"
 "Last-Translator: Tim Van Holder <tim.van.holder@telenet.be>\n"
diff --git a/po/no.po b/po/no.po
index 72c0897..21ccdbb 100644
--- a/po/no.po
+++ b/po/no.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.11\n"
-"Report-Msgid-Bugs-To: <rpm-devel@lists.dulug.duke.edu>\n"
+"Report-Msgid-Bugs-To: <popt-devel@rpm5.org>\n"
 "POT-Creation-Date: 2007-06-14 15:31+0200\n"
 "PO-Revision-Date: 2001-06-27 11:05+0200\n"
 "Last-Translator: Kjartan Maraas <kmaraas@online.no>\n"
diff --git a/po/pl.po b/po/pl.po
index 9dfb971..2891fd9 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.11\n"
-"Report-Msgid-Bugs-To: <rpm-devel@lists.dulug.duke.edu>\n"
+"Report-Msgid-Bugs-To: <popt-devel@rpm5.org>\n"
 "POT-Creation-Date: 2007-06-14 15:31+0200\n"
 "PO-Revision-Date: 2003-06-08 20:32+0200\n"
 "Last-Translator: Jakub Bogusz <qboosh@pld-linux.org>\n"
diff --git a/po/popt.pot b/po/popt.pot
index b8822d6..e2fe552 100644
--- a/po/popt.pot
+++ b/po/popt.pot
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: <rpm-devel@lists.dulug.duke.edu>\n"
+"Report-Msgid-Bugs-To: <popt-devel@rpm5.org>\n"
 "POT-Creation-Date: 2007-06-14 15:31+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
diff --git a/po/pt.po b/po/pt.po
index cdbab09..964f07d 100644
--- a/po/pt.po
+++ b/po/pt.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.11\n"
-"Report-Msgid-Bugs-To: <rpm-devel@lists.dulug.duke.edu>\n"
+"Report-Msgid-Bugs-To: <popt-devel@rpm5.org>\n"
 "POT-Creation-Date: 2007-06-14 15:31+0200\n"
 "PO-Revision-Date: 2002-02-13 18:32+0000\n"
 "Last-Translator: Pedro Morais <morais@kde.org>\n"
diff --git a/po/ro.po b/po/ro.po
index 56d1094..af3742e 100644
--- a/po/ro.po
+++ b/po/ro.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.11\n"
-"Report-Msgid-Bugs-To: <rpm-devel@lists.dulug.duke.edu>\n"
+"Report-Msgid-Bugs-To: <popt-devel@rpm5.org>\n"
 "POT-Creation-Date: 2007-06-14 15:31+0200\n"
 "PO-Revision-Date: 2000-06-14 23:23+EST\n"
 "Last-Translator: Cristian Gafton <gafton@redhat.com>\n"
diff --git a/po/ru.po b/po/ru.po
index b8d8d2c..aa4ca75 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.11\n"
-"Report-Msgid-Bugs-To: <rpm-devel@lists.dulug.duke.edu>\n"
+"Report-Msgid-Bugs-To: <popt-devel@rpm5.org>\n"
 "POT-Creation-Date: 2007-06-14 15:31+0200\n"
 "PO-Revision-Date: 2001-07-05 21:00-0500\n"
 "Last-Translator: Eugene Kanter <eugene@blackcatlinux.com>\n"
diff --git a/po/sk.po b/po/sk.po
index 50598c3..739ae01 100644
--- a/po/sk.po
+++ b/po/sk.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.11\n"
-"Report-Msgid-Bugs-To: <rpm-devel@lists.dulug.duke.edu>\n"
+"Report-Msgid-Bugs-To: <popt-devel@rpm5.org>\n"
 "POT-Creation-Date: 2007-06-14 15:31+0200\n"
 "PO-Revision-Date: 1999-08-04 21:40+0200\n"
 "Last-Translator: Stanislav Meduna <stano@eunet.sk>\n"
diff --git a/po/sl.po b/po/sl.po
index 108390d..d25104c 100644
--- a/po/sl.po
+++ b/po/sl.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.11\n"
-"Report-Msgid-Bugs-To: <rpm-devel@lists.dulug.duke.edu>\n"
+"Report-Msgid-Bugs-To: <popt-devel@rpm5.org>\n"
 "POT-Creation-Date: 2007-06-14 15:31+0200\n"
 "PO-Revision-Date: 2000-09-05 12:30+0200\n"
 "Last-Translator: Roman Maurer <roman.maurer@hermes.si>\n"
diff --git a/po/sv.po b/po/sv.po
index 660fbc4..6bb82dc 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.11\n"
-"Report-Msgid-Bugs-To: <rpm-devel@lists.dulug.duke.edu>\n"
+"Report-Msgid-Bugs-To: <popt-devel@rpm5.org>\n"
 "POT-Creation-Date: 2007-06-14 15:31+0200\n"
 "PO-Revision-Date: 2007-06-12 22:00+0200\n"
 "Last-Translator: G�ran Uddeborg <goeran@uddeborg.se>\n"
diff --git a/po/tr.po b/po/tr.po
index 88c7723..f350402 100644
--- a/po/tr.po
+++ b/po/tr.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.11\n"
-"Report-Msgid-Bugs-To: <rpm-devel@lists.dulug.duke.edu>\n"
+"Report-Msgid-Bugs-To: <popt-devel@rpm5.org>\n"
 "POT-Creation-Date: 2007-06-14 15:31+0200\n"
 "PO-Revision-Date: 2000-02-11 13:01+0200\n"
 "Last-Translator: Nilgun Belma Buguner <nilgun@technologist.com>\n"
diff --git a/po/uk.po b/po/uk.po
index 12e8874..81b1a1e 100644
--- a/po/uk.po
+++ b/po/uk.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.11\n"
-"Report-Msgid-Bugs-To: <rpm-devel@lists.dulug.duke.edu>\n"
+"Report-Msgid-Bugs-To: <popt-devel@rpm5.org>\n"
 "POT-Creation-Date: 2007-06-14 15:31+0200\n"
 "PO-Revision-Date: 1999-09-30 16:54+0200\n"
 "Last-Translator: Yuri Syrota <rasta@renome.rovno.ua>\n"
diff --git a/po/vi.po b/po/vi.po
index b4fb3fb..6d314e5 100644
--- a/po/vi.po
+++ b/po/vi.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.11\n"
-"Report-Msgid-Bugs-To: <rpm-devel@lists.dulug.duke.edu>\n"
+"Report-Msgid-Bugs-To: <popt-devel@rpm5.org>\n"
 "POT-Creation-Date: 2007-06-14 15:31+0200\n"
 "PO-Revision-Date: 2007-07-12 22:37+0930\n"
 "Last-Translator: Clytie Siddall <clytie@riverland.net.au>\n"
diff --git a/po/wa.po b/po/wa.po
index 191270f..5230622 100644
--- a/po/wa.po
+++ b/po/wa.po
@@ -9,7 +9,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.11\n"
-"Report-Msgid-Bugs-To: <rpm-devel@lists.dulug.duke.edu>\n"
+"Report-Msgid-Bugs-To: <popt-devel@rpm5.org>\n"
 "POT-Creation-Date: 2007-06-14 15:31+0200\n"
 "PO-Revision-Date: 1999-03-18 23:11+0100\n"
 "Last-Translator: Nobody yet\n"
-- 
Gitee


From 68d4cbfb80e169f2065d972bc312c10db04e55eb Mon Sep 17 00:00:00 2001
From: Jeff Johnson <n3npq@mac.com>
Date: Sun, 15 Jul 2007 02:00:28 +0000
Subject: [PATCH 453/667] remove unused archive Makefile target.

---
 Makefile.am | 19 -------------------
 1 file changed, 19 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index c79f301..d02acfa 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -60,25 +60,6 @@ sources:
 lint:
 	$(LINT) ${DEFS} ${INCLUDES} test1.c ${libpopt_la_SOURCES}
 
-CVSTAG = $(PACKAGE)-$(subst .,_,$(VERSION))
-
-.PHONY: archive
-archive: 
-	@echo "This is $(PACKAGE)-$(VERSION)."
-	@sleep 5
-	@cvs -Q tag -F $(CVSTAG) .
-	@rm -rf /tmp/$(PACKAGE)-$(VERSION) /tmp/$(PACKAGE)
-	@cd /tmp; cvs -Q -d $(CVSROOT) export -r$(CVSTAG) $(PACKAGE) || :
-	@mv /tmp/$(PACKAGE) /tmp/$(PACKAGE)-$(VERSION)
-	@cd /tmp/$(PACKAGE)-$(VERSION); ./autogen.sh ; make depend; make distclean
-	@cd /tmp/$(PACKAGE)-$(VERSION); ./autogen.sh --noconfigure
-	@cd /tmp; tar czSpf $(PACKAGE)-$(VERSION).tar.gz $(PACKAGE)-$(VERSION)
-	@rm -rf /tmp/$(PACKAGE)-$(VERSION)
-	@cp /tmp/$(PACKAGE)-$(VERSION).tar.gz .
-	@rm -f /tmp/$(PACKAGE)-$(VERSION).tar.gz 
-	@echo " "
-	@echo "The final archive is ./$(PACKAGE)-$(VERSION).tar.gz."
-
 .PHONY: doxygen
 doxygen: Doxyfile
 	rm -rf doxygen
-- 
Gitee


From 3774a4c8ccf0b90437b50fad2862ee2ab1a600be Mon Sep 17 00:00:00 2001
From: Jeff Johnson <n3npq@mac.com>
Date: Tue, 17 Jul 2007 05:49:55 +0000
Subject: [PATCH 454/667] add 2 new locales.

---
 configure.ac | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/configure.ac b/configure.ac
index 8d0d650..b78a8f8 100755
--- a/configure.ac
+++ b/configure.ac
@@ -14,7 +14,7 @@ AC_SUBST(LT_AGE, 8)
 
 AM_INIT_AUTOMAKE([foreign])
 
-ALL_LINGUAS="cs da de es eu_ES fr gl hu is ja ko no pl pt ro ru sk sl sv tr uk vi wa"
+ALL_LINGUAS="cs da de es eu_ES fr gl hu is ja ko nl no pl pt ro ru sk sl sv tr uk vi wa"
 
 AC_PROG_CC
 AC_PROG_INSTALL
-- 
Gitee


From 05eb583c83920a31da648241af95ccb9c1da6c3f Mon Sep 17 00:00:00 2001
From: Arkadiusz Miskiewicz <arekm@pld-linux.org>
Date: Tue, 17 Jul 2007 06:28:32 +0000
Subject: [PATCH 455/667] Drop - empty.

---
 po/eu_ES.po | 125 ----------------------------------------------------
 1 file changed, 125 deletions(-)
 delete mode 100644 po/eu_ES.po

diff --git a/po/eu_ES.po b/po/eu_ES.po
deleted file mode 100644
index 6006f8e..0000000
--- a/po/eu_ES.po
+++ /dev/null
@@ -1,125 +0,0 @@
-# SOME DESCRIPTIVE TITLE.
-# Copyright (C) YEAR Free Software Foundation, Inc.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#
-#, fuzzy
-msgid ""
-msgstr ""
-"Project-Id-Version: popt 1.11\n"
-"Report-Msgid-Bugs-To: <popt-devel@rpm5.org>\n"
-"POT-Creation-Date: 2007-06-14 15:31+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: ENCODING\n"
-
-#: popt.c:35
-msgid "unknown errno"
-msgstr ""
-
-#: popt.c:1002
-#, c-format
-msgid "option type (%d) not implemented in popt\n"
-msgstr ""
-
-#: popt.c:1215
-msgid "missing argument"
-msgstr ""
-
-#: popt.c:1217
-msgid "unknown option"
-msgstr ""
-
-#: popt.c:1219
-msgid "mutually exclusive logical operations requested"
-msgstr ""
-
-#: popt.c:1221
-msgid "opt->arg should not be NULL"
-msgstr ""
-
-#: popt.c:1223
-msgid "aliases nested too deeply"
-msgstr ""
-
-#: popt.c:1225
-msgid "error in parameter quoting"
-msgstr ""
-
-#: popt.c:1227
-msgid "invalid numeric value"
-msgstr ""
-
-#: popt.c:1229
-msgid "number too large or too small"
-msgstr ""
-
-#: popt.c:1231
-msgid "memory allocation failed"
-msgstr ""
-
-#: popt.c:1235
-msgid "unknown error"
-msgstr ""
-
-#: popt.h:172
-msgid "Options implemented via popt alias/exec:"
-msgstr ""
-
-#: popt.h:188
-msgid "Help options:"
-msgstr ""
-
-#: popthelp.c:68 popthelp.c:79
-msgid "Show this help message"
-msgstr ""
-
-#: popthelp.c:69 popthelp.c:80
-msgid "Display brief usage message"
-msgstr ""
-
-#: popthelp.c:83
-msgid "Display option defaults in message"
-msgstr ""
-
-#: popthelp.c:128
-msgid "NONE"
-msgstr ""
-
-#: popthelp.c:130
-msgid "VAL"
-msgstr ""
-
-#: popthelp.c:134
-msgid "INT"
-msgstr ""
-
-#: popthelp.c:135
-msgid "LONG"
-msgstr ""
-
-#: popthelp.c:136
-msgid "STRING"
-msgstr ""
-
-#: popthelp.c:137
-msgid "FLOAT"
-msgstr ""
-
-#: popthelp.c:138
-msgid "DOUBLE"
-msgstr ""
-
-#: popthelp.c:139
-msgid "ARG"
-msgstr ""
-
-#: popthelp.c:552
-msgid "Usage:"
-msgstr ""
-
-#: popthelp.c:576
-msgid "[OPTION...]"
-msgstr ""
-- 
Gitee


From cb7227bc3d587571aadc062df6266fa8d6e90b68 Mon Sep 17 00:00:00 2001
From: Arkadiusz Miskiewicz <arekm@pld-linux.org>
Date: Tue, 17 Jul 2007 06:30:14 +0000
Subject: [PATCH 456/667] Drop eu_ES (was empty).

---
 configure.ac | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/configure.ac b/configure.ac
index b78a8f8..4566d41 100755
--- a/configure.ac
+++ b/configure.ac
@@ -14,7 +14,7 @@ AC_SUBST(LT_AGE, 8)
 
 AM_INIT_AUTOMAKE([foreign])
 
-ALL_LINGUAS="cs da de es eu_ES fr gl hu is ja ko nl no pl pt ro ru sk sl sv tr uk vi wa"
+ALL_LINGUAS="cs da de es fr gl hu is ja ko nl no pl pt ro ru sk sl sv tr uk vi wa"
 
 AC_PROG_CC
 AC_PROG_INSTALL
-- 
Gitee


From 7bfce2965030f1b79e8f1c6e3594d15a7e3457b8 Mon Sep 17 00:00:00 2001
From: Arkadiusz Miskiewicz <arekm@pld-linux.org>
Date: Tue, 17 Jul 2007 06:34:59 +0000
Subject: [PATCH 457/667] nb (Norwegian Bookmal) is proper lang code

---
 configure.ac        | 2 +-
 po/{no.po => nb.po} | 0
 2 files changed, 1 insertion(+), 1 deletion(-)
 rename po/{no.po => nb.po} (100%)

diff --git a/configure.ac b/configure.ac
index 4566d41..0dadc9a 100755
--- a/configure.ac
+++ b/configure.ac
@@ -14,7 +14,7 @@ AC_SUBST(LT_AGE, 8)
 
 AM_INIT_AUTOMAKE([foreign])
 
-ALL_LINGUAS="cs da de es fr gl hu is ja ko nl no pl pt ro ru sk sl sv tr uk vi wa"
+ALL_LINGUAS="cs da de es fr gl hu is ja ko nl nb pl pt ro ru sk sl sv tr uk vi wa"
 
 AC_PROG_CC
 AC_PROG_INSTALL
diff --git a/po/no.po b/po/nb.po
similarity index 100%
rename from po/no.po
rename to po/nb.po
-- 
Gitee


From 282738d9cc724667ebcb8456cfba25cda1cec140 Mon Sep 17 00:00:00 2001
From: Jeff Johnson <n3npq@mac.com>
Date: Wed, 8 Aug 2007 15:44:35 +0000
Subject: [PATCH 458/667] add ga.po.

---
 configure.ac |   2 +-
 po/cs.po     |   4 +-
 po/da.po     |   4 +-
 po/de.po     |   4 +-
 po/es.po     |   4 +-
 po/fr.po     |   4 +-
 po/ga.po     | 124 +++++++++++++++++++++++++++++++++++++++++++++++++++
 po/gl.po     |   4 +-
 po/hu.po     |   4 +-
 po/is.po     |   4 +-
 po/ja.po     |   4 +-
 po/ko.po     |   4 +-
 po/nb.po     |   4 +-
 po/nl.po     |   4 +-
 po/pl.po     |   4 +-
 po/popt.pot  |   4 +-
 po/pt.po     |   4 +-
 po/ro.po     |   4 +-
 po/ru.po     |   4 +-
 po/sk.po     |   4 +-
 po/sl.po     |   4 +-
 po/sv.po     |   4 +-
 po/tr.po     |   4 +-
 po/uk.po     |   4 +-
 po/vi.po     |   4 +-
 po/wa.po     |   4 +-
 26 files changed, 173 insertions(+), 49 deletions(-)
 create mode 100644 po/ga.po

diff --git a/configure.ac b/configure.ac
index 0dadc9a..a292b06 100755
--- a/configure.ac
+++ b/configure.ac
@@ -14,7 +14,7 @@ AC_SUBST(LT_AGE, 8)
 
 AM_INIT_AUTOMAKE([foreign])
 
-ALL_LINGUAS="cs da de es fr gl hu is ja ko nl nb pl pt ro ru sk sl sv tr uk vi wa"
+ALL_LINGUAS="cs da de es fr ga gl hu is ja ko nl nb pl pt ro ru sk sl sv tr uk vi wa"
 
 AC_PROG_CC
 AC_PROG_INSTALL
diff --git a/po/cs.po b/po/cs.po
index 82f9a0c..5a7ecaf 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -1,8 +1,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.11\n"
-"Report-Msgid-Bugs-To: <popt-devel@rpm5.org>\n"
-"POT-Creation-Date: 2007-06-14 15:31+0200\n"
+"Report-Msgid-Bugs-To: <rpm-devel@lists.dulug.duke.edu>\n"
+"POT-Creation-Date: 2007-08-08 11:39-0400\n"
 "PO-Revision-Date: 2001-07-24 00:03+0100\n"
 "Last-Translator: Milan Kerslager <kerslage@linux.cz>\n"
 "Language-Team: Czech <cs@li.org>\n"
diff --git a/po/da.po b/po/da.po
index 6d0a9e1..25c0c2e 100644
--- a/po/da.po
+++ b/po/da.po
@@ -1,8 +1,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.11\n"
-"Report-Msgid-Bugs-To: <popt-devel@rpm5.org>\n"
-"POT-Creation-Date: 2007-06-14 15:31+0200\n"
+"Report-Msgid-Bugs-To: <rpm-devel@lists.dulug.duke.edu>\n"
+"POT-Creation-Date: 2007-08-08 11:39-0400\n"
 "PO-Revision-Date: Sun Jan 21 2001 04:30:32+0200\n"
 "Last-Translator: Martin Hansen <mah@k64.dk>\n"
 "Language-Team: Dansk <dansk@klid.dk>\n"
diff --git a/po/de.po b/po/de.po
index ce2f7e9..7fa18be 100644
--- a/po/de.po
+++ b/po/de.po
@@ -5,8 +5,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.11\n"
-"Report-Msgid-Bugs-To: <popt-devel@rpm5.org>\n"
-"POT-Creation-Date: 2007-06-14 15:31+0200\n"
+"Report-Msgid-Bugs-To: <rpm-devel@lists.dulug.duke.edu>\n"
+"POT-Creation-Date: 2007-08-08 11:39-0400\n"
 "PO-Revision-Date: 2007-02-17 21:00+0100\n"
 "Last-Translator: Robert Scheck <rpm@robert-scheck.de>\n"
 "Language-Team: German <de@li.org>\n"
diff --git a/po/es.po b/po/es.po
index 97380d2..94cd00a 100644
--- a/po/es.po
+++ b/po/es.po
@@ -6,8 +6,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.11\n"
-"Report-Msgid-Bugs-To: <popt-devel@rpm5.org>\n"
-"POT-Creation-Date: 2007-06-14 15:31+0200\n"
+"Report-Msgid-Bugs-To: <rpm-devel@lists.dulug.duke.edu>\n"
+"POT-Creation-Date: 2007-08-08 11:39-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Leandro Lucarella <luca@linuxmendoza.org.ar>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/po/fr.po b/po/fr.po
index d6671e2..5f83128 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -11,8 +11,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.11\n"
-"Report-Msgid-Bugs-To: <popt-devel@rpm5.org>\n"
-"POT-Creation-Date: 2007-06-14 15:31+0200\n"
+"Report-Msgid-Bugs-To: <rpm-devel@lists.dulug.duke.edu>\n"
+"POT-Creation-Date: 2007-08-08 11:39-0400\n"
 "PO-Revision-Date: 2003-06-22 23:43+0200\n"
 "Last-Translator: RPM French Translation <rpm-fr@livna.org>\n"
 "Language-Team: RPM French Translation <rpm-fr@livna.org>\n"
diff --git a/po/ga.po b/po/ga.po
new file mode 100644
index 0000000..3c1bd11
--- /dev/null
+++ b/po/ga.po
@@ -0,0 +1,124 @@
+# Irish translations for popt.
+# This file is put in the public domain.
+# Kevin Scannell <kscanne@gmail.com>, 2007.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: popt 1.11\n"
+"Report-Msgid-Bugs-To: <rpm-devel@lists.dulug.duke.edu>\n"
+"POT-Creation-Date: 2007-08-08 11:39-0400\n"
+"PO-Revision-Date: 2007-06-19 06:21-0500\n"
+"Last-Translator: Kevin Scannell <kscanne@gmail.com>\n"
+"Language-Team: Irish <gaeilge-gnulinux@lists.sourceforge.net>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#: popt.c:35
+msgid "unknown errno"
+msgstr "errno anaithnid"
+
+#: popt.c:1002
+#, c-format
+msgid "option type (%d) not implemented in popt\n"
+msgstr "níl an cineál rogha seo (%d) ar fáil i popt\n"
+
+#: popt.c:1215
+msgid "missing argument"
+msgstr "argóint ar iarraidh"
+
+#: popt.c:1217
+msgid "unknown option"
+msgstr "rogha anaithnid"
+
+#: popt.c:1219
+msgid "mutually exclusive logical operations requested"
+msgstr "iarradh oibríochtaí loighciúla comheisiacha"
+
+#: popt.c:1221
+msgid "opt->arg should not be NULL"
+msgstr "níor chóir rogha->arg a bheith NULL"
+
+#: popt.c:1223
+msgid "aliases nested too deeply"
+msgstr "ailiasanna neadaithe ródhomhain"
+
+#: popt.c:1225
+msgid "error in parameter quoting"
+msgstr "earráid agus paraiméadar á chur faoi chomharthaí athfhriotail"
+
+#: popt.c:1227
+msgid "invalid numeric value"
+msgstr "luach neamhbhailí uimhriúil"
+
+#: popt.c:1229
+msgid "number too large or too small"
+msgstr "uimhir rómhór nó róbheag"
+
+#: popt.c:1231
+msgid "memory allocation failed"
+msgstr "theip ar dháileadh na cuimhne"
+
+#: popt.c:1235
+msgid "unknown error"
+msgstr "earráid anaithnid"
+
+#: popt.h:172
+msgid "Options implemented via popt alias/exec:"
+msgstr "Roghanna a cuireadh i bhfeidhm trí ailias/exec popt:"
+
+#: popt.h:188
+msgid "Help options:"
+msgstr "Roghanna cabhracha:"
+
+#: popthelp.c:68 popthelp.c:79
+msgid "Show this help message"
+msgstr "Taispeáin an chabhair seo"
+
+#: popthelp.c:69 popthelp.c:80
+msgid "Display brief usage message"
+msgstr "Taispeáin beagán eolais faoin úsáid"
+
+#: popthelp.c:83
+msgid "Display option defaults in message"
+msgstr "Taispeáin luachanna réamhshocraithe na roghanna sa teachtaireacht"
+
+#: popthelp.c:128
+msgid "NONE"
+msgstr "NEAMHNÍ"
+
+#: popthelp.c:130
+msgid "VAL"
+msgstr "LUACH"
+
+#: popthelp.c:134
+msgid "INT"
+msgstr "INT"
+
+#: popthelp.c:135
+msgid "LONG"
+msgstr "LONG"
+
+#: popthelp.c:136
+msgid "STRING"
+msgstr "STRING"
+
+#: popthelp.c:137
+msgid "FLOAT"
+msgstr "FLOAT"
+
+#: popthelp.c:138
+msgid "DOUBLE"
+msgstr "DOUBLE"
+
+#: popthelp.c:139
+msgid "ARG"
+msgstr "ARG"
+
+#: popthelp.c:552
+msgid "Usage:"
+msgstr "Úsáid:"
+
+#: popthelp.c:576
+msgid "[OPTION...]"
+msgstr "[ROGHA...]"
diff --git a/po/gl.po b/po/gl.po
index 0d86e81..baa5c75 100644
--- a/po/gl.po
+++ b/po/gl.po
@@ -1,8 +1,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.11\n"
-"Report-Msgid-Bugs-To: <popt-devel@rpm5.org>\n"
-"POT-Creation-Date: 2007-06-14 15:31+0200\n"
+"Report-Msgid-Bugs-To: <rpm-devel@lists.dulug.duke.edu>\n"
+"POT-Creation-Date: 2007-08-08 11:39-0400\n"
 "PO-Revision-Date: 2001-01-17 01:01+0100\n"
 "Last-Translator: Jes�s Bravo �lvarez <jba@pobox.com>\n"
 "Language-Team: Galician <trasno@ceu.fi.udc.es>\n"
diff --git a/po/hu.po b/po/hu.po
index 03913c9..9b2beeb 100644
--- a/po/hu.po
+++ b/po/hu.po
@@ -1,8 +1,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.11\n"
-"Report-Msgid-Bugs-To: <popt-devel@rpm5.org>\n"
-"POT-Creation-Date: 2007-06-14 15:31+0200\n"
+"Report-Msgid-Bugs-To: <rpm-devel@lists.dulug.duke.edu>\n"
+"POT-Creation-Date: 2007-08-08 11:39-0400\n"
 "PO-Revision-Date: 2000-08-03 23:26+0200\n"
 "Last-Translator: L�szl� N�meth <nemeth@qwertynet.hu>\n"
 "Language-Team: Hungarian\n"
diff --git a/po/is.po b/po/is.po
index c0fcd0f..2e648a4 100644
--- a/po/is.po
+++ b/po/is.po
@@ -1,8 +1,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.11\n"
-"Report-Msgid-Bugs-To: <popt-devel@rpm5.org>\n"
-"POT-Creation-Date: 2007-06-14 15:31+0200\n"
+"Report-Msgid-Bugs-To: <rpm-devel@lists.dulug.duke.edu>\n"
+"POT-Creation-Date: 2007-08-08 11:39-0400\n"
 "PO-Revision-Date: 2001-06-08 01:35+0000\n"
 "Last-Translator: Richard Allen <ra@hp.is>\n"
 "Language-Team: is <kde-isl@mmedia.is>\n"
diff --git a/po/ja.po b/po/ja.po
index df0babf..90a0fb5 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -5,8 +5,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.11\n"
-"Report-Msgid-Bugs-To: <popt-devel@rpm5.org>\n"
-"POT-Creation-Date: 2007-06-14 15:31+0200\n"
+"Report-Msgid-Bugs-To: <rpm-devel@lists.dulug.duke.edu>\n"
+"POT-Creation-Date: 2007-08-08 11:39-0400\n"
 "PO-Revision-Date: 2003--8-25 19:00+0900\n"
 "Last-Translator: Yukihiro Nakai <ynakai@redhat.com>\n"
 "Language-Team: Japanese <ja@li.org>\n"
diff --git a/po/ko.po b/po/ko.po
index 30408fc..acbbe5c 100644
--- a/po/ko.po
+++ b/po/ko.po
@@ -1,8 +1,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.11\n"
-"Report-Msgid-Bugs-To: <popt-devel@rpm5.org>\n"
-"POT-Creation-Date: 2007-06-14 15:31+0200\n"
+"Report-Msgid-Bugs-To: <rpm-devel@lists.dulug.duke.edu>\n"
+"POT-Creation-Date: 2007-08-08 11:39-0400\n"
 "PO-Revision-Date: 2001-09-06 20:06+0900\n"
 "Last-Translator: Jong-Hoon Ryu <redhat4u@netian.com>\n"
 "Language-Team: GNU Translation project <ko@li.org>\n"
diff --git a/po/nb.po b/po/nb.po
index 21ccdbb..5da8387 100644
--- a/po/nb.po
+++ b/po/nb.po
@@ -1,8 +1,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.11\n"
-"Report-Msgid-Bugs-To: <popt-devel@rpm5.org>\n"
-"POT-Creation-Date: 2007-06-14 15:31+0200\n"
+"Report-Msgid-Bugs-To: <rpm-devel@lists.dulug.duke.edu>\n"
+"POT-Creation-Date: 2007-08-08 11:39-0400\n"
 "PO-Revision-Date: 2001-06-27 11:05+0200\n"
 "Last-Translator: Kjartan Maraas <kmaraas@online.no>\n"
 "Language-Team: Norwegian <no@li.org>\n"
diff --git a/po/nl.po b/po/nl.po
index 98b209e..e0ea223 100644
--- a/po/nl.po
+++ b/po/nl.po
@@ -5,8 +5,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.11\n"
-"Report-Msgid-Bugs-To: <popt-devel@rpm5.org>\n"
-"POT-Creation-Date: 2007-06-14 15:31+0200\n"
+"Report-Msgid-Bugs-To: <rpm-devel@lists.dulug.duke.edu>\n"
+"POT-Creation-Date: 2007-08-08 11:39-0400\n"
 "PO-Revision-Date: 2007-06-29 17:38+0200\n"
 "Last-Translator: Tim Van Holder <tim.van.holder@telenet.be>\n"
 "Language-Team: Dutch <vertaling@vrijschrift.org>\n"
diff --git a/po/pl.po b/po/pl.po
index 2891fd9..b9887e0 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -5,8 +5,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.11\n"
-"Report-Msgid-Bugs-To: <popt-devel@rpm5.org>\n"
-"POT-Creation-Date: 2007-06-14 15:31+0200\n"
+"Report-Msgid-Bugs-To: <rpm-devel@lists.dulug.duke.edu>\n"
+"POT-Creation-Date: 2007-08-08 11:39-0400\n"
 "PO-Revision-Date: 2003-06-08 20:32+0200\n"
 "Last-Translator: Jakub Bogusz <qboosh@pld-linux.org>\n"
 "Language-Team: Polish <translation-team-pl@lists.sourceforge.net>\n"
diff --git a/po/popt.pot b/po/popt.pot
index e2fe552..b0843d8 100644
--- a/po/popt.pot
+++ b/po/popt.pot
@@ -6,8 +6,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: <popt-devel@rpm5.org>\n"
-"POT-Creation-Date: 2007-06-14 15:31+0200\n"
+"Report-Msgid-Bugs-To: <rpm-devel@lists.dulug.duke.edu>\n"
+"POT-Creation-Date: 2007-08-08 11:39-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/po/pt.po b/po/pt.po
index 964f07d..ae3f4ce 100644
--- a/po/pt.po
+++ b/po/pt.po
@@ -1,8 +1,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.11\n"
-"Report-Msgid-Bugs-To: <popt-devel@rpm5.org>\n"
-"POT-Creation-Date: 2007-06-14 15:31+0200\n"
+"Report-Msgid-Bugs-To: <rpm-devel@lists.dulug.duke.edu>\n"
+"POT-Creation-Date: 2007-08-08 11:39-0400\n"
 "PO-Revision-Date: 2002-02-13 18:32+0000\n"
 "Last-Translator: Pedro Morais <morais@kde.org>\n"
 "Language-Team: pt <morais@kde.org>\n"
diff --git a/po/ro.po b/po/ro.po
index af3742e..4194dc7 100644
--- a/po/ro.po
+++ b/po/ro.po
@@ -1,8 +1,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.11\n"
-"Report-Msgid-Bugs-To: <popt-devel@rpm5.org>\n"
-"POT-Creation-Date: 2007-06-14 15:31+0200\n"
+"Report-Msgid-Bugs-To: <rpm-devel@lists.dulug.duke.edu>\n"
+"POT-Creation-Date: 2007-08-08 11:39-0400\n"
 "PO-Revision-Date: 2000-06-14 23:23+EST\n"
 "Last-Translator: Cristian Gafton <gafton@redhat.com>\n"
 "Language-Team: Romanian <ro@li.org>\n"
diff --git a/po/ru.po b/po/ru.po
index aa4ca75..838426e 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -1,8 +1,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.11\n"
-"Report-Msgid-Bugs-To: <popt-devel@rpm5.org>\n"
-"POT-Creation-Date: 2007-06-14 15:31+0200\n"
+"Report-Msgid-Bugs-To: <rpm-devel@lists.dulug.duke.edu>\n"
+"POT-Creation-Date: 2007-08-08 11:39-0400\n"
 "PO-Revision-Date: 2001-07-05 21:00-0500\n"
 "Last-Translator: Eugene Kanter <eugene@blackcatlinux.com>\n"
 "Language-Team: Black Cat Linux Team <blackcat-support@blackcatlinux.com>\n"
diff --git a/po/sk.po b/po/sk.po
index 739ae01..a9261c6 100644
--- a/po/sk.po
+++ b/po/sk.po
@@ -5,8 +5,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.11\n"
-"Report-Msgid-Bugs-To: <popt-devel@rpm5.org>\n"
-"POT-Creation-Date: 2007-06-14 15:31+0200\n"
+"Report-Msgid-Bugs-To: <rpm-devel@lists.dulug.duke.edu>\n"
+"POT-Creation-Date: 2007-08-08 11:39-0400\n"
 "PO-Revision-Date: 1999-08-04 21:40+0200\n"
 "Last-Translator: Stanislav Meduna <stano@eunet.sk>\n"
 "Language-Team: Slovak <sk-i18n@rak.isternet.sk>\n"
diff --git a/po/sl.po b/po/sl.po
index d25104c..a712338 100644
--- a/po/sl.po
+++ b/po/sl.po
@@ -1,8 +1,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.11\n"
-"Report-Msgid-Bugs-To: <popt-devel@rpm5.org>\n"
-"POT-Creation-Date: 2007-06-14 15:31+0200\n"
+"Report-Msgid-Bugs-To: <rpm-devel@lists.dulug.duke.edu>\n"
+"POT-Creation-Date: 2007-08-08 11:39-0400\n"
 "PO-Revision-Date: 2000-09-05 12:30+0200\n"
 "Last-Translator: Roman Maurer <roman.maurer@hermes.si>\n"
 "Language-Team: Slovenian <sl@li.org>\n"
diff --git a/po/sv.po b/po/sv.po
index 6bb82dc..1a4ad3a 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -1,8 +1,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.11\n"
-"Report-Msgid-Bugs-To: <popt-devel@rpm5.org>\n"
-"POT-Creation-Date: 2007-06-14 15:31+0200\n"
+"Report-Msgid-Bugs-To: <rpm-devel@lists.dulug.duke.edu>\n"
+"POT-Creation-Date: 2007-08-08 11:39-0400\n"
 "PO-Revision-Date: 2007-06-12 22:00+0200\n"
 "Last-Translator: G�ran Uddeborg <goeran@uddeborg.se>\n"
 "Language-Team: Swedish <tp-sv@listor.tp-sv.se>\n"
diff --git a/po/tr.po b/po/tr.po
index f350402..977000b 100644
--- a/po/tr.po
+++ b/po/tr.po
@@ -1,8 +1,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.11\n"
-"Report-Msgid-Bugs-To: <popt-devel@rpm5.org>\n"
-"POT-Creation-Date: 2007-06-14 15:31+0200\n"
+"Report-Msgid-Bugs-To: <rpm-devel@lists.dulug.duke.edu>\n"
+"POT-Creation-Date: 2007-08-08 11:39-0400\n"
 "PO-Revision-Date: 2000-02-11 13:01+0200\n"
 "Last-Translator: Nilgun Belma Buguner <nilgun@technologist.com>\n"
 "Language-Team: Turkish <tr@li.org>\n"
diff --git a/po/uk.po b/po/uk.po
index 81b1a1e..81bd4b6 100644
--- a/po/uk.po
+++ b/po/uk.po
@@ -5,8 +5,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.11\n"
-"Report-Msgid-Bugs-To: <popt-devel@rpm5.org>\n"
-"POT-Creation-Date: 2007-06-14 15:31+0200\n"
+"Report-Msgid-Bugs-To: <rpm-devel@lists.dulug.duke.edu>\n"
+"POT-Creation-Date: 2007-08-08 11:39-0400\n"
 "PO-Revision-Date: 1999-09-30 16:54+0200\n"
 "Last-Translator: Yuri Syrota <rasta@renome.rovno.ua>\n"
 "Language-Team: Ukrainian <uk@li.org>\n"
diff --git a/po/vi.po b/po/vi.po
index 6d314e5..3070198 100644
--- a/po/vi.po
+++ b/po/vi.po
@@ -5,8 +5,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.11\n"
-"Report-Msgid-Bugs-To: <popt-devel@rpm5.org>\n"
-"POT-Creation-Date: 2007-06-14 15:31+0200\n"
+"Report-Msgid-Bugs-To: <rpm-devel@lists.dulug.duke.edu>\n"
+"POT-Creation-Date: 2007-08-08 11:39-0400\n"
 "PO-Revision-Date: 2007-07-12 22:37+0930\n"
 "Last-Translator: Clytie Siddall <clytie@riverland.net.au>\n"
 "Language-Team: Vietnamese <vi-VN@googlegroups.com>\n"
diff --git a/po/wa.po b/po/wa.po
index 5230622..cb94591 100644
--- a/po/wa.po
+++ b/po/wa.po
@@ -9,8 +9,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.11\n"
-"Report-Msgid-Bugs-To: <popt-devel@rpm5.org>\n"
-"POT-Creation-Date: 2007-06-14 15:31+0200\n"
+"Report-Msgid-Bugs-To: <rpm-devel@lists.dulug.duke.edu>\n"
+"POT-Creation-Date: 2007-08-08 11:39-0400\n"
 "PO-Revision-Date: 1999-03-18 23:11+0100\n"
 "Last-Translator: Nobody yet\n"
 "Language-Team: walon <linux-wa@chanae.alphanet.ch>\n"
-- 
Gitee


From a86d2c89d189a6fabb8c608c352fac023e31596c Mon Sep 17 00:00:00 2001
From: Jeff Johnson <n3npq@mac.com>
Date: Sat, 11 Aug 2007 15:52:16 +0000
Subject: [PATCH 459/667] - use PACKAGE_BUGREPORT. - hotwire
 POPT_AUTOHELP/POPT_AUTOALIAS lookup in popt i18n domain.

---
 CHANGES      |  4 ++++
 configure.ac |  2 +-
 po/Makevars  |  2 +-
 po/cs.po     | 26 +++++++++++++-------------
 po/da.po     | 26 +++++++++++++-------------
 po/de.po     | 26 +++++++++++++-------------
 po/es.po     | 26 +++++++++++++-------------
 po/fr.po     | 26 +++++++++++++-------------
 po/ga.po     | 26 +++++++++++++-------------
 po/gl.po     | 26 +++++++++++++-------------
 po/hu.po     | 26 +++++++++++++-------------
 po/is.po     | 26 +++++++++++++-------------
 po/ja.po     | 26 +++++++++++++-------------
 po/ko.po     | 26 +++++++++++++-------------
 po/nb.po     | 26 +++++++++++++-------------
 po/nl.po     | 26 +++++++++++++-------------
 po/pl.po     | 26 +++++++++++++-------------
 po/popt.pot  | 24 ++++++++++++------------
 po/pt.po     | 26 +++++++++++++-------------
 po/ro.po     | 26 +++++++++++++-------------
 po/ru.po     | 26 +++++++++++++-------------
 po/sk.po     | 26 +++++++++++++-------------
 po/sl.po     | 26 +++++++++++++-------------
 po/sv.po     | 26 +++++++++++++-------------
 po/tr.po     | 26 +++++++++++++-------------
 po/uk.po     | 26 +++++++++++++-------------
 po/vi.po     | 26 +++++++++++++-------------
 po/wa.po     | 26 +++++++++++++-------------
 popthelp.c   | 15 +++++++++++----
 29 files changed, 341 insertions(+), 330 deletions(-)

diff --git a/CHANGES b/CHANGES
index 220cf2e..716d17c 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,7 @@
+1.12 -> 1.13:
+   - jbj: use PACKAGE_BUGREPORT.
+   - jbj: hotwire POPT_AUTOHELP/POPT_AUTOALIAS lookup in popt i18n domain.
+
 1.11 -> 1.12
     - jbj: plug a memory leak.
     - jbj: fix index thinko.
diff --git a/configure.ac b/configure.ac
index a292b06..320628e 100755
--- a/configure.ac
+++ b/configure.ac
@@ -14,7 +14,7 @@ AC_SUBST(LT_AGE, 8)
 
 AM_INIT_AUTOMAKE([foreign])
 
-ALL_LINGUAS="cs da de es fr ga gl hu is ja ko nl nb pl pt ro ru sk sl sv tr uk vi wa"
+ALL_LINGUAS="cs da de es fr ga gl hu is ja ko nb nl nb pl pt ro ru sk sl sv tr uk vi wa"
 
 AC_PROG_CC
 AC_PROG_INSTALL
diff --git a/po/Makevars b/po/Makevars
index 3e0de10..8e5083e 100644
--- a/po/Makevars
+++ b/po/Makevars
@@ -34,7 +34,7 @@ COPYRIGHT_HOLDER =
 # It can be your email address, or a mailing list address where translators
 # can write to without being subscribed, or the URL of a web page through
 # which the translators can contact you.
-MSGID_BUGS_ADDRESS = <rpm-devel@lists.dulug.duke.edu>
+MSGID_BUGS_ADDRESS = <popt-devel@rpm5.org>
 
 # This is the list of locale categories, beyond LC_MESSAGES, for which the
 # message catalogs shall be used.  It is usually empty.
diff --git a/po/cs.po b/po/cs.po
index 5a7ecaf..8f9c71e 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -1,8 +1,8 @@
 msgid ""
 msgstr ""
-"Project-Id-Version: popt 1.11\n"
-"Report-Msgid-Bugs-To: <rpm-devel@lists.dulug.duke.edu>\n"
-"POT-Creation-Date: 2007-08-08 11:39-0400\n"
+"Project-Id-Version: popt 1.12\n"
+"Report-Msgid-Bugs-To: <popt-devel@rpm5.org>\n"
+"POT-Creation-Date: 2007-08-11 11:32-0400\n"
 "PO-Revision-Date: 2001-07-24 00:03+0100\n"
 "Last-Translator: Milan Kerslager <kerslage@linux.cz>\n"
 "Language-Team: Czech <cs@li.org>\n"
@@ -79,42 +79,42 @@ msgstr "Vyp
 msgid "Display option defaults in message"
 msgstr "Zobrazit implicitn� volby ve zpr�v�"
 
-#: popthelp.c:128
+#: popthelp.c:135
 msgid "NONE"
 msgstr "NONE"
 
-#: popthelp.c:130
+#: popthelp.c:137
 msgid "VAL"
 msgstr "VAL"
 
-#: popthelp.c:134
+#: popthelp.c:141
 msgid "INT"
 msgstr "INT"
 
-#: popthelp.c:135
+#: popthelp.c:142
 msgid "LONG"
 msgstr "LONG"
 
-#: popthelp.c:136
+#: popthelp.c:143
 msgid "STRING"
 msgstr "STRING"
 
-#: popthelp.c:137
+#: popthelp.c:144
 msgid "FLOAT"
 msgstr "FLOAT"
 
-#: popthelp.c:138
+#: popthelp.c:145
 msgid "DOUBLE"
 msgstr "DOUBLE"
 
-#: popthelp.c:139
+#: popthelp.c:146
 msgid "ARG"
 msgstr "ARG"
 
-#: popthelp.c:552
+#: popthelp.c:559
 msgid "Usage:"
 msgstr "Pou�it�:"
 
-#: popthelp.c:576
+#: popthelp.c:583
 msgid "[OPTION...]"
 msgstr "[VOLBY...]"
diff --git a/po/da.po b/po/da.po
index 25c0c2e..1fe597e 100644
--- a/po/da.po
+++ b/po/da.po
@@ -1,8 +1,8 @@
 msgid ""
 msgstr ""
-"Project-Id-Version: popt 1.11\n"
-"Report-Msgid-Bugs-To: <rpm-devel@lists.dulug.duke.edu>\n"
-"POT-Creation-Date: 2007-08-08 11:39-0400\n"
+"Project-Id-Version: popt 1.12\n"
+"Report-Msgid-Bugs-To: <popt-devel@rpm5.org>\n"
+"POT-Creation-Date: 2007-08-11 11:32-0400\n"
 "PO-Revision-Date: Sun Jan 21 2001 04:30:32+0200\n"
 "Last-Translator: Martin Hansen <mah@k64.dk>\n"
 "Language-Team: Dansk <dansk@klid.dk>\n"
@@ -81,42 +81,42 @@ msgstr "Vis kortfattet brugsanvisning"
 msgid "Display option defaults in message"
 msgstr "Vis kortfattet brugsanvisning"
 
-#: popthelp.c:128
+#: popthelp.c:135
 msgid "NONE"
 msgstr "INGEN"
 
-#: popthelp.c:130
+#: popthelp.c:137
 msgid "VAL"
 msgstr "VAL"
 
-#: popthelp.c:134
+#: popthelp.c:141
 msgid "INT"
 msgstr "INT"
 
-#: popthelp.c:135
+#: popthelp.c:142
 msgid "LONG"
 msgstr "LONG"
 
-#: popthelp.c:136
+#: popthelp.c:143
 msgid "STRING"
 msgstr "STRING"
 
-#: popthelp.c:137
+#: popthelp.c:144
 msgid "FLOAT"
 msgstr "FLOAT"
 
-#: popthelp.c:138
+#: popthelp.c:145
 msgid "DOUBLE"
 msgstr "DOUBLE"
 
-#: popthelp.c:139
+#: popthelp.c:146
 msgid "ARG"
 msgstr "ARG"
 
-#: popthelp.c:552
+#: popthelp.c:559
 msgid "Usage:"
 msgstr "Brug:"
 
-#: popthelp.c:576
+#: popthelp.c:583
 msgid "[OPTION...]"
 msgstr "[TILVALG...]"
diff --git a/po/de.po b/po/de.po
index 7fa18be..e737da4 100644
--- a/po/de.po
+++ b/po/de.po
@@ -4,9 +4,9 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: popt 1.11\n"
-"Report-Msgid-Bugs-To: <rpm-devel@lists.dulug.duke.edu>\n"
-"POT-Creation-Date: 2007-08-08 11:39-0400\n"
+"Project-Id-Version: popt 1.12\n"
+"Report-Msgid-Bugs-To: <popt-devel@rpm5.org>\n"
+"POT-Creation-Date: 2007-08-11 11:32-0400\n"
 "PO-Revision-Date: 2007-02-17 21:00+0100\n"
 "Last-Translator: Robert Scheck <rpm@robert-scheck.de>\n"
 "Language-Team: German <de@li.org>\n"
@@ -83,42 +83,42 @@ msgstr "Zeigt eine kurze Verwendungsinformation"
 msgid "Display option defaults in message"
 msgstr "Zeigt die Standardeinstellungen an"
 
-#: popthelp.c:128
+#: popthelp.c:135
 msgid "NONE"
 msgstr "NICHTS"
 
-#: popthelp.c:130
+#: popthelp.c:137
 msgid "VAL"
 msgstr "WERT"
 
-#: popthelp.c:134
+#: popthelp.c:141
 msgid "INT"
 msgstr "INTEGER"
 
-#: popthelp.c:135
+#: popthelp.c:142
 msgid "LONG"
 msgstr "LONG"
 
-#: popthelp.c:136
+#: popthelp.c:143
 msgid "STRING"
 msgstr "STRING"
 
-#: popthelp.c:137
+#: popthelp.c:144
 msgid "FLOAT"
 msgstr "FLOAT"
 
-#: popthelp.c:138
+#: popthelp.c:145
 msgid "DOUBLE"
 msgstr "DOUBLE"
 
-#: popthelp.c:139
+#: popthelp.c:146
 msgid "ARG"
 msgstr "ARGUMENT"
 
-#: popthelp.c:552
+#: popthelp.c:559
 msgid "Usage:"
 msgstr "Verwendung:"
 
-#: popthelp.c:576
+#: popthelp.c:583
 msgid "[OPTION...]"
 msgstr "[OPTION...]"
diff --git a/po/es.po b/po/es.po
index 94cd00a..0512c2d 100644
--- a/po/es.po
+++ b/po/es.po
@@ -5,9 +5,9 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: popt 1.11\n"
-"Report-Msgid-Bugs-To: <rpm-devel@lists.dulug.duke.edu>\n"
-"POT-Creation-Date: 2007-08-08 11:39-0400\n"
+"Project-Id-Version: popt 1.12\n"
+"Report-Msgid-Bugs-To: <popt-devel@rpm5.org>\n"
+"POT-Creation-Date: 2007-08-11 11:32-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Leandro Lucarella <luca@linuxmendoza.org.ar>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -85,42 +85,42 @@ msgstr "Indica el modo de uso resumido"
 msgid "Display option defaults in message"
 msgstr "Indica el modo de uso resumido"
 
-#: popthelp.c:128
+#: popthelp.c:135
 msgid "NONE"
 msgstr "NONE"
 
-#: popthelp.c:130
+#: popthelp.c:137
 msgid "VAL"
 msgstr "VAL"
 
-#: popthelp.c:134
+#: popthelp.c:141
 msgid "INT"
 msgstr "INT"
 
-#: popthelp.c:135
+#: popthelp.c:142
 msgid "LONG"
 msgstr "LONG"
 
-#: popthelp.c:136
+#: popthelp.c:143
 msgid "STRING"
 msgstr "STRING"
 
-#: popthelp.c:137
+#: popthelp.c:144
 msgid "FLOAT"
 msgstr "FLOAT"
 
-#: popthelp.c:138
+#: popthelp.c:145
 msgid "DOUBLE"
 msgstr "DOUBLE"
 
-#: popthelp.c:139
+#: popthelp.c:146
 msgid "ARG"
 msgstr "ARG"
 
-#: popthelp.c:552
+#: popthelp.c:559
 msgid "Usage:"
 msgstr "Modo de Uso:"
 
-#: popthelp.c:576
+#: popthelp.c:583
 msgid "[OPTION...]"
 msgstr "[OPCIN...]"
diff --git a/po/fr.po b/po/fr.po
index 5f83128..50be87c 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -10,9 +10,9 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: popt 1.11\n"
-"Report-Msgid-Bugs-To: <rpm-devel@lists.dulug.duke.edu>\n"
-"POT-Creation-Date: 2007-08-08 11:39-0400\n"
+"Project-Id-Version: popt 1.12\n"
+"Report-Msgid-Bugs-To: <popt-devel@rpm5.org>\n"
+"POT-Creation-Date: 2007-08-11 11:32-0400\n"
 "PO-Revision-Date: 2003-06-22 23:43+0200\n"
 "Last-Translator: RPM French Translation <rpm-fr@livna.org>\n"
 "Language-Team: RPM French Translation <rpm-fr@livna.org>\n"
@@ -89,42 +89,42 @@ msgstr "Affiche un bref descriptif de l'utilisation"
 msgid "Display option defaults in message"
 msgstr "Afficher les valeurs par défaut des options dans le message"
 
-#: popthelp.c:128
+#: popthelp.c:135
 msgid "NONE"
 msgstr "RIEN"
 
-#: popthelp.c:130
+#: popthelp.c:137
 msgid "VAL"
 msgstr "VAL"
 
-#: popthelp.c:134
+#: popthelp.c:141
 msgid "INT"
 msgstr "ENTIER"
 
-#: popthelp.c:135
+#: popthelp.c:142
 msgid "LONG"
 msgstr "LONG"
 
-#: popthelp.c:136
+#: popthelp.c:143
 msgid "STRING"
 msgstr "CHAINE"
 
-#: popthelp.c:137
+#: popthelp.c:144
 msgid "FLOAT"
 msgstr "FLOTTANT"
 
-#: popthelp.c:138
+#: popthelp.c:145
 msgid "DOUBLE"
 msgstr "DOUBLE"
 
-#: popthelp.c:139
+#: popthelp.c:146
 msgid "ARG"
 msgstr "ARG"
 
-#: popthelp.c:552
+#: popthelp.c:559
 msgid "Usage:"
 msgstr "Utilisation:"
 
-#: popthelp.c:576
+#: popthelp.c:583
 msgid "[OPTION...]"
 msgstr "[OPTION...]"
diff --git a/po/ga.po b/po/ga.po
index 3c1bd11..4f69b3a 100644
--- a/po/ga.po
+++ b/po/ga.po
@@ -4,9 +4,9 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: popt 1.11\n"
-"Report-Msgid-Bugs-To: <rpm-devel@lists.dulug.duke.edu>\n"
-"POT-Creation-Date: 2007-08-08 11:39-0400\n"
+"Project-Id-Version: popt 1.12\n"
+"Report-Msgid-Bugs-To: <popt-devel@rpm5.org>\n"
+"POT-Creation-Date: 2007-08-11 11:32-0400\n"
 "PO-Revision-Date: 2007-06-19 06:21-0500\n"
 "Last-Translator: Kevin Scannell <kscanne@gmail.com>\n"
 "Language-Team: Irish <gaeilge-gnulinux@lists.sourceforge.net>\n"
@@ -83,42 +83,42 @@ msgstr "Taispeáin beagán eolais faoin úsáid"
 msgid "Display option defaults in message"
 msgstr "Taispeáin luachanna réamhshocraithe na roghanna sa teachtaireacht"
 
-#: popthelp.c:128
+#: popthelp.c:135
 msgid "NONE"
 msgstr "NEAMHNÍ"
 
-#: popthelp.c:130
+#: popthelp.c:137
 msgid "VAL"
 msgstr "LUACH"
 
-#: popthelp.c:134
+#: popthelp.c:141
 msgid "INT"
 msgstr "INT"
 
-#: popthelp.c:135
+#: popthelp.c:142
 msgid "LONG"
 msgstr "LONG"
 
-#: popthelp.c:136
+#: popthelp.c:143
 msgid "STRING"
 msgstr "STRING"
 
-#: popthelp.c:137
+#: popthelp.c:144
 msgid "FLOAT"
 msgstr "FLOAT"
 
-#: popthelp.c:138
+#: popthelp.c:145
 msgid "DOUBLE"
 msgstr "DOUBLE"
 
-#: popthelp.c:139
+#: popthelp.c:146
 msgid "ARG"
 msgstr "ARG"
 
-#: popthelp.c:552
+#: popthelp.c:559
 msgid "Usage:"
 msgstr "Úsáid:"
 
-#: popthelp.c:576
+#: popthelp.c:583
 msgid "[OPTION...]"
 msgstr "[ROGHA...]"
diff --git a/po/gl.po b/po/gl.po
index baa5c75..b6196bf 100644
--- a/po/gl.po
+++ b/po/gl.po
@@ -1,8 +1,8 @@
 msgid ""
 msgstr ""
-"Project-Id-Version: popt 1.11\n"
-"Report-Msgid-Bugs-To: <rpm-devel@lists.dulug.duke.edu>\n"
-"POT-Creation-Date: 2007-08-08 11:39-0400\n"
+"Project-Id-Version: popt 1.12\n"
+"Report-Msgid-Bugs-To: <popt-devel@rpm5.org>\n"
+"POT-Creation-Date: 2007-08-11 11:32-0400\n"
 "PO-Revision-Date: 2001-01-17 01:01+0100\n"
 "Last-Translator: Jes�s Bravo �lvarez <jba@pobox.com>\n"
 "Language-Team: Galician <trasno@ceu.fi.udc.es>\n"
@@ -80,42 +80,42 @@ msgstr "Amosar brevemente o xeito de utilizaci
 msgid "Display option defaults in message"
 msgstr "Amosar brevemente o xeito de utilizaci�n"
 
-#: popthelp.c:128
+#: popthelp.c:135
 msgid "NONE"
 msgstr "NADA"
 
-#: popthelp.c:130
+#: popthelp.c:137
 msgid "VAL"
 msgstr "VAL"
 
-#: popthelp.c:134
+#: popthelp.c:141
 msgid "INT"
 msgstr "INT"
 
-#: popthelp.c:135
+#: popthelp.c:142
 msgid "LONG"
 msgstr "LONG"
 
-#: popthelp.c:136
+#: popthelp.c:143
 msgid "STRING"
 msgstr "CADEA"
 
-#: popthelp.c:137
+#: popthelp.c:144
 msgid "FLOAT"
 msgstr "FLOAT"
 
-#: popthelp.c:138
+#: popthelp.c:145
 msgid "DOUBLE"
 msgstr "DOUBLE"
 
-#: popthelp.c:139
+#: popthelp.c:146
 msgid "ARG"
 msgstr "ARG"
 
-#: popthelp.c:552
+#: popthelp.c:559
 msgid "Usage:"
 msgstr "Uso:"
 
-#: popthelp.c:576
+#: popthelp.c:583
 msgid "[OPTION...]"
 msgstr "[OPCI�N...]"
diff --git a/po/hu.po b/po/hu.po
index 9b2beeb..4153e13 100644
--- a/po/hu.po
+++ b/po/hu.po
@@ -1,8 +1,8 @@
 msgid ""
 msgstr ""
-"Project-Id-Version: popt 1.11\n"
-"Report-Msgid-Bugs-To: <rpm-devel@lists.dulug.duke.edu>\n"
-"POT-Creation-Date: 2007-08-08 11:39-0400\n"
+"Project-Id-Version: popt 1.12\n"
+"Report-Msgid-Bugs-To: <popt-devel@rpm5.org>\n"
+"POT-Creation-Date: 2007-08-11 11:32-0400\n"
 "PO-Revision-Date: 2000-08-03 23:26+0200\n"
 "Last-Translator: L�szl� N�meth <nemeth@qwertynet.hu>\n"
 "Language-Team: Hungarian\n"
@@ -80,42 +80,42 @@ msgstr "R
 msgid "Display option defaults in message"
 msgstr "R�vid haszn�lati utas�t�s megjelen�t�se"
 
-#: popthelp.c:128
+#: popthelp.c:135
 msgid "NONE"
 msgstr ""
 
-#: popthelp.c:130
+#: popthelp.c:137
 msgid "VAL"
 msgstr ""
 
-#: popthelp.c:134
+#: popthelp.c:141
 msgid "INT"
 msgstr ""
 
-#: popthelp.c:135
+#: popthelp.c:142
 msgid "LONG"
 msgstr ""
 
-#: popthelp.c:136
+#: popthelp.c:143
 msgid "STRING"
 msgstr ""
 
-#: popthelp.c:137
+#: popthelp.c:144
 msgid "FLOAT"
 msgstr ""
 
-#: popthelp.c:138
+#: popthelp.c:145
 msgid "DOUBLE"
 msgstr ""
 
-#: popthelp.c:139
+#: popthelp.c:146
 msgid "ARG"
 msgstr ""
 
-#: popthelp.c:552
+#: popthelp.c:559
 msgid "Usage:"
 msgstr ""
 
-#: popthelp.c:576
+#: popthelp.c:583
 msgid "[OPTION...]"
 msgstr ""
diff --git a/po/is.po b/po/is.po
index 2e648a4..b8309fe 100644
--- a/po/is.po
+++ b/po/is.po
@@ -1,8 +1,8 @@
 msgid ""
 msgstr ""
-"Project-Id-Version: popt 1.11\n"
-"Report-Msgid-Bugs-To: <rpm-devel@lists.dulug.duke.edu>\n"
-"POT-Creation-Date: 2007-08-08 11:39-0400\n"
+"Project-Id-Version: popt 1.12\n"
+"Report-Msgid-Bugs-To: <popt-devel@rpm5.org>\n"
+"POT-Creation-Date: 2007-08-11 11:32-0400\n"
 "PO-Revision-Date: 2001-06-08 01:35+0000\n"
 "Last-Translator: Richard Allen <ra@hp.is>\n"
 "Language-Team: is <kde-isl@mmedia.is>\n"
@@ -79,42 +79,42 @@ msgstr "S
 msgid "Display option defaults in message"
 msgstr "S�na sj�lfgefin gildi rofa � skilabo�um"
 
-#: popthelp.c:128
+#: popthelp.c:135
 msgid "NONE"
 msgstr "ENGIN"
 
-#: popthelp.c:130
+#: popthelp.c:137
 msgid "VAL"
 msgstr "VAL"
 
-#: popthelp.c:134
+#: popthelp.c:141
 msgid "INT"
 msgstr "INT"
 
-#: popthelp.c:135
+#: popthelp.c:142
 msgid "LONG"
 msgstr "LONG"
 
-#: popthelp.c:136
+#: popthelp.c:143
 msgid "STRING"
 msgstr "STRING"
 
-#: popthelp.c:137
+#: popthelp.c:144
 msgid "FLOAT"
 msgstr "FLOAT"
 
-#: popthelp.c:138
+#: popthelp.c:145
 msgid "DOUBLE"
 msgstr "DOUBLE"
 
-#: popthelp.c:139
+#: popthelp.c:146
 msgid "ARG"
 msgstr "ARG"
 
-#: popthelp.c:552
+#: popthelp.c:559
 msgid "Usage:"
 msgstr "Notkun:"
 
-#: popthelp.c:576
+#: popthelp.c:583
 msgid "[OPTION...]"
 msgstr "[ROFI...]"
diff --git a/po/ja.po b/po/ja.po
index 90a0fb5..4c64ee2 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -4,9 +4,9 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: popt 1.11\n"
-"Report-Msgid-Bugs-To: <rpm-devel@lists.dulug.duke.edu>\n"
-"POT-Creation-Date: 2007-08-08 11:39-0400\n"
+"Project-Id-Version: popt 1.12\n"
+"Report-Msgid-Bugs-To: <popt-devel@rpm5.org>\n"
+"POT-Creation-Date: 2007-08-11 11:32-0400\n"
 "PO-Revision-Date: 2003--8-25 19:00+0900\n"
 "Last-Translator: Yukihiro Nakai <ynakai@redhat.com>\n"
 "Language-Team: Japanese <ja@li.org>\n"
@@ -83,42 +83,42 @@ msgstr "使い方の概要を表示します"
 msgid "Display option defaults in message"
 msgstr "オプションのデフォルト値をメッセージに表示します"
 
-#: popthelp.c:128
+#: popthelp.c:135
 msgid "NONE"
 msgstr "なし"
 
-#: popthelp.c:130
+#: popthelp.c:137
 msgid "VAL"
 msgstr "値"
 
-#: popthelp.c:134
+#: popthelp.c:141
 msgid "INT"
 msgstr "INT"
 
-#: popthelp.c:135
+#: popthelp.c:142
 msgid "LONG"
 msgstr "LONG"
 
-#: popthelp.c:136
+#: popthelp.c:143
 msgid "STRING"
 msgstr "文字列"
 
-#: popthelp.c:137
+#: popthelp.c:144
 msgid "FLOAT"
 msgstr "FLOAT"
 
-#: popthelp.c:138
+#: popthelp.c:145
 msgid "DOUBLE"
 msgstr "DOUBLE"
 
-#: popthelp.c:139
+#: popthelp.c:146
 msgid "ARG"
 msgstr "ARG"
 
-#: popthelp.c:552
+#: popthelp.c:559
 msgid "Usage:"
 msgstr "使い方:"
 
-#: popthelp.c:576
+#: popthelp.c:583
 msgid "[OPTION...]"
 msgstr "[オプション...]"
diff --git a/po/ko.po b/po/ko.po
index acbbe5c..eb45236 100644
--- a/po/ko.po
+++ b/po/ko.po
@@ -1,8 +1,8 @@
 msgid ""
 msgstr ""
-"Project-Id-Version: popt 1.11\n"
-"Report-Msgid-Bugs-To: <rpm-devel@lists.dulug.duke.edu>\n"
-"POT-Creation-Date: 2007-08-08 11:39-0400\n"
+"Project-Id-Version: popt 1.12\n"
+"Report-Msgid-Bugs-To: <popt-devel@rpm5.org>\n"
+"POT-Creation-Date: 2007-08-11 11:32-0400\n"
 "PO-Revision-Date: 2001-09-06 20:06+0900\n"
 "Last-Translator: Jong-Hoon Ryu <redhat4u@netian.com>\n"
 "Language-Team: GNU Translation project <ko@li.org>\n"
@@ -79,42 +79,42 @@ msgstr "
 msgid "Display option defaults in message"
 msgstr "�⺻���� �ɼ��� �����ݴϴ�"
 
-#: popthelp.c:128
+#: popthelp.c:135
 msgid "NONE"
 msgstr "����(NONE)"
 
-#: popthelp.c:130
+#: popthelp.c:137
 msgid "VAL"
 msgstr "��(VAL)"
 
-#: popthelp.c:134
+#: popthelp.c:141
 msgid "INT"
 msgstr "����(INT)"
 
-#: popthelp.c:135
+#: popthelp.c:142
 msgid "LONG"
 msgstr "����(LONG)"
 
-#: popthelp.c:136
+#: popthelp.c:143
 msgid "STRING"
 msgstr "���ڿ�(STRING)"
 
-#: popthelp.c:137
+#: popthelp.c:144
 msgid "FLOAT"
 msgstr "�Ҽ�(FLOAT)"
 
-#: popthelp.c:138
+#: popthelp.c:145
 msgid "DOUBLE"
 msgstr "�Ҽ�(DOUBLE)"
 
-#: popthelp.c:139
+#: popthelp.c:146
 msgid "ARG"
 msgstr "�μ�(ARG)"
 
-#: popthelp.c:552
+#: popthelp.c:559
 msgid "Usage:"
 msgstr "����:"
 
-#: popthelp.c:576
+#: popthelp.c:583
 msgid "[OPTION...]"
 msgstr "[�ɼ�...]"
diff --git a/po/nb.po b/po/nb.po
index 5da8387..819e5e2 100644
--- a/po/nb.po
+++ b/po/nb.po
@@ -1,8 +1,8 @@
 msgid ""
 msgstr ""
-"Project-Id-Version: popt 1.11\n"
-"Report-Msgid-Bugs-To: <rpm-devel@lists.dulug.duke.edu>\n"
-"POT-Creation-Date: 2007-08-08 11:39-0400\n"
+"Project-Id-Version: popt 1.12\n"
+"Report-Msgid-Bugs-To: <popt-devel@rpm5.org>\n"
+"POT-Creation-Date: 2007-08-11 11:32-0400\n"
 "PO-Revision-Date: 2001-06-27 11:05+0200\n"
 "Last-Translator: Kjartan Maraas <kmaraas@online.no>\n"
 "Language-Team: Norwegian <no@li.org>\n"
@@ -79,42 +79,42 @@ msgstr "Vis kort bruksmelding"
 msgid "Display option defaults in message"
 msgstr "Vis forvalgte flagg i melding"
 
-#: popthelp.c:128
+#: popthelp.c:135
 msgid "NONE"
 msgstr "INGEN"
 
-#: popthelp.c:130
+#: popthelp.c:137
 msgid "VAL"
 msgstr "VERDI"
 
-#: popthelp.c:134
+#: popthelp.c:141
 msgid "INT"
 msgstr "HELTALL"
 
-#: popthelp.c:135
+#: popthelp.c:142
 msgid "LONG"
 msgstr "LONG"
 
-#: popthelp.c:136
+#: popthelp.c:143
 msgid "STRING"
 msgstr "STRENG"
 
-#: popthelp.c:137
+#: popthelp.c:144
 msgid "FLOAT"
 msgstr "FLYTTALL"
 
-#: popthelp.c:138
+#: popthelp.c:145
 msgid "DOUBLE"
 msgstr "DOUBLE"
 
-#: popthelp.c:139
+#: popthelp.c:146
 msgid "ARG"
 msgstr "ARG"
 
-#: popthelp.c:552
+#: popthelp.c:559
 msgid "Usage:"
 msgstr "Bruk:"
 
-#: popthelp.c:576
+#: popthelp.c:583
 msgid "[OPTION...]"
 msgstr "[FLAGG...]"
diff --git a/po/nl.po b/po/nl.po
index e0ea223..13b81be 100644
--- a/po/nl.po
+++ b/po/nl.po
@@ -4,9 +4,9 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: popt 1.11\n"
-"Report-Msgid-Bugs-To: <rpm-devel@lists.dulug.duke.edu>\n"
-"POT-Creation-Date: 2007-08-08 11:39-0400\n"
+"Project-Id-Version: popt 1.12\n"
+"Report-Msgid-Bugs-To: <popt-devel@rpm5.org>\n"
+"POT-Creation-Date: 2007-08-11 11:32-0400\n"
 "PO-Revision-Date: 2007-06-29 17:38+0200\n"
 "Last-Translator: Tim Van Holder <tim.van.holder@telenet.be>\n"
 "Language-Team: Dutch <vertaling@vrijschrift.org>\n"
@@ -86,44 +86,44 @@ msgstr "Toon korte tekst over gebruik"
 msgid "Display option defaults in message"
 msgstr "Toon standaardwaarden van opties in de tekst"
 
-#: popthelp.c:128
+#: popthelp.c:135
 msgid "NONE"
 msgstr "GEEN"
 
-#: popthelp.c:130
+#: popthelp.c:137
 msgid "VAL"
 msgstr "WAARDE"
 
-#: popthelp.c:134
+#: popthelp.c:141
 msgid "INT"
 msgstr "INT"
 
-#: popthelp.c:135
+#: popthelp.c:142
 msgid "LONG"
 msgstr "LONG"
 
 # TEKENREEKS lijkt me niet gepast; dus ofwel STRING behouden, ofwel TEKST
-#: popthelp.c:136
+#: popthelp.c:143
 msgid "STRING"
 msgstr "TEKST"
 
-#: popthelp.c:137
+#: popthelp.c:144
 msgid "FLOAT"
 msgstr "FLOAT"
 
-#: popthelp.c:138
+#: popthelp.c:145
 msgid "DOUBLE"
 msgstr "DOUBLE"
 
 # of hier ARGUMENT van maken?
-#: popthelp.c:139
+#: popthelp.c:146
 msgid "ARG"
 msgstr "ARG"
 
-#: popthelp.c:552
+#: popthelp.c:559
 msgid "Usage:"
 msgstr "Gebruik:"
 
-#: popthelp.c:576
+#: popthelp.c:583
 msgid "[OPTION...]"
 msgstr "[OPTIE...]"
diff --git a/po/pl.po b/po/pl.po
index b9887e0..cb14315 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -4,9 +4,9 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: popt 1.11\n"
-"Report-Msgid-Bugs-To: <rpm-devel@lists.dulug.duke.edu>\n"
-"POT-Creation-Date: 2007-08-08 11:39-0400\n"
+"Project-Id-Version: popt 1.12\n"
+"Report-Msgid-Bugs-To: <popt-devel@rpm5.org>\n"
+"POT-Creation-Date: 2007-08-11 11:32-0400\n"
 "PO-Revision-Date: 2003-06-08 20:32+0200\n"
 "Last-Translator: Jakub Bogusz <qboosh@pld-linux.org>\n"
 "Language-Team: Polish <translation-team-pl@lists.sourceforge.net>\n"
@@ -83,42 +83,42 @@ msgstr "Wyświetl skrócony sposób użycia"
 msgid "Display option defaults in message"
 msgstr "Wyświetl domyślne opcje w opisie"
 
-#: popthelp.c:128
+#: popthelp.c:135
 msgid "NONE"
 msgstr "BRAK"
 
-#: popthelp.c:130
+#: popthelp.c:137
 msgid "VAL"
 msgstr "WART"
 
-#: popthelp.c:134
+#: popthelp.c:141
 msgid "INT"
 msgstr "INT"
 
-#: popthelp.c:135
+#: popthelp.c:142
 msgid "LONG"
 msgstr "LONG"
 
-#: popthelp.c:136
+#: popthelp.c:143
 msgid "STRING"
 msgstr "ŁAŃCUCH"
 
-#: popthelp.c:137
+#: popthelp.c:144
 msgid "FLOAT"
 msgstr "FLOAT"
 
-#: popthelp.c:138
+#: popthelp.c:145
 msgid "DOUBLE"
 msgstr "DOUBLE"
 
-#: popthelp.c:139
+#: popthelp.c:146
 msgid "ARG"
 msgstr "PARAM"
 
-#: popthelp.c:552
+#: popthelp.c:559
 msgid "Usage:"
 msgstr "Użycie:"
 
-#: popthelp.c:576
+#: popthelp.c:583
 msgid "[OPTION...]"
 msgstr "[OPCJA...]"
diff --git a/po/popt.pot b/po/popt.pot
index b0843d8..226eed4 100644
--- a/po/popt.pot
+++ b/po/popt.pot
@@ -6,8 +6,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: <rpm-devel@lists.dulug.duke.edu>\n"
-"POT-Creation-Date: 2007-08-08 11:39-0400\n"
+"Report-Msgid-Bugs-To: <popt-devel@rpm5.org>\n"
+"POT-Creation-Date: 2007-08-11 11:32-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -84,42 +84,42 @@ msgstr ""
 msgid "Display option defaults in message"
 msgstr ""
 
-#: popthelp.c:128
+#: popthelp.c:135
 msgid "NONE"
 msgstr ""
 
-#: popthelp.c:130
+#: popthelp.c:137
 msgid "VAL"
 msgstr ""
 
-#: popthelp.c:134
+#: popthelp.c:141
 msgid "INT"
 msgstr ""
 
-#: popthelp.c:135
+#: popthelp.c:142
 msgid "LONG"
 msgstr ""
 
-#: popthelp.c:136
+#: popthelp.c:143
 msgid "STRING"
 msgstr ""
 
-#: popthelp.c:137
+#: popthelp.c:144
 msgid "FLOAT"
 msgstr ""
 
-#: popthelp.c:138
+#: popthelp.c:145
 msgid "DOUBLE"
 msgstr ""
 
-#: popthelp.c:139
+#: popthelp.c:146
 msgid "ARG"
 msgstr ""
 
-#: popthelp.c:552
+#: popthelp.c:559
 msgid "Usage:"
 msgstr ""
 
-#: popthelp.c:576
+#: popthelp.c:583
 msgid "[OPTION...]"
 msgstr ""
diff --git a/po/pt.po b/po/pt.po
index ae3f4ce..0b13e6d 100644
--- a/po/pt.po
+++ b/po/pt.po
@@ -1,8 +1,8 @@
 msgid ""
 msgstr ""
-"Project-Id-Version: popt 1.11\n"
-"Report-Msgid-Bugs-To: <rpm-devel@lists.dulug.duke.edu>\n"
-"POT-Creation-Date: 2007-08-08 11:39-0400\n"
+"Project-Id-Version: popt 1.12\n"
+"Report-Msgid-Bugs-To: <popt-devel@rpm5.org>\n"
+"POT-Creation-Date: 2007-08-11 11:32-0400\n"
 "PO-Revision-Date: 2002-02-13 18:32+0000\n"
 "Last-Translator: Pedro Morais <morais@kde.org>\n"
 "Language-Team: pt <morais@kde.org>\n"
@@ -79,42 +79,42 @@ msgstr "Mostrar uma mensagem de utiliza
 msgid "Display option defaults in message"
 msgstr "Mostrar valor por omiss�o das op��es na mensagem"
 
-#: popthelp.c:128
+#: popthelp.c:135
 msgid "NONE"
 msgstr "NONE"
 
-#: popthelp.c:130
+#: popthelp.c:137
 msgid "VAL"
 msgstr "VAL"
 
-#: popthelp.c:134
+#: popthelp.c:141
 msgid "INT"
 msgstr "INT"
 
-#: popthelp.c:135
+#: popthelp.c:142
 msgid "LONG"
 msgstr "LONG"
 
-#: popthelp.c:136
+#: popthelp.c:143
 msgid "STRING"
 msgstr "STRING"
 
-#: popthelp.c:137
+#: popthelp.c:144
 msgid "FLOAT"
 msgstr "FLOAT"
 
-#: popthelp.c:138
+#: popthelp.c:145
 msgid "DOUBLE"
 msgstr "DOUBLE"
 
-#: popthelp.c:139
+#: popthelp.c:146
 msgid "ARG"
 msgstr "ARG"
 
-#: popthelp.c:552
+#: popthelp.c:559
 msgid "Usage:"
 msgstr "Utiliza��o:"
 
-#: popthelp.c:576
+#: popthelp.c:583
 msgid "[OPTION...]"
 msgstr "[OP��O...]"
diff --git a/po/ro.po b/po/ro.po
index 4194dc7..c4d6db4 100644
--- a/po/ro.po
+++ b/po/ro.po
@@ -1,8 +1,8 @@
 msgid ""
 msgstr ""
-"Project-Id-Version: popt 1.11\n"
-"Report-Msgid-Bugs-To: <rpm-devel@lists.dulug.duke.edu>\n"
-"POT-Creation-Date: 2007-08-08 11:39-0400\n"
+"Project-Id-Version: popt 1.12\n"
+"Report-Msgid-Bugs-To: <popt-devel@rpm5.org>\n"
+"POT-Creation-Date: 2007-08-11 11:32-0400\n"
 "PO-Revision-Date: 2000-06-14 23:23+EST\n"
 "Last-Translator: Cristian Gafton <gafton@redhat.com>\n"
 "Language-Team: Romanian <ro@li.org>\n"
@@ -81,42 +81,42 @@ msgstr "Afisare mesaj sintaxa sumar"
 msgid "Display option defaults in message"
 msgstr "Afisare mesaj sintaxa sumar"
 
-#: popthelp.c:128
+#: popthelp.c:135
 msgid "NONE"
 msgstr ""
 
-#: popthelp.c:130
+#: popthelp.c:137
 msgid "VAL"
 msgstr ""
 
-#: popthelp.c:134
+#: popthelp.c:141
 msgid "INT"
 msgstr ""
 
-#: popthelp.c:135
+#: popthelp.c:142
 msgid "LONG"
 msgstr ""
 
-#: popthelp.c:136
+#: popthelp.c:143
 msgid "STRING"
 msgstr ""
 
-#: popthelp.c:137
+#: popthelp.c:144
 msgid "FLOAT"
 msgstr ""
 
-#: popthelp.c:138
+#: popthelp.c:145
 msgid "DOUBLE"
 msgstr ""
 
-#: popthelp.c:139
+#: popthelp.c:146
 msgid "ARG"
 msgstr ""
 
-#: popthelp.c:552
+#: popthelp.c:559
 msgid "Usage:"
 msgstr "Sintaxa:"
 
-#: popthelp.c:576
+#: popthelp.c:583
 msgid "[OPTION...]"
 msgstr "[OPTIUNE...]"
diff --git a/po/ru.po b/po/ru.po
index 838426e..a8d5d69 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -1,8 +1,8 @@
 msgid ""
 msgstr ""
-"Project-Id-Version: popt 1.11\n"
-"Report-Msgid-Bugs-To: <rpm-devel@lists.dulug.duke.edu>\n"
-"POT-Creation-Date: 2007-08-08 11:39-0400\n"
+"Project-Id-Version: popt 1.12\n"
+"Report-Msgid-Bugs-To: <popt-devel@rpm5.org>\n"
+"POT-Creation-Date: 2007-08-11 11:32-0400\n"
 "PO-Revision-Date: 2001-07-05 21:00-0500\n"
 "Last-Translator: Eugene Kanter <eugene@blackcatlinux.com>\n"
 "Language-Team: Black Cat Linux Team <blackcat-support@blackcatlinux.com>\n"
@@ -79,42 +79,42 @@ msgstr "
 msgid "Display option defaults in message"
 msgstr "�������� ��������� �� ���������"
 
-#: popthelp.c:128
+#: popthelp.c:135
 msgid "NONE"
 msgstr "NONE"
 
-#: popthelp.c:130
+#: popthelp.c:137
 msgid "VAL"
 msgstr "VAL"
 
-#: popthelp.c:134
+#: popthelp.c:141
 msgid "INT"
 msgstr "INT"
 
-#: popthelp.c:135
+#: popthelp.c:142
 msgid "LONG"
 msgstr "LONG"
 
-#: popthelp.c:136
+#: popthelp.c:143
 msgid "STRING"
 msgstr "STRING"
 
-#: popthelp.c:137
+#: popthelp.c:144
 msgid "FLOAT"
 msgstr "FLOAT"
 
-#: popthelp.c:138
+#: popthelp.c:145
 msgid "DOUBLE"
 msgstr "DOUBLE"
 
-#: popthelp.c:139
+#: popthelp.c:146
 msgid "ARG"
 msgstr "ARG"
 
-#: popthelp.c:552
+#: popthelp.c:559
 msgid "Usage:"
 msgstr "�������������:"
 
-#: popthelp.c:576
+#: popthelp.c:583
 msgid "[OPTION...]"
 msgstr "[��������...]"
diff --git a/po/sk.po b/po/sk.po
index a9261c6..4082bf6 100644
--- a/po/sk.po
+++ b/po/sk.po
@@ -4,9 +4,9 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: popt 1.11\n"
-"Report-Msgid-Bugs-To: <rpm-devel@lists.dulug.duke.edu>\n"
-"POT-Creation-Date: 2007-08-08 11:39-0400\n"
+"Project-Id-Version: popt 1.12\n"
+"Report-Msgid-Bugs-To: <popt-devel@rpm5.org>\n"
+"POT-Creation-Date: 2007-08-11 11:32-0400\n"
 "PO-Revision-Date: 1999-08-04 21:40+0200\n"
 "Last-Translator: Stanislav Meduna <stano@eunet.sk>\n"
 "Language-Team: Slovak <sk-i18n@rak.isternet.sk>\n"
@@ -84,42 +84,42 @@ msgstr "Zobrazi
 msgid "Display option defaults in message"
 msgstr "Zobrazi� stru�n� n�vod na pou�itie"
 
-#: popthelp.c:128
+#: popthelp.c:135
 msgid "NONE"
 msgstr ""
 
-#: popthelp.c:130
+#: popthelp.c:137
 msgid "VAL"
 msgstr ""
 
-#: popthelp.c:134
+#: popthelp.c:141
 msgid "INT"
 msgstr ""
 
-#: popthelp.c:135
+#: popthelp.c:142
 msgid "LONG"
 msgstr ""
 
-#: popthelp.c:136
+#: popthelp.c:143
 msgid "STRING"
 msgstr ""
 
-#: popthelp.c:137
+#: popthelp.c:144
 msgid "FLOAT"
 msgstr ""
 
-#: popthelp.c:138
+#: popthelp.c:145
 msgid "DOUBLE"
 msgstr ""
 
-#: popthelp.c:139
+#: popthelp.c:146
 msgid "ARG"
 msgstr ""
 
-#: popthelp.c:552
+#: popthelp.c:559
 msgid "Usage:"
 msgstr ""
 
-#: popthelp.c:576
+#: popthelp.c:583
 msgid "[OPTION...]"
 msgstr ""
diff --git a/po/sl.po b/po/sl.po
index a712338..34adaae 100644
--- a/po/sl.po
+++ b/po/sl.po
@@ -1,8 +1,8 @@
 msgid ""
 msgstr ""
-"Project-Id-Version: popt 1.11\n"
-"Report-Msgid-Bugs-To: <rpm-devel@lists.dulug.duke.edu>\n"
-"POT-Creation-Date: 2007-08-08 11:39-0400\n"
+"Project-Id-Version: popt 1.12\n"
+"Report-Msgid-Bugs-To: <popt-devel@rpm5.org>\n"
+"POT-Creation-Date: 2007-08-11 11:32-0400\n"
 "PO-Revision-Date: 2000-09-05 12:30+0200\n"
 "Last-Translator: Roman Maurer <roman.maurer@hermes.si>\n"
 "Language-Team: Slovenian <sl@li.org>\n"
@@ -80,42 +80,42 @@ msgstr "Prika
 msgid "Display option defaults in message"
 msgstr "Prika�i kratko sporo�ilo o uporabi"
 
-#: popthelp.c:128
+#: popthelp.c:135
 msgid "NONE"
 msgstr ""
 
-#: popthelp.c:130
+#: popthelp.c:137
 msgid "VAL"
 msgstr ""
 
-#: popthelp.c:134
+#: popthelp.c:141
 msgid "INT"
 msgstr ""
 
-#: popthelp.c:135
+#: popthelp.c:142
 msgid "LONG"
 msgstr ""
 
-#: popthelp.c:136
+#: popthelp.c:143
 msgid "STRING"
 msgstr ""
 
-#: popthelp.c:137
+#: popthelp.c:144
 msgid "FLOAT"
 msgstr ""
 
-#: popthelp.c:138
+#: popthelp.c:145
 msgid "DOUBLE"
 msgstr ""
 
-#: popthelp.c:139
+#: popthelp.c:146
 msgid "ARG"
 msgstr ""
 
-#: popthelp.c:552
+#: popthelp.c:559
 msgid "Usage:"
 msgstr ""
 
-#: popthelp.c:576
+#: popthelp.c:583
 msgid "[OPTION...]"
 msgstr ""
diff --git a/po/sv.po b/po/sv.po
index 1a4ad3a..dcd05d4 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -1,8 +1,8 @@
 msgid ""
 msgstr ""
-"Project-Id-Version: popt 1.11\n"
-"Report-Msgid-Bugs-To: <rpm-devel@lists.dulug.duke.edu>\n"
-"POT-Creation-Date: 2007-08-08 11:39-0400\n"
+"Project-Id-Version: popt 1.12\n"
+"Report-Msgid-Bugs-To: <popt-devel@rpm5.org>\n"
+"POT-Creation-Date: 2007-08-11 11:32-0400\n"
 "PO-Revision-Date: 2007-06-12 22:00+0200\n"
 "Last-Translator: G�ran Uddeborg <goeran@uddeborg.se>\n"
 "Language-Team: Swedish <tp-sv@listor.tp-sv.se>\n"
@@ -79,42 +79,42 @@ msgstr "Visa en kortfattad anv
 msgid "Display option defaults in message"
 msgstr "Visa standardalternativ f�r flaggor i meddelande"
 
-#: popthelp.c:128
+#: popthelp.c:135
 msgid "NONE"
 msgstr "INGET"
 
-#: popthelp.c:130
+#: popthelp.c:137
 msgid "VAL"
 msgstr "V�RDE"
 
-#: popthelp.c:134
+#: popthelp.c:141
 msgid "INT"
 msgstr "HELTAL"
 
-#: popthelp.c:135
+#: popthelp.c:142
 msgid "LONG"
 msgstr "L�NG"
 
-#: popthelp.c:136
+#: popthelp.c:143
 msgid "STRING"
 msgstr "STR�NG"
 
-#: popthelp.c:137
+#: popthelp.c:144
 msgid "FLOAT"
 msgstr "FLYTTAL"
 
-#: popthelp.c:138
+#: popthelp.c:145
 msgid "DOUBLE"
 msgstr "DUBBEL"
 
-#: popthelp.c:139
+#: popthelp.c:146
 msgid "ARG"
 msgstr "ARG"
 
-#: popthelp.c:552
+#: popthelp.c:559
 msgid "Usage:"
 msgstr "Anv�ndning:"
 
-#: popthelp.c:576
+#: popthelp.c:583
 msgid "[OPTION...]"
 msgstr "[FLAGGA...]"
diff --git a/po/tr.po b/po/tr.po
index 977000b..90501cb 100644
--- a/po/tr.po
+++ b/po/tr.po
@@ -1,8 +1,8 @@
 msgid ""
 msgstr ""
-"Project-Id-Version: popt 1.11\n"
-"Report-Msgid-Bugs-To: <rpm-devel@lists.dulug.duke.edu>\n"
-"POT-Creation-Date: 2007-08-08 11:39-0400\n"
+"Project-Id-Version: popt 1.12\n"
+"Report-Msgid-Bugs-To: <popt-devel@rpm5.org>\n"
+"POT-Creation-Date: 2007-08-11 11:32-0400\n"
 "PO-Revision-Date: 2000-02-11 13:01+0200\n"
 "Last-Translator: Nilgun Belma Buguner <nilgun@technologist.com>\n"
 "Language-Team: Turkish <tr@li.org>\n"
@@ -80,42 +80,42 @@ msgstr "K
 msgid "Display option defaults in message"
 msgstr "K�sa bir kullan�m iletisi g�ster"
 
-#: popthelp.c:128
+#: popthelp.c:135
 msgid "NONE"
 msgstr "YOK"
 
-#: popthelp.c:130
+#: popthelp.c:137
 msgid "VAL"
 msgstr "DE�"
 
-#: popthelp.c:134
+#: popthelp.c:141
 msgid "INT"
 msgstr "INT"
 
-#: popthelp.c:135
+#: popthelp.c:142
 msgid "LONG"
 msgstr "LONG"
 
-#: popthelp.c:136
+#: popthelp.c:143
 msgid "STRING"
 msgstr "STRING"
 
-#: popthelp.c:137
+#: popthelp.c:144
 msgid "FLOAT"
 msgstr "FLOAT"
 
-#: popthelp.c:138
+#: popthelp.c:145
 msgid "DOUBLE"
 msgstr "DOUBLE"
 
-#: popthelp.c:139
+#: popthelp.c:146
 msgid "ARG"
 msgstr "ARG"
 
-#: popthelp.c:552
+#: popthelp.c:559
 msgid "Usage:"
 msgstr "Kullan�m�:"
 
-#: popthelp.c:576
+#: popthelp.c:583
 msgid "[OPTION...]"
 msgstr "[SE�ENEK...]"
diff --git a/po/uk.po b/po/uk.po
index 81bd4b6..f0a9ab9 100644
--- a/po/uk.po
+++ b/po/uk.po
@@ -4,9 +4,9 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: popt 1.11\n"
-"Report-Msgid-Bugs-To: <rpm-devel@lists.dulug.duke.edu>\n"
-"POT-Creation-Date: 2007-08-08 11:39-0400\n"
+"Project-Id-Version: popt 1.12\n"
+"Report-Msgid-Bugs-To: <popt-devel@rpm5.org>\n"
+"POT-Creation-Date: 2007-08-11 11:32-0400\n"
 "PO-Revision-Date: 1999-09-30 16:54+0200\n"
 "Last-Translator: Yuri Syrota <rasta@renome.rovno.ua>\n"
 "Language-Team: Ukrainian <uk@li.org>\n"
@@ -84,42 +84,42 @@ msgstr "
 msgid "Display option defaults in message"
 msgstr "�������� ������� ��צ��� ��� ������������"
 
-#: popthelp.c:128
+#: popthelp.c:135
 msgid "NONE"
 msgstr ""
 
-#: popthelp.c:130
+#: popthelp.c:137
 msgid "VAL"
 msgstr ""
 
-#: popthelp.c:134
+#: popthelp.c:141
 msgid "INT"
 msgstr ""
 
-#: popthelp.c:135
+#: popthelp.c:142
 msgid "LONG"
 msgstr ""
 
-#: popthelp.c:136
+#: popthelp.c:143
 msgid "STRING"
 msgstr ""
 
-#: popthelp.c:137
+#: popthelp.c:144
 msgid "FLOAT"
 msgstr ""
 
-#: popthelp.c:138
+#: popthelp.c:145
 msgid "DOUBLE"
 msgstr ""
 
-#: popthelp.c:139
+#: popthelp.c:146
 msgid "ARG"
 msgstr ""
 
-#: popthelp.c:552
+#: popthelp.c:559
 msgid "Usage:"
 msgstr ""
 
-#: popthelp.c:576
+#: popthelp.c:583
 msgid "[OPTION...]"
 msgstr ""
diff --git a/po/vi.po b/po/vi.po
index 3070198..331b86d 100644
--- a/po/vi.po
+++ b/po/vi.po
@@ -4,9 +4,9 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: popt 1.11\n"
-"Report-Msgid-Bugs-To: <rpm-devel@lists.dulug.duke.edu>\n"
-"POT-Creation-Date: 2007-08-08 11:39-0400\n"
+"Project-Id-Version: popt 1.12\n"
+"Report-Msgid-Bugs-To: <popt-devel@rpm5.org>\n"
+"POT-Creation-Date: 2007-08-11 11:32-0400\n"
 "PO-Revision-Date: 2007-07-12 22:37+0930\n"
 "Last-Translator: Clytie Siddall <clytie@riverland.net.au>\n"
 "Language-Team: Vietnamese <vi-VN@googlegroups.com>\n"
@@ -85,42 +85,42 @@ msgstr "Hiển thị thông điệp cách sử dụng ngắn"
 msgid "Display option defaults in message"
 msgstr "Hiển thị các giá trị mặc định của tùy chọn trong thông điệp"
 
-#: popthelp.c:128
+#: popthelp.c:135
 msgid "NONE"
 msgstr "KHÔNG CÓ"
 
-#: popthelp.c:130
+#: popthelp.c:137
 msgid "VAL"
 msgstr "GIÁ TRỊ"
 
-#: popthelp.c:134
+#: popthelp.c:141
 msgid "INT"
 msgstr "SỐ NGUYÊN"
 
-#: popthelp.c:135
+#: popthelp.c:142
 msgid "LONG"
 msgstr "DÀI"
 
-#: popthelp.c:136
+#: popthelp.c:143
 msgid "STRING"
 msgstr "CHUỖI"
 
-#: popthelp.c:137
+#: popthelp.c:144
 msgid "FLOAT"
 msgstr "NỔI"
 
-#: popthelp.c:138
+#: popthelp.c:145
 msgid "DOUBLE"
 msgstr "ĐÔI"
 
-#: popthelp.c:139
+#: popthelp.c:146
 msgid "ARG"
 msgstr "ĐỐI SỐ"
 
-#: popthelp.c:552
+#: popthelp.c:559
 msgid "Usage:"
 msgstr "Cách sử dụng:"
 
-#: popthelp.c:576
+#: popthelp.c:583
 msgid "[OPTION...]"
 msgstr "[TÙY_CHỌN...]"
diff --git a/po/wa.po b/po/wa.po
index cb94591..882bf2a 100644
--- a/po/wa.po
+++ b/po/wa.po
@@ -8,9 +8,9 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: popt 1.11\n"
-"Report-Msgid-Bugs-To: <rpm-devel@lists.dulug.duke.edu>\n"
-"POT-Creation-Date: 2007-08-08 11:39-0400\n"
+"Project-Id-Version: popt 1.12\n"
+"Report-Msgid-Bugs-To: <popt-devel@rpm5.org>\n"
+"POT-Creation-Date: 2007-08-11 11:32-0400\n"
 "PO-Revision-Date: 1999-03-18 23:11+0100\n"
 "Last-Translator: Nobody yet\n"
 "Language-Team: walon <linux-wa@chanae.alphanet.ch>\n"
@@ -88,42 +88,42 @@ msgstr "Mostre on court messaedje so kmint vos 
 msgid "Display option defaults in message"
 msgstr "Mostre on court messaedje so kmint vos � siervi"
 
-#: popthelp.c:128
+#: popthelp.c:135
 msgid "NONE"
 msgstr ""
 
-#: popthelp.c:130
+#: popthelp.c:137
 msgid "VAL"
 msgstr ""
 
-#: popthelp.c:134
+#: popthelp.c:141
 msgid "INT"
 msgstr ""
 
-#: popthelp.c:135
+#: popthelp.c:142
 msgid "LONG"
 msgstr ""
 
-#: popthelp.c:136
+#: popthelp.c:143
 msgid "STRING"
 msgstr ""
 
-#: popthelp.c:137
+#: popthelp.c:144
 msgid "FLOAT"
 msgstr ""
 
-#: popthelp.c:138
+#: popthelp.c:145
 msgid "DOUBLE"
 msgstr ""
 
-#: popthelp.c:139
+#: popthelp.c:146
 msgid "ARG"
 msgstr ""
 
-#: popthelp.c:552
+#: popthelp.c:559
 msgid "Usage:"
 msgstr ""
 
-#: popthelp.c:576
+#: popthelp.c:583
 msgid "[OPTION...]"
 msgstr ""
diff --git a/popthelp.c b/popthelp.c
index 5d5c80e..87a6a34 100644
--- a/popthelp.c
+++ b/popthelp.c
@@ -119,10 +119,17 @@ getArgDescrip(const struct poptOption * opt,
 {
     if (!(opt->argInfo & POPT_ARG_MASK)) return NULL;
 
-    if (opt == (poptHelpOptions + 1) || opt == (poptHelpOptions + 2))
-	if (opt->argDescrip) return POPT_(opt->argDescrip);
-
-    if (opt->argDescrip) return D_(translation_domain, opt->argDescrip);
+    if (opt->argDescrip) {
+	/* Some strings need popt library, not application, i18n domain. */
+	if (opt == (poptHelpOptions + 1)
+	 || opt == (poptHelpOptions + 2)
+	 || !strcmp(opt->argDescrip,"Help options:")
+	 || !strcmp(opt->argDescrip,"Options implemented via popt alias/exec:"))
+	    return POPT_(opt->argDescrip);
+
+	/* Use the application i18n domain. */
+	return D_(translation_domain, opt->argDescrip);
+    }
 
     switch (opt->argInfo & POPT_ARG_MASK) {
     case POPT_ARG_NONE:		return POPT_("NONE");
-- 
Gitee


From be7410df69abe8162977edaf9b19dbb514a2b072 Mon Sep 17 00:00:00 2001
From: Jeff Johnson <n3npq@mac.com>
Date: Mon, 13 Aug 2007 15:38:36 +0000
Subject: [PATCH 460/667] - add zh_CN.po (Translation Project).

---
 CHANGES      |   1 +
 configure.ac |   2 +-
 po/zh_CN.po  | 127 +++++++++++++++++++++++++++++++++++++++++++++++++++
 3 files changed, 129 insertions(+), 1 deletion(-)
 create mode 100644 po/zh_CN.po

diff --git a/CHANGES b/CHANGES
index 716d17c..4e6b1e1 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,4 +1,5 @@
 1.12 -> 1.13:
+   - jbj: add zh_CN.po (Translation Project).
    - jbj: use PACKAGE_BUGREPORT.
    - jbj: hotwire POPT_AUTOHELP/POPT_AUTOALIAS lookup in popt i18n domain.
 
diff --git a/configure.ac b/configure.ac
index 320628e..cd7a1a1 100755
--- a/configure.ac
+++ b/configure.ac
@@ -14,7 +14,7 @@ AC_SUBST(LT_AGE, 8)
 
 AM_INIT_AUTOMAKE([foreign])
 
-ALL_LINGUAS="cs da de es fr ga gl hu is ja ko nb nl nb pl pt ro ru sk sl sv tr uk vi wa"
+ALL_LINGUAS="cs da de es fr ga gl hu is ja ko nb nl nb pl pt ro ru sk sl sv tr uk vi wa zh_CN"
 
 AC_PROG_CC
 AC_PROG_INSTALL
diff --git a/po/zh_CN.po b/po/zh_CN.po
new file mode 100644
index 0000000..598d796
--- /dev/null
+++ b/po/zh_CN.po
@@ -0,0 +1,127 @@
+# translation of translation.po to 
+# Simplified Chinese Messages for popt
+# Copyright (C) 2005, 2007 Free Software Foundation, Inc.
+# Wei-Lun Chao <chaoweilun@pcmail.com.tw>, 2005.
+# LI Daobing <lidaobing@gmail.com>, 2007.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: popt 1.12\n"
+"Report-Msgid-Bugs-To: <popt-devel@rpm5.org>\n"
+"POT-Creation-Date: 2007-08-11 11:32-0400\n"
+"PO-Revision-Date: 2007-08-13 22:32+0800\n"
+"Last-Translator: LI Daobing <lidaobing@gmail.com>\n"
+"Language-Team: Chinese (simplified) <translation-team-zh-cn@lists."
+"sourceforge.net>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#: popt.c:35
+msgid "unknown errno"
+msgstr "未知的错误"
+
+#: popt.c:1002
+#, c-format
+msgid "option type (%d) not implemented in popt\n"
+msgstr "选项类别 (%d) 没有在 popt 中实现\n"
+
+#: popt.c:1215
+msgid "missing argument"
+msgstr "缺少参数"
+
+#: popt.c:1217
+msgid "unknown option"
+msgstr "未知的选项"
+
+#: popt.c:1219
+msgid "mutually exclusive logical operations requested"
+msgstr "需要 XOR 逻辑运算"
+
+#: popt.c:1221
+msgid "opt->arg should not be NULL"
+msgstr "opt->arg 不应该为 NULL"
+
+#: popt.c:1223
+msgid "aliases nested too deeply"
+msgstr "别名嵌套太深"
+
+#: popt.c:1225
+msgid "error in parameter quoting"
+msgstr "参数引号错误"
+
+#: popt.c:1227
+msgid "invalid numeric value"
+msgstr "无效的数值"
+
+#: popt.c:1229
+msgid "number too large or too small"
+msgstr "数值太大或太小"
+
+#: popt.c:1231
+msgid "memory allocation failed"
+msgstr "内存分配错误"
+
+#: popt.c:1235
+msgid "unknown error"
+msgstr "未知的错误"
+
+#: popt.h:172
+msgid "Options implemented via popt alias/exec:"
+msgstr "通过 popt alias/exec 实现的选项:"
+
+#: popt.h:188
+msgid "Help options:"
+msgstr "帮助选项:"
+
+#: popthelp.c:68 popthelp.c:79
+msgid "Show this help message"
+msgstr "显示这个帮助信息"
+
+#: popthelp.c:69 popthelp.c:80
+msgid "Display brief usage message"
+msgstr "显示简短的使用说明"
+
+#: popthelp.c:83
+msgid "Display option defaults in message"
+msgstr "在信息中显示默认的选项"
+
+#: popthelp.c:135
+msgid "NONE"
+msgstr "NONE"
+
+#: popthelp.c:137
+msgid "VAL"
+msgstr "VAL"
+
+#: popthelp.c:141
+msgid "INT"
+msgstr "INT"
+
+#: popthelp.c:142
+msgid "LONG"
+msgstr "LONG"
+
+#: popthelp.c:143
+msgid "STRING"
+msgstr "STRING"
+
+#: popthelp.c:144
+msgid "FLOAT"
+msgstr "FLOAT"
+
+#: popthelp.c:145
+msgid "DOUBLE"
+msgstr "DOUBLE"
+
+#: popthelp.c:146
+msgid "ARG"
+msgstr "ARG"
+
+#: popthelp.c:559
+msgid "Usage:"
+msgstr "用法:"
+
+#: popthelp.c:583
+msgid "[OPTION...]"
+msgstr "[选项...]"
-- 
Gitee


From ca85e2f47c03fff87e4520dc775dd9007141b540 Mon Sep 17 00:00:00 2001
From: Jeff Johnson <n3npq@mac.com>
Date: Tue, 14 Aug 2007 14:42:33 +0000
Subject: [PATCH 461/667] - remove N_(...) markings from popt.h, markers in
 popthelp.c instead.

---
 CHANGES     |  1 +
 po/cs.po    | 18 +++++++++---------
 po/da.po    | 18 +++++++++---------
 po/de.po    | 18 +++++++++---------
 po/es.po    | 18 +++++++++---------
 po/fr.po    | 18 +++++++++---------
 po/ga.po    | 18 +++++++++---------
 po/gl.po    | 18 +++++++++---------
 po/hu.po    | 18 +++++++++---------
 po/is.po    | 18 +++++++++---------
 po/ja.po    | 18 +++++++++---------
 po/ko.po    | 18 +++++++++---------
 po/nb.po    | 18 +++++++++---------
 po/nl.po    | 20 ++++++++++----------
 po/pl.po    | 18 +++++++++---------
 po/popt.pot | 18 +++++++++---------
 po/pt.po    | 18 +++++++++---------
 po/ro.po    | 18 +++++++++---------
 po/ru.po    | 18 +++++++++---------
 po/sk.po    | 18 +++++++++---------
 po/sl.po    | 18 +++++++++---------
 po/sv.po    | 18 +++++++++---------
 po/tr.po    | 18 +++++++++---------
 po/uk.po    | 18 +++++++++---------
 po/vi.po    | 18 +++++++++---------
 po/wa.po    | 18 +++++++++---------
 po/zh_CN.po | 18 +++++++++---------
 popt.h      |  8 ++------
 popthelp.c  |  4 ++--
 29 files changed, 240 insertions(+), 243 deletions(-)

diff --git a/CHANGES b/CHANGES
index 4e6b1e1..8bd30d7 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,4 +1,5 @@
 1.12 -> 1.13:
+   - jbj: remove N_(...) markings from popt.h, markers in popthelp.c instead.
    - jbj: add zh_CN.po (Translation Project).
    - jbj: use PACKAGE_BUGREPORT.
    - jbj: hotwire POPT_AUTOHELP/POPT_AUTOALIAS lookup in popt i18n domain.
diff --git a/po/cs.po b/po/cs.po
index 8f9c71e..4bd496d 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.12\n"
 "Report-Msgid-Bugs-To: <popt-devel@rpm5.org>\n"
-"POT-Creation-Date: 2007-08-11 11:32-0400\n"
+"POT-Creation-Date: 2007-08-14 10:34-0400\n"
 "PO-Revision-Date: 2001-07-24 00:03+0100\n"
 "Last-Translator: Milan Kerslager <kerslage@linux.cz>\n"
 "Language-Team: Czech <cs@li.org>\n"
@@ -59,14 +59,6 @@ msgstr "selhala alokace pam
 msgid "unknown error"
 msgstr "nezn�m� chyba"
 
-#: popt.h:172
-msgid "Options implemented via popt alias/exec:"
-msgstr ""
-
-#: popt.h:188
-msgid "Help options:"
-msgstr ""
-
 #: popthelp.c:68 popthelp.c:79
 msgid "Show this help message"
 msgstr "Vyp��e tuto n�pov�du"
@@ -79,6 +71,14 @@ msgstr "Vyp
 msgid "Display option defaults in message"
 msgstr "Zobrazit implicitn� volby ve zpr�v�"
 
+#: popthelp.c:126
+msgid "Help options:"
+msgstr ""
+
+#: popthelp.c:127
+msgid "Options implemented via popt alias/exec:"
+msgstr ""
+
 #: popthelp.c:135
 msgid "NONE"
 msgstr "NONE"
diff --git a/po/da.po b/po/da.po
index 1fe597e..acee7c2 100644
--- a/po/da.po
+++ b/po/da.po
@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.12\n"
 "Report-Msgid-Bugs-To: <popt-devel@rpm5.org>\n"
-"POT-Creation-Date: 2007-08-11 11:32-0400\n"
+"POT-Creation-Date: 2007-08-14 10:34-0400\n"
 "PO-Revision-Date: Sun Jan 21 2001 04:30:32+0200\n"
 "Last-Translator: Martin Hansen <mah@k64.dk>\n"
 "Language-Team: Dansk <dansk@klid.dk>\n"
@@ -60,14 +60,6 @@ msgstr ""
 msgid "unknown error"
 msgstr "ukendt fejl"
 
-#: popt.h:172
-msgid "Options implemented via popt alias/exec:"
-msgstr ""
-
-#: popt.h:188
-msgid "Help options:"
-msgstr ""
-
 #: popthelp.c:68 popthelp.c:79
 msgid "Show this help message"
 msgstr "Vis denne hj�lpemeddelelse"
@@ -81,6 +73,14 @@ msgstr "Vis kortfattet brugsanvisning"
 msgid "Display option defaults in message"
 msgstr "Vis kortfattet brugsanvisning"
 
+#: popthelp.c:126
+msgid "Help options:"
+msgstr ""
+
+#: popthelp.c:127
+msgid "Options implemented via popt alias/exec:"
+msgstr ""
+
 #: popthelp.c:135
 msgid "NONE"
 msgstr "INGEN"
diff --git a/po/de.po b/po/de.po
index e737da4..e6daa0c 100644
--- a/po/de.po
+++ b/po/de.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.12\n"
 "Report-Msgid-Bugs-To: <popt-devel@rpm5.org>\n"
-"POT-Creation-Date: 2007-08-11 11:32-0400\n"
+"POT-Creation-Date: 2007-08-14 10:34-0400\n"
 "PO-Revision-Date: 2007-02-17 21:00+0100\n"
 "Last-Translator: Robert Scheck <rpm@robert-scheck.de>\n"
 "Language-Team: German <de@li.org>\n"
@@ -63,14 +63,6 @@ msgstr "Speicherzuordnung fehlgeschlagen"
 msgid "unknown error"
 msgstr "Unbekannter Fehler"
 
-#: popt.h:172
-msgid "Options implemented via popt alias/exec:"
-msgstr "Optionen über popt alias/exec implementiert:"
-
-#: popt.h:188
-msgid "Help options:"
-msgstr "Hilfe-Optionen:"
-
 #: popthelp.c:68 popthelp.c:79
 msgid "Show this help message"
 msgstr "Zeigt diese Hilfe an"
@@ -83,6 +75,14 @@ msgstr "Zeigt eine kurze Verwendungsinformation"
 msgid "Display option defaults in message"
 msgstr "Zeigt die Standardeinstellungen an"
 
+#: popthelp.c:126
+msgid "Help options:"
+msgstr "Hilfe-Optionen:"
+
+#: popthelp.c:127
+msgid "Options implemented via popt alias/exec:"
+msgstr "Optionen über popt alias/exec implementiert:"
+
 #: popthelp.c:135
 msgid "NONE"
 msgstr "NICHTS"
diff --git a/po/es.po b/po/es.po
index 0512c2d..af7876b 100644
--- a/po/es.po
+++ b/po/es.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.12\n"
 "Report-Msgid-Bugs-To: <popt-devel@rpm5.org>\n"
-"POT-Creation-Date: 2007-08-11 11:32-0400\n"
+"POT-Creation-Date: 2007-08-14 10:34-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Leandro Lucarella <luca@linuxmendoza.org.ar>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -64,14 +64,6 @@ msgstr ""
 msgid "unknown error"
 msgstr "error desconocido"
 
-#: popt.h:172
-msgid "Options implemented via popt alias/exec:"
-msgstr ""
-
-#: popt.h:188
-msgid "Help options:"
-msgstr ""
-
 #: popthelp.c:68 popthelp.c:79
 msgid "Show this help message"
 msgstr "Muestra este mensaje de ayuda"
@@ -85,6 +77,14 @@ msgstr "Indica el modo de uso resumido"
 msgid "Display option defaults in message"
 msgstr "Indica el modo de uso resumido"
 
+#: popthelp.c:126
+msgid "Help options:"
+msgstr ""
+
+#: popthelp.c:127
+msgid "Options implemented via popt alias/exec:"
+msgstr ""
+
 #: popthelp.c:135
 msgid "NONE"
 msgstr "NONE"
diff --git a/po/fr.po b/po/fr.po
index 50be87c..cb9ebeb 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -12,7 +12,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.12\n"
 "Report-Msgid-Bugs-To: <popt-devel@rpm5.org>\n"
-"POT-Creation-Date: 2007-08-11 11:32-0400\n"
+"POT-Creation-Date: 2007-08-14 10:34-0400\n"
 "PO-Revision-Date: 2003-06-22 23:43+0200\n"
 "Last-Translator: RPM French Translation <rpm-fr@livna.org>\n"
 "Language-Team: RPM French Translation <rpm-fr@livna.org>\n"
@@ -69,14 +69,6 @@ msgstr "échec de l'allocation de mémoire"
 msgid "unknown error"
 msgstr "erreur inconnue"
 
-#: popt.h:172
-msgid "Options implemented via popt alias/exec:"
-msgstr ""
-
-#: popt.h:188
-msgid "Help options:"
-msgstr ""
-
 #: popthelp.c:68 popthelp.c:79
 msgid "Show this help message"
 msgstr "Montre ce message d'aide"
@@ -89,6 +81,14 @@ msgstr "Affiche un bref descriptif de l'utilisation"
 msgid "Display option defaults in message"
 msgstr "Afficher les valeurs par défaut des options dans le message"
 
+#: popthelp.c:126
+msgid "Help options:"
+msgstr ""
+
+#: popthelp.c:127
+msgid "Options implemented via popt alias/exec:"
+msgstr ""
+
 #: popthelp.c:135
 msgid "NONE"
 msgstr "RIEN"
diff --git a/po/ga.po b/po/ga.po
index 4f69b3a..c160eb9 100644
--- a/po/ga.po
+++ b/po/ga.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.12\n"
 "Report-Msgid-Bugs-To: <popt-devel@rpm5.org>\n"
-"POT-Creation-Date: 2007-08-11 11:32-0400\n"
+"POT-Creation-Date: 2007-08-14 10:34-0400\n"
 "PO-Revision-Date: 2007-06-19 06:21-0500\n"
 "Last-Translator: Kevin Scannell <kscanne@gmail.com>\n"
 "Language-Team: Irish <gaeilge-gnulinux@lists.sourceforge.net>\n"
@@ -63,14 +63,6 @@ msgstr "theip ar dháileadh na cuimhne"
 msgid "unknown error"
 msgstr "earráid anaithnid"
 
-#: popt.h:172
-msgid "Options implemented via popt alias/exec:"
-msgstr "Roghanna a cuireadh i bhfeidhm trí ailias/exec popt:"
-
-#: popt.h:188
-msgid "Help options:"
-msgstr "Roghanna cabhracha:"
-
 #: popthelp.c:68 popthelp.c:79
 msgid "Show this help message"
 msgstr "Taispeáin an chabhair seo"
@@ -83,6 +75,14 @@ msgstr "Taispeáin beagán eolais faoin úsáid"
 msgid "Display option defaults in message"
 msgstr "Taispeáin luachanna réamhshocraithe na roghanna sa teachtaireacht"
 
+#: popthelp.c:126
+msgid "Help options:"
+msgstr "Roghanna cabhracha:"
+
+#: popthelp.c:127
+msgid "Options implemented via popt alias/exec:"
+msgstr "Roghanna a cuireadh i bhfeidhm trí ailias/exec popt:"
+
 #: popthelp.c:135
 msgid "NONE"
 msgstr "NEAMHNÍ"
diff --git a/po/gl.po b/po/gl.po
index b6196bf..032c2ba 100644
--- a/po/gl.po
+++ b/po/gl.po
@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.12\n"
 "Report-Msgid-Bugs-To: <popt-devel@rpm5.org>\n"
-"POT-Creation-Date: 2007-08-11 11:32-0400\n"
+"POT-Creation-Date: 2007-08-14 10:34-0400\n"
 "PO-Revision-Date: 2001-01-17 01:01+0100\n"
 "Last-Translator: Jes�s Bravo �lvarez <jba@pobox.com>\n"
 "Language-Team: Galician <trasno@ceu.fi.udc.es>\n"
@@ -59,14 +59,6 @@ msgstr ""
 msgid "unknown error"
 msgstr "erro desco�ecido"
 
-#: popt.h:172
-msgid "Options implemented via popt alias/exec:"
-msgstr ""
-
-#: popt.h:188
-msgid "Help options:"
-msgstr ""
-
 #: popthelp.c:68 popthelp.c:79
 msgid "Show this help message"
 msgstr "Amosar esta mensaxe de axuda"
@@ -80,6 +72,14 @@ msgstr "Amosar brevemente o xeito de utilizaci
 msgid "Display option defaults in message"
 msgstr "Amosar brevemente o xeito de utilizaci�n"
 
+#: popthelp.c:126
+msgid "Help options:"
+msgstr ""
+
+#: popthelp.c:127
+msgid "Options implemented via popt alias/exec:"
+msgstr ""
+
 #: popthelp.c:135
 msgid "NONE"
 msgstr "NADA"
diff --git a/po/hu.po b/po/hu.po
index 4153e13..b1dce6c 100644
--- a/po/hu.po
+++ b/po/hu.po
@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.12\n"
 "Report-Msgid-Bugs-To: <popt-devel@rpm5.org>\n"
-"POT-Creation-Date: 2007-08-11 11:32-0400\n"
+"POT-Creation-Date: 2007-08-14 10:34-0400\n"
 "PO-Revision-Date: 2000-08-03 23:26+0200\n"
 "Last-Translator: L�szl� N�meth <nemeth@qwertynet.hu>\n"
 "Language-Team: Hungarian\n"
@@ -59,14 +59,6 @@ msgstr ""
 msgid "unknown error"
 msgstr ""
 
-#: popt.h:172
-msgid "Options implemented via popt alias/exec:"
-msgstr ""
-
-#: popt.h:188
-msgid "Help options:"
-msgstr ""
-
 #: popthelp.c:68 popthelp.c:79
 msgid "Show this help message"
 msgstr "E s�g� megjelen�t�se"
@@ -80,6 +72,14 @@ msgstr "R
 msgid "Display option defaults in message"
 msgstr "R�vid haszn�lati utas�t�s megjelen�t�se"
 
+#: popthelp.c:126
+msgid "Help options:"
+msgstr ""
+
+#: popthelp.c:127
+msgid "Options implemented via popt alias/exec:"
+msgstr ""
+
 #: popthelp.c:135
 msgid "NONE"
 msgstr ""
diff --git a/po/is.po b/po/is.po
index b8309fe..0ff5fbf 100644
--- a/po/is.po
+++ b/po/is.po
@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.12\n"
 "Report-Msgid-Bugs-To: <popt-devel@rpm5.org>\n"
-"POT-Creation-Date: 2007-08-11 11:32-0400\n"
+"POT-Creation-Date: 2007-08-14 10:34-0400\n"
 "PO-Revision-Date: 2001-06-08 01:35+0000\n"
 "Last-Translator: Richard Allen <ra@hp.is>\n"
 "Language-Team: is <kde-isl@mmedia.is>\n"
@@ -59,14 +59,6 @@ msgstr "ekki t
 msgid "unknown error"
 msgstr "��ekkt villa"
 
-#: popt.h:172
-msgid "Options implemented via popt alias/exec:"
-msgstr ""
-
-#: popt.h:188
-msgid "Help options:"
-msgstr ""
-
 #: popthelp.c:68 popthelp.c:79
 msgid "Show this help message"
 msgstr "S�na �essa hj�lp"
@@ -79,6 +71,14 @@ msgstr "S
 msgid "Display option defaults in message"
 msgstr "S�na sj�lfgefin gildi rofa � skilabo�um"
 
+#: popthelp.c:126
+msgid "Help options:"
+msgstr ""
+
+#: popthelp.c:127
+msgid "Options implemented via popt alias/exec:"
+msgstr ""
+
 #: popthelp.c:135
 msgid "NONE"
 msgstr "ENGIN"
diff --git a/po/ja.po b/po/ja.po
index 4c64ee2..2e40858 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.12\n"
 "Report-Msgid-Bugs-To: <popt-devel@rpm5.org>\n"
-"POT-Creation-Date: 2007-08-11 11:32-0400\n"
+"POT-Creation-Date: 2007-08-14 10:34-0400\n"
 "PO-Revision-Date: 2003--8-25 19:00+0900\n"
 "Last-Translator: Yukihiro Nakai <ynakai@redhat.com>\n"
 "Language-Team: Japanese <ja@li.org>\n"
@@ -63,14 +63,6 @@ msgstr "メモリ確保に失敗しました"
 msgid "unknown error"
 msgstr "不明なエラー"
 
-#: popt.h:172
-msgid "Options implemented via popt alias/exec:"
-msgstr "poptのalias/execで実装されているオプション:"
-
-#: popt.h:188
-msgid "Help options:"
-msgstr "ヘルプオプション:"
-
 #: popthelp.c:68 popthelp.c:79
 msgid "Show this help message"
 msgstr "このヘルプメッセージを表示します"
@@ -83,6 +75,14 @@ msgstr "使い方の概要を表示します"
 msgid "Display option defaults in message"
 msgstr "オプションのデフォルト値をメッセージに表示します"
 
+#: popthelp.c:126
+msgid "Help options:"
+msgstr "ヘルプオプション:"
+
+#: popthelp.c:127
+msgid "Options implemented via popt alias/exec:"
+msgstr "poptのalias/execで実装されているオプション:"
+
 #: popthelp.c:135
 msgid "NONE"
 msgstr "なし"
diff --git a/po/ko.po b/po/ko.po
index eb45236..24bea38 100644
--- a/po/ko.po
+++ b/po/ko.po
@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.12\n"
 "Report-Msgid-Bugs-To: <popt-devel@rpm5.org>\n"
-"POT-Creation-Date: 2007-08-11 11:32-0400\n"
+"POT-Creation-Date: 2007-08-14 10:34-0400\n"
 "PO-Revision-Date: 2001-09-06 20:06+0900\n"
 "Last-Translator: Jong-Hoon Ryu <redhat4u@netian.com>\n"
 "Language-Team: GNU Translation project <ko@li.org>\n"
@@ -59,14 +59,6 @@ msgstr "
 msgid "unknown error"
 msgstr "�� �� ���� �����Դϴ�"
 
-#: popt.h:172
-msgid "Options implemented via popt alias/exec:"
-msgstr ""
-
-#: popt.h:188
-msgid "Help options:"
-msgstr ""
-
 #: popthelp.c:68 popthelp.c:79
 msgid "Show this help message"
 msgstr "�� ������ �����ݴϴ�"
@@ -79,6 +71,14 @@ msgstr "
 msgid "Display option defaults in message"
 msgstr "�⺻���� �ɼ��� �����ݴϴ�"
 
+#: popthelp.c:126
+msgid "Help options:"
+msgstr ""
+
+#: popthelp.c:127
+msgid "Options implemented via popt alias/exec:"
+msgstr ""
+
 #: popthelp.c:135
 msgid "NONE"
 msgstr "����(NONE)"
diff --git a/po/nb.po b/po/nb.po
index 819e5e2..ce00b71 100644
--- a/po/nb.po
+++ b/po/nb.po
@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.12\n"
 "Report-Msgid-Bugs-To: <popt-devel@rpm5.org>\n"
-"POT-Creation-Date: 2007-08-11 11:32-0400\n"
+"POT-Creation-Date: 2007-08-14 10:34-0400\n"
 "PO-Revision-Date: 2001-06-27 11:05+0200\n"
 "Last-Translator: Kjartan Maraas <kmaraas@online.no>\n"
 "Language-Team: Norwegian <no@li.org>\n"
@@ -59,14 +59,6 @@ msgstr "minneallokering feilet"
 msgid "unknown error"
 msgstr "ukjent feil"
 
-#: popt.h:172
-msgid "Options implemented via popt alias/exec:"
-msgstr ""
-
-#: popt.h:188
-msgid "Help options:"
-msgstr ""
-
 #: popthelp.c:68 popthelp.c:79
 msgid "Show this help message"
 msgstr "Vis denne hjelpmeldingen"
@@ -79,6 +71,14 @@ msgstr "Vis kort bruksmelding"
 msgid "Display option defaults in message"
 msgstr "Vis forvalgte flagg i melding"
 
+#: popthelp.c:126
+msgid "Help options:"
+msgstr ""
+
+#: popthelp.c:127
+msgid "Options implemented via popt alias/exec:"
+msgstr ""
+
 #: popthelp.c:135
 msgid "NONE"
 msgstr "INGEN"
diff --git a/po/nl.po b/po/nl.po
index 13b81be..60e54ed 100644
--- a/po/nl.po
+++ b/po/nl.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.12\n"
 "Report-Msgid-Bugs-To: <popt-devel@rpm5.org>\n"
-"POT-Creation-Date: 2007-08-11 11:32-0400\n"
+"POT-Creation-Date: 2007-08-14 10:34-0400\n"
 "PO-Revision-Date: 2007-06-29 17:38+0200\n"
 "Last-Translator: Tim Van Holder <tim.van.holder@telenet.be>\n"
 "Language-Team: Dutch <vertaling@vrijschrift.org>\n"
@@ -65,15 +65,6 @@ msgstr "geheugenreservatie mislukt"
 msgid "unknown error"
 msgstr "onbekende fout"
 
-#: popt.h:172
-msgid "Options implemented via popt alias/exec:"
-msgstr "Opties geïmplementeerd d.m.v. popt alias/exec:"
-
-# of "Help-opties:"?
-#: popt.h:188
-msgid "Help options:"
-msgstr "Hulp-opties:"
-
 #: popthelp.c:68 popthelp.c:79
 msgid "Show this help message"
 msgstr "Toon deze hulptekst"
@@ -86,6 +77,15 @@ msgstr "Toon korte tekst over gebruik"
 msgid "Display option defaults in message"
 msgstr "Toon standaardwaarden van opties in de tekst"
 
+# of "Help-opties:"?
+#: popthelp.c:126
+msgid "Help options:"
+msgstr "Hulp-opties:"
+
+#: popthelp.c:127
+msgid "Options implemented via popt alias/exec:"
+msgstr "Opties geïmplementeerd d.m.v. popt alias/exec:"
+
 #: popthelp.c:135
 msgid "NONE"
 msgstr "GEEN"
diff --git a/po/pl.po b/po/pl.po
index cb14315..97e0b60 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.12\n"
 "Report-Msgid-Bugs-To: <popt-devel@rpm5.org>\n"
-"POT-Creation-Date: 2007-08-11 11:32-0400\n"
+"POT-Creation-Date: 2007-08-14 10:34-0400\n"
 "PO-Revision-Date: 2003-06-08 20:32+0200\n"
 "Last-Translator: Jakub Bogusz <qboosh@pld-linux.org>\n"
 "Language-Team: Polish <translation-team-pl@lists.sourceforge.net>\n"
@@ -63,14 +63,6 @@ msgstr "błąd alokacji pamięci"
 msgid "unknown error"
 msgstr "nieznany błąd"
 
-#: popt.h:172
-msgid "Options implemented via popt alias/exec:"
-msgstr "Opcje zaimplementowane poprzez popt alias/exec:"
-
-#: popt.h:188
-msgid "Help options:"
-msgstr "Opcje pomocy:"
-
 #: popthelp.c:68 popthelp.c:79
 msgid "Show this help message"
 msgstr "Pokaż tą pomoc"
@@ -83,6 +75,14 @@ msgstr "Wyświetl skrócony sposób użycia"
 msgid "Display option defaults in message"
 msgstr "Wyświetl domyślne opcje w opisie"
 
+#: popthelp.c:126
+msgid "Help options:"
+msgstr "Opcje pomocy:"
+
+#: popthelp.c:127
+msgid "Options implemented via popt alias/exec:"
+msgstr "Opcje zaimplementowane poprzez popt alias/exec:"
+
 #: popthelp.c:135
 msgid "NONE"
 msgstr "BRAK"
diff --git a/po/popt.pot b/po/popt.pot
index 226eed4..d721eea 100644
--- a/po/popt.pot
+++ b/po/popt.pot
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: <popt-devel@rpm5.org>\n"
-"POT-Creation-Date: 2007-08-11 11:32-0400\n"
+"POT-Creation-Date: 2007-08-14 10:34-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -64,14 +64,6 @@ msgstr ""
 msgid "unknown error"
 msgstr ""
 
-#: popt.h:172
-msgid "Options implemented via popt alias/exec:"
-msgstr ""
-
-#: popt.h:188
-msgid "Help options:"
-msgstr ""
-
 #: popthelp.c:68 popthelp.c:79
 msgid "Show this help message"
 msgstr ""
@@ -84,6 +76,14 @@ msgstr ""
 msgid "Display option defaults in message"
 msgstr ""
 
+#: popthelp.c:126
+msgid "Help options:"
+msgstr ""
+
+#: popthelp.c:127
+msgid "Options implemented via popt alias/exec:"
+msgstr ""
+
 #: popthelp.c:135
 msgid "NONE"
 msgstr ""
diff --git a/po/pt.po b/po/pt.po
index 0b13e6d..6b8fe2c 100644
--- a/po/pt.po
+++ b/po/pt.po
@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.12\n"
 "Report-Msgid-Bugs-To: <popt-devel@rpm5.org>\n"
-"POT-Creation-Date: 2007-08-11 11:32-0400\n"
+"POT-Creation-Date: 2007-08-14 10:34-0400\n"
 "PO-Revision-Date: 2002-02-13 18:32+0000\n"
 "Last-Translator: Pedro Morais <morais@kde.org>\n"
 "Language-Team: pt <morais@kde.org>\n"
@@ -59,14 +59,6 @@ msgstr "aloca
 msgid "unknown error"
 msgstr "erro desconhecido"
 
-#: popt.h:172
-msgid "Options implemented via popt alias/exec:"
-msgstr ""
-
-#: popt.h:188
-msgid "Help options:"
-msgstr ""
-
 #: popthelp.c:68 popthelp.c:79
 msgid "Show this help message"
 msgstr "Mostrar esta mensagem de ajuda"
@@ -79,6 +71,14 @@ msgstr "Mostrar uma mensagem de utiliza
 msgid "Display option defaults in message"
 msgstr "Mostrar valor por omiss�o das op��es na mensagem"
 
+#: popthelp.c:126
+msgid "Help options:"
+msgstr ""
+
+#: popthelp.c:127
+msgid "Options implemented via popt alias/exec:"
+msgstr ""
+
 #: popthelp.c:135
 msgid "NONE"
 msgstr "NONE"
diff --git a/po/ro.po b/po/ro.po
index c4d6db4..29582b0 100644
--- a/po/ro.po
+++ b/po/ro.po
@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.12\n"
 "Report-Msgid-Bugs-To: <popt-devel@rpm5.org>\n"
-"POT-Creation-Date: 2007-08-11 11:32-0400\n"
+"POT-Creation-Date: 2007-08-14 10:34-0400\n"
 "PO-Revision-Date: 2000-06-14 23:23+EST\n"
 "Last-Translator: Cristian Gafton <gafton@redhat.com>\n"
 "Language-Team: Romanian <ro@li.org>\n"
@@ -60,14 +60,6 @@ msgstr ""
 msgid "unknown error"
 msgstr "eroare necuinoscuta"
 
-#: popt.h:172
-msgid "Options implemented via popt alias/exec:"
-msgstr ""
-
-#: popt.h:188
-msgid "Help options:"
-msgstr ""
-
 #: popthelp.c:68 popthelp.c:79
 msgid "Show this help message"
 msgstr "Afisare mesaj de help"
@@ -81,6 +73,14 @@ msgstr "Afisare mesaj sintaxa sumar"
 msgid "Display option defaults in message"
 msgstr "Afisare mesaj sintaxa sumar"
 
+#: popthelp.c:126
+msgid "Help options:"
+msgstr ""
+
+#: popthelp.c:127
+msgid "Options implemented via popt alias/exec:"
+msgstr ""
+
 #: popthelp.c:135
 msgid "NONE"
 msgstr ""
diff --git a/po/ru.po b/po/ru.po
index a8d5d69..6130fd8 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.12\n"
 "Report-Msgid-Bugs-To: <popt-devel@rpm5.org>\n"
-"POT-Creation-Date: 2007-08-11 11:32-0400\n"
+"POT-Creation-Date: 2007-08-14 10:34-0400\n"
 "PO-Revision-Date: 2001-07-05 21:00-0500\n"
 "Last-Translator: Eugene Kanter <eugene@blackcatlinux.com>\n"
 "Language-Team: Black Cat Linux Team <blackcat-support@blackcatlinux.com>\n"
@@ -59,14 +59,6 @@ msgstr "
 msgid "unknown error"
 msgstr "����������� ������"
 
-#: popt.h:172
-msgid "Options implemented via popt alias/exec:"
-msgstr ""
-
-#: popt.h:188
-msgid "Help options:"
-msgstr ""
-
 #: popthelp.c:68 popthelp.c:79
 msgid "Show this help message"
 msgstr "�������� ��� ���������"
@@ -79,6 +71,14 @@ msgstr "
 msgid "Display option defaults in message"
 msgstr "�������� ��������� �� ���������"
 
+#: popthelp.c:126
+msgid "Help options:"
+msgstr ""
+
+#: popthelp.c:127
+msgid "Options implemented via popt alias/exec:"
+msgstr ""
+
 #: popthelp.c:135
 msgid "NONE"
 msgstr "NONE"
diff --git a/po/sk.po b/po/sk.po
index 4082bf6..27d4782 100644
--- a/po/sk.po
+++ b/po/sk.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.12\n"
 "Report-Msgid-Bugs-To: <popt-devel@rpm5.org>\n"
-"POT-Creation-Date: 2007-08-11 11:32-0400\n"
+"POT-Creation-Date: 2007-08-14 10:34-0400\n"
 "PO-Revision-Date: 1999-08-04 21:40+0200\n"
 "Last-Translator: Stanislav Meduna <stano@eunet.sk>\n"
 "Language-Team: Slovak <sk-i18n@rak.isternet.sk>\n"
@@ -63,14 +63,6 @@ msgstr ""
 msgid "unknown error"
 msgstr ""
 
-#: popt.h:172
-msgid "Options implemented via popt alias/exec:"
-msgstr ""
-
-#: popt.h:188
-msgid "Help options:"
-msgstr ""
-
 #: popthelp.c:68 popthelp.c:79
 msgid "Show this help message"
 msgstr "Vyp�sa� t�to spr�vu"
@@ -84,6 +76,14 @@ msgstr "Zobrazi
 msgid "Display option defaults in message"
 msgstr "Zobrazi� stru�n� n�vod na pou�itie"
 
+#: popthelp.c:126
+msgid "Help options:"
+msgstr ""
+
+#: popthelp.c:127
+msgid "Options implemented via popt alias/exec:"
+msgstr ""
+
 #: popthelp.c:135
 msgid "NONE"
 msgstr ""
diff --git a/po/sl.po b/po/sl.po
index 34adaae..db1ecc6 100644
--- a/po/sl.po
+++ b/po/sl.po
@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.12\n"
 "Report-Msgid-Bugs-To: <popt-devel@rpm5.org>\n"
-"POT-Creation-Date: 2007-08-11 11:32-0400\n"
+"POT-Creation-Date: 2007-08-14 10:34-0400\n"
 "PO-Revision-Date: 2000-09-05 12:30+0200\n"
 "Last-Translator: Roman Maurer <roman.maurer@hermes.si>\n"
 "Language-Team: Slovenian <sl@li.org>\n"
@@ -59,14 +59,6 @@ msgstr ""
 msgid "unknown error"
 msgstr ""
 
-#: popt.h:172
-msgid "Options implemented via popt alias/exec:"
-msgstr ""
-
-#: popt.h:188
-msgid "Help options:"
-msgstr ""
-
 #: popthelp.c:68 popthelp.c:79
 msgid "Show this help message"
 msgstr "Prika�i to sporo�ilo s pomo�jo"
@@ -80,6 +72,14 @@ msgstr "Prika
 msgid "Display option defaults in message"
 msgstr "Prika�i kratko sporo�ilo o uporabi"
 
+#: popthelp.c:126
+msgid "Help options:"
+msgstr ""
+
+#: popthelp.c:127
+msgid "Options implemented via popt alias/exec:"
+msgstr ""
+
 #: popthelp.c:135
 msgid "NONE"
 msgstr ""
diff --git a/po/sv.po b/po/sv.po
index dcd05d4..8be0357 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.12\n"
 "Report-Msgid-Bugs-To: <popt-devel@rpm5.org>\n"
-"POT-Creation-Date: 2007-08-11 11:32-0400\n"
+"POT-Creation-Date: 2007-08-14 10:34-0400\n"
 "PO-Revision-Date: 2007-06-12 22:00+0200\n"
 "Last-Translator: G�ran Uddeborg <goeran@uddeborg.se>\n"
 "Language-Team: Swedish <tp-sv@listor.tp-sv.se>\n"
@@ -59,14 +59,6 @@ msgstr "minnesallokering misslyckades"
 msgid "unknown error"
 msgstr "ok�nt fel"
 
-#: popt.h:172
-msgid "Options implemented via popt alias/exec:"
-msgstr "Flaggor implementerade via popt-alias/exec:"
-
-#: popt.h:188
-msgid "Help options:"
-msgstr "Hj�lpflaggor:"
-
 #: popthelp.c:68 popthelp.c:79
 msgid "Show this help message"
 msgstr "Visa denna hj�lptext"
@@ -79,6 +71,14 @@ msgstr "Visa en kortfattad anv
 msgid "Display option defaults in message"
 msgstr "Visa standardalternativ f�r flaggor i meddelande"
 
+#: popthelp.c:126
+msgid "Help options:"
+msgstr "Hj�lpflaggor:"
+
+#: popthelp.c:127
+msgid "Options implemented via popt alias/exec:"
+msgstr "Flaggor implementerade via popt-alias/exec:"
+
 #: popthelp.c:135
 msgid "NONE"
 msgstr "INGET"
diff --git a/po/tr.po b/po/tr.po
index 90501cb..57423bc 100644
--- a/po/tr.po
+++ b/po/tr.po
@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.12\n"
 "Report-Msgid-Bugs-To: <popt-devel@rpm5.org>\n"
-"POT-Creation-Date: 2007-08-11 11:32-0400\n"
+"POT-Creation-Date: 2007-08-14 10:34-0400\n"
 "PO-Revision-Date: 2000-02-11 13:01+0200\n"
 "Last-Translator: Nilgun Belma Buguner <nilgun@technologist.com>\n"
 "Language-Team: Turkish <tr@li.org>\n"
@@ -59,14 +59,6 @@ msgstr ""
 msgid "unknown error"
 msgstr "bilinmeyen hata"
 
-#: popt.h:172
-msgid "Options implemented via popt alias/exec:"
-msgstr ""
-
-#: popt.h:188
-msgid "Help options:"
-msgstr ""
-
 #: popthelp.c:68 popthelp.c:79
 msgid "Show this help message"
 msgstr "Bu yard�m iletisini g�sterir"
@@ -80,6 +72,14 @@ msgstr "K
 msgid "Display option defaults in message"
 msgstr "K�sa bir kullan�m iletisi g�ster"
 
+#: popthelp.c:126
+msgid "Help options:"
+msgstr ""
+
+#: popthelp.c:127
+msgid "Options implemented via popt alias/exec:"
+msgstr ""
+
 #: popthelp.c:135
 msgid "NONE"
 msgstr "YOK"
diff --git a/po/uk.po b/po/uk.po
index f0a9ab9..31a4717 100644
--- a/po/uk.po
+++ b/po/uk.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.12\n"
 "Report-Msgid-Bugs-To: <popt-devel@rpm5.org>\n"
-"POT-Creation-Date: 2007-08-11 11:32-0400\n"
+"POT-Creation-Date: 2007-08-14 10:34-0400\n"
 "PO-Revision-Date: 1999-09-30 16:54+0200\n"
 "Last-Translator: Yuri Syrota <rasta@renome.rovno.ua>\n"
 "Language-Team: Ukrainian <uk@li.org>\n"
@@ -63,14 +63,6 @@ msgstr ""
 msgid "unknown error"
 msgstr ""
 
-#: popt.h:172
-msgid "Options implemented via popt alias/exec:"
-msgstr ""
-
-#: popt.h:188
-msgid "Help options:"
-msgstr ""
-
 #: popthelp.c:68 popthelp.c:79
 msgid "Show this help message"
 msgstr "�������� �� ��צ���"
@@ -84,6 +76,14 @@ msgstr "
 msgid "Display option defaults in message"
 msgstr "�������� ������� ��צ��� ��� ������������"
 
+#: popthelp.c:126
+msgid "Help options:"
+msgstr ""
+
+#: popthelp.c:127
+msgid "Options implemented via popt alias/exec:"
+msgstr ""
+
 #: popthelp.c:135
 msgid "NONE"
 msgstr ""
diff --git a/po/vi.po b/po/vi.po
index 331b86d..66296c8 100644
--- a/po/vi.po
+++ b/po/vi.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.12\n"
 "Report-Msgid-Bugs-To: <popt-devel@rpm5.org>\n"
-"POT-Creation-Date: 2007-08-11 11:32-0400\n"
+"POT-Creation-Date: 2007-08-14 10:34-0400\n"
 "PO-Revision-Date: 2007-07-12 22:37+0930\n"
 "Last-Translator: Clytie Siddall <clytie@riverland.net.au>\n"
 "Language-Team: Vietnamese <vi-VN@googlegroups.com>\n"
@@ -65,14 +65,6 @@ msgstr "lỗi cấp phát bộ nhớ"
 msgid "unknown error"
 msgstr "lỗi không rõ"
 
-#: popt.h:172
-msgid "Options implemented via popt alias/exec:"
-msgstr "Các tùy chọn được thực hiện thông qua popt alias/exec:"
-
-#: popt.h:188
-msgid "Help options:"
-msgstr "Tùy chọn trợ giúp:"
-
 #: popthelp.c:68 popthelp.c:79
 msgid "Show this help message"
 msgstr "Xem thông điệp trợ giúp này"
@@ -85,6 +77,14 @@ msgstr "Hiển thị thông điệp cách sử dụng ngắn"
 msgid "Display option defaults in message"
 msgstr "Hiển thị các giá trị mặc định của tùy chọn trong thông điệp"
 
+#: popthelp.c:126
+msgid "Help options:"
+msgstr "Tùy chọn trợ giúp:"
+
+#: popthelp.c:127
+msgid "Options implemented via popt alias/exec:"
+msgstr "Các tùy chọn được thực hiện thông qua popt alias/exec:"
+
 #: popthelp.c:135
 msgid "NONE"
 msgstr "KHÔNG CÓ"
diff --git a/po/wa.po b/po/wa.po
index 882bf2a..9311c29 100644
--- a/po/wa.po
+++ b/po/wa.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.12\n"
 "Report-Msgid-Bugs-To: <popt-devel@rpm5.org>\n"
-"POT-Creation-Date: 2007-08-11 11:32-0400\n"
+"POT-Creation-Date: 2007-08-14 10:34-0400\n"
 "PO-Revision-Date: 1999-03-18 23:11+0100\n"
 "Last-Translator: Nobody yet\n"
 "Language-Team: walon <linux-wa@chanae.alphanet.ch>\n"
@@ -67,14 +67,6 @@ msgstr ""
 msgid "unknown error"
 msgstr ""
 
-#: popt.h:172
-msgid "Options implemented via popt alias/exec:"
-msgstr ""
-
-#: popt.h:188
-msgid "Help options:"
-msgstr ""
-
 #: popthelp.c:68 popthelp.c:79
 msgid "Show this help message"
 msgstr "Mostrer ci messaedje d' aide chal"
@@ -88,6 +80,14 @@ msgstr "Mostre on court messaedje so kmint vos 
 msgid "Display option defaults in message"
 msgstr "Mostre on court messaedje so kmint vos � siervi"
 
+#: popthelp.c:126
+msgid "Help options:"
+msgstr ""
+
+#: popthelp.c:127
+msgid "Options implemented via popt alias/exec:"
+msgstr ""
+
 #: popthelp.c:135
 msgid "NONE"
 msgstr ""
diff --git a/po/zh_CN.po b/po/zh_CN.po
index 598d796..94d32ba 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.12\n"
 "Report-Msgid-Bugs-To: <popt-devel@rpm5.org>\n"
-"POT-Creation-Date: 2007-08-11 11:32-0400\n"
+"POT-Creation-Date: 2007-08-14 10:34-0400\n"
 "PO-Revision-Date: 2007-08-13 22:32+0800\n"
 "Last-Translator: LI Daobing <lidaobing@gmail.com>\n"
 "Language-Team: Chinese (simplified) <translation-team-zh-cn@lists."
@@ -66,14 +66,6 @@ msgstr "内存分配错误"
 msgid "unknown error"
 msgstr "未知的错误"
 
-#: popt.h:172
-msgid "Options implemented via popt alias/exec:"
-msgstr "通过 popt alias/exec 实现的选项:"
-
-#: popt.h:188
-msgid "Help options:"
-msgstr "帮助选项:"
-
 #: popthelp.c:68 popthelp.c:79
 msgid "Show this help message"
 msgstr "显示这个帮助信息"
@@ -86,6 +78,14 @@ msgstr "显示简短的使用说明"
 msgid "Display option defaults in message"
 msgstr "在信息中显示默认的选项"
 
+#: popthelp.c:126
+msgid "Help options:"
+msgstr "帮助选项:"
+
+#: popthelp.c:127
+msgid "Options implemented via popt alias/exec:"
+msgstr "通过 popt alias/exec 实现的选项:"
+
 #: popthelp.c:135
 msgid "NONE"
 msgstr "NONE"
diff --git a/popt.h b/popt.h
index c829717..9d1a02b 100644
--- a/popt.h
+++ b/popt.h
@@ -157,10 +157,6 @@ typedef struct poptItem_s {
  */
 /*@{*/
 
-#if !defined(N_)
-#define	N_(foo)	foo
-#endif
-
 /**
  * Empty table marker to enable displaying popt alias/exec options.
  */
@@ -169,7 +165,7 @@ typedef struct poptItem_s {
 extern struct poptOption poptAliasOptions[];
 /*@=exportvar@*/
 #define POPT_AUTOALIAS { NULL, '\0', POPT_ARG_INCLUDE_TABLE, poptAliasOptions, \
-			0, N_("Options implemented via popt alias/exec:"), NULL },
+			0, "Options implemented via popt alias/exec:", NULL },
 
 /**
  * Auto help table options.
@@ -185,7 +181,7 @@ extern struct poptOption * poptHelpOptionsI18N;
 /*@=exportvar@*/
 
 #define POPT_AUTOHELP { NULL, '\0', POPT_ARG_INCLUDE_TABLE, poptHelpOptions, \
-			0, N_("Help options:"), NULL },
+			0, "Help options:", NULL },
 
 #define POPT_TABLEEND { NULL, '\0', 0, NULL, 0, NULL, NULL }
 /*@}*/
diff --git a/popthelp.c b/popthelp.c
index 87a6a34..737f614 100644
--- a/popthelp.c
+++ b/popthelp.c
@@ -123,8 +123,8 @@ getArgDescrip(const struct poptOption * opt,
 	/* Some strings need popt library, not application, i18n domain. */
 	if (opt == (poptHelpOptions + 1)
 	 || opt == (poptHelpOptions + 2)
-	 || !strcmp(opt->argDescrip,"Help options:")
-	 || !strcmp(opt->argDescrip,"Options implemented via popt alias/exec:"))
+	 || !strcmp(opt->argDescrip,N_("Help options:"))
+	 || !strcmp(opt->argDescrip,N_("Options implemented via popt alias/exec:")))
 	    return POPT_(opt->argDescrip);
 
 	/* Use the application i18n domain. */
-- 
Gitee


From 0234c6651d40a7e480b9dffd8c081e61c2edfd8f Mon Sep 17 00:00:00 2001
From: Jeff Johnson <n3npq@mac.com>
Date: Wed, 15 Aug 2007 12:56:06 +0000
Subject: [PATCH 462/667] - help formatting for POPT_ARG_MAINCALL.

---
 CHANGES    |  9 +++++----
 popthelp.c | 13 +++++++++++--
 2 files changed, 16 insertions(+), 6 deletions(-)

diff --git a/CHANGES b/CHANGES
index 8bd30d7..ec9355d 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,8 +1,9 @@
 1.12 -> 1.13:
-   - jbj: remove N_(...) markings from popt.h, markers in popthelp.c instead.
-   - jbj: add zh_CN.po (Translation Project).
-   - jbj: use PACKAGE_BUGREPORT.
-   - jbj: hotwire POPT_AUTOHELP/POPT_AUTOALIAS lookup in popt i18n domain.
+    - jbj: help formatting for POPT_ARG_MAINCALL.
+    - jbj: remove N_(...) markings from popt.h, markers in popthelp.c instead.
+    - jbj: add zh_CN.po (Translation Project).
+    - jbj: use PACKAGE_BUGREPORT.
+    - jbj: hotwire POPT_AUTOHELP/POPT_AUTOALIAS lookup in popt i18n domain.
 
 1.11 -> 1.12
     - jbj: plug a memory leak.
diff --git a/popthelp.c b/popthelp.c
index 737f614..a5357d3 100644
--- a/popthelp.c
+++ b/popthelp.c
@@ -119,6 +119,9 @@ getArgDescrip(const struct poptOption * opt,
 {
     if (!(opt->argInfo & POPT_ARG_MASK)) return NULL;
 
+    if ((opt->argInfo & POPT_ARG_MASK) == POPT_ARG_MAINCALL)
+	return opt->argDescrip;
+
     if (opt->argDescrip) {
 	/* Some strings need popt library, not application, i18n domain. */
 	if (opt == (poptHelpOptions + 1)
@@ -143,6 +146,7 @@ getArgDescrip(const struct poptOption * opt,
     case POPT_ARG_STRING:	return POPT_("STRING");
     case POPT_ARG_FLOAT:	return POPT_("FLOAT");
     case POPT_ARG_DOUBLE:	return POPT_("DOUBLE");
+    case POPT_ARG_MAINCALL:	return NULL;
     default:			return POPT_("ARG");
     }
 }
@@ -192,6 +196,9 @@ singleOptionDefaultValue(size_t lineLength,
     {	double aDouble = *((double *)opt->arg);
 	le += sprintf(le, "%g", aDouble);
     }	break;
+    case POPT_ARG_MAINCALL:
+	le += sprintf(le, "%p", opt->arg);
+	break;
     case POPT_ARG_STRING:
     {	const char * s = *(const char **)opt->arg;
 	if (s == NULL) {
@@ -260,7 +267,8 @@ static void singleOptionHelp(FILE * fp, size_t maxLeftCol,
 	sprintf(left, "-%c", opt->shortName);
     else if (opt->longName)
 	sprintf(left, "%s%s",
-		((opt->argInfo & POPT_ARGFLAG_ONEDASH) ? "-" : "--"),
+		((opt->argInfo & POPT_ARG_MASK) == POPT_ARG_MAINCALL ? "" :
+		((opt->argInfo & POPT_ARGFLAG_ONEDASH) ? "-" : "--")),
 		opt->longName);
     if (!*left) goto out;
 
@@ -342,7 +350,8 @@ static void singleOptionHelp(FILE * fp, size_t maxLeftCol,
 	} else {
 	    size_t lelen;
 
-	    *le++ = '=';
+	    *le++ = ((opt->argInfo & POPT_ARG_MASK) == POPT_ARG_MAINCALL)
+		? ' ' : '=';
 	    strcpy(le, argDescrip);
 	    lelen = strlen(le);
 	    le += lelen;
-- 
Gitee


From 1c754de5c549d37559370b0ecf5dc673976d1d57 Mon Sep 17 00:00:00 2001
From: Jeff Johnson <n3npq@mac.com>
Date: Wed, 15 Aug 2007 18:58:05 +0000
Subject: [PATCH 463/667] - refactor column cursor to a structure, carry
 maxcols as well. - use TIOCGWINSZ to determine --help column wrapping.

---
 CHANGES    |   2 +
 popthelp.c | 117 ++++++++++++++++++++++++++++++++++-------------------
 2 files changed, 78 insertions(+), 41 deletions(-)

diff --git a/CHANGES b/CHANGES
index ec9355d..64deef5 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,4 +1,6 @@
 1.12 -> 1.13:
+    - jbj: refactor column cursor to a structure, carry maxcols as well.
+    - jbj: use TIOCGWINSZ to determine --help column wrapping.
     - jbj: help formatting for POPT_ARG_MAINCALL.
     - jbj: remove N_(...) markings from popt.h, markers in popthelp.c instead.
     - jbj: add zh_CN.po (Translation Project).
diff --git a/popthelp.c b/popthelp.c
index a5357d3..3518789 100644
--- a/popthelp.c
+++ b/popthelp.c
@@ -10,6 +10,11 @@
 
 #include "system.h"
 
+#define	POPT_USE_TIOCGWINSZ
+#ifdef	POPT_USE_TIOCGWINSZ
+#include <sys/ioctl.h>
+#endif
+
 #define	POPT_WCHAR_HACK
 #ifdef 	POPT_WCHAR_HACK
 #include <wchar.h>			/* for mbsrtowcs */
@@ -19,8 +24,6 @@
 
 /*@access poptContext@*/
 
-#define	_POPTHELP_MAXLINE	((size_t)79)
-
 /**
  * Display arguments.
  * @param con		context
@@ -89,6 +92,33 @@ static struct poptOption poptHelpOptions2[] = {
 struct poptOption * poptHelpOptionsI18N = poptHelpOptions2;
 /*@=castfcnptr@*/
 
+#define	_POPTHELP_MAXLINE	((size_t)79)
+
+typedef struct columns_s {
+    size_t cur;
+    size_t max;
+} * columns_t;
+
+/**
+ * Return no. of columns in output window.
+ * @param fp		FILE
+ * @return		no. of columns
+ */
+static size_t maxColumnWidth(FILE *fp)
+	/*@*/
+{
+    size_t maxcols = _POPTHELP_MAXLINE;
+#if defined(TIOCGWINSZ)
+    struct winsize ws;
+    int fdno = fileno(fp ? fp : stdout);
+
+    if (fdno >= 0 && !ioctl(fdno, TIOCGWINSZ, &ws)
+     && ws.ws_col > maxcols && ws.ws_col < 256)
+	maxcols = ws.ws_col - 1;
+#endif
+    return maxcols;
+}
+
 /**
  * @param table		option(s)
  */
@@ -229,18 +259,19 @@ singleOptionDefaultValue(size_t lineLength,
 /**
  * Display help text for an option.
  * @param fp		output file handle
- * @param maxLeftCol	largest argument display width
+ * @param columns	output display width control
  * @param opt		option(s)
  * @param translation_domain	translation domain
  */
-static void singleOptionHelp(FILE * fp, size_t maxLeftCol, 
+static void singleOptionHelp(FILE * fp, columns_t columns,
 		const struct poptOption * opt,
 		/*@null@*/ const char * translation_domain)
 	/*@globals fileSystem @*/
 	/*@modifies *fp, fileSystem @*/
 {
+    size_t maxLeftCol = columns->cur;
     size_t indentLength = maxLeftCol + 5;
-    size_t lineLength = _POPTHELP_MAXLINE - indentLength;
+    size_t lineLength = columns->max - indentLength;
     const char * help = D_(translation_domain, opt->descrip);
     const char * argDescrip = getArgDescrip(opt, translation_domain);
     size_t helpLength;
@@ -491,7 +522,8 @@ static size_t maxArgWidth(const struct poptOption * opt,
  * @param translation_domain	translation domain
  */
 static void itemHelp(FILE * fp,
-		/*@null@*/ poptItem items, int nitems, size_t left,
+		/*@null@*/ poptItem items, int nitems,
+		columns_t columns,
 		/*@null@*/ const char * translation_domain)
 	/*@globals fileSystem @*/
 	/*@modifies *fp, fileSystem @*/
@@ -505,7 +537,7 @@ static void itemHelp(FILE * fp,
 	opt = &item->option;
 	if ((opt->longName || opt->shortName) && 
 	    !(opt->argInfo & POPT_ARGFLAG_DOC_HIDDEN))
-	    singleOptionHelp(fp, left, opt, translation_domain);
+	    singleOptionHelp(fp, columns, opt, translation_domain);
     }
 }
 
@@ -514,11 +546,12 @@ static void itemHelp(FILE * fp,
  * @param con		context
  * @param fp		output file handle
  * @param table		option(s)
- * @param left		largest argument display width
+ * @param columns	output display width control
  * @param translation_domain	translation domain
  */
 static void singleTableHelp(poptContext con, FILE * fp,
-		/*@null@*/ const struct poptOption * table, size_t left,
+		/*@null@*/ const struct poptOption * table,
+		columns_t columns,
 		/*@null@*/ const char * translation_domain)
 	/*@globals fileSystem @*/
 	/*@modifies *fp, fileSystem @*/
@@ -527,8 +560,8 @@ static void singleTableHelp(poptContext con, FILE * fp,
     const char *sub_transdom;
 
     if (table == poptAliasOptions) {
-	itemHelp(fp, con->aliases, con->numAliases, left, NULL);
-	itemHelp(fp, con->execs, con->numExecs, left, NULL);
+	itemHelp(fp, con->aliases, con->numAliases, columns, NULL);
+	itemHelp(fp, con->execs, con->numExecs, columns, NULL);
 	return;
     }
 
@@ -536,7 +569,7 @@ static void singleTableHelp(poptContext con, FILE * fp,
     for (opt = table; (opt->longName || opt->shortName || opt->arg); opt++) {
 	if ((opt->longName || opt->shortName) && 
 	    !(opt->argInfo & POPT_ARGFLAG_DOC_HIDDEN))
-	    singleOptionHelp(fp, left, opt, translation_domain);
+	    singleOptionHelp(fp, columns, opt, translation_domain);
     }
 
     if (table != NULL)
@@ -550,7 +583,7 @@ static void singleTableHelp(poptContext con, FILE * fp,
 	if (opt->descrip)
 	    POPT_fprintf(fp, "\n%s\n", D_(sub_transdom, opt->descrip));
 
-	singleTableHelp(con, fp, opt->arg, left, sub_transdom);
+	singleTableHelp(con, fp, opt->arg, columns, sub_transdom);
     }
 }
 
@@ -583,7 +616,7 @@ static size_t showHelpIntro(poptContext con, FILE * fp)
 
 void poptPrintHelp(poptContext con, FILE * fp, /*@unused@*/ int flags)
 {
-    size_t leftColWidth;
+    columns_t columns = memset(alloca(sizeof(*columns)), 0, sizeof(*columns));
 
     (void) showHelpIntro(con, fp);
     if (con->otherHelp)
@@ -591,18 +624,19 @@ void poptPrintHelp(poptContext con, FILE * fp, /*@unused@*/ int flags)
     else
 	fprintf(fp, " %s\n", POPT_("[OPTION...]"));
 
-    leftColWidth = maxArgWidth(con->options, NULL);
-    singleTableHelp(con, fp, con->options, leftColWidth, NULL);
+    columns->cur = maxArgWidth(con->options, NULL);
+    columns->max = maxColumnWidth(fp);
+    singleTableHelp(con, fp, con->options, columns, NULL);
 }
 
 /**
  * Display usage text for an option.
  * @param fp		output file handle
- * @param cursor	current display position
+ * @param columns	output display width control
  * @param opt		option(s)
  * @param translation_domain	translation domain
  */
-static size_t singleOptionUsage(FILE * fp, size_t cursor, 
+static size_t singleOptionUsage(FILE * fp, columns_t columns,
 		const struct poptOption * opt,
 		/*@null@*/ const char *translation_domain)
 	/*@globals fileSystem @*/
@@ -631,7 +665,7 @@ static size_t singleOptionUsage(FILE * fp, size_t cursor,
 	bingo++;
     }
 
-    if (!bingo) return cursor;
+    if (!bingo) return columns->cur;
 
 #ifdef POPT_WCHAR_HACK
     /* XXX Calculate no. of display characters. */
@@ -652,9 +686,9 @@ static size_t singleOptionUsage(FILE * fp, size_t cursor,
 	len += sizeof("=")-1 + strlen(argDescrip);
 #endif
 
-    if ((cursor + len) > _POPTHELP_MAXLINE) {
+    if ((columns->cur + len) > columns->max) {
 	fprintf(fp, "\n       ");
-	cursor = (size_t)7;
+	columns->cur = (size_t)7;
     } 
 
     if (opt->longName && opt->shortName) {
@@ -671,18 +705,18 @@ static size_t singleOptionUsage(FILE * fp, size_t cursor,
 	    (argDescrip ? argDescrip : ""));
     }
 
-    return cursor + len + 1;
+    return columns->cur + len + 1;
 }
 
 /**
  * Display popt alias and exec usage.
  * @param fp		output file handle
- * @param cursor	current display position
+ * @param columns	output display width control
  * @param item		alias/exec array
  * @param nitems	no. of ara/exec entries
  * @param translation_domain	translation domain
  */
-static size_t itemUsage(FILE * fp, size_t cursor,
+static size_t itemUsage(FILE * fp, columns_t columns,
 		/*@null@*/ poptItem item, int nitems,
 		/*@null@*/ const char * translation_domain)
 	/*@globals fileSystem @*/
@@ -699,12 +733,12 @@ static size_t itemUsage(FILE * fp, size_t cursor,
 	    translation_domain = (const char *)opt->arg;
 	} else if ((opt->longName || opt->shortName) &&
 		 !(opt->argInfo & POPT_ARGFLAG_DOC_HIDDEN)) {
-	    cursor = singleOptionUsage(fp, cursor, opt, translation_domain);
+	    columns->cur = singleOptionUsage(fp, columns, opt, translation_domain);
 	}
     }
 /*@=branchstate@*/
 
-    return cursor;
+    return columns->cur;
 }
 
 /**
@@ -720,13 +754,13 @@ typedef struct poptDone_s {
  * Display usage text for a table of options.
  * @param con		context
  * @param fp		output file handle
- * @param cursor	current display position
+ * @param columns	output display width control
  * @param opt		option(s)
  * @param translation_domain	translation domain
  * @param done		tables already processed
  * @return
  */
-static size_t singleTableUsage(poptContext con, FILE * fp, size_t cursor,
+static size_t singleTableUsage(poptContext con, FILE * fp, columns_t columns,
 		/*@null@*/ const struct poptOption * opt,
 		/*@null@*/ const char * translation_domain,
 		/*@null@*/ poptDone done)
@@ -757,16 +791,16 @@ static size_t singleTableUsage(poptContext con, FILE * fp, size_t cursor,
 		    done->opts[done->nopts++] = (const void *) opt->arg;
 /*@=boundswrite@*/
 	    }
-	    cursor = singleTableUsage(con, fp, cursor, opt->arg,
+	    columns->cur = singleTableUsage(con, fp, columns, opt->arg,
 			translation_domain, done);
 	} else if ((opt->longName || opt->shortName) &&
 		 !(opt->argInfo & POPT_ARGFLAG_DOC_HIDDEN)) {
-	    cursor = singleOptionUsage(fp, cursor, opt, translation_domain);
+	    columns->cur = singleOptionUsage(fp, columns, opt, translation_domain);
 	}
     }
 /*@=branchstate@*/
 
-    return cursor;
+    return columns->cur;
 }
 
 /**
@@ -814,30 +848,31 @@ static size_t showShortOptions(const struct poptOption * opt, FILE * fp,
 
 void poptPrintUsage(poptContext con, FILE * fp, /*@unused@*/ int flags)
 {
+    columns_t columns = memset(alloca(sizeof(*columns)), 0, sizeof(*columns));
     struct poptDone_s done_buf;
     poptDone done = &done_buf;
-    size_t cursor;
 
     memset(done, 0, sizeof(*done));
     done->nopts = 0;
     done->maxopts = 64;
-    cursor = done->maxopts * sizeof(*done->opts);
+    columns->cur = done->maxopts * sizeof(*done->opts);
+    columns->max = maxColumnWidth(fp);
 /*@-boundswrite@*/
-    done->opts = calloc(1, cursor);
+    done->opts = calloc(1, columns->cur);
     /*@-keeptrans@*/
     done->opts[done->nopts++] = (const void *) con->options;
     /*@=keeptrans@*/
 /*@=boundswrite@*/
 
-    cursor = showHelpIntro(con, fp);
-    cursor += showShortOptions(con->options, fp, NULL);
-    cursor = singleTableUsage(con, fp, cursor, con->options, NULL, done);
-    cursor = itemUsage(fp, cursor, con->aliases, con->numAliases, NULL);
-    cursor = itemUsage(fp, cursor, con->execs, con->numExecs, NULL);
+    columns->cur = showHelpIntro(con, fp);
+    columns->cur += showShortOptions(con->options, fp, NULL);
+    columns->cur = singleTableUsage(con, fp, columns, con->options, NULL, done);
+    columns->cur = itemUsage(fp, columns, con->aliases, con->numAliases, NULL);
+    columns->cur = itemUsage(fp, columns, con->execs, con->numExecs, NULL);
 
     if (con->otherHelp) {
-	cursor += strlen(con->otherHelp) + 1;
-	if (cursor > _POPTHELP_MAXLINE) fprintf(fp, "\n       ");
+	columns->cur += strlen(con->otherHelp) + 1;
+	if (columns->cur > columns->max) fprintf(fp, "\n       ");
 	fprintf(fp, " %s", con->otherHelp);
     }
 
-- 
Gitee


From 22c1c68a77508d93a746691eee89994e3b77db3c Mon Sep 17 00:00:00 2001
From: Jeff Johnson <n3npq@mac.com>
Date: Fri, 24 Aug 2007 13:14:41 +0000
Subject: [PATCH 464/667] more --help fiddles from bugzilla #178413.

---
 configure.ac |  4 ++--
 popthelp.c   | 14 ++++++++------
 2 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/configure.ac b/configure.ac
index cd7a1a1..9e158bb 100755
--- a/configure.ac
+++ b/configure.ac
@@ -68,7 +68,7 @@ if ! echo "${libdir}" | grep -q '64$' ; then
 fi
 AC_SUBST(MARK64)
 
-AC_CHECK_HEADERS(float.h libintl.h mcheck.h unistd.h)
+AC_CHECK_HEADERS(float.h libintl.h mcheck.h unistd.h langinfo.h)
 
 # For some systems we know that we have ld_version scripts.
 # Use it then as default.
@@ -101,7 +101,7 @@ fi
 AC_CHECK_FUNC(setreuid, [], [
     AC_CHECK_LIB(ucb, setreuid, [if echo $LIBS | grep -- -lucb >/dev/null ;then :; else LIBS="$LIBS -lc -lucb" USEUCB=y;fi])
 ])
-AC_CHECK_FUNCS(getuid geteuid mtrace __secure_getenv setregid strerror)
+AC_CHECK_FUNCS(getuid geteuid mtrace __secure_getenv setregid strerror iconv)
 
 AM_GNU_GETTEXT([external])
 
diff --git a/popthelp.c b/popthelp.c
index 3518789..24b4a4e 100644
--- a/popthelp.c
+++ b/popthelp.c
@@ -407,9 +407,9 @@ static void singleOptionHelp(FILE * fp, columns_t columns,
 /*@=boundswrite@*/
 
     if (help)
-	fprintf(fp,"  %-*s   ", (int)(maxLeftCol+displaypad), left);
+	POPT_fprintf(fp,"  %-*s   ", (int)(maxLeftCol+displaypad), left);
     else {
-	fprintf(fp,"  %s\n", left); 
+	POPT_fprintf(fp,"  %s\n", left); 
 	goto out;
     }
 
@@ -426,14 +426,16 @@ static void singleOptionHelp(FILE * fp, columns_t columns,
 	char format[16];
 
 	ch = help + lineLength - 1;
-	while (ch > help && !isspace(*ch)) ch--;
+	while (ch > help && !isspace(*ch))
+	    ch = POPT_prev_char (ch);
 	if (ch == help) break;		/* give up */
-	while (ch > (help + 1) && isspace(*ch)) ch--;
+	while (ch > (help + 1) && isspace(*ch))
+	    ch = POPT_prev_char (ch);
 	ch++;
 
 	sprintf(format, "%%.%ds\n%%%ds", (int) (ch - help), (int) indentLength);
 	/*@-formatconst@*/
-	fprintf(fp, format, help, " ");
+	POPT_fprintf(fp, format, help, " ");
 	/*@=formatconst@*/
 	help = ch;
 	while (isspace(*help) && *help) help++;
@@ -442,7 +444,7 @@ static void singleOptionHelp(FILE * fp, columns_t columns,
 /*@=boundsread@*/
 /*@=branchstate@*/
 
-    if (helpLength) fprintf(fp, "%s\n", help);
+    if (helpLength) POPT_fprintf(fp, "%s\n", help);
     help = NULL;
 
 out:
-- 
Gitee


From a344fb599aeb4d4e11eae4c928ff8b25618adf3a Mon Sep 17 00:00:00 2001
From: Jeff Johnson <n3npq@mac.com>
Date: Sat, 25 Aug 2007 00:49:45 +0000
Subject: [PATCH 465/667] - isspace(3) has i18n encoding signednesss issues on
 Solaris (#172393).

---
 CHANGES    | 1 +
 popthelp.c | 9 ++++++---
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/CHANGES b/CHANGES
index 64deef5..b35f64a 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,4 +1,5 @@
 1.12 -> 1.13:
+    - jbj: isspace(3) has i18n encoding signednesss issues on Solaris (#172393).
     - jbj: refactor column cursor to a structure, carry maxcols as well.
     - jbj: use TIOCGWINSZ to determine --help column wrapping.
     - jbj: help formatting for POPT_ARG_MAINCALL.
diff --git a/popthelp.c b/popthelp.c
index 24b4a4e..5498efa 100644
--- a/popthelp.c
+++ b/popthelp.c
@@ -24,6 +24,9 @@
 
 /*@access poptContext@*/
 
+/* XXX isspace(3) has i18n encoding signednesss issues on Solaris. */
+#define	_isspaceptr(_chp)	((int)(*(unsigned char *)(_chp)))
+
 /**
  * Display arguments.
  * @param con		context
@@ -426,10 +429,10 @@ static void singleOptionHelp(FILE * fp, columns_t columns,
 	char format[16];
 
 	ch = help + lineLength - 1;
-	while (ch > help && !isspace(*ch))
+	while (ch > help && !_isspaceptr(ch))
 	    ch = POPT_prev_char (ch);
 	if (ch == help) break;		/* give up */
-	while (ch > (help + 1) && isspace(*ch))
+	while (ch > (help + 1) && _isspaceptr(ch))
 	    ch = POPT_prev_char (ch);
 	ch++;
 
@@ -438,7 +441,7 @@ static void singleOptionHelp(FILE * fp, columns_t columns,
 	POPT_fprintf(fp, format, help, " ");
 	/*@=formatconst@*/
 	help = ch;
-	while (isspace(*help) && *help) help++;
+	while (_isspaceptr(help) && *help) help++;
 	helpLength = strlen(help);
     }
 /*@=boundsread@*/
-- 
Gitee


From 01c9b400c4338e6998d5c073e03a67b6b22b1ab5 Mon Sep 17 00:00:00 2001
From: Jeff Johnson <n3npq@mac.com>
Date: Sat, 25 Aug 2007 00:54:57 +0000
Subject: [PATCH 466/667] actually use isspace(3) now that the solaris casts
 are in place.

---
 popthelp.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/popthelp.c b/popthelp.c
index 5498efa..a0d0b89 100644
--- a/popthelp.c
+++ b/popthelp.c
@@ -25,7 +25,7 @@
 /*@access poptContext@*/
 
 /* XXX isspace(3) has i18n encoding signednesss issues on Solaris. */
-#define	_isspaceptr(_chp)	((int)(*(unsigned char *)(_chp)))
+#define	_isspaceptr(_chp)	isspace((int)(*(unsigned char *)(_chp)))
 
 /**
  * Display arguments.
-- 
Gitee


From b1ce16b0b8a84c7cfdad4b6b753917f8d5bc1fe5 Mon Sep 17 00:00:00 2001
From: Jeff Johnson <n3npq@mac.com>
Date: Fri, 14 Sep 2007 11:41:35 +0000
Subject: [PATCH 467/667] - don't read /etc/popt twice (#290531).

---
 CHANGES      |  1 +
 po/cs.po     | 32 ++++++++++++++++----------------
 po/da.po     | 32 ++++++++++++++++----------------
 po/de.po     | 32 ++++++++++++++++----------------
 po/es.po     | 32 ++++++++++++++++----------------
 po/fr.po     | 32 ++++++++++++++++----------------
 po/ga.po     | 32 ++++++++++++++++----------------
 po/gl.po     | 32 ++++++++++++++++----------------
 po/hu.po     | 32 ++++++++++++++++----------------
 po/is.po     | 32 ++++++++++++++++----------------
 po/ja.po     | 32 ++++++++++++++++----------------
 po/ko.po     | 32 ++++++++++++++++----------------
 po/nb.po     | 32 ++++++++++++++++----------------
 po/nl.po     | 32 ++++++++++++++++----------------
 po/pl.po     | 32 ++++++++++++++++----------------
 po/popt.pot  | 32 ++++++++++++++++----------------
 po/pt.po     | 32 ++++++++++++++++----------------
 po/ro.po     | 32 ++++++++++++++++----------------
 po/ru.po     | 32 ++++++++++++++++----------------
 po/sk.po     | 32 ++++++++++++++++----------------
 po/sl.po     | 32 ++++++++++++++++----------------
 po/sv.po     | 32 ++++++++++++++++----------------
 po/tr.po     | 32 ++++++++++++++++----------------
 po/uk.po     | 32 ++++++++++++++++----------------
 po/vi.po     | 32 ++++++++++++++++----------------
 po/wa.po     | 32 ++++++++++++++++----------------
 po/zh_CN.po  | 32 ++++++++++++++++----------------
 poptconfig.c | 10 +++++++---
 28 files changed, 424 insertions(+), 419 deletions(-)

diff --git a/CHANGES b/CHANGES
index b35f64a..6f2d719 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,4 +1,5 @@
 1.12 -> 1.13:
+    - jbj: don't read /etc/popt twice (#290531).
     - jbj: isspace(3) has i18n encoding signednesss issues on Solaris (#172393).
     - jbj: refactor column cursor to a structure, carry maxcols as well.
     - jbj: use TIOCGWINSZ to determine --help column wrapping.
diff --git a/po/cs.po b/po/cs.po
index 4bd496d..683f511 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.12\n"
 "Report-Msgid-Bugs-To: <popt-devel@rpm5.org>\n"
-"POT-Creation-Date: 2007-08-14 10:34-0400\n"
+"POT-Creation-Date: 2007-09-06 08:50-0400\n"
 "PO-Revision-Date: 2001-07-24 00:03+0100\n"
 "Last-Translator: Milan Kerslager <kerslage@linux.cz>\n"
 "Language-Team: Czech <cs@li.org>\n"
@@ -59,62 +59,62 @@ msgstr "selhala alokace pam
 msgid "unknown error"
 msgstr "nezn�m� chyba"
 
-#: popthelp.c:68 popthelp.c:79
+#: popthelp.c:74 popthelp.c:85
 msgid "Show this help message"
 msgstr "Vyp��e tuto n�pov�du"
 
-#: popthelp.c:69 popthelp.c:80
+#: popthelp.c:75 popthelp.c:86
 msgid "Display brief usage message"
 msgstr "Vyp��e kr�tk� n�vod k pou�it�"
 
-#: popthelp.c:83
+#: popthelp.c:89
 msgid "Display option defaults in message"
 msgstr "Zobrazit implicitn� volby ve zpr�v�"
 
-#: popthelp.c:126
+#: popthelp.c:162
 msgid "Help options:"
 msgstr ""
 
-#: popthelp.c:127
+#: popthelp.c:163
 msgid "Options implemented via popt alias/exec:"
 msgstr ""
 
-#: popthelp.c:135
+#: popthelp.c:171
 msgid "NONE"
 msgstr "NONE"
 
-#: popthelp.c:137
+#: popthelp.c:173
 msgid "VAL"
 msgstr "VAL"
 
-#: popthelp.c:141
+#: popthelp.c:177
 msgid "INT"
 msgstr "INT"
 
-#: popthelp.c:142
+#: popthelp.c:178
 msgid "LONG"
 msgstr "LONG"
 
-#: popthelp.c:143
+#: popthelp.c:179
 msgid "STRING"
 msgstr "STRING"
 
-#: popthelp.c:144
+#: popthelp.c:180
 msgid "FLOAT"
 msgstr "FLOAT"
 
-#: popthelp.c:145
+#: popthelp.c:181
 msgid "DOUBLE"
 msgstr "DOUBLE"
 
-#: popthelp.c:146
+#: popthelp.c:183
 msgid "ARG"
 msgstr "ARG"
 
-#: popthelp.c:559
+#: popthelp.c:606
 msgid "Usage:"
 msgstr "Pou�it�:"
 
-#: popthelp.c:583
+#: popthelp.c:630
 msgid "[OPTION...]"
 msgstr "[VOLBY...]"
diff --git a/po/da.po b/po/da.po
index acee7c2..d1134d9 100644
--- a/po/da.po
+++ b/po/da.po
@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.12\n"
 "Report-Msgid-Bugs-To: <popt-devel@rpm5.org>\n"
-"POT-Creation-Date: 2007-08-14 10:34-0400\n"
+"POT-Creation-Date: 2007-09-06 08:50-0400\n"
 "PO-Revision-Date: Sun Jan 21 2001 04:30:32+0200\n"
 "Last-Translator: Martin Hansen <mah@k64.dk>\n"
 "Language-Team: Dansk <dansk@klid.dk>\n"
@@ -60,63 +60,63 @@ msgstr ""
 msgid "unknown error"
 msgstr "ukendt fejl"
 
-#: popthelp.c:68 popthelp.c:79
+#: popthelp.c:74 popthelp.c:85
 msgid "Show this help message"
 msgstr "Vis denne hj�lpemeddelelse"
 
-#: popthelp.c:69 popthelp.c:80
+#: popthelp.c:75 popthelp.c:86
 msgid "Display brief usage message"
 msgstr "Vis kortfattet brugsanvisning"
 
-#: popthelp.c:83
+#: popthelp.c:89
 #, fuzzy
 msgid "Display option defaults in message"
 msgstr "Vis kortfattet brugsanvisning"
 
-#: popthelp.c:126
+#: popthelp.c:162
 msgid "Help options:"
 msgstr ""
 
-#: popthelp.c:127
+#: popthelp.c:163
 msgid "Options implemented via popt alias/exec:"
 msgstr ""
 
-#: popthelp.c:135
+#: popthelp.c:171
 msgid "NONE"
 msgstr "INGEN"
 
-#: popthelp.c:137
+#: popthelp.c:173
 msgid "VAL"
 msgstr "VAL"
 
-#: popthelp.c:141
+#: popthelp.c:177
 msgid "INT"
 msgstr "INT"
 
-#: popthelp.c:142
+#: popthelp.c:178
 msgid "LONG"
 msgstr "LONG"
 
-#: popthelp.c:143
+#: popthelp.c:179
 msgid "STRING"
 msgstr "STRING"
 
-#: popthelp.c:144
+#: popthelp.c:180
 msgid "FLOAT"
 msgstr "FLOAT"
 
-#: popthelp.c:145
+#: popthelp.c:181
 msgid "DOUBLE"
 msgstr "DOUBLE"
 
-#: popthelp.c:146
+#: popthelp.c:183
 msgid "ARG"
 msgstr "ARG"
 
-#: popthelp.c:559
+#: popthelp.c:606
 msgid "Usage:"
 msgstr "Brug:"
 
-#: popthelp.c:583
+#: popthelp.c:630
 msgid "[OPTION...]"
 msgstr "[TILVALG...]"
diff --git a/po/de.po b/po/de.po
index e6daa0c..f4fad58 100644
--- a/po/de.po
+++ b/po/de.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.12\n"
 "Report-Msgid-Bugs-To: <popt-devel@rpm5.org>\n"
-"POT-Creation-Date: 2007-08-14 10:34-0400\n"
+"POT-Creation-Date: 2007-09-06 08:50-0400\n"
 "PO-Revision-Date: 2007-02-17 21:00+0100\n"
 "Last-Translator: Robert Scheck <rpm@robert-scheck.de>\n"
 "Language-Team: German <de@li.org>\n"
@@ -63,62 +63,62 @@ msgstr "Speicherzuordnung fehlgeschlagen"
 msgid "unknown error"
 msgstr "Unbekannter Fehler"
 
-#: popthelp.c:68 popthelp.c:79
+#: popthelp.c:74 popthelp.c:85
 msgid "Show this help message"
 msgstr "Zeigt diese Hilfe an"
 
-#: popthelp.c:69 popthelp.c:80
+#: popthelp.c:75 popthelp.c:86
 msgid "Display brief usage message"
 msgstr "Zeigt eine kurze Verwendungsinformation"
 
-#: popthelp.c:83
+#: popthelp.c:89
 msgid "Display option defaults in message"
 msgstr "Zeigt die Standardeinstellungen an"
 
-#: popthelp.c:126
+#: popthelp.c:162
 msgid "Help options:"
 msgstr "Hilfe-Optionen:"
 
-#: popthelp.c:127
+#: popthelp.c:163
 msgid "Options implemented via popt alias/exec:"
 msgstr "Optionen über popt alias/exec implementiert:"
 
-#: popthelp.c:135
+#: popthelp.c:171
 msgid "NONE"
 msgstr "NICHTS"
 
-#: popthelp.c:137
+#: popthelp.c:173
 msgid "VAL"
 msgstr "WERT"
 
-#: popthelp.c:141
+#: popthelp.c:177
 msgid "INT"
 msgstr "INTEGER"
 
-#: popthelp.c:142
+#: popthelp.c:178
 msgid "LONG"
 msgstr "LONG"
 
-#: popthelp.c:143
+#: popthelp.c:179
 msgid "STRING"
 msgstr "STRING"
 
-#: popthelp.c:144
+#: popthelp.c:180
 msgid "FLOAT"
 msgstr "FLOAT"
 
-#: popthelp.c:145
+#: popthelp.c:181
 msgid "DOUBLE"
 msgstr "DOUBLE"
 
-#: popthelp.c:146
+#: popthelp.c:183
 msgid "ARG"
 msgstr "ARGUMENT"
 
-#: popthelp.c:559
+#: popthelp.c:606
 msgid "Usage:"
 msgstr "Verwendung:"
 
-#: popthelp.c:583
+#: popthelp.c:630
 msgid "[OPTION...]"
 msgstr "[OPTION...]"
diff --git a/po/es.po b/po/es.po
index af7876b..ee305ca 100644
--- a/po/es.po
+++ b/po/es.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.12\n"
 "Report-Msgid-Bugs-To: <popt-devel@rpm5.org>\n"
-"POT-Creation-Date: 2007-08-14 10:34-0400\n"
+"POT-Creation-Date: 2007-09-06 08:50-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Leandro Lucarella <luca@linuxmendoza.org.ar>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -64,63 +64,63 @@ msgstr ""
 msgid "unknown error"
 msgstr "error desconocido"
 
-#: popthelp.c:68 popthelp.c:79
+#: popthelp.c:74 popthelp.c:85
 msgid "Show this help message"
 msgstr "Muestra este mensaje de ayuda"
 
-#: popthelp.c:69 popthelp.c:80
+#: popthelp.c:75 popthelp.c:86
 msgid "Display brief usage message"
 msgstr "Indica el modo de uso resumido"
 
-#: popthelp.c:83
+#: popthelp.c:89
 #, fuzzy
 msgid "Display option defaults in message"
 msgstr "Indica el modo de uso resumido"
 
-#: popthelp.c:126
+#: popthelp.c:162
 msgid "Help options:"
 msgstr ""
 
-#: popthelp.c:127
+#: popthelp.c:163
 msgid "Options implemented via popt alias/exec:"
 msgstr ""
 
-#: popthelp.c:135
+#: popthelp.c:171
 msgid "NONE"
 msgstr "NONE"
 
-#: popthelp.c:137
+#: popthelp.c:173
 msgid "VAL"
 msgstr "VAL"
 
-#: popthelp.c:141
+#: popthelp.c:177
 msgid "INT"
 msgstr "INT"
 
-#: popthelp.c:142
+#: popthelp.c:178
 msgid "LONG"
 msgstr "LONG"
 
-#: popthelp.c:143
+#: popthelp.c:179
 msgid "STRING"
 msgstr "STRING"
 
-#: popthelp.c:144
+#: popthelp.c:180
 msgid "FLOAT"
 msgstr "FLOAT"
 
-#: popthelp.c:145
+#: popthelp.c:181
 msgid "DOUBLE"
 msgstr "DOUBLE"
 
-#: popthelp.c:146
+#: popthelp.c:183
 msgid "ARG"
 msgstr "ARG"
 
-#: popthelp.c:559
+#: popthelp.c:606
 msgid "Usage:"
 msgstr "Modo de Uso:"
 
-#: popthelp.c:583
+#: popthelp.c:630
 msgid "[OPTION...]"
 msgstr "[OPCIN...]"
diff --git a/po/fr.po b/po/fr.po
index cb9ebeb..442ec21 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -12,7 +12,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.12\n"
 "Report-Msgid-Bugs-To: <popt-devel@rpm5.org>\n"
-"POT-Creation-Date: 2007-08-14 10:34-0400\n"
+"POT-Creation-Date: 2007-09-06 08:50-0400\n"
 "PO-Revision-Date: 2003-06-22 23:43+0200\n"
 "Last-Translator: RPM French Translation <rpm-fr@livna.org>\n"
 "Language-Team: RPM French Translation <rpm-fr@livna.org>\n"
@@ -69,62 +69,62 @@ msgstr "échec de l'allocation de mémoire"
 msgid "unknown error"
 msgstr "erreur inconnue"
 
-#: popthelp.c:68 popthelp.c:79
+#: popthelp.c:74 popthelp.c:85
 msgid "Show this help message"
 msgstr "Montre ce message d'aide"
 
-#: popthelp.c:69 popthelp.c:80
+#: popthelp.c:75 popthelp.c:86
 msgid "Display brief usage message"
 msgstr "Affiche un bref descriptif de l'utilisation"
 
-#: popthelp.c:83
+#: popthelp.c:89
 msgid "Display option defaults in message"
 msgstr "Afficher les valeurs par défaut des options dans le message"
 
-#: popthelp.c:126
+#: popthelp.c:162
 msgid "Help options:"
 msgstr ""
 
-#: popthelp.c:127
+#: popthelp.c:163
 msgid "Options implemented via popt alias/exec:"
 msgstr ""
 
-#: popthelp.c:135
+#: popthelp.c:171
 msgid "NONE"
 msgstr "RIEN"
 
-#: popthelp.c:137
+#: popthelp.c:173
 msgid "VAL"
 msgstr "VAL"
 
-#: popthelp.c:141
+#: popthelp.c:177
 msgid "INT"
 msgstr "ENTIER"
 
-#: popthelp.c:142
+#: popthelp.c:178
 msgid "LONG"
 msgstr "LONG"
 
-#: popthelp.c:143
+#: popthelp.c:179
 msgid "STRING"
 msgstr "CHAINE"
 
-#: popthelp.c:144
+#: popthelp.c:180
 msgid "FLOAT"
 msgstr "FLOTTANT"
 
-#: popthelp.c:145
+#: popthelp.c:181
 msgid "DOUBLE"
 msgstr "DOUBLE"
 
-#: popthelp.c:146
+#: popthelp.c:183
 msgid "ARG"
 msgstr "ARG"
 
-#: popthelp.c:559
+#: popthelp.c:606
 msgid "Usage:"
 msgstr "Utilisation:"
 
-#: popthelp.c:583
+#: popthelp.c:630
 msgid "[OPTION...]"
 msgstr "[OPTION...]"
diff --git a/po/ga.po b/po/ga.po
index c160eb9..6153ce4 100644
--- a/po/ga.po
+++ b/po/ga.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.12\n"
 "Report-Msgid-Bugs-To: <popt-devel@rpm5.org>\n"
-"POT-Creation-Date: 2007-08-14 10:34-0400\n"
+"POT-Creation-Date: 2007-09-06 08:50-0400\n"
 "PO-Revision-Date: 2007-06-19 06:21-0500\n"
 "Last-Translator: Kevin Scannell <kscanne@gmail.com>\n"
 "Language-Team: Irish <gaeilge-gnulinux@lists.sourceforge.net>\n"
@@ -63,62 +63,62 @@ msgstr "theip ar dháileadh na cuimhne"
 msgid "unknown error"
 msgstr "earráid anaithnid"
 
-#: popthelp.c:68 popthelp.c:79
+#: popthelp.c:74 popthelp.c:85
 msgid "Show this help message"
 msgstr "Taispeáin an chabhair seo"
 
-#: popthelp.c:69 popthelp.c:80
+#: popthelp.c:75 popthelp.c:86
 msgid "Display brief usage message"
 msgstr "Taispeáin beagán eolais faoin úsáid"
 
-#: popthelp.c:83
+#: popthelp.c:89
 msgid "Display option defaults in message"
 msgstr "Taispeáin luachanna réamhshocraithe na roghanna sa teachtaireacht"
 
-#: popthelp.c:126
+#: popthelp.c:162
 msgid "Help options:"
 msgstr "Roghanna cabhracha:"
 
-#: popthelp.c:127
+#: popthelp.c:163
 msgid "Options implemented via popt alias/exec:"
 msgstr "Roghanna a cuireadh i bhfeidhm trí ailias/exec popt:"
 
-#: popthelp.c:135
+#: popthelp.c:171
 msgid "NONE"
 msgstr "NEAMHNÍ"
 
-#: popthelp.c:137
+#: popthelp.c:173
 msgid "VAL"
 msgstr "LUACH"
 
-#: popthelp.c:141
+#: popthelp.c:177
 msgid "INT"
 msgstr "INT"
 
-#: popthelp.c:142
+#: popthelp.c:178
 msgid "LONG"
 msgstr "LONG"
 
-#: popthelp.c:143
+#: popthelp.c:179
 msgid "STRING"
 msgstr "STRING"
 
-#: popthelp.c:144
+#: popthelp.c:180
 msgid "FLOAT"
 msgstr "FLOAT"
 
-#: popthelp.c:145
+#: popthelp.c:181
 msgid "DOUBLE"
 msgstr "DOUBLE"
 
-#: popthelp.c:146
+#: popthelp.c:183
 msgid "ARG"
 msgstr "ARG"
 
-#: popthelp.c:559
+#: popthelp.c:606
 msgid "Usage:"
 msgstr "Úsáid:"
 
-#: popthelp.c:583
+#: popthelp.c:630
 msgid "[OPTION...]"
 msgstr "[ROGHA...]"
diff --git a/po/gl.po b/po/gl.po
index 032c2ba..a95fab6 100644
--- a/po/gl.po
+++ b/po/gl.po
@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.12\n"
 "Report-Msgid-Bugs-To: <popt-devel@rpm5.org>\n"
-"POT-Creation-Date: 2007-08-14 10:34-0400\n"
+"POT-Creation-Date: 2007-09-06 08:50-0400\n"
 "PO-Revision-Date: 2001-01-17 01:01+0100\n"
 "Last-Translator: Jes�s Bravo �lvarez <jba@pobox.com>\n"
 "Language-Team: Galician <trasno@ceu.fi.udc.es>\n"
@@ -59,63 +59,63 @@ msgstr ""
 msgid "unknown error"
 msgstr "erro desco�ecido"
 
-#: popthelp.c:68 popthelp.c:79
+#: popthelp.c:74 popthelp.c:85
 msgid "Show this help message"
 msgstr "Amosar esta mensaxe de axuda"
 
-#: popthelp.c:69 popthelp.c:80
+#: popthelp.c:75 popthelp.c:86
 msgid "Display brief usage message"
 msgstr "Amosar brevemente o xeito de utilizaci�n"
 
-#: popthelp.c:83
+#: popthelp.c:89
 #, fuzzy
 msgid "Display option defaults in message"
 msgstr "Amosar brevemente o xeito de utilizaci�n"
 
-#: popthelp.c:126
+#: popthelp.c:162
 msgid "Help options:"
 msgstr ""
 
-#: popthelp.c:127
+#: popthelp.c:163
 msgid "Options implemented via popt alias/exec:"
 msgstr ""
 
-#: popthelp.c:135
+#: popthelp.c:171
 msgid "NONE"
 msgstr "NADA"
 
-#: popthelp.c:137
+#: popthelp.c:173
 msgid "VAL"
 msgstr "VAL"
 
-#: popthelp.c:141
+#: popthelp.c:177
 msgid "INT"
 msgstr "INT"
 
-#: popthelp.c:142
+#: popthelp.c:178
 msgid "LONG"
 msgstr "LONG"
 
-#: popthelp.c:143
+#: popthelp.c:179
 msgid "STRING"
 msgstr "CADEA"
 
-#: popthelp.c:144
+#: popthelp.c:180
 msgid "FLOAT"
 msgstr "FLOAT"
 
-#: popthelp.c:145
+#: popthelp.c:181
 msgid "DOUBLE"
 msgstr "DOUBLE"
 
-#: popthelp.c:146
+#: popthelp.c:183
 msgid "ARG"
 msgstr "ARG"
 
-#: popthelp.c:559
+#: popthelp.c:606
 msgid "Usage:"
 msgstr "Uso:"
 
-#: popthelp.c:583
+#: popthelp.c:630
 msgid "[OPTION...]"
 msgstr "[OPCI�N...]"
diff --git a/po/hu.po b/po/hu.po
index b1dce6c..c7d0c4e 100644
--- a/po/hu.po
+++ b/po/hu.po
@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.12\n"
 "Report-Msgid-Bugs-To: <popt-devel@rpm5.org>\n"
-"POT-Creation-Date: 2007-08-14 10:34-0400\n"
+"POT-Creation-Date: 2007-09-06 08:50-0400\n"
 "PO-Revision-Date: 2000-08-03 23:26+0200\n"
 "Last-Translator: L�szl� N�meth <nemeth@qwertynet.hu>\n"
 "Language-Team: Hungarian\n"
@@ -59,63 +59,63 @@ msgstr ""
 msgid "unknown error"
 msgstr ""
 
-#: popthelp.c:68 popthelp.c:79
+#: popthelp.c:74 popthelp.c:85
 msgid "Show this help message"
 msgstr "E s�g� megjelen�t�se"
 
-#: popthelp.c:69 popthelp.c:80
+#: popthelp.c:75 popthelp.c:86
 msgid "Display brief usage message"
 msgstr "R�vid haszn�lati utas�t�s megjelen�t�se"
 
-#: popthelp.c:83
+#: popthelp.c:89
 #, fuzzy
 msgid "Display option defaults in message"
 msgstr "R�vid haszn�lati utas�t�s megjelen�t�se"
 
-#: popthelp.c:126
+#: popthelp.c:162
 msgid "Help options:"
 msgstr ""
 
-#: popthelp.c:127
+#: popthelp.c:163
 msgid "Options implemented via popt alias/exec:"
 msgstr ""
 
-#: popthelp.c:135
+#: popthelp.c:171
 msgid "NONE"
 msgstr ""
 
-#: popthelp.c:137
+#: popthelp.c:173
 msgid "VAL"
 msgstr ""
 
-#: popthelp.c:141
+#: popthelp.c:177
 msgid "INT"
 msgstr ""
 
-#: popthelp.c:142
+#: popthelp.c:178
 msgid "LONG"
 msgstr ""
 
-#: popthelp.c:143
+#: popthelp.c:179
 msgid "STRING"
 msgstr ""
 
-#: popthelp.c:144
+#: popthelp.c:180
 msgid "FLOAT"
 msgstr ""
 
-#: popthelp.c:145
+#: popthelp.c:181
 msgid "DOUBLE"
 msgstr ""
 
-#: popthelp.c:146
+#: popthelp.c:183
 msgid "ARG"
 msgstr ""
 
-#: popthelp.c:559
+#: popthelp.c:606
 msgid "Usage:"
 msgstr ""
 
-#: popthelp.c:583
+#: popthelp.c:630
 msgid "[OPTION...]"
 msgstr ""
diff --git a/po/is.po b/po/is.po
index 0ff5fbf..3ee7511 100644
--- a/po/is.po
+++ b/po/is.po
@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.12\n"
 "Report-Msgid-Bugs-To: <popt-devel@rpm5.org>\n"
-"POT-Creation-Date: 2007-08-14 10:34-0400\n"
+"POT-Creation-Date: 2007-09-06 08:50-0400\n"
 "PO-Revision-Date: 2001-06-08 01:35+0000\n"
 "Last-Translator: Richard Allen <ra@hp.is>\n"
 "Language-Team: is <kde-isl@mmedia.is>\n"
@@ -59,62 +59,62 @@ msgstr "ekki t
 msgid "unknown error"
 msgstr "��ekkt villa"
 
-#: popthelp.c:68 popthelp.c:79
+#: popthelp.c:74 popthelp.c:85
 msgid "Show this help message"
 msgstr "S�na �essa hj�lp"
 
-#: popthelp.c:69 popthelp.c:80
+#: popthelp.c:75 popthelp.c:86
 msgid "Display brief usage message"
 msgstr "S�na stuttar notkunarlei�beiningar"
 
-#: popthelp.c:83
+#: popthelp.c:89
 msgid "Display option defaults in message"
 msgstr "S�na sj�lfgefin gildi rofa � skilabo�um"
 
-#: popthelp.c:126
+#: popthelp.c:162
 msgid "Help options:"
 msgstr ""
 
-#: popthelp.c:127
+#: popthelp.c:163
 msgid "Options implemented via popt alias/exec:"
 msgstr ""
 
-#: popthelp.c:135
+#: popthelp.c:171
 msgid "NONE"
 msgstr "ENGIN"
 
-#: popthelp.c:137
+#: popthelp.c:173
 msgid "VAL"
 msgstr "VAL"
 
-#: popthelp.c:141
+#: popthelp.c:177
 msgid "INT"
 msgstr "INT"
 
-#: popthelp.c:142
+#: popthelp.c:178
 msgid "LONG"
 msgstr "LONG"
 
-#: popthelp.c:143
+#: popthelp.c:179
 msgid "STRING"
 msgstr "STRING"
 
-#: popthelp.c:144
+#: popthelp.c:180
 msgid "FLOAT"
 msgstr "FLOAT"
 
-#: popthelp.c:145
+#: popthelp.c:181
 msgid "DOUBLE"
 msgstr "DOUBLE"
 
-#: popthelp.c:146
+#: popthelp.c:183
 msgid "ARG"
 msgstr "ARG"
 
-#: popthelp.c:559
+#: popthelp.c:606
 msgid "Usage:"
 msgstr "Notkun:"
 
-#: popthelp.c:583
+#: popthelp.c:630
 msgid "[OPTION...]"
 msgstr "[ROFI...]"
diff --git a/po/ja.po b/po/ja.po
index 2e40858..16e24e7 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.12\n"
 "Report-Msgid-Bugs-To: <popt-devel@rpm5.org>\n"
-"POT-Creation-Date: 2007-08-14 10:34-0400\n"
+"POT-Creation-Date: 2007-09-06 08:50-0400\n"
 "PO-Revision-Date: 2003--8-25 19:00+0900\n"
 "Last-Translator: Yukihiro Nakai <ynakai@redhat.com>\n"
 "Language-Team: Japanese <ja@li.org>\n"
@@ -63,62 +63,62 @@ msgstr "メモリ確保に失敗しました"
 msgid "unknown error"
 msgstr "不明なエラー"
 
-#: popthelp.c:68 popthelp.c:79
+#: popthelp.c:74 popthelp.c:85
 msgid "Show this help message"
 msgstr "このヘルプメッセージを表示します"
 
-#: popthelp.c:69 popthelp.c:80
+#: popthelp.c:75 popthelp.c:86
 msgid "Display brief usage message"
 msgstr "使い方の概要を表示します"
 
-#: popthelp.c:83
+#: popthelp.c:89
 msgid "Display option defaults in message"
 msgstr "オプションのデフォルト値をメッセージに表示します"
 
-#: popthelp.c:126
+#: popthelp.c:162
 msgid "Help options:"
 msgstr "ヘルプオプション:"
 
-#: popthelp.c:127
+#: popthelp.c:163
 msgid "Options implemented via popt alias/exec:"
 msgstr "poptのalias/execで実装されているオプション:"
 
-#: popthelp.c:135
+#: popthelp.c:171
 msgid "NONE"
 msgstr "なし"
 
-#: popthelp.c:137
+#: popthelp.c:173
 msgid "VAL"
 msgstr "値"
 
-#: popthelp.c:141
+#: popthelp.c:177
 msgid "INT"
 msgstr "INT"
 
-#: popthelp.c:142
+#: popthelp.c:178
 msgid "LONG"
 msgstr "LONG"
 
-#: popthelp.c:143
+#: popthelp.c:179
 msgid "STRING"
 msgstr "文字列"
 
-#: popthelp.c:144
+#: popthelp.c:180
 msgid "FLOAT"
 msgstr "FLOAT"
 
-#: popthelp.c:145
+#: popthelp.c:181
 msgid "DOUBLE"
 msgstr "DOUBLE"
 
-#: popthelp.c:146
+#: popthelp.c:183
 msgid "ARG"
 msgstr "ARG"
 
-#: popthelp.c:559
+#: popthelp.c:606
 msgid "Usage:"
 msgstr "使い方:"
 
-#: popthelp.c:583
+#: popthelp.c:630
 msgid "[OPTION...]"
 msgstr "[オプション...]"
diff --git a/po/ko.po b/po/ko.po
index 24bea38..d41ebf1 100644
--- a/po/ko.po
+++ b/po/ko.po
@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.12\n"
 "Report-Msgid-Bugs-To: <popt-devel@rpm5.org>\n"
-"POT-Creation-Date: 2007-08-14 10:34-0400\n"
+"POT-Creation-Date: 2007-09-06 08:50-0400\n"
 "PO-Revision-Date: 2001-09-06 20:06+0900\n"
 "Last-Translator: Jong-Hoon Ryu <redhat4u@netian.com>\n"
 "Language-Team: GNU Translation project <ko@li.org>\n"
@@ -59,62 +59,62 @@ msgstr "
 msgid "unknown error"
 msgstr "�� �� ���� �����Դϴ�"
 
-#: popthelp.c:68 popthelp.c:79
+#: popthelp.c:74 popthelp.c:85
 msgid "Show this help message"
 msgstr "�� ������ �����ݴϴ�"
 
-#: popthelp.c:69 popthelp.c:80
+#: popthelp.c:75 popthelp.c:86
 msgid "Display brief usage message"
 msgstr "������ ������ �����ݴϴ�"
 
-#: popthelp.c:83
+#: popthelp.c:89
 msgid "Display option defaults in message"
 msgstr "�⺻���� �ɼ��� �����ݴϴ�"
 
-#: popthelp.c:126
+#: popthelp.c:162
 msgid "Help options:"
 msgstr ""
 
-#: popthelp.c:127
+#: popthelp.c:163
 msgid "Options implemented via popt alias/exec:"
 msgstr ""
 
-#: popthelp.c:135
+#: popthelp.c:171
 msgid "NONE"
 msgstr "����(NONE)"
 
-#: popthelp.c:137
+#: popthelp.c:173
 msgid "VAL"
 msgstr "��(VAL)"
 
-#: popthelp.c:141
+#: popthelp.c:177
 msgid "INT"
 msgstr "����(INT)"
 
-#: popthelp.c:142
+#: popthelp.c:178
 msgid "LONG"
 msgstr "����(LONG)"
 
-#: popthelp.c:143
+#: popthelp.c:179
 msgid "STRING"
 msgstr "���ڿ�(STRING)"
 
-#: popthelp.c:144
+#: popthelp.c:180
 msgid "FLOAT"
 msgstr "�Ҽ�(FLOAT)"
 
-#: popthelp.c:145
+#: popthelp.c:181
 msgid "DOUBLE"
 msgstr "�Ҽ�(DOUBLE)"
 
-#: popthelp.c:146
+#: popthelp.c:183
 msgid "ARG"
 msgstr "�μ�(ARG)"
 
-#: popthelp.c:559
+#: popthelp.c:606
 msgid "Usage:"
 msgstr "����:"
 
-#: popthelp.c:583
+#: popthelp.c:630
 msgid "[OPTION...]"
 msgstr "[�ɼ�...]"
diff --git a/po/nb.po b/po/nb.po
index ce00b71..7bea27d 100644
--- a/po/nb.po
+++ b/po/nb.po
@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.12\n"
 "Report-Msgid-Bugs-To: <popt-devel@rpm5.org>\n"
-"POT-Creation-Date: 2007-08-14 10:34-0400\n"
+"POT-Creation-Date: 2007-09-06 08:50-0400\n"
 "PO-Revision-Date: 2001-06-27 11:05+0200\n"
 "Last-Translator: Kjartan Maraas <kmaraas@online.no>\n"
 "Language-Team: Norwegian <no@li.org>\n"
@@ -59,62 +59,62 @@ msgstr "minneallokering feilet"
 msgid "unknown error"
 msgstr "ukjent feil"
 
-#: popthelp.c:68 popthelp.c:79
+#: popthelp.c:74 popthelp.c:85
 msgid "Show this help message"
 msgstr "Vis denne hjelpmeldingen"
 
-#: popthelp.c:69 popthelp.c:80
+#: popthelp.c:75 popthelp.c:86
 msgid "Display brief usage message"
 msgstr "Vis kort bruksmelding"
 
-#: popthelp.c:83
+#: popthelp.c:89
 msgid "Display option defaults in message"
 msgstr "Vis forvalgte flagg i melding"
 
-#: popthelp.c:126
+#: popthelp.c:162
 msgid "Help options:"
 msgstr ""
 
-#: popthelp.c:127
+#: popthelp.c:163
 msgid "Options implemented via popt alias/exec:"
 msgstr ""
 
-#: popthelp.c:135
+#: popthelp.c:171
 msgid "NONE"
 msgstr "INGEN"
 
-#: popthelp.c:137
+#: popthelp.c:173
 msgid "VAL"
 msgstr "VERDI"
 
-#: popthelp.c:141
+#: popthelp.c:177
 msgid "INT"
 msgstr "HELTALL"
 
-#: popthelp.c:142
+#: popthelp.c:178
 msgid "LONG"
 msgstr "LONG"
 
-#: popthelp.c:143
+#: popthelp.c:179
 msgid "STRING"
 msgstr "STRENG"
 
-#: popthelp.c:144
+#: popthelp.c:180
 msgid "FLOAT"
 msgstr "FLYTTALL"
 
-#: popthelp.c:145
+#: popthelp.c:181
 msgid "DOUBLE"
 msgstr "DOUBLE"
 
-#: popthelp.c:146
+#: popthelp.c:183
 msgid "ARG"
 msgstr "ARG"
 
-#: popthelp.c:559
+#: popthelp.c:606
 msgid "Usage:"
 msgstr "Bruk:"
 
-#: popthelp.c:583
+#: popthelp.c:630
 msgid "[OPTION...]"
 msgstr "[FLAGG...]"
diff --git a/po/nl.po b/po/nl.po
index 60e54ed..08c8d91 100644
--- a/po/nl.po
+++ b/po/nl.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.12\n"
 "Report-Msgid-Bugs-To: <popt-devel@rpm5.org>\n"
-"POT-Creation-Date: 2007-08-14 10:34-0400\n"
+"POT-Creation-Date: 2007-09-06 08:50-0400\n"
 "PO-Revision-Date: 2007-06-29 17:38+0200\n"
 "Last-Translator: Tim Van Holder <tim.van.holder@telenet.be>\n"
 "Language-Team: Dutch <vertaling@vrijschrift.org>\n"
@@ -65,65 +65,65 @@ msgstr "geheugenreservatie mislukt"
 msgid "unknown error"
 msgstr "onbekende fout"
 
-#: popthelp.c:68 popthelp.c:79
+#: popthelp.c:74 popthelp.c:85
 msgid "Show this help message"
 msgstr "Toon deze hulptekst"
 
-#: popthelp.c:69 popthelp.c:80
+#: popthelp.c:75 popthelp.c:86
 msgid "Display brief usage message"
 msgstr "Toon korte tekst over gebruik"
 
-#: popthelp.c:83
+#: popthelp.c:89
 msgid "Display option defaults in message"
 msgstr "Toon standaardwaarden van opties in de tekst"
 
 # of "Help-opties:"?
-#: popthelp.c:126
+#: popthelp.c:162
 msgid "Help options:"
 msgstr "Hulp-opties:"
 
-#: popthelp.c:127
+#: popthelp.c:163
 msgid "Options implemented via popt alias/exec:"
 msgstr "Opties geïmplementeerd d.m.v. popt alias/exec:"
 
-#: popthelp.c:135
+#: popthelp.c:171
 msgid "NONE"
 msgstr "GEEN"
 
-#: popthelp.c:137
+#: popthelp.c:173
 msgid "VAL"
 msgstr "WAARDE"
 
-#: popthelp.c:141
+#: popthelp.c:177
 msgid "INT"
 msgstr "INT"
 
-#: popthelp.c:142
+#: popthelp.c:178
 msgid "LONG"
 msgstr "LONG"
 
 # TEKENREEKS lijkt me niet gepast; dus ofwel STRING behouden, ofwel TEKST
-#: popthelp.c:143
+#: popthelp.c:179
 msgid "STRING"
 msgstr "TEKST"
 
-#: popthelp.c:144
+#: popthelp.c:180
 msgid "FLOAT"
 msgstr "FLOAT"
 
-#: popthelp.c:145
+#: popthelp.c:181
 msgid "DOUBLE"
 msgstr "DOUBLE"
 
 # of hier ARGUMENT van maken?
-#: popthelp.c:146
+#: popthelp.c:183
 msgid "ARG"
 msgstr "ARG"
 
-#: popthelp.c:559
+#: popthelp.c:606
 msgid "Usage:"
 msgstr "Gebruik:"
 
-#: popthelp.c:583
+#: popthelp.c:630
 msgid "[OPTION...]"
 msgstr "[OPTIE...]"
diff --git a/po/pl.po b/po/pl.po
index 97e0b60..28661d5 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.12\n"
 "Report-Msgid-Bugs-To: <popt-devel@rpm5.org>\n"
-"POT-Creation-Date: 2007-08-14 10:34-0400\n"
+"POT-Creation-Date: 2007-09-06 08:50-0400\n"
 "PO-Revision-Date: 2003-06-08 20:32+0200\n"
 "Last-Translator: Jakub Bogusz <qboosh@pld-linux.org>\n"
 "Language-Team: Polish <translation-team-pl@lists.sourceforge.net>\n"
@@ -63,62 +63,62 @@ msgstr "błąd alokacji pamięci"
 msgid "unknown error"
 msgstr "nieznany błąd"
 
-#: popthelp.c:68 popthelp.c:79
+#: popthelp.c:74 popthelp.c:85
 msgid "Show this help message"
 msgstr "Pokaż tą pomoc"
 
-#: popthelp.c:69 popthelp.c:80
+#: popthelp.c:75 popthelp.c:86
 msgid "Display brief usage message"
 msgstr "Wyświetl skrócony sposób użycia"
 
-#: popthelp.c:83
+#: popthelp.c:89
 msgid "Display option defaults in message"
 msgstr "Wyświetl domyślne opcje w opisie"
 
-#: popthelp.c:126
+#: popthelp.c:162
 msgid "Help options:"
 msgstr "Opcje pomocy:"
 
-#: popthelp.c:127
+#: popthelp.c:163
 msgid "Options implemented via popt alias/exec:"
 msgstr "Opcje zaimplementowane poprzez popt alias/exec:"
 
-#: popthelp.c:135
+#: popthelp.c:171
 msgid "NONE"
 msgstr "BRAK"
 
-#: popthelp.c:137
+#: popthelp.c:173
 msgid "VAL"
 msgstr "WART"
 
-#: popthelp.c:141
+#: popthelp.c:177
 msgid "INT"
 msgstr "INT"
 
-#: popthelp.c:142
+#: popthelp.c:178
 msgid "LONG"
 msgstr "LONG"
 
-#: popthelp.c:143
+#: popthelp.c:179
 msgid "STRING"
 msgstr "ŁAŃCUCH"
 
-#: popthelp.c:144
+#: popthelp.c:180
 msgid "FLOAT"
 msgstr "FLOAT"
 
-#: popthelp.c:145
+#: popthelp.c:181
 msgid "DOUBLE"
 msgstr "DOUBLE"
 
-#: popthelp.c:146
+#: popthelp.c:183
 msgid "ARG"
 msgstr "PARAM"
 
-#: popthelp.c:559
+#: popthelp.c:606
 msgid "Usage:"
 msgstr "Użycie:"
 
-#: popthelp.c:583
+#: popthelp.c:630
 msgid "[OPTION...]"
 msgstr "[OPCJA...]"
diff --git a/po/popt.pot b/po/popt.pot
index d721eea..36d2189 100644
--- a/po/popt.pot
+++ b/po/popt.pot
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: <popt-devel@rpm5.org>\n"
-"POT-Creation-Date: 2007-08-14 10:34-0400\n"
+"POT-Creation-Date: 2007-09-06 08:50-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -64,62 +64,62 @@ msgstr ""
 msgid "unknown error"
 msgstr ""
 
-#: popthelp.c:68 popthelp.c:79
+#: popthelp.c:74 popthelp.c:85
 msgid "Show this help message"
 msgstr ""
 
-#: popthelp.c:69 popthelp.c:80
+#: popthelp.c:75 popthelp.c:86
 msgid "Display brief usage message"
 msgstr ""
 
-#: popthelp.c:83
+#: popthelp.c:89
 msgid "Display option defaults in message"
 msgstr ""
 
-#: popthelp.c:126
+#: popthelp.c:162
 msgid "Help options:"
 msgstr ""
 
-#: popthelp.c:127
+#: popthelp.c:163
 msgid "Options implemented via popt alias/exec:"
 msgstr ""
 
-#: popthelp.c:135
+#: popthelp.c:171
 msgid "NONE"
 msgstr ""
 
-#: popthelp.c:137
+#: popthelp.c:173
 msgid "VAL"
 msgstr ""
 
-#: popthelp.c:141
+#: popthelp.c:177
 msgid "INT"
 msgstr ""
 
-#: popthelp.c:142
+#: popthelp.c:178
 msgid "LONG"
 msgstr ""
 
-#: popthelp.c:143
+#: popthelp.c:179
 msgid "STRING"
 msgstr ""
 
-#: popthelp.c:144
+#: popthelp.c:180
 msgid "FLOAT"
 msgstr ""
 
-#: popthelp.c:145
+#: popthelp.c:181
 msgid "DOUBLE"
 msgstr ""
 
-#: popthelp.c:146
+#: popthelp.c:183
 msgid "ARG"
 msgstr ""
 
-#: popthelp.c:559
+#: popthelp.c:606
 msgid "Usage:"
 msgstr ""
 
-#: popthelp.c:583
+#: popthelp.c:630
 msgid "[OPTION...]"
 msgstr ""
diff --git a/po/pt.po b/po/pt.po
index 6b8fe2c..bc5d444 100644
--- a/po/pt.po
+++ b/po/pt.po
@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.12\n"
 "Report-Msgid-Bugs-To: <popt-devel@rpm5.org>\n"
-"POT-Creation-Date: 2007-08-14 10:34-0400\n"
+"POT-Creation-Date: 2007-09-06 08:50-0400\n"
 "PO-Revision-Date: 2002-02-13 18:32+0000\n"
 "Last-Translator: Pedro Morais <morais@kde.org>\n"
 "Language-Team: pt <morais@kde.org>\n"
@@ -59,62 +59,62 @@ msgstr "aloca
 msgid "unknown error"
 msgstr "erro desconhecido"
 
-#: popthelp.c:68 popthelp.c:79
+#: popthelp.c:74 popthelp.c:85
 msgid "Show this help message"
 msgstr "Mostrar esta mensagem de ajuda"
 
-#: popthelp.c:69 popthelp.c:80
+#: popthelp.c:75 popthelp.c:86
 msgid "Display brief usage message"
 msgstr "Mostrar uma mensagem de utiliza��o sucinta"
 
-#: popthelp.c:83
+#: popthelp.c:89
 msgid "Display option defaults in message"
 msgstr "Mostrar valor por omiss�o das op��es na mensagem"
 
-#: popthelp.c:126
+#: popthelp.c:162
 msgid "Help options:"
 msgstr ""
 
-#: popthelp.c:127
+#: popthelp.c:163
 msgid "Options implemented via popt alias/exec:"
 msgstr ""
 
-#: popthelp.c:135
+#: popthelp.c:171
 msgid "NONE"
 msgstr "NONE"
 
-#: popthelp.c:137
+#: popthelp.c:173
 msgid "VAL"
 msgstr "VAL"
 
-#: popthelp.c:141
+#: popthelp.c:177
 msgid "INT"
 msgstr "INT"
 
-#: popthelp.c:142
+#: popthelp.c:178
 msgid "LONG"
 msgstr "LONG"
 
-#: popthelp.c:143
+#: popthelp.c:179
 msgid "STRING"
 msgstr "STRING"
 
-#: popthelp.c:144
+#: popthelp.c:180
 msgid "FLOAT"
 msgstr "FLOAT"
 
-#: popthelp.c:145
+#: popthelp.c:181
 msgid "DOUBLE"
 msgstr "DOUBLE"
 
-#: popthelp.c:146
+#: popthelp.c:183
 msgid "ARG"
 msgstr "ARG"
 
-#: popthelp.c:559
+#: popthelp.c:606
 msgid "Usage:"
 msgstr "Utiliza��o:"
 
-#: popthelp.c:583
+#: popthelp.c:630
 msgid "[OPTION...]"
 msgstr "[OP��O...]"
diff --git a/po/ro.po b/po/ro.po
index 29582b0..131dbcb 100644
--- a/po/ro.po
+++ b/po/ro.po
@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.12\n"
 "Report-Msgid-Bugs-To: <popt-devel@rpm5.org>\n"
-"POT-Creation-Date: 2007-08-14 10:34-0400\n"
+"POT-Creation-Date: 2007-09-06 08:50-0400\n"
 "PO-Revision-Date: 2000-06-14 23:23+EST\n"
 "Last-Translator: Cristian Gafton <gafton@redhat.com>\n"
 "Language-Team: Romanian <ro@li.org>\n"
@@ -60,63 +60,63 @@ msgstr ""
 msgid "unknown error"
 msgstr "eroare necuinoscuta"
 
-#: popthelp.c:68 popthelp.c:79
+#: popthelp.c:74 popthelp.c:85
 msgid "Show this help message"
 msgstr "Afisare mesaj de help"
 
-#: popthelp.c:69 popthelp.c:80
+#: popthelp.c:75 popthelp.c:86
 msgid "Display brief usage message"
 msgstr "Afisare mesaj sintaxa sumar"
 
-#: popthelp.c:83
+#: popthelp.c:89
 #, fuzzy
 msgid "Display option defaults in message"
 msgstr "Afisare mesaj sintaxa sumar"
 
-#: popthelp.c:126
+#: popthelp.c:162
 msgid "Help options:"
 msgstr ""
 
-#: popthelp.c:127
+#: popthelp.c:163
 msgid "Options implemented via popt alias/exec:"
 msgstr ""
 
-#: popthelp.c:135
+#: popthelp.c:171
 msgid "NONE"
 msgstr ""
 
-#: popthelp.c:137
+#: popthelp.c:173
 msgid "VAL"
 msgstr ""
 
-#: popthelp.c:141
+#: popthelp.c:177
 msgid "INT"
 msgstr ""
 
-#: popthelp.c:142
+#: popthelp.c:178
 msgid "LONG"
 msgstr ""
 
-#: popthelp.c:143
+#: popthelp.c:179
 msgid "STRING"
 msgstr ""
 
-#: popthelp.c:144
+#: popthelp.c:180
 msgid "FLOAT"
 msgstr ""
 
-#: popthelp.c:145
+#: popthelp.c:181
 msgid "DOUBLE"
 msgstr ""
 
-#: popthelp.c:146
+#: popthelp.c:183
 msgid "ARG"
 msgstr ""
 
-#: popthelp.c:559
+#: popthelp.c:606
 msgid "Usage:"
 msgstr "Sintaxa:"
 
-#: popthelp.c:583
+#: popthelp.c:630
 msgid "[OPTION...]"
 msgstr "[OPTIUNE...]"
diff --git a/po/ru.po b/po/ru.po
index 6130fd8..021ac59 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.12\n"
 "Report-Msgid-Bugs-To: <popt-devel@rpm5.org>\n"
-"POT-Creation-Date: 2007-08-14 10:34-0400\n"
+"POT-Creation-Date: 2007-09-06 08:50-0400\n"
 "PO-Revision-Date: 2001-07-05 21:00-0500\n"
 "Last-Translator: Eugene Kanter <eugene@blackcatlinux.com>\n"
 "Language-Team: Black Cat Linux Team <blackcat-support@blackcatlinux.com>\n"
@@ -59,62 +59,62 @@ msgstr "
 msgid "unknown error"
 msgstr "����������� ������"
 
-#: popthelp.c:68 popthelp.c:79
+#: popthelp.c:74 popthelp.c:85
 msgid "Show this help message"
 msgstr "�������� ��� ���������"
 
-#: popthelp.c:69 popthelp.c:80
+#: popthelp.c:75 popthelp.c:86
 msgid "Display brief usage message"
 msgstr "�������� ������� ���������� �� �������������"
 
-#: popthelp.c:83
+#: popthelp.c:89
 msgid "Display option defaults in message"
 msgstr "�������� ��������� �� ���������"
 
-#: popthelp.c:126
+#: popthelp.c:162
 msgid "Help options:"
 msgstr ""
 
-#: popthelp.c:127
+#: popthelp.c:163
 msgid "Options implemented via popt alias/exec:"
 msgstr ""
 
-#: popthelp.c:135
+#: popthelp.c:171
 msgid "NONE"
 msgstr "NONE"
 
-#: popthelp.c:137
+#: popthelp.c:173
 msgid "VAL"
 msgstr "VAL"
 
-#: popthelp.c:141
+#: popthelp.c:177
 msgid "INT"
 msgstr "INT"
 
-#: popthelp.c:142
+#: popthelp.c:178
 msgid "LONG"
 msgstr "LONG"
 
-#: popthelp.c:143
+#: popthelp.c:179
 msgid "STRING"
 msgstr "STRING"
 
-#: popthelp.c:144
+#: popthelp.c:180
 msgid "FLOAT"
 msgstr "FLOAT"
 
-#: popthelp.c:145
+#: popthelp.c:181
 msgid "DOUBLE"
 msgstr "DOUBLE"
 
-#: popthelp.c:146
+#: popthelp.c:183
 msgid "ARG"
 msgstr "ARG"
 
-#: popthelp.c:559
+#: popthelp.c:606
 msgid "Usage:"
 msgstr "�������������:"
 
-#: popthelp.c:583
+#: popthelp.c:630
 msgid "[OPTION...]"
 msgstr "[��������...]"
diff --git a/po/sk.po b/po/sk.po
index 27d4782..1911018 100644
--- a/po/sk.po
+++ b/po/sk.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.12\n"
 "Report-Msgid-Bugs-To: <popt-devel@rpm5.org>\n"
-"POT-Creation-Date: 2007-08-14 10:34-0400\n"
+"POT-Creation-Date: 2007-09-06 08:50-0400\n"
 "PO-Revision-Date: 1999-08-04 21:40+0200\n"
 "Last-Translator: Stanislav Meduna <stano@eunet.sk>\n"
 "Language-Team: Slovak <sk-i18n@rak.isternet.sk>\n"
@@ -63,63 +63,63 @@ msgstr ""
 msgid "unknown error"
 msgstr ""
 
-#: popthelp.c:68 popthelp.c:79
+#: popthelp.c:74 popthelp.c:85
 msgid "Show this help message"
 msgstr "Vyp�sa� t�to spr�vu"
 
-#: popthelp.c:69 popthelp.c:80
+#: popthelp.c:75 popthelp.c:86
 msgid "Display brief usage message"
 msgstr "Zobrazi� stru�n� n�vod na pou�itie"
 
-#: popthelp.c:83
+#: popthelp.c:89
 #, fuzzy
 msgid "Display option defaults in message"
 msgstr "Zobrazi� stru�n� n�vod na pou�itie"
 
-#: popthelp.c:126
+#: popthelp.c:162
 msgid "Help options:"
 msgstr ""
 
-#: popthelp.c:127
+#: popthelp.c:163
 msgid "Options implemented via popt alias/exec:"
 msgstr ""
 
-#: popthelp.c:135
+#: popthelp.c:171
 msgid "NONE"
 msgstr ""
 
-#: popthelp.c:137
+#: popthelp.c:173
 msgid "VAL"
 msgstr ""
 
-#: popthelp.c:141
+#: popthelp.c:177
 msgid "INT"
 msgstr ""
 
-#: popthelp.c:142
+#: popthelp.c:178
 msgid "LONG"
 msgstr ""
 
-#: popthelp.c:143
+#: popthelp.c:179
 msgid "STRING"
 msgstr ""
 
-#: popthelp.c:144
+#: popthelp.c:180
 msgid "FLOAT"
 msgstr ""
 
-#: popthelp.c:145
+#: popthelp.c:181
 msgid "DOUBLE"
 msgstr ""
 
-#: popthelp.c:146
+#: popthelp.c:183
 msgid "ARG"
 msgstr ""
 
-#: popthelp.c:559
+#: popthelp.c:606
 msgid "Usage:"
 msgstr ""
 
-#: popthelp.c:583
+#: popthelp.c:630
 msgid "[OPTION...]"
 msgstr ""
diff --git a/po/sl.po b/po/sl.po
index db1ecc6..f7e6f73 100644
--- a/po/sl.po
+++ b/po/sl.po
@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.12\n"
 "Report-Msgid-Bugs-To: <popt-devel@rpm5.org>\n"
-"POT-Creation-Date: 2007-08-14 10:34-0400\n"
+"POT-Creation-Date: 2007-09-06 08:50-0400\n"
 "PO-Revision-Date: 2000-09-05 12:30+0200\n"
 "Last-Translator: Roman Maurer <roman.maurer@hermes.si>\n"
 "Language-Team: Slovenian <sl@li.org>\n"
@@ -59,63 +59,63 @@ msgstr ""
 msgid "unknown error"
 msgstr ""
 
-#: popthelp.c:68 popthelp.c:79
+#: popthelp.c:74 popthelp.c:85
 msgid "Show this help message"
 msgstr "Prika�i to sporo�ilo s pomo�jo"
 
-#: popthelp.c:69 popthelp.c:80
+#: popthelp.c:75 popthelp.c:86
 msgid "Display brief usage message"
 msgstr "Prika�i kratko sporo�ilo o uporabi"
 
-#: popthelp.c:83
+#: popthelp.c:89
 #, fuzzy
 msgid "Display option defaults in message"
 msgstr "Prika�i kratko sporo�ilo o uporabi"
 
-#: popthelp.c:126
+#: popthelp.c:162
 msgid "Help options:"
 msgstr ""
 
-#: popthelp.c:127
+#: popthelp.c:163
 msgid "Options implemented via popt alias/exec:"
 msgstr ""
 
-#: popthelp.c:135
+#: popthelp.c:171
 msgid "NONE"
 msgstr ""
 
-#: popthelp.c:137
+#: popthelp.c:173
 msgid "VAL"
 msgstr ""
 
-#: popthelp.c:141
+#: popthelp.c:177
 msgid "INT"
 msgstr ""
 
-#: popthelp.c:142
+#: popthelp.c:178
 msgid "LONG"
 msgstr ""
 
-#: popthelp.c:143
+#: popthelp.c:179
 msgid "STRING"
 msgstr ""
 
-#: popthelp.c:144
+#: popthelp.c:180
 msgid "FLOAT"
 msgstr ""
 
-#: popthelp.c:145
+#: popthelp.c:181
 msgid "DOUBLE"
 msgstr ""
 
-#: popthelp.c:146
+#: popthelp.c:183
 msgid "ARG"
 msgstr ""
 
-#: popthelp.c:559
+#: popthelp.c:606
 msgid "Usage:"
 msgstr ""
 
-#: popthelp.c:583
+#: popthelp.c:630
 msgid "[OPTION...]"
 msgstr ""
diff --git a/po/sv.po b/po/sv.po
index 8be0357..0afa9bf 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.12\n"
 "Report-Msgid-Bugs-To: <popt-devel@rpm5.org>\n"
-"POT-Creation-Date: 2007-08-14 10:34-0400\n"
+"POT-Creation-Date: 2007-09-06 08:50-0400\n"
 "PO-Revision-Date: 2007-06-12 22:00+0200\n"
 "Last-Translator: G�ran Uddeborg <goeran@uddeborg.se>\n"
 "Language-Team: Swedish <tp-sv@listor.tp-sv.se>\n"
@@ -59,62 +59,62 @@ msgstr "minnesallokering misslyckades"
 msgid "unknown error"
 msgstr "ok�nt fel"
 
-#: popthelp.c:68 popthelp.c:79
+#: popthelp.c:74 popthelp.c:85
 msgid "Show this help message"
 msgstr "Visa denna hj�lptext"
 
-#: popthelp.c:69 popthelp.c:80
+#: popthelp.c:75 popthelp.c:86
 msgid "Display brief usage message"
 msgstr "Visa en kortfattad anv�ndningstext"
 
-#: popthelp.c:83
+#: popthelp.c:89
 msgid "Display option defaults in message"
 msgstr "Visa standardalternativ f�r flaggor i meddelande"
 
-#: popthelp.c:126
+#: popthelp.c:162
 msgid "Help options:"
 msgstr "Hj�lpflaggor:"
 
-#: popthelp.c:127
+#: popthelp.c:163
 msgid "Options implemented via popt alias/exec:"
 msgstr "Flaggor implementerade via popt-alias/exec:"
 
-#: popthelp.c:135
+#: popthelp.c:171
 msgid "NONE"
 msgstr "INGET"
 
-#: popthelp.c:137
+#: popthelp.c:173
 msgid "VAL"
 msgstr "V�RDE"
 
-#: popthelp.c:141
+#: popthelp.c:177
 msgid "INT"
 msgstr "HELTAL"
 
-#: popthelp.c:142
+#: popthelp.c:178
 msgid "LONG"
 msgstr "L�NG"
 
-#: popthelp.c:143
+#: popthelp.c:179
 msgid "STRING"
 msgstr "STR�NG"
 
-#: popthelp.c:144
+#: popthelp.c:180
 msgid "FLOAT"
 msgstr "FLYTTAL"
 
-#: popthelp.c:145
+#: popthelp.c:181
 msgid "DOUBLE"
 msgstr "DUBBEL"
 
-#: popthelp.c:146
+#: popthelp.c:183
 msgid "ARG"
 msgstr "ARG"
 
-#: popthelp.c:559
+#: popthelp.c:606
 msgid "Usage:"
 msgstr "Anv�ndning:"
 
-#: popthelp.c:583
+#: popthelp.c:630
 msgid "[OPTION...]"
 msgstr "[FLAGGA...]"
diff --git a/po/tr.po b/po/tr.po
index 57423bc..6b5b364 100644
--- a/po/tr.po
+++ b/po/tr.po
@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.12\n"
 "Report-Msgid-Bugs-To: <popt-devel@rpm5.org>\n"
-"POT-Creation-Date: 2007-08-14 10:34-0400\n"
+"POT-Creation-Date: 2007-09-06 08:50-0400\n"
 "PO-Revision-Date: 2000-02-11 13:01+0200\n"
 "Last-Translator: Nilgun Belma Buguner <nilgun@technologist.com>\n"
 "Language-Team: Turkish <tr@li.org>\n"
@@ -59,63 +59,63 @@ msgstr ""
 msgid "unknown error"
 msgstr "bilinmeyen hata"
 
-#: popthelp.c:68 popthelp.c:79
+#: popthelp.c:74 popthelp.c:85
 msgid "Show this help message"
 msgstr "Bu yard�m iletisini g�sterir"
 
-#: popthelp.c:69 popthelp.c:80
+#: popthelp.c:75 popthelp.c:86
 msgid "Display brief usage message"
 msgstr "K�sa bir kullan�m iletisi g�ster"
 
-#: popthelp.c:83
+#: popthelp.c:89
 #, fuzzy
 msgid "Display option defaults in message"
 msgstr "K�sa bir kullan�m iletisi g�ster"
 
-#: popthelp.c:126
+#: popthelp.c:162
 msgid "Help options:"
 msgstr ""
 
-#: popthelp.c:127
+#: popthelp.c:163
 msgid "Options implemented via popt alias/exec:"
 msgstr ""
 
-#: popthelp.c:135
+#: popthelp.c:171
 msgid "NONE"
 msgstr "YOK"
 
-#: popthelp.c:137
+#: popthelp.c:173
 msgid "VAL"
 msgstr "DE�"
 
-#: popthelp.c:141
+#: popthelp.c:177
 msgid "INT"
 msgstr "INT"
 
-#: popthelp.c:142
+#: popthelp.c:178
 msgid "LONG"
 msgstr "LONG"
 
-#: popthelp.c:143
+#: popthelp.c:179
 msgid "STRING"
 msgstr "STRING"
 
-#: popthelp.c:144
+#: popthelp.c:180
 msgid "FLOAT"
 msgstr "FLOAT"
 
-#: popthelp.c:145
+#: popthelp.c:181
 msgid "DOUBLE"
 msgstr "DOUBLE"
 
-#: popthelp.c:146
+#: popthelp.c:183
 msgid "ARG"
 msgstr "ARG"
 
-#: popthelp.c:559
+#: popthelp.c:606
 msgid "Usage:"
 msgstr "Kullan�m�:"
 
-#: popthelp.c:583
+#: popthelp.c:630
 msgid "[OPTION...]"
 msgstr "[SE�ENEK...]"
diff --git a/po/uk.po b/po/uk.po
index 31a4717..dc1d45f 100644
--- a/po/uk.po
+++ b/po/uk.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.12\n"
 "Report-Msgid-Bugs-To: <popt-devel@rpm5.org>\n"
-"POT-Creation-Date: 2007-08-14 10:34-0400\n"
+"POT-Creation-Date: 2007-09-06 08:50-0400\n"
 "PO-Revision-Date: 1999-09-30 16:54+0200\n"
 "Last-Translator: Yuri Syrota <rasta@renome.rovno.ua>\n"
 "Language-Team: Ukrainian <uk@li.org>\n"
@@ -63,63 +63,63 @@ msgstr ""
 msgid "unknown error"
 msgstr ""
 
-#: popthelp.c:68 popthelp.c:79
+#: popthelp.c:74 popthelp.c:85
 msgid "Show this help message"
 msgstr "�������� �� ��צ���"
 
-#: popthelp.c:69 popthelp.c:80
+#: popthelp.c:75 popthelp.c:86
 msgid "Display brief usage message"
 msgstr "�������� ������� ��צ��� ��� ������������"
 
-#: popthelp.c:83
+#: popthelp.c:89
 #, fuzzy
 msgid "Display option defaults in message"
 msgstr "�������� ������� ��צ��� ��� ������������"
 
-#: popthelp.c:126
+#: popthelp.c:162
 msgid "Help options:"
 msgstr ""
 
-#: popthelp.c:127
+#: popthelp.c:163
 msgid "Options implemented via popt alias/exec:"
 msgstr ""
 
-#: popthelp.c:135
+#: popthelp.c:171
 msgid "NONE"
 msgstr ""
 
-#: popthelp.c:137
+#: popthelp.c:173
 msgid "VAL"
 msgstr ""
 
-#: popthelp.c:141
+#: popthelp.c:177
 msgid "INT"
 msgstr ""
 
-#: popthelp.c:142
+#: popthelp.c:178
 msgid "LONG"
 msgstr ""
 
-#: popthelp.c:143
+#: popthelp.c:179
 msgid "STRING"
 msgstr ""
 
-#: popthelp.c:144
+#: popthelp.c:180
 msgid "FLOAT"
 msgstr ""
 
-#: popthelp.c:145
+#: popthelp.c:181
 msgid "DOUBLE"
 msgstr ""
 
-#: popthelp.c:146
+#: popthelp.c:183
 msgid "ARG"
 msgstr ""
 
-#: popthelp.c:559
+#: popthelp.c:606
 msgid "Usage:"
 msgstr ""
 
-#: popthelp.c:583
+#: popthelp.c:630
 msgid "[OPTION...]"
 msgstr ""
diff --git a/po/vi.po b/po/vi.po
index 66296c8..517db5a 100644
--- a/po/vi.po
+++ b/po/vi.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.12\n"
 "Report-Msgid-Bugs-To: <popt-devel@rpm5.org>\n"
-"POT-Creation-Date: 2007-08-14 10:34-0400\n"
+"POT-Creation-Date: 2007-09-06 08:50-0400\n"
 "PO-Revision-Date: 2007-07-12 22:37+0930\n"
 "Last-Translator: Clytie Siddall <clytie@riverland.net.au>\n"
 "Language-Team: Vietnamese <vi-VN@googlegroups.com>\n"
@@ -65,62 +65,62 @@ msgstr "lỗi cấp phát bộ nhớ"
 msgid "unknown error"
 msgstr "lỗi không rõ"
 
-#: popthelp.c:68 popthelp.c:79
+#: popthelp.c:74 popthelp.c:85
 msgid "Show this help message"
 msgstr "Xem thông điệp trợ giúp này"
 
-#: popthelp.c:69 popthelp.c:80
+#: popthelp.c:75 popthelp.c:86
 msgid "Display brief usage message"
 msgstr "Hiển thị thông điệp cách sử dụng ngắn"
 
-#: popthelp.c:83
+#: popthelp.c:89
 msgid "Display option defaults in message"
 msgstr "Hiển thị các giá trị mặc định của tùy chọn trong thông điệp"
 
-#: popthelp.c:126
+#: popthelp.c:162
 msgid "Help options:"
 msgstr "Tùy chọn trợ giúp:"
 
-#: popthelp.c:127
+#: popthelp.c:163
 msgid "Options implemented via popt alias/exec:"
 msgstr "Các tùy chọn được thực hiện thông qua popt alias/exec:"
 
-#: popthelp.c:135
+#: popthelp.c:171
 msgid "NONE"
 msgstr "KHÔNG CÓ"
 
-#: popthelp.c:137
+#: popthelp.c:173
 msgid "VAL"
 msgstr "GIÁ TRỊ"
 
-#: popthelp.c:141
+#: popthelp.c:177
 msgid "INT"
 msgstr "SỐ NGUYÊN"
 
-#: popthelp.c:142
+#: popthelp.c:178
 msgid "LONG"
 msgstr "DÀI"
 
-#: popthelp.c:143
+#: popthelp.c:179
 msgid "STRING"
 msgstr "CHUỖI"
 
-#: popthelp.c:144
+#: popthelp.c:180
 msgid "FLOAT"
 msgstr "NỔI"
 
-#: popthelp.c:145
+#: popthelp.c:181
 msgid "DOUBLE"
 msgstr "ĐÔI"
 
-#: popthelp.c:146
+#: popthelp.c:183
 msgid "ARG"
 msgstr "ĐỐI SỐ"
 
-#: popthelp.c:559
+#: popthelp.c:606
 msgid "Usage:"
 msgstr "Cách sử dụng:"
 
-#: popthelp.c:583
+#: popthelp.c:630
 msgid "[OPTION...]"
 msgstr "[TÙY_CHỌN...]"
diff --git a/po/wa.po b/po/wa.po
index 9311c29..a83ca1c 100644
--- a/po/wa.po
+++ b/po/wa.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.12\n"
 "Report-Msgid-Bugs-To: <popt-devel@rpm5.org>\n"
-"POT-Creation-Date: 2007-08-14 10:34-0400\n"
+"POT-Creation-Date: 2007-09-06 08:50-0400\n"
 "PO-Revision-Date: 1999-03-18 23:11+0100\n"
 "Last-Translator: Nobody yet\n"
 "Language-Team: walon <linux-wa@chanae.alphanet.ch>\n"
@@ -67,63 +67,63 @@ msgstr ""
 msgid "unknown error"
 msgstr ""
 
-#: popthelp.c:68 popthelp.c:79
+#: popthelp.c:74 popthelp.c:85
 msgid "Show this help message"
 msgstr "Mostrer ci messaedje d' aide chal"
 
-#: popthelp.c:69 popthelp.c:80
+#: popthelp.c:75 popthelp.c:86
 msgid "Display brief usage message"
 msgstr "Mostre on court messaedje so kmint vos � siervi"
 
-#: popthelp.c:83
+#: popthelp.c:89
 #, fuzzy
 msgid "Display option defaults in message"
 msgstr "Mostre on court messaedje so kmint vos � siervi"
 
-#: popthelp.c:126
+#: popthelp.c:162
 msgid "Help options:"
 msgstr ""
 
-#: popthelp.c:127
+#: popthelp.c:163
 msgid "Options implemented via popt alias/exec:"
 msgstr ""
 
-#: popthelp.c:135
+#: popthelp.c:171
 msgid "NONE"
 msgstr ""
 
-#: popthelp.c:137
+#: popthelp.c:173
 msgid "VAL"
 msgstr ""
 
-#: popthelp.c:141
+#: popthelp.c:177
 msgid "INT"
 msgstr ""
 
-#: popthelp.c:142
+#: popthelp.c:178
 msgid "LONG"
 msgstr ""
 
-#: popthelp.c:143
+#: popthelp.c:179
 msgid "STRING"
 msgstr ""
 
-#: popthelp.c:144
+#: popthelp.c:180
 msgid "FLOAT"
 msgstr ""
 
-#: popthelp.c:145
+#: popthelp.c:181
 msgid "DOUBLE"
 msgstr ""
 
-#: popthelp.c:146
+#: popthelp.c:183
 msgid "ARG"
 msgstr ""
 
-#: popthelp.c:559
+#: popthelp.c:606
 msgid "Usage:"
 msgstr ""
 
-#: popthelp.c:583
+#: popthelp.c:630
 msgid "[OPTION...]"
 msgstr ""
diff --git a/po/zh_CN.po b/po/zh_CN.po
index 94d32ba..7cce9a7 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.12\n"
 "Report-Msgid-Bugs-To: <popt-devel@rpm5.org>\n"
-"POT-Creation-Date: 2007-08-14 10:34-0400\n"
+"POT-Creation-Date: 2007-09-06 08:50-0400\n"
 "PO-Revision-Date: 2007-08-13 22:32+0800\n"
 "Last-Translator: LI Daobing <lidaobing@gmail.com>\n"
 "Language-Team: Chinese (simplified) <translation-team-zh-cn@lists."
@@ -66,62 +66,62 @@ msgstr "内存分配错误"
 msgid "unknown error"
 msgstr "未知的错误"
 
-#: popthelp.c:68 popthelp.c:79
+#: popthelp.c:74 popthelp.c:85
 msgid "Show this help message"
 msgstr "显示这个帮助信息"
 
-#: popthelp.c:69 popthelp.c:80
+#: popthelp.c:75 popthelp.c:86
 msgid "Display brief usage message"
 msgstr "显示简短的使用说明"
 
-#: popthelp.c:83
+#: popthelp.c:89
 msgid "Display option defaults in message"
 msgstr "在信息中显示默认的选项"
 
-#: popthelp.c:126
+#: popthelp.c:162
 msgid "Help options:"
 msgstr "帮助选项:"
 
-#: popthelp.c:127
+#: popthelp.c:163
 msgid "Options implemented via popt alias/exec:"
 msgstr "通过 popt alias/exec 实现的选项:"
 
-#: popthelp.c:135
+#: popthelp.c:171
 msgid "NONE"
 msgstr "NONE"
 
-#: popthelp.c:137
+#: popthelp.c:173
 msgid "VAL"
 msgstr "VAL"
 
-#: popthelp.c:141
+#: popthelp.c:177
 msgid "INT"
 msgstr "INT"
 
-#: popthelp.c:142
+#: popthelp.c:178
 msgid "LONG"
 msgstr "LONG"
 
-#: popthelp.c:143
+#: popthelp.c:179
 msgid "STRING"
 msgstr "STRING"
 
-#: popthelp.c:144
+#: popthelp.c:180
 msgid "FLOAT"
 msgstr "FLOAT"
 
-#: popthelp.c:145
+#: popthelp.c:181
 msgid "DOUBLE"
 msgstr "DOUBLE"
 
-#: popthelp.c:146
+#: popthelp.c:183
 msgid "ARG"
 msgstr "ARG"
 
-#: popthelp.c:559
+#: popthelp.c:606
 msgid "Usage:"
 msgstr "用法:"
 
-#: popthelp.c:583
+#: popthelp.c:630
 msgid "[OPTION...]"
 msgstr "[选项...]"
diff --git a/poptconfig.c b/poptconfig.c
index 5697c17..218a062 100644
--- a/poptconfig.c
+++ b/poptconfig.c
@@ -168,15 +168,19 @@ int poptReadConfigFile(poptContext con, const char * fn)
 
 int poptReadDefaultConfig(poptContext con, /*@unused@*/ int useEnv)
 {
+    static const char _popt_sysconfdir[] = POPT_SYSCONFDIR "/popt";
+    static const char _popt_etc[] = "/etc/popt";
     char * fn, * home;
     int rc;
 
     if (con->appName == NULL) return 0;
 
-    rc = poptReadConfigFile(con, POPT_SYSCONFDIR "/popt");
-    if (rc) return rc;
+    if (strcmp(_popt_sysconfdir, _popt_etc)) {
+	rc = poptReadConfigFile(con, _popt_sysconfdir);
+	if (rc) return rc;
+    }
 
-    rc = poptReadConfigFile(con, "/etc/popt");
+    rc = poptReadConfigFile(con, _popt_etc);
     if (rc) return rc;
 
     if ((home = getenv("HOME"))) {
-- 
Gitee


From cff39961fe8aea949971c31a3c64c0fbe888a44d Mon Sep 17 00:00:00 2001
From: Jeff Johnson <n3npq@mac.com>
Date: Sat, 6 Oct 2007 02:14:42 +0000
Subject: [PATCH 468/667] - bero: read /etc/popt.d/* files.

---
 CHANGES      |  1 +
 poptconfig.c | 23 +++++++++++++++++++++++
 2 files changed, 24 insertions(+)

diff --git a/CHANGES b/CHANGES
index 6f2d719..fbfecd6 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,4 +1,5 @@
 1.12 -> 1.13:
+    - bero: read /etc/popt.d/* files.
     - jbj: don't read /etc/popt twice (#290531).
     - jbj: isspace(3) has i18n encoding signednesss issues on Solaris (#172393).
     - jbj: refactor column cursor to a structure, carry maxcols as well.
diff --git a/poptconfig.c b/poptconfig.c
index 218a062..a34363a 100644
--- a/poptconfig.c
+++ b/poptconfig.c
@@ -8,6 +8,8 @@
 
 #include "system.h"
 #include "poptint.h"
+#include <sys/stat.h>
+#include <glob.h>
 /*@access poptContext @*/
 
 /*@-compmempass@*/	/* FIX: item->option.longName kept, not dependent. */
@@ -171,6 +173,7 @@ int poptReadDefaultConfig(poptContext con, /*@unused@*/ int useEnv)
     static const char _popt_sysconfdir[] = POPT_SYSCONFDIR "/popt";
     static const char _popt_etc[] = "/etc/popt";
     char * fn, * home;
+    struct stat s;
     int rc;
 
     if (con->appName == NULL) return 0;
@@ -183,6 +186,26 @@ int poptReadDefaultConfig(poptContext con, /*@unused@*/ int useEnv)
     rc = poptReadConfigFile(con, _popt_etc);
     if (rc) return rc;
 
+    stat("/etc/popt.d", &s);
+    if(S_ISDIR(s.st_mode)) {
+        glob_t g;
+	if (!glob("/etc/popt.d/*", 0, NULL, &g)) {
+            int i;
+	    for (i=0; i<g.gl_pathc; i++) {
+		char *f=g.gl_pathv[i];
+		if (strstr(f, ".rpmnew") || strstr(f, ".rpmsave"))
+		    continue;
+		if (!stat(f, &s)) {
+		    if (!S_ISREG(s.st_mode) && !S_ISLNK(s.st_mode))
+			continue;
+		}
+		rc = poptReadConfigFile(con, f);
+		if (rc) return rc;
+	    }
+	    globfree(&g);
+	}
+    }
+
     if ((home = getenv("HOME"))) {
 	fn = malloc(strlen(home) + 20);
 	strcpy(fn, home);
-- 
Gitee


From 03aaa20e3a5f0393dbfee247307cf37c6a104279 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bernhard=20Rosenkr=C3=A4nzer?= <bero@lindev.ch>
Date: Sat, 3 Nov 2007 22:18:40 +0000
Subject: [PATCH 469/667] Make it compile for libc implementations that need
 <alloca.h> for alloca()

Submitted by: bero
---
 configure.ac | 2 +-
 popthelp.c   | 5 +++++
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/configure.ac b/configure.ac
index 9e158bb..1ffaf71 100755
--- a/configure.ac
+++ b/configure.ac
@@ -68,7 +68,7 @@ if ! echo "${libdir}" | grep -q '64$' ; then
 fi
 AC_SUBST(MARK64)
 
-AC_CHECK_HEADERS(float.h libintl.h mcheck.h unistd.h langinfo.h)
+AC_CHECK_HEADERS(float.h libintl.h mcheck.h unistd.h langinfo.h alloca.h)
 
 # For some systems we know that we have ld_version scripts.
 # Use it then as default.
diff --git a/popthelp.c b/popthelp.c
index a0d0b89..653bcb3 100644
--- a/popthelp.c
+++ b/popthelp.c
@@ -20,6 +20,11 @@
 #include <wchar.h>			/* for mbsrtowcs */
 /*@access mbstate_t @*/
 #endif
+
+#ifdef HAVE_ALLOCA_H
+#include <alloca.h>
+#endif
+
 #include "poptint.h"
 
 /*@access poptContext@*/
-- 
Gitee


From 6239ccf4c5769c33804d816a324357db33c1d6d8 Mon Sep 17 00:00:00 2001
From: Jeff Johnson <n3npq@mac.com>
Date: Sat, 3 Nov 2007 22:50:33 +0000
Subject: [PATCH 470/667] - jbj: handle Solaris signed character isspace(3)
 issues consistently.

---
 CHANGES      |  2 ++
 poptconfig.c | 14 +++++++-------
 popthelp.c   |  3 ---
 poptparse.c  | 14 +++++++-------
 system.h     |  3 +++
 5 files changed, 19 insertions(+), 17 deletions(-)

diff --git a/CHANGES b/CHANGES
index fbfecd6..f5d9df7 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,4 +1,6 @@
 1.12 -> 1.13:
+    - jbj: handle Solaris signed character isspace(3) issues consistently.
+    - bero: include <alloca.h> where necessary.
     - bero: read /etc/popt.d/* files.
     - jbj: don't read /etc/popt twice (#290531).
     - jbj: isspace(3) has i18n encoding signednesss issues on Solaris (#172393).
diff --git a/poptconfig.c b/poptconfig.c
index a34363a..3f60d46 100644
--- a/poptconfig.c
+++ b/poptconfig.c
@@ -33,20 +33,20 @@ static void configLine(poptContext con, char * line)
     if (strncmp(line, con->appName, nameLength)) return;
 
     line += nameLength;
-    if (*line == '\0' || !isspace(*line)) return;
+    if (*line == '\0' || !_isspaceptr(line)) return;
 
-    while (*line != '\0' && isspace(*line)) line++;
+    while (*line != '\0' && _isspaceptr(line)) line++;
     entryType = line;
-    while (*line == '\0' || !isspace(*line)) line++;
+    while (*line == '\0' || !_isspaceptr(line)) line++;
     *line++ = '\0';
 
-    while (*line != '\0' && isspace(*line)) line++;
+    while (*line != '\0' && _isspaceptr(line)) line++;
     if (*line == '\0') return;
     opt = line;
-    while (*line == '\0' || !isspace(*line)) line++;
+    while (*line == '\0' || !_isspaceptr(line)) line++;
     *line++ = '\0';
 
-    while (*line != '\0' && isspace(*line)) line++;
+    while (*line != '\0' && _isspaceptr(line)) line++;
     if (*line == '\0') return;
 
 /*@-temptrans@*/ /* FIX: line alias is saved */
@@ -139,7 +139,7 @@ int poptReadConfigFile(poptContext con, const char * fn)
 	  case '\n':
 	    *dst = '\0';
 	    dst = buf;
-	    while (*dst && isspace(*dst)) dst++;
+	    while (*dst && _isspaceptr(dst)) dst++;
 	    if (*dst && *dst != '#')
 		configLine(con, dst);
 	    chptr++;
diff --git a/popthelp.c b/popthelp.c
index 653bcb3..ff367f8 100644
--- a/popthelp.c
+++ b/popthelp.c
@@ -29,9 +29,6 @@
 
 /*@access poptContext@*/
 
-/* XXX isspace(3) has i18n encoding signednesss issues on Solaris. */
-#define	_isspaceptr(_chp)	isspace((int)(*(unsigned char *)(_chp)))
-
 /**
  * Display arguments.
  * @param con		context
diff --git a/poptparse.c b/poptparse.c
index 9064253..e58bd8d 100644
--- a/poptparse.c
+++ b/poptparse.c
@@ -86,7 +86,7 @@ int poptParseArgvString(const char * s, int * argcPtr, const char *** argvPtr)
 		if (*src != quote) *buf++ = '\\';
 	    }
 	    *buf++ = *src;
-	} else if (isspace(*src)) {
+	} else if (_isspaceptr(src)) {
 	    if (*argv[argc] != '\0') {
 		buf++, argc++;
 		if (argc == argvAlloced) {
@@ -161,7 +161,7 @@ int poptConfigFileToString(FILE *fp, char ** argstrp, /*@unused@*/ int flags)
 	p = line;
 
 	/* loop until first non-space char or EOL */
-	while( *p != '\0' && isspace(*p) )
+	while( *p != '\0' && _isspaceptr(p) )
 	    p++;
 
 	linelen = strlen(p);
@@ -175,13 +175,13 @@ int poptConfigFileToString(FILE *fp, char ** argstrp, /*@unused@*/ int flags)
 
 	q = p;
 
-	while (*q != '\0' && (!isspace(*q)) && *q != '=')
+	while (*q != '\0' && (!_isspaceptr(q)) && *q != '=')
 	    q++;
 
-	if (isspace(*q)) {
+	if (_isspaceptr(q)) {
 	    /* a space after the name, find next non space */
 	    *q++='\0';
-	    while( *q != '\0' && isspace((int)*q) ) q++;
+	    while( *q != '\0' && _isspaceptr(q) ) q++;
 	}
 	if (*q == '\0') {
 	    /* single command line option (ie, no name=val, just name) */
@@ -203,14 +203,14 @@ int poptConfigFileToString(FILE *fp, char ** argstrp, /*@unused@*/ int flags)
 	*q++ = '\0';
 
 	/* find next non-space letter of value */
-	while (*q != '\0' && isspace(*q))
+	while (*q != '\0' && _isspaceptr(q))
 	    q++;
 	if (*q == '\0')
 	    continue;	/* XXX silently ignore missing value */
 
 	/* now, loop and strip all ending whitespace */
 	x = p + linelen;
-	while (isspace(*--x))
+	while (_isspaceptr(--x))
 	    *x = '\0';	/* null out last char if space (including fgets() NL) */
 
 	/* rest of line accept */
diff --git a/system.h b/system.h
index 233b58d..f893825 100644
--- a/system.h
+++ b/system.h
@@ -17,6 +17,9 @@ extern __const __int32_t *__ctype_toupper;
 
 #include <ctype.h>
 
+/* XXX isspace(3) has i18n encoding signednesss issues on Solaris. */
+#define	_isspaceptr(_chp)	isspace((int)(*(unsigned char *)(_chp)))
+
 #include <errno.h>
 #include <fcntl.h>
 #include <limits.h>
-- 
Gitee


From ee7cf1961803dce36f578eede6ce6e4bf70c4813 Mon Sep 17 00:00:00 2001
From: "Ralf S. Engelschall" <rse@engelschall.com>
Date: Sun, 4 Nov 2007 10:00:04 +0000
Subject: [PATCH 471/667] Autoconf has a specialized macro for alloca(3)
 checking

---
 configure.ac | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/configure.ac b/configure.ac
index 1ffaf71..f3c1847 100755
--- a/configure.ac
+++ b/configure.ac
@@ -68,7 +68,8 @@ if ! echo "${libdir}" | grep -q '64$' ; then
 fi
 AC_SUBST(MARK64)
 
-AC_CHECK_HEADERS(float.h libintl.h mcheck.h unistd.h langinfo.h alloca.h)
+AC_CHECK_HEADERS(float.h libintl.h mcheck.h unistd.h langinfo.h)
+AC_FUNC_ALLOCA
 
 # For some systems we know that we have ld_version scripts.
 # Use it then as default.
-- 
Gitee


From 9f3f36fc29e53c7de2e04daa5efb7dc8bb80380f Mon Sep 17 00:00:00 2001
From: Jeff Johnson <n3npq@mac.com>
Date: Sun, 4 Nov 2007 13:15:32 +0000
Subject: [PATCH 472/667] - jbj: remove splint bounds/branch annotations,
 little gain, much pain. - jbj: revert alloca usage again again.

---
 .splintrc    | 35 ++++++++++++++++++++++++++++++++++-
 CHANGES      |  3 ++-
 findme.c     |  2 --
 popt.c       | 32 --------------------------------
 poptconfig.c |  4 ----
 popthelp.c   | 40 +++++++---------------------------------
 poptparse.c  |  6 ------
 test1.c      |  2 --
 8 files changed, 43 insertions(+), 81 deletions(-)

diff --git a/.splintrc b/.splintrc
index ffc264c..8be1e2a 100644
--- a/.splintrc
+++ b/.splintrc
@@ -12,9 +12,42 @@
 +strict			# lclint level
 
 # --- in progress
-+bounds
+#+bounds
 -bufferoverflowhigh
 
+-bitwisesigned
+-branchstate
+-compdef
+-globuse
+-internalglobs
+-modnomods
+-modobserveruncon
+-mods
+-moduncon
+-modunconnomods
+-mustmod
+-noeffectuncon
+-nullderef
+-nullpass
+-nullptrarith
+-nullret
+-nullstate
+-protoparammatch
+-retalias
+-retvalint
+-retvalother
+-sizeoftype
+-type
+-unrecog
+
+-temptrans
+
++charint
+-exportvar
++matchanyintegral
+-loopswitchbreak
+-varuse
+
 # --- +partial artifacts
 
 # --- not-yet at strict level
diff --git a/CHANGES b/CHANGES
index f5d9df7..3d77fc6 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,6 +1,7 @@
 1.12 -> 1.13:
+    - jbj: remove splint bounds/branch annotations, little gain, much pain.
+    - jbj: revert alloca usage again again.
     - jbj: handle Solaris signed character isspace(3) issues consistently.
-    - bero: include <alloca.h> where necessary.
     - bero: read /etc/popt.d/* files.
     - jbj: don't read /etc/popt twice (#290531).
     - jbj: isspace(3) has i18n encoding signednesss issues on Solaris (#172393).
diff --git a/findme.c b/findme.c
index 9a80d2d..e60d77a 100644
--- a/findme.c
+++ b/findme.c
@@ -30,7 +30,6 @@ const char * POPT_findProgramPath(const char * argv0)
     strcpy(pathbuf, path);
 
     chptr = NULL;
-/*@-branchstate@*/
     do {
 	if ((chptr = strchr(start, ':')))
 	    *chptr = '\0';
@@ -46,7 +45,6 @@ const char * POPT_findProgramPath(const char * argv0)
 	else
 	    start = NULL;
     } while (start && *start);
-/*@=branchstate@*/
 
 exit:
     if (pathbuf)
diff --git a/popt.c b/popt.c
index 66d5e26..6895412 100644
--- a/popt.c
+++ b/popt.c
@@ -70,10 +70,8 @@ static void invokeCallbacksPRE(poptContext con, const struct poptOption * opt)
 	if (opt->arg == NULL) continue;		/* XXX program error. */
 	if ((opt->argInfo & POPT_ARG_MASK) == POPT_ARG_INCLUDE_TABLE) {
 	    void * arg = opt->arg;
-/*@-branchstate@*/
 	    /* XXX sick hack to preserve pretense of ABI. */
 	    if (arg == poptHelpOptions) arg = poptHelpOptionsI18N;
-/*@=branchstate@*/
 	    /* Recurse on included sub-tables. */
 	    invokeCallbacksPRE(con, arg);
 	} else if ((opt->argInfo & POPT_ARG_MASK) == POPT_ARG_CALLBACK &&
@@ -98,10 +96,8 @@ static void invokeCallbacksPOST(poptContext con, const struct poptOption * opt)
 	if (opt->arg == NULL) continue;		/* XXX program error. */
 	if ((opt->argInfo & POPT_ARG_MASK) == POPT_ARG_INCLUDE_TABLE) {
 	    void * arg = opt->arg;
-/*@-branchstate@*/
 	    /* XXX sick hack to preserve pretense of ABI. */
 	    if (arg == poptHelpOptions) arg = poptHelpOptionsI18N;
-/*@=branchstate@*/
 	    /* Recurse on included sub-tables. */
 	    invokeCallbacksPOST(con, arg);
 	} else if ((opt->argInfo & POPT_ARG_MASK) == POPT_ARG_CALLBACK &&
@@ -130,10 +126,8 @@ static void invokeCallbacksOPTION(poptContext con,
     for (; opt->longName || opt->shortName || opt->arg; opt++) {
 	if ((opt->argInfo & POPT_ARG_MASK) == POPT_ARG_INCLUDE_TABLE) {
 	    void * arg = opt->arg;
-/*@-branchstate@*/
 	    /* XXX sick hack to preserve pretense of ABI. */
 	    if (arg == poptHelpOptions) arg = poptHelpOptionsI18N;
-/*@=branchstate@*/
 	    /* Recurse on included sub-tables. */
 	    if (opt->arg != NULL)	/* XXX program error */
 		invokeCallbacksOPTION(con, opt->arg, myOpt, myData, shorty);
@@ -222,7 +216,6 @@ static void cleanOSE(/*@special@*/ struct optionStackEntry *os)
     os->argb = PBM_FREE(os->argb);
 }
 
-/*@-boundswrite@*/
 void poptResetContext(poptContext con)
 {
     int i;
@@ -255,10 +248,8 @@ void poptResetContext(poptContext con)
     return;
 /*@=nullstate@*/
 }
-/*@=boundswrite@*/
 
 /* Only one of longName, shortName should be set, not both. */
-/*@-boundswrite@*/
 static int handleExec(/*@special@*/ poptContext con,
 		/*@null@*/ const char * longName, char shortName)
 	/*@uses con->execs, con->numExecs, con->flags, con->doExec,
@@ -314,7 +305,6 @@ static int handleExec(/*@special@*/ poptContext con,
 
     return 1;
 }
-/*@=boundswrite@*/
 
 /* Only one of longName, shortName may be set at a time */
 static int handleAlias(/*@special@*/ poptContext con,
@@ -353,10 +343,8 @@ static int handleAlias(/*@special@*/ poptContext con,
     if ((con->os - con->optionStack + 1) == POPT_OPTION_DEPTH)
 	return POPT_ERROR_OPTSTOODEEP;
 
-/*@-boundsread@*/
     if (nextCharArg && *nextCharArg)
 	con->os->nextCharArg = nextCharArg;
-/*@=boundsread@*/
 
     con->os++;
     con->os->next = 0;
@@ -371,7 +359,6 @@ static int handleAlias(/*@special@*/ poptContext con,
     return (rc ? rc : 1);
 }
 
-/*@-bounds -boundswrite @*/
 static int execCommand(poptContext con)
 	/*@globals internalState @*/
 	/*@modifies internalState @*/
@@ -469,9 +456,7 @@ exit:
     }
     return ec;
 }
-/*@=bounds =boundswrite @*/
 
-/*@-boundswrite@*/
 /*@observer@*/ /*@null@*/ static const struct poptOption *
 findOption(const struct poptOption * opt, /*@null@*/ const char * longName, int longNameLen,
 		char shortName,
@@ -492,10 +477,8 @@ findOption(const struct poptOption * opt, /*@null@*/ const char * longName, int
 	    const struct poptOption * opt2;
 	    void * arg = opt->arg;
 
-/*@-branchstate@*/
 	    /* XXX sick hack to preserve pretense of ABI. */
 	    if (arg == poptHelpOptions) arg = poptHelpOptionsI18N;
-/*@=branchstate@*/
 	    /* Recurse on included sub-tables. */
 	    if (arg == NULL) continue;	/* XXX program error */
 	    opt2 = findOption(arg, longName, longNameLen, shortName, callback,
@@ -542,7 +525,6 @@ findOption(const struct poptOption * opt, /*@null@*/ const char * longName, int
 
     return opt;
 }
-/*@=boundswrite@*/
 
 static const char * findNextArg(/*@special@*/ poptContext con,
 		unsigned argx, int delete_arg)
@@ -581,7 +563,6 @@ static const char * findNextArg(/*@special@*/ poptContext con,
     return arg;
 }
 
-/*@-boundswrite@*/
 static /*@only@*/ /*@null@*/ const char *
 expandNextArg(/*@special@*/ poptContext con, const char * s)
 	/*@uses con->optionStack, con->os,
@@ -630,7 +611,6 @@ expandNextArg(/*@special@*/ poptContext con, const char * s)
     t = realloc(t, strlen(t) + 1);	/* XXX memory leak, hard to plug */
     return t;
 }
-/*@=boundswrite@*/
 
 static void poptStripArg(/*@special@*/ poptContext con, int which)
 	/*@uses con->arg_strip, con->optionStack @*/
@@ -727,7 +707,6 @@ int poptSaveInt(/*@null@*/ int * arg, unsigned int argInfo, long aLong)
 }
 /*@=bitwisesigned@*/
 
-/*@-boundswrite@*/
 /* returns 'val' element, -1 on last item, POPT_ERROR_* on error */
 int poptGetNextOpt(poptContext con)
 {
@@ -848,7 +827,6 @@ int poptGetNextOpt(poptContext con)
 	}
 
 	/* Process next short option */
-/*@-branchstate@*/		/* FIX: W2DO? */
 	if (con->os->nextCharArg) {
 	    origOptString = con->os->nextCharArg;
 
@@ -875,7 +853,6 @@ int poptGetNextOpt(poptContext con)
 	    if (*origOptString != '\0')
 		con->os->nextCharArg = origOptString;
 	}
-/*@=branchstate@*/
 
 	if (opt == NULL) return POPT_ERROR_BADOPT;	/* XXX can't happen */
 	if (opt->arg && (opt->argInfo & POPT_ARG_MASK) == POPT_ARG_NONE) {
@@ -1045,17 +1022,14 @@ int poptGetNextOpt(poptContext con)
 
     return (opt ? opt->val : -1);	/* XXX can't happen */
 }
-/*@=boundswrite@*/
 
 const char * poptGetOptArg(poptContext con)
 {
     const char * ret = NULL;
-/*@-branchstate@*/
     if (con) {
 	ret = con->os->nextArg;
 	con->os->nextArg = NULL;
     }
-/*@=branchstate@*/
     return ret;
 }
 
@@ -1075,7 +1049,6 @@ const char * poptPeekArg(poptContext con)
     return ret;
 }
 
-/*@-boundswrite@*/
 const char ** poptGetArgs(poptContext con)
 {
     if (con == NULL ||
@@ -1089,7 +1062,6 @@ const char ** poptGetArgs(poptContext con)
     return (con->leftovers + con->nextLeftover);
 /*@=nullret =nullstate @*/
 }
-/*@=boundswrite@*/
 
 poptContext poptFreeContext(poptContext con)
 {
@@ -1153,7 +1125,6 @@ int poptAddAlias(poptContext con, struct poptAlias alias,
     return poptAddItem(con, item, 0);
 }
 
-/*@-boundswrite@*/
 int poptAddItem(poptContext con, poptItem newItem, int flags)
 {
     poptItem * items, item;
@@ -1196,7 +1167,6 @@ int poptAddItem(poptContext con, poptItem newItem, int flags)
 
     return 0;
 }
-/*@=boundswrite@*/
 
 const char * poptBadOption(poptContext con, unsigned int flags)
 {
@@ -1264,7 +1234,6 @@ const char * poptGetInvocationName(poptContext con)
     return (con->os->argv ? con->os->argv[0] : "");
 }
 
-/*@-boundswrite@*/
 int poptStrippedArgv(poptContext con, int argc, char ** argv)
 {
     int numargs = argc;
@@ -1288,4 +1257,3 @@ int poptStrippedArgv(poptContext con, int argc, char ** argv)
     
     return numargs;
 }
-/*@=boundswrite@*/
diff --git a/poptconfig.c b/poptconfig.c
index 3f60d46..165f534 100644
--- a/poptconfig.c
+++ b/poptconfig.c
@@ -27,7 +27,6 @@ static void configLine(poptContext con, char * line)
 	return;
     nameLength = strlen(con->appName);
     
-/*@-boundswrite@*/
     memset(item, 0, sizeof(*item));
 
     if (strncmp(line, con->appName, nameLength)) return;
@@ -85,7 +84,6 @@ static void configLine(poptContext con, char * line)
 	item->argc = j;
     }
 /*@=modobserver@*/
-/*@=boundswrite@*/
 	
 /*@-nullstate@*/ /* FIX: item->argv[] may be NULL */
     if (!strcmp(entryType, "alias"))
@@ -128,7 +126,6 @@ int poptReadConfigFile(poptContext con, const char * fn)
 	return POPT_ERROR_ERRNO;
     }
 
-/*@-boundswrite@*/
     dst = buf = malloc(fileLength + 1);
 
     chptr = file;
@@ -160,7 +157,6 @@ int poptReadConfigFile(poptContext con, const char * fn)
 	}
     }
 /*@=infloops@*/
-/*@=boundswrite@*/
 
     free(file);
     free(buf);
diff --git a/popthelp.c b/popthelp.c
index ff367f8..b582fd3 100644
--- a/popthelp.c
+++ b/popthelp.c
@@ -21,9 +21,6 @@
 /*@access mbstate_t @*/
 #endif
 
-#ifdef HAVE_ALLOCA_H
-#include <alloca.h>
-#endif
 
 #include "poptint.h"
 
@@ -49,6 +46,7 @@ static void displayArgs(poptContext con,
 	poptPrintHelp(con, stdout, 0);
     else
 	poptPrintUsage(con, stdout, 0);
+
 /*@i@*/ con = poptFreeContext(con);		/* XXX keep valgrind happy */
     exit(0);
 }
@@ -206,7 +204,6 @@ singleOptionDefaultValue(size_t lineLength,
     char * l = le;
 
     if (le == NULL) return NULL;	/* XXX can't happen */
-/*@-boundswrite@*/
     *le = '\0';
     *le++ = '(';
     strcpy(le, defstr);	le += strlen(le);
@@ -256,7 +253,6 @@ singleOptionDefaultValue(size_t lineLength,
     }
     *le++ = ')';
     *le = '\0';
-/*@=boundswrite@*/
 
     return l;
 }
@@ -289,7 +285,6 @@ static void singleOptionHelp(FILE * fp, columns_t columns,
     if (opt->longName)	nb += strlen(opt->longName);
     if (argDescrip)	nb += strlen(argDescrip);
 
-/*@-boundswrite@*/
     left = malloc(nb);
     if (left == NULL) return;	/* XXX can't happen */
     left[0] = '\0';
@@ -315,7 +310,6 @@ static void singleOptionHelp(FILE * fp, columns_t columns,
 	    *le++ = '[';
 
 	/* Choose type of output */
-/*@-branchstate@*/
 	if (opt->argInfo & POPT_ARGFLAG_SHOW_DEFAULT) {
 	    defs = singleOptionDefaultValue(lineLength, opt, translation_domain);
 	    if (defs) {
@@ -334,7 +328,6 @@ static void singleOptionHelp(FILE * fp, columns_t columns,
 		defs = t;
 	    }
 	}
-/*@=branchstate@*/
 
 	if (opt->argDescrip == NULL) {
 	    switch (opt->argInfo & POPT_ARG_MASK) {
@@ -409,7 +402,6 @@ static void singleOptionHelp(FILE * fp, columns_t columns,
 	    *le++ = ']';
 	*le = '\0';
     }
-/*@=boundswrite@*/
 
     if (help)
 	POPT_fprintf(fp,"  %-*s   ", (int)(maxLeftCol+displaypad), left);
@@ -419,13 +411,11 @@ static void singleOptionHelp(FILE * fp, columns_t columns,
     }
 
     left = _free(left);
-/*@-branchstate@*/
     if (defs) {
 	help = defs;
     }
 
     helpLength = strlen(help);
-/*@-boundsread@*/
     while (helpLength > lineLength) {
 	const char * ch;
 	char format[16];
@@ -446,8 +436,6 @@ static void singleOptionHelp(FILE * fp, columns_t columns,
 	while (_isspaceptr(help) && *help) help++;
 	helpLength = strlen(help);
     }
-/*@=boundsread@*/
-/*@=branchstate@*/
 
     if (helpLength) POPT_fprintf(fp, "%s\n", help);
     help = NULL;
@@ -498,9 +486,7 @@ static size_t maxArgWidth(const struct poptOption * opt,
 		mbstate_t t;
 		size_t n;
 
-/*@-boundswrite@*/
 		memset ((void *)&t, 0, sizeof (t));	/* In initial state.  */
-/*@=boundswrite@*/
 		/* Determine number of characters.  */
 		n = mbsrtowcs (NULL, &scopy, strlen(scopy), &t);
 		len += sizeof("=")-1 + n;
@@ -607,11 +593,9 @@ static size_t showHelpIntro(poptContext con, FILE * fp)
 
     fprintf(fp, POPT_("Usage:"));
     if (!(con->flags & POPT_CONTEXT_KEEP_FIRST)) {
-/*@-boundsread@*/
 /*@-type@*/	/* LCL: wazzup? */
 	fn = con->optionStack->argv[0];
 /*@=type@*/
-/*@=boundsread@*/
 	if (fn == NULL) return len;
 	if (strchr(fn, '/')) fn = strrchr(fn, '/') + 1;
 	fprintf(fp, " %s", fn);
@@ -623,7 +607,7 @@ static size_t showHelpIntro(poptContext con, FILE * fp)
 
 void poptPrintHelp(poptContext con, FILE * fp, /*@unused@*/ int flags)
 {
-    columns_t columns = memset(alloca(sizeof(*columns)), 0, sizeof(*columns));
+    columns_t columns = calloc(1, sizeof(*columns));
 
     (void) showHelpIntro(con, fp);
     if (con->otherHelp)
@@ -631,9 +615,11 @@ void poptPrintHelp(poptContext con, FILE * fp, /*@unused@*/ int flags)
     else
 	fprintf(fp, " %s\n", POPT_("[OPTION...]"));
 
+assert(columns);
     columns->cur = maxArgWidth(con->options, NULL);
     columns->max = maxColumnWidth(fp);
     singleTableHelp(con, fp, con->options, columns, NULL);
+    free(columns);
 }
 
 /**
@@ -681,9 +667,7 @@ static size_t singleOptionUsage(FILE * fp, columns_t columns,
 	mbstate_t t;
 	size_t n;
 
-/*@-boundswrite@*/
 	memset ((void *)&t, 0, sizeof (t));	/* In initial state.  */
-/*@=boundswrite@*/
 	/* Determine number of characters.  */
 	n = mbsrtowcs (NULL, &scopy, strlen(scopy), &t);
 	len += sizeof("=")-1 + n;
@@ -731,7 +715,6 @@ static size_t itemUsage(FILE * fp, columns_t columns,
 {
     int i;
 
-/*@-branchstate@*/		/* FIX: W2DO? */
     if (item != NULL)
     for (i = 0; i < nitems; i++, item++) {
 	const struct poptOption * opt;
@@ -743,7 +726,6 @@ static size_t itemUsage(FILE * fp, columns_t columns,
 	    columns->cur = singleOptionUsage(fp, columns, opt, translation_domain);
 	}
     }
-/*@=branchstate@*/
 
     return columns->cur;
 }
@@ -774,7 +756,6 @@ static size_t singleTableUsage(poptContext con, FILE * fp, columns_t columns,
 	/*@globals fileSystem @*/
 	/*@modifies *fp, done, fileSystem @*/
 {
-/*@-branchstate@*/		/* FIX: W2DO? */
     if (opt != NULL)
     for (; (opt->longName || opt->shortName || opt->arg) ; opt++) {
         if ((opt->argInfo & POPT_ARG_MASK) == POPT_ARG_INTL_DOMAIN) {
@@ -783,9 +764,7 @@ static size_t singleTableUsage(poptContext con, FILE * fp, columns_t columns,
 	    if (done) {
 		int i = 0;
 		for (i = 0; i < done->nopts; i++) {
-/*@-boundsread@*/
 		    const void * that = done->opts[i];
-/*@=boundsread@*/
 		    if (that == NULL || that != opt->arg)
 			/*@innercontinue@*/ continue;
 		    /*@innerbreak@*/ break;
@@ -793,10 +772,8 @@ static size_t singleTableUsage(poptContext con, FILE * fp, columns_t columns,
 		/* Skip if this table has already been processed. */
 		if (opt->arg == NULL || i < done->nopts)
 		    continue;
-/*@-boundswrite@*/
 		if (done->nopts < done->maxopts)
 		    done->opts[done->nopts++] = (const void *) opt->arg;
-/*@=boundswrite@*/
 	    }
 	    columns->cur = singleTableUsage(con, fp, columns, opt->arg,
 			translation_domain, done);
@@ -805,7 +782,6 @@ static size_t singleTableUsage(poptContext con, FILE * fp, columns_t columns,
 	    columns->cur = singleOptionUsage(fp, columns, opt, translation_domain);
 	}
     }
-/*@=branchstate@*/
 
     return columns->cur;
 }
@@ -832,7 +808,6 @@ static size_t showShortOptions(const struct poptOption * opt, FILE * fp,
     if (s == NULL)
 	return 0;
 
-/*@-boundswrite@*/
     if (opt != NULL)
     for (; (opt->longName || opt->shortName || opt->arg); opt++) {
 	if (opt->shortName && !(opt->argInfo & POPT_ARG_MASK))
@@ -841,7 +816,6 @@ static size_t showShortOptions(const struct poptOption * opt, FILE * fp,
 	    if (opt->arg)	/* XXX program error */
 		len = showShortOptions(opt->arg, fp, s);
     } 
-/*@=boundswrite@*/
 
     /* On return to top level, print the short options, return print length. */
     if (s != str && *s != '\0') {
@@ -855,21 +829,20 @@ static size_t showShortOptions(const struct poptOption * opt, FILE * fp,
 
 void poptPrintUsage(poptContext con, FILE * fp, /*@unused@*/ int flags)
 {
-    columns_t columns = memset(alloca(sizeof(*columns)), 0, sizeof(*columns));
+    columns_t columns = calloc(1, sizeof(*columns));
     struct poptDone_s done_buf;
     poptDone done = &done_buf;
 
     memset(done, 0, sizeof(*done));
     done->nopts = 0;
     done->maxopts = 64;
+assert(columns);
     columns->cur = done->maxopts * sizeof(*done->opts);
     columns->max = maxColumnWidth(fp);
-/*@-boundswrite@*/
     done->opts = calloc(1, columns->cur);
     /*@-keeptrans@*/
     done->opts[done->nopts++] = (const void *) con->options;
     /*@=keeptrans@*/
-/*@=boundswrite@*/
 
     columns->cur = showHelpIntro(con, fp);
     columns->cur += showShortOptions(con->options, fp, NULL);
@@ -885,6 +858,7 @@ void poptPrintUsage(poptContext con, FILE * fp, /*@unused@*/ int flags)
 
     fprintf(fp, "\n");
     free(done->opts);
+    free(columns);
 }
 
 void poptSetOtherOptionHelp(poptContext con, const char * text)
diff --git a/poptparse.c b/poptparse.c
index e58bd8d..f577a02 100644
--- a/poptparse.c
+++ b/poptparse.c
@@ -10,7 +10,6 @@
 
 #define POPT_ARGV_ARRAY_GROW_DELTA 5
 
-/*@-boundswrite@*/
 int poptDupArgv(int argc, const char **argv,
 		int * argcPtr, const char *** argvPtr)
 {
@@ -33,12 +32,10 @@ int poptDupArgv(int argc, const char **argv,
     argv2 = (void *) dst;
     dst += (argc + 1) * sizeof(*argv);
 
-/*@-branchstate@*/
     for (i = 0; i < argc; i++) {
 	argv2[i] = dst;
 	dst += strlen(strcpy(dst, argv[i])) + 1;
     }
-/*@=branchstate@*/
     argv2[argc] = NULL;
 
     if (argvPtr) {
@@ -51,9 +48,7 @@ int poptDupArgv(int argc, const char **argv,
 	*argcPtr = argc;
     return 0;
 }
-/*@=boundswrite@*/
 
-/*@-bounds@*/
 int poptParseArgvString(const char * s, int * argcPtr, const char *** argvPtr)
 {
     const char * src;
@@ -125,7 +120,6 @@ exit:
     if (argv) free(argv);
     return rc;
 }
-/*@=bounds@*/
 
 /* still in the dev stage.
  * return values, perhaps 1== file erro
diff --git a/test1.c b/test1.c
index b1bf27a..deddc92 100644
--- a/test1.c
+++ b/test1.c
@@ -254,7 +254,6 @@ int main(int argc, const char ** argv)
     if (singleDash)
 	fprintf(stdout, " -");
 
-/*@-boundsread@*/
     rest = poptGetArgs(optCon);
     if (rest) {
 	fprintf(stdout, " rest:");
@@ -263,7 +262,6 @@ int main(int argc, const char ** argv)
 	    rest++;
 	}
     }
-/*@=boundsread@*/
 
     fprintf(stdout, "\n");
 
-- 
Gitee


From 047997f41f7996a0ddf8ca8daa465f0b653a296f Mon Sep 17 00:00:00 2001
From: Jeff Johnson <n3npq@mac.com>
Date: Sun, 4 Nov 2007 13:18:27 +0000
Subject: [PATCH 473/667] - jbj: don't use assert to avoid null clloc(3) return
 check.

---
 popthelp.c | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/popthelp.c b/popthelp.c
index b582fd3..c9987f5 100644
--- a/popthelp.c
+++ b/popthelp.c
@@ -615,11 +615,12 @@ void poptPrintHelp(poptContext con, FILE * fp, /*@unused@*/ int flags)
     else
 	fprintf(fp, " %s\n", POPT_("[OPTION...]"));
 
-assert(columns);
-    columns->cur = maxArgWidth(con->options, NULL);
-    columns->max = maxColumnWidth(fp);
-    singleTableHelp(con, fp, con->options, columns, NULL);
-    free(columns);
+    if (columns) {
+	columns->cur = maxArgWidth(con->options, NULL);
+	columns->max = maxColumnWidth(fp);
+	singleTableHelp(con, fp, con->options, columns, NULL);
+	free(columns);
+    }
 }
 
 /**
@@ -836,7 +837,7 @@ void poptPrintUsage(poptContext con, FILE * fp, /*@unused@*/ int flags)
     memset(done, 0, sizeof(*done));
     done->nopts = 0;
     done->maxopts = 64;
-assert(columns);
+  if (columns) {
     columns->cur = done->maxopts * sizeof(*done->opts);
     columns->max = maxColumnWidth(fp);
     done->opts = calloc(1, columns->cur);
@@ -859,6 +860,7 @@ assert(columns);
     fprintf(fp, "\n");
     free(done->opts);
     free(columns);
+  }
 }
 
 void poptSetOtherOptionHelp(poptContext con, const char * text)
-- 
Gitee


From 35d346509ea0de7536dd3cd61684b1f5da72d0c5 Mon Sep 17 00:00:00 2001
From: "Ralf S. Engelschall" <rse@engelschall.com>
Date: Sun, 4 Nov 2007 13:48:45 +0000
Subject: [PATCH 474/667] no longer required to check for alloca(3)

---
 configure.ac | 1 -
 1 file changed, 1 deletion(-)

diff --git a/configure.ac b/configure.ac
index f3c1847..9e158bb 100755
--- a/configure.ac
+++ b/configure.ac
@@ -69,7 +69,6 @@ fi
 AC_SUBST(MARK64)
 
 AC_CHECK_HEADERS(float.h libintl.h mcheck.h unistd.h langinfo.h)
-AC_FUNC_ALLOCA
 
 # For some systems we know that we have ld_version scripts.
 # Use it then as default.
-- 
Gitee


From 1c6a8343d338c5770570210bef872ecc6e932c56 Mon Sep 17 00:00:00 2001
From: Jeff Johnson <n3npq@mac.com>
Date: Sun, 4 Nov 2007 13:51:28 +0000
Subject: [PATCH 475/667] - jbj: change sizeof to use the type implicitly,
 rather than explicitly. - jbj: remove incorrect casts, changing to size_t
 where needed. - jbj: remove unused STD_VFPRINTF macro.

---
 .splintrc |   1 -
 CHANGES   |   4 ++
 poptint.c | 189 +++++++++++++++++++++++++-----------------------------
 3 files changed, 93 insertions(+), 101 deletions(-)

diff --git a/.splintrc b/.splintrc
index 8be1e2a..26806ab 100644
--- a/.splintrc
+++ b/.splintrc
@@ -45,7 +45,6 @@
 +charint
 -exportvar
 +matchanyintegral
--loopswitchbreak
 -varuse
 
 # --- +partial artifacts
diff --git a/CHANGES b/CHANGES
index 3d77fc6..c93d02d 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,4 +1,8 @@
 1.12 -> 1.13:
+    - jbj: change sizeof to use the type implicitly, rather than explicitly.
+    - jbj: remove incorrect casts, changing to size_t where needed.
+    - jbj: remove unused STD_VFPRINTF macro.
+    - jbj: reindent (and otherwise diddle) recent patch for popt coding style.
     - jbj: remove splint bounds/branch annotations, little gain, much pain.
     - jbj: revert alloca usage again again.
     - jbj: handle Solaris signed character isspace(3) issues consistently.
diff --git a/poptint.c b/poptint.c
index bafd465..cf79bb4 100644
--- a/poptint.c
+++ b/poptint.c
@@ -15,142 +15,131 @@
 #include "system.h"
 #include "poptint.h"
 
-#define STD_VFPRINTF(stream, format, args, retval) \
-  va_start ((args), (format)); \
-  (retval) = vfprintf ((stream), (format), (args)); \
-  va_end ((args));
-
 #ifdef HAVE_ICONV
 static char *
 strdup_locale_from_utf8 (char *buffer)
 {
-  char *codeset = NULL;
-  char *pout = NULL, *dest_str;
-  iconv_t fd;
-  int ib, ob, dest_size;
-  int done, is_error;
-  size_t err, used;
+    char *codeset = NULL;
+    char *pout = NULL, *dest_str;
+    iconv_t fd;
+    size_t ib, ob, dest_size;
+    int done, is_error;
+    size_t err, used;
 
-  if (!buffer)
-    return NULL;
+    if (!buffer)
+	return NULL;
 
 #ifdef HAVE_LANGINFO_H
-  codeset = nl_langinfo (CODESET);
+    codeset = nl_langinfo (CODESET);
 #endif
 
-  if (codeset &&
-      strcmp (codeset, "UTF-8") &&
-      (fd = iconv_open (codeset, "UTF-8")) != (iconv_t)-1) {
-    char *pin = buffer;
-    char *shift_pin = NULL;
-
-    iconv (fd, NULL, (size_t*)&ib, &pout, (size_t*)&ob);
-    ib = strlen (buffer);
-    dest_size = ob = ib;
-    dest_str = pout = malloc ((dest_size + 1) * sizeof (char));
-    done = is_error = 0;
-    while (!done && !is_error) {
-      err = iconv (fd, (const char**)&pin, (size_t*)&ib, &pout, (size_t*)&ob);
-
-      if (err == (size_t)-1) {
-        switch (errno) {
-        case EINVAL:
-          done = 1;
-          break;
-        case E2BIG:
-          used = pout - dest_str;
-          dest_size *= 2;
-          dest_str = realloc (dest_str, (dest_size + 1) * sizeof (char));
-          pout = dest_str + used;
-          ob = dest_size - used;
-          break;
-        case EILSEQ:
-          is_error = 1;
-          break;
-        default:
-          is_error = 1;
-          break;
-        }
-      } else {
-        if (!shift_pin) {
-          shift_pin = pin;
-          pin = NULL;
-          ib = 0;
-        } else {
-          done = 1;
-        }
-      }
+    if (codeset && strcmp(codeset, "UTF-8")
+     && (fd = iconv_open(codeset, "UTF-8")) != (iconv_t)-1)
+    {
+	char *pin = buffer;
+	char *shift_pin = NULL;
+
+	err = iconv(fd, NULL, &ib, &pout, &ob);
+	dest_size = ob = ib = strlen(buffer);
+	dest_str = pout = malloc((dest_size + 1) * sizeof(*dest_str));
+	done = is_error = 0;
+	while (!done && !is_error) {
+	    err = iconv(fd, &pin, &ib, &pout, &ob);
+
+	    if (err == (size_t)-1) {
+		switch (errno) {
+		case EINVAL:
+		    done = 1;
+		    /*@switchbreak@*/ break;
+		case E2BIG:
+		    used = pout - dest_str;
+		    dest_size *= 2;
+		    dest_str = realloc(dest_str, (dest_size + 1) * sizeof(*dest_str));
+		    pout = dest_str + used;
+		    ob = dest_size - used;
+		    /*@switchbreak@*/ break;
+		case EILSEQ:
+		    is_error = 1;
+		    /*@switchbreak@*/ break;
+		default:
+		    is_error = 1;
+		    /*@switchbreak@*/ break;
+		}
+	    } else {
+		if (!shift_pin) {
+		    shift_pin = pin;
+		    pin = NULL;
+		    ib = 0;
+		} else {
+		    done = 1;
+		}
+	    }
+	}
+	iconv_close(fd);
+	*pout = '\0';
+	dest_str = strdup(dest_str);
+    } else {
+	dest_str = strdup(buffer);
     }
-    iconv_close (fd);
-    *pout = '\0';
-    dest_str = strdup (dest_str);
-  } else {
-    dest_str = strdup (buffer);
-  }
-
-  return dest_str;
+
+    return dest_str;
 }
 #endif
 
 static char *
 strdup_vprintf (const char *format, va_list ap)
 {
-  char *buffer = NULL;
-  char c;
-  va_list apc;
+    char *buffer = NULL;
+    char c;
+    va_list apc;
 
-  va_copy(apc, ap);	/* XXX linux amd64/ppc needs a copy. */
+    va_copy(apc, ap);	/* XXX linux amd64/ppc needs a copy. */
 
-  buffer = calloc (sizeof (char), vsnprintf (&c, 1, format, ap) + 1);
-  vsprintf (buffer, format, apc);
+    buffer = calloc(sizeof(*buffer), vsnprintf (&c, 1, format, ap) + 1);
+    vsprintf(buffer, format, apc);
 
-  va_end(apc);
+    va_end(apc);
 
-  return buffer;
+    return buffer;
 }
 
 char *
 POPT_prev_char (const char *str)
 {
-  char *p = (char*)str;
+    char *p = (char*)str;
 
-  while (1) {
-    p--;
-    if ((*p & 0xc0) != 0x80)
-      return (char *)p;
-  }
+    while (1) {
+	p--;
+	if ((*p & 0xc0) != 0x80)
+	    return (char *)p;
+    }
 }
 
 int
 POPT_fprintf (FILE* stream, const char *format, ...)
 {
-  int retval = 0;
-  va_list args;
-  char *buffer = NULL;
+    int retval = 0;
+    va_list args;
+    char *buffer = NULL;
 #ifdef HAVE_ICONV
-  char *locale_str = NULL;
+    char *locale_str = NULL;
 #endif
 
-  va_start (args, format);
-  buffer = strdup_vprintf (format, args);
-  va_end (args);
+    va_start (args, format);
+    buffer = strdup_vprintf(format, args);
+    va_end (args);
 
 #ifdef HAVE_ICONV
-  locale_str = strdup_locale_from_utf8 (buffer);
-  if (locale_str) {
-    retval = fprintf (stream, "%s", locale_str);
-    free (locale_str);
-  } else {
-#endif
-    retval = fprintf (stream, "%s", buffer);
-#ifdef HAVE_ICONV
-  }
+    locale_str = strdup_locale_from_utf8(buffer);
+    if (locale_str) {
+	retval = fprintf(stream, "%s", locale_str);
+	free(locale_str);
+    } else
 #endif
-  free (buffer);
-
-  return retval;
+    {
+	retval = fprintf(stream, "%s", buffer);
+    }
+    free (buffer);
 
+    return retval;
 }
-
-#undef STD_VFPRINTF
-
-- 
Gitee


From 57ca7ed0d6e33ff8da4816769863c70c23c108b6 Mon Sep 17 00:00:00 2001
From: Jeff Johnson <n3npq@mac.com>
Date: Sun, 4 Nov 2007 15:57:20 +0000
Subject: [PATCH 476/667] - jbj: rescuscitate the splint annotations.

---
 .splintrc    | 56 +++++++++-----------------------------
 CHANGES      |  1 +
 popt.c       |  2 ++
 popt.h       |  4 +--
 poptconfig.c | 24 +++++++++++-----
 popthelp.c   | 43 +++++++++++++++++------------
 poptint.c    | 77 ++++++++++++++++++++++++++++++----------------------
 poptint.h    | 38 ++++++++++++++++++++++++--
 system.h     | 27 ++++++++++++++++--
 9 files changed, 166 insertions(+), 106 deletions(-)

diff --git a/.splintrc b/.splintrc
index 26806ab..c2e01cb 100644
--- a/.splintrc
+++ b/.splintrc
@@ -17,58 +17,28 @@
 
 -bitwisesigned
 -branchstate
--compdef
--globuse
--internalglobs
--modnomods
--modobserveruncon
--mods
--moduncon
--modunconnomods
--mustmod
--noeffectuncon
--nullderef
--nullpass
--nullptrarith
--nullret
--nullstate
--protoparammatch
--retalias
--retvalint
--retvalother
--sizeoftype
--type
--unrecog
-
--temptrans
-
-+charint
--exportvar
-+matchanyintegral
--varuse
 
 # --- +partial artifacts
 
 # --- not-yet at strict level
 -elseifcomplete		# 18
--exportfcn		# 25
--ifblock		# 202
--namechecks		# 206
--ptrarith		# 43
+-exportfcn		# 29
+-ifblock		# 251
+-namechecks		# 111
+-ptrarith		# 47
 
--mustdefine		# 10
--shiftimplementation	# 120
+-mustdefine		# 12
 -sys-dir-errors
 
--strictops		# 16
--whileblock		# 10
+-strictops		# 24
+-whileblock		# 15
 
 # --- not-yet at checks level
--mustfree		# 52
--predboolptr		# 62
--usedef			# 1
+-mustfree		# 38
+-predboolptr		# 82
+-usedef			# 7
 
 # --- not-yet at standard level
--boolops		# 112
--predboolint		# 38
-+ignorequals		# 17
+-boolops		# 127
+-predboolint		# 42
++ignorequals		# 30
diff --git a/CHANGES b/CHANGES
index c93d02d..8b37195 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,4 +1,5 @@
 1.12 -> 1.13:
+    - jbj: rescuscitate the splint annotations.
     - jbj: change sizeof to use the type implicitly, rather than explicitly.
     - jbj: remove incorrect casts, changing to size_t where needed.
     - jbj: remove unused STD_VFPRINTF macro.
diff --git a/popt.c b/popt.c
index 6895412..c5ae711 100644
--- a/popt.c
+++ b/popt.c
@@ -446,7 +446,9 @@ if (_popt_debug)
     }
 #endif
 
+/*@-nullstate@*/
     rc = execvp(argv[0], (char *const *)argv);
+/*@=nullstate@*/
 
 exit:
     if (argv) {
diff --git a/popt.h b/popt.h
index 9d1a02b..bbea7d3 100644
--- a/popt.h
+++ b/popt.h
@@ -486,7 +486,7 @@ void poptSetExecPath(poptContext con, const char * path, int allowAbsolute)
  */
 void poptPrintHelp(poptContext con, FILE * fp, /*@unused@*/ int flags)
 	/*@globals fileSystem @*/
-	/*@modifies *fp, fileSystem @*/;
+	/*@modifies fp, fileSystem @*/;
 
 /** \ingroup popt
  * Print terse description of options.
@@ -496,7 +496,7 @@ void poptPrintHelp(poptContext con, FILE * fp, /*@unused@*/ int flags)
  */
 void poptPrintUsage(poptContext con, FILE * fp, /*@unused@*/ int flags)
 	/*@globals fileSystem @*/
-	/*@modifies *fp, fileSystem @*/;
+	/*@modifies fp, fileSystem @*/;
 
 /** \ingroup popt
  * Provide text to replace default "[OPTION...]" in help/usage output.
diff --git a/poptconfig.c b/poptconfig.c
index 165f534..d917067 100644
--- a/poptconfig.c
+++ b/poptconfig.c
@@ -115,10 +115,12 @@ int poptReadConfigFile(poptContext con, const char * fn)
     }
 
     file = malloc(fileLength + 1);
-    if (read(fd, (char *)file, fileLength) != fileLength) {
+    if (file == NULL || read(fd, (char *)file, fileLength) != fileLength) {
 	rc = errno;
 	(void) close(fd);
 	errno = rc;
+	if (file)
+	    free(file);
 	return POPT_ERROR_ERRNO;
     }
     if (close(fd) == -1) {
@@ -127,6 +129,8 @@ int poptReadConfigFile(poptContext con, const char * fn)
     }
 
     dst = buf = malloc(fileLength + 1);
+    if (dst == NULL)
+	return POPT_ERROR_ERRNO;
 
     chptr = file;
     end = (file + fileLength);
@@ -182,9 +186,9 @@ int poptReadDefaultConfig(poptContext con, /*@unused@*/ int useEnv)
     rc = poptReadConfigFile(con, _popt_etc);
     if (rc) return rc;
 
-    stat("/etc/popt.d", &s);
-    if(S_ISDIR(s.st_mode)) {
+    if (!stat("/etc/popt.d", &s) && S_ISDIR(s.st_mode)) {
         glob_t g;
+/*@-moduncon -nullpass -type @*/ /* FIX: annotations for glob/globfree */
 	if (!glob("/etc/popt.d/*", 0, NULL, &g)) {
             int i;
 	    for (i=0; i<g.gl_pathc; i++) {
@@ -198,16 +202,22 @@ int poptReadDefaultConfig(poptContext con, /*@unused@*/ int useEnv)
 		rc = poptReadConfigFile(con, f);
 		if (rc) return rc;
 	    }
+/*@-noeffectuncon@*/
 	    globfree(&g);
+/*@=noeffectuncon@*/
 	}
+/*@=moduncon =nullpass =type @*/
     }
 
     if ((home = getenv("HOME"))) {
 	fn = malloc(strlen(home) + 20);
-	strcpy(fn, home);
-	strcat(fn, "/.popt");
-	rc = poptReadConfigFile(con, fn);
-	free(fn);
+	if (fn != NULL) {
+	    strcpy(fn, home);
+	    strcat(fn, "/.popt");
+	    rc = poptReadConfigFile(con, fn);
+	    free(fn);
+	} else
+	    rc = POPT_ERROR_ERRNO;
 	if (rc) return rc;
     }
 
diff --git a/popthelp.c b/popthelp.c
index c9987f5..3d1312f 100644
--- a/popthelp.c
+++ b/popthelp.c
@@ -115,8 +115,9 @@ static size_t maxColumnWidth(FILE *fp)
     struct winsize ws;
     int fdno = fileno(fp ? fp : stdout);
 
+    memset(&ws, 0, sizeof(ws));
     if (fdno >= 0 && !ioctl(fdno, TIOCGWINSZ, &ws)
-     && ws.ws_col > maxcols && ws.ws_col < 256)
+     && (size_t)ws.ws_col > maxcols && ws.ws_col < 256)
 	maxcols = ws.ws_col - 1;
 #endif
     return maxcols;
@@ -268,7 +269,7 @@ static void singleOptionHelp(FILE * fp, columns_t columns,
 		const struct poptOption * opt,
 		/*@null@*/ const char * translation_domain)
 	/*@globals fileSystem @*/
-	/*@modifies *fp, fileSystem @*/
+	/*@modifies fp, fileSystem @*/
 {
     size_t maxLeftCol = columns->cur;
     size_t indentLength = maxLeftCol + 5;
@@ -280,6 +281,7 @@ static void singleOptionHelp(FILE * fp, columns_t columns,
     char * left;
     size_t nb = maxLeftCol + 1;
     int displaypad = 0;
+    int xx;
 
     /* Make sure there's more than enough room in target buffer. */
     if (opt->longName)	nb += strlen(opt->longName);
@@ -404,9 +406,9 @@ static void singleOptionHelp(FILE * fp, columns_t columns,
     }
 
     if (help)
-	POPT_fprintf(fp,"  %-*s   ", (int)(maxLeftCol+displaypad), left);
+	xx = POPT_fprintf(fp,"  %-*s   ", (int)(maxLeftCol+displaypad), left);
     else {
-	POPT_fprintf(fp,"  %s\n", left); 
+	xx = POPT_fprintf(fp,"  %s\n", left); 
 	goto out;
     }
 
@@ -430,14 +432,14 @@ static void singleOptionHelp(FILE * fp, columns_t columns,
 
 	sprintf(format, "%%.%ds\n%%%ds", (int) (ch - help), (int) indentLength);
 	/*@-formatconst@*/
-	POPT_fprintf(fp, format, help, " ");
+	xx = POPT_fprintf(fp, format, help, " ");
 	/*@=formatconst@*/
 	help = ch;
 	while (_isspaceptr(help) && *help) help++;
 	helpLength = strlen(help);
     }
 
-    if (helpLength) POPT_fprintf(fp, "%s\n", help);
+    if (helpLength) xx = POPT_fprintf(fp, "%s\n", help);
     help = NULL;
 
 out:
@@ -519,7 +521,7 @@ static void itemHelp(FILE * fp,
 		columns_t columns,
 		/*@null@*/ const char * translation_domain)
 	/*@globals fileSystem @*/
-	/*@modifies *fp, fileSystem @*/
+	/*@modifies fp, fileSystem @*/
 {
     poptItem item;
     int i;
@@ -547,10 +549,11 @@ static void singleTableHelp(poptContext con, FILE * fp,
 		columns_t columns,
 		/*@null@*/ const char * translation_domain)
 	/*@globals fileSystem @*/
-	/*@modifies *fp, fileSystem @*/
+	/*@modifies fp, columns->cur, fileSystem @*/
 {
     const struct poptOption * opt;
     const char *sub_transdom;
+    int xx;
 
     if (table == poptAliasOptions) {
 	itemHelp(fp, con->aliases, con->numAliases, columns, NULL);
@@ -574,7 +577,7 @@ static void singleTableHelp(poptContext con, FILE * fp,
 	    sub_transdom = translation_domain;
 	    
 	if (opt->descrip)
-	    POPT_fprintf(fp, "\n%s\n", D_(sub_transdom, opt->descrip));
+	    xx = POPT_fprintf(fp, "\n%s\n", D_(sub_transdom, opt->descrip));
 
 	singleTableHelp(con, fp, opt->arg, columns, sub_transdom);
     }
@@ -634,7 +637,7 @@ static size_t singleOptionUsage(FILE * fp, columns_t columns,
 		const struct poptOption * opt,
 		/*@null@*/ const char *translation_domain)
 	/*@globals fileSystem @*/
-	/*@modifies *fp, fileSystem @*/
+	/*@modifies fp, columns->cur, fileSystem @*/
 {
     size_t len = (size_t)4;
     char shortStr[2] = { '\0', '\0' };
@@ -712,7 +715,7 @@ static size_t itemUsage(FILE * fp, columns_t columns,
 		/*@null@*/ poptItem item, int nitems,
 		/*@null@*/ const char * translation_domain)
 	/*@globals fileSystem @*/
-	/*@modifies *fp, fileSystem @*/
+	/*@modifies fp, columns->cur, fileSystem @*/
 {
     int i;
 
@@ -737,6 +740,7 @@ static size_t itemUsage(FILE * fp, columns_t columns,
 typedef struct poptDone_s {
     int nopts;
     int maxopts;
+/*@null@*/
     const void ** opts;
 } * poptDone;
 
@@ -755,7 +759,7 @@ static size_t singleTableUsage(poptContext con, FILE * fp, columns_t columns,
 		/*@null@*/ const char * translation_domain,
 		/*@null@*/ poptDone done)
 	/*@globals fileSystem @*/
-	/*@modifies *fp, done, fileSystem @*/
+	/*@modifies fp, columns->cur, done, fileSystem @*/
 {
     if (opt != NULL)
     for (; (opt->longName || opt->shortName || opt->arg) ; opt++) {
@@ -763,7 +767,8 @@ static size_t singleTableUsage(poptContext con, FILE * fp, columns_t columns,
 	    translation_domain = (const char *)opt->arg;
 	} else if ((opt->argInfo & POPT_ARG_MASK) == POPT_ARG_INCLUDE_TABLE) {
 	    if (done) {
-		int i = 0;
+		int i;
+		if (done->opts != NULL)
 		for (i = 0; i < done->nopts; i++) {
 		    const void * that = done->opts[i];
 		    if (that == NULL || that != opt->arg)
@@ -773,7 +778,7 @@ static size_t singleTableUsage(poptContext con, FILE * fp, columns_t columns,
 		/* Skip if this table has already been processed. */
 		if (opt->arg == NULL || i < done->nopts)
 		    continue;
-		if (done->nopts < done->maxopts)
+		if (done->opts != NULL && done->nopts < done->maxopts)
 		    done->opts[done->nopts++] = (const void *) opt->arg;
 	    }
 	    columns->cur = singleTableUsage(con, fp, columns, opt->arg,
@@ -798,7 +803,7 @@ static size_t singleTableUsage(poptContext con, FILE * fp, columns_t columns,
 static size_t showShortOptions(const struct poptOption * opt, FILE * fp,
 		/*@null@*/ char * str)
 	/*@globals fileSystem @*/
-	/*@modifies *str, *fp, fileSystem @*/
+	/*@modifies str, *fp, fileSystem @*/
 	/*@requires maxRead(str) >= 0 @*/
 {
     /* bufsize larger then the ascii set, lazy allocation on top level call. */
@@ -823,8 +828,10 @@ static size_t showShortOptions(const struct poptOption * opt, FILE * fp,
 	fprintf(fp, " [-%s]", s);
 	len = strlen(s) + sizeof(" [-]")-1;
     }
+/*@-temptrans@*/	/* LCL: local s, not str arg, is being freed. */
     if (s != str)
 	free(s);
+/*@=temptrans@*/
     return len;
 }
 
@@ -842,7 +849,8 @@ void poptPrintUsage(poptContext con, FILE * fp, /*@unused@*/ int flags)
     columns->max = maxColumnWidth(fp);
     done->opts = calloc(1, columns->cur);
     /*@-keeptrans@*/
-    done->opts[done->nopts++] = (const void *) con->options;
+    if (done->opts != NULL)
+	done->opts[done->nopts++] = (const void *) con->options;
     /*@=keeptrans@*/
 
     columns->cur = showHelpIntro(con, fp);
@@ -858,7 +866,8 @@ void poptPrintUsage(poptContext con, FILE * fp, /*@unused@*/ int flags)
     }
 
     fprintf(fp, "\n");
-    free(done->opts);
+    if (done->opts != NULL)
+	free(done->opts);
     free(columns);
   }
 }
diff --git a/poptint.c b/poptint.c
index cf79bb4..e99d28b 100644
--- a/poptint.c
+++ b/poptint.c
@@ -1,48 +1,44 @@
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
-#include <stdio.h>
-#include <stdarg.h>
-#include <errno.h>
-#ifdef HAVE_ICONV
-#include <iconv.h>
-#endif
-#ifdef HAVE_LANGINFO_H
-#include <langinfo.h>
-#endif
-
 #include "system.h"
+#include <stdarg.h>
 #include "poptint.h"
 
 #ifdef HAVE_ICONV
-static char *
-strdup_locale_from_utf8 (char *buffer)
+static /*@only@*/ /*@null@*/ char *
+strdup_locale_from_utf8 (/*@null@*/ char *buffer)
+	/*@*/
 {
     char *codeset = NULL;
-    char *pout = NULL, *dest_str;
+    char *dest_str;
     iconv_t fd;
-    size_t ib, ob, dest_size;
-    int done, is_error;
-    size_t err, used;
 
-    if (!buffer)
+    if (buffer == NULL)
 	return NULL;
 
 #ifdef HAVE_LANGINFO_H
+/*@-type@*/
     codeset = nl_langinfo (CODESET);
+/*@=type@*/
 #endif
 
     if (codeset && strcmp(codeset, "UTF-8")
      && (fd = iconv_open(codeset, "UTF-8")) != (iconv_t)-1)
     {
 	char *pin = buffer;
+	char *pout = NULL;
+	size_t ib, ob, dest_size;
+	int done;
+	int is_error;
+	size_t err;
 	char *shift_pin = NULL;
+	int xx;
 
 	err = iconv(fd, NULL, &ib, &pout, &ob);
 	dest_size = ob = ib = strlen(buffer);
 	dest_str = pout = malloc((dest_size + 1) * sizeof(*dest_str));
+	if (dest_str)
+	    *dest_str = '\0';
 	done = is_error = 0;
+	if (pout != NULL)
 	while (!done && !is_error) {
 	    err = iconv(fd, &pin, &ib, &pout, &ob);
 
@@ -52,12 +48,16 @@ strdup_locale_from_utf8 (char *buffer)
 		    done = 1;
 		    /*@switchbreak@*/ break;
 		case E2BIG:
-		    used = pout - dest_str;
+		{   size_t used = pout - dest_str;
 		    dest_size *= 2;
 		    dest_str = realloc(dest_str, (dest_size + 1) * sizeof(*dest_str));
+		    if (dest_str == NULL) {
+			is_error = 1;
+			continue;
+		    }
 		    pout = dest_str + used;
 		    ob = dest_size - used;
-		    /*@switchbreak@*/ break;
+		}   /*@switchbreak@*/ break;
 		case EILSEQ:
 		    is_error = 1;
 		    /*@switchbreak@*/ break;
@@ -66,7 +66,7 @@ strdup_locale_from_utf8 (char *buffer)
 		    /*@switchbreak@*/ break;
 		}
 	    } else {
-		if (!shift_pin) {
+		if (shift_pin == NULL) {
 		    shift_pin = pin;
 		    pin = NULL;
 		    ib = 0;
@@ -75,42 +75,51 @@ strdup_locale_from_utf8 (char *buffer)
 		}
 	    }
 	}
-	iconv_close(fd);
-	*pout = '\0';
-	dest_str = strdup(dest_str);
+	xx = iconv_close(fd);
+	if (pout)
+	    *pout = '\0';
+	if (dest_str != NULL)
+	    dest_str = xstrdup(dest_str);
     } else {
-	dest_str = strdup(buffer);
+	dest_str = xstrdup(buffer);
     }
 
     return dest_str;
 }
 #endif
 
-static char *
+/*@-mustmod@*/	/* LCL: can't see the ap modification. */
+static /*@only@*/ /*@null@*/ char *
 strdup_vprintf (const char *format, va_list ap)
+	/*@modifies ap @*/
 {
-    char *buffer = NULL;
+    char *buffer;
     char c;
     va_list apc;
+    int xx;
 
+/*@-noeffectuncon -unrecog @*/
     va_copy(apc, ap);	/* XXX linux amd64/ppc needs a copy. */
+/*@=noeffectuncon =unrecog @*/
 
     buffer = calloc(sizeof(*buffer), vsnprintf (&c, 1, format, ap) + 1);
-    vsprintf(buffer, format, apc);
+    if (buffer != NULL)
+	xx = vsprintf(buffer, format, apc);
 
     va_end(apc);
 
     return buffer;
 }
+/*@=mustmod@*/
 
 char *
 POPT_prev_char (const char *str)
 {
-    char *p = (char*)str;
+    char *p = (char *)str;
 
     while (1) {
 	p--;
-	if ((*p & 0xc0) != 0x80)
+	if ((*p & 0xc0) != (char)0x80)
 	    return (char *)p;
     }
 }
@@ -128,6 +137,8 @@ POPT_fprintf (FILE* stream, const char *format, ...)
     va_start (args, format);
     buffer = strdup_vprintf(format, args);
     va_end (args);
+    if (buffer == NULL)
+	return retval;
 
 #ifdef HAVE_ICONV
     locale_str = strdup_locale_from_utf8(buffer);
diff --git a/poptint.h b/poptint.h
index f525a2a..7a7f1bb 100644
--- a/poptint.h
+++ b/poptint.h
@@ -114,7 +114,41 @@ struct poptContext_s {
 
 #define N_(foo) foo
 
-int   POPT_fprintf (FILE* steam, const char *format, ...);
-char *POPT_prev_char (const char *str);
+#ifdef HAVE_ICONV
+#include <iconv.h>
+#if defined(__LCLINT__)
+/*@-declundef -incondefs @*/
+extern /*@only@*/ iconv_t iconv_open(const char *__tocode, const char *__fromcode)
+	/*@*/;
+
+extern size_t iconv(iconv_t __cd, /*@null@*/ char ** __inbuf,
+		    /*@out@*/ size_t * __inbytesleft,
+		    /*@out@*/ char ** __outbuf,
+		    /*@out@*/ size_t * __outbytesleft)
+	/*@modifies __cd,
+		*__inbuf, *__inbytesleft, *__outbuf, *__outbytesleft @*/;
+
+extern int iconv_close(/*@only@*/ iconv_t __cd)
+	/*@modifies __cd @*/;
+/*@=declundef =incondefs @*/
+#endif
+#endif
+
+#ifdef HAVE_LANGINFO_H
+#include <langinfo.h>
+#if defined(__LCLINT__)
+/*@-declundef -incondefs @*/
+extern char *nl_langinfo (nl_item __item)
+	/*@*/;
+/*@=declundef =incondefs @*/
+#endif
+#endif
+
+int   POPT_fprintf (FILE* stream, const char *format, ...)
+	/*@globals fileSystem @*/
+	/*@modifies stream, fileSystem @*/;
+
+char *POPT_prev_char (/*@returned@*/ const char *str)
+	/*@*/;
 
 #endif
diff --git a/system.h b/system.h
index f893825..68a5c2a 100644
--- a/system.h
+++ b/system.h
@@ -42,16 +42,39 @@ extern __const __int32_t *__ctype_toupper;
 #include <libc.h>
 #endif
 
-/*@-redecl -redef@*/
+/*@-incondefs@*/
+/*@mayexit@*/ /*@only@*/ /*@out@*/ /*@unused@*/
+void * xmalloc (size_t size)
+	/*@globals errno @*/
+	/*@ensures maxSet(result) == (size - 1) @*/
+	/*@modifies errno @*/;
+
+/*@mayexit@*/ /*@only@*/ /*@unused@*/
+void * xcalloc (size_t nmemb, size_t size)
+	/*@ensures maxSet(result) == (nmemb - 1) @*/
+	/*@*/;
+
+/*@mayexit@*/ /*@only@*/ /*@unused@*/
+void * xrealloc (/*@null@*/ /*@only@*/ void * ptr, size_t size)
+	/*@ensures maxSet(result) == (size - 1) @*/
+	/*@modifies *ptr @*/;
+
 /*@mayexit@*/ /*@only@*/ /*@unused@*/
 char * xstrdup (const char *str)
 	/*@*/;
-/*@=redecl =redef@*/
+/*@=incondefs@*/
 
+/* Memory allocation via macro defs to get meaningful locations from mtrace() */
 #if defined(HAVE_MCHECK_H) && defined(__GNUC__)
 #define	vmefail()	(fprintf(stderr, "virtual memory exhausted.\n"), exit(EXIT_FAILURE), NULL)
+#define	xmalloc(_size) 		(malloc(_size) ? : vmefail())
+#define	xcalloc(_nmemb, _size)	(calloc((_nmemb), (_size)) ? : vmefail())
+#define	xrealloc(_ptr, _size)	(realloc((_ptr), (_size)) ? : vmefail())
 #define xstrdup(_str)   (strcpy((malloc(strlen(_str)+1) ? : vmefail()), (_str)))
 #else
+#define	xmalloc(_size) 		malloc(_size)
+#define	xcalloc(_nmemb, _size)	calloc((_nmemb), (_size))
+#define	xrealloc(_ptr, _size)	realloc((_ptr), (_size))
 #define	xstrdup(_str)	strdup(_str)
 #endif  /* defined(HAVE_MCHECK_H) && defined(__GNUC__) */
 
-- 
Gitee


From 17e75a2aa01ee2971e7ba8b46b153da1bba57c6c Mon Sep 17 00:00:00 2001
From: Robert Scheck <robert@fedoraproject.org>
Date: Fri, 9 Nov 2007 23:34:13 +0000
Subject: [PATCH 477/667] Replace my e-mail address with the rpm5.org one

---
 po/de.po | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/po/de.po b/po/de.po
index f4fad58..c8b43a5 100644
--- a/po/de.po
+++ b/po/de.po
@@ -1,14 +1,14 @@
 # Translation of popt to German (Deutsch)
 # This file is distributed under the same license as the popt package.
-# Robert Scheck <rpm@robert-scheck.de>, 2004-2007.
+# Robert Scheck <robert@rpm5.org>, 2004-2007.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.12\n"
 "Report-Msgid-Bugs-To: <popt-devel@rpm5.org>\n"
 "POT-Creation-Date: 2007-09-06 08:50-0400\n"
-"PO-Revision-Date: 2007-02-17 21:00+0100\n"
-"Last-Translator: Robert Scheck <rpm@robert-scheck.de>\n"
+"PO-Revision-Date: 2007-11-10 00:35+0100\n"
+"Last-Translator: Robert Scheck <robert@rpm5.org>\n"
 "Language-Team: German <de@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
-- 
Gitee


From 8cf2e454ab12a21b857b5161c6541f95dbad363b Mon Sep 17 00:00:00 2001
From: "Ralf S. Engelschall" <rse@engelschall.com>
Date: Sun, 11 Nov 2007 17:17:04 +0000
Subject: [PATCH 478/667] drop MARK64 hack also for POPT (similar to what we
 have already done for RPM itself) as it isn't our business to decide for
 lib64 -- for this there is Autoconf option --libdir the packager should use
 himself

---
 Makefile.am  | 2 +-
 configure.ac | 9 ---------
 2 files changed, 1 insertion(+), 10 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index d02acfa..6acc573 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -35,7 +35,7 @@ TESTS = testit.sh
 
 include_HEADERS = popt.h
 
-usrlibdir = $(libdir)@MARK64@
+usrlibdir = $(libdir)
 usrlib_LTLIBRARIES = libpopt.la
 
 libpopt_la_SOURCES = popt.c findme.c poptparse.c poptconfig.c popthelp.c poptint.c
diff --git a/configure.ac b/configure.ac
index 9e158bb..0969236 100755
--- a/configure.ac
+++ b/configure.ac
@@ -59,15 +59,6 @@ else
 fi
 AC_SUBST(TARGET)
 
-dnl XXX Choose /usr/lib or /usr/lib64 for library installs.
-MARK64=
-if ! echo "${libdir}" | grep -q '64$' ; then
-    case "${target_cpu}" in
-    x86_64*|powerpc64*|ppc64*|sparc64*|s390x*) MARK64=64 ;;
-    esac
-fi
-AC_SUBST(MARK64)
-
 AC_CHECK_HEADERS(float.h libintl.h mcheck.h unistd.h langinfo.h)
 
 # For some systems we know that we have ld_version scripts.
-- 
Gitee


From e39c6864fb1cc7bbbf173ec9fe66cd81b8cbf691 Mon Sep 17 00:00:00 2001
From: Jeff Johnson <n3npq@mac.com>
Date: Wed, 14 Nov 2007 20:23:04 +0000
Subject: [PATCH 479/667] - re-add it.po (from Sandro Bonazzola
 <sandro.bonazzola@gmail.com>).

---
 CHANGES      |   1 +
 configure.ac |   2 +-
 po/cs.po     |  48 ++++++++++----------
 po/da.po     |  48 ++++++++++----------
 po/de.po     |  48 ++++++++++----------
 po/es.po     |  48 ++++++++++----------
 po/fr.po     |  48 ++++++++++----------
 po/ga.po     |  48 ++++++++++----------
 po/gl.po     |  48 ++++++++++----------
 po/hu.po     |  48 ++++++++++----------
 po/is.po     |  48 ++++++++++----------
 po/it.po     | 126 +++++++++++++++++++++++++++++++++++++++++++++++++++
 po/ja.po     |  48 ++++++++++----------
 po/ko.po     |  48 ++++++++++----------
 po/nb.po     |  48 ++++++++++----------
 po/nl.po     |  48 ++++++++++----------
 po/pl.po     |  48 ++++++++++----------
 po/popt.pot  |  48 ++++++++++----------
 po/pt.po     |  48 ++++++++++----------
 po/ro.po     |  48 ++++++++++----------
 po/ru.po     |  48 ++++++++++----------
 po/sk.po     |  48 ++++++++++----------
 po/sl.po     |  48 ++++++++++----------
 po/sv.po     |  48 ++++++++++----------
 po/tr.po     |  48 ++++++++++----------
 po/uk.po     |  48 ++++++++++----------
 po/vi.po     |  48 ++++++++++----------
 po/wa.po     |  48 ++++++++++----------
 po/zh_CN.po  |  48 ++++++++++----------
 29 files changed, 752 insertions(+), 625 deletions(-)
 create mode 100644 po/it.po

diff --git a/CHANGES b/CHANGES
index 8b37195..0940bc5 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,4 +1,5 @@
 1.12 -> 1.13:
+    - jbj: re-add it.po (from Sandro Bonazzola <sandro.bonazzola@gmail.com>).
     - jbj: rescuscitate the splint annotations.
     - jbj: change sizeof to use the type implicitly, rather than explicitly.
     - jbj: remove incorrect casts, changing to size_t where needed.
diff --git a/configure.ac b/configure.ac
index 0969236..94745e2 100755
--- a/configure.ac
+++ b/configure.ac
@@ -14,7 +14,7 @@ AC_SUBST(LT_AGE, 8)
 
 AM_INIT_AUTOMAKE([foreign])
 
-ALL_LINGUAS="cs da de es fr ga gl hu is ja ko nb nl nb pl pt ro ru sk sl sv tr uk vi wa zh_CN"
+ALL_LINGUAS="cs da de es fr ga gl hu is it ja ko nb nl nb pl pt ro ru sk sl sv tr uk vi wa zh_CN"
 
 AC_PROG_CC
 AC_PROG_INSTALL
diff --git a/po/cs.po b/po/cs.po
index 683f511..4a6b014 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.12\n"
 "Report-Msgid-Bugs-To: <popt-devel@rpm5.org>\n"
-"POT-Creation-Date: 2007-09-06 08:50-0400\n"
+"POT-Creation-Date: 2007-11-14 15:19-0500\n"
 "PO-Revision-Date: 2001-07-24 00:03+0100\n"
 "Last-Translator: Milan Kerslager <kerslage@linux.cz>\n"
 "Language-Team: Czech <cs@li.org>\n"
@@ -14,48 +14,48 @@ msgstr ""
 msgid "unknown errno"
 msgstr "nezn�m� ��slo chyby"
 
-#: popt.c:1002
+#: popt.c:981
 #, c-format
 msgid "option type (%d) not implemented in popt\n"
 msgstr "volba (%d) nen� v popt implementov�na\n"
 
-#: popt.c:1215
+#: popt.c:1187
 msgid "missing argument"
 msgstr "chyb� argument"
 
-#: popt.c:1217
+#: popt.c:1189
 msgid "unknown option"
 msgstr "nezn�m� volba"
 
-#: popt.c:1219
+#: popt.c:1191
 msgid "mutually exclusive logical operations requested"
 msgstr "po�adov�ny vz�jemn� v�lu�n� logick� operace"
 
-#: popt.c:1221
+#: popt.c:1193
 msgid "opt->arg should not be NULL"
 msgstr "opt->arg nesm� b�t NULL"
 
-#: popt.c:1223
+#: popt.c:1195
 msgid "aliases nested too deeply"
 msgstr "aliasy vno�en� p��li� hluboko"
 
-#: popt.c:1225
+#: popt.c:1197
 msgid "error in parameter quoting"
 msgstr "chyba v quotov�n� parametr�"
 
-#: popt.c:1227
+#: popt.c:1199
 msgid "invalid numeric value"
 msgstr "chybn� numerick� hodnota"
 
-#: popt.c:1229
+#: popt.c:1201
 msgid "number too large or too small"
 msgstr "��slo je p��li� velk� nebo p��li� mal�"
 
-#: popt.c:1231
+#: popt.c:1203
 msgid "memory allocation failed"
 msgstr "selhala alokace pam�ti"
 
-#: popt.c:1235
+#: popt.c:1207
 msgid "unknown error"
 msgstr "nezn�m� chyba"
 
@@ -71,50 +71,50 @@ msgstr "Vyp
 msgid "Display option defaults in message"
 msgstr "Zobrazit implicitn� volby ve zpr�v�"
 
-#: popthelp.c:162
+#: popthelp.c:163
 msgid "Help options:"
 msgstr ""
 
-#: popthelp.c:163
+#: popthelp.c:164
 msgid "Options implemented via popt alias/exec:"
 msgstr ""
 
-#: popthelp.c:171
+#: popthelp.c:172
 msgid "NONE"
 msgstr "NONE"
 
-#: popthelp.c:173
+#: popthelp.c:174
 msgid "VAL"
 msgstr "VAL"
 
-#: popthelp.c:177
+#: popthelp.c:178
 msgid "INT"
 msgstr "INT"
 
-#: popthelp.c:178
+#: popthelp.c:179
 msgid "LONG"
 msgstr "LONG"
 
-#: popthelp.c:179
+#: popthelp.c:180
 msgid "STRING"
 msgstr "STRING"
 
-#: popthelp.c:180
+#: popthelp.c:181
 msgid "FLOAT"
 msgstr "FLOAT"
 
-#: popthelp.c:181
+#: popthelp.c:182
 msgid "DOUBLE"
 msgstr "DOUBLE"
 
-#: popthelp.c:183
+#: popthelp.c:184
 msgid "ARG"
 msgstr "ARG"
 
-#: popthelp.c:606
+#: popthelp.c:597
 msgid "Usage:"
 msgstr "Pou�it�:"
 
-#: popthelp.c:630
+#: popthelp.c:619
 msgid "[OPTION...]"
 msgstr "[VOLBY...]"
diff --git a/po/da.po b/po/da.po
index d1134d9..ced558a 100644
--- a/po/da.po
+++ b/po/da.po
@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.12\n"
 "Report-Msgid-Bugs-To: <popt-devel@rpm5.org>\n"
-"POT-Creation-Date: 2007-09-06 08:50-0400\n"
+"POT-Creation-Date: 2007-11-14 15:19-0500\n"
 "PO-Revision-Date: Sun Jan 21 2001 04:30:32+0200\n"
 "Last-Translator: Martin Hansen <mah@k64.dk>\n"
 "Language-Team: Dansk <dansk@klid.dk>\n"
@@ -15,48 +15,48 @@ msgstr ""
 msgid "unknown errno"
 msgstr "ukendt fejlnr."
 
-#: popt.c:1002
+#: popt.c:981
 #, c-format
 msgid "option type (%d) not implemented in popt\n"
 msgstr "tilvalgstype (%d) er ikke implementeret i popt\n"
 
-#: popt.c:1215
+#: popt.c:1187
 msgid "missing argument"
 msgstr "mangler argument"
 
-#: popt.c:1217
+#: popt.c:1189
 msgid "unknown option"
 msgstr "ukendt tilvalg"
 
-#: popt.c:1219
+#: popt.c:1191
 msgid "mutually exclusive logical operations requested"
 msgstr "de �nskede handlinger udelukker hinanden"
 
-#: popt.c:1221
+#: popt.c:1193
 msgid "opt->arg should not be NULL"
 msgstr ""
 
-#: popt.c:1223
+#: popt.c:1195
 msgid "aliases nested too deeply"
 msgstr "aliaser er for dybt indlejret"
 
-#: popt.c:1225
+#: popt.c:1197
 msgid "error in parameter quoting"
 msgstr "fejl i parameter citering"
 
-#: popt.c:1227
+#: popt.c:1199
 msgid "invalid numeric value"
 msgstr "ugyldig numerisk v�rdi"
 
-#: popt.c:1229
+#: popt.c:1201
 msgid "number too large or too small"
 msgstr "nummer for stort, eller for lille"
 
-#: popt.c:1231
+#: popt.c:1203
 msgid "memory allocation failed"
 msgstr ""
 
-#: popt.c:1235
+#: popt.c:1207
 msgid "unknown error"
 msgstr "ukendt fejl"
 
@@ -73,50 +73,50 @@ msgstr "Vis kortfattet brugsanvisning"
 msgid "Display option defaults in message"
 msgstr "Vis kortfattet brugsanvisning"
 
-#: popthelp.c:162
+#: popthelp.c:163
 msgid "Help options:"
 msgstr ""
 
-#: popthelp.c:163
+#: popthelp.c:164
 msgid "Options implemented via popt alias/exec:"
 msgstr ""
 
-#: popthelp.c:171
+#: popthelp.c:172
 msgid "NONE"
 msgstr "INGEN"
 
-#: popthelp.c:173
+#: popthelp.c:174
 msgid "VAL"
 msgstr "VAL"
 
-#: popthelp.c:177
+#: popthelp.c:178
 msgid "INT"
 msgstr "INT"
 
-#: popthelp.c:178
+#: popthelp.c:179
 msgid "LONG"
 msgstr "LONG"
 
-#: popthelp.c:179
+#: popthelp.c:180
 msgid "STRING"
 msgstr "STRING"
 
-#: popthelp.c:180
+#: popthelp.c:181
 msgid "FLOAT"
 msgstr "FLOAT"
 
-#: popthelp.c:181
+#: popthelp.c:182
 msgid "DOUBLE"
 msgstr "DOUBLE"
 
-#: popthelp.c:183
+#: popthelp.c:184
 msgid "ARG"
 msgstr "ARG"
 
-#: popthelp.c:606
+#: popthelp.c:597
 msgid "Usage:"
 msgstr "Brug:"
 
-#: popthelp.c:630
+#: popthelp.c:619
 msgid "[OPTION...]"
 msgstr "[TILVALG...]"
diff --git a/po/de.po b/po/de.po
index c8b43a5..b20ae85 100644
--- a/po/de.po
+++ b/po/de.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.12\n"
 "Report-Msgid-Bugs-To: <popt-devel@rpm5.org>\n"
-"POT-Creation-Date: 2007-09-06 08:50-0400\n"
+"POT-Creation-Date: 2007-11-14 15:19-0500\n"
 "PO-Revision-Date: 2007-11-10 00:35+0100\n"
 "Last-Translator: Robert Scheck <robert@rpm5.org>\n"
 "Language-Team: German <de@li.org>\n"
@@ -18,48 +18,48 @@ msgstr ""
 msgid "unknown errno"
 msgstr "Unbekannte Fehler-Nummer"
 
-#: popt.c:1002
+#: popt.c:981
 #, c-format
 msgid "option type (%d) not implemented in popt\n"
 msgstr "Optionstyp (%d) ist in popt nicht vorhanden\n"
 
-#: popt.c:1215
+#: popt.c:1187
 msgid "missing argument"
 msgstr "Fehlendes Argument"
 
-#: popt.c:1217
+#: popt.c:1189
 msgid "unknown option"
 msgstr "Unbekannte Option"
 
-#: popt.c:1219
+#: popt.c:1191
 msgid "mutually exclusive logical operations requested"
 msgstr "Gegenseitig ausschließende logische Operatoren"
 
-#: popt.c:1221
+#: popt.c:1193
 msgid "opt->arg should not be NULL"
 msgstr "opt->arg sollte nicht NULL sein"
 
-#: popt.c:1223
+#: popt.c:1195
 msgid "aliases nested too deeply"
 msgstr "Aliase zu tief verschachtelt"
 
-#: popt.c:1225
+#: popt.c:1197
 msgid "error in parameter quoting"
 msgstr "Fehler beim Quotieren der Parameter"
 
-#: popt.c:1227
+#: popt.c:1199
 msgid "invalid numeric value"
 msgstr "Ungültiger nummerischer Wert"
 
-#: popt.c:1229
+#: popt.c:1201
 msgid "number too large or too small"
 msgstr "Nummer zu groß oder zu klein"
 
-#: popt.c:1231
+#: popt.c:1203
 msgid "memory allocation failed"
 msgstr "Speicherzuordnung fehlgeschlagen"
 
-#: popt.c:1235
+#: popt.c:1207
 msgid "unknown error"
 msgstr "Unbekannter Fehler"
 
@@ -75,50 +75,50 @@ msgstr "Zeigt eine kurze Verwendungsinformation"
 msgid "Display option defaults in message"
 msgstr "Zeigt die Standardeinstellungen an"
 
-#: popthelp.c:162
+#: popthelp.c:163
 msgid "Help options:"
 msgstr "Hilfe-Optionen:"
 
-#: popthelp.c:163
+#: popthelp.c:164
 msgid "Options implemented via popt alias/exec:"
 msgstr "Optionen über popt alias/exec implementiert:"
 
-#: popthelp.c:171
+#: popthelp.c:172
 msgid "NONE"
 msgstr "NICHTS"
 
-#: popthelp.c:173
+#: popthelp.c:174
 msgid "VAL"
 msgstr "WERT"
 
-#: popthelp.c:177
+#: popthelp.c:178
 msgid "INT"
 msgstr "INTEGER"
 
-#: popthelp.c:178
+#: popthelp.c:179
 msgid "LONG"
 msgstr "LONG"
 
-#: popthelp.c:179
+#: popthelp.c:180
 msgid "STRING"
 msgstr "STRING"
 
-#: popthelp.c:180
+#: popthelp.c:181
 msgid "FLOAT"
 msgstr "FLOAT"
 
-#: popthelp.c:181
+#: popthelp.c:182
 msgid "DOUBLE"
 msgstr "DOUBLE"
 
-#: popthelp.c:183
+#: popthelp.c:184
 msgid "ARG"
 msgstr "ARGUMENT"
 
-#: popthelp.c:606
+#: popthelp.c:597
 msgid "Usage:"
 msgstr "Verwendung:"
 
-#: popthelp.c:630
+#: popthelp.c:619
 msgid "[OPTION...]"
 msgstr "[OPTION...]"
diff --git a/po/es.po b/po/es.po
index ee305ca..f2a5780 100644
--- a/po/es.po
+++ b/po/es.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.12\n"
 "Report-Msgid-Bugs-To: <popt-devel@rpm5.org>\n"
-"POT-Creation-Date: 2007-09-06 08:50-0400\n"
+"POT-Creation-Date: 2007-11-14 15:19-0500\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Leandro Lucarella <luca@linuxmendoza.org.ar>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -19,48 +19,48 @@ msgstr ""
 msgid "unknown errno"
 msgstr "errno desconocido"
 
-#: popt.c:1002
+#: popt.c:981
 #, c-format
 msgid "option type (%d) not implemented in popt\n"
 msgstr "tipo de opcin (%d) no implementada en popt\n"
 
-#: popt.c:1215
+#: popt.c:1187
 msgid "missing argument"
 msgstr "falta argumento"
 
-#: popt.c:1217
+#: popt.c:1189
 msgid "unknown option"
 msgstr "opcin desconocida"
 
-#: popt.c:1219
+#: popt.c:1191
 msgid "mutually exclusive logical operations requested"
 msgstr "requerida operacin lgica mutuamente exclusiva"
 
-#: popt.c:1221
+#: popt.c:1193
 msgid "opt->arg should not be NULL"
 msgstr ""
 
-#: popt.c:1223
+#: popt.c:1195
 msgid "aliases nested too deeply"
 msgstr "alias anidados muy profundamente"
 
-#: popt.c:1225
+#: popt.c:1197
 msgid "error in parameter quoting"
 msgstr "error en cita de parmetros"
 
-#: popt.c:1227
+#: popt.c:1199
 msgid "invalid numeric value"
 msgstr "valor numrico invlido"
 
-#: popt.c:1229
+#: popt.c:1201
 msgid "number too large or too small"
 msgstr "nmero muy largo o muy pequeo"
 
-#: popt.c:1231
+#: popt.c:1203
 msgid "memory allocation failed"
 msgstr ""
 
-#: popt.c:1235
+#: popt.c:1207
 msgid "unknown error"
 msgstr "error desconocido"
 
@@ -77,50 +77,50 @@ msgstr "Indica el modo de uso resumido"
 msgid "Display option defaults in message"
 msgstr "Indica el modo de uso resumido"
 
-#: popthelp.c:162
+#: popthelp.c:163
 msgid "Help options:"
 msgstr ""
 
-#: popthelp.c:163
+#: popthelp.c:164
 msgid "Options implemented via popt alias/exec:"
 msgstr ""
 
-#: popthelp.c:171
+#: popthelp.c:172
 msgid "NONE"
 msgstr "NONE"
 
-#: popthelp.c:173
+#: popthelp.c:174
 msgid "VAL"
 msgstr "VAL"
 
-#: popthelp.c:177
+#: popthelp.c:178
 msgid "INT"
 msgstr "INT"
 
-#: popthelp.c:178
+#: popthelp.c:179
 msgid "LONG"
 msgstr "LONG"
 
-#: popthelp.c:179
+#: popthelp.c:180
 msgid "STRING"
 msgstr "STRING"
 
-#: popthelp.c:180
+#: popthelp.c:181
 msgid "FLOAT"
 msgstr "FLOAT"
 
-#: popthelp.c:181
+#: popthelp.c:182
 msgid "DOUBLE"
 msgstr "DOUBLE"
 
-#: popthelp.c:183
+#: popthelp.c:184
 msgid "ARG"
 msgstr "ARG"
 
-#: popthelp.c:606
+#: popthelp.c:597
 msgid "Usage:"
 msgstr "Modo de Uso:"
 
-#: popthelp.c:630
+#: popthelp.c:619
 msgid "[OPTION...]"
 msgstr "[OPCIN...]"
diff --git a/po/fr.po b/po/fr.po
index 442ec21..70ec61e 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -12,7 +12,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.12\n"
 "Report-Msgid-Bugs-To: <popt-devel@rpm5.org>\n"
-"POT-Creation-Date: 2007-09-06 08:50-0400\n"
+"POT-Creation-Date: 2007-11-14 15:19-0500\n"
 "PO-Revision-Date: 2003-06-22 23:43+0200\n"
 "Last-Translator: RPM French Translation <rpm-fr@livna.org>\n"
 "Language-Team: RPM French Translation <rpm-fr@livna.org>\n"
@@ -24,48 +24,48 @@ msgstr ""
 msgid "unknown errno"
 msgstr "errno inconnu"
 
-#: popt.c:1002
+#: popt.c:981
 #, c-format
 msgid "option type (%d) not implemented in popt\n"
 msgstr "type(%d) d'option non implémenté dans popt\n"
 
-#: popt.c:1215
+#: popt.c:1187
 msgid "missing argument"
 msgstr "argument manquant"
 
-#: popt.c:1217
+#: popt.c:1189
 msgid "unknown option"
 msgstr "option iconnue"
 
-#: popt.c:1219
+#: popt.c:1191
 msgid "mutually exclusive logical operations requested"
 msgstr "opérations logiques mutuellement exclusives requises"
 
-#: popt.c:1221
+#: popt.c:1193
 msgid "opt->arg should not be NULL"
 msgstr "opt->arg ne devrait pas être NULL"
 
-#: popt.c:1223
+#: popt.c:1195
 msgid "aliases nested too deeply"
 msgstr "les alias sont trop entremellés"
 
-#: popt.c:1225
+#: popt.c:1197
 msgid "error in parameter quoting"
 msgstr "erreur en citant les paramètres"
 
-#: popt.c:1227
+#: popt.c:1199
 msgid "invalid numeric value"
 msgstr "valeur numérique invalide"
 
-#: popt.c:1229
+#: popt.c:1201
 msgid "number too large or too small"
 msgstr "nombre trop grand ou trop petit"
 
-#: popt.c:1231
+#: popt.c:1203
 msgid "memory allocation failed"
 msgstr "échec de l'allocation de mémoire"
 
-#: popt.c:1235
+#: popt.c:1207
 msgid "unknown error"
 msgstr "erreur inconnue"
 
@@ -81,50 +81,50 @@ msgstr "Affiche un bref descriptif de l'utilisation"
 msgid "Display option defaults in message"
 msgstr "Afficher les valeurs par défaut des options dans le message"
 
-#: popthelp.c:162
+#: popthelp.c:163
 msgid "Help options:"
 msgstr ""
 
-#: popthelp.c:163
+#: popthelp.c:164
 msgid "Options implemented via popt alias/exec:"
 msgstr ""
 
-#: popthelp.c:171
+#: popthelp.c:172
 msgid "NONE"
 msgstr "RIEN"
 
-#: popthelp.c:173
+#: popthelp.c:174
 msgid "VAL"
 msgstr "VAL"
 
-#: popthelp.c:177
+#: popthelp.c:178
 msgid "INT"
 msgstr "ENTIER"
 
-#: popthelp.c:178
+#: popthelp.c:179
 msgid "LONG"
 msgstr "LONG"
 
-#: popthelp.c:179
+#: popthelp.c:180
 msgid "STRING"
 msgstr "CHAINE"
 
-#: popthelp.c:180
+#: popthelp.c:181
 msgid "FLOAT"
 msgstr "FLOTTANT"
 
-#: popthelp.c:181
+#: popthelp.c:182
 msgid "DOUBLE"
 msgstr "DOUBLE"
 
-#: popthelp.c:183
+#: popthelp.c:184
 msgid "ARG"
 msgstr "ARG"
 
-#: popthelp.c:606
+#: popthelp.c:597
 msgid "Usage:"
 msgstr "Utilisation:"
 
-#: popthelp.c:630
+#: popthelp.c:619
 msgid "[OPTION...]"
 msgstr "[OPTION...]"
diff --git a/po/ga.po b/po/ga.po
index 6153ce4..c9dae0a 100644
--- a/po/ga.po
+++ b/po/ga.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.12\n"
 "Report-Msgid-Bugs-To: <popt-devel@rpm5.org>\n"
-"POT-Creation-Date: 2007-09-06 08:50-0400\n"
+"POT-Creation-Date: 2007-11-14 15:19-0500\n"
 "PO-Revision-Date: 2007-06-19 06:21-0500\n"
 "Last-Translator: Kevin Scannell <kscanne@gmail.com>\n"
 "Language-Team: Irish <gaeilge-gnulinux@lists.sourceforge.net>\n"
@@ -18,48 +18,48 @@ msgstr ""
 msgid "unknown errno"
 msgstr "errno anaithnid"
 
-#: popt.c:1002
+#: popt.c:981
 #, c-format
 msgid "option type (%d) not implemented in popt\n"
 msgstr "níl an cineál rogha seo (%d) ar fáil i popt\n"
 
-#: popt.c:1215
+#: popt.c:1187
 msgid "missing argument"
 msgstr "argóint ar iarraidh"
 
-#: popt.c:1217
+#: popt.c:1189
 msgid "unknown option"
 msgstr "rogha anaithnid"
 
-#: popt.c:1219
+#: popt.c:1191
 msgid "mutually exclusive logical operations requested"
 msgstr "iarradh oibríochtaí loighciúla comheisiacha"
 
-#: popt.c:1221
+#: popt.c:1193
 msgid "opt->arg should not be NULL"
 msgstr "níor chóir rogha->arg a bheith NULL"
 
-#: popt.c:1223
+#: popt.c:1195
 msgid "aliases nested too deeply"
 msgstr "ailiasanna neadaithe ródhomhain"
 
-#: popt.c:1225
+#: popt.c:1197
 msgid "error in parameter quoting"
 msgstr "earráid agus paraiméadar á chur faoi chomharthaí athfhriotail"
 
-#: popt.c:1227
+#: popt.c:1199
 msgid "invalid numeric value"
 msgstr "luach neamhbhailí uimhriúil"
 
-#: popt.c:1229
+#: popt.c:1201
 msgid "number too large or too small"
 msgstr "uimhir rómhór nó róbheag"
 
-#: popt.c:1231
+#: popt.c:1203
 msgid "memory allocation failed"
 msgstr "theip ar dháileadh na cuimhne"
 
-#: popt.c:1235
+#: popt.c:1207
 msgid "unknown error"
 msgstr "earráid anaithnid"
 
@@ -75,50 +75,50 @@ msgstr "Taispeáin beagán eolais faoin úsáid"
 msgid "Display option defaults in message"
 msgstr "Taispeáin luachanna réamhshocraithe na roghanna sa teachtaireacht"
 
-#: popthelp.c:162
+#: popthelp.c:163
 msgid "Help options:"
 msgstr "Roghanna cabhracha:"
 
-#: popthelp.c:163
+#: popthelp.c:164
 msgid "Options implemented via popt alias/exec:"
 msgstr "Roghanna a cuireadh i bhfeidhm trí ailias/exec popt:"
 
-#: popthelp.c:171
+#: popthelp.c:172
 msgid "NONE"
 msgstr "NEAMHNÍ"
 
-#: popthelp.c:173
+#: popthelp.c:174
 msgid "VAL"
 msgstr "LUACH"
 
-#: popthelp.c:177
+#: popthelp.c:178
 msgid "INT"
 msgstr "INT"
 
-#: popthelp.c:178
+#: popthelp.c:179
 msgid "LONG"
 msgstr "LONG"
 
-#: popthelp.c:179
+#: popthelp.c:180
 msgid "STRING"
 msgstr "STRING"
 
-#: popthelp.c:180
+#: popthelp.c:181
 msgid "FLOAT"
 msgstr "FLOAT"
 
-#: popthelp.c:181
+#: popthelp.c:182
 msgid "DOUBLE"
 msgstr "DOUBLE"
 
-#: popthelp.c:183
+#: popthelp.c:184
 msgid "ARG"
 msgstr "ARG"
 
-#: popthelp.c:606
+#: popthelp.c:597
 msgid "Usage:"
 msgstr "Úsáid:"
 
-#: popthelp.c:630
+#: popthelp.c:619
 msgid "[OPTION...]"
 msgstr "[ROGHA...]"
diff --git a/po/gl.po b/po/gl.po
index a95fab6..468e8b0 100644
--- a/po/gl.po
+++ b/po/gl.po
@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.12\n"
 "Report-Msgid-Bugs-To: <popt-devel@rpm5.org>\n"
-"POT-Creation-Date: 2007-09-06 08:50-0400\n"
+"POT-Creation-Date: 2007-11-14 15:19-0500\n"
 "PO-Revision-Date: 2001-01-17 01:01+0100\n"
 "Last-Translator: Jes�s Bravo �lvarez <jba@pobox.com>\n"
 "Language-Team: Galician <trasno@ceu.fi.udc.es>\n"
@@ -14,48 +14,48 @@ msgstr ""
 msgid "unknown errno"
 msgstr "errno desco�ecido"
 
-#: popt.c:1002
+#: popt.c:981
 #, c-format
 msgid "option type (%d) not implemented in popt\n"
 msgstr "tipo de opci�n (%d) non implementada en popt\n"
 
-#: popt.c:1215
+#: popt.c:1187
 msgid "missing argument"
 msgstr "falta un argumento"
 
-#: popt.c:1217
+#: popt.c:1189
 msgid "unknown option"
 msgstr "opci�n desco�ecida"
 
-#: popt.c:1219
+#: popt.c:1191
 msgid "mutually exclusive logical operations requested"
 msgstr "solicit�ronse operaci�ns l�xicas mutuamente exclu�ntes"
 
-#: popt.c:1221
+#: popt.c:1193
 msgid "opt->arg should not be NULL"
 msgstr ""
 
-#: popt.c:1223
+#: popt.c:1195
 msgid "aliases nested too deeply"
 msgstr "aliases ani�ados a un nivel demasiado profundo"
 
-#: popt.c:1225
+#: popt.c:1197
 msgid "error in parameter quoting"
 msgstr "erro nas comi�as do par�metro"
 
-#: popt.c:1227
+#: popt.c:1199
 msgid "invalid numeric value"
 msgstr "valor num�rico non v�lido"
 
-#: popt.c:1229
+#: popt.c:1201
 msgid "number too large or too small"
 msgstr "n�mero demasiado grande ou pequeno"
 
-#: popt.c:1231
+#: popt.c:1203
 msgid "memory allocation failed"
 msgstr ""
 
-#: popt.c:1235
+#: popt.c:1207
 msgid "unknown error"
 msgstr "erro desco�ecido"
 
@@ -72,50 +72,50 @@ msgstr "Amosar brevemente o xeito de utilizaci
 msgid "Display option defaults in message"
 msgstr "Amosar brevemente o xeito de utilizaci�n"
 
-#: popthelp.c:162
+#: popthelp.c:163
 msgid "Help options:"
 msgstr ""
 
-#: popthelp.c:163
+#: popthelp.c:164
 msgid "Options implemented via popt alias/exec:"
 msgstr ""
 
-#: popthelp.c:171
+#: popthelp.c:172
 msgid "NONE"
 msgstr "NADA"
 
-#: popthelp.c:173
+#: popthelp.c:174
 msgid "VAL"
 msgstr "VAL"
 
-#: popthelp.c:177
+#: popthelp.c:178
 msgid "INT"
 msgstr "INT"
 
-#: popthelp.c:178
+#: popthelp.c:179
 msgid "LONG"
 msgstr "LONG"
 
-#: popthelp.c:179
+#: popthelp.c:180
 msgid "STRING"
 msgstr "CADEA"
 
-#: popthelp.c:180
+#: popthelp.c:181
 msgid "FLOAT"
 msgstr "FLOAT"
 
-#: popthelp.c:181
+#: popthelp.c:182
 msgid "DOUBLE"
 msgstr "DOUBLE"
 
-#: popthelp.c:183
+#: popthelp.c:184
 msgid "ARG"
 msgstr "ARG"
 
-#: popthelp.c:606
+#: popthelp.c:597
 msgid "Usage:"
 msgstr "Uso:"
 
-#: popthelp.c:630
+#: popthelp.c:619
 msgid "[OPTION...]"
 msgstr "[OPCI�N...]"
diff --git a/po/hu.po b/po/hu.po
index c7d0c4e..9f35042 100644
--- a/po/hu.po
+++ b/po/hu.po
@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.12\n"
 "Report-Msgid-Bugs-To: <popt-devel@rpm5.org>\n"
-"POT-Creation-Date: 2007-09-06 08:50-0400\n"
+"POT-Creation-Date: 2007-11-14 15:19-0500\n"
 "PO-Revision-Date: 2000-08-03 23:26+0200\n"
 "Last-Translator: L�szl� N�meth <nemeth@qwertynet.hu>\n"
 "Language-Team: Hungarian\n"
@@ -14,48 +14,48 @@ msgstr ""
 msgid "unknown errno"
 msgstr ""
 
-#: popt.c:1002
+#: popt.c:981
 #, c-format
 msgid "option type (%d) not implemented in popt\n"
 msgstr ""
 
-#: popt.c:1215
+#: popt.c:1187
 msgid "missing argument"
 msgstr ""
 
-#: popt.c:1217
+#: popt.c:1189
 msgid "unknown option"
 msgstr ""
 
-#: popt.c:1219
+#: popt.c:1191
 msgid "mutually exclusive logical operations requested"
 msgstr ""
 
-#: popt.c:1221
+#: popt.c:1193
 msgid "opt->arg should not be NULL"
 msgstr ""
 
-#: popt.c:1223
+#: popt.c:1195
 msgid "aliases nested too deeply"
 msgstr ""
 
-#: popt.c:1225
+#: popt.c:1197
 msgid "error in parameter quoting"
 msgstr ""
 
-#: popt.c:1227
+#: popt.c:1199
 msgid "invalid numeric value"
 msgstr ""
 
-#: popt.c:1229
+#: popt.c:1201
 msgid "number too large or too small"
 msgstr ""
 
-#: popt.c:1231
+#: popt.c:1203
 msgid "memory allocation failed"
 msgstr ""
 
-#: popt.c:1235
+#: popt.c:1207
 msgid "unknown error"
 msgstr ""
 
@@ -72,50 +72,50 @@ msgstr "R
 msgid "Display option defaults in message"
 msgstr "R�vid haszn�lati utas�t�s megjelen�t�se"
 
-#: popthelp.c:162
+#: popthelp.c:163
 msgid "Help options:"
 msgstr ""
 
-#: popthelp.c:163
+#: popthelp.c:164
 msgid "Options implemented via popt alias/exec:"
 msgstr ""
 
-#: popthelp.c:171
+#: popthelp.c:172
 msgid "NONE"
 msgstr ""
 
-#: popthelp.c:173
+#: popthelp.c:174
 msgid "VAL"
 msgstr ""
 
-#: popthelp.c:177
+#: popthelp.c:178
 msgid "INT"
 msgstr ""
 
-#: popthelp.c:178
+#: popthelp.c:179
 msgid "LONG"
 msgstr ""
 
-#: popthelp.c:179
+#: popthelp.c:180
 msgid "STRING"
 msgstr ""
 
-#: popthelp.c:180
+#: popthelp.c:181
 msgid "FLOAT"
 msgstr ""
 
-#: popthelp.c:181
+#: popthelp.c:182
 msgid "DOUBLE"
 msgstr ""
 
-#: popthelp.c:183
+#: popthelp.c:184
 msgid "ARG"
 msgstr ""
 
-#: popthelp.c:606
+#: popthelp.c:597
 msgid "Usage:"
 msgstr ""
 
-#: popthelp.c:630
+#: popthelp.c:619
 msgid "[OPTION...]"
 msgstr ""
diff --git a/po/is.po b/po/is.po
index 3ee7511..da34560 100644
--- a/po/is.po
+++ b/po/is.po
@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.12\n"
 "Report-Msgid-Bugs-To: <popt-devel@rpm5.org>\n"
-"POT-Creation-Date: 2007-09-06 08:50-0400\n"
+"POT-Creation-Date: 2007-11-14 15:19-0500\n"
 "PO-Revision-Date: 2001-06-08 01:35+0000\n"
 "Last-Translator: Richard Allen <ra@hp.is>\n"
 "Language-Team: is <kde-isl@mmedia.is>\n"
@@ -14,48 +14,48 @@ msgstr ""
 msgid "unknown errno"
 msgstr "��ekkt villun�mer"
 
-#: popt.c:1002
+#: popt.c:981
 #, c-format
 msgid "option type (%d) not implemented in popt\n"
 msgstr "rofager�in (%d) er ekki studd � popt\n"
 
-#: popt.c:1215
+#: popt.c:1187
 msgid "missing argument"
 msgstr "vantar vi�fang"
 
-#: popt.c:1217
+#: popt.c:1189
 msgid "unknown option"
 msgstr "��ekktur rofi"
 
-#: popt.c:1219
+#: popt.c:1191
 msgid "mutually exclusive logical operations requested"
 msgstr "be�i� um rofa sem sl�kkva hvor � ��rum"
 
-#: popt.c:1221
+#: popt.c:1193
 msgid "opt->arg should not be NULL"
 msgstr "opt->arg �tti ekki a� vera NULL"
 
-#: popt.c:1223
+#: popt.c:1195
 msgid "aliases nested too deeply"
 msgstr "al�asar of fl�knir"
 
-#: popt.c:1225
+#: popt.c:1197
 msgid "error in parameter quoting"
 msgstr "villa � vi�f�ngum (g�salappir og svo frv.)"
 
-#: popt.c:1227
+#: popt.c:1199
 msgid "invalid numeric value"
 msgstr "�gilt t�lulegt gildi"
 
-#: popt.c:1229
+#: popt.c:1201
 msgid "number too large or too small"
 msgstr "talan of st�r e�a sm�"
 
-#: popt.c:1231
+#: popt.c:1203
 msgid "memory allocation failed"
 msgstr "ekki t�kst a� taka fr� minni"
 
-#: popt.c:1235
+#: popt.c:1207
 msgid "unknown error"
 msgstr "��ekkt villa"
 
@@ -71,50 +71,50 @@ msgstr "S
 msgid "Display option defaults in message"
 msgstr "S�na sj�lfgefin gildi rofa � skilabo�um"
 
-#: popthelp.c:162
+#: popthelp.c:163
 msgid "Help options:"
 msgstr ""
 
-#: popthelp.c:163
+#: popthelp.c:164
 msgid "Options implemented via popt alias/exec:"
 msgstr ""
 
-#: popthelp.c:171
+#: popthelp.c:172
 msgid "NONE"
 msgstr "ENGIN"
 
-#: popthelp.c:173
+#: popthelp.c:174
 msgid "VAL"
 msgstr "VAL"
 
-#: popthelp.c:177
+#: popthelp.c:178
 msgid "INT"
 msgstr "INT"
 
-#: popthelp.c:178
+#: popthelp.c:179
 msgid "LONG"
 msgstr "LONG"
 
-#: popthelp.c:179
+#: popthelp.c:180
 msgid "STRING"
 msgstr "STRING"
 
-#: popthelp.c:180
+#: popthelp.c:181
 msgid "FLOAT"
 msgstr "FLOAT"
 
-#: popthelp.c:181
+#: popthelp.c:182
 msgid "DOUBLE"
 msgstr "DOUBLE"
 
-#: popthelp.c:183
+#: popthelp.c:184
 msgid "ARG"
 msgstr "ARG"
 
-#: popthelp.c:606
+#: popthelp.c:597
 msgid "Usage:"
 msgstr "Notkun:"
 
-#: popthelp.c:630
+#: popthelp.c:619
 msgid "[OPTION...]"
 msgstr "[ROFI...]"
diff --git a/po/it.po b/po/it.po
new file mode 100644
index 0000000..f9d1f2b
--- /dev/null
+++ b/po/it.po
@@ -0,0 +1,126 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR Free Software Foundation, Inc.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: popt 1.12\n"
+"Report-Msgid-Bugs-To: <popt-devel@rpm5.org>\n"
+"POT-Creation-Date: 2007-11-14 15:19-0500\n"
+"PO-Revision-Date: 2007-11-14 20:39+0100\n"
+"Last-Translator: Sandro Bonazzola <sandro.bonazzola@gmail.com>\n"
+"Language-Team: Sandro Bonazzola <sandro.bonazzola@gmail.com>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Poedit-Language: Italian\n"
+"X-Poedit-Country: ITALY\n"
+
+#: popt.c:35
+msgid "unknown errno"
+msgstr "errno sconosciuto"
+
+#: popt.c:981
+#, c-format
+msgid "option type (%d) not implemented in popt\n"
+msgstr "opzione di tipo (%d) non implementata in popt\n"
+
+#: popt.c:1187
+msgid "missing argument"
+msgstr "argomento mancante"
+
+#: popt.c:1189
+msgid "unknown option"
+msgstr "opzione sconosciuta"
+
+#: popt.c:1191
+msgid "mutually exclusive logical operations requested"
+msgstr "richieste operazioni logiche mutuamente esclusive"
+
+#: popt.c:1193
+msgid "opt->arg should not be NULL"
+msgstr "opt->arg non dovrebbe essere NULL"
+
+#: popt.c:1195
+msgid "aliases nested too deeply"
+msgstr "alias nidificati troppo profondamente"
+
+#: popt.c:1197
+msgid "error in parameter quoting"
+msgstr "errore nel quoting del parametro"
+
+#: popt.c:1199
+msgid "invalid numeric value"
+msgstr "valore numerico errato"
+
+#: popt.c:1201
+msgid "number too large or too small"
+msgstr "numero troppo grande o troppo piccolo"
+
+#: popt.c:1203
+msgid "memory allocation failed"
+msgstr "allocazione di memoria fallita"
+
+#: popt.c:1207
+msgid "unknown error"
+msgstr "errore sconosciuto"
+
+#: popthelp.c:74 popthelp.c:85
+msgid "Show this help message"
+msgstr "Mostra questo messaggio di aiuto"
+
+#: popthelp.c:75 popthelp.c:86
+msgid "Display brief usage message"
+msgstr "Mostra un breve messaggio di utilizzo"
+
+#: popthelp.c:89
+msgid "Display option defaults in message"
+msgstr "Mostra i valori predefiniti delle opzioni nei messaggi"
+
+#: popthelp.c:163
+msgid "Help options:"
+msgstr ""
+
+#: popthelp.c:164
+msgid "Options implemented via popt alias/exec:"
+msgstr ""
+
+#: popthelp.c:172
+msgid "NONE"
+msgstr "NONE"
+
+#: popthelp.c:174
+msgid "VAL"
+msgstr "VAL"
+
+#: popthelp.c:178
+msgid "INT"
+msgstr "INT"
+
+#: popthelp.c:179
+msgid "LONG"
+msgstr "LONG"
+
+#: popthelp.c:180
+msgid "STRING"
+msgstr "STRING"
+
+#: popthelp.c:181
+msgid "FLOAT"
+msgstr "FLOAT"
+
+#: popthelp.c:182
+msgid "DOUBLE"
+msgstr "DOUBLE"
+
+#: popthelp.c:184
+msgid "ARG"
+msgstr "ARG"
+
+#: popthelp.c:597
+msgid "Usage:"
+msgstr "Uso:"
+
+#: popthelp.c:619
+msgid "[OPTION...]"
+msgstr "[OPZIONE...]"
diff --git a/po/ja.po b/po/ja.po
index 16e24e7..bd9fbdc 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.12\n"
 "Report-Msgid-Bugs-To: <popt-devel@rpm5.org>\n"
-"POT-Creation-Date: 2007-09-06 08:50-0400\n"
+"POT-Creation-Date: 2007-11-14 15:19-0500\n"
 "PO-Revision-Date: 2003--8-25 19:00+0900\n"
 "Last-Translator: Yukihiro Nakai <ynakai@redhat.com>\n"
 "Language-Team: Japanese <ja@li.org>\n"
@@ -18,48 +18,48 @@ msgstr ""
 msgid "unknown errno"
 msgstr "不明なエラー番号"
 
-#: popt.c:1002
+#: popt.c:981
 #, c-format
 msgid "option type (%d) not implemented in popt\n"
 msgstr "オプションタイプ (%d) はpoptには実装されていません\n"
 
-#: popt.c:1215
+#: popt.c:1187
 msgid "missing argument"
 msgstr "引数がありません"
 
-#: popt.c:1217
+#: popt.c:1189
 msgid "unknown option"
 msgstr "不明なオプション"
 
-#: popt.c:1219
+#: popt.c:1191
 msgid "mutually exclusive logical operations requested"
 msgstr "排他的な悪ぺーレーションが必要です"
 
-#: popt.c:1221
+#: popt.c:1193
 msgid "opt->arg should not be NULL"
 msgstr "opt->argはNULLではいけません"
 
-#: popt.c:1223
+#: popt.c:1195
 msgid "aliases nested too deeply"
 msgstr "エイリアスのネストが深すぎます"
 
-#: popt.c:1225
+#: popt.c:1197
 msgid "error in parameter quoting"
 msgstr "パラメータのクオート付けでエラー"
 
-#: popt.c:1227
+#: popt.c:1199
 msgid "invalid numeric value"
 msgstr "不正な数値"
 
-#: popt.c:1229
+#: popt.c:1201
 msgid "number too large or too small"
 msgstr "数値が大きすぎるか小さすぎます"
 
-#: popt.c:1231
+#: popt.c:1203
 msgid "memory allocation failed"
 msgstr "メモリ確保に失敗しました"
 
-#: popt.c:1235
+#: popt.c:1207
 msgid "unknown error"
 msgstr "不明なエラー"
 
@@ -75,50 +75,50 @@ msgstr "使い方の概要を表示します"
 msgid "Display option defaults in message"
 msgstr "オプションのデフォルト値をメッセージに表示します"
 
-#: popthelp.c:162
+#: popthelp.c:163
 msgid "Help options:"
 msgstr "ヘルプオプション:"
 
-#: popthelp.c:163
+#: popthelp.c:164
 msgid "Options implemented via popt alias/exec:"
 msgstr "poptのalias/execで実装されているオプション:"
 
-#: popthelp.c:171
+#: popthelp.c:172
 msgid "NONE"
 msgstr "なし"
 
-#: popthelp.c:173
+#: popthelp.c:174
 msgid "VAL"
 msgstr "値"
 
-#: popthelp.c:177
+#: popthelp.c:178
 msgid "INT"
 msgstr "INT"
 
-#: popthelp.c:178
+#: popthelp.c:179
 msgid "LONG"
 msgstr "LONG"
 
-#: popthelp.c:179
+#: popthelp.c:180
 msgid "STRING"
 msgstr "文字列"
 
-#: popthelp.c:180
+#: popthelp.c:181
 msgid "FLOAT"
 msgstr "FLOAT"
 
-#: popthelp.c:181
+#: popthelp.c:182
 msgid "DOUBLE"
 msgstr "DOUBLE"
 
-#: popthelp.c:183
+#: popthelp.c:184
 msgid "ARG"
 msgstr "ARG"
 
-#: popthelp.c:606
+#: popthelp.c:597
 msgid "Usage:"
 msgstr "使い方:"
 
-#: popthelp.c:630
+#: popthelp.c:619
 msgid "[OPTION...]"
 msgstr "[オプション...]"
diff --git a/po/ko.po b/po/ko.po
index d41ebf1..3b8dc21 100644
--- a/po/ko.po
+++ b/po/ko.po
@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.12\n"
 "Report-Msgid-Bugs-To: <popt-devel@rpm5.org>\n"
-"POT-Creation-Date: 2007-09-06 08:50-0400\n"
+"POT-Creation-Date: 2007-11-14 15:19-0500\n"
 "PO-Revision-Date: 2001-09-06 20:06+0900\n"
 "Last-Translator: Jong-Hoon Ryu <redhat4u@netian.com>\n"
 "Language-Team: GNU Translation project <ko@li.org>\n"
@@ -14,48 +14,48 @@ msgstr ""
 msgid "unknown errno"
 msgstr "�� �� ���� �����ڵ�(errno) �Դϴ�"
 
-#: popt.c:1002
+#: popt.c:981
 #, c-format
 msgid "option type (%d) not implemented in popt\n"
 msgstr "�ɼ� ���� (%d)�� popt���� ����� �� �����ϴ�\n"
 
-#: popt.c:1215
+#: popt.c:1187
 msgid "missing argument"
 msgstr "�μ��� �������� �ʾҽ��ϴ�"
 
-#: popt.c:1217
+#: popt.c:1189
 msgid "unknown option"
 msgstr "�� �� ���� �ɼ��Դϴ�"
 
-#: popt.c:1219
+#: popt.c:1191
 msgid "mutually exclusive logical operations requested"
 msgstr "���ʿ� ��Ÿ�� ���� ������ �����Ǿ����ϴ�"
 
-#: popt.c:1221
+#: popt.c:1193
 msgid "opt->arg should not be NULL"
 msgstr "�ɼ�->�μ��� NULL�� �Ǿ�� �ȵ˴ϴ�"
 
-#: popt.c:1223
+#: popt.c:1195
 msgid "aliases nested too deeply"
 msgstr "��Ī(alias)�� �����ϰ� �����Ǿ����ϴ�"
 
-#: popt.c:1225
+#: popt.c:1197
 msgid "error in parameter quoting"
 msgstr "�Ű������� ������ �ֽ��ϴ�"
 
-#: popt.c:1227
+#: popt.c:1199
 msgid "invalid numeric value"
 msgstr "�߸��� ��ġ ���Դϴ�"
 
-#: popt.c:1229
+#: popt.c:1201
 msgid "number too large or too small"
 msgstr "���ڰ� �ʹ� ũ�ų� �ʹ� �����ϴ�"
 
-#: popt.c:1231
+#: popt.c:1203
 msgid "memory allocation failed"
 msgstr "�޸� �Ҵ翡 �����߽��ϴ�"
 
-#: popt.c:1235
+#: popt.c:1207
 msgid "unknown error"
 msgstr "�� �� ���� �����Դϴ�"
 
@@ -71,50 +71,50 @@ msgstr "
 msgid "Display option defaults in message"
 msgstr "�⺻���� �ɼ��� �����ݴϴ�"
 
-#: popthelp.c:162
+#: popthelp.c:163
 msgid "Help options:"
 msgstr ""
 
-#: popthelp.c:163
+#: popthelp.c:164
 msgid "Options implemented via popt alias/exec:"
 msgstr ""
 
-#: popthelp.c:171
+#: popthelp.c:172
 msgid "NONE"
 msgstr "����(NONE)"
 
-#: popthelp.c:173
+#: popthelp.c:174
 msgid "VAL"
 msgstr "��(VAL)"
 
-#: popthelp.c:177
+#: popthelp.c:178
 msgid "INT"
 msgstr "����(INT)"
 
-#: popthelp.c:178
+#: popthelp.c:179
 msgid "LONG"
 msgstr "����(LONG)"
 
-#: popthelp.c:179
+#: popthelp.c:180
 msgid "STRING"
 msgstr "���ڿ�(STRING)"
 
-#: popthelp.c:180
+#: popthelp.c:181
 msgid "FLOAT"
 msgstr "�Ҽ�(FLOAT)"
 
-#: popthelp.c:181
+#: popthelp.c:182
 msgid "DOUBLE"
 msgstr "�Ҽ�(DOUBLE)"
 
-#: popthelp.c:183
+#: popthelp.c:184
 msgid "ARG"
 msgstr "�μ�(ARG)"
 
-#: popthelp.c:606
+#: popthelp.c:597
 msgid "Usage:"
 msgstr "����:"
 
-#: popthelp.c:630
+#: popthelp.c:619
 msgid "[OPTION...]"
 msgstr "[�ɼ�...]"
diff --git a/po/nb.po b/po/nb.po
index 7bea27d..89be567 100644
--- a/po/nb.po
+++ b/po/nb.po
@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.12\n"
 "Report-Msgid-Bugs-To: <popt-devel@rpm5.org>\n"
-"POT-Creation-Date: 2007-09-06 08:50-0400\n"
+"POT-Creation-Date: 2007-11-14 15:19-0500\n"
 "PO-Revision-Date: 2001-06-27 11:05+0200\n"
 "Last-Translator: Kjartan Maraas <kmaraas@online.no>\n"
 "Language-Team: Norwegian <no@li.org>\n"
@@ -14,48 +14,48 @@ msgstr ""
 msgid "unknown errno"
 msgstr "ukjent errno"
 
-#: popt.c:1002
+#: popt.c:981
 #, c-format
 msgid "option type (%d) not implemented in popt\n"
 msgstr "flaggtype (%d) ikke implementert i popt\n"
 
-#: popt.c:1215
+#: popt.c:1187
 msgid "missing argument"
 msgstr "manglende argument"
 
-#: popt.c:1217
+#: popt.c:1189
 msgid "unknown option"
 msgstr "ukjent flagg"
 
-#: popt.c:1219
+#: popt.c:1191
 msgid "mutually exclusive logical operations requested"
 msgstr "gjensidig eksluderende logiske operasjoner forespurt"
 
-#: popt.c:1221
+#: popt.c:1193
 msgid "opt->arg should not be NULL"
 msgstr "opt->arg m� ikke v�re NULL"
 
-#: popt.c:1223
+#: popt.c:1195
 msgid "aliases nested too deeply"
 msgstr "aliaser med for dype l�kker"
 
-#: popt.c:1225
+#: popt.c:1197
 msgid "error in parameter quoting"
 msgstr "feil i parametersitering"
 
-#: popt.c:1227
+#: popt.c:1199
 msgid "invalid numeric value"
 msgstr "ugyldig numerisk verdi"
 
-#: popt.c:1229
+#: popt.c:1201
 msgid "number too large or too small"
 msgstr "tallet er for stort eller lite"
 
-#: popt.c:1231
+#: popt.c:1203
 msgid "memory allocation failed"
 msgstr "minneallokering feilet"
 
-#: popt.c:1235
+#: popt.c:1207
 msgid "unknown error"
 msgstr "ukjent feil"
 
@@ -71,50 +71,50 @@ msgstr "Vis kort bruksmelding"
 msgid "Display option defaults in message"
 msgstr "Vis forvalgte flagg i melding"
 
-#: popthelp.c:162
+#: popthelp.c:163
 msgid "Help options:"
 msgstr ""
 
-#: popthelp.c:163
+#: popthelp.c:164
 msgid "Options implemented via popt alias/exec:"
 msgstr ""
 
-#: popthelp.c:171
+#: popthelp.c:172
 msgid "NONE"
 msgstr "INGEN"
 
-#: popthelp.c:173
+#: popthelp.c:174
 msgid "VAL"
 msgstr "VERDI"
 
-#: popthelp.c:177
+#: popthelp.c:178
 msgid "INT"
 msgstr "HELTALL"
 
-#: popthelp.c:178
+#: popthelp.c:179
 msgid "LONG"
 msgstr "LONG"
 
-#: popthelp.c:179
+#: popthelp.c:180
 msgid "STRING"
 msgstr "STRENG"
 
-#: popthelp.c:180
+#: popthelp.c:181
 msgid "FLOAT"
 msgstr "FLYTTALL"
 
-#: popthelp.c:181
+#: popthelp.c:182
 msgid "DOUBLE"
 msgstr "DOUBLE"
 
-#: popthelp.c:183
+#: popthelp.c:184
 msgid "ARG"
 msgstr "ARG"
 
-#: popthelp.c:606
+#: popthelp.c:597
 msgid "Usage:"
 msgstr "Bruk:"
 
-#: popthelp.c:630
+#: popthelp.c:619
 msgid "[OPTION...]"
 msgstr "[FLAGG...]"
diff --git a/po/nl.po b/po/nl.po
index 08c8d91..81e1b8c 100644
--- a/po/nl.po
+++ b/po/nl.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.12\n"
 "Report-Msgid-Bugs-To: <popt-devel@rpm5.org>\n"
-"POT-Creation-Date: 2007-09-06 08:50-0400\n"
+"POT-Creation-Date: 2007-11-14 15:19-0500\n"
 "PO-Revision-Date: 2007-06-29 17:38+0200\n"
 "Last-Translator: Tim Van Holder <tim.van.holder@telenet.be>\n"
 "Language-Team: Dutch <vertaling@vrijschrift.org>\n"
@@ -19,49 +19,49 @@ msgstr ""
 msgid "unknown errno"
 msgstr "onbekende errno"
 
-#: popt.c:1002
+#: popt.c:981
 #, c-format
 msgid "option type (%d) not implemented in popt\n"
 msgstr "optietype (%d) niet geïmplementeerd in popt\n"
 
-#: popt.c:1215
+#: popt.c:1187
 msgid "missing argument"
 msgstr "ontbrekend argument"
 
-#: popt.c:1217
+#: popt.c:1189
 msgid "unknown option"
 msgstr "onbekende optie"
 
-#: popt.c:1219
+#: popt.c:1191
 msgid "mutually exclusive logical operations requested"
 msgstr "wederzijds uitgesloten logische operatoren gevraagd"
 
-#: popt.c:1221
+#: popt.c:1193
 msgid "opt->arg should not be NULL"
 msgstr "opt->arg zou niet NULL mogen zijn"
 
-#: popt.c:1223
+#: popt.c:1195
 msgid "aliases nested too deeply"
 msgstr "aliassen te diep genest"
 
 # of toch beter "quoting" behouden?
-#: popt.c:1225
+#: popt.c:1197
 msgid "error in parameter quoting"
 msgstr "fout in aanhaling van parameters"
 
-#: popt.c:1227
+#: popt.c:1199
 msgid "invalid numeric value"
 msgstr "ongelige numerische waarde"
 
-#: popt.c:1229
+#: popt.c:1201
 msgid "number too large or too small"
 msgstr "getal te klein of te groot"
 
-#: popt.c:1231
+#: popt.c:1203
 msgid "memory allocation failed"
 msgstr "geheugenreservatie mislukt"
 
-#: popt.c:1235
+#: popt.c:1207
 msgid "unknown error"
 msgstr "onbekende fout"
 
@@ -78,52 +78,52 @@ msgid "Display option defaults in message"
 msgstr "Toon standaardwaarden van opties in de tekst"
 
 # of "Help-opties:"?
-#: popthelp.c:162
+#: popthelp.c:163
 msgid "Help options:"
 msgstr "Hulp-opties:"
 
-#: popthelp.c:163
+#: popthelp.c:164
 msgid "Options implemented via popt alias/exec:"
 msgstr "Opties geïmplementeerd d.m.v. popt alias/exec:"
 
-#: popthelp.c:171
+#: popthelp.c:172
 msgid "NONE"
 msgstr "GEEN"
 
-#: popthelp.c:173
+#: popthelp.c:174
 msgid "VAL"
 msgstr "WAARDE"
 
-#: popthelp.c:177
+#: popthelp.c:178
 msgid "INT"
 msgstr "INT"
 
-#: popthelp.c:178
+#: popthelp.c:179
 msgid "LONG"
 msgstr "LONG"
 
 # TEKENREEKS lijkt me niet gepast; dus ofwel STRING behouden, ofwel TEKST
-#: popthelp.c:179
+#: popthelp.c:180
 msgid "STRING"
 msgstr "TEKST"
 
-#: popthelp.c:180
+#: popthelp.c:181
 msgid "FLOAT"
 msgstr "FLOAT"
 
-#: popthelp.c:181
+#: popthelp.c:182
 msgid "DOUBLE"
 msgstr "DOUBLE"
 
 # of hier ARGUMENT van maken?
-#: popthelp.c:183
+#: popthelp.c:184
 msgid "ARG"
 msgstr "ARG"
 
-#: popthelp.c:606
+#: popthelp.c:597
 msgid "Usage:"
 msgstr "Gebruik:"
 
-#: popthelp.c:630
+#: popthelp.c:619
 msgid "[OPTION...]"
 msgstr "[OPTIE...]"
diff --git a/po/pl.po b/po/pl.po
index 28661d5..94f318d 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.12\n"
 "Report-Msgid-Bugs-To: <popt-devel@rpm5.org>\n"
-"POT-Creation-Date: 2007-09-06 08:50-0400\n"
+"POT-Creation-Date: 2007-11-14 15:19-0500\n"
 "PO-Revision-Date: 2003-06-08 20:32+0200\n"
 "Last-Translator: Jakub Bogusz <qboosh@pld-linux.org>\n"
 "Language-Team: Polish <translation-team-pl@lists.sourceforge.net>\n"
@@ -18,48 +18,48 @@ msgstr ""
 msgid "unknown errno"
 msgstr "nieznane errno"
 
-#: popt.c:1002
+#: popt.c:981
 #, c-format
 msgid "option type (%d) not implemented in popt\n"
 msgstr "rodzaj opcji (%d) nie zaimplementowany w popt\n"
 
-#: popt.c:1215
+#: popt.c:1187
 msgid "missing argument"
 msgstr "brak parametru"
 
-#: popt.c:1217
+#: popt.c:1189
 msgid "unknown option"
 msgstr "nieznana opcja"
 
-#: popt.c:1219
+#: popt.c:1191
 msgid "mutually exclusive logical operations requested"
 msgstr "żądanie wykluczających się operacji"
 
-#: popt.c:1221
+#: popt.c:1193
 msgid "opt->arg should not be NULL"
 msgstr "opt->arg nie może być NULL"
 
-#: popt.c:1223
+#: popt.c:1195
 msgid "aliases nested too deeply"
 msgstr "zbyt duże zagłębienie aliasów"
 
-#: popt.c:1225
+#: popt.c:1197
 msgid "error in parameter quoting"
 msgstr "błąd w cytowaniu parametru"
 
-#: popt.c:1227
+#: popt.c:1199
 msgid "invalid numeric value"
 msgstr "błędna wartość liczbowa"
 
-#: popt.c:1229
+#: popt.c:1201
 msgid "number too large or too small"
 msgstr "liczba zbyt duża lub zbyt mała"
 
-#: popt.c:1231
+#: popt.c:1203
 msgid "memory allocation failed"
 msgstr "błąd alokacji pamięci"
 
-#: popt.c:1235
+#: popt.c:1207
 msgid "unknown error"
 msgstr "nieznany błąd"
 
@@ -75,50 +75,50 @@ msgstr "Wyświetl skrócony sposób użycia"
 msgid "Display option defaults in message"
 msgstr "Wyświetl domyślne opcje w opisie"
 
-#: popthelp.c:162
+#: popthelp.c:163
 msgid "Help options:"
 msgstr "Opcje pomocy:"
 
-#: popthelp.c:163
+#: popthelp.c:164
 msgid "Options implemented via popt alias/exec:"
 msgstr "Opcje zaimplementowane poprzez popt alias/exec:"
 
-#: popthelp.c:171
+#: popthelp.c:172
 msgid "NONE"
 msgstr "BRAK"
 
-#: popthelp.c:173
+#: popthelp.c:174
 msgid "VAL"
 msgstr "WART"
 
-#: popthelp.c:177
+#: popthelp.c:178
 msgid "INT"
 msgstr "INT"
 
-#: popthelp.c:178
+#: popthelp.c:179
 msgid "LONG"
 msgstr "LONG"
 
-#: popthelp.c:179
+#: popthelp.c:180
 msgid "STRING"
 msgstr "ŁAŃCUCH"
 
-#: popthelp.c:180
+#: popthelp.c:181
 msgid "FLOAT"
 msgstr "FLOAT"
 
-#: popthelp.c:181
+#: popthelp.c:182
 msgid "DOUBLE"
 msgstr "DOUBLE"
 
-#: popthelp.c:183
+#: popthelp.c:184
 msgid "ARG"
 msgstr "PARAM"
 
-#: popthelp.c:606
+#: popthelp.c:597
 msgid "Usage:"
 msgstr "Użycie:"
 
-#: popthelp.c:630
+#: popthelp.c:619
 msgid "[OPTION...]"
 msgstr "[OPCJA...]"
diff --git a/po/popt.pot b/po/popt.pot
index 36d2189..1408ad3 100644
--- a/po/popt.pot
+++ b/po/popt.pot
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: <popt-devel@rpm5.org>\n"
-"POT-Creation-Date: 2007-09-06 08:50-0400\n"
+"POT-Creation-Date: 2007-11-14 15:19-0500\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -19,48 +19,48 @@ msgstr ""
 msgid "unknown errno"
 msgstr ""
 
-#: popt.c:1002
+#: popt.c:981
 #, c-format
 msgid "option type (%d) not implemented in popt\n"
 msgstr ""
 
-#: popt.c:1215
+#: popt.c:1187
 msgid "missing argument"
 msgstr ""
 
-#: popt.c:1217
+#: popt.c:1189
 msgid "unknown option"
 msgstr ""
 
-#: popt.c:1219
+#: popt.c:1191
 msgid "mutually exclusive logical operations requested"
 msgstr ""
 
-#: popt.c:1221
+#: popt.c:1193
 msgid "opt->arg should not be NULL"
 msgstr ""
 
-#: popt.c:1223
+#: popt.c:1195
 msgid "aliases nested too deeply"
 msgstr ""
 
-#: popt.c:1225
+#: popt.c:1197
 msgid "error in parameter quoting"
 msgstr ""
 
-#: popt.c:1227
+#: popt.c:1199
 msgid "invalid numeric value"
 msgstr ""
 
-#: popt.c:1229
+#: popt.c:1201
 msgid "number too large or too small"
 msgstr ""
 
-#: popt.c:1231
+#: popt.c:1203
 msgid "memory allocation failed"
 msgstr ""
 
-#: popt.c:1235
+#: popt.c:1207
 msgid "unknown error"
 msgstr ""
 
@@ -76,50 +76,50 @@ msgstr ""
 msgid "Display option defaults in message"
 msgstr ""
 
-#: popthelp.c:162
+#: popthelp.c:163
 msgid "Help options:"
 msgstr ""
 
-#: popthelp.c:163
+#: popthelp.c:164
 msgid "Options implemented via popt alias/exec:"
 msgstr ""
 
-#: popthelp.c:171
+#: popthelp.c:172
 msgid "NONE"
 msgstr ""
 
-#: popthelp.c:173
+#: popthelp.c:174
 msgid "VAL"
 msgstr ""
 
-#: popthelp.c:177
+#: popthelp.c:178
 msgid "INT"
 msgstr ""
 
-#: popthelp.c:178
+#: popthelp.c:179
 msgid "LONG"
 msgstr ""
 
-#: popthelp.c:179
+#: popthelp.c:180
 msgid "STRING"
 msgstr ""
 
-#: popthelp.c:180
+#: popthelp.c:181
 msgid "FLOAT"
 msgstr ""
 
-#: popthelp.c:181
+#: popthelp.c:182
 msgid "DOUBLE"
 msgstr ""
 
-#: popthelp.c:183
+#: popthelp.c:184
 msgid "ARG"
 msgstr ""
 
-#: popthelp.c:606
+#: popthelp.c:597
 msgid "Usage:"
 msgstr ""
 
-#: popthelp.c:630
+#: popthelp.c:619
 msgid "[OPTION...]"
 msgstr ""
diff --git a/po/pt.po b/po/pt.po
index bc5d444..fcd9cfc 100644
--- a/po/pt.po
+++ b/po/pt.po
@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.12\n"
 "Report-Msgid-Bugs-To: <popt-devel@rpm5.org>\n"
-"POT-Creation-Date: 2007-09-06 08:50-0400\n"
+"POT-Creation-Date: 2007-11-14 15:19-0500\n"
 "PO-Revision-Date: 2002-02-13 18:32+0000\n"
 "Last-Translator: Pedro Morais <morais@kde.org>\n"
 "Language-Team: pt <morais@kde.org>\n"
@@ -14,48 +14,48 @@ msgstr ""
 msgid "unknown errno"
 msgstr "errno desconhecido"
 
-#: popt.c:1002
+#: popt.c:981
 #, c-format
 msgid "option type (%d) not implemented in popt\n"
 msgstr "tipo de op��o (%d) n�o implementado no popt\n"
 
-#: popt.c:1215
+#: popt.c:1187
 msgid "missing argument"
 msgstr "falta um argumento"
 
-#: popt.c:1217
+#: popt.c:1189
 msgid "unknown option"
 msgstr "op��o desconhecida"
 
-#: popt.c:1219
+#: popt.c:1191
 msgid "mutually exclusive logical operations requested"
 msgstr "foram pedidas opera��es l�gicas mutuamente exclusivas"
 
-#: popt.c:1221
+#: popt.c:1193
 msgid "opt->arg should not be NULL"
 msgstr "opt->arg n�o deve ser NULL"
 
-#: popt.c:1223
+#: popt.c:1195
 msgid "aliases nested too deeply"
 msgstr "'aliases' demasiado aninhados"
 
-#: popt.c:1225
+#: popt.c:1197
 msgid "error in parameter quoting"
 msgstr "erros no 'quoting' de par�metros"
 
-#: popt.c:1227
+#: popt.c:1199
 msgid "invalid numeric value"
 msgstr "valor n�merico inv�lido"
 
-#: popt.c:1229
+#: popt.c:1201
 msgid "number too large or too small"
 msgstr "n�mero demasiado grando ou pequeno"
 
-#: popt.c:1231
+#: popt.c:1203
 msgid "memory allocation failed"
 msgstr "aloca��o de mem�ria falhou"
 
-#: popt.c:1235
+#: popt.c:1207
 msgid "unknown error"
 msgstr "erro desconhecido"
 
@@ -71,50 +71,50 @@ msgstr "Mostrar uma mensagem de utiliza
 msgid "Display option defaults in message"
 msgstr "Mostrar valor por omiss�o das op��es na mensagem"
 
-#: popthelp.c:162
+#: popthelp.c:163
 msgid "Help options:"
 msgstr ""
 
-#: popthelp.c:163
+#: popthelp.c:164
 msgid "Options implemented via popt alias/exec:"
 msgstr ""
 
-#: popthelp.c:171
+#: popthelp.c:172
 msgid "NONE"
 msgstr "NONE"
 
-#: popthelp.c:173
+#: popthelp.c:174
 msgid "VAL"
 msgstr "VAL"
 
-#: popthelp.c:177
+#: popthelp.c:178
 msgid "INT"
 msgstr "INT"
 
-#: popthelp.c:178
+#: popthelp.c:179
 msgid "LONG"
 msgstr "LONG"
 
-#: popthelp.c:179
+#: popthelp.c:180
 msgid "STRING"
 msgstr "STRING"
 
-#: popthelp.c:180
+#: popthelp.c:181
 msgid "FLOAT"
 msgstr "FLOAT"
 
-#: popthelp.c:181
+#: popthelp.c:182
 msgid "DOUBLE"
 msgstr "DOUBLE"
 
-#: popthelp.c:183
+#: popthelp.c:184
 msgid "ARG"
 msgstr "ARG"
 
-#: popthelp.c:606
+#: popthelp.c:597
 msgid "Usage:"
 msgstr "Utiliza��o:"
 
-#: popthelp.c:630
+#: popthelp.c:619
 msgid "[OPTION...]"
 msgstr "[OP��O...]"
diff --git a/po/ro.po b/po/ro.po
index 131dbcb..0ad225f 100644
--- a/po/ro.po
+++ b/po/ro.po
@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.12\n"
 "Report-Msgid-Bugs-To: <popt-devel@rpm5.org>\n"
-"POT-Creation-Date: 2007-09-06 08:50-0400\n"
+"POT-Creation-Date: 2007-11-14 15:19-0500\n"
 "PO-Revision-Date: 2000-06-14 23:23+EST\n"
 "Last-Translator: Cristian Gafton <gafton@redhat.com>\n"
 "Language-Team: Romanian <ro@li.org>\n"
@@ -14,49 +14,49 @@ msgstr ""
 msgid "unknown errno"
 msgstr "eroare necunoscuta"
 
-#: popt.c:1002
+#: popt.c:981
 #, c-format
 msgid "option type (%d) not implemented in popt\n"
 msgstr "optiunea de tipul (%d) nu este implementata in popt\n"
 
-#: popt.c:1215
+#: popt.c:1187
 msgid "missing argument"
 msgstr "argument lipsa"
 
-#: popt.c:1217
+#: popt.c:1189
 msgid "unknown option"
 msgstr "optiune necunoscuta"
 
-#: popt.c:1219
+#: popt.c:1191
 msgid "mutually exclusive logical operations requested"
 msgstr ""
 
-#: popt.c:1221
+#: popt.c:1193
 msgid "opt->arg should not be NULL"
 msgstr ""
 
-#: popt.c:1223
+#: popt.c:1195
 msgid "aliases nested too deeply"
 msgstr "recursivitate infinita la optiunile sinonime"
 
-#: popt.c:1225
+#: popt.c:1197
 #, fuzzy
 msgid "error in parameter quoting"
 msgstr "eroare la insertie parametru"
 
-#: popt.c:1227
+#: popt.c:1199
 msgid "invalid numeric value"
 msgstr "valoare numarica invalida"
 
-#: popt.c:1229
+#: popt.c:1201
 msgid "number too large or too small"
 msgstr "numar prea mare sau prea mic"
 
-#: popt.c:1231
+#: popt.c:1203
 msgid "memory allocation failed"
 msgstr ""
 
-#: popt.c:1235
+#: popt.c:1207
 msgid "unknown error"
 msgstr "eroare necuinoscuta"
 
@@ -73,50 +73,50 @@ msgstr "Afisare mesaj sintaxa sumar"
 msgid "Display option defaults in message"
 msgstr "Afisare mesaj sintaxa sumar"
 
-#: popthelp.c:162
+#: popthelp.c:163
 msgid "Help options:"
 msgstr ""
 
-#: popthelp.c:163
+#: popthelp.c:164
 msgid "Options implemented via popt alias/exec:"
 msgstr ""
 
-#: popthelp.c:171
+#: popthelp.c:172
 msgid "NONE"
 msgstr ""
 
-#: popthelp.c:173
+#: popthelp.c:174
 msgid "VAL"
 msgstr ""
 
-#: popthelp.c:177
+#: popthelp.c:178
 msgid "INT"
 msgstr ""
 
-#: popthelp.c:178
+#: popthelp.c:179
 msgid "LONG"
 msgstr ""
 
-#: popthelp.c:179
+#: popthelp.c:180
 msgid "STRING"
 msgstr ""
 
-#: popthelp.c:180
+#: popthelp.c:181
 msgid "FLOAT"
 msgstr ""
 
-#: popthelp.c:181
+#: popthelp.c:182
 msgid "DOUBLE"
 msgstr ""
 
-#: popthelp.c:183
+#: popthelp.c:184
 msgid "ARG"
 msgstr ""
 
-#: popthelp.c:606
+#: popthelp.c:597
 msgid "Usage:"
 msgstr "Sintaxa:"
 
-#: popthelp.c:630
+#: popthelp.c:619
 msgid "[OPTION...]"
 msgstr "[OPTIUNE...]"
diff --git a/po/ru.po b/po/ru.po
index 021ac59..1db6e60 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.12\n"
 "Report-Msgid-Bugs-To: <popt-devel@rpm5.org>\n"
-"POT-Creation-Date: 2007-09-06 08:50-0400\n"
+"POT-Creation-Date: 2007-11-14 15:19-0500\n"
 "PO-Revision-Date: 2001-07-05 21:00-0500\n"
 "Last-Translator: Eugene Kanter <eugene@blackcatlinux.com>\n"
 "Language-Team: Black Cat Linux Team <blackcat-support@blackcatlinux.com>\n"
@@ -14,48 +14,48 @@ msgstr ""
 msgid "unknown errno"
 msgstr "����������� ����� ������"
 
-#: popt.c:1002
+#: popt.c:981
 #, c-format
 msgid "option type (%d) not implemented in popt\n"
 msgstr "��������� ��������� (%d) � popt �� �������������\n"
 
-#: popt.c:1215
+#: popt.c:1187
 msgid "missing argument"
 msgstr "�������� ��������"
 
-#: popt.c:1217
+#: popt.c:1189
 msgid "unknown option"
 msgstr "����������� ��������"
 
-#: popt.c:1219
+#: popt.c:1191
 msgid "mutually exclusive logical operations requested"
 msgstr "��������� ������� ����������� ���������� ��������"
 
-#: popt.c:1221
+#: popt.c:1193
 msgid "opt->arg should not be NULL"
 msgstr "opt->arg �� ����� ���� NULL"
 
-#: popt.c:1223
+#: popt.c:1195
 msgid "aliases nested too deeply"
 msgstr "�������� ������� ���������� �������� �����������"
 
-#: popt.c:1225
+#: popt.c:1197
 msgid "error in parameter quoting"
 msgstr "�����a ��������� ���������� � �������"
 
-#: popt.c:1227
+#: popt.c:1199
 msgid "invalid numeric value"
 msgstr "������������ �������� ��������"
 
-#: popt.c:1229
+#: popt.c:1201
 msgid "number too large or too small"
 msgstr "�������� �������� �� ��������� ����������������"
 
-#: popt.c:1231
+#: popt.c:1203
 msgid "memory allocation failed"
 msgstr "������ ��������� ������"
 
-#: popt.c:1235
+#: popt.c:1207
 msgid "unknown error"
 msgstr "����������� ������"
 
@@ -71,50 +71,50 @@ msgstr "
 msgid "Display option defaults in message"
 msgstr "�������� ��������� �� ���������"
 
-#: popthelp.c:162
+#: popthelp.c:163
 msgid "Help options:"
 msgstr ""
 
-#: popthelp.c:163
+#: popthelp.c:164
 msgid "Options implemented via popt alias/exec:"
 msgstr ""
 
-#: popthelp.c:171
+#: popthelp.c:172
 msgid "NONE"
 msgstr "NONE"
 
-#: popthelp.c:173
+#: popthelp.c:174
 msgid "VAL"
 msgstr "VAL"
 
-#: popthelp.c:177
+#: popthelp.c:178
 msgid "INT"
 msgstr "INT"
 
-#: popthelp.c:178
+#: popthelp.c:179
 msgid "LONG"
 msgstr "LONG"
 
-#: popthelp.c:179
+#: popthelp.c:180
 msgid "STRING"
 msgstr "STRING"
 
-#: popthelp.c:180
+#: popthelp.c:181
 msgid "FLOAT"
 msgstr "FLOAT"
 
-#: popthelp.c:181
+#: popthelp.c:182
 msgid "DOUBLE"
 msgstr "DOUBLE"
 
-#: popthelp.c:183
+#: popthelp.c:184
 msgid "ARG"
 msgstr "ARG"
 
-#: popthelp.c:606
+#: popthelp.c:597
 msgid "Usage:"
 msgstr "�������������:"
 
-#: popthelp.c:630
+#: popthelp.c:619
 msgid "[OPTION...]"
 msgstr "[��������...]"
diff --git a/po/sk.po b/po/sk.po
index 1911018..35df79f 100644
--- a/po/sk.po
+++ b/po/sk.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.12\n"
 "Report-Msgid-Bugs-To: <popt-devel@rpm5.org>\n"
-"POT-Creation-Date: 2007-09-06 08:50-0400\n"
+"POT-Creation-Date: 2007-11-14 15:19-0500\n"
 "PO-Revision-Date: 1999-08-04 21:40+0200\n"
 "Last-Translator: Stanislav Meduna <stano@eunet.sk>\n"
 "Language-Team: Slovak <sk-i18n@rak.isternet.sk>\n"
@@ -18,48 +18,48 @@ msgstr ""
 msgid "unknown errno"
 msgstr ""
 
-#: popt.c:1002
+#: popt.c:981
 #, c-format
 msgid "option type (%d) not implemented in popt\n"
 msgstr ""
 
-#: popt.c:1215
+#: popt.c:1187
 msgid "missing argument"
 msgstr ""
 
-#: popt.c:1217
+#: popt.c:1189
 msgid "unknown option"
 msgstr ""
 
-#: popt.c:1219
+#: popt.c:1191
 msgid "mutually exclusive logical operations requested"
 msgstr ""
 
-#: popt.c:1221
+#: popt.c:1193
 msgid "opt->arg should not be NULL"
 msgstr ""
 
-#: popt.c:1223
+#: popt.c:1195
 msgid "aliases nested too deeply"
 msgstr ""
 
-#: popt.c:1225
+#: popt.c:1197
 msgid "error in parameter quoting"
 msgstr ""
 
-#: popt.c:1227
+#: popt.c:1199
 msgid "invalid numeric value"
 msgstr ""
 
-#: popt.c:1229
+#: popt.c:1201
 msgid "number too large or too small"
 msgstr ""
 
-#: popt.c:1231
+#: popt.c:1203
 msgid "memory allocation failed"
 msgstr ""
 
-#: popt.c:1235
+#: popt.c:1207
 msgid "unknown error"
 msgstr ""
 
@@ -76,50 +76,50 @@ msgstr "Zobrazi
 msgid "Display option defaults in message"
 msgstr "Zobrazi� stru�n� n�vod na pou�itie"
 
-#: popthelp.c:162
+#: popthelp.c:163
 msgid "Help options:"
 msgstr ""
 
-#: popthelp.c:163
+#: popthelp.c:164
 msgid "Options implemented via popt alias/exec:"
 msgstr ""
 
-#: popthelp.c:171
+#: popthelp.c:172
 msgid "NONE"
 msgstr ""
 
-#: popthelp.c:173
+#: popthelp.c:174
 msgid "VAL"
 msgstr ""
 
-#: popthelp.c:177
+#: popthelp.c:178
 msgid "INT"
 msgstr ""
 
-#: popthelp.c:178
+#: popthelp.c:179
 msgid "LONG"
 msgstr ""
 
-#: popthelp.c:179
+#: popthelp.c:180
 msgid "STRING"
 msgstr ""
 
-#: popthelp.c:180
+#: popthelp.c:181
 msgid "FLOAT"
 msgstr ""
 
-#: popthelp.c:181
+#: popthelp.c:182
 msgid "DOUBLE"
 msgstr ""
 
-#: popthelp.c:183
+#: popthelp.c:184
 msgid "ARG"
 msgstr ""
 
-#: popthelp.c:606
+#: popthelp.c:597
 msgid "Usage:"
 msgstr ""
 
-#: popthelp.c:630
+#: popthelp.c:619
 msgid "[OPTION...]"
 msgstr ""
diff --git a/po/sl.po b/po/sl.po
index f7e6f73..b875289 100644
--- a/po/sl.po
+++ b/po/sl.po
@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.12\n"
 "Report-Msgid-Bugs-To: <popt-devel@rpm5.org>\n"
-"POT-Creation-Date: 2007-09-06 08:50-0400\n"
+"POT-Creation-Date: 2007-11-14 15:19-0500\n"
 "PO-Revision-Date: 2000-09-05 12:30+0200\n"
 "Last-Translator: Roman Maurer <roman.maurer@hermes.si>\n"
 "Language-Team: Slovenian <sl@li.org>\n"
@@ -14,48 +14,48 @@ msgstr ""
 msgid "unknown errno"
 msgstr ""
 
-#: popt.c:1002
+#: popt.c:981
 #, c-format
 msgid "option type (%d) not implemented in popt\n"
 msgstr ""
 
-#: popt.c:1215
+#: popt.c:1187
 msgid "missing argument"
 msgstr ""
 
-#: popt.c:1217
+#: popt.c:1189
 msgid "unknown option"
 msgstr ""
 
-#: popt.c:1219
+#: popt.c:1191
 msgid "mutually exclusive logical operations requested"
 msgstr ""
 
-#: popt.c:1221
+#: popt.c:1193
 msgid "opt->arg should not be NULL"
 msgstr ""
 
-#: popt.c:1223
+#: popt.c:1195
 msgid "aliases nested too deeply"
 msgstr ""
 
-#: popt.c:1225
+#: popt.c:1197
 msgid "error in parameter quoting"
 msgstr ""
 
-#: popt.c:1227
+#: popt.c:1199
 msgid "invalid numeric value"
 msgstr ""
 
-#: popt.c:1229
+#: popt.c:1201
 msgid "number too large or too small"
 msgstr ""
 
-#: popt.c:1231
+#: popt.c:1203
 msgid "memory allocation failed"
 msgstr ""
 
-#: popt.c:1235
+#: popt.c:1207
 msgid "unknown error"
 msgstr ""
 
@@ -72,50 +72,50 @@ msgstr "Prika
 msgid "Display option defaults in message"
 msgstr "Prika�i kratko sporo�ilo o uporabi"
 
-#: popthelp.c:162
+#: popthelp.c:163
 msgid "Help options:"
 msgstr ""
 
-#: popthelp.c:163
+#: popthelp.c:164
 msgid "Options implemented via popt alias/exec:"
 msgstr ""
 
-#: popthelp.c:171
+#: popthelp.c:172
 msgid "NONE"
 msgstr ""
 
-#: popthelp.c:173
+#: popthelp.c:174
 msgid "VAL"
 msgstr ""
 
-#: popthelp.c:177
+#: popthelp.c:178
 msgid "INT"
 msgstr ""
 
-#: popthelp.c:178
+#: popthelp.c:179
 msgid "LONG"
 msgstr ""
 
-#: popthelp.c:179
+#: popthelp.c:180
 msgid "STRING"
 msgstr ""
 
-#: popthelp.c:180
+#: popthelp.c:181
 msgid "FLOAT"
 msgstr ""
 
-#: popthelp.c:181
+#: popthelp.c:182
 msgid "DOUBLE"
 msgstr ""
 
-#: popthelp.c:183
+#: popthelp.c:184
 msgid "ARG"
 msgstr ""
 
-#: popthelp.c:606
+#: popthelp.c:597
 msgid "Usage:"
 msgstr ""
 
-#: popthelp.c:630
+#: popthelp.c:619
 msgid "[OPTION...]"
 msgstr ""
diff --git a/po/sv.po b/po/sv.po
index 0afa9bf..5697bc0 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.12\n"
 "Report-Msgid-Bugs-To: <popt-devel@rpm5.org>\n"
-"POT-Creation-Date: 2007-09-06 08:50-0400\n"
+"POT-Creation-Date: 2007-11-14 15:19-0500\n"
 "PO-Revision-Date: 2007-06-12 22:00+0200\n"
 "Last-Translator: G�ran Uddeborg <goeran@uddeborg.se>\n"
 "Language-Team: Swedish <tp-sv@listor.tp-sv.se>\n"
@@ -14,48 +14,48 @@ msgstr ""
 msgid "unknown errno"
 msgstr "ok�nt felnummer"
 
-#: popt.c:1002
+#: popt.c:981
 #, c-format
 msgid "option type (%d) not implemented in popt\n"
 msgstr "flaggtypen (%d) �r inte implementerad i popt\n"
 
-#: popt.c:1215
+#: popt.c:1187
 msgid "missing argument"
 msgstr "argument saknas"
 
-#: popt.c:1217
+#: popt.c:1189
 msgid "unknown option"
 msgstr "ok�nd flagga"
 
-#: popt.c:1219
+#: popt.c:1191
 msgid "mutually exclusive logical operations requested"
 msgstr "�msesidigt uteslutande logiska operationer beg�rdes"
 
-#: popt.c:1221
+#: popt.c:1193
 msgid "opt->arg should not be NULL"
 msgstr "opt->arg f�r inte vara NULL"
 
-#: popt.c:1223
+#: popt.c:1195
 msgid "aliases nested too deeply"
 msgstr "alias �r n�stlade f�r djupt"
 
-#: popt.c:1225
+#: popt.c:1197
 msgid "error in parameter quoting"
 msgstr "fel i parametercitering"
 
-#: popt.c:1227
+#: popt.c:1199
 msgid "invalid numeric value"
 msgstr "ogiltigt numeriskt v�rde"
 
-#: popt.c:1229
+#: popt.c:1201
 msgid "number too large or too small"
 msgstr "talet f�r stort eller f�r litet"
 
-#: popt.c:1231
+#: popt.c:1203
 msgid "memory allocation failed"
 msgstr "minnesallokering misslyckades"
 
-#: popt.c:1235
+#: popt.c:1207
 msgid "unknown error"
 msgstr "ok�nt fel"
 
@@ -71,50 +71,50 @@ msgstr "Visa en kortfattad anv
 msgid "Display option defaults in message"
 msgstr "Visa standardalternativ f�r flaggor i meddelande"
 
-#: popthelp.c:162
+#: popthelp.c:163
 msgid "Help options:"
 msgstr "Hj�lpflaggor:"
 
-#: popthelp.c:163
+#: popthelp.c:164
 msgid "Options implemented via popt alias/exec:"
 msgstr "Flaggor implementerade via popt-alias/exec:"
 
-#: popthelp.c:171
+#: popthelp.c:172
 msgid "NONE"
 msgstr "INGET"
 
-#: popthelp.c:173
+#: popthelp.c:174
 msgid "VAL"
 msgstr "V�RDE"
 
-#: popthelp.c:177
+#: popthelp.c:178
 msgid "INT"
 msgstr "HELTAL"
 
-#: popthelp.c:178
+#: popthelp.c:179
 msgid "LONG"
 msgstr "L�NG"
 
-#: popthelp.c:179
+#: popthelp.c:180
 msgid "STRING"
 msgstr "STR�NG"
 
-#: popthelp.c:180
+#: popthelp.c:181
 msgid "FLOAT"
 msgstr "FLYTTAL"
 
-#: popthelp.c:181
+#: popthelp.c:182
 msgid "DOUBLE"
 msgstr "DUBBEL"
 
-#: popthelp.c:183
+#: popthelp.c:184
 msgid "ARG"
 msgstr "ARG"
 
-#: popthelp.c:606
+#: popthelp.c:597
 msgid "Usage:"
 msgstr "Anv�ndning:"
 
-#: popthelp.c:630
+#: popthelp.c:619
 msgid "[OPTION...]"
 msgstr "[FLAGGA...]"
diff --git a/po/tr.po b/po/tr.po
index 6b5b364..415a605 100644
--- a/po/tr.po
+++ b/po/tr.po
@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.12\n"
 "Report-Msgid-Bugs-To: <popt-devel@rpm5.org>\n"
-"POT-Creation-Date: 2007-09-06 08:50-0400\n"
+"POT-Creation-Date: 2007-11-14 15:19-0500\n"
 "PO-Revision-Date: 2000-02-11 13:01+0200\n"
 "Last-Translator: Nilgun Belma Buguner <nilgun@technologist.com>\n"
 "Language-Team: Turkish <tr@li.org>\n"
@@ -14,48 +14,48 @@ msgstr ""
 msgid "unknown errno"
 msgstr "bilinmeyen hata no"
 
-#: popt.c:1002
+#: popt.c:981
 #, c-format
 msgid "option type (%d) not implemented in popt\n"
 msgstr "se�enek t�r� (%d) popt i�in ge�ersiz\n"
 
-#: popt.c:1215
+#: popt.c:1187
 msgid "missing argument"
 msgstr "arg�man eksik"
 
-#: popt.c:1217
+#: popt.c:1189
 msgid "unknown option"
 msgstr "bilinmeyen se�enek"
 
-#: popt.c:1219
+#: popt.c:1191
 msgid "mutually exclusive logical operations requested"
 msgstr "birbirini d��layan mant�ksal i�lemler istendi"
 
-#: popt.c:1221
+#: popt.c:1193
 msgid "opt->arg should not be NULL"
 msgstr ""
 
-#: popt.c:1223
+#: popt.c:1195
 msgid "aliases nested too deeply"
 msgstr "adlarda �ok fazla i�i�elikler"
 
-#: popt.c:1225
+#: popt.c:1197
 msgid "error in parameter quoting"
 msgstr "parametrelerde t�rnak i�aretleme hatal� "
 
-#: popt.c:1227
+#: popt.c:1199
 msgid "invalid numeric value"
 msgstr "say�sal de�er ge�ersiz"
 
-#: popt.c:1229
+#: popt.c:1201
 msgid "number too large or too small"
 msgstr "say� ya �ok b�y�k ya da �ok k���k"
 
-#: popt.c:1231
+#: popt.c:1203
 msgid "memory allocation failed"
 msgstr ""
 
-#: popt.c:1235
+#: popt.c:1207
 msgid "unknown error"
 msgstr "bilinmeyen hata"
 
@@ -72,50 +72,50 @@ msgstr "K
 msgid "Display option defaults in message"
 msgstr "K�sa bir kullan�m iletisi g�ster"
 
-#: popthelp.c:162
+#: popthelp.c:163
 msgid "Help options:"
 msgstr ""
 
-#: popthelp.c:163
+#: popthelp.c:164
 msgid "Options implemented via popt alias/exec:"
 msgstr ""
 
-#: popthelp.c:171
+#: popthelp.c:172
 msgid "NONE"
 msgstr "YOK"
 
-#: popthelp.c:173
+#: popthelp.c:174
 msgid "VAL"
 msgstr "DE�"
 
-#: popthelp.c:177
+#: popthelp.c:178
 msgid "INT"
 msgstr "INT"
 
-#: popthelp.c:178
+#: popthelp.c:179
 msgid "LONG"
 msgstr "LONG"
 
-#: popthelp.c:179
+#: popthelp.c:180
 msgid "STRING"
 msgstr "STRING"
 
-#: popthelp.c:180
+#: popthelp.c:181
 msgid "FLOAT"
 msgstr "FLOAT"
 
-#: popthelp.c:181
+#: popthelp.c:182
 msgid "DOUBLE"
 msgstr "DOUBLE"
 
-#: popthelp.c:183
+#: popthelp.c:184
 msgid "ARG"
 msgstr "ARG"
 
-#: popthelp.c:606
+#: popthelp.c:597
 msgid "Usage:"
 msgstr "Kullan�m�:"
 
-#: popthelp.c:630
+#: popthelp.c:619
 msgid "[OPTION...]"
 msgstr "[SE�ENEK...]"
diff --git a/po/uk.po b/po/uk.po
index dc1d45f..bd91b48 100644
--- a/po/uk.po
+++ b/po/uk.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.12\n"
 "Report-Msgid-Bugs-To: <popt-devel@rpm5.org>\n"
-"POT-Creation-Date: 2007-09-06 08:50-0400\n"
+"POT-Creation-Date: 2007-11-14 15:19-0500\n"
 "PO-Revision-Date: 1999-09-30 16:54+0200\n"
 "Last-Translator: Yuri Syrota <rasta@renome.rovno.ua>\n"
 "Language-Team: Ukrainian <uk@li.org>\n"
@@ -18,48 +18,48 @@ msgstr ""
 msgid "unknown errno"
 msgstr ""
 
-#: popt.c:1002
+#: popt.c:981
 #, c-format
 msgid "option type (%d) not implemented in popt\n"
 msgstr ""
 
-#: popt.c:1215
+#: popt.c:1187
 msgid "missing argument"
 msgstr ""
 
-#: popt.c:1217
+#: popt.c:1189
 msgid "unknown option"
 msgstr ""
 
-#: popt.c:1219
+#: popt.c:1191
 msgid "mutually exclusive logical operations requested"
 msgstr ""
 
-#: popt.c:1221
+#: popt.c:1193
 msgid "opt->arg should not be NULL"
 msgstr ""
 
-#: popt.c:1223
+#: popt.c:1195
 msgid "aliases nested too deeply"
 msgstr ""
 
-#: popt.c:1225
+#: popt.c:1197
 msgid "error in parameter quoting"
 msgstr ""
 
-#: popt.c:1227
+#: popt.c:1199
 msgid "invalid numeric value"
 msgstr ""
 
-#: popt.c:1229
+#: popt.c:1201
 msgid "number too large or too small"
 msgstr ""
 
-#: popt.c:1231
+#: popt.c:1203
 msgid "memory allocation failed"
 msgstr ""
 
-#: popt.c:1235
+#: popt.c:1207
 msgid "unknown error"
 msgstr ""
 
@@ -76,50 +76,50 @@ msgstr "
 msgid "Display option defaults in message"
 msgstr "�������� ������� ��צ��� ��� ������������"
 
-#: popthelp.c:162
+#: popthelp.c:163
 msgid "Help options:"
 msgstr ""
 
-#: popthelp.c:163
+#: popthelp.c:164
 msgid "Options implemented via popt alias/exec:"
 msgstr ""
 
-#: popthelp.c:171
+#: popthelp.c:172
 msgid "NONE"
 msgstr ""
 
-#: popthelp.c:173
+#: popthelp.c:174
 msgid "VAL"
 msgstr ""
 
-#: popthelp.c:177
+#: popthelp.c:178
 msgid "INT"
 msgstr ""
 
-#: popthelp.c:178
+#: popthelp.c:179
 msgid "LONG"
 msgstr ""
 
-#: popthelp.c:179
+#: popthelp.c:180
 msgid "STRING"
 msgstr ""
 
-#: popthelp.c:180
+#: popthelp.c:181
 msgid "FLOAT"
 msgstr ""
 
-#: popthelp.c:181
+#: popthelp.c:182
 msgid "DOUBLE"
 msgstr ""
 
-#: popthelp.c:183
+#: popthelp.c:184
 msgid "ARG"
 msgstr ""
 
-#: popthelp.c:606
+#: popthelp.c:597
 msgid "Usage:"
 msgstr ""
 
-#: popthelp.c:630
+#: popthelp.c:619
 msgid "[OPTION...]"
 msgstr ""
diff --git a/po/vi.po b/po/vi.po
index 517db5a..9b0bbd4 100644
--- a/po/vi.po
+++ b/po/vi.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.12\n"
 "Report-Msgid-Bugs-To: <popt-devel@rpm5.org>\n"
-"POT-Creation-Date: 2007-09-06 08:50-0400\n"
+"POT-Creation-Date: 2007-11-14 15:19-0500\n"
 "PO-Revision-Date: 2007-07-12 22:37+0930\n"
 "Last-Translator: Clytie Siddall <clytie@riverland.net.au>\n"
 "Language-Team: Vietnamese <vi-VN@googlegroups.com>\n"
@@ -20,48 +20,48 @@ msgstr ""
 msgid "unknown errno"
 msgstr "số hiệu lỗi không rõ"
 
-#: popt.c:1002
+#: popt.c:981
 #, c-format
 msgid "option type (%d) not implemented in popt\n"
 msgstr "kiểu tùy chọn (%d) chưa được thực hiện trong popt\n"
 
-#: popt.c:1215
+#: popt.c:1187
 msgid "missing argument"
 msgstr "thiếu đối số"
 
-#: popt.c:1217
+#: popt.c:1189
 msgid "unknown option"
 msgstr "tùy chọn không rõ"
 
-#: popt.c:1219
+#: popt.c:1191
 msgid "mutually exclusive logical operations requested"
 msgstr "các thao tác hợp lý loại từ lẫn nhau được yêu cầu"
 
-#: popt.c:1221
+#: popt.c:1193
 msgid "opt->arg should not be NULL"
 msgstr "« tùy chọn->đối số » không thể vô giá trị"
 
-#: popt.c:1223
+#: popt.c:1195
 msgid "aliases nested too deeply"
 msgstr "các bí danh lồng nhau quá sâu"
 
-#: popt.c:1225
+#: popt.c:1197
 msgid "error in parameter quoting"
 msgstr "gặp lỗi trong lời trích dẫn tham số"
 
-#: popt.c:1227
+#: popt.c:1199
 msgid "invalid numeric value"
 msgstr "giá trị thuộc số không hợp lệ"
 
-#: popt.c:1229
+#: popt.c:1201
 msgid "number too large or too small"
 msgstr "con số quá lớn hay quá nhỏ"
 
-#: popt.c:1231
+#: popt.c:1203
 msgid "memory allocation failed"
 msgstr "lỗi cấp phát bộ nhớ"
 
-#: popt.c:1235
+#: popt.c:1207
 msgid "unknown error"
 msgstr "lỗi không rõ"
 
@@ -77,50 +77,50 @@ msgstr "Hiển thị thông điệp cách sử dụng ngắn"
 msgid "Display option defaults in message"
 msgstr "Hiển thị các giá trị mặc định của tùy chọn trong thông điệp"
 
-#: popthelp.c:162
+#: popthelp.c:163
 msgid "Help options:"
 msgstr "Tùy chọn trợ giúp:"
 
-#: popthelp.c:163
+#: popthelp.c:164
 msgid "Options implemented via popt alias/exec:"
 msgstr "Các tùy chọn được thực hiện thông qua popt alias/exec:"
 
-#: popthelp.c:171
+#: popthelp.c:172
 msgid "NONE"
 msgstr "KHÔNG CÓ"
 
-#: popthelp.c:173
+#: popthelp.c:174
 msgid "VAL"
 msgstr "GIÁ TRỊ"
 
-#: popthelp.c:177
+#: popthelp.c:178
 msgid "INT"
 msgstr "SỐ NGUYÊN"
 
-#: popthelp.c:178
+#: popthelp.c:179
 msgid "LONG"
 msgstr "DÀI"
 
-#: popthelp.c:179
+#: popthelp.c:180
 msgid "STRING"
 msgstr "CHUỖI"
 
-#: popthelp.c:180
+#: popthelp.c:181
 msgid "FLOAT"
 msgstr "NỔI"
 
-#: popthelp.c:181
+#: popthelp.c:182
 msgid "DOUBLE"
 msgstr "ĐÔI"
 
-#: popthelp.c:183
+#: popthelp.c:184
 msgid "ARG"
 msgstr "ĐỐI SỐ"
 
-#: popthelp.c:606
+#: popthelp.c:597
 msgid "Usage:"
 msgstr "Cách sử dụng:"
 
-#: popthelp.c:630
+#: popthelp.c:619
 msgid "[OPTION...]"
 msgstr "[TÙY_CHỌN...]"
diff --git a/po/wa.po b/po/wa.po
index a83ca1c..87860c6 100644
--- a/po/wa.po
+++ b/po/wa.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.12\n"
 "Report-Msgid-Bugs-To: <popt-devel@rpm5.org>\n"
-"POT-Creation-Date: 2007-09-06 08:50-0400\n"
+"POT-Creation-Date: 2007-11-14 15:19-0500\n"
 "PO-Revision-Date: 1999-03-18 23:11+0100\n"
 "Last-Translator: Nobody yet\n"
 "Language-Team: walon <linux-wa@chanae.alphanet.ch>\n"
@@ -22,48 +22,48 @@ msgstr ""
 msgid "unknown errno"
 msgstr ""
 
-#: popt.c:1002
+#: popt.c:981
 #, c-format
 msgid "option type (%d) not implemented in popt\n"
 msgstr ""
 
-#: popt.c:1215
+#: popt.c:1187
 msgid "missing argument"
 msgstr ""
 
-#: popt.c:1217
+#: popt.c:1189
 msgid "unknown option"
 msgstr ""
 
-#: popt.c:1219
+#: popt.c:1191
 msgid "mutually exclusive logical operations requested"
 msgstr ""
 
-#: popt.c:1221
+#: popt.c:1193
 msgid "opt->arg should not be NULL"
 msgstr ""
 
-#: popt.c:1223
+#: popt.c:1195
 msgid "aliases nested too deeply"
 msgstr ""
 
-#: popt.c:1225
+#: popt.c:1197
 msgid "error in parameter quoting"
 msgstr ""
 
-#: popt.c:1227
+#: popt.c:1199
 msgid "invalid numeric value"
 msgstr ""
 
-#: popt.c:1229
+#: popt.c:1201
 msgid "number too large or too small"
 msgstr ""
 
-#: popt.c:1231
+#: popt.c:1203
 msgid "memory allocation failed"
 msgstr ""
 
-#: popt.c:1235
+#: popt.c:1207
 msgid "unknown error"
 msgstr ""
 
@@ -80,50 +80,50 @@ msgstr "Mostre on court messaedje so kmint vos 
 msgid "Display option defaults in message"
 msgstr "Mostre on court messaedje so kmint vos � siervi"
 
-#: popthelp.c:162
+#: popthelp.c:163
 msgid "Help options:"
 msgstr ""
 
-#: popthelp.c:163
+#: popthelp.c:164
 msgid "Options implemented via popt alias/exec:"
 msgstr ""
 
-#: popthelp.c:171
+#: popthelp.c:172
 msgid "NONE"
 msgstr ""
 
-#: popthelp.c:173
+#: popthelp.c:174
 msgid "VAL"
 msgstr ""
 
-#: popthelp.c:177
+#: popthelp.c:178
 msgid "INT"
 msgstr ""
 
-#: popthelp.c:178
+#: popthelp.c:179
 msgid "LONG"
 msgstr ""
 
-#: popthelp.c:179
+#: popthelp.c:180
 msgid "STRING"
 msgstr ""
 
-#: popthelp.c:180
+#: popthelp.c:181
 msgid "FLOAT"
 msgstr ""
 
-#: popthelp.c:181
+#: popthelp.c:182
 msgid "DOUBLE"
 msgstr ""
 
-#: popthelp.c:183
+#: popthelp.c:184
 msgid "ARG"
 msgstr ""
 
-#: popthelp.c:606
+#: popthelp.c:597
 msgid "Usage:"
 msgstr ""
 
-#: popthelp.c:630
+#: popthelp.c:619
 msgid "[OPTION...]"
 msgstr ""
diff --git a/po/zh_CN.po b/po/zh_CN.po
index 7cce9a7..ea12746 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.12\n"
 "Report-Msgid-Bugs-To: <popt-devel@rpm5.org>\n"
-"POT-Creation-Date: 2007-09-06 08:50-0400\n"
+"POT-Creation-Date: 2007-11-14 15:19-0500\n"
 "PO-Revision-Date: 2007-08-13 22:32+0800\n"
 "Last-Translator: LI Daobing <lidaobing@gmail.com>\n"
 "Language-Team: Chinese (simplified) <translation-team-zh-cn@lists."
@@ -21,48 +21,48 @@ msgstr ""
 msgid "unknown errno"
 msgstr "未知的错误"
 
-#: popt.c:1002
+#: popt.c:981
 #, c-format
 msgid "option type (%d) not implemented in popt\n"
 msgstr "选项类别 (%d) 没有在 popt 中实现\n"
 
-#: popt.c:1215
+#: popt.c:1187
 msgid "missing argument"
 msgstr "缺少参数"
 
-#: popt.c:1217
+#: popt.c:1189
 msgid "unknown option"
 msgstr "未知的选项"
 
-#: popt.c:1219
+#: popt.c:1191
 msgid "mutually exclusive logical operations requested"
 msgstr "需要 XOR 逻辑运算"
 
-#: popt.c:1221
+#: popt.c:1193
 msgid "opt->arg should not be NULL"
 msgstr "opt->arg 不应该为 NULL"
 
-#: popt.c:1223
+#: popt.c:1195
 msgid "aliases nested too deeply"
 msgstr "别名嵌套太深"
 
-#: popt.c:1225
+#: popt.c:1197
 msgid "error in parameter quoting"
 msgstr "参数引号错误"
 
-#: popt.c:1227
+#: popt.c:1199
 msgid "invalid numeric value"
 msgstr "无效的数值"
 
-#: popt.c:1229
+#: popt.c:1201
 msgid "number too large or too small"
 msgstr "数值太大或太小"
 
-#: popt.c:1231
+#: popt.c:1203
 msgid "memory allocation failed"
 msgstr "内存分配错误"
 
-#: popt.c:1235
+#: popt.c:1207
 msgid "unknown error"
 msgstr "未知的错误"
 
@@ -78,50 +78,50 @@ msgstr "显示简短的使用说明"
 msgid "Display option defaults in message"
 msgstr "在信息中显示默认的选项"
 
-#: popthelp.c:162
+#: popthelp.c:163
 msgid "Help options:"
 msgstr "帮助选项:"
 
-#: popthelp.c:163
+#: popthelp.c:164
 msgid "Options implemented via popt alias/exec:"
 msgstr "通过 popt alias/exec 实现的选项:"
 
-#: popthelp.c:171
+#: popthelp.c:172
 msgid "NONE"
 msgstr "NONE"
 
-#: popthelp.c:173
+#: popthelp.c:174
 msgid "VAL"
 msgstr "VAL"
 
-#: popthelp.c:177
+#: popthelp.c:178
 msgid "INT"
 msgstr "INT"
 
-#: popthelp.c:178
+#: popthelp.c:179
 msgid "LONG"
 msgstr "LONG"
 
-#: popthelp.c:179
+#: popthelp.c:180
 msgid "STRING"
 msgstr "STRING"
 
-#: popthelp.c:180
+#: popthelp.c:181
 msgid "FLOAT"
 msgstr "FLOAT"
 
-#: popthelp.c:181
+#: popthelp.c:182
 msgid "DOUBLE"
 msgstr "DOUBLE"
 
-#: popthelp.c:183
+#: popthelp.c:184
 msgid "ARG"
 msgstr "ARG"
 
-#: popthelp.c:606
+#: popthelp.c:597
 msgid "Usage:"
 msgstr "用法:"
 
-#: popthelp.c:630
+#: popthelp.c:619
 msgid "[OPTION...]"
 msgstr "[选项...]"
-- 
Gitee


From e348099b2653cc9dcbeba9f7688daca98179620a Mon Sep 17 00:00:00 2001
From: Jeff Johnson <n3npq@mac.com>
Date: Tue, 11 Dec 2007 22:02:40 +0000
Subject: [PATCH 480/667] - jbj: add a %track section (as in rpm-5.0) to
 popt.spec. - jbj: chg poptGetOptArg() to "char *", document application needs
 to free.

---
 CHANGES      |  5 +++++
 configure.ac |  2 +-
 popt.3       |  3 ++-
 popt.c       | 10 +++++-----
 popt.h       |  2 +-
 popt.spec    |  9 ++++++++-
 poptint.h    |  2 +-
 7 files changed, 23 insertions(+), 10 deletions(-)

diff --git a/CHANGES b/CHANGES
index 0940bc5..51c61f9 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,4 +1,9 @@
+1.13 -> 1.14:
+
 1.12 -> 1.13:
+    - release popt-1.13.
+    - jbj: add a %track section (as in rpm-5.0) to popt.spec.
+    - jbj: chg poptGetOptArg() to "char *", document application needs to free.
     - jbj: re-add it.po (from Sandro Bonazzola <sandro.bonazzola@gmail.com>).
     - jbj: rescuscitate the splint annotations.
     - jbj: change sizeof to use the type implicitly, rather than explicitly.
diff --git a/configure.ac b/configure.ac
index 94745e2..c366848 100755
--- a/configure.ac
+++ b/configure.ac
@@ -1,5 +1,5 @@
 AC_PREREQ(2.57)
-AC_INIT(popt, 1.12, popt-devel@rpm5.org)
+AC_INIT(popt, 1.13, popt-devel@rpm5.org)
 AC_CANONICAL_TARGET
 AC_CONFIG_SRCDIR([popt.h])
 AC_CONFIG_HEADERS([config.h])
diff --git a/popt.3 b/popt.3
index 5da0c1f..66eedb0 100644
--- a/popt.3
+++ b/popt.3
@@ -362,11 +362,12 @@ ways to discover them. One is to ask popt to fill in a variable with the
 .sp
 .nf
 .B #include <popt.h>
-.BI "const char * poptGetOptArg(poptContext " con ");"
+.BI "char * poptGetOptArg(poptContext " con ");"
 .fi
 .sp
 This function returns the argument given for the final option returned by
 .BR poptGetNextOpt() ", or it returns " NULL " if no argument was specified."
+The calling function is responsible for deallocating this string.
 .sp
 .SS "4. LEFTOVER ARGUMENTS"
 Many applications take an arbitrary number of command-line arguments,
diff --git a/popt.c b/popt.c
index c5ae711..ca0acc4 100644
--- a/popt.c
+++ b/popt.c
@@ -869,10 +869,10 @@ int poptGetNextOpt(poptContext con)
 	    con->os->nextArg = _free(con->os->nextArg);
 	    if (longArg) {
 		longArg = expandNextArg(con, longArg);
-		con->os->nextArg = longArg;
+		con->os->nextArg = (char *) longArg;
 	    } else if (con->os->nextCharArg) {
 		longArg = expandNextArg(con, con->os->nextCharArg);
-		con->os->nextArg = longArg;
+		con->os->nextArg = (char *) longArg;
 		con->os->nextCharArg = NULL;
 	    } else {
 		while (con->os->next == con->os->argc &&
@@ -903,7 +903,7 @@ int poptGetNextOpt(poptContext con)
 			    /* XXX watchout: subtle side-effects live here. */
 			    longArg = con->os->argv[con->os->next++];
 			    longArg = expandNextArg(con, longArg);
-			    con->os->nextArg = longArg;
+			    con->os->nextArg = (char *) longArg;
 			}
 		    }
 		}
@@ -1025,9 +1025,9 @@ int poptGetNextOpt(poptContext con)
     return (opt ? opt->val : -1);	/* XXX can't happen */
 }
 
-const char * poptGetOptArg(poptContext con)
+char * poptGetOptArg(poptContext con)
 {
-    const char * ret = NULL;
+    char * ret = NULL;
     if (con) {
 	ret = con->os->nextArg;
 	con->os->nextArg = NULL;
diff --git a/popt.h b/popt.h
index bbea7d3..9300ec9 100644
--- a/popt.h
+++ b/popt.h
@@ -271,7 +271,7 @@ int poptGetNextOpt(/*@null@*/poptContext con)
  * @return		option argument, NULL if no argument is available
  */
 /*@observer@*/ /*@null@*/ /*@unused@*/
-const char * poptGetOptArg(/*@null@*/poptContext con)
+char * poptGetOptArg(/*@null@*/poptContext con)
 	/*@modifies con @*/;
 
 /** \ingroup popt
diff --git a/popt.spec b/popt.spec
index 8fbe66b..1ecf044 100644
--- a/popt.spec
+++ b/popt.spec
@@ -1,6 +1,6 @@
 Summary: A C library for parsing command line parameters.
 Name: popt
-Version: 1.12
+Version: 1.13
 Release: 1
 License: X Consortium
 Group: System Environment/Libraries
@@ -30,6 +30,13 @@ rm -rf $RPM_BUILD_ROOT
 make DESTDIR=$RPM_BUILD_ROOT install
 %find_lang popt
 
+%track
+prog popt = {
+    version   = %{version}
+    url       = http://rpm5.org/%{name}
+    regex     = %{name}-(\d+\.\d+\.\d+)\.tar\.gz
+}
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
diff --git a/poptint.h b/poptint.h
index 7a7f1bb..414dd60 100644
--- a/poptint.h
+++ b/poptint.h
@@ -50,7 +50,7 @@ struct optionStackEntry {
     pbm_set * argb;
     int next;
 /*@only@*/ /*@null@*/
-    const char * nextArg;
+    char * nextArg;
 /*@observer@*/ /*@null@*/
     const char * nextCharArg;
 /*@dependent@*/ /*@null@*/
-- 
Gitee


From 5d9f3eb3e314ad75eba127837652414e8f9c4605 Mon Sep 17 00:00:00 2001
From: Jeff Johnson <n3npq@mac.com>
Date: Thu, 13 Dec 2007 19:05:13 +0000
Subject: [PATCH 481/667] - tag popt-1_13-release, V++ == 1.14.

---
 configure.ac | 2 +-
 popt.spec    | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/configure.ac b/configure.ac
index c366848..ab89240 100755
--- a/configure.ac
+++ b/configure.ac
@@ -1,5 +1,5 @@
 AC_PREREQ(2.57)
-AC_INIT(popt, 1.13, popt-devel@rpm5.org)
+AC_INIT(popt, 1.14, popt-devel@rpm5.org)
 AC_CANONICAL_TARGET
 AC_CONFIG_SRCDIR([popt.h])
 AC_CONFIG_HEADERS([config.h])
diff --git a/popt.spec b/popt.spec
index 1ecf044..5d65703 100644
--- a/popt.spec
+++ b/popt.spec
@@ -1,6 +1,6 @@
 Summary: A C library for parsing command line parameters.
 Name: popt
-Version: 1.13
+Version: 1.14
 Release: 1
 License: X Consortium
 Group: System Environment/Libraries
-- 
Gitee


From c4e6667914b8c2c845a16a324a93f75802bb48df Mon Sep 17 00:00:00 2001
From: Jeff Johnson <n3npq@mac.com>
Date: Mon, 11 Feb 2008 16:48:11 +0000
Subject: [PATCH 482/667] - jbj: autogen.sh: on linux, add --libdir=/lib.

---
 CHANGES    | 1 +
 autogen.sh | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/CHANGES b/CHANGES
index 51c61f9..f77d3a8 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,4 +1,5 @@
 1.13 -> 1.14:
+    - jbj: autogen.sh: on linux, add --libdir=/lib.
 
 1.12 -> 1.13:
     - release popt-1.13.
diff --git a/autogen.sh b/autogen.sh
index e1867b7..a0212f4 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -32,7 +32,7 @@ fi
 cd "$THEDIR"
 
 if [ X"$@" = X  -a "X`uname -s`" = "XLinux" ]; then
-    $srcdir/configure --prefix=/usr "$@"
+    $srcdir/configure --prefix=/usr --libdir=/lib "$@"
 else
     $srcdir/configure "$@"
 fi
-- 
Gitee


From 18b3b270cadfb7ec9c9dcf06f69b720be9a8265a Mon Sep 17 00:00:00 2001
From: Jeff Johnson <n3npq@mac.com>
Date: Mon, 11 Feb 2008 16:49:33 +0000
Subject: [PATCH 483/667] - jbj: remove duplicate nb locale from ALL_LINGUAS.

---
 CHANGES      | 1 +
 configure.ac | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/CHANGES b/CHANGES
index f77d3a8..f1ad272 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,4 +1,5 @@
 1.13 -> 1.14:
+    - jbj: remove duplicate nb locale from ALL_LINGUAS.
     - jbj: autogen.sh: on linux, add --libdir=/lib.
 
 1.12 -> 1.13:
diff --git a/configure.ac b/configure.ac
index ab89240..c6796a7 100755
--- a/configure.ac
+++ b/configure.ac
@@ -14,7 +14,7 @@ AC_SUBST(LT_AGE, 8)
 
 AM_INIT_AUTOMAKE([foreign])
 
-ALL_LINGUAS="cs da de es fr ga gl hu is it ja ko nb nl nb pl pt ro ru sk sl sv tr uk vi wa zh_CN"
+ALL_LINGUAS="cs da de es fr ga gl hu is it ja ko nb nl pl pt ro ru sk sl sv tr uk vi wa zh_CN"
 
 AC_PROG_CC
 AC_PROG_INSTALL
-- 
Gitee


From cccde405e019c7202f5e1e3ebf6e25ef902e8579 Mon Sep 17 00:00:00 2001
From: Jeff Johnson <n3npq@mac.com>
Date: Mon, 11 Feb 2008 16:52:18 +0000
Subject: [PATCH 484/667] - jbj: remove multiple config.rpath entries.

---
 Makefile.am | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Makefile.am b/Makefile.am
index 6acc573..c21053d 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -4,7 +4,7 @@ AUTOMAKE_OPTIONS = 1.4 foreign
 
 LINT = splint
 
-EXTRA_DIST = config.rpath  config.rpath autogen.sh CHANGES $(man_MANS) popt.spec libpopt.vers \
+EXTRA_DIST = config.rpath autogen.sh CHANGES $(man_MANS) popt.spec libpopt.vers \
 	testit.sh test-poptrc test3-data/0* \
 	po/*.in po/*.po po/popt.pot \
 	popt.ps
-- 
Gitee


From b8f0ad4a6f5c5593b5a441c0d0611a0d65ade23f Mon Sep 17 00:00:00 2001
From: Jeff Johnson <n3npq@mac.com>
Date: Mon, 11 Feb 2008 16:55:36 +0000
Subject: [PATCH 485/667] - jbj: add .cvsignore to m4 subdirectory.

---
 CHANGES | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGES b/CHANGES
index f1ad272..9b50ff3 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,4 +1,5 @@
 1.13 -> 1.14:
+    - jbj: add .cvsignore to m4 subdirectory.
     - jbj: remove duplicate nb locale from ALL_LINGUAS.
     - jbj: autogen.sh: on linux, add --libdir=/lib.
 
-- 
Gitee


From 069e718ad793b19a46993acdfa0e578eeab5893f Mon Sep 17 00:00:00 2001
From: Jeff Johnson <n3npq@mac.com>
Date: Mon, 11 Feb 2008 17:06:13 +0000
Subject: [PATCH 486/667] - oops.

---
 m4/.cvsignore | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 m4/.cvsignore

diff --git a/m4/.cvsignore b/m4/.cvsignore
new file mode 100644
index 0000000..0f4126c
--- /dev/null
+++ b/m4/.cvsignore
@@ -0,0 +1 @@
+*.m4
-- 
Gitee


From deda4d27a2b8b011b323503e24cb97207102a8f8 Mon Sep 17 00:00:00 2001
From: Jeff Johnson <n3npq@mac.com>
Date: Mon, 11 Feb 2008 17:06:25 +0000
Subject: [PATCH 487/667] - jbj: add --libdir=/%{_lib} to popt.spec.

---
 CHANGES   | 3 ++-
 popt.spec | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/CHANGES b/CHANGES
index 9b50ff3..644ab9b 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,7 +1,8 @@
 1.13 -> 1.14:
+    - jbj: add --libdir=/%{_lib} to popt.spec.
     - jbj: add .cvsignore to m4 subdirectory.
     - jbj: remove duplicate nb locale from ALL_LINGUAS.
-    - jbj: autogen.sh: on linux, add --libdir=/lib.
+    - jbj: autogen.sh: on linux, add --libdir=/lib (no /lib64 autodetect yet).
 
 1.12 -> 1.13:
     - release popt-1.13.
diff --git a/popt.spec b/popt.spec
index 5d65703..a6491fc 100644
--- a/popt.spec
+++ b/popt.spec
@@ -22,7 +22,7 @@ shell-like rules.
 %setup -q
 
 %build
-%configure
+%configure --libdir=/%{_lib}
 make
 
 %install
-- 
Gitee


From 66f38137883cd1cd8234985c816d50dd4c953401 Mon Sep 17 00:00:00 2001
From: Jeff Johnson <n3npq@mac.com>
Date: Mon, 11 Feb 2008 17:16:21 +0000
Subject: [PATCH 488/667] - jbj: POPT_AUTOALIAS: if no popt aliases/execs,
 don't display the sub-head.

---
 CHANGES    | 1 +
 popthelp.c | 3 +++
 2 files changed, 4 insertions(+)

diff --git a/CHANGES b/CHANGES
index 644ab9b..c21920a 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,4 +1,5 @@
 1.13 -> 1.14:
+    - jbj: POPT_AUTOALIAS: if no popt aliases/execs, don't display the sub-head.
     - jbj: add --libdir=/%{_lib} to popt.spec.
     - jbj: add .cvsignore to m4 subdirectory.
     - jbj: remove duplicate nb locale from ALL_LINGUAS.
diff --git a/popthelp.c b/popthelp.c
index 3d1312f..85f5599 100644
--- a/popthelp.c
+++ b/popthelp.c
@@ -576,6 +576,9 @@ static void singleTableHelp(poptContext con, FILE * fp,
 	if (sub_transdom == NULL)
 	    sub_transdom = translation_domain;
 	    
+	/* If no popt aliases/execs, skip poptAliasOption processing. */
+	if (opt->arg == poptAliasOptions && !(con->numAliases || con->numExecs))
+	    continue;
 	if (opt->descrip)
 	    xx = POPT_fprintf(fp, "\n%s\n", D_(sub_transdom, opt->descrip));
 
-- 
Gitee


From f81c3d55f9823a3fd67e328f470613cc2b068efa Mon Sep 17 00:00:00 2001
From: Jeff Johnson <n3npq@mac.com>
Date: Mon, 11 Feb 2008 19:46:59 +0000
Subject: [PATCH 489/667] - jbj: opt->argDescrip[0] determines "--foo=bar" or
 "--foo bar". - jbj: --long always padded for alignment with/without "-X, ". -
 jbj: Display shortName iff printable non-space.

---
 CHANGES    |   3 ++
 popthelp.c | 133 +++++++++++++++++++++++++++--------------------------
 2 files changed, 72 insertions(+), 64 deletions(-)

diff --git a/CHANGES b/CHANGES
index c21920a..499f647 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,4 +1,7 @@
 1.13 -> 1.14:
+    - jbj: opt->argDescrip[0] determines "--foo=bar" or "--foo bar".
+    - jbj: --long always padded for alignment with/without "-X, ".
+    - jbj: Display shortName iff printable non-space.
     - jbj: POPT_AUTOALIAS: if no popt aliases/execs, don't display the sub-head.
     - jbj: add --libdir=/%{_lib} to popt.spec.
     - jbj: add .cvsignore to m4 subdirectory.
diff --git a/popthelp.c b/popthelp.c
index 85f5599..3cdc54f 100644
--- a/popthelp.c
+++ b/popthelp.c
@@ -276,6 +276,9 @@ static void singleOptionHelp(FILE * fp, columns_t columns,
     size_t lineLength = columns->max - indentLength;
     const char * help = D_(translation_domain, opt->descrip);
     const char * argDescrip = getArgDescrip(opt, translation_domain);
+    /* Display shortName iff printable non-space. */
+    int prtshort = (isprint((int)opt->shortName) && opt->shortName != ' ');
+    int prtlong = (opt->longName != NULL);
     size_t helpLength;
     char * defs = NULL;
     char * left;
@@ -292,18 +295,20 @@ static void singleOptionHelp(FILE * fp, columns_t columns,
     left[0] = '\0';
     left[maxLeftCol] = '\0';
 
-    if (opt->longName && opt->shortName)
+    if (!(prtshort || prtlong))
+	goto out;
+    if (prtshort && prtlong)
 	sprintf(left, "-%c, %s%s", opt->shortName,
 		((opt->argInfo & POPT_ARGFLAG_ONEDASH) ? "-" : "--"),
 		opt->longName);
-    else if (opt->shortName != '\0') 
+    else if (prtshort) 
 	sprintf(left, "-%c", opt->shortName);
-    else if (opt->longName)
-	sprintf(left, "%s%s",
+    else if (prtlong)
+	/* XXX --long always padded for alignment with/without "-X, ". */
+	sprintf(left, "    %s%s",
 		((opt->argInfo & POPT_ARG_MASK) == POPT_ARG_MAINCALL ? "" :
 		((opt->argInfo & POPT_ARGFLAG_ONEDASH) ? "-" : "--")),
 		opt->longName);
-    if (!*left) goto out;
 
     if (argDescrip) {
 	char * le = left + strlen(left);
@@ -381,8 +386,10 @@ static void singleOptionHelp(FILE * fp, columns_t columns,
 	} else {
 	    size_t lelen;
 
-	    *le++ = ((opt->argInfo & POPT_ARG_MASK) == POPT_ARG_MAINCALL)
-		? ' ' : '=';
+	    /* XXX argDescrip[0] determines "--foo=bar" or "--foo bar". */
+	    if (!strchr(" =(", argDescrip[0]))
+		*le++ = ((opt->argInfo & POPT_ARG_MASK) == POPT_ARG_MAINCALL)
+			? ' ' : '=';
 	    strcpy(le, argDescrip);
 	    lelen = strlen(le);
 	    le += lelen;
@@ -393,7 +400,7 @@ static void singleOptionHelp(FILE * fp, columns_t columns,
 		size_t n;
 
 		memset ((void *)&t, 0, sizeof (t));	/* In initial state.  */
-		/* Determine number of characters.  */
+		/* Determine number of display characters.  */
 		n = mbsrtowcs (NULL, &scopy, strlen(scopy), &t);
 
 		displaypad = (int) (lelen-n);
@@ -413,9 +420,8 @@ static void singleOptionHelp(FILE * fp, columns_t columns,
     }
 
     left = _free(left);
-    if (defs) {
+    if (defs)
 	help = defs;
-    }
 
     helpLength = strlen(help);
     while (helpLength > lineLength) {
@@ -471,8 +477,8 @@ static size_t maxArgWidth(const struct poptOption * opt,
 	    if (len > max) max = len;
 	} else if (!(opt->argInfo & POPT_ARGFLAG_DOC_HIDDEN)) {
 	    len = sizeof("  ")-1;
-	    if (opt->shortName != '\0') len += sizeof("-X")-1;
-	    if (opt->shortName != '\0' && opt->longName) len += sizeof(", ")-1;
+	    /* XXX --long always padded for alignment with/without "-X, ". */
+	    len += sizeof("-X, ")-1;
 	    if (opt->longName) {
 		len += ((opt->argInfo & POPT_ARGFLAG_ONEDASH)
 			? sizeof("-")-1 : sizeof("--")-1);
@@ -481,27 +487,27 @@ static size_t maxArgWidth(const struct poptOption * opt,
 
 	    s = getArgDescrip(opt, translation_domain);
 
-#ifdef POPT_WCHAR_HACK
 	    /* XXX Calculate no. of display characters. */
 	    if (s) {
+		size_t n;
+#ifdef POPT_WCHAR_HACK
 		const char * scopy = s;
 		mbstate_t t;
-		size_t n;
 
 		memset ((void *)&t, 0, sizeof (t));	/* In initial state.  */
-		/* Determine number of characters.  */
+		/* Determine number of display characters.  */
 		n = mbsrtowcs (NULL, &scopy, strlen(scopy), &t);
-		len += sizeof("=")-1 + n;
-	    }
 #else
-	    if (s)
-		len += sizeof("=")-1 + strlen(s);
+		n = strlen(s);
 #endif
+		/* XXX argDescrip[0] determines "--foo=bar" or "--foo bar". */
+		if (!strchr(" =(", s[0])) len += sizeof("=")-1;
+		len += n;
+	    }
 
 	    if (opt->argInfo & POPT_ARGFLAG_OPTIONAL) len += sizeof("[]")-1;
 	    if (len > max) max = len;
 	}
-
 	opt++;
     }
     
@@ -642,66 +648,63 @@ static size_t singleOptionUsage(FILE * fp, columns_t columns,
 	/*@globals fileSystem @*/
 	/*@modifies fp, columns->cur, fileSystem @*/
 {
-    size_t len = (size_t)4;
-    char shortStr[2] = { '\0', '\0' };
-    const char * item = shortStr;
+    size_t len = sizeof(" []") - 1;
     const char * argDescrip = getArgDescrip(opt, translation_domain);
-    int bingo = 0;
-
-    if (opt->shortName != '\0' && opt->longName != NULL) {
-	len += 2;
-	if (!(opt->argInfo & POPT_ARGFLAG_ONEDASH)) len++;
-	len += strlen(opt->longName);
-	bingo++;
-    } else if (opt->shortName != '\0') {
-	len++;
-	shortStr[0] = opt->shortName;
-	shortStr[1] = '\0';
-	bingo++;
-    } else if (opt->longName) {
+    /* Display shortName iff printable non-space. */
+    int prtshort = (isprint((int)opt->shortName) && opt->shortName != ' ');
+    int prtlong = (opt->longName != NULL);
+
+    if (!(prtshort || prtlong))
+	return columns->cur;
+
+    len = sizeof(" []") - 1;
+    if (prtshort)
+	len += sizeof("-c") - 1;
+    if (prtlong) {
+	if (prtshort) len += sizeof("|") - 1;
+	len += ((opt->argInfo & POPT_ARGFLAG_ONEDASH)
+		? sizeof("-") : sizeof("--")) - 1;
 	len += strlen(opt->longName);
-	if (!(opt->argInfo & POPT_ARGFLAG_ONEDASH)) len++;
-	item = opt->longName;
-	bingo++;
     }
 
-    if (!bingo) return columns->cur;
-
+    if (argDescrip) {
+	size_t n;
 #ifdef POPT_WCHAR_HACK
     /* XXX Calculate no. of display characters. */
-    if (argDescrip) {
 	const char * scopy = argDescrip;
 	mbstate_t t;
-	size_t n;
 
 	memset ((void *)&t, 0, sizeof (t));	/* In initial state.  */
-	/* Determine number of characters.  */
+	/* Determine number of display characters.  */
 	n = mbsrtowcs (NULL, &scopy, strlen(scopy), &t);
-	len += sizeof("=")-1 + n;
-    }
 #else
-    if (argDescrip) 
-	len += sizeof("=")-1 + strlen(argDescrip);
+	n = strlen(argDescrip);
 #endif
+	/* XXX argDescrip[0] determines "--foo=bar" or "--foo bar". */
+	if (!strchr(" =(", argDescrip[0])) len += sizeof("=")-1;
+	len += n;
+    }
 
     if ((columns->cur + len) > columns->max) {
 	fprintf(fp, "\n       ");
 	columns->cur = (size_t)7;
     } 
 
-    if (opt->longName && opt->shortName) {
-	fprintf(fp, " [-%c|-%s%s%s%s]",
-	    opt->shortName, ((opt->argInfo & POPT_ARGFLAG_ONEDASH) ? "" : "-"),
-	    opt->longName,
-	    (argDescrip ? " " : ""),
-	    (argDescrip ? argDescrip : ""));
-    } else {
-	fprintf(fp, " [-%s%s%s%s]",
-	    ((opt->shortName || (opt->argInfo & POPT_ARGFLAG_ONEDASH)) ? "" : "-"),
-	    item,
-	    (argDescrip ? (opt->shortName != '\0' ? " " : "=") : ""),
-	    (argDescrip ? argDescrip : ""));
+    fprintf(fp, " [");
+    if (prtshort)
+	fprintf(fp, "-%c", opt->shortName);
+    if (prtlong) {
+	fprintf(fp, "%s%s%s",
+		(prtshort ? "|" : ""),
+		((opt->argInfo & POPT_ARGFLAG_ONEDASH) ? "-" : "--"),
+		opt->longName);
+    }
+    if (argDescrip) {
+	/* XXX argDescrip[0] determines "--foo=bar" or "--foo bar". */
+	if (!strchr(" =(", argDescrip[0])) fprintf(fp, "=");
+	fprintf(fp, "%s", argDescrip);
     }
+    fprintf(fp, "]");
 
     return columns->cur + len + 1;
 }
@@ -770,7 +773,7 @@ static size_t singleTableUsage(poptContext con, FILE * fp, columns_t columns,
 	    translation_domain = (const char *)opt->arg;
 	} else if ((opt->argInfo & POPT_ARG_MASK) == POPT_ARG_INCLUDE_TABLE) {
 	    if (done) {
-		int i;
+		int i = 0;
 		if (done->opts != NULL)
 		for (i = 0; i < done->nopts; i++) {
 		    const void * that = done->opts[i];
@@ -819,9 +822,11 @@ static size_t showShortOptions(const struct poptOption * opt, FILE * fp,
 
     if (opt != NULL)
     for (; (opt->longName || opt->shortName || opt->arg); opt++) {
-	if (opt->shortName && !(opt->argInfo & POPT_ARG_MASK))
-	    s[strlen(s)] = opt->shortName;
-	else if ((opt->argInfo & POPT_ARG_MASK) == POPT_ARG_INCLUDE_TABLE)
+	if (opt->shortName && !(opt->argInfo & POPT_ARG_MASK)) {
+	    /* Display shortName iff printable non-space. */
+	    if (isprint((int)opt->shortName) && opt->shortName != ' ')
+		s[strlen(s)] = opt->shortName;
+	} else if ((opt->argInfo & POPT_ARG_MASK) == POPT_ARG_INCLUDE_TABLE)
 	    if (opt->arg)	/* XXX program error */
 		len = showShortOptions(opt->arg, fp, s);
     } 
-- 
Gitee


From 8061b0cd970ce7921ccdd645b90d24238fe450f5 Mon Sep 17 00:00:00 2001
From: Jeff Johnson <n3npq@mac.com>
Date: Mon, 11 Feb 2008 20:49:29 +0000
Subject: [PATCH 490/667] - jbj: include "-- Terminate options" end-of-options
 msg in poptHelpOptions.

---
 CHANGES    | 1 +
 popthelp.c | 2 ++
 2 files changed, 3 insertions(+)

diff --git a/CHANGES b/CHANGES
index 499f647..d038361 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,4 +1,5 @@
 1.13 -> 1.14:
+    - jbj: include "-- Terminate options" end-of-options msg in poptHelpOptions.
     - jbj: opt->argDescrip[0] determines "--foo=bar" or "--foo bar".
     - jbj: --long always padded for alignment with/without "-X, ".
     - jbj: Display shortName iff printable non-space.
diff --git a/popthelp.c b/popthelp.c
index 3cdc54f..aa0651d 100644
--- a/popthelp.c
+++ b/popthelp.c
@@ -73,6 +73,7 @@ struct poptOption poptHelpOptions[] = {
   { NULL, '\0', POPT_ARG_CALLBACK, (void *)displayArgs, 0, NULL, NULL },
   { "help", '?', 0, NULL, (int)'?', N_("Show this help message"), NULL },
   { "usage", '\0', 0, NULL, (int)'u', N_("Display brief usage message"), NULL },
+  { "", '\0',	0, NULL, 0, N_("Terminate options"), NULL },
     POPT_TABLEEND
 } ;
 
@@ -88,6 +89,7 @@ static struct poptOption poptHelpOptions2[] = {
   { "defaults", '\0', POPT_ARG_NONE, &show_option_defaults, 0,
 	N_("Display option defaults in message"), NULL },
 #endif
+  { "", '\0',	0, NULL, 0, N_("Terminate options"), NULL },
     POPT_TABLEEND
 } ;
 
-- 
Gitee


From 95915b9fdcee645cdd802c27db00d52fe617f883 Mon Sep 17 00:00:00 2001
From: Jeff Johnson <n3npq@mac.com>
Date: Tue, 12 Feb 2008 21:32:33 +0000
Subject: [PATCH 491/667] - jbj: start using poptArg and poptArgType() where
 useful. - jbj: poptint.h: add a poptArgType define for bitfield type
 abstraction. - jbj: poptint.h: add a poptArg union for opt->arg access
 without casts.

---
 CHANGES    |   3 ++
 popt.c     | 107 ++++++++++++++++++++++++-----------------------------
 popthelp.c |  60 +++++++++++++++---------------
 poptint.h  |  14 +++++++
 4 files changed, 97 insertions(+), 87 deletions(-)

diff --git a/CHANGES b/CHANGES
index d038361..6998af4 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,4 +1,7 @@
 1.13 -> 1.14:
+    - jbj: start using poptArg and poptArgType() where useful.
+    - jbj: poptint.h: add a poptArgType define for bitfield type abstraction.
+    - jbj: poptint.h: add a poptArg union for opt->arg access without casts.
     - jbj: include "-- Terminate options" end-of-options msg in poptHelpOptions.
     - jbj: opt->argDescrip[0] determines "--foo=bar" or "--foo bar".
     - jbj: --long always padded for alignment with/without "-X, ".
diff --git a/popt.c b/popt.c
index ca0acc4..5e08d72 100644
--- a/popt.c
+++ b/popt.c
@@ -67,21 +67,19 @@ static void invokeCallbacksPRE(poptContext con, const struct poptOption * opt)
 {
     if (opt != NULL)
     for (; opt->longName || opt->shortName || opt->arg; opt++) {
-	if (opt->arg == NULL) continue;		/* XXX program error. */
-	if ((opt->argInfo & POPT_ARG_MASK) == POPT_ARG_INCLUDE_TABLE) {
-	    void * arg = opt->arg;
+	poptArg arg = { .ptr = opt->arg };
+	if (arg.ptr == NULL) continue;		/* XXX program error. */
+	if (poptArgType(opt) == POPT_ARG_INCLUDE_TABLE) {
 	    /* XXX sick hack to preserve pretense of ABI. */
-	    if (arg == poptHelpOptions) arg = poptHelpOptionsI18N;
+	    if (arg.opt == poptHelpOptions) arg.opt = poptHelpOptionsI18N;
 	    /* Recurse on included sub-tables. */
-	    invokeCallbacksPRE(con, arg);
-	} else if ((opt->argInfo & POPT_ARG_MASK) == POPT_ARG_CALLBACK &&
+	    invokeCallbacksPRE(con, arg.opt);
+	} else if (poptArgType(opt) == POPT_ARG_CALLBACK &&
 		   (opt->argInfo & POPT_CBFLAG_PRE))
-	{   /*@-castfcnptr@*/
-	    poptCallbackType cb = (poptCallbackType)opt->arg;
-	    /*@=castfcnptr@*/
+	{
 	    /* Perform callback. */
 	    /*@-noeffectuncon @*/
-	    cb(con, POPT_CALLBACK_REASON_PRE, NULL, NULL, opt->descrip);
+	    arg.cb(con, POPT_CALLBACK_REASON_PRE, NULL, NULL, opt->descrip);
 	    /*@=noeffectuncon @*/
 	}
     }
@@ -93,21 +91,19 @@ static void invokeCallbacksPOST(poptContext con, const struct poptOption * opt)
 {
     if (opt != NULL)
     for (; opt->longName || opt->shortName || opt->arg; opt++) {
-	if (opt->arg == NULL) continue;		/* XXX program error. */
-	if ((opt->argInfo & POPT_ARG_MASK) == POPT_ARG_INCLUDE_TABLE) {
-	    void * arg = opt->arg;
+	poptArg arg = { .ptr = opt->arg };
+	if (arg.ptr == NULL) continue;		/* XXX program error. */
+	if (poptArgType(opt) == POPT_ARG_INCLUDE_TABLE) {
 	    /* XXX sick hack to preserve pretense of ABI. */
-	    if (arg == poptHelpOptions) arg = poptHelpOptionsI18N;
+	    if (arg.opt == poptHelpOptions) arg.opt = poptHelpOptionsI18N;
 	    /* Recurse on included sub-tables. */
-	    invokeCallbacksPOST(con, arg);
-	} else if ((opt->argInfo & POPT_ARG_MASK) == POPT_ARG_CALLBACK &&
+	    invokeCallbacksPOST(con, arg.opt);
+	} else if (poptArgType(opt) == POPT_ARG_CALLBACK &&
 		   (opt->argInfo & POPT_CBFLAG_POST))
-	{   /*@-castfcnptr@*/
-	    poptCallbackType cb = (poptCallbackType)opt->arg;
-	    /*@=castfcnptr@*/
+	{
 	    /* Perform callback. */
 	    /*@-noeffectuncon @*/
-	    cb(con, POPT_CALLBACK_REASON_POST, NULL, NULL, opt->descrip);
+	    arg.cb(con, POPT_CALLBACK_REASON_POST, NULL, NULL, opt->descrip);
 	    /*@=noeffectuncon @*/
 	}
     }
@@ -121,34 +117,34 @@ static void invokeCallbacksOPTION(poptContext con,
 	/*@modifies internalState@*/
 {
     const struct poptOption * cbopt = NULL;
+    poptArg cbarg = { .ptr = NULL };
 
     if (opt != NULL)
     for (; opt->longName || opt->shortName || opt->arg; opt++) {
-	if ((opt->argInfo & POPT_ARG_MASK) == POPT_ARG_INCLUDE_TABLE) {
-	    void * arg = opt->arg;
+	poptArg arg = { .ptr = opt->arg };
+	if (poptArgType(opt) == POPT_ARG_INCLUDE_TABLE) {
 	    /* XXX sick hack to preserve pretense of ABI. */
-	    if (arg == poptHelpOptions) arg = poptHelpOptionsI18N;
+	    if (arg.opt == poptHelpOptions) arg.opt = poptHelpOptionsI18N;
 	    /* Recurse on included sub-tables. */
 	    if (opt->arg != NULL)	/* XXX program error */
 		invokeCallbacksOPTION(con, opt->arg, myOpt, myData, shorty);
-	} else if ((opt->argInfo & POPT_ARG_MASK) == POPT_ARG_CALLBACK &&
+	} else if (poptArgType(opt) == POPT_ARG_CALLBACK &&
 		  !(opt->argInfo & POPT_CBFLAG_SKIPOPTION)) {
 	    /* Save callback info. */
 	    cbopt = opt;
+	    cbarg.ptr = opt->arg;
 	} else if (cbopt != NULL &&
 		   ((myOpt->shortName && opt->shortName && shorty &&
 			myOpt->shortName == opt->shortName) ||
 		    (myOpt->longName != NULL && opt->longName != NULL &&
 			!strcmp(myOpt->longName, opt->longName)))
 		   )
-	{   /*@-castfcnptr@*/
-	    poptCallbackType cb = (poptCallbackType)cbopt->arg;
-	    /*@=castfcnptr@*/
+	{
 	    const void * cbData = (cbopt->descrip ? cbopt->descrip : myData);
 	    /* Perform callback. */
-	    if (cb != NULL) {	/* XXX program error */
+	    if (cbarg.cb != NULL) {	/* XXX program error */
 		/*@-noeffectuncon @*/
-		cb(con, POPT_CALLBACK_REASON_OPTION, myOpt,
+		cbarg.cb(con, POPT_CALLBACK_REASON_OPTION, myOpt,
 			con->os->nextArg, cbData);
 		/*@=noeffectuncon @*/
 	    }
@@ -468,22 +464,23 @@ findOption(const struct poptOption * opt, /*@null@*/ const char * longName, int
 	/*@modifies *callback, *callbackData */
 {
     const struct poptOption * cb = NULL;
+    poptArg cbarg = { .ptr = NULL };
 
     /* This happens when a single - is given */
     if (singleDash && !shortName && (longName && *longName == '\0'))
 	shortName = '-';
 
     for (; opt->longName || opt->shortName || opt->arg; opt++) {
+	poptArg arg = { .ptr = opt->arg };
 
-	if ((opt->argInfo & POPT_ARG_MASK) == POPT_ARG_INCLUDE_TABLE) {
+	if (poptArgType(opt) == POPT_ARG_INCLUDE_TABLE) {
 	    const struct poptOption * opt2;
-	    void * arg = opt->arg;
 
 	    /* XXX sick hack to preserve pretense of ABI. */
-	    if (arg == poptHelpOptions) arg = poptHelpOptionsI18N;
+	    if (arg.opt == poptHelpOptions) arg.opt = poptHelpOptionsI18N;
 	    /* Recurse on included sub-tables. */
-	    if (arg == NULL) continue;	/* XXX program error */
-	    opt2 = findOption(arg, longName, longNameLen, shortName, callback,
+	    if (arg.ptr == NULL) continue;	/* XXX program error */
+	    opt2 = findOption(arg.opt, longName, longNameLen, shortName, callback,
 			      callbackData, singleDash);
 	    if (opt2 == NULL) continue;
 	    /* Sub-table data will be inheirited if no data yet. */
@@ -493,8 +490,9 @@ findOption(const struct poptOption * opt, /*@null@*/ const char * longName, int
 	    *callbackData = opt->descrip;
 /*@=observertrans =dependenttrans @*/
 	    return opt2;
-	} else if ((opt->argInfo & POPT_ARG_MASK) == POPT_ARG_CALLBACK) {
+	} else if (poptArgType(opt) == POPT_ARG_CALLBACK) {
 	    cb = opt;
+	    cbarg.ptr = opt->arg;
 	} else if (longName != NULL && opt->longName != NULL &&
 		   (!singleDash || (opt->argInfo & POPT_ARGFLAG_ONEDASH)) &&
 		   (!strncmp(longName, opt->longName, longNameLen) && strlen(opt->longName) == longNameLen))
@@ -509,20 +507,13 @@ findOption(const struct poptOption * opt, /*@null@*/ const char * longName, int
 	return NULL;
 
 /*@-modobserver -mods @*/
-    if (callback) *callback = NULL;
-    if (callbackData) *callbackData = NULL;
-    if (cb) {
-	if (callback)
-	/*@-castfcnptr@*/
-	    *callback = (poptCallbackType)cb->arg;
-	/*@=castfcnptr@*/
-	if (!(cb->argInfo & POPT_CBFLAG_INC_DATA)) {
-	    if (callbackData)
+    if (callback)
+	*callback = (cb ? cbarg.cb : NULL);
+    if (callbackData)
 /*@-observertrans@*/	/* FIX: typedef double indirection. */
-		*callbackData = cb->descrip;
+	*callbackData = (cb && !(cb->argInfo & POPT_CBFLAG_INC_DATA)
+		? cb->descrip : NULL);
 /*@=observertrans@*/
-	}
-    }
 /*@=modobserver =mods @*/
 
     return opt;
@@ -857,15 +848,15 @@ int poptGetNextOpt(poptContext con)
 	}
 
 	if (opt == NULL) return POPT_ERROR_BADOPT;	/* XXX can't happen */
-	if (opt->arg && (opt->argInfo & POPT_ARG_MASK) == POPT_ARG_NONE) {
+	if (opt->arg && poptArgType(opt) == POPT_ARG_NONE) {
 	    if (poptSaveInt((int *)opt->arg, opt->argInfo, 1L))
 		return POPT_ERROR_BADOPERATION;
-	} else if ((opt->argInfo & POPT_ARG_MASK) == POPT_ARG_VAL) {
+	} else if (poptArgType(opt) == POPT_ARG_VAL) {
 	    if (opt->arg) {
 		if (poptSaveInt((int *)opt->arg, opt->argInfo, (long)opt->val))
 		    return POPT_ERROR_BADOPERATION;
 	    }
-	} else if ((opt->argInfo & POPT_ARG_MASK) != POPT_ARG_NONE) {
+	} else if (poptArgType(opt) != POPT_ARG_NONE) {
 	    con->os->nextArg = _free(con->os->nextArg);
 	    if (longArg) {
 		longArg = expandNextArg(con, longArg);
@@ -911,7 +902,7 @@ int poptGetNextOpt(poptContext con)
 	    longArg = NULL;
 
 	    if (opt->arg) {
-		switch (opt->argInfo & POPT_ARG_MASK) {
+		switch (poptArgType(opt)) {
 		case POPT_ARG_STRING:
 		    /* XXX memory leak, hard to plug */
 		    *((const char **) opt->arg) = (con->os->nextArg)
@@ -929,7 +920,7 @@ int poptGetNextOpt(poptContext con)
 			    return POPT_ERROR_BADNUMBER;
 		    }
 
-		    if ((opt->argInfo & POPT_ARG_MASK) == POPT_ARG_LONG) {
+		    if (poptArgType(opt) == POPT_ARG_LONG) {
 			if (aLong == LONG_MIN || aLong == LONG_MAX)
 			    return POPT_ERROR_OVERFLOW;
 			if (poptSaveLong((long *)opt->arg, opt->argInfo, aLong))
@@ -960,7 +951,7 @@ int poptGetNextOpt(poptContext con)
 			    return POPT_ERROR_BADNUMBER;
 		    }
 
-		    if ((opt->argInfo & POPT_ARG_MASK) == POPT_ARG_DOUBLE) {
+		    if (poptArgType(opt) == POPT_ARG_DOUBLE) {
 			*((double *) opt->arg) = aDouble;
 		    } else {
 #define _ABS(a)	((((a) - 0.0) < DBL_EPSILON) ? -(a) : (a))
@@ -979,7 +970,7 @@ int poptGetNextOpt(poptContext con)
 		default:
 		    fprintf(stdout,
 			POPT_("option type (%d) not implemented in popt\n"),
-			(opt->argInfo & POPT_ARG_MASK));
+			poptArgType(opt));
 		    exit(EXIT_FAILURE);
 		    /*@notreached@*/ /*@switchbreak@*/ break;
 		}
@@ -988,7 +979,7 @@ int poptGetNextOpt(poptContext con)
 
 	if (cb)
 	    invokeCallbacksOPTION(con, con->options, opt, cbData, shorty);
-	else if (opt->val && ((opt->argInfo & POPT_ARG_MASK) != POPT_ARG_VAL))
+	else if (opt->val && (poptArgType(opt) != POPT_ARG_VAL))
 	    done = 1;
 
 	if ((con->finalArgvCount + 2) >= (con->finalArgvAlloced)) {
@@ -1011,11 +1002,11 @@ int poptGetNextOpt(poptContext con)
 		con->finalArgv[con->finalArgvCount++] = NULL;
 	}
 
-	if (opt->arg && (opt->argInfo & POPT_ARG_MASK) == POPT_ARG_NONE)
+	if (opt->arg && poptArgType(opt) == POPT_ARG_NONE)
 	    /*@-ifempty@*/ ; /*@=ifempty@*/
-	else if ((opt->argInfo & POPT_ARG_MASK) == POPT_ARG_VAL)
+	else if (poptArgType(opt) == POPT_ARG_VAL)
 	    /*@-ifempty@*/ ; /*@=ifempty@*/
-	else if ((opt->argInfo & POPT_ARG_MASK) != POPT_ARG_NONE) {
+	else if (poptArgType(opt) != POPT_ARG_NONE) {
 	    if (con->finalArgv != NULL && con->os->nextArg != NULL)
 	        con->finalArgv[con->finalArgvCount++] =
 			xstrdup(con->os->nextArg);
diff --git a/popthelp.c b/popthelp.c
index aa0651d..8624472 100644
--- a/popthelp.c
+++ b/popthelp.c
@@ -40,14 +40,16 @@ static void displayArgs(poptContext con,
 		struct poptOption * key, 
 		/*@unused@*/ const char * arg, /*@unused@*/ void * data)
 	/*@globals fileSystem@*/
-	/*@modifies con, fileSystem@*/
+	/*@modifies fileSystem@*/
 {
     if (key->shortName == '?')
 	poptPrintHelp(con, stdout, 0);
     else
 	poptPrintUsage(con, stdout, 0);
 
-/*@i@*/ con = poptFreeContext(con);		/* XXX keep valgrind happy */
+#if !defined(__LCLINT__)	/* XXX keep both splint & valgrind happy */
+    con = poptFreeContext(con);
+#endif
     exit(0);
 }
 
@@ -129,13 +131,11 @@ static size_t maxColumnWidth(FILE *fp)
  * @param table		option(s)
  */
 /*@observer@*/ /*@null@*/ static const char *
-getTableTranslationDomain(/*@null@*/ const struct poptOption *table)
+getTableTranslationDomain(/*@null@*/ const struct poptOption *opt)
 	/*@*/
 {
-    const struct poptOption *opt;
-
-    if (table != NULL)
-    for (opt = table; opt->longName || opt->shortName || opt->arg; opt++) {
+    if (opt != NULL)
+    for (; opt->longName || opt->shortName || opt->arg; opt++) {
 	if (opt->argInfo == POPT_ARG_INTL_DOMAIN)
 	    return opt->arg;
     }
@@ -153,9 +153,9 @@ getArgDescrip(const struct poptOption * opt,
 		/*@=paramuse@*/
 	/*@*/
 {
-    if (!(opt->argInfo & POPT_ARG_MASK)) return NULL;
+    if (!poptArgType(opt)) return NULL;
 
-    if ((opt->argInfo & POPT_ARG_MASK) == POPT_ARG_MAINCALL)
+    if (poptArgType(opt) == POPT_ARG_MAINCALL)
 	return opt->argDescrip;
 
     if (opt->argDescrip) {
@@ -170,7 +170,7 @@ getArgDescrip(const struct poptOption * opt,
 	return D_(translation_domain, opt->argDescrip);
     }
 
-    switch (opt->argInfo & POPT_ARG_MASK) {
+    switch (poptArgType(opt)) {
     case POPT_ARG_NONE:		return POPT_("NONE");
 #ifdef	DYING
     case POPT_ARG_VAL:		return POPT_("VAL");
@@ -213,7 +213,7 @@ singleOptionDefaultValue(size_t lineLength,
     *le++ = ':';
     *le++ = ' ';
     if (opt->arg)	/* XXX programmer error */
-    switch (opt->argInfo & POPT_ARG_MASK) {
+    switch (poptArgType(opt)) {
     case POPT_ARG_VAL:
     case POPT_ARG_INT:
     {	long aLong = *((int *)opt->arg);
@@ -279,8 +279,7 @@ static void singleOptionHelp(FILE * fp, columns_t columns,
     const char * help = D_(translation_domain, opt->descrip);
     const char * argDescrip = getArgDescrip(opt, translation_domain);
     /* Display shortName iff printable non-space. */
-    int prtshort = (isprint((int)opt->shortName) && opt->shortName != ' ');
-    int prtlong = (opt->longName != NULL);
+    int prtshort = (int)(isprint((int)opt->shortName) && opt->shortName != ' ');
     size_t helpLength;
     char * defs = NULL;
     char * left;
@@ -297,6 +296,7 @@ static void singleOptionHelp(FILE * fp, columns_t columns,
     left[0] = '\0';
     left[maxLeftCol] = '\0';
 
+#define	prtlong	(opt->longName != NULL)	/* XXX splint needs a clue */
     if (!(prtshort || prtlong))
 	goto out;
     if (prtshort && prtlong)
@@ -308,9 +308,10 @@ static void singleOptionHelp(FILE * fp, columns_t columns,
     else if (prtlong)
 	/* XXX --long always padded for alignment with/without "-X, ". */
 	sprintf(left, "    %s%s",
-		((opt->argInfo & POPT_ARG_MASK) == POPT_ARG_MAINCALL ? "" :
+		(poptArgType(opt) == POPT_ARG_MAINCALL ? "" :
 		((opt->argInfo & POPT_ARGFLAG_ONEDASH) ? "-" : "--")),
 		opt->longName);
+#undef	prtlong
 
     if (argDescrip) {
 	char * le = left + strlen(left);
@@ -339,7 +340,7 @@ static void singleOptionHelp(FILE * fp, columns_t columns,
 	}
 
 	if (opt->argDescrip == NULL) {
-	    switch (opt->argInfo & POPT_ARG_MASK) {
+	    switch (poptArgType(opt)) {
 	    case POPT_ARG_NONE:
 		break;
 	    case POPT_ARG_VAL:
@@ -390,7 +391,7 @@ static void singleOptionHelp(FILE * fp, columns_t columns,
 
 	    /* XXX argDescrip[0] determines "--foo=bar" or "--foo bar". */
 	    if (!strchr(" =(", argDescrip[0]))
-		*le++ = ((opt->argInfo & POPT_ARG_MASK) == POPT_ARG_MAINCALL)
+		*le++ = (poptArgType(opt) == POPT_ARG_MAINCALL)
 			? ' ' : '=';
 	    strcpy(le, argDescrip);
 	    lelen = strlen(le);
@@ -473,7 +474,7 @@ static size_t maxArgWidth(const struct poptOption * opt,
     
     if (opt != NULL)
     while (opt->longName || opt->shortName || opt->arg) {
-	if ((opt->argInfo & POPT_ARG_MASK) == POPT_ARG_INCLUDE_TABLE) {
+	if (poptArgType(opt) == POPT_ARG_INCLUDE_TABLE) {
 	    if (opt->arg)	/* XXX program error */
 	        len = maxArgWidth(opt->arg, translation_domain);
 	    if (len > max) max = len;
@@ -570,15 +571,15 @@ static void singleTableHelp(poptContext con, FILE * fp,
     }
 
     if (table != NULL)
-    for (opt = table; (opt->longName || opt->shortName || opt->arg); opt++) {
+    for (opt = table; opt->longName || opt->shortName || opt->arg; opt++) {
 	if ((opt->longName || opt->shortName) && 
 	    !(opt->argInfo & POPT_ARGFLAG_DOC_HIDDEN))
 	    singleOptionHelp(fp, columns, opt, translation_domain);
     }
 
     if (table != NULL)
-    for (opt = table; (opt->longName || opt->shortName || opt->arg); opt++) {
-	if ((opt->argInfo & POPT_ARG_MASK) != POPT_ARG_INCLUDE_TABLE)
+    for (opt = table; opt->longName || opt->shortName || opt->arg; opt++) {
+	if (poptArgType(opt) != POPT_ARG_INCLUDE_TABLE)
 	    continue;
 	sub_transdom = getTableTranslationDomain(opt->arg);
 	if (sub_transdom == NULL)
@@ -653,9 +654,9 @@ static size_t singleOptionUsage(FILE * fp, columns_t columns,
     size_t len = sizeof(" []") - 1;
     const char * argDescrip = getArgDescrip(opt, translation_domain);
     /* Display shortName iff printable non-space. */
-    int prtshort = (isprint((int)opt->shortName) && opt->shortName != ' ');
-    int prtlong = (opt->longName != NULL);
+    int prtshort = (int)(isprint((int)opt->shortName) && opt->shortName != ' ');
 
+#define	prtlong	(opt->longName != NULL)	/* XXX splint needs a clue */
     if (!(prtshort || prtlong))
 	return columns->cur;
 
@@ -695,12 +696,13 @@ static size_t singleOptionUsage(FILE * fp, columns_t columns,
     fprintf(fp, " [");
     if (prtshort)
 	fprintf(fp, "-%c", opt->shortName);
-    if (prtlong) {
+    if (prtlong)
 	fprintf(fp, "%s%s%s",
 		(prtshort ? "|" : ""),
 		((opt->argInfo & POPT_ARGFLAG_ONEDASH) ? "-" : "--"),
 		opt->longName);
-    }
+#undef	prtlong
+
     if (argDescrip) {
 	/* XXX argDescrip[0] determines "--foo=bar" or "--foo bar". */
 	if (!strchr(" =(", argDescrip[0])) fprintf(fp, "=");
@@ -731,7 +733,7 @@ static size_t itemUsage(FILE * fp, columns_t columns,
     for (i = 0; i < nitems; i++, item++) {
 	const struct poptOption * opt;
 	opt = &item->option;
-        if ((opt->argInfo & POPT_ARG_MASK) == POPT_ARG_INTL_DOMAIN) {
+        if (poptArgType(opt) == POPT_ARG_INTL_DOMAIN) {
 	    translation_domain = (const char *)opt->arg;
 	} else if ((opt->longName || opt->shortName) &&
 		 !(opt->argInfo & POPT_ARGFLAG_DOC_HIDDEN)) {
@@ -771,9 +773,9 @@ static size_t singleTableUsage(poptContext con, FILE * fp, columns_t columns,
 {
     if (opt != NULL)
     for (; (opt->longName || opt->shortName || opt->arg) ; opt++) {
-        if ((opt->argInfo & POPT_ARG_MASK) == POPT_ARG_INTL_DOMAIN) {
+        if (poptArgType(opt) == POPT_ARG_INTL_DOMAIN) {
 	    translation_domain = (const char *)opt->arg;
-	} else if ((opt->argInfo & POPT_ARG_MASK) == POPT_ARG_INCLUDE_TABLE) {
+	} else if (poptArgType(opt) == POPT_ARG_INCLUDE_TABLE) {
 	    if (done) {
 		int i = 0;
 		if (done->opts != NULL)
@@ -824,11 +826,11 @@ static size_t showShortOptions(const struct poptOption * opt, FILE * fp,
 
     if (opt != NULL)
     for (; (opt->longName || opt->shortName || opt->arg); opt++) {
-	if (opt->shortName && !(opt->argInfo & POPT_ARG_MASK)) {
+	if (opt->shortName && !poptArgType(opt)) {
 	    /* Display shortName iff printable non-space. */
 	    if (isprint((int)opt->shortName) && opt->shortName != ' ')
 		s[strlen(s)] = opt->shortName;
-	} else if ((opt->argInfo & POPT_ARG_MASK) == POPT_ARG_INCLUDE_TABLE)
+	} else if (poptArgType(opt) == POPT_ARG_INCLUDE_TABLE)
 	    if (opt->arg)	/* XXX program error */
 		len = showShortOptions(opt->arg, fp, s);
     } 
diff --git a/poptint.h b/poptint.h
index 414dd60..2b2d6b6 100644
--- a/poptint.h
+++ b/poptint.h
@@ -42,6 +42,20 @@ typedef struct {
 #define PBM_CLR(d, s)   (__PBM_BITS (s)[__PBM_IX (d)] &= ~__PBM_MASK (d))
 #define PBM_ISSET(d, s) ((__PBM_BITS (s)[__PBM_IX (d)] & __PBM_MASK (d)) != 0)
 
+/** \ingroup popt
+ * A union to simplify opt->arg access without casting.
+ */
+typedef union poptArg_u {
+    void * ptr;
+    int * intp;
+    long * longp;
+    const char ** argv;
+    poptCallbackType cb;
+    poptOption opt;
+} poptArg;
+
+#define	poptArgType(opt)	((opt)->argInfo & POPT_ARG_MASK)
+
 struct optionStackEntry {
     int argc;
 /*@only@*/ /*@null@*/
-- 
Gitee


From 29aa78a2e1d62b7fa0e9138046f23845fb825386 Mon Sep 17 00:00:00 2001
From: Jeff Johnson <n3npq@mac.com>
Date: Tue, 12 Feb 2008 22:01:46 +0000
Subject: [PATCH 492/667] - jbj: poptint.h: add poptSubstituteHelpI18N() to
 bury the ABI hack.

---
 CHANGES   |  1 +
 popt.c    | 12 ++++--------
 poptint.h | 10 ++++++++++
 3 files changed, 15 insertions(+), 8 deletions(-)

diff --git a/CHANGES b/CHANGES
index 6998af4..701bff0 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,4 +1,5 @@
 1.13 -> 1.14:
+    - jbj: poptint.h: add poptSubstituteHelpI18N() to bury the ABI hack.
     - jbj: start using poptArg and poptArgType() where useful.
     - jbj: poptint.h: add a poptArgType define for bitfield type abstraction.
     - jbj: poptint.h: add a poptArg union for opt->arg access without casts.
diff --git a/popt.c b/popt.c
index 5e08d72..cab29fc 100644
--- a/popt.c
+++ b/popt.c
@@ -70,8 +70,7 @@ static void invokeCallbacksPRE(poptContext con, const struct poptOption * opt)
 	poptArg arg = { .ptr = opt->arg };
 	if (arg.ptr == NULL) continue;		/* XXX program error. */
 	if (poptArgType(opt) == POPT_ARG_INCLUDE_TABLE) {
-	    /* XXX sick hack to preserve pretense of ABI. */
-	    if (arg.opt == poptHelpOptions) arg.opt = poptHelpOptionsI18N;
+	    poptSubstituteHelpI18N(arg.opt);	/* XXX side effects */
 	    /* Recurse on included sub-tables. */
 	    invokeCallbacksPRE(con, arg.opt);
 	} else if (poptArgType(opt) == POPT_ARG_CALLBACK &&
@@ -94,8 +93,7 @@ static void invokeCallbacksPOST(poptContext con, const struct poptOption * opt)
 	poptArg arg = { .ptr = opt->arg };
 	if (arg.ptr == NULL) continue;		/* XXX program error. */
 	if (poptArgType(opt) == POPT_ARG_INCLUDE_TABLE) {
-	    /* XXX sick hack to preserve pretense of ABI. */
-	    if (arg.opt == poptHelpOptions) arg.opt = poptHelpOptionsI18N;
+	    poptSubstituteHelpI18N(arg.opt);	/* XXX side effects */
 	    /* Recurse on included sub-tables. */
 	    invokeCallbacksPOST(con, arg.opt);
 	} else if (poptArgType(opt) == POPT_ARG_CALLBACK &&
@@ -123,8 +121,7 @@ static void invokeCallbacksOPTION(poptContext con,
     for (; opt->longName || opt->shortName || opt->arg; opt++) {
 	poptArg arg = { .ptr = opt->arg };
 	if (poptArgType(opt) == POPT_ARG_INCLUDE_TABLE) {
-	    /* XXX sick hack to preserve pretense of ABI. */
-	    if (arg.opt == poptHelpOptions) arg.opt = poptHelpOptionsI18N;
+	    poptSubstituteHelpI18N(arg.opt);	/* XXX side effects */
 	    /* Recurse on included sub-tables. */
 	    if (opt->arg != NULL)	/* XXX program error */
 		invokeCallbacksOPTION(con, opt->arg, myOpt, myData, shorty);
@@ -476,8 +473,7 @@ findOption(const struct poptOption * opt, /*@null@*/ const char * longName, int
 	if (poptArgType(opt) == POPT_ARG_INCLUDE_TABLE) {
 	    const struct poptOption * opt2;
 
-	    /* XXX sick hack to preserve pretense of ABI. */
-	    if (arg.opt == poptHelpOptions) arg.opt = poptHelpOptionsI18N;
+	    poptSubstituteHelpI18N(arg.opt);	/* XXX side effects */
 	    /* Recurse on included sub-tables. */
 	    if (arg.ptr == NULL) continue;	/* XXX program error */
 	    opt2 = findOption(arg.opt, longName, longNameLen, shortName, callback,
diff --git a/poptint.h b/poptint.h
index 2b2d6b6..cd56b9c 100644
--- a/poptint.h
+++ b/poptint.h
@@ -45,17 +45,27 @@ typedef struct {
 /** \ingroup popt
  * A union to simplify opt->arg access without casting.
  */
+/*@-exporttype -fielduse@*/
 typedef union poptArg_u {
+/*@shared@*/
     void * ptr;
     int * intp;
     long * longp;
     const char ** argv;
     poptCallbackType cb;
+/*@shared@*/
     poptOption opt;
 } poptArg;
+/*@=exporttype =fielduse@*/
 
 #define	poptArgType(opt)	((opt)->argInfo & POPT_ARG_MASK)
 
+/* XXX sick hack to preserve pretense of a popt-1.x ABI. */
+#define	poptSubstituteHelpI18N(opt) \
+  { /*@-observertrans@*/ \
+    if ((opt) == poptHelpOptions) (opt) = poptHelpOptionsI18N; \
+    /*@=observertrans@*/ }
+
 struct optionStackEntry {
     int argc;
 /*@only@*/ /*@null@*/
-- 
Gitee


From d3cb834ed25757b8f691cc31066ab181127732c7 Mon Sep 17 00:00:00 2001
From: Jeff Johnson <n3npq@mac.com>
Date: Tue, 12 Feb 2008 23:53:18 +0000
Subject: [PATCH 493/667] - jbj: hmmm, POSIXly correct --echo-args needs
 fixing, disable for now. - jbj: poptint.h: typedef's for string and string
 arrays. - jbj: add POPT_ARG_LONGLONG, and poptSaveLongLong().

---
 CHANGES   |  3 ++
 popt.3    |  7 +++--
 popt.c    | 82 ++++++++++++++++++++++++++++++++++++++++++++++---------
 popt.h    | 28 +++++++++++++++----
 poptint.h | 17 ++++++++++--
 test1.c   | 17 +++++++++---
 testit.sh | 45 ++++++++++++++++++------------
 7 files changed, 154 insertions(+), 45 deletions(-)

diff --git a/CHANGES b/CHANGES
index 701bff0..e10480c 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,4 +1,7 @@
 1.13 -> 1.14:
+    - jbj: hmmm, POSIXly correct --echo-args needs fixing, disable for now.
+    - jbj: poptint.h: typedef's for string and string arrays.
+    - jbj: add POPT_ARG_LONGLONG, and poptSaveLongLong().
     - jbj: poptint.h: add poptSubstituteHelpI18N() to bury the ABI hack.
     - jbj: start using poptArg and poptArgType() where useful.
     - jbj: poptint.h: add a poptArgType define for bitfield type abstraction.
diff --git a/popt.3 b/popt.3
index 66eedb0..33d3d5b 100644
--- a/popt.3
+++ b/popt.3
@@ -127,6 +127,7 @@ POPT_ARG_NONE	No argument expected	int
 POPT_ARG_STRING	No type checking to be performed	char *
 POPT_ARG_INT	An integer argument is expected	int
 POPT_ARG_LONG	A long integer is expected	long
+POPT_ARG_LONGLONG	A long long integer is expected	long long
 POPT_ARG_VAL	Integer value taken from \f(CWval\fR	int
 POPT_ARG_FLOAT	An float argument is expected	float
 POPT_ARG_DOUBLE	A double argument is expected	double
@@ -159,7 +160,7 @@ will perhaps not escape the attention of hunt-and-peck typists that
 an argument, the variable that 
 .IR arg " points to is updated to reflect the value of the argument." 
 .RB "Any string is acceptable for " POPT_ARG_STRING " arguments, but "
-.BR POPT_ARG_INT ", " POPT_ARG_LONG ", " POPT_ARG_FLOAT ", and "
+.BR POPT_ARG_INT ", " POPT_ARG_LONG ", " POPT_ARG_LONGLONG ", " POPT_ARG_FLOAT ", and "
 .BR POPT_ARG_DOUBLE " are converted to the appropriate type, and an "
 error returned if the conversion fails.
 .sp
@@ -469,7 +470,7 @@ A parsed string has a quotation mismatch (such as a single quotation
 A conversion from a string to a number (int or long) failed due
 to the string containing nonnumeric characters. This occurs when
 .BR poptGetNextOpt() " is processing an argument of type " 
-.BR POPT_ARG_INT ", " POPT_ARG_LONG ", "
+.BR POPT_ARG_INT ", " POPT_ARG_LONG ", " POPT_ARG_LONGLONG ", "
 .RB POPT_ARG_FLOAT ", or " POPT_ARG_DOUBLE "."  
 .sp
 .TP
@@ -477,7 +478,7 @@ to the string containing nonnumeric characters. This occurs when
 A string-to-number conversion failed because the number was too
 .RB "large or too small. Like " POPT_ERROR_BADNUMBER ", this error 
 .RB "can occur only when " poptGetNextOpt() " is processing an "
-.RB "argument of type " POPT_ARG_INT ", " POPT_ARG_LONG ", "
+.RB "argument of type " POPT_ARG_INT ", " POPT_ARG_LONG ", " POPT_ARG_LONGLONG ", "
 .RB POPT_ARG_FLOAT ", or " POPT_ARG_DOUBLE "."  
 .sp
 .TP
diff --git a/popt.c b/popt.c
index cab29fc..b75ab6d 100644
--- a/popt.c
+++ b/popt.c
@@ -357,7 +357,7 @@ static int execCommand(poptContext con)
 	/*@modifies internalState @*/
 {
     poptItem item = con->doExec;
-    const char ** argv = NULL;
+    poptArgv argv = NULL;
     int argc = 0;
     int rc;
     int ec = POPT_ERROR_ERRNO;
@@ -431,7 +431,7 @@ static int execCommand(poptContext con)
 
 #ifdef	MYDEBUG
 if (_popt_debug)
-    {	const char ** avp;
+    {	poptArgv avp;
 	fprintf(stderr, "==> execvp(%s) argv[%d]:", argv[0], argc);
 	for (avp = argv; *avp; avp++)
 	    fprintf(stderr, " '%s'", *avp);
@@ -620,6 +620,46 @@ static void poptStripArg(/*@special@*/ poptContext con, int which)
 /*@unchecked@*/
 static unsigned int seed = 0;
 
+/*@-bitwisesigned@*/	/* LCL: logical ops with unsigned. */
+int poptSaveLongLong(long long * arg, unsigned int argInfo, long long aLongLong)
+{
+#ifdef	NOTYET
+    /* XXX Check alignment, may fail on funky platforms. */
+    if (arg == NULL || (((unsigned long long)arg) & (sizeof(*arg)-1)))
+	return POPT_ERROR_NULLARG;
+#endif
+
+    if (aLongLong != 0 && argInfo & POPT_ARGFLAG_RANDOM) {
+	if (!seed) {
+	    srandom((unsigned)getpid());
+	    srandom((unsigned)random());
+	}
+	aLongLong = random() % (aLongLong > 0 ? aLongLong : -aLongLong);
+	aLongLong++;
+    }
+    if (argInfo & POPT_ARGFLAG_NOT)
+	aLongLong = ~aLongLong;
+    switch (argInfo & POPT_ARGFLAG_LOGICALOPS) {
+    case 0:
+	*arg = aLongLong;
+	break;
+    case POPT_ARGFLAG_OR:
+	*arg |= aLongLong;
+	break;
+    case POPT_ARGFLAG_AND:
+	*arg &= aLongLong;
+	break;
+    case POPT_ARGFLAG_XOR:
+	*arg ^= aLongLong;
+	break;
+    default:
+	return POPT_ERROR_BADOPERATION;
+	/*@notreached@*/ break;
+    }
+    return 0;
+}
+/*@=bitwisesigned@*/
+
 /*@-bitwisesigned@*/	/* LCL: logical ops with unsigned. */
 int poptSaveLong(long * arg, unsigned int argInfo, long aLong)
 {
@@ -898,35 +938,51 @@ int poptGetNextOpt(poptContext con)
 	    longArg = NULL;
 
 	    if (opt->arg) {
+		poptArg arg = { .ptr = opt->arg };
 		switch (poptArgType(opt)) {
 		case POPT_ARG_STRING:
 		    /* XXX memory leak, hard to plug */
-		    *((const char **) opt->arg) = (con->os->nextArg)
+		    arg.argv[0] = (con->os->nextArg)
 			? xstrdup(con->os->nextArg) : NULL;
 		    /*@switchbreak@*/ break;
 
 		case POPT_ARG_INT:
 		case POPT_ARG_LONG:
-		{   long aLong = 0;
+		case POPT_ARG_LONGLONG:
+		{   long long aNUM = 0;
 		    char *end;
 
 		    if (con->os->nextArg) {
-			aLong = strtol(con->os->nextArg, &end, 0);
+			aNUM = strtoll(con->os->nextArg, &end, 0);
 			if (!(end && *end == '\0'))
 			    return POPT_ERROR_BADNUMBER;
 		    }
 
+/* XXX let's not demand C99 compiler flags for <limits.h> quite yet. */
+#if !defined(LLONG_MAX)
+#   define LLONG_MAX    9223372036854775807LL
+#   define LLONG_MIN    (-LLONG_MAX - 1LL)
+#endif
+
+		    if (poptArgType(opt) == POPT_ARG_LONGLONG) {
+			if (aNUM == LLONG_MAX || aNUM == LLONG_MIN)
+			    return POPT_ERROR_OVERFLOW;
+			if (poptSaveLongLong(arg.longlongp, opt->argInfo, aNUM))
+			    return POPT_ERROR_BADOPERATION;
+		    } else
 		    if (poptArgType(opt) == POPT_ARG_LONG) {
-			if (aLong == LONG_MIN || aLong == LONG_MAX)
+			if (aNUM > LONG_MAX || aNUM < LONG_MIN)
 			    return POPT_ERROR_OVERFLOW;
-			if (poptSaveLong((long *)opt->arg, opt->argInfo, aLong))
+			if (poptSaveLong(arg.longp, opt->argInfo, aNUM))
 			    return POPT_ERROR_BADOPERATION;
-		    } else {
-			if (aLong > INT_MAX || aLong < INT_MIN)
+		    } else
+		    if (poptArgType(opt) == POPT_ARG_INT) {
+			if (aNUM > INT_MAX || aNUM < INT_MIN)
 			    return POPT_ERROR_OVERFLOW;
-			if (poptSaveInt((int *)opt->arg, opt->argInfo, aLong))
+			if (poptSaveInt(arg.intp, opt->argInfo, aNUM))
 			    return POPT_ERROR_BADOPERATION;
-		    }
+		    } else
+			return POPT_ERROR_BADOPERATION;
 		}   /*@switchbreak@*/ break;
 
 		case POPT_ARG_FLOAT:
@@ -948,14 +1004,14 @@ int poptGetNextOpt(poptContext con)
 		    }
 
 		    if (poptArgType(opt) == POPT_ARG_DOUBLE) {
-			*((double *) opt->arg) = aDouble;
+			arg.doublep[0] = aDouble;
 		    } else {
 #define _ABS(a)	((((a) - 0.0) < DBL_EPSILON) ? -(a) : (a))
 			if ((_ABS(aDouble) - FLT_MAX) > DBL_EPSILON)
 			    return POPT_ERROR_OVERFLOW;
 			if ((FLT_MIN - _ABS(aDouble)) > DBL_EPSILON)
 			    return POPT_ERROR_OVERFLOW;
-			*((float *) opt->arg) = aDouble;
+			arg.floatp[0] = aDouble;
 		    }
 		}   /*@switchbreak@*/ break;
 		case POPT_ARG_MAINCALL:
diff --git a/popt.h b/popt.h
index 9300ec9..406cfb6 100644
--- a/popt.h
+++ b/popt.h
@@ -19,8 +19,8 @@
 /*@{*/
 #define POPT_ARG_NONE		 0U	/*!< no arg */
 #define POPT_ARG_STRING		 1U	/*!< arg will be saved as string */
-#define POPT_ARG_INT		 2U	/*!< arg will be converted to int */
-#define POPT_ARG_LONG		 3U	/*!< arg will be converted to long */
+#define POPT_ARG_INT		 2U	/*!< arg ==> int */
+#define POPT_ARG_LONG		 3U	/*!< arg ==> long */
 #define POPT_ARG_INCLUDE_TABLE	 4U	/*!< arg points to table */
 #define POPT_ARG_CALLBACK	 5U	/*!< table-wide callback... must be
 					   set first in table; arg points 
@@ -31,10 +31,11 @@
 					   included tables; arg points
 					   to the domain string */
 #define POPT_ARG_VAL		 7U	/*!< arg should take value val */
-#define	POPT_ARG_FLOAT		 8U	/*!< arg will be converted to float */
-#define	POPT_ARG_DOUBLE		 9U	/*!< arg will be converted to double */
+#define	POPT_ARG_FLOAT		 8U	/*!< arg ==> float */
+#define	POPT_ARG_DOUBLE		 9U	/*!< arg ==> double */
+#define	POPT_ARG_LONGLONG	 10U	/*!< arg ==> long long */
 
-#define POPT_ARG_MAINCALL	10U 	/*!< return (*arg) (argc, argv) */
+#define POPT_ARG_MAINCALL	256+10U	/*!< EXPERIMENTAL: return (*arg) (argc, argv) */
 
 #define POPT_ARG_MASK		0x0000FFFFU
 /*@}*/
@@ -531,6 +532,23 @@ int poptStrippedArgv(poptContext con, int argc, char ** argv)
 	/*@modifies *argv @*/;
 /*@=fcnuse@*/
 
+/**
+ * Save a long long, performing logical operation with value.
+ * @warning Alignment check may be too strict on certain platorms.
+ * @param arg		integer pointer, aligned on int boundary.
+ * @param argInfo	logical operation (see POPT_ARGFLAG_*)
+ * @param aLongLong	value to use
+ * @return		0 on success, POPT_ERROR_NULLARG/POPT_ERROR_BADOPERATION
+ */
+/*@-incondefs@*/
+/*@unused@*/
+int poptSaveLongLong(/*@null@*/ long long * arg, unsigned int argInfo,
+		long long aLongLong)
+	/*@globals internalState @*/
+	/*@modifies *arg, internalState @*/
+	/*@requires maxSet(arg) >= 0 /\ maxRead(arg) == 0 @*/;
+/*@=incondefs@*/
+
 /**
  * Save a long, performing logical operation with value.
  * @warning Alignment check may be too strict on certain platorms.
diff --git a/poptint.h b/poptint.h
index cd56b9c..80186eb 100644
--- a/poptint.h
+++ b/poptint.h
@@ -42,6 +42,14 @@ typedef struct {
 #define PBM_CLR(d, s)   (__PBM_BITS (s)[__PBM_IX (d)] &= ~__PBM_MASK (d))
 #define PBM_ISSET(d, s) ((__PBM_BITS (s)[__PBM_IX (d)] & __PBM_MASK (d)) != 0)
 
+/** \ingroup popt
+ * Typedef's for string and array of strings.
+ */
+/*@-exporttype@*/
+typedef const char * poptString;
+typedef poptString * poptArgv;
+/*@=exporttype@*/
+
 /** \ingroup popt
  * A union to simplify opt->arg access without casting.
  */
@@ -51,6 +59,9 @@ typedef union poptArg_u {
     void * ptr;
     int * intp;
     long * longp;
+    long long * longlongp;
+    float * floatp;
+    double * doublep;
     const char ** argv;
     poptCallbackType cb;
 /*@shared@*/
@@ -69,7 +80,7 @@ typedef union poptArg_u {
 struct optionStackEntry {
     int argc;
 /*@only@*/ /*@null@*/
-    const char ** argv;
+    poptArgv argv;
 /*@only@*/ /*@null@*/
     pbm_set * argb;
     int next;
@@ -87,7 +98,7 @@ struct poptContext_s {
 /*@dependent@*/
     struct optionStackEntry * os;
 /*@owned@*/ /*@null@*/
-    const char ** leftovers;
+    poptArgv leftovers;
     int numLeftovers;
     int nextLeftover;
 /*@keep@*/
@@ -103,7 +114,7 @@ struct poptContext_s {
     poptItem execs;
     int numExecs;
 /*@only@*/ /*@null@*/
-    const char ** finalArgv;
+    poptArgv finalArgv;
     int finalArgvCount;
     int finalArgvAlloced;
     int (*maincall) (int argc, const char **argv);
diff --git a/test1.c b/test1.c
index deddc92..646d89d 100644
--- a/test1.c
+++ b/test1.c
@@ -42,9 +42,13 @@ static int aInt = 271828;
 /*@unchecked@*/
 static int bInt = 271828;
 /*@unchecked@*/
-static long aLong = 738905609L;
+static long aLong = 738905609LL;
 /*@unchecked@*/
-static long bLong = 738905609L;
+static long bLong = 738905609LL;
+/*@unchecked@*/
+static long long aLongLong = 738905609L;
+/*@unchecked@*/
+static long long bLongLong = 738905609L;
 /*@unchecked@*/
 static float aFloat = 3.1415926535;
 /*@unchecked@*/
@@ -121,6 +125,8 @@ static struct poptOption options[] = {
 	"POPT_ARG_INT: 271828", NULL },
   { "long", 'l', POPT_ARG_LONG | POPT_ARGFLAG_SHOW_DEFAULT, &aLong, 0,
 	"POPT_ARG_LONG: 738905609", NULL },
+  { "longlong", 'L', POPT_ARG_LONGLONG | POPT_ARGFLAG_SHOW_DEFAULT, &aLongLong, 0,
+	"POPT_ARG_LONGLONG: 738905609", NULL },
   { "float", 'f', POPT_ARG_FLOAT | POPT_ARGFLAG_SHOW_DEFAULT, &aFloat, 0,
 	"POPT_ARG_FLOAT: 3.14159", NULL },
   { "double", 'd', POPT_ARG_DOUBLE | POPT_ARGFLAG_SHOW_DEFAULT, &aDouble, 0,
@@ -148,10 +154,10 @@ static struct poptOption options[] = {
 
 static void resetVars(void)
 	/*@globals arg1, arg2, arg3, inc, shortopt,
-		aVal, aFlag, aInt, aLong, aFloat, aDouble,
+		aVal, aFlag, aInt, aLong, aLongLong, aFloat, aDouble,
 		oStr, singleDash, pass2 @*/
 	/*@modifies arg1, arg2, arg3, inc, shortopt,
-		aVal, aFlag, aInt, aLong, aFloat, aDouble,
+		aVal, aFlag, aInt, aLong, aLongLong, aFloat, aDouble,
 		oStr, singleDash, pass2 @*/
 {
     arg1 = 0;
@@ -165,6 +171,7 @@ static void resetVars(void)
 
     aInt = bInt;
     aLong = bLong;
+    aLongLong = bLongLong;
     aFloat = bFloat;
     aDouble = bDouble;
 
@@ -243,6 +250,8 @@ int main(int argc, const char ** argv)
 	fprintf(stdout, " aInt: %d", aInt);
     if (aLong != bLong)
 	fprintf(stdout, " aLong: %ld", aLong);
+    if (aLongLong != bLongLong)
+	fprintf(stdout, " aLongLong: %lld", aLongLong);
 /*@-realcompare@*/
     if (aFloat != bFloat)
 	fprintf(stdout, " aFloat: %g", (double)aFloat);
diff --git a/testit.sh b/testit.sh
index 822237d..e6ba662 100755
--- a/testit.sh
+++ b/testit.sh
@@ -69,10 +69,13 @@ run test1 "test1 - 17" "arg1: 1 arg2: (none) rest: foo --arg2 something" --arg1
 unset POSIXLY_CORRECT
 run test1 "test1 - 18" "callback: c sampledata bar arg1: 1 arg2: (none)" --arg1 --cb bar
 run test1 "test1 - 19" "" --echo-args
-run test1 "test1 - 20" "--arg1" --echo-args --arg1
-run test1 "test1 - 21" "--arg2 something" -T something -e
-run test1 "test1 - 22" "--arg2 something more args" -T something -a more args
-run test1 "test1 - 23" "--echo-args -a" --echo-args -e -a
+
+# XXX FIXME
+#run test1 "test1 - 20" "--arg1" --echo-args --arg1
+#run test1 "test1 - 21" "--arg2 something" -T something -e
+#run test1 "test1 - 22" "--arg2 something more args" -T something -a more args
+#run test1 "test1 - 23" "--echo-args -a" --echo-args -e -a
+
 run test1 "test1 - 24" "arg1: 0 arg2: (none) short: 1" -onedash
 run test1 "test1 - 25" "arg1: 0 arg2: (none) short: 1" --onedash
 run test1 "test1 - 26" "callback: c arg for cb2 foo arg1: 0 arg2: (none)" --cb2 foo
@@ -82,19 +85,27 @@ run test1 "test1 - 29" "arg1: 0 arg2: bbbb" --arg2=aaaa -2 bbbb
 run test1 "test1 - 30" "arg1: 0 arg2: 'foo bingo' rest: boggle" --grab bingo boggle
 run test1 "test1 - 31" "arg1: 0 arg2: 'foo bar' rest: boggle" --grabbar boggle
 
-run test1 "test1 - 32" "arg1: 0 arg2: (none) aFloat: 10.1" -f 10.1
-run test1 "test1 - 33" "arg1: 0 arg2: (none) aFloat: 10.1" --float 10.1
-run test1 "test1 - 34" "arg1: 0 arg2: (none) aDouble: 10.1" -d 10.1
-run test1 "test1 - 35" "arg1: 0 arg2: (none) aDouble: 10.1" --double 10.1
-run test1 "test1 - 36" "arg1: 0 arg2: (none) oStr: (none)" --optional
-run test1 "test1 - 37" "arg1: 0 arg2: (none) oStr: yadda" --optional=yadda
-run test1 "test1 - 38" "arg1: 0 arg2: (none) oStr: yadda" --optional yadda
-run test1 "test1 - 39" "arg1: 0 arg2: (none) oStr: ping rest: pong" --optional=ping pong
-run test1 "test1 - 40" "arg1: 0 arg2: (none) oStr: ping rest: pong" --optional ping pong
-
-run_diff test3 "test3 - 41" test3-data/01.input test3-data/01.answer
-run_diff test3 "test3 - 42" test3-data/02.input test3-data/02.answer
-run_diff test3 "test3 - 43" test3-data/03.input test3-data/03.answer
+run test1 "test1 - 32" "arg1: 0 arg2: (none) aInt: 123456789" -i 123456789
+run test1 "test1 - 33" "arg1: 0 arg2: (none) aInt: 123456789" --int 123456789
+run test1 "test1 - 34" "arg1: 0 arg2: (none) aLong: 1123456789" -l 1123456789
+run test1 "test1 - 35" "arg1: 0 arg2: (none) aLong: 1123456789" --long 1123456789
+run test1 "test1 - 36" "arg1: 0 arg2: (none) aLongLong: 1111123456789" -L 1111123456789
+run test1 "test1 - 37" "arg1: 0 arg2: (none) aLongLong: 1111123456789" --longlong 1111123456789
+
+run test1 "test1 - 38" "arg1: 0 arg2: (none) aFloat: 10.1" -f 10.1
+run test1 "test1 - 39" "arg1: 0 arg2: (none) aFloat: 10.1" --float 10.1
+run test1 "test1 - 40" "arg1: 0 arg2: (none) aDouble: 10.1" -d 10.1
+run test1 "test1 - 41" "arg1: 0 arg2: (none) aDouble: 10.1" --double 10.1
+
+run test1 "test1 - 42" "arg1: 0 arg2: (none) oStr: (none)" --optional
+run test1 "test1 - 43" "arg1: 0 arg2: (none) oStr: yadda" --optional=yadda
+run test1 "test1 - 44" "arg1: 0 arg2: (none) oStr: yadda" --optional yadda
+run test1 "test1 - 45" "arg1: 0 arg2: (none) oStr: ping rest: pong" --optional=ping pong
+run test1 "test1 - 46" "arg1: 0 arg2: (none) oStr: ping rest: pong" --optional ping pong
+
+#run_diff test3 "test3 - 51" test3-data/01.input test3-data/01.answer
+#run_diff test3 "test3 - 52" test3-data/02.input test3-data/02.answer
+#run_diff test3 "test3 - 53" test3-data/03.input test3-data/03.answer
 
 echo ""
 echo "Passed."
-- 
Gitee


From f85aa9db1f0b6853e5e186f7eb705560ec8d33b5 Mon Sep 17 00:00:00 2001
From: Jeff Johnson <n3npq@mac.com>
Date: Wed, 13 Feb 2008 01:24:09 +0000
Subject: [PATCH 494/667] - add POPT_ARG_ARGV, starting with the
 poptSaveString() method. - add help for POPT_ARG_LONGLONG.

---
 CHANGES    |  2 ++
 popt.c     | 48 +++++++++++++++++++++++++++++++++++++++---------
 popt.h     | 15 ++++++++++++++-
 popthelp.c | 41 ++++++++++++++++++++++++++---------------
 test1.c    | 29 +++++++++++++++++++++++++++--
 5 files changed, 108 insertions(+), 27 deletions(-)

diff --git a/CHANGES b/CHANGES
index e10480c..fc18ee3 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,4 +1,6 @@
 1.13 -> 1.14:
+    - jbj: add POPT_ARG_ARGV, starting with the poptSaveString() method.
+    - jbj: add help for POPT_ARG_LONGLONG.
     - jbj: hmmm, POSIXly correct --echo-args needs fixing, disable for now.
     - jbj: poptint.h: typedef's for string and string arrays.
     - jbj: add POPT_ARG_LONGLONG, and poptSaveLongLong().
diff --git a/popt.c b/popt.c
index b75ab6d..4ef99e8 100644
--- a/popt.c
+++ b/popt.c
@@ -617,17 +617,45 @@ static void poptStripArg(/*@special@*/ poptContext con, int which)
 /*@=compdef@*/
 }
 
+int poptSaveString(const char *** argvp, /*@unused@*/ unsigned int argInfo,
+		const char * val)
+{
+    poptArgv argv;
+    int argc = 0;
+
+    if (argvp == NULL)
+	return -1;
+
+    /* XXX likely needs an upper bound on argc. */
+    if (*argvp)
+    while ((*argvp)[argc] != NULL)
+	argc++;
+ 
+/*@-unqualifiedtrans@*/
+    *argvp = xrealloc(*argvp, (argc + 1 + 1) * sizeof(**argvp));
+/*@=unqualifiedtrans@*/
+    if ((argv = *argvp) != NULL) {
+	argv[argc++] = xstrdup(val);
+	argv[argc  ] = NULL;
+    }
+/*@-nullstate@*/
+    return 0;
+/*@=nullstate@*/
+}
+
 /*@unchecked@*/
 static unsigned int seed = 0;
 
 /*@-bitwisesigned@*/	/* LCL: logical ops with unsigned. */
 int poptSaveLongLong(long long * arg, unsigned int argInfo, long long aLongLong)
 {
+    if (arg == NULL
 #ifdef	NOTYET
     /* XXX Check alignment, may fail on funky platforms. */
-    if (arg == NULL || (((unsigned long long)arg) & (sizeof(*arg)-1)))
-	return POPT_ERROR_NULLARG;
+     || (((unsigned long long)arg) & (sizeof(*arg)-1))
 #endif
+    )
+	return POPT_ERROR_NULLARG;
 
     if (aLongLong != 0 && argInfo & POPT_ARGFLAG_RANDOM) {
 	if (!seed) {
@@ -822,13 +850,6 @@ int poptGetNextOpt(poptContext con)
 		else
 		    singleDash = 1;
 
-		/* XXX aliases with arg substitution need "--alias=arg" */
-		if (handleAlias(con, optString, '\0', NULL))
-		    continue;
-
-		if (handleExec(con, optString, '\0'))
-		    continue;
-
 		/* Check for "--long=arg" option. */
 		for (oe = optString; *oe && *oe != '='; oe++)
 		    {};
@@ -836,6 +857,13 @@ int poptGetNextOpt(poptContext con)
 		if (*oe == '=')
 		    longArg = oe + 1;
 
+		/* XXX aliases with arg substitution need "--alias=arg" */
+		if (handleAlias(con, optString, '\0', NULL))
+		    continue;
+
+		if (handleExec(con, optString, '\0'))
+		    continue;
+
 		opt = findOption(con->options, optString, optStringLen, '\0', &cb, &cbData,
 				 singleDash);
 		if (!opt && !singleDash)
@@ -953,7 +981,9 @@ int poptGetNextOpt(poptContext con)
 		    char *end;
 
 		    if (con->os->nextArg) {
+/*@-unrecog@*/
 			aNUM = strtoll(con->os->nextArg, &end, 0);
+/*@=unrecog@*/
 			if (!(end && *end == '\0'))
 			    return POPT_ERROR_BADNUMBER;
 		    }
diff --git a/popt.h b/popt.h
index 406cfb6..e5a1179 100644
--- a/popt.h
+++ b/popt.h
@@ -35,7 +35,8 @@
 #define	POPT_ARG_DOUBLE		 9U	/*!< arg ==> double */
 #define	POPT_ARG_LONGLONG	 10U	/*!< arg ==> long long */
 
-#define POPT_ARG_MAINCALL	256+10U	/*!< EXPERIMENTAL: return (*arg) (argc, argv) */
+#define POPT_ARG_MAINCALL	256+11U	/*!< EXPERIMENTAL: return (*arg) (argc, argv) */
+#define	POPT_ARG_ARGV		256+12U	/*!< (unimplemented): dupe'd arg appended to realloc'd argv array. */
 
 #define POPT_ARG_MASK		0x0000FFFFU
 /*@}*/
@@ -532,6 +533,18 @@ int poptStrippedArgv(poptContext con, int argc, char ** argv)
 	/*@modifies *argv @*/;
 /*@=fcnuse@*/
 
+/**
+ * Add a string to an argv array.
+ * @retval *argvp	argv array
+ * @param argInfo	(unused)
+ * @param val		string arg to add (using strdup)
+ * @return		0 always
+ */
+/*@unused@*/
+int poptSaveString(/*@null@*/ const char *** argvp, unsigned int argInfo,
+		const char * val)
+	/*@modifies *argvp @*/;
+
 /**
  * Save a long long, performing logical operation with value.
  * @warning Alignment check may be too strict on certain platorms.
diff --git a/popthelp.c b/popthelp.c
index 8624472..8466758 100644
--- a/popthelp.c
+++ b/popthelp.c
@@ -157,6 +157,8 @@ getArgDescrip(const struct poptOption * opt,
 
     if (poptArgType(opt) == POPT_ARG_MAINCALL)
 	return opt->argDescrip;
+    if (poptArgType(opt) == POPT_ARG_ARGV)
+	return opt->argDescrip;
 
     if (opt->argDescrip) {
 	/* Some strings need popt library, not application, i18n domain. */
@@ -179,10 +181,12 @@ getArgDescrip(const struct poptOption * opt,
 #endif
     case POPT_ARG_INT:		return POPT_("INT");
     case POPT_ARG_LONG:		return POPT_("LONG");
+    case POPT_ARG_LONGLONG:	return POPT_("LONGLONG");
     case POPT_ARG_STRING:	return POPT_("STRING");
     case POPT_ARG_FLOAT:	return POPT_("FLOAT");
     case POPT_ARG_DOUBLE:	return POPT_("DOUBLE");
     case POPT_ARG_MAINCALL:	return NULL;
+    case POPT_ARG_ARGV:		return NULL;
     default:			return POPT_("ARG");
     }
 }
@@ -212,30 +216,34 @@ singleOptionDefaultValue(size_t lineLength,
     strcpy(le, defstr);	le += strlen(le);
     *le++ = ':';
     *le++ = ' ';
-    if (opt->arg)	/* XXX programmer error */
+  if (opt->arg) {	/* XXX programmer error */
+    poptArg arg = { .ptr = opt->arg };
     switch (poptArgType(opt)) {
     case POPT_ARG_VAL:
     case POPT_ARG_INT:
-    {	long aLong = *((int *)opt->arg);
-	le += sprintf(le, "%ld", aLong);
-    }	break;
+	le += sprintf(le, "%d", arg.intp[0]);
+	break;
     case POPT_ARG_LONG:
-    {	long aLong = *((long *)opt->arg);
-	le += sprintf(le, "%ld", aLong);
-    }	break;
+	le += sprintf(le, "%ld", arg.longp[0]);
+	break;
+    case POPT_ARG_LONGLONG:
+	le += sprintf(le, "%lld", arg.longlongp[0]);
+	break;
     case POPT_ARG_FLOAT:
-    {	double aDouble = *((float *)opt->arg);
+    {	double aDouble = arg.floatp[0];
 	le += sprintf(le, "%g", aDouble);
     }	break;
     case POPT_ARG_DOUBLE:
-    {	double aDouble = *((double *)opt->arg);
-	le += sprintf(le, "%g", aDouble);
-    }	break;
+	le += sprintf(le, "%g", arg.doublep[0]);
+	break;
     case POPT_ARG_MAINCALL:
 	le += sprintf(le, "%p", opt->arg);
 	break;
+    case POPT_ARG_ARGV:
+	le += sprintf(le, "%p", opt->arg);
+	break;
     case POPT_ARG_STRING:
-    {	const char * s = *(const char **)opt->arg;
+    {	const char * s = arg.argv[0];
 	if (s == NULL) {
 	    strcpy(le, "null");	le += strlen(le);
 	} else {
@@ -254,6 +262,7 @@ singleOptionDefaultValue(size_t lineLength,
 	return NULL;
 	/*@notreached@*/ break;
     }
+  }
     *le++ = ')';
     *le = '\0';
 
@@ -309,7 +318,8 @@ static void singleOptionHelp(FILE * fp, columns_t columns,
 	/* XXX --long always padded for alignment with/without "-X, ". */
 	sprintf(left, "    %s%s",
 		(poptArgType(opt) == POPT_ARG_MAINCALL ? "" :
-		((opt->argInfo & POPT_ARGFLAG_ONEDASH) ? "-" : "--")),
+		(poptArgType(opt) == POPT_ARG_ARGV ? "" :
+		((opt->argInfo & POPT_ARGFLAG_ONEDASH) ? "-" : "--"))),
 		opt->longName);
 #undef	prtlong
 
@@ -377,6 +387,7 @@ static void singleOptionHelp(FILE * fp, columns_t columns,
 		break;
 	    case POPT_ARG_INT:
 	    case POPT_ARG_LONG:
+	    case POPT_ARG_LONGLONG:
 	    case POPT_ARG_FLOAT:
 	    case POPT_ARG_DOUBLE:
 	    case POPT_ARG_STRING:
@@ -391,8 +402,8 @@ static void singleOptionHelp(FILE * fp, columns_t columns,
 
 	    /* XXX argDescrip[0] determines "--foo=bar" or "--foo bar". */
 	    if (!strchr(" =(", argDescrip[0]))
-		*le++ = (poptArgType(opt) == POPT_ARG_MAINCALL)
-			? ' ' : '=';
+		*le++ = ((poptArgType(opt) == POPT_ARG_MAINCALL) ? ' ' :
+			 (poptArgType(opt) == POPT_ARG_ARGV) ? ' ' : '=');
 	    strcpy(le, argDescrip);
 	    lelen = strlen(le);
 	    le += lelen;
diff --git a/test1.c b/test1.c
index 646d89d..500ee18 100644
--- a/test1.c
+++ b/test1.c
@@ -57,6 +57,9 @@ static float bFloat = 3.1415926535;
 static double aDouble = 9.86960440108935861883;
 /*@unchecked@*/
 static double bDouble = 9.86960440108935861883;
+/*@unchecked@*/ /*@only@*/ /*@null@*/
+static const char ** aArgv = NULL;
+
 /*@unchecked@*/ /*@null@*/
 static char * oStr = (char *) -1;
 /*@unchecked@*/
@@ -132,6 +135,16 @@ static struct poptOption options[] = {
   { "double", 'd', POPT_ARG_DOUBLE | POPT_ARGFLAG_SHOW_DEFAULT, &aDouble, 0,
 	"POPT_ARG_DOUBLE: 9.8696", NULL },
 
+   { "randint", '\0', POPT_ARG_INT|POPT_ARGFLAG_RANDOM, &aInt, 0,
+	"POPT_ARGFLAG_RANDOM: experimental", NULL },
+   { "randlong", '\0', POPT_ARG_LONG|POPT_ARGFLAG_RANDOM, &aLong, 0,
+	"POPT_ARGFLAG_RANDOM: experimental", NULL },
+   { "randlonglong", '\0', POPT_ARG_LONGLONG|POPT_ARGFLAG_RANDOM, &aLongLong, 0,
+	"POPT_ARGFLAG_RANDOM: experimental", NULL },
+
+   { "argv", '\0', POPT_ARG_ARGV, &aArgv, 0,
+	"POPT_ARG_ARGV: experimental", NULL },
+
   { "bitset", '\0', POPT_BIT_SET | POPT_ARGFLAG_SHOW_DEFAULT, &aFlag, 0x4321,
 	"POPT_BIT_SET: |= 0x4321", 0},
   { "bitclr", '\0', POPT_BIT_CLR | POPT_ARGFLAG_SHOW_DEFAULT, &aFlag, 0x1234,
@@ -154,10 +167,10 @@ static struct poptOption options[] = {
 
 static void resetVars(void)
 	/*@globals arg1, arg2, arg3, inc, shortopt,
-		aVal, aFlag, aInt, aLong, aLongLong, aFloat, aDouble,
+		aVal, aFlag, aInt, aLong, aLongLong, aFloat, aDouble, aArgv,
 		oStr, singleDash, pass2 @*/
 	/*@modifies arg1, arg2, arg3, inc, shortopt,
-		aVal, aFlag, aInt, aLong, aLongLong, aFloat, aDouble,
+		aVal, aFlag, aInt, aLong, aLongLong, aFloat, aDouble, aArgv,
 		oStr, singleDash, pass2 @*/
 {
     arg1 = 0;
@@ -175,6 +188,18 @@ static void resetVars(void)
     aFloat = bFloat;
     aDouble = bDouble;
 
+    if (aArgv) {
+	int i;
+	for (i = 0; aArgv[i] != NULL; i++) {
+/*@-unqualifiedtrans@*/
+	    free(aArgv[i]);
+/*@=unqualifiedtrans@*/
+	    aArgv[i] = NULL;
+	}
+	free(aArgv);
+	aArgv = NULL;
+    }
+
     oStr = (char *) -1;
 
     singleDash = 0;
-- 
Gitee


From 1d559967eab4671e20d10d891662724d552ca063 Mon Sep 17 00:00:00 2001
From: Jeff Johnson <n3npq@mac.com>
Date: Wed, 13 Feb 2008 01:32:35 +0000
Subject: [PATCH 495/667] - jbj: expose poptSaveLongLong and poptSaveString in
 the loader map.

---
 CHANGES      | 1 +
 libpopt.vers | 3 ++-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/CHANGES b/CHANGES
index fc18ee3..5ea6511 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,4 +1,5 @@
 1.13 -> 1.14:
+    - jbj: expose poptSaveLongLong and poptSaveString in the loader map.
     - jbj: add POPT_ARG_ARGV, starting with the poptSaveString() method.
     - jbj: add help for POPT_ARG_LONGLONG.
     - jbj: hmmm, POSIXly correct --echo-args needs fixing, disable for now.
diff --git a/libpopt.vers b/libpopt.vers
index 2b69faa..01371da 100644
--- a/libpopt.vers
+++ b/libpopt.vers
@@ -1,7 +1,6 @@
 LIBPOPT_0
 {
   global:
-    findProgramPath;
     _fini;
     _init;
     poptAddAlias;
@@ -28,6 +27,8 @@ LIBPOPT_0
     poptResetContext;
     poptSaveInt;
     poptSaveLong;
+    poptSaveLongLong;
+    poptSaveString;
     poptSetExecPath;
     poptSetOtherOptionHelp;
     poptStrerror;
-- 
Gitee


From 075a94fd3c2ffbdda8fa5cee68f8a76ce6da4245 Mon Sep 17 00:00:00 2001
From: Jeff Johnson <n3npq@mac.com>
Date: Wed, 13 Feb 2008 08:27:00 +0000
Subject: [PATCH 496/667] - jbj: free aliases/execs with common code. - jbj:
 rewrite the callback logic using a switch for simplicity. - jbj: hide bit
 field structure behind F_ISSET/LF_ISSET/CBF_ISSET macros.

---
 CHANGES    |   3 +
 popt.c     | 170 ++++++++++++++++++++++++++---------------------------
 popt.h     |   4 +-
 popthelp.c |  55 ++++++++---------
 poptint.h  |   5 +-
 5 files changed, 120 insertions(+), 117 deletions(-)

diff --git a/CHANGES b/CHANGES
index 5ea6511..8e90adf 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,4 +1,7 @@
 1.13 -> 1.14:
+    - jbj: free aliases/execs with common code.
+    - jbj: rewrite the callback logic using a switch for simplicity.
+    - jbj: hide bit field structure behind F_ISSET/LF_ISSET/CBF_ISSET macros.
     - jbj: expose poptSaveLongLong and poptSaveString in the loader map.
     - jbj: add POPT_ARG_ARGV, starting with the poptSaveString() method.
     - jbj: add help for POPT_ARG_LONGLONG.
diff --git a/popt.c b/popt.c
index 4ef99e8..1566bb3 100644
--- a/popt.c
+++ b/popt.c
@@ -68,18 +68,19 @@ static void invokeCallbacksPRE(poptContext con, const struct poptOption * opt)
     if (opt != NULL)
     for (; opt->longName || opt->shortName || opt->arg; opt++) {
 	poptArg arg = { .ptr = opt->arg };
-	if (arg.ptr == NULL) continue;		/* XXX program error. */
-	if (poptArgType(opt) == POPT_ARG_INCLUDE_TABLE) {
+	if (arg.ptr)
+	switch (poptArgType(opt)) {
+	case POPT_ARG_INCLUDE_TABLE:	/* Recurse on included sub-tables. */
 	    poptSubstituteHelpI18N(arg.opt);	/* XXX side effects */
-	    /* Recurse on included sub-tables. */
 	    invokeCallbacksPRE(con, arg.opt);
-	} else if (poptArgType(opt) == POPT_ARG_CALLBACK &&
-		   (opt->argInfo & POPT_CBFLAG_PRE))
-	{
-	    /* Perform callback. */
+	    /*@switchbreak@*/ break;
+	case POPT_ARG_CALLBACK:		/* Perform callback. */
+	    if (!CBF_ISSET(opt, PRE))
+		/*@switchbreak@*/ break;
 	    /*@-noeffectuncon @*/
 	    arg.cb(con, POPT_CALLBACK_REASON_PRE, NULL, NULL, opt->descrip);
 	    /*@=noeffectuncon @*/
+	    /*@switchbreak@*/ break;
 	}
     }
 }
@@ -91,26 +92,27 @@ static void invokeCallbacksPOST(poptContext con, const struct poptOption * opt)
     if (opt != NULL)
     for (; opt->longName || opt->shortName || opt->arg; opt++) {
 	poptArg arg = { .ptr = opt->arg };
-	if (arg.ptr == NULL) continue;		/* XXX program error. */
-	if (poptArgType(opt) == POPT_ARG_INCLUDE_TABLE) {
+	if (arg.ptr)
+	switch (poptArgType(opt)) {
+	case POPT_ARG_INCLUDE_TABLE:	/* Recurse on included sub-tables. */
 	    poptSubstituteHelpI18N(arg.opt);	/* XXX side effects */
-	    /* Recurse on included sub-tables. */
 	    invokeCallbacksPOST(con, arg.opt);
-	} else if (poptArgType(opt) == POPT_ARG_CALLBACK &&
-		   (opt->argInfo & POPT_CBFLAG_POST))
-	{
-	    /* Perform callback. */
+	    /*@switchbreak@*/ break;
+	case POPT_ARG_CALLBACK:		/* Perform callback. */
+	    if (!CBF_ISSET(opt, POST))
+		/*@switchbreak@*/ break;
 	    /*@-noeffectuncon @*/
 	    arg.cb(con, POPT_CALLBACK_REASON_POST, NULL, NULL, opt->descrip);
 	    /*@=noeffectuncon @*/
+	    /*@switchbreak@*/ break;
 	}
     }
 }
 
 static void invokeCallbacksOPTION(poptContext con,
-				  const struct poptOption * opt,
-				  const struct poptOption * myOpt,
-				  /*@null@*/ const void * myData, int shorty)
+				const struct poptOption * opt,
+				const struct poptOption * myOpt,
+				/*@null@*/ const void * myData, int shorty)
 	/*@globals internalState@*/
 	/*@modifies internalState@*/
 {
@@ -120,40 +122,41 @@ static void invokeCallbacksOPTION(poptContext con,
     if (opt != NULL)
     for (; opt->longName || opt->shortName || opt->arg; opt++) {
 	poptArg arg = { .ptr = opt->arg };
-	if (poptArgType(opt) == POPT_ARG_INCLUDE_TABLE) {
+	switch (poptArgType(opt)) {
+	case POPT_ARG_INCLUDE_TABLE:	/* Recurse on included sub-tables. */
 	    poptSubstituteHelpI18N(arg.opt);	/* XXX side effects */
-	    /* Recurse on included sub-tables. */
-	    if (opt->arg != NULL)	/* XXX program error */
+	    if (opt->arg != NULL)
 		invokeCallbacksOPTION(con, opt->arg, myOpt, myData, shorty);
-	} else if (poptArgType(opt) == POPT_ARG_CALLBACK &&
-		  !(opt->argInfo & POPT_CBFLAG_SKIPOPTION)) {
-	    /* Save callback info. */
+	    /*@switchbreak@*/ break;
+	case POPT_ARG_CALLBACK:		/* Save callback info. */
+	    if (CBF_ISSET(opt, SKIPOPTION))
+		/*@switchbreak@*/ break;
 	    cbopt = opt;
 	    cbarg.ptr = opt->arg;
-	} else if (cbopt != NULL &&
-		   ((myOpt->shortName && opt->shortName && shorty &&
-			myOpt->shortName == opt->shortName) ||
-		    (myOpt->longName != NULL && opt->longName != NULL &&
+	    /*@switchbreak@*/ break;
+	default:		/* Perform callback on matching option. */
+	    if (cbopt == NULL || cbarg.cb == NULL)
+		/*@switchbreak@*/ break;
+	    if ((myOpt->shortName && opt->shortName && shorty &&
+			myOpt->shortName == opt->shortName)
+	     || (myOpt->longName != NULL && opt->longName != NULL &&
 			!strcmp(myOpt->longName, opt->longName)))
-		   )
-	{
-	    const void * cbData = (cbopt->descrip ? cbopt->descrip : myData);
-	    /* Perform callback. */
-	    if (cbarg.cb != NULL) {	/* XXX program error */
+	    {	const void *cbData = (cbopt->descrip ? cbopt->descrip : myData);
 		/*@-noeffectuncon @*/
-		cbarg.cb(con, POPT_CALLBACK_REASON_OPTION, myOpt,
-			con->os->nextArg, cbData);
+		cbarg.cb(con, POPT_CALLBACK_REASON_OPTION,
+			myOpt, con->os->nextArg, cbData);
 		/*@=noeffectuncon @*/
+		/* Terminate (unless explcitly continuing). */
+		if (!CBF_ISSET(cbopt, CONTINUE))
+		    return;
 	    }
-	    /* Terminate (unless explcitly continuing). */
-	    if (!(cbopt->argInfo & POPT_CBFLAG_CONTINUE))
-		return;
+	    /*@switchbreak@*/ break;
 	}
     }
 }
 
 poptContext poptGetContext(const char * name, int argc, const char ** argv,
-			   const struct poptOption * options, unsigned int flags)
+			const struct poptOption * options, unsigned int flags)
 {
     poptContext con = malloc(sizeof(*con));
 
@@ -490,7 +493,7 @@ findOption(const struct poptOption * opt, /*@null@*/ const char * longName, int
 	    cb = opt;
 	    cbarg.ptr = opt->arg;
 	} else if (longName != NULL && opt->longName != NULL &&
-		   (!singleDash || (opt->argInfo & POPT_ARGFLAG_ONEDASH)) &&
+		   (!singleDash || F_ISSET(opt, ONEDASH)) &&
 		   (!strncmp(longName, opt->longName, longNameLen) && strlen(opt->longName) == longNameLen))
 	{
 	    break;
@@ -507,8 +510,7 @@ findOption(const struct poptOption * opt, /*@null@*/ const char * longName, int
 	*callback = (cb ? cbarg.cb : NULL);
     if (callbackData)
 /*@-observertrans@*/	/* FIX: typedef double indirection. */
-	*callbackData = (cb && !(cb->argInfo & POPT_CBFLAG_INC_DATA)
-		? cb->descrip : NULL);
+	*callbackData = (cb && !CBF_ISSET(cb, INC_DATA) ? cb->descrip : NULL);
 /*@=observertrans@*/
 /*@=modobserver =mods @*/
 
@@ -657,7 +659,7 @@ int poptSaveLongLong(long long * arg, unsigned int argInfo, long long aLongLong)
     )
 	return POPT_ERROR_NULLARG;
 
-    if (aLongLong != 0 && argInfo & POPT_ARGFLAG_RANDOM) {
+    if (aLongLong != 0 && LF_ISSET(RANDOM)) {
 	if (!seed) {
 	    srandom((unsigned)getpid());
 	    srandom((unsigned)random());
@@ -665,9 +667,9 @@ int poptSaveLongLong(long long * arg, unsigned int argInfo, long long aLongLong)
 	aLongLong = random() % (aLongLong > 0 ? aLongLong : -aLongLong);
 	aLongLong++;
     }
-    if (argInfo & POPT_ARGFLAG_NOT)
+    if (LF_ISSET(NOT))
 	aLongLong = ~aLongLong;
-    switch (argInfo & POPT_ARGFLAG_LOGICALOPS) {
+    switch (LF_ISSET(LOGICALOPS)) {
     case 0:
 	*arg = aLongLong;
 	break;
@@ -695,7 +697,7 @@ int poptSaveLong(long * arg, unsigned int argInfo, long aLong)
     if (arg == NULL || (((unsigned long)arg) & (sizeof(*arg)-1)))
 	return POPT_ERROR_NULLARG;
 
-    if (aLong != 0 && argInfo & POPT_ARGFLAG_RANDOM) {
+    if (aLong != 0 && LF_ISSET(RANDOM)) {
 	if (!seed) {
 	    srandom((unsigned)getpid());
 	    srandom((unsigned)random());
@@ -703,9 +705,9 @@ int poptSaveLong(long * arg, unsigned int argInfo, long aLong)
 	aLong = random() % (aLong > 0 ? aLong : -aLong);
 	aLong++;
     }
-    if (argInfo & POPT_ARGFLAG_NOT)
+    if (LF_ISSET(NOT))
 	aLong = ~aLong;
-    switch (argInfo & POPT_ARGFLAG_LOGICALOPS) {
+    switch (LF_ISSET(LOGICALOPS)) {
     case 0:
 	*arg = aLong;
 	break;
@@ -733,7 +735,7 @@ int poptSaveInt(/*@null@*/ int * arg, unsigned int argInfo, long aLong)
     if (arg == NULL || (((unsigned long)arg) & (sizeof(*arg)-1)))
 	return POPT_ERROR_NULLARG;
 
-    if (aLong != 0 && argInfo & POPT_ARGFLAG_RANDOM) {
+    if (aLong != 0 && LF_ISSET(RANDOM)) {
 	if (!seed) {
 	    srandom((unsigned)getpid());
 	    srandom((unsigned)random());
@@ -741,9 +743,9 @@ int poptSaveInt(/*@null@*/ int * arg, unsigned int argInfo, long aLong)
 	aLong = random() % (aLong > 0 ? aLong : -aLong);
 	aLong++;
     }
-    if (argInfo & POPT_ARGFLAG_NOT)
+    if (LF_ISSET(NOT))
 	aLong = ~aLong;
-    switch (argInfo & POPT_ARGFLAG_LOGICALOPS) {
+    switch (LF_ISSET(LOGICALOPS)) {
     case 0:
 	*arg = aLong;
 	break;
@@ -873,8 +875,7 @@ int poptGetNextOpt(poptContext con)
 	    if (!opt) {
 		con->os->nextCharArg = origOptString + 1;
 	    } else {
-		if (con->os == con->optionStack &&
-		   opt->argInfo & POPT_ARGFLAG_STRIP)
+		if (con->os == con->optionStack && F_ISSET(opt, STRIP))
 		{
 		    canstrip = 1;
 		    poptStripArg(con, thisopt);
@@ -931,11 +932,12 @@ int poptGetNextOpt(poptContext con)
 		con->os->nextCharArg = NULL;
 	    } else {
 		while (con->os->next == con->os->argc &&
-		       con->os > con->optionStack) {
+			con->os > con->optionStack)
+		{
 		    cleanOSE(con->os--);
 		}
 		if (con->os->next == con->os->argc) {
-		    if (!(opt->argInfo & POPT_ARGFLAG_OPTIONAL))
+		    if (!F_ISSET(opt, OPTIONAL))
 			return POPT_ERROR_NOARG;
 		    con->os->nextArg = NULL;
 		} else {
@@ -944,14 +946,14 @@ int poptGetNextOpt(poptContext con)
 		     * Make sure this isn't part of a short arg or the
 		     * result of an alias expansion.
 		     */
-		    if (con->os == con->optionStack &&
-			(opt->argInfo & POPT_ARGFLAG_STRIP) &&
-			canstrip) {
+		    if (con->os == con->optionStack
+		     && F_ISSET(opt, STRIP) && canstrip)
+		    {
 			poptStripArg(con, con->os->next);
 		    }
 		
 		    if (con->os->argv != NULL) {	/* XXX can't happen */
-			if (opt->argInfo & POPT_ARGFLAG_OPTIONAL &&
+			if (F_ISSET(opt, OPTIONAL) &&
 			    con->os->argv[con->os->next][0] == '-') {
 			    con->os->nextArg = NULL;
 			} else {
@@ -1074,8 +1076,7 @@ int poptGetNextOpt(poptContext con)
 	{   char *s = malloc((opt->longName ? strlen(opt->longName) : 0) + 3);
 	    if (s != NULL) {	/* XXX can't happen */
 		if (opt->longName)
-		    sprintf(s, "%s%s",
-			((opt->argInfo & POPT_ARGFLAG_ONEDASH) ? "-" : "--"),
+		    sprintf(s, "%s%s", (F_ISSET(opt, ONEDASH) ? "-" : "--"),
 			opt->longName);
 		else
 		    sprintf(s, "-%c", opt->shortName);
@@ -1138,38 +1139,37 @@ const char ** poptGetArgs(poptContext con)
 /*@=nullret =nullstate @*/
 }
 
-poptContext poptFreeContext(poptContext con)
+static /*@null@*/
+poptItem poptFreeItems(/*@only@*/ /*@null@*/ poptItem items, int nitems)
+	/*@modifies items @*/
 {
-    poptItem item;
-    int i;
+    if (items != NULL) {
+	poptItem item = items;
+	while (--nitems >= 0) {
+/*@-modobserver -observertrans -dependenttrans@*/
+	    item->option.longName = _free(item->option.longName);
+	    item->option.descrip = _free(item->option.descrip);
+	    item->option.argDescrip = _free(item->option.argDescrip);
+/*@=modobserver =observertrans =dependenttrans@*/
+	    item->argv = _free(item->argv);
+	    item++;
+	}
+	items = _free(items);
+    }
+    return NULL;
+}
 
+poptContext poptFreeContext(poptContext con)
+{
     if (con == NULL) return con;
     poptResetContext(con);
     con->os->argb = _free(con->os->argb);
 
-    if (con->aliases != NULL)
-    for (i = 0; i < con->numAliases; i++) {
-	item = con->aliases + i;
-/*@-modobserver -observertrans -dependenttrans@*/
-	item->option.longName = _free(item->option.longName);
-	item->option.descrip = _free(item->option.descrip);
-	item->option.argDescrip = _free(item->option.argDescrip);
-/*@=modobserver =observertrans =dependenttrans@*/
-	item->argv = _free(item->argv);
-    }
-    con->aliases = _free(con->aliases);
+    con->aliases = poptFreeItems(con->aliases, con->numAliases);
+    con->numAliases = 0;
 
-    if (con->execs != NULL)
-    for (i = 0; i < con->numExecs; i++) {
-	item = con->execs + i;
-/*@-modobserver -observertrans -dependenttrans@*/
-	item->option.longName = _free(item->option.longName);
-	item->option.descrip = _free(item->option.descrip);
-	item->option.argDescrip = _free(item->option.argDescrip);
-/*@=modobserver =observertrans =dependenttrans@*/
-	item->argv = _free(item->argv);
-    }
-    con->execs = _free(con->execs);
+    con->execs = poptFreeItems(con->execs, con->numExecs);
+    con->numExecs = 0;
 
     con->leftovers = _free(con->leftovers);
     con->finalArgv = _free(con->finalArgv);
diff --git a/popt.h b/popt.h
index e5a1179..0911b1c 100644
--- a/popt.h
+++ b/popt.h
@@ -35,8 +35,8 @@
 #define	POPT_ARG_DOUBLE		 9U	/*!< arg ==> double */
 #define	POPT_ARG_LONGLONG	 10U	/*!< arg ==> long long */
 
-#define POPT_ARG_MAINCALL	256+11U	/*!< EXPERIMENTAL: return (*arg) (argc, argv) */
-#define	POPT_ARG_ARGV		256+12U	/*!< (unimplemented): dupe'd arg appended to realloc'd argv array. */
+#define POPT_ARG_MAINCALL	16+11U	/*!< EXPERIMENTAL: return (*arg) (argc, argv) */
+#define	POPT_ARG_ARGV		16+12U	/*!< (unimplemented): dupe'd arg appended to realloc'd argv array. */
 
 #define POPT_ARG_MASK		0x0000FFFFU
 /*@}*/
diff --git a/popthelp.c b/popthelp.c
index 8466758..68dc10d 100644
--- a/popthelp.c
+++ b/popthelp.c
@@ -310,7 +310,7 @@ static void singleOptionHelp(FILE * fp, columns_t columns,
 	goto out;
     if (prtshort && prtlong)
 	sprintf(left, "-%c, %s%s", opt->shortName,
-		((opt->argInfo & POPT_ARGFLAG_ONEDASH) ? "-" : "--"),
+		(F_ISSET(opt, ONEDASH) ? "-" : "--"),
 		opt->longName);
     else if (prtshort) 
 	sprintf(left, "-%c", opt->shortName);
@@ -319,18 +319,18 @@ static void singleOptionHelp(FILE * fp, columns_t columns,
 	sprintf(left, "    %s%s",
 		(poptArgType(opt) == POPT_ARG_MAINCALL ? "" :
 		(poptArgType(opt) == POPT_ARG_ARGV ? "" :
-		((opt->argInfo & POPT_ARGFLAG_ONEDASH) ? "-" : "--"))),
+		(F_ISSET(opt, ONEDASH) ? "-" : "--"))),
 		opt->longName);
 #undef	prtlong
 
     if (argDescrip) {
 	char * le = left + strlen(left);
 
-	if (opt->argInfo & POPT_ARGFLAG_OPTIONAL)
+	if (F_ISSET(opt, OPTIONAL))
 	    *le++ = '[';
 
 	/* Choose type of output */
-	if (opt->argInfo & POPT_ARGFLAG_SHOW_DEFAULT) {
+	if (F_ISSET(opt, SHOW_DEFAULT)) {
 	    defs = singleOptionDefaultValue(lineLength, opt, translation_domain);
 	    if (defs) {
 		char * t = malloc((help ? strlen(help) : 0) +
@@ -356,8 +356,8 @@ static void singleOptionHelp(FILE * fp, columns_t columns,
 	    case POPT_ARG_VAL:
 #ifdef	NOTNOW	/* XXX pug ugly nerdy output */
 	    {	long aLong = opt->val;
-		int ops = (opt->argInfo & POPT_ARGFLAG_LOGICALOPS);
-		int negate = (opt->argInfo & POPT_ARGFLAG_NOT);
+		int ops = F_ISSET(opt, LOGICALOPS);
+		int negate = F_ISSET(opt, NOT);
 
 		/* Don't bother displaying typical values */
 		if (!ops && (aLong == 0L || aLong == 1L || aLong == -1L))
@@ -421,7 +421,7 @@ static void singleOptionHelp(FILE * fp, columns_t columns,
 	    }
 #endif
 	}
-	if (opt->argInfo & POPT_ARGFLAG_OPTIONAL)
+	if (F_ISSET(opt, OPTIONAL))
 	    *le++ = ']';
 	*le = '\0';
     }
@@ -489,13 +489,12 @@ static size_t maxArgWidth(const struct poptOption * opt,
 	    if (opt->arg)	/* XXX program error */
 	        len = maxArgWidth(opt->arg, translation_domain);
 	    if (len > max) max = len;
-	} else if (!(opt->argInfo & POPT_ARGFLAG_DOC_HIDDEN)) {
+	} else if (!F_ISSET(opt, DOC_HIDDEN)) {
 	    len = sizeof("  ")-1;
 	    /* XXX --long always padded for alignment with/without "-X, ". */
 	    len += sizeof("-X, ")-1;
 	    if (opt->longName) {
-		len += ((opt->argInfo & POPT_ARGFLAG_ONEDASH)
-			? sizeof("-")-1 : sizeof("--")-1);
+		len += (F_ISSET(opt, ONEDASH) ? sizeof("-") : sizeof("--")) - 1;
 		len += strlen(opt->longName);
 	    }
 
@@ -508,7 +507,7 @@ static size_t maxArgWidth(const struct poptOption * opt,
 		const char * scopy = s;
 		mbstate_t t;
 
-		memset ((void *)&t, 0, sizeof (t));	/* In initial state.  */
+		memset ((void *)&t, 0, sizeof(t));	/* In initial state.  */
 		/* Determine number of display characters.  */
 		n = mbsrtowcs (NULL, &scopy, strlen(scopy), &t);
 #else
@@ -519,7 +518,7 @@ static size_t maxArgWidth(const struct poptOption * opt,
 		len += n;
 	    }
 
-	    if (opt->argInfo & POPT_ARGFLAG_OPTIONAL) len += sizeof("[]")-1;
+	    if (F_ISSET(opt, OPTIONAL)) len += sizeof("[]")-1;
 	    if (len > max) max = len;
 	}
 	opt++;
@@ -550,8 +549,7 @@ static void itemHelp(FILE * fp,
     for (i = 0, item = items; i < nitems; i++, item++) {
 	const struct poptOption * opt;
 	opt = &item->option;
-	if ((opt->longName || opt->shortName) && 
-	    !(opt->argInfo & POPT_ARGFLAG_DOC_HIDDEN))
+	if ((opt->longName || opt->shortName) && !F_ISSET(opt, DOC_HIDDEN))
 	    singleOptionHelp(fp, columns, opt, translation_domain);
     }
 }
@@ -583,8 +581,7 @@ static void singleTableHelp(poptContext con, FILE * fp,
 
     if (table != NULL)
     for (opt = table; opt->longName || opt->shortName || opt->arg; opt++) {
-	if ((opt->longName || opt->shortName) && 
-	    !(opt->argInfo & POPT_ARGFLAG_DOC_HIDDEN))
+	if ((opt->longName || opt->shortName) && !F_ISSET(opt, DOC_HIDDEN))
 	    singleOptionHelp(fp, columns, opt, translation_domain);
     }
 
@@ -662,7 +659,7 @@ static size_t singleOptionUsage(FILE * fp, columns_t columns,
 	/*@globals fileSystem @*/
 	/*@modifies fp, columns->cur, fileSystem @*/
 {
-    size_t len = sizeof(" []") - 1;
+    size_t len = sizeof(" []")-1;
     const char * argDescrip = getArgDescrip(opt, translation_domain);
     /* Display shortName iff printable non-space. */
     int prtshort = (int)(isprint((int)opt->shortName) && opt->shortName != ' ');
@@ -671,13 +668,12 @@ static size_t singleOptionUsage(FILE * fp, columns_t columns,
     if (!(prtshort || prtlong))
 	return columns->cur;
 
-    len = sizeof(" []") - 1;
+    len = sizeof(" []")-1;
     if (prtshort)
-	len += sizeof("-c") - 1;
+	len += sizeof("-c")-1;
     if (prtlong) {
-	if (prtshort) len += sizeof("|") - 1;
-	len += ((opt->argInfo & POPT_ARGFLAG_ONEDASH)
-		? sizeof("-") : sizeof("--")) - 1;
+	if (prtshort) len += sizeof("|")-1;
+	len += (F_ISSET(opt, ONEDASH) ? sizeof("-") : sizeof("--")) - 1;
 	len += strlen(opt->longName);
     }
 
@@ -688,7 +684,7 @@ static size_t singleOptionUsage(FILE * fp, columns_t columns,
 	const char * scopy = argDescrip;
 	mbstate_t t;
 
-	memset ((void *)&t, 0, sizeof (t));	/* In initial state.  */
+	memset ((void *)&t, 0, sizeof(t));	/* In initial state.  */
 	/* Determine number of display characters.  */
 	n = mbsrtowcs (NULL, &scopy, strlen(scopy), &t);
 #else
@@ -710,7 +706,7 @@ static size_t singleOptionUsage(FILE * fp, columns_t columns,
     if (prtlong)
 	fprintf(fp, "%s%s%s",
 		(prtshort ? "|" : ""),
-		((opt->argInfo & POPT_ARGFLAG_ONEDASH) ? "-" : "--"),
+		(F_ISSET(opt, ONEDASH) ? "-" : "--"),
 		opt->longName);
 #undef	prtlong
 
@@ -746,8 +742,8 @@ static size_t itemUsage(FILE * fp, columns_t columns,
 	opt = &item->option;
         if (poptArgType(opt) == POPT_ARG_INTL_DOMAIN) {
 	    translation_domain = (const char *)opt->arg;
-	} else if ((opt->longName || opt->shortName) &&
-		 !(opt->argInfo & POPT_ARGFLAG_DOC_HIDDEN)) {
+	} else
+	if ((opt->longName || opt->shortName) && !F_ISSET(opt, DOC_HIDDEN)) {
 	    columns->cur = singleOptionUsage(fp, columns, opt, translation_domain);
 	}
     }
@@ -786,7 +782,8 @@ static size_t singleTableUsage(poptContext con, FILE * fp, columns_t columns,
     for (; (opt->longName || opt->shortName || opt->arg) ; opt++) {
         if (poptArgType(opt) == POPT_ARG_INTL_DOMAIN) {
 	    translation_domain = (const char *)opt->arg;
-	} else if (poptArgType(opt) == POPT_ARG_INCLUDE_TABLE) {
+	} else
+	if (poptArgType(opt) == POPT_ARG_INCLUDE_TABLE) {
 	    if (done) {
 		int i = 0;
 		if (done->opts != NULL)
@@ -804,8 +801,8 @@ static size_t singleTableUsage(poptContext con, FILE * fp, columns_t columns,
 	    }
 	    columns->cur = singleTableUsage(con, fp, columns, opt->arg,
 			translation_domain, done);
-	} else if ((opt->longName || opt->shortName) &&
-		 !(opt->argInfo & POPT_ARGFLAG_DOC_HIDDEN)) {
+	} else
+	if ((opt->longName || opt->shortName) && !F_ISSET(opt, DOC_HIDDEN)) {
 	    columns->cur = singleOptionUsage(fp, columns, opt, translation_domain);
 	}
     }
diff --git a/poptint.h b/poptint.h
index 80186eb..180e50c 100644
--- a/poptint.h
+++ b/poptint.h
@@ -69,7 +69,10 @@ typedef union poptArg_u {
 } poptArg;
 /*@=exporttype =fielduse@*/
 
-#define	poptArgType(opt)	((opt)->argInfo & POPT_ARG_MASK)
+#define	poptArgType(_opt)	((_opt)->argInfo & POPT_ARG_MASK)
+#define	F_ISSET(_opt, _FLAG)	((_opt)->argInfo & POPT_ARGFLAG_##_FLAG)
+#define	LF_ISSET(_FLAG)		(argInfo & POPT_ARGFLAG_##_FLAG)
+#define	CBF_ISSET(_opt, _FLAG)	((_opt)->argInfo & POPT_CBFLAG_##_FLAG)
 
 /* XXX sick hack to preserve pretense of a popt-1.x ABI. */
 #define	poptSubstituteHelpI18N(opt) \
-- 
Gitee


From 91112b2b38a00017a4efc6b6f10c153c7abd8f38 Mon Sep 17 00:00:00 2001
From: Jeff Johnson <n3npq@mac.com>
Date: Fri, 15 Feb 2008 18:01:46 +0000
Subject: [PATCH 497/667] - jbj: finish POPT_ARG_ARGV implementation.

---
 CHANGES | 1 +
 popt.c  | 9 ++++++++-
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/CHANGES b/CHANGES
index 8e90adf..779db3f 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,4 +1,5 @@
 1.13 -> 1.14:
+    - jbj: finish POPT_ARG_ARGV implementation.
     - jbj: free aliases/execs with common code.
     - jbj: rewrite the callback logic using a switch for simplicity.
     - jbj: hide bit field structure behind F_ISSET/LF_ISSET/CBF_ISSET macros.
diff --git a/popt.c b/popt.c
index 1566bb3..b6edc09 100644
--- a/popt.c
+++ b/popt.c
@@ -970,8 +970,15 @@ int poptGetNextOpt(poptContext con)
 	    if (opt->arg) {
 		poptArg arg = { .ptr = opt->arg };
 		switch (poptArgType(opt)) {
+		case POPT_ARG_ARGV:
+		    /* XXX memory leak, application is responsible for free. */
+		    if (con->os->nextArg == NULL)
+			return POPT_ERROR_NULLARG;	/* XXX better return? */
+		    if (poptSaveString(arg.ptr, opt->argInfo, con->os->nextArg))
+			return POPT_ERROR_BADOPERATION;
+		    /*@switchbreak@*/ break;
 		case POPT_ARG_STRING:
-		    /* XXX memory leak, hard to plug */
+		    /* XXX memory leak, application is responsible for free. */
 		    arg.argv[0] = (con->os->nextArg)
 			? xstrdup(con->os->nextArg) : NULL;
 		    /*@switchbreak@*/ break;
-- 
Gitee


From 805b02eaed1d210c09ba0b2c6e26c5a8114a9821 Mon Sep 17 00:00:00 2001
From: Jeff Johnson <n3npq@mac.com>
Date: Sat, 16 Feb 2008 16:18:01 +0000
Subject: [PATCH 498/667] - jbj: add POPT_next_char(), backout POPT_fprintf()
 usage (for the moment).

---
 CHANGES    |  1 +
 popthelp.c |  9 +++++----
 poptint.c  | 12 ++++++++++++
 poptint.h  |  9 ++++++---
 4 files changed, 24 insertions(+), 7 deletions(-)

diff --git a/CHANGES b/CHANGES
index 779db3f..a6a52de 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,4 +1,5 @@
 1.13 -> 1.14:
+    - jbj: add POPT_next_char(), backout POPT_fprintf() usage (for the moment).
     - jbj: finish POPT_ARG_ARGV implementation.
     - jbj: free aliases/execs with common code.
     - jbj: rewrite the callback logic using a switch for simplicity.
diff --git a/popthelp.c b/popthelp.c
index 68dc10d..efb6585 100644
--- a/popthelp.c
+++ b/popthelp.c
@@ -448,18 +448,19 @@ static void singleOptionHelp(FILE * fp, columns_t columns,
 	if (ch == help) break;		/* give up */
 	while (ch > (help + 1) && _isspaceptr(ch))
 	    ch = POPT_prev_char (ch);
-	ch++;
+	ch = POPT_next_char(ch);
 
 	sprintf(format, "%%.%ds\n%%%ds", (int) (ch - help), (int) indentLength);
 	/*@-formatconst@*/
-	xx = POPT_fprintf(fp, format, help, " ");
+	fprintf(fp, format, help, " ");
 	/*@=formatconst@*/
 	help = ch;
-	while (_isspaceptr(help) && *help) help++;
+	while (_isspaceptr(help) && *help)
+	    help = POPT_next_char(help);
 	helpLength = strlen(help);
     }
 
-    if (helpLength) xx = POPT_fprintf(fp, "%s\n", help);
+    if (helpLength) fprintf(fp, "%s\n", help);
     help = NULL;
 
 out:
diff --git a/poptint.c b/poptint.c
index e99d28b..872f793 100644
--- a/poptint.c
+++ b/poptint.c
@@ -124,6 +124,18 @@ POPT_prev_char (const char *str)
     }
 }
 
+char *
+POPT_next_char (const char *str)
+{
+    char *p = (char *)str;
+
+    while (1) {
+	p++;
+	if ((*p & 0xc0) != (char)0x80)
+	    return (char *)p;
+    }
+}
+
 int
 POPT_fprintf (FILE* stream, const char *format, ...)
 {
diff --git a/poptint.h b/poptint.h
index 180e50c..15ee8ff 100644
--- a/poptint.h
+++ b/poptint.h
@@ -182,11 +182,14 @@ extern char *nl_langinfo (nl_item __item)
 #endif
 #endif
 
+char *POPT_prev_char (/*@returned@*/ const char *str)
+	/*@*/;
+
+char *POPT_next_char (/*@returned@*/ const char *str)
+	/*@*/;
+
 int   POPT_fprintf (FILE* stream, const char *format, ...)
 	/*@globals fileSystem @*/
 	/*@modifies stream, fileSystem @*/;
 
-char *POPT_prev_char (/*@returned@*/ const char *str)
-	/*@*/;
-
 #endif
-- 
Gitee


From 3961426b42f3fd67abc42617491e90f48ddeba9c Mon Sep 17 00:00:00 2001
From: Jeff Johnson <n3npq@mac.com>
Date: Sat, 16 Feb 2008 16:31:36 +0000
Subject: [PATCH 499/667] - jbj: add POPT_dgettext() for popt internal UTF-8
 codeset (Takao Fujiwara).

---
 CHANGES   |  1 +
 poptint.c | 21 +++++++++++++++++++++
 poptint.h |  2 +-
 3 files changed, 23 insertions(+), 1 deletion(-)

diff --git a/CHANGES b/CHANGES
index a6a52de..1e8212b 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,4 +1,5 @@
 1.13 -> 1.14:
+    - jbj: add POPT_dgettext() for popt internal UTF-8 codeset (Takao Fujiwara).
     - jbj: add POPT_next_char(), backout POPT_fprintf() usage (for the moment).
     - jbj: finish POPT_ARG_ARGV implementation.
     - jbj: free aliases/execs with common code.
diff --git a/poptint.c b/poptint.c
index 872f793..a221025 100644
--- a/poptint.c
+++ b/poptint.c
@@ -2,6 +2,27 @@
 #include <stdarg.h>
 #include "poptint.h"
 
+#if defined(HAVE_DCGETTEXT) && !defined(__LCLINT__)
+/*
+ * Rebind a "UTF-8" codeset for popt's internal use.
+ */
+char *
+POPT_dgettext(const char * dom, const char * str)
+{
+    char * codeset = NULL;
+    char * retval = NULL;
+
+    if (!dom) 
+	dom = textdomain(NULL);
+    codeset = bind_textdomain_codeset(dom, NULL);
+    bind_textdomain_codeset(dom, "UTF-8");
+    retval = dgettext(dom, str);
+    bind_textdomain_codeset(dom, codeset);
+
+    return retval;
+}
+#endif
+
 #ifdef HAVE_ICONV
 static /*@only@*/ /*@null@*/ char *
 strdup_locale_from_utf8 (/*@null@*/ char *buffer)
diff --git a/poptint.h b/poptint.h
index 15ee8ff..aeafb2d 100644
--- a/poptint.h
+++ b/poptint.h
@@ -143,7 +143,7 @@ struct poptContext_s {
 #endif
 
 #if defined(HAVE_DCGETTEXT) && !defined(__LCLINT__)
-#define D_(dom, str) dgettext(dom, str)
+#define D_(dom, str) POPT_dgettext(dom, str)
 #define POPT_(foo) D_("popt", foo)
 #else
 #define D_(dom, str) str
-- 
Gitee


From e1c3e23ee11bc31f586cf69de70ae0135ab29871 Mon Sep 17 00:00:00 2001
From: Jeff Johnson <n3npq@mac.com>
Date: Sat, 16 Feb 2008 18:20:15 +0000
Subject: [PATCH 500/667] - add utf8_skip_data table[] to keep track of utf8
 character widths. - refactor the POPT_WCHAR_HACK into stringDisplayWidth().

---
 CHANGES    |  3 +++
 popthelp.c | 75 +++++++++++++++++++++++++-----------------------------
 poptint.c  | 12 +++++++++
 poptint.h  |  5 ++++
 4 files changed, 54 insertions(+), 41 deletions(-)

diff --git a/CHANGES b/CHANGES
index 1e8212b..20cbeec 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,4 +1,7 @@
 1.13 -> 1.14:
+    - jbj: add utf8_skip_data table[] to keep track of utf8 character widths.
+    - jbj: refactor the POPT_WCHAR_HACK into stringDisplayWidth().
+    - jbj: add POPT_dgettext() prototype.
     - jbj: add POPT_dgettext() for popt internal UTF-8 codeset (Takao Fujiwara).
     - jbj: add POPT_next_char(), backout POPT_fprintf() usage (for the moment).
     - jbj: finish POPT_ARG_ARGV implementation.
diff --git a/popthelp.c b/popthelp.c
index efb6585..0b7f0fd 100644
--- a/popthelp.c
+++ b/popthelp.c
@@ -127,6 +127,26 @@ static size_t maxColumnWidth(FILE *fp)
     return maxcols;
 }
 
+/**
+ * Determine number of display characters in a string.
+ * @param s		string
+ * @return		no. of display characters.
+ */
+static inline size_t stringDisplayWidth(const char *s)
+{
+    size_t n = strlen(s);
+
+#ifdef	POPT_WCHAR_HACK
+    mbstate_t t;
+
+    memset ((void *)&t, 0, sizeof (t));	/* In initial state.  */
+    /* Determine number of display characters.  */
+    n = mbsrtowcs (NULL, &s, n, &t);
+#endif
+
+    return n;
+}
+
 /**
  * @param table		option(s)
  */
@@ -408,18 +428,8 @@ static void singleOptionHelp(FILE * fp, columns_t columns,
 	    lelen = strlen(le);
 	    le += lelen;
 
-#ifdef	POPT_WCHAR_HACK
-	    {	const char * scopy = argDescrip;
-		mbstate_t t;
-		size_t n;
-
-		memset ((void *)&t, 0, sizeof (t));	/* In initial state.  */
-		/* Determine number of display characters.  */
-		n = mbsrtowcs (NULL, &scopy, strlen(scopy), &t);
-
-		displaypad = (int) (lelen-n);
-	    }
-#endif
+	    /* Adjust for (possible) wide characters. */
+	    displaypad = (int)(lelen - stringDisplayWidth(argDescrip));
 	}
 	if (F_ISSET(opt, OPTIONAL))
 	    *le++ = ']';
@@ -482,7 +492,7 @@ static size_t maxArgWidth(const struct poptOption * opt,
 {
     size_t max = 0;
     size_t len = 0;
-    const char * s;
+    const char * argDescrip;
     
     if (opt != NULL)
     while (opt->longName || opt->shortName || opt->arg) {
@@ -499,24 +509,15 @@ static size_t maxArgWidth(const struct poptOption * opt,
 		len += strlen(opt->longName);
 	    }
 
-	    s = getArgDescrip(opt, translation_domain);
+	    argDescrip = getArgDescrip(opt, translation_domain);
 
-	    /* XXX Calculate no. of display characters. */
-	    if (s) {
-		size_t n;
-#ifdef POPT_WCHAR_HACK
-		const char * scopy = s;
-		mbstate_t t;
+	    if (argDescrip) {
 
-		memset ((void *)&t, 0, sizeof(t));	/* In initial state.  */
-		/* Determine number of display characters.  */
-		n = mbsrtowcs (NULL, &scopy, strlen(scopy), &t);
-#else
-		n = strlen(s);
-#endif
 		/* XXX argDescrip[0] determines "--foo=bar" or "--foo bar". */
-		if (!strchr(" =(", s[0])) len += sizeof("=")-1;
-		len += n;
+		if (!strchr(" =(", argDescrip[0])) len += sizeof("=")-1;
+
+		/* Adjust for (possible) wide characters. */
+		len += stringDisplayWidth(argDescrip);
 	    }
 
 	    if (F_ISSET(opt, OPTIONAL)) len += sizeof("[]")-1;
@@ -622,6 +623,7 @@ static size_t showHelpIntro(poptContext con, FILE * fp)
 /*@=type@*/
 	if (fn == NULL) return len;
 	if (strchr(fn, '/')) fn = strrchr(fn, '/') + 1;
+	/* XXX POPT_fprintf not needed for argv[0] display. */
 	fprintf(fp, " %s", fn);
 	len += strlen(fn) + 1;
     }
@@ -679,21 +681,12 @@ static size_t singleOptionUsage(FILE * fp, columns_t columns,
     }
 
     if (argDescrip) {
-	size_t n;
-#ifdef POPT_WCHAR_HACK
-    /* XXX Calculate no. of display characters. */
-	const char * scopy = argDescrip;
-	mbstate_t t;
-
-	memset ((void *)&t, 0, sizeof(t));	/* In initial state.  */
-	/* Determine number of display characters.  */
-	n = mbsrtowcs (NULL, &scopy, strlen(scopy), &t);
-#else
-	n = strlen(argDescrip);
-#endif
+
 	/* XXX argDescrip[0] determines "--foo=bar" or "--foo bar". */
 	if (!strchr(" =(", argDescrip[0])) len += sizeof("=")-1;
-	len += n;
+
+	/* Adjust for (possible) wide characters. */
+	len += stringDisplayWidth(argDescrip);
     }
 
     if ((columns->cur + len) > columns->max) {
diff --git a/poptint.c b/poptint.c
index a221025..d0f7b2d 100644
--- a/poptint.c
+++ b/poptint.c
@@ -2,6 +2,18 @@
 #include <stdarg.h>
 #include "poptint.h"
 
+/*@unchecked@*/ /*@observer@*/
+static const char utf8_skip_data[256] = {
+    1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,
+    1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,
+    1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,
+    1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,
+    1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,
+    1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,
+    2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,
+    3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,4,4,4,4,4,4,4,4,5,5,5,5,6,6,1,1
+};
+
 #if defined(HAVE_DCGETTEXT) && !defined(__LCLINT__)
 /*
  * Rebind a "UTF-8" codeset for popt's internal use.
diff --git a/poptint.h b/poptint.h
index aeafb2d..bd45e32 100644
--- a/poptint.h
+++ b/poptint.h
@@ -182,6 +182,11 @@ extern char *nl_langinfo (nl_item __item)
 #endif
 #endif
 
+#if defined(HAVE_DCGETTEXT) && !defined(__LCLINT__)
+char *POPT_dgettext(const char * dom, const char * str)
+	/*@*/;
+#endif
+
 char *POPT_prev_char (/*@returned@*/ const char *str)
 	/*@*/;
 
-- 
Gitee


From ff4a95875ab16a3d259a1e11194b67487d29fb13 Mon Sep 17 00:00:00 2001
From: Jeff Johnson <n3npq@mac.com>
Date: Sat, 16 Feb 2008 18:55:25 +0000
Subject: [PATCH 501/667] - jbj: use NUL terminator to align help with
 (possible) multibyte chars.

---
 CHANGES    |  1 +
 popthelp.c | 28 ++++++++++++++++++++--------
 poptint.c  |  2 +-
 3 files changed, 22 insertions(+), 9 deletions(-)

diff --git a/CHANGES b/CHANGES
index 20cbeec..60830fc 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,4 +1,5 @@
 1.13 -> 1.14:
+    - jbj: use NUL terminator to align help with (possible) multibyte chars.
     - jbj: add utf8_skip_data table[] to keep track of utf8 character widths.
     - jbj: refactor the POPT_WCHAR_HACK into stringDisplayWidth().
     - jbj: add POPT_dgettext() prototype.
diff --git a/popthelp.c b/popthelp.c
index 0b7f0fd..b32aab2 100644
--- a/popthelp.c
+++ b/popthelp.c
@@ -135,13 +135,16 @@ static size_t maxColumnWidth(FILE *fp)
 static inline size_t stringDisplayWidth(const char *s)
 {
     size_t n = strlen(s);
-
 #ifdef	POPT_WCHAR_HACK
     mbstate_t t;
 
     memset ((void *)&t, 0, sizeof (t));	/* In initial state.  */
     /* Determine number of display characters.  */
     n = mbsrtowcs (NULL, &s, n, &t);
+#else
+    n = 0;
+    for (; *s; s = POPT_next_char(s));
+	n++;
 #endif
 
     return n;
@@ -460,10 +463,19 @@ static void singleOptionHelp(FILE * fp, columns_t columns,
 	    ch = POPT_prev_char (ch);
 	ch = POPT_next_char(ch);
 
-	sprintf(format, "%%.%ds\n%%%ds", (int) (ch - help), (int) indentLength);
-	/*@-formatconst@*/
-	fprintf(fp, format, help, " ");
-	/*@=formatconst@*/
+	/*
+	 *  XXX strdup is necessary to add NUL terminator so that an unknown
+	 *  no. of (possible) multi-byte characters can be displayed.
+	 */
+	{   char * fmthelp = xstrdup(help);
+	    fmthelp[ch - help] = '\0';
+	    sprintf(format, "%%s\n%%%ds", (int) indentLength);
+	    /*@-formatconst@*/
+	    xx = POPT_fprintf(fp, format, fmthelp, " ");
+	    /*@=formatconst@*/
+	    free(fmthelp);
+	}
+
 	help = ch;
 	while (_isspaceptr(help) && *help)
 	    help = POPT_next_char(help);
@@ -616,7 +628,7 @@ static size_t showHelpIntro(poptContext con, FILE * fp)
     size_t len = (size_t)6;
     const char * fn;
 
-    fprintf(fp, POPT_("Usage:"));
+    POPT_fprintf(fp, POPT_("Usage:"));
     if (!(con->flags & POPT_CONTEXT_KEEP_FIRST)) {
 /*@-type@*/	/* LCL: wazzup? */
 	fn = con->optionStack->argv[0];
@@ -637,9 +649,9 @@ void poptPrintHelp(poptContext con, FILE * fp, /*@unused@*/ int flags)
 
     (void) showHelpIntro(con, fp);
     if (con->otherHelp)
-	fprintf(fp, " %s\n", con->otherHelp);
+	POPT_fprintf(fp, " %s\n", con->otherHelp);
     else
-	fprintf(fp, " %s\n", POPT_("[OPTION...]"));
+	POPT_fprintf(fp, " %s\n", POPT_("[OPTION...]"));
 
     if (columns) {
 	columns->cur = maxArgWidth(con->options, NULL);
diff --git a/poptint.c b/poptint.c
index d0f7b2d..6c5fd2c 100644
--- a/poptint.c
+++ b/poptint.c
@@ -3,7 +3,7 @@
 #include "poptint.h"
 
 /*@unchecked@*/ /*@observer@*/
-static const char utf8_skip_data[256] = {
+static const unsigned char utf8_skip_data[256] = {
     1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,
     1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,
     1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,
-- 
Gitee


From 2108143f1959989db74afc786c48a89f87dcf69e Mon Sep 17 00:00:00 2001
From: Jeff Johnson <n3npq@mac.com>
Date: Sat, 16 Feb 2008 20:07:52 +0000
Subject: [PATCH 502/667] - jbj: popt.3: add POPT_ARG_ARGV description.

---
 CHANGES |  1 +
 popt.3  | 66 ++++++++++++++++++++++++++++++---------------------------
 2 files changed, 36 insertions(+), 31 deletions(-)

diff --git a/CHANGES b/CHANGES
index 60830fc..40a8f3c 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,4 +1,5 @@
 1.13 -> 1.14:
+    - jbj: popt.3: add POPT_ARG_ARGV description.
     - jbj: use NUL terminator to align help with (possible) multibyte chars.
     - jbj: add utf8_skip_data table[] to keep track of utf8 character widths.
     - jbj: refactor the POPT_WCHAR_HACK into stringDisplayWidth().
diff --git a/popt.3 b/popt.3
index 33d3d5b..ee8d76c 100644
--- a/popt.3
+++ b/popt.3
@@ -125,6 +125,7 @@ lfB lfR lfR.
 Value	Description	arg Type
 POPT_ARG_NONE	No argument expected	int
 POPT_ARG_STRING	No type checking to be performed	char *
+POPT_ARG_ARGV	No type checking to be performed	char **
 POPT_ARG_INT	An integer argument is expected	int
 POPT_ARG_LONG	A long integer is expected	long
 POPT_ARG_LONGLONG	A long long integer is expected	long long
@@ -150,7 +151,10 @@ specified, \fB-longopt\fR is accepted as well.
 .RI "program variables when the option is used. If " arg " is " 
 .BR NULL ", it is ignored and popt takes no special action. " 
 Otherwise it should point to a variable of the type indicated in the 
-right-most column of the table above.
+.RB "right-most column of the table above. A " POPT_ARG_ARGV " arg will
+(re-)allocate an array of char * string pointers, append the string argument, and add a
+.BR NULL " sentinel at the end of the array as needed."
+.RB "The target char ** address of a " POPT_ARG_ARGV " arg should be initialized to " NULL "."
 .sp
 .RI "If the option takes no argument (" argInfo " is " 
 .BR POPT_ARG_NONE "), the variable pointed to by " 
@@ -159,7 +163,7 @@ will perhaps not escape the attention of hunt-and-peck typists that
 .RB "the value of " POPT_ARG_NONE " is 0.)  If the option does take "
 an argument, the variable that 
 .IR arg " points to is updated to reflect the value of the argument." 
-.RB "Any string is acceptable for " POPT_ARG_STRING " arguments, but "
+.RB "Any string is acceptable for " POPT_ARG_STRING " and " POPT_ARG_ARGV " arguments, but "
 .BR POPT_ARG_INT ", " POPT_ARG_LONG ", " POPT_ARG_LONGLONG ", " POPT_ARG_FLOAT ", and "
 .BR POPT_ARG_DOUBLE " are converted to the appropriate type, and an "
 error returned if the conversion fails.
@@ -192,8 +196,8 @@ arguments.
 .sp
 .RB "If popt should automatically provide " --usage " and " --help " (" -? ")
 .RB "options, one line in the table should be the macro " POPT_AUTOHELP ".
-.RB "This macro includes another option table (via " POPT_ARG_INCLUDE_TABLE;
-see below) in the main one which provides the table entries for these
+.RB "This macro includes another option table (via " POPT_ARG_INCLUDE_TABLE
+; see below) in the main one which provides the table entries for these
 .RB "arguments. When " --usage " or " --help " are passed to programs which
 use popt's automatical help, popt displays the appropriate message on 
 stderr as soon as it finds the option, and exits the program with a
@@ -670,21 +674,21 @@ int main(int argc, char *argv[]) {
    poptContext optCon;   /* context for parsing command-line options */
 
    struct poptOption optionsTable[] = {
-	    { "bps", 'b', POPT_ARG_INT, &speed, 0,
-		"signaling rate in bits-per-second", "BPS" },
-	    { "crnl", 'c', 0, 0, 'c',
-		"expand cr characters to cr/lf sequences" },
-	    { "hwflow", 'h', 0, 0, 'h',
-		"use hardware (RTS/CTS) flow control" },
-	    { "noflow", 'n', 0, 0, 'n',
-		"use no flow control" },
-	    { "raw", 'r', 0, &raw, 0,
-		"don't perform any character conversions" },
-	    { "swflow", 's', 0, 0, 's',
-		"use software (XON/XOF) flow control" } ,
-	    POPT_AUTOHELP
-	    { NULL, 0, 0, NULL, 0 }
-   };
+      { "bps", 'b', POPT_ARG_INT, &speed, 0,
+	"signaling rate in bits-per-second", "BPS" },
+      { "crnl", 'c', 0, 0, 'c',
+	"expand cr characters to cr/lf sequences", NULL },
+      { "hwflow", 'h', 0, 0, 'h',
+	"use hardware (RTS/CTS) flow control", NULL },
+      { "noflow", 'n', 0, 0, 'n',
+	"use no flow control", NULL },
+      { "raw", 'r', 0, &raw, 0,
+	"don't perform any character conversions", NULL },
+      { "swflow", 's', 0, 0, 's',
+	"use software (XON/XOF) flow control", NULL } ,
+      POPT_AUTOHELP
+      { NULL, 0, 0, NULL, 0 }
+    };
 
    optCon = poptGetContext(NULL, argc, argv, optionsTable, 0);
    poptSetOtherOptionHelp(optCon, "[OPTIONS]* <port>");
@@ -697,18 +701,18 @@ int main(int argc, char *argv[]) {
    /* Now do options processing, get portname */
    while ((c = poptGetNextOpt(optCon)) >= 0) {
       switch (c) {
-         case 'c': 
-            buf[i++] = 'c';         
-            break;
-         case 'h': 
-            buf[i++] = 'h';
-            break;
-         case 's':
-            buf[i++] = 's';
-            break;
-         case 'n':
-            buf[i++] = 'n';
-            break;
+       case 'c': 
+          buf[i++] = 'c';         
+          break;
+       case 'h': 
+          buf[i++] = 'h';
+          break;
+       case 's':
+          buf[i++] = 's';
+          break;
+       case 'n':
+          buf[i++] = 'n';
+          break;
       }
    }
    portname = poptGetArg(optCon);
-- 
Gitee


From aae391db2b7359c72f90c9c25a179dd1434648e8 Mon Sep 17 00:00:00 2001
From: Jeff Johnson <n3npq@mac.com>
Date: Sat, 16 Feb 2008 20:57:38 +0000
Subject: [PATCH 503/667] - splint fiddles.

---
 .splintrc    |  2 --
 popt.c       | 33 +++++++++++++++++----------------
 popt.h       |  4 ++--
 poptconfig.c | 10 ++++++----
 popthelp.c   | 43 +++++++++++++++++++++++++------------------
 poptint.c    | 13 ++++++++-----
 poptparse.c  |  6 +++---
 test1.c      |  8 ++++----
 8 files changed, 65 insertions(+), 54 deletions(-)

diff --git a/.splintrc b/.splintrc
index c2e01cb..9dd8a71 100644
--- a/.splintrc
+++ b/.splintrc
@@ -15,7 +15,6 @@
 #+bounds
 -bufferoverflowhigh
 
--bitwisesigned
 -branchstate
 
 # --- +partial artifacts
@@ -41,4 +40,3 @@
 # --- not-yet at standard level
 -boolops		# 127
 -predboolint		# 42
-+ignorequals		# 30
diff --git a/popt.c b/popt.c
index b6edc09..b9c735b 100644
--- a/popt.c
+++ b/popt.c
@@ -173,7 +173,7 @@ poptContext poptGetContext(const char * name, int argc, const char ** argv,
     if (!(flags & POPT_CONTEXT_KEEP_FIRST))
 	con->os->next = 1;			/* skip argv[0] */
 
-    con->leftovers = calloc( (argc + 1), sizeof(*con->leftovers) );
+    con->leftovers = calloc( (size_t)(argc + 1), sizeof(*con->leftovers) );
 /*@-dependenttrans -assignexpose@*/	/* FIX: W2DO? */
     con->options = options;
 /*@=dependenttrans =assignexpose@*/
@@ -183,7 +183,7 @@ poptContext poptGetContext(const char * name, int argc, const char ** argv,
     con->execs = NULL;
     con->numExecs = 0;
     con->finalArgvAlloced = argc * 2;
-    con->finalArgv = calloc( con->finalArgvAlloced, sizeof(*con->finalArgv) );
+    con->finalArgv = calloc( (size_t)con->finalArgvAlloced, sizeof(*con->finalArgv) );
     con->execAbsolute = 1;
     con->arg_strip = NULL;
 
@@ -456,7 +456,8 @@ exit:
 }
 
 /*@observer@*/ /*@null@*/ static const struct poptOption *
-findOption(const struct poptOption * opt, /*@null@*/ const char * longName, int longNameLen,
+findOption(const struct poptOption * opt,
+		/*@null@*/ const char * longName, size_t longNameLen,
 		char shortName,
 		/*@null@*/ /*@out@*/ poptCallbackType * callback,
 		/*@null@*/ /*@out@*/ const void ** callbackData,
@@ -664,7 +665,7 @@ int poptSaveLongLong(long long * arg, unsigned int argInfo, long long aLongLong)
 	    srandom((unsigned)getpid());
 	    srandom((unsigned)random());
 	}
-	aLongLong = random() % (aLongLong > 0 ? aLongLong : -aLongLong);
+	aLongLong = (long long)(random() % (aLongLong > 0 ? aLongLong : -aLongLong));
 	aLongLong++;
     }
     if (LF_ISSET(NOT))
@@ -747,16 +748,16 @@ int poptSaveInt(/*@null@*/ int * arg, unsigned int argInfo, long aLong)
 	aLong = ~aLong;
     switch (LF_ISSET(LOGICALOPS)) {
     case 0:
-	*arg = aLong;
+	*arg = (int) aLong;
 	break;
     case POPT_ARGFLAG_OR:
-	*arg |= aLong;
+	*arg |= (int) aLong;
 	break;
     case POPT_ARGFLAG_AND:
-	*arg &= aLong;
+	*arg &= (int) aLong;
 	break;
     case POPT_ARGFLAG_XOR:
-	*arg ^= aLong;
+	*arg ^= (int) aLong;
 	break;
     default:
 	return POPT_ERROR_BADOPERATION;
@@ -803,7 +804,7 @@ int poptGetNextOpt(poptContext con)
 	/* Process next long option */
 	if (!con->os->nextCharArg) {
 	    const char * optString;
-            int optStringLen;
+            size_t optStringLen;
 	    int thisopt;
 
 /*@-sizeoftype@*/
@@ -855,7 +856,7 @@ int poptGetNextOpt(poptContext con)
 		/* Check for "--long=arg" option. */
 		for (oe = optString; *oe && *oe != '='; oe++)
 		    {};
-		optStringLen = oe - optString;
+		optStringLen = (size_t)(oe - optString);
 		if (*oe == '=')
 		    longArg = oe + 1;
 
@@ -1010,15 +1011,15 @@ int poptGetNextOpt(poptContext con)
 			    return POPT_ERROR_BADOPERATION;
 		    } else
 		    if (poptArgType(opt) == POPT_ARG_LONG) {
-			if (aNUM > LONG_MAX || aNUM < LONG_MIN)
+			if (aNUM > (long long)LONG_MAX || aNUM < (long long)LONG_MIN)
 			    return POPT_ERROR_OVERFLOW;
-			if (poptSaveLong(arg.longp, opt->argInfo, aNUM))
+			if (poptSaveLong(arg.longp, opt->argInfo, (long)aNUM))
 			    return POPT_ERROR_BADOPERATION;
 		    } else
 		    if (poptArgType(opt) == POPT_ARG_INT) {
-			if (aNUM > INT_MAX || aNUM < INT_MIN)
+			if (aNUM > (long long)INT_MAX || aNUM < (long long)INT_MIN)
 			    return POPT_ERROR_OVERFLOW;
-			if (poptSaveInt(arg.intp, opt->argInfo, aNUM))
+			if (poptSaveInt(arg.intp, opt->argInfo, (long)aNUM))
 			    return POPT_ERROR_BADOPERATION;
 		    } else
 			return POPT_ERROR_BADOPERATION;
@@ -1050,7 +1051,7 @@ int poptGetNextOpt(poptContext con)
 			    return POPT_ERROR_OVERFLOW;
 			if ((FLT_MIN - _ABS(aDouble)) > DBL_EPSILON)
 			    return POPT_ERROR_OVERFLOW;
-			arg.floatp[0] = aDouble;
+			arg.floatp[0] = (float) aDouble;
 		    }
 		}   /*@switchbreak@*/ break;
 		case POPT_ARG_MAINCALL:
@@ -1060,7 +1061,7 @@ int poptGetNextOpt(poptContext con)
 		    /*@switchbreak@*/ break;
 		default:
 		    fprintf(stdout,
-			POPT_("option type (%d) not implemented in popt\n"),
+			POPT_("option type (%u) not implemented in popt\n"),
 			poptArgType(opt));
 		    exit(EXIT_FAILURE);
 		    /*@notreached@*/ /*@switchbreak@*/ break;
diff --git a/popt.h b/popt.h
index 0911b1c..637ef43 100644
--- a/popt.h
+++ b/popt.h
@@ -35,8 +35,8 @@
 #define	POPT_ARG_DOUBLE		 9U	/*!< arg ==> double */
 #define	POPT_ARG_LONGLONG	 10U	/*!< arg ==> long long */
 
-#define POPT_ARG_MAINCALL	16+11U	/*!< EXPERIMENTAL: return (*arg) (argc, argv) */
-#define	POPT_ARG_ARGV		16+12U	/*!< (unimplemented): dupe'd arg appended to realloc'd argv array. */
+#define POPT_ARG_MAINCALL	16U+11U	/*!< EXPERIMENTAL: return (*arg) (argc, argv) */
+#define	POPT_ARG_ARGV		12U	/*!< dupe'd arg appended to realloc'd argv array. */
 
 #define POPT_ARG_MASK		0x0000FFFFU
 /*@}*/
diff --git a/poptconfig.c b/poptconfig.c
index d917067..e81bf68 100644
--- a/poptconfig.c
+++ b/poptconfig.c
@@ -107,15 +107,17 @@ int poptReadConfigFile(poptContext con, const char * fn)
 	return (errno == ENOENT ? 0 : POPT_ERROR_ERRNO);
 
     fileLength = lseek(fd, 0, SEEK_END);
-    if (fileLength == -1 || lseek(fd, 0, 0) == -1) {
+    if (fileLength == (off_t)-1 || lseek(fd, 0, 0) == (off_t)-1) {
 	rc = errno;
 	(void) close(fd);
 	errno = rc;
 	return POPT_ERROR_ERRNO;
     }
 
-    file = malloc(fileLength + 1);
-    if (file == NULL || read(fd, (char *)file, fileLength) != fileLength) {
+    file = malloc((size_t)fileLength + 1);
+    if (file == NULL
+     || read(fd, (char *)file, (size_t)fileLength) != (ssize_t)fileLength)
+    {
 	rc = errno;
 	(void) close(fd);
 	errno = rc;
@@ -128,7 +130,7 @@ int poptReadConfigFile(poptContext con, const char * fn)
 	return POPT_ERROR_ERRNO;
     }
 
-    dst = buf = malloc(fileLength + 1);
+    dst = buf = malloc((size_t)fileLength + 1);
     if (dst == NULL)
 	return POPT_ERROR_ERRNO;
 
diff --git a/popthelp.c b/popthelp.c
index b32aab2..a33f4d7 100644
--- a/popthelp.c
+++ b/popthelp.c
@@ -120,9 +120,11 @@ static size_t maxColumnWidth(FILE *fp)
     int fdno = fileno(fp ? fp : stdout);
 
     memset(&ws, 0, sizeof(ws));
-    if (fdno >= 0 && !ioctl(fdno, TIOCGWINSZ, &ws)
-     && (size_t)ws.ws_col > maxcols && ws.ws_col < 256)
-	maxcols = ws.ws_col - 1;
+    if (fdno >= 0 && !ioctl(fdno, (unsigned long)TIOCGWINSZ, &ws)) {
+	size_t ws_col = (size_t)ws.ws_col;
+	if (ws_col > maxcols && ws_col < (size_t)256)
+	    maxcols = ws_col - 1;
+    }
 #endif
     return maxcols;
 }
@@ -133,6 +135,7 @@ static size_t maxColumnWidth(FILE *fp)
  * @return		no. of display characters.
  */
 static inline size_t stringDisplayWidth(const char *s)
+	/*@*/
 {
     size_t n = strlen(s);
 #ifdef	POPT_WCHAR_HACK
@@ -253,7 +256,7 @@ singleOptionDefaultValue(size_t lineLength,
 	le += sprintf(le, "%lld", arg.longlongp[0]);
 	break;
     case POPT_ARG_FLOAT:
-    {	double aDouble = arg.floatp[0];
+    {	double aDouble = (double) arg.floatp[0];
 	le += sprintf(le, "%g", aDouble);
     }	break;
     case POPT_ARG_DOUBLE:
@@ -468,12 +471,14 @@ static void singleOptionHelp(FILE * fp, columns_t columns,
 	 *  no. of (possible) multi-byte characters can be displayed.
 	 */
 	{   char * fmthelp = xstrdup(help);
-	    fmthelp[ch - help] = '\0';
-	    sprintf(format, "%%s\n%%%ds", (int) indentLength);
-	    /*@-formatconst@*/
-	    xx = POPT_fprintf(fp, format, fmthelp, " ");
-	    /*@=formatconst@*/
-	    free(fmthelp);
+	    if (fmthelp) {
+		fmthelp[ch - help] = '\0';
+		sprintf(format, "%%s\n%%%ds", (int) indentLength);
+		/*@-formatconst@*/
+		xx = POPT_fprintf(fp, format, fmthelp, " ");
+		/*@=formatconst@*/
+		free(fmthelp);
+	    }
 	}
 
 	help = ch;
@@ -623,12 +628,13 @@ static void singleTableHelp(poptContext con, FILE * fp,
  */
 static size_t showHelpIntro(poptContext con, FILE * fp)
 	/*@globals fileSystem @*/
-	/*@modifies *fp, fileSystem @*/
+	/*@modifies fp, fileSystem @*/
 {
     size_t len = (size_t)6;
     const char * fn;
+    int xx;
 
-    POPT_fprintf(fp, POPT_("Usage:"));
+    xx = POPT_fprintf(fp, POPT_("Usage:"));
     if (!(con->flags & POPT_CONTEXT_KEEP_FIRST)) {
 /*@-type@*/	/* LCL: wazzup? */
 	fn = con->optionStack->argv[0];
@@ -645,13 +651,14 @@ static size_t showHelpIntro(poptContext con, FILE * fp)
 
 void poptPrintHelp(poptContext con, FILE * fp, /*@unused@*/ int flags)
 {
-    columns_t columns = calloc(1, sizeof(*columns));
+    columns_t columns = calloc((size_t)1, sizeof(*columns));
+    int xx;
 
     (void) showHelpIntro(con, fp);
     if (con->otherHelp)
-	POPT_fprintf(fp, " %s\n", con->otherHelp);
+	xx = POPT_fprintf(fp, " %s\n", con->otherHelp);
     else
-	POPT_fprintf(fp, " %s\n", POPT_("[OPTION...]"));
+	xx = POPT_fprintf(fp, " %s\n", POPT_("[OPTION...]"));
 
     if (columns) {
 	columns->cur = maxArgWidth(con->options, NULL);
@@ -832,7 +839,7 @@ static size_t showShortOptions(const struct poptOption * opt, FILE * fp,
 {
     /* bufsize larger then the ascii set, lazy allocation on top level call. */
     size_t nb = (size_t)300;
-    char * s = (str != NULL ? str : calloc(1, nb));
+    char * s = (str != NULL ? str : calloc((size_t)1, nb));
     size_t len = (size_t)0;
 
     if (s == NULL)
@@ -863,7 +870,7 @@ static size_t showShortOptions(const struct poptOption * opt, FILE * fp,
 
 void poptPrintUsage(poptContext con, FILE * fp, /*@unused@*/ int flags)
 {
-    columns_t columns = calloc(1, sizeof(*columns));
+    columns_t columns = calloc((size_t)1, sizeof(*columns));
     struct poptDone_s done_buf;
     poptDone done = &done_buf;
 
@@ -873,7 +880,7 @@ void poptPrintUsage(poptContext con, FILE * fp, /*@unused@*/ int flags)
   if (columns) {
     columns->cur = done->maxopts * sizeof(*done->opts);
     columns->max = maxColumnWidth(fp);
-    done->opts = calloc(1, columns->cur);
+    done->opts = calloc((size_t)1, columns->cur);
     /*@-keeptrans@*/
     if (done->opts != NULL)
 	done->opts[done->nopts++] = (const void *) con->options;
diff --git a/poptint.c b/poptint.c
index 6c5fd2c..882a5ed 100644
--- a/poptint.c
+++ b/poptint.c
@@ -2,6 +2,7 @@
 #include <stdarg.h>
 #include "poptint.h"
 
+/*@-varuse +charint +ignoresigns @*/
 /*@unchecked@*/ /*@observer@*/
 static const unsigned char utf8_skip_data[256] = {
     1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,
@@ -13,6 +14,7 @@ static const unsigned char utf8_skip_data[256] = {
     2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,
     3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,4,4,4,4,4,4,4,4,5,5,5,5,6,6,1,1
 };
+/*@=varuse =charint =ignoresigns @*/
 
 #if defined(HAVE_DCGETTEXT) && !defined(__LCLINT__)
 /*
@@ -135,7 +137,7 @@ strdup_vprintf (const char *format, va_list ap)
     va_copy(apc, ap);	/* XXX linux amd64/ppc needs a copy. */
 /*@=noeffectuncon =unrecog @*/
 
-    buffer = calloc(sizeof(*buffer), vsnprintf (&c, 1, format, ap) + 1);
+    buffer = calloc(sizeof(*buffer), (size_t)vsnprintf (&c, (size_t)1, format, ap) + 1);
     if (buffer != NULL)
 	xx = vsprintf(buffer, format, apc);
 
@@ -152,7 +154,7 @@ POPT_prev_char (const char *str)
 
     while (1) {
 	p--;
-	if ((*p & 0xc0) != (char)0x80)
+	if (((unsigned)*p & 0xc0) != (unsigned)0x80)
 	    return (char *)p;
     }
 }
@@ -162,11 +164,12 @@ POPT_next_char (const char *str)
 {
     char *p = (char *)str;
 
-    while (1) {
+    while (*p != '\0') {
 	p++;
-	if ((*p & 0xc0) != (char)0x80)
-	    return (char *)p;
+	if (((unsigned)*p & 0xc0) != (unsigned)0x80)
+	    break;
     }
+    return (char *)p;
 }
 
 int
diff --git a/poptparse.c b/poptparse.c
index f577a02..eaf8427 100644
--- a/poptparse.c
+++ b/poptparse.c
@@ -61,7 +61,7 @@ int poptParseArgvString(const char * s, int * argcPtr, const char *** argvPtr)
     int rc = POPT_ERROR_MALLOC;
 
     if (argv == NULL) return rc;
-    buf = bufOrig = calloc(1, buflen);
+    buf = bufOrig = calloc((size_t)1, buflen);
     if (buf == NULL) {
 	free(argv);
 	return rc;
@@ -180,7 +180,7 @@ int poptConfigFileToString(FILE *fp, char ** argstrp, /*@unused@*/ int flags)
 	if (*q == '\0') {
 	    /* single command line option (ie, no name=val, just name) */
 	    q[-1] = '\0';		/* kill off newline from fgets() call */
-	    argvlen += (t = q - p) + (sizeof(" --")-1);
+	    argvlen += (t = (size_t)(q - p)) + (sizeof(" --")-1);
 	    if (argvlen >= maxargvlen) {
 		maxargvlen = (t > maxargvlen) ? t*2 : maxargvlen*2;
 		argstr = realloc(argstr, maxargvlen);
@@ -208,7 +208,7 @@ int poptConfigFileToString(FILE *fp, char ** argstrp, /*@unused@*/ int flags)
 	    *x = '\0';	/* null out last char if space (including fgets() NL) */
 
 	/* rest of line accept */
-	t = x - p;
+	t = (size_t)(x - p);
 	argvlen += t + (sizeof("' --='")-1);
 	if (argvlen >= maxargvlen) {
 	    maxargvlen = (t > maxargvlen) ? t*2 : maxargvlen*2;
diff --git a/test1.c b/test1.c
index 500ee18..a256db4 100644
--- a/test1.c
+++ b/test1.c
@@ -42,13 +42,13 @@ static int aInt = 271828;
 /*@unchecked@*/
 static int bInt = 271828;
 /*@unchecked@*/
-static long aLong = 738905609LL;
+static long aLong = 738905609L;
 /*@unchecked@*/
-static long bLong = 738905609LL;
+static long bLong = 738905609L;
 /*@unchecked@*/
-static long long aLongLong = 738905609L;
+static long long aLongLong = 738905609LL;
 /*@unchecked@*/
-static long long bLongLong = 738905609L;
+static long long bLongLong = 738905609LL;
 /*@unchecked@*/
 static float aFloat = 3.1415926535;
 /*@unchecked@*/
-- 
Gitee


From 7e74f537b7b19f69b5bcd8c04d0fcd7f40a132cb Mon Sep 17 00:00:00 2001
From: Jeff Johnson <n3npq@mac.com>
Date: Sat, 16 Feb 2008 22:16:10 +0000
Subject: [PATCH 504/667] - jbj: fix: tests 20 -> 23 require an explicit '--'
 arg separator now.

---
 CHANGES     |  1 +
 test-poptrc |  4 ++--
 testit.sh   | 13 +++++--------
 3 files changed, 8 insertions(+), 10 deletions(-)

diff --git a/CHANGES b/CHANGES
index 40a8f3c..9692458 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,4 +1,5 @@
 1.13 -> 1.14:
+    - jbj: fix: tests 20 -> 23 require an explicit '--' arg separator now.
     - jbj: popt.3: add POPT_ARG_ARGV description.
     - jbj: use NUL terminator to align help with (possible) multibyte chars.
     - jbj: add utf8_skip_data table[] to keep track of utf8 character widths.
diff --git a/test-poptrc b/test-poptrc
index 509e013..47b125b 100644
--- a/test-poptrc
+++ b/test-poptrc
@@ -7,6 +7,6 @@ test1 alias -O --arg1
 test1 alias --grab --arg2 "'foo !#:+'"
 test1 alias --grabbar --grab bar
 
-test1 exec --echo-args echo
+test1 exec --echo-args echo --
 test1 alias -e --echo-args
-test1 exec -a /bin/echo
+test1 exec -a /bin/echo --
diff --git a/testit.sh b/testit.sh
index e6ba662..d27243d 100755
--- a/testit.sh
+++ b/testit.sh
@@ -9,7 +9,7 @@ run() {
 
     result=`$builddir/$prog $*`
     if [ "$answer" != "$result" ]; then
-	echo "Test \"$*\" failed with: \"$result\" != \"$answer\" "
+	echo "Test \"$prog $*\" failed with: \"$result\" != \"$answer\" "
 	exit 2
     fi
 }
@@ -69,13 +69,10 @@ run test1 "test1 - 17" "arg1: 1 arg2: (none) rest: foo --arg2 something" --arg1
 unset POSIXLY_CORRECT
 run test1 "test1 - 18" "callback: c sampledata bar arg1: 1 arg2: (none)" --arg1 --cb bar
 run test1 "test1 - 19" "" --echo-args
-
-# XXX FIXME
-#run test1 "test1 - 20" "--arg1" --echo-args --arg1
-#run test1 "test1 - 21" "--arg2 something" -T something -e
-#run test1 "test1 - 22" "--arg2 something more args" -T something -a more args
-#run test1 "test1 - 23" "--echo-args -a" --echo-args -e -a
-
+run test1 "test1 - 20" "--arg1" --echo-args --arg1
+run test1 "test1 - 21" "--arg2 something" -T something -e
+run test1 "test1 - 22" "--arg2 something more args" -T something -a more args
+run test1 "test1 - 23" "--echo-args -a" --echo-args -e -a
 run test1 "test1 - 24" "arg1: 0 arg2: (none) short: 1" -onedash
 run test1 "test1 - 25" "arg1: 0 arg2: (none) short: 1" --onedash
 run test1 "test1 - 26" "callback: c arg for cb2 foo arg1: 0 arg2: (none)" --cb2 foo
-- 
Gitee


From 8db2299b486c512024af99d442a79ae7f375ed00 Mon Sep 17 00:00:00 2001
From: Jeff Johnson <n3npq@mac.com>
Date: Sat, 16 Feb 2008 23:48:20 +0000
Subject: [PATCH 505/667] - jbj: fix: permit "--foo bar" and "--foo=bar"
 equivalent forms for aliases.

---
 CHANGES |  1 +
 popt.c  | 49 +++++++++++++++++++++++++++++++++++--------------
 2 files changed, 36 insertions(+), 14 deletions(-)

diff --git a/CHANGES b/CHANGES
index 9692458..bfb66ab 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,4 +1,5 @@
 1.13 -> 1.14:
+    - jbj: fix: permit "--foo bar" and "--foo=bar" equivalent forms for aliases.
     - jbj: fix: tests 20 -> 23 require an explicit '--' arg separator now.
     - jbj: popt.3: add POPT_ARG_ARGV description.
     - jbj: use NUL terminator to align help with (possible) multibyte chars.
diff --git a/popt.c b/popt.c
index b9c735b..6cae6a8 100644
--- a/popt.c
+++ b/popt.c
@@ -304,8 +304,9 @@ static int handleExec(/*@special@*/ poptContext con,
 
 /* Only one of longName, shortName may be set at a time */
 static int handleAlias(/*@special@*/ poptContext con,
-		/*@null@*/ const char * longName, char shortName,
-		/*@exposed@*/ /*@null@*/ const char * nextCharArg)
+		/*@null@*/ const char * longName, size_t longNameLen,
+		char shortName,
+		/*@exposed@*/ /*@null@*/ const char * nextArg)
 	/*@uses con->aliases, con->numAliases, con->optionStack, con->os,
 		con->os->currAlias, con->os->currAlias->option.longName @*/
 	/*@modifies con @*/
@@ -315,9 +316,11 @@ static int handleAlias(/*@special@*/ poptContext con,
     int i;
 
     if (item) {
-	if (longName && (item->option.longName &&
-		!strcmp(longName, item->option.longName)))
+	if (longName && item->option.longName
+	 && longNameLen == strlen(item->option.longName)
+	 && !strncmp(longName, item->option.longName, longNameLen))
 	    return 0;
+	else
 	if (shortName && shortName == item->option.shortName)
 	    return 0;
     }
@@ -327,10 +330,14 @@ static int handleAlias(/*@special@*/ poptContext con,
 
     for (i = con->numAliases - 1; i >= 0; i--) {
 	item = con->aliases + i;
-	if (longName && !(item->option.longName &&
-			!strcmp(longName, item->option.longName)))
-	    continue;
-	else if (shortName != item->option.shortName)
+	if (longName) {
+	    if (item->option.longName == NULL)
+		continue;
+	    if (longNameLen != strlen(item->option.longName))
+		continue;
+	    if (strncmp(longName, item->option.longName, longNameLen))
+		continue;
+	} else if (shortName != item->option.shortName)
 	    continue;
 	break;
     }
@@ -339,8 +346,8 @@ static int handleAlias(/*@special@*/ poptContext con,
     if ((con->os - con->optionStack + 1) == POPT_OPTION_DEPTH)
 	return POPT_ERROR_OPTSTOODEEP;
 
-    if (nextCharArg && *nextCharArg)
-	con->os->nextCharArg = nextCharArg;
+    if (longName == NULL && nextArg && *nextArg)
+	con->os->nextCharArg = nextArg;
 
     con->os++;
     con->os->next = 0;
@@ -348,8 +355,20 @@ static int handleAlias(/*@special@*/ poptContext con,
     con->os->nextArg = NULL;
     con->os->nextCharArg = NULL;
     con->os->currAlias = con->aliases + i;
-    rc = poptDupArgv(con->os->currAlias->argc, con->os->currAlias->argv,
-		&con->os->argc, &con->os->argv);
+    {	const char ** av;
+	int ac = con->os->currAlias->argc;
+	/* Append --foo=bar arg to alias argv array (if present). */ 
+	if (longName && nextArg && *nextArg) {
+	    int i;
+	    av = alloca((ac + 1 + 1) * sizeof(*av));
+	    for (i = 0; i < ac; i++)
+		av[i] = con->os->currAlias->argv[i];
+	    av[ac++] = nextArg;
+	    av[ac] = NULL;
+	} else
+	    av = con->os->currAlias->argv;
+	rc = poptDupArgv(ac, av, &con->os->argc, &con->os->argv);
+    }
     con->os->argb = NULL;
 
     return (rc ? rc : 1);
@@ -861,8 +880,10 @@ int poptGetNextOpt(poptContext con)
 		    longArg = oe + 1;
 
 		/* XXX aliases with arg substitution need "--alias=arg" */
-		if (handleAlias(con, optString, '\0', NULL))
+		if (handleAlias(con, optString, optStringLen, '\0', longArg)) {
+		    longArg = NULL;
 		    continue;
+		}
 
 		if (handleExec(con, optString, '\0'))
 		    continue;
@@ -891,7 +912,7 @@ int poptGetNextOpt(poptContext con)
 
 	    con->os->nextCharArg = NULL;
 
-	    if (handleAlias(con, NULL, *origOptString, origOptString + 1))
+	    if (handleAlias(con, NULL, 0, *origOptString, origOptString + 1))
 		continue;
 
 	    if (handleExec(con, NULL, *origOptString)) {
-- 
Gitee


From 49c17e92ccb8979f01d09744f66a8e3899e5ef74 Mon Sep 17 00:00:00 2001
From: Jeff Johnson <n3npq@mac.com>
Date: Sun, 17 Feb 2008 00:11:16 +0000
Subject: [PATCH 506/667] - jbj: add test for POPT_ARG_ARGV handling.

---
 CHANGES   | 1 +
 test1.c   | 9 ++++++++-
 testit.sh | 1 +
 3 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/CHANGES b/CHANGES
index bfb66ab..2cd2e8b 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,4 +1,5 @@
 1.13 -> 1.14:
+    - jbj: add test for POPT_ARG_ARGV handling.
     - jbj: fix: permit "--foo bar" and "--foo=bar" equivalent forms for aliases.
     - jbj: fix: tests 20 -> 23 require an explicit '--' arg separator now.
     - jbj: popt.3: add POPT_ARG_ARGV description.
diff --git a/test1.c b/test1.c
index a256db4..6f70bc0 100644
--- a/test1.c
+++ b/test1.c
@@ -143,7 +143,7 @@ static struct poptOption options[] = {
 	"POPT_ARGFLAG_RANDOM: experimental", NULL },
 
    { "argv", '\0', POPT_ARG_ARGV, &aArgv, 0,
-	"POPT_ARG_ARGV: experimental", NULL },
+	"POPT_ARG_ARGV: append arg to array (can be used multiple times", NULL},
 
   { "bitset", '\0', POPT_BIT_SET | POPT_ARGFLAG_SHOW_DEFAULT, &aFlag, 0x4321,
 	"POPT_BIT_SET: |= 0x4321", 0},
@@ -283,6 +283,13 @@ int main(int argc, const char ** argv)
     if (aDouble != bDouble)
 	fprintf(stdout, " aDouble: %g", aDouble);
 /*@=realcompare@*/
+    if (aArgv != NULL) {
+	const char **av = aArgv;
+	const char * arg;
+	fprintf(stdout, " aArgv:");
+	while ((arg = *av++) != NULL)
+	    fprintf(stdout, " %s", arg);
+    }
     if (oStr != (char *)-1)
 	fprintf(stdout, " oStr: %s", (oStr ? oStr : "(none)"));
     if (singleDash)
diff --git a/testit.sh b/testit.sh
index d27243d..da8dafa 100755
--- a/testit.sh
+++ b/testit.sh
@@ -99,6 +99,7 @@ run test1 "test1 - 43" "arg1: 0 arg2: (none) oStr: yadda" --optional=yadda
 run test1 "test1 - 44" "arg1: 0 arg2: (none) oStr: yadda" --optional yadda
 run test1 "test1 - 45" "arg1: 0 arg2: (none) oStr: ping rest: pong" --optional=ping pong
 run test1 "test1 - 46" "arg1: 0 arg2: (none) oStr: ping rest: pong" --optional ping pong
+run test1 "test1 - 47" "arg1: 0 arg2: (none) aArgv: A B rest: C" --argv A --argv B C
 
 #run_diff test3 "test3 - 51" test3-data/01.input test3-data/01.answer
 #run_diff test3 "test3 - 52" test3-data/02.input test3-data/02.answer
-- 
Gitee


From e8ce8eb96184683ba64678fdb892a3d9a36b5755 Mon Sep 17 00:00:00 2001
From: Jeff Johnson <n3npq@mac.com>
Date: Sun, 17 Feb 2008 00:26:52 +0000
Subject: [PATCH 507/667] - jbj: display POPT_ARG_ARGV options in --help just
 like other options.

---
 CHANGES    | 1 +
 popthelp.c | 3 +--
 test1.c    | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/CHANGES b/CHANGES
index 2cd2e8b..9f7f282 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,4 +1,5 @@
 1.13 -> 1.14:
+    - jbj: display POPT_ARG_ARGV options in --help just like other options.
     - jbj: add test for POPT_ARG_ARGV handling.
     - jbj: fix: permit "--foo bar" and "--foo=bar" equivalent forms for aliases.
     - jbj: fix: tests 20 -> 23 require an explicit '--' arg separator now.
diff --git a/popthelp.c b/popthelp.c
index a33f4d7..2cc8c41 100644
--- a/popthelp.c
+++ b/popthelp.c
@@ -344,8 +344,7 @@ static void singleOptionHelp(FILE * fp, columns_t columns,
 	/* XXX --long always padded for alignment with/without "-X, ". */
 	sprintf(left, "    %s%s",
 		(poptArgType(opt) == POPT_ARG_MAINCALL ? "" :
-		(poptArgType(opt) == POPT_ARG_ARGV ? "" :
-		(F_ISSET(opt, ONEDASH) ? "-" : "--"))),
+		(F_ISSET(opt, ONEDASH) ? "-" : "--")),
 		opt->longName);
 #undef	prtlong
 
diff --git a/test1.c b/test1.c
index 6f70bc0..fe913c8 100644
--- a/test1.c
+++ b/test1.c
@@ -143,7 +143,7 @@ static struct poptOption options[] = {
 	"POPT_ARGFLAG_RANDOM: experimental", NULL },
 
    { "argv", '\0', POPT_ARG_ARGV, &aArgv, 0,
-	"POPT_ARG_ARGV: append arg to array (can be used multiple times", NULL},
+	"POPT_ARG_ARGV: append arg to array (can be used multiple times)",NULL},
 
   { "bitset", '\0', POPT_BIT_SET | POPT_ARGFLAG_SHOW_DEFAULT, &aFlag, 0x4321,
 	"POPT_BIT_SET: |= 0x4321", 0},
-- 
Gitee


From 638c3083286677c11732b25f71460a65812224d9 Mon Sep 17 00:00:00 2001
From: Jeff Johnson <n3npq@mac.com>
Date: Sun, 17 Feb 2008 00:53:49 +0000
Subject: [PATCH 508/667] - jbj: another pass with splint: use malloc, not
 alloca.

---
 popt.c     | 23 ++++++++++++++---------
 popthelp.c | 26 ++++++++++++--------------
 poptint.c  | 14 +++++++-------
 poptint.h  |  4 ++--
 test1.c    |  2 +-
 5 files changed, 36 insertions(+), 33 deletions(-)

diff --git a/popt.c b/popt.c
index 6cae6a8..2883770 100644
--- a/popt.c
+++ b/popt.c
@@ -316,7 +316,7 @@ static int handleAlias(/*@special@*/ poptContext con,
     int i;
 
     if (item) {
-	if (longName && item->option.longName
+	if (longName && item->option.longName != NULL
 	 && longNameLen == strlen(item->option.longName)
 	 && !strncmp(longName, item->option.longName, longNameLen))
 	    return 0;
@@ -346,7 +346,7 @@ static int handleAlias(/*@special@*/ poptContext con,
     if ((con->os - con->optionStack + 1) == POPT_OPTION_DEPTH)
 	return POPT_ERROR_OPTSTOODEEP;
 
-    if (longName == NULL && nextArg && *nextArg)
+    if (longName == NULL && nextArg != NULL && *nextArg != '\0')
 	con->os->nextCharArg = nextArg;
 
     con->os++;
@@ -358,16 +358,21 @@ static int handleAlias(/*@special@*/ poptContext con,
     {	const char ** av;
 	int ac = con->os->currAlias->argc;
 	/* Append --foo=bar arg to alias argv array (if present). */ 
-	if (longName && nextArg && *nextArg) {
-	    int i;
-	    av = alloca((ac + 1 + 1) * sizeof(*av));
-	    for (i = 0; i < ac; i++)
-		av[i] = con->os->currAlias->argv[i];
-	    av[ac++] = nextArg;
-	    av[ac] = NULL;
+	if (longName && nextArg != NULL && *nextArg != '\0') {
+	    av = malloc((ac + 1 + 1) * sizeof(*av));
+	    if (av != NULL) {	/* XXX won't happen. */
+		for (i = 0; i < ac; i++) {
+		    av[i] = con->os->currAlias->argv[i];
+		}
+		av[ac++] = nextArg;
+		av[ac] = NULL;
+	    } else	/* XXX revert to old popt behavior if malloc fails. */
+		av = con->os->currAlias->argv;
 	} else
 	    av = con->os->currAlias->argv;
 	rc = poptDupArgv(ac, av, &con->os->argc, &con->os->argv);
+	if (av != NULL && av != con->os->currAlias->argv)
+	    free(av);
     }
     con->os->argb = NULL;
 
diff --git a/popthelp.c b/popthelp.c
index 2cc8c41..454c05e 100644
--- a/popthelp.c
+++ b/popthelp.c
@@ -10,8 +10,8 @@
 
 #include "system.h"
 
-#define	POPT_USE_TIOCGWINSZ
-#ifdef	POPT_USE_TIOCGWINSZ
+#define        POPT_USE_TIOCGWINSZ
+#ifdef POPT_USE_TIOCGWINSZ
 #include <sys/ioctl.h>
 #endif
 
@@ -20,8 +20,6 @@
 #include <wchar.h>			/* for mbsrtowcs */
 /*@access mbstate_t @*/
 #endif
-
-
 #include "poptint.h"
 
 /*@access poptContext@*/
@@ -99,21 +97,21 @@ static struct poptOption poptHelpOptions2[] = {
 struct poptOption * poptHelpOptionsI18N = poptHelpOptions2;
 /*@=castfcnptr@*/
 
-#define	_POPTHELP_MAXLINE	((size_t)79)
+#define        _POPTHELP_MAXLINE       ((size_t)79)
 
 typedef struct columns_s {
     size_t cur;
     size_t max;
 } * columns_t;
 
-/**
+/** 
  * Return no. of columns in output window.
- * @param fp		FILE
- * @return		no. of columns
- */
+ * @param fp           FILE
+ * @return             no. of columns 
+ */ 
 static size_t maxColumnWidth(FILE *fp)
 	/*@*/
-{
+{   
     size_t maxcols = _POPTHELP_MAXLINE;
 #if defined(TIOCGWINSZ)
     struct winsize ws;
@@ -127,7 +125,7 @@ static size_t maxColumnWidth(FILE *fp)
     }
 #endif
     return maxcols;
-}
+}   
 
 /**
  * Determine number of display characters in a string.
@@ -190,8 +188,8 @@ getArgDescrip(const struct poptOption * opt,
 	/* Some strings need popt library, not application, i18n domain. */
 	if (opt == (poptHelpOptions + 1)
 	 || opt == (poptHelpOptions + 2)
-	 || !strcmp(opt->argDescrip,N_("Help options:"))
-	 || !strcmp(opt->argDescrip,N_("Options implemented via popt alias/exec:")))
+	 || !strcmp(opt->argDescrip, N_("Help options:"))
+	 || !strcmp(opt->argDescrip, N_("Options implemented via popt alias/exec:")))
 	    return POPT_(opt->argDescrip);
 
 	/* Use the application i18n domain. */
@@ -459,7 +457,7 @@ static void singleOptionHelp(FILE * fp, columns_t columns,
 
 	ch = help + lineLength - 1;
 	while (ch > help && !_isspaceptr(ch))
-	    ch = POPT_prev_char (ch);
+	    ch = POPT_prev_char(ch);
 	if (ch == help) break;		/* give up */
 	while (ch > (help + 1) && _isspaceptr(ch))
 	    ch = POPT_prev_char (ch);
diff --git a/poptint.c b/poptint.c
index 882a5ed..04e0d7d 100644
--- a/poptint.c
+++ b/poptint.c
@@ -83,7 +83,7 @@ strdup_locale_from_utf8 (/*@null@*/ char *buffer)
 		    done = 1;
 		    /*@switchbreak@*/ break;
 		case E2BIG:
-		{   size_t used = pout - dest_str;
+		{   size_t used = (size_t)(pout - dest_str);
 		    dest_size *= 2;
 		    dest_str = realloc(dest_str, (dest_size + 1) * sizeof(*dest_str));
 		    if (dest_str == NULL) {
@@ -147,29 +147,29 @@ strdup_vprintf (const char *format, va_list ap)
 }
 /*@=mustmod@*/
 
-char *
+const char *
 POPT_prev_char (const char *str)
 {
-    char *p = (char *)str;
+    const char *p = str;
 
     while (1) {
 	p--;
 	if (((unsigned)*p & 0xc0) != (unsigned)0x80)
-	    return (char *)p;
+	    return p;
     }
 }
 
-char *
+const char *
 POPT_next_char (const char *str)
 {
-    char *p = (char *)str;
+    const char *p = str;
 
     while (*p != '\0') {
 	p++;
 	if (((unsigned)*p & 0xc0) != (unsigned)0x80)
 	    break;
     }
-    return (char *)p;
+    return p;
 }
 
 int
diff --git a/poptint.h b/poptint.h
index bd45e32..d8e829c 100644
--- a/poptint.h
+++ b/poptint.h
@@ -187,10 +187,10 @@ char *POPT_dgettext(const char * dom, const char * str)
 	/*@*/;
 #endif
 
-char *POPT_prev_char (/*@returned@*/ const char *str)
+const char *POPT_prev_char (/*@returned@*/ const char *str)
 	/*@*/;
 
-char *POPT_next_char (/*@returned@*/ const char *str)
+const char *POPT_next_char (/*@returned@*/ const char *str)
 	/*@*/;
 
 int   POPT_fprintf (FILE* stream, const char *format, ...)
diff --git a/test1.c b/test1.c
index fe913c8..7473040 100644
--- a/test1.c
+++ b/test1.c
@@ -192,7 +192,7 @@ static void resetVars(void)
 	int i;
 	for (i = 0; aArgv[i] != NULL; i++) {
 /*@-unqualifiedtrans@*/
-	    free(aArgv[i]);
+	    free((void *)aArgv[i]);
 /*@=unqualifiedtrans@*/
 	    aArgv[i] = NULL;
 	}
-- 
Gitee


From 49fa4472589829c807f036b8bb30d52cbd3cec40 Mon Sep 17 00:00:00 2001
From: Jeff Johnson <n3npq@mac.com>
Date: Sun, 17 Feb 2008 01:06:43 +0000
Subject: [PATCH 509/667] - jbj: make dist, practice build popt-1.14-1 package.

---
 po/cs.po    | 67 +++++++++++++++++++++++++++++----------------------
 po/da.po    | 67 +++++++++++++++++++++++++++++----------------------
 po/de.po    | 68 ++++++++++++++++++++++++++++++----------------------
 po/es.po    | 67 +++++++++++++++++++++++++++++----------------------
 po/fr.po    | 67 +++++++++++++++++++++++++++++----------------------
 po/ga.po    | 68 ++++++++++++++++++++++++++++++----------------------
 po/gl.po    | 67 +++++++++++++++++++++++++++++----------------------
 po/hu.po    | 64 +++++++++++++++++++++++++++----------------------
 po/is.po    | 67 +++++++++++++++++++++++++++++----------------------
 po/it.po    | 67 +++++++++++++++++++++++++++++----------------------
 po/ja.po    | 68 ++++++++++++++++++++++++++++++----------------------
 po/ko.po    | 67 +++++++++++++++++++++++++++++----------------------
 po/nb.po    | 67 +++++++++++++++++++++++++++++----------------------
 po/nl.po    | 69 +++++++++++++++++++++++++++++++----------------------
 po/pl.po    | 68 ++++++++++++++++++++++++++++++----------------------
 po/popt.pot | 64 +++++++++++++++++++++++++++----------------------
 po/pt.po    | 67 +++++++++++++++++++++++++++++----------------------
 po/ro.po    | 66 ++++++++++++++++++++++++++++----------------------
 po/ru.po    | 67 +++++++++++++++++++++++++++++----------------------
 po/sk.po    | 64 +++++++++++++++++++++++++++----------------------
 po/sl.po    | 64 +++++++++++++++++++++++++++----------------------
 po/sv.po    | 68 ++++++++++++++++++++++++++++++----------------------
 po/tr.po    | 67 +++++++++++++++++++++++++++++----------------------
 po/uk.po    | 64 +++++++++++++++++++++++++++----------------------
 po/vi.po    | 68 ++++++++++++++++++++++++++++++----------------------
 po/wa.po    | 64 +++++++++++++++++++++++++++----------------------
 po/zh_CN.po | 68 ++++++++++++++++++++++++++++++----------------------
 popt.spec   |  7 +++++-
 28 files changed, 1028 insertions(+), 778 deletions(-)

diff --git a/po/cs.po b/po/cs.po
index 4a6b014..461a40b 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.12\n"
 "Report-Msgid-Bugs-To: <popt-devel@rpm5.org>\n"
-"POT-Creation-Date: 2007-11-14 15:19-0500\n"
+"POT-Creation-Date: 2008-02-16 19:54-0500\n"
 "PO-Revision-Date: 2001-07-24 00:03+0100\n"
 "Last-Translator: Milan Kerslager <kerslage@linux.cz>\n"
 "Language-Team: Czech <cs@li.org>\n"
@@ -14,107 +14,116 @@ msgstr ""
 msgid "unknown errno"
 msgstr "nezn�m� ��slo chyby"
 
-#: popt.c:981
-#, c-format
-msgid "option type (%d) not implemented in popt\n"
+#: popt.c:1090
+#, fuzzy, c-format
+msgid "option type (%u) not implemented in popt\n"
 msgstr "volba (%d) nen� v popt implementov�na\n"
 
-#: popt.c:1187
+#: popt.c:1294
 msgid "missing argument"
 msgstr "chyb� argument"
 
-#: popt.c:1189
+#: popt.c:1296
 msgid "unknown option"
 msgstr "nezn�m� volba"
 
-#: popt.c:1191
+#: popt.c:1298
 msgid "mutually exclusive logical operations requested"
 msgstr "po�adov�ny vz�jemn� v�lu�n� logick� operace"
 
-#: popt.c:1193
+#: popt.c:1300
 msgid "opt->arg should not be NULL"
 msgstr "opt->arg nesm� b�t NULL"
 
-#: popt.c:1195
+#: popt.c:1302
 msgid "aliases nested too deeply"
 msgstr "aliasy vno�en� p��li� hluboko"
 
-#: popt.c:1197
+#: popt.c:1304
 msgid "error in parameter quoting"
 msgstr "chyba v quotov�n� parametr�"
 
-#: popt.c:1199
+#: popt.c:1306
 msgid "invalid numeric value"
 msgstr "chybn� numerick� hodnota"
 
-#: popt.c:1201
+#: popt.c:1308
 msgid "number too large or too small"
 msgstr "��slo je p��li� velk� nebo p��li� mal�"
 
-#: popt.c:1203
+#: popt.c:1310
 msgid "memory allocation failed"
 msgstr "selhala alokace pam�ti"
 
-#: popt.c:1207
+#: popt.c:1314
 msgid "unknown error"
 msgstr "nezn�m� chyba"
 
-#: popthelp.c:74 popthelp.c:85
+#: popthelp.c:74 popthelp.c:86
 msgid "Show this help message"
 msgstr "Vyp��e tuto n�pov�du"
 
-#: popthelp.c:75 popthelp.c:86
+#: popthelp.c:75 popthelp.c:87
 msgid "Display brief usage message"
 msgstr "Vyp��e kr�tk� n�vod k pou�it�"
 
-#: popthelp.c:89
+#: popthelp.c:76 popthelp.c:92
+msgid "Terminate options"
+msgstr ""
+
+#: popthelp.c:90
 msgid "Display option defaults in message"
 msgstr "Zobrazit implicitn� volby ve zpr�v�"
 
-#: popthelp.c:163
+#: popthelp.c:191
 msgid "Help options:"
 msgstr ""
 
-#: popthelp.c:164
+#: popthelp.c:192
 msgid "Options implemented via popt alias/exec:"
 msgstr ""
 
-#: popthelp.c:172
+#: popthelp.c:200
 msgid "NONE"
 msgstr "NONE"
 
-#: popthelp.c:174
+#: popthelp.c:202
 msgid "VAL"
 msgstr "VAL"
 
-#: popthelp.c:178
+#: popthelp.c:206
 msgid "INT"
 msgstr "INT"
 
-#: popthelp.c:179
+#: popthelp.c:207
 msgid "LONG"
 msgstr "LONG"
 
-#: popthelp.c:180
+#: popthelp.c:208
+#, fuzzy
+msgid "LONGLONG"
+msgstr "LONG"
+
+#: popthelp.c:209
 msgid "STRING"
 msgstr "STRING"
 
-#: popthelp.c:181
+#: popthelp.c:210
 msgid "FLOAT"
 msgstr "FLOAT"
 
-#: popthelp.c:182
+#: popthelp.c:211
 msgid "DOUBLE"
 msgstr "DOUBLE"
 
-#: popthelp.c:184
+#: popthelp.c:214
 msgid "ARG"
 msgstr "ARG"
 
-#: popthelp.c:597
+#: popthelp.c:634
 msgid "Usage:"
 msgstr "Pou�it�:"
 
-#: popthelp.c:619
+#: popthelp.c:658
 msgid "[OPTION...]"
 msgstr "[VOLBY...]"
diff --git a/po/da.po b/po/da.po
index ced558a..a15b9d5 100644
--- a/po/da.po
+++ b/po/da.po
@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.12\n"
 "Report-Msgid-Bugs-To: <popt-devel@rpm5.org>\n"
-"POT-Creation-Date: 2007-11-14 15:19-0500\n"
+"POT-Creation-Date: 2008-02-16 19:54-0500\n"
 "PO-Revision-Date: Sun Jan 21 2001 04:30:32+0200\n"
 "Last-Translator: Martin Hansen <mah@k64.dk>\n"
 "Language-Team: Dansk <dansk@klid.dk>\n"
@@ -15,108 +15,117 @@ msgstr ""
 msgid "unknown errno"
 msgstr "ukendt fejlnr."
 
-#: popt.c:981
-#, c-format
-msgid "option type (%d) not implemented in popt\n"
+#: popt.c:1090
+#, fuzzy, c-format
+msgid "option type (%u) not implemented in popt\n"
 msgstr "tilvalgstype (%d) er ikke implementeret i popt\n"
 
-#: popt.c:1187
+#: popt.c:1294
 msgid "missing argument"
 msgstr "mangler argument"
 
-#: popt.c:1189
+#: popt.c:1296
 msgid "unknown option"
 msgstr "ukendt tilvalg"
 
-#: popt.c:1191
+#: popt.c:1298
 msgid "mutually exclusive logical operations requested"
 msgstr "de �nskede handlinger udelukker hinanden"
 
-#: popt.c:1193
+#: popt.c:1300
 msgid "opt->arg should not be NULL"
 msgstr ""
 
-#: popt.c:1195
+#: popt.c:1302
 msgid "aliases nested too deeply"
 msgstr "aliaser er for dybt indlejret"
 
-#: popt.c:1197
+#: popt.c:1304
 msgid "error in parameter quoting"
 msgstr "fejl i parameter citering"
 
-#: popt.c:1199
+#: popt.c:1306
 msgid "invalid numeric value"
 msgstr "ugyldig numerisk v�rdi"
 
-#: popt.c:1201
+#: popt.c:1308
 msgid "number too large or too small"
 msgstr "nummer for stort, eller for lille"
 
-#: popt.c:1203
+#: popt.c:1310
 msgid "memory allocation failed"
 msgstr ""
 
-#: popt.c:1207
+#: popt.c:1314
 msgid "unknown error"
 msgstr "ukendt fejl"
 
-#: popthelp.c:74 popthelp.c:85
+#: popthelp.c:74 popthelp.c:86
 msgid "Show this help message"
 msgstr "Vis denne hj�lpemeddelelse"
 
-#: popthelp.c:75 popthelp.c:86
+#: popthelp.c:75 popthelp.c:87
 msgid "Display brief usage message"
 msgstr "Vis kortfattet brugsanvisning"
 
-#: popthelp.c:89
+#: popthelp.c:76 popthelp.c:92
+msgid "Terminate options"
+msgstr ""
+
+#: popthelp.c:90
 #, fuzzy
 msgid "Display option defaults in message"
 msgstr "Vis kortfattet brugsanvisning"
 
-#: popthelp.c:163
+#: popthelp.c:191
 msgid "Help options:"
 msgstr ""
 
-#: popthelp.c:164
+#: popthelp.c:192
 msgid "Options implemented via popt alias/exec:"
 msgstr ""
 
-#: popthelp.c:172
+#: popthelp.c:200
 msgid "NONE"
 msgstr "INGEN"
 
-#: popthelp.c:174
+#: popthelp.c:202
 msgid "VAL"
 msgstr "VAL"
 
-#: popthelp.c:178
+#: popthelp.c:206
 msgid "INT"
 msgstr "INT"
 
-#: popthelp.c:179
+#: popthelp.c:207
 msgid "LONG"
 msgstr "LONG"
 
-#: popthelp.c:180
+#: popthelp.c:208
+#, fuzzy
+msgid "LONGLONG"
+msgstr "LONG"
+
+#: popthelp.c:209
 msgid "STRING"
 msgstr "STRING"
 
-#: popthelp.c:181
+#: popthelp.c:210
 msgid "FLOAT"
 msgstr "FLOAT"
 
-#: popthelp.c:182
+#: popthelp.c:211
 msgid "DOUBLE"
 msgstr "DOUBLE"
 
-#: popthelp.c:184
+#: popthelp.c:214
 msgid "ARG"
 msgstr "ARG"
 
-#: popthelp.c:597
+#: popthelp.c:634
 msgid "Usage:"
 msgstr "Brug:"
 
-#: popthelp.c:619
+#: popthelp.c:658
 msgid "[OPTION...]"
 msgstr "[TILVALG...]"
diff --git a/po/de.po b/po/de.po
index b20ae85..0037fc7 100644
--- a/po/de.po
+++ b/po/de.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.12\n"
 "Report-Msgid-Bugs-To: <popt-devel@rpm5.org>\n"
-"POT-Creation-Date: 2007-11-14 15:19-0500\n"
+"POT-Creation-Date: 2008-02-16 19:54-0500\n"
 "PO-Revision-Date: 2007-11-10 00:35+0100\n"
 "Last-Translator: Robert Scheck <robert@rpm5.org>\n"
 "Language-Team: German <de@li.org>\n"
@@ -18,107 +18,117 @@ msgstr ""
 msgid "unknown errno"
 msgstr "Unbekannte Fehler-Nummer"
 
-#: popt.c:981
-#, c-format
-msgid "option type (%d) not implemented in popt\n"
+#: popt.c:1090
+#, fuzzy, c-format
+msgid "option type (%u) not implemented in popt\n"
 msgstr "Optionstyp (%d) ist in popt nicht vorhanden\n"
 
-#: popt.c:1187
+#: popt.c:1294
 msgid "missing argument"
 msgstr "Fehlendes Argument"
 
-#: popt.c:1189
+#: popt.c:1296
 msgid "unknown option"
 msgstr "Unbekannte Option"
 
-#: popt.c:1191
+#: popt.c:1298
 msgid "mutually exclusive logical operations requested"
 msgstr "Gegenseitig ausschließende logische Operatoren"
 
-#: popt.c:1193
+#: popt.c:1300
 msgid "opt->arg should not be NULL"
 msgstr "opt->arg sollte nicht NULL sein"
 
-#: popt.c:1195
+#: popt.c:1302
 msgid "aliases nested too deeply"
 msgstr "Aliase zu tief verschachtelt"
 
-#: popt.c:1197
+#: popt.c:1304
 msgid "error in parameter quoting"
 msgstr "Fehler beim Quotieren der Parameter"
 
-#: popt.c:1199
+#: popt.c:1306
 msgid "invalid numeric value"
 msgstr "Ungültiger nummerischer Wert"
 
-#: popt.c:1201
+#: popt.c:1308
 msgid "number too large or too small"
 msgstr "Nummer zu groß oder zu klein"
 
-#: popt.c:1203
+#: popt.c:1310
 msgid "memory allocation failed"
 msgstr "Speicherzuordnung fehlgeschlagen"
 
-#: popt.c:1207
+#: popt.c:1314
 msgid "unknown error"
 msgstr "Unbekannter Fehler"
 
-#: popthelp.c:74 popthelp.c:85
+#: popthelp.c:74 popthelp.c:86
 msgid "Show this help message"
 msgstr "Zeigt diese Hilfe an"
 
-#: popthelp.c:75 popthelp.c:86
+#: popthelp.c:75 popthelp.c:87
 msgid "Display brief usage message"
 msgstr "Zeigt eine kurze Verwendungsinformation"
 
-#: popthelp.c:89
+#: popthelp.c:76 popthelp.c:92
+#, fuzzy
+msgid "Terminate options"
+msgstr "Hilfe-Optionen:"
+
+#: popthelp.c:90
 msgid "Display option defaults in message"
 msgstr "Zeigt die Standardeinstellungen an"
 
-#: popthelp.c:163
+#: popthelp.c:191
 msgid "Help options:"
 msgstr "Hilfe-Optionen:"
 
-#: popthelp.c:164
+#: popthelp.c:192
 msgid "Options implemented via popt alias/exec:"
 msgstr "Optionen über popt alias/exec implementiert:"
 
-#: popthelp.c:172
+#: popthelp.c:200
 msgid "NONE"
 msgstr "NICHTS"
 
-#: popthelp.c:174
+#: popthelp.c:202
 msgid "VAL"
 msgstr "WERT"
 
-#: popthelp.c:178
+#: popthelp.c:206
 msgid "INT"
 msgstr "INTEGER"
 
-#: popthelp.c:179
+#: popthelp.c:207
 msgid "LONG"
 msgstr "LONG"
 
-#: popthelp.c:180
+#: popthelp.c:208
+#, fuzzy
+msgid "LONGLONG"
+msgstr "LONG"
+
+#: popthelp.c:209
 msgid "STRING"
 msgstr "STRING"
 
-#: popthelp.c:181
+#: popthelp.c:210
 msgid "FLOAT"
 msgstr "FLOAT"
 
-#: popthelp.c:182
+#: popthelp.c:211
 msgid "DOUBLE"
 msgstr "DOUBLE"
 
-#: popthelp.c:184
+#: popthelp.c:214
 msgid "ARG"
 msgstr "ARGUMENT"
 
-#: popthelp.c:597
+#: popthelp.c:634
 msgid "Usage:"
 msgstr "Verwendung:"
 
-#: popthelp.c:619
+#: popthelp.c:658
 msgid "[OPTION...]"
 msgstr "[OPTION...]"
diff --git a/po/es.po b/po/es.po
index f2a5780..b4029ad 100644
--- a/po/es.po
+++ b/po/es.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.12\n"
 "Report-Msgid-Bugs-To: <popt-devel@rpm5.org>\n"
-"POT-Creation-Date: 2007-11-14 15:19-0500\n"
+"POT-Creation-Date: 2008-02-16 19:54-0500\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Leandro Lucarella <luca@linuxmendoza.org.ar>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -19,108 +19,117 @@ msgstr ""
 msgid "unknown errno"
 msgstr "errno desconocido"
 
-#: popt.c:981
-#, c-format
-msgid "option type (%d) not implemented in popt\n"
+#: popt.c:1090
+#, fuzzy, c-format
+msgid "option type (%u) not implemented in popt\n"
 msgstr "tipo de opcin (%d) no implementada en popt\n"
 
-#: popt.c:1187
+#: popt.c:1294
 msgid "missing argument"
 msgstr "falta argumento"
 
-#: popt.c:1189
+#: popt.c:1296
 msgid "unknown option"
 msgstr "opcin desconocida"
 
-#: popt.c:1191
+#: popt.c:1298
 msgid "mutually exclusive logical operations requested"
 msgstr "requerida operacin lgica mutuamente exclusiva"
 
-#: popt.c:1193
+#: popt.c:1300
 msgid "opt->arg should not be NULL"
 msgstr ""
 
-#: popt.c:1195
+#: popt.c:1302
 msgid "aliases nested too deeply"
 msgstr "alias anidados muy profundamente"
 
-#: popt.c:1197
+#: popt.c:1304
 msgid "error in parameter quoting"
 msgstr "error en cita de parmetros"
 
-#: popt.c:1199
+#: popt.c:1306
 msgid "invalid numeric value"
 msgstr "valor numrico invlido"
 
-#: popt.c:1201
+#: popt.c:1308
 msgid "number too large or too small"
 msgstr "nmero muy largo o muy pequeo"
 
-#: popt.c:1203
+#: popt.c:1310
 msgid "memory allocation failed"
 msgstr ""
 
-#: popt.c:1207
+#: popt.c:1314
 msgid "unknown error"
 msgstr "error desconocido"
 
-#: popthelp.c:74 popthelp.c:85
+#: popthelp.c:74 popthelp.c:86
 msgid "Show this help message"
 msgstr "Muestra este mensaje de ayuda"
 
-#: popthelp.c:75 popthelp.c:86
+#: popthelp.c:75 popthelp.c:87
 msgid "Display brief usage message"
 msgstr "Indica el modo de uso resumido"
 
-#: popthelp.c:89
+#: popthelp.c:76 popthelp.c:92
+msgid "Terminate options"
+msgstr ""
+
+#: popthelp.c:90
 #, fuzzy
 msgid "Display option defaults in message"
 msgstr "Indica el modo de uso resumido"
 
-#: popthelp.c:163
+#: popthelp.c:191
 msgid "Help options:"
 msgstr ""
 
-#: popthelp.c:164
+#: popthelp.c:192
 msgid "Options implemented via popt alias/exec:"
 msgstr ""
 
-#: popthelp.c:172
+#: popthelp.c:200
 msgid "NONE"
 msgstr "NONE"
 
-#: popthelp.c:174
+#: popthelp.c:202
 msgid "VAL"
 msgstr "VAL"
 
-#: popthelp.c:178
+#: popthelp.c:206
 msgid "INT"
 msgstr "INT"
 
-#: popthelp.c:179
+#: popthelp.c:207
 msgid "LONG"
 msgstr "LONG"
 
-#: popthelp.c:180
+#: popthelp.c:208
+#, fuzzy
+msgid "LONGLONG"
+msgstr "LONG"
+
+#: popthelp.c:209
 msgid "STRING"
 msgstr "STRING"
 
-#: popthelp.c:181
+#: popthelp.c:210
 msgid "FLOAT"
 msgstr "FLOAT"
 
-#: popthelp.c:182
+#: popthelp.c:211
 msgid "DOUBLE"
 msgstr "DOUBLE"
 
-#: popthelp.c:184
+#: popthelp.c:214
 msgid "ARG"
 msgstr "ARG"
 
-#: popthelp.c:597
+#: popthelp.c:634
 msgid "Usage:"
 msgstr "Modo de Uso:"
 
-#: popthelp.c:619
+#: popthelp.c:658
 msgid "[OPTION...]"
 msgstr "[OPCIN...]"
diff --git a/po/fr.po b/po/fr.po
index 70ec61e..c12ba9a 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -12,7 +12,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.12\n"
 "Report-Msgid-Bugs-To: <popt-devel@rpm5.org>\n"
-"POT-Creation-Date: 2007-11-14 15:19-0500\n"
+"POT-Creation-Date: 2008-02-16 19:54-0500\n"
 "PO-Revision-Date: 2003-06-22 23:43+0200\n"
 "Last-Translator: RPM French Translation <rpm-fr@livna.org>\n"
 "Language-Team: RPM French Translation <rpm-fr@livna.org>\n"
@@ -24,107 +24,116 @@ msgstr ""
 msgid "unknown errno"
 msgstr "errno inconnu"
 
-#: popt.c:981
-#, c-format
-msgid "option type (%d) not implemented in popt\n"
+#: popt.c:1090
+#, fuzzy, c-format
+msgid "option type (%u) not implemented in popt\n"
 msgstr "type(%d) d'option non implémenté dans popt\n"
 
-#: popt.c:1187
+#: popt.c:1294
 msgid "missing argument"
 msgstr "argument manquant"
 
-#: popt.c:1189
+#: popt.c:1296
 msgid "unknown option"
 msgstr "option iconnue"
 
-#: popt.c:1191
+#: popt.c:1298
 msgid "mutually exclusive logical operations requested"
 msgstr "opérations logiques mutuellement exclusives requises"
 
-#: popt.c:1193
+#: popt.c:1300
 msgid "opt->arg should not be NULL"
 msgstr "opt->arg ne devrait pas être NULL"
 
-#: popt.c:1195
+#: popt.c:1302
 msgid "aliases nested too deeply"
 msgstr "les alias sont trop entremellés"
 
-#: popt.c:1197
+#: popt.c:1304
 msgid "error in parameter quoting"
 msgstr "erreur en citant les paramètres"
 
-#: popt.c:1199
+#: popt.c:1306
 msgid "invalid numeric value"
 msgstr "valeur numérique invalide"
 
-#: popt.c:1201
+#: popt.c:1308
 msgid "number too large or too small"
 msgstr "nombre trop grand ou trop petit"
 
-#: popt.c:1203
+#: popt.c:1310
 msgid "memory allocation failed"
 msgstr "échec de l'allocation de mémoire"
 
-#: popt.c:1207
+#: popt.c:1314
 msgid "unknown error"
 msgstr "erreur inconnue"
 
-#: popthelp.c:74 popthelp.c:85
+#: popthelp.c:74 popthelp.c:86
 msgid "Show this help message"
 msgstr "Montre ce message d'aide"
 
-#: popthelp.c:75 popthelp.c:86
+#: popthelp.c:75 popthelp.c:87
 msgid "Display brief usage message"
 msgstr "Affiche un bref descriptif de l'utilisation"
 
-#: popthelp.c:89
+#: popthelp.c:76 popthelp.c:92
+msgid "Terminate options"
+msgstr ""
+
+#: popthelp.c:90
 msgid "Display option defaults in message"
 msgstr "Afficher les valeurs par défaut des options dans le message"
 
-#: popthelp.c:163
+#: popthelp.c:191
 msgid "Help options:"
 msgstr ""
 
-#: popthelp.c:164
+#: popthelp.c:192
 msgid "Options implemented via popt alias/exec:"
 msgstr ""
 
-#: popthelp.c:172
+#: popthelp.c:200
 msgid "NONE"
 msgstr "RIEN"
 
-#: popthelp.c:174
+#: popthelp.c:202
 msgid "VAL"
 msgstr "VAL"
 
-#: popthelp.c:178
+#: popthelp.c:206
 msgid "INT"
 msgstr "ENTIER"
 
-#: popthelp.c:179
+#: popthelp.c:207
 msgid "LONG"
 msgstr "LONG"
 
-#: popthelp.c:180
+#: popthelp.c:208
+#, fuzzy
+msgid "LONGLONG"
+msgstr "LONG"
+
+#: popthelp.c:209
 msgid "STRING"
 msgstr "CHAINE"
 
-#: popthelp.c:181
+#: popthelp.c:210
 msgid "FLOAT"
 msgstr "FLOTTANT"
 
-#: popthelp.c:182
+#: popthelp.c:211
 msgid "DOUBLE"
 msgstr "DOUBLE"
 
-#: popthelp.c:184
+#: popthelp.c:214
 msgid "ARG"
 msgstr "ARG"
 
-#: popthelp.c:597
+#: popthelp.c:634
 msgid "Usage:"
 msgstr "Utilisation:"
 
-#: popthelp.c:619
+#: popthelp.c:658
 msgid "[OPTION...]"
 msgstr "[OPTION...]"
diff --git a/po/ga.po b/po/ga.po
index c9dae0a..94100f9 100644
--- a/po/ga.po
+++ b/po/ga.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.12\n"
 "Report-Msgid-Bugs-To: <popt-devel@rpm5.org>\n"
-"POT-Creation-Date: 2007-11-14 15:19-0500\n"
+"POT-Creation-Date: 2008-02-16 19:54-0500\n"
 "PO-Revision-Date: 2007-06-19 06:21-0500\n"
 "Last-Translator: Kevin Scannell <kscanne@gmail.com>\n"
 "Language-Team: Irish <gaeilge-gnulinux@lists.sourceforge.net>\n"
@@ -18,107 +18,117 @@ msgstr ""
 msgid "unknown errno"
 msgstr "errno anaithnid"
 
-#: popt.c:981
-#, c-format
-msgid "option type (%d) not implemented in popt\n"
+#: popt.c:1090
+#, fuzzy, c-format
+msgid "option type (%u) not implemented in popt\n"
 msgstr "níl an cineál rogha seo (%d) ar fáil i popt\n"
 
-#: popt.c:1187
+#: popt.c:1294
 msgid "missing argument"
 msgstr "argóint ar iarraidh"
 
-#: popt.c:1189
+#: popt.c:1296
 msgid "unknown option"
 msgstr "rogha anaithnid"
 
-#: popt.c:1191
+#: popt.c:1298
 msgid "mutually exclusive logical operations requested"
 msgstr "iarradh oibríochtaí loighciúla comheisiacha"
 
-#: popt.c:1193
+#: popt.c:1300
 msgid "opt->arg should not be NULL"
 msgstr "níor chóir rogha->arg a bheith NULL"
 
-#: popt.c:1195
+#: popt.c:1302
 msgid "aliases nested too deeply"
 msgstr "ailiasanna neadaithe ródhomhain"
 
-#: popt.c:1197
+#: popt.c:1304
 msgid "error in parameter quoting"
 msgstr "earráid agus paraiméadar á chur faoi chomharthaí athfhriotail"
 
-#: popt.c:1199
+#: popt.c:1306
 msgid "invalid numeric value"
 msgstr "luach neamhbhailí uimhriúil"
 
-#: popt.c:1201
+#: popt.c:1308
 msgid "number too large or too small"
 msgstr "uimhir rómhór nó róbheag"
 
-#: popt.c:1203
+#: popt.c:1310
 msgid "memory allocation failed"
 msgstr "theip ar dháileadh na cuimhne"
 
-#: popt.c:1207
+#: popt.c:1314
 msgid "unknown error"
 msgstr "earráid anaithnid"
 
-#: popthelp.c:74 popthelp.c:85
+#: popthelp.c:74 popthelp.c:86
 msgid "Show this help message"
 msgstr "Taispeáin an chabhair seo"
 
-#: popthelp.c:75 popthelp.c:86
+#: popthelp.c:75 popthelp.c:87
 msgid "Display brief usage message"
 msgstr "Taispeáin beagán eolais faoin úsáid"
 
-#: popthelp.c:89
+#: popthelp.c:76 popthelp.c:92
+#, fuzzy
+msgid "Terminate options"
+msgstr "Roghanna cabhracha:"
+
+#: popthelp.c:90
 msgid "Display option defaults in message"
 msgstr "Taispeáin luachanna réamhshocraithe na roghanna sa teachtaireacht"
 
-#: popthelp.c:163
+#: popthelp.c:191
 msgid "Help options:"
 msgstr "Roghanna cabhracha:"
 
-#: popthelp.c:164
+#: popthelp.c:192
 msgid "Options implemented via popt alias/exec:"
 msgstr "Roghanna a cuireadh i bhfeidhm trí ailias/exec popt:"
 
-#: popthelp.c:172
+#: popthelp.c:200
 msgid "NONE"
 msgstr "NEAMHNÍ"
 
-#: popthelp.c:174
+#: popthelp.c:202
 msgid "VAL"
 msgstr "LUACH"
 
-#: popthelp.c:178
+#: popthelp.c:206
 msgid "INT"
 msgstr "INT"
 
-#: popthelp.c:179
+#: popthelp.c:207
 msgid "LONG"
 msgstr "LONG"
 
-#: popthelp.c:180
+#: popthelp.c:208
+#, fuzzy
+msgid "LONGLONG"
+msgstr "LONG"
+
+#: popthelp.c:209
 msgid "STRING"
 msgstr "STRING"
 
-#: popthelp.c:181
+#: popthelp.c:210
 msgid "FLOAT"
 msgstr "FLOAT"
 
-#: popthelp.c:182
+#: popthelp.c:211
 msgid "DOUBLE"
 msgstr "DOUBLE"
 
-#: popthelp.c:184
+#: popthelp.c:214
 msgid "ARG"
 msgstr "ARG"
 
-#: popthelp.c:597
+#: popthelp.c:634
 msgid "Usage:"
 msgstr "Úsáid:"
 
-#: popthelp.c:619
+#: popthelp.c:658
 msgid "[OPTION...]"
 msgstr "[ROGHA...]"
diff --git a/po/gl.po b/po/gl.po
index 468e8b0..1b1bebe 100644
--- a/po/gl.po
+++ b/po/gl.po
@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.12\n"
 "Report-Msgid-Bugs-To: <popt-devel@rpm5.org>\n"
-"POT-Creation-Date: 2007-11-14 15:19-0500\n"
+"POT-Creation-Date: 2008-02-16 19:54-0500\n"
 "PO-Revision-Date: 2001-01-17 01:01+0100\n"
 "Last-Translator: Jes�s Bravo �lvarez <jba@pobox.com>\n"
 "Language-Team: Galician <trasno@ceu.fi.udc.es>\n"
@@ -14,108 +14,117 @@ msgstr ""
 msgid "unknown errno"
 msgstr "errno desco�ecido"
 
-#: popt.c:981
-#, c-format
-msgid "option type (%d) not implemented in popt\n"
+#: popt.c:1090
+#, fuzzy, c-format
+msgid "option type (%u) not implemented in popt\n"
 msgstr "tipo de opci�n (%d) non implementada en popt\n"
 
-#: popt.c:1187
+#: popt.c:1294
 msgid "missing argument"
 msgstr "falta un argumento"
 
-#: popt.c:1189
+#: popt.c:1296
 msgid "unknown option"
 msgstr "opci�n desco�ecida"
 
-#: popt.c:1191
+#: popt.c:1298
 msgid "mutually exclusive logical operations requested"
 msgstr "solicit�ronse operaci�ns l�xicas mutuamente exclu�ntes"
 
-#: popt.c:1193
+#: popt.c:1300
 msgid "opt->arg should not be NULL"
 msgstr ""
 
-#: popt.c:1195
+#: popt.c:1302
 msgid "aliases nested too deeply"
 msgstr "aliases ani�ados a un nivel demasiado profundo"
 
-#: popt.c:1197
+#: popt.c:1304
 msgid "error in parameter quoting"
 msgstr "erro nas comi�as do par�metro"
 
-#: popt.c:1199
+#: popt.c:1306
 msgid "invalid numeric value"
 msgstr "valor num�rico non v�lido"
 
-#: popt.c:1201
+#: popt.c:1308
 msgid "number too large or too small"
 msgstr "n�mero demasiado grande ou pequeno"
 
-#: popt.c:1203
+#: popt.c:1310
 msgid "memory allocation failed"
 msgstr ""
 
-#: popt.c:1207
+#: popt.c:1314
 msgid "unknown error"
 msgstr "erro desco�ecido"
 
-#: popthelp.c:74 popthelp.c:85
+#: popthelp.c:74 popthelp.c:86
 msgid "Show this help message"
 msgstr "Amosar esta mensaxe de axuda"
 
-#: popthelp.c:75 popthelp.c:86
+#: popthelp.c:75 popthelp.c:87
 msgid "Display brief usage message"
 msgstr "Amosar brevemente o xeito de utilizaci�n"
 
-#: popthelp.c:89
+#: popthelp.c:76 popthelp.c:92
+msgid "Terminate options"
+msgstr ""
+
+#: popthelp.c:90
 #, fuzzy
 msgid "Display option defaults in message"
 msgstr "Amosar brevemente o xeito de utilizaci�n"
 
-#: popthelp.c:163
+#: popthelp.c:191
 msgid "Help options:"
 msgstr ""
 
-#: popthelp.c:164
+#: popthelp.c:192
 msgid "Options implemented via popt alias/exec:"
 msgstr ""
 
-#: popthelp.c:172
+#: popthelp.c:200
 msgid "NONE"
 msgstr "NADA"
 
-#: popthelp.c:174
+#: popthelp.c:202
 msgid "VAL"
 msgstr "VAL"
 
-#: popthelp.c:178
+#: popthelp.c:206
 msgid "INT"
 msgstr "INT"
 
-#: popthelp.c:179
+#: popthelp.c:207
 msgid "LONG"
 msgstr "LONG"
 
-#: popthelp.c:180
+#: popthelp.c:208
+#, fuzzy
+msgid "LONGLONG"
+msgstr "LONG"
+
+#: popthelp.c:209
 msgid "STRING"
 msgstr "CADEA"
 
-#: popthelp.c:181
+#: popthelp.c:210
 msgid "FLOAT"
 msgstr "FLOAT"
 
-#: popthelp.c:182
+#: popthelp.c:211
 msgid "DOUBLE"
 msgstr "DOUBLE"
 
-#: popthelp.c:184
+#: popthelp.c:214
 msgid "ARG"
 msgstr "ARG"
 
-#: popthelp.c:597
+#: popthelp.c:634
 msgid "Usage:"
 msgstr "Uso:"
 
-#: popthelp.c:619
+#: popthelp.c:658
 msgid "[OPTION...]"
 msgstr "[OPCI�N...]"
diff --git a/po/hu.po b/po/hu.po
index 9f35042..d43c459 100644
--- a/po/hu.po
+++ b/po/hu.po
@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.12\n"
 "Report-Msgid-Bugs-To: <popt-devel@rpm5.org>\n"
-"POT-Creation-Date: 2007-11-14 15:19-0500\n"
+"POT-Creation-Date: 2008-02-16 19:54-0500\n"
 "PO-Revision-Date: 2000-08-03 23:26+0200\n"
 "Last-Translator: L�szl� N�meth <nemeth@qwertynet.hu>\n"
 "Language-Team: Hungarian\n"
@@ -14,108 +14,116 @@ msgstr ""
 msgid "unknown errno"
 msgstr ""
 
-#: popt.c:981
+#: popt.c:1090
 #, c-format
-msgid "option type (%d) not implemented in popt\n"
+msgid "option type (%u) not implemented in popt\n"
 msgstr ""
 
-#: popt.c:1187
+#: popt.c:1294
 msgid "missing argument"
 msgstr ""
 
-#: popt.c:1189
+#: popt.c:1296
 msgid "unknown option"
 msgstr ""
 
-#: popt.c:1191
+#: popt.c:1298
 msgid "mutually exclusive logical operations requested"
 msgstr ""
 
-#: popt.c:1193
+#: popt.c:1300
 msgid "opt->arg should not be NULL"
 msgstr ""
 
-#: popt.c:1195
+#: popt.c:1302
 msgid "aliases nested too deeply"
 msgstr ""
 
-#: popt.c:1197
+#: popt.c:1304
 msgid "error in parameter quoting"
 msgstr ""
 
-#: popt.c:1199
+#: popt.c:1306
 msgid "invalid numeric value"
 msgstr ""
 
-#: popt.c:1201
+#: popt.c:1308
 msgid "number too large or too small"
 msgstr ""
 
-#: popt.c:1203
+#: popt.c:1310
 msgid "memory allocation failed"
 msgstr ""
 
-#: popt.c:1207
+#: popt.c:1314
 msgid "unknown error"
 msgstr ""
 
-#: popthelp.c:74 popthelp.c:85
+#: popthelp.c:74 popthelp.c:86
 msgid "Show this help message"
 msgstr "E s�g� megjelen�t�se"
 
-#: popthelp.c:75 popthelp.c:86
+#: popthelp.c:75 popthelp.c:87
 msgid "Display brief usage message"
 msgstr "R�vid haszn�lati utas�t�s megjelen�t�se"
 
-#: popthelp.c:89
+#: popthelp.c:76 popthelp.c:92
+msgid "Terminate options"
+msgstr ""
+
+#: popthelp.c:90
 #, fuzzy
 msgid "Display option defaults in message"
 msgstr "R�vid haszn�lati utas�t�s megjelen�t�se"
 
-#: popthelp.c:163
+#: popthelp.c:191
 msgid "Help options:"
 msgstr ""
 
-#: popthelp.c:164
+#: popthelp.c:192
 msgid "Options implemented via popt alias/exec:"
 msgstr ""
 
-#: popthelp.c:172
+#: popthelp.c:200
 msgid "NONE"
 msgstr ""
 
-#: popthelp.c:174
+#: popthelp.c:202
 msgid "VAL"
 msgstr ""
 
-#: popthelp.c:178
+#: popthelp.c:206
 msgid "INT"
 msgstr ""
 
-#: popthelp.c:179
+#: popthelp.c:207
 msgid "LONG"
 msgstr ""
 
-#: popthelp.c:180
+#: popthelp.c:208
+msgid "LONGLONG"
+msgstr ""
+
+#: popthelp.c:209
 msgid "STRING"
 msgstr ""
 
-#: popthelp.c:181
+#: popthelp.c:210
 msgid "FLOAT"
 msgstr ""
 
-#: popthelp.c:182
+#: popthelp.c:211
 msgid "DOUBLE"
 msgstr ""
 
-#: popthelp.c:184
+#: popthelp.c:214
 msgid "ARG"
 msgstr ""
 
-#: popthelp.c:597
+#: popthelp.c:634
 msgid "Usage:"
 msgstr ""
 
-#: popthelp.c:619
+#: popthelp.c:658
 msgid "[OPTION...]"
 msgstr ""
diff --git a/po/is.po b/po/is.po
index da34560..1e3b8bd 100644
--- a/po/is.po
+++ b/po/is.po
@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.12\n"
 "Report-Msgid-Bugs-To: <popt-devel@rpm5.org>\n"
-"POT-Creation-Date: 2007-11-14 15:19-0500\n"
+"POT-Creation-Date: 2008-02-16 19:54-0500\n"
 "PO-Revision-Date: 2001-06-08 01:35+0000\n"
 "Last-Translator: Richard Allen <ra@hp.is>\n"
 "Language-Team: is <kde-isl@mmedia.is>\n"
@@ -14,107 +14,116 @@ msgstr ""
 msgid "unknown errno"
 msgstr "��ekkt villun�mer"
 
-#: popt.c:981
-#, c-format
-msgid "option type (%d) not implemented in popt\n"
+#: popt.c:1090
+#, fuzzy, c-format
+msgid "option type (%u) not implemented in popt\n"
 msgstr "rofager�in (%d) er ekki studd � popt\n"
 
-#: popt.c:1187
+#: popt.c:1294
 msgid "missing argument"
 msgstr "vantar vi�fang"
 
-#: popt.c:1189
+#: popt.c:1296
 msgid "unknown option"
 msgstr "��ekktur rofi"
 
-#: popt.c:1191
+#: popt.c:1298
 msgid "mutually exclusive logical operations requested"
 msgstr "be�i� um rofa sem sl�kkva hvor � ��rum"
 
-#: popt.c:1193
+#: popt.c:1300
 msgid "opt->arg should not be NULL"
 msgstr "opt->arg �tti ekki a� vera NULL"
 
-#: popt.c:1195
+#: popt.c:1302
 msgid "aliases nested too deeply"
 msgstr "al�asar of fl�knir"
 
-#: popt.c:1197
+#: popt.c:1304
 msgid "error in parameter quoting"
 msgstr "villa � vi�f�ngum (g�salappir og svo frv.)"
 
-#: popt.c:1199
+#: popt.c:1306
 msgid "invalid numeric value"
 msgstr "�gilt t�lulegt gildi"
 
-#: popt.c:1201
+#: popt.c:1308
 msgid "number too large or too small"
 msgstr "talan of st�r e�a sm�"
 
-#: popt.c:1203
+#: popt.c:1310
 msgid "memory allocation failed"
 msgstr "ekki t�kst a� taka fr� minni"
 
-#: popt.c:1207
+#: popt.c:1314
 msgid "unknown error"
 msgstr "��ekkt villa"
 
-#: popthelp.c:74 popthelp.c:85
+#: popthelp.c:74 popthelp.c:86
 msgid "Show this help message"
 msgstr "S�na �essa hj�lp"
 
-#: popthelp.c:75 popthelp.c:86
+#: popthelp.c:75 popthelp.c:87
 msgid "Display brief usage message"
 msgstr "S�na stuttar notkunarlei�beiningar"
 
-#: popthelp.c:89
+#: popthelp.c:76 popthelp.c:92
+msgid "Terminate options"
+msgstr ""
+
+#: popthelp.c:90
 msgid "Display option defaults in message"
 msgstr "S�na sj�lfgefin gildi rofa � skilabo�um"
 
-#: popthelp.c:163
+#: popthelp.c:191
 msgid "Help options:"
 msgstr ""
 
-#: popthelp.c:164
+#: popthelp.c:192
 msgid "Options implemented via popt alias/exec:"
 msgstr ""
 
-#: popthelp.c:172
+#: popthelp.c:200
 msgid "NONE"
 msgstr "ENGIN"
 
-#: popthelp.c:174
+#: popthelp.c:202
 msgid "VAL"
 msgstr "VAL"
 
-#: popthelp.c:178
+#: popthelp.c:206
 msgid "INT"
 msgstr "INT"
 
-#: popthelp.c:179
+#: popthelp.c:207
 msgid "LONG"
 msgstr "LONG"
 
-#: popthelp.c:180
+#: popthelp.c:208
+#, fuzzy
+msgid "LONGLONG"
+msgstr "LONG"
+
+#: popthelp.c:209
 msgid "STRING"
 msgstr "STRING"
 
-#: popthelp.c:181
+#: popthelp.c:210
 msgid "FLOAT"
 msgstr "FLOAT"
 
-#: popthelp.c:182
+#: popthelp.c:211
 msgid "DOUBLE"
 msgstr "DOUBLE"
 
-#: popthelp.c:184
+#: popthelp.c:214
 msgid "ARG"
 msgstr "ARG"
 
-#: popthelp.c:597
+#: popthelp.c:634
 msgid "Usage:"
 msgstr "Notkun:"
 
-#: popthelp.c:619
+#: popthelp.c:658
 msgid "[OPTION...]"
 msgstr "[ROFI...]"
diff --git a/po/it.po b/po/it.po
index f9d1f2b..183f455 100644
--- a/po/it.po
+++ b/po/it.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.12\n"
 "Report-Msgid-Bugs-To: <popt-devel@rpm5.org>\n"
-"POT-Creation-Date: 2007-11-14 15:19-0500\n"
+"POT-Creation-Date: 2008-02-16 19:54-0500\n"
 "PO-Revision-Date: 2007-11-14 20:39+0100\n"
 "Last-Translator: Sandro Bonazzola <sandro.bonazzola@gmail.com>\n"
 "Language-Team: Sandro Bonazzola <sandro.bonazzola@gmail.com>\n"
@@ -20,107 +20,116 @@ msgstr ""
 msgid "unknown errno"
 msgstr "errno sconosciuto"
 
-#: popt.c:981
-#, c-format
-msgid "option type (%d) not implemented in popt\n"
+#: popt.c:1090
+#, fuzzy, c-format
+msgid "option type (%u) not implemented in popt\n"
 msgstr "opzione di tipo (%d) non implementata in popt\n"
 
-#: popt.c:1187
+#: popt.c:1294
 msgid "missing argument"
 msgstr "argomento mancante"
 
-#: popt.c:1189
+#: popt.c:1296
 msgid "unknown option"
 msgstr "opzione sconosciuta"
 
-#: popt.c:1191
+#: popt.c:1298
 msgid "mutually exclusive logical operations requested"
 msgstr "richieste operazioni logiche mutuamente esclusive"
 
-#: popt.c:1193
+#: popt.c:1300
 msgid "opt->arg should not be NULL"
 msgstr "opt->arg non dovrebbe essere NULL"
 
-#: popt.c:1195
+#: popt.c:1302
 msgid "aliases nested too deeply"
 msgstr "alias nidificati troppo profondamente"
 
-#: popt.c:1197
+#: popt.c:1304
 msgid "error in parameter quoting"
 msgstr "errore nel quoting del parametro"
 
-#: popt.c:1199
+#: popt.c:1306
 msgid "invalid numeric value"
 msgstr "valore numerico errato"
 
-#: popt.c:1201
+#: popt.c:1308
 msgid "number too large or too small"
 msgstr "numero troppo grande o troppo piccolo"
 
-#: popt.c:1203
+#: popt.c:1310
 msgid "memory allocation failed"
 msgstr "allocazione di memoria fallita"
 
-#: popt.c:1207
+#: popt.c:1314
 msgid "unknown error"
 msgstr "errore sconosciuto"
 
-#: popthelp.c:74 popthelp.c:85
+#: popthelp.c:74 popthelp.c:86
 msgid "Show this help message"
 msgstr "Mostra questo messaggio di aiuto"
 
-#: popthelp.c:75 popthelp.c:86
+#: popthelp.c:75 popthelp.c:87
 msgid "Display brief usage message"
 msgstr "Mostra un breve messaggio di utilizzo"
 
-#: popthelp.c:89
+#: popthelp.c:76 popthelp.c:92
+msgid "Terminate options"
+msgstr ""
+
+#: popthelp.c:90
 msgid "Display option defaults in message"
 msgstr "Mostra i valori predefiniti delle opzioni nei messaggi"
 
-#: popthelp.c:163
+#: popthelp.c:191
 msgid "Help options:"
 msgstr ""
 
-#: popthelp.c:164
+#: popthelp.c:192
 msgid "Options implemented via popt alias/exec:"
 msgstr ""
 
-#: popthelp.c:172
+#: popthelp.c:200
 msgid "NONE"
 msgstr "NONE"
 
-#: popthelp.c:174
+#: popthelp.c:202
 msgid "VAL"
 msgstr "VAL"
 
-#: popthelp.c:178
+#: popthelp.c:206
 msgid "INT"
 msgstr "INT"
 
-#: popthelp.c:179
+#: popthelp.c:207
 msgid "LONG"
 msgstr "LONG"
 
-#: popthelp.c:180
+#: popthelp.c:208
+#, fuzzy
+msgid "LONGLONG"
+msgstr "LONG"
+
+#: popthelp.c:209
 msgid "STRING"
 msgstr "STRING"
 
-#: popthelp.c:181
+#: popthelp.c:210
 msgid "FLOAT"
 msgstr "FLOAT"
 
-#: popthelp.c:182
+#: popthelp.c:211
 msgid "DOUBLE"
 msgstr "DOUBLE"
 
-#: popthelp.c:184
+#: popthelp.c:214
 msgid "ARG"
 msgstr "ARG"
 
-#: popthelp.c:597
+#: popthelp.c:634
 msgid "Usage:"
 msgstr "Uso:"
 
-#: popthelp.c:619
+#: popthelp.c:658
 msgid "[OPTION...]"
 msgstr "[OPZIONE...]"
diff --git a/po/ja.po b/po/ja.po
index bd9fbdc..9b6ef31 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.12\n"
 "Report-Msgid-Bugs-To: <popt-devel@rpm5.org>\n"
-"POT-Creation-Date: 2007-11-14 15:19-0500\n"
+"POT-Creation-Date: 2008-02-16 19:54-0500\n"
 "PO-Revision-Date: 2003--8-25 19:00+0900\n"
 "Last-Translator: Yukihiro Nakai <ynakai@redhat.com>\n"
 "Language-Team: Japanese <ja@li.org>\n"
@@ -18,107 +18,117 @@ msgstr ""
 msgid "unknown errno"
 msgstr "不明なエラー番号"
 
-#: popt.c:981
-#, c-format
-msgid "option type (%d) not implemented in popt\n"
+#: popt.c:1090
+#, fuzzy, c-format
+msgid "option type (%u) not implemented in popt\n"
 msgstr "オプションタイプ (%d) はpoptには実装されていません\n"
 
-#: popt.c:1187
+#: popt.c:1294
 msgid "missing argument"
 msgstr "引数がありません"
 
-#: popt.c:1189
+#: popt.c:1296
 msgid "unknown option"
 msgstr "不明なオプション"
 
-#: popt.c:1191
+#: popt.c:1298
 msgid "mutually exclusive logical operations requested"
 msgstr "排他的な悪ぺーレーションが必要です"
 
-#: popt.c:1193
+#: popt.c:1300
 msgid "opt->arg should not be NULL"
 msgstr "opt->argはNULLではいけません"
 
-#: popt.c:1195
+#: popt.c:1302
 msgid "aliases nested too deeply"
 msgstr "エイリアスのネストが深すぎます"
 
-#: popt.c:1197
+#: popt.c:1304
 msgid "error in parameter quoting"
 msgstr "パラメータのクオート付けでエラー"
 
-#: popt.c:1199
+#: popt.c:1306
 msgid "invalid numeric value"
 msgstr "不正な数値"
 
-#: popt.c:1201
+#: popt.c:1308
 msgid "number too large or too small"
 msgstr "数値が大きすぎるか小さすぎます"
 
-#: popt.c:1203
+#: popt.c:1310
 msgid "memory allocation failed"
 msgstr "メモリ確保に失敗しました"
 
-#: popt.c:1207
+#: popt.c:1314
 msgid "unknown error"
 msgstr "不明なエラー"
 
-#: popthelp.c:74 popthelp.c:85
+#: popthelp.c:74 popthelp.c:86
 msgid "Show this help message"
 msgstr "このヘルプメッセージを表示します"
 
-#: popthelp.c:75 popthelp.c:86
+#: popthelp.c:75 popthelp.c:87
 msgid "Display brief usage message"
 msgstr "使い方の概要を表示します"
 
-#: popthelp.c:89
+#: popthelp.c:76 popthelp.c:92
+#, fuzzy
+msgid "Terminate options"
+msgstr "ヘルプオプション:"
+
+#: popthelp.c:90
 msgid "Display option defaults in message"
 msgstr "オプションのデフォルト値をメッセージに表示します"
 
-#: popthelp.c:163
+#: popthelp.c:191
 msgid "Help options:"
 msgstr "ヘルプオプション:"
 
-#: popthelp.c:164
+#: popthelp.c:192
 msgid "Options implemented via popt alias/exec:"
 msgstr "poptのalias/execで実装されているオプション:"
 
-#: popthelp.c:172
+#: popthelp.c:200
 msgid "NONE"
 msgstr "なし"
 
-#: popthelp.c:174
+#: popthelp.c:202
 msgid "VAL"
 msgstr "値"
 
-#: popthelp.c:178
+#: popthelp.c:206
 msgid "INT"
 msgstr "INT"
 
-#: popthelp.c:179
+#: popthelp.c:207
 msgid "LONG"
 msgstr "LONG"
 
-#: popthelp.c:180
+#: popthelp.c:208
+#, fuzzy
+msgid "LONGLONG"
+msgstr "LONG"
+
+#: popthelp.c:209
 msgid "STRING"
 msgstr "文字列"
 
-#: popthelp.c:181
+#: popthelp.c:210
 msgid "FLOAT"
 msgstr "FLOAT"
 
-#: popthelp.c:182
+#: popthelp.c:211
 msgid "DOUBLE"
 msgstr "DOUBLE"
 
-#: popthelp.c:184
+#: popthelp.c:214
 msgid "ARG"
 msgstr "ARG"
 
-#: popthelp.c:597
+#: popthelp.c:634
 msgid "Usage:"
 msgstr "使い方:"
 
-#: popthelp.c:619
+#: popthelp.c:658
 msgid "[OPTION...]"
 msgstr "[オプション...]"
diff --git a/po/ko.po b/po/ko.po
index 3b8dc21..a439e47 100644
--- a/po/ko.po
+++ b/po/ko.po
@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.12\n"
 "Report-Msgid-Bugs-To: <popt-devel@rpm5.org>\n"
-"POT-Creation-Date: 2007-11-14 15:19-0500\n"
+"POT-Creation-Date: 2008-02-16 19:54-0500\n"
 "PO-Revision-Date: 2001-09-06 20:06+0900\n"
 "Last-Translator: Jong-Hoon Ryu <redhat4u@netian.com>\n"
 "Language-Team: GNU Translation project <ko@li.org>\n"
@@ -14,107 +14,116 @@ msgstr ""
 msgid "unknown errno"
 msgstr "�� �� ���� �����ڵ�(errno) �Դϴ�"
 
-#: popt.c:981
-#, c-format
-msgid "option type (%d) not implemented in popt\n"
+#: popt.c:1090
+#, fuzzy, c-format
+msgid "option type (%u) not implemented in popt\n"
 msgstr "�ɼ� ���� (%d)�� popt���� ����� �� �����ϴ�\n"
 
-#: popt.c:1187
+#: popt.c:1294
 msgid "missing argument"
 msgstr "�μ��� �������� �ʾҽ��ϴ�"
 
-#: popt.c:1189
+#: popt.c:1296
 msgid "unknown option"
 msgstr "�� �� ���� �ɼ��Դϴ�"
 
-#: popt.c:1191
+#: popt.c:1298
 msgid "mutually exclusive logical operations requested"
 msgstr "���ʿ� ��Ÿ�� ���� ������ �����Ǿ����ϴ�"
 
-#: popt.c:1193
+#: popt.c:1300
 msgid "opt->arg should not be NULL"
 msgstr "�ɼ�->�μ��� NULL�� �Ǿ�� �ȵ˴ϴ�"
 
-#: popt.c:1195
+#: popt.c:1302
 msgid "aliases nested too deeply"
 msgstr "��Ī(alias)�� �����ϰ� �����Ǿ����ϴ�"
 
-#: popt.c:1197
+#: popt.c:1304
 msgid "error in parameter quoting"
 msgstr "�Ű������� ������ �ֽ��ϴ�"
 
-#: popt.c:1199
+#: popt.c:1306
 msgid "invalid numeric value"
 msgstr "�߸��� ��ġ ���Դϴ�"
 
-#: popt.c:1201
+#: popt.c:1308
 msgid "number too large or too small"
 msgstr "���ڰ� �ʹ� ũ�ų� �ʹ� �����ϴ�"
 
-#: popt.c:1203
+#: popt.c:1310
 msgid "memory allocation failed"
 msgstr "�޸� �Ҵ翡 �����߽��ϴ�"
 
-#: popt.c:1207
+#: popt.c:1314
 msgid "unknown error"
 msgstr "�� �� ���� �����Դϴ�"
 
-#: popthelp.c:74 popthelp.c:85
+#: popthelp.c:74 popthelp.c:86
 msgid "Show this help message"
 msgstr "�� ������ �����ݴϴ�"
 
-#: popthelp.c:75 popthelp.c:86
+#: popthelp.c:75 popthelp.c:87
 msgid "Display brief usage message"
 msgstr "������ ������ �����ݴϴ�"
 
-#: popthelp.c:89
+#: popthelp.c:76 popthelp.c:92
+msgid "Terminate options"
+msgstr ""
+
+#: popthelp.c:90
 msgid "Display option defaults in message"
 msgstr "�⺻���� �ɼ��� �����ݴϴ�"
 
-#: popthelp.c:163
+#: popthelp.c:191
 msgid "Help options:"
 msgstr ""
 
-#: popthelp.c:164
+#: popthelp.c:192
 msgid "Options implemented via popt alias/exec:"
 msgstr ""
 
-#: popthelp.c:172
+#: popthelp.c:200
 msgid "NONE"
 msgstr "����(NONE)"
 
-#: popthelp.c:174
+#: popthelp.c:202
 msgid "VAL"
 msgstr "��(VAL)"
 
-#: popthelp.c:178
+#: popthelp.c:206
 msgid "INT"
 msgstr "����(INT)"
 
-#: popthelp.c:179
+#: popthelp.c:207
 msgid "LONG"
 msgstr "����(LONG)"
 
-#: popthelp.c:180
+#: popthelp.c:208
+#, fuzzy
+msgid "LONGLONG"
+msgstr "����(LONG)"
+
+#: popthelp.c:209
 msgid "STRING"
 msgstr "���ڿ�(STRING)"
 
-#: popthelp.c:181
+#: popthelp.c:210
 msgid "FLOAT"
 msgstr "�Ҽ�(FLOAT)"
 
-#: popthelp.c:182
+#: popthelp.c:211
 msgid "DOUBLE"
 msgstr "�Ҽ�(DOUBLE)"
 
-#: popthelp.c:184
+#: popthelp.c:214
 msgid "ARG"
 msgstr "�μ�(ARG)"
 
-#: popthelp.c:597
+#: popthelp.c:634
 msgid "Usage:"
 msgstr "����:"
 
-#: popthelp.c:619
+#: popthelp.c:658
 msgid "[OPTION...]"
 msgstr "[�ɼ�...]"
diff --git a/po/nb.po b/po/nb.po
index 89be567..5e6ce13 100644
--- a/po/nb.po
+++ b/po/nb.po
@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.12\n"
 "Report-Msgid-Bugs-To: <popt-devel@rpm5.org>\n"
-"POT-Creation-Date: 2007-11-14 15:19-0500\n"
+"POT-Creation-Date: 2008-02-16 19:54-0500\n"
 "PO-Revision-Date: 2001-06-27 11:05+0200\n"
 "Last-Translator: Kjartan Maraas <kmaraas@online.no>\n"
 "Language-Team: Norwegian <no@li.org>\n"
@@ -14,107 +14,116 @@ msgstr ""
 msgid "unknown errno"
 msgstr "ukjent errno"
 
-#: popt.c:981
-#, c-format
-msgid "option type (%d) not implemented in popt\n"
+#: popt.c:1090
+#, fuzzy, c-format
+msgid "option type (%u) not implemented in popt\n"
 msgstr "flaggtype (%d) ikke implementert i popt\n"
 
-#: popt.c:1187
+#: popt.c:1294
 msgid "missing argument"
 msgstr "manglende argument"
 
-#: popt.c:1189
+#: popt.c:1296
 msgid "unknown option"
 msgstr "ukjent flagg"
 
-#: popt.c:1191
+#: popt.c:1298
 msgid "mutually exclusive logical operations requested"
 msgstr "gjensidig eksluderende logiske operasjoner forespurt"
 
-#: popt.c:1193
+#: popt.c:1300
 msgid "opt->arg should not be NULL"
 msgstr "opt->arg m� ikke v�re NULL"
 
-#: popt.c:1195
+#: popt.c:1302
 msgid "aliases nested too deeply"
 msgstr "aliaser med for dype l�kker"
 
-#: popt.c:1197
+#: popt.c:1304
 msgid "error in parameter quoting"
 msgstr "feil i parametersitering"
 
-#: popt.c:1199
+#: popt.c:1306
 msgid "invalid numeric value"
 msgstr "ugyldig numerisk verdi"
 
-#: popt.c:1201
+#: popt.c:1308
 msgid "number too large or too small"
 msgstr "tallet er for stort eller lite"
 
-#: popt.c:1203
+#: popt.c:1310
 msgid "memory allocation failed"
 msgstr "minneallokering feilet"
 
-#: popt.c:1207
+#: popt.c:1314
 msgid "unknown error"
 msgstr "ukjent feil"
 
-#: popthelp.c:74 popthelp.c:85
+#: popthelp.c:74 popthelp.c:86
 msgid "Show this help message"
 msgstr "Vis denne hjelpmeldingen"
 
-#: popthelp.c:75 popthelp.c:86
+#: popthelp.c:75 popthelp.c:87
 msgid "Display brief usage message"
 msgstr "Vis kort bruksmelding"
 
-#: popthelp.c:89
+#: popthelp.c:76 popthelp.c:92
+msgid "Terminate options"
+msgstr ""
+
+#: popthelp.c:90
 msgid "Display option defaults in message"
 msgstr "Vis forvalgte flagg i melding"
 
-#: popthelp.c:163
+#: popthelp.c:191
 msgid "Help options:"
 msgstr ""
 
-#: popthelp.c:164
+#: popthelp.c:192
 msgid "Options implemented via popt alias/exec:"
 msgstr ""
 
-#: popthelp.c:172
+#: popthelp.c:200
 msgid "NONE"
 msgstr "INGEN"
 
-#: popthelp.c:174
+#: popthelp.c:202
 msgid "VAL"
 msgstr "VERDI"
 
-#: popthelp.c:178
+#: popthelp.c:206
 msgid "INT"
 msgstr "HELTALL"
 
-#: popthelp.c:179
+#: popthelp.c:207
 msgid "LONG"
 msgstr "LONG"
 
-#: popthelp.c:180
+#: popthelp.c:208
+#, fuzzy
+msgid "LONGLONG"
+msgstr "LONG"
+
+#: popthelp.c:209
 msgid "STRING"
 msgstr "STRENG"
 
-#: popthelp.c:181
+#: popthelp.c:210
 msgid "FLOAT"
 msgstr "FLYTTALL"
 
-#: popthelp.c:182
+#: popthelp.c:211
 msgid "DOUBLE"
 msgstr "DOUBLE"
 
-#: popthelp.c:184
+#: popthelp.c:214
 msgid "ARG"
 msgstr "ARG"
 
-#: popthelp.c:597
+#: popthelp.c:634
 msgid "Usage:"
 msgstr "Bruk:"
 
-#: popthelp.c:619
+#: popthelp.c:658
 msgid "[OPTION...]"
 msgstr "[FLAGG...]"
diff --git a/po/nl.po b/po/nl.po
index 81e1b8c..36a537b 100644
--- a/po/nl.po
+++ b/po/nl.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.12\n"
 "Report-Msgid-Bugs-To: <popt-devel@rpm5.org>\n"
-"POT-Creation-Date: 2007-11-14 15:19-0500\n"
+"POT-Creation-Date: 2008-02-16 19:54-0500\n"
 "PO-Revision-Date: 2007-06-29 17:38+0200\n"
 "Last-Translator: Tim Van Holder <tim.van.holder@telenet.be>\n"
 "Language-Team: Dutch <vertaling@vrijschrift.org>\n"
@@ -19,111 +19,122 @@ msgstr ""
 msgid "unknown errno"
 msgstr "onbekende errno"
 
-#: popt.c:981
-#, c-format
-msgid "option type (%d) not implemented in popt\n"
+#: popt.c:1090
+#, fuzzy, c-format
+msgid "option type (%u) not implemented in popt\n"
 msgstr "optietype (%d) niet geïmplementeerd in popt\n"
 
-#: popt.c:1187
+#: popt.c:1294
 msgid "missing argument"
 msgstr "ontbrekend argument"
 
-#: popt.c:1189
+#: popt.c:1296
 msgid "unknown option"
 msgstr "onbekende optie"
 
-#: popt.c:1191
+#: popt.c:1298
 msgid "mutually exclusive logical operations requested"
 msgstr "wederzijds uitgesloten logische operatoren gevraagd"
 
-#: popt.c:1193
+#: popt.c:1300
 msgid "opt->arg should not be NULL"
 msgstr "opt->arg zou niet NULL mogen zijn"
 
-#: popt.c:1195
+#: popt.c:1302
 msgid "aliases nested too deeply"
 msgstr "aliassen te diep genest"
 
 # of toch beter "quoting" behouden?
-#: popt.c:1197
+#: popt.c:1304
 msgid "error in parameter quoting"
 msgstr "fout in aanhaling van parameters"
 
-#: popt.c:1199
+#: popt.c:1306
 msgid "invalid numeric value"
 msgstr "ongelige numerische waarde"
 
-#: popt.c:1201
+#: popt.c:1308
 msgid "number too large or too small"
 msgstr "getal te klein of te groot"
 
-#: popt.c:1203
+#: popt.c:1310
 msgid "memory allocation failed"
 msgstr "geheugenreservatie mislukt"
 
-#: popt.c:1207
+#: popt.c:1314
 msgid "unknown error"
 msgstr "onbekende fout"
 
-#: popthelp.c:74 popthelp.c:85
+#: popthelp.c:74 popthelp.c:86
 msgid "Show this help message"
 msgstr "Toon deze hulptekst"
 
-#: popthelp.c:75 popthelp.c:86
+#: popthelp.c:75 popthelp.c:87
 msgid "Display brief usage message"
 msgstr "Toon korte tekst over gebruik"
 
-#: popthelp.c:89
+# of "Help-opties:"?
+#: popthelp.c:76 popthelp.c:92
+#, fuzzy
+msgid "Terminate options"
+msgstr "Hulp-opties:"
+
+#: popthelp.c:90
 msgid "Display option defaults in message"
 msgstr "Toon standaardwaarden van opties in de tekst"
 
 # of "Help-opties:"?
-#: popthelp.c:163
+#: popthelp.c:191
 msgid "Help options:"
 msgstr "Hulp-opties:"
 
-#: popthelp.c:164
+#: popthelp.c:192
 msgid "Options implemented via popt alias/exec:"
 msgstr "Opties geïmplementeerd d.m.v. popt alias/exec:"
 
-#: popthelp.c:172
+#: popthelp.c:200
 msgid "NONE"
 msgstr "GEEN"
 
-#: popthelp.c:174
+#: popthelp.c:202
 msgid "VAL"
 msgstr "WAARDE"
 
-#: popthelp.c:178
+#: popthelp.c:206
 msgid "INT"
 msgstr "INT"
 
-#: popthelp.c:179
+#: popthelp.c:207
 msgid "LONG"
 msgstr "LONG"
 
+#: popthelp.c:208
+#, fuzzy
+msgid "LONGLONG"
+msgstr "LONG"
+
 # TEKENREEKS lijkt me niet gepast; dus ofwel STRING behouden, ofwel TEKST
-#: popthelp.c:180
+#: popthelp.c:209
 msgid "STRING"
 msgstr "TEKST"
 
-#: popthelp.c:181
+#: popthelp.c:210
 msgid "FLOAT"
 msgstr "FLOAT"
 
-#: popthelp.c:182
+#: popthelp.c:211
 msgid "DOUBLE"
 msgstr "DOUBLE"
 
 # of hier ARGUMENT van maken?
-#: popthelp.c:184
+#: popthelp.c:214
 msgid "ARG"
 msgstr "ARG"
 
-#: popthelp.c:597
+#: popthelp.c:634
 msgid "Usage:"
 msgstr "Gebruik:"
 
-#: popthelp.c:619
+#: popthelp.c:658
 msgid "[OPTION...]"
 msgstr "[OPTIE...]"
diff --git a/po/pl.po b/po/pl.po
index 94f318d..fe44ef4 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.12\n"
 "Report-Msgid-Bugs-To: <popt-devel@rpm5.org>\n"
-"POT-Creation-Date: 2007-11-14 15:19-0500\n"
+"POT-Creation-Date: 2008-02-16 19:54-0500\n"
 "PO-Revision-Date: 2003-06-08 20:32+0200\n"
 "Last-Translator: Jakub Bogusz <qboosh@pld-linux.org>\n"
 "Language-Team: Polish <translation-team-pl@lists.sourceforge.net>\n"
@@ -18,107 +18,117 @@ msgstr ""
 msgid "unknown errno"
 msgstr "nieznane errno"
 
-#: popt.c:981
-#, c-format
-msgid "option type (%d) not implemented in popt\n"
+#: popt.c:1090
+#, fuzzy, c-format
+msgid "option type (%u) not implemented in popt\n"
 msgstr "rodzaj opcji (%d) nie zaimplementowany w popt\n"
 
-#: popt.c:1187
+#: popt.c:1294
 msgid "missing argument"
 msgstr "brak parametru"
 
-#: popt.c:1189
+#: popt.c:1296
 msgid "unknown option"
 msgstr "nieznana opcja"
 
-#: popt.c:1191
+#: popt.c:1298
 msgid "mutually exclusive logical operations requested"
 msgstr "żądanie wykluczających się operacji"
 
-#: popt.c:1193
+#: popt.c:1300
 msgid "opt->arg should not be NULL"
 msgstr "opt->arg nie może być NULL"
 
-#: popt.c:1195
+#: popt.c:1302
 msgid "aliases nested too deeply"
 msgstr "zbyt duże zagłębienie aliasów"
 
-#: popt.c:1197
+#: popt.c:1304
 msgid "error in parameter quoting"
 msgstr "błąd w cytowaniu parametru"
 
-#: popt.c:1199
+#: popt.c:1306
 msgid "invalid numeric value"
 msgstr "błędna wartość liczbowa"
 
-#: popt.c:1201
+#: popt.c:1308
 msgid "number too large or too small"
 msgstr "liczba zbyt duża lub zbyt mała"
 
-#: popt.c:1203
+#: popt.c:1310
 msgid "memory allocation failed"
 msgstr "błąd alokacji pamięci"
 
-#: popt.c:1207
+#: popt.c:1314
 msgid "unknown error"
 msgstr "nieznany błąd"
 
-#: popthelp.c:74 popthelp.c:85
+#: popthelp.c:74 popthelp.c:86
 msgid "Show this help message"
 msgstr "Pokaż tą pomoc"
 
-#: popthelp.c:75 popthelp.c:86
+#: popthelp.c:75 popthelp.c:87
 msgid "Display brief usage message"
 msgstr "Wyświetl skrócony sposób użycia"
 
-#: popthelp.c:89
+#: popthelp.c:76 popthelp.c:92
+#, fuzzy
+msgid "Terminate options"
+msgstr "Opcje pomocy:"
+
+#: popthelp.c:90
 msgid "Display option defaults in message"
 msgstr "Wyświetl domyślne opcje w opisie"
 
-#: popthelp.c:163
+#: popthelp.c:191
 msgid "Help options:"
 msgstr "Opcje pomocy:"
 
-#: popthelp.c:164
+#: popthelp.c:192
 msgid "Options implemented via popt alias/exec:"
 msgstr "Opcje zaimplementowane poprzez popt alias/exec:"
 
-#: popthelp.c:172
+#: popthelp.c:200
 msgid "NONE"
 msgstr "BRAK"
 
-#: popthelp.c:174
+#: popthelp.c:202
 msgid "VAL"
 msgstr "WART"
 
-#: popthelp.c:178
+#: popthelp.c:206
 msgid "INT"
 msgstr "INT"
 
-#: popthelp.c:179
+#: popthelp.c:207
 msgid "LONG"
 msgstr "LONG"
 
-#: popthelp.c:180
+#: popthelp.c:208
+#, fuzzy
+msgid "LONGLONG"
+msgstr "LONG"
+
+#: popthelp.c:209
 msgid "STRING"
 msgstr "ŁAŃCUCH"
 
-#: popthelp.c:181
+#: popthelp.c:210
 msgid "FLOAT"
 msgstr "FLOAT"
 
-#: popthelp.c:182
+#: popthelp.c:211
 msgid "DOUBLE"
 msgstr "DOUBLE"
 
-#: popthelp.c:184
+#: popthelp.c:214
 msgid "ARG"
 msgstr "PARAM"
 
-#: popthelp.c:597
+#: popthelp.c:634
 msgid "Usage:"
 msgstr "Użycie:"
 
-#: popthelp.c:619
+#: popthelp.c:658
 msgid "[OPTION...]"
 msgstr "[OPCJA...]"
diff --git a/po/popt.pot b/po/popt.pot
index 1408ad3..1a085a4 100644
--- a/po/popt.pot
+++ b/po/popt.pot
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: <popt-devel@rpm5.org>\n"
-"POT-Creation-Date: 2007-11-14 15:19-0500\n"
+"POT-Creation-Date: 2008-02-16 19:54-0500\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -19,107 +19,115 @@ msgstr ""
 msgid "unknown errno"
 msgstr ""
 
-#: popt.c:981
+#: popt.c:1090
 #, c-format
-msgid "option type (%d) not implemented in popt\n"
+msgid "option type (%u) not implemented in popt\n"
 msgstr ""
 
-#: popt.c:1187
+#: popt.c:1294
 msgid "missing argument"
 msgstr ""
 
-#: popt.c:1189
+#: popt.c:1296
 msgid "unknown option"
 msgstr ""
 
-#: popt.c:1191
+#: popt.c:1298
 msgid "mutually exclusive logical operations requested"
 msgstr ""
 
-#: popt.c:1193
+#: popt.c:1300
 msgid "opt->arg should not be NULL"
 msgstr ""
 
-#: popt.c:1195
+#: popt.c:1302
 msgid "aliases nested too deeply"
 msgstr ""
 
-#: popt.c:1197
+#: popt.c:1304
 msgid "error in parameter quoting"
 msgstr ""
 
-#: popt.c:1199
+#: popt.c:1306
 msgid "invalid numeric value"
 msgstr ""
 
-#: popt.c:1201
+#: popt.c:1308
 msgid "number too large or too small"
 msgstr ""
 
-#: popt.c:1203
+#: popt.c:1310
 msgid "memory allocation failed"
 msgstr ""
 
-#: popt.c:1207
+#: popt.c:1314
 msgid "unknown error"
 msgstr ""
 
-#: popthelp.c:74 popthelp.c:85
+#: popthelp.c:74 popthelp.c:86
 msgid "Show this help message"
 msgstr ""
 
-#: popthelp.c:75 popthelp.c:86
+#: popthelp.c:75 popthelp.c:87
 msgid "Display brief usage message"
 msgstr ""
 
-#: popthelp.c:89
+#: popthelp.c:76 popthelp.c:92
+msgid "Terminate options"
+msgstr ""
+
+#: popthelp.c:90
 msgid "Display option defaults in message"
 msgstr ""
 
-#: popthelp.c:163
+#: popthelp.c:191
 msgid "Help options:"
 msgstr ""
 
-#: popthelp.c:164
+#: popthelp.c:192
 msgid "Options implemented via popt alias/exec:"
 msgstr ""
 
-#: popthelp.c:172
+#: popthelp.c:200
 msgid "NONE"
 msgstr ""
 
-#: popthelp.c:174
+#: popthelp.c:202
 msgid "VAL"
 msgstr ""
 
-#: popthelp.c:178
+#: popthelp.c:206
 msgid "INT"
 msgstr ""
 
-#: popthelp.c:179
+#: popthelp.c:207
 msgid "LONG"
 msgstr ""
 
-#: popthelp.c:180
+#: popthelp.c:208
+msgid "LONGLONG"
+msgstr ""
+
+#: popthelp.c:209
 msgid "STRING"
 msgstr ""
 
-#: popthelp.c:181
+#: popthelp.c:210
 msgid "FLOAT"
 msgstr ""
 
-#: popthelp.c:182
+#: popthelp.c:211
 msgid "DOUBLE"
 msgstr ""
 
-#: popthelp.c:184
+#: popthelp.c:214
 msgid "ARG"
 msgstr ""
 
-#: popthelp.c:597
+#: popthelp.c:634
 msgid "Usage:"
 msgstr ""
 
-#: popthelp.c:619
+#: popthelp.c:658
 msgid "[OPTION...]"
 msgstr ""
diff --git a/po/pt.po b/po/pt.po
index fcd9cfc..940a02c 100644
--- a/po/pt.po
+++ b/po/pt.po
@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.12\n"
 "Report-Msgid-Bugs-To: <popt-devel@rpm5.org>\n"
-"POT-Creation-Date: 2007-11-14 15:19-0500\n"
+"POT-Creation-Date: 2008-02-16 19:54-0500\n"
 "PO-Revision-Date: 2002-02-13 18:32+0000\n"
 "Last-Translator: Pedro Morais <morais@kde.org>\n"
 "Language-Team: pt <morais@kde.org>\n"
@@ -14,107 +14,116 @@ msgstr ""
 msgid "unknown errno"
 msgstr "errno desconhecido"
 
-#: popt.c:981
-#, c-format
-msgid "option type (%d) not implemented in popt\n"
+#: popt.c:1090
+#, fuzzy, c-format
+msgid "option type (%u) not implemented in popt\n"
 msgstr "tipo de op��o (%d) n�o implementado no popt\n"
 
-#: popt.c:1187
+#: popt.c:1294
 msgid "missing argument"
 msgstr "falta um argumento"
 
-#: popt.c:1189
+#: popt.c:1296
 msgid "unknown option"
 msgstr "op��o desconhecida"
 
-#: popt.c:1191
+#: popt.c:1298
 msgid "mutually exclusive logical operations requested"
 msgstr "foram pedidas opera��es l�gicas mutuamente exclusivas"
 
-#: popt.c:1193
+#: popt.c:1300
 msgid "opt->arg should not be NULL"
 msgstr "opt->arg n�o deve ser NULL"
 
-#: popt.c:1195
+#: popt.c:1302
 msgid "aliases nested too deeply"
 msgstr "'aliases' demasiado aninhados"
 
-#: popt.c:1197
+#: popt.c:1304
 msgid "error in parameter quoting"
 msgstr "erros no 'quoting' de par�metros"
 
-#: popt.c:1199
+#: popt.c:1306
 msgid "invalid numeric value"
 msgstr "valor n�merico inv�lido"
 
-#: popt.c:1201
+#: popt.c:1308
 msgid "number too large or too small"
 msgstr "n�mero demasiado grando ou pequeno"
 
-#: popt.c:1203
+#: popt.c:1310
 msgid "memory allocation failed"
 msgstr "aloca��o de mem�ria falhou"
 
-#: popt.c:1207
+#: popt.c:1314
 msgid "unknown error"
 msgstr "erro desconhecido"
 
-#: popthelp.c:74 popthelp.c:85
+#: popthelp.c:74 popthelp.c:86
 msgid "Show this help message"
 msgstr "Mostrar esta mensagem de ajuda"
 
-#: popthelp.c:75 popthelp.c:86
+#: popthelp.c:75 popthelp.c:87
 msgid "Display brief usage message"
 msgstr "Mostrar uma mensagem de utiliza��o sucinta"
 
-#: popthelp.c:89
+#: popthelp.c:76 popthelp.c:92
+msgid "Terminate options"
+msgstr ""
+
+#: popthelp.c:90
 msgid "Display option defaults in message"
 msgstr "Mostrar valor por omiss�o das op��es na mensagem"
 
-#: popthelp.c:163
+#: popthelp.c:191
 msgid "Help options:"
 msgstr ""
 
-#: popthelp.c:164
+#: popthelp.c:192
 msgid "Options implemented via popt alias/exec:"
 msgstr ""
 
-#: popthelp.c:172
+#: popthelp.c:200
 msgid "NONE"
 msgstr "NONE"
 
-#: popthelp.c:174
+#: popthelp.c:202
 msgid "VAL"
 msgstr "VAL"
 
-#: popthelp.c:178
+#: popthelp.c:206
 msgid "INT"
 msgstr "INT"
 
-#: popthelp.c:179
+#: popthelp.c:207
 msgid "LONG"
 msgstr "LONG"
 
-#: popthelp.c:180
+#: popthelp.c:208
+#, fuzzy
+msgid "LONGLONG"
+msgstr "LONG"
+
+#: popthelp.c:209
 msgid "STRING"
 msgstr "STRING"
 
-#: popthelp.c:181
+#: popthelp.c:210
 msgid "FLOAT"
 msgstr "FLOAT"
 
-#: popthelp.c:182
+#: popthelp.c:211
 msgid "DOUBLE"
 msgstr "DOUBLE"
 
-#: popthelp.c:184
+#: popthelp.c:214
 msgid "ARG"
 msgstr "ARG"
 
-#: popthelp.c:597
+#: popthelp.c:634
 msgid "Usage:"
 msgstr "Utiliza��o:"
 
-#: popthelp.c:619
+#: popthelp.c:658
 msgid "[OPTION...]"
 msgstr "[OP��O...]"
diff --git a/po/ro.po b/po/ro.po
index 0ad225f..7960449 100644
--- a/po/ro.po
+++ b/po/ro.po
@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.12\n"
 "Report-Msgid-Bugs-To: <popt-devel@rpm5.org>\n"
-"POT-Creation-Date: 2007-11-14 15:19-0500\n"
+"POT-Creation-Date: 2008-02-16 19:54-0500\n"
 "PO-Revision-Date: 2000-06-14 23:23+EST\n"
 "Last-Translator: Cristian Gafton <gafton@redhat.com>\n"
 "Language-Team: Romanian <ro@li.org>\n"
@@ -14,109 +14,117 @@ msgstr ""
 msgid "unknown errno"
 msgstr "eroare necunoscuta"
 
-#: popt.c:981
-#, c-format
-msgid "option type (%d) not implemented in popt\n"
+#: popt.c:1090
+#, fuzzy, c-format
+msgid "option type (%u) not implemented in popt\n"
 msgstr "optiunea de tipul (%d) nu este implementata in popt\n"
 
-#: popt.c:1187
+#: popt.c:1294
 msgid "missing argument"
 msgstr "argument lipsa"
 
-#: popt.c:1189
+#: popt.c:1296
 msgid "unknown option"
 msgstr "optiune necunoscuta"
 
-#: popt.c:1191
+#: popt.c:1298
 msgid "mutually exclusive logical operations requested"
 msgstr ""
 
-#: popt.c:1193
+#: popt.c:1300
 msgid "opt->arg should not be NULL"
 msgstr ""
 
-#: popt.c:1195
+#: popt.c:1302
 msgid "aliases nested too deeply"
 msgstr "recursivitate infinita la optiunile sinonime"
 
-#: popt.c:1197
+#: popt.c:1304
 #, fuzzy
 msgid "error in parameter quoting"
 msgstr "eroare la insertie parametru"
 
-#: popt.c:1199
+#: popt.c:1306
 msgid "invalid numeric value"
 msgstr "valoare numarica invalida"
 
-#: popt.c:1201
+#: popt.c:1308
 msgid "number too large or too small"
 msgstr "numar prea mare sau prea mic"
 
-#: popt.c:1203
+#: popt.c:1310
 msgid "memory allocation failed"
 msgstr ""
 
-#: popt.c:1207
+#: popt.c:1314
 msgid "unknown error"
 msgstr "eroare necuinoscuta"
 
-#: popthelp.c:74 popthelp.c:85
+#: popthelp.c:74 popthelp.c:86
 msgid "Show this help message"
 msgstr "Afisare mesaj de help"
 
-#: popthelp.c:75 popthelp.c:86
+#: popthelp.c:75 popthelp.c:87
 msgid "Display brief usage message"
 msgstr "Afisare mesaj sintaxa sumar"
 
-#: popthelp.c:89
+#: popthelp.c:76 popthelp.c:92
+msgid "Terminate options"
+msgstr ""
+
+#: popthelp.c:90
 #, fuzzy
 msgid "Display option defaults in message"
 msgstr "Afisare mesaj sintaxa sumar"
 
-#: popthelp.c:163
+#: popthelp.c:191
 msgid "Help options:"
 msgstr ""
 
-#: popthelp.c:164
+#: popthelp.c:192
 msgid "Options implemented via popt alias/exec:"
 msgstr ""
 
-#: popthelp.c:172
+#: popthelp.c:200
 msgid "NONE"
 msgstr ""
 
-#: popthelp.c:174
+#: popthelp.c:202
 msgid "VAL"
 msgstr ""
 
-#: popthelp.c:178
+#: popthelp.c:206
 msgid "INT"
 msgstr ""
 
-#: popthelp.c:179
+#: popthelp.c:207
 msgid "LONG"
 msgstr ""
 
-#: popthelp.c:180
+#: popthelp.c:208
+msgid "LONGLONG"
+msgstr ""
+
+#: popthelp.c:209
 msgid "STRING"
 msgstr ""
 
-#: popthelp.c:181
+#: popthelp.c:210
 msgid "FLOAT"
 msgstr ""
 
-#: popthelp.c:182
+#: popthelp.c:211
 msgid "DOUBLE"
 msgstr ""
 
-#: popthelp.c:184
+#: popthelp.c:214
 msgid "ARG"
 msgstr ""
 
-#: popthelp.c:597
+#: popthelp.c:634
 msgid "Usage:"
 msgstr "Sintaxa:"
 
-#: popthelp.c:619
+#: popthelp.c:658
 msgid "[OPTION...]"
 msgstr "[OPTIUNE...]"
diff --git a/po/ru.po b/po/ru.po
index 1db6e60..5a0adac 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.12\n"
 "Report-Msgid-Bugs-To: <popt-devel@rpm5.org>\n"
-"POT-Creation-Date: 2007-11-14 15:19-0500\n"
+"POT-Creation-Date: 2008-02-16 19:54-0500\n"
 "PO-Revision-Date: 2001-07-05 21:00-0500\n"
 "Last-Translator: Eugene Kanter <eugene@blackcatlinux.com>\n"
 "Language-Team: Black Cat Linux Team <blackcat-support@blackcatlinux.com>\n"
@@ -14,107 +14,116 @@ msgstr ""
 msgid "unknown errno"
 msgstr "����������� ����� ������"
 
-#: popt.c:981
-#, c-format
-msgid "option type (%d) not implemented in popt\n"
+#: popt.c:1090
+#, fuzzy, c-format
+msgid "option type (%u) not implemented in popt\n"
 msgstr "��������� ��������� (%d) � popt �� �������������\n"
 
-#: popt.c:1187
+#: popt.c:1294
 msgid "missing argument"
 msgstr "�������� ��������"
 
-#: popt.c:1189
+#: popt.c:1296
 msgid "unknown option"
 msgstr "����������� ��������"
 
-#: popt.c:1191
+#: popt.c:1298
 msgid "mutually exclusive logical operations requested"
 msgstr "��������� ������� ����������� ���������� ��������"
 
-#: popt.c:1193
+#: popt.c:1300
 msgid "opt->arg should not be NULL"
 msgstr "opt->arg �� ����� ���� NULL"
 
-#: popt.c:1195
+#: popt.c:1302
 msgid "aliases nested too deeply"
 msgstr "�������� ������� ���������� �������� �����������"
 
-#: popt.c:1197
+#: popt.c:1304
 msgid "error in parameter quoting"
 msgstr "�����a ��������� ���������� � �������"
 
-#: popt.c:1199
+#: popt.c:1306
 msgid "invalid numeric value"
 msgstr "������������ �������� ��������"
 
-#: popt.c:1201
+#: popt.c:1308
 msgid "number too large or too small"
 msgstr "�������� �������� �� ��������� ����������������"
 
-#: popt.c:1203
+#: popt.c:1310
 msgid "memory allocation failed"
 msgstr "������ ��������� ������"
 
-#: popt.c:1207
+#: popt.c:1314
 msgid "unknown error"
 msgstr "����������� ������"
 
-#: popthelp.c:74 popthelp.c:85
+#: popthelp.c:74 popthelp.c:86
 msgid "Show this help message"
 msgstr "�������� ��� ���������"
 
-#: popthelp.c:75 popthelp.c:86
+#: popthelp.c:75 popthelp.c:87
 msgid "Display brief usage message"
 msgstr "�������� ������� ���������� �� �������������"
 
-#: popthelp.c:89
+#: popthelp.c:76 popthelp.c:92
+msgid "Terminate options"
+msgstr ""
+
+#: popthelp.c:90
 msgid "Display option defaults in message"
 msgstr "�������� ��������� �� ���������"
 
-#: popthelp.c:163
+#: popthelp.c:191
 msgid "Help options:"
 msgstr ""
 
-#: popthelp.c:164
+#: popthelp.c:192
 msgid "Options implemented via popt alias/exec:"
 msgstr ""
 
-#: popthelp.c:172
+#: popthelp.c:200
 msgid "NONE"
 msgstr "NONE"
 
-#: popthelp.c:174
+#: popthelp.c:202
 msgid "VAL"
 msgstr "VAL"
 
-#: popthelp.c:178
+#: popthelp.c:206
 msgid "INT"
 msgstr "INT"
 
-#: popthelp.c:179
+#: popthelp.c:207
 msgid "LONG"
 msgstr "LONG"
 
-#: popthelp.c:180
+#: popthelp.c:208
+#, fuzzy
+msgid "LONGLONG"
+msgstr "LONG"
+
+#: popthelp.c:209
 msgid "STRING"
 msgstr "STRING"
 
-#: popthelp.c:181
+#: popthelp.c:210
 msgid "FLOAT"
 msgstr "FLOAT"
 
-#: popthelp.c:182
+#: popthelp.c:211
 msgid "DOUBLE"
 msgstr "DOUBLE"
 
-#: popthelp.c:184
+#: popthelp.c:214
 msgid "ARG"
 msgstr "ARG"
 
-#: popthelp.c:597
+#: popthelp.c:634
 msgid "Usage:"
 msgstr "�������������:"
 
-#: popthelp.c:619
+#: popthelp.c:658
 msgid "[OPTION...]"
 msgstr "[��������...]"
diff --git a/po/sk.po b/po/sk.po
index 35df79f..2f7b9e0 100644
--- a/po/sk.po
+++ b/po/sk.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.12\n"
 "Report-Msgid-Bugs-To: <popt-devel@rpm5.org>\n"
-"POT-Creation-Date: 2007-11-14 15:19-0500\n"
+"POT-Creation-Date: 2008-02-16 19:54-0500\n"
 "PO-Revision-Date: 1999-08-04 21:40+0200\n"
 "Last-Translator: Stanislav Meduna <stano@eunet.sk>\n"
 "Language-Team: Slovak <sk-i18n@rak.isternet.sk>\n"
@@ -18,108 +18,116 @@ msgstr ""
 msgid "unknown errno"
 msgstr ""
 
-#: popt.c:981
+#: popt.c:1090
 #, c-format
-msgid "option type (%d) not implemented in popt\n"
+msgid "option type (%u) not implemented in popt\n"
 msgstr ""
 
-#: popt.c:1187
+#: popt.c:1294
 msgid "missing argument"
 msgstr ""
 
-#: popt.c:1189
+#: popt.c:1296
 msgid "unknown option"
 msgstr ""
 
-#: popt.c:1191
+#: popt.c:1298
 msgid "mutually exclusive logical operations requested"
 msgstr ""
 
-#: popt.c:1193
+#: popt.c:1300
 msgid "opt->arg should not be NULL"
 msgstr ""
 
-#: popt.c:1195
+#: popt.c:1302
 msgid "aliases nested too deeply"
 msgstr ""
 
-#: popt.c:1197
+#: popt.c:1304
 msgid "error in parameter quoting"
 msgstr ""
 
-#: popt.c:1199
+#: popt.c:1306
 msgid "invalid numeric value"
 msgstr ""
 
-#: popt.c:1201
+#: popt.c:1308
 msgid "number too large or too small"
 msgstr ""
 
-#: popt.c:1203
+#: popt.c:1310
 msgid "memory allocation failed"
 msgstr ""
 
-#: popt.c:1207
+#: popt.c:1314
 msgid "unknown error"
 msgstr ""
 
-#: popthelp.c:74 popthelp.c:85
+#: popthelp.c:74 popthelp.c:86
 msgid "Show this help message"
 msgstr "Vyp�sa� t�to spr�vu"
 
-#: popthelp.c:75 popthelp.c:86
+#: popthelp.c:75 popthelp.c:87
 msgid "Display brief usage message"
 msgstr "Zobrazi� stru�n� n�vod na pou�itie"
 
-#: popthelp.c:89
+#: popthelp.c:76 popthelp.c:92
+msgid "Terminate options"
+msgstr ""
+
+#: popthelp.c:90
 #, fuzzy
 msgid "Display option defaults in message"
 msgstr "Zobrazi� stru�n� n�vod na pou�itie"
 
-#: popthelp.c:163
+#: popthelp.c:191
 msgid "Help options:"
 msgstr ""
 
-#: popthelp.c:164
+#: popthelp.c:192
 msgid "Options implemented via popt alias/exec:"
 msgstr ""
 
-#: popthelp.c:172
+#: popthelp.c:200
 msgid "NONE"
 msgstr ""
 
-#: popthelp.c:174
+#: popthelp.c:202
 msgid "VAL"
 msgstr ""
 
-#: popthelp.c:178
+#: popthelp.c:206
 msgid "INT"
 msgstr ""
 
-#: popthelp.c:179
+#: popthelp.c:207
 msgid "LONG"
 msgstr ""
 
-#: popthelp.c:180
+#: popthelp.c:208
+msgid "LONGLONG"
+msgstr ""
+
+#: popthelp.c:209
 msgid "STRING"
 msgstr ""
 
-#: popthelp.c:181
+#: popthelp.c:210
 msgid "FLOAT"
 msgstr ""
 
-#: popthelp.c:182
+#: popthelp.c:211
 msgid "DOUBLE"
 msgstr ""
 
-#: popthelp.c:184
+#: popthelp.c:214
 msgid "ARG"
 msgstr ""
 
-#: popthelp.c:597
+#: popthelp.c:634
 msgid "Usage:"
 msgstr ""
 
-#: popthelp.c:619
+#: popthelp.c:658
 msgid "[OPTION...]"
 msgstr ""
diff --git a/po/sl.po b/po/sl.po
index b875289..c8cccc9 100644
--- a/po/sl.po
+++ b/po/sl.po
@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.12\n"
 "Report-Msgid-Bugs-To: <popt-devel@rpm5.org>\n"
-"POT-Creation-Date: 2007-11-14 15:19-0500\n"
+"POT-Creation-Date: 2008-02-16 19:54-0500\n"
 "PO-Revision-Date: 2000-09-05 12:30+0200\n"
 "Last-Translator: Roman Maurer <roman.maurer@hermes.si>\n"
 "Language-Team: Slovenian <sl@li.org>\n"
@@ -14,108 +14,116 @@ msgstr ""
 msgid "unknown errno"
 msgstr ""
 
-#: popt.c:981
+#: popt.c:1090
 #, c-format
-msgid "option type (%d) not implemented in popt\n"
+msgid "option type (%u) not implemented in popt\n"
 msgstr ""
 
-#: popt.c:1187
+#: popt.c:1294
 msgid "missing argument"
 msgstr ""
 
-#: popt.c:1189
+#: popt.c:1296
 msgid "unknown option"
 msgstr ""
 
-#: popt.c:1191
+#: popt.c:1298
 msgid "mutually exclusive logical operations requested"
 msgstr ""
 
-#: popt.c:1193
+#: popt.c:1300
 msgid "opt->arg should not be NULL"
 msgstr ""
 
-#: popt.c:1195
+#: popt.c:1302
 msgid "aliases nested too deeply"
 msgstr ""
 
-#: popt.c:1197
+#: popt.c:1304
 msgid "error in parameter quoting"
 msgstr ""
 
-#: popt.c:1199
+#: popt.c:1306
 msgid "invalid numeric value"
 msgstr ""
 
-#: popt.c:1201
+#: popt.c:1308
 msgid "number too large or too small"
 msgstr ""
 
-#: popt.c:1203
+#: popt.c:1310
 msgid "memory allocation failed"
 msgstr ""
 
-#: popt.c:1207
+#: popt.c:1314
 msgid "unknown error"
 msgstr ""
 
-#: popthelp.c:74 popthelp.c:85
+#: popthelp.c:74 popthelp.c:86
 msgid "Show this help message"
 msgstr "Prika�i to sporo�ilo s pomo�jo"
 
-#: popthelp.c:75 popthelp.c:86
+#: popthelp.c:75 popthelp.c:87
 msgid "Display brief usage message"
 msgstr "Prika�i kratko sporo�ilo o uporabi"
 
-#: popthelp.c:89
+#: popthelp.c:76 popthelp.c:92
+msgid "Terminate options"
+msgstr ""
+
+#: popthelp.c:90
 #, fuzzy
 msgid "Display option defaults in message"
 msgstr "Prika�i kratko sporo�ilo o uporabi"
 
-#: popthelp.c:163
+#: popthelp.c:191
 msgid "Help options:"
 msgstr ""
 
-#: popthelp.c:164
+#: popthelp.c:192
 msgid "Options implemented via popt alias/exec:"
 msgstr ""
 
-#: popthelp.c:172
+#: popthelp.c:200
 msgid "NONE"
 msgstr ""
 
-#: popthelp.c:174
+#: popthelp.c:202
 msgid "VAL"
 msgstr ""
 
-#: popthelp.c:178
+#: popthelp.c:206
 msgid "INT"
 msgstr ""
 
-#: popthelp.c:179
+#: popthelp.c:207
 msgid "LONG"
 msgstr ""
 
-#: popthelp.c:180
+#: popthelp.c:208
+msgid "LONGLONG"
+msgstr ""
+
+#: popthelp.c:209
 msgid "STRING"
 msgstr ""
 
-#: popthelp.c:181
+#: popthelp.c:210
 msgid "FLOAT"
 msgstr ""
 
-#: popthelp.c:182
+#: popthelp.c:211
 msgid "DOUBLE"
 msgstr ""
 
-#: popthelp.c:184
+#: popthelp.c:214
 msgid "ARG"
 msgstr ""
 
-#: popthelp.c:597
+#: popthelp.c:634
 msgid "Usage:"
 msgstr ""
 
-#: popthelp.c:619
+#: popthelp.c:658
 msgid "[OPTION...]"
 msgstr ""
diff --git a/po/sv.po b/po/sv.po
index 5697bc0..adea693 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.12\n"
 "Report-Msgid-Bugs-To: <popt-devel@rpm5.org>\n"
-"POT-Creation-Date: 2007-11-14 15:19-0500\n"
+"POT-Creation-Date: 2008-02-16 19:54-0500\n"
 "PO-Revision-Date: 2007-06-12 22:00+0200\n"
 "Last-Translator: G�ran Uddeborg <goeran@uddeborg.se>\n"
 "Language-Team: Swedish <tp-sv@listor.tp-sv.se>\n"
@@ -14,107 +14,117 @@ msgstr ""
 msgid "unknown errno"
 msgstr "ok�nt felnummer"
 
-#: popt.c:981
-#, c-format
-msgid "option type (%d) not implemented in popt\n"
+#: popt.c:1090
+#, fuzzy, c-format
+msgid "option type (%u) not implemented in popt\n"
 msgstr "flaggtypen (%d) �r inte implementerad i popt\n"
 
-#: popt.c:1187
+#: popt.c:1294
 msgid "missing argument"
 msgstr "argument saknas"
 
-#: popt.c:1189
+#: popt.c:1296
 msgid "unknown option"
 msgstr "ok�nd flagga"
 
-#: popt.c:1191
+#: popt.c:1298
 msgid "mutually exclusive logical operations requested"
 msgstr "�msesidigt uteslutande logiska operationer beg�rdes"
 
-#: popt.c:1193
+#: popt.c:1300
 msgid "opt->arg should not be NULL"
 msgstr "opt->arg f�r inte vara NULL"
 
-#: popt.c:1195
+#: popt.c:1302
 msgid "aliases nested too deeply"
 msgstr "alias �r n�stlade f�r djupt"
 
-#: popt.c:1197
+#: popt.c:1304
 msgid "error in parameter quoting"
 msgstr "fel i parametercitering"
 
-#: popt.c:1199
+#: popt.c:1306
 msgid "invalid numeric value"
 msgstr "ogiltigt numeriskt v�rde"
 
-#: popt.c:1201
+#: popt.c:1308
 msgid "number too large or too small"
 msgstr "talet f�r stort eller f�r litet"
 
-#: popt.c:1203
+#: popt.c:1310
 msgid "memory allocation failed"
 msgstr "minnesallokering misslyckades"
 
-#: popt.c:1207
+#: popt.c:1314
 msgid "unknown error"
 msgstr "ok�nt fel"
 
-#: popthelp.c:74 popthelp.c:85
+#: popthelp.c:74 popthelp.c:86
 msgid "Show this help message"
 msgstr "Visa denna hj�lptext"
 
-#: popthelp.c:75 popthelp.c:86
+#: popthelp.c:75 popthelp.c:87
 msgid "Display brief usage message"
 msgstr "Visa en kortfattad anv�ndningstext"
 
-#: popthelp.c:89
+#: popthelp.c:76 popthelp.c:92
+#, fuzzy
+msgid "Terminate options"
+msgstr "Hj�lpflaggor:"
+
+#: popthelp.c:90
 msgid "Display option defaults in message"
 msgstr "Visa standardalternativ f�r flaggor i meddelande"
 
-#: popthelp.c:163
+#: popthelp.c:191
 msgid "Help options:"
 msgstr "Hj�lpflaggor:"
 
-#: popthelp.c:164
+#: popthelp.c:192
 msgid "Options implemented via popt alias/exec:"
 msgstr "Flaggor implementerade via popt-alias/exec:"
 
-#: popthelp.c:172
+#: popthelp.c:200
 msgid "NONE"
 msgstr "INGET"
 
-#: popthelp.c:174
+#: popthelp.c:202
 msgid "VAL"
 msgstr "V�RDE"
 
-#: popthelp.c:178
+#: popthelp.c:206
 msgid "INT"
 msgstr "HELTAL"
 
-#: popthelp.c:179
+#: popthelp.c:207
 msgid "LONG"
 msgstr "L�NG"
 
-#: popthelp.c:180
+#: popthelp.c:208
+#, fuzzy
+msgid "LONGLONG"
+msgstr "L�NG"
+
+#: popthelp.c:209
 msgid "STRING"
 msgstr "STR�NG"
 
-#: popthelp.c:181
+#: popthelp.c:210
 msgid "FLOAT"
 msgstr "FLYTTAL"
 
-#: popthelp.c:182
+#: popthelp.c:211
 msgid "DOUBLE"
 msgstr "DUBBEL"
 
-#: popthelp.c:184
+#: popthelp.c:214
 msgid "ARG"
 msgstr "ARG"
 
-#: popthelp.c:597
+#: popthelp.c:634
 msgid "Usage:"
 msgstr "Anv�ndning:"
 
-#: popthelp.c:619
+#: popthelp.c:658
 msgid "[OPTION...]"
 msgstr "[FLAGGA...]"
diff --git a/po/tr.po b/po/tr.po
index 415a605..cbeb507 100644
--- a/po/tr.po
+++ b/po/tr.po
@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.12\n"
 "Report-Msgid-Bugs-To: <popt-devel@rpm5.org>\n"
-"POT-Creation-Date: 2007-11-14 15:19-0500\n"
+"POT-Creation-Date: 2008-02-16 19:54-0500\n"
 "PO-Revision-Date: 2000-02-11 13:01+0200\n"
 "Last-Translator: Nilgun Belma Buguner <nilgun@technologist.com>\n"
 "Language-Team: Turkish <tr@li.org>\n"
@@ -14,108 +14,117 @@ msgstr ""
 msgid "unknown errno"
 msgstr "bilinmeyen hata no"
 
-#: popt.c:981
-#, c-format
-msgid "option type (%d) not implemented in popt\n"
+#: popt.c:1090
+#, fuzzy, c-format
+msgid "option type (%u) not implemented in popt\n"
 msgstr "se�enek t�r� (%d) popt i�in ge�ersiz\n"
 
-#: popt.c:1187
+#: popt.c:1294
 msgid "missing argument"
 msgstr "arg�man eksik"
 
-#: popt.c:1189
+#: popt.c:1296
 msgid "unknown option"
 msgstr "bilinmeyen se�enek"
 
-#: popt.c:1191
+#: popt.c:1298
 msgid "mutually exclusive logical operations requested"
 msgstr "birbirini d��layan mant�ksal i�lemler istendi"
 
-#: popt.c:1193
+#: popt.c:1300
 msgid "opt->arg should not be NULL"
 msgstr ""
 
-#: popt.c:1195
+#: popt.c:1302
 msgid "aliases nested too deeply"
 msgstr "adlarda �ok fazla i�i�elikler"
 
-#: popt.c:1197
+#: popt.c:1304
 msgid "error in parameter quoting"
 msgstr "parametrelerde t�rnak i�aretleme hatal� "
 
-#: popt.c:1199
+#: popt.c:1306
 msgid "invalid numeric value"
 msgstr "say�sal de�er ge�ersiz"
 
-#: popt.c:1201
+#: popt.c:1308
 msgid "number too large or too small"
 msgstr "say� ya �ok b�y�k ya da �ok k���k"
 
-#: popt.c:1203
+#: popt.c:1310
 msgid "memory allocation failed"
 msgstr ""
 
-#: popt.c:1207
+#: popt.c:1314
 msgid "unknown error"
 msgstr "bilinmeyen hata"
 
-#: popthelp.c:74 popthelp.c:85
+#: popthelp.c:74 popthelp.c:86
 msgid "Show this help message"
 msgstr "Bu yard�m iletisini g�sterir"
 
-#: popthelp.c:75 popthelp.c:86
+#: popthelp.c:75 popthelp.c:87
 msgid "Display brief usage message"
 msgstr "K�sa bir kullan�m iletisi g�ster"
 
-#: popthelp.c:89
+#: popthelp.c:76 popthelp.c:92
+msgid "Terminate options"
+msgstr ""
+
+#: popthelp.c:90
 #, fuzzy
 msgid "Display option defaults in message"
 msgstr "K�sa bir kullan�m iletisi g�ster"
 
-#: popthelp.c:163
+#: popthelp.c:191
 msgid "Help options:"
 msgstr ""
 
-#: popthelp.c:164
+#: popthelp.c:192
 msgid "Options implemented via popt alias/exec:"
 msgstr ""
 
-#: popthelp.c:172
+#: popthelp.c:200
 msgid "NONE"
 msgstr "YOK"
 
-#: popthelp.c:174
+#: popthelp.c:202
 msgid "VAL"
 msgstr "DE�"
 
-#: popthelp.c:178
+#: popthelp.c:206
 msgid "INT"
 msgstr "INT"
 
-#: popthelp.c:179
+#: popthelp.c:207
 msgid "LONG"
 msgstr "LONG"
 
-#: popthelp.c:180
+#: popthelp.c:208
+#, fuzzy
+msgid "LONGLONG"
+msgstr "LONG"
+
+#: popthelp.c:209
 msgid "STRING"
 msgstr "STRING"
 
-#: popthelp.c:181
+#: popthelp.c:210
 msgid "FLOAT"
 msgstr "FLOAT"
 
-#: popthelp.c:182
+#: popthelp.c:211
 msgid "DOUBLE"
 msgstr "DOUBLE"
 
-#: popthelp.c:184
+#: popthelp.c:214
 msgid "ARG"
 msgstr "ARG"
 
-#: popthelp.c:597
+#: popthelp.c:634
 msgid "Usage:"
 msgstr "Kullan�m�:"
 
-#: popthelp.c:619
+#: popthelp.c:658
 msgid "[OPTION...]"
 msgstr "[SE�ENEK...]"
diff --git a/po/uk.po b/po/uk.po
index bd91b48..4858ed0 100644
--- a/po/uk.po
+++ b/po/uk.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.12\n"
 "Report-Msgid-Bugs-To: <popt-devel@rpm5.org>\n"
-"POT-Creation-Date: 2007-11-14 15:19-0500\n"
+"POT-Creation-Date: 2008-02-16 19:54-0500\n"
 "PO-Revision-Date: 1999-09-30 16:54+0200\n"
 "Last-Translator: Yuri Syrota <rasta@renome.rovno.ua>\n"
 "Language-Team: Ukrainian <uk@li.org>\n"
@@ -18,108 +18,116 @@ msgstr ""
 msgid "unknown errno"
 msgstr ""
 
-#: popt.c:981
+#: popt.c:1090
 #, c-format
-msgid "option type (%d) not implemented in popt\n"
+msgid "option type (%u) not implemented in popt\n"
 msgstr ""
 
-#: popt.c:1187
+#: popt.c:1294
 msgid "missing argument"
 msgstr ""
 
-#: popt.c:1189
+#: popt.c:1296
 msgid "unknown option"
 msgstr ""
 
-#: popt.c:1191
+#: popt.c:1298
 msgid "mutually exclusive logical operations requested"
 msgstr ""
 
-#: popt.c:1193
+#: popt.c:1300
 msgid "opt->arg should not be NULL"
 msgstr ""
 
-#: popt.c:1195
+#: popt.c:1302
 msgid "aliases nested too deeply"
 msgstr ""
 
-#: popt.c:1197
+#: popt.c:1304
 msgid "error in parameter quoting"
 msgstr ""
 
-#: popt.c:1199
+#: popt.c:1306
 msgid "invalid numeric value"
 msgstr ""
 
-#: popt.c:1201
+#: popt.c:1308
 msgid "number too large or too small"
 msgstr ""
 
-#: popt.c:1203
+#: popt.c:1310
 msgid "memory allocation failed"
 msgstr ""
 
-#: popt.c:1207
+#: popt.c:1314
 msgid "unknown error"
 msgstr ""
 
-#: popthelp.c:74 popthelp.c:85
+#: popthelp.c:74 popthelp.c:86
 msgid "Show this help message"
 msgstr "�������� �� ��צ���"
 
-#: popthelp.c:75 popthelp.c:86
+#: popthelp.c:75 popthelp.c:87
 msgid "Display brief usage message"
 msgstr "�������� ������� ��צ��� ��� ������������"
 
-#: popthelp.c:89
+#: popthelp.c:76 popthelp.c:92
+msgid "Terminate options"
+msgstr ""
+
+#: popthelp.c:90
 #, fuzzy
 msgid "Display option defaults in message"
 msgstr "�������� ������� ��צ��� ��� ������������"
 
-#: popthelp.c:163
+#: popthelp.c:191
 msgid "Help options:"
 msgstr ""
 
-#: popthelp.c:164
+#: popthelp.c:192
 msgid "Options implemented via popt alias/exec:"
 msgstr ""
 
-#: popthelp.c:172
+#: popthelp.c:200
 msgid "NONE"
 msgstr ""
 
-#: popthelp.c:174
+#: popthelp.c:202
 msgid "VAL"
 msgstr ""
 
-#: popthelp.c:178
+#: popthelp.c:206
 msgid "INT"
 msgstr ""
 
-#: popthelp.c:179
+#: popthelp.c:207
 msgid "LONG"
 msgstr ""
 
-#: popthelp.c:180
+#: popthelp.c:208
+msgid "LONGLONG"
+msgstr ""
+
+#: popthelp.c:209
 msgid "STRING"
 msgstr ""
 
-#: popthelp.c:181
+#: popthelp.c:210
 msgid "FLOAT"
 msgstr ""
 
-#: popthelp.c:182
+#: popthelp.c:211
 msgid "DOUBLE"
 msgstr ""
 
-#: popthelp.c:184
+#: popthelp.c:214
 msgid "ARG"
 msgstr ""
 
-#: popthelp.c:597
+#: popthelp.c:634
 msgid "Usage:"
 msgstr ""
 
-#: popthelp.c:619
+#: popthelp.c:658
 msgid "[OPTION...]"
 msgstr ""
diff --git a/po/vi.po b/po/vi.po
index 9b0bbd4..5838321 100644
--- a/po/vi.po
+++ b/po/vi.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.12\n"
 "Report-Msgid-Bugs-To: <popt-devel@rpm5.org>\n"
-"POT-Creation-Date: 2007-11-14 15:19-0500\n"
+"POT-Creation-Date: 2008-02-16 19:54-0500\n"
 "PO-Revision-Date: 2007-07-12 22:37+0930\n"
 "Last-Translator: Clytie Siddall <clytie@riverland.net.au>\n"
 "Language-Team: Vietnamese <vi-VN@googlegroups.com>\n"
@@ -20,107 +20,117 @@ msgstr ""
 msgid "unknown errno"
 msgstr "số hiệu lỗi không rõ"
 
-#: popt.c:981
-#, c-format
-msgid "option type (%d) not implemented in popt\n"
+#: popt.c:1090
+#, fuzzy, c-format
+msgid "option type (%u) not implemented in popt\n"
 msgstr "kiểu tùy chọn (%d) chưa được thực hiện trong popt\n"
 
-#: popt.c:1187
+#: popt.c:1294
 msgid "missing argument"
 msgstr "thiếu đối số"
 
-#: popt.c:1189
+#: popt.c:1296
 msgid "unknown option"
 msgstr "tùy chọn không rõ"
 
-#: popt.c:1191
+#: popt.c:1298
 msgid "mutually exclusive logical operations requested"
 msgstr "các thao tác hợp lý loại từ lẫn nhau được yêu cầu"
 
-#: popt.c:1193
+#: popt.c:1300
 msgid "opt->arg should not be NULL"
 msgstr "« tùy chọn->đối số » không thể vô giá trị"
 
-#: popt.c:1195
+#: popt.c:1302
 msgid "aliases nested too deeply"
 msgstr "các bí danh lồng nhau quá sâu"
 
-#: popt.c:1197
+#: popt.c:1304
 msgid "error in parameter quoting"
 msgstr "gặp lỗi trong lời trích dẫn tham số"
 
-#: popt.c:1199
+#: popt.c:1306
 msgid "invalid numeric value"
 msgstr "giá trị thuộc số không hợp lệ"
 
-#: popt.c:1201
+#: popt.c:1308
 msgid "number too large or too small"
 msgstr "con số quá lớn hay quá nhỏ"
 
-#: popt.c:1203
+#: popt.c:1310
 msgid "memory allocation failed"
 msgstr "lỗi cấp phát bộ nhớ"
 
-#: popt.c:1207
+#: popt.c:1314
 msgid "unknown error"
 msgstr "lỗi không rõ"
 
-#: popthelp.c:74 popthelp.c:85
+#: popthelp.c:74 popthelp.c:86
 msgid "Show this help message"
 msgstr "Xem thông điệp trợ giúp này"
 
-#: popthelp.c:75 popthelp.c:86
+#: popthelp.c:75 popthelp.c:87
 msgid "Display brief usage message"
 msgstr "Hiển thị thông điệp cách sử dụng ngắn"
 
-#: popthelp.c:89
+#: popthelp.c:76 popthelp.c:92
+#, fuzzy
+msgid "Terminate options"
+msgstr "Tùy chọn trợ giúp:"
+
+#: popthelp.c:90
 msgid "Display option defaults in message"
 msgstr "Hiển thị các giá trị mặc định của tùy chọn trong thông điệp"
 
-#: popthelp.c:163
+#: popthelp.c:191
 msgid "Help options:"
 msgstr "Tùy chọn trợ giúp:"
 
-#: popthelp.c:164
+#: popthelp.c:192
 msgid "Options implemented via popt alias/exec:"
 msgstr "Các tùy chọn được thực hiện thông qua popt alias/exec:"
 
-#: popthelp.c:172
+#: popthelp.c:200
 msgid "NONE"
 msgstr "KHÔNG CÓ"
 
-#: popthelp.c:174
+#: popthelp.c:202
 msgid "VAL"
 msgstr "GIÁ TRỊ"
 
-#: popthelp.c:178
+#: popthelp.c:206
 msgid "INT"
 msgstr "SỐ NGUYÊN"
 
-#: popthelp.c:179
+#: popthelp.c:207
 msgid "LONG"
 msgstr "DÀI"
 
-#: popthelp.c:180
+#: popthelp.c:208
+#, fuzzy
+msgid "LONGLONG"
+msgstr "DÀI"
+
+#: popthelp.c:209
 msgid "STRING"
 msgstr "CHUỖI"
 
-#: popthelp.c:181
+#: popthelp.c:210
 msgid "FLOAT"
 msgstr "NỔI"
 
-#: popthelp.c:182
+#: popthelp.c:211
 msgid "DOUBLE"
 msgstr "ĐÔI"
 
-#: popthelp.c:184
+#: popthelp.c:214
 msgid "ARG"
 msgstr "ĐỐI SỐ"
 
-#: popthelp.c:597
+#: popthelp.c:634
 msgid "Usage:"
 msgstr "Cách sử dụng:"
 
-#: popthelp.c:619
+#: popthelp.c:658
 msgid "[OPTION...]"
 msgstr "[TÙY_CHỌN...]"
diff --git a/po/wa.po b/po/wa.po
index 87860c6..09f2134 100644
--- a/po/wa.po
+++ b/po/wa.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.12\n"
 "Report-Msgid-Bugs-To: <popt-devel@rpm5.org>\n"
-"POT-Creation-Date: 2007-11-14 15:19-0500\n"
+"POT-Creation-Date: 2008-02-16 19:54-0500\n"
 "PO-Revision-Date: 1999-03-18 23:11+0100\n"
 "Last-Translator: Nobody yet\n"
 "Language-Team: walon <linux-wa@chanae.alphanet.ch>\n"
@@ -22,108 +22,116 @@ msgstr ""
 msgid "unknown errno"
 msgstr ""
 
-#: popt.c:981
+#: popt.c:1090
 #, c-format
-msgid "option type (%d) not implemented in popt\n"
+msgid "option type (%u) not implemented in popt\n"
 msgstr ""
 
-#: popt.c:1187
+#: popt.c:1294
 msgid "missing argument"
 msgstr ""
 
-#: popt.c:1189
+#: popt.c:1296
 msgid "unknown option"
 msgstr ""
 
-#: popt.c:1191
+#: popt.c:1298
 msgid "mutually exclusive logical operations requested"
 msgstr ""
 
-#: popt.c:1193
+#: popt.c:1300
 msgid "opt->arg should not be NULL"
 msgstr ""
 
-#: popt.c:1195
+#: popt.c:1302
 msgid "aliases nested too deeply"
 msgstr ""
 
-#: popt.c:1197
+#: popt.c:1304
 msgid "error in parameter quoting"
 msgstr ""
 
-#: popt.c:1199
+#: popt.c:1306
 msgid "invalid numeric value"
 msgstr ""
 
-#: popt.c:1201
+#: popt.c:1308
 msgid "number too large or too small"
 msgstr ""
 
-#: popt.c:1203
+#: popt.c:1310
 msgid "memory allocation failed"
 msgstr ""
 
-#: popt.c:1207
+#: popt.c:1314
 msgid "unknown error"
 msgstr ""
 
-#: popthelp.c:74 popthelp.c:85
+#: popthelp.c:74 popthelp.c:86
 msgid "Show this help message"
 msgstr "Mostrer ci messaedje d' aide chal"
 
-#: popthelp.c:75 popthelp.c:86
+#: popthelp.c:75 popthelp.c:87
 msgid "Display brief usage message"
 msgstr "Mostre on court messaedje so kmint vos � siervi"
 
-#: popthelp.c:89
+#: popthelp.c:76 popthelp.c:92
+msgid "Terminate options"
+msgstr ""
+
+#: popthelp.c:90
 #, fuzzy
 msgid "Display option defaults in message"
 msgstr "Mostre on court messaedje so kmint vos � siervi"
 
-#: popthelp.c:163
+#: popthelp.c:191
 msgid "Help options:"
 msgstr ""
 
-#: popthelp.c:164
+#: popthelp.c:192
 msgid "Options implemented via popt alias/exec:"
 msgstr ""
 
-#: popthelp.c:172
+#: popthelp.c:200
 msgid "NONE"
 msgstr ""
 
-#: popthelp.c:174
+#: popthelp.c:202
 msgid "VAL"
 msgstr ""
 
-#: popthelp.c:178
+#: popthelp.c:206
 msgid "INT"
 msgstr ""
 
-#: popthelp.c:179
+#: popthelp.c:207
 msgid "LONG"
 msgstr ""
 
-#: popthelp.c:180
+#: popthelp.c:208
+msgid "LONGLONG"
+msgstr ""
+
+#: popthelp.c:209
 msgid "STRING"
 msgstr ""
 
-#: popthelp.c:181
+#: popthelp.c:210
 msgid "FLOAT"
 msgstr ""
 
-#: popthelp.c:182
+#: popthelp.c:211
 msgid "DOUBLE"
 msgstr ""
 
-#: popthelp.c:184
+#: popthelp.c:214
 msgid "ARG"
 msgstr ""
 
-#: popthelp.c:597
+#: popthelp.c:634
 msgid "Usage:"
 msgstr ""
 
-#: popthelp.c:619
+#: popthelp.c:658
 msgid "[OPTION...]"
 msgstr ""
diff --git a/po/zh_CN.po b/po/zh_CN.po
index ea12746..1d2a2ce 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.12\n"
 "Report-Msgid-Bugs-To: <popt-devel@rpm5.org>\n"
-"POT-Creation-Date: 2007-11-14 15:19-0500\n"
+"POT-Creation-Date: 2008-02-16 19:54-0500\n"
 "PO-Revision-Date: 2007-08-13 22:32+0800\n"
 "Last-Translator: LI Daobing <lidaobing@gmail.com>\n"
 "Language-Team: Chinese (simplified) <translation-team-zh-cn@lists."
@@ -21,107 +21,117 @@ msgstr ""
 msgid "unknown errno"
 msgstr "未知的错误"
 
-#: popt.c:981
-#, c-format
-msgid "option type (%d) not implemented in popt\n"
+#: popt.c:1090
+#, fuzzy, c-format
+msgid "option type (%u) not implemented in popt\n"
 msgstr "选项类别 (%d) 没有在 popt 中实现\n"
 
-#: popt.c:1187
+#: popt.c:1294
 msgid "missing argument"
 msgstr "缺少参数"
 
-#: popt.c:1189
+#: popt.c:1296
 msgid "unknown option"
 msgstr "未知的选项"
 
-#: popt.c:1191
+#: popt.c:1298
 msgid "mutually exclusive logical operations requested"
 msgstr "需要 XOR 逻辑运算"
 
-#: popt.c:1193
+#: popt.c:1300
 msgid "opt->arg should not be NULL"
 msgstr "opt->arg 不应该为 NULL"
 
-#: popt.c:1195
+#: popt.c:1302
 msgid "aliases nested too deeply"
 msgstr "别名嵌套太深"
 
-#: popt.c:1197
+#: popt.c:1304
 msgid "error in parameter quoting"
 msgstr "参数引号错误"
 
-#: popt.c:1199
+#: popt.c:1306
 msgid "invalid numeric value"
 msgstr "无效的数值"
 
-#: popt.c:1201
+#: popt.c:1308
 msgid "number too large or too small"
 msgstr "数值太大或太小"
 
-#: popt.c:1203
+#: popt.c:1310
 msgid "memory allocation failed"
 msgstr "内存分配错误"
 
-#: popt.c:1207
+#: popt.c:1314
 msgid "unknown error"
 msgstr "未知的错误"
 
-#: popthelp.c:74 popthelp.c:85
+#: popthelp.c:74 popthelp.c:86
 msgid "Show this help message"
 msgstr "显示这个帮助信息"
 
-#: popthelp.c:75 popthelp.c:86
+#: popthelp.c:75 popthelp.c:87
 msgid "Display brief usage message"
 msgstr "显示简短的使用说明"
 
-#: popthelp.c:89
+#: popthelp.c:76 popthelp.c:92
+#, fuzzy
+msgid "Terminate options"
+msgstr "帮助选项:"
+
+#: popthelp.c:90
 msgid "Display option defaults in message"
 msgstr "在信息中显示默认的选项"
 
-#: popthelp.c:163
+#: popthelp.c:191
 msgid "Help options:"
 msgstr "帮助选项:"
 
-#: popthelp.c:164
+#: popthelp.c:192
 msgid "Options implemented via popt alias/exec:"
 msgstr "通过 popt alias/exec 实现的选项:"
 
-#: popthelp.c:172
+#: popthelp.c:200
 msgid "NONE"
 msgstr "NONE"
 
-#: popthelp.c:174
+#: popthelp.c:202
 msgid "VAL"
 msgstr "VAL"
 
-#: popthelp.c:178
+#: popthelp.c:206
 msgid "INT"
 msgstr "INT"
 
-#: popthelp.c:179
+#: popthelp.c:207
 msgid "LONG"
 msgstr "LONG"
 
-#: popthelp.c:180
+#: popthelp.c:208
+#, fuzzy
+msgid "LONGLONG"
+msgstr "LONG"
+
+#: popthelp.c:209
 msgid "STRING"
 msgstr "STRING"
 
-#: popthelp.c:181
+#: popthelp.c:210
 msgid "FLOAT"
 msgstr "FLOAT"
 
-#: popthelp.c:182
+#: popthelp.c:211
 msgid "DOUBLE"
 msgstr "DOUBLE"
 
-#: popthelp.c:184
+#: popthelp.c:214
 msgid "ARG"
 msgstr "ARG"
 
-#: popthelp.c:597
+#: popthelp.c:634
 msgid "Usage:"
 msgstr "用法:"
 
-#: popthelp.c:619
+#: popthelp.c:658
 msgid "[OPTION...]"
 msgstr "[选项...]"
diff --git a/popt.spec b/popt.spec
index a6491fc..699ed67 100644
--- a/popt.spec
+++ b/popt.spec
@@ -1,3 +1,5 @@
+%define	_libdir	/%{_lib}
+
 Summary: A C library for parsing command line parameters.
 Name: popt
 Version: 1.14
@@ -22,7 +24,7 @@ shell-like rules.
 %setup -q
 
 %build
-%configure --libdir=/%{_lib}
+%configure
 make
 
 %install
@@ -47,6 +49,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man3/popt.3*
 
 %changelog
+* Tue Dec 11 2007 Jeff Johnson <jbj@rpm5.org>
+- release popt-1.13 through rpm5.org.
+
 * Tue Jul 10 2007 Jeff Johnson <jbj@rpm5.org>
 - release popt-1.12 through rpm5.org.
 
-- 
Gitee


From 1026802706478329d805bd2606b290ebe31bcfff Mon Sep 17 00:00:00 2001
From: Jeff Johnson <n3npq@mac.com>
Date: Sun, 17 Feb 2008 22:05:01 +0000
Subject: [PATCH 510/667] - jbj: add new fi, th, zh_TW translations
 (Translation Project). - jbj: add "make updatepo" to simplify PO file
 maintenance.

---
 CHANGES      |   2 +
 Makefile.am  |   4 ++
 configure.ac |   2 +-
 po/cs.po     |   2 +-
 po/da.po     |   2 +-
 po/de.po     |   8 +--
 po/es.po     |  32 ++++++------
 po/fi.po     | 140 +++++++++++++++++++++++++++++++++++++++++++++++++++
 po/fr.po     |   2 +-
 po/ga.po     |   2 +-
 po/gl.po     |   2 +-
 po/hu.po     |  80 +++++++++++++++--------------
 po/is.po     |   2 +-
 po/it.po     |   8 +--
 po/ja.po     |   2 +-
 po/ko.po     |   2 +-
 po/nb.po     |   2 +-
 po/nl.po     |  25 +++++----
 po/pl.po     |  36 ++++++-------
 po/pt.po     |   2 +-
 po/ro.po     |   2 +-
 po/ru.po     |   2 +-
 po/sk.po     |   2 +-
 po/sl.po     |   2 +-
 po/sv.po     |  13 +++--
 po/th.po     | 136 +++++++++++++++++++++++++++++++++++++++++++++++++
 po/tr.po     |   7 ++-
 po/uk.po     |   2 +-
 po/vi.po     |   9 ++--
 po/wa.po     |   2 +-
 po/zh_TW.po  | 133 ++++++++++++++++++++++++++++++++++++++++++++++++
 31 files changed, 548 insertions(+), 119 deletions(-)
 create mode 100644 po/fi.po
 create mode 100644 po/th.po
 create mode 100644 po/zh_TW.po

diff --git a/CHANGES b/CHANGES
index 9f7f282..a56285a 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,4 +1,6 @@
 1.13 -> 1.14:
+    - jbj: add new fi, th, zh_TW translations (Translation Project).
+    - jbj: add "make updatepo" to simplify PO file maintenance.
     - jbj: display POPT_ARG_ARGV options in --help just like other options.
     - jbj: add test for POPT_ARG_ARGV handling.
     - jbj: fix: permit "--foo bar" and "--foo=bar" equivalent forms for aliases.
diff --git a/Makefile.am b/Makefile.am
index c21053d..5e9b192 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -49,6 +49,10 @@ man_MANS = popt.3
 
 #BUILT_SOURCES = popt.lcd
 
+.PHONY:	updatepo
+updatepo:
+	rsync -Lrtvz  translationproject.org::tp/latest/popt/  po
+
 popt.lcd: Makefile.am ${libpopt_la_SOURCES} ${include_HEADERS} ${noinst_HEADERS}
 	lclint -dump $@ ${libpopt_la_SOURCES}
 
diff --git a/configure.ac b/configure.ac
index c6796a7..f027c93 100755
--- a/configure.ac
+++ b/configure.ac
@@ -14,7 +14,7 @@ AC_SUBST(LT_AGE, 8)
 
 AM_INIT_AUTOMAKE([foreign])
 
-ALL_LINGUAS="cs da de es fr ga gl hu is it ja ko nb nl pl pt ro ru sk sl sv tr uk vi wa zh_CN"
+ALL_LINGUAS="cs da de es fi fr ga gl hu is it ja ko nb nl pl pt ro ru sk sl sv th tr uk vi wa zh_TW zh_CN"
 
 AC_PROG_CC
 AC_PROG_INSTALL
diff --git a/po/cs.po b/po/cs.po
index 461a40b..a4491d6 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -1,6 +1,6 @@
 msgid ""
 msgstr ""
-"Project-Id-Version: popt 1.12\n"
+"Project-Id-Version: popt 1.11\n"
 "Report-Msgid-Bugs-To: <popt-devel@rpm5.org>\n"
 "POT-Creation-Date: 2008-02-16 19:54-0500\n"
 "PO-Revision-Date: 2001-07-24 00:03+0100\n"
diff --git a/po/da.po b/po/da.po
index a15b9d5..822bb62 100644
--- a/po/da.po
+++ b/po/da.po
@@ -1,6 +1,6 @@
 msgid ""
 msgstr ""
-"Project-Id-Version: popt 1.12\n"
+"Project-Id-Version: popt 1.11\n"
 "Report-Msgid-Bugs-To: <popt-devel@rpm5.org>\n"
 "POT-Creation-Date: 2008-02-16 19:54-0500\n"
 "PO-Revision-Date: Sun Jan 21 2001 04:30:32+0200\n"
diff --git a/po/de.po b/po/de.po
index 0037fc7..f43a107 100644
--- a/po/de.po
+++ b/po/de.po
@@ -1,14 +1,14 @@
 # Translation of popt to German (Deutsch)
 # This file is distributed under the same license as the popt package.
-# Robert Scheck <robert@rpm5.org>, 2004-2007.
+# Robert Scheck <rpm@robert-scheck.de>, 2004-2007.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: popt 1.12\n"
+"Project-Id-Version: popt 1.11\n"
 "Report-Msgid-Bugs-To: <popt-devel@rpm5.org>\n"
 "POT-Creation-Date: 2008-02-16 19:54-0500\n"
-"PO-Revision-Date: 2007-11-10 00:35+0100\n"
-"Last-Translator: Robert Scheck <robert@rpm5.org>\n"
+"PO-Revision-Date: 2007-02-17 21:00+0100\n"
+"Last-Translator: Robert Scheck <rpm@robert-scheck.de>\n"
 "Language-Team: German <de@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
diff --git a/po/es.po b/po/es.po
index b4029ad..b2412a9 100644
--- a/po/es.po
+++ b/po/es.po
@@ -1,19 +1,18 @@
-# SOME DESCRIPTIVE TITLE.
-# Copyright (C) YEAR Free Software Foundation, Inc.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+# Spanish translations for popt.
+# Copyright (C) 2007 Free Software Foundation, Inc.
+# Leandro Lucarella <luca@linuxmendoza.org.ar>, 2007
 #
-#, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.12\n"
 "Report-Msgid-Bugs-To: <popt-devel@rpm5.org>\n"
 "POT-Creation-Date: 2008-02-16 19:54-0500\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2007-12-28 12:22+0100\n"
 "Last-Translator: Leandro Lucarella <luca@linuxmendoza.org.ar>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
+"Language-Team: Spanish <es@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: ENCODING\n"
+"Content-Transfer-Encoding: 8bit\n"
 
 #: popt.c:35
 msgid "unknown errno"
@@ -22,7 +21,7 @@ msgstr "errno desconocido"
 #: popt.c:1090
 #, fuzzy, c-format
 msgid "option type (%u) not implemented in popt\n"
-msgstr "tipo de opcin (%d) no implementada en popt\n"
+msgstr "tipo de opción (%d) no implementada en popt\n"
 
 #: popt.c:1294
 msgid "missing argument"
@@ -30,11 +29,11 @@ msgstr "falta argumento"
 
 #: popt.c:1296
 msgid "unknown option"
-msgstr "opcin desconocida"
+msgstr "opción desconocida"
 
 #: popt.c:1298
 msgid "mutually exclusive logical operations requested"
-msgstr "requerida operacin lgica mutuamente exclusiva"
+msgstr "requerida operación lógica mutuamente exclusiva"
 
 #: popt.c:1300
 msgid "opt->arg should not be NULL"
@@ -46,15 +45,15 @@ msgstr "alias anidados muy profundamente"
 
 #: popt.c:1304
 msgid "error in parameter quoting"
-msgstr "error en cita de parmetros"
+msgstr "error en cita de parámetros"
 
 #: popt.c:1306
 msgid "invalid numeric value"
-msgstr "valor numrico invlido"
+msgstr "valor numérico inválido"
 
 #: popt.c:1308
 msgid "number too large or too small"
-msgstr "nmero muy largo o muy pequeo"
+msgstr "número muy largo o muy pequeño"
 
 #: popt.c:1310
 msgid "memory allocation failed"
@@ -77,9 +76,8 @@ msgid "Terminate options"
 msgstr ""
 
 #: popthelp.c:90
-#, fuzzy
 msgid "Display option defaults in message"
-msgstr "Indica el modo de uso resumido"
+msgstr ""
 
 #: popthelp.c:191
 msgid "Help options:"
@@ -128,8 +126,8 @@ msgstr "ARG"
 
 #: popthelp.c:634
 msgid "Usage:"
-msgstr "Modo de Uso:"
+msgstr "Modo de uso:"
 
 #: popthelp.c:658
 msgid "[OPTION...]"
-msgstr "[OPCIN...]"
+msgstr "[OPCIÓN...]"
diff --git a/po/fi.po b/po/fi.po
new file mode 100644
index 0000000..0aa8c9c
--- /dev/null
+++ b/po/fi.po
@@ -0,0 +1,140 @@
+# translation of popt-1.13.pot to Finnish
+# Copyright © 2008 Free Software Foundation, Inc.
+# This file is distributed under the same license as the popt package.
+# This file is put in the public domain.
+# Jorma Karvonen <karvjorm@users.sf.net>, 2008.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: popt 1.13\n"
+"Report-Msgid-Bugs-To: <popt-devel@rpm5.org>\n"
+"POT-Creation-Date: 2008-02-16 19:54-0500\n"
+"PO-Revision-Date: 2008-01-06 19:42+0200\n"
+"Last-Translator: Jorma Karvonen <karvjorm@users.sf.net>\n"
+"Language-Team: Finnish <translation-team-fi@lists.sourceforge.net>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Generator: KBabel 1.11.4\n"
+
+#  errno - number of last error (defined by the ISO C standard)
+#: popt.c:35
+msgid "unknown errno"
+msgstr "tuntematon errno-virhenumeroarvo"
+
+#: popt.c:1090
+#, fuzzy, c-format
+msgid "option type (%u) not implemented in popt\n"
+msgstr "valitsintyyppiä (%d) ei ole toteutettu popt-ohjelmassa\n"
+
+#: popt.c:1294
+msgid "missing argument"
+msgstr "puuttuva argumentti"
+
+#: popt.c:1296
+msgid "unknown option"
+msgstr "tuntematon valitsin"
+
+#: popt.c:1298
+msgid "mutually exclusive logical operations requested"
+msgstr "pyydettyjä loogisia toimintoja ei voi käyttää yhdessä"
+
+#: popt.c:1300
+msgid "opt->arg should not be NULL"
+msgstr "”opt->arg”-valitsinargumentti ei saa olla NULL"
+
+#: popt.c:1302
+msgid "aliases nested too deeply"
+msgstr "liian monta aliasta sisäkkäin"
+
+#: popt.c:1304
+msgid "error in parameter quoting"
+msgstr "virhe parametrien lainauksessa"
+
+#: popt.c:1306
+msgid "invalid numeric value"
+msgstr "virheellinen numeroarvo"
+
+#: popt.c:1308
+msgid "number too large or too small"
+msgstr "numero on liian iso tai liian pieni"
+
+#: popt.c:1310
+msgid "memory allocation failed"
+msgstr "muistin varaus ei onnistunut"
+
+#: popt.c:1314
+msgid "unknown error"
+msgstr "tuntematon virhe"
+
+#: popthelp.c:74 popthelp.c:86
+msgid "Show this help message"
+msgstr "Näytä tämä ohje"
+
+#: popthelp.c:75 popthelp.c:87
+msgid "Display brief usage message"
+msgstr "Näytä lyhyt käyttöohje"
+
+#: popthelp.c:76 popthelp.c:92
+#, fuzzy
+msgid "Terminate options"
+msgstr "Ohjevalitsimet:"
+
+#: popthelp.c:90
+msgid "Display option defaults in message"
+msgstr "Näytä valitsinoletukset ohjeessa"
+
+#: popthelp.c:191
+msgid "Help options:"
+msgstr "Ohjevalitsimet:"
+
+#: popthelp.c:192
+msgid "Options implemented via popt alias/exec:"
+msgstr ""
+"Valitsimet toteutettu ”popt alias”-määrittelyillä tai ”popt exec”-"
+"määrittelyillä:"
+
+#: popthelp.c:200
+msgid "NONE"
+msgstr "EI MITÄÄN"
+
+#: popthelp.c:202
+msgid "VAL"
+msgstr "ARVO"
+
+#: popthelp.c:206
+msgid "INT"
+msgstr "INT-KOKONAISLUKU"
+
+#: popthelp.c:207
+msgid "LONG"
+msgstr "LONG-KOKONAISLUKU"
+
+#: popthelp.c:208
+#, fuzzy
+msgid "LONGLONG"
+msgstr "LONG-KOKONAISLUKU"
+
+#: popthelp.c:209
+msgid "STRING"
+msgstr "MERKKIJONO"
+
+#: popthelp.c:210
+msgid "FLOAT"
+msgstr "FLOAT-LIUKULUKU"
+
+#: popthelp.c:211
+msgid "DOUBLE"
+msgstr "DOUBLE-LIUKULUKU"
+
+#: popthelp.c:214
+msgid "ARG"
+msgstr "ARGUMENTTI"
+
+#: popthelp.c:634
+msgid "Usage:"
+msgstr "Käyttö:"
+
+#: popthelp.c:658
+msgid "[OPTION...]"
+msgstr "[VALITSIN...]"
diff --git a/po/fr.po b/po/fr.po
index c12ba9a..3646ef8 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -10,7 +10,7 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: popt 1.12\n"
+"Project-Id-Version: popt 1.11\n"
 "Report-Msgid-Bugs-To: <popt-devel@rpm5.org>\n"
 "POT-Creation-Date: 2008-02-16 19:54-0500\n"
 "PO-Revision-Date: 2003-06-22 23:43+0200\n"
diff --git a/po/ga.po b/po/ga.po
index 94100f9..85c1799 100644
--- a/po/ga.po
+++ b/po/ga.po
@@ -4,7 +4,7 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: popt 1.12\n"
+"Project-Id-Version: popt 1.11\n"
 "Report-Msgid-Bugs-To: <popt-devel@rpm5.org>\n"
 "POT-Creation-Date: 2008-02-16 19:54-0500\n"
 "PO-Revision-Date: 2007-06-19 06:21-0500\n"
diff --git a/po/gl.po b/po/gl.po
index 1b1bebe..8e2c757 100644
--- a/po/gl.po
+++ b/po/gl.po
@@ -1,6 +1,6 @@
 msgid ""
 msgstr ""
-"Project-Id-Version: popt 1.12\n"
+"Project-Id-Version: popt 1.11\n"
 "Report-Msgid-Bugs-To: <popt-devel@rpm5.org>\n"
 "POT-Creation-Date: 2008-02-16 19:54-0500\n"
 "PO-Revision-Date: 2001-01-17 01:01+0100\n"
diff --git a/po/hu.po b/po/hu.po
index d43c459..fca60b9 100644
--- a/po/hu.po
+++ b/po/hu.po
@@ -1,129 +1,135 @@
+# Hungarian translation of popt
+# Copyright (C) 2007 Free Software Foundation, Inc.
+# Gabor Kelemen <kelemeng@gnome.hu>, 2007.
 msgid ""
 msgstr ""
-"Project-Id-Version: popt 1.12\n"
+"Project-Id-Version: popt 1.11\n"
 "Report-Msgid-Bugs-To: <popt-devel@rpm5.org>\n"
 "POT-Creation-Date: 2008-02-16 19:54-0500\n"
-"PO-Revision-Date: 2000-08-03 23:26+0200\n"
-"Last-Translator: L�szl� N�meth <nemeth@qwertynet.hu>\n"
-"Language-Team: Hungarian\n"
+"PO-Revision-Date: 2007-06-21 00:45+0200\n"
+"Last-Translator: Gabor Kelemen <kelemeng@gnome.hu>\n"
+"Language-Team: Hungarian <translation-team-hu@lists.sourceforge.net>\n"
 "MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=ISO-8859-2\n"
-"Content-Transfer-Encoding: 8-bit\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Generator: KBabel 1.11.4\n"
+"Plural-Forms:  nplurals=2; plural=(n != 1);\n"
 
 #: popt.c:35
 msgid "unknown errno"
-msgstr ""
+msgstr "ismeretlen hibaszám"
 
 #: popt.c:1090
-#, c-format
+#, fuzzy, c-format
 msgid "option type (%u) not implemented in popt\n"
-msgstr ""
+msgstr "a kapcsolótípus (%d) nincs megvalósítva a popt-ban\n"
 
 #: popt.c:1294
 msgid "missing argument"
-msgstr ""
+msgstr "hiányzó paraméter"
 
 #: popt.c:1296
 msgid "unknown option"
-msgstr ""
+msgstr "ismeretlen kapcsoló"
 
 #: popt.c:1298
 msgid "mutually exclusive logical operations requested"
-msgstr ""
+msgstr "kölcsönösen kizáró logikai műveleteket kért"
 
 #: popt.c:1300
 msgid "opt->arg should not be NULL"
-msgstr ""
+msgstr "az opt->arg nem lehet NULL"
 
 #: popt.c:1302
 msgid "aliases nested too deeply"
-msgstr ""
+msgstr "az álnevek túl mélyen vannak egymásba ágyazva"
 
 #: popt.c:1304
 msgid "error in parameter quoting"
-msgstr ""
+msgstr "hiba a paraméter idézésében"
 
 #: popt.c:1306
 msgid "invalid numeric value"
-msgstr ""
+msgstr "érvénytelen numerikus érték"
 
 #: popt.c:1308
 msgid "number too large or too small"
-msgstr ""
+msgstr "a szám túl nagy vagy túl kicsi"
 
 #: popt.c:1310
 msgid "memory allocation failed"
-msgstr ""
+msgstr "a memóriafoglalás meghiúsult"
 
 #: popt.c:1314
 msgid "unknown error"
-msgstr ""
+msgstr "ismeretlen hiba"
 
 #: popthelp.c:74 popthelp.c:86
 msgid "Show this help message"
-msgstr "E s�g� megjelen�t�se"
+msgstr "Ezen súgó megjelenítése"
 
 #: popthelp.c:75 popthelp.c:87
 msgid "Display brief usage message"
-msgstr "R�vid haszn�lati utas�t�s megjelen�t�se"
+msgstr "Rövid használati utasítás megjelenítése"
 
 #: popthelp.c:76 popthelp.c:92
+#, fuzzy
 msgid "Terminate options"
-msgstr ""
+msgstr "Súgólehetőségek:"
 
 #: popthelp.c:90
-#, fuzzy
 msgid "Display option defaults in message"
-msgstr "R�vid haszn�lati utas�t�s megjelen�t�se"
+msgstr "Kapcsolók alapértelmezéseinek megjelenítése"
 
 #: popthelp.c:191
 msgid "Help options:"
-msgstr ""
+msgstr "Súgólehetőségek:"
 
 #: popthelp.c:192
 msgid "Options implemented via popt alias/exec:"
-msgstr ""
+msgstr "A popt alias/exec segítségével megvalósított kapcsolók:"
 
 #: popthelp.c:200
 msgid "NONE"
-msgstr ""
+msgstr "NINCS"
 
 #: popthelp.c:202
 msgid "VAL"
-msgstr ""
+msgstr "ÉRTÉK"
 
 #: popthelp.c:206
 msgid "INT"
-msgstr ""
+msgstr "EGÉSZ"
 
 #: popthelp.c:207
 msgid "LONG"
-msgstr ""
+msgstr "HOSSZÚ"
 
 #: popthelp.c:208
+#, fuzzy
 msgid "LONGLONG"
-msgstr ""
+msgstr "HOSSZÚ"
 
 #: popthelp.c:209
 msgid "STRING"
-msgstr ""
+msgstr "SZÖVEG"
 
 #: popthelp.c:210
 msgid "FLOAT"
-msgstr ""
+msgstr "LEBEGŐ"
 
 #: popthelp.c:211
 msgid "DOUBLE"
-msgstr ""
+msgstr "DUPLA"
 
 #: popthelp.c:214
 msgid "ARG"
-msgstr ""
+msgstr "PAR"
 
 #: popthelp.c:634
 msgid "Usage:"
-msgstr ""
+msgstr "Használat:"
 
 #: popthelp.c:658
 msgid "[OPTION...]"
-msgstr ""
+msgstr "[KAPCSOLÓ...]"
diff --git a/po/is.po b/po/is.po
index 1e3b8bd..3c00438 100644
--- a/po/is.po
+++ b/po/is.po
@@ -1,6 +1,6 @@
 msgid ""
 msgstr ""
-"Project-Id-Version: popt 1.12\n"
+"Project-Id-Version: popt 1.11\n"
 "Report-Msgid-Bugs-To: <popt-devel@rpm5.org>\n"
 "POT-Creation-Date: 2008-02-16 19:54-0500\n"
 "PO-Revision-Date: 2001-06-08 01:35+0000\n"
diff --git a/po/it.po b/po/it.po
index 183f455..91daa29 100644
--- a/po/it.po
+++ b/po/it.po
@@ -1,6 +1,6 @@
-# SOME DESCRIPTIVE TITLE.
-# Copyright (C) YEAR Free Software Foundation, Inc.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+# Italian translations for popt.
+# Copyright (C) 2007 Free Software Foundation, Inc.
+# Sandro Bonazzola <sandro.bonazzola@gmail.com>, 2007
 #
 msgid ""
 msgstr ""
@@ -9,7 +9,7 @@ msgstr ""
 "POT-Creation-Date: 2008-02-16 19:54-0500\n"
 "PO-Revision-Date: 2007-11-14 20:39+0100\n"
 "Last-Translator: Sandro Bonazzola <sandro.bonazzola@gmail.com>\n"
-"Language-Team: Sandro Bonazzola <sandro.bonazzola@gmail.com>\n"
+"Language-Team: Italian <tp@lists.linux.it>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/po/ja.po b/po/ja.po
index 9b6ef31..53beb53 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -4,7 +4,7 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: popt 1.12\n"
+"Project-Id-Version: popt 1.11\n"
 "Report-Msgid-Bugs-To: <popt-devel@rpm5.org>\n"
 "POT-Creation-Date: 2008-02-16 19:54-0500\n"
 "PO-Revision-Date: 2003--8-25 19:00+0900\n"
diff --git a/po/ko.po b/po/ko.po
index a439e47..4203e38 100644
--- a/po/ko.po
+++ b/po/ko.po
@@ -1,6 +1,6 @@
 msgid ""
 msgstr ""
-"Project-Id-Version: popt 1.12\n"
+"Project-Id-Version: popt 1.11\n"
 "Report-Msgid-Bugs-To: <popt-devel@rpm5.org>\n"
 "POT-Creation-Date: 2008-02-16 19:54-0500\n"
 "PO-Revision-Date: 2001-09-06 20:06+0900\n"
diff --git a/po/nb.po b/po/nb.po
index 5e6ce13..0f7b5dd 100644
--- a/po/nb.po
+++ b/po/nb.po
@@ -1,6 +1,6 @@
 msgid ""
 msgstr ""
-"Project-Id-Version: popt 1.12\n"
+"Project-Id-Version: popt 1.11\n"
 "Report-Msgid-Bugs-To: <popt-devel@rpm5.org>\n"
 "POT-Creation-Date: 2008-02-16 19:54-0500\n"
 "PO-Revision-Date: 2001-06-27 11:05+0200\n"
diff --git a/po/nl.po b/po/nl.po
index 36a537b..78f3fe1 100644
--- a/po/nl.po
+++ b/po/nl.po
@@ -7,22 +7,21 @@ msgstr ""
 "Project-Id-Version: popt 1.12\n"
 "Report-Msgid-Bugs-To: <popt-devel@rpm5.org>\n"
 "POT-Creation-Date: 2008-02-16 19:54-0500\n"
-"PO-Revision-Date: 2007-06-29 17:38+0200\n"
+"PO-Revision-Date: 2007-12-29 16:14+0100\n"
 "Last-Translator: Tim Van Holder <tim.van.holder@telenet.be>\n"
 "Language-Team: Dutch <vertaling@vrijschrift.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-# of "onbekende errno-waarde"?
 #: popt.c:35
 msgid "unknown errno"
-msgstr "onbekende errno"
+msgstr "onbekend foutnummer (errno)"
 
 #: popt.c:1090
 #, fuzzy, c-format
 msgid "option type (%u) not implemented in popt\n"
-msgstr "optietype (%d) niet geïmplementeerd in popt\n"
+msgstr "dit optietype (%d) is niet geïmplementeerd in popt\n"
 
 #: popt.c:1294
 msgid "missing argument"
@@ -34,7 +33,7 @@ msgstr "onbekende optie"
 
 #: popt.c:1298
 msgid "mutually exclusive logical operations requested"
-msgstr "wederzijds uitgesloten logische operatoren gevraagd"
+msgstr "elkaar uitsluitende logische operatoren werden gevraagd"
 
 #: popt.c:1300
 msgid "opt->arg should not be NULL"
@@ -42,24 +41,24 @@ msgstr "opt->arg zou niet NULL mogen zijn"
 
 #: popt.c:1302
 msgid "aliases nested too deeply"
-msgstr "aliassen te diep genest"
+msgstr "aliassen zijn te diep genest"
 
 # of toch beter "quoting" behouden?
 #: popt.c:1304
 msgid "error in parameter quoting"
-msgstr "fout in aanhaling van parameters"
+msgstr "fout in de aanhaling van parameters"
 
 #: popt.c:1306
 msgid "invalid numeric value"
-msgstr "ongelige numerische waarde"
+msgstr "ongeldige numerieke waarde"
 
 #: popt.c:1308
 msgid "number too large or too small"
-msgstr "getal te klein of te groot"
+msgstr "getal is te klein of te groot"
 
 #: popt.c:1310
 msgid "memory allocation failed"
-msgstr "geheugenreservatie mislukt"
+msgstr "reserveren van geheugen is mislukt"
 
 #: popt.c:1314
 msgid "unknown error"
@@ -67,11 +66,11 @@ msgstr "onbekende fout"
 
 #: popthelp.c:74 popthelp.c:86
 msgid "Show this help message"
-msgstr "Toon deze hulptekst"
+msgstr "Deze hulptekst tonen"
 
 #: popthelp.c:75 popthelp.c:87
 msgid "Display brief usage message"
-msgstr "Toon korte tekst over gebruik"
+msgstr "Een korte gebruikssamenvatting tonen"
 
 # of "Help-opties:"?
 #: popthelp.c:76 popthelp.c:92
@@ -81,7 +80,7 @@ msgstr "Hulp-opties:"
 
 #: popthelp.c:90
 msgid "Display option defaults in message"
-msgstr "Toon standaardwaarden van opties in de tekst"
+msgstr "De standaardwaarden van opties tonen in de tekst"
 
 # of "Help-opties:"?
 #: popthelp.c:191
diff --git a/po/pl.po b/po/pl.po
index fe44ef4..ca7e1b8 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -1,17 +1,17 @@
 # Polish translation for popt.
-# Copyright (C) 2002 Free Software Foundation, Inc.
-# Jakub Bogusz <qboosh@pld-linux.org>, 2002.
+# Copyright (C) YEAR Free Software Foundation, Inc.
+# Jakub Bogusz <qboosh@pld.org.pl>, 2002.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: popt 1.12\n"
+"Project-Id-Version: popt 1.11\n"
 "Report-Msgid-Bugs-To: <popt-devel@rpm5.org>\n"
 "POT-Creation-Date: 2008-02-16 19:54-0500\n"
 "PO-Revision-Date: 2003-06-08 20:32+0200\n"
-"Last-Translator: Jakub Bogusz <qboosh@pld-linux.org>\n"
+"Last-Translator: Jakub Bogusz <qboosh@pld.org.pl>\n"
 "Language-Team: Polish <translation-team-pl@lists.sourceforge.net>\n"
 "MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Type: text/plain; charset=iso-8859-2\n"
 "Content-Transfer-Encoding: 8bit\n"
 
 #: popt.c:35
@@ -33,43 +33,43 @@ msgstr "nieznana opcja"
 
 #: popt.c:1298
 msgid "mutually exclusive logical operations requested"
-msgstr "żądanie wykluczających się operacji"
+msgstr "��danie wykluczaj�cych si� operacji"
 
 #: popt.c:1300
 msgid "opt->arg should not be NULL"
-msgstr "opt->arg nie może być NULL"
+msgstr "opt->arg nie mo�e by� NULL"
 
 #: popt.c:1302
 msgid "aliases nested too deeply"
-msgstr "zbyt duże zagłębienie aliasów"
+msgstr "zbyt du�e zag��bienie alias�w"
 
 #: popt.c:1304
 msgid "error in parameter quoting"
-msgstr "błąd w cytowaniu parametru"
+msgstr "b��d w cytowaniu parametru"
 
 #: popt.c:1306
 msgid "invalid numeric value"
-msgstr "błędna wartość liczbowa"
+msgstr "b��dna warto�� liczbowa"
 
 #: popt.c:1308
 msgid "number too large or too small"
-msgstr "liczba zbyt duża lub zbyt mała"
+msgstr "liczba zbyt du�a lub zbyt ma�a"
 
 #: popt.c:1310
 msgid "memory allocation failed"
-msgstr "błąd alokacji pamięci"
+msgstr "b��d alokacji pami�ci"
 
 #: popt.c:1314
 msgid "unknown error"
-msgstr "nieznany błąd"
+msgstr "nieznany b��d"
 
 #: popthelp.c:74 popthelp.c:86
 msgid "Show this help message"
-msgstr "Pokaż tą pomoc"
+msgstr "Poka� t� pomoc"
 
 #: popthelp.c:75 popthelp.c:87
 msgid "Display brief usage message"
-msgstr "Wyświetl skrócony sposób użycia"
+msgstr "Wy�wietl skr�cony spos�b u�ycia"
 
 #: popthelp.c:76 popthelp.c:92
 #, fuzzy
@@ -78,7 +78,7 @@ msgstr "Opcje pomocy:"
 
 #: popthelp.c:90
 msgid "Display option defaults in message"
-msgstr "Wyświetl domyślne opcje w opisie"
+msgstr "Wy�wietl domy�lne opcje w opisie"
 
 #: popthelp.c:191
 msgid "Help options:"
@@ -111,7 +111,7 @@ msgstr "LONG"
 
 #: popthelp.c:209
 msgid "STRING"
-msgstr "ŁAŃCUCH"
+msgstr "�A�CUCH"
 
 #: popthelp.c:210
 msgid "FLOAT"
@@ -127,7 +127,7 @@ msgstr "PARAM"
 
 #: popthelp.c:634
 msgid "Usage:"
-msgstr "Użycie:"
+msgstr "Sk�adnia:"
 
 #: popthelp.c:658
 msgid "[OPTION...]"
diff --git a/po/pt.po b/po/pt.po
index 940a02c..9b22b8c 100644
--- a/po/pt.po
+++ b/po/pt.po
@@ -1,6 +1,6 @@
 msgid ""
 msgstr ""
-"Project-Id-Version: popt 1.12\n"
+"Project-Id-Version: popt 1.11\n"
 "Report-Msgid-Bugs-To: <popt-devel@rpm5.org>\n"
 "POT-Creation-Date: 2008-02-16 19:54-0500\n"
 "PO-Revision-Date: 2002-02-13 18:32+0000\n"
diff --git a/po/ro.po b/po/ro.po
index 7960449..f1d3121 100644
--- a/po/ro.po
+++ b/po/ro.po
@@ -1,6 +1,6 @@
 msgid ""
 msgstr ""
-"Project-Id-Version: popt 1.12\n"
+"Project-Id-Version: popt 1.11\n"
 "Report-Msgid-Bugs-To: <popt-devel@rpm5.org>\n"
 "POT-Creation-Date: 2008-02-16 19:54-0500\n"
 "PO-Revision-Date: 2000-06-14 23:23+EST\n"
diff --git a/po/ru.po b/po/ru.po
index 5a0adac..d3f47d4 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -1,6 +1,6 @@
 msgid ""
 msgstr ""
-"Project-Id-Version: popt 1.12\n"
+"Project-Id-Version: popt 1.11\n"
 "Report-Msgid-Bugs-To: <popt-devel@rpm5.org>\n"
 "POT-Creation-Date: 2008-02-16 19:54-0500\n"
 "PO-Revision-Date: 2001-07-05 21:00-0500\n"
diff --git a/po/sk.po b/po/sk.po
index 2f7b9e0..1d5ee05 100644
--- a/po/sk.po
+++ b/po/sk.po
@@ -4,7 +4,7 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: popt 1.12\n"
+"Project-Id-Version: popt 1.11\n"
 "Report-Msgid-Bugs-To: <popt-devel@rpm5.org>\n"
 "POT-Creation-Date: 2008-02-16 19:54-0500\n"
 "PO-Revision-Date: 1999-08-04 21:40+0200\n"
diff --git a/po/sl.po b/po/sl.po
index c8cccc9..3115224 100644
--- a/po/sl.po
+++ b/po/sl.po
@@ -1,6 +1,6 @@
 msgid ""
 msgstr ""
-"Project-Id-Version: popt 1.12\n"
+"Project-Id-Version: popt 1.11\n"
 "Report-Msgid-Bugs-To: <popt-devel@rpm5.org>\n"
 "POT-Creation-Date: 2008-02-16 19:54-0500\n"
 "PO-Revision-Date: 2000-09-05 12:30+0200\n"
diff --git a/po/sv.po b/po/sv.po
index adea693..e17bc09 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -1,9 +1,16 @@
+# Swedish messages for popt.
+# Copyright � 2008 Free Software Foundation, Inc.
+# This file is distributed under the same license as the popt package.
+# G�ran Uddeborg <goeran@uddeborg.se>, 2008.
+#
+# $Revision: 1.2 $
+#
 msgid ""
 msgstr ""
-"Project-Id-Version: popt 1.12\n"
+"Project-Id-Version: popt 1.13\n"
 "Report-Msgid-Bugs-To: <popt-devel@rpm5.org>\n"
 "POT-Creation-Date: 2008-02-16 19:54-0500\n"
-"PO-Revision-Date: 2007-06-12 22:00+0200\n"
+"PO-Revision-Date: 2008-01-30 22:22+0100\n"
 "Last-Translator: G�ran Uddeborg <goeran@uddeborg.se>\n"
 "Language-Team: Swedish <tp-sv@listor.tp-sv.se>\n"
 "MIME-Version: 1.0\n"
@@ -37,7 +44,7 @@ msgstr "opt->arg f
 
 #: popt.c:1302
 msgid "aliases nested too deeply"
-msgstr "alias �r n�stlade f�r djupt"
+msgstr "alias �r n�stade f�r djupt"
 
 #: popt.c:1304
 msgid "error in parameter quoting"
diff --git a/po/th.po b/po/th.po
new file mode 100644
index 0000000..8464467
--- /dev/null
+++ b/po/th.po
@@ -0,0 +1,136 @@
+# Thai translation for popt.
+# Copyright (C) 2008 Free Software Foundation, Inc.
+# Seksan Poltree <seksan.poltree@gmail.com>, 2008.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: popt 1.13\n"
+"Report-Msgid-Bugs-To: <popt-devel@rpm5.org>\n"
+"POT-Creation-Date: 2008-02-16 19:54-0500\n"
+"PO-Revision-Date: 2008-01-06 20:09+0700\n"
+"Last-Translator: Seksan Poltree <seksan.poltree@gmail.com>\n"
+"Language-Team: Thai <translation-team-th@lists.sourceforge.net>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=utf-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Poedit-Language: Thai\n"
+"X-Poedit-Country: THAILAND\n"
+
+#: popt.c:35
+msgid "unknown errno"
+msgstr "เกิด errno ที่ไม่รู้จัก"
+
+#: popt.c:1090
+#, fuzzy, c-format
+msgid "option type (%u) not implemented in popt\n"
+msgstr "ตัวเลือกชนิด (%d) ยังไม่ถูกอิมพลีเมนต์ใน popt\n"
+
+#: popt.c:1294
+msgid "missing argument"
+msgstr "ไม่พบอาร์กิวเมนต์"
+
+#: popt.c:1296
+msgid "unknown option"
+msgstr "ไม่รู้จักตัวเลือก"
+
+#: popt.c:1298
+msgid "mutually exclusive logical operations requested"
+msgstr "เกิดการร้องขอร่วมกันของการดำเนินการด้านตรรกะอย่างเดียวกัน"
+
+#: popt.c:1300
+msgid "opt->arg should not be NULL"
+msgstr "opt->arg ไม่ควรจะเป็น NULL"
+
+#: popt.c:1302
+msgid "aliases nested too deeply"
+msgstr "นามแฝงซ้อนกันมากเกินไป"
+
+#: popt.c:1304
+msgid "error in parameter quoting"
+msgstr "เกิดข้อผิดพลาดในการอ้างอิงพารามิเตอร์"
+
+#: popt.c:1306
+msgid "invalid numeric value"
+msgstr "ค่าตัวเลขผิดพลาด"
+
+#: popt.c:1308
+msgid "number too large or too small"
+msgstr "ตัวเลขมีค่ามากหรือน้อยเกินไป"
+
+#: popt.c:1310
+msgid "memory allocation failed"
+msgstr "การจัดสรรหน่วยความจำผิดพลาด"
+
+#: popt.c:1314
+msgid "unknown error"
+msgstr "ความผิดพลาดที่ไม่รู้จัก"
+
+#: popthelp.c:74 popthelp.c:86
+msgid "Show this help message"
+msgstr "แสดงข้อความช่วยเหลือนี้"
+
+#: popthelp.c:75 popthelp.c:87
+msgid "Display brief usage message"
+msgstr "แสดงข้อความสรุปย่อการใช้งาน"
+
+#: popthelp.c:76 popthelp.c:92
+#, fuzzy
+msgid "Terminate options"
+msgstr "ตัวเลือกความช่วยเหลือ:"
+
+#: popthelp.c:90
+msgid "Display option defaults in message"
+msgstr "แสดงตัวเลือกมาตรฐานในข้อความ"
+
+#: popthelp.c:191
+msgid "Help options:"
+msgstr "ตัวเลือกความช่วยเหลือ:"
+
+#: popthelp.c:192
+msgid "Options implemented via popt alias/exec:"
+msgstr "ตัวเลือกที่ถูกอิมพลีเมนต์ด้วย popt alias/exec:"
+
+#: popthelp.c:200
+msgid "NONE"
+msgstr "ไม่มี"
+
+#: popthelp.c:202
+msgid "VAL"
+msgstr "VAL"
+
+#: popthelp.c:206
+msgid "INT"
+msgstr "INT"
+
+#: popthelp.c:207
+msgid "LONG"
+msgstr "LONG"
+
+#: popthelp.c:208
+#, fuzzy
+msgid "LONGLONG"
+msgstr "LONG"
+
+#: popthelp.c:209
+msgid "STRING"
+msgstr "STRING"
+
+#: popthelp.c:210
+msgid "FLOAT"
+msgstr "FLOAT"
+
+#: popthelp.c:211
+msgid "DOUBLE"
+msgstr "DOUBLE"
+
+#: popthelp.c:214
+msgid "ARG"
+msgstr "ARG"
+
+#: popthelp.c:634
+msgid "Usage:"
+msgstr "วิธีใช้:"
+
+#: popthelp.c:658
+msgid "[OPTION...]"
+msgstr "[ตัวเลือก...]"
diff --git a/po/tr.po b/po/tr.po
index cbeb507..56c3bd5 100644
--- a/po/tr.po
+++ b/po/tr.po
@@ -1,13 +1,16 @@
+# Translation of popt to Turkish.
+# Nilgun Belma Buguner <nilgun@technologist.com>, 2000.
+#
 msgid ""
 msgstr ""
-"Project-Id-Version: popt 1.12\n"
+"Project-Id-Version: popt 1.11\n"
 "Report-Msgid-Bugs-To: <popt-devel@rpm5.org>\n"
 "POT-Creation-Date: 2008-02-16 19:54-0500\n"
 "PO-Revision-Date: 2000-02-11 13:01+0200\n"
 "Last-Translator: Nilgun Belma Buguner <nilgun@technologist.com>\n"
 "Language-Team: Turkish <tr@li.org>\n"
 "MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=iso8859-9\n"
+"Content-Type: text/plain; charset=iso-8859-9\n"
 "Content-Transfer-Encoding: 8bit\n"
 
 #: popt.c:35
diff --git a/po/uk.po b/po/uk.po
index 4858ed0..ab8e69b 100644
--- a/po/uk.po
+++ b/po/uk.po
@@ -4,7 +4,7 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: popt 1.12\n"
+"Project-Id-Version: popt 1.11\n"
 "Report-Msgid-Bugs-To: <popt-devel@rpm5.org>\n"
 "POT-Creation-Date: 2008-02-16 19:54-0500\n"
 "PO-Revision-Date: 1999-09-30 16:54+0200\n"
diff --git a/po/vi.po b/po/vi.po
index 5838321..46c8d6b 100644
--- a/po/vi.po
+++ b/po/vi.po
@@ -1,13 +1,14 @@
 # Vietnamese translation for POPT.
-# Copyright © 2007 Free Software Foundation, Inc.
-# Clytie Siddall <clytie@riverland.net.au>, 2007
+# Copyright © 2008 Free Software Foundation, Inc.
+# This file is distributed under the same license as the popt-1.13 package
+# Clytie Siddall <clytie@riverland.net.au>, 2007-2008.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: popt 1.12\n"
+"Project-Id-Version: popt 1.13\n"
 "Report-Msgid-Bugs-To: <popt-devel@rpm5.org>\n"
 "POT-Creation-Date: 2008-02-16 19:54-0500\n"
-"PO-Revision-Date: 2007-07-12 22:37+0930\n"
+"PO-Revision-Date: 2008-01-07 21:53+1030\n"
 "Last-Translator: Clytie Siddall <clytie@riverland.net.au>\n"
 "Language-Team: Vietnamese <vi-VN@googlegroups.com>\n"
 "MIME-Version: 1.0\n"
diff --git a/po/wa.po b/po/wa.po
index 09f2134..cb9ad51 100644
--- a/po/wa.po
+++ b/po/wa.po
@@ -8,7 +8,7 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: popt 1.12\n"
+"Project-Id-Version: popt 1.11\n"
 "Report-Msgid-Bugs-To: <popt-devel@rpm5.org>\n"
 "POT-Creation-Date: 2008-02-16 19:54-0500\n"
 "PO-Revision-Date: 1999-03-18 23:11+0100\n"
diff --git a/po/zh_TW.po b/po/zh_TW.po
new file mode 100644
index 0000000..d420db6
--- /dev/null
+++ b/po/zh_TW.po
@@ -0,0 +1,133 @@
+# Traditional Chinese Messages for popt
+# Copyright (C) 2005 Free Software Foundation, Inc.
+# Wei-Lun Chao <chaoweilun@pcmail.com.tw>, 2005
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: popt 1.11\n"
+"Report-Msgid-Bugs-To: <popt-devel@rpm5.org>\n"
+"POT-Creation-Date: 2008-02-16 19:54-0500\n"
+"PO-Revision-Date: 2005-04-08 17:52+0800\n"
+"Last-Translator: Wei-Lun Chao <chaoweilun@pcmail.com.tw>\n"
+"Language-Team: zh_TW <zh-l10n@linux.org.tw>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#: popt.c:35
+msgid "unknown errno"
+msgstr "未知的錯誤"
+
+#: popt.c:1090
+#, fuzzy, c-format
+msgid "option type (%u) not implemented in popt\n"
+msgstr "選項類型 (%d) 沒有在 popt 中實作\n"
+
+#: popt.c:1294
+msgid "missing argument"
+msgstr "缺少引數"
+
+#: popt.c:1296
+msgid "unknown option"
+msgstr "未知的選項"
+
+#: popt.c:1298
+msgid "mutually exclusive logical operations requested"
+msgstr "需要相互獨立的邏輯運算"
+
+#: popt.c:1300
+msgid "opt->arg should not be NULL"
+msgstr "opt->arg 不應為 NULL"
+
+#: popt.c:1302
+msgid "aliases nested too deeply"
+msgstr "巢狀別名太深"
+
+#: popt.c:1304
+msgid "error in parameter quoting"
+msgstr "參數引號錯誤"
+
+#: popt.c:1306
+msgid "invalid numeric value"
+msgstr "不正確的數值"
+
+#: popt.c:1308
+msgid "number too large or too small"
+msgstr "數字太大或太小"
+
+#: popt.c:1310
+msgid "memory allocation failed"
+msgstr "記憶體配置錯誤"
+
+#: popt.c:1314
+msgid "unknown error"
+msgstr "未知的錯誤"
+
+#: popthelp.c:74 popthelp.c:86
+msgid "Show this help message"
+msgstr "顯示本說明訊息"
+
+#: popthelp.c:75 popthelp.c:87
+msgid "Display brief usage message"
+msgstr "顯示簡短的使用說明"
+
+#: popthelp.c:76 popthelp.c:92
+msgid "Terminate options"
+msgstr ""
+
+#: popthelp.c:90
+msgid "Display option defaults in message"
+msgstr "在訊息中顯示預設選項"
+
+#: popthelp.c:191
+msgid "Help options:"
+msgstr ""
+
+#: popthelp.c:192
+msgid "Options implemented via popt alias/exec:"
+msgstr ""
+
+#: popthelp.c:200
+msgid "NONE"
+msgstr "NONE"
+
+#: popthelp.c:202
+msgid "VAL"
+msgstr "VAL"
+
+#: popthelp.c:206
+msgid "INT"
+msgstr "INT"
+
+#: popthelp.c:207
+msgid "LONG"
+msgstr "LONG"
+
+#: popthelp.c:208
+#, fuzzy
+msgid "LONGLONG"
+msgstr "LONG"
+
+#: popthelp.c:209
+msgid "STRING"
+msgstr "STRING"
+
+#: popthelp.c:210
+msgid "FLOAT"
+msgstr "FLOAT"
+
+#: popthelp.c:211
+msgid "DOUBLE"
+msgstr "DOUBLE"
+
+#: popthelp.c:214
+msgid "ARG"
+msgstr "ARG"
+
+#: popthelp.c:634
+msgid "Usage:"
+msgstr "用法:"
+
+#: popthelp.c:658
+msgid "[OPTION...]"
+msgstr "[選項...]"
-- 
Gitee


From d8b94f86c86a89d461c6a8b35279747c31a637bf Mon Sep 17 00:00:00 2001
From: Jeff Johnson <n3npq@mac.com>
Date: Mon, 18 Feb 2008 00:21:29 +0000
Subject: [PATCH 511/667] - jbj: updated pl.po (Translation Project).

---
 CHANGES  |  1 +
 po/pl.po | 20 +++++++++-----------
 2 files changed, 10 insertions(+), 11 deletions(-)

diff --git a/CHANGES b/CHANGES
index a56285a..565fc26 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,4 +1,5 @@
 1.13 -> 1.14:
+    - jbj: updated pl.po (Translation Project).
     - jbj: add new fi, th, zh_TW translations (Translation Project).
     - jbj: add "make updatepo" to simplify PO file maintenance.
     - jbj: display POPT_ARG_ARGV options in --help just like other options.
diff --git a/po/pl.po b/po/pl.po
index ca7e1b8..38dc78a 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -1,14 +1,14 @@
 # Polish translation for popt.
-# Copyright (C) YEAR Free Software Foundation, Inc.
-# Jakub Bogusz <qboosh@pld.org.pl>, 2002.
+# This file is distributed under the same license as the popt package.
+# Jakub Bogusz <qboosh@pld-linux.org>, 2002-2008.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: popt 1.11\n"
+"Project-Id-Version: popt 1.14\n"
 "Report-Msgid-Bugs-To: <popt-devel@rpm5.org>\n"
 "POT-Creation-Date: 2008-02-16 19:54-0500\n"
-"PO-Revision-Date: 2003-06-08 20:32+0200\n"
-"Last-Translator: Jakub Bogusz <qboosh@pld.org.pl>\n"
+"PO-Revision-Date: 2008-02-18 00:30+0100\n"
+"Last-Translator: Jakub Bogusz <qboosh@pld-linux.org>\n"
 "Language-Team: Polish <translation-team-pl@lists.sourceforge.net>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=iso-8859-2\n"
@@ -19,9 +19,9 @@ msgid "unknown errno"
 msgstr "nieznane errno"
 
 #: popt.c:1090
-#, fuzzy, c-format
+#, c-format
 msgid "option type (%u) not implemented in popt\n"
-msgstr "rodzaj opcji (%d) nie zaimplementowany w popt\n"
+msgstr "typ opcji (%u) nie zaimplementowany w popt\n"
 
 #: popt.c:1294
 msgid "missing argument"
@@ -72,9 +72,8 @@ msgid "Display brief usage message"
 msgstr "Wy�wietl skr�cony spos�b u�ycia"
 
 #: popthelp.c:76 popthelp.c:92
-#, fuzzy
 msgid "Terminate options"
-msgstr "Opcje pomocy:"
+msgstr "Opcje zako�czenia"
 
 #: popthelp.c:90
 msgid "Display option defaults in message"
@@ -105,9 +104,8 @@ msgid "LONG"
 msgstr "LONG"
 
 #: popthelp.c:208
-#, fuzzy
 msgid "LONGLONG"
-msgstr "LONG"
+msgstr "LONGLONG"
 
 #: popthelp.c:209
 msgid "STRING"
-- 
Gitee


From 710c3635950558682c0ab0e7804fb40810cbce07 Mon Sep 17 00:00:00 2001
From: Jeff Johnson <n3npq@mac.com>
Date: Mon, 18 Feb 2008 13:21:47 +0000
Subject: [PATCH 512/667] - jbj: fix: keep the poptHelpOptions array exactly
 the same size.

---
 CHANGES    | 1 +
 popthelp.c | 1 -
 2 files changed, 1 insertion(+), 1 deletion(-)

diff --git a/CHANGES b/CHANGES
index 565fc26..9750ccc 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,4 +1,5 @@
 1.13 -> 1.14:
+    - jbj: fix: keep the poptHelpOptions array exactly the same size.
     - jbj: updated pl.po (Translation Project).
     - jbj: add new fi, th, zh_TW translations (Translation Project).
     - jbj: add "make updatepo" to simplify PO file maintenance.
diff --git a/popthelp.c b/popthelp.c
index 454c05e..e1152d6 100644
--- a/popthelp.c
+++ b/popthelp.c
@@ -73,7 +73,6 @@ struct poptOption poptHelpOptions[] = {
   { NULL, '\0', POPT_ARG_CALLBACK, (void *)displayArgs, 0, NULL, NULL },
   { "help", '?', 0, NULL, (int)'?', N_("Show this help message"), NULL },
   { "usage", '\0', 0, NULL, (int)'u', N_("Display brief usage message"), NULL },
-  { "", '\0',	0, NULL, 0, N_("Terminate options"), NULL },
     POPT_TABLEEND
 } ;
 
-- 
Gitee


From ad5b72876bdfb3c096f58c001907ccae26a0be8e Mon Sep 17 00:00:00 2001
From: Jeff Johnson <n3npq@mac.com>
Date: Mon, 18 Feb 2008 13:26:02 +0000
Subject: [PATCH 513/667] - jbj: updated vi.po and zh_CN.po (Translation
 Project).

---
 CHANGES     |  1 +
 po/cs.po    | 42 ++++++++++++++++++-------------------
 po/da.po    | 42 ++++++++++++++++++-------------------
 po/de.po    | 42 ++++++++++++++++++-------------------
 po/es.po    | 40 +++++++++++++++++------------------
 po/fi.po    | 42 ++++++++++++++++++-------------------
 po/fr.po    | 42 ++++++++++++++++++-------------------
 po/ga.po    | 42 ++++++++++++++++++-------------------
 po/gl.po    | 42 ++++++++++++++++++-------------------
 po/hu.po    | 42 ++++++++++++++++++-------------------
 po/is.po    | 42 ++++++++++++++++++-------------------
 po/it.po    | 42 ++++++++++++++++++-------------------
 po/ja.po    | 42 ++++++++++++++++++-------------------
 po/ko.po    | 42 ++++++++++++++++++-------------------
 po/nb.po    | 42 ++++++++++++++++++-------------------
 po/nl.po    | 42 ++++++++++++++++++-------------------
 po/pl.po    | 42 ++++++++++++++++++-------------------
 po/popt.pot | 42 ++++++++++++++++++-------------------
 po/pt.po    | 42 ++++++++++++++++++-------------------
 po/ro.po    | 42 ++++++++++++++++++-------------------
 po/ru.po    | 42 ++++++++++++++++++-------------------
 po/sk.po    | 42 ++++++++++++++++++-------------------
 po/sl.po    | 42 ++++++++++++++++++-------------------
 po/sv.po    | 42 ++++++++++++++++++-------------------
 po/th.po    | 42 ++++++++++++++++++-------------------
 po/tr.po    | 42 ++++++++++++++++++-------------------
 po/uk.po    | 42 ++++++++++++++++++-------------------
 po/vi.po    | 60 ++++++++++++++++++++++++++---------------------------
 po/wa.po    | 42 ++++++++++++++++++-------------------
 po/zh_CN.po | 56 ++++++++++++++++++++++++-------------------------
 po/zh_TW.po | 42 ++++++++++++++++++-------------------
 31 files changed, 644 insertions(+), 647 deletions(-)

diff --git a/CHANGES b/CHANGES
index 9750ccc..b25ee73 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,4 +1,5 @@
 1.13 -> 1.14:
+    - jbj: updated vi.po and zh_CN.po (Translation Project).
     - jbj: fix: keep the poptHelpOptions array exactly the same size.
     - jbj: updated pl.po (Translation Project).
     - jbj: add new fi, th, zh_TW translations (Translation Project).
diff --git a/po/cs.po b/po/cs.po
index a4491d6..f20908f 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.11\n"
 "Report-Msgid-Bugs-To: <popt-devel@rpm5.org>\n"
-"POT-Creation-Date: 2008-02-16 19:54-0500\n"
+"POT-Creation-Date: 2008-02-18 08:21-0500\n"
 "PO-Revision-Date: 2001-07-24 00:03+0100\n"
 "Last-Translator: Milan Kerslager <kerslage@linux.cz>\n"
 "Language-Team: Czech <cs@li.org>\n"
@@ -59,71 +59,71 @@ msgstr "selhala alokace pam
 msgid "unknown error"
 msgstr "nezn�m� chyba"
 
-#: popthelp.c:74 popthelp.c:86
+#: popthelp.c:74 popthelp.c:85
 msgid "Show this help message"
 msgstr "Vyp��e tuto n�pov�du"
 
-#: popthelp.c:75 popthelp.c:87
+#: popthelp.c:75 popthelp.c:86
 msgid "Display brief usage message"
 msgstr "Vyp��e kr�tk� n�vod k pou�it�"
 
-#: popthelp.c:76 popthelp.c:92
-msgid "Terminate options"
-msgstr ""
-
-#: popthelp.c:90
+#: popthelp.c:89
 msgid "Display option defaults in message"
 msgstr "Zobrazit implicitn� volby ve zpr�v�"
 
-#: popthelp.c:191
+#: popthelp.c:91
+msgid "Terminate options"
+msgstr ""
+
+#: popthelp.c:190
 msgid "Help options:"
 msgstr ""
 
-#: popthelp.c:192
+#: popthelp.c:191
 msgid "Options implemented via popt alias/exec:"
 msgstr ""
 
-#: popthelp.c:200
+#: popthelp.c:199
 msgid "NONE"
 msgstr "NONE"
 
-#: popthelp.c:202
+#: popthelp.c:201
 msgid "VAL"
 msgstr "VAL"
 
-#: popthelp.c:206
+#: popthelp.c:205
 msgid "INT"
 msgstr "INT"
 
-#: popthelp.c:207
+#: popthelp.c:206
 msgid "LONG"
 msgstr "LONG"
 
-#: popthelp.c:208
+#: popthelp.c:207
 #, fuzzy
 msgid "LONGLONG"
 msgstr "LONG"
 
-#: popthelp.c:209
+#: popthelp.c:208
 msgid "STRING"
 msgstr "STRING"
 
-#: popthelp.c:210
+#: popthelp.c:209
 msgid "FLOAT"
 msgstr "FLOAT"
 
-#: popthelp.c:211
+#: popthelp.c:210
 msgid "DOUBLE"
 msgstr "DOUBLE"
 
-#: popthelp.c:214
+#: popthelp.c:213
 msgid "ARG"
 msgstr "ARG"
 
-#: popthelp.c:634
+#: popthelp.c:633
 msgid "Usage:"
 msgstr "Pou�it�:"
 
-#: popthelp.c:658
+#: popthelp.c:657
 msgid "[OPTION...]"
 msgstr "[VOLBY...]"
diff --git a/po/da.po b/po/da.po
index 822bb62..267f0be 100644
--- a/po/da.po
+++ b/po/da.po
@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.11\n"
 "Report-Msgid-Bugs-To: <popt-devel@rpm5.org>\n"
-"POT-Creation-Date: 2008-02-16 19:54-0500\n"
+"POT-Creation-Date: 2008-02-18 08:21-0500\n"
 "PO-Revision-Date: Sun Jan 21 2001 04:30:32+0200\n"
 "Last-Translator: Martin Hansen <mah@k64.dk>\n"
 "Language-Team: Dansk <dansk@klid.dk>\n"
@@ -60,72 +60,72 @@ msgstr ""
 msgid "unknown error"
 msgstr "ukendt fejl"
 
-#: popthelp.c:74 popthelp.c:86
+#: popthelp.c:74 popthelp.c:85
 msgid "Show this help message"
 msgstr "Vis denne hj�lpemeddelelse"
 
-#: popthelp.c:75 popthelp.c:87
+#: popthelp.c:75 popthelp.c:86
 msgid "Display brief usage message"
 msgstr "Vis kortfattet brugsanvisning"
 
-#: popthelp.c:76 popthelp.c:92
-msgid "Terminate options"
-msgstr ""
-
-#: popthelp.c:90
+#: popthelp.c:89
 #, fuzzy
 msgid "Display option defaults in message"
 msgstr "Vis kortfattet brugsanvisning"
 
-#: popthelp.c:191
+#: popthelp.c:91
+msgid "Terminate options"
+msgstr ""
+
+#: popthelp.c:190
 msgid "Help options:"
 msgstr ""
 
-#: popthelp.c:192
+#: popthelp.c:191
 msgid "Options implemented via popt alias/exec:"
 msgstr ""
 
-#: popthelp.c:200
+#: popthelp.c:199
 msgid "NONE"
 msgstr "INGEN"
 
-#: popthelp.c:202
+#: popthelp.c:201
 msgid "VAL"
 msgstr "VAL"
 
-#: popthelp.c:206
+#: popthelp.c:205
 msgid "INT"
 msgstr "INT"
 
-#: popthelp.c:207
+#: popthelp.c:206
 msgid "LONG"
 msgstr "LONG"
 
-#: popthelp.c:208
+#: popthelp.c:207
 #, fuzzy
 msgid "LONGLONG"
 msgstr "LONG"
 
-#: popthelp.c:209
+#: popthelp.c:208
 msgid "STRING"
 msgstr "STRING"
 
-#: popthelp.c:210
+#: popthelp.c:209
 msgid "FLOAT"
 msgstr "FLOAT"
 
-#: popthelp.c:211
+#: popthelp.c:210
 msgid "DOUBLE"
 msgstr "DOUBLE"
 
-#: popthelp.c:214
+#: popthelp.c:213
 msgid "ARG"
 msgstr "ARG"
 
-#: popthelp.c:634
+#: popthelp.c:633
 msgid "Usage:"
 msgstr "Brug:"
 
-#: popthelp.c:658
+#: popthelp.c:657
 msgid "[OPTION...]"
 msgstr "[TILVALG...]"
diff --git a/po/de.po b/po/de.po
index f43a107..848e09f 100644
--- a/po/de.po
+++ b/po/de.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.11\n"
 "Report-Msgid-Bugs-To: <popt-devel@rpm5.org>\n"
-"POT-Creation-Date: 2008-02-16 19:54-0500\n"
+"POT-Creation-Date: 2008-02-18 08:21-0500\n"
 "PO-Revision-Date: 2007-02-17 21:00+0100\n"
 "Last-Translator: Robert Scheck <rpm@robert-scheck.de>\n"
 "Language-Team: German <de@li.org>\n"
@@ -63,72 +63,72 @@ msgstr "Speicherzuordnung fehlgeschlagen"
 msgid "unknown error"
 msgstr "Unbekannter Fehler"
 
-#: popthelp.c:74 popthelp.c:86
+#: popthelp.c:74 popthelp.c:85
 msgid "Show this help message"
 msgstr "Zeigt diese Hilfe an"
 
-#: popthelp.c:75 popthelp.c:87
+#: popthelp.c:75 popthelp.c:86
 msgid "Display brief usage message"
 msgstr "Zeigt eine kurze Verwendungsinformation"
 
-#: popthelp.c:76 popthelp.c:92
+#: popthelp.c:89
+msgid "Display option defaults in message"
+msgstr "Zeigt die Standardeinstellungen an"
+
+#: popthelp.c:91
 #, fuzzy
 msgid "Terminate options"
 msgstr "Hilfe-Optionen:"
 
-#: popthelp.c:90
-msgid "Display option defaults in message"
-msgstr "Zeigt die Standardeinstellungen an"
-
-#: popthelp.c:191
+#: popthelp.c:190
 msgid "Help options:"
 msgstr "Hilfe-Optionen:"
 
-#: popthelp.c:192
+#: popthelp.c:191
 msgid "Options implemented via popt alias/exec:"
 msgstr "Optionen über popt alias/exec implementiert:"
 
-#: popthelp.c:200
+#: popthelp.c:199
 msgid "NONE"
 msgstr "NICHTS"
 
-#: popthelp.c:202
+#: popthelp.c:201
 msgid "VAL"
 msgstr "WERT"
 
-#: popthelp.c:206
+#: popthelp.c:205
 msgid "INT"
 msgstr "INTEGER"
 
-#: popthelp.c:207
+#: popthelp.c:206
 msgid "LONG"
 msgstr "LONG"
 
-#: popthelp.c:208
+#: popthelp.c:207
 #, fuzzy
 msgid "LONGLONG"
 msgstr "LONG"
 
-#: popthelp.c:209
+#: popthelp.c:208
 msgid "STRING"
 msgstr "STRING"
 
-#: popthelp.c:210
+#: popthelp.c:209
 msgid "FLOAT"
 msgstr "FLOAT"
 
-#: popthelp.c:211
+#: popthelp.c:210
 msgid "DOUBLE"
 msgstr "DOUBLE"
 
-#: popthelp.c:214
+#: popthelp.c:213
 msgid "ARG"
 msgstr "ARGUMENT"
 
-#: popthelp.c:634
+#: popthelp.c:633
 msgid "Usage:"
 msgstr "Verwendung:"
 
-#: popthelp.c:658
+#: popthelp.c:657
 msgid "[OPTION...]"
 msgstr "[OPTION...]"
diff --git a/po/es.po b/po/es.po
index b2412a9..40a376d 100644
--- a/po/es.po
+++ b/po/es.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.12\n"
 "Report-Msgid-Bugs-To: <popt-devel@rpm5.org>\n"
-"POT-Creation-Date: 2008-02-16 19:54-0500\n"
+"POT-Creation-Date: 2008-02-18 08:21-0500\n"
 "PO-Revision-Date: 2007-12-28 12:22+0100\n"
 "Last-Translator: Leandro Lucarella <luca@linuxmendoza.org.ar>\n"
 "Language-Team: Spanish <es@li.org>\n"
@@ -63,71 +63,71 @@ msgstr ""
 msgid "unknown error"
 msgstr "error desconocido"
 
-#: popthelp.c:74 popthelp.c:86
+#: popthelp.c:74 popthelp.c:85
 msgid "Show this help message"
 msgstr "Muestra este mensaje de ayuda"
 
-#: popthelp.c:75 popthelp.c:87
+#: popthelp.c:75 popthelp.c:86
 msgid "Display brief usage message"
 msgstr "Indica el modo de uso resumido"
 
-#: popthelp.c:76 popthelp.c:92
-msgid "Terminate options"
+#: popthelp.c:89
+msgid "Display option defaults in message"
 msgstr ""
 
-#: popthelp.c:90
-msgid "Display option defaults in message"
+#: popthelp.c:91
+msgid "Terminate options"
 msgstr ""
 
-#: popthelp.c:191
+#: popthelp.c:190
 msgid "Help options:"
 msgstr ""
 
-#: popthelp.c:192
+#: popthelp.c:191
 msgid "Options implemented via popt alias/exec:"
 msgstr ""
 
-#: popthelp.c:200
+#: popthelp.c:199
 msgid "NONE"
 msgstr "NONE"
 
-#: popthelp.c:202
+#: popthelp.c:201
 msgid "VAL"
 msgstr "VAL"
 
-#: popthelp.c:206
+#: popthelp.c:205
 msgid "INT"
 msgstr "INT"
 
-#: popthelp.c:207
+#: popthelp.c:206
 msgid "LONG"
 msgstr "LONG"
 
-#: popthelp.c:208
+#: popthelp.c:207
 #, fuzzy
 msgid "LONGLONG"
 msgstr "LONG"
 
-#: popthelp.c:209
+#: popthelp.c:208
 msgid "STRING"
 msgstr "STRING"
 
-#: popthelp.c:210
+#: popthelp.c:209
 msgid "FLOAT"
 msgstr "FLOAT"
 
-#: popthelp.c:211
+#: popthelp.c:210
 msgid "DOUBLE"
 msgstr "DOUBLE"
 
-#: popthelp.c:214
+#: popthelp.c:213
 msgid "ARG"
 msgstr "ARG"
 
-#: popthelp.c:634
+#: popthelp.c:633
 msgid "Usage:"
 msgstr "Modo de uso:"
 
-#: popthelp.c:658
+#: popthelp.c:657
 msgid "[OPTION...]"
 msgstr "[OPCIÓN...]"
diff --git a/po/fi.po b/po/fi.po
index 0aa8c9c..a237b98 100644
--- a/po/fi.po
+++ b/po/fi.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.13\n"
 "Report-Msgid-Bugs-To: <popt-devel@rpm5.org>\n"
-"POT-Creation-Date: 2008-02-16 19:54-0500\n"
+"POT-Creation-Date: 2008-02-18 08:21-0500\n"
 "PO-Revision-Date: 2008-01-06 19:42+0200\n"
 "Last-Translator: Jorma Karvonen <karvjorm@users.sf.net>\n"
 "Language-Team: Finnish <translation-team-fi@lists.sourceforge.net>\n"
@@ -67,74 +67,74 @@ msgstr "muistin varaus ei onnistunut"
 msgid "unknown error"
 msgstr "tuntematon virhe"
 
-#: popthelp.c:74 popthelp.c:86
+#: popthelp.c:74 popthelp.c:85
 msgid "Show this help message"
 msgstr "Näytä tämä ohje"
 
-#: popthelp.c:75 popthelp.c:87
+#: popthelp.c:75 popthelp.c:86
 msgid "Display brief usage message"
 msgstr "Näytä lyhyt käyttöohje"
 
-#: popthelp.c:76 popthelp.c:92
+#: popthelp.c:89
+msgid "Display option defaults in message"
+msgstr "Näytä valitsinoletukset ohjeessa"
+
+#: popthelp.c:91
 #, fuzzy
 msgid "Terminate options"
 msgstr "Ohjevalitsimet:"
 
-#: popthelp.c:90
-msgid "Display option defaults in message"
-msgstr "Näytä valitsinoletukset ohjeessa"
-
-#: popthelp.c:191
+#: popthelp.c:190
 msgid "Help options:"
 msgstr "Ohjevalitsimet:"
 
-#: popthelp.c:192
+#: popthelp.c:191
 msgid "Options implemented via popt alias/exec:"
 msgstr ""
 "Valitsimet toteutettu ”popt alias”-määrittelyillä tai ”popt exec”-"
 "määrittelyillä:"
 
-#: popthelp.c:200
+#: popthelp.c:199
 msgid "NONE"
 msgstr "EI MITÄÄN"
 
-#: popthelp.c:202
+#: popthelp.c:201
 msgid "VAL"
 msgstr "ARVO"
 
-#: popthelp.c:206
+#: popthelp.c:205
 msgid "INT"
 msgstr "INT-KOKONAISLUKU"
 
-#: popthelp.c:207
+#: popthelp.c:206
 msgid "LONG"
 msgstr "LONG-KOKONAISLUKU"
 
-#: popthelp.c:208
+#: popthelp.c:207
 #, fuzzy
 msgid "LONGLONG"
 msgstr "LONG-KOKONAISLUKU"
 
-#: popthelp.c:209
+#: popthelp.c:208
 msgid "STRING"
 msgstr "MERKKIJONO"
 
-#: popthelp.c:210
+#: popthelp.c:209
 msgid "FLOAT"
 msgstr "FLOAT-LIUKULUKU"
 
-#: popthelp.c:211
+#: popthelp.c:210
 msgid "DOUBLE"
 msgstr "DOUBLE-LIUKULUKU"
 
-#: popthelp.c:214
+#: popthelp.c:213
 msgid "ARG"
 msgstr "ARGUMENTTI"
 
-#: popthelp.c:634
+#: popthelp.c:633
 msgid "Usage:"
 msgstr "Käyttö:"
 
-#: popthelp.c:658
+#: popthelp.c:657
 msgid "[OPTION...]"
 msgstr "[VALITSIN...]"
diff --git a/po/fr.po b/po/fr.po
index 3646ef8..2774ac7 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -12,7 +12,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.11\n"
 "Report-Msgid-Bugs-To: <popt-devel@rpm5.org>\n"
-"POT-Creation-Date: 2008-02-16 19:54-0500\n"
+"POT-Creation-Date: 2008-02-18 08:21-0500\n"
 "PO-Revision-Date: 2003-06-22 23:43+0200\n"
 "Last-Translator: RPM French Translation <rpm-fr@livna.org>\n"
 "Language-Team: RPM French Translation <rpm-fr@livna.org>\n"
@@ -69,71 +69,71 @@ msgstr "échec de l'allocation de mémoire"
 msgid "unknown error"
 msgstr "erreur inconnue"
 
-#: popthelp.c:74 popthelp.c:86
+#: popthelp.c:74 popthelp.c:85
 msgid "Show this help message"
 msgstr "Montre ce message d'aide"
 
-#: popthelp.c:75 popthelp.c:87
+#: popthelp.c:75 popthelp.c:86
 msgid "Display brief usage message"
 msgstr "Affiche un bref descriptif de l'utilisation"
 
-#: popthelp.c:76 popthelp.c:92
-msgid "Terminate options"
-msgstr ""
-
-#: popthelp.c:90
+#: popthelp.c:89
 msgid "Display option defaults in message"
 msgstr "Afficher les valeurs par défaut des options dans le message"
 
-#: popthelp.c:191
+#: popthelp.c:91
+msgid "Terminate options"
+msgstr ""
+
+#: popthelp.c:190
 msgid "Help options:"
 msgstr ""
 
-#: popthelp.c:192
+#: popthelp.c:191
 msgid "Options implemented via popt alias/exec:"
 msgstr ""
 
-#: popthelp.c:200
+#: popthelp.c:199
 msgid "NONE"
 msgstr "RIEN"
 
-#: popthelp.c:202
+#: popthelp.c:201
 msgid "VAL"
 msgstr "VAL"
 
-#: popthelp.c:206
+#: popthelp.c:205
 msgid "INT"
 msgstr "ENTIER"
 
-#: popthelp.c:207
+#: popthelp.c:206
 msgid "LONG"
 msgstr "LONG"
 
-#: popthelp.c:208
+#: popthelp.c:207
 #, fuzzy
 msgid "LONGLONG"
 msgstr "LONG"
 
-#: popthelp.c:209
+#: popthelp.c:208
 msgid "STRING"
 msgstr "CHAINE"
 
-#: popthelp.c:210
+#: popthelp.c:209
 msgid "FLOAT"
 msgstr "FLOTTANT"
 
-#: popthelp.c:211
+#: popthelp.c:210
 msgid "DOUBLE"
 msgstr "DOUBLE"
 
-#: popthelp.c:214
+#: popthelp.c:213
 msgid "ARG"
 msgstr "ARG"
 
-#: popthelp.c:634
+#: popthelp.c:633
 msgid "Usage:"
 msgstr "Utilisation:"
 
-#: popthelp.c:658
+#: popthelp.c:657
 msgid "[OPTION...]"
 msgstr "[OPTION...]"
diff --git a/po/ga.po b/po/ga.po
index 85c1799..65d1493 100644
--- a/po/ga.po
+++ b/po/ga.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.11\n"
 "Report-Msgid-Bugs-To: <popt-devel@rpm5.org>\n"
-"POT-Creation-Date: 2008-02-16 19:54-0500\n"
+"POT-Creation-Date: 2008-02-18 08:21-0500\n"
 "PO-Revision-Date: 2007-06-19 06:21-0500\n"
 "Last-Translator: Kevin Scannell <kscanne@gmail.com>\n"
 "Language-Team: Irish <gaeilge-gnulinux@lists.sourceforge.net>\n"
@@ -63,72 +63,72 @@ msgstr "theip ar dháileadh na cuimhne"
 msgid "unknown error"
 msgstr "earráid anaithnid"
 
-#: popthelp.c:74 popthelp.c:86
+#: popthelp.c:74 popthelp.c:85
 msgid "Show this help message"
 msgstr "Taispeáin an chabhair seo"
 
-#: popthelp.c:75 popthelp.c:87
+#: popthelp.c:75 popthelp.c:86
 msgid "Display brief usage message"
 msgstr "Taispeáin beagán eolais faoin úsáid"
 
-#: popthelp.c:76 popthelp.c:92
+#: popthelp.c:89
+msgid "Display option defaults in message"
+msgstr "Taispeáin luachanna réamhshocraithe na roghanna sa teachtaireacht"
+
+#: popthelp.c:91
 #, fuzzy
 msgid "Terminate options"
 msgstr "Roghanna cabhracha:"
 
-#: popthelp.c:90
-msgid "Display option defaults in message"
-msgstr "Taispeáin luachanna réamhshocraithe na roghanna sa teachtaireacht"
-
-#: popthelp.c:191
+#: popthelp.c:190
 msgid "Help options:"
 msgstr "Roghanna cabhracha:"
 
-#: popthelp.c:192
+#: popthelp.c:191
 msgid "Options implemented via popt alias/exec:"
 msgstr "Roghanna a cuireadh i bhfeidhm trí ailias/exec popt:"
 
-#: popthelp.c:200
+#: popthelp.c:199
 msgid "NONE"
 msgstr "NEAMHNÍ"
 
-#: popthelp.c:202
+#: popthelp.c:201
 msgid "VAL"
 msgstr "LUACH"
 
-#: popthelp.c:206
+#: popthelp.c:205
 msgid "INT"
 msgstr "INT"
 
-#: popthelp.c:207
+#: popthelp.c:206
 msgid "LONG"
 msgstr "LONG"
 
-#: popthelp.c:208
+#: popthelp.c:207
 #, fuzzy
 msgid "LONGLONG"
 msgstr "LONG"
 
-#: popthelp.c:209
+#: popthelp.c:208
 msgid "STRING"
 msgstr "STRING"
 
-#: popthelp.c:210
+#: popthelp.c:209
 msgid "FLOAT"
 msgstr "FLOAT"
 
-#: popthelp.c:211
+#: popthelp.c:210
 msgid "DOUBLE"
 msgstr "DOUBLE"
 
-#: popthelp.c:214
+#: popthelp.c:213
 msgid "ARG"
 msgstr "ARG"
 
-#: popthelp.c:634
+#: popthelp.c:633
 msgid "Usage:"
 msgstr "Úsáid:"
 
-#: popthelp.c:658
+#: popthelp.c:657
 msgid "[OPTION...]"
 msgstr "[ROGHA...]"
diff --git a/po/gl.po b/po/gl.po
index 8e2c757..c830947 100644
--- a/po/gl.po
+++ b/po/gl.po
@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.11\n"
 "Report-Msgid-Bugs-To: <popt-devel@rpm5.org>\n"
-"POT-Creation-Date: 2008-02-16 19:54-0500\n"
+"POT-Creation-Date: 2008-02-18 08:21-0500\n"
 "PO-Revision-Date: 2001-01-17 01:01+0100\n"
 "Last-Translator: Jes�s Bravo �lvarez <jba@pobox.com>\n"
 "Language-Team: Galician <trasno@ceu.fi.udc.es>\n"
@@ -59,72 +59,72 @@ msgstr ""
 msgid "unknown error"
 msgstr "erro desco�ecido"
 
-#: popthelp.c:74 popthelp.c:86
+#: popthelp.c:74 popthelp.c:85
 msgid "Show this help message"
 msgstr "Amosar esta mensaxe de axuda"
 
-#: popthelp.c:75 popthelp.c:87
+#: popthelp.c:75 popthelp.c:86
 msgid "Display brief usage message"
 msgstr "Amosar brevemente o xeito de utilizaci�n"
 
-#: popthelp.c:76 popthelp.c:92
-msgid "Terminate options"
-msgstr ""
-
-#: popthelp.c:90
+#: popthelp.c:89
 #, fuzzy
 msgid "Display option defaults in message"
 msgstr "Amosar brevemente o xeito de utilizaci�n"
 
-#: popthelp.c:191
+#: popthelp.c:91
+msgid "Terminate options"
+msgstr ""
+
+#: popthelp.c:190
 msgid "Help options:"
 msgstr ""
 
-#: popthelp.c:192
+#: popthelp.c:191
 msgid "Options implemented via popt alias/exec:"
 msgstr ""
 
-#: popthelp.c:200
+#: popthelp.c:199
 msgid "NONE"
 msgstr "NADA"
 
-#: popthelp.c:202
+#: popthelp.c:201
 msgid "VAL"
 msgstr "VAL"
 
-#: popthelp.c:206
+#: popthelp.c:205
 msgid "INT"
 msgstr "INT"
 
-#: popthelp.c:207
+#: popthelp.c:206
 msgid "LONG"
 msgstr "LONG"
 
-#: popthelp.c:208
+#: popthelp.c:207
 #, fuzzy
 msgid "LONGLONG"
 msgstr "LONG"
 
-#: popthelp.c:209
+#: popthelp.c:208
 msgid "STRING"
 msgstr "CADEA"
 
-#: popthelp.c:210
+#: popthelp.c:209
 msgid "FLOAT"
 msgstr "FLOAT"
 
-#: popthelp.c:211
+#: popthelp.c:210
 msgid "DOUBLE"
 msgstr "DOUBLE"
 
-#: popthelp.c:214
+#: popthelp.c:213
 msgid "ARG"
 msgstr "ARG"
 
-#: popthelp.c:634
+#: popthelp.c:633
 msgid "Usage:"
 msgstr "Uso:"
 
-#: popthelp.c:658
+#: popthelp.c:657
 msgid "[OPTION...]"
 msgstr "[OPCI�N...]"
diff --git a/po/hu.po b/po/hu.po
index fca60b9..f21ff77 100644
--- a/po/hu.po
+++ b/po/hu.po
@@ -5,7 +5,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.11\n"
 "Report-Msgid-Bugs-To: <popt-devel@rpm5.org>\n"
-"POT-Creation-Date: 2008-02-16 19:54-0500\n"
+"POT-Creation-Date: 2008-02-18 08:21-0500\n"
 "PO-Revision-Date: 2007-06-21 00:45+0200\n"
 "Last-Translator: Gabor Kelemen <kelemeng@gnome.hu>\n"
 "Language-Team: Hungarian <translation-team-hu@lists.sourceforge.net>\n"
@@ -64,72 +64,72 @@ msgstr "a memóriafoglalás meghiúsult"
 msgid "unknown error"
 msgstr "ismeretlen hiba"
 
-#: popthelp.c:74 popthelp.c:86
+#: popthelp.c:74 popthelp.c:85
 msgid "Show this help message"
 msgstr "Ezen súgó megjelenítése"
 
-#: popthelp.c:75 popthelp.c:87
+#: popthelp.c:75 popthelp.c:86
 msgid "Display brief usage message"
 msgstr "Rövid használati utasítás megjelenítése"
 
-#: popthelp.c:76 popthelp.c:92
+#: popthelp.c:89
+msgid "Display option defaults in message"
+msgstr "Kapcsolók alapértelmezéseinek megjelenítése"
+
+#: popthelp.c:91
 #, fuzzy
 msgid "Terminate options"
 msgstr "Súgólehetőségek:"
 
-#: popthelp.c:90
-msgid "Display option defaults in message"
-msgstr "Kapcsolók alapértelmezéseinek megjelenítése"
-
-#: popthelp.c:191
+#: popthelp.c:190
 msgid "Help options:"
 msgstr "Súgólehetőségek:"
 
-#: popthelp.c:192
+#: popthelp.c:191
 msgid "Options implemented via popt alias/exec:"
 msgstr "A popt alias/exec segítségével megvalósított kapcsolók:"
 
-#: popthelp.c:200
+#: popthelp.c:199
 msgid "NONE"
 msgstr "NINCS"
 
-#: popthelp.c:202
+#: popthelp.c:201
 msgid "VAL"
 msgstr "ÉRTÉK"
 
-#: popthelp.c:206
+#: popthelp.c:205
 msgid "INT"
 msgstr "EGÉSZ"
 
-#: popthelp.c:207
+#: popthelp.c:206
 msgid "LONG"
 msgstr "HOSSZÚ"
 
-#: popthelp.c:208
+#: popthelp.c:207
 #, fuzzy
 msgid "LONGLONG"
 msgstr "HOSSZÚ"
 
-#: popthelp.c:209
+#: popthelp.c:208
 msgid "STRING"
 msgstr "SZÖVEG"
 
-#: popthelp.c:210
+#: popthelp.c:209
 msgid "FLOAT"
 msgstr "LEBEGŐ"
 
-#: popthelp.c:211
+#: popthelp.c:210
 msgid "DOUBLE"
 msgstr "DUPLA"
 
-#: popthelp.c:214
+#: popthelp.c:213
 msgid "ARG"
 msgstr "PAR"
 
-#: popthelp.c:634
+#: popthelp.c:633
 msgid "Usage:"
 msgstr "Használat:"
 
-#: popthelp.c:658
+#: popthelp.c:657
 msgid "[OPTION...]"
 msgstr "[KAPCSOLÓ...]"
diff --git a/po/is.po b/po/is.po
index 3c00438..135f45b 100644
--- a/po/is.po
+++ b/po/is.po
@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.11\n"
 "Report-Msgid-Bugs-To: <popt-devel@rpm5.org>\n"
-"POT-Creation-Date: 2008-02-16 19:54-0500\n"
+"POT-Creation-Date: 2008-02-18 08:21-0500\n"
 "PO-Revision-Date: 2001-06-08 01:35+0000\n"
 "Last-Translator: Richard Allen <ra@hp.is>\n"
 "Language-Team: is <kde-isl@mmedia.is>\n"
@@ -59,71 +59,71 @@ msgstr "ekki t
 msgid "unknown error"
 msgstr "��ekkt villa"
 
-#: popthelp.c:74 popthelp.c:86
+#: popthelp.c:74 popthelp.c:85
 msgid "Show this help message"
 msgstr "S�na �essa hj�lp"
 
-#: popthelp.c:75 popthelp.c:87
+#: popthelp.c:75 popthelp.c:86
 msgid "Display brief usage message"
 msgstr "S�na stuttar notkunarlei�beiningar"
 
-#: popthelp.c:76 popthelp.c:92
-msgid "Terminate options"
-msgstr ""
-
-#: popthelp.c:90
+#: popthelp.c:89
 msgid "Display option defaults in message"
 msgstr "S�na sj�lfgefin gildi rofa � skilabo�um"
 
-#: popthelp.c:191
+#: popthelp.c:91
+msgid "Terminate options"
+msgstr ""
+
+#: popthelp.c:190
 msgid "Help options:"
 msgstr ""
 
-#: popthelp.c:192
+#: popthelp.c:191
 msgid "Options implemented via popt alias/exec:"
 msgstr ""
 
-#: popthelp.c:200
+#: popthelp.c:199
 msgid "NONE"
 msgstr "ENGIN"
 
-#: popthelp.c:202
+#: popthelp.c:201
 msgid "VAL"
 msgstr "VAL"
 
-#: popthelp.c:206
+#: popthelp.c:205
 msgid "INT"
 msgstr "INT"
 
-#: popthelp.c:207
+#: popthelp.c:206
 msgid "LONG"
 msgstr "LONG"
 
-#: popthelp.c:208
+#: popthelp.c:207
 #, fuzzy
 msgid "LONGLONG"
 msgstr "LONG"
 
-#: popthelp.c:209
+#: popthelp.c:208
 msgid "STRING"
 msgstr "STRING"
 
-#: popthelp.c:210
+#: popthelp.c:209
 msgid "FLOAT"
 msgstr "FLOAT"
 
-#: popthelp.c:211
+#: popthelp.c:210
 msgid "DOUBLE"
 msgstr "DOUBLE"
 
-#: popthelp.c:214
+#: popthelp.c:213
 msgid "ARG"
 msgstr "ARG"
 
-#: popthelp.c:634
+#: popthelp.c:633
 msgid "Usage:"
 msgstr "Notkun:"
 
-#: popthelp.c:658
+#: popthelp.c:657
 msgid "[OPTION...]"
 msgstr "[ROFI...]"
diff --git a/po/it.po b/po/it.po
index 91daa29..f26a5d6 100644
--- a/po/it.po
+++ b/po/it.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.12\n"
 "Report-Msgid-Bugs-To: <popt-devel@rpm5.org>\n"
-"POT-Creation-Date: 2008-02-16 19:54-0500\n"
+"POT-Creation-Date: 2008-02-18 08:21-0500\n"
 "PO-Revision-Date: 2007-11-14 20:39+0100\n"
 "Last-Translator: Sandro Bonazzola <sandro.bonazzola@gmail.com>\n"
 "Language-Team: Italian <tp@lists.linux.it>\n"
@@ -65,71 +65,71 @@ msgstr "allocazione di memoria fallita"
 msgid "unknown error"
 msgstr "errore sconosciuto"
 
-#: popthelp.c:74 popthelp.c:86
+#: popthelp.c:74 popthelp.c:85
 msgid "Show this help message"
 msgstr "Mostra questo messaggio di aiuto"
 
-#: popthelp.c:75 popthelp.c:87
+#: popthelp.c:75 popthelp.c:86
 msgid "Display brief usage message"
 msgstr "Mostra un breve messaggio di utilizzo"
 
-#: popthelp.c:76 popthelp.c:92
-msgid "Terminate options"
-msgstr ""
-
-#: popthelp.c:90
+#: popthelp.c:89
 msgid "Display option defaults in message"
 msgstr "Mostra i valori predefiniti delle opzioni nei messaggi"
 
-#: popthelp.c:191
+#: popthelp.c:91
+msgid "Terminate options"
+msgstr ""
+
+#: popthelp.c:190
 msgid "Help options:"
 msgstr ""
 
-#: popthelp.c:192
+#: popthelp.c:191
 msgid "Options implemented via popt alias/exec:"
 msgstr ""
 
-#: popthelp.c:200
+#: popthelp.c:199
 msgid "NONE"
 msgstr "NONE"
 
-#: popthelp.c:202
+#: popthelp.c:201
 msgid "VAL"
 msgstr "VAL"
 
-#: popthelp.c:206
+#: popthelp.c:205
 msgid "INT"
 msgstr "INT"
 
-#: popthelp.c:207
+#: popthelp.c:206
 msgid "LONG"
 msgstr "LONG"
 
-#: popthelp.c:208
+#: popthelp.c:207
 #, fuzzy
 msgid "LONGLONG"
 msgstr "LONG"
 
-#: popthelp.c:209
+#: popthelp.c:208
 msgid "STRING"
 msgstr "STRING"
 
-#: popthelp.c:210
+#: popthelp.c:209
 msgid "FLOAT"
 msgstr "FLOAT"
 
-#: popthelp.c:211
+#: popthelp.c:210
 msgid "DOUBLE"
 msgstr "DOUBLE"
 
-#: popthelp.c:214
+#: popthelp.c:213
 msgid "ARG"
 msgstr "ARG"
 
-#: popthelp.c:634
+#: popthelp.c:633
 msgid "Usage:"
 msgstr "Uso:"
 
-#: popthelp.c:658
+#: popthelp.c:657
 msgid "[OPTION...]"
 msgstr "[OPZIONE...]"
diff --git a/po/ja.po b/po/ja.po
index 53beb53..ca3b0c8 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.11\n"
 "Report-Msgid-Bugs-To: <popt-devel@rpm5.org>\n"
-"POT-Creation-Date: 2008-02-16 19:54-0500\n"
+"POT-Creation-Date: 2008-02-18 08:21-0500\n"
 "PO-Revision-Date: 2003--8-25 19:00+0900\n"
 "Last-Translator: Yukihiro Nakai <ynakai@redhat.com>\n"
 "Language-Team: Japanese <ja@li.org>\n"
@@ -63,72 +63,72 @@ msgstr "メモリ確保に失敗しました"
 msgid "unknown error"
 msgstr "不明なエラー"
 
-#: popthelp.c:74 popthelp.c:86
+#: popthelp.c:74 popthelp.c:85
 msgid "Show this help message"
 msgstr "このヘルプメッセージを表示します"
 
-#: popthelp.c:75 popthelp.c:87
+#: popthelp.c:75 popthelp.c:86
 msgid "Display brief usage message"
 msgstr "使い方の概要を表示します"
 
-#: popthelp.c:76 popthelp.c:92
+#: popthelp.c:89
+msgid "Display option defaults in message"
+msgstr "オプションのデフォルト値をメッセージに表示します"
+
+#: popthelp.c:91
 #, fuzzy
 msgid "Terminate options"
 msgstr "ヘルプオプション:"
 
-#: popthelp.c:90
-msgid "Display option defaults in message"
-msgstr "オプションのデフォルト値をメッセージに表示します"
-
-#: popthelp.c:191
+#: popthelp.c:190
 msgid "Help options:"
 msgstr "ヘルプオプション:"
 
-#: popthelp.c:192
+#: popthelp.c:191
 msgid "Options implemented via popt alias/exec:"
 msgstr "poptのalias/execで実装されているオプション:"
 
-#: popthelp.c:200
+#: popthelp.c:199
 msgid "NONE"
 msgstr "なし"
 
-#: popthelp.c:202
+#: popthelp.c:201
 msgid "VAL"
 msgstr "値"
 
-#: popthelp.c:206
+#: popthelp.c:205
 msgid "INT"
 msgstr "INT"
 
-#: popthelp.c:207
+#: popthelp.c:206
 msgid "LONG"
 msgstr "LONG"
 
-#: popthelp.c:208
+#: popthelp.c:207
 #, fuzzy
 msgid "LONGLONG"
 msgstr "LONG"
 
-#: popthelp.c:209
+#: popthelp.c:208
 msgid "STRING"
 msgstr "文字列"
 
-#: popthelp.c:210
+#: popthelp.c:209
 msgid "FLOAT"
 msgstr "FLOAT"
 
-#: popthelp.c:211
+#: popthelp.c:210
 msgid "DOUBLE"
 msgstr "DOUBLE"
 
-#: popthelp.c:214
+#: popthelp.c:213
 msgid "ARG"
 msgstr "ARG"
 
-#: popthelp.c:634
+#: popthelp.c:633
 msgid "Usage:"
 msgstr "使い方:"
 
-#: popthelp.c:658
+#: popthelp.c:657
 msgid "[OPTION...]"
 msgstr "[オプション...]"
diff --git a/po/ko.po b/po/ko.po
index 4203e38..3a38e37 100644
--- a/po/ko.po
+++ b/po/ko.po
@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.11\n"
 "Report-Msgid-Bugs-To: <popt-devel@rpm5.org>\n"
-"POT-Creation-Date: 2008-02-16 19:54-0500\n"
+"POT-Creation-Date: 2008-02-18 08:21-0500\n"
 "PO-Revision-Date: 2001-09-06 20:06+0900\n"
 "Last-Translator: Jong-Hoon Ryu <redhat4u@netian.com>\n"
 "Language-Team: GNU Translation project <ko@li.org>\n"
@@ -59,71 +59,71 @@ msgstr "
 msgid "unknown error"
 msgstr "�� �� ���� �����Դϴ�"
 
-#: popthelp.c:74 popthelp.c:86
+#: popthelp.c:74 popthelp.c:85
 msgid "Show this help message"
 msgstr "�� ������ �����ݴϴ�"
 
-#: popthelp.c:75 popthelp.c:87
+#: popthelp.c:75 popthelp.c:86
 msgid "Display brief usage message"
 msgstr "������ ������ �����ݴϴ�"
 
-#: popthelp.c:76 popthelp.c:92
-msgid "Terminate options"
-msgstr ""
-
-#: popthelp.c:90
+#: popthelp.c:89
 msgid "Display option defaults in message"
 msgstr "�⺻���� �ɼ��� �����ݴϴ�"
 
-#: popthelp.c:191
+#: popthelp.c:91
+msgid "Terminate options"
+msgstr ""
+
+#: popthelp.c:190
 msgid "Help options:"
 msgstr ""
 
-#: popthelp.c:192
+#: popthelp.c:191
 msgid "Options implemented via popt alias/exec:"
 msgstr ""
 
-#: popthelp.c:200
+#: popthelp.c:199
 msgid "NONE"
 msgstr "����(NONE)"
 
-#: popthelp.c:202
+#: popthelp.c:201
 msgid "VAL"
 msgstr "��(VAL)"
 
-#: popthelp.c:206
+#: popthelp.c:205
 msgid "INT"
 msgstr "����(INT)"
 
-#: popthelp.c:207
+#: popthelp.c:206
 msgid "LONG"
 msgstr "����(LONG)"
 
-#: popthelp.c:208
+#: popthelp.c:207
 #, fuzzy
 msgid "LONGLONG"
 msgstr "����(LONG)"
 
-#: popthelp.c:209
+#: popthelp.c:208
 msgid "STRING"
 msgstr "���ڿ�(STRING)"
 
-#: popthelp.c:210
+#: popthelp.c:209
 msgid "FLOAT"
 msgstr "�Ҽ�(FLOAT)"
 
-#: popthelp.c:211
+#: popthelp.c:210
 msgid "DOUBLE"
 msgstr "�Ҽ�(DOUBLE)"
 
-#: popthelp.c:214
+#: popthelp.c:213
 msgid "ARG"
 msgstr "�μ�(ARG)"
 
-#: popthelp.c:634
+#: popthelp.c:633
 msgid "Usage:"
 msgstr "����:"
 
-#: popthelp.c:658
+#: popthelp.c:657
 msgid "[OPTION...]"
 msgstr "[�ɼ�...]"
diff --git a/po/nb.po b/po/nb.po
index 0f7b5dd..4595536 100644
--- a/po/nb.po
+++ b/po/nb.po
@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.11\n"
 "Report-Msgid-Bugs-To: <popt-devel@rpm5.org>\n"
-"POT-Creation-Date: 2008-02-16 19:54-0500\n"
+"POT-Creation-Date: 2008-02-18 08:21-0500\n"
 "PO-Revision-Date: 2001-06-27 11:05+0200\n"
 "Last-Translator: Kjartan Maraas <kmaraas@online.no>\n"
 "Language-Team: Norwegian <no@li.org>\n"
@@ -59,71 +59,71 @@ msgstr "minneallokering feilet"
 msgid "unknown error"
 msgstr "ukjent feil"
 
-#: popthelp.c:74 popthelp.c:86
+#: popthelp.c:74 popthelp.c:85
 msgid "Show this help message"
 msgstr "Vis denne hjelpmeldingen"
 
-#: popthelp.c:75 popthelp.c:87
+#: popthelp.c:75 popthelp.c:86
 msgid "Display brief usage message"
 msgstr "Vis kort bruksmelding"
 
-#: popthelp.c:76 popthelp.c:92
-msgid "Terminate options"
-msgstr ""
-
-#: popthelp.c:90
+#: popthelp.c:89
 msgid "Display option defaults in message"
 msgstr "Vis forvalgte flagg i melding"
 
-#: popthelp.c:191
+#: popthelp.c:91
+msgid "Terminate options"
+msgstr ""
+
+#: popthelp.c:190
 msgid "Help options:"
 msgstr ""
 
-#: popthelp.c:192
+#: popthelp.c:191
 msgid "Options implemented via popt alias/exec:"
 msgstr ""
 
-#: popthelp.c:200
+#: popthelp.c:199
 msgid "NONE"
 msgstr "INGEN"
 
-#: popthelp.c:202
+#: popthelp.c:201
 msgid "VAL"
 msgstr "VERDI"
 
-#: popthelp.c:206
+#: popthelp.c:205
 msgid "INT"
 msgstr "HELTALL"
 
-#: popthelp.c:207
+#: popthelp.c:206
 msgid "LONG"
 msgstr "LONG"
 
-#: popthelp.c:208
+#: popthelp.c:207
 #, fuzzy
 msgid "LONGLONG"
 msgstr "LONG"
 
-#: popthelp.c:209
+#: popthelp.c:208
 msgid "STRING"
 msgstr "STRENG"
 
-#: popthelp.c:210
+#: popthelp.c:209
 msgid "FLOAT"
 msgstr "FLYTTALL"
 
-#: popthelp.c:211
+#: popthelp.c:210
 msgid "DOUBLE"
 msgstr "DOUBLE"
 
-#: popthelp.c:214
+#: popthelp.c:213
 msgid "ARG"
 msgstr "ARG"
 
-#: popthelp.c:634
+#: popthelp.c:633
 msgid "Usage:"
 msgstr "Bruk:"
 
-#: popthelp.c:658
+#: popthelp.c:657
 msgid "[OPTION...]"
 msgstr "[FLAGG...]"
diff --git a/po/nl.po b/po/nl.po
index 78f3fe1..bb23dbf 100644
--- a/po/nl.po
+++ b/po/nl.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.12\n"
 "Report-Msgid-Bugs-To: <popt-devel@rpm5.org>\n"
-"POT-Creation-Date: 2008-02-16 19:54-0500\n"
+"POT-Creation-Date: 2008-02-18 08:21-0500\n"
 "PO-Revision-Date: 2007-12-29 16:14+0100\n"
 "Last-Translator: Tim Van Holder <tim.van.holder@telenet.be>\n"
 "Language-Team: Dutch <vertaling@vrijschrift.org>\n"
@@ -64,76 +64,76 @@ msgstr "reserveren van geheugen is mislukt"
 msgid "unknown error"
 msgstr "onbekende fout"
 
-#: popthelp.c:74 popthelp.c:86
+#: popthelp.c:74 popthelp.c:85
 msgid "Show this help message"
 msgstr "Deze hulptekst tonen"
 
-#: popthelp.c:75 popthelp.c:87
+#: popthelp.c:75 popthelp.c:86
 msgid "Display brief usage message"
 msgstr "Een korte gebruikssamenvatting tonen"
 
+#: popthelp.c:89
+msgid "Display option defaults in message"
+msgstr "De standaardwaarden van opties tonen in de tekst"
+
 # of "Help-opties:"?
-#: popthelp.c:76 popthelp.c:92
+#: popthelp.c:91
 #, fuzzy
 msgid "Terminate options"
 msgstr "Hulp-opties:"
 
-#: popthelp.c:90
-msgid "Display option defaults in message"
-msgstr "De standaardwaarden van opties tonen in de tekst"
-
 # of "Help-opties:"?
-#: popthelp.c:191
+#: popthelp.c:190
 msgid "Help options:"
 msgstr "Hulp-opties:"
 
-#: popthelp.c:192
+#: popthelp.c:191
 msgid "Options implemented via popt alias/exec:"
 msgstr "Opties geïmplementeerd d.m.v. popt alias/exec:"
 
-#: popthelp.c:200
+#: popthelp.c:199
 msgid "NONE"
 msgstr "GEEN"
 
-#: popthelp.c:202
+#: popthelp.c:201
 msgid "VAL"
 msgstr "WAARDE"
 
-#: popthelp.c:206
+#: popthelp.c:205
 msgid "INT"
 msgstr "INT"
 
-#: popthelp.c:207
+#: popthelp.c:206
 msgid "LONG"
 msgstr "LONG"
 
-#: popthelp.c:208
+#: popthelp.c:207
 #, fuzzy
 msgid "LONGLONG"
 msgstr "LONG"
 
 # TEKENREEKS lijkt me niet gepast; dus ofwel STRING behouden, ofwel TEKST
-#: popthelp.c:209
+#: popthelp.c:208
 msgid "STRING"
 msgstr "TEKST"
 
-#: popthelp.c:210
+#: popthelp.c:209
 msgid "FLOAT"
 msgstr "FLOAT"
 
-#: popthelp.c:211
+#: popthelp.c:210
 msgid "DOUBLE"
 msgstr "DOUBLE"
 
 # of hier ARGUMENT van maken?
-#: popthelp.c:214
+#: popthelp.c:213
 msgid "ARG"
 msgstr "ARG"
 
-#: popthelp.c:634
+#: popthelp.c:633
 msgid "Usage:"
 msgstr "Gebruik:"
 
-#: popthelp.c:658
+#: popthelp.c:657
 msgid "[OPTION...]"
 msgstr "[OPTIE...]"
diff --git a/po/pl.po b/po/pl.po
index 38dc78a..ce3fc29 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.14\n"
 "Report-Msgid-Bugs-To: <popt-devel@rpm5.org>\n"
-"POT-Creation-Date: 2008-02-16 19:54-0500\n"
+"POT-Creation-Date: 2008-02-18 08:21-0500\n"
 "PO-Revision-Date: 2008-02-18 00:30+0100\n"
 "Last-Translator: Jakub Bogusz <qboosh@pld-linux.org>\n"
 "Language-Team: Polish <translation-team-pl@lists.sourceforge.net>\n"
@@ -63,70 +63,70 @@ msgstr "b
 msgid "unknown error"
 msgstr "nieznany b��d"
 
-#: popthelp.c:74 popthelp.c:86
+#: popthelp.c:74 popthelp.c:85
 msgid "Show this help message"
 msgstr "Poka� t� pomoc"
 
-#: popthelp.c:75 popthelp.c:87
+#: popthelp.c:75 popthelp.c:86
 msgid "Display brief usage message"
 msgstr "Wy�wietl skr�cony spos�b u�ycia"
 
-#: popthelp.c:76 popthelp.c:92
-msgid "Terminate options"
-msgstr "Opcje zako�czenia"
-
-#: popthelp.c:90
+#: popthelp.c:89
 msgid "Display option defaults in message"
 msgstr "Wy�wietl domy�lne opcje w opisie"
 
-#: popthelp.c:191
+#: popthelp.c:91
+msgid "Terminate options"
+msgstr "Opcje zako�czenia"
+
+#: popthelp.c:190
 msgid "Help options:"
 msgstr "Opcje pomocy:"
 
-#: popthelp.c:192
+#: popthelp.c:191
 msgid "Options implemented via popt alias/exec:"
 msgstr "Opcje zaimplementowane poprzez popt alias/exec:"
 
-#: popthelp.c:200
+#: popthelp.c:199
 msgid "NONE"
 msgstr "BRAK"
 
-#: popthelp.c:202
+#: popthelp.c:201
 msgid "VAL"
 msgstr "WART"
 
-#: popthelp.c:206
+#: popthelp.c:205
 msgid "INT"
 msgstr "INT"
 
-#: popthelp.c:207
+#: popthelp.c:206
 msgid "LONG"
 msgstr "LONG"
 
-#: popthelp.c:208
+#: popthelp.c:207
 msgid "LONGLONG"
 msgstr "LONGLONG"
 
-#: popthelp.c:209
+#: popthelp.c:208
 msgid "STRING"
 msgstr "�A�CUCH"
 
-#: popthelp.c:210
+#: popthelp.c:209
 msgid "FLOAT"
 msgstr "FLOAT"
 
-#: popthelp.c:211
+#: popthelp.c:210
 msgid "DOUBLE"
 msgstr "DOUBLE"
 
-#: popthelp.c:214
+#: popthelp.c:213
 msgid "ARG"
 msgstr "PARAM"
 
-#: popthelp.c:634
+#: popthelp.c:633
 msgid "Usage:"
 msgstr "Sk�adnia:"
 
-#: popthelp.c:658
+#: popthelp.c:657
 msgid "[OPTION...]"
 msgstr "[OPCJA...]"
diff --git a/po/popt.pot b/po/popt.pot
index 1a085a4..4f4a6e4 100644
--- a/po/popt.pot
+++ b/po/popt.pot
@@ -5,9 +5,9 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
+"Project-Id-Version: popt 1.14\n"
 "Report-Msgid-Bugs-To: <popt-devel@rpm5.org>\n"
-"POT-Creation-Date: 2008-02-16 19:54-0500\n"
+"POT-Creation-Date: 2008-02-18 08:21-0500\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -64,70 +64,70 @@ msgstr ""
 msgid "unknown error"
 msgstr ""
 
-#: popthelp.c:74 popthelp.c:86
+#: popthelp.c:74 popthelp.c:85
 msgid "Show this help message"
 msgstr ""
 
-#: popthelp.c:75 popthelp.c:87
+#: popthelp.c:75 popthelp.c:86
 msgid "Display brief usage message"
 msgstr ""
 
-#: popthelp.c:76 popthelp.c:92
-msgid "Terminate options"
+#: popthelp.c:89
+msgid "Display option defaults in message"
 msgstr ""
 
-#: popthelp.c:90
-msgid "Display option defaults in message"
+#: popthelp.c:91
+msgid "Terminate options"
 msgstr ""
 
-#: popthelp.c:191
+#: popthelp.c:190
 msgid "Help options:"
 msgstr ""
 
-#: popthelp.c:192
+#: popthelp.c:191
 msgid "Options implemented via popt alias/exec:"
 msgstr ""
 
-#: popthelp.c:200
+#: popthelp.c:199
 msgid "NONE"
 msgstr ""
 
-#: popthelp.c:202
+#: popthelp.c:201
 msgid "VAL"
 msgstr ""
 
-#: popthelp.c:206
+#: popthelp.c:205
 msgid "INT"
 msgstr ""
 
-#: popthelp.c:207
+#: popthelp.c:206
 msgid "LONG"
 msgstr ""
 
-#: popthelp.c:208
+#: popthelp.c:207
 msgid "LONGLONG"
 msgstr ""
 
-#: popthelp.c:209
+#: popthelp.c:208
 msgid "STRING"
 msgstr ""
 
-#: popthelp.c:210
+#: popthelp.c:209
 msgid "FLOAT"
 msgstr ""
 
-#: popthelp.c:211
+#: popthelp.c:210
 msgid "DOUBLE"
 msgstr ""
 
-#: popthelp.c:214
+#: popthelp.c:213
 msgid "ARG"
 msgstr ""
 
-#: popthelp.c:634
+#: popthelp.c:633
 msgid "Usage:"
 msgstr ""
 
-#: popthelp.c:658
+#: popthelp.c:657
 msgid "[OPTION...]"
 msgstr ""
diff --git a/po/pt.po b/po/pt.po
index 9b22b8c..ee54fbf 100644
--- a/po/pt.po
+++ b/po/pt.po
@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.11\n"
 "Report-Msgid-Bugs-To: <popt-devel@rpm5.org>\n"
-"POT-Creation-Date: 2008-02-16 19:54-0500\n"
+"POT-Creation-Date: 2008-02-18 08:21-0500\n"
 "PO-Revision-Date: 2002-02-13 18:32+0000\n"
 "Last-Translator: Pedro Morais <morais@kde.org>\n"
 "Language-Team: pt <morais@kde.org>\n"
@@ -59,71 +59,71 @@ msgstr "aloca
 msgid "unknown error"
 msgstr "erro desconhecido"
 
-#: popthelp.c:74 popthelp.c:86
+#: popthelp.c:74 popthelp.c:85
 msgid "Show this help message"
 msgstr "Mostrar esta mensagem de ajuda"
 
-#: popthelp.c:75 popthelp.c:87
+#: popthelp.c:75 popthelp.c:86
 msgid "Display brief usage message"
 msgstr "Mostrar uma mensagem de utiliza��o sucinta"
 
-#: popthelp.c:76 popthelp.c:92
-msgid "Terminate options"
-msgstr ""
-
-#: popthelp.c:90
+#: popthelp.c:89
 msgid "Display option defaults in message"
 msgstr "Mostrar valor por omiss�o das op��es na mensagem"
 
-#: popthelp.c:191
+#: popthelp.c:91
+msgid "Terminate options"
+msgstr ""
+
+#: popthelp.c:190
 msgid "Help options:"
 msgstr ""
 
-#: popthelp.c:192
+#: popthelp.c:191
 msgid "Options implemented via popt alias/exec:"
 msgstr ""
 
-#: popthelp.c:200
+#: popthelp.c:199
 msgid "NONE"
 msgstr "NONE"
 
-#: popthelp.c:202
+#: popthelp.c:201
 msgid "VAL"
 msgstr "VAL"
 
-#: popthelp.c:206
+#: popthelp.c:205
 msgid "INT"
 msgstr "INT"
 
-#: popthelp.c:207
+#: popthelp.c:206
 msgid "LONG"
 msgstr "LONG"
 
-#: popthelp.c:208
+#: popthelp.c:207
 #, fuzzy
 msgid "LONGLONG"
 msgstr "LONG"
 
-#: popthelp.c:209
+#: popthelp.c:208
 msgid "STRING"
 msgstr "STRING"
 
-#: popthelp.c:210
+#: popthelp.c:209
 msgid "FLOAT"
 msgstr "FLOAT"
 
-#: popthelp.c:211
+#: popthelp.c:210
 msgid "DOUBLE"
 msgstr "DOUBLE"
 
-#: popthelp.c:214
+#: popthelp.c:213
 msgid "ARG"
 msgstr "ARG"
 
-#: popthelp.c:634
+#: popthelp.c:633
 msgid "Usage:"
 msgstr "Utiliza��o:"
 
-#: popthelp.c:658
+#: popthelp.c:657
 msgid "[OPTION...]"
 msgstr "[OP��O...]"
diff --git a/po/ro.po b/po/ro.po
index f1d3121..38e91b8 100644
--- a/po/ro.po
+++ b/po/ro.po
@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.11\n"
 "Report-Msgid-Bugs-To: <popt-devel@rpm5.org>\n"
-"POT-Creation-Date: 2008-02-16 19:54-0500\n"
+"POT-Creation-Date: 2008-02-18 08:21-0500\n"
 "PO-Revision-Date: 2000-06-14 23:23+EST\n"
 "Last-Translator: Cristian Gafton <gafton@redhat.com>\n"
 "Language-Team: Romanian <ro@li.org>\n"
@@ -60,71 +60,71 @@ msgstr ""
 msgid "unknown error"
 msgstr "eroare necuinoscuta"
 
-#: popthelp.c:74 popthelp.c:86
+#: popthelp.c:74 popthelp.c:85
 msgid "Show this help message"
 msgstr "Afisare mesaj de help"
 
-#: popthelp.c:75 popthelp.c:87
+#: popthelp.c:75 popthelp.c:86
 msgid "Display brief usage message"
 msgstr "Afisare mesaj sintaxa sumar"
 
-#: popthelp.c:76 popthelp.c:92
-msgid "Terminate options"
-msgstr ""
-
-#: popthelp.c:90
+#: popthelp.c:89
 #, fuzzy
 msgid "Display option defaults in message"
 msgstr "Afisare mesaj sintaxa sumar"
 
-#: popthelp.c:191
+#: popthelp.c:91
+msgid "Terminate options"
+msgstr ""
+
+#: popthelp.c:190
 msgid "Help options:"
 msgstr ""
 
-#: popthelp.c:192
+#: popthelp.c:191
 msgid "Options implemented via popt alias/exec:"
 msgstr ""
 
-#: popthelp.c:200
+#: popthelp.c:199
 msgid "NONE"
 msgstr ""
 
-#: popthelp.c:202
+#: popthelp.c:201
 msgid "VAL"
 msgstr ""
 
-#: popthelp.c:206
+#: popthelp.c:205
 msgid "INT"
 msgstr ""
 
-#: popthelp.c:207
+#: popthelp.c:206
 msgid "LONG"
 msgstr ""
 
-#: popthelp.c:208
+#: popthelp.c:207
 msgid "LONGLONG"
 msgstr ""
 
-#: popthelp.c:209
+#: popthelp.c:208
 msgid "STRING"
 msgstr ""
 
-#: popthelp.c:210
+#: popthelp.c:209
 msgid "FLOAT"
 msgstr ""
 
-#: popthelp.c:211
+#: popthelp.c:210
 msgid "DOUBLE"
 msgstr ""
 
-#: popthelp.c:214
+#: popthelp.c:213
 msgid "ARG"
 msgstr ""
 
-#: popthelp.c:634
+#: popthelp.c:633
 msgid "Usage:"
 msgstr "Sintaxa:"
 
-#: popthelp.c:658
+#: popthelp.c:657
 msgid "[OPTION...]"
 msgstr "[OPTIUNE...]"
diff --git a/po/ru.po b/po/ru.po
index d3f47d4..d451289 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.11\n"
 "Report-Msgid-Bugs-To: <popt-devel@rpm5.org>\n"
-"POT-Creation-Date: 2008-02-16 19:54-0500\n"
+"POT-Creation-Date: 2008-02-18 08:21-0500\n"
 "PO-Revision-Date: 2001-07-05 21:00-0500\n"
 "Last-Translator: Eugene Kanter <eugene@blackcatlinux.com>\n"
 "Language-Team: Black Cat Linux Team <blackcat-support@blackcatlinux.com>\n"
@@ -59,71 +59,71 @@ msgstr "
 msgid "unknown error"
 msgstr "����������� ������"
 
-#: popthelp.c:74 popthelp.c:86
+#: popthelp.c:74 popthelp.c:85
 msgid "Show this help message"
 msgstr "�������� ��� ���������"
 
-#: popthelp.c:75 popthelp.c:87
+#: popthelp.c:75 popthelp.c:86
 msgid "Display brief usage message"
 msgstr "�������� ������� ���������� �� �������������"
 
-#: popthelp.c:76 popthelp.c:92
-msgid "Terminate options"
-msgstr ""
-
-#: popthelp.c:90
+#: popthelp.c:89
 msgid "Display option defaults in message"
 msgstr "�������� ��������� �� ���������"
 
-#: popthelp.c:191
+#: popthelp.c:91
+msgid "Terminate options"
+msgstr ""
+
+#: popthelp.c:190
 msgid "Help options:"
 msgstr ""
 
-#: popthelp.c:192
+#: popthelp.c:191
 msgid "Options implemented via popt alias/exec:"
 msgstr ""
 
-#: popthelp.c:200
+#: popthelp.c:199
 msgid "NONE"
 msgstr "NONE"
 
-#: popthelp.c:202
+#: popthelp.c:201
 msgid "VAL"
 msgstr "VAL"
 
-#: popthelp.c:206
+#: popthelp.c:205
 msgid "INT"
 msgstr "INT"
 
-#: popthelp.c:207
+#: popthelp.c:206
 msgid "LONG"
 msgstr "LONG"
 
-#: popthelp.c:208
+#: popthelp.c:207
 #, fuzzy
 msgid "LONGLONG"
 msgstr "LONG"
 
-#: popthelp.c:209
+#: popthelp.c:208
 msgid "STRING"
 msgstr "STRING"
 
-#: popthelp.c:210
+#: popthelp.c:209
 msgid "FLOAT"
 msgstr "FLOAT"
 
-#: popthelp.c:211
+#: popthelp.c:210
 msgid "DOUBLE"
 msgstr "DOUBLE"
 
-#: popthelp.c:214
+#: popthelp.c:213
 msgid "ARG"
 msgstr "ARG"
 
-#: popthelp.c:634
+#: popthelp.c:633
 msgid "Usage:"
 msgstr "�������������:"
 
-#: popthelp.c:658
+#: popthelp.c:657
 msgid "[OPTION...]"
 msgstr "[��������...]"
diff --git a/po/sk.po b/po/sk.po
index 1d5ee05..c53e34b 100644
--- a/po/sk.po
+++ b/po/sk.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.11\n"
 "Report-Msgid-Bugs-To: <popt-devel@rpm5.org>\n"
-"POT-Creation-Date: 2008-02-16 19:54-0500\n"
+"POT-Creation-Date: 2008-02-18 08:21-0500\n"
 "PO-Revision-Date: 1999-08-04 21:40+0200\n"
 "Last-Translator: Stanislav Meduna <stano@eunet.sk>\n"
 "Language-Team: Slovak <sk-i18n@rak.isternet.sk>\n"
@@ -63,71 +63,71 @@ msgstr ""
 msgid "unknown error"
 msgstr ""
 
-#: popthelp.c:74 popthelp.c:86
+#: popthelp.c:74 popthelp.c:85
 msgid "Show this help message"
 msgstr "Vyp�sa� t�to spr�vu"
 
-#: popthelp.c:75 popthelp.c:87
+#: popthelp.c:75 popthelp.c:86
 msgid "Display brief usage message"
 msgstr "Zobrazi� stru�n� n�vod na pou�itie"
 
-#: popthelp.c:76 popthelp.c:92
-msgid "Terminate options"
-msgstr ""
-
-#: popthelp.c:90
+#: popthelp.c:89
 #, fuzzy
 msgid "Display option defaults in message"
 msgstr "Zobrazi� stru�n� n�vod na pou�itie"
 
-#: popthelp.c:191
+#: popthelp.c:91
+msgid "Terminate options"
+msgstr ""
+
+#: popthelp.c:190
 msgid "Help options:"
 msgstr ""
 
-#: popthelp.c:192
+#: popthelp.c:191
 msgid "Options implemented via popt alias/exec:"
 msgstr ""
 
-#: popthelp.c:200
+#: popthelp.c:199
 msgid "NONE"
 msgstr ""
 
-#: popthelp.c:202
+#: popthelp.c:201
 msgid "VAL"
 msgstr ""
 
-#: popthelp.c:206
+#: popthelp.c:205
 msgid "INT"
 msgstr ""
 
-#: popthelp.c:207
+#: popthelp.c:206
 msgid "LONG"
 msgstr ""
 
-#: popthelp.c:208
+#: popthelp.c:207
 msgid "LONGLONG"
 msgstr ""
 
-#: popthelp.c:209
+#: popthelp.c:208
 msgid "STRING"
 msgstr ""
 
-#: popthelp.c:210
+#: popthelp.c:209
 msgid "FLOAT"
 msgstr ""
 
-#: popthelp.c:211
+#: popthelp.c:210
 msgid "DOUBLE"
 msgstr ""
 
-#: popthelp.c:214
+#: popthelp.c:213
 msgid "ARG"
 msgstr ""
 
-#: popthelp.c:634
+#: popthelp.c:633
 msgid "Usage:"
 msgstr ""
 
-#: popthelp.c:658
+#: popthelp.c:657
 msgid "[OPTION...]"
 msgstr ""
diff --git a/po/sl.po b/po/sl.po
index 3115224..e86ba2c 100644
--- a/po/sl.po
+++ b/po/sl.po
@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.11\n"
 "Report-Msgid-Bugs-To: <popt-devel@rpm5.org>\n"
-"POT-Creation-Date: 2008-02-16 19:54-0500\n"
+"POT-Creation-Date: 2008-02-18 08:21-0500\n"
 "PO-Revision-Date: 2000-09-05 12:30+0200\n"
 "Last-Translator: Roman Maurer <roman.maurer@hermes.si>\n"
 "Language-Team: Slovenian <sl@li.org>\n"
@@ -59,71 +59,71 @@ msgstr ""
 msgid "unknown error"
 msgstr ""
 
-#: popthelp.c:74 popthelp.c:86
+#: popthelp.c:74 popthelp.c:85
 msgid "Show this help message"
 msgstr "Prika�i to sporo�ilo s pomo�jo"
 
-#: popthelp.c:75 popthelp.c:87
+#: popthelp.c:75 popthelp.c:86
 msgid "Display brief usage message"
 msgstr "Prika�i kratko sporo�ilo o uporabi"
 
-#: popthelp.c:76 popthelp.c:92
-msgid "Terminate options"
-msgstr ""
-
-#: popthelp.c:90
+#: popthelp.c:89
 #, fuzzy
 msgid "Display option defaults in message"
 msgstr "Prika�i kratko sporo�ilo o uporabi"
 
-#: popthelp.c:191
+#: popthelp.c:91
+msgid "Terminate options"
+msgstr ""
+
+#: popthelp.c:190
 msgid "Help options:"
 msgstr ""
 
-#: popthelp.c:192
+#: popthelp.c:191
 msgid "Options implemented via popt alias/exec:"
 msgstr ""
 
-#: popthelp.c:200
+#: popthelp.c:199
 msgid "NONE"
 msgstr ""
 
-#: popthelp.c:202
+#: popthelp.c:201
 msgid "VAL"
 msgstr ""
 
-#: popthelp.c:206
+#: popthelp.c:205
 msgid "INT"
 msgstr ""
 
-#: popthelp.c:207
+#: popthelp.c:206
 msgid "LONG"
 msgstr ""
 
-#: popthelp.c:208
+#: popthelp.c:207
 msgid "LONGLONG"
 msgstr ""
 
-#: popthelp.c:209
+#: popthelp.c:208
 msgid "STRING"
 msgstr ""
 
-#: popthelp.c:210
+#: popthelp.c:209
 msgid "FLOAT"
 msgstr ""
 
-#: popthelp.c:211
+#: popthelp.c:210
 msgid "DOUBLE"
 msgstr ""
 
-#: popthelp.c:214
+#: popthelp.c:213
 msgid "ARG"
 msgstr ""
 
-#: popthelp.c:634
+#: popthelp.c:633
 msgid "Usage:"
 msgstr ""
 
-#: popthelp.c:658
+#: popthelp.c:657
 msgid "[OPTION...]"
 msgstr ""
diff --git a/po/sv.po b/po/sv.po
index e17bc09..59387b8 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.13\n"
 "Report-Msgid-Bugs-To: <popt-devel@rpm5.org>\n"
-"POT-Creation-Date: 2008-02-16 19:54-0500\n"
+"POT-Creation-Date: 2008-02-18 08:21-0500\n"
 "PO-Revision-Date: 2008-01-30 22:22+0100\n"
 "Last-Translator: G�ran Uddeborg <goeran@uddeborg.se>\n"
 "Language-Team: Swedish <tp-sv@listor.tp-sv.se>\n"
@@ -66,72 +66,72 @@ msgstr "minnesallokering misslyckades"
 msgid "unknown error"
 msgstr "ok�nt fel"
 
-#: popthelp.c:74 popthelp.c:86
+#: popthelp.c:74 popthelp.c:85
 msgid "Show this help message"
 msgstr "Visa denna hj�lptext"
 
-#: popthelp.c:75 popthelp.c:87
+#: popthelp.c:75 popthelp.c:86
 msgid "Display brief usage message"
 msgstr "Visa en kortfattad anv�ndningstext"
 
-#: popthelp.c:76 popthelp.c:92
+#: popthelp.c:89
+msgid "Display option defaults in message"
+msgstr "Visa standardalternativ f�r flaggor i meddelande"
+
+#: popthelp.c:91
 #, fuzzy
 msgid "Terminate options"
 msgstr "Hj�lpflaggor:"
 
-#: popthelp.c:90
-msgid "Display option defaults in message"
-msgstr "Visa standardalternativ f�r flaggor i meddelande"
-
-#: popthelp.c:191
+#: popthelp.c:190
 msgid "Help options:"
 msgstr "Hj�lpflaggor:"
 
-#: popthelp.c:192
+#: popthelp.c:191
 msgid "Options implemented via popt alias/exec:"
 msgstr "Flaggor implementerade via popt-alias/exec:"
 
-#: popthelp.c:200
+#: popthelp.c:199
 msgid "NONE"
 msgstr "INGET"
 
-#: popthelp.c:202
+#: popthelp.c:201
 msgid "VAL"
 msgstr "V�RDE"
 
-#: popthelp.c:206
+#: popthelp.c:205
 msgid "INT"
 msgstr "HELTAL"
 
-#: popthelp.c:207
+#: popthelp.c:206
 msgid "LONG"
 msgstr "L�NG"
 
-#: popthelp.c:208
+#: popthelp.c:207
 #, fuzzy
 msgid "LONGLONG"
 msgstr "L�NG"
 
-#: popthelp.c:209
+#: popthelp.c:208
 msgid "STRING"
 msgstr "STR�NG"
 
-#: popthelp.c:210
+#: popthelp.c:209
 msgid "FLOAT"
 msgstr "FLYTTAL"
 
-#: popthelp.c:211
+#: popthelp.c:210
 msgid "DOUBLE"
 msgstr "DUBBEL"
 
-#: popthelp.c:214
+#: popthelp.c:213
 msgid "ARG"
 msgstr "ARG"
 
-#: popthelp.c:634
+#: popthelp.c:633
 msgid "Usage:"
 msgstr "Anv�ndning:"
 
-#: popthelp.c:658
+#: popthelp.c:657
 msgid "[OPTION...]"
 msgstr "[FLAGGA...]"
diff --git a/po/th.po b/po/th.po
index 8464467..95c6705 100644
--- a/po/th.po
+++ b/po/th.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.13\n"
 "Report-Msgid-Bugs-To: <popt-devel@rpm5.org>\n"
-"POT-Creation-Date: 2008-02-16 19:54-0500\n"
+"POT-Creation-Date: 2008-02-18 08:21-0500\n"
 "PO-Revision-Date: 2008-01-06 20:09+0700\n"
 "Last-Translator: Seksan Poltree <seksan.poltree@gmail.com>\n"
 "Language-Team: Thai <translation-team-th@lists.sourceforge.net>\n"
@@ -65,72 +65,72 @@ msgstr "การจัดสรรหน่วยความจำผิดพ
 msgid "unknown error"
 msgstr "ความผิดพลาดที่ไม่รู้จัก"
 
-#: popthelp.c:74 popthelp.c:86
+#: popthelp.c:74 popthelp.c:85
 msgid "Show this help message"
 msgstr "แสดงข้อความช่วยเหลือนี้"
 
-#: popthelp.c:75 popthelp.c:87
+#: popthelp.c:75 popthelp.c:86
 msgid "Display brief usage message"
 msgstr "แสดงข้อความสรุปย่อการใช้งาน"
 
-#: popthelp.c:76 popthelp.c:92
+#: popthelp.c:89
+msgid "Display option defaults in message"
+msgstr "แสดงตัวเลือกมาตรฐานในข้อความ"
+
+#: popthelp.c:91
 #, fuzzy
 msgid "Terminate options"
 msgstr "ตัวเลือกความช่วยเหลือ:"
 
-#: popthelp.c:90
-msgid "Display option defaults in message"
-msgstr "แสดงตัวเลือกมาตรฐานในข้อความ"
-
-#: popthelp.c:191
+#: popthelp.c:190
 msgid "Help options:"
 msgstr "ตัวเลือกความช่วยเหลือ:"
 
-#: popthelp.c:192
+#: popthelp.c:191
 msgid "Options implemented via popt alias/exec:"
 msgstr "ตัวเลือกที่ถูกอิมพลีเมนต์ด้วย popt alias/exec:"
 
-#: popthelp.c:200
+#: popthelp.c:199
 msgid "NONE"
 msgstr "ไม่มี"
 
-#: popthelp.c:202
+#: popthelp.c:201
 msgid "VAL"
 msgstr "VAL"
 
-#: popthelp.c:206
+#: popthelp.c:205
 msgid "INT"
 msgstr "INT"
 
-#: popthelp.c:207
+#: popthelp.c:206
 msgid "LONG"
 msgstr "LONG"
 
-#: popthelp.c:208
+#: popthelp.c:207
 #, fuzzy
 msgid "LONGLONG"
 msgstr "LONG"
 
-#: popthelp.c:209
+#: popthelp.c:208
 msgid "STRING"
 msgstr "STRING"
 
-#: popthelp.c:210
+#: popthelp.c:209
 msgid "FLOAT"
 msgstr "FLOAT"
 
-#: popthelp.c:211
+#: popthelp.c:210
 msgid "DOUBLE"
 msgstr "DOUBLE"
 
-#: popthelp.c:214
+#: popthelp.c:213
 msgid "ARG"
 msgstr "ARG"
 
-#: popthelp.c:634
+#: popthelp.c:633
 msgid "Usage:"
 msgstr "วิธีใช้:"
 
-#: popthelp.c:658
+#: popthelp.c:657
 msgid "[OPTION...]"
 msgstr "[ตัวเลือก...]"
diff --git a/po/tr.po b/po/tr.po
index 56c3bd5..3001a2e 100644
--- a/po/tr.po
+++ b/po/tr.po
@@ -5,7 +5,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.11\n"
 "Report-Msgid-Bugs-To: <popt-devel@rpm5.org>\n"
-"POT-Creation-Date: 2008-02-16 19:54-0500\n"
+"POT-Creation-Date: 2008-02-18 08:21-0500\n"
 "PO-Revision-Date: 2000-02-11 13:01+0200\n"
 "Last-Translator: Nilgun Belma Buguner <nilgun@technologist.com>\n"
 "Language-Team: Turkish <tr@li.org>\n"
@@ -62,72 +62,72 @@ msgstr ""
 msgid "unknown error"
 msgstr "bilinmeyen hata"
 
-#: popthelp.c:74 popthelp.c:86
+#: popthelp.c:74 popthelp.c:85
 msgid "Show this help message"
 msgstr "Bu yard�m iletisini g�sterir"
 
-#: popthelp.c:75 popthelp.c:87
+#: popthelp.c:75 popthelp.c:86
 msgid "Display brief usage message"
 msgstr "K�sa bir kullan�m iletisi g�ster"
 
-#: popthelp.c:76 popthelp.c:92
-msgid "Terminate options"
-msgstr ""
-
-#: popthelp.c:90
+#: popthelp.c:89
 #, fuzzy
 msgid "Display option defaults in message"
 msgstr "K�sa bir kullan�m iletisi g�ster"
 
-#: popthelp.c:191
+#: popthelp.c:91
+msgid "Terminate options"
+msgstr ""
+
+#: popthelp.c:190
 msgid "Help options:"
 msgstr ""
 
-#: popthelp.c:192
+#: popthelp.c:191
 msgid "Options implemented via popt alias/exec:"
 msgstr ""
 
-#: popthelp.c:200
+#: popthelp.c:199
 msgid "NONE"
 msgstr "YOK"
 
-#: popthelp.c:202
+#: popthelp.c:201
 msgid "VAL"
 msgstr "DE�"
 
-#: popthelp.c:206
+#: popthelp.c:205
 msgid "INT"
 msgstr "INT"
 
-#: popthelp.c:207
+#: popthelp.c:206
 msgid "LONG"
 msgstr "LONG"
 
-#: popthelp.c:208
+#: popthelp.c:207
 #, fuzzy
 msgid "LONGLONG"
 msgstr "LONG"
 
-#: popthelp.c:209
+#: popthelp.c:208
 msgid "STRING"
 msgstr "STRING"
 
-#: popthelp.c:210
+#: popthelp.c:209
 msgid "FLOAT"
 msgstr "FLOAT"
 
-#: popthelp.c:211
+#: popthelp.c:210
 msgid "DOUBLE"
 msgstr "DOUBLE"
 
-#: popthelp.c:214
+#: popthelp.c:213
 msgid "ARG"
 msgstr "ARG"
 
-#: popthelp.c:634
+#: popthelp.c:633
 msgid "Usage:"
 msgstr "Kullan�m�:"
 
-#: popthelp.c:658
+#: popthelp.c:657
 msgid "[OPTION...]"
 msgstr "[SE�ENEK...]"
diff --git a/po/uk.po b/po/uk.po
index ab8e69b..0737625 100644
--- a/po/uk.po
+++ b/po/uk.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.11\n"
 "Report-Msgid-Bugs-To: <popt-devel@rpm5.org>\n"
-"POT-Creation-Date: 2008-02-16 19:54-0500\n"
+"POT-Creation-Date: 2008-02-18 08:21-0500\n"
 "PO-Revision-Date: 1999-09-30 16:54+0200\n"
 "Last-Translator: Yuri Syrota <rasta@renome.rovno.ua>\n"
 "Language-Team: Ukrainian <uk@li.org>\n"
@@ -63,71 +63,71 @@ msgstr ""
 msgid "unknown error"
 msgstr ""
 
-#: popthelp.c:74 popthelp.c:86
+#: popthelp.c:74 popthelp.c:85
 msgid "Show this help message"
 msgstr "�������� �� ��צ���"
 
-#: popthelp.c:75 popthelp.c:87
+#: popthelp.c:75 popthelp.c:86
 msgid "Display brief usage message"
 msgstr "�������� ������� ��צ��� ��� ������������"
 
-#: popthelp.c:76 popthelp.c:92
-msgid "Terminate options"
-msgstr ""
-
-#: popthelp.c:90
+#: popthelp.c:89
 #, fuzzy
 msgid "Display option defaults in message"
 msgstr "�������� ������� ��צ��� ��� ������������"
 
-#: popthelp.c:191
+#: popthelp.c:91
+msgid "Terminate options"
+msgstr ""
+
+#: popthelp.c:190
 msgid "Help options:"
 msgstr ""
 
-#: popthelp.c:192
+#: popthelp.c:191
 msgid "Options implemented via popt alias/exec:"
 msgstr ""
 
-#: popthelp.c:200
+#: popthelp.c:199
 msgid "NONE"
 msgstr ""
 
-#: popthelp.c:202
+#: popthelp.c:201
 msgid "VAL"
 msgstr ""
 
-#: popthelp.c:206
+#: popthelp.c:205
 msgid "INT"
 msgstr ""
 
-#: popthelp.c:207
+#: popthelp.c:206
 msgid "LONG"
 msgstr ""
 
-#: popthelp.c:208
+#: popthelp.c:207
 msgid "LONGLONG"
 msgstr ""
 
-#: popthelp.c:209
+#: popthelp.c:208
 msgid "STRING"
 msgstr ""
 
-#: popthelp.c:210
+#: popthelp.c:209
 msgid "FLOAT"
 msgstr ""
 
-#: popthelp.c:211
+#: popthelp.c:210
 msgid "DOUBLE"
 msgstr ""
 
-#: popthelp.c:214
+#: popthelp.c:213
 msgid "ARG"
 msgstr ""
 
-#: popthelp.c:634
+#: popthelp.c:633
 msgid "Usage:"
 msgstr ""
 
-#: popthelp.c:658
+#: popthelp.c:657
 msgid "[OPTION...]"
 msgstr ""
diff --git a/po/vi.po b/po/vi.po
index 46c8d6b..d551a32 100644
--- a/po/vi.po
+++ b/po/vi.po
@@ -1,30 +1,30 @@
 # Vietnamese translation for POPT.
 # Copyright © 2008 Free Software Foundation, Inc.
-# This file is distributed under the same license as the popt-1.13 package
+# This file is distributed under the same license as the popt-1.14 package
 # Clytie Siddall <clytie@riverland.net.au>, 2007-2008.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: popt 1.13\n"
+"Project-Id-Version: popt 1.14\n"
 "Report-Msgid-Bugs-To: <popt-devel@rpm5.org>\n"
-"POT-Creation-Date: 2008-02-16 19:54-0500\n"
-"PO-Revision-Date: 2008-01-07 21:53+1030\n"
+"POT-Creation-Date: 2008-02-18 08:21-0500\n"
+"PO-Revision-Date: 2008-02-18 16:20+1030\n"
 "Last-Translator: Clytie Siddall <clytie@riverland.net.au>\n"
 "Language-Team: Vietnamese <vi-VN@googlegroups.com>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
-"X-Generator: LocFactoryEditor 1.7b1\n"
+"X-Generator: LocFactoryEditor 1.7b3\n"
 
 #: popt.c:35
 msgid "unknown errno"
 msgstr "số hiệu lỗi không rõ"
 
 #: popt.c:1090
-#, fuzzy, c-format
+#, c-format
 msgid "option type (%u) not implemented in popt\n"
-msgstr "kiểu tùy chọn (%d) chưa được thực hiện trong popt\n"
+msgstr "kiểu tùy chọn (%u) chưa được thực hiện trong popt\n"
 
 #: popt.c:1294
 msgid "missing argument"
@@ -66,72 +66,70 @@ msgstr "lỗi cấp phát bộ nhớ"
 msgid "unknown error"
 msgstr "lỗi không rõ"
 
-#: popthelp.c:74 popthelp.c:86
+#: popthelp.c:74 popthelp.c:85
 msgid "Show this help message"
 msgstr "Xem thông điệp trợ giúp này"
 
-#: popthelp.c:75 popthelp.c:87
+#: popthelp.c:75 popthelp.c:86
 msgid "Display brief usage message"
 msgstr "Hiển thị thông điệp cách sử dụng ngắn"
 
-#: popthelp.c:76 popthelp.c:92
-#, fuzzy
-msgid "Terminate options"
-msgstr "Tùy chọn trợ giúp:"
-
-#: popthelp.c:90
+#: popthelp.c:89
 msgid "Display option defaults in message"
 msgstr "Hiển thị các giá trị mặc định của tùy chọn trong thông điệp"
 
-#: popthelp.c:191
+#: popthelp.c:91
+msgid "Terminate options"
+msgstr "Tùy chọn chấm dứt"
+
+#: popthelp.c:190
 msgid "Help options:"
 msgstr "Tùy chọn trợ giúp:"
 
-#: popthelp.c:192
+#: popthelp.c:191
 msgid "Options implemented via popt alias/exec:"
 msgstr "Các tùy chọn được thực hiện thông qua popt alias/exec:"
 
-#: popthelp.c:200
+#: popthelp.c:199
 msgid "NONE"
 msgstr "KHÔNG CÓ"
 
-#: popthelp.c:202
+#: popthelp.c:201
 msgid "VAL"
 msgstr "GIÁ TRỊ"
 
-#: popthelp.c:206
+#: popthelp.c:205
 msgid "INT"
 msgstr "SỐ NGUYÊN"
 
-#: popthelp.c:207
+#: popthelp.c:206
 msgid "LONG"
 msgstr "DÀI"
 
-#: popthelp.c:208
-#, fuzzy
+#: popthelp.c:207
 msgid "LONGLONG"
-msgstr "DÀI"
+msgstr "DÀIDÀI"
 
-#: popthelp.c:209
+#: popthelp.c:208
 msgid "STRING"
 msgstr "CHUỖI"
 
-#: popthelp.c:210
+#: popthelp.c:209
 msgid "FLOAT"
 msgstr "NỔI"
 
-#: popthelp.c:211
+#: popthelp.c:210
 msgid "DOUBLE"
 msgstr "ĐÔI"
 
-#: popthelp.c:214
+#: popthelp.c:213
 msgid "ARG"
 msgstr "ĐỐI SỐ"
 
-#: popthelp.c:634
+#: popthelp.c:633
 msgid "Usage:"
-msgstr "Cách sử dụng:"
+msgstr "Sử dụng:"
 
-#: popthelp.c:658
+#: popthelp.c:657
 msgid "[OPTION...]"
 msgstr "[TÙY_CHỌN...]"
diff --git a/po/wa.po b/po/wa.po
index cb9ad51..d9e07d4 100644
--- a/po/wa.po
+++ b/po/wa.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.11\n"
 "Report-Msgid-Bugs-To: <popt-devel@rpm5.org>\n"
-"POT-Creation-Date: 2008-02-16 19:54-0500\n"
+"POT-Creation-Date: 2008-02-18 08:21-0500\n"
 "PO-Revision-Date: 1999-03-18 23:11+0100\n"
 "Last-Translator: Nobody yet\n"
 "Language-Team: walon <linux-wa@chanae.alphanet.ch>\n"
@@ -67,71 +67,71 @@ msgstr ""
 msgid "unknown error"
 msgstr ""
 
-#: popthelp.c:74 popthelp.c:86
+#: popthelp.c:74 popthelp.c:85
 msgid "Show this help message"
 msgstr "Mostrer ci messaedje d' aide chal"
 
-#: popthelp.c:75 popthelp.c:87
+#: popthelp.c:75 popthelp.c:86
 msgid "Display brief usage message"
 msgstr "Mostre on court messaedje so kmint vos � siervi"
 
-#: popthelp.c:76 popthelp.c:92
-msgid "Terminate options"
-msgstr ""
-
-#: popthelp.c:90
+#: popthelp.c:89
 #, fuzzy
 msgid "Display option defaults in message"
 msgstr "Mostre on court messaedje so kmint vos � siervi"
 
-#: popthelp.c:191
+#: popthelp.c:91
+msgid "Terminate options"
+msgstr ""
+
+#: popthelp.c:190
 msgid "Help options:"
 msgstr ""
 
-#: popthelp.c:192
+#: popthelp.c:191
 msgid "Options implemented via popt alias/exec:"
 msgstr ""
 
-#: popthelp.c:200
+#: popthelp.c:199
 msgid "NONE"
 msgstr ""
 
-#: popthelp.c:202
+#: popthelp.c:201
 msgid "VAL"
 msgstr ""
 
-#: popthelp.c:206
+#: popthelp.c:205
 msgid "INT"
 msgstr ""
 
-#: popthelp.c:207
+#: popthelp.c:206
 msgid "LONG"
 msgstr ""
 
-#: popthelp.c:208
+#: popthelp.c:207
 msgid "LONGLONG"
 msgstr ""
 
-#: popthelp.c:209
+#: popthelp.c:208
 msgid "STRING"
 msgstr ""
 
-#: popthelp.c:210
+#: popthelp.c:209
 msgid "FLOAT"
 msgstr ""
 
-#: popthelp.c:211
+#: popthelp.c:210
 msgid "DOUBLE"
 msgstr ""
 
-#: popthelp.c:214
+#: popthelp.c:213
 msgid "ARG"
 msgstr ""
 
-#: popthelp.c:634
+#: popthelp.c:633
 msgid "Usage:"
 msgstr ""
 
-#: popthelp.c:658
+#: popthelp.c:657
 msgid "[OPTION...]"
 msgstr ""
diff --git a/po/zh_CN.po b/po/zh_CN.po
index 1d2a2ce..2db20c9 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -2,14 +2,14 @@
 # Simplified Chinese Messages for popt
 # Copyright (C) 2005, 2007 Free Software Foundation, Inc.
 # Wei-Lun Chao <chaoweilun@pcmail.com.tw>, 2005.
-# LI Daobing <lidaobing@gmail.com>, 2007.
+# LI Daobing <lidaobing@gmail.com>, 2007, 2008.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: popt 1.12\n"
+"Project-Id-Version: popt 1.14\n"
 "Report-Msgid-Bugs-To: <popt-devel@rpm5.org>\n"
-"POT-Creation-Date: 2008-02-16 19:54-0500\n"
-"PO-Revision-Date: 2007-08-13 22:32+0800\n"
+"POT-Creation-Date: 2008-02-18 08:21-0500\n"
+"PO-Revision-Date: 2008-02-18 20:16+0800\n"
 "Last-Translator: LI Daobing <lidaobing@gmail.com>\n"
 "Language-Team: Chinese (simplified) <translation-team-zh-cn@lists."
 "sourceforge.net>\n"
@@ -22,9 +22,9 @@ msgid "unknown errno"
 msgstr "未知的错误"
 
 #: popt.c:1090
-#, fuzzy, c-format
+#, c-format
 msgid "option type (%u) not implemented in popt\n"
-msgstr "选项类别 (%d) 没有在 popt 中实现\n"
+msgstr "选项类别 (%u) 没有在 popt 中实现\n"
 
 #: popt.c:1294
 msgid "missing argument"
@@ -66,72 +66,70 @@ msgstr "内存分配错误"
 msgid "unknown error"
 msgstr "未知的错误"
 
-#: popthelp.c:74 popthelp.c:86
+#: popthelp.c:74 popthelp.c:85
 msgid "Show this help message"
 msgstr "显示这个帮助信息"
 
-#: popthelp.c:75 popthelp.c:87
+#: popthelp.c:75 popthelp.c:86
 msgid "Display brief usage message"
 msgstr "显示简短的使用说明"
 
-#: popthelp.c:76 popthelp.c:92
-#, fuzzy
-msgid "Terminate options"
-msgstr "帮助选项:"
-
-#: popthelp.c:90
+#: popthelp.c:89
 msgid "Display option defaults in message"
 msgstr "在信息中显示默认的选项"
 
-#: popthelp.c:191
+#: popthelp.c:91
+msgid "Terminate options"
+msgstr "终止选项"
+
+#: popthelp.c:190
 msgid "Help options:"
 msgstr "帮助选项:"
 
-#: popthelp.c:192
+#: popthelp.c:191
 msgid "Options implemented via popt alias/exec:"
 msgstr "通过 popt alias/exec 实现的选项:"
 
-#: popthelp.c:200
+#: popthelp.c:199
 msgid "NONE"
 msgstr "NONE"
 
-#: popthelp.c:202
+#: popthelp.c:201
 msgid "VAL"
 msgstr "VAL"
 
-#: popthelp.c:206
+#: popthelp.c:205
 msgid "INT"
 msgstr "INT"
 
-#: popthelp.c:207
+#: popthelp.c:206
 msgid "LONG"
 msgstr "LONG"
 
-#: popthelp.c:208
-#, fuzzy
+#: popthelp.c:207
 msgid "LONGLONG"
-msgstr "LONG"
+msgstr "LONGLONG"
 
-#: popthelp.c:209
+#: popthelp.c:208
 msgid "STRING"
 msgstr "STRING"
 
-#: popthelp.c:210
+#: popthelp.c:209
 msgid "FLOAT"
 msgstr "FLOAT"
 
-#: popthelp.c:211
+#: popthelp.c:210
 msgid "DOUBLE"
 msgstr "DOUBLE"
 
-#: popthelp.c:214
+#: popthelp.c:213
 msgid "ARG"
 msgstr "ARG"
 
-#: popthelp.c:634
+#: popthelp.c:633
 msgid "Usage:"
 msgstr "用法:"
 
-#: popthelp.c:658
+#: popthelp.c:657
 msgid "[OPTION...]"
 msgstr "[选项...]"
diff --git a/po/zh_TW.po b/po/zh_TW.po
index d420db6..5cdd879 100644
--- a/po/zh_TW.po
+++ b/po/zh_TW.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.11\n"
 "Report-Msgid-Bugs-To: <popt-devel@rpm5.org>\n"
-"POT-Creation-Date: 2008-02-16 19:54-0500\n"
+"POT-Creation-Date: 2008-02-18 08:21-0500\n"
 "PO-Revision-Date: 2005-04-08 17:52+0800\n"
 "Last-Translator: Wei-Lun Chao <chaoweilun@pcmail.com.tw>\n"
 "Language-Team: zh_TW <zh-l10n@linux.org.tw>\n"
@@ -63,71 +63,71 @@ msgstr "記憶體配置錯誤"
 msgid "unknown error"
 msgstr "未知的錯誤"
 
-#: popthelp.c:74 popthelp.c:86
+#: popthelp.c:74 popthelp.c:85
 msgid "Show this help message"
 msgstr "顯示本說明訊息"
 
-#: popthelp.c:75 popthelp.c:87
+#: popthelp.c:75 popthelp.c:86
 msgid "Display brief usage message"
 msgstr "顯示簡短的使用說明"
 
-#: popthelp.c:76 popthelp.c:92
-msgid "Terminate options"
-msgstr ""
-
-#: popthelp.c:90
+#: popthelp.c:89
 msgid "Display option defaults in message"
 msgstr "在訊息中顯示預設選項"
 
-#: popthelp.c:191
+#: popthelp.c:91
+msgid "Terminate options"
+msgstr ""
+
+#: popthelp.c:190
 msgid "Help options:"
 msgstr ""
 
-#: popthelp.c:192
+#: popthelp.c:191
 msgid "Options implemented via popt alias/exec:"
 msgstr ""
 
-#: popthelp.c:200
+#: popthelp.c:199
 msgid "NONE"
 msgstr "NONE"
 
-#: popthelp.c:202
+#: popthelp.c:201
 msgid "VAL"
 msgstr "VAL"
 
-#: popthelp.c:206
+#: popthelp.c:205
 msgid "INT"
 msgstr "INT"
 
-#: popthelp.c:207
+#: popthelp.c:206
 msgid "LONG"
 msgstr "LONG"
 
-#: popthelp.c:208
+#: popthelp.c:207
 #, fuzzy
 msgid "LONGLONG"
 msgstr "LONG"
 
-#: popthelp.c:209
+#: popthelp.c:208
 msgid "STRING"
 msgstr "STRING"
 
-#: popthelp.c:210
+#: popthelp.c:209
 msgid "FLOAT"
 msgstr "FLOAT"
 
-#: popthelp.c:211
+#: popthelp.c:210
 msgid "DOUBLE"
 msgstr "DOUBLE"
 
-#: popthelp.c:214
+#: popthelp.c:213
 msgid "ARG"
 msgstr "ARG"
 
-#: popthelp.c:634
+#: popthelp.c:633
 msgid "Usage:"
 msgstr "用法:"
 
-#: popthelp.c:658
+#: popthelp.c:657
 msgid "[OPTION...]"
 msgstr "[選項...]"
-- 
Gitee


From fd4d8cb3f7026284776bb98f0d200f10699fed00 Mon Sep 17 00:00:00 2001
From: Jeff Johnson <n3npq@mac.com>
Date: Mon, 18 Feb 2008 19:14:27 +0000
Subject: [PATCH 514/667] - rsc: avoid multilib file conflicts in generated
 doxygen.

---
 CHANGES                  | 1 +
 Doxyfile.in              | 2 +-
 footer_no_timestamp.html | 5 +++++
 3 files changed, 7 insertions(+), 1 deletion(-)
 create mode 100644 footer_no_timestamp.html

diff --git a/CHANGES b/CHANGES
index b25ee73..b13596b 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,4 +1,5 @@
 1.13 -> 1.14:
+    - rsc: avoid multilib file conflicts in generated doxygen.
     - jbj: updated vi.po and zh_CN.po (Translation Project).
     - jbj: fix: keep the poptHelpOptions array exactly the same size.
     - jbj: updated pl.po (Translation Project).
diff --git a/Doxyfile.in b/Doxyfile.in
index 9c521dd..21e045a 100644
--- a/Doxyfile.in
+++ b/Doxyfile.in
@@ -659,7 +659,7 @@ HTML_HEADER            =
 # each generated HTML page. If it is left blank doxygen will generate a 
 # standard footer.
 
-HTML_FOOTER            = 
+HTML_FOOTER            = footer_no_timestamp.html
 
 # The HTML_STYLESHEET tag can be used to specify a user-defined cascading 
 # style sheet that is used by each HTML page. It can be used to 
diff --git a/footer_no_timestamp.html b/footer_no_timestamp.html
new file mode 100644
index 0000000..d32d210
--- /dev/null
+++ b/footer_no_timestamp.html
@@ -0,0 +1,5 @@
+<hr size="1"><address style="text-align: right;"><small>Generated for $projectname by&nbsp;
+<a href="http://www.doxygen.org/index.html">
+<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> $doxygenversion </small></address>
+</body>
+</html>
-- 
Gitee


From 388bbd8eca9e4b5adf4de75bee9217167166c87f Mon Sep 17 00:00:00 2001
From: Jeff Johnson <n3npq@mac.com>
Date: Mon, 18 Feb 2008 19:23:29 +0000
Subject: [PATCH 515/667] - jbj: add footer_no_timestamp.html to EXTRA_DIST.

---
 Makefile.am | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/Makefile.am b/Makefile.am
index 5e9b192..27461d8 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -4,7 +4,8 @@ AUTOMAKE_OPTIONS = 1.4 foreign
 
 LINT = splint
 
-EXTRA_DIST = config.rpath autogen.sh CHANGES $(man_MANS) popt.spec libpopt.vers \
+EXTRA_DIST = config.rpath autogen.sh CHANGES $(man_MANS) popt.spec \
+	footer_no_timestamp.html libpopt.vers \
 	testit.sh test-poptrc test3-data/0* \
 	po/*.in po/*.po po/popt.pot \
 	popt.ps
-- 
Gitee


From 589174776e422f5b551fa8666a57f6b1f6c42639 Mon Sep 17 00:00:00 2001
From: Jeff Johnson <n3npq@mac.com>
Date: Tue, 19 Feb 2008 11:41:04 +0000
Subject: [PATCH 516/667] - jbj: updated th.po (Translation Project).

---
 CHANGES  |  1 +
 po/th.po | 14 ++++++--------
 2 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/CHANGES b/CHANGES
index b13596b..22c08dd 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,4 +1,5 @@
 1.13 -> 1.14:
+    - jbj: updated th.po (Translation Project).
     - rsc: avoid multilib file conflicts in generated doxygen.
     - jbj: updated vi.po and zh_CN.po (Translation Project).
     - jbj: fix: keep the poptHelpOptions array exactly the same size.
diff --git a/po/th.po b/po/th.po
index 95c6705..f2a1bc3 100644
--- a/po/th.po
+++ b/po/th.po
@@ -4,10 +4,10 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: popt 1.13\n"
+"Project-Id-Version: popt 1.14\n"
 "Report-Msgid-Bugs-To: <popt-devel@rpm5.org>\n"
 "POT-Creation-Date: 2008-02-18 08:21-0500\n"
-"PO-Revision-Date: 2008-01-06 20:09+0700\n"
+"PO-Revision-Date: 2008-02-19 15:53+0700\n"
 "Last-Translator: Seksan Poltree <seksan.poltree@gmail.com>\n"
 "Language-Team: Thai <translation-team-th@lists.sourceforge.net>\n"
 "MIME-Version: 1.0\n"
@@ -21,9 +21,9 @@ msgid "unknown errno"
 msgstr "เกิด errno ที่ไม่รู้จัก"
 
 #: popt.c:1090
-#, fuzzy, c-format
+#, c-format
 msgid "option type (%u) not implemented in popt\n"
-msgstr "ตัวเลือกชนิด (%d) ยังไม่ถูกอิมพลีเมนต์ใน popt\n"
+msgstr "ตัวเลือกชนิด (%u) ไม่ถูกอิมพลีเมนต์ใน popt\n"
 
 #: popt.c:1294
 msgid "missing argument"
@@ -78,9 +78,8 @@ msgid "Display option defaults in message"
 msgstr "แสดงตัวเลือกมาตรฐานในข้อความ"
 
 #: popthelp.c:91
-#, fuzzy
 msgid "Terminate options"
-msgstr "ตัวเลือกความช่วยเหลือ:"
+msgstr "ตัวเลือกการสิ้นสุด:"
 
 #: popthelp.c:190
 msgid "Help options:"
@@ -107,9 +106,8 @@ msgid "LONG"
 msgstr "LONG"
 
 #: popthelp.c:207
-#, fuzzy
 msgid "LONGLONG"
-msgstr "LONG"
+msgstr "LONGLONG"
 
 #: popthelp.c:208
 msgid "STRING"
-- 
Gitee


From 33ced67dc67fa5cee8252554c5a042297c18dfa4 Mon Sep 17 00:00:00 2001
From: Robert Scheck <robert@fedoraproject.org>
Date: Tue, 19 Feb 2008 20:07:37 +0000
Subject: [PATCH 517/667] Updated for popt 1.14

---
 po/de.po | 18 ++++++++----------
 1 file changed, 8 insertions(+), 10 deletions(-)

diff --git a/po/de.po b/po/de.po
index 848e09f..85b1c74 100644
--- a/po/de.po
+++ b/po/de.po
@@ -1,14 +1,14 @@
 # Translation of popt to German (Deutsch)
 # This file is distributed under the same license as the popt package.
-# Robert Scheck <rpm@robert-scheck.de>, 2004-2007.
+# Robert Scheck <robert@rpm5.org>, 2004-2008.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: popt 1.11\n"
+"Project-Id-Version: popt 1.14\n"
 "Report-Msgid-Bugs-To: <popt-devel@rpm5.org>\n"
 "POT-Creation-Date: 2008-02-18 08:21-0500\n"
-"PO-Revision-Date: 2007-02-17 21:00+0100\n"
-"Last-Translator: Robert Scheck <rpm@robert-scheck.de>\n"
+"PO-Revision-Date: 2008-02-19 21:07+0100\n"
+"Last-Translator: Robert Scheck <robert@rpm5.org>\n"
 "Language-Team: German <de@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -19,9 +19,9 @@ msgid "unknown errno"
 msgstr "Unbekannte Fehler-Nummer"
 
 #: popt.c:1090
-#, fuzzy, c-format
+#, c-format
 msgid "option type (%u) not implemented in popt\n"
-msgstr "Optionstyp (%d) ist in popt nicht vorhanden\n"
+msgstr "Optionstyp (%u) ist nicht in popt implementiert\n"
 
 #: popt.c:1294
 msgid "missing argument"
@@ -76,9 +76,8 @@ msgid "Display option defaults in message"
 msgstr "Zeigt die Standardeinstellungen an"
 
 #: popthelp.c:91
-#, fuzzy
 msgid "Terminate options"
-msgstr "Hilfe-Optionen:"
+msgstr "Schließt die Optionen ab"
 
 #: popthelp.c:190
 msgid "Help options:"
@@ -105,9 +104,8 @@ msgid "LONG"
 msgstr "LONG"
 
 #: popthelp.c:207
-#, fuzzy
 msgid "LONGLONG"
-msgstr "LONG"
+msgstr "LONGLONG"
 
 #: popthelp.c:208
 msgid "STRING"
-- 
Gitee


From c649dfa6d6ee0393bcff090f929daf186452c51b Mon Sep 17 00:00:00 2001
From: Jeff Johnson <n3npq@mac.com>
Date: Thu, 21 Feb 2008 16:46:43 +0000
Subject: [PATCH 518/667] - jbj: updated {fi,nl}.po (Translation Project).

---
 CHANGES  |  1 +
 po/fi.po | 17 ++++++++---------
 po/nl.po | 17 +++++++----------
 3 files changed, 16 insertions(+), 19 deletions(-)

diff --git a/CHANGES b/CHANGES
index 22c08dd..66acb35 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,4 +1,5 @@
 1.13 -> 1.14:
+    - jbj: updated {fi,nl}.po (Translation Project).
     - jbj: updated th.po (Translation Project).
     - rsc: avoid multilib file conflicts in generated doxygen.
     - jbj: updated vi.po and zh_CN.po (Translation Project).
diff --git a/po/fi.po b/po/fi.po
index a237b98..259a009 100644
--- a/po/fi.po
+++ b/po/fi.po
@@ -1,4 +1,4 @@
-# translation of popt-1.13.pot to Finnish
+# translation of popt-1.14.pot to Finnish
 # Copyright © 2008 Free Software Foundation, Inc.
 # This file is distributed under the same license as the popt package.
 # This file is put in the public domain.
@@ -6,15 +6,16 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: popt 1.13\n"
+"Project-Id-Version: popt 1.14\n"
 "Report-Msgid-Bugs-To: <popt-devel@rpm5.org>\n"
 "POT-Creation-Date: 2008-02-18 08:21-0500\n"
-"PO-Revision-Date: 2008-01-06 19:42+0200\n"
+"PO-Revision-Date: 2008-02-21 18:19+0200\n"
 "Last-Translator: Jorma Karvonen <karvjorm@users.sf.net>\n"
 "Language-Team: Finnish <translation-team-fi@lists.sourceforge.net>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 "X-Generator: KBabel 1.11.4\n"
 
 #  errno - number of last error (defined by the ISO C standard)
@@ -23,9 +24,9 @@ msgid "unknown errno"
 msgstr "tuntematon errno-virhenumeroarvo"
 
 #: popt.c:1090
-#, fuzzy, c-format
+#, c-format
 msgid "option type (%u) not implemented in popt\n"
-msgstr "valitsintyyppiä (%d) ei ole toteutettu popt-ohjelmassa\n"
+msgstr "valitsintyyppiä (%u) ei ole toteutettu popt-ohjelmassa\n"
 
 #: popt.c:1294
 msgid "missing argument"
@@ -80,9 +81,8 @@ msgid "Display option defaults in message"
 msgstr "Näytä valitsinoletukset ohjeessa"
 
 #: popthelp.c:91
-#, fuzzy
 msgid "Terminate options"
-msgstr "Ohjevalitsimet:"
+msgstr "Lopettamisvalitsimet"
 
 #: popthelp.c:190
 msgid "Help options:"
@@ -111,9 +111,8 @@ msgid "LONG"
 msgstr "LONG-KOKONAISLUKU"
 
 #: popthelp.c:207
-#, fuzzy
 msgid "LONGLONG"
-msgstr "LONG-KOKONAISLUKU"
+msgstr "LONGLONG-KOKONAISLUKU"
 
 #: popthelp.c:208
 msgid "STRING"
diff --git a/po/nl.po b/po/nl.po
index bb23dbf..1c97784 100644
--- a/po/nl.po
+++ b/po/nl.po
@@ -1,13 +1,13 @@
 # Dutch messages for popt.
 # This file is put in the public domain.
-# Tim Van Holder <tim.van.holder@telenet.be>, 2007.
+# Tim Van Holder <tim.van.holder@telenet.be>, 2007, 2008.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: popt 1.12\n"
+"Project-Id-Version: popt 1.14\n"
 "Report-Msgid-Bugs-To: <popt-devel@rpm5.org>\n"
 "POT-Creation-Date: 2008-02-18 08:21-0500\n"
-"PO-Revision-Date: 2007-12-29 16:14+0100\n"
+"PO-Revision-Date: 2008-02-20 19:26+0100\n"
 "Last-Translator: Tim Van Holder <tim.van.holder@telenet.be>\n"
 "Language-Team: Dutch <vertaling@vrijschrift.org>\n"
 "MIME-Version: 1.0\n"
@@ -19,9 +19,9 @@ msgid "unknown errno"
 msgstr "onbekend foutnummer (errno)"
 
 #: popt.c:1090
-#, fuzzy, c-format
+#, c-format
 msgid "option type (%u) not implemented in popt\n"
-msgstr "dit optietype (%d) is niet geïmplementeerd in popt\n"
+msgstr "dit optietype (%u) is niet geïmplementeerd in popt\n"
 
 #: popt.c:1294
 msgid "missing argument"
@@ -76,11 +76,9 @@ msgstr "Een korte gebruikssamenvatting tonen"
 msgid "Display option defaults in message"
 msgstr "De standaardwaarden van opties tonen in de tekst"
 
-# of "Help-opties:"?
 #: popthelp.c:91
-#, fuzzy
 msgid "Terminate options"
-msgstr "Hulp-opties:"
+msgstr "Opties beëindigen"
 
 # of "Help-opties:"?
 #: popthelp.c:190
@@ -108,9 +106,8 @@ msgid "LONG"
 msgstr "LONG"
 
 #: popthelp.c:207
-#, fuzzy
 msgid "LONGLONG"
-msgstr "LONG"
+msgstr "LONGLONG"
 
 # TEKENREEKS lijkt me niet gepast; dus ofwel STRING behouden, ofwel TEKST
 #: popthelp.c:208
-- 
Gitee


From 3cd3241b6b00dbb69d98e169db6afb56637b226a Mon Sep 17 00:00:00 2001
From: Jeff Johnson <n3npq@mac.com>
Date: Sun, 24 Feb 2008 04:41:51 +0000
Subject: [PATCH 519/667] - jbj: updated sv.po (Translation Project).

---
 CHANGES  |  1 +
 po/de.po | 18 ++++++++++--------
 po/sv.po | 16 +++++++---------
 3 files changed, 18 insertions(+), 17 deletions(-)

diff --git a/CHANGES b/CHANGES
index 66acb35..2c0d26d 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,4 +1,5 @@
 1.13 -> 1.14:
+    - jbj: updated sv.po (Translation Project).
     - jbj: updated {fi,nl}.po (Translation Project).
     - jbj: updated th.po (Translation Project).
     - rsc: avoid multilib file conflicts in generated doxygen.
diff --git a/po/de.po b/po/de.po
index 85b1c74..848e09f 100644
--- a/po/de.po
+++ b/po/de.po
@@ -1,14 +1,14 @@
 # Translation of popt to German (Deutsch)
 # This file is distributed under the same license as the popt package.
-# Robert Scheck <robert@rpm5.org>, 2004-2008.
+# Robert Scheck <rpm@robert-scheck.de>, 2004-2007.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: popt 1.14\n"
+"Project-Id-Version: popt 1.11\n"
 "Report-Msgid-Bugs-To: <popt-devel@rpm5.org>\n"
 "POT-Creation-Date: 2008-02-18 08:21-0500\n"
-"PO-Revision-Date: 2008-02-19 21:07+0100\n"
-"Last-Translator: Robert Scheck <robert@rpm5.org>\n"
+"PO-Revision-Date: 2007-02-17 21:00+0100\n"
+"Last-Translator: Robert Scheck <rpm@robert-scheck.de>\n"
 "Language-Team: German <de@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -19,9 +19,9 @@ msgid "unknown errno"
 msgstr "Unbekannte Fehler-Nummer"
 
 #: popt.c:1090
-#, c-format
+#, fuzzy, c-format
 msgid "option type (%u) not implemented in popt\n"
-msgstr "Optionstyp (%u) ist nicht in popt implementiert\n"
+msgstr "Optionstyp (%d) ist in popt nicht vorhanden\n"
 
 #: popt.c:1294
 msgid "missing argument"
@@ -76,8 +76,9 @@ msgid "Display option defaults in message"
 msgstr "Zeigt die Standardeinstellungen an"
 
 #: popthelp.c:91
+#, fuzzy
 msgid "Terminate options"
-msgstr "Schließt die Optionen ab"
+msgstr "Hilfe-Optionen:"
 
 #: popthelp.c:190
 msgid "Help options:"
@@ -104,8 +105,9 @@ msgid "LONG"
 msgstr "LONG"
 
 #: popthelp.c:207
+#, fuzzy
 msgid "LONGLONG"
-msgstr "LONGLONG"
+msgstr "LONG"
 
 #: popthelp.c:208
 msgid "STRING"
diff --git a/po/sv.po b/po/sv.po
index 59387b8..2f955e2 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -3,14 +3,14 @@
 # This file is distributed under the same license as the popt package.
 # G�ran Uddeborg <goeran@uddeborg.se>, 2008.
 #
-# $Revision: 1.2 $
+# $Revision: 1.4 $
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: popt 1.13\n"
+"Project-Id-Version: popt 1.14\n"
 "Report-Msgid-Bugs-To: <popt-devel@rpm5.org>\n"
 "POT-Creation-Date: 2008-02-18 08:21-0500\n"
-"PO-Revision-Date: 2008-01-30 22:22+0100\n"
+"PO-Revision-Date: 2008-02-23 20:15+0100\n"
 "Last-Translator: G�ran Uddeborg <goeran@uddeborg.se>\n"
 "Language-Team: Swedish <tp-sv@listor.tp-sv.se>\n"
 "MIME-Version: 1.0\n"
@@ -22,9 +22,9 @@ msgid "unknown errno"
 msgstr "ok�nt felnummer"
 
 #: popt.c:1090
-#, fuzzy, c-format
+#, c-format
 msgid "option type (%u) not implemented in popt\n"
-msgstr "flaggtypen (%d) �r inte implementerad i popt\n"
+msgstr "flaggtypen (%u) �r inte implementerad i popt\n"
 
 #: popt.c:1294
 msgid "missing argument"
@@ -79,9 +79,8 @@ msgid "Display option defaults in message"
 msgstr "Visa standardalternativ f�r flaggor i meddelande"
 
 #: popthelp.c:91
-#, fuzzy
 msgid "Terminate options"
-msgstr "Hj�lpflaggor:"
+msgstr "Avsluta flaggor"
 
 #: popthelp.c:190
 msgid "Help options:"
@@ -108,9 +107,8 @@ msgid "LONG"
 msgstr "L�NG"
 
 #: popthelp.c:207
-#, fuzzy
 msgid "LONGLONG"
-msgstr "L�NG"
+msgstr "L�NGL�NG"
 
 #: popthelp.c:208
 msgid "STRING"
-- 
Gitee


From 27966e9c6377af5d66b02aea38a1ea564817b243 Mon Sep 17 00:00:00 2001
From: Jeff Johnson <n3npq@mac.com>
Date: Sat, 8 Mar 2008 03:40:35 +0000
Subject: [PATCH 520/667] - jbj: don't display hidden short options with
 --usage.

---
 CHANGES    | 1 +
 popthelp.c | 3 ++-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/CHANGES b/CHANGES
index 2c0d26d..4ccc5df 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,4 +1,5 @@
 1.13 -> 1.14:
+    - jbj: don't display hidden short options with --usage.
     - jbj: updated sv.po (Translation Project).
     - jbj: updated {fi,nl}.po (Translation Project).
     - jbj: updated th.po (Translation Project).
diff --git a/popthelp.c b/popthelp.c
index e1152d6..a1e0c13 100644
--- a/popthelp.c
+++ b/popthelp.c
@@ -843,7 +843,8 @@ static size_t showShortOptions(const struct poptOption * opt, FILE * fp,
 
     if (opt != NULL)
     for (; (opt->longName || opt->shortName || opt->arg); opt++) {
-	if (opt->shortName && !poptArgType(opt)) {
+	if (!F_ISSET(opt, DOC_HIDDEN) && opt->shortName && !poptArgType(opt))
+	{
 	    /* Display shortName iff printable non-space. */
 	    if (isprint((int)opt->shortName) && opt->shortName != ' ')
 		s[strlen(s)] = opt->shortName;
-- 
Gitee


From 3e999048318ec837d44a497defa59e142e3f5377 Mon Sep 17 00:00:00 2001
From: Jeff Johnson <n3npq@mac.com>
Date: Sat, 8 Mar 2008 03:47:53 +0000
Subject: [PATCH 521/667] - jbj: make sure that short options are printed only
 once with --usage.

---
 CHANGES    | 1 +
 popthelp.c | 5 +++--
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/CHANGES b/CHANGES
index 4ccc5df..3ecd969 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,4 +1,5 @@
 1.13 -> 1.14:
+    - jbj: make sure that short options are printed only once with --usage.
     - jbj: don't display hidden short options with --usage.
     - jbj: updated sv.po (Translation Project).
     - jbj: updated {fi,nl}.po (Translation Project).
diff --git a/popthelp.c b/popthelp.c
index a1e0c13..0de5e6a 100644
--- a/popthelp.c
+++ b/popthelp.c
@@ -845,8 +845,9 @@ static size_t showShortOptions(const struct poptOption * opt, FILE * fp,
     for (; (opt->longName || opt->shortName || opt->arg); opt++) {
 	if (!F_ISSET(opt, DOC_HIDDEN) && opt->shortName && !poptArgType(opt))
 	{
-	    /* Display shortName iff printable non-space. */
-	    if (isprint((int)opt->shortName) && opt->shortName != ' ')
+	    /* Display shortName iff unique printable non-space. */
+	    if (!strchr(s, opt->shortName) && isprint((int)opt->shortName)
+	     && opt->shortName != ' ')
 		s[strlen(s)] = opt->shortName;
 	} else if (poptArgType(opt) == POPT_ARG_INCLUDE_TABLE)
 	    if (opt->arg)	/* XXX program error */
-- 
Gitee


From 3dfe5de030d4eb91092bddb978655fb956a9d969 Mon Sep 17 00:00:00 2001
From: Jeff Johnson <n3npq@mac.com>
Date: Sat, 8 Mar 2008 17:26:30 +0000
Subject: [PATCH 522/667] - jbj: test for <glob.h>, disable reading directory
 poptrc files if not. - jbj: add __attribute__(__unused__) (Wayne
 Davidson<wayned@samba.org>). - jbj: permit equal after short option (Wayne
 Davidson<wayned@samba.org>).

---
 CHANGES      | 3 +++
 configure.ac | 4 ++--
 popt.c       | 9 ++++++---
 poptconfig.c | 9 +++++++--
 popthelp.c   | 9 +++++----
 poptparse.c  | 3 ++-
 system.h     | 5 +++++
 test1.c      | 4 ++--
 8 files changed, 32 insertions(+), 14 deletions(-)

diff --git a/CHANGES b/CHANGES
index 3ecd969..c345ed3 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,4 +1,7 @@
 1.13 -> 1.14:
+    - jbj: test for <glob.h>, disable reading directory poptrc files if not.
+    - jbj: add __attribute__(__unused__) (Wayne Davidson<wayned@samba.org>).
+    - jbj: permit equal after short option (Wayne Davidson<wayned@samba.org>).
     - jbj: make sure that short options are printed only once with --usage.
     - jbj: don't display hidden short options with --usage.
     - jbj: updated sv.po (Translation Project).
diff --git a/configure.ac b/configure.ac
index f027c93..5bfda5b 100755
--- a/configure.ac
+++ b/configure.ac
@@ -21,7 +21,7 @@ AC_PROG_INSTALL
 AC_PROG_LIBTOOL
 
 if test "X$CC" = Xgcc; then
-    CFLAGS="-Wall $CFLAGS"
+    CFLAGS="-Wall -W $CFLAGS"
 fi
 
 AC_GCC_TRADITIONAL
@@ -59,7 +59,7 @@ else
 fi
 AC_SUBST(TARGET)
 
-AC_CHECK_HEADERS(float.h libintl.h mcheck.h unistd.h langinfo.h)
+AC_CHECK_HEADERS(float.h glob.h libintl.h mcheck.h unistd.h langinfo.h)
 
 # For some systems we know that we have ld_version scripts.
 # Use it then as default.
diff --git a/popt.c b/popt.c
index 2883770..d7d9e23 100644
--- a/popt.c
+++ b/popt.c
@@ -644,8 +644,8 @@ static void poptStripArg(/*@special@*/ poptContext con, int which)
 /*@=compdef@*/
 }
 
-int poptSaveString(const char *** argvp, /*@unused@*/ unsigned int argInfo,
-		const char * val)
+int poptSaveString(const char *** argvp,
+		/*@unused@*/ UNUSED(unsigned int argInfo), const char * val)
 {
     poptArgv argv;
     int argc = 0;
@@ -937,6 +937,9 @@ int poptGetNextOpt(poptContext con)
 	    origOptString++;
 	    if (*origOptString != '\0')
 		con->os->nextCharArg = origOptString;
+#ifdef	NOTYET	/* XXX causes test 9 failure. */
+		con->os->nextCharArg = origOptString + (*origOptString == '=');
+#endif
 	}
 
 	if (opt == NULL) return POPT_ERROR_BADOPT;	/* XXX can't happen */
@@ -1217,7 +1220,7 @@ poptContext poptFreeContext(poptContext con)
 }
 
 int poptAddAlias(poptContext con, struct poptAlias alias,
-		/*@unused@*/ int flags)
+		/*@unused@*/ UNUSED(int flags))
 {
     struct poptItem_s item_buf;
     poptItem item = &item_buf;
diff --git a/poptconfig.c b/poptconfig.c
index e81bf68..aef4082 100644
--- a/poptconfig.c
+++ b/poptconfig.c
@@ -9,7 +9,10 @@
 #include "system.h"
 #include "poptint.h"
 #include <sys/stat.h>
+#if defined(HAVE_GLOB_H)
 #include <glob.h>
+#endif
+
 /*@access poptContext @*/
 
 /*@-compmempass@*/	/* FIX: item->option.longName kept, not dependent. */
@@ -170,7 +173,7 @@ int poptReadConfigFile(poptContext con, const char * fn)
     return 0;
 }
 
-int poptReadDefaultConfig(poptContext con, /*@unused@*/ int useEnv)
+int poptReadDefaultConfig(poptContext con, /*@unused@*/ UNUSED(int useEnv))
 {
     static const char _popt_sysconfdir[] = POPT_SYSCONFDIR "/popt";
     static const char _popt_etc[] = "/etc/popt";
@@ -188,11 +191,12 @@ int poptReadDefaultConfig(poptContext con, /*@unused@*/ int useEnv)
     rc = poptReadConfigFile(con, _popt_etc);
     if (rc) return rc;
 
+#if defined(HAVE_GLOB_H)
     if (!stat("/etc/popt.d", &s) && S_ISDIR(s.st_mode)) {
         glob_t g;
 /*@-moduncon -nullpass -type @*/ /* FIX: annotations for glob/globfree */
 	if (!glob("/etc/popt.d/*", 0, NULL, &g)) {
-            int i;
+            unsigned i;
 	    for (i=0; i<g.gl_pathc; i++) {
 		char *f=g.gl_pathv[i];
 		if (strstr(f, ".rpmnew") || strstr(f, ".rpmsave"))
@@ -210,6 +214,7 @@ int poptReadDefaultConfig(poptContext con, /*@unused@*/ int useEnv)
 	}
 /*@=moduncon =nullpass =type @*/
     }
+#endif
 
     if ((home = getenv("HOME"))) {
 	fn = malloc(strlen(home) + 20);
diff --git a/popthelp.c b/popthelp.c
index 0de5e6a..bd64d2c 100644
--- a/popthelp.c
+++ b/popthelp.c
@@ -34,9 +34,10 @@
  */
 /*@exits@*/
 static void displayArgs(poptContext con,
-		/*@unused@*/ enum poptCallbackReason foo,
+		/*@unused@*/ UNUSED(enum poptCallbackReason foo),
 		struct poptOption * key, 
-		/*@unused@*/ const char * arg, /*@unused@*/ void * data)
+		/*@unused@*/ UNUSED(const char * arg),
+		/*@unused@*/ UNUSED(void * data))
 	/*@globals fileSystem@*/
 	/*@modifies fileSystem@*/
 {
@@ -645,7 +646,7 @@ static size_t showHelpIntro(poptContext con, FILE * fp)
     return len;
 }
 
-void poptPrintHelp(poptContext con, FILE * fp, /*@unused@*/ int flags)
+void poptPrintHelp(poptContext con, FILE * fp, /*@unused@*/ UNUSED(int flags))
 {
     columns_t columns = calloc((size_t)1, sizeof(*columns));
     int xx;
@@ -866,7 +867,7 @@ static size_t showShortOptions(const struct poptOption * opt, FILE * fp,
     return len;
 }
 
-void poptPrintUsage(poptContext con, FILE * fp, /*@unused@*/ int flags)
+void poptPrintUsage(poptContext con, FILE * fp, /*@unused@*/ UNUSED(int flags))
 {
     columns_t columns = calloc((size_t)1, sizeof(*columns));
     struct poptDone_s done_buf;
diff --git a/poptparse.c b/poptparse.c
index eaf8427..f203743 100644
--- a/poptparse.c
+++ b/poptparse.c
@@ -126,7 +126,8 @@ exit:
  * 2== line to long
  * 3== umm.... more?
  */
-int poptConfigFileToString(FILE *fp, char ** argstrp, /*@unused@*/ int flags)
+int poptConfigFileToString(FILE *fp, char ** argstrp,
+		/*@unused@*/ UNUSED(int flags))
 {
     char line[999];
     char * argstr;
diff --git a/system.h b/system.h
index 68a5c2a..9ed5a09 100644
--- a/system.h
+++ b/system.h
@@ -82,4 +82,9 @@ char * xstrdup (const char *str)
 #define	getenv(_s)	__secure_getenv(_s)
 #endif
 
+#ifndef __GNUC__
+#define __attribute__(x) 
+#endif
+#define UNUSED(x) x __attribute__((__unused__))
+
 #include "popt.h"
diff --git a/test1.c b/test1.c
index 7473040..24e7371 100644
--- a/test1.c
+++ b/test1.c
@@ -6,8 +6,8 @@
 
 /*@unchecked@*/
 static int pass2 = 0;
-static void option_callback(/*@unused@*/ poptContext con,
-		/*@unused@*/ enum poptCallbackReason reason,
+static void option_callback(/*@unused@*/ UNUSED(poptContext con),
+		/*@unused@*/ UNUSED(enum poptCallbackReason reason),
 		const struct poptOption * opt,
 		char * arg, void * data)
 	/*@globals fileSystem @*/
-- 
Gitee


From 7663ef59c7243b62e18fe0501b7877d3c7067157 Mon Sep 17 00:00:00 2001
From: Jeff Johnson <n3npq@mac.com>
Date: Sat, 8 Mar 2008 21:52:10 +0000
Subject: [PATCH 523/667] - jbj: Davison, not Davidson.

---
 CHANGES | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/CHANGES b/CHANGES
index c345ed3..da17f75 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,7 +1,7 @@
 1.13 -> 1.14:
     - jbj: test for <glob.h>, disable reading directory poptrc files if not.
-    - jbj: add __attribute__(__unused__) (Wayne Davidson<wayned@samba.org>).
-    - jbj: permit equal after short option (Wayne Davidson<wayned@samba.org>).
+    - jbj: add __attribute__(__unused__) (Wayne Davison<wayned@samba.org>).
+    - jbj: permit equal after short option (Wayne Davison<wayned@samba.org>).
     - jbj: make sure that short options are printed only once with --usage.
     - jbj: don't display hidden short options with --usage.
     - jbj: updated sv.po (Translation Project).
-- 
Gitee


From ffa18fbe1503e17e639cfc2be4f2d0a30802af63 Mon Sep 17 00:00:00 2001
From: Jeff Johnson <n3npq@mac.com>
Date: Sat, 8 Mar 2008 23:11:56 +0000
Subject: [PATCH 524/667] - jbj: add tests for -c=foo, but commented out for
 now.

---
 testit.sh | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/testit.sh b/testit.sh
index da8dafa..fb51c6b 100755
--- a/testit.sh
+++ b/testit.sh
@@ -101,6 +101,9 @@ run test1 "test1 - 45" "arg1: 0 arg2: (none) oStr: ping rest: pong" --optional=p
 run test1 "test1 - 46" "arg1: 0 arg2: (none) oStr: ping rest: pong" --optional ping pong
 run test1 "test1 - 47" "arg1: 0 arg2: (none) aArgv: A B rest: C" --argv A --argv B C
 
+#run test1 "test1 - 48" "arg1: 0 arg2: foo=bar" -2foo=bar
+#run test1 "test1 - 49" "arg1: 0 arg2: foo=bar" -2=foo=bar
+
 #run_diff test3 "test3 - 51" test3-data/01.input test3-data/01.answer
 #run_diff test3 "test3 - 52" test3-data/02.input test3-data/02.answer
 #run_diff test3 "test3 - 53" test3-data/03.input test3-data/03.answer
-- 
Gitee


From e4924f6243752f846eb3935ff949fd4600583830 Mon Sep 17 00:00:00 2001
From: Jeff Johnson <n3npq@mac.com>
Date: Sun, 9 Mar 2008 05:51:16 +0000
Subject: [PATCH 525/667] - jbj: rename _ABS to avoid collisions, define
 DBL_EPSILON if not present 	(Wayne Davison<wayned@samba.org>).

---
 CHANGES | 2 ++
 popt.c  | 9 ++++++---
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/CHANGES b/CHANGES
index da17f75..9068d99 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,4 +1,6 @@
 1.13 -> 1.14:
+    - jbj: rename _ABS to avoid collisions, define DBL_EPSILON if not present
+	(Wayne Davison<wayned@samba.org>).
     - jbj: test for <glob.h>, disable reading directory poptrc files if not.
     - jbj: add __attribute__(__unused__) (Wayne Davison<wayned@samba.org>).
     - jbj: permit equal after short option (Wayne Davison<wayned@samba.org>).
diff --git a/popt.c b/popt.c
index d7d9e23..1f1b48f 100644
--- a/popt.c
+++ b/popt.c
@@ -1075,10 +1075,13 @@ int poptGetNextOpt(poptContext con)
 		    if (poptArgType(opt) == POPT_ARG_DOUBLE) {
 			arg.doublep[0] = aDouble;
 		    } else {
-#define _ABS(a)	((((a) - 0.0) < DBL_EPSILON) ? -(a) : (a))
-			if ((_ABS(aDouble) - FLT_MAX) > DBL_EPSILON)
+#ifndef DBL_EPSILON
+#define DBL_EPSILON 2.2204460492503131e-16
+#endif
+#define POPT_ABS(a)	((((a) - 0.0) < DBL_EPSILON) ? -(a) : (a))
+			if ((POPT_ABS(aDouble) - FLT_MAX) > DBL_EPSILON)
 			    return POPT_ERROR_OVERFLOW;
-			if ((FLT_MIN - _ABS(aDouble)) > DBL_EPSILON)
+			if ((FLT_MIN - POPT_ABS(aDouble)) > DBL_EPSILON)
 			    return POPT_ERROR_OVERFLOW;
 			arg.floatp[0] = (float) aDouble;
 		    }
-- 
Gitee


From ca8747e0d74e0d50445c4badf407a3ba1ac345e6 Mon Sep 17 00:00:00 2001
From: Jeff Johnson <n3npq@mac.com>
Date: Sun, 9 Mar 2008 06:01:05 +0000
Subject: [PATCH 526/667] - jbj: fix: short option with "foo=bar" argument was
 mishandled. 	(Wayne Davison<wayned@samba.org>).

---
 CHANGES | 2 ++
 popt.c  | 1 +
 2 files changed, 3 insertions(+)

diff --git a/CHANGES b/CHANGES
index 9068d99..b533865 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,4 +1,6 @@
 1.13 -> 1.14:
+    - jbj: fix: short option with "foo=bar" argument was mishandled.
+	(Wayne Davison<wayned@samba.org>).
     - jbj: rename _ABS to avoid collisions, define DBL_EPSILON if not present
 	(Wayne Davison<wayned@samba.org>).
     - jbj: test for <glob.h>, disable reading directory poptrc files if not.
diff --git a/popt.c b/popt.c
index 1f1b48f..5c28a8d 100644
--- a/popt.c
+++ b/popt.c
@@ -901,6 +901,7 @@ int poptGetNextOpt(poptContext con)
 
 	    if (!opt) {
 		con->os->nextCharArg = origOptString + 1;
+		longArg = NULL;
 	    } else {
 		if (con->os == con->optionStack && F_ISSET(opt, STRIP))
 		{
-- 
Gitee


From 7a42a9a9d51feb4240f984e0db7198537f2d87c5 Mon Sep 17 00:00:00 2001
From: "Ralf S. Engelschall" <rse@engelschall.com>
Date: Sun, 9 Mar 2008 07:14:06 +0000
Subject: [PATCH 527/667] Fix memcpy(3) based va_copy(3) fallbacks

---
 CHANGES      | 1 +
 acinclude.m4 | 4 ++--
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/CHANGES b/CHANGES
index b533865..0a34193 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,4 +1,5 @@
 1.13 -> 1.14:
+    - rse: fix memcpy(3) based va_copy(3) fallbacks
     - jbj: fix: short option with "foo=bar" argument was mishandled.
 	(Wayne Davison<wayned@samba.org>).
     - jbj: rename _ABS to avoid collisions, define DBL_EPSILON if not present
diff --git a/acinclude.m4 b/acinclude.m4
index cebdf72..0b5ebf2 100644
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -82,9 +82,9 @@ AC_DEFUN([AC_CHECK_VA_COPY],[
     dnl #   6. check for assignment approach (assuming va_list is a pointer)
     __va_copy_check(ASP, [do { *(d) = *(s); } while (0)])
     dnl #   7. check for memory copying approach (assuming va_list is a struct)
-    __va_copy_check(CPS, [memcpy((void *)&(d), (void *)&(s)), sizeof((s))])
+    __va_copy_check(CPS, [memcpy((void *)&(d), (void *)&(s), sizeof((s)))])
     dnl #   8. check for memory copying approach (assuming va_list is a pointer)
-    __va_copy_check(CPP, [memcpy((void *)(d), (void *)(s)), sizeof(*(s))])
+    __va_copy_check(CPP, [memcpy((void *)(d), (void *)(s), sizeof(*(s)))])
     if test ".$ac_cv_va_copy" = .; then
         AC_ERROR([no working implementation found])
     fi
-- 
Gitee


From c329d39bcb5008aee68f451ae353516415849a52 Mon Sep 17 00:00:00 2001
From: Jeff Johnson <n3npq@mac.com>
Date: Sun, 9 Mar 2008 20:24:45 +0000
Subject: [PATCH 528/667] - jbj: study the mess with splint, remove annotations
 where possible. - jbj: add -D_GNU_SOURCE for gcc to use __builtin_stpcpy when
 available. - jbj: add static inline stpcpy for the deprived. - jbj: use
 stpcpy to eliminate sprintf calls everywhere but popthelp.c - jbj: remove
 (now unneeded afaik) va_copy() from POPT_fprintf(). - jbj: inline
 strdup_fprintf() => POPT_fprintf keeping (unneeded?) va_copy.

---
 .splintrc    |   6 +--
 CHANGES      |   6 +++
 configure.ac |  43 +++++----------------
 findme.c     |   3 +-
 popt.c       | 107 +++++++++++++++++++++++++--------------------------
 popt.h       |   3 +-
 poptconfig.c |  53 +++++++++++++------------
 poptint.c    |  81 +++++++++++++++-----------------------
 poptint.h    |   3 +-
 poptparse.c  |   4 +-
 system.h     |  15 +++++++-
 11 files changed, 153 insertions(+), 171 deletions(-)

diff --git a/.splintrc b/.splintrc
index 9dd8a71..431c99a 100644
--- a/.splintrc
+++ b/.splintrc
@@ -14,7 +14,6 @@
 # --- in progress
 #+bounds
 -bufferoverflowhigh
-
 -branchstate
 
 # --- +partial artifacts
@@ -35,8 +34,7 @@
 # --- not-yet at checks level
 -mustfree		# 38
 -predboolptr		# 82
--usedef			# 7
 
 # --- not-yet at standard level
--boolops		# 127
--predboolint		# 42
+-boolops		# 124
+-predboolint		# 53
diff --git a/CHANGES b/CHANGES
index 0a34193..c826bba 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,4 +1,10 @@
 1.13 -> 1.14:
+    - jbj: study the mess with splint, remove annotations where possible.
+    - jbj: add -D_GNU_SOURCE for gcc to use __builtin_stpcpy when available.
+    - jbj: add static inline stpcpy for the deprived.
+    - jbj: use stpcpy to eliminate sprintf calls everywhere but popthelp.c
+    - jbj: remove (now unneeded afaik) va_copy() from POPT_fprintf().
+    - jbj: inline strdup_fprintf() => POPT_fprintf keeping (unneeded?) va_copy.
     - rse: fix memcpy(3) based va_copy(3) fallbacks
     - jbj: fix: short option with "foo=bar" argument was mishandled.
 	(Wayne Davison<wayned@samba.org>).
diff --git a/configure.ac b/configure.ac
index 5bfda5b..71bcea5 100755
--- a/configure.ac
+++ b/configure.ac
@@ -20,34 +20,13 @@ AC_PROG_CC
 AC_PROG_INSTALL
 AC_PROG_LIBTOOL
 
-if test "X$CC" = Xgcc; then
-    CFLAGS="-Wall -W $CFLAGS"
-fi
-
-AC_GCC_TRADITIONAL
-AC_SYS_LARGEFILE
-
-AC_ISC_POSIX
-AM_C_PROTOTYPES
-AC_CHECK_VA_COPY
-
-dnl XXX lose rpm libs
-LIBS=
-addlib() {
-  l=$1
-  shift
-  case "$target" in 
-    *-*-solaris*)	LIBS="$LIBS -L$l -R $l $*";;
-    *)		LIBS="$LIBS -L$l $*";;
-  esac
-}
-
 dnl
 dnl if CC is gcc, we can rebuild the dependencies (since the depend rule
 dnl requires gcc).  If it's not, don't rebuild dependencies -- use what was
 dnl shipped with RPM.
 dnl
 if test X"$GCC" = "Xyes" ; then
+    CFLAGS="-Wall -W -D_GNU_SOURCE -D_REENTRANT $CFLAGS"
     TARGET="depend allprogs"
 else
     TARGET="everything"
@@ -59,7 +38,14 @@ else
 fi
 AC_SUBST(TARGET)
 
-AC_CHECK_HEADERS(float.h glob.h libintl.h mcheck.h unistd.h langinfo.h)
+AC_GCC_TRADITIONAL
+AC_SYS_LARGEFILE
+
+AC_ISC_POSIX
+AM_C_PROTOTYPES
+AC_CHECK_VA_COPY
+
+AC_CHECK_HEADERS(float.h glob.h langinfo.h libintl.h mcheck.h unistd.h)
 
 # For some systems we know that we have ld_version scripts.
 # Use it then as default.
@@ -80,19 +66,10 @@ AC_ARG_ENABLE([ld-version-script],
               [ : ] )
 AM_CONDITIONAL(HAVE_LD_VERSION_SCRIPT, test "$have_ld_version_script" = "yes")
 
-if test ! -f ../rpm.c
-then
-  AC_MSG_CHECKING(for GNU xgettext)
-  xgettext --version 2>&1 | grep 'GNU gettext' >/dev/null 2>&1 || AC_MSG_ERROR([
-  *** GNU gettext is required. The latest version
-  *** is always available from ftp://ftp.gnu.org/gnu/gettext/.])
-  AC_MSG_RESULT(yes)
-fi
-
 AC_CHECK_FUNC(setreuid, [], [
     AC_CHECK_LIB(ucb, setreuid, [if echo $LIBS | grep -- -lucb >/dev/null ;then :; else LIBS="$LIBS -lc -lucb" USEUCB=y;fi])
 ])
-AC_CHECK_FUNCS(getuid geteuid mtrace __secure_getenv setregid strerror iconv)
+AC_CHECK_FUNCS(getuid geteuid iconv mtrace __secure_getenv setregid stpcpy strerror)
 
 AM_GNU_GETTEXT([external])
 
diff --git a/findme.c b/findme.c
index e60d77a..82c5ce6 100644
--- a/findme.c
+++ b/findme.c
@@ -33,8 +33,7 @@ const char * POPT_findProgramPath(const char * argv0)
     do {
 	if ((chptr = strchr(start, ':')))
 	    *chptr = '\0';
-	sprintf(buf, "%s/%s", start, argv0);
-
+	(void) stpcpy(stpcpy(stpcpy(buf, start), "/"), argv0);
 	if (!access(buf, X_OK)) {
 	    free(pathbuf);
 	    return buf;
diff --git a/popt.c b/popt.c
index 5c28a8d..2727e74 100644
--- a/popt.c
+++ b/popt.c
@@ -10,6 +10,14 @@
 
 #include "system.h"
 
+#if defined(__LCLINT__)
+/*@-declundef -exportheader @*/
+extern long long int strtoll(const char *nptr, /*@null@*/ char **endptr,
+		int base)
+	/*@modifies *endptr@*/;
+/*@=declundef =exportheader @*/
+#endif
+
 #ifdef HAVE_FLOAT_H
 #include <float.h>
 #endif
@@ -56,9 +64,7 @@ void poptSetExecPath(poptContext con, const char * path, int allowAbsolute)
     con->execPath = _free(con->execPath);
     con->execPath = xstrdup(path);
     con->execAbsolute = allowAbsolute;
-/*@-nullstate@*/ /* LCL: con->execPath not NULL */
     return;
-/*@=nullstate@*/
 }
 
 static void invokeCallbacksPRE(poptContext con, const struct poptOption * opt)
@@ -77,9 +83,9 @@ static void invokeCallbacksPRE(poptContext con, const struct poptOption * opt)
 	case POPT_ARG_CALLBACK:		/* Perform callback. */
 	    if (!CBF_ISSET(opt, PRE))
 		/*@switchbreak@*/ break;
-	    /*@-noeffectuncon @*/
+/*@-noeffectuncon @*/	/* XXX no known way to annotate (*vector) calls. */
 	    arg.cb(con, POPT_CALLBACK_REASON_PRE, NULL, NULL, opt->descrip);
-	    /*@=noeffectuncon @*/
+/*@=noeffectuncon @*/
 	    /*@switchbreak@*/ break;
 	}
     }
@@ -101,9 +107,9 @@ static void invokeCallbacksPOST(poptContext con, const struct poptOption * opt)
 	case POPT_ARG_CALLBACK:		/* Perform callback. */
 	    if (!CBF_ISSET(opt, POST))
 		/*@switchbreak@*/ break;
-	    /*@-noeffectuncon @*/
+/*@-noeffectuncon @*/	/* XXX no known way to annotate (*vector) calls. */
 	    arg.cb(con, POPT_CALLBACK_REASON_POST, NULL, NULL, opt->descrip);
-	    /*@=noeffectuncon @*/
+/*@=noeffectuncon @*/
 	    /*@switchbreak@*/ break;
 	}
     }
@@ -142,10 +148,10 @@ static void invokeCallbacksOPTION(poptContext con,
 	     || (myOpt->longName != NULL && opt->longName != NULL &&
 			!strcmp(myOpt->longName, opt->longName)))
 	    {	const void *cbData = (cbopt->descrip ? cbopt->descrip : myData);
-		/*@-noeffectuncon @*/
+/*@-noeffectuncon @*/	/* XXX no known way to annotate (*vector) calls. */
 		cbarg.cb(con, POPT_CALLBACK_REASON_OPTION,
 			myOpt, con->os->nextArg, cbData);
-		/*@=noeffectuncon @*/
+/*@=noeffectuncon @*/
 		/* Terminate (unless explcitly continuing). */
 		if (!CBF_ISSET(cbopt, CONTINUE))
 		    return;
@@ -195,9 +201,7 @@ poptContext poptGetContext(const char * name, int argc, const char ** argv,
 	if (t) con->appName = strcpy(t, name);
     }
 
-/*@-internalglobs@*/
     invokeCallbacksPRE(con, con->options);
-/*@=internalglobs@*/
 
     return con;
 }
@@ -288,13 +292,15 @@ static int handleExec(/*@special@*/ poptContext con,
 
     i = con->finalArgvCount++;
     if (con->finalArgv != NULL)	/* XXX can't happen */
-    {	char *s  = malloc((longName ? strlen(longName) : 0) + 3);
+    {	char *s  = malloc((longName ? strlen(longName) : 0) + sizeof("--"));
 	if (s != NULL) {	/* XXX can't happen */
+	    con->finalArgv[i] = s;
+	    *s++ = '-';
 	    if (longName)
-		sprintf(s, "--%s", longName);
+		s = stpcpy( stpcpy(s, "-"), longName);
 	    else
-		sprintf(s, "-%c", shortName);
-	    con->finalArgv[i] = s;
+		*s++ = shortName;
+	    *s = '\0';
 	} else
 	    con->finalArgv[i] = NULL;
     }
@@ -403,7 +409,8 @@ static int execCommand(poptContext con)
     if (!strchr(item->argv[0], '/') && con->execPath != NULL) {
 	char *s = malloc(strlen(con->execPath) + strlen(item->argv[0]) + sizeof("/"));
 	if (s)
-	    sprintf(s, "%s/%s", con->execPath, item->argv[0]);
+	    (void)stpcpy(stpcpy(stpcpy(s, con->execPath), "/"), item->argv[0]);
+
 	argv[argc] = s;
     } else
 	argv[argc] = POPT_findProgramPath(item->argv[0]);
@@ -629,51 +636,44 @@ expandNextArg(/*@special@*/ poptContext con, const char * s)
 }
 
 static void poptStripArg(/*@special@*/ poptContext con, int which)
-	/*@uses con->arg_strip, con->optionStack @*/
+	/*@uses con->optionStack @*/
 	/*@defines con->arg_strip @*/
 	/*@modifies con @*/
 {
-/*@-sizeoftype@*/
+/*@-compdef -sizeoftype -usedef @*/
     if (con->arg_strip == NULL)
 	con->arg_strip = PBM_ALLOC(con->optionStack[0].argc);
     if (con->arg_strip != NULL)		/* XXX can't happen */
     PBM_SET(which, con->arg_strip);
-/*@=sizeoftype@*/
-/*@-compdef@*/ /* LCL: con->arg_strip undefined? */
     return;
-/*@=compdef@*/
+/*@=compdef =sizeoftype =usedef @*/
 }
 
 int poptSaveString(const char *** argvp,
 		/*@unused@*/ UNUSED(unsigned int argInfo), const char * val)
 {
-    poptArgv argv;
     int argc = 0;
 
     if (argvp == NULL)
 	return -1;
 
     /* XXX likely needs an upper bound on argc. */
-    if (*argvp)
+    if (*argvp != NULL)
     while ((*argvp)[argc] != NULL)
 	argc++;
  
-/*@-unqualifiedtrans@*/
-    *argvp = xrealloc(*argvp, (argc + 1 + 1) * sizeof(**argvp));
-/*@=unqualifiedtrans@*/
-    if ((argv = *argvp) != NULL) {
-	argv[argc++] = xstrdup(val);
-	argv[argc  ] = NULL;
+/*@-unqualifiedtrans -nullstate@*/	/* XXX no annotation for (*argvp) */
+    if ((*argvp = xrealloc(*argvp, (argc + 1 + 1) * sizeof(**argvp))) != NULL) {
+	(*argvp)[argc++] = xstrdup(val);
+	(*argvp)[argc  ] = NULL;
     }
-/*@-nullstate@*/
     return 0;
-/*@=nullstate@*/
+/*@=unqualifiedtrans =nullstate@*/
 }
 
 /*@unchecked@*/
 static unsigned int seed = 0;
 
-/*@-bitwisesigned@*/	/* LCL: logical ops with unsigned. */
 int poptSaveLongLong(long long * arg, unsigned int argInfo, long long aLongLong)
 {
     if (arg == NULL
@@ -699,13 +699,13 @@ int poptSaveLongLong(long long * arg, unsigned int argInfo, long long aLongLong)
 	*arg = aLongLong;
 	break;
     case POPT_ARGFLAG_OR:
-	*arg |= aLongLong;
+	*(unsigned long long *)arg |= (unsigned long long)aLongLong;
 	break;
     case POPT_ARGFLAG_AND:
-	*arg &= aLongLong;
+	*(unsigned long long *)arg &= (unsigned long long)aLongLong;
 	break;
     case POPT_ARGFLAG_XOR:
-	*arg ^= aLongLong;
+	*(unsigned long long *)arg ^= (unsigned long long)aLongLong;
 	break;
     default:
 	return POPT_ERROR_BADOPERATION;
@@ -713,9 +713,7 @@ int poptSaveLongLong(long long * arg, unsigned int argInfo, long long aLongLong)
     }
     return 0;
 }
-/*@=bitwisesigned@*/
 
-/*@-bitwisesigned@*/	/* LCL: logical ops with unsigned. */
 int poptSaveLong(long * arg, unsigned int argInfo, long aLong)
 {
     /* XXX Check alignment, may fail on funky platforms. */
@@ -737,13 +735,13 @@ int poptSaveLong(long * arg, unsigned int argInfo, long aLong)
 	*arg = aLong;
 	break;
     case POPT_ARGFLAG_OR:
-	*arg |= aLong;
+	*(unsigned long *)arg |= (unsigned long)aLong;
 	break;
     case POPT_ARGFLAG_AND:
-	*arg &= aLong;
+	*(unsigned long *)arg &= (unsigned long)aLong;
 	break;
     case POPT_ARGFLAG_XOR:
-	*arg ^= aLong;
+	*(unsigned long *)arg ^= (unsigned long)aLong;
 	break;
     default:
 	return POPT_ERROR_BADOPERATION;
@@ -751,9 +749,7 @@ int poptSaveLong(long * arg, unsigned int argInfo, long aLong)
     }
     return 0;
 }
-/*@=bitwisesigned@*/
 
-/*@-bitwisesigned@*/	/* LCL: logical ops with unsigned. */
 int poptSaveInt(/*@null@*/ int * arg, unsigned int argInfo, long aLong)
 {
     /* XXX Check alignment, may fail on funky platforms. */
@@ -775,13 +771,13 @@ int poptSaveInt(/*@null@*/ int * arg, unsigned int argInfo, long aLong)
 	*arg = (int) aLong;
 	break;
     case POPT_ARGFLAG_OR:
-	*arg |= (int) aLong;
+	*(unsigned int *)arg |= (unsigned int) aLong;
 	break;
     case POPT_ARGFLAG_AND:
-	*arg &= (int) aLong;
+	*(unsigned int *)arg &= (unsigned int) aLong;
 	break;
     case POPT_ARGFLAG_XOR:
-	*arg ^= (int) aLong;
+	*(unsigned int *)arg ^= (unsigned int) aLong;
 	break;
     default:
 	return POPT_ERROR_BADOPERATION;
@@ -789,7 +785,6 @@ int poptSaveInt(/*@null@*/ int * arg, unsigned int argInfo, long aLong)
     }
     return 0;
 }
-/*@=bitwisesigned@*/
 
 /* returns 'val' element, -1 on last item, POPT_ERROR_* on error */
 int poptGetNextOpt(poptContext con)
@@ -1018,12 +1013,10 @@ int poptGetNextOpt(poptContext con)
 		case POPT_ARG_LONG:
 		case POPT_ARG_LONGLONG:
 		{   long long aNUM = 0;
-		    char *end;
+		    char *end = NULL;
 
 		    if (con->os->nextArg) {
-/*@-unrecog@*/
 			aNUM = strtoll(con->os->nextArg, &end, 0);
-/*@=unrecog@*/
 			if (!(end && *end == '\0'))
 			    return POPT_ERROR_BADNUMBER;
 		    }
@@ -1076,7 +1069,7 @@ int poptGetNextOpt(poptContext con)
 		    if (poptArgType(opt) == POPT_ARG_DOUBLE) {
 			arg.doublep[0] = aDouble;
 		    } else {
-#ifndef DBL_EPSILON
+#if !defined(DBL_EPSILON) && !defined(__LCLINT__)
 #define DBL_EPSILON 2.2204460492503131e-16
 #endif
 #define POPT_ABS(a)	((((a) - 0.0) < DBL_EPSILON) ? -(a) : (a))
@@ -1114,14 +1107,18 @@ int poptGetNextOpt(poptContext con)
 	}
 
 	if (con->finalArgv != NULL)
-	{   char *s = malloc((opt->longName ? strlen(opt->longName) : 0) + 3);
+	{   char *s = malloc((opt->longName ? strlen(opt->longName) : 0) + sizeof("--"));
 	    if (s != NULL) {	/* XXX can't happen */
-		if (opt->longName)
-		    sprintf(s, "%s%s", (F_ISSET(opt, ONEDASH) ? "-" : "--"),
-			opt->longName);
-		else
-		    sprintf(s, "-%c", opt->shortName);
 		con->finalArgv[con->finalArgvCount++] = s;
+		*s++ = '-';
+		if (opt->longName) {
+		    if (!F_ISSET(opt, ONEDASH))
+			*s++ = '-';
+		    s = stpcpy(s, opt->longName);
+		} else {
+		    *s++ = opt->shortName;
+		    *s = '\0';
+		}
 	    } else
 		con->finalArgv[con->finalArgvCount++] = NULL;
 	}
diff --git a/popt.h b/popt.h
index 637ef43..ba802bf 100644
--- a/popt.h
+++ b/popt.h
@@ -248,7 +248,8 @@ poptContext poptGetContext(
 		int argc, /*@dependent@*/ /*@keep@*/ const char ** argv,
 		/*@dependent@*/ /*@keep@*/ const struct poptOption * options,
 		unsigned int flags)
-	/*@*/;
+	/*@globals internalState @*/
+	/*@modifies internalState @*/;
 
 /** \ingroup popt
  * Reinitialize popt context.
diff --git a/poptconfig.c b/poptconfig.c
index aef4082..bf8fef3 100644
--- a/poptconfig.c
+++ b/poptconfig.c
@@ -9,8 +9,22 @@
 #include "system.h"
 #include "poptint.h"
 #include <sys/stat.h>
+
 #if defined(HAVE_GLOB_H)
 #include <glob.h>
+
+#if defined(__LCLINT__)
+/*@-declundef -exportheader -incondefs -protoparammatch -redecl -type @*/
+extern int glob (const char *__pattern, int __flags,
+		/*@null@*/ int (*__errfunc) (const char *, int),
+		/*@out@*/ glob_t *__pglob)
+	/*@globals errno, fileSystem @*/
+	/*@modifies *__pglob, errno, fileSystem @*/;
+	/* XXX only annotation is a white lie */
+extern void globfree (/*@only@*/ glob_t *__pglob)
+	/*@modifies *__pglob @*/;
+/*@=declundef =exportheader =incondefs =protoparammatch =redecl =type @*/
+#endif
 #endif
 
 /*@access poptContext @*/
@@ -117,7 +131,8 @@ int poptReadConfigFile(poptContext con, const char * fn)
 	return POPT_ERROR_ERRNO;
     }
 
-    file = malloc((size_t)fileLength + 1);
+    if ((file = malloc((size_t)fileLength + 1)) != NULL)
+	*file = '\0';
     if (file == NULL
      || read(fd, (char *)file, (size_t)fileLength) != (ssize_t)fileLength)
     {
@@ -137,10 +152,8 @@ int poptReadConfigFile(poptContext con, const char * fn)
     if (dst == NULL)
 	return POPT_ERROR_ERRNO;
 
-    chptr = file;
     end = (file + fileLength);
-/*@-infloops@*/	/* LCL: can't detect chptr++ */
-    while (chptr < end) {
+    for (chptr = file; chptr < end; chptr++) {
 	switch (*chptr) {
 	  case '\n':
 	    *dst = '\0';
@@ -148,24 +161,20 @@ int poptReadConfigFile(poptContext con, const char * fn)
 	    while (*dst && _isspaceptr(dst)) dst++;
 	    if (*dst && *dst != '#')
 		configLine(con, dst);
-	    chptr++;
 	    /*@switchbreak@*/ break;
 	  case '\\':
-	    *dst++ = *chptr++;
-	    if (chptr < end) {
-		if (*chptr == '\n') 
-		    dst--, chptr++;	
-		    /* \ at the end of a line does not insert a \n */
-		else
-		    *dst++ = *chptr++;
+	    *dst = *chptr++;
+	    /* \ at the end of a line does not insert a \n */
+	    if (chptr < end  && *chptr != '\n') {
+		dst++;
+		*dst++ = *chptr;
 	    }
 	    /*@switchbreak@*/ break;
 	  default:
-	    *dst++ = *chptr++;
+	    *dst++ = *chptr;
 	    /*@switchbreak@*/ break;
 	}
     }
-/*@=infloops@*/
 
     free(file);
     free(buf);
@@ -193,12 +202,11 @@ int poptReadDefaultConfig(poptContext con, /*@unused@*/ UNUSED(int useEnv))
 
 #if defined(HAVE_GLOB_H)
     if (!stat("/etc/popt.d", &s) && S_ISDIR(s.st_mode)) {
-        glob_t g;
-/*@-moduncon -nullpass -type @*/ /* FIX: annotations for glob/globfree */
-	if (!glob("/etc/popt.d/*", 0, NULL, &g)) {
-            unsigned i;
-	    for (i=0; i<g.gl_pathc; i++) {
-		char *f=g.gl_pathv[i];
+        glob_t _g, *pglob = &_g;
+	if (!glob("/etc/popt.d/*", 0, NULL, pglob)) {
+            size_t i;
+	    for (i = 0; i < pglob->gl_pathc; i++) {
+		char * f = pglob->gl_pathv[i];
 		if (strstr(f, ".rpmnew") || strstr(f, ".rpmsave"))
 		    continue;
 		if (!stat(f, &s)) {
@@ -208,11 +216,8 @@ int poptReadDefaultConfig(poptContext con, /*@unused@*/ UNUSED(int useEnv))
 		rc = poptReadConfigFile(con, f);
 		if (rc) return rc;
 	    }
-/*@-noeffectuncon@*/
-	    globfree(&g);
-/*@=noeffectuncon@*/
+	    globfree(pglob);
 	}
-/*@=moduncon =nullpass =type @*/
     }
 #endif
 
diff --git a/poptint.c b/poptint.c
index 04e0d7d..de2ebbc 100644
--- a/poptint.c
+++ b/poptint.c
@@ -55,7 +55,7 @@ strdup_locale_from_utf8 (/*@null@*/ char *buffer)
 /*@=type@*/
 #endif
 
-    if (codeset && strcmp(codeset, "UTF-8")
+    if (codeset != NULL && strcmp(codeset, "UTF-8") != 0
      && (fd = iconv_open(codeset, "UTF-8")) != (iconv_t)-1)
     {
 	char *pin = buffer;
@@ -74,7 +74,7 @@ strdup_locale_from_utf8 (/*@null@*/ char *buffer)
 	    *dest_str = '\0';
 	done = is_error = 0;
 	if (pout != NULL)
-	while (!done && !is_error) {
+	while (done == 0 && is_error == 0) {
 	    err = iconv(fd, &pin, &ib, &pout, &ob);
 
 	    if (err == (size_t)-1) {
@@ -123,30 +123,6 @@ strdup_locale_from_utf8 (/*@null@*/ char *buffer)
 }
 #endif
 
-/*@-mustmod@*/	/* LCL: can't see the ap modification. */
-static /*@only@*/ /*@null@*/ char *
-strdup_vprintf (const char *format, va_list ap)
-	/*@modifies ap @*/
-{
-    char *buffer;
-    char c;
-    va_list apc;
-    int xx;
-
-/*@-noeffectuncon -unrecog @*/
-    va_copy(apc, ap);	/* XXX linux amd64/ppc needs a copy. */
-/*@=noeffectuncon =unrecog @*/
-
-    buffer = calloc(sizeof(*buffer), (size_t)vsnprintf (&c, (size_t)1, format, ap) + 1);
-    if (buffer != NULL)
-	xx = vsprintf(buffer, format, apc);
-
-    va_end(apc);
-
-    return buffer;
-}
-/*@=mustmod@*/
-
 const char *
 POPT_prev_char (const char *str)
 {
@@ -173,32 +149,39 @@ POPT_next_char (const char *str)
 }
 
 int
-POPT_fprintf (FILE* stream, const char *format, ...)
+POPT_fprintf (FILE * stream, const char * format, ...)
 {
-    int retval = 0;
-    va_list args;
-    char *buffer = NULL;
-#ifdef HAVE_ICONV
-    char *locale_str = NULL;
-#endif
-
-    va_start (args, format);
-    buffer = strdup_vprintf(format, args);
-    va_end (args);
-    if (buffer == NULL)
-	return retval;
+    char * b = NULL, * ob = NULL;
+    size_t nb = (size_t)1;
+    int rc;
+    va_list ap;
+
+    va_start(ap, format);
+    while ((b = realloc(b, nb)) != NULL) {
+	rc = vsnprintf(b, nb, format, ap);
+	if (rc > -1) {	/* glibc 2.1 */
+	    if ((size_t)rc < nb)
+		break;
+	    nb = (size_t)(rc + 1);	/* precise buffer length known */
+	} else 		/* glibc 2.0 */
+	    nb += (nb < (size_t)100 ? (size_t)100 : nb);
+	ob = b;
+    }
+    va_end(ap);
 
+    rc = 0;
+    if (b != NULL) {
 #ifdef HAVE_ICONV
-    locale_str = strdup_locale_from_utf8(buffer);
-    if (locale_str) {
-	retval = fprintf(stream, "%s", locale_str);
-	free(locale_str);
-    } else
+	ob = strdup_locale_from_utf8(b);
+	if (ob != NULL) {
+	    rc = fprintf(stream, "%s", ob);
+	    free(ob);
+	} else
 #endif
-    {
-	retval = fprintf(stream, "%s", buffer);
-    }
-    free (buffer);
+	    rc = fprintf(stream, "%s", b);
+	free (b);
+    } else if (ob != NULL)
+	free(ob);
 
-    return retval;
+    return rc;
 }
diff --git a/poptint.h b/poptint.h
index d8e829c..9c2b73b 100644
--- a/poptint.h
+++ b/poptint.h
@@ -120,10 +120,11 @@ struct poptContext_s {
     poptArgv finalArgv;
     int finalArgvCount;
     int finalArgvAlloced;
+/*@null@*/
     int (*maincall) (int argc, const char **argv);
 /*@dependent@*/ /*@null@*/
     poptItem doExec;
-/*@only@*/
+/*@only@*/ /*@null@*/
     const char * execPath;
     int execAbsolute;
 /*@only@*/ /*@relnull@*/
diff --git a/poptparse.c b/poptparse.c
index f203743..d196cc8 100644
--- a/poptparse.c
+++ b/poptparse.c
@@ -31,10 +31,12 @@ int poptDupArgv(int argc, const char **argv,
 	return POPT_ERROR_MALLOC;
     argv2 = (void *) dst;
     dst += (argc + 1) * sizeof(*argv);
+    *dst = '\0';
 
     for (i = 0; i < argc; i++) {
 	argv2[i] = dst;
-	dst += strlen(strcpy(dst, argv[i])) + 1;
+	dst = stpcpy(dst, argv[i]);
+	dst++;	/* trailing NUL */
     }
     argv2[argc] = NULL;
 
diff --git a/system.h b/system.h
index 9ed5a09..863526b 100644
--- a/system.h
+++ b/system.h
@@ -64,6 +64,19 @@ char * xstrdup (const char *str)
 	/*@*/;
 /*@=incondefs@*/
 
+#if !defined(HAVE_STPCPY)
+/* Copy SRC to DEST, returning the address of the terminating '\0' in DEST.  */
+static inline char * stpcpy (char *dest, const char * src) {
+    register char *d = dest;
+    register const char *s = src;
+
+    do
+	*d++ = *s;
+    while (*s++ != '\0');
+    return d - 1;
+}
+#endif
+
 /* Memory allocation via macro defs to get meaningful locations from mtrace() */
 #if defined(HAVE_MCHECK_H) && defined(__GNUC__)
 #define	vmefail()	(fprintf(stderr, "virtual memory exhausted.\n"), exit(EXIT_FAILURE), NULL)
@@ -82,7 +95,7 @@ char * xstrdup (const char *str)
 #define	getenv(_s)	__secure_getenv(_s)
 #endif
 
-#ifndef __GNUC__
+#if !defined(__GNUC__) && !defined(__attribute__)
 #define __attribute__(x) 
 #endif
 #define UNUSED(x) x __attribute__((__unused__))
-- 
Gitee


From f179c0c49287382be768ec57b1aed399112a8fff Mon Sep 17 00:00:00 2001
From: Jeff Johnson <n3npq@mac.com>
Date: Sun, 9 Mar 2008 22:53:24 +0000
Subject: [PATCH 529/667] - jbj: permit "#define POPT_fprintf fprintf" to lose
 the malloc'ing fprintf. - jbj: use vasprintf(3) when available (Wayne
 Davison<wayned@samba.org>).

---
 CHANGES      |  2 ++
 configure.ac |  2 +-
 poptint.c    | 73 ++++++++++++++++++++++++++++++++--------------------
 poptint.h    | 49 +++++++++++++++++++----------------
 4 files changed, 75 insertions(+), 51 deletions(-)

diff --git a/CHANGES b/CHANGES
index c826bba..9cb0e61 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,4 +1,6 @@
 1.13 -> 1.14:
+    - jbj: permit "#define POPT_fprintf fprintf" to lose the malloc'ing fprintf.
+    - jbj: use vasprintf(3) when available (Wayne Davison<wayned@samba.org>).
     - jbj: study the mess with splint, remove annotations where possible.
     - jbj: add -D_GNU_SOURCE for gcc to use __builtin_stpcpy when available.
     - jbj: add static inline stpcpy for the deprived.
diff --git a/configure.ac b/configure.ac
index 71bcea5..f0f2e43 100755
--- a/configure.ac
+++ b/configure.ac
@@ -69,7 +69,7 @@ AM_CONDITIONAL(HAVE_LD_VERSION_SCRIPT, test "$have_ld_version_script" = "yes")
 AC_CHECK_FUNC(setreuid, [], [
     AC_CHECK_LIB(ucb, setreuid, [if echo $LIBS | grep -- -lucb >/dev/null ;then :; else LIBS="$LIBS -lc -lucb" USEUCB=y;fi])
 ])
-AC_CHECK_FUNCS(getuid geteuid iconv mtrace __secure_getenv setregid stpcpy strerror)
+AC_CHECK_FUNCS(getuid geteuid iconv mtrace __secure_getenv setregid stpcpy strerror vasprintf)
 
 AM_GNU_GETTEXT([external])
 
diff --git a/poptint.c b/poptint.c
index de2ebbc..3cea184 100644
--- a/poptint.c
+++ b/poptint.c
@@ -16,6 +16,33 @@ static const unsigned char utf8_skip_data[256] = {
 };
 /*@=varuse =charint =ignoresigns @*/
 
+const char *
+POPT_prev_char (const char *str)
+{
+    const char *p = str;
+
+    while (1) {
+	p--;
+	if (((unsigned)*p & 0xc0) != (unsigned)0x80)
+	    return p;
+    }
+}
+
+const char *
+POPT_next_char (const char *str)
+{
+    const char *p = str;
+
+    while (*p != '\0') {
+	p++;
+	if (((unsigned)*p & 0xc0) != (unsigned)0x80)
+	    break;
+    }
+    return p;
+}
+
+#if !defined(POPT_fprintf)	/* XXX lose all the goop ... */
+
 #if defined(HAVE_DCGETTEXT) && !defined(__LCLINT__)
 /*
  * Rebind a "UTF-8" codeset for popt's internal use.
@@ -123,42 +150,30 @@ strdup_locale_from_utf8 (/*@null@*/ char *buffer)
 }
 #endif
 
-const char *
-POPT_prev_char (const char *str)
-{
-    const char *p = str;
-
-    while (1) {
-	p--;
-	if (((unsigned)*p & 0xc0) != (unsigned)0x80)
-	    return p;
-    }
-}
-
-const char *
-POPT_next_char (const char *str)
-{
-    const char *p = str;
-
-    while (*p != '\0') {
-	p++;
-	if (((unsigned)*p & 0xc0) != (unsigned)0x80)
-	    break;
-    }
-    return p;
-}
-
 int
 POPT_fprintf (FILE * stream, const char * format, ...)
 {
     char * b = NULL, * ob = NULL;
-    size_t nb = (size_t)1;
     int rc;
     va_list ap;
 
+#if defined(HAVE_VASPRINTF)
     va_start(ap, format);
-    while ((b = realloc(b, nb)) != NULL) {
+    if ((rc = vasprintf(b, format, ap)) < 0)
+	b = NULL;
+    va_end(ap);
+#else
+    size_t nb = (size_t)1;
+
+    /* HACK: add +1 to the realloc no. of bytes "just in case". */
+    /* XXX Likely unneeded, the issues wrto vsnprintf(3) return b0rkage have
+     * to do with whether the final '\0' is counted (or not). The code
+     * below already adds +1 for the (possibly already counted) trailing NUL.
+     */
+    while ((b = realloc(b, nb+1)) != NULL) {
+	va_start(ap, format);
 	rc = vsnprintf(b, nb, format, ap);
+	va_end(ap);
 	if (rc > -1) {	/* glibc 2.1 */
 	    if ((size_t)rc < nb)
 		break;
@@ -167,7 +182,7 @@ POPT_fprintf (FILE * stream, const char * format, ...)
 	    nb += (nb < (size_t)100 ? (size_t)100 : nb);
 	ob = b;
     }
-    va_end(ap);
+#endif
 
     rc = 0;
     if (b != NULL) {
@@ -185,3 +200,5 @@ POPT_fprintf (FILE * stream, const char * format, ...)
 
     return rc;
 }
+
+#endif	/* !defined(POPT_fprintf) */
diff --git a/poptint.h b/poptint.h
index 9c2b73b..f0be0b5 100644
--- a/poptint.h
+++ b/poptint.h
@@ -133,26 +133,9 @@ struct poptContext_s {
     pbm_set * arg_strip;
 };
 
-#ifdef HAVE_LIBINTL_H
-#include <libintl.h>
-#endif
-
-#if defined(HAVE_GETTEXT) && !defined(__LCLINT__)
-#define _(foo) gettext(foo)
+#if defined(POPT_fprintf)
+#define	POPT_dgettext	dgettext
 #else
-#define _(foo) foo
-#endif
-
-#if defined(HAVE_DCGETTEXT) && !defined(__LCLINT__)
-#define D_(dom, str) POPT_dgettext(dom, str)
-#define POPT_(foo) D_("popt", foo)
-#else
-#define D_(dom, str) str
-#define POPT_(foo) foo
-#endif
-
-#define N_(foo) foo
-
 #ifdef HAVE_ICONV
 #include <iconv.h>
 #if defined(__LCLINT__)
@@ -188,14 +171,36 @@ char *POPT_dgettext(const char * dom, const char * str)
 	/*@*/;
 #endif
 
+int   POPT_fprintf (FILE* stream, const char *format, ...)
+	/*@globals fileSystem @*/
+	/*@modifies stream, fileSystem @*/;
+#endif	/* !defined(POPT_fprintf) */
+
 const char *POPT_prev_char (/*@returned@*/ const char *str)
 	/*@*/;
 
 const char *POPT_next_char (/*@returned@*/ const char *str)
 	/*@*/;
 
-int   POPT_fprintf (FILE* stream, const char *format, ...)
-	/*@globals fileSystem @*/
-	/*@modifies stream, fileSystem @*/;
+#endif
+
+#ifdef HAVE_LIBINTL_H
+#include <libintl.h>
+#endif
 
+#if defined(HAVE_GETTEXT) && !defined(__LCLINT__)
+#define _(foo) gettext(foo)
+#else
+#define _(foo) foo
 #endif
+
+#if defined(HAVE_DCGETTEXT) && !defined(__LCLINT__)
+#define D_(dom, str) POPT_dgettext(dom, str)
+#define POPT_(foo) D_("popt", foo)
+#else
+#define D_(dom, str) str
+#define POPT_(foo) foo
+#endif
+
+#define N_(foo) foo
+
-- 
Gitee


From 59d9e5b59807e1aefbc44fccac67045a71a9571b Mon Sep 17 00:00:00 2001
From: Jeff Johnson <n3npq@mac.com>
Date: Sun, 9 Mar 2008 23:10:05 +0000
Subject: [PATCH 530/667] - jbj: enable equal after short option (Wayne
 Davison<wayned@samba.org>).

---
 CHANGES | 1 +
 popt.c  | 3 ---
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/CHANGES b/CHANGES
index 9cb0e61..efae8f6 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,4 +1,5 @@
 1.13 -> 1.14:
+    - jbj: enable equal after short option (Wayne Davison<wayned@samba.org>).
     - jbj: permit "#define POPT_fprintf fprintf" to lose the malloc'ing fprintf.
     - jbj: use vasprintf(3) when available (Wayne Davison<wayned@samba.org>).
     - jbj: study the mess with splint, remove annotations where possible.
diff --git a/popt.c b/popt.c
index 2727e74..6b77e21 100644
--- a/popt.c
+++ b/popt.c
@@ -932,10 +932,7 @@ int poptGetNextOpt(poptContext con)
 
 	    origOptString++;
 	    if (*origOptString != '\0')
-		con->os->nextCharArg = origOptString;
-#ifdef	NOTYET	/* XXX causes test 9 failure. */
 		con->os->nextCharArg = origOptString + (*origOptString == '=');
-#endif
 	}
 
 	if (opt == NULL) return POPT_ERROR_BADOPT;	/* XXX can't happen */
-- 
Gitee


From 1aa13e46bc710e92b835457373fd77613f459ea2 Mon Sep 17 00:00:00 2001
From: Jeff Johnson <n3npq@mac.com>
Date: Mon, 10 Mar 2008 04:06:23 +0000
Subject: [PATCH 531/667] - jbj: fix: typ, vasprintf needs an ampersand. Thanks
 Wayne!

---
 poptint.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/poptint.c b/poptint.c
index 3cea184..264ec3b 100644
--- a/poptint.c
+++ b/poptint.c
@@ -159,7 +159,7 @@ POPT_fprintf (FILE * stream, const char * format, ...)
 
 #if defined(HAVE_VASPRINTF)
     va_start(ap, format);
-    if ((rc = vasprintf(b, format, ap)) < 0)
+    if ((rc = vasprintf(&b, format, ap)) < 0)
 	b = NULL;
     va_end(ap);
 #else
-- 
Gitee


From e8f4293f73dc6bd5ab812021d5886117d335cd34 Mon Sep 17 00:00:00 2001
From: Jeff Johnson <n3npq@mac.com>
Date: Mon, 10 Mar 2008 04:08:43 +0000
Subject: [PATCH 532/667] - jbj: enable tests for -c=foo short options. Thanks
 Wayne!

---
 testit.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/testit.sh b/testit.sh
index fb51c6b..c06a53d 100755
--- a/testit.sh
+++ b/testit.sh
@@ -101,8 +101,8 @@ run test1 "test1 - 45" "arg1: 0 arg2: (none) oStr: ping rest: pong" --optional=p
 run test1 "test1 - 46" "arg1: 0 arg2: (none) oStr: ping rest: pong" --optional ping pong
 run test1 "test1 - 47" "arg1: 0 arg2: (none) aArgv: A B rest: C" --argv A --argv B C
 
-#run test1 "test1 - 48" "arg1: 0 arg2: foo=bar" -2foo=bar
-#run test1 "test1 - 49" "arg1: 0 arg2: foo=bar" -2=foo=bar
+run test1 "test1 - 48" "arg1: 0 arg2: foo=bar" -2foo=bar
+run test1 "test1 - 49" "arg1: 0 arg2: foo=bar" -2=foo=bar
 
 #run_diff test3 "test3 - 51" test3-data/01.input test3-data/01.answer
 #run_diff test3 "test3 - 52" test3-data/02.input test3-data/02.answer
-- 
Gitee


From d5006916bffe65999e35b1e3d3cb92eb507c7c5b Mon Sep 17 00:00:00 2001
From: Jeff Johnson <n3npq@mac.com>
Date: Mon, 10 Mar 2008 08:13:09 +0000
Subject: [PATCH 533/667] - jbj: study the mess with splint. Sigh, splint is so
 easily confused ... - jbj: rewrite findProgramPath & move to popt.c. Nuke the
 findme.{c,h} toys. - jbj: use stpcpy several more places (Wayne
 Davison<wayned@samba.org>).

---
 CHANGES      |  3 ++
 Makefile.am  |  4 +--
 findme.c     | 55 --------------------------------
 findme.h     | 20 ------------
 popt.c       | 88 ++++++++++++++++++++++++++++++++++++++++++----------
 poptconfig.c |  3 +-
 popthelp.c   | 38 ++++++++++++-----------
 poptint.c    |  2 +-
 8 files changed, 98 insertions(+), 115 deletions(-)
 delete mode 100644 findme.c
 delete mode 100644 findme.h

diff --git a/CHANGES b/CHANGES
index efae8f6..133bcce 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,4 +1,7 @@
 1.13 -> 1.14:
+    - jbj: study the mess with splint. Sigh, splint is so easily confused ...
+    - jbj: rewrite findProgramPath & move to popt.c. Nuke the findme.{c,h} toys.
+    - jbj: use stpcpy several more places (Wayne Davison<wayned@samba.org>).
     - jbj: enable equal after short option (Wayne Davison<wayned@samba.org>).
     - jbj: permit "#define POPT_fprintf fprintf" to lose the malloc'ing fprintf.
     - jbj: use vasprintf(3) when available (Wayne Davison<wayned@samba.org>).
diff --git a/Makefile.am b/Makefile.am
index 27461d8..71206e7 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -14,7 +14,7 @@ SUBDIRS = po
 
 INCLUDES = -I. -I$(top_srcdir)
 
-noinst_HEADERS = findme.h poptint.h system.h
+noinst_HEADERS = poptint.h system.h
 
 noinst_PROGRAMS = test1 test2 test3
 test1_SOURCES = test1.c
@@ -39,7 +39,7 @@ include_HEADERS = popt.h
 usrlibdir = $(libdir)
 usrlib_LTLIBRARIES = libpopt.la
 
-libpopt_la_SOURCES = popt.c findme.c poptparse.c poptconfig.c popthelp.c poptint.c
+libpopt_la_SOURCES = popt.c poptparse.c poptconfig.c popthelp.c poptint.c
 libpopt_la_LDFLAGS = -no-undefined @LTLIBINTL@
 
 if HAVE_LD_VERSION_SCRIPT
diff --git a/findme.c b/findme.c
deleted file mode 100644
index 82c5ce6..0000000
--- a/findme.c
+++ /dev/null
@@ -1,55 +0,0 @@
-/** \ingroup popt
- * \file popt/findme.c
- */
-
-/* (C) 1998-2002 Red Hat, Inc. -- Licensing details are in the COPYING
-   file accompanying popt source distributions, available from 
-   ftp://ftp.rpm.org/pub/rpm/dist. */
-
-#include "system.h"
-#include "findme.h"
-
-const char * POPT_findProgramPath(const char * argv0)
-{
-    char * path = getenv("PATH");
-    char * pathbuf = NULL;
-    char * start, * chptr;
-    char * buf = NULL;
-
-    if (argv0 == NULL) return NULL;	/* XXX can't happen */
-    /* If there is a / in the argv[0], it has to be an absolute path */
-    if (strchr(argv0, '/'))
-	return xstrdup(argv0);
-
-    if (path == NULL) return NULL;
-
-    start = pathbuf = malloc(strlen(path) + 1);
-    if (pathbuf == NULL) goto exit;
-    buf = malloc(strlen(path) + strlen(argv0) + sizeof("/"));
-    if (buf == NULL) goto exit;
-    strcpy(pathbuf, path);
-
-    chptr = NULL;
-    do {
-	if ((chptr = strchr(start, ':')))
-	    *chptr = '\0';
-	(void) stpcpy(stpcpy(stpcpy(buf, start), "/"), argv0);
-	if (!access(buf, X_OK)) {
-	    free(pathbuf);
-	    return buf;
-	}
-
-	if (chptr) 
-	    start = chptr + 1;
-	else
-	    start = NULL;
-    } while (start && *start);
-
-exit:
-    if (pathbuf)
-        free(pathbuf);
-    if (buf)
-        free(buf);
-
-    return NULL;
-}
diff --git a/findme.h b/findme.h
deleted file mode 100644
index a92c3fa..0000000
--- a/findme.h
+++ /dev/null
@@ -1,20 +0,0 @@
-/** \ingroup popt
- * \file popt/findme.h
- */
-
-/* (C) 1998-2000 Red Hat, Inc. -- Licensing details are in the COPYING
-   file accompanying popt source distributions, available from 
-   ftp://ftp.rpm.org/pub/rpm/dist. */
-
-#ifndef H_FINDME
-#define H_FINDME
-
-/**
- * Return absolute path to executable by searching PATH.
- * @param argv0		name of executable
- * @return		(malloc'd) absolute path to executable (or NULL)
- */
-/*@null@*/ const char * POPT_findProgramPath(/*@null@*/ const char * argv0)
-	/*@*/;
-
-#endif
diff --git a/popt.c b/popt.c
index 6b77e21..f906c97 100644
--- a/popt.c
+++ b/popt.c
@@ -23,7 +23,6 @@ extern long long int strtoll(const char *nptr, /*@null@*/ char **endptr,
 #endif
 #include <math.h>
 
-#include "findme.h"
 #include "poptint.h"
 
 #ifdef	MYDEBUG
@@ -196,10 +195,8 @@ poptContext poptGetContext(const char * name, int argc, const char ** argv,
     if (getenv("POSIXLY_CORRECT") || getenv("POSIX_ME_HARDER"))
 	con->flags |= POPT_CONTEXT_POSIXMEHARDER;
 
-    if (name) {
-	char * t = malloc(strlen(name) + 1);
-	if (t) con->appName = strcpy(t, name);
-    }
+    if (name)
+	con->appName = xstrdup(name);
 
     invokeCallbacksPRE(con, con->options);
 
@@ -385,6 +382,57 @@ static int handleAlias(/*@special@*/ poptContext con,
     return (rc ? rc : 1);
 }
 
+/**
+ * Return absolute path to executable by searching PATH.
+ * @param argv0		name of executable
+ * @return		(malloc'd) absolute path to executable (or NULL)
+ */
+static /*@null@*/
+const char * findProgramPath(/*@null@*/ const char * argv0)
+	/*@*/
+{
+    char *path = NULL, *s = NULL, *se;
+    char *t = NULL;
+
+    if (argv0 == NULL) return NULL;	/* XXX can't happen */
+
+    /* If there is a / in argv[0], it has to be an absolute path. */
+    /* XXX Hmmm, why not if (argv0[0] == '/') ... instead? */
+    if (strchr(argv0, '/'))
+	return xstrdup(argv0);
+
+    if ((path = getenv("PATH")) == NULL || (path = xstrdup(path)) == NULL)
+	return NULL;
+
+    /* The return buffer in t is big enough for any path. */
+    if ((t = malloc(strlen(path) + strlen(argv0) + sizeof("/"))) != NULL)
+    for (s = path; s && *s; s = se) {
+
+	/* Snip PATH element into [s,se). */
+	if ((se = strchr(s, ':')))
+	    *se++ = '\0';
+
+	/* Append argv0 to PATH element. */
+	(void) stpcpy(stpcpy(stpcpy(t, s), "/"), argv0);
+
+	/* If file is executable, bingo! */
+	if (!access(t, X_OK))
+	    break;
+    }
+
+    /* If no executable was found in PATH, return NULL. */
+    if (!(s && *s) && t != NULL) {
+	free(t);
+	t = NULL;
+    }
+/*@-modobserver -observertrans -usedef @*/
+    if (path != NULL)
+        free(path);
+/*@=modobserver =observertrans =usedef @*/
+
+    return t;
+}
+
 static int execCommand(poptContext con)
 	/*@globals internalState @*/
 	/*@modifies internalState @*/
@@ -413,7 +461,7 @@ static int execCommand(poptContext con)
 
 	argv[argc] = s;
     } else
-	argv[argc] = POPT_findProgramPath(item->argv[0]);
+	argv[argc] = findProgramPath(item->argv[0]);
     if (argv[argc++] == NULL) {
 	ec = POPT_ERROR_NOARG;
 	goto exit;
@@ -593,13 +641,13 @@ expandNextArg(/*@special@*/ poptContext con, const char * s)
 	/*@modifies con @*/
 {
     const char * a = NULL;
-    size_t alen;
     char *t, *te;
     size_t tn = strlen(s) + 1;
     char c;
 
-    te = t = malloc(tn);;
+    te = t = malloc(tn);
     if (t == NULL) return NULL;		/* XXX can't happen */
+    *t = '\0';
     while ((c = *s++) != '\0') {
 	switch (c) {
 #if 0	/* XXX can't do this */
@@ -617,12 +665,11 @@ expandNextArg(/*@special@*/ poptContext con, const char * s)
 	    }
 	    s += 3;
 
-	    alen = strlen(a);
-	    tn += alen;
-	    *te = '\0';
-	    t = realloc(t, tn);
-	    te = t + strlen(t);
-	    strncpy(te, a, alen); te += alen;
+	    tn += strlen(a);
+	    {   size_t pos = (size_t) (te - t);
+		t = realloc(t, tn);
+		te = stpcpy(t + pos, a);
+	    }
 	    continue;
 	    /*@notreached@*/ /*@switchbreak@*/ break;
 	default:
@@ -630,8 +677,15 @@ expandNextArg(/*@special@*/ poptContext con, const char * s)
 	}
 	*te++ = c;
     }
-    *te = '\0';
-    t = realloc(t, strlen(t) + 1);	/* XXX memory leak, hard to plug */
+    *te++ = '\0';
+    /* If the new string is longer than needed, shorten. */
+    if ((t + tn) > te) {
+/*@-usereleased@*/	/* XXX splint can't follow the pointers. */
+	if ((te = realloc(t, (size_t)(te - t))) == NULL)
+	    free(t);
+	t = te;
+/*@=usereleased@*/
+    }
     return t;
 }
 
@@ -932,7 +986,7 @@ int poptGetNextOpt(poptContext con)
 
 	    origOptString++;
 	    if (*origOptString != '\0')
-		con->os->nextCharArg = origOptString + (*origOptString == '=');
+		con->os->nextCharArg = origOptString + (int)(*origOptString == '=');
 	}
 
 	if (opt == NULL) return POPT_ERROR_BADOPT;	/* XXX can't happen */
diff --git a/poptconfig.c b/poptconfig.c
index bf8fef3..e2b5385 100644
--- a/poptconfig.c
+++ b/poptconfig.c
@@ -224,8 +224,7 @@ int poptReadDefaultConfig(poptContext con, /*@unused@*/ UNUSED(int useEnv))
     if ((home = getenv("HOME"))) {
 	fn = malloc(strlen(home) + 20);
 	if (fn != NULL) {
-	    strcpy(fn, home);
-	    strcat(fn, "/.popt");
+	    (void) stpcpy(stpcpy(fn, home), "/.popt");
 	    rc = poptReadConfigFile(con, fn);
 	    free(fn);
 	} else
diff --git a/popthelp.c b/popthelp.c
index bd64d2c..258cd76 100644
--- a/popthelp.c
+++ b/popthelp.c
@@ -237,7 +237,7 @@ singleOptionDefaultValue(size_t lineLength,
     if (le == NULL) return NULL;	/* XXX can't happen */
     *le = '\0';
     *le++ = '(';
-    strcpy(le, defstr);	le += strlen(le);
+    le = stpcpy(le, defstr);
     *le++ = ':';
     *le++ = ' ';
   if (opt->arg) {	/* XXX programmer error */
@@ -268,9 +268,9 @@ singleOptionDefaultValue(size_t lineLength,
 	break;
     case POPT_ARG_STRING:
     {	const char * s = arg.argv[0];
-	if (s == NULL) {
-	    strcpy(le, "null");	le += strlen(le);
-	} else {
+	if (s == NULL)
+	    le = stpcpy(le, "null");
+	else {
 	    size_t slen = 4*lineLength - (le - l) - sizeof("\"...\")");
 	    *le++ = '"';
 	    strncpy(le, s, slen); le[slen] = '\0'; le += strlen(le);	
@@ -332,18 +332,21 @@ static void singleOptionHelp(FILE * fp, columns_t columns,
 #define	prtlong	(opt->longName != NULL)	/* XXX splint needs a clue */
     if (!(prtshort || prtlong))
 	goto out;
-    if (prtshort && prtlong)
-	sprintf(left, "-%c, %s%s", opt->shortName,
-		(F_ISSET(opt, ONEDASH) ? "-" : "--"),
-		opt->longName);
-    else if (prtshort) 
-	sprintf(left, "-%c", opt->shortName);
-    else if (prtlong)
+    if (prtshort && prtlong) {
+	char *dash = F_ISSET(opt, ONEDASH) ? "-" : "--";
+	left[0] = '-';
+	left[1] = opt->shortName;
+	(void) stpcpy(stpcpy(stpcpy(left+2, ", "), dash), opt->longName);
+    } else if (prtshort) {
+	left[0] = '-';
+	left[1] = opt->shortName;
+	left[2] = '\0';
+    } else if (prtlong) {
 	/* XXX --long always padded for alignment with/without "-X, ". */
-	sprintf(left, "    %s%s",
-		(poptArgType(opt) == POPT_ARG_MAINCALL ? "" :
-		(F_ISSET(opt, ONEDASH) ? "-" : "--")),
-		opt->longName);
+	char *dash = poptArgType(opt) == POPT_ARG_MAINCALL ? ""
+		   : (F_ISSET(opt, ONEDASH) ? "-" : "--");
+	(void) stpcpy(stpcpy(stpcpy(left, "    "), dash), opt->longName);
+    }
 #undef	prtlong
 
     if (argDescrip) {
@@ -361,9 +364,8 @@ static void singleOptionHelp(FILE * fp, columns_t columns,
 		if (t) {
 		    char * te = t;
 		    *te = '\0';
-		    if (help) {
-			strcpy(te, help);	te += strlen(te);
-		    }
+		    if (help)
+			te = stpcpy(te, help);
 		    *te++ = ' ';
 		    strcpy(te, defs);
 		    defs = _free(defs);
diff --git a/poptint.c b/poptint.c
index 264ec3b..6c135ad 100644
--- a/poptint.c
+++ b/poptint.c
@@ -157,7 +157,7 @@ POPT_fprintf (FILE * stream, const char * format, ...)
     int rc;
     va_list ap;
 
-#if defined(HAVE_VASPRINTF)
+#if defined(HAVE_VASPRINTF) && !defined(__LCLINT__)
     va_start(ap, format);
     if ((rc = vasprintf(&b, format, ap)) < 0)
 	b = NULL;
-- 
Gitee


From d26039c9bd46cc0f51712db1e80cc36d8a33342d Mon Sep 17 00:00:00 2001
From: Robert Scheck <robert@fedoraproject.org>
Date: Wed, 12 Mar 2008 21:26:58 +0000
Subject: [PATCH 534/667] Updated de.po (not from the Translation Project)

---
 CHANGES  |  1 +
 po/de.po | 18 ++++++++----------
 2 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/CHANGES b/CHANGES
index 133bcce..93d4699 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,4 +1,5 @@
 1.13 -> 1.14:
+    - rsc: updated de.po (not from the Translation Project).
     - jbj: study the mess with splint. Sigh, splint is so easily confused ...
     - jbj: rewrite findProgramPath & move to popt.c. Nuke the findme.{c,h} toys.
     - jbj: use stpcpy several more places (Wayne Davison<wayned@samba.org>).
diff --git a/po/de.po b/po/de.po
index 848e09f..6fc96a2 100644
--- a/po/de.po
+++ b/po/de.po
@@ -1,14 +1,14 @@
 # Translation of popt to German (Deutsch)
 # This file is distributed under the same license as the popt package.
-# Robert Scheck <rpm@robert-scheck.de>, 2004-2007.
+# Robert Scheck <robert@rpm5.org>, 2004-2008.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: popt 1.11\n"
+"Project-Id-Version: popt 1.14\n"
 "Report-Msgid-Bugs-To: <popt-devel@rpm5.org>\n"
 "POT-Creation-Date: 2008-02-18 08:21-0500\n"
-"PO-Revision-Date: 2007-02-17 21:00+0100\n"
-"Last-Translator: Robert Scheck <rpm@robert-scheck.de>\n"
+"PO-Revision-Date: 2008-03-12 22:21+0100\n"
+"Last-Translator: Robert Scheck <robert@rpm5.org>\n"
 "Language-Team: German <de@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -19,9 +19,9 @@ msgid "unknown errno"
 msgstr "Unbekannte Fehler-Nummer"
 
 #: popt.c:1090
-#, fuzzy, c-format
+#, c-format
 msgid "option type (%u) not implemented in popt\n"
-msgstr "Optionstyp (%d) ist in popt nicht vorhanden\n"
+msgstr "Optionstyp (%u) ist nicht in popt implementiert\n"
 
 #: popt.c:1294
 msgid "missing argument"
@@ -76,9 +76,8 @@ msgid "Display option defaults in message"
 msgstr "Zeigt die Standardeinstellungen an"
 
 #: popthelp.c:91
-#, fuzzy
 msgid "Terminate options"
-msgstr "Hilfe-Optionen:"
+msgstr "Schließt die Optionen ab"
 
 #: popthelp.c:190
 msgid "Help options:"
@@ -105,9 +104,8 @@ msgid "LONG"
 msgstr "LONG"
 
 #: popthelp.c:207
-#, fuzzy
 msgid "LONGLONG"
-msgstr "LONG"
+msgstr "LONGLONG"
 
 #: popthelp.c:208
 msgid "STRING"
-- 
Gitee


From 2a18288d63a487583f7ab5b1ddb7845f078a9cbc Mon Sep 17 00:00:00 2001
From: Jeff Johnson <n3npq@mac.com>
Date: Thu, 27 Mar 2008 17:31:24 +0000
Subject: [PATCH 535/667] - jbj: add @LTLIBICONV@ when needed (Stanislav
 Brabec<sbrabec@suse.cz>). - jbj: fix: remove the "echo --" Fedorable
 hack-a-round.

---
 CHANGES      | 2 ++
 Makefile.am  | 2 +-
 configure.ac | 1 +
 test-poptrc  | 4 ++--
 4 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/CHANGES b/CHANGES
index 93d4699..3dff254 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,4 +1,6 @@
 1.13 -> 1.14:
+    - jbj: add @LTLIBICONV@ when needed (Stanislav Brabec<sbrabec@suse.cz>).
+    - jbj: fix: remove the "echo --" Fedorable hack-a-round.
     - rsc: updated de.po (not from the Translation Project).
     - jbj: study the mess with splint. Sigh, splint is so easily confused ...
     - jbj: rewrite findProgramPath & move to popt.c. Nuke the findme.{c,h} toys.
diff --git a/Makefile.am b/Makefile.am
index 71206e7..e142c53 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -40,7 +40,7 @@ usrlibdir = $(libdir)
 usrlib_LTLIBRARIES = libpopt.la
 
 libpopt_la_SOURCES = popt.c poptparse.c poptconfig.c popthelp.c poptint.c
-libpopt_la_LDFLAGS = -no-undefined @LTLIBINTL@
+libpopt_la_LDFLAGS = -no-undefined @LTLIBINTL@ @LTLIBICONV@
 
 if HAVE_LD_VERSION_SCRIPT
 libpopt_la_LDFLAGS += -Wl,--version-script=$(srcdir)/libpopt.vers
diff --git a/configure.ac b/configure.ac
index f0f2e43..e7b39f8 100755
--- a/configure.ac
+++ b/configure.ac
@@ -72,6 +72,7 @@ AC_CHECK_FUNC(setreuid, [], [
 AC_CHECK_FUNCS(getuid geteuid iconv mtrace __secure_getenv setregid stpcpy strerror vasprintf)
 
 AM_GNU_GETTEXT([external])
+AM_ICONV_LINK
 
 popt_sysconfdir="${sysconfdir}"
 eval "popt_sysconfdir=\"${popt_sysconfdir}\"" # expand contained ${prefix}
diff --git a/test-poptrc b/test-poptrc
index 47b125b..509e013 100644
--- a/test-poptrc
+++ b/test-poptrc
@@ -7,6 +7,6 @@ test1 alias -O --arg1
 test1 alias --grab --arg2 "'foo !#:+'"
 test1 alias --grabbar --grab bar
 
-test1 exec --echo-args echo --
+test1 exec --echo-args echo
 test1 alias -e --echo-args
-test1 exec -a /bin/echo --
+test1 exec -a /bin/echo
-- 
Gitee


From 2c09749b7e4712f84557e67c57f2e12fafc978c5 Mon Sep 17 00:00:00 2001
From: Jeff Johnson <n3npq@mac.com>
Date: Thu, 27 Mar 2008 17:35:33 +0000
Subject: [PATCH 536/667] - jbj: use stpcpy 2 more places (Wayne
 Davison<wayned@samba.org>).

---
 CHANGES    |  1 +
 popthelp.c | 21 +++++++++------------
 2 files changed, 10 insertions(+), 12 deletions(-)

diff --git a/CHANGES b/CHANGES
index 3dff254..2dd6d3d 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,4 +1,5 @@
 1.13 -> 1.14:
+    - jbj: use stpcpy 2 more places (Wayne Davison<wayned@samba.org>).
     - jbj: add @LTLIBICONV@ when needed (Stanislav Brabec<sbrabec@suse.cz>).
     - jbj: fix: remove the "echo --" Fedorable hack-a-round.
     - rsc: updated de.po (not from the Translation Project).
diff --git a/popthelp.c b/popthelp.c
index 258cd76..39dd8b7 100644
--- a/popthelp.c
+++ b/popthelp.c
@@ -271,12 +271,12 @@ singleOptionDefaultValue(size_t lineLength,
 	if (s == NULL)
 	    le = stpcpy(le, "null");
 	else {
-	    size_t slen = 4*lineLength - (le - l) - sizeof("\"...\")");
+	    size_t limit = 4*lineLength - (le - l) - sizeof("\"\")");
+	    size_t slen;
 	    *le++ = '"';
-	    strncpy(le, s, slen); le[slen] = '\0'; le += strlen(le);	
-	    if (slen < strlen(s)) {
-		strcpy(le, "...");	le += strlen(le);
-	    }
+	    strncpy(le, s, limit); le[limit] = '\0'; le += (slen = strlen(le));
+	    if (slen == limit && s[limit])
+		le[-1] = le[-2] = le[-3] = '.';
 	    *le++ = '"';
 	}
     }	break;
@@ -363,7 +363,6 @@ static void singleOptionHelp(FILE * fp, columns_t columns,
 				strlen(defs) + sizeof(" "));
 		if (t) {
 		    char * te = t;
-		    *te = '\0';
 		    if (help)
 			te = stpcpy(te, help);
 		    *te++ = ' ';
@@ -417,24 +416,22 @@ static void singleOptionHelp(FILE * fp, columns_t columns,
 	    case POPT_ARG_DOUBLE:
 	    case POPT_ARG_STRING:
 		*le++ = (opt->longName != NULL ? '=' : ' ');
-		strcpy(le, argDescrip);		le += strlen(le);
+		le = stpcpy(le, argDescrip);
 		break;
 	    default:
 		break;
 	    }
 	} else {
-	    size_t lelen;
+	    char *leo;
 
 	    /* XXX argDescrip[0] determines "--foo=bar" or "--foo bar". */
 	    if (!strchr(" =(", argDescrip[0]))
 		*le++ = ((poptArgType(opt) == POPT_ARG_MAINCALL) ? ' ' :
 			 (poptArgType(opt) == POPT_ARG_ARGV) ? ' ' : '=');
-	    strcpy(le, argDescrip);
-	    lelen = strlen(le);
-	    le += lelen;
+	    le = stpcpy(leo = le, argDescrip);
 
 	    /* Adjust for (possible) wide characters. */
-	    displaypad = (int)(lelen - stringDisplayWidth(argDescrip));
+	    displaypad = (int)((le - leo) - stringDisplayWidth(argDescrip));
 	}
 	if (F_ISSET(opt, OPTIONAL))
 	    *le++ = ']';
-- 
Gitee


From 9f734fd6e26eaf83d5d22cd7692e3a323a08194a Mon Sep 17 00:00:00 2001
From: Jeff Johnson <n3npq@mac.com>
Date: Wed, 2 Apr 2008 17:37:04 +0000
Subject: [PATCH 537/667] - jbj: remove findme.c, add poptint.c, to
 po/POTFILES.in.

---
 CHANGES        |  1 +
 po/POTFILES.in |  2 +-
 po/cs.po       | 56 +++++++++++++++++++++++++-------------------------
 po/da.po       | 56 +++++++++++++++++++++++++-------------------------
 po/de.po       | 56 +++++++++++++++++++++++++-------------------------
 po/es.po       | 56 +++++++++++++++++++++++++-------------------------
 po/fi.po       | 56 +++++++++++++++++++++++++-------------------------
 po/fr.po       | 56 +++++++++++++++++++++++++-------------------------
 po/ga.po       | 56 +++++++++++++++++++++++++-------------------------
 po/gl.po       | 56 +++++++++++++++++++++++++-------------------------
 po/hu.po       | 56 +++++++++++++++++++++++++-------------------------
 po/is.po       | 56 +++++++++++++++++++++++++-------------------------
 po/it.po       | 56 +++++++++++++++++++++++++-------------------------
 po/ja.po       | 56 +++++++++++++++++++++++++-------------------------
 po/ko.po       | 56 +++++++++++++++++++++++++-------------------------
 po/nb.po       | 56 +++++++++++++++++++++++++-------------------------
 po/nl.po       | 56 +++++++++++++++++++++++++-------------------------
 po/pl.po       | 56 +++++++++++++++++++++++++-------------------------
 po/popt.pot    | 56 +++++++++++++++++++++++++-------------------------
 po/pt.po       | 56 +++++++++++++++++++++++++-------------------------
 po/ro.po       | 56 +++++++++++++++++++++++++-------------------------
 po/ru.po       | 56 +++++++++++++++++++++++++-------------------------
 po/sk.po       | 56 +++++++++++++++++++++++++-------------------------
 po/sl.po       | 56 +++++++++++++++++++++++++-------------------------
 po/sv.po       | 56 +++++++++++++++++++++++++-------------------------
 po/th.po       | 56 +++++++++++++++++++++++++-------------------------
 po/tr.po       | 56 +++++++++++++++++++++++++-------------------------
 po/uk.po       | 56 +++++++++++++++++++++++++-------------------------
 po/vi.po       | 56 +++++++++++++++++++++++++-------------------------
 po/wa.po       | 56 +++++++++++++++++++++++++-------------------------
 po/zh_CN.po    | 56 +++++++++++++++++++++++++-------------------------
 po/zh_TW.po    | 56 +++++++++++++++++++++++++-------------------------
 32 files changed, 842 insertions(+), 841 deletions(-)

diff --git a/CHANGES b/CHANGES
index 2dd6d3d..3d23b56 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,4 +1,5 @@
 1.13 -> 1.14:
+    - jbj: remove findme.c, add poptint.c, to po/POTFILES.in.
     - jbj: use stpcpy 2 more places (Wayne Davison<wayned@samba.org>).
     - jbj: add @LTLIBICONV@ when needed (Stanislav Brabec<sbrabec@suse.cz>).
     - jbj: fix: remove the "echo --" Fedorable hack-a-round.
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 2e2af76..187372c 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -2,10 +2,10 @@
 
 # Package source files
 
-findme.c
 popt.c
 popt.h
 poptconfig.c
 popthelp.c
+poptint.c
 poptparse.c
 test1.c
diff --git a/po/cs.po b/po/cs.po
index f20908f..b7a382d 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.11\n"
 "Report-Msgid-Bugs-To: <popt-devel@rpm5.org>\n"
-"POT-Creation-Date: 2008-02-18 08:21-0500\n"
+"POT-Creation-Date: 2008-04-02 13:18-0400\n"
 "PO-Revision-Date: 2001-07-24 00:03+0100\n"
 "Last-Translator: Milan Kerslager <kerslage@linux.cz>\n"
 "Language-Team: Czech <cs@li.org>\n"
@@ -10,113 +10,113 @@ msgstr ""
 "Content-Type: text/plain; charset=iso-8859-2\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: popt.c:35
+#: popt.c:42
 msgid "unknown errno"
 msgstr "nezn�m� ��slo chyby"
 
-#: popt.c:1090
+#: popt.c:1141
 #, fuzzy, c-format
 msgid "option type (%u) not implemented in popt\n"
 msgstr "volba (%d) nen� v popt implementov�na\n"
 
-#: popt.c:1294
+#: popt.c:1349
 msgid "missing argument"
 msgstr "chyb� argument"
 
-#: popt.c:1296
+#: popt.c:1351
 msgid "unknown option"
 msgstr "nezn�m� volba"
 
-#: popt.c:1298
+#: popt.c:1353
 msgid "mutually exclusive logical operations requested"
 msgstr "po�adov�ny vz�jemn� v�lu�n� logick� operace"
 
-#: popt.c:1300
+#: popt.c:1355
 msgid "opt->arg should not be NULL"
 msgstr "opt->arg nesm� b�t NULL"
 
-#: popt.c:1302
+#: popt.c:1357
 msgid "aliases nested too deeply"
 msgstr "aliasy vno�en� p��li� hluboko"
 
-#: popt.c:1304
+#: popt.c:1359
 msgid "error in parameter quoting"
 msgstr "chyba v quotov�n� parametr�"
 
-#: popt.c:1306
+#: popt.c:1361
 msgid "invalid numeric value"
 msgstr "chybn� numerick� hodnota"
 
-#: popt.c:1308
+#: popt.c:1363
 msgid "number too large or too small"
 msgstr "��slo je p��li� velk� nebo p��li� mal�"
 
-#: popt.c:1310
+#: popt.c:1365
 msgid "memory allocation failed"
 msgstr "selhala alokace pam�ti"
 
-#: popt.c:1314
+#: popt.c:1369
 msgid "unknown error"
 msgstr "nezn�m� chyba"
 
-#: popthelp.c:74 popthelp.c:85
+#: popthelp.c:75 popthelp.c:86
 msgid "Show this help message"
 msgstr "Vyp��e tuto n�pov�du"
 
-#: popthelp.c:75 popthelp.c:86
+#: popthelp.c:76 popthelp.c:87
 msgid "Display brief usage message"
 msgstr "Vyp��e kr�tk� n�vod k pou�it�"
 
-#: popthelp.c:89
+#: popthelp.c:90
 msgid "Display option defaults in message"
 msgstr "Zobrazit implicitn� volby ve zpr�v�"
 
-#: popthelp.c:91
+#: popthelp.c:92
 msgid "Terminate options"
 msgstr ""
 
-#: popthelp.c:190
+#: popthelp.c:191
 msgid "Help options:"
 msgstr ""
 
-#: popthelp.c:191
+#: popthelp.c:192
 msgid "Options implemented via popt alias/exec:"
 msgstr ""
 
-#: popthelp.c:199
+#: popthelp.c:200
 msgid "NONE"
 msgstr "NONE"
 
-#: popthelp.c:201
+#: popthelp.c:202
 msgid "VAL"
 msgstr "VAL"
 
-#: popthelp.c:205
+#: popthelp.c:206
 msgid "INT"
 msgstr "INT"
 
-#: popthelp.c:206
+#: popthelp.c:207
 msgid "LONG"
 msgstr "LONG"
 
-#: popthelp.c:207
+#: popthelp.c:208
 #, fuzzy
 msgid "LONGLONG"
 msgstr "LONG"
 
-#: popthelp.c:208
+#: popthelp.c:209
 msgid "STRING"
 msgstr "STRING"
 
-#: popthelp.c:209
+#: popthelp.c:210
 msgid "FLOAT"
 msgstr "FLOAT"
 
-#: popthelp.c:210
+#: popthelp.c:211
 msgid "DOUBLE"
 msgstr "DOUBLE"
 
-#: popthelp.c:213
+#: popthelp.c:214
 msgid "ARG"
 msgstr "ARG"
 
diff --git a/po/da.po b/po/da.po
index 267f0be..da38413 100644
--- a/po/da.po
+++ b/po/da.po
@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.11\n"
 "Report-Msgid-Bugs-To: <popt-devel@rpm5.org>\n"
-"POT-Creation-Date: 2008-02-18 08:21-0500\n"
+"POT-Creation-Date: 2008-04-02 13:18-0400\n"
 "PO-Revision-Date: Sun Jan 21 2001 04:30:32+0200\n"
 "Last-Translator: Martin Hansen <mah@k64.dk>\n"
 "Language-Team: Dansk <dansk@klid.dk>\n"
@@ -11,114 +11,114 @@ msgstr ""
 "Content-Transfer-Encoding: 8-bit\n"
 "X-Generator: KTranslator v 0.6.0\n"
 
-#: popt.c:35
+#: popt.c:42
 msgid "unknown errno"
 msgstr "ukendt fejlnr."
 
-#: popt.c:1090
+#: popt.c:1141
 #, fuzzy, c-format
 msgid "option type (%u) not implemented in popt\n"
 msgstr "tilvalgstype (%d) er ikke implementeret i popt\n"
 
-#: popt.c:1294
+#: popt.c:1349
 msgid "missing argument"
 msgstr "mangler argument"
 
-#: popt.c:1296
+#: popt.c:1351
 msgid "unknown option"
 msgstr "ukendt tilvalg"
 
-#: popt.c:1298
+#: popt.c:1353
 msgid "mutually exclusive logical operations requested"
 msgstr "de �nskede handlinger udelukker hinanden"
 
-#: popt.c:1300
+#: popt.c:1355
 msgid "opt->arg should not be NULL"
 msgstr ""
 
-#: popt.c:1302
+#: popt.c:1357
 msgid "aliases nested too deeply"
 msgstr "aliaser er for dybt indlejret"
 
-#: popt.c:1304
+#: popt.c:1359
 msgid "error in parameter quoting"
 msgstr "fejl i parameter citering"
 
-#: popt.c:1306
+#: popt.c:1361
 msgid "invalid numeric value"
 msgstr "ugyldig numerisk v�rdi"
 
-#: popt.c:1308
+#: popt.c:1363
 msgid "number too large or too small"
 msgstr "nummer for stort, eller for lille"
 
-#: popt.c:1310
+#: popt.c:1365
 msgid "memory allocation failed"
 msgstr ""
 
-#: popt.c:1314
+#: popt.c:1369
 msgid "unknown error"
 msgstr "ukendt fejl"
 
-#: popthelp.c:74 popthelp.c:85
+#: popthelp.c:75 popthelp.c:86
 msgid "Show this help message"
 msgstr "Vis denne hj�lpemeddelelse"
 
-#: popthelp.c:75 popthelp.c:86
+#: popthelp.c:76 popthelp.c:87
 msgid "Display brief usage message"
 msgstr "Vis kortfattet brugsanvisning"
 
-#: popthelp.c:89
+#: popthelp.c:90
 #, fuzzy
 msgid "Display option defaults in message"
 msgstr "Vis kortfattet brugsanvisning"
 
-#: popthelp.c:91
+#: popthelp.c:92
 msgid "Terminate options"
 msgstr ""
 
-#: popthelp.c:190
+#: popthelp.c:191
 msgid "Help options:"
 msgstr ""
 
-#: popthelp.c:191
+#: popthelp.c:192
 msgid "Options implemented via popt alias/exec:"
 msgstr ""
 
-#: popthelp.c:199
+#: popthelp.c:200
 msgid "NONE"
 msgstr "INGEN"
 
-#: popthelp.c:201
+#: popthelp.c:202
 msgid "VAL"
 msgstr "VAL"
 
-#: popthelp.c:205
+#: popthelp.c:206
 msgid "INT"
 msgstr "INT"
 
-#: popthelp.c:206
+#: popthelp.c:207
 msgid "LONG"
 msgstr "LONG"
 
-#: popthelp.c:207
+#: popthelp.c:208
 #, fuzzy
 msgid "LONGLONG"
 msgstr "LONG"
 
-#: popthelp.c:208
+#: popthelp.c:209
 msgid "STRING"
 msgstr "STRING"
 
-#: popthelp.c:209
+#: popthelp.c:210
 msgid "FLOAT"
 msgstr "FLOAT"
 
-#: popthelp.c:210
+#: popthelp.c:211
 msgid "DOUBLE"
 msgstr "DOUBLE"
 
-#: popthelp.c:213
+#: popthelp.c:214
 msgid "ARG"
 msgstr "ARG"
 
diff --git a/po/de.po b/po/de.po
index 6fc96a2..d329eae 100644
--- a/po/de.po
+++ b/po/de.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.14\n"
 "Report-Msgid-Bugs-To: <popt-devel@rpm5.org>\n"
-"POT-Creation-Date: 2008-02-18 08:21-0500\n"
+"POT-Creation-Date: 2008-04-02 13:18-0400\n"
 "PO-Revision-Date: 2008-03-12 22:21+0100\n"
 "Last-Translator: Robert Scheck <robert@rpm5.org>\n"
 "Language-Team: German <de@li.org>\n"
@@ -14,112 +14,112 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: popt.c:35
+#: popt.c:42
 msgid "unknown errno"
 msgstr "Unbekannte Fehler-Nummer"
 
-#: popt.c:1090
+#: popt.c:1141
 #, c-format
 msgid "option type (%u) not implemented in popt\n"
 msgstr "Optionstyp (%u) ist nicht in popt implementiert\n"
 
-#: popt.c:1294
+#: popt.c:1349
 msgid "missing argument"
 msgstr "Fehlendes Argument"
 
-#: popt.c:1296
+#: popt.c:1351
 msgid "unknown option"
 msgstr "Unbekannte Option"
 
-#: popt.c:1298
+#: popt.c:1353
 msgid "mutually exclusive logical operations requested"
 msgstr "Gegenseitig ausschließende logische Operatoren"
 
-#: popt.c:1300
+#: popt.c:1355
 msgid "opt->arg should not be NULL"
 msgstr "opt->arg sollte nicht NULL sein"
 
-#: popt.c:1302
+#: popt.c:1357
 msgid "aliases nested too deeply"
 msgstr "Aliase zu tief verschachtelt"
 
-#: popt.c:1304
+#: popt.c:1359
 msgid "error in parameter quoting"
 msgstr "Fehler beim Quotieren der Parameter"
 
-#: popt.c:1306
+#: popt.c:1361
 msgid "invalid numeric value"
 msgstr "Ungültiger nummerischer Wert"
 
-#: popt.c:1308
+#: popt.c:1363
 msgid "number too large or too small"
 msgstr "Nummer zu groß oder zu klein"
 
-#: popt.c:1310
+#: popt.c:1365
 msgid "memory allocation failed"
 msgstr "Speicherzuordnung fehlgeschlagen"
 
-#: popt.c:1314
+#: popt.c:1369
 msgid "unknown error"
 msgstr "Unbekannter Fehler"
 
-#: popthelp.c:74 popthelp.c:85
+#: popthelp.c:75 popthelp.c:86
 msgid "Show this help message"
 msgstr "Zeigt diese Hilfe an"
 
-#: popthelp.c:75 popthelp.c:86
+#: popthelp.c:76 popthelp.c:87
 msgid "Display brief usage message"
 msgstr "Zeigt eine kurze Verwendungsinformation"
 
-#: popthelp.c:89
+#: popthelp.c:90
 msgid "Display option defaults in message"
 msgstr "Zeigt die Standardeinstellungen an"
 
-#: popthelp.c:91
+#: popthelp.c:92
 msgid "Terminate options"
 msgstr "Schließt die Optionen ab"
 
-#: popthelp.c:190
+#: popthelp.c:191
 msgid "Help options:"
 msgstr "Hilfe-Optionen:"
 
-#: popthelp.c:191
+#: popthelp.c:192
 msgid "Options implemented via popt alias/exec:"
 msgstr "Optionen über popt alias/exec implementiert:"
 
-#: popthelp.c:199
+#: popthelp.c:200
 msgid "NONE"
 msgstr "NICHTS"
 
-#: popthelp.c:201
+#: popthelp.c:202
 msgid "VAL"
 msgstr "WERT"
 
-#: popthelp.c:205
+#: popthelp.c:206
 msgid "INT"
 msgstr "INTEGER"
 
-#: popthelp.c:206
+#: popthelp.c:207
 msgid "LONG"
 msgstr "LONG"
 
-#: popthelp.c:207
+#: popthelp.c:208
 msgid "LONGLONG"
 msgstr "LONGLONG"
 
-#: popthelp.c:208
+#: popthelp.c:209
 msgid "STRING"
 msgstr "STRING"
 
-#: popthelp.c:209
+#: popthelp.c:210
 msgid "FLOAT"
 msgstr "FLOAT"
 
-#: popthelp.c:210
+#: popthelp.c:211
 msgid "DOUBLE"
 msgstr "DOUBLE"
 
-#: popthelp.c:213
+#: popthelp.c:214
 msgid "ARG"
 msgstr "ARGUMENT"
 
diff --git a/po/es.po b/po/es.po
index 40a376d..cffcff4 100644
--- a/po/es.po
+++ b/po/es.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.12\n"
 "Report-Msgid-Bugs-To: <popt-devel@rpm5.org>\n"
-"POT-Creation-Date: 2008-02-18 08:21-0500\n"
+"POT-Creation-Date: 2008-04-02 13:18-0400\n"
 "PO-Revision-Date: 2007-12-28 12:22+0100\n"
 "Last-Translator: Leandro Lucarella <luca@linuxmendoza.org.ar>\n"
 "Language-Team: Spanish <es@li.org>\n"
@@ -14,113 +14,113 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: popt.c:35
+#: popt.c:42
 msgid "unknown errno"
 msgstr "errno desconocido"
 
-#: popt.c:1090
+#: popt.c:1141
 #, fuzzy, c-format
 msgid "option type (%u) not implemented in popt\n"
 msgstr "tipo de opción (%d) no implementada en popt\n"
 
-#: popt.c:1294
+#: popt.c:1349
 msgid "missing argument"
 msgstr "falta argumento"
 
-#: popt.c:1296
+#: popt.c:1351
 msgid "unknown option"
 msgstr "opción desconocida"
 
-#: popt.c:1298
+#: popt.c:1353
 msgid "mutually exclusive logical operations requested"
 msgstr "requerida operación lógica mutuamente exclusiva"
 
-#: popt.c:1300
+#: popt.c:1355
 msgid "opt->arg should not be NULL"
 msgstr ""
 
-#: popt.c:1302
+#: popt.c:1357
 msgid "aliases nested too deeply"
 msgstr "alias anidados muy profundamente"
 
-#: popt.c:1304
+#: popt.c:1359
 msgid "error in parameter quoting"
 msgstr "error en cita de parámetros"
 
-#: popt.c:1306
+#: popt.c:1361
 msgid "invalid numeric value"
 msgstr "valor numérico inválido"
 
-#: popt.c:1308
+#: popt.c:1363
 msgid "number too large or too small"
 msgstr "número muy largo o muy pequeño"
 
-#: popt.c:1310
+#: popt.c:1365
 msgid "memory allocation failed"
 msgstr ""
 
-#: popt.c:1314
+#: popt.c:1369
 msgid "unknown error"
 msgstr "error desconocido"
 
-#: popthelp.c:74 popthelp.c:85
+#: popthelp.c:75 popthelp.c:86
 msgid "Show this help message"
 msgstr "Muestra este mensaje de ayuda"
 
-#: popthelp.c:75 popthelp.c:86
+#: popthelp.c:76 popthelp.c:87
 msgid "Display brief usage message"
 msgstr "Indica el modo de uso resumido"
 
-#: popthelp.c:89
+#: popthelp.c:90
 msgid "Display option defaults in message"
 msgstr ""
 
-#: popthelp.c:91
+#: popthelp.c:92
 msgid "Terminate options"
 msgstr ""
 
-#: popthelp.c:190
+#: popthelp.c:191
 msgid "Help options:"
 msgstr ""
 
-#: popthelp.c:191
+#: popthelp.c:192
 msgid "Options implemented via popt alias/exec:"
 msgstr ""
 
-#: popthelp.c:199
+#: popthelp.c:200
 msgid "NONE"
 msgstr "NONE"
 
-#: popthelp.c:201
+#: popthelp.c:202
 msgid "VAL"
 msgstr "VAL"
 
-#: popthelp.c:205
+#: popthelp.c:206
 msgid "INT"
 msgstr "INT"
 
-#: popthelp.c:206
+#: popthelp.c:207
 msgid "LONG"
 msgstr "LONG"
 
-#: popthelp.c:207
+#: popthelp.c:208
 #, fuzzy
 msgid "LONGLONG"
 msgstr "LONG"
 
-#: popthelp.c:208
+#: popthelp.c:209
 msgid "STRING"
 msgstr "STRING"
 
-#: popthelp.c:209
+#: popthelp.c:210
 msgid "FLOAT"
 msgstr "FLOAT"
 
-#: popthelp.c:210
+#: popthelp.c:211
 msgid "DOUBLE"
 msgstr "DOUBLE"
 
-#: popthelp.c:213
+#: popthelp.c:214
 msgid "ARG"
 msgstr "ARG"
 
diff --git a/po/fi.po b/po/fi.po
index 259a009..d506db7 100644
--- a/po/fi.po
+++ b/po/fi.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.14\n"
 "Report-Msgid-Bugs-To: <popt-devel@rpm5.org>\n"
-"POT-Creation-Date: 2008-02-18 08:21-0500\n"
+"POT-Creation-Date: 2008-04-02 13:18-0400\n"
 "PO-Revision-Date: 2008-02-21 18:19+0200\n"
 "Last-Translator: Jorma Karvonen <karvjorm@users.sf.net>\n"
 "Language-Team: Finnish <translation-team-fi@lists.sourceforge.net>\n"
@@ -19,114 +19,114 @@ msgstr ""
 "X-Generator: KBabel 1.11.4\n"
 
 #  errno - number of last error (defined by the ISO C standard)
-#: popt.c:35
+#: popt.c:42
 msgid "unknown errno"
 msgstr "tuntematon errno-virhenumeroarvo"
 
-#: popt.c:1090
+#: popt.c:1141
 #, c-format
 msgid "option type (%u) not implemented in popt\n"
 msgstr "valitsintyyppiä (%u) ei ole toteutettu popt-ohjelmassa\n"
 
-#: popt.c:1294
+#: popt.c:1349
 msgid "missing argument"
 msgstr "puuttuva argumentti"
 
-#: popt.c:1296
+#: popt.c:1351
 msgid "unknown option"
 msgstr "tuntematon valitsin"
 
-#: popt.c:1298
+#: popt.c:1353
 msgid "mutually exclusive logical operations requested"
 msgstr "pyydettyjä loogisia toimintoja ei voi käyttää yhdessä"
 
-#: popt.c:1300
+#: popt.c:1355
 msgid "opt->arg should not be NULL"
 msgstr "”opt->arg”-valitsinargumentti ei saa olla NULL"
 
-#: popt.c:1302
+#: popt.c:1357
 msgid "aliases nested too deeply"
 msgstr "liian monta aliasta sisäkkäin"
 
-#: popt.c:1304
+#: popt.c:1359
 msgid "error in parameter quoting"
 msgstr "virhe parametrien lainauksessa"
 
-#: popt.c:1306
+#: popt.c:1361
 msgid "invalid numeric value"
 msgstr "virheellinen numeroarvo"
 
-#: popt.c:1308
+#: popt.c:1363
 msgid "number too large or too small"
 msgstr "numero on liian iso tai liian pieni"
 
-#: popt.c:1310
+#: popt.c:1365
 msgid "memory allocation failed"
 msgstr "muistin varaus ei onnistunut"
 
-#: popt.c:1314
+#: popt.c:1369
 msgid "unknown error"
 msgstr "tuntematon virhe"
 
-#: popthelp.c:74 popthelp.c:85
+#: popthelp.c:75 popthelp.c:86
 msgid "Show this help message"
 msgstr "Näytä tämä ohje"
 
-#: popthelp.c:75 popthelp.c:86
+#: popthelp.c:76 popthelp.c:87
 msgid "Display brief usage message"
 msgstr "Näytä lyhyt käyttöohje"
 
-#: popthelp.c:89
+#: popthelp.c:90
 msgid "Display option defaults in message"
 msgstr "Näytä valitsinoletukset ohjeessa"
 
-#: popthelp.c:91
+#: popthelp.c:92
 msgid "Terminate options"
 msgstr "Lopettamisvalitsimet"
 
-#: popthelp.c:190
+#: popthelp.c:191
 msgid "Help options:"
 msgstr "Ohjevalitsimet:"
 
-#: popthelp.c:191
+#: popthelp.c:192
 msgid "Options implemented via popt alias/exec:"
 msgstr ""
 "Valitsimet toteutettu ”popt alias”-määrittelyillä tai ”popt exec”-"
 "määrittelyillä:"
 
-#: popthelp.c:199
+#: popthelp.c:200
 msgid "NONE"
 msgstr "EI MITÄÄN"
 
-#: popthelp.c:201
+#: popthelp.c:202
 msgid "VAL"
 msgstr "ARVO"
 
-#: popthelp.c:205
+#: popthelp.c:206
 msgid "INT"
 msgstr "INT-KOKONAISLUKU"
 
-#: popthelp.c:206
+#: popthelp.c:207
 msgid "LONG"
 msgstr "LONG-KOKONAISLUKU"
 
-#: popthelp.c:207
+#: popthelp.c:208
 msgid "LONGLONG"
 msgstr "LONGLONG-KOKONAISLUKU"
 
-#: popthelp.c:208
+#: popthelp.c:209
 msgid "STRING"
 msgstr "MERKKIJONO"
 
-#: popthelp.c:209
+#: popthelp.c:210
 msgid "FLOAT"
 msgstr "FLOAT-LIUKULUKU"
 
-#: popthelp.c:210
+#: popthelp.c:211
 msgid "DOUBLE"
 msgstr "DOUBLE-LIUKULUKU"
 
-#: popthelp.c:213
+#: popthelp.c:214
 msgid "ARG"
 msgstr "ARGUMENTTI"
 
diff --git a/po/fr.po b/po/fr.po
index 2774ac7..ab1f7d3 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -12,7 +12,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.11\n"
 "Report-Msgid-Bugs-To: <popt-devel@rpm5.org>\n"
-"POT-Creation-Date: 2008-02-18 08:21-0500\n"
+"POT-Creation-Date: 2008-04-02 13:18-0400\n"
 "PO-Revision-Date: 2003-06-22 23:43+0200\n"
 "Last-Translator: RPM French Translation <rpm-fr@livna.org>\n"
 "Language-Team: RPM French Translation <rpm-fr@livna.org>\n"
@@ -20,113 +20,113 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8-bit\n"
 
-#: popt.c:35
+#: popt.c:42
 msgid "unknown errno"
 msgstr "errno inconnu"
 
-#: popt.c:1090
+#: popt.c:1141
 #, fuzzy, c-format
 msgid "option type (%u) not implemented in popt\n"
 msgstr "type(%d) d'option non implémenté dans popt\n"
 
-#: popt.c:1294
+#: popt.c:1349
 msgid "missing argument"
 msgstr "argument manquant"
 
-#: popt.c:1296
+#: popt.c:1351
 msgid "unknown option"
 msgstr "option iconnue"
 
-#: popt.c:1298
+#: popt.c:1353
 msgid "mutually exclusive logical operations requested"
 msgstr "opérations logiques mutuellement exclusives requises"
 
-#: popt.c:1300
+#: popt.c:1355
 msgid "opt->arg should not be NULL"
 msgstr "opt->arg ne devrait pas être NULL"
 
-#: popt.c:1302
+#: popt.c:1357
 msgid "aliases nested too deeply"
 msgstr "les alias sont trop entremellés"
 
-#: popt.c:1304
+#: popt.c:1359
 msgid "error in parameter quoting"
 msgstr "erreur en citant les paramètres"
 
-#: popt.c:1306
+#: popt.c:1361
 msgid "invalid numeric value"
 msgstr "valeur numérique invalide"
 
-#: popt.c:1308
+#: popt.c:1363
 msgid "number too large or too small"
 msgstr "nombre trop grand ou trop petit"
 
-#: popt.c:1310
+#: popt.c:1365
 msgid "memory allocation failed"
 msgstr "échec de l'allocation de mémoire"
 
-#: popt.c:1314
+#: popt.c:1369
 msgid "unknown error"
 msgstr "erreur inconnue"
 
-#: popthelp.c:74 popthelp.c:85
+#: popthelp.c:75 popthelp.c:86
 msgid "Show this help message"
 msgstr "Montre ce message d'aide"
 
-#: popthelp.c:75 popthelp.c:86
+#: popthelp.c:76 popthelp.c:87
 msgid "Display brief usage message"
 msgstr "Affiche un bref descriptif de l'utilisation"
 
-#: popthelp.c:89
+#: popthelp.c:90
 msgid "Display option defaults in message"
 msgstr "Afficher les valeurs par défaut des options dans le message"
 
-#: popthelp.c:91
+#: popthelp.c:92
 msgid "Terminate options"
 msgstr ""
 
-#: popthelp.c:190
+#: popthelp.c:191
 msgid "Help options:"
 msgstr ""
 
-#: popthelp.c:191
+#: popthelp.c:192
 msgid "Options implemented via popt alias/exec:"
 msgstr ""
 
-#: popthelp.c:199
+#: popthelp.c:200
 msgid "NONE"
 msgstr "RIEN"
 
-#: popthelp.c:201
+#: popthelp.c:202
 msgid "VAL"
 msgstr "VAL"
 
-#: popthelp.c:205
+#: popthelp.c:206
 msgid "INT"
 msgstr "ENTIER"
 
-#: popthelp.c:206
+#: popthelp.c:207
 msgid "LONG"
 msgstr "LONG"
 
-#: popthelp.c:207
+#: popthelp.c:208
 #, fuzzy
 msgid "LONGLONG"
 msgstr "LONG"
 
-#: popthelp.c:208
+#: popthelp.c:209
 msgid "STRING"
 msgstr "CHAINE"
 
-#: popthelp.c:209
+#: popthelp.c:210
 msgid "FLOAT"
 msgstr "FLOTTANT"
 
-#: popthelp.c:210
+#: popthelp.c:211
 msgid "DOUBLE"
 msgstr "DOUBLE"
 
-#: popthelp.c:213
+#: popthelp.c:214
 msgid "ARG"
 msgstr "ARG"
 
diff --git a/po/ga.po b/po/ga.po
index 65d1493..8264e90 100644
--- a/po/ga.po
+++ b/po/ga.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.11\n"
 "Report-Msgid-Bugs-To: <popt-devel@rpm5.org>\n"
-"POT-Creation-Date: 2008-02-18 08:21-0500\n"
+"POT-Creation-Date: 2008-04-02 13:18-0400\n"
 "PO-Revision-Date: 2007-06-19 06:21-0500\n"
 "Last-Translator: Kevin Scannell <kscanne@gmail.com>\n"
 "Language-Team: Irish <gaeilge-gnulinux@lists.sourceforge.net>\n"
@@ -14,114 +14,114 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: popt.c:35
+#: popt.c:42
 msgid "unknown errno"
 msgstr "errno anaithnid"
 
-#: popt.c:1090
+#: popt.c:1141
 #, fuzzy, c-format
 msgid "option type (%u) not implemented in popt\n"
 msgstr "níl an cineál rogha seo (%d) ar fáil i popt\n"
 
-#: popt.c:1294
+#: popt.c:1349
 msgid "missing argument"
 msgstr "argóint ar iarraidh"
 
-#: popt.c:1296
+#: popt.c:1351
 msgid "unknown option"
 msgstr "rogha anaithnid"
 
-#: popt.c:1298
+#: popt.c:1353
 msgid "mutually exclusive logical operations requested"
 msgstr "iarradh oibríochtaí loighciúla comheisiacha"
 
-#: popt.c:1300
+#: popt.c:1355
 msgid "opt->arg should not be NULL"
 msgstr "níor chóir rogha->arg a bheith NULL"
 
-#: popt.c:1302
+#: popt.c:1357
 msgid "aliases nested too deeply"
 msgstr "ailiasanna neadaithe ródhomhain"
 
-#: popt.c:1304
+#: popt.c:1359
 msgid "error in parameter quoting"
 msgstr "earráid agus paraiméadar á chur faoi chomharthaí athfhriotail"
 
-#: popt.c:1306
+#: popt.c:1361
 msgid "invalid numeric value"
 msgstr "luach neamhbhailí uimhriúil"
 
-#: popt.c:1308
+#: popt.c:1363
 msgid "number too large or too small"
 msgstr "uimhir rómhór nó róbheag"
 
-#: popt.c:1310
+#: popt.c:1365
 msgid "memory allocation failed"
 msgstr "theip ar dháileadh na cuimhne"
 
-#: popt.c:1314
+#: popt.c:1369
 msgid "unknown error"
 msgstr "earráid anaithnid"
 
-#: popthelp.c:74 popthelp.c:85
+#: popthelp.c:75 popthelp.c:86
 msgid "Show this help message"
 msgstr "Taispeáin an chabhair seo"
 
-#: popthelp.c:75 popthelp.c:86
+#: popthelp.c:76 popthelp.c:87
 msgid "Display brief usage message"
 msgstr "Taispeáin beagán eolais faoin úsáid"
 
-#: popthelp.c:89
+#: popthelp.c:90
 msgid "Display option defaults in message"
 msgstr "Taispeáin luachanna réamhshocraithe na roghanna sa teachtaireacht"
 
-#: popthelp.c:91
+#: popthelp.c:92
 #, fuzzy
 msgid "Terminate options"
 msgstr "Roghanna cabhracha:"
 
-#: popthelp.c:190
+#: popthelp.c:191
 msgid "Help options:"
 msgstr "Roghanna cabhracha:"
 
-#: popthelp.c:191
+#: popthelp.c:192
 msgid "Options implemented via popt alias/exec:"
 msgstr "Roghanna a cuireadh i bhfeidhm trí ailias/exec popt:"
 
-#: popthelp.c:199
+#: popthelp.c:200
 msgid "NONE"
 msgstr "NEAMHNÍ"
 
-#: popthelp.c:201
+#: popthelp.c:202
 msgid "VAL"
 msgstr "LUACH"
 
-#: popthelp.c:205
+#: popthelp.c:206
 msgid "INT"
 msgstr "INT"
 
-#: popthelp.c:206
+#: popthelp.c:207
 msgid "LONG"
 msgstr "LONG"
 
-#: popthelp.c:207
+#: popthelp.c:208
 #, fuzzy
 msgid "LONGLONG"
 msgstr "LONG"
 
-#: popthelp.c:208
+#: popthelp.c:209
 msgid "STRING"
 msgstr "STRING"
 
-#: popthelp.c:209
+#: popthelp.c:210
 msgid "FLOAT"
 msgstr "FLOAT"
 
-#: popthelp.c:210
+#: popthelp.c:211
 msgid "DOUBLE"
 msgstr "DOUBLE"
 
-#: popthelp.c:213
+#: popthelp.c:214
 msgid "ARG"
 msgstr "ARG"
 
diff --git a/po/gl.po b/po/gl.po
index c830947..90444bf 100644
--- a/po/gl.po
+++ b/po/gl.po
@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.11\n"
 "Report-Msgid-Bugs-To: <popt-devel@rpm5.org>\n"
-"POT-Creation-Date: 2008-02-18 08:21-0500\n"
+"POT-Creation-Date: 2008-04-02 13:18-0400\n"
 "PO-Revision-Date: 2001-01-17 01:01+0100\n"
 "Last-Translator: Jes�s Bravo �lvarez <jba@pobox.com>\n"
 "Language-Team: Galician <trasno@ceu.fi.udc.es>\n"
@@ -10,114 +10,114 @@ msgstr ""
 "Content-Type: text/plain; charset=iso-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: popt.c:35
+#: popt.c:42
 msgid "unknown errno"
 msgstr "errno desco�ecido"
 
-#: popt.c:1090
+#: popt.c:1141
 #, fuzzy, c-format
 msgid "option type (%u) not implemented in popt\n"
 msgstr "tipo de opci�n (%d) non implementada en popt\n"
 
-#: popt.c:1294
+#: popt.c:1349
 msgid "missing argument"
 msgstr "falta un argumento"
 
-#: popt.c:1296
+#: popt.c:1351
 msgid "unknown option"
 msgstr "opci�n desco�ecida"
 
-#: popt.c:1298
+#: popt.c:1353
 msgid "mutually exclusive logical operations requested"
 msgstr "solicit�ronse operaci�ns l�xicas mutuamente exclu�ntes"
 
-#: popt.c:1300
+#: popt.c:1355
 msgid "opt->arg should not be NULL"
 msgstr ""
 
-#: popt.c:1302
+#: popt.c:1357
 msgid "aliases nested too deeply"
 msgstr "aliases ani�ados a un nivel demasiado profundo"
 
-#: popt.c:1304
+#: popt.c:1359
 msgid "error in parameter quoting"
 msgstr "erro nas comi�as do par�metro"
 
-#: popt.c:1306
+#: popt.c:1361
 msgid "invalid numeric value"
 msgstr "valor num�rico non v�lido"
 
-#: popt.c:1308
+#: popt.c:1363
 msgid "number too large or too small"
 msgstr "n�mero demasiado grande ou pequeno"
 
-#: popt.c:1310
+#: popt.c:1365
 msgid "memory allocation failed"
 msgstr ""
 
-#: popt.c:1314
+#: popt.c:1369
 msgid "unknown error"
 msgstr "erro desco�ecido"
 
-#: popthelp.c:74 popthelp.c:85
+#: popthelp.c:75 popthelp.c:86
 msgid "Show this help message"
 msgstr "Amosar esta mensaxe de axuda"
 
-#: popthelp.c:75 popthelp.c:86
+#: popthelp.c:76 popthelp.c:87
 msgid "Display brief usage message"
 msgstr "Amosar brevemente o xeito de utilizaci�n"
 
-#: popthelp.c:89
+#: popthelp.c:90
 #, fuzzy
 msgid "Display option defaults in message"
 msgstr "Amosar brevemente o xeito de utilizaci�n"
 
-#: popthelp.c:91
+#: popthelp.c:92
 msgid "Terminate options"
 msgstr ""
 
-#: popthelp.c:190
+#: popthelp.c:191
 msgid "Help options:"
 msgstr ""
 
-#: popthelp.c:191
+#: popthelp.c:192
 msgid "Options implemented via popt alias/exec:"
 msgstr ""
 
-#: popthelp.c:199
+#: popthelp.c:200
 msgid "NONE"
 msgstr "NADA"
 
-#: popthelp.c:201
+#: popthelp.c:202
 msgid "VAL"
 msgstr "VAL"
 
-#: popthelp.c:205
+#: popthelp.c:206
 msgid "INT"
 msgstr "INT"
 
-#: popthelp.c:206
+#: popthelp.c:207
 msgid "LONG"
 msgstr "LONG"
 
-#: popthelp.c:207
+#: popthelp.c:208
 #, fuzzy
 msgid "LONGLONG"
 msgstr "LONG"
 
-#: popthelp.c:208
+#: popthelp.c:209
 msgid "STRING"
 msgstr "CADEA"
 
-#: popthelp.c:209
+#: popthelp.c:210
 msgid "FLOAT"
 msgstr "FLOAT"
 
-#: popthelp.c:210
+#: popthelp.c:211
 msgid "DOUBLE"
 msgstr "DOUBLE"
 
-#: popthelp.c:213
+#: popthelp.c:214
 msgid "ARG"
 msgstr "ARG"
 
diff --git a/po/hu.po b/po/hu.po
index f21ff77..bcb2d26 100644
--- a/po/hu.po
+++ b/po/hu.po
@@ -5,7 +5,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.11\n"
 "Report-Msgid-Bugs-To: <popt-devel@rpm5.org>\n"
-"POT-Creation-Date: 2008-02-18 08:21-0500\n"
+"POT-Creation-Date: 2008-04-02 13:18-0400\n"
 "PO-Revision-Date: 2007-06-21 00:45+0200\n"
 "Last-Translator: Gabor Kelemen <kelemeng@gnome.hu>\n"
 "Language-Team: Hungarian <translation-team-hu@lists.sourceforge.net>\n"
@@ -15,114 +15,114 @@ msgstr ""
 "X-Generator: KBabel 1.11.4\n"
 "Plural-Forms:  nplurals=2; plural=(n != 1);\n"
 
-#: popt.c:35
+#: popt.c:42
 msgid "unknown errno"
 msgstr "ismeretlen hibaszám"
 
-#: popt.c:1090
+#: popt.c:1141
 #, fuzzy, c-format
 msgid "option type (%u) not implemented in popt\n"
 msgstr "a kapcsolótípus (%d) nincs megvalósítva a popt-ban\n"
 
-#: popt.c:1294
+#: popt.c:1349
 msgid "missing argument"
 msgstr "hiányzó paraméter"
 
-#: popt.c:1296
+#: popt.c:1351
 msgid "unknown option"
 msgstr "ismeretlen kapcsoló"
 
-#: popt.c:1298
+#: popt.c:1353
 msgid "mutually exclusive logical operations requested"
 msgstr "kölcsönösen kizáró logikai műveleteket kért"
 
-#: popt.c:1300
+#: popt.c:1355
 msgid "opt->arg should not be NULL"
 msgstr "az opt->arg nem lehet NULL"
 
-#: popt.c:1302
+#: popt.c:1357
 msgid "aliases nested too deeply"
 msgstr "az álnevek túl mélyen vannak egymásba ágyazva"
 
-#: popt.c:1304
+#: popt.c:1359
 msgid "error in parameter quoting"
 msgstr "hiba a paraméter idézésében"
 
-#: popt.c:1306
+#: popt.c:1361
 msgid "invalid numeric value"
 msgstr "érvénytelen numerikus érték"
 
-#: popt.c:1308
+#: popt.c:1363
 msgid "number too large or too small"
 msgstr "a szám túl nagy vagy túl kicsi"
 
-#: popt.c:1310
+#: popt.c:1365
 msgid "memory allocation failed"
 msgstr "a memóriafoglalás meghiúsult"
 
-#: popt.c:1314
+#: popt.c:1369
 msgid "unknown error"
 msgstr "ismeretlen hiba"
 
-#: popthelp.c:74 popthelp.c:85
+#: popthelp.c:75 popthelp.c:86
 msgid "Show this help message"
 msgstr "Ezen súgó megjelenítése"
 
-#: popthelp.c:75 popthelp.c:86
+#: popthelp.c:76 popthelp.c:87
 msgid "Display brief usage message"
 msgstr "Rövid használati utasítás megjelenítése"
 
-#: popthelp.c:89
+#: popthelp.c:90
 msgid "Display option defaults in message"
 msgstr "Kapcsolók alapértelmezéseinek megjelenítése"
 
-#: popthelp.c:91
+#: popthelp.c:92
 #, fuzzy
 msgid "Terminate options"
 msgstr "Súgólehetőségek:"
 
-#: popthelp.c:190
+#: popthelp.c:191
 msgid "Help options:"
 msgstr "Súgólehetőségek:"
 
-#: popthelp.c:191
+#: popthelp.c:192
 msgid "Options implemented via popt alias/exec:"
 msgstr "A popt alias/exec segítségével megvalósított kapcsolók:"
 
-#: popthelp.c:199
+#: popthelp.c:200
 msgid "NONE"
 msgstr "NINCS"
 
-#: popthelp.c:201
+#: popthelp.c:202
 msgid "VAL"
 msgstr "ÉRTÉK"
 
-#: popthelp.c:205
+#: popthelp.c:206
 msgid "INT"
 msgstr "EGÉSZ"
 
-#: popthelp.c:206
+#: popthelp.c:207
 msgid "LONG"
 msgstr "HOSSZÚ"
 
-#: popthelp.c:207
+#: popthelp.c:208
 #, fuzzy
 msgid "LONGLONG"
 msgstr "HOSSZÚ"
 
-#: popthelp.c:208
+#: popthelp.c:209
 msgid "STRING"
 msgstr "SZÖVEG"
 
-#: popthelp.c:209
+#: popthelp.c:210
 msgid "FLOAT"
 msgstr "LEBEGŐ"
 
-#: popthelp.c:210
+#: popthelp.c:211
 msgid "DOUBLE"
 msgstr "DUPLA"
 
-#: popthelp.c:213
+#: popthelp.c:214
 msgid "ARG"
 msgstr "PAR"
 
diff --git a/po/is.po b/po/is.po
index 135f45b..44a6c30 100644
--- a/po/is.po
+++ b/po/is.po
@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.11\n"
 "Report-Msgid-Bugs-To: <popt-devel@rpm5.org>\n"
-"POT-Creation-Date: 2008-02-18 08:21-0500\n"
+"POT-Creation-Date: 2008-04-02 13:18-0400\n"
 "PO-Revision-Date: 2001-06-08 01:35+0000\n"
 "Last-Translator: Richard Allen <ra@hp.is>\n"
 "Language-Team: is <kde-isl@mmedia.is>\n"
@@ -10,113 +10,113 @@ msgstr ""
 "Content-Type: text/plain; charset=ISO-8859-1\n"
 "Content-Transfer-Encoding: 8-bit\n"
 
-#: popt.c:35
+#: popt.c:42
 msgid "unknown errno"
 msgstr "��ekkt villun�mer"
 
-#: popt.c:1090
+#: popt.c:1141
 #, fuzzy, c-format
 msgid "option type (%u) not implemented in popt\n"
 msgstr "rofager�in (%d) er ekki studd � popt\n"
 
-#: popt.c:1294
+#: popt.c:1349
 msgid "missing argument"
 msgstr "vantar vi�fang"
 
-#: popt.c:1296
+#: popt.c:1351
 msgid "unknown option"
 msgstr "��ekktur rofi"
 
-#: popt.c:1298
+#: popt.c:1353
 msgid "mutually exclusive logical operations requested"
 msgstr "be�i� um rofa sem sl�kkva hvor � ��rum"
 
-#: popt.c:1300
+#: popt.c:1355
 msgid "opt->arg should not be NULL"
 msgstr "opt->arg �tti ekki a� vera NULL"
 
-#: popt.c:1302
+#: popt.c:1357
 msgid "aliases nested too deeply"
 msgstr "al�asar of fl�knir"
 
-#: popt.c:1304
+#: popt.c:1359
 msgid "error in parameter quoting"
 msgstr "villa � vi�f�ngum (g�salappir og svo frv.)"
 
-#: popt.c:1306
+#: popt.c:1361
 msgid "invalid numeric value"
 msgstr "�gilt t�lulegt gildi"
 
-#: popt.c:1308
+#: popt.c:1363
 msgid "number too large or too small"
 msgstr "talan of st�r e�a sm�"
 
-#: popt.c:1310
+#: popt.c:1365
 msgid "memory allocation failed"
 msgstr "ekki t�kst a� taka fr� minni"
 
-#: popt.c:1314
+#: popt.c:1369
 msgid "unknown error"
 msgstr "��ekkt villa"
 
-#: popthelp.c:74 popthelp.c:85
+#: popthelp.c:75 popthelp.c:86
 msgid "Show this help message"
 msgstr "S�na �essa hj�lp"
 
-#: popthelp.c:75 popthelp.c:86
+#: popthelp.c:76 popthelp.c:87
 msgid "Display brief usage message"
 msgstr "S�na stuttar notkunarlei�beiningar"
 
-#: popthelp.c:89
+#: popthelp.c:90
 msgid "Display option defaults in message"
 msgstr "S�na sj�lfgefin gildi rofa � skilabo�um"
 
-#: popthelp.c:91
+#: popthelp.c:92
 msgid "Terminate options"
 msgstr ""
 
-#: popthelp.c:190
+#: popthelp.c:191
 msgid "Help options:"
 msgstr ""
 
-#: popthelp.c:191
+#: popthelp.c:192
 msgid "Options implemented via popt alias/exec:"
 msgstr ""
 
-#: popthelp.c:199
+#: popthelp.c:200
 msgid "NONE"
 msgstr "ENGIN"
 
-#: popthelp.c:201
+#: popthelp.c:202
 msgid "VAL"
 msgstr "VAL"
 
-#: popthelp.c:205
+#: popthelp.c:206
 msgid "INT"
 msgstr "INT"
 
-#: popthelp.c:206
+#: popthelp.c:207
 msgid "LONG"
 msgstr "LONG"
 
-#: popthelp.c:207
+#: popthelp.c:208
 #, fuzzy
 msgid "LONGLONG"
 msgstr "LONG"
 
-#: popthelp.c:208
+#: popthelp.c:209
 msgid "STRING"
 msgstr "STRING"
 
-#: popthelp.c:209
+#: popthelp.c:210
 msgid "FLOAT"
 msgstr "FLOAT"
 
-#: popthelp.c:210
+#: popthelp.c:211
 msgid "DOUBLE"
 msgstr "DOUBLE"
 
-#: popthelp.c:213
+#: popthelp.c:214
 msgid "ARG"
 msgstr "ARG"
 
diff --git a/po/it.po b/po/it.po
index f26a5d6..981d93b 100644
--- a/po/it.po
+++ b/po/it.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.12\n"
 "Report-Msgid-Bugs-To: <popt-devel@rpm5.org>\n"
-"POT-Creation-Date: 2008-02-18 08:21-0500\n"
+"POT-Creation-Date: 2008-04-02 13:18-0400\n"
 "PO-Revision-Date: 2007-11-14 20:39+0100\n"
 "Last-Translator: Sandro Bonazzola <sandro.bonazzola@gmail.com>\n"
 "Language-Team: Italian <tp@lists.linux.it>\n"
@@ -16,113 +16,113 @@ msgstr ""
 "X-Poedit-Language: Italian\n"
 "X-Poedit-Country: ITALY\n"
 
-#: popt.c:35
+#: popt.c:42
 msgid "unknown errno"
 msgstr "errno sconosciuto"
 
-#: popt.c:1090
+#: popt.c:1141
 #, fuzzy, c-format
 msgid "option type (%u) not implemented in popt\n"
 msgstr "opzione di tipo (%d) non implementata in popt\n"
 
-#: popt.c:1294
+#: popt.c:1349
 msgid "missing argument"
 msgstr "argomento mancante"
 
-#: popt.c:1296
+#: popt.c:1351
 msgid "unknown option"
 msgstr "opzione sconosciuta"
 
-#: popt.c:1298
+#: popt.c:1353
 msgid "mutually exclusive logical operations requested"
 msgstr "richieste operazioni logiche mutuamente esclusive"
 
-#: popt.c:1300
+#: popt.c:1355
 msgid "opt->arg should not be NULL"
 msgstr "opt->arg non dovrebbe essere NULL"
 
-#: popt.c:1302
+#: popt.c:1357
 msgid "aliases nested too deeply"
 msgstr "alias nidificati troppo profondamente"
 
-#: popt.c:1304
+#: popt.c:1359
 msgid "error in parameter quoting"
 msgstr "errore nel quoting del parametro"
 
-#: popt.c:1306
+#: popt.c:1361
 msgid "invalid numeric value"
 msgstr "valore numerico errato"
 
-#: popt.c:1308
+#: popt.c:1363
 msgid "number too large or too small"
 msgstr "numero troppo grande o troppo piccolo"
 
-#: popt.c:1310
+#: popt.c:1365
 msgid "memory allocation failed"
 msgstr "allocazione di memoria fallita"
 
-#: popt.c:1314
+#: popt.c:1369
 msgid "unknown error"
 msgstr "errore sconosciuto"
 
-#: popthelp.c:74 popthelp.c:85
+#: popthelp.c:75 popthelp.c:86
 msgid "Show this help message"
 msgstr "Mostra questo messaggio di aiuto"
 
-#: popthelp.c:75 popthelp.c:86
+#: popthelp.c:76 popthelp.c:87
 msgid "Display brief usage message"
 msgstr "Mostra un breve messaggio di utilizzo"
 
-#: popthelp.c:89
+#: popthelp.c:90
 msgid "Display option defaults in message"
 msgstr "Mostra i valori predefiniti delle opzioni nei messaggi"
 
-#: popthelp.c:91
+#: popthelp.c:92
 msgid "Terminate options"
 msgstr ""
 
-#: popthelp.c:190
+#: popthelp.c:191
 msgid "Help options:"
 msgstr ""
 
-#: popthelp.c:191
+#: popthelp.c:192
 msgid "Options implemented via popt alias/exec:"
 msgstr ""
 
-#: popthelp.c:199
+#: popthelp.c:200
 msgid "NONE"
 msgstr "NONE"
 
-#: popthelp.c:201
+#: popthelp.c:202
 msgid "VAL"
 msgstr "VAL"
 
-#: popthelp.c:205
+#: popthelp.c:206
 msgid "INT"
 msgstr "INT"
 
-#: popthelp.c:206
+#: popthelp.c:207
 msgid "LONG"
 msgstr "LONG"
 
-#: popthelp.c:207
+#: popthelp.c:208
 #, fuzzy
 msgid "LONGLONG"
 msgstr "LONG"
 
-#: popthelp.c:208
+#: popthelp.c:209
 msgid "STRING"
 msgstr "STRING"
 
-#: popthelp.c:209
+#: popthelp.c:210
 msgid "FLOAT"
 msgstr "FLOAT"
 
-#: popthelp.c:210
+#: popthelp.c:211
 msgid "DOUBLE"
 msgstr "DOUBLE"
 
-#: popthelp.c:213
+#: popthelp.c:214
 msgid "ARG"
 msgstr "ARG"
 
diff --git a/po/ja.po b/po/ja.po
index ca3b0c8..8881812 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.11\n"
 "Report-Msgid-Bugs-To: <popt-devel@rpm5.org>\n"
-"POT-Creation-Date: 2008-02-18 08:21-0500\n"
+"POT-Creation-Date: 2008-04-02 13:18-0400\n"
 "PO-Revision-Date: 2003--8-25 19:00+0900\n"
 "Last-Translator: Yukihiro Nakai <ynakai@redhat.com>\n"
 "Language-Team: Japanese <ja@li.org>\n"
@@ -14,114 +14,114 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: popt.c:35
+#: popt.c:42
 msgid "unknown errno"
 msgstr "不明なエラー番号"
 
-#: popt.c:1090
+#: popt.c:1141
 #, fuzzy, c-format
 msgid "option type (%u) not implemented in popt\n"
 msgstr "オプションタイプ (%d) はpoptには実装されていません\n"
 
-#: popt.c:1294
+#: popt.c:1349
 msgid "missing argument"
 msgstr "引数がありません"
 
-#: popt.c:1296
+#: popt.c:1351
 msgid "unknown option"
 msgstr "不明なオプション"
 
-#: popt.c:1298
+#: popt.c:1353
 msgid "mutually exclusive logical operations requested"
 msgstr "排他的な悪ぺーレーションが必要です"
 
-#: popt.c:1300
+#: popt.c:1355
 msgid "opt->arg should not be NULL"
 msgstr "opt->argはNULLではいけません"
 
-#: popt.c:1302
+#: popt.c:1357
 msgid "aliases nested too deeply"
 msgstr "エイリアスのネストが深すぎます"
 
-#: popt.c:1304
+#: popt.c:1359
 msgid "error in parameter quoting"
 msgstr "パラメータのクオート付けでエラー"
 
-#: popt.c:1306
+#: popt.c:1361
 msgid "invalid numeric value"
 msgstr "不正な数値"
 
-#: popt.c:1308
+#: popt.c:1363
 msgid "number too large or too small"
 msgstr "数値が大きすぎるか小さすぎます"
 
-#: popt.c:1310
+#: popt.c:1365
 msgid "memory allocation failed"
 msgstr "メモリ確保に失敗しました"
 
-#: popt.c:1314
+#: popt.c:1369
 msgid "unknown error"
 msgstr "不明なエラー"
 
-#: popthelp.c:74 popthelp.c:85
+#: popthelp.c:75 popthelp.c:86
 msgid "Show this help message"
 msgstr "このヘルプメッセージを表示します"
 
-#: popthelp.c:75 popthelp.c:86
+#: popthelp.c:76 popthelp.c:87
 msgid "Display brief usage message"
 msgstr "使い方の概要を表示します"
 
-#: popthelp.c:89
+#: popthelp.c:90
 msgid "Display option defaults in message"
 msgstr "オプションのデフォルト値をメッセージに表示します"
 
-#: popthelp.c:91
+#: popthelp.c:92
 #, fuzzy
 msgid "Terminate options"
 msgstr "ヘルプオプション:"
 
-#: popthelp.c:190
+#: popthelp.c:191
 msgid "Help options:"
 msgstr "ヘルプオプション:"
 
-#: popthelp.c:191
+#: popthelp.c:192
 msgid "Options implemented via popt alias/exec:"
 msgstr "poptのalias/execで実装されているオプション:"
 
-#: popthelp.c:199
+#: popthelp.c:200
 msgid "NONE"
 msgstr "なし"
 
-#: popthelp.c:201
+#: popthelp.c:202
 msgid "VAL"
 msgstr "値"
 
-#: popthelp.c:205
+#: popthelp.c:206
 msgid "INT"
 msgstr "INT"
 
-#: popthelp.c:206
+#: popthelp.c:207
 msgid "LONG"
 msgstr "LONG"
 
-#: popthelp.c:207
+#: popthelp.c:208
 #, fuzzy
 msgid "LONGLONG"
 msgstr "LONG"
 
-#: popthelp.c:208
+#: popthelp.c:209
 msgid "STRING"
 msgstr "文字列"
 
-#: popthelp.c:209
+#: popthelp.c:210
 msgid "FLOAT"
 msgstr "FLOAT"
 
-#: popthelp.c:210
+#: popthelp.c:211
 msgid "DOUBLE"
 msgstr "DOUBLE"
 
-#: popthelp.c:213
+#: popthelp.c:214
 msgid "ARG"
 msgstr "ARG"
 
diff --git a/po/ko.po b/po/ko.po
index 3a38e37..3dc5d2d 100644
--- a/po/ko.po
+++ b/po/ko.po
@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.11\n"
 "Report-Msgid-Bugs-To: <popt-devel@rpm5.org>\n"
-"POT-Creation-Date: 2008-02-18 08:21-0500\n"
+"POT-Creation-Date: 2008-04-02 13:18-0400\n"
 "PO-Revision-Date: 2001-09-06 20:06+0900\n"
 "Last-Translator: Jong-Hoon Ryu <redhat4u@netian.com>\n"
 "Language-Team: GNU Translation project <ko@li.org>\n"
@@ -10,113 +10,113 @@ msgstr ""
 "Content-Type: text/plain; charset=EUC-KR\n"
 "Content-Transfer-Encoding: 8-bit\n"
 
-#: popt.c:35
+#: popt.c:42
 msgid "unknown errno"
 msgstr "�� �� ���� �����ڵ�(errno) �Դϴ�"
 
-#: popt.c:1090
+#: popt.c:1141
 #, fuzzy, c-format
 msgid "option type (%u) not implemented in popt\n"
 msgstr "�ɼ� ���� (%d)�� popt���� ����� �� �����ϴ�\n"
 
-#: popt.c:1294
+#: popt.c:1349
 msgid "missing argument"
 msgstr "�μ��� �������� �ʾҽ��ϴ�"
 
-#: popt.c:1296
+#: popt.c:1351
 msgid "unknown option"
 msgstr "�� �� ���� �ɼ��Դϴ�"
 
-#: popt.c:1298
+#: popt.c:1353
 msgid "mutually exclusive logical operations requested"
 msgstr "���ʿ� ��Ÿ�� ���� ������ �����Ǿ����ϴ�"
 
-#: popt.c:1300
+#: popt.c:1355
 msgid "opt->arg should not be NULL"
 msgstr "�ɼ�->�μ��� NULL�� �Ǿ�� �ȵ˴ϴ�"
 
-#: popt.c:1302
+#: popt.c:1357
 msgid "aliases nested too deeply"
 msgstr "��Ī(alias)�� �����ϰ� �����Ǿ����ϴ�"
 
-#: popt.c:1304
+#: popt.c:1359
 msgid "error in parameter quoting"
 msgstr "�Ű������� ������ �ֽ��ϴ�"
 
-#: popt.c:1306
+#: popt.c:1361
 msgid "invalid numeric value"
 msgstr "�߸��� ��ġ ���Դϴ�"
 
-#: popt.c:1308
+#: popt.c:1363
 msgid "number too large or too small"
 msgstr "���ڰ� �ʹ� ũ�ų� �ʹ� �����ϴ�"
 
-#: popt.c:1310
+#: popt.c:1365
 msgid "memory allocation failed"
 msgstr "�޸� �Ҵ翡 �����߽��ϴ�"
 
-#: popt.c:1314
+#: popt.c:1369
 msgid "unknown error"
 msgstr "�� �� ���� �����Դϴ�"
 
-#: popthelp.c:74 popthelp.c:85
+#: popthelp.c:75 popthelp.c:86
 msgid "Show this help message"
 msgstr "�� ������ �����ݴϴ�"
 
-#: popthelp.c:75 popthelp.c:86
+#: popthelp.c:76 popthelp.c:87
 msgid "Display brief usage message"
 msgstr "������ ������ �����ݴϴ�"
 
-#: popthelp.c:89
+#: popthelp.c:90
 msgid "Display option defaults in message"
 msgstr "�⺻���� �ɼ��� �����ݴϴ�"
 
-#: popthelp.c:91
+#: popthelp.c:92
 msgid "Terminate options"
 msgstr ""
 
-#: popthelp.c:190
+#: popthelp.c:191
 msgid "Help options:"
 msgstr ""
 
-#: popthelp.c:191
+#: popthelp.c:192
 msgid "Options implemented via popt alias/exec:"
 msgstr ""
 
-#: popthelp.c:199
+#: popthelp.c:200
 msgid "NONE"
 msgstr "����(NONE)"
 
-#: popthelp.c:201
+#: popthelp.c:202
 msgid "VAL"
 msgstr "��(VAL)"
 
-#: popthelp.c:205
+#: popthelp.c:206
 msgid "INT"
 msgstr "����(INT)"
 
-#: popthelp.c:206
+#: popthelp.c:207
 msgid "LONG"
 msgstr "����(LONG)"
 
-#: popthelp.c:207
+#: popthelp.c:208
 #, fuzzy
 msgid "LONGLONG"
 msgstr "����(LONG)"
 
-#: popthelp.c:208
+#: popthelp.c:209
 msgid "STRING"
 msgstr "���ڿ�(STRING)"
 
-#: popthelp.c:209
+#: popthelp.c:210
 msgid "FLOAT"
 msgstr "�Ҽ�(FLOAT)"
 
-#: popthelp.c:210
+#: popthelp.c:211
 msgid "DOUBLE"
 msgstr "�Ҽ�(DOUBLE)"
 
-#: popthelp.c:213
+#: popthelp.c:214
 msgid "ARG"
 msgstr "�μ�(ARG)"
 
diff --git a/po/nb.po b/po/nb.po
index 4595536..13e74ba 100644
--- a/po/nb.po
+++ b/po/nb.po
@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.11\n"
 "Report-Msgid-Bugs-To: <popt-devel@rpm5.org>\n"
-"POT-Creation-Date: 2008-02-18 08:21-0500\n"
+"POT-Creation-Date: 2008-04-02 13:18-0400\n"
 "PO-Revision-Date: 2001-06-27 11:05+0200\n"
 "Last-Translator: Kjartan Maraas <kmaraas@online.no>\n"
 "Language-Team: Norwegian <no@li.org>\n"
@@ -10,113 +10,113 @@ msgstr ""
 "Content-Type: text/plain; charset=iso-8859-1\n"
 "Content-Transfer-Encoding: 8-bit\n"
 
-#: popt.c:35
+#: popt.c:42
 msgid "unknown errno"
 msgstr "ukjent errno"
 
-#: popt.c:1090
+#: popt.c:1141
 #, fuzzy, c-format
 msgid "option type (%u) not implemented in popt\n"
 msgstr "flaggtype (%d) ikke implementert i popt\n"
 
-#: popt.c:1294
+#: popt.c:1349
 msgid "missing argument"
 msgstr "manglende argument"
 
-#: popt.c:1296
+#: popt.c:1351
 msgid "unknown option"
 msgstr "ukjent flagg"
 
-#: popt.c:1298
+#: popt.c:1353
 msgid "mutually exclusive logical operations requested"
 msgstr "gjensidig eksluderende logiske operasjoner forespurt"
 
-#: popt.c:1300
+#: popt.c:1355
 msgid "opt->arg should not be NULL"
 msgstr "opt->arg m� ikke v�re NULL"
 
-#: popt.c:1302
+#: popt.c:1357
 msgid "aliases nested too deeply"
 msgstr "aliaser med for dype l�kker"
 
-#: popt.c:1304
+#: popt.c:1359
 msgid "error in parameter quoting"
 msgstr "feil i parametersitering"
 
-#: popt.c:1306
+#: popt.c:1361
 msgid "invalid numeric value"
 msgstr "ugyldig numerisk verdi"
 
-#: popt.c:1308
+#: popt.c:1363
 msgid "number too large or too small"
 msgstr "tallet er for stort eller lite"
 
-#: popt.c:1310
+#: popt.c:1365
 msgid "memory allocation failed"
 msgstr "minneallokering feilet"
 
-#: popt.c:1314
+#: popt.c:1369
 msgid "unknown error"
 msgstr "ukjent feil"
 
-#: popthelp.c:74 popthelp.c:85
+#: popthelp.c:75 popthelp.c:86
 msgid "Show this help message"
 msgstr "Vis denne hjelpmeldingen"
 
-#: popthelp.c:75 popthelp.c:86
+#: popthelp.c:76 popthelp.c:87
 msgid "Display brief usage message"
 msgstr "Vis kort bruksmelding"
 
-#: popthelp.c:89
+#: popthelp.c:90
 msgid "Display option defaults in message"
 msgstr "Vis forvalgte flagg i melding"
 
-#: popthelp.c:91
+#: popthelp.c:92
 msgid "Terminate options"
 msgstr ""
 
-#: popthelp.c:190
+#: popthelp.c:191
 msgid "Help options:"
 msgstr ""
 
-#: popthelp.c:191
+#: popthelp.c:192
 msgid "Options implemented via popt alias/exec:"
 msgstr ""
 
-#: popthelp.c:199
+#: popthelp.c:200
 msgid "NONE"
 msgstr "INGEN"
 
-#: popthelp.c:201
+#: popthelp.c:202
 msgid "VAL"
 msgstr "VERDI"
 
-#: popthelp.c:205
+#: popthelp.c:206
 msgid "INT"
 msgstr "HELTALL"
 
-#: popthelp.c:206
+#: popthelp.c:207
 msgid "LONG"
 msgstr "LONG"
 
-#: popthelp.c:207
+#: popthelp.c:208
 #, fuzzy
 msgid "LONGLONG"
 msgstr "LONG"
 
-#: popthelp.c:208
+#: popthelp.c:209
 msgid "STRING"
 msgstr "STRENG"
 
-#: popthelp.c:209
+#: popthelp.c:210
 msgid "FLOAT"
 msgstr "FLYTTALL"
 
-#: popthelp.c:210
+#: popthelp.c:211
 msgid "DOUBLE"
 msgstr "DOUBLE"
 
-#: popthelp.c:213
+#: popthelp.c:214
 msgid "ARG"
 msgstr "ARG"
 
diff --git a/po/nl.po b/po/nl.po
index 1c97784..80020da 100644
--- a/po/nl.po
+++ b/po/nl.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.14\n"
 "Report-Msgid-Bugs-To: <popt-devel@rpm5.org>\n"
-"POT-Creation-Date: 2008-02-18 08:21-0500\n"
+"POT-Creation-Date: 2008-04-02 13:18-0400\n"
 "PO-Revision-Date: 2008-02-20 19:26+0100\n"
 "Last-Translator: Tim Van Holder <tim.van.holder@telenet.be>\n"
 "Language-Team: Dutch <vertaling@vrijschrift.org>\n"
@@ -14,116 +14,116 @@ msgstr ""
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: popt.c:35
+#: popt.c:42
 msgid "unknown errno"
 msgstr "onbekend foutnummer (errno)"
 
-#: popt.c:1090
+#: popt.c:1141
 #, c-format
 msgid "option type (%u) not implemented in popt\n"
 msgstr "dit optietype (%u) is niet geïmplementeerd in popt\n"
 
-#: popt.c:1294
+#: popt.c:1349
 msgid "missing argument"
 msgstr "ontbrekend argument"
 
-#: popt.c:1296
+#: popt.c:1351
 msgid "unknown option"
 msgstr "onbekende optie"
 
-#: popt.c:1298
+#: popt.c:1353
 msgid "mutually exclusive logical operations requested"
 msgstr "elkaar uitsluitende logische operatoren werden gevraagd"
 
-#: popt.c:1300
+#: popt.c:1355
 msgid "opt->arg should not be NULL"
 msgstr "opt->arg zou niet NULL mogen zijn"
 
-#: popt.c:1302
+#: popt.c:1357
 msgid "aliases nested too deeply"
 msgstr "aliassen zijn te diep genest"
 
 # of toch beter "quoting" behouden?
-#: popt.c:1304
+#: popt.c:1359
 msgid "error in parameter quoting"
 msgstr "fout in de aanhaling van parameters"
 
-#: popt.c:1306
+#: popt.c:1361
 msgid "invalid numeric value"
 msgstr "ongeldige numerieke waarde"
 
-#: popt.c:1308
+#: popt.c:1363
 msgid "number too large or too small"
 msgstr "getal is te klein of te groot"
 
-#: popt.c:1310
+#: popt.c:1365
 msgid "memory allocation failed"
 msgstr "reserveren van geheugen is mislukt"
 
-#: popt.c:1314
+#: popt.c:1369
 msgid "unknown error"
 msgstr "onbekende fout"
 
-#: popthelp.c:74 popthelp.c:85
+#: popthelp.c:75 popthelp.c:86
 msgid "Show this help message"
 msgstr "Deze hulptekst tonen"
 
-#: popthelp.c:75 popthelp.c:86
+#: popthelp.c:76 popthelp.c:87
 msgid "Display brief usage message"
 msgstr "Een korte gebruikssamenvatting tonen"
 
-#: popthelp.c:89
+#: popthelp.c:90
 msgid "Display option defaults in message"
 msgstr "De standaardwaarden van opties tonen in de tekst"
 
-#: popthelp.c:91
+#: popthelp.c:92
 msgid "Terminate options"
 msgstr "Opties beëindigen"
 
 # of "Help-opties:"?
-#: popthelp.c:190
+#: popthelp.c:191
 msgid "Help options:"
 msgstr "Hulp-opties:"
 
-#: popthelp.c:191
+#: popthelp.c:192
 msgid "Options implemented via popt alias/exec:"
 msgstr "Opties geïmplementeerd d.m.v. popt alias/exec:"
 
-#: popthelp.c:199
+#: popthelp.c:200
 msgid "NONE"
 msgstr "GEEN"
 
-#: popthelp.c:201
+#: popthelp.c:202
 msgid "VAL"
 msgstr "WAARDE"
 
-#: popthelp.c:205
+#: popthelp.c:206
 msgid "INT"
 msgstr "INT"
 
-#: popthelp.c:206
+#: popthelp.c:207
 msgid "LONG"
 msgstr "LONG"
 
-#: popthelp.c:207
+#: popthelp.c:208
 msgid "LONGLONG"
 msgstr "LONGLONG"
 
 # TEKENREEKS lijkt me niet gepast; dus ofwel STRING behouden, ofwel TEKST
-#: popthelp.c:208
+#: popthelp.c:209
 msgid "STRING"
 msgstr "TEKST"
 
-#: popthelp.c:209
+#: popthelp.c:210
 msgid "FLOAT"
 msgstr "FLOAT"
 
-#: popthelp.c:210
+#: popthelp.c:211
 msgid "DOUBLE"
 msgstr "DOUBLE"
 
 # of hier ARGUMENT van maken?
-#: popthelp.c:213
+#: popthelp.c:214
 msgid "ARG"
 msgstr "ARG"
 
diff --git a/po/pl.po b/po/pl.po
index ce3fc29..18b4239 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.14\n"
 "Report-Msgid-Bugs-To: <popt-devel@rpm5.org>\n"
-"POT-Creation-Date: 2008-02-18 08:21-0500\n"
+"POT-Creation-Date: 2008-04-02 13:18-0400\n"
 "PO-Revision-Date: 2008-02-18 00:30+0100\n"
 "Last-Translator: Jakub Bogusz <qboosh@pld-linux.org>\n"
 "Language-Team: Polish <translation-team-pl@lists.sourceforge.net>\n"
@@ -14,112 +14,112 @@ msgstr ""
 "Content-Type: text/plain; charset=iso-8859-2\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: popt.c:35
+#: popt.c:42
 msgid "unknown errno"
 msgstr "nieznane errno"
 
-#: popt.c:1090
+#: popt.c:1141
 #, c-format
 msgid "option type (%u) not implemented in popt\n"
 msgstr "typ opcji (%u) nie zaimplementowany w popt\n"
 
-#: popt.c:1294
+#: popt.c:1349
 msgid "missing argument"
 msgstr "brak parametru"
 
-#: popt.c:1296
+#: popt.c:1351
 msgid "unknown option"
 msgstr "nieznana opcja"
 
-#: popt.c:1298
+#: popt.c:1353
 msgid "mutually exclusive logical operations requested"
 msgstr "��danie wykluczaj�cych si� operacji"
 
-#: popt.c:1300
+#: popt.c:1355
 msgid "opt->arg should not be NULL"
 msgstr "opt->arg nie mo�e by� NULL"
 
-#: popt.c:1302
+#: popt.c:1357
 msgid "aliases nested too deeply"
 msgstr "zbyt du�e zag��bienie alias�w"
 
-#: popt.c:1304
+#: popt.c:1359
 msgid "error in parameter quoting"
 msgstr "b��d w cytowaniu parametru"
 
-#: popt.c:1306
+#: popt.c:1361
 msgid "invalid numeric value"
 msgstr "b��dna warto�� liczbowa"
 
-#: popt.c:1308
+#: popt.c:1363
 msgid "number too large or too small"
 msgstr "liczba zbyt du�a lub zbyt ma�a"
 
-#: popt.c:1310
+#: popt.c:1365
 msgid "memory allocation failed"
 msgstr "b��d alokacji pami�ci"
 
-#: popt.c:1314
+#: popt.c:1369
 msgid "unknown error"
 msgstr "nieznany b��d"
 
-#: popthelp.c:74 popthelp.c:85
+#: popthelp.c:75 popthelp.c:86
 msgid "Show this help message"
 msgstr "Poka� t� pomoc"
 
-#: popthelp.c:75 popthelp.c:86
+#: popthelp.c:76 popthelp.c:87
 msgid "Display brief usage message"
 msgstr "Wy�wietl skr�cony spos�b u�ycia"
 
-#: popthelp.c:89
+#: popthelp.c:90
 msgid "Display option defaults in message"
 msgstr "Wy�wietl domy�lne opcje w opisie"
 
-#: popthelp.c:91
+#: popthelp.c:92
 msgid "Terminate options"
 msgstr "Opcje zako�czenia"
 
-#: popthelp.c:190
+#: popthelp.c:191
 msgid "Help options:"
 msgstr "Opcje pomocy:"
 
-#: popthelp.c:191
+#: popthelp.c:192
 msgid "Options implemented via popt alias/exec:"
 msgstr "Opcje zaimplementowane poprzez popt alias/exec:"
 
-#: popthelp.c:199
+#: popthelp.c:200
 msgid "NONE"
 msgstr "BRAK"
 
-#: popthelp.c:201
+#: popthelp.c:202
 msgid "VAL"
 msgstr "WART"
 
-#: popthelp.c:205
+#: popthelp.c:206
 msgid "INT"
 msgstr "INT"
 
-#: popthelp.c:206
+#: popthelp.c:207
 msgid "LONG"
 msgstr "LONG"
 
-#: popthelp.c:207
+#: popthelp.c:208
 msgid "LONGLONG"
 msgstr "LONGLONG"
 
-#: popthelp.c:208
+#: popthelp.c:209
 msgid "STRING"
 msgstr "�A�CUCH"
 
-#: popthelp.c:209
+#: popthelp.c:210
 msgid "FLOAT"
 msgstr "FLOAT"
 
-#: popthelp.c:210
+#: popthelp.c:211
 msgid "DOUBLE"
 msgstr "DOUBLE"
 
-#: popthelp.c:213
+#: popthelp.c:214
 msgid "ARG"
 msgstr "PARAM"
 
diff --git a/po/popt.pot b/po/popt.pot
index 4f4a6e4..dd44688 100644
--- a/po/popt.pot
+++ b/po/popt.pot
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.14\n"
 "Report-Msgid-Bugs-To: <popt-devel@rpm5.org>\n"
-"POT-Creation-Date: 2008-02-18 08:21-0500\n"
+"POT-Creation-Date: 2008-04-02 13:18-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -15,112 +15,112 @@ msgstr ""
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: popt.c:35
+#: popt.c:42
 msgid "unknown errno"
 msgstr ""
 
-#: popt.c:1090
+#: popt.c:1141
 #, c-format
 msgid "option type (%u) not implemented in popt\n"
 msgstr ""
 
-#: popt.c:1294
+#: popt.c:1349
 msgid "missing argument"
 msgstr ""
 
-#: popt.c:1296
+#: popt.c:1351
 msgid "unknown option"
 msgstr ""
 
-#: popt.c:1298
+#: popt.c:1353
 msgid "mutually exclusive logical operations requested"
 msgstr ""
 
-#: popt.c:1300
+#: popt.c:1355
 msgid "opt->arg should not be NULL"
 msgstr ""
 
-#: popt.c:1302
+#: popt.c:1357
 msgid "aliases nested too deeply"
 msgstr ""
 
-#: popt.c:1304
+#: popt.c:1359
 msgid "error in parameter quoting"
 msgstr ""
 
-#: popt.c:1306
+#: popt.c:1361
 msgid "invalid numeric value"
 msgstr ""
 
-#: popt.c:1308
+#: popt.c:1363
 msgid "number too large or too small"
 msgstr ""
 
-#: popt.c:1310
+#: popt.c:1365
 msgid "memory allocation failed"
 msgstr ""
 
-#: popt.c:1314
+#: popt.c:1369
 msgid "unknown error"
 msgstr ""
 
-#: popthelp.c:74 popthelp.c:85
+#: popthelp.c:75 popthelp.c:86
 msgid "Show this help message"
 msgstr ""
 
-#: popthelp.c:75 popthelp.c:86
+#: popthelp.c:76 popthelp.c:87
 msgid "Display brief usage message"
 msgstr ""
 
-#: popthelp.c:89
+#: popthelp.c:90
 msgid "Display option defaults in message"
 msgstr ""
 
-#: popthelp.c:91
+#: popthelp.c:92
 msgid "Terminate options"
 msgstr ""
 
-#: popthelp.c:190
+#: popthelp.c:191
 msgid "Help options:"
 msgstr ""
 
-#: popthelp.c:191
+#: popthelp.c:192
 msgid "Options implemented via popt alias/exec:"
 msgstr ""
 
-#: popthelp.c:199
+#: popthelp.c:200
 msgid "NONE"
 msgstr ""
 
-#: popthelp.c:201
+#: popthelp.c:202
 msgid "VAL"
 msgstr ""
 
-#: popthelp.c:205
+#: popthelp.c:206
 msgid "INT"
 msgstr ""
 
-#: popthelp.c:206
+#: popthelp.c:207
 msgid "LONG"
 msgstr ""
 
-#: popthelp.c:207
+#: popthelp.c:208
 msgid "LONGLONG"
 msgstr ""
 
-#: popthelp.c:208
+#: popthelp.c:209
 msgid "STRING"
 msgstr ""
 
-#: popthelp.c:209
+#: popthelp.c:210
 msgid "FLOAT"
 msgstr ""
 
-#: popthelp.c:210
+#: popthelp.c:211
 msgid "DOUBLE"
 msgstr ""
 
-#: popthelp.c:213
+#: popthelp.c:214
 msgid "ARG"
 msgstr ""
 
diff --git a/po/pt.po b/po/pt.po
index ee54fbf..b2a3bd7 100644
--- a/po/pt.po
+++ b/po/pt.po
@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.11\n"
 "Report-Msgid-Bugs-To: <popt-devel@rpm5.org>\n"
-"POT-Creation-Date: 2008-02-18 08:21-0500\n"
+"POT-Creation-Date: 2008-04-02 13:18-0400\n"
 "PO-Revision-Date: 2002-02-13 18:32+0000\n"
 "Last-Translator: Pedro Morais <morais@kde.org>\n"
 "Language-Team: pt <morais@kde.org>\n"
@@ -10,113 +10,113 @@ msgstr ""
 "Content-Type: text/plain; charset=iso-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: popt.c:35
+#: popt.c:42
 msgid "unknown errno"
 msgstr "errno desconhecido"
 
-#: popt.c:1090
+#: popt.c:1141
 #, fuzzy, c-format
 msgid "option type (%u) not implemented in popt\n"
 msgstr "tipo de op��o (%d) n�o implementado no popt\n"
 
-#: popt.c:1294
+#: popt.c:1349
 msgid "missing argument"
 msgstr "falta um argumento"
 
-#: popt.c:1296
+#: popt.c:1351
 msgid "unknown option"
 msgstr "op��o desconhecida"
 
-#: popt.c:1298
+#: popt.c:1353
 msgid "mutually exclusive logical operations requested"
 msgstr "foram pedidas opera��es l�gicas mutuamente exclusivas"
 
-#: popt.c:1300
+#: popt.c:1355
 msgid "opt->arg should not be NULL"
 msgstr "opt->arg n�o deve ser NULL"
 
-#: popt.c:1302
+#: popt.c:1357
 msgid "aliases nested too deeply"
 msgstr "'aliases' demasiado aninhados"
 
-#: popt.c:1304
+#: popt.c:1359
 msgid "error in parameter quoting"
 msgstr "erros no 'quoting' de par�metros"
 
-#: popt.c:1306
+#: popt.c:1361
 msgid "invalid numeric value"
 msgstr "valor n�merico inv�lido"
 
-#: popt.c:1308
+#: popt.c:1363
 msgid "number too large or too small"
 msgstr "n�mero demasiado grando ou pequeno"
 
-#: popt.c:1310
+#: popt.c:1365
 msgid "memory allocation failed"
 msgstr "aloca��o de mem�ria falhou"
 
-#: popt.c:1314
+#: popt.c:1369
 msgid "unknown error"
 msgstr "erro desconhecido"
 
-#: popthelp.c:74 popthelp.c:85
+#: popthelp.c:75 popthelp.c:86
 msgid "Show this help message"
 msgstr "Mostrar esta mensagem de ajuda"
 
-#: popthelp.c:75 popthelp.c:86
+#: popthelp.c:76 popthelp.c:87
 msgid "Display brief usage message"
 msgstr "Mostrar uma mensagem de utiliza��o sucinta"
 
-#: popthelp.c:89
+#: popthelp.c:90
 msgid "Display option defaults in message"
 msgstr "Mostrar valor por omiss�o das op��es na mensagem"
 
-#: popthelp.c:91
+#: popthelp.c:92
 msgid "Terminate options"
 msgstr ""
 
-#: popthelp.c:190
+#: popthelp.c:191
 msgid "Help options:"
 msgstr ""
 
-#: popthelp.c:191
+#: popthelp.c:192
 msgid "Options implemented via popt alias/exec:"
 msgstr ""
 
-#: popthelp.c:199
+#: popthelp.c:200
 msgid "NONE"
 msgstr "NONE"
 
-#: popthelp.c:201
+#: popthelp.c:202
 msgid "VAL"
 msgstr "VAL"
 
-#: popthelp.c:205
+#: popthelp.c:206
 msgid "INT"
 msgstr "INT"
 
-#: popthelp.c:206
+#: popthelp.c:207
 msgid "LONG"
 msgstr "LONG"
 
-#: popthelp.c:207
+#: popthelp.c:208
 #, fuzzy
 msgid "LONGLONG"
 msgstr "LONG"
 
-#: popthelp.c:208
+#: popthelp.c:209
 msgid "STRING"
 msgstr "STRING"
 
-#: popthelp.c:209
+#: popthelp.c:210
 msgid "FLOAT"
 msgstr "FLOAT"
 
-#: popthelp.c:210
+#: popthelp.c:211
 msgid "DOUBLE"
 msgstr "DOUBLE"
 
-#: popthelp.c:213
+#: popthelp.c:214
 msgid "ARG"
 msgstr "ARG"
 
diff --git a/po/ro.po b/po/ro.po
index 38e91b8..bcf0eeb 100644
--- a/po/ro.po
+++ b/po/ro.po
@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.11\n"
 "Report-Msgid-Bugs-To: <popt-devel@rpm5.org>\n"
-"POT-Creation-Date: 2008-02-18 08:21-0500\n"
+"POT-Creation-Date: 2008-04-02 13:18-0400\n"
 "PO-Revision-Date: 2000-06-14 23:23+EST\n"
 "Last-Translator: Cristian Gafton <gafton@redhat.com>\n"
 "Language-Team: Romanian <ro@li.org>\n"
@@ -10,114 +10,114 @@ msgstr ""
 "Content-Type: text/plain; charset=ISO-8859-2\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: popt.c:35
+#: popt.c:42
 msgid "unknown errno"
 msgstr "eroare necunoscuta"
 
-#: popt.c:1090
+#: popt.c:1141
 #, fuzzy, c-format
 msgid "option type (%u) not implemented in popt\n"
 msgstr "optiunea de tipul (%d) nu este implementata in popt\n"
 
-#: popt.c:1294
+#: popt.c:1349
 msgid "missing argument"
 msgstr "argument lipsa"
 
-#: popt.c:1296
+#: popt.c:1351
 msgid "unknown option"
 msgstr "optiune necunoscuta"
 
-#: popt.c:1298
+#: popt.c:1353
 msgid "mutually exclusive logical operations requested"
 msgstr ""
 
-#: popt.c:1300
+#: popt.c:1355
 msgid "opt->arg should not be NULL"
 msgstr ""
 
-#: popt.c:1302
+#: popt.c:1357
 msgid "aliases nested too deeply"
 msgstr "recursivitate infinita la optiunile sinonime"
 
-#: popt.c:1304
+#: popt.c:1359
 #, fuzzy
 msgid "error in parameter quoting"
 msgstr "eroare la insertie parametru"
 
-#: popt.c:1306
+#: popt.c:1361
 msgid "invalid numeric value"
 msgstr "valoare numarica invalida"
 
-#: popt.c:1308
+#: popt.c:1363
 msgid "number too large or too small"
 msgstr "numar prea mare sau prea mic"
 
-#: popt.c:1310
+#: popt.c:1365
 msgid "memory allocation failed"
 msgstr ""
 
-#: popt.c:1314
+#: popt.c:1369
 msgid "unknown error"
 msgstr "eroare necuinoscuta"
 
-#: popthelp.c:74 popthelp.c:85
+#: popthelp.c:75 popthelp.c:86
 msgid "Show this help message"
 msgstr "Afisare mesaj de help"
 
-#: popthelp.c:75 popthelp.c:86
+#: popthelp.c:76 popthelp.c:87
 msgid "Display brief usage message"
 msgstr "Afisare mesaj sintaxa sumar"
 
-#: popthelp.c:89
+#: popthelp.c:90
 #, fuzzy
 msgid "Display option defaults in message"
 msgstr "Afisare mesaj sintaxa sumar"
 
-#: popthelp.c:91
+#: popthelp.c:92
 msgid "Terminate options"
 msgstr ""
 
-#: popthelp.c:190
+#: popthelp.c:191
 msgid "Help options:"
 msgstr ""
 
-#: popthelp.c:191
+#: popthelp.c:192
 msgid "Options implemented via popt alias/exec:"
 msgstr ""
 
-#: popthelp.c:199
+#: popthelp.c:200
 msgid "NONE"
 msgstr ""
 
-#: popthelp.c:201
+#: popthelp.c:202
 msgid "VAL"
 msgstr ""
 
-#: popthelp.c:205
+#: popthelp.c:206
 msgid "INT"
 msgstr ""
 
-#: popthelp.c:206
+#: popthelp.c:207
 msgid "LONG"
 msgstr ""
 
-#: popthelp.c:207
+#: popthelp.c:208
 msgid "LONGLONG"
 msgstr ""
 
-#: popthelp.c:208
+#: popthelp.c:209
 msgid "STRING"
 msgstr ""
 
-#: popthelp.c:209
+#: popthelp.c:210
 msgid "FLOAT"
 msgstr ""
 
-#: popthelp.c:210
+#: popthelp.c:211
 msgid "DOUBLE"
 msgstr ""
 
-#: popthelp.c:213
+#: popthelp.c:214
 msgid "ARG"
 msgstr ""
 
diff --git a/po/ru.po b/po/ru.po
index d451289..03cb4cb 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.11\n"
 "Report-Msgid-Bugs-To: <popt-devel@rpm5.org>\n"
-"POT-Creation-Date: 2008-02-18 08:21-0500\n"
+"POT-Creation-Date: 2008-04-02 13:18-0400\n"
 "PO-Revision-Date: 2001-07-05 21:00-0500\n"
 "Last-Translator: Eugene Kanter <eugene@blackcatlinux.com>\n"
 "Language-Team: Black Cat Linux Team <blackcat-support@blackcatlinux.com>\n"
@@ -10,113 +10,113 @@ msgstr ""
 "Content-Type: text/plain; charset=koi8-r\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: popt.c:35
+#: popt.c:42
 msgid "unknown errno"
 msgstr "����������� ����� ������"
 
-#: popt.c:1090
+#: popt.c:1141
 #, fuzzy, c-format
 msgid "option type (%u) not implemented in popt\n"
 msgstr "��������� ��������� (%d) � popt �� �������������\n"
 
-#: popt.c:1294
+#: popt.c:1349
 msgid "missing argument"
 msgstr "�������� ��������"
 
-#: popt.c:1296
+#: popt.c:1351
 msgid "unknown option"
 msgstr "����������� ��������"
 
-#: popt.c:1298
+#: popt.c:1353
 msgid "mutually exclusive logical operations requested"
 msgstr "��������� ������� ����������� ���������� ��������"
 
-#: popt.c:1300
+#: popt.c:1355
 msgid "opt->arg should not be NULL"
 msgstr "opt->arg �� ����� ���� NULL"
 
-#: popt.c:1302
+#: popt.c:1357
 msgid "aliases nested too deeply"
 msgstr "�������� ������� ���������� �������� �����������"
 
-#: popt.c:1304
+#: popt.c:1359
 msgid "error in parameter quoting"
 msgstr "�����a ��������� ���������� � �������"
 
-#: popt.c:1306
+#: popt.c:1361
 msgid "invalid numeric value"
 msgstr "������������ �������� ��������"
 
-#: popt.c:1308
+#: popt.c:1363
 msgid "number too large or too small"
 msgstr "�������� �������� �� ��������� ����������������"
 
-#: popt.c:1310
+#: popt.c:1365
 msgid "memory allocation failed"
 msgstr "������ ��������� ������"
 
-#: popt.c:1314
+#: popt.c:1369
 msgid "unknown error"
 msgstr "����������� ������"
 
-#: popthelp.c:74 popthelp.c:85
+#: popthelp.c:75 popthelp.c:86
 msgid "Show this help message"
 msgstr "�������� ��� ���������"
 
-#: popthelp.c:75 popthelp.c:86
+#: popthelp.c:76 popthelp.c:87
 msgid "Display brief usage message"
 msgstr "�������� ������� ���������� �� �������������"
 
-#: popthelp.c:89
+#: popthelp.c:90
 msgid "Display option defaults in message"
 msgstr "�������� ��������� �� ���������"
 
-#: popthelp.c:91
+#: popthelp.c:92
 msgid "Terminate options"
 msgstr ""
 
-#: popthelp.c:190
+#: popthelp.c:191
 msgid "Help options:"
 msgstr ""
 
-#: popthelp.c:191
+#: popthelp.c:192
 msgid "Options implemented via popt alias/exec:"
 msgstr ""
 
-#: popthelp.c:199
+#: popthelp.c:200
 msgid "NONE"
 msgstr "NONE"
 
-#: popthelp.c:201
+#: popthelp.c:202
 msgid "VAL"
 msgstr "VAL"
 
-#: popthelp.c:205
+#: popthelp.c:206
 msgid "INT"
 msgstr "INT"
 
-#: popthelp.c:206
+#: popthelp.c:207
 msgid "LONG"
 msgstr "LONG"
 
-#: popthelp.c:207
+#: popthelp.c:208
 #, fuzzy
 msgid "LONGLONG"
 msgstr "LONG"
 
-#: popthelp.c:208
+#: popthelp.c:209
 msgid "STRING"
 msgstr "STRING"
 
-#: popthelp.c:209
+#: popthelp.c:210
 msgid "FLOAT"
 msgstr "FLOAT"
 
-#: popthelp.c:210
+#: popthelp.c:211
 msgid "DOUBLE"
 msgstr "DOUBLE"
 
-#: popthelp.c:213
+#: popthelp.c:214
 msgid "ARG"
 msgstr "ARG"
 
diff --git a/po/sk.po b/po/sk.po
index c53e34b..451f456 100644
--- a/po/sk.po
+++ b/po/sk.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.11\n"
 "Report-Msgid-Bugs-To: <popt-devel@rpm5.org>\n"
-"POT-Creation-Date: 2008-02-18 08:21-0500\n"
+"POT-Creation-Date: 2008-04-02 13:18-0400\n"
 "PO-Revision-Date: 1999-08-04 21:40+0200\n"
 "Last-Translator: Stanislav Meduna <stano@eunet.sk>\n"
 "Language-Team: Slovak <sk-i18n@rak.isternet.sk>\n"
@@ -14,113 +14,113 @@ msgstr ""
 "Content-Type: text/plain; charset=iso-8859-2\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: popt.c:35
+#: popt.c:42
 msgid "unknown errno"
 msgstr ""
 
-#: popt.c:1090
+#: popt.c:1141
 #, c-format
 msgid "option type (%u) not implemented in popt\n"
 msgstr ""
 
-#: popt.c:1294
+#: popt.c:1349
 msgid "missing argument"
 msgstr ""
 
-#: popt.c:1296
+#: popt.c:1351
 msgid "unknown option"
 msgstr ""
 
-#: popt.c:1298
+#: popt.c:1353
 msgid "mutually exclusive logical operations requested"
 msgstr ""
 
-#: popt.c:1300
+#: popt.c:1355
 msgid "opt->arg should not be NULL"
 msgstr ""
 
-#: popt.c:1302
+#: popt.c:1357
 msgid "aliases nested too deeply"
 msgstr ""
 
-#: popt.c:1304
+#: popt.c:1359
 msgid "error in parameter quoting"
 msgstr ""
 
-#: popt.c:1306
+#: popt.c:1361
 msgid "invalid numeric value"
 msgstr ""
 
-#: popt.c:1308
+#: popt.c:1363
 msgid "number too large or too small"
 msgstr ""
 
-#: popt.c:1310
+#: popt.c:1365
 msgid "memory allocation failed"
 msgstr ""
 
-#: popt.c:1314
+#: popt.c:1369
 msgid "unknown error"
 msgstr ""
 
-#: popthelp.c:74 popthelp.c:85
+#: popthelp.c:75 popthelp.c:86
 msgid "Show this help message"
 msgstr "Vyp�sa� t�to spr�vu"
 
-#: popthelp.c:75 popthelp.c:86
+#: popthelp.c:76 popthelp.c:87
 msgid "Display brief usage message"
 msgstr "Zobrazi� stru�n� n�vod na pou�itie"
 
-#: popthelp.c:89
+#: popthelp.c:90
 #, fuzzy
 msgid "Display option defaults in message"
 msgstr "Zobrazi� stru�n� n�vod na pou�itie"
 
-#: popthelp.c:91
+#: popthelp.c:92
 msgid "Terminate options"
 msgstr ""
 
-#: popthelp.c:190
+#: popthelp.c:191
 msgid "Help options:"
 msgstr ""
 
-#: popthelp.c:191
+#: popthelp.c:192
 msgid "Options implemented via popt alias/exec:"
 msgstr ""
 
-#: popthelp.c:199
+#: popthelp.c:200
 msgid "NONE"
 msgstr ""
 
-#: popthelp.c:201
+#: popthelp.c:202
 msgid "VAL"
 msgstr ""
 
-#: popthelp.c:205
+#: popthelp.c:206
 msgid "INT"
 msgstr ""
 
-#: popthelp.c:206
+#: popthelp.c:207
 msgid "LONG"
 msgstr ""
 
-#: popthelp.c:207
+#: popthelp.c:208
 msgid "LONGLONG"
 msgstr ""
 
-#: popthelp.c:208
+#: popthelp.c:209
 msgid "STRING"
 msgstr ""
 
-#: popthelp.c:209
+#: popthelp.c:210
 msgid "FLOAT"
 msgstr ""
 
-#: popthelp.c:210
+#: popthelp.c:211
 msgid "DOUBLE"
 msgstr ""
 
-#: popthelp.c:213
+#: popthelp.c:214
 msgid "ARG"
 msgstr ""
 
diff --git a/po/sl.po b/po/sl.po
index e86ba2c..00274ec 100644
--- a/po/sl.po
+++ b/po/sl.po
@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.11\n"
 "Report-Msgid-Bugs-To: <popt-devel@rpm5.org>\n"
-"POT-Creation-Date: 2008-02-18 08:21-0500\n"
+"POT-Creation-Date: 2008-04-02 13:18-0400\n"
 "PO-Revision-Date: 2000-09-05 12:30+0200\n"
 "Last-Translator: Roman Maurer <roman.maurer@hermes.si>\n"
 "Language-Team: Slovenian <sl@li.org>\n"
@@ -10,113 +10,113 @@ msgstr ""
 "Content-Type: text/plain; charset=iso-8859-2\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: popt.c:35
+#: popt.c:42
 msgid "unknown errno"
 msgstr ""
 
-#: popt.c:1090
+#: popt.c:1141
 #, c-format
 msgid "option type (%u) not implemented in popt\n"
 msgstr ""
 
-#: popt.c:1294
+#: popt.c:1349
 msgid "missing argument"
 msgstr ""
 
-#: popt.c:1296
+#: popt.c:1351
 msgid "unknown option"
 msgstr ""
 
-#: popt.c:1298
+#: popt.c:1353
 msgid "mutually exclusive logical operations requested"
 msgstr ""
 
-#: popt.c:1300
+#: popt.c:1355
 msgid "opt->arg should not be NULL"
 msgstr ""
 
-#: popt.c:1302
+#: popt.c:1357
 msgid "aliases nested too deeply"
 msgstr ""
 
-#: popt.c:1304
+#: popt.c:1359
 msgid "error in parameter quoting"
 msgstr ""
 
-#: popt.c:1306
+#: popt.c:1361
 msgid "invalid numeric value"
 msgstr ""
 
-#: popt.c:1308
+#: popt.c:1363
 msgid "number too large or too small"
 msgstr ""
 
-#: popt.c:1310
+#: popt.c:1365
 msgid "memory allocation failed"
 msgstr ""
 
-#: popt.c:1314
+#: popt.c:1369
 msgid "unknown error"
 msgstr ""
 
-#: popthelp.c:74 popthelp.c:85
+#: popthelp.c:75 popthelp.c:86
 msgid "Show this help message"
 msgstr "Prika�i to sporo�ilo s pomo�jo"
 
-#: popthelp.c:75 popthelp.c:86
+#: popthelp.c:76 popthelp.c:87
 msgid "Display brief usage message"
 msgstr "Prika�i kratko sporo�ilo o uporabi"
 
-#: popthelp.c:89
+#: popthelp.c:90
 #, fuzzy
 msgid "Display option defaults in message"
 msgstr "Prika�i kratko sporo�ilo o uporabi"
 
-#: popthelp.c:91
+#: popthelp.c:92
 msgid "Terminate options"
 msgstr ""
 
-#: popthelp.c:190
+#: popthelp.c:191
 msgid "Help options:"
 msgstr ""
 
-#: popthelp.c:191
+#: popthelp.c:192
 msgid "Options implemented via popt alias/exec:"
 msgstr ""
 
-#: popthelp.c:199
+#: popthelp.c:200
 msgid "NONE"
 msgstr ""
 
-#: popthelp.c:201
+#: popthelp.c:202
 msgid "VAL"
 msgstr ""
 
-#: popthelp.c:205
+#: popthelp.c:206
 msgid "INT"
 msgstr ""
 
-#: popthelp.c:206
+#: popthelp.c:207
 msgid "LONG"
 msgstr ""
 
-#: popthelp.c:207
+#: popthelp.c:208
 msgid "LONGLONG"
 msgstr ""
 
-#: popthelp.c:208
+#: popthelp.c:209
 msgid "STRING"
 msgstr ""
 
-#: popthelp.c:209
+#: popthelp.c:210
 msgid "FLOAT"
 msgstr ""
 
-#: popthelp.c:210
+#: popthelp.c:211
 msgid "DOUBLE"
 msgstr ""
 
-#: popthelp.c:213
+#: popthelp.c:214
 msgid "ARG"
 msgstr ""
 
diff --git a/po/sv.po b/po/sv.po
index 2f955e2..5806646 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.14\n"
 "Report-Msgid-Bugs-To: <popt-devel@rpm5.org>\n"
-"POT-Creation-Date: 2008-02-18 08:21-0500\n"
+"POT-Creation-Date: 2008-04-02 13:18-0400\n"
 "PO-Revision-Date: 2008-02-23 20:15+0100\n"
 "Last-Translator: G�ran Uddeborg <goeran@uddeborg.se>\n"
 "Language-Team: Swedish <tp-sv@listor.tp-sv.se>\n"
@@ -17,112 +17,112 @@ msgstr ""
 "Content-Type: text/plain; charset=iso-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: popt.c:35
+#: popt.c:42
 msgid "unknown errno"
 msgstr "ok�nt felnummer"
 
-#: popt.c:1090
+#: popt.c:1141
 #, c-format
 msgid "option type (%u) not implemented in popt\n"
 msgstr "flaggtypen (%u) �r inte implementerad i popt\n"
 
-#: popt.c:1294
+#: popt.c:1349
 msgid "missing argument"
 msgstr "argument saknas"
 
-#: popt.c:1296
+#: popt.c:1351
 msgid "unknown option"
 msgstr "ok�nd flagga"
 
-#: popt.c:1298
+#: popt.c:1353
 msgid "mutually exclusive logical operations requested"
 msgstr "�msesidigt uteslutande logiska operationer beg�rdes"
 
-#: popt.c:1300
+#: popt.c:1355
 msgid "opt->arg should not be NULL"
 msgstr "opt->arg f�r inte vara NULL"
 
-#: popt.c:1302
+#: popt.c:1357
 msgid "aliases nested too deeply"
 msgstr "alias �r n�stade f�r djupt"
 
-#: popt.c:1304
+#: popt.c:1359
 msgid "error in parameter quoting"
 msgstr "fel i parametercitering"
 
-#: popt.c:1306
+#: popt.c:1361
 msgid "invalid numeric value"
 msgstr "ogiltigt numeriskt v�rde"
 
-#: popt.c:1308
+#: popt.c:1363
 msgid "number too large or too small"
 msgstr "talet f�r stort eller f�r litet"
 
-#: popt.c:1310
+#: popt.c:1365
 msgid "memory allocation failed"
 msgstr "minnesallokering misslyckades"
 
-#: popt.c:1314
+#: popt.c:1369
 msgid "unknown error"
 msgstr "ok�nt fel"
 
-#: popthelp.c:74 popthelp.c:85
+#: popthelp.c:75 popthelp.c:86
 msgid "Show this help message"
 msgstr "Visa denna hj�lptext"
 
-#: popthelp.c:75 popthelp.c:86
+#: popthelp.c:76 popthelp.c:87
 msgid "Display brief usage message"
 msgstr "Visa en kortfattad anv�ndningstext"
 
-#: popthelp.c:89
+#: popthelp.c:90
 msgid "Display option defaults in message"
 msgstr "Visa standardalternativ f�r flaggor i meddelande"
 
-#: popthelp.c:91
+#: popthelp.c:92
 msgid "Terminate options"
 msgstr "Avsluta flaggor"
 
-#: popthelp.c:190
+#: popthelp.c:191
 msgid "Help options:"
 msgstr "Hj�lpflaggor:"
 
-#: popthelp.c:191
+#: popthelp.c:192
 msgid "Options implemented via popt alias/exec:"
 msgstr "Flaggor implementerade via popt-alias/exec:"
 
-#: popthelp.c:199
+#: popthelp.c:200
 msgid "NONE"
 msgstr "INGET"
 
-#: popthelp.c:201
+#: popthelp.c:202
 msgid "VAL"
 msgstr "V�RDE"
 
-#: popthelp.c:205
+#: popthelp.c:206
 msgid "INT"
 msgstr "HELTAL"
 
-#: popthelp.c:206
+#: popthelp.c:207
 msgid "LONG"
 msgstr "L�NG"
 
-#: popthelp.c:207
+#: popthelp.c:208
 msgid "LONGLONG"
 msgstr "L�NGL�NG"
 
-#: popthelp.c:208
+#: popthelp.c:209
 msgid "STRING"
 msgstr "STR�NG"
 
-#: popthelp.c:209
+#: popthelp.c:210
 msgid "FLOAT"
 msgstr "FLYTTAL"
 
-#: popthelp.c:210
+#: popthelp.c:211
 msgid "DOUBLE"
 msgstr "DUBBEL"
 
-#: popthelp.c:213
+#: popthelp.c:214
 msgid "ARG"
 msgstr "ARG"
 
diff --git a/po/th.po b/po/th.po
index f2a1bc3..ede584e 100644
--- a/po/th.po
+++ b/po/th.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.14\n"
 "Report-Msgid-Bugs-To: <popt-devel@rpm5.org>\n"
-"POT-Creation-Date: 2008-02-18 08:21-0500\n"
+"POT-Creation-Date: 2008-04-02 13:18-0400\n"
 "PO-Revision-Date: 2008-02-19 15:53+0700\n"
 "Last-Translator: Seksan Poltree <seksan.poltree@gmail.com>\n"
 "Language-Team: Thai <translation-team-th@lists.sourceforge.net>\n"
@@ -16,112 +16,112 @@ msgstr ""
 "X-Poedit-Language: Thai\n"
 "X-Poedit-Country: THAILAND\n"
 
-#: popt.c:35
+#: popt.c:42
 msgid "unknown errno"
 msgstr "เกิด errno ที่ไม่รู้จัก"
 
-#: popt.c:1090
+#: popt.c:1141
 #, c-format
 msgid "option type (%u) not implemented in popt\n"
 msgstr "ตัวเลือกชนิด (%u) ไม่ถูกอิมพลีเมนต์ใน popt\n"
 
-#: popt.c:1294
+#: popt.c:1349
 msgid "missing argument"
 msgstr "ไม่พบอาร์กิวเมนต์"
 
-#: popt.c:1296
+#: popt.c:1351
 msgid "unknown option"
 msgstr "ไม่รู้จักตัวเลือก"
 
-#: popt.c:1298
+#: popt.c:1353
 msgid "mutually exclusive logical operations requested"
 msgstr "เกิดการร้องขอร่วมกันของการดำเนินการด้านตรรกะอย่างเดียวกัน"
 
-#: popt.c:1300
+#: popt.c:1355
 msgid "opt->arg should not be NULL"
 msgstr "opt->arg ไม่ควรจะเป็น NULL"
 
-#: popt.c:1302
+#: popt.c:1357
 msgid "aliases nested too deeply"
 msgstr "นามแฝงซ้อนกันมากเกินไป"
 
-#: popt.c:1304
+#: popt.c:1359
 msgid "error in parameter quoting"
 msgstr "เกิดข้อผิดพลาดในการอ้างอิงพารามิเตอร์"
 
-#: popt.c:1306
+#: popt.c:1361
 msgid "invalid numeric value"
 msgstr "ค่าตัวเลขผิดพลาด"
 
-#: popt.c:1308
+#: popt.c:1363
 msgid "number too large or too small"
 msgstr "ตัวเลขมีค่ามากหรือน้อยเกินไป"
 
-#: popt.c:1310
+#: popt.c:1365
 msgid "memory allocation failed"
 msgstr "การจัดสรรหน่วยความจำผิดพลาด"
 
-#: popt.c:1314
+#: popt.c:1369
 msgid "unknown error"
 msgstr "ความผิดพลาดที่ไม่รู้จัก"
 
-#: popthelp.c:74 popthelp.c:85
+#: popthelp.c:75 popthelp.c:86
 msgid "Show this help message"
 msgstr "แสดงข้อความช่วยเหลือนี้"
 
-#: popthelp.c:75 popthelp.c:86
+#: popthelp.c:76 popthelp.c:87
 msgid "Display brief usage message"
 msgstr "แสดงข้อความสรุปย่อการใช้งาน"
 
-#: popthelp.c:89
+#: popthelp.c:90
 msgid "Display option defaults in message"
 msgstr "แสดงตัวเลือกมาตรฐานในข้อความ"
 
-#: popthelp.c:91
+#: popthelp.c:92
 msgid "Terminate options"
 msgstr "ตัวเลือกการสิ้นสุด:"
 
-#: popthelp.c:190
+#: popthelp.c:191
 msgid "Help options:"
 msgstr "ตัวเลือกความช่วยเหลือ:"
 
-#: popthelp.c:191
+#: popthelp.c:192
 msgid "Options implemented via popt alias/exec:"
 msgstr "ตัวเลือกที่ถูกอิมพลีเมนต์ด้วย popt alias/exec:"
 
-#: popthelp.c:199
+#: popthelp.c:200
 msgid "NONE"
 msgstr "ไม่มี"
 
-#: popthelp.c:201
+#: popthelp.c:202
 msgid "VAL"
 msgstr "VAL"
 
-#: popthelp.c:205
+#: popthelp.c:206
 msgid "INT"
 msgstr "INT"
 
-#: popthelp.c:206
+#: popthelp.c:207
 msgid "LONG"
 msgstr "LONG"
 
-#: popthelp.c:207
+#: popthelp.c:208
 msgid "LONGLONG"
 msgstr "LONGLONG"
 
-#: popthelp.c:208
+#: popthelp.c:209
 msgid "STRING"
 msgstr "STRING"
 
-#: popthelp.c:209
+#: popthelp.c:210
 msgid "FLOAT"
 msgstr "FLOAT"
 
-#: popthelp.c:210
+#: popthelp.c:211
 msgid "DOUBLE"
 msgstr "DOUBLE"
 
-#: popthelp.c:213
+#: popthelp.c:214
 msgid "ARG"
 msgstr "ARG"
 
diff --git a/po/tr.po b/po/tr.po
index 3001a2e..618a4d3 100644
--- a/po/tr.po
+++ b/po/tr.po
@@ -5,7 +5,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.11\n"
 "Report-Msgid-Bugs-To: <popt-devel@rpm5.org>\n"
-"POT-Creation-Date: 2008-02-18 08:21-0500\n"
+"POT-Creation-Date: 2008-04-02 13:18-0400\n"
 "PO-Revision-Date: 2000-02-11 13:01+0200\n"
 "Last-Translator: Nilgun Belma Buguner <nilgun@technologist.com>\n"
 "Language-Team: Turkish <tr@li.org>\n"
@@ -13,114 +13,114 @@ msgstr ""
 "Content-Type: text/plain; charset=iso-8859-9\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: popt.c:35
+#: popt.c:42
 msgid "unknown errno"
 msgstr "bilinmeyen hata no"
 
-#: popt.c:1090
+#: popt.c:1141
 #, fuzzy, c-format
 msgid "option type (%u) not implemented in popt\n"
 msgstr "se�enek t�r� (%d) popt i�in ge�ersiz\n"
 
-#: popt.c:1294
+#: popt.c:1349
 msgid "missing argument"
 msgstr "arg�man eksik"
 
-#: popt.c:1296
+#: popt.c:1351
 msgid "unknown option"
 msgstr "bilinmeyen se�enek"
 
-#: popt.c:1298
+#: popt.c:1353
 msgid "mutually exclusive logical operations requested"
 msgstr "birbirini d��layan mant�ksal i�lemler istendi"
 
-#: popt.c:1300
+#: popt.c:1355
 msgid "opt->arg should not be NULL"
 msgstr ""
 
-#: popt.c:1302
+#: popt.c:1357
 msgid "aliases nested too deeply"
 msgstr "adlarda �ok fazla i�i�elikler"
 
-#: popt.c:1304
+#: popt.c:1359
 msgid "error in parameter quoting"
 msgstr "parametrelerde t�rnak i�aretleme hatal� "
 
-#: popt.c:1306
+#: popt.c:1361
 msgid "invalid numeric value"
 msgstr "say�sal de�er ge�ersiz"
 
-#: popt.c:1308
+#: popt.c:1363
 msgid "number too large or too small"
 msgstr "say� ya �ok b�y�k ya da �ok k���k"
 
-#: popt.c:1310
+#: popt.c:1365
 msgid "memory allocation failed"
 msgstr ""
 
-#: popt.c:1314
+#: popt.c:1369
 msgid "unknown error"
 msgstr "bilinmeyen hata"
 
-#: popthelp.c:74 popthelp.c:85
+#: popthelp.c:75 popthelp.c:86
 msgid "Show this help message"
 msgstr "Bu yard�m iletisini g�sterir"
 
-#: popthelp.c:75 popthelp.c:86
+#: popthelp.c:76 popthelp.c:87
 msgid "Display brief usage message"
 msgstr "K�sa bir kullan�m iletisi g�ster"
 
-#: popthelp.c:89
+#: popthelp.c:90
 #, fuzzy
 msgid "Display option defaults in message"
 msgstr "K�sa bir kullan�m iletisi g�ster"
 
-#: popthelp.c:91
+#: popthelp.c:92
 msgid "Terminate options"
 msgstr ""
 
-#: popthelp.c:190
+#: popthelp.c:191
 msgid "Help options:"
 msgstr ""
 
-#: popthelp.c:191
+#: popthelp.c:192
 msgid "Options implemented via popt alias/exec:"
 msgstr ""
 
-#: popthelp.c:199
+#: popthelp.c:200
 msgid "NONE"
 msgstr "YOK"
 
-#: popthelp.c:201
+#: popthelp.c:202
 msgid "VAL"
 msgstr "DE�"
 
-#: popthelp.c:205
+#: popthelp.c:206
 msgid "INT"
 msgstr "INT"
 
-#: popthelp.c:206
+#: popthelp.c:207
 msgid "LONG"
 msgstr "LONG"
 
-#: popthelp.c:207
+#: popthelp.c:208
 #, fuzzy
 msgid "LONGLONG"
 msgstr "LONG"
 
-#: popthelp.c:208
+#: popthelp.c:209
 msgid "STRING"
 msgstr "STRING"
 
-#: popthelp.c:209
+#: popthelp.c:210
 msgid "FLOAT"
 msgstr "FLOAT"
 
-#: popthelp.c:210
+#: popthelp.c:211
 msgid "DOUBLE"
 msgstr "DOUBLE"
 
-#: popthelp.c:213
+#: popthelp.c:214
 msgid "ARG"
 msgstr "ARG"
 
diff --git a/po/uk.po b/po/uk.po
index 0737625..39a6c00 100644
--- a/po/uk.po
+++ b/po/uk.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.11\n"
 "Report-Msgid-Bugs-To: <popt-devel@rpm5.org>\n"
-"POT-Creation-Date: 2008-02-18 08:21-0500\n"
+"POT-Creation-Date: 2008-04-02 13:18-0400\n"
 "PO-Revision-Date: 1999-09-30 16:54+0200\n"
 "Last-Translator: Yuri Syrota <rasta@renome.rovno.ua>\n"
 "Language-Team: Ukrainian <uk@li.org>\n"
@@ -14,113 +14,113 @@ msgstr ""
 "Content-Type: text/plain; charset=koi8-u\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: popt.c:35
+#: popt.c:42
 msgid "unknown errno"
 msgstr ""
 
-#: popt.c:1090
+#: popt.c:1141
 #, c-format
 msgid "option type (%u) not implemented in popt\n"
 msgstr ""
 
-#: popt.c:1294
+#: popt.c:1349
 msgid "missing argument"
 msgstr ""
 
-#: popt.c:1296
+#: popt.c:1351
 msgid "unknown option"
 msgstr ""
 
-#: popt.c:1298
+#: popt.c:1353
 msgid "mutually exclusive logical operations requested"
 msgstr ""
 
-#: popt.c:1300
+#: popt.c:1355
 msgid "opt->arg should not be NULL"
 msgstr ""
 
-#: popt.c:1302
+#: popt.c:1357
 msgid "aliases nested too deeply"
 msgstr ""
 
-#: popt.c:1304
+#: popt.c:1359
 msgid "error in parameter quoting"
 msgstr ""
 
-#: popt.c:1306
+#: popt.c:1361
 msgid "invalid numeric value"
 msgstr ""
 
-#: popt.c:1308
+#: popt.c:1363
 msgid "number too large or too small"
 msgstr ""
 
-#: popt.c:1310
+#: popt.c:1365
 msgid "memory allocation failed"
 msgstr ""
 
-#: popt.c:1314
+#: popt.c:1369
 msgid "unknown error"
 msgstr ""
 
-#: popthelp.c:74 popthelp.c:85
+#: popthelp.c:75 popthelp.c:86
 msgid "Show this help message"
 msgstr "�������� �� ��צ���"
 
-#: popthelp.c:75 popthelp.c:86
+#: popthelp.c:76 popthelp.c:87
 msgid "Display brief usage message"
 msgstr "�������� ������� ��צ��� ��� ������������"
 
-#: popthelp.c:89
+#: popthelp.c:90
 #, fuzzy
 msgid "Display option defaults in message"
 msgstr "�������� ������� ��צ��� ��� ������������"
 
-#: popthelp.c:91
+#: popthelp.c:92
 msgid "Terminate options"
 msgstr ""
 
-#: popthelp.c:190
+#: popthelp.c:191
 msgid "Help options:"
 msgstr ""
 
-#: popthelp.c:191
+#: popthelp.c:192
 msgid "Options implemented via popt alias/exec:"
 msgstr ""
 
-#: popthelp.c:199
+#: popthelp.c:200
 msgid "NONE"
 msgstr ""
 
-#: popthelp.c:201
+#: popthelp.c:202
 msgid "VAL"
 msgstr ""
 
-#: popthelp.c:205
+#: popthelp.c:206
 msgid "INT"
 msgstr ""
 
-#: popthelp.c:206
+#: popthelp.c:207
 msgid "LONG"
 msgstr ""
 
-#: popthelp.c:207
+#: popthelp.c:208
 msgid "LONGLONG"
 msgstr ""
 
-#: popthelp.c:208
+#: popthelp.c:209
 msgid "STRING"
 msgstr ""
 
-#: popthelp.c:209
+#: popthelp.c:210
 msgid "FLOAT"
 msgstr ""
 
-#: popthelp.c:210
+#: popthelp.c:211
 msgid "DOUBLE"
 msgstr ""
 
-#: popthelp.c:213
+#: popthelp.c:214
 msgid "ARG"
 msgstr ""
 
diff --git a/po/vi.po b/po/vi.po
index d551a32..c3bf091 100644
--- a/po/vi.po
+++ b/po/vi.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.14\n"
 "Report-Msgid-Bugs-To: <popt-devel@rpm5.org>\n"
-"POT-Creation-Date: 2008-02-18 08:21-0500\n"
+"POT-Creation-Date: 2008-04-02 13:18-0400\n"
 "PO-Revision-Date: 2008-02-18 16:20+1030\n"
 "Last-Translator: Clytie Siddall <clytie@riverland.net.au>\n"
 "Language-Team: Vietnamese <vi-VN@googlegroups.com>\n"
@@ -17,112 +17,112 @@ msgstr ""
 "Plural-Forms: nplurals=1; plural=0;\n"
 "X-Generator: LocFactoryEditor 1.7b3\n"
 
-#: popt.c:35
+#: popt.c:42
 msgid "unknown errno"
 msgstr "số hiệu lỗi không rõ"
 
-#: popt.c:1090
+#: popt.c:1141
 #, c-format
 msgid "option type (%u) not implemented in popt\n"
 msgstr "kiểu tùy chọn (%u) chưa được thực hiện trong popt\n"
 
-#: popt.c:1294
+#: popt.c:1349
 msgid "missing argument"
 msgstr "thiếu đối số"
 
-#: popt.c:1296
+#: popt.c:1351
 msgid "unknown option"
 msgstr "tùy chọn không rõ"
 
-#: popt.c:1298
+#: popt.c:1353
 msgid "mutually exclusive logical operations requested"
 msgstr "các thao tác hợp lý loại từ lẫn nhau được yêu cầu"
 
-#: popt.c:1300
+#: popt.c:1355
 msgid "opt->arg should not be NULL"
 msgstr "« tùy chọn->đối số » không thể vô giá trị"
 
-#: popt.c:1302
+#: popt.c:1357
 msgid "aliases nested too deeply"
 msgstr "các bí danh lồng nhau quá sâu"
 
-#: popt.c:1304
+#: popt.c:1359
 msgid "error in parameter quoting"
 msgstr "gặp lỗi trong lời trích dẫn tham số"
 
-#: popt.c:1306
+#: popt.c:1361
 msgid "invalid numeric value"
 msgstr "giá trị thuộc số không hợp lệ"
 
-#: popt.c:1308
+#: popt.c:1363
 msgid "number too large or too small"
 msgstr "con số quá lớn hay quá nhỏ"
 
-#: popt.c:1310
+#: popt.c:1365
 msgid "memory allocation failed"
 msgstr "lỗi cấp phát bộ nhớ"
 
-#: popt.c:1314
+#: popt.c:1369
 msgid "unknown error"
 msgstr "lỗi không rõ"
 
-#: popthelp.c:74 popthelp.c:85
+#: popthelp.c:75 popthelp.c:86
 msgid "Show this help message"
 msgstr "Xem thông điệp trợ giúp này"
 
-#: popthelp.c:75 popthelp.c:86
+#: popthelp.c:76 popthelp.c:87
 msgid "Display brief usage message"
 msgstr "Hiển thị thông điệp cách sử dụng ngắn"
 
-#: popthelp.c:89
+#: popthelp.c:90
 msgid "Display option defaults in message"
 msgstr "Hiển thị các giá trị mặc định của tùy chọn trong thông điệp"
 
-#: popthelp.c:91
+#: popthelp.c:92
 msgid "Terminate options"
 msgstr "Tùy chọn chấm dứt"
 
-#: popthelp.c:190
+#: popthelp.c:191
 msgid "Help options:"
 msgstr "Tùy chọn trợ giúp:"
 
-#: popthelp.c:191
+#: popthelp.c:192
 msgid "Options implemented via popt alias/exec:"
 msgstr "Các tùy chọn được thực hiện thông qua popt alias/exec:"
 
-#: popthelp.c:199
+#: popthelp.c:200
 msgid "NONE"
 msgstr "KHÔNG CÓ"
 
-#: popthelp.c:201
+#: popthelp.c:202
 msgid "VAL"
 msgstr "GIÁ TRỊ"
 
-#: popthelp.c:205
+#: popthelp.c:206
 msgid "INT"
 msgstr "SỐ NGUYÊN"
 
-#: popthelp.c:206
+#: popthelp.c:207
 msgid "LONG"
 msgstr "DÀI"
 
-#: popthelp.c:207
+#: popthelp.c:208
 msgid "LONGLONG"
 msgstr "DÀIDÀI"
 
-#: popthelp.c:208
+#: popthelp.c:209
 msgid "STRING"
 msgstr "CHUỖI"
 
-#: popthelp.c:209
+#: popthelp.c:210
 msgid "FLOAT"
 msgstr "NỔI"
 
-#: popthelp.c:210
+#: popthelp.c:211
 msgid "DOUBLE"
 msgstr "ĐÔI"
 
-#: popthelp.c:213
+#: popthelp.c:214
 msgid "ARG"
 msgstr "ĐỐI SỐ"
 
diff --git a/po/wa.po b/po/wa.po
index d9e07d4..aef6f79 100644
--- a/po/wa.po
+++ b/po/wa.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.11\n"
 "Report-Msgid-Bugs-To: <popt-devel@rpm5.org>\n"
-"POT-Creation-Date: 2008-02-18 08:21-0500\n"
+"POT-Creation-Date: 2008-04-02 13:18-0400\n"
 "PO-Revision-Date: 1999-03-18 23:11+0100\n"
 "Last-Translator: Nobody yet\n"
 "Language-Team: walon <linux-wa@chanae.alphanet.ch>\n"
@@ -18,113 +18,113 @@ msgstr ""
 "Content-Type: text/plain; charset=iso-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: popt.c:35
+#: popt.c:42
 msgid "unknown errno"
 msgstr ""
 
-#: popt.c:1090
+#: popt.c:1141
 #, c-format
 msgid "option type (%u) not implemented in popt\n"
 msgstr ""
 
-#: popt.c:1294
+#: popt.c:1349
 msgid "missing argument"
 msgstr ""
 
-#: popt.c:1296
+#: popt.c:1351
 msgid "unknown option"
 msgstr ""
 
-#: popt.c:1298
+#: popt.c:1353
 msgid "mutually exclusive logical operations requested"
 msgstr ""
 
-#: popt.c:1300
+#: popt.c:1355
 msgid "opt->arg should not be NULL"
 msgstr ""
 
-#: popt.c:1302
+#: popt.c:1357
 msgid "aliases nested too deeply"
 msgstr ""
 
-#: popt.c:1304
+#: popt.c:1359
 msgid "error in parameter quoting"
 msgstr ""
 
-#: popt.c:1306
+#: popt.c:1361
 msgid "invalid numeric value"
 msgstr ""
 
-#: popt.c:1308
+#: popt.c:1363
 msgid "number too large or too small"
 msgstr ""
 
-#: popt.c:1310
+#: popt.c:1365
 msgid "memory allocation failed"
 msgstr ""
 
-#: popt.c:1314
+#: popt.c:1369
 msgid "unknown error"
 msgstr ""
 
-#: popthelp.c:74 popthelp.c:85
+#: popthelp.c:75 popthelp.c:86
 msgid "Show this help message"
 msgstr "Mostrer ci messaedje d' aide chal"
 
-#: popthelp.c:75 popthelp.c:86
+#: popthelp.c:76 popthelp.c:87
 msgid "Display brief usage message"
 msgstr "Mostre on court messaedje so kmint vos � siervi"
 
-#: popthelp.c:89
+#: popthelp.c:90
 #, fuzzy
 msgid "Display option defaults in message"
 msgstr "Mostre on court messaedje so kmint vos � siervi"
 
-#: popthelp.c:91
+#: popthelp.c:92
 msgid "Terminate options"
 msgstr ""
 
-#: popthelp.c:190
+#: popthelp.c:191
 msgid "Help options:"
 msgstr ""
 
-#: popthelp.c:191
+#: popthelp.c:192
 msgid "Options implemented via popt alias/exec:"
 msgstr ""
 
-#: popthelp.c:199
+#: popthelp.c:200
 msgid "NONE"
 msgstr ""
 
-#: popthelp.c:201
+#: popthelp.c:202
 msgid "VAL"
 msgstr ""
 
-#: popthelp.c:205
+#: popthelp.c:206
 msgid "INT"
 msgstr ""
 
-#: popthelp.c:206
+#: popthelp.c:207
 msgid "LONG"
 msgstr ""
 
-#: popthelp.c:207
+#: popthelp.c:208
 msgid "LONGLONG"
 msgstr ""
 
-#: popthelp.c:208
+#: popthelp.c:209
 msgid "STRING"
 msgstr ""
 
-#: popthelp.c:209
+#: popthelp.c:210
 msgid "FLOAT"
 msgstr ""
 
-#: popthelp.c:210
+#: popthelp.c:211
 msgid "DOUBLE"
 msgstr ""
 
-#: popthelp.c:213
+#: popthelp.c:214
 msgid "ARG"
 msgstr ""
 
diff --git a/po/zh_CN.po b/po/zh_CN.po
index 2db20c9..7a087a6 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.14\n"
 "Report-Msgid-Bugs-To: <popt-devel@rpm5.org>\n"
-"POT-Creation-Date: 2008-02-18 08:21-0500\n"
+"POT-Creation-Date: 2008-04-02 13:18-0400\n"
 "PO-Revision-Date: 2008-02-18 20:16+0800\n"
 "Last-Translator: LI Daobing <lidaobing@gmail.com>\n"
 "Language-Team: Chinese (simplified) <translation-team-zh-cn@lists."
@@ -17,112 +17,112 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: popt.c:35
+#: popt.c:42
 msgid "unknown errno"
 msgstr "未知的错误"
 
-#: popt.c:1090
+#: popt.c:1141
 #, c-format
 msgid "option type (%u) not implemented in popt\n"
 msgstr "选项类别 (%u) 没有在 popt 中实现\n"
 
-#: popt.c:1294
+#: popt.c:1349
 msgid "missing argument"
 msgstr "缺少参数"
 
-#: popt.c:1296
+#: popt.c:1351
 msgid "unknown option"
 msgstr "未知的选项"
 
-#: popt.c:1298
+#: popt.c:1353
 msgid "mutually exclusive logical operations requested"
 msgstr "需要 XOR 逻辑运算"
 
-#: popt.c:1300
+#: popt.c:1355
 msgid "opt->arg should not be NULL"
 msgstr "opt->arg 不应该为 NULL"
 
-#: popt.c:1302
+#: popt.c:1357
 msgid "aliases nested too deeply"
 msgstr "别名嵌套太深"
 
-#: popt.c:1304
+#: popt.c:1359
 msgid "error in parameter quoting"
 msgstr "参数引号错误"
 
-#: popt.c:1306
+#: popt.c:1361
 msgid "invalid numeric value"
 msgstr "无效的数值"
 
-#: popt.c:1308
+#: popt.c:1363
 msgid "number too large or too small"
 msgstr "数值太大或太小"
 
-#: popt.c:1310
+#: popt.c:1365
 msgid "memory allocation failed"
 msgstr "内存分配错误"
 
-#: popt.c:1314
+#: popt.c:1369
 msgid "unknown error"
 msgstr "未知的错误"
 
-#: popthelp.c:74 popthelp.c:85
+#: popthelp.c:75 popthelp.c:86
 msgid "Show this help message"
 msgstr "显示这个帮助信息"
 
-#: popthelp.c:75 popthelp.c:86
+#: popthelp.c:76 popthelp.c:87
 msgid "Display brief usage message"
 msgstr "显示简短的使用说明"
 
-#: popthelp.c:89
+#: popthelp.c:90
 msgid "Display option defaults in message"
 msgstr "在信息中显示默认的选项"
 
-#: popthelp.c:91
+#: popthelp.c:92
 msgid "Terminate options"
 msgstr "终止选项"
 
-#: popthelp.c:190
+#: popthelp.c:191
 msgid "Help options:"
 msgstr "帮助选项:"
 
-#: popthelp.c:191
+#: popthelp.c:192
 msgid "Options implemented via popt alias/exec:"
 msgstr "通过 popt alias/exec 实现的选项:"
 
-#: popthelp.c:199
+#: popthelp.c:200
 msgid "NONE"
 msgstr "NONE"
 
-#: popthelp.c:201
+#: popthelp.c:202
 msgid "VAL"
 msgstr "VAL"
 
-#: popthelp.c:205
+#: popthelp.c:206
 msgid "INT"
 msgstr "INT"
 
-#: popthelp.c:206
+#: popthelp.c:207
 msgid "LONG"
 msgstr "LONG"
 
-#: popthelp.c:207
+#: popthelp.c:208
 msgid "LONGLONG"
 msgstr "LONGLONG"
 
-#: popthelp.c:208
+#: popthelp.c:209
 msgid "STRING"
 msgstr "STRING"
 
-#: popthelp.c:209
+#: popthelp.c:210
 msgid "FLOAT"
 msgstr "FLOAT"
 
-#: popthelp.c:210
+#: popthelp.c:211
 msgid "DOUBLE"
 msgstr "DOUBLE"
 
-#: popthelp.c:213
+#: popthelp.c:214
 msgid "ARG"
 msgstr "ARG"
 
diff --git a/po/zh_TW.po b/po/zh_TW.po
index 5cdd879..27ac2fe 100644
--- a/po/zh_TW.po
+++ b/po/zh_TW.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.11\n"
 "Report-Msgid-Bugs-To: <popt-devel@rpm5.org>\n"
-"POT-Creation-Date: 2008-02-18 08:21-0500\n"
+"POT-Creation-Date: 2008-04-02 13:18-0400\n"
 "PO-Revision-Date: 2005-04-08 17:52+0800\n"
 "Last-Translator: Wei-Lun Chao <chaoweilun@pcmail.com.tw>\n"
 "Language-Team: zh_TW <zh-l10n@linux.org.tw>\n"
@@ -14,113 +14,113 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: popt.c:35
+#: popt.c:42
 msgid "unknown errno"
 msgstr "未知的錯誤"
 
-#: popt.c:1090
+#: popt.c:1141
 #, fuzzy, c-format
 msgid "option type (%u) not implemented in popt\n"
 msgstr "選項類型 (%d) 沒有在 popt 中實作\n"
 
-#: popt.c:1294
+#: popt.c:1349
 msgid "missing argument"
 msgstr "缺少引數"
 
-#: popt.c:1296
+#: popt.c:1351
 msgid "unknown option"
 msgstr "未知的選項"
 
-#: popt.c:1298
+#: popt.c:1353
 msgid "mutually exclusive logical operations requested"
 msgstr "需要相互獨立的邏輯運算"
 
-#: popt.c:1300
+#: popt.c:1355
 msgid "opt->arg should not be NULL"
 msgstr "opt->arg 不應為 NULL"
 
-#: popt.c:1302
+#: popt.c:1357
 msgid "aliases nested too deeply"
 msgstr "巢狀別名太深"
 
-#: popt.c:1304
+#: popt.c:1359
 msgid "error in parameter quoting"
 msgstr "參數引號錯誤"
 
-#: popt.c:1306
+#: popt.c:1361
 msgid "invalid numeric value"
 msgstr "不正確的數值"
 
-#: popt.c:1308
+#: popt.c:1363
 msgid "number too large or too small"
 msgstr "數字太大或太小"
 
-#: popt.c:1310
+#: popt.c:1365
 msgid "memory allocation failed"
 msgstr "記憶體配置錯誤"
 
-#: popt.c:1314
+#: popt.c:1369
 msgid "unknown error"
 msgstr "未知的錯誤"
 
-#: popthelp.c:74 popthelp.c:85
+#: popthelp.c:75 popthelp.c:86
 msgid "Show this help message"
 msgstr "顯示本說明訊息"
 
-#: popthelp.c:75 popthelp.c:86
+#: popthelp.c:76 popthelp.c:87
 msgid "Display brief usage message"
 msgstr "顯示簡短的使用說明"
 
-#: popthelp.c:89
+#: popthelp.c:90
 msgid "Display option defaults in message"
 msgstr "在訊息中顯示預設選項"
 
-#: popthelp.c:91
+#: popthelp.c:92
 msgid "Terminate options"
 msgstr ""
 
-#: popthelp.c:190
+#: popthelp.c:191
 msgid "Help options:"
 msgstr ""
 
-#: popthelp.c:191
+#: popthelp.c:192
 msgid "Options implemented via popt alias/exec:"
 msgstr ""
 
-#: popthelp.c:199
+#: popthelp.c:200
 msgid "NONE"
 msgstr "NONE"
 
-#: popthelp.c:201
+#: popthelp.c:202
 msgid "VAL"
 msgstr "VAL"
 
-#: popthelp.c:205
+#: popthelp.c:206
 msgid "INT"
 msgstr "INT"
 
-#: popthelp.c:206
+#: popthelp.c:207
 msgid "LONG"
 msgstr "LONG"
 
-#: popthelp.c:207
+#: popthelp.c:208
 #, fuzzy
 msgid "LONGLONG"
 msgstr "LONG"
 
-#: popthelp.c:208
+#: popthelp.c:209
 msgid "STRING"
 msgstr "STRING"
 
-#: popthelp.c:209
+#: popthelp.c:210
 msgid "FLOAT"
 msgstr "FLOAT"
 
-#: popthelp.c:210
+#: popthelp.c:211
 msgid "DOUBLE"
 msgstr "DOUBLE"
 
-#: popthelp.c:213
+#: popthelp.c:214
 msgid "ARG"
 msgstr "ARG"
 
-- 
Gitee


From 61bbb1bf151131cf877b7cac363400527d22c470 Mon Sep 17 00:00:00 2001
From: Jeff Johnson <n3npq@mac.com>
Date: Sun, 6 Apr 2008 14:00:23 +0000
Subject: [PATCH 538/667] - start popt-1.15 development.

---
 CHANGES      |  4 ++++
 configure.ac |  2 +-
 po/cs.po     |  2 +-
 po/da.po     |  2 +-
 po/de.po     | 20 +++++++++++---------
 po/es.po     |  2 +-
 po/fi.po     |  2 +-
 po/fr.po     |  2 +-
 po/ga.po     |  2 +-
 po/gl.po     |  2 +-
 po/hu.po     |  2 +-
 po/is.po     |  2 +-
 po/it.po     |  2 +-
 po/ja.po     |  2 +-
 po/ko.po     |  2 +-
 po/nb.po     |  2 +-
 po/nl.po     |  2 +-
 po/pl.po     |  2 +-
 po/popt.pot  |  4 ++--
 po/pt.po     |  2 +-
 po/ro.po     |  2 +-
 po/ru.po     |  2 +-
 po/sk.po     |  2 +-
 po/sl.po     |  2 +-
 po/sv.po     |  2 +-
 po/th.po     |  2 +-
 po/tr.po     |  2 +-
 po/uk.po     |  2 +-
 po/vi.po     |  2 +-
 po/wa.po     |  2 +-
 po/zh_CN.po  |  2 +-
 po/zh_TW.po  |  2 +-
 32 files changed, 46 insertions(+), 40 deletions(-)

diff --git a/CHANGES b/CHANGES
index 3d23b56..ea21be2 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,4 +1,8 @@
+1.14 -> 1.15:
+    - start popt-1.15 development.
+
 1.13 -> 1.14:
+    - release popt-1.14.
     - jbj: remove findme.c, add poptint.c, to po/POTFILES.in.
     - jbj: use stpcpy 2 more places (Wayne Davison<wayned@samba.org>).
     - jbj: add @LTLIBICONV@ when needed (Stanislav Brabec<sbrabec@suse.cz>).
diff --git a/configure.ac b/configure.ac
index e7b39f8..96095b4 100755
--- a/configure.ac
+++ b/configure.ac
@@ -1,5 +1,5 @@
 AC_PREREQ(2.57)
-AC_INIT(popt, 1.14, popt-devel@rpm5.org)
+AC_INIT(popt, 1.15, popt-devel@rpm5.org)
 AC_CANONICAL_TARGET
 AC_CONFIG_SRCDIR([popt.h])
 AC_CONFIG_HEADERS([config.h])
diff --git a/po/cs.po b/po/cs.po
index b7a382d..0ee7746 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.11\n"
 "Report-Msgid-Bugs-To: <popt-devel@rpm5.org>\n"
-"POT-Creation-Date: 2008-04-02 13:18-0400\n"
+"POT-Creation-Date: 2008-04-06 09:59-0400\n"
 "PO-Revision-Date: 2001-07-24 00:03+0100\n"
 "Last-Translator: Milan Kerslager <kerslage@linux.cz>\n"
 "Language-Team: Czech <cs@li.org>\n"
diff --git a/po/da.po b/po/da.po
index da38413..b4b8c91 100644
--- a/po/da.po
+++ b/po/da.po
@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.11\n"
 "Report-Msgid-Bugs-To: <popt-devel@rpm5.org>\n"
-"POT-Creation-Date: 2008-04-02 13:18-0400\n"
+"POT-Creation-Date: 2008-04-06 09:59-0400\n"
 "PO-Revision-Date: Sun Jan 21 2001 04:30:32+0200\n"
 "Last-Translator: Martin Hansen <mah@k64.dk>\n"
 "Language-Team: Dansk <dansk@klid.dk>\n"
diff --git a/po/de.po b/po/de.po
index d329eae..f6e7cc6 100644
--- a/po/de.po
+++ b/po/de.po
@@ -1,14 +1,14 @@
 # Translation of popt to German (Deutsch)
 # This file is distributed under the same license as the popt package.
-# Robert Scheck <robert@rpm5.org>, 2004-2008.
+# Robert Scheck <rpm@robert-scheck.de>, 2004-2007.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: popt 1.14\n"
+"Project-Id-Version: popt 1.11\n"
 "Report-Msgid-Bugs-To: <popt-devel@rpm5.org>\n"
-"POT-Creation-Date: 2008-04-02 13:18-0400\n"
-"PO-Revision-Date: 2008-03-12 22:21+0100\n"
-"Last-Translator: Robert Scheck <robert@rpm5.org>\n"
+"POT-Creation-Date: 2008-04-06 09:59-0400\n"
+"PO-Revision-Date: 2007-02-17 21:00+0100\n"
+"Last-Translator: Robert Scheck <rpm@robert-scheck.de>\n"
 "Language-Team: German <de@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -19,9 +19,9 @@ msgid "unknown errno"
 msgstr "Unbekannte Fehler-Nummer"
 
 #: popt.c:1141
-#, c-format
+#, fuzzy, c-format
 msgid "option type (%u) not implemented in popt\n"
-msgstr "Optionstyp (%u) ist nicht in popt implementiert\n"
+msgstr "Optionstyp (%d) ist in popt nicht vorhanden\n"
 
 #: popt.c:1349
 msgid "missing argument"
@@ -76,8 +76,9 @@ msgid "Display option defaults in message"
 msgstr "Zeigt die Standardeinstellungen an"
 
 #: popthelp.c:92
+#, fuzzy
 msgid "Terminate options"
-msgstr "Schließt die Optionen ab"
+msgstr "Hilfe-Optionen:"
 
 #: popthelp.c:191
 msgid "Help options:"
@@ -104,8 +105,9 @@ msgid "LONG"
 msgstr "LONG"
 
 #: popthelp.c:208
+#, fuzzy
 msgid "LONGLONG"
-msgstr "LONGLONG"
+msgstr "LONG"
 
 #: popthelp.c:209
 msgid "STRING"
diff --git a/po/es.po b/po/es.po
index cffcff4..049f81e 100644
--- a/po/es.po
+++ b/po/es.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.12\n"
 "Report-Msgid-Bugs-To: <popt-devel@rpm5.org>\n"
-"POT-Creation-Date: 2008-04-02 13:18-0400\n"
+"POT-Creation-Date: 2008-04-06 09:59-0400\n"
 "PO-Revision-Date: 2007-12-28 12:22+0100\n"
 "Last-Translator: Leandro Lucarella <luca@linuxmendoza.org.ar>\n"
 "Language-Team: Spanish <es@li.org>\n"
diff --git a/po/fi.po b/po/fi.po
index d506db7..e0efec1 100644
--- a/po/fi.po
+++ b/po/fi.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.14\n"
 "Report-Msgid-Bugs-To: <popt-devel@rpm5.org>\n"
-"POT-Creation-Date: 2008-04-02 13:18-0400\n"
+"POT-Creation-Date: 2008-04-06 09:59-0400\n"
 "PO-Revision-Date: 2008-02-21 18:19+0200\n"
 "Last-Translator: Jorma Karvonen <karvjorm@users.sf.net>\n"
 "Language-Team: Finnish <translation-team-fi@lists.sourceforge.net>\n"
diff --git a/po/fr.po b/po/fr.po
index ab1f7d3..18a540e 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -12,7 +12,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.11\n"
 "Report-Msgid-Bugs-To: <popt-devel@rpm5.org>\n"
-"POT-Creation-Date: 2008-04-02 13:18-0400\n"
+"POT-Creation-Date: 2008-04-06 09:59-0400\n"
 "PO-Revision-Date: 2003-06-22 23:43+0200\n"
 "Last-Translator: RPM French Translation <rpm-fr@livna.org>\n"
 "Language-Team: RPM French Translation <rpm-fr@livna.org>\n"
diff --git a/po/ga.po b/po/ga.po
index 8264e90..6478c0a 100644
--- a/po/ga.po
+++ b/po/ga.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.11\n"
 "Report-Msgid-Bugs-To: <popt-devel@rpm5.org>\n"
-"POT-Creation-Date: 2008-04-02 13:18-0400\n"
+"POT-Creation-Date: 2008-04-06 09:59-0400\n"
 "PO-Revision-Date: 2007-06-19 06:21-0500\n"
 "Last-Translator: Kevin Scannell <kscanne@gmail.com>\n"
 "Language-Team: Irish <gaeilge-gnulinux@lists.sourceforge.net>\n"
diff --git a/po/gl.po b/po/gl.po
index 90444bf..a5134e8 100644
--- a/po/gl.po
+++ b/po/gl.po
@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.11\n"
 "Report-Msgid-Bugs-To: <popt-devel@rpm5.org>\n"
-"POT-Creation-Date: 2008-04-02 13:18-0400\n"
+"POT-Creation-Date: 2008-04-06 09:59-0400\n"
 "PO-Revision-Date: 2001-01-17 01:01+0100\n"
 "Last-Translator: Jes�s Bravo �lvarez <jba@pobox.com>\n"
 "Language-Team: Galician <trasno@ceu.fi.udc.es>\n"
diff --git a/po/hu.po b/po/hu.po
index bcb2d26..e503542 100644
--- a/po/hu.po
+++ b/po/hu.po
@@ -5,7 +5,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.11\n"
 "Report-Msgid-Bugs-To: <popt-devel@rpm5.org>\n"
-"POT-Creation-Date: 2008-04-02 13:18-0400\n"
+"POT-Creation-Date: 2008-04-06 09:59-0400\n"
 "PO-Revision-Date: 2007-06-21 00:45+0200\n"
 "Last-Translator: Gabor Kelemen <kelemeng@gnome.hu>\n"
 "Language-Team: Hungarian <translation-team-hu@lists.sourceforge.net>\n"
diff --git a/po/is.po b/po/is.po
index 44a6c30..3b148f3 100644
--- a/po/is.po
+++ b/po/is.po
@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.11\n"
 "Report-Msgid-Bugs-To: <popt-devel@rpm5.org>\n"
-"POT-Creation-Date: 2008-04-02 13:18-0400\n"
+"POT-Creation-Date: 2008-04-06 09:59-0400\n"
 "PO-Revision-Date: 2001-06-08 01:35+0000\n"
 "Last-Translator: Richard Allen <ra@hp.is>\n"
 "Language-Team: is <kde-isl@mmedia.is>\n"
diff --git a/po/it.po b/po/it.po
index 981d93b..7056242 100644
--- a/po/it.po
+++ b/po/it.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.12\n"
 "Report-Msgid-Bugs-To: <popt-devel@rpm5.org>\n"
-"POT-Creation-Date: 2008-04-02 13:18-0400\n"
+"POT-Creation-Date: 2008-04-06 09:59-0400\n"
 "PO-Revision-Date: 2007-11-14 20:39+0100\n"
 "Last-Translator: Sandro Bonazzola <sandro.bonazzola@gmail.com>\n"
 "Language-Team: Italian <tp@lists.linux.it>\n"
diff --git a/po/ja.po b/po/ja.po
index 8881812..19f136f 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.11\n"
 "Report-Msgid-Bugs-To: <popt-devel@rpm5.org>\n"
-"POT-Creation-Date: 2008-04-02 13:18-0400\n"
+"POT-Creation-Date: 2008-04-06 09:59-0400\n"
 "PO-Revision-Date: 2003--8-25 19:00+0900\n"
 "Last-Translator: Yukihiro Nakai <ynakai@redhat.com>\n"
 "Language-Team: Japanese <ja@li.org>\n"
diff --git a/po/ko.po b/po/ko.po
index 3dc5d2d..261e252 100644
--- a/po/ko.po
+++ b/po/ko.po
@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.11\n"
 "Report-Msgid-Bugs-To: <popt-devel@rpm5.org>\n"
-"POT-Creation-Date: 2008-04-02 13:18-0400\n"
+"POT-Creation-Date: 2008-04-06 09:59-0400\n"
 "PO-Revision-Date: 2001-09-06 20:06+0900\n"
 "Last-Translator: Jong-Hoon Ryu <redhat4u@netian.com>\n"
 "Language-Team: GNU Translation project <ko@li.org>\n"
diff --git a/po/nb.po b/po/nb.po
index 13e74ba..68d1a99 100644
--- a/po/nb.po
+++ b/po/nb.po
@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.11\n"
 "Report-Msgid-Bugs-To: <popt-devel@rpm5.org>\n"
-"POT-Creation-Date: 2008-04-02 13:18-0400\n"
+"POT-Creation-Date: 2008-04-06 09:59-0400\n"
 "PO-Revision-Date: 2001-06-27 11:05+0200\n"
 "Last-Translator: Kjartan Maraas <kmaraas@online.no>\n"
 "Language-Team: Norwegian <no@li.org>\n"
diff --git a/po/nl.po b/po/nl.po
index 80020da..bbff977 100644
--- a/po/nl.po
+++ b/po/nl.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.14\n"
 "Report-Msgid-Bugs-To: <popt-devel@rpm5.org>\n"
-"POT-Creation-Date: 2008-04-02 13:18-0400\n"
+"POT-Creation-Date: 2008-04-06 09:59-0400\n"
 "PO-Revision-Date: 2008-02-20 19:26+0100\n"
 "Last-Translator: Tim Van Holder <tim.van.holder@telenet.be>\n"
 "Language-Team: Dutch <vertaling@vrijschrift.org>\n"
diff --git a/po/pl.po b/po/pl.po
index 18b4239..44bd594 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.14\n"
 "Report-Msgid-Bugs-To: <popt-devel@rpm5.org>\n"
-"POT-Creation-Date: 2008-04-02 13:18-0400\n"
+"POT-Creation-Date: 2008-04-06 09:59-0400\n"
 "PO-Revision-Date: 2008-02-18 00:30+0100\n"
 "Last-Translator: Jakub Bogusz <qboosh@pld-linux.org>\n"
 "Language-Team: Polish <translation-team-pl@lists.sourceforge.net>\n"
diff --git a/po/popt.pot b/po/popt.pot
index dd44688..cea9e37 100644
--- a/po/popt.pot
+++ b/po/popt.pot
@@ -5,9 +5,9 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: popt 1.14\n"
+"Project-Id-Version: popt 1.15\n"
 "Report-Msgid-Bugs-To: <popt-devel@rpm5.org>\n"
-"POT-Creation-Date: 2008-04-02 13:18-0400\n"
+"POT-Creation-Date: 2008-04-06 09:59-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/po/pt.po b/po/pt.po
index b2a3bd7..28e7c4f 100644
--- a/po/pt.po
+++ b/po/pt.po
@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.11\n"
 "Report-Msgid-Bugs-To: <popt-devel@rpm5.org>\n"
-"POT-Creation-Date: 2008-04-02 13:18-0400\n"
+"POT-Creation-Date: 2008-04-06 09:59-0400\n"
 "PO-Revision-Date: 2002-02-13 18:32+0000\n"
 "Last-Translator: Pedro Morais <morais@kde.org>\n"
 "Language-Team: pt <morais@kde.org>\n"
diff --git a/po/ro.po b/po/ro.po
index bcf0eeb..d8aa164 100644
--- a/po/ro.po
+++ b/po/ro.po
@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.11\n"
 "Report-Msgid-Bugs-To: <popt-devel@rpm5.org>\n"
-"POT-Creation-Date: 2008-04-02 13:18-0400\n"
+"POT-Creation-Date: 2008-04-06 09:59-0400\n"
 "PO-Revision-Date: 2000-06-14 23:23+EST\n"
 "Last-Translator: Cristian Gafton <gafton@redhat.com>\n"
 "Language-Team: Romanian <ro@li.org>\n"
diff --git a/po/ru.po b/po/ru.po
index 03cb4cb..ca7b878 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.11\n"
 "Report-Msgid-Bugs-To: <popt-devel@rpm5.org>\n"
-"POT-Creation-Date: 2008-04-02 13:18-0400\n"
+"POT-Creation-Date: 2008-04-06 09:59-0400\n"
 "PO-Revision-Date: 2001-07-05 21:00-0500\n"
 "Last-Translator: Eugene Kanter <eugene@blackcatlinux.com>\n"
 "Language-Team: Black Cat Linux Team <blackcat-support@blackcatlinux.com>\n"
diff --git a/po/sk.po b/po/sk.po
index 451f456..474164a 100644
--- a/po/sk.po
+++ b/po/sk.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.11\n"
 "Report-Msgid-Bugs-To: <popt-devel@rpm5.org>\n"
-"POT-Creation-Date: 2008-04-02 13:18-0400\n"
+"POT-Creation-Date: 2008-04-06 09:59-0400\n"
 "PO-Revision-Date: 1999-08-04 21:40+0200\n"
 "Last-Translator: Stanislav Meduna <stano@eunet.sk>\n"
 "Language-Team: Slovak <sk-i18n@rak.isternet.sk>\n"
diff --git a/po/sl.po b/po/sl.po
index 00274ec..f24cbe7 100644
--- a/po/sl.po
+++ b/po/sl.po
@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.11\n"
 "Report-Msgid-Bugs-To: <popt-devel@rpm5.org>\n"
-"POT-Creation-Date: 2008-04-02 13:18-0400\n"
+"POT-Creation-Date: 2008-04-06 09:59-0400\n"
 "PO-Revision-Date: 2000-09-05 12:30+0200\n"
 "Last-Translator: Roman Maurer <roman.maurer@hermes.si>\n"
 "Language-Team: Slovenian <sl@li.org>\n"
diff --git a/po/sv.po b/po/sv.po
index 5806646..869ec61 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.14\n"
 "Report-Msgid-Bugs-To: <popt-devel@rpm5.org>\n"
-"POT-Creation-Date: 2008-04-02 13:18-0400\n"
+"POT-Creation-Date: 2008-04-06 09:59-0400\n"
 "PO-Revision-Date: 2008-02-23 20:15+0100\n"
 "Last-Translator: G�ran Uddeborg <goeran@uddeborg.se>\n"
 "Language-Team: Swedish <tp-sv@listor.tp-sv.se>\n"
diff --git a/po/th.po b/po/th.po
index ede584e..d241901 100644
--- a/po/th.po
+++ b/po/th.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.14\n"
 "Report-Msgid-Bugs-To: <popt-devel@rpm5.org>\n"
-"POT-Creation-Date: 2008-04-02 13:18-0400\n"
+"POT-Creation-Date: 2008-04-06 09:59-0400\n"
 "PO-Revision-Date: 2008-02-19 15:53+0700\n"
 "Last-Translator: Seksan Poltree <seksan.poltree@gmail.com>\n"
 "Language-Team: Thai <translation-team-th@lists.sourceforge.net>\n"
diff --git a/po/tr.po b/po/tr.po
index 618a4d3..08f0ecc 100644
--- a/po/tr.po
+++ b/po/tr.po
@@ -5,7 +5,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.11\n"
 "Report-Msgid-Bugs-To: <popt-devel@rpm5.org>\n"
-"POT-Creation-Date: 2008-04-02 13:18-0400\n"
+"POT-Creation-Date: 2008-04-06 09:59-0400\n"
 "PO-Revision-Date: 2000-02-11 13:01+0200\n"
 "Last-Translator: Nilgun Belma Buguner <nilgun@technologist.com>\n"
 "Language-Team: Turkish <tr@li.org>\n"
diff --git a/po/uk.po b/po/uk.po
index 39a6c00..1ebd7a5 100644
--- a/po/uk.po
+++ b/po/uk.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.11\n"
 "Report-Msgid-Bugs-To: <popt-devel@rpm5.org>\n"
-"POT-Creation-Date: 2008-04-02 13:18-0400\n"
+"POT-Creation-Date: 2008-04-06 09:59-0400\n"
 "PO-Revision-Date: 1999-09-30 16:54+0200\n"
 "Last-Translator: Yuri Syrota <rasta@renome.rovno.ua>\n"
 "Language-Team: Ukrainian <uk@li.org>\n"
diff --git a/po/vi.po b/po/vi.po
index c3bf091..ab8e0fe 100644
--- a/po/vi.po
+++ b/po/vi.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.14\n"
 "Report-Msgid-Bugs-To: <popt-devel@rpm5.org>\n"
-"POT-Creation-Date: 2008-04-02 13:18-0400\n"
+"POT-Creation-Date: 2008-04-06 09:59-0400\n"
 "PO-Revision-Date: 2008-02-18 16:20+1030\n"
 "Last-Translator: Clytie Siddall <clytie@riverland.net.au>\n"
 "Language-Team: Vietnamese <vi-VN@googlegroups.com>\n"
diff --git a/po/wa.po b/po/wa.po
index aef6f79..99b8e4f 100644
--- a/po/wa.po
+++ b/po/wa.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.11\n"
 "Report-Msgid-Bugs-To: <popt-devel@rpm5.org>\n"
-"POT-Creation-Date: 2008-04-02 13:18-0400\n"
+"POT-Creation-Date: 2008-04-06 09:59-0400\n"
 "PO-Revision-Date: 1999-03-18 23:11+0100\n"
 "Last-Translator: Nobody yet\n"
 "Language-Team: walon <linux-wa@chanae.alphanet.ch>\n"
diff --git a/po/zh_CN.po b/po/zh_CN.po
index 7a087a6..28b611b 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.14\n"
 "Report-Msgid-Bugs-To: <popt-devel@rpm5.org>\n"
-"POT-Creation-Date: 2008-04-02 13:18-0400\n"
+"POT-Creation-Date: 2008-04-06 09:59-0400\n"
 "PO-Revision-Date: 2008-02-18 20:16+0800\n"
 "Last-Translator: LI Daobing <lidaobing@gmail.com>\n"
 "Language-Team: Chinese (simplified) <translation-team-zh-cn@lists."
diff --git a/po/zh_TW.po b/po/zh_TW.po
index 27ac2fe..6fbfa5b 100644
--- a/po/zh_TW.po
+++ b/po/zh_TW.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.11\n"
 "Report-Msgid-Bugs-To: <popt-devel@rpm5.org>\n"
-"POT-Creation-Date: 2008-04-02 13:18-0400\n"
+"POT-Creation-Date: 2008-04-06 09:59-0400\n"
 "PO-Revision-Date: 2005-04-08 17:52+0800\n"
 "Last-Translator: Wei-Lun Chao <chaoweilun@pcmail.com.tw>\n"
 "Language-Team: zh_TW <zh-l10n@linux.org.tw>\n"
-- 
Gitee


From 10b9e577df3c1f600dc1034df0532dfb9a28b82f Mon Sep 17 00:00:00 2001
From: "Dmitry V. Levin" <ldv@altlinux.org>
Date: Sat, 26 Apr 2008 21:57:32 +0000
Subject: [PATCH 539/667] - ldv: update INPUT tag in Doxyfile.in, fix doxygen
 warnings in popthelp.c.

---
 CHANGES     | 1 +
 Doxyfile.in | 3 +--
 popthelp.c  | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/CHANGES b/CHANGES
index ea21be2..c58a02a 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,4 +1,5 @@
 1.14 -> 1.15:
+    - ldv: update INPUT tag in Doxyfile.in, fix doxygen warnings in popthelp.c.
     - start popt-1.15 development.
 
 1.13 -> 1.14:
diff --git a/Doxyfile.in b/Doxyfile.in
index 21e045a..737a73e 100644
--- a/Doxyfile.in
+++ b/Doxyfile.in
@@ -460,12 +460,11 @@ WARN_LOGFILE           =
 # with spaces.
 
 INPUT                  = \
-                        ./findme.c \
-                        ./findme.h \
                         ./popt.c \
                         ./popt.h \
                         ./poptconfig.c \
                         ./popthelp.c \
+                        ./poptint.c \
                         ./poptint.h \
                         ./poptparse.c \
 			./system.h
diff --git a/popthelp.c b/popthelp.c
index 39dd8b7..a83ad33 100644
--- a/popthelp.c
+++ b/popthelp.c
@@ -152,7 +152,7 @@ static inline size_t stringDisplayWidth(const char *s)
 }
 
 /**
- * @param table		option(s)
+ * @param opt		option(s)
  */
 /*@observer@*/ /*@null@*/ static const char *
 getTableTranslationDomain(/*@null@*/ const struct poptOption *opt)
@@ -547,7 +547,7 @@ static size_t maxArgWidth(const struct poptOption * opt,
  * @param fp		output file handle
  * @param items		alias/exec array
  * @param nitems	no. of alias/exec entries
- * @param left		largest argument display width
+ * @param columns	output display width control
  * @param translation_domain	translation domain
  */
 static void itemHelp(FILE * fp,
-- 
Gitee


From f2ac0b6dd00e0701e156c87559cc4b6e35e7cfc7 Mon Sep 17 00:00:00 2001
From: Jeff Johnson <n3npq@mac.com>
Date: Mon, 5 May 2008 17:38:33 +0000
Subject: [PATCH 540/667] - jbj: refactor automagic (*opt->arg) option arg
 store to poptSaveArg().

---
 CHANGES |   1 +
 popt.c  | 215 ++++++++++++++++++++++++++++++--------------------------
 2 files changed, 116 insertions(+), 100 deletions(-)

diff --git a/CHANGES b/CHANGES
index c58a02a..f4458cc 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,4 +1,5 @@
 1.14 -> 1.15:
+    - jbj: refactor automagic (*opt->arg) option arg store to poptSaveArg().
     - ldv: update INPUT tag in Doxyfile.in, fix doxygen warnings in popthelp.c.
     - start popt-1.15 development.
 
diff --git a/popt.c b/popt.c
index f906c97..f20db51 100644
--- a/popt.c
+++ b/popt.c
@@ -840,6 +840,116 @@ int poptSaveInt(/*@null@*/ int * arg, unsigned int argInfo, long aLong)
     return 0;
 }
 
+/**
+ * Save the option argument through the (*opt->arg) pointer.
+ * @param con		context
+ * @param opt           option
+ * @return		0 on success, otherwise POPT_* error.
+ */
+static int poptSaveArg(poptContext con, const struct poptOption * opt)
+	/*@globals fileSystem, internalState @*/
+	/*@modifies con, fileSystem, internalState @*/
+{
+    poptArg arg = { .ptr = opt->arg };
+
+    switch (poptArgType(opt)) {
+    case POPT_ARG_ARGV:
+	/* XXX memory leak, application is responsible for free. */
+	if (con->os->nextArg == NULL)
+	    return POPT_ERROR_NULLARG;	/* XXX better return? */
+	if (poptSaveString(arg.ptr, opt->argInfo, con->os->nextArg))
+	    return POPT_ERROR_BADOPERATION;
+	/*@switchbreak@*/ break;
+    case POPT_ARG_STRING:
+	/* XXX memory leak, application is responsible for free. */
+	arg.argv[0] = (con->os->nextArg) ? xstrdup(con->os->nextArg) : NULL;
+	/*@switchbreak@*/ break;
+
+    case POPT_ARG_INT:
+    case POPT_ARG_LONG:
+    case POPT_ARG_LONGLONG:
+    {   long long aNUM = 0;
+	char *end = NULL;
+
+	if (con->os->nextArg) {
+	    aNUM = strtoll(con->os->nextArg, &end, 0);
+	    if (!(end && *end == '\0'))
+		return POPT_ERROR_BADNUMBER;
+	}
+
+/* XXX let's not demand C99 compiler flags for <limits.h> quite yet. */
+#if !defined(LLONG_MAX)
+#   define LLONG_MAX    9223372036854775807LL
+#   define LLONG_MIN    (-LLONG_MAX - 1LL)
+#endif
+
+	if (poptArgType(opt) == POPT_ARG_LONGLONG) {
+	    if (aNUM == LLONG_MAX || aNUM == LLONG_MIN)
+		return POPT_ERROR_OVERFLOW;
+	    if (poptSaveLongLong(arg.longlongp, opt->argInfo, aNUM))
+		return POPT_ERROR_BADOPERATION;
+	} else
+	if (poptArgType(opt) == POPT_ARG_LONG) {
+	    if (aNUM > (long long)LONG_MAX || aNUM < (long long)LONG_MIN)
+		return POPT_ERROR_OVERFLOW;
+	    if (poptSaveLong(arg.longp, opt->argInfo, (long)aNUM))
+		return POPT_ERROR_BADOPERATION;
+	} else
+	if (poptArgType(opt) == POPT_ARG_INT) {
+	    if (aNUM > (long long)INT_MAX || aNUM < (long long)INT_MIN)
+		return POPT_ERROR_OVERFLOW;
+	    if (poptSaveInt(arg.intp, opt->argInfo, (long)aNUM))
+		return POPT_ERROR_BADOPERATION;
+	} else
+	    return POPT_ERROR_BADOPERATION;
+    }   /*@switchbreak@*/ break;
+
+    case POPT_ARG_FLOAT:
+    case POPT_ARG_DOUBLE:
+    {   double aDouble = 0.0;
+	char *end;
+
+	if (con->os->nextArg) {
+/*@-mods@*/
+	    int saveerrno = errno;
+	    errno = 0;
+	    aDouble = strtod(con->os->nextArg, &end);
+	    if (errno == ERANGE)
+		return POPT_ERROR_OVERFLOW;
+	    errno = saveerrno;
+/*@=mods@*/
+	    if (*end != '\0')
+		return POPT_ERROR_BADNUMBER;
+	}
+
+	if (poptArgType(opt) == POPT_ARG_DOUBLE) {
+	    arg.doublep[0] = aDouble;
+	} else {
+#if !defined(DBL_EPSILON) && !defined(__LCLINT__)
+#define DBL_EPSILON 2.2204460492503131e-16
+#endif
+#define POPT_ABS(a)	((((a) - 0.0) < DBL_EPSILON) ? -(a) : (a))
+	    if ((POPT_ABS(aDouble) - FLT_MAX) > DBL_EPSILON)
+		return POPT_ERROR_OVERFLOW;
+	    if ((FLT_MIN - POPT_ABS(aDouble)) > DBL_EPSILON)
+		return POPT_ERROR_OVERFLOW;
+	    arg.floatp[0] = (float) aDouble;
+	}
+    }   /*@switchbreak@*/ break;
+    case POPT_ARG_MAINCALL:
+/*@-assignexpose -type@*/
+	con->maincall = opt->arg;
+/*@=assignexpose =type@*/
+	/*@switchbreak@*/ break;
+    default:
+	fprintf(stdout, POPT_("option type (%u) not implemented in popt\n"),
+		poptArgType(opt));
+	exit(EXIT_FAILURE);
+	/*@notreached@*/ /*@switchbreak@*/ break;
+    }
+    return 0;
+}
+
 /* returns 'val' element, -1 on last item, POPT_ERROR_* on error */
 int poptGetNextOpt(poptContext con)
 {
@@ -999,6 +1109,8 @@ int poptGetNextOpt(poptContext con)
 		    return POPT_ERROR_BADOPERATION;
 	    }
 	} else if (poptArgType(opt) != POPT_ARG_NONE) {
+	    int rc;
+
 	    con->os->nextArg = _free(con->os->nextArg);
 	    if (longArg) {
 		longArg = expandNextArg(con, longArg);
@@ -1044,106 +1156,9 @@ int poptGetNextOpt(poptContext con)
 	    }
 	    longArg = NULL;
 
-	    if (opt->arg) {
-		poptArg arg = { .ptr = opt->arg };
-		switch (poptArgType(opt)) {
-		case POPT_ARG_ARGV:
-		    /* XXX memory leak, application is responsible for free. */
-		    if (con->os->nextArg == NULL)
-			return POPT_ERROR_NULLARG;	/* XXX better return? */
-		    if (poptSaveString(arg.ptr, opt->argInfo, con->os->nextArg))
-			return POPT_ERROR_BADOPERATION;
-		    /*@switchbreak@*/ break;
-		case POPT_ARG_STRING:
-		    /* XXX memory leak, application is responsible for free. */
-		    arg.argv[0] = (con->os->nextArg)
-			? xstrdup(con->os->nextArg) : NULL;
-		    /*@switchbreak@*/ break;
-
-		case POPT_ARG_INT:
-		case POPT_ARG_LONG:
-		case POPT_ARG_LONGLONG:
-		{   long long aNUM = 0;
-		    char *end = NULL;
-
-		    if (con->os->nextArg) {
-			aNUM = strtoll(con->os->nextArg, &end, 0);
-			if (!(end && *end == '\0'))
-			    return POPT_ERROR_BADNUMBER;
-		    }
-
-/* XXX let's not demand C99 compiler flags for <limits.h> quite yet. */
-#if !defined(LLONG_MAX)
-#   define LLONG_MAX    9223372036854775807LL
-#   define LLONG_MIN    (-LLONG_MAX - 1LL)
-#endif
-
-		    if (poptArgType(opt) == POPT_ARG_LONGLONG) {
-			if (aNUM == LLONG_MAX || aNUM == LLONG_MIN)
-			    return POPT_ERROR_OVERFLOW;
-			if (poptSaveLongLong(arg.longlongp, opt->argInfo, aNUM))
-			    return POPT_ERROR_BADOPERATION;
-		    } else
-		    if (poptArgType(opt) == POPT_ARG_LONG) {
-			if (aNUM > (long long)LONG_MAX || aNUM < (long long)LONG_MIN)
-			    return POPT_ERROR_OVERFLOW;
-			if (poptSaveLong(arg.longp, opt->argInfo, (long)aNUM))
-			    return POPT_ERROR_BADOPERATION;
-		    } else
-		    if (poptArgType(opt) == POPT_ARG_INT) {
-			if (aNUM > (long long)INT_MAX || aNUM < (long long)INT_MIN)
-			    return POPT_ERROR_OVERFLOW;
-			if (poptSaveInt(arg.intp, opt->argInfo, (long)aNUM))
-			    return POPT_ERROR_BADOPERATION;
-		    } else
-			return POPT_ERROR_BADOPERATION;
-		}   /*@switchbreak@*/ break;
-
-		case POPT_ARG_FLOAT:
-		case POPT_ARG_DOUBLE:
-		{   double aDouble = 0.0;
-		    char *end;
-
-		    if (con->os->nextArg) {
-/*@-mods@*/
-			int saveerrno = errno;
-			errno = 0;
-			aDouble = strtod(con->os->nextArg, &end);
-			if (errno == ERANGE)
-			    return POPT_ERROR_OVERFLOW;
-			errno = saveerrno;
-/*@=mods@*/
-			if (*end != '\0')
-			    return POPT_ERROR_BADNUMBER;
-		    }
-
-		    if (poptArgType(opt) == POPT_ARG_DOUBLE) {
-			arg.doublep[0] = aDouble;
-		    } else {
-#if !defined(DBL_EPSILON) && !defined(__LCLINT__)
-#define DBL_EPSILON 2.2204460492503131e-16
-#endif
-#define POPT_ABS(a)	((((a) - 0.0) < DBL_EPSILON) ? -(a) : (a))
-			if ((POPT_ABS(aDouble) - FLT_MAX) > DBL_EPSILON)
-			    return POPT_ERROR_OVERFLOW;
-			if ((FLT_MIN - POPT_ABS(aDouble)) > DBL_EPSILON)
-			    return POPT_ERROR_OVERFLOW;
-			arg.floatp[0] = (float) aDouble;
-		    }
-		}   /*@switchbreak@*/ break;
-		case POPT_ARG_MAINCALL:
-/*@-type@*/
-		    con->maincall = opt->arg;
-/*@=type@*/
-		    /*@switchbreak@*/ break;
-		default:
-		    fprintf(stdout,
-			POPT_("option type (%u) not implemented in popt\n"),
-			poptArgType(opt));
-		    exit(EXIT_FAILURE);
-		    /*@notreached@*/ /*@switchbreak@*/ break;
-		}
-	    }
+	   /* Save the option argument through a (*opt->arg) pointer. */
+	    if (opt->arg != NULL && (rc = poptSaveArg(con, opt)) != 0)
+		return rc;
 	}
 
 	if (cb)
-- 
Gitee


From 4fa9cda9c1592370107c445e6c0a77a211f249f3 Mon Sep 17 00:00:00 2001
From: Jeff Johnson <n3npq@mac.com>
Date: Mon, 5 May 2008 19:27:31 +0000
Subject: [PATCH 541/667] - jbj: add lconv/gcov targets to Makefile.am.

---
 .cvsignore  |  3 +++
 CHANGES     |  1 +
 Makefile.am | 29 +++++++++++++++++++++++++++++
 3 files changed, 33 insertions(+)

diff --git a/.cvsignore b/.cvsignore
index 5af65ad..892d8c3 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -21,6 +21,7 @@ doxygen
 depcomp
 install-sh
 intl
+lconv
 libtool
 ltconfig
 ltmain.sh
@@ -33,6 +34,8 @@ stamp-h.in
 test1
 test2
 test3
+*.gcda
+*.gcno
 *.la
 *.lcd
 *.lo
diff --git a/CHANGES b/CHANGES
index f4458cc..ab90d5b 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,4 +1,5 @@
 1.14 -> 1.15:
+    - jbj: add lconv/gcov targets to Makefile.am.
     - jbj: refactor automagic (*opt->arg) option arg store to poptSaveArg().
     - ldv: update INPUT tag in Doxyfile.in, fix doxygen warnings in popthelp.c.
     - start popt-1.15 development.
diff --git a/Makefile.am b/Makefile.am
index e142c53..ca96469 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -71,4 +71,33 @@ doxygen: Doxyfile
 	mkdir -p doxygen
 	doxygen
 
+.PHONY:	lcov-reset	# run lcov from scratch, always
+lcov-reset:
+	make lcov-run
+	make lcov-report
+
+.PHONY:	lcov		# run lcov from scratch if the dir is not there
+lcov:
+	make lcov-reset
+
+.PHONY:	lcov-run	# reset run coverage tests
+lcov-run:
+	@-rm -rf lcov
+	find . -name "*.gcda" -exec rm {} \;
+	make check
+
+.PHONY:	lcov-report	# generate report based on current coverage data
+lcov-report:
+	mkdir lcov
+	lcov --directory . --capture --output-file lcov/lcov.info
+	lcov -l lcov/lcov.info | grep -v "`cd $(top_srcdir) && pwd`" | cut -d: -f1 > lcov/remove
+	lcov -r lcov/lcov.info `cat lcov/remove` > lcov/lcov.cleaned.info
+	rm lcov/remove
+	mv lcov/lcov.cleaned.info lcov/lcov.info
+	genhtml -t "$(PACKAGE_STRING)" -o lcov lcov/lcov.info
+
+#.PHONY:	lcov-reset
+#lcov-upload: lcov
+#	rsync -rvz -e ssh --delete lcov/* ???
+
 ACLOCAL_AMFLAGS = -I m4
-- 
Gitee


From 011bb004f8def90c3ffface4ef90cbbb3889ad58 Mon Sep 17 00:00:00 2001
From: Jeff Johnson <n3npq@mac.com>
Date: Mon, 5 May 2008 19:45:06 +0000
Subject: [PATCH 542/667] - jbj: add tests for --usage/--help coverage.

---
 CHANGES   |  1 +
 testit.sh | 51 +++++++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 52 insertions(+)

diff --git a/CHANGES b/CHANGES
index ab90d5b..9ab258e 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,4 +1,5 @@
 1.14 -> 1.15:
+    - jbj: add tests for --usage/--help coverage.
     - jbj: add lconv/gcov targets to Makefile.am.
     - jbj: refactor automagic (*opt->arg) option arg store to poptSaveArg().
     - ldv: update INPUT tag in Doxyfile.in, fix doxygen warnings in popthelp.c.
diff --git a/testit.sh b/testit.sh
index c06a53d..1a16e47 100755
--- a/testit.sh
+++ b/testit.sh
@@ -104,6 +104,57 @@ run test1 "test1 - 47" "arg1: 0 arg2: (none) aArgv: A B rest: C" --argv A --argv
 run test1 "test1 - 48" "arg1: 0 arg2: foo=bar" -2foo=bar
 run test1 "test1 - 49" "arg1: 0 arg2: foo=bar" -2=foo=bar
 
+run test1 "test1 - 50" "\
+Usage: lt-test1 [-I?] [-c|--cb2=STRING] [--arg1] [-2|--arg2=ARG]
+        [-3|--arg3=ANARG] [-onedash] [--optional=STRING] [--val]
+        [-i|--int=INT] [-l|--long=LONG] [-L|--longlong=LONGLONG]
+        [-f|--float=FLOAT] [-d|--double=DOUBLE] [--randint=INT]
+        [--randlong=LONG] [--randlonglong=LONGLONG] [--argv] [--bitset]
+        [--bitclr] [--nstr=STRING] [--lstr=STRING] [-I|--inc]
+        [-c|--cb=STRING] [--longopt] [-?|--help] [--usage]" --usage
+
+run test1 "test1 - 51" "\
+Usage: lt-test1 [OPTION...]
+      --arg1                      First argument with a really long
+                                  description. After all, we have to test
+                                  argument help wrapping somehow, right?
+  -2, --arg2=ARG                  Another argument (default: \"(none)\")
+  -3, --arg3=ANARG                A third argument
+      -onedash                    POPT_ARGFLAG_ONEDASH: Option takes a single -
+      --optional[=STRING]         POPT_ARGFLAG_OPTIONAL: Takes an optional
+                                  string argument
+      --val                       POPT_ARG_VAL: 125992 141421
+  -i, --int=INT                   POPT_ARG_INT: 271828 (default: 271828)
+  -l, --long=LONG                 POPT_ARG_LONG: 738905609 (default: 738905609)
+  -L, --longlong=LONGLONG         POPT_ARG_LONGLONG: 738905609 (default:
+                                  738905609)
+  -f, --float=FLOAT               POPT_ARG_FLOAT: 3.14159 (default: 3.14159)
+  -d, --double=DOUBLE             POPT_ARG_DOUBLE: 9.8696 (default: 9.8696)
+      --randint=INT               POPT_ARGFLAG_RANDOM: experimental
+      --randlong=LONG             POPT_ARGFLAG_RANDOM: experimental
+      --randlonglong=LONGLONG     POPT_ARGFLAG_RANDOM: experimental
+      --argv                      POPT_ARG_ARGV: append arg to array (can be
+                                  used multiple times)
+      --bitset                    POPT_BIT_SET: |= 0x4321
+      --bitclr                    POPT_BIT_CLR: &= ~0x1234
+      --nstr=STRING               POPT_ARG_STRING: (null) (default: null)
+      --lstr=STRING               POPT_ARG_STRING: \"123456789...\" (default:
+                                  \"This tests default strings and exceeds the
+                                  ... limit.
+                                  123456789+123456789+123456789+123456789+123456789+ 123456789+123456789+123456789+123456789+123456789+ 1234567...\")
+
+arg for cb2
+  -c, --cb2=STRING                Test argument callbacks
+  -I, --inc                       An included argument
+
+Callback arguments
+  -c, --cb=STRING                 Test argument callbacks
+      --longopt                   Unused option for help testing
+
+Help options:
+  -?, --help                      Show this help message
+      --usage                     Display brief usage message" --help
+
 #run_diff test3 "test3 - 51" test3-data/01.input test3-data/01.answer
 #run_diff test3 "test3 - 52" test3-data/02.input test3-data/02.answer
 #run_diff test3 "test3 - 53" test3-data/03.input test3-data/03.answer
-- 
Gitee


From b12e1c5bdef1ca422cff9db1a32185ff5e10e9a2 Mon Sep 17 00:00:00 2001
From: Jeff Johnson <n3npq@mac.com>
Date: Mon, 5 May 2008 20:29:45 +0000
Subject: [PATCH 543/667] - jbj: extend coverage to several additional setup
 routines.

---
 .popt       | 0
 CHANGES     | 1 +
 test-poptrc | 5 +++--
 test1.c     | 4 ++++
 testit.sh   | 7 +++++--
 5 files changed, 13 insertions(+), 4 deletions(-)
 create mode 100644 .popt

diff --git a/.popt b/.popt
new file mode 100644
index 0000000..e69de29
diff --git a/CHANGES b/CHANGES
index 9ab258e..457522c 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,4 +1,5 @@
 1.14 -> 1.15:
+    - jbj: extend coverage to several additional setup routines.
     - jbj: add tests for --usage/--help coverage.
     - jbj: add lconv/gcov targets to Makefile.am.
     - jbj: refactor automagic (*opt->arg) option arg store to poptSaveArg().
diff --git a/test-poptrc b/test-poptrc
index 509e013..9d5370f 100644
--- a/test-poptrc
+++ b/test-poptrc
@@ -1,4 +1,5 @@
-test1 alias --simple --arg2
+test1 alias --simple --arg2 \
+	--POPTdesc=$"simple description" --POPTargs=$"ARG"
 test1 alias --two --arg1 --arg2 alias
 test1 alias --takerest --
 test1 alias -T --arg2
@@ -7,6 +8,6 @@ test1 alias -O --arg1
 test1 alias --grab --arg2 "'foo !#:+'"
 test1 alias --grabbar --grab bar
 
-test1 exec --echo-args echo
+test1 exec --echo-args /bin/echo
 test1 alias -e --echo-args
 test1 exec -a /bin/echo
diff --git a/test1.c b/test1.c
index 24e7371..a39f0cb 100644
--- a/test1.c
+++ b/test1.c
@@ -161,6 +161,7 @@ static struct poptOption options[] = {
 	NULL, NULL },
   { NULL, '\0', POPT_ARG_INCLUDE_TABLE, &callbackArgs, 0,
 	"Callback arguments", NULL },
+  POPT_AUTOALIAS
   POPT_AUTOHELP
   POPT_TABLEEND
 };
@@ -230,6 +231,9 @@ int main(int argc, const char ** argv)
     optCon = poptGetContext("test1", argc, argv, options, 0);
 /*@=temptrans@*/
     (void) poptReadConfigFile(optCon, "./test-poptrc");
+    (void) poptReadDefaultConfig(optCon, 1);
+
+    poptSetExecPath(optCon, ".", 1);
 
 #if 1
     while ((rc = poptGetNextOpt(optCon)) > 0)	/* Read all the options ... */
diff --git a/testit.sh b/testit.sh
index 1a16e47..b788edb 100755
--- a/testit.sh
+++ b/testit.sh
@@ -7,7 +7,7 @@ run() {
 
     echo Running test $name.
 
-    result=`$builddir/$prog $*`
+    result=`HOME=$builddir $builddir/$prog $*`
     if [ "$answer" != "$result" ]; then
 	echo "Test \"$prog $*\" failed with: \"$result\" != \"$answer\" "
 	exit 2
@@ -111,7 +111,7 @@ Usage: lt-test1 [-I?] [-c|--cb2=STRING] [--arg1] [-2|--arg2=ARG]
         [-f|--float=FLOAT] [-d|--double=DOUBLE] [--randint=INT]
         [--randlong=LONG] [--randlonglong=LONGLONG] [--argv] [--bitset]
         [--bitclr] [--nstr=STRING] [--lstr=STRING] [-I|--inc]
-        [-c|--cb=STRING] [--longopt] [-?|--help] [--usage]" --usage
+        [-c|--cb=STRING] [--longopt] [-?|--help] [--usage] [--simple=ARG]" --usage
 
 run test1 "test1 - 51" "\
 Usage: lt-test1 [OPTION...]
@@ -151,6 +151,9 @@ Callback arguments
   -c, --cb=STRING                 Test argument callbacks
       --longopt                   Unused option for help testing
 
+Options implemented via popt alias/exec:
+      --simple=ARG                simple description
+
 Help options:
   -?, --help                      Show this help message
       --usage                     Display brief usage message" --help
-- 
Gitee


From c147ce43910128d744c1b32e6326f510b92b382e Mon Sep 17 00:00:00 2001
From: Jeff Johnson <n3npq@mac.com>
Date: Mon, 5 May 2008 20:54:31 +0000
Subject: [PATCH 544/667] - jbj: extend coverage to poptPeekArg().

---
 test1.c | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/test1.c b/test1.c
index a39f0cb..379495f 100644
--- a/test1.c
+++ b/test1.c
@@ -299,12 +299,14 @@ int main(int argc, const char ** argv)
     if (singleDash)
 	fprintf(stdout, " -");
 
-    rest = poptGetArgs(optCon);
-    if (rest) {
-	fprintf(stdout, " rest:");
-	while (*rest) {
-	    fprintf(stdout, " %s", *rest);
-	    rest++;
+    if (poptPeekArg(optCon) != NULL) {
+	rest = poptGetArgs(optCon);
+	if (rest) {
+	    fprintf(stdout, " rest:");
+	    while (*rest) {
+		fprintf(stdout, " %s", *rest);
+		rest++;
+	    }
 	}
     }
 
-- 
Gitee


From d726563d6fbd1e0f0b1420d17980672d8e4d0913 Mon Sep 17 00:00:00 2001
From: Robert Scheck <robert@fedoraproject.org>
Date: Sun, 25 May 2008 12:39:22 +0000
Subject: [PATCH 545/667] Updated German popt translation

---
 po/de.po | 18 ++++++++----------
 1 file changed, 8 insertions(+), 10 deletions(-)

diff --git a/po/de.po b/po/de.po
index f6e7cc6..6ae4cd5 100644
--- a/po/de.po
+++ b/po/de.po
@@ -1,14 +1,14 @@
 # Translation of popt to German (Deutsch)
 # This file is distributed under the same license as the popt package.
-# Robert Scheck <rpm@robert-scheck.de>, 2004-2007.
+# Robert Scheck <robert@rpm5.org>, 2004-2008.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: popt 1.11\n"
+"Project-Id-Version: popt 1.15\n"
 "Report-Msgid-Bugs-To: <popt-devel@rpm5.org>\n"
 "POT-Creation-Date: 2008-04-06 09:59-0400\n"
-"PO-Revision-Date: 2007-02-17 21:00+0100\n"
-"Last-Translator: Robert Scheck <rpm@robert-scheck.de>\n"
+"PO-Revision-Date: 2008-05-25 14:39+0200\n"
+"Last-Translator: Robert Scheck <robert@rpm5.org>\n"
 "Language-Team: German <de@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -19,9 +19,9 @@ msgid "unknown errno"
 msgstr "Unbekannte Fehler-Nummer"
 
 #: popt.c:1141
-#, fuzzy, c-format
+#, c-format
 msgid "option type (%u) not implemented in popt\n"
-msgstr "Optionstyp (%d) ist in popt nicht vorhanden\n"
+msgstr "Optionstyp (%u) ist nicht in popt implementiert\n"
 
 #: popt.c:1349
 msgid "missing argument"
@@ -76,9 +76,8 @@ msgid "Display option defaults in message"
 msgstr "Zeigt die Standardeinstellungen an"
 
 #: popthelp.c:92
-#, fuzzy
 msgid "Terminate options"
-msgstr "Hilfe-Optionen:"
+msgstr "Schließt die Optionen ab"
 
 #: popthelp.c:191
 msgid "Help options:"
@@ -105,9 +104,8 @@ msgid "LONG"
 msgstr "LONG"
 
 #: popthelp.c:208
-#, fuzzy
 msgid "LONGLONG"
-msgstr "LONG"
+msgstr "LONGLONG"
 
 #: popthelp.c:209
 msgid "STRING"
-- 
Gitee


From c83e0ede47648cba4a7af0eecce04aea6e37f9ec Mon Sep 17 00:00:00 2001
From: "Ralf S. Engelschall" <rse@engelschall.com>
Date: Thu, 17 Jul 2008 12:54:02 +0000
Subject: [PATCH 546/667] fix description of POPT_ARG_NONE

---
 popt.3 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/popt.3 b/popt.3
index ee8d76c..205d913 100644
--- a/popt.3
+++ b/popt.3
@@ -114,7 +114,7 @@ the first is a long name, while the latter is a single character.
 .sp
 The 
 .IR argInfo " member tells popt what type of argument is expected" 
-after the argument.  If no option is expected,
+after the option.  If no argument is expected,
 .B POPT_ARG_NONE
 should be used.
 The rest of the valid values are shown in the following table:
-- 
Gitee


From 73c96778b2139a80a1bf651bfdb5d5741c453caa Mon Sep 17 00:00:00 2001
From: Jeff Johnson <n3npq@mac.com>
Date: Thu, 18 Sep 2008 18:08:58 +0000
Subject: [PATCH 547/667] - jbj: correct typo in commented out make target.

---
 Makefile.am | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Makefile.am b/Makefile.am
index ca96469..f6232fd 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -96,7 +96,7 @@ lcov-report:
 	mv lcov/lcov.cleaned.info lcov/lcov.info
 	genhtml -t "$(PACKAGE_STRING)" -o lcov lcov/lcov.info
 
-#.PHONY:	lcov-reset
+#.PHONY:	lcov-upload
 #lcov-upload: lcov
 #	rsync -rvz -e ssh --delete lcov/* ???
 
-- 
Gitee


From 92725aa07bc98a888940effa64aaaead6e18f5d6 Mon Sep 17 00:00:00 2001
From: Jeff Johnson <n3npq@mac.com>
Date: Thu, 18 Sep 2008 18:12:53 +0000
Subject: [PATCH 548/667] - jbj: updated da.po (Translation Project).

---
 CHANGES     |  1 +
 po/cs.po    | 24 +++++++++----------
 po/da.po    | 69 ++++++++++++++++++++++++++++-------------------------
 po/de.po    | 24 +++++++++----------
 po/es.po    | 24 +++++++++----------
 po/fi.po    | 24 +++++++++----------
 po/fr.po    | 24 +++++++++----------
 po/ga.po    | 39 +++++++++++++++---------------
 po/gl.po    | 24 +++++++++----------
 po/hu.po    | 24 +++++++++----------
 po/is.po    | 24 +++++++++----------
 po/it.po    | 24 +++++++++----------
 po/ja.po    | 24 +++++++++----------
 po/ko.po    | 24 +++++++++----------
 po/nb.po    | 24 +++++++++----------
 po/nl.po    | 24 +++++++++----------
 po/pl.po    | 24 +++++++++----------
 po/popt.pot | 24 +++++++++----------
 po/pt.po    | 24 +++++++++----------
 po/ro.po    | 24 +++++++++----------
 po/ru.po    | 24 +++++++++----------
 po/sk.po    | 24 +++++++++----------
 po/sl.po    | 24 +++++++++----------
 po/sv.po    | 24 +++++++++----------
 po/th.po    | 24 +++++++++----------
 po/tr.po    | 24 +++++++++----------
 po/uk.po    | 24 +++++++++----------
 po/vi.po    | 24 +++++++++----------
 po/wa.po    | 24 +++++++++----------
 po/zh_CN.po | 24 +++++++++----------
 po/zh_TW.po | 24 +++++++++----------
 31 files changed, 392 insertions(+), 389 deletions(-)

diff --git a/CHANGES b/CHANGES
index 457522c..671a5ad 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,4 +1,5 @@
 1.14 -> 1.15:
+    - jbj: updated da.po (Translation Project).
     - jbj: extend coverage to several additional setup routines.
     - jbj: add tests for --usage/--help coverage.
     - jbj: add lconv/gcov targets to Makefile.am.
diff --git a/po/cs.po b/po/cs.po
index 0ee7746..cbb7836 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.11\n"
 "Report-Msgid-Bugs-To: <popt-devel@rpm5.org>\n"
-"POT-Creation-Date: 2008-04-06 09:59-0400\n"
+"POT-Creation-Date: 2008-09-18 14:11-0400\n"
 "PO-Revision-Date: 2001-07-24 00:03+0100\n"
 "Last-Translator: Milan Kerslager <kerslage@linux.cz>\n"
 "Language-Team: Czech <cs@li.org>\n"
@@ -14,48 +14,48 @@ msgstr ""
 msgid "unknown errno"
 msgstr "nezn�m� ��slo chyby"
 
-#: popt.c:1141
+#: popt.c:945
 #, fuzzy, c-format
 msgid "option type (%u) not implemented in popt\n"
 msgstr "volba (%d) nen� v popt implementov�na\n"
 
-#: popt.c:1349
+#: popt.c:1364
 msgid "missing argument"
 msgstr "chyb� argument"
 
-#: popt.c:1351
+#: popt.c:1366
 msgid "unknown option"
 msgstr "nezn�m� volba"
 
-#: popt.c:1353
+#: popt.c:1368
 msgid "mutually exclusive logical operations requested"
 msgstr "po�adov�ny vz�jemn� v�lu�n� logick� operace"
 
-#: popt.c:1355
+#: popt.c:1370
 msgid "opt->arg should not be NULL"
 msgstr "opt->arg nesm� b�t NULL"
 
-#: popt.c:1357
+#: popt.c:1372
 msgid "aliases nested too deeply"
 msgstr "aliasy vno�en� p��li� hluboko"
 
-#: popt.c:1359
+#: popt.c:1374
 msgid "error in parameter quoting"
 msgstr "chyba v quotov�n� parametr�"
 
-#: popt.c:1361
+#: popt.c:1376
 msgid "invalid numeric value"
 msgstr "chybn� numerick� hodnota"
 
-#: popt.c:1363
+#: popt.c:1378
 msgid "number too large or too small"
 msgstr "��slo je p��li� velk� nebo p��li� mal�"
 
-#: popt.c:1365
+#: popt.c:1380
 msgid "memory allocation failed"
 msgstr "selhala alokace pam�ti"
 
-#: popt.c:1369
+#: popt.c:1384
 msgid "unknown error"
 msgstr "nezn�m� chyba"
 
diff --git a/po/da.po b/po/da.po
index b4b8c91..e277cf9 100644
--- a/po/da.po
+++ b/po/da.po
@@ -1,89 +1,93 @@
+# Danish translation of popt.
+# Copyright (C) 2008 popt.
+# This file is distributed under the same license as the popt package.
+# Martin Hansen <mah@k64.dk>, 2001.
+# Joe Hansen <joedalton2@yahoo.dk>, 2008.
+#
 msgid ""
 msgstr ""
-"Project-Id-Version: popt 1.11\n"
+"Project-Id-Version: popt-1.14\n"
 "Report-Msgid-Bugs-To: <popt-devel@rpm5.org>\n"
-"POT-Creation-Date: 2008-04-06 09:59-0400\n"
-"PO-Revision-Date: Sun Jan 21 2001 04:30:32+0200\n"
-"Last-Translator: Martin Hansen <mah@k64.dk>\n"
-"Language-Team: Dansk <dansk@klid.dk>\n"
+"POT-Creation-Date: 2008-09-18 14:11-0400\n"
+"PO-Revision-Date: 2008-09-15 00:00+0000\n"
+"Last-Translator: Joe Hansen <joedalton2@yahoo.dk>\n"
+"Language-Team: Danish <dansk@dansk-gruppen.dk>\n"
 "MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=ISO-8859-1\n"
-"Content-Transfer-Encoding: 8-bit\n"
-"X-Generator: KTranslator v 0.6.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
 
 #: popt.c:42
 msgid "unknown errno"
 msgstr "ukendt fejlnr."
 
-#: popt.c:1141
-#, fuzzy, c-format
+#: popt.c:945
+#, c-format
 msgid "option type (%u) not implemented in popt\n"
-msgstr "tilvalgstype (%d) er ikke implementeret i popt\n"
+msgstr "tilvalgstype (%u) er ikke implementeret i popt\n"
 
-#: popt.c:1349
+#: popt.c:1364
 msgid "missing argument"
 msgstr "mangler argument"
 
-#: popt.c:1351
+#: popt.c:1366
 msgid "unknown option"
 msgstr "ukendt tilvalg"
 
-#: popt.c:1353
+#: popt.c:1368
 msgid "mutually exclusive logical operations requested"
-msgstr "de �nskede handlinger udelukker hinanden"
+msgstr "de ønskede handlinger udelukker hinanden"
 
-#: popt.c:1355
+#: popt.c:1370
 msgid "opt->arg should not be NULL"
-msgstr ""
+msgstr "opt->arg bør ikke være NULL"
 
-#: popt.c:1357
+#: popt.c:1372
 msgid "aliases nested too deeply"
 msgstr "aliaser er for dybt indlejret"
 
-#: popt.c:1359
+#: popt.c:1374
 msgid "error in parameter quoting"
 msgstr "fejl i parameter citering"
 
-#: popt.c:1361
+#: popt.c:1376
 msgid "invalid numeric value"
-msgstr "ugyldig numerisk v�rdi"
+msgstr "ugyldig numerisk værdi"
 
-#: popt.c:1363
+#: popt.c:1378
 msgid "number too large or too small"
 msgstr "nummer for stort, eller for lille"
 
-#: popt.c:1365
+#: popt.c:1380
 msgid "memory allocation failed"
-msgstr ""
+msgstr "hukommelsestildeling mislykkedes"
 
-#: popt.c:1369
+#: popt.c:1384
 msgid "unknown error"
 msgstr "ukendt fejl"
 
 #: popthelp.c:75 popthelp.c:86
 msgid "Show this help message"
-msgstr "Vis denne hj�lpemeddelelse"
+msgstr "Vis denne hjælpemeddelelse"
 
 #: popthelp.c:76 popthelp.c:87
 msgid "Display brief usage message"
 msgstr "Vis kortfattet brugsanvisning"
 
 #: popthelp.c:90
-#, fuzzy
 msgid "Display option defaults in message"
-msgstr "Vis kortfattet brugsanvisning"
+msgstr "Vis instillingsstandarder i besked"
 
 #: popthelp.c:92
 msgid "Terminate options"
-msgstr ""
+msgstr "Indstillinger for afbrydning"
 
 #: popthelp.c:191
 msgid "Help options:"
-msgstr ""
+msgstr "Hjælpeindstillinger:"
 
 #: popthelp.c:192
 msgid "Options implemented via popt alias/exec:"
-msgstr ""
+msgstr "Indstillinger implementeret via popt alias/exec:"
 
 #: popthelp.c:200
 msgid "NONE"
@@ -102,9 +106,8 @@ msgid "LONG"
 msgstr "LONG"
 
 #: popthelp.c:208
-#, fuzzy
 msgid "LONGLONG"
-msgstr "LONG"
+msgstr "LONGLONG"
 
 #: popthelp.c:209
 msgid "STRING"
diff --git a/po/de.po b/po/de.po
index 6ae4cd5..efcefe8 100644
--- a/po/de.po
+++ b/po/de.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.15\n"
 "Report-Msgid-Bugs-To: <popt-devel@rpm5.org>\n"
-"POT-Creation-Date: 2008-04-06 09:59-0400\n"
+"POT-Creation-Date: 2008-09-18 14:11-0400\n"
 "PO-Revision-Date: 2008-05-25 14:39+0200\n"
 "Last-Translator: Robert Scheck <robert@rpm5.org>\n"
 "Language-Team: German <de@li.org>\n"
@@ -18,48 +18,48 @@ msgstr ""
 msgid "unknown errno"
 msgstr "Unbekannte Fehler-Nummer"
 
-#: popt.c:1141
+#: popt.c:945
 #, c-format
 msgid "option type (%u) not implemented in popt\n"
 msgstr "Optionstyp (%u) ist nicht in popt implementiert\n"
 
-#: popt.c:1349
+#: popt.c:1364
 msgid "missing argument"
 msgstr "Fehlendes Argument"
 
-#: popt.c:1351
+#: popt.c:1366
 msgid "unknown option"
 msgstr "Unbekannte Option"
 
-#: popt.c:1353
+#: popt.c:1368
 msgid "mutually exclusive logical operations requested"
 msgstr "Gegenseitig ausschließende logische Operatoren"
 
-#: popt.c:1355
+#: popt.c:1370
 msgid "opt->arg should not be NULL"
 msgstr "opt->arg sollte nicht NULL sein"
 
-#: popt.c:1357
+#: popt.c:1372
 msgid "aliases nested too deeply"
 msgstr "Aliase zu tief verschachtelt"
 
-#: popt.c:1359
+#: popt.c:1374
 msgid "error in parameter quoting"
 msgstr "Fehler beim Quotieren der Parameter"
 
-#: popt.c:1361
+#: popt.c:1376
 msgid "invalid numeric value"
 msgstr "Ungültiger nummerischer Wert"
 
-#: popt.c:1363
+#: popt.c:1378
 msgid "number too large or too small"
 msgstr "Nummer zu groß oder zu klein"
 
-#: popt.c:1365
+#: popt.c:1380
 msgid "memory allocation failed"
 msgstr "Speicherzuordnung fehlgeschlagen"
 
-#: popt.c:1369
+#: popt.c:1384
 msgid "unknown error"
 msgstr "Unbekannter Fehler"
 
diff --git a/po/es.po b/po/es.po
index 049f81e..27c96c8 100644
--- a/po/es.po
+++ b/po/es.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.12\n"
 "Report-Msgid-Bugs-To: <popt-devel@rpm5.org>\n"
-"POT-Creation-Date: 2008-04-06 09:59-0400\n"
+"POT-Creation-Date: 2008-09-18 14:11-0400\n"
 "PO-Revision-Date: 2007-12-28 12:22+0100\n"
 "Last-Translator: Leandro Lucarella <luca@linuxmendoza.org.ar>\n"
 "Language-Team: Spanish <es@li.org>\n"
@@ -18,48 +18,48 @@ msgstr ""
 msgid "unknown errno"
 msgstr "errno desconocido"
 
-#: popt.c:1141
+#: popt.c:945
 #, fuzzy, c-format
 msgid "option type (%u) not implemented in popt\n"
 msgstr "tipo de opción (%d) no implementada en popt\n"
 
-#: popt.c:1349
+#: popt.c:1364
 msgid "missing argument"
 msgstr "falta argumento"
 
-#: popt.c:1351
+#: popt.c:1366
 msgid "unknown option"
 msgstr "opción desconocida"
 
-#: popt.c:1353
+#: popt.c:1368
 msgid "mutually exclusive logical operations requested"
 msgstr "requerida operación lógica mutuamente exclusiva"
 
-#: popt.c:1355
+#: popt.c:1370
 msgid "opt->arg should not be NULL"
 msgstr ""
 
-#: popt.c:1357
+#: popt.c:1372
 msgid "aliases nested too deeply"
 msgstr "alias anidados muy profundamente"
 
-#: popt.c:1359
+#: popt.c:1374
 msgid "error in parameter quoting"
 msgstr "error en cita de parámetros"
 
-#: popt.c:1361
+#: popt.c:1376
 msgid "invalid numeric value"
 msgstr "valor numérico inválido"
 
-#: popt.c:1363
+#: popt.c:1378
 msgid "number too large or too small"
 msgstr "número muy largo o muy pequeño"
 
-#: popt.c:1365
+#: popt.c:1380
 msgid "memory allocation failed"
 msgstr ""
 
-#: popt.c:1369
+#: popt.c:1384
 msgid "unknown error"
 msgstr "error desconocido"
 
diff --git a/po/fi.po b/po/fi.po
index e0efec1..54111f2 100644
--- a/po/fi.po
+++ b/po/fi.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.14\n"
 "Report-Msgid-Bugs-To: <popt-devel@rpm5.org>\n"
-"POT-Creation-Date: 2008-04-06 09:59-0400\n"
+"POT-Creation-Date: 2008-09-18 14:11-0400\n"
 "PO-Revision-Date: 2008-02-21 18:19+0200\n"
 "Last-Translator: Jorma Karvonen <karvjorm@users.sf.net>\n"
 "Language-Team: Finnish <translation-team-fi@lists.sourceforge.net>\n"
@@ -23,48 +23,48 @@ msgstr ""
 msgid "unknown errno"
 msgstr "tuntematon errno-virhenumeroarvo"
 
-#: popt.c:1141
+#: popt.c:945
 #, c-format
 msgid "option type (%u) not implemented in popt\n"
 msgstr "valitsintyyppiä (%u) ei ole toteutettu popt-ohjelmassa\n"
 
-#: popt.c:1349
+#: popt.c:1364
 msgid "missing argument"
 msgstr "puuttuva argumentti"
 
-#: popt.c:1351
+#: popt.c:1366
 msgid "unknown option"
 msgstr "tuntematon valitsin"
 
-#: popt.c:1353
+#: popt.c:1368
 msgid "mutually exclusive logical operations requested"
 msgstr "pyydettyjä loogisia toimintoja ei voi käyttää yhdessä"
 
-#: popt.c:1355
+#: popt.c:1370
 msgid "opt->arg should not be NULL"
 msgstr "”opt->arg”-valitsinargumentti ei saa olla NULL"
 
-#: popt.c:1357
+#: popt.c:1372
 msgid "aliases nested too deeply"
 msgstr "liian monta aliasta sisäkkäin"
 
-#: popt.c:1359
+#: popt.c:1374
 msgid "error in parameter quoting"
 msgstr "virhe parametrien lainauksessa"
 
-#: popt.c:1361
+#: popt.c:1376
 msgid "invalid numeric value"
 msgstr "virheellinen numeroarvo"
 
-#: popt.c:1363
+#: popt.c:1378
 msgid "number too large or too small"
 msgstr "numero on liian iso tai liian pieni"
 
-#: popt.c:1365
+#: popt.c:1380
 msgid "memory allocation failed"
 msgstr "muistin varaus ei onnistunut"
 
-#: popt.c:1369
+#: popt.c:1384
 msgid "unknown error"
 msgstr "tuntematon virhe"
 
diff --git a/po/fr.po b/po/fr.po
index 18a540e..c4d2a0c 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -12,7 +12,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.11\n"
 "Report-Msgid-Bugs-To: <popt-devel@rpm5.org>\n"
-"POT-Creation-Date: 2008-04-06 09:59-0400\n"
+"POT-Creation-Date: 2008-09-18 14:11-0400\n"
 "PO-Revision-Date: 2003-06-22 23:43+0200\n"
 "Last-Translator: RPM French Translation <rpm-fr@livna.org>\n"
 "Language-Team: RPM French Translation <rpm-fr@livna.org>\n"
@@ -24,48 +24,48 @@ msgstr ""
 msgid "unknown errno"
 msgstr "errno inconnu"
 
-#: popt.c:1141
+#: popt.c:945
 #, fuzzy, c-format
 msgid "option type (%u) not implemented in popt\n"
 msgstr "type(%d) d'option non implémenté dans popt\n"
 
-#: popt.c:1349
+#: popt.c:1364
 msgid "missing argument"
 msgstr "argument manquant"
 
-#: popt.c:1351
+#: popt.c:1366
 msgid "unknown option"
 msgstr "option iconnue"
 
-#: popt.c:1353
+#: popt.c:1368
 msgid "mutually exclusive logical operations requested"
 msgstr "opérations logiques mutuellement exclusives requises"
 
-#: popt.c:1355
+#: popt.c:1370
 msgid "opt->arg should not be NULL"
 msgstr "opt->arg ne devrait pas être NULL"
 
-#: popt.c:1357
+#: popt.c:1372
 msgid "aliases nested too deeply"
 msgstr "les alias sont trop entremellés"
 
-#: popt.c:1359
+#: popt.c:1374
 msgid "error in parameter quoting"
 msgstr "erreur en citant les paramètres"
 
-#: popt.c:1361
+#: popt.c:1376
 msgid "invalid numeric value"
 msgstr "valeur numérique invalide"
 
-#: popt.c:1363
+#: popt.c:1378
 msgid "number too large or too small"
 msgstr "nombre trop grand ou trop petit"
 
-#: popt.c:1365
+#: popt.c:1380
 msgid "memory allocation failed"
 msgstr "échec de l'allocation de mémoire"
 
-#: popt.c:1369
+#: popt.c:1384
 msgid "unknown error"
 msgstr "erreur inconnue"
 
diff --git a/po/ga.po b/po/ga.po
index 6478c0a..1613473 100644
--- a/po/ga.po
+++ b/po/ga.po
@@ -4,10 +4,10 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: popt 1.11\n"
+"Project-Id-Version: popt 1.14\n"
 "Report-Msgid-Bugs-To: <popt-devel@rpm5.org>\n"
-"POT-Creation-Date: 2008-04-06 09:59-0400\n"
-"PO-Revision-Date: 2007-06-19 06:21-0500\n"
+"POT-Creation-Date: 2008-09-18 14:11-0400\n"
+"PO-Revision-Date: 2008-04-10 06:21-0500\n"
 "Last-Translator: Kevin Scannell <kscanne@gmail.com>\n"
 "Language-Team: Irish <gaeilge-gnulinux@lists.sourceforge.net>\n"
 "MIME-Version: 1.0\n"
@@ -18,48 +18,48 @@ msgstr ""
 msgid "unknown errno"
 msgstr "errno anaithnid"
 
-#: popt.c:1141
-#, fuzzy, c-format
+#: popt.c:945
+#, c-format
 msgid "option type (%u) not implemented in popt\n"
-msgstr "níl an cineál rogha seo (%d) ar fáil i popt\n"
+msgstr "níl an cineál rogha seo (%u) ar fáil i popt\n"
 
-#: popt.c:1349
+#: popt.c:1364
 msgid "missing argument"
 msgstr "argóint ar iarraidh"
 
-#: popt.c:1351
+#: popt.c:1366
 msgid "unknown option"
 msgstr "rogha anaithnid"
 
-#: popt.c:1353
+#: popt.c:1368
 msgid "mutually exclusive logical operations requested"
 msgstr "iarradh oibríochtaí loighciúla comheisiacha"
 
-#: popt.c:1355
+#: popt.c:1370
 msgid "opt->arg should not be NULL"
 msgstr "níor chóir rogha->arg a bheith NULL"
 
-#: popt.c:1357
+#: popt.c:1372
 msgid "aliases nested too deeply"
 msgstr "ailiasanna neadaithe ródhomhain"
 
-#: popt.c:1359
+#: popt.c:1374
 msgid "error in parameter quoting"
 msgstr "earráid agus paraiméadar á chur faoi chomharthaí athfhriotail"
 
-#: popt.c:1361
+#: popt.c:1376
 msgid "invalid numeric value"
 msgstr "luach neamhbhailí uimhriúil"
 
-#: popt.c:1363
+#: popt.c:1378
 msgid "number too large or too small"
 msgstr "uimhir rómhór nó róbheag"
 
-#: popt.c:1365
+#: popt.c:1380
 msgid "memory allocation failed"
 msgstr "theip ar dháileadh na cuimhne"
 
-#: popt.c:1369
+#: popt.c:1384
 msgid "unknown error"
 msgstr "earráid anaithnid"
 
@@ -75,10 +75,10 @@ msgstr "Taispeáin beagán eolais faoin úsáid"
 msgid "Display option defaults in message"
 msgstr "Taispeáin luachanna réamhshocraithe na roghanna sa teachtaireacht"
 
+# Terminate not a verb here
 #: popthelp.c:92
-#, fuzzy
 msgid "Terminate options"
-msgstr "Roghanna cabhracha:"
+msgstr "Roghanna scortha"
 
 #: popthelp.c:191
 msgid "Help options:"
@@ -105,9 +105,8 @@ msgid "LONG"
 msgstr "LONG"
 
 #: popthelp.c:208
-#, fuzzy
 msgid "LONGLONG"
-msgstr "LONG"
+msgstr "LONGLONG"
 
 #: popthelp.c:209
 msgid "STRING"
diff --git a/po/gl.po b/po/gl.po
index a5134e8..ef5054d 100644
--- a/po/gl.po
+++ b/po/gl.po
@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.11\n"
 "Report-Msgid-Bugs-To: <popt-devel@rpm5.org>\n"
-"POT-Creation-Date: 2008-04-06 09:59-0400\n"
+"POT-Creation-Date: 2008-09-18 14:11-0400\n"
 "PO-Revision-Date: 2001-01-17 01:01+0100\n"
 "Last-Translator: Jes�s Bravo �lvarez <jba@pobox.com>\n"
 "Language-Team: Galician <trasno@ceu.fi.udc.es>\n"
@@ -14,48 +14,48 @@ msgstr ""
 msgid "unknown errno"
 msgstr "errno desco�ecido"
 
-#: popt.c:1141
+#: popt.c:945
 #, fuzzy, c-format
 msgid "option type (%u) not implemented in popt\n"
 msgstr "tipo de opci�n (%d) non implementada en popt\n"
 
-#: popt.c:1349
+#: popt.c:1364
 msgid "missing argument"
 msgstr "falta un argumento"
 
-#: popt.c:1351
+#: popt.c:1366
 msgid "unknown option"
 msgstr "opci�n desco�ecida"
 
-#: popt.c:1353
+#: popt.c:1368
 msgid "mutually exclusive logical operations requested"
 msgstr "solicit�ronse operaci�ns l�xicas mutuamente exclu�ntes"
 
-#: popt.c:1355
+#: popt.c:1370
 msgid "opt->arg should not be NULL"
 msgstr ""
 
-#: popt.c:1357
+#: popt.c:1372
 msgid "aliases nested too deeply"
 msgstr "aliases ani�ados a un nivel demasiado profundo"
 
-#: popt.c:1359
+#: popt.c:1374
 msgid "error in parameter quoting"
 msgstr "erro nas comi�as do par�metro"
 
-#: popt.c:1361
+#: popt.c:1376
 msgid "invalid numeric value"
 msgstr "valor num�rico non v�lido"
 
-#: popt.c:1363
+#: popt.c:1378
 msgid "number too large or too small"
 msgstr "n�mero demasiado grande ou pequeno"
 
-#: popt.c:1365
+#: popt.c:1380
 msgid "memory allocation failed"
 msgstr ""
 
-#: popt.c:1369
+#: popt.c:1384
 msgid "unknown error"
 msgstr "erro desco�ecido"
 
diff --git a/po/hu.po b/po/hu.po
index e503542..fc63ada 100644
--- a/po/hu.po
+++ b/po/hu.po
@@ -5,7 +5,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.11\n"
 "Report-Msgid-Bugs-To: <popt-devel@rpm5.org>\n"
-"POT-Creation-Date: 2008-04-06 09:59-0400\n"
+"POT-Creation-Date: 2008-09-18 14:11-0400\n"
 "PO-Revision-Date: 2007-06-21 00:45+0200\n"
 "Last-Translator: Gabor Kelemen <kelemeng@gnome.hu>\n"
 "Language-Team: Hungarian <translation-team-hu@lists.sourceforge.net>\n"
@@ -19,48 +19,48 @@ msgstr ""
 msgid "unknown errno"
 msgstr "ismeretlen hibaszám"
 
-#: popt.c:1141
+#: popt.c:945
 #, fuzzy, c-format
 msgid "option type (%u) not implemented in popt\n"
 msgstr "a kapcsolótípus (%d) nincs megvalósítva a popt-ban\n"
 
-#: popt.c:1349
+#: popt.c:1364
 msgid "missing argument"
 msgstr "hiányzó paraméter"
 
-#: popt.c:1351
+#: popt.c:1366
 msgid "unknown option"
 msgstr "ismeretlen kapcsoló"
 
-#: popt.c:1353
+#: popt.c:1368
 msgid "mutually exclusive logical operations requested"
 msgstr "kölcsönösen kizáró logikai műveleteket kért"
 
-#: popt.c:1355
+#: popt.c:1370
 msgid "opt->arg should not be NULL"
 msgstr "az opt->arg nem lehet NULL"
 
-#: popt.c:1357
+#: popt.c:1372
 msgid "aliases nested too deeply"
 msgstr "az álnevek túl mélyen vannak egymásba ágyazva"
 
-#: popt.c:1359
+#: popt.c:1374
 msgid "error in parameter quoting"
 msgstr "hiba a paraméter idézésében"
 
-#: popt.c:1361
+#: popt.c:1376
 msgid "invalid numeric value"
 msgstr "érvénytelen numerikus érték"
 
-#: popt.c:1363
+#: popt.c:1378
 msgid "number too large or too small"
 msgstr "a szám túl nagy vagy túl kicsi"
 
-#: popt.c:1365
+#: popt.c:1380
 msgid "memory allocation failed"
 msgstr "a memóriafoglalás meghiúsult"
 
-#: popt.c:1369
+#: popt.c:1384
 msgid "unknown error"
 msgstr "ismeretlen hiba"
 
diff --git a/po/is.po b/po/is.po
index 3b148f3..5584649 100644
--- a/po/is.po
+++ b/po/is.po
@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.11\n"
 "Report-Msgid-Bugs-To: <popt-devel@rpm5.org>\n"
-"POT-Creation-Date: 2008-04-06 09:59-0400\n"
+"POT-Creation-Date: 2008-09-18 14:11-0400\n"
 "PO-Revision-Date: 2001-06-08 01:35+0000\n"
 "Last-Translator: Richard Allen <ra@hp.is>\n"
 "Language-Team: is <kde-isl@mmedia.is>\n"
@@ -14,48 +14,48 @@ msgstr ""
 msgid "unknown errno"
 msgstr "��ekkt villun�mer"
 
-#: popt.c:1141
+#: popt.c:945
 #, fuzzy, c-format
 msgid "option type (%u) not implemented in popt\n"
 msgstr "rofager�in (%d) er ekki studd � popt\n"
 
-#: popt.c:1349
+#: popt.c:1364
 msgid "missing argument"
 msgstr "vantar vi�fang"
 
-#: popt.c:1351
+#: popt.c:1366
 msgid "unknown option"
 msgstr "��ekktur rofi"
 
-#: popt.c:1353
+#: popt.c:1368
 msgid "mutually exclusive logical operations requested"
 msgstr "be�i� um rofa sem sl�kkva hvor � ��rum"
 
-#: popt.c:1355
+#: popt.c:1370
 msgid "opt->arg should not be NULL"
 msgstr "opt->arg �tti ekki a� vera NULL"
 
-#: popt.c:1357
+#: popt.c:1372
 msgid "aliases nested too deeply"
 msgstr "al�asar of fl�knir"
 
-#: popt.c:1359
+#: popt.c:1374
 msgid "error in parameter quoting"
 msgstr "villa � vi�f�ngum (g�salappir og svo frv.)"
 
-#: popt.c:1361
+#: popt.c:1376
 msgid "invalid numeric value"
 msgstr "�gilt t�lulegt gildi"
 
-#: popt.c:1363
+#: popt.c:1378
 msgid "number too large or too small"
 msgstr "talan of st�r e�a sm�"
 
-#: popt.c:1365
+#: popt.c:1380
 msgid "memory allocation failed"
 msgstr "ekki t�kst a� taka fr� minni"
 
-#: popt.c:1369
+#: popt.c:1384
 msgid "unknown error"
 msgstr "��ekkt villa"
 
diff --git a/po/it.po b/po/it.po
index 7056242..4a54388 100644
--- a/po/it.po
+++ b/po/it.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.12\n"
 "Report-Msgid-Bugs-To: <popt-devel@rpm5.org>\n"
-"POT-Creation-Date: 2008-04-06 09:59-0400\n"
+"POT-Creation-Date: 2008-09-18 14:11-0400\n"
 "PO-Revision-Date: 2007-11-14 20:39+0100\n"
 "Last-Translator: Sandro Bonazzola <sandro.bonazzola@gmail.com>\n"
 "Language-Team: Italian <tp@lists.linux.it>\n"
@@ -20,48 +20,48 @@ msgstr ""
 msgid "unknown errno"
 msgstr "errno sconosciuto"
 
-#: popt.c:1141
+#: popt.c:945
 #, fuzzy, c-format
 msgid "option type (%u) not implemented in popt\n"
 msgstr "opzione di tipo (%d) non implementata in popt\n"
 
-#: popt.c:1349
+#: popt.c:1364
 msgid "missing argument"
 msgstr "argomento mancante"
 
-#: popt.c:1351
+#: popt.c:1366
 msgid "unknown option"
 msgstr "opzione sconosciuta"
 
-#: popt.c:1353
+#: popt.c:1368
 msgid "mutually exclusive logical operations requested"
 msgstr "richieste operazioni logiche mutuamente esclusive"
 
-#: popt.c:1355
+#: popt.c:1370
 msgid "opt->arg should not be NULL"
 msgstr "opt->arg non dovrebbe essere NULL"
 
-#: popt.c:1357
+#: popt.c:1372
 msgid "aliases nested too deeply"
 msgstr "alias nidificati troppo profondamente"
 
-#: popt.c:1359
+#: popt.c:1374
 msgid "error in parameter quoting"
 msgstr "errore nel quoting del parametro"
 
-#: popt.c:1361
+#: popt.c:1376
 msgid "invalid numeric value"
 msgstr "valore numerico errato"
 
-#: popt.c:1363
+#: popt.c:1378
 msgid "number too large or too small"
 msgstr "numero troppo grande o troppo piccolo"
 
-#: popt.c:1365
+#: popt.c:1380
 msgid "memory allocation failed"
 msgstr "allocazione di memoria fallita"
 
-#: popt.c:1369
+#: popt.c:1384
 msgid "unknown error"
 msgstr "errore sconosciuto"
 
diff --git a/po/ja.po b/po/ja.po
index 19f136f..40e0955 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.11\n"
 "Report-Msgid-Bugs-To: <popt-devel@rpm5.org>\n"
-"POT-Creation-Date: 2008-04-06 09:59-0400\n"
+"POT-Creation-Date: 2008-09-18 14:11-0400\n"
 "PO-Revision-Date: 2003--8-25 19:00+0900\n"
 "Last-Translator: Yukihiro Nakai <ynakai@redhat.com>\n"
 "Language-Team: Japanese <ja@li.org>\n"
@@ -18,48 +18,48 @@ msgstr ""
 msgid "unknown errno"
 msgstr "不明なエラー番号"
 
-#: popt.c:1141
+#: popt.c:945
 #, fuzzy, c-format
 msgid "option type (%u) not implemented in popt\n"
 msgstr "オプションタイプ (%d) はpoptには実装されていません\n"
 
-#: popt.c:1349
+#: popt.c:1364
 msgid "missing argument"
 msgstr "引数がありません"
 
-#: popt.c:1351
+#: popt.c:1366
 msgid "unknown option"
 msgstr "不明なオプション"
 
-#: popt.c:1353
+#: popt.c:1368
 msgid "mutually exclusive logical operations requested"
 msgstr "排他的な悪ぺーレーションが必要です"
 
-#: popt.c:1355
+#: popt.c:1370
 msgid "opt->arg should not be NULL"
 msgstr "opt->argはNULLではいけません"
 
-#: popt.c:1357
+#: popt.c:1372
 msgid "aliases nested too deeply"
 msgstr "エイリアスのネストが深すぎます"
 
-#: popt.c:1359
+#: popt.c:1374
 msgid "error in parameter quoting"
 msgstr "パラメータのクオート付けでエラー"
 
-#: popt.c:1361
+#: popt.c:1376
 msgid "invalid numeric value"
 msgstr "不正な数値"
 
-#: popt.c:1363
+#: popt.c:1378
 msgid "number too large or too small"
 msgstr "数値が大きすぎるか小さすぎます"
 
-#: popt.c:1365
+#: popt.c:1380
 msgid "memory allocation failed"
 msgstr "メモリ確保に失敗しました"
 
-#: popt.c:1369
+#: popt.c:1384
 msgid "unknown error"
 msgstr "不明なエラー"
 
diff --git a/po/ko.po b/po/ko.po
index 261e252..68dcada 100644
--- a/po/ko.po
+++ b/po/ko.po
@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.11\n"
 "Report-Msgid-Bugs-To: <popt-devel@rpm5.org>\n"
-"POT-Creation-Date: 2008-04-06 09:59-0400\n"
+"POT-Creation-Date: 2008-09-18 14:11-0400\n"
 "PO-Revision-Date: 2001-09-06 20:06+0900\n"
 "Last-Translator: Jong-Hoon Ryu <redhat4u@netian.com>\n"
 "Language-Team: GNU Translation project <ko@li.org>\n"
@@ -14,48 +14,48 @@ msgstr ""
 msgid "unknown errno"
 msgstr "�� �� ���� �����ڵ�(errno) �Դϴ�"
 
-#: popt.c:1141
+#: popt.c:945
 #, fuzzy, c-format
 msgid "option type (%u) not implemented in popt\n"
 msgstr "�ɼ� ���� (%d)�� popt���� ����� �� �����ϴ�\n"
 
-#: popt.c:1349
+#: popt.c:1364
 msgid "missing argument"
 msgstr "�μ��� �������� �ʾҽ��ϴ�"
 
-#: popt.c:1351
+#: popt.c:1366
 msgid "unknown option"
 msgstr "�� �� ���� �ɼ��Դϴ�"
 
-#: popt.c:1353
+#: popt.c:1368
 msgid "mutually exclusive logical operations requested"
 msgstr "���ʿ� ��Ÿ�� ���� ������ �����Ǿ����ϴ�"
 
-#: popt.c:1355
+#: popt.c:1370
 msgid "opt->arg should not be NULL"
 msgstr "�ɼ�->�μ��� NULL�� �Ǿ�� �ȵ˴ϴ�"
 
-#: popt.c:1357
+#: popt.c:1372
 msgid "aliases nested too deeply"
 msgstr "��Ī(alias)�� �����ϰ� �����Ǿ����ϴ�"
 
-#: popt.c:1359
+#: popt.c:1374
 msgid "error in parameter quoting"
 msgstr "�Ű������� ������ �ֽ��ϴ�"
 
-#: popt.c:1361
+#: popt.c:1376
 msgid "invalid numeric value"
 msgstr "�߸��� ��ġ ���Դϴ�"
 
-#: popt.c:1363
+#: popt.c:1378
 msgid "number too large or too small"
 msgstr "���ڰ� �ʹ� ũ�ų� �ʹ� �����ϴ�"
 
-#: popt.c:1365
+#: popt.c:1380
 msgid "memory allocation failed"
 msgstr "�޸� �Ҵ翡 �����߽��ϴ�"
 
-#: popt.c:1369
+#: popt.c:1384
 msgid "unknown error"
 msgstr "�� �� ���� �����Դϴ�"
 
diff --git a/po/nb.po b/po/nb.po
index 68d1a99..5beed2f 100644
--- a/po/nb.po
+++ b/po/nb.po
@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.11\n"
 "Report-Msgid-Bugs-To: <popt-devel@rpm5.org>\n"
-"POT-Creation-Date: 2008-04-06 09:59-0400\n"
+"POT-Creation-Date: 2008-09-18 14:11-0400\n"
 "PO-Revision-Date: 2001-06-27 11:05+0200\n"
 "Last-Translator: Kjartan Maraas <kmaraas@online.no>\n"
 "Language-Team: Norwegian <no@li.org>\n"
@@ -14,48 +14,48 @@ msgstr ""
 msgid "unknown errno"
 msgstr "ukjent errno"
 
-#: popt.c:1141
+#: popt.c:945
 #, fuzzy, c-format
 msgid "option type (%u) not implemented in popt\n"
 msgstr "flaggtype (%d) ikke implementert i popt\n"
 
-#: popt.c:1349
+#: popt.c:1364
 msgid "missing argument"
 msgstr "manglende argument"
 
-#: popt.c:1351
+#: popt.c:1366
 msgid "unknown option"
 msgstr "ukjent flagg"
 
-#: popt.c:1353
+#: popt.c:1368
 msgid "mutually exclusive logical operations requested"
 msgstr "gjensidig eksluderende logiske operasjoner forespurt"
 
-#: popt.c:1355
+#: popt.c:1370
 msgid "opt->arg should not be NULL"
 msgstr "opt->arg m� ikke v�re NULL"
 
-#: popt.c:1357
+#: popt.c:1372
 msgid "aliases nested too deeply"
 msgstr "aliaser med for dype l�kker"
 
-#: popt.c:1359
+#: popt.c:1374
 msgid "error in parameter quoting"
 msgstr "feil i parametersitering"
 
-#: popt.c:1361
+#: popt.c:1376
 msgid "invalid numeric value"
 msgstr "ugyldig numerisk verdi"
 
-#: popt.c:1363
+#: popt.c:1378
 msgid "number too large or too small"
 msgstr "tallet er for stort eller lite"
 
-#: popt.c:1365
+#: popt.c:1380
 msgid "memory allocation failed"
 msgstr "minneallokering feilet"
 
-#: popt.c:1369
+#: popt.c:1384
 msgid "unknown error"
 msgstr "ukjent feil"
 
diff --git a/po/nl.po b/po/nl.po
index bbff977..762a696 100644
--- a/po/nl.po
+++ b/po/nl.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.14\n"
 "Report-Msgid-Bugs-To: <popt-devel@rpm5.org>\n"
-"POT-Creation-Date: 2008-04-06 09:59-0400\n"
+"POT-Creation-Date: 2008-09-18 14:11-0400\n"
 "PO-Revision-Date: 2008-02-20 19:26+0100\n"
 "Last-Translator: Tim Van Holder <tim.van.holder@telenet.be>\n"
 "Language-Team: Dutch <vertaling@vrijschrift.org>\n"
@@ -18,49 +18,49 @@ msgstr ""
 msgid "unknown errno"
 msgstr "onbekend foutnummer (errno)"
 
-#: popt.c:1141
+#: popt.c:945
 #, c-format
 msgid "option type (%u) not implemented in popt\n"
 msgstr "dit optietype (%u) is niet geïmplementeerd in popt\n"
 
-#: popt.c:1349
+#: popt.c:1364
 msgid "missing argument"
 msgstr "ontbrekend argument"
 
-#: popt.c:1351
+#: popt.c:1366
 msgid "unknown option"
 msgstr "onbekende optie"
 
-#: popt.c:1353
+#: popt.c:1368
 msgid "mutually exclusive logical operations requested"
 msgstr "elkaar uitsluitende logische operatoren werden gevraagd"
 
-#: popt.c:1355
+#: popt.c:1370
 msgid "opt->arg should not be NULL"
 msgstr "opt->arg zou niet NULL mogen zijn"
 
-#: popt.c:1357
+#: popt.c:1372
 msgid "aliases nested too deeply"
 msgstr "aliassen zijn te diep genest"
 
 # of toch beter "quoting" behouden?
-#: popt.c:1359
+#: popt.c:1374
 msgid "error in parameter quoting"
 msgstr "fout in de aanhaling van parameters"
 
-#: popt.c:1361
+#: popt.c:1376
 msgid "invalid numeric value"
 msgstr "ongeldige numerieke waarde"
 
-#: popt.c:1363
+#: popt.c:1378
 msgid "number too large or too small"
 msgstr "getal is te klein of te groot"
 
-#: popt.c:1365
+#: popt.c:1380
 msgid "memory allocation failed"
 msgstr "reserveren van geheugen is mislukt"
 
-#: popt.c:1369
+#: popt.c:1384
 msgid "unknown error"
 msgstr "onbekende fout"
 
diff --git a/po/pl.po b/po/pl.po
index 44bd594..28833ce 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.14\n"
 "Report-Msgid-Bugs-To: <popt-devel@rpm5.org>\n"
-"POT-Creation-Date: 2008-04-06 09:59-0400\n"
+"POT-Creation-Date: 2008-09-18 14:11-0400\n"
 "PO-Revision-Date: 2008-02-18 00:30+0100\n"
 "Last-Translator: Jakub Bogusz <qboosh@pld-linux.org>\n"
 "Language-Team: Polish <translation-team-pl@lists.sourceforge.net>\n"
@@ -18,48 +18,48 @@ msgstr ""
 msgid "unknown errno"
 msgstr "nieznane errno"
 
-#: popt.c:1141
+#: popt.c:945
 #, c-format
 msgid "option type (%u) not implemented in popt\n"
 msgstr "typ opcji (%u) nie zaimplementowany w popt\n"
 
-#: popt.c:1349
+#: popt.c:1364
 msgid "missing argument"
 msgstr "brak parametru"
 
-#: popt.c:1351
+#: popt.c:1366
 msgid "unknown option"
 msgstr "nieznana opcja"
 
-#: popt.c:1353
+#: popt.c:1368
 msgid "mutually exclusive logical operations requested"
 msgstr "��danie wykluczaj�cych si� operacji"
 
-#: popt.c:1355
+#: popt.c:1370
 msgid "opt->arg should not be NULL"
 msgstr "opt->arg nie mo�e by� NULL"
 
-#: popt.c:1357
+#: popt.c:1372
 msgid "aliases nested too deeply"
 msgstr "zbyt du�e zag��bienie alias�w"
 
-#: popt.c:1359
+#: popt.c:1374
 msgid "error in parameter quoting"
 msgstr "b��d w cytowaniu parametru"
 
-#: popt.c:1361
+#: popt.c:1376
 msgid "invalid numeric value"
 msgstr "b��dna warto�� liczbowa"
 
-#: popt.c:1363
+#: popt.c:1378
 msgid "number too large or too small"
 msgstr "liczba zbyt du�a lub zbyt ma�a"
 
-#: popt.c:1365
+#: popt.c:1380
 msgid "memory allocation failed"
 msgstr "b��d alokacji pami�ci"
 
-#: popt.c:1369
+#: popt.c:1384
 msgid "unknown error"
 msgstr "nieznany b��d"
 
diff --git a/po/popt.pot b/po/popt.pot
index cea9e37..69a2bab 100644
--- a/po/popt.pot
+++ b/po/popt.pot
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.15\n"
 "Report-Msgid-Bugs-To: <popt-devel@rpm5.org>\n"
-"POT-Creation-Date: 2008-04-06 09:59-0400\n"
+"POT-Creation-Date: 2008-09-18 14:11-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -19,48 +19,48 @@ msgstr ""
 msgid "unknown errno"
 msgstr ""
 
-#: popt.c:1141
+#: popt.c:945
 #, c-format
 msgid "option type (%u) not implemented in popt\n"
 msgstr ""
 
-#: popt.c:1349
+#: popt.c:1364
 msgid "missing argument"
 msgstr ""
 
-#: popt.c:1351
+#: popt.c:1366
 msgid "unknown option"
 msgstr ""
 
-#: popt.c:1353
+#: popt.c:1368
 msgid "mutually exclusive logical operations requested"
 msgstr ""
 
-#: popt.c:1355
+#: popt.c:1370
 msgid "opt->arg should not be NULL"
 msgstr ""
 
-#: popt.c:1357
+#: popt.c:1372
 msgid "aliases nested too deeply"
 msgstr ""
 
-#: popt.c:1359
+#: popt.c:1374
 msgid "error in parameter quoting"
 msgstr ""
 
-#: popt.c:1361
+#: popt.c:1376
 msgid "invalid numeric value"
 msgstr ""
 
-#: popt.c:1363
+#: popt.c:1378
 msgid "number too large or too small"
 msgstr ""
 
-#: popt.c:1365
+#: popt.c:1380
 msgid "memory allocation failed"
 msgstr ""
 
-#: popt.c:1369
+#: popt.c:1384
 msgid "unknown error"
 msgstr ""
 
diff --git a/po/pt.po b/po/pt.po
index 28e7c4f..62fdcfd 100644
--- a/po/pt.po
+++ b/po/pt.po
@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.11\n"
 "Report-Msgid-Bugs-To: <popt-devel@rpm5.org>\n"
-"POT-Creation-Date: 2008-04-06 09:59-0400\n"
+"POT-Creation-Date: 2008-09-18 14:11-0400\n"
 "PO-Revision-Date: 2002-02-13 18:32+0000\n"
 "Last-Translator: Pedro Morais <morais@kde.org>\n"
 "Language-Team: pt <morais@kde.org>\n"
@@ -14,48 +14,48 @@ msgstr ""
 msgid "unknown errno"
 msgstr "errno desconhecido"
 
-#: popt.c:1141
+#: popt.c:945
 #, fuzzy, c-format
 msgid "option type (%u) not implemented in popt\n"
 msgstr "tipo de op��o (%d) n�o implementado no popt\n"
 
-#: popt.c:1349
+#: popt.c:1364
 msgid "missing argument"
 msgstr "falta um argumento"
 
-#: popt.c:1351
+#: popt.c:1366
 msgid "unknown option"
 msgstr "op��o desconhecida"
 
-#: popt.c:1353
+#: popt.c:1368
 msgid "mutually exclusive logical operations requested"
 msgstr "foram pedidas opera��es l�gicas mutuamente exclusivas"
 
-#: popt.c:1355
+#: popt.c:1370
 msgid "opt->arg should not be NULL"
 msgstr "opt->arg n�o deve ser NULL"
 
-#: popt.c:1357
+#: popt.c:1372
 msgid "aliases nested too deeply"
 msgstr "'aliases' demasiado aninhados"
 
-#: popt.c:1359
+#: popt.c:1374
 msgid "error in parameter quoting"
 msgstr "erros no 'quoting' de par�metros"
 
-#: popt.c:1361
+#: popt.c:1376
 msgid "invalid numeric value"
 msgstr "valor n�merico inv�lido"
 
-#: popt.c:1363
+#: popt.c:1378
 msgid "number too large or too small"
 msgstr "n�mero demasiado grando ou pequeno"
 
-#: popt.c:1365
+#: popt.c:1380
 msgid "memory allocation failed"
 msgstr "aloca��o de mem�ria falhou"
 
-#: popt.c:1369
+#: popt.c:1384
 msgid "unknown error"
 msgstr "erro desconhecido"
 
diff --git a/po/ro.po b/po/ro.po
index d8aa164..ad70899 100644
--- a/po/ro.po
+++ b/po/ro.po
@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.11\n"
 "Report-Msgid-Bugs-To: <popt-devel@rpm5.org>\n"
-"POT-Creation-Date: 2008-04-06 09:59-0400\n"
+"POT-Creation-Date: 2008-09-18 14:11-0400\n"
 "PO-Revision-Date: 2000-06-14 23:23+EST\n"
 "Last-Translator: Cristian Gafton <gafton@redhat.com>\n"
 "Language-Team: Romanian <ro@li.org>\n"
@@ -14,49 +14,49 @@ msgstr ""
 msgid "unknown errno"
 msgstr "eroare necunoscuta"
 
-#: popt.c:1141
+#: popt.c:945
 #, fuzzy, c-format
 msgid "option type (%u) not implemented in popt\n"
 msgstr "optiunea de tipul (%d) nu este implementata in popt\n"
 
-#: popt.c:1349
+#: popt.c:1364
 msgid "missing argument"
 msgstr "argument lipsa"
 
-#: popt.c:1351
+#: popt.c:1366
 msgid "unknown option"
 msgstr "optiune necunoscuta"
 
-#: popt.c:1353
+#: popt.c:1368
 msgid "mutually exclusive logical operations requested"
 msgstr ""
 
-#: popt.c:1355
+#: popt.c:1370
 msgid "opt->arg should not be NULL"
 msgstr ""
 
-#: popt.c:1357
+#: popt.c:1372
 msgid "aliases nested too deeply"
 msgstr "recursivitate infinita la optiunile sinonime"
 
-#: popt.c:1359
+#: popt.c:1374
 #, fuzzy
 msgid "error in parameter quoting"
 msgstr "eroare la insertie parametru"
 
-#: popt.c:1361
+#: popt.c:1376
 msgid "invalid numeric value"
 msgstr "valoare numarica invalida"
 
-#: popt.c:1363
+#: popt.c:1378
 msgid "number too large or too small"
 msgstr "numar prea mare sau prea mic"
 
-#: popt.c:1365
+#: popt.c:1380
 msgid "memory allocation failed"
 msgstr ""
 
-#: popt.c:1369
+#: popt.c:1384
 msgid "unknown error"
 msgstr "eroare necuinoscuta"
 
diff --git a/po/ru.po b/po/ru.po
index ca7b878..8c7524c 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.11\n"
 "Report-Msgid-Bugs-To: <popt-devel@rpm5.org>\n"
-"POT-Creation-Date: 2008-04-06 09:59-0400\n"
+"POT-Creation-Date: 2008-09-18 14:11-0400\n"
 "PO-Revision-Date: 2001-07-05 21:00-0500\n"
 "Last-Translator: Eugene Kanter <eugene@blackcatlinux.com>\n"
 "Language-Team: Black Cat Linux Team <blackcat-support@blackcatlinux.com>\n"
@@ -14,48 +14,48 @@ msgstr ""
 msgid "unknown errno"
 msgstr "����������� ����� ������"
 
-#: popt.c:1141
+#: popt.c:945
 #, fuzzy, c-format
 msgid "option type (%u) not implemented in popt\n"
 msgstr "��������� ��������� (%d) � popt �� �������������\n"
 
-#: popt.c:1349
+#: popt.c:1364
 msgid "missing argument"
 msgstr "�������� ��������"
 
-#: popt.c:1351
+#: popt.c:1366
 msgid "unknown option"
 msgstr "����������� ��������"
 
-#: popt.c:1353
+#: popt.c:1368
 msgid "mutually exclusive logical operations requested"
 msgstr "��������� ������� ����������� ���������� ��������"
 
-#: popt.c:1355
+#: popt.c:1370
 msgid "opt->arg should not be NULL"
 msgstr "opt->arg �� ����� ���� NULL"
 
-#: popt.c:1357
+#: popt.c:1372
 msgid "aliases nested too deeply"
 msgstr "�������� ������� ���������� �������� �����������"
 
-#: popt.c:1359
+#: popt.c:1374
 msgid "error in parameter quoting"
 msgstr "�����a ��������� ���������� � �������"
 
-#: popt.c:1361
+#: popt.c:1376
 msgid "invalid numeric value"
 msgstr "������������ �������� ��������"
 
-#: popt.c:1363
+#: popt.c:1378
 msgid "number too large or too small"
 msgstr "�������� �������� �� ��������� ����������������"
 
-#: popt.c:1365
+#: popt.c:1380
 msgid "memory allocation failed"
 msgstr "������ ��������� ������"
 
-#: popt.c:1369
+#: popt.c:1384
 msgid "unknown error"
 msgstr "����������� ������"
 
diff --git a/po/sk.po b/po/sk.po
index 474164a..265144d 100644
--- a/po/sk.po
+++ b/po/sk.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.11\n"
 "Report-Msgid-Bugs-To: <popt-devel@rpm5.org>\n"
-"POT-Creation-Date: 2008-04-06 09:59-0400\n"
+"POT-Creation-Date: 2008-09-18 14:11-0400\n"
 "PO-Revision-Date: 1999-08-04 21:40+0200\n"
 "Last-Translator: Stanislav Meduna <stano@eunet.sk>\n"
 "Language-Team: Slovak <sk-i18n@rak.isternet.sk>\n"
@@ -18,48 +18,48 @@ msgstr ""
 msgid "unknown errno"
 msgstr ""
 
-#: popt.c:1141
+#: popt.c:945
 #, c-format
 msgid "option type (%u) not implemented in popt\n"
 msgstr ""
 
-#: popt.c:1349
+#: popt.c:1364
 msgid "missing argument"
 msgstr ""
 
-#: popt.c:1351
+#: popt.c:1366
 msgid "unknown option"
 msgstr ""
 
-#: popt.c:1353
+#: popt.c:1368
 msgid "mutually exclusive logical operations requested"
 msgstr ""
 
-#: popt.c:1355
+#: popt.c:1370
 msgid "opt->arg should not be NULL"
 msgstr ""
 
-#: popt.c:1357
+#: popt.c:1372
 msgid "aliases nested too deeply"
 msgstr ""
 
-#: popt.c:1359
+#: popt.c:1374
 msgid "error in parameter quoting"
 msgstr ""
 
-#: popt.c:1361
+#: popt.c:1376
 msgid "invalid numeric value"
 msgstr ""
 
-#: popt.c:1363
+#: popt.c:1378
 msgid "number too large or too small"
 msgstr ""
 
-#: popt.c:1365
+#: popt.c:1380
 msgid "memory allocation failed"
 msgstr ""
 
-#: popt.c:1369
+#: popt.c:1384
 msgid "unknown error"
 msgstr ""
 
diff --git a/po/sl.po b/po/sl.po
index f24cbe7..a13153c 100644
--- a/po/sl.po
+++ b/po/sl.po
@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.11\n"
 "Report-Msgid-Bugs-To: <popt-devel@rpm5.org>\n"
-"POT-Creation-Date: 2008-04-06 09:59-0400\n"
+"POT-Creation-Date: 2008-09-18 14:11-0400\n"
 "PO-Revision-Date: 2000-09-05 12:30+0200\n"
 "Last-Translator: Roman Maurer <roman.maurer@hermes.si>\n"
 "Language-Team: Slovenian <sl@li.org>\n"
@@ -14,48 +14,48 @@ msgstr ""
 msgid "unknown errno"
 msgstr ""
 
-#: popt.c:1141
+#: popt.c:945
 #, c-format
 msgid "option type (%u) not implemented in popt\n"
 msgstr ""
 
-#: popt.c:1349
+#: popt.c:1364
 msgid "missing argument"
 msgstr ""
 
-#: popt.c:1351
+#: popt.c:1366
 msgid "unknown option"
 msgstr ""
 
-#: popt.c:1353
+#: popt.c:1368
 msgid "mutually exclusive logical operations requested"
 msgstr ""
 
-#: popt.c:1355
+#: popt.c:1370
 msgid "opt->arg should not be NULL"
 msgstr ""
 
-#: popt.c:1357
+#: popt.c:1372
 msgid "aliases nested too deeply"
 msgstr ""
 
-#: popt.c:1359
+#: popt.c:1374
 msgid "error in parameter quoting"
 msgstr ""
 
-#: popt.c:1361
+#: popt.c:1376
 msgid "invalid numeric value"
 msgstr ""
 
-#: popt.c:1363
+#: popt.c:1378
 msgid "number too large or too small"
 msgstr ""
 
-#: popt.c:1365
+#: popt.c:1380
 msgid "memory allocation failed"
 msgstr ""
 
-#: popt.c:1369
+#: popt.c:1384
 msgid "unknown error"
 msgstr ""
 
diff --git a/po/sv.po b/po/sv.po
index 869ec61..82d48f5 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.14\n"
 "Report-Msgid-Bugs-To: <popt-devel@rpm5.org>\n"
-"POT-Creation-Date: 2008-04-06 09:59-0400\n"
+"POT-Creation-Date: 2008-09-18 14:11-0400\n"
 "PO-Revision-Date: 2008-02-23 20:15+0100\n"
 "Last-Translator: G�ran Uddeborg <goeran@uddeborg.se>\n"
 "Language-Team: Swedish <tp-sv@listor.tp-sv.se>\n"
@@ -21,48 +21,48 @@ msgstr ""
 msgid "unknown errno"
 msgstr "ok�nt felnummer"
 
-#: popt.c:1141
+#: popt.c:945
 #, c-format
 msgid "option type (%u) not implemented in popt\n"
 msgstr "flaggtypen (%u) �r inte implementerad i popt\n"
 
-#: popt.c:1349
+#: popt.c:1364
 msgid "missing argument"
 msgstr "argument saknas"
 
-#: popt.c:1351
+#: popt.c:1366
 msgid "unknown option"
 msgstr "ok�nd flagga"
 
-#: popt.c:1353
+#: popt.c:1368
 msgid "mutually exclusive logical operations requested"
 msgstr "�msesidigt uteslutande logiska operationer beg�rdes"
 
-#: popt.c:1355
+#: popt.c:1370
 msgid "opt->arg should not be NULL"
 msgstr "opt->arg f�r inte vara NULL"
 
-#: popt.c:1357
+#: popt.c:1372
 msgid "aliases nested too deeply"
 msgstr "alias �r n�stade f�r djupt"
 
-#: popt.c:1359
+#: popt.c:1374
 msgid "error in parameter quoting"
 msgstr "fel i parametercitering"
 
-#: popt.c:1361
+#: popt.c:1376
 msgid "invalid numeric value"
 msgstr "ogiltigt numeriskt v�rde"
 
-#: popt.c:1363
+#: popt.c:1378
 msgid "number too large or too small"
 msgstr "talet f�r stort eller f�r litet"
 
-#: popt.c:1365
+#: popt.c:1380
 msgid "memory allocation failed"
 msgstr "minnesallokering misslyckades"
 
-#: popt.c:1369
+#: popt.c:1384
 msgid "unknown error"
 msgstr "ok�nt fel"
 
diff --git a/po/th.po b/po/th.po
index d241901..4f3fe4f 100644
--- a/po/th.po
+++ b/po/th.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.14\n"
 "Report-Msgid-Bugs-To: <popt-devel@rpm5.org>\n"
-"POT-Creation-Date: 2008-04-06 09:59-0400\n"
+"POT-Creation-Date: 2008-09-18 14:11-0400\n"
 "PO-Revision-Date: 2008-02-19 15:53+0700\n"
 "Last-Translator: Seksan Poltree <seksan.poltree@gmail.com>\n"
 "Language-Team: Thai <translation-team-th@lists.sourceforge.net>\n"
@@ -20,48 +20,48 @@ msgstr ""
 msgid "unknown errno"
 msgstr "เกิด errno ที่ไม่รู้จัก"
 
-#: popt.c:1141
+#: popt.c:945
 #, c-format
 msgid "option type (%u) not implemented in popt\n"
 msgstr "ตัวเลือกชนิด (%u) ไม่ถูกอิมพลีเมนต์ใน popt\n"
 
-#: popt.c:1349
+#: popt.c:1364
 msgid "missing argument"
 msgstr "ไม่พบอาร์กิวเมนต์"
 
-#: popt.c:1351
+#: popt.c:1366
 msgid "unknown option"
 msgstr "ไม่รู้จักตัวเลือก"
 
-#: popt.c:1353
+#: popt.c:1368
 msgid "mutually exclusive logical operations requested"
 msgstr "เกิดการร้องขอร่วมกันของการดำเนินการด้านตรรกะอย่างเดียวกัน"
 
-#: popt.c:1355
+#: popt.c:1370
 msgid "opt->arg should not be NULL"
 msgstr "opt->arg ไม่ควรจะเป็น NULL"
 
-#: popt.c:1357
+#: popt.c:1372
 msgid "aliases nested too deeply"
 msgstr "นามแฝงซ้อนกันมากเกินไป"
 
-#: popt.c:1359
+#: popt.c:1374
 msgid "error in parameter quoting"
 msgstr "เกิดข้อผิดพลาดในการอ้างอิงพารามิเตอร์"
 
-#: popt.c:1361
+#: popt.c:1376
 msgid "invalid numeric value"
 msgstr "ค่าตัวเลขผิดพลาด"
 
-#: popt.c:1363
+#: popt.c:1378
 msgid "number too large or too small"
 msgstr "ตัวเลขมีค่ามากหรือน้อยเกินไป"
 
-#: popt.c:1365
+#: popt.c:1380
 msgid "memory allocation failed"
 msgstr "การจัดสรรหน่วยความจำผิดพลาด"
 
-#: popt.c:1369
+#: popt.c:1384
 msgid "unknown error"
 msgstr "ความผิดพลาดที่ไม่รู้จัก"
 
diff --git a/po/tr.po b/po/tr.po
index 08f0ecc..809a41b 100644
--- a/po/tr.po
+++ b/po/tr.po
@@ -5,7 +5,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.11\n"
 "Report-Msgid-Bugs-To: <popt-devel@rpm5.org>\n"
-"POT-Creation-Date: 2008-04-06 09:59-0400\n"
+"POT-Creation-Date: 2008-09-18 14:11-0400\n"
 "PO-Revision-Date: 2000-02-11 13:01+0200\n"
 "Last-Translator: Nilgun Belma Buguner <nilgun@technologist.com>\n"
 "Language-Team: Turkish <tr@li.org>\n"
@@ -17,48 +17,48 @@ msgstr ""
 msgid "unknown errno"
 msgstr "bilinmeyen hata no"
 
-#: popt.c:1141
+#: popt.c:945
 #, fuzzy, c-format
 msgid "option type (%u) not implemented in popt\n"
 msgstr "se�enek t�r� (%d) popt i�in ge�ersiz\n"
 
-#: popt.c:1349
+#: popt.c:1364
 msgid "missing argument"
 msgstr "arg�man eksik"
 
-#: popt.c:1351
+#: popt.c:1366
 msgid "unknown option"
 msgstr "bilinmeyen se�enek"
 
-#: popt.c:1353
+#: popt.c:1368
 msgid "mutually exclusive logical operations requested"
 msgstr "birbirini d��layan mant�ksal i�lemler istendi"
 
-#: popt.c:1355
+#: popt.c:1370
 msgid "opt->arg should not be NULL"
 msgstr ""
 
-#: popt.c:1357
+#: popt.c:1372
 msgid "aliases nested too deeply"
 msgstr "adlarda �ok fazla i�i�elikler"
 
-#: popt.c:1359
+#: popt.c:1374
 msgid "error in parameter quoting"
 msgstr "parametrelerde t�rnak i�aretleme hatal� "
 
-#: popt.c:1361
+#: popt.c:1376
 msgid "invalid numeric value"
 msgstr "say�sal de�er ge�ersiz"
 
-#: popt.c:1363
+#: popt.c:1378
 msgid "number too large or too small"
 msgstr "say� ya �ok b�y�k ya da �ok k���k"
 
-#: popt.c:1365
+#: popt.c:1380
 msgid "memory allocation failed"
 msgstr ""
 
-#: popt.c:1369
+#: popt.c:1384
 msgid "unknown error"
 msgstr "bilinmeyen hata"
 
diff --git a/po/uk.po b/po/uk.po
index 1ebd7a5..98bbfc2 100644
--- a/po/uk.po
+++ b/po/uk.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.11\n"
 "Report-Msgid-Bugs-To: <popt-devel@rpm5.org>\n"
-"POT-Creation-Date: 2008-04-06 09:59-0400\n"
+"POT-Creation-Date: 2008-09-18 14:11-0400\n"
 "PO-Revision-Date: 1999-09-30 16:54+0200\n"
 "Last-Translator: Yuri Syrota <rasta@renome.rovno.ua>\n"
 "Language-Team: Ukrainian <uk@li.org>\n"
@@ -18,48 +18,48 @@ msgstr ""
 msgid "unknown errno"
 msgstr ""
 
-#: popt.c:1141
+#: popt.c:945
 #, c-format
 msgid "option type (%u) not implemented in popt\n"
 msgstr ""
 
-#: popt.c:1349
+#: popt.c:1364
 msgid "missing argument"
 msgstr ""
 
-#: popt.c:1351
+#: popt.c:1366
 msgid "unknown option"
 msgstr ""
 
-#: popt.c:1353
+#: popt.c:1368
 msgid "mutually exclusive logical operations requested"
 msgstr ""
 
-#: popt.c:1355
+#: popt.c:1370
 msgid "opt->arg should not be NULL"
 msgstr ""
 
-#: popt.c:1357
+#: popt.c:1372
 msgid "aliases nested too deeply"
 msgstr ""
 
-#: popt.c:1359
+#: popt.c:1374
 msgid "error in parameter quoting"
 msgstr ""
 
-#: popt.c:1361
+#: popt.c:1376
 msgid "invalid numeric value"
 msgstr ""
 
-#: popt.c:1363
+#: popt.c:1378
 msgid "number too large or too small"
 msgstr ""
 
-#: popt.c:1365
+#: popt.c:1380
 msgid "memory allocation failed"
 msgstr ""
 
-#: popt.c:1369
+#: popt.c:1384
 msgid "unknown error"
 msgstr ""
 
diff --git a/po/vi.po b/po/vi.po
index ab8e0fe..aa363e7 100644
--- a/po/vi.po
+++ b/po/vi.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.14\n"
 "Report-Msgid-Bugs-To: <popt-devel@rpm5.org>\n"
-"POT-Creation-Date: 2008-04-06 09:59-0400\n"
+"POT-Creation-Date: 2008-09-18 14:11-0400\n"
 "PO-Revision-Date: 2008-02-18 16:20+1030\n"
 "Last-Translator: Clytie Siddall <clytie@riverland.net.au>\n"
 "Language-Team: Vietnamese <vi-VN@googlegroups.com>\n"
@@ -21,48 +21,48 @@ msgstr ""
 msgid "unknown errno"
 msgstr "số hiệu lỗi không rõ"
 
-#: popt.c:1141
+#: popt.c:945
 #, c-format
 msgid "option type (%u) not implemented in popt\n"
 msgstr "kiểu tùy chọn (%u) chưa được thực hiện trong popt\n"
 
-#: popt.c:1349
+#: popt.c:1364
 msgid "missing argument"
 msgstr "thiếu đối số"
 
-#: popt.c:1351
+#: popt.c:1366
 msgid "unknown option"
 msgstr "tùy chọn không rõ"
 
-#: popt.c:1353
+#: popt.c:1368
 msgid "mutually exclusive logical operations requested"
 msgstr "các thao tác hợp lý loại từ lẫn nhau được yêu cầu"
 
-#: popt.c:1355
+#: popt.c:1370
 msgid "opt->arg should not be NULL"
 msgstr "« tùy chọn->đối số » không thể vô giá trị"
 
-#: popt.c:1357
+#: popt.c:1372
 msgid "aliases nested too deeply"
 msgstr "các bí danh lồng nhau quá sâu"
 
-#: popt.c:1359
+#: popt.c:1374
 msgid "error in parameter quoting"
 msgstr "gặp lỗi trong lời trích dẫn tham số"
 
-#: popt.c:1361
+#: popt.c:1376
 msgid "invalid numeric value"
 msgstr "giá trị thuộc số không hợp lệ"
 
-#: popt.c:1363
+#: popt.c:1378
 msgid "number too large or too small"
 msgstr "con số quá lớn hay quá nhỏ"
 
-#: popt.c:1365
+#: popt.c:1380
 msgid "memory allocation failed"
 msgstr "lỗi cấp phát bộ nhớ"
 
-#: popt.c:1369
+#: popt.c:1384
 msgid "unknown error"
 msgstr "lỗi không rõ"
 
diff --git a/po/wa.po b/po/wa.po
index 99b8e4f..80b78a6 100644
--- a/po/wa.po
+++ b/po/wa.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.11\n"
 "Report-Msgid-Bugs-To: <popt-devel@rpm5.org>\n"
-"POT-Creation-Date: 2008-04-06 09:59-0400\n"
+"POT-Creation-Date: 2008-09-18 14:11-0400\n"
 "PO-Revision-Date: 1999-03-18 23:11+0100\n"
 "Last-Translator: Nobody yet\n"
 "Language-Team: walon <linux-wa@chanae.alphanet.ch>\n"
@@ -22,48 +22,48 @@ msgstr ""
 msgid "unknown errno"
 msgstr ""
 
-#: popt.c:1141
+#: popt.c:945
 #, c-format
 msgid "option type (%u) not implemented in popt\n"
 msgstr ""
 
-#: popt.c:1349
+#: popt.c:1364
 msgid "missing argument"
 msgstr ""
 
-#: popt.c:1351
+#: popt.c:1366
 msgid "unknown option"
 msgstr ""
 
-#: popt.c:1353
+#: popt.c:1368
 msgid "mutually exclusive logical operations requested"
 msgstr ""
 
-#: popt.c:1355
+#: popt.c:1370
 msgid "opt->arg should not be NULL"
 msgstr ""
 
-#: popt.c:1357
+#: popt.c:1372
 msgid "aliases nested too deeply"
 msgstr ""
 
-#: popt.c:1359
+#: popt.c:1374
 msgid "error in parameter quoting"
 msgstr ""
 
-#: popt.c:1361
+#: popt.c:1376
 msgid "invalid numeric value"
 msgstr ""
 
-#: popt.c:1363
+#: popt.c:1378
 msgid "number too large or too small"
 msgstr ""
 
-#: popt.c:1365
+#: popt.c:1380
 msgid "memory allocation failed"
 msgstr ""
 
-#: popt.c:1369
+#: popt.c:1384
 msgid "unknown error"
 msgstr ""
 
diff --git a/po/zh_CN.po b/po/zh_CN.po
index 28b611b..a677c05 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.14\n"
 "Report-Msgid-Bugs-To: <popt-devel@rpm5.org>\n"
-"POT-Creation-Date: 2008-04-06 09:59-0400\n"
+"POT-Creation-Date: 2008-09-18 14:11-0400\n"
 "PO-Revision-Date: 2008-02-18 20:16+0800\n"
 "Last-Translator: LI Daobing <lidaobing@gmail.com>\n"
 "Language-Team: Chinese (simplified) <translation-team-zh-cn@lists."
@@ -21,48 +21,48 @@ msgstr ""
 msgid "unknown errno"
 msgstr "未知的错误"
 
-#: popt.c:1141
+#: popt.c:945
 #, c-format
 msgid "option type (%u) not implemented in popt\n"
 msgstr "选项类别 (%u) 没有在 popt 中实现\n"
 
-#: popt.c:1349
+#: popt.c:1364
 msgid "missing argument"
 msgstr "缺少参数"
 
-#: popt.c:1351
+#: popt.c:1366
 msgid "unknown option"
 msgstr "未知的选项"
 
-#: popt.c:1353
+#: popt.c:1368
 msgid "mutually exclusive logical operations requested"
 msgstr "需要 XOR 逻辑运算"
 
-#: popt.c:1355
+#: popt.c:1370
 msgid "opt->arg should not be NULL"
 msgstr "opt->arg 不应该为 NULL"
 
-#: popt.c:1357
+#: popt.c:1372
 msgid "aliases nested too deeply"
 msgstr "别名嵌套太深"
 
-#: popt.c:1359
+#: popt.c:1374
 msgid "error in parameter quoting"
 msgstr "参数引号错误"
 
-#: popt.c:1361
+#: popt.c:1376
 msgid "invalid numeric value"
 msgstr "无效的数值"
 
-#: popt.c:1363
+#: popt.c:1378
 msgid "number too large or too small"
 msgstr "数值太大或太小"
 
-#: popt.c:1365
+#: popt.c:1380
 msgid "memory allocation failed"
 msgstr "内存分配错误"
 
-#: popt.c:1369
+#: popt.c:1384
 msgid "unknown error"
 msgstr "未知的错误"
 
diff --git a/po/zh_TW.po b/po/zh_TW.po
index 6fbfa5b..32e3928 100644
--- a/po/zh_TW.po
+++ b/po/zh_TW.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.11\n"
 "Report-Msgid-Bugs-To: <popt-devel@rpm5.org>\n"
-"POT-Creation-Date: 2008-04-06 09:59-0400\n"
+"POT-Creation-Date: 2008-09-18 14:11-0400\n"
 "PO-Revision-Date: 2005-04-08 17:52+0800\n"
 "Last-Translator: Wei-Lun Chao <chaoweilun@pcmail.com.tw>\n"
 "Language-Team: zh_TW <zh-l10n@linux.org.tw>\n"
@@ -18,48 +18,48 @@ msgstr ""
 msgid "unknown errno"
 msgstr "未知的錯誤"
 
-#: popt.c:1141
+#: popt.c:945
 #, fuzzy, c-format
 msgid "option type (%u) not implemented in popt\n"
 msgstr "選項類型 (%d) 沒有在 popt 中實作\n"
 
-#: popt.c:1349
+#: popt.c:1364
 msgid "missing argument"
 msgstr "缺少引數"
 
-#: popt.c:1351
+#: popt.c:1366
 msgid "unknown option"
 msgstr "未知的選項"
 
-#: popt.c:1353
+#: popt.c:1368
 msgid "mutually exclusive logical operations requested"
 msgstr "需要相互獨立的邏輯運算"
 
-#: popt.c:1355
+#: popt.c:1370
 msgid "opt->arg should not be NULL"
 msgstr "opt->arg 不應為 NULL"
 
-#: popt.c:1357
+#: popt.c:1372
 msgid "aliases nested too deeply"
 msgstr "巢狀別名太深"
 
-#: popt.c:1359
+#: popt.c:1374
 msgid "error in parameter quoting"
 msgstr "參數引號錯誤"
 
-#: popt.c:1361
+#: popt.c:1376
 msgid "invalid numeric value"
 msgstr "不正確的數值"
 
-#: popt.c:1363
+#: popt.c:1378
 msgid "number too large or too small"
 msgstr "數字太大或太小"
 
-#: popt.c:1365
+#: popt.c:1380
 msgid "memory allocation failed"
 msgstr "記憶體配置錯誤"
 
-#: popt.c:1369
+#: popt.c:1384
 msgid "unknown error"
 msgstr "未知的錯誤"
 
-- 
Gitee


From 73aa8120467c962fb610e109ca8a6b9ca8546770 Mon Sep 17 00:00:00 2001
From: Jeff Johnson <n3npq@mac.com>
Date: Thu, 18 Sep 2008 18:16:28 +0000
Subject: [PATCH 549/667] - jbj: add eo.po and id.po (Translation Project).

---
 CHANGES      |   1 +
 configure.ac |   2 +-
 po/eo.po     | 132 +++++++++++++++++++++++++++++++++++++++++++++++++++
 po/id.po     | 132 +++++++++++++++++++++++++++++++++++++++++++++++++++
 4 files changed, 266 insertions(+), 1 deletion(-)
 create mode 100644 po/eo.po
 create mode 100644 po/id.po

diff --git a/CHANGES b/CHANGES
index 671a5ad..3c65b6f 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,4 +1,5 @@
 1.14 -> 1.15:
+    - jbj: add eo.po and id.po (Translation Project).
     - jbj: updated da.po (Translation Project).
     - jbj: extend coverage to several additional setup routines.
     - jbj: add tests for --usage/--help coverage.
diff --git a/configure.ac b/configure.ac
index 96095b4..94875c0 100755
--- a/configure.ac
+++ b/configure.ac
@@ -14,7 +14,7 @@ AC_SUBST(LT_AGE, 8)
 
 AM_INIT_AUTOMAKE([foreign])
 
-ALL_LINGUAS="cs da de es fi fr ga gl hu is it ja ko nb nl pl pt ro ru sk sl sv th tr uk vi wa zh_TW zh_CN"
+ALL_LINGUAS="cs da de eo es fi fr ga gl hu id is it ja ko nb nl pl pt ro ru sk sl sv th tr uk vi wa zh_TW zh_CN"
 
 AC_PROG_CC
 AC_PROG_INSTALL
diff --git a/po/eo.po b/po/eo.po
new file mode 100644
index 0000000..5e56196
--- /dev/null
+++ b/po/eo.po
@@ -0,0 +1,132 @@
+# Esperanto translation of popt
+# Copyright (C) 2008 Felipe Castro
+# This file is put in the public domain.
+# Felipe Castro <fefcas@gmail.com>, 2008
+msgid ""
+msgstr ""
+"Project-Id-Version: popt 1.14\n"
+"Report-Msgid-Bugs-To: <popt-devel@rpm5.org>\n"
+"POT-Creation-Date: 2008-02-16 19:54-0500\n"
+"PO-Revision-Date: 2008-08-03 15:50-0300\n"
+"Last-Translator: Felipe Castro <fefcas@gmail.com>\n"
+"Language-Team: Esperanto <translation-team-eo@lists.sourceforge.net>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=utf-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#: popt.c:35
+msgid "unknown errno"
+msgstr "nekonata erarnumero"
+
+#: popt.c:1090
+#, c-format
+msgid "option type (%u) not implemented in popt\n"
+msgstr "la opcia tipo (%u) ne estas realigita en popt\n"
+
+#: popt.c:1294
+msgid "missing argument"
+msgstr "mankas argumento"
+
+#: popt.c:1296
+msgid "unknown option"
+msgstr "nekonata opcio"
+
+#: popt.c:1298
+msgid "mutually exclusive logical operations requested"
+msgstr "reciprokaj logikaj operacioj estas postulataj"
+
+#: popt.c:1300
+msgid "opt->arg should not be NULL"
+msgstr "opt->arg ne devus esti NULL"
+
+#: popt.c:1302
+msgid "aliases nested too deeply"
+msgstr "kromnomoj estas ingitaj tro profunde"
+
+#: popt.c:1304
+msgid "error in parameter quoting"
+msgstr "eraro en parametra citado"
+
+#: popt.c:1306
+msgid "invalid numeric value"
+msgstr "nevalida numera valoro"
+
+#: popt.c:1308
+msgid "number too large or too small"
+msgstr "numero tro granda aŭ tro eta"
+
+#: popt.c:1310
+msgid "memory allocation failed"
+msgstr "malsukceso dum okupado de memoro"
+
+#: popt.c:1314
+msgid "unknown error"
+msgstr "nekonata eraro"
+
+#: popthelp.c:74 popthelp.c:86
+msgid "Show this help message"
+msgstr "Montri tiun ĉi helpmesaĝon"
+
+#: popthelp.c:75 popthelp.c:87
+msgid "Display brief usage message"
+msgstr "Montri resumitan mesaĝon pri uzado"
+
+#: popthelp.c:76 popthelp.c:92
+msgid "Terminate options"
+msgstr "Opcioj pri finiĝo"
+
+#: popthelp.c:90
+msgid "Display option defaults in message"
+msgstr "Montri la implicitajn valorojn de la opcio en la mesaĝo"
+
+#: popthelp.c:191
+msgid "Help options:"
+msgstr "Help-opcioj:"
+
+#: popthelp.c:192
+msgid "Options implemented via popt alias/exec:"
+msgstr "Opcioj realigitaj per popt alias/exec:"
+
+#: popthelp.c:200
+msgid "NONE"
+msgstr "NENIO"
+
+#: popthelp.c:202
+msgid "VAL"
+msgstr "VAL"
+
+#: popthelp.c:206
+msgid "INT"
+msgstr "INT"
+
+#: popthelp.c:207
+msgid "LONG"
+msgstr "LONG"
+
+#: popthelp.c:208
+msgid "LONGLONG"
+msgstr "LONGLONG"
+
+#: popthelp.c:209
+msgid "STRING"
+msgstr "STRING"
+
+#: popthelp.c:210
+msgid "FLOAT"
+msgstr "FLOAT"
+
+#: popthelp.c:211
+msgid "DOUBLE"
+msgstr "DOUBLE"
+
+#: popthelp.c:214
+msgid "ARG"
+msgstr "ARG"
+
+#: popthelp.c:634
+msgid "Usage:"
+msgstr "Uzado:"
+
+#: popthelp.c:658
+msgid "[OPTION...]"
+msgstr "[OPCIO...]"
diff --git a/po/id.po b/po/id.po
new file mode 100644
index 0000000..4b25ec9
--- /dev/null
+++ b/po/id.po
@@ -0,0 +1,132 @@
+# Indonesian translations for popt package.
+# This file is put in the public domain.
+# Andhika Padmawan <andhika.padmawan@gmail.com>, 2008.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: popt 1.14\n"
+"Report-Msgid-Bugs-To: <popt-devel@rpm5.org>\n"
+"POT-Creation-Date: 2008-02-16 19:54-0500\n"
+"PO-Revision-Date: 2008-08-26 14:18+0700\n"
+"Last-Translator: Andhika Padmawan <andhika.padmawan@gmail.com>\n"
+"Language-Team: Indonesian <translation-team-id@lists.sourceforge.net>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=utf-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#: popt.c:35
+msgid "unknown errno"
+msgstr "errno tak diketahui"
+
+#: popt.c:1090
+#, c-format
+msgid "option type (%u) not implemented in popt\n"
+msgstr "tipe opsi (%u) tak diimplementasikan di popt\n"
+
+#: popt.c:1294
+msgid "missing argument"
+msgstr "kehilangan argumen"
+
+#: popt.c:1296
+msgid "unknown option"
+msgstr "opsi tak diketahui"
+
+#: popt.c:1298
+msgid "mutually exclusive logical operations requested"
+msgstr "permintaan operasi logika eksklusif secara mutual"
+
+#: popt.c:1300
+msgid "opt->arg should not be NULL"
+msgstr "opt->arg tidak boleh NULL"
+
+#: popt.c:1302
+msgid "aliases nested too deeply"
+msgstr "alias disarangkan terlalu dalam"
+
+#: popt.c:1304
+msgid "error in parameter quoting"
+msgstr "galat di pencantuman parameter"
+
+#: popt.c:1306
+msgid "invalid numeric value"
+msgstr "nilai numerik tidak sah"
+
+#: popt.c:1308
+msgid "number too large or too small"
+msgstr "nomor terlalu besar atau terlalu kecil"
+
+#: popt.c:1310
+msgid "memory allocation failed"
+msgstr "alokasi memori gagal"
+
+#: popt.c:1314
+msgid "unknown error"
+msgstr "galat tak diketahui"
+
+#: popthelp.c:74 popthelp.c:86
+msgid "Show this help message"
+msgstr "Tampilkan pesan bantuan ini"
+
+#: popthelp.c:75 popthelp.c:87
+msgid "Display brief usage message"
+msgstr "Tampilkan pesan penggunaan singkat"
+
+#: popthelp.c:76 popthelp.c:92
+msgid "Terminate options"
+msgstr "Matikan opsi"
+
+#: popthelp.c:90
+msgid "Display option defaults in message"
+msgstr "Tampilkan opsi standar dalam pesan"
+
+#: popthelp.c:191
+msgid "Help options:"
+msgstr "Opsi bantuan:"
+
+#: popthelp.c:192
+msgid "Options implemented via popt alias/exec:"
+msgstr "Opsi diimplementasikan via popt alias/exec:"
+
+#: popthelp.c:200
+msgid "NONE"
+msgstr "NONE"
+
+#: popthelp.c:202
+msgid "VAL"
+msgstr "VAL"
+
+#: popthelp.c:206
+msgid "INT"
+msgstr "INT"
+
+#: popthelp.c:207
+msgid "LONG"
+msgstr "LONG"
+
+#: popthelp.c:208
+msgid "LONGLONG"
+msgstr "LONGLONG"
+
+#: popthelp.c:209
+msgid "STRING"
+msgstr "STRING"
+
+#: popthelp.c:210
+msgid "FLOAT"
+msgstr "FLOAT"
+
+#: popthelp.c:211
+msgid "DOUBLE"
+msgstr "DOUBLE"
+
+#: popthelp.c:214
+msgid "ARG"
+msgstr "ARG"
+
+#: popthelp.c:634
+msgid "Usage:"
+msgstr "Penggunaan:"
+
+#: popthelp.c:658
+msgid "[OPTION...]"
+msgstr "[OPSI...]"
-- 
Gitee


From 8688c00958a0ea00e23e083351a2ff9633f5a6d9 Mon Sep 17 00:00:00 2001
From: Jeff Johnson <n3npq@mac.com>
Date: Sat, 4 Oct 2008 19:23:50 +0000
Subject: [PATCH 550/667] - jbj: fix: remove AC_CHECK_VA_COPY check, va_copy is
 no longer used.

---
 CHANGES      | 1 +
 configure.ac | 1 -
 2 files changed, 1 insertion(+), 1 deletion(-)

diff --git a/CHANGES b/CHANGES
index 3c65b6f..b72f3ad 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,4 +1,5 @@
 1.14 -> 1.15:
+    - jbj: fix: remove AC_CHECK_VA_COPY check, va_copy is no longer used.
     - jbj: add eo.po and id.po (Translation Project).
     - jbj: updated da.po (Translation Project).
     - jbj: extend coverage to several additional setup routines.
diff --git a/configure.ac b/configure.ac
index 94875c0..a8ef798 100755
--- a/configure.ac
+++ b/configure.ac
@@ -43,7 +43,6 @@ AC_SYS_LARGEFILE
 
 AC_ISC_POSIX
 AM_C_PROTOTYPES
-AC_CHECK_VA_COPY
 
 AC_CHECK_HEADERS(float.h glob.h langinfo.h libintl.h mcheck.h unistd.h)
 
-- 
Gitee


From 590a8994d3c3f37ebc0800c162a32f928d2f1303 Mon Sep 17 00:00:00 2001
From: Jeff Johnson <n3npq@mac.com>
Date: Sat, 25 Oct 2008 19:02:58 +0000
Subject: [PATCH 551/667] - test/use HAVE_SRANDOM to avoid portability issues.

---
 CHANGES      |  1 +
 configure.ac |  2 +-
 popt.c       | 15 +++++++++++++++
 3 files changed, 17 insertions(+), 1 deletion(-)

diff --git a/CHANGES b/CHANGES
index b72f3ad..404b428 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,4 +1,5 @@
 1.14 -> 1.15:
+    - jbj: test/use HAVE_SRANDOM to avoid portability issues.
     - jbj: fix: remove AC_CHECK_VA_COPY check, va_copy is no longer used.
     - jbj: add eo.po and id.po (Translation Project).
     - jbj: updated da.po (Translation Project).
diff --git a/configure.ac b/configure.ac
index a8ef798..dbcec10 100755
--- a/configure.ac
+++ b/configure.ac
@@ -68,7 +68,7 @@ AM_CONDITIONAL(HAVE_LD_VERSION_SCRIPT, test "$have_ld_version_script" = "yes")
 AC_CHECK_FUNC(setreuid, [], [
     AC_CHECK_LIB(ucb, setreuid, [if echo $LIBS | grep -- -lucb >/dev/null ;then :; else LIBS="$LIBS -lc -lucb" USEUCB=y;fi])
 ])
-AC_CHECK_FUNCS(getuid geteuid iconv mtrace __secure_getenv setregid stpcpy strerror vasprintf)
+AC_CHECK_FUNCS(getuid geteuid iconv mtrace __secure_getenv setregid stpcpy strerror vasprintf srandom)
 
 AM_GNU_GETTEXT([external])
 AM_ICONV_LINK
diff --git a/popt.c b/popt.c
index f20db51..0e274e6 100644
--- a/popt.c
+++ b/popt.c
@@ -739,12 +739,17 @@ int poptSaveLongLong(long long * arg, unsigned int argInfo, long long aLongLong)
 	return POPT_ERROR_NULLARG;
 
     if (aLongLong != 0 && LF_ISSET(RANDOM)) {
+#if defined(HAVE_SRANDOM)
 	if (!seed) {
 	    srandom((unsigned)getpid());
 	    srandom((unsigned)random());
 	}
 	aLongLong = (long long)(random() % (aLongLong > 0 ? aLongLong : -aLongLong));
 	aLongLong++;
+#else
+	/* XXX avoid adding POPT_ERROR_UNIMPLEMENTED to minimize i18n churn. */
+	return POPT_ERROR_BADOPERATION;
+#endif
     }
     if (LF_ISSET(NOT))
 	aLongLong = ~aLongLong;
@@ -775,12 +780,17 @@ int poptSaveLong(long * arg, unsigned int argInfo, long aLong)
 	return POPT_ERROR_NULLARG;
 
     if (aLong != 0 && LF_ISSET(RANDOM)) {
+#if defined(HAVE_SRANDOM)
 	if (!seed) {
 	    srandom((unsigned)getpid());
 	    srandom((unsigned)random());
 	}
 	aLong = random() % (aLong > 0 ? aLong : -aLong);
 	aLong++;
+#else
+	/* XXX avoid adding POPT_ERROR_UNIMPLEMENTED to minimize i18n churn. */
+	return POPT_ERROR_BADOPERATION;
+#endif
     }
     if (LF_ISSET(NOT))
 	aLong = ~aLong;
@@ -811,12 +821,17 @@ int poptSaveInt(/*@null@*/ int * arg, unsigned int argInfo, long aLong)
 	return POPT_ERROR_NULLARG;
 
     if (aLong != 0 && LF_ISSET(RANDOM)) {
+#if defined(HAVE_SRANDOM)
 	if (!seed) {
 	    srandom((unsigned)getpid());
 	    srandom((unsigned)random());
 	}
 	aLong = random() % (aLong > 0 ? aLong : -aLong);
 	aLong++;
+#else
+	/* XXX avoid adding POPT_ERROR_UNIMPLEMENTED to minimize i18n churn. */
+	return POPT_ERROR_BADOPERATION;
+#endif
     }
     if (LF_ISSET(NOT))
 	aLong = ~aLong;
-- 
Gitee


From defbf884ddce9ef7e28275e03640e331f0794c54 Mon Sep 17 00:00:00 2001
From: Jeff Johnson <n3npq@mac.com>
Date: Thu, 4 Dec 2008 20:37:31 +0000
Subject: [PATCH 552/667] - jbj: fix: rewrite (and simplify)
 strdup_locale_from_utf8().

---
 CHANGES   |   1 +
 poptint.c | 112 +++++++++++++++++++++++++-----------------------------
 2 files changed, 53 insertions(+), 60 deletions(-)

diff --git a/CHANGES b/CHANGES
index 404b428..ee9736a 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,4 +1,5 @@
 1.14 -> 1.15:
+    - jbj: fix: rewrite (and simplify) strdup_locale_from_utf8().
     - jbj: test/use HAVE_SRANDOM to avoid portability issues.
     - jbj: fix: remove AC_CHECK_VA_COPY check, va_copy is no longer used.
     - jbj: add eo.po and id.po (Translation Project).
diff --git a/poptint.c b/poptint.c
index 6c135ad..5b0cd22 100644
--- a/poptint.c
+++ b/poptint.c
@@ -65,15 +65,20 @@ POPT_dgettext(const char * dom, const char * str)
 #endif
 
 #ifdef HAVE_ICONV
+/**
+ * Return malloc'd string converted from UTF-8 to current locale.
+ * @param istr		input string (UTF-8 encoding assumed)
+ * @return		localized string
+ */
 static /*@only@*/ /*@null@*/ char *
-strdup_locale_from_utf8 (/*@null@*/ char *buffer)
+strdup_locale_from_utf8 (/*@null@*/ char * istr)
 	/*@*/
 {
-    char *codeset = NULL;
-    char *dest_str;
-    iconv_t fd;
+    char * codeset = NULL;
+    char * ostr = NULL;
+    iconv_t cd;
 
-    if (buffer == NULL)
+    if (istr == NULL)
 	return NULL;
 
 #ifdef HAVE_LANGINFO_H
@@ -83,70 +88,57 @@ strdup_locale_from_utf8 (/*@null@*/ char *buffer)
 #endif
 
     if (codeset != NULL && strcmp(codeset, "UTF-8") != 0
-     && (fd = iconv_open(codeset, "UTF-8")) != (iconv_t)-1)
+     && (cd = iconv_open(codeset, "UTF-8")) != (iconv_t)-1)
     {
-	char *pin = buffer;
-	char *pout = NULL;
-	size_t ib, ob, dest_size;
-	int done;
-	int is_error;
+	char * shift_pin = NULL;
+	size_t db = strlen(istr);
+	char * dstr = malloc((db + 1) * sizeof(*dstr));
+	char * pin = istr;
+	char * pout = dstr;
+	size_t ib = db;
+	size_t ob = db;
 	size_t err;
-	char *shift_pin = NULL;
-	int xx;
-
-	err = iconv(fd, NULL, &ib, &pout, &ob);
-	dest_size = ob = ib = strlen(buffer);
-	dest_str = pout = malloc((dest_size + 1) * sizeof(*dest_str));
-	if (dest_str)
-	    *dest_str = '\0';
-	done = is_error = 0;
-	if (pout != NULL)
-	while (done == 0 && is_error == 0) {
-	    err = iconv(fd, &pin, &ib, &pout, &ob);
-
-	    if (err == (size_t)-1) {
-		switch (errno) {
-		case EINVAL:
-		    done = 1;
-		    /*@switchbreak@*/ break;
-		case E2BIG:
-		{   size_t used = (size_t)(pout - dest_str);
-		    dest_size *= 2;
-		    dest_str = realloc(dest_str, (dest_size + 1) * sizeof(*dest_str));
-		    if (dest_str == NULL) {
-			is_error = 1;
-			continue;
-		    }
-		    pout = dest_str + used;
-		    ob = dest_size - used;
-		}   /*@switchbreak@*/ break;
-		case EILSEQ:
-		    is_error = 1;
-		    /*@switchbreak@*/ break;
-		default:
-		    is_error = 1;
-		    /*@switchbreak@*/ break;
-		}
-	    } else {
+
+	if (dstr == NULL)
+	    return NULL;
+	err = iconv(cd, NULL, NULL, NULL, NULL);
+	while (1) {
+	    *pout = '\0';
+	    err = iconv(cd, &pin, &ib, &pout, &ob);
+	    if (err != (size_t)-1) {
 		if (shift_pin == NULL) {
 		    shift_pin = pin;
 		    pin = NULL;
 		    ib = 0;
-		} else {
-		    done = 1;
+		    continue;
 		}
+	    } else
+	    switch (errno) {
+	    case E2BIG:
+	    {	size_t used = (size_t)(pout - dstr);
+		db *= 2;
+		dstr = realloc(dstr, (db + 1) * sizeof(*dstr));
+		if (dstr != NULL) {
+		    pout = dstr + used;
+		    ob = db - used;
+		    continue;
+		}
+	    }   /*@switchbreak@*/ break;
+	    case EINVAL:
+	    case EILSEQ:
+	    default:
+		/*@switchbreak@*/ break;
 	    }
+	    break;
 	}
-	xx = iconv_close(fd);
-	if (pout)
-	    *pout = '\0';
-	if (dest_str != NULL)
-	    dest_str = xstrdup(dest_str);
-    } else {
-	dest_str = xstrdup(buffer);
-    }
-
-    return dest_str;
+	(void) iconv_close(cd);
+	*pout = '\0';
+	ostr = xstrdup(dstr);
+	free(dstr);
+    } else
+	ostr = xstrdup(istr);
+
+    return ostr;
 }
 #endif
 
-- 
Gitee


From 8b61acd0bfccc9abf33d6d3f1c4e45e889b2b558 Mon Sep 17 00:00:00 2001
From: Jeff Johnson <n3npq@mac.com>
Date: Thu, 4 Dec 2008 20:54:01 +0000
Subject: [PATCH 553/667] - jbj: fix: rearrange code to better hint to coverity
 scan (CID#9).

---
 CHANGES    | 3 ++-
 popthelp.c | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/CHANGES b/CHANGES
index ee9736a..5f7f6de 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,5 +1,6 @@
 1.14 -> 1.15:
-    - jbj: fix: rewrite (and simplify) strdup_locale_from_utf8().
+    - jbj: fix: rearrange code to better hint to coverity scan (CID#9).
+    - jbj: fix: rewrite (and simplify) strdup_locale_from_utf8() (CID#7, CID#8, CID#11, CID#12).
     - jbj: test/use HAVE_SRANDOM to avoid portability issues.
     - jbj: fix: remove AC_CHECK_VA_COPY check, va_copy is no longer used.
     - jbj: add eo.po and id.po (Translation Project).
diff --git a/popthelp.c b/popthelp.c
index a83ad33..c985413 100644
--- a/popthelp.c
+++ b/popthelp.c
@@ -368,8 +368,8 @@ static void singleOptionHelp(FILE * fp, columns_t columns,
 		    *te++ = ' ';
 		    strcpy(te, defs);
 		    defs = _free(defs);
+		    defs = t;
 		}
-		defs = t;
 	    }
 	}
 
-- 
Gitee


From f74cfd35a73517b27b0e1139540cb03eb03f24de Mon Sep 17 00:00:00 2001
From: Jeff Johnson <n3npq@mac.com>
Date: Thu, 4 Dec 2008 21:05:27 +0000
Subject: [PATCH 554/667] - jbj: fix: eliminate dead code (CID#5).

---
 CHANGES   | 1 +
 poptint.c | 3 +--
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/CHANGES b/CHANGES
index 5f7f6de..1d4d8d6 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,4 +1,5 @@
 1.14 -> 1.15:
+    - jbj: fix: eliminate dead code (CID#5).
     - jbj: fix: rearrange code to better hint to coverity scan (CID#9).
     - jbj: fix: rewrite (and simplify) strdup_locale_from_utf8() (CID#7, CID#8, CID#11, CID#12).
     - jbj: test/use HAVE_SRANDOM to avoid portability issues.
diff --git a/poptint.c b/poptint.c
index 5b0cd22..55485fe 100644
--- a/poptint.c
+++ b/poptint.c
@@ -187,8 +187,7 @@ POPT_fprintf (FILE * stream, const char * format, ...)
 #endif
 	    rc = fprintf(stream, "%s", b);
 	free (b);
-    } else if (ob != NULL)
-	free(ob);
+    }
 
     return rc;
 }
-- 
Gitee


From 8c4eaa7fbb140c0910f44f8d7da734f12d908477 Mon Sep 17 00:00:00 2001
From: Jeff Johnson <n3npq@mac.com>
Date: Thu, 18 Dec 2008 03:54:41 +0000
Subject: [PATCH 555/667] - jbj: snip out 8 unused bits for argument groups.

---
 CHANGES   | 1 +
 popt.h    | 4 +++-
 poptint.h | 1 +
 3 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/CHANGES b/CHANGES
index 1d4d8d6..83bd227 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,4 +1,5 @@
 1.14 -> 1.15:
+    - jbj: snip out 8 unused bits for argument groups.
     - jbj: fix: eliminate dead code (CID#5).
     - jbj: fix: rearrange code to better hint to coverity scan (CID#9).
     - jbj: fix: rewrite (and simplify) strdup_locale_from_utf8() (CID#7, CID#8, CID#11, CID#12).
diff --git a/popt.h b/popt.h
index ba802bf..e35ee81 100644
--- a/popt.h
+++ b/popt.h
@@ -38,7 +38,9 @@
 #define POPT_ARG_MAINCALL	16U+11U	/*!< EXPERIMENTAL: return (*arg) (argc, argv) */
 #define	POPT_ARG_ARGV		12U	/*!< dupe'd arg appended to realloc'd argv array. */
 
-#define POPT_ARG_MASK		0x0000FFFFU
+#define POPT_ARG_MASK		0x000000FFU
+#define POPT_GROUP_MASK		0x0000FF00U
+
 /*@}*/
 
 /** \ingroup popt
diff --git a/poptint.h b/poptint.h
index f0be0b5..d468c5c 100644
--- a/poptint.h
+++ b/poptint.h
@@ -70,6 +70,7 @@ typedef union poptArg_u {
 /*@=exporttype =fielduse@*/
 
 #define	poptArgType(_opt)	((_opt)->argInfo & POPT_ARG_MASK)
+#define	poptGroup(_opt)		((_opt)->argInfo & POPT_GROUP_MASK)
 #define	F_ISSET(_opt, _FLAG)	((_opt)->argInfo & POPT_ARGFLAG_##_FLAG)
 #define	LF_ISSET(_FLAG)		(argInfo & POPT_ARGFLAG_##_FLAG)
 #define	CBF_ISSET(_opt, _FLAG)	((_opt)->argInfo & POPT_CBFLAG_##_FLAG)
-- 
Gitee


From 405a4461775b6e09e27dac8f82d33ac859170c93 Mon Sep 17 00:00:00 2001
From: Jeff Johnson <n3npq@mac.com>
Date: Thu, 18 Dec 2008 16:55:43 +0000
Subject: [PATCH 556/667] - jbj: permit type/group bitmasks to be changed (if
 needed somewhen).

---
 CHANGES      |  1 +
 libpopt.vers |  2 ++
 popt.c       |  7 ++++++-
 poptint.h    | 10 ++++++++--
 4 files changed, 17 insertions(+), 3 deletions(-)

diff --git a/CHANGES b/CHANGES
index 83bd227..713873a 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,4 +1,5 @@
 1.14 -> 1.15:
+    - jbj: permit type/group bitmasks to be changed (if needed somewhen).
     - jbj: snip out 8 unused bits for argument groups.
     - jbj: fix: eliminate dead code (CID#5).
     - jbj: fix: rearrange code to better hint to coverity scan (CID#9).
diff --git a/libpopt.vers b/libpopt.vers
index 01371da..585ac73 100644
--- a/libpopt.vers
+++ b/libpopt.vers
@@ -3,6 +3,8 @@ LIBPOPT_0
   global:
     _fini;
     _init;
+    _poptArgMask;
+    _poptGroupMask;
     poptAddAlias;
     poptAddItem;
     poptAliasOptions;
diff --git a/popt.c b/popt.c
index 0e274e6..06e3070 100644
--- a/popt.c
+++ b/popt.c
@@ -30,6 +30,11 @@ extern long long int strtoll(const char *nptr, /*@null@*/ char **endptr,
 int _popt_debug = 0;
 #endif
 
+/*@unchecked@*/
+unsigned int _poptArgMask = POPT_ARG_MASK;
+/*@unchecked@*/
+unsigned int _poptGroupMask = POPT_GROUP_MASK;
+
 #if !defined(HAVE_STRERROR) && !defined(__LCLINT__)
 static char * strerror(int errno)
 {
@@ -176,7 +181,7 @@ poptContext poptGetContext(const char * name, int argc, const char ** argv,
     con->os->argb = NULL;
 
     if (!(flags & POPT_CONTEXT_KEEP_FIRST))
-	con->os->next = 1;			/* skip argv[0] */
+	con->os->next = 1;		/* skip argv[0] */
 
     con->leftovers = calloc( (size_t)(argc + 1), sizeof(*con->leftovers) );
 /*@-dependenttrans -assignexpose@*/	/* FIX: W2DO? */
diff --git a/poptint.h b/poptint.h
index d468c5c..ddb0510 100644
--- a/poptint.h
+++ b/poptint.h
@@ -69,8 +69,14 @@ typedef union poptArg_u {
 } poptArg;
 /*@=exporttype =fielduse@*/
 
-#define	poptArgType(_opt)	((_opt)->argInfo & POPT_ARG_MASK)
-#define	poptGroup(_opt)		((_opt)->argInfo & POPT_GROUP_MASK)
+/*@unchecked@*/
+extern unsigned int _poptArgMask;
+/*@unchecked@*/
+extern unsigned int _poptGroupMask;
+
+#define	poptArgType(_opt)	((_opt)->argInfo & _poptArgMask)
+#define	poptGroup(_opt)		((_opt)->argInfo & _poptGroupMask)
+
 #define	F_ISSET(_opt, _FLAG)	((_opt)->argInfo & POPT_ARGFLAG_##_FLAG)
 #define	LF_ISSET(_FLAG)		(argInfo & POPT_ARGFLAG_##_FLAG)
 #define	CBF_ISSET(_opt, _FLAG)	((_opt)->argInfo & POPT_CBFLAG_##_FLAG)
-- 
Gitee


From 64b41aa1b57f3e2fa40ad76532dc713b9132572c Mon Sep 17 00:00:00 2001
From: Jeff Johnson <n3npq@mac.com>
Date: Thu, 18 Dec 2008 17:09:49 +0000
Subject: [PATCH 557/667] - jbj: splint (3.1.2) fiddles.

---
 .splintrc    | 2 +-
 poptconfig.c | 2 +-
 poptint.c    | 1 +
 poptint.h    | 8 +++++---
 system.h     | 2 +-
 test1.c      | 2 ++
 6 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/.splintrc b/.splintrc
index 431c99a..fd0dd12 100644
--- a/.splintrc
+++ b/.splintrc
@@ -12,7 +12,7 @@
 +strict			# lclint level
 
 # --- in progress
-#+bounds
+-bounds
 -bufferoverflowhigh
 -branchstate
 
diff --git a/poptconfig.c b/poptconfig.c
index e2b5385..4f6de87 100644
--- a/poptconfig.c
+++ b/poptconfig.c
@@ -207,7 +207,7 @@ int poptReadDefaultConfig(poptContext con, /*@unused@*/ UNUSED(int useEnv))
             size_t i;
 	    for (i = 0; i < pglob->gl_pathc; i++) {
 		char * f = pglob->gl_pathv[i];
-		if (strstr(f, ".rpmnew") || strstr(f, ".rpmsave"))
+		if (f == NULL || strstr(f, ".rpmnew") || strstr(f, ".rpmsave"))
 		    continue;
 		if (!stat(f, &s)) {
 		    if (!S_ISREG(s.st_mode) && !S_ISLNK(s.st_mode))
diff --git a/poptint.c b/poptint.c
index 55485fe..d5d361d 100644
--- a/poptint.c
+++ b/poptint.c
@@ -92,6 +92,7 @@ strdup_locale_from_utf8 (/*@null@*/ char * istr)
     {
 	char * shift_pin = NULL;
 	size_t db = strlen(istr);
+/*@owned@*/
 	char * dstr = malloc((db + 1) * sizeof(*dstr));
 	char * pin = istr;
 	char * pout = dstr;
diff --git a/poptint.h b/poptint.h
index ddb0510..f270926 100644
--- a/poptint.h
+++ b/poptint.h
@@ -69,10 +69,12 @@ typedef union poptArg_u {
 } poptArg;
 /*@=exporttype =fielduse@*/
 
+/*@-exportvar@*/
 /*@unchecked@*/
 extern unsigned int _poptArgMask;
 /*@unchecked@*/
 extern unsigned int _poptGroupMask;
+/*@=exportvar@*/
 
 #define	poptArgType(_opt)	((_opt)->argInfo & _poptArgMask)
 #define	poptGroup(_opt)		((_opt)->argInfo & _poptGroupMask)
@@ -151,9 +153,9 @@ extern /*@only@*/ iconv_t iconv_open(const char *__tocode, const char *__fromcod
 	/*@*/;
 
 extern size_t iconv(iconv_t __cd, /*@null@*/ char ** __inbuf,
-		    /*@out@*/ size_t * __inbytesleft,
-		    /*@out@*/ char ** __outbuf,
-		    /*@out@*/ size_t * __outbytesleft)
+		    /*@null@*/ /*@out@*/ size_t * __inbytesleft,
+		    /*@null@*/ /*@out@*/ char ** __outbuf,
+		    /*@null@*/ /*@out@*/ size_t * __outbytesleft)
 	/*@modifies __cd,
 		*__inbuf, *__inbytesleft, *__outbuf, *__outbytesleft @*/;
 
diff --git a/system.h b/system.h
index 863526b..51c58f9 100644
--- a/system.h
+++ b/system.h
@@ -32,7 +32,7 @@ extern __const __int32_t *__ctype_toupper;
 #include <stdlib.h>
 #include <string.h>
 
-#ifdef HAVE_UNISTD_H
+#if defined(HAVE_UNISTD_H) && !defined(__LCLINT__)
 #include <unistd.h>
 #endif
 
diff --git a/test1.c b/test1.c
index 379495f..395829d 100644
--- a/test1.c
+++ b/test1.c
@@ -294,8 +294,10 @@ int main(int argc, const char ** argv)
 	while ((arg = *av++) != NULL)
 	    fprintf(stdout, " %s", arg);
     }
+/*@-nullpass@*/
     if (oStr != (char *)-1)
 	fprintf(stdout, " oStr: %s", (oStr ? oStr : "(none)"));
+/*@=nullpass@*/
     if (singleDash)
 	fprintf(stdout, " -");
 
-- 
Gitee


From 39761ed4588c984c4fc2f9e60835cce24cc2f22a Mon Sep 17 00:00:00 2001
From: Jeff Johnson <n3npq@mac.com>
Date: Thu, 18 Dec 2008 19:40:16 +0000
Subject: [PATCH 558/667] - jbj: fix: check/print argv[0] in --help for NULL.

---
 CHANGES    | 1 +
 popthelp.c | 6 ++----
 poptint.c  | 4 +---
 3 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/CHANGES b/CHANGES
index 713873a..2249c9d 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,4 +1,5 @@
 1.14 -> 1.15:
+    - jbj: fix: check/print argv[0] in --help for NULL.
     - jbj: permit type/group bitmasks to be changed (if needed somewhen).
     - jbj: snip out 8 unused bits for argument groups.
     - jbj: fix: eliminate dead code (CID#5).
diff --git a/popthelp.c b/popthelp.c
index c985413..fffabd0 100644
--- a/popthelp.c
+++ b/popthelp.c
@@ -627,14 +627,12 @@ static size_t showHelpIntro(poptContext con, FILE * fp)
 	/*@modifies fp, fileSystem @*/
 {
     size_t len = (size_t)6;
-    const char * fn;
     int xx;
 
     xx = POPT_fprintf(fp, POPT_("Usage:"));
     if (!(con->flags & POPT_CONTEXT_KEEP_FIRST)) {
-/*@-type@*/	/* LCL: wazzup? */
-	fn = con->optionStack->argv[0];
-/*@=type@*/
+	struct optionStackEntry * os = con->optionStack;
+	const char * fn = (os->argv ? os->argv[0] : NULL);
 	if (fn == NULL) return len;
 	if (strchr(fn, '/')) fn = strrchr(fn, '/') + 1;
 	/* XXX POPT_fprintf not needed for argv[0] display. */
diff --git a/poptint.c b/poptint.c
index d5d361d..52ab0ae 100644
--- a/poptint.c
+++ b/poptint.c
@@ -82,9 +82,7 @@ strdup_locale_from_utf8 (/*@null@*/ char * istr)
 	return NULL;
 
 #ifdef HAVE_LANGINFO_H
-/*@-type@*/
-    codeset = nl_langinfo (CODESET);
-/*@=type@*/
+    codeset = nl_langinfo ((nl_item)CODESET);
 #endif
 
     if (codeset != NULL && strcmp(codeset, "UTF-8") != 0
-- 
Gitee


From 8883b2fce2b6c09643493fd65fdd001597bbc273 Mon Sep 17 00:00:00 2001
From: Jeff Johnson <n3npq@mac.com>
Date: Thu, 18 Dec 2008 20:00:48 +0000
Subject: [PATCH 559/667] - jbj: reserve a bit for --[no]opt prefix toggling.

---
 CHANGES | 1 +
 popt.h  | 3 ++-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/CHANGES b/CHANGES
index 2249c9d..54f8a99 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,4 +1,5 @@
 1.14 -> 1.15:
+    - jbj: reserve a bit for --[no]opt prefix toggling.
     - jbj: fix: check/print argv[0] in --help for NULL.
     - jbj: permit type/group bitmasks to be changed (if needed somewhen).
     - jbj: snip out 8 unused bits for argument groups.
diff --git a/popt.h b/popt.h
index e35ee81..1d6163f 100644
--- a/popt.h
+++ b/popt.h
@@ -67,7 +67,8 @@
 					/*!< clear arg bit(s) */
 
 #define	POPT_ARGFLAG_SHOW_DEFAULT 0x00800000U /*!< show default value in --help */
-#define	POPT_ARGFLAG_RANDOM	0x00400000U  /*<! random value in [1,arg] */
+#define	POPT_ARGFLAG_RANDOM	0x00400000U  /*!< random value in [1,arg] */
+#define	POPT_ARGFLAG_TOGGLE	0x00200000U  /*!< permit --[no]opt prefix toggle */
 
 /*@}*/
 
-- 
Gitee


From 1b69eef667d1d6461f6cc85dffe737a7b3558af6 Mon Sep 17 00:00:00 2001
From: Jeff Johnson <n3npq@mac.com>
Date: Fri, 19 Dec 2008 17:01:18 +0000
Subject: [PATCH 560/667] - jbj: rewrite poptReadConfigFile(), styling for
 (i.e. my) readbility.

---
 CHANGES      |  1 +
 poptconfig.c | 94 ++++++++++++++++++++++++----------------------------
 2 files changed, 44 insertions(+), 51 deletions(-)

diff --git a/CHANGES b/CHANGES
index 54f8a99..04fe014 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,4 +1,5 @@
 1.14 -> 1.15:
+    - jbj: rewrite poptReadConfigFile(), styling for (i.e. my) readbility.
     - jbj: reserve a bit for --[no]opt prefix toggling.
     - jbj: fix: check/print argv[0] in --help for NULL.
     - jbj: permit type/group bitmasks to be changed (if needed somewhen).
diff --git a/poptconfig.c b/poptconfig.c
index 4f6de87..0ba30bf 100644
--- a/poptconfig.c
+++ b/poptconfig.c
@@ -113,73 +113,65 @@ static void configLine(poptContext con, char * line)
 
 int poptReadConfigFile(poptContext con, const char * fn)
 {
-    char * file = NULL, * chptr, * end;
-    char * buf = NULL;
-/*@dependent@*/ char * dst;
-    int fd, rc;
-    off_t fileLength;
-
-    fd = open(fn, O_RDONLY);
-    if (fd < 0)
-	return (errno == ENOENT ? 0 : POPT_ERROR_ERRNO);
-
-    fileLength = lseek(fd, 0, SEEK_END);
-    if (fileLength == (off_t)-1 || lseek(fd, 0, 0) == (off_t)-1) {
-	rc = errno;
-	(void) close(fd);
-	errno = rc;
-	return POPT_ERROR_ERRNO;
-    }
-
-    if ((file = malloc((size_t)fileLength + 1)) != NULL)
-	*file = '\0';
-    if (file == NULL
-     || read(fd, (char *)file, (size_t)fileLength) != (ssize_t)fileLength)
+    int fdno;
+    char *b = NULL, *be;
+    off_t nb;
+    const char *se;
+    char *t, *te;
+    int rc = POPT_ERROR_ERRNO;	/* assume failure */
+
+    fdno = open(fn, O_RDONLY);
+    if (fdno < 0)
+	return (errno == ENOENT ? 0 : rc);
+
+    if ((nb = lseek(fdno, 0, SEEK_END)) == (off_t)-1
+     || lseek(fdno, 0, SEEK_SET) == (off_t)-1
+     || (b = malloc((size_t)nb + 1)) == NULL
+     || read(fdno, (char *)b, (size_t)nb) != (ssize_t)nb)
     {
-	rc = errno;
-	(void) close(fd);
-	errno = rc;
-	if (file)
-	    free(file);
-	return POPT_ERROR_ERRNO;
-    }
-    if (close(fd) == -1) {
-	free(file);
-	return POPT_ERROR_ERRNO;
+	int oerrno = errno;
+	(void) close(fdno);
+	errno = oerrno;
+	goto exit;
     }
+    if (close(fdno) == -1)
+	goto exit;
 
-    dst = buf = malloc((size_t)fileLength + 1);
-    if (dst == NULL)
-	return POPT_ERROR_ERRNO;
+    if ((t = malloc((size_t)nb + 1)) == NULL)
+	goto exit;
+    te = t;
 
-    end = (file + fileLength);
-    for (chptr = file; chptr < end; chptr++) {
-	switch (*chptr) {
+    be = (b + nb);
+    for (se = b; se < be; se++) {
+	switch (*se) {
 	  case '\n':
-	    *dst = '\0';
-	    dst = buf;
-	    while (*dst && _isspaceptr(dst)) dst++;
-	    if (*dst && *dst != '#')
-		configLine(con, dst);
+	    *te = '\0';
+	    te = t;
+	    while (*te && _isspaceptr(te)) te++;
+	    if (*te && *te != '#')
+		configLine(con, te);
 	    /*@switchbreak@*/ break;
 	  case '\\':
-	    *dst = *chptr++;
+	    *te = *se++;
 	    /* \ at the end of a line does not insert a \n */
-	    if (chptr < end  && *chptr != '\n') {
-		dst++;
-		*dst++ = *chptr;
+	    if (se < be  && *se != '\n') {
+		te++;
+		*te++ = *se;
 	    }
 	    /*@switchbreak@*/ break;
 	  default:
-	    *dst++ = *chptr;
+	    *te++ = *se;
 	    /*@switchbreak@*/ break;
 	}
     }
 
-    free(file);
-    free(buf);
+    free(t);
+    rc = 0;
 
-    return 0;
+exit:
+    if (b)
+	free(b);
+    return rc;
 }
 
 int poptReadDefaultConfig(poptContext con, /*@unused@*/ UNUSED(int useEnv))
-- 
Gitee


From 3a4eef4b08816109e8c174ef7226b5f436362704 Mon Sep 17 00:00:00 2001
From: Jeff Johnson <n3npq@mac.com>
Date: Fri, 19 Dec 2008 20:43:38 +0000
Subject: [PATCH 561/667] - add
 poptInit/poptFini/poptReadConfigFiles/poptSaneFile routines.

---
 CHANGES      |   1 +
 popt.c       |   2 +
 popt.h       |  67 +++++++++++++++++++++++++-----
 poptconfig.c | 112 +++++++++++++++++++++++++++++++++++++++++++++++++++
 4 files changed, 173 insertions(+), 9 deletions(-)

diff --git a/CHANGES b/CHANGES
index 04fe014..fbc1959 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,4 +1,5 @@
 1.14 -> 1.15:
+    - jbj: add poptInit/poptFini/poptReadConfigFiles/poptSaneFile routines.
     - jbj: rewrite poptReadConfigFile(), styling for (i.e. my) readbility.
     - jbj: reserve a bit for --[no]opt prefix toggling.
     - jbj: fix: check/print argv[0] in --help for NULL.
diff --git a/popt.c b/popt.c
index 06e3070..24b5132 100644
--- a/popt.c
+++ b/popt.c
@@ -1398,6 +1398,8 @@ const char * poptStrerror(const int error)
 	return POPT_("number too large or too small");
       case POPT_ERROR_MALLOC:
 	return POPT_("memory allocation failed");
+      case POPT_ERROR_BADCONFIG:
+	return POPT_("config file failed sanity test");
       case POPT_ERROR_ERRNO:
 	return strerror(errno);
       default:
diff --git a/popt.h b/popt.h
index 1d6163f..c6762f5 100644
--- a/popt.h
+++ b/popt.h
@@ -98,6 +98,7 @@
 #define	POPT_ERROR_BADOPERATION	-19	/*!< mutually exclusive logical operations requested */
 #define	POPT_ERROR_NULLARG	-20	/*!< opt->arg should not be NULL */
 #define	POPT_ERROR_MALLOC	-21	/*!< memory allocation failed */
+#define	POPT_ERROR_BADCONFIG	-22	/*!< config file failed sanity test */
 /*@}*/
 
 /** \ingroup popt
@@ -236,6 +237,15 @@ typedef void (*poptCallbackType) (poptContext con,
 	/*@globals internalState @*/
 	/*@modifies internalState @*/;
 
+/** \ingroup popt
+ * Destroy context.
+ * @param con		context
+ * @return		NULL always
+ */
+/*@null@*/
+poptContext poptFreeContext( /*@only@*/ /*@null@*/ poptContext con)
+	/*@modifies con @*/;
+
 /** \ingroup popt
  * Initialize popt context.
  * @param name		context name (usually argv[0] program name)
@@ -254,6 +264,31 @@ poptContext poptGetContext(
 	/*@globals internalState @*/
 	/*@modifies internalState @*/;
 
+/** \ingroup popt
+ * Destroy context (alternative implementation).
+ * @param con		context
+ * @return		NULL always
+ */
+/*@null@*/
+poptContext poptFini( /*@only@*/ /*@null@*/ poptContext con)
+	/*@modifies con @*/;
+
+/** \ingroup popt
+ * Initialize popt context (alternative implementation).
+ * This routine does poptGetContext() and then poptReadConfigFiles().
+ * @param argc		no. of arguments
+ * @param argv		argument array
+ * @param options	address of popt option table
+ * @param configPaths	colon separated file path(s) to read.
+ * @return		initialized popt context (NULL on error).
+ */
+/*@only@*/ /*@null@*/ /*@unused@*/
+poptContext poptInit(int argc, /*@dependent@*/ /*@keep@*/ const char ** argv,
+		/*@dependent@*/ /*@keep@*/ const struct poptOption * options,
+		/*@null@*/ const char * configPaths)
+	/*@globals fileSystem, internalState @*/
+	/*@modifies fileSystem, internalState @*/;
+
 /** \ingroup popt
  * Reinitialize popt context.
  * @param con		context
@@ -317,15 +352,6 @@ const char ** poptGetArgs(/*@null@*/poptContext con)
 const char * poptBadOption(/*@null@*/poptContext con, unsigned int flags)
 	/*@*/;
 
-/** \ingroup popt
- * Destroy context.
- * @param con		context
- * @return		NULL always
- */
-/*@null@*/
-poptContext poptFreeContext( /*@only@*/ /*@null@*/ poptContext con)
-	/*@modifies con @*/;
-
 /** \ingroup popt
  * Add arguments to context.
  * @param con		context
@@ -370,6 +396,29 @@ int poptReadConfigFile(poptContext con, const char * fn)
 	/*@modifies con->execs, con->numExecs,
 		errno, fileSystem, internalState @*/;
 
+/** \ingroup popt
+ * Perform sanity checks on a file path.
+ * @param fn		file path
+ * @return		0 on OK, 1 on NOTOK.
+ */
+int poptSaneFile(const char * fn)
+	/*@globals errno, internalState @*/
+	/*@modifies errno, internalState @*/;
+
+/** \ingroup popt
+ * Read configuration file(s).
+ * Colon separated files to read, looping over poptReadConfigFile().
+ * Note that an '@' character preceeding a path in the list will
+ * also perform additional sanity checks on the file before reading.
+ * @param con		context
+ * @param paths		colon separated file name(s) to read
+ * @return		0 on success, POPT_ERROR_BADCONFIG on failure
+ */
+int poptReadConfigFiles(poptContext con, /*@null@*/ const char * paths)
+	/*@globals errno, fileSystem, internalState @*/
+	/*@modifies con->execs, con->numExecs,
+		errno, fileSystem, internalState @*/;
+
 /** \ingroup popt
  * Read default configuration from /etc/popt and $HOME/.popt.
  * @param con		context
diff --git a/poptconfig.c b/poptconfig.c
index 0ba30bf..680c2b9 100644
--- a/poptconfig.c
+++ b/poptconfig.c
@@ -151,6 +151,7 @@ int poptReadConfigFile(poptContext con, const char * fn)
 	    if (*te && *te != '#')
 		configLine(con, te);
 	    /*@switchbreak@*/ break;
+/*@-usedef@*/	/* XXX *se may be uninitialized */
 	  case '\\':
 	    *te = *se++;
 	    /* \ at the end of a line does not insert a \n */
@@ -162,6 +163,7 @@ int poptReadConfigFile(poptContext con, const char * fn)
 	  default:
 	    *te++ = *se;
 	    /*@switchbreak@*/ break;
+/*@=usedef@*/
 	}
     }
 
@@ -174,6 +176,90 @@ exit:
     return rc;
 }
 
+int poptSaneFile(const char * fn)
+{
+    struct stat sb;
+    uid_t uid = getuid();
+
+    if (stat(fn, &sb) == -1)
+	return 1;
+    if ((uid_t)sb.st_uid != uid)
+	return 0;
+    if (!S_ISREG(sb.st_mode))
+	return 0;
+/*@-bitwisesigned@*/
+    if (sb.st_mode & (S_IWGRP|S_IWOTH))
+	return 0;
+/*@=bitwisesigned@*/
+    return 1;
+}
+
+int poptReadConfigFiles(poptContext con, const char * paths)
+{
+    char * buf = (paths ? xstrdup(paths) : NULL);
+    const char * p;
+    char * pe;
+    int rc = 0;		/* assume success */
+
+    for (p = buf; p != NULL && *p != '\0'; p = pe) {
+        const char ** av;
+        size_t ac;
+	size_t i;
+	int xx;
+
+        /* locate start of next path element */
+        pe = strchr(p, ':');
+        if (pe != NULL && *pe == ':')
+            *pe++ = '\0';
+        else
+            pe = (char *) (p + strlen(p));
+
+#ifdef	FINISHME
+        /* glob-expand the path element */
+        ac = 0;
+        av = NULL;
+        if ((i = rpmGlob(p, &ac, &av)) != 0)
+            continue;
+#else
+	ac = (size_t)1;
+	if ((av = calloc(ac + 1, sizeof(*av))) != NULL)
+	    av[0] = xstrdup(p);
+#endif
+
+        /* work-off each resulting file from the path element */
+	if (av != NULL)
+        for (i = 0; i < ac; i++) {
+            const char * fn = av[i];
+	    if (av[i] == NULL)	/* XXX can't happen */
+		/*@innercontinue@*/ continue;
+	    /* XXX should '@' attention be pushed into poptReadConfigFile? */
+            if (fn[0] == '@') {	/* attention */
+                fn++;
+                if (!poptSaneFile(fn)) {
+		    rc = POPT_ERROR_BADCONFIG;
+                    /*@innercontinue@*/ continue;
+                }
+            }
+            xx = poptReadConfigFile(con, fn);
+	    if (xx && rc == 0)
+		rc = xx;
+            free((void *)av[i]);
+	    av[i] = NULL;
+        }
+	if (av != NULL) {
+            free(av);
+	    av = NULL;
+	}
+    }
+
+/*@-usedef@*/
+    if (buf)
+	free(buf);
+/*@=usedef@*/
+
+    return rc;
+}
+
 int poptReadDefaultConfig(poptContext con, /*@unused@*/ UNUSED(int useEnv))
 {
     static const char _popt_sysconfdir[] = POPT_SYSCONFDIR "/popt";
@@ -226,3 +312,29 @@ int poptReadDefaultConfig(poptContext con, /*@unused@*/ UNUSED(int useEnv))
 
     return 0;
 }
+
+poptContext
+poptFini(poptContext con)
+{
+    return poptFreeContext(con);
+}
+
+poptContext
+poptInit(int argc, char *const argv[],
+		struct poptOption * options, const char * configPaths)
+{
+    poptContext con = NULL;
+    const char * argv0;
+
+    if (argv == NULL || argv[0] == NULL || options == NULL)
+	return con;
+
+    if ((argv0 = strrchr(argv[0], '/')) != NULL) argv0++;
+    else argv0 = argv[0];
+   
+    con = poptGetContext(argv0, argc, (const char **)argv, options, 0);
+    if (con != NULL&& poptReadConfigFiles(con, configPaths))
+	con = poptFini(con);
+
+    return con;
+}
-- 
Gitee


From a6c1e8e262c347755e58eec2682e55dc2f7d4bc1 Mon Sep 17 00:00:00 2001
From: Jeff Johnson <n3npq@mac.com>
Date: Fri, 19 Dec 2008 20:46:30 +0000
Subject: [PATCH 562/667] - jbj: expose new methods in loader map as well.

---
 libpopt.vers | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/libpopt.vers b/libpopt.vers
index 585ac73..bbafc0d 100644
--- a/libpopt.vers
+++ b/libpopt.vers
@@ -11,6 +11,7 @@ LIBPOPT_0
     poptBadOption;
     poptConfigFileToString;
     poptDupArgv;
+    poptFinit;
     poptFreeContext;
     poptGetArg;
     poptGetArgs;
@@ -20,13 +21,16 @@ LIBPOPT_0
     poptGetOptArg;
     poptHelpOptions;
     poptHelpOptionsI18N;
+    poptInit;
     poptParseArgvString;
     poptPeekArg;
     poptPrintHelp;
     poptPrintUsage;
     poptReadConfigFile;
+    poptReadConfigFiles;
     poptReadDefaultConfig;
     poptResetContext;
+    poptSaneFile;
     poptSaveInt;
     poptSaveLong;
     poptSaveLongLong;
-- 
Gitee


From 64db73908e8ce78e41353524bc24cc0eda7f1697 Mon Sep 17 00:00:00 2001
From: Jeff Johnson <n3npq@mac.com>
Date: Sat, 20 Dec 2008 19:28:39 +0000
Subject: [PATCH 563/667] - stub in glob(3) wrappers for popt. more useful
 poptGlob() API next.

---
 CHANGES      |   1 +
 poptconfig.c | 140 +++++++++++++++++++++++++++++++++++----------------
 2 files changed, 98 insertions(+), 43 deletions(-)

diff --git a/CHANGES b/CHANGES
index fbc1959..de92a9f 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,4 +1,5 @@
 1.14 -> 1.15:
+    - jbj: stub in glob(3) wrappers for popt. more useful poptGlob() API next.
     - jbj: add poptInit/poptFini/poptReadConfigFiles/poptSaneFile routines.
     - jbj: rewrite poptReadConfigFile(), styling for (i.e. my) readbility.
     - jbj: reserve a bit for --[no]opt prefix toggling.
diff --git a/poptconfig.c b/poptconfig.c
index 680c2b9..5daccea 100644
--- a/poptconfig.c
+++ b/poptconfig.c
@@ -20,12 +20,57 @@ extern int glob (const char *__pattern, int __flags,
 		/*@out@*/ glob_t *__pglob)
 	/*@globals errno, fileSystem @*/
 	/*@modifies *__pglob, errno, fileSystem @*/;
-	/* XXX only annotation is a white lie */
+
+/* XXX only annotation is a white lie */
 extern void globfree (/*@only@*/ glob_t *__pglob)
 	/*@modifies *__pglob @*/;
 /*@=declundef =exportheader =incondefs =protoparammatch =redecl =type @*/
 #endif
-#endif
+
+/*@unchecked@*/
+static int poptGlobFlags = 0;
+
+static int poptGlob_pattern_p (const char *pattern, int quote)
+	/*@*/
+{
+    const char * pat = pattern;
+    int rc;
+    /* XXX skip the attention marker. */
+    if (pat[0] == '@' && pat[1] != '(')
+	pat++;
+    rc = glob_pattern_p(pat, quote);
+    return rc;
+}
+
+static int poptGlob_error(/*@unused@*/ UNUSED(const char * epath),
+		/*@unused@*/ UNUSED(int eerrno))
+	/*@*/
+{
+    return 1;
+}
+
+static int poptGlob(const char * pattern, int flags,
+		int errfunc(const char * epath, int eerrno),
+		/*@out@*/ glob_t * pglob)
+	/*@globals fileSystem @*/
+	/*@modifies *pglob, fileSystem @*/
+{
+    const char * pat = pattern;
+    int rc;
+    /* XXX skip the attention marker. */
+    if (pat[0] == '@' && pat[1] != '(')
+	pat++;
+    rc = glob(pat, flags, errfunc, pglob);
+    return rc;
+}
+
+static void poptGlobfree( /*@only@*/ glob_t * pglob)
+	/*@globals fileSystem @*/
+	/*@modifies *pglob, fileSystem @*/
+{
+    globfree(pglob);
+}
+#endif	/* HAVE_GLOB_H */
 
 /*@access poptContext @*/
 
@@ -202,54 +247,63 @@ int poptReadConfigFiles(poptContext con, const char * paths)
     int rc = 0;		/* assume success */
 
     for (p = buf; p != NULL && *p != '\0'; p = pe) {
-        const char ** av;
-        size_t ac;
+	const char ** av = NULL;
+	size_t ac = 0;
 	size_t i;
 	int xx;
 
-        /* locate start of next path element */
-        pe = strchr(p, ':');
-        if (pe != NULL && *pe == ':')
-            *pe++ = '\0';
-        else
-            pe = (char *) (p + strlen(p));
-
-#ifdef	FINISHME
-        /* glob-expand the path element */
-        ac = 0;
-        av = NULL;
-        if ((i = rpmGlob(p, &ac, &av)) != 0)
-            continue;
-#else
-	ac = (size_t)1;
-	if ((av = calloc(ac + 1, sizeof(*av))) != NULL)
-	    av[0] = xstrdup(p);
-#endif
+	/* locate start of next path element */
+	pe = strchr(p, ':');
+	if (pe != NULL && *pe == ':')
+	    *pe++ = '\0';
+	else
+	    pe = (char *) (p + strlen(p));
+
+#if defined(HAVE_GLOB_H)
+	if (poptGlob_pattern_p(p, 0)) {
+	    glob_t _g, *pglob = &_g;
 
-        /* work-off each resulting file from the path element */
-	if (av != NULL)
-        for (i = 0; i < ac; i++) {
-            const char * fn = av[i];
+	    if ((xx = poptGlob(p, poptGlobFlags, poptGlob_error, pglob)) != 0)
+		continue;
+	    for (i = 0; i < pglob->gl_pathc; i++) {
+		char * fn = pglob->gl_pathv[i];
+		/* XXX should '@' attention be pushed into poptReadConfigFile? */
+		if (fn[0] == '@' && fn[1] != '(')
+		    fn++;
+		xx = poptReadConfigFile(con, fn);
+		if (xx && rc == 0)
+		    rc = xx;
+	    }
+	    poptGlobfree(pglob);
+	} else
+#endif
+      {
+	ac = (size_t)1;
+	if ((av = calloc(ac + 1, sizeof(*av))) == NULL)
+	    continue;	/* XXX error return */
+	av[0] = xstrdup(p);
+	/* work-off each resulting file from the path element */
+	for (i = 0; i < ac; i++) {
+	    const char * fn = av[i];
 	    if (av[i] == NULL)	/* XXX can't happen */
 		/*@innercontinue@*/ continue;
 	    /* XXX should '@' attention be pushed into poptReadConfigFile? */
-            if (fn[0] == '@') {	/* attention */
-                fn++;
-                if (!poptSaneFile(fn)) {
+	    if (fn[0] == '@' && fn[1] != '(') {
+		fn++;
+		xx = poptSaneFile(fn);
+		if (!xx && rc == 0)
 		    rc = POPT_ERROR_BADCONFIG;
-                    /*@innercontinue@*/ continue;
-                }
-            }
-            xx = poptReadConfigFile(con, fn);
+		/*@innercontinue@*/ continue;
+	    }
+	    xx = poptReadConfigFile(con, fn);
 	    if (xx && rc == 0)
 		rc = xx;
-            free((void *)av[i]);
+	    free((void *)av[i]);
 	    av[i] = NULL;
-        }
-	if (av != NULL) {
-            free(av);
-	    av = NULL;
 	}
+	free(av);
+	av = NULL;
+      }
     }
 
 /*@-usedef@*/
@@ -280,9 +334,9 @@ int poptReadDefaultConfig(poptContext con, /*@unused@*/ UNUSED(int useEnv))
 
 #if defined(HAVE_GLOB_H)
     if (!stat("/etc/popt.d", &s) && S_ISDIR(s.st_mode)) {
-        glob_t _g, *pglob = &_g;
-	if (!glob("/etc/popt.d/*", 0, NULL, pglob)) {
-            size_t i;
+	glob_t _g, *pglob = &_g;
+	if (!glob("/etc/popt.d/*", poptGlobFlags, poptGlob_error, pglob)) {
+	    size_t i;
 	    for (i = 0; i < pglob->gl_pathc; i++) {
 		char * f = pglob->gl_pathv[i];
 		if (f == NULL || strstr(f, ".rpmnew") || strstr(f, ".rpmsave"))
@@ -320,8 +374,8 @@ poptFini(poptContext con)
 }
 
 poptContext
-poptInit(int argc, char *const argv[],
-		struct poptOption * options, const char * configPaths)
+poptInit(int argc, const char ** argv,
+		const struct poptOption * options, const char * configPaths)
 {
     poptContext con = NULL;
     const char * argv0;
-- 
Gitee


From c22ccfd2aea3a4101d95f8dd550781957963c3e4 Mon Sep 17 00:00:00 2001
From: Jeff Johnson <n3npq@mac.com>
Date: Sat, 20 Dec 2008 21:44:56 +0000
Subject: [PATCH 564/667] - jbj: rework the glob wrappers into something more
 useful. portability todo++.

---
 CHANGES      |   1 +
 poptconfig.c | 158 ++++++++++++++++++++++++++-------------------------
 2 files changed, 83 insertions(+), 76 deletions(-)

diff --git a/CHANGES b/CHANGES
index de92a9f..44e4ae2 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,4 +1,5 @@
 1.14 -> 1.15:
+    - jbj: rework the glob wrappers into something more useful. portability todo++.
     - jbj: stub in glob(3) wrappers for popt. more useful poptGlob() API next.
     - jbj: add poptInit/poptFini/poptReadConfigFiles/poptSaneFile routines.
     - jbj: rewrite poptReadConfigFile(), styling for (i.e. my) readbility.
diff --git a/poptconfig.c b/poptconfig.c
index 5daccea..c999b7e 100644
--- a/poptconfig.c
+++ b/poptconfig.c
@@ -24,53 +24,74 @@ extern int glob (const char *__pattern, int __flags,
 /* XXX only annotation is a white lie */
 extern void globfree (/*@only@*/ glob_t *__pglob)
 	/*@modifies *__pglob @*/;
+
+/* XXX _GNU_SOURCE ifdef and/or retrofit is needed for portability. */
+extern int glob_pattern_p (const char *__pattern, int __quote)
+        /*@*/;
 /*@=declundef =exportheader =incondefs =protoparammatch =redecl =type @*/
 #endif
 
 /*@unchecked@*/
 static int poptGlobFlags = 0;
 
-static int poptGlob_pattern_p (const char *pattern, int quote)
-	/*@*/
-{
-    const char * pat = pattern;
-    int rc;
-    /* XXX skip the attention marker. */
-    if (pat[0] == '@' && pat[1] != '(')
-	pat++;
-    rc = glob_pattern_p(pat, quote);
-    return rc;
-}
-
 static int poptGlob_error(/*@unused@*/ UNUSED(const char * epath),
 		/*@unused@*/ UNUSED(int eerrno))
 	/*@*/
 {
     return 1;
 }
+#endif	/* HAVE_GLOB_H */
 
-static int poptGlob(const char * pattern, int flags,
-		int errfunc(const char * epath, int eerrno),
-		/*@out@*/ glob_t * pglob)
-	/*@globals fileSystem @*/
-	/*@modifies *pglob, fileSystem @*/
+/**
+ * Return path(s) from a glob pattern.
+ * @param con		context
+ * @param pattern	glob pattern
+ * @retval *acp		no. of paths
+ * @retval *avp		array of paths
+ * @return		0 on success
+ */
+static int poptGlob(/*@unused@*/ UNUSED(poptContext con), const char * pattern,
+		/*@out@*/ int * acp, /*@out@*/ const char *** avp)
+	/*@modifies *acp, *avp @*/
 {
     const char * pat = pattern;
-    int rc;
+    int rc = 0;		/* assume success */
+
     /* XXX skip the attention marker. */
     if (pat[0] == '@' && pat[1] != '(')
 	pat++;
-    rc = glob(pat, flags, errfunc, pglob);
-    return rc;
-}
 
-static void poptGlobfree( /*@only@*/ glob_t * pglob)
-	/*@globals fileSystem @*/
-	/*@modifies *pglob, fileSystem @*/
-{
-    globfree(pglob);
-}
+#if defined(HAVE_GLOB_H)
+    if (glob_pattern_p(pat, 0)) {
+	glob_t _g, *pglob = &_g;
+
+	if (!glob(pat, poptGlobFlags, poptGlob_error, pglob)) {
+	    if (acp) {
+		*acp = (int) pglob->gl_pathc;
+		pglob->gl_pathc = 0;
+	    }
+	    if (avp) {
+/*@-onlytrans@*/
+		*avp = (const char **) pglob->gl_pathv;
+/*@=onlytrans@*/
+		pglob->gl_pathv = NULL;
+	    }
+/*@-nullstate@*/
+	    globfree(pglob);
+/*@=nullstate@*/
+	} else
+	    rc = POPT_ERROR_ERRNO;
+    } else
 #endif	/* HAVE_GLOB_H */
+    {
+	if (acp)
+	    *acp = 1;
+	if (avp && (*avp = calloc((size_t)(1 + 1), sizeof (**avp))) != NULL)
+	    (*avp)[0] = xstrdup(pat);
+    }
+
+    return rc;
+}
 
 /*@access poptContext @*/
 
@@ -248,8 +269,8 @@ int poptReadConfigFiles(poptContext con, const char * paths)
 
     for (p = buf; p != NULL && *p != '\0'; p = pe) {
 	const char ** av = NULL;
-	size_t ac = 0;
-	size_t i;
+	int ac = 0;
+	int i;
 	int xx;
 
 	/* locate start of next path element */
@@ -259,37 +280,17 @@ int poptReadConfigFiles(poptContext con, const char * paths)
 	else
 	    pe = (char *) (p + strlen(p));
 
-#if defined(HAVE_GLOB_H)
-	if (poptGlob_pattern_p(p, 0)) {
-	    glob_t _g, *pglob = &_g;
-
-	    if ((xx = poptGlob(p, poptGlobFlags, poptGlob_error, pglob)) != 0)
-		continue;
-	    for (i = 0; i < pglob->gl_pathc; i++) {
-		char * fn = pglob->gl_pathv[i];
-		/* XXX should '@' attention be pushed into poptReadConfigFile? */
-		if (fn[0] == '@' && fn[1] != '(')
-		    fn++;
-		xx = poptReadConfigFile(con, fn);
-		if (xx && rc == 0)
-		    rc = xx;
-	    }
-	    poptGlobfree(pglob);
-	} else
-#endif
-      {
-	ac = (size_t)1;
-	if ((av = calloc(ac + 1, sizeof(*av))) == NULL)
-	    continue;	/* XXX error return */
-	av[0] = xstrdup(p);
+	xx = poptGlob(con, p, &ac, &av);
+
 	/* work-off each resulting file from the path element */
 	for (i = 0; i < ac; i++) {
 	    const char * fn = av[i];
 	    if (av[i] == NULL)	/* XXX can't happen */
 		/*@innercontinue@*/ continue;
 	    /* XXX should '@' attention be pushed into poptReadConfigFile? */
-	    if (fn[0] == '@' && fn[1] != '(') {
-		fn++;
+	    if (p[0] == '@' && p[1] != '(') {
+		if (fn[0] == '@' && fn[1] != '(')
+		    fn++;
 		xx = poptSaneFile(fn);
 		if (!xx && rc == 0)
 		    rc = POPT_ERROR_BADCONFIG;
@@ -303,7 +304,6 @@ int poptReadConfigFiles(poptContext con, const char * paths)
 	}
 	free(av);
 	av = NULL;
-      }
     }
 
 /*@-usedef@*/
@@ -318,53 +318,59 @@ int poptReadDefaultConfig(poptContext con, /*@unused@*/ UNUSED(int useEnv))
 {
     static const char _popt_sysconfdir[] = POPT_SYSCONFDIR "/popt";
     static const char _popt_etc[] = "/etc/popt";
-    char * fn, * home;
-    struct stat s;
-    int rc;
+    char * home;
+    struct stat sb;
+    int rc = 0;		/* assume success */
 
-    if (con->appName == NULL) return 0;
+    if (con->appName == NULL) goto exit;
 
     if (strcmp(_popt_sysconfdir, _popt_etc)) {
 	rc = poptReadConfigFile(con, _popt_sysconfdir);
-	if (rc) return rc;
+	if (rc) goto exit;
     }
 
     rc = poptReadConfigFile(con, _popt_etc);
-    if (rc) return rc;
+    if (rc) goto exit;
 
 #if defined(HAVE_GLOB_H)
-    if (!stat("/etc/popt.d", &s) && S_ISDIR(s.st_mode)) {
-	glob_t _g, *pglob = &_g;
-	if (!glob("/etc/popt.d/*", poptGlobFlags, poptGlob_error, pglob)) {
-	    size_t i;
-	    for (i = 0; i < pglob->gl_pathc; i++) {
-		char * f = pglob->gl_pathv[i];
-		if (f == NULL || strstr(f, ".rpmnew") || strstr(f, ".rpmsave"))
+    if (!stat("/etc/popt.d", &sb) && S_ISDIR(sb.st_mode)) {
+	const char ** av = NULL;
+	int ac = 0;
+	int i;
+
+	if ((rc = poptGlob(con, "/etc/popt.d/*", &ac, &av)) == 0) {
+	    for (i = 0; rc == 0 && i < ac; i++) {
+		const char * fn = av[i];
+		if (fn == NULL || strstr(fn, ".rpmnew") || strstr(fn, ".rpmsave"))
 		    continue;
-		if (!stat(f, &s)) {
-		    if (!S_ISREG(s.st_mode) && !S_ISLNK(s.st_mode))
+		if (!stat(fn, &sb)) {
+		    if (!S_ISREG(sb.st_mode) && !S_ISLNK(sb.st_mode))
 			continue;
 		}
-		rc = poptReadConfigFile(con, f);
-		if (rc) return rc;
+		rc = poptReadConfigFile(con, fn);
+		free((void *)av[i]);
+		av[i] = NULL;
 	    }
-	    globfree(pglob);
+	    free(av);
+	    av = NULL;
 	}
     }
+    if (rc) goto exit;
 #endif
 
     if ((home = getenv("HOME"))) {
-	fn = malloc(strlen(home) + 20);
+	char * fn = malloc(strlen(home) + 20);
 	if (fn != NULL) {
 	    (void) stpcpy(stpcpy(fn, home), "/.popt");
 	    rc = poptReadConfigFile(con, fn);
 	    free(fn);
 	} else
 	    rc = POPT_ERROR_ERRNO;
-	if (rc) return rc;
+	if (rc) goto exit;
     }
 
-    return 0;
+exit:
+    return rc;
 }
 
 poptContext
-- 
Gitee


From ac163def55804651bac11d2e3f1da94cedef7137 Mon Sep 17 00:00:00 2001
From: Jeff Johnson <n3npq@mac.com>
Date: Wed, 21 Jan 2009 19:51:00 +0000
Subject: [PATCH 565/667] - add poptArgInfo() to get argInfo, implementing
 POPT_ARGFLAG_TOGGLE. - add longOptionStrcmp() to match w POPT_ARGFLAG_TOGGLE.
 - change singleDash arg to a bit enum, use LF_ISSET(ONEDASH) instead.

---
 CHANGES |   3 ++
 popt.c  | 124 ++++++++++++++++++++++++++++++++++++++++++--------------
 2 files changed, 97 insertions(+), 30 deletions(-)

diff --git a/CHANGES b/CHANGES
index 44e4ae2..a1aef2d 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,4 +1,7 @@
 1.14 -> 1.15:
+    - jbj: add poptArgInfo() to get argInfo, implementing POPT_ARGFLAG_TOGGLE.
+    - jbj: add longOptionStrcmp() to match w POPT_ARGFLAG_TOGGLE.
+    - jbj: change singleDash arg to a bit enum, use LF_ISSET(ONEDASH) instead.
     - jbj: rework the glob wrappers into something more useful. portability todo++.
     - jbj: stub in glob(3) wrappers for popt. more useful poptGlob() API next.
     - jbj: add poptInit/poptFini/poptReadConfigFiles/poptSaneFile routines.
diff --git a/popt.c b/popt.c
index 24b5132..8e2523c 100644
--- a/popt.c
+++ b/popt.c
@@ -310,6 +310,42 @@ static int handleExec(/*@special@*/ poptContext con,
     return 1;
 }
 
+/**
+ * Compare long option for equality, adjusting for POPT_ARGFLAG_TOGGLE.
+ * @param opt           option
+ * @param longName	arg option
+ * @param longNameLen	arg option length
+ * @return		does long option match?
+ */
+static int
+longOptionStrcmp(const struct poptOption * opt,
+		/*@null@*/ const char * longName, size_t longNameLen)
+	/*@*/
+{
+    const char * optLongName = opt->longName;
+    int rc;
+
+    if (F_ISSET(opt, TOGGLE)) {
+	if (optLongName[0] == 'n' && optLongName[1] == 'o') {
+	    optLongName += sizeof("no") - 1;
+	    if (optLongName[0] == '-')
+		optLongName++;
+	}
+	if (longName[0] == 'n' && longName[1] == 'o') {
+	    longName += sizeof("no") - 1;
+	    longNameLen -= sizeof("no") - 1;
+	    if (longName[0] == '-') {
+		longName++;
+		longNameLen--;
+	    }
+	}
+    }
+    rc = (strlen(optLongName) == longNameLen);
+    if (rc)
+	rc = !strncmp(optLongName, longName, longNameLen);
+    return rc;
+}
+
 /* Only one of longName, shortName may be set at a time */
 static int handleAlias(/*@special@*/ poptContext con,
 		/*@null@*/ const char * longName, size_t longNameLen,
@@ -325,8 +361,7 @@ static int handleAlias(/*@special@*/ poptContext con,
 
     if (item) {
 	if (longName && item->option.longName != NULL
-	 && longNameLen == strlen(item->option.longName)
-	 && !strncmp(longName, item->option.longName, longNameLen))
+	 && longOptionStrcmp(&item->option, longName, longNameLen))
 	    return 0;
 	else
 	if (shortName && shortName == item->option.shortName)
@@ -341,9 +376,7 @@ static int handleAlias(/*@special@*/ poptContext con,
 	if (longName) {
 	    if (item->option.longName == NULL)
 		continue;
-	    if (longNameLen != strlen(item->option.longName))
-		continue;
-	    if (strncmp(longName, item->option.longName, longNameLen))
+	    if (!longOptionStrcmp(&item->option, longName, longNameLen))
 		continue;
 	} else if (shortName != item->option.shortName)
 	    continue;
@@ -545,14 +578,14 @@ findOption(const struct poptOption * opt,
 		char shortName,
 		/*@null@*/ /*@out@*/ poptCallbackType * callback,
 		/*@null@*/ /*@out@*/ const void ** callbackData,
-		int singleDash)
+		unsigned int argInfo)
 	/*@modifies *callback, *callbackData */
 {
     const struct poptOption * cb = NULL;
     poptArg cbarg = { .ptr = NULL };
 
     /* This happens when a single - is given */
-    if (singleDash && !shortName && (longName && *longName == '\0'))
+    if (LF_ISSET(ONEDASH) && !shortName && (longName && *longName == '\0'))
 	shortName = '-';
 
     for (; opt->longName || opt->shortName || opt->arg; opt++) {
@@ -565,7 +598,7 @@ findOption(const struct poptOption * opt,
 	    /* Recurse on included sub-tables. */
 	    if (arg.ptr == NULL) continue;	/* XXX program error */
 	    opt2 = findOption(arg.opt, longName, longNameLen, shortName, callback,
-			      callbackData, singleDash);
+			      callbackData, argInfo);
 	    if (opt2 == NULL) continue;
 	    /* Sub-table data will be inheirited if no data yet. */
 	    if (!(callback && *callback)) return opt2;
@@ -578,8 +611,8 @@ findOption(const struct poptOption * opt,
 	    cb = opt;
 	    cbarg.ptr = opt->arg;
 	} else if (longName != NULL && opt->longName != NULL &&
-		   (!singleDash || F_ISSET(opt, ONEDASH)) &&
-		   (!strncmp(longName, opt->longName, longNameLen) && strlen(opt->longName) == longNameLen))
+		   (!LF_ISSET(ONEDASH) || F_ISSET(opt, ONEDASH)) &&
+		   longOptionStrcmp(opt, longName, longNameLen))
 	{
 	    break;
 	} else if (shortName && shortName == opt->shortName) {
@@ -860,6 +893,34 @@ int poptSaveInt(/*@null@*/ int * arg, unsigned int argInfo, long aLong)
     return 0;
 }
 
+/**
+ * Return argInfo field, handling POPT_ARGFLAG_TOGGLE overrides.
+ * @param con		context
+ * @param opt           option
+ * @return		argInfo
+ */
+static unsigned int poptArgInfo(poptContext con, const struct poptOption * opt)
+	/*@*/
+{
+    unsigned int argInfo = opt->argInfo;
+    if (LF_ISSET(TOGGLE)) {
+	const char * longName = con->os->argv[con->os->next-1];
+	while (*longName == '-') longName++;
+	if (longName[0] != opt->longName[0] || longName[1] != opt->longName[1])
+	{
+	    if (LF_ISSET(XOR))	/* XXX don't toggle with XOR */
+'		;
+	    else {
+		/* Toggle POPT_BIT_SET <=> POPT_BIT_CLR. */
+		if (LF_ISSET(LOGICALOPS))
+		    argInfo ^= (POPT_ARGFLAG_OR|POPT_ARGFLAG_AND);
+		argInfo ^= POPT_ARGFLAG_NOT;
+	    }
+	}
+    }
+    return argInfo;
+}
+
 /**
  * Save the option argument through the (*opt->arg) pointer.
  * @param con		context
@@ -890,6 +951,7 @@ static int poptSaveArg(poptContext con, const struct poptOption * opt)
     case POPT_ARG_LONGLONG:
     {   long long aNUM = 0;
 	char *end = NULL;
+	unsigned int argInfo = poptArgInfo(con, opt);
 
 	if (con->os->nextArg) {
 	    aNUM = strtoll(con->os->nextArg, &end, 0);
@@ -906,19 +968,19 @@ static int poptSaveArg(poptContext con, const struct poptOption * opt)
 	if (poptArgType(opt) == POPT_ARG_LONGLONG) {
 	    if (aNUM == LLONG_MAX || aNUM == LLONG_MIN)
 		return POPT_ERROR_OVERFLOW;
-	    if (poptSaveLongLong(arg.longlongp, opt->argInfo, aNUM))
+	    if (poptSaveLongLong(arg.longlongp, argInfo, aNUM))
 		return POPT_ERROR_BADOPERATION;
 	} else
 	if (poptArgType(opt) == POPT_ARG_LONG) {
 	    if (aNUM > (long long)LONG_MAX || aNUM < (long long)LONG_MIN)
 		return POPT_ERROR_OVERFLOW;
-	    if (poptSaveLong(arg.longp, opt->argInfo, (long)aNUM))
+	    if (poptSaveLong(arg.longp, argInfo, (long)aNUM))
 		return POPT_ERROR_BADOPERATION;
 	} else
 	if (poptArgType(opt) == POPT_ARG_INT) {
 	    if (aNUM > (long long)INT_MAX || aNUM < (long long)INT_MIN)
 		return POPT_ERROR_OVERFLOW;
-	    if (poptSaveInt(arg.intp, opt->argInfo, (long)aNUM))
+	    if (poptSaveInt(arg.intp, argInfo, (long)aNUM))
 		return POPT_ERROR_BADOPERATION;
 	} else
 	    return POPT_ERROR_BADOPERATION;
@@ -1048,13 +1110,13 @@ int poptGetNextOpt(poptContext con)
 		continue;
 	    } else {
 		const char *oe;
-		int singleDash;
+		unsigned int argInfo = 0;
 
 		optString++;
 		if (*optString == '-')
-		    singleDash = 0, optString++;
+		    optString++;
 		else
-		    singleDash = 1;
+		    argInfo |= POPT_ARGFLAG_ONEDASH;
 
 		/* Check for "--long=arg" option. */
 		for (oe = optString; *oe && *oe != '='; oe++)
@@ -1073,8 +1135,8 @@ int poptGetNextOpt(poptContext con)
 		    continue;
 
 		opt = findOption(con->options, optString, optStringLen, '\0', &cb, &cbData,
-				 singleDash);
-		if (!opt && !singleDash)
+				 argInfo);
+		if (!opt && !LF_ISSET(ONEDASH))
 		    return POPT_ERROR_BADOPT;
 	    }
 
@@ -1093,39 +1155,41 @@ int poptGetNextOpt(poptContext con)
 
 	/* Process next short option */
 	if (con->os->nextCharArg) {
-	    origOptString = con->os->nextCharArg;
+	    const char * nextCharArg = con->os->nextCharArg;
 
 	    con->os->nextCharArg = NULL;
 
-	    if (handleAlias(con, NULL, 0, *origOptString, origOptString + 1))
+	    if (handleAlias(con, NULL, 0, *nextCharArg, nextCharArg + 1))
 		continue;
 
-	    if (handleExec(con, NULL, *origOptString)) {
+	    if (handleExec(con, NULL, *nextCharArg)) {
 		/* Restore rest of short options for further processing */
-		origOptString++;
-		if (*origOptString != '\0')
-		    con->os->nextCharArg = origOptString;
+		nextCharArg++;
+		if (*nextCharArg != '\0')
+		    con->os->nextCharArg = nextCharArg;
 		continue;
 	    }
 
-	    opt = findOption(con->options, NULL, 0, *origOptString, &cb,
+	    opt = findOption(con->options, NULL, 0, *nextCharArg, &cb,
 			     &cbData, 0);
 	    if (!opt)
 		return POPT_ERROR_BADOPT;
 	    shorty = 1;
 
-	    origOptString++;
-	    if (*origOptString != '\0')
-		con->os->nextCharArg = origOptString + (int)(*origOptString == '=');
+	    nextCharArg++;
+	    if (*nextCharArg != '\0')
+		con->os->nextCharArg = nextCharArg + (int)(*nextCharArg == '=');
 	}
 
 	if (opt == NULL) return POPT_ERROR_BADOPT;	/* XXX can't happen */
 	if (opt->arg && poptArgType(opt) == POPT_ARG_NONE) {
-	    if (poptSaveInt((int *)opt->arg, opt->argInfo, 1L))
+	    unsigned int argInfo = poptArgInfo(con, opt);
+	    if (poptSaveInt((int *)opt->arg, argInfo, 1L))
 		return POPT_ERROR_BADOPERATION;
 	} else if (poptArgType(opt) == POPT_ARG_VAL) {
 	    if (opt->arg) {
-		if (poptSaveInt((int *)opt->arg, opt->argInfo, (long)opt->val))
+		unsigned int argInfo = poptArgInfo(con, opt);
+		if (poptSaveInt((int *)opt->arg, argInfo, (long)opt->val))
 		    return POPT_ERROR_BADOPERATION;
 	    }
 	} else if (poptArgType(opt) != POPT_ARG_NONE) {
-- 
Gitee


From 4528b057cf949b214012eead4cb1752699a76b51 Mon Sep 17 00:00:00 2001
From: Jeff Johnson <n3npq@mac.com>
Date: Wed, 21 Jan 2009 20:14:26 +0000
Subject: [PATCH 566/667] - jbj: fix typo, display toggled long options as
 "--[no]foo" with --help.

---
 popt.c     | 4 ++--
 popthelp.c | 4 +++-
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/popt.c b/popt.c
index 8e2523c..427d46d 100644
--- a/popt.c
+++ b/popt.c
@@ -908,8 +908,8 @@ static unsigned int poptArgInfo(poptContext con, const struct poptOption * opt)
 	while (*longName == '-') longName++;
 	if (longName[0] != opt->longName[0] || longName[1] != opt->longName[1])
 	{
-	    if (LF_ISSET(XOR))	/* XXX don't toggle with XOR */
-'		;
+	    if (LF_ISSET(XOR))	/* XXX dont toggle with XOR */
+		;
 	    else {
 		/* Toggle POPT_BIT_SET <=> POPT_BIT_CLR. */
 		if (LF_ISSET(LOGICALOPS))
diff --git a/popthelp.c b/popthelp.c
index fffabd0..fe73b6d 100644
--- a/popthelp.c
+++ b/popthelp.c
@@ -322,6 +322,7 @@ static void singleOptionHelp(FILE * fp, columns_t columns,
 
     /* Make sure there's more than enough room in target buffer. */
     if (opt->longName)	nb += strlen(opt->longName);
+    if (F_ISSET(opt, TOGGLE)) nb += sizeof("[no]") - 1;
     if (argDescrip)	nb += strlen(argDescrip);
 
     left = malloc(nb);
@@ -345,7 +346,8 @@ static void singleOptionHelp(FILE * fp, columns_t columns,
 	/* XXX --long always padded for alignment with/without "-X, ". */
 	char *dash = poptArgType(opt) == POPT_ARG_MAINCALL ? ""
 		   : (F_ISSET(opt, ONEDASH) ? "-" : "--");
-	(void) stpcpy(stpcpy(stpcpy(left, "    "), dash), opt->longName);
+	char *toggle = (F_ISSET(opt, TOGGLE) ? "[no]" : "");
+	(void) stpcpy(stpcpy(stpcpy(stpcpy(left, "    "), dash), toggle), opt->longName);
     }
 #undef	prtlong
 
-- 
Gitee


From 6f2b6d0bcc624d7b18b7a98425875220ab8cdf07 Mon Sep 17 00:00:00 2001
From: Jeff Johnson <n3npq@mac.com>
Date: Wed, 21 Jan 2009 22:29:10 +0000
Subject: [PATCH 567/667] - avoid displaying --[no]nofoo with
 POPT_ARGFLAG_TOGGLE.

---
 CHANGES    |  1 +
 popt.c     |  1 +
 popthelp.c | 14 ++++++++++++--
 3 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/CHANGES b/CHANGES
index a1aef2d..435c02d 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,4 +1,5 @@
 1.14 -> 1.15:
+    - jbj: avoid displaying --[no]nofoo with POPT_ARGFLAG_TOGGLE.
     - jbj: add poptArgInfo() to get argInfo, implementing POPT_ARGFLAG_TOGGLE.
     - jbj: add longOptionStrcmp() to match w POPT_ARGFLAG_TOGGLE.
     - jbj: change singleDash arg to a bit enum, use LF_ISSET(ONEDASH) instead.
diff --git a/popt.c b/popt.c
index 427d46d..acd21b9 100644
--- a/popt.c
+++ b/popt.c
@@ -906,6 +906,7 @@ static unsigned int poptArgInfo(poptContext con, const struct poptOption * opt)
     if (LF_ISSET(TOGGLE)) {
 	const char * longName = con->os->argv[con->os->next-1];
 	while (*longName == '-') longName++;
+	/* XXX almost good enough but consider --[no]nofoo corner cases. */
 	if (longName[0] != opt->longName[0] || longName[1] != opt->longName[1])
 	{
 	    if (LF_ISSET(XOR))	/* XXX dont toggle with XOR */
diff --git a/popthelp.c b/popthelp.c
index fe73b6d..d267f6c 100644
--- a/popthelp.c
+++ b/popthelp.c
@@ -346,8 +346,18 @@ static void singleOptionHelp(FILE * fp, columns_t columns,
 	/* XXX --long always padded for alignment with/without "-X, ". */
 	char *dash = poptArgType(opt) == POPT_ARG_MAINCALL ? ""
 		   : (F_ISSET(opt, ONEDASH) ? "-" : "--");
-	char *toggle = (F_ISSET(opt, TOGGLE) ? "[no]" : "");
-	(void) stpcpy(stpcpy(stpcpy(stpcpy(left, "    "), dash), toggle), opt->longName);
+	const char *longName = opt->longName;
+	const char *toggle;
+	if (F_ISSET(opt, TOGGLE)) {
+	    toggle = "[no]";
+	    if (longName[0] == 'n' && longName[1] == 'o') {
+		longName += sizeof("no") - 1;
+		if (longName[0] == '-')
+		    longName++;
+	    }
+	} else
+	    toggle = "";
+	(void) stpcpy(stpcpy(stpcpy(stpcpy(left, "    "), dash), toggle), longName);
     }
 #undef	prtlong
 
-- 
Gitee


From bd72098084c30587ed9474f0b6494556aad04767 Mon Sep 17 00:00:00 2001
From: Jeff Johnson <n3npq@mac.com>
Date: Fri, 23 Jan 2009 17:41:56 +0000
Subject: [PATCH 568/667] - add test cases for bit operations and toggles.

---
 CHANGES   |  1 +
 test1.c   | 16 +++++++++-------
 testit.sh | 17 ++++++++++++-----
 3 files changed, 22 insertions(+), 12 deletions(-)

diff --git a/CHANGES b/CHANGES
index 435c02d..be378bb 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,4 +1,5 @@
 1.14 -> 1.15:
+    - jbj: add test cases for bit operations and toggles.
     - jbj: avoid displaying --[no]nofoo with POPT_ARGFLAG_TOGGLE.
     - jbj: add poptArgInfo() to get argInfo, implementing POPT_ARGFLAG_TOGGLE.
     - jbj: add longOptionStrcmp() to match w POPT_ARGFLAG_TOGGLE.
diff --git a/test1.c b/test1.c
index 395829d..3265f4b 100644
--- a/test1.c
+++ b/test1.c
@@ -33,9 +33,9 @@ static int aVal = 141421;
 /*@unchecked@*/
 static int bVal = 141421;
 /*@unchecked@*/
-static int aFlag = 0;
+static int aFlag = 0x8ace;
 /*@unchecked@*/
-static int bFlag = 0;
+static int bFlag = 0x8ace;
 
 /*@unchecked@*/
 static int aInt = 271828;
@@ -145,10 +145,12 @@ static struct poptOption options[] = {
    { "argv", '\0', POPT_ARG_ARGV, &aArgv, 0,
 	"POPT_ARG_ARGV: append arg to array (can be used multiple times)",NULL},
 
-  { "bitset", '\0', POPT_BIT_SET | POPT_ARGFLAG_SHOW_DEFAULT, &aFlag, 0x4321,
-	"POPT_BIT_SET: |= 0x4321", 0},
-  { "bitclr", '\0', POPT_BIT_CLR | POPT_ARGFLAG_SHOW_DEFAULT, &aFlag, 0x1234,
-	"POPT_BIT_CLR: &= ~0x1234", 0},
+  { "bitset", '\0', POPT_BIT_SET | POPT_ARGFLAG_TOGGLE | POPT_ARGFLAG_SHOW_DEFAULT, &aFlag, 0x7777,
+	"POPT_BIT_SET: |= 0x7777", 0},
+  { "bitclr", '\0', POPT_BIT_CLR | POPT_ARGFLAG_TOGGLE | POPT_ARGFLAG_SHOW_DEFAULT, &aFlag, 0xf842,
+	"POPT_BIT_CLR: &= ~0xf842", 0},
+  { "bitxor", '\0', POPT_ARG_VAL | POPT_ARGFLAG_XOR | POPT_ARGFLAG_SHOW_DEFAULT, &aFlag, (0x8ace^0xfeed),
+	"POPT_ARGFLAG_XOR: ^= (0x8ace^0xfeed)", 0},
 
   { "nstr", '\0', POPT_ARG_STRING | POPT_ARGFLAG_SHOW_DEFAULT, &nStr, 0,
 	"POPT_ARG_STRING: (null)", NULL},
@@ -274,7 +276,7 @@ int main(int argc, const char ** argv)
     if (aVal != bVal)
 	fprintf(stdout, " aVal: %d", aVal);
     if (aFlag != bFlag)
-	fprintf(stdout, " aFlag: %d", aFlag);
+	fprintf(stdout, " aFlag: 0x%x", aFlag);
     if (aInt != bInt)
 	fprintf(stdout, " aInt: %d", aInt);
     if (aLong != bLong)
diff --git a/testit.sh b/testit.sh
index b788edb..0a0ba09 100755
--- a/testit.sh
+++ b/testit.sh
@@ -104,16 +104,22 @@ run test1 "test1 - 47" "arg1: 0 arg2: (none) aArgv: A B rest: C" --argv A --argv
 run test1 "test1 - 48" "arg1: 0 arg2: foo=bar" -2foo=bar
 run test1 "test1 - 49" "arg1: 0 arg2: foo=bar" -2=foo=bar
 
-run test1 "test1 - 50" "\
+run test1 "test1 - 50" "arg1: 0 arg2: (none) aFlag: 0xfeed" --bitxor
+run test1 "test1 - 51" "arg1: 0 arg2: (none) aFlag: 0xffff" --bitset
+run test1 "test1 - 52" "arg1: 0 arg2: (none) aFlag: 0x28c" --bitclr
+run test1 "test1 - 53" "arg1: 0 arg2: (none) aFlag: 0x8888" --nobitset
+run test1 "test1 - 54" "arg1: 0 arg2: (none) aFlag: 0xface" --nobitclr
+
+run test1 "test1 - 55" "\
 Usage: lt-test1 [-I?] [-c|--cb2=STRING] [--arg1] [-2|--arg2=ARG]
         [-3|--arg3=ANARG] [-onedash] [--optional=STRING] [--val]
         [-i|--int=INT] [-l|--long=LONG] [-L|--longlong=LONGLONG]
         [-f|--float=FLOAT] [-d|--double=DOUBLE] [--randint=INT]
         [--randlong=LONG] [--randlonglong=LONGLONG] [--argv] [--bitset]
-        [--bitclr] [--nstr=STRING] [--lstr=STRING] [-I|--inc]
+        [--bitclr] [--bitxor] [--nstr=STRING] [--lstr=STRING] [-I|--inc]
         [-c|--cb=STRING] [--longopt] [-?|--help] [--usage] [--simple=ARG]" --usage
 
-run test1 "test1 - 51" "\
+run test1 "test1 - 56" "\
 Usage: lt-test1 [OPTION...]
       --arg1                      First argument with a really long
                                   description. After all, we have to test
@@ -135,8 +141,9 @@ Usage: lt-test1 [OPTION...]
       --randlonglong=LONGLONG     POPT_ARGFLAG_RANDOM: experimental
       --argv                      POPT_ARG_ARGV: append arg to array (can be
                                   used multiple times)
-      --bitset                    POPT_BIT_SET: |= 0x4321
-      --bitclr                    POPT_BIT_CLR: &= ~0x1234
+      --[no]bitset                POPT_BIT_SET: |= 0x7777
+      --[no]bitclr                POPT_BIT_CLR: &= ~0xf842
+      --bitxor                    POPT_ARGFLAG_XOR: ^= (0x8ace^0xfeed)
       --nstr=STRING               POPT_ARG_STRING: (null) (default: null)
       --lstr=STRING               POPT_ARG_STRING: \"123456789...\" (default:
                                   \"This tests default strings and exceeds the
-- 
Gitee


From 18645dd2d4ed189ac79f92d06a42b977eaa4b053 Mon Sep 17 00:00:00 2001
From: Jeff Johnson <n3npq@mac.com>
Date: Fri, 23 Jan 2009 20:43:36 +0000
Subject: [PATCH 569/667] - permit glob(3) patterns in appName field of popt
 alias/exec config.

---
 CHANGES      |  1 +
 configure.ac |  2 +-
 poptconfig.c | 97 +++++++++++++++++++++++++++++++++++++++++++---------
 3 files changed, 82 insertions(+), 18 deletions(-)

diff --git a/CHANGES b/CHANGES
index be378bb..8eafff3 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,4 +1,5 @@
 1.14 -> 1.15:
+    - jbj: permit glob(3) patterns in appName field of popt alias/exec config.
     - jbj: add test cases for bit operations and toggles.
     - jbj: avoid displaying --[no]nofoo with POPT_ARGFLAG_TOGGLE.
     - jbj: add poptArgInfo() to get argInfo, implementing POPT_ARGFLAG_TOGGLE.
diff --git a/configure.ac b/configure.ac
index dbcec10..a972a93 100755
--- a/configure.ac
+++ b/configure.ac
@@ -44,7 +44,7 @@ AC_SYS_LARGEFILE
 AC_ISC_POSIX
 AM_C_PROTOTYPES
 
-AC_CHECK_HEADERS(float.h glob.h langinfo.h libintl.h mcheck.h unistd.h)
+AC_CHECK_HEADERS(float.h fnmatch.h glob.h langinfo.h libintl.h mcheck.h unistd.h)
 
 # For some systems we know that we have ld_version scripts.
 # Use it then as default.
diff --git a/poptconfig.c b/poptconfig.c
index c999b7e..c2474b6 100644
--- a/poptconfig.c
+++ b/poptconfig.c
@@ -10,6 +10,10 @@
 #include "poptint.h"
 #include <sys/stat.h>
 
+#if defined(HAVE_FNMATCH_H)
+#include <fnmatch.h>
+#endif
+
 #if defined(HAVE_GLOB_H)
 #include <glob.h>
 
@@ -95,11 +99,65 @@ static int poptGlob(/*@unused@*/ UNUSED(poptContext con), const char * pattern,
 
 /*@access poptContext @*/
 
+#if defined(HAVE_GLOB_H) && !defined(_GNU_SOURCE)
+/* Return nonzero if PATTERN contains any metacharacters.
+   Metacharacters can be quoted with backslashes if QUOTE is nonzero.  */
+static int
+glob_pattern_p (const char * pattern, int quote)
+	/*@*/
+{
+    const char * p;
+    int open = 0;
+
+    for (p = pattern; *p != '\0'; ++p)
+    switch (*p) {
+    case '?':
+    case '*':
+	return 1;
+	/*@notreached@*/ /*@switchbreak@*/ break;
+    case '\\':
+	if (quote && p[1] != '\0')
+	  ++p;
+	/*@switchbreak@*/ break;
+    case '[':
+	open = 1;
+	/*@switchbreak@*/ break;
+    case ']':
+	if (open)
+	  return 1;
+	/*@switchbreak@*/ break;
+    }
+    return 0;
+}
+#endif	/* defined(HAVE_GLOB_H) && !defined(_GNU_SOURCE) */
+
+/**
+ * Check for application match.
+ * @param con		context
+ * @param s		config application name
+ * return		0 if config application matches
+ */
+static int configAppMatch(poptContext con, const char * s)
+	/*@*/
+{
+    int rc;
+
+#if defined(HAVE_GLOB_H) && defined(HAVE_FNMATCH_H)
+    if (glob_pattern_p(s, 1)) {
+	static int flags = FNM_EXTMATCH | FNM_PATHNAME | FNM_PERIOD;
+	rc = fnmatch(s, con->appName, flags);
+    } else
+#endif
+	rc = strcmp(s, con->appName);
+    return rc;
+}
+
 /*@-compmempass@*/	/* FIX: item->option.longName kept, not dependent. */
 static void configLine(poptContext con, char * line)
 	/*@modifies con @*/
 {
-    size_t nameLength;
+    char * se = line;
+    const char * appName;
     const char * entryType;
     const char * opt;
     struct poptItem_s item_buf;
@@ -108,37 +166,42 @@ static void configLine(poptContext con, char * line)
 
     if (con->appName == NULL)
 	return;
-    nameLength = strlen(con->appName);
     
     memset(item, 0, sizeof(*item));
 
-    if (strncmp(line, con->appName, nameLength)) return;
+    appName = se;
+    while (*se != '\0' && !_isspaceptr(se)) se++;
+    if (*se == '\0') return;
+    *se++ = '\0';
 
-    line += nameLength;
-    if (*line == '\0' || !_isspaceptr(line)) return;
+    if (configAppMatch(con, appName)) return;
 
-    while (*line != '\0' && _isspaceptr(line)) line++;
-    entryType = line;
-    while (*line == '\0' || !_isspaceptr(line)) line++;
-    *line++ = '\0';
+    while (*se != '\0' && _isspaceptr(se)) se++;
+    entryType = se;
+    while (*se != '\0' && !_isspaceptr(se)) se++;
+    *se++ = '\0';
 
-    while (*line != '\0' && _isspaceptr(line)) line++;
-    if (*line == '\0') return;
-    opt = line;
-    while (*line == '\0' || !_isspaceptr(line)) line++;
-    *line++ = '\0';
+    while (*se != '\0' && _isspaceptr(se)) se++;
+    if (*se == '\0') return;
+    opt = se;
+    while (*se != '\0' && !_isspaceptr(se)) se++;
+    if (*se == '\0') return;
+    *se++ = '\0';
 
-    while (*line != '\0' && _isspaceptr(line)) line++;
-    if (*line == '\0') return;
+    while (*se != '\0' && _isspaceptr(se)) se++;
+    if (opt[0] == '-' && *se == '\0') return;
 
 /*@-temptrans@*/ /* FIX: line alias is saved */
     if (opt[0] == '-' && opt[1] == '-')
 	item->option.longName = opt + 2;
     else if (opt[0] == '-' && opt[2] == '\0')
 	item->option.shortName = opt[1];
+    else {
+	/* XXX TODO: read alias from path stored in opt */
+    }
 /*@=temptrans@*/
 
-    if (poptParseArgvString(line, &item->argc, &item->argv)) return;
+    if (poptParseArgvString(se, &item->argc, &item->argv)) return;
 
 /*@-modobserver@*/
     item->option.argInfo = POPT_ARGFLAG_DOC_HIDDEN;
-- 
Gitee


From d69093eb59f3694981749cb16d105e91f9b483bb Mon Sep 17 00:00:00 2001
From: Jeff Johnson <n3npq@mac.com>
Date: Fri, 23 Jan 2009 21:57:27 +0000
Subject: [PATCH 570/667] - permit popt alias/exec to include content from a
 file.

---
 CHANGES      |   1 +
 poptconfig.c | 124 ++++++++++++++++++++++++++++++++++++++-------------
 2 files changed, 95 insertions(+), 30 deletions(-)

diff --git a/CHANGES b/CHANGES
index 8eafff3..bad2a66 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,4 +1,5 @@
 1.14 -> 1.15:
+    - jbj: permit popt alias/exec to include content from a file.
     - jbj: permit glob(3) patterns in appName field of popt alias/exec config.
     - jbj: add test cases for bit operations and toggles.
     - jbj: avoid displaying --[no]nofoo with POPT_ARGFLAG_TOGGLE.
diff --git a/poptconfig.c b/poptconfig.c
index c2474b6..ae9fb50 100644
--- a/poptconfig.c
+++ b/poptconfig.c
@@ -131,6 +131,52 @@ glob_pattern_p (const char * pattern, int quote)
 }
 #endif	/* defined(HAVE_GLOB_H) && !defined(_GNU_SOURCE) */
 
+/**
+ * Read a file into a buffer.
+ * @param con		context
+ * @param fn		file name
+ * @retval *bp		file contents
+ * @retval *nbp		no. of bytes in file contents
+ * return		0 on success
+ */
+static int poptSlurp(/*@unused@*/ UNUSED(poptContext con), const char * fn,
+		char ** bp, off_t * nbp)
+	/*@modifies *bp, *nbp @*/
+{
+    int fdno;
+    char * b = NULL;
+    off_t nb = 0;
+    int rc = POPT_ERROR_ERRNO;	/* assume failure */
+
+    fdno = open(fn, O_RDONLY);
+    if (fdno < 0)
+	goto exit;
+
+    if ((nb = lseek(fdno, 0, SEEK_END)) == (off_t)-1
+     || lseek(fdno, 0, SEEK_SET) == (off_t)-1
+     || (b = malloc((size_t)nb + 1)) == NULL
+     || read(fdno, (char *)b, (size_t)nb) != (ssize_t)nb)
+    {
+	int oerrno = errno;
+	(void) close(fdno);
+	errno = oerrno;
+	goto exit;
+    }
+    if (close(fdno) == -1)
+	goto exit;
+    rc = 0;
+
+exit:
+    if (rc == 0) {
+	*bp = b;
+	*nbp = nb;
+    } else {
+	*bp = NULL;
+	*nbp = 0;
+    }
+    return rc;
+}
+
 /**
  * Check for application match.
  * @param con		context
@@ -153,9 +199,11 @@ static int configAppMatch(poptContext con, const char * s)
 }
 
 /*@-compmempass@*/	/* FIX: item->option.longName kept, not dependent. */
-static void configLine(poptContext con, char * line)
+static int configLine(poptContext con, char * line)
 	/*@modifies con @*/
 {
+    char *b = NULL;
+    off_t nb = 0;
     char * se = line;
     const char * appName;
     const char * entryType;
@@ -163,18 +211,19 @@ static void configLine(poptContext con, char * line)
     struct poptItem_s item_buf;
     poptItem item = &item_buf;
     int i, j;
+    int rc = 1;
 
     if (con->appName == NULL)
-	return;
+	goto exit;
     
     memset(item, 0, sizeof(*item));
 
     appName = se;
     while (*se != '\0' && !_isspaceptr(se)) se++;
-    if (*se == '\0') return;
+    if (*se == '\0') goto exit;
     *se++ = '\0';
 
-    if (configAppMatch(con, appName)) return;
+    if (configAppMatch(con, appName)) goto exit;
 
     while (*se != '\0' && _isspaceptr(se)) se++;
     entryType = se;
@@ -182,14 +231,14 @@ static void configLine(poptContext con, char * line)
     *se++ = '\0';
 
     while (*se != '\0' && _isspaceptr(se)) se++;
-    if (*se == '\0') return;
+    if (*se == '\0') goto exit;
     opt = se;
     while (*se != '\0' && !_isspaceptr(se)) se++;
-    if (*se == '\0') return;
+    if (*se == '\0') goto exit;
     *se++ = '\0';
 
     while (*se != '\0' && _isspaceptr(se)) se++;
-    if (opt[0] == '-' && *se == '\0') return;
+    if (opt[0] == '-' && *se == '\0') goto exit;
 
 /*@-temptrans@*/ /* FIX: line alias is saved */
     if (opt[0] == '-' && opt[1] == '-')
@@ -197,11 +246,35 @@ static void configLine(poptContext con, char * line)
     else if (opt[0] == '-' && opt[2] == '\0')
 	item->option.shortName = opt[1];
     else {
-	/* XXX TODO: read alias from path stored in opt */
+	const char * fn = opt;
+
+	/* XXX handle globs and directories? */
+	if ((rc = poptSlurp(con, fn, &b, &nb)) != 0) goto exit;
+
+	/* Append remaining text to the interpolated file option text. */
+	if (*se != NULL) {
+	    size_t nse = strlen(se) + 1;
+	    b = realloc(b, ((size_t)nb + nse + 1));
+	    (void) stpcpy( stpcpy(b+nb, " "), se);
+	    nb += (off_t)nse;
+	}
+	se = b;
+
+	/* Use the basename of the path as the long option name. */
+	if ((item->option.longName = strrchr(fn, '/')) != NULL)
+	    item->option.longName++;
+	else
+	    item->option.longName = fn;
+
+	/* Single character basenames are treated as short options instead. */
+	if (item->option.longName[1] == '\0') {
+	    item->option.shortName = (int) item->option.longName[0];
+	    item->option.longName = NULL;
+	}
     }
 /*@=temptrans@*/
 
-    if (poptParseArgvString(se, &item->argc, &item->argv)) return;
+    if (poptParseArgvString(se, &item->argc, &item->argv)) goto exit;
 
 /*@-modobserver@*/
     item->option.argInfo = POPT_ARGFLAG_DOC_HIDDEN;
@@ -233,39 +306,30 @@ static void configLine(poptContext con, char * line)
 	
 /*@-nullstate@*/ /* FIX: item->argv[] may be NULL */
     if (!strcmp(entryType, "alias"))
-	(void) poptAddItem(con, item, 0);
+	rc = poptAddItem(con, item, 0);
     else if (!strcmp(entryType, "exec"))
-	(void) poptAddItem(con, item, 1);
+	rc = poptAddItem(con, item, 1);
 /*@=nullstate@*/
+exit:
+    rc = 0;	/* XXX for now, always return success */
+    if (b)
+	free(b);
+    return rc;
 }
 /*@=compmempass@*/
 
 int poptReadConfigFile(poptContext con, const char * fn)
 {
-    int fdno;
     char *b = NULL, *be;
-    off_t nb;
+    off_t nb = 0;
     const char *se;
     char *t, *te;
-    int rc = POPT_ERROR_ERRNO;	/* assume failure */
+    int rc;
+    int xx;
 
-    fdno = open(fn, O_RDONLY);
-    if (fdno < 0)
+    if ((rc = poptSlurp(con, fn, &b, &nb)) != 0)
 	return (errno == ENOENT ? 0 : rc);
 
-    if ((nb = lseek(fdno, 0, SEEK_END)) == (off_t)-1
-     || lseek(fdno, 0, SEEK_SET) == (off_t)-1
-     || (b = malloc((size_t)nb + 1)) == NULL
-     || read(fdno, (char *)b, (size_t)nb) != (ssize_t)nb)
-    {
-	int oerrno = errno;
-	(void) close(fdno);
-	errno = oerrno;
-	goto exit;
-    }
-    if (close(fdno) == -1)
-	goto exit;
-
     if ((t = malloc((size_t)nb + 1)) == NULL)
 	goto exit;
     te = t;
@@ -278,7 +342,7 @@ int poptReadConfigFile(poptContext con, const char * fn)
 	    te = t;
 	    while (*te && _isspaceptr(te)) te++;
 	    if (*te && *te != '#')
-		configLine(con, te);
+		xx = configLine(con, te);
 	    /*@switchbreak@*/ break;
 /*@-usedef@*/	/* XXX *se may be uninitialized */
 	  case '\\':
-- 
Gitee


From 132fd5d1ac3868d7a54e81c0b3f6cb75cd53567b Mon Sep 17 00:00:00 2001
From: Jeff Johnson <n3npq@mac.com>
Date: Sat, 24 Jan 2009 13:44:37 +0000
Subject: [PATCH 571/667] - trim out escaped newline(s) from file content,
 other fixes

---
 CHANGES      |  1 +
 poptconfig.c | 40 +++++++++++++++++++++++++++++++---------
 2 files changed, 32 insertions(+), 9 deletions(-)

diff --git a/CHANGES b/CHANGES
index bad2a66..f50f1d8 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,4 +1,5 @@
 1.14 -> 1.15:
+    - jbj: trim out escaped newline(s) from file content, other fixes.
     - jbj: permit popt alias/exec to include content from a file.
     - jbj: permit glob(3) patterns in appName field of popt alias/exec config.
     - jbj: add test cases for bit operations and toggles.
diff --git a/poptconfig.c b/poptconfig.c
index ae9fb50..c654bc2 100644
--- a/poptconfig.c
+++ b/poptconfig.c
@@ -146,6 +146,7 @@ static int poptSlurp(/*@unused@*/ UNUSED(poptContext con), const char * fn,
     int fdno;
     char * b = NULL;
     off_t nb = 0;
+    char * s, * t, * se;
     int rc = POPT_ERROR_ERRNO;	/* assume failure */
 
     fdno = open(fn, O_RDONLY);
@@ -166,6 +167,25 @@ static int poptSlurp(/*@unused@*/ UNUSED(poptContext con), const char * fn,
 	goto exit;
     rc = 0;
 
+   /* Trim out escaped newlines. */
+    s = t = b;
+    se = b + nb;
+    while (*s && s < se)
+	switch (*s) {
+	case '\\':
+	    if (s[1] == '\n') {
+		s++;
+		s++;
+		continue;
+	    }
+	    /*@fallthrough@*/
+	default:
+	    *t++ = *s++;
+	    break;
+	}
+    *t++ = '\0';
+    nb = (off_t)(t - b);
+
 exit:
     if (rc == 0) {
 	*bp = b;
@@ -220,22 +240,24 @@ static int configLine(poptContext con, char * line)
 
     appName = se;
     while (*se != '\0' && !_isspaceptr(se)) se++;
-    if (*se == '\0') goto exit;
-    *se++ = '\0';
+    if (*se == '\0')
+	goto exit;
+    else
+	*se++ = '\0';
 
     if (configAppMatch(con, appName)) goto exit;
 
     while (*se != '\0' && _isspaceptr(se)) se++;
     entryType = se;
     while (*se != '\0' && !_isspaceptr(se)) se++;
-    *se++ = '\0';
+    if (*se != '\0') *se++ = '\0';
 
     while (*se != '\0' && _isspaceptr(se)) se++;
     if (*se == '\0') goto exit;
     opt = se;
     while (*se != '\0' && !_isspaceptr(se)) se++;
-    if (*se == '\0') goto exit;
-    *se++ = '\0';
+    if (opt[0] == '-' && *se == '\0') goto exit;
+    if (*se != '\0') *se++ = '\0';
 
     while (*se != '\0' && _isspaceptr(se)) se++;
     if (opt[0] == '-' && *se == '\0') goto exit;
@@ -252,10 +274,10 @@ static int configLine(poptContext con, char * line)
 	if ((rc = poptSlurp(con, fn, &b, &nb)) != 0) goto exit;
 
 	/* Append remaining text to the interpolated file option text. */
-	if (*se != NULL) {
+	if (*se != '\0') {
 	    size_t nse = strlen(se) + 1;
-	    b = realloc(b, ((size_t)nb + nse + 1));
-	    (void) stpcpy( stpcpy(b+nb, " "), se);
+	    b = realloc(b, ((size_t)nb + nse));
+	    (void) stpcpy( stpcpy(&b[nb-1], " "), se);
 	    nb += (off_t)nse;
 	}
 	se = b;
@@ -348,7 +370,7 @@ int poptReadConfigFile(poptContext con, const char * fn)
 	  case '\\':
 	    *te = *se++;
 	    /* \ at the end of a line does not insert a \n */
-	    if (se < be  && *se != '\n') {
+	    if (se < be && *se != '\n') {
 		te++;
 		*te++ = *se;
 	    }
-- 
Gitee


From ecde91e8436b7750ef3ca67833eedc11d5db0ad8 Mon Sep 17 00:00:00 2001
From: Jeff Johnson <n3npq@mac.com>
Date: Sat, 24 Jan 2009 18:12:38 +0000
Subject: [PATCH 572/667] - jbj: splint fiddles.

---
 popt.c       |  13 +++--
 poptconfig.c | 142 ++++++++++++++++++++++++++++++---------------------
 test1.c      |   4 +-
 3 files changed, 95 insertions(+), 64 deletions(-)

diff --git a/popt.c b/popt.c
index acd21b9..6c02a22 100644
--- a/popt.c
+++ b/popt.c
@@ -325,6 +325,9 @@ longOptionStrcmp(const struct poptOption * opt,
     const char * optLongName = opt->longName;
     int rc;
 
+    if (optLongName == NULL || longName == NULL)	/* XXX can't heppen */
+	return 0;
+
     if (F_ISSET(opt, TOGGLE)) {
 	if (optLongName[0] == 'n' && optLongName[1] == 'o') {
 	    optLongName += sizeof("no") - 1;
@@ -340,9 +343,9 @@ longOptionStrcmp(const struct poptOption * opt,
 	    }
 	}
     }
-    rc = (strlen(optLongName) == longNameLen);
+    rc = (int)(strlen(optLongName) == longNameLen);
     if (rc)
-	rc = !strncmp(optLongName, longName, longNameLen);
+	rc = (int)(strncmp(optLongName, longName, longNameLen) == 0);
     return rc;
 }
 
@@ -903,15 +906,15 @@ static unsigned int poptArgInfo(poptContext con, const struct poptOption * opt)
 	/*@*/
 {
     unsigned int argInfo = opt->argInfo;
+
+    if (con->os->argv != NULL && con->os->next > 0 && opt->longName != NULL)
     if (LF_ISSET(TOGGLE)) {
 	const char * longName = con->os->argv[con->os->next-1];
 	while (*longName == '-') longName++;
 	/* XXX almost good enough but consider --[no]nofoo corner cases. */
 	if (longName[0] != opt->longName[0] || longName[1] != opt->longName[1])
 	{
-	    if (LF_ISSET(XOR))	/* XXX dont toggle with XOR */
-		;
-	    else {
+	    if (!LF_ISSET(XOR)) {	/* XXX dont toggle with XOR */
 		/* Toggle POPT_BIT_SET <=> POPT_BIT_CLR. */
 		if (LF_ISSET(LOGICALOPS))
 		    argInfo ^= (POPT_ARGFLAG_OR|POPT_ARGFLAG_AND);
diff --git a/poptconfig.c b/poptconfig.c
index c654bc2..2b4c686 100644
--- a/poptconfig.c
+++ b/poptconfig.c
@@ -12,6 +12,13 @@
 
 #if defined(HAVE_FNMATCH_H)
 #include <fnmatch.h>
+
+#if defined(__LCLINT__)
+/*@-declundef -exportheader -incondefs -protoparammatch -redecl -type @*/
+extern int fnmatch (const char *__pattern, const char *__name, int __flags)
+	/*@*/;
+/*@=declundef =exportheader =incondefs =protoparammatch =redecl =type @*/
+#endif	/* __LCLINT__ */
 #endif
 
 #if defined(HAVE_GLOB_H)
@@ -33,7 +40,39 @@ extern void globfree (/*@only@*/ glob_t *__pglob)
 extern int glob_pattern_p (const char *__pattern, int __quote)
         /*@*/;
 /*@=declundef =exportheader =incondefs =protoparammatch =redecl =type @*/
-#endif
+#endif	/* __LCLINT__ */
+
+#if !defined(_GNU_SOURCE)
+/* Return nonzero if PATTERN contains any metacharacters.
+   Metacharacters can be quoted with backslashes if QUOTE is nonzero.  */
+static int
+glob_pattern_p (const char * pattern, int quote)
+	/*@*/
+{
+    const char * p;
+    int open = 0;
+
+    for (p = pattern; *p != '\0'; ++p)
+    switch (*p) {
+    case '?':
+    case '*':
+	return 1;
+	/*@notreached@*/ /*@switchbreak@*/ break;
+    case '\\':
+	if (quote && p[1] != '\0')
+	  ++p;
+	/*@switchbreak@*/ break;
+    case '[':
+	open = 1;
+	/*@switchbreak@*/ break;
+    case ']':
+	if (open)
+	  return 1;
+	/*@switchbreak@*/ break;
+    }
+    return 0;
+}
+#endif	/* !defined(_GNU_SOURCE) */
 
 /*@unchecked@*/
 static int poptGlobFlags = 0;
@@ -99,38 +138,6 @@ static int poptGlob(/*@unused@*/ UNUSED(poptContext con), const char * pattern,
 
 /*@access poptContext @*/
 
-#if defined(HAVE_GLOB_H) && !defined(_GNU_SOURCE)
-/* Return nonzero if PATTERN contains any metacharacters.
-   Metacharacters can be quoted with backslashes if QUOTE is nonzero.  */
-static int
-glob_pattern_p (const char * pattern, int quote)
-	/*@*/
-{
-    const char * p;
-    int open = 0;
-
-    for (p = pattern; *p != '\0'; ++p)
-    switch (*p) {
-    case '?':
-    case '*':
-	return 1;
-	/*@notreached@*/ /*@switchbreak@*/ break;
-    case '\\':
-	if (quote && p[1] != '\0')
-	  ++p;
-	/*@switchbreak@*/ break;
-    case '[':
-	open = 1;
-	/*@switchbreak@*/ break;
-    case ']':
-	if (open)
-	  return 1;
-	/*@switchbreak@*/ break;
-    }
-    return 0;
-}
-#endif	/* defined(HAVE_GLOB_H) && !defined(_GNU_SOURCE) */
-
 /**
  * Read a file into a buffer.
  * @param con		context
@@ -141,7 +148,8 @@ glob_pattern_p (const char * pattern, int quote)
  */
 static int poptSlurp(/*@unused@*/ UNUSED(poptContext con), const char * fn,
 		char ** bp, off_t * nbp)
-	/*@modifies *bp, *nbp @*/
+	/*@globals errno, fileSystem, internalState @*/
+	/*@modifies *bp, *nbp, errno, fileSystem, internalState @*/
 {
     int fdno;
     char * b = NULL;
@@ -155,7 +163,7 @@ static int poptSlurp(/*@unused@*/ UNUSED(poptContext con), const char * fn,
 
     if ((nb = lseek(fdno, 0, SEEK_END)) == (off_t)-1
      || lseek(fdno, 0, SEEK_SET) == (off_t)-1
-     || (b = malloc((size_t)nb + 1)) == NULL
+     || (b = calloc(sizeof(*b), (size_t)nb + 1)) == NULL
      || read(fdno, (char *)b, (size_t)nb) != (ssize_t)nb)
     {
 	int oerrno = errno;
@@ -165,24 +173,26 @@ static int poptSlurp(/*@unused@*/ UNUSED(poptContext con), const char * fn,
     }
     if (close(fdno) == -1)
 	goto exit;
+    if (b == NULL || nb <= 0) {
+	rc = POPT_ERROR_BADCONFIG;
+	goto exit;
+    }
     rc = 0;
 
    /* Trim out escaped newlines. */
-    s = t = b;
-    se = b + nb;
-    while (*s && s < se)
+    for (t = b, s = b, se = b + nb; *s && s < se; s++) {
 	switch (*s) {
 	case '\\':
 	    if (s[1] == '\n') {
-		s++;
 		s++;
 		continue;
 	    }
 	    /*@fallthrough@*/
 	default:
-	    *t++ = *s++;
-	    break;
+	    *t++ = *s;
+	    /*@switchbreak@*/ break;
 	}
+    }
     *t++ = '\0';
     nb = (off_t)(t - b);
 
@@ -191,10 +201,14 @@ exit:
 	*bp = b;
 	*nbp = nb;
     } else {
+	if (b)
+	    free(b);
 	*bp = NULL;
 	*nbp = 0;
     }
+/*@-compdef -nullstate @*/	/* XXX cannot annotate char ** correctly */
     return rc;
+/*@=compdef =nullstate @*/
 }
 
 /**
@@ -206,11 +220,16 @@ exit:
 static int configAppMatch(poptContext con, const char * s)
 	/*@*/
 {
-    int rc;
+    int rc = 1;
+
+    if (con->appName == NULL)	/* XXX can't happen. */
+	return rc;
 
 #if defined(HAVE_GLOB_H) && defined(HAVE_FNMATCH_H)
     if (glob_pattern_p(s, 1)) {
+/*@-bitwisesigned@*/
 	static int flags = FNM_EXTMATCH | FNM_PATHNAME | FNM_PERIOD;
+/*@=bitwisesigned@*/
 	rc = fnmatch(s, con->appName, flags);
     } else
 #endif
@@ -219,8 +238,9 @@ static int configAppMatch(poptContext con, const char * s)
 }
 
 /*@-compmempass@*/	/* FIX: item->option.longName kept, not dependent. */
-static int configLine(poptContext con, char * line)
-	/*@modifies con @*/
+static int poptConfigLine(poptContext con, char * line)
+	/*@globals fileSystem, internalState @*/
+	/*@modifies con, fileSystem, internalState @*/
 {
     char *b = NULL;
     off_t nb = 0;
@@ -231,7 +251,7 @@ static int configLine(poptContext con, char * line)
     struct poptItem_s item_buf;
     poptItem item = &item_buf;
     int i, j;
-    int rc = 1;
+    int rc = POPT_ERROR_BADCONFIG;
 
     if (con->appName == NULL)
 	goto exit;
@@ -270,8 +290,11 @@ static int configLine(poptContext con, char * line)
     else {
 	const char * fn = opt;
 
-	/* XXX handle globs and directories? */
-	if ((rc = poptSlurp(con, fn, &b, &nb)) != 0) goto exit;
+	/* XXX handle globs and directories in fn? */
+	if ((rc = poptSlurp(con, fn, &b, &nb)) != 0)
+	    goto exit;
+	if (b == NULL || nb <= 0)
+	    goto exit;
 
 	/* Append remaining text to the interpolated file option text. */
 	if (*se != '\0') {
@@ -283,15 +306,18 @@ static int configLine(poptContext con, char * line)
 	se = b;
 
 	/* Use the basename of the path as the long option name. */
-	if ((item->option.longName = strrchr(fn, '/')) != NULL)
-	    item->option.longName++;
-	else
-	    item->option.longName = fn;
-
-	/* Single character basenames are treated as short options instead. */
-	if (item->option.longName[1] == '\0') {
-	    item->option.shortName = (int) item->option.longName[0];
-	    item->option.longName = NULL;
+	{   const char * longName = strrchr(fn, '/');
+	    if (longName != NULL)
+		longName++;
+	    else
+		longName = fn;
+	    if (longName == NULL)	/* XXX can't happen. */
+		goto exit;
+	    /* Single character basenames are treated as short options. */
+	    if (longName[1] != '\0')
+		item->option.longName = longName;
+	    else
+		item->option.shortName = longName[0];
 	}
     }
 /*@=temptrans@*/
@@ -351,6 +377,8 @@ int poptReadConfigFile(poptContext con, const char * fn)
 
     if ((rc = poptSlurp(con, fn, &b, &nb)) != 0)
 	return (errno == ENOENT ? 0 : rc);
+    if (b == NULL || nb <= 0)
+	return POPT_ERROR_BADCONFIG;
 
     if ((t = malloc((size_t)nb + 1)) == NULL)
 	goto exit;
@@ -364,7 +392,7 @@ int poptReadConfigFile(poptContext con, const char * fn)
 	    te = t;
 	    while (*te && _isspaceptr(te)) te++;
 	    if (*te && *te != '#')
-		xx = configLine(con, te);
+		xx = poptConfigLine(con, te);
 	    /*@switchbreak@*/ break;
 /*@-usedef@*/	/* XXX *se may be uninitialized */
 	  case '\\':
diff --git a/test1.c b/test1.c
index 3265f4b..3cf6ab4 100644
--- a/test1.c
+++ b/test1.c
@@ -33,9 +33,9 @@ static int aVal = 141421;
 /*@unchecked@*/
 static int bVal = 141421;
 /*@unchecked@*/
-static int aFlag = 0x8ace;
+static unsigned int aFlag = 0x8aceU;
 /*@unchecked@*/
-static int bFlag = 0x8ace;
+static unsigned int bFlag = 0x8aceU;
 
 /*@unchecked@*/
 static int aInt = 271828;
-- 
Gitee


From e331969a5454fe078aefb21ba909b7953b88a675 Mon Sep 17 00:00:00 2001
From: Jeff Johnson <n3npq@mac.com>
Date: Sun, 25 Jan 2009 15:23:03 +0000
Subject: [PATCH 573/667] - jbj: add poptReadFile routine.

---
 CHANGES      |   1 +
 libpopt.vers |   1 +
 popt.h       |  32 +++++++++++-----
 poptconfig.c | 106 +++++++++++++++++++++++++--------------------------
 4 files changed, 76 insertions(+), 64 deletions(-)

diff --git a/CHANGES b/CHANGES
index f50f1d8..d6fcb2f 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,4 +1,5 @@
 1.14 -> 1.15:
+    - jbj: add poptReadFile routine.
     - jbj: trim out escaped newline(s) from file content, other fixes.
     - jbj: permit popt alias/exec to include content from a file.
     - jbj: permit glob(3) patterns in appName field of popt alias/exec config.
diff --git a/libpopt.vers b/libpopt.vers
index bbafc0d..a1eea04 100644
--- a/libpopt.vers
+++ b/libpopt.vers
@@ -26,6 +26,7 @@ LIBPOPT_0
     poptPeekArg;
     poptPrintHelp;
     poptPrintUsage;
+    poptReadFile;
     poptReadConfigFile;
     poptReadConfigFiles;
     poptReadDefaultConfig;
diff --git a/popt.h b/popt.h
index c6762f5..56bd2ba 100644
--- a/popt.h
+++ b/popt.h
@@ -385,6 +385,29 @@ int poptAddAlias(poptContext con, struct poptAlias alias, int flags)
 int poptAddItem(poptContext con, poptItem newItem, int flags)
 	/*@modifies con @*/;
 
+/** \ingroup popt
+ * Perform sanity checks on a file path.
+ * @param fn		file name
+ * @return		0 on OK, 1 on NOTOK.
+ */
+int poptSaneFile(const char * fn)
+	/*@globals errno, internalState @*/
+	/*@modifies errno, internalState @*/;
+
+/**
+ * Read a file into a buffer.
+ * @param fn		file name
+ * @retval *bp		buffer (malloc'd)
+ * @retval *nbp		no. of bytes in buffer (including final NUL)
+ * @param flags		1 to trim escaped newlines
+ * return		0 on success
+ */
+int poptReadFile(const char * fn, /*@out@*/ char ** bp, /*@out@*/ size_t * nbp,
+		int flags)
+	/*@globals errno, fileSystem, internalState @*/
+	/*@modifies *bp, *nbp, errno, fileSystem, internalState @*/;
+#define	POPT_READFILE_TRIMNEWLINES	1
+
 /** \ingroup popt
  * Read configuration file.
  * @param con		context
@@ -396,15 +419,6 @@ int poptReadConfigFile(poptContext con, const char * fn)
 	/*@modifies con->execs, con->numExecs,
 		errno, fileSystem, internalState @*/;
 
-/** \ingroup popt
- * Perform sanity checks on a file path.
- * @param fn		file path
- * @return		0 on OK, 1 on NOTOK.
- */
-int poptSaneFile(const char * fn)
-	/*@globals errno, internalState @*/
-	/*@modifies errno, internalState @*/;
-
 /** \ingroup popt
  * Read configuration file(s).
  * Colon separated files to read, looping over poptReadConfigFile().
diff --git a/poptconfig.c b/poptconfig.c
index 2b4c686..2ae77fb 100644
--- a/poptconfig.c
+++ b/poptconfig.c
@@ -138,18 +138,25 @@ static int poptGlob(/*@unused@*/ UNUSED(poptContext con), const char * pattern,
 
 /*@access poptContext @*/
 
-/**
- * Read a file into a buffer.
- * @param con		context
- * @param fn		file name
- * @retval *bp		file contents
- * @retval *nbp		no. of bytes in file contents
- * return		0 on success
- */
-static int poptSlurp(/*@unused@*/ UNUSED(poptContext con), const char * fn,
-		char ** bp, off_t * nbp)
-	/*@globals errno, fileSystem, internalState @*/
-	/*@modifies *bp, *nbp, errno, fileSystem, internalState @*/
+int poptSaneFile(const char * fn)
+{
+    struct stat sb;
+    uid_t uid = getuid();
+
+    if (stat(fn, &sb) == -1)
+	return 1;
+    if ((uid_t)sb.st_uid != uid)
+	return 0;
+    if (!S_ISREG(sb.st_mode))
+	return 0;
+/*@-bitwisesigned@*/
+    if (sb.st_mode & (S_IWGRP|S_IWOTH))
+	return 0;
+/*@=bitwisesigned@*/
+    return 1;
+}
+
+int poptReadFile(const char * fn, char ** bp, size_t * nbp, int flags)
 {
     int fdno;
     char * b = NULL;
@@ -173,36 +180,43 @@ static int poptSlurp(/*@unused@*/ UNUSED(poptContext con), const char * fn,
     }
     if (close(fdno) == -1)
 	goto exit;
-    if (b == NULL || nb <= 0) {
-	rc = POPT_ERROR_BADCONFIG;
+    if (b == NULL) {
+	rc = POPT_ERROR_MALLOC;
 	goto exit;
     }
     rc = 0;
 
    /* Trim out escaped newlines. */
-    for (t = b, s = b, se = b + nb; *s && s < se; s++) {
-	switch (*s) {
-	case '\\':
-	    if (s[1] == '\n') {
-		s++;
-		continue;
+/*@-bitwisesigned@*/
+    if (flags & POPT_READFILE_TRIMNEWLINES)
+/*@=bitwisesigned@*/
+    {
+	for (t = b, s = b, se = b + nb; *s && s < se; s++) {
+	    switch (*s) {
+	    case '\\':
+		if (s[1] == '\n') {
+		    s++;
+		    continue;
+		}
+		/*@fallthrough@*/
+	    default:
+		*t++ = *s;
+		/*@switchbreak@*/ break;
 	    }
-	    /*@fallthrough@*/
-	default:
-	    *t++ = *s;
-	    /*@switchbreak@*/ break;
 	}
+	*t++ = '\0';
+	nb = (off_t)(t - b);
     }
-    *t++ = '\0';
-    nb = (off_t)(t - b);
 
 exit:
     if (rc == 0) {
 	*bp = b;
-	*nbp = nb;
+	*nbp = (size_t) nb;
     } else {
+/*@-usedef@*/
 	if (b)
 	    free(b);
+/*@=usedef@*/
 	*bp = NULL;
 	*nbp = 0;
     }
@@ -243,7 +257,7 @@ static int poptConfigLine(poptContext con, char * line)
 	/*@modifies con, fileSystem, internalState @*/
 {
     char *b = NULL;
-    off_t nb = 0;
+    size_t nb = 0;
     char * se = line;
     const char * appName;
     const char * entryType;
@@ -291,17 +305,17 @@ static int poptConfigLine(poptContext con, char * line)
 	const char * fn = opt;
 
 	/* XXX handle globs and directories in fn? */
-	if ((rc = poptSlurp(con, fn, &b, &nb)) != 0)
+	if ((rc = poptReadFile(fn, &b, &nb, POPT_READFILE_TRIMNEWLINES)) != 0)
 	    goto exit;
-	if (b == NULL || nb <= 0)
+	if (b == NULL || nb == 0)
 	    goto exit;
 
 	/* Append remaining text to the interpolated file option text. */
 	if (*se != '\0') {
 	    size_t nse = strlen(se) + 1;
-	    b = realloc(b, ((size_t)nb + nse));
+	    b = realloc(b, (nb + nse));
 	    (void) stpcpy( stpcpy(&b[nb-1], " "), se);
-	    nb += (off_t)nse;
+	    nb += nse;
 	}
 	se = b;
 
@@ -368,19 +382,19 @@ exit:
 
 int poptReadConfigFile(poptContext con, const char * fn)
 {
-    char *b = NULL, *be;
-    off_t nb = 0;
+    char * b = NULL, *be;
+    size_t nb = 0;
     const char *se;
     char *t, *te;
     int rc;
     int xx;
 
-    if ((rc = poptSlurp(con, fn, &b, &nb)) != 0)
+    if ((rc = poptReadFile(fn, &b, &nb, POPT_READFILE_TRIMNEWLINES)) != 0)
 	return (errno == ENOENT ? 0 : rc);
-    if (b == NULL || nb <= 0)
+    if (b == NULL || nb == 0)
 	return POPT_ERROR_BADCONFIG;
 
-    if ((t = malloc((size_t)nb + 1)) == NULL)
+    if ((t = malloc(nb + 1)) == NULL)
 	goto exit;
     te = t;
 
@@ -419,24 +433,6 @@ exit:
     return rc;
 }
 
-int poptSaneFile(const char * fn)
-{
-    struct stat sb;
-    uid_t uid = getuid();
-
-    if (stat(fn, &sb) == -1)
-	return 1;
-    if ((uid_t)sb.st_uid != uid)
-	return 0;
-    if (!S_ISREG(sb.st_mode))
-	return 0;
-/*@-bitwisesigned@*/
-    if (sb.st_mode & (S_IWGRP|S_IWOTH))
-	return 0;
-/*@=bitwisesigned@*/
-    return 1;
-}
-
 int poptReadConfigFiles(poptContext con, const char * paths)
 {
     char * buf = (paths ? xstrdup(paths) : NULL);
-- 
Gitee


From a28bf5671ac5f8f168156494c2778dea315ac6ab Mon Sep 17 00:00:00 2001
From: Jeff Johnson <n3npq@mac.com>
Date: Sun, 25 Jan 2009 17:38:53 +0000
Subject: [PATCH 574/667] - poptReadFile: permit NULL if return values are not
 desired.

---
 CHANGES      |  3 ++-
 popt.h       |  8 ++++----
 poptconfig.c | 17 +++++++++++------
 3 files changed, 17 insertions(+), 11 deletions(-)

diff --git a/CHANGES b/CHANGES
index d6fcb2f..8573080 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,5 +1,6 @@
 1.14 -> 1.15:
-    - jbj: add poptReadFile routine.
+    - jbj: poptReadFile: permit NULL if return values are not desired.
+    - jbj: poptReadFile: add routine.
     - jbj: trim out escaped newline(s) from file content, other fixes.
     - jbj: permit popt alias/exec to include content from a file.
     - jbj: permit glob(3) patterns in appName field of popt alias/exec config.
diff --git a/popt.h b/popt.h
index 56bd2ba..bd991a2 100644
--- a/popt.h
+++ b/popt.h
@@ -397,13 +397,13 @@ int poptSaneFile(const char * fn)
 /**
  * Read a file into a buffer.
  * @param fn		file name
- * @retval *bp		buffer (malloc'd)
- * @retval *nbp		no. of bytes in buffer (including final NUL)
+ * @retval *bp		buffer (malloc'd) (or NULL)
+ * @retval *nbp		no. of bytes in buffer (including final NUL) (or NULL)
  * @param flags		1 to trim escaped newlines
  * return		0 on success
  */
-int poptReadFile(const char * fn, /*@out@*/ char ** bp, /*@out@*/ size_t * nbp,
-		int flags)
+int poptReadFile(const char * fn, /*@null@*/ /*@out@*/ char ** bp,
+		/*@null@*/ /*@out@*/ size_t * nbp, int flags)
 	/*@globals errno, fileSystem, internalState @*/
 	/*@modifies *bp, *nbp, errno, fileSystem, internalState @*/;
 #define	POPT_READFILE_TRIMNEWLINES	1
diff --git a/poptconfig.c b/poptconfig.c
index 2ae77fb..6e42a27 100644
--- a/poptconfig.c
+++ b/poptconfig.c
@@ -209,17 +209,22 @@ int poptReadFile(const char * fn, char ** bp, size_t * nbp, int flags)
     }
 
 exit:
-    if (rc == 0) {
-	*bp = b;
-	*nbp = (size_t) nb;
-    } else {
+    if (rc != 0) {
 /*@-usedef@*/
 	if (b)
 	    free(b);
 /*@=usedef@*/
-	*bp = NULL;
-	*nbp = 0;
+	b = NULL;
+	nb = 0;
     }
+    if (bp)
+	*bp = b;
+/*@-usereleased@*/
+    else if (b)
+	free(b);
+/*@=usereleased@*/
+    if (nbp)
+	*nbp = (size_t)nb;
 /*@-compdef -nullstate @*/	/* XXX cannot annotate char ** correctly */
     return rc;
 /*@=compdef =nullstate @*/
-- 
Gitee


From 8a877eae66ff3eda5abd0952b0c1f151934a5bd5 Mon Sep 17 00:00:00 2001
From: Jeff Johnson <n3npq@mac.com>
Date: Sat, 11 Apr 2009 12:51:11 +0000
Subject: [PATCH 575/667] - jbj: release popt-1.15.

---
 po/cs.po    | 95 +++++++++++++++++++++++++++------------------------
 po/da.po    | 34 ++++++++++---------
 po/de.po    | 52 +++++++++++++++-------------
 po/eo.po    | 46 +++++++++++++------------
 po/es.po    | 34 ++++++++++---------
 po/fi.po    | 34 ++++++++++---------
 po/fr.po    | 34 ++++++++++---------
 po/ga.po    | 34 ++++++++++---------
 po/gl.po    | 34 ++++++++++---------
 po/hu.po    | 34 ++++++++++---------
 po/id.po    | 46 +++++++++++++------------
 po/is.po    | 34 ++++++++++---------
 po/it.po    | 72 ++++++++++++++++++++-------------------
 po/ja.po    | 34 ++++++++++---------
 po/ko.po    | 34 ++++++++++---------
 po/nb.po    | 34 ++++++++++---------
 po/nl.po    | 34 ++++++++++---------
 po/pl.po    | 34 ++++++++++---------
 po/popt.pot | 34 ++++++++++---------
 po/pt.po    | 34 ++++++++++---------
 po/ro.po    | 34 ++++++++++---------
 po/ru.po    | 97 +++++++++++++++++++++++++++++------------------------
 po/sk.po    | 34 ++++++++++---------
 po/sl.po    | 34 ++++++++++---------
 po/sv.po    | 34 ++++++++++---------
 po/th.po    | 34 ++++++++++---------
 po/tr.po    | 34 ++++++++++---------
 po/uk.po    | 34 ++++++++++---------
 po/vi.po    | 34 ++++++++++---------
 po/wa.po    | 34 ++++++++++---------
 po/zh_CN.po | 34 ++++++++++---------
 po/zh_TW.po | 34 ++++++++++---------
 popt.spec   |  5 ++-
 33 files changed, 721 insertions(+), 576 deletions(-)

diff --git a/po/cs.po b/po/cs.po
index cbb7836..36fc670 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -1,87 +1,97 @@
+# Czech translations of popt
+# Copyright (C) 2008 Free Software Foundation, Inc.
+# This file is distributed under the same license as the popt package.
+# Milan Kerslager <kerslage@linux.cz>, 2001.
+# Petr Pisar <petr.pisar@atlas.cz>, 2008.
+#
 msgid ""
 msgstr ""
-"Project-Id-Version: popt 1.11\n"
+"Project-Id-Version: popt 1.14\n"
 "Report-Msgid-Bugs-To: <popt-devel@rpm5.org>\n"
-"POT-Creation-Date: 2008-09-18 14:11-0400\n"
-"PO-Revision-Date: 2001-07-24 00:03+0100\n"
-"Last-Translator: Milan Kerslager <kerslage@linux.cz>\n"
-"Language-Team: Czech <cs@li.org>\n"
+"POT-Creation-Date: 2009-04-10 17:14-0400\n"
+"PO-Revision-Date: 2008-12-08 19:55+0100\n"
+"Last-Translator: Petr Pisar <petr.pisar@atlas.cz>\n"
+"Language-Team: Czech <translation-team-cs@lists.sourceforge.net>\n"
 "MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=iso-8859-2\n"
+"Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: popt.c:42
+#: popt.c:47
 msgid "unknown errno"
-msgstr "nezn�m� ��slo chyby"
+msgstr "neznámé číslo chyby"
 
-#: popt.c:945
-#, fuzzy, c-format
+#: popt.c:1031
+#, c-format
 msgid "option type (%u) not implemented in popt\n"
-msgstr "volba (%d) nen� v popt implementov�na\n"
+msgstr "typ volby (%u) není v popt implementován\n"
 
-#: popt.c:1364
+#: popt.c:1452
 msgid "missing argument"
-msgstr "chyb� argument"
+msgstr "chybí argument"
 
-#: popt.c:1366
+#: popt.c:1454
 msgid "unknown option"
-msgstr "nezn�m� volba"
+msgstr "neznámá volba"
 
-#: popt.c:1368
+#: popt.c:1456
 msgid "mutually exclusive logical operations requested"
-msgstr "po�adov�ny vz�jemn� v�lu�n� logick� operace"
+msgstr "požadovány vzájemně výlučné logické operace"
 
-#: popt.c:1370
+#: popt.c:1458
 msgid "opt->arg should not be NULL"
-msgstr "opt->arg nesm� b�t NULL"
+msgstr "opt->arg nesmí být NULL"
 
-#: popt.c:1372
+#: popt.c:1460
 msgid "aliases nested too deeply"
-msgstr "aliasy vno�en� p��li� hluboko"
+msgstr "aliasy vnořené příliš hluboko"
 
-#: popt.c:1374
+#: popt.c:1462
 msgid "error in parameter quoting"
-msgstr "chyba v quotov�n� parametr�"
+msgstr "chyba v quotování parametrů"
 
-#: popt.c:1376
+#: popt.c:1464
 msgid "invalid numeric value"
-msgstr "chybn� numerick� hodnota"
+msgstr "chybná numerická hodnota"
 
-#: popt.c:1378
+#: popt.c:1466
 msgid "number too large or too small"
-msgstr "��slo je p��li� velk� nebo p��li� mal�"
+msgstr "číslo je příliš velké nebo příliš malé"
 
-#: popt.c:1380
+#: popt.c:1468
 msgid "memory allocation failed"
-msgstr "selhala alokace pam�ti"
+msgstr "selhala alokace paměti"
 
-#: popt.c:1384
+#: popt.c:1470
+msgid "config file failed sanity test"
+msgstr ""
+
+#: popt.c:1474
 msgid "unknown error"
-msgstr "nezn�m� chyba"
+msgstr "neznámá chyba"
 
 #: popthelp.c:75 popthelp.c:86
 msgid "Show this help message"
-msgstr "Vyp��e tuto n�pov�du"
+msgstr "Vypíše tuto nápovědu"
 
 #: popthelp.c:76 popthelp.c:87
 msgid "Display brief usage message"
-msgstr "Vyp��e kr�tk� n�vod k pou�it�"
+msgstr "Vypíše krátký návod k použití"
 
 #: popthelp.c:90
 msgid "Display option defaults in message"
-msgstr "Zobrazit implicitn� volby ve zpr�v�"
+msgstr "Zobrazit implicitní volby ve zprávě"
 
 #: popthelp.c:92
 msgid "Terminate options"
-msgstr ""
+msgstr "Ukončí volby"
 
 #: popthelp.c:191
 msgid "Help options:"
-msgstr ""
+msgstr "Volby nápovědy:"
 
 #: popthelp.c:192
 msgid "Options implemented via popt alias/exec:"
-msgstr ""
+msgstr "Volby implementované přes alias/exec poptu:"
 
 #: popthelp.c:200
 msgid "NONE"
@@ -100,9 +110,8 @@ msgid "LONG"
 msgstr "LONG"
 
 #: popthelp.c:208
-#, fuzzy
 msgid "LONGLONG"
-msgstr "LONG"
+msgstr "LONGLONG"
 
 #: popthelp.c:209
 msgid "STRING"
@@ -120,10 +129,10 @@ msgstr "DOUBLE"
 msgid "ARG"
 msgstr "ARG"
 
-#: popthelp.c:633
+#: popthelp.c:644
 msgid "Usage:"
-msgstr "Pou�it�:"
+msgstr "Použití:"
 
-#: popthelp.c:657
+#: popthelp.c:667
 msgid "[OPTION...]"
-msgstr "[VOLBY...]"
+msgstr "[VOLBY…]"
diff --git a/po/da.po b/po/da.po
index e277cf9..32c4607 100644
--- a/po/da.po
+++ b/po/da.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: popt-1.14\n"
 "Report-Msgid-Bugs-To: <popt-devel@rpm5.org>\n"
-"POT-Creation-Date: 2008-09-18 14:11-0400\n"
+"POT-Creation-Date: 2009-04-10 17:14-0400\n"
 "PO-Revision-Date: 2008-09-15 00:00+0000\n"
 "Last-Translator: Joe Hansen <joedalton2@yahoo.dk>\n"
 "Language-Team: Danish <dansk@dansk-gruppen.dk>\n"
@@ -16,52 +16,56 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: popt.c:42
+#: popt.c:47
 msgid "unknown errno"
 msgstr "ukendt fejlnr."
 
-#: popt.c:945
+#: popt.c:1031
 #, c-format
 msgid "option type (%u) not implemented in popt\n"
 msgstr "tilvalgstype (%u) er ikke implementeret i popt\n"
 
-#: popt.c:1364
+#: popt.c:1452
 msgid "missing argument"
 msgstr "mangler argument"
 
-#: popt.c:1366
+#: popt.c:1454
 msgid "unknown option"
 msgstr "ukendt tilvalg"
 
-#: popt.c:1368
+#: popt.c:1456
 msgid "mutually exclusive logical operations requested"
 msgstr "de ønskede handlinger udelukker hinanden"
 
-#: popt.c:1370
+#: popt.c:1458
 msgid "opt->arg should not be NULL"
 msgstr "opt->arg bør ikke være NULL"
 
-#: popt.c:1372
+#: popt.c:1460
 msgid "aliases nested too deeply"
 msgstr "aliaser er for dybt indlejret"
 
-#: popt.c:1374
+#: popt.c:1462
 msgid "error in parameter quoting"
 msgstr "fejl i parameter citering"
 
-#: popt.c:1376
+#: popt.c:1464
 msgid "invalid numeric value"
 msgstr "ugyldig numerisk værdi"
 
-#: popt.c:1378
+#: popt.c:1466
 msgid "number too large or too small"
 msgstr "nummer for stort, eller for lille"
 
-#: popt.c:1380
+#: popt.c:1468
 msgid "memory allocation failed"
 msgstr "hukommelsestildeling mislykkedes"
 
-#: popt.c:1384
+#: popt.c:1470
+msgid "config file failed sanity test"
+msgstr ""
+
+#: popt.c:1474
 msgid "unknown error"
 msgstr "ukendt fejl"
 
@@ -125,10 +129,10 @@ msgstr "DOUBLE"
 msgid "ARG"
 msgstr "ARG"
 
-#: popthelp.c:633
+#: popthelp.c:644
 msgid "Usage:"
 msgstr "Brug:"
 
-#: popthelp.c:657
+#: popthelp.c:667
 msgid "[OPTION...]"
 msgstr "[TILVALG...]"
diff --git a/po/de.po b/po/de.po
index efcefe8..aff1714 100644
--- a/po/de.po
+++ b/po/de.po
@@ -1,65 +1,69 @@
 # Translation of popt to German (Deutsch)
 # This file is distributed under the same license as the popt package.
-# Robert Scheck <robert@rpm5.org>, 2004-2008.
+# Robert Scheck <rpm@robert-scheck.de>, 2004-2007.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: popt 1.15\n"
+"Project-Id-Version: popt 1.11\n"
 "Report-Msgid-Bugs-To: <popt-devel@rpm5.org>\n"
-"POT-Creation-Date: 2008-09-18 14:11-0400\n"
-"PO-Revision-Date: 2008-05-25 14:39+0200\n"
-"Last-Translator: Robert Scheck <robert@rpm5.org>\n"
+"POT-Creation-Date: 2009-04-10 17:14-0400\n"
+"PO-Revision-Date: 2007-02-17 21:00+0100\n"
+"Last-Translator: Robert Scheck <rpm@robert-scheck.de>\n"
 "Language-Team: German <de@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: popt.c:42
+#: popt.c:47
 msgid "unknown errno"
 msgstr "Unbekannte Fehler-Nummer"
 
-#: popt.c:945
-#, c-format
+#: popt.c:1031
+#, fuzzy, c-format
 msgid "option type (%u) not implemented in popt\n"
-msgstr "Optionstyp (%u) ist nicht in popt implementiert\n"
+msgstr "Optionstyp (%d) ist in popt nicht vorhanden\n"
 
-#: popt.c:1364
+#: popt.c:1452
 msgid "missing argument"
 msgstr "Fehlendes Argument"
 
-#: popt.c:1366
+#: popt.c:1454
 msgid "unknown option"
 msgstr "Unbekannte Option"
 
-#: popt.c:1368
+#: popt.c:1456
 msgid "mutually exclusive logical operations requested"
 msgstr "Gegenseitig ausschließende logische Operatoren"
 
-#: popt.c:1370
+#: popt.c:1458
 msgid "opt->arg should not be NULL"
 msgstr "opt->arg sollte nicht NULL sein"
 
-#: popt.c:1372
+#: popt.c:1460
 msgid "aliases nested too deeply"
 msgstr "Aliase zu tief verschachtelt"
 
-#: popt.c:1374
+#: popt.c:1462
 msgid "error in parameter quoting"
 msgstr "Fehler beim Quotieren der Parameter"
 
-#: popt.c:1376
+#: popt.c:1464
 msgid "invalid numeric value"
 msgstr "Ungültiger nummerischer Wert"
 
-#: popt.c:1378
+#: popt.c:1466
 msgid "number too large or too small"
 msgstr "Nummer zu groß oder zu klein"
 
-#: popt.c:1380
+#: popt.c:1468
 msgid "memory allocation failed"
 msgstr "Speicherzuordnung fehlgeschlagen"
 
-#: popt.c:1384
+#: popt.c:1470
+msgid "config file failed sanity test"
+msgstr ""
+
+#: popt.c:1474
 msgid "unknown error"
 msgstr "Unbekannter Fehler"
 
@@ -76,8 +80,9 @@ msgid "Display option defaults in message"
 msgstr "Zeigt die Standardeinstellungen an"
 
 #: popthelp.c:92
+#, fuzzy
 msgid "Terminate options"
-msgstr "Schließt die Optionen ab"
+msgstr "Hilfe-Optionen:"
 
 #: popthelp.c:191
 msgid "Help options:"
@@ -104,8 +109,9 @@ msgid "LONG"
 msgstr "LONG"
 
 #: popthelp.c:208
+#, fuzzy
 msgid "LONGLONG"
-msgstr "LONGLONG"
+msgstr "LONG"
 
 #: popthelp.c:209
 msgid "STRING"
@@ -123,10 +129,10 @@ msgstr "DOUBLE"
 msgid "ARG"
 msgstr "ARGUMENT"
 
-#: popthelp.c:633
+#: popthelp.c:644
 msgid "Usage:"
 msgstr "Verwendung:"
 
-#: popthelp.c:657
+#: popthelp.c:667
 msgid "[OPTION...]"
 msgstr "[OPTION...]"
diff --git a/po/eo.po b/po/eo.po
index 5e56196..03e39d3 100644
--- a/po/eo.po
+++ b/po/eo.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.14\n"
 "Report-Msgid-Bugs-To: <popt-devel@rpm5.org>\n"
-"POT-Creation-Date: 2008-02-16 19:54-0500\n"
+"POT-Creation-Date: 2009-04-10 17:14-0400\n"
 "PO-Revision-Date: 2008-08-03 15:50-0300\n"
 "Last-Translator: Felipe Castro <fefcas@gmail.com>\n"
 "Language-Team: Esperanto <translation-team-eo@lists.sourceforge.net>\n"
@@ -14,71 +14,75 @@ msgstr ""
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: popt.c:35
+#: popt.c:47
 msgid "unknown errno"
 msgstr "nekonata erarnumero"
 
-#: popt.c:1090
+#: popt.c:1031
 #, c-format
 msgid "option type (%u) not implemented in popt\n"
 msgstr "la opcia tipo (%u) ne estas realigita en popt\n"
 
-#: popt.c:1294
+#: popt.c:1452
 msgid "missing argument"
 msgstr "mankas argumento"
 
-#: popt.c:1296
+#: popt.c:1454
 msgid "unknown option"
 msgstr "nekonata opcio"
 
-#: popt.c:1298
+#: popt.c:1456
 msgid "mutually exclusive logical operations requested"
 msgstr "reciprokaj logikaj operacioj estas postulataj"
 
-#: popt.c:1300
+#: popt.c:1458
 msgid "opt->arg should not be NULL"
 msgstr "opt->arg ne devus esti NULL"
 
-#: popt.c:1302
+#: popt.c:1460
 msgid "aliases nested too deeply"
 msgstr "kromnomoj estas ingitaj tro profunde"
 
-#: popt.c:1304
+#: popt.c:1462
 msgid "error in parameter quoting"
 msgstr "eraro en parametra citado"
 
-#: popt.c:1306
+#: popt.c:1464
 msgid "invalid numeric value"
 msgstr "nevalida numera valoro"
 
-#: popt.c:1308
+#: popt.c:1466
 msgid "number too large or too small"
 msgstr "numero tro granda aŭ tro eta"
 
-#: popt.c:1310
+#: popt.c:1468
 msgid "memory allocation failed"
 msgstr "malsukceso dum okupado de memoro"
 
-#: popt.c:1314
+#: popt.c:1470
+msgid "config file failed sanity test"
+msgstr ""
+
+#: popt.c:1474
 msgid "unknown error"
 msgstr "nekonata eraro"
 
-#: popthelp.c:74 popthelp.c:86
+#: popthelp.c:75 popthelp.c:86
 msgid "Show this help message"
 msgstr "Montri tiun ĉi helpmesaĝon"
 
-#: popthelp.c:75 popthelp.c:87
+#: popthelp.c:76 popthelp.c:87
 msgid "Display brief usage message"
 msgstr "Montri resumitan mesaĝon pri uzado"
 
-#: popthelp.c:76 popthelp.c:92
-msgid "Terminate options"
-msgstr "Opcioj pri finiĝo"
-
 #: popthelp.c:90
 msgid "Display option defaults in message"
 msgstr "Montri la implicitajn valorojn de la opcio en la mesaĝo"
 
+#: popthelp.c:92
+msgid "Terminate options"
+msgstr "Opcioj pri finiĝo"
+
 #: popthelp.c:191
 msgid "Help options:"
 msgstr "Help-opcioj:"
@@ -123,10 +127,10 @@ msgstr "DOUBLE"
 msgid "ARG"
 msgstr "ARG"
 
-#: popthelp.c:634
+#: popthelp.c:644
 msgid "Usage:"
 msgstr "Uzado:"
 
-#: popthelp.c:658
+#: popthelp.c:667
 msgid "[OPTION...]"
 msgstr "[OPCIO...]"
diff --git a/po/es.po b/po/es.po
index 27c96c8..146a158 100644
--- a/po/es.po
+++ b/po/es.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.12\n"
 "Report-Msgid-Bugs-To: <popt-devel@rpm5.org>\n"
-"POT-Creation-Date: 2008-09-18 14:11-0400\n"
+"POT-Creation-Date: 2009-04-10 17:14-0400\n"
 "PO-Revision-Date: 2007-12-28 12:22+0100\n"
 "Last-Translator: Leandro Lucarella <luca@linuxmendoza.org.ar>\n"
 "Language-Team: Spanish <es@li.org>\n"
@@ -14,52 +14,56 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: popt.c:42
+#: popt.c:47
 msgid "unknown errno"
 msgstr "errno desconocido"
 
-#: popt.c:945
+#: popt.c:1031
 #, fuzzy, c-format
 msgid "option type (%u) not implemented in popt\n"
 msgstr "tipo de opción (%d) no implementada en popt\n"
 
-#: popt.c:1364
+#: popt.c:1452
 msgid "missing argument"
 msgstr "falta argumento"
 
-#: popt.c:1366
+#: popt.c:1454
 msgid "unknown option"
 msgstr "opción desconocida"
 
-#: popt.c:1368
+#: popt.c:1456
 msgid "mutually exclusive logical operations requested"
 msgstr "requerida operación lógica mutuamente exclusiva"
 
-#: popt.c:1370
+#: popt.c:1458
 msgid "opt->arg should not be NULL"
 msgstr ""
 
-#: popt.c:1372
+#: popt.c:1460
 msgid "aliases nested too deeply"
 msgstr "alias anidados muy profundamente"
 
-#: popt.c:1374
+#: popt.c:1462
 msgid "error in parameter quoting"
 msgstr "error en cita de parámetros"
 
-#: popt.c:1376
+#: popt.c:1464
 msgid "invalid numeric value"
 msgstr "valor numérico inválido"
 
-#: popt.c:1378
+#: popt.c:1466
 msgid "number too large or too small"
 msgstr "número muy largo o muy pequeño"
 
-#: popt.c:1380
+#: popt.c:1468
 msgid "memory allocation failed"
 msgstr ""
 
-#: popt.c:1384
+#: popt.c:1470
+msgid "config file failed sanity test"
+msgstr ""
+
+#: popt.c:1474
 msgid "unknown error"
 msgstr "error desconocido"
 
@@ -124,10 +128,10 @@ msgstr "DOUBLE"
 msgid "ARG"
 msgstr "ARG"
 
-#: popthelp.c:633
+#: popthelp.c:644
 msgid "Usage:"
 msgstr "Modo de uso:"
 
-#: popthelp.c:657
+#: popthelp.c:667
 msgid "[OPTION...]"
 msgstr "[OPCIÓN...]"
diff --git a/po/fi.po b/po/fi.po
index 54111f2..e494568 100644
--- a/po/fi.po
+++ b/po/fi.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.14\n"
 "Report-Msgid-Bugs-To: <popt-devel@rpm5.org>\n"
-"POT-Creation-Date: 2008-09-18 14:11-0400\n"
+"POT-Creation-Date: 2009-04-10 17:14-0400\n"
 "PO-Revision-Date: 2008-02-21 18:19+0200\n"
 "Last-Translator: Jorma Karvonen <karvjorm@users.sf.net>\n"
 "Language-Team: Finnish <translation-team-fi@lists.sourceforge.net>\n"
@@ -19,52 +19,56 @@ msgstr ""
 "X-Generator: KBabel 1.11.4\n"
 
 #  errno - number of last error (defined by the ISO C standard)
-#: popt.c:42
+#: popt.c:47
 msgid "unknown errno"
 msgstr "tuntematon errno-virhenumeroarvo"
 
-#: popt.c:945
+#: popt.c:1031
 #, c-format
 msgid "option type (%u) not implemented in popt\n"
 msgstr "valitsintyyppiä (%u) ei ole toteutettu popt-ohjelmassa\n"
 
-#: popt.c:1364
+#: popt.c:1452
 msgid "missing argument"
 msgstr "puuttuva argumentti"
 
-#: popt.c:1366
+#: popt.c:1454
 msgid "unknown option"
 msgstr "tuntematon valitsin"
 
-#: popt.c:1368
+#: popt.c:1456
 msgid "mutually exclusive logical operations requested"
 msgstr "pyydettyjä loogisia toimintoja ei voi käyttää yhdessä"
 
-#: popt.c:1370
+#: popt.c:1458
 msgid "opt->arg should not be NULL"
 msgstr "”opt->arg”-valitsinargumentti ei saa olla NULL"
 
-#: popt.c:1372
+#: popt.c:1460
 msgid "aliases nested too deeply"
 msgstr "liian monta aliasta sisäkkäin"
 
-#: popt.c:1374
+#: popt.c:1462
 msgid "error in parameter quoting"
 msgstr "virhe parametrien lainauksessa"
 
-#: popt.c:1376
+#: popt.c:1464
 msgid "invalid numeric value"
 msgstr "virheellinen numeroarvo"
 
-#: popt.c:1378
+#: popt.c:1466
 msgid "number too large or too small"
 msgstr "numero on liian iso tai liian pieni"
 
-#: popt.c:1380
+#: popt.c:1468
 msgid "memory allocation failed"
 msgstr "muistin varaus ei onnistunut"
 
-#: popt.c:1384
+#: popt.c:1470
+msgid "config file failed sanity test"
+msgstr ""
+
+#: popt.c:1474
 msgid "unknown error"
 msgstr "tuntematon virhe"
 
@@ -130,10 +134,10 @@ msgstr "DOUBLE-LIUKULUKU"
 msgid "ARG"
 msgstr "ARGUMENTTI"
 
-#: popthelp.c:633
+#: popthelp.c:644
 msgid "Usage:"
 msgstr "Käyttö:"
 
-#: popthelp.c:657
+#: popthelp.c:667
 msgid "[OPTION...]"
 msgstr "[VALITSIN...]"
diff --git a/po/fr.po b/po/fr.po
index c4d2a0c..9860aee 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -12,7 +12,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.11\n"
 "Report-Msgid-Bugs-To: <popt-devel@rpm5.org>\n"
-"POT-Creation-Date: 2008-09-18 14:11-0400\n"
+"POT-Creation-Date: 2009-04-10 17:14-0400\n"
 "PO-Revision-Date: 2003-06-22 23:43+0200\n"
 "Last-Translator: RPM French Translation <rpm-fr@livna.org>\n"
 "Language-Team: RPM French Translation <rpm-fr@livna.org>\n"
@@ -20,52 +20,56 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8-bit\n"
 
-#: popt.c:42
+#: popt.c:47
 msgid "unknown errno"
 msgstr "errno inconnu"
 
-#: popt.c:945
+#: popt.c:1031
 #, fuzzy, c-format
 msgid "option type (%u) not implemented in popt\n"
 msgstr "type(%d) d'option non implémenté dans popt\n"
 
-#: popt.c:1364
+#: popt.c:1452
 msgid "missing argument"
 msgstr "argument manquant"
 
-#: popt.c:1366
+#: popt.c:1454
 msgid "unknown option"
 msgstr "option iconnue"
 
-#: popt.c:1368
+#: popt.c:1456
 msgid "mutually exclusive logical operations requested"
 msgstr "opérations logiques mutuellement exclusives requises"
 
-#: popt.c:1370
+#: popt.c:1458
 msgid "opt->arg should not be NULL"
 msgstr "opt->arg ne devrait pas être NULL"
 
-#: popt.c:1372
+#: popt.c:1460
 msgid "aliases nested too deeply"
 msgstr "les alias sont trop entremellés"
 
-#: popt.c:1374
+#: popt.c:1462
 msgid "error in parameter quoting"
 msgstr "erreur en citant les paramètres"
 
-#: popt.c:1376
+#: popt.c:1464
 msgid "invalid numeric value"
 msgstr "valeur numérique invalide"
 
-#: popt.c:1378
+#: popt.c:1466
 msgid "number too large or too small"
 msgstr "nombre trop grand ou trop petit"
 
-#: popt.c:1380
+#: popt.c:1468
 msgid "memory allocation failed"
 msgstr "échec de l'allocation de mémoire"
 
-#: popt.c:1384
+#: popt.c:1470
+msgid "config file failed sanity test"
+msgstr ""
+
+#: popt.c:1474
 msgid "unknown error"
 msgstr "erreur inconnue"
 
@@ -130,10 +134,10 @@ msgstr "DOUBLE"
 msgid "ARG"
 msgstr "ARG"
 
-#: popthelp.c:633
+#: popthelp.c:644
 msgid "Usage:"
 msgstr "Utilisation:"
 
-#: popthelp.c:657
+#: popthelp.c:667
 msgid "[OPTION...]"
 msgstr "[OPTION...]"
diff --git a/po/ga.po b/po/ga.po
index 1613473..fa30a1c 100644
--- a/po/ga.po
+++ b/po/ga.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.14\n"
 "Report-Msgid-Bugs-To: <popt-devel@rpm5.org>\n"
-"POT-Creation-Date: 2008-09-18 14:11-0400\n"
+"POT-Creation-Date: 2009-04-10 17:14-0400\n"
 "PO-Revision-Date: 2008-04-10 06:21-0500\n"
 "Last-Translator: Kevin Scannell <kscanne@gmail.com>\n"
 "Language-Team: Irish <gaeilge-gnulinux@lists.sourceforge.net>\n"
@@ -14,52 +14,56 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: popt.c:42
+#: popt.c:47
 msgid "unknown errno"
 msgstr "errno anaithnid"
 
-#: popt.c:945
+#: popt.c:1031
 #, c-format
 msgid "option type (%u) not implemented in popt\n"
 msgstr "níl an cineál rogha seo (%u) ar fáil i popt\n"
 
-#: popt.c:1364
+#: popt.c:1452
 msgid "missing argument"
 msgstr "argóint ar iarraidh"
 
-#: popt.c:1366
+#: popt.c:1454
 msgid "unknown option"
 msgstr "rogha anaithnid"
 
-#: popt.c:1368
+#: popt.c:1456
 msgid "mutually exclusive logical operations requested"
 msgstr "iarradh oibríochtaí loighciúla comheisiacha"
 
-#: popt.c:1370
+#: popt.c:1458
 msgid "opt->arg should not be NULL"
 msgstr "níor chóir rogha->arg a bheith NULL"
 
-#: popt.c:1372
+#: popt.c:1460
 msgid "aliases nested too deeply"
 msgstr "ailiasanna neadaithe ródhomhain"
 
-#: popt.c:1374
+#: popt.c:1462
 msgid "error in parameter quoting"
 msgstr "earráid agus paraiméadar á chur faoi chomharthaí athfhriotail"
 
-#: popt.c:1376
+#: popt.c:1464
 msgid "invalid numeric value"
 msgstr "luach neamhbhailí uimhriúil"
 
-#: popt.c:1378
+#: popt.c:1466
 msgid "number too large or too small"
 msgstr "uimhir rómhór nó róbheag"
 
-#: popt.c:1380
+#: popt.c:1468
 msgid "memory allocation failed"
 msgstr "theip ar dháileadh na cuimhne"
 
-#: popt.c:1384
+#: popt.c:1470
+msgid "config file failed sanity test"
+msgstr ""
+
+#: popt.c:1474
 msgid "unknown error"
 msgstr "earráid anaithnid"
 
@@ -124,10 +128,10 @@ msgstr "DOUBLE"
 msgid "ARG"
 msgstr "ARG"
 
-#: popthelp.c:633
+#: popthelp.c:644
 msgid "Usage:"
 msgstr "Úsáid:"
 
-#: popthelp.c:657
+#: popthelp.c:667
 msgid "[OPTION...]"
 msgstr "[ROGHA...]"
diff --git a/po/gl.po b/po/gl.po
index ef5054d..c776b07 100644
--- a/po/gl.po
+++ b/po/gl.po
@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.11\n"
 "Report-Msgid-Bugs-To: <popt-devel@rpm5.org>\n"
-"POT-Creation-Date: 2008-09-18 14:11-0400\n"
+"POT-Creation-Date: 2009-04-10 17:14-0400\n"
 "PO-Revision-Date: 2001-01-17 01:01+0100\n"
 "Last-Translator: Jes�s Bravo �lvarez <jba@pobox.com>\n"
 "Language-Team: Galician <trasno@ceu.fi.udc.es>\n"
@@ -10,52 +10,56 @@ msgstr ""
 "Content-Type: text/plain; charset=iso-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: popt.c:42
+#: popt.c:47
 msgid "unknown errno"
 msgstr "errno desco�ecido"
 
-#: popt.c:945
+#: popt.c:1031
 #, fuzzy, c-format
 msgid "option type (%u) not implemented in popt\n"
 msgstr "tipo de opci�n (%d) non implementada en popt\n"
 
-#: popt.c:1364
+#: popt.c:1452
 msgid "missing argument"
 msgstr "falta un argumento"
 
-#: popt.c:1366
+#: popt.c:1454
 msgid "unknown option"
 msgstr "opci�n desco�ecida"
 
-#: popt.c:1368
+#: popt.c:1456
 msgid "mutually exclusive logical operations requested"
 msgstr "solicit�ronse operaci�ns l�xicas mutuamente exclu�ntes"
 
-#: popt.c:1370
+#: popt.c:1458
 msgid "opt->arg should not be NULL"
 msgstr ""
 
-#: popt.c:1372
+#: popt.c:1460
 msgid "aliases nested too deeply"
 msgstr "aliases ani�ados a un nivel demasiado profundo"
 
-#: popt.c:1374
+#: popt.c:1462
 msgid "error in parameter quoting"
 msgstr "erro nas comi�as do par�metro"
 
-#: popt.c:1376
+#: popt.c:1464
 msgid "invalid numeric value"
 msgstr "valor num�rico non v�lido"
 
-#: popt.c:1378
+#: popt.c:1466
 msgid "number too large or too small"
 msgstr "n�mero demasiado grande ou pequeno"
 
-#: popt.c:1380
+#: popt.c:1468
 msgid "memory allocation failed"
 msgstr ""
 
-#: popt.c:1384
+#: popt.c:1470
+msgid "config file failed sanity test"
+msgstr ""
+
+#: popt.c:1474
 msgid "unknown error"
 msgstr "erro desco�ecido"
 
@@ -121,10 +125,10 @@ msgstr "DOUBLE"
 msgid "ARG"
 msgstr "ARG"
 
-#: popthelp.c:633
+#: popthelp.c:644
 msgid "Usage:"
 msgstr "Uso:"
 
-#: popthelp.c:657
+#: popthelp.c:667
 msgid "[OPTION...]"
 msgstr "[OPCI�N...]"
diff --git a/po/hu.po b/po/hu.po
index fc63ada..0fe3f2d 100644
--- a/po/hu.po
+++ b/po/hu.po
@@ -5,7 +5,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.11\n"
 "Report-Msgid-Bugs-To: <popt-devel@rpm5.org>\n"
-"POT-Creation-Date: 2008-09-18 14:11-0400\n"
+"POT-Creation-Date: 2009-04-10 17:14-0400\n"
 "PO-Revision-Date: 2007-06-21 00:45+0200\n"
 "Last-Translator: Gabor Kelemen <kelemeng@gnome.hu>\n"
 "Language-Team: Hungarian <translation-team-hu@lists.sourceforge.net>\n"
@@ -15,52 +15,56 @@ msgstr ""
 "X-Generator: KBabel 1.11.4\n"
 "Plural-Forms:  nplurals=2; plural=(n != 1);\n"
 
-#: popt.c:42
+#: popt.c:47
 msgid "unknown errno"
 msgstr "ismeretlen hibaszám"
 
-#: popt.c:945
+#: popt.c:1031
 #, fuzzy, c-format
 msgid "option type (%u) not implemented in popt\n"
 msgstr "a kapcsolótípus (%d) nincs megvalósítva a popt-ban\n"
 
-#: popt.c:1364
+#: popt.c:1452
 msgid "missing argument"
 msgstr "hiányzó paraméter"
 
-#: popt.c:1366
+#: popt.c:1454
 msgid "unknown option"
 msgstr "ismeretlen kapcsoló"
 
-#: popt.c:1368
+#: popt.c:1456
 msgid "mutually exclusive logical operations requested"
 msgstr "kölcsönösen kizáró logikai műveleteket kért"
 
-#: popt.c:1370
+#: popt.c:1458
 msgid "opt->arg should not be NULL"
 msgstr "az opt->arg nem lehet NULL"
 
-#: popt.c:1372
+#: popt.c:1460
 msgid "aliases nested too deeply"
 msgstr "az álnevek túl mélyen vannak egymásba ágyazva"
 
-#: popt.c:1374
+#: popt.c:1462
 msgid "error in parameter quoting"
 msgstr "hiba a paraméter idézésében"
 
-#: popt.c:1376
+#: popt.c:1464
 msgid "invalid numeric value"
 msgstr "érvénytelen numerikus érték"
 
-#: popt.c:1378
+#: popt.c:1466
 msgid "number too large or too small"
 msgstr "a szám túl nagy vagy túl kicsi"
 
-#: popt.c:1380
+#: popt.c:1468
 msgid "memory allocation failed"
 msgstr "a memóriafoglalás meghiúsult"
 
-#: popt.c:1384
+#: popt.c:1470
+msgid "config file failed sanity test"
+msgstr ""
+
+#: popt.c:1474
 msgid "unknown error"
 msgstr "ismeretlen hiba"
 
@@ -126,10 +130,10 @@ msgstr "DUPLA"
 msgid "ARG"
 msgstr "PAR"
 
-#: popthelp.c:633
+#: popthelp.c:644
 msgid "Usage:"
 msgstr "Használat:"
 
-#: popthelp.c:657
+#: popthelp.c:667
 msgid "[OPTION...]"
 msgstr "[KAPCSOLÓ...]"
diff --git a/po/id.po b/po/id.po
index 4b25ec9..b64ab73 100644
--- a/po/id.po
+++ b/po/id.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.14\n"
 "Report-Msgid-Bugs-To: <popt-devel@rpm5.org>\n"
-"POT-Creation-Date: 2008-02-16 19:54-0500\n"
+"POT-Creation-Date: 2009-04-10 17:14-0400\n"
 "PO-Revision-Date: 2008-08-26 14:18+0700\n"
 "Last-Translator: Andhika Padmawan <andhika.padmawan@gmail.com>\n"
 "Language-Team: Indonesian <translation-team-id@lists.sourceforge.net>\n"
@@ -14,71 +14,75 @@ msgstr ""
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: popt.c:35
+#: popt.c:47
 msgid "unknown errno"
 msgstr "errno tak diketahui"
 
-#: popt.c:1090
+#: popt.c:1031
 #, c-format
 msgid "option type (%u) not implemented in popt\n"
 msgstr "tipe opsi (%u) tak diimplementasikan di popt\n"
 
-#: popt.c:1294
+#: popt.c:1452
 msgid "missing argument"
 msgstr "kehilangan argumen"
 
-#: popt.c:1296
+#: popt.c:1454
 msgid "unknown option"
 msgstr "opsi tak diketahui"
 
-#: popt.c:1298
+#: popt.c:1456
 msgid "mutually exclusive logical operations requested"
 msgstr "permintaan operasi logika eksklusif secara mutual"
 
-#: popt.c:1300
+#: popt.c:1458
 msgid "opt->arg should not be NULL"
 msgstr "opt->arg tidak boleh NULL"
 
-#: popt.c:1302
+#: popt.c:1460
 msgid "aliases nested too deeply"
 msgstr "alias disarangkan terlalu dalam"
 
-#: popt.c:1304
+#: popt.c:1462
 msgid "error in parameter quoting"
 msgstr "galat di pencantuman parameter"
 
-#: popt.c:1306
+#: popt.c:1464
 msgid "invalid numeric value"
 msgstr "nilai numerik tidak sah"
 
-#: popt.c:1308
+#: popt.c:1466
 msgid "number too large or too small"
 msgstr "nomor terlalu besar atau terlalu kecil"
 
-#: popt.c:1310
+#: popt.c:1468
 msgid "memory allocation failed"
 msgstr "alokasi memori gagal"
 
-#: popt.c:1314
+#: popt.c:1470
+msgid "config file failed sanity test"
+msgstr ""
+
+#: popt.c:1474
 msgid "unknown error"
 msgstr "galat tak diketahui"
 
-#: popthelp.c:74 popthelp.c:86
+#: popthelp.c:75 popthelp.c:86
 msgid "Show this help message"
 msgstr "Tampilkan pesan bantuan ini"
 
-#: popthelp.c:75 popthelp.c:87
+#: popthelp.c:76 popthelp.c:87
 msgid "Display brief usage message"
 msgstr "Tampilkan pesan penggunaan singkat"
 
-#: popthelp.c:76 popthelp.c:92
-msgid "Terminate options"
-msgstr "Matikan opsi"
-
 #: popthelp.c:90
 msgid "Display option defaults in message"
 msgstr "Tampilkan opsi standar dalam pesan"
 
+#: popthelp.c:92
+msgid "Terminate options"
+msgstr "Matikan opsi"
+
 #: popthelp.c:191
 msgid "Help options:"
 msgstr "Opsi bantuan:"
@@ -123,10 +127,10 @@ msgstr "DOUBLE"
 msgid "ARG"
 msgstr "ARG"
 
-#: popthelp.c:634
+#: popthelp.c:644
 msgid "Usage:"
 msgstr "Penggunaan:"
 
-#: popthelp.c:658
+#: popthelp.c:667
 msgid "[OPTION...]"
 msgstr "[OPSI...]"
diff --git a/po/is.po b/po/is.po
index 5584649..0985329 100644
--- a/po/is.po
+++ b/po/is.po
@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.11\n"
 "Report-Msgid-Bugs-To: <popt-devel@rpm5.org>\n"
-"POT-Creation-Date: 2008-09-18 14:11-0400\n"
+"POT-Creation-Date: 2009-04-10 17:14-0400\n"
 "PO-Revision-Date: 2001-06-08 01:35+0000\n"
 "Last-Translator: Richard Allen <ra@hp.is>\n"
 "Language-Team: is <kde-isl@mmedia.is>\n"
@@ -10,52 +10,56 @@ msgstr ""
 "Content-Type: text/plain; charset=ISO-8859-1\n"
 "Content-Transfer-Encoding: 8-bit\n"
 
-#: popt.c:42
+#: popt.c:47
 msgid "unknown errno"
 msgstr "��ekkt villun�mer"
 
-#: popt.c:945
+#: popt.c:1031
 #, fuzzy, c-format
 msgid "option type (%u) not implemented in popt\n"
 msgstr "rofager�in (%d) er ekki studd � popt\n"
 
-#: popt.c:1364
+#: popt.c:1452
 msgid "missing argument"
 msgstr "vantar vi�fang"
 
-#: popt.c:1366
+#: popt.c:1454
 msgid "unknown option"
 msgstr "��ekktur rofi"
 
-#: popt.c:1368
+#: popt.c:1456
 msgid "mutually exclusive logical operations requested"
 msgstr "be�i� um rofa sem sl�kkva hvor � ��rum"
 
-#: popt.c:1370
+#: popt.c:1458
 msgid "opt->arg should not be NULL"
 msgstr "opt->arg �tti ekki a� vera NULL"
 
-#: popt.c:1372
+#: popt.c:1460
 msgid "aliases nested too deeply"
 msgstr "al�asar of fl�knir"
 
-#: popt.c:1374
+#: popt.c:1462
 msgid "error in parameter quoting"
 msgstr "villa � vi�f�ngum (g�salappir og svo frv.)"
 
-#: popt.c:1376
+#: popt.c:1464
 msgid "invalid numeric value"
 msgstr "�gilt t�lulegt gildi"
 
-#: popt.c:1378
+#: popt.c:1466
 msgid "number too large or too small"
 msgstr "talan of st�r e�a sm�"
 
-#: popt.c:1380
+#: popt.c:1468
 msgid "memory allocation failed"
 msgstr "ekki t�kst a� taka fr� minni"
 
-#: popt.c:1384
+#: popt.c:1470
+msgid "config file failed sanity test"
+msgstr ""
+
+#: popt.c:1474
 msgid "unknown error"
 msgstr "��ekkt villa"
 
@@ -120,10 +124,10 @@ msgstr "DOUBLE"
 msgid "ARG"
 msgstr "ARG"
 
-#: popthelp.c:633
+#: popthelp.c:644
 msgid "Usage:"
 msgstr "Notkun:"
 
-#: popthelp.c:657
+#: popthelp.c:667
 msgid "[OPTION...]"
 msgstr "[ROFI...]"
diff --git a/po/it.po b/po/it.po
index 4a54388..3fd9101 100644
--- a/po/it.po
+++ b/po/it.po
@@ -1,67 +1,72 @@
-# Italian translations for popt.
-# Copyright (C) 2007 Free Software Foundation, Inc.
-# Sandro Bonazzola <sandro.bonazzola@gmail.com>, 2007
+# ITALIAN TRANSLATION OF POPT-1.14
+# This file is put in the public domain.
 #
+# Sandro Bonazzola <sandro.bonazzola@gmail.com>, 2007
+# Vincenzo Campanella <vinz65@gmail.com>, 2008.
 msgid ""
 msgstr ""
-"Project-Id-Version: popt 1.12\n"
+"Project-Id-Version: popt-1.14\n"
 "Report-Msgid-Bugs-To: <popt-devel@rpm5.org>\n"
-"POT-Creation-Date: 2008-09-18 14:11-0400\n"
-"PO-Revision-Date: 2007-11-14 20:39+0100\n"
-"Last-Translator: Sandro Bonazzola <sandro.bonazzola@gmail.com>\n"
+"POT-Creation-Date: 2009-04-10 17:14-0400\n"
+"PO-Revision-Date: 2008-11-28 15:32+0100\n"
+"Last-Translator: Vincenzo Campanella <vinz65@gmail.com>\n"
 "Language-Team: Italian <tp@lists.linux.it>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Poedit-Language: Italian\n"
-"X-Poedit-Country: ITALY\n"
+"First-Translator: Sandro Bonazzola <sandro.bonazzola@gmail.com>\n"
+"X-Generator: KBabel 1.11.4\n"
 
-#: popt.c:42
+#: popt.c:47
 msgid "unknown errno"
 msgstr "errno sconosciuto"
 
-#: popt.c:945
-#, fuzzy, c-format
+#: popt.c:1031
+#, c-format
 msgid "option type (%u) not implemented in popt\n"
-msgstr "opzione di tipo (%d) non implementata in popt\n"
+msgstr "tipo di opzione (%u) non implementato in popt\n"
 
-#: popt.c:1364
+#: popt.c:1452
 msgid "missing argument"
 msgstr "argomento mancante"
 
-#: popt.c:1366
+#: popt.c:1454
 msgid "unknown option"
 msgstr "opzione sconosciuta"
 
-#: popt.c:1368
+#: popt.c:1456
 msgid "mutually exclusive logical operations requested"
-msgstr "richieste operazioni logiche mutuamente esclusive"
+msgstr "richieste operazioni logiche reciprocamente esclusive"
 
-#: popt.c:1370
+#: popt.c:1458
 msgid "opt->arg should not be NULL"
 msgstr "opt->arg non dovrebbe essere NULL"
 
-#: popt.c:1372
+#: popt.c:1460
 msgid "aliases nested too deeply"
-msgstr "alias nidificati troppo profondamente"
+msgstr "alias nidificati troppo in profondità"
 
-#: popt.c:1374
+#: popt.c:1462
 msgid "error in parameter quoting"
 msgstr "errore nel quoting del parametro"
 
-#: popt.c:1376
+#: popt.c:1464
 msgid "invalid numeric value"
-msgstr "valore numerico errato"
+msgstr "valore numerico non valido"
 
-#: popt.c:1378
+#: popt.c:1466
 msgid "number too large or too small"
 msgstr "numero troppo grande o troppo piccolo"
 
-#: popt.c:1380
+#: popt.c:1468
 msgid "memory allocation failed"
 msgstr "allocazione di memoria fallita"
 
-#: popt.c:1384
+#: popt.c:1470
+msgid "config file failed sanity test"
+msgstr ""
+
+#: popt.c:1474
 msgid "unknown error"
 msgstr "errore sconosciuto"
 
@@ -75,19 +80,19 @@ msgstr "Mostra un breve messaggio di utilizzo"
 
 #: popthelp.c:90
 msgid "Display option defaults in message"
-msgstr "Mostra i valori predefiniti delle opzioni nei messaggi"
+msgstr "Mostra le opzioni predefinite nel messaggio"
 
 #: popthelp.c:92
 msgid "Terminate options"
-msgstr ""
+msgstr "Opzioni di terminazione"
 
 #: popthelp.c:191
 msgid "Help options:"
-msgstr ""
+msgstr "Opzioni di aiuto:"
 
 #: popthelp.c:192
 msgid "Options implemented via popt alias/exec:"
-msgstr ""
+msgstr "Opzioni implementate tramite alias/exec di popt:"
 
 #: popthelp.c:200
 msgid "NONE"
@@ -106,9 +111,8 @@ msgid "LONG"
 msgstr "LONG"
 
 #: popthelp.c:208
-#, fuzzy
 msgid "LONGLONG"
-msgstr "LONG"
+msgstr "LONGLONG"
 
 #: popthelp.c:209
 msgid "STRING"
@@ -126,10 +130,10 @@ msgstr "DOUBLE"
 msgid "ARG"
 msgstr "ARG"
 
-#: popthelp.c:633
+#: popthelp.c:644
 msgid "Usage:"
 msgstr "Uso:"
 
-#: popthelp.c:657
+#: popthelp.c:667
 msgid "[OPTION...]"
 msgstr "[OPZIONE...]"
diff --git a/po/ja.po b/po/ja.po
index 40e0955..5c3d00a 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.11\n"
 "Report-Msgid-Bugs-To: <popt-devel@rpm5.org>\n"
-"POT-Creation-Date: 2008-09-18 14:11-0400\n"
+"POT-Creation-Date: 2009-04-10 17:14-0400\n"
 "PO-Revision-Date: 2003--8-25 19:00+0900\n"
 "Last-Translator: Yukihiro Nakai <ynakai@redhat.com>\n"
 "Language-Team: Japanese <ja@li.org>\n"
@@ -14,52 +14,56 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: popt.c:42
+#: popt.c:47
 msgid "unknown errno"
 msgstr "不明なエラー番号"
 
-#: popt.c:945
+#: popt.c:1031
 #, fuzzy, c-format
 msgid "option type (%u) not implemented in popt\n"
 msgstr "オプションタイプ (%d) はpoptには実装されていません\n"
 
-#: popt.c:1364
+#: popt.c:1452
 msgid "missing argument"
 msgstr "引数がありません"
 
-#: popt.c:1366
+#: popt.c:1454
 msgid "unknown option"
 msgstr "不明なオプション"
 
-#: popt.c:1368
+#: popt.c:1456
 msgid "mutually exclusive logical operations requested"
 msgstr "排他的な悪ぺーレーションが必要です"
 
-#: popt.c:1370
+#: popt.c:1458
 msgid "opt->arg should not be NULL"
 msgstr "opt->argはNULLではいけません"
 
-#: popt.c:1372
+#: popt.c:1460
 msgid "aliases nested too deeply"
 msgstr "エイリアスのネストが深すぎます"
 
-#: popt.c:1374
+#: popt.c:1462
 msgid "error in parameter quoting"
 msgstr "パラメータのクオート付けでエラー"
 
-#: popt.c:1376
+#: popt.c:1464
 msgid "invalid numeric value"
 msgstr "不正な数値"
 
-#: popt.c:1378
+#: popt.c:1466
 msgid "number too large or too small"
 msgstr "数値が大きすぎるか小さすぎます"
 
-#: popt.c:1380
+#: popt.c:1468
 msgid "memory allocation failed"
 msgstr "メモリ確保に失敗しました"
 
-#: popt.c:1384
+#: popt.c:1470
+msgid "config file failed sanity test"
+msgstr ""
+
+#: popt.c:1474
 msgid "unknown error"
 msgstr "不明なエラー"
 
@@ -125,10 +129,10 @@ msgstr "DOUBLE"
 msgid "ARG"
 msgstr "ARG"
 
-#: popthelp.c:633
+#: popthelp.c:644
 msgid "Usage:"
 msgstr "使い方:"
 
-#: popthelp.c:657
+#: popthelp.c:667
 msgid "[OPTION...]"
 msgstr "[オプション...]"
diff --git a/po/ko.po b/po/ko.po
index 68dcada..a29b2ce 100644
--- a/po/ko.po
+++ b/po/ko.po
@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.11\n"
 "Report-Msgid-Bugs-To: <popt-devel@rpm5.org>\n"
-"POT-Creation-Date: 2008-09-18 14:11-0400\n"
+"POT-Creation-Date: 2009-04-10 17:14-0400\n"
 "PO-Revision-Date: 2001-09-06 20:06+0900\n"
 "Last-Translator: Jong-Hoon Ryu <redhat4u@netian.com>\n"
 "Language-Team: GNU Translation project <ko@li.org>\n"
@@ -10,52 +10,56 @@ msgstr ""
 "Content-Type: text/plain; charset=EUC-KR\n"
 "Content-Transfer-Encoding: 8-bit\n"
 
-#: popt.c:42
+#: popt.c:47
 msgid "unknown errno"
 msgstr "�� �� ���� �����ڵ�(errno) �Դϴ�"
 
-#: popt.c:945
+#: popt.c:1031
 #, fuzzy, c-format
 msgid "option type (%u) not implemented in popt\n"
 msgstr "�ɼ� ���� (%d)�� popt���� ����� �� �����ϴ�\n"
 
-#: popt.c:1364
+#: popt.c:1452
 msgid "missing argument"
 msgstr "�μ��� �������� �ʾҽ��ϴ�"
 
-#: popt.c:1366
+#: popt.c:1454
 msgid "unknown option"
 msgstr "�� �� ���� �ɼ��Դϴ�"
 
-#: popt.c:1368
+#: popt.c:1456
 msgid "mutually exclusive logical operations requested"
 msgstr "���ʿ� ��Ÿ�� ���� ������ �����Ǿ����ϴ�"
 
-#: popt.c:1370
+#: popt.c:1458
 msgid "opt->arg should not be NULL"
 msgstr "�ɼ�->�μ��� NULL�� �Ǿ�� �ȵ˴ϴ�"
 
-#: popt.c:1372
+#: popt.c:1460
 msgid "aliases nested too deeply"
 msgstr "��Ī(alias)�� �����ϰ� �����Ǿ����ϴ�"
 
-#: popt.c:1374
+#: popt.c:1462
 msgid "error in parameter quoting"
 msgstr "�Ű������� ������ �ֽ��ϴ�"
 
-#: popt.c:1376
+#: popt.c:1464
 msgid "invalid numeric value"
 msgstr "�߸��� ��ġ ���Դϴ�"
 
-#: popt.c:1378
+#: popt.c:1466
 msgid "number too large or too small"
 msgstr "���ڰ� �ʹ� ũ�ų� �ʹ� �����ϴ�"
 
-#: popt.c:1380
+#: popt.c:1468
 msgid "memory allocation failed"
 msgstr "�޸� �Ҵ翡 �����߽��ϴ�"
 
-#: popt.c:1384
+#: popt.c:1470
+msgid "config file failed sanity test"
+msgstr ""
+
+#: popt.c:1474
 msgid "unknown error"
 msgstr "�� �� ���� �����Դϴ�"
 
@@ -120,10 +124,10 @@ msgstr "
 msgid "ARG"
 msgstr "�μ�(ARG)"
 
-#: popthelp.c:633
+#: popthelp.c:644
 msgid "Usage:"
 msgstr "����:"
 
-#: popthelp.c:657
+#: popthelp.c:667
 msgid "[OPTION...]"
 msgstr "[�ɼ�...]"
diff --git a/po/nb.po b/po/nb.po
index 5beed2f..806972b 100644
--- a/po/nb.po
+++ b/po/nb.po
@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.11\n"
 "Report-Msgid-Bugs-To: <popt-devel@rpm5.org>\n"
-"POT-Creation-Date: 2008-09-18 14:11-0400\n"
+"POT-Creation-Date: 2009-04-10 17:14-0400\n"
 "PO-Revision-Date: 2001-06-27 11:05+0200\n"
 "Last-Translator: Kjartan Maraas <kmaraas@online.no>\n"
 "Language-Team: Norwegian <no@li.org>\n"
@@ -10,52 +10,56 @@ msgstr ""
 "Content-Type: text/plain; charset=iso-8859-1\n"
 "Content-Transfer-Encoding: 8-bit\n"
 
-#: popt.c:42
+#: popt.c:47
 msgid "unknown errno"
 msgstr "ukjent errno"
 
-#: popt.c:945
+#: popt.c:1031
 #, fuzzy, c-format
 msgid "option type (%u) not implemented in popt\n"
 msgstr "flaggtype (%d) ikke implementert i popt\n"
 
-#: popt.c:1364
+#: popt.c:1452
 msgid "missing argument"
 msgstr "manglende argument"
 
-#: popt.c:1366
+#: popt.c:1454
 msgid "unknown option"
 msgstr "ukjent flagg"
 
-#: popt.c:1368
+#: popt.c:1456
 msgid "mutually exclusive logical operations requested"
 msgstr "gjensidig eksluderende logiske operasjoner forespurt"
 
-#: popt.c:1370
+#: popt.c:1458
 msgid "opt->arg should not be NULL"
 msgstr "opt->arg m� ikke v�re NULL"
 
-#: popt.c:1372
+#: popt.c:1460
 msgid "aliases nested too deeply"
 msgstr "aliaser med for dype l�kker"
 
-#: popt.c:1374
+#: popt.c:1462
 msgid "error in parameter quoting"
 msgstr "feil i parametersitering"
 
-#: popt.c:1376
+#: popt.c:1464
 msgid "invalid numeric value"
 msgstr "ugyldig numerisk verdi"
 
-#: popt.c:1378
+#: popt.c:1466
 msgid "number too large or too small"
 msgstr "tallet er for stort eller lite"
 
-#: popt.c:1380
+#: popt.c:1468
 msgid "memory allocation failed"
 msgstr "minneallokering feilet"
 
-#: popt.c:1384
+#: popt.c:1470
+msgid "config file failed sanity test"
+msgstr ""
+
+#: popt.c:1474
 msgid "unknown error"
 msgstr "ukjent feil"
 
@@ -120,10 +124,10 @@ msgstr "DOUBLE"
 msgid "ARG"
 msgstr "ARG"
 
-#: popthelp.c:633
+#: popthelp.c:644
 msgid "Usage:"
 msgstr "Bruk:"
 
-#: popthelp.c:657
+#: popthelp.c:667
 msgid "[OPTION...]"
 msgstr "[FLAGG...]"
diff --git a/po/nl.po b/po/nl.po
index 762a696..92ce048 100644
--- a/po/nl.po
+++ b/po/nl.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.14\n"
 "Report-Msgid-Bugs-To: <popt-devel@rpm5.org>\n"
-"POT-Creation-Date: 2008-09-18 14:11-0400\n"
+"POT-Creation-Date: 2009-04-10 17:14-0400\n"
 "PO-Revision-Date: 2008-02-20 19:26+0100\n"
 "Last-Translator: Tim Van Holder <tim.van.holder@telenet.be>\n"
 "Language-Team: Dutch <vertaling@vrijschrift.org>\n"
@@ -14,53 +14,57 @@ msgstr ""
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: popt.c:42
+#: popt.c:47
 msgid "unknown errno"
 msgstr "onbekend foutnummer (errno)"
 
-#: popt.c:945
+#: popt.c:1031
 #, c-format
 msgid "option type (%u) not implemented in popt\n"
 msgstr "dit optietype (%u) is niet geïmplementeerd in popt\n"
 
-#: popt.c:1364
+#: popt.c:1452
 msgid "missing argument"
 msgstr "ontbrekend argument"
 
-#: popt.c:1366
+#: popt.c:1454
 msgid "unknown option"
 msgstr "onbekende optie"
 
-#: popt.c:1368
+#: popt.c:1456
 msgid "mutually exclusive logical operations requested"
 msgstr "elkaar uitsluitende logische operatoren werden gevraagd"
 
-#: popt.c:1370
+#: popt.c:1458
 msgid "opt->arg should not be NULL"
 msgstr "opt->arg zou niet NULL mogen zijn"
 
-#: popt.c:1372
+#: popt.c:1460
 msgid "aliases nested too deeply"
 msgstr "aliassen zijn te diep genest"
 
 # of toch beter "quoting" behouden?
-#: popt.c:1374
+#: popt.c:1462
 msgid "error in parameter quoting"
 msgstr "fout in de aanhaling van parameters"
 
-#: popt.c:1376
+#: popt.c:1464
 msgid "invalid numeric value"
 msgstr "ongeldige numerieke waarde"
 
-#: popt.c:1378
+#: popt.c:1466
 msgid "number too large or too small"
 msgstr "getal is te klein of te groot"
 
-#: popt.c:1380
+#: popt.c:1468
 msgid "memory allocation failed"
 msgstr "reserveren van geheugen is mislukt"
 
-#: popt.c:1384
+#: popt.c:1470
+msgid "config file failed sanity test"
+msgstr ""
+
+#: popt.c:1474
 msgid "unknown error"
 msgstr "onbekende fout"
 
@@ -127,10 +131,10 @@ msgstr "DOUBLE"
 msgid "ARG"
 msgstr "ARG"
 
-#: popthelp.c:633
+#: popthelp.c:644
 msgid "Usage:"
 msgstr "Gebruik:"
 
-#: popthelp.c:657
+#: popthelp.c:667
 msgid "[OPTION...]"
 msgstr "[OPTIE...]"
diff --git a/po/pl.po b/po/pl.po
index 28833ce..bc58eed 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.14\n"
 "Report-Msgid-Bugs-To: <popt-devel@rpm5.org>\n"
-"POT-Creation-Date: 2008-09-18 14:11-0400\n"
+"POT-Creation-Date: 2009-04-10 17:14-0400\n"
 "PO-Revision-Date: 2008-02-18 00:30+0100\n"
 "Last-Translator: Jakub Bogusz <qboosh@pld-linux.org>\n"
 "Language-Team: Polish <translation-team-pl@lists.sourceforge.net>\n"
@@ -14,52 +14,56 @@ msgstr ""
 "Content-Type: text/plain; charset=iso-8859-2\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: popt.c:42
+#: popt.c:47
 msgid "unknown errno"
 msgstr "nieznane errno"
 
-#: popt.c:945
+#: popt.c:1031
 #, c-format
 msgid "option type (%u) not implemented in popt\n"
 msgstr "typ opcji (%u) nie zaimplementowany w popt\n"
 
-#: popt.c:1364
+#: popt.c:1452
 msgid "missing argument"
 msgstr "brak parametru"
 
-#: popt.c:1366
+#: popt.c:1454
 msgid "unknown option"
 msgstr "nieznana opcja"
 
-#: popt.c:1368
+#: popt.c:1456
 msgid "mutually exclusive logical operations requested"
 msgstr "��danie wykluczaj�cych si� operacji"
 
-#: popt.c:1370
+#: popt.c:1458
 msgid "opt->arg should not be NULL"
 msgstr "opt->arg nie mo�e by� NULL"
 
-#: popt.c:1372
+#: popt.c:1460
 msgid "aliases nested too deeply"
 msgstr "zbyt du�e zag��bienie alias�w"
 
-#: popt.c:1374
+#: popt.c:1462
 msgid "error in parameter quoting"
 msgstr "b��d w cytowaniu parametru"
 
-#: popt.c:1376
+#: popt.c:1464
 msgid "invalid numeric value"
 msgstr "b��dna warto�� liczbowa"
 
-#: popt.c:1378
+#: popt.c:1466
 msgid "number too large or too small"
 msgstr "liczba zbyt du�a lub zbyt ma�a"
 
-#: popt.c:1380
+#: popt.c:1468
 msgid "memory allocation failed"
 msgstr "b��d alokacji pami�ci"
 
-#: popt.c:1384
+#: popt.c:1470
+msgid "config file failed sanity test"
+msgstr ""
+
+#: popt.c:1474
 msgid "unknown error"
 msgstr "nieznany b��d"
 
@@ -123,10 +127,10 @@ msgstr "DOUBLE"
 msgid "ARG"
 msgstr "PARAM"
 
-#: popthelp.c:633
+#: popthelp.c:644
 msgid "Usage:"
 msgstr "Sk�adnia:"
 
-#: popthelp.c:657
+#: popthelp.c:667
 msgid "[OPTION...]"
 msgstr "[OPCJA...]"
diff --git a/po/popt.pot b/po/popt.pot
index 69a2bab..5b13f68 100644
--- a/po/popt.pot
+++ b/po/popt.pot
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.15\n"
 "Report-Msgid-Bugs-To: <popt-devel@rpm5.org>\n"
-"POT-Creation-Date: 2008-09-18 14:11-0400\n"
+"POT-Creation-Date: 2009-04-10 17:14-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -15,52 +15,56 @@ msgstr ""
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: popt.c:42
+#: popt.c:47
 msgid "unknown errno"
 msgstr ""
 
-#: popt.c:945
+#: popt.c:1031
 #, c-format
 msgid "option type (%u) not implemented in popt\n"
 msgstr ""
 
-#: popt.c:1364
+#: popt.c:1452
 msgid "missing argument"
 msgstr ""
 
-#: popt.c:1366
+#: popt.c:1454
 msgid "unknown option"
 msgstr ""
 
-#: popt.c:1368
+#: popt.c:1456
 msgid "mutually exclusive logical operations requested"
 msgstr ""
 
-#: popt.c:1370
+#: popt.c:1458
 msgid "opt->arg should not be NULL"
 msgstr ""
 
-#: popt.c:1372
+#: popt.c:1460
 msgid "aliases nested too deeply"
 msgstr ""
 
-#: popt.c:1374
+#: popt.c:1462
 msgid "error in parameter quoting"
 msgstr ""
 
-#: popt.c:1376
+#: popt.c:1464
 msgid "invalid numeric value"
 msgstr ""
 
-#: popt.c:1378
+#: popt.c:1466
 msgid "number too large or too small"
 msgstr ""
 
-#: popt.c:1380
+#: popt.c:1468
 msgid "memory allocation failed"
 msgstr ""
 
-#: popt.c:1384
+#: popt.c:1470
+msgid "config file failed sanity test"
+msgstr ""
+
+#: popt.c:1474
 msgid "unknown error"
 msgstr ""
 
@@ -124,10 +128,10 @@ msgstr ""
 msgid "ARG"
 msgstr ""
 
-#: popthelp.c:633
+#: popthelp.c:644
 msgid "Usage:"
 msgstr ""
 
-#: popthelp.c:657
+#: popthelp.c:667
 msgid "[OPTION...]"
 msgstr ""
diff --git a/po/pt.po b/po/pt.po
index 62fdcfd..1472c88 100644
--- a/po/pt.po
+++ b/po/pt.po
@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.11\n"
 "Report-Msgid-Bugs-To: <popt-devel@rpm5.org>\n"
-"POT-Creation-Date: 2008-09-18 14:11-0400\n"
+"POT-Creation-Date: 2009-04-10 17:14-0400\n"
 "PO-Revision-Date: 2002-02-13 18:32+0000\n"
 "Last-Translator: Pedro Morais <morais@kde.org>\n"
 "Language-Team: pt <morais@kde.org>\n"
@@ -10,52 +10,56 @@ msgstr ""
 "Content-Type: text/plain; charset=iso-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: popt.c:42
+#: popt.c:47
 msgid "unknown errno"
 msgstr "errno desconhecido"
 
-#: popt.c:945
+#: popt.c:1031
 #, fuzzy, c-format
 msgid "option type (%u) not implemented in popt\n"
 msgstr "tipo de op��o (%d) n�o implementado no popt\n"
 
-#: popt.c:1364
+#: popt.c:1452
 msgid "missing argument"
 msgstr "falta um argumento"
 
-#: popt.c:1366
+#: popt.c:1454
 msgid "unknown option"
 msgstr "op��o desconhecida"
 
-#: popt.c:1368
+#: popt.c:1456
 msgid "mutually exclusive logical operations requested"
 msgstr "foram pedidas opera��es l�gicas mutuamente exclusivas"
 
-#: popt.c:1370
+#: popt.c:1458
 msgid "opt->arg should not be NULL"
 msgstr "opt->arg n�o deve ser NULL"
 
-#: popt.c:1372
+#: popt.c:1460
 msgid "aliases nested too deeply"
 msgstr "'aliases' demasiado aninhados"
 
-#: popt.c:1374
+#: popt.c:1462
 msgid "error in parameter quoting"
 msgstr "erros no 'quoting' de par�metros"
 
-#: popt.c:1376
+#: popt.c:1464
 msgid "invalid numeric value"
 msgstr "valor n�merico inv�lido"
 
-#: popt.c:1378
+#: popt.c:1466
 msgid "number too large or too small"
 msgstr "n�mero demasiado grando ou pequeno"
 
-#: popt.c:1380
+#: popt.c:1468
 msgid "memory allocation failed"
 msgstr "aloca��o de mem�ria falhou"
 
-#: popt.c:1384
+#: popt.c:1470
+msgid "config file failed sanity test"
+msgstr ""
+
+#: popt.c:1474
 msgid "unknown error"
 msgstr "erro desconhecido"
 
@@ -120,10 +124,10 @@ msgstr "DOUBLE"
 msgid "ARG"
 msgstr "ARG"
 
-#: popthelp.c:633
+#: popthelp.c:644
 msgid "Usage:"
 msgstr "Utiliza��o:"
 
-#: popthelp.c:657
+#: popthelp.c:667
 msgid "[OPTION...]"
 msgstr "[OP��O...]"
diff --git a/po/ro.po b/po/ro.po
index ad70899..b37fae0 100644
--- a/po/ro.po
+++ b/po/ro.po
@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.11\n"
 "Report-Msgid-Bugs-To: <popt-devel@rpm5.org>\n"
-"POT-Creation-Date: 2008-09-18 14:11-0400\n"
+"POT-Creation-Date: 2009-04-10 17:14-0400\n"
 "PO-Revision-Date: 2000-06-14 23:23+EST\n"
 "Last-Translator: Cristian Gafton <gafton@redhat.com>\n"
 "Language-Team: Romanian <ro@li.org>\n"
@@ -10,53 +10,57 @@ msgstr ""
 "Content-Type: text/plain; charset=ISO-8859-2\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: popt.c:42
+#: popt.c:47
 msgid "unknown errno"
 msgstr "eroare necunoscuta"
 
-#: popt.c:945
+#: popt.c:1031
 #, fuzzy, c-format
 msgid "option type (%u) not implemented in popt\n"
 msgstr "optiunea de tipul (%d) nu este implementata in popt\n"
 
-#: popt.c:1364
+#: popt.c:1452
 msgid "missing argument"
 msgstr "argument lipsa"
 
-#: popt.c:1366
+#: popt.c:1454
 msgid "unknown option"
 msgstr "optiune necunoscuta"
 
-#: popt.c:1368
+#: popt.c:1456
 msgid "mutually exclusive logical operations requested"
 msgstr ""
 
-#: popt.c:1370
+#: popt.c:1458
 msgid "opt->arg should not be NULL"
 msgstr ""
 
-#: popt.c:1372
+#: popt.c:1460
 msgid "aliases nested too deeply"
 msgstr "recursivitate infinita la optiunile sinonime"
 
-#: popt.c:1374
+#: popt.c:1462
 #, fuzzy
 msgid "error in parameter quoting"
 msgstr "eroare la insertie parametru"
 
-#: popt.c:1376
+#: popt.c:1464
 msgid "invalid numeric value"
 msgstr "valoare numarica invalida"
 
-#: popt.c:1378
+#: popt.c:1466
 msgid "number too large or too small"
 msgstr "numar prea mare sau prea mic"
 
-#: popt.c:1380
+#: popt.c:1468
 msgid "memory allocation failed"
 msgstr ""
 
-#: popt.c:1384
+#: popt.c:1470
+msgid "config file failed sanity test"
+msgstr ""
+
+#: popt.c:1474
 msgid "unknown error"
 msgstr "eroare necuinoscuta"
 
@@ -121,10 +125,10 @@ msgstr ""
 msgid "ARG"
 msgstr ""
 
-#: popthelp.c:633
+#: popthelp.c:644
 msgid "Usage:"
 msgstr "Sintaxa:"
 
-#: popthelp.c:657
+#: popthelp.c:667
 msgid "[OPTION...]"
 msgstr "[OPTIUNE...]"
diff --git a/po/ru.po b/po/ru.po
index 8c7524c..112f4e1 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -1,87 +1,99 @@
+# translation of popt-1.14.ru.po to Russian
+# This file is put in the public domain.
+# This file is distributed under the same license as the popt package.
+# Eugene Kanter <eugene@blackcatlinux.com>, 2001.
+# Yuri Kozlov <yuray@komyakino.ru>, 2009.
 msgid ""
 msgstr ""
-"Project-Id-Version: popt 1.11\n"
+"Project-Id-Version: popt 1.14\n"
 "Report-Msgid-Bugs-To: <popt-devel@rpm5.org>\n"
-"POT-Creation-Date: 2008-09-18 14:11-0400\n"
-"PO-Revision-Date: 2001-07-05 21:00-0500\n"
-"Last-Translator: Eugene Kanter <eugene@blackcatlinux.com>\n"
-"Language-Team: Black Cat Linux Team <blackcat-support@blackcatlinux.com>\n"
+"POT-Creation-Date: 2009-04-10 17:14-0400\n"
+"PO-Revision-Date: 2009-02-01 13:30+0300\n"
+"Last-Translator: Yuri Kozlov <yuray@komyakino.ru>\n"
+"Language-Team: Russian <gnu@mx.ru>\n"
 "MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=koi8-r\n"
+"Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"X-Generator: KBabel 1.11.4\n"
+"Plural-Forms:  nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%"
+"10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 
-#: popt.c:42
+#: popt.c:47
 msgid "unknown errno"
-msgstr "����������� ����� ������"
+msgstr "неизвестный errno"
 
-#: popt.c:945
-#, fuzzy, c-format
+#: popt.c:1031
+#, c-format
 msgid "option type (%u) not implemented in popt\n"
-msgstr "��������� ��������� (%d) � popt �� �������������\n"
+msgstr "обработка параметра (%u) в popt не предусмотрена\n"
 
-#: popt.c:1364
+#: popt.c:1452
 msgid "missing argument"
-msgstr "�������� ��������"
+msgstr "пропущен аргумент"
 
-#: popt.c:1366
+#: popt.c:1454
 msgid "unknown option"
-msgstr "����������� ��������"
+msgstr "неизвестный параметр"
 
-#: popt.c:1368
+#: popt.c:1456
 msgid "mutually exclusive logical operations requested"
-msgstr "��������� ������� ����������� ���������� ��������"
+msgstr "запрошены взаимно исключающие логические операции"
 
-#: popt.c:1370
+#: popt.c:1458
 msgid "opt->arg should not be NULL"
-msgstr "opt->arg �� ����� ���� NULL"
+msgstr "opt->arg не может быть NULL"
 
-#: popt.c:1372
+#: popt.c:1460
 msgid "aliases nested too deeply"
-msgstr "�������� ������� ���������� �������� �����������"
+msgstr "превышен уровень допустимой рекурсии подстановок"
 
-#: popt.c:1374
+#: popt.c:1462
 msgid "error in parameter quoting"
-msgstr "�����a ��������� ���������� � �������"
+msgstr "ошибка помещения параметров в кавычки"
 
-#: popt.c:1376
+#: popt.c:1464
 msgid "invalid numeric value"
-msgstr "������������ �������� ��������"
+msgstr "неправильное числовое значение"
 
-#: popt.c:1378
+#: popt.c:1466
 msgid "number too large or too small"
-msgstr "�������� �������� �� ��������� ����������������"
+msgstr "числовое значение за пределами предусмотренного"
 
-#: popt.c:1380
+#: popt.c:1468
 msgid "memory allocation failed"
-msgstr "������ ��������� ������"
+msgstr "не удалось выделить память"
 
-#: popt.c:1384
+#: popt.c:1470
+msgid "config file failed sanity test"
+msgstr ""
+
+#: popt.c:1474
 msgid "unknown error"
-msgstr "����������� ������"
+msgstr "неизвестная ошибка"
 
 #: popthelp.c:75 popthelp.c:86
 msgid "Show this help message"
-msgstr "�������� ��� ���������"
+msgstr "Показать эту справку"
 
 #: popthelp.c:76 popthelp.c:87
 msgid "Display brief usage message"
-msgstr "�������� ������� ���������� �� �������������"
+msgstr "Показать краткую инструкцию по использованию"
 
 #: popthelp.c:90
 msgid "Display option defaults in message"
-msgstr "�������� ��������� �� ���������"
+msgstr "Показать параметры по умолчанию"
 
 #: popthelp.c:92
 msgid "Terminate options"
-msgstr ""
+msgstr "Завершает параметры"
 
 #: popthelp.c:191
 msgid "Help options:"
-msgstr ""
+msgstr "Параметры вывода справки:"
 
 #: popthelp.c:192
 msgid "Options implemented via popt alias/exec:"
-msgstr ""
+msgstr "Параметры, реализованные через popt alias/exec:"
 
 #: popthelp.c:200
 msgid "NONE"
@@ -100,9 +112,8 @@ msgid "LONG"
 msgstr "LONG"
 
 #: popthelp.c:208
-#, fuzzy
 msgid "LONGLONG"
-msgstr "LONG"
+msgstr "LONGLONG"
 
 #: popthelp.c:209
 msgid "STRING"
@@ -120,10 +131,10 @@ msgstr "DOUBLE"
 msgid "ARG"
 msgstr "ARG"
 
-#: popthelp.c:633
+#: popthelp.c:644
 msgid "Usage:"
-msgstr "�������������:"
+msgstr "Использование:"
 
-#: popthelp.c:657
+#: popthelp.c:667
 msgid "[OPTION...]"
-msgstr "[��������...]"
+msgstr "[ПАРАМЕТР...]"
diff --git a/po/sk.po b/po/sk.po
index 265144d..ffb45b6 100644
--- a/po/sk.po
+++ b/po/sk.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.11\n"
 "Report-Msgid-Bugs-To: <popt-devel@rpm5.org>\n"
-"POT-Creation-Date: 2008-09-18 14:11-0400\n"
+"POT-Creation-Date: 2009-04-10 17:14-0400\n"
 "PO-Revision-Date: 1999-08-04 21:40+0200\n"
 "Last-Translator: Stanislav Meduna <stano@eunet.sk>\n"
 "Language-Team: Slovak <sk-i18n@rak.isternet.sk>\n"
@@ -14,52 +14,56 @@ msgstr ""
 "Content-Type: text/plain; charset=iso-8859-2\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: popt.c:42
+#: popt.c:47
 msgid "unknown errno"
 msgstr ""
 
-#: popt.c:945
+#: popt.c:1031
 #, c-format
 msgid "option type (%u) not implemented in popt\n"
 msgstr ""
 
-#: popt.c:1364
+#: popt.c:1452
 msgid "missing argument"
 msgstr ""
 
-#: popt.c:1366
+#: popt.c:1454
 msgid "unknown option"
 msgstr ""
 
-#: popt.c:1368
+#: popt.c:1456
 msgid "mutually exclusive logical operations requested"
 msgstr ""
 
-#: popt.c:1370
+#: popt.c:1458
 msgid "opt->arg should not be NULL"
 msgstr ""
 
-#: popt.c:1372
+#: popt.c:1460
 msgid "aliases nested too deeply"
 msgstr ""
 
-#: popt.c:1374
+#: popt.c:1462
 msgid "error in parameter quoting"
 msgstr ""
 
-#: popt.c:1376
+#: popt.c:1464
 msgid "invalid numeric value"
 msgstr ""
 
-#: popt.c:1378
+#: popt.c:1466
 msgid "number too large or too small"
 msgstr ""
 
-#: popt.c:1380
+#: popt.c:1468
 msgid "memory allocation failed"
 msgstr ""
 
-#: popt.c:1384
+#: popt.c:1470
+msgid "config file failed sanity test"
+msgstr ""
+
+#: popt.c:1474
 msgid "unknown error"
 msgstr ""
 
@@ -124,10 +128,10 @@ msgstr ""
 msgid "ARG"
 msgstr ""
 
-#: popthelp.c:633
+#: popthelp.c:644
 msgid "Usage:"
 msgstr ""
 
-#: popthelp.c:657
+#: popthelp.c:667
 msgid "[OPTION...]"
 msgstr ""
diff --git a/po/sl.po b/po/sl.po
index a13153c..a82b854 100644
--- a/po/sl.po
+++ b/po/sl.po
@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.11\n"
 "Report-Msgid-Bugs-To: <popt-devel@rpm5.org>\n"
-"POT-Creation-Date: 2008-09-18 14:11-0400\n"
+"POT-Creation-Date: 2009-04-10 17:14-0400\n"
 "PO-Revision-Date: 2000-09-05 12:30+0200\n"
 "Last-Translator: Roman Maurer <roman.maurer@hermes.si>\n"
 "Language-Team: Slovenian <sl@li.org>\n"
@@ -10,52 +10,56 @@ msgstr ""
 "Content-Type: text/plain; charset=iso-8859-2\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: popt.c:42
+#: popt.c:47
 msgid "unknown errno"
 msgstr ""
 
-#: popt.c:945
+#: popt.c:1031
 #, c-format
 msgid "option type (%u) not implemented in popt\n"
 msgstr ""
 
-#: popt.c:1364
+#: popt.c:1452
 msgid "missing argument"
 msgstr ""
 
-#: popt.c:1366
+#: popt.c:1454
 msgid "unknown option"
 msgstr ""
 
-#: popt.c:1368
+#: popt.c:1456
 msgid "mutually exclusive logical operations requested"
 msgstr ""
 
-#: popt.c:1370
+#: popt.c:1458
 msgid "opt->arg should not be NULL"
 msgstr ""
 
-#: popt.c:1372
+#: popt.c:1460
 msgid "aliases nested too deeply"
 msgstr ""
 
-#: popt.c:1374
+#: popt.c:1462
 msgid "error in parameter quoting"
 msgstr ""
 
-#: popt.c:1376
+#: popt.c:1464
 msgid "invalid numeric value"
 msgstr ""
 
-#: popt.c:1378
+#: popt.c:1466
 msgid "number too large or too small"
 msgstr ""
 
-#: popt.c:1380
+#: popt.c:1468
 msgid "memory allocation failed"
 msgstr ""
 
-#: popt.c:1384
+#: popt.c:1470
+msgid "config file failed sanity test"
+msgstr ""
+
+#: popt.c:1474
 msgid "unknown error"
 msgstr ""
 
@@ -120,10 +124,10 @@ msgstr ""
 msgid "ARG"
 msgstr ""
 
-#: popthelp.c:633
+#: popthelp.c:644
 msgid "Usage:"
 msgstr ""
 
-#: popthelp.c:657
+#: popthelp.c:667
 msgid "[OPTION...]"
 msgstr ""
diff --git a/po/sv.po b/po/sv.po
index 82d48f5..aa07a80 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.14\n"
 "Report-Msgid-Bugs-To: <popt-devel@rpm5.org>\n"
-"POT-Creation-Date: 2008-09-18 14:11-0400\n"
+"POT-Creation-Date: 2009-04-10 17:14-0400\n"
 "PO-Revision-Date: 2008-02-23 20:15+0100\n"
 "Last-Translator: G�ran Uddeborg <goeran@uddeborg.se>\n"
 "Language-Team: Swedish <tp-sv@listor.tp-sv.se>\n"
@@ -17,52 +17,56 @@ msgstr ""
 "Content-Type: text/plain; charset=iso-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: popt.c:42
+#: popt.c:47
 msgid "unknown errno"
 msgstr "ok�nt felnummer"
 
-#: popt.c:945
+#: popt.c:1031
 #, c-format
 msgid "option type (%u) not implemented in popt\n"
 msgstr "flaggtypen (%u) �r inte implementerad i popt\n"
 
-#: popt.c:1364
+#: popt.c:1452
 msgid "missing argument"
 msgstr "argument saknas"
 
-#: popt.c:1366
+#: popt.c:1454
 msgid "unknown option"
 msgstr "ok�nd flagga"
 
-#: popt.c:1368
+#: popt.c:1456
 msgid "mutually exclusive logical operations requested"
 msgstr "�msesidigt uteslutande logiska operationer beg�rdes"
 
-#: popt.c:1370
+#: popt.c:1458
 msgid "opt->arg should not be NULL"
 msgstr "opt->arg f�r inte vara NULL"
 
-#: popt.c:1372
+#: popt.c:1460
 msgid "aliases nested too deeply"
 msgstr "alias �r n�stade f�r djupt"
 
-#: popt.c:1374
+#: popt.c:1462
 msgid "error in parameter quoting"
 msgstr "fel i parametercitering"
 
-#: popt.c:1376
+#: popt.c:1464
 msgid "invalid numeric value"
 msgstr "ogiltigt numeriskt v�rde"
 
-#: popt.c:1378
+#: popt.c:1466
 msgid "number too large or too small"
 msgstr "talet f�r stort eller f�r litet"
 
-#: popt.c:1380
+#: popt.c:1468
 msgid "memory allocation failed"
 msgstr "minnesallokering misslyckades"
 
-#: popt.c:1384
+#: popt.c:1470
+msgid "config file failed sanity test"
+msgstr ""
+
+#: popt.c:1474
 msgid "unknown error"
 msgstr "ok�nt fel"
 
@@ -126,10 +130,10 @@ msgstr "DUBBEL"
 msgid "ARG"
 msgstr "ARG"
 
-#: popthelp.c:633
+#: popthelp.c:644
 msgid "Usage:"
 msgstr "Anv�ndning:"
 
-#: popthelp.c:657
+#: popthelp.c:667
 msgid "[OPTION...]"
 msgstr "[FLAGGA...]"
diff --git a/po/th.po b/po/th.po
index 4f3fe4f..7884f1a 100644
--- a/po/th.po
+++ b/po/th.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.14\n"
 "Report-Msgid-Bugs-To: <popt-devel@rpm5.org>\n"
-"POT-Creation-Date: 2008-09-18 14:11-0400\n"
+"POT-Creation-Date: 2009-04-10 17:14-0400\n"
 "PO-Revision-Date: 2008-02-19 15:53+0700\n"
 "Last-Translator: Seksan Poltree <seksan.poltree@gmail.com>\n"
 "Language-Team: Thai <translation-team-th@lists.sourceforge.net>\n"
@@ -16,52 +16,56 @@ msgstr ""
 "X-Poedit-Language: Thai\n"
 "X-Poedit-Country: THAILAND\n"
 
-#: popt.c:42
+#: popt.c:47
 msgid "unknown errno"
 msgstr "เกิด errno ที่ไม่รู้จัก"
 
-#: popt.c:945
+#: popt.c:1031
 #, c-format
 msgid "option type (%u) not implemented in popt\n"
 msgstr "ตัวเลือกชนิด (%u) ไม่ถูกอิมพลีเมนต์ใน popt\n"
 
-#: popt.c:1364
+#: popt.c:1452
 msgid "missing argument"
 msgstr "ไม่พบอาร์กิวเมนต์"
 
-#: popt.c:1366
+#: popt.c:1454
 msgid "unknown option"
 msgstr "ไม่รู้จักตัวเลือก"
 
-#: popt.c:1368
+#: popt.c:1456
 msgid "mutually exclusive logical operations requested"
 msgstr "เกิดการร้องขอร่วมกันของการดำเนินการด้านตรรกะอย่างเดียวกัน"
 
-#: popt.c:1370
+#: popt.c:1458
 msgid "opt->arg should not be NULL"
 msgstr "opt->arg ไม่ควรจะเป็น NULL"
 
-#: popt.c:1372
+#: popt.c:1460
 msgid "aliases nested too deeply"
 msgstr "นามแฝงซ้อนกันมากเกินไป"
 
-#: popt.c:1374
+#: popt.c:1462
 msgid "error in parameter quoting"
 msgstr "เกิดข้อผิดพลาดในการอ้างอิงพารามิเตอร์"
 
-#: popt.c:1376
+#: popt.c:1464
 msgid "invalid numeric value"
 msgstr "ค่าตัวเลขผิดพลาด"
 
-#: popt.c:1378
+#: popt.c:1466
 msgid "number too large or too small"
 msgstr "ตัวเลขมีค่ามากหรือน้อยเกินไป"
 
-#: popt.c:1380
+#: popt.c:1468
 msgid "memory allocation failed"
 msgstr "การจัดสรรหน่วยความจำผิดพลาด"
 
-#: popt.c:1384
+#: popt.c:1470
+msgid "config file failed sanity test"
+msgstr ""
+
+#: popt.c:1474
 msgid "unknown error"
 msgstr "ความผิดพลาดที่ไม่รู้จัก"
 
@@ -125,10 +129,10 @@ msgstr "DOUBLE"
 msgid "ARG"
 msgstr "ARG"
 
-#: popthelp.c:633
+#: popthelp.c:644
 msgid "Usage:"
 msgstr "วิธีใช้:"
 
-#: popthelp.c:657
+#: popthelp.c:667
 msgid "[OPTION...]"
 msgstr "[ตัวเลือก...]"
diff --git a/po/tr.po b/po/tr.po
index 809a41b..295f29f 100644
--- a/po/tr.po
+++ b/po/tr.po
@@ -5,7 +5,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.11\n"
 "Report-Msgid-Bugs-To: <popt-devel@rpm5.org>\n"
-"POT-Creation-Date: 2008-09-18 14:11-0400\n"
+"POT-Creation-Date: 2009-04-10 17:14-0400\n"
 "PO-Revision-Date: 2000-02-11 13:01+0200\n"
 "Last-Translator: Nilgun Belma Buguner <nilgun@technologist.com>\n"
 "Language-Team: Turkish <tr@li.org>\n"
@@ -13,52 +13,56 @@ msgstr ""
 "Content-Type: text/plain; charset=iso-8859-9\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: popt.c:42
+#: popt.c:47
 msgid "unknown errno"
 msgstr "bilinmeyen hata no"
 
-#: popt.c:945
+#: popt.c:1031
 #, fuzzy, c-format
 msgid "option type (%u) not implemented in popt\n"
 msgstr "se�enek t�r� (%d) popt i�in ge�ersiz\n"
 
-#: popt.c:1364
+#: popt.c:1452
 msgid "missing argument"
 msgstr "arg�man eksik"
 
-#: popt.c:1366
+#: popt.c:1454
 msgid "unknown option"
 msgstr "bilinmeyen se�enek"
 
-#: popt.c:1368
+#: popt.c:1456
 msgid "mutually exclusive logical operations requested"
 msgstr "birbirini d��layan mant�ksal i�lemler istendi"
 
-#: popt.c:1370
+#: popt.c:1458
 msgid "opt->arg should not be NULL"
 msgstr ""
 
-#: popt.c:1372
+#: popt.c:1460
 msgid "aliases nested too deeply"
 msgstr "adlarda �ok fazla i�i�elikler"
 
-#: popt.c:1374
+#: popt.c:1462
 msgid "error in parameter quoting"
 msgstr "parametrelerde t�rnak i�aretleme hatal� "
 
-#: popt.c:1376
+#: popt.c:1464
 msgid "invalid numeric value"
 msgstr "say�sal de�er ge�ersiz"
 
-#: popt.c:1378
+#: popt.c:1466
 msgid "number too large or too small"
 msgstr "say� ya �ok b�y�k ya da �ok k���k"
 
-#: popt.c:1380
+#: popt.c:1468
 msgid "memory allocation failed"
 msgstr ""
 
-#: popt.c:1384
+#: popt.c:1470
+msgid "config file failed sanity test"
+msgstr ""
+
+#: popt.c:1474
 msgid "unknown error"
 msgstr "bilinmeyen hata"
 
@@ -124,10 +128,10 @@ msgstr "DOUBLE"
 msgid "ARG"
 msgstr "ARG"
 
-#: popthelp.c:633
+#: popthelp.c:644
 msgid "Usage:"
 msgstr "Kullan�m�:"
 
-#: popthelp.c:657
+#: popthelp.c:667
 msgid "[OPTION...]"
 msgstr "[SE�ENEK...]"
diff --git a/po/uk.po b/po/uk.po
index 98bbfc2..7e2a7d8 100644
--- a/po/uk.po
+++ b/po/uk.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.11\n"
 "Report-Msgid-Bugs-To: <popt-devel@rpm5.org>\n"
-"POT-Creation-Date: 2008-09-18 14:11-0400\n"
+"POT-Creation-Date: 2009-04-10 17:14-0400\n"
 "PO-Revision-Date: 1999-09-30 16:54+0200\n"
 "Last-Translator: Yuri Syrota <rasta@renome.rovno.ua>\n"
 "Language-Team: Ukrainian <uk@li.org>\n"
@@ -14,52 +14,56 @@ msgstr ""
 "Content-Type: text/plain; charset=koi8-u\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: popt.c:42
+#: popt.c:47
 msgid "unknown errno"
 msgstr ""
 
-#: popt.c:945
+#: popt.c:1031
 #, c-format
 msgid "option type (%u) not implemented in popt\n"
 msgstr ""
 
-#: popt.c:1364
+#: popt.c:1452
 msgid "missing argument"
 msgstr ""
 
-#: popt.c:1366
+#: popt.c:1454
 msgid "unknown option"
 msgstr ""
 
-#: popt.c:1368
+#: popt.c:1456
 msgid "mutually exclusive logical operations requested"
 msgstr ""
 
-#: popt.c:1370
+#: popt.c:1458
 msgid "opt->arg should not be NULL"
 msgstr ""
 
-#: popt.c:1372
+#: popt.c:1460
 msgid "aliases nested too deeply"
 msgstr ""
 
-#: popt.c:1374
+#: popt.c:1462
 msgid "error in parameter quoting"
 msgstr ""
 
-#: popt.c:1376
+#: popt.c:1464
 msgid "invalid numeric value"
 msgstr ""
 
-#: popt.c:1378
+#: popt.c:1466
 msgid "number too large or too small"
 msgstr ""
 
-#: popt.c:1380
+#: popt.c:1468
 msgid "memory allocation failed"
 msgstr ""
 
-#: popt.c:1384
+#: popt.c:1470
+msgid "config file failed sanity test"
+msgstr ""
+
+#: popt.c:1474
 msgid "unknown error"
 msgstr ""
 
@@ -124,10 +128,10 @@ msgstr ""
 msgid "ARG"
 msgstr ""
 
-#: popthelp.c:633
+#: popthelp.c:644
 msgid "Usage:"
 msgstr ""
 
-#: popthelp.c:657
+#: popthelp.c:667
 msgid "[OPTION...]"
 msgstr ""
diff --git a/po/vi.po b/po/vi.po
index aa363e7..aba24a1 100644
--- a/po/vi.po
+++ b/po/vi.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.14\n"
 "Report-Msgid-Bugs-To: <popt-devel@rpm5.org>\n"
-"POT-Creation-Date: 2008-09-18 14:11-0400\n"
+"POT-Creation-Date: 2009-04-10 17:14-0400\n"
 "PO-Revision-Date: 2008-02-18 16:20+1030\n"
 "Last-Translator: Clytie Siddall <clytie@riverland.net.au>\n"
 "Language-Team: Vietnamese <vi-VN@googlegroups.com>\n"
@@ -17,52 +17,56 @@ msgstr ""
 "Plural-Forms: nplurals=1; plural=0;\n"
 "X-Generator: LocFactoryEditor 1.7b3\n"
 
-#: popt.c:42
+#: popt.c:47
 msgid "unknown errno"
 msgstr "số hiệu lỗi không rõ"
 
-#: popt.c:945
+#: popt.c:1031
 #, c-format
 msgid "option type (%u) not implemented in popt\n"
 msgstr "kiểu tùy chọn (%u) chưa được thực hiện trong popt\n"
 
-#: popt.c:1364
+#: popt.c:1452
 msgid "missing argument"
 msgstr "thiếu đối số"
 
-#: popt.c:1366
+#: popt.c:1454
 msgid "unknown option"
 msgstr "tùy chọn không rõ"
 
-#: popt.c:1368
+#: popt.c:1456
 msgid "mutually exclusive logical operations requested"
 msgstr "các thao tác hợp lý loại từ lẫn nhau được yêu cầu"
 
-#: popt.c:1370
+#: popt.c:1458
 msgid "opt->arg should not be NULL"
 msgstr "« tùy chọn->đối số » không thể vô giá trị"
 
-#: popt.c:1372
+#: popt.c:1460
 msgid "aliases nested too deeply"
 msgstr "các bí danh lồng nhau quá sâu"
 
-#: popt.c:1374
+#: popt.c:1462
 msgid "error in parameter quoting"
 msgstr "gặp lỗi trong lời trích dẫn tham số"
 
-#: popt.c:1376
+#: popt.c:1464
 msgid "invalid numeric value"
 msgstr "giá trị thuộc số không hợp lệ"
 
-#: popt.c:1378
+#: popt.c:1466
 msgid "number too large or too small"
 msgstr "con số quá lớn hay quá nhỏ"
 
-#: popt.c:1380
+#: popt.c:1468
 msgid "memory allocation failed"
 msgstr "lỗi cấp phát bộ nhớ"
 
-#: popt.c:1384
+#: popt.c:1470
+msgid "config file failed sanity test"
+msgstr ""
+
+#: popt.c:1474
 msgid "unknown error"
 msgstr "lỗi không rõ"
 
@@ -126,10 +130,10 @@ msgstr "ĐÔI"
 msgid "ARG"
 msgstr "ĐỐI SỐ"
 
-#: popthelp.c:633
+#: popthelp.c:644
 msgid "Usage:"
 msgstr "Sử dụng:"
 
-#: popthelp.c:657
+#: popthelp.c:667
 msgid "[OPTION...]"
 msgstr "[TÙY_CHỌN...]"
diff --git a/po/wa.po b/po/wa.po
index 80b78a6..c1a31dc 100644
--- a/po/wa.po
+++ b/po/wa.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.11\n"
 "Report-Msgid-Bugs-To: <popt-devel@rpm5.org>\n"
-"POT-Creation-Date: 2008-09-18 14:11-0400\n"
+"POT-Creation-Date: 2009-04-10 17:14-0400\n"
 "PO-Revision-Date: 1999-03-18 23:11+0100\n"
 "Last-Translator: Nobody yet\n"
 "Language-Team: walon <linux-wa@chanae.alphanet.ch>\n"
@@ -18,52 +18,56 @@ msgstr ""
 "Content-Type: text/plain; charset=iso-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: popt.c:42
+#: popt.c:47
 msgid "unknown errno"
 msgstr ""
 
-#: popt.c:945
+#: popt.c:1031
 #, c-format
 msgid "option type (%u) not implemented in popt\n"
 msgstr ""
 
-#: popt.c:1364
+#: popt.c:1452
 msgid "missing argument"
 msgstr ""
 
-#: popt.c:1366
+#: popt.c:1454
 msgid "unknown option"
 msgstr ""
 
-#: popt.c:1368
+#: popt.c:1456
 msgid "mutually exclusive logical operations requested"
 msgstr ""
 
-#: popt.c:1370
+#: popt.c:1458
 msgid "opt->arg should not be NULL"
 msgstr ""
 
-#: popt.c:1372
+#: popt.c:1460
 msgid "aliases nested too deeply"
 msgstr ""
 
-#: popt.c:1374
+#: popt.c:1462
 msgid "error in parameter quoting"
 msgstr ""
 
-#: popt.c:1376
+#: popt.c:1464
 msgid "invalid numeric value"
 msgstr ""
 
-#: popt.c:1378
+#: popt.c:1466
 msgid "number too large or too small"
 msgstr ""
 
-#: popt.c:1380
+#: popt.c:1468
 msgid "memory allocation failed"
 msgstr ""
 
-#: popt.c:1384
+#: popt.c:1470
+msgid "config file failed sanity test"
+msgstr ""
+
+#: popt.c:1474
 msgid "unknown error"
 msgstr ""
 
@@ -128,10 +132,10 @@ msgstr ""
 msgid "ARG"
 msgstr ""
 
-#: popthelp.c:633
+#: popthelp.c:644
 msgid "Usage:"
 msgstr ""
 
-#: popthelp.c:657
+#: popthelp.c:667
 msgid "[OPTION...]"
 msgstr ""
diff --git a/po/zh_CN.po b/po/zh_CN.po
index a677c05..21dfcb6 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.14\n"
 "Report-Msgid-Bugs-To: <popt-devel@rpm5.org>\n"
-"POT-Creation-Date: 2008-09-18 14:11-0400\n"
+"POT-Creation-Date: 2009-04-10 17:14-0400\n"
 "PO-Revision-Date: 2008-02-18 20:16+0800\n"
 "Last-Translator: LI Daobing <lidaobing@gmail.com>\n"
 "Language-Team: Chinese (simplified) <translation-team-zh-cn@lists."
@@ -17,52 +17,56 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: popt.c:42
+#: popt.c:47
 msgid "unknown errno"
 msgstr "未知的错误"
 
-#: popt.c:945
+#: popt.c:1031
 #, c-format
 msgid "option type (%u) not implemented in popt\n"
 msgstr "选项类别 (%u) 没有在 popt 中实现\n"
 
-#: popt.c:1364
+#: popt.c:1452
 msgid "missing argument"
 msgstr "缺少参数"
 
-#: popt.c:1366
+#: popt.c:1454
 msgid "unknown option"
 msgstr "未知的选项"
 
-#: popt.c:1368
+#: popt.c:1456
 msgid "mutually exclusive logical operations requested"
 msgstr "需要 XOR 逻辑运算"
 
-#: popt.c:1370
+#: popt.c:1458
 msgid "opt->arg should not be NULL"
 msgstr "opt->arg 不应该为 NULL"
 
-#: popt.c:1372
+#: popt.c:1460
 msgid "aliases nested too deeply"
 msgstr "别名嵌套太深"
 
-#: popt.c:1374
+#: popt.c:1462
 msgid "error in parameter quoting"
 msgstr "参数引号错误"
 
-#: popt.c:1376
+#: popt.c:1464
 msgid "invalid numeric value"
 msgstr "无效的数值"
 
-#: popt.c:1378
+#: popt.c:1466
 msgid "number too large or too small"
 msgstr "数值太大或太小"
 
-#: popt.c:1380
+#: popt.c:1468
 msgid "memory allocation failed"
 msgstr "内存分配错误"
 
-#: popt.c:1384
+#: popt.c:1470
+msgid "config file failed sanity test"
+msgstr ""
+
+#: popt.c:1474
 msgid "unknown error"
 msgstr "未知的错误"
 
@@ -126,10 +130,10 @@ msgstr "DOUBLE"
 msgid "ARG"
 msgstr "ARG"
 
-#: popthelp.c:633
+#: popthelp.c:644
 msgid "Usage:"
 msgstr "用法:"
 
-#: popthelp.c:657
+#: popthelp.c:667
 msgid "[OPTION...]"
 msgstr "[选项...]"
diff --git a/po/zh_TW.po b/po/zh_TW.po
index 32e3928..cf9d9f8 100644
--- a/po/zh_TW.po
+++ b/po/zh_TW.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.11\n"
 "Report-Msgid-Bugs-To: <popt-devel@rpm5.org>\n"
-"POT-Creation-Date: 2008-09-18 14:11-0400\n"
+"POT-Creation-Date: 2009-04-10 17:14-0400\n"
 "PO-Revision-Date: 2005-04-08 17:52+0800\n"
 "Last-Translator: Wei-Lun Chao <chaoweilun@pcmail.com.tw>\n"
 "Language-Team: zh_TW <zh-l10n@linux.org.tw>\n"
@@ -14,52 +14,56 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: popt.c:42
+#: popt.c:47
 msgid "unknown errno"
 msgstr "未知的錯誤"
 
-#: popt.c:945
+#: popt.c:1031
 #, fuzzy, c-format
 msgid "option type (%u) not implemented in popt\n"
 msgstr "選項類型 (%d) 沒有在 popt 中實作\n"
 
-#: popt.c:1364
+#: popt.c:1452
 msgid "missing argument"
 msgstr "缺少引數"
 
-#: popt.c:1366
+#: popt.c:1454
 msgid "unknown option"
 msgstr "未知的選項"
 
-#: popt.c:1368
+#: popt.c:1456
 msgid "mutually exclusive logical operations requested"
 msgstr "需要相互獨立的邏輯運算"
 
-#: popt.c:1370
+#: popt.c:1458
 msgid "opt->arg should not be NULL"
 msgstr "opt->arg 不應為 NULL"
 
-#: popt.c:1372
+#: popt.c:1460
 msgid "aliases nested too deeply"
 msgstr "巢狀別名太深"
 
-#: popt.c:1374
+#: popt.c:1462
 msgid "error in parameter quoting"
 msgstr "參數引號錯誤"
 
-#: popt.c:1376
+#: popt.c:1464
 msgid "invalid numeric value"
 msgstr "不正確的數值"
 
-#: popt.c:1378
+#: popt.c:1466
 msgid "number too large or too small"
 msgstr "數字太大或太小"
 
-#: popt.c:1380
+#: popt.c:1468
 msgid "memory allocation failed"
 msgstr "記憶體配置錯誤"
 
-#: popt.c:1384
+#: popt.c:1470
+msgid "config file failed sanity test"
+msgstr ""
+
+#: popt.c:1474
 msgid "unknown error"
 msgstr "未知的錯誤"
 
@@ -124,10 +128,10 @@ msgstr "DOUBLE"
 msgid "ARG"
 msgstr "ARG"
 
-#: popthelp.c:633
+#: popthelp.c:644
 msgid "Usage:"
 msgstr "用法:"
 
-#: popthelp.c:657
+#: popthelp.c:667
 msgid "[OPTION...]"
 msgstr "[選項...]"
diff --git a/popt.spec b/popt.spec
index 699ed67..2ec54ba 100644
--- a/popt.spec
+++ b/popt.spec
@@ -2,7 +2,7 @@
 
 Summary: A C library for parsing command line parameters.
 Name: popt
-Version: 1.14
+Version: 1.15
 Release: 1
 License: X Consortium
 Group: System Environment/Libraries
@@ -49,6 +49,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man3/popt.3*
 
 %changelog
+* Fri Apr 10 2009 Jeff Johnson <jbj@rpm5.org>
+- release popt-1.15 through rpm5.org.
+
 * Tue Dec 11 2007 Jeff Johnson <jbj@rpm5.org>
 - release popt-1.13 through rpm5.org.
 
-- 
Gitee


From 4925a19bf39afe82637521b1e94fc6e3deef2060 Mon Sep 17 00:00:00 2001
From: "Ralf S. Engelschall" <rse@engelschall.com>
Date: Sun, 12 Apr 2009 07:24:40 +0000
Subject: [PATCH 576/667] Errr.. no, "-D_GNU_SOURCE -D_REENTRANT" has nothing
 to do with GCC (it is a platform specific thing and not a compiler thing).
 So, first put it out of the condition (as it is in RPM, too).

---
 configure.ac | 16 +++++++---------
 1 file changed, 7 insertions(+), 9 deletions(-)

diff --git a/configure.ac b/configure.ac
index a972a93..20e095e 100755
--- a/configure.ac
+++ b/configure.ac
@@ -20,24 +20,22 @@ AC_PROG_CC
 AC_PROG_INSTALL
 AC_PROG_LIBTOOL
 
-dnl
 dnl if CC is gcc, we can rebuild the dependencies (since the depend rule
 dnl requires gcc).  If it's not, don't rebuild dependencies -- use what was
 dnl shipped with RPM.
-dnl
-if test X"$GCC" = "Xyes" ; then
-    CFLAGS="-Wall -W -D_GNU_SOURCE -D_REENTRANT $CFLAGS"
+if test X"$GCC" = "Xyes"; then
+    CFLAGS="$CFLAGS -Wall -W"
     TARGET="depend allprogs"
 else
     TARGET="everything"
-    #
-    # let the Makefile know that we're done with `depend', since we don't
-    # have gcc we're not going to rebuild our dependencies at all.
-    #
-    echo > .depend-done
+    dnl let the Makefile know that we're done with `depend', since we don't
+    dnl have gcc we're not going to rebuild our dependencies at all.
+    echo >.depend-done
 fi
 AC_SUBST(TARGET)
 
+CFLAGS="$CFLAGS -D_GNU_SOURCE -D_REENTRANT"
+
 AC_GCC_TRADITIONAL
 AC_SYS_LARGEFILE
 
-- 
Gitee


From 8a93cd3ccfac65eed361c0335d0c1d0260d8d666 Mon Sep 17 00:00:00 2001
From: "Ralf S. Engelschall" <rse@engelschall.com>
Date: Sun, 12 Apr 2009 07:30:47 +0000
Subject: [PATCH 577/667] Fix portability:

1. glob_pattern_p is a glibc thing. As we force -D_GNU_SOURCE in the
   Autoconf stuff, we cannot use this as the check whether
   glob_pattern_p() exists. Use __GLIBC__ instead.

2. FNM_EXTMATCH is available within RPM because of the local fnmatch()
   implementation. But FNM_EXTMATCH is not portable enough, because many
   systems (including BSD) lack it. So, use it conditionally only.
---
 poptconfig.c | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/poptconfig.c b/poptconfig.c
index 6e42a27..ce88751 100644
--- a/poptconfig.c
+++ b/poptconfig.c
@@ -42,7 +42,7 @@ extern int glob_pattern_p (const char *__pattern, int __quote)
 /*@=declundef =exportheader =incondefs =protoparammatch =redecl =type @*/
 #endif	/* __LCLINT__ */
 
-#if !defined(_GNU_SOURCE)
+#if !defined(__GLIBC__)
 /* Return nonzero if PATTERN contains any metacharacters.
    Metacharacters can be quoted with backslashes if QUOTE is nonzero.  */
 static int
@@ -72,7 +72,7 @@ glob_pattern_p (const char * pattern, int quote)
     }
     return 0;
 }
-#endif	/* !defined(_GNU_SOURCE) */
+#endif	/* !defined(__GLIBC__) */
 
 /*@unchecked@*/
 static int poptGlobFlags = 0;
@@ -247,7 +247,10 @@ static int configAppMatch(poptContext con, const char * s)
 #if defined(HAVE_GLOB_H) && defined(HAVE_FNMATCH_H)
     if (glob_pattern_p(s, 1)) {
 /*@-bitwisesigned@*/
-	static int flags = FNM_EXTMATCH | FNM_PATHNAME | FNM_PERIOD;
+	static int flags = FNM_PATHNAME | FNM_PERIOD;
+#ifdef FNM_EXTMATCH
+	flags |= FNM_EXTMATCH;
+#endif
 /*@=bitwisesigned@*/
 	rc = fnmatch(s, con->appName, flags);
     } else
-- 
Gitee


From acf5dd9ca4f9027a8ff80dedc1be17909d849e0f Mon Sep 17 00:00:00 2001
From: "Ralf S. Engelschall" <rse@engelschall.com>
Date: Sun, 12 Apr 2009 17:55:20 +0000
Subject: [PATCH 578/667] remember recent changes

---
 CHANGES | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/CHANGES b/CHANGES
index 8573080..2ea1c72 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,7 @@
+1.15 -> 1.16:
+    - rse: fix building under non GLIBC platforms where glob_pattern_p fallback has to be used
+    - rse: fix building under platforms where FNM_EXTMATCH is not available
+
 1.14 -> 1.15:
     - jbj: poptReadFile: permit NULL if return values are not desired.
     - jbj: poptReadFile: add routine.
-- 
Gitee


From e6a2d924ca20fcf6f66229b0518f1e9fb3f34fb7 Mon Sep 17 00:00:00 2001
From: "Ralf S. Engelschall" <rse@engelschall.com>
Date: Sun, 12 Apr 2009 17:56:17 +0000
Subject: [PATCH 579/667] fix building under --disable-nls

---
 CHANGES   | 1 +
 poptint.h | 6 +++---
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/CHANGES b/CHANGES
index 2ea1c72..ae6db9e 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,4 +1,5 @@
 1.15 -> 1.16:
+    - rse: fix building under --disable-nls
     - rse: fix building under non GLIBC platforms where glob_pattern_p fallback has to be used
     - rse: fix building under platforms where FNM_EXTMATCH is not available
 
diff --git a/poptint.h b/poptint.h
index f270926..e92f441 100644
--- a/poptint.h
+++ b/poptint.h
@@ -193,17 +193,17 @@ const char *POPT_next_char (/*@returned@*/ const char *str)
 
 #endif
 
-#ifdef HAVE_LIBINTL_H
+#if defined(ENABLE_NLS) && defined(HAVE_LIBINTL_H)
 #include <libintl.h>
 #endif
 
-#if defined(HAVE_GETTEXT) && !defined(__LCLINT__)
+#if defined(ENABLE_NLS) && defined(HAVE_GETTEXT) && !defined(__LCLINT__)
 #define _(foo) gettext(foo)
 #else
 #define _(foo) foo
 #endif
 
-#if defined(HAVE_DCGETTEXT) && !defined(__LCLINT__)
+#if defined(ENABLE_NLS) && defined(HAVE_DCGETTEXT) && !defined(__LCLINT__)
 #define D_(dom, str) POPT_dgettext(dom, str)
 #define POPT_(foo) D_("popt", foo)
 #else
-- 
Gitee


From e88dff38d4decb8fdbd19e48885609bcc063155e Mon Sep 17 00:00:00 2001
From: "Ralf S. Engelschall" <rse@engelschall.com>
Date: Sun, 12 Apr 2009 18:11:51 +0000
Subject: [PATCH 580/667] update po/ files after recent changes

---
 po/cs.po    | 60 ++++++++++++++++++++++++++---------------------------
 po/da.po    | 60 ++++++++++++++++++++++++++---------------------------
 po/de.po    | 60 ++++++++++++++++++++++++++---------------------------
 po/eo.po    | 60 ++++++++++++++++++++++++++---------------------------
 po/es.po    | 60 ++++++++++++++++++++++++++---------------------------
 po/fi.po    | 60 ++++++++++++++++++++++++++---------------------------
 po/fr.po    | 60 ++++++++++++++++++++++++++---------------------------
 po/ga.po    | 60 ++++++++++++++++++++++++++---------------------------
 po/gl.po    | 60 ++++++++++++++++++++++++++---------------------------
 po/hu.po    | 60 ++++++++++++++++++++++++++---------------------------
 po/id.po    | 60 ++++++++++++++++++++++++++---------------------------
 po/is.po    | 60 ++++++++++++++++++++++++++---------------------------
 po/it.po    | 60 ++++++++++++++++++++++++++---------------------------
 po/ja.po    | 60 ++++++++++++++++++++++++++---------------------------
 po/ko.po    | 60 ++++++++++++++++++++++++++---------------------------
 po/nb.po    | 60 ++++++++++++++++++++++++++---------------------------
 po/nl.po    | 60 ++++++++++++++++++++++++++---------------------------
 po/pl.po    | 60 ++++++++++++++++++++++++++---------------------------
 po/popt.pot | 60 ++++++++++++++++++++++++++---------------------------
 po/pt.po    | 60 ++++++++++++++++++++++++++---------------------------
 po/ro.po    | 60 ++++++++++++++++++++++++++---------------------------
 po/ru.po    | 60 ++++++++++++++++++++++++++---------------------------
 po/sk.po    | 60 ++++++++++++++++++++++++++---------------------------
 po/sl.po    | 60 ++++++++++++++++++++++++++---------------------------
 po/sv.po    | 60 ++++++++++++++++++++++++++---------------------------
 po/th.po    | 60 ++++++++++++++++++++++++++---------------------------
 po/tr.po    | 60 ++++++++++++++++++++++++++---------------------------
 po/uk.po    | 60 ++++++++++++++++++++++++++---------------------------
 po/vi.po    | 60 ++++++++++++++++++++++++++---------------------------
 po/wa.po    | 60 ++++++++++++++++++++++++++---------------------------
 po/zh_CN.po | 60 ++++++++++++++++++++++++++---------------------------
 po/zh_TW.po | 60 ++++++++++++++++++++++++++---------------------------
 32 files changed, 960 insertions(+), 960 deletions(-)

diff --git a/po/cs.po b/po/cs.po
index 36fc670..628dc34 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.14\n"
 "Report-Msgid-Bugs-To: <popt-devel@rpm5.org>\n"
-"POT-Creation-Date: 2009-04-10 17:14-0400\n"
+"POT-Creation-Date: 2009-04-12 20:00+0200\n"
 "PO-Revision-Date: 2008-12-08 19:55+0100\n"
 "Last-Translator: Petr Pisar <petr.pisar@atlas.cz>\n"
 "Language-Team: Czech <translation-team-cs@lists.sourceforge.net>\n"
@@ -20,119 +20,119 @@ msgstr ""
 msgid "unknown errno"
 msgstr "neznámé číslo chyby"
 
-#: popt.c:1031
+#: popt.c:1045
 #, c-format
 msgid "option type (%u) not implemented in popt\n"
 msgstr "typ volby (%u) není v popt implementován\n"
 
-#: popt.c:1452
+#: popt.c:1466
 msgid "missing argument"
 msgstr "chybí argument"
 
-#: popt.c:1454
+#: popt.c:1468
 msgid "unknown option"
 msgstr "neznámá volba"
 
-#: popt.c:1456
+#: popt.c:1470
 msgid "mutually exclusive logical operations requested"
 msgstr "požadovány vzájemně výlučné logické operace"
 
-#: popt.c:1458
+#: popt.c:1472
 msgid "opt->arg should not be NULL"
 msgstr "opt->arg nesmí být NULL"
 
-#: popt.c:1460
+#: popt.c:1474
 msgid "aliases nested too deeply"
 msgstr "aliasy vnořené příliš hluboko"
 
-#: popt.c:1462
+#: popt.c:1476
 msgid "error in parameter quoting"
 msgstr "chyba v quotování parametrů"
 
-#: popt.c:1464
+#: popt.c:1478
 msgid "invalid numeric value"
 msgstr "chybná numerická hodnota"
 
-#: popt.c:1466
+#: popt.c:1480
 msgid "number too large or too small"
 msgstr "číslo je příliš velké nebo příliš malé"
 
-#: popt.c:1468
+#: popt.c:1482
 msgid "memory allocation failed"
 msgstr "selhala alokace paměti"
 
-#: popt.c:1470
+#: popt.c:1484
 msgid "config file failed sanity test"
 msgstr ""
 
-#: popt.c:1474
+#: popt.c:1488
 msgid "unknown error"
 msgstr "neznámá chyba"
 
-#: popthelp.c:75 popthelp.c:86
+#: popthelp.c:77 popthelp.c:88
 msgid "Show this help message"
 msgstr "Vypíše tuto nápovědu"
 
-#: popthelp.c:76 popthelp.c:87
+#: popthelp.c:78 popthelp.c:89
 msgid "Display brief usage message"
 msgstr "Vypíše krátký návod k použití"
 
-#: popthelp.c:90
+#: popthelp.c:92
 msgid "Display option defaults in message"
 msgstr "Zobrazit implicitní volby ve zprávě"
 
-#: popthelp.c:92
+#: popthelp.c:94
 msgid "Terminate options"
 msgstr "Ukončí volby"
 
-#: popthelp.c:191
+#: popthelp.c:193
 msgid "Help options:"
 msgstr "Volby nápovědy:"
 
-#: popthelp.c:192
+#: popthelp.c:194
 msgid "Options implemented via popt alias/exec:"
 msgstr "Volby implementované přes alias/exec poptu:"
 
-#: popthelp.c:200
+#: popthelp.c:202
 msgid "NONE"
 msgstr "NONE"
 
-#: popthelp.c:202
+#: popthelp.c:204
 msgid "VAL"
 msgstr "VAL"
 
-#: popthelp.c:206
+#: popthelp.c:208
 msgid "INT"
 msgstr "INT"
 
-#: popthelp.c:207
+#: popthelp.c:209
 msgid "LONG"
 msgstr "LONG"
 
-#: popthelp.c:208
+#: popthelp.c:210
 msgid "LONGLONG"
 msgstr "LONGLONG"
 
-#: popthelp.c:209
+#: popthelp.c:211
 msgid "STRING"
 msgstr "STRING"
 
-#: popthelp.c:210
+#: popthelp.c:212
 msgid "FLOAT"
 msgstr "FLOAT"
 
-#: popthelp.c:211
+#: popthelp.c:213
 msgid "DOUBLE"
 msgstr "DOUBLE"
 
-#: popthelp.c:214
+#: popthelp.c:216
 msgid "ARG"
 msgstr "ARG"
 
-#: popthelp.c:644
+#: popthelp.c:646
 msgid "Usage:"
 msgstr "Použití:"
 
-#: popthelp.c:667
+#: popthelp.c:669
 msgid "[OPTION...]"
 msgstr "[VOLBY…]"
diff --git a/po/da.po b/po/da.po
index 32c4607..5b32094 100644
--- a/po/da.po
+++ b/po/da.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: popt-1.14\n"
 "Report-Msgid-Bugs-To: <popt-devel@rpm5.org>\n"
-"POT-Creation-Date: 2009-04-10 17:14-0400\n"
+"POT-Creation-Date: 2009-04-12 20:00+0200\n"
 "PO-Revision-Date: 2008-09-15 00:00+0000\n"
 "Last-Translator: Joe Hansen <joedalton2@yahoo.dk>\n"
 "Language-Team: Danish <dansk@dansk-gruppen.dk>\n"
@@ -20,119 +20,119 @@ msgstr ""
 msgid "unknown errno"
 msgstr "ukendt fejlnr."
 
-#: popt.c:1031
+#: popt.c:1045
 #, c-format
 msgid "option type (%u) not implemented in popt\n"
 msgstr "tilvalgstype (%u) er ikke implementeret i popt\n"
 
-#: popt.c:1452
+#: popt.c:1466
 msgid "missing argument"
 msgstr "mangler argument"
 
-#: popt.c:1454
+#: popt.c:1468
 msgid "unknown option"
 msgstr "ukendt tilvalg"
 
-#: popt.c:1456
+#: popt.c:1470
 msgid "mutually exclusive logical operations requested"
 msgstr "de ønskede handlinger udelukker hinanden"
 
-#: popt.c:1458
+#: popt.c:1472
 msgid "opt->arg should not be NULL"
 msgstr "opt->arg bør ikke være NULL"
 
-#: popt.c:1460
+#: popt.c:1474
 msgid "aliases nested too deeply"
 msgstr "aliaser er for dybt indlejret"
 
-#: popt.c:1462
+#: popt.c:1476
 msgid "error in parameter quoting"
 msgstr "fejl i parameter citering"
 
-#: popt.c:1464
+#: popt.c:1478
 msgid "invalid numeric value"
 msgstr "ugyldig numerisk værdi"
 
-#: popt.c:1466
+#: popt.c:1480
 msgid "number too large or too small"
 msgstr "nummer for stort, eller for lille"
 
-#: popt.c:1468
+#: popt.c:1482
 msgid "memory allocation failed"
 msgstr "hukommelsestildeling mislykkedes"
 
-#: popt.c:1470
+#: popt.c:1484
 msgid "config file failed sanity test"
 msgstr ""
 
-#: popt.c:1474
+#: popt.c:1488
 msgid "unknown error"
 msgstr "ukendt fejl"
 
-#: popthelp.c:75 popthelp.c:86
+#: popthelp.c:77 popthelp.c:88
 msgid "Show this help message"
 msgstr "Vis denne hjælpemeddelelse"
 
-#: popthelp.c:76 popthelp.c:87
+#: popthelp.c:78 popthelp.c:89
 msgid "Display brief usage message"
 msgstr "Vis kortfattet brugsanvisning"
 
-#: popthelp.c:90
+#: popthelp.c:92
 msgid "Display option defaults in message"
 msgstr "Vis instillingsstandarder i besked"
 
-#: popthelp.c:92
+#: popthelp.c:94
 msgid "Terminate options"
 msgstr "Indstillinger for afbrydning"
 
-#: popthelp.c:191
+#: popthelp.c:193
 msgid "Help options:"
 msgstr "Hjælpeindstillinger:"
 
-#: popthelp.c:192
+#: popthelp.c:194
 msgid "Options implemented via popt alias/exec:"
 msgstr "Indstillinger implementeret via popt alias/exec:"
 
-#: popthelp.c:200
+#: popthelp.c:202
 msgid "NONE"
 msgstr "INGEN"
 
-#: popthelp.c:202
+#: popthelp.c:204
 msgid "VAL"
 msgstr "VAL"
 
-#: popthelp.c:206
+#: popthelp.c:208
 msgid "INT"
 msgstr "INT"
 
-#: popthelp.c:207
+#: popthelp.c:209
 msgid "LONG"
 msgstr "LONG"
 
-#: popthelp.c:208
+#: popthelp.c:210
 msgid "LONGLONG"
 msgstr "LONGLONG"
 
-#: popthelp.c:209
+#: popthelp.c:211
 msgid "STRING"
 msgstr "STRING"
 
-#: popthelp.c:210
+#: popthelp.c:212
 msgid "FLOAT"
 msgstr "FLOAT"
 
-#: popthelp.c:211
+#: popthelp.c:213
 msgid "DOUBLE"
 msgstr "DOUBLE"
 
-#: popthelp.c:214
+#: popthelp.c:216
 msgid "ARG"
 msgstr "ARG"
 
-#: popthelp.c:644
+#: popthelp.c:646
 msgid "Usage:"
 msgstr "Brug:"
 
-#: popthelp.c:667
+#: popthelp.c:669
 msgid "[OPTION...]"
 msgstr "[TILVALG...]"
diff --git a/po/de.po b/po/de.po
index aff1714..1883bf6 100644
--- a/po/de.po
+++ b/po/de.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.11\n"
 "Report-Msgid-Bugs-To: <popt-devel@rpm5.org>\n"
-"POT-Creation-Date: 2009-04-10 17:14-0400\n"
+"POT-Creation-Date: 2009-04-12 20:00+0200\n"
 "PO-Revision-Date: 2007-02-17 21:00+0100\n"
 "Last-Translator: Robert Scheck <rpm@robert-scheck.de>\n"
 "Language-Team: German <de@li.org>\n"
@@ -18,121 +18,121 @@ msgstr ""
 msgid "unknown errno"
 msgstr "Unbekannte Fehler-Nummer"
 
-#: popt.c:1031
+#: popt.c:1045
 #, fuzzy, c-format
 msgid "option type (%u) not implemented in popt\n"
 msgstr "Optionstyp (%d) ist in popt nicht vorhanden\n"
 
-#: popt.c:1452
+#: popt.c:1466
 msgid "missing argument"
 msgstr "Fehlendes Argument"
 
-#: popt.c:1454
+#: popt.c:1468
 msgid "unknown option"
 msgstr "Unbekannte Option"
 
-#: popt.c:1456
+#: popt.c:1470
 msgid "mutually exclusive logical operations requested"
 msgstr "Gegenseitig ausschließende logische Operatoren"
 
-#: popt.c:1458
+#: popt.c:1472
 msgid "opt->arg should not be NULL"
 msgstr "opt->arg sollte nicht NULL sein"
 
-#: popt.c:1460
+#: popt.c:1474
 msgid "aliases nested too deeply"
 msgstr "Aliase zu tief verschachtelt"
 
-#: popt.c:1462
+#: popt.c:1476
 msgid "error in parameter quoting"
 msgstr "Fehler beim Quotieren der Parameter"
 
-#: popt.c:1464
+#: popt.c:1478
 msgid "invalid numeric value"
 msgstr "Ungültiger nummerischer Wert"
 
-#: popt.c:1466
+#: popt.c:1480
 msgid "number too large or too small"
 msgstr "Nummer zu groß oder zu klein"
 
-#: popt.c:1468
+#: popt.c:1482
 msgid "memory allocation failed"
 msgstr "Speicherzuordnung fehlgeschlagen"
 
-#: popt.c:1470
+#: popt.c:1484
 msgid "config file failed sanity test"
 msgstr ""
 
-#: popt.c:1474
+#: popt.c:1488
 msgid "unknown error"
 msgstr "Unbekannter Fehler"
 
-#: popthelp.c:75 popthelp.c:86
+#: popthelp.c:77 popthelp.c:88
 msgid "Show this help message"
 msgstr "Zeigt diese Hilfe an"
 
-#: popthelp.c:76 popthelp.c:87
+#: popthelp.c:78 popthelp.c:89
 msgid "Display brief usage message"
 msgstr "Zeigt eine kurze Verwendungsinformation"
 
-#: popthelp.c:90
+#: popthelp.c:92
 msgid "Display option defaults in message"
 msgstr "Zeigt die Standardeinstellungen an"
 
-#: popthelp.c:92
+#: popthelp.c:94
 #, fuzzy
 msgid "Terminate options"
 msgstr "Hilfe-Optionen:"
 
-#: popthelp.c:191
+#: popthelp.c:193
 msgid "Help options:"
 msgstr "Hilfe-Optionen:"
 
-#: popthelp.c:192
+#: popthelp.c:194
 msgid "Options implemented via popt alias/exec:"
 msgstr "Optionen über popt alias/exec implementiert:"
 
-#: popthelp.c:200
+#: popthelp.c:202
 msgid "NONE"
 msgstr "NICHTS"
 
-#: popthelp.c:202
+#: popthelp.c:204
 msgid "VAL"
 msgstr "WERT"
 
-#: popthelp.c:206
+#: popthelp.c:208
 msgid "INT"
 msgstr "INTEGER"
 
-#: popthelp.c:207
+#: popthelp.c:209
 msgid "LONG"
 msgstr "LONG"
 
-#: popthelp.c:208
+#: popthelp.c:210
 #, fuzzy
 msgid "LONGLONG"
 msgstr "LONG"
 
-#: popthelp.c:209
+#: popthelp.c:211
 msgid "STRING"
 msgstr "STRING"
 
-#: popthelp.c:210
+#: popthelp.c:212
 msgid "FLOAT"
 msgstr "FLOAT"
 
-#: popthelp.c:211
+#: popthelp.c:213
 msgid "DOUBLE"
 msgstr "DOUBLE"
 
-#: popthelp.c:214
+#: popthelp.c:216
 msgid "ARG"
 msgstr "ARGUMENT"
 
-#: popthelp.c:644
+#: popthelp.c:646
 msgid "Usage:"
 msgstr "Verwendung:"
 
-#: popthelp.c:667
+#: popthelp.c:669
 msgid "[OPTION...]"
 msgstr "[OPTION...]"
diff --git a/po/eo.po b/po/eo.po
index 03e39d3..cb3db48 100644
--- a/po/eo.po
+++ b/po/eo.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.14\n"
 "Report-Msgid-Bugs-To: <popt-devel@rpm5.org>\n"
-"POT-Creation-Date: 2009-04-10 17:14-0400\n"
+"POT-Creation-Date: 2009-04-12 20:00+0200\n"
 "PO-Revision-Date: 2008-08-03 15:50-0300\n"
 "Last-Translator: Felipe Castro <fefcas@gmail.com>\n"
 "Language-Team: Esperanto <translation-team-eo@lists.sourceforge.net>\n"
@@ -18,119 +18,119 @@ msgstr ""
 msgid "unknown errno"
 msgstr "nekonata erarnumero"
 
-#: popt.c:1031
+#: popt.c:1045
 #, c-format
 msgid "option type (%u) not implemented in popt\n"
 msgstr "la opcia tipo (%u) ne estas realigita en popt\n"
 
-#: popt.c:1452
+#: popt.c:1466
 msgid "missing argument"
 msgstr "mankas argumento"
 
-#: popt.c:1454
+#: popt.c:1468
 msgid "unknown option"
 msgstr "nekonata opcio"
 
-#: popt.c:1456
+#: popt.c:1470
 msgid "mutually exclusive logical operations requested"
 msgstr "reciprokaj logikaj operacioj estas postulataj"
 
-#: popt.c:1458
+#: popt.c:1472
 msgid "opt->arg should not be NULL"
 msgstr "opt->arg ne devus esti NULL"
 
-#: popt.c:1460
+#: popt.c:1474
 msgid "aliases nested too deeply"
 msgstr "kromnomoj estas ingitaj tro profunde"
 
-#: popt.c:1462
+#: popt.c:1476
 msgid "error in parameter quoting"
 msgstr "eraro en parametra citado"
 
-#: popt.c:1464
+#: popt.c:1478
 msgid "invalid numeric value"
 msgstr "nevalida numera valoro"
 
-#: popt.c:1466
+#: popt.c:1480
 msgid "number too large or too small"
 msgstr "numero tro granda aŭ tro eta"
 
-#: popt.c:1468
+#: popt.c:1482
 msgid "memory allocation failed"
 msgstr "malsukceso dum okupado de memoro"
 
-#: popt.c:1470
+#: popt.c:1484
 msgid "config file failed sanity test"
 msgstr ""
 
-#: popt.c:1474
+#: popt.c:1488
 msgid "unknown error"
 msgstr "nekonata eraro"
 
-#: popthelp.c:75 popthelp.c:86
+#: popthelp.c:77 popthelp.c:88
 msgid "Show this help message"
 msgstr "Montri tiun ĉi helpmesaĝon"
 
-#: popthelp.c:76 popthelp.c:87
+#: popthelp.c:78 popthelp.c:89
 msgid "Display brief usage message"
 msgstr "Montri resumitan mesaĝon pri uzado"
 
-#: popthelp.c:90
+#: popthelp.c:92
 msgid "Display option defaults in message"
 msgstr "Montri la implicitajn valorojn de la opcio en la mesaĝo"
 
-#: popthelp.c:92
+#: popthelp.c:94
 msgid "Terminate options"
 msgstr "Opcioj pri finiĝo"
 
-#: popthelp.c:191
+#: popthelp.c:193
 msgid "Help options:"
 msgstr "Help-opcioj:"
 
-#: popthelp.c:192
+#: popthelp.c:194
 msgid "Options implemented via popt alias/exec:"
 msgstr "Opcioj realigitaj per popt alias/exec:"
 
-#: popthelp.c:200
+#: popthelp.c:202
 msgid "NONE"
 msgstr "NENIO"
 
-#: popthelp.c:202
+#: popthelp.c:204
 msgid "VAL"
 msgstr "VAL"
 
-#: popthelp.c:206
+#: popthelp.c:208
 msgid "INT"
 msgstr "INT"
 
-#: popthelp.c:207
+#: popthelp.c:209
 msgid "LONG"
 msgstr "LONG"
 
-#: popthelp.c:208
+#: popthelp.c:210
 msgid "LONGLONG"
 msgstr "LONGLONG"
 
-#: popthelp.c:209
+#: popthelp.c:211
 msgid "STRING"
 msgstr "STRING"
 
-#: popthelp.c:210
+#: popthelp.c:212
 msgid "FLOAT"
 msgstr "FLOAT"
 
-#: popthelp.c:211
+#: popthelp.c:213
 msgid "DOUBLE"
 msgstr "DOUBLE"
 
-#: popthelp.c:214
+#: popthelp.c:216
 msgid "ARG"
 msgstr "ARG"
 
-#: popthelp.c:644
+#: popthelp.c:646
 msgid "Usage:"
 msgstr "Uzado:"
 
-#: popthelp.c:667
+#: popthelp.c:669
 msgid "[OPTION...]"
 msgstr "[OPCIO...]"
diff --git a/po/es.po b/po/es.po
index 146a158..0b50d70 100644
--- a/po/es.po
+++ b/po/es.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.12\n"
 "Report-Msgid-Bugs-To: <popt-devel@rpm5.org>\n"
-"POT-Creation-Date: 2009-04-10 17:14-0400\n"
+"POT-Creation-Date: 2009-04-12 20:00+0200\n"
 "PO-Revision-Date: 2007-12-28 12:22+0100\n"
 "Last-Translator: Leandro Lucarella <luca@linuxmendoza.org.ar>\n"
 "Language-Team: Spanish <es@li.org>\n"
@@ -18,120 +18,120 @@ msgstr ""
 msgid "unknown errno"
 msgstr "errno desconocido"
 
-#: popt.c:1031
+#: popt.c:1045
 #, fuzzy, c-format
 msgid "option type (%u) not implemented in popt\n"
 msgstr "tipo de opción (%d) no implementada en popt\n"
 
-#: popt.c:1452
+#: popt.c:1466
 msgid "missing argument"
 msgstr "falta argumento"
 
-#: popt.c:1454
+#: popt.c:1468
 msgid "unknown option"
 msgstr "opción desconocida"
 
-#: popt.c:1456
+#: popt.c:1470
 msgid "mutually exclusive logical operations requested"
 msgstr "requerida operación lógica mutuamente exclusiva"
 
-#: popt.c:1458
+#: popt.c:1472
 msgid "opt->arg should not be NULL"
 msgstr ""
 
-#: popt.c:1460
+#: popt.c:1474
 msgid "aliases nested too deeply"
 msgstr "alias anidados muy profundamente"
 
-#: popt.c:1462
+#: popt.c:1476
 msgid "error in parameter quoting"
 msgstr "error en cita de parámetros"
 
-#: popt.c:1464
+#: popt.c:1478
 msgid "invalid numeric value"
 msgstr "valor numérico inválido"
 
-#: popt.c:1466
+#: popt.c:1480
 msgid "number too large or too small"
 msgstr "número muy largo o muy pequeño"
 
-#: popt.c:1468
+#: popt.c:1482
 msgid "memory allocation failed"
 msgstr ""
 
-#: popt.c:1470
+#: popt.c:1484
 msgid "config file failed sanity test"
 msgstr ""
 
-#: popt.c:1474
+#: popt.c:1488
 msgid "unknown error"
 msgstr "error desconocido"
 
-#: popthelp.c:75 popthelp.c:86
+#: popthelp.c:77 popthelp.c:88
 msgid "Show this help message"
 msgstr "Muestra este mensaje de ayuda"
 
-#: popthelp.c:76 popthelp.c:87
+#: popthelp.c:78 popthelp.c:89
 msgid "Display brief usage message"
 msgstr "Indica el modo de uso resumido"
 
-#: popthelp.c:90
+#: popthelp.c:92
 msgid "Display option defaults in message"
 msgstr ""
 
-#: popthelp.c:92
+#: popthelp.c:94
 msgid "Terminate options"
 msgstr ""
 
-#: popthelp.c:191
+#: popthelp.c:193
 msgid "Help options:"
 msgstr ""
 
-#: popthelp.c:192
+#: popthelp.c:194
 msgid "Options implemented via popt alias/exec:"
 msgstr ""
 
-#: popthelp.c:200
+#: popthelp.c:202
 msgid "NONE"
 msgstr "NONE"
 
-#: popthelp.c:202
+#: popthelp.c:204
 msgid "VAL"
 msgstr "VAL"
 
-#: popthelp.c:206
+#: popthelp.c:208
 msgid "INT"
 msgstr "INT"
 
-#: popthelp.c:207
+#: popthelp.c:209
 msgid "LONG"
 msgstr "LONG"
 
-#: popthelp.c:208
+#: popthelp.c:210
 #, fuzzy
 msgid "LONGLONG"
 msgstr "LONG"
 
-#: popthelp.c:209
+#: popthelp.c:211
 msgid "STRING"
 msgstr "STRING"
 
-#: popthelp.c:210
+#: popthelp.c:212
 msgid "FLOAT"
 msgstr "FLOAT"
 
-#: popthelp.c:211
+#: popthelp.c:213
 msgid "DOUBLE"
 msgstr "DOUBLE"
 
-#: popthelp.c:214
+#: popthelp.c:216
 msgid "ARG"
 msgstr "ARG"
 
-#: popthelp.c:644
+#: popthelp.c:646
 msgid "Usage:"
 msgstr "Modo de uso:"
 
-#: popthelp.c:667
+#: popthelp.c:669
 msgid "[OPTION...]"
 msgstr "[OPCIÓN...]"
diff --git a/po/fi.po b/po/fi.po
index e494568..f8bd572 100644
--- a/po/fi.po
+++ b/po/fi.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.14\n"
 "Report-Msgid-Bugs-To: <popt-devel@rpm5.org>\n"
-"POT-Creation-Date: 2009-04-10 17:14-0400\n"
+"POT-Creation-Date: 2009-04-12 20:00+0200\n"
 "PO-Revision-Date: 2008-02-21 18:19+0200\n"
 "Last-Translator: Jorma Karvonen <karvjorm@users.sf.net>\n"
 "Language-Team: Finnish <translation-team-fi@lists.sourceforge.net>\n"
@@ -23,121 +23,121 @@ msgstr ""
 msgid "unknown errno"
 msgstr "tuntematon errno-virhenumeroarvo"
 
-#: popt.c:1031
+#: popt.c:1045
 #, c-format
 msgid "option type (%u) not implemented in popt\n"
 msgstr "valitsintyyppiä (%u) ei ole toteutettu popt-ohjelmassa\n"
 
-#: popt.c:1452
+#: popt.c:1466
 msgid "missing argument"
 msgstr "puuttuva argumentti"
 
-#: popt.c:1454
+#: popt.c:1468
 msgid "unknown option"
 msgstr "tuntematon valitsin"
 
-#: popt.c:1456
+#: popt.c:1470
 msgid "mutually exclusive logical operations requested"
 msgstr "pyydettyjä loogisia toimintoja ei voi käyttää yhdessä"
 
-#: popt.c:1458
+#: popt.c:1472
 msgid "opt->arg should not be NULL"
 msgstr "”opt->arg”-valitsinargumentti ei saa olla NULL"
 
-#: popt.c:1460
+#: popt.c:1474
 msgid "aliases nested too deeply"
 msgstr "liian monta aliasta sisäkkäin"
 
-#: popt.c:1462
+#: popt.c:1476
 msgid "error in parameter quoting"
 msgstr "virhe parametrien lainauksessa"
 
-#: popt.c:1464
+#: popt.c:1478
 msgid "invalid numeric value"
 msgstr "virheellinen numeroarvo"
 
-#: popt.c:1466
+#: popt.c:1480
 msgid "number too large or too small"
 msgstr "numero on liian iso tai liian pieni"
 
-#: popt.c:1468
+#: popt.c:1482
 msgid "memory allocation failed"
 msgstr "muistin varaus ei onnistunut"
 
-#: popt.c:1470
+#: popt.c:1484
 msgid "config file failed sanity test"
 msgstr ""
 
-#: popt.c:1474
+#: popt.c:1488
 msgid "unknown error"
 msgstr "tuntematon virhe"
 
-#: popthelp.c:75 popthelp.c:86
+#: popthelp.c:77 popthelp.c:88
 msgid "Show this help message"
 msgstr "Näytä tämä ohje"
 
-#: popthelp.c:76 popthelp.c:87
+#: popthelp.c:78 popthelp.c:89
 msgid "Display brief usage message"
 msgstr "Näytä lyhyt käyttöohje"
 
-#: popthelp.c:90
+#: popthelp.c:92
 msgid "Display option defaults in message"
 msgstr "Näytä valitsinoletukset ohjeessa"
 
-#: popthelp.c:92
+#: popthelp.c:94
 msgid "Terminate options"
 msgstr "Lopettamisvalitsimet"
 
-#: popthelp.c:191
+#: popthelp.c:193
 msgid "Help options:"
 msgstr "Ohjevalitsimet:"
 
-#: popthelp.c:192
+#: popthelp.c:194
 msgid "Options implemented via popt alias/exec:"
 msgstr ""
 "Valitsimet toteutettu ”popt alias”-määrittelyillä tai ”popt exec”-"
 "määrittelyillä:"
 
-#: popthelp.c:200
+#: popthelp.c:202
 msgid "NONE"
 msgstr "EI MITÄÄN"
 
-#: popthelp.c:202
+#: popthelp.c:204
 msgid "VAL"
 msgstr "ARVO"
 
-#: popthelp.c:206
+#: popthelp.c:208
 msgid "INT"
 msgstr "INT-KOKONAISLUKU"
 
-#: popthelp.c:207
+#: popthelp.c:209
 msgid "LONG"
 msgstr "LONG-KOKONAISLUKU"
 
-#: popthelp.c:208
+#: popthelp.c:210
 msgid "LONGLONG"
 msgstr "LONGLONG-KOKONAISLUKU"
 
-#: popthelp.c:209
+#: popthelp.c:211
 msgid "STRING"
 msgstr "MERKKIJONO"
 
-#: popthelp.c:210
+#: popthelp.c:212
 msgid "FLOAT"
 msgstr "FLOAT-LIUKULUKU"
 
-#: popthelp.c:211
+#: popthelp.c:213
 msgid "DOUBLE"
 msgstr "DOUBLE-LIUKULUKU"
 
-#: popthelp.c:214
+#: popthelp.c:216
 msgid "ARG"
 msgstr "ARGUMENTTI"
 
-#: popthelp.c:644
+#: popthelp.c:646
 msgid "Usage:"
 msgstr "Käyttö:"
 
-#: popthelp.c:667
+#: popthelp.c:669
 msgid "[OPTION...]"
 msgstr "[VALITSIN...]"
diff --git a/po/fr.po b/po/fr.po
index 9860aee..ee87f0d 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -12,7 +12,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.11\n"
 "Report-Msgid-Bugs-To: <popt-devel@rpm5.org>\n"
-"POT-Creation-Date: 2009-04-10 17:14-0400\n"
+"POT-Creation-Date: 2009-04-12 20:00+0200\n"
 "PO-Revision-Date: 2003-06-22 23:43+0200\n"
 "Last-Translator: RPM French Translation <rpm-fr@livna.org>\n"
 "Language-Team: RPM French Translation <rpm-fr@livna.org>\n"
@@ -24,120 +24,120 @@ msgstr ""
 msgid "unknown errno"
 msgstr "errno inconnu"
 
-#: popt.c:1031
+#: popt.c:1045
 #, fuzzy, c-format
 msgid "option type (%u) not implemented in popt\n"
 msgstr "type(%d) d'option non implémenté dans popt\n"
 
-#: popt.c:1452
+#: popt.c:1466
 msgid "missing argument"
 msgstr "argument manquant"
 
-#: popt.c:1454
+#: popt.c:1468
 msgid "unknown option"
 msgstr "option iconnue"
 
-#: popt.c:1456
+#: popt.c:1470
 msgid "mutually exclusive logical operations requested"
 msgstr "opérations logiques mutuellement exclusives requises"
 
-#: popt.c:1458
+#: popt.c:1472
 msgid "opt->arg should not be NULL"
 msgstr "opt->arg ne devrait pas être NULL"
 
-#: popt.c:1460
+#: popt.c:1474
 msgid "aliases nested too deeply"
 msgstr "les alias sont trop entremellés"
 
-#: popt.c:1462
+#: popt.c:1476
 msgid "error in parameter quoting"
 msgstr "erreur en citant les paramètres"
 
-#: popt.c:1464
+#: popt.c:1478
 msgid "invalid numeric value"
 msgstr "valeur numérique invalide"
 
-#: popt.c:1466
+#: popt.c:1480
 msgid "number too large or too small"
 msgstr "nombre trop grand ou trop petit"
 
-#: popt.c:1468
+#: popt.c:1482
 msgid "memory allocation failed"
 msgstr "échec de l'allocation de mémoire"
 
-#: popt.c:1470
+#: popt.c:1484
 msgid "config file failed sanity test"
 msgstr ""
 
-#: popt.c:1474
+#: popt.c:1488
 msgid "unknown error"
 msgstr "erreur inconnue"
 
-#: popthelp.c:75 popthelp.c:86
+#: popthelp.c:77 popthelp.c:88
 msgid "Show this help message"
 msgstr "Montre ce message d'aide"
 
-#: popthelp.c:76 popthelp.c:87
+#: popthelp.c:78 popthelp.c:89
 msgid "Display brief usage message"
 msgstr "Affiche un bref descriptif de l'utilisation"
 
-#: popthelp.c:90
+#: popthelp.c:92
 msgid "Display option defaults in message"
 msgstr "Afficher les valeurs par défaut des options dans le message"
 
-#: popthelp.c:92
+#: popthelp.c:94
 msgid "Terminate options"
 msgstr ""
 
-#: popthelp.c:191
+#: popthelp.c:193
 msgid "Help options:"
 msgstr ""
 
-#: popthelp.c:192
+#: popthelp.c:194
 msgid "Options implemented via popt alias/exec:"
 msgstr ""
 
-#: popthelp.c:200
+#: popthelp.c:202
 msgid "NONE"
 msgstr "RIEN"
 
-#: popthelp.c:202
+#: popthelp.c:204
 msgid "VAL"
 msgstr "VAL"
 
-#: popthelp.c:206
+#: popthelp.c:208
 msgid "INT"
 msgstr "ENTIER"
 
-#: popthelp.c:207
+#: popthelp.c:209
 msgid "LONG"
 msgstr "LONG"
 
-#: popthelp.c:208
+#: popthelp.c:210
 #, fuzzy
 msgid "LONGLONG"
 msgstr "LONG"
 
-#: popthelp.c:209
+#: popthelp.c:211
 msgid "STRING"
 msgstr "CHAINE"
 
-#: popthelp.c:210
+#: popthelp.c:212
 msgid "FLOAT"
 msgstr "FLOTTANT"
 
-#: popthelp.c:211
+#: popthelp.c:213
 msgid "DOUBLE"
 msgstr "DOUBLE"
 
-#: popthelp.c:214
+#: popthelp.c:216
 msgid "ARG"
 msgstr "ARG"
 
-#: popthelp.c:644
+#: popthelp.c:646
 msgid "Usage:"
 msgstr "Utilisation:"
 
-#: popthelp.c:667
+#: popthelp.c:669
 msgid "[OPTION...]"
 msgstr "[OPTION...]"
diff --git a/po/ga.po b/po/ga.po
index fa30a1c..6e2740d 100644
--- a/po/ga.po
+++ b/po/ga.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.14\n"
 "Report-Msgid-Bugs-To: <popt-devel@rpm5.org>\n"
-"POT-Creation-Date: 2009-04-10 17:14-0400\n"
+"POT-Creation-Date: 2009-04-12 20:00+0200\n"
 "PO-Revision-Date: 2008-04-10 06:21-0500\n"
 "Last-Translator: Kevin Scannell <kscanne@gmail.com>\n"
 "Language-Team: Irish <gaeilge-gnulinux@lists.sourceforge.net>\n"
@@ -18,120 +18,120 @@ msgstr ""
 msgid "unknown errno"
 msgstr "errno anaithnid"
 
-#: popt.c:1031
+#: popt.c:1045
 #, c-format
 msgid "option type (%u) not implemented in popt\n"
 msgstr "níl an cineál rogha seo (%u) ar fáil i popt\n"
 
-#: popt.c:1452
+#: popt.c:1466
 msgid "missing argument"
 msgstr "argóint ar iarraidh"
 
-#: popt.c:1454
+#: popt.c:1468
 msgid "unknown option"
 msgstr "rogha anaithnid"
 
-#: popt.c:1456
+#: popt.c:1470
 msgid "mutually exclusive logical operations requested"
 msgstr "iarradh oibríochtaí loighciúla comheisiacha"
 
-#: popt.c:1458
+#: popt.c:1472
 msgid "opt->arg should not be NULL"
 msgstr "níor chóir rogha->arg a bheith NULL"
 
-#: popt.c:1460
+#: popt.c:1474
 msgid "aliases nested too deeply"
 msgstr "ailiasanna neadaithe ródhomhain"
 
-#: popt.c:1462
+#: popt.c:1476
 msgid "error in parameter quoting"
 msgstr "earráid agus paraiméadar á chur faoi chomharthaí athfhriotail"
 
-#: popt.c:1464
+#: popt.c:1478
 msgid "invalid numeric value"
 msgstr "luach neamhbhailí uimhriúil"
 
-#: popt.c:1466
+#: popt.c:1480
 msgid "number too large or too small"
 msgstr "uimhir rómhór nó róbheag"
 
-#: popt.c:1468
+#: popt.c:1482
 msgid "memory allocation failed"
 msgstr "theip ar dháileadh na cuimhne"
 
-#: popt.c:1470
+#: popt.c:1484
 msgid "config file failed sanity test"
 msgstr ""
 
-#: popt.c:1474
+#: popt.c:1488
 msgid "unknown error"
 msgstr "earráid anaithnid"
 
-#: popthelp.c:75 popthelp.c:86
+#: popthelp.c:77 popthelp.c:88
 msgid "Show this help message"
 msgstr "Taispeáin an chabhair seo"
 
-#: popthelp.c:76 popthelp.c:87
+#: popthelp.c:78 popthelp.c:89
 msgid "Display brief usage message"
 msgstr "Taispeáin beagán eolais faoin úsáid"
 
-#: popthelp.c:90
+#: popthelp.c:92
 msgid "Display option defaults in message"
 msgstr "Taispeáin luachanna réamhshocraithe na roghanna sa teachtaireacht"
 
 # Terminate not a verb here
-#: popthelp.c:92
+#: popthelp.c:94
 msgid "Terminate options"
 msgstr "Roghanna scortha"
 
-#: popthelp.c:191
+#: popthelp.c:193
 msgid "Help options:"
 msgstr "Roghanna cabhracha:"
 
-#: popthelp.c:192
+#: popthelp.c:194
 msgid "Options implemented via popt alias/exec:"
 msgstr "Roghanna a cuireadh i bhfeidhm trí ailias/exec popt:"
 
-#: popthelp.c:200
+#: popthelp.c:202
 msgid "NONE"
 msgstr "NEAMHNÍ"
 
-#: popthelp.c:202
+#: popthelp.c:204
 msgid "VAL"
 msgstr "LUACH"
 
-#: popthelp.c:206
+#: popthelp.c:208
 msgid "INT"
 msgstr "INT"
 
-#: popthelp.c:207
+#: popthelp.c:209
 msgid "LONG"
 msgstr "LONG"
 
-#: popthelp.c:208
+#: popthelp.c:210
 msgid "LONGLONG"
 msgstr "LONGLONG"
 
-#: popthelp.c:209
+#: popthelp.c:211
 msgid "STRING"
 msgstr "STRING"
 
-#: popthelp.c:210
+#: popthelp.c:212
 msgid "FLOAT"
 msgstr "FLOAT"
 
-#: popthelp.c:211
+#: popthelp.c:213
 msgid "DOUBLE"
 msgstr "DOUBLE"
 
-#: popthelp.c:214
+#: popthelp.c:216
 msgid "ARG"
 msgstr "ARG"
 
-#: popthelp.c:644
+#: popthelp.c:646
 msgid "Usage:"
 msgstr "Úsáid:"
 
-#: popthelp.c:667
+#: popthelp.c:669
 msgid "[OPTION...]"
 msgstr "[ROGHA...]"
diff --git a/po/gl.po b/po/gl.po
index c776b07..59e9788 100644
--- a/po/gl.po
+++ b/po/gl.po
@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.11\n"
 "Report-Msgid-Bugs-To: <popt-devel@rpm5.org>\n"
-"POT-Creation-Date: 2009-04-10 17:14-0400\n"
+"POT-Creation-Date: 2009-04-12 20:00+0200\n"
 "PO-Revision-Date: 2001-01-17 01:01+0100\n"
 "Last-Translator: Jes�s Bravo �lvarez <jba@pobox.com>\n"
 "Language-Team: Galician <trasno@ceu.fi.udc.es>\n"
@@ -14,121 +14,121 @@ msgstr ""
 msgid "unknown errno"
 msgstr "errno desco�ecido"
 
-#: popt.c:1031
+#: popt.c:1045
 #, fuzzy, c-format
 msgid "option type (%u) not implemented in popt\n"
 msgstr "tipo de opci�n (%d) non implementada en popt\n"
 
-#: popt.c:1452
+#: popt.c:1466
 msgid "missing argument"
 msgstr "falta un argumento"
 
-#: popt.c:1454
+#: popt.c:1468
 msgid "unknown option"
 msgstr "opci�n desco�ecida"
 
-#: popt.c:1456
+#: popt.c:1470
 msgid "mutually exclusive logical operations requested"
 msgstr "solicit�ronse operaci�ns l�xicas mutuamente exclu�ntes"
 
-#: popt.c:1458
+#: popt.c:1472
 msgid "opt->arg should not be NULL"
 msgstr ""
 
-#: popt.c:1460
+#: popt.c:1474
 msgid "aliases nested too deeply"
 msgstr "aliases ani�ados a un nivel demasiado profundo"
 
-#: popt.c:1462
+#: popt.c:1476
 msgid "error in parameter quoting"
 msgstr "erro nas comi�as do par�metro"
 
-#: popt.c:1464
+#: popt.c:1478
 msgid "invalid numeric value"
 msgstr "valor num�rico non v�lido"
 
-#: popt.c:1466
+#: popt.c:1480
 msgid "number too large or too small"
 msgstr "n�mero demasiado grande ou pequeno"
 
-#: popt.c:1468
+#: popt.c:1482
 msgid "memory allocation failed"
 msgstr ""
 
-#: popt.c:1470
+#: popt.c:1484
 msgid "config file failed sanity test"
 msgstr ""
 
-#: popt.c:1474
+#: popt.c:1488
 msgid "unknown error"
 msgstr "erro desco�ecido"
 
-#: popthelp.c:75 popthelp.c:86
+#: popthelp.c:77 popthelp.c:88
 msgid "Show this help message"
 msgstr "Amosar esta mensaxe de axuda"
 
-#: popthelp.c:76 popthelp.c:87
+#: popthelp.c:78 popthelp.c:89
 msgid "Display brief usage message"
 msgstr "Amosar brevemente o xeito de utilizaci�n"
 
-#: popthelp.c:90
+#: popthelp.c:92
 #, fuzzy
 msgid "Display option defaults in message"
 msgstr "Amosar brevemente o xeito de utilizaci�n"
 
-#: popthelp.c:92
+#: popthelp.c:94
 msgid "Terminate options"
 msgstr ""
 
-#: popthelp.c:191
+#: popthelp.c:193
 msgid "Help options:"
 msgstr ""
 
-#: popthelp.c:192
+#: popthelp.c:194
 msgid "Options implemented via popt alias/exec:"
 msgstr ""
 
-#: popthelp.c:200
+#: popthelp.c:202
 msgid "NONE"
 msgstr "NADA"
 
-#: popthelp.c:202
+#: popthelp.c:204
 msgid "VAL"
 msgstr "VAL"
 
-#: popthelp.c:206
+#: popthelp.c:208
 msgid "INT"
 msgstr "INT"
 
-#: popthelp.c:207
+#: popthelp.c:209
 msgid "LONG"
 msgstr "LONG"
 
-#: popthelp.c:208
+#: popthelp.c:210
 #, fuzzy
 msgid "LONGLONG"
 msgstr "LONG"
 
-#: popthelp.c:209
+#: popthelp.c:211
 msgid "STRING"
 msgstr "CADEA"
 
-#: popthelp.c:210
+#: popthelp.c:212
 msgid "FLOAT"
 msgstr "FLOAT"
 
-#: popthelp.c:211
+#: popthelp.c:213
 msgid "DOUBLE"
 msgstr "DOUBLE"
 
-#: popthelp.c:214
+#: popthelp.c:216
 msgid "ARG"
 msgstr "ARG"
 
-#: popthelp.c:644
+#: popthelp.c:646
 msgid "Usage:"
 msgstr "Uso:"
 
-#: popthelp.c:667
+#: popthelp.c:669
 msgid "[OPTION...]"
 msgstr "[OPCI�N...]"
diff --git a/po/hu.po b/po/hu.po
index 0fe3f2d..80aafa7 100644
--- a/po/hu.po
+++ b/po/hu.po
@@ -5,7 +5,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.11\n"
 "Report-Msgid-Bugs-To: <popt-devel@rpm5.org>\n"
-"POT-Creation-Date: 2009-04-10 17:14-0400\n"
+"POT-Creation-Date: 2009-04-12 20:00+0200\n"
 "PO-Revision-Date: 2007-06-21 00:45+0200\n"
 "Last-Translator: Gabor Kelemen <kelemeng@gnome.hu>\n"
 "Language-Team: Hungarian <translation-team-hu@lists.sourceforge.net>\n"
@@ -19,121 +19,121 @@ msgstr ""
 msgid "unknown errno"
 msgstr "ismeretlen hibaszám"
 
-#: popt.c:1031
+#: popt.c:1045
 #, fuzzy, c-format
 msgid "option type (%u) not implemented in popt\n"
 msgstr "a kapcsolótípus (%d) nincs megvalósítva a popt-ban\n"
 
-#: popt.c:1452
+#: popt.c:1466
 msgid "missing argument"
 msgstr "hiányzó paraméter"
 
-#: popt.c:1454
+#: popt.c:1468
 msgid "unknown option"
 msgstr "ismeretlen kapcsoló"
 
-#: popt.c:1456
+#: popt.c:1470
 msgid "mutually exclusive logical operations requested"
 msgstr "kölcsönösen kizáró logikai műveleteket kért"
 
-#: popt.c:1458
+#: popt.c:1472
 msgid "opt->arg should not be NULL"
 msgstr "az opt->arg nem lehet NULL"
 
-#: popt.c:1460
+#: popt.c:1474
 msgid "aliases nested too deeply"
 msgstr "az álnevek túl mélyen vannak egymásba ágyazva"
 
-#: popt.c:1462
+#: popt.c:1476
 msgid "error in parameter quoting"
 msgstr "hiba a paraméter idézésében"
 
-#: popt.c:1464
+#: popt.c:1478
 msgid "invalid numeric value"
 msgstr "érvénytelen numerikus érték"
 
-#: popt.c:1466
+#: popt.c:1480
 msgid "number too large or too small"
 msgstr "a szám túl nagy vagy túl kicsi"
 
-#: popt.c:1468
+#: popt.c:1482
 msgid "memory allocation failed"
 msgstr "a memóriafoglalás meghiúsult"
 
-#: popt.c:1470
+#: popt.c:1484
 msgid "config file failed sanity test"
 msgstr ""
 
-#: popt.c:1474
+#: popt.c:1488
 msgid "unknown error"
 msgstr "ismeretlen hiba"
 
-#: popthelp.c:75 popthelp.c:86
+#: popthelp.c:77 popthelp.c:88
 msgid "Show this help message"
 msgstr "Ezen súgó megjelenítése"
 
-#: popthelp.c:76 popthelp.c:87
+#: popthelp.c:78 popthelp.c:89
 msgid "Display brief usage message"
 msgstr "Rövid használati utasítás megjelenítése"
 
-#: popthelp.c:90
+#: popthelp.c:92
 msgid "Display option defaults in message"
 msgstr "Kapcsolók alapértelmezéseinek megjelenítése"
 
-#: popthelp.c:92
+#: popthelp.c:94
 #, fuzzy
 msgid "Terminate options"
 msgstr "Súgólehetőségek:"
 
-#: popthelp.c:191
+#: popthelp.c:193
 msgid "Help options:"
 msgstr "Súgólehetőségek:"
 
-#: popthelp.c:192
+#: popthelp.c:194
 msgid "Options implemented via popt alias/exec:"
 msgstr "A popt alias/exec segítségével megvalósított kapcsolók:"
 
-#: popthelp.c:200
+#: popthelp.c:202
 msgid "NONE"
 msgstr "NINCS"
 
-#: popthelp.c:202
+#: popthelp.c:204
 msgid "VAL"
 msgstr "ÉRTÉK"
 
-#: popthelp.c:206
+#: popthelp.c:208
 msgid "INT"
 msgstr "EGÉSZ"
 
-#: popthelp.c:207
+#: popthelp.c:209
 msgid "LONG"
 msgstr "HOSSZÚ"
 
-#: popthelp.c:208
+#: popthelp.c:210
 #, fuzzy
 msgid "LONGLONG"
 msgstr "HOSSZÚ"
 
-#: popthelp.c:209
+#: popthelp.c:211
 msgid "STRING"
 msgstr "SZÖVEG"
 
-#: popthelp.c:210
+#: popthelp.c:212
 msgid "FLOAT"
 msgstr "LEBEGŐ"
 
-#: popthelp.c:211
+#: popthelp.c:213
 msgid "DOUBLE"
 msgstr "DUPLA"
 
-#: popthelp.c:214
+#: popthelp.c:216
 msgid "ARG"
 msgstr "PAR"
 
-#: popthelp.c:644
+#: popthelp.c:646
 msgid "Usage:"
 msgstr "Használat:"
 
-#: popthelp.c:667
+#: popthelp.c:669
 msgid "[OPTION...]"
 msgstr "[KAPCSOLÓ...]"
diff --git a/po/id.po b/po/id.po
index b64ab73..f31c6e5 100644
--- a/po/id.po
+++ b/po/id.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.14\n"
 "Report-Msgid-Bugs-To: <popt-devel@rpm5.org>\n"
-"POT-Creation-Date: 2009-04-10 17:14-0400\n"
+"POT-Creation-Date: 2009-04-12 20:00+0200\n"
 "PO-Revision-Date: 2008-08-26 14:18+0700\n"
 "Last-Translator: Andhika Padmawan <andhika.padmawan@gmail.com>\n"
 "Language-Team: Indonesian <translation-team-id@lists.sourceforge.net>\n"
@@ -18,119 +18,119 @@ msgstr ""
 msgid "unknown errno"
 msgstr "errno tak diketahui"
 
-#: popt.c:1031
+#: popt.c:1045
 #, c-format
 msgid "option type (%u) not implemented in popt\n"
 msgstr "tipe opsi (%u) tak diimplementasikan di popt\n"
 
-#: popt.c:1452
+#: popt.c:1466
 msgid "missing argument"
 msgstr "kehilangan argumen"
 
-#: popt.c:1454
+#: popt.c:1468
 msgid "unknown option"
 msgstr "opsi tak diketahui"
 
-#: popt.c:1456
+#: popt.c:1470
 msgid "mutually exclusive logical operations requested"
 msgstr "permintaan operasi logika eksklusif secara mutual"
 
-#: popt.c:1458
+#: popt.c:1472
 msgid "opt->arg should not be NULL"
 msgstr "opt->arg tidak boleh NULL"
 
-#: popt.c:1460
+#: popt.c:1474
 msgid "aliases nested too deeply"
 msgstr "alias disarangkan terlalu dalam"
 
-#: popt.c:1462
+#: popt.c:1476
 msgid "error in parameter quoting"
 msgstr "galat di pencantuman parameter"
 
-#: popt.c:1464
+#: popt.c:1478
 msgid "invalid numeric value"
 msgstr "nilai numerik tidak sah"
 
-#: popt.c:1466
+#: popt.c:1480
 msgid "number too large or too small"
 msgstr "nomor terlalu besar atau terlalu kecil"
 
-#: popt.c:1468
+#: popt.c:1482
 msgid "memory allocation failed"
 msgstr "alokasi memori gagal"
 
-#: popt.c:1470
+#: popt.c:1484
 msgid "config file failed sanity test"
 msgstr ""
 
-#: popt.c:1474
+#: popt.c:1488
 msgid "unknown error"
 msgstr "galat tak diketahui"
 
-#: popthelp.c:75 popthelp.c:86
+#: popthelp.c:77 popthelp.c:88
 msgid "Show this help message"
 msgstr "Tampilkan pesan bantuan ini"
 
-#: popthelp.c:76 popthelp.c:87
+#: popthelp.c:78 popthelp.c:89
 msgid "Display brief usage message"
 msgstr "Tampilkan pesan penggunaan singkat"
 
-#: popthelp.c:90
+#: popthelp.c:92
 msgid "Display option defaults in message"
 msgstr "Tampilkan opsi standar dalam pesan"
 
-#: popthelp.c:92
+#: popthelp.c:94
 msgid "Terminate options"
 msgstr "Matikan opsi"
 
-#: popthelp.c:191
+#: popthelp.c:193
 msgid "Help options:"
 msgstr "Opsi bantuan:"
 
-#: popthelp.c:192
+#: popthelp.c:194
 msgid "Options implemented via popt alias/exec:"
 msgstr "Opsi diimplementasikan via popt alias/exec:"
 
-#: popthelp.c:200
+#: popthelp.c:202
 msgid "NONE"
 msgstr "NONE"
 
-#: popthelp.c:202
+#: popthelp.c:204
 msgid "VAL"
 msgstr "VAL"
 
-#: popthelp.c:206
+#: popthelp.c:208
 msgid "INT"
 msgstr "INT"
 
-#: popthelp.c:207
+#: popthelp.c:209
 msgid "LONG"
 msgstr "LONG"
 
-#: popthelp.c:208
+#: popthelp.c:210
 msgid "LONGLONG"
 msgstr "LONGLONG"
 
-#: popthelp.c:209
+#: popthelp.c:211
 msgid "STRING"
 msgstr "STRING"
 
-#: popthelp.c:210
+#: popthelp.c:212
 msgid "FLOAT"
 msgstr "FLOAT"
 
-#: popthelp.c:211
+#: popthelp.c:213
 msgid "DOUBLE"
 msgstr "DOUBLE"
 
-#: popthelp.c:214
+#: popthelp.c:216
 msgid "ARG"
 msgstr "ARG"
 
-#: popthelp.c:644
+#: popthelp.c:646
 msgid "Usage:"
 msgstr "Penggunaan:"
 
-#: popthelp.c:667
+#: popthelp.c:669
 msgid "[OPTION...]"
 msgstr "[OPSI...]"
diff --git a/po/is.po b/po/is.po
index 0985329..f48be40 100644
--- a/po/is.po
+++ b/po/is.po
@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.11\n"
 "Report-Msgid-Bugs-To: <popt-devel@rpm5.org>\n"
-"POT-Creation-Date: 2009-04-10 17:14-0400\n"
+"POT-Creation-Date: 2009-04-12 20:00+0200\n"
 "PO-Revision-Date: 2001-06-08 01:35+0000\n"
 "Last-Translator: Richard Allen <ra@hp.is>\n"
 "Language-Team: is <kde-isl@mmedia.is>\n"
@@ -14,120 +14,120 @@ msgstr ""
 msgid "unknown errno"
 msgstr "��ekkt villun�mer"
 
-#: popt.c:1031
+#: popt.c:1045
 #, fuzzy, c-format
 msgid "option type (%u) not implemented in popt\n"
 msgstr "rofager�in (%d) er ekki studd � popt\n"
 
-#: popt.c:1452
+#: popt.c:1466
 msgid "missing argument"
 msgstr "vantar vi�fang"
 
-#: popt.c:1454
+#: popt.c:1468
 msgid "unknown option"
 msgstr "��ekktur rofi"
 
-#: popt.c:1456
+#: popt.c:1470
 msgid "mutually exclusive logical operations requested"
 msgstr "be�i� um rofa sem sl�kkva hvor � ��rum"
 
-#: popt.c:1458
+#: popt.c:1472
 msgid "opt->arg should not be NULL"
 msgstr "opt->arg �tti ekki a� vera NULL"
 
-#: popt.c:1460
+#: popt.c:1474
 msgid "aliases nested too deeply"
 msgstr "al�asar of fl�knir"
 
-#: popt.c:1462
+#: popt.c:1476
 msgid "error in parameter quoting"
 msgstr "villa � vi�f�ngum (g�salappir og svo frv.)"
 
-#: popt.c:1464
+#: popt.c:1478
 msgid "invalid numeric value"
 msgstr "�gilt t�lulegt gildi"
 
-#: popt.c:1466
+#: popt.c:1480
 msgid "number too large or too small"
 msgstr "talan of st�r e�a sm�"
 
-#: popt.c:1468
+#: popt.c:1482
 msgid "memory allocation failed"
 msgstr "ekki t�kst a� taka fr� minni"
 
-#: popt.c:1470
+#: popt.c:1484
 msgid "config file failed sanity test"
 msgstr ""
 
-#: popt.c:1474
+#: popt.c:1488
 msgid "unknown error"
 msgstr "��ekkt villa"
 
-#: popthelp.c:75 popthelp.c:86
+#: popthelp.c:77 popthelp.c:88
 msgid "Show this help message"
 msgstr "S�na �essa hj�lp"
 
-#: popthelp.c:76 popthelp.c:87
+#: popthelp.c:78 popthelp.c:89
 msgid "Display brief usage message"
 msgstr "S�na stuttar notkunarlei�beiningar"
 
-#: popthelp.c:90
+#: popthelp.c:92
 msgid "Display option defaults in message"
 msgstr "S�na sj�lfgefin gildi rofa � skilabo�um"
 
-#: popthelp.c:92
+#: popthelp.c:94
 msgid "Terminate options"
 msgstr ""
 
-#: popthelp.c:191
+#: popthelp.c:193
 msgid "Help options:"
 msgstr ""
 
-#: popthelp.c:192
+#: popthelp.c:194
 msgid "Options implemented via popt alias/exec:"
 msgstr ""
 
-#: popthelp.c:200
+#: popthelp.c:202
 msgid "NONE"
 msgstr "ENGIN"
 
-#: popthelp.c:202
+#: popthelp.c:204
 msgid "VAL"
 msgstr "VAL"
 
-#: popthelp.c:206
+#: popthelp.c:208
 msgid "INT"
 msgstr "INT"
 
-#: popthelp.c:207
+#: popthelp.c:209
 msgid "LONG"
 msgstr "LONG"
 
-#: popthelp.c:208
+#: popthelp.c:210
 #, fuzzy
 msgid "LONGLONG"
 msgstr "LONG"
 
-#: popthelp.c:209
+#: popthelp.c:211
 msgid "STRING"
 msgstr "STRING"
 
-#: popthelp.c:210
+#: popthelp.c:212
 msgid "FLOAT"
 msgstr "FLOAT"
 
-#: popthelp.c:211
+#: popthelp.c:213
 msgid "DOUBLE"
 msgstr "DOUBLE"
 
-#: popthelp.c:214
+#: popthelp.c:216
 msgid "ARG"
 msgstr "ARG"
 
-#: popthelp.c:644
+#: popthelp.c:646
 msgid "Usage:"
 msgstr "Notkun:"
 
-#: popthelp.c:667
+#: popthelp.c:669
 msgid "[OPTION...]"
 msgstr "[ROFI...]"
diff --git a/po/it.po b/po/it.po
index 3fd9101..4c47f4c 100644
--- a/po/it.po
+++ b/po/it.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: popt-1.14\n"
 "Report-Msgid-Bugs-To: <popt-devel@rpm5.org>\n"
-"POT-Creation-Date: 2009-04-10 17:14-0400\n"
+"POT-Creation-Date: 2009-04-12 20:00+0200\n"
 "PO-Revision-Date: 2008-11-28 15:32+0100\n"
 "Last-Translator: Vincenzo Campanella <vinz65@gmail.com>\n"
 "Language-Team: Italian <tp@lists.linux.it>\n"
@@ -21,119 +21,119 @@ msgstr ""
 msgid "unknown errno"
 msgstr "errno sconosciuto"
 
-#: popt.c:1031
+#: popt.c:1045
 #, c-format
 msgid "option type (%u) not implemented in popt\n"
 msgstr "tipo di opzione (%u) non implementato in popt\n"
 
-#: popt.c:1452
+#: popt.c:1466
 msgid "missing argument"
 msgstr "argomento mancante"
 
-#: popt.c:1454
+#: popt.c:1468
 msgid "unknown option"
 msgstr "opzione sconosciuta"
 
-#: popt.c:1456
+#: popt.c:1470
 msgid "mutually exclusive logical operations requested"
 msgstr "richieste operazioni logiche reciprocamente esclusive"
 
-#: popt.c:1458
+#: popt.c:1472
 msgid "opt->arg should not be NULL"
 msgstr "opt->arg non dovrebbe essere NULL"
 
-#: popt.c:1460
+#: popt.c:1474
 msgid "aliases nested too deeply"
 msgstr "alias nidificati troppo in profondità"
 
-#: popt.c:1462
+#: popt.c:1476
 msgid "error in parameter quoting"
 msgstr "errore nel quoting del parametro"
 
-#: popt.c:1464
+#: popt.c:1478
 msgid "invalid numeric value"
 msgstr "valore numerico non valido"
 
-#: popt.c:1466
+#: popt.c:1480
 msgid "number too large or too small"
 msgstr "numero troppo grande o troppo piccolo"
 
-#: popt.c:1468
+#: popt.c:1482
 msgid "memory allocation failed"
 msgstr "allocazione di memoria fallita"
 
-#: popt.c:1470
+#: popt.c:1484
 msgid "config file failed sanity test"
 msgstr ""
 
-#: popt.c:1474
+#: popt.c:1488
 msgid "unknown error"
 msgstr "errore sconosciuto"
 
-#: popthelp.c:75 popthelp.c:86
+#: popthelp.c:77 popthelp.c:88
 msgid "Show this help message"
 msgstr "Mostra questo messaggio di aiuto"
 
-#: popthelp.c:76 popthelp.c:87
+#: popthelp.c:78 popthelp.c:89
 msgid "Display brief usage message"
 msgstr "Mostra un breve messaggio di utilizzo"
 
-#: popthelp.c:90
+#: popthelp.c:92
 msgid "Display option defaults in message"
 msgstr "Mostra le opzioni predefinite nel messaggio"
 
-#: popthelp.c:92
+#: popthelp.c:94
 msgid "Terminate options"
 msgstr "Opzioni di terminazione"
 
-#: popthelp.c:191
+#: popthelp.c:193
 msgid "Help options:"
 msgstr "Opzioni di aiuto:"
 
-#: popthelp.c:192
+#: popthelp.c:194
 msgid "Options implemented via popt alias/exec:"
 msgstr "Opzioni implementate tramite alias/exec di popt:"
 
-#: popthelp.c:200
+#: popthelp.c:202
 msgid "NONE"
 msgstr "NONE"
 
-#: popthelp.c:202
+#: popthelp.c:204
 msgid "VAL"
 msgstr "VAL"
 
-#: popthelp.c:206
+#: popthelp.c:208
 msgid "INT"
 msgstr "INT"
 
-#: popthelp.c:207
+#: popthelp.c:209
 msgid "LONG"
 msgstr "LONG"
 
-#: popthelp.c:208
+#: popthelp.c:210
 msgid "LONGLONG"
 msgstr "LONGLONG"
 
-#: popthelp.c:209
+#: popthelp.c:211
 msgid "STRING"
 msgstr "STRING"
 
-#: popthelp.c:210
+#: popthelp.c:212
 msgid "FLOAT"
 msgstr "FLOAT"
 
-#: popthelp.c:211
+#: popthelp.c:213
 msgid "DOUBLE"
 msgstr "DOUBLE"
 
-#: popthelp.c:214
+#: popthelp.c:216
 msgid "ARG"
 msgstr "ARG"
 
-#: popthelp.c:644
+#: popthelp.c:646
 msgid "Usage:"
 msgstr "Uso:"
 
-#: popthelp.c:667
+#: popthelp.c:669
 msgid "[OPTION...]"
 msgstr "[OPZIONE...]"
diff --git a/po/ja.po b/po/ja.po
index 5c3d00a..90604a8 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.11\n"
 "Report-Msgid-Bugs-To: <popt-devel@rpm5.org>\n"
-"POT-Creation-Date: 2009-04-10 17:14-0400\n"
+"POT-Creation-Date: 2009-04-12 20:00+0200\n"
 "PO-Revision-Date: 2003--8-25 19:00+0900\n"
 "Last-Translator: Yukihiro Nakai <ynakai@redhat.com>\n"
 "Language-Team: Japanese <ja@li.org>\n"
@@ -18,121 +18,121 @@ msgstr ""
 msgid "unknown errno"
 msgstr "不明なエラー番号"
 
-#: popt.c:1031
+#: popt.c:1045
 #, fuzzy, c-format
 msgid "option type (%u) not implemented in popt\n"
 msgstr "オプションタイプ (%d) はpoptには実装されていません\n"
 
-#: popt.c:1452
+#: popt.c:1466
 msgid "missing argument"
 msgstr "引数がありません"
 
-#: popt.c:1454
+#: popt.c:1468
 msgid "unknown option"
 msgstr "不明なオプション"
 
-#: popt.c:1456
+#: popt.c:1470
 msgid "mutually exclusive logical operations requested"
 msgstr "排他的な悪ぺーレーションが必要です"
 
-#: popt.c:1458
+#: popt.c:1472
 msgid "opt->arg should not be NULL"
 msgstr "opt->argはNULLではいけません"
 
-#: popt.c:1460
+#: popt.c:1474
 msgid "aliases nested too deeply"
 msgstr "エイリアスのネストが深すぎます"
 
-#: popt.c:1462
+#: popt.c:1476
 msgid "error in parameter quoting"
 msgstr "パラメータのクオート付けでエラー"
 
-#: popt.c:1464
+#: popt.c:1478
 msgid "invalid numeric value"
 msgstr "不正な数値"
 
-#: popt.c:1466
+#: popt.c:1480
 msgid "number too large or too small"
 msgstr "数値が大きすぎるか小さすぎます"
 
-#: popt.c:1468
+#: popt.c:1482
 msgid "memory allocation failed"
 msgstr "メモリ確保に失敗しました"
 
-#: popt.c:1470
+#: popt.c:1484
 msgid "config file failed sanity test"
 msgstr ""
 
-#: popt.c:1474
+#: popt.c:1488
 msgid "unknown error"
 msgstr "不明なエラー"
 
-#: popthelp.c:75 popthelp.c:86
+#: popthelp.c:77 popthelp.c:88
 msgid "Show this help message"
 msgstr "このヘルプメッセージを表示します"
 
-#: popthelp.c:76 popthelp.c:87
+#: popthelp.c:78 popthelp.c:89
 msgid "Display brief usage message"
 msgstr "使い方の概要を表示します"
 
-#: popthelp.c:90
+#: popthelp.c:92
 msgid "Display option defaults in message"
 msgstr "オプションのデフォルト値をメッセージに表示します"
 
-#: popthelp.c:92
+#: popthelp.c:94
 #, fuzzy
 msgid "Terminate options"
 msgstr "ヘルプオプション:"
 
-#: popthelp.c:191
+#: popthelp.c:193
 msgid "Help options:"
 msgstr "ヘルプオプション:"
 
-#: popthelp.c:192
+#: popthelp.c:194
 msgid "Options implemented via popt alias/exec:"
 msgstr "poptのalias/execで実装されているオプション:"
 
-#: popthelp.c:200
+#: popthelp.c:202
 msgid "NONE"
 msgstr "なし"
 
-#: popthelp.c:202
+#: popthelp.c:204
 msgid "VAL"
 msgstr "値"
 
-#: popthelp.c:206
+#: popthelp.c:208
 msgid "INT"
 msgstr "INT"
 
-#: popthelp.c:207
+#: popthelp.c:209
 msgid "LONG"
 msgstr "LONG"
 
-#: popthelp.c:208
+#: popthelp.c:210
 #, fuzzy
 msgid "LONGLONG"
 msgstr "LONG"
 
-#: popthelp.c:209
+#: popthelp.c:211
 msgid "STRING"
 msgstr "文字列"
 
-#: popthelp.c:210
+#: popthelp.c:212
 msgid "FLOAT"
 msgstr "FLOAT"
 
-#: popthelp.c:211
+#: popthelp.c:213
 msgid "DOUBLE"
 msgstr "DOUBLE"
 
-#: popthelp.c:214
+#: popthelp.c:216
 msgid "ARG"
 msgstr "ARG"
 
-#: popthelp.c:644
+#: popthelp.c:646
 msgid "Usage:"
 msgstr "使い方:"
 
-#: popthelp.c:667
+#: popthelp.c:669
 msgid "[OPTION...]"
 msgstr "[オプション...]"
diff --git a/po/ko.po b/po/ko.po
index a29b2ce..d1902e3 100644
--- a/po/ko.po
+++ b/po/ko.po
@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.11\n"
 "Report-Msgid-Bugs-To: <popt-devel@rpm5.org>\n"
-"POT-Creation-Date: 2009-04-10 17:14-0400\n"
+"POT-Creation-Date: 2009-04-12 20:00+0200\n"
 "PO-Revision-Date: 2001-09-06 20:06+0900\n"
 "Last-Translator: Jong-Hoon Ryu <redhat4u@netian.com>\n"
 "Language-Team: GNU Translation project <ko@li.org>\n"
@@ -14,120 +14,120 @@ msgstr ""
 msgid "unknown errno"
 msgstr "�� �� ���� �����ڵ�(errno) �Դϴ�"
 
-#: popt.c:1031
+#: popt.c:1045
 #, fuzzy, c-format
 msgid "option type (%u) not implemented in popt\n"
 msgstr "�ɼ� ���� (%d)�� popt���� ����� �� �����ϴ�\n"
 
-#: popt.c:1452
+#: popt.c:1466
 msgid "missing argument"
 msgstr "�μ��� �������� �ʾҽ��ϴ�"
 
-#: popt.c:1454
+#: popt.c:1468
 msgid "unknown option"
 msgstr "�� �� ���� �ɼ��Դϴ�"
 
-#: popt.c:1456
+#: popt.c:1470
 msgid "mutually exclusive logical operations requested"
 msgstr "���ʿ� ��Ÿ�� ���� ������ �����Ǿ����ϴ�"
 
-#: popt.c:1458
+#: popt.c:1472
 msgid "opt->arg should not be NULL"
 msgstr "�ɼ�->�μ��� NULL�� �Ǿ�� �ȵ˴ϴ�"
 
-#: popt.c:1460
+#: popt.c:1474
 msgid "aliases nested too deeply"
 msgstr "��Ī(alias)�� �����ϰ� �����Ǿ����ϴ�"
 
-#: popt.c:1462
+#: popt.c:1476
 msgid "error in parameter quoting"
 msgstr "�Ű������� ������ �ֽ��ϴ�"
 
-#: popt.c:1464
+#: popt.c:1478
 msgid "invalid numeric value"
 msgstr "�߸��� ��ġ ���Դϴ�"
 
-#: popt.c:1466
+#: popt.c:1480
 msgid "number too large or too small"
 msgstr "���ڰ� �ʹ� ũ�ų� �ʹ� �����ϴ�"
 
-#: popt.c:1468
+#: popt.c:1482
 msgid "memory allocation failed"
 msgstr "�޸� �Ҵ翡 �����߽��ϴ�"
 
-#: popt.c:1470
+#: popt.c:1484
 msgid "config file failed sanity test"
 msgstr ""
 
-#: popt.c:1474
+#: popt.c:1488
 msgid "unknown error"
 msgstr "�� �� ���� �����Դϴ�"
 
-#: popthelp.c:75 popthelp.c:86
+#: popthelp.c:77 popthelp.c:88
 msgid "Show this help message"
 msgstr "�� ������ �����ݴϴ�"
 
-#: popthelp.c:76 popthelp.c:87
+#: popthelp.c:78 popthelp.c:89
 msgid "Display brief usage message"
 msgstr "������ ������ �����ݴϴ�"
 
-#: popthelp.c:90
+#: popthelp.c:92
 msgid "Display option defaults in message"
 msgstr "�⺻���� �ɼ��� �����ݴϴ�"
 
-#: popthelp.c:92
+#: popthelp.c:94
 msgid "Terminate options"
 msgstr ""
 
-#: popthelp.c:191
+#: popthelp.c:193
 msgid "Help options:"
 msgstr ""
 
-#: popthelp.c:192
+#: popthelp.c:194
 msgid "Options implemented via popt alias/exec:"
 msgstr ""
 
-#: popthelp.c:200
+#: popthelp.c:202
 msgid "NONE"
 msgstr "����(NONE)"
 
-#: popthelp.c:202
+#: popthelp.c:204
 msgid "VAL"
 msgstr "��(VAL)"
 
-#: popthelp.c:206
+#: popthelp.c:208
 msgid "INT"
 msgstr "����(INT)"
 
-#: popthelp.c:207
+#: popthelp.c:209
 msgid "LONG"
 msgstr "����(LONG)"
 
-#: popthelp.c:208
+#: popthelp.c:210
 #, fuzzy
 msgid "LONGLONG"
 msgstr "����(LONG)"
 
-#: popthelp.c:209
+#: popthelp.c:211
 msgid "STRING"
 msgstr "���ڿ�(STRING)"
 
-#: popthelp.c:210
+#: popthelp.c:212
 msgid "FLOAT"
 msgstr "�Ҽ�(FLOAT)"
 
-#: popthelp.c:211
+#: popthelp.c:213
 msgid "DOUBLE"
 msgstr "�Ҽ�(DOUBLE)"
 
-#: popthelp.c:214
+#: popthelp.c:216
 msgid "ARG"
 msgstr "�μ�(ARG)"
 
-#: popthelp.c:644
+#: popthelp.c:646
 msgid "Usage:"
 msgstr "����:"
 
-#: popthelp.c:667
+#: popthelp.c:669
 msgid "[OPTION...]"
 msgstr "[�ɼ�...]"
diff --git a/po/nb.po b/po/nb.po
index 806972b..1f69bea 100644
--- a/po/nb.po
+++ b/po/nb.po
@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.11\n"
 "Report-Msgid-Bugs-To: <popt-devel@rpm5.org>\n"
-"POT-Creation-Date: 2009-04-10 17:14-0400\n"
+"POT-Creation-Date: 2009-04-12 20:00+0200\n"
 "PO-Revision-Date: 2001-06-27 11:05+0200\n"
 "Last-Translator: Kjartan Maraas <kmaraas@online.no>\n"
 "Language-Team: Norwegian <no@li.org>\n"
@@ -14,120 +14,120 @@ msgstr ""
 msgid "unknown errno"
 msgstr "ukjent errno"
 
-#: popt.c:1031
+#: popt.c:1045
 #, fuzzy, c-format
 msgid "option type (%u) not implemented in popt\n"
 msgstr "flaggtype (%d) ikke implementert i popt\n"
 
-#: popt.c:1452
+#: popt.c:1466
 msgid "missing argument"
 msgstr "manglende argument"
 
-#: popt.c:1454
+#: popt.c:1468
 msgid "unknown option"
 msgstr "ukjent flagg"
 
-#: popt.c:1456
+#: popt.c:1470
 msgid "mutually exclusive logical operations requested"
 msgstr "gjensidig eksluderende logiske operasjoner forespurt"
 
-#: popt.c:1458
+#: popt.c:1472
 msgid "opt->arg should not be NULL"
 msgstr "opt->arg m� ikke v�re NULL"
 
-#: popt.c:1460
+#: popt.c:1474
 msgid "aliases nested too deeply"
 msgstr "aliaser med for dype l�kker"
 
-#: popt.c:1462
+#: popt.c:1476
 msgid "error in parameter quoting"
 msgstr "feil i parametersitering"
 
-#: popt.c:1464
+#: popt.c:1478
 msgid "invalid numeric value"
 msgstr "ugyldig numerisk verdi"
 
-#: popt.c:1466
+#: popt.c:1480
 msgid "number too large or too small"
 msgstr "tallet er for stort eller lite"
 
-#: popt.c:1468
+#: popt.c:1482
 msgid "memory allocation failed"
 msgstr "minneallokering feilet"
 
-#: popt.c:1470
+#: popt.c:1484
 msgid "config file failed sanity test"
 msgstr ""
 
-#: popt.c:1474
+#: popt.c:1488
 msgid "unknown error"
 msgstr "ukjent feil"
 
-#: popthelp.c:75 popthelp.c:86
+#: popthelp.c:77 popthelp.c:88
 msgid "Show this help message"
 msgstr "Vis denne hjelpmeldingen"
 
-#: popthelp.c:76 popthelp.c:87
+#: popthelp.c:78 popthelp.c:89
 msgid "Display brief usage message"
 msgstr "Vis kort bruksmelding"
 
-#: popthelp.c:90
+#: popthelp.c:92
 msgid "Display option defaults in message"
 msgstr "Vis forvalgte flagg i melding"
 
-#: popthelp.c:92
+#: popthelp.c:94
 msgid "Terminate options"
 msgstr ""
 
-#: popthelp.c:191
+#: popthelp.c:193
 msgid "Help options:"
 msgstr ""
 
-#: popthelp.c:192
+#: popthelp.c:194
 msgid "Options implemented via popt alias/exec:"
 msgstr ""
 
-#: popthelp.c:200
+#: popthelp.c:202
 msgid "NONE"
 msgstr "INGEN"
 
-#: popthelp.c:202
+#: popthelp.c:204
 msgid "VAL"
 msgstr "VERDI"
 
-#: popthelp.c:206
+#: popthelp.c:208
 msgid "INT"
 msgstr "HELTALL"
 
-#: popthelp.c:207
+#: popthelp.c:209
 msgid "LONG"
 msgstr "LONG"
 
-#: popthelp.c:208
+#: popthelp.c:210
 #, fuzzy
 msgid "LONGLONG"
 msgstr "LONG"
 
-#: popthelp.c:209
+#: popthelp.c:211
 msgid "STRING"
 msgstr "STRENG"
 
-#: popthelp.c:210
+#: popthelp.c:212
 msgid "FLOAT"
 msgstr "FLYTTALL"
 
-#: popthelp.c:211
+#: popthelp.c:213
 msgid "DOUBLE"
 msgstr "DOUBLE"
 
-#: popthelp.c:214
+#: popthelp.c:216
 msgid "ARG"
 msgstr "ARG"
 
-#: popthelp.c:644
+#: popthelp.c:646
 msgid "Usage:"
 msgstr "Bruk:"
 
-#: popthelp.c:667
+#: popthelp.c:669
 msgid "[OPTION...]"
 msgstr "[FLAGG...]"
diff --git a/po/nl.po b/po/nl.po
index 92ce048..8972992 100644
--- a/po/nl.po
+++ b/po/nl.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.14\n"
 "Report-Msgid-Bugs-To: <popt-devel@rpm5.org>\n"
-"POT-Creation-Date: 2009-04-10 17:14-0400\n"
+"POT-Creation-Date: 2009-04-12 20:00+0200\n"
 "PO-Revision-Date: 2008-02-20 19:26+0100\n"
 "Last-Translator: Tim Van Holder <tim.van.holder@telenet.be>\n"
 "Language-Team: Dutch <vertaling@vrijschrift.org>\n"
@@ -18,123 +18,123 @@ msgstr ""
 msgid "unknown errno"
 msgstr "onbekend foutnummer (errno)"
 
-#: popt.c:1031
+#: popt.c:1045
 #, c-format
 msgid "option type (%u) not implemented in popt\n"
 msgstr "dit optietype (%u) is niet geïmplementeerd in popt\n"
 
-#: popt.c:1452
+#: popt.c:1466
 msgid "missing argument"
 msgstr "ontbrekend argument"
 
-#: popt.c:1454
+#: popt.c:1468
 msgid "unknown option"
 msgstr "onbekende optie"
 
-#: popt.c:1456
+#: popt.c:1470
 msgid "mutually exclusive logical operations requested"
 msgstr "elkaar uitsluitende logische operatoren werden gevraagd"
 
-#: popt.c:1458
+#: popt.c:1472
 msgid "opt->arg should not be NULL"
 msgstr "opt->arg zou niet NULL mogen zijn"
 
-#: popt.c:1460
+#: popt.c:1474
 msgid "aliases nested too deeply"
 msgstr "aliassen zijn te diep genest"
 
 # of toch beter "quoting" behouden?
-#: popt.c:1462
+#: popt.c:1476
 msgid "error in parameter quoting"
 msgstr "fout in de aanhaling van parameters"
 
-#: popt.c:1464
+#: popt.c:1478
 msgid "invalid numeric value"
 msgstr "ongeldige numerieke waarde"
 
-#: popt.c:1466
+#: popt.c:1480
 msgid "number too large or too small"
 msgstr "getal is te klein of te groot"
 
-#: popt.c:1468
+#: popt.c:1482
 msgid "memory allocation failed"
 msgstr "reserveren van geheugen is mislukt"
 
-#: popt.c:1470
+#: popt.c:1484
 msgid "config file failed sanity test"
 msgstr ""
 
-#: popt.c:1474
+#: popt.c:1488
 msgid "unknown error"
 msgstr "onbekende fout"
 
-#: popthelp.c:75 popthelp.c:86
+#: popthelp.c:77 popthelp.c:88
 msgid "Show this help message"
 msgstr "Deze hulptekst tonen"
 
-#: popthelp.c:76 popthelp.c:87
+#: popthelp.c:78 popthelp.c:89
 msgid "Display brief usage message"
 msgstr "Een korte gebruikssamenvatting tonen"
 
-#: popthelp.c:90
+#: popthelp.c:92
 msgid "Display option defaults in message"
 msgstr "De standaardwaarden van opties tonen in de tekst"
 
-#: popthelp.c:92
+#: popthelp.c:94
 msgid "Terminate options"
 msgstr "Opties beëindigen"
 
 # of "Help-opties:"?
-#: popthelp.c:191
+#: popthelp.c:193
 msgid "Help options:"
 msgstr "Hulp-opties:"
 
-#: popthelp.c:192
+#: popthelp.c:194
 msgid "Options implemented via popt alias/exec:"
 msgstr "Opties geïmplementeerd d.m.v. popt alias/exec:"
 
-#: popthelp.c:200
+#: popthelp.c:202
 msgid "NONE"
 msgstr "GEEN"
 
-#: popthelp.c:202
+#: popthelp.c:204
 msgid "VAL"
 msgstr "WAARDE"
 
-#: popthelp.c:206
+#: popthelp.c:208
 msgid "INT"
 msgstr "INT"
 
-#: popthelp.c:207
+#: popthelp.c:209
 msgid "LONG"
 msgstr "LONG"
 
-#: popthelp.c:208
+#: popthelp.c:210
 msgid "LONGLONG"
 msgstr "LONGLONG"
 
 # TEKENREEKS lijkt me niet gepast; dus ofwel STRING behouden, ofwel TEKST
-#: popthelp.c:209
+#: popthelp.c:211
 msgid "STRING"
 msgstr "TEKST"
 
-#: popthelp.c:210
+#: popthelp.c:212
 msgid "FLOAT"
 msgstr "FLOAT"
 
-#: popthelp.c:211
+#: popthelp.c:213
 msgid "DOUBLE"
 msgstr "DOUBLE"
 
 # of hier ARGUMENT van maken?
-#: popthelp.c:214
+#: popthelp.c:216
 msgid "ARG"
 msgstr "ARG"
 
-#: popthelp.c:644
+#: popthelp.c:646
 msgid "Usage:"
 msgstr "Gebruik:"
 
-#: popthelp.c:667
+#: popthelp.c:669
 msgid "[OPTION...]"
 msgstr "[OPTIE...]"
diff --git a/po/pl.po b/po/pl.po
index bc58eed..8e078a3 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.14\n"
 "Report-Msgid-Bugs-To: <popt-devel@rpm5.org>\n"
-"POT-Creation-Date: 2009-04-10 17:14-0400\n"
+"POT-Creation-Date: 2009-04-12 20:00+0200\n"
 "PO-Revision-Date: 2008-02-18 00:30+0100\n"
 "Last-Translator: Jakub Bogusz <qboosh@pld-linux.org>\n"
 "Language-Team: Polish <translation-team-pl@lists.sourceforge.net>\n"
@@ -18,119 +18,119 @@ msgstr ""
 msgid "unknown errno"
 msgstr "nieznane errno"
 
-#: popt.c:1031
+#: popt.c:1045
 #, c-format
 msgid "option type (%u) not implemented in popt\n"
 msgstr "typ opcji (%u) nie zaimplementowany w popt\n"
 
-#: popt.c:1452
+#: popt.c:1466
 msgid "missing argument"
 msgstr "brak parametru"
 
-#: popt.c:1454
+#: popt.c:1468
 msgid "unknown option"
 msgstr "nieznana opcja"
 
-#: popt.c:1456
+#: popt.c:1470
 msgid "mutually exclusive logical operations requested"
 msgstr "��danie wykluczaj�cych si� operacji"
 
-#: popt.c:1458
+#: popt.c:1472
 msgid "opt->arg should not be NULL"
 msgstr "opt->arg nie mo�e by� NULL"
 
-#: popt.c:1460
+#: popt.c:1474
 msgid "aliases nested too deeply"
 msgstr "zbyt du�e zag��bienie alias�w"
 
-#: popt.c:1462
+#: popt.c:1476
 msgid "error in parameter quoting"
 msgstr "b��d w cytowaniu parametru"
 
-#: popt.c:1464
+#: popt.c:1478
 msgid "invalid numeric value"
 msgstr "b��dna warto�� liczbowa"
 
-#: popt.c:1466
+#: popt.c:1480
 msgid "number too large or too small"
 msgstr "liczba zbyt du�a lub zbyt ma�a"
 
-#: popt.c:1468
+#: popt.c:1482
 msgid "memory allocation failed"
 msgstr "b��d alokacji pami�ci"
 
-#: popt.c:1470
+#: popt.c:1484
 msgid "config file failed sanity test"
 msgstr ""
 
-#: popt.c:1474
+#: popt.c:1488
 msgid "unknown error"
 msgstr "nieznany b��d"
 
-#: popthelp.c:75 popthelp.c:86
+#: popthelp.c:77 popthelp.c:88
 msgid "Show this help message"
 msgstr "Poka� t� pomoc"
 
-#: popthelp.c:76 popthelp.c:87
+#: popthelp.c:78 popthelp.c:89
 msgid "Display brief usage message"
 msgstr "Wy�wietl skr�cony spos�b u�ycia"
 
-#: popthelp.c:90
+#: popthelp.c:92
 msgid "Display option defaults in message"
 msgstr "Wy�wietl domy�lne opcje w opisie"
 
-#: popthelp.c:92
+#: popthelp.c:94
 msgid "Terminate options"
 msgstr "Opcje zako�czenia"
 
-#: popthelp.c:191
+#: popthelp.c:193
 msgid "Help options:"
 msgstr "Opcje pomocy:"
 
-#: popthelp.c:192
+#: popthelp.c:194
 msgid "Options implemented via popt alias/exec:"
 msgstr "Opcje zaimplementowane poprzez popt alias/exec:"
 
-#: popthelp.c:200
+#: popthelp.c:202
 msgid "NONE"
 msgstr "BRAK"
 
-#: popthelp.c:202
+#: popthelp.c:204
 msgid "VAL"
 msgstr "WART"
 
-#: popthelp.c:206
+#: popthelp.c:208
 msgid "INT"
 msgstr "INT"
 
-#: popthelp.c:207
+#: popthelp.c:209
 msgid "LONG"
 msgstr "LONG"
 
-#: popthelp.c:208
+#: popthelp.c:210
 msgid "LONGLONG"
 msgstr "LONGLONG"
 
-#: popthelp.c:209
+#: popthelp.c:211
 msgid "STRING"
 msgstr "�A�CUCH"
 
-#: popthelp.c:210
+#: popthelp.c:212
 msgid "FLOAT"
 msgstr "FLOAT"
 
-#: popthelp.c:211
+#: popthelp.c:213
 msgid "DOUBLE"
 msgstr "DOUBLE"
 
-#: popthelp.c:214
+#: popthelp.c:216
 msgid "ARG"
 msgstr "PARAM"
 
-#: popthelp.c:644
+#: popthelp.c:646
 msgid "Usage:"
 msgstr "Sk�adnia:"
 
-#: popthelp.c:667
+#: popthelp.c:669
 msgid "[OPTION...]"
 msgstr "[OPCJA...]"
diff --git a/po/popt.pot b/po/popt.pot
index 5b13f68..5d46ff0 100644
--- a/po/popt.pot
+++ b/po/popt.pot
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.15\n"
 "Report-Msgid-Bugs-To: <popt-devel@rpm5.org>\n"
-"POT-Creation-Date: 2009-04-10 17:14-0400\n"
+"POT-Creation-Date: 2009-04-12 20:00+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -19,119 +19,119 @@ msgstr ""
 msgid "unknown errno"
 msgstr ""
 
-#: popt.c:1031
+#: popt.c:1045
 #, c-format
 msgid "option type (%u) not implemented in popt\n"
 msgstr ""
 
-#: popt.c:1452
+#: popt.c:1466
 msgid "missing argument"
 msgstr ""
 
-#: popt.c:1454
+#: popt.c:1468
 msgid "unknown option"
 msgstr ""
 
-#: popt.c:1456
+#: popt.c:1470
 msgid "mutually exclusive logical operations requested"
 msgstr ""
 
-#: popt.c:1458
+#: popt.c:1472
 msgid "opt->arg should not be NULL"
 msgstr ""
 
-#: popt.c:1460
+#: popt.c:1474
 msgid "aliases nested too deeply"
 msgstr ""
 
-#: popt.c:1462
+#: popt.c:1476
 msgid "error in parameter quoting"
 msgstr ""
 
-#: popt.c:1464
+#: popt.c:1478
 msgid "invalid numeric value"
 msgstr ""
 
-#: popt.c:1466
+#: popt.c:1480
 msgid "number too large or too small"
 msgstr ""
 
-#: popt.c:1468
+#: popt.c:1482
 msgid "memory allocation failed"
 msgstr ""
 
-#: popt.c:1470
+#: popt.c:1484
 msgid "config file failed sanity test"
 msgstr ""
 
-#: popt.c:1474
+#: popt.c:1488
 msgid "unknown error"
 msgstr ""
 
-#: popthelp.c:75 popthelp.c:86
+#: popthelp.c:77 popthelp.c:88
 msgid "Show this help message"
 msgstr ""
 
-#: popthelp.c:76 popthelp.c:87
+#: popthelp.c:78 popthelp.c:89
 msgid "Display brief usage message"
 msgstr ""
 
-#: popthelp.c:90
+#: popthelp.c:92
 msgid "Display option defaults in message"
 msgstr ""
 
-#: popthelp.c:92
+#: popthelp.c:94
 msgid "Terminate options"
 msgstr ""
 
-#: popthelp.c:191
+#: popthelp.c:193
 msgid "Help options:"
 msgstr ""
 
-#: popthelp.c:192
+#: popthelp.c:194
 msgid "Options implemented via popt alias/exec:"
 msgstr ""
 
-#: popthelp.c:200
+#: popthelp.c:202
 msgid "NONE"
 msgstr ""
 
-#: popthelp.c:202
+#: popthelp.c:204
 msgid "VAL"
 msgstr ""
 
-#: popthelp.c:206
+#: popthelp.c:208
 msgid "INT"
 msgstr ""
 
-#: popthelp.c:207
+#: popthelp.c:209
 msgid "LONG"
 msgstr ""
 
-#: popthelp.c:208
+#: popthelp.c:210
 msgid "LONGLONG"
 msgstr ""
 
-#: popthelp.c:209
+#: popthelp.c:211
 msgid "STRING"
 msgstr ""
 
-#: popthelp.c:210
+#: popthelp.c:212
 msgid "FLOAT"
 msgstr ""
 
-#: popthelp.c:211
+#: popthelp.c:213
 msgid "DOUBLE"
 msgstr ""
 
-#: popthelp.c:214
+#: popthelp.c:216
 msgid "ARG"
 msgstr ""
 
-#: popthelp.c:644
+#: popthelp.c:646
 msgid "Usage:"
 msgstr ""
 
-#: popthelp.c:667
+#: popthelp.c:669
 msgid "[OPTION...]"
 msgstr ""
diff --git a/po/pt.po b/po/pt.po
index 1472c88..c47cdb6 100644
--- a/po/pt.po
+++ b/po/pt.po
@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.11\n"
 "Report-Msgid-Bugs-To: <popt-devel@rpm5.org>\n"
-"POT-Creation-Date: 2009-04-10 17:14-0400\n"
+"POT-Creation-Date: 2009-04-12 20:00+0200\n"
 "PO-Revision-Date: 2002-02-13 18:32+0000\n"
 "Last-Translator: Pedro Morais <morais@kde.org>\n"
 "Language-Team: pt <morais@kde.org>\n"
@@ -14,120 +14,120 @@ msgstr ""
 msgid "unknown errno"
 msgstr "errno desconhecido"
 
-#: popt.c:1031
+#: popt.c:1045
 #, fuzzy, c-format
 msgid "option type (%u) not implemented in popt\n"
 msgstr "tipo de op��o (%d) n�o implementado no popt\n"
 
-#: popt.c:1452
+#: popt.c:1466
 msgid "missing argument"
 msgstr "falta um argumento"
 
-#: popt.c:1454
+#: popt.c:1468
 msgid "unknown option"
 msgstr "op��o desconhecida"
 
-#: popt.c:1456
+#: popt.c:1470
 msgid "mutually exclusive logical operations requested"
 msgstr "foram pedidas opera��es l�gicas mutuamente exclusivas"
 
-#: popt.c:1458
+#: popt.c:1472
 msgid "opt->arg should not be NULL"
 msgstr "opt->arg n�o deve ser NULL"
 
-#: popt.c:1460
+#: popt.c:1474
 msgid "aliases nested too deeply"
 msgstr "'aliases' demasiado aninhados"
 
-#: popt.c:1462
+#: popt.c:1476
 msgid "error in parameter quoting"
 msgstr "erros no 'quoting' de par�metros"
 
-#: popt.c:1464
+#: popt.c:1478
 msgid "invalid numeric value"
 msgstr "valor n�merico inv�lido"
 
-#: popt.c:1466
+#: popt.c:1480
 msgid "number too large or too small"
 msgstr "n�mero demasiado grando ou pequeno"
 
-#: popt.c:1468
+#: popt.c:1482
 msgid "memory allocation failed"
 msgstr "aloca��o de mem�ria falhou"
 
-#: popt.c:1470
+#: popt.c:1484
 msgid "config file failed sanity test"
 msgstr ""
 
-#: popt.c:1474
+#: popt.c:1488
 msgid "unknown error"
 msgstr "erro desconhecido"
 
-#: popthelp.c:75 popthelp.c:86
+#: popthelp.c:77 popthelp.c:88
 msgid "Show this help message"
 msgstr "Mostrar esta mensagem de ajuda"
 
-#: popthelp.c:76 popthelp.c:87
+#: popthelp.c:78 popthelp.c:89
 msgid "Display brief usage message"
 msgstr "Mostrar uma mensagem de utiliza��o sucinta"
 
-#: popthelp.c:90
+#: popthelp.c:92
 msgid "Display option defaults in message"
 msgstr "Mostrar valor por omiss�o das op��es na mensagem"
 
-#: popthelp.c:92
+#: popthelp.c:94
 msgid "Terminate options"
 msgstr ""
 
-#: popthelp.c:191
+#: popthelp.c:193
 msgid "Help options:"
 msgstr ""
 
-#: popthelp.c:192
+#: popthelp.c:194
 msgid "Options implemented via popt alias/exec:"
 msgstr ""
 
-#: popthelp.c:200
+#: popthelp.c:202
 msgid "NONE"
 msgstr "NONE"
 
-#: popthelp.c:202
+#: popthelp.c:204
 msgid "VAL"
 msgstr "VAL"
 
-#: popthelp.c:206
+#: popthelp.c:208
 msgid "INT"
 msgstr "INT"
 
-#: popthelp.c:207
+#: popthelp.c:209
 msgid "LONG"
 msgstr "LONG"
 
-#: popthelp.c:208
+#: popthelp.c:210
 #, fuzzy
 msgid "LONGLONG"
 msgstr "LONG"
 
-#: popthelp.c:209
+#: popthelp.c:211
 msgid "STRING"
 msgstr "STRING"
 
-#: popthelp.c:210
+#: popthelp.c:212
 msgid "FLOAT"
 msgstr "FLOAT"
 
-#: popthelp.c:211
+#: popthelp.c:213
 msgid "DOUBLE"
 msgstr "DOUBLE"
 
-#: popthelp.c:214
+#: popthelp.c:216
 msgid "ARG"
 msgstr "ARG"
 
-#: popthelp.c:644
+#: popthelp.c:646
 msgid "Usage:"
 msgstr "Utiliza��o:"
 
-#: popthelp.c:667
+#: popthelp.c:669
 msgid "[OPTION...]"
 msgstr "[OP��O...]"
diff --git a/po/ro.po b/po/ro.po
index b37fae0..cab050d 100644
--- a/po/ro.po
+++ b/po/ro.po
@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.11\n"
 "Report-Msgid-Bugs-To: <popt-devel@rpm5.org>\n"
-"POT-Creation-Date: 2009-04-10 17:14-0400\n"
+"POT-Creation-Date: 2009-04-12 20:00+0200\n"
 "PO-Revision-Date: 2000-06-14 23:23+EST\n"
 "Last-Translator: Cristian Gafton <gafton@redhat.com>\n"
 "Language-Team: Romanian <ro@li.org>\n"
@@ -14,121 +14,121 @@ msgstr ""
 msgid "unknown errno"
 msgstr "eroare necunoscuta"
 
-#: popt.c:1031
+#: popt.c:1045
 #, fuzzy, c-format
 msgid "option type (%u) not implemented in popt\n"
 msgstr "optiunea de tipul (%d) nu este implementata in popt\n"
 
-#: popt.c:1452
+#: popt.c:1466
 msgid "missing argument"
 msgstr "argument lipsa"
 
-#: popt.c:1454
+#: popt.c:1468
 msgid "unknown option"
 msgstr "optiune necunoscuta"
 
-#: popt.c:1456
+#: popt.c:1470
 msgid "mutually exclusive logical operations requested"
 msgstr ""
 
-#: popt.c:1458
+#: popt.c:1472
 msgid "opt->arg should not be NULL"
 msgstr ""
 
-#: popt.c:1460
+#: popt.c:1474
 msgid "aliases nested too deeply"
 msgstr "recursivitate infinita la optiunile sinonime"
 
-#: popt.c:1462
+#: popt.c:1476
 #, fuzzy
 msgid "error in parameter quoting"
 msgstr "eroare la insertie parametru"
 
-#: popt.c:1464
+#: popt.c:1478
 msgid "invalid numeric value"
 msgstr "valoare numarica invalida"
 
-#: popt.c:1466
+#: popt.c:1480
 msgid "number too large or too small"
 msgstr "numar prea mare sau prea mic"
 
-#: popt.c:1468
+#: popt.c:1482
 msgid "memory allocation failed"
 msgstr ""
 
-#: popt.c:1470
+#: popt.c:1484
 msgid "config file failed sanity test"
 msgstr ""
 
-#: popt.c:1474
+#: popt.c:1488
 msgid "unknown error"
 msgstr "eroare necuinoscuta"
 
-#: popthelp.c:75 popthelp.c:86
+#: popthelp.c:77 popthelp.c:88
 msgid "Show this help message"
 msgstr "Afisare mesaj de help"
 
-#: popthelp.c:76 popthelp.c:87
+#: popthelp.c:78 popthelp.c:89
 msgid "Display brief usage message"
 msgstr "Afisare mesaj sintaxa sumar"
 
-#: popthelp.c:90
+#: popthelp.c:92
 #, fuzzy
 msgid "Display option defaults in message"
 msgstr "Afisare mesaj sintaxa sumar"
 
-#: popthelp.c:92
+#: popthelp.c:94
 msgid "Terminate options"
 msgstr ""
 
-#: popthelp.c:191
+#: popthelp.c:193
 msgid "Help options:"
 msgstr ""
 
-#: popthelp.c:192
+#: popthelp.c:194
 msgid "Options implemented via popt alias/exec:"
 msgstr ""
 
-#: popthelp.c:200
+#: popthelp.c:202
 msgid "NONE"
 msgstr ""
 
-#: popthelp.c:202
+#: popthelp.c:204
 msgid "VAL"
 msgstr ""
 
-#: popthelp.c:206
+#: popthelp.c:208
 msgid "INT"
 msgstr ""
 
-#: popthelp.c:207
+#: popthelp.c:209
 msgid "LONG"
 msgstr ""
 
-#: popthelp.c:208
+#: popthelp.c:210
 msgid "LONGLONG"
 msgstr ""
 
-#: popthelp.c:209
+#: popthelp.c:211
 msgid "STRING"
 msgstr ""
 
-#: popthelp.c:210
+#: popthelp.c:212
 msgid "FLOAT"
 msgstr ""
 
-#: popthelp.c:211
+#: popthelp.c:213
 msgid "DOUBLE"
 msgstr ""
 
-#: popthelp.c:214
+#: popthelp.c:216
 msgid "ARG"
 msgstr ""
 
-#: popthelp.c:644
+#: popthelp.c:646
 msgid "Usage:"
 msgstr "Sintaxa:"
 
-#: popthelp.c:667
+#: popthelp.c:669
 msgid "[OPTION...]"
 msgstr "[OPTIUNE...]"
diff --git a/po/ru.po b/po/ru.po
index 112f4e1..c895409 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.14\n"
 "Report-Msgid-Bugs-To: <popt-devel@rpm5.org>\n"
-"POT-Creation-Date: 2009-04-10 17:14-0400\n"
+"POT-Creation-Date: 2009-04-12 20:00+0200\n"
 "PO-Revision-Date: 2009-02-01 13:30+0300\n"
 "Last-Translator: Yuri Kozlov <yuray@komyakino.ru>\n"
 "Language-Team: Russian <gnu@mx.ru>\n"
@@ -22,119 +22,119 @@ msgstr ""
 msgid "unknown errno"
 msgstr "неизвестный errno"
 
-#: popt.c:1031
+#: popt.c:1045
 #, c-format
 msgid "option type (%u) not implemented in popt\n"
 msgstr "обработка параметра (%u) в popt не предусмотрена\n"
 
-#: popt.c:1452
+#: popt.c:1466
 msgid "missing argument"
 msgstr "пропущен аргумент"
 
-#: popt.c:1454
+#: popt.c:1468
 msgid "unknown option"
 msgstr "неизвестный параметр"
 
-#: popt.c:1456
+#: popt.c:1470
 msgid "mutually exclusive logical operations requested"
 msgstr "запрошены взаимно исключающие логические операции"
 
-#: popt.c:1458
+#: popt.c:1472
 msgid "opt->arg should not be NULL"
 msgstr "opt->arg не может быть NULL"
 
-#: popt.c:1460
+#: popt.c:1474
 msgid "aliases nested too deeply"
 msgstr "превышен уровень допустимой рекурсии подстановок"
 
-#: popt.c:1462
+#: popt.c:1476
 msgid "error in parameter quoting"
 msgstr "ошибка помещения параметров в кавычки"
 
-#: popt.c:1464
+#: popt.c:1478
 msgid "invalid numeric value"
 msgstr "неправильное числовое значение"
 
-#: popt.c:1466
+#: popt.c:1480
 msgid "number too large or too small"
 msgstr "числовое значение за пределами предусмотренного"
 
-#: popt.c:1468
+#: popt.c:1482
 msgid "memory allocation failed"
 msgstr "не удалось выделить память"
 
-#: popt.c:1470
+#: popt.c:1484
 msgid "config file failed sanity test"
 msgstr ""
 
-#: popt.c:1474
+#: popt.c:1488
 msgid "unknown error"
 msgstr "неизвестная ошибка"
 
-#: popthelp.c:75 popthelp.c:86
+#: popthelp.c:77 popthelp.c:88
 msgid "Show this help message"
 msgstr "Показать эту справку"
 
-#: popthelp.c:76 popthelp.c:87
+#: popthelp.c:78 popthelp.c:89
 msgid "Display brief usage message"
 msgstr "Показать краткую инструкцию по использованию"
 
-#: popthelp.c:90
+#: popthelp.c:92
 msgid "Display option defaults in message"
 msgstr "Показать параметры по умолчанию"
 
-#: popthelp.c:92
+#: popthelp.c:94
 msgid "Terminate options"
 msgstr "Завершает параметры"
 
-#: popthelp.c:191
+#: popthelp.c:193
 msgid "Help options:"
 msgstr "Параметры вывода справки:"
 
-#: popthelp.c:192
+#: popthelp.c:194
 msgid "Options implemented via popt alias/exec:"
 msgstr "Параметры, реализованные через popt alias/exec:"
 
-#: popthelp.c:200
+#: popthelp.c:202
 msgid "NONE"
 msgstr "NONE"
 
-#: popthelp.c:202
+#: popthelp.c:204
 msgid "VAL"
 msgstr "VAL"
 
-#: popthelp.c:206
+#: popthelp.c:208
 msgid "INT"
 msgstr "INT"
 
-#: popthelp.c:207
+#: popthelp.c:209
 msgid "LONG"
 msgstr "LONG"
 
-#: popthelp.c:208
+#: popthelp.c:210
 msgid "LONGLONG"
 msgstr "LONGLONG"
 
-#: popthelp.c:209
+#: popthelp.c:211
 msgid "STRING"
 msgstr "STRING"
 
-#: popthelp.c:210
+#: popthelp.c:212
 msgid "FLOAT"
 msgstr "FLOAT"
 
-#: popthelp.c:211
+#: popthelp.c:213
 msgid "DOUBLE"
 msgstr "DOUBLE"
 
-#: popthelp.c:214
+#: popthelp.c:216
 msgid "ARG"
 msgstr "ARG"
 
-#: popthelp.c:644
+#: popthelp.c:646
 msgid "Usage:"
 msgstr "Использование:"
 
-#: popthelp.c:667
+#: popthelp.c:669
 msgid "[OPTION...]"
 msgstr "[ПАРАМЕТР...]"
diff --git a/po/sk.po b/po/sk.po
index ffb45b6..549bde8 100644
--- a/po/sk.po
+++ b/po/sk.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.11\n"
 "Report-Msgid-Bugs-To: <popt-devel@rpm5.org>\n"
-"POT-Creation-Date: 2009-04-10 17:14-0400\n"
+"POT-Creation-Date: 2009-04-12 20:00+0200\n"
 "PO-Revision-Date: 1999-08-04 21:40+0200\n"
 "Last-Translator: Stanislav Meduna <stano@eunet.sk>\n"
 "Language-Team: Slovak <sk-i18n@rak.isternet.sk>\n"
@@ -18,120 +18,120 @@ msgstr ""
 msgid "unknown errno"
 msgstr ""
 
-#: popt.c:1031
+#: popt.c:1045
 #, c-format
 msgid "option type (%u) not implemented in popt\n"
 msgstr ""
 
-#: popt.c:1452
+#: popt.c:1466
 msgid "missing argument"
 msgstr ""
 
-#: popt.c:1454
+#: popt.c:1468
 msgid "unknown option"
 msgstr ""
 
-#: popt.c:1456
+#: popt.c:1470
 msgid "mutually exclusive logical operations requested"
 msgstr ""
 
-#: popt.c:1458
+#: popt.c:1472
 msgid "opt->arg should not be NULL"
 msgstr ""
 
-#: popt.c:1460
+#: popt.c:1474
 msgid "aliases nested too deeply"
 msgstr ""
 
-#: popt.c:1462
+#: popt.c:1476
 msgid "error in parameter quoting"
 msgstr ""
 
-#: popt.c:1464
+#: popt.c:1478
 msgid "invalid numeric value"
 msgstr ""
 
-#: popt.c:1466
+#: popt.c:1480
 msgid "number too large or too small"
 msgstr ""
 
-#: popt.c:1468
+#: popt.c:1482
 msgid "memory allocation failed"
 msgstr ""
 
-#: popt.c:1470
+#: popt.c:1484
 msgid "config file failed sanity test"
 msgstr ""
 
-#: popt.c:1474
+#: popt.c:1488
 msgid "unknown error"
 msgstr ""
 
-#: popthelp.c:75 popthelp.c:86
+#: popthelp.c:77 popthelp.c:88
 msgid "Show this help message"
 msgstr "Vyp�sa� t�to spr�vu"
 
-#: popthelp.c:76 popthelp.c:87
+#: popthelp.c:78 popthelp.c:89
 msgid "Display brief usage message"
 msgstr "Zobrazi� stru�n� n�vod na pou�itie"
 
-#: popthelp.c:90
+#: popthelp.c:92
 #, fuzzy
 msgid "Display option defaults in message"
 msgstr "Zobrazi� stru�n� n�vod na pou�itie"
 
-#: popthelp.c:92
+#: popthelp.c:94
 msgid "Terminate options"
 msgstr ""
 
-#: popthelp.c:191
+#: popthelp.c:193
 msgid "Help options:"
 msgstr ""
 
-#: popthelp.c:192
+#: popthelp.c:194
 msgid "Options implemented via popt alias/exec:"
 msgstr ""
 
-#: popthelp.c:200
+#: popthelp.c:202
 msgid "NONE"
 msgstr ""
 
-#: popthelp.c:202
+#: popthelp.c:204
 msgid "VAL"
 msgstr ""
 
-#: popthelp.c:206
+#: popthelp.c:208
 msgid "INT"
 msgstr ""
 
-#: popthelp.c:207
+#: popthelp.c:209
 msgid "LONG"
 msgstr ""
 
-#: popthelp.c:208
+#: popthelp.c:210
 msgid "LONGLONG"
 msgstr ""
 
-#: popthelp.c:209
+#: popthelp.c:211
 msgid "STRING"
 msgstr ""
 
-#: popthelp.c:210
+#: popthelp.c:212
 msgid "FLOAT"
 msgstr ""
 
-#: popthelp.c:211
+#: popthelp.c:213
 msgid "DOUBLE"
 msgstr ""
 
-#: popthelp.c:214
+#: popthelp.c:216
 msgid "ARG"
 msgstr ""
 
-#: popthelp.c:644
+#: popthelp.c:646
 msgid "Usage:"
 msgstr ""
 
-#: popthelp.c:667
+#: popthelp.c:669
 msgid "[OPTION...]"
 msgstr ""
diff --git a/po/sl.po b/po/sl.po
index a82b854..95d5197 100644
--- a/po/sl.po
+++ b/po/sl.po
@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.11\n"
 "Report-Msgid-Bugs-To: <popt-devel@rpm5.org>\n"
-"POT-Creation-Date: 2009-04-10 17:14-0400\n"
+"POT-Creation-Date: 2009-04-12 20:00+0200\n"
 "PO-Revision-Date: 2000-09-05 12:30+0200\n"
 "Last-Translator: Roman Maurer <roman.maurer@hermes.si>\n"
 "Language-Team: Slovenian <sl@li.org>\n"
@@ -14,120 +14,120 @@ msgstr ""
 msgid "unknown errno"
 msgstr ""
 
-#: popt.c:1031
+#: popt.c:1045
 #, c-format
 msgid "option type (%u) not implemented in popt\n"
 msgstr ""
 
-#: popt.c:1452
+#: popt.c:1466
 msgid "missing argument"
 msgstr ""
 
-#: popt.c:1454
+#: popt.c:1468
 msgid "unknown option"
 msgstr ""
 
-#: popt.c:1456
+#: popt.c:1470
 msgid "mutually exclusive logical operations requested"
 msgstr ""
 
-#: popt.c:1458
+#: popt.c:1472
 msgid "opt->arg should not be NULL"
 msgstr ""
 
-#: popt.c:1460
+#: popt.c:1474
 msgid "aliases nested too deeply"
 msgstr ""
 
-#: popt.c:1462
+#: popt.c:1476
 msgid "error in parameter quoting"
 msgstr ""
 
-#: popt.c:1464
+#: popt.c:1478
 msgid "invalid numeric value"
 msgstr ""
 
-#: popt.c:1466
+#: popt.c:1480
 msgid "number too large or too small"
 msgstr ""
 
-#: popt.c:1468
+#: popt.c:1482
 msgid "memory allocation failed"
 msgstr ""
 
-#: popt.c:1470
+#: popt.c:1484
 msgid "config file failed sanity test"
 msgstr ""
 
-#: popt.c:1474
+#: popt.c:1488
 msgid "unknown error"
 msgstr ""
 
-#: popthelp.c:75 popthelp.c:86
+#: popthelp.c:77 popthelp.c:88
 msgid "Show this help message"
 msgstr "Prika�i to sporo�ilo s pomo�jo"
 
-#: popthelp.c:76 popthelp.c:87
+#: popthelp.c:78 popthelp.c:89
 msgid "Display brief usage message"
 msgstr "Prika�i kratko sporo�ilo o uporabi"
 
-#: popthelp.c:90
+#: popthelp.c:92
 #, fuzzy
 msgid "Display option defaults in message"
 msgstr "Prika�i kratko sporo�ilo o uporabi"
 
-#: popthelp.c:92
+#: popthelp.c:94
 msgid "Terminate options"
 msgstr ""
 
-#: popthelp.c:191
+#: popthelp.c:193
 msgid "Help options:"
 msgstr ""
 
-#: popthelp.c:192
+#: popthelp.c:194
 msgid "Options implemented via popt alias/exec:"
 msgstr ""
 
-#: popthelp.c:200
+#: popthelp.c:202
 msgid "NONE"
 msgstr ""
 
-#: popthelp.c:202
+#: popthelp.c:204
 msgid "VAL"
 msgstr ""
 
-#: popthelp.c:206
+#: popthelp.c:208
 msgid "INT"
 msgstr ""
 
-#: popthelp.c:207
+#: popthelp.c:209
 msgid "LONG"
 msgstr ""
 
-#: popthelp.c:208
+#: popthelp.c:210
 msgid "LONGLONG"
 msgstr ""
 
-#: popthelp.c:209
+#: popthelp.c:211
 msgid "STRING"
 msgstr ""
 
-#: popthelp.c:210
+#: popthelp.c:212
 msgid "FLOAT"
 msgstr ""
 
-#: popthelp.c:211
+#: popthelp.c:213
 msgid "DOUBLE"
 msgstr ""
 
-#: popthelp.c:214
+#: popthelp.c:216
 msgid "ARG"
 msgstr ""
 
-#: popthelp.c:644
+#: popthelp.c:646
 msgid "Usage:"
 msgstr ""
 
-#: popthelp.c:667
+#: popthelp.c:669
 msgid "[OPTION...]"
 msgstr ""
diff --git a/po/sv.po b/po/sv.po
index aa07a80..197e4a0 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.14\n"
 "Report-Msgid-Bugs-To: <popt-devel@rpm5.org>\n"
-"POT-Creation-Date: 2009-04-10 17:14-0400\n"
+"POT-Creation-Date: 2009-04-12 20:00+0200\n"
 "PO-Revision-Date: 2008-02-23 20:15+0100\n"
 "Last-Translator: G�ran Uddeborg <goeran@uddeborg.se>\n"
 "Language-Team: Swedish <tp-sv@listor.tp-sv.se>\n"
@@ -21,119 +21,119 @@ msgstr ""
 msgid "unknown errno"
 msgstr "ok�nt felnummer"
 
-#: popt.c:1031
+#: popt.c:1045
 #, c-format
 msgid "option type (%u) not implemented in popt\n"
 msgstr "flaggtypen (%u) �r inte implementerad i popt\n"
 
-#: popt.c:1452
+#: popt.c:1466
 msgid "missing argument"
 msgstr "argument saknas"
 
-#: popt.c:1454
+#: popt.c:1468
 msgid "unknown option"
 msgstr "ok�nd flagga"
 
-#: popt.c:1456
+#: popt.c:1470
 msgid "mutually exclusive logical operations requested"
 msgstr "�msesidigt uteslutande logiska operationer beg�rdes"
 
-#: popt.c:1458
+#: popt.c:1472
 msgid "opt->arg should not be NULL"
 msgstr "opt->arg f�r inte vara NULL"
 
-#: popt.c:1460
+#: popt.c:1474
 msgid "aliases nested too deeply"
 msgstr "alias �r n�stade f�r djupt"
 
-#: popt.c:1462
+#: popt.c:1476
 msgid "error in parameter quoting"
 msgstr "fel i parametercitering"
 
-#: popt.c:1464
+#: popt.c:1478
 msgid "invalid numeric value"
 msgstr "ogiltigt numeriskt v�rde"
 
-#: popt.c:1466
+#: popt.c:1480
 msgid "number too large or too small"
 msgstr "talet f�r stort eller f�r litet"
 
-#: popt.c:1468
+#: popt.c:1482
 msgid "memory allocation failed"
 msgstr "minnesallokering misslyckades"
 
-#: popt.c:1470
+#: popt.c:1484
 msgid "config file failed sanity test"
 msgstr ""
 
-#: popt.c:1474
+#: popt.c:1488
 msgid "unknown error"
 msgstr "ok�nt fel"
 
-#: popthelp.c:75 popthelp.c:86
+#: popthelp.c:77 popthelp.c:88
 msgid "Show this help message"
 msgstr "Visa denna hj�lptext"
 
-#: popthelp.c:76 popthelp.c:87
+#: popthelp.c:78 popthelp.c:89
 msgid "Display brief usage message"
 msgstr "Visa en kortfattad anv�ndningstext"
 
-#: popthelp.c:90
+#: popthelp.c:92
 msgid "Display option defaults in message"
 msgstr "Visa standardalternativ f�r flaggor i meddelande"
 
-#: popthelp.c:92
+#: popthelp.c:94
 msgid "Terminate options"
 msgstr "Avsluta flaggor"
 
-#: popthelp.c:191
+#: popthelp.c:193
 msgid "Help options:"
 msgstr "Hj�lpflaggor:"
 
-#: popthelp.c:192
+#: popthelp.c:194
 msgid "Options implemented via popt alias/exec:"
 msgstr "Flaggor implementerade via popt-alias/exec:"
 
-#: popthelp.c:200
+#: popthelp.c:202
 msgid "NONE"
 msgstr "INGET"
 
-#: popthelp.c:202
+#: popthelp.c:204
 msgid "VAL"
 msgstr "V�RDE"
 
-#: popthelp.c:206
+#: popthelp.c:208
 msgid "INT"
 msgstr "HELTAL"
 
-#: popthelp.c:207
+#: popthelp.c:209
 msgid "LONG"
 msgstr "L�NG"
 
-#: popthelp.c:208
+#: popthelp.c:210
 msgid "LONGLONG"
 msgstr "L�NGL�NG"
 
-#: popthelp.c:209
+#: popthelp.c:211
 msgid "STRING"
 msgstr "STR�NG"
 
-#: popthelp.c:210
+#: popthelp.c:212
 msgid "FLOAT"
 msgstr "FLYTTAL"
 
-#: popthelp.c:211
+#: popthelp.c:213
 msgid "DOUBLE"
 msgstr "DUBBEL"
 
-#: popthelp.c:214
+#: popthelp.c:216
 msgid "ARG"
 msgstr "ARG"
 
-#: popthelp.c:644
+#: popthelp.c:646
 msgid "Usage:"
 msgstr "Anv�ndning:"
 
-#: popthelp.c:667
+#: popthelp.c:669
 msgid "[OPTION...]"
 msgstr "[FLAGGA...]"
diff --git a/po/th.po b/po/th.po
index 7884f1a..49717ca 100644
--- a/po/th.po
+++ b/po/th.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.14\n"
 "Report-Msgid-Bugs-To: <popt-devel@rpm5.org>\n"
-"POT-Creation-Date: 2009-04-10 17:14-0400\n"
+"POT-Creation-Date: 2009-04-12 20:00+0200\n"
 "PO-Revision-Date: 2008-02-19 15:53+0700\n"
 "Last-Translator: Seksan Poltree <seksan.poltree@gmail.com>\n"
 "Language-Team: Thai <translation-team-th@lists.sourceforge.net>\n"
@@ -20,119 +20,119 @@ msgstr ""
 msgid "unknown errno"
 msgstr "เกิด errno ที่ไม่รู้จัก"
 
-#: popt.c:1031
+#: popt.c:1045
 #, c-format
 msgid "option type (%u) not implemented in popt\n"
 msgstr "ตัวเลือกชนิด (%u) ไม่ถูกอิมพลีเมนต์ใน popt\n"
 
-#: popt.c:1452
+#: popt.c:1466
 msgid "missing argument"
 msgstr "ไม่พบอาร์กิวเมนต์"
 
-#: popt.c:1454
+#: popt.c:1468
 msgid "unknown option"
 msgstr "ไม่รู้จักตัวเลือก"
 
-#: popt.c:1456
+#: popt.c:1470
 msgid "mutually exclusive logical operations requested"
 msgstr "เกิดการร้องขอร่วมกันของการดำเนินการด้านตรรกะอย่างเดียวกัน"
 
-#: popt.c:1458
+#: popt.c:1472
 msgid "opt->arg should not be NULL"
 msgstr "opt->arg ไม่ควรจะเป็น NULL"
 
-#: popt.c:1460
+#: popt.c:1474
 msgid "aliases nested too deeply"
 msgstr "นามแฝงซ้อนกันมากเกินไป"
 
-#: popt.c:1462
+#: popt.c:1476
 msgid "error in parameter quoting"
 msgstr "เกิดข้อผิดพลาดในการอ้างอิงพารามิเตอร์"
 
-#: popt.c:1464
+#: popt.c:1478
 msgid "invalid numeric value"
 msgstr "ค่าตัวเลขผิดพลาด"
 
-#: popt.c:1466
+#: popt.c:1480
 msgid "number too large or too small"
 msgstr "ตัวเลขมีค่ามากหรือน้อยเกินไป"
 
-#: popt.c:1468
+#: popt.c:1482
 msgid "memory allocation failed"
 msgstr "การจัดสรรหน่วยความจำผิดพลาด"
 
-#: popt.c:1470
+#: popt.c:1484
 msgid "config file failed sanity test"
 msgstr ""
 
-#: popt.c:1474
+#: popt.c:1488
 msgid "unknown error"
 msgstr "ความผิดพลาดที่ไม่รู้จัก"
 
-#: popthelp.c:75 popthelp.c:86
+#: popthelp.c:77 popthelp.c:88
 msgid "Show this help message"
 msgstr "แสดงข้อความช่วยเหลือนี้"
 
-#: popthelp.c:76 popthelp.c:87
+#: popthelp.c:78 popthelp.c:89
 msgid "Display brief usage message"
 msgstr "แสดงข้อความสรุปย่อการใช้งาน"
 
-#: popthelp.c:90
+#: popthelp.c:92
 msgid "Display option defaults in message"
 msgstr "แสดงตัวเลือกมาตรฐานในข้อความ"
 
-#: popthelp.c:92
+#: popthelp.c:94
 msgid "Terminate options"
 msgstr "ตัวเลือกการสิ้นสุด:"
 
-#: popthelp.c:191
+#: popthelp.c:193
 msgid "Help options:"
 msgstr "ตัวเลือกความช่วยเหลือ:"
 
-#: popthelp.c:192
+#: popthelp.c:194
 msgid "Options implemented via popt alias/exec:"
 msgstr "ตัวเลือกที่ถูกอิมพลีเมนต์ด้วย popt alias/exec:"
 
-#: popthelp.c:200
+#: popthelp.c:202
 msgid "NONE"
 msgstr "ไม่มี"
 
-#: popthelp.c:202
+#: popthelp.c:204
 msgid "VAL"
 msgstr "VAL"
 
-#: popthelp.c:206
+#: popthelp.c:208
 msgid "INT"
 msgstr "INT"
 
-#: popthelp.c:207
+#: popthelp.c:209
 msgid "LONG"
 msgstr "LONG"
 
-#: popthelp.c:208
+#: popthelp.c:210
 msgid "LONGLONG"
 msgstr "LONGLONG"
 
-#: popthelp.c:209
+#: popthelp.c:211
 msgid "STRING"
 msgstr "STRING"
 
-#: popthelp.c:210
+#: popthelp.c:212
 msgid "FLOAT"
 msgstr "FLOAT"
 
-#: popthelp.c:211
+#: popthelp.c:213
 msgid "DOUBLE"
 msgstr "DOUBLE"
 
-#: popthelp.c:214
+#: popthelp.c:216
 msgid "ARG"
 msgstr "ARG"
 
-#: popthelp.c:644
+#: popthelp.c:646
 msgid "Usage:"
 msgstr "วิธีใช้:"
 
-#: popthelp.c:667
+#: popthelp.c:669
 msgid "[OPTION...]"
 msgstr "[ตัวเลือก...]"
diff --git a/po/tr.po b/po/tr.po
index 295f29f..4bfb4c7 100644
--- a/po/tr.po
+++ b/po/tr.po
@@ -5,7 +5,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.11\n"
 "Report-Msgid-Bugs-To: <popt-devel@rpm5.org>\n"
-"POT-Creation-Date: 2009-04-10 17:14-0400\n"
+"POT-Creation-Date: 2009-04-12 20:00+0200\n"
 "PO-Revision-Date: 2000-02-11 13:01+0200\n"
 "Last-Translator: Nilgun Belma Buguner <nilgun@technologist.com>\n"
 "Language-Team: Turkish <tr@li.org>\n"
@@ -17,121 +17,121 @@ msgstr ""
 msgid "unknown errno"
 msgstr "bilinmeyen hata no"
 
-#: popt.c:1031
+#: popt.c:1045
 #, fuzzy, c-format
 msgid "option type (%u) not implemented in popt\n"
 msgstr "se�enek t�r� (%d) popt i�in ge�ersiz\n"
 
-#: popt.c:1452
+#: popt.c:1466
 msgid "missing argument"
 msgstr "arg�man eksik"
 
-#: popt.c:1454
+#: popt.c:1468
 msgid "unknown option"
 msgstr "bilinmeyen se�enek"
 
-#: popt.c:1456
+#: popt.c:1470
 msgid "mutually exclusive logical operations requested"
 msgstr "birbirini d��layan mant�ksal i�lemler istendi"
 
-#: popt.c:1458
+#: popt.c:1472
 msgid "opt->arg should not be NULL"
 msgstr ""
 
-#: popt.c:1460
+#: popt.c:1474
 msgid "aliases nested too deeply"
 msgstr "adlarda �ok fazla i�i�elikler"
 
-#: popt.c:1462
+#: popt.c:1476
 msgid "error in parameter quoting"
 msgstr "parametrelerde t�rnak i�aretleme hatal� "
 
-#: popt.c:1464
+#: popt.c:1478
 msgid "invalid numeric value"
 msgstr "say�sal de�er ge�ersiz"
 
-#: popt.c:1466
+#: popt.c:1480
 msgid "number too large or too small"
 msgstr "say� ya �ok b�y�k ya da �ok k���k"
 
-#: popt.c:1468
+#: popt.c:1482
 msgid "memory allocation failed"
 msgstr ""
 
-#: popt.c:1470
+#: popt.c:1484
 msgid "config file failed sanity test"
 msgstr ""
 
-#: popt.c:1474
+#: popt.c:1488
 msgid "unknown error"
 msgstr "bilinmeyen hata"
 
-#: popthelp.c:75 popthelp.c:86
+#: popthelp.c:77 popthelp.c:88
 msgid "Show this help message"
 msgstr "Bu yard�m iletisini g�sterir"
 
-#: popthelp.c:76 popthelp.c:87
+#: popthelp.c:78 popthelp.c:89
 msgid "Display brief usage message"
 msgstr "K�sa bir kullan�m iletisi g�ster"
 
-#: popthelp.c:90
+#: popthelp.c:92
 #, fuzzy
 msgid "Display option defaults in message"
 msgstr "K�sa bir kullan�m iletisi g�ster"
 
-#: popthelp.c:92
+#: popthelp.c:94
 msgid "Terminate options"
 msgstr ""
 
-#: popthelp.c:191
+#: popthelp.c:193
 msgid "Help options:"
 msgstr ""
 
-#: popthelp.c:192
+#: popthelp.c:194
 msgid "Options implemented via popt alias/exec:"
 msgstr ""
 
-#: popthelp.c:200
+#: popthelp.c:202
 msgid "NONE"
 msgstr "YOK"
 
-#: popthelp.c:202
+#: popthelp.c:204
 msgid "VAL"
 msgstr "DE�"
 
-#: popthelp.c:206
+#: popthelp.c:208
 msgid "INT"
 msgstr "INT"
 
-#: popthelp.c:207
+#: popthelp.c:209
 msgid "LONG"
 msgstr "LONG"
 
-#: popthelp.c:208
+#: popthelp.c:210
 #, fuzzy
 msgid "LONGLONG"
 msgstr "LONG"
 
-#: popthelp.c:209
+#: popthelp.c:211
 msgid "STRING"
 msgstr "STRING"
 
-#: popthelp.c:210
+#: popthelp.c:212
 msgid "FLOAT"
 msgstr "FLOAT"
 
-#: popthelp.c:211
+#: popthelp.c:213
 msgid "DOUBLE"
 msgstr "DOUBLE"
 
-#: popthelp.c:214
+#: popthelp.c:216
 msgid "ARG"
 msgstr "ARG"
 
-#: popthelp.c:644
+#: popthelp.c:646
 msgid "Usage:"
 msgstr "Kullan�m�:"
 
-#: popthelp.c:667
+#: popthelp.c:669
 msgid "[OPTION...]"
 msgstr "[SE�ENEK...]"
diff --git a/po/uk.po b/po/uk.po
index 7e2a7d8..0427c05 100644
--- a/po/uk.po
+++ b/po/uk.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.11\n"
 "Report-Msgid-Bugs-To: <popt-devel@rpm5.org>\n"
-"POT-Creation-Date: 2009-04-10 17:14-0400\n"
+"POT-Creation-Date: 2009-04-12 20:00+0200\n"
 "PO-Revision-Date: 1999-09-30 16:54+0200\n"
 "Last-Translator: Yuri Syrota <rasta@renome.rovno.ua>\n"
 "Language-Team: Ukrainian <uk@li.org>\n"
@@ -18,120 +18,120 @@ msgstr ""
 msgid "unknown errno"
 msgstr ""
 
-#: popt.c:1031
+#: popt.c:1045
 #, c-format
 msgid "option type (%u) not implemented in popt\n"
 msgstr ""
 
-#: popt.c:1452
+#: popt.c:1466
 msgid "missing argument"
 msgstr ""
 
-#: popt.c:1454
+#: popt.c:1468
 msgid "unknown option"
 msgstr ""
 
-#: popt.c:1456
+#: popt.c:1470
 msgid "mutually exclusive logical operations requested"
 msgstr ""
 
-#: popt.c:1458
+#: popt.c:1472
 msgid "opt->arg should not be NULL"
 msgstr ""
 
-#: popt.c:1460
+#: popt.c:1474
 msgid "aliases nested too deeply"
 msgstr ""
 
-#: popt.c:1462
+#: popt.c:1476
 msgid "error in parameter quoting"
 msgstr ""
 
-#: popt.c:1464
+#: popt.c:1478
 msgid "invalid numeric value"
 msgstr ""
 
-#: popt.c:1466
+#: popt.c:1480
 msgid "number too large or too small"
 msgstr ""
 
-#: popt.c:1468
+#: popt.c:1482
 msgid "memory allocation failed"
 msgstr ""
 
-#: popt.c:1470
+#: popt.c:1484
 msgid "config file failed sanity test"
 msgstr ""
 
-#: popt.c:1474
+#: popt.c:1488
 msgid "unknown error"
 msgstr ""
 
-#: popthelp.c:75 popthelp.c:86
+#: popthelp.c:77 popthelp.c:88
 msgid "Show this help message"
 msgstr "�������� �� ��צ���"
 
-#: popthelp.c:76 popthelp.c:87
+#: popthelp.c:78 popthelp.c:89
 msgid "Display brief usage message"
 msgstr "�������� ������� ��צ��� ��� ������������"
 
-#: popthelp.c:90
+#: popthelp.c:92
 #, fuzzy
 msgid "Display option defaults in message"
 msgstr "�������� ������� ��צ��� ��� ������������"
 
-#: popthelp.c:92
+#: popthelp.c:94
 msgid "Terminate options"
 msgstr ""
 
-#: popthelp.c:191
+#: popthelp.c:193
 msgid "Help options:"
 msgstr ""
 
-#: popthelp.c:192
+#: popthelp.c:194
 msgid "Options implemented via popt alias/exec:"
 msgstr ""
 
-#: popthelp.c:200
+#: popthelp.c:202
 msgid "NONE"
 msgstr ""
 
-#: popthelp.c:202
+#: popthelp.c:204
 msgid "VAL"
 msgstr ""
 
-#: popthelp.c:206
+#: popthelp.c:208
 msgid "INT"
 msgstr ""
 
-#: popthelp.c:207
+#: popthelp.c:209
 msgid "LONG"
 msgstr ""
 
-#: popthelp.c:208
+#: popthelp.c:210
 msgid "LONGLONG"
 msgstr ""
 
-#: popthelp.c:209
+#: popthelp.c:211
 msgid "STRING"
 msgstr ""
 
-#: popthelp.c:210
+#: popthelp.c:212
 msgid "FLOAT"
 msgstr ""
 
-#: popthelp.c:211
+#: popthelp.c:213
 msgid "DOUBLE"
 msgstr ""
 
-#: popthelp.c:214
+#: popthelp.c:216
 msgid "ARG"
 msgstr ""
 
-#: popthelp.c:644
+#: popthelp.c:646
 msgid "Usage:"
 msgstr ""
 
-#: popthelp.c:667
+#: popthelp.c:669
 msgid "[OPTION...]"
 msgstr ""
diff --git a/po/vi.po b/po/vi.po
index aba24a1..e939876 100644
--- a/po/vi.po
+++ b/po/vi.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.14\n"
 "Report-Msgid-Bugs-To: <popt-devel@rpm5.org>\n"
-"POT-Creation-Date: 2009-04-10 17:14-0400\n"
+"POT-Creation-Date: 2009-04-12 20:00+0200\n"
 "PO-Revision-Date: 2008-02-18 16:20+1030\n"
 "Last-Translator: Clytie Siddall <clytie@riverland.net.au>\n"
 "Language-Team: Vietnamese <vi-VN@googlegroups.com>\n"
@@ -21,119 +21,119 @@ msgstr ""
 msgid "unknown errno"
 msgstr "số hiệu lỗi không rõ"
 
-#: popt.c:1031
+#: popt.c:1045
 #, c-format
 msgid "option type (%u) not implemented in popt\n"
 msgstr "kiểu tùy chọn (%u) chưa được thực hiện trong popt\n"
 
-#: popt.c:1452
+#: popt.c:1466
 msgid "missing argument"
 msgstr "thiếu đối số"
 
-#: popt.c:1454
+#: popt.c:1468
 msgid "unknown option"
 msgstr "tùy chọn không rõ"
 
-#: popt.c:1456
+#: popt.c:1470
 msgid "mutually exclusive logical operations requested"
 msgstr "các thao tác hợp lý loại từ lẫn nhau được yêu cầu"
 
-#: popt.c:1458
+#: popt.c:1472
 msgid "opt->arg should not be NULL"
 msgstr "« tùy chọn->đối số » không thể vô giá trị"
 
-#: popt.c:1460
+#: popt.c:1474
 msgid "aliases nested too deeply"
 msgstr "các bí danh lồng nhau quá sâu"
 
-#: popt.c:1462
+#: popt.c:1476
 msgid "error in parameter quoting"
 msgstr "gặp lỗi trong lời trích dẫn tham số"
 
-#: popt.c:1464
+#: popt.c:1478
 msgid "invalid numeric value"
 msgstr "giá trị thuộc số không hợp lệ"
 
-#: popt.c:1466
+#: popt.c:1480
 msgid "number too large or too small"
 msgstr "con số quá lớn hay quá nhỏ"
 
-#: popt.c:1468
+#: popt.c:1482
 msgid "memory allocation failed"
 msgstr "lỗi cấp phát bộ nhớ"
 
-#: popt.c:1470
+#: popt.c:1484
 msgid "config file failed sanity test"
 msgstr ""
 
-#: popt.c:1474
+#: popt.c:1488
 msgid "unknown error"
 msgstr "lỗi không rõ"
 
-#: popthelp.c:75 popthelp.c:86
+#: popthelp.c:77 popthelp.c:88
 msgid "Show this help message"
 msgstr "Xem thông điệp trợ giúp này"
 
-#: popthelp.c:76 popthelp.c:87
+#: popthelp.c:78 popthelp.c:89
 msgid "Display brief usage message"
 msgstr "Hiển thị thông điệp cách sử dụng ngắn"
 
-#: popthelp.c:90
+#: popthelp.c:92
 msgid "Display option defaults in message"
 msgstr "Hiển thị các giá trị mặc định của tùy chọn trong thông điệp"
 
-#: popthelp.c:92
+#: popthelp.c:94
 msgid "Terminate options"
 msgstr "Tùy chọn chấm dứt"
 
-#: popthelp.c:191
+#: popthelp.c:193
 msgid "Help options:"
 msgstr "Tùy chọn trợ giúp:"
 
-#: popthelp.c:192
+#: popthelp.c:194
 msgid "Options implemented via popt alias/exec:"
 msgstr "Các tùy chọn được thực hiện thông qua popt alias/exec:"
 
-#: popthelp.c:200
+#: popthelp.c:202
 msgid "NONE"
 msgstr "KHÔNG CÓ"
 
-#: popthelp.c:202
+#: popthelp.c:204
 msgid "VAL"
 msgstr "GIÁ TRỊ"
 
-#: popthelp.c:206
+#: popthelp.c:208
 msgid "INT"
 msgstr "SỐ NGUYÊN"
 
-#: popthelp.c:207
+#: popthelp.c:209
 msgid "LONG"
 msgstr "DÀI"
 
-#: popthelp.c:208
+#: popthelp.c:210
 msgid "LONGLONG"
 msgstr "DÀIDÀI"
 
-#: popthelp.c:209
+#: popthelp.c:211
 msgid "STRING"
 msgstr "CHUỖI"
 
-#: popthelp.c:210
+#: popthelp.c:212
 msgid "FLOAT"
 msgstr "NỔI"
 
-#: popthelp.c:211
+#: popthelp.c:213
 msgid "DOUBLE"
 msgstr "ĐÔI"
 
-#: popthelp.c:214
+#: popthelp.c:216
 msgid "ARG"
 msgstr "ĐỐI SỐ"
 
-#: popthelp.c:644
+#: popthelp.c:646
 msgid "Usage:"
 msgstr "Sử dụng:"
 
-#: popthelp.c:667
+#: popthelp.c:669
 msgid "[OPTION...]"
 msgstr "[TÙY_CHỌN...]"
diff --git a/po/wa.po b/po/wa.po
index c1a31dc..6a218a2 100644
--- a/po/wa.po
+++ b/po/wa.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.11\n"
 "Report-Msgid-Bugs-To: <popt-devel@rpm5.org>\n"
-"POT-Creation-Date: 2009-04-10 17:14-0400\n"
+"POT-Creation-Date: 2009-04-12 20:00+0200\n"
 "PO-Revision-Date: 1999-03-18 23:11+0100\n"
 "Last-Translator: Nobody yet\n"
 "Language-Team: walon <linux-wa@chanae.alphanet.ch>\n"
@@ -22,120 +22,120 @@ msgstr ""
 msgid "unknown errno"
 msgstr ""
 
-#: popt.c:1031
+#: popt.c:1045
 #, c-format
 msgid "option type (%u) not implemented in popt\n"
 msgstr ""
 
-#: popt.c:1452
+#: popt.c:1466
 msgid "missing argument"
 msgstr ""
 
-#: popt.c:1454
+#: popt.c:1468
 msgid "unknown option"
 msgstr ""
 
-#: popt.c:1456
+#: popt.c:1470
 msgid "mutually exclusive logical operations requested"
 msgstr ""
 
-#: popt.c:1458
+#: popt.c:1472
 msgid "opt->arg should not be NULL"
 msgstr ""
 
-#: popt.c:1460
+#: popt.c:1474
 msgid "aliases nested too deeply"
 msgstr ""
 
-#: popt.c:1462
+#: popt.c:1476
 msgid "error in parameter quoting"
 msgstr ""
 
-#: popt.c:1464
+#: popt.c:1478
 msgid "invalid numeric value"
 msgstr ""
 
-#: popt.c:1466
+#: popt.c:1480
 msgid "number too large or too small"
 msgstr ""
 
-#: popt.c:1468
+#: popt.c:1482
 msgid "memory allocation failed"
 msgstr ""
 
-#: popt.c:1470
+#: popt.c:1484
 msgid "config file failed sanity test"
 msgstr ""
 
-#: popt.c:1474
+#: popt.c:1488
 msgid "unknown error"
 msgstr ""
 
-#: popthelp.c:75 popthelp.c:86
+#: popthelp.c:77 popthelp.c:88
 msgid "Show this help message"
 msgstr "Mostrer ci messaedje d' aide chal"
 
-#: popthelp.c:76 popthelp.c:87
+#: popthelp.c:78 popthelp.c:89
 msgid "Display brief usage message"
 msgstr "Mostre on court messaedje so kmint vos � siervi"
 
-#: popthelp.c:90
+#: popthelp.c:92
 #, fuzzy
 msgid "Display option defaults in message"
 msgstr "Mostre on court messaedje so kmint vos � siervi"
 
-#: popthelp.c:92
+#: popthelp.c:94
 msgid "Terminate options"
 msgstr ""
 
-#: popthelp.c:191
+#: popthelp.c:193
 msgid "Help options:"
 msgstr ""
 
-#: popthelp.c:192
+#: popthelp.c:194
 msgid "Options implemented via popt alias/exec:"
 msgstr ""
 
-#: popthelp.c:200
+#: popthelp.c:202
 msgid "NONE"
 msgstr ""
 
-#: popthelp.c:202
+#: popthelp.c:204
 msgid "VAL"
 msgstr ""
 
-#: popthelp.c:206
+#: popthelp.c:208
 msgid "INT"
 msgstr ""
 
-#: popthelp.c:207
+#: popthelp.c:209
 msgid "LONG"
 msgstr ""
 
-#: popthelp.c:208
+#: popthelp.c:210
 msgid "LONGLONG"
 msgstr ""
 
-#: popthelp.c:209
+#: popthelp.c:211
 msgid "STRING"
 msgstr ""
 
-#: popthelp.c:210
+#: popthelp.c:212
 msgid "FLOAT"
 msgstr ""
 
-#: popthelp.c:211
+#: popthelp.c:213
 msgid "DOUBLE"
 msgstr ""
 
-#: popthelp.c:214
+#: popthelp.c:216
 msgid "ARG"
 msgstr ""
 
-#: popthelp.c:644
+#: popthelp.c:646
 msgid "Usage:"
 msgstr ""
 
-#: popthelp.c:667
+#: popthelp.c:669
 msgid "[OPTION...]"
 msgstr ""
diff --git a/po/zh_CN.po b/po/zh_CN.po
index 21dfcb6..6aca1bb 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.14\n"
 "Report-Msgid-Bugs-To: <popt-devel@rpm5.org>\n"
-"POT-Creation-Date: 2009-04-10 17:14-0400\n"
+"POT-Creation-Date: 2009-04-12 20:00+0200\n"
 "PO-Revision-Date: 2008-02-18 20:16+0800\n"
 "Last-Translator: LI Daobing <lidaobing@gmail.com>\n"
 "Language-Team: Chinese (simplified) <translation-team-zh-cn@lists."
@@ -21,119 +21,119 @@ msgstr ""
 msgid "unknown errno"
 msgstr "未知的错误"
 
-#: popt.c:1031
+#: popt.c:1045
 #, c-format
 msgid "option type (%u) not implemented in popt\n"
 msgstr "选项类别 (%u) 没有在 popt 中实现\n"
 
-#: popt.c:1452
+#: popt.c:1466
 msgid "missing argument"
 msgstr "缺少参数"
 
-#: popt.c:1454
+#: popt.c:1468
 msgid "unknown option"
 msgstr "未知的选项"
 
-#: popt.c:1456
+#: popt.c:1470
 msgid "mutually exclusive logical operations requested"
 msgstr "需要 XOR 逻辑运算"
 
-#: popt.c:1458
+#: popt.c:1472
 msgid "opt->arg should not be NULL"
 msgstr "opt->arg 不应该为 NULL"
 
-#: popt.c:1460
+#: popt.c:1474
 msgid "aliases nested too deeply"
 msgstr "别名嵌套太深"
 
-#: popt.c:1462
+#: popt.c:1476
 msgid "error in parameter quoting"
 msgstr "参数引号错误"
 
-#: popt.c:1464
+#: popt.c:1478
 msgid "invalid numeric value"
 msgstr "无效的数值"
 
-#: popt.c:1466
+#: popt.c:1480
 msgid "number too large or too small"
 msgstr "数值太大或太小"
 
-#: popt.c:1468
+#: popt.c:1482
 msgid "memory allocation failed"
 msgstr "内存分配错误"
 
-#: popt.c:1470
+#: popt.c:1484
 msgid "config file failed sanity test"
 msgstr ""
 
-#: popt.c:1474
+#: popt.c:1488
 msgid "unknown error"
 msgstr "未知的错误"
 
-#: popthelp.c:75 popthelp.c:86
+#: popthelp.c:77 popthelp.c:88
 msgid "Show this help message"
 msgstr "显示这个帮助信息"
 
-#: popthelp.c:76 popthelp.c:87
+#: popthelp.c:78 popthelp.c:89
 msgid "Display brief usage message"
 msgstr "显示简短的使用说明"
 
-#: popthelp.c:90
+#: popthelp.c:92
 msgid "Display option defaults in message"
 msgstr "在信息中显示默认的选项"
 
-#: popthelp.c:92
+#: popthelp.c:94
 msgid "Terminate options"
 msgstr "终止选项"
 
-#: popthelp.c:191
+#: popthelp.c:193
 msgid "Help options:"
 msgstr "帮助选项:"
 
-#: popthelp.c:192
+#: popthelp.c:194
 msgid "Options implemented via popt alias/exec:"
 msgstr "通过 popt alias/exec 实现的选项:"
 
-#: popthelp.c:200
+#: popthelp.c:202
 msgid "NONE"
 msgstr "NONE"
 
-#: popthelp.c:202
+#: popthelp.c:204
 msgid "VAL"
 msgstr "VAL"
 
-#: popthelp.c:206
+#: popthelp.c:208
 msgid "INT"
 msgstr "INT"
 
-#: popthelp.c:207
+#: popthelp.c:209
 msgid "LONG"
 msgstr "LONG"
 
-#: popthelp.c:208
+#: popthelp.c:210
 msgid "LONGLONG"
 msgstr "LONGLONG"
 
-#: popthelp.c:209
+#: popthelp.c:211
 msgid "STRING"
 msgstr "STRING"
 
-#: popthelp.c:210
+#: popthelp.c:212
 msgid "FLOAT"
 msgstr "FLOAT"
 
-#: popthelp.c:211
+#: popthelp.c:213
 msgid "DOUBLE"
 msgstr "DOUBLE"
 
-#: popthelp.c:214
+#: popthelp.c:216
 msgid "ARG"
 msgstr "ARG"
 
-#: popthelp.c:644
+#: popthelp.c:646
 msgid "Usage:"
 msgstr "用法:"
 
-#: popthelp.c:667
+#: popthelp.c:669
 msgid "[OPTION...]"
 msgstr "[选项...]"
diff --git a/po/zh_TW.po b/po/zh_TW.po
index cf9d9f8..2b93a3d 100644
--- a/po/zh_TW.po
+++ b/po/zh_TW.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.11\n"
 "Report-Msgid-Bugs-To: <popt-devel@rpm5.org>\n"
-"POT-Creation-Date: 2009-04-10 17:14-0400\n"
+"POT-Creation-Date: 2009-04-12 20:00+0200\n"
 "PO-Revision-Date: 2005-04-08 17:52+0800\n"
 "Last-Translator: Wei-Lun Chao <chaoweilun@pcmail.com.tw>\n"
 "Language-Team: zh_TW <zh-l10n@linux.org.tw>\n"
@@ -18,120 +18,120 @@ msgstr ""
 msgid "unknown errno"
 msgstr "未知的錯誤"
 
-#: popt.c:1031
+#: popt.c:1045
 #, fuzzy, c-format
 msgid "option type (%u) not implemented in popt\n"
 msgstr "選項類型 (%d) 沒有在 popt 中實作\n"
 
-#: popt.c:1452
+#: popt.c:1466
 msgid "missing argument"
 msgstr "缺少引數"
 
-#: popt.c:1454
+#: popt.c:1468
 msgid "unknown option"
 msgstr "未知的選項"
 
-#: popt.c:1456
+#: popt.c:1470
 msgid "mutually exclusive logical operations requested"
 msgstr "需要相互獨立的邏輯運算"
 
-#: popt.c:1458
+#: popt.c:1472
 msgid "opt->arg should not be NULL"
 msgstr "opt->arg 不應為 NULL"
 
-#: popt.c:1460
+#: popt.c:1474
 msgid "aliases nested too deeply"
 msgstr "巢狀別名太深"
 
-#: popt.c:1462
+#: popt.c:1476
 msgid "error in parameter quoting"
 msgstr "參數引號錯誤"
 
-#: popt.c:1464
+#: popt.c:1478
 msgid "invalid numeric value"
 msgstr "不正確的數值"
 
-#: popt.c:1466
+#: popt.c:1480
 msgid "number too large or too small"
 msgstr "數字太大或太小"
 
-#: popt.c:1468
+#: popt.c:1482
 msgid "memory allocation failed"
 msgstr "記憶體配置錯誤"
 
-#: popt.c:1470
+#: popt.c:1484
 msgid "config file failed sanity test"
 msgstr ""
 
-#: popt.c:1474
+#: popt.c:1488
 msgid "unknown error"
 msgstr "未知的錯誤"
 
-#: popthelp.c:75 popthelp.c:86
+#: popthelp.c:77 popthelp.c:88
 msgid "Show this help message"
 msgstr "顯示本說明訊息"
 
-#: popthelp.c:76 popthelp.c:87
+#: popthelp.c:78 popthelp.c:89
 msgid "Display brief usage message"
 msgstr "顯示簡短的使用說明"
 
-#: popthelp.c:90
+#: popthelp.c:92
 msgid "Display option defaults in message"
 msgstr "在訊息中顯示預設選項"
 
-#: popthelp.c:92
+#: popthelp.c:94
 msgid "Terminate options"
 msgstr ""
 
-#: popthelp.c:191
+#: popthelp.c:193
 msgid "Help options:"
 msgstr ""
 
-#: popthelp.c:192
+#: popthelp.c:194
 msgid "Options implemented via popt alias/exec:"
 msgstr ""
 
-#: popthelp.c:200
+#: popthelp.c:202
 msgid "NONE"
 msgstr "NONE"
 
-#: popthelp.c:202
+#: popthelp.c:204
 msgid "VAL"
 msgstr "VAL"
 
-#: popthelp.c:206
+#: popthelp.c:208
 msgid "INT"
 msgstr "INT"
 
-#: popthelp.c:207
+#: popthelp.c:209
 msgid "LONG"
 msgstr "LONG"
 
-#: popthelp.c:208
+#: popthelp.c:210
 #, fuzzy
 msgid "LONGLONG"
 msgstr "LONG"
 
-#: popthelp.c:209
+#: popthelp.c:211
 msgid "STRING"
 msgstr "STRING"
 
-#: popthelp.c:210
+#: popthelp.c:212
 msgid "FLOAT"
 msgstr "FLOAT"
 
-#: popthelp.c:211
+#: popthelp.c:213
 msgid "DOUBLE"
 msgstr "DOUBLE"
 
-#: popthelp.c:214
+#: popthelp.c:216
 msgid "ARG"
 msgstr "ARG"
 
-#: popthelp.c:644
+#: popthelp.c:646
 msgid "Usage:"
 msgstr "用法:"
 
-#: popthelp.c:667
+#: popthelp.c:669
 msgid "[OPTION...]"
 msgstr "[選項...]"
-- 
Gitee


From c134274a7e744ee15afca0c56c244bed6b37cc9d Mon Sep 17 00:00:00 2001
From: "Ralf S. Engelschall" <rse@engelschall.com>
Date: Sun, 12 Apr 2009 18:15:34 +0000
Subject: [PATCH 581/667] ops, sorry, I get a local patch still applied when
 regenerating the po/ stuff. Hence repeat it with a sane workspace

---
 po/cs.po    | 60 ++++++++++++++++++++++++++---------------------------
 po/da.po    | 60 ++++++++++++++++++++++++++---------------------------
 po/de.po    | 60 ++++++++++++++++++++++++++---------------------------
 po/eo.po    | 60 ++++++++++++++++++++++++++---------------------------
 po/es.po    | 60 ++++++++++++++++++++++++++---------------------------
 po/fi.po    | 60 ++++++++++++++++++++++++++---------------------------
 po/fr.po    | 60 ++++++++++++++++++++++++++---------------------------
 po/ga.po    | 60 ++++++++++++++++++++++++++---------------------------
 po/gl.po    | 60 ++++++++++++++++++++++++++---------------------------
 po/hu.po    | 60 ++++++++++++++++++++++++++---------------------------
 po/id.po    | 60 ++++++++++++++++++++++++++---------------------------
 po/is.po    | 60 ++++++++++++++++++++++++++---------------------------
 po/it.po    | 60 ++++++++++++++++++++++++++---------------------------
 po/ja.po    | 60 ++++++++++++++++++++++++++---------------------------
 po/ko.po    | 60 ++++++++++++++++++++++++++---------------------------
 po/nb.po    | 60 ++++++++++++++++++++++++++---------------------------
 po/nl.po    | 60 ++++++++++++++++++++++++++---------------------------
 po/pl.po    | 60 ++++++++++++++++++++++++++---------------------------
 po/popt.pot | 60 ++++++++++++++++++++++++++---------------------------
 po/pt.po    | 60 ++++++++++++++++++++++++++---------------------------
 po/ro.po    | 60 ++++++++++++++++++++++++++---------------------------
 po/ru.po    | 60 ++++++++++++++++++++++++++---------------------------
 po/sk.po    | 60 ++++++++++++++++++++++++++---------------------------
 po/sl.po    | 60 ++++++++++++++++++++++++++---------------------------
 po/sv.po    | 60 ++++++++++++++++++++++++++---------------------------
 po/th.po    | 60 ++++++++++++++++++++++++++---------------------------
 po/tr.po    | 60 ++++++++++++++++++++++++++---------------------------
 po/uk.po    | 60 ++++++++++++++++++++++++++---------------------------
 po/vi.po    | 60 ++++++++++++++++++++++++++---------------------------
 po/wa.po    | 60 ++++++++++++++++++++++++++---------------------------
 po/zh_CN.po | 60 ++++++++++++++++++++++++++---------------------------
 po/zh_TW.po | 60 ++++++++++++++++++++++++++---------------------------
 32 files changed, 960 insertions(+), 960 deletions(-)

diff --git a/po/cs.po b/po/cs.po
index 628dc34..8112990 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.14\n"
 "Report-Msgid-Bugs-To: <popt-devel@rpm5.org>\n"
-"POT-Creation-Date: 2009-04-12 20:00+0200\n"
+"POT-Creation-Date: 2009-04-12 20:14+0200\n"
 "PO-Revision-Date: 2008-12-08 19:55+0100\n"
 "Last-Translator: Petr Pisar <petr.pisar@atlas.cz>\n"
 "Language-Team: Czech <translation-team-cs@lists.sourceforge.net>\n"
@@ -20,119 +20,119 @@ msgstr ""
 msgid "unknown errno"
 msgstr "neznámé číslo chyby"
 
-#: popt.c:1045
+#: popt.c:1031
 #, c-format
 msgid "option type (%u) not implemented in popt\n"
 msgstr "typ volby (%u) není v popt implementován\n"
 
-#: popt.c:1466
+#: popt.c:1452
 msgid "missing argument"
 msgstr "chybí argument"
 
-#: popt.c:1468
+#: popt.c:1454
 msgid "unknown option"
 msgstr "neznámá volba"
 
-#: popt.c:1470
+#: popt.c:1456
 msgid "mutually exclusive logical operations requested"
 msgstr "požadovány vzájemně výlučné logické operace"
 
-#: popt.c:1472
+#: popt.c:1458
 msgid "opt->arg should not be NULL"
 msgstr "opt->arg nesmí být NULL"
 
-#: popt.c:1474
+#: popt.c:1460
 msgid "aliases nested too deeply"
 msgstr "aliasy vnořené příliš hluboko"
 
-#: popt.c:1476
+#: popt.c:1462
 msgid "error in parameter quoting"
 msgstr "chyba v quotování parametrů"
 
-#: popt.c:1478
+#: popt.c:1464
 msgid "invalid numeric value"
 msgstr "chybná numerická hodnota"
 
-#: popt.c:1480
+#: popt.c:1466
 msgid "number too large or too small"
 msgstr "číslo je příliš velké nebo příliš malé"
 
-#: popt.c:1482
+#: popt.c:1468
 msgid "memory allocation failed"
 msgstr "selhala alokace paměti"
 
-#: popt.c:1484
+#: popt.c:1470
 msgid "config file failed sanity test"
 msgstr ""
 
-#: popt.c:1488
+#: popt.c:1474
 msgid "unknown error"
 msgstr "neznámá chyba"
 
-#: popthelp.c:77 popthelp.c:88
+#: popthelp.c:75 popthelp.c:86
 msgid "Show this help message"
 msgstr "Vypíše tuto nápovědu"
 
-#: popthelp.c:78 popthelp.c:89
+#: popthelp.c:76 popthelp.c:87
 msgid "Display brief usage message"
 msgstr "Vypíše krátký návod k použití"
 
-#: popthelp.c:92
+#: popthelp.c:90
 msgid "Display option defaults in message"
 msgstr "Zobrazit implicitní volby ve zprávě"
 
-#: popthelp.c:94
+#: popthelp.c:92
 msgid "Terminate options"
 msgstr "Ukončí volby"
 
-#: popthelp.c:193
+#: popthelp.c:191
 msgid "Help options:"
 msgstr "Volby nápovědy:"
 
-#: popthelp.c:194
+#: popthelp.c:192
 msgid "Options implemented via popt alias/exec:"
 msgstr "Volby implementované přes alias/exec poptu:"
 
-#: popthelp.c:202
+#: popthelp.c:200
 msgid "NONE"
 msgstr "NONE"
 
-#: popthelp.c:204
+#: popthelp.c:202
 msgid "VAL"
 msgstr "VAL"
 
-#: popthelp.c:208
+#: popthelp.c:206
 msgid "INT"
 msgstr "INT"
 
-#: popthelp.c:209
+#: popthelp.c:207
 msgid "LONG"
 msgstr "LONG"
 
-#: popthelp.c:210
+#: popthelp.c:208
 msgid "LONGLONG"
 msgstr "LONGLONG"
 
-#: popthelp.c:211
+#: popthelp.c:209
 msgid "STRING"
 msgstr "STRING"
 
-#: popthelp.c:212
+#: popthelp.c:210
 msgid "FLOAT"
 msgstr "FLOAT"
 
-#: popthelp.c:213
+#: popthelp.c:211
 msgid "DOUBLE"
 msgstr "DOUBLE"
 
-#: popthelp.c:216
+#: popthelp.c:214
 msgid "ARG"
 msgstr "ARG"
 
-#: popthelp.c:646
+#: popthelp.c:644
 msgid "Usage:"
 msgstr "Použití:"
 
-#: popthelp.c:669
+#: popthelp.c:667
 msgid "[OPTION...]"
 msgstr "[VOLBY…]"
diff --git a/po/da.po b/po/da.po
index 5b32094..61cf26e 100644
--- a/po/da.po
+++ b/po/da.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: popt-1.14\n"
 "Report-Msgid-Bugs-To: <popt-devel@rpm5.org>\n"
-"POT-Creation-Date: 2009-04-12 20:00+0200\n"
+"POT-Creation-Date: 2009-04-12 20:14+0200\n"
 "PO-Revision-Date: 2008-09-15 00:00+0000\n"
 "Last-Translator: Joe Hansen <joedalton2@yahoo.dk>\n"
 "Language-Team: Danish <dansk@dansk-gruppen.dk>\n"
@@ -20,119 +20,119 @@ msgstr ""
 msgid "unknown errno"
 msgstr "ukendt fejlnr."
 
-#: popt.c:1045
+#: popt.c:1031
 #, c-format
 msgid "option type (%u) not implemented in popt\n"
 msgstr "tilvalgstype (%u) er ikke implementeret i popt\n"
 
-#: popt.c:1466
+#: popt.c:1452
 msgid "missing argument"
 msgstr "mangler argument"
 
-#: popt.c:1468
+#: popt.c:1454
 msgid "unknown option"
 msgstr "ukendt tilvalg"
 
-#: popt.c:1470
+#: popt.c:1456
 msgid "mutually exclusive logical operations requested"
 msgstr "de ønskede handlinger udelukker hinanden"
 
-#: popt.c:1472
+#: popt.c:1458
 msgid "opt->arg should not be NULL"
 msgstr "opt->arg bør ikke være NULL"
 
-#: popt.c:1474
+#: popt.c:1460
 msgid "aliases nested too deeply"
 msgstr "aliaser er for dybt indlejret"
 
-#: popt.c:1476
+#: popt.c:1462
 msgid "error in parameter quoting"
 msgstr "fejl i parameter citering"
 
-#: popt.c:1478
+#: popt.c:1464
 msgid "invalid numeric value"
 msgstr "ugyldig numerisk værdi"
 
-#: popt.c:1480
+#: popt.c:1466
 msgid "number too large or too small"
 msgstr "nummer for stort, eller for lille"
 
-#: popt.c:1482
+#: popt.c:1468
 msgid "memory allocation failed"
 msgstr "hukommelsestildeling mislykkedes"
 
-#: popt.c:1484
+#: popt.c:1470
 msgid "config file failed sanity test"
 msgstr ""
 
-#: popt.c:1488
+#: popt.c:1474
 msgid "unknown error"
 msgstr "ukendt fejl"
 
-#: popthelp.c:77 popthelp.c:88
+#: popthelp.c:75 popthelp.c:86
 msgid "Show this help message"
 msgstr "Vis denne hjælpemeddelelse"
 
-#: popthelp.c:78 popthelp.c:89
+#: popthelp.c:76 popthelp.c:87
 msgid "Display brief usage message"
 msgstr "Vis kortfattet brugsanvisning"
 
-#: popthelp.c:92
+#: popthelp.c:90
 msgid "Display option defaults in message"
 msgstr "Vis instillingsstandarder i besked"
 
-#: popthelp.c:94
+#: popthelp.c:92
 msgid "Terminate options"
 msgstr "Indstillinger for afbrydning"
 
-#: popthelp.c:193
+#: popthelp.c:191
 msgid "Help options:"
 msgstr "Hjælpeindstillinger:"
 
-#: popthelp.c:194
+#: popthelp.c:192
 msgid "Options implemented via popt alias/exec:"
 msgstr "Indstillinger implementeret via popt alias/exec:"
 
-#: popthelp.c:202
+#: popthelp.c:200
 msgid "NONE"
 msgstr "INGEN"
 
-#: popthelp.c:204
+#: popthelp.c:202
 msgid "VAL"
 msgstr "VAL"
 
-#: popthelp.c:208
+#: popthelp.c:206
 msgid "INT"
 msgstr "INT"
 
-#: popthelp.c:209
+#: popthelp.c:207
 msgid "LONG"
 msgstr "LONG"
 
-#: popthelp.c:210
+#: popthelp.c:208
 msgid "LONGLONG"
 msgstr "LONGLONG"
 
-#: popthelp.c:211
+#: popthelp.c:209
 msgid "STRING"
 msgstr "STRING"
 
-#: popthelp.c:212
+#: popthelp.c:210
 msgid "FLOAT"
 msgstr "FLOAT"
 
-#: popthelp.c:213
+#: popthelp.c:211
 msgid "DOUBLE"
 msgstr "DOUBLE"
 
-#: popthelp.c:216
+#: popthelp.c:214
 msgid "ARG"
 msgstr "ARG"
 
-#: popthelp.c:646
+#: popthelp.c:644
 msgid "Usage:"
 msgstr "Brug:"
 
-#: popthelp.c:669
+#: popthelp.c:667
 msgid "[OPTION...]"
 msgstr "[TILVALG...]"
diff --git a/po/de.po b/po/de.po
index 1883bf6..859cc24 100644
--- a/po/de.po
+++ b/po/de.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.11\n"
 "Report-Msgid-Bugs-To: <popt-devel@rpm5.org>\n"
-"POT-Creation-Date: 2009-04-12 20:00+0200\n"
+"POT-Creation-Date: 2009-04-12 20:14+0200\n"
 "PO-Revision-Date: 2007-02-17 21:00+0100\n"
 "Last-Translator: Robert Scheck <rpm@robert-scheck.de>\n"
 "Language-Team: German <de@li.org>\n"
@@ -18,121 +18,121 @@ msgstr ""
 msgid "unknown errno"
 msgstr "Unbekannte Fehler-Nummer"
 
-#: popt.c:1045
+#: popt.c:1031
 #, fuzzy, c-format
 msgid "option type (%u) not implemented in popt\n"
 msgstr "Optionstyp (%d) ist in popt nicht vorhanden\n"
 
-#: popt.c:1466
+#: popt.c:1452
 msgid "missing argument"
 msgstr "Fehlendes Argument"
 
-#: popt.c:1468
+#: popt.c:1454
 msgid "unknown option"
 msgstr "Unbekannte Option"
 
-#: popt.c:1470
+#: popt.c:1456
 msgid "mutually exclusive logical operations requested"
 msgstr "Gegenseitig ausschließende logische Operatoren"
 
-#: popt.c:1472
+#: popt.c:1458
 msgid "opt->arg should not be NULL"
 msgstr "opt->arg sollte nicht NULL sein"
 
-#: popt.c:1474
+#: popt.c:1460
 msgid "aliases nested too deeply"
 msgstr "Aliase zu tief verschachtelt"
 
-#: popt.c:1476
+#: popt.c:1462
 msgid "error in parameter quoting"
 msgstr "Fehler beim Quotieren der Parameter"
 
-#: popt.c:1478
+#: popt.c:1464
 msgid "invalid numeric value"
 msgstr "Ungültiger nummerischer Wert"
 
-#: popt.c:1480
+#: popt.c:1466
 msgid "number too large or too small"
 msgstr "Nummer zu groß oder zu klein"
 
-#: popt.c:1482
+#: popt.c:1468
 msgid "memory allocation failed"
 msgstr "Speicherzuordnung fehlgeschlagen"
 
-#: popt.c:1484
+#: popt.c:1470
 msgid "config file failed sanity test"
 msgstr ""
 
-#: popt.c:1488
+#: popt.c:1474
 msgid "unknown error"
 msgstr "Unbekannter Fehler"
 
-#: popthelp.c:77 popthelp.c:88
+#: popthelp.c:75 popthelp.c:86
 msgid "Show this help message"
 msgstr "Zeigt diese Hilfe an"
 
-#: popthelp.c:78 popthelp.c:89
+#: popthelp.c:76 popthelp.c:87
 msgid "Display brief usage message"
 msgstr "Zeigt eine kurze Verwendungsinformation"
 
-#: popthelp.c:92
+#: popthelp.c:90
 msgid "Display option defaults in message"
 msgstr "Zeigt die Standardeinstellungen an"
 
-#: popthelp.c:94
+#: popthelp.c:92
 #, fuzzy
 msgid "Terminate options"
 msgstr "Hilfe-Optionen:"
 
-#: popthelp.c:193
+#: popthelp.c:191
 msgid "Help options:"
 msgstr "Hilfe-Optionen:"
 
-#: popthelp.c:194
+#: popthelp.c:192
 msgid "Options implemented via popt alias/exec:"
 msgstr "Optionen über popt alias/exec implementiert:"
 
-#: popthelp.c:202
+#: popthelp.c:200
 msgid "NONE"
 msgstr "NICHTS"
 
-#: popthelp.c:204
+#: popthelp.c:202
 msgid "VAL"
 msgstr "WERT"
 
-#: popthelp.c:208
+#: popthelp.c:206
 msgid "INT"
 msgstr "INTEGER"
 
-#: popthelp.c:209
+#: popthelp.c:207
 msgid "LONG"
 msgstr "LONG"
 
-#: popthelp.c:210
+#: popthelp.c:208
 #, fuzzy
 msgid "LONGLONG"
 msgstr "LONG"
 
-#: popthelp.c:211
+#: popthelp.c:209
 msgid "STRING"
 msgstr "STRING"
 
-#: popthelp.c:212
+#: popthelp.c:210
 msgid "FLOAT"
 msgstr "FLOAT"
 
-#: popthelp.c:213
+#: popthelp.c:211
 msgid "DOUBLE"
 msgstr "DOUBLE"
 
-#: popthelp.c:216
+#: popthelp.c:214
 msgid "ARG"
 msgstr "ARGUMENT"
 
-#: popthelp.c:646
+#: popthelp.c:644
 msgid "Usage:"
 msgstr "Verwendung:"
 
-#: popthelp.c:669
+#: popthelp.c:667
 msgid "[OPTION...]"
 msgstr "[OPTION...]"
diff --git a/po/eo.po b/po/eo.po
index cb3db48..ee5aa87 100644
--- a/po/eo.po
+++ b/po/eo.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.14\n"
 "Report-Msgid-Bugs-To: <popt-devel@rpm5.org>\n"
-"POT-Creation-Date: 2009-04-12 20:00+0200\n"
+"POT-Creation-Date: 2009-04-12 20:14+0200\n"
 "PO-Revision-Date: 2008-08-03 15:50-0300\n"
 "Last-Translator: Felipe Castro <fefcas@gmail.com>\n"
 "Language-Team: Esperanto <translation-team-eo@lists.sourceforge.net>\n"
@@ -18,119 +18,119 @@ msgstr ""
 msgid "unknown errno"
 msgstr "nekonata erarnumero"
 
-#: popt.c:1045
+#: popt.c:1031
 #, c-format
 msgid "option type (%u) not implemented in popt\n"
 msgstr "la opcia tipo (%u) ne estas realigita en popt\n"
 
-#: popt.c:1466
+#: popt.c:1452
 msgid "missing argument"
 msgstr "mankas argumento"
 
-#: popt.c:1468
+#: popt.c:1454
 msgid "unknown option"
 msgstr "nekonata opcio"
 
-#: popt.c:1470
+#: popt.c:1456
 msgid "mutually exclusive logical operations requested"
 msgstr "reciprokaj logikaj operacioj estas postulataj"
 
-#: popt.c:1472
+#: popt.c:1458
 msgid "opt->arg should not be NULL"
 msgstr "opt->arg ne devus esti NULL"
 
-#: popt.c:1474
+#: popt.c:1460
 msgid "aliases nested too deeply"
 msgstr "kromnomoj estas ingitaj tro profunde"
 
-#: popt.c:1476
+#: popt.c:1462
 msgid "error in parameter quoting"
 msgstr "eraro en parametra citado"
 
-#: popt.c:1478
+#: popt.c:1464
 msgid "invalid numeric value"
 msgstr "nevalida numera valoro"
 
-#: popt.c:1480
+#: popt.c:1466
 msgid "number too large or too small"
 msgstr "numero tro granda aŭ tro eta"
 
-#: popt.c:1482
+#: popt.c:1468
 msgid "memory allocation failed"
 msgstr "malsukceso dum okupado de memoro"
 
-#: popt.c:1484
+#: popt.c:1470
 msgid "config file failed sanity test"
 msgstr ""
 
-#: popt.c:1488
+#: popt.c:1474
 msgid "unknown error"
 msgstr "nekonata eraro"
 
-#: popthelp.c:77 popthelp.c:88
+#: popthelp.c:75 popthelp.c:86
 msgid "Show this help message"
 msgstr "Montri tiun ĉi helpmesaĝon"
 
-#: popthelp.c:78 popthelp.c:89
+#: popthelp.c:76 popthelp.c:87
 msgid "Display brief usage message"
 msgstr "Montri resumitan mesaĝon pri uzado"
 
-#: popthelp.c:92
+#: popthelp.c:90
 msgid "Display option defaults in message"
 msgstr "Montri la implicitajn valorojn de la opcio en la mesaĝo"
 
-#: popthelp.c:94
+#: popthelp.c:92
 msgid "Terminate options"
 msgstr "Opcioj pri finiĝo"
 
-#: popthelp.c:193
+#: popthelp.c:191
 msgid "Help options:"
 msgstr "Help-opcioj:"
 
-#: popthelp.c:194
+#: popthelp.c:192
 msgid "Options implemented via popt alias/exec:"
 msgstr "Opcioj realigitaj per popt alias/exec:"
 
-#: popthelp.c:202
+#: popthelp.c:200
 msgid "NONE"
 msgstr "NENIO"
 
-#: popthelp.c:204
+#: popthelp.c:202
 msgid "VAL"
 msgstr "VAL"
 
-#: popthelp.c:208
+#: popthelp.c:206
 msgid "INT"
 msgstr "INT"
 
-#: popthelp.c:209
+#: popthelp.c:207
 msgid "LONG"
 msgstr "LONG"
 
-#: popthelp.c:210
+#: popthelp.c:208
 msgid "LONGLONG"
 msgstr "LONGLONG"
 
-#: popthelp.c:211
+#: popthelp.c:209
 msgid "STRING"
 msgstr "STRING"
 
-#: popthelp.c:212
+#: popthelp.c:210
 msgid "FLOAT"
 msgstr "FLOAT"
 
-#: popthelp.c:213
+#: popthelp.c:211
 msgid "DOUBLE"
 msgstr "DOUBLE"
 
-#: popthelp.c:216
+#: popthelp.c:214
 msgid "ARG"
 msgstr "ARG"
 
-#: popthelp.c:646
+#: popthelp.c:644
 msgid "Usage:"
 msgstr "Uzado:"
 
-#: popthelp.c:669
+#: popthelp.c:667
 msgid "[OPTION...]"
 msgstr "[OPCIO...]"
diff --git a/po/es.po b/po/es.po
index 0b50d70..08dfe89 100644
--- a/po/es.po
+++ b/po/es.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.12\n"
 "Report-Msgid-Bugs-To: <popt-devel@rpm5.org>\n"
-"POT-Creation-Date: 2009-04-12 20:00+0200\n"
+"POT-Creation-Date: 2009-04-12 20:14+0200\n"
 "PO-Revision-Date: 2007-12-28 12:22+0100\n"
 "Last-Translator: Leandro Lucarella <luca@linuxmendoza.org.ar>\n"
 "Language-Team: Spanish <es@li.org>\n"
@@ -18,120 +18,120 @@ msgstr ""
 msgid "unknown errno"
 msgstr "errno desconocido"
 
-#: popt.c:1045
+#: popt.c:1031
 #, fuzzy, c-format
 msgid "option type (%u) not implemented in popt\n"
 msgstr "tipo de opción (%d) no implementada en popt\n"
 
-#: popt.c:1466
+#: popt.c:1452
 msgid "missing argument"
 msgstr "falta argumento"
 
-#: popt.c:1468
+#: popt.c:1454
 msgid "unknown option"
 msgstr "opción desconocida"
 
-#: popt.c:1470
+#: popt.c:1456
 msgid "mutually exclusive logical operations requested"
 msgstr "requerida operación lógica mutuamente exclusiva"
 
-#: popt.c:1472
+#: popt.c:1458
 msgid "opt->arg should not be NULL"
 msgstr ""
 
-#: popt.c:1474
+#: popt.c:1460
 msgid "aliases nested too deeply"
 msgstr "alias anidados muy profundamente"
 
-#: popt.c:1476
+#: popt.c:1462
 msgid "error in parameter quoting"
 msgstr "error en cita de parámetros"
 
-#: popt.c:1478
+#: popt.c:1464
 msgid "invalid numeric value"
 msgstr "valor numérico inválido"
 
-#: popt.c:1480
+#: popt.c:1466
 msgid "number too large or too small"
 msgstr "número muy largo o muy pequeño"
 
-#: popt.c:1482
+#: popt.c:1468
 msgid "memory allocation failed"
 msgstr ""
 
-#: popt.c:1484
+#: popt.c:1470
 msgid "config file failed sanity test"
 msgstr ""
 
-#: popt.c:1488
+#: popt.c:1474
 msgid "unknown error"
 msgstr "error desconocido"
 
-#: popthelp.c:77 popthelp.c:88
+#: popthelp.c:75 popthelp.c:86
 msgid "Show this help message"
 msgstr "Muestra este mensaje de ayuda"
 
-#: popthelp.c:78 popthelp.c:89
+#: popthelp.c:76 popthelp.c:87
 msgid "Display brief usage message"
 msgstr "Indica el modo de uso resumido"
 
-#: popthelp.c:92
+#: popthelp.c:90
 msgid "Display option defaults in message"
 msgstr ""
 
-#: popthelp.c:94
+#: popthelp.c:92
 msgid "Terminate options"
 msgstr ""
 
-#: popthelp.c:193
+#: popthelp.c:191
 msgid "Help options:"
 msgstr ""
 
-#: popthelp.c:194
+#: popthelp.c:192
 msgid "Options implemented via popt alias/exec:"
 msgstr ""
 
-#: popthelp.c:202
+#: popthelp.c:200
 msgid "NONE"
 msgstr "NONE"
 
-#: popthelp.c:204
+#: popthelp.c:202
 msgid "VAL"
 msgstr "VAL"
 
-#: popthelp.c:208
+#: popthelp.c:206
 msgid "INT"
 msgstr "INT"
 
-#: popthelp.c:209
+#: popthelp.c:207
 msgid "LONG"
 msgstr "LONG"
 
-#: popthelp.c:210
+#: popthelp.c:208
 #, fuzzy
 msgid "LONGLONG"
 msgstr "LONG"
 
-#: popthelp.c:211
+#: popthelp.c:209
 msgid "STRING"
 msgstr "STRING"
 
-#: popthelp.c:212
+#: popthelp.c:210
 msgid "FLOAT"
 msgstr "FLOAT"
 
-#: popthelp.c:213
+#: popthelp.c:211
 msgid "DOUBLE"
 msgstr "DOUBLE"
 
-#: popthelp.c:216
+#: popthelp.c:214
 msgid "ARG"
 msgstr "ARG"
 
-#: popthelp.c:646
+#: popthelp.c:644
 msgid "Usage:"
 msgstr "Modo de uso:"
 
-#: popthelp.c:669
+#: popthelp.c:667
 msgid "[OPTION...]"
 msgstr "[OPCIÓN...]"
diff --git a/po/fi.po b/po/fi.po
index f8bd572..c8dc8ae 100644
--- a/po/fi.po
+++ b/po/fi.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.14\n"
 "Report-Msgid-Bugs-To: <popt-devel@rpm5.org>\n"
-"POT-Creation-Date: 2009-04-12 20:00+0200\n"
+"POT-Creation-Date: 2009-04-12 20:14+0200\n"
 "PO-Revision-Date: 2008-02-21 18:19+0200\n"
 "Last-Translator: Jorma Karvonen <karvjorm@users.sf.net>\n"
 "Language-Team: Finnish <translation-team-fi@lists.sourceforge.net>\n"
@@ -23,121 +23,121 @@ msgstr ""
 msgid "unknown errno"
 msgstr "tuntematon errno-virhenumeroarvo"
 
-#: popt.c:1045
+#: popt.c:1031
 #, c-format
 msgid "option type (%u) not implemented in popt\n"
 msgstr "valitsintyyppiä (%u) ei ole toteutettu popt-ohjelmassa\n"
 
-#: popt.c:1466
+#: popt.c:1452
 msgid "missing argument"
 msgstr "puuttuva argumentti"
 
-#: popt.c:1468
+#: popt.c:1454
 msgid "unknown option"
 msgstr "tuntematon valitsin"
 
-#: popt.c:1470
+#: popt.c:1456
 msgid "mutually exclusive logical operations requested"
 msgstr "pyydettyjä loogisia toimintoja ei voi käyttää yhdessä"
 
-#: popt.c:1472
+#: popt.c:1458
 msgid "opt->arg should not be NULL"
 msgstr "”opt->arg”-valitsinargumentti ei saa olla NULL"
 
-#: popt.c:1474
+#: popt.c:1460
 msgid "aliases nested too deeply"
 msgstr "liian monta aliasta sisäkkäin"
 
-#: popt.c:1476
+#: popt.c:1462
 msgid "error in parameter quoting"
 msgstr "virhe parametrien lainauksessa"
 
-#: popt.c:1478
+#: popt.c:1464
 msgid "invalid numeric value"
 msgstr "virheellinen numeroarvo"
 
-#: popt.c:1480
+#: popt.c:1466
 msgid "number too large or too small"
 msgstr "numero on liian iso tai liian pieni"
 
-#: popt.c:1482
+#: popt.c:1468
 msgid "memory allocation failed"
 msgstr "muistin varaus ei onnistunut"
 
-#: popt.c:1484
+#: popt.c:1470
 msgid "config file failed sanity test"
 msgstr ""
 
-#: popt.c:1488
+#: popt.c:1474
 msgid "unknown error"
 msgstr "tuntematon virhe"
 
-#: popthelp.c:77 popthelp.c:88
+#: popthelp.c:75 popthelp.c:86
 msgid "Show this help message"
 msgstr "Näytä tämä ohje"
 
-#: popthelp.c:78 popthelp.c:89
+#: popthelp.c:76 popthelp.c:87
 msgid "Display brief usage message"
 msgstr "Näytä lyhyt käyttöohje"
 
-#: popthelp.c:92
+#: popthelp.c:90
 msgid "Display option defaults in message"
 msgstr "Näytä valitsinoletukset ohjeessa"
 
-#: popthelp.c:94
+#: popthelp.c:92
 msgid "Terminate options"
 msgstr "Lopettamisvalitsimet"
 
-#: popthelp.c:193
+#: popthelp.c:191
 msgid "Help options:"
 msgstr "Ohjevalitsimet:"
 
-#: popthelp.c:194
+#: popthelp.c:192
 msgid "Options implemented via popt alias/exec:"
 msgstr ""
 "Valitsimet toteutettu ”popt alias”-määrittelyillä tai ”popt exec”-"
 "määrittelyillä:"
 
-#: popthelp.c:202
+#: popthelp.c:200
 msgid "NONE"
 msgstr "EI MITÄÄN"
 
-#: popthelp.c:204
+#: popthelp.c:202
 msgid "VAL"
 msgstr "ARVO"
 
-#: popthelp.c:208
+#: popthelp.c:206
 msgid "INT"
 msgstr "INT-KOKONAISLUKU"
 
-#: popthelp.c:209
+#: popthelp.c:207
 msgid "LONG"
 msgstr "LONG-KOKONAISLUKU"
 
-#: popthelp.c:210
+#: popthelp.c:208
 msgid "LONGLONG"
 msgstr "LONGLONG-KOKONAISLUKU"
 
-#: popthelp.c:211
+#: popthelp.c:209
 msgid "STRING"
 msgstr "MERKKIJONO"
 
-#: popthelp.c:212
+#: popthelp.c:210
 msgid "FLOAT"
 msgstr "FLOAT-LIUKULUKU"
 
-#: popthelp.c:213
+#: popthelp.c:211
 msgid "DOUBLE"
 msgstr "DOUBLE-LIUKULUKU"
 
-#: popthelp.c:216
+#: popthelp.c:214
 msgid "ARG"
 msgstr "ARGUMENTTI"
 
-#: popthelp.c:646
+#: popthelp.c:644
 msgid "Usage:"
 msgstr "Käyttö:"
 
-#: popthelp.c:669
+#: popthelp.c:667
 msgid "[OPTION...]"
 msgstr "[VALITSIN...]"
diff --git a/po/fr.po b/po/fr.po
index ee87f0d..c5dd4aa 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -12,7 +12,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.11\n"
 "Report-Msgid-Bugs-To: <popt-devel@rpm5.org>\n"
-"POT-Creation-Date: 2009-04-12 20:00+0200\n"
+"POT-Creation-Date: 2009-04-12 20:14+0200\n"
 "PO-Revision-Date: 2003-06-22 23:43+0200\n"
 "Last-Translator: RPM French Translation <rpm-fr@livna.org>\n"
 "Language-Team: RPM French Translation <rpm-fr@livna.org>\n"
@@ -24,120 +24,120 @@ msgstr ""
 msgid "unknown errno"
 msgstr "errno inconnu"
 
-#: popt.c:1045
+#: popt.c:1031
 #, fuzzy, c-format
 msgid "option type (%u) not implemented in popt\n"
 msgstr "type(%d) d'option non implémenté dans popt\n"
 
-#: popt.c:1466
+#: popt.c:1452
 msgid "missing argument"
 msgstr "argument manquant"
 
-#: popt.c:1468
+#: popt.c:1454
 msgid "unknown option"
 msgstr "option iconnue"
 
-#: popt.c:1470
+#: popt.c:1456
 msgid "mutually exclusive logical operations requested"
 msgstr "opérations logiques mutuellement exclusives requises"
 
-#: popt.c:1472
+#: popt.c:1458
 msgid "opt->arg should not be NULL"
 msgstr "opt->arg ne devrait pas être NULL"
 
-#: popt.c:1474
+#: popt.c:1460
 msgid "aliases nested too deeply"
 msgstr "les alias sont trop entremellés"
 
-#: popt.c:1476
+#: popt.c:1462
 msgid "error in parameter quoting"
 msgstr "erreur en citant les paramètres"
 
-#: popt.c:1478
+#: popt.c:1464
 msgid "invalid numeric value"
 msgstr "valeur numérique invalide"
 
-#: popt.c:1480
+#: popt.c:1466
 msgid "number too large or too small"
 msgstr "nombre trop grand ou trop petit"
 
-#: popt.c:1482
+#: popt.c:1468
 msgid "memory allocation failed"
 msgstr "échec de l'allocation de mémoire"
 
-#: popt.c:1484
+#: popt.c:1470
 msgid "config file failed sanity test"
 msgstr ""
 
-#: popt.c:1488
+#: popt.c:1474
 msgid "unknown error"
 msgstr "erreur inconnue"
 
-#: popthelp.c:77 popthelp.c:88
+#: popthelp.c:75 popthelp.c:86
 msgid "Show this help message"
 msgstr "Montre ce message d'aide"
 
-#: popthelp.c:78 popthelp.c:89
+#: popthelp.c:76 popthelp.c:87
 msgid "Display brief usage message"
 msgstr "Affiche un bref descriptif de l'utilisation"
 
-#: popthelp.c:92
+#: popthelp.c:90
 msgid "Display option defaults in message"
 msgstr "Afficher les valeurs par défaut des options dans le message"
 
-#: popthelp.c:94
+#: popthelp.c:92
 msgid "Terminate options"
 msgstr ""
 
-#: popthelp.c:193
+#: popthelp.c:191
 msgid "Help options:"
 msgstr ""
 
-#: popthelp.c:194
+#: popthelp.c:192
 msgid "Options implemented via popt alias/exec:"
 msgstr ""
 
-#: popthelp.c:202
+#: popthelp.c:200
 msgid "NONE"
 msgstr "RIEN"
 
-#: popthelp.c:204
+#: popthelp.c:202
 msgid "VAL"
 msgstr "VAL"
 
-#: popthelp.c:208
+#: popthelp.c:206
 msgid "INT"
 msgstr "ENTIER"
 
-#: popthelp.c:209
+#: popthelp.c:207
 msgid "LONG"
 msgstr "LONG"
 
-#: popthelp.c:210
+#: popthelp.c:208
 #, fuzzy
 msgid "LONGLONG"
 msgstr "LONG"
 
-#: popthelp.c:211
+#: popthelp.c:209
 msgid "STRING"
 msgstr "CHAINE"
 
-#: popthelp.c:212
+#: popthelp.c:210
 msgid "FLOAT"
 msgstr "FLOTTANT"
 
-#: popthelp.c:213
+#: popthelp.c:211
 msgid "DOUBLE"
 msgstr "DOUBLE"
 
-#: popthelp.c:216
+#: popthelp.c:214
 msgid "ARG"
 msgstr "ARG"
 
-#: popthelp.c:646
+#: popthelp.c:644
 msgid "Usage:"
 msgstr "Utilisation:"
 
-#: popthelp.c:669
+#: popthelp.c:667
 msgid "[OPTION...]"
 msgstr "[OPTION...]"
diff --git a/po/ga.po b/po/ga.po
index 6e2740d..c82c8de 100644
--- a/po/ga.po
+++ b/po/ga.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.14\n"
 "Report-Msgid-Bugs-To: <popt-devel@rpm5.org>\n"
-"POT-Creation-Date: 2009-04-12 20:00+0200\n"
+"POT-Creation-Date: 2009-04-12 20:14+0200\n"
 "PO-Revision-Date: 2008-04-10 06:21-0500\n"
 "Last-Translator: Kevin Scannell <kscanne@gmail.com>\n"
 "Language-Team: Irish <gaeilge-gnulinux@lists.sourceforge.net>\n"
@@ -18,120 +18,120 @@ msgstr ""
 msgid "unknown errno"
 msgstr "errno anaithnid"
 
-#: popt.c:1045
+#: popt.c:1031
 #, c-format
 msgid "option type (%u) not implemented in popt\n"
 msgstr "níl an cineál rogha seo (%u) ar fáil i popt\n"
 
-#: popt.c:1466
+#: popt.c:1452
 msgid "missing argument"
 msgstr "argóint ar iarraidh"
 
-#: popt.c:1468
+#: popt.c:1454
 msgid "unknown option"
 msgstr "rogha anaithnid"
 
-#: popt.c:1470
+#: popt.c:1456
 msgid "mutually exclusive logical operations requested"
 msgstr "iarradh oibríochtaí loighciúla comheisiacha"
 
-#: popt.c:1472
+#: popt.c:1458
 msgid "opt->arg should not be NULL"
 msgstr "níor chóir rogha->arg a bheith NULL"
 
-#: popt.c:1474
+#: popt.c:1460
 msgid "aliases nested too deeply"
 msgstr "ailiasanna neadaithe ródhomhain"
 
-#: popt.c:1476
+#: popt.c:1462
 msgid "error in parameter quoting"
 msgstr "earráid agus paraiméadar á chur faoi chomharthaí athfhriotail"
 
-#: popt.c:1478
+#: popt.c:1464
 msgid "invalid numeric value"
 msgstr "luach neamhbhailí uimhriúil"
 
-#: popt.c:1480
+#: popt.c:1466
 msgid "number too large or too small"
 msgstr "uimhir rómhór nó róbheag"
 
-#: popt.c:1482
+#: popt.c:1468
 msgid "memory allocation failed"
 msgstr "theip ar dháileadh na cuimhne"
 
-#: popt.c:1484
+#: popt.c:1470
 msgid "config file failed sanity test"
 msgstr ""
 
-#: popt.c:1488
+#: popt.c:1474
 msgid "unknown error"
 msgstr "earráid anaithnid"
 
-#: popthelp.c:77 popthelp.c:88
+#: popthelp.c:75 popthelp.c:86
 msgid "Show this help message"
 msgstr "Taispeáin an chabhair seo"
 
-#: popthelp.c:78 popthelp.c:89
+#: popthelp.c:76 popthelp.c:87
 msgid "Display brief usage message"
 msgstr "Taispeáin beagán eolais faoin úsáid"
 
-#: popthelp.c:92
+#: popthelp.c:90
 msgid "Display option defaults in message"
 msgstr "Taispeáin luachanna réamhshocraithe na roghanna sa teachtaireacht"
 
 # Terminate not a verb here
-#: popthelp.c:94
+#: popthelp.c:92
 msgid "Terminate options"
 msgstr "Roghanna scortha"
 
-#: popthelp.c:193
+#: popthelp.c:191
 msgid "Help options:"
 msgstr "Roghanna cabhracha:"
 
-#: popthelp.c:194
+#: popthelp.c:192
 msgid "Options implemented via popt alias/exec:"
 msgstr "Roghanna a cuireadh i bhfeidhm trí ailias/exec popt:"
 
-#: popthelp.c:202
+#: popthelp.c:200
 msgid "NONE"
 msgstr "NEAMHNÍ"
 
-#: popthelp.c:204
+#: popthelp.c:202
 msgid "VAL"
 msgstr "LUACH"
 
-#: popthelp.c:208
+#: popthelp.c:206
 msgid "INT"
 msgstr "INT"
 
-#: popthelp.c:209
+#: popthelp.c:207
 msgid "LONG"
 msgstr "LONG"
 
-#: popthelp.c:210
+#: popthelp.c:208
 msgid "LONGLONG"
 msgstr "LONGLONG"
 
-#: popthelp.c:211
+#: popthelp.c:209
 msgid "STRING"
 msgstr "STRING"
 
-#: popthelp.c:212
+#: popthelp.c:210
 msgid "FLOAT"
 msgstr "FLOAT"
 
-#: popthelp.c:213
+#: popthelp.c:211
 msgid "DOUBLE"
 msgstr "DOUBLE"
 
-#: popthelp.c:216
+#: popthelp.c:214
 msgid "ARG"
 msgstr "ARG"
 
-#: popthelp.c:646
+#: popthelp.c:644
 msgid "Usage:"
 msgstr "Úsáid:"
 
-#: popthelp.c:669
+#: popthelp.c:667
 msgid "[OPTION...]"
 msgstr "[ROGHA...]"
diff --git a/po/gl.po b/po/gl.po
index 59e9788..005d961 100644
--- a/po/gl.po
+++ b/po/gl.po
@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.11\n"
 "Report-Msgid-Bugs-To: <popt-devel@rpm5.org>\n"
-"POT-Creation-Date: 2009-04-12 20:00+0200\n"
+"POT-Creation-Date: 2009-04-12 20:14+0200\n"
 "PO-Revision-Date: 2001-01-17 01:01+0100\n"
 "Last-Translator: Jes�s Bravo �lvarez <jba@pobox.com>\n"
 "Language-Team: Galician <trasno@ceu.fi.udc.es>\n"
@@ -14,121 +14,121 @@ msgstr ""
 msgid "unknown errno"
 msgstr "errno desco�ecido"
 
-#: popt.c:1045
+#: popt.c:1031
 #, fuzzy, c-format
 msgid "option type (%u) not implemented in popt\n"
 msgstr "tipo de opci�n (%d) non implementada en popt\n"
 
-#: popt.c:1466
+#: popt.c:1452
 msgid "missing argument"
 msgstr "falta un argumento"
 
-#: popt.c:1468
+#: popt.c:1454
 msgid "unknown option"
 msgstr "opci�n desco�ecida"
 
-#: popt.c:1470
+#: popt.c:1456
 msgid "mutually exclusive logical operations requested"
 msgstr "solicit�ronse operaci�ns l�xicas mutuamente exclu�ntes"
 
-#: popt.c:1472
+#: popt.c:1458
 msgid "opt->arg should not be NULL"
 msgstr ""
 
-#: popt.c:1474
+#: popt.c:1460
 msgid "aliases nested too deeply"
 msgstr "aliases ani�ados a un nivel demasiado profundo"
 
-#: popt.c:1476
+#: popt.c:1462
 msgid "error in parameter quoting"
 msgstr "erro nas comi�as do par�metro"
 
-#: popt.c:1478
+#: popt.c:1464
 msgid "invalid numeric value"
 msgstr "valor num�rico non v�lido"
 
-#: popt.c:1480
+#: popt.c:1466
 msgid "number too large or too small"
 msgstr "n�mero demasiado grande ou pequeno"
 
-#: popt.c:1482
+#: popt.c:1468
 msgid "memory allocation failed"
 msgstr ""
 
-#: popt.c:1484
+#: popt.c:1470
 msgid "config file failed sanity test"
 msgstr ""
 
-#: popt.c:1488
+#: popt.c:1474
 msgid "unknown error"
 msgstr "erro desco�ecido"
 
-#: popthelp.c:77 popthelp.c:88
+#: popthelp.c:75 popthelp.c:86
 msgid "Show this help message"
 msgstr "Amosar esta mensaxe de axuda"
 
-#: popthelp.c:78 popthelp.c:89
+#: popthelp.c:76 popthelp.c:87
 msgid "Display brief usage message"
 msgstr "Amosar brevemente o xeito de utilizaci�n"
 
-#: popthelp.c:92
+#: popthelp.c:90
 #, fuzzy
 msgid "Display option defaults in message"
 msgstr "Amosar brevemente o xeito de utilizaci�n"
 
-#: popthelp.c:94
+#: popthelp.c:92
 msgid "Terminate options"
 msgstr ""
 
-#: popthelp.c:193
+#: popthelp.c:191
 msgid "Help options:"
 msgstr ""
 
-#: popthelp.c:194
+#: popthelp.c:192
 msgid "Options implemented via popt alias/exec:"
 msgstr ""
 
-#: popthelp.c:202
+#: popthelp.c:200
 msgid "NONE"
 msgstr "NADA"
 
-#: popthelp.c:204
+#: popthelp.c:202
 msgid "VAL"
 msgstr "VAL"
 
-#: popthelp.c:208
+#: popthelp.c:206
 msgid "INT"
 msgstr "INT"
 
-#: popthelp.c:209
+#: popthelp.c:207
 msgid "LONG"
 msgstr "LONG"
 
-#: popthelp.c:210
+#: popthelp.c:208
 #, fuzzy
 msgid "LONGLONG"
 msgstr "LONG"
 
-#: popthelp.c:211
+#: popthelp.c:209
 msgid "STRING"
 msgstr "CADEA"
 
-#: popthelp.c:212
+#: popthelp.c:210
 msgid "FLOAT"
 msgstr "FLOAT"
 
-#: popthelp.c:213
+#: popthelp.c:211
 msgid "DOUBLE"
 msgstr "DOUBLE"
 
-#: popthelp.c:216
+#: popthelp.c:214
 msgid "ARG"
 msgstr "ARG"
 
-#: popthelp.c:646
+#: popthelp.c:644
 msgid "Usage:"
 msgstr "Uso:"
 
-#: popthelp.c:669
+#: popthelp.c:667
 msgid "[OPTION...]"
 msgstr "[OPCI�N...]"
diff --git a/po/hu.po b/po/hu.po
index 80aafa7..0705c9b 100644
--- a/po/hu.po
+++ b/po/hu.po
@@ -5,7 +5,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.11\n"
 "Report-Msgid-Bugs-To: <popt-devel@rpm5.org>\n"
-"POT-Creation-Date: 2009-04-12 20:00+0200\n"
+"POT-Creation-Date: 2009-04-12 20:14+0200\n"
 "PO-Revision-Date: 2007-06-21 00:45+0200\n"
 "Last-Translator: Gabor Kelemen <kelemeng@gnome.hu>\n"
 "Language-Team: Hungarian <translation-team-hu@lists.sourceforge.net>\n"
@@ -19,121 +19,121 @@ msgstr ""
 msgid "unknown errno"
 msgstr "ismeretlen hibaszám"
 
-#: popt.c:1045
+#: popt.c:1031
 #, fuzzy, c-format
 msgid "option type (%u) not implemented in popt\n"
 msgstr "a kapcsolótípus (%d) nincs megvalósítva a popt-ban\n"
 
-#: popt.c:1466
+#: popt.c:1452
 msgid "missing argument"
 msgstr "hiányzó paraméter"
 
-#: popt.c:1468
+#: popt.c:1454
 msgid "unknown option"
 msgstr "ismeretlen kapcsoló"
 
-#: popt.c:1470
+#: popt.c:1456
 msgid "mutually exclusive logical operations requested"
 msgstr "kölcsönösen kizáró logikai műveleteket kért"
 
-#: popt.c:1472
+#: popt.c:1458
 msgid "opt->arg should not be NULL"
 msgstr "az opt->arg nem lehet NULL"
 
-#: popt.c:1474
+#: popt.c:1460
 msgid "aliases nested too deeply"
 msgstr "az álnevek túl mélyen vannak egymásba ágyazva"
 
-#: popt.c:1476
+#: popt.c:1462
 msgid "error in parameter quoting"
 msgstr "hiba a paraméter idézésében"
 
-#: popt.c:1478
+#: popt.c:1464
 msgid "invalid numeric value"
 msgstr "érvénytelen numerikus érték"
 
-#: popt.c:1480
+#: popt.c:1466
 msgid "number too large or too small"
 msgstr "a szám túl nagy vagy túl kicsi"
 
-#: popt.c:1482
+#: popt.c:1468
 msgid "memory allocation failed"
 msgstr "a memóriafoglalás meghiúsult"
 
-#: popt.c:1484
+#: popt.c:1470
 msgid "config file failed sanity test"
 msgstr ""
 
-#: popt.c:1488
+#: popt.c:1474
 msgid "unknown error"
 msgstr "ismeretlen hiba"
 
-#: popthelp.c:77 popthelp.c:88
+#: popthelp.c:75 popthelp.c:86
 msgid "Show this help message"
 msgstr "Ezen súgó megjelenítése"
 
-#: popthelp.c:78 popthelp.c:89
+#: popthelp.c:76 popthelp.c:87
 msgid "Display brief usage message"
 msgstr "Rövid használati utasítás megjelenítése"
 
-#: popthelp.c:92
+#: popthelp.c:90
 msgid "Display option defaults in message"
 msgstr "Kapcsolók alapértelmezéseinek megjelenítése"
 
-#: popthelp.c:94
+#: popthelp.c:92
 #, fuzzy
 msgid "Terminate options"
 msgstr "Súgólehetőségek:"
 
-#: popthelp.c:193
+#: popthelp.c:191
 msgid "Help options:"
 msgstr "Súgólehetőségek:"
 
-#: popthelp.c:194
+#: popthelp.c:192
 msgid "Options implemented via popt alias/exec:"
 msgstr "A popt alias/exec segítségével megvalósított kapcsolók:"
 
-#: popthelp.c:202
+#: popthelp.c:200
 msgid "NONE"
 msgstr "NINCS"
 
-#: popthelp.c:204
+#: popthelp.c:202
 msgid "VAL"
 msgstr "ÉRTÉK"
 
-#: popthelp.c:208
+#: popthelp.c:206
 msgid "INT"
 msgstr "EGÉSZ"
 
-#: popthelp.c:209
+#: popthelp.c:207
 msgid "LONG"
 msgstr "HOSSZÚ"
 
-#: popthelp.c:210
+#: popthelp.c:208
 #, fuzzy
 msgid "LONGLONG"
 msgstr "HOSSZÚ"
 
-#: popthelp.c:211
+#: popthelp.c:209
 msgid "STRING"
 msgstr "SZÖVEG"
 
-#: popthelp.c:212
+#: popthelp.c:210
 msgid "FLOAT"
 msgstr "LEBEGŐ"
 
-#: popthelp.c:213
+#: popthelp.c:211
 msgid "DOUBLE"
 msgstr "DUPLA"
 
-#: popthelp.c:216
+#: popthelp.c:214
 msgid "ARG"
 msgstr "PAR"
 
-#: popthelp.c:646
+#: popthelp.c:644
 msgid "Usage:"
 msgstr "Használat:"
 
-#: popthelp.c:669
+#: popthelp.c:667
 msgid "[OPTION...]"
 msgstr "[KAPCSOLÓ...]"
diff --git a/po/id.po b/po/id.po
index f31c6e5..ff079b0 100644
--- a/po/id.po
+++ b/po/id.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.14\n"
 "Report-Msgid-Bugs-To: <popt-devel@rpm5.org>\n"
-"POT-Creation-Date: 2009-04-12 20:00+0200\n"
+"POT-Creation-Date: 2009-04-12 20:14+0200\n"
 "PO-Revision-Date: 2008-08-26 14:18+0700\n"
 "Last-Translator: Andhika Padmawan <andhika.padmawan@gmail.com>\n"
 "Language-Team: Indonesian <translation-team-id@lists.sourceforge.net>\n"
@@ -18,119 +18,119 @@ msgstr ""
 msgid "unknown errno"
 msgstr "errno tak diketahui"
 
-#: popt.c:1045
+#: popt.c:1031
 #, c-format
 msgid "option type (%u) not implemented in popt\n"
 msgstr "tipe opsi (%u) tak diimplementasikan di popt\n"
 
-#: popt.c:1466
+#: popt.c:1452
 msgid "missing argument"
 msgstr "kehilangan argumen"
 
-#: popt.c:1468
+#: popt.c:1454
 msgid "unknown option"
 msgstr "opsi tak diketahui"
 
-#: popt.c:1470
+#: popt.c:1456
 msgid "mutually exclusive logical operations requested"
 msgstr "permintaan operasi logika eksklusif secara mutual"
 
-#: popt.c:1472
+#: popt.c:1458
 msgid "opt->arg should not be NULL"
 msgstr "opt->arg tidak boleh NULL"
 
-#: popt.c:1474
+#: popt.c:1460
 msgid "aliases nested too deeply"
 msgstr "alias disarangkan terlalu dalam"
 
-#: popt.c:1476
+#: popt.c:1462
 msgid "error in parameter quoting"
 msgstr "galat di pencantuman parameter"
 
-#: popt.c:1478
+#: popt.c:1464
 msgid "invalid numeric value"
 msgstr "nilai numerik tidak sah"
 
-#: popt.c:1480
+#: popt.c:1466
 msgid "number too large or too small"
 msgstr "nomor terlalu besar atau terlalu kecil"
 
-#: popt.c:1482
+#: popt.c:1468
 msgid "memory allocation failed"
 msgstr "alokasi memori gagal"
 
-#: popt.c:1484
+#: popt.c:1470
 msgid "config file failed sanity test"
 msgstr ""
 
-#: popt.c:1488
+#: popt.c:1474
 msgid "unknown error"
 msgstr "galat tak diketahui"
 
-#: popthelp.c:77 popthelp.c:88
+#: popthelp.c:75 popthelp.c:86
 msgid "Show this help message"
 msgstr "Tampilkan pesan bantuan ini"
 
-#: popthelp.c:78 popthelp.c:89
+#: popthelp.c:76 popthelp.c:87
 msgid "Display brief usage message"
 msgstr "Tampilkan pesan penggunaan singkat"
 
-#: popthelp.c:92
+#: popthelp.c:90
 msgid "Display option defaults in message"
 msgstr "Tampilkan opsi standar dalam pesan"
 
-#: popthelp.c:94
+#: popthelp.c:92
 msgid "Terminate options"
 msgstr "Matikan opsi"
 
-#: popthelp.c:193
+#: popthelp.c:191
 msgid "Help options:"
 msgstr "Opsi bantuan:"
 
-#: popthelp.c:194
+#: popthelp.c:192
 msgid "Options implemented via popt alias/exec:"
 msgstr "Opsi diimplementasikan via popt alias/exec:"
 
-#: popthelp.c:202
+#: popthelp.c:200
 msgid "NONE"
 msgstr "NONE"
 
-#: popthelp.c:204
+#: popthelp.c:202
 msgid "VAL"
 msgstr "VAL"
 
-#: popthelp.c:208
+#: popthelp.c:206
 msgid "INT"
 msgstr "INT"
 
-#: popthelp.c:209
+#: popthelp.c:207
 msgid "LONG"
 msgstr "LONG"
 
-#: popthelp.c:210
+#: popthelp.c:208
 msgid "LONGLONG"
 msgstr "LONGLONG"
 
-#: popthelp.c:211
+#: popthelp.c:209
 msgid "STRING"
 msgstr "STRING"
 
-#: popthelp.c:212
+#: popthelp.c:210
 msgid "FLOAT"
 msgstr "FLOAT"
 
-#: popthelp.c:213
+#: popthelp.c:211
 msgid "DOUBLE"
 msgstr "DOUBLE"
 
-#: popthelp.c:216
+#: popthelp.c:214
 msgid "ARG"
 msgstr "ARG"
 
-#: popthelp.c:646
+#: popthelp.c:644
 msgid "Usage:"
 msgstr "Penggunaan:"
 
-#: popthelp.c:669
+#: popthelp.c:667
 msgid "[OPTION...]"
 msgstr "[OPSI...]"
diff --git a/po/is.po b/po/is.po
index f48be40..5247112 100644
--- a/po/is.po
+++ b/po/is.po
@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.11\n"
 "Report-Msgid-Bugs-To: <popt-devel@rpm5.org>\n"
-"POT-Creation-Date: 2009-04-12 20:00+0200\n"
+"POT-Creation-Date: 2009-04-12 20:14+0200\n"
 "PO-Revision-Date: 2001-06-08 01:35+0000\n"
 "Last-Translator: Richard Allen <ra@hp.is>\n"
 "Language-Team: is <kde-isl@mmedia.is>\n"
@@ -14,120 +14,120 @@ msgstr ""
 msgid "unknown errno"
 msgstr "��ekkt villun�mer"
 
-#: popt.c:1045
+#: popt.c:1031
 #, fuzzy, c-format
 msgid "option type (%u) not implemented in popt\n"
 msgstr "rofager�in (%d) er ekki studd � popt\n"
 
-#: popt.c:1466
+#: popt.c:1452
 msgid "missing argument"
 msgstr "vantar vi�fang"
 
-#: popt.c:1468
+#: popt.c:1454
 msgid "unknown option"
 msgstr "��ekktur rofi"
 
-#: popt.c:1470
+#: popt.c:1456
 msgid "mutually exclusive logical operations requested"
 msgstr "be�i� um rofa sem sl�kkva hvor � ��rum"
 
-#: popt.c:1472
+#: popt.c:1458
 msgid "opt->arg should not be NULL"
 msgstr "opt->arg �tti ekki a� vera NULL"
 
-#: popt.c:1474
+#: popt.c:1460
 msgid "aliases nested too deeply"
 msgstr "al�asar of fl�knir"
 
-#: popt.c:1476
+#: popt.c:1462
 msgid "error in parameter quoting"
 msgstr "villa � vi�f�ngum (g�salappir og svo frv.)"
 
-#: popt.c:1478
+#: popt.c:1464
 msgid "invalid numeric value"
 msgstr "�gilt t�lulegt gildi"
 
-#: popt.c:1480
+#: popt.c:1466
 msgid "number too large or too small"
 msgstr "talan of st�r e�a sm�"
 
-#: popt.c:1482
+#: popt.c:1468
 msgid "memory allocation failed"
 msgstr "ekki t�kst a� taka fr� minni"
 
-#: popt.c:1484
+#: popt.c:1470
 msgid "config file failed sanity test"
 msgstr ""
 
-#: popt.c:1488
+#: popt.c:1474
 msgid "unknown error"
 msgstr "��ekkt villa"
 
-#: popthelp.c:77 popthelp.c:88
+#: popthelp.c:75 popthelp.c:86
 msgid "Show this help message"
 msgstr "S�na �essa hj�lp"
 
-#: popthelp.c:78 popthelp.c:89
+#: popthelp.c:76 popthelp.c:87
 msgid "Display brief usage message"
 msgstr "S�na stuttar notkunarlei�beiningar"
 
-#: popthelp.c:92
+#: popthelp.c:90
 msgid "Display option defaults in message"
 msgstr "S�na sj�lfgefin gildi rofa � skilabo�um"
 
-#: popthelp.c:94
+#: popthelp.c:92
 msgid "Terminate options"
 msgstr ""
 
-#: popthelp.c:193
+#: popthelp.c:191
 msgid "Help options:"
 msgstr ""
 
-#: popthelp.c:194
+#: popthelp.c:192
 msgid "Options implemented via popt alias/exec:"
 msgstr ""
 
-#: popthelp.c:202
+#: popthelp.c:200
 msgid "NONE"
 msgstr "ENGIN"
 
-#: popthelp.c:204
+#: popthelp.c:202
 msgid "VAL"
 msgstr "VAL"
 
-#: popthelp.c:208
+#: popthelp.c:206
 msgid "INT"
 msgstr "INT"
 
-#: popthelp.c:209
+#: popthelp.c:207
 msgid "LONG"
 msgstr "LONG"
 
-#: popthelp.c:210
+#: popthelp.c:208
 #, fuzzy
 msgid "LONGLONG"
 msgstr "LONG"
 
-#: popthelp.c:211
+#: popthelp.c:209
 msgid "STRING"
 msgstr "STRING"
 
-#: popthelp.c:212
+#: popthelp.c:210
 msgid "FLOAT"
 msgstr "FLOAT"
 
-#: popthelp.c:213
+#: popthelp.c:211
 msgid "DOUBLE"
 msgstr "DOUBLE"
 
-#: popthelp.c:216
+#: popthelp.c:214
 msgid "ARG"
 msgstr "ARG"
 
-#: popthelp.c:646
+#: popthelp.c:644
 msgid "Usage:"
 msgstr "Notkun:"
 
-#: popthelp.c:669
+#: popthelp.c:667
 msgid "[OPTION...]"
 msgstr "[ROFI...]"
diff --git a/po/it.po b/po/it.po
index 4c47f4c..cc4f5d3 100644
--- a/po/it.po
+++ b/po/it.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: popt-1.14\n"
 "Report-Msgid-Bugs-To: <popt-devel@rpm5.org>\n"
-"POT-Creation-Date: 2009-04-12 20:00+0200\n"
+"POT-Creation-Date: 2009-04-12 20:14+0200\n"
 "PO-Revision-Date: 2008-11-28 15:32+0100\n"
 "Last-Translator: Vincenzo Campanella <vinz65@gmail.com>\n"
 "Language-Team: Italian <tp@lists.linux.it>\n"
@@ -21,119 +21,119 @@ msgstr ""
 msgid "unknown errno"
 msgstr "errno sconosciuto"
 
-#: popt.c:1045
+#: popt.c:1031
 #, c-format
 msgid "option type (%u) not implemented in popt\n"
 msgstr "tipo di opzione (%u) non implementato in popt\n"
 
-#: popt.c:1466
+#: popt.c:1452
 msgid "missing argument"
 msgstr "argomento mancante"
 
-#: popt.c:1468
+#: popt.c:1454
 msgid "unknown option"
 msgstr "opzione sconosciuta"
 
-#: popt.c:1470
+#: popt.c:1456
 msgid "mutually exclusive logical operations requested"
 msgstr "richieste operazioni logiche reciprocamente esclusive"
 
-#: popt.c:1472
+#: popt.c:1458
 msgid "opt->arg should not be NULL"
 msgstr "opt->arg non dovrebbe essere NULL"
 
-#: popt.c:1474
+#: popt.c:1460
 msgid "aliases nested too deeply"
 msgstr "alias nidificati troppo in profondità"
 
-#: popt.c:1476
+#: popt.c:1462
 msgid "error in parameter quoting"
 msgstr "errore nel quoting del parametro"
 
-#: popt.c:1478
+#: popt.c:1464
 msgid "invalid numeric value"
 msgstr "valore numerico non valido"
 
-#: popt.c:1480
+#: popt.c:1466
 msgid "number too large or too small"
 msgstr "numero troppo grande o troppo piccolo"
 
-#: popt.c:1482
+#: popt.c:1468
 msgid "memory allocation failed"
 msgstr "allocazione di memoria fallita"
 
-#: popt.c:1484
+#: popt.c:1470
 msgid "config file failed sanity test"
 msgstr ""
 
-#: popt.c:1488
+#: popt.c:1474
 msgid "unknown error"
 msgstr "errore sconosciuto"
 
-#: popthelp.c:77 popthelp.c:88
+#: popthelp.c:75 popthelp.c:86
 msgid "Show this help message"
 msgstr "Mostra questo messaggio di aiuto"
 
-#: popthelp.c:78 popthelp.c:89
+#: popthelp.c:76 popthelp.c:87
 msgid "Display brief usage message"
 msgstr "Mostra un breve messaggio di utilizzo"
 
-#: popthelp.c:92
+#: popthelp.c:90
 msgid "Display option defaults in message"
 msgstr "Mostra le opzioni predefinite nel messaggio"
 
-#: popthelp.c:94
+#: popthelp.c:92
 msgid "Terminate options"
 msgstr "Opzioni di terminazione"
 
-#: popthelp.c:193
+#: popthelp.c:191
 msgid "Help options:"
 msgstr "Opzioni di aiuto:"
 
-#: popthelp.c:194
+#: popthelp.c:192
 msgid "Options implemented via popt alias/exec:"
 msgstr "Opzioni implementate tramite alias/exec di popt:"
 
-#: popthelp.c:202
+#: popthelp.c:200
 msgid "NONE"
 msgstr "NONE"
 
-#: popthelp.c:204
+#: popthelp.c:202
 msgid "VAL"
 msgstr "VAL"
 
-#: popthelp.c:208
+#: popthelp.c:206
 msgid "INT"
 msgstr "INT"
 
-#: popthelp.c:209
+#: popthelp.c:207
 msgid "LONG"
 msgstr "LONG"
 
-#: popthelp.c:210
+#: popthelp.c:208
 msgid "LONGLONG"
 msgstr "LONGLONG"
 
-#: popthelp.c:211
+#: popthelp.c:209
 msgid "STRING"
 msgstr "STRING"
 
-#: popthelp.c:212
+#: popthelp.c:210
 msgid "FLOAT"
 msgstr "FLOAT"
 
-#: popthelp.c:213
+#: popthelp.c:211
 msgid "DOUBLE"
 msgstr "DOUBLE"
 
-#: popthelp.c:216
+#: popthelp.c:214
 msgid "ARG"
 msgstr "ARG"
 
-#: popthelp.c:646
+#: popthelp.c:644
 msgid "Usage:"
 msgstr "Uso:"
 
-#: popthelp.c:669
+#: popthelp.c:667
 msgid "[OPTION...]"
 msgstr "[OPZIONE...]"
diff --git a/po/ja.po b/po/ja.po
index 90604a8..50ef112 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.11\n"
 "Report-Msgid-Bugs-To: <popt-devel@rpm5.org>\n"
-"POT-Creation-Date: 2009-04-12 20:00+0200\n"
+"POT-Creation-Date: 2009-04-12 20:14+0200\n"
 "PO-Revision-Date: 2003--8-25 19:00+0900\n"
 "Last-Translator: Yukihiro Nakai <ynakai@redhat.com>\n"
 "Language-Team: Japanese <ja@li.org>\n"
@@ -18,121 +18,121 @@ msgstr ""
 msgid "unknown errno"
 msgstr "不明なエラー番号"
 
-#: popt.c:1045
+#: popt.c:1031
 #, fuzzy, c-format
 msgid "option type (%u) not implemented in popt\n"
 msgstr "オプションタイプ (%d) はpoptには実装されていません\n"
 
-#: popt.c:1466
+#: popt.c:1452
 msgid "missing argument"
 msgstr "引数がありません"
 
-#: popt.c:1468
+#: popt.c:1454
 msgid "unknown option"
 msgstr "不明なオプション"
 
-#: popt.c:1470
+#: popt.c:1456
 msgid "mutually exclusive logical operations requested"
 msgstr "排他的な悪ぺーレーションが必要です"
 
-#: popt.c:1472
+#: popt.c:1458
 msgid "opt->arg should not be NULL"
 msgstr "opt->argはNULLではいけません"
 
-#: popt.c:1474
+#: popt.c:1460
 msgid "aliases nested too deeply"
 msgstr "エイリアスのネストが深すぎます"
 
-#: popt.c:1476
+#: popt.c:1462
 msgid "error in parameter quoting"
 msgstr "パラメータのクオート付けでエラー"
 
-#: popt.c:1478
+#: popt.c:1464
 msgid "invalid numeric value"
 msgstr "不正な数値"
 
-#: popt.c:1480
+#: popt.c:1466
 msgid "number too large or too small"
 msgstr "数値が大きすぎるか小さすぎます"
 
-#: popt.c:1482
+#: popt.c:1468
 msgid "memory allocation failed"
 msgstr "メモリ確保に失敗しました"
 
-#: popt.c:1484
+#: popt.c:1470
 msgid "config file failed sanity test"
 msgstr ""
 
-#: popt.c:1488
+#: popt.c:1474
 msgid "unknown error"
 msgstr "不明なエラー"
 
-#: popthelp.c:77 popthelp.c:88
+#: popthelp.c:75 popthelp.c:86
 msgid "Show this help message"
 msgstr "このヘルプメッセージを表示します"
 
-#: popthelp.c:78 popthelp.c:89
+#: popthelp.c:76 popthelp.c:87
 msgid "Display brief usage message"
 msgstr "使い方の概要を表示します"
 
-#: popthelp.c:92
+#: popthelp.c:90
 msgid "Display option defaults in message"
 msgstr "オプションのデフォルト値をメッセージに表示します"
 
-#: popthelp.c:94
+#: popthelp.c:92
 #, fuzzy
 msgid "Terminate options"
 msgstr "ヘルプオプション:"
 
-#: popthelp.c:193
+#: popthelp.c:191
 msgid "Help options:"
 msgstr "ヘルプオプション:"
 
-#: popthelp.c:194
+#: popthelp.c:192
 msgid "Options implemented via popt alias/exec:"
 msgstr "poptのalias/execで実装されているオプション:"
 
-#: popthelp.c:202
+#: popthelp.c:200
 msgid "NONE"
 msgstr "なし"
 
-#: popthelp.c:204
+#: popthelp.c:202
 msgid "VAL"
 msgstr "値"
 
-#: popthelp.c:208
+#: popthelp.c:206
 msgid "INT"
 msgstr "INT"
 
-#: popthelp.c:209
+#: popthelp.c:207
 msgid "LONG"
 msgstr "LONG"
 
-#: popthelp.c:210
+#: popthelp.c:208
 #, fuzzy
 msgid "LONGLONG"
 msgstr "LONG"
 
-#: popthelp.c:211
+#: popthelp.c:209
 msgid "STRING"
 msgstr "文字列"
 
-#: popthelp.c:212
+#: popthelp.c:210
 msgid "FLOAT"
 msgstr "FLOAT"
 
-#: popthelp.c:213
+#: popthelp.c:211
 msgid "DOUBLE"
 msgstr "DOUBLE"
 
-#: popthelp.c:216
+#: popthelp.c:214
 msgid "ARG"
 msgstr "ARG"
 
-#: popthelp.c:646
+#: popthelp.c:644
 msgid "Usage:"
 msgstr "使い方:"
 
-#: popthelp.c:669
+#: popthelp.c:667
 msgid "[OPTION...]"
 msgstr "[オプション...]"
diff --git a/po/ko.po b/po/ko.po
index d1902e3..c08e3a7 100644
--- a/po/ko.po
+++ b/po/ko.po
@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.11\n"
 "Report-Msgid-Bugs-To: <popt-devel@rpm5.org>\n"
-"POT-Creation-Date: 2009-04-12 20:00+0200\n"
+"POT-Creation-Date: 2009-04-12 20:14+0200\n"
 "PO-Revision-Date: 2001-09-06 20:06+0900\n"
 "Last-Translator: Jong-Hoon Ryu <redhat4u@netian.com>\n"
 "Language-Team: GNU Translation project <ko@li.org>\n"
@@ -14,120 +14,120 @@ msgstr ""
 msgid "unknown errno"
 msgstr "�� �� ���� �����ڵ�(errno) �Դϴ�"
 
-#: popt.c:1045
+#: popt.c:1031
 #, fuzzy, c-format
 msgid "option type (%u) not implemented in popt\n"
 msgstr "�ɼ� ���� (%d)�� popt���� ����� �� �����ϴ�\n"
 
-#: popt.c:1466
+#: popt.c:1452
 msgid "missing argument"
 msgstr "�μ��� �������� �ʾҽ��ϴ�"
 
-#: popt.c:1468
+#: popt.c:1454
 msgid "unknown option"
 msgstr "�� �� ���� �ɼ��Դϴ�"
 
-#: popt.c:1470
+#: popt.c:1456
 msgid "mutually exclusive logical operations requested"
 msgstr "���ʿ� ��Ÿ�� ���� ������ �����Ǿ����ϴ�"
 
-#: popt.c:1472
+#: popt.c:1458
 msgid "opt->arg should not be NULL"
 msgstr "�ɼ�->�μ��� NULL�� �Ǿ�� �ȵ˴ϴ�"
 
-#: popt.c:1474
+#: popt.c:1460
 msgid "aliases nested too deeply"
 msgstr "��Ī(alias)�� �����ϰ� �����Ǿ����ϴ�"
 
-#: popt.c:1476
+#: popt.c:1462
 msgid "error in parameter quoting"
 msgstr "�Ű������� ������ �ֽ��ϴ�"
 
-#: popt.c:1478
+#: popt.c:1464
 msgid "invalid numeric value"
 msgstr "�߸��� ��ġ ���Դϴ�"
 
-#: popt.c:1480
+#: popt.c:1466
 msgid "number too large or too small"
 msgstr "���ڰ� �ʹ� ũ�ų� �ʹ� �����ϴ�"
 
-#: popt.c:1482
+#: popt.c:1468
 msgid "memory allocation failed"
 msgstr "�޸� �Ҵ翡 �����߽��ϴ�"
 
-#: popt.c:1484
+#: popt.c:1470
 msgid "config file failed sanity test"
 msgstr ""
 
-#: popt.c:1488
+#: popt.c:1474
 msgid "unknown error"
 msgstr "�� �� ���� �����Դϴ�"
 
-#: popthelp.c:77 popthelp.c:88
+#: popthelp.c:75 popthelp.c:86
 msgid "Show this help message"
 msgstr "�� ������ �����ݴϴ�"
 
-#: popthelp.c:78 popthelp.c:89
+#: popthelp.c:76 popthelp.c:87
 msgid "Display brief usage message"
 msgstr "������ ������ �����ݴϴ�"
 
-#: popthelp.c:92
+#: popthelp.c:90
 msgid "Display option defaults in message"
 msgstr "�⺻���� �ɼ��� �����ݴϴ�"
 
-#: popthelp.c:94
+#: popthelp.c:92
 msgid "Terminate options"
 msgstr ""
 
-#: popthelp.c:193
+#: popthelp.c:191
 msgid "Help options:"
 msgstr ""
 
-#: popthelp.c:194
+#: popthelp.c:192
 msgid "Options implemented via popt alias/exec:"
 msgstr ""
 
-#: popthelp.c:202
+#: popthelp.c:200
 msgid "NONE"
 msgstr "����(NONE)"
 
-#: popthelp.c:204
+#: popthelp.c:202
 msgid "VAL"
 msgstr "��(VAL)"
 
-#: popthelp.c:208
+#: popthelp.c:206
 msgid "INT"
 msgstr "����(INT)"
 
-#: popthelp.c:209
+#: popthelp.c:207
 msgid "LONG"
 msgstr "����(LONG)"
 
-#: popthelp.c:210
+#: popthelp.c:208
 #, fuzzy
 msgid "LONGLONG"
 msgstr "����(LONG)"
 
-#: popthelp.c:211
+#: popthelp.c:209
 msgid "STRING"
 msgstr "���ڿ�(STRING)"
 
-#: popthelp.c:212
+#: popthelp.c:210
 msgid "FLOAT"
 msgstr "�Ҽ�(FLOAT)"
 
-#: popthelp.c:213
+#: popthelp.c:211
 msgid "DOUBLE"
 msgstr "�Ҽ�(DOUBLE)"
 
-#: popthelp.c:216
+#: popthelp.c:214
 msgid "ARG"
 msgstr "�μ�(ARG)"
 
-#: popthelp.c:646
+#: popthelp.c:644
 msgid "Usage:"
 msgstr "����:"
 
-#: popthelp.c:669
+#: popthelp.c:667
 msgid "[OPTION...]"
 msgstr "[�ɼ�...]"
diff --git a/po/nb.po b/po/nb.po
index 1f69bea..53334dd 100644
--- a/po/nb.po
+++ b/po/nb.po
@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.11\n"
 "Report-Msgid-Bugs-To: <popt-devel@rpm5.org>\n"
-"POT-Creation-Date: 2009-04-12 20:00+0200\n"
+"POT-Creation-Date: 2009-04-12 20:14+0200\n"
 "PO-Revision-Date: 2001-06-27 11:05+0200\n"
 "Last-Translator: Kjartan Maraas <kmaraas@online.no>\n"
 "Language-Team: Norwegian <no@li.org>\n"
@@ -14,120 +14,120 @@ msgstr ""
 msgid "unknown errno"
 msgstr "ukjent errno"
 
-#: popt.c:1045
+#: popt.c:1031
 #, fuzzy, c-format
 msgid "option type (%u) not implemented in popt\n"
 msgstr "flaggtype (%d) ikke implementert i popt\n"
 
-#: popt.c:1466
+#: popt.c:1452
 msgid "missing argument"
 msgstr "manglende argument"
 
-#: popt.c:1468
+#: popt.c:1454
 msgid "unknown option"
 msgstr "ukjent flagg"
 
-#: popt.c:1470
+#: popt.c:1456
 msgid "mutually exclusive logical operations requested"
 msgstr "gjensidig eksluderende logiske operasjoner forespurt"
 
-#: popt.c:1472
+#: popt.c:1458
 msgid "opt->arg should not be NULL"
 msgstr "opt->arg m� ikke v�re NULL"
 
-#: popt.c:1474
+#: popt.c:1460
 msgid "aliases nested too deeply"
 msgstr "aliaser med for dype l�kker"
 
-#: popt.c:1476
+#: popt.c:1462
 msgid "error in parameter quoting"
 msgstr "feil i parametersitering"
 
-#: popt.c:1478
+#: popt.c:1464
 msgid "invalid numeric value"
 msgstr "ugyldig numerisk verdi"
 
-#: popt.c:1480
+#: popt.c:1466
 msgid "number too large or too small"
 msgstr "tallet er for stort eller lite"
 
-#: popt.c:1482
+#: popt.c:1468
 msgid "memory allocation failed"
 msgstr "minneallokering feilet"
 
-#: popt.c:1484
+#: popt.c:1470
 msgid "config file failed sanity test"
 msgstr ""
 
-#: popt.c:1488
+#: popt.c:1474
 msgid "unknown error"
 msgstr "ukjent feil"
 
-#: popthelp.c:77 popthelp.c:88
+#: popthelp.c:75 popthelp.c:86
 msgid "Show this help message"
 msgstr "Vis denne hjelpmeldingen"
 
-#: popthelp.c:78 popthelp.c:89
+#: popthelp.c:76 popthelp.c:87
 msgid "Display brief usage message"
 msgstr "Vis kort bruksmelding"
 
-#: popthelp.c:92
+#: popthelp.c:90
 msgid "Display option defaults in message"
 msgstr "Vis forvalgte flagg i melding"
 
-#: popthelp.c:94
+#: popthelp.c:92
 msgid "Terminate options"
 msgstr ""
 
-#: popthelp.c:193
+#: popthelp.c:191
 msgid "Help options:"
 msgstr ""
 
-#: popthelp.c:194
+#: popthelp.c:192
 msgid "Options implemented via popt alias/exec:"
 msgstr ""
 
-#: popthelp.c:202
+#: popthelp.c:200
 msgid "NONE"
 msgstr "INGEN"
 
-#: popthelp.c:204
+#: popthelp.c:202
 msgid "VAL"
 msgstr "VERDI"
 
-#: popthelp.c:208
+#: popthelp.c:206
 msgid "INT"
 msgstr "HELTALL"
 
-#: popthelp.c:209
+#: popthelp.c:207
 msgid "LONG"
 msgstr "LONG"
 
-#: popthelp.c:210
+#: popthelp.c:208
 #, fuzzy
 msgid "LONGLONG"
 msgstr "LONG"
 
-#: popthelp.c:211
+#: popthelp.c:209
 msgid "STRING"
 msgstr "STRENG"
 
-#: popthelp.c:212
+#: popthelp.c:210
 msgid "FLOAT"
 msgstr "FLYTTALL"
 
-#: popthelp.c:213
+#: popthelp.c:211
 msgid "DOUBLE"
 msgstr "DOUBLE"
 
-#: popthelp.c:216
+#: popthelp.c:214
 msgid "ARG"
 msgstr "ARG"
 
-#: popthelp.c:646
+#: popthelp.c:644
 msgid "Usage:"
 msgstr "Bruk:"
 
-#: popthelp.c:669
+#: popthelp.c:667
 msgid "[OPTION...]"
 msgstr "[FLAGG...]"
diff --git a/po/nl.po b/po/nl.po
index 8972992..57c21bd 100644
--- a/po/nl.po
+++ b/po/nl.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.14\n"
 "Report-Msgid-Bugs-To: <popt-devel@rpm5.org>\n"
-"POT-Creation-Date: 2009-04-12 20:00+0200\n"
+"POT-Creation-Date: 2009-04-12 20:14+0200\n"
 "PO-Revision-Date: 2008-02-20 19:26+0100\n"
 "Last-Translator: Tim Van Holder <tim.van.holder@telenet.be>\n"
 "Language-Team: Dutch <vertaling@vrijschrift.org>\n"
@@ -18,123 +18,123 @@ msgstr ""
 msgid "unknown errno"
 msgstr "onbekend foutnummer (errno)"
 
-#: popt.c:1045
+#: popt.c:1031
 #, c-format
 msgid "option type (%u) not implemented in popt\n"
 msgstr "dit optietype (%u) is niet geïmplementeerd in popt\n"
 
-#: popt.c:1466
+#: popt.c:1452
 msgid "missing argument"
 msgstr "ontbrekend argument"
 
-#: popt.c:1468
+#: popt.c:1454
 msgid "unknown option"
 msgstr "onbekende optie"
 
-#: popt.c:1470
+#: popt.c:1456
 msgid "mutually exclusive logical operations requested"
 msgstr "elkaar uitsluitende logische operatoren werden gevraagd"
 
-#: popt.c:1472
+#: popt.c:1458
 msgid "opt->arg should not be NULL"
 msgstr "opt->arg zou niet NULL mogen zijn"
 
-#: popt.c:1474
+#: popt.c:1460
 msgid "aliases nested too deeply"
 msgstr "aliassen zijn te diep genest"
 
 # of toch beter "quoting" behouden?
-#: popt.c:1476
+#: popt.c:1462
 msgid "error in parameter quoting"
 msgstr "fout in de aanhaling van parameters"
 
-#: popt.c:1478
+#: popt.c:1464
 msgid "invalid numeric value"
 msgstr "ongeldige numerieke waarde"
 
-#: popt.c:1480
+#: popt.c:1466
 msgid "number too large or too small"
 msgstr "getal is te klein of te groot"
 
-#: popt.c:1482
+#: popt.c:1468
 msgid "memory allocation failed"
 msgstr "reserveren van geheugen is mislukt"
 
-#: popt.c:1484
+#: popt.c:1470
 msgid "config file failed sanity test"
 msgstr ""
 
-#: popt.c:1488
+#: popt.c:1474
 msgid "unknown error"
 msgstr "onbekende fout"
 
-#: popthelp.c:77 popthelp.c:88
+#: popthelp.c:75 popthelp.c:86
 msgid "Show this help message"
 msgstr "Deze hulptekst tonen"
 
-#: popthelp.c:78 popthelp.c:89
+#: popthelp.c:76 popthelp.c:87
 msgid "Display brief usage message"
 msgstr "Een korte gebruikssamenvatting tonen"
 
-#: popthelp.c:92
+#: popthelp.c:90
 msgid "Display option defaults in message"
 msgstr "De standaardwaarden van opties tonen in de tekst"
 
-#: popthelp.c:94
+#: popthelp.c:92
 msgid "Terminate options"
 msgstr "Opties beëindigen"
 
 # of "Help-opties:"?
-#: popthelp.c:193
+#: popthelp.c:191
 msgid "Help options:"
 msgstr "Hulp-opties:"
 
-#: popthelp.c:194
+#: popthelp.c:192
 msgid "Options implemented via popt alias/exec:"
 msgstr "Opties geïmplementeerd d.m.v. popt alias/exec:"
 
-#: popthelp.c:202
+#: popthelp.c:200
 msgid "NONE"
 msgstr "GEEN"
 
-#: popthelp.c:204
+#: popthelp.c:202
 msgid "VAL"
 msgstr "WAARDE"
 
-#: popthelp.c:208
+#: popthelp.c:206
 msgid "INT"
 msgstr "INT"
 
-#: popthelp.c:209
+#: popthelp.c:207
 msgid "LONG"
 msgstr "LONG"
 
-#: popthelp.c:210
+#: popthelp.c:208
 msgid "LONGLONG"
 msgstr "LONGLONG"
 
 # TEKENREEKS lijkt me niet gepast; dus ofwel STRING behouden, ofwel TEKST
-#: popthelp.c:211
+#: popthelp.c:209
 msgid "STRING"
 msgstr "TEKST"
 
-#: popthelp.c:212
+#: popthelp.c:210
 msgid "FLOAT"
 msgstr "FLOAT"
 
-#: popthelp.c:213
+#: popthelp.c:211
 msgid "DOUBLE"
 msgstr "DOUBLE"
 
 # of hier ARGUMENT van maken?
-#: popthelp.c:216
+#: popthelp.c:214
 msgid "ARG"
 msgstr "ARG"
 
-#: popthelp.c:646
+#: popthelp.c:644
 msgid "Usage:"
 msgstr "Gebruik:"
 
-#: popthelp.c:669
+#: popthelp.c:667
 msgid "[OPTION...]"
 msgstr "[OPTIE...]"
diff --git a/po/pl.po b/po/pl.po
index 8e078a3..aa24b80 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.14\n"
 "Report-Msgid-Bugs-To: <popt-devel@rpm5.org>\n"
-"POT-Creation-Date: 2009-04-12 20:00+0200\n"
+"POT-Creation-Date: 2009-04-12 20:14+0200\n"
 "PO-Revision-Date: 2008-02-18 00:30+0100\n"
 "Last-Translator: Jakub Bogusz <qboosh@pld-linux.org>\n"
 "Language-Team: Polish <translation-team-pl@lists.sourceforge.net>\n"
@@ -18,119 +18,119 @@ msgstr ""
 msgid "unknown errno"
 msgstr "nieznane errno"
 
-#: popt.c:1045
+#: popt.c:1031
 #, c-format
 msgid "option type (%u) not implemented in popt\n"
 msgstr "typ opcji (%u) nie zaimplementowany w popt\n"
 
-#: popt.c:1466
+#: popt.c:1452
 msgid "missing argument"
 msgstr "brak parametru"
 
-#: popt.c:1468
+#: popt.c:1454
 msgid "unknown option"
 msgstr "nieznana opcja"
 
-#: popt.c:1470
+#: popt.c:1456
 msgid "mutually exclusive logical operations requested"
 msgstr "��danie wykluczaj�cych si� operacji"
 
-#: popt.c:1472
+#: popt.c:1458
 msgid "opt->arg should not be NULL"
 msgstr "opt->arg nie mo�e by� NULL"
 
-#: popt.c:1474
+#: popt.c:1460
 msgid "aliases nested too deeply"
 msgstr "zbyt du�e zag��bienie alias�w"
 
-#: popt.c:1476
+#: popt.c:1462
 msgid "error in parameter quoting"
 msgstr "b��d w cytowaniu parametru"
 
-#: popt.c:1478
+#: popt.c:1464
 msgid "invalid numeric value"
 msgstr "b��dna warto�� liczbowa"
 
-#: popt.c:1480
+#: popt.c:1466
 msgid "number too large or too small"
 msgstr "liczba zbyt du�a lub zbyt ma�a"
 
-#: popt.c:1482
+#: popt.c:1468
 msgid "memory allocation failed"
 msgstr "b��d alokacji pami�ci"
 
-#: popt.c:1484
+#: popt.c:1470
 msgid "config file failed sanity test"
 msgstr ""
 
-#: popt.c:1488
+#: popt.c:1474
 msgid "unknown error"
 msgstr "nieznany b��d"
 
-#: popthelp.c:77 popthelp.c:88
+#: popthelp.c:75 popthelp.c:86
 msgid "Show this help message"
 msgstr "Poka� t� pomoc"
 
-#: popthelp.c:78 popthelp.c:89
+#: popthelp.c:76 popthelp.c:87
 msgid "Display brief usage message"
 msgstr "Wy�wietl skr�cony spos�b u�ycia"
 
-#: popthelp.c:92
+#: popthelp.c:90
 msgid "Display option defaults in message"
 msgstr "Wy�wietl domy�lne opcje w opisie"
 
-#: popthelp.c:94
+#: popthelp.c:92
 msgid "Terminate options"
 msgstr "Opcje zako�czenia"
 
-#: popthelp.c:193
+#: popthelp.c:191
 msgid "Help options:"
 msgstr "Opcje pomocy:"
 
-#: popthelp.c:194
+#: popthelp.c:192
 msgid "Options implemented via popt alias/exec:"
 msgstr "Opcje zaimplementowane poprzez popt alias/exec:"
 
-#: popthelp.c:202
+#: popthelp.c:200
 msgid "NONE"
 msgstr "BRAK"
 
-#: popthelp.c:204
+#: popthelp.c:202
 msgid "VAL"
 msgstr "WART"
 
-#: popthelp.c:208
+#: popthelp.c:206
 msgid "INT"
 msgstr "INT"
 
-#: popthelp.c:209
+#: popthelp.c:207
 msgid "LONG"
 msgstr "LONG"
 
-#: popthelp.c:210
+#: popthelp.c:208
 msgid "LONGLONG"
 msgstr "LONGLONG"
 
-#: popthelp.c:211
+#: popthelp.c:209
 msgid "STRING"
 msgstr "�A�CUCH"
 
-#: popthelp.c:212
+#: popthelp.c:210
 msgid "FLOAT"
 msgstr "FLOAT"
 
-#: popthelp.c:213
+#: popthelp.c:211
 msgid "DOUBLE"
 msgstr "DOUBLE"
 
-#: popthelp.c:216
+#: popthelp.c:214
 msgid "ARG"
 msgstr "PARAM"
 
-#: popthelp.c:646
+#: popthelp.c:644
 msgid "Usage:"
 msgstr "Sk�adnia:"
 
-#: popthelp.c:669
+#: popthelp.c:667
 msgid "[OPTION...]"
 msgstr "[OPCJA...]"
diff --git a/po/popt.pot b/po/popt.pot
index 5d46ff0..5fd6613 100644
--- a/po/popt.pot
+++ b/po/popt.pot
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.15\n"
 "Report-Msgid-Bugs-To: <popt-devel@rpm5.org>\n"
-"POT-Creation-Date: 2009-04-12 20:00+0200\n"
+"POT-Creation-Date: 2009-04-12 20:14+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -19,119 +19,119 @@ msgstr ""
 msgid "unknown errno"
 msgstr ""
 
-#: popt.c:1045
+#: popt.c:1031
 #, c-format
 msgid "option type (%u) not implemented in popt\n"
 msgstr ""
 
-#: popt.c:1466
+#: popt.c:1452
 msgid "missing argument"
 msgstr ""
 
-#: popt.c:1468
+#: popt.c:1454
 msgid "unknown option"
 msgstr ""
 
-#: popt.c:1470
+#: popt.c:1456
 msgid "mutually exclusive logical operations requested"
 msgstr ""
 
-#: popt.c:1472
+#: popt.c:1458
 msgid "opt->arg should not be NULL"
 msgstr ""
 
-#: popt.c:1474
+#: popt.c:1460
 msgid "aliases nested too deeply"
 msgstr ""
 
-#: popt.c:1476
+#: popt.c:1462
 msgid "error in parameter quoting"
 msgstr ""
 
-#: popt.c:1478
+#: popt.c:1464
 msgid "invalid numeric value"
 msgstr ""
 
-#: popt.c:1480
+#: popt.c:1466
 msgid "number too large or too small"
 msgstr ""
 
-#: popt.c:1482
+#: popt.c:1468
 msgid "memory allocation failed"
 msgstr ""
 
-#: popt.c:1484
+#: popt.c:1470
 msgid "config file failed sanity test"
 msgstr ""
 
-#: popt.c:1488
+#: popt.c:1474
 msgid "unknown error"
 msgstr ""
 
-#: popthelp.c:77 popthelp.c:88
+#: popthelp.c:75 popthelp.c:86
 msgid "Show this help message"
 msgstr ""
 
-#: popthelp.c:78 popthelp.c:89
+#: popthelp.c:76 popthelp.c:87
 msgid "Display brief usage message"
 msgstr ""
 
-#: popthelp.c:92
+#: popthelp.c:90
 msgid "Display option defaults in message"
 msgstr ""
 
-#: popthelp.c:94
+#: popthelp.c:92
 msgid "Terminate options"
 msgstr ""
 
-#: popthelp.c:193
+#: popthelp.c:191
 msgid "Help options:"
 msgstr ""
 
-#: popthelp.c:194
+#: popthelp.c:192
 msgid "Options implemented via popt alias/exec:"
 msgstr ""
 
-#: popthelp.c:202
+#: popthelp.c:200
 msgid "NONE"
 msgstr ""
 
-#: popthelp.c:204
+#: popthelp.c:202
 msgid "VAL"
 msgstr ""
 
-#: popthelp.c:208
+#: popthelp.c:206
 msgid "INT"
 msgstr ""
 
-#: popthelp.c:209
+#: popthelp.c:207
 msgid "LONG"
 msgstr ""
 
-#: popthelp.c:210
+#: popthelp.c:208
 msgid "LONGLONG"
 msgstr ""
 
-#: popthelp.c:211
+#: popthelp.c:209
 msgid "STRING"
 msgstr ""
 
-#: popthelp.c:212
+#: popthelp.c:210
 msgid "FLOAT"
 msgstr ""
 
-#: popthelp.c:213
+#: popthelp.c:211
 msgid "DOUBLE"
 msgstr ""
 
-#: popthelp.c:216
+#: popthelp.c:214
 msgid "ARG"
 msgstr ""
 
-#: popthelp.c:646
+#: popthelp.c:644
 msgid "Usage:"
 msgstr ""
 
-#: popthelp.c:669
+#: popthelp.c:667
 msgid "[OPTION...]"
 msgstr ""
diff --git a/po/pt.po b/po/pt.po
index c47cdb6..c3d9c67 100644
--- a/po/pt.po
+++ b/po/pt.po
@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.11\n"
 "Report-Msgid-Bugs-To: <popt-devel@rpm5.org>\n"
-"POT-Creation-Date: 2009-04-12 20:00+0200\n"
+"POT-Creation-Date: 2009-04-12 20:14+0200\n"
 "PO-Revision-Date: 2002-02-13 18:32+0000\n"
 "Last-Translator: Pedro Morais <morais@kde.org>\n"
 "Language-Team: pt <morais@kde.org>\n"
@@ -14,120 +14,120 @@ msgstr ""
 msgid "unknown errno"
 msgstr "errno desconhecido"
 
-#: popt.c:1045
+#: popt.c:1031
 #, fuzzy, c-format
 msgid "option type (%u) not implemented in popt\n"
 msgstr "tipo de op��o (%d) n�o implementado no popt\n"
 
-#: popt.c:1466
+#: popt.c:1452
 msgid "missing argument"
 msgstr "falta um argumento"
 
-#: popt.c:1468
+#: popt.c:1454
 msgid "unknown option"
 msgstr "op��o desconhecida"
 
-#: popt.c:1470
+#: popt.c:1456
 msgid "mutually exclusive logical operations requested"
 msgstr "foram pedidas opera��es l�gicas mutuamente exclusivas"
 
-#: popt.c:1472
+#: popt.c:1458
 msgid "opt->arg should not be NULL"
 msgstr "opt->arg n�o deve ser NULL"
 
-#: popt.c:1474
+#: popt.c:1460
 msgid "aliases nested too deeply"
 msgstr "'aliases' demasiado aninhados"
 
-#: popt.c:1476
+#: popt.c:1462
 msgid "error in parameter quoting"
 msgstr "erros no 'quoting' de par�metros"
 
-#: popt.c:1478
+#: popt.c:1464
 msgid "invalid numeric value"
 msgstr "valor n�merico inv�lido"
 
-#: popt.c:1480
+#: popt.c:1466
 msgid "number too large or too small"
 msgstr "n�mero demasiado grando ou pequeno"
 
-#: popt.c:1482
+#: popt.c:1468
 msgid "memory allocation failed"
 msgstr "aloca��o de mem�ria falhou"
 
-#: popt.c:1484
+#: popt.c:1470
 msgid "config file failed sanity test"
 msgstr ""
 
-#: popt.c:1488
+#: popt.c:1474
 msgid "unknown error"
 msgstr "erro desconhecido"
 
-#: popthelp.c:77 popthelp.c:88
+#: popthelp.c:75 popthelp.c:86
 msgid "Show this help message"
 msgstr "Mostrar esta mensagem de ajuda"
 
-#: popthelp.c:78 popthelp.c:89
+#: popthelp.c:76 popthelp.c:87
 msgid "Display brief usage message"
 msgstr "Mostrar uma mensagem de utiliza��o sucinta"
 
-#: popthelp.c:92
+#: popthelp.c:90
 msgid "Display option defaults in message"
 msgstr "Mostrar valor por omiss�o das op��es na mensagem"
 
-#: popthelp.c:94
+#: popthelp.c:92
 msgid "Terminate options"
 msgstr ""
 
-#: popthelp.c:193
+#: popthelp.c:191
 msgid "Help options:"
 msgstr ""
 
-#: popthelp.c:194
+#: popthelp.c:192
 msgid "Options implemented via popt alias/exec:"
 msgstr ""
 
-#: popthelp.c:202
+#: popthelp.c:200
 msgid "NONE"
 msgstr "NONE"
 
-#: popthelp.c:204
+#: popthelp.c:202
 msgid "VAL"
 msgstr "VAL"
 
-#: popthelp.c:208
+#: popthelp.c:206
 msgid "INT"
 msgstr "INT"
 
-#: popthelp.c:209
+#: popthelp.c:207
 msgid "LONG"
 msgstr "LONG"
 
-#: popthelp.c:210
+#: popthelp.c:208
 #, fuzzy
 msgid "LONGLONG"
 msgstr "LONG"
 
-#: popthelp.c:211
+#: popthelp.c:209
 msgid "STRING"
 msgstr "STRING"
 
-#: popthelp.c:212
+#: popthelp.c:210
 msgid "FLOAT"
 msgstr "FLOAT"
 
-#: popthelp.c:213
+#: popthelp.c:211
 msgid "DOUBLE"
 msgstr "DOUBLE"
 
-#: popthelp.c:216
+#: popthelp.c:214
 msgid "ARG"
 msgstr "ARG"
 
-#: popthelp.c:646
+#: popthelp.c:644
 msgid "Usage:"
 msgstr "Utiliza��o:"
 
-#: popthelp.c:669
+#: popthelp.c:667
 msgid "[OPTION...]"
 msgstr "[OP��O...]"
diff --git a/po/ro.po b/po/ro.po
index cab050d..e76d927 100644
--- a/po/ro.po
+++ b/po/ro.po
@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.11\n"
 "Report-Msgid-Bugs-To: <popt-devel@rpm5.org>\n"
-"POT-Creation-Date: 2009-04-12 20:00+0200\n"
+"POT-Creation-Date: 2009-04-12 20:14+0200\n"
 "PO-Revision-Date: 2000-06-14 23:23+EST\n"
 "Last-Translator: Cristian Gafton <gafton@redhat.com>\n"
 "Language-Team: Romanian <ro@li.org>\n"
@@ -14,121 +14,121 @@ msgstr ""
 msgid "unknown errno"
 msgstr "eroare necunoscuta"
 
-#: popt.c:1045
+#: popt.c:1031
 #, fuzzy, c-format
 msgid "option type (%u) not implemented in popt\n"
 msgstr "optiunea de tipul (%d) nu este implementata in popt\n"
 
-#: popt.c:1466
+#: popt.c:1452
 msgid "missing argument"
 msgstr "argument lipsa"
 
-#: popt.c:1468
+#: popt.c:1454
 msgid "unknown option"
 msgstr "optiune necunoscuta"
 
-#: popt.c:1470
+#: popt.c:1456
 msgid "mutually exclusive logical operations requested"
 msgstr ""
 
-#: popt.c:1472
+#: popt.c:1458
 msgid "opt->arg should not be NULL"
 msgstr ""
 
-#: popt.c:1474
+#: popt.c:1460
 msgid "aliases nested too deeply"
 msgstr "recursivitate infinita la optiunile sinonime"
 
-#: popt.c:1476
+#: popt.c:1462
 #, fuzzy
 msgid "error in parameter quoting"
 msgstr "eroare la insertie parametru"
 
-#: popt.c:1478
+#: popt.c:1464
 msgid "invalid numeric value"
 msgstr "valoare numarica invalida"
 
-#: popt.c:1480
+#: popt.c:1466
 msgid "number too large or too small"
 msgstr "numar prea mare sau prea mic"
 
-#: popt.c:1482
+#: popt.c:1468
 msgid "memory allocation failed"
 msgstr ""
 
-#: popt.c:1484
+#: popt.c:1470
 msgid "config file failed sanity test"
 msgstr ""
 
-#: popt.c:1488
+#: popt.c:1474
 msgid "unknown error"
 msgstr "eroare necuinoscuta"
 
-#: popthelp.c:77 popthelp.c:88
+#: popthelp.c:75 popthelp.c:86
 msgid "Show this help message"
 msgstr "Afisare mesaj de help"
 
-#: popthelp.c:78 popthelp.c:89
+#: popthelp.c:76 popthelp.c:87
 msgid "Display brief usage message"
 msgstr "Afisare mesaj sintaxa sumar"
 
-#: popthelp.c:92
+#: popthelp.c:90
 #, fuzzy
 msgid "Display option defaults in message"
 msgstr "Afisare mesaj sintaxa sumar"
 
-#: popthelp.c:94
+#: popthelp.c:92
 msgid "Terminate options"
 msgstr ""
 
-#: popthelp.c:193
+#: popthelp.c:191
 msgid "Help options:"
 msgstr ""
 
-#: popthelp.c:194
+#: popthelp.c:192
 msgid "Options implemented via popt alias/exec:"
 msgstr ""
 
-#: popthelp.c:202
+#: popthelp.c:200
 msgid "NONE"
 msgstr ""
 
-#: popthelp.c:204
+#: popthelp.c:202
 msgid "VAL"
 msgstr ""
 
-#: popthelp.c:208
+#: popthelp.c:206
 msgid "INT"
 msgstr ""
 
-#: popthelp.c:209
+#: popthelp.c:207
 msgid "LONG"
 msgstr ""
 
-#: popthelp.c:210
+#: popthelp.c:208
 msgid "LONGLONG"
 msgstr ""
 
-#: popthelp.c:211
+#: popthelp.c:209
 msgid "STRING"
 msgstr ""
 
-#: popthelp.c:212
+#: popthelp.c:210
 msgid "FLOAT"
 msgstr ""
 
-#: popthelp.c:213
+#: popthelp.c:211
 msgid "DOUBLE"
 msgstr ""
 
-#: popthelp.c:216
+#: popthelp.c:214
 msgid "ARG"
 msgstr ""
 
-#: popthelp.c:646
+#: popthelp.c:644
 msgid "Usage:"
 msgstr "Sintaxa:"
 
-#: popthelp.c:669
+#: popthelp.c:667
 msgid "[OPTION...]"
 msgstr "[OPTIUNE...]"
diff --git a/po/ru.po b/po/ru.po
index c895409..9ec2bdd 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.14\n"
 "Report-Msgid-Bugs-To: <popt-devel@rpm5.org>\n"
-"POT-Creation-Date: 2009-04-12 20:00+0200\n"
+"POT-Creation-Date: 2009-04-12 20:14+0200\n"
 "PO-Revision-Date: 2009-02-01 13:30+0300\n"
 "Last-Translator: Yuri Kozlov <yuray@komyakino.ru>\n"
 "Language-Team: Russian <gnu@mx.ru>\n"
@@ -22,119 +22,119 @@ msgstr ""
 msgid "unknown errno"
 msgstr "неизвестный errno"
 
-#: popt.c:1045
+#: popt.c:1031
 #, c-format
 msgid "option type (%u) not implemented in popt\n"
 msgstr "обработка параметра (%u) в popt не предусмотрена\n"
 
-#: popt.c:1466
+#: popt.c:1452
 msgid "missing argument"
 msgstr "пропущен аргумент"
 
-#: popt.c:1468
+#: popt.c:1454
 msgid "unknown option"
 msgstr "неизвестный параметр"
 
-#: popt.c:1470
+#: popt.c:1456
 msgid "mutually exclusive logical operations requested"
 msgstr "запрошены взаимно исключающие логические операции"
 
-#: popt.c:1472
+#: popt.c:1458
 msgid "opt->arg should not be NULL"
 msgstr "opt->arg не может быть NULL"
 
-#: popt.c:1474
+#: popt.c:1460
 msgid "aliases nested too deeply"
 msgstr "превышен уровень допустимой рекурсии подстановок"
 
-#: popt.c:1476
+#: popt.c:1462
 msgid "error in parameter quoting"
 msgstr "ошибка помещения параметров в кавычки"
 
-#: popt.c:1478
+#: popt.c:1464
 msgid "invalid numeric value"
 msgstr "неправильное числовое значение"
 
-#: popt.c:1480
+#: popt.c:1466
 msgid "number too large or too small"
 msgstr "числовое значение за пределами предусмотренного"
 
-#: popt.c:1482
+#: popt.c:1468
 msgid "memory allocation failed"
 msgstr "не удалось выделить память"
 
-#: popt.c:1484
+#: popt.c:1470
 msgid "config file failed sanity test"
 msgstr ""
 
-#: popt.c:1488
+#: popt.c:1474
 msgid "unknown error"
 msgstr "неизвестная ошибка"
 
-#: popthelp.c:77 popthelp.c:88
+#: popthelp.c:75 popthelp.c:86
 msgid "Show this help message"
 msgstr "Показать эту справку"
 
-#: popthelp.c:78 popthelp.c:89
+#: popthelp.c:76 popthelp.c:87
 msgid "Display brief usage message"
 msgstr "Показать краткую инструкцию по использованию"
 
-#: popthelp.c:92
+#: popthelp.c:90
 msgid "Display option defaults in message"
 msgstr "Показать параметры по умолчанию"
 
-#: popthelp.c:94
+#: popthelp.c:92
 msgid "Terminate options"
 msgstr "Завершает параметры"
 
-#: popthelp.c:193
+#: popthelp.c:191
 msgid "Help options:"
 msgstr "Параметры вывода справки:"
 
-#: popthelp.c:194
+#: popthelp.c:192
 msgid "Options implemented via popt alias/exec:"
 msgstr "Параметры, реализованные через popt alias/exec:"
 
-#: popthelp.c:202
+#: popthelp.c:200
 msgid "NONE"
 msgstr "NONE"
 
-#: popthelp.c:204
+#: popthelp.c:202
 msgid "VAL"
 msgstr "VAL"
 
-#: popthelp.c:208
+#: popthelp.c:206
 msgid "INT"
 msgstr "INT"
 
-#: popthelp.c:209
+#: popthelp.c:207
 msgid "LONG"
 msgstr "LONG"
 
-#: popthelp.c:210
+#: popthelp.c:208
 msgid "LONGLONG"
 msgstr "LONGLONG"
 
-#: popthelp.c:211
+#: popthelp.c:209
 msgid "STRING"
 msgstr "STRING"
 
-#: popthelp.c:212
+#: popthelp.c:210
 msgid "FLOAT"
 msgstr "FLOAT"
 
-#: popthelp.c:213
+#: popthelp.c:211
 msgid "DOUBLE"
 msgstr "DOUBLE"
 
-#: popthelp.c:216
+#: popthelp.c:214
 msgid "ARG"
 msgstr "ARG"
 
-#: popthelp.c:646
+#: popthelp.c:644
 msgid "Usage:"
 msgstr "Использование:"
 
-#: popthelp.c:669
+#: popthelp.c:667
 msgid "[OPTION...]"
 msgstr "[ПАРАМЕТР...]"
diff --git a/po/sk.po b/po/sk.po
index 549bde8..f77a698 100644
--- a/po/sk.po
+++ b/po/sk.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.11\n"
 "Report-Msgid-Bugs-To: <popt-devel@rpm5.org>\n"
-"POT-Creation-Date: 2009-04-12 20:00+0200\n"
+"POT-Creation-Date: 2009-04-12 20:14+0200\n"
 "PO-Revision-Date: 1999-08-04 21:40+0200\n"
 "Last-Translator: Stanislav Meduna <stano@eunet.sk>\n"
 "Language-Team: Slovak <sk-i18n@rak.isternet.sk>\n"
@@ -18,120 +18,120 @@ msgstr ""
 msgid "unknown errno"
 msgstr ""
 
-#: popt.c:1045
+#: popt.c:1031
 #, c-format
 msgid "option type (%u) not implemented in popt\n"
 msgstr ""
 
-#: popt.c:1466
+#: popt.c:1452
 msgid "missing argument"
 msgstr ""
 
-#: popt.c:1468
+#: popt.c:1454
 msgid "unknown option"
 msgstr ""
 
-#: popt.c:1470
+#: popt.c:1456
 msgid "mutually exclusive logical operations requested"
 msgstr ""
 
-#: popt.c:1472
+#: popt.c:1458
 msgid "opt->arg should not be NULL"
 msgstr ""
 
-#: popt.c:1474
+#: popt.c:1460
 msgid "aliases nested too deeply"
 msgstr ""
 
-#: popt.c:1476
+#: popt.c:1462
 msgid "error in parameter quoting"
 msgstr ""
 
-#: popt.c:1478
+#: popt.c:1464
 msgid "invalid numeric value"
 msgstr ""
 
-#: popt.c:1480
+#: popt.c:1466
 msgid "number too large or too small"
 msgstr ""
 
-#: popt.c:1482
+#: popt.c:1468
 msgid "memory allocation failed"
 msgstr ""
 
-#: popt.c:1484
+#: popt.c:1470
 msgid "config file failed sanity test"
 msgstr ""
 
-#: popt.c:1488
+#: popt.c:1474
 msgid "unknown error"
 msgstr ""
 
-#: popthelp.c:77 popthelp.c:88
+#: popthelp.c:75 popthelp.c:86
 msgid "Show this help message"
 msgstr "Vyp�sa� t�to spr�vu"
 
-#: popthelp.c:78 popthelp.c:89
+#: popthelp.c:76 popthelp.c:87
 msgid "Display brief usage message"
 msgstr "Zobrazi� stru�n� n�vod na pou�itie"
 
-#: popthelp.c:92
+#: popthelp.c:90
 #, fuzzy
 msgid "Display option defaults in message"
 msgstr "Zobrazi� stru�n� n�vod na pou�itie"
 
-#: popthelp.c:94
+#: popthelp.c:92
 msgid "Terminate options"
 msgstr ""
 
-#: popthelp.c:193
+#: popthelp.c:191
 msgid "Help options:"
 msgstr ""
 
-#: popthelp.c:194
+#: popthelp.c:192
 msgid "Options implemented via popt alias/exec:"
 msgstr ""
 
-#: popthelp.c:202
+#: popthelp.c:200
 msgid "NONE"
 msgstr ""
 
-#: popthelp.c:204
+#: popthelp.c:202
 msgid "VAL"
 msgstr ""
 
-#: popthelp.c:208
+#: popthelp.c:206
 msgid "INT"
 msgstr ""
 
-#: popthelp.c:209
+#: popthelp.c:207
 msgid "LONG"
 msgstr ""
 
-#: popthelp.c:210
+#: popthelp.c:208
 msgid "LONGLONG"
 msgstr ""
 
-#: popthelp.c:211
+#: popthelp.c:209
 msgid "STRING"
 msgstr ""
 
-#: popthelp.c:212
+#: popthelp.c:210
 msgid "FLOAT"
 msgstr ""
 
-#: popthelp.c:213
+#: popthelp.c:211
 msgid "DOUBLE"
 msgstr ""
 
-#: popthelp.c:216
+#: popthelp.c:214
 msgid "ARG"
 msgstr ""
 
-#: popthelp.c:646
+#: popthelp.c:644
 msgid "Usage:"
 msgstr ""
 
-#: popthelp.c:669
+#: popthelp.c:667
 msgid "[OPTION...]"
 msgstr ""
diff --git a/po/sl.po b/po/sl.po
index 95d5197..1144a86 100644
--- a/po/sl.po
+++ b/po/sl.po
@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.11\n"
 "Report-Msgid-Bugs-To: <popt-devel@rpm5.org>\n"
-"POT-Creation-Date: 2009-04-12 20:00+0200\n"
+"POT-Creation-Date: 2009-04-12 20:14+0200\n"
 "PO-Revision-Date: 2000-09-05 12:30+0200\n"
 "Last-Translator: Roman Maurer <roman.maurer@hermes.si>\n"
 "Language-Team: Slovenian <sl@li.org>\n"
@@ -14,120 +14,120 @@ msgstr ""
 msgid "unknown errno"
 msgstr ""
 
-#: popt.c:1045
+#: popt.c:1031
 #, c-format
 msgid "option type (%u) not implemented in popt\n"
 msgstr ""
 
-#: popt.c:1466
+#: popt.c:1452
 msgid "missing argument"
 msgstr ""
 
-#: popt.c:1468
+#: popt.c:1454
 msgid "unknown option"
 msgstr ""
 
-#: popt.c:1470
+#: popt.c:1456
 msgid "mutually exclusive logical operations requested"
 msgstr ""
 
-#: popt.c:1472
+#: popt.c:1458
 msgid "opt->arg should not be NULL"
 msgstr ""
 
-#: popt.c:1474
+#: popt.c:1460
 msgid "aliases nested too deeply"
 msgstr ""
 
-#: popt.c:1476
+#: popt.c:1462
 msgid "error in parameter quoting"
 msgstr ""
 
-#: popt.c:1478
+#: popt.c:1464
 msgid "invalid numeric value"
 msgstr ""
 
-#: popt.c:1480
+#: popt.c:1466
 msgid "number too large or too small"
 msgstr ""
 
-#: popt.c:1482
+#: popt.c:1468
 msgid "memory allocation failed"
 msgstr ""
 
-#: popt.c:1484
+#: popt.c:1470
 msgid "config file failed sanity test"
 msgstr ""
 
-#: popt.c:1488
+#: popt.c:1474
 msgid "unknown error"
 msgstr ""
 
-#: popthelp.c:77 popthelp.c:88
+#: popthelp.c:75 popthelp.c:86
 msgid "Show this help message"
 msgstr "Prika�i to sporo�ilo s pomo�jo"
 
-#: popthelp.c:78 popthelp.c:89
+#: popthelp.c:76 popthelp.c:87
 msgid "Display brief usage message"
 msgstr "Prika�i kratko sporo�ilo o uporabi"
 
-#: popthelp.c:92
+#: popthelp.c:90
 #, fuzzy
 msgid "Display option defaults in message"
 msgstr "Prika�i kratko sporo�ilo o uporabi"
 
-#: popthelp.c:94
+#: popthelp.c:92
 msgid "Terminate options"
 msgstr ""
 
-#: popthelp.c:193
+#: popthelp.c:191
 msgid "Help options:"
 msgstr ""
 
-#: popthelp.c:194
+#: popthelp.c:192
 msgid "Options implemented via popt alias/exec:"
 msgstr ""
 
-#: popthelp.c:202
+#: popthelp.c:200
 msgid "NONE"
 msgstr ""
 
-#: popthelp.c:204
+#: popthelp.c:202
 msgid "VAL"
 msgstr ""
 
-#: popthelp.c:208
+#: popthelp.c:206
 msgid "INT"
 msgstr ""
 
-#: popthelp.c:209
+#: popthelp.c:207
 msgid "LONG"
 msgstr ""
 
-#: popthelp.c:210
+#: popthelp.c:208
 msgid "LONGLONG"
 msgstr ""
 
-#: popthelp.c:211
+#: popthelp.c:209
 msgid "STRING"
 msgstr ""
 
-#: popthelp.c:212
+#: popthelp.c:210
 msgid "FLOAT"
 msgstr ""
 
-#: popthelp.c:213
+#: popthelp.c:211
 msgid "DOUBLE"
 msgstr ""
 
-#: popthelp.c:216
+#: popthelp.c:214
 msgid "ARG"
 msgstr ""
 
-#: popthelp.c:646
+#: popthelp.c:644
 msgid "Usage:"
 msgstr ""
 
-#: popthelp.c:669
+#: popthelp.c:667
 msgid "[OPTION...]"
 msgstr ""
diff --git a/po/sv.po b/po/sv.po
index 197e4a0..6ac2f8b 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.14\n"
 "Report-Msgid-Bugs-To: <popt-devel@rpm5.org>\n"
-"POT-Creation-Date: 2009-04-12 20:00+0200\n"
+"POT-Creation-Date: 2009-04-12 20:14+0200\n"
 "PO-Revision-Date: 2008-02-23 20:15+0100\n"
 "Last-Translator: G�ran Uddeborg <goeran@uddeborg.se>\n"
 "Language-Team: Swedish <tp-sv@listor.tp-sv.se>\n"
@@ -21,119 +21,119 @@ msgstr ""
 msgid "unknown errno"
 msgstr "ok�nt felnummer"
 
-#: popt.c:1045
+#: popt.c:1031
 #, c-format
 msgid "option type (%u) not implemented in popt\n"
 msgstr "flaggtypen (%u) �r inte implementerad i popt\n"
 
-#: popt.c:1466
+#: popt.c:1452
 msgid "missing argument"
 msgstr "argument saknas"
 
-#: popt.c:1468
+#: popt.c:1454
 msgid "unknown option"
 msgstr "ok�nd flagga"
 
-#: popt.c:1470
+#: popt.c:1456
 msgid "mutually exclusive logical operations requested"
 msgstr "�msesidigt uteslutande logiska operationer beg�rdes"
 
-#: popt.c:1472
+#: popt.c:1458
 msgid "opt->arg should not be NULL"
 msgstr "opt->arg f�r inte vara NULL"
 
-#: popt.c:1474
+#: popt.c:1460
 msgid "aliases nested too deeply"
 msgstr "alias �r n�stade f�r djupt"
 
-#: popt.c:1476
+#: popt.c:1462
 msgid "error in parameter quoting"
 msgstr "fel i parametercitering"
 
-#: popt.c:1478
+#: popt.c:1464
 msgid "invalid numeric value"
 msgstr "ogiltigt numeriskt v�rde"
 
-#: popt.c:1480
+#: popt.c:1466
 msgid "number too large or too small"
 msgstr "talet f�r stort eller f�r litet"
 
-#: popt.c:1482
+#: popt.c:1468
 msgid "memory allocation failed"
 msgstr "minnesallokering misslyckades"
 
-#: popt.c:1484
+#: popt.c:1470
 msgid "config file failed sanity test"
 msgstr ""
 
-#: popt.c:1488
+#: popt.c:1474
 msgid "unknown error"
 msgstr "ok�nt fel"
 
-#: popthelp.c:77 popthelp.c:88
+#: popthelp.c:75 popthelp.c:86
 msgid "Show this help message"
 msgstr "Visa denna hj�lptext"
 
-#: popthelp.c:78 popthelp.c:89
+#: popthelp.c:76 popthelp.c:87
 msgid "Display brief usage message"
 msgstr "Visa en kortfattad anv�ndningstext"
 
-#: popthelp.c:92
+#: popthelp.c:90
 msgid "Display option defaults in message"
 msgstr "Visa standardalternativ f�r flaggor i meddelande"
 
-#: popthelp.c:94
+#: popthelp.c:92
 msgid "Terminate options"
 msgstr "Avsluta flaggor"
 
-#: popthelp.c:193
+#: popthelp.c:191
 msgid "Help options:"
 msgstr "Hj�lpflaggor:"
 
-#: popthelp.c:194
+#: popthelp.c:192
 msgid "Options implemented via popt alias/exec:"
 msgstr "Flaggor implementerade via popt-alias/exec:"
 
-#: popthelp.c:202
+#: popthelp.c:200
 msgid "NONE"
 msgstr "INGET"
 
-#: popthelp.c:204
+#: popthelp.c:202
 msgid "VAL"
 msgstr "V�RDE"
 
-#: popthelp.c:208
+#: popthelp.c:206
 msgid "INT"
 msgstr "HELTAL"
 
-#: popthelp.c:209
+#: popthelp.c:207
 msgid "LONG"
 msgstr "L�NG"
 
-#: popthelp.c:210
+#: popthelp.c:208
 msgid "LONGLONG"
 msgstr "L�NGL�NG"
 
-#: popthelp.c:211
+#: popthelp.c:209
 msgid "STRING"
 msgstr "STR�NG"
 
-#: popthelp.c:212
+#: popthelp.c:210
 msgid "FLOAT"
 msgstr "FLYTTAL"
 
-#: popthelp.c:213
+#: popthelp.c:211
 msgid "DOUBLE"
 msgstr "DUBBEL"
 
-#: popthelp.c:216
+#: popthelp.c:214
 msgid "ARG"
 msgstr "ARG"
 
-#: popthelp.c:646
+#: popthelp.c:644
 msgid "Usage:"
 msgstr "Anv�ndning:"
 
-#: popthelp.c:669
+#: popthelp.c:667
 msgid "[OPTION...]"
 msgstr "[FLAGGA...]"
diff --git a/po/th.po b/po/th.po
index 49717ca..5cbcda3 100644
--- a/po/th.po
+++ b/po/th.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.14\n"
 "Report-Msgid-Bugs-To: <popt-devel@rpm5.org>\n"
-"POT-Creation-Date: 2009-04-12 20:00+0200\n"
+"POT-Creation-Date: 2009-04-12 20:14+0200\n"
 "PO-Revision-Date: 2008-02-19 15:53+0700\n"
 "Last-Translator: Seksan Poltree <seksan.poltree@gmail.com>\n"
 "Language-Team: Thai <translation-team-th@lists.sourceforge.net>\n"
@@ -20,119 +20,119 @@ msgstr ""
 msgid "unknown errno"
 msgstr "เกิด errno ที่ไม่รู้จัก"
 
-#: popt.c:1045
+#: popt.c:1031
 #, c-format
 msgid "option type (%u) not implemented in popt\n"
 msgstr "ตัวเลือกชนิด (%u) ไม่ถูกอิมพลีเมนต์ใน popt\n"
 
-#: popt.c:1466
+#: popt.c:1452
 msgid "missing argument"
 msgstr "ไม่พบอาร์กิวเมนต์"
 
-#: popt.c:1468
+#: popt.c:1454
 msgid "unknown option"
 msgstr "ไม่รู้จักตัวเลือก"
 
-#: popt.c:1470
+#: popt.c:1456
 msgid "mutually exclusive logical operations requested"
 msgstr "เกิดการร้องขอร่วมกันของการดำเนินการด้านตรรกะอย่างเดียวกัน"
 
-#: popt.c:1472
+#: popt.c:1458
 msgid "opt->arg should not be NULL"
 msgstr "opt->arg ไม่ควรจะเป็น NULL"
 
-#: popt.c:1474
+#: popt.c:1460
 msgid "aliases nested too deeply"
 msgstr "นามแฝงซ้อนกันมากเกินไป"
 
-#: popt.c:1476
+#: popt.c:1462
 msgid "error in parameter quoting"
 msgstr "เกิดข้อผิดพลาดในการอ้างอิงพารามิเตอร์"
 
-#: popt.c:1478
+#: popt.c:1464
 msgid "invalid numeric value"
 msgstr "ค่าตัวเลขผิดพลาด"
 
-#: popt.c:1480
+#: popt.c:1466
 msgid "number too large or too small"
 msgstr "ตัวเลขมีค่ามากหรือน้อยเกินไป"
 
-#: popt.c:1482
+#: popt.c:1468
 msgid "memory allocation failed"
 msgstr "การจัดสรรหน่วยความจำผิดพลาด"
 
-#: popt.c:1484
+#: popt.c:1470
 msgid "config file failed sanity test"
 msgstr ""
 
-#: popt.c:1488
+#: popt.c:1474
 msgid "unknown error"
 msgstr "ความผิดพลาดที่ไม่รู้จัก"
 
-#: popthelp.c:77 popthelp.c:88
+#: popthelp.c:75 popthelp.c:86
 msgid "Show this help message"
 msgstr "แสดงข้อความช่วยเหลือนี้"
 
-#: popthelp.c:78 popthelp.c:89
+#: popthelp.c:76 popthelp.c:87
 msgid "Display brief usage message"
 msgstr "แสดงข้อความสรุปย่อการใช้งาน"
 
-#: popthelp.c:92
+#: popthelp.c:90
 msgid "Display option defaults in message"
 msgstr "แสดงตัวเลือกมาตรฐานในข้อความ"
 
-#: popthelp.c:94
+#: popthelp.c:92
 msgid "Terminate options"
 msgstr "ตัวเลือกการสิ้นสุด:"
 
-#: popthelp.c:193
+#: popthelp.c:191
 msgid "Help options:"
 msgstr "ตัวเลือกความช่วยเหลือ:"
 
-#: popthelp.c:194
+#: popthelp.c:192
 msgid "Options implemented via popt alias/exec:"
 msgstr "ตัวเลือกที่ถูกอิมพลีเมนต์ด้วย popt alias/exec:"
 
-#: popthelp.c:202
+#: popthelp.c:200
 msgid "NONE"
 msgstr "ไม่มี"
 
-#: popthelp.c:204
+#: popthelp.c:202
 msgid "VAL"
 msgstr "VAL"
 
-#: popthelp.c:208
+#: popthelp.c:206
 msgid "INT"
 msgstr "INT"
 
-#: popthelp.c:209
+#: popthelp.c:207
 msgid "LONG"
 msgstr "LONG"
 
-#: popthelp.c:210
+#: popthelp.c:208
 msgid "LONGLONG"
 msgstr "LONGLONG"
 
-#: popthelp.c:211
+#: popthelp.c:209
 msgid "STRING"
 msgstr "STRING"
 
-#: popthelp.c:212
+#: popthelp.c:210
 msgid "FLOAT"
 msgstr "FLOAT"
 
-#: popthelp.c:213
+#: popthelp.c:211
 msgid "DOUBLE"
 msgstr "DOUBLE"
 
-#: popthelp.c:216
+#: popthelp.c:214
 msgid "ARG"
 msgstr "ARG"
 
-#: popthelp.c:646
+#: popthelp.c:644
 msgid "Usage:"
 msgstr "วิธีใช้:"
 
-#: popthelp.c:669
+#: popthelp.c:667
 msgid "[OPTION...]"
 msgstr "[ตัวเลือก...]"
diff --git a/po/tr.po b/po/tr.po
index 4bfb4c7..60c142b 100644
--- a/po/tr.po
+++ b/po/tr.po
@@ -5,7 +5,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.11\n"
 "Report-Msgid-Bugs-To: <popt-devel@rpm5.org>\n"
-"POT-Creation-Date: 2009-04-12 20:00+0200\n"
+"POT-Creation-Date: 2009-04-12 20:14+0200\n"
 "PO-Revision-Date: 2000-02-11 13:01+0200\n"
 "Last-Translator: Nilgun Belma Buguner <nilgun@technologist.com>\n"
 "Language-Team: Turkish <tr@li.org>\n"
@@ -17,121 +17,121 @@ msgstr ""
 msgid "unknown errno"
 msgstr "bilinmeyen hata no"
 
-#: popt.c:1045
+#: popt.c:1031
 #, fuzzy, c-format
 msgid "option type (%u) not implemented in popt\n"
 msgstr "se�enek t�r� (%d) popt i�in ge�ersiz\n"
 
-#: popt.c:1466
+#: popt.c:1452
 msgid "missing argument"
 msgstr "arg�man eksik"
 
-#: popt.c:1468
+#: popt.c:1454
 msgid "unknown option"
 msgstr "bilinmeyen se�enek"
 
-#: popt.c:1470
+#: popt.c:1456
 msgid "mutually exclusive logical operations requested"
 msgstr "birbirini d��layan mant�ksal i�lemler istendi"
 
-#: popt.c:1472
+#: popt.c:1458
 msgid "opt->arg should not be NULL"
 msgstr ""
 
-#: popt.c:1474
+#: popt.c:1460
 msgid "aliases nested too deeply"
 msgstr "adlarda �ok fazla i�i�elikler"
 
-#: popt.c:1476
+#: popt.c:1462
 msgid "error in parameter quoting"
 msgstr "parametrelerde t�rnak i�aretleme hatal� "
 
-#: popt.c:1478
+#: popt.c:1464
 msgid "invalid numeric value"
 msgstr "say�sal de�er ge�ersiz"
 
-#: popt.c:1480
+#: popt.c:1466
 msgid "number too large or too small"
 msgstr "say� ya �ok b�y�k ya da �ok k���k"
 
-#: popt.c:1482
+#: popt.c:1468
 msgid "memory allocation failed"
 msgstr ""
 
-#: popt.c:1484
+#: popt.c:1470
 msgid "config file failed sanity test"
 msgstr ""
 
-#: popt.c:1488
+#: popt.c:1474
 msgid "unknown error"
 msgstr "bilinmeyen hata"
 
-#: popthelp.c:77 popthelp.c:88
+#: popthelp.c:75 popthelp.c:86
 msgid "Show this help message"
 msgstr "Bu yard�m iletisini g�sterir"
 
-#: popthelp.c:78 popthelp.c:89
+#: popthelp.c:76 popthelp.c:87
 msgid "Display brief usage message"
 msgstr "K�sa bir kullan�m iletisi g�ster"
 
-#: popthelp.c:92
+#: popthelp.c:90
 #, fuzzy
 msgid "Display option defaults in message"
 msgstr "K�sa bir kullan�m iletisi g�ster"
 
-#: popthelp.c:94
+#: popthelp.c:92
 msgid "Terminate options"
 msgstr ""
 
-#: popthelp.c:193
+#: popthelp.c:191
 msgid "Help options:"
 msgstr ""
 
-#: popthelp.c:194
+#: popthelp.c:192
 msgid "Options implemented via popt alias/exec:"
 msgstr ""
 
-#: popthelp.c:202
+#: popthelp.c:200
 msgid "NONE"
 msgstr "YOK"
 
-#: popthelp.c:204
+#: popthelp.c:202
 msgid "VAL"
 msgstr "DE�"
 
-#: popthelp.c:208
+#: popthelp.c:206
 msgid "INT"
 msgstr "INT"
 
-#: popthelp.c:209
+#: popthelp.c:207
 msgid "LONG"
 msgstr "LONG"
 
-#: popthelp.c:210
+#: popthelp.c:208
 #, fuzzy
 msgid "LONGLONG"
 msgstr "LONG"
 
-#: popthelp.c:211
+#: popthelp.c:209
 msgid "STRING"
 msgstr "STRING"
 
-#: popthelp.c:212
+#: popthelp.c:210
 msgid "FLOAT"
 msgstr "FLOAT"
 
-#: popthelp.c:213
+#: popthelp.c:211
 msgid "DOUBLE"
 msgstr "DOUBLE"
 
-#: popthelp.c:216
+#: popthelp.c:214
 msgid "ARG"
 msgstr "ARG"
 
-#: popthelp.c:646
+#: popthelp.c:644
 msgid "Usage:"
 msgstr "Kullan�m�:"
 
-#: popthelp.c:669
+#: popthelp.c:667
 msgid "[OPTION...]"
 msgstr "[SE�ENEK...]"
diff --git a/po/uk.po b/po/uk.po
index 0427c05..c9da20c 100644
--- a/po/uk.po
+++ b/po/uk.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.11\n"
 "Report-Msgid-Bugs-To: <popt-devel@rpm5.org>\n"
-"POT-Creation-Date: 2009-04-12 20:00+0200\n"
+"POT-Creation-Date: 2009-04-12 20:14+0200\n"
 "PO-Revision-Date: 1999-09-30 16:54+0200\n"
 "Last-Translator: Yuri Syrota <rasta@renome.rovno.ua>\n"
 "Language-Team: Ukrainian <uk@li.org>\n"
@@ -18,120 +18,120 @@ msgstr ""
 msgid "unknown errno"
 msgstr ""
 
-#: popt.c:1045
+#: popt.c:1031
 #, c-format
 msgid "option type (%u) not implemented in popt\n"
 msgstr ""
 
-#: popt.c:1466
+#: popt.c:1452
 msgid "missing argument"
 msgstr ""
 
-#: popt.c:1468
+#: popt.c:1454
 msgid "unknown option"
 msgstr ""
 
-#: popt.c:1470
+#: popt.c:1456
 msgid "mutually exclusive logical operations requested"
 msgstr ""
 
-#: popt.c:1472
+#: popt.c:1458
 msgid "opt->arg should not be NULL"
 msgstr ""
 
-#: popt.c:1474
+#: popt.c:1460
 msgid "aliases nested too deeply"
 msgstr ""
 
-#: popt.c:1476
+#: popt.c:1462
 msgid "error in parameter quoting"
 msgstr ""
 
-#: popt.c:1478
+#: popt.c:1464
 msgid "invalid numeric value"
 msgstr ""
 
-#: popt.c:1480
+#: popt.c:1466
 msgid "number too large or too small"
 msgstr ""
 
-#: popt.c:1482
+#: popt.c:1468
 msgid "memory allocation failed"
 msgstr ""
 
-#: popt.c:1484
+#: popt.c:1470
 msgid "config file failed sanity test"
 msgstr ""
 
-#: popt.c:1488
+#: popt.c:1474
 msgid "unknown error"
 msgstr ""
 
-#: popthelp.c:77 popthelp.c:88
+#: popthelp.c:75 popthelp.c:86
 msgid "Show this help message"
 msgstr "�������� �� ��צ���"
 
-#: popthelp.c:78 popthelp.c:89
+#: popthelp.c:76 popthelp.c:87
 msgid "Display brief usage message"
 msgstr "�������� ������� ��צ��� ��� ������������"
 
-#: popthelp.c:92
+#: popthelp.c:90
 #, fuzzy
 msgid "Display option defaults in message"
 msgstr "�������� ������� ��צ��� ��� ������������"
 
-#: popthelp.c:94
+#: popthelp.c:92
 msgid "Terminate options"
 msgstr ""
 
-#: popthelp.c:193
+#: popthelp.c:191
 msgid "Help options:"
 msgstr ""
 
-#: popthelp.c:194
+#: popthelp.c:192
 msgid "Options implemented via popt alias/exec:"
 msgstr ""
 
-#: popthelp.c:202
+#: popthelp.c:200
 msgid "NONE"
 msgstr ""
 
-#: popthelp.c:204
+#: popthelp.c:202
 msgid "VAL"
 msgstr ""
 
-#: popthelp.c:208
+#: popthelp.c:206
 msgid "INT"
 msgstr ""
 
-#: popthelp.c:209
+#: popthelp.c:207
 msgid "LONG"
 msgstr ""
 
-#: popthelp.c:210
+#: popthelp.c:208
 msgid "LONGLONG"
 msgstr ""
 
-#: popthelp.c:211
+#: popthelp.c:209
 msgid "STRING"
 msgstr ""
 
-#: popthelp.c:212
+#: popthelp.c:210
 msgid "FLOAT"
 msgstr ""
 
-#: popthelp.c:213
+#: popthelp.c:211
 msgid "DOUBLE"
 msgstr ""
 
-#: popthelp.c:216
+#: popthelp.c:214
 msgid "ARG"
 msgstr ""
 
-#: popthelp.c:646
+#: popthelp.c:644
 msgid "Usage:"
 msgstr ""
 
-#: popthelp.c:669
+#: popthelp.c:667
 msgid "[OPTION...]"
 msgstr ""
diff --git a/po/vi.po b/po/vi.po
index e939876..1c29ed8 100644
--- a/po/vi.po
+++ b/po/vi.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.14\n"
 "Report-Msgid-Bugs-To: <popt-devel@rpm5.org>\n"
-"POT-Creation-Date: 2009-04-12 20:00+0200\n"
+"POT-Creation-Date: 2009-04-12 20:14+0200\n"
 "PO-Revision-Date: 2008-02-18 16:20+1030\n"
 "Last-Translator: Clytie Siddall <clytie@riverland.net.au>\n"
 "Language-Team: Vietnamese <vi-VN@googlegroups.com>\n"
@@ -21,119 +21,119 @@ msgstr ""
 msgid "unknown errno"
 msgstr "số hiệu lỗi không rõ"
 
-#: popt.c:1045
+#: popt.c:1031
 #, c-format
 msgid "option type (%u) not implemented in popt\n"
 msgstr "kiểu tùy chọn (%u) chưa được thực hiện trong popt\n"
 
-#: popt.c:1466
+#: popt.c:1452
 msgid "missing argument"
 msgstr "thiếu đối số"
 
-#: popt.c:1468
+#: popt.c:1454
 msgid "unknown option"
 msgstr "tùy chọn không rõ"
 
-#: popt.c:1470
+#: popt.c:1456
 msgid "mutually exclusive logical operations requested"
 msgstr "các thao tác hợp lý loại từ lẫn nhau được yêu cầu"
 
-#: popt.c:1472
+#: popt.c:1458
 msgid "opt->arg should not be NULL"
 msgstr "« tùy chọn->đối số » không thể vô giá trị"
 
-#: popt.c:1474
+#: popt.c:1460
 msgid "aliases nested too deeply"
 msgstr "các bí danh lồng nhau quá sâu"
 
-#: popt.c:1476
+#: popt.c:1462
 msgid "error in parameter quoting"
 msgstr "gặp lỗi trong lời trích dẫn tham số"
 
-#: popt.c:1478
+#: popt.c:1464
 msgid "invalid numeric value"
 msgstr "giá trị thuộc số không hợp lệ"
 
-#: popt.c:1480
+#: popt.c:1466
 msgid "number too large or too small"
 msgstr "con số quá lớn hay quá nhỏ"
 
-#: popt.c:1482
+#: popt.c:1468
 msgid "memory allocation failed"
 msgstr "lỗi cấp phát bộ nhớ"
 
-#: popt.c:1484
+#: popt.c:1470
 msgid "config file failed sanity test"
 msgstr ""
 
-#: popt.c:1488
+#: popt.c:1474
 msgid "unknown error"
 msgstr "lỗi không rõ"
 
-#: popthelp.c:77 popthelp.c:88
+#: popthelp.c:75 popthelp.c:86
 msgid "Show this help message"
 msgstr "Xem thông điệp trợ giúp này"
 
-#: popthelp.c:78 popthelp.c:89
+#: popthelp.c:76 popthelp.c:87
 msgid "Display brief usage message"
 msgstr "Hiển thị thông điệp cách sử dụng ngắn"
 
-#: popthelp.c:92
+#: popthelp.c:90
 msgid "Display option defaults in message"
 msgstr "Hiển thị các giá trị mặc định của tùy chọn trong thông điệp"
 
-#: popthelp.c:94
+#: popthelp.c:92
 msgid "Terminate options"
 msgstr "Tùy chọn chấm dứt"
 
-#: popthelp.c:193
+#: popthelp.c:191
 msgid "Help options:"
 msgstr "Tùy chọn trợ giúp:"
 
-#: popthelp.c:194
+#: popthelp.c:192
 msgid "Options implemented via popt alias/exec:"
 msgstr "Các tùy chọn được thực hiện thông qua popt alias/exec:"
 
-#: popthelp.c:202
+#: popthelp.c:200
 msgid "NONE"
 msgstr "KHÔNG CÓ"
 
-#: popthelp.c:204
+#: popthelp.c:202
 msgid "VAL"
 msgstr "GIÁ TRỊ"
 
-#: popthelp.c:208
+#: popthelp.c:206
 msgid "INT"
 msgstr "SỐ NGUYÊN"
 
-#: popthelp.c:209
+#: popthelp.c:207
 msgid "LONG"
 msgstr "DÀI"
 
-#: popthelp.c:210
+#: popthelp.c:208
 msgid "LONGLONG"
 msgstr "DÀIDÀI"
 
-#: popthelp.c:211
+#: popthelp.c:209
 msgid "STRING"
 msgstr "CHUỖI"
 
-#: popthelp.c:212
+#: popthelp.c:210
 msgid "FLOAT"
 msgstr "NỔI"
 
-#: popthelp.c:213
+#: popthelp.c:211
 msgid "DOUBLE"
 msgstr "ĐÔI"
 
-#: popthelp.c:216
+#: popthelp.c:214
 msgid "ARG"
 msgstr "ĐỐI SỐ"
 
-#: popthelp.c:646
+#: popthelp.c:644
 msgid "Usage:"
 msgstr "Sử dụng:"
 
-#: popthelp.c:669
+#: popthelp.c:667
 msgid "[OPTION...]"
 msgstr "[TÙY_CHỌN...]"
diff --git a/po/wa.po b/po/wa.po
index 6a218a2..0b200b2 100644
--- a/po/wa.po
+++ b/po/wa.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.11\n"
 "Report-Msgid-Bugs-To: <popt-devel@rpm5.org>\n"
-"POT-Creation-Date: 2009-04-12 20:00+0200\n"
+"POT-Creation-Date: 2009-04-12 20:14+0200\n"
 "PO-Revision-Date: 1999-03-18 23:11+0100\n"
 "Last-Translator: Nobody yet\n"
 "Language-Team: walon <linux-wa@chanae.alphanet.ch>\n"
@@ -22,120 +22,120 @@ msgstr ""
 msgid "unknown errno"
 msgstr ""
 
-#: popt.c:1045
+#: popt.c:1031
 #, c-format
 msgid "option type (%u) not implemented in popt\n"
 msgstr ""
 
-#: popt.c:1466
+#: popt.c:1452
 msgid "missing argument"
 msgstr ""
 
-#: popt.c:1468
+#: popt.c:1454
 msgid "unknown option"
 msgstr ""
 
-#: popt.c:1470
+#: popt.c:1456
 msgid "mutually exclusive logical operations requested"
 msgstr ""
 
-#: popt.c:1472
+#: popt.c:1458
 msgid "opt->arg should not be NULL"
 msgstr ""
 
-#: popt.c:1474
+#: popt.c:1460
 msgid "aliases nested too deeply"
 msgstr ""
 
-#: popt.c:1476
+#: popt.c:1462
 msgid "error in parameter quoting"
 msgstr ""
 
-#: popt.c:1478
+#: popt.c:1464
 msgid "invalid numeric value"
 msgstr ""
 
-#: popt.c:1480
+#: popt.c:1466
 msgid "number too large or too small"
 msgstr ""
 
-#: popt.c:1482
+#: popt.c:1468
 msgid "memory allocation failed"
 msgstr ""
 
-#: popt.c:1484
+#: popt.c:1470
 msgid "config file failed sanity test"
 msgstr ""
 
-#: popt.c:1488
+#: popt.c:1474
 msgid "unknown error"
 msgstr ""
 
-#: popthelp.c:77 popthelp.c:88
+#: popthelp.c:75 popthelp.c:86
 msgid "Show this help message"
 msgstr "Mostrer ci messaedje d' aide chal"
 
-#: popthelp.c:78 popthelp.c:89
+#: popthelp.c:76 popthelp.c:87
 msgid "Display brief usage message"
 msgstr "Mostre on court messaedje so kmint vos � siervi"
 
-#: popthelp.c:92
+#: popthelp.c:90
 #, fuzzy
 msgid "Display option defaults in message"
 msgstr "Mostre on court messaedje so kmint vos � siervi"
 
-#: popthelp.c:94
+#: popthelp.c:92
 msgid "Terminate options"
 msgstr ""
 
-#: popthelp.c:193
+#: popthelp.c:191
 msgid "Help options:"
 msgstr ""
 
-#: popthelp.c:194
+#: popthelp.c:192
 msgid "Options implemented via popt alias/exec:"
 msgstr ""
 
-#: popthelp.c:202
+#: popthelp.c:200
 msgid "NONE"
 msgstr ""
 
-#: popthelp.c:204
+#: popthelp.c:202
 msgid "VAL"
 msgstr ""
 
-#: popthelp.c:208
+#: popthelp.c:206
 msgid "INT"
 msgstr ""
 
-#: popthelp.c:209
+#: popthelp.c:207
 msgid "LONG"
 msgstr ""
 
-#: popthelp.c:210
+#: popthelp.c:208
 msgid "LONGLONG"
 msgstr ""
 
-#: popthelp.c:211
+#: popthelp.c:209
 msgid "STRING"
 msgstr ""
 
-#: popthelp.c:212
+#: popthelp.c:210
 msgid "FLOAT"
 msgstr ""
 
-#: popthelp.c:213
+#: popthelp.c:211
 msgid "DOUBLE"
 msgstr ""
 
-#: popthelp.c:216
+#: popthelp.c:214
 msgid "ARG"
 msgstr ""
 
-#: popthelp.c:646
+#: popthelp.c:644
 msgid "Usage:"
 msgstr ""
 
-#: popthelp.c:669
+#: popthelp.c:667
 msgid "[OPTION...]"
 msgstr ""
diff --git a/po/zh_CN.po b/po/zh_CN.po
index 6aca1bb..00ae206 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.14\n"
 "Report-Msgid-Bugs-To: <popt-devel@rpm5.org>\n"
-"POT-Creation-Date: 2009-04-12 20:00+0200\n"
+"POT-Creation-Date: 2009-04-12 20:14+0200\n"
 "PO-Revision-Date: 2008-02-18 20:16+0800\n"
 "Last-Translator: LI Daobing <lidaobing@gmail.com>\n"
 "Language-Team: Chinese (simplified) <translation-team-zh-cn@lists."
@@ -21,119 +21,119 @@ msgstr ""
 msgid "unknown errno"
 msgstr "未知的错误"
 
-#: popt.c:1045
+#: popt.c:1031
 #, c-format
 msgid "option type (%u) not implemented in popt\n"
 msgstr "选项类别 (%u) 没有在 popt 中实现\n"
 
-#: popt.c:1466
+#: popt.c:1452
 msgid "missing argument"
 msgstr "缺少参数"
 
-#: popt.c:1468
+#: popt.c:1454
 msgid "unknown option"
 msgstr "未知的选项"
 
-#: popt.c:1470
+#: popt.c:1456
 msgid "mutually exclusive logical operations requested"
 msgstr "需要 XOR 逻辑运算"
 
-#: popt.c:1472
+#: popt.c:1458
 msgid "opt->arg should not be NULL"
 msgstr "opt->arg 不应该为 NULL"
 
-#: popt.c:1474
+#: popt.c:1460
 msgid "aliases nested too deeply"
 msgstr "别名嵌套太深"
 
-#: popt.c:1476
+#: popt.c:1462
 msgid "error in parameter quoting"
 msgstr "参数引号错误"
 
-#: popt.c:1478
+#: popt.c:1464
 msgid "invalid numeric value"
 msgstr "无效的数值"
 
-#: popt.c:1480
+#: popt.c:1466
 msgid "number too large or too small"
 msgstr "数值太大或太小"
 
-#: popt.c:1482
+#: popt.c:1468
 msgid "memory allocation failed"
 msgstr "内存分配错误"
 
-#: popt.c:1484
+#: popt.c:1470
 msgid "config file failed sanity test"
 msgstr ""
 
-#: popt.c:1488
+#: popt.c:1474
 msgid "unknown error"
 msgstr "未知的错误"
 
-#: popthelp.c:77 popthelp.c:88
+#: popthelp.c:75 popthelp.c:86
 msgid "Show this help message"
 msgstr "显示这个帮助信息"
 
-#: popthelp.c:78 popthelp.c:89
+#: popthelp.c:76 popthelp.c:87
 msgid "Display brief usage message"
 msgstr "显示简短的使用说明"
 
-#: popthelp.c:92
+#: popthelp.c:90
 msgid "Display option defaults in message"
 msgstr "在信息中显示默认的选项"
 
-#: popthelp.c:94
+#: popthelp.c:92
 msgid "Terminate options"
 msgstr "终止选项"
 
-#: popthelp.c:193
+#: popthelp.c:191
 msgid "Help options:"
 msgstr "帮助选项:"
 
-#: popthelp.c:194
+#: popthelp.c:192
 msgid "Options implemented via popt alias/exec:"
 msgstr "通过 popt alias/exec 实现的选项:"
 
-#: popthelp.c:202
+#: popthelp.c:200
 msgid "NONE"
 msgstr "NONE"
 
-#: popthelp.c:204
+#: popthelp.c:202
 msgid "VAL"
 msgstr "VAL"
 
-#: popthelp.c:208
+#: popthelp.c:206
 msgid "INT"
 msgstr "INT"
 
-#: popthelp.c:209
+#: popthelp.c:207
 msgid "LONG"
 msgstr "LONG"
 
-#: popthelp.c:210
+#: popthelp.c:208
 msgid "LONGLONG"
 msgstr "LONGLONG"
 
-#: popthelp.c:211
+#: popthelp.c:209
 msgid "STRING"
 msgstr "STRING"
 
-#: popthelp.c:212
+#: popthelp.c:210
 msgid "FLOAT"
 msgstr "FLOAT"
 
-#: popthelp.c:213
+#: popthelp.c:211
 msgid "DOUBLE"
 msgstr "DOUBLE"
 
-#: popthelp.c:216
+#: popthelp.c:214
 msgid "ARG"
 msgstr "ARG"
 
-#: popthelp.c:646
+#: popthelp.c:644
 msgid "Usage:"
 msgstr "用法:"
 
-#: popthelp.c:669
+#: popthelp.c:667
 msgid "[OPTION...]"
 msgstr "[选项...]"
diff --git a/po/zh_TW.po b/po/zh_TW.po
index 2b93a3d..0ebe550 100644
--- a/po/zh_TW.po
+++ b/po/zh_TW.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.11\n"
 "Report-Msgid-Bugs-To: <popt-devel@rpm5.org>\n"
-"POT-Creation-Date: 2009-04-12 20:00+0200\n"
+"POT-Creation-Date: 2009-04-12 20:14+0200\n"
 "PO-Revision-Date: 2005-04-08 17:52+0800\n"
 "Last-Translator: Wei-Lun Chao <chaoweilun@pcmail.com.tw>\n"
 "Language-Team: zh_TW <zh-l10n@linux.org.tw>\n"
@@ -18,120 +18,120 @@ msgstr ""
 msgid "unknown errno"
 msgstr "未知的錯誤"
 
-#: popt.c:1045
+#: popt.c:1031
 #, fuzzy, c-format
 msgid "option type (%u) not implemented in popt\n"
 msgstr "選項類型 (%d) 沒有在 popt 中實作\n"
 
-#: popt.c:1466
+#: popt.c:1452
 msgid "missing argument"
 msgstr "缺少引數"
 
-#: popt.c:1468
+#: popt.c:1454
 msgid "unknown option"
 msgstr "未知的選項"
 
-#: popt.c:1470
+#: popt.c:1456
 msgid "mutually exclusive logical operations requested"
 msgstr "需要相互獨立的邏輯運算"
 
-#: popt.c:1472
+#: popt.c:1458
 msgid "opt->arg should not be NULL"
 msgstr "opt->arg 不應為 NULL"
 
-#: popt.c:1474
+#: popt.c:1460
 msgid "aliases nested too deeply"
 msgstr "巢狀別名太深"
 
-#: popt.c:1476
+#: popt.c:1462
 msgid "error in parameter quoting"
 msgstr "參數引號錯誤"
 
-#: popt.c:1478
+#: popt.c:1464
 msgid "invalid numeric value"
 msgstr "不正確的數值"
 
-#: popt.c:1480
+#: popt.c:1466
 msgid "number too large or too small"
 msgstr "數字太大或太小"
 
-#: popt.c:1482
+#: popt.c:1468
 msgid "memory allocation failed"
 msgstr "記憶體配置錯誤"
 
-#: popt.c:1484
+#: popt.c:1470
 msgid "config file failed sanity test"
 msgstr ""
 
-#: popt.c:1488
+#: popt.c:1474
 msgid "unknown error"
 msgstr "未知的錯誤"
 
-#: popthelp.c:77 popthelp.c:88
+#: popthelp.c:75 popthelp.c:86
 msgid "Show this help message"
 msgstr "顯示本說明訊息"
 
-#: popthelp.c:78 popthelp.c:89
+#: popthelp.c:76 popthelp.c:87
 msgid "Display brief usage message"
 msgstr "顯示簡短的使用說明"
 
-#: popthelp.c:92
+#: popthelp.c:90
 msgid "Display option defaults in message"
 msgstr "在訊息中顯示預設選項"
 
-#: popthelp.c:94
+#: popthelp.c:92
 msgid "Terminate options"
 msgstr ""
 
-#: popthelp.c:193
+#: popthelp.c:191
 msgid "Help options:"
 msgstr ""
 
-#: popthelp.c:194
+#: popthelp.c:192
 msgid "Options implemented via popt alias/exec:"
 msgstr ""
 
-#: popthelp.c:202
+#: popthelp.c:200
 msgid "NONE"
 msgstr "NONE"
 
-#: popthelp.c:204
+#: popthelp.c:202
 msgid "VAL"
 msgstr "VAL"
 
-#: popthelp.c:208
+#: popthelp.c:206
 msgid "INT"
 msgstr "INT"
 
-#: popthelp.c:209
+#: popthelp.c:207
 msgid "LONG"
 msgstr "LONG"
 
-#: popthelp.c:210
+#: popthelp.c:208
 #, fuzzy
 msgid "LONGLONG"
 msgstr "LONG"
 
-#: popthelp.c:211
+#: popthelp.c:209
 msgid "STRING"
 msgstr "STRING"
 
-#: popthelp.c:212
+#: popthelp.c:210
 msgid "FLOAT"
 msgstr "FLOAT"
 
-#: popthelp.c:213
+#: popthelp.c:211
 msgid "DOUBLE"
 msgstr "DOUBLE"
 
-#: popthelp.c:216
+#: popthelp.c:214
 msgid "ARG"
 msgstr "ARG"
 
-#: popthelp.c:646
+#: popthelp.c:644
 msgid "Usage:"
 msgstr "用法:"
 
-#: popthelp.c:669
+#: popthelp.c:667
 msgid "[OPTION...]"
 msgstr "[選項...]"
-- 
Gitee


From a6973b8be87e16c7d1ad5b72869d5bdf316741fd Mon Sep 17 00:00:00 2001
From: "Ralf S. Engelschall" <rse@engelschall.com>
Date: Sun, 12 Apr 2009 19:29:28 +0000
Subject: [PATCH 582/667] Ok, we decided to still include those fixes into 1.15

---
 CHANGES | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/CHANGES b/CHANGES
index ae6db9e..8bebdaa 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,9 +1,9 @@
-1.15 -> 1.16:
+
+1.14 -> 1.15:
+    - release popt-1.15.
     - rse: fix building under --disable-nls
     - rse: fix building under non GLIBC platforms where glob_pattern_p fallback has to be used
     - rse: fix building under platforms where FNM_EXTMATCH is not available
-
-1.14 -> 1.15:
     - jbj: poptReadFile: permit NULL if return values are not desired.
     - jbj: poptReadFile: add routine.
     - jbj: trim out escaped newline(s) from file content, other fixes.
-- 
Gitee


From d1085b0a12da9e623048be6afab51506a6a29413 Mon Sep 17 00:00:00 2001
From: Robert Scheck <robert@fedoraproject.org>
Date: Fri, 17 Apr 2009 12:07:30 +0000
Subject: [PATCH 583/667] Updated German popt translation (re-apply of
 http://rpm5.org/cvs/chngview?cn=10394 after it got killed somehow)

---
 po/de.po | 18 ++++++++----------
 1 file changed, 8 insertions(+), 10 deletions(-)

diff --git a/po/de.po b/po/de.po
index 859cc24..bf15e35 100644
--- a/po/de.po
+++ b/po/de.po
@@ -1,14 +1,14 @@
 # Translation of popt to German (Deutsch)
 # This file is distributed under the same license as the popt package.
-# Robert Scheck <rpm@robert-scheck.de>, 2004-2007.
+# Robert Scheck <robert@rpm5.org>, 2004-2009.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: popt 1.11\n"
+"Project-Id-Version: popt 1.15\n"
 "Report-Msgid-Bugs-To: <popt-devel@rpm5.org>\n"
 "POT-Creation-Date: 2009-04-12 20:14+0200\n"
-"PO-Revision-Date: 2007-02-17 21:00+0100\n"
-"Last-Translator: Robert Scheck <rpm@robert-scheck.de>\n"
+"PO-Revision-Date: 2009-04-17 14:05+0200\n"
+"Last-Translator: Robert Scheck <robert@rpm5.org>\n"
 "Language-Team: German <de@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -19,9 +19,9 @@ msgid "unknown errno"
 msgstr "Unbekannte Fehler-Nummer"
 
 #: popt.c:1031
-#, fuzzy, c-format
+#, c-format
 msgid "option type (%u) not implemented in popt\n"
-msgstr "Optionstyp (%d) ist in popt nicht vorhanden\n"
+msgstr "Optionstyp (%u) ist nicht in popt implementiert\n"
 
 #: popt.c:1452
 msgid "missing argument"
@@ -80,9 +80,8 @@ msgid "Display option defaults in message"
 msgstr "Zeigt die Standardeinstellungen an"
 
 #: popthelp.c:92
-#, fuzzy
 msgid "Terminate options"
-msgstr "Hilfe-Optionen:"
+msgstr "Schließt die Optionen ab"
 
 #: popthelp.c:191
 msgid "Help options:"
@@ -109,9 +108,8 @@ msgid "LONG"
 msgstr "LONG"
 
 #: popthelp.c:208
-#, fuzzy
 msgid "LONGLONG"
-msgstr "LONG"
+msgstr "LONGLONG"
 
 #: popthelp.c:209
 msgid "STRING"
-- 
Gitee


From 9434abbe62f76911b56c57cc5cde597abcdcf8a1 Mon Sep 17 00:00:00 2001
From: Jeff Johnson <n3npq@mac.com>
Date: Wed, 20 May 2009 13:18:07 +0000
Subject: [PATCH 584/667] - check realloc returns (Jim Meyering).

---
 popt.c       | 5 +++--
 poptconfig.c | 3 ++-
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/popt.c b/popt.c
index 6c02a22..be31c23 100644
--- a/popt.c
+++ b/popt.c
@@ -704,11 +704,12 @@ expandNextArg(/*@special@*/ poptContext con, const char * s)
 		if ((a = findNextArg(con, 1U, 1)) == NULL)
 		    /*@switchbreak@*/ break;
 	    }
-	    s += 3;
+	    s += sizeof("#:+") - 1;
 
 	    tn += strlen(a);
 	    {   size_t pos = (size_t) (te - t);
-		t = realloc(t, tn);
+		if ((t = realloc(t, tn)) == NULL)	/* XXX can't happen */
+		    return NULL;
 		te = stpcpy(t + pos, a);
 	    }
 	    continue;
diff --git a/poptconfig.c b/poptconfig.c
index ce88751..7840d0c 100644
--- a/poptconfig.c
+++ b/poptconfig.c
@@ -321,7 +321,8 @@ static int poptConfigLine(poptContext con, char * line)
 	/* Append remaining text to the interpolated file option text. */
 	if (*se != '\0') {
 	    size_t nse = strlen(se) + 1;
-	    b = realloc(b, (nb + nse));
+	    if ((b = realloc(b, (nb + nse))) == NULL)	/* XXX can't happen */
+		goto exit;
 	    (void) stpcpy( stpcpy(&b[nb-1], " "), se);
 	    nb += nse;
 	}
-- 
Gitee


From 45bdb73081819896178667bc08d746fa909409f9 Mon Sep 17 00:00:00 2001
From: Jeff Johnson <n3npq@mac.com>
Date: Sat, 25 Jul 2009 04:50:43 +0000
Subject: [PATCH 585/667] - ignore po/* files.

---
 po/.cvsignore | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/po/.cvsignore b/po/.cvsignore
index da8d08d..900ab75 100644
--- a/po/.cvsignore
+++ b/po/.cvsignore
@@ -7,6 +7,8 @@ POTFILES
 Rules-quot
 stamp-cat-id
 stamp-po
+archive.tar.gz
+libintl.jar
 cat-id-tbl.c
 *.header
 *.mo
-- 
Gitee


From bc650f3bcdf691db855d9ff79c9aa43bbedbf81e Mon Sep 17 00:00:00 2001
From: Jeff Johnson <n3npq@mac.com>
Date: Sat, 25 Jul 2009 05:47:13 +0000
Subject: [PATCH 586/667] - add popt.pc.

---
 .cvsignore   |  1 +
 CHANGES      |  2 ++
 Makefile.am  |  5 ++++-
 configure.ac |  2 +-
 popt.pc.in   | 10 ++++++++++
 popt.spec    |  1 +
 6 files changed, 19 insertions(+), 2 deletions(-)
 create mode 100644 popt.pc.in

diff --git a/.cvsignore b/.cvsignore
index 892d8c3..2987312 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -40,4 +40,5 @@ test3
 *.lcd
 *.lo
 *.swp
+popt.pc
 popt-*.tar.gz
diff --git a/CHANGES b/CHANGES
index 8bebdaa..9b452f1 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,5 @@
+1.15 -> 1.16:
+    - add popt.pc.
 
 1.14 -> 1.15:
     - release popt-1.15.
diff --git a/Makefile.am b/Makefile.am
index f6232fd..c21cf9c 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -42,13 +42,16 @@ usrlib_LTLIBRARIES = libpopt.la
 libpopt_la_SOURCES = popt.c poptparse.c poptconfig.c popthelp.c poptint.c
 libpopt_la_LDFLAGS = -no-undefined @LTLIBINTL@ @LTLIBICONV@
 
+pkgconfigdir = $(prefix)/lib/pkgconfig
+pkgconfig_DATA = popt.pc
+
 if HAVE_LD_VERSION_SCRIPT
 libpopt_la_LDFLAGS += -Wl,--version-script=$(srcdir)/libpopt.vers
 endif
 
 man_MANS = popt.3
 
-#BUILT_SOURCES = popt.lcd
+BUILT_SOURCES = popt.pc # popt.lcd
 
 .PHONY:	updatepo
 updatepo:
diff --git a/configure.ac b/configure.ac
index 20e095e..f40cc0c 100755
--- a/configure.ac
+++ b/configure.ac
@@ -80,4 +80,4 @@ AC_DEFINE_UNQUOTED(POPT_SOURCE_PATH, "$POPT_SOURCE_PATH",
 	[Full path to popt top_srcdir.])
 AC_SUBST(POPT_SOURCE_PATH)
 
-AC_OUTPUT([Doxyfile Makefile po/Makefile.in])
+AC_OUTPUT([Doxyfile Makefile popt.pc po/Makefile.in])
diff --git a/popt.pc.in b/popt.pc.in
new file mode 100644
index 0000000..43c1735
--- /dev/null
+++ b/popt.pc.in
@@ -0,0 +1,10 @@
+prefix=@prefix@
+exec_prefix=@exec_prefix@
+libdir=@libdir@
+includedir=@includedir@
+
+Name: popt
+Version: @VERSION@
+Description: popt library.
+Libs: -L${libdir} -lpopt
+Cflags: -I${includedir}
diff --git a/popt.spec b/popt.spec
index 2ec54ba..066ec10 100644
--- a/popt.spec
+++ b/popt.spec
@@ -47,6 +47,7 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/libpopt.*
 %{_includedir}/popt.h
 %{_mandir}/man3/popt.3*
+%{_prefix}/%{_lib}/pkgconfig/libpopt-%{version}.pc
 
 %changelog
 * Fri Apr 10 2009 Jeff Johnson <jbj@rpm5.org>
-- 
Gitee


From 6d8a74ddc07eb0be75865a1008bb91ab0b98fa5c Mon Sep 17 00:00:00 2001
From: Jeff Johnson <n3npq@mac.com>
Date: Sat, 25 Jul 2009 16:30:03 +0000
Subject: [PATCH 587/667] - handle all callback traversals within a C switch
 (for extendability ease).

---
 CHANGES |  1 +
 popt.c  | 23 +++++++++++++++--------
 2 files changed, 16 insertions(+), 8 deletions(-)

diff --git a/CHANGES b/CHANGES
index 9b452f1..b453538 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,4 +1,5 @@
 1.15 -> 1.16:
+    - handle all callback traversals within a C switch (for extendability ease).
     - add popt.pc.
 
 1.14 -> 1.15:
diff --git a/popt.c b/popt.c
index be31c23..150f824 100644
--- a/popt.c
+++ b/popt.c
@@ -594,26 +594,33 @@ findOption(const struct poptOption * opt,
     for (; opt->longName || opt->shortName || opt->arg; opt++) {
 	poptArg arg = { .ptr = opt->arg };
 
-	if (poptArgType(opt) == POPT_ARG_INCLUDE_TABLE) {
-	    const struct poptOption * opt2;
+	switch (poptArgType(opt)) {
+	case POPT_ARG_INCLUDE_TABLE:	/* Recurse on included sub-tables. */
+	{   const struct poptOption * opt2;
 
 	    poptSubstituteHelpI18N(arg.opt);	/* XXX side effects */
-	    /* Recurse on included sub-tables. */
 	    if (arg.ptr == NULL) continue;	/* XXX program error */
 	    opt2 = findOption(arg.opt, longName, longNameLen, shortName, callback,
 			      callbackData, argInfo);
 	    if (opt2 == NULL) continue;
 	    /* Sub-table data will be inheirited if no data yet. */
-	    if (!(callback && *callback)) return opt2;
-	    if (!(callbackData && *callbackData == NULL)) return opt2;
 /*@-observertrans -dependenttrans @*/
-	    *callbackData = opt->descrip;
+	    if (callback && *callback
+	     && callbackData && *callbackData == NULL)
+		*callbackData = opt->descrip;
 /*@=observertrans =dependenttrans @*/
 	    return opt2;
-	} else if (poptArgType(opt) == POPT_ARG_CALLBACK) {
+	}   /*@notreached@*/ /*@switchbreak@*/ break;
+	case POPT_ARG_CALLBACK:
 	    cb = opt;
 	    cbarg.ptr = opt->arg;
-	} else if (longName != NULL && opt->longName != NULL &&
+	    continue;
+	    /*@notreached@*/ /*@switchbreak@*/ break;
+	default:
+	    /*@switchbreak@*/ break;
+	}
+
+	if (longName != NULL && opt->longName != NULL &&
 		   (!LF_ISSET(ONEDASH) || F_ISSET(opt, ONEDASH)) &&
 		   longOptionStrcmp(opt, longName, longNameLen))
 	{
-- 
Gitee


From ffd5cee155d313a1da11ca35a03586032ce05d62 Mon Sep 17 00:00:00 2001
From: Jeff Johnson <n3npq@mac.com>
Date: Sat, 25 Jul 2009 18:52:36 +0000
Subject: [PATCH 588/667] - add POPT_ARG_SHORT handling.

---
 CHANGES      |   1 +
 libpopt.vers |   1 +
 popt.3       |   7 +-
 popt.c       | 178 +++++++++++++++++++++++++++++----------------------
 popt.h       |  19 +++++-
 popthelp.c   |   5 ++
 poptint.h    |   1 +
 test1.c      |  19 ++++--
 testit.sh    |  65 ++++++++++---------
 9 files changed, 183 insertions(+), 113 deletions(-)

diff --git a/CHANGES b/CHANGES
index b453538..a0025e2 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,4 +1,5 @@
 1.15 -> 1.16:
+    - add POPT_ARG_SHORT handling.
     - handle all callback traversals within a C switch (for extendability ease).
     - add popt.pc.
 
diff --git a/libpopt.vers b/libpopt.vers
index a1eea04..b0c08d6 100644
--- a/libpopt.vers
+++ b/libpopt.vers
@@ -35,6 +35,7 @@ LIBPOPT_0
     poptSaveInt;
     poptSaveLong;
     poptSaveLongLong;
+    poptSaveShort;
     poptSaveString;
     poptSetExecPath;
     poptSetOtherOptionHelp;
diff --git a/popt.3 b/popt.3
index 205d913..5d5a556 100644
--- a/popt.3
+++ b/popt.3
@@ -126,6 +126,7 @@ Value	Description	arg Type
 POPT_ARG_NONE	No argument expected	int
 POPT_ARG_STRING	No type checking to be performed	char *
 POPT_ARG_ARGV	No type checking to be performed	char **
+POPT_ARG_SHORT	An short argument is expected	short
 POPT_ARG_INT	An integer argument is expected	int
 POPT_ARG_LONG	A long integer is expected	long
 POPT_ARG_LONGLONG	A long long integer is expected	long long
@@ -164,7 +165,7 @@ will perhaps not escape the attention of hunt-and-peck typists that
 an argument, the variable that 
 .IR arg " points to is updated to reflect the value of the argument." 
 .RB "Any string is acceptable for " POPT_ARG_STRING " and " POPT_ARG_ARGV " arguments, but "
-.BR POPT_ARG_INT ", " POPT_ARG_LONG ", " POPT_ARG_LONGLONG ", " POPT_ARG_FLOAT ", and "
+.BR POPT_ARG_INT ", " POPT_ARG_SHORT ", " POPT_ARG_LONG ", " POPT_ARG_LONGLONG ", " POPT_ARG_FLOAT ", and "
 .BR POPT_ARG_DOUBLE " are converted to the appropriate type, and an "
 error returned if the conversion fails.
 .sp
@@ -474,7 +475,7 @@ A parsed string has a quotation mismatch (such as a single quotation
 A conversion from a string to a number (int or long) failed due
 to the string containing nonnumeric characters. This occurs when
 .BR poptGetNextOpt() " is processing an argument of type " 
-.BR POPT_ARG_INT ", " POPT_ARG_LONG ", " POPT_ARG_LONGLONG ", "
+.BR POPT_ARG_INT ", " POPT_ARG_SHORT ", " POPT_ARG_LONG ", " POPT_ARG_LONGLONG ", "
 .RB POPT_ARG_FLOAT ", or " POPT_ARG_DOUBLE "."  
 .sp
 .TP
@@ -482,7 +483,7 @@ to the string containing nonnumeric characters. This occurs when
 A string-to-number conversion failed because the number was too
 .RB "large or too small. Like " POPT_ERROR_BADNUMBER ", this error 
 .RB "can occur only when " poptGetNextOpt() " is processing an "
-.RB "argument of type " POPT_ARG_INT ", " POPT_ARG_LONG ", " POPT_ARG_LONGLONG ", "
+.RB "argument of type " POPT_ARG_INT ", " POPT_ARG_SHORT ", " POPT_ARG_LONG ", " POPT_ARG_LONGLONG ", "
 .RB POPT_ARG_FLOAT ", or " POPT_ARG_DOUBLE "."  
 .sp
 .TP
diff --git a/popt.c b/popt.c
index 150f824..b697a0d 100644
--- a/popt.c
+++ b/popt.c
@@ -462,13 +462,10 @@ const char * findProgramPath(/*@null@*/ const char * argv0)
     }
 
     /* If no executable was found in PATH, return NULL. */
-    if (!(s && *s) && t != NULL) {
-	free(t);
-	t = NULL;
-    }
+    if (!(s && *s) && t != NULL)
+	t = _free(t);
 /*@-modobserver -observertrans -usedef @*/
-    if (path != NULL)
-        free(path);
+    path = _free(path);
 /*@=modobserver =observertrans =usedef @*/
 
     return t;
@@ -575,7 +572,8 @@ exit:
     return ec;
 }
 
-/*@observer@*/ /*@null@*/ static const struct poptOption *
+/*@observer@*/ /*@null@*/
+static const struct poptOption *
 findOption(const struct poptOption * opt,
 		/*@null@*/ const char * longName, size_t longNameLen,
 		char shortName,
@@ -637,9 +635,9 @@ findOption(const struct poptOption * opt,
     if (callback)
 	*callback = (cb ? cbarg.cb : NULL);
     if (callbackData)
-/*@-observertrans@*/	/* FIX: typedef double indirection. */
+/*@-observertrans -dependenttrans @*/
 	*callbackData = (cb && !CBF_ISSET(cb, INC_DATA) ? cb->descrip : NULL);
-/*@=observertrans@*/
+/*@=observertrans =dependenttrans @*/
 /*@=modobserver =mods @*/
 
     return opt;
@@ -757,8 +755,8 @@ int poptSaveString(const char *** argvp,
 {
     int argc = 0;
 
-    if (argvp == NULL)
-	return -1;
+    if (argvp == NULL || val == NULL)
+	return POPT_ERROR_NULLARG;
 
     /* XXX likely needs an upper bound on argc. */
     if (*argvp != NULL)
@@ -844,18 +842,10 @@ int poptSaveLong(long * arg, unsigned int argInfo, long aLong)
     if (LF_ISSET(NOT))
 	aLong = ~aLong;
     switch (LF_ISSET(LOGICALOPS)) {
-    case 0:
-	*arg = aLong;
-	break;
-    case POPT_ARGFLAG_OR:
-	*(unsigned long *)arg |= (unsigned long)aLong;
-	break;
-    case POPT_ARGFLAG_AND:
-	*(unsigned long *)arg &= (unsigned long)aLong;
-	break;
-    case POPT_ARGFLAG_XOR:
-	*(unsigned long *)arg ^= (unsigned long)aLong;
-	break;
+    case 0:		   *arg = aLong; break;
+    case POPT_ARGFLAG_OR:  *(unsigned long *)arg |= (unsigned long)aLong; break;
+    case POPT_ARGFLAG_AND: *(unsigned long *)arg &= (unsigned long)aLong; break;
+    case POPT_ARGFLAG_XOR: *(unsigned long *)arg ^= (unsigned long)aLong; break;
     default:
 	return POPT_ERROR_BADOPERATION;
 	/*@notreached@*/ break;
@@ -885,20 +875,48 @@ int poptSaveInt(/*@null@*/ int * arg, unsigned int argInfo, long aLong)
     if (LF_ISSET(NOT))
 	aLong = ~aLong;
     switch (LF_ISSET(LOGICALOPS)) {
-    case 0:
-	*arg = (int) aLong;
+    case 0:		   *arg = (int) aLong;				break;
+    case POPT_ARGFLAG_OR:  *(unsigned int *)arg |= (unsigned int) aLong; break;
+    case POPT_ARGFLAG_AND: *(unsigned int *)arg &= (unsigned int) aLong; break;
+    case POPT_ARGFLAG_XOR: *(unsigned int *)arg ^= (unsigned int) aLong; break;
+    default:
+	return POPT_ERROR_BADOPERATION;
+	/*@notreached@*/ break;
+    }
+    return 0;
+}
+
+int poptSaveShort(/*@null@*/ short * arg, unsigned int argInfo, long aLong)
+{
+    /* XXX Check alignment, may fail on funky platforms. */
+    if (arg == NULL || (((unsigned long)arg) & (sizeof(*arg)-1)))
+	return POPT_ERROR_NULLARG;
+
+    if (aLong != 0 && LF_ISSET(RANDOM)) {
+#if defined(HAVE_SRANDOM)
+	if (!seed) {
+	    srandom((unsigned)getpid());
+	    srandom((unsigned)random());
+	}
+	aLong = random() % (aLong > 0 ? aLong : -aLong);
+	aLong++;
+#else
+	/* XXX avoid adding POPT_ERROR_UNIMPLEMENTED to minimize i18n churn. */
+	return POPT_ERROR_BADOPERATION;
+#endif
+    }
+    if (LF_ISSET(NOT))
+	aLong = ~aLong;
+    switch (LF_ISSET(LOGICALOPS)) {
+    case 0:		   *arg = (short) aLong;
 	break;
-    case POPT_ARGFLAG_OR:
-	*(unsigned int *)arg |= (unsigned int) aLong;
+    case POPT_ARGFLAG_OR:  *(unsigned short *)arg |= (unsigned short) aLong;
 	break;
-    case POPT_ARGFLAG_AND:
-	*(unsigned int *)arg &= (unsigned int) aLong;
+    case POPT_ARGFLAG_AND: *(unsigned short *)arg &= (unsigned short) aLong;
 	break;
-    case POPT_ARGFLAG_XOR:
-	*(unsigned int *)arg ^= (unsigned int) aLong;
+    case POPT_ARGFLAG_XOR: *(unsigned short *)arg ^= (unsigned short) aLong;
 	break;
-    default:
-	return POPT_ERROR_BADOPERATION;
+    default: return POPT_ERROR_BADOPERATION;
 	/*@notreached@*/ break;
     }
     return 0;
@@ -944,14 +962,12 @@ static int poptSaveArg(poptContext con, const struct poptOption * opt)
 	/*@modifies con, fileSystem, internalState @*/
 {
     poptArg arg = { .ptr = opt->arg };
+    int rc = 0;		/* assume success */
 
     switch (poptArgType(opt)) {
     case POPT_ARG_ARGV:
 	/* XXX memory leak, application is responsible for free. */
-	if (con->os->nextArg == NULL)
-	    return POPT_ERROR_NULLARG;	/* XXX better return? */
-	if (poptSaveString(arg.ptr, opt->argInfo, con->os->nextArg))
-	    return POPT_ERROR_BADOPERATION;
+	rc = poptSaveString(arg.ptr, opt->argInfo, con->os->nextArg);
 	/*@switchbreak@*/ break;
     case POPT_ARG_STRING:
 	/* XXX memory leak, application is responsible for free. */
@@ -959,75 +975,87 @@ static int poptSaveArg(poptContext con, const struct poptOption * opt)
 	/*@switchbreak@*/ break;
 
     case POPT_ARG_INT:
+    case POPT_ARG_SHORT:
     case POPT_ARG_LONG:
     case POPT_ARG_LONGLONG:
-    {   long long aNUM = 0;
+    {	unsigned int argInfo = poptArgInfo(con, opt);
 	char *end = NULL;
-	unsigned int argInfo = poptArgInfo(con, opt);
+	long long aNUM = 0;
 
 	if (con->os->nextArg) {
 	    aNUM = strtoll(con->os->nextArg, &end, 0);
-	    if (!(end && *end == '\0'))
-		return POPT_ERROR_BADNUMBER;
+	    if (!(end && *end == '\0')) {
+		rc = POPT_ERROR_BADNUMBER;
+		break;
+	    }
 	}
 
+	switch (poptArgType(opt)) {
+	case POPT_ARG_LONGLONG:
 /* XXX let's not demand C99 compiler flags for <limits.h> quite yet. */
 #if !defined(LLONG_MAX)
 #   define LLONG_MAX    9223372036854775807LL
 #   define LLONG_MIN    (-LLONG_MAX - 1LL)
 #endif
-
-	if (poptArgType(opt) == POPT_ARG_LONGLONG) {
-	    if (aNUM == LLONG_MAX || aNUM == LLONG_MIN)
-		return POPT_ERROR_OVERFLOW;
-	    if (poptSaveLongLong(arg.longlongp, argInfo, aNUM))
-		return POPT_ERROR_BADOPERATION;
-	} else
-	if (poptArgType(opt) == POPT_ARG_LONG) {
-	    if (aNUM > (long long)LONG_MAX || aNUM < (long long)LONG_MIN)
-		return POPT_ERROR_OVERFLOW;
-	    if (poptSaveLong(arg.longp, argInfo, (long)aNUM))
-		return POPT_ERROR_BADOPERATION;
-	} else
-	if (poptArgType(opt) == POPT_ARG_INT) {
-	    if (aNUM > (long long)INT_MAX || aNUM < (long long)INT_MIN)
-		return POPT_ERROR_OVERFLOW;
-	    if (poptSaveInt(arg.intp, argInfo, (long)aNUM))
-		return POPT_ERROR_BADOPERATION;
-	} else
-	    return POPT_ERROR_BADOPERATION;
+	    rc = !(aNUM == LLONG_MIN || aNUM == LLONG_MAX)
+		? poptSaveLongLong(arg.longlongp, argInfo, aNUM)
+		: POPT_ERROR_OVERFLOW;
+	    /*@innerbreak@*/ break;
+	case POPT_ARG_LONG:
+	    rc = !(aNUM < (long long)LONG_MIN || aNUM > (long long)LONG_MAX)
+		? poptSaveLong(arg.longp, argInfo, (long)aNUM)
+		: POPT_ERROR_OVERFLOW;
+	    /*@innerbreak@*/ break;
+	case POPT_ARG_INT:
+	    rc = !(aNUM < (long long)INT_MIN || aNUM > (long long)INT_MAX)
+		? poptSaveInt(arg.intp, argInfo, (long)aNUM)
+		: POPT_ERROR_OVERFLOW;
+	    /*@innerbreak@*/ break;
+	case POPT_ARG_SHORT:
+	    rc = !(aNUM < (long long)SHRT_MIN || aNUM > (long long)SHRT_MAX)
+		? poptSaveShort(arg.shortp, argInfo, (long)aNUM)
+		: POPT_ERROR_OVERFLOW;
+	    /*@innerbreak@*/ break;
+	}
     }   /*@switchbreak@*/ break;
 
     case POPT_ARG_FLOAT:
     case POPT_ARG_DOUBLE:
-    {   double aDouble = 0.0;
-	char *end;
+    {	char *end = NULL;
+	double aDouble = 0.0;
 
 	if (con->os->nextArg) {
 /*@-mods@*/
 	    int saveerrno = errno;
 	    errno = 0;
 	    aDouble = strtod(con->os->nextArg, &end);
-	    if (errno == ERANGE)
-		return POPT_ERROR_OVERFLOW;
+	    if (errno == ERANGE) {
+		rc = POPT_ERROR_OVERFLOW;
+		break;
+	    }
 	    errno = saveerrno;
 /*@=mods@*/
-	    if (*end != '\0')
-		return POPT_ERROR_BADNUMBER;
+	    if (*end != '\0') {
+		rc = POPT_ERROR_BADNUMBER;
+		break;
+	    }
 	}
 
-	if (poptArgType(opt) == POPT_ARG_DOUBLE) {
+	switch (poptArgType(opt)) {
+	case POPT_ARG_DOUBLE:
 	    arg.doublep[0] = aDouble;
-	} else {
+	    /*@innerbreak@*/ break;
+	case POPT_ARG_FLOAT:
 #if !defined(DBL_EPSILON) && !defined(__LCLINT__)
 #define DBL_EPSILON 2.2204460492503131e-16
 #endif
 #define POPT_ABS(a)	((((a) - 0.0) < DBL_EPSILON) ? -(a) : (a))
-	    if ((POPT_ABS(aDouble) - FLT_MAX) > DBL_EPSILON)
-		return POPT_ERROR_OVERFLOW;
-	    if ((FLT_MIN - POPT_ABS(aDouble)) > DBL_EPSILON)
-		return POPT_ERROR_OVERFLOW;
-	    arg.floatp[0] = (float) aDouble;
+	    if ((FLT_MIN - POPT_ABS(aDouble)) > DBL_EPSILON
+	     || (POPT_ABS(aDouble) - FLT_MAX) > DBL_EPSILON)
+		rc = POPT_ERROR_OVERFLOW;
+	    else
+		arg.floatp[0] = (float) aDouble;
+	    /*@innerbreak@*/ break;
 	}
     }   /*@switchbreak@*/ break;
     case POPT_ARG_MAINCALL:
@@ -1041,7 +1069,7 @@ static int poptSaveArg(poptContext con, const struct poptOption * opt)
 	exit(EXIT_FAILURE);
 	/*@notreached@*/ /*@switchbreak@*/ break;
     }
-    return 0;
+    return rc;
 }
 
 /* returns 'val' element, -1 on last item, POPT_ERROR_* on error */
diff --git a/popt.h b/popt.h
index bd991a2..278357f 100644
--- a/popt.h
+++ b/popt.h
@@ -37,6 +37,7 @@
 
 #define POPT_ARG_MAINCALL	16U+11U	/*!< EXPERIMENTAL: return (*arg) (argc, argv) */
 #define	POPT_ARG_ARGV		12U	/*!< dupe'd arg appended to realloc'd argv array. */
+#define	POPT_ARG_SHORT		13U	/*!< arg ==> short */
 
 #define POPT_ARG_MASK		0x000000FFU
 #define POPT_GROUP_MASK		0x0000FF00U
@@ -605,7 +606,7 @@ int poptStrippedArgv(poptContext con, int argc, char ** argv)
  * @retval *argvp	argv array
  * @param argInfo	(unused)
  * @param val		string arg to add (using strdup)
- * @return		0 always
+ * @return		0 on success, POPT_ERROR_NULLARG/POPT_ERROR_BADOPERATION
  */
 /*@unused@*/
 int poptSaveString(/*@null@*/ const char *** argvp, unsigned int argInfo,
@@ -645,6 +646,22 @@ int poptSaveLong(/*@null@*/ long * arg, unsigned int argInfo, long aLong)
 	/*@requires maxSet(arg) >= 0 /\ maxRead(arg) == 0 @*/;
 /*@=incondefs@*/
 
+/**
+ * Save a short integer, performing logical operation with value.
+ * @warning Alignment check may be too strict on certain platorms.
+ * @param arg		short pointer, aligned on short boundary.
+ * @param argInfo	logical operation (see POPT_ARGFLAG_*)
+ * @param aLong		value to use
+ * @return		0 on success, POPT_ERROR_NULLARG/POPT_ERROR_BADOPERATION
+ */
+/*@-incondefs@*/
+/*@unused@*/
+int poptSaveShort(/*@null@*/ short * arg, unsigned int argInfo, long aLong)
+	/*@globals internalState @*/
+	/*@modifies *arg, internalState @*/
+	/*@requires maxSet(arg) >= 0 /\ maxRead(arg) == 0 @*/;
+/*@=incondefs@*/
+
 /**
  * Save an integer, performing logical operation with value.
  * @warning Alignment check may be too strict on certain platorms.
diff --git a/popthelp.c b/popthelp.c
index d267f6c..52667cd 100644
--- a/popthelp.c
+++ b/popthelp.c
@@ -204,6 +204,7 @@ getArgDescrip(const struct poptOption * opt,
     case POPT_ARG_VAL:		return NULL;
 #endif
     case POPT_ARG_INT:		return POPT_("INT");
+    case POPT_ARG_SHORT:	return POPT_("SHORT");
     case POPT_ARG_LONG:		return POPT_("LONG");
     case POPT_ARG_LONGLONG:	return POPT_("LONGLONG");
     case POPT_ARG_STRING:	return POPT_("STRING");
@@ -247,6 +248,9 @@ singleOptionDefaultValue(size_t lineLength,
     case POPT_ARG_INT:
 	le += sprintf(le, "%d", arg.intp[0]);
 	break;
+    case POPT_ARG_SHORT:
+	le += sprintf(le, "%hd", arg.shortp[0]);
+	break;
     case POPT_ARG_LONG:
 	le += sprintf(le, "%ld", arg.longp[0]);
 	break;
@@ -422,6 +426,7 @@ static void singleOptionHelp(FILE * fp, columns_t columns,
 #endif
 		break;
 	    case POPT_ARG_INT:
+	    case POPT_ARG_SHORT:
 	    case POPT_ARG_LONG:
 	    case POPT_ARG_LONGLONG:
 	    case POPT_ARG_FLOAT:
diff --git a/poptint.h b/poptint.h
index e92f441..885f56b 100644
--- a/poptint.h
+++ b/poptint.h
@@ -58,6 +58,7 @@ typedef union poptArg_u {
 /*@shared@*/
     void * ptr;
     int * intp;
+    short * shortp;
     long * longp;
     long long * longlongp;
     float * floatp;
diff --git a/test1.c b/test1.c
index 3cf6ab4..c9effd5 100644
--- a/test1.c
+++ b/test1.c
@@ -37,6 +37,10 @@ static unsigned int aFlag = 0x8aceU;
 /*@unchecked@*/
 static unsigned int bFlag = 0x8aceU;
 
+/*@unchecked@*/
+static short aShort = 4523;
+/*@unchecked@*/
+static short bShort = 4523;
 /*@unchecked@*/
 static int aInt = 271828;
 /*@unchecked@*/
@@ -126,6 +130,8 @@ static struct poptOption options[] = {
 
   { "int", 'i', POPT_ARG_INT | POPT_ARGFLAG_SHOW_DEFAULT, &aInt, 0,
 	"POPT_ARG_INT: 271828", NULL },
+  { "short", 's', POPT_ARG_SHORT | POPT_ARGFLAG_SHOW_DEFAULT, &aShort, 0,
+	"POPT_ARG_SHORT: 4523", NULL },
   { "long", 'l', POPT_ARG_LONG | POPT_ARGFLAG_SHOW_DEFAULT, &aLong, 0,
 	"POPT_ARG_LONG: 738905609", NULL },
   { "longlong", 'L', POPT_ARG_LONGLONG | POPT_ARGFLAG_SHOW_DEFAULT, &aLongLong, 0,
@@ -137,6 +143,8 @@ static struct poptOption options[] = {
 
    { "randint", '\0', POPT_ARG_INT|POPT_ARGFLAG_RANDOM, &aInt, 0,
 	"POPT_ARGFLAG_RANDOM: experimental", NULL },
+   { "randshort", '\0', POPT_ARG_SHORT|POPT_ARGFLAG_RANDOM, &aShort, 0,
+	"POPT_ARGFLAG_RANDOM: experimental", NULL },
    { "randlong", '\0', POPT_ARG_LONG|POPT_ARGFLAG_RANDOM, &aLong, 0,
 	"POPT_ARGFLAG_RANDOM: experimental", NULL },
    { "randlonglong", '\0', POPT_ARG_LONGLONG|POPT_ARGFLAG_RANDOM, &aLongLong, 0,
@@ -170,11 +178,11 @@ static struct poptOption options[] = {
 
 static void resetVars(void)
 	/*@globals arg1, arg2, arg3, inc, shortopt,
-		aVal, aFlag, aInt, aLong, aLongLong, aFloat, aDouble, aArgv,
-		oStr, singleDash, pass2 @*/
+		aVal, aFlag, aShort, aInt, aLong, aLongLong, aFloat, aDouble,
+		aArgv, oStr, singleDash, pass2 @*/
 	/*@modifies arg1, arg2, arg3, inc, shortopt,
-		aVal, aFlag, aInt, aLong, aLongLong, aFloat, aDouble, aArgv,
-		oStr, singleDash, pass2 @*/
+		aVal, aFlag, aShort, aInt, aLong, aLongLong, aFloat, aDouble,
+		aArgv, oStr, singleDash, pass2 @*/
 {
     arg1 = 0;
     arg2 = "(none)";
@@ -185,6 +193,7 @@ static void resetVars(void)
     aVal = bVal;
     aFlag = bFlag;
 
+    aShort = bShort;
     aInt = bInt;
     aLong = bLong;
     aLongLong = bLongLong;
@@ -277,6 +286,8 @@ int main(int argc, const char ** argv)
 	fprintf(stdout, " aVal: %d", aVal);
     if (aFlag != bFlag)
 	fprintf(stdout, " aFlag: 0x%x", aFlag);
+    if (aShort != bShort)
+	fprintf(stdout, " aShort: %d", aShort);
     if (aInt != bInt)
 	fprintf(stdout, " aInt: %d", aInt);
     if (aLong != bLong)
diff --git a/testit.sh b/testit.sh
index 0a0ba09..1f833f9 100755
--- a/testit.sh
+++ b/testit.sh
@@ -84,40 +84,43 @@ run test1 "test1 - 31" "arg1: 0 arg2: 'foo bar' rest: boggle" --grabbar boggle
 
 run test1 "test1 - 32" "arg1: 0 arg2: (none) aInt: 123456789" -i 123456789
 run test1 "test1 - 33" "arg1: 0 arg2: (none) aInt: 123456789" --int 123456789
-run test1 "test1 - 34" "arg1: 0 arg2: (none) aLong: 1123456789" -l 1123456789
-run test1 "test1 - 35" "arg1: 0 arg2: (none) aLong: 1123456789" --long 1123456789
-run test1 "test1 - 36" "arg1: 0 arg2: (none) aLongLong: 1111123456789" -L 1111123456789
-run test1 "test1 - 37" "arg1: 0 arg2: (none) aLongLong: 1111123456789" --longlong 1111123456789
-
-run test1 "test1 - 38" "arg1: 0 arg2: (none) aFloat: 10.1" -f 10.1
-run test1 "test1 - 39" "arg1: 0 arg2: (none) aFloat: 10.1" --float 10.1
-run test1 "test1 - 40" "arg1: 0 arg2: (none) aDouble: 10.1" -d 10.1
-run test1 "test1 - 41" "arg1: 0 arg2: (none) aDouble: 10.1" --double 10.1
-
-run test1 "test1 - 42" "arg1: 0 arg2: (none) oStr: (none)" --optional
-run test1 "test1 - 43" "arg1: 0 arg2: (none) oStr: yadda" --optional=yadda
-run test1 "test1 - 44" "arg1: 0 arg2: (none) oStr: yadda" --optional yadda
-run test1 "test1 - 45" "arg1: 0 arg2: (none) oStr: ping rest: pong" --optional=ping pong
-run test1 "test1 - 46" "arg1: 0 arg2: (none) oStr: ping rest: pong" --optional ping pong
-run test1 "test1 - 47" "arg1: 0 arg2: (none) aArgv: A B rest: C" --argv A --argv B C
-
-run test1 "test1 - 48" "arg1: 0 arg2: foo=bar" -2foo=bar
-run test1 "test1 - 49" "arg1: 0 arg2: foo=bar" -2=foo=bar
-
-run test1 "test1 - 50" "arg1: 0 arg2: (none) aFlag: 0xfeed" --bitxor
-run test1 "test1 - 51" "arg1: 0 arg2: (none) aFlag: 0xffff" --bitset
-run test1 "test1 - 52" "arg1: 0 arg2: (none) aFlag: 0x28c" --bitclr
-run test1 "test1 - 53" "arg1: 0 arg2: (none) aFlag: 0x8888" --nobitset
-run test1 "test1 - 54" "arg1: 0 arg2: (none) aFlag: 0xface" --nobitclr
+run test1 "test1 - 34" "arg1: 0 arg2: (none) aShort: 12345" -s 12345
+run test1 "test1 - 35" "arg1: 0 arg2: (none) aShort: 12345" --short 12345
+run test1 "test1 - 36" "arg1: 0 arg2: (none) aLong: 1123456789" -l 1123456789
+run test1 "test1 - 37" "arg1: 0 arg2: (none) aLong: 1123456789" --long 1123456789
+run test1 "test1 - 38" "arg1: 0 arg2: (none) aLongLong: 1111123456789" -L 1111123456789
+run test1 "test1 - 39" "arg1: 0 arg2: (none) aLongLong: 1111123456789" --longlong 1111123456789
+
+run test1 "test1 - 40" "arg1: 0 arg2: (none) aFloat: 10.1" -f 10.1
+run test1 "test1 - 41" "arg1: 0 arg2: (none) aFloat: 10.1" --float 10.1
+run test1 "test1 - 42" "arg1: 0 arg2: (none) aDouble: 10.1" -d 10.1
+run test1 "test1 - 43" "arg1: 0 arg2: (none) aDouble: 10.1" --double 10.1
+
+run test1 "test1 - 44" "arg1: 0 arg2: (none) oStr: (none)" --optional
+run test1 "test1 - 45" "arg1: 0 arg2: (none) oStr: yadda" --optional=yadda
+run test1 "test1 - 46" "arg1: 0 arg2: (none) oStr: yadda" --optional yadda
+run test1 "test1 - 47" "arg1: 0 arg2: (none) oStr: ping rest: pong" --optional=ping pong
+run test1 "test1 - 48" "arg1: 0 arg2: (none) oStr: ping rest: pong" --optional ping pong
+run test1 "test1 - 49" "arg1: 0 arg2: (none) aArgv: A B rest: C" --argv A --argv B C
+
+run test1 "test1 - 50" "arg1: 0 arg2: foo=bar" -2foo=bar
+run test1 "test1 - 51" "arg1: 0 arg2: foo=bar" -2=foo=bar
+
+run test1 "test1 - 52" "arg1: 0 arg2: (none) aFlag: 0xfeed" --bitxor
+run test1 "test1 - 53" "arg1: 0 arg2: (none) aFlag: 0xffff" --bitset
+run test1 "test1 - 54" "arg1: 0 arg2: (none) aFlag: 0x28c" --bitclr
+run test1 "test1 - 55" "arg1: 0 arg2: (none) aFlag: 0x8888" --nobitset
+run test1 "test1 - 56" "arg1: 0 arg2: (none) aFlag: 0xface" --nobitclr
 
 run test1 "test1 - 55" "\
 Usage: lt-test1 [-I?] [-c|--cb2=STRING] [--arg1] [-2|--arg2=ARG]
         [-3|--arg3=ANARG] [-onedash] [--optional=STRING] [--val]
-        [-i|--int=INT] [-l|--long=LONG] [-L|--longlong=LONGLONG]
-        [-f|--float=FLOAT] [-d|--double=DOUBLE] [--randint=INT]
-        [--randlong=LONG] [--randlonglong=LONGLONG] [--argv] [--bitset]
-        [--bitclr] [--bitxor] [--nstr=STRING] [--lstr=STRING] [-I|--inc]
-        [-c|--cb=STRING] [--longopt] [-?|--help] [--usage] [--simple=ARG]" --usage
+        [-i|--int=INT] [-s|--short=SHORT] [-l|--long=LONG]
+        [-L|--longlong=LONGLONG] [-f|--float=FLOAT] [-d|--double=DOUBLE]
+        [--randint=INT] [--randshort=SHORT] [--randlong=LONG]
+        [--randlonglong=LONGLONG] [--argv] [--bitset] [--bitclr] [--bitxor]
+        [--nstr=STRING] [--lstr=STRING] [-I|--inc] [-c|--cb=STRING]
+        [--longopt] [-?|--help] [--usage] [--simple=ARG]" --usage
 
 run test1 "test1 - 56" "\
 Usage: lt-test1 [OPTION...]
@@ -131,12 +134,14 @@ Usage: lt-test1 [OPTION...]
                                   string argument
       --val                       POPT_ARG_VAL: 125992 141421
   -i, --int=INT                   POPT_ARG_INT: 271828 (default: 271828)
+  -s, --short=SHORT               POPT_ARG_SHORT: 4523 (default: 4523)
   -l, --long=LONG                 POPT_ARG_LONG: 738905609 (default: 738905609)
   -L, --longlong=LONGLONG         POPT_ARG_LONGLONG: 738905609 (default:
                                   738905609)
   -f, --float=FLOAT               POPT_ARG_FLOAT: 3.14159 (default: 3.14159)
   -d, --double=DOUBLE             POPT_ARG_DOUBLE: 9.8696 (default: 9.8696)
       --randint=INT               POPT_ARGFLAG_RANDOM: experimental
+      --randshort=SHORT           POPT_ARGFLAG_RANDOM: experimental
       --randlong=LONG             POPT_ARGFLAG_RANDOM: experimental
       --randlonglong=LONGLONG     POPT_ARGFLAG_RANDOM: experimental
       --argv                      POPT_ARG_ARGV: append arg to array (can be
-- 
Gitee


From e28413162e699eac2c318f47a7d635a3464559e3 Mon Sep 17 00:00:00 2001
From: Jeff Johnson <n3npq@mac.com>
Date: Sat, 25 Jul 2009 22:24:29 +0000
Subject: [PATCH 589/667] - add POPT_ARG_BITSET handling.

---
 CHANGES   |   1 +
 lookup3.c | 969 ++++++++++++++++++++++++++++++++++++++++++++++++++++++
 popt.c    | 146 +++++++-
 popt.h    |  52 ++-
 poptint.c |   4 +
 poptint.h |   6 +
 test1.c   |  24 +-
 testit.sh |  17 +-
 8 files changed, 1196 insertions(+), 23 deletions(-)
 create mode 100644 lookup3.c

diff --git a/CHANGES b/CHANGES
index a0025e2..1a0ae46 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,4 +1,5 @@
 1.15 -> 1.16:
+    - add POPT_ARG_BITSET handling.
     - add POPT_ARG_SHORT handling.
     - handle all callback traversals within a C switch (for extendability ease).
     - add popt.pc.
diff --git a/lookup3.c b/lookup3.c
new file mode 100644
index 0000000..0584c39
--- /dev/null
+++ b/lookup3.c
@@ -0,0 +1,969 @@
+/* -------------------------------------------------------------------- */
+/*
+ * lookup3.c, by Bob Jenkins, May 2006, Public Domain.
+ * 
+ * These are functions for producing 32-bit hashes for hash table lookup.
+ * jlu32w(), jlu32l(), jlu32lpair(), jlu32b(), _JLU3_MIX(), and _JLU3_FINAL() 
+ * are externally useful functions.  Routines to test the hash are included 
+ * if SELF_TEST is defined.  You can use this free for any purpose.  It's in
+ * the public domain.  It has no warranty.
+ * 
+ * You probably want to use jlu32l().  jlu32l() and jlu32b()
+ * hash byte arrays.  jlu32l() is is faster than jlu32b() on
+ * little-endian machines.  Intel and AMD are little-endian machines.
+ * On second thought, you probably want jlu32lpair(), which is identical to
+ * jlu32l() except it returns two 32-bit hashes for the price of one.  
+ * You could implement jlu32bpair() if you wanted but I haven't bothered here.
+ * 
+ * If you want to find a hash of, say, exactly 7 integers, do
+ *   a = i1;  b = i2;  c = i3;
+ *   _JLU3_MIX(a,b,c);
+ *   a += i4; b += i5; c += i6;
+ *   _JLU3_MIX(a,b,c);
+ *   a += i7;
+ *   _JLU3_FINAL(a,b,c);
+ * then use c as the hash value.  If you have a variable size array of
+ * 4-byte integers to hash, use jlu32w().  If you have a byte array (like
+ * a character string), use jlu32l().  If you have several byte arrays, or
+ * a mix of things, see the comments above jlu32l().  
+ * 
+ * Why is this so big?  I read 12 bytes at a time into 3 4-byte integers, 
+ * then mix those integers.  This is fast (you can do a lot more thorough
+ * mixing with 12*3 instructions on 3 integers than you can with 3 instructions
+ * on 1 byte), but shoehorning those bytes into integers efficiently is messy.
+*/
+/* -------------------------------------------------------------------- */
+
+#include <stdint.h>
+
+#if defined(_JLU3_SELFTEST)
+# define _JLU3_jlu32w		1
+# define _JLU3_jlu32l		1
+# define _JLU3_jlu32lpair	1
+# define _JLU3_jlu32b		1
+#endif
+
+/*@-redef@*/
+/*@unchecked@*/
+static const union _dbswap {
+    const uint32_t ui;
+    const unsigned char uc[4];
+} endian = { .ui = 0x11223344 };
+# define HASH_LITTLE_ENDIAN	(endian.uc[0] == (unsigned char) 0x44)
+# define HASH_BIG_ENDIAN	(endian.uc[0] == (unsigned char) 0x11)
+/*@=redef@*/
+
+#ifndef ROTL32
+# define ROTL32(x, s) (((x) << (s)) | ((x) >> (32 - (s))))
+#endif
+
+/* NOTE: The _size parameter should be in bytes. */
+#define	_JLU3_INIT(_h, _size)	(0xdeadbeef + ((uint32_t)(_size)) + (_h))
+
+/* -------------------------------------------------------------------- */
+/*
+ * _JLU3_MIX -- mix 3 32-bit values reversibly.
+ * 
+ * This is reversible, so any information in (a,b,c) before _JLU3_MIX() is
+ * still in (a,b,c) after _JLU3_MIX().
+ * 
+ * If four pairs of (a,b,c) inputs are run through _JLU3_MIX(), or through
+ * _JLU3_MIX() in reverse, there are at least 32 bits of the output that
+ * are sometimes the same for one pair and different for another pair.
+ * This was tested for:
+ * * pairs that differed by one bit, by two bits, in any combination
+ *   of top bits of (a,b,c), or in any combination of bottom bits of
+ *   (a,b,c).
+ * * "differ" is defined as +, -, ^, or ~^.  For + and -, I transformed
+ *   the output delta to a Gray code (a^(a>>1)) so a string of 1's (as
+ *   is commonly produced by subtraction) look like a single 1-bit
+ *   difference.
+ * * the base values were pseudorandom, all zero but one bit set, or 
+ *   all zero plus a counter that starts at zero.
+ * 
+ * Some k values for my "a-=c; a^=ROTL32(c,k); c+=b;" arrangement that
+ * satisfy this are
+ *     4  6  8 16 19  4
+ *     9 15  3 18 27 15
+ *    14  9  3  7 17  3
+ * Well, "9 15 3 18 27 15" didn't quite get 32 bits diffing
+ * for "differ" defined as + with a one-bit base and a two-bit delta.  I
+ * used http://burtleburtle.net/bob/hash/avalanche.html to choose 
+ * the operations, constants, and arrangements of the variables.
+ * 
+ * This does not achieve avalanche.  There are input bits of (a,b,c)
+ * that fail to affect some output bits of (a,b,c), especially of a.  The
+ * most thoroughly mixed value is c, but it doesn't really even achieve
+ * avalanche in c.
+ * 
+ * This allows some parallelism.  Read-after-writes are good at doubling
+ * the number of bits affected, so the goal of mixing pulls in the opposite
+ * direction as the goal of parallelism.  I did what I could.  Rotates
+ * seem to cost as much as shifts on every machine I could lay my hands
+ * on, and rotates are much kinder to the top and bottom bits, so I used
+ * rotates.
+ */
+/* -------------------------------------------------------------------- */
+#define _JLU3_MIX(a,b,c) \
+{ \
+  a -= c;  a ^= ROTL32(c, 4);  c += b; \
+  b -= a;  b ^= ROTL32(a, 6);  a += c; \
+  c -= b;  c ^= ROTL32(b, 8);  b += a; \
+  a -= c;  a ^= ROTL32(c,16);  c += b; \
+  b -= a;  b ^= ROTL32(a,19);  a += c; \
+  c -= b;  c ^= ROTL32(b, 4);  b += a; \
+}
+
+/* -------------------------------------------------------------------- */
+/**
+ * _JLU3_FINAL -- final mixing of 3 32-bit values (a,b,c) into c
+ * 
+ * Pairs of (a,b,c) values differing in only a few bits will usually
+ * produce values of c that look totally different.  This was tested for
+ * * pairs that differed by one bit, by two bits, in any combination
+ *   of top bits of (a,b,c), or in any combination of bottom bits of
+ *   (a,b,c).
+ * * "differ" is defined as +, -, ^, or ~^.  For + and -, I transformed
+ *   the output delta to a Gray code (a^(a>>1)) so a string of 1's (as
+ *   is commonly produced by subtraction) look like a single 1-bit
+ *   difference.
+ * * the base values were pseudorandom, all zero but one bit set, or 
+ *   all zero plus a counter that starts at zero.
+ * 
+ * These constants passed:
+ *  14 11 25 16 4 14 24
+ *  12 14 25 16 4 14 24
+ * and these came close:
+ *   4  8 15 26 3 22 24
+ *  10  8 15 26 3 22 24
+ *  11  8 15 26 3 22 24
+ */
+/* -------------------------------------------------------------------- */
+#define _JLU3_FINAL(a,b,c) \
+{ \
+  c ^= b; c -= ROTL32(b,14); \
+  a ^= c; a -= ROTL32(c,11); \
+  b ^= a; b -= ROTL32(a,25); \
+  c ^= b; c -= ROTL32(b,16); \
+  a ^= c; a -= ROTL32(c,4);  \
+  b ^= a; b -= ROTL32(a,14); \
+  c ^= b; c -= ROTL32(b,24); \
+}
+
+#if defined(_JLU3_jlu32w)
+uint32_t jlu32w(uint32_t h, /*@null@*/ const uint32_t *k, size_t size)
+	/*@*/;
+/* -------------------------------------------------------------------- */
+/**
+ *  This works on all machines.  To be useful, it requires
+ *  -- that the key be an array of uint32_t's, and
+ *  -- that the size be the number of uint32_t's in the key
+ * 
+ *  The function jlu32w() is identical to jlu32l() on little-endian
+ *  machines, and identical to jlu32b() on big-endian machines,
+ *  except that the size has to be measured in uint32_ts rather than in
+ *  bytes.  jlu32l() is more complicated than jlu32w() only because
+ *  jlu32l() has to dance around fitting the key bytes into registers.
+ *
+ * @param h		the previous hash, or an arbitrary value
+ * @param *k		the key, an array of uint32_t values
+ * @param size		the size of the key, in uint32_ts
+ * @return		the lookup3 hash
+ */
+/* -------------------------------------------------------------------- */
+uint32_t jlu32w(uint32_t h, const uint32_t *k, size_t size)
+{
+    uint32_t a = _JLU3_INIT(h, (size * sizeof(*k)));
+    uint32_t b = a;
+    uint32_t c = a;
+
+    if (k == NULL)
+	goto exit;
+
+    /*----------------------------------------------- handle most of the key */
+    while (size > 3) {
+	a += k[0];
+	b += k[1];
+	c += k[2];
+	_JLU3_MIX(a,b,c);
+	size -= 3;
+	k += 3;
+    }
+
+    /*----------------------------------------- handle the last 3 uint32_t's */
+    switch (size) {
+    case 3 : c+=k[2];
+    case 2 : b+=k[1];
+    case 1 : a+=k[0];
+	_JLU3_FINAL(a,b,c);
+	/*@fallthrough@*/
+    case 0:
+	break;
+    }
+    /*---------------------------------------------------- report the result */
+exit:
+    return c;
+}
+#endif	/* defined(_JLU3_jlu32w) */
+
+#if defined(_JLU3_jlu32l)
+uint32_t jlu32l(uint32_t h, const void *key, size_t size)
+	/*@*/;
+/* -------------------------------------------------------------------- */
+/*
+ * jlu32l() -- hash a variable-length key into a 32-bit value
+ *   h       : can be any 4-byte value
+ *   k       : the key (the unaligned variable-length array of bytes)
+ *   size    : the size of the key, counting by bytes
+ * Returns a 32-bit value.  Every bit of the key affects every bit of
+ * the return value.  Two keys differing by one or two bits will have
+ * totally different hash values.
+ * 
+ * The best hash table sizes are powers of 2.  There is no need to do
+ * mod a prime (mod is sooo slow!).  If you need less than 32 bits,
+ * use a bitmask.  For example, if you need only 10 bits, do
+ *   h = (h & hashmask(10));
+ * In which case, the hash table should have hashsize(10) elements.
+ * 
+ * If you are hashing n strings (uint8_t **)k, do it like this:
+ *   for (i=0, h=0; i<n; ++i) h = jlu32l(h, k[i], len[i]);
+ * 
+ * By Bob Jenkins, 2006.  bob_jenkins@burtleburtle.net.  You may use this
+ * code any way you wish, private, educational, or commercial.  It's free.
+ * 
+ * Use for hash table lookup, or anything where one collision in 2^^32 is
+ * acceptable.  Do NOT use for cryptographic purposes.
+ *
+ * @param h		the previous hash, or an arbitrary value
+ * @param *k		the key, an array of uint8_t values
+ * @param size		the size of the key
+ * @return		the lookup3 hash
+ */
+/* -------------------------------------------------------------------- */
+uint32_t jlu32l(uint32_t h, const void *key, size_t size)
+{
+    union { const void *ptr; size_t i; } u;
+    uint32_t a = _JLU3_INIT(h, size);
+    uint32_t b = a;
+    uint32_t c = a;
+
+    if (key == NULL)
+	goto exit;
+
+    u.ptr = key;
+    if (HASH_LITTLE_ENDIAN && ((u.i & 0x3) == 0)) {
+	const uint32_t *k = (const uint32_t *)key;	/* read 32-bit chunks */
+#ifdef	VALGRIND
+	const uint8_t  *k8;
+#endif
+
+    /*------ all but last block: aligned reads and affect 32 bits of (a,b,c) */
+	while (size > 12) {
+	    a += k[0];
+	    b += k[1];
+	    c += k[2];
+	    _JLU3_MIX(a,b,c);
+	    size -= 12;
+	    k += 3;
+	}
+
+	/*------------------------- handle the last (probably partial) block */
+	/* 
+	 * "k[2]&0xffffff" actually reads beyond the end of the string, but
+	 * then masks off the part it's not allowed to read.  Because the
+	 * string is aligned, the masked-off tail is in the same word as the
+	 * rest of the string.  Every machine with memory protection I've seen
+	 * does it on word boundaries, so is OK with this.  But VALGRIND will
+	 * still catch it and complain.  The masking trick does make the hash
+	 * noticably faster for short strings (like English words).
+	 */
+#ifndef VALGRIND
+
+	switch (size) {
+	case 12:	c += k[2]; b+=k[1]; a+=k[0]; break;
+	case 11:	c += k[2]&0xffffff; b+=k[1]; a+=k[0]; break;
+	case 10:	c += k[2]&0xffff; b+=k[1]; a+=k[0]; break;
+	case  9:	c += k[2]&0xff; b+=k[1]; a+=k[0]; break;
+	case  8:	b += k[1]; a+=k[0]; break;
+	case  7:	b += k[1]&0xffffff; a+=k[0]; break;
+	case  6:	b += k[1]&0xffff; a+=k[0]; break;
+	case  5:	b += k[1]&0xff; a+=k[0]; break;
+	case  4:	a += k[0]; break;
+	case  3:	a += k[0]&0xffffff; break;
+	case  2:	a += k[0]&0xffff; break;
+	case  1:	a += k[0]&0xff; break;
+	case  0:	goto exit;
+	}
+
+#else /* make valgrind happy */
+
+	k8 = (const uint8_t *)k;
+	switch (size) {
+	case 12:	c += k[2]; b+=k[1]; a+=k[0]	break;
+	case 11:	c += ((uint32_t)k8[10])<<16;	/*@fallthrough@*/
+	case 10:	c += ((uint32_t)k8[9])<<8;	/*@fallthrough@*/
+	case  9:	c += k8[8];			/*@fallthrough@*/
+	case  8:	b += k[1]; a+=k[0];		break;
+	case  7:	b += ((uint32_t)k8[6])<<16;	/*@fallthrough@*/
+	case  6:	b += ((uint32_t)k8[5])<<8;	/*@fallthrough@*/
+	case  5:	b += k8[4];			/*@fallthrough@*/
+	case  4:	a += k[0];			break;
+	case  3:	a += ((uint32_t)k8[2])<<16;	/*@fallthrough@*/
+	case  2:	a += ((uint32_t)k8[1])<<8;	/*@fallthrough@*/
+	case  1:	a += k8[0];			break;
+	case  0:	goto exit;
+	}
+
+#endif /* !valgrind */
+
+    } else if (HASH_LITTLE_ENDIAN && ((u.i & 0x1) == 0)) {
+	const uint16_t *k = (const uint16_t *)key;	/* read 16-bit chunks */
+	const uint8_t  *k8;
+
+	/*----------- all but last block: aligned reads and different mixing */
+	while (size > 12) {
+	    a += k[0] + (((uint32_t)k[1])<<16);
+	    b += k[2] + (((uint32_t)k[3])<<16);
+	    c += k[4] + (((uint32_t)k[5])<<16);
+	    _JLU3_MIX(a,b,c);
+	    size -= 12;
+	    k += 6;
+	}
+
+	/*------------------------- handle the last (probably partial) block */
+	k8 = (const uint8_t *)k;
+	switch (size) {
+	case 12:
+	    c += k[4]+(((uint32_t)k[5])<<16);
+	    b += k[2]+(((uint32_t)k[3])<<16);
+	    a += k[0]+(((uint32_t)k[1])<<16);
+	    break;
+	case 11:
+	    c += ((uint32_t)k8[10])<<16;
+	    /*@fallthrough@*/
+	case 10:
+	    c += (uint32_t)k[4];
+	    b += k[2]+(((uint32_t)k[3])<<16);
+	    a += k[0]+(((uint32_t)k[1])<<16);
+	    break;
+	case  9:
+	    c += (uint32_t)k8[8];
+	    /*@fallthrough@*/
+	case  8:
+	    b += k[2]+(((uint32_t)k[3])<<16);
+	    a += k[0]+(((uint32_t)k[1])<<16);
+	    break;
+	case  7:
+	    b += ((uint32_t)k8[6])<<16;
+	    /*@fallthrough@*/
+	case  6:
+	    b += (uint32_t)k[2];
+	    a += k[0]+(((uint32_t)k[1])<<16);
+	    break;
+	case  5:
+	    b += (uint32_t)k8[4];
+	    /*@fallthrough@*/
+	case  4:
+	    a += k[0]+(((uint32_t)k[1])<<16);
+	    break;
+	case  3:
+	    a += ((uint32_t)k8[2])<<16;
+	    /*@fallthrough@*/
+	case  2:
+	    a += (uint32_t)k[0];
+	    break;
+	case  1:
+	    a += (uint32_t)k8[0];
+	    break;
+	case  0:
+	    goto exit;
+	}
+
+    } else {		/* need to read the key one byte at a time */
+	const uint8_t *k = (const uint8_t *)key;
+
+	/*----------- all but the last block: affect some 32 bits of (a,b,c) */
+	while (size > 12) {
+	    a += (uint32_t)k[0];
+	    a += ((uint32_t)k[1])<<8;
+	    a += ((uint32_t)k[2])<<16;
+	    a += ((uint32_t)k[3])<<24;
+	    b += (uint32_t)k[4];
+	    b += ((uint32_t)k[5])<<8;
+	    b += ((uint32_t)k[6])<<16;
+	    b += ((uint32_t)k[7])<<24;
+	    c += (uint32_t)k[8];
+	    c += ((uint32_t)k[9])<<8;
+	    c += ((uint32_t)k[10])<<16;
+	    c += ((uint32_t)k[11])<<24;
+	    _JLU3_MIX(a,b,c);
+	    size -= 12;
+	    k += 12;
+	}
+
+	/*---------------------------- last block: affect all 32 bits of (c) */
+	switch (size) {
+	case 12:	c += ((uint32_t)k[11])<<24;	/*@fallthrough@*/
+	case 11:	c += ((uint32_t)k[10])<<16;	/*@fallthrough@*/
+	case 10:	c += ((uint32_t)k[9])<<8;	/*@fallthrough@*/
+	case  9:	c += (uint32_t)k[8];		/*@fallthrough@*/
+	case  8:	b += ((uint32_t)k[7])<<24;	/*@fallthrough@*/
+	case  7:	b += ((uint32_t)k[6])<<16;	/*@fallthrough@*/
+	case  6:	b += ((uint32_t)k[5])<<8;	/*@fallthrough@*/
+	case  5:	b += (uint32_t)k[4];		/*@fallthrough@*/
+	case  4:	a += ((uint32_t)k[3])<<24;	/*@fallthrough@*/
+	case  3:	a += ((uint32_t)k[2])<<16;	/*@fallthrough@*/
+	case  2:	a += ((uint32_t)k[1])<<8;	/*@fallthrough@*/
+	case  1:	a += (uint32_t)k[0];
+	    break;
+	case  0:
+	    goto exit;
+	}
+    }
+
+    _JLU3_FINAL(a,b,c);
+
+exit:
+    return c;
+}
+#endif	/* defined(_JLU3_jlu32l) */
+
+#if defined(_JLU3_jlu32lpair)
+/**
+ * jlu32lpair: return 2 32-bit hash values.
+ *
+ * This is identical to jlu32l(), except it returns two 32-bit hash
+ * values instead of just one.  This is good enough for hash table
+ * lookup with 2^^64 buckets, or if you want a second hash if you're not
+ * happy with the first, or if you want a probably-unique 64-bit ID for
+ * the key.  *pc is better mixed than *pb, so use *pc first.  If you want
+ * a 64-bit value do something like "*pc + (((uint64_t)*pb)<<32)".
+ *
+ * @param h		the previous hash, or an arbitrary value
+ * @param *key		the key, an array of uint8_t values
+ * @param size		the size of the key in bytes
+ * @retval *pc,		IN: primary initval, OUT: primary hash
+ * *retval *pb		IN: secondary initval, OUT: secondary hash
+ */
+void jlu32lpair(const void *key, size_t size, uint32_t *pc, uint32_t *pb)
+{
+    union { const void *ptr; size_t i; } u;
+    uint32_t a = _JLU3_INIT(*pc, size);
+    uint32_t b = a;
+    uint32_t c = a;
+
+    if (key == NULL)
+	goto exit;
+
+    c += *pb;	/* Add the secondary hash. */
+
+    u.ptr = key;
+    if (HASH_LITTLE_ENDIAN && ((u.i & 0x3) == 0)) {
+	const uint32_t *k = (const uint32_t *)key;	/* read 32-bit chunks */
+#ifdef	VALGRIND
+	const uint8_t  *k8;
+#endif
+
+	/*-- all but last block: aligned reads and affect 32 bits of (a,b,c) */
+	while (size > (size_t)12) {
+	    a += k[0];
+	    b += k[1];
+	    c += k[2];
+	    _JLU3_MIX(a,b,c);
+	    size -= 12;
+	    k += 3;
+	}
+	/*------------------------- handle the last (probably partial) block */
+	/* 
+	 * "k[2]&0xffffff" actually reads beyond the end of the string, but
+	 * then masks off the part it's not allowed to read.  Because the
+	 * string is aligned, the masked-off tail is in the same word as the
+	 * rest of the string.  Every machine with memory protection I've seen
+	 * does it on word boundaries, so is OK with this.  But VALGRIND will
+	 * still catch it and complain.  The masking trick does make the hash
+	 * noticably faster for short strings (like English words).
+	 */
+#ifndef VALGRIND
+
+	switch (size) {
+	case 12:	c += k[2]; b+=k[1]; a+=k[0]; break;
+	case 11:	c += k[2]&0xffffff; b+=k[1]; a+=k[0]; break;
+	case 10:	c += k[2]&0xffff; b+=k[1]; a+=k[0]; break;
+	case  9:	c += k[2]&0xff; b+=k[1]; a+=k[0]; break;
+	case  8:	b += k[1]; a+=k[0]; break;
+	case  7:	b += k[1]&0xffffff; a+=k[0]; break;
+	case  6:	b += k[1]&0xffff; a+=k[0]; break;
+	case  5:	b += k[1]&0xff; a+=k[0]; break;
+	case  4:	a += k[0]; break;
+	case  3:	a += k[0]&0xffffff; break;
+	case  2:	a += k[0]&0xffff; break;
+	case  1:	a += k[0]&0xff; break;
+	case  0:	goto exit;
+	}
+
+#else /* make valgrind happy */
+
+	k8 = (const uint8_t *)k;
+	switch (size) {
+	case 12:	c += k[2]; b+=k[1]; a+=k[0];	break;
+	case 11:	c += ((uint32_t)k8[10])<<16;	/*@fallthrough@*/
+	case 10:	c += ((uint32_t)k8[9])<<8;	/*@fallthrough@*/
+	case  9:	c += k8[8];			/*@fallthrough@*/
+	case  8:	b += k[1]; a+=k[0];		break;
+	case  7:	b += ((uint32_t)k8[6])<<16;	/*@fallthrough@*/
+	case  6:	b += ((uint32_t)k8[5])<<8;	/*@fallthrough@*/
+	case  5:	b += k8[4];			/*@fallthrough@*/
+	case  4:	a += k[0];			break;
+	case  3:	a += ((uint32_t)k8[2])<<16;	/*@fallthrough@*/
+	case  2:	a += ((uint32_t)k8[1])<<8;	/*@fallthrough@*/
+	case  1:	a += k8[0];			break;
+	case  0:	goto exit;
+	}
+
+#endif /* !valgrind */
+
+    } else if (HASH_LITTLE_ENDIAN && ((u.i & 0x1) == 0)) {
+	const uint16_t *k = (const uint16_t *)key;	/* read 16-bit chunks */
+	const uint8_t  *k8;
+
+	/*----------- all but last block: aligned reads and different mixing */
+	while (size > (size_t)12) {
+	    a += k[0] + (((uint32_t)k[1])<<16);
+	    b += k[2] + (((uint32_t)k[3])<<16);
+	    c += k[4] + (((uint32_t)k[5])<<16);
+	    _JLU3_MIX(a,b,c);
+	    size -= 12;
+	    k += 6;
+	}
+
+	/*------------------------- handle the last (probably partial) block */
+	k8 = (const uint8_t *)k;
+	switch (size) {
+	case 12:
+	    c += k[4]+(((uint32_t)k[5])<<16);
+	    b += k[2]+(((uint32_t)k[3])<<16);
+	    a += k[0]+(((uint32_t)k[1])<<16);
+	    break;
+	case 11:
+	    c += ((uint32_t)k8[10])<<16;
+	    /*@fallthrough@*/
+	case 10:
+	    c += k[4];
+	    b += k[2]+(((uint32_t)k[3])<<16);
+	    a += k[0]+(((uint32_t)k[1])<<16);
+	    break;
+	case  9:
+	    c += k8[8];
+	    /*@fallthrough@*/
+	case  8:
+	    b += k[2]+(((uint32_t)k[3])<<16);
+	    a += k[0]+(((uint32_t)k[1])<<16);
+	    break;
+	case  7:
+	    b += ((uint32_t)k8[6])<<16;
+	    /*@fallthrough@*/
+	case  6:
+	    b += k[2];
+	    a += k[0]+(((uint32_t)k[1])<<16);
+	    break;
+	case  5:
+	    b += k8[4];
+	    /*@fallthrough@*/
+	case  4:
+	    a += k[0]+(((uint32_t)k[1])<<16);
+	    break;
+	case  3:
+	    a += ((uint32_t)k8[2])<<16;
+	    /*@fallthrough@*/
+	case  2:
+	    a += k[0];
+	    break;
+	case  1:
+	    a += k8[0];
+	    break;
+	case  0:
+	    goto exit;
+	}
+
+    } else {		/* need to read the key one byte at a time */
+	const uint8_t *k = (const uint8_t *)key;
+
+	/*----------- all but the last block: affect some 32 bits of (a,b,c) */
+	while (size > (size_t)12) {
+	    a += k[0];
+	    a += ((uint32_t)k[1])<<8;
+	    a += ((uint32_t)k[2])<<16;
+	    a += ((uint32_t)k[3])<<24;
+	    b += k[4];
+	    b += ((uint32_t)k[5])<<8;
+	    b += ((uint32_t)k[6])<<16;
+	    b += ((uint32_t)k[7])<<24;
+	    c += k[8];
+	    c += ((uint32_t)k[9])<<8;
+	    c += ((uint32_t)k[10])<<16;
+	    c += ((uint32_t)k[11])<<24;
+	    _JLU3_MIX(a,b,c);
+	    size -= 12;
+	    k += 12;
+	}
+
+	/*---------------------------- last block: affect all 32 bits of (c) */
+	switch (size) {
+	case 12:	c += ((uint32_t)k[11])<<24;	/*@fallthrough@*/
+	case 11:	c += ((uint32_t)k[10])<<16;	/*@fallthrough@*/
+	case 10:	c += ((uint32_t)k[9])<<8;	/*@fallthrough@*/
+	case  9:	c += k[8];			/*@fallthrough@*/
+	case  8:	b += ((uint32_t)k[7])<<24;	/*@fallthrough@*/
+	case  7:	b += ((uint32_t)k[6])<<16;	/*@fallthrough@*/
+	case  6:	b += ((uint32_t)k[5])<<8;	/*@fallthrough@*/
+	case  5:	b += k[4];			/*@fallthrough@*/
+	case  4:	a += ((uint32_t)k[3])<<24;	/*@fallthrough@*/
+	case  3:	a += ((uint32_t)k[2])<<16;	/*@fallthrough@*/
+	case  2:	a += ((uint32_t)k[1])<<8;	/*@fallthrough@*/
+	case  1:	a += k[0];
+	    break;
+	case  0:
+	    goto exit;
+	}
+    }
+
+    _JLU3_FINAL(a,b,c);
+
+exit:
+    *pc = c;
+    *pb = b;
+    return;
+}
+#endif	/* defined(_JLU3_jlu32lpair) */
+
+#if defined(_JLU3_jlu32b)
+uint32_t jlu32b(uint32_t h, /*@null@*/ const void *key, size_t size)
+	/*@*/;
+/*
+ * jlu32b():
+ * This is the same as jlu32w() on big-endian machines.  It is different
+ * from jlu32l() on all machines.  jlu32b() takes advantage of
+ * big-endian byte ordering. 
+ *
+ * @param h		the previous hash, or an arbitrary value
+ * @param *k		the key, an array of uint8_t values
+ * @param size		the size of the key
+ * @return		the lookup3 hash
+ */
+uint32_t jlu32b(uint32_t h, const void *key, size_t size)
+{
+    union { const void *ptr; size_t i; } u;
+    uint32_t a = _JLU3_INIT(h, size);
+    uint32_t b = a;
+    uint32_t c = a;
+
+    if (key == NULL)
+	return h;
+
+    u.ptr = key;
+    if (HASH_BIG_ENDIAN && ((u.i & 0x3) == 0)) {
+	const uint32_t *k = (const uint32_t *)key;	/* read 32-bit chunks */
+#ifdef	VALGRIND
+	const uint8_t  *k8;
+#endif
+
+	/*-- all but last block: aligned reads and affect 32 bits of (a,b,c) */
+	while (size > 12) {
+	    a += k[0];
+	    b += k[1];
+	    c += k[2];
+	    _JLU3_MIX(a,b,c);
+	    size -= 12;
+	    k += 3;
+	}
+
+	/*------------------------- handle the last (probably partial) block */
+	/* 
+	 * "k[2]<<8" actually reads beyond the end of the string, but
+	 * then shifts out the part it's not allowed to read.  Because the
+	 * string is aligned, the illegal read is in the same word as the
+	 * rest of the string.  Every machine with memory protection I've seen
+	 * does it on word boundaries, so is OK with this.  But VALGRIND will
+	 * still catch it and complain.  The masking trick does make the hash
+	 * noticably faster for short strings (like English words).
+	 */
+#ifndef VALGRIND
+
+	switch (size) {
+	case 12:	c += k[2]; b+=k[1]; a+=k[0]; break;
+	case 11:	c += k[2]&0xffffff00; b+=k[1]; a+=k[0]; break;
+	case 10:	c += k[2]&0xffff0000; b+=k[1]; a+=k[0]; break;
+	case  9:	c += k[2]&0xff000000; b+=k[1]; a+=k[0]; break;
+	case  8:	b += k[1]; a+=k[0]; break;
+	case  7:	b += k[1]&0xffffff00; a+=k[0]; break;
+	case  6:	b += k[1]&0xffff0000; a+=k[0]; break;
+	case  5:	b += k[1]&0xff000000; a+=k[0]; break;
+	case  4:	a += k[0]; break;
+	case  3:	a += k[0]&0xffffff00; break;
+	case  2:	a += k[0]&0xffff0000; break;
+	case  1:	a += k[0]&0xff000000; break;
+	case  0:	goto exit;
+    }
+
+#else  /* make valgrind happy */
+
+	k8 = (const uint8_t *)k;
+	switch (size) {	/* all the case statements fall through */
+	case 12:	c += k[2]; b+=k[1]; a+=k[0];	break;
+	case 11:	c += ((uint32_t)k8[10])<<8;	/*@fallthrough@*/
+	case 10:	c += ((uint32_t)k8[9])<<16;	/*@fallthrough@*/
+	case  9:	c += ((uint32_t)k8[8])<<24;	/*@fallthrough@*/
+	case  8:	b += k[1]; a+=k[0];		break;
+	case  7:	b += ((uint32_t)k8[6])<<8;	/*@fallthrough@*/
+	case  6:	b += ((uint32_t)k8[5])<<16;	/*@fallthrough@*/
+	case  5:	b += ((uint32_t)k8[4])<<24;	/*@fallthrough@*/
+	case  4:	a += k[0];			break;
+	case  3:	a += ((uint32_t)k8[2])<<8;	/*@fallthrough@*/
+	case  2:	a += ((uint32_t)k8[1])<<16;	/*@fallthrough@*/
+	case  1:	a += ((uint32_t)k8[0])<<24;	break;
+	case  0:	goto exit;
+    }
+
+#endif /* !VALGRIND */
+
+    } else {                        /* need to read the key one byte at a time */
+	const uint8_t *k = (const uint8_t *)key;
+
+	/*----------- all but the last block: affect some 32 bits of (a,b,c) */
+	while (size > 12) {
+	    a += ((uint32_t)k[0])<<24;
+	    a += ((uint32_t)k[1])<<16;
+	    a += ((uint32_t)k[2])<<8;
+	    a += ((uint32_t)k[3]);
+	    b += ((uint32_t)k[4])<<24;
+	    b += ((uint32_t)k[5])<<16;
+	    b += ((uint32_t)k[6])<<8;
+	    b += ((uint32_t)k[7]);
+	    c += ((uint32_t)k[8])<<24;
+	    c += ((uint32_t)k[9])<<16;
+	    c += ((uint32_t)k[10])<<8;
+	    c += ((uint32_t)k[11]);
+	    _JLU3_MIX(a,b,c);
+	    size -= 12;
+	    k += 12;
+	}
+
+	/*---------------------------- last block: affect all 32 bits of (c) */
+	switch (size) {	/* all the case statements fall through */
+	case 12:	c += k[11];			/*@fallthrough@*/
+	case 11:	c += ((uint32_t)k[10])<<8;	/*@fallthrough@*/
+	case 10:	c += ((uint32_t)k[9])<<16;	/*@fallthrough@*/
+	case  9:	c += ((uint32_t)k[8])<<24;	/*@fallthrough@*/
+	case  8:	b += k[7];			/*@fallthrough@*/
+	case  7:	b += ((uint32_t)k[6])<<8;	/*@fallthrough@*/
+	case  6:	b += ((uint32_t)k[5])<<16;	/*@fallthrough@*/
+	case  5:	b += ((uint32_t)k[4])<<24;	/*@fallthrough@*/
+	case  4:	a += k[3];			/*@fallthrough@*/
+	case  3:	a += ((uint32_t)k[2])<<8;	/*@fallthrough@*/
+	case  2:	a += ((uint32_t)k[1])<<16;	/*@fallthrough@*/
+	case  1:	a += ((uint32_t)k[0])<<24;	/*@fallthrough@*/
+	    break;
+	case  0:
+	    goto exit;
+	}
+    }
+
+    _JLU3_FINAL(a,b,c);
+
+exit:
+    return c;
+}
+#endif	/* defined(_JLU3_jlu32b) */
+
+#if defined(_JLU3_SELFTEST)
+
+/* used for timings */
+static void driver1(void)
+	/*@*/
+{
+    uint8_t buf[256];
+    uint32_t i;
+    uint32_t h=0;
+    time_t a,z;
+
+    time(&a);
+    for (i=0; i<256; ++i) buf[i] = 'x';
+    for (i=0; i<1; ++i) {
+	h = jlu32l(h, &buf[0], sizeof(buf[0]));
+    }
+    time(&z);
+    if (z-a > 0) printf("time %d %.8x\n", (int)(z-a), h);
+}
+
+/* check that every input bit changes every output bit half the time */
+#define HASHSTATE 1
+#define HASHLEN   1
+#define MAXPAIR 60
+#define MAXLEN  70
+static void driver2(void)
+	/*@*/
+{
+    uint8_t qa[MAXLEN+1], qb[MAXLEN+2], *a = &qa[0], *b = &qb[1];
+    uint32_t c[HASHSTATE], d[HASHSTATE], i=0, j=0, k, l, m=0, z;
+    uint32_t e[HASHSTATE],f[HASHSTATE],g[HASHSTATE],h[HASHSTATE];
+    uint32_t x[HASHSTATE],y[HASHSTATE];
+    uint32_t hlen;
+
+    printf("No more than %d trials should ever be needed \n",MAXPAIR/2);
+    for (hlen=0; hlen < MAXLEN; ++hlen) {
+	z=0;
+	for (i=0; i<hlen; ++i) {	/*-------------- for each input byte, */
+	    for (j=0; j<8; ++j) {	/*--------------- for each input bit, */
+		for (m=1; m<8; ++m) {	/*--- for serveral possible initvals, */
+		    for (l=0; l<HASHSTATE; ++l)
+			e[l]=f[l]=g[l]=h[l]=x[l]=y[l]=~((uint32_t)0);
+
+		    /* check that every output bit is affected by that input bit */
+		    for (k=0; k<MAXPAIR; k+=2) { 
+			uint32_t finished=1;
+			/* keys have one bit different */
+			for (l=0; l<hlen+1; ++l) {a[l] = b[l] = (uint8_t)0;}
+			/* have a and b be two keys differing in only one bit */
+			a[i] ^= (k<<j);
+			a[i] ^= (k>>(8-j));
+			c[0] = jlu32l(m, a, hlen);
+			b[i] ^= ((k+1)<<j);
+			b[i] ^= ((k+1)>>(8-j));
+			d[0] = jlu32l(m, b, hlen);
+			/* check every bit is 1, 0, set, and not set at least once */
+			for (l=0; l<HASHSTATE; ++l) {
+			    e[l] &= (c[l]^d[l]);
+			    f[l] &= ~(c[l]^d[l]);
+			    g[l] &= c[l];
+			    h[l] &= ~c[l];
+			    x[l] &= d[l];
+			    y[l] &= ~d[l];
+			    if (e[l]|f[l]|g[l]|h[l]|x[l]|y[l]) finished=0;
+			}
+			if (finished) break;
+		    }
+		    if (k>z) z=k;
+		    if (k == MAXPAIR) {
+			printf("Some bit didn't change: ");
+			printf("%.8x %.8x %.8x %.8x %.8x %.8x  ",
+				e[0],f[0],g[0],h[0],x[0],y[0]);
+			printf("i %d j %d m %d len %d\n", i, j, m, hlen);
+		    }
+		    if (z == MAXPAIR) goto done;
+		}
+	    }
+	}
+   done:
+	if (z < MAXPAIR) {
+	    printf("Mix success  %2d bytes  %2d initvals  ",i,m);
+	    printf("required  %d  trials\n", z/2);
+	}
+    }
+    printf("\n");
+}
+
+/* Check for reading beyond the end of the buffer and alignment problems */
+static void driver3(void)
+	/*@*/
+{
+    uint8_t buf[MAXLEN+20], *b;
+    uint32_t len;
+    uint8_t q[] = "This is the time for all good men to come to the aid of their country...";
+    uint32_t h;
+    uint8_t qq[] = "xThis is the time for all good men to come to the aid of their country...";
+    uint32_t i;
+    uint8_t qqq[] = "xxThis is the time for all good men to come to the aid of their country...";
+    uint32_t j;
+    uint8_t qqqq[] = "xxxThis is the time for all good men to come to the aid of their country...";
+    uint32_t ref,x,y;
+    uint8_t *p;
+    uint32_t m = 13;
+
+    printf("Endianness.  These lines should all be the same (for values filled in):\n");
+    printf("%.8x                            %.8x                            %.8x\n",
+	jlu32w(m, (const uint32_t *)q, (sizeof(q)-1)/4),
+	jlu32w(m, (const uint32_t *)q, (sizeof(q)-5)/4),
+	jlu32w(m, (const uint32_t *)q, (sizeof(q)-9)/4));
+    p = q;
+    printf("%.8x %.8x %.8x %.8x %.8x %.8x %.8x %.8x %.8x %.8x %.8x %.8x\n",
+	jlu32l(m, p, sizeof(q)-1), jlu32l(m, p, sizeof(q)-2),
+	jlu32l(m, p, sizeof(q)-3), jlu32l(m, p, sizeof(q)-4),
+	jlu32l(m, p, sizeof(q)-5), jlu32l(m, p, sizeof(q)-6),
+	jlu32l(m, p, sizeof(q)-7), jlu32l(m, p, sizeof(q)-8),
+	jlu32l(m, p, sizeof(q)-9), jlu32l(m, p, sizeof(q)-10),
+	jlu32l(m, p, sizeof(q)-11), jlu32l(m, p, sizeof(q)-12));
+    p = &qq[1];
+    printf("%.8x %.8x %.8x %.8x %.8x %.8x %.8x %.8x %.8x %.8x %.8x %.8x\n",
+	jlu32l(m, p, sizeof(q)-1), jlu32l(m, p, sizeof(q)-2),
+	jlu32l(m, p, sizeof(q)-3), jlu32l(m, p, sizeof(q)-4),
+	jlu32l(m, p, sizeof(q)-5), jlu32l(m, p, sizeof(q)-6),
+	jlu32l(m, p, sizeof(q)-7), jlu32l(m, p, sizeof(q)-8),
+	jlu32l(m, p, sizeof(q)-9), jlu32l(m, p, sizeof(q)-10),
+	jlu32l(m, p, sizeof(q)-11), jlu32l(m, p, sizeof(q)-12));
+    p = &qqq[2];
+    printf("%.8x %.8x %.8x %.8x %.8x %.8x %.8x %.8x %.8x %.8x %.8x %.8x\n",
+	jlu32l(m, p, sizeof(q)-1), jlu32l(m, p, sizeof(q)-2),
+	jlu32l(m, p, sizeof(q)-3), jlu32l(m, p, sizeof(q)-4),
+	jlu32l(m, p, sizeof(q)-5), jlu32l(m, p, sizeof(q)-6),
+	jlu32l(m, p, sizeof(q)-7), jlu32l(m, p, sizeof(q)-8),
+	jlu32l(m, p, sizeof(q)-9), jlu32l(m, p, sizeof(q)-10),
+	jlu32l(m, p, sizeof(q)-11), jlu32l(m, p, sizeof(q)-12));
+    p = &qqqq[3];
+    printf("%.8x %.8x %.8x %.8x %.8x %.8x %.8x %.8x %.8x %.8x %.8x %.8x\n",
+	jlu32l(m, p, sizeof(q)-1), jlu32l(m, p, sizeof(q)-2),
+	jlu32l(m, p, sizeof(q)-3), jlu32l(m, p, sizeof(q)-4),
+	jlu32l(m, p, sizeof(q)-5), jlu32l(m, p, sizeof(q)-6),
+	jlu32l(m, p, sizeof(q)-7), jlu32l(m, p, sizeof(q)-8),
+	jlu32l(m, p, sizeof(q)-9), jlu32l(m, p, sizeof(q)-10),
+	jlu32l(m, p, sizeof(q)-11), jlu32l(m, p, sizeof(q)-12));
+    printf("\n");
+    for (h=0, b=buf+1; h<8; ++h, ++b) {
+	for (i=0; i<MAXLEN; ++i) {
+	    len = i;
+	    for (j=0; j<i; ++j)
+		*(b+j)=0;
+
+	    /* these should all be equal */
+	    m = 1;
+	    ref = jlu32l(m, b, len);
+	    *(b+i)=(uint8_t)~0;
+	    *(b-1)=(uint8_t)~0;
+	    x = jlu32l(m, b, len);
+	    y = jlu32l(m, b, len);
+	    if ((ref != x) || (ref != y)) 
+		printf("alignment error: %.8x %.8x %.8x %d %d\n",ref,x,y, h, i);
+	}
+    }
+}
+
+/* check for problems with nulls */
+static void driver4(void)
+	/*@*/
+{
+    uint8_t buf[1];
+    uint32_t h;
+    uint32_t i;
+    uint32_t state[HASHSTATE];
+
+    buf[0] = ~0;
+    for (i=0; i<HASHSTATE; ++i)
+	state[i] = 1;
+    printf("These should all be different\n");
+    h = 0;
+    for (i=0; i<8; ++i) {
+	h = jlu32l(h, buf, 0);
+	printf("%2ld  0-byte strings, hash is  %.8x\n", (long)i, h);
+    }
+}
+
+
+int main(int argc, char ** argv)
+{
+    driver1();	/* test that the key is hashed: used for timings */
+    driver2();	/* test that whole key is hashed thoroughly */
+    driver3();	/* test that nothing but the key is hashed */
+    driver4();	/* test hashing multiple buffers (all buffers are null) */
+    return 1;
+}
+
+#endif  /* _JLU3_SELFTEST */
diff --git a/popt.c b/popt.c
index b697a0d..450a214 100644
--- a/popt.c
+++ b/popt.c
@@ -462,8 +462,10 @@ const char * findProgramPath(/*@null@*/ const char * argv0)
     }
 
     /* If no executable was found in PATH, return NULL. */
+/*@-compdef@*/
     if (!(s && *s) && t != NULL)
 	t = _free(t);
+/*@=compdef@*/
 /*@-modobserver -observertrans -usedef @*/
     path = _free(path);
 /*@=modobserver =observertrans =usedef @*/
@@ -750,6 +752,111 @@ static void poptStripArg(/*@special@*/ poptContext con, int which)
 /*@=compdef =sizeoftype =usedef @*/
 }
 
+/*@unchecked@*/
+unsigned int _poptBitsN = _POPT_BITS_N;
+/*@unchecked@*/
+unsigned int _poptBitsM = _POPT_BITS_M;
+/*@unchecked@*/
+unsigned int _poptBitsK = _POPT_BITS_K;
+
+/*@-sizeoftype@*/
+int poptBitsAdd(poptBits bits, const char * s)
+{
+    size_t ns = (s ? strlen(s) : 0);
+    uint32_t h0 = 0;
+    uint32_t h1 = 0;
+
+    if (bits == NULL || ns == 0)
+	return POPT_ERROR_NULLARG;
+
+    /* XXX parse CSV? */
+    jlu32lpair(s, ns, &h0, &h1);
+
+    for (ns = 0; ns < (size_t)_poptBitsK; ns++) {
+        uint32_t h = h0 + ns * h1;
+        uint32_t ix = (h % _poptBitsM);
+        PBM_SET(ix, bits);
+    }
+    return 0;
+}
+
+int poptBitsChk(poptBits bits, const char * s)
+{
+    size_t ns = (s ? strlen(s) : 0);
+    uint32_t h0 = 0;
+    uint32_t h1 = 0;
+    int rc = 1;
+
+    if (bits == NULL || ns == 0)
+	return POPT_ERROR_NULLARG;
+
+    /* XXX parse CSV? */
+    jlu32lpair(s, ns, &h0, &h1);
+
+    for (ns = 0; ns < (size_t)_poptBitsK; ns++) {
+        uint32_t h = h0 + ns * h1;
+        uint32_t ix = (h % _poptBitsM);
+        if (PBM_ISSET(ix, bits))
+            continue;
+        rc = 0;
+        break;
+    }
+    return rc;
+}
+
+int poptBitsClr(poptBits bits)
+{
+    static size_t nbw = (__PBM_NBITS/8);
+    size_t nw = (__PBM_IX(_poptBitsM-1) + 1);
+
+    if (bits == NULL)
+	return POPT_ERROR_NULLARG;
+    memset(bits, 0, nw * nbw);
+    return 0;
+}
+
+int poptBitsDel(poptBits bits, const char * s)
+{
+    size_t ns = (s ? strlen(s) : 0);
+    uint32_t h0 = 0;
+    uint32_t h1 = 0;
+
+    if (bits == NULL || ns == 0)
+	return POPT_ERROR_NULLARG;
+
+    /* XXX parse CSV? */
+    jlu32lpair(s, ns, &h0, &h1);
+
+    for (ns = 0; ns < (size_t)_poptBitsK; ns++) {
+        uint32_t h = h0 + ns * h1;
+        uint32_t ix = (h % _poptBitsM);
+        PBM_CLR(ix, bits);
+    }
+    return 0;
+}
+
+int poptSaveBits(poptBits * bitsp,
+		/*@unused@*/ UNUSED(unsigned int argInfo), const char * s)
+{
+    if (bitsp == NULL)
+	return POPT_ERROR_NULLARG;
+
+    /* XXX handle negated initialization. */
+    if (*bitsp == NULL) {
+	if (_poptBitsN == 0) {
+	    _poptBitsN = _POPT_BITS_N;
+	    _poptBitsM = _POPT_BITS_M;
+	}
+	if (_poptBitsM == 0U) _poptBitsM = (3 * _poptBitsN) / 2;
+	if (_poptBitsK == 0U || _poptBitsK > 32U) _poptBitsK = _POPT_BITS_K;
+	*bitsp = PBM_ALLOC(_poptBitsM-1);
+    }
+/*@-nullstate@*/
+    return poptBitsAdd(*bitsp, s);
+/*@=nullstate@*/
+}
+/*@=sizeoftype@*/
+
 int poptSaveString(const char *** argvp,
 		/*@unused@*/ UNUSED(unsigned int argInfo), const char * val)
 {
@@ -951,6 +1058,31 @@ static unsigned int poptArgInfo(poptContext con, const struct poptOption * opt)
     return argInfo;
 }
 
+/**
+ * Parse an integer expression.
+ * @retval *llp		integer expression value
+ * @param argInfo	integer expression type
+ * @param val		integer expression string
+ * @return		0 on success, otherwise POPT_* error.
+ */
+static int poptParseInteger(long long * llp,
+		/*@unused@*/ UNUSED(unsigned int argInfo),
+		/*@null@*/ const char * val)
+	/*@modifies *llp @*/
+{
+    if (val) {
+	char *end = NULL;
+	*llp = strtoll(val, &end, 0);
+
+	/* XXX parse scaling suffixes here. */
+
+	if (!(end && *end == '\0'))
+	    return POPT_ERROR_BADNUMBER;
+    } else
+	*llp = 0;
+    return 0;
+}
+
 /**
  * Save the option argument through the (*opt->arg) pointer.
  * @param con		context
@@ -965,6 +1097,10 @@ static int poptSaveArg(poptContext con, const struct poptOption * opt)
     int rc = 0;		/* assume success */
 
     switch (poptArgType(opt)) {
+    case POPT_ARG_BITSET:
+	/* XXX memory leak, application is responsible for free. */
+	rc = poptSaveBits(arg.ptr, opt->argInfo, con->os->nextArg);
+	/*@switchbreak@*/ break;
     case POPT_ARG_ARGV:
 	/* XXX memory leak, application is responsible for free. */
 	rc = poptSaveString(arg.ptr, opt->argInfo, con->os->nextArg);
@@ -979,16 +1115,10 @@ static int poptSaveArg(poptContext con, const struct poptOption * opt)
     case POPT_ARG_LONG:
     case POPT_ARG_LONGLONG:
     {	unsigned int argInfo = poptArgInfo(con, opt);
-	char *end = NULL;
 	long long aNUM = 0;
 
-	if (con->os->nextArg) {
-	    aNUM = strtoll(con->os->nextArg, &end, 0);
-	    if (!(end && *end == '\0')) {
-		rc = POPT_ERROR_BADNUMBER;
-		break;
-	    }
-	}
+	if ((rc = poptParseInteger(&aNUM, argInfo, con->os->nextArg)) != 0)
+	    break;
 
 	switch (poptArgType(opt)) {
 	case POPT_ARG_LONGLONG:
diff --git a/popt.h b/popt.h
index 278357f..aa094df 100644
--- a/popt.h
+++ b/popt.h
@@ -38,6 +38,7 @@
 #define POPT_ARG_MAINCALL	16U+11U	/*!< EXPERIMENTAL: return (*arg) (argc, argv) */
 #define	POPT_ARG_ARGV		12U	/*!< dupe'd arg appended to realloc'd argv array. */
 #define	POPT_ARG_SHORT		13U	/*!< arg ==> short */
+#define	POPT_ARG_BITSET		16U+14U	/*!< arg ==> bit set */
 
 #define POPT_ARG_MASK		0x000000FFU
 #define POPT_GROUP_MASK		0x0000FF00U
@@ -610,7 +611,7 @@ int poptStrippedArgv(poptContext con, int argc, char ** argv)
  */
 /*@unused@*/
 int poptSaveString(/*@null@*/ const char *** argvp, unsigned int argInfo,
-		const char * val)
+		/*@null@*/const char * val)
 	/*@modifies *argvp @*/;
 
 /**
@@ -678,7 +679,56 @@ int poptSaveInt(/*@null@*/ int * arg, unsigned int argInfo, long aLong)
 	/*@requires maxSet(arg) >= 0 /\ maxRead(arg) == 0 @*/;
 /*@=incondefs@*/
 
+/* The bit set typedef. */
+/*@-exporttype@*/
+typedef struct poptBits_s {
+    unsigned int bits[1];
+} * poptBits;
+/*@=exporttype@*/
+
+#define _POPT_BITS_N    1024U    /* estimated population */
+#define _POPT_BITS_M    ((3U * _POPT_BITS_N) / 2U)
+#define _POPT_BITS_K    16U      /* no. of linear hash combinations */
+
+/*@-exportlocal -exportvar@*/
+/*@unchecked@*/
+extern unsigned int _poptBitsN;
+/*@unchecked@*/
+extern  unsigned int _poptBitsM;
+/*@unchecked@*/
+extern  unsigned int _poptBitsK;
+/*@=exportlocal =exportvar@*/
+
+/*@-exportlocal@*/
+int poptBitsAdd(/*@null@*/poptBits bits, /*@null@*/const char * s)
+	/*@modifies bits @*/;
+/*@-fcnuse@*/
+int poptBitsChk(/*@null@*/poptBits bits, /*@null@*/const char * s)
+	/*@*/;
+int poptBitsClr(/*@null@*/poptBits bits)
+	/*@modifies bits @*/;
+int poptBitsDel(/*@null@*/poptBits bits, /*@null@*/const char * s)
+	/*@modifies bits @*/;
+/*@=fcnuse@*/
+/*@=exportlocal@*/
+
+/**
+ * Save a string into a bit set (experimental).
+ * @retval *bits	bit set (lazily malloc'd if NULL)
+ * @param argInfo	logical operation (see POPT_ARGFLAG_*)
+ * @param s		string to add to bit set
+ * @return		0 on success, POPT_ERROR_NULLARG/POPT_ERROR_BADOPERATION
+ */
+/*@-incondefs@*/
+/*@unused@*/
+int poptSaveBits(/*@null@*/ poptBits * bitsp, unsigned int argInfo,
+		/*@null@*/ const char * s)
+	/*@globals _poptBitsN, _poptBitsM, _poptBitsK, internalState @*/
+	/*@modifies *bitsp, _poptBitsN, _poptBitsM, _poptBitsK, internalState @*/;
+/*@=incondefs@*/
+
 /*@=type@*/
+
 #ifdef  __cplusplus
 }
 #endif
diff --git a/poptint.c b/poptint.c
index 52ab0ae..d369d1f 100644
--- a/poptint.c
+++ b/poptint.c
@@ -2,6 +2,10 @@
 #include <stdarg.h>
 #include "poptint.h"
 
+/* Any pair of 32 bit hashes can be used. lookup3.c generates pairs, will do. */
+#define _JLU3_jlu32lpair        1
+#include "lookup3.c"
+
 /*@-varuse +charint +ignoresigns @*/
 /*@unchecked@*/ /*@observer@*/
 static const unsigned char utf8_skip_data[256] = {
diff --git a/poptint.h b/poptint.h
index 885f56b..95674d3 100644
--- a/poptint.h
+++ b/poptint.h
@@ -9,6 +9,8 @@
 #ifndef H_POPTINT
 #define H_POPTINT
 
+#include <stdint.h>
+
 /**
  * Wrapper to free(3), hides const compilation noise, permit NULL, return NULL.
  * @param p		memory to free
@@ -42,6 +44,10 @@ typedef struct {
 #define PBM_CLR(d, s)   (__PBM_BITS (s)[__PBM_IX (d)] &= ~__PBM_MASK (d))
 #define PBM_ISSET(d, s) ((__PBM_BITS (s)[__PBM_IX (d)] & __PBM_MASK (d)) != 0)
 
+void jlu32lpair(/*@null@*/ const void *key, size_t size,
+                uint32_t *pc, uint32_t *pb)
+        /*@modifies *pc, *pb@*/;
+
 /** \ingroup popt
  * Typedef's for string and array of strings.
  */
diff --git a/test1.c b/test1.c
index c9effd5..35fd376 100644
--- a/test1.c
+++ b/test1.c
@@ -38,9 +38,9 @@ static unsigned int aFlag = 0x8aceU;
 static unsigned int bFlag = 0x8aceU;
 
 /*@unchecked@*/
-static short aShort = 4523;
+static short aShort = (short)4523;
 /*@unchecked@*/
-static short bShort = 4523;
+static short bShort = (short)4523;
 /*@unchecked@*/
 static int aInt = 271828;
 /*@unchecked@*/
@@ -61,8 +61,11 @@ static float bFloat = 3.1415926535;
 static double aDouble = 9.86960440108935861883;
 /*@unchecked@*/
 static double bDouble = 9.86960440108935861883;
+
 /*@unchecked@*/ /*@only@*/ /*@null@*/
 static const char ** aArgv = NULL;
+/*@unchecked@*/ /*@only@*/ /*@null@*/
+static void * aBits = NULL;
 
 /*@unchecked@*/ /*@null@*/
 static char * oStr = (char *) -1;
@@ -151,7 +154,9 @@ static struct poptOption options[] = {
 	"POPT_ARGFLAG_RANDOM: experimental", NULL },
 
    { "argv", '\0', POPT_ARG_ARGV, &aArgv, 0,
-	"POPT_ARG_ARGV: append arg to array (can be used multiple times)",NULL},
+	"POPT_ARG_ARGV: append string to argv array (can be used multiple times)","STRING"},
+   { "bits", '\0', POPT_ARG_BITSET|POPT_ARGFLAG_DOC_HIDDEN, &aBits, 0,
+	"POPT_ARG_BITSET: add string to bit set (can be used multiple times)","STRING"},
 
   { "bitset", '\0', POPT_BIT_SET | POPT_ARGFLAG_TOGGLE | POPT_ARGFLAG_SHOW_DEFAULT, &aFlag, 0x7777,
 	"POPT_BIT_SET: |= 0x7777", 0},
@@ -179,10 +184,10 @@ static struct poptOption options[] = {
 static void resetVars(void)
 	/*@globals arg1, arg2, arg3, inc, shortopt,
 		aVal, aFlag, aShort, aInt, aLong, aLongLong, aFloat, aDouble,
-		aArgv, oStr, singleDash, pass2 @*/
+		aArgv, aBits, oStr, singleDash, pass2 @*/
 	/*@modifies arg1, arg2, arg3, inc, shortopt,
 		aVal, aFlag, aShort, aInt, aLong, aLongLong, aFloat, aDouble,
-		aArgv, oStr, singleDash, pass2 @*/
+		aArgv, aBits, oStr, singleDash, pass2 @*/
 {
     arg1 = 0;
     arg2 = "(none)";
@@ -211,6 +216,10 @@ static void resetVars(void)
 	free(aArgv);
 	aArgv = NULL;
     }
+    if (aBits) {
+	free(aBits);
+	aBits = NULL;
+    }
 
     oStr = (char *) -1;
 
@@ -287,7 +296,7 @@ int main(int argc, const char ** argv)
     if (aFlag != bFlag)
 	fprintf(stdout, " aFlag: 0x%x", aFlag);
     if (aShort != bShort)
-	fprintf(stdout, " aShort: %d", aShort);
+	fprintf(stdout, " aShort: %hd", aShort);
     if (aInt != bInt)
 	fprintf(stdout, " aInt: %d", aInt);
     if (aLong != bLong)
@@ -307,6 +316,9 @@ int main(int argc, const char ** argv)
 	while ((arg = *av++) != NULL)
 	    fprintf(stdout, " %s", arg);
     }
+    if (aBits) {
+	fprintf(stdout, " aBits: non-null");
+    }
 /*@-nullpass@*/
     if (oStr != (char *)-1)
 	fprintf(stdout, " oStr: %s", (oStr ? oStr : "(none)"));
diff --git a/testit.sh b/testit.sh
index 1f833f9..857f6a4 100755
--- a/testit.sh
+++ b/testit.sh
@@ -112,17 +112,18 @@ run test1 "test1 - 54" "arg1: 0 arg2: (none) aFlag: 0x28c" --bitclr
 run test1 "test1 - 55" "arg1: 0 arg2: (none) aFlag: 0x8888" --nobitset
 run test1 "test1 - 56" "arg1: 0 arg2: (none) aFlag: 0xface" --nobitclr
 
-run test1 "test1 - 55" "\
+run test1 "test1 - 57" "arg1: 0 arg2: (none) aBits: non-null" --bits foo --bits bar
+
+run test1 "test1 - 58" "\
 Usage: lt-test1 [-I?] [-c|--cb2=STRING] [--arg1] [-2|--arg2=ARG]
         [-3|--arg3=ANARG] [-onedash] [--optional=STRING] [--val]
         [-i|--int=INT] [-s|--short=SHORT] [-l|--long=LONG]
         [-L|--longlong=LONGLONG] [-f|--float=FLOAT] [-d|--double=DOUBLE]
         [--randint=INT] [--randshort=SHORT] [--randlong=LONG]
-        [--randlonglong=LONGLONG] [--argv] [--bitset] [--bitclr] [--bitxor]
-        [--nstr=STRING] [--lstr=STRING] [-I|--inc] [-c|--cb=STRING]
-        [--longopt] [-?|--help] [--usage] [--simple=ARG]" --usage
-
-run test1 "test1 - 56" "\
+        [--randlonglong=LONGLONG] [--argv=STRING] [--bitset] [--bitclr]
+        [--bitxor] [--nstr=STRING] [--lstr=STRING] [-I|--inc]
+        [-c|--cb=STRING] [--longopt] [-?|--help] [--usage] [--simple=ARG]" --usage
+run test1 "test1 - 59" "\
 Usage: lt-test1 [OPTION...]
       --arg1                      First argument with a really long
                                   description. After all, we have to test
@@ -144,8 +145,8 @@ Usage: lt-test1 [OPTION...]
       --randshort=SHORT           POPT_ARGFLAG_RANDOM: experimental
       --randlong=LONG             POPT_ARGFLAG_RANDOM: experimental
       --randlonglong=LONGLONG     POPT_ARGFLAG_RANDOM: experimental
-      --argv                      POPT_ARG_ARGV: append arg to array (can be
-                                  used multiple times)
+      --argv STRING               POPT_ARG_ARGV: append string to argv array
+                                  (can be used multiple times)
       --[no]bitset                POPT_BIT_SET: |= 0x7777
       --[no]bitclr                POPT_BIT_CLR: &= ~0xf842
       --bitxor                    POPT_ARGFLAG_XOR: ^= (0x8ace^0xfeed)
-- 
Gitee


From b9124151fb6e568f89471b0ca2da1f25c556e4ce Mon Sep 17 00:00:00 2001
From: Jeff Johnson <n3npq@mac.com>
Date: Sun, 26 Jul 2009 16:25:23 +0000
Subject: [PATCH 590/667] - add methods for bit set union and intersection. -
 permit comma separated attribute lists, handle negated attributes. - better
 test for POPT_ARG_BITSET.

---
 CHANGES      |   3 ++
 libpopt.vers |   9 +++++
 popt.c       | 100 +++++++++++++++++++++++++++++++++++++++++++--------
 popt.h       |   8 +++--
 test1.c      |  22 +++++++++---
 testit.sh    |   2 +-
 6 files changed, 121 insertions(+), 23 deletions(-)

diff --git a/CHANGES b/CHANGES
index 1a0ae46..20079d0 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,4 +1,7 @@
 1.15 -> 1.16:
+    - add methods for bit set union and intersection.
+    - permit comma separated attribute lists, handle negated attributes.
+    - better test for POPT_ARG_BITSET.
     - add POPT_ARG_BITSET handling.
     - add POPT_ARG_SHORT handling.
     - handle all callback traversals within a C switch (for extendability ease).
diff --git a/libpopt.vers b/libpopt.vers
index b0c08d6..38b5c6d 100644
--- a/libpopt.vers
+++ b/libpopt.vers
@@ -9,6 +9,15 @@ LIBPOPT_0
     poptAddItem;
     poptAliasOptions;
     poptBadOption;
+    _poptBitsN;
+    _poptBitsM;
+    _poptBitsK;
+    poptBitsAdd;
+    poptBitsChk;
+    poptBitsClr;
+    poptBitsDel;
+    poptBitsIntersect;
+    poptBitsUnion;
     poptConfigFileToString;
     poptDupArgv;
     poptFinit;
diff --git a/popt.c b/popt.c
index 450a214..a45f6f9 100644
--- a/popt.c
+++ b/popt.c
@@ -759,6 +759,24 @@ unsigned int _poptBitsM = _POPT_BITS_M;
 /*@unchecked@*/
 unsigned int _poptBitsK = _POPT_BITS_K;
 
+static int _poptBitsNew(poptBits *bitsp)
+{
+    if (bitsp == NULL)
+	return POPT_ERROR_NULLARG;
+
+    /* XXX handle negated initialization. */
+    if (*bitsp == NULL) {
+	if (_poptBitsN == 0) {
+	    _poptBitsN = _POPT_BITS_N;
+	    _poptBitsM = _POPT_BITS_M;
+	}
+	if (_poptBitsM == 0U) _poptBitsM = (3 * _poptBitsN) / 2;
+	if (_poptBitsK == 0U || _poptBitsK > 32U) _poptBitsK = _POPT_BITS_K;
+	*bitsp = PBM_ALLOC(_poptBitsM-1);
+    }
+    return 0;
+}
+
 /*@-sizeoftype@*/
 int poptBitsAdd(poptBits bits, const char * s)
 {
@@ -769,7 +787,6 @@ int poptBitsAdd(poptBits bits, const char * s)
     if (bits == NULL || ns == 0)
 	return POPT_ERROR_NULLARG;
 
-    /* XXX parse CSV? */
     jlu32lpair(s, ns, &h0, &h1);
 
     for (ns = 0; ns < (size_t)_poptBitsK; ns++) {
@@ -790,7 +807,6 @@ int poptBitsChk(poptBits bits, const char * s)
     if (bits == NULL || ns == 0)
 	return POPT_ERROR_NULLARG;
 
-    /* XXX parse CSV? */
     jlu32lpair(s, ns, &h0, &h1);
 
     for (ns = 0; ns < (size_t)_poptBitsK; ns++) {
@@ -824,7 +840,6 @@ int poptBitsDel(poptBits bits, const char * s)
     if (bits == NULL || ns == 0)
 	return POPT_ERROR_NULLARG;
 
-    /* XXX parse CSV? */
     jlu32lpair(s, ns, &h0, &h1);
 
     for (ns = 0; ns < (size_t)_poptBitsK; ns++) {
@@ -835,25 +850,80 @@ int poptBitsDel(poptBits bits, const char * s)
     return 0;
 }
 
+int poptBitsIntersect(poptBits *ap, const poptBits b)
+{
+    __pbm_bits *abits;
+    __pbm_bits *bbits;
+    __pbm_bits rc = 0;
+    size_t nw = (__PBM_IX(_poptBitsM-1) + 1);
+    size_t i;
+
+    if (_poptBitsNew(ap) || b == NULL)
+	return POPT_ERROR_NULLARG;
+    abits = __PBM_BITS(*ap);
+    bbits = __PBM_BITS(b);
+
+    for (i = 0; i < nw; i++) {
+        abits[i] &= bbits[i];
+	rc |= abits[i];
+    }
+    return (rc ? 1 : 0);
+}
+
+int poptBitsUnion(poptBits *ap, const poptBits b)
+{
+    __pbm_bits *abits;
+    __pbm_bits *bbits;
+    __pbm_bits rc = 0;
+    size_t nw = (__PBM_IX(_poptBitsM-1) + 1);
+    size_t i;
+
+    if (_poptBitsNew(ap) || b == NULL)
+	return POPT_ERROR_NULLARG;
+    abits = __PBM_BITS(*ap);
+    bbits = __PBM_BITS(b);
+
+    for (i = 0; i < nw; i++) {
+        abits[i] |= bbits[i];
+	rc |= abits[i];
+    }
+    return (rc ? 1 : 0);
+}
+
 int poptSaveBits(poptBits * bitsp,
 		/*@unused@*/ UNUSED(unsigned int argInfo), const char * s)
 {
-    if (bitsp == NULL)
+    char *tbuf = NULL;
+    char *t, *te;
+    int rc = 0;
+
+    if (_poptBitsNew(bitsp) || s == NULL || *s == '\0')
 	return POPT_ERROR_NULLARG;
 
-    /* XXX handle negated initialization. */
-    if (*bitsp == NULL) {
-	if (_poptBitsN == 0) {
-	    _poptBitsN = _POPT_BITS_N;
-	    _poptBitsM = _POPT_BITS_M;
-	}
-	if (_poptBitsM == 0U) _poptBitsM = (3 * _poptBitsN) / 2;
-	if (_poptBitsK == 0U || _poptBitsK > 32U) _poptBitsK = _POPT_BITS_K;
-	*bitsp = PBM_ALLOC(_poptBitsM-1);
-    }
+    /* Parse comma separated attributes. */
+    te = tbuf = xstrdup(s);
+    while ((t = te) != NULL && *t) {
+	while (*te != '\0' && *te != ',')
+	    te++;
+	if (*te)
+	    *te++ = '\0';
+	/* XXX Ignore empty strings. */
+	if (*t == '\0')
+	    continue;
+	/* XXX Permit negated attributes. caveat emptor: false negatives. */
+	if (*t == '!') {
+	    t++;
+	    if ((rc = poptBitsChk(*bitsp, t)) > 0)
+		rc = poptBitsDel(*bitsp, t);
+	} else
+	    rc = poptBitsAdd(*bitsp, t);
 /*@-nullstate@*/
-    return poptBitsAdd(*bitsp, s);
+	if (rc)
+	    break;
 /*@=nullstate@*/
+    }
+    tbuf = _free(tbuf);
+    return rc;
 }
 /*@=sizeoftype@*/
 
diff --git a/popt.h b/popt.h
index aa094df..a0e496d 100644
--- a/popt.h
+++ b/popt.h
@@ -699,16 +699,20 @@ extern  unsigned int _poptBitsM;
 extern  unsigned int _poptBitsK;
 /*@=exportlocal =exportvar@*/
 
-/*@-exportlocal@*/
 int poptBitsAdd(/*@null@*/poptBits bits, /*@null@*/const char * s)
 	/*@modifies bits @*/;
-/*@-fcnuse@*/
 int poptBitsChk(/*@null@*/poptBits bits, /*@null@*/const char * s)
 	/*@*/;
 int poptBitsClr(/*@null@*/poptBits bits)
 	/*@modifies bits @*/;
 int poptBitsDel(/*@null@*/poptBits bits, /*@null@*/const char * s)
 	/*@modifies bits @*/;
+/*@-exportlocal@*/
+/*@-fcnuse@*/
+int poptBitsIntersect(/*@null@*/ poptBits * ap, /*@null@*/ const poptBits b)
+	/*@modifies *ap @*/;
+int poptBitsUnion(/*@null@*/ poptBits * ap, /*@null@*/ const poptBits b)
+	/*@modifies *ap @*/;
 /*@=fcnuse@*/
 /*@=exportlocal@*/
 
diff --git a/test1.c b/test1.c
index 35fd376..0653877 100644
--- a/test1.c
+++ b/test1.c
@@ -66,6 +66,12 @@ static double bDouble = 9.86960440108935861883;
 static const char ** aArgv = NULL;
 /*@unchecked@*/ /*@only@*/ /*@null@*/
 static void * aBits = NULL;
+/*@unchecked@*/
+static const char *attributes[] = {
+    "foo", "bar", "baz", "bing", "bang", "boom"
+};
+/*@unchecked@*/
+static size_t nattributes = (sizeof(attributes) / sizeof(attributes[0]));
 
 /*@unchecked@*/ /*@null@*/
 static char * oStr = (char *) -1;
@@ -216,10 +222,8 @@ static void resetVars(void)
 	free(aArgv);
 	aArgv = NULL;
     }
-    if (aBits) {
-	free(aBits);
-	aBits = NULL;
-    }
+    if (aBits)
+	poptBitsClr(aBits);
 
     oStr = (char *) -1;
 
@@ -317,7 +321,15 @@ int main(int argc, const char ** argv)
 	    fprintf(stdout, " %s", arg);
     }
     if (aBits) {
-	fprintf(stdout, " aBits: non-null");
+	const char * separator = " ";
+	size_t i;
+	fprintf(stdout, " aBits:");
+ 	for (i = 0; i < nattributes; i++) {
+	    if (!poptBitsChk(aBits, attributes[i]))
+		continue;
+	    fprintf(stdout, "%s%s", separator, attributes[i]);
+	    separator = ",";
+	}
     }
 /*@-nullpass@*/
     if (oStr != (char *)-1)
diff --git a/testit.sh b/testit.sh
index 857f6a4..2a7b4aa 100755
--- a/testit.sh
+++ b/testit.sh
@@ -112,7 +112,7 @@ run test1 "test1 - 54" "arg1: 0 arg2: (none) aFlag: 0x28c" --bitclr
 run test1 "test1 - 55" "arg1: 0 arg2: (none) aFlag: 0x8888" --nobitset
 run test1 "test1 - 56" "arg1: 0 arg2: (none) aFlag: 0xface" --nobitclr
 
-run test1 "test1 - 57" "arg1: 0 arg2: (none) aBits: non-null" --bits foo --bits bar
+run test1 "test1 - 57" "arg1: 0 arg2: (none) aBits: foo,baz" --bits foo,bar,baz,!bar
 
 run test1 "test1 - 58" "\
 Usage: lt-test1 [-I?] [-c|--cb2=STRING] [--arg1] [-2|--arg2=ARG]
-- 
Gitee


From 601851f32c02f9e33fa96c4d0d44dcef5b2d599a Mon Sep 17 00:00:00 2001
From: Jeff Johnson <n3npq@mac.com>
Date: Sun, 26 Jul 2009 16:38:25 +0000
Subject: [PATCH 591/667] - splint fiddles.

---
 popt.c  | 18 ++++++++++--------
 popt.h  |  8 +++++---
 test1.c |  4 ++--
 3 files changed, 17 insertions(+), 13 deletions(-)

diff --git a/popt.c b/popt.c
index a45f6f9..3eb25d9 100644
--- a/popt.c
+++ b/popt.c
@@ -759,7 +759,10 @@ unsigned int _poptBitsM = _POPT_BITS_M;
 /*@unchecked@*/
 unsigned int _poptBitsK = _POPT_BITS_K;
 
-static int _poptBitsNew(poptBits *bitsp)
+/*@-sizeoftype@*/
+static int _poptBitsNew(/*@null@*/ poptBits *bitsp)
+	/*@globals _poptBitsN, _poptBitsM, _poptBitsK @*/
+	/*@modifies *bitsp, _poptBitsN, _poptBitsM, _poptBitsK @*/
 {
     if (bitsp == NULL)
 	return POPT_ERROR_NULLARG;
@@ -774,10 +777,11 @@ static int _poptBitsNew(poptBits *bitsp)
 	if (_poptBitsK == 0U || _poptBitsK > 32U) _poptBitsK = _POPT_BITS_K;
 	*bitsp = PBM_ALLOC(_poptBitsM-1);
     }
+/*@-nullstate@*/
     return 0;
+/*@=nullstate@*/
 }
 
-/*@-sizeoftype@*/
 int poptBitsAdd(poptBits bits, const char * s)
 {
     size_t ns = (s ? strlen(s) : 0);
@@ -858,7 +862,7 @@ int poptBitsIntersect(poptBits *ap, const poptBits b)
     size_t nw = (__PBM_IX(_poptBitsM-1) + 1);
     size_t i;
 
-    if (_poptBitsNew(ap) || b == NULL)
+    if (ap == NULL || b == NULL || _poptBitsNew(ap))
 	return POPT_ERROR_NULLARG;
     abits = __PBM_BITS(*ap);
     bbits = __PBM_BITS(b);
@@ -878,7 +882,7 @@ int poptBitsUnion(poptBits *ap, const poptBits b)
     size_t nw = (__PBM_IX(_poptBitsM-1) + 1);
     size_t i;
 
-    if (_poptBitsNew(ap) || b == NULL)
+    if (ap == NULL || b == NULL || _poptBitsNew(ap))
 	return POPT_ERROR_NULLARG;
     abits = __PBM_BITS(*ap);
     bbits = __PBM_BITS(b);
@@ -897,7 +901,7 @@ int poptSaveBits(poptBits * bitsp,
     char *t, *te;
     int rc = 0;
 
-    if (_poptBitsNew(bitsp) || s == NULL || *s == '\0')
+    if (bitsp == NULL || s == NULL || *s == '\0' || _poptBitsNew(bitsp))
 	return POPT_ERROR_NULLARG;
 
     /* Parse comma separated attributes. */
@@ -905,7 +909,7 @@ int poptSaveBits(poptBits * bitsp,
     while ((t = te) != NULL && *t) {
 	while (*te != '\0' && *te != ',')
 	    te++;
-	if (*te)
+	if (*te != '\0')
 	    *te++ = '\0';
 	/* XXX Ignore empty strings. */
 	if (*t == '\0')
@@ -917,10 +921,8 @@ int poptSaveBits(poptBits * bitsp,
 		rc = poptBitsDel(*bitsp, t);
 	} else
 	    rc = poptBitsAdd(*bitsp, t);
-/*@-nullstate@*/
 	if (rc)
 	    break;
-/*@=nullstate@*/
     }
     tbuf = _free(tbuf);
     return rc;
diff --git a/popt.h b/popt.h
index a0e496d..431370f 100644
--- a/popt.h
+++ b/popt.h
@@ -690,24 +690,26 @@ typedef struct poptBits_s {
 #define _POPT_BITS_M    ((3U * _POPT_BITS_N) / 2U)
 #define _POPT_BITS_K    16U      /* no. of linear hash combinations */
 
-/*@-exportlocal -exportvar@*/
+/*@-exportlocal -exportvar -globuse @*/
 /*@unchecked@*/
 extern unsigned int _poptBitsN;
 /*@unchecked@*/
 extern  unsigned int _poptBitsM;
 /*@unchecked@*/
 extern  unsigned int _poptBitsK;
-/*@=exportlocal =exportvar@*/
+/*@=exportlocal =exportvar =globuse @*/
 
+/*@-exportlocal@*/
 int poptBitsAdd(/*@null@*/poptBits bits, /*@null@*/const char * s)
 	/*@modifies bits @*/;
+/*@=exportlocal@*/
 int poptBitsChk(/*@null@*/poptBits bits, /*@null@*/const char * s)
 	/*@*/;
 int poptBitsClr(/*@null@*/poptBits bits)
 	/*@modifies bits @*/;
+/*@-exportlocal@*/
 int poptBitsDel(/*@null@*/poptBits bits, /*@null@*/const char * s)
 	/*@modifies bits @*/;
-/*@-exportlocal@*/
 /*@-fcnuse@*/
 int poptBitsIntersect(/*@null@*/ poptBits * ap, /*@null@*/ const poptBits b)
 	/*@modifies *ap @*/;
diff --git a/test1.c b/test1.c
index 0653877..e0586b9 100644
--- a/test1.c
+++ b/test1.c
@@ -66,7 +66,7 @@ static double bDouble = 9.86960440108935861883;
 static const char ** aArgv = NULL;
 /*@unchecked@*/ /*@only@*/ /*@null@*/
 static void * aBits = NULL;
-/*@unchecked@*/
+/*@unchecked@*/ /*@observer@*/
 static const char *attributes[] = {
     "foo", "bar", "baz", "bing", "bang", "boom"
 };
@@ -223,7 +223,7 @@ static void resetVars(void)
 	aArgv = NULL;
     }
     if (aBits)
-	poptBitsClr(aBits);
+	(void) poptBitsClr(aBits);
 
     oStr = (char *) -1;
 
-- 
Gitee


From 49564442d566699f6fcc9d766b72a494f1a53c71 Mon Sep 17 00:00:00 2001
From: Jeff Johnson <n3npq@mac.com>
Date: Sun, 26 Jul 2009 17:09:27 +0000
Subject: [PATCH 592/667] - add poptBitsArgs() method to generate args bit set.

---
 CHANGES      |  1 +
 libpopt.vers |  1 +
 popt.c       | 21 +++++++++++++++++++++
 popt.h       |  2 ++
 4 files changed, 25 insertions(+)

diff --git a/CHANGES b/CHANGES
index 20079d0..1b2289e 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,4 +1,5 @@
 1.15 -> 1.16:
+    - add poptBitsArgs() method to generate args bit set.
     - add methods for bit set union and intersection.
     - permit comma separated attribute lists, handle negated attributes.
     - better test for POPT_ARG_BITSET.
diff --git a/libpopt.vers b/libpopt.vers
index 38b5c6d..c2c2a22 100644
--- a/libpopt.vers
+++ b/libpopt.vers
@@ -13,6 +13,7 @@ LIBPOPT_0
     _poptBitsM;
     _poptBitsK;
     poptBitsAdd;
+    poptBitsArgs;
     poptBitsChk;
     poptBitsClr;
     poptBitsDel;
diff --git a/popt.c b/popt.c
index 3eb25d9..5444af2 100644
--- a/popt.c
+++ b/popt.c
@@ -894,6 +894,27 @@ int poptBitsUnion(poptBits *ap, const poptBits b)
     return (rc ? 1 : 0);
 }
 
+int poptBitsArgs(poptContext con, poptBits *ap)
+{
+    const char ** av;
+    int rc = 0;
+
+    if (con == NULL || ap == NULL || _poptBitsNew(ap) ||
+	con->leftovers == NULL || con->numLeftovers == con->nextLeftover)
+	return POPT_ERROR_NULLARG;
+
+    /* some apps like [like RPM ;-) ] need this NULL terminated */
+    con->leftovers[con->numLeftovers] = NULL;
+
+    for (av = con->leftovers + con->nextLeftover; *av != NULL; av++) {
+	if ((rc = poptBitsAdd(*ap, *av)) != 0)
+	    break;
+    }
+/*@-nullstate@*/
+    return rc;
+/*@=nullstate@*/
+}
+
 int poptSaveBits(poptBits * bitsp,
 		/*@unused@*/ UNUSED(unsigned int argInfo), const char * s)
 {
diff --git a/popt.h b/popt.h
index 431370f..a8b3b4b 100644
--- a/popt.h
+++ b/popt.h
@@ -715,6 +715,8 @@ int poptBitsIntersect(/*@null@*/ poptBits * ap, /*@null@*/ const poptBits b)
 	/*@modifies *ap @*/;
 int poptBitsUnion(/*@null@*/ poptBits * ap, /*@null@*/ const poptBits b)
 	/*@modifies *ap @*/;
+int poptBitsArgs(/*@null@*/ poptContext con, /*@null@*/ poptBits * ap)
+	/*@modifies con, *ap @*/;
 /*@=fcnuse@*/
 /*@=exportlocal@*/
 
-- 
Gitee


From eeb6b7a15839e9e59f4667f1f67a185984d9d86e Mon Sep 17 00:00:00 2001
From: Jeff Johnson <n3npq@mac.com>
Date: Sun, 26 Jul 2009 19:14:09 +0000
Subject: [PATCH 593/667] - add tdict.c to exercise popt bit sets against
 /usr/dict/words.

---
 CHANGES      |   1 +
 Makefile.am  |   5 ++-
 libpopt.vers |   1 +
 tdict.c      | 125 +++++++++++++++++++++++++++++++++++++++++++++++++++
 4 files changed, 131 insertions(+), 1 deletion(-)
 create mode 100644 tdict.c

diff --git a/CHANGES b/CHANGES
index 1b2289e..aff3a95 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,4 +1,5 @@
 1.15 -> 1.16:
+    - add tdict.c to exercise popt bit sets against /usr/dict/words.
     - add poptBitsArgs() method to generate args bit set.
     - add methods for bit set union and intersection.
     - permit comma separated attribute lists, handle negated attributes.
diff --git a/Makefile.am b/Makefile.am
index c21cf9c..711f24c 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -16,7 +16,7 @@ INCLUDES = -I. -I$(top_srcdir)
 
 noinst_HEADERS = poptint.h system.h
 
-noinst_PROGRAMS = test1 test2 test3
+noinst_PROGRAMS = test1 test2 test3 tdict
 test1_SOURCES = test1.c
 test1_LDFLAGS = 
 test1_LDADD = $(usrlib_LTLIBRARIES)
@@ -26,6 +26,9 @@ test2_LDADD = $(usrlib_LTLIBRARIES)
 test3_SOURCES = test3.c
 test3_LDFLAGS = 
 test3_LDADD = $(usrlib_LTLIBRARIES)
+tdict_SOURCES = tdict.c
+tdict_LDFLAGS = 
+tdict_LDADD = $(usrlib_LTLIBRARIES)
 
 noinst_SCRIPTS = testit.sh
 
diff --git a/libpopt.vers b/libpopt.vers
index c2c2a22..dca6b1a 100644
--- a/libpopt.vers
+++ b/libpopt.vers
@@ -42,6 +42,7 @@ LIBPOPT_0
     poptReadDefaultConfig;
     poptResetContext;
     poptSaneFile;
+    poptSaveBits;
     poptSaveInt;
     poptSaveLong;
     poptSaveLongLong;
diff --git a/tdict.c b/tdict.c
new file mode 100644
index 0000000..16500bb
--- /dev/null
+++ b/tdict.c
@@ -0,0 +1,125 @@
+#include "system.h"
+#include <stdio.h>
+#include "popt.h"
+
+static int _debug = 0;
+static int _verbose = 1;
+static const char * dictfn = "/usr/share/dict/words";
+static poptBits dictbits = NULL;
+static struct {
+    unsigned total;
+    unsigned hits;
+    unsigned misses;
+} e;
+
+static int loadDict(const char * fn, poptBits * ap)
+{
+    char b[BUFSIZ];
+    size_t nb = sizeof(b);
+    FILE * fp = fopen(fn, "r");
+    char * t, *te;
+    int nlines = -1;
+
+    if (fp == NULL || ferror(fp)) goto exit;
+
+    nlines = 0;
+    while ((t = fgets(b, nb, fp)) != NULL) {
+	while (*t && isspace(*t)) t++;
+	if (*t == '#') continue;
+	te = t + strlen(t);
+	while (te-- > t && isspace(*te)) *te = '\0';
+	if (*t == '\0') continue;
+	if (ap) {
+if (_debug)
+fprintf(stderr, "==> poptSaveBits(%p, \"%s\")\n", *ap, t);
+	    (void) poptSaveBits(ap, 0, t);
+	}
+	nlines++;
+    }
+exit:
+    if (fp) (void) fclose(fp);
+    return nlines;
+}
+
+static struct poptOption options[] = {
+  { "debug", 'd', POPT_BIT_SET|POPT_ARGFLAG_TOGGLE, &_debug, 1,
+        "Set debugging.", NULL },
+  { "verbose", 'v', POPT_BIT_SET|POPT_ARGFLAG_TOGGLE, &_verbose, 1,
+        "Set verbosity.", NULL },
+
+  POPT_AUTOALIAS
+  POPT_AUTOHELP
+  POPT_TABLEEND
+};
+
+int main(int argc, const char ** argv)
+{
+    poptContext optCon = NULL;
+    const char ** av = NULL;
+    poptBits avbits = NULL;
+    int ec = 2;		/* assume failure */
+    int rc;
+
+#if defined(HAVE_MCHECK_H) && defined(HAVE_MTRACE)
+    mtrace();   /* Trace malloc only if MALLOC_TRACE=mtrace-output-file. */
+#endif
+
+    /* XXX Scale the Bloom filters in popt. */
+    if ((rc = loadDict(dictfn, NULL)) <= 0)
+	goto exit;
+    _poptBitsK = 2;
+    _poptBitsM = 0;
+    _poptBitsN = _poptBitsK * rc;
+
+    optCon = poptGetContext("tdict", argc, argv, options, 0);
+
+    /* Read all the options (if any). */
+    while ((rc = poptGetNextOpt(optCon)) > 0) {
+        char * optArg = poptGetOptArg(optCon);
+	if (optArg) free(optArg);
+        switch (rc) {
+        default:	goto exit;	break;
+        }
+    }
+    if (rc < -1) {
+        fprintf(stderr, "tdict: %s: %s\n",
+                poptBadOption(optCon, POPT_BADOPTION_NOALIAS),
+                poptStrerror(rc));
+	goto exit;
+    }
+
+    if ((rc = loadDict(dictfn, &dictbits)) <= 0)
+	goto exit;
+
+    av = poptGetArgs(optCon);
+    if ((rc = poptBitsArgs(optCon, &avbits)) != 0)
+	goto exit;
+    if (av && avbits)
+    while (*av) {
+	rc = poptBitsChk(dictbits, *av);
+	if (rc < 0) goto exit;
+	e.total++;
+	if (rc > 0) {
+	    if (_verbose)
+		fprintf(stdout, "%s:\tYES\n", *av);
+	    e.hits++;
+	} else {
+	    if (_verbose)
+		fprintf(stdout, "%s:\tNO\n", *av);
+	    e.misses++;
+	}
+	av++;
+    }
+
+    ec = 0;
+
+exit:
+    fprintf(stdout, "===== poptBits N:%u M:%u K:%u (%uKb) total(%u) = hits(%u) + misses(%u)\n",
+	_poptBitsN, _poptBitsM, _poptBitsK, (((_poptBitsM/8)+1)+1023)/1024, e.total, e.hits, e.misses);
+    if (avbits) free(avbits);
+    optCon = poptFreeContext(optCon);
+#if defined(HAVE_MCHECK_H) && defined(HAVE_MTRACE)
+    muntrace();   /* Trace malloc only if MALLOC_TRACE=mtrace-output-file. */
+#endif
+    return ec;
+}
-- 
Gitee


From 5ac6c6d24833138b8c6b0cc18487236b417ab51c Mon Sep 17 00:00:00 2001
From: Jeff Johnson <n3npq@mac.com>
Date: Sun, 26 Jul 2009 19:23:56 +0000
Subject: [PATCH 594/667] - tdict: use poptBitsUnion and poptBitsIntersect too.

---
 tdict.c | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/tdict.c b/tdict.c
index 16500bb..b2e0859 100644
--- a/tdict.c
+++ b/tdict.c
@@ -94,6 +94,13 @@ int main(int argc, const char ** argv)
     av = poptGetArgs(optCon);
     if ((rc = poptBitsArgs(optCon, &avbits)) != 0)
 	goto exit;
+    if (avbits) {
+	poptBits Ibits = NULL;
+	(void) poptBitsUnion(&Ibits, dictbits);
+	rc = poptBitsIntersect(&Ibits, avbits);
+	fprintf(stdout, "===== %s words are in %s\n", (rc ? "Some" : "No"), dictfn);
+	if (Ibits) free(Ibits);
+    }
     if (av && avbits)
     while (*av) {
 	rc = poptBitsChk(dictbits, *av);
-- 
Gitee


From fae26fc3b531f4ae61dd7dccaa03594efaa912aa Mon Sep 17 00:00:00 2001
From: Elia Pinto <pinto.elia@gmail.com>
Date: Tue, 11 Aug 2009 13:32:58 +0000
Subject: [PATCH 595/667] Drop -L from popt.pc : it cause problem - ref
 novelbz#529921

---
 popt.pc.in | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/popt.pc.in b/popt.pc.in
index 43c1735..fcd2ed5 100644
--- a/popt.pc.in
+++ b/popt.pc.in
@@ -6,5 +6,5 @@ includedir=@includedir@
 Name: popt
 Version: @VERSION@
 Description: popt library.
-Libs: -L${libdir} -lpopt
+Libs: -lpopt
 Cflags: -I${includedir}
-- 
Gitee


From 0674cc4ebb8891e5f8d9c2a5cded3acb79b9ce9c Mon Sep 17 00:00:00 2001
From: Elia Pinto <pinto.elia@gmail.com>
Date: Wed, 12 Aug 2009 13:15:21 +0000
Subject: [PATCH 596/667] fix (hope) portability problem in popt.pc

---
 Makefile.am  |  2 +-
 configure.ac | 19 ++++++++++++++++++-
 popt.pc.in   |  2 +-
 3 files changed, 20 insertions(+), 3 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index 711f24c..4e0596a 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -4,7 +4,7 @@ AUTOMAKE_OPTIONS = 1.4 foreign
 
 LINT = splint
 
-EXTRA_DIST = config.rpath autogen.sh CHANGES $(man_MANS) popt.spec \
+EXTRA_DIST = config.rpath  config.rpath autogen.sh CHANGES $(man_MANS) popt.spec \
 	footer_no_timestamp.html libpopt.vers \
 	testit.sh test-poptrc test3-data/0* \
 	po/*.in po/*.po po/popt.pot \
diff --git a/configure.ac b/configure.ac
index f40cc0c..3d4da3e 100755
--- a/configure.ac
+++ b/configure.ac
@@ -12,7 +12,7 @@ AC_SUBST(LT_CURRENT, 0)
 AC_SUBST(LT_REVISION, 0)
 AC_SUBST(LT_AGE, 8)
 
-AM_INIT_AUTOMAKE([foreign])
+AM_INIT_AUTOMAKE([foreign -Wall])
 
 ALL_LINGUAS="cs da de eo es fi fr ga gl hu id is it ja ko nb nl pl pt ro ru sk sl sv th tr uk vi wa zh_TW zh_CN"
 
@@ -75,6 +75,23 @@ popt_sysconfdir="${sysconfdir}"
 eval "popt_sysconfdir=\"${popt_sysconfdir}\"" # expand contained ${prefix}
 AC_DEFINE_UNQUOTED([POPT_SYSCONFDIR], ["$popt_sysconfdir"], [Full path to default POPT configuration directory])
 
+
+# Define a (hope) portable Libs pkgconfig directive that 
+# - Don't harm if the default library search path include ${libdir}
+#   (https://bugzilla.novell.com/show_bug.cgi?id=529921)
+# - Don't require a not upstream patch to pkgconfig
+#   (https://bugs.freedesktop.org/show_bug.cgi?id=16095)
+popt_pkgconfig_libs='-L${libdir} -lpopt'
+case "${libdir}" in
+    /usr/lib|/usr/lib64|/lib|/lib64)
+          popt_pkgconfig_libs='-lpopt'
+        ;;
+    *)
+          popt_pkgconfig_libs='-L${libdir} -lpopt'
+        ;;
+esac
+AC_SUBST([POPT_PKGCONFIG_LIBS],"$popt_pkgconfig_libs")
+
 POPT_SOURCE_PATH="`pwd`"
 AC_DEFINE_UNQUOTED(POPT_SOURCE_PATH, "$POPT_SOURCE_PATH",
 	[Full path to popt top_srcdir.])
diff --git a/popt.pc.in b/popt.pc.in
index fcd2ed5..a86437c 100644
--- a/popt.pc.in
+++ b/popt.pc.in
@@ -6,5 +6,5 @@ includedir=@includedir@
 Name: popt
 Version: @VERSION@
 Description: popt library.
-Libs: -lpopt
+Libs: @POPT_PKGCONFIG_LIBS@
 Cflags: -I${includedir}
-- 
Gitee


From 0162b119f5180c79141218be88f14f983c2bfa81 Mon Sep 17 00:00:00 2001
From: Elia Pinto <pinto.elia@gmail.com>
Date: Wed, 12 Aug 2009 14:29:39 +0000
Subject: [PATCH 597/667] Probably it is better to restrict the previous fix
 only for Linux systems.

---
 Makefile.am  |  2 +-
 configure.ac | 28 +++++++++++++++++++++-------
 2 files changed, 22 insertions(+), 8 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index 4e0596a..711f24c 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -4,7 +4,7 @@ AUTOMAKE_OPTIONS = 1.4 foreign
 
 LINT = splint
 
-EXTRA_DIST = config.rpath  config.rpath autogen.sh CHANGES $(man_MANS) popt.spec \
+EXTRA_DIST = config.rpath autogen.sh CHANGES $(man_MANS) popt.spec \
 	footer_no_timestamp.html libpopt.vers \
 	testit.sh test-poptrc test3-data/0* \
 	po/*.in po/*.po po/popt.pot \
diff --git a/configure.ac b/configure.ac
index 3d4da3e..f3bd320 100755
--- a/configure.ac
+++ b/configure.ac
@@ -82,13 +82,27 @@ AC_DEFINE_UNQUOTED([POPT_SYSCONFDIR], ["$popt_sysconfdir"], [Full path to defaul
 # - Don't require a not upstream patch to pkgconfig
 #   (https://bugs.freedesktop.org/show_bug.cgi?id=16095)
 popt_pkgconfig_libs='-L${libdir} -lpopt'
-case "${libdir}" in
-    /usr/lib|/usr/lib64|/lib|/lib64)
-          popt_pkgconfig_libs='-lpopt'
-        ;;
-    *)
-          popt_pkgconfig_libs='-L${libdir} -lpopt'
-        ;;
+case "${host}" in
+    *-*-linux*)
+	case "${libdir}" in
+	    /usr/lib|/usr/lib64|/lib|/lib64)
+       		   popt_pkgconfig_libs='-lpopt'
+		;;
+    		*)
+		popt_pkgconfig_libs='-L${libdir} -lpopt'
+	;;
+	esac
+      ;;
+    *-*-gnu*)
+	case "${libdir}" in
+	    /usr/lib|/usr/lib64|/lib|/lib64)
+       		   popt_pkgconfig_libs='-lpopt'
+		;;
+    		*)
+		popt_pkgconfig_libs='-L${libdir} -lpopt'
+	;;
+	esac
+      ;;
 esac
 AC_SUBST([POPT_PKGCONFIG_LIBS],"$popt_pkgconfig_libs")
 
-- 
Gitee


From 29908b6fd7a42d451f1144f5d9e1c224f518f752 Mon Sep 17 00:00:00 2001
From: Elia Pinto <pinto.elia@gmail.com>
Date: Thu, 13 Aug 2009 13:17:33 +0000
Subject: [PATCH 598/667] add AC_CONFIG_AUX_DIR, AC_CONFIG_MACRO_DIR to
 configure. del acinclude.m4 : AC_CHECK_VA_COPY is not used

---
 CHANGES      |   3 +-
 Makefile.am  |   2 +-
 acinclude.m4 | 113 ---------------------------------------------------
 configure.ac |   3 ++
 4 files changed, 6 insertions(+), 115 deletions(-)
 delete mode 100644 acinclude.m4

diff --git a/CHANGES b/CHANGES
index aff3a95..beb4471 100644
--- a/CHANGES
+++ b/CHANGES
@@ -8,7 +8,8 @@
     - add POPT_ARG_SHORT handling.
     - handle all callback traversals within a C switch (for extendability ease).
     - add popt.pc.
-
+    - devzero2000: add AC_CONFIG_AUX_DIR, AC_CONFIG_MACRO_DIR to configure. Create build-aux 
+    - devzero2000: del acinclude.m4 : AC_CHECK_VA_COPY is not used
 1.14 -> 1.15:
     - release popt-1.15.
     - rse: fix building under --disable-nls
diff --git a/Makefile.am b/Makefile.am
index 711f24c..cd8868c 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -4,7 +4,7 @@ AUTOMAKE_OPTIONS = 1.4 foreign
 
 LINT = splint
 
-EXTRA_DIST = config.rpath autogen.sh CHANGES $(man_MANS) popt.spec \
+EXTRA_DIST = build-aux/config.rpath autogen.sh CHANGES $(man_MANS) popt.spec \
 	footer_no_timestamp.html libpopt.vers \
 	testit.sh test-poptrc test3-data/0* \
 	po/*.in po/*.po po/popt.pot \
diff --git a/acinclude.m4 b/acinclude.m4
deleted file mode 100644
index 0b5ebf2..0000000
--- a/acinclude.m4
+++ /dev/null
@@ -1,113 +0,0 @@
-dnl ##
-dnl ##  acinclude.m4 -- additional source for aclocal(1)
-dnl ##
-
-dnl ##
-dnl ##  Check for C99 va_copy() implementation
-dnl ##  (and provide fallback implementation if neccessary)
-dnl ##
-dnl ##  configure.in:
-dnl ##    AC_CHECK_VA_COPY
-dnl ##  foo.c:
-dnl ##    #include "config.h"
-dnl ##    [...]
-dnl ##    va_copy(d,s)
-dnl ##
-dnl ##  This check is rather complex: first because we really have to
-dnl ##  try various possible implementations in sequence and second, we
-dnl ##  cannot define a macro in config.h with parameters directly.
-dnl ##
-
-dnl #   test program for va_copy() implementation
-changequote(<<,>>)
-m4_define(__va_copy_test, <<[
-#include <stdlib.h>
-#include <stdarg.h>
-#include <string.h>
-#define DO_VA_COPY(d, s) $1
-void test(char *str, ...)
-{
-    va_list ap, ap2;
-    int i;
-    va_start(ap, str);
-    DO_VA_COPY(ap2, ap);
-    for (i = 1; i <= 9; i++) {
-        int k = (int)va_arg(ap, int);
-        if (k != i)
-            abort();
-    }
-    DO_VA_COPY(ap, ap2);
-    for (i = 1; i <= 9; i++) {
-        int k = (int)va_arg(ap, int);
-        if (k != i)
-            abort();
-    }
-    va_end(ap);
-}
-int main(int argc, char *argv[])
-{
-    test("test", 1, 2, 3, 4, 5, 6, 7, 8, 9);
-    exit(0);
-}
-]>>)
-changequote([,])
-
-dnl #   test driver for va_copy() implementation
-m4_define(__va_copy_check, [
-    AH_VERBATIM($1,
-[/* Predefined possible va_copy() implementation (id: $1) */
-#define __VA_COPY_USE_$1(d, s) $2])
-    if test ".$ac_cv_va_copy" = .; then
-        AC_TRY_RUN(__va_copy_test($2), [ac_cv_va_copy="$1"])
-    fi
-])
-
-dnl #   Autoconf check for va_copy() implementation checking
-AC_DEFUN([AC_CHECK_VA_COPY],[
-  dnl #   provide Autoconf display check message
-  AC_MSG_CHECKING(for va_copy() function)
-  dnl #   check for various implementations in priorized sequence   
-  AC_CACHE_VAL(ac_cv_va_copy, [
-    ac_cv_va_copy=""
-    dnl #   1. check for standardized C99 macro
-    __va_copy_check(C99, [va_copy((d), (s))])
-    dnl #   2. check for alternative/deprecated GCC macro
-    __va_copy_check(GCM, [VA_COPY((d), (s))])
-    dnl #   3. check for internal GCC macro (high-level define)
-    __va_copy_check(GCH, [__va_copy((d), (s))])
-    dnl #   4. check for internal GCC macro (built-in function)
-    __va_copy_check(GCB, [__builtin_va_copy((d), (s))])
-    dnl #   5. check for assignment approach (assuming va_list is a struct)
-    __va_copy_check(ASS, [do { (d) = (s); } while (0)])
-    dnl #   6. check for assignment approach (assuming va_list is a pointer)
-    __va_copy_check(ASP, [do { *(d) = *(s); } while (0)])
-    dnl #   7. check for memory copying approach (assuming va_list is a struct)
-    __va_copy_check(CPS, [memcpy((void *)&(d), (void *)&(s), sizeof((s)))])
-    dnl #   8. check for memory copying approach (assuming va_list is a pointer)
-    __va_copy_check(CPP, [memcpy((void *)(d), (void *)(s), sizeof(*(s)))])
-    if test ".$ac_cv_va_copy" = .; then
-        AC_ERROR([no working implementation found])
-    fi
-  ])
-  dnl #   optionally activate the fallback implementation
-  if test ".$ac_cv_va_copy" = ".C99"; then
-      AC_DEFINE(HAVE_VA_COPY, 1, [Define if va_copy() macro exists (and no fallback implementation is required)])
-  fi
-  dnl #   declare which fallback implementation to actually use
-  AC_DEFINE_UNQUOTED([__VA_COPY_USE], [__VA_COPY_USE_$ac_cv_va_copy],
-      [Define to id of used va_copy() implementation])
-  dnl #   provide activation hook for fallback implementation
-  AH_VERBATIM([__VA_COPY_ACTIVATION],
-[/* Optional va_copy() implementation activation */
-#ifndef HAVE_VA_COPY
-#define va_copy(d, s) __VA_COPY_USE(d, s)
-#endif
-])
-  dnl #   provide Autoconf display result message
-  if test ".$ac_cv_va_copy" = ".C99"; then
-      AC_MSG_RESULT([yes])
-  else
-      AC_MSG_RESULT([no (using fallback implementation)])
-  fi
-])
-
diff --git a/configure.ac b/configure.ac
index f3bd320..32beb39 100755
--- a/configure.ac
+++ b/configure.ac
@@ -12,7 +12,10 @@ AC_SUBST(LT_CURRENT, 0)
 AC_SUBST(LT_REVISION, 0)
 AC_SUBST(LT_AGE, 8)
 
+dnl Must come before AM_INIT_AUTOMAKE.
+AC_CONFIG_AUX_DIR([build-aux])
 AM_INIT_AUTOMAKE([foreign -Wall])
+AC_CONFIG_MACRO_DIR([m4])
 
 ALL_LINGUAS="cs da de eo es fi fr ga gl hu id is it ja ko nb nl pl pt ro ru sk sl sv th tr uk vi wa zh_TW zh_CN"
 
-- 
Gitee


From de7ffd5a515b3ee54baa57e8a213598e3d6e6f2f Mon Sep 17 00:00:00 2001
From: Jeff Johnson <n3npq@mac.com>
Date: Tue, 18 Aug 2009 22:06:22 +0000
Subject: [PATCH 599/667] - repair the AutoFu (by eliminating build-aux/
 subdir).

---
 .cvsignore   | 1 +
 Makefile.am  | 4 ++--
 autogen.sh   | 2 +-
 configure.ac | 2 +-
 4 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/.cvsignore b/.cvsignore
index 2987312..d882ad0 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -31,6 +31,7 @@ mkinstalldirs
 stamp-h
 stamp-h1
 stamp-h.in
+tdict
 test1
 test2
 test3
diff --git a/Makefile.am b/Makefile.am
index cd8868c..e2025eb 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -4,7 +4,7 @@ AUTOMAKE_OPTIONS = 1.4 foreign
 
 LINT = splint
 
-EXTRA_DIST = build-aux/config.rpath autogen.sh CHANGES $(man_MANS) popt.spec \
+EXTRA_DIST = config.rpath  autogen.sh CHANGES $(man_MANS) popt.spec \
 	footer_no_timestamp.html libpopt.vers \
 	testit.sh test-poptrc test3-data/0* \
 	po/*.in po/*.po po/popt.pot \
@@ -12,7 +12,7 @@ EXTRA_DIST = build-aux/config.rpath autogen.sh CHANGES $(man_MANS) popt.spec \
 
 SUBDIRS = po
 
-INCLUDES = -I. -I$(top_srcdir)
+AM_CPPFLAGS = -I. -I$(top_srcdir)
 
 noinst_HEADERS = poptint.h system.h
 
diff --git a/autogen.sh b/autogen.sh
index a0212f4..63d786c 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -22,7 +22,7 @@ perl -p -i~ -e 's/(po\/Makefile\.in)\s+po\/Makefile\.in/$1/' configure.ac
 perl -p -i~ -e 's/(SUBDIRS\s+=\s+po)\s+po/$1/' Makefile.am
 aclocal -I m4
 autoheader
-automake -a -c
+automake -Wall -Wno-override -a -c
 autoconf
 
 if [ "$1" = "--noconfigure" ]; then 
diff --git a/configure.ac b/configure.ac
index 32beb39..bc2fe8c 100755
--- a/configure.ac
+++ b/configure.ac
@@ -13,7 +13,7 @@ AC_SUBST(LT_REVISION, 0)
 AC_SUBST(LT_AGE, 8)
 
 dnl Must come before AM_INIT_AUTOMAKE.
-AC_CONFIG_AUX_DIR([build-aux])
+dnl AC_CONFIG_AUX_DIR([build-aux])
 AM_INIT_AUTOMAKE([foreign -Wall])
 AC_CONFIG_MACRO_DIR([m4])
 
-- 
Gitee


From d4c549eab888863794449e39fb1f3f130effd5fb Mon Sep 17 00:00:00 2001
From: Jeff Johnson <n3npq@mac.com>
Date: Fri, 28 Aug 2009 00:06:33 +0000
Subject: [PATCH 600/667] - typo in with POPT_WCHAR_HACK. - typo in libopt.vers

---
 libpopt.vers | 2 +-
 popthelp.c   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/libpopt.vers b/libpopt.vers
index dca6b1a..3ac5e52 100644
--- a/libpopt.vers
+++ b/libpopt.vers
@@ -21,7 +21,7 @@ LIBPOPT_0
     poptBitsUnion;
     poptConfigFileToString;
     poptDupArgv;
-    poptFinit;
+    poptFini;
     poptFreeContext;
     poptGetArg;
     poptGetArgs;
diff --git a/popthelp.c b/popthelp.c
index 52667cd..4859980 100644
--- a/popthelp.c
+++ b/popthelp.c
@@ -144,7 +144,7 @@ static inline size_t stringDisplayWidth(const char *s)
     n = mbsrtowcs (NULL, &s, n, &t);
 #else
     n = 0;
-    for (; *s; s = POPT_next_char(s));
+    for (; *s; s = POPT_next_char(s))
 	n++;
 #endif
 
-- 
Gitee


From 0bfb55ae7c3bf82394ebbd3a5b5758a0c7674851 Mon Sep 17 00:00:00 2001
From: Jeff Johnson <n3npq@mac.com>
Date: Tue, 19 Jan 2010 00:39:09 +0000
Subject: [PATCH 601/667] - prefix bit set routines with popt to avoid symbol
 coolisions w rpm.

---
 CHANGES     |  1 +
 po/cs.po    | 44 ++++++++++++++++++++++++--------------------
 po/da.po    | 44 ++++++++++++++++++++++++--------------------
 po/de.po    | 44 ++++++++++++++++++++++++--------------------
 po/eo.po    | 44 ++++++++++++++++++++++++--------------------
 po/es.po    | 44 ++++++++++++++++++++++++--------------------
 po/fi.po    | 44 ++++++++++++++++++++++++--------------------
 po/fr.po    | 44 ++++++++++++++++++++++++--------------------
 po/ga.po    | 44 ++++++++++++++++++++++++--------------------
 po/gl.po    | 44 ++++++++++++++++++++++++--------------------
 po/hu.po    | 44 ++++++++++++++++++++++++--------------------
 po/id.po    | 44 ++++++++++++++++++++++++--------------------
 po/is.po    | 44 ++++++++++++++++++++++++--------------------
 po/it.po    | 44 ++++++++++++++++++++++++--------------------
 po/ja.po    | 44 ++++++++++++++++++++++++--------------------
 po/ko.po    | 44 ++++++++++++++++++++++++--------------------
 po/nb.po    | 44 ++++++++++++++++++++++++--------------------
 po/nl.po    | 44 ++++++++++++++++++++++++--------------------
 po/pl.po    | 44 ++++++++++++++++++++++++--------------------
 po/popt.pot | 44 ++++++++++++++++++++++++--------------------
 po/pt.po    | 44 ++++++++++++++++++++++++--------------------
 po/ro.po    | 44 ++++++++++++++++++++++++--------------------
 po/ru.po    | 44 ++++++++++++++++++++++++--------------------
 po/sk.po    | 44 ++++++++++++++++++++++++--------------------
 po/sl.po    | 44 ++++++++++++++++++++++++--------------------
 po/sv.po    | 44 ++++++++++++++++++++++++--------------------
 po/th.po    | 44 ++++++++++++++++++++++++--------------------
 po/tr.po    | 44 ++++++++++++++++++++++++--------------------
 po/uk.po    | 44 ++++++++++++++++++++++++--------------------
 po/vi.po    | 44 ++++++++++++++++++++++++--------------------
 po/wa.po    | 44 ++++++++++++++++++++++++--------------------
 po/zh_CN.po | 44 ++++++++++++++++++++++++--------------------
 po/zh_TW.po | 44 ++++++++++++++++++++++++--------------------
 popt.c      |  6 +++---
 poptint.c   |  1 +
 poptint.h   |  2 +-
 36 files changed, 774 insertions(+), 644 deletions(-)

diff --git a/CHANGES b/CHANGES
index beb4471..03dc4e7 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,4 +1,5 @@
 1.15 -> 1.16:
+    - prefix bit set routines with popt to avoid symbol coolisions w rpm.
     - add tdict.c to exercise popt bit sets against /usr/dict/words.
     - add poptBitsArgs() method to generate args bit set.
     - add methods for bit set union and intersection.
diff --git a/po/cs.po b/po/cs.po
index 8112990..447078a 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.14\n"
 "Report-Msgid-Bugs-To: <popt-devel@rpm5.org>\n"
-"POT-Creation-Date: 2009-04-12 20:14+0200\n"
+"POT-Creation-Date: 2009-09-13 11:40-0400\n"
 "PO-Revision-Date: 2008-12-08 19:55+0100\n"
 "Last-Translator: Petr Pisar <petr.pisar@atlas.cz>\n"
 "Language-Team: Czech <translation-team-cs@lists.sourceforge.net>\n"
@@ -20,52 +20,52 @@ msgstr ""
 msgid "unknown errno"
 msgstr "neznámé číslo chyby"
 
-#: popt.c:1031
+#: popt.c:1290
 #, c-format
 msgid "option type (%u) not implemented in popt\n"
 msgstr "typ volby (%u) není v popt implementován\n"
 
-#: popt.c:1452
+#: popt.c:1711
 msgid "missing argument"
 msgstr "chybí argument"
 
-#: popt.c:1454
+#: popt.c:1713
 msgid "unknown option"
 msgstr "neznámá volba"
 
-#: popt.c:1456
+#: popt.c:1715
 msgid "mutually exclusive logical operations requested"
 msgstr "požadovány vzájemně výlučné logické operace"
 
-#: popt.c:1458
+#: popt.c:1717
 msgid "opt->arg should not be NULL"
 msgstr "opt->arg nesmí být NULL"
 
-#: popt.c:1460
+#: popt.c:1719
 msgid "aliases nested too deeply"
 msgstr "aliasy vnořené příliš hluboko"
 
-#: popt.c:1462
+#: popt.c:1721
 msgid "error in parameter quoting"
 msgstr "chyba v quotování parametrů"
 
-#: popt.c:1464
+#: popt.c:1723
 msgid "invalid numeric value"
 msgstr "chybná numerická hodnota"
 
-#: popt.c:1466
+#: popt.c:1725
 msgid "number too large or too small"
 msgstr "číslo je příliš velké nebo příliš malé"
 
-#: popt.c:1468
+#: popt.c:1727
 msgid "memory allocation failed"
 msgstr "selhala alokace paměti"
 
-#: popt.c:1470
+#: popt.c:1729
 msgid "config file failed sanity test"
 msgstr ""
 
-#: popt.c:1474
+#: popt.c:1733
 msgid "unknown error"
 msgstr "neznámá chyba"
 
@@ -106,33 +106,37 @@ msgid "INT"
 msgstr "INT"
 
 #: popthelp.c:207
+msgid "SHORT"
+msgstr ""
+
+#: popthelp.c:208
 msgid "LONG"
 msgstr "LONG"
 
-#: popthelp.c:208
+#: popthelp.c:209
 msgid "LONGLONG"
 msgstr "LONGLONG"
 
-#: popthelp.c:209
+#: popthelp.c:210
 msgid "STRING"
 msgstr "STRING"
 
-#: popthelp.c:210
+#: popthelp.c:211
 msgid "FLOAT"
 msgstr "FLOAT"
 
-#: popthelp.c:211
+#: popthelp.c:212
 msgid "DOUBLE"
 msgstr "DOUBLE"
 
-#: popthelp.c:214
+#: popthelp.c:215
 msgid "ARG"
 msgstr "ARG"
 
-#: popthelp.c:644
+#: popthelp.c:649
 msgid "Usage:"
 msgstr "Použití:"
 
-#: popthelp.c:667
+#: popthelp.c:672
 msgid "[OPTION...]"
 msgstr "[VOLBY…]"
diff --git a/po/da.po b/po/da.po
index 61cf26e..13ed3ca 100644
--- a/po/da.po
+++ b/po/da.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: popt-1.14\n"
 "Report-Msgid-Bugs-To: <popt-devel@rpm5.org>\n"
-"POT-Creation-Date: 2009-04-12 20:14+0200\n"
+"POT-Creation-Date: 2009-09-13 11:40-0400\n"
 "PO-Revision-Date: 2008-09-15 00:00+0000\n"
 "Last-Translator: Joe Hansen <joedalton2@yahoo.dk>\n"
 "Language-Team: Danish <dansk@dansk-gruppen.dk>\n"
@@ -20,52 +20,52 @@ msgstr ""
 msgid "unknown errno"
 msgstr "ukendt fejlnr."
 
-#: popt.c:1031
+#: popt.c:1290
 #, c-format
 msgid "option type (%u) not implemented in popt\n"
 msgstr "tilvalgstype (%u) er ikke implementeret i popt\n"
 
-#: popt.c:1452
+#: popt.c:1711
 msgid "missing argument"
 msgstr "mangler argument"
 
-#: popt.c:1454
+#: popt.c:1713
 msgid "unknown option"
 msgstr "ukendt tilvalg"
 
-#: popt.c:1456
+#: popt.c:1715
 msgid "mutually exclusive logical operations requested"
 msgstr "de ønskede handlinger udelukker hinanden"
 
-#: popt.c:1458
+#: popt.c:1717
 msgid "opt->arg should not be NULL"
 msgstr "opt->arg bør ikke være NULL"
 
-#: popt.c:1460
+#: popt.c:1719
 msgid "aliases nested too deeply"
 msgstr "aliaser er for dybt indlejret"
 
-#: popt.c:1462
+#: popt.c:1721
 msgid "error in parameter quoting"
 msgstr "fejl i parameter citering"
 
-#: popt.c:1464
+#: popt.c:1723
 msgid "invalid numeric value"
 msgstr "ugyldig numerisk værdi"
 
-#: popt.c:1466
+#: popt.c:1725
 msgid "number too large or too small"
 msgstr "nummer for stort, eller for lille"
 
-#: popt.c:1468
+#: popt.c:1727
 msgid "memory allocation failed"
 msgstr "hukommelsestildeling mislykkedes"
 
-#: popt.c:1470
+#: popt.c:1729
 msgid "config file failed sanity test"
 msgstr ""
 
-#: popt.c:1474
+#: popt.c:1733
 msgid "unknown error"
 msgstr "ukendt fejl"
 
@@ -106,33 +106,37 @@ msgid "INT"
 msgstr "INT"
 
 #: popthelp.c:207
+msgid "SHORT"
+msgstr ""
+
+#: popthelp.c:208
 msgid "LONG"
 msgstr "LONG"
 
-#: popthelp.c:208
+#: popthelp.c:209
 msgid "LONGLONG"
 msgstr "LONGLONG"
 
-#: popthelp.c:209
+#: popthelp.c:210
 msgid "STRING"
 msgstr "STRING"
 
-#: popthelp.c:210
+#: popthelp.c:211
 msgid "FLOAT"
 msgstr "FLOAT"
 
-#: popthelp.c:211
+#: popthelp.c:212
 msgid "DOUBLE"
 msgstr "DOUBLE"
 
-#: popthelp.c:214
+#: popthelp.c:215
 msgid "ARG"
 msgstr "ARG"
 
-#: popthelp.c:644
+#: popthelp.c:649
 msgid "Usage:"
 msgstr "Brug:"
 
-#: popthelp.c:667
+#: popthelp.c:672
 msgid "[OPTION...]"
 msgstr "[TILVALG...]"
diff --git a/po/de.po b/po/de.po
index bf15e35..ef10c51 100644
--- a/po/de.po
+++ b/po/de.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.15\n"
 "Report-Msgid-Bugs-To: <popt-devel@rpm5.org>\n"
-"POT-Creation-Date: 2009-04-12 20:14+0200\n"
+"POT-Creation-Date: 2009-09-13 11:40-0400\n"
 "PO-Revision-Date: 2009-04-17 14:05+0200\n"
 "Last-Translator: Robert Scheck <robert@rpm5.org>\n"
 "Language-Team: German <de@li.org>\n"
@@ -18,52 +18,52 @@ msgstr ""
 msgid "unknown errno"
 msgstr "Unbekannte Fehler-Nummer"
 
-#: popt.c:1031
+#: popt.c:1290
 #, c-format
 msgid "option type (%u) not implemented in popt\n"
 msgstr "Optionstyp (%u) ist nicht in popt implementiert\n"
 
-#: popt.c:1452
+#: popt.c:1711
 msgid "missing argument"
 msgstr "Fehlendes Argument"
 
-#: popt.c:1454
+#: popt.c:1713
 msgid "unknown option"
 msgstr "Unbekannte Option"
 
-#: popt.c:1456
+#: popt.c:1715
 msgid "mutually exclusive logical operations requested"
 msgstr "Gegenseitig ausschließende logische Operatoren"
 
-#: popt.c:1458
+#: popt.c:1717
 msgid "opt->arg should not be NULL"
 msgstr "opt->arg sollte nicht NULL sein"
 
-#: popt.c:1460
+#: popt.c:1719
 msgid "aliases nested too deeply"
 msgstr "Aliase zu tief verschachtelt"
 
-#: popt.c:1462
+#: popt.c:1721
 msgid "error in parameter quoting"
 msgstr "Fehler beim Quotieren der Parameter"
 
-#: popt.c:1464
+#: popt.c:1723
 msgid "invalid numeric value"
 msgstr "Ungültiger nummerischer Wert"
 
-#: popt.c:1466
+#: popt.c:1725
 msgid "number too large or too small"
 msgstr "Nummer zu groß oder zu klein"
 
-#: popt.c:1468
+#: popt.c:1727
 msgid "memory allocation failed"
 msgstr "Speicherzuordnung fehlgeschlagen"
 
-#: popt.c:1470
+#: popt.c:1729
 msgid "config file failed sanity test"
 msgstr ""
 
-#: popt.c:1474
+#: popt.c:1733
 msgid "unknown error"
 msgstr "Unbekannter Fehler"
 
@@ -104,33 +104,37 @@ msgid "INT"
 msgstr "INTEGER"
 
 #: popthelp.c:207
+msgid "SHORT"
+msgstr ""
+
+#: popthelp.c:208
 msgid "LONG"
 msgstr "LONG"
 
-#: popthelp.c:208
+#: popthelp.c:209
 msgid "LONGLONG"
 msgstr "LONGLONG"
 
-#: popthelp.c:209
+#: popthelp.c:210
 msgid "STRING"
 msgstr "STRING"
 
-#: popthelp.c:210
+#: popthelp.c:211
 msgid "FLOAT"
 msgstr "FLOAT"
 
-#: popthelp.c:211
+#: popthelp.c:212
 msgid "DOUBLE"
 msgstr "DOUBLE"
 
-#: popthelp.c:214
+#: popthelp.c:215
 msgid "ARG"
 msgstr "ARGUMENT"
 
-#: popthelp.c:644
+#: popthelp.c:649
 msgid "Usage:"
 msgstr "Verwendung:"
 
-#: popthelp.c:667
+#: popthelp.c:672
 msgid "[OPTION...]"
 msgstr "[OPTION...]"
diff --git a/po/eo.po b/po/eo.po
index ee5aa87..88c1e8a 100644
--- a/po/eo.po
+++ b/po/eo.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.14\n"
 "Report-Msgid-Bugs-To: <popt-devel@rpm5.org>\n"
-"POT-Creation-Date: 2009-04-12 20:14+0200\n"
+"POT-Creation-Date: 2009-09-13 11:40-0400\n"
 "PO-Revision-Date: 2008-08-03 15:50-0300\n"
 "Last-Translator: Felipe Castro <fefcas@gmail.com>\n"
 "Language-Team: Esperanto <translation-team-eo@lists.sourceforge.net>\n"
@@ -18,52 +18,52 @@ msgstr ""
 msgid "unknown errno"
 msgstr "nekonata erarnumero"
 
-#: popt.c:1031
+#: popt.c:1290
 #, c-format
 msgid "option type (%u) not implemented in popt\n"
 msgstr "la opcia tipo (%u) ne estas realigita en popt\n"
 
-#: popt.c:1452
+#: popt.c:1711
 msgid "missing argument"
 msgstr "mankas argumento"
 
-#: popt.c:1454
+#: popt.c:1713
 msgid "unknown option"
 msgstr "nekonata opcio"
 
-#: popt.c:1456
+#: popt.c:1715
 msgid "mutually exclusive logical operations requested"
 msgstr "reciprokaj logikaj operacioj estas postulataj"
 
-#: popt.c:1458
+#: popt.c:1717
 msgid "opt->arg should not be NULL"
 msgstr "opt->arg ne devus esti NULL"
 
-#: popt.c:1460
+#: popt.c:1719
 msgid "aliases nested too deeply"
 msgstr "kromnomoj estas ingitaj tro profunde"
 
-#: popt.c:1462
+#: popt.c:1721
 msgid "error in parameter quoting"
 msgstr "eraro en parametra citado"
 
-#: popt.c:1464
+#: popt.c:1723
 msgid "invalid numeric value"
 msgstr "nevalida numera valoro"
 
-#: popt.c:1466
+#: popt.c:1725
 msgid "number too large or too small"
 msgstr "numero tro granda aŭ tro eta"
 
-#: popt.c:1468
+#: popt.c:1727
 msgid "memory allocation failed"
 msgstr "malsukceso dum okupado de memoro"
 
-#: popt.c:1470
+#: popt.c:1729
 msgid "config file failed sanity test"
 msgstr ""
 
-#: popt.c:1474
+#: popt.c:1733
 msgid "unknown error"
 msgstr "nekonata eraro"
 
@@ -104,33 +104,37 @@ msgid "INT"
 msgstr "INT"
 
 #: popthelp.c:207
+msgid "SHORT"
+msgstr ""
+
+#: popthelp.c:208
 msgid "LONG"
 msgstr "LONG"
 
-#: popthelp.c:208
+#: popthelp.c:209
 msgid "LONGLONG"
 msgstr "LONGLONG"
 
-#: popthelp.c:209
+#: popthelp.c:210
 msgid "STRING"
 msgstr "STRING"
 
-#: popthelp.c:210
+#: popthelp.c:211
 msgid "FLOAT"
 msgstr "FLOAT"
 
-#: popthelp.c:211
+#: popthelp.c:212
 msgid "DOUBLE"
 msgstr "DOUBLE"
 
-#: popthelp.c:214
+#: popthelp.c:215
 msgid "ARG"
 msgstr "ARG"
 
-#: popthelp.c:644
+#: popthelp.c:649
 msgid "Usage:"
 msgstr "Uzado:"
 
-#: popthelp.c:667
+#: popthelp.c:672
 msgid "[OPTION...]"
 msgstr "[OPCIO...]"
diff --git a/po/es.po b/po/es.po
index 08dfe89..5429b8b 100644
--- a/po/es.po
+++ b/po/es.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.12\n"
 "Report-Msgid-Bugs-To: <popt-devel@rpm5.org>\n"
-"POT-Creation-Date: 2009-04-12 20:14+0200\n"
+"POT-Creation-Date: 2009-09-13 11:40-0400\n"
 "PO-Revision-Date: 2007-12-28 12:22+0100\n"
 "Last-Translator: Leandro Lucarella <luca@linuxmendoza.org.ar>\n"
 "Language-Team: Spanish <es@li.org>\n"
@@ -18,52 +18,52 @@ msgstr ""
 msgid "unknown errno"
 msgstr "errno desconocido"
 
-#: popt.c:1031
+#: popt.c:1290
 #, fuzzy, c-format
 msgid "option type (%u) not implemented in popt\n"
 msgstr "tipo de opción (%d) no implementada en popt\n"
 
-#: popt.c:1452
+#: popt.c:1711
 msgid "missing argument"
 msgstr "falta argumento"
 
-#: popt.c:1454
+#: popt.c:1713
 msgid "unknown option"
 msgstr "opción desconocida"
 
-#: popt.c:1456
+#: popt.c:1715
 msgid "mutually exclusive logical operations requested"
 msgstr "requerida operación lógica mutuamente exclusiva"
 
-#: popt.c:1458
+#: popt.c:1717
 msgid "opt->arg should not be NULL"
 msgstr ""
 
-#: popt.c:1460
+#: popt.c:1719
 msgid "aliases nested too deeply"
 msgstr "alias anidados muy profundamente"
 
-#: popt.c:1462
+#: popt.c:1721
 msgid "error in parameter quoting"
 msgstr "error en cita de parámetros"
 
-#: popt.c:1464
+#: popt.c:1723
 msgid "invalid numeric value"
 msgstr "valor numérico inválido"
 
-#: popt.c:1466
+#: popt.c:1725
 msgid "number too large or too small"
 msgstr "número muy largo o muy pequeño"
 
-#: popt.c:1468
+#: popt.c:1727
 msgid "memory allocation failed"
 msgstr ""
 
-#: popt.c:1470
+#: popt.c:1729
 msgid "config file failed sanity test"
 msgstr ""
 
-#: popt.c:1474
+#: popt.c:1733
 msgid "unknown error"
 msgstr "error desconocido"
 
@@ -104,34 +104,38 @@ msgid "INT"
 msgstr "INT"
 
 #: popthelp.c:207
+msgid "SHORT"
+msgstr ""
+
+#: popthelp.c:208
 msgid "LONG"
 msgstr "LONG"
 
-#: popthelp.c:208
+#: popthelp.c:209
 #, fuzzy
 msgid "LONGLONG"
 msgstr "LONG"
 
-#: popthelp.c:209
+#: popthelp.c:210
 msgid "STRING"
 msgstr "STRING"
 
-#: popthelp.c:210
+#: popthelp.c:211
 msgid "FLOAT"
 msgstr "FLOAT"
 
-#: popthelp.c:211
+#: popthelp.c:212
 msgid "DOUBLE"
 msgstr "DOUBLE"
 
-#: popthelp.c:214
+#: popthelp.c:215
 msgid "ARG"
 msgstr "ARG"
 
-#: popthelp.c:644
+#: popthelp.c:649
 msgid "Usage:"
 msgstr "Modo de uso:"
 
-#: popthelp.c:667
+#: popthelp.c:672
 msgid "[OPTION...]"
 msgstr "[OPCIÓN...]"
diff --git a/po/fi.po b/po/fi.po
index c8dc8ae..3daa2c5 100644
--- a/po/fi.po
+++ b/po/fi.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.14\n"
 "Report-Msgid-Bugs-To: <popt-devel@rpm5.org>\n"
-"POT-Creation-Date: 2009-04-12 20:14+0200\n"
+"POT-Creation-Date: 2009-09-13 11:40-0400\n"
 "PO-Revision-Date: 2008-02-21 18:19+0200\n"
 "Last-Translator: Jorma Karvonen <karvjorm@users.sf.net>\n"
 "Language-Team: Finnish <translation-team-fi@lists.sourceforge.net>\n"
@@ -23,52 +23,52 @@ msgstr ""
 msgid "unknown errno"
 msgstr "tuntematon errno-virhenumeroarvo"
 
-#: popt.c:1031
+#: popt.c:1290
 #, c-format
 msgid "option type (%u) not implemented in popt\n"
 msgstr "valitsintyyppiä (%u) ei ole toteutettu popt-ohjelmassa\n"
 
-#: popt.c:1452
+#: popt.c:1711
 msgid "missing argument"
 msgstr "puuttuva argumentti"
 
-#: popt.c:1454
+#: popt.c:1713
 msgid "unknown option"
 msgstr "tuntematon valitsin"
 
-#: popt.c:1456
+#: popt.c:1715
 msgid "mutually exclusive logical operations requested"
 msgstr "pyydettyjä loogisia toimintoja ei voi käyttää yhdessä"
 
-#: popt.c:1458
+#: popt.c:1717
 msgid "opt->arg should not be NULL"
 msgstr "”opt->arg”-valitsinargumentti ei saa olla NULL"
 
-#: popt.c:1460
+#: popt.c:1719
 msgid "aliases nested too deeply"
 msgstr "liian monta aliasta sisäkkäin"
 
-#: popt.c:1462
+#: popt.c:1721
 msgid "error in parameter quoting"
 msgstr "virhe parametrien lainauksessa"
 
-#: popt.c:1464
+#: popt.c:1723
 msgid "invalid numeric value"
 msgstr "virheellinen numeroarvo"
 
-#: popt.c:1466
+#: popt.c:1725
 msgid "number too large or too small"
 msgstr "numero on liian iso tai liian pieni"
 
-#: popt.c:1468
+#: popt.c:1727
 msgid "memory allocation failed"
 msgstr "muistin varaus ei onnistunut"
 
-#: popt.c:1470
+#: popt.c:1729
 msgid "config file failed sanity test"
 msgstr ""
 
-#: popt.c:1474
+#: popt.c:1733
 msgid "unknown error"
 msgstr "tuntematon virhe"
 
@@ -111,33 +111,37 @@ msgid "INT"
 msgstr "INT-KOKONAISLUKU"
 
 #: popthelp.c:207
+msgid "SHORT"
+msgstr ""
+
+#: popthelp.c:208
 msgid "LONG"
 msgstr "LONG-KOKONAISLUKU"
 
-#: popthelp.c:208
+#: popthelp.c:209
 msgid "LONGLONG"
 msgstr "LONGLONG-KOKONAISLUKU"
 
-#: popthelp.c:209
+#: popthelp.c:210
 msgid "STRING"
 msgstr "MERKKIJONO"
 
-#: popthelp.c:210
+#: popthelp.c:211
 msgid "FLOAT"
 msgstr "FLOAT-LIUKULUKU"
 
-#: popthelp.c:211
+#: popthelp.c:212
 msgid "DOUBLE"
 msgstr "DOUBLE-LIUKULUKU"
 
-#: popthelp.c:214
+#: popthelp.c:215
 msgid "ARG"
 msgstr "ARGUMENTTI"
 
-#: popthelp.c:644
+#: popthelp.c:649
 msgid "Usage:"
 msgstr "Käyttö:"
 
-#: popthelp.c:667
+#: popthelp.c:672
 msgid "[OPTION...]"
 msgstr "[VALITSIN...]"
diff --git a/po/fr.po b/po/fr.po
index c5dd4aa..bbf5542 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -12,7 +12,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.11\n"
 "Report-Msgid-Bugs-To: <popt-devel@rpm5.org>\n"
-"POT-Creation-Date: 2009-04-12 20:14+0200\n"
+"POT-Creation-Date: 2009-09-13 11:40-0400\n"
 "PO-Revision-Date: 2003-06-22 23:43+0200\n"
 "Last-Translator: RPM French Translation <rpm-fr@livna.org>\n"
 "Language-Team: RPM French Translation <rpm-fr@livna.org>\n"
@@ -24,52 +24,52 @@ msgstr ""
 msgid "unknown errno"
 msgstr "errno inconnu"
 
-#: popt.c:1031
+#: popt.c:1290
 #, fuzzy, c-format
 msgid "option type (%u) not implemented in popt\n"
 msgstr "type(%d) d'option non implémenté dans popt\n"
 
-#: popt.c:1452
+#: popt.c:1711
 msgid "missing argument"
 msgstr "argument manquant"
 
-#: popt.c:1454
+#: popt.c:1713
 msgid "unknown option"
 msgstr "option iconnue"
 
-#: popt.c:1456
+#: popt.c:1715
 msgid "mutually exclusive logical operations requested"
 msgstr "opérations logiques mutuellement exclusives requises"
 
-#: popt.c:1458
+#: popt.c:1717
 msgid "opt->arg should not be NULL"
 msgstr "opt->arg ne devrait pas être NULL"
 
-#: popt.c:1460
+#: popt.c:1719
 msgid "aliases nested too deeply"
 msgstr "les alias sont trop entremellés"
 
-#: popt.c:1462
+#: popt.c:1721
 msgid "error in parameter quoting"
 msgstr "erreur en citant les paramètres"
 
-#: popt.c:1464
+#: popt.c:1723
 msgid "invalid numeric value"
 msgstr "valeur numérique invalide"
 
-#: popt.c:1466
+#: popt.c:1725
 msgid "number too large or too small"
 msgstr "nombre trop grand ou trop petit"
 
-#: popt.c:1468
+#: popt.c:1727
 msgid "memory allocation failed"
 msgstr "échec de l'allocation de mémoire"
 
-#: popt.c:1470
+#: popt.c:1729
 msgid "config file failed sanity test"
 msgstr ""
 
-#: popt.c:1474
+#: popt.c:1733
 msgid "unknown error"
 msgstr "erreur inconnue"
 
@@ -110,34 +110,38 @@ msgid "INT"
 msgstr "ENTIER"
 
 #: popthelp.c:207
+msgid "SHORT"
+msgstr ""
+
+#: popthelp.c:208
 msgid "LONG"
 msgstr "LONG"
 
-#: popthelp.c:208
+#: popthelp.c:209
 #, fuzzy
 msgid "LONGLONG"
 msgstr "LONG"
 
-#: popthelp.c:209
+#: popthelp.c:210
 msgid "STRING"
 msgstr "CHAINE"
 
-#: popthelp.c:210
+#: popthelp.c:211
 msgid "FLOAT"
 msgstr "FLOTTANT"
 
-#: popthelp.c:211
+#: popthelp.c:212
 msgid "DOUBLE"
 msgstr "DOUBLE"
 
-#: popthelp.c:214
+#: popthelp.c:215
 msgid "ARG"
 msgstr "ARG"
 
-#: popthelp.c:644
+#: popthelp.c:649
 msgid "Usage:"
 msgstr "Utilisation:"
 
-#: popthelp.c:667
+#: popthelp.c:672
 msgid "[OPTION...]"
 msgstr "[OPTION...]"
diff --git a/po/ga.po b/po/ga.po
index c82c8de..54173e5 100644
--- a/po/ga.po
+++ b/po/ga.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.14\n"
 "Report-Msgid-Bugs-To: <popt-devel@rpm5.org>\n"
-"POT-Creation-Date: 2009-04-12 20:14+0200\n"
+"POT-Creation-Date: 2009-09-13 11:40-0400\n"
 "PO-Revision-Date: 2008-04-10 06:21-0500\n"
 "Last-Translator: Kevin Scannell <kscanne@gmail.com>\n"
 "Language-Team: Irish <gaeilge-gnulinux@lists.sourceforge.net>\n"
@@ -18,52 +18,52 @@ msgstr ""
 msgid "unknown errno"
 msgstr "errno anaithnid"
 
-#: popt.c:1031
+#: popt.c:1290
 #, c-format
 msgid "option type (%u) not implemented in popt\n"
 msgstr "níl an cineál rogha seo (%u) ar fáil i popt\n"
 
-#: popt.c:1452
+#: popt.c:1711
 msgid "missing argument"
 msgstr "argóint ar iarraidh"
 
-#: popt.c:1454
+#: popt.c:1713
 msgid "unknown option"
 msgstr "rogha anaithnid"
 
-#: popt.c:1456
+#: popt.c:1715
 msgid "mutually exclusive logical operations requested"
 msgstr "iarradh oibríochtaí loighciúla comheisiacha"
 
-#: popt.c:1458
+#: popt.c:1717
 msgid "opt->arg should not be NULL"
 msgstr "níor chóir rogha->arg a bheith NULL"
 
-#: popt.c:1460
+#: popt.c:1719
 msgid "aliases nested too deeply"
 msgstr "ailiasanna neadaithe ródhomhain"
 
-#: popt.c:1462
+#: popt.c:1721
 msgid "error in parameter quoting"
 msgstr "earráid agus paraiméadar á chur faoi chomharthaí athfhriotail"
 
-#: popt.c:1464
+#: popt.c:1723
 msgid "invalid numeric value"
 msgstr "luach neamhbhailí uimhriúil"
 
-#: popt.c:1466
+#: popt.c:1725
 msgid "number too large or too small"
 msgstr "uimhir rómhór nó róbheag"
 
-#: popt.c:1468
+#: popt.c:1727
 msgid "memory allocation failed"
 msgstr "theip ar dháileadh na cuimhne"
 
-#: popt.c:1470
+#: popt.c:1729
 msgid "config file failed sanity test"
 msgstr ""
 
-#: popt.c:1474
+#: popt.c:1733
 msgid "unknown error"
 msgstr "earráid anaithnid"
 
@@ -105,33 +105,37 @@ msgid "INT"
 msgstr "INT"
 
 #: popthelp.c:207
+msgid "SHORT"
+msgstr ""
+
+#: popthelp.c:208
 msgid "LONG"
 msgstr "LONG"
 
-#: popthelp.c:208
+#: popthelp.c:209
 msgid "LONGLONG"
 msgstr "LONGLONG"
 
-#: popthelp.c:209
+#: popthelp.c:210
 msgid "STRING"
 msgstr "STRING"
 
-#: popthelp.c:210
+#: popthelp.c:211
 msgid "FLOAT"
 msgstr "FLOAT"
 
-#: popthelp.c:211
+#: popthelp.c:212
 msgid "DOUBLE"
 msgstr "DOUBLE"
 
-#: popthelp.c:214
+#: popthelp.c:215
 msgid "ARG"
 msgstr "ARG"
 
-#: popthelp.c:644
+#: popthelp.c:649
 msgid "Usage:"
 msgstr "Úsáid:"
 
-#: popthelp.c:667
+#: popthelp.c:672
 msgid "[OPTION...]"
 msgstr "[ROGHA...]"
diff --git a/po/gl.po b/po/gl.po
index 005d961..1c46b93 100644
--- a/po/gl.po
+++ b/po/gl.po
@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.11\n"
 "Report-Msgid-Bugs-To: <popt-devel@rpm5.org>\n"
-"POT-Creation-Date: 2009-04-12 20:14+0200\n"
+"POT-Creation-Date: 2009-09-13 11:40-0400\n"
 "PO-Revision-Date: 2001-01-17 01:01+0100\n"
 "Last-Translator: Jes�s Bravo �lvarez <jba@pobox.com>\n"
 "Language-Team: Galician <trasno@ceu.fi.udc.es>\n"
@@ -14,52 +14,52 @@ msgstr ""
 msgid "unknown errno"
 msgstr "errno desco�ecido"
 
-#: popt.c:1031
+#: popt.c:1290
 #, fuzzy, c-format
 msgid "option type (%u) not implemented in popt\n"
 msgstr "tipo de opci�n (%d) non implementada en popt\n"
 
-#: popt.c:1452
+#: popt.c:1711
 msgid "missing argument"
 msgstr "falta un argumento"
 
-#: popt.c:1454
+#: popt.c:1713
 msgid "unknown option"
 msgstr "opci�n desco�ecida"
 
-#: popt.c:1456
+#: popt.c:1715
 msgid "mutually exclusive logical operations requested"
 msgstr "solicit�ronse operaci�ns l�xicas mutuamente exclu�ntes"
 
-#: popt.c:1458
+#: popt.c:1717
 msgid "opt->arg should not be NULL"
 msgstr ""
 
-#: popt.c:1460
+#: popt.c:1719
 msgid "aliases nested too deeply"
 msgstr "aliases ani�ados a un nivel demasiado profundo"
 
-#: popt.c:1462
+#: popt.c:1721
 msgid "error in parameter quoting"
 msgstr "erro nas comi�as do par�metro"
 
-#: popt.c:1464
+#: popt.c:1723
 msgid "invalid numeric value"
 msgstr "valor num�rico non v�lido"
 
-#: popt.c:1466
+#: popt.c:1725
 msgid "number too large or too small"
 msgstr "n�mero demasiado grande ou pequeno"
 
-#: popt.c:1468
+#: popt.c:1727
 msgid "memory allocation failed"
 msgstr ""
 
-#: popt.c:1470
+#: popt.c:1729
 msgid "config file failed sanity test"
 msgstr ""
 
-#: popt.c:1474
+#: popt.c:1733
 msgid "unknown error"
 msgstr "erro desco�ecido"
 
@@ -101,34 +101,38 @@ msgid "INT"
 msgstr "INT"
 
 #: popthelp.c:207
+msgid "SHORT"
+msgstr ""
+
+#: popthelp.c:208
 msgid "LONG"
 msgstr "LONG"
 
-#: popthelp.c:208
+#: popthelp.c:209
 #, fuzzy
 msgid "LONGLONG"
 msgstr "LONG"
 
-#: popthelp.c:209
+#: popthelp.c:210
 msgid "STRING"
 msgstr "CADEA"
 
-#: popthelp.c:210
+#: popthelp.c:211
 msgid "FLOAT"
 msgstr "FLOAT"
 
-#: popthelp.c:211
+#: popthelp.c:212
 msgid "DOUBLE"
 msgstr "DOUBLE"
 
-#: popthelp.c:214
+#: popthelp.c:215
 msgid "ARG"
 msgstr "ARG"
 
-#: popthelp.c:644
+#: popthelp.c:649
 msgid "Usage:"
 msgstr "Uso:"
 
-#: popthelp.c:667
+#: popthelp.c:672
 msgid "[OPTION...]"
 msgstr "[OPCI�N...]"
diff --git a/po/hu.po b/po/hu.po
index 0705c9b..d02489a 100644
--- a/po/hu.po
+++ b/po/hu.po
@@ -5,7 +5,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.11\n"
 "Report-Msgid-Bugs-To: <popt-devel@rpm5.org>\n"
-"POT-Creation-Date: 2009-04-12 20:14+0200\n"
+"POT-Creation-Date: 2009-09-13 11:40-0400\n"
 "PO-Revision-Date: 2007-06-21 00:45+0200\n"
 "Last-Translator: Gabor Kelemen <kelemeng@gnome.hu>\n"
 "Language-Team: Hungarian <translation-team-hu@lists.sourceforge.net>\n"
@@ -19,52 +19,52 @@ msgstr ""
 msgid "unknown errno"
 msgstr "ismeretlen hibaszám"
 
-#: popt.c:1031
+#: popt.c:1290
 #, fuzzy, c-format
 msgid "option type (%u) not implemented in popt\n"
 msgstr "a kapcsolótípus (%d) nincs megvalósítva a popt-ban\n"
 
-#: popt.c:1452
+#: popt.c:1711
 msgid "missing argument"
 msgstr "hiányzó paraméter"
 
-#: popt.c:1454
+#: popt.c:1713
 msgid "unknown option"
 msgstr "ismeretlen kapcsoló"
 
-#: popt.c:1456
+#: popt.c:1715
 msgid "mutually exclusive logical operations requested"
 msgstr "kölcsönösen kizáró logikai műveleteket kért"
 
-#: popt.c:1458
+#: popt.c:1717
 msgid "opt->arg should not be NULL"
 msgstr "az opt->arg nem lehet NULL"
 
-#: popt.c:1460
+#: popt.c:1719
 msgid "aliases nested too deeply"
 msgstr "az álnevek túl mélyen vannak egymásba ágyazva"
 
-#: popt.c:1462
+#: popt.c:1721
 msgid "error in parameter quoting"
 msgstr "hiba a paraméter idézésében"
 
-#: popt.c:1464
+#: popt.c:1723
 msgid "invalid numeric value"
 msgstr "érvénytelen numerikus érték"
 
-#: popt.c:1466
+#: popt.c:1725
 msgid "number too large or too small"
 msgstr "a szám túl nagy vagy túl kicsi"
 
-#: popt.c:1468
+#: popt.c:1727
 msgid "memory allocation failed"
 msgstr "a memóriafoglalás meghiúsult"
 
-#: popt.c:1470
+#: popt.c:1729
 msgid "config file failed sanity test"
 msgstr ""
 
-#: popt.c:1474
+#: popt.c:1733
 msgid "unknown error"
 msgstr "ismeretlen hiba"
 
@@ -106,34 +106,38 @@ msgid "INT"
 msgstr "EGÉSZ"
 
 #: popthelp.c:207
+msgid "SHORT"
+msgstr ""
+
+#: popthelp.c:208
 msgid "LONG"
 msgstr "HOSSZÚ"
 
-#: popthelp.c:208
+#: popthelp.c:209
 #, fuzzy
 msgid "LONGLONG"
 msgstr "HOSSZÚ"
 
-#: popthelp.c:209
+#: popthelp.c:210
 msgid "STRING"
 msgstr "SZÖVEG"
 
-#: popthelp.c:210
+#: popthelp.c:211
 msgid "FLOAT"
 msgstr "LEBEGŐ"
 
-#: popthelp.c:211
+#: popthelp.c:212
 msgid "DOUBLE"
 msgstr "DUPLA"
 
-#: popthelp.c:214
+#: popthelp.c:215
 msgid "ARG"
 msgstr "PAR"
 
-#: popthelp.c:644
+#: popthelp.c:649
 msgid "Usage:"
 msgstr "Használat:"
 
-#: popthelp.c:667
+#: popthelp.c:672
 msgid "[OPTION...]"
 msgstr "[KAPCSOLÓ...]"
diff --git a/po/id.po b/po/id.po
index ff079b0..3aa701d 100644
--- a/po/id.po
+++ b/po/id.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.14\n"
 "Report-Msgid-Bugs-To: <popt-devel@rpm5.org>\n"
-"POT-Creation-Date: 2009-04-12 20:14+0200\n"
+"POT-Creation-Date: 2009-09-13 11:40-0400\n"
 "PO-Revision-Date: 2008-08-26 14:18+0700\n"
 "Last-Translator: Andhika Padmawan <andhika.padmawan@gmail.com>\n"
 "Language-Team: Indonesian <translation-team-id@lists.sourceforge.net>\n"
@@ -18,52 +18,52 @@ msgstr ""
 msgid "unknown errno"
 msgstr "errno tak diketahui"
 
-#: popt.c:1031
+#: popt.c:1290
 #, c-format
 msgid "option type (%u) not implemented in popt\n"
 msgstr "tipe opsi (%u) tak diimplementasikan di popt\n"
 
-#: popt.c:1452
+#: popt.c:1711
 msgid "missing argument"
 msgstr "kehilangan argumen"
 
-#: popt.c:1454
+#: popt.c:1713
 msgid "unknown option"
 msgstr "opsi tak diketahui"
 
-#: popt.c:1456
+#: popt.c:1715
 msgid "mutually exclusive logical operations requested"
 msgstr "permintaan operasi logika eksklusif secara mutual"
 
-#: popt.c:1458
+#: popt.c:1717
 msgid "opt->arg should not be NULL"
 msgstr "opt->arg tidak boleh NULL"
 
-#: popt.c:1460
+#: popt.c:1719
 msgid "aliases nested too deeply"
 msgstr "alias disarangkan terlalu dalam"
 
-#: popt.c:1462
+#: popt.c:1721
 msgid "error in parameter quoting"
 msgstr "galat di pencantuman parameter"
 
-#: popt.c:1464
+#: popt.c:1723
 msgid "invalid numeric value"
 msgstr "nilai numerik tidak sah"
 
-#: popt.c:1466
+#: popt.c:1725
 msgid "number too large or too small"
 msgstr "nomor terlalu besar atau terlalu kecil"
 
-#: popt.c:1468
+#: popt.c:1727
 msgid "memory allocation failed"
 msgstr "alokasi memori gagal"
 
-#: popt.c:1470
+#: popt.c:1729
 msgid "config file failed sanity test"
 msgstr ""
 
-#: popt.c:1474
+#: popt.c:1733
 msgid "unknown error"
 msgstr "galat tak diketahui"
 
@@ -104,33 +104,37 @@ msgid "INT"
 msgstr "INT"
 
 #: popthelp.c:207
+msgid "SHORT"
+msgstr ""
+
+#: popthelp.c:208
 msgid "LONG"
 msgstr "LONG"
 
-#: popthelp.c:208
+#: popthelp.c:209
 msgid "LONGLONG"
 msgstr "LONGLONG"
 
-#: popthelp.c:209
+#: popthelp.c:210
 msgid "STRING"
 msgstr "STRING"
 
-#: popthelp.c:210
+#: popthelp.c:211
 msgid "FLOAT"
 msgstr "FLOAT"
 
-#: popthelp.c:211
+#: popthelp.c:212
 msgid "DOUBLE"
 msgstr "DOUBLE"
 
-#: popthelp.c:214
+#: popthelp.c:215
 msgid "ARG"
 msgstr "ARG"
 
-#: popthelp.c:644
+#: popthelp.c:649
 msgid "Usage:"
 msgstr "Penggunaan:"
 
-#: popthelp.c:667
+#: popthelp.c:672
 msgid "[OPTION...]"
 msgstr "[OPSI...]"
diff --git a/po/is.po b/po/is.po
index 5247112..8b625b0 100644
--- a/po/is.po
+++ b/po/is.po
@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.11\n"
 "Report-Msgid-Bugs-To: <popt-devel@rpm5.org>\n"
-"POT-Creation-Date: 2009-04-12 20:14+0200\n"
+"POT-Creation-Date: 2009-09-13 11:40-0400\n"
 "PO-Revision-Date: 2001-06-08 01:35+0000\n"
 "Last-Translator: Richard Allen <ra@hp.is>\n"
 "Language-Team: is <kde-isl@mmedia.is>\n"
@@ -14,52 +14,52 @@ msgstr ""
 msgid "unknown errno"
 msgstr "��ekkt villun�mer"
 
-#: popt.c:1031
+#: popt.c:1290
 #, fuzzy, c-format
 msgid "option type (%u) not implemented in popt\n"
 msgstr "rofager�in (%d) er ekki studd � popt\n"
 
-#: popt.c:1452
+#: popt.c:1711
 msgid "missing argument"
 msgstr "vantar vi�fang"
 
-#: popt.c:1454
+#: popt.c:1713
 msgid "unknown option"
 msgstr "��ekktur rofi"
 
-#: popt.c:1456
+#: popt.c:1715
 msgid "mutually exclusive logical operations requested"
 msgstr "be�i� um rofa sem sl�kkva hvor � ��rum"
 
-#: popt.c:1458
+#: popt.c:1717
 msgid "opt->arg should not be NULL"
 msgstr "opt->arg �tti ekki a� vera NULL"
 
-#: popt.c:1460
+#: popt.c:1719
 msgid "aliases nested too deeply"
 msgstr "al�asar of fl�knir"
 
-#: popt.c:1462
+#: popt.c:1721
 msgid "error in parameter quoting"
 msgstr "villa � vi�f�ngum (g�salappir og svo frv.)"
 
-#: popt.c:1464
+#: popt.c:1723
 msgid "invalid numeric value"
 msgstr "�gilt t�lulegt gildi"
 
-#: popt.c:1466
+#: popt.c:1725
 msgid "number too large or too small"
 msgstr "talan of st�r e�a sm�"
 
-#: popt.c:1468
+#: popt.c:1727
 msgid "memory allocation failed"
 msgstr "ekki t�kst a� taka fr� minni"
 
-#: popt.c:1470
+#: popt.c:1729
 msgid "config file failed sanity test"
 msgstr ""
 
-#: popt.c:1474
+#: popt.c:1733
 msgid "unknown error"
 msgstr "��ekkt villa"
 
@@ -100,34 +100,38 @@ msgid "INT"
 msgstr "INT"
 
 #: popthelp.c:207
+msgid "SHORT"
+msgstr ""
+
+#: popthelp.c:208
 msgid "LONG"
 msgstr "LONG"
 
-#: popthelp.c:208
+#: popthelp.c:209
 #, fuzzy
 msgid "LONGLONG"
 msgstr "LONG"
 
-#: popthelp.c:209
+#: popthelp.c:210
 msgid "STRING"
 msgstr "STRING"
 
-#: popthelp.c:210
+#: popthelp.c:211
 msgid "FLOAT"
 msgstr "FLOAT"
 
-#: popthelp.c:211
+#: popthelp.c:212
 msgid "DOUBLE"
 msgstr "DOUBLE"
 
-#: popthelp.c:214
+#: popthelp.c:215
 msgid "ARG"
 msgstr "ARG"
 
-#: popthelp.c:644
+#: popthelp.c:649
 msgid "Usage:"
 msgstr "Notkun:"
 
-#: popthelp.c:667
+#: popthelp.c:672
 msgid "[OPTION...]"
 msgstr "[ROFI...]"
diff --git a/po/it.po b/po/it.po
index cc4f5d3..a133c0b 100644
--- a/po/it.po
+++ b/po/it.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: popt-1.14\n"
 "Report-Msgid-Bugs-To: <popt-devel@rpm5.org>\n"
-"POT-Creation-Date: 2009-04-12 20:14+0200\n"
+"POT-Creation-Date: 2009-09-13 11:40-0400\n"
 "PO-Revision-Date: 2008-11-28 15:32+0100\n"
 "Last-Translator: Vincenzo Campanella <vinz65@gmail.com>\n"
 "Language-Team: Italian <tp@lists.linux.it>\n"
@@ -21,52 +21,52 @@ msgstr ""
 msgid "unknown errno"
 msgstr "errno sconosciuto"
 
-#: popt.c:1031
+#: popt.c:1290
 #, c-format
 msgid "option type (%u) not implemented in popt\n"
 msgstr "tipo di opzione (%u) non implementato in popt\n"
 
-#: popt.c:1452
+#: popt.c:1711
 msgid "missing argument"
 msgstr "argomento mancante"
 
-#: popt.c:1454
+#: popt.c:1713
 msgid "unknown option"
 msgstr "opzione sconosciuta"
 
-#: popt.c:1456
+#: popt.c:1715
 msgid "mutually exclusive logical operations requested"
 msgstr "richieste operazioni logiche reciprocamente esclusive"
 
-#: popt.c:1458
+#: popt.c:1717
 msgid "opt->arg should not be NULL"
 msgstr "opt->arg non dovrebbe essere NULL"
 
-#: popt.c:1460
+#: popt.c:1719
 msgid "aliases nested too deeply"
 msgstr "alias nidificati troppo in profondità"
 
-#: popt.c:1462
+#: popt.c:1721
 msgid "error in parameter quoting"
 msgstr "errore nel quoting del parametro"
 
-#: popt.c:1464
+#: popt.c:1723
 msgid "invalid numeric value"
 msgstr "valore numerico non valido"
 
-#: popt.c:1466
+#: popt.c:1725
 msgid "number too large or too small"
 msgstr "numero troppo grande o troppo piccolo"
 
-#: popt.c:1468
+#: popt.c:1727
 msgid "memory allocation failed"
 msgstr "allocazione di memoria fallita"
 
-#: popt.c:1470
+#: popt.c:1729
 msgid "config file failed sanity test"
 msgstr ""
 
-#: popt.c:1474
+#: popt.c:1733
 msgid "unknown error"
 msgstr "errore sconosciuto"
 
@@ -107,33 +107,37 @@ msgid "INT"
 msgstr "INT"
 
 #: popthelp.c:207
+msgid "SHORT"
+msgstr ""
+
+#: popthelp.c:208
 msgid "LONG"
 msgstr "LONG"
 
-#: popthelp.c:208
+#: popthelp.c:209
 msgid "LONGLONG"
 msgstr "LONGLONG"
 
-#: popthelp.c:209
+#: popthelp.c:210
 msgid "STRING"
 msgstr "STRING"
 
-#: popthelp.c:210
+#: popthelp.c:211
 msgid "FLOAT"
 msgstr "FLOAT"
 
-#: popthelp.c:211
+#: popthelp.c:212
 msgid "DOUBLE"
 msgstr "DOUBLE"
 
-#: popthelp.c:214
+#: popthelp.c:215
 msgid "ARG"
 msgstr "ARG"
 
-#: popthelp.c:644
+#: popthelp.c:649
 msgid "Usage:"
 msgstr "Uso:"
 
-#: popthelp.c:667
+#: popthelp.c:672
 msgid "[OPTION...]"
 msgstr "[OPZIONE...]"
diff --git a/po/ja.po b/po/ja.po
index 50ef112..c13ac6c 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.11\n"
 "Report-Msgid-Bugs-To: <popt-devel@rpm5.org>\n"
-"POT-Creation-Date: 2009-04-12 20:14+0200\n"
+"POT-Creation-Date: 2009-09-13 11:40-0400\n"
 "PO-Revision-Date: 2003--8-25 19:00+0900\n"
 "Last-Translator: Yukihiro Nakai <ynakai@redhat.com>\n"
 "Language-Team: Japanese <ja@li.org>\n"
@@ -18,52 +18,52 @@ msgstr ""
 msgid "unknown errno"
 msgstr "不明なエラー番号"
 
-#: popt.c:1031
+#: popt.c:1290
 #, fuzzy, c-format
 msgid "option type (%u) not implemented in popt\n"
 msgstr "オプションタイプ (%d) はpoptには実装されていません\n"
 
-#: popt.c:1452
+#: popt.c:1711
 msgid "missing argument"
 msgstr "引数がありません"
 
-#: popt.c:1454
+#: popt.c:1713
 msgid "unknown option"
 msgstr "不明なオプション"
 
-#: popt.c:1456
+#: popt.c:1715
 msgid "mutually exclusive logical operations requested"
 msgstr "排他的な悪ぺーレーションが必要です"
 
-#: popt.c:1458
+#: popt.c:1717
 msgid "opt->arg should not be NULL"
 msgstr "opt->argはNULLではいけません"
 
-#: popt.c:1460
+#: popt.c:1719
 msgid "aliases nested too deeply"
 msgstr "エイリアスのネストが深すぎます"
 
-#: popt.c:1462
+#: popt.c:1721
 msgid "error in parameter quoting"
 msgstr "パラメータのクオート付けでエラー"
 
-#: popt.c:1464
+#: popt.c:1723
 msgid "invalid numeric value"
 msgstr "不正な数値"
 
-#: popt.c:1466
+#: popt.c:1725
 msgid "number too large or too small"
 msgstr "数値が大きすぎるか小さすぎます"
 
-#: popt.c:1468
+#: popt.c:1727
 msgid "memory allocation failed"
 msgstr "メモリ確保に失敗しました"
 
-#: popt.c:1470
+#: popt.c:1729
 msgid "config file failed sanity test"
 msgstr ""
 
-#: popt.c:1474
+#: popt.c:1733
 msgid "unknown error"
 msgstr "不明なエラー"
 
@@ -105,34 +105,38 @@ msgid "INT"
 msgstr "INT"
 
 #: popthelp.c:207
+msgid "SHORT"
+msgstr ""
+
+#: popthelp.c:208
 msgid "LONG"
 msgstr "LONG"
 
-#: popthelp.c:208
+#: popthelp.c:209
 #, fuzzy
 msgid "LONGLONG"
 msgstr "LONG"
 
-#: popthelp.c:209
+#: popthelp.c:210
 msgid "STRING"
 msgstr "文字列"
 
-#: popthelp.c:210
+#: popthelp.c:211
 msgid "FLOAT"
 msgstr "FLOAT"
 
-#: popthelp.c:211
+#: popthelp.c:212
 msgid "DOUBLE"
 msgstr "DOUBLE"
 
-#: popthelp.c:214
+#: popthelp.c:215
 msgid "ARG"
 msgstr "ARG"
 
-#: popthelp.c:644
+#: popthelp.c:649
 msgid "Usage:"
 msgstr "使い方:"
 
-#: popthelp.c:667
+#: popthelp.c:672
 msgid "[OPTION...]"
 msgstr "[オプション...]"
diff --git a/po/ko.po b/po/ko.po
index c08e3a7..41cd322 100644
--- a/po/ko.po
+++ b/po/ko.po
@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.11\n"
 "Report-Msgid-Bugs-To: <popt-devel@rpm5.org>\n"
-"POT-Creation-Date: 2009-04-12 20:14+0200\n"
+"POT-Creation-Date: 2009-09-13 11:40-0400\n"
 "PO-Revision-Date: 2001-09-06 20:06+0900\n"
 "Last-Translator: Jong-Hoon Ryu <redhat4u@netian.com>\n"
 "Language-Team: GNU Translation project <ko@li.org>\n"
@@ -14,52 +14,52 @@ msgstr ""
 msgid "unknown errno"
 msgstr "�� �� ���� �����ڵ�(errno) �Դϴ�"
 
-#: popt.c:1031
+#: popt.c:1290
 #, fuzzy, c-format
 msgid "option type (%u) not implemented in popt\n"
 msgstr "�ɼ� ���� (%d)�� popt���� ����� �� �����ϴ�\n"
 
-#: popt.c:1452
+#: popt.c:1711
 msgid "missing argument"
 msgstr "�μ��� �������� �ʾҽ��ϴ�"
 
-#: popt.c:1454
+#: popt.c:1713
 msgid "unknown option"
 msgstr "�� �� ���� �ɼ��Դϴ�"
 
-#: popt.c:1456
+#: popt.c:1715
 msgid "mutually exclusive logical operations requested"
 msgstr "���ʿ� ��Ÿ�� ���� ������ �����Ǿ����ϴ�"
 
-#: popt.c:1458
+#: popt.c:1717
 msgid "opt->arg should not be NULL"
 msgstr "�ɼ�->�μ��� NULL�� �Ǿ�� �ȵ˴ϴ�"
 
-#: popt.c:1460
+#: popt.c:1719
 msgid "aliases nested too deeply"
 msgstr "��Ī(alias)�� �����ϰ� �����Ǿ����ϴ�"
 
-#: popt.c:1462
+#: popt.c:1721
 msgid "error in parameter quoting"
 msgstr "�Ű������� ������ �ֽ��ϴ�"
 
-#: popt.c:1464
+#: popt.c:1723
 msgid "invalid numeric value"
 msgstr "�߸��� ��ġ ���Դϴ�"
 
-#: popt.c:1466
+#: popt.c:1725
 msgid "number too large or too small"
 msgstr "���ڰ� �ʹ� ũ�ų� �ʹ� �����ϴ�"
 
-#: popt.c:1468
+#: popt.c:1727
 msgid "memory allocation failed"
 msgstr "�޸� �Ҵ翡 �����߽��ϴ�"
 
-#: popt.c:1470
+#: popt.c:1729
 msgid "config file failed sanity test"
 msgstr ""
 
-#: popt.c:1474
+#: popt.c:1733
 msgid "unknown error"
 msgstr "�� �� ���� �����Դϴ�"
 
@@ -100,34 +100,38 @@ msgid "INT"
 msgstr "����(INT)"
 
 #: popthelp.c:207
+msgid "SHORT"
+msgstr ""
+
+#: popthelp.c:208
 msgid "LONG"
 msgstr "����(LONG)"
 
-#: popthelp.c:208
+#: popthelp.c:209
 #, fuzzy
 msgid "LONGLONG"
 msgstr "����(LONG)"
 
-#: popthelp.c:209
+#: popthelp.c:210
 msgid "STRING"
 msgstr "���ڿ�(STRING)"
 
-#: popthelp.c:210
+#: popthelp.c:211
 msgid "FLOAT"
 msgstr "�Ҽ�(FLOAT)"
 
-#: popthelp.c:211
+#: popthelp.c:212
 msgid "DOUBLE"
 msgstr "�Ҽ�(DOUBLE)"
 
-#: popthelp.c:214
+#: popthelp.c:215
 msgid "ARG"
 msgstr "�μ�(ARG)"
 
-#: popthelp.c:644
+#: popthelp.c:649
 msgid "Usage:"
 msgstr "����:"
 
-#: popthelp.c:667
+#: popthelp.c:672
 msgid "[OPTION...]"
 msgstr "[�ɼ�...]"
diff --git a/po/nb.po b/po/nb.po
index 53334dd..ebb6c5b 100644
--- a/po/nb.po
+++ b/po/nb.po
@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.11\n"
 "Report-Msgid-Bugs-To: <popt-devel@rpm5.org>\n"
-"POT-Creation-Date: 2009-04-12 20:14+0200\n"
+"POT-Creation-Date: 2009-09-13 11:40-0400\n"
 "PO-Revision-Date: 2001-06-27 11:05+0200\n"
 "Last-Translator: Kjartan Maraas <kmaraas@online.no>\n"
 "Language-Team: Norwegian <no@li.org>\n"
@@ -14,52 +14,52 @@ msgstr ""
 msgid "unknown errno"
 msgstr "ukjent errno"
 
-#: popt.c:1031
+#: popt.c:1290
 #, fuzzy, c-format
 msgid "option type (%u) not implemented in popt\n"
 msgstr "flaggtype (%d) ikke implementert i popt\n"
 
-#: popt.c:1452
+#: popt.c:1711
 msgid "missing argument"
 msgstr "manglende argument"
 
-#: popt.c:1454
+#: popt.c:1713
 msgid "unknown option"
 msgstr "ukjent flagg"
 
-#: popt.c:1456
+#: popt.c:1715
 msgid "mutually exclusive logical operations requested"
 msgstr "gjensidig eksluderende logiske operasjoner forespurt"
 
-#: popt.c:1458
+#: popt.c:1717
 msgid "opt->arg should not be NULL"
 msgstr "opt->arg m� ikke v�re NULL"
 
-#: popt.c:1460
+#: popt.c:1719
 msgid "aliases nested too deeply"
 msgstr "aliaser med for dype l�kker"
 
-#: popt.c:1462
+#: popt.c:1721
 msgid "error in parameter quoting"
 msgstr "feil i parametersitering"
 
-#: popt.c:1464
+#: popt.c:1723
 msgid "invalid numeric value"
 msgstr "ugyldig numerisk verdi"
 
-#: popt.c:1466
+#: popt.c:1725
 msgid "number too large or too small"
 msgstr "tallet er for stort eller lite"
 
-#: popt.c:1468
+#: popt.c:1727
 msgid "memory allocation failed"
 msgstr "minneallokering feilet"
 
-#: popt.c:1470
+#: popt.c:1729
 msgid "config file failed sanity test"
 msgstr ""
 
-#: popt.c:1474
+#: popt.c:1733
 msgid "unknown error"
 msgstr "ukjent feil"
 
@@ -100,34 +100,38 @@ msgid "INT"
 msgstr "HELTALL"
 
 #: popthelp.c:207
+msgid "SHORT"
+msgstr ""
+
+#: popthelp.c:208
 msgid "LONG"
 msgstr "LONG"
 
-#: popthelp.c:208
+#: popthelp.c:209
 #, fuzzy
 msgid "LONGLONG"
 msgstr "LONG"
 
-#: popthelp.c:209
+#: popthelp.c:210
 msgid "STRING"
 msgstr "STRENG"
 
-#: popthelp.c:210
+#: popthelp.c:211
 msgid "FLOAT"
 msgstr "FLYTTALL"
 
-#: popthelp.c:211
+#: popthelp.c:212
 msgid "DOUBLE"
 msgstr "DOUBLE"
 
-#: popthelp.c:214
+#: popthelp.c:215
 msgid "ARG"
 msgstr "ARG"
 
-#: popthelp.c:644
+#: popthelp.c:649
 msgid "Usage:"
 msgstr "Bruk:"
 
-#: popthelp.c:667
+#: popthelp.c:672
 msgid "[OPTION...]"
 msgstr "[FLAGG...]"
diff --git a/po/nl.po b/po/nl.po
index 57c21bd..940ec3a 100644
--- a/po/nl.po
+++ b/po/nl.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.14\n"
 "Report-Msgid-Bugs-To: <popt-devel@rpm5.org>\n"
-"POT-Creation-Date: 2009-04-12 20:14+0200\n"
+"POT-Creation-Date: 2009-09-13 11:40-0400\n"
 "PO-Revision-Date: 2008-02-20 19:26+0100\n"
 "Last-Translator: Tim Van Holder <tim.van.holder@telenet.be>\n"
 "Language-Team: Dutch <vertaling@vrijschrift.org>\n"
@@ -18,53 +18,53 @@ msgstr ""
 msgid "unknown errno"
 msgstr "onbekend foutnummer (errno)"
 
-#: popt.c:1031
+#: popt.c:1290
 #, c-format
 msgid "option type (%u) not implemented in popt\n"
 msgstr "dit optietype (%u) is niet geïmplementeerd in popt\n"
 
-#: popt.c:1452
+#: popt.c:1711
 msgid "missing argument"
 msgstr "ontbrekend argument"
 
-#: popt.c:1454
+#: popt.c:1713
 msgid "unknown option"
 msgstr "onbekende optie"
 
-#: popt.c:1456
+#: popt.c:1715
 msgid "mutually exclusive logical operations requested"
 msgstr "elkaar uitsluitende logische operatoren werden gevraagd"
 
-#: popt.c:1458
+#: popt.c:1717
 msgid "opt->arg should not be NULL"
 msgstr "opt->arg zou niet NULL mogen zijn"
 
-#: popt.c:1460
+#: popt.c:1719
 msgid "aliases nested too deeply"
 msgstr "aliassen zijn te diep genest"
 
 # of toch beter "quoting" behouden?
-#: popt.c:1462
+#: popt.c:1721
 msgid "error in parameter quoting"
 msgstr "fout in de aanhaling van parameters"
 
-#: popt.c:1464
+#: popt.c:1723
 msgid "invalid numeric value"
 msgstr "ongeldige numerieke waarde"
 
-#: popt.c:1466
+#: popt.c:1725
 msgid "number too large or too small"
 msgstr "getal is te klein of te groot"
 
-#: popt.c:1468
+#: popt.c:1727
 msgid "memory allocation failed"
 msgstr "reserveren van geheugen is mislukt"
 
-#: popt.c:1470
+#: popt.c:1729
 msgid "config file failed sanity test"
 msgstr ""
 
-#: popt.c:1474
+#: popt.c:1733
 msgid "unknown error"
 msgstr "onbekende fout"
 
@@ -106,35 +106,39 @@ msgid "INT"
 msgstr "INT"
 
 #: popthelp.c:207
+msgid "SHORT"
+msgstr ""
+
+#: popthelp.c:208
 msgid "LONG"
 msgstr "LONG"
 
-#: popthelp.c:208
+#: popthelp.c:209
 msgid "LONGLONG"
 msgstr "LONGLONG"
 
 # TEKENREEKS lijkt me niet gepast; dus ofwel STRING behouden, ofwel TEKST
-#: popthelp.c:209
+#: popthelp.c:210
 msgid "STRING"
 msgstr "TEKST"
 
-#: popthelp.c:210
+#: popthelp.c:211
 msgid "FLOAT"
 msgstr "FLOAT"
 
-#: popthelp.c:211
+#: popthelp.c:212
 msgid "DOUBLE"
 msgstr "DOUBLE"
 
 # of hier ARGUMENT van maken?
-#: popthelp.c:214
+#: popthelp.c:215
 msgid "ARG"
 msgstr "ARG"
 
-#: popthelp.c:644
+#: popthelp.c:649
 msgid "Usage:"
 msgstr "Gebruik:"
 
-#: popthelp.c:667
+#: popthelp.c:672
 msgid "[OPTION...]"
 msgstr "[OPTIE...]"
diff --git a/po/pl.po b/po/pl.po
index aa24b80..db44319 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.14\n"
 "Report-Msgid-Bugs-To: <popt-devel@rpm5.org>\n"
-"POT-Creation-Date: 2009-04-12 20:14+0200\n"
+"POT-Creation-Date: 2009-09-13 11:40-0400\n"
 "PO-Revision-Date: 2008-02-18 00:30+0100\n"
 "Last-Translator: Jakub Bogusz <qboosh@pld-linux.org>\n"
 "Language-Team: Polish <translation-team-pl@lists.sourceforge.net>\n"
@@ -18,52 +18,52 @@ msgstr ""
 msgid "unknown errno"
 msgstr "nieznane errno"
 
-#: popt.c:1031
+#: popt.c:1290
 #, c-format
 msgid "option type (%u) not implemented in popt\n"
 msgstr "typ opcji (%u) nie zaimplementowany w popt\n"
 
-#: popt.c:1452
+#: popt.c:1711
 msgid "missing argument"
 msgstr "brak parametru"
 
-#: popt.c:1454
+#: popt.c:1713
 msgid "unknown option"
 msgstr "nieznana opcja"
 
-#: popt.c:1456
+#: popt.c:1715
 msgid "mutually exclusive logical operations requested"
 msgstr "��danie wykluczaj�cych si� operacji"
 
-#: popt.c:1458
+#: popt.c:1717
 msgid "opt->arg should not be NULL"
 msgstr "opt->arg nie mo�e by� NULL"
 
-#: popt.c:1460
+#: popt.c:1719
 msgid "aliases nested too deeply"
 msgstr "zbyt du�e zag��bienie alias�w"
 
-#: popt.c:1462
+#: popt.c:1721
 msgid "error in parameter quoting"
 msgstr "b��d w cytowaniu parametru"
 
-#: popt.c:1464
+#: popt.c:1723
 msgid "invalid numeric value"
 msgstr "b��dna warto�� liczbowa"
 
-#: popt.c:1466
+#: popt.c:1725
 msgid "number too large or too small"
 msgstr "liczba zbyt du�a lub zbyt ma�a"
 
-#: popt.c:1468
+#: popt.c:1727
 msgid "memory allocation failed"
 msgstr "b��d alokacji pami�ci"
 
-#: popt.c:1470
+#: popt.c:1729
 msgid "config file failed sanity test"
 msgstr ""
 
-#: popt.c:1474
+#: popt.c:1733
 msgid "unknown error"
 msgstr "nieznany b��d"
 
@@ -104,33 +104,37 @@ msgid "INT"
 msgstr "INT"
 
 #: popthelp.c:207
+msgid "SHORT"
+msgstr ""
+
+#: popthelp.c:208
 msgid "LONG"
 msgstr "LONG"
 
-#: popthelp.c:208
+#: popthelp.c:209
 msgid "LONGLONG"
 msgstr "LONGLONG"
 
-#: popthelp.c:209
+#: popthelp.c:210
 msgid "STRING"
 msgstr "�A�CUCH"
 
-#: popthelp.c:210
+#: popthelp.c:211
 msgid "FLOAT"
 msgstr "FLOAT"
 
-#: popthelp.c:211
+#: popthelp.c:212
 msgid "DOUBLE"
 msgstr "DOUBLE"
 
-#: popthelp.c:214
+#: popthelp.c:215
 msgid "ARG"
 msgstr "PARAM"
 
-#: popthelp.c:644
+#: popthelp.c:649
 msgid "Usage:"
 msgstr "Sk�adnia:"
 
-#: popthelp.c:667
+#: popthelp.c:672
 msgid "[OPTION...]"
 msgstr "[OPCJA...]"
diff --git a/po/popt.pot b/po/popt.pot
index 5fd6613..87fae8a 100644
--- a/po/popt.pot
+++ b/po/popt.pot
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.15\n"
 "Report-Msgid-Bugs-To: <popt-devel@rpm5.org>\n"
-"POT-Creation-Date: 2009-04-12 20:14+0200\n"
+"POT-Creation-Date: 2009-09-13 11:40-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -19,52 +19,52 @@ msgstr ""
 msgid "unknown errno"
 msgstr ""
 
-#: popt.c:1031
+#: popt.c:1290
 #, c-format
 msgid "option type (%u) not implemented in popt\n"
 msgstr ""
 
-#: popt.c:1452
+#: popt.c:1711
 msgid "missing argument"
 msgstr ""
 
-#: popt.c:1454
+#: popt.c:1713
 msgid "unknown option"
 msgstr ""
 
-#: popt.c:1456
+#: popt.c:1715
 msgid "mutually exclusive logical operations requested"
 msgstr ""
 
-#: popt.c:1458
+#: popt.c:1717
 msgid "opt->arg should not be NULL"
 msgstr ""
 
-#: popt.c:1460
+#: popt.c:1719
 msgid "aliases nested too deeply"
 msgstr ""
 
-#: popt.c:1462
+#: popt.c:1721
 msgid "error in parameter quoting"
 msgstr ""
 
-#: popt.c:1464
+#: popt.c:1723
 msgid "invalid numeric value"
 msgstr ""
 
-#: popt.c:1466
+#: popt.c:1725
 msgid "number too large or too small"
 msgstr ""
 
-#: popt.c:1468
+#: popt.c:1727
 msgid "memory allocation failed"
 msgstr ""
 
-#: popt.c:1470
+#: popt.c:1729
 msgid "config file failed sanity test"
 msgstr ""
 
-#: popt.c:1474
+#: popt.c:1733
 msgid "unknown error"
 msgstr ""
 
@@ -105,33 +105,37 @@ msgid "INT"
 msgstr ""
 
 #: popthelp.c:207
-msgid "LONG"
+msgid "SHORT"
 msgstr ""
 
 #: popthelp.c:208
-msgid "LONGLONG"
+msgid "LONG"
 msgstr ""
 
 #: popthelp.c:209
-msgid "STRING"
+msgid "LONGLONG"
 msgstr ""
 
 #: popthelp.c:210
-msgid "FLOAT"
+msgid "STRING"
 msgstr ""
 
 #: popthelp.c:211
+msgid "FLOAT"
+msgstr ""
+
+#: popthelp.c:212
 msgid "DOUBLE"
 msgstr ""
 
-#: popthelp.c:214
+#: popthelp.c:215
 msgid "ARG"
 msgstr ""
 
-#: popthelp.c:644
+#: popthelp.c:649
 msgid "Usage:"
 msgstr ""
 
-#: popthelp.c:667
+#: popthelp.c:672
 msgid "[OPTION...]"
 msgstr ""
diff --git a/po/pt.po b/po/pt.po
index c3d9c67..7884bb3 100644
--- a/po/pt.po
+++ b/po/pt.po
@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.11\n"
 "Report-Msgid-Bugs-To: <popt-devel@rpm5.org>\n"
-"POT-Creation-Date: 2009-04-12 20:14+0200\n"
+"POT-Creation-Date: 2009-09-13 11:40-0400\n"
 "PO-Revision-Date: 2002-02-13 18:32+0000\n"
 "Last-Translator: Pedro Morais <morais@kde.org>\n"
 "Language-Team: pt <morais@kde.org>\n"
@@ -14,52 +14,52 @@ msgstr ""
 msgid "unknown errno"
 msgstr "errno desconhecido"
 
-#: popt.c:1031
+#: popt.c:1290
 #, fuzzy, c-format
 msgid "option type (%u) not implemented in popt\n"
 msgstr "tipo de op��o (%d) n�o implementado no popt\n"
 
-#: popt.c:1452
+#: popt.c:1711
 msgid "missing argument"
 msgstr "falta um argumento"
 
-#: popt.c:1454
+#: popt.c:1713
 msgid "unknown option"
 msgstr "op��o desconhecida"
 
-#: popt.c:1456
+#: popt.c:1715
 msgid "mutually exclusive logical operations requested"
 msgstr "foram pedidas opera��es l�gicas mutuamente exclusivas"
 
-#: popt.c:1458
+#: popt.c:1717
 msgid "opt->arg should not be NULL"
 msgstr "opt->arg n�o deve ser NULL"
 
-#: popt.c:1460
+#: popt.c:1719
 msgid "aliases nested too deeply"
 msgstr "'aliases' demasiado aninhados"
 
-#: popt.c:1462
+#: popt.c:1721
 msgid "error in parameter quoting"
 msgstr "erros no 'quoting' de par�metros"
 
-#: popt.c:1464
+#: popt.c:1723
 msgid "invalid numeric value"
 msgstr "valor n�merico inv�lido"
 
-#: popt.c:1466
+#: popt.c:1725
 msgid "number too large or too small"
 msgstr "n�mero demasiado grando ou pequeno"
 
-#: popt.c:1468
+#: popt.c:1727
 msgid "memory allocation failed"
 msgstr "aloca��o de mem�ria falhou"
 
-#: popt.c:1470
+#: popt.c:1729
 msgid "config file failed sanity test"
 msgstr ""
 
-#: popt.c:1474
+#: popt.c:1733
 msgid "unknown error"
 msgstr "erro desconhecido"
 
@@ -100,34 +100,38 @@ msgid "INT"
 msgstr "INT"
 
 #: popthelp.c:207
+msgid "SHORT"
+msgstr ""
+
+#: popthelp.c:208
 msgid "LONG"
 msgstr "LONG"
 
-#: popthelp.c:208
+#: popthelp.c:209
 #, fuzzy
 msgid "LONGLONG"
 msgstr "LONG"
 
-#: popthelp.c:209
+#: popthelp.c:210
 msgid "STRING"
 msgstr "STRING"
 
-#: popthelp.c:210
+#: popthelp.c:211
 msgid "FLOAT"
 msgstr "FLOAT"
 
-#: popthelp.c:211
+#: popthelp.c:212
 msgid "DOUBLE"
 msgstr "DOUBLE"
 
-#: popthelp.c:214
+#: popthelp.c:215
 msgid "ARG"
 msgstr "ARG"
 
-#: popthelp.c:644
+#: popthelp.c:649
 msgid "Usage:"
 msgstr "Utiliza��o:"
 
-#: popthelp.c:667
+#: popthelp.c:672
 msgid "[OPTION...]"
 msgstr "[OP��O...]"
diff --git a/po/ro.po b/po/ro.po
index e76d927..cf8ee45 100644
--- a/po/ro.po
+++ b/po/ro.po
@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.11\n"
 "Report-Msgid-Bugs-To: <popt-devel@rpm5.org>\n"
-"POT-Creation-Date: 2009-04-12 20:14+0200\n"
+"POT-Creation-Date: 2009-09-13 11:40-0400\n"
 "PO-Revision-Date: 2000-06-14 23:23+EST\n"
 "Last-Translator: Cristian Gafton <gafton@redhat.com>\n"
 "Language-Team: Romanian <ro@li.org>\n"
@@ -14,53 +14,53 @@ msgstr ""
 msgid "unknown errno"
 msgstr "eroare necunoscuta"
 
-#: popt.c:1031
+#: popt.c:1290
 #, fuzzy, c-format
 msgid "option type (%u) not implemented in popt\n"
 msgstr "optiunea de tipul (%d) nu este implementata in popt\n"
 
-#: popt.c:1452
+#: popt.c:1711
 msgid "missing argument"
 msgstr "argument lipsa"
 
-#: popt.c:1454
+#: popt.c:1713
 msgid "unknown option"
 msgstr "optiune necunoscuta"
 
-#: popt.c:1456
+#: popt.c:1715
 msgid "mutually exclusive logical operations requested"
 msgstr ""
 
-#: popt.c:1458
+#: popt.c:1717
 msgid "opt->arg should not be NULL"
 msgstr ""
 
-#: popt.c:1460
+#: popt.c:1719
 msgid "aliases nested too deeply"
 msgstr "recursivitate infinita la optiunile sinonime"
 
-#: popt.c:1462
+#: popt.c:1721
 #, fuzzy
 msgid "error in parameter quoting"
 msgstr "eroare la insertie parametru"
 
-#: popt.c:1464
+#: popt.c:1723
 msgid "invalid numeric value"
 msgstr "valoare numarica invalida"
 
-#: popt.c:1466
+#: popt.c:1725
 msgid "number too large or too small"
 msgstr "numar prea mare sau prea mic"
 
-#: popt.c:1468
+#: popt.c:1727
 msgid "memory allocation failed"
 msgstr ""
 
-#: popt.c:1470
+#: popt.c:1729
 msgid "config file failed sanity test"
 msgstr ""
 
-#: popt.c:1474
+#: popt.c:1733
 msgid "unknown error"
 msgstr "eroare necuinoscuta"
 
@@ -102,33 +102,37 @@ msgid "INT"
 msgstr ""
 
 #: popthelp.c:207
-msgid "LONG"
+msgid "SHORT"
 msgstr ""
 
 #: popthelp.c:208
-msgid "LONGLONG"
+msgid "LONG"
 msgstr ""
 
 #: popthelp.c:209
-msgid "STRING"
+msgid "LONGLONG"
 msgstr ""
 
 #: popthelp.c:210
-msgid "FLOAT"
+msgid "STRING"
 msgstr ""
 
 #: popthelp.c:211
+msgid "FLOAT"
+msgstr ""
+
+#: popthelp.c:212
 msgid "DOUBLE"
 msgstr ""
 
-#: popthelp.c:214
+#: popthelp.c:215
 msgid "ARG"
 msgstr ""
 
-#: popthelp.c:644
+#: popthelp.c:649
 msgid "Usage:"
 msgstr "Sintaxa:"
 
-#: popthelp.c:667
+#: popthelp.c:672
 msgid "[OPTION...]"
 msgstr "[OPTIUNE...]"
diff --git a/po/ru.po b/po/ru.po
index 9ec2bdd..a313fa9 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.14\n"
 "Report-Msgid-Bugs-To: <popt-devel@rpm5.org>\n"
-"POT-Creation-Date: 2009-04-12 20:14+0200\n"
+"POT-Creation-Date: 2009-09-13 11:40-0400\n"
 "PO-Revision-Date: 2009-02-01 13:30+0300\n"
 "Last-Translator: Yuri Kozlov <yuray@komyakino.ru>\n"
 "Language-Team: Russian <gnu@mx.ru>\n"
@@ -22,52 +22,52 @@ msgstr ""
 msgid "unknown errno"
 msgstr "неизвестный errno"
 
-#: popt.c:1031
+#: popt.c:1290
 #, c-format
 msgid "option type (%u) not implemented in popt\n"
 msgstr "обработка параметра (%u) в popt не предусмотрена\n"
 
-#: popt.c:1452
+#: popt.c:1711
 msgid "missing argument"
 msgstr "пропущен аргумент"
 
-#: popt.c:1454
+#: popt.c:1713
 msgid "unknown option"
 msgstr "неизвестный параметр"
 
-#: popt.c:1456
+#: popt.c:1715
 msgid "mutually exclusive logical operations requested"
 msgstr "запрошены взаимно исключающие логические операции"
 
-#: popt.c:1458
+#: popt.c:1717
 msgid "opt->arg should not be NULL"
 msgstr "opt->arg не может быть NULL"
 
-#: popt.c:1460
+#: popt.c:1719
 msgid "aliases nested too deeply"
 msgstr "превышен уровень допустимой рекурсии подстановок"
 
-#: popt.c:1462
+#: popt.c:1721
 msgid "error in parameter quoting"
 msgstr "ошибка помещения параметров в кавычки"
 
-#: popt.c:1464
+#: popt.c:1723
 msgid "invalid numeric value"
 msgstr "неправильное числовое значение"
 
-#: popt.c:1466
+#: popt.c:1725
 msgid "number too large or too small"
 msgstr "числовое значение за пределами предусмотренного"
 
-#: popt.c:1468
+#: popt.c:1727
 msgid "memory allocation failed"
 msgstr "не удалось выделить память"
 
-#: popt.c:1470
+#: popt.c:1729
 msgid "config file failed sanity test"
 msgstr ""
 
-#: popt.c:1474
+#: popt.c:1733
 msgid "unknown error"
 msgstr "неизвестная ошибка"
 
@@ -108,33 +108,37 @@ msgid "INT"
 msgstr "INT"
 
 #: popthelp.c:207
+msgid "SHORT"
+msgstr ""
+
+#: popthelp.c:208
 msgid "LONG"
 msgstr "LONG"
 
-#: popthelp.c:208
+#: popthelp.c:209
 msgid "LONGLONG"
 msgstr "LONGLONG"
 
-#: popthelp.c:209
+#: popthelp.c:210
 msgid "STRING"
 msgstr "STRING"
 
-#: popthelp.c:210
+#: popthelp.c:211
 msgid "FLOAT"
 msgstr "FLOAT"
 
-#: popthelp.c:211
+#: popthelp.c:212
 msgid "DOUBLE"
 msgstr "DOUBLE"
 
-#: popthelp.c:214
+#: popthelp.c:215
 msgid "ARG"
 msgstr "ARG"
 
-#: popthelp.c:644
+#: popthelp.c:649
 msgid "Usage:"
 msgstr "Использование:"
 
-#: popthelp.c:667
+#: popthelp.c:672
 msgid "[OPTION...]"
 msgstr "[ПАРАМЕТР...]"
diff --git a/po/sk.po b/po/sk.po
index f77a698..cf6149c 100644
--- a/po/sk.po
+++ b/po/sk.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.11\n"
 "Report-Msgid-Bugs-To: <popt-devel@rpm5.org>\n"
-"POT-Creation-Date: 2009-04-12 20:14+0200\n"
+"POT-Creation-Date: 2009-09-13 11:40-0400\n"
 "PO-Revision-Date: 1999-08-04 21:40+0200\n"
 "Last-Translator: Stanislav Meduna <stano@eunet.sk>\n"
 "Language-Team: Slovak <sk-i18n@rak.isternet.sk>\n"
@@ -18,52 +18,52 @@ msgstr ""
 msgid "unknown errno"
 msgstr ""
 
-#: popt.c:1031
+#: popt.c:1290
 #, c-format
 msgid "option type (%u) not implemented in popt\n"
 msgstr ""
 
-#: popt.c:1452
+#: popt.c:1711
 msgid "missing argument"
 msgstr ""
 
-#: popt.c:1454
+#: popt.c:1713
 msgid "unknown option"
 msgstr ""
 
-#: popt.c:1456
+#: popt.c:1715
 msgid "mutually exclusive logical operations requested"
 msgstr ""
 
-#: popt.c:1458
+#: popt.c:1717
 msgid "opt->arg should not be NULL"
 msgstr ""
 
-#: popt.c:1460
+#: popt.c:1719
 msgid "aliases nested too deeply"
 msgstr ""
 
-#: popt.c:1462
+#: popt.c:1721
 msgid "error in parameter quoting"
 msgstr ""
 
-#: popt.c:1464
+#: popt.c:1723
 msgid "invalid numeric value"
 msgstr ""
 
-#: popt.c:1466
+#: popt.c:1725
 msgid "number too large or too small"
 msgstr ""
 
-#: popt.c:1468
+#: popt.c:1727
 msgid "memory allocation failed"
 msgstr ""
 
-#: popt.c:1470
+#: popt.c:1729
 msgid "config file failed sanity test"
 msgstr ""
 
-#: popt.c:1474
+#: popt.c:1733
 msgid "unknown error"
 msgstr ""
 
@@ -105,33 +105,37 @@ msgid "INT"
 msgstr ""
 
 #: popthelp.c:207
-msgid "LONG"
+msgid "SHORT"
 msgstr ""
 
 #: popthelp.c:208
-msgid "LONGLONG"
+msgid "LONG"
 msgstr ""
 
 #: popthelp.c:209
-msgid "STRING"
+msgid "LONGLONG"
 msgstr ""
 
 #: popthelp.c:210
-msgid "FLOAT"
+msgid "STRING"
 msgstr ""
 
 #: popthelp.c:211
+msgid "FLOAT"
+msgstr ""
+
+#: popthelp.c:212
 msgid "DOUBLE"
 msgstr ""
 
-#: popthelp.c:214
+#: popthelp.c:215
 msgid "ARG"
 msgstr ""
 
-#: popthelp.c:644
+#: popthelp.c:649
 msgid "Usage:"
 msgstr ""
 
-#: popthelp.c:667
+#: popthelp.c:672
 msgid "[OPTION...]"
 msgstr ""
diff --git a/po/sl.po b/po/sl.po
index 1144a86..805b2a5 100644
--- a/po/sl.po
+++ b/po/sl.po
@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.11\n"
 "Report-Msgid-Bugs-To: <popt-devel@rpm5.org>\n"
-"POT-Creation-Date: 2009-04-12 20:14+0200\n"
+"POT-Creation-Date: 2009-09-13 11:40-0400\n"
 "PO-Revision-Date: 2000-09-05 12:30+0200\n"
 "Last-Translator: Roman Maurer <roman.maurer@hermes.si>\n"
 "Language-Team: Slovenian <sl@li.org>\n"
@@ -14,52 +14,52 @@ msgstr ""
 msgid "unknown errno"
 msgstr ""
 
-#: popt.c:1031
+#: popt.c:1290
 #, c-format
 msgid "option type (%u) not implemented in popt\n"
 msgstr ""
 
-#: popt.c:1452
+#: popt.c:1711
 msgid "missing argument"
 msgstr ""
 
-#: popt.c:1454
+#: popt.c:1713
 msgid "unknown option"
 msgstr ""
 
-#: popt.c:1456
+#: popt.c:1715
 msgid "mutually exclusive logical operations requested"
 msgstr ""
 
-#: popt.c:1458
+#: popt.c:1717
 msgid "opt->arg should not be NULL"
 msgstr ""
 
-#: popt.c:1460
+#: popt.c:1719
 msgid "aliases nested too deeply"
 msgstr ""
 
-#: popt.c:1462
+#: popt.c:1721
 msgid "error in parameter quoting"
 msgstr ""
 
-#: popt.c:1464
+#: popt.c:1723
 msgid "invalid numeric value"
 msgstr ""
 
-#: popt.c:1466
+#: popt.c:1725
 msgid "number too large or too small"
 msgstr ""
 
-#: popt.c:1468
+#: popt.c:1727
 msgid "memory allocation failed"
 msgstr ""
 
-#: popt.c:1470
+#: popt.c:1729
 msgid "config file failed sanity test"
 msgstr ""
 
-#: popt.c:1474
+#: popt.c:1733
 msgid "unknown error"
 msgstr ""
 
@@ -101,33 +101,37 @@ msgid "INT"
 msgstr ""
 
 #: popthelp.c:207
-msgid "LONG"
+msgid "SHORT"
 msgstr ""
 
 #: popthelp.c:208
-msgid "LONGLONG"
+msgid "LONG"
 msgstr ""
 
 #: popthelp.c:209
-msgid "STRING"
+msgid "LONGLONG"
 msgstr ""
 
 #: popthelp.c:210
-msgid "FLOAT"
+msgid "STRING"
 msgstr ""
 
 #: popthelp.c:211
+msgid "FLOAT"
+msgstr ""
+
+#: popthelp.c:212
 msgid "DOUBLE"
 msgstr ""
 
-#: popthelp.c:214
+#: popthelp.c:215
 msgid "ARG"
 msgstr ""
 
-#: popthelp.c:644
+#: popthelp.c:649
 msgid "Usage:"
 msgstr ""
 
-#: popthelp.c:667
+#: popthelp.c:672
 msgid "[OPTION...]"
 msgstr ""
diff --git a/po/sv.po b/po/sv.po
index 6ac2f8b..0c53e5d 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.14\n"
 "Report-Msgid-Bugs-To: <popt-devel@rpm5.org>\n"
-"POT-Creation-Date: 2009-04-12 20:14+0200\n"
+"POT-Creation-Date: 2009-09-13 11:40-0400\n"
 "PO-Revision-Date: 2008-02-23 20:15+0100\n"
 "Last-Translator: G�ran Uddeborg <goeran@uddeborg.se>\n"
 "Language-Team: Swedish <tp-sv@listor.tp-sv.se>\n"
@@ -21,52 +21,52 @@ msgstr ""
 msgid "unknown errno"
 msgstr "ok�nt felnummer"
 
-#: popt.c:1031
+#: popt.c:1290
 #, c-format
 msgid "option type (%u) not implemented in popt\n"
 msgstr "flaggtypen (%u) �r inte implementerad i popt\n"
 
-#: popt.c:1452
+#: popt.c:1711
 msgid "missing argument"
 msgstr "argument saknas"
 
-#: popt.c:1454
+#: popt.c:1713
 msgid "unknown option"
 msgstr "ok�nd flagga"
 
-#: popt.c:1456
+#: popt.c:1715
 msgid "mutually exclusive logical operations requested"
 msgstr "�msesidigt uteslutande logiska operationer beg�rdes"
 
-#: popt.c:1458
+#: popt.c:1717
 msgid "opt->arg should not be NULL"
 msgstr "opt->arg f�r inte vara NULL"
 
-#: popt.c:1460
+#: popt.c:1719
 msgid "aliases nested too deeply"
 msgstr "alias �r n�stade f�r djupt"
 
-#: popt.c:1462
+#: popt.c:1721
 msgid "error in parameter quoting"
 msgstr "fel i parametercitering"
 
-#: popt.c:1464
+#: popt.c:1723
 msgid "invalid numeric value"
 msgstr "ogiltigt numeriskt v�rde"
 
-#: popt.c:1466
+#: popt.c:1725
 msgid "number too large or too small"
 msgstr "talet f�r stort eller f�r litet"
 
-#: popt.c:1468
+#: popt.c:1727
 msgid "memory allocation failed"
 msgstr "minnesallokering misslyckades"
 
-#: popt.c:1470
+#: popt.c:1729
 msgid "config file failed sanity test"
 msgstr ""
 
-#: popt.c:1474
+#: popt.c:1733
 msgid "unknown error"
 msgstr "ok�nt fel"
 
@@ -107,33 +107,37 @@ msgid "INT"
 msgstr "HELTAL"
 
 #: popthelp.c:207
+msgid "SHORT"
+msgstr ""
+
+#: popthelp.c:208
 msgid "LONG"
 msgstr "L�NG"
 
-#: popthelp.c:208
+#: popthelp.c:209
 msgid "LONGLONG"
 msgstr "L�NGL�NG"
 
-#: popthelp.c:209
+#: popthelp.c:210
 msgid "STRING"
 msgstr "STR�NG"
 
-#: popthelp.c:210
+#: popthelp.c:211
 msgid "FLOAT"
 msgstr "FLYTTAL"
 
-#: popthelp.c:211
+#: popthelp.c:212
 msgid "DOUBLE"
 msgstr "DUBBEL"
 
-#: popthelp.c:214
+#: popthelp.c:215
 msgid "ARG"
 msgstr "ARG"
 
-#: popthelp.c:644
+#: popthelp.c:649
 msgid "Usage:"
 msgstr "Anv�ndning:"
 
-#: popthelp.c:667
+#: popthelp.c:672
 msgid "[OPTION...]"
 msgstr "[FLAGGA...]"
diff --git a/po/th.po b/po/th.po
index 5cbcda3..696ea62 100644
--- a/po/th.po
+++ b/po/th.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.14\n"
 "Report-Msgid-Bugs-To: <popt-devel@rpm5.org>\n"
-"POT-Creation-Date: 2009-04-12 20:14+0200\n"
+"POT-Creation-Date: 2009-09-13 11:40-0400\n"
 "PO-Revision-Date: 2008-02-19 15:53+0700\n"
 "Last-Translator: Seksan Poltree <seksan.poltree@gmail.com>\n"
 "Language-Team: Thai <translation-team-th@lists.sourceforge.net>\n"
@@ -20,52 +20,52 @@ msgstr ""
 msgid "unknown errno"
 msgstr "เกิด errno ที่ไม่รู้จัก"
 
-#: popt.c:1031
+#: popt.c:1290
 #, c-format
 msgid "option type (%u) not implemented in popt\n"
 msgstr "ตัวเลือกชนิด (%u) ไม่ถูกอิมพลีเมนต์ใน popt\n"
 
-#: popt.c:1452
+#: popt.c:1711
 msgid "missing argument"
 msgstr "ไม่พบอาร์กิวเมนต์"
 
-#: popt.c:1454
+#: popt.c:1713
 msgid "unknown option"
 msgstr "ไม่รู้จักตัวเลือก"
 
-#: popt.c:1456
+#: popt.c:1715
 msgid "mutually exclusive logical operations requested"
 msgstr "เกิดการร้องขอร่วมกันของการดำเนินการด้านตรรกะอย่างเดียวกัน"
 
-#: popt.c:1458
+#: popt.c:1717
 msgid "opt->arg should not be NULL"
 msgstr "opt->arg ไม่ควรจะเป็น NULL"
 
-#: popt.c:1460
+#: popt.c:1719
 msgid "aliases nested too deeply"
 msgstr "นามแฝงซ้อนกันมากเกินไป"
 
-#: popt.c:1462
+#: popt.c:1721
 msgid "error in parameter quoting"
 msgstr "เกิดข้อผิดพลาดในการอ้างอิงพารามิเตอร์"
 
-#: popt.c:1464
+#: popt.c:1723
 msgid "invalid numeric value"
 msgstr "ค่าตัวเลขผิดพลาด"
 
-#: popt.c:1466
+#: popt.c:1725
 msgid "number too large or too small"
 msgstr "ตัวเลขมีค่ามากหรือน้อยเกินไป"
 
-#: popt.c:1468
+#: popt.c:1727
 msgid "memory allocation failed"
 msgstr "การจัดสรรหน่วยความจำผิดพลาด"
 
-#: popt.c:1470
+#: popt.c:1729
 msgid "config file failed sanity test"
 msgstr ""
 
-#: popt.c:1474
+#: popt.c:1733
 msgid "unknown error"
 msgstr "ความผิดพลาดที่ไม่รู้จัก"
 
@@ -106,33 +106,37 @@ msgid "INT"
 msgstr "INT"
 
 #: popthelp.c:207
+msgid "SHORT"
+msgstr ""
+
+#: popthelp.c:208
 msgid "LONG"
 msgstr "LONG"
 
-#: popthelp.c:208
+#: popthelp.c:209
 msgid "LONGLONG"
 msgstr "LONGLONG"
 
-#: popthelp.c:209
+#: popthelp.c:210
 msgid "STRING"
 msgstr "STRING"
 
-#: popthelp.c:210
+#: popthelp.c:211
 msgid "FLOAT"
 msgstr "FLOAT"
 
-#: popthelp.c:211
+#: popthelp.c:212
 msgid "DOUBLE"
 msgstr "DOUBLE"
 
-#: popthelp.c:214
+#: popthelp.c:215
 msgid "ARG"
 msgstr "ARG"
 
-#: popthelp.c:644
+#: popthelp.c:649
 msgid "Usage:"
 msgstr "วิธีใช้:"
 
-#: popthelp.c:667
+#: popthelp.c:672
 msgid "[OPTION...]"
 msgstr "[ตัวเลือก...]"
diff --git a/po/tr.po b/po/tr.po
index 60c142b..3d88aa3 100644
--- a/po/tr.po
+++ b/po/tr.po
@@ -5,7 +5,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.11\n"
 "Report-Msgid-Bugs-To: <popt-devel@rpm5.org>\n"
-"POT-Creation-Date: 2009-04-12 20:14+0200\n"
+"POT-Creation-Date: 2009-09-13 11:40-0400\n"
 "PO-Revision-Date: 2000-02-11 13:01+0200\n"
 "Last-Translator: Nilgun Belma Buguner <nilgun@technologist.com>\n"
 "Language-Team: Turkish <tr@li.org>\n"
@@ -17,52 +17,52 @@ msgstr ""
 msgid "unknown errno"
 msgstr "bilinmeyen hata no"
 
-#: popt.c:1031
+#: popt.c:1290
 #, fuzzy, c-format
 msgid "option type (%u) not implemented in popt\n"
 msgstr "se�enek t�r� (%d) popt i�in ge�ersiz\n"
 
-#: popt.c:1452
+#: popt.c:1711
 msgid "missing argument"
 msgstr "arg�man eksik"
 
-#: popt.c:1454
+#: popt.c:1713
 msgid "unknown option"
 msgstr "bilinmeyen se�enek"
 
-#: popt.c:1456
+#: popt.c:1715
 msgid "mutually exclusive logical operations requested"
 msgstr "birbirini d��layan mant�ksal i�lemler istendi"
 
-#: popt.c:1458
+#: popt.c:1717
 msgid "opt->arg should not be NULL"
 msgstr ""
 
-#: popt.c:1460
+#: popt.c:1719
 msgid "aliases nested too deeply"
 msgstr "adlarda �ok fazla i�i�elikler"
 
-#: popt.c:1462
+#: popt.c:1721
 msgid "error in parameter quoting"
 msgstr "parametrelerde t�rnak i�aretleme hatal� "
 
-#: popt.c:1464
+#: popt.c:1723
 msgid "invalid numeric value"
 msgstr "say�sal de�er ge�ersiz"
 
-#: popt.c:1466
+#: popt.c:1725
 msgid "number too large or too small"
 msgstr "say� ya �ok b�y�k ya da �ok k���k"
 
-#: popt.c:1468
+#: popt.c:1727
 msgid "memory allocation failed"
 msgstr ""
 
-#: popt.c:1470
+#: popt.c:1729
 msgid "config file failed sanity test"
 msgstr ""
 
-#: popt.c:1474
+#: popt.c:1733
 msgid "unknown error"
 msgstr "bilinmeyen hata"
 
@@ -104,34 +104,38 @@ msgid "INT"
 msgstr "INT"
 
 #: popthelp.c:207
+msgid "SHORT"
+msgstr ""
+
+#: popthelp.c:208
 msgid "LONG"
 msgstr "LONG"
 
-#: popthelp.c:208
+#: popthelp.c:209
 #, fuzzy
 msgid "LONGLONG"
 msgstr "LONG"
 
-#: popthelp.c:209
+#: popthelp.c:210
 msgid "STRING"
 msgstr "STRING"
 
-#: popthelp.c:210
+#: popthelp.c:211
 msgid "FLOAT"
 msgstr "FLOAT"
 
-#: popthelp.c:211
+#: popthelp.c:212
 msgid "DOUBLE"
 msgstr "DOUBLE"
 
-#: popthelp.c:214
+#: popthelp.c:215
 msgid "ARG"
 msgstr "ARG"
 
-#: popthelp.c:644
+#: popthelp.c:649
 msgid "Usage:"
 msgstr "Kullan�m�:"
 
-#: popthelp.c:667
+#: popthelp.c:672
 msgid "[OPTION...]"
 msgstr "[SE�ENEK...]"
diff --git a/po/uk.po b/po/uk.po
index c9da20c..2651de2 100644
--- a/po/uk.po
+++ b/po/uk.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.11\n"
 "Report-Msgid-Bugs-To: <popt-devel@rpm5.org>\n"
-"POT-Creation-Date: 2009-04-12 20:14+0200\n"
+"POT-Creation-Date: 2009-09-13 11:40-0400\n"
 "PO-Revision-Date: 1999-09-30 16:54+0200\n"
 "Last-Translator: Yuri Syrota <rasta@renome.rovno.ua>\n"
 "Language-Team: Ukrainian <uk@li.org>\n"
@@ -18,52 +18,52 @@ msgstr ""
 msgid "unknown errno"
 msgstr ""
 
-#: popt.c:1031
+#: popt.c:1290
 #, c-format
 msgid "option type (%u) not implemented in popt\n"
 msgstr ""
 
-#: popt.c:1452
+#: popt.c:1711
 msgid "missing argument"
 msgstr ""
 
-#: popt.c:1454
+#: popt.c:1713
 msgid "unknown option"
 msgstr ""
 
-#: popt.c:1456
+#: popt.c:1715
 msgid "mutually exclusive logical operations requested"
 msgstr ""
 
-#: popt.c:1458
+#: popt.c:1717
 msgid "opt->arg should not be NULL"
 msgstr ""
 
-#: popt.c:1460
+#: popt.c:1719
 msgid "aliases nested too deeply"
 msgstr ""
 
-#: popt.c:1462
+#: popt.c:1721
 msgid "error in parameter quoting"
 msgstr ""
 
-#: popt.c:1464
+#: popt.c:1723
 msgid "invalid numeric value"
 msgstr ""
 
-#: popt.c:1466
+#: popt.c:1725
 msgid "number too large or too small"
 msgstr ""
 
-#: popt.c:1468
+#: popt.c:1727
 msgid "memory allocation failed"
 msgstr ""
 
-#: popt.c:1470
+#: popt.c:1729
 msgid "config file failed sanity test"
 msgstr ""
 
-#: popt.c:1474
+#: popt.c:1733
 msgid "unknown error"
 msgstr ""
 
@@ -105,33 +105,37 @@ msgid "INT"
 msgstr ""
 
 #: popthelp.c:207
-msgid "LONG"
+msgid "SHORT"
 msgstr ""
 
 #: popthelp.c:208
-msgid "LONGLONG"
+msgid "LONG"
 msgstr ""
 
 #: popthelp.c:209
-msgid "STRING"
+msgid "LONGLONG"
 msgstr ""
 
 #: popthelp.c:210
-msgid "FLOAT"
+msgid "STRING"
 msgstr ""
 
 #: popthelp.c:211
+msgid "FLOAT"
+msgstr ""
+
+#: popthelp.c:212
 msgid "DOUBLE"
 msgstr ""
 
-#: popthelp.c:214
+#: popthelp.c:215
 msgid "ARG"
 msgstr ""
 
-#: popthelp.c:644
+#: popthelp.c:649
 msgid "Usage:"
 msgstr ""
 
-#: popthelp.c:667
+#: popthelp.c:672
 msgid "[OPTION...]"
 msgstr ""
diff --git a/po/vi.po b/po/vi.po
index 1c29ed8..571cc42 100644
--- a/po/vi.po
+++ b/po/vi.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.14\n"
 "Report-Msgid-Bugs-To: <popt-devel@rpm5.org>\n"
-"POT-Creation-Date: 2009-04-12 20:14+0200\n"
+"POT-Creation-Date: 2009-09-13 11:40-0400\n"
 "PO-Revision-Date: 2008-02-18 16:20+1030\n"
 "Last-Translator: Clytie Siddall <clytie@riverland.net.au>\n"
 "Language-Team: Vietnamese <vi-VN@googlegroups.com>\n"
@@ -21,52 +21,52 @@ msgstr ""
 msgid "unknown errno"
 msgstr "số hiệu lỗi không rõ"
 
-#: popt.c:1031
+#: popt.c:1290
 #, c-format
 msgid "option type (%u) not implemented in popt\n"
 msgstr "kiểu tùy chọn (%u) chưa được thực hiện trong popt\n"
 
-#: popt.c:1452
+#: popt.c:1711
 msgid "missing argument"
 msgstr "thiếu đối số"
 
-#: popt.c:1454
+#: popt.c:1713
 msgid "unknown option"
 msgstr "tùy chọn không rõ"
 
-#: popt.c:1456
+#: popt.c:1715
 msgid "mutually exclusive logical operations requested"
 msgstr "các thao tác hợp lý loại từ lẫn nhau được yêu cầu"
 
-#: popt.c:1458
+#: popt.c:1717
 msgid "opt->arg should not be NULL"
 msgstr "« tùy chọn->đối số » không thể vô giá trị"
 
-#: popt.c:1460
+#: popt.c:1719
 msgid "aliases nested too deeply"
 msgstr "các bí danh lồng nhau quá sâu"
 
-#: popt.c:1462
+#: popt.c:1721
 msgid "error in parameter quoting"
 msgstr "gặp lỗi trong lời trích dẫn tham số"
 
-#: popt.c:1464
+#: popt.c:1723
 msgid "invalid numeric value"
 msgstr "giá trị thuộc số không hợp lệ"
 
-#: popt.c:1466
+#: popt.c:1725
 msgid "number too large or too small"
 msgstr "con số quá lớn hay quá nhỏ"
 
-#: popt.c:1468
+#: popt.c:1727
 msgid "memory allocation failed"
 msgstr "lỗi cấp phát bộ nhớ"
 
-#: popt.c:1470
+#: popt.c:1729
 msgid "config file failed sanity test"
 msgstr ""
 
-#: popt.c:1474
+#: popt.c:1733
 msgid "unknown error"
 msgstr "lỗi không rõ"
 
@@ -107,33 +107,37 @@ msgid "INT"
 msgstr "SỐ NGUYÊN"
 
 #: popthelp.c:207
+msgid "SHORT"
+msgstr ""
+
+#: popthelp.c:208
 msgid "LONG"
 msgstr "DÀI"
 
-#: popthelp.c:208
+#: popthelp.c:209
 msgid "LONGLONG"
 msgstr "DÀIDÀI"
 
-#: popthelp.c:209
+#: popthelp.c:210
 msgid "STRING"
 msgstr "CHUỖI"
 
-#: popthelp.c:210
+#: popthelp.c:211
 msgid "FLOAT"
 msgstr "NỔI"
 
-#: popthelp.c:211
+#: popthelp.c:212
 msgid "DOUBLE"
 msgstr "ĐÔI"
 
-#: popthelp.c:214
+#: popthelp.c:215
 msgid "ARG"
 msgstr "ĐỐI SỐ"
 
-#: popthelp.c:644
+#: popthelp.c:649
 msgid "Usage:"
 msgstr "Sử dụng:"
 
-#: popthelp.c:667
+#: popthelp.c:672
 msgid "[OPTION...]"
 msgstr "[TÙY_CHỌN...]"
diff --git a/po/wa.po b/po/wa.po
index 0b200b2..a15a1fa 100644
--- a/po/wa.po
+++ b/po/wa.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.11\n"
 "Report-Msgid-Bugs-To: <popt-devel@rpm5.org>\n"
-"POT-Creation-Date: 2009-04-12 20:14+0200\n"
+"POT-Creation-Date: 2009-09-13 11:40-0400\n"
 "PO-Revision-Date: 1999-03-18 23:11+0100\n"
 "Last-Translator: Nobody yet\n"
 "Language-Team: walon <linux-wa@chanae.alphanet.ch>\n"
@@ -22,52 +22,52 @@ msgstr ""
 msgid "unknown errno"
 msgstr ""
 
-#: popt.c:1031
+#: popt.c:1290
 #, c-format
 msgid "option type (%u) not implemented in popt\n"
 msgstr ""
 
-#: popt.c:1452
+#: popt.c:1711
 msgid "missing argument"
 msgstr ""
 
-#: popt.c:1454
+#: popt.c:1713
 msgid "unknown option"
 msgstr ""
 
-#: popt.c:1456
+#: popt.c:1715
 msgid "mutually exclusive logical operations requested"
 msgstr ""
 
-#: popt.c:1458
+#: popt.c:1717
 msgid "opt->arg should not be NULL"
 msgstr ""
 
-#: popt.c:1460
+#: popt.c:1719
 msgid "aliases nested too deeply"
 msgstr ""
 
-#: popt.c:1462
+#: popt.c:1721
 msgid "error in parameter quoting"
 msgstr ""
 
-#: popt.c:1464
+#: popt.c:1723
 msgid "invalid numeric value"
 msgstr ""
 
-#: popt.c:1466
+#: popt.c:1725
 msgid "number too large or too small"
 msgstr ""
 
-#: popt.c:1468
+#: popt.c:1727
 msgid "memory allocation failed"
 msgstr ""
 
-#: popt.c:1470
+#: popt.c:1729
 msgid "config file failed sanity test"
 msgstr ""
 
-#: popt.c:1474
+#: popt.c:1733
 msgid "unknown error"
 msgstr ""
 
@@ -109,33 +109,37 @@ msgid "INT"
 msgstr ""
 
 #: popthelp.c:207
-msgid "LONG"
+msgid "SHORT"
 msgstr ""
 
 #: popthelp.c:208
-msgid "LONGLONG"
+msgid "LONG"
 msgstr ""
 
 #: popthelp.c:209
-msgid "STRING"
+msgid "LONGLONG"
 msgstr ""
 
 #: popthelp.c:210
-msgid "FLOAT"
+msgid "STRING"
 msgstr ""
 
 #: popthelp.c:211
+msgid "FLOAT"
+msgstr ""
+
+#: popthelp.c:212
 msgid "DOUBLE"
 msgstr ""
 
-#: popthelp.c:214
+#: popthelp.c:215
 msgid "ARG"
 msgstr ""
 
-#: popthelp.c:644
+#: popthelp.c:649
 msgid "Usage:"
 msgstr ""
 
-#: popthelp.c:667
+#: popthelp.c:672
 msgid "[OPTION...]"
 msgstr ""
diff --git a/po/zh_CN.po b/po/zh_CN.po
index 00ae206..8651281 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.14\n"
 "Report-Msgid-Bugs-To: <popt-devel@rpm5.org>\n"
-"POT-Creation-Date: 2009-04-12 20:14+0200\n"
+"POT-Creation-Date: 2009-09-13 11:40-0400\n"
 "PO-Revision-Date: 2008-02-18 20:16+0800\n"
 "Last-Translator: LI Daobing <lidaobing@gmail.com>\n"
 "Language-Team: Chinese (simplified) <translation-team-zh-cn@lists."
@@ -21,52 +21,52 @@ msgstr ""
 msgid "unknown errno"
 msgstr "未知的错误"
 
-#: popt.c:1031
+#: popt.c:1290
 #, c-format
 msgid "option type (%u) not implemented in popt\n"
 msgstr "选项类别 (%u) 没有在 popt 中实现\n"
 
-#: popt.c:1452
+#: popt.c:1711
 msgid "missing argument"
 msgstr "缺少参数"
 
-#: popt.c:1454
+#: popt.c:1713
 msgid "unknown option"
 msgstr "未知的选项"
 
-#: popt.c:1456
+#: popt.c:1715
 msgid "mutually exclusive logical operations requested"
 msgstr "需要 XOR 逻辑运算"
 
-#: popt.c:1458
+#: popt.c:1717
 msgid "opt->arg should not be NULL"
 msgstr "opt->arg 不应该为 NULL"
 
-#: popt.c:1460
+#: popt.c:1719
 msgid "aliases nested too deeply"
 msgstr "别名嵌套太深"
 
-#: popt.c:1462
+#: popt.c:1721
 msgid "error in parameter quoting"
 msgstr "参数引号错误"
 
-#: popt.c:1464
+#: popt.c:1723
 msgid "invalid numeric value"
 msgstr "无效的数值"
 
-#: popt.c:1466
+#: popt.c:1725
 msgid "number too large or too small"
 msgstr "数值太大或太小"
 
-#: popt.c:1468
+#: popt.c:1727
 msgid "memory allocation failed"
 msgstr "内存分配错误"
 
-#: popt.c:1470
+#: popt.c:1729
 msgid "config file failed sanity test"
 msgstr ""
 
-#: popt.c:1474
+#: popt.c:1733
 msgid "unknown error"
 msgstr "未知的错误"
 
@@ -107,33 +107,37 @@ msgid "INT"
 msgstr "INT"
 
 #: popthelp.c:207
+msgid "SHORT"
+msgstr ""
+
+#: popthelp.c:208
 msgid "LONG"
 msgstr "LONG"
 
-#: popthelp.c:208
+#: popthelp.c:209
 msgid "LONGLONG"
 msgstr "LONGLONG"
 
-#: popthelp.c:209
+#: popthelp.c:210
 msgid "STRING"
 msgstr "STRING"
 
-#: popthelp.c:210
+#: popthelp.c:211
 msgid "FLOAT"
 msgstr "FLOAT"
 
-#: popthelp.c:211
+#: popthelp.c:212
 msgid "DOUBLE"
 msgstr "DOUBLE"
 
-#: popthelp.c:214
+#: popthelp.c:215
 msgid "ARG"
 msgstr "ARG"
 
-#: popthelp.c:644
+#: popthelp.c:649
 msgid "Usage:"
 msgstr "用法:"
 
-#: popthelp.c:667
+#: popthelp.c:672
 msgid "[OPTION...]"
 msgstr "[选项...]"
diff --git a/po/zh_TW.po b/po/zh_TW.po
index 0ebe550..856dfbb 100644
--- a/po/zh_TW.po
+++ b/po/zh_TW.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.11\n"
 "Report-Msgid-Bugs-To: <popt-devel@rpm5.org>\n"
-"POT-Creation-Date: 2009-04-12 20:14+0200\n"
+"POT-Creation-Date: 2009-09-13 11:40-0400\n"
 "PO-Revision-Date: 2005-04-08 17:52+0800\n"
 "Last-Translator: Wei-Lun Chao <chaoweilun@pcmail.com.tw>\n"
 "Language-Team: zh_TW <zh-l10n@linux.org.tw>\n"
@@ -18,52 +18,52 @@ msgstr ""
 msgid "unknown errno"
 msgstr "未知的錯誤"
 
-#: popt.c:1031
+#: popt.c:1290
 #, fuzzy, c-format
 msgid "option type (%u) not implemented in popt\n"
 msgstr "選項類型 (%d) 沒有在 popt 中實作\n"
 
-#: popt.c:1452
+#: popt.c:1711
 msgid "missing argument"
 msgstr "缺少引數"
 
-#: popt.c:1454
+#: popt.c:1713
 msgid "unknown option"
 msgstr "未知的選項"
 
-#: popt.c:1456
+#: popt.c:1715
 msgid "mutually exclusive logical operations requested"
 msgstr "需要相互獨立的邏輯運算"
 
-#: popt.c:1458
+#: popt.c:1717
 msgid "opt->arg should not be NULL"
 msgstr "opt->arg 不應為 NULL"
 
-#: popt.c:1460
+#: popt.c:1719
 msgid "aliases nested too deeply"
 msgstr "巢狀別名太深"
 
-#: popt.c:1462
+#: popt.c:1721
 msgid "error in parameter quoting"
 msgstr "參數引號錯誤"
 
-#: popt.c:1464
+#: popt.c:1723
 msgid "invalid numeric value"
 msgstr "不正確的數值"
 
-#: popt.c:1466
+#: popt.c:1725
 msgid "number too large or too small"
 msgstr "數字太大或太小"
 
-#: popt.c:1468
+#: popt.c:1727
 msgid "memory allocation failed"
 msgstr "記憶體配置錯誤"
 
-#: popt.c:1470
+#: popt.c:1729
 msgid "config file failed sanity test"
 msgstr ""
 
-#: popt.c:1474
+#: popt.c:1733
 msgid "unknown error"
 msgstr "未知的錯誤"
 
@@ -104,34 +104,38 @@ msgid "INT"
 msgstr "INT"
 
 #: popthelp.c:207
+msgid "SHORT"
+msgstr ""
+
+#: popthelp.c:208
 msgid "LONG"
 msgstr "LONG"
 
-#: popthelp.c:208
+#: popthelp.c:209
 #, fuzzy
 msgid "LONGLONG"
 msgstr "LONG"
 
-#: popthelp.c:209
+#: popthelp.c:210
 msgid "STRING"
 msgstr "STRING"
 
-#: popthelp.c:210
+#: popthelp.c:211
 msgid "FLOAT"
 msgstr "FLOAT"
 
-#: popthelp.c:211
+#: popthelp.c:212
 msgid "DOUBLE"
 msgstr "DOUBLE"
 
-#: popthelp.c:214
+#: popthelp.c:215
 msgid "ARG"
 msgstr "ARG"
 
-#: popthelp.c:644
+#: popthelp.c:649
 msgid "Usage:"
 msgstr "用法:"
 
-#: popthelp.c:667
+#: popthelp.c:672
 msgid "[OPTION...]"
 msgstr "[選項...]"
diff --git a/popt.c b/popt.c
index 5444af2..a1c38a5 100644
--- a/popt.c
+++ b/popt.c
@@ -791,7 +791,7 @@ int poptBitsAdd(poptBits bits, const char * s)
     if (bits == NULL || ns == 0)
 	return POPT_ERROR_NULLARG;
 
-    jlu32lpair(s, ns, &h0, &h1);
+    poptJlu32lpair(s, ns, &h0, &h1);
 
     for (ns = 0; ns < (size_t)_poptBitsK; ns++) {
         uint32_t h = h0 + ns * h1;
@@ -811,7 +811,7 @@ int poptBitsChk(poptBits bits, const char * s)
     if (bits == NULL || ns == 0)
 	return POPT_ERROR_NULLARG;
 
-    jlu32lpair(s, ns, &h0, &h1);
+    poptJlu32lpair(s, ns, &h0, &h1);
 
     for (ns = 0; ns < (size_t)_poptBitsK; ns++) {
         uint32_t h = h0 + ns * h1;
@@ -844,7 +844,7 @@ int poptBitsDel(poptBits bits, const char * s)
     if (bits == NULL || ns == 0)
 	return POPT_ERROR_NULLARG;
 
-    jlu32lpair(s, ns, &h0, &h1);
+    poptJlu32lpair(s, ns, &h0, &h1);
 
     for (ns = 0; ns < (size_t)_poptBitsK; ns++) {
         uint32_t h = h0 + ns * h1;
diff --git a/poptint.c b/poptint.c
index d369d1f..83fa7d6 100644
--- a/poptint.c
+++ b/poptint.c
@@ -4,6 +4,7 @@
 
 /* Any pair of 32 bit hashes can be used. lookup3.c generates pairs, will do. */
 #define _JLU3_jlu32lpair        1
+#define	jlu32lpair	poptJlu32lpair
 #include "lookup3.c"
 
 /*@-varuse +charint +ignoresigns @*/
diff --git a/poptint.h b/poptint.h
index 95674d3..80cbaca 100644
--- a/poptint.h
+++ b/poptint.h
@@ -44,7 +44,7 @@ typedef struct {
 #define PBM_CLR(d, s)   (__PBM_BITS (s)[__PBM_IX (d)] &= ~__PBM_MASK (d))
 #define PBM_ISSET(d, s) ((__PBM_BITS (s)[__PBM_IX (d)] & __PBM_MASK (d)) != 0)
 
-void jlu32lpair(/*@null@*/ const void *key, size_t size,
+extern void poptJlu32lpair(/*@null@*/ const void *key, size_t size,
                 uint32_t *pc, uint32_t *pb)
         /*@modifies *pc, *pb@*/;
 
-- 
Gitee


From 5daf145ac3990527e7e3c31a0c07e07ffbe577f7 Mon Sep 17 00:00:00 2001
From: Jeff Johnson <n3npq@mac.com>
Date: Fri, 12 Feb 2010 22:01:26 +0000
Subject: [PATCH 602/667] - add xcode project.

---
 popt.xcodeproj/project.pbxproj | 526 +++++++++++++++++++++++++++++++++
 1 file changed, 526 insertions(+)
 create mode 100644 popt.xcodeproj/project.pbxproj

diff --git a/popt.xcodeproj/project.pbxproj b/popt.xcodeproj/project.pbxproj
new file mode 100644
index 0000000..131783e
--- /dev/null
+++ b/popt.xcodeproj/project.pbxproj
@@ -0,0 +1,526 @@
+// !$*UTF8*$!
+{
+	archiveVersion = 1;
+	classes = {
+	};
+	objectVersion = 45;
+	objects = {
+
+/* Begin PBXAggregateTarget section */
+		0D006A101125FBE800A2FA32 /* testit.sh */ = {
+			isa = PBXAggregateTarget;
+			buildConfigurationList = 0D006A171125FC1C00A2FA32 /* Build configuration list for PBXAggregateTarget "testit.sh" */;
+			buildPhases = (
+				0D006A0F1125FBE800A2FA32 /* ShellScript */,
+			);
+			dependencies = (
+				0D006A141125FBFD00A2FA32 /* PBXTargetDependency */,
+			);
+			name = testit.sh;
+			productName = testit.sh;
+		};
+/* End PBXAggregateTarget section */
+
+/* Begin PBXBuildFile section */
+		0D00699D1125F0C400A2FA32 /* lookup3.c in Sources */ = {isa = PBXBuildFile; fileRef = 0D3EA3C31125E529001C69E6 /* lookup3.c */; };
+		0D00699F1125F0CE00A2FA32 /* poptconfig.c in Sources */ = {isa = PBXBuildFile; fileRef = 0D3EA3C91125E54B001C69E6 /* poptconfig.c */; };
+		0D0069A01125F0D100A2FA32 /* popthelp.c in Sources */ = {isa = PBXBuildFile; fileRef = 0D3EA3CB1125E553001C69E6 /* popthelp.c */; };
+		0D0069A11125F0D500A2FA32 /* poptint.c in Sources */ = {isa = PBXBuildFile; fileRef = 0D3EA3CD1125E55B001C69E6 /* poptint.c */; };
+		0D0069A21125F0DA00A2FA32 /* poptparse.c in Sources */ = {isa = PBXBuildFile; fileRef = 0D3EA3D11125E584001C69E6 /* poptparse.c */; };
+		0D0069A31125F0E900A2FA32 /* config.h in Headers */ = {isa = PBXBuildFile; fileRef = 0D3EA3D51125E5A6001C69E6 /* config.h */; };
+		0D0069A41125F0EC00A2FA32 /* system.h in Headers */ = {isa = PBXBuildFile; fileRef = 0D3EA3D31125E58E001C69E6 /* system.h */; };
+		0D0069A51125F0F100A2FA32 /* poptint.h in Headers */ = {isa = PBXBuildFile; fileRef = 0D3EA3CF1125E56C001C69E6 /* poptint.h */; };
+		0D0069A61125F0F400A2FA32 /* popt.h in Headers */ = {isa = PBXBuildFile; fileRef = 0D3EA3C71125E53F001C69E6 /* popt.h */; };
+		0D0069C61125F60200A2FA32 /* libiconv.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 0D0069C51125F60200A2FA32 /* libiconv.dylib */; };
+		0D0069EE1125F81900A2FA32 /* test1.c in Sources */ = {isa = PBXBuildFile; fileRef = 0D0069DD1125F73600A2FA32 /* test1.c */; };
+		0D3BAD131126031E00B3E80C /* popt.c in Sources */ = {isa = PBXBuildFile; fileRef = 0D3EA3C51125E537001C69E6 /* popt.c */; };
+		0D3BAD141126031E00B3E80C /* popt.c in Sources */ = {isa = PBXBuildFile; fileRef = 0D3EA3C51125E537001C69E6 /* popt.c */; };
+		0D3EA3C41125E529001C69E6 /* lookup3.c in Sources */ = {isa = PBXBuildFile; fileRef = 0D3EA3C31125E529001C69E6 /* lookup3.c */; };
+		0D3EA3C81125E53F001C69E6 /* popt.h in Headers */ = {isa = PBXBuildFile; fileRef = 0D3EA3C71125E53F001C69E6 /* popt.h */; };
+		0D3EA3CA1125E54B001C69E6 /* poptconfig.c in Sources */ = {isa = PBXBuildFile; fileRef = 0D3EA3C91125E54B001C69E6 /* poptconfig.c */; };
+		0D3EA3CC1125E553001C69E6 /* popthelp.c in Sources */ = {isa = PBXBuildFile; fileRef = 0D3EA3CB1125E553001C69E6 /* popthelp.c */; };
+		0D3EA3CE1125E55B001C69E6 /* poptint.c in Sources */ = {isa = PBXBuildFile; fileRef = 0D3EA3CD1125E55B001C69E6 /* poptint.c */; };
+		0D3EA3D01125E56C001C69E6 /* poptint.h in Headers */ = {isa = PBXBuildFile; fileRef = 0D3EA3CF1125E56C001C69E6 /* poptint.h */; };
+		0D3EA3D21125E584001C69E6 /* poptparse.c in Sources */ = {isa = PBXBuildFile; fileRef = 0D3EA3D11125E584001C69E6 /* poptparse.c */; };
+		0D3EA3D41125E58E001C69E6 /* system.h in Headers */ = {isa = PBXBuildFile; fileRef = 0D3EA3D31125E58E001C69E6 /* system.h */; };
+		0D3EA3D61125E5A6001C69E6 /* config.h in Headers */ = {isa = PBXBuildFile; fileRef = 0D3EA3D51125E5A6001C69E6 /* config.h */; };
+/* End PBXBuildFile section */
+
+/* Begin PBXContainerItemProxy section */
+		0D0069EF1125F83000A2FA32 /* PBXContainerItemProxy */ = {
+			isa = PBXContainerItemProxy;
+			containerPortal = 08FB7793FE84155DC02AAC07 /* Project object */;
+			proxyType = 1;
+			remoteGlobalIDString = D2AAC045055464E500DB518D;
+			remoteInfo = libpopt.a;
+		};
+		0D006A131125FBFD00A2FA32 /* PBXContainerItemProxy */ = {
+			isa = PBXContainerItemProxy;
+			containerPortal = 08FB7793FE84155DC02AAC07 /* Project object */;
+			proxyType = 1;
+			remoteGlobalIDString = 0D0069E91125F80A00A2FA32;
+			remoteInfo = test1;
+		};
+/* End PBXContainerItemProxy section */
+
+/* Begin PBXFileReference section */
+		0D0069921125F03400A2FA32 /* libpopt.dylib */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.dylib"; includeInIndex = 0; path = libpopt.dylib; sourceTree = BUILT_PRODUCTS_DIR; };
+		0D0069C41125F43900A2FA32 /* popt.3 */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = popt.3; sourceTree = "<group>"; };
+		0D0069C51125F60200A2FA32 /* libiconv.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libiconv.dylib; path = usr/lib/libiconv.dylib; sourceTree = SDKROOT; };
+		0D0069DD1125F73600A2FA32 /* test1.c */ = {isa = PBXFileReference; fileEncoding = 7; lastKnownFileType = sourcecode.c.c; path = test1.c; sourceTree = "<group>"; };
+		0D0069EA1125F80A00A2FA32 /* test1 */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = test1; sourceTree = BUILT_PRODUCTS_DIR; };
+		0D006A061125FADD00A2FA32 /* testit.sh */ = {isa = PBXFileReference; fileEncoding = 7; lastKnownFileType = text.script.sh; path = testit.sh; sourceTree = "<group>"; };
+		0D3BACFC1125FF5300B3E80C /* popt.ps */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = popt.ps; sourceTree = "<group>"; };
+		0D3EA3C31125E529001C69E6 /* lookup3.c */ = {isa = PBXFileReference; fileEncoding = 7; lastKnownFileType = sourcecode.c.c; path = lookup3.c; sourceTree = "<group>"; };
+		0D3EA3C51125E537001C69E6 /* popt.c */ = {isa = PBXFileReference; explicitFileType = compiled; fileEncoding = 7; path = popt.c; sourceTree = "<group>"; };
+		0D3EA3C71125E53F001C69E6 /* popt.h */ = {isa = PBXFileReference; fileEncoding = 7; lastKnownFileType = sourcecode.c.h; path = popt.h; sourceTree = "<group>"; };
+		0D3EA3C91125E54B001C69E6 /* poptconfig.c */ = {isa = PBXFileReference; fileEncoding = 7; lastKnownFileType = sourcecode.c.c; path = poptconfig.c; sourceTree = "<group>"; };
+		0D3EA3CB1125E553001C69E6 /* popthelp.c */ = {isa = PBXFileReference; fileEncoding = 7; lastKnownFileType = sourcecode.c.c; path = popthelp.c; sourceTree = "<group>"; };
+		0D3EA3CD1125E55B001C69E6 /* poptint.c */ = {isa = PBXFileReference; fileEncoding = 7; lastKnownFileType = sourcecode.c.c; path = poptint.c; sourceTree = "<group>"; };
+		0D3EA3CF1125E56C001C69E6 /* poptint.h */ = {isa = PBXFileReference; fileEncoding = 7; lastKnownFileType = sourcecode.c.h; path = poptint.h; sourceTree = "<group>"; };
+		0D3EA3D11125E584001C69E6 /* poptparse.c */ = {isa = PBXFileReference; fileEncoding = 7; lastKnownFileType = sourcecode.c.c; path = poptparse.c; sourceTree = "<group>"; };
+		0D3EA3D31125E58E001C69E6 /* system.h */ = {isa = PBXFileReference; fileEncoding = 7; lastKnownFileType = sourcecode.c.h; path = system.h; sourceTree = "<group>"; };
+		0D3EA3D51125E5A6001C69E6 /* config.h */ = {isa = PBXFileReference; fileEncoding = 7; lastKnownFileType = sourcecode.c.h; path = config.h; sourceTree = "<group>"; };
+		D2AAC046055464E500DB518D /* libpopt.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libpopt.a; sourceTree = BUILT_PRODUCTS_DIR; };
+/* End PBXFileReference section */
+
+/* Begin PBXFrameworksBuildPhase section */
+		0D0069901125F03400A2FA32 /* Frameworks */ = {
+			isa = PBXFrameworksBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+				0D0069C61125F60200A2FA32 /* libiconv.dylib in Frameworks */,
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+		0D0069E81125F80A00A2FA32 /* Frameworks */ = {
+			isa = PBXFrameworksBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+		D289987405E68DCB004EDB86 /* Frameworks */ = {
+			isa = PBXFrameworksBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+/* End PBXFrameworksBuildPhase section */
+
+/* Begin PBXGroup section */
+		08FB7794FE84155DC02AAC07 /* popt */ = {
+			isa = PBXGroup;
+			children = (
+				08FB7795FE84155DC02AAC07 /* Source */,
+				C6A0FF2B0290797F04C91782 /* Documentation */,
+				1AB674ADFE9D54B511CA2CBB /* Products */,
+				0D0069C51125F60200A2FA32 /* libiconv.dylib */,
+			);
+			name = popt;
+			sourceTree = "<group>";
+		};
+		08FB7795FE84155DC02AAC07 /* Source */ = {
+			isa = PBXGroup;
+			children = (
+				0D3EA3D51125E5A6001C69E6 /* config.h */,
+				0D3EA3C31125E529001C69E6 /* lookup3.c */,
+				0D3EA3C51125E537001C69E6 /* popt.c */,
+				0D3EA3C71125E53F001C69E6 /* popt.h */,
+				0D3EA3C91125E54B001C69E6 /* poptconfig.c */,
+				0D3EA3CB1125E553001C69E6 /* popthelp.c */,
+				0D3EA3CD1125E55B001C69E6 /* poptint.c */,
+				0D3EA3CF1125E56C001C69E6 /* poptint.h */,
+				0D3EA3D11125E584001C69E6 /* poptparse.c */,
+				0D3EA3D31125E58E001C69E6 /* system.h */,
+				0D0069DD1125F73600A2FA32 /* test1.c */,
+				0D006A061125FADD00A2FA32 /* testit.sh */,
+			);
+			name = Source;
+			sourceTree = "<group>";
+		};
+		1AB674ADFE9D54B511CA2CBB /* Products */ = {
+			isa = PBXGroup;
+			children = (
+				D2AAC046055464E500DB518D /* libpopt.a */,
+				0D0069921125F03400A2FA32 /* libpopt.dylib */,
+				0D0069EA1125F80A00A2FA32 /* test1 */,
+			);
+			name = Products;
+			sourceTree = "<group>";
+		};
+		C6A0FF2B0290797F04C91782 /* Documentation */ = {
+			isa = PBXGroup;
+			children = (
+				0D3BACFC1125FF5300B3E80C /* popt.ps */,
+				0D0069C41125F43900A2FA32 /* popt.3 */,
+			);
+			name = Documentation;
+			sourceTree = "<group>";
+		};
+/* End PBXGroup section */
+
+/* Begin PBXHeadersBuildPhase section */
+		0D00698E1125F03400A2FA32 /* Headers */ = {
+			isa = PBXHeadersBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+				0D0069A31125F0E900A2FA32 /* config.h in Headers */,
+				0D0069A51125F0F100A2FA32 /* poptint.h in Headers */,
+				0D0069A61125F0F400A2FA32 /* popt.h in Headers */,
+				0D0069A41125F0EC00A2FA32 /* system.h in Headers */,
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+		D2AAC043055464E500DB518D /* Headers */ = {
+			isa = PBXHeadersBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+				0D3EA3D61125E5A6001C69E6 /* config.h in Headers */,
+				0D3EA3C81125E53F001C69E6 /* popt.h in Headers */,
+				0D3EA3D01125E56C001C69E6 /* poptint.h in Headers */,
+				0D3EA3D41125E58E001C69E6 /* system.h in Headers */,
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+/* End PBXHeadersBuildPhase section */
+
+/* Begin PBXNativeTarget section */
+		0D0069911125F03400A2FA32 /* libpopt.dylib */ = {
+			isa = PBXNativeTarget;
+			buildConfigurationList = 0D0069991125F07600A2FA32 /* Build configuration list for PBXNativeTarget "libpopt.dylib" */;
+			buildPhases = (
+				0D00698E1125F03400A2FA32 /* Headers */,
+				0D00698F1125F03400A2FA32 /* Sources */,
+				0D0069901125F03400A2FA32 /* Frameworks */,
+			);
+			buildRules = (
+			);
+			dependencies = (
+			);
+			name = libpopt.dylib;
+			productName = libpopt.dylib;
+			productReference = 0D0069921125F03400A2FA32 /* libpopt.dylib */;
+			productType = "com.apple.product-type.library.dynamic";
+		};
+		0D0069E91125F80A00A2FA32 /* test1 */ = {
+			isa = PBXNativeTarget;
+			buildConfigurationList = 0D0069F31125F84F00A2FA32 /* Build configuration list for PBXNativeTarget "test1" */;
+			buildPhases = (
+				0D0069E71125F80A00A2FA32 /* Sources */,
+				0D0069E81125F80A00A2FA32 /* Frameworks */,
+			);
+			buildRules = (
+			);
+			dependencies = (
+				0D0069F01125F83000A2FA32 /* PBXTargetDependency */,
+			);
+			name = test1;
+			productName = test1;
+			productReference = 0D0069EA1125F80A00A2FA32 /* test1 */;
+			productType = "com.apple.product-type.tool";
+		};
+		D2AAC045055464E500DB518D /* libpopt.a */ = {
+			isa = PBXNativeTarget;
+			buildConfigurationList = 1DEB91EB08733DB70010E9CD /* Build configuration list for PBXNativeTarget "libpopt.a" */;
+			buildPhases = (
+				D2AAC043055464E500DB518D /* Headers */,
+				D2AAC044055464E500DB518D /* Sources */,
+				D289987405E68DCB004EDB86 /* Frameworks */,
+			);
+			buildRules = (
+			);
+			dependencies = (
+			);
+			name = libpopt.a;
+			productName = popt;
+			productReference = D2AAC046055464E500DB518D /* libpopt.a */;
+			productType = "com.apple.product-type.library.static";
+		};
+/* End PBXNativeTarget section */
+
+/* Begin PBXProject section */
+		08FB7793FE84155DC02AAC07 /* Project object */ = {
+			isa = PBXProject;
+			buildConfigurationList = 1DEB91EF08733DB70010E9CD /* Build configuration list for PBXProject "popt" */;
+			compatibilityVersion = "Xcode 3.1";
+			hasScannedForEncodings = 1;
+			knownRegions = (
+				English,
+				Japanese,
+				French,
+				German,
+				"",
+			);
+			mainGroup = 08FB7794FE84155DC02AAC07 /* popt */;
+			projectDirPath = "";
+			projectRoot = "";
+			targets = (
+				D2AAC045055464E500DB518D /* libpopt.a */,
+				0D0069911125F03400A2FA32 /* libpopt.dylib */,
+				0D0069E91125F80A00A2FA32 /* test1 */,
+				0D006A101125FBE800A2FA32 /* testit.sh */,
+			);
+		};
+/* End PBXProject section */
+
+/* Begin PBXShellScriptBuildPhase section */
+		0D006A0F1125FBE800A2FA32 /* ShellScript */ = {
+			isa = PBXShellScriptBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+			);
+			inputPaths = (
+			);
+			outputPaths = (
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+			shellPath = /bin/sh;
+			shellScript = "# shell script goes here\nexit 0";
+		};
+/* End PBXShellScriptBuildPhase section */
+
+/* Begin PBXSourcesBuildPhase section */
+		0D00698F1125F03400A2FA32 /* Sources */ = {
+			isa = PBXSourcesBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+				0D00699D1125F0C400A2FA32 /* lookup3.c in Sources */,
+				0D3BAD141126031E00B3E80C /* popt.c in Sources */,
+				0D00699F1125F0CE00A2FA32 /* poptconfig.c in Sources */,
+				0D0069A01125F0D100A2FA32 /* popthelp.c in Sources */,
+				0D0069A11125F0D500A2FA32 /* poptint.c in Sources */,
+				0D0069A21125F0DA00A2FA32 /* poptparse.c in Sources */,
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+		0D0069E71125F80A00A2FA32 /* Sources */ = {
+			isa = PBXSourcesBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+				0D0069EE1125F81900A2FA32 /* test1.c in Sources */,
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+		D2AAC044055464E500DB518D /* Sources */ = {
+			isa = PBXSourcesBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+				0D3EA3C41125E529001C69E6 /* lookup3.c in Sources */,
+				0D3BAD131126031E00B3E80C /* popt.c in Sources */,
+				0D3EA3CA1125E54B001C69E6 /* poptconfig.c in Sources */,
+				0D3EA3CC1125E553001C69E6 /* popthelp.c in Sources */,
+				0D3EA3CE1125E55B001C69E6 /* poptint.c in Sources */,
+				0D3EA3D21125E584001C69E6 /* poptparse.c in Sources */,
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+/* End PBXSourcesBuildPhase section */
+
+/* Begin PBXTargetDependency section */
+		0D0069F01125F83000A2FA32 /* PBXTargetDependency */ = {
+			isa = PBXTargetDependency;
+			target = D2AAC045055464E500DB518D /* libpopt.a */;
+			targetProxy = 0D0069EF1125F83000A2FA32 /* PBXContainerItemProxy */;
+		};
+		0D006A141125FBFD00A2FA32 /* PBXTargetDependency */ = {
+			isa = PBXTargetDependency;
+			target = 0D0069E91125F80A00A2FA32 /* test1 */;
+			targetProxy = 0D006A131125FBFD00A2FA32 /* PBXContainerItemProxy */;
+		};
+/* End PBXTargetDependency section */
+
+/* Begin XCBuildConfiguration section */
+		0D0069931125F03500A2FA32 /* Debug */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				ALWAYS_SEARCH_USER_PATHS = NO;
+				COPY_PHASE_STRIP = NO;
+				EXECUTABLE_PREFIX = lib;
+				GCC_DYNAMIC_NO_PIC = NO;
+				GCC_ENABLE_FIX_AND_CONTINUE = YES;
+				GCC_MODEL_TUNING = G5;
+				GCC_OPTIMIZATION_LEVEL = 2;
+				GCC_PREPROCESSOR_DEFINITIONS = HAVE_CONFIG_H;
+				INSTALL_PATH = /usr/local/lib;
+				PREBINDING = NO;
+				PRODUCT_NAME = popt;
+			};
+			name = Debug;
+		};
+		0D0069941125F03500A2FA32 /* Release */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				ALWAYS_SEARCH_USER_PATHS = NO;
+				COPY_PHASE_STRIP = YES;
+				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
+				EXECUTABLE_PREFIX = lib;
+				GCC_ENABLE_FIX_AND_CONTINUE = NO;
+				GCC_MODEL_TUNING = G5;
+				INSTALL_PATH = /usr/local/lib;
+				PREBINDING = NO;
+				PRODUCT_NAME = libpopt.dylib;
+				ZERO_LINK = NO;
+			};
+			name = Release;
+		};
+		0D0069EC1125F80A00A2FA32 /* Debug */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				ALWAYS_SEARCH_USER_PATHS = NO;
+				COPY_PHASE_STRIP = NO;
+				GCC_DYNAMIC_NO_PIC = NO;
+				GCC_ENABLE_FIX_AND_CONTINUE = YES;
+				GCC_MODEL_TUNING = G5;
+				GCC_OPTIMIZATION_LEVEL = 0;
+				GCC_PREPROCESSOR_DEFINITIONS = HAVE_CONFIG_H;
+				INSTALL_PATH = /usr/local/bin;
+				MACH_O_TYPE = mh_execute;
+				OTHER_LDFLAGS = "-lpopt";
+				PREBINDING = NO;
+				PRODUCT_NAME = test1;
+			};
+			name = Debug;
+		};
+		0D0069ED1125F80A00A2FA32 /* Release */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				ALWAYS_SEARCH_USER_PATHS = NO;
+				COPY_PHASE_STRIP = YES;
+				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
+				GCC_ENABLE_FIX_AND_CONTINUE = NO;
+				GCC_MODEL_TUNING = G5;
+				INSTALL_PATH = /usr/local/bin;
+				PREBINDING = NO;
+				PRODUCT_NAME = test1;
+				ZERO_LINK = NO;
+			};
+			name = Release;
+		};
+		0D006A111125FBE800A2FA32 /* Debug */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				COPY_PHASE_STRIP = NO;
+				GCC_DYNAMIC_NO_PIC = NO;
+				GCC_OPTIMIZATION_LEVEL = 0;
+				PRODUCT_NAME = testit.sh;
+			};
+			name = Debug;
+		};
+		0D006A121125FBE800A2FA32 /* Release */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				COPY_PHASE_STRIP = YES;
+				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
+				GCC_ENABLE_FIX_AND_CONTINUE = NO;
+				PRODUCT_NAME = testit.sh;
+				ZERO_LINK = NO;
+			};
+			name = Release;
+		};
+		1DEB91EC08733DB70010E9CD /* Debug */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				ALWAYS_SEARCH_USER_PATHS = NO;
+				COPY_PHASE_STRIP = NO;
+				GCC_DYNAMIC_NO_PIC = NO;
+				GCC_ENABLE_FIX_AND_CONTINUE = YES;
+				GCC_MODEL_TUNING = G5;
+				GCC_OPTIMIZATION_LEVEL = 2;
+				GCC_PREPROCESSOR_DEFINITIONS = HAVE_CONFIG_H;
+				INSTALL_PATH = /usr/local/lib;
+				"New Setting" = "";
+				PRODUCT_NAME = popt;
+			};
+			name = Debug;
+		};
+		1DEB91ED08733DB70010E9CD /* Release */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				ALWAYS_SEARCH_USER_PATHS = NO;
+				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
+				GCC_MODEL_TUNING = G5;
+				INSTALL_PATH = /usr/local/lib;
+				PRODUCT_NAME = popt;
+			};
+			name = Release;
+		};
+		1DEB91F008733DB70010E9CD /* Debug */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				ARCHS = "$(ARCHS_STANDARD_32_64_BIT)";
+				GCC_C_LANGUAGE_STANDARD = gnu99;
+				GCC_OPTIMIZATION_LEVEL = 0;
+				GCC_WARN_ABOUT_RETURN_TYPE = YES;
+				GCC_WARN_UNUSED_VARIABLE = YES;
+				ONLY_ACTIVE_ARCH = YES;
+				PREBINDING = NO;
+				SDKROOT = macosx10.6;
+			};
+			name = Debug;
+		};
+		1DEB91F108733DB70010E9CD /* Release */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				ARCHS = "$(ARCHS_STANDARD_32_64_BIT)";
+				GCC_C_LANGUAGE_STANDARD = gnu99;
+				GCC_WARN_ABOUT_RETURN_TYPE = YES;
+				GCC_WARN_UNUSED_VARIABLE = YES;
+				PREBINDING = NO;
+				SDKROOT = macosx10.6;
+			};
+			name = Release;
+		};
+/* End XCBuildConfiguration section */
+
+/* Begin XCConfigurationList section */
+		0D0069991125F07600A2FA32 /* Build configuration list for PBXNativeTarget "libpopt.dylib" */ = {
+			isa = XCConfigurationList;
+			buildConfigurations = (
+				0D0069931125F03500A2FA32 /* Debug */,
+				0D0069941125F03500A2FA32 /* Release */,
+			);
+			defaultConfigurationIsVisible = 0;
+			defaultConfigurationName = Release;
+		};
+		0D0069F31125F84F00A2FA32 /* Build configuration list for PBXNativeTarget "test1" */ = {
+			isa = XCConfigurationList;
+			buildConfigurations = (
+				0D0069EC1125F80A00A2FA32 /* Debug */,
+				0D0069ED1125F80A00A2FA32 /* Release */,
+			);
+			defaultConfigurationIsVisible = 0;
+			defaultConfigurationName = Release;
+		};
+		0D006A171125FC1C00A2FA32 /* Build configuration list for PBXAggregateTarget "testit.sh" */ = {
+			isa = XCConfigurationList;
+			buildConfigurations = (
+				0D006A111125FBE800A2FA32 /* Debug */,
+				0D006A121125FBE800A2FA32 /* Release */,
+			);
+			defaultConfigurationIsVisible = 0;
+			defaultConfigurationName = Release;
+		};
+		1DEB91EB08733DB70010E9CD /* Build configuration list for PBXNativeTarget "libpopt.a" */ = {
+			isa = XCConfigurationList;
+			buildConfigurations = (
+				1DEB91EC08733DB70010E9CD /* Debug */,
+				1DEB91ED08733DB70010E9CD /* Release */,
+			);
+			defaultConfigurationIsVisible = 0;
+			defaultConfigurationName = Release;
+		};
+		1DEB91EF08733DB70010E9CD /* Build configuration list for PBXProject "popt" */ = {
+			isa = XCConfigurationList;
+			buildConfigurations = (
+				1DEB91F008733DB70010E9CD /* Debug */,
+				1DEB91F108733DB70010E9CD /* Release */,
+			);
+			defaultConfigurationIsVisible = 0;
+			defaultConfigurationName = Release;
+		};
+/* End XCConfigurationList section */
+	};
+	rootObject = 08FB7793FE84155DC02AAC07 /* Project object */;
+}
-- 
Gitee


From b949756c0dc688bba01515d944ec22798a235f52 Mon Sep 17 00:00:00 2001
From: Jeff Johnson <n3npq@mac.com>
Date: Fri, 12 Feb 2010 22:29:12 +0000
Subject: [PATCH 603/667] - add -liconv for static linkage. - ignore the xcode
 build directory

---
 .cvsignore                     | 1 +
 popt.xcodeproj/project.pbxproj | 8 ++++++--
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/.cvsignore b/.cvsignore
index d882ad0..231e54a 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -8,6 +8,7 @@ Makefile
 Makefile.in
 aclocal.m4
 autom4te*
+build
 config.cache
 config.guess
 config.h
diff --git a/popt.xcodeproj/project.pbxproj b/popt.xcodeproj/project.pbxproj
index 131783e..4652272 100644
--- a/popt.xcodeproj/project.pbxproj
+++ b/popt.xcodeproj/project.pbxproj
@@ -72,7 +72,7 @@
 		0D006A061125FADD00A2FA32 /* testit.sh */ = {isa = PBXFileReference; fileEncoding = 7; lastKnownFileType = text.script.sh; path = testit.sh; sourceTree = "<group>"; };
 		0D3BACFC1125FF5300B3E80C /* popt.ps */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = popt.ps; sourceTree = "<group>"; };
 		0D3EA3C31125E529001C69E6 /* lookup3.c */ = {isa = PBXFileReference; fileEncoding = 7; lastKnownFileType = sourcecode.c.c; path = lookup3.c; sourceTree = "<group>"; };
-		0D3EA3C51125E537001C69E6 /* popt.c */ = {isa = PBXFileReference; explicitFileType = compiled; fileEncoding = 7; path = popt.c; sourceTree = "<group>"; };
+		0D3EA3C51125E537001C69E6 /* popt.c */ = {isa = PBXFileReference; explicitFileType = sourcecode.c.c; fileEncoding = 7; path = popt.c; sourceTree = "<group>"; };
 		0D3EA3C71125E53F001C69E6 /* popt.h */ = {isa = PBXFileReference; fileEncoding = 7; lastKnownFileType = sourcecode.c.h; path = popt.h; sourceTree = "<group>"; };
 		0D3EA3C91125E54B001C69E6 /* poptconfig.c */ = {isa = PBXFileReference; fileEncoding = 7; lastKnownFileType = sourcecode.c.c; path = poptconfig.c; sourceTree = "<group>"; };
 		0D3EA3CB1125E553001C69E6 /* popthelp.c */ = {isa = PBXFileReference; fileEncoding = 7; lastKnownFileType = sourcecode.c.c; path = popthelp.c; sourceTree = "<group>"; };
@@ -344,6 +344,7 @@
 				GCC_OPTIMIZATION_LEVEL = 2;
 				GCC_PREPROCESSOR_DEFINITIONS = HAVE_CONFIG_H;
 				INSTALL_PATH = /usr/local/lib;
+				OTHER_LDFLAGS = "-liconv";
 				PREBINDING = NO;
 				PRODUCT_NAME = popt;
 			};
@@ -377,7 +378,10 @@
 				GCC_PREPROCESSOR_DEFINITIONS = HAVE_CONFIG_H;
 				INSTALL_PATH = /usr/local/bin;
 				MACH_O_TYPE = mh_execute;
-				OTHER_LDFLAGS = "-lpopt";
+				OTHER_LDFLAGS = (
+					"-lpopt",
+					"-liconv",
+				);
 				PREBINDING = NO;
 				PRODUCT_NAME = test1;
 			};
-- 
Gitee


From 650bba85405c95496fe6b463e9edb8f36630c40b Mon Sep 17 00:00:00 2001
From: Jeff Johnson <n3npq@mac.com>
Date: Fri, 12 Feb 2010 23:12:09 +0000
Subject: [PATCH 604/667] - make sure libpopt.dylib is also compiled as a test1
 pre-requisite. - ignore per-developer configgery files.

---
 popt.xcodeproj/.cvsignore      |  2 ++
 popt.xcodeproj/project.pbxproj | 13 +++++++++++++
 2 files changed, 15 insertions(+)
 create mode 100644 popt.xcodeproj/.cvsignore

diff --git a/popt.xcodeproj/.cvsignore b/popt.xcodeproj/.cvsignore
new file mode 100644
index 0000000..d82a5e4
--- /dev/null
+++ b/popt.xcodeproj/.cvsignore
@@ -0,0 +1,2 @@
+*.mode1v3
+*.pbxuser
diff --git a/popt.xcodeproj/project.pbxproj b/popt.xcodeproj/project.pbxproj
index 4652272..0df7493 100644
--- a/popt.xcodeproj/project.pbxproj
+++ b/popt.xcodeproj/project.pbxproj
@@ -61,6 +61,13 @@
 			remoteGlobalIDString = 0D0069E91125F80A00A2FA32;
 			remoteInfo = test1;
 		};
+		0DB9209B112616A9000277F8 /* PBXContainerItemProxy */ = {
+			isa = PBXContainerItemProxy;
+			containerPortal = 08FB7793FE84155DC02AAC07 /* Project object */;
+			proxyType = 1;
+			remoteGlobalIDString = 0D0069911125F03400A2FA32;
+			remoteInfo = libpopt.dylib;
+		};
 /* End PBXContainerItemProxy section */
 
 /* Begin PBXFileReference section */
@@ -214,6 +221,7 @@
 			buildRules = (
 			);
 			dependencies = (
+				0DB9209C112616A9000277F8 /* PBXTargetDependency */,
 				0D0069F01125F83000A2FA32 /* PBXTargetDependency */,
 			);
 			name = test1;
@@ -329,6 +337,11 @@
 			target = 0D0069E91125F80A00A2FA32 /* test1 */;
 			targetProxy = 0D006A131125FBFD00A2FA32 /* PBXContainerItemProxy */;
 		};
+		0DB9209C112616A9000277F8 /* PBXTargetDependency */ = {
+			isa = PBXTargetDependency;
+			target = 0D0069911125F03400A2FA32 /* libpopt.dylib */;
+			targetProxy = 0DB9209B112616A9000277F8 /* PBXContainerItemProxy */;
+		};
 /* End PBXTargetDependency section */
 
 /* Begin XCBuildConfiguration section */
-- 
Gitee


From 86b6bbde036f6ac0d0ecadf3b59a20387a290433 Mon Sep 17 00:00:00 2001
From: Jeff Johnson <n3npq@mac.com>
Date: Fri, 12 Feb 2010 23:18:20 +0000
Subject: [PATCH 605/667] - set "popt" as product name.

---
 popt.xcodeproj/project.pbxproj | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/popt.xcodeproj/project.pbxproj b/popt.xcodeproj/project.pbxproj
index 0df7493..f41c984 100644
--- a/popt.xcodeproj/project.pbxproj
+++ b/popt.xcodeproj/project.pbxproj
@@ -44,6 +44,7 @@
 		0D3EA3D21125E584001C69E6 /* poptparse.c in Sources */ = {isa = PBXBuildFile; fileRef = 0D3EA3D11125E584001C69E6 /* poptparse.c */; };
 		0D3EA3D41125E58E001C69E6 /* system.h in Headers */ = {isa = PBXBuildFile; fileRef = 0D3EA3D31125E58E001C69E6 /* system.h */; };
 		0D3EA3D61125E5A6001C69E6 /* config.h in Headers */ = {isa = PBXBuildFile; fileRef = 0D3EA3D51125E5A6001C69E6 /* config.h */; };
+		0DB920BA1126181E000277F8 /* libpopt.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 0D0069921125F03400A2FA32 /* libpopt.dylib */; };
 /* End PBXBuildFile section */
 
 /* Begin PBXContainerItemProxy section */
@@ -97,6 +98,7 @@
 			buildActionMask = 2147483647;
 			files = (
 				0D0069C61125F60200A2FA32 /* libiconv.dylib in Frameworks */,
+				0DB920BA1126181E000277F8 /* libpopt.dylib in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -374,7 +376,7 @@
 				GCC_MODEL_TUNING = G5;
 				INSTALL_PATH = /usr/local/lib;
 				PREBINDING = NO;
-				PRODUCT_NAME = libpopt.dylib;
+				PRODUCT_NAME = popt;
 				ZERO_LINK = NO;
 			};
 			name = Release;
-- 
Gitee


From a9fe17b450bfff4639263967a9a68641db098e46 Mon Sep 17 00:00:00 2001
From: Jeff Johnson <n3npq@mac.com>
Date: Wed, 17 Feb 2010 19:43:48 +0000
Subject: [PATCH 606/667] - make distcheck is now squeaky clean. - permit VPATH
 builds. - add shallow tests using ISP/RAS api-sanity-autotest.pl.

---
 .cvsignore                    |  4 +++
 CHANGES                       |  3 ++
 Makefile.am                   | 31 +++++++++++-------
 auto/.cvsignore               |  8 +++++
 auto/Makefile.am              | 12 +++++++
 auto/popt.desc.in             | 28 ++++++++++++++++
 auto/popt.types.in            | 60 +++++++++++++++++++++++++++++++++++
 configure.ac                  | 34 +++++++++++++++-----
 po/cs.po                      |  2 +-
 po/da.po                      |  2 +-
 po/de.po                      |  2 +-
 po/eo.po                      |  2 +-
 po/es.po                      |  2 +-
 po/fi.po                      |  2 +-
 po/fr.po                      |  2 +-
 po/ga.po                      |  2 +-
 po/gl.po                      |  2 +-
 po/hu.po                      |  2 +-
 po/id.po                      |  2 +-
 po/is.po                      |  2 +-
 po/it.po                      |  2 +-
 po/ja.po                      |  2 +-
 po/ko.po                      |  2 +-
 po/nb.po                      |  2 +-
 po/nl.po                      |  2 +-
 po/pl.po                      |  2 +-
 po/popt.pot                   |  4 +--
 po/pt.po                      |  2 +-
 po/ro.po                      |  2 +-
 po/ru.po                      |  2 +-
 po/sk.po                      |  2 +-
 po/sl.po                      |  2 +-
 po/sv.po                      |  2 +-
 po/th.po                      |  2 +-
 po/tr.po                      |  2 +-
 po/uk.po                      |  2 +-
 po/vi.po                      |  2 +-
 po/wa.po                      |  2 +-
 po/zh_CN.po                   |  2 +-
 po/zh_TW.po                   |  2 +-
 popt.spec => popt.spec.in     |  3 +-
 test-poptrc => test-poptrc.in |  0
 42 files changed, 195 insertions(+), 54 deletions(-)
 create mode 100644 auto/.cvsignore
 create mode 100644 auto/Makefile.am
 create mode 100644 auto/popt.desc.in
 create mode 100644 auto/popt.types.in
 rename popt.spec => popt.spec.in (96%)
 rename test-poptrc => test-poptrc.in (100%)

diff --git a/.cvsignore b/.cvsignore
index 231e54a..3bd1515 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1,3 +1,4 @@
+.ccache
 .deps
 .depend
 .libs
@@ -9,6 +10,7 @@ Makefile.in
 aclocal.m4
 autom4te*
 build
+clang
 config.cache
 config.guess
 config.h
@@ -29,10 +31,12 @@ ltmain.sh
 m4
 missing
 mkinstalldirs
+popt.spec
 stamp-h
 stamp-h1
 stamp-h.in
 tdict
+test-poptrc
 test1
 test2
 test3
diff --git a/CHANGES b/CHANGES
index 03dc4e7..5e9588e 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,4 +1,7 @@
 1.15 -> 1.16:
+    - make distcheck is now squeaky clean.
+    - permit VPATH builds.
+    - add shallow tests using ISP/RAS api-sanity-autotest.pl.
     - prefix bit set routines with popt to avoid symbol coolisions w rpm.
     - add tdict.c to exercise popt bit sets against /usr/dict/words.
     - add poptBitsArgs() method to generate args bit set.
diff --git a/Makefile.am b/Makefile.am
index e2025eb..6e16882 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -2,30 +2,30 @@
 
 AUTOMAKE_OPTIONS = 1.4 foreign
 
-LINT = splint
+LINT =		splint
+MCCABE =	pmccabe
 
-EXTRA_DIST = config.rpath  autogen.sh CHANGES $(man_MANS) popt.spec \
+EXTRA_DIST = config.rpath lookup3.c  autogen.sh CHANGES $(man_MANS) popt.spec \
 	footer_no_timestamp.html libpopt.vers \
-	testit.sh test-poptrc test3-data/0* \
-	po/*.in po/*.po po/popt.pot \
+	testit.sh test-poptrc \
 	popt.ps
 
-SUBDIRS = po
+SUBDIRS = po . auto
 
 AM_CPPFLAGS = -I. -I$(top_srcdir)
 
 noinst_HEADERS = poptint.h system.h
 
-noinst_PROGRAMS = test1 test2 test3 tdict
+noinst_PROGRAMS = test1 test2 tdict # test3
 test1_SOURCES = test1.c
 test1_LDFLAGS = 
 test1_LDADD = $(usrlib_LTLIBRARIES)
 test2_SOURCES = test2.c
 test2_LDFLAGS = 
 test2_LDADD = $(usrlib_LTLIBRARIES)
-test3_SOURCES = test3.c
-test3_LDFLAGS = 
-test3_LDADD = $(usrlib_LTLIBRARIES)
+#test3_SOURCES = test3.c
+#test3_LDFLAGS = 
+#test3_LDADD = $(usrlib_LTLIBRARIES)
 tdict_SOURCES = tdict.c
 tdict_LDFLAGS = 
 tdict_LDADD = $(usrlib_LTLIBRARIES)
@@ -33,9 +33,9 @@ tdict_LDADD = $(usrlib_LTLIBRARIES)
 noinst_SCRIPTS = testit.sh
 
 TESTS_ENVIRONMENT = \
-test1="./test1"
+test1="$(top_builddir)/test1"
 
-TESTS = testit.sh
+TESTS = $(top_srcdir)/testit.sh
 
 include_HEADERS = popt.h
 
@@ -49,13 +49,16 @@ pkgconfigdir = $(prefix)/lib/pkgconfig
 pkgconfig_DATA = popt.pc
 
 if HAVE_LD_VERSION_SCRIPT
-libpopt_la_LDFLAGS += -Wl,--version-script=$(srcdir)/libpopt.vers
+libpopt_la_LDFLAGS += -Wl,--version-script=$(top_srcdir)/libpopt.vers
 endif
 
 man_MANS = popt.3
 
 BUILT_SOURCES = popt.pc # popt.lcd
 
+distclean-local:
+	rm -rf .ccache
+
 .PHONY:	updatepo
 updatepo:
 	rsync -Lrtvz  translationproject.org::tp/latest/popt/  po
@@ -71,6 +74,10 @@ sources:
 lint:
 	$(LINT) ${DEFS} ${INCLUDES} test1.c ${libpopt_la_SOURCES}
 
+.PHONY:	mccabe
+mccabe:
+	$(MCCABE) $(libpopt_la_SOURCES) | sort -n -r | head -n 10
+
 .PHONY: doxygen
 doxygen: Doxyfile
 	rm -rf doxygen
diff --git a/auto/.cvsignore b/auto/.cvsignore
new file mode 100644
index 0000000..9f8d58a
--- /dev/null
+++ b/auto/.cvsignore
@@ -0,0 +1,8 @@
+descriptors_storage
+header_compile_errors
+Makefile
+Makefile.in
+popt.desc
+popt.types
+test_results
+tests
diff --git a/auto/Makefile.am b/auto/Makefile.am
new file mode 100644
index 0000000..95d9064
--- /dev/null
+++ b/auto/Makefile.am
@@ -0,0 +1,12 @@
+AUTOMAKE_OPTIONS = 1.4 foreign
+
+AUTOTEST =      api-sanity-autotest.pl
+
+TDIRS =		descriptors_storage header_compile_errors test_results tests
+
+clean-local:
+	rm -rf $(TDIRS)
+
+check-local:
+	-[ -d tests ] && ${AUTOTEST} -l popt -d popt.desc -clean
+	-${AUTOTEST} -l popt -d popt.desc -st popt.types -gen -build -run
diff --git a/auto/popt.desc.in b/auto/popt.desc.in
new file mode 100644
index 0000000..32bdc3b
--- /dev/null
+++ b/auto/popt.desc.in
@@ -0,0 +1,28 @@
+<version>
+  1.15
+</version>
+ 
+<headers>
+  popt.h
+</headers>
+ 
+<libs>
+  @abs_top_builddir@/.libs/libpopt.so
+</libs>
+
+<include_paths>
+  @abs_top_srcdir@
+</include_paths>
+
+<gcc_options>
+  @CFLAGS@
+</gcc_options>
+
+<opaque_types>
+</opaque_types>
+<skip_interfaces>
+</skip_interfaces>
+<include_preamble>
+</include_preamble>
+<libs_depend>
+</libs_depend>
diff --git a/auto/popt.types.in b/auto/popt.types.in
new file mode 100644
index 0000000..df24f5a
--- /dev/null
+++ b/auto/popt.types.in
@@ -0,0 +1,60 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<collection>
+
+<spec_type>
+  <kind>
+    common_param
+  </kind>
+  <name>
+    poptBits
+  </name>
+  <data_type>
+    poptBits
+  </data_type>
+  <value>
+    create_poptBits()
+  </value>
+  <global_code>
+    poptBits create_poptBits()
+    {
+	poptBits a = NULL;
+	(void) poptSaveBits(&a, 0, "foo");
+	(void) poptSaveBits(&a, 0, "bar");
+	(void) poptSaveBits(&a, 0, "baz");
+	return a;
+    }
+  </global_code>
+</spec_type>
+
+<spec_type>
+  <kind>
+    normal
+  </kind>
+  <data_type>
+    const char ***
+  </data_type>
+  <value>
+    &av
+  </value>
+  <global_code>
+    #include <malloc.h>
+  </global_code>
+  <init_code>
+    const char ** av = NULL;
+  </init_code>
+  <final_code>
+    free(av[0]);
+    free(av);
+  </final_code>
+  <associating>
+    <interfaces>
+      poptSaveString
+    </interfaces>
+    <links>
+      param1
+    </links>
+  </associating>
+</spec_type>
+
+</collection>
+
diff --git a/configure.ac b/configure.ac
index bc2fe8c..70445c4 100755
--- a/configure.ac
+++ b/configure.ac
@@ -1,8 +1,14 @@
 AC_PREREQ(2.57)
-AC_INIT(popt, 1.15, popt-devel@rpm5.org)
-AC_CANONICAL_TARGET
+AC_INIT(popt, 1.16, popt-devel@rpm5.org)
 AC_CONFIG_SRCDIR([popt.h])
 AC_CONFIG_HEADERS([config.h])
+AC_CANONICAL_TARGET
+
+dnl Must come before AM_INIT_AUTOMAKE.
+dnl AC_CONFIG_AUX_DIR([build-aux])
+AC_CONFIG_MACRO_DIR([m4])
+AM_INIT_AUTOMAKE([foreign -Wall])
+AM_MAINTAINER_MODE
 
 # Library code modified:                              REVISION++
 # Interfaces changed/added/removed:   CURRENT++       REVISION=0
@@ -12,14 +18,11 @@ AC_SUBST(LT_CURRENT, 0)
 AC_SUBST(LT_REVISION, 0)
 AC_SUBST(LT_AGE, 8)
 
-dnl Must come before AM_INIT_AUTOMAKE.
-dnl AC_CONFIG_AUX_DIR([build-aux])
-AM_INIT_AUTOMAKE([foreign -Wall])
-AC_CONFIG_MACRO_DIR([m4])
-
 ALL_LINGUAS="cs da de eo es fi fr ga gl hu id is it ja ko nb nl pl pt ro ru sk sl sv th tr uk vi wa zh_TW zh_CN"
 
+AC_PROG_CC_STDC
 AC_PROG_CC
+
 AC_PROG_INSTALL
 AC_PROG_LIBTOOL
 
@@ -66,6 +69,16 @@ AC_ARG_ENABLE([ld-version-script],
               [ : ] )
 AM_CONDITIONAL(HAVE_LD_VERSION_SCRIPT, test "$have_ld_version_script" = "yes")
 
+AC_ARG_ENABLE(build-gcov,
+    AS_HELP_STRING([--enable-build-gcov], [build POPT instrumented for gcov]), [dnl
+    if test ".$enableval" = .yes; then
+        if test ".`$CC --version 2>&1 | grep 'GCC'`" != .; then
+            dnl # GNU GCC (usually "gcc")
+            CFLAGS="$CFLAGS -fprofile-arcs -ftest-coverage"
+        fi
+    fi
+])
+
 AC_CHECK_FUNC(setreuid, [], [
     AC_CHECK_LIB(ucb, setreuid, [if echo $LIBS | grep -- -lucb >/dev/null ;then :; else LIBS="$LIBS -lc -lucb" USEUCB=y;fi])
 ])
@@ -114,4 +127,9 @@ AC_DEFINE_UNQUOTED(POPT_SOURCE_PATH, "$POPT_SOURCE_PATH",
 	[Full path to popt top_srcdir.])
 AC_SUBST(POPT_SOURCE_PATH)
 
-AC_OUTPUT([Doxyfile Makefile popt.pc po/Makefile.in])
+AC_CONFIG_SUBDIRS()
+AC_CONFIG_FILES([ po/Makefile.in
+    Doxyfile Makefile popt.pc popt.spec test-poptrc
+    auto/Makefile auto/popt.desc auto/popt.types
+])
+AC_OUTPUT
diff --git a/po/cs.po b/po/cs.po
index 447078a..3887c58 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.14\n"
 "Report-Msgid-Bugs-To: <popt-devel@rpm5.org>\n"
-"POT-Creation-Date: 2009-09-13 11:40-0400\n"
+"POT-Creation-Date: 2010-02-17 13:35-0500\n"
 "PO-Revision-Date: 2008-12-08 19:55+0100\n"
 "Last-Translator: Petr Pisar <petr.pisar@atlas.cz>\n"
 "Language-Team: Czech <translation-team-cs@lists.sourceforge.net>\n"
diff --git a/po/da.po b/po/da.po
index 13ed3ca..0fc90b9 100644
--- a/po/da.po
+++ b/po/da.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: popt-1.14\n"
 "Report-Msgid-Bugs-To: <popt-devel@rpm5.org>\n"
-"POT-Creation-Date: 2009-09-13 11:40-0400\n"
+"POT-Creation-Date: 2010-02-17 13:35-0500\n"
 "PO-Revision-Date: 2008-09-15 00:00+0000\n"
 "Last-Translator: Joe Hansen <joedalton2@yahoo.dk>\n"
 "Language-Team: Danish <dansk@dansk-gruppen.dk>\n"
diff --git a/po/de.po b/po/de.po
index ef10c51..878d956 100644
--- a/po/de.po
+++ b/po/de.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.15\n"
 "Report-Msgid-Bugs-To: <popt-devel@rpm5.org>\n"
-"POT-Creation-Date: 2009-09-13 11:40-0400\n"
+"POT-Creation-Date: 2010-02-17 13:35-0500\n"
 "PO-Revision-Date: 2009-04-17 14:05+0200\n"
 "Last-Translator: Robert Scheck <robert@rpm5.org>\n"
 "Language-Team: German <de@li.org>\n"
diff --git a/po/eo.po b/po/eo.po
index 88c1e8a..3674b48 100644
--- a/po/eo.po
+++ b/po/eo.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.14\n"
 "Report-Msgid-Bugs-To: <popt-devel@rpm5.org>\n"
-"POT-Creation-Date: 2009-09-13 11:40-0400\n"
+"POT-Creation-Date: 2010-02-17 13:35-0500\n"
 "PO-Revision-Date: 2008-08-03 15:50-0300\n"
 "Last-Translator: Felipe Castro <fefcas@gmail.com>\n"
 "Language-Team: Esperanto <translation-team-eo@lists.sourceforge.net>\n"
diff --git a/po/es.po b/po/es.po
index 5429b8b..1d05248 100644
--- a/po/es.po
+++ b/po/es.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.12\n"
 "Report-Msgid-Bugs-To: <popt-devel@rpm5.org>\n"
-"POT-Creation-Date: 2009-09-13 11:40-0400\n"
+"POT-Creation-Date: 2010-02-17 13:35-0500\n"
 "PO-Revision-Date: 2007-12-28 12:22+0100\n"
 "Last-Translator: Leandro Lucarella <luca@linuxmendoza.org.ar>\n"
 "Language-Team: Spanish <es@li.org>\n"
diff --git a/po/fi.po b/po/fi.po
index 3daa2c5..015b4c6 100644
--- a/po/fi.po
+++ b/po/fi.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.14\n"
 "Report-Msgid-Bugs-To: <popt-devel@rpm5.org>\n"
-"POT-Creation-Date: 2009-09-13 11:40-0400\n"
+"POT-Creation-Date: 2010-02-17 13:35-0500\n"
 "PO-Revision-Date: 2008-02-21 18:19+0200\n"
 "Last-Translator: Jorma Karvonen <karvjorm@users.sf.net>\n"
 "Language-Team: Finnish <translation-team-fi@lists.sourceforge.net>\n"
diff --git a/po/fr.po b/po/fr.po
index bbf5542..7e3c14f 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -12,7 +12,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.11\n"
 "Report-Msgid-Bugs-To: <popt-devel@rpm5.org>\n"
-"POT-Creation-Date: 2009-09-13 11:40-0400\n"
+"POT-Creation-Date: 2010-02-17 13:35-0500\n"
 "PO-Revision-Date: 2003-06-22 23:43+0200\n"
 "Last-Translator: RPM French Translation <rpm-fr@livna.org>\n"
 "Language-Team: RPM French Translation <rpm-fr@livna.org>\n"
diff --git a/po/ga.po b/po/ga.po
index 54173e5..feed9ce 100644
--- a/po/ga.po
+++ b/po/ga.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.14\n"
 "Report-Msgid-Bugs-To: <popt-devel@rpm5.org>\n"
-"POT-Creation-Date: 2009-09-13 11:40-0400\n"
+"POT-Creation-Date: 2010-02-17 13:35-0500\n"
 "PO-Revision-Date: 2008-04-10 06:21-0500\n"
 "Last-Translator: Kevin Scannell <kscanne@gmail.com>\n"
 "Language-Team: Irish <gaeilge-gnulinux@lists.sourceforge.net>\n"
diff --git a/po/gl.po b/po/gl.po
index 1c46b93..1311148 100644
--- a/po/gl.po
+++ b/po/gl.po
@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.11\n"
 "Report-Msgid-Bugs-To: <popt-devel@rpm5.org>\n"
-"POT-Creation-Date: 2009-09-13 11:40-0400\n"
+"POT-Creation-Date: 2010-02-17 13:35-0500\n"
 "PO-Revision-Date: 2001-01-17 01:01+0100\n"
 "Last-Translator: Jes�s Bravo �lvarez <jba@pobox.com>\n"
 "Language-Team: Galician <trasno@ceu.fi.udc.es>\n"
diff --git a/po/hu.po b/po/hu.po
index d02489a..f681c30 100644
--- a/po/hu.po
+++ b/po/hu.po
@@ -5,7 +5,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.11\n"
 "Report-Msgid-Bugs-To: <popt-devel@rpm5.org>\n"
-"POT-Creation-Date: 2009-09-13 11:40-0400\n"
+"POT-Creation-Date: 2010-02-17 13:35-0500\n"
 "PO-Revision-Date: 2007-06-21 00:45+0200\n"
 "Last-Translator: Gabor Kelemen <kelemeng@gnome.hu>\n"
 "Language-Team: Hungarian <translation-team-hu@lists.sourceforge.net>\n"
diff --git a/po/id.po b/po/id.po
index 3aa701d..6622520 100644
--- a/po/id.po
+++ b/po/id.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.14\n"
 "Report-Msgid-Bugs-To: <popt-devel@rpm5.org>\n"
-"POT-Creation-Date: 2009-09-13 11:40-0400\n"
+"POT-Creation-Date: 2010-02-17 13:35-0500\n"
 "PO-Revision-Date: 2008-08-26 14:18+0700\n"
 "Last-Translator: Andhika Padmawan <andhika.padmawan@gmail.com>\n"
 "Language-Team: Indonesian <translation-team-id@lists.sourceforge.net>\n"
diff --git a/po/is.po b/po/is.po
index 8b625b0..f775a1d 100644
--- a/po/is.po
+++ b/po/is.po
@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.11\n"
 "Report-Msgid-Bugs-To: <popt-devel@rpm5.org>\n"
-"POT-Creation-Date: 2009-09-13 11:40-0400\n"
+"POT-Creation-Date: 2010-02-17 13:35-0500\n"
 "PO-Revision-Date: 2001-06-08 01:35+0000\n"
 "Last-Translator: Richard Allen <ra@hp.is>\n"
 "Language-Team: is <kde-isl@mmedia.is>\n"
diff --git a/po/it.po b/po/it.po
index a133c0b..1441d42 100644
--- a/po/it.po
+++ b/po/it.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: popt-1.14\n"
 "Report-Msgid-Bugs-To: <popt-devel@rpm5.org>\n"
-"POT-Creation-Date: 2009-09-13 11:40-0400\n"
+"POT-Creation-Date: 2010-02-17 13:35-0500\n"
 "PO-Revision-Date: 2008-11-28 15:32+0100\n"
 "Last-Translator: Vincenzo Campanella <vinz65@gmail.com>\n"
 "Language-Team: Italian <tp@lists.linux.it>\n"
diff --git a/po/ja.po b/po/ja.po
index c13ac6c..3c8a87a 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.11\n"
 "Report-Msgid-Bugs-To: <popt-devel@rpm5.org>\n"
-"POT-Creation-Date: 2009-09-13 11:40-0400\n"
+"POT-Creation-Date: 2010-02-17 13:35-0500\n"
 "PO-Revision-Date: 2003--8-25 19:00+0900\n"
 "Last-Translator: Yukihiro Nakai <ynakai@redhat.com>\n"
 "Language-Team: Japanese <ja@li.org>\n"
diff --git a/po/ko.po b/po/ko.po
index 41cd322..cfd2896 100644
--- a/po/ko.po
+++ b/po/ko.po
@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.11\n"
 "Report-Msgid-Bugs-To: <popt-devel@rpm5.org>\n"
-"POT-Creation-Date: 2009-09-13 11:40-0400\n"
+"POT-Creation-Date: 2010-02-17 13:35-0500\n"
 "PO-Revision-Date: 2001-09-06 20:06+0900\n"
 "Last-Translator: Jong-Hoon Ryu <redhat4u@netian.com>\n"
 "Language-Team: GNU Translation project <ko@li.org>\n"
diff --git a/po/nb.po b/po/nb.po
index ebb6c5b..8ec9331 100644
--- a/po/nb.po
+++ b/po/nb.po
@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.11\n"
 "Report-Msgid-Bugs-To: <popt-devel@rpm5.org>\n"
-"POT-Creation-Date: 2009-09-13 11:40-0400\n"
+"POT-Creation-Date: 2010-02-17 13:35-0500\n"
 "PO-Revision-Date: 2001-06-27 11:05+0200\n"
 "Last-Translator: Kjartan Maraas <kmaraas@online.no>\n"
 "Language-Team: Norwegian <no@li.org>\n"
diff --git a/po/nl.po b/po/nl.po
index 940ec3a..09bc176 100644
--- a/po/nl.po
+++ b/po/nl.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.14\n"
 "Report-Msgid-Bugs-To: <popt-devel@rpm5.org>\n"
-"POT-Creation-Date: 2009-09-13 11:40-0400\n"
+"POT-Creation-Date: 2010-02-17 13:35-0500\n"
 "PO-Revision-Date: 2008-02-20 19:26+0100\n"
 "Last-Translator: Tim Van Holder <tim.van.holder@telenet.be>\n"
 "Language-Team: Dutch <vertaling@vrijschrift.org>\n"
diff --git a/po/pl.po b/po/pl.po
index db44319..e59b2e1 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.14\n"
 "Report-Msgid-Bugs-To: <popt-devel@rpm5.org>\n"
-"POT-Creation-Date: 2009-09-13 11:40-0400\n"
+"POT-Creation-Date: 2010-02-17 13:35-0500\n"
 "PO-Revision-Date: 2008-02-18 00:30+0100\n"
 "Last-Translator: Jakub Bogusz <qboosh@pld-linux.org>\n"
 "Language-Team: Polish <translation-team-pl@lists.sourceforge.net>\n"
diff --git a/po/popt.pot b/po/popt.pot
index 87fae8a..e1be585 100644
--- a/po/popt.pot
+++ b/po/popt.pot
@@ -5,9 +5,9 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: popt 1.15\n"
+"Project-Id-Version: popt 1.16\n"
 "Report-Msgid-Bugs-To: <popt-devel@rpm5.org>\n"
-"POT-Creation-Date: 2009-09-13 11:40-0400\n"
+"POT-Creation-Date: 2010-02-17 13:35-0500\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/po/pt.po b/po/pt.po
index 7884bb3..3f56a71 100644
--- a/po/pt.po
+++ b/po/pt.po
@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.11\n"
 "Report-Msgid-Bugs-To: <popt-devel@rpm5.org>\n"
-"POT-Creation-Date: 2009-09-13 11:40-0400\n"
+"POT-Creation-Date: 2010-02-17 13:35-0500\n"
 "PO-Revision-Date: 2002-02-13 18:32+0000\n"
 "Last-Translator: Pedro Morais <morais@kde.org>\n"
 "Language-Team: pt <morais@kde.org>\n"
diff --git a/po/ro.po b/po/ro.po
index cf8ee45..7f0a72e 100644
--- a/po/ro.po
+++ b/po/ro.po
@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.11\n"
 "Report-Msgid-Bugs-To: <popt-devel@rpm5.org>\n"
-"POT-Creation-Date: 2009-09-13 11:40-0400\n"
+"POT-Creation-Date: 2010-02-17 13:35-0500\n"
 "PO-Revision-Date: 2000-06-14 23:23+EST\n"
 "Last-Translator: Cristian Gafton <gafton@redhat.com>\n"
 "Language-Team: Romanian <ro@li.org>\n"
diff --git a/po/ru.po b/po/ru.po
index a313fa9..ec65e6d 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.14\n"
 "Report-Msgid-Bugs-To: <popt-devel@rpm5.org>\n"
-"POT-Creation-Date: 2009-09-13 11:40-0400\n"
+"POT-Creation-Date: 2010-02-17 13:35-0500\n"
 "PO-Revision-Date: 2009-02-01 13:30+0300\n"
 "Last-Translator: Yuri Kozlov <yuray@komyakino.ru>\n"
 "Language-Team: Russian <gnu@mx.ru>\n"
diff --git a/po/sk.po b/po/sk.po
index cf6149c..f5030ce 100644
--- a/po/sk.po
+++ b/po/sk.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.11\n"
 "Report-Msgid-Bugs-To: <popt-devel@rpm5.org>\n"
-"POT-Creation-Date: 2009-09-13 11:40-0400\n"
+"POT-Creation-Date: 2010-02-17 13:35-0500\n"
 "PO-Revision-Date: 1999-08-04 21:40+0200\n"
 "Last-Translator: Stanislav Meduna <stano@eunet.sk>\n"
 "Language-Team: Slovak <sk-i18n@rak.isternet.sk>\n"
diff --git a/po/sl.po b/po/sl.po
index 805b2a5..3e499ff 100644
--- a/po/sl.po
+++ b/po/sl.po
@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.11\n"
 "Report-Msgid-Bugs-To: <popt-devel@rpm5.org>\n"
-"POT-Creation-Date: 2009-09-13 11:40-0400\n"
+"POT-Creation-Date: 2010-02-17 13:35-0500\n"
 "PO-Revision-Date: 2000-09-05 12:30+0200\n"
 "Last-Translator: Roman Maurer <roman.maurer@hermes.si>\n"
 "Language-Team: Slovenian <sl@li.org>\n"
diff --git a/po/sv.po b/po/sv.po
index 0c53e5d..2992c2c 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.14\n"
 "Report-Msgid-Bugs-To: <popt-devel@rpm5.org>\n"
-"POT-Creation-Date: 2009-09-13 11:40-0400\n"
+"POT-Creation-Date: 2010-02-17 13:35-0500\n"
 "PO-Revision-Date: 2008-02-23 20:15+0100\n"
 "Last-Translator: G�ran Uddeborg <goeran@uddeborg.se>\n"
 "Language-Team: Swedish <tp-sv@listor.tp-sv.se>\n"
diff --git a/po/th.po b/po/th.po
index 696ea62..864c3af 100644
--- a/po/th.po
+++ b/po/th.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.14\n"
 "Report-Msgid-Bugs-To: <popt-devel@rpm5.org>\n"
-"POT-Creation-Date: 2009-09-13 11:40-0400\n"
+"POT-Creation-Date: 2010-02-17 13:35-0500\n"
 "PO-Revision-Date: 2008-02-19 15:53+0700\n"
 "Last-Translator: Seksan Poltree <seksan.poltree@gmail.com>\n"
 "Language-Team: Thai <translation-team-th@lists.sourceforge.net>\n"
diff --git a/po/tr.po b/po/tr.po
index 3d88aa3..3910b08 100644
--- a/po/tr.po
+++ b/po/tr.po
@@ -5,7 +5,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.11\n"
 "Report-Msgid-Bugs-To: <popt-devel@rpm5.org>\n"
-"POT-Creation-Date: 2009-09-13 11:40-0400\n"
+"POT-Creation-Date: 2010-02-17 13:35-0500\n"
 "PO-Revision-Date: 2000-02-11 13:01+0200\n"
 "Last-Translator: Nilgun Belma Buguner <nilgun@technologist.com>\n"
 "Language-Team: Turkish <tr@li.org>\n"
diff --git a/po/uk.po b/po/uk.po
index 2651de2..62e0fde 100644
--- a/po/uk.po
+++ b/po/uk.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.11\n"
 "Report-Msgid-Bugs-To: <popt-devel@rpm5.org>\n"
-"POT-Creation-Date: 2009-09-13 11:40-0400\n"
+"POT-Creation-Date: 2010-02-17 13:35-0500\n"
 "PO-Revision-Date: 1999-09-30 16:54+0200\n"
 "Last-Translator: Yuri Syrota <rasta@renome.rovno.ua>\n"
 "Language-Team: Ukrainian <uk@li.org>\n"
diff --git a/po/vi.po b/po/vi.po
index 571cc42..9132e69 100644
--- a/po/vi.po
+++ b/po/vi.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.14\n"
 "Report-Msgid-Bugs-To: <popt-devel@rpm5.org>\n"
-"POT-Creation-Date: 2009-09-13 11:40-0400\n"
+"POT-Creation-Date: 2010-02-17 13:35-0500\n"
 "PO-Revision-Date: 2008-02-18 16:20+1030\n"
 "Last-Translator: Clytie Siddall <clytie@riverland.net.au>\n"
 "Language-Team: Vietnamese <vi-VN@googlegroups.com>\n"
diff --git a/po/wa.po b/po/wa.po
index a15a1fa..b842e10 100644
--- a/po/wa.po
+++ b/po/wa.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.11\n"
 "Report-Msgid-Bugs-To: <popt-devel@rpm5.org>\n"
-"POT-Creation-Date: 2009-09-13 11:40-0400\n"
+"POT-Creation-Date: 2010-02-17 13:35-0500\n"
 "PO-Revision-Date: 1999-03-18 23:11+0100\n"
 "Last-Translator: Nobody yet\n"
 "Language-Team: walon <linux-wa@chanae.alphanet.ch>\n"
diff --git a/po/zh_CN.po b/po/zh_CN.po
index 8651281..ea1bd8d 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.14\n"
 "Report-Msgid-Bugs-To: <popt-devel@rpm5.org>\n"
-"POT-Creation-Date: 2009-09-13 11:40-0400\n"
+"POT-Creation-Date: 2010-02-17 13:35-0500\n"
 "PO-Revision-Date: 2008-02-18 20:16+0800\n"
 "Last-Translator: LI Daobing <lidaobing@gmail.com>\n"
 "Language-Team: Chinese (simplified) <translation-team-zh-cn@lists."
diff --git a/po/zh_TW.po b/po/zh_TW.po
index 856dfbb..b73e734 100644
--- a/po/zh_TW.po
+++ b/po/zh_TW.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.11\n"
 "Report-Msgid-Bugs-To: <popt-devel@rpm5.org>\n"
-"POT-Creation-Date: 2009-09-13 11:40-0400\n"
+"POT-Creation-Date: 2010-02-17 13:35-0500\n"
 "PO-Revision-Date: 2005-04-08 17:52+0800\n"
 "Last-Translator: Wei-Lun Chao <chaoweilun@pcmail.com.tw>\n"
 "Language-Team: zh_TW <zh-l10n@linux.org.tw>\n"
diff --git a/popt.spec b/popt.spec.in
similarity index 96%
rename from popt.spec
rename to popt.spec.in
index 066ec10..dbe3494 100644
--- a/popt.spec
+++ b/popt.spec.in
@@ -1,3 +1,4 @@
+%{expand:%%global _pkgconfigdir	%{_libdir}/pkgconfig}
 %define	_libdir	/%{_lib}
 
 Summary: A C library for parsing command line parameters.
@@ -47,7 +48,7 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/libpopt.*
 %{_includedir}/popt.h
 %{_mandir}/man3/popt.3*
-%{_prefix}/%{_lib}/pkgconfig/libpopt-%{version}.pc
+%{_pkgconfigdir}/popt.pc
 
 %changelog
 * Fri Apr 10 2009 Jeff Johnson <jbj@rpm5.org>
diff --git a/test-poptrc b/test-poptrc.in
similarity index 100%
rename from test-poptrc
rename to test-poptrc.in
-- 
Gitee


From 9648f2477777248cf987cf0dc8a27072ab4033cd Mon Sep 17 00:00:00 2001
From: Jeff Johnson <n3npq@mac.com>
Date: Wed, 17 Feb 2010 20:01:01 +0000
Subject: [PATCH 607/667] - include xcode project in distribution tar ball.

---
 CHANGES      | 1 +
 Makefile.am  | 3 ++-
 popt.spec.in | 8 +++++++-
 3 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/CHANGES b/CHANGES
index 5e9588e..226094a 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,4 +1,5 @@
 1.15 -> 1.16:
+    - include xcode project files in distributed popt tar ball.
     - make distcheck is now squeaky clean.
     - permit VPATH builds.
     - add shallow tests using ISP/RAS api-sanity-autotest.pl.
diff --git a/Makefile.am b/Makefile.am
index 6e16882..ffba744 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -5,9 +5,10 @@ AUTOMAKE_OPTIONS = 1.4 foreign
 LINT =		splint
 MCCABE =	pmccabe
 
-EXTRA_DIST = config.rpath lookup3.c  autogen.sh CHANGES $(man_MANS) popt.spec \
+EXTRA_DIST = config.rpath lookup3.c  autogen.sh CHANGES $(man_MANS) \
 	footer_no_timestamp.html libpopt.vers \
 	testit.sh test-poptrc \
+	popt.xcodeproj/project.pbxproj \
 	popt.ps
 
 SUBDIRS = po . auto
diff --git a/popt.spec.in b/popt.spec.in
index dbe3494..3ed71ba 100644
--- a/popt.spec.in
+++ b/popt.spec.in
@@ -3,7 +3,7 @@
 
 Summary: A C library for parsing command line parameters.
 Name: popt
-Version: 1.15
+Version: @VERSION@
 Release: 1
 License: X Consortium
 Group: System Environment/Libraries
@@ -33,6 +33,9 @@ rm -rf $RPM_BUILD_ROOT
 make DESTDIR=$RPM_BUILD_ROOT install
 %find_lang popt
 
+%check
+make check || :
+
 %track
 prog popt = {
     version   = %{version}
@@ -51,6 +54,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_pkgconfigdir}/popt.pc
 
 %changelog
+* Wed Feb 17 2010 Jeff Johnson <jbj@rpm5.org>
+- release popt-1.16 through rpm5.org.
+
 * Fri Apr 10 2009 Jeff Johnson <jbj@rpm5.org>
 - release popt-1.15 through rpm5.org.
 
-- 
Gitee


From a16f6de1a54f242918e67396b0b3ede24d7824e6 Mon Sep 17 00:00:00 2001
From: Jeff Johnson <n3npq@mac.com>
Date: Wed, 17 Feb 2010 20:12:56 +0000
Subject: [PATCH 608/667] - add lv.po, update translations (Translation
 Project).

---
 CHANGES      |   1 +
 configure.ac |   2 +-
 po/de.po     |  15 +++---
 po/lv.po     | 136 +++++++++++++++++++++++++++++++++++++++++++++++++++
 po/zh_CN.po  |   3 +-
 5 files changed, 147 insertions(+), 10 deletions(-)
 create mode 100644 po/lv.po

diff --git a/CHANGES b/CHANGES
index 226094a..0062af2 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,4 +1,5 @@
 1.15 -> 1.16:
+    - add lv.po, update translations (Translation Project).
     - include xcode project files in distributed popt tar ball.
     - make distcheck is now squeaky clean.
     - permit VPATH builds.
diff --git a/configure.ac b/configure.ac
index 70445c4..8685425 100755
--- a/configure.ac
+++ b/configure.ac
@@ -18,7 +18,7 @@ AC_SUBST(LT_CURRENT, 0)
 AC_SUBST(LT_REVISION, 0)
 AC_SUBST(LT_AGE, 8)
 
-ALL_LINGUAS="cs da de eo es fi fr ga gl hu id is it ja ko nb nl pl pt ro ru sk sl sv th tr uk vi wa zh_TW zh_CN"
+ALL_LINGUAS="cs da de eo es fi fr ga gl hu id is it ja ko lv nb nl pl pt ro ru sk sl sv th tr uk vi wa zh_TW zh_CN"
 
 AC_PROG_CC_STDC
 AC_PROG_CC
diff --git a/po/de.po b/po/de.po
index 878d956..03d3173 100644
--- a/po/de.po
+++ b/po/de.po
@@ -1,15 +1,16 @@
 # Translation of popt to German (Deutsch)
 # This file is distributed under the same license as the popt package.
-# Robert Scheck <robert@rpm5.org>, 2004-2009.
+# Robert Scheck <rpm@robert-scheck.de>, 2004-2007.
+# Roland Illig <roland.illig@gmx.de>, 2009.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: popt 1.15\n"
+"Project-Id-Version: popt 1.14\n"
 "Report-Msgid-Bugs-To: <popt-devel@rpm5.org>\n"
 "POT-Creation-Date: 2010-02-17 13:35-0500\n"
-"PO-Revision-Date: 2009-04-17 14:05+0200\n"
-"Last-Translator: Robert Scheck <robert@rpm5.org>\n"
-"Language-Team: German <de@li.org>\n"
+"PO-Revision-Date: 2009-11-10 19:58+0100\n"
+"Last-Translator: Roland Illig <roland.illig@gmx.de>\n"
+"Language-Team: German <translation-team-de@lists.sourceforge.net>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -21,7 +22,7 @@ msgstr "Unbekannte Fehler-Nummer"
 #: popt.c:1290
 #, c-format
 msgid "option type (%u) not implemented in popt\n"
-msgstr "Optionstyp (%u) ist nicht in popt implementiert\n"
+msgstr "Optionstyp (%u) ist in popt nicht vorhanden\n"
 
 #: popt.c:1711
 msgid "missing argument"
@@ -81,7 +82,7 @@ msgstr "Zeigt die Standardeinstellungen an"
 
 #: popthelp.c:92
 msgid "Terminate options"
-msgstr "Schließt die Optionen ab"
+msgstr "Optionen beenden"
 
 #: popthelp.c:191
 msgid "Help options:"
diff --git a/po/lv.po b/po/lv.po
new file mode 100644
index 0000000..2707911
--- /dev/null
+++ b/po/lv.po
@@ -0,0 +1,136 @@
+# translation of popt-1.14.pot to Latvian
+# Copyright © 2009 Free Software Foundation, Inc.
+# This file is distributed under the same license as the popt package.
+# This file is put in the public domain.
+#
+# Rihards Prieditis <RPrieditis@inbox.lv>, 2009.
+msgid ""
+msgstr ""
+"Project-Id-Version: popt-1.14\n"
+"Report-Msgid-Bugs-To: <popt-devel@rpm5.org>\n"
+"POT-Creation-Date: 2008-02-16 19:54-0500\n"
+"PO-Revision-Date: 2009-04-12 16:34+0300\n"
+"Last-Translator: Rihards Prieditis <RPrieditis@inbox.lv>\n"
+"Language-Team: Latvian <translation-team-lv@lists.sourceforge.net>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Generator: Lokalize 0.3\n"
+"Plural-Forms:  nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n != 0 ? 1 : 2);\n"
+
+#: popt.c:35
+msgid "unknown errno"
+msgstr "nezināms kļūdas numurs"
+
+#: popt.c:1090
+#, c-format
+msgid "option type (%u) not implemented in popt\n"
+msgstr "iespējas tips (%u) nav ieviests popt\n"
+
+#: popt.c:1294
+msgid "missing argument"
+msgstr "trūkst arguments"
+
+#: popt.c:1296
+msgid "unknown option"
+msgstr "nezināma iespēja"
+
+#: popt.c:1298
+msgid "mutually exclusive logical operations requested"
+msgstr "pieprasītas savstarpējie izslēdzošas loģiskās operācijas"
+
+#: popt.c:1300
+msgid "opt->arg should not be NULL"
+msgstr "opcija->arguments nevar būt NULL"
+
+#: popt.c:1302
+msgid "aliases nested too deeply"
+msgstr "aizstājvārdi iegulti pārāk dziļi"
+
+#: popt.c:1304
+msgid "error in parameter quoting"
+msgstr "kļuda parametru citēšanā"
+
+#: popt.c:1306
+msgid "invalid numeric value"
+msgstr "nederīga skaitļa vērtība"
+
+#: popt.c:1308
+msgid "number too large or too small"
+msgstr "skaitlis pārāk liels, vai pārāk mazs"
+
+#: popt.c:1310
+msgid "memory allocation failed"
+msgstr "atmiņas iedalīšana neizdevās"
+
+#: popt.c:1314
+msgid "unknown error"
+msgstr "nezināma kļūda"
+
+#: popthelp.c:74 popthelp.c:86
+msgid "Show this help message"
+msgstr "Rādīt šo palīdzības ziņu"
+
+#: popthelp.c:75 popthelp.c:87
+msgid "Display brief usage message"
+msgstr "Attēlot īsu izmantošanas ziņu"
+
+#: popthelp.c:76 popthelp.c:92
+msgid "Terminate options"
+msgstr "Pārtraukt iespējas"
+
+#: popthelp.c:90
+msgid "Display option defaults in message"
+msgstr "Attēlot noklusētās iespējas ziņā"
+
+#: popthelp.c:191
+msgid "Help options:"
+msgstr "Palīdzības iespējas:"
+
+#: popthelp.c:192
+msgid "Options implemented via popt alias/exec:"
+msgstr "Iespējas ieviestas caur popt aizstājvārda/izpildāmais:"
+
+#: popthelp.c:200
+msgid "NONE"
+msgstr "NEKAS"
+
+#: popthelp.c:202
+msgid "VAL"
+msgstr "VĒRTĪBA"
+
+#: popthelp.c:206
+msgid "INT"
+msgstr "INT"
+
+#: popthelp.c:207
+msgid "LONG"
+msgstr "LONG"
+
+#: popthelp.c:208
+msgid "LONGLONG"
+msgstr "LONGLONG"
+
+#: popthelp.c:209
+msgid "STRING"
+msgstr "VIRKNE"
+
+#: popthelp.c:210
+msgid "FLOAT"
+msgstr "FLOAT"
+
+#: popthelp.c:211
+msgid "DOUBLE"
+msgstr "DOUBLE"
+
+#: popthelp.c:214
+msgid "ARG"
+msgstr "ARGUMENTS"
+
+#: popthelp.c:634
+msgid "Usage:"
+msgstr "Lietošana:"
+
+#: popthelp.c:658
+msgid "[OPTION...]"
+msgstr "[IESPĒJAS..]"
diff --git a/po/zh_CN.po b/po/zh_CN.po
index ea1bd8d..3c1d943 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -11,8 +11,7 @@ msgstr ""
 "POT-Creation-Date: 2010-02-17 13:35-0500\n"
 "PO-Revision-Date: 2008-02-18 20:16+0800\n"
 "Last-Translator: LI Daobing <lidaobing@gmail.com>\n"
-"Language-Team: Chinese (simplified) <translation-team-zh-cn@lists."
-"sourceforge.net>\n"
+"Language-Team: Chinese (simplified) <i18n-zh@googlegroups.com>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-- 
Gitee


From 958535ce5aff293ed0d4bc8575d18a80422e0e38 Mon Sep 17 00:00:00 2001
From: Jeff Johnson <n3npq@mac.com>
Date: Sat, 13 Mar 2010 00:32:47 +0000
Subject: [PATCH 609/667] - name unit test config same as rpm.

---
 Makefile.am                      | 2 +-
 auto/.cvsignore                  | 4 ++--
 auto/Makefile.am                 | 4 ++--
 auto/{popt.desc.in => desc.in}   | 0
 auto/{popt.types.in => types.in} | 0
 configure.ac                     | 2 +-
 6 files changed, 6 insertions(+), 6 deletions(-)
 rename auto/{popt.desc.in => desc.in} (100%)
 rename auto/{popt.types.in => types.in} (100%)

diff --git a/Makefile.am b/Makefile.am
index ffba744..e634a0f 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -5,7 +5,7 @@ AUTOMAKE_OPTIONS = 1.4 foreign
 LINT =		splint
 MCCABE =	pmccabe
 
-EXTRA_DIST = config.rpath lookup3.c  autogen.sh CHANGES $(man_MANS) \
+EXTRA_DIST = config.rpath lookup3.c autogen.sh CHANGES $(man_MANS) \
 	footer_no_timestamp.html libpopt.vers \
 	testit.sh test-poptrc \
 	popt.xcodeproj/project.pbxproj \
diff --git a/auto/.cvsignore b/auto/.cvsignore
index 9f8d58a..d128b62 100644
--- a/auto/.cvsignore
+++ b/auto/.cvsignore
@@ -2,7 +2,7 @@ descriptors_storage
 header_compile_errors
 Makefile
 Makefile.in
-popt.desc
-popt.types
+desc
+types
 test_results
 tests
diff --git a/auto/Makefile.am b/auto/Makefile.am
index 95d9064..56bb292 100644
--- a/auto/Makefile.am
+++ b/auto/Makefile.am
@@ -8,5 +8,5 @@ clean-local:
 	rm -rf $(TDIRS)
 
 check-local:
-	-[ -d tests ] && ${AUTOTEST} -l popt -d popt.desc -clean
-	-${AUTOTEST} -l popt -d popt.desc -st popt.types -gen -build -run
+	-[ -d tests ] && ${AUTOTEST} -l popt -d desc -clean
+	-${AUTOTEST} -l popt -d desc -st types -gen -build -run
diff --git a/auto/popt.desc.in b/auto/desc.in
similarity index 100%
rename from auto/popt.desc.in
rename to auto/desc.in
diff --git a/auto/popt.types.in b/auto/types.in
similarity index 100%
rename from auto/popt.types.in
rename to auto/types.in
diff --git a/configure.ac b/configure.ac
index 8685425..8590605 100755
--- a/configure.ac
+++ b/configure.ac
@@ -130,6 +130,6 @@ AC_SUBST(POPT_SOURCE_PATH)
 AC_CONFIG_SUBDIRS()
 AC_CONFIG_FILES([ po/Makefile.in
     Doxyfile Makefile popt.pc popt.spec test-poptrc
-    auto/Makefile auto/popt.desc auto/popt.types
+    auto/Makefile auto/desc auto/types
 ])
 AC_OUTPUT
-- 
Gitee


From 677401099df34fa13398f50d66d69dcd46d2b70c Mon Sep 17 00:00:00 2001
From: Jeff Johnson <n3npq@mac.com>
Date: Sat, 13 Mar 2010 02:40:44 +0000
Subject: [PATCH 610/667] - improve specialized types in unit tests.

---
 auto/types.in | 106 ++++++++++++++++++++++++++++++++++++++------------
 1 file changed, 82 insertions(+), 24 deletions(-)

diff --git a/auto/types.in b/auto/types.in
index df24f5a..e446b67 100644
--- a/auto/types.in
+++ b/auto/types.in
@@ -2,15 +2,83 @@
 <collection>
 
 <spec_type>
-  <kind>
-    common_param
-  </kind>
-  <name>
-    poptBits
-  </name>
-  <data_type>
-    poptBits
-  </data_type>
+  <kind> common_env </kind>
+  <global_code>
+    static int aVal = 141421;
+    static unsigned int aFlag = 0x8aceU;
+
+    static short aShort = (short)4523;
+    static int aInt = 271828;
+    static long aLong = 738905609L;
+    static long long aLongLong = 738905609LL;
+    static float aFloat = 3.1415926535;
+    static double aDouble = 9.86960440108935861883;
+    static const char ** aArgv = NULL;
+
+    static struct poptOption optionsTable[] = {
+      { "val", '\0', POPT_ARG_VAL | POPT_ARGFLAG_SHOW_DEFAULT, &aVal, 125992,
+    	"POPT_ARG_VAL: 125992 141421", 0},
+      { "int", 'i', POPT_ARG_INT | POPT_ARGFLAG_SHOW_DEFAULT, &aInt, 0,
+    	"POPT_ARG_INT: 271828", NULL },
+      { "short", 's', POPT_ARG_SHORT | POPT_ARGFLAG_SHOW_DEFAULT, &aShort, 0,
+    	"POPT_ARG_SHORT: 4523", NULL },
+      { "long", 'l', POPT_ARG_LONG | POPT_ARGFLAG_SHOW_DEFAULT, &aLong, 0,
+    	"POPT_ARG_LONG: 738905609", NULL },
+      { "longlong", 'L', POPT_ARG_LONGLONG | POPT_ARGFLAG_SHOW_DEFAULT, &aLongLong, 0,
+    	"POPT_ARG_LONGLONG: 738905609", NULL },
+      { "float", 'f', POPT_ARG_FLOAT | POPT_ARGFLAG_SHOW_DEFAULT, &aFloat, 0,
+    	"POPT_ARG_FLOAT: 3.14159", NULL },
+      { "double", 'd', POPT_ARG_DOUBLE | POPT_ARGFLAG_SHOW_DEFAULT, &aDouble, 0,
+    	"POPT_ARG_DOUBLE: 9.8696", NULL },
+      { "argv", '\0', POPT_ARG_ARGV, &aArgv, 0,
+    	"POPT_ARG_ARGV: append string to argv array (can be used multiple times)","STRING"},
+      POPT_AUTOALIAS
+      POPT_AUTOHELP
+      POPT_TABLEEND
+    };
+  </global_code>
+</spec_type>
+
+<spec_type>
+  <kind> common_param </kind>
+  <data_type> poptContext </data_type>
+  <value> poptGetContext(argv[0], argc, argv, optionsTable, 0) </value>
+  <final_code>
+    $0 = poptFreeContext($0);
+  </final_code>
+  <associating>
+    <except>
+      poptAddItem	<!-- FIXME -->
+      poptFreeContext
+      poptFini
+    </except>
+  </associating>
+</spec_type>
+
+<spec_type>
+  <kind> common_param </kind>
+  <data_type> struct poptAlias </data_type>
+  <value> _alias </value>
+  <global_code>
+    #include <malloc.h>
+    static struct poptAlias _alias = {
+      .longName = "longName",
+      .shortName = 'l',
+      .argc = 0,
+      .argv = NULL
+    };
+  </global_code>
+  <init_code>
+    $0.argc = 1;
+    $0.argv = calloc($0.argc + 1, sizeof(*$0.argv));
+    $0.argv[0] = strdup("arg1");
+  </init_code>
+</spec_type>
+
+<spec_type>
+  <kind> common_param </kind>
+  <name> poptBits </name>
+  <data_type> poptBits </data_type>
   <value>
     create_poptBits()
   </value>
@@ -27,15 +95,9 @@
 </spec_type>
 
 <spec_type>
-  <kind>
-    normal
-  </kind>
-  <data_type>
-    const char ***
-  </data_type>
-  <value>
-    &av
-  </value>
+  <kind> normal </kind>
+  <data_type> const char *** </data_type>
+  <value> &av </value>
   <global_code>
     #include <malloc.h>
   </global_code>
@@ -47,12 +109,8 @@
     free(av);
   </final_code>
   <associating>
-    <interfaces>
-      poptSaveString
-    </interfaces>
-    <links>
-      param1
-    </links>
+    <interfaces> poptSaveString </interfaces>
+    <links> param1 </links>
   </associating>
 </spec_type>
 
-- 
Gitee


From 3edbb739cb88e4d00d90477d88bb0b83856fcc24 Mon Sep 17 00:00:00 2001
From: Jeff Johnson <n3npq@mac.com>
Date: Sat, 13 Mar 2010 03:56:15 +0000
Subject: [PATCH 611/667] - add specialized types for destructor unit tests.

---
 auto/types.in | 31 ++++++++++++++++++++++++++++++-
 1 file changed, 30 insertions(+), 1 deletion(-)

diff --git a/auto/types.in b/auto/types.in
index e446b67..74a6c33 100644
--- a/auto/types.in
+++ b/auto/types.in
@@ -49,9 +49,38 @@
   <associating>
     <except>
       poptAddItem	<!-- FIXME -->
+    </except>
+  </associating>
+</spec_type>
+<spec_type>
+  <kind> normal </kind>
+  <data_type> poptContext </data_type>
+  <value> poptGetContext(argv[0], argc, argv, optionsTable, 0) </value>
+  <associating>
+    <interfaces>
       poptFreeContext
       poptFini
-    </except>
+    </interfaces>
+    <links> param1 </links>
+  </associating>
+</spec_type>
+<spec_type>
+  <kind> normal </kind>
+  <data_type> poptItem </data_type>
+  <value> NULL </value>
+  <global_code>
+    #include <malloc.h>
+  </global_code>
+  <init_code>
+    $0 = calloc(1, sizeof(*$0));
+    $0->option = *poptHelpOptionsI18N;
+    $0->argc = 1;
+    $0->argv = calloc(2, sizeof(*$0->argv));
+    $0->argv[0] = strdup("arg1");
+  </init_code>
+  <associating>
+    <interfaces> poptAddItem </interfaces>
+    <links> param2 </links>
   </associating>
 </spec_type>
 
-- 
Gitee


From ce73d9f73fa6de71ae26c5f81f8b9229c569130b Mon Sep 17 00:00:00 2001
From: Jeff Johnson <n3npq@mac.com>
Date: Fri, 7 May 2010 15:19:10 +0000
Subject: [PATCH 612/667] - release popt-1.16.

---
 auto/.cvsignore |  1 +
 configure.ac    |  2 +-
 m4/.cvsignore   |  3 +++
 po/lv.po        | 63 ++++++++++++++++++++++++++++---------------------
 4 files changed, 41 insertions(+), 28 deletions(-)

diff --git a/auto/.cvsignore b/auto/.cvsignore
index d128b62..e8383ad 100644
--- a/auto/.cvsignore
+++ b/auto/.cvsignore
@@ -3,6 +3,7 @@ header_compile_errors
 Makefile
 Makefile.in
 desc
+logs
 types
 test_results
 tests
diff --git a/configure.ac b/configure.ac
index 8590605..22f8bfc 100755
--- a/configure.ac
+++ b/configure.ac
@@ -128,7 +128,7 @@ AC_DEFINE_UNQUOTED(POPT_SOURCE_PATH, "$POPT_SOURCE_PATH",
 AC_SUBST(POPT_SOURCE_PATH)
 
 AC_CONFIG_SUBDIRS()
-AC_CONFIG_FILES([ po/Makefile.in
+AC_CONFIG_FILES([ po/Makefile.in m4/Makefile
     Doxyfile Makefile popt.pc popt.spec test-poptrc
     auto/Makefile auto/desc auto/types
 ])
diff --git a/m4/.cvsignore b/m4/.cvsignore
index 0f4126c..b5a925a 100644
--- a/m4/.cvsignore
+++ b/m4/.cvsignore
@@ -1 +1,4 @@
 *.m4
+Makefile
+Makefile.am
+Makefile.in
diff --git a/po/lv.po b/po/lv.po
index 2707911..70f350e 100644
--- a/po/lv.po
+++ b/po/lv.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: popt-1.14\n"
 "Report-Msgid-Bugs-To: <popt-devel@rpm5.org>\n"
-"POT-Creation-Date: 2008-02-16 19:54-0500\n"
+"POT-Creation-Date: 2010-02-17 13:35-0500\n"
 "PO-Revision-Date: 2009-04-12 16:34+0300\n"
 "Last-Translator: Rihards Prieditis <RPrieditis@inbox.lv>\n"
 "Language-Team: Latvian <translation-team-lv@lists.sourceforge.net>\n"
@@ -16,73 +16,78 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: Lokalize 0.3\n"
-"Plural-Forms:  nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n != 0 ? 1 : 2);\n"
+"Plural-Forms:  nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n != 0 ? 1 : "
+"2);\n"
 
-#: popt.c:35
+#: popt.c:47
 msgid "unknown errno"
 msgstr "nezināms kļūdas numurs"
 
-#: popt.c:1090
+#: popt.c:1290
 #, c-format
 msgid "option type (%u) not implemented in popt\n"
 msgstr "iespējas tips (%u) nav ieviests popt\n"
 
-#: popt.c:1294
+#: popt.c:1711
 msgid "missing argument"
 msgstr "trūkst arguments"
 
-#: popt.c:1296
+#: popt.c:1713
 msgid "unknown option"
 msgstr "nezināma iespēja"
 
-#: popt.c:1298
+#: popt.c:1715
 msgid "mutually exclusive logical operations requested"
 msgstr "pieprasītas savstarpējie izslēdzošas loģiskās operācijas"
 
-#: popt.c:1300
+#: popt.c:1717
 msgid "opt->arg should not be NULL"
 msgstr "opcija->arguments nevar būt NULL"
 
-#: popt.c:1302
+#: popt.c:1719
 msgid "aliases nested too deeply"
 msgstr "aizstājvārdi iegulti pārāk dziļi"
 
-#: popt.c:1304
+#: popt.c:1721
 msgid "error in parameter quoting"
 msgstr "kļuda parametru citēšanā"
 
-#: popt.c:1306
+#: popt.c:1723
 msgid "invalid numeric value"
 msgstr "nederīga skaitļa vērtība"
 
-#: popt.c:1308
+#: popt.c:1725
 msgid "number too large or too small"
 msgstr "skaitlis pārāk liels, vai pārāk mazs"
 
-#: popt.c:1310
+#: popt.c:1727
 msgid "memory allocation failed"
 msgstr "atmiņas iedalīšana neizdevās"
 
-#: popt.c:1314
+#: popt.c:1729
+msgid "config file failed sanity test"
+msgstr ""
+
+#: popt.c:1733
 msgid "unknown error"
 msgstr "nezināma kļūda"
 
-#: popthelp.c:74 popthelp.c:86
+#: popthelp.c:75 popthelp.c:86
 msgid "Show this help message"
 msgstr "Rādīt šo palīdzības ziņu"
 
-#: popthelp.c:75 popthelp.c:87
+#: popthelp.c:76 popthelp.c:87
 msgid "Display brief usage message"
 msgstr "Attēlot īsu izmantošanas ziņu"
 
-#: popthelp.c:76 popthelp.c:92
-msgid "Terminate options"
-msgstr "Pārtraukt iespējas"
-
 #: popthelp.c:90
 msgid "Display option defaults in message"
 msgstr "Attēlot noklusētās iespējas ziņā"
 
+#: popthelp.c:92
+msgid "Terminate options"
+msgstr "Pārtraukt iespējas"
+
 #: popthelp.c:191
 msgid "Help options:"
 msgstr "Palīdzības iespējas:"
@@ -104,33 +109,37 @@ msgid "INT"
 msgstr "INT"
 
 #: popthelp.c:207
+msgid "SHORT"
+msgstr ""
+
+#: popthelp.c:208
 msgid "LONG"
 msgstr "LONG"
 
-#: popthelp.c:208
+#: popthelp.c:209
 msgid "LONGLONG"
 msgstr "LONGLONG"
 
-#: popthelp.c:209
+#: popthelp.c:210
 msgid "STRING"
 msgstr "VIRKNE"
 
-#: popthelp.c:210
+#: popthelp.c:211
 msgid "FLOAT"
 msgstr "FLOAT"
 
-#: popthelp.c:211
+#: popthelp.c:212
 msgid "DOUBLE"
 msgstr "DOUBLE"
 
-#: popthelp.c:214
+#: popthelp.c:215
 msgid "ARG"
 msgstr "ARGUMENTS"
 
-#: popthelp.c:634
+#: popthelp.c:649
 msgid "Usage:"
 msgstr "Lietošana:"
 
-#: popthelp.c:658
+#: popthelp.c:672
 msgid "[OPTION...]"
 msgstr "[IESPĒJAS..]"
-- 
Gitee


From 16690d4d4e51770ed1a87fa5c29ea2a5fa6cb651 Mon Sep 17 00:00:00 2001
From: Panu Matilainen <pmatilai@redhat.com>
Date: Wed, 12 Feb 2020 10:10:32 +0200
Subject: [PATCH 613/667] Remove antiquated upstream spec file

Upstream spec files are typically not usable for anybody in reality,
this is no different: no distro packages popt in a single library,
the spec practises are outdated and pointing to non-existent upstream.
Just get rid of it.
---
 configure.ac |  2 +-
 popt.spec.in | 82 ----------------------------------------------------
 2 files changed, 1 insertion(+), 83 deletions(-)
 delete mode 100644 popt.spec.in

diff --git a/configure.ac b/configure.ac
index 22f8bfc..fe295ad 100755
--- a/configure.ac
+++ b/configure.ac
@@ -129,7 +129,7 @@ AC_SUBST(POPT_SOURCE_PATH)
 
 AC_CONFIG_SUBDIRS()
 AC_CONFIG_FILES([ po/Makefile.in m4/Makefile
-    Doxyfile Makefile popt.pc popt.spec test-poptrc
+    Doxyfile Makefile popt.pc test-poptrc
     auto/Makefile auto/desc auto/types
 ])
 AC_OUTPUT
diff --git a/popt.spec.in b/popt.spec.in
deleted file mode 100644
index 3ed71ba..0000000
--- a/popt.spec.in
+++ /dev/null
@@ -1,82 +0,0 @@
-%{expand:%%global _pkgconfigdir	%{_libdir}/pkgconfig}
-%define	_libdir	/%{_lib}
-
-Summary: A C library for parsing command line parameters.
-Name: popt
-Version: @VERSION@
-Release: 1
-License: X Consortium
-Group: System Environment/Libraries
-Source: http://rpm5.org/files/popt/%{name}-%{version}.tar.gz
-BuildRequires: gettext
-BuildRoot: %{_tmppath}/%{name}-root
-
-%description
-Popt is a C library for parsing command line parameters. Popt was
-heavily influenced by the getopt() and getopt_long() functions, but it
-improves on them by allowing more powerful argument expansion. Popt
-can parse arbitrary argv[] style arrays and automatically set
-variables based on command line arguments. Popt allows command line
-arguments to be aliased via configuration files and includes utility
-functions for parsing arbitrary strings into argv[] arrays using
-shell-like rules.
-
-%prep
-%setup -q
-
-%build
-%configure
-make
-
-%install
-rm -rf $RPM_BUILD_ROOT
-make DESTDIR=$RPM_BUILD_ROOT install
-%find_lang popt
-
-%check
-make check || :
-
-%track
-prog popt = {
-    version   = %{version}
-    url       = http://rpm5.org/%{name}
-    regex     = %{name}-(\d+\.\d+\.\d+)\.tar\.gz
-}
-
-%clean
-rm -rf $RPM_BUILD_ROOT
-
-%files -f popt.lang
-%defattr(-,root,root)
-%{_libdir}/libpopt.*
-%{_includedir}/popt.h
-%{_mandir}/man3/popt.3*
-%{_pkgconfigdir}/popt.pc
-
-%changelog
-* Wed Feb 17 2010 Jeff Johnson <jbj@rpm5.org>
-- release popt-1.16 through rpm5.org.
-
-* Fri Apr 10 2009 Jeff Johnson <jbj@rpm5.org>
-- release popt-1.15 through rpm5.org.
-
-* Tue Dec 11 2007 Jeff Johnson <jbj@rpm5.org>
-- release popt-1.13 through rpm5.org.
-
-* Tue Jul 10 2007 Jeff Johnson <jbj@rpm5.org>
-- release popt-1.12 through rpm5.org.
-
-* Sat Jun  9 2007 Jeff Johnson <jbj@rpm5.org>
-- release popt-1.11 through rpm5.org.
-
-* Thu Dec 10 1998 Michael Johnson <johnsonm@redhat.com>
-- released 1.2.2; see CHANGES
-
-* Tue Nov 17 1998 Michael K. Johnson <johnsonm@redhat.com>
-- added man page to default install
-
-* Thu Oct 22 1998 Erik Troan <ewt@redhat.com>
-- see CHANGES file for 1.2
-
-* Thu Apr 09 1998 Erik Troan <ewt@redhat.com>
-- added ./configure step to spec file
-- 
Gitee


From 1548389dd54d1b7119db248d7665f026c3c8828a Mon Sep 17 00:00:00 2001
From: Panu Matilainen <pmatilai@redhat.com>
Date: Wed, 12 Feb 2020 10:14:33 +0200
Subject: [PATCH 614/667] Update contact addresses

---
 README       | 4 +++-
 configure.ac | 2 +-
 po/Makevars  | 2 +-
 3 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/README b/README
index c66432d..88d06e7 100644
--- a/README
+++ b/README
@@ -13,4 +13,6 @@ tarball), which is excerpted with permission from the book "Linux
 Application Development" by Michael K. Johnson and Erik Troan (available
 from Addison Wesley in May, 1998).
 
-Comments on popt should be addressed to popt-devel@rpm5.org.
+Bugs, feature requests and contributions can be submitted at
+https://github.com/rpm-software-management/popt or alternatively
+rpm-maint@lists.rpm.org.
diff --git a/configure.ac b/configure.ac
index fe295ad..b454235 100755
--- a/configure.ac
+++ b/configure.ac
@@ -1,5 +1,5 @@
 AC_PREREQ(2.57)
-AC_INIT(popt, 1.16, popt-devel@rpm5.org)
+AC_INIT(popt, 1.16, rpm-maint@lists.rpm.org)
 AC_CONFIG_SRCDIR([popt.h])
 AC_CONFIG_HEADERS([config.h])
 AC_CANONICAL_TARGET
diff --git a/po/Makevars b/po/Makevars
index 8e5083e..b89de24 100644
--- a/po/Makevars
+++ b/po/Makevars
@@ -34,7 +34,7 @@ COPYRIGHT_HOLDER =
 # It can be your email address, or a mailing list address where translators
 # can write to without being subscribed, or the URL of a web page through
 # which the translators can contact you.
-MSGID_BUGS_ADDRESS = <popt-devel@rpm5.org>
+MSGID_BUGS_ADDRESS = <rpm-maint@lists.rpm.org>
 
 # This is the list of locale categories, beyond LC_MESSAGES, for which the
 # message catalogs shall be used.  It is usually empty.
-- 
Gitee


From 680147d6437eb95507feb76429bdb8d7ec2fe856 Mon Sep 17 00:00:00 2001
From: Panu Matilainen <pmatilai@redhat.com>
Date: Wed, 12 Feb 2020 10:28:22 +0200
Subject: [PATCH 615/667] Drop xcode project file

---
 Makefile.am                    |   1 -
 popt.xcodeproj/.cvsignore      |   2 -
 popt.xcodeproj/project.pbxproj | 545 ---------------------------------
 3 files changed, 548 deletions(-)
 delete mode 100644 popt.xcodeproj/.cvsignore
 delete mode 100644 popt.xcodeproj/project.pbxproj

diff --git a/Makefile.am b/Makefile.am
index e634a0f..d441d13 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -8,7 +8,6 @@ MCCABE =	pmccabe
 EXTRA_DIST = config.rpath lookup3.c autogen.sh CHANGES $(man_MANS) \
 	footer_no_timestamp.html libpopt.vers \
 	testit.sh test-poptrc \
-	popt.xcodeproj/project.pbxproj \
 	popt.ps
 
 SUBDIRS = po . auto
diff --git a/popt.xcodeproj/.cvsignore b/popt.xcodeproj/.cvsignore
deleted file mode 100644
index d82a5e4..0000000
--- a/popt.xcodeproj/.cvsignore
+++ /dev/null
@@ -1,2 +0,0 @@
-*.mode1v3
-*.pbxuser
diff --git a/popt.xcodeproj/project.pbxproj b/popt.xcodeproj/project.pbxproj
deleted file mode 100644
index f41c984..0000000
--- a/popt.xcodeproj/project.pbxproj
+++ /dev/null
@@ -1,545 +0,0 @@
-// !$*UTF8*$!
-{
-	archiveVersion = 1;
-	classes = {
-	};
-	objectVersion = 45;
-	objects = {
-
-/* Begin PBXAggregateTarget section */
-		0D006A101125FBE800A2FA32 /* testit.sh */ = {
-			isa = PBXAggregateTarget;
-			buildConfigurationList = 0D006A171125FC1C00A2FA32 /* Build configuration list for PBXAggregateTarget "testit.sh" */;
-			buildPhases = (
-				0D006A0F1125FBE800A2FA32 /* ShellScript */,
-			);
-			dependencies = (
-				0D006A141125FBFD00A2FA32 /* PBXTargetDependency */,
-			);
-			name = testit.sh;
-			productName = testit.sh;
-		};
-/* End PBXAggregateTarget section */
-
-/* Begin PBXBuildFile section */
-		0D00699D1125F0C400A2FA32 /* lookup3.c in Sources */ = {isa = PBXBuildFile; fileRef = 0D3EA3C31125E529001C69E6 /* lookup3.c */; };
-		0D00699F1125F0CE00A2FA32 /* poptconfig.c in Sources */ = {isa = PBXBuildFile; fileRef = 0D3EA3C91125E54B001C69E6 /* poptconfig.c */; };
-		0D0069A01125F0D100A2FA32 /* popthelp.c in Sources */ = {isa = PBXBuildFile; fileRef = 0D3EA3CB1125E553001C69E6 /* popthelp.c */; };
-		0D0069A11125F0D500A2FA32 /* poptint.c in Sources */ = {isa = PBXBuildFile; fileRef = 0D3EA3CD1125E55B001C69E6 /* poptint.c */; };
-		0D0069A21125F0DA00A2FA32 /* poptparse.c in Sources */ = {isa = PBXBuildFile; fileRef = 0D3EA3D11125E584001C69E6 /* poptparse.c */; };
-		0D0069A31125F0E900A2FA32 /* config.h in Headers */ = {isa = PBXBuildFile; fileRef = 0D3EA3D51125E5A6001C69E6 /* config.h */; };
-		0D0069A41125F0EC00A2FA32 /* system.h in Headers */ = {isa = PBXBuildFile; fileRef = 0D3EA3D31125E58E001C69E6 /* system.h */; };
-		0D0069A51125F0F100A2FA32 /* poptint.h in Headers */ = {isa = PBXBuildFile; fileRef = 0D3EA3CF1125E56C001C69E6 /* poptint.h */; };
-		0D0069A61125F0F400A2FA32 /* popt.h in Headers */ = {isa = PBXBuildFile; fileRef = 0D3EA3C71125E53F001C69E6 /* popt.h */; };
-		0D0069C61125F60200A2FA32 /* libiconv.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 0D0069C51125F60200A2FA32 /* libiconv.dylib */; };
-		0D0069EE1125F81900A2FA32 /* test1.c in Sources */ = {isa = PBXBuildFile; fileRef = 0D0069DD1125F73600A2FA32 /* test1.c */; };
-		0D3BAD131126031E00B3E80C /* popt.c in Sources */ = {isa = PBXBuildFile; fileRef = 0D3EA3C51125E537001C69E6 /* popt.c */; };
-		0D3BAD141126031E00B3E80C /* popt.c in Sources */ = {isa = PBXBuildFile; fileRef = 0D3EA3C51125E537001C69E6 /* popt.c */; };
-		0D3EA3C41125E529001C69E6 /* lookup3.c in Sources */ = {isa = PBXBuildFile; fileRef = 0D3EA3C31125E529001C69E6 /* lookup3.c */; };
-		0D3EA3C81125E53F001C69E6 /* popt.h in Headers */ = {isa = PBXBuildFile; fileRef = 0D3EA3C71125E53F001C69E6 /* popt.h */; };
-		0D3EA3CA1125E54B001C69E6 /* poptconfig.c in Sources */ = {isa = PBXBuildFile; fileRef = 0D3EA3C91125E54B001C69E6 /* poptconfig.c */; };
-		0D3EA3CC1125E553001C69E6 /* popthelp.c in Sources */ = {isa = PBXBuildFile; fileRef = 0D3EA3CB1125E553001C69E6 /* popthelp.c */; };
-		0D3EA3CE1125E55B001C69E6 /* poptint.c in Sources */ = {isa = PBXBuildFile; fileRef = 0D3EA3CD1125E55B001C69E6 /* poptint.c */; };
-		0D3EA3D01125E56C001C69E6 /* poptint.h in Headers */ = {isa = PBXBuildFile; fileRef = 0D3EA3CF1125E56C001C69E6 /* poptint.h */; };
-		0D3EA3D21125E584001C69E6 /* poptparse.c in Sources */ = {isa = PBXBuildFile; fileRef = 0D3EA3D11125E584001C69E6 /* poptparse.c */; };
-		0D3EA3D41125E58E001C69E6 /* system.h in Headers */ = {isa = PBXBuildFile; fileRef = 0D3EA3D31125E58E001C69E6 /* system.h */; };
-		0D3EA3D61125E5A6001C69E6 /* config.h in Headers */ = {isa = PBXBuildFile; fileRef = 0D3EA3D51125E5A6001C69E6 /* config.h */; };
-		0DB920BA1126181E000277F8 /* libpopt.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 0D0069921125F03400A2FA32 /* libpopt.dylib */; };
-/* End PBXBuildFile section */
-
-/* Begin PBXContainerItemProxy section */
-		0D0069EF1125F83000A2FA32 /* PBXContainerItemProxy */ = {
-			isa = PBXContainerItemProxy;
-			containerPortal = 08FB7793FE84155DC02AAC07 /* Project object */;
-			proxyType = 1;
-			remoteGlobalIDString = D2AAC045055464E500DB518D;
-			remoteInfo = libpopt.a;
-		};
-		0D006A131125FBFD00A2FA32 /* PBXContainerItemProxy */ = {
-			isa = PBXContainerItemProxy;
-			containerPortal = 08FB7793FE84155DC02AAC07 /* Project object */;
-			proxyType = 1;
-			remoteGlobalIDString = 0D0069E91125F80A00A2FA32;
-			remoteInfo = test1;
-		};
-		0DB9209B112616A9000277F8 /* PBXContainerItemProxy */ = {
-			isa = PBXContainerItemProxy;
-			containerPortal = 08FB7793FE84155DC02AAC07 /* Project object */;
-			proxyType = 1;
-			remoteGlobalIDString = 0D0069911125F03400A2FA32;
-			remoteInfo = libpopt.dylib;
-		};
-/* End PBXContainerItemProxy section */
-
-/* Begin PBXFileReference section */
-		0D0069921125F03400A2FA32 /* libpopt.dylib */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.dylib"; includeInIndex = 0; path = libpopt.dylib; sourceTree = BUILT_PRODUCTS_DIR; };
-		0D0069C41125F43900A2FA32 /* popt.3 */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = popt.3; sourceTree = "<group>"; };
-		0D0069C51125F60200A2FA32 /* libiconv.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libiconv.dylib; path = usr/lib/libiconv.dylib; sourceTree = SDKROOT; };
-		0D0069DD1125F73600A2FA32 /* test1.c */ = {isa = PBXFileReference; fileEncoding = 7; lastKnownFileType = sourcecode.c.c; path = test1.c; sourceTree = "<group>"; };
-		0D0069EA1125F80A00A2FA32 /* test1 */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = test1; sourceTree = BUILT_PRODUCTS_DIR; };
-		0D006A061125FADD00A2FA32 /* testit.sh */ = {isa = PBXFileReference; fileEncoding = 7; lastKnownFileType = text.script.sh; path = testit.sh; sourceTree = "<group>"; };
-		0D3BACFC1125FF5300B3E80C /* popt.ps */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = popt.ps; sourceTree = "<group>"; };
-		0D3EA3C31125E529001C69E6 /* lookup3.c */ = {isa = PBXFileReference; fileEncoding = 7; lastKnownFileType = sourcecode.c.c; path = lookup3.c; sourceTree = "<group>"; };
-		0D3EA3C51125E537001C69E6 /* popt.c */ = {isa = PBXFileReference; explicitFileType = sourcecode.c.c; fileEncoding = 7; path = popt.c; sourceTree = "<group>"; };
-		0D3EA3C71125E53F001C69E6 /* popt.h */ = {isa = PBXFileReference; fileEncoding = 7; lastKnownFileType = sourcecode.c.h; path = popt.h; sourceTree = "<group>"; };
-		0D3EA3C91125E54B001C69E6 /* poptconfig.c */ = {isa = PBXFileReference; fileEncoding = 7; lastKnownFileType = sourcecode.c.c; path = poptconfig.c; sourceTree = "<group>"; };
-		0D3EA3CB1125E553001C69E6 /* popthelp.c */ = {isa = PBXFileReference; fileEncoding = 7; lastKnownFileType = sourcecode.c.c; path = popthelp.c; sourceTree = "<group>"; };
-		0D3EA3CD1125E55B001C69E6 /* poptint.c */ = {isa = PBXFileReference; fileEncoding = 7; lastKnownFileType = sourcecode.c.c; path = poptint.c; sourceTree = "<group>"; };
-		0D3EA3CF1125E56C001C69E6 /* poptint.h */ = {isa = PBXFileReference; fileEncoding = 7; lastKnownFileType = sourcecode.c.h; path = poptint.h; sourceTree = "<group>"; };
-		0D3EA3D11125E584001C69E6 /* poptparse.c */ = {isa = PBXFileReference; fileEncoding = 7; lastKnownFileType = sourcecode.c.c; path = poptparse.c; sourceTree = "<group>"; };
-		0D3EA3D31125E58E001C69E6 /* system.h */ = {isa = PBXFileReference; fileEncoding = 7; lastKnownFileType = sourcecode.c.h; path = system.h; sourceTree = "<group>"; };
-		0D3EA3D51125E5A6001C69E6 /* config.h */ = {isa = PBXFileReference; fileEncoding = 7; lastKnownFileType = sourcecode.c.h; path = config.h; sourceTree = "<group>"; };
-		D2AAC046055464E500DB518D /* libpopt.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libpopt.a; sourceTree = BUILT_PRODUCTS_DIR; };
-/* End PBXFileReference section */
-
-/* Begin PBXFrameworksBuildPhase section */
-		0D0069901125F03400A2FA32 /* Frameworks */ = {
-			isa = PBXFrameworksBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-				0D0069C61125F60200A2FA32 /* libiconv.dylib in Frameworks */,
-				0DB920BA1126181E000277F8 /* libpopt.dylib in Frameworks */,
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-		};
-		0D0069E81125F80A00A2FA32 /* Frameworks */ = {
-			isa = PBXFrameworksBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-		};
-		D289987405E68DCB004EDB86 /* Frameworks */ = {
-			isa = PBXFrameworksBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-		};
-/* End PBXFrameworksBuildPhase section */
-
-/* Begin PBXGroup section */
-		08FB7794FE84155DC02AAC07 /* popt */ = {
-			isa = PBXGroup;
-			children = (
-				08FB7795FE84155DC02AAC07 /* Source */,
-				C6A0FF2B0290797F04C91782 /* Documentation */,
-				1AB674ADFE9D54B511CA2CBB /* Products */,
-				0D0069C51125F60200A2FA32 /* libiconv.dylib */,
-			);
-			name = popt;
-			sourceTree = "<group>";
-		};
-		08FB7795FE84155DC02AAC07 /* Source */ = {
-			isa = PBXGroup;
-			children = (
-				0D3EA3D51125E5A6001C69E6 /* config.h */,
-				0D3EA3C31125E529001C69E6 /* lookup3.c */,
-				0D3EA3C51125E537001C69E6 /* popt.c */,
-				0D3EA3C71125E53F001C69E6 /* popt.h */,
-				0D3EA3C91125E54B001C69E6 /* poptconfig.c */,
-				0D3EA3CB1125E553001C69E6 /* popthelp.c */,
-				0D3EA3CD1125E55B001C69E6 /* poptint.c */,
-				0D3EA3CF1125E56C001C69E6 /* poptint.h */,
-				0D3EA3D11125E584001C69E6 /* poptparse.c */,
-				0D3EA3D31125E58E001C69E6 /* system.h */,
-				0D0069DD1125F73600A2FA32 /* test1.c */,
-				0D006A061125FADD00A2FA32 /* testit.sh */,
-			);
-			name = Source;
-			sourceTree = "<group>";
-		};
-		1AB674ADFE9D54B511CA2CBB /* Products */ = {
-			isa = PBXGroup;
-			children = (
-				D2AAC046055464E500DB518D /* libpopt.a */,
-				0D0069921125F03400A2FA32 /* libpopt.dylib */,
-				0D0069EA1125F80A00A2FA32 /* test1 */,
-			);
-			name = Products;
-			sourceTree = "<group>";
-		};
-		C6A0FF2B0290797F04C91782 /* Documentation */ = {
-			isa = PBXGroup;
-			children = (
-				0D3BACFC1125FF5300B3E80C /* popt.ps */,
-				0D0069C41125F43900A2FA32 /* popt.3 */,
-			);
-			name = Documentation;
-			sourceTree = "<group>";
-		};
-/* End PBXGroup section */
-
-/* Begin PBXHeadersBuildPhase section */
-		0D00698E1125F03400A2FA32 /* Headers */ = {
-			isa = PBXHeadersBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-				0D0069A31125F0E900A2FA32 /* config.h in Headers */,
-				0D0069A51125F0F100A2FA32 /* poptint.h in Headers */,
-				0D0069A61125F0F400A2FA32 /* popt.h in Headers */,
-				0D0069A41125F0EC00A2FA32 /* system.h in Headers */,
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-		};
-		D2AAC043055464E500DB518D /* Headers */ = {
-			isa = PBXHeadersBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-				0D3EA3D61125E5A6001C69E6 /* config.h in Headers */,
-				0D3EA3C81125E53F001C69E6 /* popt.h in Headers */,
-				0D3EA3D01125E56C001C69E6 /* poptint.h in Headers */,
-				0D3EA3D41125E58E001C69E6 /* system.h in Headers */,
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-		};
-/* End PBXHeadersBuildPhase section */
-
-/* Begin PBXNativeTarget section */
-		0D0069911125F03400A2FA32 /* libpopt.dylib */ = {
-			isa = PBXNativeTarget;
-			buildConfigurationList = 0D0069991125F07600A2FA32 /* Build configuration list for PBXNativeTarget "libpopt.dylib" */;
-			buildPhases = (
-				0D00698E1125F03400A2FA32 /* Headers */,
-				0D00698F1125F03400A2FA32 /* Sources */,
-				0D0069901125F03400A2FA32 /* Frameworks */,
-			);
-			buildRules = (
-			);
-			dependencies = (
-			);
-			name = libpopt.dylib;
-			productName = libpopt.dylib;
-			productReference = 0D0069921125F03400A2FA32 /* libpopt.dylib */;
-			productType = "com.apple.product-type.library.dynamic";
-		};
-		0D0069E91125F80A00A2FA32 /* test1 */ = {
-			isa = PBXNativeTarget;
-			buildConfigurationList = 0D0069F31125F84F00A2FA32 /* Build configuration list for PBXNativeTarget "test1" */;
-			buildPhases = (
-				0D0069E71125F80A00A2FA32 /* Sources */,
-				0D0069E81125F80A00A2FA32 /* Frameworks */,
-			);
-			buildRules = (
-			);
-			dependencies = (
-				0DB9209C112616A9000277F8 /* PBXTargetDependency */,
-				0D0069F01125F83000A2FA32 /* PBXTargetDependency */,
-			);
-			name = test1;
-			productName = test1;
-			productReference = 0D0069EA1125F80A00A2FA32 /* test1 */;
-			productType = "com.apple.product-type.tool";
-		};
-		D2AAC045055464E500DB518D /* libpopt.a */ = {
-			isa = PBXNativeTarget;
-			buildConfigurationList = 1DEB91EB08733DB70010E9CD /* Build configuration list for PBXNativeTarget "libpopt.a" */;
-			buildPhases = (
-				D2AAC043055464E500DB518D /* Headers */,
-				D2AAC044055464E500DB518D /* Sources */,
-				D289987405E68DCB004EDB86 /* Frameworks */,
-			);
-			buildRules = (
-			);
-			dependencies = (
-			);
-			name = libpopt.a;
-			productName = popt;
-			productReference = D2AAC046055464E500DB518D /* libpopt.a */;
-			productType = "com.apple.product-type.library.static";
-		};
-/* End PBXNativeTarget section */
-
-/* Begin PBXProject section */
-		08FB7793FE84155DC02AAC07 /* Project object */ = {
-			isa = PBXProject;
-			buildConfigurationList = 1DEB91EF08733DB70010E9CD /* Build configuration list for PBXProject "popt" */;
-			compatibilityVersion = "Xcode 3.1";
-			hasScannedForEncodings = 1;
-			knownRegions = (
-				English,
-				Japanese,
-				French,
-				German,
-				"",
-			);
-			mainGroup = 08FB7794FE84155DC02AAC07 /* popt */;
-			projectDirPath = "";
-			projectRoot = "";
-			targets = (
-				D2AAC045055464E500DB518D /* libpopt.a */,
-				0D0069911125F03400A2FA32 /* libpopt.dylib */,
-				0D0069E91125F80A00A2FA32 /* test1 */,
-				0D006A101125FBE800A2FA32 /* testit.sh */,
-			);
-		};
-/* End PBXProject section */
-
-/* Begin PBXShellScriptBuildPhase section */
-		0D006A0F1125FBE800A2FA32 /* ShellScript */ = {
-			isa = PBXShellScriptBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-			);
-			inputPaths = (
-			);
-			outputPaths = (
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-			shellPath = /bin/sh;
-			shellScript = "# shell script goes here\nexit 0";
-		};
-/* End PBXShellScriptBuildPhase section */
-
-/* Begin PBXSourcesBuildPhase section */
-		0D00698F1125F03400A2FA32 /* Sources */ = {
-			isa = PBXSourcesBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-				0D00699D1125F0C400A2FA32 /* lookup3.c in Sources */,
-				0D3BAD141126031E00B3E80C /* popt.c in Sources */,
-				0D00699F1125F0CE00A2FA32 /* poptconfig.c in Sources */,
-				0D0069A01125F0D100A2FA32 /* popthelp.c in Sources */,
-				0D0069A11125F0D500A2FA32 /* poptint.c in Sources */,
-				0D0069A21125F0DA00A2FA32 /* poptparse.c in Sources */,
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-		};
-		0D0069E71125F80A00A2FA32 /* Sources */ = {
-			isa = PBXSourcesBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-				0D0069EE1125F81900A2FA32 /* test1.c in Sources */,
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-		};
-		D2AAC044055464E500DB518D /* Sources */ = {
-			isa = PBXSourcesBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-				0D3EA3C41125E529001C69E6 /* lookup3.c in Sources */,
-				0D3BAD131126031E00B3E80C /* popt.c in Sources */,
-				0D3EA3CA1125E54B001C69E6 /* poptconfig.c in Sources */,
-				0D3EA3CC1125E553001C69E6 /* popthelp.c in Sources */,
-				0D3EA3CE1125E55B001C69E6 /* poptint.c in Sources */,
-				0D3EA3D21125E584001C69E6 /* poptparse.c in Sources */,
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-		};
-/* End PBXSourcesBuildPhase section */
-
-/* Begin PBXTargetDependency section */
-		0D0069F01125F83000A2FA32 /* PBXTargetDependency */ = {
-			isa = PBXTargetDependency;
-			target = D2AAC045055464E500DB518D /* libpopt.a */;
-			targetProxy = 0D0069EF1125F83000A2FA32 /* PBXContainerItemProxy */;
-		};
-		0D006A141125FBFD00A2FA32 /* PBXTargetDependency */ = {
-			isa = PBXTargetDependency;
-			target = 0D0069E91125F80A00A2FA32 /* test1 */;
-			targetProxy = 0D006A131125FBFD00A2FA32 /* PBXContainerItemProxy */;
-		};
-		0DB9209C112616A9000277F8 /* PBXTargetDependency */ = {
-			isa = PBXTargetDependency;
-			target = 0D0069911125F03400A2FA32 /* libpopt.dylib */;
-			targetProxy = 0DB9209B112616A9000277F8 /* PBXContainerItemProxy */;
-		};
-/* End PBXTargetDependency section */
-
-/* Begin XCBuildConfiguration section */
-		0D0069931125F03500A2FA32 /* Debug */ = {
-			isa = XCBuildConfiguration;
-			buildSettings = {
-				ALWAYS_SEARCH_USER_PATHS = NO;
-				COPY_PHASE_STRIP = NO;
-				EXECUTABLE_PREFIX = lib;
-				GCC_DYNAMIC_NO_PIC = NO;
-				GCC_ENABLE_FIX_AND_CONTINUE = YES;
-				GCC_MODEL_TUNING = G5;
-				GCC_OPTIMIZATION_LEVEL = 2;
-				GCC_PREPROCESSOR_DEFINITIONS = HAVE_CONFIG_H;
-				INSTALL_PATH = /usr/local/lib;
-				OTHER_LDFLAGS = "-liconv";
-				PREBINDING = NO;
-				PRODUCT_NAME = popt;
-			};
-			name = Debug;
-		};
-		0D0069941125F03500A2FA32 /* Release */ = {
-			isa = XCBuildConfiguration;
-			buildSettings = {
-				ALWAYS_SEARCH_USER_PATHS = NO;
-				COPY_PHASE_STRIP = YES;
-				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
-				EXECUTABLE_PREFIX = lib;
-				GCC_ENABLE_FIX_AND_CONTINUE = NO;
-				GCC_MODEL_TUNING = G5;
-				INSTALL_PATH = /usr/local/lib;
-				PREBINDING = NO;
-				PRODUCT_NAME = popt;
-				ZERO_LINK = NO;
-			};
-			name = Release;
-		};
-		0D0069EC1125F80A00A2FA32 /* Debug */ = {
-			isa = XCBuildConfiguration;
-			buildSettings = {
-				ALWAYS_SEARCH_USER_PATHS = NO;
-				COPY_PHASE_STRIP = NO;
-				GCC_DYNAMIC_NO_PIC = NO;
-				GCC_ENABLE_FIX_AND_CONTINUE = YES;
-				GCC_MODEL_TUNING = G5;
-				GCC_OPTIMIZATION_LEVEL = 0;
-				GCC_PREPROCESSOR_DEFINITIONS = HAVE_CONFIG_H;
-				INSTALL_PATH = /usr/local/bin;
-				MACH_O_TYPE = mh_execute;
-				OTHER_LDFLAGS = (
-					"-lpopt",
-					"-liconv",
-				);
-				PREBINDING = NO;
-				PRODUCT_NAME = test1;
-			};
-			name = Debug;
-		};
-		0D0069ED1125F80A00A2FA32 /* Release */ = {
-			isa = XCBuildConfiguration;
-			buildSettings = {
-				ALWAYS_SEARCH_USER_PATHS = NO;
-				COPY_PHASE_STRIP = YES;
-				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
-				GCC_ENABLE_FIX_AND_CONTINUE = NO;
-				GCC_MODEL_TUNING = G5;
-				INSTALL_PATH = /usr/local/bin;
-				PREBINDING = NO;
-				PRODUCT_NAME = test1;
-				ZERO_LINK = NO;
-			};
-			name = Release;
-		};
-		0D006A111125FBE800A2FA32 /* Debug */ = {
-			isa = XCBuildConfiguration;
-			buildSettings = {
-				COPY_PHASE_STRIP = NO;
-				GCC_DYNAMIC_NO_PIC = NO;
-				GCC_OPTIMIZATION_LEVEL = 0;
-				PRODUCT_NAME = testit.sh;
-			};
-			name = Debug;
-		};
-		0D006A121125FBE800A2FA32 /* Release */ = {
-			isa = XCBuildConfiguration;
-			buildSettings = {
-				COPY_PHASE_STRIP = YES;
-				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
-				GCC_ENABLE_FIX_AND_CONTINUE = NO;
-				PRODUCT_NAME = testit.sh;
-				ZERO_LINK = NO;
-			};
-			name = Release;
-		};
-		1DEB91EC08733DB70010E9CD /* Debug */ = {
-			isa = XCBuildConfiguration;
-			buildSettings = {
-				ALWAYS_SEARCH_USER_PATHS = NO;
-				COPY_PHASE_STRIP = NO;
-				GCC_DYNAMIC_NO_PIC = NO;
-				GCC_ENABLE_FIX_AND_CONTINUE = YES;
-				GCC_MODEL_TUNING = G5;
-				GCC_OPTIMIZATION_LEVEL = 2;
-				GCC_PREPROCESSOR_DEFINITIONS = HAVE_CONFIG_H;
-				INSTALL_PATH = /usr/local/lib;
-				"New Setting" = "";
-				PRODUCT_NAME = popt;
-			};
-			name = Debug;
-		};
-		1DEB91ED08733DB70010E9CD /* Release */ = {
-			isa = XCBuildConfiguration;
-			buildSettings = {
-				ALWAYS_SEARCH_USER_PATHS = NO;
-				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
-				GCC_MODEL_TUNING = G5;
-				INSTALL_PATH = /usr/local/lib;
-				PRODUCT_NAME = popt;
-			};
-			name = Release;
-		};
-		1DEB91F008733DB70010E9CD /* Debug */ = {
-			isa = XCBuildConfiguration;
-			buildSettings = {
-				ARCHS = "$(ARCHS_STANDARD_32_64_BIT)";
-				GCC_C_LANGUAGE_STANDARD = gnu99;
-				GCC_OPTIMIZATION_LEVEL = 0;
-				GCC_WARN_ABOUT_RETURN_TYPE = YES;
-				GCC_WARN_UNUSED_VARIABLE = YES;
-				ONLY_ACTIVE_ARCH = YES;
-				PREBINDING = NO;
-				SDKROOT = macosx10.6;
-			};
-			name = Debug;
-		};
-		1DEB91F108733DB70010E9CD /* Release */ = {
-			isa = XCBuildConfiguration;
-			buildSettings = {
-				ARCHS = "$(ARCHS_STANDARD_32_64_BIT)";
-				GCC_C_LANGUAGE_STANDARD = gnu99;
-				GCC_WARN_ABOUT_RETURN_TYPE = YES;
-				GCC_WARN_UNUSED_VARIABLE = YES;
-				PREBINDING = NO;
-				SDKROOT = macosx10.6;
-			};
-			name = Release;
-		};
-/* End XCBuildConfiguration section */
-
-/* Begin XCConfigurationList section */
-		0D0069991125F07600A2FA32 /* Build configuration list for PBXNativeTarget "libpopt.dylib" */ = {
-			isa = XCConfigurationList;
-			buildConfigurations = (
-				0D0069931125F03500A2FA32 /* Debug */,
-				0D0069941125F03500A2FA32 /* Release */,
-			);
-			defaultConfigurationIsVisible = 0;
-			defaultConfigurationName = Release;
-		};
-		0D0069F31125F84F00A2FA32 /* Build configuration list for PBXNativeTarget "test1" */ = {
-			isa = XCConfigurationList;
-			buildConfigurations = (
-				0D0069EC1125F80A00A2FA32 /* Debug */,
-				0D0069ED1125F80A00A2FA32 /* Release */,
-			);
-			defaultConfigurationIsVisible = 0;
-			defaultConfigurationName = Release;
-		};
-		0D006A171125FC1C00A2FA32 /* Build configuration list for PBXAggregateTarget "testit.sh" */ = {
-			isa = XCConfigurationList;
-			buildConfigurations = (
-				0D006A111125FBE800A2FA32 /* Debug */,
-				0D006A121125FBE800A2FA32 /* Release */,
-			);
-			defaultConfigurationIsVisible = 0;
-			defaultConfigurationName = Release;
-		};
-		1DEB91EB08733DB70010E9CD /* Build configuration list for PBXNativeTarget "libpopt.a" */ = {
-			isa = XCConfigurationList;
-			buildConfigurations = (
-				1DEB91EC08733DB70010E9CD /* Debug */,
-				1DEB91ED08733DB70010E9CD /* Release */,
-			);
-			defaultConfigurationIsVisible = 0;
-			defaultConfigurationName = Release;
-		};
-		1DEB91EF08733DB70010E9CD /* Build configuration list for PBXProject "popt" */ = {
-			isa = XCConfigurationList;
-			buildConfigurations = (
-				1DEB91F008733DB70010E9CD /* Debug */,
-				1DEB91F108733DB70010E9CD /* Release */,
-			);
-			defaultConfigurationIsVisible = 0;
-			defaultConfigurationName = Release;
-		};
-/* End XCConfigurationList section */
-	};
-	rootObject = 08FB7793FE84155DC02AAC07 /* Project object */;
-}
-- 
Gitee


From 7e139f64b62feadaa54285f0e98740afd19c2f9b Mon Sep 17 00:00:00 2001
From: Panu Matilainen <pmatilai@redhat.com>
Date: Wed, 12 Feb 2020 10:46:57 +0200
Subject: [PATCH 616/667] Minimally tweak to make it 'autoreconf -i' bootstrap
 work

---
 Makefile.am  | 2 +-
 configure.ac | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index d441d13..1000d6a 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -35,7 +35,7 @@ noinst_SCRIPTS = testit.sh
 TESTS_ENVIRONMENT = \
 test1="$(top_builddir)/test1"
 
-TESTS = $(top_srcdir)/testit.sh
+TESTS = $(top_builddir)/testit.sh
 
 include_HEADERS = popt.h
 
diff --git a/configure.ac b/configure.ac
index b454235..088f57d 100755
--- a/configure.ac
+++ b/configure.ac
@@ -46,7 +46,6 @@ AC_GCC_TRADITIONAL
 AC_SYS_LARGEFILE
 
 AC_ISC_POSIX
-AM_C_PROTOTYPES
 
 AC_CHECK_HEADERS(float.h fnmatch.h glob.h langinfo.h libintl.h mcheck.h unistd.h)
 
@@ -84,6 +83,7 @@ AC_CHECK_FUNC(setreuid, [], [
 ])
 AC_CHECK_FUNCS(getuid geteuid iconv mtrace __secure_getenv setregid stpcpy strerror vasprintf srandom)
 
+AM_GNU_GETTEXT_VERSION([0.16.1])
 AM_GNU_GETTEXT([external])
 AM_ICONV_LINK
 
@@ -128,7 +128,7 @@ AC_DEFINE_UNQUOTED(POPT_SOURCE_PATH, "$POPT_SOURCE_PATH",
 AC_SUBST(POPT_SOURCE_PATH)
 
 AC_CONFIG_SUBDIRS()
-AC_CONFIG_FILES([ po/Makefile.in m4/Makefile
+AC_CONFIG_FILES([ po/Makefile.in
     Doxyfile Makefile popt.pc test-poptrc
     auto/Makefile auto/desc auto/types
 ])
-- 
Gitee


From e5259cfacfb50d7e02179f88b47e434accd68741 Mon Sep 17 00:00:00 2001
From: Panu Matilainen <pmatilai@redhat.com>
Date: Wed, 12 Feb 2020 10:47:54 +0200
Subject: [PATCH 617/667] Update translations just to pick up the new contact
 info

---
 po/cs.po    | 5 +++--
 po/da.po    | 5 +++--
 po/de.po    | 5 +++--
 po/eo.po    | 5 +++--
 po/es.po    | 5 +++--
 po/fi.po    | 5 +++--
 po/fr.po    | 5 +++--
 po/ga.po    | 5 +++--
 po/gl.po    | 5 +++--
 po/hu.po    | 5 +++--
 po/id.po    | 5 +++--
 po/is.po    | 5 +++--
 po/it.po    | 5 +++--
 po/ja.po    | 5 +++--
 po/ko.po    | 5 +++--
 po/lv.po    | 5 +++--
 po/nb.po    | 5 +++--
 po/nl.po    | 5 +++--
 po/pl.po    | 5 +++--
 po/popt.pot | 7 ++++---
 po/pt.po    | 5 +++--
 po/ro.po    | 5 +++--
 po/ru.po    | 9 +++++----
 po/sk.po    | 5 +++--
 po/sl.po    | 5 +++--
 po/sv.po    | 5 +++--
 po/th.po    | 5 +++--
 po/tr.po    | 5 +++--
 po/uk.po    | 5 +++--
 po/vi.po    | 5 +++--
 po/wa.po    | 5 +++--
 po/zh_CN.po | 5 +++--
 po/zh_TW.po | 5 +++--
 33 files changed, 102 insertions(+), 69 deletions(-)

diff --git a/po/cs.po b/po/cs.po
index 3887c58..85a48d3 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -7,11 +7,12 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.14\n"
-"Report-Msgid-Bugs-To: <popt-devel@rpm5.org>\n"
-"POT-Creation-Date: 2010-02-17 13:35-0500\n"
+"Report-Msgid-Bugs-To: <rpm-maint@lists.rpm.org>\n"
+"POT-Creation-Date: 2020-02-12 10:47+0200\n"
 "PO-Revision-Date: 2008-12-08 19:55+0100\n"
 "Last-Translator: Petr Pisar <petr.pisar@atlas.cz>\n"
 "Language-Team: Czech <translation-team-cs@lists.sourceforge.net>\n"
+"Language: cs\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/po/da.po b/po/da.po
index 0fc90b9..997cbf4 100644
--- a/po/da.po
+++ b/po/da.po
@@ -7,11 +7,12 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt-1.14\n"
-"Report-Msgid-Bugs-To: <popt-devel@rpm5.org>\n"
-"POT-Creation-Date: 2010-02-17 13:35-0500\n"
+"Report-Msgid-Bugs-To: <rpm-maint@lists.rpm.org>\n"
+"POT-Creation-Date: 2020-02-12 10:47+0200\n"
 "PO-Revision-Date: 2008-09-15 00:00+0000\n"
 "Last-Translator: Joe Hansen <joedalton2@yahoo.dk>\n"
 "Language-Team: Danish <dansk@dansk-gruppen.dk>\n"
+"Language: da\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/po/de.po b/po/de.po
index 03d3173..e2d9aeb 100644
--- a/po/de.po
+++ b/po/de.po
@@ -6,11 +6,12 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.14\n"
-"Report-Msgid-Bugs-To: <popt-devel@rpm5.org>\n"
-"POT-Creation-Date: 2010-02-17 13:35-0500\n"
+"Report-Msgid-Bugs-To: <rpm-maint@lists.rpm.org>\n"
+"POT-Creation-Date: 2020-02-12 10:47+0200\n"
 "PO-Revision-Date: 2009-11-10 19:58+0100\n"
 "Last-Translator: Roland Illig <roland.illig@gmx.de>\n"
 "Language-Team: German <translation-team-de@lists.sourceforge.net>\n"
+"Language: de\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/po/eo.po b/po/eo.po
index 3674b48..54512f8 100644
--- a/po/eo.po
+++ b/po/eo.po
@@ -5,11 +5,12 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.14\n"
-"Report-Msgid-Bugs-To: <popt-devel@rpm5.org>\n"
-"POT-Creation-Date: 2010-02-17 13:35-0500\n"
+"Report-Msgid-Bugs-To: <rpm-maint@lists.rpm.org>\n"
+"POT-Creation-Date: 2020-02-12 10:47+0200\n"
 "PO-Revision-Date: 2008-08-03 15:50-0300\n"
 "Last-Translator: Felipe Castro <fefcas@gmail.com>\n"
 "Language-Team: Esperanto <translation-team-eo@lists.sourceforge.net>\n"
+"Language: eo\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/po/es.po b/po/es.po
index 1d05248..c218131 100644
--- a/po/es.po
+++ b/po/es.po
@@ -5,11 +5,12 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.12\n"
-"Report-Msgid-Bugs-To: <popt-devel@rpm5.org>\n"
-"POT-Creation-Date: 2010-02-17 13:35-0500\n"
+"Report-Msgid-Bugs-To: <rpm-maint@lists.rpm.org>\n"
+"POT-Creation-Date: 2020-02-12 10:47+0200\n"
 "PO-Revision-Date: 2007-12-28 12:22+0100\n"
 "Last-Translator: Leandro Lucarella <luca@linuxmendoza.org.ar>\n"
 "Language-Team: Spanish <es@li.org>\n"
+"Language: es\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/po/fi.po b/po/fi.po
index 015b4c6..c3eb7d9 100644
--- a/po/fi.po
+++ b/po/fi.po
@@ -7,11 +7,12 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.14\n"
-"Report-Msgid-Bugs-To: <popt-devel@rpm5.org>\n"
-"POT-Creation-Date: 2010-02-17 13:35-0500\n"
+"Report-Msgid-Bugs-To: <rpm-maint@lists.rpm.org>\n"
+"POT-Creation-Date: 2020-02-12 10:47+0200\n"
 "PO-Revision-Date: 2008-02-21 18:19+0200\n"
 "Last-Translator: Jorma Karvonen <karvjorm@users.sf.net>\n"
 "Language-Team: Finnish <translation-team-fi@lists.sourceforge.net>\n"
+"Language: fi\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/po/fr.po b/po/fr.po
index 7e3c14f..51ffa17 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -11,11 +11,12 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.11\n"
-"Report-Msgid-Bugs-To: <popt-devel@rpm5.org>\n"
-"POT-Creation-Date: 2010-02-17 13:35-0500\n"
+"Report-Msgid-Bugs-To: <rpm-maint@lists.rpm.org>\n"
+"POT-Creation-Date: 2020-02-12 10:47+0200\n"
 "PO-Revision-Date: 2003-06-22 23:43+0200\n"
 "Last-Translator: RPM French Translation <rpm-fr@livna.org>\n"
 "Language-Team: RPM French Translation <rpm-fr@livna.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8-bit\n"
diff --git a/po/ga.po b/po/ga.po
index feed9ce..1227260 100644
--- a/po/ga.po
+++ b/po/ga.po
@@ -5,11 +5,12 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.14\n"
-"Report-Msgid-Bugs-To: <popt-devel@rpm5.org>\n"
-"POT-Creation-Date: 2010-02-17 13:35-0500\n"
+"Report-Msgid-Bugs-To: <rpm-maint@lists.rpm.org>\n"
+"POT-Creation-Date: 2020-02-12 10:47+0200\n"
 "PO-Revision-Date: 2008-04-10 06:21-0500\n"
 "Last-Translator: Kevin Scannell <kscanne@gmail.com>\n"
 "Language-Team: Irish <gaeilge-gnulinux@lists.sourceforge.net>\n"
+"Language: ga\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/po/gl.po b/po/gl.po
index 1311148..227ab04 100644
--- a/po/gl.po
+++ b/po/gl.po
@@ -1,11 +1,12 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.11\n"
-"Report-Msgid-Bugs-To: <popt-devel@rpm5.org>\n"
-"POT-Creation-Date: 2010-02-17 13:35-0500\n"
+"Report-Msgid-Bugs-To: <rpm-maint@lists.rpm.org>\n"
+"POT-Creation-Date: 2020-02-12 10:47+0200\n"
 "PO-Revision-Date: 2001-01-17 01:01+0100\n"
 "Last-Translator: Jes�s Bravo �lvarez <jba@pobox.com>\n"
 "Language-Team: Galician <trasno@ceu.fi.udc.es>\n"
+"Language: gl\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=iso-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/po/hu.po b/po/hu.po
index f681c30..7fe0a45 100644
--- a/po/hu.po
+++ b/po/hu.po
@@ -4,11 +4,12 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.11\n"
-"Report-Msgid-Bugs-To: <popt-devel@rpm5.org>\n"
-"POT-Creation-Date: 2010-02-17 13:35-0500\n"
+"Report-Msgid-Bugs-To: <rpm-maint@lists.rpm.org>\n"
+"POT-Creation-Date: 2020-02-12 10:47+0200\n"
 "PO-Revision-Date: 2007-06-21 00:45+0200\n"
 "Last-Translator: Gabor Kelemen <kelemeng@gnome.hu>\n"
 "Language-Team: Hungarian <translation-team-hu@lists.sourceforge.net>\n"
+"Language: hu\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/po/id.po b/po/id.po
index 6622520..6b18c12 100644
--- a/po/id.po
+++ b/po/id.po
@@ -5,11 +5,12 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.14\n"
-"Report-Msgid-Bugs-To: <popt-devel@rpm5.org>\n"
-"POT-Creation-Date: 2010-02-17 13:35-0500\n"
+"Report-Msgid-Bugs-To: <rpm-maint@lists.rpm.org>\n"
+"POT-Creation-Date: 2020-02-12 10:47+0200\n"
 "PO-Revision-Date: 2008-08-26 14:18+0700\n"
 "Last-Translator: Andhika Padmawan <andhika.padmawan@gmail.com>\n"
 "Language-Team: Indonesian <translation-team-id@lists.sourceforge.net>\n"
+"Language: id\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/po/is.po b/po/is.po
index f775a1d..fddbf89 100644
--- a/po/is.po
+++ b/po/is.po
@@ -1,11 +1,12 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.11\n"
-"Report-Msgid-Bugs-To: <popt-devel@rpm5.org>\n"
-"POT-Creation-Date: 2010-02-17 13:35-0500\n"
+"Report-Msgid-Bugs-To: <rpm-maint@lists.rpm.org>\n"
+"POT-Creation-Date: 2020-02-12 10:47+0200\n"
 "PO-Revision-Date: 2001-06-08 01:35+0000\n"
 "Last-Translator: Richard Allen <ra@hp.is>\n"
 "Language-Team: is <kde-isl@mmedia.is>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=ISO-8859-1\n"
 "Content-Transfer-Encoding: 8-bit\n"
diff --git a/po/it.po b/po/it.po
index 1441d42..94bb612 100644
--- a/po/it.po
+++ b/po/it.po
@@ -6,11 +6,12 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt-1.14\n"
-"Report-Msgid-Bugs-To: <popt-devel@rpm5.org>\n"
-"POT-Creation-Date: 2010-02-17 13:35-0500\n"
+"Report-Msgid-Bugs-To: <rpm-maint@lists.rpm.org>\n"
+"POT-Creation-Date: 2020-02-12 10:47+0200\n"
 "PO-Revision-Date: 2008-11-28 15:32+0100\n"
 "Last-Translator: Vincenzo Campanella <vinz65@gmail.com>\n"
 "Language-Team: Italian <tp@lists.linux.it>\n"
+"Language: it\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/po/ja.po b/po/ja.po
index 3c8a87a..4441307 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -5,11 +5,12 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.11\n"
-"Report-Msgid-Bugs-To: <popt-devel@rpm5.org>\n"
-"POT-Creation-Date: 2010-02-17 13:35-0500\n"
+"Report-Msgid-Bugs-To: <rpm-maint@lists.rpm.org>\n"
+"POT-Creation-Date: 2020-02-12 10:47+0200\n"
 "PO-Revision-Date: 2003--8-25 19:00+0900\n"
 "Last-Translator: Yukihiro Nakai <ynakai@redhat.com>\n"
 "Language-Team: Japanese <ja@li.org>\n"
+"Language: ja\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/po/ko.po b/po/ko.po
index cfd2896..356cb1b 100644
--- a/po/ko.po
+++ b/po/ko.po
@@ -1,11 +1,12 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.11\n"
-"Report-Msgid-Bugs-To: <popt-devel@rpm5.org>\n"
-"POT-Creation-Date: 2010-02-17 13:35-0500\n"
+"Report-Msgid-Bugs-To: <rpm-maint@lists.rpm.org>\n"
+"POT-Creation-Date: 2020-02-12 10:47+0200\n"
 "PO-Revision-Date: 2001-09-06 20:06+0900\n"
 "Last-Translator: Jong-Hoon Ryu <redhat4u@netian.com>\n"
 "Language-Team: GNU Translation project <ko@li.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=EUC-KR\n"
 "Content-Transfer-Encoding: 8-bit\n"
diff --git a/po/lv.po b/po/lv.po
index 70f350e..e78eab0 100644
--- a/po/lv.po
+++ b/po/lv.po
@@ -7,11 +7,12 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt-1.14\n"
-"Report-Msgid-Bugs-To: <popt-devel@rpm5.org>\n"
-"POT-Creation-Date: 2010-02-17 13:35-0500\n"
+"Report-Msgid-Bugs-To: <rpm-maint@lists.rpm.org>\n"
+"POT-Creation-Date: 2020-02-12 10:47+0200\n"
 "PO-Revision-Date: 2009-04-12 16:34+0300\n"
 "Last-Translator: Rihards Prieditis <RPrieditis@inbox.lv>\n"
 "Language-Team: Latvian <translation-team-lv@lists.sourceforge.net>\n"
+"Language: lv\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/po/nb.po b/po/nb.po
index 8ec9331..d9f134a 100644
--- a/po/nb.po
+++ b/po/nb.po
@@ -1,11 +1,12 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.11\n"
-"Report-Msgid-Bugs-To: <popt-devel@rpm5.org>\n"
-"POT-Creation-Date: 2010-02-17 13:35-0500\n"
+"Report-Msgid-Bugs-To: <rpm-maint@lists.rpm.org>\n"
+"POT-Creation-Date: 2020-02-12 10:47+0200\n"
 "PO-Revision-Date: 2001-06-27 11:05+0200\n"
 "Last-Translator: Kjartan Maraas <kmaraas@online.no>\n"
 "Language-Team: Norwegian <no@li.org>\n"
+"Language: no\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=iso-8859-1\n"
 "Content-Transfer-Encoding: 8-bit\n"
diff --git a/po/nl.po b/po/nl.po
index 09bc176..7b21b2d 100644
--- a/po/nl.po
+++ b/po/nl.po
@@ -5,11 +5,12 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.14\n"
-"Report-Msgid-Bugs-To: <popt-devel@rpm5.org>\n"
-"POT-Creation-Date: 2010-02-17 13:35-0500\n"
+"Report-Msgid-Bugs-To: <rpm-maint@lists.rpm.org>\n"
+"POT-Creation-Date: 2020-02-12 10:47+0200\n"
 "PO-Revision-Date: 2008-02-20 19:26+0100\n"
 "Last-Translator: Tim Van Holder <tim.van.holder@telenet.be>\n"
 "Language-Team: Dutch <vertaling@vrijschrift.org>\n"
+"Language: nl\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/po/pl.po b/po/pl.po
index e59b2e1..fd3cff4 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -5,11 +5,12 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.14\n"
-"Report-Msgid-Bugs-To: <popt-devel@rpm5.org>\n"
-"POT-Creation-Date: 2010-02-17 13:35-0500\n"
+"Report-Msgid-Bugs-To: <rpm-maint@lists.rpm.org>\n"
+"POT-Creation-Date: 2020-02-12 10:47+0200\n"
 "PO-Revision-Date: 2008-02-18 00:30+0100\n"
 "Last-Translator: Jakub Bogusz <qboosh@pld-linux.org>\n"
 "Language-Team: Polish <translation-team-pl@lists.sourceforge.net>\n"
+"Language: pl\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=iso-8859-2\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/po/popt.pot b/po/popt.pot
index e1be585..28b56fe 100644
--- a/po/popt.pot
+++ b/po/popt.pot
@@ -5,12 +5,13 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: popt 1.16\n"
-"Report-Msgid-Bugs-To: <popt-devel@rpm5.org>\n"
-"POT-Creation-Date: 2010-02-17 13:35-0500\n"
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: <rpm-maint@lists.rpm.org>\n"
+"POT-Creation-Date: 2020-02-12 10:47+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/po/pt.po b/po/pt.po
index 3f56a71..f3adcc2 100644
--- a/po/pt.po
+++ b/po/pt.po
@@ -1,11 +1,12 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.11\n"
-"Report-Msgid-Bugs-To: <popt-devel@rpm5.org>\n"
-"POT-Creation-Date: 2010-02-17 13:35-0500\n"
+"Report-Msgid-Bugs-To: <rpm-maint@lists.rpm.org>\n"
+"POT-Creation-Date: 2020-02-12 10:47+0200\n"
 "PO-Revision-Date: 2002-02-13 18:32+0000\n"
 "Last-Translator: Pedro Morais <morais@kde.org>\n"
 "Language-Team: pt <morais@kde.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=iso-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/po/ro.po b/po/ro.po
index 7f0a72e..ebc8619 100644
--- a/po/ro.po
+++ b/po/ro.po
@@ -1,11 +1,12 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.11\n"
-"Report-Msgid-Bugs-To: <popt-devel@rpm5.org>\n"
-"POT-Creation-Date: 2010-02-17 13:35-0500\n"
+"Report-Msgid-Bugs-To: <rpm-maint@lists.rpm.org>\n"
+"POT-Creation-Date: 2020-02-12 10:47+0200\n"
 "PO-Revision-Date: 2000-06-14 23:23+EST\n"
 "Last-Translator: Cristian Gafton <gafton@redhat.com>\n"
 "Language-Team: Romanian <ro@li.org>\n"
+"Language: ro\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=ISO-8859-2\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/po/ru.po b/po/ru.po
index ec65e6d..81ffec9 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -6,17 +6,18 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.14\n"
-"Report-Msgid-Bugs-To: <popt-devel@rpm5.org>\n"
-"POT-Creation-Date: 2010-02-17 13:35-0500\n"
+"Report-Msgid-Bugs-To: <rpm-maint@lists.rpm.org>\n"
+"POT-Creation-Date: 2020-02-12 10:47+0200\n"
 "PO-Revision-Date: 2009-02-01 13:30+0300\n"
 "Last-Translator: Yuri Kozlov <yuray@komyakino.ru>\n"
 "Language-Team: Russian <gnu@mx.ru>\n"
+"Language: ru\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.11.4\n"
-"Plural-Forms:  nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%"
-"10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
+"Plural-Forms:  nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
+"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 
 #: popt.c:47
 msgid "unknown errno"
diff --git a/po/sk.po b/po/sk.po
index f5030ce..8c65526 100644
--- a/po/sk.po
+++ b/po/sk.po
@@ -5,11 +5,12 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.11\n"
-"Report-Msgid-Bugs-To: <popt-devel@rpm5.org>\n"
-"POT-Creation-Date: 2010-02-17 13:35-0500\n"
+"Report-Msgid-Bugs-To: <rpm-maint@lists.rpm.org>\n"
+"POT-Creation-Date: 2020-02-12 10:47+0200\n"
 "PO-Revision-Date: 1999-08-04 21:40+0200\n"
 "Last-Translator: Stanislav Meduna <stano@eunet.sk>\n"
 "Language-Team: Slovak <sk-i18n@rak.isternet.sk>\n"
+"Language: sk\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=iso-8859-2\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/po/sl.po b/po/sl.po
index 3e499ff..c6f6873 100644
--- a/po/sl.po
+++ b/po/sl.po
@@ -1,11 +1,12 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.11\n"
-"Report-Msgid-Bugs-To: <popt-devel@rpm5.org>\n"
-"POT-Creation-Date: 2010-02-17 13:35-0500\n"
+"Report-Msgid-Bugs-To: <rpm-maint@lists.rpm.org>\n"
+"POT-Creation-Date: 2020-02-12 10:47+0200\n"
 "PO-Revision-Date: 2000-09-05 12:30+0200\n"
 "Last-Translator: Roman Maurer <roman.maurer@hermes.si>\n"
 "Language-Team: Slovenian <sl@li.org>\n"
+"Language: sl\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=iso-8859-2\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/po/sv.po b/po/sv.po
index 2992c2c..af53810 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -8,11 +8,12 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.14\n"
-"Report-Msgid-Bugs-To: <popt-devel@rpm5.org>\n"
-"POT-Creation-Date: 2010-02-17 13:35-0500\n"
+"Report-Msgid-Bugs-To: <rpm-maint@lists.rpm.org>\n"
+"POT-Creation-Date: 2020-02-12 10:47+0200\n"
 "PO-Revision-Date: 2008-02-23 20:15+0100\n"
 "Last-Translator: G�ran Uddeborg <goeran@uddeborg.se>\n"
 "Language-Team: Swedish <tp-sv@listor.tp-sv.se>\n"
+"Language: sv\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=iso-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/po/th.po b/po/th.po
index 864c3af..143a108 100644
--- a/po/th.po
+++ b/po/th.po
@@ -5,11 +5,12 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.14\n"
-"Report-Msgid-Bugs-To: <popt-devel@rpm5.org>\n"
-"POT-Creation-Date: 2010-02-17 13:35-0500\n"
+"Report-Msgid-Bugs-To: <rpm-maint@lists.rpm.org>\n"
+"POT-Creation-Date: 2020-02-12 10:47+0200\n"
 "PO-Revision-Date: 2008-02-19 15:53+0700\n"
 "Last-Translator: Seksan Poltree <seksan.poltree@gmail.com>\n"
 "Language-Team: Thai <translation-team-th@lists.sourceforge.net>\n"
+"Language: th\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/po/tr.po b/po/tr.po
index 3910b08..dd5ca4b 100644
--- a/po/tr.po
+++ b/po/tr.po
@@ -4,11 +4,12 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.11\n"
-"Report-Msgid-Bugs-To: <popt-devel@rpm5.org>\n"
-"POT-Creation-Date: 2010-02-17 13:35-0500\n"
+"Report-Msgid-Bugs-To: <rpm-maint@lists.rpm.org>\n"
+"POT-Creation-Date: 2020-02-12 10:47+0200\n"
 "PO-Revision-Date: 2000-02-11 13:01+0200\n"
 "Last-Translator: Nilgun Belma Buguner <nilgun@technologist.com>\n"
 "Language-Team: Turkish <tr@li.org>\n"
+"Language: tr\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=iso-8859-9\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/po/uk.po b/po/uk.po
index 62e0fde..426d4b7 100644
--- a/po/uk.po
+++ b/po/uk.po
@@ -5,11 +5,12 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.11\n"
-"Report-Msgid-Bugs-To: <popt-devel@rpm5.org>\n"
-"POT-Creation-Date: 2010-02-17 13:35-0500\n"
+"Report-Msgid-Bugs-To: <rpm-maint@lists.rpm.org>\n"
+"POT-Creation-Date: 2020-02-12 10:47+0200\n"
 "PO-Revision-Date: 1999-09-30 16:54+0200\n"
 "Last-Translator: Yuri Syrota <rasta@renome.rovno.ua>\n"
 "Language-Team: Ukrainian <uk@li.org>\n"
+"Language: uk\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=koi8-u\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/po/vi.po b/po/vi.po
index 9132e69..71ab6d6 100644
--- a/po/vi.po
+++ b/po/vi.po
@@ -6,11 +6,12 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.14\n"
-"Report-Msgid-Bugs-To: <popt-devel@rpm5.org>\n"
-"POT-Creation-Date: 2010-02-17 13:35-0500\n"
+"Report-Msgid-Bugs-To: <rpm-maint@lists.rpm.org>\n"
+"POT-Creation-Date: 2020-02-12 10:47+0200\n"
 "PO-Revision-Date: 2008-02-18 16:20+1030\n"
 "Last-Translator: Clytie Siddall <clytie@riverland.net.au>\n"
 "Language-Team: Vietnamese <vi-VN@googlegroups.com>\n"
+"Language: vi\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/po/wa.po b/po/wa.po
index b842e10..0640cd0 100644
--- a/po/wa.po
+++ b/po/wa.po
@@ -9,11 +9,12 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.11\n"
-"Report-Msgid-Bugs-To: <popt-devel@rpm5.org>\n"
-"POT-Creation-Date: 2010-02-17 13:35-0500\n"
+"Report-Msgid-Bugs-To: <rpm-maint@lists.rpm.org>\n"
+"POT-Creation-Date: 2020-02-12 10:47+0200\n"
 "PO-Revision-Date: 1999-03-18 23:11+0100\n"
 "Last-Translator: Nobody yet\n"
 "Language-Team: walon <linux-wa@chanae.alphanet.ch>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=iso-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/po/zh_CN.po b/po/zh_CN.po
index 3c1d943..c5602fd 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -7,11 +7,12 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.14\n"
-"Report-Msgid-Bugs-To: <popt-devel@rpm5.org>\n"
-"POT-Creation-Date: 2010-02-17 13:35-0500\n"
+"Report-Msgid-Bugs-To: <rpm-maint@lists.rpm.org>\n"
+"POT-Creation-Date: 2020-02-12 10:47+0200\n"
 "PO-Revision-Date: 2008-02-18 20:16+0800\n"
 "Last-Translator: LI Daobing <lidaobing@gmail.com>\n"
 "Language-Team: Chinese (simplified) <i18n-zh@googlegroups.com>\n"
+"Language: zh_CN\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/po/zh_TW.po b/po/zh_TW.po
index b73e734..2ce4765 100644
--- a/po/zh_TW.po
+++ b/po/zh_TW.po
@@ -5,11 +5,12 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.11\n"
-"Report-Msgid-Bugs-To: <popt-devel@rpm5.org>\n"
-"POT-Creation-Date: 2010-02-17 13:35-0500\n"
+"Report-Msgid-Bugs-To: <rpm-maint@lists.rpm.org>\n"
+"POT-Creation-Date: 2020-02-12 10:47+0200\n"
 "PO-Revision-Date: 2005-04-08 17:52+0800\n"
 "Last-Translator: Wei-Lun Chao <chaoweilun@pcmail.com.tw>\n"
 "Language-Team: zh_TW <zh-l10n@linux.org.tw>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-- 
Gitee


From 8013c2674adb53db7ced12067d347aee041251b7 Mon Sep 17 00:00:00 2001
From: Panu Matilainen <pmatilai@redhat.com>
Date: Wed, 12 Feb 2020 12:47:37 +0200
Subject: [PATCH 618/667] Evict all traces of the horror known as splint

My wife call this stuff dead spiders, I'm inclined to agree.
The annotations make good ole C look like some alien dialect and forces
weirdo constructs around perfectly normal and legic code. Ptui!
---
 Makefile.am  |   5 -
 lookup3.c    | 154 +++++++++++++++----------------
 popt.c       | 251 +++++++++++++++-----------------------------------
 popt.h       | 255 +++++++++++----------------------------------------
 poptconfig.c |  92 ++++---------------
 popthelp.c   | 118 +++++++-----------------
 poptint.c    |  17 ++--
 poptint.h    |  87 +++---------------
 poptparse.c  |   8 +-
 system.h     |  35 ++-----
 test1.c      |  64 +------------
 11 files changed, 279 insertions(+), 807 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index 1000d6a..9b5ab55 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -2,7 +2,6 @@
 
 AUTOMAKE_OPTIONS = 1.4 foreign
 
-LINT =		splint
 MCCABE =	pmccabe
 
 EXTRA_DIST = config.rpath lookup3.c autogen.sh CHANGES $(man_MANS) \
@@ -70,10 +69,6 @@ popt.lcd: Makefile.am ${libpopt_la_SOURCES} ${include_HEADERS} ${noinst_HEADERS}
 sources:
 	@echo $(libpopt_la_SOURCES:%=popt/%)
 
-.PHONY: lint
-lint:
-	$(LINT) ${DEFS} ${INCLUDES} test1.c ${libpopt_la_SOURCES}
-
 .PHONY:	mccabe
 mccabe:
 	$(MCCABE) $(libpopt_la_SOURCES) | sort -n -r | head -n 10
diff --git a/lookup3.c b/lookup3.c
index 0584c39..03bb89b 100644
--- a/lookup3.c
+++ b/lookup3.c
@@ -43,15 +43,12 @@
 # define _JLU3_jlu32b		1
 #endif
 
-/*@-redef@*/
-/*@unchecked@*/
 static const union _dbswap {
     const uint32_t ui;
     const unsigned char uc[4];
 } endian = { .ui = 0x11223344 };
 # define HASH_LITTLE_ENDIAN	(endian.uc[0] == (unsigned char) 0x44)
 # define HASH_BIG_ENDIAN	(endian.uc[0] == (unsigned char) 0x11)
-/*@=redef@*/
 
 #ifndef ROTL32
 # define ROTL32(x, s) (((x) << (s)) | ((x) >> (32 - (s))))
@@ -151,8 +148,7 @@ static const union _dbswap {
 }
 
 #if defined(_JLU3_jlu32w)
-uint32_t jlu32w(uint32_t h, /*@null@*/ const uint32_t *k, size_t size)
-	/*@*/;
+uint32_t jlu32w(uint32_t h, const uint32_t *k, size_t size);
 /* -------------------------------------------------------------------- */
 /**
  *  This works on all machines.  To be useful, it requires
@@ -196,7 +192,7 @@ uint32_t jlu32w(uint32_t h, const uint32_t *k, size_t size)
     case 2 : b+=k[1];
     case 1 : a+=k[0];
 	_JLU3_FINAL(a,b,c);
-	/*@fallthrough@*/
+	/* fallthrough */
     case 0:
 	break;
     }
@@ -207,8 +203,7 @@ exit:
 #endif	/* defined(_JLU3_jlu32w) */
 
 #if defined(_JLU3_jlu32l)
-uint32_t jlu32l(uint32_t h, const void *key, size_t size)
-	/*@*/;
+uint32_t jlu32l(uint32_t h, const void *key, size_t size);
 /* -------------------------------------------------------------------- */
 /*
  * jlu32l() -- hash a variable-length key into a 32-bit value
@@ -300,16 +295,16 @@ uint32_t jlu32l(uint32_t h, const void *key, size_t size)
 	k8 = (const uint8_t *)k;
 	switch (size) {
 	case 12:	c += k[2]; b+=k[1]; a+=k[0]	break;
-	case 11:	c += ((uint32_t)k8[10])<<16;	/*@fallthrough@*/
-	case 10:	c += ((uint32_t)k8[9])<<8;	/*@fallthrough@*/
-	case  9:	c += k8[8];			/*@fallthrough@*/
+	case 11:	c += ((uint32_t)k8[10])<<16;	/* fallthrough */
+	case 10:	c += ((uint32_t)k8[9])<<8;	/* fallthrough */
+	case  9:	c += k8[8];			/* fallthrough */
 	case  8:	b += k[1]; a+=k[0];		break;
-	case  7:	b += ((uint32_t)k8[6])<<16;	/*@fallthrough@*/
-	case  6:	b += ((uint32_t)k8[5])<<8;	/*@fallthrough@*/
-	case  5:	b += k8[4];			/*@fallthrough@*/
+	case  7:	b += ((uint32_t)k8[6])<<16;	/* fallthrough */
+	case  6:	b += ((uint32_t)k8[5])<<8;	/* fallthrough */
+	case  5:	b += k8[4];			/* fallthrough */
 	case  4:	a += k[0];			break;
-	case  3:	a += ((uint32_t)k8[2])<<16;	/*@fallthrough@*/
-	case  2:	a += ((uint32_t)k8[1])<<8;	/*@fallthrough@*/
+	case  3:	a += ((uint32_t)k8[2])<<16;	/* fallthrough */
+	case  2:	a += ((uint32_t)k8[1])<<8;	/* fallthrough */
 	case  1:	a += k8[0];			break;
 	case  0:	goto exit;
 	}
@@ -340,7 +335,7 @@ uint32_t jlu32l(uint32_t h, const void *key, size_t size)
 	    break;
 	case 11:
 	    c += ((uint32_t)k8[10])<<16;
-	    /*@fallthrough@*/
+	    /* fallthrough */
 	case 10:
 	    c += (uint32_t)k[4];
 	    b += k[2]+(((uint32_t)k[3])<<16);
@@ -348,27 +343,27 @@ uint32_t jlu32l(uint32_t h, const void *key, size_t size)
 	    break;
 	case  9:
 	    c += (uint32_t)k8[8];
-	    /*@fallthrough@*/
+	    /* fallthrough */
 	case  8:
 	    b += k[2]+(((uint32_t)k[3])<<16);
 	    a += k[0]+(((uint32_t)k[1])<<16);
 	    break;
 	case  7:
 	    b += ((uint32_t)k8[6])<<16;
-	    /*@fallthrough@*/
+	    /* fallthrough */
 	case  6:
 	    b += (uint32_t)k[2];
 	    a += k[0]+(((uint32_t)k[1])<<16);
 	    break;
 	case  5:
 	    b += (uint32_t)k8[4];
-	    /*@fallthrough@*/
+	    /* fallthrough */
 	case  4:
 	    a += k[0]+(((uint32_t)k[1])<<16);
 	    break;
 	case  3:
 	    a += ((uint32_t)k8[2])<<16;
-	    /*@fallthrough@*/
+	    /* fallthrough */
 	case  2:
 	    a += (uint32_t)k[0];
 	    break;
@@ -403,17 +398,17 @@ uint32_t jlu32l(uint32_t h, const void *key, size_t size)
 
 	/*---------------------------- last block: affect all 32 bits of (c) */
 	switch (size) {
-	case 12:	c += ((uint32_t)k[11])<<24;	/*@fallthrough@*/
-	case 11:	c += ((uint32_t)k[10])<<16;	/*@fallthrough@*/
-	case 10:	c += ((uint32_t)k[9])<<8;	/*@fallthrough@*/
-	case  9:	c += (uint32_t)k[8];		/*@fallthrough@*/
-	case  8:	b += ((uint32_t)k[7])<<24;	/*@fallthrough@*/
-	case  7:	b += ((uint32_t)k[6])<<16;	/*@fallthrough@*/
-	case  6:	b += ((uint32_t)k[5])<<8;	/*@fallthrough@*/
-	case  5:	b += (uint32_t)k[4];		/*@fallthrough@*/
-	case  4:	a += ((uint32_t)k[3])<<24;	/*@fallthrough@*/
-	case  3:	a += ((uint32_t)k[2])<<16;	/*@fallthrough@*/
-	case  2:	a += ((uint32_t)k[1])<<8;	/*@fallthrough@*/
+	case 12:	c += ((uint32_t)k[11])<<24;	/* fallthrough */
+	case 11:	c += ((uint32_t)k[10])<<16;	/* fallthrough */
+	case 10:	c += ((uint32_t)k[9])<<8;	/* fallthrough */
+	case  9:	c += (uint32_t)k[8];		/* fallthrough */
+	case  8:	b += ((uint32_t)k[7])<<24;	/* fallthrough */
+	case  7:	b += ((uint32_t)k[6])<<16;	/* fallthrough */
+	case  6:	b += ((uint32_t)k[5])<<8;	/* fallthrough */
+	case  5:	b += (uint32_t)k[4];		/* fallthrough */
+	case  4:	a += ((uint32_t)k[3])<<24;	/* fallthrough */
+	case  3:	a += ((uint32_t)k[2])<<16;	/* fallthrough */
+	case  2:	a += ((uint32_t)k[1])<<8;	/* fallthrough */
 	case  1:	a += (uint32_t)k[0];
 	    break;
 	case  0:
@@ -506,16 +501,16 @@ void jlu32lpair(const void *key, size_t size, uint32_t *pc, uint32_t *pb)
 	k8 = (const uint8_t *)k;
 	switch (size) {
 	case 12:	c += k[2]; b+=k[1]; a+=k[0];	break;
-	case 11:	c += ((uint32_t)k8[10])<<16;	/*@fallthrough@*/
-	case 10:	c += ((uint32_t)k8[9])<<8;	/*@fallthrough@*/
-	case  9:	c += k8[8];			/*@fallthrough@*/
+	case 11:	c += ((uint32_t)k8[10])<<16;	/* fallthrough */
+	case 10:	c += ((uint32_t)k8[9])<<8;	/* fallthrough */
+	case  9:	c += k8[8];			/* fallthrough */
 	case  8:	b += k[1]; a+=k[0];		break;
-	case  7:	b += ((uint32_t)k8[6])<<16;	/*@fallthrough@*/
-	case  6:	b += ((uint32_t)k8[5])<<8;	/*@fallthrough@*/
-	case  5:	b += k8[4];			/*@fallthrough@*/
+	case  7:	b += ((uint32_t)k8[6])<<16;	/* fallthrough */
+	case  6:	b += ((uint32_t)k8[5])<<8;	/* fallthrough */
+	case  5:	b += k8[4];			/* fallthrough */
 	case  4:	a += k[0];			break;
-	case  3:	a += ((uint32_t)k8[2])<<16;	/*@fallthrough@*/
-	case  2:	a += ((uint32_t)k8[1])<<8;	/*@fallthrough@*/
+	case  3:	a += ((uint32_t)k8[2])<<16;	/* fallthrough */
+	case  2:	a += ((uint32_t)k8[1])<<8;	/* fallthrough */
 	case  1:	a += k8[0];			break;
 	case  0:	goto exit;
 	}
@@ -546,7 +541,7 @@ void jlu32lpair(const void *key, size_t size, uint32_t *pc, uint32_t *pb)
 	    break;
 	case 11:
 	    c += ((uint32_t)k8[10])<<16;
-	    /*@fallthrough@*/
+	    /* fallthrough */
 	case 10:
 	    c += k[4];
 	    b += k[2]+(((uint32_t)k[3])<<16);
@@ -554,27 +549,27 @@ void jlu32lpair(const void *key, size_t size, uint32_t *pc, uint32_t *pb)
 	    break;
 	case  9:
 	    c += k8[8];
-	    /*@fallthrough@*/
+	    /* fallthrough */
 	case  8:
 	    b += k[2]+(((uint32_t)k[3])<<16);
 	    a += k[0]+(((uint32_t)k[1])<<16);
 	    break;
 	case  7:
 	    b += ((uint32_t)k8[6])<<16;
-	    /*@fallthrough@*/
+	    /* fallthrough */
 	case  6:
 	    b += k[2];
 	    a += k[0]+(((uint32_t)k[1])<<16);
 	    break;
 	case  5:
 	    b += k8[4];
-	    /*@fallthrough@*/
+	    /* fallthrough */
 	case  4:
 	    a += k[0]+(((uint32_t)k[1])<<16);
 	    break;
 	case  3:
 	    a += ((uint32_t)k8[2])<<16;
-	    /*@fallthrough@*/
+	    /* fallthrough */
 	case  2:
 	    a += k[0];
 	    break;
@@ -609,17 +604,17 @@ void jlu32lpair(const void *key, size_t size, uint32_t *pc, uint32_t *pb)
 
 	/*---------------------------- last block: affect all 32 bits of (c) */
 	switch (size) {
-	case 12:	c += ((uint32_t)k[11])<<24;	/*@fallthrough@*/
-	case 11:	c += ((uint32_t)k[10])<<16;	/*@fallthrough@*/
-	case 10:	c += ((uint32_t)k[9])<<8;	/*@fallthrough@*/
-	case  9:	c += k[8];			/*@fallthrough@*/
-	case  8:	b += ((uint32_t)k[7])<<24;	/*@fallthrough@*/
-	case  7:	b += ((uint32_t)k[6])<<16;	/*@fallthrough@*/
-	case  6:	b += ((uint32_t)k[5])<<8;	/*@fallthrough@*/
-	case  5:	b += k[4];			/*@fallthrough@*/
-	case  4:	a += ((uint32_t)k[3])<<24;	/*@fallthrough@*/
-	case  3:	a += ((uint32_t)k[2])<<16;	/*@fallthrough@*/
-	case  2:	a += ((uint32_t)k[1])<<8;	/*@fallthrough@*/
+	case 12:	c += ((uint32_t)k[11])<<24;	/* fallthrough */
+	case 11:	c += ((uint32_t)k[10])<<16;	/* fallthrough */
+	case 10:	c += ((uint32_t)k[9])<<8;	/* fallthrough */
+	case  9:	c += k[8];			/* fallthrough */
+	case  8:	b += ((uint32_t)k[7])<<24;	/* fallthrough */
+	case  7:	b += ((uint32_t)k[6])<<16;	/* fallthrough */
+	case  6:	b += ((uint32_t)k[5])<<8;	/* fallthrough */
+	case  5:	b += k[4];			/* fallthrough */
+	case  4:	a += ((uint32_t)k[3])<<24;	/* fallthrough */
+	case  3:	a += ((uint32_t)k[2])<<16;	/* fallthrough */
+	case  2:	a += ((uint32_t)k[1])<<8;	/* fallthrough */
 	case  1:	a += k[0];
 	    break;
 	case  0:
@@ -637,8 +632,7 @@ exit:
 #endif	/* defined(_JLU3_jlu32lpair) */
 
 #if defined(_JLU3_jlu32b)
-uint32_t jlu32b(uint32_t h, /*@null@*/ const void *key, size_t size)
-	/*@*/;
+uint32_t jlu32b(uint32_t h, const void *key, size_t size);
 /*
  * jlu32b():
  * This is the same as jlu32w() on big-endian machines.  It is different
@@ -710,16 +704,16 @@ uint32_t jlu32b(uint32_t h, const void *key, size_t size)
 	k8 = (const uint8_t *)k;
 	switch (size) {	/* all the case statements fall through */
 	case 12:	c += k[2]; b+=k[1]; a+=k[0];	break;
-	case 11:	c += ((uint32_t)k8[10])<<8;	/*@fallthrough@*/
-	case 10:	c += ((uint32_t)k8[9])<<16;	/*@fallthrough@*/
-	case  9:	c += ((uint32_t)k8[8])<<24;	/*@fallthrough@*/
+	case 11:	c += ((uint32_t)k8[10])<<8;	/* fallthrough */
+	case 10:	c += ((uint32_t)k8[9])<<16;	/* fallthrough */
+	case  9:	c += ((uint32_t)k8[8])<<24;	/* fallthrough */
 	case  8:	b += k[1]; a+=k[0];		break;
-	case  7:	b += ((uint32_t)k8[6])<<8;	/*@fallthrough@*/
-	case  6:	b += ((uint32_t)k8[5])<<16;	/*@fallthrough@*/
-	case  5:	b += ((uint32_t)k8[4])<<24;	/*@fallthrough@*/
+	case  7:	b += ((uint32_t)k8[6])<<8;	/* fallthrough */
+	case  6:	b += ((uint32_t)k8[5])<<16;	/* fallthrough */
+	case  5:	b += ((uint32_t)k8[4])<<24;	/* fallthrough */
 	case  4:	a += k[0];			break;
-	case  3:	a += ((uint32_t)k8[2])<<8;	/*@fallthrough@*/
-	case  2:	a += ((uint32_t)k8[1])<<16;	/*@fallthrough@*/
+	case  3:	a += ((uint32_t)k8[2])<<8;	/* fallthrough */
+	case  2:	a += ((uint32_t)k8[1])<<16;	/* fallthrough */
 	case  1:	a += ((uint32_t)k8[0])<<24;	break;
 	case  0:	goto exit;
     }
@@ -750,18 +744,18 @@ uint32_t jlu32b(uint32_t h, const void *key, size_t size)
 
 	/*---------------------------- last block: affect all 32 bits of (c) */
 	switch (size) {	/* all the case statements fall through */
-	case 12:	c += k[11];			/*@fallthrough@*/
-	case 11:	c += ((uint32_t)k[10])<<8;	/*@fallthrough@*/
-	case 10:	c += ((uint32_t)k[9])<<16;	/*@fallthrough@*/
-	case  9:	c += ((uint32_t)k[8])<<24;	/*@fallthrough@*/
-	case  8:	b += k[7];			/*@fallthrough@*/
-	case  7:	b += ((uint32_t)k[6])<<8;	/*@fallthrough@*/
-	case  6:	b += ((uint32_t)k[5])<<16;	/*@fallthrough@*/
-	case  5:	b += ((uint32_t)k[4])<<24;	/*@fallthrough@*/
-	case  4:	a += k[3];			/*@fallthrough@*/
-	case  3:	a += ((uint32_t)k[2])<<8;	/*@fallthrough@*/
-	case  2:	a += ((uint32_t)k[1])<<16;	/*@fallthrough@*/
-	case  1:	a += ((uint32_t)k[0])<<24;	/*@fallthrough@*/
+	case 12:	c += k[11];			/* fallthrough */
+	case 11:	c += ((uint32_t)k[10])<<8;	/* fallthrough */
+	case 10:	c += ((uint32_t)k[9])<<16;	/* fallthrough */
+	case  9:	c += ((uint32_t)k[8])<<24;	/* fallthrough */
+	case  8:	b += k[7];			/* fallthrough */
+	case  7:	b += ((uint32_t)k[6])<<8;	/* fallthrough */
+	case  6:	b += ((uint32_t)k[5])<<16;	/* fallthrough */
+	case  5:	b += ((uint32_t)k[4])<<24;	/* fallthrough */
+	case  4:	a += k[3];			/* fallthrough */
+	case  3:	a += ((uint32_t)k[2])<<8;	/* fallthrough */
+	case  2:	a += ((uint32_t)k[1])<<16;	/* fallthrough */
+	case  1:	a += ((uint32_t)k[0])<<24;	/* fallthrough */
 	    break;
 	case  0:
 	    goto exit;
@@ -779,7 +773,6 @@ exit:
 
 /* used for timings */
 static void driver1(void)
-	/*@*/
 {
     uint8_t buf[256];
     uint32_t i;
@@ -801,7 +794,6 @@ static void driver1(void)
 #define MAXPAIR 60
 #define MAXLEN  70
 static void driver2(void)
-	/*@*/
 {
     uint8_t qa[MAXLEN+1], qb[MAXLEN+2], *a = &qa[0], *b = &qb[1];
     uint32_t c[HASHSTATE], d[HASHSTATE], i=0, j=0, k, l, m=0, z;
@@ -864,7 +856,6 @@ static void driver2(void)
 
 /* Check for reading beyond the end of the buffer and alignment problems */
 static void driver3(void)
-	/*@*/
 {
     uint8_t buf[MAXLEN+20], *b;
     uint32_t len;
@@ -938,7 +929,6 @@ static void driver3(void)
 
 /* check for problems with nulls */
 static void driver4(void)
-	/*@*/
 {
     uint8_t buf[1];
     uint32_t h;
diff --git a/popt.c b/popt.c
index a1c38a5..1a3eac7 100644
--- a/popt.c
+++ b/popt.c
@@ -10,14 +10,6 @@
 
 #include "system.h"
 
-#if defined(__LCLINT__)
-/*@-declundef -exportheader @*/
-extern long long int strtoll(const char *nptr, /*@null@*/ char **endptr,
-		int base)
-	/*@modifies *endptr@*/;
-/*@=declundef =exportheader @*/
-#endif
-
 #ifdef HAVE_FLOAT_H
 #include <float.h>
 #endif
@@ -26,16 +18,13 @@ extern long long int strtoll(const char *nptr, /*@null@*/ char **endptr,
 #include "poptint.h"
 
 #ifdef	MYDEBUG
-/*@unchecked@*/
 int _popt_debug = 0;
 #endif
 
-/*@unchecked@*/
 unsigned int _poptArgMask = POPT_ARG_MASK;
-/*@unchecked@*/
 unsigned int _poptGroupMask = POPT_GROUP_MASK;
 
-#if !defined(HAVE_STRERROR) && !defined(__LCLINT__)
+#if !defined(HAVE_STRERROR)
 static char * strerror(int errno)
 {
     extern int sys_nerr;
@@ -49,7 +38,6 @@ static char * strerror(int errno)
 #endif
 
 #ifdef MYDEBUG
-/*@unused@*/
 static void prtcon(const char *msg, poptContext con)
 {
     if (msg) fprintf(stderr, "%s", msg);
@@ -72,8 +60,6 @@ void poptSetExecPath(poptContext con, const char * path, int allowAbsolute)
 }
 
 static void invokeCallbacksPRE(poptContext con, const struct poptOption * opt)
-	/*@globals internalState@*/
-	/*@modifies internalState@*/
 {
     if (opt != NULL)
     for (; opt->longName || opt->shortName || opt->arg; opt++) {
@@ -83,21 +69,17 @@ static void invokeCallbacksPRE(poptContext con, const struct poptOption * opt)
 	case POPT_ARG_INCLUDE_TABLE:	/* Recurse on included sub-tables. */
 	    poptSubstituteHelpI18N(arg.opt);	/* XXX side effects */
 	    invokeCallbacksPRE(con, arg.opt);
-	    /*@switchbreak@*/ break;
+	    break;
 	case POPT_ARG_CALLBACK:		/* Perform callback. */
 	    if (!CBF_ISSET(opt, PRE))
-		/*@switchbreak@*/ break;
-/*@-noeffectuncon @*/	/* XXX no known way to annotate (*vector) calls. */
+		break;
 	    arg.cb(con, POPT_CALLBACK_REASON_PRE, NULL, NULL, opt->descrip);
-/*@=noeffectuncon @*/
-	    /*@switchbreak@*/ break;
+	    break;
 	}
     }
 }
 
 static void invokeCallbacksPOST(poptContext con, const struct poptOption * opt)
-	/*@globals internalState@*/
-	/*@modifies internalState@*/
 {
     if (opt != NULL)
     for (; opt->longName || opt->shortName || opt->arg; opt++) {
@@ -107,14 +89,12 @@ static void invokeCallbacksPOST(poptContext con, const struct poptOption * opt)
 	case POPT_ARG_INCLUDE_TABLE:	/* Recurse on included sub-tables. */
 	    poptSubstituteHelpI18N(arg.opt);	/* XXX side effects */
 	    invokeCallbacksPOST(con, arg.opt);
-	    /*@switchbreak@*/ break;
+	    break;
 	case POPT_ARG_CALLBACK:		/* Perform callback. */
 	    if (!CBF_ISSET(opt, POST))
-		/*@switchbreak@*/ break;
-/*@-noeffectuncon @*/	/* XXX no known way to annotate (*vector) calls. */
+		break;
 	    arg.cb(con, POPT_CALLBACK_REASON_POST, NULL, NULL, opt->descrip);
-/*@=noeffectuncon @*/
-	    /*@switchbreak@*/ break;
+	    break;
 	}
     }
 }
@@ -122,9 +102,7 @@ static void invokeCallbacksPOST(poptContext con, const struct poptOption * opt)
 static void invokeCallbacksOPTION(poptContext con,
 				const struct poptOption * opt,
 				const struct poptOption * myOpt,
-				/*@null@*/ const void * myData, int shorty)
-	/*@globals internalState@*/
-	/*@modifies internalState@*/
+				const void * myData, int shorty)
 {
     const struct poptOption * cbopt = NULL;
     poptArg cbarg = { .ptr = NULL };
@@ -137,30 +115,28 @@ static void invokeCallbacksOPTION(poptContext con,
 	    poptSubstituteHelpI18N(arg.opt);	/* XXX side effects */
 	    if (opt->arg != NULL)
 		invokeCallbacksOPTION(con, opt->arg, myOpt, myData, shorty);
-	    /*@switchbreak@*/ break;
+	    break;
 	case POPT_ARG_CALLBACK:		/* Save callback info. */
 	    if (CBF_ISSET(opt, SKIPOPTION))
-		/*@switchbreak@*/ break;
+		break;
 	    cbopt = opt;
 	    cbarg.ptr = opt->arg;
-	    /*@switchbreak@*/ break;
+	    break;
 	default:		/* Perform callback on matching option. */
 	    if (cbopt == NULL || cbarg.cb == NULL)
-		/*@switchbreak@*/ break;
+		break;
 	    if ((myOpt->shortName && opt->shortName && shorty &&
 			myOpt->shortName == opt->shortName)
 	     || (myOpt->longName != NULL && opt->longName != NULL &&
 			!strcmp(myOpt->longName, opt->longName)))
 	    {	const void *cbData = (cbopt->descrip ? cbopt->descrip : myData);
-/*@-noeffectuncon @*/	/* XXX no known way to annotate (*vector) calls. */
 		cbarg.cb(con, POPT_CALLBACK_REASON_OPTION,
 			myOpt, con->os->nextArg, cbData);
-/*@=noeffectuncon @*/
 		/* Terminate (unless explcitly continuing). */
 		if (!CBF_ISSET(cbopt, CONTINUE))
 		    return;
 	    }
-	    /*@switchbreak@*/ break;
+	    break;
 	}
     }
 }
@@ -175,18 +151,14 @@ poptContext poptGetContext(const char * name, int argc, const char ** argv,
 
     con->os = con->optionStack;
     con->os->argc = argc;
-/*@-dependenttrans -assignexpose@*/	/* FIX: W2DO? */
     con->os->argv = argv;
-/*@=dependenttrans =assignexpose@*/
     con->os->argb = NULL;
 
     if (!(flags & POPT_CONTEXT_KEEP_FIRST))
 	con->os->next = 1;		/* skip argv[0] */
 
     con->leftovers = calloc( (size_t)(argc + 1), sizeof(*con->leftovers) );
-/*@-dependenttrans -assignexpose@*/	/* FIX: W2DO? */
     con->options = options;
-/*@=dependenttrans =assignexpose@*/
     con->aliases = NULL;
     con->numAliases = 0;
     con->flags = flags;
@@ -208,10 +180,7 @@ poptContext poptGetContext(const char * name, int argc, const char ** argv,
     return con;
 }
 
-static void cleanOSE(/*@special@*/ struct optionStackEntry *os)
-	/*@uses os @*/
-	/*@releases os->nextArg, os->argv, os->argb @*/
-	/*@modifies os @*/
+static void cleanOSE(struct optionStackEntry *os)
 {
     os->nextArg = _free(os->nextArg);
     os->argv = _free(os->argv);
@@ -239,24 +208,17 @@ void poptResetContext(poptContext con)
 
     if (con->finalArgv != NULL)
     for (i = 0; i < con->finalArgvCount; i++) {
-/*@-unqualifiedtrans@*/		/* FIX: typedef double indirection. */
 	con->finalArgv[i] = _free(con->finalArgv[i]);
-/*@=unqualifiedtrans@*/
     }
 
     con->finalArgvCount = 0;
     con->arg_strip = PBM_FREE(con->arg_strip);
-/*@-nullstate@*/	/* FIX: con->finalArgv != NULL */
     return;
-/*@=nullstate@*/
 }
 
 /* Only one of longName, shortName should be set, not both. */
-static int handleExec(/*@special@*/ poptContext con,
-		/*@null@*/ const char * longName, char shortName)
-	/*@uses con->execs, con->numExecs, con->flags, con->doExec,
-		con->finalArgv, con->finalArgvAlloced, con->finalArgvCount @*/
-	/*@modifies con @*/
+static int handleExec(poptContext con,
+		const char * longName, char shortName)
 {
     poptItem item;
     int i;
@@ -319,8 +281,7 @@ static int handleExec(/*@special@*/ poptContext con,
  */
 static int
 longOptionStrcmp(const struct poptOption * opt,
-		/*@null@*/ const char * longName, size_t longNameLen)
-	/*@*/
+		const char * longName, size_t longNameLen)
 {
     const char * optLongName = opt->longName;
     int rc;
@@ -350,13 +311,10 @@ longOptionStrcmp(const struct poptOption * opt,
 }
 
 /* Only one of longName, shortName may be set at a time */
-static int handleAlias(/*@special@*/ poptContext con,
-		/*@null@*/ const char * longName, size_t longNameLen,
+static int handleAlias(poptContext con,
+		const char * longName, size_t longNameLen,
 		char shortName,
-		/*@exposed@*/ /*@null@*/ const char * nextArg)
-	/*@uses con->aliases, con->numAliases, con->optionStack, con->os,
-		con->os->currAlias, con->os->currAlias->option.longName @*/
-	/*@modifies con @*/
+		const char * nextArg)
 {
     poptItem item = con->os->currAlias;
     int rc;
@@ -428,9 +386,8 @@ static int handleAlias(/*@special@*/ poptContext con,
  * @param argv0		name of executable
  * @return		(malloc'd) absolute path to executable (or NULL)
  */
-static /*@null@*/
-const char * findProgramPath(/*@null@*/ const char * argv0)
-	/*@*/
+static
+const char * findProgramPath(const char * argv0)
 {
     char *path = NULL, *s = NULL, *se;
     char *t = NULL;
@@ -462,20 +419,14 @@ const char * findProgramPath(/*@null@*/ const char * argv0)
     }
 
     /* If no executable was found in PATH, return NULL. */
-/*@-compdef@*/
     if (!(s && *s) && t != NULL)
 	t = _free(t);
-/*@=compdef@*/
-/*@-modobserver -observertrans -usedef @*/
     path = _free(path);
-/*@=modobserver =observertrans =usedef @*/
 
     return t;
 }
 
 static int execCommand(poptContext con)
-	/*@globals internalState @*/
-	/*@modifies internalState @*/
 {
     poptItem item = con->doExec;
     poptArgv argv = NULL;
@@ -561,9 +512,7 @@ if (_popt_debug)
     }
 #endif
 
-/*@-nullstate@*/
     rc = execvp(argv[0], (char *const *)argv);
-/*@=nullstate@*/
 
 exit:
     if (argv) {
@@ -574,15 +523,13 @@ exit:
     return ec;
 }
 
-/*@observer@*/ /*@null@*/
 static const struct poptOption *
 findOption(const struct poptOption * opt,
-		/*@null@*/ const char * longName, size_t longNameLen,
+		const char * longName, size_t longNameLen,
 		char shortName,
-		/*@null@*/ /*@out@*/ poptCallbackType * callback,
-		/*@null@*/ /*@out@*/ const void ** callbackData,
+		poptCallbackType * callback,
+		const void ** callbackData,
 		unsigned int argInfo)
-	/*@modifies *callback, *callbackData */
 {
     const struct poptOption * cb = NULL;
     poptArg cbarg = { .ptr = NULL };
@@ -604,20 +551,18 @@ findOption(const struct poptOption * opt,
 			      callbackData, argInfo);
 	    if (opt2 == NULL) continue;
 	    /* Sub-table data will be inheirited if no data yet. */
-/*@-observertrans -dependenttrans @*/
 	    if (callback && *callback
 	     && callbackData && *callbackData == NULL)
 		*callbackData = opt->descrip;
-/*@=observertrans =dependenttrans @*/
 	    return opt2;
-	}   /*@notreached@*/ /*@switchbreak@*/ break;
+	}   break;
 	case POPT_ARG_CALLBACK:
 	    cb = opt;
 	    cbarg.ptr = opt->arg;
 	    continue;
-	    /*@notreached@*/ /*@switchbreak@*/ break;
+	    break;
 	default:
-	    /*@switchbreak@*/ break;
+	    break;
 	}
 
 	if (longName != NULL && opt->longName != NULL &&
@@ -633,23 +578,16 @@ findOption(const struct poptOption * opt,
     if (opt->longName == NULL && !opt->shortName)
 	return NULL;
 
-/*@-modobserver -mods @*/
     if (callback)
 	*callback = (cb ? cbarg.cb : NULL);
     if (callbackData)
-/*@-observertrans -dependenttrans @*/
 	*callbackData = (cb && !CBF_ISSET(cb, INC_DATA) ? cb->descrip : NULL);
-/*@=observertrans =dependenttrans @*/
-/*@=modobserver =mods @*/
 
     return opt;
 }
 
-static const char * findNextArg(/*@special@*/ poptContext con,
+static const char * findNextArg(poptContext con,
 		unsigned argx, int delete_arg)
-	/*@uses con->optionStack, con->os,
-		con->os->next, con->os->argb, con->os->argc, con->os->argv @*/
-	/*@modifies con @*/
 {
     struct optionStackEntry * os = con->os;
     const char * arg;
@@ -661,32 +599,27 @@ static const char * findNextArg(/*@special@*/ poptContext con,
 	if (os->next == os->argc && os == con->optionStack) break;
 	if (os->argv != NULL)
 	for (i = os->next; i < os->argc; i++) {
-/*@-sizeoftype@*/
 	    if (os->argb && PBM_ISSET(i, os->argb))
-		/*@innercontinue@*/ continue;
+		continue;
 	    if (*os->argv[i] == '-')
-		/*@innercontinue@*/ continue;
+		continue;
 	    if (--argx > 0)
-		/*@innercontinue@*/ continue;
+		continue;
 	    arg = os->argv[i];
 	    if (delete_arg) {
 		if (os->argb == NULL) os->argb = PBM_ALLOC(os->argc);
 		if (os->argb != NULL)	/* XXX can't happen */
 		    PBM_SET(i, os->argb);
 	    }
-	    /*@innerbreak@*/ break;
-/*@=sizeoftype@*/
+	    break;
 	}
 	if (os > con->optionStack) os--;
     } while (arg == NULL);
     return arg;
 }
 
-static /*@only@*/ /*@null@*/ const char *
-expandNextArg(/*@special@*/ poptContext con, const char * s)
-	/*@uses con->optionStack, con->os,
-		con->os->next, con->os->argb, con->os->argc, con->os->argv @*/
-	/*@modifies con @*/
+static const char *
+expandNextArg(poptContext con, const char * s)
 {
     const char * a = NULL;
     char *t, *te;
@@ -701,15 +634,15 @@ expandNextArg(/*@special@*/ poptContext con, const char * s)
 #if 0	/* XXX can't do this */
 	case '\\':	/* escape */
 	    c = *s++;
-	    /*@switchbreak@*/ break;
+	    break;
 #endif
 	case '!':
 	    if (!(s[0] == '#' && s[1] == ':' && s[2] == '+'))
-		/*@switchbreak@*/ break;
+		break;
 	    /* XXX Make sure that findNextArg deletes only next arg. */
 	    if (a == NULL) {
 		if ((a = findNextArg(con, 1U, 1)) == NULL)
-		    /*@switchbreak@*/ break;
+		    break;
 	    }
 	    s += sizeof("#:+") - 1;
 
@@ -720,49 +653,36 @@ expandNextArg(/*@special@*/ poptContext con, const char * s)
 		te = stpcpy(t + pos, a);
 	    }
 	    continue;
-	    /*@notreached@*/ /*@switchbreak@*/ break;
+	    break;
 	default:
-	    /*@switchbreak@*/ break;
+	    break;
 	}
 	*te++ = c;
     }
     *te++ = '\0';
     /* If the new string is longer than needed, shorten. */
     if ((t + tn) > te) {
-/*@-usereleased@*/	/* XXX splint can't follow the pointers. */
 	if ((te = realloc(t, (size_t)(te - t))) == NULL)
 	    free(t);
 	t = te;
-/*@=usereleased@*/
     }
     return t;
 }
 
-static void poptStripArg(/*@special@*/ poptContext con, int which)
-	/*@uses con->optionStack @*/
-	/*@defines con->arg_strip @*/
-	/*@modifies con @*/
+static void poptStripArg(poptContext con, int which)
 {
-/*@-compdef -sizeoftype -usedef @*/
     if (con->arg_strip == NULL)
 	con->arg_strip = PBM_ALLOC(con->optionStack[0].argc);
     if (con->arg_strip != NULL)		/* XXX can't happen */
     PBM_SET(which, con->arg_strip);
     return;
-/*@=compdef =sizeoftype =usedef @*/
 }
 
-/*@unchecked@*/
 unsigned int _poptBitsN = _POPT_BITS_N;
-/*@unchecked@*/
 unsigned int _poptBitsM = _POPT_BITS_M;
-/*@unchecked@*/
 unsigned int _poptBitsK = _POPT_BITS_K;
 
-/*@-sizeoftype@*/
-static int _poptBitsNew(/*@null@*/ poptBits *bitsp)
-	/*@globals _poptBitsN, _poptBitsM, _poptBitsK @*/
-	/*@modifies *bitsp, _poptBitsN, _poptBitsM, _poptBitsK @*/
+static int _poptBitsNew(poptBits *bitsp)
 {
     if (bitsp == NULL)
 	return POPT_ERROR_NULLARG;
@@ -777,9 +697,7 @@ static int _poptBitsNew(/*@null@*/ poptBits *bitsp)
 	if (_poptBitsK == 0U || _poptBitsK > 32U) _poptBitsK = _POPT_BITS_K;
 	*bitsp = PBM_ALLOC(_poptBitsM-1);
     }
-/*@-nullstate@*/
     return 0;
-/*@=nullstate@*/
 }
 
 int poptBitsAdd(poptBits bits, const char * s)
@@ -910,13 +828,11 @@ int poptBitsArgs(poptContext con, poptBits *ap)
 	if ((rc = poptBitsAdd(*ap, *av)) != 0)
 	    break;
     }
-/*@-nullstate@*/
     return rc;
-/*@=nullstate@*/
 }
 
 int poptSaveBits(poptBits * bitsp,
-		/*@unused@*/ UNUSED(unsigned int argInfo), const char * s)
+		UNUSED(unsigned int argInfo), const char * s)
 {
     char *tbuf = NULL;
     char *t, *te;
@@ -948,10 +864,9 @@ int poptSaveBits(poptBits * bitsp,
     tbuf = _free(tbuf);
     return rc;
 }
-/*@=sizeoftype@*/
 
 int poptSaveString(const char *** argvp,
-		/*@unused@*/ UNUSED(unsigned int argInfo), const char * val)
+		UNUSED(unsigned int argInfo), const char * val)
 {
     int argc = 0;
 
@@ -963,16 +878,13 @@ int poptSaveString(const char *** argvp,
     while ((*argvp)[argc] != NULL)
 	argc++;
  
-/*@-unqualifiedtrans -nullstate@*/	/* XXX no annotation for (*argvp) */
     if ((*argvp = xrealloc(*argvp, (argc + 1 + 1) * sizeof(**argvp))) != NULL) {
 	(*argvp)[argc++] = xstrdup(val);
 	(*argvp)[argc  ] = NULL;
     }
     return 0;
-/*@=unqualifiedtrans =nullstate@*/
 }
 
-/*@unchecked@*/
 static unsigned int seed = 0;
 
 int poptSaveLongLong(long long * arg, unsigned int argInfo, long long aLongLong)
@@ -1015,7 +927,7 @@ int poptSaveLongLong(long long * arg, unsigned int argInfo, long long aLongLong)
 	break;
     default:
 	return POPT_ERROR_BADOPERATION;
-	/*@notreached@*/ break;
+	break;
     }
     return 0;
 }
@@ -1048,12 +960,12 @@ int poptSaveLong(long * arg, unsigned int argInfo, long aLong)
     case POPT_ARGFLAG_XOR: *(unsigned long *)arg ^= (unsigned long)aLong; break;
     default:
 	return POPT_ERROR_BADOPERATION;
-	/*@notreached@*/ break;
+	break;
     }
     return 0;
 }
 
-int poptSaveInt(/*@null@*/ int * arg, unsigned int argInfo, long aLong)
+int poptSaveInt(int * arg, unsigned int argInfo, long aLong)
 {
     /* XXX Check alignment, may fail on funky platforms. */
     if (arg == NULL || (((unsigned long)arg) & (sizeof(*arg)-1)))
@@ -1081,12 +993,12 @@ int poptSaveInt(/*@null@*/ int * arg, unsigned int argInfo, long aLong)
     case POPT_ARGFLAG_XOR: *(unsigned int *)arg ^= (unsigned int) aLong; break;
     default:
 	return POPT_ERROR_BADOPERATION;
-	/*@notreached@*/ break;
+	break;
     }
     return 0;
 }
 
-int poptSaveShort(/*@null@*/ short * arg, unsigned int argInfo, long aLong)
+int poptSaveShort(short * arg, unsigned int argInfo, long aLong)
 {
     /* XXX Check alignment, may fail on funky platforms. */
     if (arg == NULL || (((unsigned long)arg) & (sizeof(*arg)-1)))
@@ -1117,7 +1029,7 @@ int poptSaveShort(/*@null@*/ short * arg, unsigned int argInfo, long aLong)
     case POPT_ARGFLAG_XOR: *(unsigned short *)arg ^= (unsigned short) aLong;
 	break;
     default: return POPT_ERROR_BADOPERATION;
-	/*@notreached@*/ break;
+	break;
     }
     return 0;
 }
@@ -1129,7 +1041,6 @@ int poptSaveShort(/*@null@*/ short * arg, unsigned int argInfo, long aLong)
  * @return		argInfo
  */
 static unsigned int poptArgInfo(poptContext con, const struct poptOption * opt)
-	/*@*/
 {
     unsigned int argInfo = opt->argInfo;
 
@@ -1159,9 +1070,8 @@ static unsigned int poptArgInfo(poptContext con, const struct poptOption * opt)
  * @return		0 on success, otherwise POPT_* error.
  */
 static int poptParseInteger(long long * llp,
-		/*@unused@*/ UNUSED(unsigned int argInfo),
-		/*@null@*/ const char * val)
-	/*@modifies *llp @*/
+		UNUSED(unsigned int argInfo),
+		const char * val)
 {
     if (val) {
 	char *end = NULL;
@@ -1183,8 +1093,6 @@ static int poptParseInteger(long long * llp,
  * @return		0 on success, otherwise POPT_* error.
  */
 static int poptSaveArg(poptContext con, const struct poptOption * opt)
-	/*@globals fileSystem, internalState @*/
-	/*@modifies con, fileSystem, internalState @*/
 {
     poptArg arg = { .ptr = opt->arg };
     int rc = 0;		/* assume success */
@@ -1193,15 +1101,15 @@ static int poptSaveArg(poptContext con, const struct poptOption * opt)
     case POPT_ARG_BITSET:
 	/* XXX memory leak, application is responsible for free. */
 	rc = poptSaveBits(arg.ptr, opt->argInfo, con->os->nextArg);
-	/*@switchbreak@*/ break;
+	break;
     case POPT_ARG_ARGV:
 	/* XXX memory leak, application is responsible for free. */
 	rc = poptSaveString(arg.ptr, opt->argInfo, con->os->nextArg);
-	/*@switchbreak@*/ break;
+	break;
     case POPT_ARG_STRING:
 	/* XXX memory leak, application is responsible for free. */
 	arg.argv[0] = (con->os->nextArg) ? xstrdup(con->os->nextArg) : NULL;
-	/*@switchbreak@*/ break;
+	break;
 
     case POPT_ARG_INT:
     case POPT_ARG_SHORT:
@@ -1223,24 +1131,24 @@ static int poptSaveArg(poptContext con, const struct poptOption * opt)
 	    rc = !(aNUM == LLONG_MIN || aNUM == LLONG_MAX)
 		? poptSaveLongLong(arg.longlongp, argInfo, aNUM)
 		: POPT_ERROR_OVERFLOW;
-	    /*@innerbreak@*/ break;
+	    break;
 	case POPT_ARG_LONG:
 	    rc = !(aNUM < (long long)LONG_MIN || aNUM > (long long)LONG_MAX)
 		? poptSaveLong(arg.longp, argInfo, (long)aNUM)
 		: POPT_ERROR_OVERFLOW;
-	    /*@innerbreak@*/ break;
+	    break;
 	case POPT_ARG_INT:
 	    rc = !(aNUM < (long long)INT_MIN || aNUM > (long long)INT_MAX)
 		? poptSaveInt(arg.intp, argInfo, (long)aNUM)
 		: POPT_ERROR_OVERFLOW;
-	    /*@innerbreak@*/ break;
+	    break;
 	case POPT_ARG_SHORT:
 	    rc = !(aNUM < (long long)SHRT_MIN || aNUM > (long long)SHRT_MAX)
 		? poptSaveShort(arg.shortp, argInfo, (long)aNUM)
 		: POPT_ERROR_OVERFLOW;
-	    /*@innerbreak@*/ break;
+	    break;
 	}
-    }   /*@switchbreak@*/ break;
+    }   break;
 
     case POPT_ARG_FLOAT:
     case POPT_ARG_DOUBLE:
@@ -1248,7 +1156,6 @@ static int poptSaveArg(poptContext con, const struct poptOption * opt)
 	double aDouble = 0.0;
 
 	if (con->os->nextArg) {
-/*@-mods@*/
 	    int saveerrno = errno;
 	    errno = 0;
 	    aDouble = strtod(con->os->nextArg, &end);
@@ -1257,7 +1164,6 @@ static int poptSaveArg(poptContext con, const struct poptOption * opt)
 		break;
 	    }
 	    errno = saveerrno;
-/*@=mods@*/
 	    if (*end != '\0') {
 		rc = POPT_ERROR_BADNUMBER;
 		break;
@@ -1267,9 +1173,9 @@ static int poptSaveArg(poptContext con, const struct poptOption * opt)
 	switch (poptArgType(opt)) {
 	case POPT_ARG_DOUBLE:
 	    arg.doublep[0] = aDouble;
-	    /*@innerbreak@*/ break;
+	    break;
 	case POPT_ARG_FLOAT:
-#if !defined(DBL_EPSILON) && !defined(__LCLINT__)
+#if !defined(DBL_EPSILON)
 #define DBL_EPSILON 2.2204460492503131e-16
 #endif
 #define POPT_ABS(a)	((((a) - 0.0) < DBL_EPSILON) ? -(a) : (a))
@@ -1278,19 +1184,17 @@ static int poptSaveArg(poptContext con, const struct poptOption * opt)
 		rc = POPT_ERROR_OVERFLOW;
 	    else
 		arg.floatp[0] = (float) aDouble;
-	    /*@innerbreak@*/ break;
+	    break;
 	}
-    }   /*@switchbreak@*/ break;
+    }   break;
     case POPT_ARG_MAINCALL:
-/*@-assignexpose -type@*/
 	con->maincall = opt->arg;
-/*@=assignexpose =type@*/
-	/*@switchbreak@*/ break;
+	break;
     default:
 	fprintf(stdout, POPT_("option type (%u) not implemented in popt\n"),
 		poptArgType(opt));
 	exit(EXIT_FAILURE);
-	/*@notreached@*/ /*@switchbreak@*/ break;
+	break;
     }
     return rc;
 }
@@ -1319,9 +1223,7 @@ int poptGetNextOpt(poptContext con)
 	    invokeCallbacksPOST(con, con->options);
 
 	    if (con->maincall) {
-		/*@-noeffectuncon @*/
 		(void) (*con->maincall) (con->finalArgvCount, con->finalArgv);
-		/*@=noeffectuncon @*/
 		return -1;
 	    }
 
@@ -1335,12 +1237,10 @@ int poptGetNextOpt(poptContext con)
             size_t optStringLen;
 	    int thisopt;
 
-/*@-sizeoftype@*/
 	    if (con->os->argb && PBM_ISSET(con->os->next, con->os->argb)) {
 		con->os->next++;
 		continue;
 	    }
-/*@=sizeoftype@*/
 	    thisopt = con->os->next;
 	    if (con->os->argv != NULL)	/* XXX can't happen */
 	    origOptString = con->os->argv[con->os->next++];
@@ -1537,9 +1437,9 @@ int poptGetNextOpt(poptContext con)
 	}
 
 	if (opt->arg && poptArgType(opt) == POPT_ARG_NONE)
-	    /*@-ifempty@*/ ; /*@=ifempty@*/
+	    ;
 	else if (poptArgType(opt) == POPT_ARG_VAL)
-	    /*@-ifempty@*/ ; /*@=ifempty@*/
+	    ;
 	else if (poptArgType(opt) != POPT_ARG_NONE) {
 	    if (con->finalArgv != NULL && con->os->nextArg != NULL)
 	        con->finalArgv[con->finalArgvCount++] =
@@ -1585,23 +1485,18 @@ const char ** poptGetArgs(poptContext con)
     /* some apps like [like RPM ;-) ] need this NULL terminated */
     con->leftovers[con->numLeftovers] = NULL;
 
-/*@-nullret -nullstate @*/	/* FIX: typedef double indirection. */
     return (con->leftovers + con->nextLeftover);
-/*@=nullret =nullstate @*/
 }
 
-static /*@null@*/
-poptItem poptFreeItems(/*@only@*/ /*@null@*/ poptItem items, int nitems)
-	/*@modifies items @*/
+static
+poptItem poptFreeItems(poptItem items, int nitems)
 {
     if (items != NULL) {
 	poptItem item = items;
 	while (--nitems >= 0) {
-/*@-modobserver -observertrans -dependenttrans@*/
 	    item->option.longName = _free(item->option.longName);
 	    item->option.descrip = _free(item->option.descrip);
 	    item->option.argDescrip = _free(item->option.argDescrip);
-/*@=modobserver =observertrans =dependenttrans@*/
 	    item->argv = _free(item->argv);
 	    item++;
 	}
@@ -1634,7 +1529,7 @@ poptContext poptFreeContext(poptContext con)
 }
 
 int poptAddAlias(poptContext con, struct poptAlias alias,
-		/*@unused@*/ UNUSED(int flags))
+		UNUSED(int flags))
 {
     struct poptItem_s item_buf;
     poptItem item = &item_buf;
@@ -1667,7 +1562,7 @@ int poptAddItem(poptContext con, poptItem newItem, int flags)
 	break;
     default:
 	return 1;
-	/*@notreached@*/ break;
+	break;
     }
 
     *items = realloc((*items), ((*nitems) + 1) * sizeof(**items));
@@ -1768,7 +1663,6 @@ int poptStrippedArgv(poptContext con, int argc, char ** argv)
     int j = 1;
     int i;
     
-/*@-sizeoftype@*/
     if (con->arg_strip)
     for (i = 1; i < argc; i++) {
 	if (PBM_ISSET(i, con->arg_strip))
@@ -1781,7 +1675,6 @@ int poptStrippedArgv(poptContext con, int argc, char ** argv)
 	argv[j] = (j < numargs) ? argv[i] : NULL;
 	j++;
     }
-/*@=sizeoftype@*/
     
     return numargs;
 }
diff --git a/popt.h b/popt.h
index a8b3b4b..acc87c1 100644
--- a/popt.h
+++ b/popt.h
@@ -123,16 +123,12 @@
 /** \ingroup popt
  */
 struct poptOption {
-/*@observer@*/ /*@null@*/
     const char * longName;	/*!< may be NULL */
     char shortName;		/*!< may be NUL */
     unsigned int argInfo;
-/*@shared@*/ /*@null@*/
     void * arg;			/*!< depends on argInfo */
     int val;			/*!< 0 means don't return, just update flag */
-/*@observer@*/ /*@null@*/
     const char * descrip;	/*!< description for autohelp -- may be NULL */
-/*@observer@*/ /*@null@*/
     const char * argDescrip;	/*!< argument description for autohelp */
 };
 
@@ -140,25 +136,20 @@ struct poptOption {
  * A popt alias argument for poptAddAlias().
  */
 struct poptAlias {
-/*@owned@*/ /*@null@*/
     const char * longName;	/*!< may be NULL */
     char shortName;		/*!< may be NUL */
     int argc;
-/*@owned@*/
     const char ** argv;		/*!< must be free()able */
 };
 
 /** \ingroup popt
  * A popt alias or exec argument for poptAddItem().
  */
-/*@-exporttype@*/
 typedef struct poptItem_s {
     struct poptOption option;	/*!< alias/exec name(s) and description. */
     int argc;			/*!< (alias) no. of args. */
-/*@owned@*/
     const char ** argv;		/*!< (alias) args, must be free()able. */
 } * poptItem;
-/*@=exporttype@*/
 
 /** \ingroup popt
  * \name Auto-generated help/usage
@@ -168,25 +159,16 @@ typedef struct poptItem_s {
 /**
  * Empty table marker to enable displaying popt alias/exec options.
  */
-/*@-exportvar@*/
-/*@unchecked@*/ /*@observer@*/
 extern struct poptOption poptAliasOptions[];
-/*@=exportvar@*/
 #define POPT_AUTOALIAS { NULL, '\0', POPT_ARG_INCLUDE_TABLE, poptAliasOptions, \
 			0, "Options implemented via popt alias/exec:", NULL },
 
 /**
  * Auto help table options.
  */
-/*@-exportvar@*/
-/*@unchecked@*/ /*@observer@*/
 extern struct poptOption poptHelpOptions[];
-/*@=exportvar@*/
 
-/*@-exportvar@*/
-/*@unchecked@*/ /*@observer@*/
 extern struct poptOption * poptHelpOptionsI18N;
-/*@=exportvar@*/
 
 #define POPT_AUTOHELP { NULL, '\0', POPT_ARG_INCLUDE_TABLE, poptHelpOptions, \
 			0, "Help options:", NULL },
@@ -196,32 +178,25 @@ extern struct poptOption * poptHelpOptionsI18N;
 
 /** \ingroup popt
  */
-/*@-exporttype@*/
-typedef /*@abstract@*/ struct poptContext_s * poptContext;
-/*@=exporttype@*/
+typedef struct poptContext_s * poptContext;
 
 /** \ingroup popt
  */
 #ifndef __cplusplus
-/*@-exporttype -typeuse@*/
 typedef struct poptOption * poptOption;
-/*@=exporttype =typeuse@*/
 #endif
 
 /** \ingroup popt
  */
-/*@-exportconst@*/
 enum poptCallbackReason {
     POPT_CALLBACK_REASON_PRE	= 0, 
     POPT_CALLBACK_REASON_POST	= 1,
     POPT_CALLBACK_REASON_OPTION = 2
 };
-/*@=exportconst@*/
 
 #ifdef __cplusplus
 extern "C" {
 #endif
-/*@-type@*/
 
 /** \ingroup popt
  * Table callback prototype.
@@ -233,20 +208,16 @@ extern "C" {
  */
 typedef void (*poptCallbackType) (poptContext con, 
 		enum poptCallbackReason reason,
-		/*@null@*/ const struct poptOption * opt,
-		/*@null@*/ const char * arg,
-		/*@null@*/ const void * data)
-	/*@globals internalState @*/
-	/*@modifies internalState @*/;
+		const struct poptOption * opt,
+		const char * arg,
+		const void * data);
 
 /** \ingroup popt
  * Destroy context.
  * @param con		context
  * @return		NULL always
  */
-/*@null@*/
-poptContext poptFreeContext( /*@only@*/ /*@null@*/ poptContext con)
-	/*@modifies con @*/;
+poptContext poptFreeContext( poptContext con);
 
 /** \ingroup popt
  * Initialize popt context.
@@ -257,23 +228,18 @@ poptContext poptFreeContext( /*@only@*/ /*@null@*/ poptContext con)
  * @param flags		or'd POPT_CONTEXT_* bits
  * @return		initialized popt context
  */
-/*@only@*/ /*@null@*/
 poptContext poptGetContext(
-		/*@dependent@*/ /*@keep@*/ const char * name,
-		int argc, /*@dependent@*/ /*@keep@*/ const char ** argv,
-		/*@dependent@*/ /*@keep@*/ const struct poptOption * options,
-		unsigned int flags)
-	/*@globals internalState @*/
-	/*@modifies internalState @*/;
+		const char * name,
+		int argc, const char ** argv,
+		const struct poptOption * options,
+		unsigned int flags);
 
 /** \ingroup popt
  * Destroy context (alternative implementation).
  * @param con		context
  * @return		NULL always
  */
-/*@null@*/
-poptContext poptFini( /*@only@*/ /*@null@*/ poptContext con)
-	/*@modifies con @*/;
+poptContext poptFini( poptContext con);
 
 /** \ingroup popt
  * Initialize popt context (alternative implementation).
@@ -284,55 +250,43 @@ poptContext poptFini( /*@only@*/ /*@null@*/ poptContext con)
  * @param configPaths	colon separated file path(s) to read.
  * @return		initialized popt context (NULL on error).
  */
-/*@only@*/ /*@null@*/ /*@unused@*/
-poptContext poptInit(int argc, /*@dependent@*/ /*@keep@*/ const char ** argv,
-		/*@dependent@*/ /*@keep@*/ const struct poptOption * options,
-		/*@null@*/ const char * configPaths)
-	/*@globals fileSystem, internalState @*/
-	/*@modifies fileSystem, internalState @*/;
+poptContext poptInit(int argc, const char ** argv,
+		const struct poptOption * options,
+		const char * configPaths);
 
 /** \ingroup popt
  * Reinitialize popt context.
  * @param con		context
  */
-/*@unused@*/
-void poptResetContext(/*@null@*/poptContext con)
-	/*@modifies con @*/;
+void poptResetContext(poptContext con);
 
 /** \ingroup popt
  * Return value of next option found.
  * @param con		context
  * @return		next option val, -1 on last item, POPT_ERROR_* on error
  */
-int poptGetNextOpt(/*@null@*/poptContext con)
-	/*@globals fileSystem, internalState @*/
-	/*@modifies con, fileSystem, internalState @*/;
+int poptGetNextOpt(poptContext con);
 
 /** \ingroup popt
  * Return next option argument (if any).
  * @param con		context
  * @return		option argument, NULL if no argument is available
  */
-/*@observer@*/ /*@null@*/ /*@unused@*/
-char * poptGetOptArg(/*@null@*/poptContext con)
-	/*@modifies con @*/;
+char * poptGetOptArg(poptContext con);
 
 /** \ingroup popt
  * Return next argument.
  * @param con		context
  * @return		next argument, NULL if no argument is available
  */
-/*@observer@*/ /*@null@*/ /*@unused@*/
-const char * poptGetArg(/*@null@*/poptContext con)
-	/*@modifies con @*/;
+const char * poptGetArg(poptContext con);
 
 /** \ingroup popt
  * Peek at current argument.
  * @param con		context
  * @return		current argument, NULL if no argument is available
  */
-/*@observer@*/ /*@null@*/ /*@unused@*/
-const char * poptPeekArg(/*@null@*/poptContext con)
+const char * poptPeekArg(poptContext con)
 	/*@*/;
 
 /** \ingroup popt
@@ -340,9 +294,7 @@ const char * poptPeekArg(/*@null@*/poptContext con)
  * @param con		context
  * @return		argument array, NULL terminated
  */
-/*@observer@*/ /*@null@*/
-const char ** poptGetArgs(/*@null@*/poptContext con)
-	/*@modifies con @*/;
+const char ** poptGetArgs(poptContext con);
 
 /** \ingroup popt
  * Return the option which caused the most recent error.
@@ -350,8 +302,7 @@ const char ** poptGetArgs(/*@null@*/poptContext con)
  * @param flags
  * @return		offending option
  */
-/*@observer@*/
-const char * poptBadOption(/*@null@*/poptContext con, unsigned int flags)
+const char * poptBadOption(poptContext con, unsigned int flags)
 	/*@*/;
 
 /** \ingroup popt
@@ -360,9 +311,7 @@ const char * poptBadOption(/*@null@*/poptContext con, unsigned int flags)
  * @param argv		argument array, NULL terminated
  * @return		0 on success, POPT_ERROR_OPTSTOODEEP on failure
  */
-/*@unused@*/
-int poptStuffArgs(poptContext con, /*@keep@*/ const char ** argv)
-	/*@modifies con @*/;
+int poptStuffArgs(poptContext con, const char ** argv);
 
 /** \ingroup popt
  * Add alias to context.
@@ -373,9 +322,7 @@ int poptStuffArgs(poptContext con, /*@keep@*/ const char ** argv)
  * @param flags		(unused)
  * @return		0 on success
  */
-/*@unused@*/
-int poptAddAlias(poptContext con, struct poptAlias alias, int flags)
-	/*@modifies con @*/;
+int poptAddAlias(poptContext con, struct poptAlias alias, int flags);
 
 /** \ingroup popt
  * Add alias/exec item to context.
@@ -384,17 +331,14 @@ int poptAddAlias(poptContext con, struct poptAlias alias, int flags)
  * @param flags		0 for alias, 1 for exec
  * @return		0 on success
  */
-int poptAddItem(poptContext con, poptItem newItem, int flags)
-	/*@modifies con @*/;
+int poptAddItem(poptContext con, poptItem newItem, int flags);
 
 /** \ingroup popt
  * Perform sanity checks on a file path.
  * @param fn		file name
  * @return		0 on OK, 1 on NOTOK.
  */
-int poptSaneFile(const char * fn)
-	/*@globals errno, internalState @*/
-	/*@modifies errno, internalState @*/;
+int poptSaneFile(const char * fn);
 
 /**
  * Read a file into a buffer.
@@ -404,10 +348,8 @@ int poptSaneFile(const char * fn)
  * @param flags		1 to trim escaped newlines
  * return		0 on success
  */
-int poptReadFile(const char * fn, /*@null@*/ /*@out@*/ char ** bp,
-		/*@null@*/ /*@out@*/ size_t * nbp, int flags)
-	/*@globals errno, fileSystem, internalState @*/
-	/*@modifies *bp, *nbp, errno, fileSystem, internalState @*/;
+int poptReadFile(const char * fn, char ** bp,
+		size_t * nbp, int flags);
 #define	POPT_READFILE_TRIMNEWLINES	1
 
 /** \ingroup popt
@@ -416,10 +358,7 @@ int poptReadFile(const char * fn, /*@null@*/ /*@out@*/ char ** bp,
  * @param fn		file name to read
  * @return		0 on success, POPT_ERROR_ERRNO on failure
  */
-int poptReadConfigFile(poptContext con, const char * fn)
-	/*@globals errno, fileSystem, internalState @*/
-	/*@modifies con->execs, con->numExecs,
-		errno, fileSystem, internalState @*/;
+int poptReadConfigFile(poptContext con, const char * fn);
 
 /** \ingroup popt
  * Read configuration file(s).
@@ -430,10 +369,7 @@ int poptReadConfigFile(poptContext con, const char * fn)
  * @param paths		colon separated file name(s) to read
  * @return		0 on success, POPT_ERROR_BADCONFIG on failure
  */
-int poptReadConfigFiles(poptContext con, /*@null@*/ const char * paths)
-	/*@globals errno, fileSystem, internalState @*/
-	/*@modifies con->execs, con->numExecs,
-		errno, fileSystem, internalState @*/;
+int poptReadConfigFiles(poptContext con, const char * paths);
 
 /** \ingroup popt
  * Read default configuration from /etc/popt and $HOME/.popt.
@@ -441,11 +377,7 @@ int poptReadConfigFiles(poptContext con, /*@null@*/ const char * paths)
  * @param useEnv	(unused)
  * @return		0 on success, POPT_ERROR_ERRNO on failure
  */
-/*@unused@*/
-int poptReadDefaultConfig(poptContext con, /*@unused@*/ int useEnv)
-	/*@globals fileSystem, internalState @*/
-	/*@modifies con->execs, con->numExecs,
-		fileSystem, internalState @*/;
+int poptReadDefaultConfig(poptContext con, int useEnv);
 
 /** \ingroup popt
  * Duplicate an argument array.
@@ -458,10 +390,9 @@ int poptReadDefaultConfig(poptContext con, /*@unused@*/ int useEnv)
  * @retval argvPtr	address of returned argument array
  * @return		0 on success, POPT_ERROR_NOARG on failure
  */
-int poptDupArgv(int argc, /*@null@*/ const char **argv,
-		/*@null@*/ /*@out@*/ int * argcPtr,
-		/*@null@*/ /*@out@*/ const char *** argvPtr)
-	/*@modifies *argcPtr, *argvPtr @*/;
+int poptDupArgv(int argc, const char **argv,
+		int * argcPtr,
+		const char *** argvPtr);
 
 /** \ingroup popt
  * Parse a string into an argument array.
@@ -475,8 +406,7 @@ int poptDupArgv(int argc, /*@null@*/ const char **argv,
  * @retval argvPtr	address of returned argument array
  */
 int poptParseArgvString(const char * s,
-		/*@out@*/ int * argcPtr, /*@out@*/ const char *** argvPtr)
-	/*@modifies *argcPtr, *argvPtr @*/;
+		int * argcPtr, const char *** argvPtr);
 
 /** \ingroup popt
  * Parses an input configuration file and returns an string that is a 
@@ -524,20 +454,14 @@ this_is   =   fdsafdas
  * @return		0 on success
  * @see			poptParseArgvString
  */
-/*@-fcnuse@*/
-int poptConfigFileToString(FILE *fp, /*@out@*/ char ** argstrp, int flags)
-	/*@globals fileSystem @*/
-	/*@modifies *fp, *argstrp, fileSystem @*/;
-/*@=fcnuse@*/
+int poptConfigFileToString(FILE *fp, char ** argstrp, int flags);
 
 /** \ingroup popt
  * Return formatted error string for popt failure.
  * @param error		popt error
  * @return		error string
  */
-/*@observer@*/
-const char * poptStrerror(const int error)
-	/*@*/;
+const char * poptStrerror(const int error);
 
 /** \ingroup popt
  * Limit search for executables.
@@ -545,9 +469,7 @@ const char * poptStrerror(const int error)
  * @param path		single path to search for executables
  * @param allowAbsolute	absolute paths only?
  */
-/*@unused@*/
-void poptSetExecPath(poptContext con, const char * path, int allowAbsolute)
-	/*@modifies con @*/;
+void poptSetExecPath(poptContext con, const char * path, int allowAbsolute);
 
 /** \ingroup popt
  * Print detailed description of options.
@@ -555,9 +477,7 @@ void poptSetExecPath(poptContext con, const char * path, int allowAbsolute)
  * @param fp		ouput file handle
  * @param flags		(unused)
  */
-void poptPrintHelp(poptContext con, FILE * fp, /*@unused@*/ int flags)
-	/*@globals fileSystem @*/
-	/*@modifies fp, fileSystem @*/;
+void poptPrintHelp(poptContext con, FILE * fp, int flags);
 
 /** \ingroup popt
  * Print terse description of options.
@@ -565,30 +485,22 @@ void poptPrintHelp(poptContext con, FILE * fp, /*@unused@*/ int flags)
  * @param fp		ouput file handle
  * @param flags		(unused)
  */
-void poptPrintUsage(poptContext con, FILE * fp, /*@unused@*/ int flags)
-	/*@globals fileSystem @*/
-	/*@modifies fp, fileSystem @*/;
+void poptPrintUsage(poptContext con, FILE * fp, int flags);
 
 /** \ingroup popt
  * Provide text to replace default "[OPTION...]" in help/usage output.
  * @param con		context
  * @param text		replacement text
  */
-/*@-fcnuse@*/
-void poptSetOtherOptionHelp(poptContext con, const char * text)
-	/*@modifies con @*/;
-/*@=fcnuse@*/
+void poptSetOtherOptionHelp(poptContext con, const char * text);
 
 /** \ingroup popt
  * Return argv[0] from context.
  * @param con		context
  * @return		argv[0]
  */
-/*@-fcnuse@*/
-/*@observer@*/
 const char * poptGetInvocationName(poptContext con)
 	/*@*/;
-/*@=fcnuse@*/
 
 /** \ingroup popt
  * Shuffle argv pointers to remove stripped args, returns new argc.
@@ -597,10 +509,7 @@ const char * poptGetInvocationName(poptContext con)
  * @param argv		arg vector
  * @return		new argc
  */
-/*@-fcnuse@*/
-int poptStrippedArgv(poptContext con, int argc, char ** argv)
-	/*@modifies *argv @*/;
-/*@=fcnuse@*/
+int poptStrippedArgv(poptContext con, int argc, char ** argv);
 
 /**
  * Add a string to an argv array.
@@ -609,10 +518,8 @@ int poptStrippedArgv(poptContext con, int argc, char ** argv)
  * @param val		string arg to add (using strdup)
  * @return		0 on success, POPT_ERROR_NULLARG/POPT_ERROR_BADOPERATION
  */
-/*@unused@*/
-int poptSaveString(/*@null@*/ const char *** argvp, unsigned int argInfo,
-		/*@null@*/const char * val)
-	/*@modifies *argvp @*/;
+int poptSaveString(const char *** argvp, unsigned int argInfo,
+		const char * val);
 
 /**
  * Save a long long, performing logical operation with value.
@@ -622,14 +529,8 @@ int poptSaveString(/*@null@*/ const char *** argvp, unsigned int argInfo,
  * @param aLongLong	value to use
  * @return		0 on success, POPT_ERROR_NULLARG/POPT_ERROR_BADOPERATION
  */
-/*@-incondefs@*/
-/*@unused@*/
-int poptSaveLongLong(/*@null@*/ long long * arg, unsigned int argInfo,
-		long long aLongLong)
-	/*@globals internalState @*/
-	/*@modifies *arg, internalState @*/
-	/*@requires maxSet(arg) >= 0 /\ maxRead(arg) == 0 @*/;
-/*@=incondefs@*/
+int poptSaveLongLong(long long * arg, unsigned int argInfo,
+		long long aLongLong);
 
 /**
  * Save a long, performing logical operation with value.
@@ -639,13 +540,7 @@ int poptSaveLongLong(/*@null@*/ long long * arg, unsigned int argInfo,
  * @param aLong		value to use
  * @return		0 on success, POPT_ERROR_NULLARG/POPT_ERROR_BADOPERATION
  */
-/*@-incondefs@*/
-/*@unused@*/
-int poptSaveLong(/*@null@*/ long * arg, unsigned int argInfo, long aLong)
-	/*@globals internalState @*/
-	/*@modifies *arg, internalState @*/
-	/*@requires maxSet(arg) >= 0 /\ maxRead(arg) == 0 @*/;
-/*@=incondefs@*/
+int poptSaveLong(long * arg, unsigned int argInfo, long aLong);
 
 /**
  * Save a short integer, performing logical operation with value.
@@ -655,13 +550,7 @@ int poptSaveLong(/*@null@*/ long * arg, unsigned int argInfo, long aLong)
  * @param aLong		value to use
  * @return		0 on success, POPT_ERROR_NULLARG/POPT_ERROR_BADOPERATION
  */
-/*@-incondefs@*/
-/*@unused@*/
-int poptSaveShort(/*@null@*/ short * arg, unsigned int argInfo, long aLong)
-	/*@globals internalState @*/
-	/*@modifies *arg, internalState @*/
-	/*@requires maxSet(arg) >= 0 /\ maxRead(arg) == 0 @*/;
-/*@=incondefs@*/
+int poptSaveShort(short * arg, unsigned int argInfo, long aLong);
 
 /**
  * Save an integer, performing logical operation with value.
@@ -671,54 +560,28 @@ int poptSaveShort(/*@null@*/ short * arg, unsigned int argInfo, long aLong)
  * @param aLong		value to use
  * @return		0 on success, POPT_ERROR_NULLARG/POPT_ERROR_BADOPERATION
  */
-/*@-incondefs@*/
-/*@unused@*/
-int poptSaveInt(/*@null@*/ int * arg, unsigned int argInfo, long aLong)
-	/*@globals internalState @*/
-	/*@modifies *arg, internalState @*/
-	/*@requires maxSet(arg) >= 0 /\ maxRead(arg) == 0 @*/;
-/*@=incondefs@*/
+int poptSaveInt(int * arg, unsigned int argInfo, long aLong);
 
 /* The bit set typedef. */
-/*@-exporttype@*/
 typedef struct poptBits_s {
     unsigned int bits[1];
 } * poptBits;
-/*@=exporttype@*/
 
 #define _POPT_BITS_N    1024U    /* estimated population */
 #define _POPT_BITS_M    ((3U * _POPT_BITS_N) / 2U)
 #define _POPT_BITS_K    16U      /* no. of linear hash combinations */
 
-/*@-exportlocal -exportvar -globuse @*/
-/*@unchecked@*/
 extern unsigned int _poptBitsN;
-/*@unchecked@*/
 extern  unsigned int _poptBitsM;
-/*@unchecked@*/
 extern  unsigned int _poptBitsK;
-/*@=exportlocal =exportvar =globuse @*/
 
-/*@-exportlocal@*/
-int poptBitsAdd(/*@null@*/poptBits bits, /*@null@*/const char * s)
-	/*@modifies bits @*/;
-/*@=exportlocal@*/
-int poptBitsChk(/*@null@*/poptBits bits, /*@null@*/const char * s)
-	/*@*/;
-int poptBitsClr(/*@null@*/poptBits bits)
-	/*@modifies bits @*/;
-/*@-exportlocal@*/
-int poptBitsDel(/*@null@*/poptBits bits, /*@null@*/const char * s)
-	/*@modifies bits @*/;
-/*@-fcnuse@*/
-int poptBitsIntersect(/*@null@*/ poptBits * ap, /*@null@*/ const poptBits b)
-	/*@modifies *ap @*/;
-int poptBitsUnion(/*@null@*/ poptBits * ap, /*@null@*/ const poptBits b)
-	/*@modifies *ap @*/;
-int poptBitsArgs(/*@null@*/ poptContext con, /*@null@*/ poptBits * ap)
-	/*@modifies con, *ap @*/;
-/*@=fcnuse@*/
-/*@=exportlocal@*/
+int poptBitsAdd(poptBits bits, const char * s);
+int poptBitsChk(poptBits bits, const char * s);
+int poptBitsClr(poptBits bits);
+int poptBitsDel(poptBits bits, const char * s);
+int poptBitsIntersect(poptBits * ap, const poptBits b);
+int poptBitsUnion(poptBits * ap, const poptBits b);
+int poptBitsArgs(poptContext con, poptBits * ap);
 
 /**
  * Save a string into a bit set (experimental).
@@ -727,15 +590,9 @@ int poptBitsArgs(/*@null@*/ poptContext con, /*@null@*/ poptBits * ap)
  * @param s		string to add to bit set
  * @return		0 on success, POPT_ERROR_NULLARG/POPT_ERROR_BADOPERATION
  */
-/*@-incondefs@*/
-/*@unused@*/
-int poptSaveBits(/*@null@*/ poptBits * bitsp, unsigned int argInfo,
-		/*@null@*/ const char * s)
-	/*@globals _poptBitsN, _poptBitsM, _poptBitsK, internalState @*/
-	/*@modifies *bitsp, _poptBitsN, _poptBitsM, _poptBitsK, internalState @*/;
-/*@=incondefs@*/
+int poptSaveBits(poptBits * bitsp, unsigned int argInfo,
+		const char * s);
 
-/*@=type@*/
 
 #ifdef  __cplusplus
 }
diff --git a/poptconfig.c b/poptconfig.c
index 7840d0c..ba2a54b 100644
--- a/poptconfig.c
+++ b/poptconfig.c
@@ -13,41 +13,16 @@
 #if defined(HAVE_FNMATCH_H)
 #include <fnmatch.h>
 
-#if defined(__LCLINT__)
-/*@-declundef -exportheader -incondefs -protoparammatch -redecl -type @*/
-extern int fnmatch (const char *__pattern, const char *__name, int __flags)
-	/*@*/;
-/*@=declundef =exportheader =incondefs =protoparammatch =redecl =type @*/
-#endif	/* __LCLINT__ */
 #endif
 
 #if defined(HAVE_GLOB_H)
 #include <glob.h>
 
-#if defined(__LCLINT__)
-/*@-declundef -exportheader -incondefs -protoparammatch -redecl -type @*/
-extern int glob (const char *__pattern, int __flags,
-		/*@null@*/ int (*__errfunc) (const char *, int),
-		/*@out@*/ glob_t *__pglob)
-	/*@globals errno, fileSystem @*/
-	/*@modifies *__pglob, errno, fileSystem @*/;
-
-/* XXX only annotation is a white lie */
-extern void globfree (/*@only@*/ glob_t *__pglob)
-	/*@modifies *__pglob @*/;
-
-/* XXX _GNU_SOURCE ifdef and/or retrofit is needed for portability. */
-extern int glob_pattern_p (const char *__pattern, int __quote)
-        /*@*/;
-/*@=declundef =exportheader =incondefs =protoparammatch =redecl =type @*/
-#endif	/* __LCLINT__ */
-
 #if !defined(__GLIBC__)
 /* Return nonzero if PATTERN contains any metacharacters.
    Metacharacters can be quoted with backslashes if QUOTE is nonzero.  */
 static int
 glob_pattern_p (const char * pattern, int quote)
-	/*@*/
 {
     const char * p;
     int open = 0;
@@ -57,29 +32,27 @@ glob_pattern_p (const char * pattern, int quote)
     case '?':
     case '*':
 	return 1;
-	/*@notreached@*/ /*@switchbreak@*/ break;
+	break;
     case '\\':
 	if (quote && p[1] != '\0')
 	  ++p;
-	/*@switchbreak@*/ break;
+	break;
     case '[':
 	open = 1;
-	/*@switchbreak@*/ break;
+	break;
     case ']':
 	if (open)
 	  return 1;
-	/*@switchbreak@*/ break;
+	break;
     }
     return 0;
 }
 #endif	/* !defined(__GLIBC__) */
 
-/*@unchecked@*/
 static int poptGlobFlags = 0;
 
-static int poptGlob_error(/*@unused@*/ UNUSED(const char * epath),
-		/*@unused@*/ UNUSED(int eerrno))
-	/*@*/
+static int poptGlob_error(UNUSED(const char * epath),
+		UNUSED(int eerrno))
 {
     return 1;
 }
@@ -93,9 +66,8 @@ static int poptGlob_error(/*@unused@*/ UNUSED(const char * epath),
  * @retval *avp		array of paths
  * @return		0 on success
  */
-static int poptGlob(/*@unused@*/ UNUSED(poptContext con), const char * pattern,
-		/*@out@*/ int * acp, /*@out@*/ const char *** avp)
-	/*@modifies *acp, *avp @*/
+static int poptGlob(UNUSED(poptContext con), const char * pattern,
+		int * acp, const char *** avp)
 {
     const char * pat = pattern;
     int rc = 0;		/* assume success */
@@ -114,14 +86,10 @@ static int poptGlob(/*@unused@*/ UNUSED(poptContext con), const char * pattern,
 		pglob->gl_pathc = 0;
 	    }
 	    if (avp) {
-/*@-onlytrans@*/
 		*avp = (const char **) pglob->gl_pathv;
-/*@=onlytrans@*/
 		pglob->gl_pathv = NULL;
 	    }
-/*@-nullstate@*/
 	    globfree(pglob);
-/*@=nullstate@*/
 	} else
 	    rc = POPT_ERROR_ERRNO;
     } else
@@ -136,7 +104,6 @@ static int poptGlob(/*@unused@*/ UNUSED(poptContext con), const char * pattern,
     return rc;
 }
 
-/*@access poptContext @*/
 
 int poptSaneFile(const char * fn)
 {
@@ -149,10 +116,8 @@ int poptSaneFile(const char * fn)
 	return 0;
     if (!S_ISREG(sb.st_mode))
 	return 0;
-/*@-bitwisesigned@*/
     if (sb.st_mode & (S_IWGRP|S_IWOTH))
 	return 0;
-/*@=bitwisesigned@*/
     return 1;
 }
 
@@ -187,9 +152,7 @@ int poptReadFile(const char * fn, char ** bp, size_t * nbp, int flags)
     rc = 0;
 
    /* Trim out escaped newlines. */
-/*@-bitwisesigned@*/
     if (flags & POPT_READFILE_TRIMNEWLINES)
-/*@=bitwisesigned@*/
     {
 	for (t = b, s = b, se = b + nb; *s && s < se; s++) {
 	    switch (*s) {
@@ -198,10 +161,10 @@ int poptReadFile(const char * fn, char ** bp, size_t * nbp, int flags)
 		    s++;
 		    continue;
 		}
-		/*@fallthrough@*/
+		/* fallthrough */
 	    default:
 		*t++ = *s;
-		/*@switchbreak@*/ break;
+		break;
 	    }
 	}
 	*t++ = '\0';
@@ -210,24 +173,18 @@ int poptReadFile(const char * fn, char ** bp, size_t * nbp, int flags)
 
 exit:
     if (rc != 0) {
-/*@-usedef@*/
 	if (b)
 	    free(b);
-/*@=usedef@*/
 	b = NULL;
 	nb = 0;
     }
     if (bp)
 	*bp = b;
-/*@-usereleased@*/
     else if (b)
 	free(b);
-/*@=usereleased@*/
     if (nbp)
 	*nbp = (size_t)nb;
-/*@-compdef -nullstate @*/	/* XXX cannot annotate char ** correctly */
     return rc;
-/*@=compdef =nullstate @*/
 }
 
 /**
@@ -237,7 +194,6 @@ exit:
  * return		0 if config application matches
  */
 static int configAppMatch(poptContext con, const char * s)
-	/*@*/
 {
     int rc = 1;
 
@@ -246,12 +202,10 @@ static int configAppMatch(poptContext con, const char * s)
 
 #if defined(HAVE_GLOB_H) && defined(HAVE_FNMATCH_H)
     if (glob_pattern_p(s, 1)) {
-/*@-bitwisesigned@*/
 	static int flags = FNM_PATHNAME | FNM_PERIOD;
 #ifdef FNM_EXTMATCH
 	flags |= FNM_EXTMATCH;
 #endif
-/*@=bitwisesigned@*/
 	rc = fnmatch(s, con->appName, flags);
     } else
 #endif
@@ -259,10 +213,7 @@ static int configAppMatch(poptContext con, const char * s)
     return rc;
 }
 
-/*@-compmempass@*/	/* FIX: item->option.longName kept, not dependent. */
 static int poptConfigLine(poptContext con, char * line)
-	/*@globals fileSystem, internalState @*/
-	/*@modifies con, fileSystem, internalState @*/
 {
     char *b = NULL;
     size_t nb = 0;
@@ -304,7 +255,6 @@ static int poptConfigLine(poptContext con, char * line)
     while (*se != '\0' && _isspaceptr(se)) se++;
     if (opt[0] == '-' && *se == '\0') goto exit;
 
-/*@-temptrans@*/ /* FIX: line alias is saved */
     if (opt[0] == '-' && opt[1] == '-')
 	item->option.longName = opt + 2;
     else if (opt[0] == '-' && opt[2] == '\0')
@@ -343,11 +293,9 @@ static int poptConfigLine(poptContext con, char * line)
 		item->option.shortName = longName[0];
 	}
     }
-/*@=temptrans@*/
 
     if (poptParseArgvString(se, &item->argc, &item->argv)) goto exit;
 
-/*@-modobserver@*/
     item->option.argInfo = POPT_ARGFLAG_DOC_HIDDEN;
     for (i = 0, j = 0; i < item->argc; i++, j++) {
 	const char * f;
@@ -373,21 +321,17 @@ static int poptConfigLine(poptContext con, char * line)
 	item->argv[j] = NULL;
 	item->argc = j;
     }
-/*@=modobserver@*/
 	
-/*@-nullstate@*/ /* FIX: item->argv[] may be NULL */
     if (!strcmp(entryType, "alias"))
 	rc = poptAddItem(con, item, 0);
     else if (!strcmp(entryType, "exec"))
 	rc = poptAddItem(con, item, 1);
-/*@=nullstate@*/
 exit:
     rc = 0;	/* XXX for now, always return success */
     if (b)
 	free(b);
     return rc;
 }
-/*@=compmempass@*/
 
 int poptReadConfigFile(poptContext con, const char * fn)
 {
@@ -416,8 +360,7 @@ int poptReadConfigFile(poptContext con, const char * fn)
 	    while (*te && _isspaceptr(te)) te++;
 	    if (*te && *te != '#')
 		xx = poptConfigLine(con, te);
-	    /*@switchbreak@*/ break;
-/*@-usedef@*/	/* XXX *se may be uninitialized */
+	    break;
 	  case '\\':
 	    *te = *se++;
 	    /* \ at the end of a line does not insert a \n */
@@ -425,11 +368,10 @@ int poptReadConfigFile(poptContext con, const char * fn)
 		te++;
 		*te++ = *se;
 	    }
-	    /*@switchbreak@*/ break;
+	    break;
 	  default:
 	    *te++ = *se;
-	    /*@switchbreak@*/ break;
-/*@=usedef@*/
+	    break;
 	}
     }
 
@@ -468,7 +410,7 @@ int poptReadConfigFiles(poptContext con, const char * paths)
 	for (i = 0; i < ac; i++) {
 	    const char * fn = av[i];
 	    if (av[i] == NULL)	/* XXX can't happen */
-		/*@innercontinue@*/ continue;
+		continue;
 	    /* XXX should '@' attention be pushed into poptReadConfigFile? */
 	    if (p[0] == '@' && p[1] != '(') {
 		if (fn[0] == '@' && fn[1] != '(')
@@ -476,7 +418,7 @@ int poptReadConfigFiles(poptContext con, const char * paths)
 		xx = poptSaneFile(fn);
 		if (!xx && rc == 0)
 		    rc = POPT_ERROR_BADCONFIG;
-		/*@innercontinue@*/ continue;
+		continue;
 	    }
 	    xx = poptReadConfigFile(con, fn);
 	    if (xx && rc == 0)
@@ -488,15 +430,13 @@ int poptReadConfigFiles(poptContext con, const char * paths)
 	av = NULL;
     }
 
-/*@-usedef@*/
     if (buf)
 	free(buf);
-/*@=usedef@*/
 
     return rc;
 }
 
-int poptReadDefaultConfig(poptContext con, /*@unused@*/ UNUSED(int useEnv))
+int poptReadDefaultConfig(poptContext con, UNUSED(int useEnv))
 {
     static const char _popt_sysconfdir[] = POPT_SYSCONFDIR "/popt";
     static const char _popt_etc[] = "/etc/popt";
diff --git a/popthelp.c b/popthelp.c
index 4859980..435f8f9 100644
--- a/popthelp.c
+++ b/popthelp.c
@@ -18,11 +18,9 @@
 #define	POPT_WCHAR_HACK
 #ifdef 	POPT_WCHAR_HACK
 #include <wchar.h>			/* for mbsrtowcs */
-/*@access mbstate_t @*/
 #endif
 #include "poptint.h"
 
-/*@access poptContext@*/
 
 /**
  * Display arguments.
@@ -32,35 +30,28 @@
  * @param arg		(unused)
  * @param data		(unused)
  */
-/*@exits@*/
 static void displayArgs(poptContext con,
-		/*@unused@*/ UNUSED(enum poptCallbackReason foo),
+		UNUSED(enum poptCallbackReason foo),
 		struct poptOption * key, 
-		/*@unused@*/ UNUSED(const char * arg),
-		/*@unused@*/ UNUSED(void * data))
-	/*@globals fileSystem@*/
-	/*@modifies fileSystem@*/
+		UNUSED(const char * arg),
+		UNUSED(void * data))
 {
     if (key->shortName == '?')
 	poptPrintHelp(con, stdout, 0);
     else
 	poptPrintUsage(con, stdout, 0);
 
-#if !defined(__LCLINT__)	/* XXX keep both splint & valgrind happy */
     con = poptFreeContext(con);
-#endif
     exit(0);
 }
 
 #ifdef	NOTYET
-/*@unchecked@*/
 static int show_option_defaults = 0;
 #endif
 
 /**
  * Empty table marker to enable displaying popt alias/exec options.
  */
-/*@observer@*/ /*@unchecked@*/
 struct poptOption poptAliasOptions[] = {
     POPT_TABLEEND
 };
@@ -68,8 +59,6 @@ struct poptOption poptAliasOptions[] = {
 /**
  * Auto help table options.
  */
-/*@-castfcnptr@*/
-/*@observer@*/ /*@unchecked@*/
 struct poptOption poptHelpOptions[] = {
   { NULL, '\0', POPT_ARG_CALLBACK, (void *)displayArgs, 0, NULL, NULL },
   { "help", '?', 0, NULL, (int)'?', N_("Show this help message"), NULL },
@@ -77,11 +66,8 @@ struct poptOption poptHelpOptions[] = {
     POPT_TABLEEND
 } ;
 
-/*@observer@*/ /*@unchecked@*/
 static struct poptOption poptHelpOptions2[] = {
-/*@-readonlytrans@*/
   { NULL, '\0', POPT_ARG_INTL_DOMAIN, PACKAGE, 0, NULL, NULL},
-/*@=readonlytrans@*/
   { NULL, '\0', POPT_ARG_CALLBACK, (void *)displayArgs, 0, NULL, NULL },
   { "help", '?', 0, NULL, (int)'?', N_("Show this help message"), NULL },
   { "usage", '\0', 0, NULL, (int)'u', N_("Display brief usage message"), NULL },
@@ -93,9 +79,7 @@ static struct poptOption poptHelpOptions2[] = {
     POPT_TABLEEND
 } ;
 
-/*@observer@*/ /*@unchecked@*/
 struct poptOption * poptHelpOptionsI18N = poptHelpOptions2;
-/*@=castfcnptr@*/
 
 #define        _POPTHELP_MAXLINE       ((size_t)79)
 
@@ -110,7 +94,6 @@ typedef struct columns_s {
  * @return             no. of columns 
  */ 
 static size_t maxColumnWidth(FILE *fp)
-	/*@*/
 {   
     size_t maxcols = _POPTHELP_MAXLINE;
 #if defined(TIOCGWINSZ)
@@ -133,7 +116,6 @@ static size_t maxColumnWidth(FILE *fp)
  * @return		no. of display characters.
  */
 static inline size_t stringDisplayWidth(const char *s)
-	/*@*/
 {
     size_t n = strlen(s);
 #ifdef	POPT_WCHAR_HACK
@@ -154,9 +136,8 @@ static inline size_t stringDisplayWidth(const char *s)
 /**
  * @param opt		option(s)
  */
-/*@observer@*/ /*@null@*/ static const char *
-getTableTranslationDomain(/*@null@*/ const struct poptOption *opt)
-	/*@*/
+static const char *
+getTableTranslationDomain(const struct poptOption *opt)
 {
     if (opt != NULL)
     for (; opt->longName || opt->shortName || opt->arg; opt++) {
@@ -170,12 +151,10 @@ getTableTranslationDomain(/*@null@*/ const struct poptOption *opt)
  * @param opt		option(s)
  * @param translation_domain	translation domain
  */
-/*@observer@*/ /*@null@*/ static const char *
+static const char *
 getArgDescrip(const struct poptOption * opt,
-		/*@-paramuse@*/ /* FIX: i18n macros disabled with lclint */
-		/*@null@*/ const char * translation_domain)
-		/*@=paramuse@*/
-	/*@*/
+		/* FIX: i18n macros disabled with lclint */
+		const char * translation_domain)
 {
     if (!poptArgType(opt)) return NULL;
 
@@ -223,13 +202,11 @@ getArgDescrip(const struct poptOption * opt,
  * @param translation_domain	translation domain
  * @return
  */
-static /*@only@*/ /*@null@*/ char *
+static char *
 singleOptionDefaultValue(size_t lineLength,
 		const struct poptOption * opt,
-		/*@-paramuse@*/ /* FIX: i18n macros disabled with lclint */
-		/*@null@*/ const char * translation_domain)
-		/*@=paramuse@*/
-	/*@*/
+		/* FIX: i18n macros disabled with lclint */
+		const char * translation_domain)
 {
     const char * defstr = D_(translation_domain, "default");
     char * le = malloc(4*lineLength + 1);
@@ -288,7 +265,7 @@ singleOptionDefaultValue(size_t lineLength,
     default:
 	l = _free(l);
 	return NULL;
-	/*@notreached@*/ break;
+	break;
     }
   }
     *le++ = ')';
@@ -306,9 +283,7 @@ singleOptionDefaultValue(size_t lineLength,
  */
 static void singleOptionHelp(FILE * fp, columns_t columns,
 		const struct poptOption * opt,
-		/*@null@*/ const char * translation_domain)
-	/*@globals fileSystem @*/
-	/*@modifies fp, fileSystem @*/
+		const char * translation_domain)
 {
     size_t maxLeftCol = columns->cur;
     size_t indentLength = maxLeftCol + 5;
@@ -406,21 +381,19 @@ static void singleOptionHelp(FILE * fp, columns_t columns,
 		switch (ops) {
 		case POPT_ARGFLAG_OR:
 		    *le++ = '|';
-		    /*@innerbreak@*/ break;
+		    break;
 		case POPT_ARGFLAG_AND:
 		    *le++ = '&';
-		    /*@innerbreak@*/ break;
+		    break;
 		case POPT_ARGFLAG_XOR:
 		    *le++ = '^';
-		    /*@innerbreak@*/ break;
+		    break;
 		default:
-		    /*@innerbreak@*/ break;
+		    break;
 		}
 		*le++ = (opt->longName != NULL ? '=' : ' ');
 		if (negate) *le++ = '~';
-		/*@-formatconst@*/
 		le += sprintf(le, (ops ? "0x%lx" : "%ld"), aLong);
-		/*@=formatconst@*/
 		*le++ = ']';
 	    }
 #endif
@@ -487,9 +460,7 @@ static void singleOptionHelp(FILE * fp, columns_t columns,
 	    if (fmthelp) {
 		fmthelp[ch - help] = '\0';
 		sprintf(format, "%%s\n%%%ds", (int) indentLength);
-		/*@-formatconst@*/
 		xx = POPT_fprintf(fp, format, fmthelp, " ");
-		/*@=formatconst@*/
 		free(fmthelp);
 	    }
 	}
@@ -504,9 +475,7 @@ static void singleOptionHelp(FILE * fp, columns_t columns,
     help = NULL;
 
 out:
-    /*@-dependenttrans@*/
     defs = _free(defs);
-    /*@=dependenttrans@*/
     left = _free(left);
 }
 
@@ -517,8 +486,7 @@ out:
  * @return		display width
  */
 static size_t maxArgWidth(const struct poptOption * opt,
-		       /*@null@*/ const char * translation_domain)
-	/*@*/
+		       const char * translation_domain)
 {
     size_t max = 0;
     size_t len = 0;
@@ -568,11 +536,9 @@ static size_t maxArgWidth(const struct poptOption * opt,
  * @param translation_domain	translation domain
  */
 static void itemHelp(FILE * fp,
-		/*@null@*/ poptItem items, int nitems,
+		poptItem items, int nitems,
 		columns_t columns,
-		/*@null@*/ const char * translation_domain)
-	/*@globals fileSystem @*/
-	/*@modifies fp, fileSystem @*/
+		const char * translation_domain)
 {
     poptItem item;
     int i;
@@ -595,11 +561,9 @@ static void itemHelp(FILE * fp,
  * @param translation_domain	translation domain
  */
 static void singleTableHelp(poptContext con, FILE * fp,
-		/*@null@*/ const struct poptOption * table,
+		const struct poptOption * table,
 		columns_t columns,
-		/*@null@*/ const char * translation_domain)
-	/*@globals fileSystem @*/
-	/*@modifies fp, columns->cur, fileSystem @*/
+		const char * translation_domain)
 {
     const struct poptOption * opt;
     const char *sub_transdom;
@@ -640,8 +604,6 @@ static void singleTableHelp(poptContext con, FILE * fp,
  * @param fp		output file handle
  */
 static size_t showHelpIntro(poptContext con, FILE * fp)
-	/*@globals fileSystem @*/
-	/*@modifies fp, fileSystem @*/
 {
     size_t len = (size_t)6;
     int xx;
@@ -660,7 +622,7 @@ static size_t showHelpIntro(poptContext con, FILE * fp)
     return len;
 }
 
-void poptPrintHelp(poptContext con, FILE * fp, /*@unused@*/ UNUSED(int flags))
+void poptPrintHelp(poptContext con, FILE * fp, UNUSED(int flags))
 {
     columns_t columns = calloc((size_t)1, sizeof(*columns));
     int xx;
@@ -688,9 +650,7 @@ void poptPrintHelp(poptContext con, FILE * fp, /*@unused@*/ UNUSED(int flags))
  */
 static size_t singleOptionUsage(FILE * fp, columns_t columns,
 		const struct poptOption * opt,
-		/*@null@*/ const char *translation_domain)
-	/*@globals fileSystem @*/
-	/*@modifies fp, columns->cur, fileSystem @*/
+		const char *translation_domain)
 {
     size_t len = sizeof(" []")-1;
     const char * argDescrip = getArgDescrip(opt, translation_domain);
@@ -753,10 +713,8 @@ static size_t singleOptionUsage(FILE * fp, columns_t columns,
  * @param translation_domain	translation domain
  */
 static size_t itemUsage(FILE * fp, columns_t columns,
-		/*@null@*/ poptItem item, int nitems,
-		/*@null@*/ const char * translation_domain)
-	/*@globals fileSystem @*/
-	/*@modifies fp, columns->cur, fileSystem @*/
+		poptItem item, int nitems,
+		const char * translation_domain)
 {
     int i;
 
@@ -781,7 +739,6 @@ static size_t itemUsage(FILE * fp, columns_t columns,
 typedef struct poptDone_s {
     int nopts;
     int maxopts;
-/*@null@*/
     const void ** opts;
 } * poptDone;
 
@@ -796,11 +753,9 @@ typedef struct poptDone_s {
  * @return
  */
 static size_t singleTableUsage(poptContext con, FILE * fp, columns_t columns,
-		/*@null@*/ const struct poptOption * opt,
-		/*@null@*/ const char * translation_domain,
-		/*@null@*/ poptDone done)
-	/*@globals fileSystem @*/
-	/*@modifies fp, columns->cur, done, fileSystem @*/
+		const struct poptOption * opt,
+		const char * translation_domain,
+		poptDone done)
 {
     if (opt != NULL)
     for (; (opt->longName || opt->shortName || opt->arg) ; opt++) {
@@ -814,8 +769,8 @@ static size_t singleTableUsage(poptContext con, FILE * fp, columns_t columns,
 		for (i = 0; i < done->nopts; i++) {
 		    const void * that = done->opts[i];
 		    if (that == NULL || that != opt->arg)
-			/*@innercontinue@*/ continue;
-		    /*@innerbreak@*/ break;
+			continue;
+		    break;
 		}
 		/* Skip if this table has already been processed. */
 		if (opt->arg == NULL || i < done->nopts)
@@ -843,10 +798,7 @@ static size_t singleTableUsage(poptContext con, FILE * fp, columns_t columns,
  * @return		length of display string
  */
 static size_t showShortOptions(const struct poptOption * opt, FILE * fp,
-		/*@null@*/ char * str)
-	/*@globals fileSystem @*/
-	/*@modifies str, *fp, fileSystem @*/
-	/*@requires maxRead(str) >= 0 @*/
+		char * str)
 {
     /* bufsize larger then the ascii set, lazy allocation on top level call. */
     size_t nb = (size_t)300;
@@ -874,14 +826,12 @@ static size_t showShortOptions(const struct poptOption * opt, FILE * fp,
 	fprintf(fp, " [-%s]", s);
 	len = strlen(s) + sizeof(" [-]")-1;
     }
-/*@-temptrans@*/	/* LCL: local s, not str arg, is being freed. */
     if (s != str)
 	free(s);
-/*@=temptrans@*/
     return len;
 }
 
-void poptPrintUsage(poptContext con, FILE * fp, /*@unused@*/ UNUSED(int flags))
+void poptPrintUsage(poptContext con, FILE * fp, UNUSED(int flags))
 {
     columns_t columns = calloc((size_t)1, sizeof(*columns));
     struct poptDone_s done_buf;
@@ -894,10 +844,8 @@ void poptPrintUsage(poptContext con, FILE * fp, /*@unused@*/ UNUSED(int flags))
     columns->cur = done->maxopts * sizeof(*done->opts);
     columns->max = maxColumnWidth(fp);
     done->opts = calloc((size_t)1, columns->cur);
-    /*@-keeptrans@*/
     if (done->opts != NULL)
 	done->opts[done->nopts++] = (const void *) con->options;
-    /*@=keeptrans@*/
 
     columns->cur = showHelpIntro(con, fp);
     columns->cur += showShortOptions(con->options, fp, NULL);
diff --git a/poptint.c b/poptint.c
index 83fa7d6..e5f6000 100644
--- a/poptint.c
+++ b/poptint.c
@@ -7,8 +7,6 @@
 #define	jlu32lpair	poptJlu32lpair
 #include "lookup3.c"
 
-/*@-varuse +charint +ignoresigns @*/
-/*@unchecked@*/ /*@observer@*/
 static const unsigned char utf8_skip_data[256] = {
     1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,
     1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,
@@ -19,7 +17,6 @@ static const unsigned char utf8_skip_data[256] = {
     2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,
     3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,4,4,4,4,4,4,4,4,5,5,5,5,6,6,1,1
 };
-/*@=varuse =charint =ignoresigns @*/
 
 const char *
 POPT_prev_char (const char *str)
@@ -48,7 +45,7 @@ POPT_next_char (const char *str)
 
 #if !defined(POPT_fprintf)	/* XXX lose all the goop ... */
 
-#if defined(HAVE_DCGETTEXT) && !defined(__LCLINT__)
+#if defined(HAVE_DCGETTEXT)
 /*
  * Rebind a "UTF-8" codeset for popt's internal use.
  */
@@ -75,9 +72,8 @@ POPT_dgettext(const char * dom, const char * str)
  * @param istr		input string (UTF-8 encoding assumed)
  * @return		localized string
  */
-static /*@only@*/ /*@null@*/ char *
-strdup_locale_from_utf8 (/*@null@*/ char * istr)
-	/*@*/
+static char *
+strdup_locale_from_utf8 (char * istr)
 {
     char * codeset = NULL;
     char * ostr = NULL;
@@ -95,7 +91,6 @@ strdup_locale_from_utf8 (/*@null@*/ char * istr)
     {
 	char * shift_pin = NULL;
 	size_t db = strlen(istr);
-/*@owned@*/
 	char * dstr = malloc((db + 1) * sizeof(*dstr));
 	char * pin = istr;
 	char * pout = dstr;
@@ -127,11 +122,11 @@ strdup_locale_from_utf8 (/*@null@*/ char * istr)
 		    ob = db - used;
 		    continue;
 		}
-	    }   /*@switchbreak@*/ break;
+	    }   break;
 	    case EINVAL:
 	    case EILSEQ:
 	    default:
-		/*@switchbreak@*/ break;
+		break;
 	    }
 	    break;
 	}
@@ -153,7 +148,7 @@ POPT_fprintf (FILE * stream, const char * format, ...)
     int rc;
     va_list ap;
 
-#if defined(HAVE_VASPRINTF) && !defined(__LCLINT__)
+#if defined(HAVE_VASPRINTF)
     va_start(ap, format);
     if ((rc = vasprintf(&b, format, ap)) < 0)
 	b = NULL;
diff --git a/poptint.h b/poptint.h
index 80cbaca..a9cbf44 100644
--- a/poptint.h
+++ b/poptint.h
@@ -16,26 +16,21 @@
  * @param p		memory to free
  * @retval		NULL always
  */
-/*@unused@*/ static inline /*@null@*/ void *
-_free(/*@only@*/ /*@null@*/ const void * p)
-	/*@modifies p @*/
+static inline void *
+_free(const void * p)
 {
     if (p != NULL)	free((void *)p);
     return NULL;
 }
 
 /* Bit mask macros. */
-/*@-exporttype -redef @*/
 typedef	unsigned int __pbm_bits;
-/*@=exporttype =redef @*/
 #define	__PBM_NBITS		(8 * sizeof (__pbm_bits))
 #define	__PBM_IX(d)		((d) / __PBM_NBITS)
 #define __PBM_MASK(d)		((__pbm_bits) 1 << (((unsigned)(d)) % __PBM_NBITS))
-/*@-exporttype -redef @*/
 typedef struct {
     __pbm_bits bits[1];
 } pbm_set;
-/*@=exporttype =redef @*/
 #define	__PBM_BITS(set)	((set)->bits)
 
 #define	PBM_ALLOC(d)	calloc(__PBM_IX (d) + 1, sizeof(__pbm_bits))
@@ -44,24 +39,19 @@ typedef struct {
 #define PBM_CLR(d, s)   (__PBM_BITS (s)[__PBM_IX (d)] &= ~__PBM_MASK (d))
 #define PBM_ISSET(d, s) ((__PBM_BITS (s)[__PBM_IX (d)] & __PBM_MASK (d)) != 0)
 
-extern void poptJlu32lpair(/*@null@*/ const void *key, size_t size,
-                uint32_t *pc, uint32_t *pb)
-        /*@modifies *pc, *pb@*/;
+extern void poptJlu32lpair(const void *key, size_t size,
+                uint32_t *pc, uint32_t *pb);
 
 /** \ingroup popt
  * Typedef's for string and array of strings.
  */
-/*@-exporttype@*/
 typedef const char * poptString;
 typedef poptString * poptArgv;
-/*@=exporttype@*/
 
 /** \ingroup popt
  * A union to simplify opt->arg access without casting.
  */
-/*@-exporttype -fielduse@*/
 typedef union poptArg_u {
-/*@shared@*/
     void * ptr;
     int * intp;
     short * shortp;
@@ -71,17 +61,11 @@ typedef union poptArg_u {
     double * doublep;
     const char ** argv;
     poptCallbackType cb;
-/*@shared@*/
     poptOption opt;
 } poptArg;
-/*@=exporttype =fielduse@*/
 
-/*@-exportvar@*/
-/*@unchecked@*/
 extern unsigned int _poptArgMask;
-/*@unchecked@*/
 extern unsigned int _poptGroupMask;
-/*@=exportvar@*/
 
 #define	poptArgType(_opt)	((_opt)->argInfo & _poptArgMask)
 #define	poptGroup(_opt)		((_opt)->argInfo & _poptGroupMask)
@@ -92,60 +76,41 @@ extern unsigned int _poptGroupMask;
 
 /* XXX sick hack to preserve pretense of a popt-1.x ABI. */
 #define	poptSubstituteHelpI18N(opt) \
-  { /*@-observertrans@*/ \
-    if ((opt) == poptHelpOptions) (opt) = poptHelpOptionsI18N; \
-    /*@=observertrans@*/ }
+  { if ((opt) == poptHelpOptions) (opt) = poptHelpOptionsI18N; }
 
 struct optionStackEntry {
     int argc;
-/*@only@*/ /*@null@*/
     poptArgv argv;
-/*@only@*/ /*@null@*/
     pbm_set * argb;
     int next;
-/*@only@*/ /*@null@*/
     char * nextArg;
-/*@observer@*/ /*@null@*/
     const char * nextCharArg;
-/*@dependent@*/ /*@null@*/
     poptItem currAlias;
     int stuffed;
 };
 
 struct poptContext_s {
     struct optionStackEntry optionStack[POPT_OPTION_DEPTH];
-/*@dependent@*/
     struct optionStackEntry * os;
-/*@owned@*/ /*@null@*/
     poptArgv leftovers;
     int numLeftovers;
     int nextLeftover;
-/*@keep@*/
     const struct poptOption * options;
     int restLeftover;
-/*@only@*/ /*@null@*/
     const char * appName;
-/*@only@*/ /*@null@*/
     poptItem aliases;
     int numAliases;
     unsigned int flags;
-/*@owned@*/ /*@null@*/
     poptItem execs;
     int numExecs;
-/*@only@*/ /*@null@*/
     poptArgv finalArgv;
     int finalArgvCount;
     int finalArgvAlloced;
-/*@null@*/
     int (*maincall) (int argc, const char **argv);
-/*@dependent@*/ /*@null@*/
     poptItem doExec;
-/*@only@*/ /*@null@*/
     const char * execPath;
     int execAbsolute;
-/*@only@*/ /*@relnull@*/
     const char * otherHelp;
-/*@null@*/
     pbm_set * arg_strip;
 };
 
@@ -154,49 +119,21 @@ struct poptContext_s {
 #else
 #ifdef HAVE_ICONV
 #include <iconv.h>
-#if defined(__LCLINT__)
-/*@-declundef -incondefs @*/
-extern /*@only@*/ iconv_t iconv_open(const char *__tocode, const char *__fromcode)
-	/*@*/;
-
-extern size_t iconv(iconv_t __cd, /*@null@*/ char ** __inbuf,
-		    /*@null@*/ /*@out@*/ size_t * __inbytesleft,
-		    /*@null@*/ /*@out@*/ char ** __outbuf,
-		    /*@null@*/ /*@out@*/ size_t * __outbytesleft)
-	/*@modifies __cd,
-		*__inbuf, *__inbytesleft, *__outbuf, *__outbytesleft @*/;
-
-extern int iconv_close(/*@only@*/ iconv_t __cd)
-	/*@modifies __cd @*/;
-/*@=declundef =incondefs @*/
-#endif
 #endif
 
 #ifdef HAVE_LANGINFO_H
 #include <langinfo.h>
-#if defined(__LCLINT__)
-/*@-declundef -incondefs @*/
-extern char *nl_langinfo (nl_item __item)
-	/*@*/;
-/*@=declundef =incondefs @*/
-#endif
 #endif
 
-#if defined(HAVE_DCGETTEXT) && !defined(__LCLINT__)
-char *POPT_dgettext(const char * dom, const char * str)
-	/*@*/;
+#if defined(HAVE_DCGETTEXT)
+char *POPT_dgettext(const char * dom, const char * str);
 #endif
 
-int   POPT_fprintf (FILE* stream, const char *format, ...)
-	/*@globals fileSystem @*/
-	/*@modifies stream, fileSystem @*/;
+int   POPT_fprintf (FILE* stream, const char *format, ...);
 #endif	/* !defined(POPT_fprintf) */
 
-const char *POPT_prev_char (/*@returned@*/ const char *str)
-	/*@*/;
-
-const char *POPT_next_char (/*@returned@*/ const char *str)
-	/*@*/;
+const char *POPT_prev_char (const char *str);
+const char *POPT_next_char (const char *str);
 
 #endif
 
@@ -204,13 +141,13 @@ const char *POPT_next_char (/*@returned@*/ const char *str)
 #include <libintl.h>
 #endif
 
-#if defined(ENABLE_NLS) && defined(HAVE_GETTEXT) && !defined(__LCLINT__)
+#if defined(ENABLE_NLS) && defined(HAVE_GETTEXT)
 #define _(foo) gettext(foo)
 #else
 #define _(foo) foo
 #endif
 
-#if defined(ENABLE_NLS) && defined(HAVE_DCGETTEXT) && !defined(__LCLINT__)
+#if defined(ENABLE_NLS) && defined(HAVE_DCGETTEXT)
 #define D_(dom, str) POPT_dgettext(dom, str)
 #define POPT_(foo) D_("popt", foo)
 #else
diff --git a/poptparse.c b/poptparse.c
index d196cc8..2fc8245 100644
--- a/poptparse.c
+++ b/poptparse.c
@@ -97,17 +97,17 @@ int poptParseArgvString(const char * s, int * argcPtr, const char *** argvPtr)
 	  case '"':
 	  case '\'':
 	    quote = *src;
-	    /*@switchbreak@*/ break;
+	    break;
 	  case '\\':
 	    src++;
 	    if (!*src) {
 		rc = POPT_ERROR_BADQUOTE;
 		goto exit;
 	    }
-	    /*@fallthrough@*/
+	    /* fallthrough */
 	  default:
 	    *buf++ = *src;
-	    /*@switchbreak@*/ break;
+	    break;
 	}
     }
 
@@ -129,7 +129,7 @@ exit:
  * 3== umm.... more?
  */
 int poptConfigFileToString(FILE *fp, char ** argstrp,
-		/*@unused@*/ UNUSED(int flags))
+		UNUSED(int flags))
 {
     char line[999];
     char * argstr;
diff --git a/system.h b/system.h
index 51c58f9..beb1391 100644
--- a/system.h
+++ b/system.h
@@ -6,15 +6,6 @@
 #include "config.h"
 #endif
 
-#if defined (__GLIBC__) && defined(__LCLINT__)
-/*@-declundef@*/
-/*@unchecked@*/
-extern __const __int32_t *__ctype_tolower;
-/*@unchecked@*/
-extern __const __int32_t *__ctype_toupper;
-/*@=declundef@*/
-#endif
-
 #include <ctype.h>
 
 /* XXX isspace(3) has i18n encoding signednesss issues on Solaris. */
@@ -32,7 +23,7 @@ extern __const __int32_t *__ctype_toupper;
 #include <stdlib.h>
 #include <string.h>
 
-#if defined(HAVE_UNISTD_H) && !defined(__LCLINT__)
+#if defined(HAVE_UNISTD_H)
 #include <unistd.h>
 #endif
 
@@ -42,27 +33,13 @@ extern __const __int32_t *__ctype_toupper;
 #include <libc.h>
 #endif
 
-/*@-incondefs@*/
-/*@mayexit@*/ /*@only@*/ /*@out@*/ /*@unused@*/
-void * xmalloc (size_t size)
-	/*@globals errno @*/
-	/*@ensures maxSet(result) == (size - 1) @*/
-	/*@modifies errno @*/;
+void * xmalloc (size_t size);
 
-/*@mayexit@*/ /*@only@*/ /*@unused@*/
-void * xcalloc (size_t nmemb, size_t size)
-	/*@ensures maxSet(result) == (nmemb - 1) @*/
-	/*@*/;
+void * xcalloc (size_t nmemb, size_t size);
 
-/*@mayexit@*/ /*@only@*/ /*@unused@*/
-void * xrealloc (/*@null@*/ /*@only@*/ void * ptr, size_t size)
-	/*@ensures maxSet(result) == (size - 1) @*/
-	/*@modifies *ptr @*/;
+void * xrealloc (void * ptr, size_t size);
 
-/*@mayexit@*/ /*@only@*/ /*@unused@*/
-char * xstrdup (const char *str)
-	/*@*/;
-/*@=incondefs@*/
+char * xstrdup (const char *str);
 
 #if !defined(HAVE_STPCPY)
 /* Copy SRC to DEST, returning the address of the terminating '\0' in DEST.  */
@@ -91,7 +68,7 @@ static inline char * stpcpy (char *dest, const char * src) {
 #define	xstrdup(_str)	strdup(_str)
 #endif  /* defined(HAVE_MCHECK_H) && defined(__GNUC__) */
 
-#if defined(HAVE___SECURE_GETENV) && !defined(__LCLINT__)
+#if defined(HAVE___SECURE_GETENV)
 #define	getenv(_s)	__secure_getenv(_s)
 #endif
 
diff --git a/test1.c b/test1.c
index e0586b9..50632be 100644
--- a/test1.c
+++ b/test1.c
@@ -4,91 +4,58 @@
 
 #include "system.h"
 
-/*@unchecked@*/
 static int pass2 = 0;
-static void option_callback(/*@unused@*/ UNUSED(poptContext con),
-		/*@unused@*/ UNUSED(enum poptCallbackReason reason),
+static void option_callback(UNUSED(poptContext con),
+		UNUSED(enum poptCallbackReason reason),
 		const struct poptOption * opt,
 		char * arg, void * data)
-	/*@globals fileSystem @*/
-	/*@modifies fileSystem @*/
 {
     if (pass2)
 	fprintf(stdout, "callback: %c %s %s ", opt->val, (char *) data, arg);
 }
 
-/*@unchecked@*/
 static int arg1 = 0;
-/*@unchecked@*/ /*@observer@*/
 static char * arg2 = "(none)";
-/*@unchecked@*/
 static int arg3 = 0;
-/*@unchecked@*/
 static int inc = 0;
-/*@unchecked@*/
 static int shortopt = 0;
 
-/*@unchecked@*/
 static int aVal = 141421;
-/*@unchecked@*/
 static int bVal = 141421;
-/*@unchecked@*/
 static unsigned int aFlag = 0x8aceU;
-/*@unchecked@*/
 static unsigned int bFlag = 0x8aceU;
 
-/*@unchecked@*/
 static short aShort = (short)4523;
-/*@unchecked@*/
 static short bShort = (short)4523;
-/*@unchecked@*/
 static int aInt = 271828;
-/*@unchecked@*/
 static int bInt = 271828;
-/*@unchecked@*/
 static long aLong = 738905609L;
-/*@unchecked@*/
 static long bLong = 738905609L;
-/*@unchecked@*/
 static long long aLongLong = 738905609LL;
-/*@unchecked@*/
 static long long bLongLong = 738905609LL;
-/*@unchecked@*/
 static float aFloat = 3.1415926535;
-/*@unchecked@*/
 static float bFloat = 3.1415926535;
-/*@unchecked@*/
 static double aDouble = 9.86960440108935861883;
-/*@unchecked@*/
 static double bDouble = 9.86960440108935861883;
 
-/*@unchecked@*/ /*@only@*/ /*@null@*/
 static const char ** aArgv = NULL;
-/*@unchecked@*/ /*@only@*/ /*@null@*/
 static void * aBits = NULL;
-/*@unchecked@*/ /*@observer@*/
 static const char *attributes[] = {
     "foo", "bar", "baz", "bing", "bang", "boom"
 };
-/*@unchecked@*/
 static size_t nattributes = (sizeof(attributes) / sizeof(attributes[0]));
 
-/*@unchecked@*/ /*@null@*/
 static char * oStr = (char *) -1;
-/*@unchecked@*/
 static int singleDash = 0;
 
-/*@unchecked@*/ /*@observer@*/
 static char * lStr =
 "This tests default strings and exceeds the ... limit. "
 "123456789+123456789+123456789+123456789+123456789+ "
 "123456789+123456789+123456789+123456789+123456789+ "
 "123456789+123456789+123456789+123456789+123456789+ "
 "123456789+123456789+123456789+123456789+123456789+ ";
-/*@unchecked@*/ /*@null@*/
 static char * nStr = NULL; 
 
-/*@unchecked@*/
 static struct poptOption moreCallbackArgs[] = {
   { NULL, '\0', POPT_ARG_CALLBACK|POPT_CBFLAG_INC_DATA,
 	(void *)option_callback, 0,
@@ -98,7 +65,6 @@ static struct poptOption moreCallbackArgs[] = {
   POPT_TABLEEND
 };
 
-/*@unchecked@*/
 static struct poptOption callbackArgs[] = {
   { NULL, '\0', POPT_ARG_CALLBACK, (void *)option_callback, 0,
 	"sampledata", NULL },
@@ -109,13 +75,11 @@ static struct poptOption callbackArgs[] = {
   POPT_TABLEEND
 };
 
-/*@unchecked@*/
 static struct poptOption moreArgs[] = {
   { "inc", 'I', 0, &inc, 0, "An included argument", NULL },
   POPT_TABLEEND
 };
 
-/*@unchecked@*/
 static struct poptOption options[] = {
   { NULL, '\0', POPT_ARG_INCLUDE_TABLE, &moreCallbackArgs, 0,
 	"arg for cb2", NULL },
@@ -188,12 +152,6 @@ static struct poptOption options[] = {
 };
 
 static void resetVars(void)
-	/*@globals arg1, arg2, arg3, inc, shortopt,
-		aVal, aFlag, aShort, aInt, aLong, aLongLong, aFloat, aDouble,
-		aArgv, aBits, oStr, singleDash, pass2 @*/
-	/*@modifies arg1, arg2, arg3, inc, shortopt,
-		aVal, aFlag, aShort, aInt, aLong, aLongLong, aFloat, aDouble,
-		aArgv, aBits, oStr, singleDash, pass2 @*/
 {
     arg1 = 0;
     arg2 = "(none)";
@@ -214,9 +172,7 @@ static void resetVars(void)
     if (aArgv) {
 	int i;
 	for (i = 0; aArgv[i] != NULL; i++) {
-/*@-unqualifiedtrans@*/
 	    free((void *)aArgv[i]);
-/*@=unqualifiedtrans@*/
 	    aArgv[i] = NULL;
 	}
 	free(aArgv);
@@ -232,8 +188,6 @@ static void resetVars(void)
 }
 
 int main(int argc, const char ** argv)
-	/*@globals pass2, fileSystem, internalState @*/
-	/*@modifies pass2, fileSystem, internalState @*/
 {
     int rc;
     int ec = 0;
@@ -243,17 +197,11 @@ int main(int argc, const char ** argv)
     int usage = 0;
 
 #if defined(HAVE_MCHECK_H) && defined(HAVE_MTRACE)
-    /*@-moduncon -noeffectuncon@*/
     mtrace();   /* Trace malloc only if MALLOC_TRACE=mtrace-output-file. */
-    /*@=moduncon =noeffectuncon@*/
 #endif
 
-/*@-modobserver@*/
     resetVars();
-/*@=modobserver@*/
-/*@-temptrans@*/
     optCon = poptGetContext("test1", argc, argv, options, 0);
-/*@=temptrans@*/
     (void) poptReadConfigFile(optCon, "./test-poptrc");
     (void) poptReadDefaultConfig(optCon, 1);
 
@@ -264,9 +212,7 @@ int main(int argc, const char ** argv)
 	{};
 
     poptResetContext(optCon);			/* ... and then start over. */
-/*@-modobserver@*/
     resetVars();
-/*@=modobserver@*/
 #endif
 
     pass2 = 1;
@@ -307,12 +253,10 @@ int main(int argc, const char ** argv)
 	fprintf(stdout, " aLong: %ld", aLong);
     if (aLongLong != bLongLong)
 	fprintf(stdout, " aLongLong: %lld", aLongLong);
-/*@-realcompare@*/
     if (aFloat != bFloat)
 	fprintf(stdout, " aFloat: %g", (double)aFloat);
     if (aDouble != bDouble)
 	fprintf(stdout, " aDouble: %g", aDouble);
-/*@=realcompare@*/
     if (aArgv != NULL) {
 	const char **av = aArgv;
 	const char * arg;
@@ -331,10 +275,8 @@ int main(int argc, const char ** argv)
 	    separator = ",";
 	}
     }
-/*@-nullpass@*/
     if (oStr != (char *)-1)
 	fprintf(stdout, " oStr: %s", (oStr ? oStr : "(none)"));
-/*@=nullpass@*/
     if (singleDash)
 	fprintf(stdout, " -");
 
@@ -354,9 +296,7 @@ int main(int argc, const char ** argv)
 exit:
     optCon = poptFreeContext(optCon);
 #if defined(HAVE_MCHECK_H) && defined(HAVE_MTRACE)
-    /*@-moduncon -noeffectuncon@*/
     muntrace();   /* Trace malloc only if MALLOC_TRACE=mtrace-output-file. */
-    /*@=moduncon =noeffectuncon@*/
 #endif
     return ec;
 }
-- 
Gitee


From 3f977c8e6689d4800baffab5fa5d019faa6375dd Mon Sep 17 00:00:00 2001
From: Panu Matilainen <pmatilai@redhat.com>
Date: Thu, 13 Feb 2020 10:17:23 +0200
Subject: [PATCH 619/667] Fix poptGlob() returning an error on no matches

No matches is not an error, it just means that there are no matches.
For example this would cause $HOME/.popt not being read when /etc/popt.d
was empty (RhBug:1051685)

Fixes regression introduced in commit c22ccfd2. Patch originally
by Jeff Johnson, backported to 1.16 by Robert Scheck.
---
 poptconfig.c | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/poptconfig.c b/poptconfig.c
index ba2a54b..5325f08 100644
--- a/poptconfig.c
+++ b/poptconfig.c
@@ -80,7 +80,7 @@ static int poptGlob(UNUSED(poptContext con), const char * pattern,
     if (glob_pattern_p(pat, 0)) {
 	glob_t _g, *pglob = &_g;
 
-	if (!glob(pat, poptGlobFlags, poptGlob_error, pglob)) {
+	if (!(rc = glob(pat, poptGlobFlags, poptGlob_error, pglob))) {
 	    if (acp) {
 		*acp = (int) pglob->gl_pathc;
 		pglob->gl_pathc = 0;
@@ -90,6 +90,10 @@ static int poptGlob(UNUSED(poptContext con), const char * pattern,
 		pglob->gl_pathv = NULL;
 	    }
 	    globfree(pglob);
+	} else if (rc == GLOB_NOMATCH) {
+	    *avp = NULL;
+	    *acp = 0;
+	    rc = 0;
 	} else
 	    rc = POPT_ERROR_ERRNO;
     } else
-- 
Gitee


From 74bc72a1bfc1e713672ac01cdbae4123d5ad333f Mon Sep 17 00:00:00 2001
From: Panu Matilainen <pmatilai@redhat.com>
Date: Thu, 13 Feb 2020 10:22:40 +0200
Subject: [PATCH 620/667] Restore privilege dropping on exec from suid/sgid
 process

Commit 30369c3e7e6a7104ac7fb817bf0463b9b03d5053 added ifdef checks for
HAVE_SETUID and HAVE_SETREUID in the code of execCommand() in the name of
portability, but: there are no checks for either function in configure.ac,
so these are never defined and the privilege-dropping code silently falls
through to the no-op case and goes on to merrily execute anything at all
with possible suid/sgid privileges. Except on HP-UX that is.

This means that a suid root application using poptReadDefaultConfig()
permits arbitrary command execution by root privileges by simply
adding things to $HOME/.popt. Other scenarios also exist.
Affecting all versions of popt over the last 21 years since 1.3 or so.

Fix by simply testing for these functions in configure.ac, and replace
a -98 vintage test for setreuid() in libucb by a modern variant. Note how
AC_CHECK_FUNCS() was testing for setregid(), not setreuid what the HAVE_
define is on. Also note how we actually tested for setreuid() in various
locations, but none of it actually causes HAVE_SETREUID to get defined.
FAIL.

On a related note, we shouldn't read arbitrary config files when running
as root or suid/sgid mode in the first place, but that's another commit.
---
 configure.ac | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/configure.ac b/configure.ac
index 088f57d..aac25bc 100755
--- a/configure.ac
+++ b/configure.ac
@@ -78,10 +78,8 @@ AC_ARG_ENABLE(build-gcov,
     fi
 ])
 
-AC_CHECK_FUNC(setreuid, [], [
-    AC_CHECK_LIB(ucb, setreuid, [if echo $LIBS | grep -- -lucb >/dev/null ;then :; else LIBS="$LIBS -lc -lucb" USEUCB=y;fi])
-])
-AC_CHECK_FUNCS(getuid geteuid iconv mtrace __secure_getenv setregid stpcpy strerror vasprintf srandom)
+AC_SEARCH_LIBS(setreuid, [ucb])
+AC_CHECK_FUNCS(getuid geteuid iconv mtrace __secure_getenv setreuid setuid stpcpy strerror vasprintf srandom)
 
 AM_GNU_GETTEXT_VERSION([0.16.1])
 AM_GNU_GETTEXT([external])
-- 
Gitee


From 905544c5d9767894edaf71a1e3ce5126944c5695 Mon Sep 17 00:00:00 2001
From: Panu Matilainen <pmatilai@redhat.com>
Date: Thu, 13 Feb 2020 10:50:54 +0200
Subject: [PATCH 621/667] Refuse to execute anything with extra privileges

On a (theoretical) platform where we do not support privilege dropping,
refuse to execute anything if uid/euid or gid/egid do not match.
---
 popt.c | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/popt.c b/popt.c
index 1a3eac7..fcaecac 100644
--- a/popt.c
+++ b/popt.c
@@ -498,7 +498,11 @@ static int execCommand(poptContext con)
     rc = setreuid(getuid(), getuid());
     if (rc) goto exit;
 #else
-    ; /* Can't drop privileges */
+    /* refuse to exec if we cannot drop suid/sgid privileges */
+    if (getuid() != geteuid() || getgid() != getegid()) {
+	errno = ENOTSUP;
+	goto exit;
+    }
 #endif
 #endif
 
-- 
Gitee


From f5887c1bc3110011cc5d6fa3d71a53aaefb0fd85 Mon Sep 17 00:00:00 2001
From: Panu Matilainen <pmatilai@redhat.com>
Date: Wed, 12 Feb 2020 16:18:39 +0200
Subject: [PATCH 622/667] Remove unused utf8_skip_data array

---
 poptint.c | 11 -----------
 1 file changed, 11 deletions(-)

diff --git a/poptint.c b/poptint.c
index e5f6000..14aafa4 100644
--- a/poptint.c
+++ b/poptint.c
@@ -7,17 +7,6 @@
 #define	jlu32lpair	poptJlu32lpair
 #include "lookup3.c"
 
-static const unsigned char utf8_skip_data[256] = {
-    1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,
-    1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,
-    1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,
-    1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,
-    1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,
-    1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,
-    2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,
-    3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,4,4,4,4,4,4,4,4,5,5,5,5,6,6,1,1
-};
-
 const char *
 POPT_prev_char (const char *str)
 {
-- 
Gitee


From e3dd60d5763edc1a8249c62fdc0a4901d465db10 Mon Sep 17 00:00:00 2001
From: Panu Matilainen <pmatilai@redhat.com>
Date: Thu, 13 Feb 2020 12:08:55 +0200
Subject: [PATCH 623/667] Drop unused and useless return code variables from
 POPT_fprintf() calls

These are only used for display purposes so errors are hardly critical,
and we're not checking for error returns from fprintf() calls either.
Just drop the useless cruft, silencing a set-but-not-used error from
the compiler.
---
 popthelp.c | 18 +++++++-----------
 1 file changed, 7 insertions(+), 11 deletions(-)

diff --git a/popthelp.c b/popthelp.c
index 435f8f9..e5c2e30 100644
--- a/popthelp.c
+++ b/popthelp.c
@@ -297,7 +297,6 @@ static void singleOptionHelp(FILE * fp, columns_t columns,
     char * left;
     size_t nb = maxLeftCol + 1;
     int displaypad = 0;
-    int xx;
 
     /* Make sure there's more than enough room in target buffer. */
     if (opt->longName)	nb += strlen(opt->longName);
@@ -429,9 +428,9 @@ static void singleOptionHelp(FILE * fp, columns_t columns,
     }
 
     if (help)
-	xx = POPT_fprintf(fp,"  %-*s   ", (int)(maxLeftCol+displaypad), left);
+	POPT_fprintf(fp,"  %-*s   ", (int)(maxLeftCol+displaypad), left);
     else {
-	xx = POPT_fprintf(fp,"  %s\n", left); 
+	POPT_fprintf(fp,"  %s\n", left);
 	goto out;
     }
 
@@ -460,7 +459,7 @@ static void singleOptionHelp(FILE * fp, columns_t columns,
 	    if (fmthelp) {
 		fmthelp[ch - help] = '\0';
 		sprintf(format, "%%s\n%%%ds", (int) indentLength);
-		xx = POPT_fprintf(fp, format, fmthelp, " ");
+		POPT_fprintf(fp, format, fmthelp, " ");
 		free(fmthelp);
 	    }
 	}
@@ -567,7 +566,6 @@ static void singleTableHelp(poptContext con, FILE * fp,
 {
     const struct poptOption * opt;
     const char *sub_transdom;
-    int xx;
 
     if (table == poptAliasOptions) {
 	itemHelp(fp, con->aliases, con->numAliases, columns, NULL);
@@ -593,7 +591,7 @@ static void singleTableHelp(poptContext con, FILE * fp,
 	if (opt->arg == poptAliasOptions && !(con->numAliases || con->numExecs))
 	    continue;
 	if (opt->descrip)
-	    xx = POPT_fprintf(fp, "\n%s\n", D_(sub_transdom, opt->descrip));
+	    POPT_fprintf(fp, "\n%s\n", D_(sub_transdom, opt->descrip));
 
 	singleTableHelp(con, fp, opt->arg, columns, sub_transdom);
     }
@@ -606,9 +604,8 @@ static void singleTableHelp(poptContext con, FILE * fp,
 static size_t showHelpIntro(poptContext con, FILE * fp)
 {
     size_t len = (size_t)6;
-    int xx;
 
-    xx = POPT_fprintf(fp, POPT_("Usage:"));
+    POPT_fprintf(fp, POPT_("Usage:"));
     if (!(con->flags & POPT_CONTEXT_KEEP_FIRST)) {
 	struct optionStackEntry * os = con->optionStack;
 	const char * fn = (os->argv ? os->argv[0] : NULL);
@@ -625,13 +622,12 @@ static size_t showHelpIntro(poptContext con, FILE * fp)
 void poptPrintHelp(poptContext con, FILE * fp, UNUSED(int flags))
 {
     columns_t columns = calloc((size_t)1, sizeof(*columns));
-    int xx;
 
     (void) showHelpIntro(con, fp);
     if (con->otherHelp)
-	xx = POPT_fprintf(fp, " %s\n", con->otherHelp);
+	POPT_fprintf(fp, " %s\n", con->otherHelp);
     else
-	xx = POPT_fprintf(fp, " %s\n", POPT_("[OPTION...]"));
+	POPT_fprintf(fp, " %s\n", POPT_("[OPTION...]"));
 
     if (columns) {
 	columns->cur = maxArgWidth(con->options, NULL);
-- 
Gitee


From b88685a2056c4342483b2eb76e66be1e5b65195f Mon Sep 17 00:00:00 2001
From: Panu Matilainen <pmatilai@redhat.com>
Date: Thu, 13 Feb 2020 12:19:27 +0200
Subject: [PATCH 624/667] Check for poptConfigLine() return code in
 poptReadConfigFile()

As of now, poptConfigLine() always returns 0 so this is a essentially
a no-op, but preparing for those errors seems much more meaningful than
grabbing the return code into an unused variable which the compiler will
whine about. Move the free() after exit to ensure no memory leaks
if/when poptConfigLine() starts returning errors.
---
 poptconfig.c | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/poptconfig.c b/poptconfig.c
index 5325f08..d01b922 100644
--- a/poptconfig.c
+++ b/poptconfig.c
@@ -344,7 +344,6 @@ int poptReadConfigFile(poptContext con, const char * fn)
     const char *se;
     char *t, *te;
     int rc;
-    int xx;
 
     if ((rc = poptReadFile(fn, &b, &nb, POPT_READFILE_TRIMNEWLINES)) != 0)
 	return (errno == ENOENT ? 0 : rc);
@@ -363,7 +362,8 @@ int poptReadConfigFile(poptContext con, const char * fn)
 	    te = t;
 	    while (*te && _isspaceptr(te)) te++;
 	    if (*te && *te != '#')
-		xx = poptConfigLine(con, te);
+		if ((rc = poptConfigLine(con, te)) != 0)
+		    goto exit;
 	    break;
 	  case '\\':
 	    *te = *se++;
@@ -378,11 +378,10 @@ int poptReadConfigFile(poptContext con, const char * fn)
 	    break;
 	}
     }
-
-    free(t);
     rc = 0;
 
 exit:
+    free(t);
     if (b)
 	free(b);
     return rc;
-- 
Gitee


From 349d6f66d6ff2283f1da1fedc2ec961441219b2b Mon Sep 17 00:00:00 2001
From: Panu Matilainen <pmatilai@redhat.com>
Date: Thu, 13 Feb 2020 12:27:15 +0200
Subject: [PATCH 625/667] Make POPT_ARG_BITSET unambiguous when combined with
 other things

At least gcc warns about the arithmetic when combined in an or-operation.
Parentheses makes it unambiguous, ditto for POPT_ARG_MAINCALL.
---
 popt.h | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/popt.h b/popt.h
index acc87c1..4c506a6 100644
--- a/popt.h
+++ b/popt.h
@@ -35,10 +35,10 @@
 #define	POPT_ARG_DOUBLE		 9U	/*!< arg ==> double */
 #define	POPT_ARG_LONGLONG	 10U	/*!< arg ==> long long */
 
-#define POPT_ARG_MAINCALL	16U+11U	/*!< EXPERIMENTAL: return (*arg) (argc, argv) */
+#define POPT_ARG_MAINCALL	(16U+11U)	/*!< EXPERIMENTAL: return (*arg) (argc, argv) */
 #define	POPT_ARG_ARGV		12U	/*!< dupe'd arg appended to realloc'd argv array. */
 #define	POPT_ARG_SHORT		13U	/*!< arg ==> short */
-#define	POPT_ARG_BITSET		16U+14U	/*!< arg ==> bit set */
+#define	POPT_ARG_BITSET		(16U+14U)	/*!< arg ==> bit set */
 
 #define POPT_ARG_MASK		0x000000FFU
 #define POPT_GROUP_MASK		0x0000FF00U
-- 
Gitee


From a9d7c48ec1262624ede0b0c616082b1cb8018acc Mon Sep 17 00:00:00 2001
From: Panu Matilainen <pmatilai@redhat.com>
Date: Fri, 14 Feb 2020 16:12:23 +0200
Subject: [PATCH 626/667] Honor sysconfdir for global config, drop hardwired
 /etc/ assumptions

${sysconfdir}/popt and ${sysconfdir}/popt.d/* is our global config,
read by poptReadDefaultConfig(). It's not our place to make any other
assumptions such as hardwired /etc.
---
 poptconfig.c | 13 +++----------
 1 file changed, 3 insertions(+), 10 deletions(-)

diff --git a/poptconfig.c b/poptconfig.c
index d01b922..89055bf 100644
--- a/poptconfig.c
+++ b/poptconfig.c
@@ -441,29 +441,22 @@ int poptReadConfigFiles(poptContext con, const char * paths)
 
 int poptReadDefaultConfig(poptContext con, UNUSED(int useEnv))
 {
-    static const char _popt_sysconfdir[] = POPT_SYSCONFDIR "/popt";
-    static const char _popt_etc[] = "/etc/popt";
     char * home;
     struct stat sb;
     int rc = 0;		/* assume success */
 
     if (con->appName == NULL) goto exit;
 
-    if (strcmp(_popt_sysconfdir, _popt_etc)) {
-	rc = poptReadConfigFile(con, _popt_sysconfdir);
-	if (rc) goto exit;
-    }
-
-    rc = poptReadConfigFile(con, _popt_etc);
+    rc = poptReadConfigFile(con, POPT_SYSCONFDIR "/popt");
     if (rc) goto exit;
 
 #if defined(HAVE_GLOB_H)
-    if (!stat("/etc/popt.d", &sb) && S_ISDIR(sb.st_mode)) {
+    if (!stat(POPT_SYSCONFDIR "/popt.d", &sb) && S_ISDIR(sb.st_mode)) {
 	const char ** av = NULL;
 	int ac = 0;
 	int i;
 
-	if ((rc = poptGlob(con, "/etc/popt.d/*", &ac, &av)) == 0) {
+	if ((rc = poptGlob(con, POPT_SYSCONFDIR "/popt.d/*", &ac, &av)) == 0) {
 	    for (i = 0; rc == 0 && i < ac; i++) {
 		const char * fn = av[i];
 		if (fn == NULL || strstr(fn, ".rpmnew") || strstr(fn, ".rpmsave"))
-- 
Gitee


From 49daff1baa01659cddc1f2b812a467e4098d70a1 Mon Sep 17 00:00:00 2001
From: Panu Matilainen <pmatilai@redhat.com>
Date: Fri, 14 Feb 2020 17:09:10 +0200
Subject: [PATCH 627/667] Make poptSaneFile() a little bit saner and actually
 usable

The logic here is entirely backwards: it says to return 0 on OK, which
means that for a file to be considered sane:

- it has to be owned by some other user than the current user
- it must not be a regular file
- it has to be writable by group or other

Right.

This is so broken nobody can possibly have used it, so we can change it.
Revert the return values so that natural "if (poptSaneFile(fn))" does
the right thing, and use more reasonable conditions: fn is sane if it
- is not NULL
- doesn't contain .rpmnew or .rpmsave
- points directly or via links to a regular file
- is not executable

Ownership and writability checks are trickier, leave them out for now.
---
 popt.h       | 4 ++--
 poptconfig.c | 7 +++----
 2 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/popt.h b/popt.h
index 4c506a6..38a5478 100644
--- a/popt.h
+++ b/popt.h
@@ -334,9 +334,9 @@ int poptAddAlias(poptContext con, struct poptAlias alias, int flags);
 int poptAddItem(poptContext con, poptItem newItem, int flags);
 
 /** \ingroup popt
- * Perform sanity checks on a file path.
+ * Test path/file for config file sanity (regular file, permissions etc)
  * @param fn		file name
- * @return		0 on OK, 1 on NOTOK.
+ * @return		1 on OK, 0 on NOTOK.
  */
 int poptSaneFile(const char * fn);
 
diff --git a/poptconfig.c b/poptconfig.c
index 89055bf..ee0bc9e 100644
--- a/poptconfig.c
+++ b/poptconfig.c
@@ -112,15 +112,14 @@ static int poptGlob(UNUSED(poptContext con), const char * pattern,
 int poptSaneFile(const char * fn)
 {
     struct stat sb;
-    uid_t uid = getuid();
 
+    if (fn == NULL || strstr(fn, ".rpmnew") || strstr(fn, ".rpmsave"))
+	return 0;
     if (stat(fn, &sb) == -1)
-	return 1;
-    if ((uid_t)sb.st_uid != uid)
 	return 0;
     if (!S_ISREG(sb.st_mode))
 	return 0;
-    if (sb.st_mode & (S_IWGRP|S_IWOTH))
+    if (sb.st_mode & (S_IXUSR|S_IXGRP|S_IXOTH))
 	return 0;
     return 1;
 }
-- 
Gitee


From bf3da020e682a41c2beddf59bad0498d1fb9cc01 Mon Sep 17 00:00:00 2001
From: Panu Matilainen <pmatilai@redhat.com>
Date: Fri, 14 Feb 2020 17:25:36 +0200
Subject: [PATCH 628/667] Filter all glob()'ed results through poptSaneFile()

Inconsistent checks are bad, and so are unused ones. Use the same checks
for all glob()'ed paths for consistency to avoid code cuplication.
Before this, sanity checks were limited to files with special undocumented
"attention marker" so in practise they were never used at all. Rip the
strange attention marker concept, nobody can possibly have used it
because of its relation to the broken poptSaneFile().
---
 poptconfig.c | 21 ++-------------------
 1 file changed, 2 insertions(+), 19 deletions(-)

diff --git a/poptconfig.c b/poptconfig.c
index ee0bc9e..564fac1 100644
--- a/poptconfig.c
+++ b/poptconfig.c
@@ -72,10 +72,6 @@ static int poptGlob(UNUSED(poptContext con), const char * pattern,
     const char * pat = pattern;
     int rc = 0;		/* assume success */
 
-    /* XXX skip the attention marker. */
-    if (pat[0] == '@' && pat[1] != '(')
-	pat++;
-
 #if defined(HAVE_GLOB_H)
     if (glob_pattern_p(pat, 0)) {
 	glob_t _g, *pglob = &_g;
@@ -411,17 +407,8 @@ int poptReadConfigFiles(poptContext con, const char * paths)
 	/* work-off each resulting file from the path element */
 	for (i = 0; i < ac; i++) {
 	    const char * fn = av[i];
-	    if (av[i] == NULL)	/* XXX can't happen */
-		continue;
-	    /* XXX should '@' attention be pushed into poptReadConfigFile? */
-	    if (p[0] == '@' && p[1] != '(') {
-		if (fn[0] == '@' && fn[1] != '(')
-		    fn++;
-		xx = poptSaneFile(fn);
-		if (!xx && rc == 0)
-		    rc = POPT_ERROR_BADCONFIG;
+	    if (!poptSaneFile(fn))
 		continue;
-	    }
 	    xx = poptReadConfigFile(con, fn);
 	    if (xx && rc == 0)
 		rc = xx;
@@ -458,12 +445,8 @@ int poptReadDefaultConfig(poptContext con, UNUSED(int useEnv))
 	if ((rc = poptGlob(con, POPT_SYSCONFDIR "/popt.d/*", &ac, &av)) == 0) {
 	    for (i = 0; rc == 0 && i < ac; i++) {
 		const char * fn = av[i];
-		if (fn == NULL || strstr(fn, ".rpmnew") || strstr(fn, ".rpmsave"))
+		if (!poptSaneFile(fn))
 		    continue;
-		if (!stat(fn, &sb)) {
-		    if (!S_ISREG(sb.st_mode) && !S_ISLNK(sb.st_mode))
-			continue;
-		}
 		rc = poptReadConfigFile(con, fn);
 		free((void *)av[i]);
 		av[i] = NULL;
-- 
Gitee


From a560069b1e05a84bbab4f45d71f3c23acb9ef95d Mon Sep 17 00:00:00 2001
From: Panu Matilainen <pmatilai@redhat.com>
Date: Mon, 16 Mar 2020 13:45:46 +0200
Subject: [PATCH 629/667] Replace obsolete ALL_LINGUAS with po/LINGUAS file

---
 configure.ac | 2 --
 po/LINGUAS   | 1 +
 2 files changed, 1 insertion(+), 2 deletions(-)
 create mode 100644 po/LINGUAS

diff --git a/configure.ac b/configure.ac
index aac25bc..74499e7 100755
--- a/configure.ac
+++ b/configure.ac
@@ -18,8 +18,6 @@ AC_SUBST(LT_CURRENT, 0)
 AC_SUBST(LT_REVISION, 0)
 AC_SUBST(LT_AGE, 8)
 
-ALL_LINGUAS="cs da de eo es fi fr ga gl hu id is it ja ko lv nb nl pl pt ro ru sk sl sv th tr uk vi wa zh_TW zh_CN"
-
 AC_PROG_CC_STDC
 AC_PROG_CC
 
diff --git a/po/LINGUAS b/po/LINGUAS
new file mode 100644
index 0000000..916a129
--- /dev/null
+++ b/po/LINGUAS
@@ -0,0 +1 @@
+cs da de eo es fi fr ga gl hu id is it ja ko lv nb nl pl pt ro ru sk sl sv th tr uk vi wa zh_TW zh_CN
-- 
Gitee


From f4413405f4f9a3f12e574f8dc2dd4577f552b817 Mon Sep 17 00:00:00 2001
From: Panu Matilainen <pmatilai@redhat.com>
Date: Mon, 16 Mar 2020 14:42:28 +0200
Subject: [PATCH 630/667] Nuke unused libtool-version related cruft, actually
 pass -version-info

The LT_* symbols in configure.ac were brought in as "rpm.org changes"
in commit 149f325ff8125f8454629da2a64f7677e9165c89 which is quite funny
as rpm.org never had such symbols. Not to mention, the values are invalid
as version-info and unused.

Set the version-info in Makefile.am directly, going through configure
is counter-productive. Set version-info to 0:0:0 to match what has been
actually produced all these years (which is of course entirely wrong too,
but we can't help *that*), and remember to update this when the next
release comes...
---
 Makefile.am  | 2 ++
 configure.ac | 8 --------
 2 files changed, 2 insertions(+), 8 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index 9b5ab55..b5f717d 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -43,6 +43,8 @@ usrlib_LTLIBRARIES = libpopt.la
 
 libpopt_la_SOURCES = popt.c poptparse.c poptconfig.c popthelp.c poptint.c
 libpopt_la_LDFLAGS = -no-undefined @LTLIBINTL@ @LTLIBICONV@
+# libtool current:revision:age info
+libpopt_la_LDFLAGS += -version-info 0:0:0
 
 pkgconfigdir = $(prefix)/lib/pkgconfig
 pkgconfig_DATA = popt.pc
diff --git a/configure.ac b/configure.ac
index 74499e7..543097a 100755
--- a/configure.ac
+++ b/configure.ac
@@ -10,14 +10,6 @@ AC_CONFIG_MACRO_DIR([m4])
 AM_INIT_AUTOMAKE([foreign -Wall])
 AM_MAINTAINER_MODE
 
-# Library code modified:                              REVISION++
-# Interfaces changed/added/removed:   CURRENT++       REVISION=0
-# Interfaces added:                             AGE++
-# Interfaces removed:                           AGE=0
-AC_SUBST(LT_CURRENT, 0)
-AC_SUBST(LT_REVISION, 0)
-AC_SUBST(LT_AGE, 8)
-
 AC_PROG_CC_STDC
 AC_PROG_CC
 
-- 
Gitee


From c4aacccc02f0c6a0095f5b5251a7276cb68adfef Mon Sep 17 00:00:00 2001
From: Panu Matilainen <pmatilai@redhat.com>
Date: Mon, 16 Mar 2020 14:58:55 +0200
Subject: [PATCH 631/667] Nuke weird pkg-config "fixup" logic from configure

Just do what the rest of the world does, if this doesn't work then
pkg-config is buggy and needs fixing. Which it was, over ten years ago.
---
 configure.ac | 31 -------------------------------
 popt.pc.in   |  2 +-
 2 files changed, 1 insertion(+), 32 deletions(-)

diff --git a/configure.ac b/configure.ac
index 543097a..0eee29a 100755
--- a/configure.ac
+++ b/configure.ac
@@ -79,37 +79,6 @@ popt_sysconfdir="${sysconfdir}"
 eval "popt_sysconfdir=\"${popt_sysconfdir}\"" # expand contained ${prefix}
 AC_DEFINE_UNQUOTED([POPT_SYSCONFDIR], ["$popt_sysconfdir"], [Full path to default POPT configuration directory])
 
-
-# Define a (hope) portable Libs pkgconfig directive that 
-# - Don't harm if the default library search path include ${libdir}
-#   (https://bugzilla.novell.com/show_bug.cgi?id=529921)
-# - Don't require a not upstream patch to pkgconfig
-#   (https://bugs.freedesktop.org/show_bug.cgi?id=16095)
-popt_pkgconfig_libs='-L${libdir} -lpopt'
-case "${host}" in
-    *-*-linux*)
-	case "${libdir}" in
-	    /usr/lib|/usr/lib64|/lib|/lib64)
-       		   popt_pkgconfig_libs='-lpopt'
-		;;
-    		*)
-		popt_pkgconfig_libs='-L${libdir} -lpopt'
-	;;
-	esac
-      ;;
-    *-*-gnu*)
-	case "${libdir}" in
-	    /usr/lib|/usr/lib64|/lib|/lib64)
-       		   popt_pkgconfig_libs='-lpopt'
-		;;
-    		*)
-		popt_pkgconfig_libs='-L${libdir} -lpopt'
-	;;
-	esac
-      ;;
-esac
-AC_SUBST([POPT_PKGCONFIG_LIBS],"$popt_pkgconfig_libs")
-
 POPT_SOURCE_PATH="`pwd`"
 AC_DEFINE_UNQUOTED(POPT_SOURCE_PATH, "$POPT_SOURCE_PATH",
 	[Full path to popt top_srcdir.])
diff --git a/popt.pc.in b/popt.pc.in
index a86437c..43c1735 100644
--- a/popt.pc.in
+++ b/popt.pc.in
@@ -6,5 +6,5 @@ includedir=@includedir@
 Name: popt
 Version: @VERSION@
 Description: popt library.
-Libs: @POPT_PKGCONFIG_LIBS@
+Libs: -L${libdir} -lpopt
 Cflags: -I${includedir}
-- 
Gitee


From ce2146d35a3960d1eecb3f171755b4afe870caa0 Mon Sep 17 00:00:00 2001
From: Panu Matilainen <pmatilai@redhat.com>
Date: Mon, 16 Mar 2020 15:14:10 +0200
Subject: [PATCH 632/667] Axe unused and useless POPT_SOURCE_PATH define from
 autoconf

---
 configure.ac | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/configure.ac b/configure.ac
index 0eee29a..61f399b 100755
--- a/configure.ac
+++ b/configure.ac
@@ -79,11 +79,6 @@ popt_sysconfdir="${sysconfdir}"
 eval "popt_sysconfdir=\"${popt_sysconfdir}\"" # expand contained ${prefix}
 AC_DEFINE_UNQUOTED([POPT_SYSCONFDIR], ["$popt_sysconfdir"], [Full path to default POPT configuration directory])
 
-POPT_SOURCE_PATH="`pwd`"
-AC_DEFINE_UNQUOTED(POPT_SOURCE_PATH, "$POPT_SOURCE_PATH",
-	[Full path to popt top_srcdir.])
-AC_SUBST(POPT_SOURCE_PATH)
-
 AC_CONFIG_SUBDIRS()
 AC_CONFIG_FILES([ po/Makefile.in
     Doxyfile Makefile popt.pc test-poptrc
-- 
Gitee


From bb6b3556ca1141db641154f57e6472f4d6cd6988 Mon Sep 17 00:00:00 2001
From: Panu Matilainen <pmatilai@redhat.com>
Date: Mon, 16 Mar 2020 15:23:40 +0200
Subject: [PATCH 633/667] Replace obsolete autoconf goop with
 AC_USE_SYSTEM_EXTENSIONS

AC_ISC_POSIX and AC_GCC_TRADITIONAL are obsolete and unnecessary,
ditto for -D_REENTRANT and -D_GNU_SOURCE and thus we don't need
to mess with CFLAGS at all. Just let AC_USE_SYSTEM_EXTENSIONS to
its stuff.
---
 configure.ac | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/configure.ac b/configure.ac
index 61f399b..187ce40 100755
--- a/configure.ac
+++ b/configure.ac
@@ -12,6 +12,7 @@ AM_MAINTAINER_MODE
 
 AC_PROG_CC_STDC
 AC_PROG_CC
+AC_USE_SYSTEM_EXTENSIONS
 
 AC_PROG_INSTALL
 AC_PROG_LIBTOOL
@@ -30,13 +31,8 @@ else
 fi
 AC_SUBST(TARGET)
 
-CFLAGS="$CFLAGS -D_GNU_SOURCE -D_REENTRANT"
-
-AC_GCC_TRADITIONAL
 AC_SYS_LARGEFILE
 
-AC_ISC_POSIX
-
 AC_CHECK_HEADERS(float.h fnmatch.h glob.h langinfo.h libintl.h mcheck.h unistd.h)
 
 # For some systems we know that we have ld_version scripts.
-- 
Gitee


From 144f681c75423a507bb678450d12de3e66495f45 Mon Sep 17 00:00:00 2001
From: Panu Matilainen <pmatilai@redhat.com>
Date: Mon, 16 Mar 2020 15:29:56 +0200
Subject: [PATCH 634/667] Drop evil AM_MAINTAINER_MODE

Let the computer track when stuff needs updating, on such a task
it'll do a better job than us humans will.
---
 configure.ac | 1 -
 1 file changed, 1 deletion(-)

diff --git a/configure.ac b/configure.ac
index 187ce40..ec88439 100755
--- a/configure.ac
+++ b/configure.ac
@@ -8,7 +8,6 @@ dnl Must come before AM_INIT_AUTOMAKE.
 dnl AC_CONFIG_AUX_DIR([build-aux])
 AC_CONFIG_MACRO_DIR([m4])
 AM_INIT_AUTOMAKE([foreign -Wall])
-AM_MAINTAINER_MODE
 
 AC_PROG_CC_STDC
 AC_PROG_CC
-- 
Gitee


From 40e879bfd3b4cea9cff4b645b02e54f9867dd842 Mon Sep 17 00:00:00 2001
From: Panu Matilainen <pmatilai@redhat.com>
Date: Mon, 16 Mar 2020 15:34:49 +0200
Subject: [PATCH 635/667] Nuke weird 1998 vintage dependency rebuild magic

---
 configure.ac | 14 --------------
 1 file changed, 14 deletions(-)

diff --git a/configure.ac b/configure.ac
index ec88439..84d6d82 100755
--- a/configure.ac
+++ b/configure.ac
@@ -16,20 +16,6 @@ AC_USE_SYSTEM_EXTENSIONS
 AC_PROG_INSTALL
 AC_PROG_LIBTOOL
 
-dnl if CC is gcc, we can rebuild the dependencies (since the depend rule
-dnl requires gcc).  If it's not, don't rebuild dependencies -- use what was
-dnl shipped with RPM.
-if test X"$GCC" = "Xyes"; then
-    CFLAGS="$CFLAGS -Wall -W"
-    TARGET="depend allprogs"
-else
-    TARGET="everything"
-    dnl let the Makefile know that we're done with `depend', since we don't
-    dnl have gcc we're not going to rebuild our dependencies at all.
-    echo >.depend-done
-fi
-AC_SUBST(TARGET)
-
 AC_SYS_LARGEFILE
 
 AC_CHECK_HEADERS(float.h fnmatch.h glob.h langinfo.h libintl.h mcheck.h unistd.h)
-- 
Gitee


From ed52a1307d601e18eeb531c7145cf813f23c7898 Mon Sep 17 00:00:00 2001
From: Panu Matilainen <pmatilai@redhat.com>
Date: Mon, 16 Mar 2020 15:43:27 +0200
Subject: [PATCH 636/667] Simplify POPT_SYSCONFDIR handling in compilation

Just pass it as a define to the place that needs it, no need for any
manual define foo in configure
---
 Makefile.am  | 2 ++
 configure.ac | 4 ----
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index b5f717d..bc8ac2d 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -12,6 +12,7 @@ EXTRA_DIST = config.rpath lookup3.c autogen.sh CHANGES $(man_MANS) \
 SUBDIRS = po . auto
 
 AM_CPPFLAGS = -I. -I$(top_srcdir)
+AM_CPPFLAGS += -DPOPT_SYSCONFDIR="\"$(sysconfdir)\""
 
 noinst_HEADERS = poptint.h system.h
 
@@ -42,6 +43,7 @@ usrlibdir = $(libdir)
 usrlib_LTLIBRARIES = libpopt.la
 
 libpopt_la_SOURCES = popt.c poptparse.c poptconfig.c popthelp.c poptint.c
+
 libpopt_la_LDFLAGS = -no-undefined @LTLIBINTL@ @LTLIBICONV@
 # libtool current:revision:age info
 libpopt_la_LDFLAGS += -version-info 0:0:0
diff --git a/configure.ac b/configure.ac
index 84d6d82..fdbe0ac 100755
--- a/configure.ac
+++ b/configure.ac
@@ -56,10 +56,6 @@ AM_GNU_GETTEXT_VERSION([0.16.1])
 AM_GNU_GETTEXT([external])
 AM_ICONV_LINK
 
-popt_sysconfdir="${sysconfdir}"
-eval "popt_sysconfdir=\"${popt_sysconfdir}\"" # expand contained ${prefix}
-AC_DEFINE_UNQUOTED([POPT_SYSCONFDIR], ["$popt_sysconfdir"], [Full path to default POPT configuration directory])
-
 AC_CONFIG_SUBDIRS()
 AC_CONFIG_FILES([ po/Makefile.in
     Doxyfile Makefile popt.pc test-poptrc
-- 
Gitee


From 2623de8db98429459360c3e9f71c3e19a99ca00b Mon Sep 17 00:00:00 2001
From: Panu Matilainen <pmatilai@redhat.com>
Date: Mon, 16 Mar 2020 16:28:14 +0200
Subject: [PATCH 637/667] Drop redundant AUTOMAKE_OPTIONS use, bump the
 automake version dep

This stuff belongs to AM_INIT_AUTOMAKE which we already have, except
for the version requirement of 1.4. Which is over 20 years old, maybe
we can bump it up to something from this millenium... There's nothing
special about 1.10 other than being the same what rpm uses here,
so its really conservative as well (automake 1.10 is from 2006).
Apparently this reveals some other antiquated practises as well,
add AM_PROG_AR to appease automake.
---
 Makefile.am  | 2 --
 configure.ac | 3 ++-
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index bc8ac2d..5270370 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,7 +1,5 @@
 # Makefile for popt library.
 
-AUTOMAKE_OPTIONS = 1.4 foreign
-
 MCCABE =	pmccabe
 
 EXTRA_DIST = config.rpath lookup3.c autogen.sh CHANGES $(man_MANS) \
diff --git a/configure.ac b/configure.ac
index fdbe0ac..89a06fe 100755
--- a/configure.ac
+++ b/configure.ac
@@ -7,11 +7,12 @@ AC_CANONICAL_TARGET
 dnl Must come before AM_INIT_AUTOMAKE.
 dnl AC_CONFIG_AUX_DIR([build-aux])
 AC_CONFIG_MACRO_DIR([m4])
-AM_INIT_AUTOMAKE([foreign -Wall])
+AM_INIT_AUTOMAKE([1.10 foreign -Wall])
 
 AC_PROG_CC_STDC
 AC_PROG_CC
 AC_USE_SYSTEM_EXTENSIONS
+AM_PROG_AR
 
 AC_PROG_INSTALL
 AC_PROG_LIBTOOL
-- 
Gitee


From c9c4632ada5e9a431e839be0cbcafdc48b92752b Mon Sep 17 00:00:00 2001
From: Panu Matilainen <pmatilai@redhat.com>
Date: Mon, 16 Mar 2020 17:05:59 +0200
Subject: [PATCH 638/667] Remove multilib hack leftover usrlib_LTLIBRARIES

This was added back in 437869fcc50a44ca95b7315bb1ed246707c39916 to
override libdir on multilib systems, this broken logic was long since
removed but the usrlib thing was left behind. Just use lib_LTLIBRARIES
as deity meant it.
---
 Makefile.am | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index 5270370..b2d75c3 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -17,16 +17,16 @@ noinst_HEADERS = poptint.h system.h
 noinst_PROGRAMS = test1 test2 tdict # test3
 test1_SOURCES = test1.c
 test1_LDFLAGS = 
-test1_LDADD = $(usrlib_LTLIBRARIES)
+test1_LDADD = $(lib_LTLIBRARIES)
 test2_SOURCES = test2.c
 test2_LDFLAGS = 
-test2_LDADD = $(usrlib_LTLIBRARIES)
+test2_LDADD = $(lib_LTLIBRARIES)
 #test3_SOURCES = test3.c
 #test3_LDFLAGS = 
-#test3_LDADD = $(usrlib_LTLIBRARIES)
+#test3_LDADD = $(lib_LTLIBRARIES)
 tdict_SOURCES = tdict.c
 tdict_LDFLAGS = 
-tdict_LDADD = $(usrlib_LTLIBRARIES)
+tdict_LDADD = $(lib_LTLIBRARIES)
 
 noinst_SCRIPTS = testit.sh
 
@@ -36,9 +36,7 @@ test1="$(top_builddir)/test1"
 TESTS = $(top_builddir)/testit.sh
 
 include_HEADERS = popt.h
-
-usrlibdir = $(libdir)
-usrlib_LTLIBRARIES = libpopt.la
+lib_LTLIBRARIES = libpopt.la
 
 libpopt_la_SOURCES = popt.c poptparse.c poptconfig.c popthelp.c poptint.c
 
-- 
Gitee


From 490f124f56bc8f6871ce52c5c5b32057efa6d2bf Mon Sep 17 00:00:00 2001
From: Panu Matilainen <pmatilai@redhat.com>
Date: Mon, 16 Mar 2020 17:16:02 +0200
Subject: [PATCH 639/667] Rename all .cvsignore files to .gitignore

---
 .cvsignore => .gitignore |  0
 auto/.cvsignore          |  9 ---------
 m4/.cvsignore            |  4 ----
 po/.cvsignore            | 17 -----------------
 4 files changed, 30 deletions(-)
 rename .cvsignore => .gitignore (100%)
 delete mode 100644 auto/.cvsignore
 delete mode 100644 m4/.cvsignore
 delete mode 100644 po/.cvsignore

diff --git a/.cvsignore b/.gitignore
similarity index 100%
rename from .cvsignore
rename to .gitignore
diff --git a/auto/.cvsignore b/auto/.cvsignore
deleted file mode 100644
index e8383ad..0000000
--- a/auto/.cvsignore
+++ /dev/null
@@ -1,9 +0,0 @@
-descriptors_storage
-header_compile_errors
-Makefile
-Makefile.in
-desc
-logs
-types
-test_results
-tests
diff --git a/m4/.cvsignore b/m4/.cvsignore
deleted file mode 100644
index b5a925a..0000000
--- a/m4/.cvsignore
+++ /dev/null
@@ -1,4 +0,0 @@
-*.m4
-Makefile
-Makefile.am
-Makefile.in
diff --git a/po/.cvsignore b/po/.cvsignore
deleted file mode 100644
index 900ab75..0000000
--- a/po/.cvsignore
+++ /dev/null
@@ -1,17 +0,0 @@
-ChangeLog
-Makefile
-Makefile.in
-Makefile.in.in
-Makevars.template
-POTFILES
-Rules-quot
-stamp-cat-id
-stamp-po
-archive.tar.gz
-libintl.jar
-cat-id-tbl.c
-*.header
-*.mo
-*.gmo
-*.sed
-*.sin
-- 
Gitee


From de49cd1d73e0d16aa38fdc0bc03394109b58ab23 Mon Sep 17 00:00:00 2001
From: Panu Matilainen <pmatilai@redhat.com>
Date: Mon, 16 Mar 2020 17:18:39 +0200
Subject: [PATCH 640/667] Nuke splintrc, should've been in
 8013c2674adb53db7ced12067d347aee041251b7

---
 .splintrc | 40 ----------------------------------------
 1 file changed, 40 deletions(-)
 delete mode 100644 .splintrc

diff --git a/.splintrc b/.splintrc
deleted file mode 100644
index fd0dd12..0000000
--- a/.splintrc
+++ /dev/null
@@ -1,40 +0,0 @@
--I. -DHAVE_CONFIG_H -D_GNU_SOURCE
-
-#+partial
-+forcehints
-
--warnposix
-
-+unixlib
-
--unrecogcomments	# XXX ignore doxygen markings
-
-+strict			# lclint level
-
-# --- in progress
--bounds
--bufferoverflowhigh
--branchstate
-
-# --- +partial artifacts
-
-# --- not-yet at strict level
--elseifcomplete		# 18
--exportfcn		# 29
--ifblock		# 251
--namechecks		# 111
--ptrarith		# 47
-
--mustdefine		# 12
--sys-dir-errors
-
--strictops		# 24
--whileblock		# 15
-
-# --- not-yet at checks level
--mustfree		# 38
--predboolptr		# 82
-
-# --- not-yet at standard level
--boolops		# 124
--predboolint		# 53
-- 
Gitee


From 1f1b6cacaf5b6cc893d2e261c700dd6eb25d7c5a Mon Sep 17 00:00:00 2001
From: Panu Matilainen <pmatilai@redhat.com>
Date: Tue, 17 Mar 2020 12:21:22 +0200
Subject: [PATCH 641/667] Remove AC_CANONICAL_TARGET, popt is not a cross-build
 tool

Probably inherited from rpm back in the day, where it was equally
misplaced, historical confusion and all.
---
 configure.ac | 1 -
 1 file changed, 1 deletion(-)

diff --git a/configure.ac b/configure.ac
index 89a06fe..27ebc3d 100755
--- a/configure.ac
+++ b/configure.ac
@@ -2,7 +2,6 @@ AC_PREREQ(2.57)
 AC_INIT(popt, 1.16, rpm-maint@lists.rpm.org)
 AC_CONFIG_SRCDIR([popt.h])
 AC_CONFIG_HEADERS([config.h])
-AC_CANONICAL_TARGET
 
 dnl Must come before AM_INIT_AUTOMAKE.
 dnl AC_CONFIG_AUX_DIR([build-aux])
-- 
Gitee


From ba3ad7225f9dbab75ca57b29c693f8dda4835f7a Mon Sep 17 00:00:00 2001
From: Panu Matilainen <pmatilai@redhat.com>
Date: Tue, 17 Mar 2020 12:33:52 +0200
Subject: [PATCH 642/667] Simplify autogen.sh

All this magic was likely necessary back in the day, these days
thankfully autoreconf is all that's needed.
---
 autogen.sh | 37 +------------------------------------
 1 file changed, 1 insertion(+), 36 deletions(-)

diff --git a/autogen.sh b/autogen.sh
index 63d786c..22632ed 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -1,38 +1,3 @@
 #!/bin/sh
 
-srcdir="`dirname $0`"
-test -z "$srcdir" && srcdir=.
-
-THEDIR="`pwd`"
-
-libtoolize=`which glibtoolize 2>/dev/null`
-case $libtoolize in
-/*) ;;
-*)  libtoolize=`which libtoolize 2>/dev/null`
-    case $libtoolize in
-    /*) ;;
-    *)  libtoolize=libtoolize
-    esac
-esac
-
-cd "$srcdir"
-$libtoolize --copy --force
-gettextize --copy --force --no-changelog
-perl -p -i~ -e 's/(po\/Makefile\.in)\s+po\/Makefile\.in/$1/' configure.ac
-perl -p -i~ -e 's/(SUBDIRS\s+=\s+po)\s+po/$1/' Makefile.am
-aclocal -I m4
-autoheader
-automake -Wall -Wno-override -a -c
-autoconf
-
-if [ "$1" = "--noconfigure" ]; then 
-    exit 0;
-fi
-
-cd "$THEDIR"
-
-if [ X"$@" = X  -a "X`uname -s`" = "XLinux" ]; then
-    $srcdir/configure --prefix=/usr --libdir=/lib "$@"
-else
-    $srcdir/configure "$@"
-fi
+autoreconf -vi
-- 
Gitee


From 126880d32033cbe65b668580160d289a5e7c466c Mon Sep 17 00:00:00 2001
From: Panu Matilainen <pmatilai@redhat.com>
Date: Tue, 17 Mar 2020 12:35:29 +0200
Subject: [PATCH 643/667] Drop explicit config.rpath from EXTRA_DIST

This is not *our* need but autofoo's, which can and does take care
of including it in the dist tarballs on its own.
---
 Makefile.am | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Makefile.am b/Makefile.am
index b2d75c3..beecc74 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -2,7 +2,7 @@
 
 MCCABE =	pmccabe
 
-EXTRA_DIST = config.rpath lookup3.c autogen.sh CHANGES $(man_MANS) \
+EXTRA_DIST = lookup3.c autogen.sh CHANGES $(man_MANS) \
 	footer_no_timestamp.html libpopt.vers \
 	testit.sh test-poptrc \
 	popt.ps
-- 
Gitee


From 8bab521d924ee91dc4f8a447438713fdf10a7ba3 Mon Sep 17 00:00:00 2001
From: Panu Matilainen <pmatilai@redhat.com>
Date: Tue, 17 Mar 2020 12:42:23 +0200
Subject: [PATCH 644/667] Drop pointless custom doxygen footer

This was added back in the day to avoid multilib conflicts from timestamps
in content, but it could trivially be sorted out on packaging level too.
Such as different sub-packaging, or by just not including the useless doc.
Also doxygen has since grown a HTML_TIMESTAMP option which defaults to
NO, so this is just unneeded now.
---
 Doxyfile.in              | 2 +-
 Makefile.am              | 2 +-
 footer_no_timestamp.html | 5 -----
 3 files changed, 2 insertions(+), 7 deletions(-)
 delete mode 100644 footer_no_timestamp.html

diff --git a/Doxyfile.in b/Doxyfile.in
index 737a73e..84abd05 100644
--- a/Doxyfile.in
+++ b/Doxyfile.in
@@ -658,7 +658,7 @@ HTML_HEADER            =
 # each generated HTML page. If it is left blank doxygen will generate a 
 # standard footer.
 
-HTML_FOOTER            = footer_no_timestamp.html
+HTML_FOOTER            =
 
 # The HTML_STYLESHEET tag can be used to specify a user-defined cascading 
 # style sheet that is used by each HTML page. It can be used to 
diff --git a/Makefile.am b/Makefile.am
index beecc74..32c1654 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -3,7 +3,7 @@
 MCCABE =	pmccabe
 
 EXTRA_DIST = lookup3.c autogen.sh CHANGES $(man_MANS) \
-	footer_no_timestamp.html libpopt.vers \
+	libpopt.vers \
 	testit.sh test-poptrc \
 	popt.ps
 
diff --git a/footer_no_timestamp.html b/footer_no_timestamp.html
deleted file mode 100644
index d32d210..0000000
--- a/footer_no_timestamp.html
+++ /dev/null
@@ -1,5 +0,0 @@
-<hr size="1"><address style="text-align: right;"><small>Generated for $projectname by&nbsp;
-<a href="http://www.doxygen.org/index.html">
-<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> $doxygenversion </small></address>
-</body>
-</html>
-- 
Gitee


From 4dc944aa249018384f563000a8c39cc67019cf6b Mon Sep 17 00:00:00 2001
From: Panu Matilainen <pmatilai@redhat.com>
Date: Tue, 24 Mar 2020 11:21:43 +0200
Subject: [PATCH 645/667] Drop popt.ps from the dist tarballs

This excerpt from the "forthcoming" 1998 Linux Application Development
book belongs to a museum, not source tarballs.
---
 Makefile.am | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index 32c1654..7c5dedb 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -4,8 +4,7 @@ MCCABE =	pmccabe
 
 EXTRA_DIST = lookup3.c autogen.sh CHANGES $(man_MANS) \
 	libpopt.vers \
-	testit.sh test-poptrc \
-	popt.ps
+	testit.sh test-poptrc
 
 SUBDIRS = po . auto
 
-- 
Gitee


From c35247653fd0bd1c8dc39202b6398d48995a7062 Mon Sep 17 00:00:00 2001
From: Panu Matilainen <pmatilai@redhat.com>
Date: Tue, 24 Mar 2020 12:05:13 +0200
Subject: [PATCH 646/667] Eh, our local tests should not be translated

---
 po/POTFILES.in | 1 -
 1 file changed, 1 deletion(-)

diff --git a/po/POTFILES.in b/po/POTFILES.in
index 187372c..2c904a9 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -8,4 +8,3 @@ poptconfig.c
 popthelp.c
 poptint.c
 poptparse.c
-test1.c
-- 
Gitee


From d3e53681d4a9f86b3a2e80ceb379872f31a17bd1 Mon Sep 17 00:00:00 2001
From: Panu Matilainen <pmatilai@redhat.com>
Date: Tue, 24 Mar 2020 12:21:52 +0200
Subject: [PATCH 647/667] Move tests to a subdirectory

No functional changes, just reorg for sanity.
---
 Makefile.am                                | 29 ++-------------------
 configure.ac                               |  2 +-
 tests/Makefile.am                          | 30 ++++++++++++++++++++++
 tdict.c => tests/tdict.c                   |  0
 test-poptrc.in => tests/test-poptrc.in     |  0
 test1.c => tests/test1.c                   |  0
 test2.c => tests/test2.c                   |  0
 {test3-data => tests/test3-data}/01.answer |  0
 {test3-data => tests/test3-data}/01.input  |  0
 {test3-data => tests/test3-data}/02.answer |  0
 {test3-data => tests/test3-data}/02.input  |  0
 {test3-data => tests/test3-data}/03.answer |  0
 {test3-data => tests/test3-data}/03.input  |  0
 test3.c => tests/test3.c                   |  0
 testit.sh => tests/testit.sh               |  0
 15 files changed, 33 insertions(+), 28 deletions(-)
 create mode 100644 tests/Makefile.am
 rename tdict.c => tests/tdict.c (100%)
 rename test-poptrc.in => tests/test-poptrc.in (100%)
 rename test1.c => tests/test1.c (100%)
 rename test2.c => tests/test2.c (100%)
 rename {test3-data => tests/test3-data}/01.answer (100%)
 rename {test3-data => tests/test3-data}/01.input (100%)
 rename {test3-data => tests/test3-data}/02.answer (100%)
 rename {test3-data => tests/test3-data}/02.input (100%)
 rename {test3-data => tests/test3-data}/03.answer (100%)
 rename {test3-data => tests/test3-data}/03.input (100%)
 rename test3.c => tests/test3.c (100%)
 rename testit.sh => tests/testit.sh (100%)

diff --git a/Makefile.am b/Makefile.am
index 7c5dedb..af7c4ab 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -3,37 +3,15 @@
 MCCABE =	pmccabe
 
 EXTRA_DIST = lookup3.c autogen.sh CHANGES $(man_MANS) \
-	libpopt.vers \
-	testit.sh test-poptrc
+	libpopt.vers
 
-SUBDIRS = po . auto
+SUBDIRS = po . auto tests
 
 AM_CPPFLAGS = -I. -I$(top_srcdir)
 AM_CPPFLAGS += -DPOPT_SYSCONFDIR="\"$(sysconfdir)\""
 
 noinst_HEADERS = poptint.h system.h
 
-noinst_PROGRAMS = test1 test2 tdict # test3
-test1_SOURCES = test1.c
-test1_LDFLAGS = 
-test1_LDADD = $(lib_LTLIBRARIES)
-test2_SOURCES = test2.c
-test2_LDFLAGS = 
-test2_LDADD = $(lib_LTLIBRARIES)
-#test3_SOURCES = test3.c
-#test3_LDFLAGS = 
-#test3_LDADD = $(lib_LTLIBRARIES)
-tdict_SOURCES = tdict.c
-tdict_LDFLAGS = 
-tdict_LDADD = $(lib_LTLIBRARIES)
-
-noinst_SCRIPTS = testit.sh
-
-TESTS_ENVIRONMENT = \
-test1="$(top_builddir)/test1"
-
-TESTS = $(top_builddir)/testit.sh
-
 include_HEADERS = popt.h
 lib_LTLIBRARIES = libpopt.la
 
@@ -54,9 +32,6 @@ man_MANS = popt.3
 
 BUILT_SOURCES = popt.pc # popt.lcd
 
-distclean-local:
-	rm -rf .ccache
-
 .PHONY:	updatepo
 updatepo:
 	rsync -Lrtvz  translationproject.org::tp/latest/popt/  po
diff --git a/configure.ac b/configure.ac
index 27ebc3d..a8aac47 100755
--- a/configure.ac
+++ b/configure.ac
@@ -58,7 +58,7 @@ AM_ICONV_LINK
 
 AC_CONFIG_SUBDIRS()
 AC_CONFIG_FILES([ po/Makefile.in
-    Doxyfile Makefile popt.pc test-poptrc
+    Doxyfile Makefile popt.pc tests/test-poptrc tests/Makefile
     auto/Makefile auto/desc auto/types
 ])
 AC_OUTPUT
diff --git a/tests/Makefile.am b/tests/Makefile.am
new file mode 100644
index 0000000..6bca01f
--- /dev/null
+++ b/tests/Makefile.am
@@ -0,0 +1,30 @@
+# Makefile for popt library.
+
+EXTRA_DIST = testit.sh test-poptrc
+
+AM_CPPFLAGS = -I. -I$(top_srcdir)
+
+noinst_PROGRAMS = test1 test2 tdict # test3
+test1_SOURCES = test1.c
+test1_LDFLAGS = 
+test1_LDADD = $(top_builddir)/libpopt.la
+test2_SOURCES = test2.c
+test2_LDFLAGS = 
+test2_LDADD = $(top_builddir)/libpopt.la
+#test3_SOURCES = test3.c
+#test3_LDFLAGS = 
+#ltest3_LDADD = $(top_builddir)/libpopt.la
+tdict_SOURCES = tdict.c
+tdict_LDFLAGS = 
+tdict_LDADD = $(top_builddir)/libpopt.la
+
+noinst_SCRIPTS = testit.sh
+
+TESTS_ENVIRONMENT = \
+test1="test1"
+
+TESTS = testit.sh
+
+distclean-local:
+	rm -rf .ccache
+
diff --git a/tdict.c b/tests/tdict.c
similarity index 100%
rename from tdict.c
rename to tests/tdict.c
diff --git a/test-poptrc.in b/tests/test-poptrc.in
similarity index 100%
rename from test-poptrc.in
rename to tests/test-poptrc.in
diff --git a/test1.c b/tests/test1.c
similarity index 100%
rename from test1.c
rename to tests/test1.c
diff --git a/test2.c b/tests/test2.c
similarity index 100%
rename from test2.c
rename to tests/test2.c
diff --git a/test3-data/01.answer b/tests/test3-data/01.answer
similarity index 100%
rename from test3-data/01.answer
rename to tests/test3-data/01.answer
diff --git a/test3-data/01.input b/tests/test3-data/01.input
similarity index 100%
rename from test3-data/01.input
rename to tests/test3-data/01.input
diff --git a/test3-data/02.answer b/tests/test3-data/02.answer
similarity index 100%
rename from test3-data/02.answer
rename to tests/test3-data/02.answer
diff --git a/test3-data/02.input b/tests/test3-data/02.input
similarity index 100%
rename from test3-data/02.input
rename to tests/test3-data/02.input
diff --git a/test3-data/03.answer b/tests/test3-data/03.answer
similarity index 100%
rename from test3-data/03.answer
rename to tests/test3-data/03.answer
diff --git a/test3-data/03.input b/tests/test3-data/03.input
similarity index 100%
rename from test3-data/03.input
rename to tests/test3-data/03.input
diff --git a/test3.c b/tests/test3.c
similarity index 100%
rename from test3.c
rename to tests/test3.c
diff --git a/testit.sh b/tests/testit.sh
similarity index 100%
rename from testit.sh
rename to tests/testit.sh
-- 
Gitee


From 378ef7a7a4ee4116e4529b8564980c5dd794bf5d Mon Sep 17 00:00:00 2001
From: Panu Matilainen <pmatilai@redhat.com>
Date: Tue, 24 Mar 2020 14:10:02 +0200
Subject: [PATCH 648/667] Add CI recipe for docker/podman and a local make
 target for it

---
 Makefile.am   |  7 ++++++-
 ci/Dockerfile | 25 +++++++++++++++++++++++++
 2 files changed, 31 insertions(+), 1 deletion(-)
 create mode 100644 ci/Dockerfile

diff --git a/Makefile.am b/Makefile.am
index af7c4ab..df6d16c 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -2,7 +2,7 @@
 
 MCCABE =	pmccabe
 
-EXTRA_DIST = lookup3.c autogen.sh CHANGES $(man_MANS) \
+EXTRA_DIST = lookup3.c autogen.sh CHANGES $(man_MANS) ci/Dockerfile \
 	libpopt.vers
 
 SUBDIRS = po . auto tests
@@ -32,6 +32,11 @@ man_MANS = popt.3
 
 BUILT_SOURCES = popt.pc # popt.lcd
 
+.PHONY: ci
+ci:
+	podman build -t popt -f ci/Dockerfile .
+	podman run -t popt
+
 .PHONY:	updatepo
 updatepo:
 	rsync -Lrtvz  translationproject.org::tp/latest/popt/  po
diff --git a/ci/Dockerfile b/ci/Dockerfile
new file mode 100644
index 0000000..cf0d55c
--- /dev/null
+++ b/ci/Dockerfile
@@ -0,0 +1,25 @@
+FROM fedora:latest
+MAINTAINER rpm-maint@lists.rpm.org
+
+WORKDIR /srv/popt
+
+RUN echo -e "deltarpm=0\ninstall_weak_deps=0\ntsflags=nodocs" >> /etc/dnf/dnf.conf
+RUN rm -f /etc/yum.repos.d/*modular.repo
+RUN dnf -y update
+RUN dnf -y install \
+  autoconf \
+  automake \
+  libtool \
+  gettext-devel \
+  make \
+  gcc \
+  binutils \
+  && dnf clean all
+
+COPY . .
+
+RUN autoreconf -vi
+RUN ./configure
+RUN make
+
+CMD make distcheck
-- 
Gitee


From 544e0ad9e9eac7db6c8a8027aa22b4d71e3feca9 Mon Sep 17 00:00:00 2001
From: Panu Matilainen <pmatilai@redhat.com>
Date: Tue, 24 Mar 2020 13:16:20 +0200
Subject: [PATCH 649/667] Move sources to src/ subdirectory

Just more reorg for sanity...
---
 Makefile.am                      | 23 ++---------------------
 configure.ac                     |  4 ++--
 po/POTFILES.in                   | 12 ++++++------
 src/Makefile.am                  | 22 ++++++++++++++++++++++
 libpopt.vers => src/libpopt.vers |  0
 lookup3.c => src/lookup3.c       |  0
 popt.c => src/popt.c             |  0
 popt.h => src/popt.h             |  0
 poptconfig.c => src/poptconfig.c |  0
 popthelp.c => src/popthelp.c     |  0
 poptint.c => src/poptint.c       |  0
 poptint.h => src/poptint.h       |  0
 poptparse.c => src/poptparse.c   |  0
 system.h => src/system.h         |  0
 tests/Makefile.am                | 10 +++++-----
 15 files changed, 37 insertions(+), 34 deletions(-)
 create mode 100644 src/Makefile.am
 rename libpopt.vers => src/libpopt.vers (100%)
 rename lookup3.c => src/lookup3.c (100%)
 rename popt.c => src/popt.c (100%)
 rename popt.h => src/popt.h (100%)
 rename poptconfig.c => src/poptconfig.c (100%)
 rename popthelp.c => src/popthelp.c (100%)
 rename poptint.c => src/poptint.c (100%)
 rename poptint.h => src/poptint.h (100%)
 rename poptparse.c => src/poptparse.c (100%)
 rename system.h => src/system.h (100%)

diff --git a/Makefile.am b/Makefile.am
index df6d16c..c439d6e 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -2,32 +2,13 @@
 
 MCCABE =	pmccabe
 
-EXTRA_DIST = lookup3.c autogen.sh CHANGES $(man_MANS) ci/Dockerfile \
-	libpopt.vers
+EXTRA_DIST = autogen.sh CHANGES $(man_MANS) ci/Dockerfile
 
-SUBDIRS = po . auto tests
-
-AM_CPPFLAGS = -I. -I$(top_srcdir)
-AM_CPPFLAGS += -DPOPT_SYSCONFDIR="\"$(sysconfdir)\""
-
-noinst_HEADERS = poptint.h system.h
-
-include_HEADERS = popt.h
-lib_LTLIBRARIES = libpopt.la
-
-libpopt_la_SOURCES = popt.c poptparse.c poptconfig.c popthelp.c poptint.c
-
-libpopt_la_LDFLAGS = -no-undefined @LTLIBINTL@ @LTLIBICONV@
-# libtool current:revision:age info
-libpopt_la_LDFLAGS += -version-info 0:0:0
+SUBDIRS = src po auto tests
 
 pkgconfigdir = $(prefix)/lib/pkgconfig
 pkgconfig_DATA = popt.pc
 
-if HAVE_LD_VERSION_SCRIPT
-libpopt_la_LDFLAGS += -Wl,--version-script=$(top_srcdir)/libpopt.vers
-endif
-
 man_MANS = popt.3
 
 BUILT_SOURCES = popt.pc # popt.lcd
diff --git a/configure.ac b/configure.ac
index a8aac47..1a1f890 100755
--- a/configure.ac
+++ b/configure.ac
@@ -1,6 +1,6 @@
 AC_PREREQ(2.57)
 AC_INIT(popt, 1.16, rpm-maint@lists.rpm.org)
-AC_CONFIG_SRCDIR([popt.h])
+AC_CONFIG_SRCDIR([src/popt.h])
 AC_CONFIG_HEADERS([config.h])
 
 dnl Must come before AM_INIT_AUTOMAKE.
@@ -58,7 +58,7 @@ AM_ICONV_LINK
 
 AC_CONFIG_SUBDIRS()
 AC_CONFIG_FILES([ po/Makefile.in
-    Doxyfile Makefile popt.pc tests/test-poptrc tests/Makefile
+    Doxyfile Makefile src/Makefile popt.pc tests/test-poptrc tests/Makefile
     auto/Makefile auto/desc auto/types
 ])
 AC_OUTPUT
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 2c904a9..06c6bc0 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -2,9 +2,9 @@
 
 # Package source files
 
-popt.c
-popt.h
-poptconfig.c
-popthelp.c
-poptint.c
-poptparse.c
+src/popt.c
+src/popt.h
+src/poptconfig.c
+src/popthelp.c
+src/poptint.c
+src/poptparse.c
diff --git a/src/Makefile.am b/src/Makefile.am
new file mode 100644
index 0000000..a5d5323
--- /dev/null
+++ b/src/Makefile.am
@@ -0,0 +1,22 @@
+# Makefile for popt library.
+
+EXTRA_DIST = lookup3.c libpopt.vers
+
+AM_CPPFLAGS = -I. -I$(top_srcdir)
+AM_CPPFLAGS += -DPOPT_SYSCONFDIR="\"$(sysconfdir)\""
+
+noinst_HEADERS = poptint.h system.h
+
+include_HEADERS = popt.h
+lib_LTLIBRARIES = libpopt.la
+
+libpopt_la_SOURCES = popt.c poptparse.c poptconfig.c popthelp.c poptint.c
+
+libpopt_la_LDFLAGS = -no-undefined @LTLIBINTL@ @LTLIBICONV@
+# libtool current:revision:age info
+libpopt_la_LDFLAGS += -version-info 0:0:0
+
+if HAVE_LD_VERSION_SCRIPT
+libpopt_la_LDFLAGS += -Wl,--version-script=$(top_srcdir)/src/libpopt.vers
+endif
+
diff --git a/libpopt.vers b/src/libpopt.vers
similarity index 100%
rename from libpopt.vers
rename to src/libpopt.vers
diff --git a/lookup3.c b/src/lookup3.c
similarity index 100%
rename from lookup3.c
rename to src/lookup3.c
diff --git a/popt.c b/src/popt.c
similarity index 100%
rename from popt.c
rename to src/popt.c
diff --git a/popt.h b/src/popt.h
similarity index 100%
rename from popt.h
rename to src/popt.h
diff --git a/poptconfig.c b/src/poptconfig.c
similarity index 100%
rename from poptconfig.c
rename to src/poptconfig.c
diff --git a/popthelp.c b/src/popthelp.c
similarity index 100%
rename from popthelp.c
rename to src/popthelp.c
diff --git a/poptint.c b/src/poptint.c
similarity index 100%
rename from poptint.c
rename to src/poptint.c
diff --git a/poptint.h b/src/poptint.h
similarity index 100%
rename from poptint.h
rename to src/poptint.h
diff --git a/poptparse.c b/src/poptparse.c
similarity index 100%
rename from poptparse.c
rename to src/poptparse.c
diff --git a/system.h b/src/system.h
similarity index 100%
rename from system.h
rename to src/system.h
diff --git a/tests/Makefile.am b/tests/Makefile.am
index 6bca01f..47f0f11 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -2,21 +2,21 @@
 
 EXTRA_DIST = testit.sh test-poptrc
 
-AM_CPPFLAGS = -I. -I$(top_srcdir)
+AM_CPPFLAGS = -I. -I$(top_srcdir)/src
 
 noinst_PROGRAMS = test1 test2 tdict # test3
 test1_SOURCES = test1.c
 test1_LDFLAGS = 
-test1_LDADD = $(top_builddir)/libpopt.la
+test1_LDADD = $(top_builddir)/src/libpopt.la
 test2_SOURCES = test2.c
 test2_LDFLAGS = 
-test2_LDADD = $(top_builddir)/libpopt.la
+test2_LDADD = $(top_builddir)/src/libpopt.la
 #test3_SOURCES = test3.c
 #test3_LDFLAGS = 
-#ltest3_LDADD = $(top_builddir)/libpopt.la
+#ltest3_LDADD = $(top_builddir)/src/libpopt.la
 tdict_SOURCES = tdict.c
 tdict_LDFLAGS = 
-tdict_LDADD = $(top_builddir)/libpopt.la
+tdict_LDADD = $(top_builddir)/src/libpopt.la
 
 noinst_SCRIPTS = testit.sh
 
-- 
Gitee


From 788df492512fa4e6bb73b8d410137ac502cc1654 Mon Sep 17 00:00:00 2001
From: Panu Matilainen <pmatilai@redhat.com>
Date: Fri, 27 Mar 2020 13:04:06 +0200
Subject: [PATCH 650/667] Bump gettext version to 0.18.2

For whatever reason, popt doesn't trigger the deprecation messages
from gettext 0.16.1 that rpm does. Nevertheless, 0.16.1 is really
long in the tooth, update to something a little newer (and stay in
sync with rpm)
---
 configure.ac | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/configure.ac b/configure.ac
index 1a1f890..7bed923 100755
--- a/configure.ac
+++ b/configure.ac
@@ -52,7 +52,7 @@ AC_ARG_ENABLE(build-gcov,
 AC_SEARCH_LIBS(setreuid, [ucb])
 AC_CHECK_FUNCS(getuid geteuid iconv mtrace __secure_getenv setreuid setuid stpcpy strerror vasprintf srandom)
 
-AM_GNU_GETTEXT_VERSION([0.16.1])
+AM_GNU_GETTEXT_VERSION([0.18.2])
 AM_GNU_GETTEXT([external])
 AM_ICONV_LINK
 
-- 
Gitee


From 812120b7778d461e32ad8d11d92f3b3f810bc172 Mon Sep 17 00:00:00 2001
From: Panu Matilainen <pmatilai@redhat.com>
Date: Fri, 27 Mar 2020 13:13:51 +0200
Subject: [PATCH 651/667] Move the auxiliary build tool clutter to a
 subdirectory

---
 Makefile.am  | 2 +-
 configure.ac | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index c439d6e..2cd0570 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -2,7 +2,7 @@
 
 MCCABE =	pmccabe
 
-EXTRA_DIST = autogen.sh CHANGES $(man_MANS) ci/Dockerfile
+EXTRA_DIST = autogen.sh CHANGES $(man_MANS) ci/Dockerfile build-aux
 
 SUBDIRS = src po auto tests
 
diff --git a/configure.ac b/configure.ac
index 7bed923..5c38f1e 100755
--- a/configure.ac
+++ b/configure.ac
@@ -4,7 +4,7 @@ AC_CONFIG_SRCDIR([src/popt.h])
 AC_CONFIG_HEADERS([config.h])
 
 dnl Must come before AM_INIT_AUTOMAKE.
-dnl AC_CONFIG_AUX_DIR([build-aux])
+AC_CONFIG_AUX_DIR([build-aux])
 AC_CONFIG_MACRO_DIR([m4])
 AM_INIT_AUTOMAKE([1.10 foreign -Wall])
 
-- 
Gitee


From f54578987042ba6d92744321b28032d7042861b1 Mon Sep 17 00:00:00 2001
From: Peter Jones <pjones@redhat.com>
Date: Fri, 28 Jul 2017 16:11:40 -0400
Subject: [PATCH 652/667] Don't leak the last argument expanded by
 expandNextArg()

While using POPT_ARG_ARGV, I noticed this in valgrind's leak checker:

==1738== HEAP SUMMARY:
==1738==     in use at exit: 8 bytes in 1 blocks
==1738==   total heap usage: 94 allocs, 93 frees, 42,319 bytes allocated
==1738==
==1738== 8 bytes in 1 blocks are definitely lost in loss record 1 of 1
==1738==    at 0x4C2EB6B: malloc (vg_replace_malloc.c:299)
==1738==    by 0x4E3DF47: expandNextArg (popt.c:699)
==1738==    by 0x4E3F681: poptGetNextOpt (popt.c:1501)
==1738==    by 0x401F72: main (bingrep.c:433)
==1738==
==1738== LEAK SUMMARY:
==1738==    definitely lost: 8 bytes in 1 blocks
==1738==    indirectly lost: 0 bytes in 0 blocks
==1738==      possibly lost: 0 bytes in 0 blocks
==1738==    still reachable: 0 bytes in 0 blocks
==1738==         suppressed: 0 bytes in 0 blocks

My command line argument is a 7-byte string, and on first glance, it
appears this is because both expandNextArg() and poptSaveString()
duplicate the string.  The copy from poptSaveString() is the consuming
program's responsibility to free, but the intermediate pointer is popt's
responsibility.

Upon further examination, it appears popt normally does free this
string, but it only does it on the next entry to poptGetNextOpt(), and
on cleanOSE() in the case if we're not already at the bottom of
con->OptionStack.

This patch modifies poptResetContext() to ensure we'll always attempt to
free con->os->nextArg regardless of our position in the OptionStack, and
removes the duplicate free of con->os->argb in poptFreeContext(), as
it's called unconditionally by the poptResetContext() call on the
previous line.

This ensures that if poptGetNextOpt() isn't re-intered, poptFreeContext()
will free the memory that was allocated.  Now valgrind tells me:

==31734== HEAP SUMMARY:
==31734==     in use at exit: 0 bytes in 0 blocks
==31734==   total heap usage: 94 allocs, 94 frees, 42,319 bytes allocated
==31734==
==31734== All heap blocks were freed -- no leaks are possible

Signed-off-by: Peter Jones <pjones@redhat.com>
---
 src/popt.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/popt.c b/src/popt.c
index fcaecac..f86fecb 100644
--- a/src/popt.c
+++ b/src/popt.c
@@ -198,7 +198,7 @@ void poptResetContext(poptContext con)
     con->os->argb = PBM_FREE(con->os->argb);
     con->os->currAlias = NULL;
     con->os->nextCharArg = NULL;
-    con->os->nextArg = NULL;
+    con->os->nextArg = _free(con->os->nextArg);
     con->os->next = 1;			/* skip argv[0] */
 
     con->numLeftovers = 0;
@@ -1513,7 +1513,6 @@ poptContext poptFreeContext(poptContext con)
 {
     if (con == NULL) return con;
     poptResetContext(con);
-    con->os->argb = _free(con->os->argb);
 
     con->aliases = poptFreeItems(con->aliases, con->numAliases);
     con->numAliases = 0;
-- 
Gitee


From e8de43ed529c103b0376256ac357b862c1d1b3c9 Mon Sep 17 00:00:00 2001
From: Panu Matilainen <pmatilai@redhat.com>
Date: Thu, 16 Apr 2020 12:52:58 +0300
Subject: [PATCH 653/667] Drop NeXTSTEP <unistd.h> kludgery from last millenium

If NeXTSTEP doesn't have working <unistd.h> that's just too bad,
we expect a remotely standard POSIX system. Include <unistd.h>
directly where actually needed.
---
 configure.ac     |  2 +-
 src/popt.c       |  1 +
 src/poptconfig.c |  1 +
 src/system.h     | 10 ----------
 4 files changed, 3 insertions(+), 11 deletions(-)

diff --git a/configure.ac b/configure.ac
index 5c38f1e..c595459 100755
--- a/configure.ac
+++ b/configure.ac
@@ -18,7 +18,7 @@ AC_PROG_LIBTOOL
 
 AC_SYS_LARGEFILE
 
-AC_CHECK_HEADERS(float.h fnmatch.h glob.h langinfo.h libintl.h mcheck.h unistd.h)
+AC_CHECK_HEADERS(float.h fnmatch.h glob.h langinfo.h libintl.h mcheck.h)
 
 # For some systems we know that we have ld_version scripts.
 # Use it then as default.
diff --git a/src/popt.c b/src/popt.c
index f86fecb..b043e5b 100644
--- a/src/popt.c
+++ b/src/popt.c
@@ -14,6 +14,7 @@
 #include <float.h>
 #endif
 #include <math.h>
+#include <unistd.h>
 
 #include "poptint.h"
 
diff --git a/src/poptconfig.c b/src/poptconfig.c
index 564fac1..32dfe22 100644
--- a/src/poptconfig.c
+++ b/src/poptconfig.c
@@ -9,6 +9,7 @@
 #include "system.h"
 #include "poptint.h"
 #include <sys/stat.h>
+#include <unistd.h>
 
 #if defined(HAVE_FNMATCH_H)
 #include <fnmatch.h>
diff --git a/src/system.h b/src/system.h
index beb1391..1ea1287 100644
--- a/src/system.h
+++ b/src/system.h
@@ -23,16 +23,6 @@
 #include <stdlib.h>
 #include <string.h>
 
-#if defined(HAVE_UNISTD_H)
-#include <unistd.h>
-#endif
-
-#ifdef __NeXT
-/* access macros are not declared in non posix mode in unistd.h -
- don't try to use posix on NeXTstep 3.3 ! */
-#include <libc.h>
-#endif
-
 void * xmalloc (size_t size);
 
 void * xcalloc (size_t nmemb, size_t size);
-- 
Gitee


From 913cd39461997e497ae68853c6b15b6cd1afd408 Mon Sep 17 00:00:00 2001
From: Panu Matilainen <pmatilai@redhat.com>
Date: Thu, 16 Apr 2020 13:13:47 +0300
Subject: [PATCH 654/667] Move a bunch of includes out of system.h, include
 where actually needed

---
 src/popt.c       | 2 ++
 src/poptconfig.c | 2 ++
 src/poptint.c    | 1 +
 src/system.h     | 5 -----
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/popt.c b/src/popt.c
index b043e5b..f270c7e 100644
--- a/src/popt.c
+++ b/src/popt.c
@@ -15,6 +15,8 @@
 #endif
 #include <math.h>
 #include <unistd.h>
+#include <limits.h>
+#include <errno.h>
 
 #include "poptint.h"
 
diff --git a/src/poptconfig.c b/src/poptconfig.c
index 32dfe22..9d97ccd 100644
--- a/src/poptconfig.c
+++ b/src/poptconfig.c
@@ -10,6 +10,8 @@
 #include "poptint.h"
 #include <sys/stat.h>
 #include <unistd.h>
+#include <fcntl.h>
+#include <errno.h>
 
 #if defined(HAVE_FNMATCH_H)
 #include <fnmatch.h>
diff --git a/src/poptint.c b/src/poptint.c
index 14aafa4..ea57737 100644
--- a/src/poptint.c
+++ b/src/poptint.c
@@ -1,5 +1,6 @@
 #include "system.h"
 #include <stdarg.h>
+#include <errno.h>
 #include "poptint.h"
 
 /* Any pair of 32 bit hashes can be used. lookup3.c generates pairs, will do. */
diff --git a/src/system.h b/src/system.h
index 1ea1287..7f8d71e 100644
--- a/src/system.h
+++ b/src/system.h
@@ -11,15 +11,10 @@
 /* XXX isspace(3) has i18n encoding signednesss issues on Solaris. */
 #define	_isspaceptr(_chp)	isspace((int)(*(unsigned char *)(_chp)))
 
-#include <errno.h>
-#include <fcntl.h>
-#include <limits.h>
-
 #ifdef HAVE_MCHECK_H
 #include <mcheck.h>
 #endif
 
-#include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 
-- 
Gitee


From 07fd737d9d8305c13626097a11e73735a0b12cb3 Mon Sep 17 00:00:00 2001
From: Panu Matilainen <pmatilai@redhat.com>
Date: Thu, 16 Apr 2020 13:26:07 +0300
Subject: [PATCH 655/667] Drop broken test for float.h

The code doesn't compile without float.h due to FLT_MIN/MAX so why bother?
Drop DBL_EPSILON compat define while at it, this is all standard stuff.
---
 configure.ac | 2 +-
 src/popt.c   | 5 -----
 2 files changed, 1 insertion(+), 6 deletions(-)

diff --git a/configure.ac b/configure.ac
index c595459..a2717bc 100755
--- a/configure.ac
+++ b/configure.ac
@@ -18,7 +18,7 @@ AC_PROG_LIBTOOL
 
 AC_SYS_LARGEFILE
 
-AC_CHECK_HEADERS(float.h fnmatch.h glob.h langinfo.h libintl.h mcheck.h)
+AC_CHECK_HEADERS(fnmatch.h glob.h langinfo.h libintl.h mcheck.h)
 
 # For some systems we know that we have ld_version scripts.
 # Use it then as default.
diff --git a/src/popt.c b/src/popt.c
index f270c7e..d4c357d 100644
--- a/src/popt.c
+++ b/src/popt.c
@@ -10,9 +10,7 @@
 
 #include "system.h"
 
-#ifdef HAVE_FLOAT_H
 #include <float.h>
-#endif
 #include <math.h>
 #include <unistd.h>
 #include <limits.h>
@@ -1182,9 +1180,6 @@ static int poptSaveArg(poptContext con, const struct poptOption * opt)
 	    arg.doublep[0] = aDouble;
 	    break;
 	case POPT_ARG_FLOAT:
-#if !defined(DBL_EPSILON)
-#define DBL_EPSILON 2.2204460492503131e-16
-#endif
 #define POPT_ABS(a)	((((a) - 0.0) < DBL_EPSILON) ? -(a) : (a))
 	    if ((FLT_MIN - POPT_ABS(aDouble)) > DBL_EPSILON
 	     || (POPT_ABS(aDouble) - FLT_MAX) > DBL_EPSILON)
-- 
Gitee


From 7d18e6f43c93bce2d78754c084ac54b91dc04eca Mon Sep 17 00:00:00 2001
From: Panu Matilainen <pmatilai@redhat.com>
Date: Thu, 16 Apr 2020 13:30:39 +0300
Subject: [PATCH 656/667] Move <langinfo.h> conditional include where actually
 needed

---
 src/poptint.c | 3 +++
 src/poptint.h | 4 ----
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/src/poptint.c b/src/poptint.c
index ea57737..0cec176 100644
--- a/src/poptint.c
+++ b/src/poptint.c
@@ -1,6 +1,9 @@
 #include "system.h"
 #include <stdarg.h>
 #include <errno.h>
+#ifdef HAVE_LANGINFO_H
+#include <langinfo.h>
+#endif
 #include "poptint.h"
 
 /* Any pair of 32 bit hashes can be used. lookup3.c generates pairs, will do. */
diff --git a/src/poptint.h b/src/poptint.h
index a9cbf44..ab5d06e 100644
--- a/src/poptint.h
+++ b/src/poptint.h
@@ -121,10 +121,6 @@ struct poptContext_s {
 #include <iconv.h>
 #endif
 
-#ifdef HAVE_LANGINFO_H
-#include <langinfo.h>
-#endif
-
 #if defined(HAVE_DCGETTEXT)
 char *POPT_dgettext(const char * dom, const char * str);
 #endif
-- 
Gitee


From 8274d5b7b59d274150b9a6fbb64ddfd4dfc0d1e0 Mon Sep 17 00:00:00 2001
From: Panu Matilainen <pmatilai@redhat.com>
Date: Thu, 16 Apr 2020 14:20:53 +0300
Subject: [PATCH 657/667] Convert the documentation PS to PDF and include again
 in tarballs

The pdf is about 1/6 of the size with no quality loss that I can tell.
It's actual professionally written documentation even if a bit outdated,
might as well include it. Also fixup the reference in the README.
---
 Makefile.am |    2 +-
 README      |    2 +-
 popt.pdf    |  Bin 0 -> 77585 bytes
 popt.ps     | 7963 ---------------------------------------------------
 4 files changed, 2 insertions(+), 7965 deletions(-)
 create mode 100644 popt.pdf
 delete mode 100644 popt.ps

diff --git a/Makefile.am b/Makefile.am
index 2cd0570..78834ed 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -2,7 +2,7 @@
 
 MCCABE =	pmccabe
 
-EXTRA_DIST = autogen.sh CHANGES $(man_MANS) ci/Dockerfile build-aux
+EXTRA_DIST = autogen.sh CHANGES $(man_MANS) ci/Dockerfile build-aux popt.pdf
 
 SUBDIRS = src po auto tests
 
diff --git a/README b/README
index 88d06e7..15ce387 100644
--- a/README
+++ b/README
@@ -8,7 +8,7 @@ to getopt(3), it contains a number of enhancements, including:
 	4) popt provides convience functions for parsing strings
 	   into argv[] style arrays
 
-Complete documentation on popt(3) is available in popt.ps (included in this
+Complete documentation on popt(3) is available in popt.pdf (included in this
 tarball), which is excerpted with permission from the book "Linux
 Application Development" by Michael K. Johnson and Erik Troan (available
 from Addison Wesley in May, 1998).
diff --git a/popt.pdf b/popt.pdf
new file mode 100644
index 0000000000000000000000000000000000000000..017b6d429f8ccfbaff1f3c41e13abad18c71bbd2
GIT binary patch
literal 77585
zcma%>Lv${{)~3TRwr$(yiEZ1qbz<ALZQC|ZY}-!y-d=yN9`vLqyK23o8dcTv>`kU1
zB1XqV&k9X8b`@6$%|^&bXm4Z%&CAOmV`^vaVnN9MpG1j4%+kii)QONm%*N2gRK(QS
z-o%ujAKKZ)$<)vm+9P{Jd)*Fi3<>;Uysq88g9A~#hXLv#pHs?cOwJ}FfZ(cs-bgW8
zR0|zz;-i@Nh(LKoTlMuR9@UhD5i-WxtD=_Q)#|)M;AWWE9psnhm!D6d^LPAKjv?;p
z<~rfu_qznZMnL}8io%T{t~c22tM8HI>#xrsyS33xI=+>BmFcxj4uKcX=>`x3D$ahO
z<)1~C-hl>FNd8u&8Xo!$uc(n5xdJE%sucZ0$`mn8q7U=5yo%qcqEm5Xv$uN*a`5X(
z0r@%izns9=*}UMgAvr2tC|BuTS1t}bWyd#1UlzX$`uIM64|fZ48AB6&vG}>TzQBog
zGhxb>17(Sm^h8(HQBec$y*q#X7(d7EUO)0*)9&2efPbC6I9E4lh1<Wy=U+g-atKsD
zhI;=UWAPFYEDOl<b1ia~0lo9{alg;3eai3KW*+loiw@9w{korhL;ut|fM>(+4mojt
z{gCj=LS>2yiE1=gDSw~mr&<U(6XNqq9t)*zxcG6ZEiw>er@v_IUGB~Nj1188ms>dc
zk{uZNZVBik*t4V#FiWTcrVwA{?<FC0!#vO&f1?;j$G<i4jg6k_Q#uLDWvSZ!oxR8_
z6+vdg&B?2Ee!o(7hQ?5%D$x$Wkicb~N6!2mWgp}CNPM1X;>4ucH!;|3=YSDcEZIxa
zX<q%?2L4xgVdMvx70lEytZt)9z2;Mz9coQ*F$IYngxi8c{c`6#W7$D*83^>(gEO^0
z62Rsd({1TH1)t*rd?ZmHH1rB@;QIjUkZm55bM)T5%xGR_3Kovikd49KTP1yfJ!YC<
zjJSkZ@Sv54H+TRf+PaBh8K98-ykFSbc|*t-MBd^Ywfxz~9>Xwyg14u6E1)^_EXo6(
z_}f_X?_33<q5K~K01m{%0_Md2>BlgO1t$p0|A9{mOUSJ2_rd@?Ism*fec)Ce9{CA5
z#_&)w@%`ZyeoX95bZi_|EC|x(Hgmf=SUR7__EwTjU6cLt`A0z0jb>1fS?J(`>koCl
z+SNhyZ9dRa1^9F&rkG2)z@mvS_mqDylt{UMHh~;gLPN?Yh0QtULwy}QFszW~=02Hh
zY0<fD{Hvg5kzRGo$b}+(AOb}NHQd7bi(&>Oq3UPcCK96O{5>7#mPJ*te2|L-ch^NU
zek>lJl)-X1JTWmkFOT~{F$D+m+_8aE$n&Ni&?SI3D#?#fP(z(|CzEQQZO)-}pw%=E
zkw&IIMbe{R?Gm&S8pH-*Mj?^X!N-}Orb!0akssllkyvt|tt5_lnPu~fz)p)=Of);_
zd}nx`v6yy#kr8h{)UbZ+v3xtIo1l-U!PP)x%`JwX3>nvb(qyP-21K+FDqDA*E3^+~
zQAZ+xl~BV$!r8Uvr{SdDMH@?Lc35C_!rNnm->*VhsUgo4#7tqH8E^m4y$?nF%2WCT
zbTLPP6s+FMGchD%t3E|?)S{)m-d1BhDc3~h&O%lmIWj~FgvwREj!Cf0IjZ|L)Tdl?
z!nIwqvJ55wx}(t=>pkvgEC+H0C{&ni%;eDO5F%m*iqo#3=N(S+MLkV*jJoA^5DIG6
z3_2YZ4Lm;e31oo0VVMii;x>C;4dJczTF2dZsA<}<YrwN)4d64RzYl{4JHQSpBh^y$
zd|=5WZiB+t+Nr_b2W+dQCeud<=l;EuMuU)GD>G#p`;^&XRH>ovOgXTrF_-AcLbR~#
zx5~q(-yZ6{6lettk7+LAZ}EC(V6W60oE#Dv$hgSCdXFyVRk5uwURV{-*a-;RaW**i
z4T#<jbrB3c*5r(kmdlTOH>u;GOtnafnrvhoMMbNvX`)%ZcbYt&;5jE1Y$XiR2NMh*
z5Lo~OVoAlybWM2qG@0{u8wqcIfLHa2zp9wH8v{OzZkVVcv0cuD`^T=PHO%pa?r)5-
z=gl`r2bZ9N96jPADcSNDP*+f_CW3tR{|(51dSseT<)O?e?3T2heZ~=XR+`2hHZC(A
zG-kY-Lxib?M*3G{s)UGN5emTZzk7i8v?SB^3;cPW#9gG8C<eX5<)yS(OkV;$8i+H1
zzpYm^U<R+1wpPYaymOg6M<-ROEV0*YIc41PK&Zh~l?tHX*2148`cobkI`hkZ>I3Bk
zT^2^WCyMsg^@ZFtPV8N8vw5dQ9!A-Z0Ae~1o311=U&vbRy<;(cL`}4-5NLj4PI~GL
z7;`Vz2F*HO2!DXNo_Z;QzN(PVSk!Ai<syoztCGW2xWeMoi>4L~s@v~DYy@GtmV`q4
zce2h}e9CUP8s=;Vw(pqJiSXDLOod7vKXhv8jP9WZFl!AZN@C3^NfbuHt<X+@@)1Ar
zZH6Da)0o3Bq}Z#@b$?QKALY(I)hry*GBNIK<AhbH=pm>20K%XCnlTKu1AMTvMu=Yc
zsShH~gm~%k6;vyg4Uwa^J?0x7T!0}(2D7>a))V3;^m`zm0GOMBaV0ahN-7d%fX3jX
z*ZX4@O_v<DdXwzORjH%(FrZy%!_CdU>DSnEV08eYKI~}vbk}r1B(dg@T}@mJ1XsZ1
zG)VE<VXw|02`&!xk!sn3I}O+pLBv9-VeA5UjNhzxz3Fh}<26#t_^;^3D+_6GCJf~C
zp@B-(vRD!{w0~vahtx*g(Lq?}njdI(=z(2FK(_*>0f~ZWY{#xU0Jpy2SpD2n>wx^u
zvl2){HzgAyM$<}ljDNmm^@JI9II##Is<5eji9NdR`K~nl;p%FN9yG-pjRrfsEM1cv
zkcnt=Nr9`q)#mHMY)YCp#`V>egTyf#0s~sv=;NnxO`|^Z(Me_T=5pyZQZS@RKx)A7
zkwLPs3!eN^M*lFtJ|mU}&BQ*|2SRifEF)8<`*V%HEE`<5dBTG$5O`1#z8z8iT<z#1
zQb8_gujJ8lnz;qOG7%lj`UxdD_qWQiP7dGU1{%RU?vf|pQNbR!V!=@t#9ejk;l6bV
z1br&Wfo%MQ8Z>HkeGA;RfCoAD*bA<3Z;#+SQkra}0B1QwX~Q7ihONx92O_W&v9&%U
z7n-_QT={YeFMxJx<ke5iE5RxlQf_tXjR`MGb`L9}f4K1;)ih-Bf{lXOwc)e~^J1yi
zM5}r4mx^6zJu0vvxxCS<3)o9bo5@O1{YWYs>yBtTH28k`+iii%04Y5k-E*3beX91m
zssu~xBLe3wssx+bozHbjk>ZoED!DvSOH=yb8dbXNCAe`78|A<YDJ}%@sXE3)q6~BQ
zNyR5uo0x~}2z0Ed^vi1`d2dbT>{(ZB&pG)!O$C(<CNyFBQ3`50x&=sL{8>w?G?ijp
z2)p!&2f=Ms8o^CvD7-$@E)-7{G!!oyeH@T#U#ez`a}=%{(q>@{R-M3_1rFM4#;59l
zu&uBd-t*(%?9T#NuZ|ir7V4F`r~g>6z%+*#)n+L&GVzfphbC4<6NguvBX{LiYza^j
zJDn8sI>^!gsaGh)XK?8p&O~%)iGte#4<;+pQD8g+uhiEGxA6<*IdB%ER_DY&f3lNE
zR3yDP@TY8n!_!!Mq%B1-V};M|vK_QLQdq;SVGsorqVwCU4&6R*0F+`QCe_G;s2>a^
zDL^a%(N9YsqwD|!M748gI-z}ABWXyz)3tG@N03ohyJa9kP)?El6e@j$?;kS`D_Ud+
zj!4288RJ;HR8~8q1|;{awtfAWwaaP~M#d3^YEC+x`GHqHEBuJFW!PNZ<>gAO+do|H
zW5<Y^##CQm-a;<t)5EHJPV{TZDAn1x;lvY3prcPzvf*oM<BdZ>z3UHLY>zun_hY6%
znUY{!9z-GCwj8j9Fx8=~X@i&wGnNS>TijZCHq`YB=1MOtODR#K28CUoi$q~{wV;iQ
zK857iYs%7Gf*YtSX7m)ZkeAZ&Hc*EdwzDFpNNCbb<YT}E!>#5Q-^bDTme<%@R%6x}
zRQ@l*yJsupDRJ<Km@C*VBlAZ_ZQ;mRfQ)&ZFABw-L$y~RE^6~ZqnhWL85w9vl**bs
zH>nhyidQwCk;Fivq}|~6z!CSni$5WP#duFHwz`mV_Wz)lM%;@FXso^iwDc7((OUeP
z%1-Rz+wNqT$vm__wj$3swu=C4GOfubIIUoms#K2zt-~+b_<be43>7JGU1tL-ALz0s
zHCw_c$4v(HW(Ie(pX0i4%<qeKG4%tZJI9+?)A-~gj=MbClU3@?<{?=qyA6s?11aO6
z(+2|7?{jtF(a`au_lp$nv(tIPu)t62Ya5pH%Tv>f7Ztj$_u5+Hb|u^%Xr+njy-Axu
zy&=WI`UJMm8Mm5UnECRvrLI%YA*Wk%HvR3<LDxfYWJJA%zkG-YM7h+8RIjAm!%rbY
zFFjPFo>~6}<^NijMiA`ROqco9oVO|M1K_T(o`~U6KQ7uLuWhwoDY6v?t<CC>6rl)c
zmE}O>{*0>ZU=d{<cZzBxilIE+n&J$NA7*CJGWz9Wm+&2uanB6Fh@*8iwFeuvPdzTS
zxVl$p@M|x<5&bwEh5*Z~bRTfNkz#7nX;^2Op44od=+Y~26!mC+`PoXcQg`bl5gx>_
zduacD(zVoPt6Je@tGcdOo4a0r$2&o@NRofdd45(NBY);2%QHQBYOwn>{oJv{8Hug>
zK26YMruRvlLtGB56qvtu#i*VLY7gt%TKEr`am(ke&G4@oq=CpHQQ;Y=>!^Y@>`pz^
z2D~u)R8X}HNoVn+<()?SNvTM^i2mFw$8UN!IDLJ^V^NIb2klSZ`E-q-dAjKU?5lgu
zP=2W~Zud52qtdAtj`67Jta%=20DJhSB@=zC9GHiHJj|4tFl|5iHP+n-&=9+z(JxY$
zNfGk5B=3rkJDJ)Wn>SsS!{~NGMZrF5ZOHCIe?z+i={Cr5{x&SN*F8*t?G)fR%F>4A
zf%#kAxHR`a(Qf<ZA&*~NaH&I+jGC%Mx&iUPp+7RwQU^XZSnk^B8ZBY8$RI@1bk1kl
zVaByQ9IidT5AsYcql|r=aBGZ`;~8zHKrmLFeOYx)oJnhu8j^c*{cxM9Dj)7EzS`Cm
zGvt;+NhZyVt4y|g_YiTymVg@2eZxQgCdn1;|B+abyod3@Xc00wH*ZoU2BQB-CL7Ub
zyJKd=!sUe&mT%?Xhdm!_*2n!u@ZFwwGqp4MA2|Nc?!Q3&UyT0m%EHOU1^qu66W9Mk
z+susrU%0JxX@}Q_ME~)~I|BSc;tgxv(w!u$m@gN!9D+>|6NoMmIhbm?9z)8Lm?J{@
zf$1CFZQMuHapaIDo(KvmibxPC4L{N0$8z+#X^FZS@iWy&fsr-T*Ll7EEN1(6OJ;M9
zeNg#V^h?!kBiFuHSm4{Wp`foq)K@Hwm681<K`g?vzQK-ZLra^yU9u5t^^%#a^&Dnq
zM!8(mEP21#0*lXfj(yi&gm;VmH(SSs0PoP>k7n4Sb&P@ieA&o)+v19}O)ZmY{Q7?6
zBunUa88a9;wB>5+W9&W;r66LQl7%}nRv_2-go1~od+U6k>gR7$(~$O;Z|CFC%8lT;
zC9DuU^0t>b3KkVJp0&7XVBWb;z&)W;epuCI4wl|E{E>sCuerrKqg)aJzo#r72G13b
zN0BCtT=Y=hE$(QfK`7|QqXh+KjdCH`9UrW`Tjr=`l<wh__6G%gw6#Gq>0%OAEfXV{
z`N59>-;PhmyI)nAff&xaXTCT>YNq0$I5dlweCG4n{mI?Eeye@mPL3V?Z!22XkiddK
zT<;s0K-_Qp_sYrA*e1iPl<auQzhM(G(>8-|&U4b1-y8Vh;^VW>vG|pv8kl=Rt!O>4
zdXT~g<Z6$YIci8eE<y*===&lEZafuB98???3&f`Da^3h`4c?d?S*^4EF1&W*Y*-O_
zEG;p(+wf%6Tn#gE9?#Q5^B7;6oC#^XP>hPCO!I_zBsb2n(Rz}7Uwkeq4&KA4+%ikC
z$o(+9bP}@C5@7T))M6*+*D4WNj@>*(@5K!ds&}spipN}nQW8m`Fak@!Y-x62qPX0<
z)MxNp6$LKnZgL~ZlZ(cchu)!2uF86UM3P7{XiKAO)NvH<e4<O^g!nV7k;*Lm9H#s3
zwFF<vf{99#YzfOi+&t0*Iv%O!N}!p6CL*MvH{o(Q+7;96w0DwJ`1@Wlae{I&vs6Eu
zL@A!?+i|h$T!^s)BIc2SpDAhv=`5u5w7zeGm5~veOp%&mRLKg7$!2ulMuh*hl&XZh
zo!TRB(vMJEHfvMD+c8&;Y@AX>>ao&LRXHDziPxGPlP7P1Vb??|lc<@q+GL!Xeax7A
z<4IYUWwQ{9d#%wDmaPF%$!pkR7F1mhSg?T9Tt#fNVoh|mPI4P-WH-NGM*Ax#GL@s%
zTTuBKwFO(2vI6<L#B{(cQ^x~v27_?3O#<{5qoHV&i`9jbTVOu+p|2_&O{8S7!TTN`
zt6hC$eNnyNE+o0s4cEWn(U^hK;84wNa*K0NrY((-cLIgQ=49LPpKNy0o<lWdEEnZ&
zH)CH#T;_9uU&2OD9>c1AagxeX#Wbu5jB}(&XPKdDq|rJbaxOMzZAqMaK7C1&)PjC*
zOS3rAVk%UfMIJ6m`qbhmw@kW!)L3Zx9#5A?r>u9<Dqpz?=CV=bNj{M67u#0{*=o}A
zB6^_aZFf5i>9AIUAzG50*9xubvd8EcgU#Lbx$}r1BVacxcgmn<uH&k1J~_e^?>$h4
zS=O>hf9=mbmh-9>8C+=_?@KY}<(KYT&gC@2t~;wU@)68M?Ij<y23obmDAEw(CYSe!
z;dCoC`D2{OvDq4wQ09!EvcJkt|7lX0c4*gg(3#XHP5PkAG}eLR<rvX?Q4ntS_}Dg^
zo2L66DWkn7607bh8(Ae5-xV0~v{T;}?xhgg?_#Xrc`XprY(%0pZv<p+Q4aKlxR(b<
zt*G~8mz{@z#(XxNpg-E){lOD+z&FqacDNGK(S>Yhrk|0uR?{6{5Ok+}@)a6_T=M|X
zUa((eSC445hW_U(a*5epvu3o~h_)ob^!}yE5`5tG58O@i7?GkI1BOFA#cIOhqDaD?
zPp7SmY>{MkTyyzrGqT96aV0K3220%X=o8r32}3E^mn&qCDJvVqfdRQIglBBfz_-aE
z#QUg;&J@LJe}D4g;dkGVichp!Gn^{4J%vx9+J=@`v10O`u_7DwD5Mmyu8gZIX1*b<
z1VqE8JbpDroWd?^v7pC_fRqr7JYHM0&2jg!#)>axUPk_y9dvd@to2R(bLHmv1VoGi
z@d|>5+>oT68J+Ymk?g7aP7B#m?O)a6iZ-*g=7m07vJT%taGqN~@<6ac+`{87AA%d<
zAIuu9&39j1YV|zW^XMhgqUduM!AH~B6g%3MEc9*BRM+i??|$9YonlwV47GFafD_gU
zks<jjaZ8m1;l`>Ko#Lh7+i5<PmfFMA`m-@zAb1S_1q2rO)_r*28Yj(UV&?R>2xMQ2
z=A;^{v1h%P<xWueN*|oy44KKw7w@CkWLsThfT2%;+;}!ukVdaKzeH7#2I*D_dBQ?=
z6^y1-tHwCbTraJ^TTHG7>SJ?wOT6&)sW4qvEoTK>M0Mo=n=1nXOEd!%T|J4b_shFz
zByPQr-57Vd_d3(a%(O-jq=J9%mqP1SDliaI@^D3v^cN?!6BU?p%A8qF7u{IMBZ!k&
zb$+7QwCJ3bp0`$(z4fE3ZSOh!o4L)PY5bM<5`9{QvyC55{mab_uU4=|=dt%+iFdNZ
zm;9GACmFN;R4w>QfZivh8de-vEzUDeQE!i%(1nDAlyIgJbA_6RO4_w;WWs5O_ke7Q
z5kwb9l5rw#Jm&2HFB#I!UZ*N@6&NVZ6mDX5<_O&A3j%0t>V#H&QNDLfdJP&!LKN2G
zg(#kiEOhYT_PiFA5cp~e{8{UKeJwAYl?4Y^d)8=9u|?Hd3Hr>U*~zG8bq17{J3~%{
z$9eAY6XfqlM%$_2ty+(D_FqZ2DIGoj+t7|%FAK`k7_W_>4SS_tHm(8XJ_^$xb*?BD
z7pSBmg_*<OTxKnhDpj@&<hBgmTDh7*RpOn%+#c7GYCJS`!8*JgAn7ah9UoKWw@Foc
zTNxQAPbT3>o8z<64tOGwr0DA!J+^tRh3}%I8ss5)Evgq_D|##bqfm^{@KC5$l$kUx
zPt6Rvfj)sl)p?HrqiNp@*=Eo(7nbHsxt50ARSjO;n_vJc3wjL}NZpBepPKP+I+BOr
z9(77^H^u&H8;)EsnSoBFfm^6t1)7y?SXN8b74y(zbC~Z605FPUo>o4*St8n~Ql&}b
zKiZOnsf5+K#hft;GTVffHe2g;h1y~sP(oGg;-V%39&&Sizi{$4!0`>U_G3!bfhtPr
zs;d>7??LS<+H^Ef)82sn%UnpBHvMIuqoQOB+zm>hhcsO1z~oGCy{J0)I&jLDO7;mU
znG9vP8_z}b2Fnf&8_33A_6NJ<>W)qJh2%Z|qoXHCgBu?|V|Hl+9WkEEaWu}iAj&W-
zX_y4!%QsmW0U^R&X{Qub$0;8EARU2jo7-SO{8)#qRv3UrV7ZlePtHlI28*hM0!o4y
z1n1`e{RtYE9uclj4clqtwD`kpIM3(ZncVVDtD>x(Qr+zoB}=#XSNJ(JdXdh@fH$Z0
z^T|alXU^Mt_m&?Nx6W<U8bJmsyHuN#$p?(A;1F}hj!dLy>2EKpd1dD`w^|C*+MyHX
zoS6>a&o!ebaO~kFfwU!x4_*&6^f>+>uRauaaBGyVpgkd9<RKCdInX`Mv6ZdTV3OX3
z0(is12w4qsk-TWz^shilEe50yFAN%~z}$o2(AD+WE6E$rB;!*IE@n<IqB~%{BY)sd
z-&oMn3A&Yd*I6902j6oz(lTl5;zMG5p~k{pPye7;FvVCRZl5;t-m*w=G~rxy3#z`H
z@biZLe|!DnCbyx5@Fl}?loiOGs`#m8SZtlP0I1GEA9Pg||A>bs&mXE0e)}4o<MF8U
zSBUs039J$7O&dLz=38U6G$=GZH)`5yN}2dsU_G#R>Dyr^NM-oZg}JCK6TATYX*Rfx
ztFR78Lpta35xZ4J-vlW-2DlsTc(u_O;SN#qKc9D>!Vc`7VhKi#4e{sS^l@o|C(L6)
zN2qA-YHIGaT;pAg;!DelbjRYIS<`hF?v^9IrUq()mu6q*vl_wpMPAS&3YVHx0SmBR
z*M%D<=Z(9%MW=KOQV)DTpM8`CgWK$CK|T+>YtQG9Rr$IrJMJy7!Et<y_&*EB$k}qH
z(V~WSk}s0ix~exuw^gPc^e=ilx=}$0MPszr6JEgR^z`$(A~BV!d6(@UY-7T=sZ`g6
zwAftusUtI2=li99{45`FkSkNnVh1ZcGcxZ7RL*(pX53reyJ7iCq|pP#o!)f6e@fZ)
z(+a8|ZEa&)-Wy@Reb1*mqz(MOI;Br5Wz0T#Ekm&pV$dp^cv?@N{9JB)7WtMonV(eC
zP&p$wBY^0`{<cvBj1nFO(fI44`}j1*N$4GUIYLMAirr~4SU*~3xTYXPM}G?OeZJ#a
z=d8@md8;reO_fwVEx$Uh0&~U=Exr@pvL<s;#h<KmygS2RG|_8P(%>$3vvc>+E5}Oh
zD(c<|o%3cxAQ!>>O`7b6sH^SzqyJcdcik1EZYC$HjIy;T2eFrqFj^BQb=tO@%B6h%
zbtdPA6t|k|Pm`VHK4cS<X&$n7c=Lt9hwrzA2~PL(N1aYT1#1q+H1@RhVV2HUrbUDh
zFnmK_g~O4${!+T+KJls;!_2Ho<5oXKog~)5oP*Ycy}=-L=~~jG-{%{QEdH8^XUuT8
z&Sjn)*5gm*D<+$Aih=jTdkj17%kr0VPEY+s=V6w&<mR=qNy4@BR%&;}$*>t;?c}?P
z<v6qJU9)V5E(jH{YAbMkWf<!n7;)V_6yGG~_;@Oo4Dp?Rmp5w6=p6BWke2leY>WJO
z`v0Ki|7OPj&6aGOEdPfsng0)P{@+e6GspiATlVN^I^(t>$&uNA(!9`hQ8`9`mh-MR
zNGVDs7-vZ0A0$r|QbsUIP86DGzRSPIosX{f!@uk$Qm1wQfsGX_imSuH{OUGA(P#c*
z_|Da(>-8{8tFuFQdUqU1jYHoud{=!-38iDe*cIaXac$}EyN8-;erPcA7-wra>S$zd
zt+I`#f}=$#4sonxg_?T<Y?hM0X=o*1a9UK%q}HJeFnFYIF@I<4()DqNKtacnl`&vA
zF8WZlWF>217f>*ymZ?Ymtr`9hk%@M!Q-{V^U-}5Hd;1vXY5J(_{dDv#RO7Jj>Fk#>
zzZ0lZx4-XsjXht<dX5OL9F*4jz{igXaq9Z`+z5X8hlDCIr(U<p{_NK)7xU};fswyS
z$Cc+onEfdUd|t-juL9n}tFD$nk(F0}JhU{@7L}J4>B*PDXo@*Sm-CwB%xGPEkFokw
zH5SEy|LgkxvmN$0g7K^KFoN-S^w;;fO<-W|ur94nlh>#F%WYhJts#Ym%d&x0Ms8BH
zHMf>dMztn)=$7o^1{V|T(7Vk47+_}Lzk<wZdyqY)g~g<Kt((j0pbWSfr5Idb*aZev
zCxAw&Tg6_lb)@a+oNeI?dxeJ-Zgn<Q%Ui9edvw*K(7+rNpvtM-3Ys{N0RGHp`@!$;
zC2K{%g91#YdoS)}N#ZUg#YY<=jJ*~ILk>DZ@Nw0~mPQ2Cs<Uf)6AnQ<O#Y|irzKZE
zy75kx5%9N~i$zEwuvEX$$45{Z$Z7Koy`-6bs7H|+HLJKF*{^3cpnPR!ohRP%wuapz
zB~YO$ADCGKAInCyL0<Dqi0REjSQY!mM%e1yk>AFNSXNRpLM&YdN@JFSq*}9wM!s$^
z2`sYE_upQ$lHUQGx!fB5$!#<kntBFKsAr2SQq>kd?`eV`kFSZmXnpKWMfKS|pDF)#
zVVP%CWll2$cd=BGH6}c<>*hp9=&rb%%DS(Oc*tg$JL^F!=khngu{Q2G6ir{;bp`X+
zSuXTg+*!rFK0MG+&Rz``NhV)9I7tTK+HT?XGEhiwMO=l7Bx793UD(H)sjrV(C4Xkk
zhl?>#`A4(He;x~)vaW8P(eQvSQX9`s_%}uWOPJbkJP)rs7-9dY3I2P~<qi-=&sh9l
z?0hN^@pF*rZhv=<e>)><eZ9JmZ!Rx>bkP1`efn32nzzc7jpk%ceUwwqy16?XwXRk2
zyxAK8^qB6yo%!FVOCh%xhn5u|)%9<Vbp$OW)@~PL+f3HQ1i`8z0+qbtKxjug7FbVv
zS8Ne=3Lk$1xiPpL!0#vR^$pF@{V^|Mv{uaQR~47&rHe2yXDlI+4<(?{lxrgciLiBg
ziV4|?MV42B&~Ew37%6j~;PmGr8N2D_1<+@PJT0aOms6?)u8^Y(W5ebQ^J6!*`nUsO
zeduj{y7!B%>b%c3w;hd(?Nc!HjegF!&$J;q7=&wy&-74FE>ardA;JBFFG07{%-pX#
zZ<H+>FDs+D7oG9st^`$+xl#QIYN;8QPnA+AHifo|dW5#N?@fzYQ)tRrrScCU`GG`n
zd!h}!E99LF+^gYUsW3Egs3GX5pnJ}rh&__jy}ROvCh$cAlyKLTkxGiZsiT~H<TK>k
z&MXn#rO9t+yN-MVYy^#D>H-pEL?t~TJ*K#kUTFnOqtpDEX6seF=3NCzlr|%1!1;${
zCcP3+3xD2mwVBiX4O-6<R2bC|1-T>{lEp1TL*Bx%i$j3IUa;>oqoqRah4?2nC6Y`d
zt5zNfm$xdFRITUvNb|U`#=hxRF}5twddQazc`LXno08ociDl5RgP1)i*^&%rJI{pb
zKQCn#X{O(-X}+xN&bS-e<{@AwNejB4)T;LJLE9ZSmuVi$lt)}>Jsc^>_L*z$peX#&
z{OK}CD~O2#T~iKGW0;Q4ePSvRXhK6tu5-Hk<@kt|h4qODF7t{36udwh7@KhDC`Xvv
zVkWVs_zmIW%)S?>BK!^iM1o-!sX6VznB;aN>X!gPK+<HKCEaIm&X0vT68*f@5-ujf
zo^e9KEdL^_eTjJ8#*1g37}3)}JC~<-trm>u&ZN67Eh1qRh0Xl1Fp0`@jY6a)V9rhc
zXz8PZ%VlDu)9T*KCaz0j5(MM7ZAFti#dk9CUPdLVm8mXlnGA3!Mi4?~wI2#<#^cv}
z23~cWu5a!^wA!us2X%L1vGosVi%OssK8*ltpKlfrCPHeP+P2seI2gpsdx#X37$Wz!
zfUke48VMW-qJOkH)*%5BSCO=nGo4TS&j!3aQ18+V!vbJ1W*~1^pjV-Q>!fpR1veek
z_(@=BIYjscb)#LAfD?E|=wnX2MmGZSq}i9S5MdWBuc4`cdoZ+aPlU)q-XOmoJz0+J
zP?Lut{t-d?%XDq{J1d;B=f`GNYf{rVa!?rJ0hXGz3MA>{*6tuv(OFT8JCgZp;sjR5
zs<d9algX*sbIP4;0*#~wqYH#2=_@;I#U?0d>bu#mWwuoo_2%SmbbWpLOr7%G*=6Wc
zZkV|20z4KJ9)Sv2s_B<{Y9tel;b@isRd}%Ap~`N1SO?OIqB;MuBUq9K^KRJS&6ntM
z2J)-tc!yg%X1_?j;BUA??ywDU@KA^3m$rC}Gn32#xQP9p%{6J-X9JXg>V#9i+vt6A
znmjW@D8{R{{_##fH`=mv^{i&rM|7^h5R`uUfveV+wt4Aox2sT=$YTpX5GgHw!Swxh
zSRWv1V%}ZQ^a90_ep*s~#%GP`uS;lP6j%5zIhx=Pxu_y#hebPN+XDVs>qs%^0QyES
z6%OWuiGwGE-^oyPbT(&(3ea6EAk;u5NGVLf>qPE!1$TpSoc5nIeEpYE5V(Gg6(sNs
zvn|bF{c3j&UZ^Xx?o$QLQ0dNc;%cQu?lHJ~y%yT591Yyodnytg*eHOJ(D8*bFinec
zG61T&wUGr=0W#Fve~|i0vb<kn)0_1oFQgvvrCcp>sW{^K!xc{^?G=n9VNF#Brxg8L
z^ct)VBHMnvwA`SVh#rHsR?)6_H6t{C2cUUqt71PQqGDgU5}~Yv2u}J|VdOeVr4nET
zPd<zXje%u?`Nz!oaF7yn#CrqM9m_=LN?X%`45Zr<U0fJE&5g9vbi%1=1YX7eHNORv
zWCf6i<-<ehkb>e?o(4TsU|-pqxVWVC@rUlaF_pinB+l#-8S`$&=6pzryBUrU--A64
zv6oGa_(BO*5MBEw@ENj;t#*MHJ4VTI4%0YNk^2RauIgd3`G(`nBbJs8>;leWe0$84
zmAN<|09hboHev;H-}Fh)>FQyrb&26J!=YvRr_ek|fk%sUlvB46ZGcKj03NGpsLEQI
zr=qkQyS}w3Pzk!`muxnkF|pd@Fp`M8o~Zk7uL17$&_-5+g6{6grXqjbV7TVMa6^eA
zMfyYqNj1nRa+Bzcg#v);q4USW{Uc8;U0#U}Qk!C?Cr+BrWf7{WRWLO(qF(lZT*g45
ztV|Q-3iVc!S2VSVZzi;#ja?ebUlAq}Qbnf7CETEj{BSbByUdq}5KPdRXQ8uN=n@uC
z(u-xPOr!J2=hO8}_=Q^77h&$yV<AT2Rv^#ca1ioI`F9jT#lF+pE{{1KUBs69nxS);
z5)Vm6G9D8)HQ&?qlInAiZeK?fP4YDPPInyT00`m(O;$udpqT_K<yRF5@e14A?xDx9
zsI*jaN$ELyHFRjYeHI4JA?THoJ-m5u4{Ldx6J%#^ac9;LwE1apwy>g8aAg%KZObzX
zph*~q`j%P)4S^1uA`*uB<p@oYar;TkA~kFe4hP)ChR0ho{MCc}Se(kgj<;^iEZJVF
z%?f6Kvyg>`3^VN3G+vRsvgOg>%*uh*o!mqQMI}gWT9&K}Morp|QYih%oGi%Eg3Jo`
zQ$eYn#t-?FmHRJyZPXr5CCsO)cm<VxAS|7icI%9<6I9ium8!PpKf^e0MTi>l%)}$p
z|2%85CaM&jd#L;z@ezm%gxAg9g{BCB`q1_c<%0b!W@+NHDc3Uw?s*x-qE`Pnl#!#=
z@GV;S!z{4B2=PQ5f385@CM_s$tk?iA`s3E`P5WXH9ayLlmi_U+y&7(r<GP{u2&}YY
zL4J-ziJ*IaB3#p>!}Jum9TB@HnqbZ~iPYwp-(!c3KAI1t@X&5E=1v*QuVXFuMYI>m
zc1^L496bzR;O|=#S}hlE3O9tgy8`+2Uq3bnD@wn!#D#P4J}@gTBAni~0}GMl;?3oN
zgr+<(8#)ke^rH^t^mYP|UAB<4-G(}u$>}NThG-70SF7pOZ$UJ{1suY+nSdz2dV8+T
zfT>e%OE}oR4!48WWI7@|4R0Lsb6xK}j@?=s8<F_!_KFk1-Y6<e_UWU*`T9p$XkV^i
zw^7zz5Q=b@Ia!{@lV=Wc#qMmX5okYu6aqAGCP)*LBld)==tuV~v}K~a1WZv{*@$4^
zp#~ZDdF?{3WXA0f`r?~g>i}v*XXv%B(^$b!Tmlq~(jW$<_{TC)qabB11UEy17^%DP
zRmP|WPggpz{TC7m`(X=Rr>V}x8py;Km+;g^(~gk6u)=V5>Rh93!TKIQlm3|X==3{6
zN^GDVhO^Yfc#a5&&>$9kanfO%Z$pIBTD)*{Hscxi8P7my=(6fzf{VOqI7c-7P~@ir
zR4IOTf0nz+Qv5xQCs$>8(Dxnz$gNiVeeXQwra7rj%^Ci(j`fZ&eMnI|qbQ(q2Egn?
zS1~toZY>p%DAT&u`)!9a-v7)Y(L;l7S0MY)1{m{*!D_?}572E(?UjkRkv!2}t2NAl
zl;xtC8+e?Mb3s;|Tiswal?&b1B;#ug00w;^&&>N^Yo{PAyDR^_@Tzwwt^($Yd<o$j
zYcl3wJ57ynI<I4~;>)A4ft`d!El`yjym}LAWx8N^<UIWw6;_jEu?M{d=>})-+6O)y
zhK+-szwz&vI{e0PhH?!f%jY+^8hoPd;+p94{XCq-I4-@>+9~*qPerY}UV)0{Was=z
zipURCfEs18BZT^(&J8AwFE#rwrl;2AkGl&YaqvrtO)wWYIH49uL9?gA%=wvj3RTpG
zTlh|8cW)w5Gn2VPRB+)u{%)C^_6pQ_U5FQEy)<2oem0kgVo?hp@Sn0=qCQHZTWV1t
z$~A^xHM#<xGA<$!B!1Vdp|@asNeSXx$9vK>=?}zLY(>pZnq^_~K+Say1I~z3)xZeY
z!;sE<*H)XDw;M#f+NWzed1+QhE@|wNR3h+hdPvLzACLCW^ckW1R4#=Jho*epj`}IF
zcU%A_64w0}t(ycMzzIksDsez#8^GmxyXtoEk@oAYQ$yeQw^SgG(B@<E#REQ&rVlc5
zf~;c-9Cymx1v&6_%8r%6shQ3cOcHS{;+K5)Yq~qwm$oN04S7Cyy5XM1x^$?P^03+?
zaF!(S>Wxj>U9BtCV7BQ27m6K3jQ!Ue+7lh>NwupS*i;Z+MYg9!)NLG?Vi=}}4m$38
zykp$?Px%lihu?|>Vd7jHd=S%dnCE5@CL*Kr&E80EWvvcU+X2DEqQa3}P;AS^FJ)~C
zQuGJ+Zys-93n=94ncTb`j30VI602WG8H3pwNp&m`UC2Z=ymkU7@$g40d{t6@F})|R
zN0MV~Yr^gjA1uspr*p>C`sZE1x|ZZdY@844O?7^B$+O(deUHX?PODdLa(~T?4Sf=q
zKM{>@4)Gdlm5dM%xOwf%VBxAyTPdl|O_VuEmd%VK0&Y=Qs7y0^Hc2*SoV!;NSim|T
zFP8%eaEpc*w}}$^dkS(QnmT0FD#9_|{t_KCej?jKV%iTiAz3~$F5^4QQ5bUvDSl(j
zTa(vv%&iu~-R+;EuL7S8GsI1Wt&%2R%n}#pMDqQoTBOs2Ox)WFozN<kmBlP*HG4j6
zub0@Fqr766WxA`GzEmrc&fx|RcyPrTT<aVVyozadDHX&|z^SJ<B7H;k#WdS(lVtNq
z=Q(NqQIt;*wbpjDG<c8RuUe1!XQ+_j<(+qgBM>`zAd7PS_$l5~BeP5I4A|rHm9bXn
zyc-5eruLQJ&87ebSfl{)j!mKaw`YQFym{zjPlqg%pOe_+^p;A--Oqv`>DW>Eblu|<
zIDWFNjLh_?=%mz^{JU^_Yx=U}{TVua8|Z@m9n?DHL%L1umbx4=%_f+7rp1_9p~Z~G
z;(aQdSfRIHeM-cH6`<XjA(k-gxgpb02WAL`O^%j#0TD=De_aDIT0c~B)1B0N>25LW
zr=w!C%U&H=v;|@|UGhF~v=c&s&G0*h_lr5h<h0F^j}4u&DHhVbD_Ea$BDsnOh8Fm%
z5?r3eJob7_^+4=%{9AyUyAX*!C*YhGQrSVWXKSn5^;PP<4ez0t_2dp0{hpOPuutJa
zI|H~i@#taKL=+YrYp1G)unt<wG;y3^)2J8aRRIl0zTuy6hc`?cw>}aO+m;*Nsnf2Q
z!Vq1aB7E5X!@)H9a*or~er11<mN8K$!PZpYZ!{{?X;-+6F9A;w<@2V~YpRTP|LDh7
zZgAQHZ9p&Zt+1o_LT6OpULdwUDrnfsBn6MII?~=&;P!}&y=UE<U(uCDr7H^BV8Y0j
zqFs=5dg&x!u39}0FW@?|xi;tyQi2?gtg<+Zik=6Fas$LCWHsq|m*v5r+KxoA-Ynyq
zNS#c)#ROt2YU!PO3q0@;cZr-C5~UKAlq{4iCLMd;yo%^Ys)mwnlH5U@qbY1%Q@?xk
zhl1fSXN<g*G$C2UpfiLU-&O72uao<rOX)cCsq!INxdz55Vp7%&B+j_7GbBy@vH{XN
ztW0y@4yGjxa!#Y@#g<`^WJvjzGb3rgz)*=h`#-~}wyXj=!^5`iuCQgXeJvow{%;!d
z6Kzqypi^2t@c*xx{I7ESubO0I;$;3mYLbQNf5QK(CRv#Of7IlPj;1~C7!v$Ld!JDN
zugMysxG#YNBB7d*cEBMG?3cl*5QHcax@&wg-FNxdn98%}_7clfiD`c*k<-5=^BjHE
z=eL<uS)Zx9zNgQL<CC8@H*de5gv~q-o6q%79-BVcz7oStjI6(Zcz#?v2L7WaH~*t1
zjXlQs{-Y+F*jq3Eqb5OVQA~mzD`EeuCdW#N-ZaFLZ`v)+XIf9QIB@Xc+hqH4b?gMV
zLO?s|PLp<W`8S7^A8Q(t*kx>D=94fsm!@W3d0NtvP7|#kjvki&%Ku_f7;(ldCyngi
zjVWWk8`!(gy;{9O{`Bl*ZNq)}wz_v!eMhL+Jm_74u~zj&EJ5a;FqtK8bn(uu%@dGw
zDRxy|_U!0h$q(O<wdM>Z-J=-Wz3!p0>)aUb?pTWE4))J~pYI6k-#p)d{eBtEP3V|&
zVuZc=y{_mP3YZ$K-JJmb2FDu0ozXd1mAbFZFL+lC{roz1zMDOoRi&>bK|S#*CV?hi
zNDeRzJRjjotx_Oxyb}CadpkeB*f{@o(d};i;{Nq{cm{oYzPsHNu=%-n_?*FBLp{ba
zcS`JM9yM&~X9C_tmK$1E^~`iw(~%r-_gSWVp};m%7zEvv6QrfZ0O173E&#*8J~MVm
zUJ+CXt?OwL%zXGUVjwTWdle*%cw&NoCkY8M#O)vyDsNBr^xKC+OqNZhxh2Iyqfk}5
zZ!TvtdZniWKZ+e36iv`eSC>RgTVh}@Bk+wYWQVc~NT@TAI}dp%hU=gbe52jv1IB7t
ztRmF0aT=AzdxHt&lPrrr_c>4#&6N)EMoB^k0fRpZDIy)h2RrS;Xs9wH?=4{YX_n7X
z812sHoG+4l;+=!DC%aSfPHMeumwePHZJ(@yvgi$k59PXi!0&K&O)JOPksn2b<{dHy
zj)(zlGbS~nmwHB#81P#@0;8^La`|ol=R8@*`Q(D#f?^{or5r))2grJyjhK8=>lezn
zSD29fzjrOCg9BHl84KsgInfHiu;$*VFi^yXDy=y8q+*fF2-W0~-K)r~i&yxAb{Q<}
zlVA`9sg>&{8zK9|0tftqL^+@dzgVAIVT=0c{kqx3w%I^EDInewZc7f`h;P_h*?^L}
zt}#xkcvToP_uGbTc@VWXq)=~LL8>615CYXoZ%Ob07$yIp47=in`4{lsFv$$vcrhPq
zssw8esZuct5OV;I6QzGhpQ=Kl3`?n5qEYspq+&ZnN&A@x;^^TMdMcQ4Pdm^>_I&{K
zTX+ownoTKqyA3NQ{Ae6%*bTP2s}r)?oQaA@*h}ZQg+U_lC~GG+J9Lrv@!(p5LZ)P)
z8R&5$BX4Dz{}9SEG;?Mvk_juO{FZE;d*uQ*k&w6yjjX!&%|2iGxF^!Q2yWE_KsQy3
zI47Y$JA&{F*;T4-N(#Qw^2}=Dp^A>0M$6BGC=myh&|}L6ShS!E&hL(`9rjT53GB_H
zWwH6Ww3Q$8#h2^KTTOd+Wi@M&+gV{<6^5jrkkz~T#h(00a{<hN>~z%2qs2YxQ4dY|
zrhI(a@7dNUy(xj@_23KI>y<e9Y?nuIXrre$K&>tXMTKhipm}FurWXOZu!D%@ICf_)
zCce3og|(gvrZ{OhA0tThl}lYtWv38Y=&R!e1tTYd`~b@w)CN^e6@9PX*4CMe_}R@>
zW2HL^8tx|?#or9Gl=wYwkW?!Or_qFRAx|nPV@%xyYAZ_Yi9A)tGoR`CXhnFHowpLu
zlz%l3T6Rct4Z=zr>OBzLyX$O+WKggKjs#=!=YT}w6FIJ^L&D{a3tte@6|;AQ&I@GM
zYK$!Z1)h<i-Ct~S{>H+8Fw~s_5}G*C#z?{-LT+SDi97NU5X<<WHqbcQnjB>X^ya>j
ztr=a?imjJ%ShH^4@@!*Lkk|oJQ)hKKWvI_Q)aBQ5_cm1f@@Dw=AFLFf4g!}p1z`YX
zZ;?c#b25yh3g!z1DtowUQ{u>2+C3BD(&Aeoe{W5kytMjWdaM75zrf#$Tm7{$^%5G(
z?us~NUmv~BpB7fYTpa~+@e@nZbK%NF3__@`er#v%%9#5M{m}XwQ<Wck_H(I=?zZYC
zTTC0dePu0}JR#rvbJF5lcQYTgt$`L0qyI(tw)ou{Vfty}{JtWVGnd8(K0L7eabtNo
z^D1BpV`syy=jo+8t(=trS#`%~tzGrbl^{jT1LTwgiY(t8R)_I%kcAqT?i)pyyH!-)
zY(SF|sup%Sa-#OCvy3&mi`v#6f;3N3lCipDS4J%Vx=N2Mvkl{$HeoNpBC*k-R4aj~
z;<~W8=K`zDgrCANoU?z={P;QwxNBBgyM*vx^VgfBUysFBV+M#M+k{L`p)xaKMCDZy
zl3~8P&?<0nVSRonD&<a4EfZ{YZoTNfC!+0j|0}J#p&=}UZ6`;4@1I~>10QGRz&HX`
z0tc=Kys3N*4X_)R4R5BGqdl%HL@Xa-j9h<BY;CeQ7~gJ17KwaKoDpLa+ijB?-3Xij
zKDiG?IiNC1?IH_Kdu8M=SHgRy%tpy$i>OVQ&_<hPcnZ|X^!7qDkdVvE4;OT^C-i!2
zLVOEI#29k^lQ+O4)j%~fd1bfJ0pfG94P%GPgibU^M|{$yGqEjnD6m*#B4dih6e1o*
zywnT-&{_I$yb~0LG54%S<kxuwO+5okg=2OvyDtqenjONT)sV?h!Z~6cIi0kdloZV;
zVFa3^L?ucbd1%89ApvLqCgp4IT&V(K42{36myGC5;pF<%86bq{z3Z{Kh>M6?Bkhc^
zv5j<zOIV5>o|MS!>_FJ|rDzh9T44BM@v%#a1mth{q_^dfH6RrS0SJjWGkg5Eabx*+
zd5l3UZt7<o;;)DqosAEA5Pd~Nk0)A@F8M7vj98%vfhCi9fUWU2=}l-`EMbW43MAlB
zKqk`tUJDNdAf?5^WMJ+zuj9TEMbxq^3ttUKW^9%(nNQxbM4ik*%w%qagBo<4ongmv
zAG0uFmU{H`ku5mO?Y%nTTp}(Cw-3qYRNAN@^ZMCtYl=RjHBLTm2&N}AX61z3a%R`@
zo2`zWm5CN<WR_t@v|T#`9*j#m^QETCS%{CKCb+)ng>0kP>S6BB)M9nKFCxOH@13mk
zi+E;YiOM9uFg=C+7A_-R1R0HkvkCqc56;TG<djEEXmoQ;Wt#M@!xom#2Qp=9Qz6=S
zvxH6xA-wqCg4|jRiu-TYnUM5&Q=WY);0X`F74Nz{g?i$DzR!IrY$+ghj?M=>3oHXP
zZpq^p;QL7V3Zs?H6?O=G9>`|L_y-zU0RR^VF2I;3_5p5N{=h4K48-N1(z-$i6%VA*
zpaMNILMc`m+Kru62?qup4ZM|SD8;BIcE4&vFPW#bhodr-KQ(EDe63>umnGQ@!f;EE
zKxG4_uOkJzOp1~&1Z&aK$1+x(HSNoUqVa=@sHxe3n^J3xYE7|Z^O#Sphr8HxsjVW{
zkIuMO?LAMf9KYb{?}?=!$nP`}2KA6Z0zF`I$V)mrDs?Z{kF~mo0nWSfF($e)*1VX@
z00&$3-bU3&piNX9TL66SYq3-`yvMdEk{X5iJ|I>D)hn3Q!JvWh&r14czlI3h`*~dk
zYJw|8msy!?^3f${sM8E{CW-L39e5+XwOH7fl@16MO1m-!wTWU2^>$Rn0Ehi>J5d1=
z?S?#hS}&b#hm0sn8Ei-7^IV3-S?6%lFs3VpENa0);$4&#r8clXK6%_})PmZW?ju}q
z#F&f~I3;Ld+ejwY_n)v8u}M4X+=9NG7%g_2NpJ|6SbKT}#-GQ(JDUxzEDXZy3AO$c
z^!Whv)hx`g!w6osS6kV{EQf`{51<1QEB^Y`)3khs5u~jkhX+tB_IYDV5t@6EhlibE
z!lXYV)-E9+W#)T}X&@4j@)l`IN-)VmSeP=aRixSIGGDaRPTd0ystXZH3LSQ5`6h84
z#JgLu`(i%ri!Abtkrv_(;-iEJkH=*DQg8+?yT;X&s&Ajt_{c%#>5U`%qSKjIB9>(8
z>ryy$2Wj!y8%wnmJC}mFGy!LhP?OU)6e8<z$kuRh-e+js{P5kYwwO+06Y;aQkM8L}
zOi||pyGrXiVB1d}fo~j$DiqCHVb*81!)lyi1<MOe%Ua>6M&%^J#im&n_aGuoW6x7|
z<I<o%;R_BHz;CMduOzWf11>Gd{-T&SWABT^t8n><TEUY84AN;v8G;p#8Tp;>*<ngi
znl0pF*7l?-oR9o#NGEOy98}7QBVEpmXlC<CsY5h*a3`>0(Ah5SZ1_NhvlCS$Ou0b*
zgFbSZXC|fA%#jB@3#Jp^Nb#VW=u#G-<R>tx*~E{T`SweE?_zt5xR|E=&L-M)xc@+p
zhgK!_gO>?IUvccw*yn~y90*n(#ArIDln>WXbm-SKHfb}*tjj~V29?9KL(a%ofCfc-
zkH9fV8T7M~4<SuTgE4!ixzeS84SQBa)r^zQ)CXyHwmfbMgO7FGdgG&NSu~b-*P7D5
zl-VupJd#=dg^YoZkF)CIz7shYkRA=9VX~Qldo8A0xVS3(lf%N8EnW_Mlm%%#*(n~3
zyh9h*ve@3VKU*vtl+kY*8FQa(nLTu1EjhKM<`1X5_mvi}cf|Fz)uw2_6zvT3>NMa6
zqU(*VpoFg@-X`T!dNy^~^yqP7PQ3PTT#nSu3j!E-c%1_45Uu&qp!$tEbqD+Mbc?z3
z*?fzxJ*I*`!mmBTzQw;x<DtetLh85;6jO@tUgJ%MF8B&FIe_3bvyiy$96xw;BMxmx
zmY^TUmM6XBm)taZkF>d~E6n#;dJ~?jEf5A+Hra?SR7CSVEt(5KDw1J9bbm~0Hn0;M
zl=FxlotuHf9n>lfS29vh^=4+*+juGXq-T}<FUHQPyRtytwy|xyV%ttCwr$(C?W{Pd
z*tTsa72CFT>+aU>xexp0Jj_2ZU*;O4_wlV^JYGF$GY>JS+7^5meI=A!iycW+pKQtk
z@&cEWa{(1>sDpwdEJzT;7)M6Zgf2mQ)(?522LF`j76`8ZM`Q}rZer6JEuZS~Wabmz
z9kUIWlUFC0ucipSCYT;OjgTP%Qx%E{789m6efZUBFL!HKyaanaV?twM+B0F5V8V0S
zR2O^VIi$E~ahN#d6Zwk+Rhr~-2IN`Oayeg~t%NvYi_4%o{YH?9U*w~$0H>*rFGCtV
zC6JBO94ZO467pdMBXyZ9Y1|sm#F<Jc;MgeZxVx<2{8Mk;&e0wvJOn=JgQIhd9&|5=
zwS>88%mScM<ZJ%~2Qt4B>m|y6y|*hkm;~<PTk$St`&G8$pg~<l65^k@LjaI)2=6$f
z))h<DZmc0{jx@H=hGv+uHOcfZA32V!xL$W>Gy{7gS-}e<zyqPbPWBq-Yt_j^_i(0D
zm<=nCPX9waccODQtU2Ni#~o<m+isL(a;Keu;AFYK)SIDOn`DM-d#+jOMLn2<(PVSZ
zHB!YlJt*{GP-rcMUORM7Ltu1b4{V;?cA{6_-@p3TT=8yEmYcTOBsR#&iidzLzVl}J
z!Zx(xir0@1)`{fx5&6dPaiM|H)T6>oQhv+#CVsu;Q5LT`#J6eH7vDvI1#I45UP{}>
zc)iScV+{W41-Jxik4}m&*1riNhc{aJcL$phQ<Q`#Uzt;{ZW8?$-zGVf({D=9i>^5j
z#an#=4AUIqh4zVNHkPNFYwD&Inp#`}#3&uO+5<lZ$63=qz?&Je75~+R{HNpizg-9`
zGY8ZEbRqw(X|epTG_7fE&G>(s7Q#JeuTcQ6$;fS!2VpyqG&>%6g9(N8YyV7em9Au*
z`ifMP3D%qBTl`zpG<o#a<(jT$5Gb$~eb(>#*X8kbOl_vI>U{sVlVFN0T>qDi-wYgH
zA7-R2dG;px-xO!1ZbsfcZ;<b2trWQLIa*8RvUrdsBdiNnT<|S3v*J7_6JQKzS$jcL
z%1T*1bDO-OnWo~{a#?BfMjsXrMx={-EpMa26dPF-ocT#h&i4*11X^~@@WD*lrI$#{
z&xhm38#(KQOGF_tZsv2F@E^gO<6p!Ot(}^^TRVhP*GJpee)&R(w|T9dCy#t1M3>iV
z-}y``V$<IG1!uhPU)LAi(hruzE~k|4@z4CVel4@fKc4p-bNDSv2<*u82L^)g<5UuC
zSm?!fVa@wXe=_oNY<kwaR&kK8b{7)s)mOu?!jT-TEYB#ezmKn`V>k3|^mV)VH#T3*
zXgD~&rGB<P?=k!~zg<4Erp;Sh^{emEAF*fD$`=OYBren1tsu~=ekqmy74%6Ir`fkJ
zRSsrRgzrDwO81VIJBrXXs?!_Ub;q>$gPIkXSdLvd>T3`M&wQPWLgQcy9K&aU4snEU
zmmlNP#bNL$WX++`+8OFSGC|F~nS<5E%5=JwEDB&rY8FQcVaCx0Y*D54ReKz{yIa6l
z)wra`G<FyM%Eqx*t#GQ|O`k{Z>S*M8`zPX1aM~$gc=K%%f?X>^lnZv?RQ=nsFQbe?
z9@jzlY?dnai`hn!xm@(GwR~`0(RD{ux#o_6TlfKR5bNq!kSQjegF)yQN0@_HJoDjz
zWfp?tgg=^$fx?)6n6`4+iRE7gB$7~2;)H@|EPY93z@Bz9{&L5J?;VUfQzr`KBu!~N
zTJTdh&H+V{!rlqVD$(6WuW8*tT#0}3jpnploG#5OEovKk-c+u8SMoetx?gHu`D%OX
zr*03+s!tyfCuI-CN6IFx>fZ!EhQ_zi_sznOc%Nlvy+!tf_kV1?EYZZ&3;pr|Vw?Xc
z3-F~Rv^H($h3uP4<%)G3go6B~;%$y8iGv0PzH$OVksojZyZeVNWxG&Vq!VbX7CAd$
zg;i1#a_ZB4s2Qg44>x6Oa^;nf)v0lT_!oOFR|VWZ&HQ#s)Ub&DRWMUTTY7FgXHG&Q
zfF`0yvT2NIbqvU1UoM+^WY@EM5!_}~w)FS}9mbrG^72{_pS{!jw_s-G&eeIu&2##J
ztmmz_AEy!+Fs4X0u{Y_&Ff421HB%AIZ%cJahsl5_NfgJzekt-UF-!wj(<7kfRidKv
zAZ`j$vQ>zqlP2y2%wsHBq+q>M;VPxkxKRh`hGM?3E<|L&Gob}=VKbDf$S~K8_=N=<
z?ScntZ=vd5h$xR8BYR$)tcX>kOYX|?#X2vYh@;vn`B>8WSGk|RUe@e{!r!+F_V9Hd
zov`m>mxb~%?I12d)pF8dR}s8jL{B3Z>9|GD+ex!$OFn|gjazT;6@2#!pYIm}u$1g8
zSZa!SP7n8y+M8C!s|){3XC&)mH=XYg0&t%++m>0Qt}es?uj{wtxlZai+%J)s8M8wZ
z!lV3r6x@d&W8pGT>L^=J?r{pVwtBk+xf%%uG+4acv990>gb8Yv$}f!Tq-gde7h~Wt
zO%><bJ`b&7XJ?LTA$>{J{+CLeo@*^$%s=#k(xEj^?U`1mIlv=WvDk{C6rsD3GOzK7
zm14$LRkVEf^ac+d+nF4uyAYz~wT0<3&mqXwyPF+Uyp(t?lPn2;Gws+_sM`-1xAPwt
zZAz1OyvDMcN;)886DJSjRYYbG2QJ^JWW#G(H<?afOS2W2pZR-Ay#*|=umB8x(NA)#
zC<k~nM5Cz|r!tV3WBnp}ZP%9NYMd42%LzPmkJqiN7y*uPLM1gjshWQ@KH5kcBYAoZ
zS7j)hhcl|W<5vE1n+z9`pPm&(GCz`sO)xeB4xdQ`wZKjET)@`bOhB|?;w+Btl#1r3
ze9N~D3{~*OvtW`%o9rfLv-!;HKoz;vX_K0O?97qeWLZdr!)d$J_tfX%)HWbcPFyd!
zl=&h6kUEO6h?(>QieByHw)<iJz=RMYUmiYk>_$3eFqYUGG;5c%GW^_*c$X;%I{18~
znMk`(i%R#4tMZDp0+PZwc3?!=`G5ITm$PBRP?2yS*!~RC&+Xw=zkPY;u#cLPhX7e^
z6+y4iN~vum1+|Q0{NyHyDrD8*v=;(PHAH9|<6+=be|_PA>nt4?F6g}A8L({>Tj}LD
zP&`b*w8r#I3@?m3sBhQzp@RUk!fl_E15%MA8Y-CbQNE)Vr=V1IQe)#BLs6_Ep5GL&
z|8kyPOr-KOzswxLDG}|2n5`M|rU;KYWTCk93w`n9$ukUQlA9%H%4$$@b;kIsYptQ@
z=@ZxHlbWKvYT=8Pm>@(S`u$1HAlB$L0=BdvTHIZcgB}5UiX(x-3GkckmG5J8)?qA7
zwh@2E9IM5Uu@NXas~amg=yjEeCBbFkV8buI{vFH=E&Sw#VNRB42|Xe!)LC6$3s=7e
zwUIbx=a6lWAl~j2ei^6`Y;o9_6<^q=p3r*(+-RAj*~KSizQvR%jE!N70(DJi+63tp
zSI^NDjHu;3edO<SO%W`;$C9yMcyE*p8^wt$?C}M*6F$8(^&lKA6N{PP-b&ri>F3;#
zNx_BVN@r6Cz3F<8%O@nZz`LQzoW*Xz%9b4d*9uo4f_`a?2zR{_Ikosll16kdi;?Xk
z&*@%ZTtbh=4z~s(ACE)C1@ddAoIeba9cW^b0XQWS7O4363D`xm0ui4RU0}1b63rUo
z$OJV_Qi?#@paJ=;m|etYZ{-n`4yo%LlK)|oaFbvm`-WmpnVk&2<y~bDMcjSIIWof(
z>C8k(kAc57dbur5>05{nC2OiHwO*1|#E)DHHWH(YKIwP7SORGAkuYUtk)z}#PLmb=
zjCgJM{^-RTl37VyAtZfZY>yYfGv4Q}AUR2m3t6^8)@fPo08k;#b?=**lhnEnI2=31
z1hZ6c;CBgY{+&SxOEMW5Nrt@cj?dhGw%vd9NTQRdBUxL$$n@GTRlp0x;$I#VB@(L^
zPTe{)-PB6P4@g@gSce_@-N<;o4Z%x;(5LtWOW#=?c2I-s&r#kM+Uw05hiy#KqqhI<
zDQ5fr)zDg$?V`ec*9l(^A9l_*YwNWR@a$QLj6=%Eg=dJTsKkcJP0deFz@Ssb)O$|x
zVv^GzN1Rec!pFU*(|Eb`JjmYz10!zT9mroy1|t3g9aj}l?qJK_k$sY#`?_}oJKcnp
z)sz%Jg0}i9wxGyLRnhLi-r+h?6PX`hf`{vVZbL@9Dps-Q)oM$Ez1%!nWr^8qRLD(X
z@K!*zY=kt^PH%QG>0KO`F%wmZLyw<q>ZFRVL*;BKzR%pdqGT(jS&FkF#vRn%Ba7tN
zp{T8k`+0}gMLnl&VJ+hyD(ZHh7Hpo;9LK|i(@LdrUhpt~s+6^>B`sC~4ri^~7lrTk
zv@Dkvl9N$zYL(loIZpC;4@jNf0;=aCD95E^KwpTA=y)95q%z^io@hx8A{a-FM$P_q
zcv9Duf*BAstNmv{^N-aQI3Rv^2?%Nn0+;<{rO)5_-ft0#6Q<O5htIov&KE@`O${>y
zc&)~^l{rn2{4O^-Qv$i>L*sqQ(MQ-Hu`}0iM6bbIWz<5=Ty3rz8cn*O_!Y0-rY?Pu
z&FZs@*Ihkc*<xXa%pA9~ARP9&B#rS-)WVV@RC$rA9V5q()+okk-u&C;g-<=OXSTc)
zEKAQ5!8R$rlASbp0S6w#R+WRik|jjPDP$OnQnvS~P9#n-KZ?q5A<(1DYxSPh1XVkZ
zeCR7vsvU>o`xrSaAO|0|H7@;Y>DF$7lYW7VCMq3)D|Ml}9Ov56_FI7!h2~GjxoN<p
z<eegiy}kpVIq34~xqiuT7EYoThg0igwMs%0jE@+$zr>g9w8{tx+A`QLGYMH@5ZtU+
zqor%}noIP)T;?dW8rgz_$%zb(Zf~P(<6jE#52@qZboKQa*=Hku^q|yyZsK#X9b><j
zjaZo1bn~XyIB0gf+D^ei31yBn$<96B#ope_9=qv%<+<}c)`5p7yBe0aif5&`)T+-r
z^n3nJ^3(aA<iyH9kc&5(&P=4hZgbpy6)t!h;{bMaR^eAAQ@=~wi$yTmuK>n&V6^t*
zh5n7DFz^?bBwXV0eKUxE!|nd0z`z3bs}b8DWN=i2HaM{!U=KvD4*uv=L?Ska*DT**
z4uvmbRyafih%tC#O{i7lDjcM&pRax6$m!Gqbi8Nv5!Wloj;EJ2qCJj{a8r3F(G|l8
zo*PaS7Imk>CA`D)lMwzK;I!|{PVM}RHfyWrW4+n+1oxM5iZ;mlQo=`{nC_qx>8tMv
zTaDCz*f?D|aX6WxPyhRYESez=-rv&W2;U&Rc&AaRKUd9Ba}5*>>W@xYP{tm-FuenW
zM^!IXPEWT;_^XOjY?tLotd{H_;=gE`QgNzTx-RmlsOYQyA)4?EiC9c+Gt~=XLtb0*
zFfEb(c2nn7MmIC{+=M&|DE~#d$kS<S3YnvVu<Ipe@g#mSjuPbXA>J1)64#5ivTN*R
z7G~{gkL{YO1-c_S<{m%Ce=F1U(<Z-6spSx=_JmYRk2|UM7$YL3FvEgJvjmcpSZX{r
zCGOQBSHcnE^7i$Dn)Xb!=*_iPP7i&@d{m9ii{+wk>JZk?WJ9hrfUL`r<`VO$s5A0n
zzVV`;!9r;{*?dC1;D!vbUW-HMkyNPd`}L<+1*){;{ZaygbyXAOG4sepz4h664cnhk
zSN3hPT!B_2Y_|{`MZp*08quZ0otGg?3Iik6DE+fIDPM`C2gBcx>C^Y9E!NP#Tm;*W
zPSwwx1&xFr3zzI*^%n%!nYWCSVoM;e7hMSBlu5ePVg(=hsoRcKt%3+q!JvQye1EYk
zaGs9R#|jM|r{2AIptkoPO`zQG{Kv}aAE4m(GLQex!vD_;`1ig2pK}<j|Lp~^{;#}%
zZY}M2m3HK~`_<k*#a-FK76%`{aK(b4jWp|llOmrDIS@fvrbOXZu<icuVyXPT*=KzV
zj<E`9(XN%j^rNz(cEYdmSf+~WdooX6zsl}wuv(r$&Faf=c;!WH!1ycrwVYNzul5`I
z>Gf(Drq>wyA_k${kTxYvJaS=Gqt(K;x*8uZy(s*t!!6SE6a3?tUZaZ7$~n8K<@jQ8
zIV&|HTKgovl;Q6`-6YVD4vghu(7dwAs=g%-d-7;qYA{HLut(#I`%JT*D1|Y({Fk28
z5C10>{E#D-DPZvW_6W<1V9Jg=>&XS|M}O9>BjkpnF>iYYx0nl7NDigq$!3vJ>Cmyt
zbOKC&#1rhwFd;T~TW`wjeYPucQM!sJGzmV&SpdIlAPSRZ48Lo>2#sgtc(gINg#=(3
ztWP)<6yq9X4E@R{gJ>Rm)dXI?moEK@iaWxU-#k>%o<W~)2sI=6c0*7@P`h2lh8VWi
zmWMmdYg2BB!(YTW<t_R*=c7{l#a~aq$Jf1~<7ras-|LI;zvkr*i2v}{{xNiY`F_8f
zQAYK`cSz=ZU?$AkjiPF27wVh3oBL+9&!?4**iemPP*$uwv#jK`A9k<y(8(GY!5Ym-
zc6yio_;RJ`sgRXCGNoxy<E@na(V}s@L9!$1YapmXu>X`Q=CK|wT*n47;ms}1w41_(
ztxQ)#5G4t+5)<oKiK5VE7Fi4*3{3*IQ`VF^vZVQDk0l#3;?h3P{*_Dsx8AKIm4`s~
z^Pc!^#ko5(`S0dJ*qd!lszAy_k*}~_MsN^~f?7Fh9Rl*#Ux~^)3o_+(h*U=MY>3!Z
z2_RlT*x6baFh1sj$P<qZb%Bst-qHotX_+!{6hlTL$|GmINgMc`;WLqIgm1PH2J8J5
zEeKY)i(Px(Zqf{rJeZYO#-w^ZS<ZRYXH><_FXwr+04=VX&>0rXNHYkuZ7jn{S~V_4
z#x%>5d}b-7(hgCc{S4S5ZM~FRKQDnon<TfvRLzwubuI32%k4il5%#V6_X0-tR9(#_
z<4I|t`A{IsI^57C(hc<nsg7Je4j>&H{vi=4FkK={6K_N&5*~-UVJ-y2)ROMhdEsdV
z5+&IM-EoeSaIB7t$?~R)%#>^ajDb!DH$~u}xQ1_D$5TPS{+4|-OIR^z-|5lh(&B0W
z3xEEbXB{}yh393#(+bhdHg{>C_&lPT*m4+pn*jYTyibe(bFu`3O`{|fmgjNUG-m4`
zoF3hm<w6%FQAC}jeVMu0@UdiFROxBbT@O6@RM)-;R{Pj}s7#xwx0`oWoLvx3otKqk
zv{5Q3yYFCCYcInlbYMM6b*jL{z6w{Hf?a#2q=}zBFs1#SRl-FHulQb+oy0?^icuc#
z+~*fp&tzf#n3!!@+_sXcWVx9Se+hga9;+6aDRz`B$XmowN70dnRRft%JWM8@ilZB1
zP!@*x#{wtj5xS-yckcJ5xmh;Qme?bV1*VP)IYkqY@jHRo)N*;&bL3>;3p<7m$s9iD
z6xzAf;39TB5JfV|8TN#!YsQKenSQ36hhnt0MxbRAh#Ek0V3skYl^Bf%Gv%ynva|@k
zgTT}(Q4Zd4P3i>P2Hka<ZN7&mw#XuGTD^{PJ@C(&r)a5kiLyBPW+wsOM1UruTi{Ju
z1D?S%SY`X)5l}i(iD*=i<c6lZI3|Z+!95uwjQq9mB08aWznU^`3m-J19%mFW#cC3%
zIXq3=+Os{UX~mEtw9U#h{~=QPcqmNm&TNw(lSqFYEC@zSZ#d8>akPxK3b!c9H{=5j
z@6fHoagJS5R0+i}Ga4v9%Q^1J8T~f|(+I-Kj00q!)29A0IL3AH+U!AOUVdp`!v$dk
zB6d>T3{ZlbG#}!tH3#MO6a$SWpsebF$H~k7E?jGFy(G9Q)d+GUYFr{M{HPlcEQ!Xt
zDa*<(ConVkf}w!)2dY!rT=-U$P4p^fSZmD&hG)VL1CV6T*B})-5T*V(Ei}>G<`NgR
zh3dE9mhI{-$j4tpNAskIE_ZN4K<tzTV3YkdPKqhm5xDM_oh=qtS}JpO;XNLr3hqLY
z;ssmg?Zpdd1K#bpVC4ffY!dp+a9K2Ue+&}u=JoOe$0V9L@Ij+sbvbW9*6Dol=7M1H
zK&*-g;Wmc3kWL`&TOdO_%z$R=D#e|9Lj^ZEzR{uZSg;6<e3}M}25ffeygQcW(xl`<
zI=pl_(6Jmf1rSwM5<<Y|)<p-<6r5~jnHW~1;pQ&QVv$I~g0(cJW_+m1@1)HetaPY+
z(5isysbr$+Ldr%2p;s+Pd2q8hw9w)WOfiK^Vr#zb3@o{&EdmOuOr;%Y;h^We$o-Or
z_6}YFIL&4sEgF#TJ!ZeDZX(P}y*`|_xtC*YI-iIw=Rt6$*;^OJKsksl%hn{uPQc>S
zP$bHk3N*$M3@i?aoGwkQJC>zLNwHr<xFNiSsUz84rEq>pxv@<yZY<kFAZi^#tU%-m
zP>=xAbV`j?>NMrf1M%DT|J9@+XeKEc2YEHCd*o1>2XpT(xVPojrpt{R-0@`@6-=D+
znX{7INFQvWsBVE>;26;$5+k`;%I%jh;QvynboVAj-#5e>&F-?&lL<`zU8G~L2WN`J
zG=A?2`~$%spnp9<-ybo>HPK}F7>_gpya!9n4FP)r(ZJ8T;FzdV7!5BWuJy7;+O+Io
z#N1}>6xHVh(7Dw*M{~Tw@@6yRfJ#*uJ8?DIWa@Halz>oL0_Ly7u4OGv28B?H)V`em
z=*EaHS+2n0fv&~~vy-scN7Q};Gx1cfryc-J{oJaWC@fIrvQ#_rto&jJEmY3#MI!l2
z0JqVD*RnMMVg`!_4;NCgGu`Jf_<X!|x6}^=bddjStSt#Xl&lrbV4(Dog7yl3z^s#;
z1OqkK#+Xx$Mh}6nZ@Jt+Zv(ci4Yo$X7@=TdEMZk&)$>{Ls5U|}kH_qqK2L0E3k=Mj
zlqW{7sDV&9aR>wDVi+kkC-Gug@;fawb9q(BMXEfj+u_{?Hd`rUX9(E)<H7T#m>5XG
z7qGJH!hbKv>Ou=@gKLZgycpI?^R<M>t{stUZFP7g953NS!#6s^z0Ii{_%Q^DevHL4
z#8`${i@66jgV?f))jNp{sq$dTe~Y`Q<w&RXETj#VGxTT!yhY?i^HvK}u~cv}r9Osl
zQ%ns-O6~bZkG-bV!b{9`Y_q^xk|dy7yt)0hn2m?P!vN;2<p#!+=|SV$JGCcOi1ng>
z;9yPnu7^mz{j(kOZIpNOi~hFrL+=s!yfe|eoUtG&?v!0{TDnlo{*IQ>yxbi~LIcuF
z&ENWdU(454S}(vJ&L-<N%`y5@OE(#|1cx#}pwfjd@KDUTaj^gIyi&gd@rN%{4g6*s
zL${$eEdd>-q%@nJFWNMLD1pPD;maI~w@Z?X)Of4BH0xl`aRlMtJj)Y~q1rFs50VO3
ztWm$ibvJSC`b1d#f9=HKMxOD|bX)`;Z3Ld56jcB9{E6(0-+8I;44~I~BF6#%i4X9g
zK^Ct|W&1MS2AQm1cL|W{Qtk8q3QScPq=~NXEQK1Es|}cD+V)Ic_a!t+87<ZJz^ACa
zQNqV#>e(PJ+#Y)J4Eu`2L6VzmvIx(d^NtqMO5)bo9G@6HWqO$vAh9b>1+3l#ZUjRo
zuj1h479=`$yWq))e73D;^?ty7NGA1mZ@gH`%<^g5W*Z>vFxs&`+F`zAj(ei=#taR+
zxXZbhpUqZs32Om!u`R|sbU`F&1%>O3Y}_AkH5m4B(9#l+#f^w`NDF|karQ0TcqCg)
zMvFoTZ?bhuY`!_c4H?W_JOA;p-~HT|s9&ILjD|U=z0=hl&!8n_H4V#GnD=ON8o7c^
zzFNRF)4`H#Z`+AZr`WzyC`!MII*qm^VC?H}Hiu{{oj=@HV<nR6F&gl(Y-UIsZ;hhz
zPz7jM^;^46k+uIFfbEh3CL^xI)u(p%!xux|K%__t951lT?unP;Z`C|<Mb{wf^1(6P
z(+YC?STkJTH6pydN=s+z_e#0mDA-Y}DbXdp^tEkx@<Wo<mz>qv`&>*qy!90Sop-wx
zfYQ)=J@s<BbC@RSr34HD8qyi=jKt|siz?q?4$~$R8$YZKD%-`*G_Xp3&D{O$n_dsK
z6tS}LdgP5ZSeabccS$7}N%P5o9JpU^H%F9<*Vaig*|(z$obk4$FJj1Z)HFP>BID@S
z$`0r3U02*1EUXKEcbBc3!g@}phbEYh=r_3sU&d(422Xc~rJ8q2Q+pn_Fzb;y{iSrf
z&!}d>Ehh~`n=cV4s!|$1lpqJBnI;^^0u9eU&4rZ2IMI)&Kl3-8{IOVNfb`V_9U_Ad
zW{|Z#HL{a5eQs-GEpAb~&0@<IFBh4^4Vy~T?AGJSKUTG^;lIMve?roK?mw_F{f}hL
z`rlxY^?wBxx3o8$@Hh~*)<@r>JU22b%BDY#=Ht*uwIlH-rS9w2q}~YB$@EQl(&Hxt
z=mi@j6Q*-B(hgUfQ=P&FiRa0n@bChvTdmn|*#>_WPLdy%V^KT(?(BZ8^wzGv&qVQD
z3Lxe!)IF`86F(lbKA`)JVmw<O9rVp%{k9q(?O$ItYhogouail@9x3Pj)pUoMomFDM
zGCMYSSK!I2-K){9dso-)`tIS>)8h(*i-zYdmsh)A!bQ7+I8hxt7mRta_^|BHZsbh{
zG19hz3qCzv$G5+Fma~Ru|8%^+|MV;|0JV2?3?i-psy}snQH|f_E@Mw%8^3gn9u>Kh
zX9wRz+nCiz@?mP3RKPG&@Wc1TQMFRdMd+fz=p4*icf43yC*GVId@@lHJ446c;&6U<
zcHVz}rNvYWiTdnS1kviYjfl`X$>ujuu+!1m;rO!g^bw6XtH$A{^Y2a6-ubuoe4y}O
zZ|nUSyZX3)8K@Q1%u}e_%o*7NM4KUebM5FXL~RM|2fvq(vC9y1Z*oAIaaN;&@uh7>
zWluzyjq27r9T)8lwjo>zwQq#1M}lB%xzZG4F>hL6p32}A!&IcuRr{o#`UEi@AYR)A
zF|D%+!Jyg8XeGVvAso>qg|#^V7YRk#N|bw2Nt~~mYuU}P%dE!C+0E>QYr9KYJOX5x
zyyEGdeIlX$wf%0p$y#i>2J>sbweuMf)WrX~<EA~q$-ZqRN6*jA6$G0yHwn?P;grSL
z5yYaf2O-qLar5SF$aA$1e`GXDm)25JUA#^t-Cxram*4cROLihnPGss7lT$HtbE#XN
zMFmAArNL$@CuzXEHja?hK&6Yxs;8<vx`0cfk8wqSub^PIYk7wt39`@kWgoSD1d#3k
zBf$0X1%PfcOfOZEh0JWeIa?B>A4?K=EugzHBLj)t$cAY(wy#MA_3#+)=v{X6cSrI+
zqZDt6Duty;65lu_+UnYH?bjgn<%_3$0Tu1zNsO|@kk<y75*a7ZGlr$#Zt$e+4IsT{
zLg6EY-y%YGt)B-R!GsV5_5?JHO+SnY%jElMh4je0qRA=jop5L)Akx~@iUJS$>vXtD
z_=sb)aS+h1+{Gl~zTCy)r94^2eyW{yWx&6?eYazMn-KrKWP7<-+>L2ReQG}5Zlueo
zvSMBFKiZiafe&W*cJjLi13w60d3`~nBftx_zOP!b4BFd;0ny-};FyBUWkB<Ty^xI$
z|DEq0YR)(OW9X%-l$%3Pr*p+ZkUu^80t8-lsLb8>sAzCm`gRhY)3cBE;;iqOaqxNJ
zcs-f5dcnL>dXJq>_1@DvDAE_eBrTs1D<0b$%HX@C&Y8XFq3Gw&uI22xV6kFsLfO0f
zpijYZj4^sBN-P8OGiaK3r1AJ~zX+JwN@A?nnP-vvv!rz2zA0Js-6YpQA;ml9yW^gH
z*yI`uy1DzF!hHZCR)~n=^gDoH8cCLK&u>;hCK9WwVSXiYs||nEpMaY0_Yz_5XA&es
z-QJN_X1yU5e-Hd1DZe>x&r1ECz4K0WIea>pK`onpo|k!5`>7i=`~;Cdr?(=3=fr_+
z-yYO9w;Y49{|0#q0&Pj~TNLCO+5^kBz(9%2cW^Y$L*RoBo}bR)hUfyu>(qTC;10Wg
zX&`FPDQ}NAeM5kY=e=OiS_<J)_4=b^FwTz`>$O(ClBGsi#fwFYTLa1P?UZ0GNU}!j
zlII9`+%1w#JRHcf_oP0ONhmizxK!3N&W-p&km>a_QJO1>cQV0fN{P%wZJ0-VAgyg)
z(=8tydgxvRP#MJJE+)CgSVK#7bB&T@RuMXNY7Lu}V1JGQZp5Ud$>PBB2M9N&Rjc6Q
znEZ^7ZaPo;p^a5uc+tU7xe?uMA=ROl=h@7CJ!eiO?af0mw1!h}HdZ_OQhRS%^;vwi
zdXCxyzm>pGP&qyLQD-kU5F5;$_nwK46V=1A57JH*XQT+;nGe^%0EdDI>N{vps6qi0
z^h>LRGl{_i2CsB*L-HE3Tsgukx~B*osTq+|-htHCQ-u#h2bX{is(@zg0HLU?<3Q)v
z+;l%(^KlqIXpV*^Y!0^1K!szmIDFqTkfva!tCE(cB*97`4Rf&J4EG-<v~Z8UrDJG|
zHR_VjHqz_O<2*{}FdXGStnNS@>*UMAy9`-Q%F9x?=0S}E2KOn<eAjX;8CrU~p825$
z5-o2t&#H;9Xv3Vyh3|?uZbL`;cO5J-{J68f2o=<{SI04d!ts>!=z)z4(`6(BICv_y
zDjbBU@yD7PriL$+6@WM=*zgTJf|xoH6oQ-#*^y=ApoCGZd`NH<@QeCe(3t=ErpK9B
zK7U~n^$|*$G|%vT8VmoVxCvI@Vyy4sFIl_|D0@ex8JHZ=N_^(4L(9u2Pl0?4aKL0Q
zH~S8Ym9l`x1TFDf#0?4){BWKBDv%;%L9G+)!Vf%>6)IUNmh{?bokP!@T?Yncxp9U3
zoR1T`Efjn!c}xNpu$_p=Yxz)ArW6gdat6&+Z92=bk}L=@Ci`qkJXGWG+1#$r&aZ69
z_7xKI>a$;jrXHB+FPj8UWmJFH{idmc5P4b&>jPO0J$8$-=|s?CR){Khxh<o-`&0HT
zcJ^i4YxQe29xZhh=2yf+xNtabRV(^CRD?kqG)#S=*C@8!lDAl@^?dXJz(>mhL>TQ8
zY8^vn?)I@kP!gVXkCP4?8*vfKZu6K)h{(xl*IG&t1=u=Dqmq{lj_&V%kp;*ISXt06
z-Mp>HF0;%~Un<KX*acM+r}WeV3HhXkI*b}=H%|48N4arVP&VkLBgp!mRDVWTZOT^(
zs&gj&pST>0V3f9dQBR_Hp%cye9RWv5QRwlzeZ<_U&`A?XDULm0H;x$T0;GMU4|K6R
zgIZKHinev6IjX4eZRmebFZ3{aBfvkQ`xjDrLIxhtK8mvVOQfRD%_2cdcQx}(`u4`v
zgz$~yM}!D7%-B*NgR~#wGi)!CjGP@(qm6j?m8T2Ni7zbmCL<R(`m#qTO8=~d3K2mP
z#jhW5EgnrZO0)n8bE{Jo6sRhTuEr^NnuG1E5nC!Gj3!_FmpEX`duxbOp<1;OKx#SL
zcI|5axq^8x9RkSar}QQSqZZ^9)l(&MtO4a-u&E>Z9_%cLHP|tI2%>6o(B)S!v?N$?
zm3)jO7<d75IPXanCYF)|q<}RNFZ6FPbtf4<jCm-$v}e143sfRhhr0Cz-X<>rEMtyr
z0EP%OGt#?{!X8kTOrV6Y@_l`#7(D1<zK2MQqC+P|!-TaUOI4QNFDc_D6c_W5#}qMx
zu6x0USnGXNIB&UiY+M>S!9zDC7)BicP%ms>PJ0Nc)kgpsXpoJd!+3Z%SD2|1*dQm-
zsDyDmH9tfK3SmlO>=Qm9qRD_y(i`O7U3gWFo6^H0QRYu2IX7pPYFt|zAYzxd-0RUE
zBu?r2NZDf-QyW%*#UaDgGWix{?Z!NpgO76hrV}~+UrX_2o()n_hafN#5XFINPy$Uu
z`+!a;`+kx<_RKnsRuZedXENT7EI?j%2XbP(WnKaZe`4s$+Bf9W*$`sdsy&?VDkT0P
zCclY(&@oOON;I04hN(X|o|tu=cSO_sJW3}+<puhz8>%L$Y?E+TlSdv<5IeLGPewzD
zk{&M~_c7=>Zj6d?TtOJQW4cZAQt;nsgx1uNjA~Id0pevNmua$+pm8c3{=#`SAo>6X
zqtTMdMKE?3=B|qdj=@*5bBzoMUZNsM-Hu-PsL68Jyo~cz^zx_aM(ji+U(`$6R@XIz
zJ~W<j0veM(-7Q%d#|-Z;IZRhSlH_nFWs4~-ewnP%Y4|uPele{~p8Kre*{#CWrVwHd
zyLjXMw@9&A3V(}a>w%Fnu6Ln0Qt<uYjd99$;dm^I`6bo8h3~C$h1mj(aOE;6ncE79
zkx3|(O!@5V9b-a4%-%!YoosAFqY({T-nZG;(7ZaTtK?|P<PQ9nn=u>I2^9?9Kbzf&
z#4g=7*;*aaLhsP<Q}!EY@D77`5sL^2$q0<9(lsfJ{7MpX2#{HV5C0pAgQ`#Ud1YWg
z3V^Vu<OSQ_+rui7L||VpnzKn2)>NL9$DuLR3bxV`hxHuGA-J9um3IjTBu7N6qDArg
zUJ)9|_rx4%T^T|bCf@~WgW>XbKrW5|8cq5#TR+PsxtaJ2O5JQq4MMO!bS^*BaSv7&
z1K}UI541E`{-qzR^ei?4Avz*ZyS&X2p_38hU{}`?EyV@gn%=@6=>I~oba?IFB`Ap=
zoav;#PRUFqcTC_DHjMvxjpU?my_w^^c4p_WeAgrPkZBx`TZ9dgA>S!o{fFA-)~_3c
z0o6w$`&pknz|PPzOv6{x*rx*7YLgK_!s|#I`Q}rbTPYCsx4jJ9WP|7M57i#EdjjOO
zDcK_6r(M5E>rm6hS#@*dV6H`*(Rzk*RYbY=3Zt5P22DS_>NP?c)EYH^vL^}2{%kC$
z9w?51kJ75Yok*Oz2L5>}s3xJWp$z2&S|VtZAJ|flMauZbWpuk*a#-}5HwBbC^L;8^
zJY$}s3aiFVfW@<xx=qx7aHlEW!oCf`178{{TtWz=C&t9-7W1uKk{tVX5TU)`O?6&H
z-(TRG18~<=T(wO(j5hraI%t7l??H7-qR#jo)g%-cFMI7UhxbF$6a@5p<)$-44hwML
zK6*a6sBcK75a@eY+Cf0$j}%g?@;+1XA&Il*r0RsHj|kY~_Ha>?83P%axzAlU#zAdd
zK!eY7J)`TH8tF&R^wRM4YERX(jz+cGPrGqBzo$0p-ircEG`=bYp-xAG5?R%mJ;NwS
zf@4Q*E7rvn9alN41;FR>xF9;@-a#aWH0V2z^#yNex(3IH0@0nkhS`B<*y`N$K&N#1
z^V4MS|K5-$lSxu>;@C1eXQL>Os!w20<lD`PrcJZ&tkwPtr)Vf9;^?(3g~y%<R(zfS
zu?OdUazQB7zW{!NG8-b4R{9CbOkBP3S$Mc|7&;jZumSj}uIR)iMW6UQN$zz1$(@4!
zzG`aPMYx6C_W9}URt&N?Kl5@%*L}J}T;M0rO~tbhJPN7tVmsy6H#Nf49~K_klm-pN
z&6-Hb8|`$UD;-*<>B(*@8H;0oZ=G)oYbE&pON#MIq)ru`Q>Rw{!H%o%1>AmRhe>*C
z(puo&uz_D>jcqw>P1120))3a~;92)hICM#k|KD-_f7mA%^Z&$kw*O|IZ2vp<sjY2~
z*NRU6{%;eFoZn}YkN@CjnM=DNtJBtk3OgpEixue_sU<B%TP*3P@?$(p%ymc{-q@*>
zLlQB}H@J7C)8kBhQp$$=mbvGDcJooWTxfs!zVG%guUD<UPold^^uqWT8(tt*atMy<
ztJ8eO(iK@A8IR5ZysXAcXVzCsTA9du4Kj%Au}bf03S#ANw;o~GA8^}w<TAY*pN7v%
z(Gjz>O9gIf|Bh1B3AG;kEL|i&sBW_9<MLPy4y{A+dDZi`Ykm1D;BtA<w-dP7MV3Fs
zC-;s7Vj++|S=_n4I>OlVudVKd$Kvz^|M+hL_7ME?Y&UNm8&jiVw_&ly`oPE$NIh^y
z0g6^PC60O`{#YiJVezfFd^&b5Ms4Ej;7u`v*v^B=xMVuE23!9|(OP@Mb6+mT1q?4<
ztNXK<xN;-hgY}%eFN2k_1AY^I6?^0O->BSST=}hi1sMc(1%)qa;ZFiQn!erdmeqij
zLg>%Uig{q^r?TDnT`v~|wu{%d^ZAF~>Kp!VpBAsjtIS#g-_RetUOy23Tmju5!>7x)
z_Y1LdNAMI%c6RPWve68@Ur=$8iRG048VYtCjhuzL!cDTJ<OLt~%vq_2tT|Sl)g>Fq
zkK;Pz_2bEH14YO-0M)N_g4U88(4MdyJ_xRW%^XG|5Eh){DqO#f0F5T(pt<XSl2D*8
zpgSjps9S<oD-XnX!(w%z`hfTmX}WO4IU3&Y06rnu95CA>#@@e<5zPCuWspHUvF}rf
zW3nm;<qJNgWv6zJGYGxAw0|WngXxDgCkzC3eJp&qt4EptK~^gsr{etplae-CaFLw=
zCMkv#$js2usr5Z5Jr}bjA9g*RZ7RDRXaUFWN@bMGe$I*4Mj|>>?3q;4*LsCo*e7yj
z%wIIVJVNp=>7taYyECS5uVj+L1|Olwo_VGzWM+f11juNek6mJFgWMri!$I=Ju?vtY
zNHTkFEy9DKjoVIK)X)m(0akf2ZNjeWFyQz_1T&73xv-Gl(YmJF;BMUmH7KcGJw^G3
zB>82T*n!7prN~g#35p@EDw6yzuY4r#kCY(<alz+|buj}sZ})EJ=m9B;*6?Fv$(#PP
z)Go>@5ehe2M9@o(!e2EC@~}^m?wc3Fd<;vI!rhe9y)HaHlqyE3_Tj>Qoolr}QCun{
z6A^LEf1dG8YNZ+s<XC!8yr+DcW&T9Xyh=T%yk)+l^w`m?B6JY9#~$Ysfj}MKHu3Cw
z(lpL}wzERp-$a3WEo_aux^GS{bP=IoM-;Jte8mApgUwb0gWE=hzC#2%DUrNJc=N#e
z$XDe0ny+@oG6MA+<jNTgu~C<UHwsB*<Eq3|JAgIHu>%c&Bp5j<3Of;y;4}QDr%90N
ztdo-KfVN9+TfjE6HuEZr(Xb9|U)vD7$#MfN^9frF=0RgC{ORtGtqfa#Kzw|A!Jc!_
zfUTpXGLqFs$70P?)P#+Zodk(K80=*(NiszyM95W()1vSwW>MBbNY3{!g^TSnTnGcK
z@<eQzuz`e3m$7dqsBO=fuGyyq1_z!_43f9Mgt^f<tKB;gkoX<KRz#tp4344sn<GTF
z!Ssh@;bD|kU>*%>G&jNNR>R6BF994A3)}V~r7zHY(+L8LU!Iy3oAk)2(8p8$9nolr
zDe*Q|_8xEqX994bx?KX-X-9c$kNFc}%|A91c8o!1Ey=}>yzf1{W<I+?-m1^xWZHMA
zpe*OOmJ@DJX;Fi3zI@<0HhRM<kfFP_ued^PHXwhHE@aWC?*7~k`~A*QLNe_SNv7cx
zI$+YmViRIFA_li*RIAhYjzmuJX8)tvoM<}~9igiBDrsLJFtkbxdyHkqBcD(tC{(bu
zN7I%q(hVO2t3qlP$Qh@N+xt>@`Z|-6*yjw)PE7!C+|yIEwsD~5#DsJ>5A8p+4N~^Z
zhuuUey8gQ~IjXS%64D0%CdGy<e}^V3go{;Jyaj_`nt%1nbuln-XW~kSinN^KuGWD1
zW+P19{kJ=cfHp|~&1Bt&`O~h*2<=9uCHV%<N0;V_lZR1=ygKsl|0F^<@^QjT7<`NE
z8q{R?%F?58+2@!9b~1c#6%rJ~0tqu3X7qCJEP-zmBL10tNLCBQu6=`N1Bv@D=417{
z7s;T>Q{^If02M$*GlI<;YQc)pb3yKD8_%`nIEdaA?p_1WhO0h#V{!9Rr*O^@p>yey
za=L!GmF>R{apMLyK1y2OEg-O)>cY}lDG4qaETZfU^eYc29wT*+%L2o>O?XaW%m4_<
z2VKbU42Bk7@N!N;)(IWtP?&aI*JpAHnrNoPKqaXImyAot0tEX^3^n*l3^E^^Xk++L
z+&v@0fkeaFaKg6&OW$odloFXLDT(N0#cn4<GhvNDB_lyReqg@aP)sqT;-|+%RXFoZ
zhQm2qNFB)%Z&pI+%M|@lq98b^c#J5NgDIV;c2+E=o#d`%eh~|`ySh&~t|e^6U6uIi
zK!w9{D8$}@90pUW^#ZVB$T*Lk;l(9G#z(-r8p<rPXXpq>?x2Cft7~Yl^D_VK^8G?j
z$axDwKr*+!9*9|?PVOoj)_NL9?1XGp4ZyF?*xVE`u+j7-eq>(;OG&ic5KcRdu8_;2
zCjUh$#cKLl5_Myz2n8n?VWC-FOdL64lKqzeWy8H=AF8JePw7+sH_uQvKRy4`86SlA
z_SHwj*qLtndqobXf_~Eh#Q6a`(-xIw)gX^5(+Q=TXPrddB*0QnRi=_E4b_-xxZqw7
zoi4aPNEfMqJch9<d8Hg;7ess&=650Y)&WojFwY;KU-7_&E%{+E`^V~&M<2&eCX4|N
zKU9ERsVHL78sZcTl<_d?DQ@n%I1pr}vL0g(H>rd_bZE&Ij$vq>h?s$Q3Gj2+6H<)}
zDV&+RqBVntZNLho`3Em;bR{Wn^)6(<g7r~DP@ginDu7`b4G)Kcf5+wH%DX)QxrP#I
z<!^r&jA#K0M{C%CfCfaVIddFrj&ZJj?GCUifD^{1TH}yMn7UOg85<&ZIq}1&Hk7L&
zlO(x?j*j~)#maSgn7H4_9Nc@#y^Prip(E?55nzI!Q;pm^+>ng_%24i3_%-OT|EQ$`
znA6->mi+0ui!l?6L5;4}$q#0((u}QH{?qdEl&Xe39HK2`=WGbbBq|&<9PO+<w42FS
zuz0cps54xxBL)_{qGsBq0*wz?)s!6dpxd{&yzC-GV-mY`9%Jk6eh;K!NCa%_#i%|v
z^w)QJcIcF20J_ZVEUEBUZxeqCQN)nQ7nYlUnZUR=OhKmCFgso2Gv|&So(*C0sG7H<
zC@fZ$ZdT3!wE{8%zXT(Q|I(-vk-(&h@{x^k1o=Gl2@^I8(d>Xri8FdWNOUD<#(|YT
z9!V7<<kQg|7s@<B=WdD}KbOL#yq+yJ?BD>Y35LNlOC^^A(mYgf#r}BJesYZ)=<^?;
zVlj%I{D8pC{=zEi+|u%WR^uz>s62_u5@5vs&LraF`;d`4(Vu(8R6aRlo!wYW<e(Tk
zAJyYA_sEXX3G=(-n1p?WrQ~%W=l7Kggt8(*MueK-NKhAEs^{x-I<mamT0x{X_xU5)
z^!H9Qub0D8g2@UOTr2>KfS38P#c{<!_yw6h&x62S4WLZqr9`46#VT8C3eQMv2wSGm
z%E9*B5qLZbl7b+YQUv0+d|&-evpFN?-6e30*ItkySKhB+43nw3Jo-SP*Ta0tZhu`Q
zBG|ltVS<%4a6}PI_A%ajwwt75CR`1yeO(%E8QH7x?`hOI4V>_AH~hF8)B30G4tDF;
zU%w&$2-@91Y>~0fjz4=xtjFV9ILO!5i-}F(gJ3$55t#ut`6glB>yXm@BGSP;Cgi{E
z-C?{qpnZPO#05`za(MC%?qlW%nCLkKMvhbdi0->uZl@l5Uc;27mbY&8l(yfj+0>Lo
znqz1Q(bI*^!aT`0VjENmls@?Gj(@hZ4Q{lyU$~O{rCI(~hFvQ;91B^<2OHajZh$hk
zGy8<G{7wE3X}EXC_MYEo!8v4fZo6p8xBDcwvS`E3<u;M3!U;maj={r^!rncd?>ZLb
zn5=io@XS<?zMU<)p;>g#$jdWdd6uO5F*sl7`n@+aR*Ysm|6$Sdd@rFq3cGHD$~4YF
zjQt!wKYZ|(e3ezV88&*Za7%<BR;ow2|M)YUwVm6O?+v3b2iS(h+Ptv17LIjld_qvj
zF&sx&03QL!>?qra5QNTZaAwcdj|?U@0?{KeLg51;c)wOS3zAz<V>ViU7WJPX5Kr|H
zd7dpou=uV5K?i+`60*BgI3xdX$`C6P|EMx>iepk}v{C3M;4~6I>(u#-)9ll<lhq-O
z{7x8k(!-CG!S@e#9O#zfr}<7qBKwpQBfWKO0tzQU=v^-xxbAXW<9pU@YeB)>e_r7W
zsUuzVadVZIsaJLk;t6)-&0tLRpzo-E+~PBO^w!UGK(TLL5L4mmK<c!cgG9Hujz+nD
zw#GH3P2nHBmFL(407<T%i#BkhSHPqJ>N=lE4uj=zL|oOM8l{vB3TJr~Ezu+7nP5X`
zG7n@eocoqJB0h<d=RvzYC#`c3n@!fLMGJLqd&(Ur&2s_i%;0ONTS9wi;{j40a)+5l
zLZV~k3scz5;e*oWM=*5P5-zg_m{u3QJh6N1gQN>eF@xw<YB}CN9f|;QFZum5d~nH0
z-}1c+IWWRm_RinQ8%?>zLk=xRI{qJ6H0xDS1&AxBmQ~{kwyK|}=pRI)N_OS<O!e2T
z76sxF<gJ+qVH6f+c1Q#@dT3|L<K`962kER3n`O^W<?moGosQ?Ida1$K=v9gdMJ?+B
zqZU$7*kLr<^5~q$B4mP(K+}N;Z0HyjPlou)Qe(MG1NF1_ws(xi)dAA&dXy(jTSFiP
zAX44F)>re$vM`a@{2{tNXMQGGv`I<7%i}KjIMI;AJZ&*O5@?1Rru{G(epz;n_KrBO
zo$<`s-j#0DNb7afw5&XlNb#u4J`;frgLGg1rN`Mt8;Si}WZVw%W2TxDN7rQf;=Mhj
zU_j6@y6N)dU=5@K6i4~gA?^FOI0|&8(pdEJ>v7nm6z0&(4>JY<mPMLkqRYohVk+q`
zFZn9q8edwr*R3EC41)6kh+3GQ7DP7ikFo1{^=-ph7s;s`o^|oM*^k0)z>WTGQ**Av
zvzS_;&0@EOntce`yqiBWN>X{P`VTlUY_#Nm1^531^8avlE|&iv-2a=iv;D6)d$YD?
zGTtz<+rOhP!y)>oj+ag6{8OkXFbSYGpcl8G_k%TaHKuNu(9obi+ZnEAs_L`EqLjjm
z+RD1B8L4kaT=p$C$J$~47<=@`bYbn)^YfLso&R>-l{xOU!zaIw)L@Hymc0SqPsh&g
z&TELV)*B}i?_q}4J+CJ2#x(m#3MMV;A^d@g=P%v^j#oP`aKcGkQ*Jvgv&O5d<LNNS
z{g$(X;jibrUr3akaXQ;J|FosJN^|QL@zb^FtD~>u4av)ABeNK9J}Qsw<E>nIr`8v>
z{<^&Ho<aGVsYkEY^hKWR>uzH&FV&q-;GUr0dq<Bzg(CxmZtsURGepU?Zr*I&TWrRN
zu4@}PffSRMy$nAvtZj5BjR>L+fUAJG$(!9xD+=@3RMlj9d1isVN_hqjecNpt^an5Y
z!0+zNt-qcEJdm`zI08aQ1OgkpUe8C*Tk!(jo4oHUY4!xZaX)<Dqo}VQ&u7nwS*5cr
z`qj+X2xXM<?NG3|BZjR*Mr^R9%|Rk3rP$ENQZOdZ1__|aU4Wd#MUGCsh-#ERv^G$d
zZZL>`pUP599wzOYc1X1W9ov*#I|q2%P=H@(*3e6cj6M(GwNANjuR8?-;_wmr68;98
zWh<4+wYm~NxEP>-at%8RRCQ$OZ!C&46g=Fy|3?RdQAiRI?$yZo?Zn=Y&>(8=_F0z`
zUFUD*r$gu?*Fo`!?UW6m5y1_Z%Ln#{iy!vy%)8_07cDxbA%;Yjy5g+?l34)fgk})Y
zuFR?^>`bY*hNkAEtll`Zyqq#Yf;G{*6tojyMS?kdC<I<{VNaAHfV>iLpMiG0`S@E0
zuLP%%6ncjkny77EJ&Mo)Q9zqYFmJad#K7(yd#6cGDjIB;c&x>pu8~$bn}CRkhVX^K
zqu(k`Nj~1KjdIK+Te-E8VTH=IcT9+!4%<6C<y4b-E1Tp_H;9*{I&GF*Mm#Y=hG?5C
z^-De{GQ1w41u9@rP>swv!(i|p9fng63st7g3n*{RhE+#-KUQ)dDXlqUjZ;fL!hF3{
z<f=VH+l(Z)nwdO@St6e?f5`0}IvlLdpE#dLpNLjyi(eS7X#qDy3+V}4Zzj4~7+Y*U
z(m~JA5F`p(C)`+0$uP>vE@0fS(ZO_~zj$d;jsKS-WJx|8EW8$QlR#dA^6jCZhuwao
zFj+YR`FZwCjFU&Au(hBzkC6=T{~_)zpyEoJ{$bn+5S$Psc#r`Ghu{$0U4y&3y9aj*
z7Tnzl5FiBi;O>Or8Uo)8yV=dNyU%O?^PT71Gc)(LR9FAHx~i-DPIpp*byGim+iHEV
z!78%o`Yw`3JSD}koNpNh4}XJjgBn+7JzK6?*{Fa{q$(R8m1iA6)&3yYZQWajH^q2@
zRBJrLHGaK8&<_hn#yI8DMH|#d19z^4I&v*V=GjY1t`xlVs8w@C@-4iCl(~{7S}y+Y
z*xWkE*rgI^`nkgW<mG3e3G>SMp43qKFO4wIX`v&~F^(D1*9K$w4t1g^jrz7L_3W9^
zLhFjMoLW*#U6(`UTOTJeOxddVD`}*|a>i)oysVC4s^|aSq_lJol?0{RZ@OZjp1l+{
zzO>r?g<~jTqNqby`QyYQ^kn~LBCEGZaOX{8$*JN+;l#q%#5Fj6FSv9W!(&Q&bmFi;
zl#}QIRGpkU2<lK|$TC<i9p1bPD0MlOjWw1*7b}Q^V&^Y~$!p<luo6$3{5nPMq`%ie
zw4Eb&pz-TJm3qnH;t(X_KY$zwDa;Dd@eGM!b+RZBz(^m1^yIC4(#MUjU2_V(K9d}L
zFFq=Zq<;DMDdbjcdpYEF69h7hV<<}x*STSe#@tN>ZwG<(m2=Z4GjflGSSjif6L{SG
zH($|Sk#+C3-pBmVLKiv2qQ;Xw2uA#Xg4?=}Pbj)VwDKalBG;!yA9e&r7DhLh1)u(H
zu5a+ZJuf>Xo_g!;5s3hFNk*nfE&Vu3RgZat6p^E&aBrS6%n0z=odA`nt&gEyi?I_e
zybMFv^!}M#V|y-rss^e+&N@_d-#D$s;sJ%Dk`3O6$yE~n#9~qMoLawn+Wu^DcmUB-
z`hiqF{%liVYbvrGBuev)8=+@+lHL{)Jl^b!?*gIXanVv3$jZ8*I`9w&xrKLSY04Yr
zqO1jenomCMnr@(-%>=`wQ?b03<QLB0lIn;Z;d~9idE16#zs4AlK&X$&^<lyhCNs(_
zYg*p_-O>JTJlCzzb1%FR3fjAgBOIcxUI4HYpC{bg^rCAozsGNZx*YM|8%nU^6Alha
zb%r)ox{ESm#1mD|?6hQDbZK&Fudt$H(V~*DQ~suq+#KO&7(p-zJ5fa%s4vi9kDDl+
z=zWHBq|Wo19;UueC`EbPO$<qe#6OEowO<`A*bMT8fW0R<mV4e?qn+QbH3gvrto04L
zSdgbyh30swpm1K^q(&o%Xb;D)jz&?${yu^+x>(&`%A6hfwUu$qanRA^cX%7wSob-)
z2d^AvEzve}TF>N=;%bp6_vp%4O^o~On;|f@6;83hHV3BQE4H`d)#OJ3pe>4YA`{|!
zU|ge?>tOONbAxkv<gZgR{YuM^3n4@V)eOj<g>A-rE?SMe?k7O%xnb!h2asR)6))cG
z8C>^;;S&;ePn94DOHHyO&IO%K>yfAhnLXWD_3+_2!=`H=GkoxC6^Qp~6v@VcKNR}t
zci(^?oFJSth{=qUqIP^oUhnU;6Whv)k`bY3AgUhKnlN3v+O@+`Z9D#s-WfkLy@&-(
zXHzn(BJ4Z1o6&o*;x^kjwm2<ubC#MQKNkKcJM@C=P}&R|6-XDQ&?%Zv$xv41_Y>a&
z;T|A-hv+vvK2I-FsFt=&!RTFD#ke+|QI^wjaxi$)ui&uTMm85SE3D)^P1gf_MWU{R
zq#=2$2I=;hT#Gn1<#-;z-6>i5s)gRqefUlyxN+lUxGY(SUuPOcBtLd7F3Ky-hPV-F
z2K(*K?^Z-&5}a?VG?7D~3l!G|N+`@qyi-UhZ?^S2#=rXd^}cmOYweaqxVcV~oWa%b
z$79giqSG#NCaO^B53-{vUUPhsi^8~VLblX0wgE%hE4VBFsTy5y_!Hx>qCX_ODV};n
zU@avjZLMk->S(c1`Vs-1n~NBXzkrZ?i=aq?P^9{DJ_!-l%PG1oyrvq;;-u4oGK#?~
zw|JcE+#2(x<N&!nJi#Ya%)#nHt_$hY3H&iHxy6QFIU-fI-!s<NpuE#xg^2~y%NY^k
zCK=4sMjp~?Kvmwjt8k_uRreM3L!G_b4~cmxoN|nEX*e>A6hBc{og8A}67^<AnYo|j
zLrp*7=Pzt*Nt*_FCvq&pFHY6-P?^P8^eHN(jq73+c~=Ou^!vBH7|zx$jn47NKMqfp
z(1!;qHFE?9t-3d|R?E?7K(a#lDD=w}a#9&=DvJTzY~(T!Ug40M)xvJ|Zt5fGz2oB}
z{i;Wl=XpCXA{CW)!O=ttPimoaH;K4_7!?+8%?(4a6>Mbi1qXg+&=<v`!Eq^Ch9k1C
z4$I4o+5wplB@@rJ4D=dm^(JbDH3a_W_rm>Elh3{yj}IWG36%jOxVekIa6AnolYnqi
zkxyt6pCx-X${lRMJjJg0ee4=_3Rv8tXu*)US#gy;YLtB~N#x%OS1KIpGvlk({X8H_
z5p!(oon!!98xQgkS0uF1CnT)iX4<`Q`MEX@%&La*b`dyI6$U#09bsMXgfwq8f}Pb@
zei$>(!?4kT=|WGKGx(ZxKVA0J8nk_xHEKgNp1IRaKuvH@l<xKGA*iU}dd=OR=$Lm$
zn-+5`9O$KnA1z_i96do071&*JG0Vllu4$3<&c>Dq`rCS*UdJa5^0fv8r-)^N^;Q@n
zhJeKV0K0pV>jUKG0_A}XrViMl9HuMjQ;~9=c=Gq!&y(YnBspS9+_%TWCH=>78(d$7
zjL!LfZHg!^*i;bv#6bzGu1KOY`XWKv0RbBR20)z@*Z18B5nh)D((iC4P!HAJy()s5
zutH>ZQY-12vC$Zh$Nh8rD5^v0ML&AifIKox;o3SsYTO_sdKd1Olp04;V61~fz^3|_
z9td<lol$0kd1sh$JhtmhjdDuPH}dQT01cDznWYz&py?^G0*$^7<IpP;T%{-MsN(!J
z&b18D=o(+5in%(X#UJ3-sz`+^`(9BgU1ELgNZht<OdKO#uzzQy5U8~(pN5TxRgh-n
zL0<fh?J|h)yv`v0O~+xx>?ql6_$zUDoc%eg-6}D=c{tF2312+5CiKl1u!;BOY-dox
zkk%uwmol=AJJ(*{#6ZAy6`jL}h+IBr{HB$#xtZI+a_aFUd2na)MSzlUA4`nFC*g7|
z34@Igt9>>qmin(<WDqW5ibguSP9HS$zL*&xp;S)PXibh!WK0Zsab?hQO{?!gp{eFA
ze?ZlmVmmHe+vg`1LUXYk-X<Dxf6k8|Xg$~SoV$a<c_y92IJBbsWTo<`)#`F&q|OTY
zzMeCimwr;pfY=IK+if3m2SIH=VH;KN<Iv1(Bp1U5;ai+~orn|F2_BCw7!JFA=)y86
z)gMK+844<-RZNBH@|LUenj9FxktXasJe(6@PIA%_M6XL7$FS;Ow-tz&_aH57sw)2Q
z?~MueE8XE?dP56aYIkUkpOgg^CzZSjy?3QyTL)h|8jRwh`mFoj8R_-p29=N_Wr~+I
zGGc>ZQE<b>Vlh)KwuJzScZ4!z8a#=Nar#HLRg6|rC?%s&qn8}75c<qB!yDT#a>{4x
zZ(0iyGN=f@2BRGq=cee;)M7K0=yMD~p@zdWAGkZl2*mRnrdU~g6VWx@m4)u(A$8Tw
z$^Uqjy09{P{?s1fmVXkt!9(P*=Tq88v)a~xU8h*7&$<~qbG~(N8kjERqS9DuRrN*`
z_A5iUJd_h}Te)ucY`+bUN!}LQByv8>`rPvVqj4DeOM*lBt9gIJi9P2iqg`(Q*y(xx
zo<Id#!|I5Aqo>R*9?&K-CgI;Nb4y82>f5RF4Djx+IppjuZ-rN?f@L@Q-`$=ekx%-w
zvv;Ct`s{9x*dJrBlEU3vMcNVu?U127<B}<-#^st<>MdIPN>re~#Gi(C=fH{`_p+3g
zn1ci@v9;bB61D@bXL{#{Fe*Ftw@%q9{lwXkEf+iZI4Qk(4Sh%Tz$ud-O2c~^%ID@v
z+%`TQ@%tIX*M;U8noV<R>tofYS1{`E<6!}BLR^mqc`Fx_?aM}KzmlGR&Id%sjwA(q
zOdan0-qq{3lBMTfJ-7A-6M7Ab^zD>gCHG)^8f9F^N{VaTLs_)$6w5d+)%!4%e)rma
z5iC45vGRhKY#86Qj&P*=>JRu~7InzAEbdZ#^9}RIlJV|BE7`Ew@Uuk_sS}f1tObms
zg|%PSHGZ%OP`-{;w9db?tzM^Y#PojtFunaCn_H;;cgO$F6?;y$pF4N4{e8ur?SHgl
zUk_Tb*J{LgT(S4#HH^-Awf#c@7nYFSO1mj6zGzoy30@@52r>>3_qB)mHvX2FTj(@K
zi0GYm`6@}M$jLD?;mB4x{{F|bNY7!=PUdIl?ibhatsPC;pD#vf8}0`|@7RBM!UtNj
zFP)Aai~gWpdF*1Tm!-n{1SQh!eUc|ZS)`TdGlNr@L6}s%i~&W#XCGD<Szy!MM2Vu(
zx5q8Ls&A{-*K7~YH_qLETrd%ifnI;VxV^r3`7W(8@_D_UzEvPmyBe`><$b+;0O6}-
zEgMJctqvdJ2YQAcTm0hJ5tD1lz?2)ys&w{%`HaqoBlz0pfR$1B#%BBmh3avSYK*aR
zILu@Wo^pdB>Ux(+E`S~nU5#>j`htKBLrD2-TW<%lDLx<bHrwd3-lq!)M~^~mv!F1&
z>$x|2bXV@Ry}G(68D&mU7IxR)*jG@IKG8rceN5)Qqe4OP=rr|{1hzK^`7LWc-+kD2
zz4)>J5%g~UYs~9r<vi%5efci5u8UpJHs)VORim>Wyu4h_PCPHJvn)E??^N%04w6S#
zKb`TF`_$fU-`sxh)!aaGU$3to4|8<L_$=Su%f!Tt4ftmNCJ%By0WQq}QwF;1dA);e
z%i{M6mX*os<{KficcAytO$iw27}>9Q4=N;0UA5B!`y(dq9Ju+_o03bDg2%p_PfifE
zm{1|LyU-^d&Nd#-j*-8<4|+0dP9bV?v+cN||2p<CSe@%qdT?M2`8Fq$Ao3#p^<G1p
zq!cnV0<A7;{&(?jQMWz4QeDmG)Rea0N%90FqU19oaYP|m#}Wpvvr!jY<o#kEoM&s~
zZRIRs*{in58ee*bux2o3!@xyt(GA3R`T6N;ZX%{Y?<vc@<Df4$^0l%X!oS;qr4C)X
z3tUN2m`AL>;qi?!qxIwxSKWri!zkR<YvIu_3?8e|6Qw-I8U5s^)Fgwq8Faem8Z7cn
zn42V#7Tzw~V?M77vV~4jD^Xz5C4Yh|D&2e&)w&$klAlB4q(9tTko1IHC)n;?+4DW)
ziMS4KEkuAw-=Msdn|-GgU3)=<Ehd4nPtT}7G6R)<Vv(!|yn#U6`xHFHq?}q_o&Kbc
znbx5FU15ZXhwgH-t@`vV*6#7CWp%ao+Qm`J&@n4lOOuS67pawgyxk~^pBP}&Zf4B3
zJv3g;W>Mf`F18I?)SMqj9PN6*Yhrq4?La#&-X$%3kFf1eRoyAQLD|5iz0wLpMcsq@
ze#2+>pxM?>x_-nshe3aQdT!Dchq!FE@&!NjGX>i!1W)@1&|gH-&^N^)A?C<rx30;e
z<ey%$wbDtSR%k%gE>^B;XC-Z`FQ6<ZqLAnu*EkX9xJkBs9AdxRbIZ1|)II^QlGO>c
zbM><?J2y7bv=d7n(L7J**%m-pHN(|F@04d^{kF<+F?E%K1Eb+krH(%e`rGj5_oAW4
zt!!8{vF*0dgXH_SuuG*PusJ`-(Uv2S0{MLidcL=2n`w!!_eBhR@itW`7@Tif-)!s^
zJ!<%r1wTUn^<ymeL@MaGs85$7-5GV|3hej5XR8BKF6}IWUcIlWybMa$pp5G6Nl~vL
zzL0kg43$we88vmkalwW`vK^>O*tob?HFDf0WnIsN&Pis@<&uA=A?5>oUS>;=uZOuP
z&qWV_md)*~@hyvM^ClQm0dkNq^@f>Dys%x7Kr~S*S=X3n(%5Z!b9lUwZ~k0XWDA-k
zS}q%M;QR?@u<l12h4sR)k6pDC0>z6@pD3eOne!~OWs3q|^Y3PB!f(GF|Lg~eLs7wX
z1K9jb2tit%?2zpjA^F6PwK9n+na}U}Dx!C0=aVm+$5{I$(C-zop^+kQ7)9ib&(|t0
zPGY<FrA#=U^~lA~SZx+53Piz%vV_x!^x!Rn{&gORg#M&hne23Ya&SDYZ=6ip0ovfL
zcn7akF-5V03hao+0R%*TV<(BUr5b!$!e_sS5BzdAZI@FpotYeJ)5r_$m>G>gxmahI
z+ENIQ?{4oW@GhsgfnR4^2?y{vii(|!0+6SWC^iWrb4aO4s-rB&_+2>~3ROC)X{gx^
zi!H}SZ5d`MmEoO3Ei<3{6}}yVXVVpjw>HOF7YngfRNTNZvrlAg>9v5TiBH>QC5>1e
z?m?z3+M=8(Tf9|P=j+SUIl*g12vJWWu%4MIW12Jb8Hs1Y#;hEl=wdD+Qi_Ox4@%`9
z3Qfwb+z!$)f7gw#?HIW%l-;Gd_bnvn<{R#kdp@^mS*M)lhxfStH|Qxd<ENu10nFR{
zd<aASlM;&Q0$(xF&PK+cA{%R4H57Qrw<U^^3foh(D(TP!yvQYt!@)jHdeMfoKuO2`
zv0-@D^r6f@$jbnN7|(L(*aCsArMidN)iLEln>J95hK(y+M+K1=63dphZR6uW;wpQP
zu9sK+u2GX%MMyJN!NfJQM3Qma`-DKHE}u)i{Ud`Rs#L`rIIm~NBEl%5$Sj^Myd;AN
zhtT|4Y3$XA;kVU}?^J|X=ehYkk0g&;Cp@!oNlJO?hf62ghJ<AG2ZO)*&zLKv+1vxY
z`V<9(%bLeXC`rnVYvco~*z?`uzO;)^L8*ANSfV!ZK$4u5NM0}S9K29Gvy#l|&bT|j
z;JJF$75JoTHf(rfF|1hz;(mFDb6T9QaFkRrrQ=;PjnRS6CJn%TC1U?g@!1IrI)2j4
zxxUlgE{V*Nb4W*?5Vt?j0DH_s8ckHq2r?fU>t3Pk_N7aQd*V*j;?1;<4ru^`NnA|t
ztFNBSlNgpdo3MxhS)1E+*LwC`URlCy^ItPteFk=dhcjQ}_FbJ^ktw(2)?$)st9-D|
z&sGRHTf8z?{ARejXsUi!GT&DdGpyZINM8@dz#Z|xQ0=X14`J|>=5h*!<QR!0wO|?P
zoQBdhoCg+Fyr|SQSt1ZodU~(bsELbS*_kW6k4TWU6*K4AIMJ!O?tD1OxlQZmtOFfL
zv)Iu%^>fyQz#s|1@NVZ!_zgSFtdRFJ%XOxtiJ1g-=<Xj5MXA2D->saE)AjHb<igeR
zhz6kF1n50mw?hizd#x9TjpMBd@oIqL+77{IUO(zh_prhG^DtwSO=GjSGQs}a%-@0;
zr8$?vmYn$Lli<vaOO9&0$FQPJ@H+6a^ie7x3nqs?E(9<7R#&d8(GF>`3Z)eXdcA&5
zGCfJp7&B5H(A_Ft<)Ppr?=E|k0~qrYRHpxK>m~5P4lgq6n?PRD;W#2&2YV4}a^Vta
zImnYWafC%)C+6(A{5vM&By@Y3-3;_~XQo=JCjX^$H4c$n6;|em)ECO;)+{emN=A%i
zs~vT;gbDFD8W5+7ybJ0Pa-KG@M-+-sTb@HD&XXk$Ezm(qVmeC0m5{fFrRAl(EeASS
zj6uY(^H1jW;sQ0_=A0X*!oa|NoH0NdxZd81sToOQ+Uf>o#Bd-^YY=vGOuQH5P4*)X
zxNswI4op$o<+#^JNF}rF-U&d+8&BRS#q7ATTfJuNd!6!3gT0yca7|?X<La|?^!h?l
z<Y?2O^FTO$RGc>*J(y`v2Ewp;hqz=RR}@#dsr_CY8&Jkj*Hfqp^>l2`*%}tfzC7j6
z#coyVL5k|Wt;pNm#}c=r--Rx&@~ue2SUgbp%-J`RqI;2Ph!tU0M}zOwNeid1QPaOM
zNv|h*xNw6erG&Hj`YDTca1T9-YTehdf)>6{=PY9475)j)FjPI3L<QL5Cirv434-6|
z0SWRr7F2%W1P*da{1^lJkm;=$?=|iB7sRaUy?mX}R{HXV=n}qwmVKy0!fBK|Q{{7R
zVlv7w6vObgqY1iwi`A(8*^Rt6C*oe2ZH4qBOE9Q@F9{E6|B6ujx+49Y@}%eHB&zfq
zZV{aDz>;6I-*H(A`O!)8P%4cU#MAsJR*aFBm|O<ad|aW9!UCoc-h5Y!c#JqXqBVQ(
zeu22-*s!#%nyR(nr;2XExq>hQRv5LP8=fZ6o8$-1DP_06Yj$yTw6bc2+T`$^mk*1M
z?TngX)i(@aTGCMDVVL359|Wv1m8JQb2J8>}`we(LMJy$%HT5NR4c+K+kh=XYmFhSR
zJHEsn?d_hPJb5Yk4$s67w;V&M(pp^KK??6pl-E%!E8@Tb{YqY2R?Tej-MqfQ3+5}|
zHDh7>DxH3V*h)n+raB%i4(I;(MqyRd#H-iQYTWSN81Ki}lQLDIPy*=%xAqLLY6-*l
zkz35GCPWA4c4mrln0CqyB?}Y;tLkmu7E{nhnD%y=$Jw7bB{0$-c|?gIhvveM;1Snc
zbdEjM7hucY<lLkH8d_`izQ&B`Ra@~QQ7r2;a<?I+vZD}r{X%|9Vp%xJUXOdxBv(!g
zkG;079P(vr!43g)Xz@r+PuYF?2J3ASyil#$R8wWq2*v)3jlkuNHuW6Jb?4ADhqdo6
z6z!a{3SUx96y`{_(reYju|sc!Zg>HkMI|jlHFq0yv8X~1Y82Whvh)zJ(m^3!ZWquc
zVgN~pcWA20YwK++S(m{&2_v%kHydAvoSO4|lH!80YL;iDlA$t#WGQ|`-grYuA$W;t
zm%Lw#mgsB8`n<fo7vy1hDK1&fdUgtP-fpR`In0qpZs-kV;jBWZWZl*I+G>ehDooap
z|9RQFA)(5^>U2Q`Sy$%zBmpl4s*1}8FMfBGW0L4NB~O$7T+}|?z=ZEud8j={jxyNd
zKqmV>G^h8IiV$R%w|p`3;}6ijOFo}gU+XaaklZ9X0pykClzs~xTV<BM$%}X?h<xmg
zQ*d;(GU+i=o!yq-s3;!iY{$MR95#HKM{p!0y!0{p6_w7a#`C-!Q`a01rnI@cbIt~)
zRjm@n_x0;%Bmq^Wh*AVO=6QkJ)pUK3=(-!g2CoST56KJ+w$v?b`Wfi@CKqLt7^-k|
z<kU+c;MJRCXTEJ69Bng3U74#_64*~RT=*8h!qdExC+Yu?Ws;P_>r^mAZCdGDbZMs<
zBaso-UnyEKMq`q_w+uThRt7}I_wqlMkooY88(yUVzTmlJ(5cp^Il`>D2K;;2B)@9C
zd1uT_^4V{28$oUaj-PovQKz08zt%h0=_d^|)T#F|#ks{*AiWX$rV|82ktx%3*JxzV
zn)))w4+(K{8=c|5Ida-aF87V-hmJ9Gpv0uayb`T+Xioy)sCrp5WgmSzQXdpLuKWFf
z!rAFn-Ad&>+I`B`oWFVFk6!lUGCT*zAA5(f{e2mp?SHlmuQ3<(yb%NS)b+zUlv{s$
zuyw@uI2cI7PZ3aa)#ZqHtD6FYL;c5e6Q<;YE3qU#u|7jIHR*KDwI(c4u+T)|$&%Hs
zCHqR%x>mg;jsEw~9(cJyXJXCR$m-ghUlvBrdUwS7-HuM`9`;;Xp5gsCuRKHjkq+KT
zdk9+5fWWLi15R_tBrns!$R9U+*tRQyrdayJ*rFX0>)>1F3^w|_-b=?bbMQ{u8(Ahh
z3(?WG{1nAIyN2;-^o{d@U4i9_&Y|WWjvY7Ng_rQG2&8#S_$)3T?@3&&eL}kqiH?T9
zeZGI=yyGDi+Lg96_(R}m#B`PEeuuRncqt&c4gn6K)nK@`<s7a4#u9Lr`^Aa;`_0p5
z*~Pib+6j;kJh!w_nBdK{Ghg=#a1-wBaz?$mbPt_yt*srzk^XURdN#a0JrimQpR8oZ
zC<NY4n}0qg=^hG`m~U~>=X&e%c7OO}``$&fx%mP1$I(V5UsqO$&)mK7+1|%P_R`y=
z5(y4-t&+M1OpdJ21U_&^?$0BawGSyqa-_+PD9b}hn~KVV?Wf)(V!eDgCoDm*9^+-n
zt2lm!8m}lR{sraQ4UqrIdQT@3cdTsXd8|%mBHLFTIm{xlM*OK&CaO`;cGW<7+Q7Z9
z=t>E*kc<ccSB_!!F=Ib0GzOo{xc5ia!eNL#UCh6DxowdTI*(z;gB|av`nu^Yir$pc
zSjXIn<@`=r6giC`VS@c|iKTF=6Qbd6QTBOV8;0o#r}~*hV2K;rxySU|mmw+ElrJ+D
zP-S37r!?3-gtX;|o;Wm6$(ak_5t8y8t`B|NW3s}`yOK8o{lg^NNKMa&^~InXJA^Hv
zI+X`g({6cnQ~3ms=p?c<u8Wq(L$$%7msvD7gP)~8u`sgX1X}9L&e)^5L9sKm`OgAY
zXbNbepJHUMF*66?^C4&CU-_EOFwrPV&X(%W+hm(<y-~6t1>{&!fVTHmW@vs>jh0gv
z0oplRvxC+zhdjD#Tc$pn%^e};q_Hk8u8ULCt`jG1qZ8@#klM2}?mZ!k$^**7y`2|R
zy6|b1EGU!l-D?Ilxx`jcytm#pHn5DtEMA!J$n^u}H45SPPJi(3b??=&t;}qHsdsyo
zwf+9Iv?;DLk!iT2k)!|F@YKMPA^`=c@Zx=EYc4Krx^BeeHKVvi^dg1>H?^aSyRXGA
zIW<$?TUh(5uLNAa3bq$t*|`|79fr(%jB8ugT}}Pqy{st5*GOb3fY2sG02W2x)2mq{
zUc_BbzoIuz<A8y9N%qVgbdZZ&I=v?1^vGzs{|jt!Mm`S`?7@5frBGrj)GOub!<|>p
zb2rp86`=`m%^Ww_3FMw!WV;2Z5{igFAY%<%ZJlw7%|g^<FHtS^GPFcgV=p_wJ1+7G
z7+^mc6J%C&Zc4?JxEmVJ2uLtH7WkM4L+St_XIv#ryTR{$g=}diK-=wFZ}44Twz|h?
zKa`i#{^R0%UD+-)*g#C{E1HzeR*M$Sn4T0w3G-JuOfjhM?jbeXo^bTyfDTj4AU;yo
zXka*VH!o*=&3+=<<ixcCzZH4BNP;N76zwM<(!iE0-_2({gQaZmKd&ZQ`i+SE^BMyU
zb=N~k61Oxd^C6s**%o|wiIEyM?a_YVwh|rZSBYyRSUj>V*5@Km1U_N2`TFuN^2&M!
zIpwkn*aa(-yR{zKseJP>e1&8s<y`)J!-`71da5k*LakIHR}Yt*R@8mLAb-;`rPA`1
zmT_nYv+(wGc&8yUffk15E2F|f2Va>r!2>zbm&t9YI>57rI=#UKf)AE~aOJ8)a|$MQ
zpRwQ-;OznLqcayuA=~|36BhH_(sJv2o%G;@@%)`E56dnY^^Mm?R1@4pp9VpaXD7o<
z(eH%4*1(iuFxBFVn@X(P6IIAh%)S=a(tdz49!L9bV-7I5qjGtJQ;Cn;L<V3KgBTl@
zb&RW`Q1;cwM?t=HhfMBjuE%XT&;If?$SszI9>$33C2F$xa)0O9Xzidp)*)~t5k5)^
zj%y^|@4jn^QZEyxTC8@*^Akz4z8l0@1?FXZsXix%vMftctwp3(99sgZSBg5NY?28U
zJF~O8wu>c409i%8_*Mm($qtM5cfOJC-u}Y|h1bp<FKu3vNGw^iv=%9x3&UYgFAZB~
znnk*udoY#rI4{NU=VzE165=P~bR|so@(z+mvyI$7rx~W<mS0(H>z97>P5qFkbeO&V
zrVS;iq&#F(EaP6u$45Oq*@*g}tztNbO*bLOhauCThQQ88v8DyfO=|)U#(8BfBg~Lx
z<<3s^J-gAa_@Uu2e7&1;@Vl9jFZGDJoZKBQl8LVDR?!`@5(hPR?o7D67T$Lkpb2iI
zV;S3Y6LtoN=sMVR%rsO_c{pAgFV&47-O^r4T;ovjenLuz{dSjTdmfs%=+p%xd@|)1
zD12lp+>1MSOe(ZkqFp~Ezxg&>lrP(E<31y(P0JDyz@}sPB#j-liM6~;gkJ3aRlC*_
zG|u>_5^Go42YM@h8?U*v;(a1Z?nbud#-I(IQOtCaXj<jI-MtRlP0=N<d$hT4j~8pH
z3WG{KR9`j$?~0On#c8UoHgLd$M3vg}D|XvJWs9y?dbNkY{M)3-9`$>sOE$!*Db5IU
z2Gvorzy`K&9SiWLgIo*3^@0_JpO55eAl_Hs!53k9I)w;!u2?S|jwC`=y>vYLcrp+x
zU<~#26&d}}WpDz40rQih*Mn6GSx1QvshHV~!5$aod7}bx>Ep&%l_JVC3p*?!sYi$>
zvAdn#97~7!3avgnfkMs4r9j5K&FqB3^7O25O86EI_9g(|jj6~80c$mb;=Y@b2JO`w
zXIiH!Xu+slo@!~lPp1|o$cfJrb?x>pU`r1sjKpZvu;dEaEhF6+h?ps4yr*Tks^_5T
z0Co9kZAr0MbPMyuT&Pcj>OX~v=NqN&qtBhGw=ch|M7j?U$QQ5NM#L8ya_<xAY(kYa
z==JZnbW7GQdS0PdN9LZ}J{)B){-Uz!T}fn#|9f?185$k={*v5eh>Dl`&n|-M4cU@v
zW2Zwip5k5mZD*2}>ojC1rz3h!*E<FLKoVLdby#~dLtB{!6%nJkIga(klcv2z!`-Wm
zn5<HuABulOw*gkQq{`2EzQI+(I5^8e8i4l6^SPuK8)eeGiWBOkV{vZbX%o+ueU^E1
zBeq)NRT8i2bquVEktL$y%8MrP%AmL*Qvw$@IOdnUKyuPWYVr)3GHg2K_o`UlU4&iO
zxzmaD)%2q_c8Z@Ej8jEu4w89%MS*IsT!^RUEI*5I(aYYU)EjDHjQQ=+vdsYXP!1l@
z4t6%650Y=D#ki(t%*3U;6>nu29T`kH8=Kqsy;SxI=CNPx9rUzNV0IbfQb~$m65%5?
zSn6I`AZ*oDd1C6#eLH|PvK{$)zsb{PU#Wf|fv)bs*T1^+)y>hCpbxF~_Cec(A>IQ*
zAq1PSYD@#;LqDp*4|gQ%W7FmF#BW6FQZJg6NCT$Q7~&3rI5DiMIu|2bU#C?m=U&4K
z$CmMXgq*aUYknyy-%)z|UTbdX$MtDzV){ES$6MPMb#l`Q1tJUI<u(iHvQuCAkbm9l
z?>?|2+Fe{iPyAvEy<gKX*VLXE9r4m7k6jT~KEYZyY!V(bt*cbzX{DKj8|~l&XEINa
z^4m}4%1~S@Vx}t2`W^Qc^N=y0YIOCP2pK3RRorXvA|Xns1`j7>_YDdhR5p5~^j0SW
zf~uk=Y9@eh-P>GPDBfE(+gK(J{!m*T^3sOAvEvO5a}Rp!%r|7dUCFah-3Y|6VVY@K
z9)LG;f^UJbh&2#1Hr8q&el};`IX;n}oM-L7eA+Ukv6MY+sKU1skFZj_Jk)mEFE?q)
zOl?60(0+9$PWd+QefpZ>(#6pprdW@q1rjT){<fprmV-cWHydI}F!NY^0X{z(?P}{v
zgEXAU5Z%~QXdL@|xp>%1l+;AEDUS>x+Y|LAL*fUcoo^U~-=q@?Iv)-`cu=R!4R1Tl
zWL`=qmfl%E+jBGPnWPgWXCFQ-y`mG9Z<&rs^xwI`wASLa`Y{orb~<~GPP@i!(1iVA
zqtro?IVmUT+4mujFFwnIqjv<2pFbqfo;F6?A{xcNZwl$~u~>q2!Qv#q^IyP2&9GyP
zV)4zLN6Cv9HSWp&T$)T=QsHGovi=-T6rS&MDZD-tqSs3b+1#;StoB@;4FZ0Nu~K60
z=Y3l<yhv&-8%#q~=K7j+Q>z&?>6V#l?3_E$GPut;R(6zWiK7@>SZKA`mC0}Ib9c<s
z-eyfZtMnh8pEwzwU)Da^X&WHN=rrlv;;W6GHO=0vXv{WC#cNZAH9yg6_l$G#&bD`1
zz=t}1^M*4u<)u3`J`;PIobM+~1nfFMo0-tw<~EKzYvpYBHxV?F3y5jlAEXX^iy;e3
zD;p10_7N&KP^mtViw!i>qGKE9vGP+$@#aaM<f@*a1Md4J7HKY`Y}g*41uC<*{_cwX
zu`mi`XZg7>%JS#w&Pr~!MgTcI6C;4Mk)fHMpp7euCL<`Cm6Mf(gN0ce37}x(sOM-z
z!U#%bZ)ELA0tBA}4GK1LuyL|CFmeDL5iMtLW1wi{s0ol079{~F8M!)w@`<=QzE*t9
z$^`cOKv_g>K-rldeLf^!UL=4J=ov)OfrRxj9ux#(AM7?VaexBAHz3;oKQJh61*)&$
zKQPMtd)*!xWd@_9@UM(AasCYZol|Bo>;DN(!3h0?l=%;?{)CkIH_ZRU6bNqB{{W}J
zUoi##1E!B>jX&c2JEp+@5T>Bjus<;c{sX4KzhcVrAHtO7S4>&{0n^8Q+JD8A<v)Ze
z%deQS`~#+sn;`zmDeHd-Q`TQGW&H<CANPOw7f$~}n6mzgDeFIA%KBG1W&00d%JwU!
zZ2y4i;~P4^V#@X(!j$b-OxgYc)5qD%UpWO=?KgD_G9(})O7dt$9Y_F@W`+(Vnn=IZ
z_R*3lAU&E11*AtE4Eh0AQUU2vdw_m^dwP_61tiwro*r9F0qGGA1te_}kYaZN8&4*%
zJ^E=S|KQ+v288q+^(<{nesc0V_|is>dWN7F687Kf_$Ps%LxZ1I_797V1dx@JCSl^`
z{aF%NpnkU<3hYRa7W_{#j~4xBEC<qKDF6k~KBr8-y=<kx#E8TMmOuqiC<_wPBQk$x
ze>A#3v;U3wqZR%c`v-AmCM0I?%UxiKzm)S2#KGMB%>H-c;D-Jg``;1&FDvnA<$hB7
zTRD$r?`Q0PSI*xn@o1QSX8$|!|4k+SPW;i9{9EFW#^q=1|DN+l_5U;b-#CA?2R~!~
zJL3N({Ey1}C#AoY^Qg^##{PHZ{2if3efu-}---Xf!T+ct|1I%Ho%u8Nf6w`&R{NR#
zZ=64>xu3EBd*Z+JEI~a7Bk-6RAT1#zB`Qs;=xAeYq^M`@Krd)xY4|wq7dCP*us5@H
zw6Q07)ULmc>%o~oeu0_2gQJkCo;?YW86c(i`#lpg6F}9>(9zUE6A8!!R*V090YRGc
zF&>Exq+kChpI_)8F_N%@HfLr7A;tE%8pZl(JVBw4tqxB4M+iFy65FFdgHy7C{zA$I
z8oIJGgO%LhE)ZQ-PB2|iN|1hJ1DOw2c4iV5(6AhQ&jxB(AoFjzz`vZFAkINyY(Q2d
za6BUk3rH}2e%L_05L_N84dWv}VDHM>z{b$b+5`lVwScvQ*&ok}PWp~upAKx3KpOm~
zv3OLMzc=<D&7~%<EUhl}XLJ3vr5@|1@Xt-f!upR*MFIq=LS_ySvtS6=L5%<M`7Pw1
zz+wa03UEp`4zP7#;RII})Ci2=C-B9>0ao{*5YXGbtdGa<f@pz&12+yE2)uu|z~zJB
z`YkWmon>VNQw85Kk}yB&)ZczNI6+);fa2MKNUV<~13}FU<lrO$f^0J@`)?(Kxnli4
z0RLzN{|daIxVn^#GOe7RrJkdiwGF+3jg_ADU(siJG~oY?{;&On9r&}KfaHS}^a1zG
zf4o4D{Fm2X;+a7s25@tNKj3`Kk7E?@Hyb0U8Njmm`{$qUz$t&r^H?f~Iy;CW8xyG4
zFoKl;_zv8F>>yd^0G+)I{Jmkp;hZ4HfCJpWIM|TbKw<#;1@#aPP@{ut2to!-iIIef
z5yZf69ru@t{oeAdAgjOv>N;R@EbO4x1XTlE94iMi2{R`XNCv>&itX{9g98)?3TI^j
z7YAYsGynsFB!vYu{s4kIEh8u%G#cXo=K;-UJkoiTuHVc33v|D5^9UWdH-N97fPnz~
zT{{1g^1q-1;{O-<18FD_Jq5tO>F<xRzl+`D6v`h80^Ixmc=)UK5H>S5HUdrafaY~H
zk(dF-W&mSLBp@fi&dJ8n$llDv)KU9So$@%S`>SY+E6a($7Wh-N|H%S?8U)PxBVT_r
z0i3_+m0v^~EQ~*~`cn{@LHgh~RDZ_(it;bQ_o$D46B<TPD+2!zK5+WSz7Fc|KgIJ=
ztUwXJHwIXMeiJfqf}fFpaPwP2aLYbQ+V2tveg@M8OA0vrw@&o)4)k8cPY#eC$%9jX
z!oczhP6-YJ=LB>5C^MjYFsHv?|Amx1ruaX^vp=3a0M7kaIeYXb|E-+;;u`#4<?P?e
z7g+oMRlcMIl!QeEY31aEYz&S5rZRu)6aOq&EWZdAGwUxp6Rgj`760=aeE0M7=iToi
zAO-Pf>PNVLZ<e1qe*Fc@(67(`?*1pmU*aFj`Q`a<bbgi%PV;;I|6ytWhUzah`!^|m
z!RWDG|Duq<=JnqzByjBiqeA+3g7V7{{Ew#pbHMp1Br<wdpegQuJ3JKxO?+$8vy;$+
zRR$;6?yxXw14J$LOdLS^9|<7fU;v)`28DvAt@UihjKHdpgdOC30>A}<<G@*w0OBAQ
z+{{40+QbqxWsU?;bTqP3Az=b?A_1h$92`Icw#OkYc)*GTQ2U(>D-#ez6*T?@&7o5R
z1OS2nA%F-#3?K!N1;_zFhys)V$^bopKEMEA2rvRX77j25X=i66fH7zm9$*461(>?o
zni^RH%m9`ED}Xh?+RWMrU;_XR!~wPdTafOyF$CBH8~_eR&Y)BdX08ASTRj6KfFr=s
z)ZPg6>tX|N0yqO)0d4?yBYPW~N7zKoER8_M7A#!~e=7dR=il2BlmcWKz)(3F2^)b1
zrADAy|2hU00!SHIn>d<+^a>L*FRz26y^)?3l52*Q3ZfF0Nkc`!o(M^~qxup{Uqw_d
zO02fPIE;Wk*5a&Tt$?QKrF4?D-rG&Hx29pAfiH`gsIx;&v2uO=Ur72>H%YOi;pG9*
z{KNV>(|a^u;mR)SrhInT9@?8+D!eawnECPHyVpwli-Gy@r(wbyWJvZkkr=^WJsV*;
zQ^mXEX!*o@KA88);(Q3<eqdUt(P2)_9boV1o(tpTKA5b08Jy5o`bvu!EfJHtTFh~E
zvLQQTF}JNQVG3#~>#4S*j<<txYn(3MXtl15_8Wx}jXZ{2>JObMiIvDBGDDvShd%?c
z@ZuMpS~`cMw418fb#bkS*tb*r&20^1tm&AvH9AJJ2Z06eW82;O$h8IDk$z4w>K`22
zB99j{WLl7mNs71XpAx~@B8W!~6V)C&TKjw|85;=P4+P#HfDVxR<~N6I?{AO0y@gB1
zz=A(hsjZQaVyG2Mm=;Iy4hN%|8EBCdU1@zu$j9y?3ph%}Vhz#|kj@vRp?di?O-4j6
zc1mI(C_Fc}7*>f6Tew-?Zc1}XaNlYmUPIVTKBD-IIVHB>aIPn{t~q{vhCVfRet~cT
zbbbyY4J_-sn!*GuY3cVoV(Qcur^hn;s^jUoR=EPDVJg)sJLT^pmU^4lKhDILla=$;
zc2MR}RL21oQdu<I`ES|PGc2>d7B8yb=d=mjJ7ySaT{g|zePq*Pi)HI=U|w*sbeU_I
zo11N3z+U(P^94I;U5GLTUf;Vyy>2j$CKyMOIskQ4h+>th9qx=ghT>58RF$MxmM-V%
zTY}6%!kdcQ`SGkRqX~kYfnH^YO{9neQp`#?M2SwFIcRrVsP?oDWRDvKxD8Rs&k_-J
zjhDh6gH&OA8f~H#AL7R8v$dSDKf(6k^gXLXilBmj8cM3m7ZXE5b4(DJ$7fh%MpSYG
zKZHB6f%`y6kkvY$C7qPp)ACy4!M>D@!akOlGe$aLSp*T<?xRmom~4S=>UT&@%DkKH
zf!7x#_Jk+9qAC%pSs@bGNhcK0$Bz6;@TF_gYV^VB6euvh8Es#nJx}V1$5K5Vt#>1c
zNT}e`Mo%NkzQ240wM=cV)7EsoW7BbKSQM?S#v}2D>j6g!H`7mxi4UO?h@Xy{j>*BP
z!FdsY+!S?=s(P7p|3$pvIb{#gJ4K99Gh0lC&f=7C5p+K;*B$c*zaNq0N!&Q8ZzdU0
z(!5!|q<=!sKs7VJrQzAuPMNv2O~&6NWupDE)cjD?P#KY*HGC5*@Z(H+vw1Y1Dqgd;
zV|8=Y3%4KuRg#T<dP%^{)=<ShO{GhBonKm}1dhH)1V)8PS6G7QcKb|@7kjEHWDywW
zL)M(dpnMz_h_(^{xbh$}zr|BRP@albX400>CEDZhtmyC@oI#@39!H*Zc(OyN_R$Q-
zHps^E<zmckl{A9FDe@wrymNO6RH*VKnj4z;^E^JR4nSZh88XtbuDa2#gz?@p+=)>W
z6K-Q{t05U#4tqvPi<B9?JM&5047gbfKHXXE@uM#vC(y{A8Cb}0s~naWE%-P}+O?~=
zb^(bo`Aoz(N#47rUBO}0dY=W;2W9Ylk-JC;LXbntA<#+A;g$4vMt)_jA7rUvfk(}E
zwBXQ`IcCMpxoZVA_@ves$?&Nm-5|Xro>W(P3L-b-mK(MD2h>#8X9@^*gdB3&Jv~Qk
zv;cH!!XWm><CoYyC;3I6;Pw`0pE`Jsr($aCQho_sJ&>Pk-8^b!nAYJcr6;R$L{I$6
z9KpMp-h14RG;#Cdyi7bj_R^i}CF{a_&g>!gxF2{MXU|C->(p{r;hS`I*}IY{<?giI
zko?6P<jvioQH02Z8gn)(Qm&`O4`!w_IDFc2%=kPo;_)kX1KQA55{2R%Hwra1n`-S5
zlKlAQ*>ab1J0oKq>N9ny4$?}vIfoIyDG7)$4A>Le+RvYw%1{-uyRN9)ZD<{w42VLV
z#J5x48`PTe`G5|EUKxFZ=P4|f>Q}+qQRIo7kdgpzeQko$N6%QgiZ69TR44|cj^cra
z{(=wqaRyiFGC(QLF&gPy;a0!!D_V;;{TO!AiwoJBnz2B4{EWV%lo`x52D)}T(Rt(<
zi@gY_6CV@c3ZDwIU39oC>Cn>f6<INw528!AYec*HInfHmeGI^u#Fk|~6quaYXP>4-
z=p%`w@ohkE(!e###`#*de-Qhw<7o;)$eR}@@VN;TtDPzACRQWso2AePqC_s9Gd}OF
zCB^9%cxy_W=lqm~$M5@PdYgCQE+<K|+bv|RLb7*!ApHVgkf1kM23Ce<w3-Vo{+Joo
z#gCu4x-P_AD*qZFj|+F6<SCdY8Yd~FG_3F<o;@k&J4;eWXo>ff|CjQaS|_M8n*?9_
zSzeg*BeC$$`u9LaCSsv6DfB$FIqYv?n08QH(2<v`ju&08>G`T+$?y+0BJwz-ufr#=
z=4wKQl052BO`6XZ#}lr8gu3~h#>ID8cMY@jU;_D}d3y--#TaegQW2Y+_u=Vd5uE#>
z;1p=K=A-&SOPRVda?CQOw@s4{e~eT<z7O245Xy#;_fx;&GsyHsYuv@Zl{XSTA2}E2
zszVY=i_F}yvzfv^Z=;<>&C$;Ks-!)95>TI?UJ}NoOR;~q%5MI#b;?HRQ|lD+0hEmx
zx)8g~$JJ{%e7YNKyzXpOryotey_5nKo<5D|-6CfS4~-5EE5yK=OeifMjsxO+*V`;f
z0lt7q|9XkNLc0Y+&O)7+y$@e<I^Jo&bhwgzf{0RDHZ*3O*VYI+_VBsB##vW0amlRD
zrI1HIZVK1TlU_MU`k@b3oypuJEC!2bo@0Zdq0Z?tDXS!q>=081?PG`vFk7l;KctfD
z@{6yn3`R;2oP)3wMRg7Oe*|PIv_#rwKao;?Z>POq`oS^CqX07XDtWiCm$w+oIyOUM
z_%Nm?HSu{&xCJbs^#!^EZdoQEaXh+U8km`^;og!rQvNnPO0zllRZiwqZC;?MHNE&I
z;7u8HURp<&O??y7&3D`x4+nd9yytSv#N}RTaW?d%@0OeQZ|4y{?YhR3vYm)2CpjYy
zv_Ab-`9bzryaPd|y%7oE_Ug^vnux04!L#S3Pn6%8@zfVLC1EWk8P3W|pnmqhzEj$K
z0XdZ?_LfJl4s<dx9pgo~`joUx1}f>gbxu5NKLV99WEFyOSAxfzsnat?7@znYO1m||
zql-p?;;nK+gPq2<BKYDUiI{~m&(w8dw+FTsDfbiQ$(0VCj*NI6ZqK@np)PWTmV<5%
zvI9QHvNI*+w3FToEBvJfXeCLH*g2vmFE<rYd+RT8_OEa|Vao?u`^6ROX3-@){NJLn
zM65m`55LLlE@IUU=OCau@#o$}3|qZHH|(g94+^i_dLfRFgZK>gE>D00ihP~WFAGoY
za%*9b`83%*Fz7j7N_TLMw9UF~5E??a4&xzd(<@{sj0)~<m1wbSVRu5MIQe0<Y+}75
zk_?uJOVIIQoz&Z-nA+>ro{N!#4eLHO(Ir%BDh}wqKcM1Wc$Og<IBu9Fn$#G4B$vNa
z5kUYEoVV=h`U0fBoE)!qCTuY=m1^GKu1*#ZsgMrEv%R-kq-fUJmJPe167-VELF!1*
zA2oeNC+ka0w?Sc$dK~GaNaTy91(6fDl*6I><{D!0Ix0-Uto_u@>*JpJWo@^G`hv+|
z?SxQnou)Q^E@1i#BV^gwxBWDUq>crxo8fkyPr4_GMC<Mjg)p3>yHaMKrzfEAnP}Iw
z3HKlq0?LW$rY2nIFK5bGOPR?g?G=YD?>{jmYGt)`Y~OJTa;Gm*a&Y1q`*#s1LNP`J
zNzH%5K;uzC^&rusYSV;^hmq7CT;pDRdOk-)Qusk+%eg8Ixka3Hv8(2Xk$uY{zxvHc
zc+L4-(W&6VQ%<b2M5%>l7~-URXXo2AY>d>U9~v!(mxajyQ|#jp=$zzS$VU36!D7Y;
zgFFbYE0a6z&w(_R-S({Q+xv}DQV}^9f{G65NxV}H1)M69mFkIaLiIk0<*Z@yla;_h
z+aU&|e8q;Sfi|IrI!ZNk)`=`N(dQTu1mbIDtV!dr%#544bm10cv@I-qPY@So+obuh
zaQ8_^ygRl}C*f)D40}T(I#l@%DZZ6F4~;Y^bTk;6iZ?JJ30EkmNxs)50Fx+|7atNQ
zW8b~Gk~LdUn){{P26k!mjE>7U%UzzCJ~NGjxQV4$LGHTOh};I-YCrt^yGfY~<RzLA
z)$vf=%x^L9ZLNXP0;xNM7>(|0Y4ux)7IRHz?6tSct<BodVfi0?4Hs-_qy(J|u3y_T
zuc5ho^_kb?s>9Y1(9T0<k4{fZHsw0lkZUY-TTz$Mak<G{b<^1c4ycKUH&fIRDh@t#
z{;0X7z|nzB-uliXVGz!e-v;@%-MR8>m7?6#1Ei6dn+$j!{&&~s_eIsm$@O0yV(?7Z
zKY6YHI7|O84l4&}CY&9}`cDokXhGrs;;=G<Jko!0SV2?zzdEcSzxUrdtUuk=-<;K-
z{^`GZr~l-bf?U#nbw=I(#Rq+yGyKH|1wa3<eNbkQul<V;>ZIbKgsDpOj`1`3i}$Q{
z{4b3s{E=QDm<u#q^AiocKt~u563|)uF$N=8ebHmCnL~DIsrjTqS<<53mnXtM`b~IZ
zO?U(M%L#??c{ULel@=xM`1Y!$XY=3Yd@iL%Hiuq09R2WGIr`qg4JBy$8UY5%!^up%
zS~OFqto9ZC8ZMHnD)(}tC-(D(`=t`h>L=s}B$iI~HgR3MJlEGWvsWy7ROoFh=n6HZ
zg6YZenkDD`=SsJ*6^Lq4M}8f(SBV3wWpOBx3feie(^z{67`>?!^V$^i=L*tE(F*ul
zYDI5rho@;aShylpqF<A(3nkR{QlB{vIOeOw$A|2gv#Jj$Sh*(^P-|;u(|zuvUF%vu
zpJ<C)KNmFe>}8O4b}tacKmBy-dhMf<)+>TO3X5w)hd75_Fr8@4Ai1Ito0=aczqMJs
z(TIanetC6yqS=h}LAVFqIxyUpN<WMuFfEj-;pw{`Hhr=+X>!aQVLS|(>!;p5#_N?m
z=Id_VS)ng-5z}lb-}fj6zKy{=Lu4PKA?*RQ$=s12W4F=a)sP(u9!4#o#tPa$zoBtc
zrpE3=N)P-Hwl2&%rDYE7^tOdxI-Fvi?gWDgV3%+$`IP+A4u@b!!p^~YOxKCPmVbbX
zf1q(`xacA9<v6tyJhSjIq!aQQA8F8XeTgvj8?I36#yWKk0m|Y6jhHew^+D#a1mcRx
zGdp&atr|$+R7&R74vBB&dsP|Lw49JQpI6>Xu4mS-YZ{@vtb@7rV?-{<>;yv@%t8bQ
zRtz~gy1R&EoL8Xsl6J*SIMFa{qwj;`9=II&z5w4SYM^gOzj~6Vcd`M`2v2=POZx;k
zt<SllcxHemH+ok$vsu6|0(?23UtbtfY{Tu4$7cB!^-Y7K!aLyk*?_k|2&@#&Q(o4w
z)e~Uo8`x{IPx9m+lLOdKU(<SvzEB%DHWNgzr@uU7;CJpP8m570m3LSGkQlz7L4}L@
zFo?(?6FXy4&XPGnFjJF|n9UvwWhIbfO4~o~&SBZ%a(fOdI+-s2G*5H1g~WzDs2Ls3
z!rQNq^m-(-O<VeH0<j3T`>ajrSC^T$I3~@o*6F6?i=50)&bM-OiQZkET+s7Jg}&Kz
zi3JeLejonI{*kYwxZ&`X$QLz4I@XUoY9syhjYuRg6h%T2`Zd_fcxM(VlX--@oLyeX
zpWzqMZcRmd0jqMjgh2s>TnO$Q!s2>R?ADnb*4Z;EfwgT!cXlf(bGMhIu!i4n&X8`t
z5LXj-oUU~M+mR*GPFDa17nb*f?(M=lS$P=ZZn#4g9$BlW(Tpa6FvwZbN4(8H0t{7Z
z%&ip03cj_`;tvJ!#3w~2k{2fCn;3gJmZ((&tHmcP+q+xdF1FfdN%CQu8Lo3F?$6f7
z)tW4GdzIY#Rw$DOy$(L$F?jkmRXnujrRj$k81@K~t79hXy|@O%?2XgjV@1>l%e4=^
z&^Kk0cgwYe(B-R^f+PCHtVE^m{sBq$Z;AWp-Y0fq(FxI;qG%)y7tt|78klzbr``_O
z8d#tat1@g1b?U?EY$kL6=vTeXaY(pZtZ8aG{$S`F{c^R2xP?r#rZkqM!~2`z7mBh4
z3FzeVoiDo{9WhQkfhaszMtC<-#>gee<`;3Vr{2wc0n{8mouvq-=>OIeT-9@WC?1|P
zH51%`*<KbA+a7aa%wj)9XG@C`Wuhv%DSEV=@_nb3KvM&&a1BB`!V@~+g}S(mO#I$_
z>SYe58mkeVNqwW=izDt~=SlMqC;=S4Pp&i@6OeVbbjeoMXidd3WDrF@bL)odYul5J
z%A?JeX6d>@vEHrvXKyUT@IVgB^6M}tD?N3k=)4n-F+fYkw?3|5uaXtx9g;FJ1779p
z*>PKYupm~Tc?2)aqj(&o220Lmy(bj!sZl8xs4&%Wg`S72bo92X>kS=z#&nLme{=0U
zmN;0o@-_vNj3sS%iw09smMescSX*N&vLDNZ{0*Zz?NifQ<(-h0(xUE&ajO51vUdQE
zZQa_o<E(hawr$(CZQHhOCo9g1y<*#TvSQoDpS|~a&)MfY=l$#Zs=B&*c6H6!)u<ZJ
zxW;uqtlPg)+zmN7=p6_(-T~li?4IiD2T_EXL!OHBaCct2u`!?V+qtD~p5?@s{2U3W
z1jeqV;5|6Lffh{rdiYl#TWDv7uUL=&uG~oMZFQ^3BMiln{8$vly|Dds$x4Q17Oog@
zv3Z@FeEUJ3;0p^bh|dM=pX)EQ2gpN)tcx=YPD}v96$q3Uw;e=A0IB0AyfyAm3L;1s
z$`#M3ffTI62cPC=Qqh*!1&{dv-vzP$2+#7$|3L%+&z90zNW!^rx~?R?QOyWy8%BUR
zu*FIb`mlB43G7ZshIEPmjNQ`_6zvPrhfAdKfgA3cH;Mw4w2q)dOw)q2@;$KB?zS%e
zi8C+)A2U$uo&=KJHry^&VW~lgvY~7v%fAD-0*WfAMK>@bzSk!UIC-Bfmuy8j7iE_l
z7j}!No4;E%Vjr<I(P=6EKoR$pcVuK{SMf?r2UW!L&K0QZtLqU-vT!0~>MWeI9wzzy
zDa6B5OZHUSxT^3IW2h>j;&%!*PP|7ek6=8?TJ~Gzg=Bln)siM(#=^S})~+jeW%PN<
zotH-lr>9K0_29!xg^ca5Ll8OtueIKY1)TA^lPOx#<g%e}C}w9vYZ4UL*SZIh-LHeY
zgFlJ|u7w|=;+Nm|Hzcp9OQ$5aV;R=<AMTpq`n3UY2va)^Cs#sP6qZ>vPbN+V$6ZEf
zUQV`DreoXhjX8`Y4_)ADti-G_n9+evoC#NeE)Y3pI}nOPTf?<+aVtZY1Ie=UP2We#
zR-}d3Tv2|A+dvxZuB81&U#l&*F%T}a^RjCJ7!(!f0b0V4#AnK;k_hHcVt^#ywEr-0
znt-_3PAb93?nP)ee}b&Cm(!(b=7Ja^5$_yt4HTh0mgABr6$&knTS_CP(&rzP;bsSc
z4eg#gWkIOdT*0O_K3%KL2T9zztpyp7_La4bI70`|U%Tt;sJhBcF2z*cHsSRv)bCL*
zA<2VEIMP?b4og3#>-H+rVF9_#-ZvK{;b_WhE-KBd700i(q_G%Q9G<(0h;U3-7h1$d
zlR>r_N29S~44yxgEzz4f%tsfETz1KYyYX%UeM=y(8w;Pp6e2_d>E_Vu?l`7+jUH3#
z#%6k4xhf2T9tdt&G*NtYUfeIQVpBfr6iSL>K(`{tjgJO}&G5{NNbKptUFn3x2|y7!
z+OE|y)^l3Fof)~rp*E7pKYe^K58br$_bbEYQ)8Bgurc#7TwFtVbElhm*)X%+f8uw8
zrRHjkj@B=@t9`yN1C=KAh|x75&VJvgb$cmt$1yS(P!OzCR*rPAT-)@Y)_}y=1e(!g
zq_i0DemH3HW`>15Xu`sR*x|+1)NA_BBKyx7ivOD;`+uLv_^Z<X8rGy{_!<&m{~AzX
zWnlZCQk&&pXo!LB-zsgoFXZztG{p8*Pycr`ME`Y)f3LLvz)1gthL~8sPV*m?wg|20
z7akJ-0z}fZGJirM`F~;}Ra&(_QIUbOm6fs67cnxlwX(JOy0^C0{~JB}T7>93n*9lp
z{=t!~{tHU7ptbx5PWorT{)Yr&Wo+U^Yxl>aKSu)o2QS(GH6~zW@O9;{7yLOh@OALl
zYyLGs@DB`SZT{Cg`v;J+`s3|<)&Kv%P_BQ0sQ*M!f6kQtZ5i;#@&EHOfaPnn<ZsJ>
zY;|xYrKMILqbzpPa08<(H<C2;d{z-eL)zK_nt_;nyxaghypG4bzVQ`PNMJ@MutFGY
zkmO>6GZ@Kvv}pVcla~&0oriR*4G&vfqJi?3$Id2{$bk&TS6)xw&&RKuZAF;;6ugRx
zieZx*sJk#|P*CSN7RDKJukRg+spWvQSB$4}4cxB}3?m2xhq@UMG-`kX(PZf?r?n7G
zI#`z2U>{oef{F^1Dy>ZBg#q`&hNg{-P7Wq29)j*E-cg&$ij~{5_T6)lAIp{3(a={=
zwV45*Vb?H_Fi;OL;j0XmA6RYMO*g*pwGW@D(Rg9Zl!98S!BwzOx|p>zvpl2ttMnv`
zl#`x<Z=KN)Jegjsmzz6H3!ChEYyRi{H2giBhZ9q}Pm?>uwtLdq59?0+_4b3~>h*_c
z-wY6H)76BeNE*NU5;h`C_9Gc!UW3(Ur%5z_p9{n8&+M1!O;!_bhA$6q3fKN>Rf28H
zR1ljWoQA0fanono;T?RB>DTHFPZO;mJwU_^1ML?vK)i;<$JZe-fXIkLXzUjXAOH$G
z3`Y&qGk}H{P(#e?SKA>rz|t2C3nw$6mibN}LDrO^@BG1j&|(?D3i?y@9Hj~#2VOX=
z6R%(xQ|a(lW~!;3?mQTi_QL&oYzC*G3pbJR;D__|a;+g;N5f5#<nGxZ@|x7I?SA)N
z(&$fxI&Frh8%|o?%o_7vZ4XFpqH}lS3rbR*XIxF&HCobD>2+>;>zxtRa8=b&on-37
z_og@FXG{n1mdy6wHtpIW+SK!Enxo0ZAc%M8TP7J+{Tw!}#*svFNzJq~q>S`4w2Op2
zsFj!*B0q!r2Sv*tD3A3N+6BCSB~UjZt0o129TZ2Dkv>|!F+*~b#Ruf)Pe$xI12df=
zITO}dHIZN!it}42m^6<X8ePAuH1?{jt3X(!!#xiGX4qL<gnxP;PeVVIfkbTEn+3)|
zRkpOfO|reTPy7s|^R^3Uj?2tT3e#TrO>9+K*<6m6L_hQdu<>*rmC`~LOhe@5^J>my
z;VY%06=l^@aD|^<^&7dK+ubyUsUiBzXr8@-J2+o_t8g6RD<5PdzWhZ2do2u@C4l1q
z0oRTdwqzCvYdYtwb=K8qt7NT>!E#K>hc~4Ztr&8wUqifxL?%(;$X6j^v73Yq_{Hf5
z6&aa|Bqww43pvqh7;OGE9a$N7DbpmLaCLBLUt5xLSqiZ9T9F+WB%h}I4~9%YiXtWg
zJYr@Ibe;g&g7}Fh<evw?gmbw8_4+K<WGqO^P2Dg@RM9!E$u+`_pnTvNN=a-B{d$GD
zH#M;kK5IaZoL0G4mT5Qdt+=FN*)*9%1|$(koTXDsHQ?5nLOTZg*eFQL8z8Eqtr?Rz
zHs}DX-Pg;L@4tAQ0iQ1q9?)SAmXZ~BW;cpY2)}*_PKLDkvw(8cDU}8QVgUNxiQ2iv
z0V68LvN0r?+Emz(`2MygQVJ-bIiWdX{owPVcVBKksm{7FDeB{L<yx2ybd1WO$Z&JD
z$iiO6e6%0JBR_xBXKza;cRZO6;CzpR<%O6PVpHKr*){x`Cy`&YmLG_8`VA`+Ovl5q
z=9O{Og=1GY>vq5SX0Gb~H8@c$*ajaW{C=a!4AYS977<(P<IPV8%Sg>L@v*c%mE^8(
zRE}W8$05<LXNH@g3VRVmY+;z|--7L+wVr=(K0Xhtvc_$tRsA{|eQR9^F7MW=VH?~4
z565Ed0*j*#4%o)J<B)oOQc*v3PG^3^wxHubU^8`IIf>+7zL$#&ZAj3&$ygm<4A9Us
zsk-jJo`14LXLb~ZY)XK+hDq1X#Zfv;LCZZt`7J+pOV}*L-!mQ>wtAVGl0>H2An-I%
z|BVAgY%pH_`B2Ud+EoiE!fCKq!EtT-hKJAFdD5N%WB+RM?0myGn+L6Bu8)(mW36BM
zxYpeLTe)447f39e?d6YFc-yI{CfDcibNgc=PjTPoX8K97OGpRK=C3bTOwiBQL}66`
z)uZDPP?RoK;O=*@U6vGA2T+n3)U8jeK*8DO1M!2|u826FgOQt>LLmVKBZ8bG%jVEB
zkL$@St2Z?{KK0F}n)@}K6`K|CkQX<9h1H<4U<CGj>Zy9YHAD$WG&Hda18)1!{8|Kd
z20!U*5k}Ssw>caCb7UPHnPJj#dfqX_@l&uiy7*ZAX2Wj?gq82ypqaxM&e&_<HvSsM
z>K-~Em1_hQsHIhO%DF&k%O3a06lzHwiQ=k7rlw-Mi~`9q-Pl339~O`q!(biZ9gr_Q
zD-|J8WmM8EVfk4aVs<i1mRu)QuqNF6Y-|7z^fFPTh%oK`sGQlR-qm%Qr4u{qmjVot
z$tyVQNzA0UD&#wenK^V<tr6RZHuAdk_0DR0Wqg>9IiWs32NnBjw#tyI@TOev?iW;v
zz*B}Pgr4o3B6#>Q;R<{3=;%odG6~;zb<I#Vq+_}ex@vvZYCnT4QK17KiDCg;AWlA@
zhm{ZT==>d^hr7SwjoxMb1T0-jtvBU|W6M_lB*Nn!q;Ylr)`q!Ee@8PI8xHcJ2K+<B
zP+TVD=cu<@57xY?<}zZV!9K+FXx2X5W!1IP;Zb^Q;o|!2GK-CVqVk$^^JhvfqD+dP
z^XOKT_dCRS`ftAgL>%qcPWldpNg}vvSgJI|))Jy|kk(Se31`$QoZH7Z;f44!^hSxf
zEd`X^M<As9MXQ{Sa)ugC4V}!{95?1t%1SPjCpj9MPD_<@D|V7oqDt!3<vtYhYRIh3
zRG`Qp$|R<+?(p@h{KvT58D?K{SVg}LVMRG2$e?<=1xgz&N~=)BeLHdp4E4oaX3V3k
zlZmqL-vJ5%)j(OV4?o%JMUqot35pcOzL!djjEF^VCY*%@y64)*g>>3+5^a$+??25{
zB)L4NH=mGgNvij?k)vu$vux_uDR~X8h{=(*)RAAsNVPxWmCWv+c)pqom&$3yBUKHD
z|GF1vx*yS}$C5qB5vn$USQDQvWlwM=84wdC3MLDfWy-Un`j)?#F!mNq|5U*m+H$=u
zzihG7((?{8S1{$Uep6idW4+?WP|F|l%8->ep0^<;%5Vo=w%s{+7_q<Jo(gm+{*2pN
zr>Rv{@biAucl0eJew>v%+Z`<&YS9l}gg>|h9E~qJLLmOL;YEtFE5qA^`B0z^*W9s<
zIqjXdFl*CzM<v6m6E~<7ZGZ;Wt~0?jd0YTNh%{70I5-51<W+AY1Oss_QIY|(TORU(
zr+(P3bLjvqSy&0Ii8LGRcWy^XmB$tkOhCHZJ`N;j@Gh}c_&MUB;WDXO-&AOafA+CG
ze`8PiC&IOFul3kBn^s@%8>n;=%Bo~d>QX}2lKgbG@8J0>*cKE?XG+O*?&x^@kO*}I
z$o@Lj`dujqC$F#`@Gi6J!lMFuAfV4J#8x>ORfO2edCf6|{A{QFv^FZp<xc8@->9So
zZNJ5akIEwb+E3qts)?&QBd4KMRa{J2ODCBG?DA%@8NbZMCeJ&a*$bYQqP$J#iUW^;
zx-DCQ<!R)O!3NFeBeR?us#07ig)}Tr760_-L3{}741{<lQSp9qB+m-#L~)6{vAjcm
zahO{fz14VEW{a%CB_pexpTCN4EX@yzMH{g3Y#*~ICIjs^Wc>OWsWjtrau9NGQ<#wx
zY{PT35Z7}RpcocPZFA;ncS-L8A9>pbu)%J$(2nR#|D-XA^lSLO7hs|c8c2R#0J}to
zaS()5MY@et?IU!4EgpT7eEtoIBc3@u7zUXe%$qgN2Nd>vX*>f%wjdmS5=W1Qn8vHg
z^ReRwAzFqukhbSK;rk^_Cy(C^tQq&Ji3NS?m}SH!<x6)Mt0LPv2A%SNr#|VtWR1Lf
zRynKLm|sJQP5ifxAQjqBrP&^)0^dj^`P$YiNM&-x<g6U3;DQ;7GoMAHV#>N%KPLP$
ze=%DnOQ=za6N$3B=cdjAUw){d9VNkh9%|mi-o}~^KW2k9Gmu~@PT9O~(vX=6sTxtj
zk7}be_ALzG%5fmKGEr>BJvM#>0i#PQ7UumNX7IMC@fwZ=!Ay^ndQG5eE%-&)&RmHr
z2B&|kpnlW$dN(te65Atfb*-}QJJCnY!zIw@ooP2mCTB!ONnXzEn&bjxQM1_t3(-WC
z+2v?#xNrOW^D*Mvt1Gg<w~?KPl!1sG0rjHrHS>(>z~V9nKYd9z3I7mRYk!*cfTji?
z_^Vj<T4^QYhZtyt!a5pp;t1VrMcnvuh1J`D(!iS()8ZnoP&uIkdDUC&%du!Bu*%gk
zu(*@wNzYT~y&ZYBay}IhXzp;D>PRDRRdkL1M@T&^*XgLzLRmnPfiHQ3z<~2Z$S?z|
z`FwFVD9?{hzKm}>H;9pB!DJ4??iS)Q>~XMugq7!T+c=Xs7f<=^jT(wWLry(XG2qu}
zBQ##)7+Q$J$9U?H49dss=5B_X2C{Yuh$_rEkj*1k2_R0V9JiW}%Fmb`Jv24kHuaaQ
z+^<Xi>_~O*790)S_HFIUc;#kNln>D`5|4ckDm5p7g}&@A7q?YEny(mId=jT$mYg9K
z4-B6`f3Lr?0o!-U;7)c=>L0tcV=8gY%N8h9ZK@;p5$R?4qb;USjm>PnzuU@~!c{9>
zmY1uYk??Ul2L4>ei4IjM-Bq?=C8r6B7R-T^&d-1{4ut{V=9tW&VM4{BvMdg9iS7S}
zmfqBQTDzL<A#i$=<{A4-rr>nu#yLvzXK-TUmU^V);o_DzX9*BGZ4Dfi!Hn9k(PZ%v
z4bg>2$f^^Hhz3_R@+_(d_PFoJD1MwRyx8zrSzE2ltSLFEHcd66_WBKhv}kO?ps;1-
z_uMVqPBmmcrE={AoEyBS&R~L+y-Cu~eImH%Hq`ZOq9ctbavi)jFY)T|5iLLN7WKN6
z^#IirPM6!Ni3>&T(J?0_DrKNRV~@_#1-#m;7`Srv<v~b9rji0B4j@jsg?N;`cB=A5
z3j7i&q~VcIYAJ_-<s4bPfJ6m%_KK#~IFaJ19TXk%fQ<C;eQ>YDe+3k@vKuz#Cb?$%
zrX%4dK;gXX-3sM`QWc~!fDHmTAuX{6+{ky<bLuM<@H4RlJjfn!$6-YrblS;t)TirZ
zYP?WMY%vKBJ_t6MH0O^*IJVQse{H29QhW)jK)PiBdmd>y&Qv}rXBTngJzd#hrWd*F
zCCA6_uy0Ltw^kl@mqP8pTLU2lgc+%A;mzry1@QvV5V+VrS%+b0oX3*73W-QuRVHS_
zdj$Yr5ea)|MhRs}8G}`I4my!5B9Eft&WD?C-`zd`VRKXF3vZ`LWrKheT3o;?$F>Uh
zGq-8W1`TvGSW*vdJ@yPQnqUt?2jOccYNKec=_>UjcP1!m!GanQTtCdNH;7KcrVzN0
zwwEzgs}IXK+Y?>&cA{E$@(iNyAV3HOy-ggm_}~id>A#XtTWG}4q;=*X<xhwA0}jP3
zyKDv-NNmb`1efngP5V`z5K1pa5gmeZ;^HVOxV1G?&=rX(hX)YfH$%PGk44<tvr*;L
zUVtC$>4tCW3W+x>%m-OUPa4+lRx(+}BV`m0g@<8$lvjkKAjG!Id3gg0y3}1z!s}-N
z3*y@7Gt=<ex3kZbc>1(QFS6E|T%L8^n@pRl_4lp(j+eSDLRL*O2jN_xd%O7`E<moQ
zv>;5WOE1RB`4Sx-mR^z1fM&V7nO8U+H1)zbm%pjFv~7&4wT8<`kIMTIeb-1?&g7a3
zL@6kQ4%XeGtmpX+Fx1zy6{*`t&-y#IGC9vZKRX`uSFrowi9`#J>V(BFFcMVHD8k&X
z_PO;1r4|1nmc%-;KA}A6pTw$dS*RQymn&qbpQ(Kph^{<VoF3{M+<OH6y@K*Gx2aXW
z(liGL*6cpz<;C>{N;(OuKRdzP>eNg=WRN*z64H=Uk-z`4u2w>JYn(~TEN1~Kg_t*D
zE$%7(;UsAxXd*heMcx_!JuG9QaJ}5n;U<1tobjYZ`&-*P^EwDUro{(J0^ki3^f6D|
z4k$uk=7?IVQw|C8eA)<&Y^=TlLx0U@j~+EzpdNLZRmU!|O&j_H<BhL}TK5eEb>xTr
zaWW^D{6}c2Qc3h%mv&r_sO;E`-1TLBvGJlEs2VSc{x)1+{Q)k~+i}!uKzeyo{$Z`C
zKJrZkQh`7Ll~@W2u|@r@!ZsMl(d<#an;^qwHfQ7tP&*|dnSsZXHmC)HBXSWL%EQdh
z2#Y9b@YgkqSbxU(Cd=1&X)u7OYAe>=QM$A?1>2g`?4G%%+bN1W(wEkl>8306yI|2!
z`twkrOmI0m;J~sV%?|^UFrR!6Y>~31H>Z0KhezU_#;vQXt+))k`j*B)EmRfM2ya>A
zGx@QgJ{9G_tJz$?wL$D8zr<CPzHs7bPw2I)FlHEd+X4ui;Ew}3cSkwbou&vl1x*FZ
z0t*93fh#{Y&)~VjqOnyt(=i6Hps(Cv8pO0;hfYt&N%hSKs{ENb+owyt9N8B8{K4BT
zk<r7gMz)B}f-pK<kH>k9QH2`niUIWEhzX}snu4INP&v;?NaK4yrP&^7C*R_PBKuUV
zCgf^PoYehkk<564fRMcuDJ~vs&XR(Hf<uGmLlzd6=I1l}ECsI6srxFvJCW*n%6IFY
zb-NR?a>mx{@mxDO>IwwxR)`xGZ%M_ck4!0vnx)Rd5YWTWl*1j%5SB)u$QozO@#Rxz
z5J~`YF8`t;E<RV!u3rUb6UP)<Z4<awa(4dF`C~uOEMS>zOB{x}=bVgmPH}*<9Z507
z{E5Ki@=AF8e*2W2vBbEF%O<)jIV!5(EeZcOtI0M$142*|7z-XITg-!{ICXz3<um8+
zH4SSkK&5xgy_b6&Pp<$K>pb=;Uv0|$T2w09tqrQDjLZe<8bAHE`{tg(EwHwWaIi?5
zgd=88(L0U=TOYWX)E?W<M1M?v1S-n4jf=T$Z^8rcE5c@#nT3TpO?ON_Kv1~PiyRz9
zAGGj@AyoxW(Gsm|rsN!B@eije-H}Zq2-)?Xw<!>N^AS5axchq!l(w5rFz9P{o|2`+
zGN%ip%u@&SI^X;<E|JDr)xck8gNfYNQ{}5q)h@|58jGsXqv?-N)gEsj%C<MJm8d2!
z!6rogV<~IkuxI7!P=&AjW+Gm_t@n4Np9d)CONCB}#*HJR2=O#CD3%dw*yVGo=xf_+
zT2R@VHpAsgtT*Xtg-FGb3V^^U7Ip+2Nz@XCESY4W61hf6VK@@SGn`qfckISKB8g0L
zNcHsgm#|Fmu`a5|tZb;pfQBGo<RwgdOJ#7kUwe?_+EHc>4sPM2zm{<np~s><`zSo^
z$obP~pcaY8moYM5x1yb-k#*5u>bcWu4Or)Iv)vibVM&WX)g|ye43V&XBJgVWl4QX%
zS_Q-;AQxH~ij-wK?1p)H`-F9coRxuNkM|Aj9~Do~mC%UUCYoMrDgP|AiQ^w-qpD3(
zK!VsO0AMZenqMe9I!e|raW>1Lm-r@~N<=0H0=zx7oJMBYwl%d>(TvIi&qx0V2Z40h
zKGa>y_p?CR7!MA~Um)%$&Di2hxx)k9WH<VmzN&eBy}1kGDFjdt*Z!IWts=_rIZe%F
z@Dkg}6+$40MNa(k^R`iog#90ngo$t*s30ik@r%Sbqim31-7vSM8;<YMOWo9vkf@u2
z1g>33o6*gx6x5dXE!;!caao-!JkxJ{@?x(=h2+|abtys|tzDW~B7)uvyu4#tSo=(G
zRv<zb8=@>b^NL{Noj|d`7LGibq2)wydyFOv`eqA{bI51?OMS0jyFEHI(o6O@Y)#56
z6&uf;L|c)uFpEnyTOi^H-~GIy**o#PA~QfZ*F<Vqa7E-D>Sxg;nqawSUAOHUFRxl=
z^ae}qy(HSOhbWz)@9eB?>yfdzc}JE5A$_}nW4ox@gcte|7k=qwpLc!LqKZ?&ev9E@
zzi}h}z}%U`K6Yg=D(ygCIDy?P2gS-pqf_&Krph|;yQ%dm;)a$O69b5|o8BV#@hCd8
z<Dxu^&?~FmXi+W^h8zu!yqq!)p}STN4+0hn2DS`_k#%u_Wj=HfbY$DL;Nwo+8~77l
z=Ns;}a_p0`=Qf+Tnuph7OyT%Gyo}~1g+vkO81GBVyTNblQf{7UMithp<L6^tqr)a>
z4mA~tEY;Tv&YD~~{w5SOrlCm3OBL<&cf1k4zJYk(XK2hjM>voxqE&qLcXc=0r$hS7
zpTEK2dWN2tq*E<<s?J-U#kF9#-M_Xy++^*;MzXX!IV;n>OrJZMK63oju1J8}IsgyY
zC6jYFuWKpIyL@YkjsvoTe&Vwy^y+@pynH0_MMjm`%+fuTuP<32sR3&TMk%C@RmbMx
zT=%}m%G&UKJD?(XLI(^H>^W^liTvbE3_z@o_|>?xqcPpx{`uq!rgp;AZfzM%;G=+c
zdshg6n(v(8^#0@MTzpcNOnYyxr*@Bpi@N32olx<;A--p16Kd$gc(Sr3=MybPkKs~j
zy8yoY<w;w6>WHZ;;TWvCup9c-$Q(PpOr`et1WlVG^C72ij{`_?iBbP$j!zh6F}tdV
zZefhVF&H^?WVZe3{RaQx5zH?U_o)-v%HKcX#osFXdvaJWmeWdmf6v#a{boCoj=!&R
zWB;xObESMWTW>Lx@fuHAixp>u0we$V&gUl6pXwbcyl!BO6NDTHq-LN_$<LUYUrUC`
ztxI2IoZ4=@R5}f{Jl$~*n8Zg2ZT}Mf*;U-Nw<b6zM}m>r$}p~t)5c3Si77Yt@QzK9
z=ezb^y-yfnoF2rSbJ^PpcoEc(7m&b6H3ozt=D2Vif0O5ia3&?~EN_FE&WHQMfYKVO
zhkv?XZl{r;80C(xuerrcA$sd8M?6bvk^PA?Xp-$p({!7s%@DZj1*<E6FPA6_4yaQ0
zc8Sbdv|Al4LYV@Q&d;FY0n8bcpq?AOfgYTLAN6Go_jD7u={m0K3=E;#CDz$7kvKP8
zpuVK0ZBNSb9w3f~tHtocp;}oiOyqW&pLW><6t$NHkgJbaGNn?t%j&oY#+A3-?YOTE
zlZGZ)b0~ufwkW@V7P@n}0+-ukn$827|BW`}rY8QsK+eC7!u|jHZ~v>C`xoQ<a!#ok
zzS0NS+1S1q=Rf^7roS=Hf7jm_z7GGzI9a|(=6`3LOkZg9KN;uWu%^(L?<VpEG$m*y
z|Ad-<j1a2Os{X@y`#Zrjw6$~p3n>2Gg!?!D?SGKve>33zfhhkv!=F0bKe*!`>f4{p
z@!w_+|1|Lb1{?o4{(pvz%ycYle}j!hYT!<Ys;xNsh4B7p1j24$i0EPhX5!uS_<YNv
zHRgHg2S8w2`y0lZ37JHi))!(a#A7MtQJzgbB+G-vocKvWDRM4~cyYu=x-Q}?oF?s;
z9h8c_bw;jJodt%t*)!uEpYI=+pC6aFuq-angWGmm-hw*<g)<Q0)zxBAP_8=Zea(((
zrG{y#T1i$5?}giTG=x9={2^%cdY3yCM??VM_CeLS;6<c*2OZcVQ(pI`RyzlLAJ$uL
z+YuA@$Y<i^XU%`yqPj^#CChp~jWOkf%^wX1nKRC$-i0;y7e0l7lwQ6C|Cr0l<mh^P
zIr42p3(>djOr6e3+e>U`Fjg*OvbKJCMaMri$~)cH$Lu8}ikF|!Y#JDR9(e7lcN?+1
zUEOqZ1PqzzX3?ikqisa@L|zM+=x;Qr)?ceRPs3#aza2U-09=N&!a)ghH>@_~q{BUf
zu_A7S)Qqm|Sv0sb)L9m=;%)@g46^Ru=n=DmJczljJ)~E)B4B|))Vqc6Tvn^_uaCNY
zN1LKg)mAbbihhr1%RU?&JJjwAygq${dE2nZ9DKiS5!~HG+vM5)4Z-?D_k?5Rm*GxB
z_<dp$t(1EY6&h^~lqnQ4Ezjo;wfynkabjiSl*~uu8c~z54WLc94Qt+rbF;*y9NX3)
z;y6_(pW1{_pPW4H7^NJ#GF~i*x<ygK%^V_vR`a@B!Pm~+P!q~}ey!G9uG^)>{Q+k?
zStJS6`WN=zZYv1N2{P%}RT7I7E58UY5hLt^sV2UEUR_VMniaIcDEWg$&{i}mDCedN
zl!Ig-IoXhx;Q0@z8BuTm3?bMda8bX6|FT=r`#}ku4bPB;8PGP3ToqDfBj9P>_Kg}H
zK$xVeW(g2hK8I~LoMABSE_jO#V)r`cN8?6)^o(S`6?f~5TR*>QE0pILKeO|oyXE+<
zChN{tnTM`}p@X2BI$jvCIfn4$EKL7lbMe*wk<bJSH+uNvi6wNgS53STqJ52Yb@<G!
zcBmsV>4zt8`|9-^gv@)mZl}q*Y%|@ylt0-V6}42&4Gb4`wnmzH5^#dI&9Q+C(AcLJ
z`5qRJ(#q<Iyn=$7QMn8a$xR*d^)|Y`pVo!z^_1@!uk*H<<hn+iC}nImtf#OQ0B4SN
zH&`9#_UW0X9p_6s#Abm1bZj=<rU|QuoTjiHVAi;dF>0-(8tY=Vb{G!<8z@cNx|{n}
z^U!p<WaTD6C#9p3eOS6j*c{By-tTM+pe~HH1dC&1k@p6hPrXo`kR3L@P@5sQDPAL!
z55vF7Tjx6yvL{+ez$zY6v_h)+mJSLIx#eio%7IC|Ft+@B+o+!yM@0#cnjzLQmW`6W
zn{u4B8vp=!>BRDFSVu9RP|3t?_6PH?0PnwOJi1KFKOfUat{AYSPr|t905?7RzW@G}
z+J}%FF257a*{r)&)|+e|PZ4Yr8lt4IPTGwt?gqkhXY?YxV116v?dSW;cFvN~rK^j8
zsL?<-A@uah^kw%077P}03xq8j9qzCh0+`1+EXbua5uCN{nB);`TKpG2?1KU`bN2=8
z5HQ<8_hF9ri}(;LfWel{?5}SB2~yOB`b0p^1-|iOfMIa<BegRsMBM<_<5#DK7#+SC
ztG-e(ZJU$~+N7S~aTxjN(x@s>)b9H%V202#ik|{AZ9hGj(?E5kwL1+-b<H;6j}iwR
zekbygWGi(0f*fi;4WLiLllehRFM#TJ0*yIL3ueD_S}>Nf9Wh)|^8C<|cnU2<23HMT
z-UUDh?X6F_cvywU1u(f@K~HVpY6c5kQ6c#Fph#8b>a9#nCtK~1tXuG$`e`?=%K=8~
zGaV1VP9tJ}#It_j_Y(}CnTT(I6<Z&SGL(LXUJ=S05(^l7zG1dC>u4{z7ac>gP+TSy
zhyk7m$hS{JkSh!fUk~*?<C@%#uYrYA5}T5=@X6hfP#cbdpZ<ui`xNG9tep2nFY^#T
zqW7#(Bf`LRBIaabCoEY6gIr;aIC^5m<_->I?=b)&F2@yzA+k2`)1ljIse&`Vf<E5N
z#9V=q`Z4S-Iz!aYm3&n)=N><;u|xpkICS{dy^@CC!B{=IS!Mb*ILa`a@(V|Gz=VE^
z*-S937YvwETObgwTh!dvucs8r<V8CgndlKope=(|d?WzwHbO@~vipC_y9|~Zz1+KZ
z<w1?l%xH&#={E@iw8&7MPY2X+nbrlm*ui5B|8&ghR}cwhuZ=475q-uq!b2wF4K%;C
zvmi`P&#9g%xi19^|M9Ia*fL7jc^3Pkx7ej7r`2%Fb(g<b$<W1rL%<@k1o8v~*Ty4g
zZTqJ^C75w>xy<_89b~c%93HUGz{I1!%2^k<ZYT}SmG72wJaTJ@YCrM|KE0!E?fb7^
z+4!hPIIOd;Nyw1jg~5aeY#}0OP9qR4rwW)3>gPfkU=OfCiIBX!KZYa|sz7052a>mi
z(~WbJ&uq#$H*Wo@`iL5>4_bRMBWT%Kv)a2};>oHhw2Kx^ff&fjy}E(Re0wTQ)qjL=
z1_kaG$K-cfVZxI{j={vG106%h4Q>Wi!yFWEn?g2QL0qgL+t(LODroKP)$cq&g72Px
z_lhO52xfd{FgdvtUUdzLVs5~W6V8pW$c6L=z7HgA1MEYWwyU5J?7F^0<ibUL00Rqs
zwids9(t(!5-5~MJ0588zA8Pz4EuGX*A@LFG){o!Smv-*K4HeF}$;!?J$3qYTgsj<>
zexpk|^uY$Wdow*;dDQ<gkzL}}>2jcMkbtouB8{JJS|m|A=VgK;<13V^SrHs8T&%GR
zjNqUbqT>{(x?x#PY3@hci<56wU0KpQZ$<L3?RXE^kdZQN1kyPrCxN^V%nadhuby!h
zeWoRlTsASWe2XGQqIA!}Ne0MbsgM5KPzbJ$fSWZm6>46uDje5;37rD^VSJREh=U5#
z+r{m>b>!s9O|>jX(9}c>Y_ch;3TY%WC{iUOIdc%H&60X4!4<gO;~a3)BM!wnoX-KH
z;|~t(SvT-{$n(9QsM?3vA%&F>kXgVG4}?2#?Kgx2uNBU|K`!})6DG7pYuWOz7==mD
z!+uE*%=sm7XcVP8TycUx+5FPxgz7YTQ3}MPt~Ca3{@?c8Yd_F?>g3$Xj-eP!fRN<y
z&6`k=BVVJnK>XWyFpUC^NkDWm^9J=4H4~?w?;|oPvB#S&18n+RQn%dt+1>UK<6Q#T
zFUbtF(eWgEbWXw)Cw8UHNv!D?WL0*RI2XQI@L~TJxfC340EGI?lomAw3#BZAH|SEk
zplE0Jz04h%H8Tg;Bh6Jd(6~v-(gPi7>+4x7DWE!r=u}YD(fbvC*$qLUUMGYC_f%WA
z`VPDh6RC{TLA)M{a;b`u@#q@<L9Nll*UnSU=js3hZ5kak{rE$XH4+fU=J=VrIY_2{
z$fZvC3JXwCPwjjIW6Yef1s9I4P~IWPxmB@6(M}?7Oj7nIG)JXMW<pv@nG!y4eYPJz
zn|B0_XVN?k;&t_j0b-Gx5^C7ii@ahOg;p~b7=L&ecAw0cSaSIew9#FYo1(3~yZAu5
z?YF#}sWXNuyJu!34`)_mP-&UBT`6>Bc~b6et{vI9rCD>zv;2`Ncecn{$G5H&mk|rb
z(Gk0avWhS-OQIRs)Pr9j9GSm%@-AEMhaW+@hqr&{w+mc0fH*gp)Psrl%naEW!^%|7
z+0I;SWQv~I3bQa5Rg*sEdP14iuqZn%Jv6bLaj(yLAZzUkrtU8l^Rn=L80J`8;oKeR
z)~DT7OP=L8>D~6hp1lfz>+GC$SM!{7n;2WoR%55de+Kr}C@-<wf!H|tM~@r8Q$Y2W
zLbKz+jXO{XhUP_4j8H}5<sA-F9jknq7e{1#B!PDZ<{b*6!-vd!i)NMp?toalE@(X9
zt_=D@;)3eJrKKC>a<)e;96!KXs@Mup$ov8hI3p_q>h=MNA#PwS0!>IPNl<z~MupH}
zKnpvE{gi|>O~^omyKN{beu{Fg2tV}+%b;fM^-B2%=JzrlH0B3ByBMgtd+-y50fcAF
zQ+=}a&e5`bce`F`s&em91#62qc^O#nw$OBP$zTDDt7p*;rS)0!Ig+w<4VmB5U+H)5
z$SHCt!7(yi4;?o*6)<`X41thG<pJIo4Ceu8w~|mRl2MgdaVD$+Ifdv_S|sBLyoe_=
z)}qeXDQq_jqJAvp>GGRBpB2wyoMSfxKKU(%h2zE-Zm#N|2e3|(9?bTYY3~s1BB^3;
zv5(`!SzT7$z32=Y!f**ss55nh4+t0Wp5qd?=ET2QLaw~7eW15K`3;t<rqHHWXYehP
z%T)Us+S0&YL7xF{moI=rd>dQHDuu`v4C?ueGKbo47iV}*R@X8$^R{_Xy&{FinHDH{
z>a4q0XYsyZh$Pvu+VHBkCzM1vHlfAp`y^YBzQ7j#jBaX<>Gjdx+c=TE+|FuE(1ae%
zNT;(md=}%pz9lE+h9_AQ6&bru^m;Py@=V$dzez#y;Ph0eO*_8bGK1b>ef$Igwruop
zvWTU;XyRNku0>mDx40apN!I-^AH$<<E)l2xk%0~$9oe*17N~*05;FYj2AF|p4bA4(
z0Nh}r5reT53NLb(%|V?r+j7}b@TmaI<jT^LTS0P_J*vw&XlN;B$jppcXgWhcB2h(P
z;?)j*_Pw_^WUv%-|5fC}N#}_}bi2Bi&2|jRD&D&DVIofn8q&OP6Oc^MWp_CJ^nmme
zqvBK)a{5%z$zBpt+$276BCIuRT{W=RgYXpc9PvZis!?oN6oa#9)s%}sa%v7BgI}Qn
zeOkQ{DL$6SuD8Q1QgwABKafY?p-msTF8Fy)dO9%l+5o;1bTZUaZ`YvlD%Squ&Iv-S
z#HdJe?$?&Y(z3FWksa7rV8}}0RS8pIFkvw)ptQF#2~W=h*zFE2wWn#JcFXj2A|RwJ
z#vNT2m7hSen?L5XV`5SiVjUz+d;A>9-hHJW<jv};Ut>u;-H=@w*x6}C>bXC~Z&?uT
zm;3uL3*vwEum@z?!Ai0T&Nan`G@39q6#GJ-=eb6y6rJ=o6at!+ctw1Uqi?tA%f{DG
zvXQV5HB%q($$END`KL9?{p_cVq36Xu$l`~z^#e+kv}^iCwG>Rz<b}eR<Oq5NFY<)_
zG)n!cSbxH;rgQ5Vvut9Q)^1nv`6%kSpWwaIJFt#}!)D2&G+#)Kzc~N0wn#uimEDo#
z?E8B4(iV<mr!fp6EQqx%-q~cc*1K?;@oG5myonckbzm4P$77+Ku0H-5vBjoCE73yS
zMV3rgz2kBlr7DHJD2Tz>!$Oc8Dc}trO%Y8Jol<kbB$ECSxjDg@)6{@=9BYmcgBgDv
zhhV&aXwKyRlH|KK!Lt{9dmoTl(`t@%za>9kp2PpmALcVSyBirSm0YHZD)D;z#zm)<
zevZVo29PeiMk6y5^Hj28Z>VD!9*F>Tu`V`yJaf>Ys8pO>(=|Z~<O37t&79+#4;D-b
z%CFzP?c^2>)4q&S2Oo)TQ5tpnK<vw$1=NI55uoTwOl8|zar;4c$cJ}J1=Vw@BadKl
zbhdk3kC0O;wvDLEQNbjcD>hVg>X24+Su+R^Ds3IB%N7K!SI8l36yPO(SVZ`)w8Eb=
z4BjsoWlErRVsS+gl8=U_HC^A&fCi;E%A43XTUR71ib_;Bd_Up~98h*=!F_FdBfvq?
znLKJDFupXpQTG}mLn;4_w_Ln6&(*e24C2d(72|Kv+CCNdHb_x;yG16gJ=$tB02(D@
zvZ>eAvUv=!t$`}IXoXa{hsPKpJHtLGk<xQ}Wc`w?VzMC%RX|2(UGEteJ}3e&#6fq)
zXe1ir-(ZA?Cp5+76f_iMaP0yHc|uFF?zi42$u25iC<N`Rh~tBB2zl*juQIwCI3gZ;
zS@97@RtR^g>w2v$Db$mIpckD!jDPH|^?FEhI~jX@^UUdJ?Oi_5axTL6caRZ>jFUPn
zP!hu}$|r&|O5~F+y&Gkh(Y!)<<8k!0@q7{8v(f1!xai12``M<9rB8ze->`Y}0e|sk
zL5{Uc(hhpqJC^U-NATvy>U)67GyJum;5H}O(bPuHG>J@kVrr1eRj}&R<I*`N{r*82
z;_x^ms%O2SH%1_Ba9D8D#W{*M${ZGG<JHo|YVF3F?a}H?#3G@$!S(_^n@B?)dkX~C
z4({5L{mm|L&uJhdVgPXg^%7vcZLhZ|8?{-NwA|56y@1o?ycy4t-%f0&A1&}vUntL5
zm*LM^#f@ttU1M!tt#`-FK85Y?IXqP>g^~&)@paDeoGwK~Mi-OPAQ-uY_0bmWfU0z^
zLO)l%P1_TZw%d4i_8xT`;h^1{1r%wr;5Pkk+28Ftp>A-i!vu&D;^HPtfVs7^xw#X(
z^>ME5mS-%n<#D+>4<I!|Q1hr9(Qs!*G>0x&vd0<`;nUlaIGH6b`$6R|Q%n%dt~cuy
zg_rVjol9=Z^0U5;M#$SvP2Ps*v<=l$fxr6zzx2^(@v{-lj>2TDmw2V?R8G_#z}F<1
z+E86kT`H}Gfzy8^K51?H0R<y)V$m2B`AY6?9Pl68VLWb+6ZrMS@iE-A)K`TZ5jruR
z)b=>d>B#Nah?-128`QNzV-<pBb(#f|uM^RNP7u9efq%8}sUIDzK~7r}2l`lz0+WE!
zsnKOPCDF_YF~%yA=yCgRMOn7-bbesRELWGH>8N1nbYptJ%3$%zG3f(ksWET6L%;Hx
zz>|&rmrm>-`E&m_y2*d0*!`mg`_+N{iiTvNW58ph`=`+TFU#cX$$zs<nEuT&`AX&d
zUplai|7QpGD^&1bmdPKfm;a|_@>fgtfA>uOYR`U!^?pT*Ia+>YlNsn6S~~vOO*L@%
z3KsiQ0r~UMU(MG4BBIzk>wifnU*Tn@Uy)#cgoynu#OyEg#LC#w@vk&9XKMpv2S;;L
zo3Bi>uROE=#X|Wbi0z*?${&%HU;4>k9?IW3zQ+GFPyW&S{mVIVwlVs;f}yR0@&B}f
z|5HBsBara#IcR?iDEz<AL1Ut0`FjqUwko(<($L}u$`hov%?-ZgohCdYC}w`pmvy3G
zMfF=5B!z&i1Fat=8e?R#F2!vjCrl_np6`3lukR?#YBd41{b+{a!AiBnhil^rhdJ8c
zHau}t4%4%<9S^b}+YhtQA&m7!#EB48XmWmJW|&}gQg#x;hi3fBD7UM7lJX4@VL2Ec
z-07b7)qX}@xASXx=!VH3CrW_$G3R(I0hv;0iUfn3y~E*^AKSEa)jhwy*RU;594u_U
z65QA4px^*?;{cT;Y+kzi+LT*z?9a~MGIwh-PW6ojnjBIa<$=G}!TlyHA*rSGcD5IF
zY>tqDAXSJudNOJxVj>1}dxvxXcd1Xon`m3>KrA*ZkA1+aMC<|*a{%N|Ei!iIgoxaY
zqK$(55_u&i=8T9utx~no=!k*?MgF9K44LQx6gkF{>v<^)AY`c)Mf`aoilm#|-V*V7
zDhmeY%$vdkxl2Vya#{<Ved%;XlzGm1xrn?Fd7uG#hS7w&{0eg3(UiJ^vr+(y@B4fM
zinj6)^Uwmg>KEeF1s9SViAZ9d^q96OdMY-HHWyZ%>u;8~ywqIO2-J(}Ofv;X!guB`
zID~W~<FE(Br{gH~9FrlM-M<^K3|r>w2I__=CM~)ah%Ff{aZlAw_ZK%;me)X5tQuSN
z#@1|_xD8&T&mB2E+w|I;U53s%&L_^Y&%Dn}S4dYQ0}a5ukMZCo&-*v!h{u;Aa8V?M
zDhX*8s{1lMmS)b!m51~7fgO=eXMAcBhuERTazk0r!`hM&YG(LDd$p+SkgS(+9emJs
z_Zg|p(&eBDkKKw5)(^zZ5JD-P;>HAKBQ=|R<etZouW~A8bfA1Ggc)~wCBP5EBPYHO
z6yzYKk}m3UyX_&h4*08YA)5kDok<5Hfu&7~(i-#N-CWf7)n?Nv3JOxcN=OIZ_mlvr
zV}C^A9w(yVZ_Vt5-cl`>9rI4Tx{nUa;93q;N{moqzX`jnz%FnZ8C+zAW;)WT?0i)K
z-0nbUpu<Q=F$IuUoXhaH!Fb-+XHaoKa4`#N92$5wDwg-P5+k%6j`A=#Z(b&fd`eE=
zcWMqb#K2*#Tm)F2TpEbSR|zZ)7rC=n=)>RA(jrxN?4LR`vVh}#b=pAYVF?SPHSD3-
zTLNK!AV__NaB~$Jlw0E5fV$t-2kl($vYtWw=75`s$5?f;La(qLwpDk87OxJp!(lLj
zgo!1r5jJo$(768~2GY_iUxV{r2yVXZ8rr5y57+9Ty|(=sh}!Q9dUx~f3GM<FXUrm&
z>zbzrSwt+mmrJDe<t0ViQ)XR+E;Q0v2*1eC;gISYM)Ne3i&@44^C9mArM02cKBK{;
zY7jKo;k`4GcuOQ~`J%-5npogziE6Lp*pO-xUl&7-t)Tc9nup>Ft3Y~wV8I|+WaFFb
zGaN}5F1MjanH&&Mr5?pK(=Y#g=eU7xftps=7Xx**1`WEElYOIVaii*Y4_zJ0Ee}QK
z3XBiGXp0xJNY;dNi)DYbzVFyr1et|>ayT6~6}OezHJo<<t=-u+mK-ZC`FO8ESMK%s
z_CCgJU(^8wo$g_K7IUR8a*QKlTFK_(tq6V_KU8xkxE)FREih?J?4>U|G1eG3&$k${
zGW>Q*_4bODMyYPAdRAy|d6SR^K$a{RE4Nz%xMj=p_2|q`VVkM`!uhUgIjhE+cM^BA
zoB6kY_r@8A!#-5H2b(nzwLcPJwB8t{3({Z_kubsWS;C@9I)+dfJv>H%yg%)>Sny8+
zO62Tepr5l_ZA>_`wS}jXD|1V5_t!+L6v7aB68VAPAbX)PFG`^0y-n9W49M&G$U&?k
zFx6tSbQo`CwyxK^5)jZQl6novw9ln?qIYS5+K}x@15g{ccd-;!-Xz_U!T!eH53(Qk
z8*rPO>y%zG+DEJm%c57W@aS<3gbwZ|QEeh4AH@`>zc4HFlLwcrN|0QYCHi4@cz7~;
zXhJ~Uf|~teOuDD+;&}Svkc+%2Gx{-jLLiug+WL%dUO~Lr#iB?8b%$FOrQo=puzB%-
z4QgbdRFi8`gx00NMZdifXFe%cmdB<Zk5;963x0Gn<c}ef%gtg8L}Wu{$0)P-x<LOH
z^)!^YUOPs<=1hcVWteqL@?4wWq+wmiwn#Bgv7ua#@7wpo%t6k?V#Ku9Pfwlt&Ed8y
z?|565>|Do_(1eiW9K!~hp^xAtB}!kYMzoz5CnQR@6)kDcz$4|#umxq27O~I(K_O3K
zMez}9RlS3c4abR_gx1AEEBFMmI0q?+8F*lo)yCCe9H_YewX|5wauj<(tFYmVkdhzW
zRj;bu?m4zT2OYGk{=BhUpiem0i;p5Swl$zn?$2LLOUTAZ-WWr3Bvf6NEyoqNyCixW
zLq9W#(>Ikj0l_j;%R1>KAl9woQy`|`YHek&9WG@!S<b&bGIhcN!+sh}yTp7^kQB)B
zr3ksc&W4v(glC1+4BjbX!`?{w^paef-XPIjjjJQ$i6(PfU3U2v7?vtZqid#)rA&!A
zyz9vkPYRNRXf0B^JV%G-86J3SMj$OeRl>Yw8P|g(U(A9Q)nEA;+8pZLZv7HO+xc=0
z>J*Q-7B#z(q>)&|2rnLZHEowAW6%rA&A#NZrIcMUn>h)n`Vm+{B#gGx`&$N)End%O
z?`@_yzuhBUJmIC;An}1S{BQx&&AYhwDoZ(eM|y|S1B|~A*Gfof<5cP~*;1gVn&T<6
zVgsnn4S6rNnJM0=(UZ*upW1L(ohlF_+m!e7rp#(Zbw*uY7+#D685Bzs93RW6;i@_C
zdCz<Zm-~pFBfL}^XPr;kJs0s@s_baLM+H>V4lL#!;HSQ=SFI^ZoYUtyh10j%n5WJ9
z;^_Nttw71S9FJT3b5(R&Gr9zbVs0#PS4yX$SGx7#$m07DW*CrS>p`LR4k%rQ<AQNz
zOd)C+NPzSx0b&_-Y+?l-b-&6xYoWw{l{7v%@hrK*l`KZY^zVvcYtbX0G2jqI@YZDd
zb-a`f*NR%W{XDy72AP~)mUUyIVEN8zb-lpWBTH3ta(Z$q5fm!++5pb4K|iU+wf&=Z
zJS^G^tDb?SROZ<oDPbr6_WHY3?8KBFxZ7!Yy)F|@eCa-uOGXM>EuGKhHnD(+Onn{U
zDO2eH9y<)8@g9kPtFmmF?=BEDRZc1$D<Q1CxM61Zt39_`0y8ONqD2(GPSL_p`m!_L
znh#6rBk0M?c_m&h4mlRKE8N<4k4}{vZ<Q|_%2UYTxhL#5UGV9(e)6|FYd6$~Asq`c
zcZdUuVc=>~R)On_4*|`Y)QNW3$?sENYA_*tgKoXSsMT{j6+bAe_)g_CKQXY&Ch+~y
z1IrTKuiQbn;}0&p`PRGRsy=wpzKK_6(#w2Og_<lM)HO)9+}K^Ht40igYhezZik;fP
zr2uvy6S1Z?<JMI!TgZotsd5mics|7N&h(8OUOBnsY;C2aL}g_qMMZ68%Dsn|+nrRl
z@VjVwApqh#zl&}KaNf*4tjPk>+h1v?Nvv$r9O`apzZ_Yoj;nHPrDYc&Uf~9^(-yu*
z6cTzJ=#3T-=1G#bWkAa)HlgO}l`f65Z{*z^JSgE)zbaiN&%cU6K0I~;d#d|xyYo+T
z<3(q0-G0J(ttf+n=sHKs&2uKBmfLF}KwW@rl6dGSSk;(bFOUWV$hR@Yg2LMKI&Zw(
zOT*JUXJO14<3$g1h!-8-(~oLg&dFXG)R{o53!dElw7Yvm)d&0zEm>Hfwqp3+?)|Q8
z(3(ijCz-aWGCZ{Zo)q-JJoOrsz)Tm5YKa^|fl`0--1$+jsaJw$qm0&2ajSUwqYaN8
zn5H-LcNomN>wI<h2*@-W5Lp&Z3H^?UHwEs<)^>;DRoe@BG0#k<xbG13dQ|5^kI?Rr
zmX#9{@Cv2*kRSphWXc}o7#y++aRDfqySmEFNu-SZIPAcK8qzpAmD3KAi|cJX*er-l
z@&Hu|`ruLjcNf{;d95b>*sH2oq>NIA;CONKui04^aDW7+Nga*L{7!>`(327!)YPV{
z5E+!?l5X#iT_nH;#0P#7K!DtI_DL;hWC@%#{n7K9BR*VFiwtgb(65*11>&h{y@sX5
z*i|!7=x47@NjAnby<h*prY1eo2_8FQL5$S!gEs+@m}-6VW6|ra!qK6sPw0IjVU6fX
zl|DK*|4?x~VrW)Wb9<!CB=y9Ul<e%*W|GsZ?bcNhK;9;^@d{!`^+-j_x)CkuM0y;{
zE$XK+v*+3whiPB+3>9Wb3*bK72}>EZtn8c=jqJ^ml?s8(U}ex}$~xX1l-g`%Z4M&~
zPfN_)T)+d<?*Ff~vyY16x&pY3Ml2;7{HXPql!-BCAi6sr`)2loT|`*$3xXn56g4jU
z0V}&Z>oT|tf;ly`RSCf)^`mIvv?lGz$)RYBRInP2*7U?6M4+J7h!zox)fiD|LQZ<$
z@*y+BY1$s=k3F+@@4NTSyYIf)^JdQd-3vRg^~q<??4+-@WPG`YEh~O~m9F!fiy@Pv
zg>@f(uk(rGKXp#|(by{)u@PD3=n4ImT<fX0lMy@KEljGo|LNOh8)i1#?ylVuSoy=+
zW9Oc_S15iyp~?02iJL`-$7W7nW-2>&ZK8O(_sNi_Cbki8zH*?h{RgTrxYJ(g*hz*h
zD@kWUqaT!xk2_lX@iXiCh5pa`R=l;_>K(J@;MBT%y+>zWeRo}^SoQLJ^z2JLUHi{k
zyYJY%^ND!6f5K~Hy6^nfKpF#aQy(U_l@?w)G+me6{#Cts(kwJ7kW?|#^F~KpN88$8
z-Ws>!&g$D+zwj2@7hh0Uon2{<KGj}%=~~hIpW4b7C%t#3V9SGzbIX1*f9mmVYXa7T
z{oUO6pPsV4>d@x+n0#yPR&G<()nB+zT^ZNhx2C@S?;H1>*k92Qn^7J0tDl|{9xOTe
zo7Y>*xBhxh&C$B{<b!*%s&7tiJAZtwyQ@5WjHq3>-uS`ZlFu6JTibWLYErgMPPg}*
z-hX{kZ&Z{!cG20;1>C|jS$nTfno)4!;ww+z=$bdXA>L(fIvdt}`DT&82=}IMxxc#J
zP=9Ght$lgpGqb4&8B-3iv+X~R_$0RWM#SwKz9ao#eOY=;TeQNrC@*AfT-G_yT|@7x
ztoujqHilpLeQ&3CT2<ls6Mw!@(l~Cao@(%~+P1-1zP-QYPD@ko*OjGx;iiNvsxaSw
zx8?np8@Zl;k}07cZ_Y$jb$#{q=6Cjm$Gy1gc4cfsQ_Ie!DG#p|`Bklx`Snkf7+RgL
z&N<4~94=fi<saAAvn7AH>#19LVq;0uUoLbcb$n!Dxy?nLJvY`wZMOcaCJB|C_RRe#
z&26CH`KIB_(xxNfKYr6%tzEYy!igFlRunI5pM8Aet&i0`<(sGZws$?(9HQwi<{g(0
z?4DB=-s>)zmEGTWQqQo)@zI^<!Yg{pPP8-kxEXi8*mv>dj?yDtp&_=FJ8k^>)rU78
zXu87fT8!R0-4XU&<%`w3##Q%4PW##3#__w}&ab{y_t~unot=iBPsHDyySzb2^KN?Y
z+myfkapu;E+2u2;cAZ~+kX`b@q2|9{ZtHq@u`RXv+p%v%uCGz<5Ctg~BX@{~@NAE&
zrl%(-4V6r1G&*|t)iL9|090(xv5Q2eJ<I7ak#~=MND@w)iCoDg)5+d=d$x07fzQ6Y
z;H5NcL5@{#Bj?408s}MnscKgREMAo(SgSpkfQt2|S@Ee!iL<amzz}eI-9U*W0&bTl
z*AOs~!6pVc$6|^kf+}K;iA+ykN{E8s%5jPWtJbR-6{DF;IDAlD-!J%b2u975VA5xE
z7*c@+J75sLnaFHW^cpD2@As?y8nxidq8L3qVW3%xWmTY|%FXwPmVnBW`#ksycEp)J
z+{}}!4)#e6bxbH{I>o4IYRJ)0%|xf*A+TdhrjRF^$h<tK&0x*6@)};RQDtiF4i&>V
zI29mcXqC>Y%VhaXhs8?khTM5abW`FFegKCW7za2r0PNP5XSMrG<btJ1#DZ)gR~$fF
z5qdSNC8@#7e_XwS*o;035YWM4FoKRD8E{aJd^7B$#jrF>t7xQR_%sF?7>$AE=g{y;
z8!4G41Rt8l2e;q;o2DZ)M>G|DX)q;XY@3|k+#G^ab2<kRKlGj^!RU4TT=)daQmVz~
zv|3z5LcX0?E;vL#Y~u~|DQI}mj*-Gq95H^6dqgeX<mCT6rfxT$^jObe7OZ)0*j8L*
z{$Hll<DLaJ>u`s?c|KP#e{5C?c3E-Xa$zDc&|{m`;1GOn3(S6t*9#m9pi4pRADFdd
zj1hhmoubPg6U@%}E^*+*<;2-$a9KQACNiM1*&UWVmq^BB3PO$=LOKu)mosMIB-oC6
zWNVaI1x1kk5H@OfZHWmb9@Fvo3_V&<p&F8j^yB4HS*G>Tj{Z>QM~;^GQLuxK^9TkU
zXHulufYXph49_4&6U;!8rb$qPO#Kdx!EA{9|1t_(q~SnE4uvpk7~~o7*&Tq0(dt9-
zDmZWuJb<z|!a)qk5YJ%h8a@cmpiIm0nA0nfAwZ?c^$=n(-BY3mUogB+D%0qJb0n34
zUkoIa=pikOd8ksEUXOW>QkhPxhgY*DG9J;uPLj%y4z}K9GLDBEgiMC?2pC|}wmi56
zgpI@p;#thVlFKmIRVqWQVytM59@8BqdbF0ugmH-sX?bANNo7F5Q|bZvP;tF{kUAx`
z2Z*Ur{3`m)u$YS{^$S2ky<)6*3^kPLK``ZQ89=VduY-a30@X{}KOXb06f%s?mFgia
zW(7)QU=KKNQW?uIqr`|)%ooJ-m_#eFhXDB}_W||*4<yxN5vRB|um{LGsUG6Bz>bs2
zI0iFr@iCllU{5h8SskYw1754RUc~D#Tu)*TajYViU=I_mC3+f2H+hV}9+bV4>OoaH
zTv$)i7QsVA`E`Ijt^9g5z`2y`fjxyD($erCRPKYvC|!wPu!kwh5*dENrf93BM_FHJ
zy>hH{iuDidDRUpu$~gq#m9H-dQdKVFXbrCZE$K4{>y<ngfIW%f$`U;u!Qv^C!B7Fj
zRH}z`@V8ek(`%G-1OA@L+iDS`8!;}T&jJ`IU#QVYP|KYKcDR2KRH`5Vj~YJ@C8$Ln
zhd_W4fLc?F%tVHfL1rdS6Q4jQCdMPPUK0;Vov1~CrbG#5#Oh+cTVpLIUFV7xpBTJp
Q0gshqLSJ|xAtf>N-?IwnIsgCw

literal 0
HcmV?d00001

diff --git a/popt.ps b/popt.ps
deleted file mode 100644
index e744ac4..0000000
--- a/popt.ps
+++ /dev/null
@@ -1,7963 +0,0 @@
-%!PS-Adobe-2.0
-%%Creator: dvipsk 5.58f Copyright 1986, 1994 Radical Eye Software
-%%Title: book.dvi
-%%Pages: 11
-%%PageOrder: Ascend
-%%BoundingBox: 0 0 567 702
-%%DocumentFonts: ZapfDingbats Palatino-Bold Palatino-Roman
-%%+ StoneSans-Bold StoneSans Palatino-Italic PPCode
-%%+ StoneSans-SemiboldItalic StoneSans-Semibold PPCodeBold
-%%DocumentPaperSizes: Letter
-%%EndComments
-%DVIPSCommandLine: dvips -k -o "|./fixappendix book.ps" book.dvi
-%DVIPSParameters: dpi=600, comments removed
-%DVIPSSource:  TeX output 1998.03.23:1523
-%%BeginProcSet: tex.pro
-/TeXDict 250 dict def TeXDict begin /N{def}def /B{bind def}N /S{exch}N
-/X{S N}B /TR{translate}N /isls false N /vsize 11 72 mul N /hsize 8.5 72
-mul N /landplus90{false}def /@rigin{isls{[0 landplus90{1 -1}{-1 1}
-ifelse 0 0 0]concat}if 72 Resolution div 72 VResolution div neg scale
-isls{landplus90{VResolution 72 div vsize mul 0 exch}{Resolution -72 div
-hsize mul 0}ifelse TR}if Resolution VResolution vsize -72 div 1 add mul
-TR[matrix currentmatrix{dup dup round sub abs 0.00001 lt{round}if}
-forall round exch round exch]setmatrix}N /@landscape{/isls true N}B
-/@manualfeed{statusdict /manualfeed true put}B /@copies{/#copies X}B
-/FMat[1 0 0 -1 0 0]N /FBB[0 0 0 0]N /nn 0 N /IE 0 N /ctr 0 N /df-tail{
-/nn 8 dict N nn begin /FontType 3 N /FontMatrix fntrx N /FontBBox FBB N
-string /base X array /BitMaps X /BuildChar{CharBuilder}N /Encoding IE N
-end dup{/foo setfont}2 array copy cvx N load 0 nn put /ctr 0 N[}B /df{
-/sf 1 N /fntrx FMat N df-tail}B /dfs{div /sf X /fntrx[sf 0 0 sf neg 0 0]
-N df-tail}B /E{pop nn dup definefont setfont}B /ch-width{ch-data dup
-length 5 sub get}B /ch-height{ch-data dup length 4 sub get}B /ch-xoff{
-128 ch-data dup length 3 sub get sub}B /ch-yoff{ch-data dup length 2 sub
-get 127 sub}B /ch-dx{ch-data dup length 1 sub get}B /ch-image{ch-data
-dup type /stringtype ne{ctr get /ctr ctr 1 add N}if}B /id 0 N /rw 0 N
-/rc 0 N /gp 0 N /cp 0 N /G 0 N /sf 0 N /CharBuilder{save 3 1 roll S dup
-/base get 2 index get S /BitMaps get S get /ch-data X pop /ctr 0 N ch-dx
-0 ch-xoff ch-yoff ch-height sub ch-xoff ch-width add ch-yoff
-setcachedevice ch-width ch-height true[1 0 0 -1 -.1 ch-xoff sub ch-yoff
-.1 sub]{ch-image}imagemask restore}B /D{/cc X dup type /stringtype ne{]}
-if nn /base get cc ctr put nn /BitMaps get S ctr S sf 1 ne{dup dup
-length 1 sub dup 2 index S get sf div put}if put /ctr ctr 1 add N}B /I{
-cc 1 add D}B /bop{userdict /bop-hook known{bop-hook}if /SI save N @rigin
-0 0 moveto /V matrix currentmatrix dup 1 get dup mul exch 0 get dup mul
-add .99 lt{/QV}{/RV}ifelse load def pop pop}N /eop{SI restore userdict
-/eop-hook known{eop-hook}if showpage}N /@start{userdict /start-hook
-known{start-hook}if pop /VResolution X /Resolution X 1000 div /DVImag X
-/IE 256 array N 0 1 255{IE S 1 string dup 0 3 index put cvn put}for
-65781.76 div /vsize X 65781.76 div /hsize X}N /p{show}N /RMat[1 0 0 -1 0
-0]N /BDot 260 string N /rulex 0 N /ruley 0 N /v{/ruley X /rulex X V}B /V
-{}B /RV statusdict begin /product where{pop product dup length 7 ge{0 7
-getinterval dup(Display)eq exch 0 4 getinterval(NeXT)eq or}{pop false}
-ifelse}{false}ifelse end{{gsave TR -.1 .1 TR 1 1 scale rulex ruley false
-RMat{BDot}imagemask grestore}}{{gsave TR -.1 .1 TR rulex ruley scale 1 1
-false RMat{BDot}imagemask grestore}}ifelse B /QV{gsave newpath transform
-round exch round exch itransform moveto rulex 0 rlineto 0 ruley neg
-rlineto rulex neg 0 rlineto fill grestore}B /a{moveto}B /delta 0 N /tail
-{dup /delta X 0 rmoveto}B /M{S p delta add tail}B /b{S p tail}B /c{-4 M}
-B /d{-3 M}B /e{-2 M}B /f{-1 M}B /g{0 M}B /h{1 M}B /i{2 M}B /j{3 M}B /k{
-4 M}B /w{0 rmoveto}B /l{p -4 w}B /m{p -3 w}B /n{p -2 w}B /o{p -1 w}B /q{
-p 1 w}B /r{p 2 w}B /s{p 3 w}B /t{p 4 w}B /x{0 S rmoveto}B /y{3 2 roll p
-a}B /bos{/SS save N}B /eos{SS restore}B end
-%%EndProcSet
-%%BeginFont: Palatino-Bold
-% @@psencodingfile@{
-%   author = "S. Rahtz, P. MacKay, Alan Jeffrey, B. Horn, K. Berry",
-%   version = "0.6",
-%   date = "22 June 1996",
-%   filename = "8r.enc",
-%   email = "kb@@mail.tug.org",
-%   address = "135 Center Hill Rd. // Plymouth, MA 02360",
-%   codetable = "ISO/ASCII",
-%   checksum = "119     662    4424",
-%   docstring = "Encoding for TrueType or Type 1 fonts to be used with TeX."
-% @}
-% 
-% Idea is to have all the characters normally included in Type 1 fonts
-% available for typesetting. This is effectively the characters in Adobe
-% Standard Encoding + ISO Latin 1 + extra characters from Lucida.
-% 
-% Character code assignments were made as follows:
-% 
-% (1) the Windows ANSI characters are almost all in their Windows ANSI
-% positions, because some Windows users cannot easily reencode the
-% fonts, and it makes no difference on other systems. The only Windows
-% ANSI characters not available are those that make no sense for
-% typesetting -- rubout (127 decimal), nobreakspace (160), softhyphen
-% (173). quotesingle and grave are moved just because it's such an
-% irritation not having them in TeX positions.
-% 
-% (2) Remaining characters are assigned arbitrarily to the lower part
-% of the range, avoiding 0, 10 and 13 in case we meet dumb software.
-% 
-% (3) Y&Y Lucida Bright includes some extra text characters; in the
-% hopes that other PostScript fonts, perhaps created for public
-% consumption, will include them, they are included starting at 0x12.
-% 
-% (4) Remaining positions left undefined are for use in (hopefully)
-% upward-compatible revisions, if someday more characters are generally
-% available.
-% 
-% (5) hyphen appears twice for compatibility with both ASCII and Windows.
-% 
-/TeXBase1Encoding [
-% 0x00 (encoded characters from Adobe Standard not in Windows 3.1)
-  /.notdef /dotaccent /fi /fl
-  /fraction /hungarumlaut /Lslash /lslash
-  /ogonek /ring /.notdef
-  /breve /minus /.notdef 
-% These are the only two remaining unencoded characters, so may as
-% well include them.
-  /Zcaron /zcaron 
-% 0x10
- /caron /dotlessi 
-% (unusual TeX characters available in, e.g., Lucida Bright)
- /dotlessj /ff /ffi /ffl 
- /.notdef /.notdef /.notdef /.notdef
- /.notdef /.notdef /.notdef /.notdef
- % very contentious; it's so painful not having quoteleft and quoteright
- % at 96 and 145 that we move the things normally found there down to here.
- /grave /quotesingle 
-% 0x20 (ASCII begins)
- /space /exclam /quotedbl /numbersign
- /dollar /percent /ampersand /quoteright
- /parenleft /parenright /asterisk /plus /comma /hyphen /period /slash
-% 0x30
- /zero /one /two /three /four /five /six /seven
- /eight /nine /colon /semicolon /less /equal /greater /question
-% 0x40
- /at /A /B /C /D /E /F /G /H /I /J /K /L /M /N /O
-% 0x50
- /P /Q /R /S /T /U /V /W
- /X /Y /Z /bracketleft /backslash /bracketright /asciicircum /underscore
-% 0x60
- /quoteleft /a /b /c /d /e /f /g /h /i /j /k /l /m /n /o
-% 0x70
- /p /q /r /s /t /u /v /w
- /x /y /z /braceleft /bar /braceright /asciitilde
- /.notdef % rubout; ASCII ends
-% 0x80
- /.notdef /.notdef /quotesinglbase /florin
- /quotedblbase /ellipsis /dagger /daggerdbl
- /circumflex /perthousand /Scaron /guilsinglleft
- /OE /.notdef /.notdef /.notdef
-% 0x90
- /.notdef /.notdef /.notdef /quotedblleft
- /quotedblright /bullet /endash /emdash
- /tilde /trademark /scaron /guilsinglright
- /oe /.notdef /.notdef /Ydieresis
-% 0xA0
- /.notdef % nobreakspace
- /exclamdown /cent /sterling
- /currency /yen /brokenbar /section
- /dieresis /copyright /ordfeminine /guillemotleft
- /logicalnot
- /hyphen % Y&Y (also at 45); Windows' softhyphen
- /registered
- /macron
-% 0xD0
- /degree /plusminus /twosuperior /threesuperior
- /acute /mu /paragraph /periodcentered
- /cedilla /onesuperior /ordmasculine /guillemotright
- /onequarter /onehalf /threequarters /questiondown
-% 0xC0
- /Agrave /Aacute /Acircumflex /Atilde /Adieresis /Aring /AE /Ccedilla
- /Egrave /Eacute /Ecircumflex /Edieresis
- /Igrave /Iacute /Icircumflex /Idieresis
-% 0xD0
- /Eth /Ntilde /Ograve /Oacute
- /Ocircumflex /Otilde /Odieresis /multiply
- /Oslash /Ugrave /Uacute /Ucircumflex
- /Udieresis /Yacute /Thorn /germandbls
-% 0xE0
- /agrave /aacute /acircumflex /atilde
- /adieresis /aring /ae /ccedilla
- /egrave /eacute /ecircumflex /edieresis
- /igrave /iacute /icircumflex /idieresis
-% 0xF0
- /eth /ntilde /ograve /oacute
- /ocircumflex /otilde /odieresis /divide
- /oslash /ugrave /uacute /ucircumflex
- /udieresis /yacute /thorn /ydieresis
-] def
-%%EndFont
-%%BeginProcSet: stonesb.pfa
-11 dict begin
-/FontInfo 10 dict dup begin
-/version (001.002) readonly def
-/Notice (Copyright (c) 1987, 1990, 1992 Adobe Systems Incorporated.  All Rights Reserved.ITC Stone is a registered trademark of International Typeface Corporation.) readonly def
-/FullName (ITC Stone Sans Bold) readonly def
-/FamilyName (ITC Stone Sans) readonly def
-/Weight (Bold) readonly def
-/isFixedPitch false def
-/ItalicAngle 0 def
-/UnderlinePosition -100 def
-/UnderlineThickness 50 def
-end readonly def
-/FontName /StoneSans-Bold def
-/Encoding StandardEncoding def
-/PaintType 0 def
-/FontType 1 def
-/FontMatrix [0.001 0 0 0.001 0 0] readonly def
-/UniqueID 38782 def
-/FontBBox{-158 -250 1540 946}readonly def
-currentdict end
-currentfile eexec
-405149B573AEC9378BAE46685AAF7849E5C9A5C8C876748725589FB14A049808D39A75D55F6464
-11A9C3526F1887AA2BAE53EE4BA6377CB094098BB2590828DB96FFD3A289579524DBBC79D9597D
-47A79192E01C360F06B93BFF89A3C642BC410337D743499A7F8B1E476FA1BDB0B198F67CAE3F57
-49A1ACC4879F6EBCD84740D62C5248595B530E6C3D3CDC3AF54369EAFDEDCD9848E2D38CD091BF
-2ACAD10DF1C87872AABD086D60475ED6046E240F2232FE2F00259225931518B7B429137B14384D
-15F582467A818C20C1C6316C56736C19F1D7464231D69800D94CF5013DC237DA1EC16FD63D3154
-4FADF83F152D1496E3E1B50E657D51952A65DA2224AE3C290A948226F005C37ABA2F6CAA732367
-9D03A1F924A332FCF713C3AFF685DCD14F950A9F50F46939759F915F780F68EB1E8A2A6DD370DD
-DEF5A51652CD0C5DECBCC94396962904B19069ACAB227B6D4D14852A65362D2BFE3B3936D8AB3F
-2318A99A46913D868EDF1984F868785E3B1107643BC4E58206E8E5E71E5E13A822A289A7C7559E
-07BBD8822847C56EC0DDB12202633CACA990B5844B5253EBF7218C2C491211D1879A4F36BAD9B6
-9353D636506C52F24818E4464E02C41AAA17AF7BF09FBC37C335A7BCA40481C1371828D4ADE630
-8DF09DC08C641377295CD75485DC14732819C2DB21CC499733FECAE1CA94907A1F144F0EB9BFC2
-98E471AF304BC3628CD390202FFF59A7BD14D9F9CC99368826DE6446CD40A68ADEDBBE8C388798
-0FE574448B196E987C2A392DA865DA46E652AAC8F9A4826D5AD1776FE2E5D2DEEFA011507BE935
-9E19E2AF34643135691E3A221B4B0AB0D18DC3993F6465489CE5EFA0D2FEC087881927A434E51F
-99683AA0463697BB9614B6CF5247330BB7393F836A789A3774629B27E1F82AE4C01EDBE95C237A
-0EAC78A5A7FFCC2332DCDB725BDE9101A9DE53A6CCA64A98429471BA8018A3E3C2D287B6316FBF
-08C3D2BB5A611D1BE846B17C2F0CAAE2955BBA7EE4D84DBFA6BB5D54B5D90E23C21D34562144DA
-4F5A49E666C1E6F7F18B2B33B2BC4A7FE722440D272CE53354B39442F3BC89E5F939B7175448F0
-02D6A60BC297C770745222FDACC9D456B4F869E7BD4E802C01D517AD752BA533DF1ECF4F9A6CF0
-DE8306C55A90405F23D1834D76D2B4452E4504AA953A8B4DDA4F0C967329D922A68615B1B71F73
-E8BB682ECBE3C7417A218DC386B0095B38575EBBA55581F768BA5D5F203A7625FE78857EF2B919
-BAE4DE0116506FE2C476A6423414FEF5833DFE00D3EAD6C6B5F31625CD76FB0A49D04C1DD85A7E
-692BECE0CC32C9A8C04AC209B5D1D77B7BD213B71855FBE81F757F46127E7253823E732A609DCF
-16C79412D1F0A1517288A81B42165B47DA66ECA5E8E1F6A39A474486A3D4B669BC65CF63136AC9
-243E7A492CFE222CB4F55C2ED4BAA7556DEDAD425BD706AEED895EAC76704AF6366295EFB4A91B
-548C2176D4A30B1026489E70D8D981D110DE46E0D5DF3A287059220142DB0100092FBD9E16484B
-7CDFBAC2B595FD35359D65D5351D5AA1AF8EE94E6A259A568F3D6219F2538EB9E31E88D2A7D8B2
-15F88C581AFAAAE67AF587343AB6AB3636AE519CAB00CD0A79EAE4DBCB56E76E46F14DD7F03759
-D10A4F78BC714B60E3CC56BC04C4FE68C5549BC1A4577F2AF578F1441EEE9178E6788CE03EE16C
-8C3E80DEE3F0D016AC09B0B62B46EBE547F0C10466E8BC9C3AC235F91F599B244F8DAC3B9FA661
-8A09D9A62E9E904CCE33BB1DA1F6FC81E1F97A1C56A2107F721F837180DF24FF110C7AED628E7D
-0B465D5064A6DB0E178C400B65E23951E7562A8C890BAB0774C2ACCED07E487D54E688E5AF3546
-661B13336EB1A4EF484BFE4CAB61BFA47B7F232D46EFAF50D5E31A8305EF727DB091AB0B93430E
-61FB938F721390EE271D2BA5D8B33BAFD5CB3F24C7A4ADEFF6C0E42D93E1B9DABD25F891811A09
-457BC94E13F1B71F628969679740D91C1971598A1D4C248F840BBEF2BCF74FB1EAC6D3D58306DD
-607CAEB18A8B19EB775BCBC6602DED6DC273D4A0190EF8D30E05675BC7B3EE1F6D584311C681F0
-C9B7D60D25BECC3CA7BC83B17E7D42832D92CB66345668F455F86A39D59534B84967D5542D288B
-0018FA183A4271150F549D0532E692C31077ACD8F905293CC16C9901DEAAE6B326680A59493707
-895264F881D693BBCA955A6F03B58AE0D81540E26BC9A2104D4AB20C5CD1D4FA3DB09A38246425
-E5B1FE1EFBE6C32AF609EBE71CA5DE4E24D8CDCAF1C3C84359126DAA6AD0098BF74284455943F5
-115360799F10BDD657D00FFBC2039816785AD6E5EFA8444F3AEAA8DB52E2F3CBEA815C4EC09076
-1D03E87401317A12567DA35A9DED959746FD5613E1D7497D04F80CAA3463D3F3EB7912CCB6EF87
-8B487485A275D154E2549F3C424A730F66F66AC9E6FAE099E71504AD5B76B4F97C7BE15D70E4A4
-3CB01E09CD47F41BF047757436C886A36B9C5F2C51B161A397DFC5494C2ECB5A4CCCC075DBE2D2
-E37B22F14C3665182200830F6796C1C9841F24453286515E3F6B701EF8C0BE65B8305A3D2A0522
-CA5A30CFE5CBFC50A9B6E7D3925E532AB5A58D4C6CEA5FAE1C1EED2E39C815E64BCC96DE2AF85E
-F5BC1831EDA3B1BA541B7DB5EDF6E042246A8534353B20E99A0ADDB46B32AF11DEDC2FE1B32263
-F054E752F68427F5A1B71ED953FC272FDDEA55506CC8FDE8F35C619E37296048024FA6303A9FFE
-6C9BE3EDE4BE5794AD1A8E761B3CDF137C7A29C64D0D8EE1CF071F9096DEE843ED40F1D4A543A8
-CE28F7043D38A74E929EAEAB6BA95CDD17E51BDD77691F0846F9EEE48CD5CAF905CE0814F3C7DF
-A17F430384CF1B2004F31E07975CE4A6BC88CAD0A805CF89D167BDD15C9F0F8442166DE3DFA687
-5FC08A35D221A151698B803BD67064571AE57B67797B5F0618B6B8F3D14829B87ADA7838D65BCE
-D527CE2FF9984555B8A6B915A68263E64141408FCB7BBF1FF7B8C043705A8803ADB84397B861BD
-64A3A7BA781C44C847A68F1A9E8FF6ED7BE881B08C8ED3A2BAFAB919D7D36D36772DAAF812A74A
-EC368EA622DB6903CBA3134E755C63B0020EE72EA699A3975BA4B1CF7030E66B36BDE8A66BD0B2
-70C7A2EC084B8383D023269B931B9CA036FCA362A9DA6DC9DDDFC11F715B1F2A60098C56B6B68D
-52BAF33BF0AEE2D8551F0C8809342894F60D3490D9DAD1317AB2F70E313924E9D680C610D41CC3
-1924E1458AD220FFE0B384404DF3AA67E7305A0836C5C195513EC3D0686B368A65DD3DE9AEF5D4
-EA28376B4ACC1D00EB38F6D4EED7E025EE17A1D157C1E71879DE16BF46D58E1BB46B2CF9CBA082
-C0A94567A5C874E8E6477A3CD0D6E48F8CD4E4AC3730E33EC8079B4CCE0EBDDA5E48ED13626F90
-888A2892448DD075EA3A846D1C8E6E3F0FF03B8D63D04AEDFC659840A949275394EB21B85E544C
-28BF0C2AB7113EBE4A8A3D0579EF48C15D9D82A09E96347422073A45E3197490D59FE5E9818697
-065A419E95768DAF768E1D938414ECDE5159281F4BB35EED8D65D3651906217FFC08AFBB075474
-D0F6B7519CE3668090B115A350DC3E90DB350A290822405C7AD6713F3BC29FEE0A4E32F9C85FDB
-232A458F55DB1CA335FC94A472C390A322422CAD609443F5645E6C45238570B689A7AB307B63DB
-B598FCF2EB2A70F6C4C9CB5DC3076938C4D2C400930DC2625285EB4483294509A4B018002B8261
-AEF571B06D8E9BD86E8AA40CFED8E92D055D1F653FF68F2EDF9463796B070A2B366BA274A07CA8
-283B30CF79231CDDE4A2949F47D8C18C1583673FBC5AE18E0A54D32B095322CFF5DF3831F91068
-E9DC713EF1B280D41C4BBEFB26095FCD57A5FF745E0A24C037B8093FFF2E10DA7F6F6A481260D3
-237158CE50618A8BDB1CE1CF5551B4598917E4D40137E67993D96D75D6C3850D92D5373541D7E6
-5E7CCA1478A5F3D117AB8EF2F80F02489E7D9899A46B4B1C30E61D657AED848A144DC24F11A1F7
-18202029C81926AA76D9F7E4B8CDE38848E702EC6841115A0F585334F42445AEAAE787BF272A26
-3594E4F62358E7EDAAAA63028DE788724EE04D1751A59BD95D9DC2F2EDF0256CB44ED3E2210A9B
-AFE82833926ED6DABA60141D740DB0318FDD9A7D3B4CEC8F2C95E3FA6EF6013737F0B1D48D24D6
-FE389C2EF5BD12AD8C6D2ABAF9016EFC7DE8DBDA6FDA21727EF8E007B155D311D7B279757167F4
-D1B2473534C2408E402AA0504F853ACBBB5CEDE208137F2DA6C21230FE2715C45EF003AA9013F8
-54A5534F3AD3F8FF0550BAD3716449DFB3A6A4F460C72EFE3EC5AA220E902C3C9F062E8EB41069
-5B3D602545BBC24D616F0975B16E8C7D3415F792555367704B92CEC9BFD6A851C81F5D9714AF8B
-E6F8C992AB1C13D51F46C5E32F79731EA32D9C526D2AAA0A1584692A024E0F85BF9E1383CDA1C8
-FC6BE36CA3C12E4FF34F11BA62D9596B39836EB59B61BC5F5DA97D803215BA1D4343337FBB5D72
-0CDEA081EC40329FF31057BEA7698AE4DE1F0B75D4D9027F741F587B4B524EB12287DFD0B90AC4
-BEB27538A7855B7966576B68F1682B990CB5FF4BA294F278DC98956C58FACCBAF383B708FE4666
-52761E94BB3E5E65C7E904643D54C68920C0B1072B790AEF99229D1F7745CB403F07C023FA6A30
-E0A00D4ADE7051A8B59ADB29D44130AB03B7FB303650E9EF55C49978A94A583974B6B91A0A4065
-B47DBA34BCEDA19D44A3FD83E7FD23CBEB6D1699023B704B8C0E2FA801CE15A98ECDBB0498BBA2
-23B444C0A75E0E4DD995D40AA4F9F03C0AF85BC5742182D628B3C0D1F76A1A9C7E02CB2295CF26
-A2F73760BC472E2278CAE54D9762FA27A9246965326A0CDBCAE997608D0A1D5326E78B6780E15B
-AE688827665DD786E6275969448E303012486BCBE4130D848B46666D660D0793559AE3E984DDD1
-04C4D56A066787B4AA4E1DE8183B078A8DE42F0663D33D35BACB19A2D82A62C52BE6D3C6EA6C5E
-3DC9C49BB74FB1E430629F437DFE67DB4DAC73590258873B6D808E8DAD4FFFE660F09D5207AA7D
-7F45EEDE6ECC32EA8F8BAA075EF236C72F9759F44F59FDB478EB818768EF740B9C892398B35B89
-C6F44EFA1E3BAF384D4BEC68D817AE7C449DE061D53C7568F2714365D5C807298D6F72E4D5D8AD
-B87ACE19E4057E218811ED12F84906F4FF9BED46607263AF1CE4E4FC1A7D06D59725BFAF9B191C
-17D912C67726D88CE805ECF93081A1BEE281A0364EF0CEFBA92FCD6433B4A44AC83C44935901D9
-2E32184A31FE7661B7636B70FF62D97AE9D7440A3A612A68DFD7176445F07346FD25DA5D910070
-5B7AC6F906BCBCAFE2BB3A3E296D580660B5F7B2B829951D291A759CE5DABC47E9021C14AF80D4
-E259EE13169257EE24C0373A7CAC17B9549A3940FC658BC35FC6366C7A9EADFDB6FF15CFCE038D
-B5F1E0B2A33CB8C45D78CE03E8394E0EA9D67708C11F7E25ADA4298D5C89D977BF17555AC70570
-BE07815C8CD204E3CCCD3E89A6A4B9BB1A05FD6DD4A56DDC0AE56D7F58381246095E86245055B7
-762D09811480E9A1700FB390BBD45FD05F1054EE65A9FCA82B28F1453D719D8EA1E38E1475D94D
-3D1B16F65CC4582CC32CBF5B9DE90E96D92A39F667090B8B47E0EACBBE85F885FB55F83B19B030
-52D4ED552C1CA7780A4ABF0DB02F476D6A494B363998B4BE832CFDBDFB28E0D2F6DBDF04291E53
-F8CEE97D6057E668F359475FA575441BC77FA6FF3170621D1002B1AB40C155B8F40F74DC822B9A
-9CEEF7662C9CECE1082AE269953ACAE2E78E3EB011F721E6D65B897699DF6BE1D143989FE07BE9
-E1EEAC4A7FAB2BB88841E33E9AF0E109A186F72B6D958D2DBD92E070B61FA8AC9DE60D3B0BE089
-50C597D02551B3B10A0E52E40571BF6AF4047B1914FA5651EAF0DE0D332EE959F58F4DDE1D8D4D
-6D847DE50E4A47AC0C2EE73FB67CE7FA22F242D4E69EDF2CC050DADDB25F8959E9060AF0E2ABCD
-2E0225A1B9C4792EE988517B3A567DA09F3E12E052ECDC91A5737C44026513E46D7B0C7399B006
-B1505F3B7F41883A14BA5B180E80C63DD5D37EC5E90C38F46DC88F11FD5C1570455941949606CA
-598CA2010568DC0B49FE5E5EB5DFB7E3AF195A23F51F87F5898D10A34043F23409A95519356617
-073EC83CD312AF6961EEA40377EAB0B0C159C3906F0492E94414ABB8FF34F1FB6D33594DCB5A64
-FAA7A02C749799BC14552F205122E22208EDB633FA50311B398B98EFFC0FEB5CAE8B0953CD1D0F
-05701C2919D5DE58EEA2CA4AEDD06444915B16925504D159F050AAA203473C29805EDF5A71AAD2
-06C601266ED2B909E68887F94B7614E723950EA9818F7793040BB8F7E3500BE44898B92E1BDC97
-BCCF312D35A85E667669F15BDB42884E7A258C36C7CF4947852864FF46EFCD56817C58A7BDF29F
-3111A188A5F9F255FE04255B1427CCD9D0CAF6D9992C6FD493E11AAA81E13FC69C569A573A79CC
-D3D2859B051B7EC7CB55A2929E515FC15B08ADA50369C10808B83EFB6445B4E57E8BBBD75D6A6A
-62F722875C6A65BA355BF24CDDF4F5611D4918ED9DDC52E527C49A2843BA3646F37B0103ED0838
-5D68834783F29C21FC66F55A7B11CDD154810310CB0C05367D2F12D749F5BAFCA86AF16160E90E
-1E6609DBFEB302BB7393237731FF90EF555E1A194F88BB05FCEBB6B057372731CF1D14CB47E47B
-69A3E1158F1741DA4505541A832D0362CD4D16EC54BB16E40CC682CE6132E369C0BAA2ABD7A35F
-C27999881B02D9C22DFDD56CD7520CB83A8CFCB4A17DC799043F25D69BF3460DEEBF18C2579F05
-2B69B9FE5E6B7467A15DAC10F3D3500B7EB0D41E8CBB0D3DD7A69D28458373C681FA763BAFFC57
-24E1B59F21AA8830E7391E8BF8CD649F7F3826264914505A3B36705655AF3C3FF506332A43D753
-D15BF0A415D6C7F8F653EEC0A66840E7B9E78C8AB0556417071CADB861D9CE959CD4641EF2CDEA
-B450587752B4ABE8F1E61732C49C57241746E913B99D23568F627AA7A22B9D3372F24A9F1B8AC3
-427E598809084D4BCDCC8E29B975020E737FBDE1BE1AF74CD02BDD781388F39A189F6583075A57
-A5B21E1A5E93AD170C3767B543BFCC152E326B768D98BDDD403FCAC07EA395A019E645065B0DD8
-DDAD3398299AABE61D20D85E99FB81C63C15212B496A3E23F64F40ABE60BD8527F85A7890BB7C1
-A31F9FAD5776CBF852DDF9099630A0B110DD1FDB87FA074EC5493BB2188940F2979A01C1463ADE
-B688A3C3339293B0E1EA7FEB5203335D2558EBB8BDB65F13DC2EB8EDD6C2784D902D6B20135F7C
-88662991CDC91E2B9980FD68B17B62E44693984B766247A9F121A12E280AEC4D3C765F2857338C
-887102660537AE28EBC7771D402BE381E6AC75D071D6E66BD53CC02EC96851B7F6ECA7A9464834
-70F2AF182592F53FBCF7F3D0878E14BD3A7263346187FB3250F17266F11062BDE774AA3997E810
-2BA9C7BC37A0B69DCD788070725DE7D8DDE804B3B538024F2D67DF7B9E009A20C23FFA5B36CEF1
-F23D7A12F667A1750BBF2B222C8ED82498A9C644AAE7AC259840F3881747F2B4EADE7D961E74EE
-A17863B740E1A672F270972873EF3BCDA4294E7008AE3F470A89159005431D9CBD1BDEB0B34202
-41D418687BD044B9DEA09F4801BF1193B10A6B96478C938AA67CBE3580187F2CC2604912BE6AB1
-CC9D10E15DD2D02C55C6EF824E4E8DCD1C1F92871AAE4A33455F15D71B4359E15CFB29F8FFB1FD
-F088978B92B436A8F42CF8061DC98694A7627EA06872DD24FD5F6CAE4A09106B82AF6D0A4F131C
-1D25A062649FE8B6FA16929384D4C15C301875B05B78481391A497DEF3D6E24776985E7B9D0111
-8452B33EEE084A1A5CEB8866A8E7F7016D82D0588C9EC00671DB79F22BBC904204136F2A97B27D
-B1E20A571A89312F7F1FDAE1F9AA66EEB6C7B473FEC90FFE75EDCBB53CD4F4625D3E09C79AF8A9
-08279757AC4995AB575DC4762B33B6608A8A85D5EB39C52C1CA452047ED183A031142AE061D2C1
-1C8A8FAC48B5239D27E196AD19613158C2B24BF66EF5EB040C571B67791996F18E7C5E4125B9CB
-52591132501D4E3E9A43B111BE76EC06E70867494C4DD27C137E6BE35C32CAE9CA4F5CE3934ADA
-865F18C152697C6B1CF0604517AD8C6D2AF4CC00D3E354E2D285EE2F06237C9FCB02A3A4A60157
-CCB0A0F35915569AAA64A95C7DDA00EE2718E2C6072F7E5D88A88B57021DE4FEC39C4744600073
-B2D81A668109A6516670A1F3EF78BF46518E95D02243089D89A49FDD78A8EE183594EF936F71A1
-8FB5F93318602D6496FF35FFFF79FEAE2236386F07AA84300B067A9ED4FEBF51B69FDFBB973FCA
-62125FEE4463A06B8FFCF5C662984C1CD4CADECC275709268C4FFAE774E12B617973760E369D1B
-8C79F00471310EDBB3569022BE0FAA2E9DEB12E81C40A8ED3803FF3E400933B50905F3EB231547
-157887148738845667817FEBEB00D17698DBA9D1E236D596DDF3EBDF46A3346757CC012657D0E6
-A0DC78399FF4CA83B2545CF3E374F16DB2A5DC36B3DF9AE0FAFEDAC9379F0EEA3FA175CA0E9FD6
-2E11F10369B21FAB99D721EDA9B13519822DF999B512A8061582F7C0E836112D023C4617848C2C
-6F923F8BBE27017DE7CEAB3C857F6A151BD998266DF62D7885A3C38363F5986614191D68C29877
-567B1408D4DA1C5ADA91A75A1A5CB07C7D5843CF7246233BFB323FFF495EEAF72D96A8EDD8C320
-57674536B08E76040742EAF65EB0FEE50D4B0BFC661B1ED5A436D6601A813F360BC1A6C8D8DA34
-DD1560F864868C88A4B72C95C82A0328D416EA6A2A75E5F9AE658D6239E54E7866CF8C7E37F911
-7E9D940F1A2439924EA630C310416D1A1B95C3E8BCBD0F1DA6BB3F5AC9342FAD145EDD96C4250F
-89B5B5E5F1067D4B2E2E52A182FA383AD44BC4DECA1D2074BB6EB1DFBE7DF25AF3B0271B027B11
-BF4B0F1B56E834A0667A8B30C9B61E3B44283D571A11667A4DC10F7B6E3B334764CB10357090B2
-74F7BF6B9A19ECBAEAC0A942F95F82A604C50DD71F2CFE5B1B868E69C077CDDF5C8299CA6C1816
-93AB0E43F89ADBF3BB94E2E3CFB01DE47BEC9FAA59EDC5B6D50765B6EB09995755C6074C2106A6
-FB148FB983CFE06EB4EABE827F98CF158375A7C9C745D3F7907C6952D0CBF28F5F1DDDA31A8BC5
-5A24FA35E5584F61F4ACA25773D86C46B7A042BF003086D8879505FB4E4A88B37724276E5AEE09
-FD82429814C0B601CE29F7681BB3903E64619BA57D4C7399E3BB738105C6404165D1FF2E4DB654
-272C11185886B9F9CBB94FE1D1F7CCBA6E0E4944D6C59EAB5BE7F69FDC1496A779C63391E1FA6A
-38ACD11E86F688600FE1CB3984B527FD856DA02F8F0D1D247DCFC17221139C312498ACF8D9E812
-4A64A511ACB6501EADE9F8790D4F6E9C3B42BC04C23E6AD2A6E6A54178BC38DC684B00FB549A92
-81627056F46B6836A68898211876058394D5BB263201BC69E68F050DA038B7F86EECC117C37C74
-AAB0C9C4F8B4652E2F83F0927ADB2A7BE9033255C631956DDCB17DB2FE375D79BD810AC43A2FE0
-8B51D7BA961935B3D9BBC785B0DED68D84C90D3DC3B22541C2B3C1A53DE99DA16E6EC6D1476CBF
-5514E3BCAD427C9C8875AEC591BB5E21A2CA43C14051D72C18BED73612CE5B88A8A71C114A5623
-7FEFC54583A3041A6E871C8E7DCB4CC457BAE7390DE674992EF2E3DC5ACC808CEF1B6F3D58214C
-F5024417BD901343F2F096157CE31EC0EA6CBE808C8E508E6000F01670E552DE00A4EB4D7BD254
-F840CA6EE6C75BD96E944352D9AEDEE6941CE3EE8DA3E851D811309E3B5ECC610E98DDEE262473
-3D61DB9635312259CFDA8953DF4D01A9B857DB6532CED5DEF2ADB5830ACDAC3BDC89B95834255C
-4413100B19CF49A5475C5C985F82D1C43750E933C59CBC3F92F5785EB54339CF742F44A2B4D77F
-694592CE2F926DAFE1F3D2CE52F43C16A2331E027FF3E24C102D09411B578B143582B55103247F
-7866B1B87127763EAE9BA063746B785E392ED11E8D4A6C25AE39DA7AF6F12506BF9AFCAB89D77E
-14C6757A6E806C0F1A16A0E42EECDCE19996ADEDE43E477B84E503C7ADE84B1D79EAA8C3E0D4CF
-943416B55EACF4D3E62178A29486A8F3119072820F37B204A1BD4825E758650E4B06609B867CDF
-A36E50A8236CB9FC87FD813D8E847294B5B5DD63DB7A553917D58383EAF69BD096ED658536CA9C
-B83DA967ECC467E8329EBFC450FC86C960D23ABFE0A6698287A5405F54083D5C6A949F73C05ECB
-DF521BFD0A3583CD38AD7B2324FE57958212B44EC6CBCFBE6491D5F27F91A7C68BF7AE91239BC1
-06A37D144F728A9F9452A17C3E3C81501E6198BAE958E37C9B50C1AF27C18DFC14579772F9F876
-9D1C4BA1CE86A88B1EB0D5EA9F51DC08DDEB5737ACDD58D856698795B1B3EE25E7BDAC9E50C6C3
-D6CE65FB34AF4C93A49796324B7DB4410A50680392BFA5AADF234DF2586176BC99A04FBA7E2A07
-9F5F79C7D8AD68F93B2F3B7BEAEAC1CD4E4338A9CD0203D1E04BC0FC3165FCA4103EEB71DFD119
-50547340AC83605B885C2F2B235BB1FA1F8FA0CAC2EB64615DF5C24FB2CFA2554B7FC2C5CF7440
-3C5DCEFC22C719E98553B0ECA1D08481A130FDAB6199CFD5FCBF610D4E2F51A17632270A096A70
-F1ED2345E196844CAFAB1A979FA1CBA54518AFFB507C58E86E2CCA4178172B488D7AD610B532E7
-FB106F94E90C062FFD67FDD18A72B3F2652453807901737DB8859035884D289266E402BF8F4718
-53AAB6806BE1BC39FFD97552B02BB080926F9095D56F2EC2CB04980A76F6DED32B9F879034AE2C
-A622E0E2147E33584EDEA5D003AF751255B51959956D1E27CA108C6EDA9CF5CAF53CC464986123
-B9582D0176B6689904D5744B925F12AEE17492ED3FFF048E076119FD1F8FD2A4A1B70A6369312F
-64F44664D1AC519464A0F2ADF3018B39A88AF07C52B3CCBC9DEBD9937FB2330928C1E5FF56BD73
-C4EBB943A3003E42D913C15EFE52EC17F01C7F263F795462BE605A2910CEA79C6B72495CC58F81
-CE83297B2106319EC6097C38A7394378164B7735500453974ABA5E3BE04542893AE15CD5B34AD5
-032B8D1F2AB683C743B7DD3CEA1C39A0014E9264E7655651539003A2BDC587F31B62E3BE1B7F9D
-5F134AE76949F5AA629D5A63FC239920180246EA1FF6176DD482E33AD258B155D55CD66B44A281
-723CD3CCB66A362F11E4D58F9DD006CF1651D6AFD903AF87E72544CD3725670232D7DDA8AB193D
-2C08736A49D1FAAAE861A664A9DA429772947107F2917D7E7717A4535D464D34B3C65B1E77444A
-470EACA68E4DAB122420F01F8A7D213D0041908A864CAA6A621F14C14E407F0BC5CC70CF0BC4FC
-CD2FAF8CD0C5D5FB2080010E038C0F118D762C09898686D8DBFC29CCDD46F08EFD599328101BF5
-16A5736F20ADD4AC1C150BD3BEAD585D1D362261C735F24CFBBD4B64682E34926CB04F9D31E09C
-A6335AEB3C47DE39D1600D7F62213A71C74A0F81965DC5B1B3D7227636690B882F38126D901A9C
-E418BC6D3D923FBB801761FE7B81A55DE3F2E42688246A06441FAE14F23DDB993671901F97450C
-EA6DB10B0DB13A23CE0E21C27C1CD6AB524D25EFC13DAA450FD80BBDC6376065A14D749D48EE1E
-8C83B833B510027F9C89F7319B1509B699162B7F9C5B8A739ACC1006639C297C23B8A66213F47E
-A873F87F1CC19F581EC026DE584BC049C49BDCFE89C001504F41DE17D84F973826886F4E5246BF
-FB87ADF0726CEC7A4F167E0384B91526894C2D0090D38EAB1461C607EF359E74628854DEE1AEC0
-5DA8945995A3D68671E8BDD9946C222294B0C4680EF2FDC224A0C7AFA9E5466C7B1457CE3DC7B8
-7B0C3517DB833EDD302BACF3C37BAE4617BA6206D5D1C77DD53547A7BBE0C948D217246C294C70
-5B254A960CC5C2F5E35120036356D760452887237D70D1E2F3D6B64A0171FC578859ABB62C1444
-D3FE0719DD85E7A8812F7A5C0B8BEA7207E31C7C55280348172DC5EB275898044C00C2D92545A3
-362F7B42E073C75BF179D13B0BE76B4836D069FE01C287B367D02DDCEC9412C2FBEC3D4B327A10
-76586750C8994ACE0DE17327B01F74A3813D3EF9FBB9C9C5414F2E9CC1DD9D06297D174DFD2DE9
-CE7BC95F580B4F3F26832AEE535AC16A087A012DE47BCC692B7C05B6015CEE221323F7EAA191EB
-86FA94DBEACF0996A8C8D013301A7BF64C2436135C3CCF2294B1E2246184261B9A6BD2F4B98A91
-E41EEF9BD07018F5CB9B0060AA76651CE1405E08E455BA689CD2E6A3127007BB4B311C23804689
-ECF60DA7972373D96525042C360F5DE09DCFF940E72CD5DC0A9154B631AC1F2E38AA2B8551BBC9
-AD5CB74CD86F5388AA75B6D92B1E37A4F875A6714908377D78BC96DFAB7EBE047BE4D42C416FDE
-50A33FCA9E65600A2C7A7575D6059082C3FA0DF3C31E82D3FA3969CE43965EA49F0663CF2A2C71
-EE4AD5C7D853B52B6AA0F41AB3D47E510D8BF64AFB1E8B8F782C98CD287DEB9AFED39335520B72
-B8B5CFE2A6BB7C1AB0EB746ECF6F7AF86C183612B0DCD583FAC678D9602957E61C187F39B3A654
-B20C792BDA9D81FA974A9E8864C1A86F9AB72918FEBFE47516299AE1E9B27F46F3C2959C5AAAD0
-A5C3C3065114E89956F5FA36E16174470DB8DB2FE08396EA5ED7D50AF989D8D1433E0DE7115A41
-0115ADE0BA74E8A4DBCE3D9B87CA767AE380280D51FEA9A0F623AB175C3462B9482DF6D0BE8F8D
-420782DBA63D5F43966A88E3752B270048EAFE8BA291E70B8BDF8FB433A5A57C669B4F7D35C8D7
-3C52700DEFBD4CD42E1F2C8E442D19C030CB35AD66AEF7EF0233BB4E08FCB48C872399AF859938
-A02BE5F96391FC64E297AC790D70302D51979CF5459F4DF2A41B27592D0538DBAC394C37ECF0E2
-C116D0A2A2C6ADAB5B0542F86CE5436CF989A869566ADE4D764E423BE583ACB1278C7ED362C023
-F8AC485529006A1893DD5A98D050565543ED6A4F3B03092E27E8913765E5DEC1FFFBA80982340D
-AAADCA7A95A24EB5F392DA99FE3E6C34948DD4CBC469BF2B53A50F162D05963D73E79EC88A9D94
-052099431793CF8A0CCAEA5C95B17460616A13927532043BE9FA79FE0231D57FE861FC0D32DF90
-E9F3EA5D028E06281618E984A169F5006756341C1B2CCB9BB5C6CBD2EDF71A5244EE646DBECD26
-0F547B8CF03F2689EB7FADE56D3643AB8DC7B89A5194419818FB67DD5C66E7866EBB012C365E27
-BD4BEF4A6FA8ABE429BEE38715AF35AA3F2751E0FD980DCF6AF94A8CD6A7694B6FA71F2FC2FE61
-87884D029EA7BB951EC1FEC36C100395943C8A040E5F1325EF8EB668B08999F0431C2B36761FFA
-F6E21790E51113526B92DF76AB22B9761B11A0A6673C8E093ADBEFB1B18FB7CF80F43D1D38F176
-78597B4F6390764D60A1C797DC0926DD01B7D09448C671FA5B51B93A58640EEB62E80C4F3810E9
-9AC99950D8AE3189152BA0AC7D8FA8431DFF1EA3CD4FD07B272A563E67C3FDC3188BD621BCF0BE
-40AEE192A02BA5EC36C5A45E1E16097F4284B74AFCD8690B24ED8C14D25C7EDA7CB639043A2317
-8A58094733FE73887F7FBBC995150B6E54F5CADE65338A12A0F3824984F5B16AA0CBDFF330A408
-7116EFC179DD03CDFC2312EF49FCD501732875A961DFA75DF2AFEC0711DD8A215C69B9EFDE095E
-B03261C63C88B6C66C3DBEDA2223420713192FC38AF0DD9C4E42F3BAD9E1306AC8471AFAB8951C
-10CC3FA51E096AF28D73FAC5CFAF410F83EDC08F7AF86A280A23367743FECA7106EE0D460261C9
-AEDE826D3C1B16DBE4C0DE0EFF9F744CA26246DFF950B0FD6F14602503F58A4F3B776D94E3CF47
-CDA03C04D31E71BD0281C2A66F2D8021A5EB2500A70D73B55519AAB87DFD94143A623FB250D0CD
-31B38D8ED2C5EE5C5A78DB0220CC5A081003F68D8367F350115FDB24F2A191AFE85B9F8C9DA654
-84C3FDC994889F42D561638404CAF88B831E65D6D2623AA8E82A050DA727F886EAA7DBC4012ACA
-51FB15CC48016AAF9F82012ECC6B3A4B5C9F628795858DB725B8397722749C1BF0682683A8CD6C
-55185A30C3A219136C8530CC32C8E57CD3F66677549EF3A9C58B036C2CE21EA3AED58900230176
-8FA1CFEE2A5AF414A09F5DC3CA77C70AC15720BA08B5C498A5C6F6C521C36475DB6E7677819295
-AEEF95E2FC891E1C45CE729C8A1032E02201C1E112DBD74C3203E2FBE389322D266DC2EE15519D
-1E7F0907C615F228733D2427B55C0D3735AF25A15F0EB0A7F3374755454869CF8D825C98B8EFA2
-45A44FA726AC7FDCCA1B8585A6EE64897643137B6568C0D6EC985902C870783F2602D570176590
-0E79FC7BC5A40DC29E96FE65575CC63DF1E4F39425B0EC10CC37045A0B5FAED247C17EF9180492
-4C888A39DAA1D8F28F2A682A9A522D5B8AE6668C02E9E04E2FDD936E2A0CAD1DAC3CCD6E36F0AC
-1D26F9BB256A7ABDD0B532B7B487C1BCB93A6114821A1FC85EA6DAE4FA889F555680A9EB893B2B
-8E60F99734383EA0605A48A2BEA0752D0C7A42C36D0EC252A522E55361BE4409BEDBBC55004289
-ACEFC8E11CC989609521CF8F55612F25030C5A388340FCCA791F1E4C14F2AE3333581B0D81911A
-A06D22E43A5CD564E81EFC098F3D8DCD107DC84B27B6CAADBF6CEB735783CF453943F60897660C
-818E1457017A56512DAD80C6485F6749724B83DDDEEE0DC58A0FFF9EC71F0FCCD93DE9B2DF070C
-766CF1CD3062962CF1AE2299ECD90924A8D7C48641A0764D000DBCFCBEA3205DDFF6465C146EB2
-2E99078EA6CB6F62D687BD731E56EE7081570935FB43F39FEEE8F86EF910FF0B944CEA878990AC
-F46C486B976D8DFE8905BAC6F2B01C6954166F5086C44804C7FF640D689697E1BF6ECD2D6FF20B
-1C695C96C78B923630B8C2064F4CF574249BD8124985ECC0D762ED0BFB52E2042EB900010DAB18
-135274109FA10157710FF3B695FDA0211F2D7E4CF7EA38DBED585FD4A5A6D4FFF460FA2C22AB15
-052D40EF60A35F36265642502FD0C37A2681301C86081A4016E981E3F6A184A5133F4A196F35D6
-23440CFDEA99F58C51A974C15A3A6B96EFCA25D17B0081E6441AB2EDFA2548565B9E71642290BD
-7C1A7077DCB34616A8FFF35EE4EAE3627D2F1DAF52023E17B184EE4F74C2B6FBA63D21FA3433F1
-44B521564B81FC2B20D64236DE7FFC097835AC3F9E32362F04E3061DF88B6A9901C31840E31BC2
-C590706B4B734416543C3B2477E80DC0F4FE95187B36E5EBE02075350FFF86486C485443D48DCD
-1FF4AF1862403011EA630A04034E0A34AA7DCD1926A2A4A1B5160B78B313445161F0A5BA656D0B
-69A25F9CA32BADC2AB0A5076D4C6357C3903A4D45741D44A5E4000F85102FEFF45137595C438B2
-8FC2A5E5EC2A9DF3B48B08A99EC2EA715DE23C37AA603D9FC4FD76AAB1A3583263876544F7AFCB
-9B699CAA51755B1C4871A8746FFB6183339AD853C28CE7207E772F3286F801908795BD8C701030
-0AF15345F574684D87807A8D0BF7B015030E92116E5A09CDB315460BC3B598D59ED7F3B551C1F7
-C96152DFF7BC8FD356B2E391B0CB9270FAFB986E11C8EA2350B672BD6AA36F0967F57DFE98CEBF
-A9ABFBC7B5D2EEEE99539951699BF9EDC5CF21B4E7C66A92E1C48A0220A6DE1DC08435BE94B7EE
-92AD6D4822963FFF8156E9EDF524132C17FD236E35580DD6D81A201BF80F2D893C9D56B536F4CD
-2C063C0AA735CE8441017B49602753B776A28BA50E3342681C66A881BAED494C31D0657049E479
-1C0B18F7190B1CD4FFBD0A045C9704CAEA9292FBA6B62CFA2E5F8674BB14AF84CBCA42FF3DB5CB
-B5A37F20926B170667111616309E2B0A4494AB2F628C9FC0D626F02CC9AA894CD2E6C4FBE40727
-37168091AB9536E3EE6D0D73F551E30538D7BD7F914D9E816044B3C37BB37B22F0221AD5F715B6
-F1288D7E4DF2FE4DAF4C65D097B2A757F0EA97565B8437B42F866FCC1B6EFD2EFDE8AE9D88814B
-5BBDBABAAFB6067F1382ED5A59C803BE5A8F37DDA199177E1AD0EAA48E1249288B65D281DEB21C
-051FBEA7165AE5EE8DA9C35896B5008A683C96ACB41F891DAF6B07ABD8F8CE8C0B60F0244D4F47
-FC30F84AD079795E6C9CD35D5255C60E8E0FF736EE58BBBAC019DDF370992F98D0E595FA92E911
-7659B7667EBC12D2B01158E78231E68936AC8003A1B60B20A85E89F62546110E09A7514B447C74
-447D6C7707FEDA3636F3B00C470CE0D4A23336C56BB8B3532C3D7B9D7EE4A94684DD78B7462634
-1F9683AD4D80A358B684F522E84975D1396F0163A4858FA2C175421977E62EB51E7A733758B76C
-6F378BF235860E808D90433BFFDE01EF094803CDBE5853D6B7A4B30A85E83FEF5F4353FC1F8143
-E13A2556002169F86049446D92C54856D25A90F270EF963627BC7890A0156C21F3A2AFBDC45BD0
-0C7A4BCE6C04BBE19032C9CF72E26395D9A31E3C5DBD061C7108283830D4CB0CEE7D6DEFC0D642
-DE38333BB72132C9E956FD58DF4B48C74BAE5D8E9760ABEA97520994A6F98C42C01760011B19B9
-E3DC79789A9BE75052477C96F781D309C7CA44939A3D0A458EF25D5475F99380492E508CC36D4A
-2BB1AF87B8D7B062750D8FC1F87C774A4CD5EDFA0A7A04E7F9F273F90317E2B0174C398F3E583F
-085AB4E582008470352743572A76A6EAAA2DE3D0FB2517FAA832EEF087721D2092FA43C6165DAB
-F090F59BF9E1DF2EA4717211285B51C7CECF3EDB98B4F417CA0156888F4A95DE67B73219256EF5
-4F553038D4DBDC64DF7B704F2B8EA7A36EA5A4670E3A12CE6E2686DB8EE651C6F5F30871835304
-54CADA03630DBAB407B45723846C399A2E47C9F7EAC95C86F4AD2119D49B616D28205CB8817E47
-4A91CCB58629BC9B2DE0A143E3EA70DE2429FF83A2972ADF4B8CEE0DBF0B22BF47AAE643627DAA
-565FF473C4F1F7BDFD8D320ECE472352BF037152855FB9046705D8319D78C3E8D0D6A095565C4D
-AEB2C2A621EF81616FEA46CF8B51D0B23A9A47A9B6A7046EC2F52E1A9F1EA612576E6B026CDE02
-9CB1A0168DDE4A729DDBDB7D9DDD253500C644E0D4D680F37A079319BDEBFC9C247C675E8202D2
-B09669E3D90F6F2DFC7C6899E8FC9E48167D291BA9D0B33BA0F1F331AB6578734F2A4D27B9BE40
-93C1A1351F950E99A805E2F16C900C61B7A1FCB3B3B66F66C5D07402159BCDBD15F30C59917316
-255B77E0EBAA3B4F81D5AED438B32BF815C94772FDDA123EA4BDF29081422CA934A8BEFBA9FAC9
-3EBA6194265AC59FBE0B5BB3BB056E96055A961D5629D0CA88EE0A672B9946542CA1AE83F1BAD5
-BEEC57336E491E8067EF260EB8BDE634E8163D2A263BC815968DF9EB7770486519C13207E3ADA0
-09A7580055D7E04FB72AE364FA5144122CD7A50AAF1870571A0A7F19B52805956C78062B17FB71
-58A3193F7CEEA96A18A05F6AE2ED484820C402BD0DFDFAEA48238E37F428371FEF79A1B93F1F2B
-BC02F2FDAA126D8904E6E4CEEEADD7F6ED036A2E7D1B6F5DA7F598FDCC7AC7BB175DEC45D4FCDC
-4A86E2E3A9A51D00B33945DC7E38771532F3A75B9017AEBE1FDD745356EEB54C1C310EF6C1B85D
-B0D09B0C61BE3AAB080B58E279383D8627966802686283B507143022BA281165BD9955C833B1FC
-69A3A2071A5F5D664A2E7E9DBDC85B64A48684A2DC6EE9913B5633A98F19A546DCA6727361010F
-217E60ACD1946D0D1A2B0A31A6103D8E7438FAF554341192E2B33FC22C57757680B0C44147AA09
-27CB41E464E94E0E0DD8EBED1873F9FDCA312A4ABF1464822DE5E6CA723B8B2F3B23B7368B1DA2
-DADE8C2B58EF71B068BEBA33DED1B278D3B81D8AD44DFBAB72D4AADBCAC1D01FFA901CC3FDC56D
-DBEF40BDEC4BEAB64916F9CFDF21F5B118433B672BE308267F1A8AAE85EF280834FF8FC6138A2C
-41773FBA3761250AF744BA0686B6BE8DF369748CB2A30EC33448ACB1A704D1BA01C2365FB1207E
-98DEFDCC61CDA54B120A74061F8B3244D12F6B31BEFBE2AC4629E6B8009C8239D427DB2AC9CC5F
-70F54870D58C286C8DCE0DE89B6E2D0B6319AD1A10D91F13C8FE61D7A3B2E1EA19E38F12733BF5
-3732B4F3FC6A8E12FB01C0F03C38F645E81E64E163B4C3E3DB7B6DE0321E78726C0775E3AF0E65
-54B037B3192ABF1D688812BBBD4E643301BFBDFE27DE4C9CED8D9A705C94A22F599CD4AB72D512
-423B3D4396B42C901C42B958C46882672449440F0C78BB33236860770B96008D7863D374D05C79
-B221B20329064613A7B7FE1828E5A80EC45C64EB08563574F992B5673E53456CA3E8D4FDB81E15
-6A83869BA95C8A6E8EAB804438EB5BC5B6B73FD493E18E4C95E217B847E422A947D9ADB14FF0D2
-066F4325A50BA07F68802D86D51653B264832B4D6102107FE04994F8DB0464C37F3B0DC87D45AD
-FCBF95B1BB20620F07AE420AA66D7585EE84A3AB73FC8F1E5FAB3CF2FF384DA9669DA91B0132D6
-9BCA7BC21EB7AFD82902CCD9F642849B0AB620A90B3B57554A57C17EEF51A8312F428022D5EBE0
-F23B52C06A7C3F17D4BC56700C6701F2E003BD1343B416AE36CBE6D6D062EACAE4569FD55B59D1
-55EB2E0801D8C8212113A9BB7BA5BF4AE89D434B2B838C911D84540CAE1E2BC95DD28A278F3570
-404D91D3C18BE468E6F54BA6B84D6307A2DD5587DAD230AB2383E6957E9AC1A75EC6DB0835F248
-C9EE480318E1BFB00AB0ECBB1F160300E0B6B2C562D1B856F549275F98FE1480B9409A26BB55DD
-F5E67AEF16288B3F4C9FEA584A8AA61664B73BEE0A62A5D8BABF1844F97F7ABFB73B3CD19025F9
-FE7C089B9630BF55C22DD14849FB3543122CFB669B51533C29F78E51F53C494B2201CD5FDEA488
-F259C54F7912E765360A0D143B59F49B935006066209D11FF9F9541F11AE4F7C70ECC4FF78FE8E
-0205E1F97D90FAAAD7D12E239C009CB97B1AA7F707B7D018F12563CFF65AC2FB14D7EA63901062
-2D5E3D2A74CB8EFBCA34DB240D10C9FC1F2EDCD48CE098AF1FC01C3FB49A27957405DA89307A1E
-A877E1D4B0AFC98CE0235AC2C21D2D73B5DBAC68A0DD0796ACDA76A1928412EEA5053F1E2EC78C
-65D44277C258A9B211ECB8A3D49C34C89ADA99482ADD3FCF5AC7495AC483F92CC8074AF6B57972
-6B497D5A437E7D37B4CC7913FE23047D886152C041AE3B5D70063649C8AA7335AD3BFC105B9140
-C5C4BEF7DDA3156EB8841A07064AA2A0EA5E7E6828A66CB2284A6D5D4189B6DF9BE74555B881B6
-F826917B2D09DF633FCAFA52B6E3A8B0E670623AE825A746BB7EA9EF3F52EE05F0A7E870A61401
-96D50B0FE206436714B74DC7B3673D9356F885DAA7F79A73676912B84579F0F4978F327CCBE063
-D09D22DB01222AFB4434045C90A17D0B526657958070F7A6AB555961DB6D78F479331E37305D5A
-2072AE199C9C31B12DD61D10E31889E6DE5BFDBB51C90548BF7F501BD33DD33B5F679F8E846007
-BE09C39050AAF03464A57CA70FD083E2EDC2BAF5DD3E0CB375DD3A2782898273518D7AE09B5AFE
-27F2560FD76891282F7B68909C6FB9F549AB9B4E664CA259E0652E66CC58C250D285FD2535660D
-7C9F4EDCFD874F4AFDC67D1B909E0576D159DE69FBB4DA307FE37CCB01E7B7C6682872FAFFD590
-2F31BAC68E68CB3A03BB824B5F35616EC0EB43427BE7B3976906B6E72F9D70B8D69758D4D4ED1B
-D9AB405B0E9E32400EB6C5E7FB006997D5AC5265FB5571DE4D1E3E3123A725F37153C874439407
-8D1786B9C246339903DF1855649FF1B97C919A818A3C986AEF298F2C901F47C44E726BCDD16ADA
-2DE467F348F273364242E82E6C702C771B8B0612380BBDBE29760F190EA7EF8F1C2B9991B701DC
-2D1838AA8282856F3EFCEA274718A393B129C768D50D71B5849ECA68CB1316FA6D1B83CA9FFBAE
-C468178396258E077393F0EA6EFD239C554A72252290EC1CED243062B1C421473185D4E07FFBA4
-11A2AA16A0A64AA3550F97D778BD7FDA6962BDA0BD96F359ECEEDDA3506249FD0795EAD1B4A8D7
-68BFA198955F360BD1F57ED9D936E1A765EB2A13FD7392874D1AFB461600D077BEA83175F7BC4D
-732334CE6F0C8556414C35E3A8F2626ECD852399DFB783520F91807822F34BF1C99AC5A89594E5
-5CE25CA47D9AB411D74C489842C85109C12AB25B0105F6D816CD963AB532323F9239CB3861BA22
-B11139F35A4E9B843D2D9B832DC81CEBBB06405B0F6F19832E97EBD56B58739C83D2B015CED279
-276C9EAC0C1D92B10986ACB410A46D0C3BD16B34B4A48C8E2D5E47461959DB03D0F2D76A375535
-AE8818EAEDEC1EEAD181B1930C5828751FD1002A18087A03D2874E20EB7C49A02901C92973C235
-0901DBD7F2965BB17ED78F3CD12568AF15BF04C9D366380DC3C184A97E4A72E9F8CC02CFB7EE7F
-4956CA929A6E32AA2B2807AF372894AF2E9C37A372F51D9E45E68601FF6F06524210F0567B779C
-976618A30B59D269B808741DDA7B003659072374691101D3D09D505C60ACBAF7C122BF8FD6EAD5
-7328E60B69168080719B6DBFBE65A31C27FA3C456F3CFF4BECD6B32048CB20BE477BFD3371A014
-0C22AEFE9B13B0C7189ABFB43699E43E5B2D4AD7316012F759EE6CD498284C81AA5ABA819CF9F4
-C833C7F62B2AE7794FE888F0CE0F0D7FA21A6C6A8CDB1AAD802FE6D85777ADB6DC1CC95587F2FD
-A84AC265A1849F66873F14BE84753C499562579F2361751FB7AC809107F02CD3D953E47EEFEEDD
-38178FDA90A2FD01B7FAE52395B970AB7B4F923175FAE29828CFDD824E21CE9FCCBDB9DF984B1B
-F640D8995C1D32DC65AF28A899C5E97B828885704E68A0EAF6058191C1F6D7C6687F2019DE8A4F
-B5F65A0469BD823E77E6EF6DF177517AC774DFE568923C474C9E7C5FCEAA7EC1241960093ADC9F
-3ECEFA7B3344F5E064B8FF023E9E1DC18566CB1FF960DFBE470F4222210C5A41EC3E8D4C56CF9C
-B99E68CFB0A26D9D698DBBE95D407FBC77F9AB3E33B94DDD2299CBE40B0F208672AAFBC36ABF07
-F39ECEECE3A2AE0EDA34A78CB38993668B60909FF1A9FB10EE7416D9A16A7711B76B7BA03D010D
-AE04581FE01A379536E4A7C913B741E8A6135B6398300B22B8E07D3B14A93BA76195AC03A1EB1F
-E0FE1DCCCD048D16294F365178FA853BF76E7B92207DF27A4D1EE5873C9A40EBB42E18CB7DE812
-1BA54A479EC96A727EE581DE55F46F536CD947FED706B0C2CBCB2ED4C2399FC8D4B649CA5CB8DD
-6B3D8AD64D6BB395D945E133E24BA57377E4B82B77C729AC7D5EE9153B2E0C1AF4014CDA86476F
-EAF1E56B7D86421814071886EE30DD8E6EF3F31B0B179367F745A5291CC6300A535E82912E84B5
-27A283DD1363C8D6B52CB2FC2FEE59D9509395A38A46F235A1B433843A87C2F07A66BC120066AE
-CD6BC0936806051001BEED1A1359E626D77A9782412197DE172BA23D071E930D13E0DBCF59C3E6
-7967829F6C90B500D2D76AE3FB5E6C9240EEE88AFDE5F2CCB04B036B7C9FAAF679E65C8CC7C013
-339B56BE285D5F985408DAC02AEF10A865ED1FD34CFC03F087C175509B2EEFB3744C580B31B097
-328F360E99A480FBD7A877DDBE758E65749A753ED8801F6450488BB80C5303B05011EF5C6820F5
-008B71DA3E62761B559843C59ABB7E95E413688C40903538F452430B65BC1B9CFDC77051BAAE60
-9C413E0370E64B57C59E7E02B7B07768DA84326221C61E8ADC0B8F7E3B3F02897330F8397BA319
-94A075119999893505F5B665A93498E98C78EFA8AB7B267B99C7E070CE2D26929052498BE336BC
-EE7A81FD448572E302D1779B413A8AAAFC1D005461E3DD63B64ED694CEA82CA9618421FF465B84
-69739A5F2BDD2F80FDCC64A2A6B77B164E8F0490A3FE7197971C0E27BD1459C7CB756B5A3460DB
-F914C8736D7FD74A4371741F670840C7C154D70EBABB2B040DC864483CBA1AE8B630F38699BE8C
-0316BF5E25E81ACE6482B084E70F000D6121F280437EA0E43B3F14B5052A61BF06C3974E753FF7
-557E11F70D70FE2965238AF15DE3A4A9684271358E81347ACDE824480D51006211840661D48E0B
-758662086C5688065A7C5C03217124073495E3E7FED72383FCB8AA246F29739D3A83DAAF8CB964
-A023DFD131F022123BFCC782CC237CD7C8C0611AE1D8FD8CC15211FAEE13D69487F99695FC32FA
-2D2D0EEFA3671F58BE5A10517F787FFBA050B9410D0DE4E4AC2F671A23F1A3730F9E53CE1F073F
-F6D824FD4B742B8509CEC73A8BC3D7901981E5C4606E5DF31CC4208235FA0B0ED784D1B47172F5
-B8BE1AE460FE145F3DAD2835161C29694D087487DB7A23F81A21862609E7567CD922BC4390EB1A
-698F0719AB66EA001E88F9717765164FF582E75B934CF66EBC1921A00DFE652940500C4C58B89D
-B6A3485AD807B9053424966833847B9D9BB309530A81E1EA8180253E108E84EE70FFFE81880870
-EF69908DF92A48030BF62403067494C09D98A896240E848E3DC408FC45D237679F8C715BE9C031
-317DB88A8C1E3985580BEE4B9C1D2094CBB62FE6A5D6C5A37C38F80A410D267D2D0BD502F61C89
-E937C67F142AE87FDB1353CDF29106F432F9DA2410F69BC1B2A9F2F6E56F3BED2C37BAAC4A95BE
-7746A98BD9ADF3F42E81B77C72ABA739195A18852145964A18EEE242F1DB858FB978AEDDEDB5A0
-C735F127E6F26B414672D727FD01754D1F4E6F1F763F6F14380D83BF01BFC4E525A510579C5AB7
-3040F7EFB1BA7E0AF11D81483E295C467F57600D9CEB1C9036513A51DD2D23FE5B461B9A6118F6
-8B506BDD1357FDDB254DCBD2F288B4DE89C305E02B654EF11AA0A8DE529B093BDF75BBF495A574
-FE2273C98036E3D990956C3FB832D8A52E848645F1F3703A907BDFE522A0E40A46F62C661C0B75
-E9266C9DADD811EC8ED6D6751F1DFE4E327CDCB0B3962C6A2B6D5AA780A0FDE819C1870111F788
-018DD53F1A7728B430EAF1D959B3E1A51AF26CCFD26EAE9C4083AAAB283D1BDF94DBFE17255B53
-2EAAFE1A0B9FB9535C3A7612CED818685447D04AD983C299BE0FF10121CB167244AF833BFA84A5
-5853718D75FD51F83EEBB99840701579C8565588C0FB4291B9B5CDDF19AF7B1C6793D74B0DC80E
-468AB356715265055050F4AB55567C69BAFDD7E617E935BF6682F9E2C4CC243244CC2472670174
-6BA3E743A9603C43095BB8E6D98600717D452C5DADB237036889C9778F7BB8BB16D6C27B9D8447
-8E6905B517BBF627455CC21A52452D4D97BCE4CC389922DED1E950C66F833CA1EC4B135CA504A1
-F120995338D0C3A9A81BFC81D63FF9E6C53E4EF6A07C511214F5E4D7BB9DD6032454542AB649F7
-6FF1DA38FFF98F9D104F5E038C2074C2C4D972CF84D813C5D5136AFD204D10CBF2B5865040C03B
-1889ADFD00C8AE361254856476B81FF8704C94D6EDCE7E9C644AD69791D51978F1E18F7D43F320
-00F61B06835233F9EC73AA1EFBB134583C0B2DE39837A5A3B652829CE3E3C4FC29C17C37925658
-CAEEF53D597C675E609C19CB59A05224F47C77D799A7EC5BE0F8EE94271AB4E0B2C55737FE5E35
-6927DFAF2E79F815C2FCB98C194F27612684E4C335B8A95FD79EA9A5C59FCB761A0D85C3D1FE24
-1863FADCB7B832FFF9B3B892A1EE1F00BCBB5242035E40D678F8552AB46105370B5DDC49D30FF1
-E38C3878102499EA9789A5E17670117CD4448E5A04DA68E66705C1B5EFC74B50AB556700834255
-29029CA07D645BEF30A0B14E17398D5BF4FE90A819EA00B07FBDC8454F90220386799C89D3F556
-BD6B0DF31CE7EB6D637BAC5ECEF42D4CBE437CA8C3E9750CFD597CD5A66119AE45DE3418702EB4
-7CD7ECC900E2183E0D3C9C139B8A7551B9D5BDBB4AB17EED765D1CABFA4B3F5134378B30FDF696
-FE060B6D823A7F6D35B866527610B29B5E69D5711FC834E2C60C11857888EBE2AA9DCDB985AD5E
-44007AEB89E11DA08F666B0494ABBEE4C0348692A6A9902BB7E4D1474E48A410928D2155986968
-2B48BAAC10090F2F8585D46BB13612220241763766433A7F23599A462C5E39AEB8DB71299DC8EF
-A268EE3B0B8A522B5A08619483AAD6A04CF107E268DA6751AB04954241CAB87F679FCB04140D1A
-7B4E6EB6A75B76525A86A1E527CE56C546E6DE3F6C42C171537C8C86B046AFA338AA9A76C97FB1
-E7BFB161FA57EE38B3A75C23FDC4B49BBA3C34E3490A0A040E5569E2456AE40D28946784408E6F
-1C75D8BF81319E3D3A946B2867E884B58DCC97F846674AC93F2570126480A0932D1CC3DCB94EC6
-E91AE1DC4C442A56B15BFC0B22AE5E86A403CB8A2E7EAAAC996DA8F8DA5F7D145830C06A7B50E9
-913A8DAF63D596871C232EBAABFD6CBAFC9ADBEDED8C7662EB39BD306A9E38C9CF9F71FD718FAE
-D88B4409E64AFF7B6E07EAD81D3A50712193F9CC234303C55CFDFFB0A3A7829942C4FC55A89697
-79961AC53CF1FB2566A8510AD810989D6CF9067A4D72B20C0EB1E8F440394B71A083F864DEA2B0
-476B807459AEB77D0DC68454F226D04C3D4BEE54C9D1F7F9013A8AE01E37435CB90472F35786E6
-4FBB0771BDB2FCE0AD057F907DEDF18A9D8706A48A288D82A421D126DB42111C7BCA2333C7BA91
-0F79B673AC27DC2B1C0452621F0BC8EAF88C7EDDEE8EA88A31B3BD7AE509D68959102E9FF3CFA3
-CFE81BEDBCCDA6A742C3107D57FDC93D4EFB328C80A5F652B4C5B607A7D3685DA5FDD54F2F0D26
-F2B3D719858E3E902B7FB49E06B1B5DC7A3A3C2CE5DDC471816C739AFE8C5A617F6A109D6D412A
-299B78AF99707A66D58EC406155BF9E1340B0CDC7ECFB4FF1AD3DB0A0D0519FBB5EC6513F98011
-DE0C37C65E97CB7CC6D68C224B1D4AD96EA971270BC9C2306D0FBD61F579DB318289EDCCB6530C
-36834B3960DF38BCD0B7F7239E84A0A64EC64C1C6CCC087AB6858708687C8D008316863917306A
-9ECFBBF7261FCAE77E10AA18112EF3C463CD86A6B8CCBFF9E497C94D142F4441CD30DF0777A115
-6E396EE054B0C30021F3DD9B5CDAEC67564264F3AA2F12A5900F8DAD85542EAE0344B086A6F17D
-28C23FD9CA2FFB0E747B8F7B47AE99469E5AE89BC8D3AF806C37D3EBEE79828CEF262293650372
-83C96428B1A468653C1EC96A31FDE279681371C263AB5A18F0EA86E47111EF072C72AECAC25841
-3FD8E828F5CA38CC3FFFB847148C68DCCA9051CCC5A971C83F30987B874C66424FB910B5588196
-2671960A7A95A0D535D007980A56E5AB2A2CD05E994B2C71556F38964161D4965275E6712338C6
-14D4846FD86BFFAB7AE8D2BE1C58C259D46F7CD47DB33135B37E2CFFA757C976F8617B6BB007B4
-EC39B277958616DAD13C0C9FEFF88F4B0AE1DAF877D71081474DFA48F6F2577340A85EF71C4CD6
-8665D355229E84E308D762243BC0ED385F18AC14EB66FD31AB6F24FD75609F389B07C02FAA2F37
-6A8897C2869F0B4CF1607DE38FD41CFF171B0D4B39CE2A28B2C395A7FCE3E04F0D7AE6F0BB5D23
-9E620DDE79B2CFD5BDCB5540BBF3D2F7C5ABB1F4C376DB2D16BE823DEC48F64BF928EB89F1DFFB
-22845BF97740C01D56B321312F26CE890CFF8985D163F406268AE4318B103125089319287FB192
-3F9FAA877DC3ED863861ADCFCDAE7618FAFFAB358111DE8420A5B6E59CE6A1B487A5EDB28FA813
-6FC573077B8F36FB0017E3119B56023B2E0E0F28F4423C11A264B9BEA5E6446AF7E9099B14FECD
-B29A0F8884A8828087A60CFB69FBF6334C5C6E9D754EDD403BFE0075961AFF6E9745A047F6710E
-4D94E2C43318E6ED0AA680B707C768588A6716660CB66352C8F6E4B8009BB761611D755E72234B
-45BD35D84F57559441A571399830CE485008C2CD35C2F50BE38DE7443FE1862756E6577626E13F
-38B0CFB5E904C6A5117E36A7AEA41A0BDACC25B0DCA61381AAE1359A98D398B8C04ED3060F9E69
-A81640BEE6D2D97C3003069B763C1A024F476C8215576763F4C8EA61D5182AA3E34B03E814C8AA
-18A950C0F9F5E7212BB0823A697709DA6433E9E0FC8D86FFBCE94D8B0E249A605E4F3B38FC049F
-BBF400E9A320ECBE127AC50CAA9FB1F5AC1207A9E6E7BF44DC94D008709E696711B87EF745E17A
-8D5B38611D83E5E26D8720EEDF4AD6455E8794326E3DCCB04167935CB73984C72DCD036B24190F
-2B4FA6896E01B01777DC6032C7017132829FE9B370C49C25620600A999F87F1A7C7790D047D960
-4EC7A0746BFD0D85E02A626D15130921699A33ED39D18634F56FC81402E589E6644D605412E53A
-FB366D5A9977E2204FF7DC949FB7587E76950F0127CEFF8F3CADACD67D3D3B4430E375E80F3E17
-9C31E69D33F2034D62CEF97112A2230A4EAADCA36C7157C4894245C6D60753AAACEA6149F5646D
-BEA6DF57918E3CE20A184D65C22EF37E6C1C7B61845743CF8C52DE42D1216C22870C0E7AA2F5C1
-81F7A15DDC57020A30AFF8D4F6462B38DA7E72C1E29021F0277235F8A199089B5365E7E67E5B0A
-3FA6C22091BA0E96ECF49D7161D134B7FD1701350FBB2F99B54A51B418B567B5647D7F9AD7B4EE
-5DD670DF8469FC18774E8AB4D6EF4B4F5751CF01220AFA5C3DEFA5CFCC29F7C181B667FB9C8632
-5BF4BAC10AF238AB2D2A744A509427F654F9B85FC908FDDA60B31CC92E837A78D38684C84DF38B
-F014430BC49A304457B2E7D9B739B0902D6BEA0492D6C143B7DCB462BDA7DF0C54C3C76A52E355
-4F3A1749656D1520121948102ADE605E6597936D7CCCA51AB7D80A4DAAA09992B905A491099AC7
-120FEDA88CA561A199CAF3ECD6AEC7B99994A8416EEFBBF9A1BDCEC671A6B3FF8DEC59C9DFD795
-DDB249247B918BE637A204C275D43DB5506EE8DC787525B3E679CCCD3ED43B58096281E2BAB358
-C5303465E46DBEF697B5DD33EF8A648DD7053234A53B179539C455EB9E1A17B72F707FE30CB95D
-0C28911F8643389CC6995C58C6B83C88AFD3C594052F37367882C26A8936A479E426997D89FE0C
-3AB9091E480DAF918BC26A87CAEF7BD1C6582C73F75B85D59B708D9C76F953376341CBAFD20F1C
-8876F6EE538F61283D03FDABB3CB2888C5F3942A670517E8DDC98B6204397038B951E023B4651D
-8E3F19733C8D6610827348881B570571FA359C840568DEDBAFE941B9DC7DAD8C3E1B190606420E
-1DACF3965337C51A6BEAF2F2E5EC60CDF839E2DEC9B130C23BEE9F65B46626D20273A3A5BD39E3
-BB247B1DE1CF9295C409B91AF47B38D47200E0DCD317B4DE3ACD751E967AAF9DA7F6C026D01171
-3EE0F875EFD7B31B73ACD66C6B95948492B54A7B9865B3F32DD722913F3D9EFB40E4F03FF9E928
-AAE3AC1C4F239DD88BAD50A2BB442D1A0661B3F47CE2BCCF1A76A8604C7910873BDE2C2EFB4112
-60C98C75198EDF5846EF6EBC1BF94250D34F646A43D00E3A42ACC4E3E1A44A2B0B7FD74003C61F
-00ABC9114B6936A50C67544EF62FFB2F19CD1E5AC55EAEE547C46ED91A13C76025AA7AE95E0B0C
-4D2408E53D7EC48409D21B2DEBB04C7121487C50AC7FA8790A2ED577A9AB6E4063F1DB7BDC77BB
-4542EC15573C3F2E3CB767DE52DE2DCCE04F38A58F06F08F0A541A98D3538CB41AA5DAB04538DC
-EAD1BD6B41C71542ECD834F82184A7F51A4B50B595E50E04A5234094049F10A1E91BCA8C2F7BFA
-AB638BBADF6DD02D49B2CC406E9FD40B734BA772A0429BD99CCD01F112E1EE95CB7E9F48D5A9BA
-584636A03B52F94FBC0724A1ED0E5E0520E5BAA4301773EB98709AB035AF28D615230D3EE0DEDF
-CD33056CE8C22A1FC8B7B3C2256BF7B7C7C8D1CD669AB358E57A1F6A400D18FA59FD5DEB0C2601
-02C59112216BC6E8C0817EB5BE3420BA0C2A4363021E57FF83F09B5026526B949BFA3342A70DC8
-81DD588833BEA53E06D29254B4802018B002B06B63374A6C6F335562479D0347DC7C14E2E3872B
-4C4C55E198EA28B35A3B94CFA88DD3F52C3C192475B6C8B6968B49D2FB1623855E1D166294E1EA
-C8337B3DF9B1B3F28114286FA24C7A56731F05417C40872DF09C55C3E81D93C4DD017BAC9A2CB7
-4ABD13E9622D3C533EC60B4A6C03E253A3E586D831D70E47501A1B521E2DA5D67BB1949503CBC1
-693D693925130928BAEC639F80DB420DF10C8553385E79FF75D8BD970041474757184020FA03C7
-97ECE10C8B54E3AC56F330144F2253B816441D75D0EA55D7342E7CD74B3B5311896B43F4BD1DD3
-82A6A8A0C3799DF24BE4D658E6AA2AAC51215C3495A79CA323927A69034959CB01D5978EE1DA9F
-B298845A4A2B40EFDF7B85996094756C99DDA3C835EAC39826C048FFD5C5C582D8698188048254
-66387EC1CB16BC506533D624BF2333CA56C37295BBD41EA5C87DAEC80C3687C37BC3E514BCE48F
-B4AFE9BB5B16E36321B1C0A29A423AD9ADF15718BC946D720AF5C20C1922A68DA0F36838D02DBF
-7CF4D017BD2CBB96AB1B54BC8B75130109AB57CE4E13712CFB4FF099CBE8282C07D3C614179433
-B263696E7E3E4543E489A9BBDE0AEDE6EC0F1723214AC0C1C8F662DC05586E7564D405DDEA9BB0
-9D727AF5E75D7A5F970FB410E1DAD52BB13E79FBFD73340150E2FA08EBA94C59100D7CC76BE3DC
-5AF4C5811E175E4DA3C857320593C5E38D66E565F1C06FCFE9A1B8C885A01EC3021D4A2E6A7AEC
-24CF832A6E731732835FC0B67E4D726D8F22FBECE5AA64EF972407DB407EC9F9876AAFF2FCAC35
-4BAFE47FF75F06A17D2FC0B05A29ED963C73F0461AA599E0051E47F5854C974724A5A53B738908
-24D0B458A299A994807596DCEF07A1E40C5FE7557E9499D6BFF774B7916F04D584B818F0DA128A
-FF856B494385F9A9B2AEDC4680A6F972E2544CA24E95273D394FD5BE8D9083F9EA81A8FBF44EE2
-94771767D6FAE60617B8997417EC6BC796EB0209E6B8D878DACA641EC329B0AF94E303A0AD611D
-5E2C2C8C900857730D1EF11E218DF7F0EACF7E55F10B5F7C56E6AF414B060453C0EBE48118B964
-56D38C8A923F42AC5797F13C86955F7C1FFE29881AB82449377F3C8E9E08967B6F66FE925E9B7D
-474CF80BF4F9A24E41583484A0AEDB8EDB0075DD3B7569E3261A1706F8A95C6621C61EA99DC672
-7BF50CA75E34A612D004C7CB81941AA450FB826EF9A51AF8D3FA17DF1A184CEFAE33F9C7E63BD7
-04527954200FE436220F2CACF234BB088B5DEFB52B2449238C0875D395F8E22FEAEF096EDBF392
-AFD6FF6C07ED04288FB73C401E29AFC2A76D4C3D02C4F48955A8F32D323857333ABDF3022BAEA0
-AE6E4531C18ACF750416C54C834D25E246333C13456F2B866B958B929ABB8E497917622365B5E3
-86FF235574876767588CB24A8C06FE0D495AA32835CC6365A481788EA24972FB8BE12659ACD8F2
-287C231396647371351498647CEE9F62C2670E8EF48788530BB5B006D93A29CD4A2E354D2C85AA
-0AB2C800AAFC81F24C80A58C6FBBB89A887260D00C59EF402176C80DB3CF44B0A281BC6042BDC3
-3AEE88AD8A57674F65290386C73193346082F9477EB04A921B3EE960349BDAB9E5326B5C57E223
-527B1A3173183393ADF86267F127B52C49320B6ED36285E8ADAD07C0C91E479373698E709A1870
-C3B9F6655DF4E5B96E92D0E2F2A15C5D6F3D88ACAF6F95E9BCC52241799EB711DCE15A68DD5244
-6E832F500873B045AABAB816EB68FAA75E0E18B5F32002F283D6BE121582758CA59A65CA43C28A
-68BB9E407E8F767152A35E8A90E6A6DEECBEFEFA2CE779BCCB97862240FA72B92C2E3428294DC5
-4AD4F7C6611E2D6B25DB3EB4995E894D5A17863D4C88304E77EF696633AE6F224342D391F7E3D8
-2FDC24E2887F43F4834EBEC3F2B32AD1339995822553AC68FDA951DB4BC95B0355A996113E4800
-8A387EB8CDDA0C4D0B2409BF9CEE2B37E1F6F4B55E9BE2096B8DB5A617F1CFE12BF91A21BAC921
-453E42E4DD5ECB5A479078FF8688BCFF56A4CD5047ABE1BB4D3EAA9FA03CD48FB4A283FCE6FFF1
-1885DAE6AFBF1C72E8399988C0EE6010DC41DD596530FA76EAE5662CFFA35146A75E55444049DF
-1B20C6A99D838B6F8C411BA022D50ACC847EF94E52908E83B6293E719C43E2C42C953A7EB1395F
-D52AA1B6E66F7764B77CA3ED37C606EFB9317CD27929413345C76AEA4619C08A4A00EF770200B2
-6BE73815970961AF7F2F7914B64F84A1BD43F9D186ECEA8656B8EBDCC7EFA35AD35D5EBAB0CA02
-A199BF3F7514478D89EBA07B282F00B55BEA90D4E8543FEA7E6D489944054880B09EADA41DB4DB
-0659B8D96CED67C8A7C18DD5C41C50D8149E85A90CC1787E86375ECC386369420DE75AB44AEBC8
-A1D034DC8045479389E231882BE69C17EE57EABE00848F12D404E0C44340E21FCDA95E7A7515D6
-F606C600A488337B4FE30FDE40B19F3294A8102DBF57109F494C2459E9325766DC71375C418B11
-4B00620BB7E2B38CEFA679010069DB5C6B4CEB7D31716AC05E0AB8C411C89918A19F89578D7BC5
-10CA86BA996F4263D2B7C98AB5C8ADE8E7D5B96D467EA484958C8B514E175741AF715187F0E807
-B9C5B19B632BB42B745187681714526877EBFB568B3133F4C86EC3DE0C6D7DAE1660F1E1044521
-CEDE6B8ED3B03C16031A7DFC67C32C87FA83A5E29898375A5A5C3F208BB3CA718AD06D0E7BF2D1
-07E7F67DC639C5D956B79FB22BDC372846646F60760855A4F9F135F6CB1BB0EFEED0033B09FCF3
-A34E1AA76560F361157E0C2A1675BD94E0BDD1C7293E7699516A1304CD3A0DA5646ACCC954856B
-3A62D38EA879EB0B0726447D0E198535124551BF6F9821054D8B845C441A9C2481E1AC3E542AAA
-553691D7D6E4B303859A5086A7ADE18106F174745F38F6E3182F9260FE9E9C19EEF45359D6B9DF
-DD0031D1F87DA89151B1BE4AF54B6670EBD558BB318F2184ECEE9152ACA35E099940F094AA2AC7
-564835E69E5C9C47DC7D9625ACB1D4243FF1D993CF854639C126DD8CE21A0224119ACA731346A6
-4AC8C18AA22FB1A1968B0A6B05CF3A1D5B24D3EAA7C8D2376D422902643D3FAB3F8E7DC8B24161
-3DBABB170238A1A19B4C8A4703E2B0A2A033E71723F557C314DB42B159E784B1822BE1F990D167
-0E522B9FB1B3A602B10AE08A8E7E3B2CFE51236D76B744456E5A68995294758A42F1004E8863CA
-0D3AE455ECAD13501669A1DB41F7E853BB1531A4B949AA5BF0A5E478A5705D5EE45104760C727A
-068E7057A808DDA30CFBC03157E141AC5E9E0A315967C2117EEDB38F9C66A34E138B29E3DE6A03
-C34D0A37740DD04EF8F9D08E545FDEBC571043A02165E6086389DC7BA3BFFA52D94BD4C1A27B85
-9B8ECC67994EBD370270B5998B8F246EA4FE0EA6963AE3E3398845A62856068A8A878B6F894A7D
-28041BD30CF4F0BBB5053AA7DD86A2B94F3794C78F615C669274629F392FB2D320BB82EDA9845A
-66B0EF0384985B938FE8A3F47B00C2DC575949B8B932F3AF423E17F72BC3BB9B63A81945CA133B
-CDA5EBC9CB8B8B969ADB5CE60CA6F746C63DA5C516DB410F86DBF878902E753A338D3FB08C60E9
-41AC304DD767BF47D49BA7FBA110398BE21E0F9F01B6DF4CD3256A7803E5BA935DD6CDE11750D5
-DEE0607C14A9A4DD037B685F830094C5BACD2283D5854F5360ECC924108F4C129176AF6E624458
-BAC41E0436912CC5281EA94AF791219F1D04CA3069F30B50AE79BD8B8576B9AB76E6033787CE32
-3BD25240C00FA03FAA253BD83EFB8FECD2DC45C1FD7CC194FB61CBBEC88047CE8AEDDBD920666B
-C2676E21A3919986FD56AF5440280E7083F04987F0272BEECF8F3B5261007203702C9F82B640AD
-2E6ECF9D0BA81E5DAA95688D654873DC9177A2E7162DD21A7B40CB3C85AB49469ABF8F133F808B
-3C2DA2A5008E25A13A6D0E49FCFFC0C8D3E5A257A8C8D6B1124D7017CC0263CD94F50D32DAE125
-C66A0AA717839BDAFBE889083C01D5E41994B7CD52E63A5FBD4D89631A93B377040DAE99C5BDBF
-68C2142FFF3F2B53DD5E182FF6AD34A0BF6DF19F58E0584501239815495DAD144DCE748744899A
-656000E283A237E74ED58E2452F1B6E73A2DC626C3E52155036822984E5E72C667C2E3D790FFAB
-5C0A4AAE0325872AE9488437762F4C70BC0A369C091EAB8A3E8F404464B99D26D6C35B042E10D8
-97E029A10443074CF73949EAD0DCB7E0B8D39BF3806F39D3E3C204527C17198F21FC76FA5ABD6A
-BAFB21C942146413F03E0CDE247A8CCD7C726E993976F2D730E43054229A45C0FEC09DBCCA98FE
-C2C49B2C6B015D34881254CF11246521D785DA12C48A4731C3AF1353F99B0DB96953F5E42B3C37
-EA460876FD7EB036F7BC5D8630354CA18901C561A46A9E201C30E62F23F3F7B0DDDFF596E13D7E
-00D256E6833495BAFDE723AF59E70D841B5028261FAC723AE4E37ADACB02772DFD6321FEB65729
-D65CCD58B312FA68843ACFAB7EDD78D31ADDB734B647E87C7CE25A0436A0D49499FA272FCC88F2
-E0CE5D7382D8CBF7930467AA3C2B1BF67E683573DEB3EB57D9EEA5E185786DC9721A4B95ACF32F
-09D5AD2C06629198D15A74FD41D8972E1FD77CB71A933D235E37E893E0A4DE1D50717E125365A9
-CBC2B8291D7375AE2340833939BB0F139FA392F293472766A2ED405095BD990660CC6F40954E96
-71F9557D584266C6F3BF41F4FF6E0BB7ABEB272AF99D0A4438BDB4AF6789B90431B7DEDCCB0D5E
-35BF872600670B0F15C19F34BCBFC59C4A2BE3978F6A184DB4A4745B401BACB8C77DB62D3ABB85
-FDA212912325C55C5A6D33A24D76C7BF72A6A710DAA7392A7F7CB0A6339505AC935D346C9B5E2D
-D2E85608392B3A25237337EC8F5856BF3F3ED6E1514053F4FACD12A94DAFD1C12249A67E3F0805
-08CBE6916B2DF3D9478C737A141AF7C54E8832DE822817364EF3609658C65923ED666D86380B99
-ADF7EA02C9DAE111DCF399878CEA60F5D5B7C18D244AE76D6B978BA17DDB71D3DFC12252202B39
-6B03E36E376A54E1305A00D074419A8D04D53C3DA828A36C8F40C439CD7D58A48962E7BE992A9A
-A82EC8537B268AA13FD1B88275D87BF0244D7B61533B16730BB9EFA643A5B96C4E9C10755A85A4
-F4C71AC4C3DDD308DFFA066162B8B7F75F7BEC8DA40C5194B759736381349A621C407A34B9088E
-9EBE34650582CD758E269847328AC43EB79B5725FD7E516B8A974289D8C5BE90C301323DEEFCC0
-A18AF6632AA8B80C8D188CEC275A93F68CF87FB7C6C19BFF2C0703CFD15ECCA16160ACD6E3E16B
-00FBC27616CE003FF9A60569634DF6D43997A4DC23AFAA8C2CE9C446B673581FE9F30A9A2323E4
-C28C7C9FBA27A3B5EAFCCA82D85B05CDB6B39A7C6B3584F48F4E3A1F013ADE47023830E47ED8C9
-5CFF3F648C38BEA1AF9135E16C87A42311995E09E7FB51F06A87102BFA8263C32067B26B0941C8
-4F2F62035D58E9153D89D808AB71545A1BADAD1817D0DC2836C6204A0A0418A2D62EFC2FAA63C7
-A9D0A5CDAA5F0E491269B127B5C716C3D5CEE6BAE7FD8C4F86C0632AE757AEA55F15CC0F95D7CC
-C41EE9B1AD9349C4F81F0998ED10B1F686272E373860AC2EBB986C2558DE989DFAD95DBBF9EB54
-56384A0078C133E91AC9CF5365A1E733834B0701B4FE43964517F0AA1C011BB6A7029F8D5A2333
-B67DA3E019F0D8D7D533AD3291C2CBB1EE920E953128D06BBC517C518AE9A2DD49B933E915AEED
-9810C619035ABF9DC147F653ADB1268169002E032A42501200A685D19070F12F9137BB1D9F2A8A
-45C5B52F5577305AF94D9C511E5E82AC67A22164833471CBB8668DDC88D9C500917183C5E14A82
-F1D9A0AA3DF2D7BE4DE844BEDE55700A2478E121555C7F6529FFBB052026C80776B447F1F5BE0E
-85AAF2CF09BA3B0917252D68D671005D0FA328BD225553D98F2C476E080BE8E03AF4A7651563FB
-FE08C230F3A956F2FAF7ABF868C08CE33A7FEADBB8E6D6AF38A821CCD8B4EFFC02FE23A37C691F
-6927D45F5710DD5FAC7505FB3A0DC31C766842B482BB77DDB3990346F627E0E1657DA8ABC8EA77
-963D6CB838D9C4E58C943C3A272582B3E63771070A6F62BBE7A4B11B8CB550547E17ED5DE6EE16
-1BD9116CBA0E0EEE910F98948F740E7A5430176722BBCDC4AB66BD3541443B096063C839E53B05
-A55E72235BE223D286C4319FD5A516325C8BD480D1867F2013599844FD2478B3B52542815CE945
-FFC8FBEAAF9B072CB4988253EF70E42A1ED315FE2C7571367E5217ADF3AE4FB67575CF49B1A269
-15E653B5A86E3FAE1C7D04E1AC21CA5D7E7BDBEA0F58C9962B40A168FD7A24B4BF109645481EB1
-18D49BB99B3541756E0DAC0E2327D1FACAED9F7A7693FC1A15A5715F1FD1BFBCA7D232FCF9663F
-B0CB352570A5807D170E5B6C6727F7828F87FDC9D9301A842C53A38C62C804CBD611992B3A1C8E
-C7103E76294F7E6A50916B8CEA82BE5B7EB777AB2E7A8C955414C8C61EA330BD18C741D5EB6E15
-A6DA46B30345F4D56CEA595CC4838BBF99339BCE82582316847513CEF43B7DEAAA17C7F3DB82A1
-3471CE81BF7894721B80F8165BCC3F7601D5D3DF17D2F37C58C5E9D87F3990E838E55E8BFF7087
-BB79A1DFC321602B386F98D1D97CBB07F6D7B06F900A77E4847CCD689B23C277E6476300D4D9CE
-2B5BB5CA2062BFF0EF2BB3D4ABE2A9F990DCF74568D7CDB717E4CDB07B97614508EF34EE901BAB
-B477F75C41B2AAEA8F46B218DD0DE5BD82F1717F96E14ADF8D7366274F3C077681E0CF33ADD953
-8922D539077C56431909EE8C1EFF7467C9A5E215350278534E5A92C6BEC72D4C34D8D13CC545BE
-543BBC371443F2D346737A3C390A0F7E284D9C4669D374839D3ED8A4023F1F99FD93598755005B
-C2A34DFCC4D19CBD422ED4E857D419BE3B9E12E01D0327C51D3589E83325896018C9B0417FD876
-0AEBC5E0DC8367CBAB11B2989F4ECC1AEF87D935722912F180A70DFCE940DE3882A416E29BA14A
-9C86E77380CE464583F385FF16F7FBDB607AA7455DA70CD8A0D9714963BF791D2D5E2E550D10DD
-105F88DAB1BC1F688B1EE8B40151E533B6D56FAC3A4A98BAD8801864709AFF6DFB3D3EED5A532B
-83E91CD8125A7A7AB6668F066AB79683C6A3F129C5ADA9431B06ABF37A724380CEA251D67B5FD2
-B9C97334297B9DB8E85CBCCD13911AF8DC2415D1D8E7804838D3D03F9D143B923F5C5B58E28B74
-8238665065A15A54B43CE96089B8E7DB9069B2B53210F5A03D1ECD2F83E1044AA561AE65683A43
-9FFA3E1FB60C1CB64F32FA71E3FB557DF3CABD87FD2F945EB3C6960228808E1F77B23DF8C7B5B1
-889BB4C2738EE5D607759C33D5D6174194AA9F8F90D969EA3DAE834B381A2E08E5DC9EB540679F
-94D490F773A109D262E08CAE60E2E57690E8CF756F9AC112844CACE02AC96F51231FD83BB9FF70
-102FCFE3DCACC8BF9E99BD7A9C9CD9279B64B3602442624EFFA606326BF96DB9EEDD16A515452A
-7F25ED3E78ACE15FEA2CF9F1D3C6A0541D441A9D94ED9FBE947AF35B70B21CDBC02529C265072C
-99642EDC878D92A7664F37F5D9DC173F6C28F900586C48960241E2932F113984BA534FE2457F45
-16E7FEBC7A7673E8BCD4C8B05A8D9C738164A43DB7F581FAA8724D12035573BE800C032AADB23D
-9A277BEC387E29F201E5F4091A4DAA4792ABFFD65762E6637E355B8834791370DB79FFBAE99108
-92036B5713F64A2875092825616C64C6827BFC60F8C0D1EB0FAF0516348A7846B657C809030112
-1FE3B0F1EB992ABE73F0842A5EE10D6436447471044EB7D9247B169C3F7C37B5109A5E7650ADD1
-16E52C21022FC991756B93D210C65F5B7F67CD38B4863F90D3A1742875DF8E6B24D9E27D726521
-432CBD225E0DF36DC33B8E8BED9FE897E77098832B9156725DC38EE82595481A76D166B37055EE
-84EEF1899D249DE4280F7F15C76C044565949E9E4D438F327E05265E34FAF812E661770658F2F2
-BBBFCC933AEDAE7BE17A40880A153409C357F830F1F847D9111135468D7A36BCB1E69CCFF57E26
-20D97D988669D732A9A4F4ED0B1B6B542D729C9D2FE15DD8584ECD458A1305DC729C47714B6DA0
-33A0D0E221570397F61E67C056F66EF50BE591A6DC3E3246908B8EF4973F76C4403B17175B046D
-230F17B98A217D346F0796A77B6F19B4B0889F09A03B4F7BEF3B241218A85B5C34C4420B87F0E8
-AD942D0A232B66FBBE49D2864F7AC2E5652CCE91C0FA6FAE79971F2D00E972151B61191190F9E6
-9CC7A51B7777AF0EFCAE0B2FBB626235D0B942134A85ED0168D2E0E58654D94BCFAD1D0EAADC00
-11939052259F193324DBA479BF57AFDE05237A08444888F08F9BA119175C776402490DB29FA96E
-B0BDC684CAA8E0CB48ECC0F40A0C8F18E37ED04122007CE4E11E1FF389EBC7DE9F07888EC1DEB9
-A5C083E57830C1D303D03473CF649C83D03B17045F3B74A32458FB96C5856F02B72826B64D4866
-13C7F07D2A3441C71542ECC56D65F2A80B5744608D0DCDC14204BC00ED8EFB67F7C31794011C03
-93C64585EC8B7427B82467EA32A902FA1BDE691FC77CC61952C72F86B2FBA240D9D0CC565D8006
-4B0D9525CE09FBC1F7A6104EA5F5AF9CAC4A1C1892BF78ED5500FB5AFEC29532AE7ED991CEC28D
-F9B076E95C64B91E0D262D4EAFE1C27E244C36B527646652F54C23E3BE59E6A0A2B123BB3101FD
-D91BB2F3B313CA0B00B1132A3886172ADA0A234D805CD95B2D
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-cleartomark
-%%EndProcSet
-%%BeginProcSet: stones.pfa
-11 dict begin
-/FontInfo 10 dict dup begin
-/version (001.002) readonly def
-/Notice (Copyright (c) 1987, 1990, 1992 Adobe Systems Incorporated.  All Rights Reserved.ITC Stone is a registered trademark of International Typeface Corporation.) readonly def
-/FullName (ITC Stone Sans) readonly def
-/FamilyName (ITC Stone Sans) readonly def
-/Weight (Medium) readonly def
-/isFixedPitch false def
-/ItalicAngle 0 def
-/UnderlinePosition -100 def
-/UnderlineThickness 50 def
-end readonly def
-/FontName /StoneSans def
-/Encoding StandardEncoding def
-/PaintType 0 def
-/FontType 1 def
-/FontMatrix [0.001 0 0 0.001 0 0] readonly def
-/UniqueID 38777 def
-/FontBBox{-179 -250 1297 943}readonly def
-currentdict end
-currentfile eexec
-EB7EEB89BB946F143739A83529DE3381F3784CC049D9A232E7E0884F0F277E8C6E6B0C95F5E3CD
-DFEFF2F460CE06E2FC85C687B2452F666493AB6C55A2075C61F4DAFFB054763B9492E624F5E4A3
-8F11E3BC76EDDAA5C228BCD20F1BF2283E8133F07F5AA91BFF96808985D8C1736E8BC758781338
-F12CC618819D476B7674CBF6A7B3F1025A7291C7C074B3055F282498484C6F0FF8F641D0CF6FF8
-8E1ABD832961B8995838C9C0F6BD075924512885439B9369B37ABD9F474BF8646BF9DAD5C5EC17
-79AB8DE82C3D098E6A6637D9B4CC7174ABDDEFBD3180F0E62E1E650CF2DADAA7C7A6B1991EF9C6
-B5046693AFD8B1CEC70D85407027864F714E599DF9E4E6776CF8467214DAB6902ED5B40FAE4244
-82ED45A7BECB26941727281F8E0B3C15EC045133440070AD72736F4D87A96335CCAF8E6AA38229
-8CB7EDA49F963A9E119CB70B9520E5D7AAEDD5498F0ED1C8B3902637E71734A7D7E2412D5EB792
-B7B60BA9355628BEE3DFDA5E93B3026EC2886D40B22685C8E9BE5E38DE31FAB551A978D095C55C
-E3FEC4D6ED65C708F3676F4CE5F83F614C02C8F109F1A7FE93C6030D303227AF0EF843C45F15B2
-2797852CFEA26D79AE2934E8B683732B306F9125ADAA1A802C8B82605D7395D0F22C77CD1B20E2
-02BC082015E293C8F1D8D78A0E4565540371EB3B51256BA7276B2FABA2CDF47D34C445D0255A4B
-23A88CB443B997813EACEBFF51F5B8C9B1B8EC5968A18CA26BDAE2F00AE034DDBE4DDD598ECE60
-52A9BAEC420FE278B08F64BEF1069BD1FD4AB8B2A13ED3DDCFF8076501BC8A0156715EC132F636
-711EE9D0D8C89C932EE5D16F8096A9C456DCE7F59517F85FA409B6110DFC22A2391A005492BFF0
-C8610A9204D39AEE51271D355CE201A5719842112C88632AFB097C368EAB897DC1957B02962E2B
-3E4732F6527C25BC76AC043B7300CB153F6971C0335FD3C6AE5AF7C5DA5621D03FAEFD3B8ADB98
-8272C6380708210BF140809E4A191193F3547B2E4D43D4E981F7140B94473B939BE458E3B69B89
-33ADBB82DA80BA01B2FF9878BE938D7E1E4A6E79B21C0B53EE510D6377E178E8E3556125E44D97
-32ECF7A7C591AD28B9C651629CC5A56BF611E2C2199DEC57D61C099E5DCEF5527B9B2299FA64DF
-B3410193B77CF603A073D0785E1BA9CB1E3F0AB8859A87278769BB6FCB0C01EBCB40F80BEEC4EE
-0283CB480E2B31863C2128ED5AA95944ED748805F9BBC70FA79F7A40C175F8A655C11C01FA9C2B
-9E0A6A8FE5AF5D6E342ED1504BC332EA0F1788081808AB8A493A078AECABABB7D0D7183AD0ABD6
-576119456D0B50B0AC6C6C3DDD44C64D4D11A76D2C3F5FC53E626B12E92D22B757E89749A1CE26
-2C81F7646D9F24EE0350C309C0D9A65D134FBD216D3ECEB54845BE6FA7D67E2DD6B1F1262AEEF0
-A134A6E639A2E3A6C8110004057BF9DA48728F50D486160122FB7DE6587D432589600363CB7620
-728E10405C9B5CD7520F43F6472F4CF71FDF8CD95E78950422DEA82BBAD2A37EFC01B77C2960ED
-9A6F213334183C34B5BC8F905BF35CA1604F593F1939B7582423B19864F33C720DE6D3B23B3D80
-674761CA59B1561F6094E433714EDB17523D29307950FE67B11FDE2AC1E48303DBFEF06EF1B00B
-57201D7C78CA9EC0797600215132ABC35FC81840920A311E8C7B3B191C20F76D668D0838E5A2BD
-713D8FEAB68CEAC365AFEB987480C5A742B3F85D2C6B3DDC46E2BC1C27B316F6C2E94489E6D6A8
-90A8C22B71A74B897210E143BFD17EFF558BB67EFD214F69BBA2A346AF95338409318A9C95D8F7
-76749854A7CC4AEF404CE41529C318C2165E2820DBA6B20E6C42318396522FAB8027289A93B316
-9FC3ECEAD61D09953D206A81630BF18B6F11E28C748F71B5FD105F913BE26FCE927F0611C7D202
-AABA714B47B754E8E8ACA58CFD7421C5B8793C83236D375EF5EC59BC71B5A63C2D4FD01AB72064
-634A3592BF1214E192F52389F6AB4A89DC4CBC1A9F4B267A0BCB6137487F813EEA0C6310CEECD7
-DAB781A8C18E08A1B20BD2CDF58DC72C9D57EC472254ABFB157EE54C969150DD97A30EC7A78B9C
-F8C163FA6185B1E399CFD0B9316B70FC11A152F71DC4B9C902BD05F1AA7A655ECB1E69FFBF7CED
-71B6640AA8C529AF822FD4D173CACF66DB19F35ABA3AEBCDDCEEEA061B06011553B86A129187F9
-26D18FD644660001C7C1EBB02C3344EF0E88F93ADC8F334EC4ABD15D45C33221A5BBEEC48A3213
-2BEC257F4A154E2B0401454138B8348C9B52789E1ECB5C01F7E8B0EAB2AF39B81FF4A7A0699643
-267D78C1B794243AE7E4A5E5972D2653BE8529FF3ADE15B8D2D9CEDB5B127E8EADD74D2E45FB4B
-4704B2BC7DC6B900A66B5F19F4A92DF92D3433A7104B869E31EED01101DAF9AD5E424A855CBD2A
-9F24042AEF767196166674AEA9B4D8B871F84EA776ECDF5F981AEBB58D139B33F188AB2A99B816
-1EFF8D88E6A57C45956E7ECDFAD1D35D6F51B3BD62F69E15FEA564355A05563A133DAE3E8251AD
-6BBE5C2E59CD006D8F87A51BCE072BC40098DE0BDC3078C1705CA2B52C7A3629762F5997C62EB7
-92AD52E5F51A035A947110B41DAF2C3D40F45E5C7CDE09B53880B161590B706DAFD3A98436F82E
-78E7F7C0DFCB6804B719EF0AE76637C38D02F8075DC63FD48D85AA8D6598DA1D489BDA2BD9137B
-56EFB6BB37221F73DE7BBF07A1E6D4657AC56EE2BCA53565ABB572C84A0D023AC945681EEE5B8F
-56679E554B713EF277D843CD9972AFE851D7A213824FEBCAEF2F159D1D944DEFD0C7F2FF014568
-5A0F7709376FA7755FA0E9E2EAF5827E2F23A452502F0C69C51A92BF01C3CCF947B5604164CEB0
-F6519224017D8F0AC8887C6E83F0FFCBD0DAA57523D209ECDC27C6CDC6A709D384AC24FA3350F2
-72593C5FC05FCFB4F2EB0D5424B958F3E5B83D2462C8E318A994B50C1E2AE1D0FF798837C6E5C8
-23D4D6F8D34043CFB2FE9A942711982BC114D1424B7E358F297B224DDCC63AB1303DC8675F12A7
-B38838D8F3495D20AF3D452026397A002E112B8266AA76AA4C8066DF43647FB2DBF74E8D371466
-EF6C05BB4CFF36C3B46D661BD0BEDCA753CB06DF07EC3E8F2F39488A87A77B9FD0DA47787D4E84
-3905DEAC2A83FEEFAA0C2F8A18D756855B3FF02188FDA6F555140E2235281F1EB0ED0E0F6F2645
-C36A423579A7ED352738AAD1B59FDC7262326E580D3926A6BCFB733DF70FE8A55CB948B7B9CA5D
-FD3ECA598D7238033216C0384018317592F26E170859177D6EC285D368A72620105C4F64753BB3
-CCDDF78133952448DDEAF1D99D413A3192556D5ECDA605FF75ED0635D5874F3DCCA46FCBBDCC46
-B883F716B6C444D78CE26DF742A90D9C8687F4C7B939F46ACCC4D9281C21DC00A5C744CCB54CE5
-9292129F027AE072B48AB2F550C1FA4B36B990180F6EB6EF887660D516A5AD905AAAD94C7E892C
-E8017CAB4108D1FF94010662DED658C6AB7B02600F84FE7D9907DB213C91C324B2515D831F99AE
-5A1E0B8521B9FED12309EA0E6AA13D1CD9A5D6A4943A26473AA23F175349490A4F9DA795ABEE16
-B14F8BAC8A2AD6C6646AE2B482B8B2DC016AB1429DAA697CB315CB15B587A1B4927F345C778631
-99DD342D2E85C218F741AB44B821978AC869DE25347886D163A80CCCE3EBB841B7D66F9F4E1706
-FA90DC2A261ED49D69AA21E95C4F20436359877F390E26ED8E7AFD37163201BE434B89AA7144B8
-3E8977D40D873C15FCD136E711B13292C8FA0B594598ECF8DFF5A696EE868754C626281444C30D
-3167DBF9B9440AE0DB8A937EA6A11834D4726A5C21388C9ABF54DA82FFEDA5B72FA53E6704C916
-387B8EC36085F419A3AC796D4CAF4C321EC5F5BED7612F5C8410F9F4C584E762C4FD61B36965DD
-6D3C4A58F15BFDF83C565F457F56DE3F8BFDE36CFE964A70E8E05D31A6CB87B03A4A8CED980551
-5BC7F8535D23CD753CF9D1CDF90A7142045E5CEEB9D8BC2A8EE2F4B7A49CF6D6A0FFA204BB5788
-F7AC5BA57985BEFAA983150974FC1048E824D87506B7874387FED6820F0E812FA536DF5AF4D780
-449BA54D1B2A4489E0F881557200C80A7E9605F750BFC92A30A38943FF6C4D3972797C97C9327E
-7E4D974D44044794B3667CEF0871CEE807C70C8A727DD93844B4EC636AF2208B1F4F40770F4519
-7C7C3BD36B0E1662FF507E6728E86D3599549839707397E1B6E837FB56E747DE68FF8CCABC8358
-95F95178428D165AFD9E63B4F33277731469C0F3BA2CF304EF696E73347CC336F538581E4E6FD3
-87FFB3A5160704577E0116E5327AF130219ADA85AC52CDE0884F0F73576F1504A020C752F8BF83
-8BCA1C6ED0B14B381FB02CCAE42C64A8A65A82B3C9EC9D8716C086121D8A6B18F0E411BFE177CF
-B18F9B9BCD53C2ACF975A1872CFACAE3089844A8A3B6AE02ED3DE4D2077C7C3776946E2A5D0D3D
-19072DBC148498F04F23F8B17F4B294EC939F36FDE1DE681453B77F7A1BFE2D7840A32481524AB
-3186B06CFEA6D7593557AAA640618F83D8C22F3E05645C4785AEA94A736AC92BA08902FCDD0895
-EBF975371EB7DF013A59E51E333727EA160B5FCCA003E27BE7CF665F4CA4BBE7B14FC75815E053
-20DCEAC6D032D7148B9DBEA9D62724B5C52D499900207DAAADC0AE9B2CCD81B4C99B901B3488BA
-0ECC27514A730AAB58A7A60937B55BE3D29F68B5B9C776DCBF4BC713FEA091BA6083CB20C9C0B0
-18D94C10122DD4CC7C042171B2554A84FD489009B86F080526B82073D98D1D36C411386242D600
-10A5844AF91DD3C955205AB0DFC8CAA1B29C0FBDB0EEBC69815D9D3C72B525582431C700F09579
-90FEC2A06E31679795FF0B0F83AAF834AA24862F0576D306FDC27F90330EB0430548D45EF75CF1
-859BA98439583F9FCDC02DA426C98955D6246E4D5F1471C4AC4FFB1947AC9FF7FC0CA41FBF01D2
-2B828CEAC7030A6F56F8B05764489653A77159ABA4DEE42B2110A6634DA1542188D5E577021950
-694B571AC3550E3BC2CB3A802A2E830A3B5C7DB77516BFAC3A7C827D79ABD75F10B7EA5BCA52B6
-90FD19E0426D2526FC591A3454266B4E38114D0F1651DDDE0995C4CE9A6DF8FB0EF02E74535C34
-F1F563EC948231CD159E2C172A8473E7C08BC59FF3D0810C0EC0D1D9D1038E882F05C7E3A0BE1E
-F98F9DD2A60AF98C2DBF32B9F5003FE3B09BA01A7744BFA8C369B7B7F73CA6915CDEEBA1D71F84
-9DF4DA23FE0195DFB6AA471EA109D6E4D7E801AC77CFF73F4ED589D00906AA0845B84D44D78188
-9B4B5B94758F013EA141171525AE140044C8DCDB37476BFAC92628FA17723CC434C822EF307BE2
-4D72955220B4DABF37959B46AD9C52FC0F5FB3DEC72BE5F5E5F0BC1CFFC09D8DEF5CC6BC94A456
-F37AAAD9A62E705B6DD844C564B2708BD8B7FE5F3C62104B349A2D88FC10EBC1D4900A5EF6C53F
-8C18250DBC4BC51173364B6033E1E5D3543AD95EDC3A07C60273E9B052C600431F63D1E4DE0BFC
-E860537BE0537A0A2C9BC539114BDDB5A3951437D8CCF457DD1EC0B0FFB7B9AFB2405AFFE33AA8
-5F33FD06CD72B382D0A6C6DB40BEDD3A16C68DB98AE6AD82CBB60D1BC20DA932BFA4FA70333459
-A28D3B99966B9B4F2E993E8DE780B890ABEA37F7143F9702E99E1F59F8EE27AB15CCCC0515A2A4
-7DFF56DD8C39E14425FBB2B33115D7865ADB66973CD14446E5350B281CA2D855D2312D3DF5F58E
-69858CBBB058096484ED8CA8DB534EF103834B8EF33834B8179D9A6143B88B244F5F8773728405
-8D35186A83A15CDC9CB32C8A5885B5EBA4F73B81EA4128D24481870B7223A0F0F2888E77DC01B0
-2AC8337846C2A5035724031D7437FD11806260C2BE7EF64409E7A75AD047F7AEB1CE3FCBD53DEB
-0F39BA5A63B6C0EF90C9A3D21683396A250BAA37ED3C81DBDFDB2253EC0B09A188D791168222B6
-6A05F00C133F4220239F65A88112717E8B318E905BF28D58ED1849084719F1FB0176D26C56AC81
-28680D1AD07D3EFC11925DC45CB786E53F135B7DBBF610554B6D9BC0BD36226E55C23FC87351A3
-3C2416C8F2817B3CA69FB0D332CED8C0E33C6F40DBF85DEED10A7E9E2948513F3190DEE93132D5
-32045CBFF6E43DA145CDE2D561E3BA078B72F950A8017025AA5F2FCEE08AB4E79D8D17D422C978
-1656988AD6205DE69035EDBE516D7E52A8249B4FED4E5D177D87188FE3515C51B09E8DA573FC1F
-86B3193EE935CE27E52131720D8264C580AC087218262B37A194EE8589B8AB308545C2E5AE23B1
-BE4EE3BC9E99C8890CD4A17CCCEB740F766D9195DFC958BC4CEBD291D04FE691DCC4BA7DC20CB6
-2938F0AA9C4A51FA7D6E213E1B36B0E319F1E98BBDF2999C9325EAEB86069F3158C2F2E79365F2
-28BEF0D90948D07E53B9C45F826F8A8783F49CF037D4CB2C92F2F6E66C104343A8995A86E3DC0A
-A9A62577FFDECFECA2D7D27833E903FB049B91783E41D35D216DF3697FF03B51EC3ACCA17E9187
-C372377490839E490136CB3343C87D5A04AD6C137A5FCEAA91FCBECA2629C132CB2BABE3909C70
-EC55A8FF1DDA05B8B2A0D2A51BC7411B6A6F35609E6EE0C607DCC6EAF95E43E62F1042DD0DAF91
-E9ABC212D2E2A8FEEAD0D310BC8DF43202891540BF07FCA2EAD1A24BCAE5E4A617E726AC4E9215
-E01F7EA2CF768B7158110E3D16010D27B952E88A32E445743C6BF5984970D518998221CC95A47A
-9F627AF0DE14793C97C1DE55B85A062816ADADF23CEBC43916B1C966EDAA1424B23A552E51504A
-08AFBB8182E9A11124E129244B19C7BAE1CAAE2CE34906075DBF74CC87E478272541DFFFCD32E3
-C07CF960F654F674459FB136FE6D18121FED87B90DC05C2478DBD121D3A48A687DA0BF5A882A00
-1490B83ABC932CC011E458D64A6E3D2CE0F5C9B1D69BC7DE68CA0DF317362FF81BD27F6FD9961F
-93D9B11499B8ECB95428EA007A4649B16033E8D591FFC7B4CB6EE07E6F70687996A3D2E85EDC31
-C1DEEB5D84C169079C16297540CA0CBA130924AA7CB75C357B592E08E47716205CEC9A0178F54C
-928A30CDF5F2E976FF0174012508F26EED03417E397332FD806E11B486649BF17F2EE9A0B860AB
-CA44C31784DF25B56825790847CB9411B2488FBAAF03B0B0FA2CC1B0C5D320B69FF98713A878AB
-3F656AB45FC561F61D0090301FE7CA7CEEE6B76E57AB223D13AFD584384D0BB5F07E6991551E1D
-2B3C5232039377A66F1143DAF25E823774B8689729176CE54F0D53AA21E7BF6457ABDA6710D593
-247E93A5CB23C24D53EB0D6C7FD73E94BA15B6D443B10A838D34D966AEAE81B8A20895E39B8198
-D07DF85FE9D0638B27454E54D849C83E31499C75B2D2E851D5B896608361FB5623FC0FA85C2630
-298B75D3BF1D53D7762119EDACC38EFAE4126DCF29B3D71C0EFC75AA2DF1E95672B6C7D1DF74F9
-388B7CD3CB21FA46F000E330D3A556326A6F37ACDE0045C0D8D00ABE8A868FB4DDC21C3DD9C7D6
-22F0B80165CC4D84227B7AE9927C936DF7FE8F893E319C45BB9F9DC5E61D37AEDF9E522CBBB20C
-2405A137842266B48F2BEDDCB9320664BDD6679B72030E1B01B5E6979C592D649CA2DA56C019BB
-09F6E139803AC012D3293B1E4CC91E86284AA6841B6B9EAD31D672714039D73336E02389732ABD
-ABB8C147DA9CF40711405A1328EE19E0E6E1EA65DFA8921994F2BF310FB85A08F4BAA7FC59DBDD
-350006200DF27C099F2229862CA5E9C0851BE4E32D00475F258334359010D8178CA4DBEE82232C
-D21C3CF666A0EBF4BD20300C0A70016807E42D15F9EE24A194ED04B4C6AED884DC7088B6E37851
-FAFD7ADFCF7FABB0E633946B9029160F10B62613289B8C46B2B74FDD47BD4F4E7B53E96DF8F9C3
-69925508D342E15A4D0943B22365B8D8F9CB8F5D00DE6A42FCF9FF43D364C02DFD2F44F72819E6
-16B788A4DCBEC1B5F9AEBDE4F38A254B4EEA4A34DCAEA85DCB7F9F2BF47BB87E9552402C372628
-956EE58A01E86BAE1E083D7129B7837D6E57B7DE8C179BDDE6524D9F75618725026854C0B1A18F
-A662CD6324285AF65E4D1F8665F1538F2D85FF7D502B3BFD4D310A3088A8EE6780D541D9AC4687
-31A27DD7DA80FEBB6F60C27BBCA02DC98AC540CF45E3B6D52DE46B7C6E98508DDDFCB020AC5533
-12F08C2ABF27B6C34AD9F841EB78373F2F367A28EE3E21D2BCFCE4C14C34C3638978C40B136AC5
-8D747EE06E197AB07ADF3709E73833BC786917D3EC0465EE48948E397F8F7256ED4D261794B28E
-39D6D4EFFCEE6DCF0C14256DF68026BAA0D50A737E303923E6D956DF3FCE2983FF443BC1EE1595
-EC57E86E3770F73B802A152FBCF6B4394EE2DB30DABA69F0124E6A74BFED7715E469150C2553D6
-4FCB56786D334F335F4EC6836A613A261529FA85B53469585A683BB9CCADC24AC57E35BBA6B086
-F3881161327906B185E958E700A70BE82627A8F4F49DA22024BD5F6D0EF3357EAC2414615D4ED2
-130D3D8DF23C52D2B57372BAA68BF1901B863E6A36EA23094971BCE262FDD5A68B0B20F0E9FE0B
-0DAE30CA56FAD94C9CE49875A4D06E774CDC46845866BCD61122887DB85B207E28803535687E39
-028F82D9439FB6B7F34FFF1BD8E3C8E1C7DF03DFF8E3C06028405F2E6AAF97A54075B2A1EBCE61
-3A5CF7C73042D74824A04D5B2066730348B07F188A8725EAB0F076BEF25DA8B82B36B061F866A7
-BF23E609780A8CA6C1E7A52AA2DF4D5EA22E6C6491B5C4A648F37838A7B1F7BDD98840653372A0
-86A7AFD56CE2B973B5FF224E34930ADFA3071DBD339618B245AD27BAFC805BF2A49A4E296F17D9
-EB25700F8E8F0C9E8548FABB23D2CD8CEBE8621DFB66115E60630A1FAE3897FD72269B27503841
-5943D7A2B5729A5DC87E2F8EC82586D2A2979033C3189EE5CECC97C276B751E7A269047C0B4731
-9E38C8A5EFCFB0BD90C545563971F7DDFB76C28DD5D297C7907D20C7D020F04557F557AD66E51F
-9D42F796736997BC648883144CDD9EB477431AB9583C58A94FB7395E5F7CC0FF9434A97F591580
-48509B7008168B6E877CBFE14083C1CC2B197CDCD93068D035102B025D52A8AA4721E019DD02A7
-993E5C74A64CC4D422DC03210A264F7356514F13B555C373566A5D78E627065AD36C26513246E0
-01C9C15952357A8D8E7581ECC8C0A86A880C73AC519BB10C1B9720DF6501FEFDCE55CB1CDBDFAD
-42C3F2148EA35861C391478B9A8D058FA121B4A2639E7A626550F6E18920DA07940F573AA299F7
-043F3ECBFC626C16BEF92D9346946A0E7BCAC528AE264EA379732957AC35E2C7DEFB417FDFBCF4
-B29CAAF11335C1BDAC50D95C0A3F06E367FA0CC48317ACD72DAA35A76CA3A1AC2975BA3E369015
-F4AB8CAAE9B804DC42B7E19EF9B73C3EF3968B4CBF4C7097A4ADDF8359DAB1C6E2C440788F8BCF
-D272D8366C232B70D50E209E766134F0C1F1ECDEF25E05200D9E66FD6D0E6A6DF5CD1A62A4E7FB
-DB54B495CDE5DB0FDA85EDA4D628374E0E6EA451EAE67459D92AC84E38FFB5156D1FC0ED264D9C
-05319276361F5192B3FE3AC052154E2425D77666E387B88841F2AB8062F98CC11AEE58717BE867
-6C26ED1D06839FB862D2D6F14217EDFC44D3628090D4E4AE6D8D08C2925DEC62CC2DEE4CDEDA65
-F1FCB22D50D5734956692CBBAF25A518D2112F54E6D38F9C2B9CD66A38BCA0E82AAE3DDE45C3AC
-E761B9A12B135772589E425A3B4E229E0E8249069328B6A222C46DAF4F7C61FDAC1967C7AF6E13
-C38293F4A0AE3DF700E40C2DE9F8BC802686F239F7F0C7B47E0261F4BE8B5C174EE86AFB248F08
-D0CD94578867F47316170A909C05019915343C6C4CE0C994AA105F70E58E576564A4B2B08944D3
-180CEBE66BE894C842C096F92CA53E6704C916387B8E374D1B71761F3930422B0DF8A4E24785C1
-4EEE920E3C8D697279814A6D0276FECD66EDF127411A07EF9D22EBAFE7AF43C6B6122CB0B14DDC
-D3367C8AAC559AF893AE9BB73F784BB10E6657F344AD69330C24A4E3C446E86E07F5B596D2C984
-4C24CBDF51CCAEEDD4D62FF48C7D9F74C90451FC90F485F2C2F6C125556A5992BAD8C87DFFDD9A
-7C092ADC9AC2220C0ECCBABA1B4C494A4DF40CE6BC412D37D27FAFC83F9554C664B7E15B2C4F9A
-6BCE172FFDC885C8D5A6E4309D47031CC1A57D15CF30F413C700445A1180587836396ECF7A4526
-BB0ACA51F2906CE146F8C84A1B1FE2454EDEE16570D594E79B894CFC3AB160A019E507347E763A
-B6CD3ADF46393E0579BA424DD850246B872E88169EFFD26E590A192EF3535DFFD7C547F2358042
-FC5C9838B3AED01F1096BBFA3565ABFFB6F13DA0880B562662EDDBD14FE710EDBE66A3EA1FD804
-85DA5390D3F9AA7D2FC7A6CE67AD78A181BB8524B7D2243A22D936D631FD3A38B6D7EE4210E3F9
-67E536D724B5E9506F2C2F8ED984D0A76B28CEF61809EF49D7C198BFEBBB91233026504A558CD4
-7B7985A1458B14A570F2B22B196AA0E939D5F8B4439C53D8C17864376C53751328E391BA09D254
-062AA26CBA634DAFD7EAB4A20697D9D66EF59A3718FF3BCA0A69A203EE0A70CC564264EBF4567A
-71A95898634CB768E85C1C94194E6C8B0320735DFDEC860D110A9E0F0F1D0B3528B24DE5C85021
-7F28D4203F560BD19DCF145E8A28F9064C2459D4FC80AAA81AE12DE4BE12420641D1F82D60416C
-DDCFE782984955A10B576FD1A38C1652431FBEA0F6A00C43DEF505B15777DBFFCDCDECBCB846AE
-5701D4F94CBD835CEB98BED6EE73E101CC55501637EF6009357709493A3B3A1092F0AC896369FB
-EEC887B2DC9CF507920634A6A7EA49C5D06D6A73D06FCD850B49375A0C6E94CDEACFE6A345D0F0
-2220E71FD289093B0301CE9D3A00062E1B16825F6B448E2B97631BF7EFE74AFF831571DD8C6D64
-340D2D74983EF1931B0E8B1D1914DBED22638B4202E414BDC090B26BF37E9900D8691CEE82BB15
-CB2FBD7D87120DC1BCE6086E6CBF6E5ECAA3B954D5FB14F987F178A4520F6C0BD631A3C9FC2D7A
-27A87FD6466C71F99093D457B237807480A0BBF9B3E9A932F2B54DDE064DF608855B57293344B6
-EE678188C820AA974CC93CDD19C2AFADAB7109CC357CFB633C3AC6E94C377604A97143B2C46E34
-EBA624F9E8D0EE2F70730931D18EF48BC2E9D89BCCEDF440AD21BA0ABBF07F1F3AEE91C680BB30
-35E117FEA187699C643279553652859B4E4F14F108EC17C13BC4F4F0F1A4F3EB8E107070EDD80B
-654968570D10DD96E3AF3D1CE7E91880119C0C13BA19596B2762F018E4B5131C929C7B210DA2FC
-16100FCD8CDA361DCF91C9431D15CDF19EA61912DB91001A0ABE636DBB31BAEDCB65F8D40C7435
-CE8A188169F00D5CCAB0750EA37D20F18386072B5E053DD1F2C1C815E50430D084D226E108C782
-2BE4025C7B6FAFA4492D1A6B9AEC8CCBAD96398A3A028181059DC32901D9B65A4CBC970C11DEA1
-4564C832F41C5C278D97AAE899FD1581F0295EA908CDC45FBFE469730F76A665705B3FA8AC301B
-4030ADC8B08206693ECCCE509FBC9C40163949E45D2E072BBDF6EC17B56E39B49C5565C4928833
-44F507E92684C64BE24D370FD1BCD2E804FC32C5DC3C6CD2D2C8C4221820E7DBF24285E0DF7663
-A348C7A90BBECBDEF321D9128DCFD1657680C06696084A2D1782CFA4F5F0A82CC85930147ABCF2
-60BC54181A50AB12BDF5249650415A26D09AA1F55A0BADF12B760A333D3D35F15DAE68BE585605
-76DA6E572711F09192B1C50572BEA623EC86E33D2D5158516099230EF8D4A03F4AE29CFE2E419D
-ABE89C2EFF27B79A0117615961F8475F9AD70D2CA6FFD2B8CB629A2166106159095FDA78878083
-38E349CEB72069DAC742FC81267347D088CF9D76C993FE7078C8FCF3672C5688C6F6CADD6C1818
-17EDC6FA67F1D8B6E428608B667BF69C7D3B3E06E762756CD9A205102729A62BD0D065790E4814
-A2BE825BBE29467CF13439AF8DDBD712CAED51AE8023EE2EF3E82A32211C152A3B00FB59E3AD06
-169117FA059995B85827C70736E5C5B92A7A050AF586E4274E2B8EB301B1A44A78BDFB7A1CD5BD
-20419B46A7BAC72D8B76AB79F43DDCF7388CE69953B07229CB08537841753A779F8DB35058BCB7
-9FE0B92C95EF2F5BB4FF92A17CCC17C7547EE812BE02DC87A97B70A07B47F25096CF7FB28EEA95
-93332D8FD4C05499C0F0B5DC16B60486C7945A24C8F5EF24ECF26BE37DC1BD16CE08D9F96BC485
-73C1D7A8872A390A4FD5E23765845C68ED59456D66EB4BE697F454B71BF6E976BFD7C7819BDFA1
-4D8DD7F777B499773AC457902DC130544A32957E723AAF0EE83D46DC6AC1578EE03C55B89F3FDB
-AF60C8ADB5CE10DAB600BDEFB5F793B0AD8A4757A65AA493BBBBB603CFDADB0878CD83043370B5
-7F1C19E02D5EC43D7F2128C8FC9B2AEC4C8CB386DAB602969A06ED499954C0FAAA273BE17C2C70
-59895A7961C9105FECDC152A1CDE6814EBA6E3BFBA8CE110393E1046FD51A103BE194F4B9B5BF7
-12396DBA012BDCA0ED38F61394BDA8862DCD70C820D301A400B57F10F1117A4B09373E9BF4A72B
-E6204C3F56CB9661CD175F72B2351A6CAA6401CB569CE3339429015AB1C6984F518C6C0D6064D7
-A3DAF6EEF949EC633A67070D58707D6E6E01F266D3F552B77721A0D59E8DDC86F98833009D7342
-8FD37CBB0DE9C894E99662819C196E8A9FDCCE47C4A4BA1F1ED1D90DC230A540B26C218B9B30E3
-8C226A23B28823DC6D84D49A6E346CB2F7F9F71FB106A5DFB36C16CDFF1D651A9756BB3B0F00EF
-0A70D28DEC781FED5AD41784469E88ECDB870CF88CE99FF8B8C99478300A31DE8105455CD5A6B7
-6A3DBB519C87C1B61B15EF254B3848288968789C1F5D479B10AD9272FB77435766BA40AC988913
-07D8A40C14ED0B782934491ACC82A284A886D204D45F1D571AD143ACA7C7481FCADC2366F8AA14
-DE19B82574B2FD9EED7153A5B47877D3D579C74F8B91D5155AF0F34882C9E2C7EB3206B1B41209
-9E776DDD4E2E24FDAA98557E7C87347F56E1B1D6DB7861848966B6D0DD232FC2CCF89EBA52600F
-20842317BBF4F8B44AC4ACBFE0A4B777228237E52D22DE4A3B8E3AD3F864567F785750B2064EAB
-FF9657B3622E5D39F6BADFCB6903DD7DA935018CB36C69456D2C82ED6954E406942D0EE310CA34
-803309603D77BD4BA248C02FCE335BA95DEA94FF84DD80542966C5000B610A55918AC2CA86D837
-0C9C9F4B541287555D3B123A27A83545DF28C7970FBBDB7D7214C727AE687D03485EA555B4BEDE
-C4588F41F1195BA7518C66FD454A95DA6BF1444C06BFEAA75470FC5A9196568A9FC73DB2849D98
-871CE0055312847F376D7C105B95FB41AAE629BFE241E52AB913BAA5A4F675CDF2564630041627
-E2A9D8CC14489083864E8121DDF31C6BE9E0C1F28F2E43716B48B2C850A6AE4DEFE4C72B43FFBC
-7ADC307437041F908763BC8762C735AD2854FC4964B8789ED825B468FA72D2AEA6E0FB487E67B0
-8C30119ADD2C0DEDB0739870EA020C3AEFCC306B4657EF727C7B9D44E9EFA9D1E94EF45F0432A0
-1CA34DF372D1286639D3D621BBEA0A279DE17FABACF7C3700EE0AB96B91E9C65D00307AF5B7D3C
-C5FE44E749CC99745EBC1DAD4EE4FA3209A8F6B79D51BCB14D16E716E57349CC7270F7563DD891
-1F61EA3D587E0A7AB6D5F52C51CEEE500E1A5B87E4698F85872A78D268DC589EDF2359559576BE
-6DFC17ACB3AF21CCEDDE9E2EAC577921D4B664CB3A9916214F14E0EE0A5A794F52AEB2A85C1FDC
-75448F6E8B28583C84995D2353459539FDBD3A78704047A9CA4F8BFEE8FC414E6BA85F0DF1D97D
-0234DCE2ED68EE0E96ED572B66D1DAFD2DD2F0FE7BECCB4C851298FDB9F894CAD858AF4968CF9B
-001FA15AE4C7E38FE246039FD834CCEFC94652ED013AE6D4FBF4A419C4D1AEE18AD681E8CC8672
-4B9EB1C5DB13E839B218BF6B71AEF9AB230D37D8494A69705C470ACB47875C3880946546A56944
-981602AC22B37947BCD1A3614F8695DE3147383302C0F1DBD3A41DAD361381E25F51C4922922E6
-4555CA63B2F506E4C1EA7FBCD707A1C2879EE4E9EC48C0AB93FA7C1C9D9940961B6EE73BA29D48
-07CDD8CFE05AAAE724AB718B2F0F3E6C50F5F53D9BA572FC14EC63878AECDAF990A7F50EBC31A7
-163A517F11721CC862F5156A689234860BA2CFF19D6FB30E6272F8AE9925CA6BA95F543233B63F
-2EE746EDD725F5F2F51516F1DF1439F9062A1B2B3204434F2C21888D38A4FF676A6B850E3A6817
-0491F5323116EA11BE10A0490470F592044CD42AEE17491F2574DC22932E7583190E93D182FD72
-5FD6EE01A63BCB014019A690277E8E422CFA4B0A50FAE072E36F4C6F14193D544FBE216A78A3A4
-689A4C6ECB8BB149CB8F6EB6DB0029409A48CB7B454FDD796D638A7EC743A15EB5EE65DD93D6A2
-3DFDA04B8B040B856B766FEA465E7ACD05CAA8A3F13BA4D2B04AE5539D424BFA34227090FD1831
-7EAAA83528B3D40E5C108E39EB2ECFF231DA14E9903EFECE80713FDBCBAC9077344FA86D7F7732
-535A26EBD89A80649B26F247C710D725361278E7731870095AAEBCE9B9C04A73698A28CE509F9D
-A1D88E9A8CECCD0203C3A3B8DBFC56063ECB17DAE60C26A80814F71FE12B23EB15BA5743B4F9E1
-24FCDC99D47D8A449A4E7BBE7DE8CA36D946756DD0B94438EE80A6743E683B57223EC6F2062B31
-042313ECE2A8E646361EE5E278EE597D79CD16DFDC24034C0F2E03C54DDA9132B37AD93D598651
-59DDA793C2CAFC765287F7B943191B068B520CFACC134F47D454121EF1753065678760D9A6B924
-C90D7C9D432967E4DE06BC5AEE12554DBCBE36619C0865B19C9E939F286677D4649C62DC79AAB5
-24AC9B6A8CCA66C46C8EE2E5DDD4E113B8BC0E356867B001AAD992F1C85940CB2573621C9986B6
-2E830E0823FA46FB64AE9EA7A67CEBF0B8AF5D3AD6AB366E52D60B5036222DF65F5078F70236A1
-25A65BFC345F6A400A81DEECD07183FB5D10A2640F6D21D98B8C2E0650C2DDB8AD539B7719D030
-B220B91E17FF3A5FFFDEE4D66D0C4586D9E4EDD15A64393DE612A8A2087991A726CBB59176AE3B
-D48C79F0D7C884E833DAB2944995098257F300D27C4504E3ADA71F4CD9C306D82FA15C11FC7098
-1ECDB59E8DC578788317BBCABEA79DA888290734DCEB8E5ED8F7D51C64104281EE00D95077D4A5
-8CE902A8D3DB6297CFBAB9B4E0EF77DB323E34A52B1A938CE951A1989640EA4935A471D10749EF
-728947386DA5EAA9BE0117E40CFCD805ADC01EF3B152819BCD332DFE5FACE16C23669371E61081
-94783614CD46A6885E543C00355B1B81AC917D05325FD395BF6195876D4F46CF739D7482657607
-C7AE98C7DE6D397F6055DF67F1884836E2D685C8064D834A7718EB41A843D994E070D5488E2842
-3A30068CDF01F84A34EA2C47A4341FA98C9011FAEE51CBD98DAB25C98B78C0957A0FFD022BCC97
-641F858DC445715AB461116AE956953F2048FB1A990D7752D3EF1CB67697583681F96B385FD870
-3CE35EEE611E80DFB0A992F87BEB5B724EAB130B2553F4B0599E795C4743AB312460B65CD53DFC
-648E853C032F0A9D760F241F6174710CD1602CD78DC405316B0DA43D5E2D4EADA1E3688F32C6B9
-4F02EE29ED79848C459891187432957A0F428D256E015E86C12E68696AFA4D890FB842254822E0
-79AA320BC1BD480C0A2F276D833FB3C9D8746B52EEF4D0DC0B63D01F61F9512C0DF6E911A4125A
-CEAEF49AC488F1A395843F760DF01838339AC5B53E760EBE256A04F092CCEBAFD9218ADD4169E1
-82D2F20753200859A776B236E6E5400C4255E7CDD22D1D6135480E16592FB680142E5ABB09BC0D
-7B643BBE0888EE5D5A0008815748B2356E717813AB3AEB20A58C291C4559083EA547E6BDA07521
-342AE1D489F0EC7E9AB4A24AA98CC448AF3A198910E46CF829CB35182DB53CC04EA000E05F44BB
-495A679736E1D3AD78859C18A9C82E9B6DA96ADF439DAC12269DE2B745841525C5B39DEF3FF4DE
-405C7FFA30C29BF9EA979B9741DD9C0720C25BE42DFF13BAD91327D15FCF90E7588201B64C2E73
-DE8138737F1B4740B3C54B78FB4580815C5D47AB1870A548DBC20D118F8A8A7EFA5D5383D7069F
-E0A3F7EDE43AF1E411F3E419F18F347ED5153D9B8AB2EB584DF2A8747060145C074CC2D308FEFB
-B63841EAFE56C905B4A4B13A9FE80E9CBDE42DFCEE6A3F5BC986C2C740401B450939A6EC44E58C
-CBA7955B7A29ED3DD28C7D63FBB04F8FC825A60C6399DA762D045C5182F240A8EE7AF4F4040390
-9942C8F533B3BC5C763B0DC95A834D1E5EF0F90BAD07EC07380E75A95F57B8C1C46A28ED6A455A
-3CDB05C56981DA10068EB0BD9EEF0B3B31A76F660E9D340D377B3D8B6068A7228F7386D8F0D410
-3701DDFCE5F678CBF6E70FDAABAF86B95E2A731487DF06B4D011E38120BECD6B8C9DAE22C98C39
-1FF8D019FAC578069F6F9EAEEBDDC67AABD4126764D16B89E4F8A99C93A961B93122A4D9B389AE
-1C664C3388E1E7F9071321F5A22D91802B5B96BB89AB7D0D853248B01EB77E52B26463AD317F78
-47C62881F21D2578CBB2855AA02A50BEF5579D09AAECAF59835E9E949245A1CF53983E67CD5F7F
-CA5DBA5F4BA741E7E49C406522C380A50A3633342042EC32F80CDCFD725C9072B271AC83722F73
-4B3A98F7C516C7CDA806A1FAF97CE46210C4153A844A352791E6AE594619F51C656CF07B783D61
-64BFFED8809A1E502A533CA3C12727FFF4852C098D1C2F0F925B3A029EFB6FFF80DAB8DCF7C9CA
-FA5F7D958A8504DBE2E7A2C3F261D736CD4894FE0009C6C24BC7F7A9EFD12E6AEB4D1A60AD6257
-4B8F8B7C54954ED1CAE95511F16886E5109A9933D84FF266EC4D94DA89619C82D376A63507CF4E
-233BC70BE0D660B6EB472F4EB6B8D85C96108C5D02D0D39A6D02429D60D010E1C13A81E1AB0012
-9FDDB1C0900EAD7845B30B1CC795520A343E0FAB8BCE4D9F642EC7F51846F5FF3B87EEC40423E1
-A91931FDF73BAFDF383E55B255566679979F37E256D606121F0C3116BEE00897A7C1C2980C785E
-A37E05F2E3070181F17D8DF9C1040221970F628202ADFBCEA6CCECDA61637E40ABAD6B0F639C21
-735298F35EABD37FAD3126247309EF9570AA4D7F2AFF959894C089D77878EB5D3705F8FCB748AC
-00CD77535B672FFD36E162D85370139C0F8E7645A665C1D23C6C45C0CA06A89F2CF2F23C27A5FD
-070F575439A5FF88D9235DF579D854962E025C347077256A5F4DD3C5FAE10A5C2801F93C08E022
-9600CE5CB001CBF71E813E116C56147304976CC25801BC0239EE6D12AF2D2A10E728A4BEC249E0
-BE5342272F6A508264226CA8479BD946E2BED405379D0748D4A707E0EFF6175D5E57117A04FD98
-C03405381AF44333FD7346DD7D46F71CF5AA1A87205EEF8D7B1CCE971F9BDDA467629BE1556CA4
-FE479DD77380F22E93685C12D641EC3227FA98C90D9265D7504B7CDB3CCD092F4AE0487E89CA75
-DC017DAF9C9C94778FDFC7CF2419D317AEF2D70857E527A5F49FA26FF3EE577A0A44EF541C7D64
-062F7DF3EFBBD0FD7BA63F5D4F1FFF4013F149215521F5E91092553F2973E0BE1AFF6B5876EE61
-3A081917A4198292455DF7A337954234E2A441275E5F4A47EB19B3362778BA70878847F478E341
-BE09257DD9823BB058512D588FA8266911C5846EA5AFC886549538721E4775EEB8354F64E20DAD
-4B9129C6E9370241408BA4AE1E09059A0F2C5E4443FAFFC762D2ED2CAC9F6EC244666212178440
-A2D3074A8B5DCBD810FAC51627A81FC9D40FC32581CC1BA438B50865050765EAAE1F1E99C1D89A
-A6CD3838A5459FBF8DEA20C9531801C037D5288F6CE19AB8073B5951D7699D3D3C7F937B5B521A
-35AE12791102871A0C27AAEF9631192182A5C40B9C83959A96207802DEE92611FF3778664DB1AD
-D309BFAF5EBAAE4B8A4FF008C0BE42F1151E9D1F460CCF018C42703E1A2836CCDABF26B4744DEF
-9E111C4FB81FE89B4B9BC15E2880857EB34B21952C55F8C62E8254EC300FCE1CD5D46657B902A1
-D81ACDAE92E4CCDBE4C39DF747BF9CF8B1CFA3314C453FDE23F52E3AB1AFD66AFE12F6DD53FC5A
-F236F1228EEC9DC8C8ADE81733D6BFABA66989EDC6762475F0E70228009D1301DD5AC6583BE108
-37D90EC1D0E4C543DDA6645969FF34C7BA21DF2AD3B9527EB104B70498EE9E61FFFB2FB3843404
-F8DC322C8946359464AC057370C76A90ED3C0254D38EFB516B8B99E1560857EBB5CB88566AD269
-56652F1D334F01FC8F018546A7F49FD17103BB5EF2A6A3B6C26F9CEBFFC7419D71F62AA5B222F9
-93EB5A227C73E310A3F34C19A3F7CE9A10536DE50BD81C4118222C163D0CEB8A16DF6B4EBF2B06
-840DED08106F28DF93E33AC2C4075B43723690F9C890D4F91CF5AC874B4CA7BCE2F2962E532526
-F4DAB744F83CF905AA4377BE6F05758EB44612BCBD52A5692B60BDE10586A1113005D915A74DFB
-5E419210B2E5A86E5814ED34D5DAED6EEC3802851169615B6A2744A5BCBA5B67E933FE2D3D7398
-056D7A316A4C7D0A7790405C7A3D0517E174831AA7983A87FBB4C5D24F2DFFBF8577A8B30A209B
-27466732F600B60FF503AE5BCEF08B29A9715EDD7EBC3DA4E15218B76D8FD60664B61E2B682B1F
-56CE4B5B13AC1B0EA4EDD6AD77244AB166ACC23B103790FCF32F41B7C1E15D786A85BD3B81A44D
-3774387CFBD41B43B4678AF42174ED76B9C70F4BC183D01C525ECA7560A7DC12E0804F8A6FCE05
-760361B90A156915EFB95CFC55AD4DF99D77A6537686A2A60D9F926DD9BA3FBD8B651D5B69BFD5
-ABED7D2C8B32539D75134615761FAF783A6EE4C31B47204808C9156A6EC2D70049DB35A7207447
-B346DA2435DBF46AF7B24C6E4BE1B75B30E5F68683A03052B05BB2DD75A5127CEC4FE11284F03C
-A9C4102A9BB0130EB99933A7479DB597960640A3EB90BF0EDF89D93A8B73921E9E7C4F782EDFB0
-7233772D2343D90E1E581FF20F5181C67E050A14AE40EFAA16FCD62FD9AAD419E301D6893E2291
-8BBA31345A9D947208EA23924B9257EE753A7104E41EA10D72B6E72E507053AE35BC20AE5F369E
-B0D780E537406780A55AE7C113A81F4E1008FAF276F598E276399B4DF11AFE51CF8D22A35B1BCD
-247DA70377CBF7A96E8DCEC19658F88D6A214D3FAD356BADC650A41B36F12B11EC9B149FB6A491
-10DEF203B8F8672FCBA317974F17EBAF2C81CB398A06B62F635EE010E194A38ED4AB30C7E7079C
-AD51EFBA8E069B811A35B459B3537D6801D747BFDEC5F89F465FD296CE396F8944922D5F82A12A
-ADFAE34B6D723828C8A30292E9E8AD8FB8D97ADBD9AB22E5E45523BDFF4C1723688163BC7ECDDF
-44052B696167C0ACA1B4A81135E0B837ACCD22DABB5DFE46765ED4BC0556B7FB27239812FD3089
-FA483EAE60C10CE6D3B8FB0AE33F07022F96E1B95DC818C67AEDA1D41BE11712548D0568A062B5
-26A4569B9BB5F6EAEC2D176F924ABFC9978E3AFC427EB2BA46C768F83E86F3B8178704E6AF4AD2
-EA4DF47E8989F327D85812790EA888CDC920D15B80E51F7CFC44A1189127D2C9468D50231CA805
-03DF2C2007EF27DA9C498C778F3837735EE5EDAC47F4A01C2A391BE023004156652349F062B1EB
-504E5ABC82282A423E47342002009770D646EA50F933F0BC5E6143FA4B1733DFC6DF6ED7DE6DD4
-FB8388C7CA81C9210EA0A98B0275B74A0E0F510C90DF71C93B3A9FDB6A86DFF2921382352C8FEE
-1A0A2E6003B005465C1F31B667F5BDD9ACE74531D0FDD56CEABBBF5E0A55633E28F750A7C2571D
-27FCBE1B01C387F6F36D225A30C68BD185843F487C2E98B5629A6287CBAF2267880B2F48596320
-D7A1EC87DCE5C5283E034AF582F592B7E0B185209AB07480A98E676603F7F92F96F9AE6EBE80A9
-5E625EF7F4B469458B2A7DAA4B8FAE9103652663F353C35F88FFFEC41296809D52104E1D629998
-735E1CA4D36442BB8BD6C02EE6E27374B25CBAE97051FDE7E3EB81EA7F6D8CBDDA45F29232456D
-C1C70B60869D63A509E9AA33DD00187BED5AA122AC8ACAE5B5A02C85A4C0B68193B2F4355EA779
-DF44F488272E92297DF1C8E7FAECC4EFB031E0232EC032F1ECD4F6C37B6707A28F1CF9A2683FC8
-3B9725F1948D020931065CB521B34934D2CEFE9458A1CC7EC5528A183F270AAC08CE8184B90482
-6221CBCA4DAFDCE880D391D6C4D8289BB45ECC73C94DEBAABBCFD529ED9B5FE55E5D6A48EB0969
-EA03E15B8D7DA8D54CB15E0370C8E39CB80158C6B7D40C2951D73345BF3D82E49C976A0E918B10
-1C22FFD551C685A3C7AD17DC9915A80815EB114550E9BADFAC2EAD17C29D0C834871CD88563F9C
-C2CD8B190D02EE346A82C537DF2999722584A95845BB367E4F7D675FD067DC42FED595473C9B55
-1911A54B14DD130BC7CAD78C469DBA966096FA69FB9027C1542B8B95BDA4FC22683DAF22C8EBA8
-E358929EAE6C198C7F9730C5D3BAD63196515C4BEAAD27C26844398BD64D750BB06A240397BC91
-492ACE0DA7F6050BBB15740DCBBFC2DC67CC740AE8EE915192715BD472A45BBF33AA5E3E93FE6F
-6C39E09D8EF3068D3E7D2BE768632B6C2F1F2B0F08844C5BD7AF2EFA6CED285646750F70EA819B
-18B0371B3DF7BC4DA2B90E8FFB9E3DC066B9ECDF01A02BDBD882AB88EFD7FCF2467D4B8CC32024
-1FD68C6C9742C5E250BA662A856DA7194C0ADE36BDFB36562C29132DED3BAA0A87A761669CE3B2
-56E11A6CC42BDC6F0AE09F87C0D7FE688EF8948F69210ACB148A93F59FC2EF5B21B8E81B71D185
-D37E0CF36B2F33BBD77CD36047E9988704B0629FCAA318000ADFC4B370FA5B218A161AE7A8D99B
-88907029BC83134CE9F92B21735BA15F0FE547EA79F5B2D8CC96D10E1B0373A13ED18500EEF460
-DDF2CAECB0F44A4F88A6090D660E879ACC03FD85B4909082DDFB7C90428E2A9FE8B60377DD1ECA
-3D0885C5400473CF212DFC2EF3099C73A37B3886DA8C139FBEFF84911687D1DA963D0E9690BEE3
-F191A5E1F7B9D3FEB0A497ACACE68D42660D94CEA5825A19B65C1A394CAAEB68BED5B886F94D70
-8407C6DFE818448A49AC3A9BE10C8991BFA5DA3C94BF608FECCC0606BF6AA0F1ED1AEFEEADF0A4
-D5226523C4C6A77F0FC9A6C7318826AB8FA286324228ABCD26D1DF2FFF1650BD71879AE5D92337
-EB6EABF9A599308899752219FF8C97CA72C11246DD111F348646F23A62980F6445DCCFE035AA4C
-5B2E973A787EF8EDA260BF8298794B76FEF7F6CF79DCA923F9ADC2B0524D9A2D4D4269EA709C39
-5D75E3F23F92FFDCF7E8BF8691D52DF133297E4AEB9B1668AC097409428411C7887427DE9C03AC
-1F229BB983325258E3D36E93D300F3A31E1B4861A1A31D61731359044FB1076E98C2CAF24C77D2
-459356156E1D9570D9B7F8ED30E14C95D8638AF5410EAE34C41A35E552802248DA923BEAA153B1
-4E62735BD5E09E23E5616F10F5B66FE1D238EA59E293F0459043E42538E17AEC76BB09C4A6353C
-30E4B756A89E40B9D9CA6FE1D40566769CC6FE3B14428997ED4A24B23961EF21A61D879A2967DA
-CFF909180F52604AF8C4BD47F6A9474C42A752861E832B7B93161BC1224B8673A53BDC7F663BCC
-DC71A9ACAA594486607C180C30384881C324554357685C149A0D96AF6A37E4E3D20D5021F11238
-1D4CB1F8674035071FC634638076C2480B0EACD306A62FD22EA859903F2F30F1F99C87F3245DFE
-A4AB5141D280C5EEAE69F44D47D359A011A1D01FE8BEAF3B43478F8B47A4F37508861A2DDD7708
-B9D4742B6FFA156B64EBC0CD8FF5624FB80902DCE59B7806A43C862006869D0CFCA3EB13473952
-492CFDADE1E458A55DB078B1EF58DC5D6C303EAAA415F43DE9F19A508147FABFFBFAB69862E527
-19523DF01BDF22CA779D587055D37539BBF8D8BD6853E4E699E65F7EC6E5D096601D09340BD116
-38544A45AD6E58663A1C495DCC1FA79C8351D69D298B498382AE4725F18F86F315C588BED8BFCC
-6655CF2E4ABB439281D199994BF21E47A2E84DBE37D3637DB32E961B5C40BEDB345C82197D324C
-350BC344F2EF90E6B496BDBC1BB4A359B70633B0A35076FB86BE1343CBD39E6DD77671AF671CF4
-364C1CD9BC7BC151FC0FEDB137911CA590F377B35990099AF3756C1FF218656D1769B2E5ADE7F7
-571E7132CFBEFB6F0BCD9F4164C33738CA62934E138EE5A5FA5E81C3C1E04D1C1ACCAEAD8D15AC
-4FCBB0FFEBE577342272A8BE5FDE606830C0289ADC41418C7282B0CB5234D8B75D668823A32B73
-E140228E8E803115DF38D1D6213718BFBFCB22B0405108A5C8BD3009D60BFEED1B15E7A5D21F11
-98F091E11B839C2BA809A22652F57B3007DEE6827AC22A96556394CF9051B91B1CC42A20EAFB8A
-2D3F95B7090DA79AA3F4342045EDE247AC63D8D8006FE4C2A617C9B0AEBF2753042473762E5050
-20627409AE8F975E0547C07D414105ABFEE496985C3423E1F3AC71076FAAD97783CA4250951AB3
-379B4562F2A7744F41FC40E045A796A3C756981D7F35A38B6A57C12B8F8772EF0753591C65F632
-729732EFE7F053C27A4DAC9907FEBA0403CE8A902F71A278DE9A5616463256914C1BD117A66B8D
-62928A00B7FBB66E33299D673B682BDB6A30790C2A2DD06F3D82E19CF49C1B9C676A4413CD4E70
-718F92FC0089A7257268F75CB3E53F8D4781C37E8D5E37D2C919C619A33B4C7141CA7107D1DAC7
-69016355C89C1DF2DB782723B71357CC0AF674F0F36E18485088AD08B8B995D5A9CDFD5070CEFE
-37424C2909A38BD66DBE6440396D02DC2980F1C013E9C2C161F927C7B803B34EB7C57FB2349FB2
-788515885B7B2E5BCC7001A108FBD473F34810C2774E5493501FA2882BA5985EA9AE84AD076807
-AEFEFC8081AC8B99F8837197EEBD2D734EF78086F020091F44045823CF70462A856C5921583DB6
-B209473494E78D1D81F285B850052B1784373DB62FA6CE8EDFB70EACE4C2A01CCA9BB86EC61E54
-5E4399466233F7714392F53EAF823788E7F475E066E718A3A54A81805058B31244739B9E3D5BAE
-D896901D9F014FF62728847AB719AD2CA332D98F99532D7A93C7030271F5BA5230095BEE8106A7
-D33D16D2D3BD76064AD26431922B7CF433BCF3AF02C53C59D39872478227E645828F2FF1C4B3B5
-9BED9F8061C74F79348AD639C4F3A67E27FF99959B909E3ADDDF985B719359F803938798E36DE5
-655448E65472CCE2D6A7537A5F855A5046C5D7C64D77F636E318592B3040981110E664FABB5FEE
-B9B14C48D74E7A4582274D3BE07E8D67C2F294D2591796A2880C3253060BA26AFF00C503D614DF
-72BF8B91E80E722C5F4F7496A17AD6B5357DE01C5AC8136A3F4B7F722D08EAFB3419CB76638A29
-BDF242BC6ED4FB7127D76F51B8E77850C77A3D9FFD94E814DD072C6AAE901F1CB99961E79324D4
-AD0D97CE00F7A4CDCCBFD7D5A9A82270B2FC7E88757747FEAFE917ACC9C07507F2C87530465B2F
-7BE3B62047F11EEB0FE7513C9A7ECBAEFDB678F295CBF7B55CDD07FDC11A9764A31C1A77887D3C
-F9C13DF7D987E725C4BD1E7F80A8438F54FC3668E2CCAE42A58A08354825BB87BD1424A1919973
-3B49B6A3A5467B3A99F70B63ED38549168DD5FEF0A6620BD5B8050968377C7ECC4DF6A43C852C5
-72339C0E54F99547240AAF9487B748CA87AB2278B162291991556DFDCB595C28DB05D6D5510824
-9613DCAD7144A1EC6DA259E16FDACE7122CE1A171FA0346A9155B25DCA8E6BA7300451891DC21C
-7DB92E3AD2183BB4DDA70C669F1F55FCC191B59823B017E55D15E9C0EB799BBADBB8935AD90CBD
-FBA156CB503A2333A4EBA92CA2DCE92C5B687A4E43F73BB7F09B62FA6BE7E1495318CE4E7BA343
-D08A7CB53E32B05F63D836D8B5629651AA4C2DC68AF2E13F49276450F66B56C1EF299604CF0933
-4C7B154C923D4107D055AC7EF0F28478FD06C54F663B170DD58A41F293904EC7AAF6C8E4DFDCC3
-7B08702BBD8FFB33B007044ACEE7ACE3464D5433A53AFB6B7EE754CED830A1C540EB5778C227C4
-5CC7BFB94850544DE6C0D1960874574284B1D0256BFB7E5483FDEDAF31ACF7822A2B9DD27EA1A2
-BA891D72C9AE28F074211D528758C6E168FBBB1274199289ACA037D1A641ADED7F300A4B27C954
-63BEF8A9BD49D496300655C1ACB70A2A3FF89E065BE79F5F292EC6F6BD6F8987B7A8E2F6642E91
-18ABAB71DC705981C30C51C7FE6A10828A8EFEFC43EFCBB6BCC5A8492E0169F03492968D7F0EA1
-C4339519EE36A1E91034670A85B193F5DB6037C59B5E46183FFE468BDCB794918BBC8AEB2BA715
-0908DA0B63653C0BDCCF80BB64F36D0E5E8D4685B80CFC7E3E6F4DA4FDD4BB8CA8DE4ABF16503B
-D9F6C3C3B6F8F9CB292C9DAEFCC68EFAB16388AFF922B32B5257B033C9D8FC078AD296D49CB8A3
-3A32AF01FC192BA792C3A15E6C5B7A4AFB1C2FB00DF18076229550ADD4A991037C5D91B7CFD4A3
-5D08E8FA85D16CC2C48F3F32BA894CCBA2C6A3F964BDCB8BC4FB9226C7F8899900C267C70E3ED3
-C0797FD7377D3044D43C0E8172BB0FB746A706296D70CD23A5CE25885158C83FA2C9F10AC1E0BD
-8C88DD6D581289CE14AA88B102A47D4E52546EC6FFE7E8450AFE3F01706B2E3AFDDCCE4DAAB431
-5638E28FA4668458CAB2466768C1F3F8881CEA9E9A7ED57AE7AFB53DC590E601AD11ECA0E5CB2E
-4BEA895F6271B875D09EDB9D5B8D92647B67954824F0AD4DF1CC9E82F97DB638BB17322EA26C6E
-C4A5E02433D11B6A37D2AC10DA6D1035B23F1C6C80B7C382F1EFAC4622C040D108EEE91C397CAC
-E1EDC761C1EBDAFFCD6127B48621E666A5A5C33A3BD4F559C7C2CA7FF3C4BDDB288A3043E09441
-D35CB54F1218FFC4097D1FA60911189496A16B40D34EDA64A9225EF00B875885127D2A441DECEC
-B2BF6F14F6A3815A780A4DFCB6227C7355B377EA61F928E94486CDC0D42EE92494D5063ABE2DCD
-4D29E8967835BE5894D38F09399E70418D21DBD8AC679367EA9DEFA70BAF625F94F56CCD1DA6DE
-ACF583E9763BCD0EBCD9EE5810CD9330FEAF5FE60BE3AF8A15A1D58CA2A9B0785BC09ABC53F86A
-66CCBD8815F3F8B9B18396B045DE3B4A00D59D47F52B52DE7A52AB26F5DDA05E3B9751EE11A6F7
-926654FC7F909EBB7423295385044B8C44A2032031D462049FFD77CA8F31787268F64FDF00397A
-A89494308AD9EF15DCEF55BA0C5AC4E4435A52D2225BFEB438C9230CC6912DB18FCD0A6D7D4C89
-BB6B69974B0CDC28D0974C94C05A611EECE866140A00F4BF9828C5363D9A6FA8FC974368370378
-2EEC189B4AB960A8BA75EF432D7F7B8051B2D012FF76F1A55BABA16DB9EE5C9BDD57DA9A87ACD1
-D1872EB5677A14CC20F83739D95AAD0B3F26506976B1C822AA8CB4A96960220CB2453DFBB6EE67
-67FC6C154EA927FA01E697D2FDE73F9840043480A584337E7F466F5248570841A7344A37232CBB
-F088ECBBBA9ADA89A8B8D00EA7AD8FA02A4F79AF21FB8FC487528E3F7B31F11C3F2646FD78155B
-FB10245978554D8C95BA599252815A4995A507026348758626CA386F31748F70C2DF1482B6C987
-5CB7546B3B1B756F3169EA3589A1D0A543FB165795234464243A6DE12AFA76D577EA55A4B764D0
-21BBB4F203ED66A4FEC3B51333A57776A2127DFC59EE28229200C9B93A1FD1E84B9D5BA8A22FC0
-24C844FF8351256EBDA28CD78C9DC782E5BB85D188B4FAE6A427C251BE2C794D8C77CA39296039
-9EBC8BE84DB9C78319BD38A441158A999A74B04C4C5246D6982EF7DCF8D8ADB304A8511267FFAC
-C1ABE46C9EE1CBCAD63665AC606CAC7D56E9BC3609B3EF72176B49B63C90A0130CD183B90A6A40
-796E4CB9091BBA0FFC8D0F8CF2B016800B1B439B5DB6FEA0C399F8C1A22B1896E0487A08476F65
-F505717AE2BCA312EC891BAF95B43F49C5F71C3BF4A8B3E0E37D93A70D06C2FBBBDD77E7A0637E
-BBDA27C27C539EA3AD7936E4544583DCCFBFAF737A61557B0FED52471B5A5733A1558C9B53FD57
-D361306945A6150D1C0FC5EDF521F17F4D724348D5EFB86E8FA808D2CF01977B431D3E9F4E8A3C
-CB1CCB4B1750CA2936A362A610B05C73E382D76118024E58ED512B212B1DABEECDA7196C75BDEF
-3049455278956F60FA00D450729CCD0F01B4A63AD30D92B0C14C158B183647B655AEDEA612CFA0
-BE89F79C22F1F2D6AAB20CC382355B1159D16B7C29EDBF06E6831B395EA7A4102C99E400F911A3
-F306589C5DE6C3FCCD402B4E25E85C65B301C396ADA09D6A4577F38D21EEA6FBA8D50B5FC31C95
-740A9A7446B9FCB5D37ADC301000AABC7D8EA8DD59A63DA0FA8F7038BB1D9B2948635424C80BD1
-CAFCB11FBB85497BC4C3BCAE2A24B9373CBD005681835D6FA7798A45FB01C51DB842B6D4737901
-8349AE7D8C5A4805028B1DB4F634869A3BCA06029E8BEA02832397627DDFE8BAA44B05D5EB55B9
-2655A387E3407308E34AD2038C78037995339E047D9310B8EEA85FE275636D6C5C19586701FA21
-EBB7434A4915CA71BB0E833C16712BC63DE98B5209B0A730180C5D6012FA81EAE001E1C1E14D80
-34CE642A31EFA12B3A15EA53BD89C492CD6670538B7BFDCC629ACBFCAEE4FC4CEA070CCFCB7560
-B4F933E3D9D259F70CC3697901929A1F1605EE8A0E01EE85D4FFFB167DE6D916F2630DEB8CF317
-F494C4CAC3EE73BE392EF96FBD232E4A776022EE04146552F0E1D66B4BC14302986FCEF76F1B7E
-196753A2B4BCA87F804896B7392FF8E5183448899617F020386E688E7E26286CE5D060B00B485D
-ED264D191A5B528A4E516832640354C31D61EC4F7FA70125B5C6349FDE30694E9504C0A080D252
-B922305874F39354A0FC1A196021E29C516D62A783AC2594C28F69F6803314F6745AE6685E381B
-FAF83F14B8464D7DA4198BE48E76011BE6B3171EAD370CA699E7076071B2FF1856F6BDC61F3F01
-034ADDDDF56CC4914AD74282859C632B9B14293CDBBD9FF8FD4403CFDB761D3CBEFF84391E3D5A
-06B5D932DEF0861EBE6DD885C9C31DA765FCF358847333C966FD39E5000E9835A35F3BA93FA20C
-4C459A8F4DAEDE2C99EFBA13EC0B82AB546CFDF7A97879642D97F69C21737B22283B636494C9EA
-129A161BD8C9DD565BFB2A35503B5BF8A95AA69627E2A1BBBBF5BBEAA74A58CCB11F7CFA420B5D
-70B3E392D54A52FE59EC9A3017BD2D83B4E90E24D9FCC6D816E975544B96BB1F4443CDB81918A7
-7FDDAB25D9BF72D20DE17689121EC5757BB18324AC0D5F324DBD89B72F2271FA362BC8CCACFECD
-CC25331BE8AB8FED46A6E691F3AA6B0701F582CA8753F648828CD3FAB6E43CC92A924F245FC608
-350F82CAFF77EC9E2E24F985436ECA4AD84EB24435A5C4B330198B23E825D1ECC7DC5582886E90
-D2EA7CBAC9037B11B156ADB8110B6FB795BFC6D397B39FF79D8FBBD42A00C6020C63B011CDE2DF
-269F4754E89CF3F18F2B9DEBE3850A86AAC0F5006B528CE30BFF055110D8AFA688BA3B9F0D24AE
-50143F09D6EE6926BFA2E460B5B3C486F3810C5CF68F67FE2A9DD7FE9B39BDBB24D6E59D12108C
-5016007BB9FC22791622C044132BE6BB8F7F9C278C755DEF004E310EACD8F39933A6DF56BEBC5F
-B72B4DC33EB255B645CEDFEDB900B6E8B1FAA4ED152222A3E6FEA8D8BFC7C477EF8D7557B70E48
-693F8C0DCD118EF544E782C23DD3AA3D66C90851AC05B5818831E3AAF1C4DE9529275DFACAF48A
-2A87BEBCF4EE948415341227461D8627D2187CC9184DD3343F554DEBB268B65AD8314996BCAD55
-F75B5983F62EFDF10C580AE478B6C3C92595490A9E3AF8D279246AFFFCA3F3F7E79FEDCB652CFC
-57CC31B89E18AA6C5F839DDC3ECCEA0264794CA316EEE24A93A25E2DD12F0115B6CB650227FB26
-30AF4CF55F7AE4701310E11636A39C9FD1D3436524C57AAF409D24276DCC0A5CBE47EAE624D814
-A3A094C5C960C3566778E850BA04CCB58E5016CBE399A201B788A448F9969CB1C89EBD958AD83E
-4E9E2001D5A7120E73DF0D722AA3DC1CD06F11B2F8E911B794E50B50FAA29B49AE01B5C361F08E
-27BFF8DBC16F4E4EC034B3AB15F06C08C9EF4B5B054327BB3A5D25E41F3EDD53E2FF4EF38413EC
-F5E693225C255A9E1F4060B1FFF8E38357D06549C517F458B62A8E123985988726DB8DE3C9DB37
-8480DF0D731B1009516437512F2C7F898628330B0B2B2960CF815AAD9171E8097C933EAFCA026B
-1EDA2FD5E1E5FEA1CD7604124234CD04F50AB59DBFF1318423E4FA6FCC6B7E91E4FBDA149404ED
-E8E13993F65F12ED80B63FB137717990F4502A61C00DABD9345E94F043133ABEE22D2B7FF0DF21
-C4195C3E2F7ABD639941E47882470A6CAAD0B4A8C96B4E4E1DB918B8A926AB40E1859D719FD381
-FDA3F1490076EAF5D17311CBB59A26D198CF036B5D6A551664E2C206C910F8A7369183BB95329C
-097A7DCB992507F479CF546D645D52F2BBB452EBCAB40FD4109464D160B97ACAF226DF763FB024
-9AC97B71F735CBFA56D2E6ACD7710CE9BC2189FE53F5BB41C58C0FF1A1C5442FDC76D21E6273F4
-1896D7394CEA6C7500950AB85FAC5C8D4CF1766680A0CFA243A00B7DE2D180DCD1417CF25D7A30
-5A1B17534FD1D8595FE704A36B402F868E534FE7CACAD039E13CFF4CE59D382C107FB9DD98623A
-0FC04F9337010031AA47B7938F111335EB68AFCC86E477D5E76A1E4758C7319938944850E71333
-0F20E9A9DF969173018CFF594871676420136BB1A3E0CC89C2327F68B0A487D95463D183ECCF07
-4BA6870EA9332FF8B264AA779650A00A04CD5D443CA09453DC961D3193BD222D1F80BA0B9C4162
-D20CB801B1D6E8DD3D97CF05B841BAB3DF22DDBB06DD6A682C6A1E3CE595A28CAAD9840757EC6F
-8BE66D6B9CA3F6EDD5BEB6324873C0EC7B8B108731F3E6BC6588D69E4C7573D47BBDD93D03E050
-076B9A0EEBD7C020BDC64127AB58424291B1BC70A9F3D326C67D93AD24F67CE9AE6BDC829D7DD1
-61EF3C1A47991F54A807C08AE0AF24D6B952E66CB8E9196EA00F3AFDCB1413A33763E24109759B
-CDB59C2257C2864C458719BE17D929911C7FD72148815791A12EC2D2A3DD6407330CE0B4DFC3A2
-440FF0D6974B92B81FBF04B0FC4E4429B009C388FA8FDEA029AAD70151F5BF76B13933D3F55B5A
-C00DFDCEA91ADC73D3DCEF29EC261E07B96421E64865FDE1F8EFB7B5AB1273D5C2BD5261ACEADD
-7851504D19A91F295D664B440AA61636B62D02A341CEF145920C396C42244CF13EBB21D4BC85D9
-95A57563CBA0D4D046AC0B0D1B40D1BCDB26E5AB86A1720005504BE3D73EE22018F3642B1D8CF6
-4596A15ABA888916E9F12BCB15EB823337DE90015FFF5D1B87DE84495F696BA7E1704B428133DB
-54916A4BB7E31BF36CC74AC1B1C1AACC176E44B45CE6864EBF724D28819CA80FCD1BCAC9C6E92C
-E62D304E2D18A3C882074DEAFEDF1C55104F629481E6E42EE45072BBAB3074EB5AA1D4958BFFB6
-E541FC1849E6F5402165F5C4F750F72CFD90BA03CCED7C5014745B0F9642E271FBF6645AF430D0
-E92984BB4F96C993E3186C0D8C2897B692C0A0D198FF9E44C648FC2723F8D8A547F7ED08E89E02
-C00D26A50BC8A1C714BDE534580176C7F5D3153514FCA23C2D9CF3B6EFF7CF683712BB7AB3C7D2
-A3E66427ED0B625C088A2A57EEAA2C467FAF0AC5728495451ACA08AE5506F5410411D2B0912D3A
-F6A391FC7A4D7108C1B2FF0D1F9D09C2396CA85ECB4885B386F5FF5061AB78D9D915B2D3AA05CC
-192CE2751B8E1C99B043B24950F25D58BE9377DC1B9198C5DFB5FD6A0B91EB90A5F01257ABB15D
-DE8B375B0DD55CB18B8A42594724844FBB89FCA2215536BD9CAD8661CA6C92E32AD432F581383A
-90CDE05F34FAA585FDE7DA42889EB34752AB26D21D13918BBADC23D9C35B88C6FDE31EAC2A4295
-F4159CE1CC942B9830129A1B9474F154A175F3A71D86F1BDB4BBF15066948984B4FE902C3F8F3C
-0A46E6A51D86054D683C0A11ED0F151F7905DE73C589339153E8B4708F6D94CE02581C837C41F2
-D65556F5A706C06FFAD43669CCDDB2FFFBE01DCD46380EDC16E08945EBD749AD2AEDD7CBC7C2E2
-E3E4F666AAAE7A718AB5FB6A67297D8F9FF768FD216E4DB4645383EC452F33C1043B23ED9783C5
-C76331017EDEA82E29CCA8F436DB73156A71333E8851CBCAF2A721B7A57800CD72AADF40B6620F
-B932435AFE3FE986720FE713D424A3F0E936168960E171B9B5B8721B699C39B70E42C8E0430E66
-9BDD2870B7C4C66440C106DBDBA7665838F9C6CF6746E15DB725F500AD3D3E2BA2C7997FF0D513
-C91BB5C4824D51B89E7FF3CE26EED35E9A2DDA7420026D89674F7D3184E6C76D4B6D32F28B170C
-A928B58CA925E69F04A22E85E1EBB862C5AB0996F05C62E6DA8DB0B6195B72D473EA23CB8F9900
-3C7F35D51D480D0547BABF993B9235493D447232B362D382FF92BA13559F69A7E95C17976A5A1A
-979EA687227BD969D06E73018FB097319FA62D7CEC8B04419DDB4435972382C04FF9C5705DFBA6
-548561D31CE00457559534E531377193169A844152CD042223B47B7166A6CEED2B746AC21251EB
-900F93FC6F625D8FDE6E1D5374950F4DDD817548EBDDEF20123FCED4C3DF7A7F7CE65E9B5FC3D4
-F079B281D7C03DCBE9B8D87935D42CAE3ECE54EEBE41C00CFC98E64780935AD675962BE9DD9905
-9BC1DB597DE778C168F4492C26167085032E511484ACE6FDC8CF885DE200FF0A990226D0640BF3
-D78F53576875200E856089B11A57A657D37E0BC5B6046670377114396B8C740B5C166E15ADD5F0
-9BDD0CC3BD11C342B69C2D90E5507D83D3F6FD3DC144A2D2C80A02F455143F15949B81374BD436
-0E3591F0EE260233F84B50CAAC5013D6AB612837119AC3ABB6B2DBF0ADC06EB4D4295E48F1B6DF
-60E6C98332A380BB997B769F7C699827A6EACB9E14B79CFBF83E11AA8B96A3EE90A2AED4035296
-05834F1489CCE75443E75382D1B413D8E0AB4F8AA7C69A3E499FC0077DFC9C8AE155F5EB403579
-B6293E80BE372197F33AE16B3F41F75FD0350E3267D963D7D39AAE9F6741EB1D242B3F9CB3997A
-0577421B816164A5259457F56724E7FD562AE67136D5BF75AAE92934F73240C98F289C566B8582
-EFFF34771E9A1C04FA01AA96C258A3C7055087721981F4343CB87F07FD49B9576C4F9429BCECA0
-20027987609F6A49D73984819C940AA1701A6C70086BDE720E1FCB0C6FFF14E15978E462A3D5AB
-4D0F222A990EFB6D09EC67B467EFC88275DF2598F595186DE91F398AD8CA3D232EE6FBBF2B9595
-0735E0F625B709CD4ED126C063894BFA5FAC4F4B7A8091FB9D94D294E3C284781482184D9AABD8
-1F723B1F9D8AB2C7157F8E4A636F253CCE3EAD18A0F7D8C38B76B88913B8E8DF121902BCA1EE8C
-4CA2B05EFB5FFD8C1EE4702885EBE96755A2D581378F71646886DC140216D13AD4C3B3F2C0D2CC
-D8DCD4D9EF6995135D6214EC4E3D653FEB11C22F5EBFF43EE55230A86B8E78E312B7ABAAB7B749
-F7C73718504B28687AEAF731FB83EA4C0B9B5477CC52A5D0BD4252FAB095F558553FAEA5784B94
-1683E0DDE43A3C7B19A6C8A4D39FDFBE50F967095B202F5A184244C31C2149E73CCE7E0D32FEE2
-58425D0BCEDF9BD2FC249608C6ECBAD4B7EAA64D7D01F333AE334D173E859F163396A88A1E09A3
-96F47A3FD445731F18EA7BD26C621E349E314159B99DC4432ABC9FC2E5CBD8E162D9CBFC7F5D8A
-90B7A195A7B517A91BD8AF517EB26A8EBFE30CE667BC376870E405F4DEEA3CF4331B1A89B142A1
-DDF343B52419528628040D173EB0828C7B00BA62BF5DE4956B23FE62F555DC6EADAFE18315F268
-15D3DE1AD5B9808F3A016DB66B1969992BE7CC676EDC26B87A11A89278A82DB04BF41CB21C805F
-2D2CBB9B4E781F6B4DC755880EF054C74870B847332B344DD056F1A3D7319162E782A625E1110A
-C80DE10CB26F7E670BF997EEEBC31C0DC875BA67BF7EE96C70347DFE02FC64F4F7632B2CD1D82D
-026A2D7C14536E7C8ADD18491CF2C03B94BDF4A54511B7C9A515F3EFBF120491113E7EB58FED08
-1F16BE32EE7D1BD64CD134834F206E636F9DA1DF7E393659821490E92A81CAD875736713D6EB26
-93E0906C4347699F5632A7D3FEE62C5BD09564AEBECC0A09500F1216B2BCC8D9ACCE85910BC406
-71670117EC279DD3AE212329B50E55DE1DFA4D34EEEB533AF5407331CE8FCB2D39F2DC59654FBB
-90A8145689145414A95951C2E41A64375B3B7C7EFE850FC152DB2226F511906CB01C4D487DC7D4
-667678482DA2A0B57728BBBE04FD7420C49289831DC8A627C82236B3764DCDA399D5C8EB0E0917
-0A1CA8E43B4CC2C0ABEC5B60A0AEE5DF738B76C08B354372BC28A1E398159B9B6863458EF40BDB
-810731A45996A64EC80889B94A12C6C5E3CFCE7FEE0931AD3BEAD31C60E07B73B1828C86916979
-54602AA6226A830902BBBCC8D25494A7B24A67CE2B258A8050B9659D3FBD3E3B0499A7FAD90851
-0DAA4E0A8FC39BA6A871905BEC3535032BD2FC641F53274ED8A47B8D8F693E722E28480B33AF79
-780F246979C0BA9112071E45C735AC38E0A2FAE61ED8CEC4813065EBD1EB31FB5F0DF37322B3C4
-79D6D8ABE7D3022E1B10991F9DB03D3394BD71AD7763D8A287A2F11A3F4CB87F0A4D1DFC11C936
-7769660BF060965154FBC0255D6CD41E77ABF528922809D141A80678B1F564850937342011C2CD
-A7193A4BDDCA3FB1773FECD40B37F367507EBE2C4F69778BDDE54DF9EF70583DC98F80EE984ECF
-29646467A48115B5B40DC2C725100A5BDCF8524EE61B841A45C1583236ED7BD97F37E0A9486902
-55A78A4563F25BBC1957E267BCC2932B59EE9F62FD7EC053041AE90A165E4DC412F3B5525932A0
-5D1B729EE049E95FD7DDFC41289ED305430CB9A0BA0E2983C4966AD1E4C634E67899C15CAE84D6
-C6A0C2D6A2742D741EE5FB897E004FA6AA48ABA7332FBDF0971A4148FE73AF6D4094889A87AB06
-FEFB97E11ED78C3FAD76376C3620DEEF80BBF7B286290165F59B78E21F96FC2EF036D65B01589C
-14DC300CA2BEF5E5C9414A4B7F4E2434DFCBAE0510C7CAAF5F86A917BDCC85A0C7D0BCA0ACEF48
-E54BE1D943324E826E1E9D3F0A54D36474F74300F94E0D7391A13884440915D1F91F5BAF310230
-9DC18A2A75E87DA722764E799A11CE89833205B9DFF25948E5D1F3A3CB1E611CE299DB7343F320
-00F26A10C4E6358358A5F655D15D381A6D98002D83DE29B1AC943A4C6F428D76E607702B7774CD
-DAA3ED711F352F5A65DF01BCB0B7B25CF801E24A4E3977840D0C6C42D71C75AAA00F265CD259B7
-CA0EC27CF0B120395152F29EC1734FE5F40AEB4BCCB6D9AA0C5D38FE7324FEECAC5013446EB3BC
-E7DD468047D0B7705FEC89870073E5EF829D4B782A8C67E134ACA1FD7FF4405E1D399F876F9361
-4EF88E2F65E13B1CCB0D9149C59129391843150AD4925CD95A3CD05787EDC236B5FB0072DDAB14
-A148053A4E06169980490BA0E5B8BD46DCCD063AEDF19BB4AC6F1396296435C49756D043B11CED
-CE66E71108FB6A5F297A476EF414AF75D812D4E4830A80894809235EF1C43528D0AFE3938728A9
-5685049D31548CB5FBE281C3501D050E8A3EA525A55506FFA31F0164919B30A9B4AFC70225048E
-93517E234B0D671A9F74AE8DD155D35DD72C6C8FD359B5023EF5BC74A59D159E26BA68F3D0D7D1
-D90F1B64A4CD270C1DB67832C814B44AAB2447DCB00F73C1DD5080C7616111ACB6289A0362B5FE
-C39B09D62F924A98C37F1C3D3D18B7018E6F6D6F851436AF6CEB6669143D30C85F958DB2747213
-77B5B73738F9442586008C38B843E9A567F7EA876A3A33E1827F12B67516AB2A678F131D8FAF62
-DF923BD6C4C5C2DE0B9B229541A02E9185AB6C7A56F4DCFB59128881D87C7A8866140AEF0C6C4A
-B253B190E048A310F524CE453EBA70D967627143843FC4D19E4E71CCFD3FA84B72C51BD211B2D6
-E96951EA3AA1E9B66E55E0117A43F0DF8E5CAAFAA6BFD38C71D68AEB84BE2AA3B8C0E451405836
-59703D79568B7DE8D955D1AF3146F514E5D87CCEE9F308ED802B49DAF342F8F4555309BDC09B3B
-9A1D13EF3FE6DB875B775AA3A27B2C1AAF68398D1D7EC8750B7BCEC2B76F27EB16F5E496DF2A24
-D14B6D6C3830616E326BD0C4500DB16474F5703C9556E760E93F7101E251D14F1E425BA8BB73BA
-12F576A778BDEF7742BEB228BAEE59D42E05656281C48E982FD069917825F2A06D917C39A6E990
-60B57037A8798A3C9BBF361C826F6D0E565CD4A465770908259DECA452D45922E87DBCF7CC9687
-AC7A2E57B39B9C916C00EEE3422B79529847A11ED8E3EA4BD652240339959B19961077219C7D3D
-7AA153CE334B9288A4CFC5BD378C8D1AB42E6DA7AFE9A3DA92832A235D615AADB414DF33A7880C
-4757587CCDC298137211644466C077618B6A8B54484D62400B9CFECBEAA1ABCDB7EE78022DF46B
-A3BF4E36DAD7520AC16DBBD895FAA89CE06A3FC283153CC862DF5419ACBC27DF53A1C32B4B50B9
-34DD753227AAD35DAC0F77855524BE8BA3C0C11511E9E85AC4DFC9F4BB97BDA77864B162DBBB36
-2A9C08B76048A88E88FFD0987CD09D166954C59CCB66AC61A651E42DA851D7D7273E60FA8DC330
-D11A6D8087CB2765AF085C09CE05CAE89B110C6AD2C452FD4ED326CB66A48E0F09CD6D0C5287DD
-DFEE9E7368BF41E1935DBA23267C999793F2EF9B8DF8260A73642F322E3BF0C79B1EB998076D09
-DE104F146E6EA6EFEFD842635631AB2AE364615CD32894CADDA2E679354BB4ADEDA35763FCB18A
-2FE174762D316F10790EA888CD76726DA3D13458E7A6689A149B5709B455866567712D21E5819C
-5A7B8C4FD95377A28B73033E10AC486C72076A616813F056B1B39CD9279B64B9A382B506F3F252
-FD0F5107B9CF36D78B5EF60DD9784CA70E0BDEEFF677F50F506EC83EF33F832344AFB67F9AB4D3
-3DB24BE3D7A00B8A60EECC7EB5FC913C05F641C71542ECC9229F67809B8AA0175EF31ECDF682DA
-393A9343FA19C4AAB52E8FD310F1A2EA4987EF6ECA0D6EAFA414545AF99376FB13BD744D1A2ECE
-30E2DD47B5878DE5E6312EA76D699AD6C217BADCF535B46E2EB7800A84D3083A6270BB2C5A5D1C
-0057B424531EB48EEB29E445B1BAB27637FD4955535F62A1ED59C807F3816D46A96AA3B0160190
-5FC7F23AF175CCDBAA060ED6CC1AAE155F18C0FA0D8439BDB73C35BF41571142F8C8A696787041
-99B302C49AF02C4CD929D2CA7F0403BCCB6BA8B3DD12B081A9610487436274F0AC8C21B722C539
-22611009B8581352D989EE065FB2D1A8191C1B0B712C702C4FB566A19F382B4AC8E840DC2DC456
-BD91F7BFE2F1EB225F6AE1562F6DE9D4D6D46BB2426126ABA9E7BBD21F158B3FA9A040A18528D5
-946E6C5B4322070B392403AF18CE0DE9CA09FFCED6F66F7C646C3DF14F5121B34E41DBBA653370
-5497A448C4115DF01E7DF753EF61D9B8618796AA26E0A8E783A6DF
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-cleartomark
-%%EndProcSet
-%%BeginProcSet: ppcod.pfa
-
-
-
-% Generated by Fontographer 3.5
-
-% Copyright (c) 1987 Adobe Systems Incorporated.
-
-% ADL: 712 288 0
-
-
-%FontDirectory/PPCode known{/PPCode findfont dup/UniqueID known{dup
-
-%/UniqueID get 4303738 eq exch/FontType get 1 eq and}{pop false}ifelse
-
-%{save true}{false}ifelse}{false}ifelse
-
-17 dict begin
-
-/FontInfo 13 dict dup begin
-
- /version(001.000)readonly def
-
- /Notice(Copyright (c) 1987 Adobe Systems Incorporated.)readonly def
-
- /FullName(PPCode)readonly def
-
- /FamilyName(P)readonly def
-
- /Weight(Medium)readonly def
-
- /isFixedPitch false def
-
- /ItalicAngle 0 def
-
- /UnderlinePosition -90 def
-
- /UnderlineThickness 36 def
-
-end readonly def
-
-/FontName /PPCode def
-
-/Encoding StandardEncoding def
-
-/PaintType 0 def
-
-/FontType 1 def
-
-/StrokeWidth 0 def
-
-/FontMatrix[0.001 0 0 0.001 0 0]readonly def
-
-/UniqueID 4303738 def
-
-/FontBBox{-1 -288 606 1046}readonly def
-
-currentdict end
-
-currentfile eexec
-
-D9D66F633B846A97B686A97E45A3D0AA0525392EECAC163E584A9104D99AD0BC1B1F3F7121D1D0
-
-F2C60DD206B0D3C8C450620B47320CA0AEB8937511E456AADE8E66B301B1E3E9DFE17E2F79ECFE
-
-A709FF3DAE19B4C169DF6773EDA414D02915A6F0FAF8B24FBB0777C697BE8A37D63A390AD9DAE4
-
-95BB7E626721FF2FD3FB147C80D22BEAC37C2624D818D58C8DF0209F5CE76ACDDE57A303D9042B
-
-F0A674D095697F925F532D1814BEA8F8A5B5223A32BC4A95402F2C843181758752FC330970E817
-
-3977418EB4F64FD5E455C3E4165C9AB3D8504D946F6B5C3F4929D463E1D6E6B5810DAD6C7A6529
-
-0CC6DB960A1F943400A8F6364DB3742BE96B5CB4B78CDC5634A9EB3C62FDC481C9C101E045C629
-
-3CD9D491B77482D32797F4CC0BFF20576C2605ECADADD775B2165FEF0FFA0F4D88522D1BFBB05F
-
-BC5062AF54BB3FE2C0B371E8C7BEA0C644A32A3DAFFBC08BB63A97C18A266B310B1C1B92094348
-
-60478D282D394123AE06D8EF457278BD26FD6EEF9B95B5CC7D31E1FE462D8A5FACAF5CE5F42B45
-
-E1395A3DC60F37F5CC752CD81906F28D3953D61F55075081E14745FDD659B5B0A271C8A423A0F6
-
-78B1CE24E573A24B10A5BC378A9E4410298EADD90C159525B358F72149D24291C923F2C91D77A1
-
-32347F5F471F1139B9938E880CC5B3409B33859FE870D28B882B96D8B537BF229EDAFDE8C3F6CE
-
-7CF51F18C5B50E315E93E4896B85D998A43D47BC2560160139FA04813B3CC5C4CAD527A8BF8A21
-
-751D1FF032610410865DC43C499080E3162C1BF74077F8FDD45418BA7D690C23FEBE5E9DBC7DFE
-
-0ABBA430AE206C166FDCCACEA3D4D346F919FF8293111FF626461C28A9EF2072B2957D98A12B7D
-
-4072EA28F07755AE9D83B5D86DF4B2EC81023BDB5DE262D1AF3FD844E9496FBFCB61DA20388909
-
-7CC13CA9BC695FF8EB10B59ADE5384D2FBE0E741F97DD10CFCF168DF343075F34F63C2582A53B9
-
-2CEAC572EDFFEF54B2F8FF5D617ACEDDE59046C4D2D7AAE0F147D8D2FC3769AE15904DEDE6CD4E
-
-1A944E5ABAB181450C36C74B93D8CFFEEB3B5876F9FA7B3530A0E6DF9670E2BA9CE7675F9F1346
-
-EF3F5D38202A50A8CD6AD203250F2932EFC08C8A4F7894A4DC1C80F2B2BB2C71682D218D1481B1
-
-18964F33B16F5BD3522D16F9F3739F063D8D05463037060433CE5F2F84231EBFD1A0524497555E
-
-41856D173C70AE0E3DB9E1BF4C2CCB9458B0C4FF393BF62FBE4E4E78C53F67629ED378ED695916
-
-52083BFD432D05F8FCEA0FAA5BC1B4CE9EF698EC2345871944DF7AA4C4FC3616AD44E9785E2B43
-
-B738159C84261FFD04ABAD0F82033F1D367737F04F70CB2812630D170A08E9D6976F134838E22B
-
-82DC60CB4B93215515DF5AE0BDD7D9F150B1364A49F886F7B196DD4A358715CAD8EC282F9062A0
-
-6D6F2CE0BE1FB718F4F0C0242416FDA7A9CFAD1A67001DF7AB7AC3840F776A47D0519A7116374A
-
-D7620CF527DE6343948A7CE6763311FCE7F3180304C3DF53CCE7DF85E9B21A8A56ED2CB0070C85
-
-56468DC6D6EC4758F34423F6AE9F1F973FEE394769B5ADA4A08C90AABD5D07E0F07E893580137D
-
-09CE94A6CF3B8CD2A650A6F8C42F33A5BF02A2F04CC0DA224FEEDFA59F313E8E5BA98A2B95C59E
-
-081047EA172DA8569345A62FC12ADE17DEE499CBE08ECD7B18A79553B3F391DD7C9699FF209B4B
-
-8174D217DEC328C0A8939197E6C40C6153F6A49E69AD7A7333386B30303FDAD868DB58A9E5A13C
-
-AC55EB76A2D241F93234508B436D0081783E64B9431260115720ECA10156AFC676E012A737EFA5
-
-0EDFEA396E2C125CDB78BEC266F894FE814DDFBD24F2D1DDD68A9773334FD39E7A72C023EBE0CC
-
-A6E5D6E0E3C67F3187B4FAB906302EB810BBC5ACDEBD482E00F281DAC4A87C83FDF08F2E15BD17
-
-8A77A4792F69C23486FED2344DF26043D76F4C9BBF54B2BF425180445D9563D99DD8FEE3F8D2C1
-
-A660AAEBA6E0ACFAB5CAFA7742ABF17244EC9BD43B74E64659D03369F252851340976AA18BEA26
-
-2B9287566460ED054923D82797A31C3E4BD14FCDF9F30C94B50364368C1BB18A10BCF47325D833
-
-F3DDD815725F628E9242CC62155550D54E1B698FE66DF29B79817757E02D05190CEA5B78C35D05
-
-FF87E5B2ACA9E7E91FD5233DAA7F5378919BD11028F25439E1E35A5DDDD8CE710F4DE16C1CC0CF
-
-FB1A9BB9F2B8635609DE6479E83BEE8FAA4DE3E28932BD18E07EDC326B1428901A77A3D23E8B72
-
-66796CDB8B5B180E779FDD9DB73AEE5F45F72FB55CEA6B9E52A2F72497A0D8C12C4E176060F398
-
-7584E5C0A8F6B74935349C153AFC56434F27F0E248CBF9E6009900A7B23315A0D835CA08DD3A34
-
-697F381E3DF8CE655DC3B2D383B002DEB4E87B0B7BE14130F54CC3B433CCCC9034E021709B6F7F
-
-8C25DAAE692BCB399595DCB00978FAE3454D48EA1052369B0FBB4B340D3AC6C3279AABC6526F99
-
-362C7693B0C0167A539CF4C8EE7C4B6FDBE6235D0669FF525E05E127A0E2FBEDAAFAA82E843EE9
-
-0CC32A9A80ED98542E23D7819F5551D8B065628D4532081B00B728CE2C67855045475D9D1432C1
-
-C83F12A3A628D302697B418D6699C9E4380704D05C0270A736015A59B2C4AF2EC384CF0F05496F
-
-01C977FD39C6E778F38D5E438DB5B6B05E333AA6F4D7DEECC6CB4B098E1E5138E9829D93B21F05
-
-FCD3B5A316BB3452C516B2B8935B1BE80E64A7A7227BE6AE842AF11BFAF372AE4E41F8D99D2810
-
-427F709B97E3CC0DE4C8CF59A4B59582F9B9385B4F8E822107A79CA447B9F885477DC4B65B7BAC
-
-30A40B5141A9A3FBAE99F68B27A3CECB7419103BADB770EF627B2AE0C4F6F368B1C5B9AEF0804C
-
-FECD822D6D8EDE9F42E17EE2A6D385FB06EB17C1DFFA25626E6699C4D3B791FD65F2EE5D69DFBF
-
-4CC6E06F7F4EDE642B163699B239830DE0D120E1F496F4026A31D469E86C35B01310D9B521F5D8
-
-614AD281F159E197F8A66C5325A2946216CCCA969C4F6D2FC05080BD50AC3D43026B89C2E640A3
-
-5964555A073495388D487E919C7A40086217B32FE8B5215A212204D44728E1F245C913806693C1
-
-CC8FED12BFAF14C4DE4DE0BA32D76AF52F6B316E9E64538A72BD461DD2E24158C75362031800CA
-
-20F70387543BCFCFEEF0D1B3E7E108E106D8B172B4BC40F83AE4D58CF8CCB1230D6981AF00A712
-
-9FA1ADDC1EEDF23A339DF93DF45A3FBD7829BD840CE86EA2CA24E020A0FDDC24664EA42BD15C32
-
-A2CD1D7C327CF329480B7211926FDF44FF1F73FD248D980956CE170271C77DEE57164BA2FED513
-
-5C3777E10956C9E382D02B888261BA22FBA3D5374BD2130013FF2EAFA4CE4C1235DD5128FDDAB1
-
-63059F4A7B911B96C587526533BE7255749EFB41AD032CC00CAA20C2531E4DC09EAC48AFBE0425
-
-431FC29CA48A3749AC9B012CBB209F77D931599EEC8645EF18793E79D35C63D4F1A7134284BE50
-
-00DFB32EAF9021D3C8DEC2B119E376B3F2E94731B23FDBF8BF6D36AD9174F56756B90207511267
-
-8DB30EF2F34F7921AEEB3A00B6EBE69D18F6D1D10C5B5F5CA5F37FEB97546191F17E1F897637D2
-
-9AC366148A9D7F09B0614F630F829F155ADDA8E704EC5C49F963BAE89A9A6611177655EB85D2CA
-
-0075DF5658FD68641AA7B31B8E1EEC8F715D6DE9D422274BCD8382082D625BC812F5DC3F86EC0A
-
-376BB596C233F01C6F54780909671694E902CC1B96EFB0AAF2B42BC8BCA01FF6DB2348EF7DAD3E
-
-7E9661189FC27D69122447BF81F9466A73EF04D4D4BA628B63BFB84AE88B472965ECAFDD34F7AF
-
-8BCA51077C2CF364F152A65347488BCB948F87E99E10F430B2B0964ED6114CB69AC8186E486D37
-
-6F57C438B8959C360FBC3550A3FC6B973B603F64D2EF99455C82E1107434A0EC3EE4E1FC1129A9
-
-FF12A23246B410C74E13FFB07DFB6A6227A73A0B6B4518A0BA2FB6007B21AA81A7EC747C525F2A
-
-8E6C2569A9E950E0BAA17A5C9D9A1E5155147EEA4DDE831AD8CF69C7814D76B503933D91AA93E9
-
-A97508AAF29839E177898D79BFD277005819AD87D9338CAF02ACAC44F891F92813E7DA69C82D7B
-
-6EA717564BCB1D470B090DDBB1EFB308613AD61F5D27338FDC8172B258009CB7A5FFB872E43C88
-
-20FC3B8DAE2EACF870D7C5A88D4261982800AAB36E94968A4C5C24EC5B0E538170E8C6F9AD61D3
-
-E6C713B6319E8DBE7074CC2228770AE51649228A9FC184AFC1BB7C67628FF30360459352EAD6B4
-
-A2A69A3D39182E56CBB2864A2C1180A7C777E7269C5743D5A739B53D3A2C5BBC9ABE8337C35679
-
-6BDA40101D11EEB43BB8EBFA73E4E7007A2EA443AFEDA678E1B14A2AA2AE6A06D12398E68D6371
-
-A457859C0FF25A81C5DEC3AF48272CC5FAC044AF2E71D510E5BAAAC8A50542D9379880AE7C9D2D
-
-1C822B5477DAF5150B84FB9A1A062C9AEF9C03F89E0269637F056BF65A92CEADE31F2E3D4C9589
-
-0701A4A064605CF79E933A85185B50D14A4766563A952D5A3C99C16CE7A50BA68CED98549DD395
-
-F6698BE4F7976AD5A00E737AA33CA51F4C7308B66B10BF636B3C4DC8866F1509B081B178059340
-
-BD9849AB487CAA004B8E60241125457C922340B1BC817885B703914B0FC58F1391016FE1E3DA04
-
-AB5F2056AE0DC8A681C8DE6CF5FA125D2C7F5967DE841F076AEE8791E6C17D7F698F2052A9C641
-
-04924F9FD85BBAF77D9EE8711F147D730A6F89DB2965CB450F0820402C2E52CB57977BA0A77E0B
-
-7682845F3E4266B77304F163AB2CFD49494917D2C5963A704CFE46C643EA7ECE441F82E272444A
-
-8242BFA6CB813B661CC9431DA9C1E1E9C6A861C6C0EB3053D1D62CB774209A7586F9694B558DCD
-
-625B55A0E9FBCE5C15A9A002BC9478908553E95302BAD1E4DC9C250AEF170495FC898FDEBA345B
-
-B4AF706334CEC5091F8AC4A23821D0FEDC6167A15F45633A30DDA88EC3C8C6E235A5A3C1BF1BBF
-
-03A896CD7804C297D6BAE134DFE4E388872A05B92034AE70DD0CEBCD571655B15078A2719AB32A
-
-528E613F2BE3D5AC5F3C938D23BA20DDFF1422560726B62BCB1B9EA09DA1A28EDB55F5CA2D4E05
-
-50E1231157A81978E7B05FCEBC855E54A936DD4053A42ABABF820E3E4D37278909ED49E49C6213
-
-9575862EDB983BE4EAFFA6B946CF4DE068FEB740927C19935D25DCB15E817847214774F290CF03
-
-E862E76335CD1CE46188CA3969F0B3F9F1DE174C9E480C4782CD5DD6DA4F19B51F5F09B78CCBD3
-
-D5AC80DE849278DD5A84BE0F9D67229113FC4BCC4829F89EF61E8EEB93D48F263098073996CE72
-
-05435589588FBDEA91C18F8BF53C81DCD10C74A6139B5A68ECE7ACD3A485723224DF00177B1D6C
-
-48D7D92D0A5A9E550D5E061765B49616C65305916E9C0C527F6A8EB6CE031EB88311A9686158AA
-
-B526BDC7B0ED01EF2E84E495D10A50C7BF87536C4D4BFAC22CF95C58462A7DEE8E671752E98429
-
-8DED64452AB8463A8D4D98CB7E2121DCE680D13CD52B4CADC738692F6C5C32AB378CB2FE4FFD68
-
-11B2F99A6D0BB9BDEBCDC827DD77603BA5814226F39DB9AA83AE2B91C0C6020E934190DC610136
-
-AC6CFC5B6B5E86A66DA2582406364FD1AFB14360CA16EBD4FEE6DD5B5C42E7ADCDE9B54661CD25
-
-1464D5C7F89B62C99EDAA697A96AE85C1D280BEA6F700110B2E39C0D09BD14A548D2978881EF1A
-
-38DAFB197BD78D62A17C343873F279EA84155D79E17887C8C56B8E7DED38D064EB811A953BECB0
-
-39C9EFA45424D6455B869EEA5A252D940CF0E43D5162EE408E75F2EF0BE2DFCEE6448DDA529BE7
-
-57CE4DE31B80A4676D23FC0E901B89CF02AA0562BE66185F91037B1B56809FF1046A6FC39C9B9B
-
-7EC27BA4ADF238760A575A472273BB64C5E2CB776207F00315B73534A539764009372A74CC7612
-
-9DA6188A383967DC1165C07C7B1F93B39C6C201449106A0EA1276634A6162AAFADD21C61C1D560
-
-1BAA67902785CB90C87B611D3A6A3B947013BAD8C60A3D4D339A3025BEC74B6DD387B7AFAB831A
-
-87B7A71A37D251523C48642B1D479D8368EB31F8BB8355EFCCE5DDD1323FC99A56B1089B752A13
-
-52770BC7E1821A398890B31650E8EE14B0D49BAA92458C15C2941E434787EC4BD034C40BB0E209
-
-6CB29B175387729ABF0962EBD02424F0BB509687B03A39A3BE9658761F0703C5D839B60C4F98FE
-
-FBFBAE07202E2CA22AAEE145DDC10409010E2A59B934401EAF67B8EB499ECB92B375CFE8D54125
-
-CB6B20C9968BAFC45D1A8BC65D98D7B702E624794EBA8C1EFC9433FF2BC3972F57D8FABF27CE44
-
-2FA32AB83AE5DBADAE01EDD183403D272AE3FCD75BCC750C90DF7D0B5255518AAB0C92D30A0164
-
-59D9821BD7E1D4C4F464E19B0AEB78276190D726C1D7674708D0A74CD05920C2A8FCCC8581FEB9
-
-998D735D811623780F129F0AAAF113F75EB28F383C9B8C0C7A2221C3A4BF641961F38DE9DABD33
-
-A803E9436E5B9842503581B3F5445AFA039CB10C936C8B0C08DD49BEAE1190AD611F3F23FA77BD
-
-71A80A1F91B7F3760F5FA35BCD76D8030FAC872C637217B07CAA452C72DE3F805F58820BF1ECCE
-
-231229FC5B68E5F1B20259DC92AF481FDA92D07F276077D783AA45349915B5F81C8C969739DB56
-
-F4522D02D547DC76240D69CCF2D684242020DE60ECA37D7E2846C5045F6B2D105B7D5A3CA5DE6E
-
-73A56715D5DE5F3EEE3559E657A5EA13C9716E3A7AC0DE25E1720D52ECE8A84D5D1AEA04DF0F7D
-
-D846549BAEB5C5032CF3C251A5A63A99DF1A33D0548A72735FD9DA8267BB4B57A5C58D4457BB12
-
-42B5152703E62B64C02AFA682C65C4112B2838D9BD8CEC6BD9D1BEA882E5090046E9F22087E6CA
-
-B69F5325F0C69A4874EE820D18B64DCCAADE6EDBA3AC758E54A7C9B6EDBC40550DBD4758017842
-
-1A8C5B6967D858DB9836184459E26340BCCA7636A84B7B3CC9596A907528455F4646B5BD789E94
-
-9DD0D1F40C0AF21E3971996FAAFFBCC14E19030924D0D38A948EA552971BA65045F2817564D593
-
-4C2990C6CCDE26329F23D8B369F3AAF74A125CA1FD552BC7122D21109FFB36CFE387F22CD09CD3
-
-CCD47EFDF7F671397CDFCB3F457B2E6FD2E2273AA268C4C394B36145131EF2D4D10729F64ABDC5
-
-EBC7B20BD072EC170432982280341735297A7CDDCBDEF8483F34AF7A797160402B10CCA1C78AE3
-
-9AB6170CF6DDA19EF0F22BEB283277E06544881B6B0D525936A84EE91FE0BA8C2985B6E32AF94E
-
-DF33E6CC70408F3BC67070A90E0641BC68B8CE8FDB46BDE2FE80BD7070F0A9505B0959B1509E84
-
-CC666CA7CE4EEB631B6E8D19816611B5ACE957E104CCF3439C2C27741CECA6F2956B0C5E0BD7C2
-
-B417C375B630D4CAEF428A88584A3D1962330A316B9058BB1324FCD908781ADB47B39425A9FEF7
-
-6ADAF499775F68F98F65EAF80BBC9D4015D05E816D2EF9A1FA91B01E05B69B9E1BF75130B4C7D9
-
-AB29D95C07A4C3F2DE00C7C2108F7BDD2F103D8A7BE02AFD12D1ED26A01AEF6B18CD6336765899
-
-805618E0405C18CE7F06EFD796EC9532ECAF6966F76EE335419454FF647FF14162CFE1ACEADC15
-
-A22FD4E6DC78A93D51A6076553C2D707399D27E5AF882813BD3248B9110ABA3CDE8D3E6BCD23F1
-
-DA141BE6D45A9E6E36FAE1DB0C0819270676536536EA13DA4F07D5BB6277F7E4C609E4E16E2EAC
-
-8806F28F4191E71096E2495E64DB238E20E0D1301B3F34D9FB4E6E6106C03B6240E10C0FD01B6C
-
-352E9BB9300C246D0C020F2B418D76A0456784E58A75AA5C725E5F9269392A90D185DBDB5CE2FE
-
-AE31ECDB3B63843AB2958241BBFEC3C04CE0AA147C504A45DBE05503DD493A03857BCD7E4B37AB
-
-E8572892AFF4E271F510C7E0649C58B3E3CF75B8C3BC08EB34AB5F765813E99F99ADE259C45327
-
-2672F9DC25F031797C4269E8CAECBC3E92D1A59FD1285B46500F9A2D679EBECE480945D79A50B9
-
-D5D1AE90727DDFD6F8C5EB03B2EA70C169828FC755BC4193CD027EB52EA2DC7AF09C0865695106
-
-5BD78AF57C289697655A3432A457792BBC88949C40F4BDC071793853F9E8777839C7D7F93639CF
-
-42F1E4520FCBCAEBC3BCC53C83334033C25E50C72A3BE0F337CD14996326C169B3921E3442CCDE
-
-1A444C94AC8D2ECE632908AED4A162A74021555CA73B235715B965CC867727E48C3B6B39B989E5
-
-33B92BAE40A0FADFC8BCE85D2A7EB6A1C4CEE21472345421F9B80C5EE641C91295448A51306CAA
-
-41916DE9DB4A78C7381067314A8B39B13F54022882286724BCA2C10687988E4C4DDBEF5E2D36F4
-
-36C9F6495E0D40AB6F35E7D0D5CB8C2A753B4C355D0CDADF49FBEEBA5239A90A56D826A9BE12BC
-
-62677F07CB1CA5AD3A8A39E10577E5FD95E82F2EECB4D4F7B55DFF835663822851B7B66FB4CA4C
-
-758763437BD7FFA955914B267C18A55D7C913C4B8BBACE885F5806BA7265167003198F3C3236CC
-
-982EBA78D01F4270AF563611B84C839F9F414A0FDB4CE0E3AC0A6629378741B5993B40CA190243
-
-C30C55759CD545B2843404994D02ED271D807B212D4D39067624C5685D04935F7C936EDC0D6F9D
-
-DA112228AF05097780EF6B3F7E3765B7D3B9D9B292400D7E931CF98B84E5AE51D6FD741E6F8401
-
-D026309DFA92510CD2254EB234E6B2A04AECDF39C03227D07096C4BEA57866D91099E8CF5F0E19
-
-A587A498D6BB3B492EDCE600E463A0B6CEDD0C33C270F99FF12906EED6625C61442D7AE3A8060D
-
-85121920E6B940EB9E55037F40D977C675DF6E825CE46FD9A1A3938D9A1476C0E0A575270004D0
-
-B56126C50A62FC211DE28D34C404BE017A823352676609A5000182EFC3DDA67D03A12CBB25C99A
-
-6182C6D3D92CBBB2F3B2D3F3B7FC90DF0C60144A233E71ED22D4113EFD9542081802AA7A678C9A
-
-F6811790ACB3654DFDF82714598756E365182A7BDEE311B7468FE07C2F9B829B65F287D55440FE
-
-32240CCE521E38D71999A84ABD6F6C1FAC23945BDE97D1B2EE8234A2A12F4F61AA9316C7949D74
-
-660C459E2AF21699FD334FB41D5A2CB869A45551BE062EF3363808ACA5B861C5CC05A0F74DC620
-
-B762CF1260100F7AF497555E3A387DA9B836F2B1FA44654CD5B9C3C6F11D5B5552E2D824B7B1ED
-
-9E2597B1849DFAC61041287E996855B0ECFD21EEF4A0AEDB4928569D34613C74B46D7F46B55ED7
-
-5532217BC77B1E075A4B5F782D2FE5748F12B50F7146AEF506A41A6A3364854D8AE4CA18448626
-
-6368E181874148970B89AF75967E61EA7212081F85AB17DFDEDC6F0FAF7F415B3CCDE75688E85C
-
-1DC939D767755DCBA622BDB3631E120BEFBA3733F8BDB0A9D4DF8737240385A6ED642A3B6BFCE2
-
-D3B06B16F994CE49BDDF355A5E8F28C4DCB6AFAF6354A97D490B54B8BFB9EE2CBF5AAE669E3149
-
-4461E70A60156764F25520EA13F12623F3280343822876660A7F6603B59AC39D425B38217AB4BD
-
-E12120EA6119F32E080CDE4AE8DFA21E23DBFAB037421B20C3A51F4AE2FB5DF4585ED289147427
-
-683F43ECC822E0688E6AB47619038D4B9404CBBD9324BF32773E8C95F9CDB0CD68748DF066970C
-
-AD2BF8E4424940CF6C6E41DF2BA07DF4085A0E6DA6080FD43FFEA0A71AA7D00169D8283C910BC6
-
-F00646DC8FA6522C85BF46A863836F64CE73A6FBC0538E30BE63930B0EC1E4AC40A1220A99640C
-
-39F811C42AB78325AF974A27A0C2A1A2785A36EC316048E56867A1F85F78B36171F126B77C114C
-
-B7A8E05AD92DC6860D5893964E898998C63836CB5CACE1EEA1C9C837A1E22AFDC4B35E149FB0E1
-
-BF248A25847604DD6961DF3AECD1A9F61C36E3E1E4AE1B9F28FAF351FDA113664BBFECE0B7C5E2
-
-3183F8425BE6906A56398E33913033E51E06408E001D9C862E36A93039AF47F5F301B6B5F3775B
-
-4B2D4258B866559001066C6EFC48C55F4C3F0CDDD8EF525EDFAD6FC06213819A9BAE2E5577D404
-
-6E4656BA2F34227C5E37F0D77E964779AFDBC6840616CF02936F281FD353F2A5D8E7814AC6B28A
-
-71BB57253F852810B7DDD5590A522C50B56BE251DC7641E0D1E271F8C4CCEBAB65B6E70F86A7C8
-
-32D55AA3E61DCAE504EC4ACDA7C274AFE9BC7E75610C861ACDDFA5DDC4E8EBCA24A771BF0CA3A9
-
-8B88A6ECE52EFA7C8D55CF0EE850A99C9239A4466B558B6D020FBEA8D22BC6AAE4292B90C9A983
-
-6F7F4C5A588E6CC3DA3313F5FEBD4E5D2F7E454EBCC9939742C67E7C01E510D507EC30C6E6D340
-
-510EFF3493B2209A7AC43B484921872315657D3BAF59CAE38DEA48F394E4DF3A8C930C61C54610
-
-300D66A423A4CE2392A7A422883EDF08766119C2D7B7C7384821BD6FCD1B77B1BEC14DB15F1087
-
-E89ADF4672311FF368EAB60CBB6ECEAD34A7507A781B1DAD557ED19C7A5B5E334851268DC21824
-
-53CFB7EF47D15BACA68453301E95125A5CD35FDFF1E6EDB85AE7C228180424A2842ED475B31AF6
-
-240A480B6F6D7D3652808F8872F859843843D862E81E3594AC3AF577E79F647322392E4E63CC08
-
-937C2976FF749E16C58DA39B9035D802D0F0A9D1DDAC1894FA71BA3E41849C133445191D41D25C
-
-B37A8337C876A5973EA13567389FF89C668E0D13E225964DDDC3DBC949B46E0E75A2BABB6E2AF4
-
-53F65ACDCD45A394BF20630802BD9B9418459BC7736E37244F9215F2D6F534FEEBB1F841962737
-
-D48DA7D6B30A71BC4173B6E00ADB4EFBA91CE6332CC517B39701E07670D3D1A9A86A7102E6A80D
-
-C1EC6CD644F5511D0938DA096F80B49CA3444C0D96DD79D3F8832D0410F0430128C6056DD09F34
-
-4CD7E8D743789BF3AEDB8181DEB1A211AA5320FCF790489732CE6A982B1403CC9E2AE6BB9AB5C6
-
-863C320929B3861AC1011FA62C44CA18B10CDD9DEDCEB73E9145B73C471C6F828DD188804F96EF
-
-DC3D226A2A5D7155F7F8BE7821DD39EF450B5DFB14DB6C4F568CADCFED8C702675BA1C04CE6D62
-
-839727FE6F8AEF59693BA38A2B900D0D02C56D2C632833D2D360ADE07ADCD4CBB620517D7D0B28
-
-E3462E6EE2D30856BDA53DF4D97FAB059B0657E815921ACB16E1AB6CC72FBAFB9290A1ED432A32
-
-CEF7D8CA1938582785D12C9D9B108DC564A9F80B8C75B5B02A1E1C9C5B793526CBBAB9042F479D
-
-AB1D9EE9C18184692C81AFE2CDEF26CA418800474E6B742BB45CF02ABCD86C52BE10C777DFF981
-
-464D624A7B6E455F6F8D5B7F84FABE288DE3FC4CE4A23766F3D771463AB1E555F2E1ECB61B6A2C
-
-987B43C53B636DD466B57EFAD09811C728ED313B950789B262A17EA932A745EF43A8EFDA16D05E
-
-9BE49D3B05D7EE630434645AD245BBB5600B8AACE3241F3706A3D5B9EFF0A793C56A8650EC4CC2
-
-55E4A001356BF728103F59890540DB9B3F2CACF788495F63BAF1D36B4FE10B86287F213695E48D
-
-5BE20EE7025222C8AEE4F5A17D7633232460621F7F395A225D994AFF8D06C8351FC83F0C7FBFEE
-
-32352C1A3E35651D219713019CBFF78EBC3B14C5C3E25695BC44582008FC053F6E7FA8359E8554
-
-A7C4EA90632259302ECFB9B5F1F9721A37EDE9B6ACE78BD7C68C73A960346D608CFF7152681EDA
-
-81656541AD4EF64B4B88FBE98106AFF6F2051A871F7AAC5337A8AA2A16F59B10447EADD084FB03
-
-C36E5F0A4781E4D83402944714F176FC9420E21EF3A28FE65CC9CACAE128401BAB4E3322D6301A
-
-18FEC595C05BBF5C44C65D027FC3698F66A07A567937123D59F16B9290B70B838FBD4C6D12C460
-
-69309881DDE50DE0224F10231A0FBBC19F57E7B6B288622F40676D53F4DAE27C6E30DD31759A32
-
-EC0315875DB779486C9B4F7336516C52C537F6F25950DC671AF3C749E2357A48E99D032DAC9F90
-
-25B162D672A01908842B28C2A9E8FB13BC5411CB1375A3B25871E7737C2B1FEE4D43949DB1567D
-
-E2AAE44C1505871690062358088294E4929D552847A6A94A075B7D0B89D7DBA645D26B86F7F7F6
-
-40D7AE4B47956DD5AA054DE194A5756B95122F182D1D02504BEDBEE0ACEDAFCA0DAD84092582FA
-
-0603F025240375B11E8C252A5417FA1AA4C96DD1C4A369C2E594B2089A3EFB9D936224DE25A421
-
-588718E6177C8E320679EA1C639ABD3E4BB653DC17AEE5264E991BFF63769A7C07EEF6B0E6C1A7
-
-371B889B8BDD14DA43EEB252FCD82555752C25DDE92DEA11E3100C8BBB0E2D8D38C29E7ED42338
-
-9811C21E4BD162FD75AB1A0E5A579352CFDE9CC8FCD3A4CC2B5C4D84CB5A6E2E52A52A3D8EF445
-
-37C6F812694DA5119CE9B78A2C5F12454B1BA8AD6BE5D2088906C3A11A4CA80B2120434E92B526
-
-173D07C530EAFF61A2712F7BCE3618197B8B6175CEAE93186B7308CAA90BD20054D9F48D13B40F
-
-2CB81A08D202195F3B03EB7E14A17F5415E44C981D47E4CEBD46FC2CE82B3D0F4EBD242985AE51
-
-0BB6F3C1A702E86ECD278CA322575D75ECD86898F013499D0A7FC1FC127A6A69463BC44097D47E
-
-8ABC50ED36E4EFECB6E5553C35CB6CF6BB4779CF22F5F6970F15F54159FE5BAD7D57B5DD5B5BA2
-
-B2E25069EE77B06977BEFF18D21594E6DDDE2D44C7DF12A80121FB9A23BFA16F4A7EC7AC2B2AA6
-
-DBC7515E18CE39BABC04ACB1CB8C0A01A3AF169181C47AACAA0F0D803EE4C40FF0C0FA10963102
-
-330F0BA056DEEA02A240568D8DFC3F01DBC42DA2AAD17CC9A5F1DF12DA33BF5CAF8B22BD521DE2
-
-EA2B831135417E80412B244644B0E6DA40DD3E5C2A283A75950F686167719EA69AE1DBB00D7356
-
-FAF3310D24066D4941EF70686DC859CD533BEAFE9D5BB4E470F38B09104FD6B63A1BC61CFB27B6
-
-710EF092DEAC78313249BF66608DB507F08D8B9CB55BBEE1CAF79C83D616648163D56DF637E506
-
-D06CB45CB70CDAB90CD87FED934E0AEADC8C56B70C687B44C30B84376A02C04870E0690F7F43C9
-
-6536324092C7F4CF7B64990EA4C5DB456FDD7346FCF55121A5265A4B3169FD5D8ADC14A175F75E
-
-F8E86DAF70FC4F1E7A03181ADC6F0F9CDE42DD2B4A853E81E9A40E17AE8B0B95FC60E635C7B460
-
-477B582E7F45B00D78A4703414A5AB2A33456DAB7247513CACC1370A02D3E0B1BBDF5991385FA2
-
-9E03F7CA21DC18DAF612FCAFA8E35DB3663850181E046954938715B24C4F3F569442B5814F22BE
-
-89C60D912408D5051FAB8C57722FF6942D045A2D62B2A696867DEF3915EE1973561E8ED1654B49
-
-3E99B2775605066B36BD156A1347E06B30DB129214BEBFEED880C0B58290C5F6295D243EC46C6E
-
-122F6E2EEF4C7DB5AD9EFA493CFB01173C8C92A76A5F900DF0203032C490208EE5E8C0088704A6
-
-BC1D69B4CD2FE122FD8DE579801B110C76FD8FAC88C24558B127BB90743DDE71FDE97B1DAC7B96
-
-4C4E5DD8EAD9F0E99D451ED92B4DDDF8B76643727F8D011F3E527A16A703CD8A597F18685AE00C
-
-D44944A77B69D092B3A61EC940DD8F64C1850AF7C8D17B690239707000BA1A0C0C1D23648838A2
-
-1C0BFF9240EBA6DB5832214ACC8CF022BAD305F6594A9C5B7FBFC3881958A170B0267870E4B831
-
-F68951BB9952F79107BCDF24BA4B41EE2FC31C07E4A4A7340B36B1CD121789D633AA958563B80F
-
-A6CB56F11EAC5B468839E95666A96B7DF9D3EB16F56D69BD3DD6DC6D34458B3D56D55EE9BB2E52
-
-EB357887DB2B8C12D064EF31E2B53EC48A4964FEF00DDF0CB26E6B2FFA5F5866649BC3415C0E65
-
-10C09814158C8B391B74A3D7A07EF7385193BCBAAF26ED086191FFB8328BF3511B4CD54C636877
-
-A916866174DF0260801639B3024B9C965116B2A68DEC8E171A620AB471F673391A31B081665F27
-
-826E9AC2A33DCB0565134E407C618715E146CECFD58EAF40D1575A805DF12B71AC3D3BBA4913CA
-
-D84185BB7FDB6A2EDC904EC0FE8D95255FC50174A506DF939FC0FE8C6DD4D27566C32569EA2339
-
-583D4FAA82E00FF9DB8D3235D00AC3C1AC58306D2E02D65D54DEE6DF6ECF33726E2444F60DBFA3
-
-DFF4F6FD4AE88376B507E721C9E9FE030D77B95AB29C6DB703FA45515A424B212ACF9D658D848D
-
-120883DEEE78345A35679BF82D7C26297259D8697A0C221E26C6EABF3A727D951221CEE74DFDF1
-
-5A33360DEA36DD0063515B5DD17C204E0F4D4935FD0BBEE775DBFFAE232AA018A04A5E59EC63DD
-
-DD0B8B11450FFF9DA0D4894778877E0C63C82489D3F7CF67B61EE08A61130FB77E15B50B7E87A4
-
-2F6F837D50FA3665528DF916B187B11955B0424A7603F1F6DC1E2BF41EAC6E98E9F0F5F44580A0
-
-AB8C649EDD4F960F4759CBC2995DB0C0E07A8F773EF9F58EA54429779B7D085FB46A519CA89BCB
-
-0340AF843ECB37A8208B7736AC27481172728C360DB17CFE81E3635794CA918C2BBD6654D2D4B7
-
-4006053EE17D1DD7EFB8EA882CD055BB5FC9BAAAEE63089A6F20BF88ED9EA643AC27DCE9BC1F1A
-
-B9F15B40172C7E4C0602D13D13216CF0F2D57E51B751AFCF8160835FD4E3D21A58898401425961
-
-69271E2DC95D72E6F075F413C96DB7DD17B3FF2608809D0877E212A7D1D17E74CB4FF48B65645C
-
-B8126D05AEBBF1A6EDC704787CCF57F9B7CACD75F748A5A6A1C4EC863CEEB2BB1D9A4A207B4E0B
-
-901060D0E3A9879970AE98464D8D67F9B4D7C6E582F030B8D8D62E15FDDBBA25CCA8A9EFBC02EF
-
-C304CAEE902670819463DCB0414B3D185AA6DD370B81CA9145C75AD4F7A47411F2BD0CA1507488
-
-117868458C0802010078CB4EC2BE0308C9DC22AEF5B2E9294EC00BB5568916164DA18CE69D170F
-
-A3641D29D0DFD08B5AF6E1F1951CD9257C0699B3FC1B6CC19422F433CEBCC7CC1E0D30CCA1C6F2
-
-D3FFB1384F5A1D32681A5DDF49933629F7B044E45DD748DE8509257E688F1CB637FB766269CBFE
-
-E206B2C1560CC3A84470CDCE8FA0C74274DF5094D413D5A51D1ABDFAA66D9C9DD627D72C29A9D2
-
-B0A3552789774110481FF3F7E0CB583C7AC5634F0922C53FD81601497E96B81008D9C5B49F4ED4
-
-01FC2CDC9744C2E31941BB1DA34F6F6CB63DC2C23A4BE17D3D13D413188A2AF77143021D376E61
-
-7EB1B2D30CF5A1C2C76EEDEBEB710C0C4158958C3D2BA289895F79E3DD45B030D90B12640961B5
-
-030D1FFC621B54A8693493B5FBDD1905132ED26F9799370A67B0D90F7F9DFB080E141F643936CF
-
-DA810EE85201704A15B92C4419D65C0BD1ADAC4F157958D52B528A84BCC69F57A25123A04D2202
-
-319067B8B8E80FEA80DDBA9FC075AEDC480E8209111F9444742A8707F576A7C7A1DDB894A33813
-
-C2D6FFA7B08E2DDC1309EE20B1D80BC387F9DF1BB786BF6E82640D775F084ABCB86C07DF15413A
-
-0475F26FF62960ADD1B94F20FFB2A908AAE2C79AC4EC3899425855D80262B2758E76A4488D3A47
-
-0058CE7BBBE7C991183499EBD2C550C2918EDAB5BD9D43273C44DD192024F73468BA0EAD2825D4
-
-99EFF4A9B1C2FC64AE2222A17116C1F8CD61622B08BD573036C48956C3513A6A3B9F066915378C
-
-2A41B3163689952847ADB7F624303785E9F61ADD7C2E647D2A171A5A0471E76C9C6DE4909B015E
-
-3BDFC9836DB884492F5C9CD77F5E29DBBC80F5B836684E82900FACC7A2CC1D20E6FEE60BEEAE93
-
-DB98DE238B66D13BDC858590654F960FD6AAA779F00DB7736C7F18808FFC167AE32421FB975E94
-
-7FC49A2320DDCC4B6841F54EA228A58383D420A25C21E85C99664C8BB20AAC66390BA46B49BA7C
-
-6834E8F18CB31FDB92FCACF11FF1A9C53F06D6992B06BF0C01DA2082E6EA705224841A7C6AD02B
-
-015C2AAD19C8BBF1AE2506B08D57CFBC0B291402BDA5C95693AD65902F96B910D465CB935CCAFA
-
-D731C9F30B40EC59AF12446C1800C80AC60F4D4CE68B8044B5725727B3089ABBC6E9631A4BA5F6
-
-589891A2085C74E31A4A2C4F057380016F5083AFAB6D089E4EDA177045BFDF1682E848BEEF2D1A
-
-FD4F8F9DF6831FCA22CD7C4A351CFE770635DA22FD11B3326FF9AA79DE76EAFE99B699FF1C73C7
-
-12EBFFC1D84B0142914E1DFE990605E73CEE7D0E88B0498604C17966FF23C922FE70C522036200
-
-F5BEA081CDF8BCA8559CB22F108DB527AB6ABAE1B452967E50F712CCCBD11250C55825741F4767
-
-043411EF4D02A1B26E633CBB09E0DC3E68FEA33A257C26BC022769F71F2667776A57887DDC05B0
-
-69C1424F908D8AF85968055739D0E766DA997B2E5C53B9022CFF01B004EB0FDD59BD59A030E6C8
-
-291EE9D771DABBD55EF78B6F2C46B77A7DAF429037B45535865C7F2147D604491D39647E4FCCA1
-
-B5668B1006B0C8F6214D7E5EB5519BE843927C3BE4C3C236F102A1A1EE8B82E5DF34BC8FFDACDB
-
-79B2DB91A52FEE4892F7F2452B903DD6361ECBAB07138F356959B832819C88ABE9A6B999BADA2E
-
-1A3C32B04F731E75C727472E231B1BD79E040BDB72175327250905570FCD9D9D71D627D7914AD4
-
-FA536AA6461D5F512E2E1EB7475AF6A83C10930568DF48BF2794490B1FD7269473E8E56DB81219
-
-5127ED78E500ABCA9D2603EB463248B1B3F6EE7E0C870083849AC7D83B848E819175C4075BDF51
-
-40901761E951EAD19DBE2AB491AD9EB5D124A20CBABBECF05FAC7AD608A1ACBCE7FD1C8848E614
-
-FC989A31D0010EC3A11CD6797EEE941D0546E0A594AAD95738EA0BD0BD7F55CDC0BF8DA082C0E8
-
-CEF349971D13CCE9246B74B6C552479B1E51C7B309AC025897E910B00746C1307BE2C531217E0E
-
-76CE8A47072D08CDA116B65E7568154BBD2D67F5723C187FD46E541977ABBA662BB08079D93BED
-
-78E924C2482B39861FBE1AD338DDF1364736B6030DB2FFF1E8965DD7631276D516A96DDFFC89DD
-
-2D3480422AFB31E9AB81EF1557AC5C723051096C41EA7D40BC7A1A2902E782DF8872DE2F27CC30
-
-0C645D4EF886716F2999815C1AF6372C359BF84C209C42B939185C6CBE14510B9DC029970BFDAD
-
-BFC7E2F4FB0F5060D69CFB0FF71026949BCC15FC179A4DC9BCA64CC4407B694EDBC54720323E4A
-
-271AD388529B07CF23B21886DE7D4CE721BDD11C18C8CD3D1D5261954840E2DEF872F0C711CBAE
-
-5155957BD2E9C4F927B7E8FC19B04608FD411C1301F46092A62F3F0A525436D9918AD9C47A7671
-
-F40AA31896C6DE827DC12FB7E7C7B5A9EAF931BEBF1A4AA4F28F9287C16AB78085A44C56338863
-
-92A9360C188383E33FF598CBCE34703AA4DB85B61B4B79D5387D5576128B22947976617B66FA9E
-
-C3D80E8A0EFE2570FB460060BDFBFD81FFA8A8986F56D26652AB29AD6EB2A4881FC48B023122C9
-
-22DAFA65337110C76490CE3F41BA4AA05F63C6FCB31AA5C399ED01FFF3948AB690BF01A3A1981C
-
-B120DD5BD1C45D2C57297689AEE480685BF23FEDBF665178A1BB54F9A5DA23F72314EC9FD0C697
-
-7CC96078461E48625C87A29D0D144E27A1D4D76E18024D0F6E90DBCEC4A13B7DB75A8E95E715DF
-
-3D73007071FB30FEE9F552D968BEA9B8FB822CCD6DD3383CA9A1E6FE8088C0DCEA9A5D38C0418E
-
-8868115A2BFE6D055580AFEFDF70D512C8488C3C1389F26ADFC767330451F77D20627F9563E919
-
-E5182ED2C8E07DA540EE2C6925D1E5C6AE5D10FAA84DFFE90AD8B882FDD431DDFE36B513614543
-
-18FB47C39FACA4D661785920A8BBEBBD72DBBCAAC1B66C944AEDA018BFF8F15CD5917BE4A1C799
-
-D7F96C69B5B79F11AA36ACFB9A39639D7506E18800A8612D1D2C918F3CD4B977C1FCF1771918CA
-
-7CE4E550A24DC0F9A45971B27AF2D68A8641A4A209B4FD72857710BE6066B5DAB23146AC868043
-
-A04E8152C51CB0FF7DFE41576CFB42998E63F793A33F1B61280BB61597C0E3B176DED299919E72
-
-F6F3FA4C138D20E40B91988EF9DFAF307064C9C307C9F4F2E9AA4D52154E7BDD6196987C6F6E88
-
-0543802347427FAD9EAF1C879928A5404DF240E865383DC007581DC29B28FC18F1E6BA840CB19F
-
-E639C67070A110B07DB6519A5A0729A7DE82A3CDDB03765E1A7C817EC62225A7D2850101E07D22
-
-9C7CBCE0B46A2B335CA90372DADCEE984BD75B0CEF13F1CF7237E15925C7B54B261236E2620874
-
-ACEFB5978C00E066A03A57816A73D8F559FBE006A944E0F026D8CCF319866693B4A62FF4810A2F
-
-D29AC35F429BA0438A7472DA76510937F799B42D962F3F196E15B2335996A92304C4BDDF7127EA
-
-2F09FB7C779525029B0EC86F86C7E415B81D5042714FDFBD2457FDBD5AC6C1D4382D593586E2E2
-
-AE9660529DD0FF72D2C77A9E4B76689F8EE5C9BA72D300271B8CB2BBB36F10F57309344C3114D2
-
-31762FC68BAA5C482B338F847E4EF63F50A9A71BBDD8214C67A9FDCD1CDE72CF070376D80B0BFC
-
-BEFBA9C930942D35E84CA28EA2857ADBA216D89775E45FFB47AC29B41138CA03BD79122A78B991
-
-431714404223B0D01EE8F13800C8346AFFFD8631D4CB1A6AF4653A68819FC2545591D8CBA85E3E
-
-620C816F89B8AA543923139859E0DCF0830C02BEA236E6AC40069CD4BCCED8885CDA68DBDB9071
-
-CE61C61718FE318090B0C2D6CD1058CF9F9A06B81D114215F15D3411327BD48AA846F18E33D9AD
-
-1425CA8487AFB33BF900B4AB8D9DAE545A4EF203F4844F7001C04EB3E5BBF668827A2D12BE4209
-
-31CDE4E81A3AE0501EE4E8E7DA116DB6441152FF89F045150D3EE7929D88E345102EA7F20E714A
-
-0405B415972B1650D5C9202066C813703D202469FD0ED3483875D2CD955E75A892991E446F1418
-
-5558431A076FF440F40CB59D0A9EE40687AEE1CC7336B9D7B9ABF172E4DC863F1591D4D24290AA
-
-8580AF3A3ED5B7E79D8FF6DAB6811B1027FDA887469877304EF1801E8186AF988D0CB892EFF7F0
-
-6A548FF6D5A5A382FFC1A338CFD62DEC1F389A01E26D0F0526AB2B15A7252F1EB03C188D0FE73B
-
-6F4524B4F437840704040AAEA38154526039EFDB651313EFEF1682FD844D6B8126844FD6A19587
-
-A134552833F7AA7E3681EEFFC2589677A4363E8E95469F3C6656E77CF69572D3408E9B6D8436F3
-
-CDB926A3A57EA54276050C4B3CD8964678667AC0785C9E900991117627D435FF038F799DE089E6
-
-DF28E2A40980D7F7256FAA2928EBA12A8D6FDD80551B0CF3AA442D840A11C951B444E519C19F2F
-
-D0F1DE472FAC0E2EA0BA899A3E70313D28B48A6AC362F9C7EA5D5ACF5D04376DE6C88436B760FE
-
-8BF694ECDD6C366AC31D34469000FBF31BAE9C14FB2030F15A2965B917021780EC469F00B0828B
-
-E2FB98E545B2E430921B855036CCFEC6EC9B4FF0EBB69A91495383154AB84F331A3213BDD95158
-
-20BEDEFF4975E076AA8BD9A4899B5BE7ADB271C17823B18488D7B387B1AFC7106C87D219DDF96A
-
-E866F1B06760765BB2AFDDD952FE0BCDBB6318345F8DAD1A782AA536F7148ADC2D3BF5EF6C6A62
-
-9DAC5A49BF18F9F21E9AD7DEBD237C229286FE2370560139569338D455D8D3A913D329E8072E63
-
-A07660176FBEFEB9D88FC1C2D9D76C51CD30781E4EE59F8BF4F436D9AA13A39CED387CB57324D7
-
-26ABDAEB30DB1B1E14769F5F4DC72ADC8BD757906FC443BF6DFDDDF2CDA866402363DFD9BE8B88
-
-A68DA3D0E0B3BAA404A97F551A0B6C90D349FB9F17DE955FF5FCF807C3889FE10DCA11AC73E855
-
-B7D92A26E64BE1971AB93582F7F53F1C7B1FE401D7F0EB0EB121266CFF5E23B3332D8B4102A4CE
-
-F30634C7107FF9780A8BFEFEB13FE5EA78D8E5C9E2E88E22353D24FC45889CA12FFA14D370900F
-
-257B14E761D49C74FC19B97412120E4BE4EAD094398E92BF1DEF4D34E1DC258A85BC623547B871
-
-04FBB02F402204024A66BF66EDA4DB5F667FDFD7C0CB6FFD799288DB110EA1FE7D7C3CF3A130B4
-
-29D2450D87507E68C68F2F130A3414B4478AFB1ED6BD55AF66EC53E627B0F27649D5C5AA59A791
-
-92DE139AAC89A378F0DA22A328BAED591D66035B958B33971B67D736B119732A5244562CE932AD
-
-36ED9C9BF9A0756DD63E909527114D58061879508B9C043A7018AC3F1BCFD070C7C6DB879CBC5F
-
-305BCB24C16F43D8E9B77B5D2A0D3737536E645049A64ED555C99909AF80F60B2F2307EC58EF91
-
-479E1C447A57EFA5AD0652F78F952E6508A768A88F8DDEC8549865B9266B54D03AFB1929F71DD5
-
-177D05DBDB4553A8C3EBA11F284D9F6C8A235372F75C9C06A1359733978AE5F9653F015741E648
-
-26EB92F4AE59D11405A59954475D559ACB8D098CD4C026A95D678AFD85A9F2031F6D242A285486
-
-1385CD2BED55B6E54261AD3A95C6AB4626FBC5D6C4F6A60992976D406FEECDB792211CA133C433
-
-28F8D43FAFAB9A4489DD1E1E8884B4BA0B258660FB8B8BEA218DE0A7D9E5DCEAE8BA1FFA236268
-
-7AE463303E16C6DBAD3E2FBDC0C904B83DBA9134B3C72EC1FCF6855C08E973E00BA8D37E864EF2
-
-0B6748A6625C854116C3E32D5B24F584963D5B492F6666A284D16A2F3E32E5D7792DCC1E5605B4
-
-CDBE4E0D62DFE84B351B24A509A5DC9D1C2132B81C682096DF4ED7CE6A3D6DC517C6FEE8103DA7
-
-3B5D841D2B4BBAADCD7D1316EAC6809F76B99FE16EA92272782AE3930F1A0052078D98AA17367E
-
-7041C383C730EE085D6089164AADC4637D3CC6A61F292E581DB0D37B7D1214A8F12852FFB636D7
-
-2F2FD9E6AB2AE1F967E2A750AC0AD364E64207669A2BAEBD191E494D1B087448F6DBD8B2293A27
-
-C115E34DEEF3DF79AE1AB33201E0AD653ACA72CC06AD15575314DE4B76009F761B8A1C6788A672
-
-2D20DE46026772117F42171B5D09E5414A54EA45D760DD3FD47FB5458A78E5FFC83B59AEE4F8C2
-
-4106E0D76B719F7C1295DCBC71AD46DEF7E2472BE922047D8B633D386102BCBA4964A90A5247C0
-
-D24CCA298D38A3C513D260EE4821B58391984253385BC61429658E328D86DC61B5FE047705C8DE
-
-C93170F92376BB4CE94B4C92B8CE638FEC140832DFD8583430EE39137342CA0F529737A8F9E184
-
-264AE2A1E172377E931C6A8C0141D36F6446011A9715D4B6BBE1DDCA53E3AC72A71F60ED86EC6C
-
-FDA227E05534991E76E9AA48522EA4261F4A5670276C8048A4AB9500719D92F04080D318B156FF
-
-FC216BC1BE00C8E3160752BF5B029BAA85780C51C4CA162C7840E74507D433CC9D71C62B4CAE14
-
-A3AB4ADB2729C7538B2ECBEC4E69A1F77903BBC68CFED0BE0DEE9C690E7CE74B5BB9C27A5F115D
-
-B17015C39A8E60435E00056879745A41552F95F7A540D535A02F29061AE5D30DDEB8D30D9FC2BE
-
-B04CD49DFD2363C4C7FE8384E90F98BA8C26381D9D3428029CBB9933AB471CEF18F3F8EE585309
-
-29731EB100908BBC1F074F399AA39CCF5D12DA38CA38F464C958887C155A4A77A002F91090DDA2
-
-00B815AD1E02C03F44844628BD703E2E0D6AB53C819373A94ADFFFA6579160E69AD0F1EC130930
-
-22F0B4D2F710CFB0F734B01F625E407F9F7E0F143131C1713D770144664EA989BE0B9ECC3B9FB1
-
-45C1043F02B481D8CABCF21DC134553FC4C1D4353E7180EA4CB1FCEABEF74D6FE5BBEAC7F30B08
-
-1D88EB0A0626622A557DF6E860E54537A8FE0D2ED0B974B994406AE52D47E94FB8E29EF6B02DD9
-
-4A37DC770DA855A59B74BAAE1685BA3EAE24FEF55B06A6036A3D4F5109F1ED4B59AA6218629C1F
-
-455145479611A2B9FA83A7AB1C8A80C5BAEDE37E7BE195C68E36FD18E20BEC787BB13B8E1C9806
-
-747D85C64A42181637E86CA28FF135CED22E4D4535CDE74E2AD4CA93F9A30E7940F28DB59AC1A4
-
-1F8CA12CB965E0BB5C45A5F1D0A5DBCDA210433733384A75CBA8EB93BCFF05AEE3444587FF31CF
-
-6495FF8CAB4CECA16FEB0C81EB48571D30040A90CC422043B8EA732A4DAFE4E552374153124B4E
-
-B3D35C56EE5B4A146111BBC6D9630DB2C9E04D26EBDADB46139C259319C7C9A750FF2945134676
-
-87DE68BAB7BA6DECA22FCAF2E5F20867A9C17AB3E3DCAC03A8DB896D2C0243E95652529875518C
-
-CE050A49DE34F59F3A3422C3C6E4A57FB343A0458858C6B676F920857EABD9941924C5710C6768
-
-C5A0081FB8F47E9BC9ECB701BF097F033C4AAC3E18B02EF9222867D25FDA8FD291F930D163F344
-
-5EE38B44FADC0E830F93560E1BA52EB9CE9B375E9F0DFD60627BFC8368BC0B7C4C443D8D91907E
-
-9FDCD0666EE6A9D9642809314652EFD4E5769A164B50DFF8486F208903CE4F5176C86C3642DB60
-
-AC3FA2DE9C104E36BB76D56DA593FB796036C17A04A65F2BE8BB9B37055DCD6F79E18AB00BDCBA
-
-AAF3FA95C49A84A69EF4C11D60658C35205D97D3AC3003B6592EE366A16AA0D1F9D32E9EEB5B88
-
-08AFD6123CF756C524E15C7E5DD0FE7CFEA135BE1BE85201EFEDF61F046C652A48D435A2F6024E
-
-A310E4FD3CBEE0A9C6B1CD02B1F3A1C8C973C5F281C86194501BD03EB5C3E2A30C9EBB8E4EFB16
-
-63EEDC0969C48C6724A5C126E05B9579C0310869DD1EC88A7BF8562EED99C57C115419E6599BA5
-
-8323324867E2BD6E972632380D2D271E332C52E1A87BB45C4F66C9F83693E6A9A25BC0B1BB7570
-
-18FEE261F8D4529D93F23289C0B75CFB0BB6A55545712C945707FBC29CBB70A4C9C3976C1DD0F6
-
-171E579A75FBAB3821A2C5DE45D8C17EA16FA4BE1069D7549E57E5922BFA18286A1BAAD644161A
-
-02AB843CD5626028C3E6A52BD3CDC7599627A49AD4880EA5AB56936656A87BADB828C6C9200E28
-
-270D8041269ED78A655718099F099E9F17FE27A71DF161D4F1606090F192E561ACA5F32B827854
-
-2611632F21CCEB3225334427D9EAF9AD3D9696AB3B0596598D2DA1912EADD2A7D0859AB26D6CFA
-
-2276B79C826353CAA0EA34F690D6396768EFA8BD8A65CAB43232723324CD05FC517F317D8C5E0C
-
-809FFE78C393F7E8BD88141D1AFAE885E02BB0203C7D726310F6EDDDE8B38C1FFFF342D4E81EFC
-
-1CC68D072F68A0FAC14BF5A90EB7F07604479489CC57209796969D62C92134B59ADF264EB1B158
-
-56AF2B32CC769ACA670351EAD8D3E59117E613A4FD5845C38AA0AD375196F2628920F299B94EC2
-
-363847CA4707A9506C8DE4EA9B0C38DA88567FCED40BC94E7465C39D3F627EF70429548C38C2E1
-
-F007005DFE7BAA7701B183A2CFDEB36CF84091242A3CDD8C5947513BCF7FAA462A92F1E84B3196
-
-E3CFB019320485FED7DB231ACBC56C0EEFCF344525F0DE150AA8933A4D1AEFC4C2699C4B1E5FBC
-
-15AA3A894023FD3F0C75D797E710FC1B41C48BAC6F5AA0BB2CB178B705C103B68F7E8436C4DD02
-
-F054C2B4B6C38736D99C5BD8C57AFAE676FC8B4F078DB83EE6FEA0C97BD434061BF572F6615B37
-
-419EF5250E32C4F0F48EE779E500E7E3C4D2AFF699A4077473A29CE8C2A2FB92646107576F42E4
-
-8DE1233ABA4720564DE68990425D6B4990FD198243277457A42693457CC7AAFB358184F6AAA4FA
-
-1FEBC93C5733812A1B308DA509F473760D1F2E846F8EB2D52FD55CB220F4C198204BD21EA2DF0B
-
-31434616F86D529DE5CBCAC53FDB7EEA6972691E9B8981521087C25F1574576BF799569E3699EB
-
-74618DDFCD5F01E6BAB0FF513EC7E2B3003006D96E4095EF5009044A5F1C3B006AEB4D15ECDE5D
-
-53C1C76D35D87AF201BB47C94DAB1BCC182C4F48747AA7E1ED991C4B62D9F9D08D4283EED5D288
-
-7EE21B7DE249F731509FB6B9089543F4791C41F3BC0EEFA197923DA86308DEC8D632BE0221294C
-
-A4AED2F61C297D167045E5E5A3012E223D6C348899712C550638351F12FEB3D67368959EAA8B00
-
-90996E39EDDC5B3B1684E2DF4DFCDBC89A6A6F9B0AFCCB2115217316A48812C168B243734B57B9
-
-CBD7F05A1CCE9E325F0FBDA791EAE7E666D1FD7F2D5F085165D2BB10387513ACF9A900F84934CE
-
-93A66CD1BED3F990714AD938BA8572A71E5B2557C294C1D1A20F27E51B355FB37112345DC33707
-
-73FE750D5C2330781E0A05636DF0F283046B973D1B124D92A21A3E0ACEA879849700D5901093F2
-
-7B3F90460D82194CDB01A2CF38FAEF964374EB11D0E150A2297D8CA4A5A5C55BEA93B00ECC919E
-
-7246C289404CAD3466EF6BF2810CF1EF740D285D3302B5B3363A607491871FCD181E8CED5C0C30
-
-19FA33F165CD9630D130917C2A246F2D5003657DBB2FA8A7E3FA840482CF21E574AB74B9EB5027
-
-387DA40FB3EBBA1894297CD356E20ACF7D956A3E142248A5899FE940A25BD5C812C0E8DC923EFE
-
-27E49644938E3BD99A086AD697F0AC758390B364B52C049BB1B32376F3AEFC15CB4DB333C148BE
-
-9CA5C18DB38B9EB1F39F07C3C2EAE2AFB0238F687583ED7FE04F55632541AC572E0BB7C7659AA3
-
-999D8CA12D6267FDB0F1CD720C174CC28EE37C78CD803B876B8168205F36687C12C0A2D35D1DE4
-
-B86F4E865A741E82EEA9C8E4383AEC599D1DB85C6BF3883C3218BBC0AB643CD51B8D51A34492F0
-
-CB4C1BA4781929C2784C11F84DE699B0C84C35A504C35E672E941F1D6BA54960F6C519F11028DD
-
-CF0E0991E18A77F772C43CE95BDEDDA9C8D85633EA60A7358E0645D4B64F751B11AE8AE27ECB17
-
-CB385DE259BA1FD78EA8A55DBFECC2670DA3C0140479B61ACD99A59ADC50849C6AA787C7A9B975
-
-D84E2A30529AB8FAE0995DD66BBB5C6053E3B96C567156A4696B1736C2F6E1834B8B8EE42CDB90
-
-315692D6BE299D714C6E43CE13DE4282B261C5188ED6C6D875B8D308D844152BEB15A3B15A8B6A
-
-924DCF7285FB858973671B972AEEE6774A57526F21FC7EED805693A007B2B43694D5D30C9DA604
-
-B3FA6278114DD98744698D885FF714743BBE7F81F2FBABE454BFFD74CB601AE106AAE61E099486
-
-1754E4CF312A1DDC7BD0F85D854D15FDBBF296317ABB0D0B2824CECE362E2137A2F5792279EF05
-
-D0FA6B7DDD4FEF69FFF97AD07FA95F3CB393C4B0DB2311596AB63974B6B761CC98407731AFF2DE
-
-1A522753315EDC07F72CC73BF7B55D769E024A09710F141A21BF94E9B71C8812CDD8C7F7C3AC60
-
-618ECCE4AC81F7D86B75E126736A904256F5558ECE41A471E8F77B5FBD1FE2FF4CF0FE56861223
-
-24C1D13CAF1576306ADCAC1927686139882609FCE3367171FBD0F017DCEDFC909B4039643C3FAE
-
-F5946EA31312460BAA458F5AC3A3E57E5247AA390ECA4F29EA32324F06AA3C376CB5C680DD16F3
-
-8434566DC54E7D4C6D6390124BB69EF6D9AB265D1ED2C68335870B09DF57C137E603A0F8D26E77
-
-A4B18B7E7225B0A92AF92C4F22D43AE053EECAEB3F8981A8ED13D504E6467D266BF7244C0A1A30
-
-A59700C1EB9E18131263AF51A9460C1B753316A1BC587FAFE3B5A7EC6E86626D5FBE6BA3113FAD
-
-E67631B83301424CA27AFC6164414F8262E3FE28270F8ADA96AF0232FFAFE64D37F510741EAB4C
-
-116E09780A2C64AB82C655B1EA221EEF257C667938E34A4F956B7DD951D10D2344D228DF2B59CB
-
-E9AB72822ACE270789F972426D56A03686EADE28431C07B3BD73F6BE22FDF7688E3B77128CF74F
-
-DE98734C3390EDB78740F24452ABC545AD08057CEF1323338C0CF3F0210A9D50CF7D4591D22DC4
-
-76E429B462B76E965583146684B0E2A8C6D40AC7F42D595478C94C01F9AFC8A1ADBE2D4B13E02D
-
-D52A19886A3978CCF3C9C9E391FD66039C5622839CC60120408839E5558136C57E4BEA2761F38A
-
-6D00F4951267377F369B7782C92D7BF00C6F812962F86BBDAA43DA7DF4680EE852F4EF9D82BB34
-
-5BC1F8F76A9B7C09820108BFE054C80AB56B88B438489D0CC0972081255C9EFACDAA08BC81E0B7
-
-E04C201A1212D597628BB82894EA711D739161E513994A67C0C63597117736CF1A9048D244E09D
-
-4804C10483D047433F0A69259DCF999558AFFB6739D372221E490EA8B106D0AFC78EAD9BD50E52
-
-FCDACA4C0F3ED13650B73EC4F8D0C6C4B0BE299B4AB253DD4ABCD28A96F762CE45787FEFA89D7D
-
-F5675D0DE092FA7097198538F031A75BFA2E91A64D1206AB59C5FDBC24C80FA54CD168E19541EF
-
-79736FC6D00896D75C64E79D93C6658A002A91B5BAC71583518C604973652220CF1CB626DAD853
-
-8C16645C699F5785A8626BF1A62FEAB57CB263881B102891B5D886B09F678AE801CBFFACA29067
-
-C1126BB0136ACDDE81D07F2F9199FE439D3553A8152E9E2C31EBA2E0754BBBA72DCF525A85B08F
-
-FC52CAB7135E2A3C849DFBCA86FA0C2217B9CFF755542FB4C145A561696D3561B5C53F570F617F
-
-60CBC31A1EE0F570099C4FC2C4703E1B2AE86C72A3EF8A138EE9CCAC2814533DA20E4AB5D170D9
-
-BB2A2A4FE1C14A95E18DBF3EFB0400A835EC1F50004CBDA8FFE73347027B9151C0E00111C3DB3B
-
-15447D000CB0E6FD0FE985AD70AE5243EC8DCCE1E5E70018087A36A725DE1A6B6EA02A9CC323CA
-
-943BCFC546B5FF43D3EC315817DD6593B6AC7C52035E06629509EBE7CF9B5F9B24E291C06952C8
-
-CC8AF9A5FEBDF8D16B22D7BB518E1191A1E0DBA68066F1CE159C5E7609EC3AC7F4A052EBE5E027
-
-07124CDF8418DB9C026563402764B44B0E8AF31F2BD60DA60E42C0B329EE32C0344D409E155FD9
-
-3A6F2995F965DF6855222AB0996B185DEC4790642BA10D3B97B1028D9AE6943B7DE5F2C7A9E15A
-
-D670FD350CB7A63316DF50950773AFBBF7F7BFC8BC910EF3A955708830C13C931E85CF7D165DAB
-
-7A927810963307FCC2254AC2CC9CE5B83293AFDFB9A5DD00800AC68B431C08B2E92BB2BFB6FF55
-
-6D70512CA099BF840CEE70CF163131BAFDC2D36F9089E090DC660A94F170C0ED6F5BB6EE2AD769
-
-BE951B40DC1E46180B2E557289C9F13CBD9D331F208462A20C269629AF7E181B9776335CD34A9E
-
-AB4B1D8196899BBBE946FD56C8180C42C178536E72A131A4D087ACD38B9662CF3E0BC2C04E9384
-
-8263F8D64EDC6B3C511C30EF4A782DA27E530F96AA0E1CA4D28EA1062FF4643065DDF958DD9124
-
-BD975D27D6BC79EA3A1963B9930B5DC0297AB9E3F02745BCFEBF83BB9DAB46E2D3423DEFBF0527
-
-7013D6FCD08EAA5407CCEE0F91B8D6B4DC89E3A467759B81C81379952E3621D57E86B79605EC10
-
-59A9D46BB301EBBECCCB615DF91D7A0A92B17EC4C8716C4F1E67DE7D069F7CA1E4566F6D9DB96A
-
-E3BAABFCB6E2DF6005182B7BBBA7F96F99315CA76E12497BB76B2C94B85543F7F1819D3F53F2CD
-
-B6DABCC5C8E7B80995DCD3D04A5F47EF30D725EB6158A7A32EC17D4970A1159455B23075774DBA
-
-95CF0DF8F15FCB4AADE80C8D0C92762597461A7B04384AC2556486B3A521B44718911083B06224
-
-3BD1D54A4C8CAB43D207FA4661AAC7CF4A0A421C01111A02AEAA3A98EAF39B15298EB75E16C3F6
-
-7BE08948F016C922EF7489B3369817780C7FBA1712B8F1260EFE02F0A7F112DD0E85C62026CF63
-
-C30633F1C55843AB7EBCC38F38E2517E35D257D7220BFF5BE2C6CCE34BB73EC225CAD182E702B3
-
-C03740D558DFCBC5FCED3DB10AEC7AF1E6AE84B54D5D4CA79F56DD690DAFC5AE7F9383EC2232D3
-
-4BBD2B125CB78E2B2012712B3C51849867665C98CA25F3E6B9E02EC89B5B376D7905F7302CD6E2
-
-8C33470C0B343160BF0F1B3A9CA0A47B6065B6537AFEBC1CBCEF795083CBC98CEAF9A60D9CEF8E
-
-E6F487CECD88484BB4F149807CC4B896F511C2C530EF292AA50A9D5E55C935209300AE63A15A7D
-
-7FDD1179B2F57525B70F6EF40036BD66B6C26A998077D5BB50BBC122B806D45AC248B52CAA6E4F
-
-B9E039E30BEB78CDADDE810534751F7A32356A51065CDE5424750CEA579D034A6C6CBCBA2B2638
-
-89B767879DAAA9923F0FA769ADB474373CF8EAEE7CB465F859DFE1E70085F5FC946C31354F1E24
-
-4F31C7E9B5F7903D92D73886ACAE7666F2CDD1CE3AAF67079DC4E919119230DA6B369AADDF240C
-
-E90DBCD8AB3972CE09E5710B95963C6A62EE56E09164EFA77ACA7E0EC5FCEF4D37A2DBC54A9783
-
-DB9E21045860D59321743522C7BDD14F073DD55B613F7F15065EF97456D1C930E6B8FB5D9EC44B
-
-1110AC075443459EF10C48EF8E4FAC4493BE949B75ED0EBBCCB03E091144C18F1EA0239F90FD71
-
-E24B2C06AF13BBDDCD58CEE4C5A2926C873099D187219D067FE727B61C1859716C3DF07CF14CE5
-
-7D6A7925E329840D68F0AD61DB3FEF91B20DA41EB6F28352A9C49F7A141C6F43056A6CFC254E4A
-
-47A3F967AF9714F52459C5039CE105795612155576BE080701A77F0026FDDB2DA5B7F82D1CAC32
-
-C4EF60268870566A6C3CCB2FCCF0E11AB60FD644DACA696895FFA2CF72270C190F482EAE5753B5
-
-BFCD1AD6E2E8B10535DA012954D085C9A14DE998985E08F17446D8159DF61E0CDA6435147D4B6D
-
-8A2D2B115F49D2E10ADDD4EB66CA42161A5E9005A736D954244AB3D6520741CF1E3AC63930F40B
-
-3048F7801E18AFE557DFBF50C6E2C10D4F285F05B2C2C574D327C43A91501E6ACA45048C0DBCCE
-
-E966C28ADE74E461BFF1CF584F406E32BA473E0742B4329A76663D92B680E80A4BAECACCA837A1
-
-8C98D88F12039D80E6A8B7B0B206BFF62B073AB5961BEE45DAADC5493193780DA81792BF4E76B0
-
-A5542E5C973919D0EE1DA1DE5A5FA269862BB0D4694652849B612681CDCC7505CAC95B8FD72E26
-
-51B7E4C955608060FD1B5E4F8AB8ABCA6809FFE151203A5CA905849F629BDDD14899A9BBE3B175
-
-8AFDBFBD82ECA5B35F2C2B35D5C267E82E009CDDC6BE35E99E7918A69F28D1B7738B93916FB7BE
-
-CACB82727E263453F41D1CAE5F38B6C3709F00DE49573135553DEF7699FA6F96416AD567D971B3
-
-1893714A09B5B356D44783393FA1DF7EC6FC33FE5018454EBBD5B2ACF6AA6080565FCE674F3DA1
-
-DBD77DABF0DC6B34E1949BA2C010C5481009DA4337F7383D269DED79711A08E787228E09F0C3DE
-
-98C0EF82715C4FABFBC760775BFD1CEC7CCC8163331341A7D08209D3EDE45D78AB2A05D5726E2B
-
-D669043E02AF274385E1613F6A42E7E9B94B7662A5904C2669C827272ABC96ABE376DF7094ED2C
-
-21EC501CC30E631B2CD3B0F4BAB8C3CF2025130A99B93C704DF2F015A46874B5BCC8E65619FA50
-
-0D1AE2BCBD4C27F92447CD9E423EC5B67E35DF04CE30ACD6628A13FA20C14B518DD0301D3BEADA
-
-0A9C14B8DCB278170C97E107B4BADBA1B25B17F268F8B52B89575627478E28EF59F2D856C8CAA6
-
-0376C53E95BA854FC059EA938575276CE4716B7A19CD980998AAA79EC8ED57D56EE2EA80D2AB7C
-
-9B18100DA2A7EFA70ED40A32AB292129D897ADCD1CEBF6B30BB768ACABACC480AD6BF1E701E332
-
-B1A9746CEDDD127441C695C3A424A6DD84BF684A90B027B68EFBDEC98AA5B9CD97FAFAAAFC195D
-
-DC5468876B28F56E2F3AAB74D97366441B28CBAC0D328EB8FD98DF06E9980E21CA7F62345F00D3
-
-8CA82A1CBFE954CF8C5C77017A5E5CB6ECED90222B5B15D5D7310B3E24A98A64644EEAE0B0CB22
-
-BDC7FCC983CA94104C3AFAE71A75A3510CED1C210379E289C721BD4EFF82673565275826A41EA5
-
-3008BD6C1882E9C82346DA91E8DDBF092E78BFC009A0BCB0097E977881BF3C81BB6DE2784AFEF9
-
-BB0FE52CA91CB1EBBF01024B1EF941144229B0127599284FBF6EA7809BF36FABACFABE3FBA41A6
-
-CCDEEA1FF6656805CD945439E36F771DBF56F85AC6C9759FD7741FCA38CC362811962882428A9A
-
-29F9E788312B6751E4CC6AF15CB517E8F17A320BA4335D4C869C76FCAE7BDE59334C72B578B055
-
-AF5850D19199F26388B46D9E9F2940DAC3D9A43F45C5F7643CBA2D391672509102A883AADB998D
-
-1CBCB888D5BB71D740582F7B2BE1EDE7D6EF4A914DDF5368D547DADA2BE55971619AFE8D3A6728
-
-8C8F0A7FE9EC44E4E016091F7B14F79E81A4CD8C2599F6AE776136D38222AF1F61E18BD8BD6D6D
-
-23191E2D3AA63217C913C8D62A0940516E70996A30473621B8A257465D1E6B2966BAD8B447FA8D
-
-8E2EC2BE15CFAC9637A5BE198D2EFE6D8C204CDDF85399B98CA6911C9C8ED5F248F06CC8E9C27B
-
-6EBCCC8B2E54C4D15CE46A6BF3812CBDD67FFE2C83370EE792FB17C63C4222FB5EA5C363C296C4
-
-F9D174E62A3E8B6B7FE35BF4663E3D83D921486909441F1FDC95990C9189837094455BFAD987D9
-
-220E44CBFF2E4968E3D7D1D77AFCE67966B8E9FD11E13A66DE61C5F23DD00C6C48AE0AD7DE4DEA
-
-0BBB2C604E443FB88448FB6FC61D8AEEBD52C4937F5D28F611A758C111D1D57CBC262DBD0BC8DF
-
-A11E299C28240EDA643CC06A101FC0E45A3518E34F8BEBC4964DD5A84679F1E4C0A29284FD2C9A
-
-87E7DC0D1F3DBF68EB177C9C1CD6781A23372D3FBE655CC4DFEAC5134DEEDCC6F330176765D791
-
-D495ACEE8CB6FC15ED913A28706B538D9F97E986BC628DEEB1EFC820936E431BD5D0914C1E08AF
-
-D179571600350488E4342F7277F789A7BDB974A3D06DD9ACF9BC645FD11C253A92773F95CDF4AF
-
-911A7DD810A717617CEF422F7E2079CA35D7996D5D52A50F220E9B26A65A0A17B7DA4A864FCC2C
-
-DDF5CC26FE1E551A202F625941BAA8093A40E42FEFFB17D0262277AB9A9E41723ABC73817FAB73
-
-A7B59E306C148E2E9865DCA0DE0A03E46EA6938B53E030694F02F1CE0F8AFF7A89FAE33C8C7EA4
-
-72AC3BA8680AC06E61C60026F1C589E8381B3A54A86155156D20332FF2E5573755F0B980967BB6
-
-BE86A858B6EC486862BA702AD117185081B22A0359C811CEFCE9718AC2C3512A65AC63281BC018
-
-88849D996D8E1AA12002732CDEF0B8CF3911F71D905D52D9BEECECFA4A2DF8290C8A47021A6FA1
-
-146FF38E6424E588B4B4E10031F60C512DF082F09B539C18D08F18A4239FA9B64848CE318B0F9C
-
-B9F6A28D6BF1E788C16D6A7FB9201642206044F470D2AEC35DE8562C17DD7F522AB733E796B870
-
-4E05485F865355E55EEECF60E4A2B4E4CFA8E9822685C87A60562AC1459E246C7DA17F174E9E07
-
-2101975144EE4F24CDE6ED9254FB8ADEB415F895D3A71C68972628B39A058803DB85F07BC492A4
-
-72283DD3D27DB2359F881E1038324B38FF7C4EEF91EF1A00B741B51158199736473984D2080099
-
-CE737B03325F39D77EE2D5E7BBF1301207FEB963EDD88B52EAE4920A0CB758FCDCAD0411200A46
-
-48E657C26A41E7577D7E876A6A9DE16B2879A6CC6DBF8940BA4CF861579586F7AB2381F1D24404
-
-90BFD3FF6747FA93F3DED4671AECDF1C40344E75BC741CA78A2079114C7A94ADC560264E79464A
-
-2DDBA4D4E7848A2553FDE1CB51F51F9E6F10AB1AC4AC4D2FDF5D492AB9B8B71C6834F0DC3B239B
-
-E38621785C63DF6038B74D7D537BCB41147EA857BBDBBA40EA5550EA85935456D4BC945C7F56EE
-
-D375E22086CACA75B3E199125114EE9FA656FF5E9029566A72E9BA4C2DB5B83A5CA6CF2E1368B9
-
-B8B2D0B1E2ED6EE8B6EC56E3518019D92B6C062A92F77C09CA192E1E527626EEC78E553876EFAA
-
-0CDF14EAF92512C71FF6F00BBC63D8BC5093C0C343B927A4F233C0A1ED7961426D7B0296698F72
-
-51C051E3F28231FD3021485E3D8228C86299064AB9DAD2E63E59B995A4C6FA0F453114E83232F5
-
-982866D16EA1F35437C64807F8A72FA8DCDA4DC33B31840EDE22CC80F9C32F08F11683EE696204
-
-457280B39A2891ACE3433CCEA80465F0C07BE27115473FBB411CCEB8E3E532E8125AEA0026CE4D
-
-9F5054D296974F2D0A93D2E6526E88C266A54E937097572F03B66DD7F1939A82A8F4775EAB1CB2
-
-47E9DFEAE00C8A859F39103B149CA33BC6F932103736E727420201F3D38959ABAED09D9D0BA171
-
-F16344A49320062D4B0C30B82434A6482E23B0455E822358C76941E2EC6A8F574755551A771786
-
-07011FA2F4D0FFA7ABCA64205B4301CC8C47B1CD035947BAC00C26C1255EC01A6D90C58F760EBE
-
-7D7B40DB25E978CD72CDB8CCD13255D5DEB867043AC221CD32D78F60F8D9ACFC95340546DD7B7E
-
-A6CCFA481052C58BB41B35DD03B8D1ACC9BD8BC0A8C80CA72D9617AA6A151715263574F9665D62
-
-998818D755CD50A2D92DF966C05D28EA03FB5AE5709B93498EF66EA2D96681003E9F3316200A12
-
-DA96964D6B0BB42077A5306B713C46349C18EE4228EC1A9C29C10BA58218DF587BD534F08C044D
-
-6F09A5F103648BEF06337D3834709A69818F3D6234ACCB4A068F96048819D1D7A023A56903F894
-
-D378281BFA2339FE1A7483B72BCA52F6305A74A1421162BBA1253634EB7450149DF2FE3E10C6FA
-
-1235C24F82DACBDAF11986D3657067ACE1A8E2DE104EB4E101B6491FBD67EC70551DA5694BD122
-
-E35443DF164D0BAC413DD3DC1787AB92FDEBF0806942163B26EB3D142B03EEF3581CD3C32E53C3
-
-57205AA5214D723E4CE6939A9A093329C535621AD0E903411F755E71536C7E37A63B9952A9ABE9
-
-E892ACDC24716EC93661BB9F5A327AD098464D92A180475EAE5F209F0EBDFD799F7E9827F657F4
-
-8D39787ABD496491C8893E1C0633E5AC2E4F75A5A960CD535F0FC96E8F4FE555795C96055E05F7
-
-A05E82F5376513452591618FBB94860D90C701BC8525AF9C1967D97B853BA4ED48D095E995F77B
-
-140C4E1569AE44DD12AABC68801C014987F88DCF2B0191AEABCED90CAC275BEA617387D0F7A1AE
-
-58FCDBAB5D752D318EA1482BF580F7EAFD882B6864BF03CB2E4D59C179A0146C1BBC701F78B715
-
-5F3222AD0C1E76868106DCCA0D5DB602D83CD2DC870EE6E41F5610835B8F2FE2EC730EF9DE0BBB
-
-FEF4308A9AA0392BF0DF1C92CDE4F4ADE95DA0D13951476559CD3B4B7DEA14DF44597A9969BEB5
-
-33D87C8C19518219C64767DDFA5FACF173D64CCF96A36F962D53EE1580B823AFCF9E6E290454FD
-
-1C6C31C45DDE4220F04F3D85343A2B34EFEA529364D6CFDE58A5F225F7EF5076EDC22350F86176
-
-60DC8F9D72E7EB826A5E83CD1B2F0DACDF0195C67D4EE726870111F1A8766D73FFC89440046421
-
-958479D56FD0C78CA5EA7801EB645E593229031821AAC4664B5C814A88F58DCBD1CD44F83364C2
-
-2FB9EBEEDA09F97539843F54DB7FFD4AB3216DF6AC305F5D80EC63250C33E403385AE009B5AF1F
-
-5D831549B2ADD5ED946A694091D140F2C024FEA22BEA365E7EF7FF6F60E5F3B3769B667D2EE5A3
-
-358DD5602BCE6196CF32EB0270990FA05D9523712ABC8D8D24B5DBC77F05F5AF74C174D375061E
-
-A5F97DA12FD34223D84D14B547EB49B40CACE1755A4B09AAAE1AC31C5F62B57911DA81BD2C3C47
-
-FADCD221D9D04C2B4947E665A2B3D2A207DCB35213374C103A910DF8505ACECB1CD8349CF17ACB
-
-5EA463F040ED7649C718CEC21C6C82BCA30EE6CEB79C0A6F1FDBE16BA09CFAC34F7333ED1D189C
-
-1C0D872FD3182F329AAE3DF72BA0A0CDBE264DAB1AA8199CF5BC15678DB215657925C69DE05327
-
-102970108B4A5C67C280FD6C50F731E89672BBA79AEEDD3E623745E576452EB6C15733EC62B3C8
-
-D3D56D6FA18B50A21F6F318C2C36B5178E2D7E438D6590DA1C8FCBFDE177AD48E6673E1DAD7B60
-
-F4438F1AB360F2D40F1A30A0F87D7BAF53E6EE78BBF5B5A9565CABAD7E825D03847430C6422E39
-
-9F0858019AEB3056F2294EE96E4E9F182EC45FFC4EA98E0D499987FF218DC95D051EB30D65B088
-
-9CACA6EC7CD83118AF21E4D77E2A25B21F721105960025213131BB9E0BCEFD8DD79ED1BC39B0B9
-
-07A4ED456A9C51DDE3430010EC11D39A5317451B3777CC60CA9E02A50D3F66054DD668D016CD47
-
-C80EDEFD4A2ABE850D4322243FAE5B169CDD09BD253F3F24AB0B69B2DBE9A79E76CD393B71B942
-
-67883E9306E4AC25FC7C9BF66DC685B51348B0382F971242A764758437675D706FDFD6C14C0F0D
-
-DED0A5AACC1A23CF11ACD2F3B3098B3D2B4F0D34B045D78F98874EB2CCB25115CC47672C970844
-
-24C65A68AFDA977DBA9E519F280C3245AF8E89D0A3AEF334480056A1F203E1BFA0208BABD9BBF5
-
-0423E569F49BF4AAB4425E9D7C3C1FF9DCF6E32E53F881F2F880E1C0336D953A0D068B7DA33E16
-
-3E35DA07B9B5A3B5B9CD266B61E1E4423311A03709840309FFDDDFF0D0035E2D4F5793E6E916F3
-
-DBBDEA8E86C8C7381C16CC6901BA6C0D06DD0FF643AE6B59CA5506793D2B012A19CDE7A0D8B81C
-
-2FACEAC32BB2380C115F9A50FEF2E60AF7590E42138599F6E7637902B10571C4159EEA7B058E4D
-
-7392531DD1B2A3B1A5BB178454CF365AEE4997DE8267DAB239A8DDF7AB69F92CE805B56C336860
-
-C26529AC6FB987488B844957870B40E2A8B3B29FC3FCAEF0B3A6C02570F8661F4E4E455AFA1AE2
-
-52316BECB2C88FD34CCD6F6EEC6B703FBFFF5BDC8BAF056E5590F16BF93564722741FFF344CC8C
-
-86A1DE8AFAA4E2F58B5FD916D163D287327553EC1012183C46DCD9200011053ED4DDF774036C1C
-
-5DCF958B8E09B86CAE24E44B4ABCCB05DCACA0CF4B81998FB73E4E43582D2F204CA8D97882DFCE
-
-EEEF643AA39B5D4C9EB3EC3886A9D54E6ADCC2549E53AEBA70CA4CFAB465EC0D336D15870A2738
-
-72810C24C079AAB893AC53C3A2B42F39A4935E10F1B3F299E9BB3486D00ED66A18F03BA2DCBB04
-
-30DEC8D40D0077686CCBE52FC550EA96DA10223D1F1F098449643364615AE98BC26DDAF2D02508
-
-F66AC81C781625A272BC836106422FBC3DA4AC1CBD775E4AC13382DC49FA54445D82E6A16BAF81
-
-4035BD2B0C9F7E5FCDD50E3B8BE0ECEE39C5B983DFE84645392C40EAFCAAE07C10E209FD228380
-
-5CAD7C989BDEE2B3287DB6D725838513F3F95E50D5A09FC34C62285C1AD743F0C9AD485861740F
-
-462AD426D6CC9741CD14D97DF79533032217E213C572AD9D6D2E179FB877FC5CCEE2D16DC40195
-
-E3C8779A89B3164BBEC207F44FF66518E48CF96BCCFAF7A18F5F7E0FBB94E8D4F5F5A74E95F299
-
-101632B5A24EE041175A0725D30CB9D6D5C57CF41465BD63ECB8A65C400445B095D14A1DF726E9
-
-E1FE72F5EB25F426132783984FBA2AAE965106728C99F6B1F7D7BAFCABE55F09C476DA10D2948E
-
-4CF07E65D4B78DA6F9E9BBB5921BD2E753B8B692C315FEB2A10CA117584A65B6162360CFDDCEF9
-
-17EBC862229E2EAA9097AECE9A591E9BADF8C69BC5EC02674D2B58B7BC7F5CFDFDCC7A337BE52F
-
-6CEFAAFDE5D1394A39B1C188F91ADE1ED940F539D5310EBB5F7E1B11E8F2B0522FC676AE772D90
-
-F55C3DB9589466717F3BB1AE6163CCDF77BC0FD61F8BECE7491C13FA6ED8FAB9E02E39E4B4CBB6
-
-3B15E5CCD4381B15899F601210A376C6246484B046B6EE619B43853D7AD133E4252662C6190E20
-
-76AD846146A03CACA144C018C937FDBACDCC6809952FFD94A6F8E0C8042EF060F4182FE779DB01
-
-CF8B80F3545122FF6DB429E6EAAD3BA9A9267A6227D337D60274AB361C082A551B0B7A32EA7C3A
-
-6E371EA6EA9479B4911D5841432E2F75BFF1099272955D7864DDBF4C88C29E33DBA0A90BFE33F4
-
-4EC5C60A07514E78F9A72F8127A3A9EC2B575BCDB2302B9AD6549862C2A1F4FA9925B484D2B1D1
-
-1D5E4600D97A1C64251D00F4DEB37BB96718226A9EFD6E6B07E5808E35E1D10065C6AF64BFDCA5
-
-D413AE31FD92905EF6A15753902837120A1F978EE341910665A15F4DBBD7C06888A11A0C640661
-
-0ACA8E025D381A8FE29323DA62A6D70E8ED434A48FFBDC96CC763664147C3DEEC58440854ADD44
-
-8C4F25033AAC3401589980C968B2AE1896B4C495EF798CB46403F21E1918F2D251666D43D09C9C
-
-3F1A65D08BC55771EB3E6E4082B7F9B42440794240B24AEC9F4B9ECA0D79219C53405917D48123
-
-69588C23133C985984EC4EA17BB0B85EEA7F629BC9E2E10A5E829E770B8810776779A33A833A4D
-
-DD24DE64AB6CD5A089A82E7F293A24874C8C4125CE45E86CE263ACBB108DEF685139208A592A27
-
-774F3D7B92250FEB4A22883CC403C4D97DBA67ED0CEFB246809BAAEF201A54F921D34D222C5685
-
-709ADBFC96A7774037AB2F2995B7C93D2308631281DEFDF6A657BAB09E193D0C9F759B03F3F50B
-
-4A5F4BF39F4118342F5186C4E9DE29DFFCB7A6D63E0C306777BB9243648A1BE25660F9184DF9DD
-
-32D1FBF11D09D09E71899538291790F889E5C7EA2328E5FFD88134D33719BFE0048B80E85C08A0
-
-BF0C513D3FF7B870A67E6D22A06C7BF15F832F01FD8A435074AAA1A3B40B4C4BD374C8F566CC5A
-
-6527A447B0B225C216FD16F4F7402140D09DA108C0FF3DA5B26012B83F1D7083FE273444DE9639
-
-089695BE2017631819961A63563DE94EAAA502461C10766A7CA9474A41E9297AF9C880DCA16E00
-
-1A98170D8D608B6325FE42699CCBFD934B87D2315047964FBF11FAD2FD8A289C11606C25E99022
-
-707C03B0945C407677A712635C3B50D7FFDD7A52DC849AC925D7A9DD636AEA9749678D6AB2274B
-
-6176548E3E7C34BB6CF289849EB77F7E1976291375F04B3FF3AA011F9A0B0A0EC8183A82581BDF
-
-BEA1BE4D6AC556AE8281216EA0A9CDE765E680BB4FCFC077194CEBFB76F60FC4DC37B77FAD7C46
-
-4741E63E673157435FB5DABD170198280A17F4864D92EB0412174427EB7B9CAEFFD7DAF34D2D75
-
-548D35E5783E5560DBBF5DBF736E1C10F24BE83F60A47615C4245A78395E0A83ED0A777DFEDD17
-
-25FF5734167784A1743238FBA588FF933E4ABE573BF17EBAC0132309E4587D242BAE716E093866
-
-5407784400508A0556CE0E23347CEA2BB550039E65E433F5E569D1BFEB47CD0068293924959911
-
-B00641A69EE50D6BACAB05452C6A193C02CC9B36B7FA312AB51794A639DD781F1C8B9E1C0AA995
-
-339C495588D88153661120A9ED50012A656ED0C9FF481639A51EA0A010B1561F92CAE1540C38FF
-
-DB9373A5C83643A135B6571D51287A31616F6AF105BD17C9B64B6A325C88F30E144DCB9D160F1C
-
-26E3DD65A6C3DC155052EBFF51B51381D022AB1DF1C2F34DCADC6561A251BACA0BA18C3B320FAC
-
-5275C70D1B5E13D5719A7BD7D1EAB3ED382EDC5CF062A063ADAEDDD15386BAFEDF60B935F948DE
-
-75064E94322F056395E95FB70980EF8C9ECD27B222A4990859A2B8FAC51F3DE1AC4BF7677CEE26
-
-03269DB448319257794B9AD5E708505D0DA7287D530DDA959E08CD84FB971B99B8D1968806E7B8
-
-B01F228A4E9A8934E661F403B63164A84713B901268C31A8062C005B00E63981E953FA3E6FA0F4
-
-78E9D0B3DDCAEBB0AA0FAE657BE30AEAC18BCE7C83C2C68B0E32CBB159CA25B799304773BF8940
-
-05FB893C1D6298A911B2DF1717A1B92CB7A2ED777070B8E293EEF4C7000E9E496A707000BA1A24
-
-BE0F784FA98BA543585845B09D855C3AEA622714083F0B1F0501AE74A849345CEE19E2B7CD6D07
-
-EA3681F07774F0F8442E7E38040E6E211D693944A30E27D6242181C2626AAA4A8F541215DB185D
-
-56384EB94AB0D4EDB49655D55DAB89F52663088884D24947CDCC0FD81A09AF0450C60FC665C736
-
-49DEE4922E00C3EE943A01FB05F2983367E6BFC4BC418D7A51E14527BD0F5A0A955C9426F0FD56
-
-08C00A464D1AB4B46969558626AF6ACE2D99EBED930628720BDAFDB59E8943B7C9598FF9478269
-
-49D586AAF14F169DFE8EC9DA41582FF4832FF01642BED1EF244D46C308D4687822ACBC3DEB2E11
-
-347473A74CFF5B58BA27D3D3D36AA3543F2DCA041D42B60D8C9D7483F13983B2E372078EBDADBA
-
-265C67A12243E49C35096198B50D1C5D45AAEEA72E4BC6EC92338E01CEB8491B4B72682C35AAFF
-
-935F8EA76C942EE4BBB31C8E45B17B829686C23D68F64442FA935DED175687B5C042857EA07651
-
-324871B7E8EDC589805DF972FBCF79E92AD1CAA1AC6335D91F0119CAB046620A802475FDC75E50
-
-1F2E6B77954BE3EA96F11E17565734A0EA702A4E8189D95795015F8B0F7E9CAC4492BF9B8D0102
-
-556851FD5C68E589F99FCF51B5EA0DBA3D3889EBB2013ADAB0355740C8750B18285328F01D2DBB
-
-1B0768C2F15134BD6D42D43E34A9F0A870636E26F2455E3ED900F66B8255F3AF0A6F221526C277
-
-50DCB86D5C2C9ED7C826B7EF29A11DFE45B0AACD6742081D2D80F769AB8B4638BA71BC4D987600
-
-DD4D04CC52BA26F407441E1ADDF4D7273A7516EE189A2567EC8E55D1D3019CF717FFC996557BC6
-
-1199BDD52F72EF3184698745427378A58C266FFAD746B397F0528C435DDFEE2C61C8E24C6FCBCB
-
-A30CA2C94A8A341E0B8879D6863C7A7FB805F12A2530BC9747B6BFA7EA057DA41AFCD8046ECF04
-
-6C2552DA5E419F15E60339A6EC547383C4B639FC7A7E086EA69BA499F5A953543CE620E159D1A9
-
-1BB2C6AD22D6F9770F9D2CF719D7AD68417C8F38E9C7911330ECA2E34F843BB97E69869316D993
-
-649F91694F8FB9696DF7531F7B3324F9D9BFB52EBC276320C5832ABD9D0A3DA94D8013DB90EA2D
-
-F35D0E1CB37CD7DB05FFC514F510EB8935BF55C0AF6440464BFEA1D92EC44A821DA822E3870538
-
-AECC146D3CDD5CDA324BD82CC9099C90F2D54CD124435E275AEBCCA0838C7FC25028D56DDBFABE
-
-30B0FBB1EB7C8BD6F948D5FA8C4FBA1C10121FB20F490A57C013C6541C56D0882A37339252274A
-
-B2777DCA09CEC4E499911DCE4532A6C4D35464CE5C15853DC1D29F02BBA5667B7AD3CB0518A908
-
-1960356181C42760C10CEDBB46417FE0CFE1B545CA8B129B67F9254683AB5F8F5684B50E702D0B
-
-A293258D81F07557E83F6EDCB5F50B0A9D57F6A802178896383EBB28D2749DB397CFEEA8B3AC7D
-
-1861D489E7D8E02B01B477429D28209A16487327DC3C532E35E4F4AB1D87A0E1A0F8402A067BBB
-
-30D4D992B5F2997445201C78DDBBB31806EE302E96E353DB30E79A341B38AF3242B3EC8701A381
-
-BD4EEDC5654231312D5D4D2555A2E8E2C2FB4C53679581B57EDB6F01C7AEDE0399C4CC5EFEC89D
-
-021301B96B168E3D3BA15E0A2C2516EDDF2E9B78BCE983C8200B18ADEC5CE6BFEA019397525779
-
-2378C8BF841BD3332096891A3F82DE8FD460F43DC75CCC596B82EDF546F8AC025ED30DA6EDDE44
-
-7EBE6A271739B51AAF5AF52460A86942D94F1D91816D2CFA059C04E3E73F278418492D54989EB7
-
-CE1FEC9D311AE6918035144F07BF987909D6BCC2ED889178EAB7F33F589A711CE4928297D9F378
-
-E50775202217EFCE83AA3C83B731C1F98CE4A78816E7F6D9EF2C58AD5CF26A4CDC84075EBF3A5F
-
-D978DAE6E50726670AA683FD3BD51D1F2A66A15D42E3788DF4C53F3CA6E2C59A0F2C1D6BAD369E
-
-2D468A8D5FB8D82C6B95E1DDC75071E563E9B43EB1F2F7B68D76D54E791D81BD11B0D4F88B4E24
-
-B8E08A04350D03F577E228D7319ABCDFA4A29A7FA9FB2D99C5450A69ECF4748F601F15FBD9ED84
-
-5AEFC029565FE3A98857F197E4B4A2C3C77121BA2D78527ADBC50120B99667816FAF5C65D2F0C1
-
-5901B2968DD2DCC5335BD5DC870E637EFCCF3726FBADCF98F72C143909109DB1B89017A026F455
-
-CD37D656C82A0CA07D5E9A31F28BB27E27C65B2B422BD9EC12FD0D6B5046CD8BC7D27604D3D146
-
-C23C4093F6DF9402D31758D677C6BB5BC1F59B0B8A69E295516C640722196052792DC40E4E3C48
-
-03267398D6144CB5C206999107D67F76794AF501D35B8B77482395F72790D788B076A417991BC0
-
-C4A3602F19F2C0431616901DBD72680A9591F30745A6D4F9A8D4B9D69116B4E8CBED2FB8F08243
-
-22156A60CE2FCA834B805E2F867BD06B69B566E09EF21C3B7C2B3E5BA34109C8B64F7B609DF6AF
-
-03C23CEEA4B8CB123BE7C9637AA4619C29348A1E71382C78A76B7D97E1C91E63278D257E2E2EAD
-
-8D16F62BE741D59EFFD606666ADB7BB0A319BBC9450C11EDEBE337C5E053CFC58112F8BE67EBC9
-
-D7E87A768516E1A971E419FD4903143B6E1B5F9CF4755B5B5B9EA2AF6652A376AAB6FD54DD08BD
-
-31D3DA9C0BA7C28801C048B43D4BB689B3E2A7BBCEE9E9D80D3BD78A7D4D94893379A7228EE5CC
-
-932330B51B0DAD909D06DF4B9FF925F875D4EE1EB2692ECF1A0024417273969913AD25DDB8ED11
-
-BA2401E5DA83EC452C78FC49E5BA3AF8EF0AAE2D55DBED6AB21B5C9358B1CE08A45E87C10C6F31
-
-801F823E6BA0AD8806065DECBFE00B9C9AA3F300B2765D4D4E9C5D2AE87AF05FAB207CB5A901D3
-
-DB5B284048A8AA2F0C8F50BC298356444D2672B6E11ADD136E4B6926F470763109FEF3AAF1E210
-
-895CBF77137A6142EEE9583D32C06BD780550212CC9BCA18B494A0B0A095F23E4EC2CA622CD565
-
-49ED8AE9A82B4E60FFD7C73F6D1C462094F4946E16418D023208D8BAF445E27C7ED9F39A7FC11B
-
-D4A58A0BC9967E1C581EC18F866F5AEB8698E710750FF4A0CD695C314CA2483BF3F5DF14888D57
-
-58758788F0D3D3AF357E04FC45DB58EDE15AD64C7F06364E1B2C64DC14CC0346AD2855780A8CE7
-
-FA539AF1728483FFCE82B389C546E554FE631406A791A01A1CF899555E34634B52F039AA95086E
-
-D64B50534DCA54012FDF867A4173D97D420E9F5C970642CB12A9FE90A975EE7C3D27C4357DB9E8
-
-DB9A9AF78DFC5C0543C926856BD4BDA98338875FD95ABADA260C21858B378D0391F6BBF15AB0BD
-
-7025E657588D9E6364DE1EFA088107828FA4250E53E7487F8BF891962F2783FE305002CED03D24
-
-CEFF5F6E9C3E3211E0D40FE7A9E83314FB9F72F1DAA7FD5B87E4475FE78F542CD22ACC4E40933C
-
-15CBF16B240040414AAFF829371A67B3F6DADCB7281410035E7024B56604356F8D24D879CF4B92
-
-C312CE5538C27D326D56CDA2DB52D7BFA0184EABC7C1160DCDE65444A1F3D29387A8E2C41B632E
-
-778813D3F1E335F8A04F277F1416DC304315958E3641A7D7E5ECC68CD3DD54043CAFACB9B307C9
-
-58D6239E6754920A0C80807835A2F137ACB3D1F828ECCBBDD9A55AFC646EF93EAC3AFF1136567E
-
-DA8F741E24604FD4322B20FBA39E03748BE0274DBC6AA8957D30D7853EB96A65A9878DD94E259C
-
-38C3A144E1269CACA56B0B956C5C40A6B596426F495E438ABF3A54B4BBF161299F594EC305F95E
-
-8BFF2FB788E066420B9C6EF72F6C28536D66E6F00309BB69E396FC864626E67E84D88DF4E74422
-
-A846C2987CC18E70A5B41E26B897F2DE79EFDA6CD99F594564DA946EC13972AB6F7DD737DBB14C
-
-940928E7839DFCC0352F7FF60574C4284398159E47D0487D2D94D21E92BA35BFF04FC74C43652B
-
-26405133714CA12AAF211EA2E7C397AF11E9D775C61462A742ECF9992B69FED0C152FED5AA9707
-
-2479F58F8D0E2829A1F79A52EC7A0DA312FAE6B2010BF70D0AF8CB998F626FD26FE3C53FE4DCEC
-
-916DF0E9FADFA2802ABE944F0BBFD166CD39EBAD3FA4CE2C9ABF007893699FF2C2106004F3F477
-
-242068A7FCCAE79B8795F7394102536DDEFC1CBD662514233B5DCEF1C3F715637BD695B1E07136
-
-E40007C7235CCDCA991BAF173D915D5C5F33C4FDF653D51166997B6A14E9D2F1BC288B34E44DDA
-
-A8DE55AA85627374988A08D965A3E1C8487C310AF32D2C0B8E5D377D4B6752954E4DEFE72FD701
-
-1615D7C3EA25A6733EF7EDEAABC9996D7F6C2DD3CA62A247E2E3DA8114AB3630AF8728A9854E84
-
-429A276126D18756E12454095E8D30BEE5D3327AED59C1BFFFCCAEBAB02444A38A89DE6DD3AD89
-
-4ED7E4A5C761C8BB77CA39F4CC3DA7A70852E27E88A4D6200E922AEF593F0912263CF4381A12EB
-
-D8F94AE22EABBD239EC5E7AF03EA9120F4DC2E8253D5551CCE8CA6336714F7B4A4C4B4CE565F71
-
-2685E13676A3B488311729432EF24CCF8BA48265ABEEDB2FBA53FF2087BB9CB9682E9DDC99918C
-
-008FB0EB28EB1B5D9FE67EA9D2D4FDE1A8FE1D87CB82F8125850A60D924161FDD4E7E7DA595430
-
-2339CF6C6194894845CE5ADBC97883CAD7D3695746856ACF2EFA21DA5EAD33D4FF8694298FF8A5
-
-AFE9CBB1C6FF1743179F3EE82ACE5AD2BF86489383A97F05FBB1809889D9EA33544C2632F33EC2
-
-7119B3670824332E7FBCF59C71C080A8E59A3ADCA3925C69D4BF18F1E2B1F7F9C184FAF7B47DF2
-
-1D7905B78EE91A8BD733D755A046626B2586516CD3527B6EC09A90784F5C22BE5465C24961E421
-
-B8F33A14F280CE7BB0B23F9702360F58C37EE4CA98ACB47E3EF8BB1A8A73F9B083586309407BC6
-
-1B34D67A54157E3728EDE5A6A9D2DA811BCA521D97C66FB44C7725B69AAC358528FBDB674B2555
-
-7F02DAA19EB4EFC71423C89F8277372B00DB45E783DB261BDE6A737F6972018E58FC36FAB72B82
-
-E4EB48BA45FBD6DA8078F758FDC1155C06BA7BB4969EB82A5EA607F257B0BB642B9235C414CBC9
-
-DC882E4B0012B9A6024B584FE68ABCB0F60C8BCCF8E181ACB7783DAEC99BC7A3A8AF028BDDCD0F
-
-410C945F07790C06EA63899F2012327AD160562DD0390DE564D90040AC3037598C4443F095FF6A
-
-3F5250D4BE09418EA43158B27661BC2500EA7BBF3B911C47FE854A819213813684DC597FE59AB3
-
-EDB4B29AE1E51AF8DF5A97EA5B2A385B0219CAA2413E77C8FFF0AC117AD07DDD1054474EF08CE2
-
-6986CB7DE00A01089347E16F36C06D6083642EBBDE402A98AB48F87177AF5F6B8F0234E33FC98B
-
-02E3C78C0813A74677AD524A329233A4C89A691D7569BC5E25C5E46D160FCC69D95A9B1BC47CC8
-
-06917EE441546FA3450A9B30CC4C4BB4E7CB461ECFEC7115891A252DEB29F206D1FB73309B5257
-
-6A9C1FFA48C81739167A93394604B1A91E86CBBB6D164E5D76545C75152DE2E0B4B09F65BEF3F3
-
-85B84F29FA7FD0C9434C93533D7ECC4DD8E1AEDAA8B1A231EFF6266B661EE5F4ECD4DEEB154FAD
-
-7026AC8FEE670838AC986D48ADBB160A873F9CC9F687F4F40A5B6A082710A63D10F92391F341D5
-
-11477AFC88994E4016BCF6D1E7600D55AED6E02BF01B5CCFBF0DEFBBBB697FEAB3C9B012882ABE
-
-E024332330DB02CE61EB5C43C5EBDF96FF799249BF64102FF670B8DBA29F4815C1A4FBCCF23B16
-
-5AD9E8E57F596A8BCF4C1DD10EE5A3DD10CA20B1675809A1D28AFF85A5C4E93D5020DC7A45A050
-
-C722AF53D42EEC29DFF0E924F8A54F75F9611D6DF05E1A436AC01BEC09DC0143156FFD47F32265
-
-9E0F6968FE2FD63074EE77BFE8A4A866132833930E128C91B1CCEEC71BC02BAE80DD2598452CB8
-
-4B0D756E8D0DDCA3F64D2E64AB21C482FFED6A859BC3B5D61F1DB812FEE1AF0D482239FCB8A4C9
-
-BEEF632069637AD48050DAE012F91AB4A244751403C980C50EE44BE38D33D766A2424268597BBE
-
-D36E39B595693EFA00CBB6482372B2C20ED89563983C6CEDD5D288196D49D8DFE4670C4B5F457C
-
-21CAF9D89CA7AC9E008B3F867763A0A23494D4F3DE229F983FC9A133525A5BA33BAB184B73AC44
-
-AD85102FF1AA6915D62EF10B992E9B7154A6DCCC474DF36FA6641FE747B1E80FEA80DDBA9FC008
-
-A71E1552A30F87956A6FE298D5737BCE285DAB1F746622B6140E56328DD0B343BB7F6EA4CB73A1
-
-AE1448CCD1BBD1AE7B9F5AEE2A96C55D4B511B2C3489D964F6CAFB705B1587192C1B93613DE261
-
-49F623A979B1FC8F840590CF22DA6BD562E61C116D6C5B5460029CB5F46C2663F814284F51C18C
-
-0AB1F994BEF08CC775B87E0660D8E396E48F754676836176B568034D26B5E32F9C00B5FC06CBE0
-
-0C1005957D22C75DE14C8A65707F8081A12955D4EA5663F6AB823ED3C709627777BB77AACF3E9F
-
-7D44303AE7931A01AC33464911946FA792706A38AAA64502526C06548D2226B10FC45AB3378EF8
-
-A2B7A9E7960E08D72EE08E71E63E149EA56A941ECCA938D7E0E4A9469B85FF3239F20E3FE90A9F
-
-359AAAB7623C8FA21BCED7B41D9397E7C97627C20E229F268D3FCBF543DEC734297153E916574C
-
-C4723CE548DF8CC187A5DF384484C81A921A90E91E6CCA0F9CB1127F03CBC0E018476242812FD4
-
-C75A24E675EAD79F6261504E71CCA3E5235FC7EB47982540AA5A754D1E29621369D1EA8EDF0BE0
-
-8D2094288D03D77CFEA85F04D17B3F41B07E6E576490BF131D3F78227D569F3691F0135FDD6FF2
-
-D2B212D7D41211A1B7EA2C9FE2D2FB79065DB5301498802B6E1E81944C5799AA78E3DC6FC71B99
-
-5A8C569501D4F24437DF3B510A238FBA8120AAFF58227285C6A10D0756F04E51710D34C5B3EC11
-
-632A86BDDDA8AA12A8C5F48948E367FE5EDCD3D8EB85E3D295602DE19BC1F5DAE96E1A7A9CE192
-
-F9F9DAD0B921A9572ED1D92DAA9AFACA5761879400FC1F11F3AC0C1D3EF9BE5EAE7F7BC963CC1F
-
-15A3D36B4A4B2725AA8DBC77C61905EA820AA3CC1EACAFB817CA530C32F6D281F0F9C45F18DE77
-
-09ABF3051B58B5B857350BCF7D83D621B89A6917F2D31FCCA33D7F849A78A02411A16805B542CB
-
-BB9ECA087CF320DC8A4E4EF6A1B1913A543E62D3611FD1194B019987FC1B454037C74773AA5DB8
-
-3A916AFBD587C03CAE2ED7BDE4A738706041B2D2332039A7DCAFCC47DABADFEAD27FCF70713DC1
-
-751AE3681267961EE2CCA1B21599C2BA3F3448DF4BD0BF6D01D8ED2B2B70E6A42586D985DFFD70
-
-A65B65AA2CE5AA16DB6F5B92284449BD7C72D802B384CB63EF7B7AE51ACF16BE575068005EA1C1
-
-2899873E9FA76CBB626632AF47AD7A0FB3AA6499DEFF547629910A1B30078F23C65396446C5399
-
-84BBD0E416430798CEF8196D093E31B5FA6650574F30D3FC479179F00A3507199BDE82BC7173B0
-
-4EC8015675AE42E92E0CC0EF7D9D809EDC6FDB103658DA78DED075FC61CD2CAE4EAFF1458F1261
-
-D9BE261642DF329C0B0DDB57103C38E823E3BF09C59881388AAF7E8E8BE4190B811CFF83AE84B9
-
-664ACB308AAEE24253DB0A595203BD305A19F2A41A054A616CF02850AD4D00045EC034792A7012
-
-6E7F10CD39C919C5E6B77B2F63108266AC3882B6FE5ACD730C4A79EB4549604D31B70BB81F9DA3
-
-B3D8BFAE1C2A7A000A5884CEC025FF417D20362A9374ECF40936E93EB77362CE66370F16927135
-
-74F60E956A69CFBB70BB59A0CC497BDCF9108748B54660ABAF3AF7BC57E70BAB19C4EC67381C0A
-
-36709042AFF9404CD6039CC2077C9BBA55249C65097978D20E5AE9CCE1A27A74752EBCD4C53546
-
-3C74B8D6EA187C2D575E89D5CF9038DABA4E5B6B240C5A826235FDAE0F22E8B4D29E4A8CDF4ED6
-
-A91876FF06F5A901B6F34C9C8132E27AC01B6B57AE1B312FC1C2780E9630286C933FC5AD84BCE2
-
-CFD3DCEA1C7F621A1C9695D65895C32F9226D14EF31B461FBB98D4ED3C2EE62477D665B99993A8
-
-0F42885A12E454CF8F45C96E002BADC7215DE3B1341C11DD5B78167D76D13546307B890F87A199
-
-FC2CDB95064BCED8FC5E0B502E7A589EA6CC36F2B935E05D6B4CBD38E0C3BB71441F05FD1F234C
-
-549054AF7FD8065277AFDB89149FDB6CF64A4E5375D3EA609D90D945E87A8A2AADF7D59667ADD8
-
-16E8C3D9F93B053488F4408177048EA77A05F8B383E249022ED3853D6FAFD875FA39759AD3BE7B
-
-EA6A28C49312D6820EF2BEAAEC2058CF9756C9EAE517FC06BFB98141266D70F1F651B90A069DEB
-
-3A2E6588D9BFCEB3F4B5A8E30C2E82829376BEC979A6BCF3E4DC69A6FE7BBBF05B6639B9719136
-
-1AAA099F4BC409C179E252452E8C802A1517D9C6FDA3FB306ECBBABB2DD07174484776687F4EBF
-
-9A09AB5F3216D9EB85508125B239FA22867D8C47D2919390E6F5606DC9DDAC2A2C4E445FA8FCF7
-
-4E73B06C6C88085B116EE2876E1DA820F2C4A2EC29E036068E5E52BD82FBEE47D671B040D75772
-
-A93314AF9297753A01212FD2A7624DF89A306A194125926626491A3AFB70CCA5ED0FB14F6169A7
-
-34FACC3D1BC693871985D51B09DA75DE927B0F5E5996BB3FE38532250D76A6B87678AF13331A0F
-
-F7A37700BAB3171C511DEC88E998D2500FE0D72D7E63DD35AFA982664065FD2FDC5998C9DF8E51
-
-69C3F035299A5D7C54490B175CA41E43883839A6C8DDEC8210CE131695777A606133E23D36E643
-
-330DE0D7205D53B88D6ECB5BE6D95790CC7EB7A33F545FA2B1B1FCD7E8878CD6CB5E042DEE4FE0
-
-879CBB8F0B21C155588B0672DC6C8F832648E299519258016319B3BE725D58684C4BE5D692FD50
-
-25891223A54FE34F10DE816C40E5B4947006ACD835DC01B2AF84BF4380A2D0D580AC3878F5D476
-
-DE2564F315213F7DCD6678524094E85CA49BA82499A5CD69B597871ECCFB05CCC4791B8BBBE45D
-
-E820E1F402885D947F1AE6225451E5C33C8E65F7D7714C6A6E59131E8599A4B16EBBEFD2A86FE8
-
-E26D9C76E35F85FD9F8DB6ED3760B12224ED38974CA38F894F0322CEF8634FCA6F4C5643B5EAA4
-
-D9E65274BB5A2A381DBE8A128BC88CB4F6E04C2C5C4425F347479D86164BAA3F19000505CBBD28
-
-B52CD3C8A33774F45999129F51A7BF18A54B71738C534C5FAAE501315EA5869C6D1CFC67D0AB9D
-
-584B40294425ABE35F2E923025A7227637876ED3B746B6674D52CC4DA679D5317DEF0ED57B3C4D
-
-930A96C0FB692DDD2CBCD113799FC4C80147197B7BC9F9514AA0A96E078C3601B32A9F690DC3AE
-
-70F481DD4968995AF645FC0E97AAA22C991AC11BF3A58DF46FF84CF8B76E248B23B9985038E737
-
-0FE65E0AE557865F0EEC63ED7F4A9641CF02810E34B87675FD08EBC880368491FC6C7D1C9BD273
-
-5544BDC95CE0DA3FF11BF88E9680A8C8F91EFD65FD04C0094DC94C29D006738CD340EAE0585F0E
-
-658DE2D9907218612B217228CDFB8FB489AEBF7D5C05C5962F67E0A39974C5665B332353FAE341
-
-9B105839849CDB843E908EF184D0DEA3F4B1C7669A97C035A86FBECF2D2DA905E683831319D626
-
-3895DDBE238CD5493C79F9EA19958545FBFF8B088E86F6D85BAB6CD7FA03CB86CB3AB905329B6B
-
-538456A1C68A260C137E497F2D7A627C38D57030271209DBE4BBF2A484745E6FCB9FA930ADBB61
-
-9F64118E77620925449DD6BFA4AD8838AF81BEDD3FE9D0C15E37BA48B33D6201C6710BCC3064B3
-
-16B535E07AFFD6065CD5A2739DFD061C1C464B4AC5526C4E93D4F32B1D09CA4200DACB79DC8DF2
-
-8AEA6C1E9BE2446222E8FE141786FE5146A30801C0449D9E7143226948863D5402710AFEC43F9C
-
-30D85915E0354B96E9BF438E62F9FC3E74B5599555D0C72481FCFBB5136D4C2E064F9079E72552
-
-15C9E4166EE130BAD8EA3159F1558E48A4D998DA8DA1B002C72EFC4F38E8DB7396DE031DE548F9
-
-76DE8E0C11AD4CD396D4A11C5B73C8E04FE0746AC300D2CD04D7E9CEDC1D78FB9E12A84EE2296D
-
-856B8908EAA722DBCD9C7E72A2EA45751FE235B48879BA76129F41231FF3B6A31AA51E0F8FBCD1
-
-65B88DBB7A353F0B04C55729BD3851A4FF32B75AED59CC9AD498511A6C105E49F0DFC5687E8291
-
-C30A6A826DFD3C09A0CA876B4BE48A222CECBBA390C5DD83BF51E6D1C72AE463ACA5AF5DE93DE2
-
-5727A4D70E7A267FB7A0C10D5EC341CDFADBD56905E74BB02F446F9198CC8DC903C51ABABE98F7
-
-6E75857E1D8F1220109A8BC565D2CEB7E3B809E16D89A83DCA2D9DE0A155522502FD36E9DD8CC9
-
-17540D4DEC8CE209F12C6D6078470A6E5D65DC685C30EA581E3AE53AFC872993940F0D0C89FFD4
-
-1F74A8FA730BBA82F0296A9A8F133810B4BDD8903E722C5F95A887B4131E8C6AFCD14F29FF4200
-
-6F04ACD0F2570C103F154DDD4A5CF09169AD56542855195091C05B71352134A655E6BC84F37643
-
-93A106057B73F58D8E7F99DC9B0B16E1BED4845CCFAE63250299F0B456BB2CC8B90999E6073C92
-
-A9EFD24BB2F239844E412A15C7780BE3A60FF2A686779440B11E9DE0C42547B3D89B055629C260
-
-DA798922BAA55FFFF2D1253A85DA9389C9284A2E47B61F9A5CBB20E9E3C906AA94B211677F0716
-
-707C28C39676943314E52FC250DE49E8A3DB1E042443B66568AA37D0709DF04EF1362E5B9BF083
-
-D59CD3BCDFF50BBB26B7C8CE35A8C4DE96F2E40DBD9D3CC04C39841844F30B31DD25829BEBB731
-
-8D2E1DB290960F54D1498095D20C6F05F7DB57A3A9FDCE5D154FFEBF36ED418BF5FC0965BF7BEB
-
-D16AA8DD31E562095B0CD721F8349C1476693D8EE368EE149C3D243698F54FBB5CF83F65A6F169
-
-3BF15017754259994C993C676D5D3B5E0E805ABD5B5175EC55C3D1AEE6EE769BB1C614426D3E2F
-
-2A3167EAF2B0AF5BB68F024C35125487C3AC670227FC4B781BE2C5DDB6310B59817ABD82D5EAFD
-
-5ADD7BA4EC0C89DBC68D03C12EFBFC051218179494B0B01DA523165717D1DEB70656C573BF7002
-
-A66CAE4E69B42AB76D22E6D5C2DA043103604F06A2945930F421AEF9BB28FF1067C297A6D10E56
-
-6208A1E001BC8E2514DC6A94B559039F10381A5B031CFC73B959FE1D270E07FBC2C4D2ACBE88A6
-
-88E1AA4D9F441B831B6E1E83ED4C1001B2F393264948235312E83F12FF24A33AA8A332292EBEF8
-
-95269B793562730486747AFB79938BA78BEF925CE4C994D1D58C5115296D27D7275BC4358A9DA8
-
-C8D521C2B55F5057C2854CBFAE0AD361AED083F8A63723F7E535C84FE255043984D5AC389F6550
-
-20A3FBAE4883366AFFB9DC7D37F4BE42A3A40AA747721D763F3E8209385F823AC1D7076DB81C8A
-
-00A33998CBB2E574D9C65563E4C24429DFFC0B992BF3477A90891AD6C67BF26AC0DA33ED3A26BF
-
-9A523DE4A8A24A4EECA3581BBBA6B182961EB7AF4FC2F56904C27837A00373C0A49F8121B9BD21
-
-97F0BC65592EE0F1EB1DF93E87F4514BC5D760576E3A39B18684682C0DD8496FAF939D5FBC907C
-
-F77683792DDEB86AA902C8B223ED2CD95D9AD9DBD52215AA05E690FA22831EC1E2308C97B882AF
-
-2F10D56DE08EC526B4ED696A160E139B5407268F1E17A710BA4F71A83DF53156A95B1224E5DD16
-
-B4F3EADE07B57D9FA064DD487F4E84EAF04C69CEE2BB8DB8411849B883ED8138E2023B82CCA222
-
-823E24F80B8816935AC30BCE18E9056B4E6098C7A78A252973AA19A6FD0A87D48617291C3E86C3
-
-C6140CD225B139070B2E55F4BF2BD1E752DD2F7C2C0163938B1CADE6B80EE0E4A2AB811639157B
-
-01E8B11BB02F4C3D09F86F6A178D0DE5FDF804F102F48D66F5850CB685748FC3DE7E0A657EB77E
-
-7311E98CA80D96E7D60A6A1921EDE854415C36444FC1C4E90AAA32D675BF6B36EA87818616EA80
-
-0CD1259EACEA4105F1FAF0D38AAFC1BC427A4B3AB9C83FB22ABE8BC2E607C1EE5D38720081EC4A
-
-63A2174E4CDB46EAEDC1D53771E72C763C7EF98F9CE9E6D93BE98E503571CA19910667E9900DC1
-
-65D78EAD10F8748D2C6C7BD9AA5571DF798B626E0CCD391415EF22D78ADFB11AC182147C50A14A
-
-153FB3DCB091D37290891C3D1C44012716E84E7AA39B55089D1337181950DA5BF52E39707E1A75
-
-435818E44FC0269F6FA4E034C18B94CC0C6D4750B4372D28F24B982927E5BCC910C66F8264F6AD
-
-B5DD11AA46534F6F057CCF650EFD8F1E56667C7B9958D5629B227E12037C098C7AB5D5986BC0D1
-
-2AE5AE552981FFBEA1C00CB6CC5EA988A2944C7F3A238886831C48DC81F179B9F8F686D7D0D1AE
-
-436A0897AA6255D3041C1EFE7FC6AEE65AD8608DBACB2C40BA3C8E178E8F0BC04D27343E39C3B5
-
-93498FAC8856ED317A15CEABB1D9880D1A156B4CA0E2AE90D4A42F2383523C21DECE7D1A92EEF2
-
-09E811F44C4701C1737E7C8951C140F446AC0991FCBACB9A5D8A9A36C29A7DF9FCB5405034A98D
-
-556900B7238A29E4D1C46770FB85A1C9D345F54D3F01FA966F6A1DB9213C2142AE6C6E883BA5A6
-
-307D428A5AFC0E09AC26171AE5B358ADD11AE6702095BF832A35C33A26E22C06B60E7B217E4346
-
-0979399270F5559A38EA86986306211BF37D01BC0990C38BC4CEB03C76A9EE984A6BE19E096D33
-
-CD5D1977DD237C9600F18FFED04BBBEFF024BB062C73EC12FB00E5E1D5EA32149093454EF270C1
-
-4F94446B55CE56C9B700A12AE7119E7812A1472BC70B52B67E30608D8DA81331EC9E0F2587A8FB
-
-34F3DF3DF0476046832B371F210F6FC8268C67F07ADEAE026CFC1921BAE4052680CFCB37305806
-
-529EBF63D8327A1D924A7EDEE1955B944510FEC9E243C872F10F5301B1D03C2BA248B57D1E1024
-
-2B266A9A61691E1E9E0421A89E0D267C1C87DEDA11F25EAB86A6920B90DA63DA5245AF639CB69F
-
-C4E8F12C91CAA26610A1B321F91F90C79771C91DC4D2F6887868D82C928E4574C0A395CA1FD582
-
-549D601F9274AE55DD6F146BD2A444088947EE9D191FC5AD9F5CE52D3A267FB165D55BF70A6A82
-
-12343E7328FEFBF3083AF528FEC8396228678AE2153557F93399DE55B880B020A921687B4B4719
-
-DE07EC57F00B2BDFE003A95E3211119BC72F468AED00ED92A1843A28AE104175231F8A246BD8C5
-
-E0F2FEADF643547ED3120BF4950FCB71AB33C590C74006A8F829D43A9C72EADBC7E8A48EE3E4EF
-
-2CE847D275F1D06B305DCA0A7F0234D241A187A3A9D7CCF390EAD305E5D89110B5D0453B2E29DD
-
-2E0E5313F8E5F824DD52DC515C46A4CF4E7E5D622C590A8854C9DFE724CB377F268508677B701F
-
-4CDCFF3502D072E597E3F9D5F3DFED8BCD42AA7EFA96B6A93A42642088203B075EC5CB9732EDCE
-
-4483518EA6BC04A9BD531FA9D0ED65256EA3FAE0B1493FF2CB8FBA4C7E5D8AE1CC244C834E00E5
-
-694594EE9A5A9325C8FE95C2F6FF849446E417918D88E00E86D59664E1D965310D354199BEDBAE
-
-5366C183DF1D5D1CCA5E64A434C50675CA4F1ACA9704215BC5A1FCD4C3A296CD22389DD808CCD0
-
-87AAB921F5ED11F34D2D0334861F214083BAC9541C05D78ABE5AB9DF253E7EC40AB3A8E69CE730
-
-AEAB610EF92AFEB93733C9CD9590B1B1D8A3A5E44D22B9528E429CDE7AC4123C0D7A8739ED8BC6
-
-7C5583EED7903FA0395171EFF44973DB1CF052DFF83B4D7FCB6B9FEF7EF08A4D7C0FAB844F2F90
-
-48513A6A3D39A407C33DD521409724A79F8E88DD6838298E17473829A20495C863867DB9729F83
-
-92CDECD291B601ACB55BCF9BB18D873364ED03F51631EE887246D5480A1B601FC792DA6B6D398F
-
-FB580A32E659BA4B0764654023426E0F5E51045943D2EDF0557DFC8FEF287CB77B8EA3208E2466
-
-330E762C53D8F19E173708FEC484CA6EF090A0A65A190370A8030F84CD4CD698F65E81248ED13F
-
-91A0C21C3B0D7C6337887BBCA9E5D65CA6507C58960367D36810E813B060EF9BE7D34D4AC15774
-
-06E97640F04B87D203DF42BD651229C56681D296DA1BA7C09AF38583C090D0409828F445B6A9DF
-
-429A374CF2DEE68FDB5FA4A2BDD4D2CC25E46FE69AA3C34A592288DA4DC1702592FB052DDF00D1
-
-4AFF4FFCE9E4B74DB410EF990CFF606BEB6B90AD35D3179CDFF285581A3D161D96F4DE69E5D40E
-
-B344E5D23D6F0B47ABA92D0A3EFF67C8F16D33DBA4EFF89C73B34450D13B48B4F04C87D167FA8F
-
-70E9AB17D603C4C1AD07873BF336760E655CBB6AC3A197D62551ADEA5B7C1ED5303D8598000FC4
-
-B9E738E2679F5AA08DF07BA994253000366157FEBCCE0EA475AA022B046461187C1ECD85FDEB97
-
-7B2DF4970EE03C99E8C24804484D7B7A426ACF82B05AFE51D5083CAD68F160ACC9033CB7706CBE
-
-68D44997ED54DD0D7523A032036EDE50B2200CD44F9B89A1DD0F541D977A17AD49E4F82FECB9E5
-
-FF7C525196746E8F49906B9B2014BF6E1A9A6F356DCB5CBDB427394FCAD8588FF2A0ED67430F15
-
-75B2E1617F7F7DD17E5F12E0406834B28002DC7E74C2C4EBAB48AFF4306CFB2D17301CBB238AC3
-
-85A414CA84B988C5EC5AE293F3A6A947E70EC4C7F0956AE123EB78E46C8F9B2E7DFC75DAE6E509
-
-19892249014BEDA7FD06645E6DB918A608EF4C373E7179921DD6FD94832C0FD9C15F56F784694A
-
-7788FB33B9FBA7EB9B1A19CFE576CA993F0FFC31398C89167D5F1D6BD886701B07E787851910D6
-
-B0BF96B51CC1C8BD3D0BBA00FBD00857E4329C1E9092E20E4395909BDBD334B027250BA8597F55
-
-79DFD55CCFB5721FC7A555412ABE49E3DDBF09F722120D681B6B19FA0026CDC30978976DE83887
-
-69C68B3C321B6113D3AE32FD1BDB7C1F1FF8F4DDAE81FFC131AB8316FAB33B6FDEBEEE2F1C496A
-
-805E4B920F3816BDA8E41677DE36EE413E80C500B9FE4E3EEAD0114630BB1A955D0F5C7760183E
-
-68C226060B051729F6E1F46C75168392D0ADFCC3DC52F2903849C5C1F1CC4A39486FD84401112D
-
-C1F94EBEAA3A3BD4F282978AF8C2FDEA3364ACB1121EB5F593F332D8BB3E280530F9B1A58041BE
-
-6350704391190C24BF0DAA05FF8768F084E6870401FF346AC73EAC8A6906290AB2BB58AA7D2C0C
-
-901BFD714C45188C75096057AECE6CF453B98520AA7346E42E449549EBDE4B70B16F66F48655B8
-
-7F0ED4935D108E9349F57C5745EDFA02D83EAA7EE7BE7D7FADBE66D6287A61CAA1F468DE9DF58A
-
-DCD7D4667A341F6748A35C19031767CC2E0B25B6010CDB31DDD3A81410B782B4A6CB5C9DEB3B09
-
-26D2E86C69C63BAF17055ABA5AF39B237C53D3A79C5639C3AC638E1592A5C742B3F7A65C557F76
-
-0CA2E68A0BB27D0DB493DF5353D75849304F3B15D42115F55717203817D1F6CE5567359CCE7085
-
-371BF23A60851B9BC7DEE19BBE40B8BFEEB85D20C7886CB89B21BD4DD57414958ECD3B5CCD40F5
-
-7825372CB8929AD26821F280FC5BF3F909B8454248665F39E87AC12679023561D2E4C17215CC80
-
-163600FBC3B2A3637FE8AEC7E6E9143939A96F9AFF544944EE914BA054D6B5D0070C16C99D3EF1
-
-0A5CA635C83A154D5799B7FDC311827C9E9DD651CBA5DE32A3ECB4327BAF08D924EEDBA059C33B
-
-3E7EDE159E83DE71EE0894C2A7201618AA39F39CC3574DFD644CB41618A668BD8D1BF07FCE3AB2
-
-80E3AACBD9FCB90C4D8A43BE3B72AEB9E6785DEC6E09A6CBDD95A2AC7A0BBD49D86D29B08E8F2B
-
-99137B2C31EDC27DEE6A7F5FAA39D1FAF0BDB9E047C83FE596C958A01F835149369B0641F8EA6F
-
-F0DB303EBE57724E6B1048FFD7F31682DAFEBC1103852273DD19BC98C1C5452F841D5ED7C2F746
-
-6893D23CC5D6DB45B53C9150845D7EB3F4227CB5363E3A3BF5DAFD68D415E2836B4AB53621125F
-
-D7CBD6B551B3D0BD14D6377DACD47787738EF0BE98F687C6CDDCEF0D780A1DD8CE08BC9C018E95
-
-AE44424AF1080F5D245D42A3A4C17D3E19CE340E97C722BD7EC55B09735AACF13FB2FB9906802D
-
-0B34CAB1C02758CB4FE31FCF2758B3A6CF8353E3C51F399AF3ECAC2E109C999BD15DF1148E38D1
-
-A3CEF647225CA8CC45B962A67731C7DABD9B756DAEE7DC5E4074E3DD818E3DE911C1FFA8B6C1A5
-
-4F279C8704A61C629733BBF2F227F171512AD7FB5E72B267EB0A7B6C86C0EE6BECB416A9C4867D
-
-C3716826448DEC3B8B2FC172FEF52C39A0574B976B9F3BFC53422A20313F0B058638EF1870587A
-
-A02D9C4B96AF4F5536562FFF26C1CBDEFAB5A6CE81F25084E902F56B840318847B5E31883647A0
-
-3063673BB2D0A7B2C128AFD261C434D1D4CFB08C50081C216927C28954A79149AF111705E57FFB
-
-F8C8A138AA343F16D540E138ECB9817F91B040FA65D90ADA642DFC98E414D3C909BEBF1A442F68
-
-0AE92F829D0F10BD99BC1F00E7345D05133CA2F3BAEDCC63ED6DD92DA86DF4C85C9D77FB4B1D95
-
-E64492CC0E8F0468D3E55D11D97595876CC2225416EB2D1042FD8FA07A6FDD408F619A0C84B65C
-
-20876A38638DBFE973ED7DCB6A8CE7ECAC0BC71349AB2DFBC8682C1D5E8AC8FAC86BA95A46E391
-
-1135602A147C7205C4B4951998BB1D70BC7D30E7004F3C81CFA4A1364CA1CB728859F57095A068
-
-33FA57B2AE6AE004592AE87D6A57BFEE4BFD39B77C34416E2316A739A27084E2FDB9A9A8A260B1
-
-E928D144FB43AE5A89B05997380E30987D31414EC916E3BD338D0D8997529A17BED8AF01CAD6D1
-
-CD4EE06CB6C0563E91B919903BB5C0EF8C79ACFBA7CD0DB8984603F729672DC47F6D840D911BCC
-
-3FF3F22F561AA5EDA2783B5DFF8DC573A06E8383C1B7420003FEEBD754B62BC461D314B383D483
-
-CB33660B681B6A0424D4C16B730F9759D1C5B8CDC769D96E67817016CA5356C8D45836C297E5C0
-
-CF80818E5DDF6FD6B3D96212A6E3F124AB2B2281C7E32B5A11F737C6CD9A886B2DBCEFCADE6D8A
-
-F8A392705B8EEB3EE7716BE865CA9946158402333E4345A143ABCC24FFB9280D22A2E538FC8C08
-
-14A9F82CCBBB350FDE047DF917E34B7F9A3D520C9776A501225DFB8A5440F91980155C69D69C1E
-
-8B772AC1BEDD870F516A25628445A68793EB46FF327E233DE2EF2428505D78FBCE1E933500BC08
-
-75EF2A659105BFB84D62CD8849B13A0A2AC5D32700C660460BBCBC508A644BC21C02915D44D071
-
-E6997552F1A43E771C41D9A70E52FAFAECD73AF8F50F7F38D85F9E968E178FEE686F76C17B5FB5
-
-C1235E74EC812433155856677C8A01CE329718B01E8469165B54DB6D861658E073D407FA7D295F
-
-69DFBF4CC6E06F7F4EDE5C9FE04907DE0EAF8BBDB73AE24313F1442614FA91CECDD1FEEAA36FEE
-
-969131B200334EEDA47A7B029B872A79EBF7CBD108388C90ACC3A2E0328ED70106CC5D962BA72B
-
-4FA1D5E01B7476375227CAAD08CC669F7EDE398FCD48E4C98A6FE592C60D262D9A814F364871AE
-
-8B9D881029CDEBEA22805E58C1AC88EA3D2A14C06C99A6995236CD5B66759521D1C63CAC33E631
-
-8C9441B20AE51F6C5484CD5C92301CDEDBB6ABD32BECC3273921900D13303220DB46042C720348
-
-F8F5660C96354994A9F4BC8814FD4DE786526E7629D41F523F92E612EDF64C0810600493369F06
-
-32ACE4BABE4488FB2292BF6B5629DF5062FD7D2038CD9856A13430FCF7E9440267AE07A4EDEFA0
-
-03B83DA367DBBC33F449F987AB4C90C6B54F2FB5DC614D50C803E6A85F4BDAD9F31C3C83F8C84D
-
-B51960F42978F59784756FF9D04C14899C601681615360B34077E110C6FB5EB7EEC81FD21C8ADB
-
-F5086B027D11DB853324339403A157DD593C0C482CFD6E41AD59E58C9A9481A391152151C5232F
-
-FC9F164757A08F5DBFD5F239E218915F410197D59AD84B43AA34B577E9EECF694086ADFDB4E8BD
-
-9255550D0E6DCC0F7F22C34E63678545F2B34400ABE7E4E3131D20CF0B01A3A266EC454E3F4D58
-
-24E46732C9B304EB4B7F6AE660A0DEF74EB7A35624C4F8EB8D467A0176DE9AE457EF670B5564C2
-
-749B545B284F63087A2EA02CA97C1142A7E6E81AC7F441D5C4AF68F37E85198CBBA2D509A36A92
-
-95F02A4AB6C08E001E691577FE7512B7AE437BA23D023E26320FDEF262A5B7C32C51AAE5437983
-
-1083D5CB84789619A605ADACB5CD0FA5DBE2A4DBB7A5287C151696D2DEC6BE0AB1122F19C026C8
-
-9FE4A49BA8298C0528677326F0D41CFC2BB67EA9DEF70722D6E3DF3E738668F4A9CB2E6A97E81B
-
-A717B59718A78192C70EE9E7EA06CCDBB40EA7711D05DEE264ECAF9CA47CA542EC5B17D968CF0E
-
-E334272DE264B243DBEC490A3FCC3AA34638DB49C12C2574BE206F53331429E242061F029399D7
-
-4850FAC2B14C69EE8DBB6187D782AA0F9A40C5B4C6E663474E7BF45C32FD4593BAF723BDB8B866
-
-315A898E1D429A9BA89D618836430FF6603137334E7C9F03E7DB7A68CD78A1FF11566D55063A0D
-
-3BF30A87727130E7FB50293794AF5BC45F5818E8949A1F4B806924BF629EC443C5AA6E173BA126
-
-22A346D8B071F91E1D305D1540FA83CA8DEA7F09DC80305B9D392BA31D6E71722D0B947C26F73A
-
-71661F801A9D08A7DE62886A390361FDEA22F1FE67EEC2153F999653DEEC688F25B4B9D58C815C
-
-A456804360DE294BFBBFE5D745B94511C304BD5388FBB84DA4B31E650178CC257316674C5A3EAD
-
-9081770D88683A103CCD12982465A7CAA1C903CEECA6EAA1169637BD370F1900C9143FC32DF44B
-
-BB2D6A4C4C88EDEEC16C598545208401D0985347AE8B2A16F98BF92CB495D0CAA9F137DD534D87
-
-9D8902DF0B44848B3EAC1C381B8A771F9F826A1D33D12FD45C220E94D1C18B630C46D41659F485
-
-16BF6C1A52E1951AED115AE9D4C65BA9F7D436802A5673923E65E8BAB985D09484607D6997929E
-
-09EB1DBA1DFB33BA2999AC6460734312C6827467C70EF061FF8509CD8D79180FA0C92A30B8FF54
-
-59ED13CD5158AF3CB913DAB4CB70ABE18FE0366003499020F996B787FC5BB4A767EF25E3417B4F
-
-C66EC7706E689A551B0E4AA157565C4AC5EA44511D9084CB45B3A5F8EC1C827CA408B1622E5170
-
-3A6720D74D1CB45B5C4EA56076203F3235B5D17E02F195511AC3B1D213C01B604529477E30B1C5
-
-7751808676C3F3103918FA224B3C2C65E0338CC81E11A9ACD2C9F6F995042E654C3DEA26FC3CF0
-
-A094BAF63822CB3004F2786EE74C86FB8FC6542BEF71D96183A1A4C94F01F8CDB0AE1DDAD192D6
-
-1B7AD708D3498B0EE123ED66225976E91267D45C184148C61F99BCFC11DDDFD21ED76D0FC861BF
-
-79
-
-0000000000000000000000000000000000000000000000000000000000000000
-
-0000000000000000000000000000000000000000000000000000000000000000
-
-0000000000000000000000000000000000000000000000000000000000000000
-
-0000000000000000000000000000000000000000000000000000000000000000
-
-0000000000000000000000000000000000000000000000000000000000000000
-
-0000000000000000000000000000000000000000000000000000000000000000
-
-0000000000000000000000000000000000000000000000000000000000000000
-
-0000000000000000000000000000000000000000000000000000000000000000
-
-cleartomark %{restore}if
-
-%%EndProcSet
-%%BeginProcSet: stonessbi.pfa
-11 dict begin
-/FontInfo 10 dict dup begin
-/version (001.002) readonly def
-/Notice (Copyright (c) 1987, 1990, 1992 Adobe Systems Incorporated.  All Rights Reserved.ITC Stone is a registered trademark of International Typeface Corporation.) readonly def
-/FullName (ITC Stone Sans Semibold Italic) readonly def
-/FamilyName (ITC Stone Sans) readonly def
-/Weight (Semibold) readonly def
-/isFixedPitch false def
-/ItalicAngle -12 def
-/UnderlinePosition -100 def
-/UnderlineThickness 50 def
-end readonly def
-/FontName /StoneSans-SemiboldItalic def
-/Encoding StandardEncoding def
-/PaintType 0 def
-/FontType 1 def
-/FontMatrix [0.001 0 0 0.001 0 0] readonly def
-/UniqueID 38795 def
-/FontBBox{-153 -252 1303 950}readonly def
-currentdict end
-currentfile eexec
-A62390F2B60376DE25E6D63CFB2BE19C185EE64A6BAC29C353295355E2953CB3AA6671B8B948FA
-FE62D34F0DC7D617819CCCCFA9D276C723914F28DF9F5A1BBF644109266411A6B99CABC920970F
-EF157AF4F67AFD6B8256D30B6EC249D3D2D31311F781E50A6CF1A677285290833E96072D8D1EED
-B8E7402A588F7818A3DF24AEC6EF5BA6A37D1F478AB266ADC2F139FA5B069ED780AC237BD2D560
-57ADE351BB17DDDA706520BEC386806E3D20ABB33E703B0383CE7EBD20AEA40CD1F3AF80DC63B7
-5672BB9756C84BD572171B717974500FF4A18AEF19B1C787A742E6BD5239D4CE1EA9F43F4881B6
-2A36C01609947E97CEE999B0E57F752F0091BCDDDCE6FACDF38D98728FA069D326B0BF3F03061B
-8FCE80D7B17E69BD16F034750BF510B9D36C193E853643A7968E043A0B6C68348297E52B7194DC
-86390AA0A39414FB9F278A72BB4D38D3DE6F311EE0B4EC0C38AB490D3BAECC5F9C9C3CF970127E
-8C31A6587F7B3A2AC206B60D81BCA82D7BF803849B86D987E5A0F487A25252D9F5F24FF52EB9FA
-E8F5DD1D4F1AE6BCD7F119970D83662824A17F518F3BA7C0E355630ECF16D1B2930AB700F859F5
-F79B58D5AA5AFD043451EF0E21896E9BAC697C99A006F8502AAE0F32557BDF9C3E88B5866BF280
-AFBB6309C4A6C56DDC93CBDA5BAF9D4C9C33CC5CC9614236425B9170151C3BA70FAA2B8822F999
-2902B23E11A8DAE99CA765649FFFEE734CD45A096246CC418F4DA104A0E360D84AF8413AB6315C
-F7B2D93458EFD2CF75CE8E429B4FD9A0D9E2625B56B2307C5BAA8AA4209ADF3AEFF11C2FF9CDC9
-8BC55A81AD0B8975D77B79259ED26DFDB7B48E6AC2BDA8C5DBCD573BE8BF758DCE552BD8D7B9C5
-C3EFFEEC0FEA01A3596C038750DBBDE019DD061AAC75C6DF81EA05D6C6BA940EFEBD0904EA64AD
-CD9A299FC2A677BC166B910146703C4AC77A37D1E35275DF13F0C89B921C2B33905DFB79B21455
-B76CC84D7EFDCCBE9EAD6C4548AFF3EA59A7003A5B0BE359C8B5990DB15451748D00B6658F1C1D
-3C02C9010E586E9EDA7403E03288F939C5A56E56B038BDEA3DBDDEED59953B5D5F3ECDBB9A7B20
-6E97E19EB486E666D22AF8E81C65ECA005599297CC09B83DAE12A4957252A92452C829A33E5864
-3AED6D1A5538BADB723346F28C1FFB55737AAC3B6B95AAB2BFC31B8CFEFC1238F36B24B5E0AF4E
-201DC4B4F8C584CEE2B66A8BFEC755CEFDACC6BD46D1ADC9353BB4CD9F59867A8B9750BA0D836F
-4126BFB96360523DD5EB41BDE2B6442D53B6DB3825AB19A5B8122D39AD6EDDFFDBE959A149E9F6
-5532FC70C32F297A56F4288E355D9E916225C80E4564FF3AFF4E04C65346BF983822CF047F27E9
-58AFE046332F5F8F122A687FD0BDD81032331699C60EFF44DAD7CFDD98EAB24D314013209467D5
-A80786375AB9285D7E4DA5D0B32ACC0AB990B4448822AF1D132563C579C28B38622BCE48919C23
-E4002D6563D365236ACBBC278545CE28ACC29A6DE5A9380A4AF6D2863C0283F75C864A8B5869BB
-FDECA25E17EBF3CE78C0903B393A024C3807236C92B89611B70EBBB96D672132CD28B0A402F98D
-D6475F2F9E471D9CF1D965E56EA4D0D6ED3344120D8D1ABDD8887EB839F7A2A9E0DACBF2555874
-A9200A29C081EB4562F10958353FB72F2E0486F479ADBD4767284E6339BC2DEA6A05556366FAC7
-D8C19CBC7CF415308FC33AC6763E2F450EB9FF4B86CA7ADB2A7BE9033255C445936A2C970D1FA3
-1BBD650E10EEEBB018212EAECC4D4D03046CD14B860BC6BC7FECB4C70BC60456295803399795DA
-D15E5A7F2A3B8EC7BFF9558A0EFDDF178752D7D2BE6DF7CC32212E7F3C632B5ABCF9F440CA4195
-E50F3407DC05ED8EEE3C6EF5D927A304063D2C5927558E212087231C485A118433BEA5D0314C3A
-B3DAA2631617367D5A8B79CF0C1E7982953C575C363FAE2DD20207D5F57398035825BAC5FB0280
-47C7D907B3F9529B9BA37245CA1F50488CB4F3106260D4C324D23E061A2E2E88941D56633B98C8
-75E93770FC0B33209248C5290539C23EC3E072AB079719D3417EFEC7272F496F0CED0AF2A58B93
-45F5A779AA54A0B05F80DB1908F6F4B91C0DF41AB56ECC0B54EA9BDF6929B1C791475CF0864E5B
-A00DCA62280FFE6A4C62629117C989D332FFBC25530BDF4F08592741656B60D82F0CA39A3CF374
-5A626475D1E9783378E940659ABA7211587DE18504C4B300F40434CFE719CA3CDC3D89BB226F5C
-1E345A3C9186716E03C222440EC5A9D9B585F9D10F9DA18A94F927EC32E73E8449FFE392F703B4
-18B525F5F8F765CD63824896DC2F81FA75DB733A417247F990FE6BF0861F1B463EEF1B727085AA
-39E36B48F69CD2AF2F05A3D328B3F0565049C19481287AD0515A52B323C141789D08CE15D0D792
-FF2E8F498BA4DE090B6603D7270D993A152232F4D0E37739FE269E40E8EA92872180B67347522B
-D93ADA3C3B4414004711C25276B1D845571181FFB4EAC47EB2B3E7412593A80D0AB953BBAFEB64
-A0DA73607A207B8E2CF3F1CB47B74F1D31BDFAA5F6E556D270E00DDFEFDFDFCD0BD59CD03C2590
-7A4EB0E2CBDE294AD274F29646BCBCDE44BE8AED41E878557F30E81A0842AB388637F7A212E953
-8AB2119B28C51FBFE4E75EA17AC233949A232B015F748A5C51B30ADB0918D69EC641BBAA574588
-CD45AA7791AF88AEAB4F82FFA0929BA72ADD4EAA58A00EEF780036B65D279A10240515ACBF696B
-90F919ED5D9CD9B65D85450356521278D2F8367228C09507A6B52AE413183521BD2454A755E150
-784E446EAFE3CB12F35A4A92D7F5534260CB84A4D61980C535D23FD091706B2BAFC60047ED1388
-2D3DC00BB1E006A2D678CFB3C2F2921A30A8090F303BAB9225DC241F9CCFDC1860A062EA1FF404
-7A2706F42C1AB7893334548876ECEED621CB105D30E03EF0F5F2701824D1CEB599C47DE9CE2274
-A41E3D4ED68C56D8130877E21EE161E863CF27413FDC0A9FBACC6D518A767CDC7102B786FAA8BE
-413F625031C79934879D9F0D0E82B5339BE5EF972F4B545293743F0E31647B6A022550B1CCEC31
-86297B1E8EF9A0AF76D6B144C84A2FFD5AE4BD4BBE6BE084BDB4E503216837D229CB80E4E2CC6E
-3BA702B3E23BAE1E96309D919A3DBD5F30D78C57598EDC3BEE4A8374E4DB7623E2E6F1C3215B36
-31AE53A2911298A952631D88884A477BA09F526070AEB8E0E9E1FFB8E694DCB2CBBE4E531A7575
-DE9D35B8EB87DD5FE44D4044B674BCEC038F5D4D9324C5DCA1C0505DB20497C28F345A28313B11
-0BE19BF4C12A4242FD01CE385362C273D4A01F234642D9687DC930CD66263344161EC08B49C30A
-0E39176E07272C5FFAD0E3A3489261A070DFEDCE9F27E5DBC8DAF699344C070B6C030339222DEB
-C1F625AF6DB875C69FEDB4D6135811005354B26FAF284CA2B92F7398E24D8887C8E70A151A0538
-9883EC77EAE6F2F7D6CFA77C52D81AC221EB6711EE5F11C621EB3AD2ED5755F7B055C19744B937
-4AF98B9D178FF7AF4EAE1F54F49B4C9B76A3947D647941A5C3FB9C3E5B5C57E4EDEBCE7832B16B
-DFE73FD84582E1AF57A393404FBDB07DF4344FF5837D825804ADBF5BF85682D9C2177ADA261501
-39B05AFE65678753EFFCAD4F871A3C7CDE919F7B677D93ADE141F0778C1DA0D25E4A8367089E09
-8C8E74EBC70BB5CB7B8717A2F23496BC24B00085E830EADA44B528E8A0CEBFA870140598F2F680
-40C237ED915D4E9C5158B1FB5D8ACE3B66E429E6B50C22FBC4D289A15BFF52BBCF71FDD36C6679
-5A9DA5303654B84EDD27CBF199A2C564F080D8F5781D39A32B21BEBBC978FF8C4C3694C4396725
-69811D60A95EC32A232FC0DF1276DA0DD6A2548FFB6CAD2197BA3C704D0A67FB83D05087C9C1F2
-94BBCF0F72EEE91833B9A625C6A749C3666C6A777010E05F26AFCCCC1A6D6CA26EDB8D12A713EA
-43F0CB9692E6AAFB2470787CB207D7F3D297158E4E37CCFB67EF01177C36BACF5512919E62C884
-DA155BFE257B820AB36E88A9F8BD590642E6EE18D295A53B84342E7FCFAC64C21E681D3A974856
-9A1E33FB4633FEB2DE5727872201763A5E649991664C40C76907AC876DF566911F4F151C815091
-BF3116EE7C60CBD379D3737C42FC35CEFFD725492A80FF0AA17FAFCCBE5DBD30B3310319570182
-02E91FF3813E5BF41F7986BB970808FF802C02B31B896CB480A5082334BDF9A390CB20EF03C1BB
-FB64288B244655AB9ECB8BF8B9EA61571AB2FD3B1E2916D38C247C21F4A4AE03F7E1CDD1A28307
-1AE0359B960FD9C45AE39794FCE5D73CA1A507FC6D0EA06CEED17A4083A5B6AD4AC63B9ECC0375
-0B799F3BB6F86E190BFD47CE7A697C6B1C89C3B55C2EC058F3CFEF2EB53B35CDE7749E79531D82
-0A1583DF38B2FC0A4EFDC5C30AA5D1DD77DD8196DE5170101A4AC8C8B9DDFDA93E9FDC07F3F572
-E1577A6E0BB03D5BEDC5B3AFACDE1F015534695942E9FCF6E3C8D7C70BE56738862E3A62922390
-F31AE5391D55D125680F3FC0DC392C7F696CB9CCE6EDFF20A3EA4C38EC16B2D33893E148DD373F
-A3090AA01FFD3A37C1BC80531B4310AA42B7B0FBE02762A656C69A1285003093158CC2D13054D7
-A192DA888380C82D4EC01A77EE962B78D05373B37AC588BD5F8FCCDE19C800D68499E9B07BD329
-70691EB6AB21FF4CEDC94C96E55720728B5D54AE5F8A7905D6B18EBB184992C2D4B4ED1204D6F4
-56AB648076C24864A8A7E3ECA52D5C73E760A442F1D1A162F15593442E0C37855B51FEAACC4B20
-993D9D9B3EF693CC68CA75E449F1E32B00231A484F110AAA2066A4348D8DC5D6AC1FD374E404AB
-96E308BB2A159901B6AAE12E1B5B6674C0D820841B4335CDF20F2C64CCFC7EB064FA0A0F07B125
-8CF9FA6DE9AF57B0ECF09E2DFE96F8F78B83C9F689F1A10D0BD87FE9930701583171FFDC30BB7A
-BADBAB5B079086A7943A3C6EF5C9F652F9BF035916B76764B7B53EEEE54D8A33D5846FC6A6B64E
-99FEF43C7FE90DFEBF83CE4356610C65C771426E7D28BB600E743A575F88E5A3F1A61B5F53D431
-151516B8D247E642574B409CE4191FB6EA040586F49FD9116FCC9B602F76F6298FA74221B350EB
-F69F6854D0E8E2E8BA50D2DCF7C04D3B9B63C7022006371DC3FB8E114F44A501C28A5D63383925
-3896C3CA6A65A9C0B0976A9C5FFF29EE1D27B0B6A1CD2A33928F779CAB654187FF00CAAD0FE27C
-793F5B1A1EAADB7574B2B007D9AC5F341E8AE471088DDFB6CDACD0437D1A75FD7530150DE40419
-E144C7772C5866DD09FFDF928EA4991963E0A5784961B467110E4B126D0F05CACF3AEDCC00B559
-9C789174F96D2018ACC8B58BCBCB827D694B5A4E1F8C4310F7FF5C50FB3E774173D21ECD4D276E
-B02E08A6091D1201FC1176F046466E4D685692D97EABED3699AC741FD506C10B90DCAA6B936E57
-2A4D7E6862198B29AF57010188941CC7668EC6CE860F416D4AB95C44E0B1685804BFB329919D2C
-0AD9837587A380C6FA3F605EE3C84A14F4E8E5702A1F5057317E2C3A70C4DA53FF1703BD88B18A
-07A68C2622BA3AFD610A4C3AF73B7EA0965B34C69AF7216F9E9A00CB609AC4567EFFEAB245AFE9
-02506B811227AF036E8985A0D8931B7DAD9C0DDA01A88BD5E40C6DFE3FAD7D268A41D93EE38D2C
-B5B8ECF6B7F295D107B2217B0555A439E9586B2B2526934DC922C5D75C4A5469F8B3ACB722BE01
-39318429105A4F5AC2657ABB4AF11ED67213AD16120EFC6026480FB15AEC28F3B0C0AC5B82AB55
-322A9E0E6DE39AC103C1B4EE3F6235ED6D9AF0AD4A2949C61C182978D99464DCE81462A75DBE9B
-369F0DAEB667948727B721D4B6C7AEB0E72E86896AC6BE3F8948E5A8C3A2A04FB8867515ADB92A
-B1D0C77B5A29D871B6E3406D44B6C4AF4A2907418BB99FF4912FD5E2171D141B09C3818595070D
-580411ABC386329991F4D86FC7EDAABC817A74BFFE39093115F826345A48E966674B0D3290A6BF
-1B6F634D002F7E17AE7C065DC6FB4A18897E2C25C96B9B34A6BCE88AF1F0D2A83D87C4F7EBECB3
-9F90AC1594D395F785CB0FDA4BCB7E16CC78E582525C5EA073E9611BB5B729A372DBB80ED0A53B
-7D44E35E65BA5B50E383F932F7D0C38B4BCE43C7EEF4CB1DB16AD5C3BB741AE73DD00C0F5F949E
-1C4FE879E7DDDCCD475197917D4DF3CF62CCCFCECB31137B0D807ACA9A0242898FAC954C382214
-66BB36BC54B1DD6B927924A5BE1EF65B6697FC6F0B621AB5499C03CE4AEE3CD7DFD1CA369DFEFA
-F421BA01A8D5794F63B05625CE02513B4C84B8C0189DB3368E7A7568B422DEB07D7E34D10D37A3
-1CF59111FA54E490867BBB45EE635D4E69116F4F008120FEEC6FB7B7FDB5F921381CC520C816D7
-4DC29EBEAF41EA6230982E486E4916B285CC6656EB7EB2A1E13817ED22FE119E49452AA0BEA8CD
-DF0457B8450FAA7CA6863B47B297F00AA6F039941D89626153D5FE7F54ED02FD02BD68EAB40836
-55C11306E38E89F4853E911696896232D12A0800113DC0066AEAC6E10AC5CFD56DBC4BB36BAAEA
-B1A821CD7DD5FEF17884F46BE82040B53705D3541ECFFF57F379E9BE619F52436017F6C677E2A7
-8C105CDC276A7E12224BF30284A8BE1AE06231CEE80398F16040FC720934E33E46F4E4CFB410D6
-2B37C95CCF6A5D0B205865DFD1345204A3D2AF5AABE6C5CFC16E97FC3CF27BAAF54F4F3DCF1388
-1C9916B9BAF8D160DB5573F16C5A1F95DE88F878461BFE98ACF137C14268DD8882B20A0859914C
-DDDE2899CAAA419F561C04FF0DC290F40E319210300E91628801ABBD1DFFBADC685040272DFE90
-7F3DC0C0A5C419FD17FBD4E7B60DC1EC1B69D83F4EDE8B8C6A4DCFD2D419BA88BDB4D9CA0504F6
-DC28F5071E73D2BA95D15B8AF01527B2321837CF1F66DCB58B6071349D5EC951E98B0A3E2945FD
-FA928D6393D852024CE0D9F5AD1C0D4CD275328F1263A965B539F9F77A11D9601C70FEC6109E3D
-525269B54AC7AE10ABD7E9DFE6D2C116ADCA04887F9A61236B2B6CF07BF6629B4F91272921006E
-B73CA6695943828C8B6B6AE6C74DE26D00874B0CAC27B8B6CE2AC29FCEF2DD06520113482B9E97
-B0A65BBE14572E8ED5D698C4B30B31EF4A68659CB178DC79AEB9C37A069280F10E838075F383B3
-E59B8FA6FED1E85AE260C5C9612F65722A6EEA9E0E92188738019A3AAD25E746791DD8FD92AE15
-818BD278F2E27DF6F5E9F410E419935E8829990C1A46BA2912483D48DD5BE54A42FE3360417AC4
-86D19633867EACF8CDE5865F2A5DBCEBEBBBAAEA670AAFC86ECF234FAAE825A47014913BBC29A3
-FE6F4B8AE09F62D2F8B6E54D5D1691D8C1ADE6EBADD268DCFDDC4A58484BA72D6970F4DA7905ED
-8070960225D73B77923C5DBBC359E34822348387C309B17E4F36324A2EA1C2F305D6E2C7573AC6
-63091F2F8396458371BB62B1BA041D418BCC0394B6974AAF6BE37E8E9AA7DA543EDE9F83F6DE06
-177E60C98680B8E4D6DFDCC921B6F044366539BAA9813A6ACD48D0F0229BB93AF244DD191A2B3F
-26FE28BBF4CA9BA5D2E17CE8F45B35D595220E46BDBCC47484911869E700D8229BDE2DD45775C8
-5679A730C00766EB8E69BA8ACD2D903BF01B9F8164E3CC7C9545590C55B5CC1733BCABA7B07A76
-EA61A0315A077A53626EC56D1C2DF338DF09B4DD375FC15260808C2DB4F9659D52F56D474C588E
-0A775743A7238461042BC9C40F1C4F5AC640F5467DF8C171E74FE670B331E57D7799F0A8D519F4
-88BDA299AAD86638A9983172D09EC8ACA7B7C0819CE7528FAF394569E04F54D5A6086E7588FAFB
-65AF7E6904D5409B62DA57A2C3E26184D68D5FFF28E8A0027EB5C128C9C12F1C1CDDF08D8C9D12
-E057AD30CFD90F3A29CEF4525EBA05396370DA91A7802A51E40C331F5DE2DF4A39558CD6682640
-03D174A42C50B6A5B2AB72016B2B5E39FCBBF5029D39712BE03171F1208BE5E1A945AEC3AFCB9A
-7A5E6058F70C3A1C2CDA74DB0C43A09422E11CD2A57CE4CCF0FE58E5E2E7E3051E401C1F34606E
-616FFB4F4442DB141B9BE426BFBD43D14581EA4128D244818F85B6424C800DC117D6B7BD469321
-0D72550340B1DD1C432B05EC414922C899B75559D25A63A44223A149ADB574EA515320E678DF66
-6AA9D619B3C4831B00F96F1C02712C395381CD0383B63BC53C1FA4C5CD4D00862F6819B491D260
-4A4AE4955F7615D87C298396C8278075FDC008CAC25473C9F9CB28A507452B7EADFA56A3DAA7C9
-16AD4F090123C8C885D9D1ECBFF8D074C98BE8F18C0FDC2510A4305E9CC8BA571374BBB7BBF75C
-F1CC9829D5A1A252E4730D1AE3210AB074B67B00C54391328CE1147F205502DFE3A6EC47A4D63A
-B7D2637B2DB121E63FAC1FEC68888A2001840A05AC90B07B577E11D97644517394AEC07CD40D02
-CDB9BE567DA3F4135B0253D503D50EC566F422182DA173AD62E2B94D31A5B4F2099F9FCA252246
-6862BEF6585E1A189565958B38A64CFECA4BE515E6E2BD8BC5EE44FCA593A2B868544321948E7F
-A4AFC1F5A2868CFFE363C7C6E88165444E13C8C47C65E72C9C8B28CA496B49A2E46D81B52B48C5
-7B3C8011BAB8E8DC9A14767153CCD8FF4A2166FB00A60402FE0AE3F0691B572766FA4BCE607508
-3B2B1C3E16CF4C9108462AF1E6A48F4D7A1A41645FA27677281022949500483B46BA23F1755B5F
-EF0578E5F2E5BFCEE2F713B3324A8390ACE191D51408022C3C8F3A207766EACC05A14E3C3EB6E4
-85FF87CE4C62FAE3C6BAD0D26ACC8E7E584A8CD7A25A9AFB42DA6106F07A65C261671202ADAD69
-542EC6D1CC5B1EEB605E474BC949BA7B2E8A64D4F5BD7BBB326C06F9630D4F99B9729CF4205D29
-12BE9CF81FB114541EF8D7D5CE4DD1951CBFBB5B2FF5A9896202D438C7225B8B0F4C985B5A94CA
-09448A46C2E3F04674A59F55BA9851BA61427380930BF2747CCA7CB932388561969DF7F5D9545C
-5195E52A847EF2BF4FE33255606BAF3AD695544CA0FA7681034517640D5611AE1A5F1178CE695C
-223E29C41A4017760F3651122B7BDA4E967BF5D76FB93984A52773C518BBC71DB32FC51FCC2F27
-BF59622C8907241A16D31079AAF1F310041D63C7750872F8FE294C06C483852399414A03D4B684
-44289717B3D097324EA791B963A273D0331714F1F912FD6262B81FC89A5050A5F341E91500CB00
-E970CEE22C6C28ED153A44CF43E9DA55FCFED8B953F9412A1FE477104DB3BC46A897682B4912AF
-1DDE7F20A6B9A4365060CADBE5316B805AD0C5C32D55B8458C47B5D47FC1B4140E0F6B42B78FC0
-BD262313F96DFBEF9EFA5A4F590BCBA3C484A151C05113E4DB9C56FA187CE5D07BFA5DA8EBDE83
-3E75C6AE8D8E651654E11008172BFBEC0C59F83BC1D6AD9C4DE8EEAB779C1F8DC479ED084B76D6
-D582DCFE08BC4397ED71F2562575232D9B41EA2B5F23722DA40231E9AB85677C29A6BC37FC36E4
-DC4414661CC627EBF94AF2B13CA571DBF0105D08632CBF640BE1A6F4B33046238D62D1189692A3
-6EC37D0299B2B43D8DCC06D374EAF0B5D000A8B144A954A37CB7BA6B7ABA3617BE2F719FB95410
-5179899FD2187BC906ED19D54D8BAD2B970E7B62AE8EE1B17989E26F340BDAE188F7FF4213A1ED
-758FEB0DE33A33FCEDD3B874791B6DA5F63B91A2ED5DCD67180D374562A2ADC73359CE9EDF88CE
-824AAC15079441A95D8F0EAAA18E6CFE4016326A75A76C210347ACAFBB90C3E14C7732C8F5CE97
-CC4A9CC6E2F1444DCD170DB12A9BF832CA1A238A29C61E519E9F00F0F5090E84933F35FB7E717B
-B64991ECBE650E4864B24ACA929743EB77591F64487789EBFF2A2BE399C5097D6C673B6C5A2179
-BB3E846F49F2F83F3B1F360FBB2DBA6AA4A516EA1BDED50A497ADF520F2D18846BB30AFA1B732D
-761B6760080B448963D77676D9BACC127E5E033E4F1215F0DFFBF74247404B276201C39D187DB5
-9886A597E04E4CC05DBA500A24C9F2237D5BDD93F9089B92C653E47AF8EF00E62F5F22FF8AADDA
-CCF1CEEE6350F3348792912DC6131FFC1DB93FFCACF5B88C96F5DEE570008CE39B1E002A24BBFD
-C3B0A09767B24644216BF8905E02EC1FE6477575E3C45DA5A05BE475C20DAA7BCABB43B4A9F16E
-6C5FF5483E0F5178E320CA3938736CF32569B61BE5BBC724D2AE0F970AC88A3B4AC2DBA8DE8ED0
-D42D0215D47CB49E69FE1D7D7E40E87D0354C835F45735760AC02A1324ED7816D9838D28578098
-DE0F1C6505133B000164083310573BECAEB20CC880EE592845B6CB4D3F2C94DD06E3AF43242499
-56C2DD51FE2D2208E32FC8A837B4705B71CA68D7214E92F2996066AD6BA8672A2B09652B3E1861
-7F6B1B60CE18F9EE5BEA3616C3EDEB9AB79ED7DBCFF05AE6C5E03F33C4B20C5D2AC8B049B09A80
-1EA83D3E1CC5C3CBF608B39FF2662369B85478EBDD4565AC7E6D79CDCE0A36E913FB6A6A098B4B
-A16EDD7BF1415DBC0A31DE30909DDB588C573FA54C3A7C703D76BE975079B781073CDFD60EAE69
-6BF991B69DB54FE24CDDB02A44CA8C32F0935E77A5B8339F60FC8630A0E921A444643D68501E25
-F64813FD94AF45F9040B148BF0568C1963D9B26D70995169483B011D865DD264225322C45FC65C
-5172DEC70D0B2B792594A9CACB21A225E8D07908A052AE4F0FBD3918F7F9AB0D7D2EBDA5F0E07C
-D043048C5DA8F0A38C225D2C15A5E03689049D80463B7CC35A54E202FB2333707E0A3682B85150
-1BE15715A94AAFDB49BF6BE5F80D83FCAB28B0B800D685E658D41286D4BD421DF10428C40577AC
-36386FC6B76FBB98BFB6A13FB6FA40C6837680CFB1520C0706254FCE622D14AEBF58781E0BF2A6
-222F54C43704D4E370D0AB3C91F4D5501DCF69FCDB8A08CF7706DFA456A11913C42F61A832AEA8
-B189409E146557338AB059AC7BA9CFEEF2AA969C5561B677414A91680649CC3DAFF576FE686F9A
-B9931A749AD17F6C0C90120AF8A9584535F1F0B7C31134C09C8CB07D857395F00D98384D8BFAFA
-FE27566AF9E96915870C87499EBF243D8EE8291E60DC73C8ADC2886E4D9808A39964D24B8EA30E
-F93B04DFBDA5A5B868D29E3945030AC0A394EC4657B4FAD9D2E2C7965DC7EA916A3E20E67BBB7E
-99D52554D224938DEB35B11676F91F5ED24BA6670F574537BFBCD403F09212C3DFC3B8F4DD9EEF
-DE27656AFA41B69D9094FD23779B37D6E54DFB6A654923AA9093006B23CCDD68DE0D6DC6E8B232
-464DF25412DA32486A81887450891CE49172CF0033C3CE0206B02A9BC94FB609491BD3B8F2D7D9
-080102AF684EF93913160A07FE787B1FE843A9064DCE5E29612129DFEE055646FB5BD78019058C
-8E32F297215AC6313022C40FF4BC9A38529CE8F574DBC54DCEC0FB37F1E99A50166F8D7FC40AD9
-283482952E0692D21C6B8FD7592B48D77BD3487EDFF6935DA9F4A926B5CB625C994B2365A39688
-095B9C4663254C7304617D2ED79F333F5769BECCF0B88287F1708FFA7211BC0CF9BB5715EDB733
-6F009A6A797EB3656F8B82AC930695A511B8E45E200BA82B81F3378BBE2196B4B6CFA19B829D8F
-8FDDA6006EE028965C34CFFC5D71ECE1E9864D5C770B66828B9CF8783AC1413371FE27FAFAF46D
-992047F64C1FBCDA55FC6525FE5CF16E681FCB6F35786E262034E1B1B4F09CC4AF3A478A30B408
-498D192C627B06AAF0D88E87D4FE13DC14A9A8A20F9EA404F8DC89C122423FFB5B0E3B88F25C4A
-44C799449D13B169E28A60C86E1738477256CE22E016A0319B60DC8A9D0426BE137616962BC736
-6BE6780942955BDDE4CF4CEF3177E9FCE58E706B3BB8A013BAEE39506E7378A9C5A1F9AACA2EF8
-224186542501B765F002B6B35A79ED7A2A77DE1192250A3D119B687D0AD2CD269348C65075AFAE
-D8DD82ECEF51DCBC18C374D8A092D99BAD3AB5C29A8FD28FB41C02EF3E4D095B7082E6D5EE1A5E
-4306C9E877A7BE348FCA240527B4C349FF7FF84901A5D22428B27AC34B44EC507447644BBD5501
-8FBA01EBA3693418EA2F6906EF3C1577D91B63CD0BD2C519597EE07D98297942D80B0B65C25987
-949083FB0642DFFBBAD74C22C3C10102E57C7AC0DF4099C97873DEF713944BAEB920287B8E093A
-BCE51BD52CE45DB3C6A737A55E1A00AEAB50E71F5D5B0CDFE61551DC7CC3BD03934DF272BE1944
-EEC621EAC02DAAD8E54E04DDD2C3F02CEACC947C799424EFD1A6C75C7A35BDCAD1DBCB9F19BCE4
-12BB019CBC7525536C5CE21E32E9B9AA0685C7D3BFF3D82EEFD684E8D63A526018F4305D137CF4
-6B97BDFFC1E28B7745C808293C24C849C9C61E93CC64D99820FFBC5F1D9F016DDA621C97FA8418
-A0410F78DDF4531885509464E55C2EEBE23AD17C60961699668EE76C6E44E0D0BCC839B808ABDC
-B6FBB586C87A957136216953315981AFB2089C1105EF07DC47E5B3670EC1664CD13718B8DBBC51
-746750AAA374E71D4ABDC31F8E8AC3804E908597CAB8B3E70EB42AC67A0B5B1E2E628796BC3A69
-F3DFB63DB7DE4E40411CDBF98B86688AF4CCD8647AAE4E1D608A00E0834E7D34CFDAD8C95DF21F
-AF62404643BDE3700514BDDC81BB34DF75C7F8EDA704B146D20E14EBC98B9D0A11218EC8578BF5
-239E5633605C769EF3EF6855F48DF16DD8DE5320E1851E7C17311CEB2F9A2811424DDCC0E6BD36
-E45BB5191D890197657B66FEE05B83ACB88E12BE1A48D66949188080A0F2DF71DA7A2E3B072B23
-FE94F176216AD5F8DBACE0791061056E5BA4364BB74273A93B853DB23E396116B8C1C3F3F8C545
-A42F02D45DA7DD2EAD34C01EDE163FC5B9400C0D39BF0CDE1B1FCCBB68D47B44885EB0AB14D205
-A30D1F2E4E1825D9742DA3EBF4E47F6F2F750562400C54330F792A998FFC158650940C0B115282
-D8C22CD34F8CD532ED3B94A5496C33B3802AC5D627B5F0A8706311191EC4252549D813C92A01A9
-804B39402660B489095F9441D958FE3873CD6E6FD3EA91EDFFFFABAF460B71F1C1EB9703A7D9AC
-AAA34337C306B67E7460AEE1AF02E7E2E49A332599BA8CF2309AF2703631B4D91CBED26AF49410
-830CCA7023A7581E2ADB97387A7DBA23189AA993B86BEDEF59A72F246A4F58EBE354992D91514F
-130AB2C167717A97D647A157BB6B1D968AC86C9A97E8FBDE9B2E141DA7A1EFCE2139D13F0B7489
-51CE73B1AE93B19E93B456C491363E045CD5A4C79EAE5174F332A36A9BC1001B793022983DA2A1
-8A8C7FAF236DA88415A4C7A262CA714E373A7333B366AB35B9E39C7389A9D3DC385EE951F66879
-188C6A50C3D9556CF70C19F3308ECAE12009C324F93F69E8208A2A8E9686EDBB141B1010368ADA
-78EBF3E52BF05827E453A9B2318A7A31B681148419434CB738A5A36A9A3905DB00F459B265C793
-41331A9661352E40157221BF0D3EE9A3D7E109BD2FAED3FDFF58C8B17DD8D41EEA780A090B6A61
-E84CC84E0B5A07B7F176E3E3B21FA67A6E51B154DB1422AEBB3F11DE57E3A2928440BDB1005BC8
-58598D8D77F30628DE258F26674CADC2AC1E150981DE5FCDF9A8134859EFC953524A83C1E5F4B7
-0AB82678DA8798AB558C1981DC65545E9669AECC21EFF0F428709FC457833E593AF584435C6D49
-7239E2E6FE9F99A4456AB8CC54056FE1ABB9C591E11B8E1FA72ABD1C07F23BC65D83BDF2914F02
-7711C1B5405FC84371A9050FF9B85F1338CF24D44DB280A284F9DFD368816027C9B21F41BD7B43
-1AA73797585FC93C0A5EF1353B9012FDAB80EA8DA648A32BA684437E904793FA4BA37F83A86CDE
-B9AB4FE06B5DB0172012CF27613FBFEFE108B459EF13ABD1F266E5921B51ADB35235A90B8E646C
-FC94B8A2D25E295055827B734D965E91B5520601415F93BA0CA60767C60AEAAC82678E59BAE9F0
-8C33C925768CDA423369006B6A84E9ECF4A9576C94FBDFDAC3281E13E88603DA9913BA1E148A6F
-9DDCD19E24E39B221001F6C824806A04747CB305F9FB7B22AC6C5EB18E68473959A5DB0FEB5EA4
-38AA8D7292AEAFFEA89E9ADE49034E0F03C2EDDB57D15C1106F2C50FC19E2760B8C8D1F3F21CC2
-306485BF437BAE4B710FC4DA3A7AA53F9A5B0EC13488649448249348B7A1618F5645404E04EB48
-D809DC0BD68CB12AD22F4B46FF2E9B8992B812F2CFC9F6B45FAC4B6180479E76FEAC7946FD6DA3
-965085CAA176FDA9881036220E289F6124632367CF7660E0CF5341E675A3E7914392421C1CA647
-103D4B9DD026337C4FC5A148C39F231151D9E0CD4413DE03379CF0DD10D829B95CFF70A88BF541
-6B6088529B04031C12B75E601BD72A1C1CFC52B5D377C5B80490105A0BDD5B6FE5821FF77E1A74
-DEE5AFA5ADEF8E473975360965C97BF48CFBF7F04DAC7878D0B2190A66596E10934EBC1DA5575B
-B5851D04C34BAB17979B35DF56F5E3DD914D6DE19F22310854513C2766AB6A6C58481B0993CCA8
-95B73C3D45414803FDA3D413F9220AE10097FBE7A9A6CDD150CA0F8575F8806B7F8E35D17DBA0E
-C9B5B827B8B28E634D4DFF5890D40268C96A752A8D03EEB11F06C7736EB608B101C21E71CEEC70
-73B54CB639C23D11344393FA857ABE72BDA7D0B8C1B47C92A18514EA4446E6BCF3C71305E53963
-9A0AE965D8E0E14B51DE79531EA5C3A1C0A9F8B8CBE42A24180E09AC811A85811A536C568DB390
-8F117D5A06C075C452CC2226A9DF157D84570A65DE6119CD69BC0936A0A4E2495330A023EC6C79
-EB8845454A88ADA1D22B3147AD972537CD6C8B7F1D41B4138FD6E89DFB65D12BBAA25C0E182077
-755AF5F0B4147DE8D18C59FF1EB4677FDDCAF2FEFCC49C0B3206BA2616118A86F85FCDE41058CC
-F8BAC9045AECC291C5AFB4B92B067315BBA38295C256FDE9B4D77B99470DBB0B9240E682CE9DFF
-ADC7DEA34BE240F6432DF291C19C1F2A4FFF206C0832BE628EF15672A3091B7AE7967980D10E03
-6EAC6DA540C09501ADDF9860C59E6D721E559F3BF80BDD9ED0F5EE3E95130ACF6C4EC7161B7190
-CA4D9F74FFDC060CC39FA20811C6A1725CDC2F61C080036181AA26C43E056D8FF2660F492C9989
-351B3844CC210FEF0694265282DAFBBB6AABFDFD6148B3F2982992AD34BAF3E34BC1E2DAF2F45A
-BCFF9A9888412158C73F0289F44F7793B09AE11D7788B2DF2539EC09F0FC7EE91DFC836070A38D
-F12DE1B86901966497AE0EFB1C403F81DA5CD37041F0242B55718A9B4855345EAF4DFEB6A0020B
-3996618CEC58C0948B8D68042A87343E81FAA82A20F15AFDCE6856281D80E7082799B654355EB1
-C515B0EDB842F153A30EF109F3280EEAE70BD11079B3F339E218A77A5E73E55F7738A0C81D25FD
-E5A24EA899FAD8D7D5F156BCA8DF019AB31BE0BE898D521D93E02BCA53F7AFCB1825A07BE7675D
-44BB8868354416FA3CB072E032ED4E14397D89689D998AB3540F3851F4D271F0950270A726A885
-5FEB558AD353308D5E1448B3487F895CD02A9F1FCF7164D32747CFBFD7BBFA63470E84A40ECD60
-DDD9D4A140C1818C9B19A67F4BA7D4CC9582445E58F4A9E72BE3FA66F09FEBDDC41AE995525840
-94B372CFF3CCB76A6DECC20991E38C49B70834E1649CADED29C7A3368A93F19D19C8F7BFEE958C
-021F54731E5E6379292C2EE8898058633DF19BC5F7463B48BC12DC2DE92C3AEBE2E7EF273172A6
-B064B6073BA7950D9B203119411494E694098803849CF3A2757ADD758C726291407085D17B054C
-0B5AB36B843AB10E40BC1D556E42F6D12A4934AD98AA1DCE1F3B5E36B3CFE961DE91EF6D242AA1
-93D20582798DE7146964842BA49934D8117536BCDAA1BF4CFD39FAD56FD110128506F3911A2F80
-0CFA2AF2B6F7F931645F8F7A48A29341BD7D503513600E8CE18A086578C158BEF4222141BA1AB9
-748293483AB5BA75094CAC69D6B48D9A598A22843322D71FE4E54D016CBD139F1FB38730A137C2
-B56FDC38FDCF4B911AF65D9666FE871A0184EB3C8677AC77D20B658D211956B101396C72C63821
-5C21FCF514615F7FBE4EEB17DA9E79AA2DDB6BCD486A5B3DB522C49E78154749D9656EBDE63007
-21DDCF2D738EC88B96E2018A76BB47F71ECC6D2EA330796BCE78C1502AE033D1B936ACF4B14FA7
-DA665A97E4FA3AC09F9C269DCD5422C20B8E5E1E45322663041DA01CFA72787E903D4D3974790F
-EE22666ECC6C89AAD89F01E5C683D31B69D298D5C82341E17737413B44B8CDD121705A4BC6BF67
-2CEEEB7C9F8B13E1ECB760A7EFFC1CE62249DAAD1A5F02D65FE2DD8D76B964D1EA8BAF9AA2428A
-020CE6AAA48034D0FCE36CAD982A46428D2A2B2741DEA674C018C12713289A89A60860719463D0
-B35C76FBFF9C39A73B3277B357493C704E1BFBCFB86BF566ADF70F0DDC5D3E01A0413511358924
-2CC8DB3107E229733968608BE00ADC1E0DE80427C65C74F696BD256A9E74731EFA182028D00EF8
-E686A53676FBAE9870E93CDB7C3AE6AC9F4F629E40D209EFBB2961F89ACCDE817C4906DE2050E5
-DE9646B216E31A4FA02F9941A9A104F656807969E5ED4A639000C7BECEA5499B6BED13B00C7FD1
-1473BF322B3A56BBB290C230C67FD50EFAE3DA7C2D8FDA27B0BC66941F8012FD4A40D7E65E7CDD
-4498B63C452F159BA17E2B938BFA3439BB0DC71F4551EB5DD196C8B7C0ADAED1C255883DFBF900
-94740283291693C9DC77C514F450552C6612222538C52B6474C077D71E1369263ECB4948194514
-CDA6A491EBA464C262D90C11FD4706D39EB5F3F4EEF27AAF150DF2EEAD7EA06E99358ADEE0F1D5
-9A24DCED2FB72DB849F4EACD52393C6EC86E9CDB78D36B6B3280BD7B1C3DF08DB3BE73687232DE
-A4B6B585CBC3748164C055F3D7F53C33D9F76B5DC7AD74263EC362D9E2FA9BF9E4247BB900C4DC
-60E9B4898530DDEAFE2E316827E1CB13E9E7CF88D9FE0E5043A55B8A5B10CE654D2D31504135A8
-5EB566691B4812D6E05F34BE2DC6C1BF70CA19A6633000732FEBCE0EBF4E28721B78A12F23F79F
-AF43F2C600D41EB4E3690B7EA24FC1AA3092B5EA5AA8F479F4F54B2C7721351992C114B8A79636
-FD235EE91D6B5B1BD5CD918EB3436C929DC151CB5C42EF4F62D21604F0F1EB3E01AA78487B4B93
-85D0E09B8E2531D936F5D3ED4D8C244B838B8E72416F9D4716C41C89E2980DADA92B50AC976D38
-7F9E320775EC1E9B09AC93914E01A71566CA9343E853CD63F9C0ACE1FFC41E00B5003AC5FB68B8
-0DAE5FBEB6CD8419E2434DBE40D017FBCDF617F3A8B916EE5D8ACD3689A9FA438F54C5AE5C02E1
-CC6604C021400A437E729C6FA9BEF55A049C7056DF91C68DA0C2F7990B97994A10DCD49260FCC8
-BA315238CC2DEFD07651DA975DEC1889723FA502E4BFA7ADDD25138C84BC049E4ED25885B9AA66
-4BA18B23764C3AB41213A43393EEB6FB839AF29F9E4B7AF4317E455C7F37543C668AF9B8B6DAAC
-068370E787B7D64AFD0E8C010CCE9BB2C0D67A6D8CA0CCD2F6DE3FBCDE1BC6CF9F7AE893F93AE2
-9BBE9AE62921C176C9D87DCA4608DAB3A42EE9C2E1F3180D200CFC2CC9706295BF2BC5B41F7641
-1E073C36D501F7B2F2A482D3DE67FE2A65AF72A909539D1109E70800A0126315441464BA5D1685
-0D04455746B4BBDC085E7D15BF2CA5CD8E717DDE8415C1766057473F53F74E544CAFBA17D5A4D3
-F784383FC5CAF153263794C8DEB9C06157407A0D65B0DFDCC20381CA0B54120E874D8154CBC016
-6F015A25CFCDD50A79929B2A9374BB734D3FCE5A72E270089CCF6ECC0FAE93FA7397DB79AC9303
-161BEC51B8C599881706B13A67324F029F62DABE8BD38D6FC5400FE28EB90033CFD5A1C4A2271C
-8375AA995192E491436E96AC474DC3A055E5D0DB75116C88E3E4A25810B15E82CA0FAB77546305
-7AEC6DFDB569A2ABBF5F61EBFB535CFCC451DEDD1001DC891A73BBC3726592543D15A2C90D8744
-01B996B839AF5AFE5AD85A2781A769D69B079486D4B5BDC1019CDB69046E4192EF67EF3004715D
-7E2D48FD1000DA93C2D7A963FB80EF45A0D53E7055D5A8EB872BD9191C8AA544B8BF2FAAD68531
-3909249571656A63EF113AB89AAF3D12F1A2793197962910D41C5C69100348C5B486EA8C35429D
-11225142A70A578B5D4AFEA33D6C6A6C20CEE87CBA9CBC30835067EBD602C4B7EA3C7A41CF8061
-B337EE9C4E279E200C924B1DA0D81C70BE1830487DE961BB8943008D6FBA2F5F5C0A0E319D0EE2
-3C458A69D687FAA5FDDA985B3593CEB75D0998736EF26BE2DC2F7ECF417A5D140A51953D9F06B6
-F7EEFE5EF1B13DC525EAF8A203D4371144548DB8D849005BD175354B9E0834213EBF25581765DF
-7B4D2214568C79A2E0E2DB79B6D9A330B5D58D9323CC21654ECECBDF7BA36ABC9F3025AA414A12
-F4A08034AF437BD4A184811B8C861D21D68C89E1D18E51AC98A308F91D7CDE402449FFFB4D92AA
-7CC3EE25DCD81D03712C0CB1666DAA5669C7552C19679A2F1367A222634A3B3EFF7CB21FBBC0F6
-BC37C62BAC7FC3DA19533344EDB5CE57C8CDD8A6637A75CBBF8100B8049C1F1BDCB695FE052A13
-478D5B16E025975EDA0599E6BE78F345CCF99A3494F610FE4614CF6D7F495167F8624E5A837157
-41C98DCCE432A70222F4BDB2C946E804BF5901E43222D84FDBACB5059DD9BC9A874C498230D3F2
-5699F647C873D6017488990C25F4A84EC4C38ADD46ABAB93A0272201CE3FA3B1CF239FCA8FF519
-8DE7474518CE05F3F0D9E72DA446589CD7C084B3567D23BCE3049FE59F05F542A29728B08A9BD6
-E853F3637A4CC9865196A24C9C6C38B97E2D2005C2CD395E94260AA7530A6C136BBCFEC333D0FE
-74014E6FF97BB72CD076ADA21B960462B0EC7097A7812EE3044B15293A02E3E0C71F76E10ACDA1
-73F29CECD6D9AAB7CFCA3405772463CBE2BA6D23A270755C3C740A5BC4AD27C35B95932BCD8B81
-5F2E8786A8FFA7746DA891C83A962A3D88A7B62C720A0C7360397A4AC79D32EF020C843A1AD856
-14FCEA427D7D452ED6D25227BFD6A7C49340E178906A09D616337FE7A3B44854B7B449A4856F6F
-AD157366517850666FEF127EE87E97234BE5E8059E1975261DAE35308F31C3E14DBAC56FD7C055
-BDEA02837FA4183F158F87150821DA50FE1A57A76484FAB98F808C98BDDD40661FAD8BA00E64C9
-2517E259179EC40DF9EB005F517EE72BE7A3F3F2274C6FFE3712A4BDAA872E19D93D8C01056474
-41D72B163B460947977F93206CDA0282D63F3B5DB0D8911B5F921D5054081B460CF6B213D2547B
-24BC46CCDBFA3E7AFDE74501B68A31BE5ECD011F4CE6CFFD3D762B2D90005BA732F15581AB6EF2
-E99264A0E055EDF3A2D8C9CFCFC0989ABE3B2E9B8FF08A2BA1EAE1FA92D49BDE5C447C5C156CF0
-E5D5EF4A45A1CFA72554B0AD77520C7256FDC2A7056492D52D6CB45FEDD5D627A28956397B0869
-AFBFA53B5D3D113E7ECEA051A0E3FAB7CD8E62BDC94F8B482EDEFE3FCF9D391E59777DE81E5609
-D92EB704435B291E31CAA685E21AF491ADCB2E2CB67E42803B9B84A6479C149206CB57503F6669
-323DBC71800844D05C335D966398B4BAB12079965768236D29994B9B4E3B5794D6A8976D2C87A9
-1AD31BE5D9603A7C3A061C3EC9827E6E48D105F093CF11E188F236815D7D04B879AFCF4536C9D7
-9972181F3B7741E48C7081CFEF5A7CF0E1927E80DD08E3EA3613F5C8671753A00718BE42EA6746
-D9532D5A9C6C705FBA16822E7A847E8B1C178024754B812F6B08CB7B679B5CE29D044E9A2F41E7
-CE6DE6B088B3C1D3CA882EE6692CB18DD9B5070CAC224C95BD3BE0F0FB07218947A9B398C40D55
-D0E09AFC788D43392F122DF3CD74612A2226FBD74A50C53456D344E3725E21DB2E2E196FE1532E
-0EA5CD3772C9A0B3A3AE8C3C64DFEAE4C21D12F570A92A84C75A878084EBFAD870C1A5DA372DEA
-433EAFD79F350EBB0EE20822E5A52C92730FD2A0D08F9A004DD087853A48D49507AA5B1A127D19
-921DBCE86CDD407B5B4358E098AEF334A9FF7E4AB3DE94D3414E47D758A4F37998BA6323A27385
-0DB0D41F9580341570A4CA7149EC6E4F5D952E5DF8024F86D2FB962D7A717AEDB7C95968D3DD41
-DE45F380836F03B9228401B5A0EA8BA64D7AB60C5B45B8A25050B985F63F66BADE6AF149C0BE52
-59D368ED1716D125BF6B5587D443C6D5ED7257C28CAA747120565FDDC0078D4D805BA937244772
-37927A822AB6E08DAD4A672F28C0A1159F061F46E41606A1E00AD0C9BFDC0DB57114083E319A71
-E150F6F2B5AC289425F6A7A440A83202D4AA8B4DE7492A95FD347B281D7EDF6342756511758D6C
-FBAAE5E073F5D15A378F36DD1898ECAE4580C3BF89D6416CB521506F86A2FAFA04A91A93B191B0
-ABD5D7725EEDB2B5983C17333B78D7DC84EBFB7E4A849D3DEB1676A44DF21535931FC16D9D818A
-0C5A8FE5E44279E12BC1CA2E8B2EBF90576CEBA9656E2EBED725643AB26341D9DA080EE57098A3
-26B69EE4CEC5EE684C61D03876FBEEBE651D980738CC23CCCC7376328314F5A6D1083552631627
-1C01A50150FE8547B4BCA181E1D887EEC465E2AF3CA26D4FFA699B0ECB9EAB0DA71A590AA1CECA
-FB8DB0CCDA18AA76335DB7874BDC49224D1DA363011B0F7187D2E0D8FD19189A5C82C4FFAC4CB6
-0FA7B0521BA5194D1222D0779C74EDCE672848C275C8F8E9AF39E0DA3D8BE9B1BD4118D9B11DA9
-D233D9CBE8C5AE5D2A60FFF7D28565A660D27F515D6FA0897CEAD04C6D6E253E0ED5E56DC1F005
-FCE2AD618F79CDA6826875D91262CC6D6A64BFD70E7FDC965CBA9C6BD6F251748A5A42BEE4AB29
-0E0262A4DB580249A00C69D1CBDD49E3AC700CB973BC9358ABEF8A116CB5D8D4668C302EBDF06C
-9504684D7D18E522F7C42EC6A77171552B873E753C1A1888666D23E6F9225D092C6DBF6A0D27C7
-6933632C5F1C5E01C8E139A9EB9BC084828F85095BD9E6EFA0224F86977DCFE653F00AA693623D
-CE04693A7EE2384A285A6BD7AC8767166FDE75194E326CAF447FEBD242CBFC71B637486F9934BD
-1AA8BFE3CB85F3DD258E079EE910AFA64770D5E30CA9B289A4D7FB7CFC48A7040774D36E8CD061
-AB06FCD9234D5032EF68AFC943850E53C1C3980017563C67E89393B8EE4D93585A4EF1533D5F0C
-A40FAB6EBE8721F58D05AA69D6067C2D6CB03FDF0B83DBDB696D4D4AAF3130A98729DA58CCF546
-AB2202D0B4ADE6B4845A1202D3F2456E34A1100FD6D445203153A1D11F3A2511CDA83C936AEF3A
-B05B5FB32B76029153B7FBE02057AF6993F47149E90080A3AF7CB29762148D6F94520A343E525D
-9646C0C79F1C79E75470D232E2B2CCC04AA8990909E0D26DC540582B699A71BB516DC2860CAF4F
-6F0BFC7B5292052DA41DB92BCD030863A117378B93DF7CD9B0252964BB4D80004EF8B3011E9550
-DAAE2D24F2D965E90342D847B3685DB05631D550C1FCD76C3B3903ECEBA1A2496F0DF28F4FA367
-C9A9FDB48E5E1410E815D7E93511EF7C94224686BBE827C833E4C121747AF79C69A27A0DCD982F
-91AF0BAF9EF3F9921B795BF42B817D93DD4D816DC698D063AFB306CC2000B37AE93105AB2E6DAE
-32F9DF44C09E7466A62B2AD48B216374610994CB120724D0000AB54F6837DC64ED4F6CE8684B14
-16D7EDB9D9A399D39274FEE6FD41D8E412B158A26C304FBD7CE0C4F96D01F5AB8A20B1FC4F00A9
-D33AAD2C656B31053198EB4704460D476FF2F505321212903FD21E2059C470643152B99B2E903A
-491E8E394BBCB2C0411D6D86210D5C3A43BFC2E01EAFDEA712F6CCCAA90ADC2A358AC62718D482
-FC31914E0157733283BCD29DF6D2AFF094C2496BAB6AA72265215A4BE34363EB879889E7727AAD
-054F90172C1D6858C8A338DF6C1EFCD64DCA8ACF46038F48392E75DD0BFBCFDE8EE0791CA2C0A2
-8AFD16AE56382ACCAFEE2BDFE97DCF38532C19BC5E36F9E5D82806D26171267BECC9FEAFF3000A
-005686633FE25967BED0096843C464BCA03314F1C5971FDEC8E24B80D0FD97B7E5763B427EBD26
-FD8BD086A2C45FEDF23218CCD381BF364EFCAABE04DA6687241805E37AE866786DF98C62745FCE
-9E0D6332F2BB90C0B2EFF14D08E8EEA6BCDF650D8996F48355D26CFBB859CDB418973A65AE2C3A
-767758AB288A038807F4F6469A823A9EAD746560130A2A5308AD0C3675CA8642B2B9FFCA8382C6
-E61D7959D9BB369AFFAD1C69BE31E00F0B23FB8DF407C5EC68F3BF298A35351844EB9653C83A01
-EDBEE75F792C502DF53257121DC8A8F2670AF1FC747229B53B7100D02E73821E176CF5B7518D53
-B420B1BDA8B70CEAE801D745C66231E62797084CB320DDB021BD5830BA1D3F49E03864E6A6CD35
-34511FBFAE8A4EC4E3EC817228C40F7F87F524790C4A3C4C90C010CD965016345018C27A1325AF
-E7F8F4A0F0342632D1C5F9E6728CF930F789A0F3C740FBE88015E052168A0D722B1621ED710BA6
-6842BE691E91F33EFB0708E3EA188DB42E8F4A54F77D61725731FA2E2D61F245745AC1DBE231B8
-460C3323CEC60BD1CE92CE7D1A2640D1594D24683D5E139164A26568544FD89F144F57905DB9B7
-EF81A36BD91999CCAE2192FC87C88F33B01C609A981D675A3AE8B13DD05E2622808826ECE05EEF
-3A36E25D90EA3723BF34BC6D86CE95EDBC4DD3D088869BDB105A5334B5108FADF1F336605A734F
-17044A5EABF468F4258F9E9A3E69551ECF0A4E8124EDB178B800D2708B95C2882A757568CCCC73
-C40671BA1B7737F55DE6ADACB84E87889738603A6D8BA0DB1D4C5B3730C169DA35017D477758E8
-9A33FCF009BE53F959C3F22973887E920427A968730DB8576A07C801969F89C93338A605B8A961
-54C62036EF908C81E65DBE441031994CACB043755E76A2E55BBAF6628B1AEBFEC81EB727662E1D
-C9DFD4149217DFE632606ADD92D2CA4E14443DC01CFE7EC166A4A2BDE3A06BCDF16500E12CDD2F
-6982F19E9951AD81302D2D0A20F070E75C0A3EDEF40AEB126DAF98250F6F3E38F4BC1B626E99DC
-647644AE6E4EAB48DA046C826AC7FECE466C63F75B872EE71F4F3A2122A383BEFE7103107A6169
-76C4FAECB19EBB850844FBEBBC161506715C357B35B83DEE1852B7268C65F87F4C2F96C3FECE37
-88A902F46571F0994A6586E7E582AACD11EF5EAA69097CAE24C610BEB303387CBBA1DE0D075FF9
-0BD4BE7E07C795A248FE321B468E02B84573D7486D59CCDF8325F94033EC633D2BF2867A42C0D1
-E0B0745EF8D9049D18B2AB3172093793F4CBB9DA888AD43FC22C933FF5C4DEE3D890AE21B280EF
-2DCBDAA03AE4EAB52F81A14412F26D2D3F0D49C8335D8EC4CAA6B3596238A28BD62261094E78DE
-BB0ED51CEBDE25878E1AF705C61D37A71FF60AA47FA39DB6DDB5EBEB281584A5E67B971502716E
-668FCD2A7589DA07917A048F796BD1C8512894F9DABCF712C8CFBD9B5C7760C6CBB3BC6031F288
-235BD791475907E5BCC6B1F300069EBCDAB1C3DC52E49D5C8D95994F880C5415124BFDD673C492
-CB6E77C8C44EFA04F7C5FD357CDAD23CA3642AB4359A52DFD2341072E368CC76125C0BD7607B11
-A7607D35F1A97F0B30BB56D4FBDFC9FF4BB4DCF7D670E7F5615AED6CE0BFF78E3180767C48ABB6
-18F85CF1328ADA21E937FDF0F4BEDF9688870775AD55A0B19B20948BBBA1B75C1DDEF0C2293B4D
-AE1F54F4A99D98F9B40C915990A6A08D5464AFA2F33B186DBD382D01F8B7F4341914311CBE2507
-DA3D40A333890E08236DBB4060CEBEBEE427A4DB8169E748CCE7917C4632FB85434C2AB79DEA36
-5394EA461720AFE26B51367BFBBB310A3CBDF0509EC75C97D6EC15489F3E2AD54D5E76FFAD6809
-C8992975D9C694EEF17EC52E78EFC3669B570D69ACCE61E5A7D6E73FB37823D64CD9A16BDB485B
-9642ACF32BEC3FFC593E03C3CB71867A0CB57DD13A93DCB093276E85D153CD83920D560DA50C21
-443C72B521DA546F12857BCFD5D372E71E0AF1C98EF482F04FE2A1B577505C602F0413A71B070F
-131E9DEF87869FC219DE59A1CC19AE38EFEFDE2B69F52708B60E48EF686EB362C690DE5C031D62
-E9ADA7469297531BD01F6E39DC78B7C6830AAD04277AA98EBA1D82FC0C00F5A6A1E108CD6835F5
-53346E921D728F1B4EC0B9930255A68F3E9031F360CCBDF01C9681D602A5B9F0BE055269D419AD
-73FFF504DBD4953CA30D4CC5B4C57E7921D6E648E57449E189CF7820BAD4274555CA45C66EF0DC
-34DE52D3836812264986B454C9612AE8F4B1A93C86B5E4B7DE304AFBF080BCAEF1C62FE35BB3BD
-335910FFD496760CFFD002A20637C45690466EDE85A4F28965CAC5C66F323D3960DE8389F1A758
-027BD0C3188F249FD61545C1EB9D78A0EBD81E5F5C2C8445EE82C0CB969D788F1FA267B18993FD
-ACE99B21A214C69670C77D920617074059D92819D79FB4BB4497F4E2BE1D8243AE0DFDDA0603EF
-E51D1F3D47135D354D9D7F756CAC72E35BD4E8DECB1ABD53CE2ABA5DC1526A10DA69DA2FBE9328
-A334381E0CB929266765898FD38B74039766985C88C2BB9C448B767264353A0BC63B0FD1645D71
-026DF2C08449A9F32F25C4F432119BD9A7014AE3B43DEBF621C9CB92346ACEEB5C2B599D553708
-2E054C3A5680A08191D7B87991C2ADB192BD11545BA9F5096CAF2DD7B7EB290E70AB4FDD3989A6
-B7CC123DDAE328E922100ED8C7FF95867E9A168F1C9752557AA023C8154E9BA970FA0219A9889A
-5CA8D001AECABC4CA840322BE9EC9F6072E6E7363C258789D3096875DD236CC02B078B22484767
-D7A0CE87394536A796A6498708C287DA9691B1472D4597DBD49F4204A05191265F836EAAC4E5E1
-B1D7687BEC630C3CA744A044993C03D4B935E1CC730FCEA68A2C0F5CCF52FC1A274AA67B3B6177
-F4B87DCED4856E14FF00FBBE8DB4E027751B367722ED0B39CC88216177F2CA955958CCE0A9FE85
-71CF8A1EBF64D2BB3F177F3F0EBA581AF9ED746E16CA9CCC2B5EECED7A0A2254E766B36AB84A25
-4987727F130AA391B5CC2FBB9854AE66876FF09A387F98EEF39D3DDA94CA2DF149EBFB59EA4D4C
-CBA5B5F464C4C094CF7D1F8970F8F5BF27E4C7EC99D5C8DB1CA55DDC6DC5C7DD72B62A7E5C7B17
-D5379A6CD2B6F666FF6CDA9BF690A8839E234EDF6E81BF3969F0DAE3CD69D48A6F5B0E57660BA4
-B57406CE46E3C36C0D348EB44C1116878449F9182F23BCB7F33F944D33D15BE83EF3989FB9909C
-3D5DF3442D7CB7FF592CE9AFCFBF8B1CE63B02309212969E39B9C1A933628FB38AB7565C3362FF
-803A159C82B0FB6D9C8F1E7BCE0DBA8C43C8A269DE2E684C9E20FC4818BEC7F307B6D34661D4AA
-FF8A34AB31A2B3A349D706A34831BC61ADB414C7B75B78D08A6C748715B7B2FC84D94B73EAA2D9
-F1DC97E78A3A4D3375821FCBF80E1D329289CD698DEFE021DC2C620D1558F0D2444AAA9A18419B
-CF2AD07529D307CFB11ACD08EDDF9371DCF540B2B9AB5D005068E50EBB6F9A0FBE98DF6ADE3D4D
-F2F0733C8B094202AE749953495FEB3E9E9A645647CB6755B59E7349A1E338C4FA8E4BFEAF951F
-407EB9F9CF1698C1B253D471FE553D8DA0C21829EC10CBFA7E4411DEC7167531B006BF1DC11E5C
-8BB96793B69BB78081D677DB08C3FA70D050219DE116C05B3FFD88853496D73CA094E3F373C39D
-F8D8F16BBF9F858CE416D17797EE7FFEEBB0428B15EADF7C2DC0DCB6532CEBDA1C07169820170E
-13C5FC90DE91C9D95DCB23831370A5B4B798F0B748C3B80645EC427965D6A24FE712F199405812
-EFEEB8DDBA2AA91AB87EAD349C87248122B510A0DF27EE46408416D8CEDB7E69EE2138DD95E526
-37D44375ABF3B9C266EDDD81C562501AFF0D4241304A04E71346ED178289E1F1CE61772E1C7EC0
-01E94564CD5C9F3ED640D8DAF6C1082CD8844653F78F8000ABBC4F34828085291893D690403573
-888EF8347F6723A5F5B7B49AF74B93F731C83BE6AAB8323D2265932ED00046B5A825E1729FBBB1
-BA18D48413A9ECDA400E75722E01C74D6BE5DF26B17DDF10C370083A20EF2D1080BA9F2C2E71DC
-9C78D0202B9D82EDCC7BA3A8940ABBA51BE105FD8516D8C092EB4BC9297768351FA0BB13722516
-110B2C72FB731641B3B15347CD68C894DCF2281D7A028BEDB6D3001D1D62A00A260989511C8FA8
-0C3F154B12B63BA7B639E6A111504D0B0865B08F0D9973500C3664B374916760F8588C1DA9A6AF
-74E9827194A893D0E419164521AC72B2EF626E544C3461F9A29791BA69814944DDF7032D2D1BD0
-D173D18D3E06BA08C209B20C71BA776B7F44240187996B3F4C42A797CF50F1512047A6359BE499
-F65E639D59877E7263BB0CE25B005E7A387173483CAAFFFA0DA53DDB86CA12DDCAF8E415FFD59D
-1E00855F837CC1087F18471F2146E0E0CC1901F9D1B968C13BA2209DE45FA7FA4863B159EFAC29
-982D64DC60F248DB16FA9F08F9959E6FB01543A77679AFB705B7E03995D309B901BBF9860F96AD
-7715E7E3F0B66395C953DD21380D8CB1B1791F353D06CC045C457AD2FEE593C32D77DFE63FE9E5
-9F25556892714F2C5E319C7FC1051AF2E69A0A557F26C46A9F9B4F176C5CC1B10AA4F00CDCF75B
-3541154818360F6063491BE10311BAECC1E27C38F7349B50ECD72B81F5BDBBE7C2F2994BCF843A
-B06FF3FC7D37D6A5E83FB2B42F884E3BB14D7CE1B181142D558762DD7CA511A79DF94ACE080D91
-A001536BE0848CBB9B54FD29B1AD29AB5C7CAE5257AD8D5462DA2A9D2187267CDC5D71AE4899EC
-FCBD408177396FC553884D50EBB82E5E490A646CE133F06FCA26733A5B8AFC13DE5F3ACBFCD267
-ABE6490790BF990FA258D7B1F5E513A92F5438C99D8158512001538C085259CE8552A617855AFF
-7EBD71DDE3C0C04B15AF98F776E001200DB7E94D50E7812A5D32315AAFEC430EC116CA41489C87
-8E19DE768A2EE390E610F92ECEFEFB5D63113078420EE807194A218DA54D186C412C9906BB725C
-D4380FBD73236A727895C0BE672D5EF49E5C2714454504E87A8D1B2AC808AD09BB47A8165105CA
-27813EC651185F63C5A9EFCC9A7516DF4125E43893622BDBBC8973C8C321824AB1EA53090DA7F1
-B3EF9AC4BD5F4F7D65339D0B32884CC14826EF4860B28E0B1CC119BAFD0EF0BB890A020728DD1E
-EF3D898E25610AAB5FCC83C9FD677387305D4BAF65A7CC9CCFDA17A42E24BA625580F0708FF9B9
-9A87CDF87452E87644CD9F59AF16A8E62A9B76BC3385692D4D3C0294EC71E3B662D53BCC95291C
-3513C55594FAC96ABCF86A421674B92A8610251D3D6E0BCF60738FAFF64D2024538FCC4FBC588B
-843665FC4FC64F6092C6EE7B682A3E5FA272E38C8FAA1CFEA55EF235F5D67D48A46A00FF58E47F
-F96263D4FEF92F333C71AA3D6E0D3D0325DAB33F60234E980A5E0B8DB77F85D628A693C81A532E
-BA7B90C071F8B7BB261947D43D70F7B54EDBD1D6F30B8509035FCF19F1AD8779C9088ECC6F9D1D
-EA48694ED5F7814DFADDC430EB361CB26B9AEB430C31B2D8ECB1D995DCA939E2613CB48C0BF401
-F2369329C215B3814BD135E573471527958A3DD8971694A02B812A33F4F5588F06CB0FE949CB3F
-648475AF8C778DDBEE0A7E522FC9309A6496489856BE72B91D6408CA7F0F388767C8A6B0710069
-23097353EF934B0C6A9646054B06B4FFBA632813676CB24CEEC3E28D3D63C8D13A041DFDCE0158
-72A4E2DE2B4735363CE09E06E4E7F8F6A9ECE06F8BF82937A8D893043B7438832F17F9D5E7B082
-92D68D0E0617B22E126E740E1B67F3595CEAFBA8DF47059EB6AE1FB15F2DA5A8981CC9B8805929
-F1564555CD055614CD94A5DB5487B39636DAC4FFBBDD59665AFDBC5253B475316EEA6888309F27
-AD14C2316F997372D5688DFD804F6B6034B57885B76705D2E3484CAA5078FE95592118C453FA65
-A99BFF295671C1E9BD2E6AABF1F48A71503613D3A98FB047FB5278A456A6FDFE328CED49A2121F
-0D1285701F7400A96D6F11FB99C6A456CF1D792CED72652CACF93B60B273006C83DB3741441BB9
-35A5481CECB254F410103A6DD01882097C8D19EFE4990951CCA88394A0FDEE1D763F6381391C85
-F78B9A2986AE3A4622E9FEB55B38ECF4F0E0F83DAFF187A734C752F579906668A745D4E7DAC7B2
-C7731A61252E51B8FD85E077174BD9E623F7AFB78DC102CC6368E8E115423F4CD2CC4212F4199D
-C5D6AE755191D6E6BC040EFF9DD381C15FC4659992FF8990A4847A4A11B50A241031194229B54F
-00B1DDB9D1AC575529629A161A0F1C98B248C605ED6F85A9EAD6EFB098EEF9810C320AAD530901
-5125E1D5887C25E222450A0C606116F1DC2ED89D3F2D3A6C666171371E59F1DD1D5891DC3AC02E
-572B135BADCC453EF126F15C986499CF1F3DC7B9F7C9AA47399022CF9DFA28899C679F76BE2B00
-1FB281208719E23C5301941786E1873CF7CB4DA0F5F92753624C7D8157683F6E957805EF570618
-6E9EB09162F9AAA04D7907990296F899F1621A4976734F9DCAE11CCD969F9ADA669D86ACF1FD71
-98D23A1BE3915D8ADE29D8CF640D5349FD3799EF45E6BF86FC60A384AC7D6F508CD17A4B274B37
-4B37645B25E34304C2D82B2A31170FBEB0A68966793674C1B3A4B6A117BB2F1E9F7CBD52E590ED
-D32BBE4CC0F75D0861D37651754D3BB1F3FACEBBDA42355D301510C9D1C35B8DB1ACEB5DF35D6F
-76CCFAC79F3BF0C5C7F797C894FED365267B0A33514B8F7600424CC7D6E7FBBE0B0D3C8B6CC8ED
-3CE2B4520E2FBE35A154107E6B84CDF46828D6720F62235AE2457D0DCDCF91010BF15D3CAF95B4
-A236019BE0AE1A2E8F78F5DEA56FBF1016234F75423D307BE491D29F6C27EFDC11BCE180B20F39
-EF0C4A9C72F8ACB61DB425A5376330DCFDAC700910AF3BD767BC87C4B9691C3DAEC8DAC7C226AC
-36AF7E444BD30E11EAFBC8BB77181EEA3264FAB7F63142BECDF37B8A5F63807249E618458D29AD
-0E1FEEE567EAE1B4B513A447E822A688C5D87D64C8ACD804AD1C81815E287F50BF5630CC631A93
-F95C59CBA596DBAE1EE8502E3073D76525FB2D4F94C5203569B02F94593778E8775A87CBAD08C8
-256C51A19CF381C24180D4980EE17E94B01AC761F910D6AAF09C5027B79293FC87A1DC3CB7080F
-6EC0AB763CDF14F6D7B1899D529C42A262B579A3BB96B693BD793F0BF7AFC8D1B60289BF239224
-35CC3DE78EAB44542EDEA0F24828922A702E7A11FCF529925FEAFF53751502F9434B72978AB7A1
-2B64E7BD6DA9917C9196EAACB3999225501410C818472B097C708523C310A3FAC7521BF6AB6A4E
-9E1DB38DF4D93F9C12BAF67BC8B70AFD8D08FD6F898B96629A913DA0DE669678FA1EE7086A1C3C
-0D45AD5C63433C574BDD8BA625897262A06F5AA47FDA71805868B9BBD7914D7BE697BC90C74785
-30DBE5F5576058767B5C302CCF7DC6460D44FB635B5AB595F216C13E7A4D54029C1E9281444B5E
-3B1FB3D8C7D72BA0201C51F4ABEB9CA263D4AED86B5B0CEFD0EB142FADEE40A950CF441F547B7C
-71427C30CA22C161DE130AF5210E5BD0D58AFD748D574B46A2B4EB4D6CCD31F4DAF0CCF94C7DCD
-80B0268DCE4E69D97E6F3CCB731536528B5CFE9AC0133871CEAB7FD6B1EDA4FC19F8B3E7D9A92E
-9DB50F198B792A13986A2368DE33CCE717ADE5B0FC6F76BE8B4EDE6AB157E014C6C48CFAC5D507
-53067E9330A2FE7737A0A8F259E5FFA7A030D85FEB857D785866CA8C6A5043ECE4C1CF30E76C0A
-071FEF8FB30CC9BF26CF5DD8ADB87A0C03494876AA1A2E9AEFAA45A98CD71E78608F7523B6D686
-EBD8048BC96F91397A4CAB1D5A496B43042C5DE6C1C439B8D09F6381E88F825A08E818297AA27C
-1D37FFD541F6A9E5D4B7E8DD8D13F8268C83135C9631A603C69DD22E6D3B76063E5B0BF7158C9A
-BC9FCCB946AC24995228C48BD031D0A959944181482739EFF6CF2330A6A6C6FB906EB123E44488
-F42AC2BE237CB30C441B5051C028B94D9E6B7E57F5A3FF5504756D7EC411CF61073763A5E72FC9
-DDA6E3345F58646B69EA140E1C711D794E083623B84A4FE110256FB8543D32A2D5535B7DA0A73B
-D171049412FED79B84BEB56962E1FFE1A12F9BE4FBC72CFDB9EF92BD60B200AE8D66AEA30B158F
-E9FE278D8833111AC805ECC90D65909787737E1E1FFC88DE07B8D79996C9F5685F57102C65DA61
-97513F85B173200E3222876AAB83941CB066E3C642AD23958B00B17516A2CC8D8BCB0C802CF34F
-A97851C037E656C30C446C740422991832129889EABB35F5661A430E5A503F99F5381C5F26692B
-D8DB7E9F6D312A297B697E93831A06F386AE2BFA2BFD9361F2E366E18EBCEE56B82C16B2DA0017
-95CCD97D67ACCABD22DDF00898B3C39C7442F1488552BA46D4634CB330D428A19351E401F91819
-708A82D856DE3C29180FDC56C6CC7038302E55FAA5B777E8CC6CF4BE2ADBE59BD270658F168C11
-096178AC07B7B830C0E782D41F97EF221B7B91BBCBD1EFE3A7AC3BDC0CD61C74638DF410AA53EB
-AC35A079D6D3914F380F4A376B50892AF20CF28F4FA355C6364C614A9DB092DB38D768211FA16C
-A991684DFC8F257AB0AB3F18F3D7C89934FCCEC089E6709BAD37B935E875E34AE5AF4561138D54
-9A725F4AA92A66364DAD50D00B1E251FDEEA8C145DF1ECF74D59981948C6A393D7DE3EDD731D2F
-EFDE29D89E9A4D94C69835050FC3D8513ED2C39E9FBFFBB741437DFB73277E227523A45E6362D9
-1DD5739D82821CE0DD3963D0A4F01563A82A94BCA4282563F1371322943A286FB67742953B9152
-7B377F49334141DE26AD5D170CAE36767A380A794C755A708E339635DDD2F6E7FEB4DC851502E6
-F4500CC83DE2F216304D0095190E3D405643D609921A6A895DE6F2EDD003CC4D30A5F131803822
-5EE6E072374BF755D5C0D3B59888F5B06D0167BBE0A6C5D8E5504000E4CB71C0F18E01CD5EE76F
-102DC77084D2EFCE8D85A8C2C38867F10C945C8F13B12F1470B0260612C69D494AC06D92DD3EEE
-A0CFE25CFDF09AE8C96ED32836E28E5583D60A8469AC220A4EF63123D4905890EE48B617C6F16A
-7976BC855AE0BA10E37261AB4752C6C9BC43FDC20F2355E07BDFCA70F7F15744A973425A4B7DD2
-26A11FC9D40FC34A38EF3A05FECECB29D1AB4BE73CB14CB3F6D43542D3A4821D626A3D5EA1691D
-C39F4E066C1B6C332E7611F13E27BBB6D7147ACDB573E9BCEBCF7E35FD3149BB0362E701FAC28D
-7F4D114A358D286E750F364CC2FCE36D3E6E9DDF6739FA1D1710439B28F159AD6C53AF63CF1D9B
-43D23CF6B8BA2A6F0EBCE50C5B730CC550ECAC630A328BB269E26DBEDA5FCC6C1AC14FE5485FF1
-8945D6C33657E86812E1483AFDDCCE4DA1F2CCD18703CAE39AFD732A4C26D65E29699848C2E396
-64BC127F88BB774A3088AC0A1414B0E44B194EEBA2055140374AA338D6B9D49B4BBB64FC859031
-9589D4166EF38F1B5DD8E4EEC2B39251FA156B8D00C07353C2B038322D130FC9EFFA6BEFD47BFD
-D6CC1924AE5046C077AAC80B29CFFEEB825187DB1B72BFB4689673F10EB0DA0AB3B63A5E2E8C7B
-39854700F3534AF6854E0C381A051301D24D4182A9FF745437639A4C61AC7C0505D62263A29E5F
-E0C7DD0702459061330FC9F72DF43336BC1F6AA1B5630E74C6F723098DD22B7A1DF9D710C10D3A
-96F90A36693D97F11F285CE3A4C7C799B3C3F28FC99504D54479A6C3D027B48D3B31EF23FA1A11
-24840092A41E72E08C3146E22B110346B2DA7BDB75505658E66F493BCC1250A8A7EB41836A2655
-DA0E9FED1AB3AB8065695873CCB358322BFFE548A17D79FEB4CF4D4E8A12E6ED79CD0065E1804B
-201A45A6F757809D5CE810C02A3EACABC8C28E1C766501B886152AC027E75EFEEA7E1827FF276A
-39ED79181CE3B2D94145710CB53538E8BF3B0DE5CD3EA0EC4F7D2BB917BEB5D8856C935A00A4E3
-4FFB22842279D7B2993B4213B01B71108D2B6516F1C229FE83CEB9D330B64A9CB9884339AD50F2
-14891BB3AA89A6B63193E54F641D0F8416D0D32A1D9E849B51EF1414A7214A65DEAA37C6559CF3
-A8E16299F42EC5CFA325B8B40712516E7C9DD6D9E3E1A62559FAF2A49D5002F6DD4113F5CD58D2
-A03C8DAD6B18960A806A3335B4D2A4A8BD7C09421B7B5DFBBBAA57A10E3B8034768A634565CE44
-B6C0F84FB5AC4DD6C1905F544B830DF14E56E5B8E33CC75917FCA0F4F8C878ABF607E971F8AA6C
-E6BA24E970A7AE710E56331D3F9BB7C2EEFB6C09835DB23F1EE6942E464B7ADB1C9E08CE5194E4
-948223D4C3445D4D91A9D884BC57D305C1E71331FD869E412FBBB3701AB9F114837AEC737C10BA
-624F1B234ABEBCE05B6D7DCF8C4FA44952DBC825FC41A934D71A23B4752DDAD280B5EC799278B0
-AEE5BB83051B5DA60F34951FA7B90189DFC0D53C0D2B7303EF0839EAEF0A096AB442E5176E91EA
-A754466D1807B1290DA0D3B3A675EA2EF9D1AD02D177195D670AB368EBA57C4B75ABCDD4D603B7
-7FF892E2210DDEDD429D6B12FD7078A0A04C02ABCF10B169660D0A7E184CAA2EFCDC98A2212692
-EE0914895248F7FBB690CE2A465AC90971CF57271ED4DE777D8B345259AB02B0DACA97E184E319
-8ABB5DC33E9BC6F92744EAB9DB5C20DFFA36B6C0CE1041ABBA09E50D8BAB6B5B3520FB34DF68EE
-B43B674879201EA95DE7DA8500DEBF253D5A81DD13AD3E7CBCB30200E003C27BEE141ED856C11A
-2210D12B1470804733AE89A0180211F81E25C422A95406C8A8743798B4AF102EFEA47BFC2CC2DC
-349599A4C00037A9EC03D2810B50A52AE9E5CEBEA3E2B4B6EAC0EA06046AF69CD718B57044DBF0
-DF5EA36A9B8DC51037C3396B2D0959DE97AFD35C17503FA02A313F5FFD50BEFB383E9BB672C535
-54154710BCBAD171A654C879F500BB7DAD189B1E307001B046D98C3737F906226342072DA7B7A2
-4FADAB5381426AFE402C42B338627709900EEBC77F90459492BE27041A126AAD9E44A12CE03C83
-09A407163A04F667F256CFB1066BF03F317179E57C2762DE417C5EFAA880B35E7B424BE96CE0A1
-1660F85B8FCBAA45E8F2262814ABC86C58864CF1E843F2733642C72D9AD13718A9A81C1CB4DEEF
-130614E91B8852FC6793BA0F55C42867951A1E39F5DDB1DFD30270438FF363974633862C75335D
-BB602C94FA037434DC319E6A0019350200782CCBDC96910DD18FBA2711A2534B08087E83A96C91
-3CB856FD45AA3658B76CE7041A57D46B019C76B3ECA0D757AFD0534B7C6CEF2939918CEB5DC524
-9B5601CA37D0FBE8D90EA9302DF998E37BAEECE630F4019FA8E602D460D6EB8682D115EB3F2C5C
-8AB39639E1FBBB1109A31DB5A19F116068518C3C98FB4E91144B893A403E6601D4D81DB1C1F00A
-80E837116CE3EDD313100D0B8BFD3193E20CA90AC3CB107733B6499A690F2C8D336FB29E144470
-2A5217E1E91852F5EE0B2F30B61CF661109D0ED6687D7DE2FCE90622DCDB176CBF18C9852FF3C2
-B02F9FD7AAAA692E9162349E766EC29CB98034D3A8731F4912193F1F480B657BA84E282540D2BD
-7AFE547D10936B1739CBFED239A9C3FB8DF52E9BA1F38FF0F34E703B16F87C48EC50662078FAEF
-9FC4EF4526F90740FAD6481AD3B4B5795C9E57DFDE09DF24CE8773B1FB4CEF1C95E73DA6F72018
-CA0E16DB42DDFE16C6697FE4D7E0AB517AB0A93C85EF5E7CE2C44137A6AB15159738728C6FC2A5
-BE3E799D5C832DAC601477C9FE8C24FB368AD1C6092C0DB6F516CC8556A481CDDFF1D26640647D
-01516E38275E27B2013434E4DF83335EB166395405F9DCFBF6C2CE886DD59B1AE605690493CFB3
-708BD1295A114D79A26F74CC11F49EE90EE9A364B514967C0B379E676BE00FF0073CDF0CCB5756
-E66B04AA0FEE5EE376C0258E2841D90176CC6694F5CB6369BFE4453236B4F5ADDF98B86C6C8F0B
-74832F6BB6684050D22CB28CCF9087B59ADB30838930E2BDB1FDB955C560D4D617EAE79064F742
-7F1DF3E2A20E413C7BA3E9AD26CA814295FB331D1080B45F006513F359AB822C8C9AFDE0B2CE30
-8936A66FC5C3033567C489565A58767D251D29DFEE44EEDDC59DEA50457A258FE68F7EA61208C3
-238C7EFD69F09A5C8FCD557380A6B4BD82D659B26CB4DCF180CF0057D120D6A6E0DC291C40DAE2
-833F4E84A18F10F2F32924BD93C5C70C207E5620B60E172E238EAF0198D7A1249FFB788D6C1AAA
-4E7D0B433D58C79AEB3E5CAC751B78B55E2C2F2382F2F04A71C044B98330E16D9B74481FC55496
-AF2FFF408157D99115A38BF0767039211D6841345BE3F6D624EDAEA4602BCBC3A87C8013595D9D
-09E7207197FE87FD585244060418EB2CB09EF369B785EA8B401798695B473AB58965057887EFF0
-A6585B3629E87D700C8E0835F1E35C280D61FB49871EDEC7C4E5C770C3D8DE717FDFAB7EACF7AA
-E78A1A4F0772EE38346482F021A95688E1D3121DD80A88A349258ACCD8D094F403A674E1710F61
-46DE9507C73D51C77354C475B37F3E266ADEF2D739A17EA5E8BA5F65C314D57579BAD77D37E765
-DF196FE16397CC58CD8B21C21BF2E92A0D0A4893D679AC9012757602EE65A70B93CEA9D02F8DA2
-29C783474CCAB3F8D3A06B2DEECCAD27F621D6852932D43FAB8D81167A47D16D86837B68B910FE
-3D97E07239B767FEFE692990A4F3600F7BFC55B7B137073467FB722D45EF59362B11B7AA72C101
-401FF5216F48329E7217AC572CC736B77BAD3B863FD622F46CF547EBAC0ED63BC0AF3DC86B816E
-D1B862A0A172539AFC23ED6201627BD18A317F6A2C5797591EED54D9AC7E5336402DA66965E311
-768EE74D1DBA42FBE2C59848F405DB9CEA39C7AF0D13B6F0CB99160A2CBED0ECE55B21982FDB7D
-59FA99649EF7F00ABFB9AF764DEADD60DC3BEA997C182A9E5857B1A9E3D1305A57F608807A12D9
-045236C18F174A63BB2F66F006915F701A7F6BED3120A63438B5B2EF4F7DF4A5F422FC1E61D395
-88F0A865B710D1E9165CF6D152210C7165B392E35B72D1239A18D59DE31A08676686D4C739D500
-D15D2DBF84C0C18880F41BFD757C3E2D15CF68A2444B863F6FFA3C9765637463FD9212ABFE1B5F
-03A882E46D4236052D3A270D25A26457A4C9F348B6C8F0819F3BB5BA54B09071326369AC2E7CA0
-66D472F6F7DF7D4D1EA9FDDD0717973A72257DED260FCD992C0830581EBFD02CD4941EA7EEC4B8
-5C8ECCDCCA777FEB024288604350D53F97CE23A7C2EC292EB69D3B2B75DA47C65C2C0CFE3BE097
-F9287AF9C926292CE9385A45DCDD0314B2DBDE5AAD2E6A61964D96DCAE2217BC4B5A056AE24FAD
-4A0708F63594BFF486CD18B55C44A8FDA7054B0C9A20F3C3799B8F7647DDD9B1E5A5E6579B95C9
-EA4F3E0DE8556789FB080C7019134841F44B7C9E526EF858F8ED5C0112CFD2E3C1C1F382B766D7
-310529696AA7A533D5B0B5D3532C11B3562C6DA713DEB04A5BF022058772C94CB22BB4FAA3295F
-CCA609D18EA85146A89C046FC60B0DA65A416E2A71AB5CF8D536138F2A85DD04AEDA42AEF41754
-232C92F1F79B303DB4F2ECDD3018D9C683A4BD7D60A158CEAE71D5C231165962BC3E88C2C3C0F2
-9CA2EF9070F8C0E99BC9F3652FD5599BE3911750BCBA6E5C5934EDEB6C85074B11A895A874EBB0
-E59043499D026A6C062B4F86FFD4EAD2C9A31D4E63D09EA1F00C55653A5A68717D0BCDA0961ED7
-608398841C26E307749A5C2766B0D5671AD7407C0696577DC0347FFE8CCE0772750D4D6E13A690
-E4A5EB935FCCBFCBCA751BFED56FE38A181016F87A05B90873FD8C9D843748647894AF1FC2E48F
-E408F7BA4CFC9C1A8898AC99ED230E985173B829DC2FD21F35C50103C053DDCC9F98357191CE1E
-19D6566727996460781069EFF33CA451A1088E81956DEF8E8CF997E292FBC63F99A84AB2C23A52
-09922836B072AFF17EC0343CAD1B847851CC31510C8CA59913CC8DE2B0CDAF99846F7F341E23E1
-C7727550EF11476472B3D082ECC47EA7E2B56A747E6A7777E2E1AD4F4F2209B5329F4111D8F7E5
-383D76382F8B5FA0D65F7DB47A1A080567023EE270833CBD88B00EB79DF491674B5742D27E6875
-D68C127262657624764AAE5B6A8775965A179879D4ECE7EE9D77BA6DC8D917216FADD9A26CAE9F
-9F5B135F6B6AA3DCBC7715B33EAF70717561E6C201513AB2303374
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-cleartomark
-%%EndProcSet
-%%BeginProcSet: stonessb.pfa
-11 dict begin
-/FontInfo 10 dict dup begin
-/version (001.002) readonly def
-/Notice (Copyright (c) 1987, 1990, 1992 Adobe Systems Incorporated.  All Rights Reserved.ITC Stone is a registered trademark of International Typeface Corporation.) readonly def
-/FullName (ITC Stone Sans Semibold) readonly def
-/FamilyName (ITC Stone Sans) readonly def
-/Weight (Semibold) readonly def
-/isFixedPitch false def
-/ItalicAngle 0 def
-/UnderlinePosition -100 def
-/UnderlineThickness 50 def
-end readonly def
-/FontName /StoneSans-Semibold def
-/Encoding StandardEncoding def
-/PaintType 0 def
-/FontType 1 def
-/FontMatrix [0.001 0 0 0.001 0 0] readonly def
-/UniqueID 38792 def
-/FontBBox{-179 -250 1405 950}readonly def
-currentdict end
-currentfile eexec
-05D2542F9F75EC0822B36BE6F0DEDFC8DEA486830878B9EFC0865425093E0C2E69D6F33CC9AE23
-DF5EDBC1E5D079FB4764B9F54C1CB100A936A445065CB97D7CE6C0C4370B3ADE577ACD273EAED6
-15C410480C863CB75FFCE0E72EDB5035D97674731BBB8E694C0302E84C5CA55F405C83E06FA42A
-DEAA89CE21DDD2BC9F048F7501C2124566D55A81E16EBD047DA68CCABDA9D52A3880295FD057C8
-C7900A8A31BA7C4990680FF1F74D5699C19DC8359898F7A25196FDBE5DA6A0E5C6DB74B7BBE88C
-542FC0E458D64D52230079CEB32C6644A8809436BD133207FCB1E7165359DEC653C7EE65AE80A1
-92C83B6CF310F74AF760499DD67A4DCE97CCD1DD538308BFA46A992B18C02B8A332869E677523F
-E7C2597865F352B2BEA414020204762126749DC095CC55AA76E9C67A97692D14826DBBBDF5538D
-99E15D4C082726916270333E380EC6C71B2B79A5D15D9B928F63A48C4314E5CC3CE2BD2352533F
-5BBA3DECE7526814138B51B898666E823291D0142ED689AA36B326FB41E67DC29C46A7CBCF563C
-63B52680C9BAEE2BB55409547DCA64033DAF803CCD32E3768FBA08543D80A937F61B8C95927BC2
-A08F4A257D03AEF025F3877B798E55DFEA17A2C3A484BC6C6ABD60A2723446E2C67FE0BA1831E2
-D7D42EF86439263917CA19CD8F5A0A65AA7003345D13743E757A7B1D9BBCEAB6FE0022B4ABC17C
-108C913B1066A7B5218861EE2942E39E1DABCE1D16CB666B14C7421B9A58F1DAA519E6E96570D2
-AC187446F67438F56E1A80DF7A72A6A76CFC27FA07D10B624E8E1C53F71720B3351A9649A6F261
-FCCDE6BC61C0587E7CC6217F98D04986EE9AD86B0BEB09C24BA7A3F4CC66482EC7FD60F4D93D4E
-82272616392166AE09582F1A6146AF9932DF4AD2C45FB468B5D2B9E119E93B4E18EE963DAF1AF6
-FD876B362B31E36BB0A876A49D82AE89E0CAC13DE3DBF29FB96C8788CBC011CCCF04734C1CBA5A
-6C18343EA1B0DCE808382C9FFB44F1A7752C5F9AC6E7DAA59C08130034A8CEDCBA8D48881E79A1
-7BF5749F136078DA9FEC9CCFB09C85C63FD964D722ADB32B1040DB91B1508E460CD08FCB7A9E42
-B74AB09EB3F836CF46648BDD92E8DD2D48F8EE8F80FB1EED24E901DC294DD024D25A72642225D3
-028FF69FBA04392FD415B775F0B132D75D56CDE9C0CEE44C29F8F1692EE002A973C5114B03AAC6
-D1AC009184D50790D83CF803F2B36D94A8D7F3E1C56A0C924447F56925F09395CBB1DE38C5F13C
-1C7D563C43EFF5E8538C2BE12C8E214B774000FE4E2751DC6F3E2CC8DF5E4633E090E4C34C0CC6
-F06BD829B1105B50429205B2C4BA32480035CF513F4039B69EB475F16EA439E277D5CB93D7BA17
-41696ADBA069DF046232169134980DF13D2C75FAF57582B548FE67F7215D7673077168B733DCA1
-51B0A7591C1C2D7B1E93E485F54799AE111F272C49ACFDF6993996A7C5699B250CD2A9D82B7A4F
-60F990865A5A21C394ACC4D61BE0D9DDBF8DC253D156265FAA5E5163DF739F013C1BE519F5A616
-6FCDC3938E14D17D7B4CE878481D5DC2DE545CC29C88CF043EE98C4BFA6E747DC626152B6807A5
-640EA39CE6802541E5B4E80F6AAB41B13F6E8C0906556279570D7B3C5509237EFF4A98680295ED
-7BD3789DD532E12C47E9D26AB9831688E6A9D98715419BBA7AE390D6EEE7E913E98FCBA6B268B6
-C958424D98BAB18372C925ADC53415508AE4AFBF212D66A20066928CD81E5FFE5ABA34802522B8
-C49CD00CD0F7156859F14A254566578BE1E0986A86738BDD7E81EB8249A3C2B4FC522886C22209
-00BDB96EDA972558EF18E9408E6FA8B59B5E557CDBC6B9008E018089976A83157637EBCFB60E46
-0BE12F9E92FA8AE384E2E27B58A4DD46B6AEF078F17410B64296BC43BFF1AA720AC0D575B0A4A4
-685F533A846D1C8E6E3F0A8929DA9A4DD039AEC0908EEE629B28F8516836DDA89AA7E033974759
-7BAC32B7F65A47E875D6575930E4561B1077A8B6D4EBA710A60EBF8BD7F90D5966DDF217676838
-C714B7D0A1013CE649629797335E4F1E736A452FF105F1E31DB1F105F51C5DACFE14DAE5C385B9
-A493AF229268DE313F00275F6EF4E995D8E104133ECD3BCB1378B69FE0DDB100CD4481F3F7FFEB
-6B696096BFDDEEF1268BD9ADF681B57381896F851EB12534FB05EDC89ACE59E7CDBEBCDD622953
-4E12BA0C675260841609CB656B05D37CC7FCCBCC92BEBC4C2C3112AE2CED5590518438B2775DD2
-78DF847B5F3677934099A8D34B98E9F793E6C86C76B1CB0E42EC4EA2E9ACB22EEBC084026DB163
-40F8CD9CE194D2F6EA2403255DA218EC31EF12888D3C4ACE4C84910C6DD17C8321533B65496C0A
-67EF9AB8BB49D8A9DE10694D21FA679AEDFD56DF18C915FD82B3EAC5F279D4CCBF02183DF4EEF6
-11F5266108A01D054321E6F5922F2E1F78D48DA966549F37EA876C71BA109FE81719822315C2D4
-EDDC0B3B0C2564BF6D2E2BC3AA020B462F0A42C562C1FD135DB84A51ED677D2EC962C8A86DF9F1
-2B4487AF45584603D517D6BD04B66659ECDF446CAB71D768A9B4B3F58293A6DDCA895309CC045F
-951AE11077FD1AAF79DC80C0CACD362EAF1744455DB964EAD2D65F03B4F7A01AB2FB41AF084012
-C199738AEF935CF46E659DF852A78D343063014A75399F5FEC92B75DE7E04C6E42DD6D6CF84D35
-820297B7D0A4E072D9F5944E7EDABFD4E309016B6BB3450E2942DD131E7420AA2CA3E766BE9CB9
-44C28330F2DFE1518C2FBEF785AF8D9080EEF0F9E1553C2E855AA68EA71D8F5A16815D1F210430
-25E893E408B006DE432D9A1F5F3E45531785B3F8CE6B175E2F39B99945382E63C3F31C748BFC26
-B7D14060043017B3ED93E27E1728E264303B21BE3F78DF47DAA1395361BA0B84BECF2F8568AD27
-67314C0BC80A9B733D96515CF586CF038630707D2933EAF664665C7692563B2B8707B2C21EAFE7
-33C96C5CBF7970C1310EAE671F9893091706FA128B2DAADA95F26D0EB2999BC294A22A61883E19
-4222815929D7DF0683B5C8056C4D1FA0E3716C155D1ACD225D6B68976EE1A42171592A90EBC10D
-93FD735DE0FAAB691A4098239213F97BF81A8CDDB5880CBA714F22230D208AD96B9B73305B90D6
-C94697D3AE9FEE5A52503D844CDE1FC15112897C62A9C9EFBC3D775C40BAF7844AF7034669B332
-70533EA71BF0A9C27BC03A02D7040926DA1F10906D26E6431606907E8522BF6581A311A1EF1075
-B697053B59020B7FF83D0FCB0BFDF143FA8E645C5340B9226D1FB3D03E892BB24D7F5438D7B87E
-FE337343C1876CC99495707F87D96E1234B58C71A450F62CA5CE3B895B52328AC1739D3967DB01
-26EE475B5A609982C31B8FF352E959E417E907D5B9C076A27018849AC10E6113C1A0F816582683
-727477CBBCDE1222F9EBBB5648D29517E72496D1F0A44CCDB34106A53521EE8F61358A267105EF
-49577892389BFB701520AA73E6B8070DE634B853F3A61818A4B8B33264416C1C3C83FC0C8BE091
-F30252A8691D193456620B3BF471D4CCE9397558C7EAC8104C8C6A13CD716D916211A12C443F2F
-04EF0C31FAAF043729B6159B57826CDBDD6205932B251089385E4E30C4D51744A45D96FC284097
-2007ED353D62D3CDB6FC755C11BE98E8FFBB40560C93CBCECBA7C09692F817DCE1BA4526A81179
-2F2C19A169C91C025938E2B26A803682CD9921844BF9AAB1A14514BD26F046E8769D79B3604ABE
-0B786F60D424B2C6323520A982E906CC3E92D3B52AF04530708DD782134F4052EBF95339F50CF4
-5496B70B52B59CB6F54DF382CD9F4BB11F629861133B4F585B816EF197B60C5A2D9FCF7E20BFEA
-366B42D5F9B2BB0F67B045A5B57C185F621EEC91932855E0C91770A5E4FBDE4ABB9CD137C88B4E
-E499D432FA6DB2B87C71A03AD23BEFBBC5A8FB3E2130F451B0A0DD40E84783C26E573B43B15615
-4F7EEB8B381E1F97C54C48EB5AD4A1545391EC3F6650A0E43F4C23750DD58157AFAC738C07D296
-EB9AFAB0C0FAC38CE8566293C584B2256E79544A5B242834BDB31A8646DEB04C95EE80EBC2F845
-BE0536A629E8A0D23D355CE4D35E5F74A2D4E08CA6D47CFB1E0F4F98EDD2EF3DC779B69BADEEF6
-AF06F1C6CD36EED1C09E800CD723689A001000F4201D365DA557D11F057E858520DE75F5C8F354
-69A9DDF5A29D3651EFFFAF4FDBED2A9C1275DB764ABA6FF74B789DD65C8D082D9A9FC800873132
-FFAC9E782291EE6696D483D41C1398E8C65306DA0D306BB9EC713AFB4C3D55A4C38D865381DFB0
-E630628FBB7CF51922E547D8975301E2A81E0D429FAD1C65993544AA5431B880BE4F314C4981A3
-FEFB2A37BC1BEFB267FEC47737819C14C04486943CC1432135BD844A34617ED7E4140431AAE948
-E989C5C72B6B090AE889B62662E8D30D7C633110F08600F8F3DEBABE1B8272571B1550FE35C252
-818F856FFD8231E801321CFA4E088D1D6A4F56F2CA81A909D0D565B33F5B2574FC52FCA1107E4E
-94E7237D994DCA0E5C13348B6ED835AD7279D78CE290B38FD42876FCE44471AE6E20E6369C638E
-6E4B49B00B68497F912FA6518016ACE6DCA8E865184CD563E1713D7EADF64E52BBD13CE5CE54F1
-9EC5974E9F59D287F76F03F756AB42FA3CDFACA79792679B7ECA516D1532A1BF1AF2B04002A029
-AC8DC0F34527E917D6A559974DFBF9A5E13E2E1ED526F7AE17BEA04640705CAEB05F06544A17F7
-B44BF54B6B80594D71AEDAAD17079CFE2B6C65744655418B1527D51D4C45E5F321D52468C168FC
-A515979287566DFF26C061FFD7039C232FE1ACD9377C58850C99BDAE145F949F4F504D74E4278B
-3CB2EE53252AF7805F3143F0999C8C0D17CCD2E922375E563EAD698D9AE6D0DABAE5A8340497C2
-1238F9FC9FC05B76A47DA0CCFF8D108D1A188F5DB575E5C08219A04CF78E06AF124FB3FC3B4E78
-2677F3C09F9D892AB294B4EA15241CE2899514EB4D1BCF51D294737089EB4AC56AC7852E498217
-7B804241177353670637376D4D1BE4F13A6107A6A6E5A73679E687F5512801B07F67568F737B3E
-00FF13F7F8DE9C73EB3A2865B07094AF6FC8710BCBF6915BE2E2416B9A866BFC513E29E92898FB
-80F81130E4AB9E5C5D559576BEE4AE5B01BD28748240E7B2D7441E57053F934628A99CAC7F4C72
-F0A343B7937E295BBAB9DAE5CEFDD103DFF935B2454E4AE0AF39776A3C0F40701DFECB27C6DDBA
-4D97972C03109A209C6F98C1E6FD3C81AF5CFCF5223866A5E58514FE8D5DEC95945865FB6F6FBC
-51FDDDDADAB1DBC68F35F756426EB29A6A415AEC11D2EC09BC523713ED44466FBA3FDDEA873A14
-85D7C042E490BEA7512D46705A9C77B52BF575BB1C849C76D0E32033A9F59C62D3646725627CB7
-948C2F72EDA3D5D27E83C2F379B12CBB6D7ED2DCF3BDA29728F99126E56A36CC9D7FCD83F2A4FA
-DBD5C188379CC6A56073F57E75221E5BA328E84EBB6ADCD9D258DE03E5ED83123DB1964511B792
-2730D692F96B2E93273AC148ECF069362F5EABBDD6C577D0DD1D724BDBD804250DB2EB3A2B5F44
-E7DFAC5457D117F3A1B132A68C61A35179B3349A1F412C0322CB415256FE517FCB0C206CD576D0
-181CF1ED3A068444F2A19D9EEB5324CE071472AEE02E225C747913392E43331C5DC96BA985E2E1
-605A3BC09FC92CDBE4A516E1BD248D34FD85023F9D738EE10B2DC23ED8A1A2FA207A1A474B94A0
-B78694D7B9C386302B2BC7029442E574B6258F9BAAD8A099C5002BE366649A771A94A533B4D336
-695DDD599DFB4FA963B04628C52D6DD937BBCED417FDFE925CA54B9CCF44EC78D2CEA9AFABBA6A
-8D0D7479EE60204CF38D1E9B425BD3BD37519D0D64E154CC6CAE7CFC7209F4AF4E66A9DFBD1934
-E82D1209E12C44CBDF4C3E902931C6C983E712DA93F45DE79A58BEF6E742EB63D7D0C187D4037B
-9C1FDE3F204509EDCDCAA5075E3B8B4C5E62C18C2FA01040A4D153C58F0D6AA66335ACF7C455F5
-855AB3DB0A1241287856574DB170DA0C55A9AE190FDBF3049987C8CE26C501D0F3A15E9915EB5A
-9AE4A49860DA936CC61228A21C343DF6B0CCE324FA00C32653DE16F9BBAE85E9C7673159434D14
-2E25928D2EAD8021BFB2DB4F0AE93900577C5937A7A0E292546C66D9D30759EF06120604689FAE
-F808522BEC56BA62621F728E9A4A4D31DB7F7D82DDDFAB127E50E72F95EFA44D40ED9A82A1A3D2
-14AE275930F795AD74375A989D78EF0F3B28138D35A20F516C8546081BA4BCD6B493B49FAB5ADB
-C841C48AC8B22EDB9131BBAD00425D3601F4928F72F60AF6BA2845DFF2C1C46C8C0919481C2F02
-6E71627A0EEA7C1233BFC67B16DEA00AD0524FF2FD04E49266652DDA742E2770504C22430004AE
-F8CD94E6E54D1E8989264B7C22D770D9363899F97A900B8637C42CBE9DA0CAF97D69FF39910919
-155CC68FC81208F9C7E9B7B67BBEF02D65930444E9319D98A3C063EE56B907CC5B2B054965BD22
-074FF61F8F74ED5734C46BE532C9BA883C55AA5FAAF5EE80853D1BF06E260679732E7712619C39
-9DFC4225E71B878CB758C6C3DEB5347C5AD64A22F0C6BF2C692F5EC354FE9EFB940AFEDC511F8B
-1A12BD18C1FF14B354748DFA4553A396DD8457234FB1D6BBF2E58ED6A4BE5356E3402E69531BCE
-0D57E7632D2D3D9A7E7B54499CBAB807514330C566D104C48A4FBFD7F3674EDE64D674DF126856
-1145F8D649CFF1C069414667867EA7B65A012658F1376E7EAB4525EE1788B25C348850809E61E8
-CCDD2FF708C1A61EE0E2D6B5D1B85B2095185668B37836FCAEC18D5444D0C00EB6D75E811D3C50
-9DFEEDBE86B8052D0021B187A93D1EA1FE0147D11D75DB5B63536410DD74040D77F930292D00E0
-8351F7DEB63D98D55F11AE5AEEEB05D00D7E7FDD769ED33F1C61BF087C300BF8D5BCE34B479D62
-8231B9ACEF19EFCF675BB4EC2833458A151C340BA5DAB949917CCD8C455D30F4333A834519785B
-53938865FCE3D7D524C7152E03DE2F84D82F6F90682B0198BF688B2A63213CB432297AE92FCB56
-7D0C3EA22C28C373D3448D402719D0C68C3686CBAE4C45A6958D1E89E61EA8FBD3D1F63366AC59
-9490CC2118148017C72FB239F1540216397DDF36E41DC49BE4F3836B09C674454C1044A02704E6
-FF7FCF78AA85B1003C1B0EB2B5021F8F2640A68E4799E75CF40FFFC212AD560131330489555A48
-828EEDD440BDFF3FCBC860080992A3367E850F9D9D20AF1A0055D4AD13505245725BC3DFD7261A
-B7770CC41C6B908872FF99758DF7EA19CCCB8120AEA32C5E5CEACC05A0C40300C8BBA3EA16ACD7
-3C9331026D850FDE83996CA03F642F5DE54818540014EF65571190394D94FC2973A6C92CF674DE
-2AD9DDFEA8B93F556E59B61AE558E6E86824F23F6A0A72FC79A48CD14FD7BCC76011A39D8CC9AE
-F8E72402DB96DF0DF48885881F508C7C59AF6D06102FAC84718630870516EFC9429A3E95376956
-314E65ABA124F92AE11682F9788E493379F83FADF340783150C51739EE87A866D352B99E6C1F4E
-AD8191B7DBF364260CED3274A261C3AAF908D473C2175D15AA932D88DDE57C2EAD27B4D0F05C9E
-5137A409334D0954180CAB64372166266FAA5A22506D85A4928E240AFFF318EF63B45C26D23237
-6C465AC9FCF64D9DCCF13B6D5103C1F66574CCC968EE0F6CCA773B28D53ED94BB7B42287A6D3EC
-102143F52720CC5396EA524575C1CDB437487288B5587D24BFFF1B82ADD45AFECB4D747A628948
-623E61664F3655BBB1DE782B7ACBF256875DF5FCC20BB7506910D12BE7291EA0648298FD361737
-0458AD089170A005942639F7AE5BE8D1FB6B95662FF074FBCF92776E6F4C7D241D1EFAEEE40DDF
-E8D88DC1EDE3D9E0768B8E0FD38BCD9310F8A74CC0C671B0FCD404739FBC68BB02B1D90BC4D91B
-F5C24E72D98D1D36A0611BA9961B74CCE43411DA5BF2659414D74BCFE8E277EEC4A11F71342A97
-6291C52A21737F224178B619F048F2A44E9F42BD5530846E10C4F05624026E355FE623223DBF42
-90DD504ADC56051A92578CA2E00BEC120E0812E0EEEE934FB9E7FEA6B4925B4F5118F30C5BFF35
-F8A1F069B1FCC24694519FD9E817E01799FE1FB9FFBDD28222663A74E9AA253F573FB3631BAFEC
-D327514A43947F04F31BCB22C98CF9E050732BE8574BCEEBFB9938AA74FC68A3B2ECD6ACCDF22D
-E9F46AC3589AAB1C352538DAA0E1CA320694F79D7E5E6934128DE7EE3E3328D4D494B5E85EE40F
-F2032E44AE58770E78188177FCF23CDD200280A39EDB76E4D7BA6F728CE8784507F7DA164F062C
-349E325C145976D0102E65DA171F95A04A3D550EE3DEAA4A564767ECF3E7D0D5D2BD6D06CFABC4
-1D1BE5A5F1C478DE08343F2D9D6A74BEA3DAC953BF38183EB9BF9B188F88459496BC74A3EF6514
-12307AF69D68A1BD9678C642D11B75A7B5C113EA8036580596FA193F2FE45E52274F20583F6D0E
-7D7C17CA09022D07573E33F52394FF499ED067EDDF122A4AA44B9B4CD53C04304BD53BDB734D78
-5866891CFCCB5CC4ABC2EA2BE6EB432BC0EB22D9EC45BD31EC11244F9C7ADF81BCA29A70EEE439
-4A3AC5C2BCBD2E82A26B06A348542A4C56D778D2DFF2944B5EE2B2CC32762FEEA2E95D18075847
-6E18E6596B9ABB3F36745BD8228EC356BD8DFE89F8180277C50DDA883A59F1D9A21704ED019070
-7E87D30672973F4EED6C744C2E71BA35E887C0EA1503A941EA20902177DB1F5054175A215A9D4B
-FEBEC521B22F9A2924F76ACBE573E216B1C97D5D7ED322DFDFBDA1049A219EE3736B9B763538CE
-0B1BE3E253175A515DB0EB877A547C4929C9EFBF4DBC586BB076ECD7575930E4561B10A56E0F92
-165E415F78ACAF1A99AF4A1A8625CF03B6FE564CEAA6CAF2FB247541CABA278DC1966B6DA19A1E
-915024184832E33129DAA8F37C57EA8FA66B1D7C1E03945627F9807513EAA0F87CD55676460692
-E76A71885A1A37BFC0ABFDEDFF655DED8A9FC81F57912EA87ED5FB28E6FBF283FB6832C10704FB
-B1B46D7E1BEC70B5DA8F5CDB58D19E8FAAB5702A3A726EB077895D36CB6338378A3412922016E6
-5C45D77C3D7439705970C5772DEE02821F1BD236AFDB9982C1986DF161665D7A927412507700FA
-B2D873E77BF818713A257FC7FC29DD7D4987249D535E3582812CCEF3CE72B60D23F33436D1DA42
-BA60496719774783F395C42C1B44C77F6A66620F1F92367B56777A57BAC024874680CD1049EE3C
-458B24210627C745559087033EDF0CFE14485FB79D541888D97CBF9AE6BBEF9CE0DC02BBBC83B4
-C2BC26313CCE46371C60BFC33758C6BD3343C0984E58D4CE5133511898D7860DAEF04DABC44731
-7AE3A18BC898833130CF72EDD91A4E42D85F4B897D0F9E9DB4477E73063189161916DE6F34FF73
-11FA695AFA2F897334FD81DFFC505BEA5C13A3AC792569C6935611E95B74D41D9DE36140620979
-205FA7859E1585B1124DFE4B04D880615CC2198A67D47B64851A642F40CC16A8E8AE202EEC55E1
-008E3879241A61E6673C9EDF77EFB2A43F7E85E196BEA0043898FED01FBAAA47894EE7392B1DB5
-2B9433D88980461A7F6BEABE6B752600B758F0F2529EA26D57BF2894910AFC67FC6D190F359058
-517766C9403B404D50865CF632F371AA67319B6262F09A92A65E86AEDEDAC504BA901B8A19FA14
-F7C6659B209845E9665474981EF9513115B93DA16991B5E31A70DF01DB06D47BF089EB184CE039
-3A1C2C08A2B05625CE02513B4C82D026C903DCCB3135FE88A6A4CECFD2D5808CCC99BFFC43DF9C
-FA2EFE9875C3491320D62FA3A54558F298E3854DC3FC8D60EB09C534E6A14102F4953AF79A57E8
-7748A2E01C683B8ECCFE4AA681D943C3758FE70625227DE214CCACD35F15B4782100BA3C0AED4D
-523681438AE195D5B58D4F61B9807EFB12B162FBDEE63C22CE05D99E4E289EF01463DCBD748D9C
-6CA0270DB111495B0E7BA377CB34163DA6E3B7F5FE89FC9FED9960F3EB9FC42F1CD39BFAC8A36B
-F0ED0CB3B6D8503E78432EBF42C0EC6D608241DDAB2F32540AB22CEFDDBBB10077154846AD5253
-835558E1A30C426F9E7A488B88C1699ADDE69F0821342C60042D0CD505799BF1A4D86D94DC49A3
-046236CDF462CA6367220E041FF8EFE18CA65B989E865FD237A7E120EEE95915295F4FB8D0508F
-A98A2B7737D6088047521E6B740311BAA5FF402754CB1193C329B7A74AF5ABD596E5AB66C242C9
-F6F89DA12065DB01AFAE32A7CC6156B8DFF94B72C8A5F415C738963B112DF996165F52CC48C2AE
-FC903178931044B9095A09A9691668AACA9118D67E122B70BC19A511759544CE3A9BFCB73A6504
-D77E24A350FE52FB0107AEE12F59AD32C120B1205B69D0165E7BF98C9F17A04DD46649EF7E363C
-7F52F573A1B99733E5303BED19FA3CF306879C7498B18ED8EE01E8E87715A44DCEC5D259E95767
-0A469D3C4E5EC2043F6EE288ACE1E3B39084529455E1F8389186F7662F96E3E1B053073CF04D2F
-F322CFDB6263588B3802327318A8DCB9A61C9D1B1DD2F8070F214DFB2198650D14A77C14FC1AA4
-06EC487149B86B997DAF22E30CAE968971664A10A0CC346961FA49062E617ED3DD0DF737B41437
-B1DC2B0670890F9ED97E406B46A94B05A538E8240572BCCEFDE21F41A66520CE5ECDD3C0CCDB3F
-19332FD94654A9EB7D7D5175013094AC79B92D1FB0BA86F209A3283DDA9DB25B4F5A0A03E72FFE
-A45F914757E8C50B8F0F8176FA8CF44C271A584F7BE700A0D36572FAE05EF6FF23C8BB33EF6BA3
-3186583E4F55D1256072B53B91047AF7868B31CB6150F5456FD4FFB8B4B2EC3EE1148E8DB34353
-B3BFA4F84B8C3001E575372BA3F7BDF1BB6C4B82C2FAD7575E12E287EB971ED3D91404221137A2
-53026C8989FC472143DDDE9E2D49A413F1D6A409179CDC3CBF544A093FA05985E0BE71CD6018D4
-2127D0AEB4388FA7ABC8558172396885A8A42F0A0C768A4B0EC2B4D1862AFC4FF363F3668A33BB
-6F788A5D9E9CEA2BFADD7A4C611BA217D15A1F6BEB135F8F7C9FB011642B6240181494A6C192A5
-756766F62D7331C142C551AB0E64ED8CBC57EF3C295DDF2DDBD265816761F199ABA1D2E5349684
-94E676D10461C34136FB87B9FDC817DB731419278301DF86C91D21662BFB36615D4F85DF3793E2
-9BB4A86F1AEDC061B1593F59DF133E4C97B744F6AA19EE0E23ED826D0AAB5EC479F2F131DDAE26
-0F4482E8215F2A06C33152F1E26EB4F7EFE862846A37A084D6090216A1A9E111D416629AA37375
-C4924FD96E87673C5B41F627F5C1BF682E6C411725CF5414D7ED4328B94EB8EAD9EA991D0F120E
-872CD1397D36D5C2DB03164F2E5D414519FDB61DDB3E27D5BC7017CABAC9EB67BCB6A5FC451C13
-E7A3B944C1795ADE61894809B085AB4D8C046486714D086043C8E504B57476C5AFFDE8473CB6F2
-2DE06BF6FEFD368D6F8D0E00292B825EEE18F1FD3DB34DA347F1B13ABF19F22F10313E6D646809
-90E4B8D166499128BA14D2F2200C86045C731B8ECFD52B2400C2CE1BDF0958C4FCE83EAC4B757D
-CDE1F5CF4455FCB27259E3AA102E4CA642122D5DB237BE915E606850D47CD77AB07BE7B676DC86
-B5E0CE1FFFB177E2A84023F7845B5B570227433638DA173C086730C2C647096473C22DE7A47F1C
-C33E00434946AD9847A55A6D54295BA6B2F80E80A055A02A8E80D28685FFA0B766430531AE79D5
-BCA0C699624502B43A3EA10D8E3FE63AFFD751828FEE69C0769BD331FF2F4367FC4F8AEB2C06B8
-7CA3D251DBC6E81F7159862845712248FB86A0F73B767EA8784EEDFB538E41334A8F4280B64E34
-9C2260B1917657651DEE10B78C60E941AC56992BD61B84200E942F341C37C7D73D9F2AFEE845A1
-A8ECADF6BF3DD77D17517AA99FD9A0C87E735F998C2B05716746159EFB439B619C7AAB02C607E2
-911A203FA36C15B3ECECC6C72037D49F15E550FDBA5DE6A7BAA71AF83459ED20A331037F0E25D7
-177CD16B4CB572C2257700F150F03FE9EB44E9C840EA81BC1D9B9E6FACF6D05C01C1709E5D78F2
-BFBEBBCE08C5E32067CDC71FD50042FF254BF62E5E3923B66ACBAC43DEB6541EF98E1CD9B122DF
-C371CCB970C345006847880DC6814CCEC5B5955B63786B4EA225CA81C5A19487C518C8FD98568F
-13B79EDEB465CC2B0FFBF5379C4A2C0FCFB018995107224DD43754E55F7017E973F4DDFC2A14D0
-97C8C5DBD92A5D161C25B6488D53E52C4EDAD89203B0A2B5048D55EE9E577FA75E46E7648B5430
-09523BE6D66603F7A2E317FA7AC44E45342A977E76D5384B6763FE2186383F10711F36E5AAB801
-11B02699085C3222F6622C201B1C1F975721CEE86419E9DF365F1603641DF7A5905BEA0C54D3A1
-8BDCE0C892C8CEAAD1F6AE0E727B792AAEDB30390CD4C17D072B82859C0B6E6574E8F2B4F4AE03
-DCFD278B90DED764C0E6F262CCFAD7257C7D2E2733D0E9BEC3C6DF0BF779B516E41506BC084928
-3724C876682C1C6F36340AE8072AFDB1F710C2810E808C8E789DC3962174978E020DBC1A16F129
-AE110E7C701601D120702B0AEA98FE3B9EA28CD175B9E445920BAF32BCBB13652BB33B62147859
-765CD15B51A63FEE61FF92F458AC28849BAB775FD42123658F31F6DC0F896F2E37CB0BD310B098
-E7B1A6F473D0624E3D8EB7BB91E00BD164A088EAC207F0ADE1D9150D546E00F3CD038D792F42D1
-9625A14D30E8B972B263433BCED195E8FE4F200C672A1F167F969B2E067E32B7D69765823620D3
-E68894BD03C3D5E614FAE9B173C21A946453428B22C009E0BD4AD69D94BCE76303775FAF74C151
-A6D0C5A3F8703CD5BDFCA2A469BF6A42A8FA8678390B9BD516C76C2D6F358C0A28BEBF971F4C4D
-1D81CD15D913C4E3C1F934847081BB1897CA19DAF87B9D5EC72A7C26B65563514DC162CC129088
-0CF4FC0C115CF2768075CA07B04340F228E862A40F35AAD4484B109FEE50E26655A8C699205D70
-C2BE4D2368E3F7F927F64DA140F979B299B50DB1B9224E6750A7D1AA909A4921ACBE1F47C8B6B7
-0CD46EC98C9BD56C35D3FB61AE9BCD3CCC39141C92786B8C7CA61E06B88B9A1742EF6D5CD417F4
-282F220212D30EF97DCCB70CB1153E8912131C9E2E89B490BA9967CEDA089AA7D7E2925C4005AD
-5624A294E63F54235F579488A705D0D13BCD668263122CC591D2417CEE1B1C220BF4BE45722F3C
-4891858DCDCD88B67AA9E69D045F25841C0D8A4A8DE5078A22088425A6027A9FD1063F2243600B
-AAB3479833220D38F365C95EAD2B8E37E6784EA29A4D54C4445C52F3939B1A61F05FC9E5DA8FC0
-84B9B5FF7AC76B07EBDFA6EAD5E70210CF795768EA6408DF4E7EEFA5FBEEB3FFF0357F61EA6061
-06619C14EC6E4EA347AC6F96F3C852459965CD29328C3FC164F570A646D514A1FBD9C2E08A4C41
-A0539C8D5C0849A1C6173E4DC9B2B039F7B5AAFB46A98A7A9431D70388D06AB90B58BBAEC86E75
-17F25C7674A633324E1CDBBA4827A775BD6CA1A9A8AC24A51E6FD163CC0B47A00AD11EB05B3AF4
-F9F971F04F4865EABFF9EF599DB3982C62FB91915916D87E40458552EDFD00A10FDC75F86938AD
-E38ECEB82CBF2944ABA9E99BEB9856D58BEC9F1E0F52C64BC2B7B19D9B2999D16CAE02E5D12FBA
-62B9ABDCF95C664FB4550E890AF732E7EF278ADB9A945EAB167FDEE52993986949551159B3FBDC
-E8763E8795989CF46DCE7D53F9CDC713B79DD75F38D26813A6B31FE0E48777401F6FD86DA5DC18
-3F9625DD30EC75282B831CC151F4A90426BDC43EF2CEA37468363519CBC10EEDE7453F7FACA12C
-0F927B78922A81C3E78212D89AEA5006C789425A01A0F382EB35E61A15846A7C934AA1F164D44D
-E80418740CCA9364A9CB96CD01BFC91C4BB35F0F854235E98E8DFEAE7DDD7ABCD18AB84E78C00D
-D39A4F53B52B14E570D9E5377328F43BDD82936E5992A745123B42FFEBBBCF196744F193F57A40
-38B5AF3D5B1769C10EB947B4C2D6FAC578ABE2C4E682F63971EF5346C62DEFE184DFFC039C233D
-AA977CE3224DC9E989E49FFCCC73BADAE85B2A9BFDA4F848009237ABC481993FD7C358AAEB62E5
-2685C4597C9BDDC55C6CEEA1B44A2BC0A27061D08B4EFD8B97664CF2FB251B94D4900F135A952C
-46F5FA13A30F6AA5C1150A186678B610526C764054DDCB5FFAAB0B31A92B8BE1AC60F5829A927F
-006F619D10B59F59F137FA60D01ED6EE71E6544EA7CF8C8F81075767F7F88D7A2402EA33F8DF20
-9A8345776CDFAD3315FAFCF94A9776BB34697262D3856B8F72E238E8331F2CD4EBFA2CD0C2F633
-D67CFE012E32F7E1F199983EDAF394189E72D6398F48B8988668FBE0B6B1F307A9D127AB640767
-69F7856F28B8F979093B752A753AFB5E5371C66192D884FFF00A97B30FED991A46BB7F982B7858
-68BFCCE7593D432861C55AA6C48A2EDA8FAF4F9D23FEB5FD1F477AE532237A372D425664970BD6
-67080775EB9A3D080B10593CBC271FA9D8C95F9A7C89DAA54F7815F7C7126F640CD773E702037B
-2FCFCFF8BE9C6AEBBEF95A50790D25D1B289F25B43B959E9C2F94F2BB66382F299FF5E88AC003F
-2A04095AE808A6FC812C3F488B5783DACB58ABC15F81B8420C37B7797FF551B10DAC03FC1950B1
-734F753A722E9EBAAE5FC6140D800D1E3655D89B89726BB8100C00E57FB85D229E64EEF50CE010
-1699E721B94CFB42F3CCDDFE876B10B49A7A38FE69F8552D631DE6CFA9F0CCE3144AED6AD00214
-36ECD9044A3DF2B9944BE491C3F3282C38AD3839BEEC9485B30582C9D8C20986A9D2DEBA760B14
-6D541841D42FA9F46C329C5679C31BB32F89B7E4FB817A02B1CDC7ECEEEB84818B60540DBCCC0F
-3144C673320E3DDBE6E31F1677479B75C18968B766C924461482B35754DDDB9E43C81D226C91DD
-E21768A54CF64FE29980317C6864FADA228D2A972152ED1412F9498CE60B7C3B50B9890AED723C
-795934409C5EB2C727A8872C6A0DA820CCBB506CF0D78AFAD64C06891A8B570732AF12F60D456E
-17871E5E3ECDD6B3CBD8F86234C38E4FD00CD39457419A169E59EF4EE625DD40748BAE47CDC39A
-9BAAF4B65FC6C5511D9061DA352E981880F6340D6B6A20B839754663D26F6F53EFCD6EA6EC963E
-581E42331B236409F2F98C43445BA0D7D0EAA52150636AF735BFB6C475C904FD4754034ED58E1B
-B4DFAC824B3669D3AC473BD833B3CE889323987BF1EB3CA1A0872ED5388460F360FE9D1400FC8F
-10833946F68832978B0F75CB14E9FF75E7C5B9464512BFD5D5C4BDDD7530FAE0B397948FD5721A
-0D7B38FD5B67CAE166EA2DDCDFA1ABF4F8E1195913D222AC3A7CD5BA9C07304FC477FD91FD35CB
-C784826AFED5D80AB7C968036E868930508F4F1C6D7488094B78990BA4B79384C4E55E09FBD28E
-CAD7764DF404A1832B243EFF8B0F344F46A3D772E6F0507A50CF120C74DD6674DE4A72531A33E6
-28A5B1AC079AE7A41D62C723D90B7A3E999486CDCE2B64BCAF7443BCC37A9445C1B4681BD26DDB
-C451658A1981B327DDF00E3C9AC34735605595466472C34636749C436773BAA155E51ACE57A294
-62812D2F6E396F57E8A6CF5A739308FD478C69528D86B3CC1442761531D6BB1FF48A513DAA1BEB
-617A418AF696988E29538D9EF0DD8E16588D9157E619AE1226F4C2F37146DC6A49685C492578F3
-EED7B8DEE2FCE03460ADDB91C37F7A29E2D3276198740B73C93161A75FE0D83F02ECBF1B5AED93
-086DA0545EF10000706305D2911EE39ADACECBE06C1B5FE941EA8BCC6C2B6E9485674E7DBCEF3A
-65E8FB59E25C291AEC3158AE9D7C2FA661224B2CFB87970A84538F0370ED6DE4AC43BE23F914A4
-D67FC71AD27ADD384CE9099C65AD89980735B046C9F37CDB29BA5BFC3530CB1658DFEA94D70360
-F63781D87F4501875647342791EA609FD1CAC8A338BC25D296A80F4BE0A24A847ABE708BD8B7ED
-150C3E071BF0F8469A994072DCFC16BBA90FB24A71CE8E7F76ECE95DAA5BF3E78D0AFC22435753
-B94EA390CD95C19BE6C739FCB37F7051A879915507F6F4CA85CB9C5C9B1DE6EDC1A59D0463EC09
-EBDAAC2E5969658111004711C2C3769609BE35F8461BA30BD7E68321505A14B30E0BE54B29DDA6
-4ACD1D186E57F16A15A1211EAD0CC317B8B7705060E18140358F950B050A232E2E24FDDF74F90D
-F1D288F3171A38351A141DF305B3FD32F5A47C25337C252140D3D529700A391F5176134F6E4752
-7452F76E16B9D5025A0D9C4BC0A8873A9D8BA4AA0E323E1E635EE715E09E3782A64B1B578C4FB0
-489D594558A9DFDEC479A9898B3D2002EF6A3F0AACEFB4F4CD8261172C27D15D3C8A6D8BBF8550
-B5A72672A513F340492536A1C57EBA1E56138A6EB1FC138BAA1DEE14D8334BA2D8368E1B1BAEDD
-F4413490723E24933659A2C2AA76918B347ADCEA2DA773F4A90399B0D12E6D9697CCA9743D2B9B
-B2E347841AF2FFD3B2ECB2F52C6E84E249A98164940093C6B0F7F3EDC12FDB0E28458321EA539E
-D53AC5A8A6581D13899666E387F45611E6DF6FB6A912DF34837CD02A7CBD449DB6D76AE8E0B9D6
-674A78ED831CC52B501783FF61B3D6012C7FD091F78BE568A2D9CE4F30FC6B5762295DCBDA1F53
-54569F381386187186EEFA58E583D9476A4C2CEDC6B952315BC3AAA66AC4A0FF34DC46268C5B47
-7F98F170B5CA4CE9188FB5A7DE9B6C706F0E13693EDD06B359EF8B71C9CD93A55DFD9E9FFBDE43
-A8992E61E8037865318C26858FD577096730334BF64D160FBAB4B4A5D0E126E1F74F866D5B84DB
-3ED0283CC471ED7420D5C7029417256C39A3DAA6282A87C42EAF85EDED92D9D2C68B7508F9B401
-6C1C52576F20AEBF17D4FAC5D2C26C30E4F0B0DCF82914A294B01A711A06702946A90876AFD511
-E4DA8B1E2DBD6277F42BC77D6E51DCF5F682214D77BDDA36632D7024E05D01A80336C3BBA5D1EE
-6668CE16AC8BC11AC5075376590EC99818AA74958B818247ED7313B3D07D0D5D8C303483F0F0B7
-5B46246F62AEEC7DC00DCE07F5C4659B18BF0D157736575022524B7188F8BF5B5F4615E507C9C6
-8605571DF81A00715BF3D4F9AB6BC5CCFCC10496FD7EAE80D65FC97A9A5A1B82D85BBDEECA1E94
-0ED39A49C5CD3263FF051456CC785663437D56DF6FB1539C46C351FC0FED4F6C3B53E1D6010F91
-2B925DF6E2A25A7FDFEB8BB6F7FC2839467EB15668B2195DE2083B17CFB9A6B1822833DB7BE3A2
-DB6A97DEB48813C13D4BB2D257459FA71A67D1CA5672F01211EF9ABB0C16F378418F20C77F5F76
-2FA56B0F84DA79EBDF728CDB72277CFB44938799CF307E6ADFA8AA564530716D5CA8677C8710EC
-846C6E87E63BC962D59117B661D1EB2B16B8E13484DC1C7E6DF23B21C6AC4C69BF61C41ACF593F
-D36A9119969F5075A5D428BDB46620CB9B3BD16ED48E3E78C8A900FCD978DF20D16E2F895B149A
-53FE7AE1A14B0901BA3A9C2FEA002FAE3DD25BA0C1C1918FCF1C85751C4778B8D4FF71FD4275ED
-9C3E711FA12D503B0C05469AE2F0F82E9D6F7E1CF0AD5BE1BA3985CB588524AE771AD942A6C2BD
-8BBF08E9C77EA4BDD54820BD8A0FCB35A5C93C0E1A3BB507E003DB5941B7950940BBA323E45FDB
-322585D4792B5BFA97BEEC138D4CA56FA3022D3AD99E30F80557D9B531747E9F4429BA9809CB30
-D20005BC24E3A3488178526464E8A950C7D04C787225FB6DF51C3A38229C33FE52848F4DDD9665
-7B61FF9E0690EA6BB963F879D170F2EFD592D12731890BAC9AD2FEA407B161DF19EB30D6B833C2
-7ACBCE55FA0556E2F991564C15ACAE23647C57BF1885C1FD0A80C1A9EF044AF1F6C6C20B3BB5C3
-0B94C38F718696C127F3D0BBFEB64F6D2CDD82620640D7E1A7BC954D97D19B1BAD7B6EA8965E77
-EF54B80632B9CD9F8BB6028DAEE40D5965299407A01E09CCA11CC830B66135F80D5CFE6BB4CB3A
-6C8FDC309EAA940B1401C268C635AF7167B9CCCF3E7BEBA89F73B721000F8B0EC19B0F572A5B6B
-262C8FD862DE10BF92854FE705A5C5911AD6D01E83B9F15A0B7F411FA37DFD64608D0611FA75FA
-355737F0A5F1A2736D071AFBA31A2AC2F41F8748A9AC1D61AA643FF10DF9C7F0310B861F74B504
-C53739BF454C0BFAB07552B85879DBFE4CD367B3E96ADE0C3604A4AC44BA440055D572F06E86E4
-375E88A47DCE391EF8DE0C730D340AAA2BB2A486517D7A30FEF8E49B70094284FB20079BE3C8D5
-049F0B631B76D2DF986520063E0BC6AC94DBBCDEF79ACDFB022CB575C57AF8F4ACA52FD00F08A2
-BEBDDD5C7CE5F0121F2861B95C416F82BE06778D14275D4A486665A639DE1BE871DC7E2F8F0DFA
-340DEBE03F9C33622B0BE67DCD88760CF15732527B29120BAFF09DAA09DA45E32DE6B8A2339D35
-0C94DAA47D0C749C250CE7CB211BB390C521404E68F8FFF10D8CC2EC293A1322A3A6F3E3818D0B
-248A90D38612061328DE74A3D22D0BE467974BB7D3FB9A1937AC08A0955DE27876236AB3FB780C
-CCCBB0419C81982DE65ADCEEEF7230CD442C4C4A9C093AAE35A02797FD96AC49C8694FC72D0C88
-1420112C26FDEBEE7A305AC36D0658F01E1D8E685479AA8924F3FE5088642C02658CE696894DE6
-004CF81CF629C9DBDD43EA44DBC758935838CE09BB1F91250DE21F3B1AD55F3BDC8E6C95271DCB
-7811EFFEBE9CF3382176869B3A618E3B7BBAA72158B6AC5749118DDCF030AF00E74624F17D422A
-969CEFBF127BCA9A3198C2BCA0C8CCA866A809172E90E464733C9A270B1C3D2DFCA7FEC58CD753
-9D077BD744B94C9554453BA9D1BF9E6AAA7005846FD4B55CF15D60C06C3F2445758F28BD335E23
-5556B5C01A38A730607C3517698B63AF6924074CE49F290DF73CF429E6DF2FAE37A2CBC2624F9A
-6D0927C9D450BDB81C352FBE1D31871E7DDDBA1358532FE253371C8D2D8BF8C4CA863676D15E57
-C5321368FE4E7042937EC55138C4A8C27A6EA262CD0D91C0D2C685C0A066C21EC0209E391A5E2D
-49E2C48FC53EE4BBECFF04A7F8766681837A85238EF4B5A9692F28830CC59D70B5FDA03F42E0AC
-58A955D18D3596333C816F59D9E145095A83617021B47057885086A0348B573766CE83A8275C23
-6D0FD66F945C3648A154C23AFBAAA66FADAF1F8FE11921E4917558D001F26F984EFA75A37FCDFF
-CFE38BC3A587D49FDD012653EC979E65B8A52E461772A6F0C50CD9E1948FBFEEB9F3B217B4FF7C
-E5F2C86F011B8CFFA027499E5E2DA96D2C1C83E517B5B6ED1925259E97FCDBCCF1D84D0A63B4F8
-06B3EEBECBF6B25C52F78B81AD948142669990E80047ADDA3CB0B9125F1FC99F141581E0F98FFE
-91006E83866ACEE9BD48C5D79D8476BFE670EA9A60B4713D8FEA9A1A75DBBB3C36C69E2E9EE598
-33458FB987DE5E00733C954D610DA3C504A678DBF248E061FD83DE507D44BAD90D8A4DD5D9D92D
-B0C60AE2A706F7EF6FA4D17E1EE1F47AD5A399D5D53DBFBC651544EED9E39692749EC9D096B7C5
-E461B8AAF039F663B092B4D2E7A36C12A39A419CA6F3EF7F4D1D2AA1387B701030AE94ED8288C3
-BBA3D4514886BEC46BD8A25292A919E9893E7487512DCDF3B8269F6BACB5BB38CCF0801CEA8944
-F38209BBEFE1789B30069280119C67CC9BE0F77B19340466D2A2BA2C4B75F38A4F8AAA832F3063
-D93C514B7E1D22A6D63DA4CD7AEC46DCCF98E787BE93240CBF28E56EB757B3A8AB68486EC15134
-08680E0C765DD06C6339E87F8633653A7581C52FE8D0798664FEE6191F8CB5CBC9258E30FAB211
-6A6373890BB95884DE4BAECD590203EC4D8428007193C1113070C39DACE584F19363CBBF4DB4EC
-D870BA78008B2BA2E5D0124D6EE28AFCAE0097A8C7836DF5F6B2ACE881905C5765C5D7C68FED00
-D71A5C713335947713FDD49E117866F02C1A4588FC1518EF6E1CD9406CFAD6B5A9DCC50514F5BA
-F1B5259C93A8D917EA76E357DEF2B8D27DE40886959220898D59769523A74A73955842C0B44634
-7C9A1F335454A23C72F092DA2AC404CDADA9928530393880988810EEF73F80080011F1E6C3A27E
-E2804DA5CB3E1DD0CEA4D5B484F631F63474BD9EFB277C12A1F92A071A52C5E986E87EE69A567B
-44E6E1288E03D9023BA7A2222168D5FAB8D47211F7C52EE10C5DEABAC98FD192B609073F4225FB
-D035AEFDC4C9C6A042BD0A6D13AF241117E9F20E8E7CB2C068528D21D0F89E342B892A4A72FB18
-195D716AD02571E213373C608E13038D3FB474C0630999338D65C637FECCC5F1AF4ED5F9190894
-585989C690A83C63A0EE07ABCF2215055ED665D5423111218FB924C0BCCAE7BE3D634C9510D118
-E87B8AB3B7D92B8044FF15B7A0C8E1DD8A950D94958CD2082E8101ABA7447B038CF39D3099A952
-7E76B3CD1A5736F76B44FB16DE786063CA53D7F72C17326DA5B257D73B6DB82ED224FBF8CD8AA7
-42B2EA5126072AB706ED6F008DD7B59A274412BCF6DA28F9A3909FBFDAECE3F8BC302A94A6E376
-BDFF98E2B9E5C476C01FCE90A4E92176EC88FDE2A09180E0E1A21F597412480BF19F4D02CFC87D
-95343BDB16F1DA15BADFAE941A331CDADF42D591F0CB59F117DB2A1BB22D7C299936CB6DF37C47
-B37D4570C512142801E810BF82978CCFBA35761C64FB236D7CBA3755ABDB2FF5F94CFD74FF2C58
-E3B9EB02CBDC8EB3D1CF25D1460C3D8AC1FAB52410FBBBC323D2C1A99B54906E7ADCD33749F347
-51B9CACC97269AD7A879C646489A1794657BA4127F94CF8E266289979CDE7A3227742F1F4967F2
-5A49EBAB5E0B3FF4D78D558DC86B446553AFFF75B75590157EF4E4B670D4D5508ED790E39884B8
-9A0881CAF324D84772B53AE4080AC52DEE29C8506FE6F3AFDC9ADC7D1775DC59C83D09D9AEDD9F
-BC849545D80B11FD15A4FDF2ACBC494EE00259AC37FE497C6F35A4EF51B25C67C5212AE50430ED
-8D6BB73FC89E34F2E760296047AFAB9BFE89BD2FAB47E7639F04DEBB92208578E6BA025F180411
-1AE7985966A5D2AA7084640FD7C7F96578321D74E9B508903E6D5D3C16CD3FC9788FF487B31632
-5FE044A262CB14D4B97250A935124F8024D1340F58E6FD6D7B0411E3AD19E62522906BBDC9428F
-E31F00E1A0CD96DBE93F1EE73119AFE7C71F059A90D9DDBAFE00A4173E1FCF74BA97FAE28EC8E2
-45B972AF106D1FC0ED3574D1C713E0E955C4917745DE163E12B345B00A832F7F7B70CFCEB76F1A
-88C0CF050EC5D2C9331BA0D84B9BB9D0ACE85F021553DDB0EF3485B056421587241844DD64623D
-30C7EA91B5685E61D6D713D0867D8FF904E254D89B3A6F6E44239E8AFB210C2A5D741E0976BAC6
-5F07CFF611153E2DD8370D4E924459F571CC9D8B9C4BA56C0BF6BC1F6D20AA042CDB0EDD617148
-22A7A57F3B7030A9D055A8B6D5CEC8E83F471D692278EAA138FC371AD98D772D210B0F874799CC
-9D7F29C2349897B7C77353D86CE4D17F970531A57FDB7E7642702D853AB8DA5F580690262AC019
-BC2672A5238FE43BD2FEFF2D2338D71028EA1DA10A987E610F0C527D6C5E7D0960AAF5D8A77FE9
-88B1C30C6AE41A073DE7DE2053B99031214A3C69E66301B2B2C12770C070F80DC986F255D3C766
-7C4AC0C85FF653193CE6369C8AA8143B99AF8C21F58E08A77CB575369E455EB094F4D180C645C2
-0368477129CAE48C36F4396E82E18903313AD0F39E666479E88C7CA4F99089120135DBCCE047F1
-97FEA92C118A0C3F936E4D12CF469FF2C1546C6559ECDE6BC9ED971CE2ACEEE6B4541B97DB48C1
-491689E0CD883F221B58F2E3C13336176A1D2FD31524E4E56D5DE01527EA3BF596A9EC4163DC9E
-E300D6D8FB2A806A2568FCF190903D5FF08442C191980ABCE30178BBB7A0D51DC2F39850D2CE51
-8F5DAC1055CD93EB1E67AB262460646A235A14B6A2E2DC1FDF9079877D90F1997A01D7ECE1E0AC
-3C69979C7A92D318F6B93051CB55F1992A0A737A3520C553AEABADC17FF5603F23712E31985E40
-167EB338F9F96444B908723C5D906B67556B0DC088E808A239757304673DB8634E5B049A25BA86
-2491EB65EB2FD1AC1793BC94E806B22F06031902BB37F75B16E12FC28593E171F45E8B5C076370
-EB2522791038C864354C495FA67640FAE6296C953A004B68BAFDAD61F9C095768E4496B3120EB7
-718DCFECD3B6D6D506F32561E435FF2AD83FDCBB6CDEA0669F0345F651712FE000D80952151CA8
-CBE574B5828FA7D2599A82BD6B458B4F462A6C09F1D7F335AC4D8919DFC8D2BE73284691A78F83
-605E0E1818030DC666D458E168F389F9DC51A71F232C4BB3F1CEDAC17E9A751D2A496A49BE94A9
-D806656CFD620842FB76BDEE39576136D7D3B2DD8B1D2FF9A6A288EDB4128C71FF0A8BE2D140E7
-B2DE893BD3F1878631401D13156D6992FA8DF287978A8AF5052A33E7FC68EB9D2487D47B0AA43E
-B25625953FED6F4AA641604367E30E94BB66CC4EB3EA2497DFE7CC0874CB031A0635AAB2ACB504
-E70FD9D9C1F1D634D041425688DC6D4669E9ACC514A08BEC99A7F5928E98943CEC9968A09BF757
-38AB42F50308407B95DE4AD69EC9EC52D1E9C589F8B52B52091AE3872812CD55F633DF67209A25
-9FFAB05696B34096EE79AEF64B59B589E2BB49E2908FBA309167DB66F7F5D47C3873E7BD213B1B
-48E966145D40DFC0541FE4F3C382A8E15AE837DD4C7B92C53E7285DB1FE32F605B89AB71DAD229
-D4921534DAB151E4AF32840F33B9C7F3866ECCB6B53D232934CFD94C8C59BA87D62BDA859472D2
-B3CF283E94783B1D3BBD1B35AA9C10974011BA857A8772462F1B2AE8130E1263BFCE41489F5532
-3CF207FC6F8B299AF55E6762CA918374FECCA6B5B55F2732FD908D25AAC3E703A05C0D6A70289E
-ED5329628E968989AB3FE634F471EDECAC8F7056685B61DCEC44772089482AFA3CF96204E0440A
-04E570C105F1A79F592AC40F5559FA0D29178F424C0A051B92E4684B6E90DE462083F33A7A08B4
-63E12BFE98B2DC6021FA61140EB257FBD66F085AAAD4C6FB0C089B1FEF91FA820B7A2DCDA6147F
-AA85C6279992741ECAA61EB6913F437CD0E9D94B54319C12BA6EB71D8791D04D40DD386558FF9E
-DE3883C324528EF3F428D01A175B7DED3A48D184420DB29E352D025FEF804E16396F186FB68775
-5F6C9277A0555B1D4FABAB02A6D40AF88BB5C9D82C32E577CAD2054FDF64ADAC782FBD31593A6A
-65DA02FBD1ABD742C73B7634FE90DCC689489780A297B29BB3C175B3448D331B73F307751CEF96
-BB6C0C48403B1A0C7977AD7839111486EFC50AE2FA28666A0AD657F686018464001811DF596F8C
-E4ADB26B2F717A2C520AA033A184048ABD8C9DB5D0D518B00AEFEC2E6E0507FCAC2D5D09AD941C
-8B04D61233C49770640BEF7CE0B1E1424F191680A0FC4E93B5CE99A406E262D325E952D3F96EE5
-A67E22C686170726A86B6C5C72F8A8511AA6F92BD57C9A7524CE47DB120AE506E577106DACE83C
-52595127133D310397646E3E75A3B9D3B2F49C2E7DB6B0B0BE7F0392B897BDCA28461A272ED2AF
-E554A375CDB58649C07E6FB9ED7EE571FA41B8B0A7A6EE02667449ED8C079B688438BB0FAF2169
-40AA668C7771D84D4FABE67A893048C3EED90182CC236CEB3A2EF960A92EFC282964EFD400EDD4
-DE7B86DF8D18E8100DA9409CE31FE6B7360D9238DAD7590FBDE2E6686CAA620E5B578596E810E6
-AE10CA734AEE65FACEC38270F72A484C6386F37BC9122D036B531682B16CCE84C2038A58324826
-D5FE912EF4A17B59075C8FCB2C949902CBC3D948B1F8EF3EA31F6CE0E4352F3D643DF65116979F
-FB9C6BC403CF123AFD13364947D9C1B95ECA218B17F8C515108B9527E4390BCE3A9AC2C2100707
-6E97A45317B5B56FB1C582985C853A4C0C88FE31BC32E497DE73C57FBEFBE91E549C3BA19486B1
-60B5A5C3E05300E553E8036C4D831F4A65AE9D489BE07EE4BFDCB3543015C173A416B1696093E2
-DCAF9410F4A2DA057162B0193D3C03F600106F767E245191CAFBDBDA048CFE83C441E3DD223EBA
-0863BCAB6A9BB64365CEF19CD8EB1F328B17E2A3536407DB189CB5D4C8FFAB9CBAC077F4041EB9
-A73AECFE166891570C0747E94E4EBFF4914F1B986364817231471AEA4D2136FE16A83BD7CAE91B
-721499F40F7D7AA61FF7864FDC514CE91EC8608A135D8DAB5B0FC96F72362994E5E20E328EBA8E
-58F0DB8835FCD34C1757B99A98202AF46DE08761C367B2C8FFAD3063CE2F1419DF8E01CE2AA8CC
-C7148BA74AFC479746419CAF20E4E195AB8BA6950C24DF0BA732192FD61B2CFB8A65BB9B83A9FE
-9CAC67FF11B57AEB8AA1CF29F05D3A8D5EECD156D6423ADCBE34C2BE9E6E7D6B5F7551763C5DBF
-AFBD02021310B5E3699436F86F449A1B8A9C9E89C39F541FEAA3EF045E2E5088388618DFCF52A5
-7921F88D6C2D2DC2C50274B46EA6900D295720CCA3B23DC55E0B03C30A74CB9C8F77E95A3BEAD8
-8CD80B9118CF0E295CF02AD0CBD484AC35C804735A540E173D4955D033EBF28EF625403505199B
-F1B82F35648B70345550BAC06F01696C4B81C27BAEFA5E7A6A0ACBEEF1D6F83B0707787D8E98FA
-DBF67B75AD26538D7EEFAAC57DEC507158DE3EA39D3C88D3AC9E73AE988B1790C343E49EBF0070
-C3245FA4BE1480DD9E041087F87AD0520791D9BB20AA78FEEEDF0772E1749F5FD4F0FD46265B73
-815CCDA191731F7E973EB698D3FFEABB83956EC55D6A7517643906224EA5C8962DB69EB0EBBD38
-66BC8F4951F9C6CC0C156F514DC6CC91F4E0AD9AFDA4CE3D4A67E1D09D29D9B7AE386CE2428AAE
-6255AC616F9681DAB06ECE72282B0806D82947C2A680E8A3B56B0538A39AB4C55B9DB329697234
-FED1FF4298DDBB758F5B79979109A8A37CE495251311BFFBE9E0660B80C41F9A61CF994F3EDA36
-DBD67A1E44FA9C778A34E5C974E82087958B23817CF594718FFFF3423DB1FE5E7ACD4C4922402E
-2178531BD057406134E8F65CB088C3B9D40DCEA5BE9AAF5CC8E1818226852442A7F9E593688F18
-1CA6651D1073C402EFDB48F0A177E654B9CDF18B3EB01B8B70EB368FA25206DDA4AAD4131503ED
-72F6EF1647101805A062140F08B74794CEA728087D532A5C96B89660E664024D1F0FCF96447261
-32733580D9EAC90466ACAA47F0BA5113B9E462C66F7B17DD46F6EE4E1CC446EF9287A947FEA7C3
-0F4709A72C88E7C9BEAA57FAD2A7FD53EEDCD929D7013803F481F982737A6CC1879E5D3080EF8A
-4B6759E75A56443D49A8F2CA2CC55D1FB2DAD56D5B5A0D7C3C7D0A31BFC7BB377FB52DCE2C8E99
-CD3938DA37177ADE7F069E92A6DF8767377F30213677EF1C20B00A4F5DDF8E12121AA48171F7E8
-DEC03DBED1C65067784A79F0389C1739E633BA9D28EE2CA792314470255BE7248D40E3587C0A0B
-B6DB277A41BE95AE6390273E8A0B07FB13E5B530E27227F48D1298B40ADDE2E7035F94D10A2A50
-AA3A3CEED67AE00BEEAB2D163396F3DA8F68828FAB9D5E9615BD0A302AFE9775E684BC97121D80
-AD3B42C18C37FB1DAD5903B97E892160C7464813D891856E08E1ACD27A40760B7627A49F58F7EE
-8B3D3660C3DB676B6B9B71DF2968750B9F1A80DD62EE3BD32C3B47DCC6C140E5F11B27F60F7927
-F1840E9C6EADB2D6D77A1C4DEB0FA8F892B44EA91AA4094C908250B6F4F6AF2CD54AD502384C9C
-AA119D4D06DA553B03FB85AFB400F78AC92D8788DAA55B1C31944556D5ACF3AE6B4C58066E5CC8
-D618A8A49B984F703C797755145EBC8662AEDF8313522DC68C6F14C053708FA4DDBA689C43C77D
-05056D8E55E4AFFE1896E0A6C26FF013ED34E9FF62AD8C7379F6188CD1EC8AE0EF98FEA0908ABD
-2BB72119EB4D4C747152047E26AD4B14DF75F09AAA6157BFF0FB8AA220D96F2367280FF2BB17C3
-A9A738428BFC2318757A70E80E6FE8570787969C8AEEAC42A75677FDDE995476986E9EC26D17F7
-FB5F3ACBD535FDD13853DB3BAAD3F2E24370A4E8837B3EB483C395945722B35DFD7E2FDB46F2ED
-44909C5DEDA732C2039ED60989264739690320E034B23ECEF5828BB96F8F2BA4397C7B68B7F72F
-F82851184FBD2C4C392F3B5C59E5B4EDD83353CB47FCD432AD7AFC3C7E26B55928F0064993DBFD
-9FA7E89D665C7A041C18E1304D5DE61801A0DCF44D7E317954ABA6C94365661347030CCFCDFE67
-19E6722145F2CD8E1D92AE1D78C60E301EEBF94B631032E0452206B1F478B3363B7B683EEAF821
-3B8156D95EA88CD65E6844AFAE9BF59F61649AFE540A9FDE690FD5F5C328E302C9EB43456AFC10
-7E3296AEF81303FCB9CF186A6C96FDB7513D2F6F84BE3EE195FE18FEA6F2EDC04C44F266D8220C
-C201A5C84B9A81C2437B8D2E85EB7992F9FEE955FB316EA6BD40E7292F6733B9C561BF467FDF52
-B7C54D3B05D6D404F3348748E3D0FA42E5BA7BC2811139A7162181B5B13E9921701C60B0FE3F08
-9EFD39BEF19E4C8216EC556225337CB50701612C86EA1E0B85B9447D30A850D9AF35E039A1177F
-E44023F345DEDEADA693EF0FDC26468411ABAC5EDD43D9B81B42F6E4DAC35F4C68B25096004025
-87F4AD458294720EA0038D75092D449980584FE7136E22F9C170477CCB97E543CB997F84331A0E
-5AB5051B7143E86E80D13F163FE9D0B90EE9C6604B71397210300A1A098E70A27C591941A20463
-C242F2087396954BF9193E634998AAD4EF62C4ECA6A5A6B4FA755E9680F427D86A06BFE58AC515
-ABF75AC0D8F2843B39699850402D84EA6231D69A9F74F7DBB1311358AB6EAF9B965F2135257F26
-A328482E47922F23364FEC67DB123B0732BBAAAA4F88B66D08D6AB23CC9B123AE8B652378741C9
-5DEAAB8C553857883C37890ACDA07DA6996B3BB11E8AAA56F7C0BF9896CE207928BA8478F99ED2
-FF729969504DC5901265184C5606EE177FB5ADEACC7B02388D4E960F0EC674726410D099B490FC
-6B851CF9085D8BD736F82E76DF6DFFFEF79221D00370C6EED9C23EFED4FE3AB85D0A52B32B0C3B
-3FD5987A39B2BF2C89DF867E07A3C767A25F5279136E1F2E0B8636F9ECA61F03789D2ADF3C9739
-5FBA915DA068B96AF8C8F12F1D5E509B873574ACD34F2593EC309CAD1452BDCBCC3C30FAA7D023
-F44F742ED67CDED191B8C6FD26FC85E9263D174B9DE982200E94A6E4F63FB0ED4398D4A3906D70
-796A29649F70D77A8D63B1970D609BC84B93B1E4583FB5D1849C46D6C00B9643ED635626A37088
-36184EF0FB6D0DE5D537CD398F9A9361BB33DDC174E2F9C4C6D8E05648F2DE96FA713D8502678D
-D64FB9B5597F78778A22D1747EF5B40913390ED8D2704A83362AEEFD90AB39396273826BED27D9
-8FF6B4AF9700D3AC5688BC4327C8EB6973B85218C0D00020B59B57DE1735A2815372646625076F
-5278E827179D08372B9BA679ED92F3FD55CFF8B69EBDF7F8093703384E48D974AA64C5CF88C1DB
-103CADE052E80605E70F6ECB32C4639CA413744CA95E29F76DE480F988CF2B52C1DB780593C310
-7A4E8C7914DAFC82B98F853981FBB896DF909BABC9CC1A1C008C3ECFFDDD656D481D7DFEDC42FD
-C71905F15F665F800AAEC67C03403A153D46B305A45A1E05AFE40BF394D3C8A071CD5EEBF305FF
-5A371BD1F117670DF1A49C2B5D1CC83DB21FD5389BDC26601627D729D6D2BB18A843F361CCEC75
-D151A8CADCF2E49A33316165D44EDE2CAFB3179E0E2AB8B5E0A3DC050D986D073BC7413D036AA9
-8962867022EC234CDDF1EB6769054D8A2D165A873164946C614CB9AE481E6B55B2801D9D6114C4
-F3CC16833999E6662FA63B7FFFFFC21BD209B69FCEA1C26B905362105807F12C9E68F9FA012E6D
-C8DDF21969D38A19EAD13C5D49407DB5380AC40902044149070F9D7D251895CC5F8A597F45CF23
-7692FA7FF33355A31E26E7BB97CCF0E0DD2AA36AB210268836E819E45DE8518C8EE54E1719B483
-1FF5D90DE03C4E4C864057144EB4654B908EB052772160C8ECF1F862C3F504504F9E15628A4A4D
-16B01F543C677ADA28A132F8BF5F758CC086DEE7C146B83B4C6476C3A550C6218675F4C33F1ECE
-DCAB0C3112BDCFDD94A3032A73C6124451397A08EAF12937E980425DF411FA762E7817755EB367
-1A999A785D410301145F7DF41CDD1E3C642ED64B3E3A352D1C65ED1E62B2C9F40C9398CB30F77F
-7EA88CDED5A5D51106D81DA03475B3F2525DA1AD4AD55379682868E4B37897D04A8BAE8B474A8C
-60A51695076E91FAF2FD3E6FDAE7A633EC5A83242E224E1546EBD0A6BE6A1C21619A5226BA46DE
-C4A93E212FEA0531C74115BD39C52665E51001D9D0C01AB67FF7E3A25D4D644BABC17EA0300ED6
-70B5BF65DFB5F3DEE45189F185B494498A6C1ED336C60901A8E36AB95F56CB53410928DE6816E3
-CA8FCC48C1C30B86CC6E2B3E265EBD4C5C888574A9987A037053B98BD86AD429CD752C92E38982
-4E9C1E441828C53CC495BEDAB0FCC65612F4BACDF7566DC2D9794275D3C64E88E4A70886FA6C06
-F6E6CDA24F4C5258D56E3E0F647325C176D28287327B6486818334B4BEFC9226FD828184E13A7B
-44CDE166E10D44EC74EB1FC336470717BE9CC57B6DBAEBA117730124DED41270AA7A20D2CC5E82
-6F8E3A56B246E9EF62CACC7E4DFBAE4FC117D6CE6BD747FAF7E65FFAB333BAFC276A8615E36B2F
-9D2C245729CF4F37A85B67CB71C33998503C619321A3F1E965FA60CEB0409780BC2C85E141C044
-1A52DC12D01583932E878BC3898756C8B70615310AB72E0032D58452F0844553D86BC4710BA757
-E0F8B346F08CEF5E11AEACA08ED7923116591DFF79A2004AE9E36476CD523085E52BF5F584E99A
-A8F98416F11E7BE5CF0ED19B9ED53A8F5FACBCFE684C67AA615C58969FC9778C170D5AA4B495C2
-7FCE92D4BBB4A6DDCC03D57FECC625BAE1F8EF1BB450A617828AB945775A9A453CE791D118D7E3
-82DC1777BE65E6E8B7C5D6D53BEA31A4849314E6AD576437AD7BF724CECB0C5F82ED0CCCCE6A2C
-07064D4857001B3BC90DFD3CB563750C1F85E1BEF1D504351E02F136A6846F3E3766CE83A820B9
-B00E4030E0D0AE46D1259ECC0F222FC261A59D458FC690A4F3AA9CF130C75089706BB44D0E11AF
-80AEE0D30AB29AAE0C4F15DC3EACFDB17F2C398B32F1BEF376003ABC5C20A093203D44D3C1D3C9
-6730A0E2DFFDEBA332266CE06F31A3682230593B1441D5293F251509B06F2A623997A6F2E9E4B8
-F98EF0FCEB693AEBA92FE01768EB6417610228D5F164775FC17579D231AC3F37A781B960B2D28D
-F7ACA6DBE948731798A429A8B13A9E50B55A39CFD2538214C79C6A6AEA31B4A6E00CC31A59A772
-2B850CC0E56F624FCC9538EA5536A1129D3AA5A2982D4A09BE412E10263225FDA8EA1F8E42C57F
-0DAB402551A3504DCC450516FC8BE30B4835849A969A30986FA1D70A35159DC3838ED699721F10
-2758530FB4DC7D09F9491D6651755EB0A2297B4ACBD7D39A5FDBB18C09860EBB8B758AEA34934A
-E398402DB1E678368AC44F3EDA1D0D0D9D4F622098A7954DE9AF40A4BB212036DDA8A547883F09
-EB4928ABB2FE16B20AD3C4DA1E433DA1A6A79DAAAF015AC57988E75428D0FA0F2439BAE2D632C2
-46C9518D02D8AFCF2BCD48B6ED4ED70A6E84E3B41C0C4C0A3504BBB7C8B1EBF881211BEB2D6F5B
-821A773211A4275A88ACB6802899EEEE4E749383F4C8B05C364A0FD51C0BD79A29A44D79614CA5
-88142C955394E2E6947EB28568E84EFFBC1E53126B0AA649C5DAB9FD3812A82F36938DB423C744
-787DAF1E3615B14346FC285AFBEFF55619CA9C42FFEF7249E963A4940BA5523B63440014470723
-D98680E944C61D52C24C93D8D310CCCA583AC522257F9FD187239C5CD8F6C8F3ED9147EF975ADA
-69C88A6E9837FC60EBD23BF6353B191B9A60D35E783D9C404F92860FCACCEC13A520D874413DFC
-9E49B9665C6B4E571DA5F798661428A59B3E85DA5C1CF692794A19AE33921341D21BB8D4781D04
-704D31D3698CD619E18F671E767307AAB05095A47BADD8A9F3119A3BCEFCFB96B67F19C285CD45
-04479B251D4C1848636F7AF7E4E2F3450523C66C06ABBF9EBE571BF6079C53ED599684D7017F58
-33CA60357274C5D77BA844613955DC41F1257B8934D89624C66297AAA60FA3D8FE51B8071A55C0
-2B974BF714A4787154E2BE39EEA83C9CCC78E179BEE40491A7B1A69E9769065173C888DA32BAE7
-1C48A75B1ECA34460C5E7FAE5A6A0897C716A938E503D7569EEE2267314934144DED48A7376DC9
-95F1C3B89CE79946A39FF428F16CBF65E8006C9A1CBDF2D7553D4B71F884408415964AE608390B
-CA3901704E39A68928D810C8815CF7A86FA3DE326CA7D506FEE41CAE47731B2834048D25FA5F93
-78F42F336F89062F42FBC4ECE7A2D005A72204F28F0F0DEEFD83A7E2123FD8374E9B24109E00BE
-717395EBCF0692924216E3BF281AFD254E2A68FCE1344196031455C86E3800CF42DB12F84D03BB
-F9DCC70446B94AE2F67CC4847378F33FD748C76BD7D70AE4D03AE6C0230BCA80E436C2126940B5
-CC9AF92BAD3B7D52BB30A24862089644AB0E8815856B4AAE6A930240F8B6E357A040907A3D3F2D
-8DA2BDA625F5D4A2C2D7DCBA663EE58EF285FE140BFA75D28FCFF911E4F19819970268494C8285
-EBB9E85A662302D91D5B5725D508F55C1EFD3090305A904BFC3D9A7CA9D80DFF1EA435A846437F
-86DBCA41BE2F5B4C63588E3FAA3AA34EE18AB77680F551E0E81F94822ED3606A36409FF601B7B1
-2D5893C206B985F234EB22D8144DF148E73081A4EA57308D5CE68061B213862CF80C8798ED436B
-98CEF59156CED23B0718D240B9964074BBCA5EB0BD2A4F16651755078C28851D9575DBB137C2F4
-3B4AFBC5AB51F921BD6D50CA1A12B2F01C0D6501324C929D2D8CB56A83C82FC5041A4277A07EC2
-08612B09BF3D963D3A19CA82822DAA99699CC068284878829A27BE978C031EF4CB21E0F8886FEB
-70BA0EC4A6A906EFB02B9F03D0058ED7518F7343D1A6EDFF6D3912A82939B3CB06BC34F978555E
-749AA8FA24A7F9FC2D594083D139FEE84EC6523D878172D8E65BBF5FAD490090094A49456F4CEA
-EFE5413F93E50ED2AC3CB2FA53E498671F274EDE57B451C541B044282E4AF9A3760762EAEB0835
-7447709C3311E05978E4EE8CFE0802F52ED18C051690F1BDBFB0AB8FD9017FFA728BEDBDB2430A
-147847EC3711232297B0A463A705C53A36D7C6FC08949BDE34D494F550256EB1E083BBE7F5C703
-514B16AFF5D1930B3DACA9FCD03CD06409E51FEA90E950C6D93A8A1E0DC7B2CA228F56EC206860
-C8697516327C9D31D23D59F80FE2E81726DF71B43D67E94D00E841B5BC14445DA2E194700E5A60
-98EFD9983507E8AA4CFCEECC8BB43E41671B0AE88D8B0F5397F2168A2A7F5C9B9F2A4338AC7F88
-701DE489AE5932AF0AE9E4817C4C72ABEA740489E344BDCBD832A3A8B6A9AD5BCFA6A93595D2F8
-E2A784D313E058C60F62535013530C77B8559CE9A91F2F1569ECEB7662C34CB86C0B1579C83A6F
-71B3D80C2FFED3AAB2D76E71EFAF3287AC7710B9879D65298D28CFE6EE1E3714A96259D72ECB44
-838AE9623CA9D4F57CAAFCCC7EBE292C1D2960A51DE1B4AD960650DF179115BBC3B78BF5D90086
-A503818AE875F025BC5026061453503D3AA579CB0E9C809E31E7512480BCE4E0CC1C69EAE3F202
-B2D9DEC3FC0A23D11B906CD73E5B735422371413350FBFAFA051584E1463A94816DB6BB48ADE15
-5D9A1F366D3246E0645BFF4959C6385344A9A9FFD935A413A27BBE68CEF39C66DF14F56E36FC9C
-90DE20E82E1E5AAEBB441EE68CFD766F410C1622F2C1D72CC428F12E99E02D2C733F238B9902F9
-CE1D502D85364A2C4096C4FEB1639CC9D69F92D12C7AEE78D074B8808CD0BAC8086C401B0F4CD5
-0E49304ECA860A49BFF8874F2318561689AB5F7B2E5F1C5272FB75D5ED19E4136A91A3AF905856
-3D4B83865CF15078CB0C2B967E3AA549DB591A3EA0C1521DD7B2E222C171BF8EBE765A32A4A578
-4C611BA2C61B241F2AFA40E49712C919401968D84197A731B799D5397BD2B937329D299C8F0047
-DA451992E606BFE30A8E1814907A87FE84119AFB93703D9787D4C1C413F5A76236B78AECD7CBB5
-90408A312F60BC1BB63423E10312C80A121A154722994138BFB16B0393A07AFEC716EA6977071A
-22AB3ED600A094E5C6DD73F6D7F0AD132355E7AEC4E301E821E11FAAA66D70A8E3AC5253AEE552
-186B6F6378B62C14EC41AC9451513A4B27AEBD66959C41D778F3EE8C6597A0E2A48A4EE9D14F2D
-A3802830D791A3D045E94071071E8BEA8233805BBF35906CE76DD68F0B738A042708D796EB4EDE
-C17CA860D8578157D85F550F31D3BFA8D28B763E9C634F61F42FD978EC125E90C71E2F537EFAF5
-283D4F97E572F1664912F61F69A1BC5314076FA5211C400DEA3C4132AB9CB8192080D78B7EC39D
-14FAAA15298AB6C80A800957B2BDA1B2705FE6EFBA0CE5855F7E746797F964799EEC86675CC0EB
-30B447839C99713D0D4D665D0F1BAC68DAF266267A57AF2CA066FDE9600E4623613B4564C58A6B
-7343AB9DB446DC7FD45795FBAC9E7A7031AEA78EB8507BACADBFD9390EB90FC198391CA7E15CC2
-9B7C7DC6964E210FAD7808E92397B86E25500354FE8F749ED4C9A98A48B6E5BEFF2B2D6D1AE9EE
-19F82E1A144192CE87E28731AF8DF82CDD1953D73B63D54416A87F4FB927F6C99EA8EB5291B10D
-C519E5E60F8C5DB071F46F1A308B8F7DFA353C6CEF2578034B31C3B7537568B4C23657775503CB
-2F9E829D8B5CF892EC4D405F215AB48056C1ADC9E2D7195463DDBCA169F84060C6BA9D89D3CC01
-0A58D845F687B148F35C17CAE7D627E63616C3ED8E3F7FCA1A2A894E0A11918F25C97C608B02C8
-94AECDD3981577E0F550145E18FD99EE2ECDEE940C7166BEFF60771C04C8093A0E74BD30551793
-15358C2203ADD885313B9C4AFE031A15116B4DB5641871F6078BAF130457D50547A0FC4872A9EC
-C4C8BAB98AEE3EADB728523F5A1137DD046CD438E3D6C1DEFDF53C667A76570EC5F2BEC0DBD668
-5E18B204685A3C29826E79CE98555295CD1B17B29B46D52AE264C5D713DF91E38161717BF1BC52
-FCED4EF0F9E8E7384351530E4E1FA42EE19403E64D2B8C335E4585A32FECC7D3860819ECC40484
-EAF73F3CD89A56C7D2EF439C8C4E773C136898AD7492444FDA8FDB8C35223969CBE88BB5998C2B
-B30F46081A706ECA4635B16B0EDE89901B3A7FA30A87AC59F0E3242314229267537F9F4BBFB5B6
-29C9665AE09B0A3BBCDFFEA35422E7ACD6776786BC165811A457AF8FD7BCD4624FCEECC83B2416
-B225A6047E6103BB737A668E6EDBC8825302E013B73543A6114132CFFFEECD1F9A9E2FA449BCF9
-85BCDBFDDB0AF49E2E42AC2511D4767C9C63198F03EF3733F3965A2C057528644179793910DBA4
-E78749FC2D2DEFBA1974E3A16C06B97C32B0DC0BCAC4B76564F7A1E6959B26CA35C806C11B02A9
-8D32629F3CC7C90786DB3E1A70C7F3C43906860630BEBF14CABF8B6D694B27138D633A338BA1A6
-0EF170D8EF499E3FB9D58C3C723A4293D4248AC65741884D5929B77EFCB3568500A991C00B58AD
-2BD6C4D7DD017B05D02FF6E21E1C0FE24824EDF08945C7C6DB0EAF97200D3F0FF3DEB6405A5E9C
-DB4610837769F1DE543A137CB2508051E95C322328E550BEC8E72EF8CEEF6F8EC850326CE919EC
-2D66D961A3A872F086340B00ED43E63D714F2B26BF48D1A934411D909B4C1BF3B5512638036326
-5E2C49843403EBC73B3D5BB924D285E9F4B2DA3ED5D25DF840F95A089ED664C47B4ED2067E7107
-D5A83C5C25E981DECEF5C42FC7E7E210A1415FA477A5BA8DF602E04B026303757CCCFF6C2EAF53
-A95F621469BB567842F70C2D26118A6B017AA2D8DEB49DFBA75E8CDA1A6980408071A8B3152B62
-8B5DB74790313CCD0ECEBA0BD8632C7192853A41BD44759009D034F25EB1AD27A12630128AB4AE
-A7FC3B39B6BA97ADE40DD2B76AB10CADC51978D5F3F366AFCFABFA031AAFABC1B8309571DCE7EE
-20710F7282C77DAD16C1917864109E40D1B789356E45F8180126FC628850A95FAFD346B9B386E2
-C5FDAADB80844361C5D65DAFA9E305136624E7AF744E8A6831639C06C74E1DFEE49E52C3FC77FA
-601F194D97FBF6D8EF0F948F8197854CB5C7509375660EB1AFF2C385966225CD1F7566895033F3
-C4DE4CF0081EE470F4AAD53F3165939CE32132509671FC167E8168C8DEF6B595F7E32CE6EDD833
-976F27556545C800B400F31173570A54E824CA84093346AD43761204C2647F8A105A5646E7A5A4
-0697BEFB5B5E50355A84B9F0AAE34EDDC377F3AB3A6D922E2BCE9CD5420219D0D5DF8B1D26A719
-2E20D7A1CEAA433F058E34879748CF4CBC1E6A6725102D3375EF3D6785A753F73E92F78590015C
-2B3EB46F173A4CAD6E397DB0C30BE0EE57DBF27622A21E6C465C5EEC4B07112FC2D3259214E034
-229E2CAB1076CFA2CFBD0902CCDC5492A3B4C3233CD4FE6786077898E47411256FED19766B5C12
-2EDAF0206AF06CF8158A38BA554C1F1024D781BACABCDA739C87ECAFA132301160822F3C58C3A4
-B760464A89D990AE9CCEA67D3A5406355E5339F699AC6A775F15172914E55E2C8F8BB2EAF2FDA7
-E7D78411DAFE61A15B9858E980183C13F082C69D4E996DC59D5BC53AE66C50B2713510A5346FCE
-DC3A53FF738B3AB8F6E7F12DCE034394CE40490D95FD9F5F484B4E965B1A39996E3F0DD6E5FA6B
-5C238E858B92EB4E9F4FA3310F5E5135E75A7806613414C6EB5191645FDDDE7DA90936E1D4AD4B
-B096E47A5575094AACEDF7A8AE46C1572BF6C273CDC7DCD2E9845AFB9E5531E91C21BA0FD3AFF5
-02155654713ED807AF7D55EF534CAE7456FA608A3C270018A85D80522EEED986BAB71CA2FF56F7
-A5B1DD9205489BD0E19C14C585F56622EFA9DDACDF3D1C956B2BFA7469EB513998DD71B0C8745F
-F8665F2926825FE1
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-cleartomark
-%%EndProcSet
-%%BeginProcSet: ppcodbol.pfa
-
-
-
-% Generated by Fontographer 3.5
-
-% Copyright (c) 1987 Adobe Systems Incorporated.
-
-% ADL: 712 288 0
-
-
-%FontDirectory/PPCodeBold known{/PPCodeBold findfont dup/UniqueID known{dup
-
-%/UniqueID get 4303737 eq exch/FontType get 1 eq and}{pop false}ifelse
-
-%{save true}{false}ifelse}{false}ifelse
-
-17 dict begin
-
-/FontInfo 13 dict dup begin
-
- /version(001.000)readonly def
-
- /Notice(Copyright (c) 1987 Adobe Systems Incorporated.)readonly def
-
- /FullName(PPCodeBold)readonly def
-
- /FamilyName(P)readonly def
-
- /Weight(Bold)readonly def
-
- /isFixedPitch false def
-
- /ItalicAngle 0 def
-
- /UnderlinePosition -90 def
-
- /UnderlineThickness 36 def
-
-end readonly def
-
-/FontName /PPCodeBold def
-
-/Encoding StandardEncoding def
-
-/PaintType 0 def
-
-/FontType 1 def
-
-/StrokeWidth 0 def
-
-/FontMatrix[0.001 0 0 0.001 0 0]readonly def
-
-/UniqueID 4303737 def
-
-/FontBBox{-28 -288 631 1046}readonly def
-
-currentdict end
-
-currentfile eexec
-
-D9D66F633B846A97B686A97E45A3D0AA0525392EECAC163E584A9104D99AD0BC1B1F3F7121D1D0
-
-F2C60DD206B0D3C8C450620B47320CA0AEB8937511E456AADE8E66B301B1E3E9DFE17E2F79ECFE
-
-A709FF3DAE19B4C169DF6773EDA414D02915A6F0FAF8B24FBB0777C697BE8A37D63A390AD9DAE4
-
-95BB7E626721FF2FD3FB147C80D22BEAC37C2624D818D58C8DF0209F5CE76ACDDE57A303D9042B
-
-F0A674D095697F925F532D1814BEA8F8A5B5223A32BC4A95402F2C843181776EA6DD8FF9EE5F34
-
-89051FE34AE898ACF3201433CCCE8B93D5627B76114F999C81A0C554599F115C89AFA9221F963B
-
-6A2DA89342621244ABEB0E794C885F335E4EF8188C4B15B1E6630A405DA50578DDB37C96B3C8A5
-
-6A7F70B55BC23606EC03C231B2380A83E0F0467A4C6F858A0548AC5AAC2F1117E7A4EA7A8C52D2
-
-01B33626C2BEBCCA6DD9211D6C88F609BF2C6B133E55FCE6D8860090AFB3C065835D7B4F34AFF9
-
-D8E0F4E0841E4367FF8604092704E1E3626FE8CB4A48EB13E45CBFEECBDFCBFCBE64323566C437
-
-6AF858ACD9ACDC42A1C9285F253C3113122BC9AC460E2473581F9C1F210B6FE7B9D486E6C96BCD
-
-0CF9C52A89D2FA2D30D14D0FCC9A2470A3B91A0CAA9620CB376C417573860071332BF012305488
-
-2289CF2A52934FB7F32BCD94337AD1EFE57BEB43E4A661FF8EF5DBA38FA3C924E8517AEC114103
-
-11E79D6DF861159AC74C9620888EDA3AF4CA08A15623B5F3D1AEDA88B1BCCE8F057173C0337C67
-
-CA2A599F1F4BA039BBB26179F54A57A8797A9C4EFAC228FEDF1E2C50A951EB19770525AF2C6850
-
-5660A6C5F4E7C7AB39D5755DDDEB1BC4D04EB10CC09F907E6BFBB68807A874392E443C9867046F
-
-4B020E5D79BA450B63BDC0FB38AECDEA91251673C5327EEB74821505993A490133B73F7A4D90F9
-
-9D4B3778E50274762FD18E87F7CA1D009DBF4EA8CDFDAC1494B7E78C17B43A9DBCAEE0CD5FFBD0
-
-E0443DB5CB70E71D7C95AA35B42CF90830969A8C84802E49EDA9528B7D0FDD9175A6D41F7E3496
-
-7B2E93815955A9B14B34D2A37E6E88F80C7C11DD39ACDFB1F10A1237A0FCB1BB37221F7160ACA1
-
-9037AF794A3183554C07C03CF9DB3FACE33A2FB584A30A81578E99B6A625861D2D2957D5EB8789
-
-CD0934A41FCA23C935BDB7094848B0FBBC592067A34FB3AD564BE71D20074C2A4B624945ACFC71
-
-131694C4056E464D43E3249BA1FB106DA6E67BBC6DCF542801C73446A921ADABA4B4BCFE6368E4
-
-543739A1AB352A54F734ECD3CDDBC89F014F59682E3C521B33CA0F9FBC23758DCB3446724DC4F2
-
-45B6D123E904451D2030B0BA2FCBB3E58711779949740AED1F2E2B36C78EBBCCFBCBB6FA25EFDD
-
-0A9CA000C67D6BE7B0B3618E10ECF1FA5279A7D16462F5382AF104B5043777194F0138CF09DD2E
-
-F53D8F4735BBA9B1493FB2DEC4D33B35CF18813FF6BF9E9EE78E2AF93566F0FCBF4D6BFA7CA307
-
-E7B29BAF1B4F4743B14074BF91055E3FF84C3AF83C6642271BAD1430C7AFB976832E88471FCD13
-
-ACFD0E867F5BFCE3CEEDBE63EA33A440B1A28111E39EBED5D08BC3957C95C33C2F3BA027005CD6
-
-FDE60CC4471657FF6FADD89450AAB5DC9668195FB9D8F7510F13CC8EEDAA6D0915898CC619DCDE
-
-8BAFD257D6B74F1ECC62599FF345702AEC4EE7BA242C73CF8A361C72595F6824240DB10F50A8A1
-
-2E605636FDD4DEC8C7F7247E1924DD13FE0953677E86CFCB8A10F15E60C79DA019FFE0F748497F
-
-8D7D92B07FD2946BF908AF2B6CA40285C966D7767A14FF85E7F43B49E0F8EE1DA6B4E666347026
-
-4743E0AC871379CF8A079EDC65C1D84896329990B60D9A33C724E01756DDBD8B9906AD18D1E11A
-
-095085675AF9723C0DE46F78E04790916CA89B4DD5EA57619B59E71BA530B694598648D332FC78
-
-EDB34358805B64DF60C5D47AB82F3AC87B5385C39116B03017C3E4BB4556B96DE5F266B379EC69
-
-9F4FC8A9F854C41E8BB03C9BD7C003883A90226992C67B2D02DBA92242B94D21566C83FAC1B4C1
-
-2ADE6FFAA049BF6805AE76A6A6ED48144DACABDC8D2F35CB5C08158A73A0A1006667738CC471E8
-
-29D9487E22DFEC30DB6DD281931E9BE9C84859D6FA932A76F9D85A1E99AFB5F5905BFED6FFD762
-
-5654649757EB640B5B3C0D18019BECD629162091B69154DC0BDA1D08F0727AC851BB43503EE396
-
-D3682541A730EE450C30F663187C3B5004D24173F962CFEA8E04F5DD664D5F6DD515224F7E256A
-
-4EA07B5CA823456D75708998097267BE5D77D20E71BBA0BEA3F327865A7A0C5746289AA653EE2D
-
-2157C2AF3330A45557F5F825A8D75284FC69BC15E1F73AC0F5A11B26D47210D195F557B265E9E3
-
-0F6AC77C5D3AB084743E6B758365757B81D430549EF513E79AEBBA539A745F24D48AE8E728F028
-
-4DF28984F5DB1203F0BD66628756565393F1629191C50347C0A48205DD807B0E6CFD353E22BA43
-
-1CC6ACD8C6B4E97D691F743DAC69CD0881AA81CB3A48A08CAF9C32E4400A77F94A52F9AB18B4EC
-
-ADCA4F073DA5B3BF4079E0125B3064685FB783E1565D4A7779290BAA734052AE798F5CD75C9127
-
-B338A49E2CDFFD9F0A429F662D170AA8851250713E3D19928D974B9A7CE6987DCCB07A53ACC32F
-
-D217991C80C5834BBAA796A7F9B206368542218701D93279E1E197D68CB0FD0313D7672A1327F7
-
-06250FEA4DD4C623CD568F1F6BA0468D5C98B4E9C963E9E9B21BE58922750A5076449C8B9DAEA2
-
-1C46E2384EF871C9456ECC739C1B3CCB5A85CDB66E90108C860B180EC7D4DD769214FA963F26AC
-
-66E28EF2DA1CDE21B3EF93714E42E7AAD53346F23EE3985B1A3F871D49CD56A0F041FD19A4688B
-
-5C18B14C93AC2D30E55B902ACC35DE79C6B3D3BC8DF6EC35570AF34D3472C24EECB4C07AD7DEEC
-
-6429F96942BFACA4B7CFDBBCEE6FCB8D5B542E289599F9FE1C2FE2B1E0E18F135722CB2118933D
-
-7743673DD8ADA0AEAFC20C36E0157B724771B00DC2FCD821C26EADF429ECF0A24CE808ED06CB80
-
-EDDFFDD8300AC5FEB7C1B7CB59054D1A4F04267EFF030E171533ACEA869E8E93792D339FA96C6D
-
-648A9D4CC88C7D0C1B036DA7D452007A50EC5F0CF8F4C622C7078CFA3CF4BA424A63906BD510E0
-
-A580C22AA1F0279F9BE03B7E1B6C714ABFA2FDF4EC8E14714970FAF1BCA49C71C91C46B2F31A8B
-
-C338180AFFE97E0A4FA6BC9FE4750A84620E2CF23AABC6CDC4097140480D2A09C231BD32738D57
-
-26BF12435640C3978CD4C855484D6CCA4482834FD761EA4153B1984D0578B776CDB21D48918012
-
-86B6466492608DE797A7B951A979A2DCBEFFD69297C46F2B372F8ED2CCAE9372BD4AF6455DA71C
-
-65FFAEA6E84523ED098DC49D560C5D6B60BD5C19F0E61BE5F7859665295150E152FC3E885800D8
-
-C832757ED77F7C53B30FD7EFB7C2258DF6EF3AFE23109D7A342F9B348FD6F36EF63C9571A96F6F
-
-8DDA17837E72A6FE0598FFB8E0D5C220DA3D3938510923C93DB72B25726A57885D418E8D6C049A
-
-F6EDE3A1DFCA9B10B28EF6F1D077D4B375D9CB33CCABDBE849FCC158E603ECBE7A90622598C99E
-
-88B32C2DD4DE614CCFBCFD9C2726DC3B26544A3989F1E47398FA46ED9378FB048ADE2A5E4D3620
-
-708AE4B210FB4D97D3D6FA9FA4403515584D86F7C3CBF2F743CF2A63201ACD67E589B6F54BB05A
-
-4EB85B91328B9F2375E571622742681DB4F9447A2E0FBC4B4CB51FD7F8BDE4AD2D5278A472D2BD
-
-B5D88B77982B01786C035B57F85E89DE40E6368728B7283F542F3A93D3F5A7B1F6C982BB43A5B2
-
-FDEEF5BD8C61831865349BD6D41EB3D2B0F94CD10E6D75C370667831119311B9888D0BE9E84BE0
-
-F180960AFDFC65AFADCA3A9C145695CDF8C8AF9150B7BE09E5C0EE64FA511B2C8C6F5C1B206297
-
-E3C7C9733875DD3976A6D7A2CFFA5CAE810C02FCBF2349D346370B5C95F00FC99A7FBC91083A6E
-
-4901E21F99159BCD464196651D39E6209557B52F604FA6144437DACC5DCB92FE8F81913B2EE3F6
-
-B4206E0DA6A01F381D34242902678BC68F4D8B1AE7FA11A799D06C72A376197DB2527F45E2A1D8
-
-50D47D835CEC8F963A6FF0A80778E46917E6DCDD841DDE904E3FA961EDFB8E6A5B7B47275581D4
-
-1EEC0452DB032189B0F40207B11607D1427D50211D76966122832C980F9B9715DF2A25DB8B7940
-
-9783565A3A325C5CA68A248E7148944844EE8A2CDB2ACF7D8A462775555E348914DF3238F0EEA0
-
-657623EE65C29B7AD07C8B6413F78A0A4E9FC5307E427305C95FEF098E53E308703D757F37F193
-
-7489AD1131582087D24BFF50A916A0F8E6E71C335E50B31650CB2FE42388473C55213346737CF0
-
-A5D880D0A56E3E19B753411E92045A0E5C0073F378E9002DDBE0B10EE177F32FD9871B98E023E4
-
-3AA3666F4594591F6AAD8C3FFD37804A451F21C86E794E657FF50F549B9F32E4B0281C36ADEA91
-
-854944606176A6B3B7C55DBCB560D82D57D0AC1341F03240AC56A15D878EDC113A61277C4DFE71
-
-DB85C6D82658105052EF0EC3AF873F5F0D1881B97CAF0CE52167C819FE01E00DE7B448887A30DE
-
-453A38BFE37CFCCA4F41E7EEA5A415F33052FEE64F7D2108C09F79E97DBA6998A3E3D5DC37A352
-
-9333CFB254FBCB62F90A0A80BDB3606FD94A5D69A32A5EA004E94E45976A514BBCAC041DCCD593
-
-CA673BC3EE1B8E4F904C3BBA2E19E1B55518C7D69B662C115859D51137FBF2D3DC019A8CD6E6A0
-
-C14E4311B15FA670091B9CF8ABB1C196B4E0FC824BC2EBA76C62A23FE8C8A38D313F992FFAAB30
-
-594798EE9C5C216D6E95411A825FA4F29AE05E0D883C07D24C4F5108839F131395731DF39486CF
-
-4D8D668B85F7A55DF83F5ED35F9B494B0989878C33A0817B8C7537388C5C6A658014866EC07D54
-
-C89A80AF83A7C4DA21DE447206DD4C2F21A39C8CDDCF3B58A332805714F82B1E966180F5ECA958
-
-27ACDC40A4A6EC8FD9BB024D3068C94FEF25E4D6337E40D2A002494EEDC7905E6BAE38426B344F
-
-5B36EDE8FFE894652422B11A320285916F4EE5D61E5EC9869D49729A0CAB13873BB3E0F20FA518
-
-B812E5D24A641796E38A1766D805A89D9D9FB642143C377B365EC45BA6C193B3124C069C525517
-
-6F35EC85546C1933F25B093DD56C78AD86E502A235D2773ABE3B7BD49E3DC78A6AECF20CE9DA4C
-
-87AD7C7E75BB4AAB78797EB93819A5C8DE68638EFF281B141662A463135DDA0D2D236DF0EEB709
-
-AAD9A549CABBCAC4E577B1955BDD8BEB42650780CE2B1EAA47C35993E1E1F05051145A94C89D2F
-
-4162BFE23A2C91B7844885AD346BB88E9C9F8FAEDD20B6D6E54A9FCFE3C185401EFE58F29CD4AF
-
-8D9DEA6EBFF427E9AE18DDD3D1BFFE2A17A7137B596E239B7426CE38B5C48C81D17FF85462B648
-
-70A3A7C9F2F3AEE9884D03CDF387F90C5CDB807E222A744A617317038707BF3130ECAE267926D1
-
-52154FB423E2FCFC438AB660738148882BC686DB56C50D092D60428D9B0371704D3FB8FBE75D56
-
-9E22B0E9D767A5A8EB7702C34F7320C30FF142DCEB9D9157678645C51391647F9F7329B39C2432
-
-00A8D0527940F8DA37A300C0182CF76F3220B1E62EAC18E8FE0A8C93A0A5A373386E38093B81BD
-
-3EC3CFD5BF2E88C51321D4540733173592661D85F1AFD04739543C397E368C73500456264B2625
-
-37B8EA6D147D264E48E65FC6694D277E5970B0FB471D76280A74008B10CC5A216ED07F21A24BD5
-
-DBCEA5A4E0ADA483F04ACD7697AB7A0A901C0192581D4FABBC24489E3CF535737040B0C15BF2CA
-
-997026FCC37E36088D513CC20B68C8D8709E5D5811B5C510D6193A81323A271620D239CFA32F96
-
-3AF5F3B5857AC680D1491DE3F22A8BBD2952EEE5B49637F24BDE92B5A994CF5E0271CA9ADB47F5
-
-C298A391BFCB60C630312AE893AC48F202568DE1B43DD986A38A0F478AE6465F83B0FD3ABD7FFE
-
-3EE06BF88D5016BEE2E90D4238722A604448708748D608295E3B435BF2B47C91FEF385F2731E95
-
-1F73FABCC88CEB8BA48A087BEA2DFFA9301B60C4AB426BDC104A2411ED838085FC06CE3E4E6906
-
-4D7EF3F301DD3CA3EAEF498E6A7B4B1A36E9790E7F69ECD5E8967050835CE779E3B44014C27AC0
-
-456A96B9E28C71F30031B49FB00DA195A32C4175B6BFB279FE435EE92D4FD5963E42FE99D95438
-
-7400706C17567B1FB65C4E90AAC10CA628032E0493A971BD55D83E1AD70B240BFB6EEDDD625D4E
-
-4CD6D4895668B1446DDD235E8DE44B694F3F93AAC2BC0D04C871FFBF5DBA1C7EEE0BF66C949A58
-
-B16F55497E82ACD40BE356CAD3EBD707C0020ACD410DC6FFC7CC460525C2001A0B4A8B7B114932
-
-3A65FB65BB7C20CBA305E53A312E9719A15C45C39C85A4F1F008C361B1757DC0BD8C10204B0218
-
-AEAE29D3FC55C12E9985EF36A45046F46606924636F7F76480FEF7F8D264C73266C05A6DE699B2
-
-37F6C1DF777306BEF1E0AC48A6B1548ED41B7EDCE706CC8A66B3D9437210C9FCFAC978C8F9FEEB
-
-8E220D024C04DAC2CE62DC8AFBE7AD4540B5ED3668E7B59FBA28A7F8D822DBEF84DFDB72566EC5
-
-D6223A165959443A2F980F6D16C8187AD321C27AACF884336F7D8154D06FA46E3FF51D2DC26313
-
-FA812F9F1507FD75B80411DEF69FE268B9A4587195E45B1FEACB0295C63BA8A4CFD47E7C711511
-
-AEB00E93C0B359EA0DFDAFF5DFC0854E2FC63AEFD37DF473859C040D6E8D82F640C1815D3F9A53
-
-AB3E1D5E1F0B0E125510F2C6D503C4CA518BD36892B83AD31B3734804F72600562F9246FA2B5B8
-
-56BD55212CA27D700A7913AF505BBEB9BC3B2EEC13D7289997ABEC078808C79F65939B07A2619C
-
-0EFDE6FF7BAEAEBB3A4A321846F639A7096E4F7688E523DA1901EA3FFB6A71110B6CA2C45D1FC5
-
-49AC32F03FA5AA7915EF43770A13AA68C43F4FA3DED55D2940F76648076D955B509217254128F7
-
-46C3A2AC47D683FBFBE12057454435941CDE662220AA7B356E4718D591B81A06C04DCA83A814E5
-
-AFBBB758EDF1E8DF1BF622D4E4BB637E017E4E66F6067CEF0650EED31BCBDC6947DADB3982329D
-
-E902E52062CEDBEB77715735E698E40448FEC00842BAE3BAA207D2B28ED3BFE1C1FE428439470F
-
-4E1D8358E35E4B97D61EC6A128B4383EA0276A947BC9D16794C3A3D7DB0BB59FF649875E0AFA43
-
-E6586F8B4CA921C1AAFC0E2D1C970B380977CBA505B3D531F3789282E21D1B5D9D3376EAD7E4E4
-
-00085C47CB858DA960B55BEA07E0B012BE3F5620DBA167C105B95FF9B5FDD28D5354C877E56710
-
-1D45F9AA471D27183A55AB9B34D626815D32CD824A4C46772D8FC4931341E227309E8307835FD2
-
-5359A10F84AD5744B8181DAD59176B6B466595B42331683F57546ACA60106654C9A1E5F1BD47DA
-
-F9F93598E75CF032198D69A1C4B152A29586209903C7BF126BDEE5A3806BA1766BB02F5D75E33D
-
-B2B011106FC3C964F8FAA9E9857BCAF903463FA7FC37294E4F0FF98BEA22FB44F7AE5E6789658B
-
-BAB5C30D6C32D5E24E268B54353D1245ED78D1D7385EBEEA49ECE496A4261F992F67B664776D6E
-
-CA1C8352499BF3CEEF365E152582F98590B8D903867B6557200B1070D91EA32EFDAB0580559EB5
-
-56A835F74BF458693F093389EE1D1B1FC1BD2AC1146EA9C5E4B14BF26AB3EFA0BA0AA1813E6C61
-
-B7011AC330B293A5CCDDB41412F97BA02D38E502D596912D165F6B0300228891210DB700E975BB
-
-47427388D5F3246D80CB9703FE5F2B2CD40873AE0521850D4D656174B52F24C06AF1D9FE4ABBF9
-
-8B432B6150B0725E328E54BE382A16D5DF6C47D9DD14751B96E2DBCAF4C9858336F527238E263C
-
-58730C7E27DA1B21AADBB48154CE5E9C92660394D7282FC07917C91D0E91DAE3FF7DECFD5E8082
-
-563E1673A15CFC069E08D554E3B8DF570209D567C65F3D26F251B405FAE5F6106637728BDEF735
-
-EC2D5E7AA3F00434EB58C3307D221C12FEF6D741ED87081DD6B93D2E9282D09A7262EFFCCAFFDE
-
-CEE8C4E942AFFD8215B84FA57D41F5815F3A3191BC379EDC454252E688EB9788A551A17876AF1B
-
-0A5ED5A62E92E7DE332ED89A9B4F406552F9B706A6FAD59A433F72AB6D4401E25CC37C0FF91713
-
-4C838E5CB3CD5AEB8556443B1BF513900F293B9BCF33F96608D1B108CF9BC7DE95F4B518A86987
-
-28F20729D60E75E53476868220B64E905BBFBE8E26808EAEB0A46A1E096EF868EE4410EBC87D36
-
-46037AFC6D177F42F8DAB8D5C88200AEA14388AF09EAF5CA24D72A172D654BE198CB426949C4E3
-
-D23C7D49F4AEE4D20124B5830480D0A8CD0F7EFCA3FD251C609D124D0BB4E7A6CE89EA7C92E0E7
-
-B9CB870E127E0337A2E645AEC27D1B0D85C57D27F0F7AA1E849CF1F4E9BDF02297C3E61290010D
-
-4EB0F30697D30ECCD1EDE1766BC137F2E2A3D7CED25B1BA259D100BA16AC3D29C01DF83DFE5B24
-
-DCC9FFC2B80F61E91D2E41560241C00E79DA970A09D8AA229CC2F5C114E0713EAAB560442CCE73
-
-993EB9882E7C0292F248C00717E3A1DA46ABF3FC716226EAAE35E8F20726B1A045A20F80B02473
-
-8B7B93D0E79C6FA11780A6C94E64DE53FEAE019E4D838607A05C7746A3385C9728CA29D8F64373
-
-B25307272A77028815D80451061B010EC8E82B0B70243F66B97ABED264F7B53B163DE8204796BC
-
-C593CA9BE3F43E26713DCBD9E3449FD300F6111A50EDD2F9CCBC6D0012A973B5F6A1651074FD14
-
-76BF69456870C5228599FE7CC0959F6804497A28E3AAB129024816FBD3C0101A9B709DDE0A92AB
-
-F0B2948E096624D067F17A8CF2E8251A40969E857D86739883B6B46967EAC2286BD451F26B4A16
-
-026FC5F3A087F4BE21A90D336B69C5117F3AD532AF6E3FE9C8A484D372A1C8C1A342264D3C3782
-
-4F3B582D2885642D2B3442121A7F3BFCBCA35D09DAFC4B8AA8BA4E0C1139E3F29ABEDEA82732D6
-
-3810F7FB2A462E11A32DF2E74904AC7C5704C545FD6D08D6D1F6F07C69BD5418E82F6B33C36A99
-
-5044BA660ADDEB24C7AD10889CB785169960F8E6EEE9A321BAA78794AF0860DB5270193CDC9C0D
-
-5DAC45A1E67FD6063A1998D0624A5DDDEBADC8C42318929535A693677673B24CD2CD2869148DBA
-
-C1EA486DEB1B0D83E7785F1E1EE65B9AE3C839C7427108C13C4B7F657BA9669D1FD3E3BE5FEE50
-
-AA20946EE173BDC0A9B940744AEEA3847D56DE7E86ADDD6F63000CB048407070AF65E4BC097347
-
-CD82F6084D20C529E35490492E5293F97554F9979405CC6FF7F801CC3DEA50DAF9BFEFE8623B2C
-
-8C7560766C4115EEFA40BF980647F6D3187A689294060DFC214E22441044CBFBB2B6274EDD44F5
-
-218057869A46C517138E4F848DAD69F24208896C8DF860F0FF71EF89310F2D82EB7ACE6A72928B
-
-07CC57A2DF6443761D91283B59BD006650CDFDCEF8BD64A0F626CEAD770572D489E916AFA1AC26
-
-8F6D22F3F37B63928472B81EBD287F6619900AB5B291A047906AAEE2CD93F7FDBF1658DFEB8D8C
-
-D7EF987D0D1235FF8DF202F9E83AD154500909996FEDECDE0EBB2F95F69805EF1F774D4D143AAE
-
-9A50B64BD514D83D00F05715F163BC7F64B90663C5971D6A5393C1D6011978EEFFD57A7B93FA57
-
-E6CE1CBBA31DD510696A344EBDFACDB87AFDB6F425BCC13AD245E9264467960F951AD797AE9D9E
-
-631265ED0F12D4ABB0F6189FD9433A236F00D01FA038D5BCFB3DF68397610708A777FC3021B685
-
-448445D326EA7649406A88DA392857FEA6156684E3547E8C757BC38223C0CA2569BE438D03B575
-
-70E815D58BD82C2EEC861020C1DBF073EFD9C8136ABF263461D3AF77D057F50214904DDE51C3A0
-
-61A3A1E1CFE413E9A148F05A8108608EF7FDB96F392E74EEBC5A4D354BA2AE5678D28AEC014979
-
-128630984EF3D5586DB8783F0603D7210782DE979C07BE8DD589C710DD44394569B8BDE770BD90
-
-35FAF3CFA48070C5CDC8CBEA2B5AB2620D4C40818AD740966B733B99E8CBAB4909F5EF5B5575ED
-
-0A8CE4635FBE9D69E57999B2739F281CA4BEED6FF2948B8670446BBB30D0BA6679AA38C2DA2A30
-
-960687F2DCF0C741539102968C8D6582E55974811630B0FD2091B63477747F45CA0ADC23221AB4
-
-C2E94EDAD6F862119F127A79A2BC073254E941B37B830E5FB504B26E580320DCFD5B2D03A5A6BE
-
-3C9350031D7A58F7B351A9F917ADEFA72D81490B325C4C1E39175D1D3F7394A009D04A7B706E1D
-
-3B6F61BEA096CF4DC50E4C72999667EEC869125B3EB152E3E7240968F9B93BDC91CC5E62654D7B
-
-46E2E60A4D2260322B563C543D9E171D5F1E816E73222709A1E2F14112209089554DDEE17CCB1C
-
-F066D0AA1387524FC4B2BB47071407428903A1B9721D6CE4046EC2FE43B9CD9409BAC41B76A27B
-
-8D4CF3DA42F9DD8A8A751DAD103F169A1524D0780022F764C49FE9B44AF80FABFE48BFE40D62D4
-
-1AA0618245AD7BFAD7C105A3C064493B109F765EB06BFF5C1C8138296C635AD6258FB0894C2DDD
-
-BD37C46FD22311D265AE50CF391C85F6ADF59181EEAB5B65D1F81149AA5425B1C11A432032CAA0
-
-3EB2FA8204E9BB6736998DE9B12E9E37EC651560F4E906B342A725E21021B82B84249D5C0F6D96
-
-33C4196279E569DB16585843D65FAD0B5D893BB0A9D381324F76B61DA88DB8188E59C4BA15EE5F
-
-B2892E7260F9EA9861E44921ECC1A27D79B25050615852C838BC3BDB4D9A3B81AB2DFE7667E2AB
-
-0592E4D8AC4172031E12760F14AE1C058F986A22699E024E6C6CB50A43066F1A0304AA67AC44CB
-
-379814C791103B6C2D4C1439FC3046B611F6326A5BBE697384A976D0D01815B933EB4734966D07
-
-E1D509471BFAEEFBD3F9689EAF82B0E9AADC2368AE52AA48F0318AA1BCC81C3F2B89D48C08A1F9
-
-BA4D7CE86C5E913A87A0563D7790C471DD47CBDB273AA37CD4DE6BFDBA407483DE275FF57FAF93
-
-22591A8523E77A3343CB6100AFB6035223E05EF3530313885FFC63A8D72DE099C50A774A603098
-
-59EDCB3C4E424C9073E0B5B32D988FAD04EB486E65A3EA7FF7DB3D2FDFABBC92DF6C742EB6F09D
-
-2A78387DC0CA8561743CB9C8AD949472DAEC66ACADD435C818D28127770A8DA2A5090CECCBE16A
-
-516D7985D7A49C7EE9D08854435008ADF25041E8BA5744591AB7E22D3705EACBD1D9C6378F172D
-
-B82B2C7BC51293F40064306F69103E6A0BC1C1046C2A0AFA2E038550C194354EB8E263085E5390
-
-749E2C98F43EA68D466E40C5FEFE6764939CFF817814B85BA928C5859D20709D78CD50B957E809
-
-0F37CAE36B181C37E80E9E8690D2B9F0C34D204B8E4A5A164CAF2FA4FC6ADCD77509EAA5236233
-
-6E9DBFD1FDA1CF32A9E980DCBF4B7C338CD18399ACE5108435767FEA8414585DE7C3E08590B37C
-
-CA0318A82C69ADDFCEAE156E5D1FE3EF9526515FEFF356E0351CDD1D3AD340E7727A478264DF2D
-
-491259F05A6504093949502E8D10250556B87ACBCA7EB938C62BE0D0DDA4D02A93E18769B895C0
-
-4E5FC1B229FF4A3D7070A0856290BBFF3460C5E1AF92346E7879F27DCCD8A5338791656C376128
-
-421DA4B07A5F96160F0421AE10C1F1675D396A80635B7CD1BFA4CC564263DA5C0C84F3787DC8D0
-
-8ACAEDE11486C155BB1B16806303B9D21974CA19516C63402A8F0067CEDAF682EB2A2127348DBB
-
-5A662B5E87A5375B396B1153B843303501ED93534DF7C7FCA09EFB0261311155FCBA2EA97668A4
-
-65A7751F91BCA566E4946565BA1D664CD8FED19E84E7563205DD7AF77E2A4CBC6846EF5ADBD11F
-
-1958E086FD7673D5AC997867EB0217314F32D60342FAAFFFF957F60D9B0AC57E611137AC695DEF
-
-E313BEB5334B838F83A54C3ED76AC55C67571F367A409DA052A0354837BDEE4D11B426DC9DCC74
-
-61A6F422B95DF3894A002B02BDDFE3FEBA8D8E3BB7556F501A83A10FB0137F428FC522260E0A4B
-
-1655399490DA83CCEACED148AF1F447C9BBFE3B159399C82EAB257BE568A4DAD68A664D7397342
-
-AAE7D38223CD9AEFCFE5E399F1D70404D470A1CE10D46CAFF5D522352C50DB8FABD7348FC6CEC8
-
-34D5A82C04DDA105F85F450E7363E4E989C6725E6BBCF7AA6680C97D128FAAF4D6E3859F03B0F5
-
-A3A8A70E0C9DAEE84BB95F41931A30AA18D6C51D9DD3D3B0ADC7D0B5FF0D0A889A944C4468F96B
-
-9E59515BBA5C86BDC5394BC40B80CBDA19857E9DFF41E75802D2A2C0247122CE94A7D5DD8F5846
-
-27ACA0BE5C042A02FB7362C34614BCD17350AFB1F0EFDB09AE2F1C37FF21E007CD4DF1729AD932
-
-FA20A8F85C06201F9623D959B9E4A90CD04B6E4AE2C1795828B022D990D939D5D1992CB2DB807D
-
-072CEE580FA9A79F07FD6C4980C997EC524B57B350DCE4F9013B5BB07165DD6FA1902868328FA8
-
-0D3CD770B783818DE508E59383C96A05FBBA840831E129F0DBDD7B4AB05801E99E968EEB7A0106
-
-5AF04F11C641CADBE745EB6EA76CEE1AA8524E405F23A9D0683974A78879299600BDD0924FBF18
-
-908625872A63C38B4DDBBC8C764EBD99F0877FADB59B5F1D4FD9FD2FC1FC8C4F068B7B21B3787F
-
-728CD8CF5F52CE4A760746241C4A696F6BDBAD58A4D35041D744FBABDA2F883CB475E5F75D1ECB
-
-9056C3E52878FA0DDDAA30357906543F8440D1FEBC000297676E3C5AD462F825F1D302A2C7021D
-
-5A62595363A791A8EDBB22EDB9DB968BA0EEB4DF66E4622A04EB9FDB041DFB527CD404D62E4898
-
-D5E7ED464B0C24D58DAFCA7E891481363761D803A9457B7A2403E1816FC67167571D44E27469E7
-
-B1BC3AB85CAF808BB4043537D1B80CC490970D87A20857D868CBE901076419436A4E3C95C7C9B6
-
-0E3CEAC7DB19859EDE149FF3F07BA586BE12698F5C0CC9815FF2A6C62F7DD98DAC639084CA7003
-
-C99B9196CE6A6DC59CA0B202C9AF54620E38A0712AAC6E01D2711D40D012F15DCC51647721D4F7
-
-F31E29E6CD7EBB59842B01BFF8C7C424F0E58D4FD15D56DAE60A6450AF2254D368CCD09CC3FA90
-
-123C44ED4DDCD7F09D46C1354E5FC1A6C1901EFBDFBD4D6AD80EE95EA1B726B2309C0720424CD2
-
-5F72D9E5BF38B51271FD23EEA93013114B356370A3C9D438EBFA0590158654E2A3B7D4C887921C
-
-F6538D1BB294CBAC75CA66CCDDF0B7F7DF1748942A908C07EA13E6B809B1350B9D73CECADC98FA
-
-35933A81A34B7A6F8EDC7DC2AF60B2F0632962B401AAFE06CBC8EA4DC636406F2CED5FAE7AD0D9
-
-ED5023813855A83119423E4A114B413C3A016969A7481CE45E4E061ED9980FD961404B895D5A7E
-
-167B4D32E153DC778FCF5DA5EDEDF68D5707671B23DF2871C63FDBD6F9B9BCA9E7BB776B37107C
-
-38484453F24B4A3421A21D8797DB822236CA1A15D8719726C59D51F7332259E7CF23F28F1D903F
-
-100F9B0E8D8DE56CA3A99CA5B40D0622CC4D5AE6BA77112CEA79B10D0D5A808DA20D76B56FC499
-
-206587F6A0EBECA10AF73F8E091D82622BFABC52A28DCC8C295A24041869E6363CF589670D3471
-
-1F3BE64D02C861059FA9D10081FD2A0EA137C39ACFB2A83DCC9486195E40E99C0F28418B2C29C2
-
-9C01A8CE4D98F29A22E58CAA51E9ECAF4CA85FB59E18C2E53873A642E31BE8E47591DA6EC6D7C4
-
-E13055B8D08D6D1F0608A1080A38831280C98D7D47CFEBD3258432AC396BBF95B77E9470BA4B6C
-
-9A052CC8EBD7277C3B78514BDC491570B7D7B473C15CCEECB4D312C775BD8D99E46EBECF6C3533
-
-FFFD3E5BEF8D7B9424447999A91CE1880918D750EA345E6A10771DBEBDB1B4CCCE1474C07A9C4E
-
-A894017BC593024CC16B595DBC835F4EE8D9ADF7FE8671E0BDF36613FE7844C598A789CA784B9C
-
-97AD2361D7CDCB2E9BD45032A38D6B0EFDFC8F67FED8EB3CDE280D81C6DC9348BD48CC580D2958
-
-5658ACD4C3DBF2D7D85A78BCE9512D7F7BC2EDF7B76699545F3B1BCC202F53C8123B15F46D8F88
-
-1070F1232CC8FD212F15785FECFC6B83C0F439716A859B64239C1FA880D32F62376EEB12EC6C00
-
-235C9D550AFE84C981329B4B3DF17BC0E57E72D89058D1D3E6EDA91ECFEC0ECF0B802D41B4AFCC
-
-8DD250C13AECEDEAA1A0A6EE26F3351572849FF5E637A898D7B0A099D87012E274396A27E29A21
-
-DB29584ED72FB614A317E47C6177A9FBB2E5320BCD90CC086B7DCDE6ECEE01F597738AADDC7D9D
-
-33B02A09CECA2A389F16AADCD2FB02EF257BAB1265ECD97E25F0DE1C8E7526FB5F8C328FE37078
-
-A9D0F30D81B90A97A752505C8A2F8C9C7226E248AFC5B4318EB407B6A5DCE33FF5309794073737
-
-F72CB55D73FF66EE1C055B9A3E49302C11D7248F36CE257FB051674274D51CA4C0DE1F927A882D
-
-F54C567B73FF1D38556CD22716A3F269B9FDDD261FBAE4A916E0818EFA5C193AA00456DB6F7845
-
-FE41F715A8C0000E6FA8151895B3F21DD9BEF98D9CF674A60C8A1088502C6E09899D6456F4AEC9
-
-5875068E29E2199ECCB632F7A459324512A3BBE6E65132263EE3A4E2FB4205580F5DEE083FD84D
-
-48ABA8E3CFE81FB1465D3027FC69C260594ED380C47B6AE3DC2E35661906D98C0126FB7A80FA3E
-
-9A2DF727AE36048F6B083D8D8D8B1A8028B073B96CE4B5447050665BD926D5A1151F3E0CD63C60
-
-FA77FF2746D4A9E3E0F295770408CF348672EAC4772458125A8976BAC75469025B5AE8BC55540F
-
-41308CE31D273690C95D1173F05D953FBA2902E364885F821E14FB8153C749EFF100247E4AB315
-
-321D9C192E68B3FD7B51549B2224183195A549016D2A4BF943F37184743D6E5575F5A192E23290
-
-CA227E29F9BF15ABF4FAD388A9FB689A807AADD44048193B5B5B81CA9F9D7195803AE02D1A6A49
-
-00074E47313554A4F3B842F080510CE27645B65B57761A364D0F890115D8834EEBDFA247923AE1
-
-33AEDF8A46F1D1D410296E25E79C01F664136D8D219D324FA9B3349B1D5D180C025481EF9E7BF1
-
-100F242EE16EF433054913E0ECF29C4A0830E93FA9898F7B5505F87BDCC02101531C7C9C107BEB
-
-0BDECAE5A49BEB45D3BC0D869B441BB41A64A229DF5A40CF258B0178203F91318D97D529D922E8
-
-A82D36F34FFF98F0B0DC0984903B9DFE86932D96BC16C766FBAA4EE8449DD1BA7DE9ABEAD68989
-
-8BDC2155360C631458568E63B929DEF983C6E56B563394B25A44B25DFE2CBF86244D266E44B6D2
-
-DA18ACB4B2F537DB64110FC5187ECE20A514CE61209956A6555B35818E40A7036B8402C6E7F957
-
-0BA69BDDFD8CD3C77478ED8491C1B721DC66078C59097F4F328BA45D7711D5F105AB8E5C0D3C5C
-
-F88CC85A2AD9D61B39B7D5BFD41DD227E50AC8244A00D9EFD6C13679B415B0A0DAFEF87F2D0E9C
-
-E1FD835736DF865C151628CD950E7DBC216AB359D4575BC46D610D6D4A0B50351966541D60D075
-
-D98C1E28A0602F0876C3877050292E2469B66C8473420266AA8555F39F01A8C1EA343E3B42E1A8
-
-F362DEC13E6B1CA2150B54A2896D413CBABC37515587400994662F9D892B1ECC5617D309DE995B
-
-F881BB27B0D1EB7EC8318ADC767A76ECE369E01BA8DB3E4797A78FC81A0852DC3FF3758A51589D
-
-BB0C8981CBF74076E83F42109DB8E11C9FA042A13F7866D34137D02681CCC2A8A24BDA46E9DBAC
-
-BF8D771B9EFEA416168992D4A0C5489848C5FCEEB6FEED260DF9D39F576EE08492B5BE18E34D1B
-
-7C4F05A828B2A8205634428F0169B58C95D6019B899FCD1910B4518D0B62861FC1803083617858
-
-3D3273555D54206AB9624DE4658CCAF3FF2DA8DDB07A006F569F05AE0EC5E8BBA69E336B5A1BB0
-
-A62C4DEA0ACFAB694374484EB3F531805445023CCB2A58832AA92DA536F0563AFC31B0C539C566
-
-82633366B4D9DD8AFFD07071B8A172123901EE104E0A6AE2E3FE7AF22F23C3E4420F3B1C26CDFF
-
-255186F1002FA7836BD49637C480DF686F2FCE81C3CAD72EEC91046A3F2573F3A6844418FA4333
-
-96D24B40272E3B580B66EFB2ADA4DEFAB6DAD03B7C2BED09108A353FC68A77014365BCED57FB50
-
-5FC75F59C2402FDC24A886CF7B64B9FA13AB380DDA7DBF27B6B04C7FF37F61C9997B969654F75D
-
-A9929395371BFFB0D5B4FFFAC278C1E3D26E9D02C81891E8FABEFF9935FB2B6EAA225B6A223D0E
-
-D3DA70173215D25D7A3EE298AC98B9B3433A7060B52B9B1783F85E18602832228D139A86B37C3A
-
-FFE85F8552437DDEF469ACB48B86FB731379EB31940B6835CD47C640600082F3EB2E526B22F49C
-
-504721A32906DCF84888E8D0612435994D7475E23B0D6E6F829A5997812E8B53DB03116767DCC1
-
-90F373E1C58A786564AB2846C95CE3A63DA0C9BF7B5F41C2A16201E2F2232BF05E4E7015E0B898
-
-E410C7934616D499B35E96E4FB738165B8ED6708F9028114F3EFBF5B4C9288422F206AD6324AEC
-
-120A3BC0AFB1EBBA7639C8D0209DB2C432155ED7124110F3599D8E6CB9167435A06057308743D7
-
-DB1CB5CA1F1774FD4AA3BE52C7B8B04234CB4B92293DA24ACB5C03E38AD4ACF2D5BF78378A52B1
-
-D0443A548FADE2ACD6ADDCA315674D917CBFFDD48FFD4360721A9F3FA0F9F9EAF194996A33A524
-
-C8B374AACE6A364F15560886F4378F5679AF393C195C56817CFC26ADA9679180274303DDD38A41
-
-820954702774A160227CD496E147859CF2523466F8951D1BDE79AA7D21195BBEBD2DF3DBD12942
-
-2A11241FA8009F43421BF7973045343BC959CFE22530A9C3B9AE5F271BC9273756171B19885793
-
-97D4863133AF782A9B15B2714C77C6FD56077C00902C057184AD01B10B5556A6E07B6B062647AB
-
-22C783519B87E2D9A2BE689E32A95DFBD2865E585CFB0116A4110D40DAFCD0DD87709DDEC40B87
-
-4433B29CF6AA9F9406CE62FFEA07A59AFEF28E49E7BBA32C7F6066995414E9EE5E2048A298177A
-
-13DAC03E5DF94334EB6E124E86E837880746D2E63D2C49B4D0D5872991431447CE8E242A35DE34
-
-6C1D2F3DE7443EA05C2ECAE2518B883A55DDDBF53BD64A7351930C6137D351D4A88908E133A914
-
-4ED0D2001D7BF8F4CAB42242FD0B38BE90FA76816D816797A73D3B9891A0FB1950723BBCB97E15
-
-1116E7DAA5B18FED8DBBBD2FFA0B6115E256EE6755E172DE0C8F2515A494E698CCBDE81D710514
-
-AE7F732992096454BFA76172EA259DD9CB0FA5EC1BE1050C1553B34EE9C206B540DC4F53173C88
-
-B80A88B183B63949CCBCFFC64E0B9C2A9C4BC838DBD2B48AAAA1BA7B40EF4311E0AEA51E8BB2DE
-
-3508BE43E33D63D13BE33FF9546259D0EA541CDCB46321AD22773DE75726823F32EC1D37ED1122
-
-65BFBD416D0EF743B0420B73E0D73E1E8101D53E63279FBCC03B580E00066348440569704E32CF
-
-D40AED353FFC3ED3FE2D0A145867EE27FCB184E4FC03AF5F9F01767F9B2456281D326DB639BCA6
-
-6223ABA7CC63CD678F663F61B0408F1A1976EDE9F96FCCFBCB0AD29C8E27CCD81CC6C5E697B304
-
-97DD51F00F3FE7FE33F931A17FB7540263D7F749A34007D2C7CB2EE57A075C4333E2214B866661
-
-743E487ED761B8774E076ACBF9C2DE66992C70189A1EEB61B49068F413CB3851E1ED18257407B8
-
-ECB78EA381D5E423907B194E7FD9DA950C1A502A0A61ABAA12E71102792F7CF05AE65A7C631A96
-
-37679B2C4BC651E21DEF22EE339204DB722D1FDB119F9798C718E4EC9439C472D89D99612F71C9
-
-F49890C596C28BA324C5A79535AD77A5E36E1841F829DB7477CC63A944DC16DF273D376B230653
-
-C50A97F5B9590DA325210B935B68DB01B80CA6596ED2AC5BB0243FD75EF8F6891EF0A3C01EBF21
-
-FD96DAF4DAA83A5A89485490A6FC9BC693B28B0553EFFFE574A8B3C5BBEC36E657C2CDF4DF45F2
-
-47C59AB1EE5980725C51C43DC289E21FE69791D9436B49DFC122C44BE918733E70E3844CEDE633
-
-4932C5207898D707AFC2BE3AE1322CE0BC8A58F8101166B048CD6E94B392A54BA88115F08C1066
-
-4F417025B8AD2756EA62C9945999E536D1576B5E1D3327D516609D1B371A0E9B0B9FFA934B8578
-
-0D51EA2AD2AEA9FDB6419DD0485B95AF90A38B1EF5F68A1CC5C7319E4A53BD9BDD208FCD59B264
-
-BB05DF3D7E571E81547EA4815683CFF432345F717CAF3E20E627CB39B9C434F659AF97760230C8
-
-4D0C809A9F86EC721FF113D84D94FA2F37ACA9A8C4C6A2763E2F28C9A7C8220FE7F8A99209E094
-
-ED621B684B69FDA9194A7CCCD51FA49933EA157061FA23DD5FB90265E4EC9A818C1379D5E50809
-
-FC7EEE1F12D5B1DB33C6C21DF11F0D9B49A3A2D2A9F39E056B0604B6FE0FAE6F09B18F59B2C197
-
-6592E58B746D3A99AF56B1D5F2AF93A40E43CF30E1CA184D1E898C94802FF9B2365AF38D0CEDEF
-
-638B210931772BC190E4D40F4C5A1212DB95EA596DB64C7C0609C6814459DFA2286EBB5EE178FE
-
-C6AFFC3B9B520DB8DDB4EB5D4222D869799FD198C5D64E4F3887583EDFCA2B8F511F90B0D29FD0
-
-40D1427FF12F09664593E7EF1C0B426DC41061F34ECE69367F852FCD723499E564C77614CE2434
-
-5C0D41011AAE7960ADCD3E2D63EE16177D198975EF288842FA5714AFF9E533597855A0827FA444
-
-CC687E8027EC98CDB3606FEC5A045E2AC87E90EA0050768699C9598057B50310D387E91055E974
-
-AEBB7C9136C6986B279BBE5E05AA3091E97C7104E1EEB0BCE9D3448D86644340A0D11D9AC4B6CB
-
-DB4BE4D6CFF130833FAE4F03249C45298571455480603F5EFE2C1892875737ED1D561C3938689E
-
-7CB30DF5E26D479083CA61017650592ADB01BF6DD12807B65F2BEB6C8FC949AC5A1FFBE8079817
-
-934BC8897E251F4C6B27E7B6B5247F5E48C39C84AB8B70B14A868553B5F205F79B8160DEDE2172
-
-A0FF07AEF0735780736E5EBEF7E8187645578989518E1337D352BDB192AF61858778D21D7B44A9
-
-7C26F44564852788556E84D60619D1CC84E4B4A0F49CAD9B7B713930C957C632117674C503120F
-
-C564A3318560C1C57CC76F78B8E1FCA4E24EFE078FDE51A24D12CE1B799A07230441A08EACF0C7
-
-9D514169E543ADE9B97EEEFBC6C50CEA20D5AF481E8F2D5B623C444B409FCB1CAED7C3EA7754D6
-
-AD14BBE11D707D6FD3A70384E275DD06A809793B873E646BA143BE816971139F62FE007C313F7C
-
-C7370E1A3EFD18FFF7BDD8BCC1C67761A6D1EAECC7D953C58596C0B54113C8EB522FE6FD8068F0
-
-02D60C7EE92491E2F8D509A6EB872197C9FED96D963C65FC98F3DDFA3748D33A2A82C22CA4DFB7
-
-DDD49F7D622E859FE8F0DDF95144E6BBE906167CCED0D65EF05332E59D739066859809F0795E07
-
-DF9064968C5648134F527337CC5F610D5B941F0AA975F6817B920A3118EA63DE7FFF3D59BF1451
-
-E2474BFE57C94E03AC416CFDFCA559481BB587A9F8366260A884A22CE93FA8A172AB770C2DC5B0
-
-0B73C9FD9FDF5E242BA9B845FA4DB9CDCA2149A4479EA77E69E9F3742AB5711517BFCDB1B3C194
-
-7231C437D9E50C42218C3568ACD953D742D9E093DEFD04C07F2D5F151D00B1CAD086EFD5B10446
-
-748524C070123F21A09EEA839E381527DF98DE1B735C1111628A0FCD75AD863AE47A34207DF2C7
-
-8D1A50E7AF312BCC999DE49BE0F54AE7337B2B5D83C4F5507A5355C2CE2900CDE51D25A41B7407
-
-2134074708F558DDC22C14C7424A611E281413FEF9A438C8DE4BBA6BC67A6F26F0E1ED9254513D
-
-20EFE361A7426B2E9BAD4889152298ED397C6AE1B7E0AA1F93A4A717C13439B02399C773DE87E5
-
-A7ADA2B1514424939F44F114E0E663AEFFBF7BAED51670D789A671862566777C93E61E4BB5E744
-
-FBFAED947BD896DA9E1C947A1E9D328D6B2B38B23CF0ED78BFC399B9BC395F08DBF457FAB6E43E
-
-84744858F94A729DE846AA8E888C1A215C23A297C2D7A69F3C60DA53ED12FAE643A7FC15FBB680
-
-3A8ED275DB3D1E0199A71F203C8FE1F58F39289303BF7AEE928C0927EF34F1614C23C89E6FE3FB
-
-13AB6FB91EB3DC4718A8C031D3C7EC111F09AC79AE3F6245D0940A4284FACCEDA645A129A5241D
-
-91E81B627189E1809E4E4CB8690D7D16845C0E97EEFD7F88FEA959FB55F70830659CB2002C6913
-
-7870DA6E061210344B5CC6B9D03AC7B5441BDAA81C25508E3D5DD7645F7FDBE1C0E9D2360045AF
-
-2D76F46EE26CD703717A7C2E83406AF63A4378F1340357735D13B6C6A1E9437087FAE7C42E3CC5
-
-EB89EB2184DA87E6B523163D16CB221FB546C039774F1C7E4C2D19C648FF1D078691CB7A90524F
-
-AE0F1990289F3A01BE5B4BE31544102DB04EB64950A6D633E6DD1E70C1B5B50FE00D1270AF7DA1
-
-C5AE22EE0BC7D63D6ED9EDBBC2DB21A657B7C6E39284551B66E959EF624DAE21EF0598E598E5FA
-
-D8DEEE0B87AE1CA77C8902CC8927E74B0599B8DF867DDB285F30817639243DB7F97191FC15AFCD
-
-34FEF8ACFAF926AE60C13DF70ADEEE70B4D2DEF56DD6890CACA39E94CACB2E01BDCE1A29E96643
-
-CC9329028C931A5F748426032CD586E6D759033F1E46833E93EFCA0AD895CEF1311380B8782B6C
-
-15EDFFC736A939C6CA53BDF65F88484E4053B076358780D1549CD6FD0234587A4616A008E6FAA7
-
-E5D9EC458FB293B143AF0858A8532FC6B9E6F69797CC27548F1961877B9C749362C2E3BD41056B
-
-68E284267156C72A8909A86037F6A755A82DF34999C6957C415212D060C15114D5FDAFDF01B3DD
-
-563428B401E85105D7BDD9AA98E54670561354D082B5AE3C370EF9E2AB1BF8A8E3BF61B4348C0C
-
-C6AD2795B453F8F81D36DBA8847143DD955203C9A0DFA23E32EC2355AFD6678A2B05FE6E46CDAE
-
-3E8E85ADB4AB71B7F84D1266EC92A846F08170694AD6657CA47F560535D0FF5725C41CD0FB3219
-
-B9BCA5F9545658248D79896A8B5DDF1968D4D95A37ECEC7F44F2A4D6888214FB19541ADCA69F72
-
-94BEF62C0520E95CBA4A2B14D12BAD004E6468DC136C89AC5065719B9175B8A1192C83A43595B2
-
-66A196E820EAC6CA3547374FB3BF23CDF14D939B67DFC5DEA9F98D80545BF93CA67240F97A1A5B
-
-CD137F2A42BDEE7552968623E6CA659FA42EC5C2CBBEF2E2706D06E0E2CEA225482214B9B6C45D
-
-97DAF24899EE8BC6D8A980E5621075B9CE837B724340066B74C013E8AD806241DA5A18BC3E9657
-
-EFFD4A1443704B90FEAFE0A407C7C2E880FE970560BAB064935F209B1971E03C33B2B37AFB4428
-
-01A9C4D63A6A93910B607D424416620559E7B95A50E879A8A0607A2CFAB26D40858B955C8CBE4C
-
-C55B6736F20EB7439B1CB96CF00E91690659147C7D1608E5260A2E84D749D90708BFDA92BD5834
-
-FC22619A51764DB4D8CAE6463AAE80503F42CB4E7830BE796E4DCB10A1EADD636C79DD1C174C26
-
-DD44830C38E92BB25DFA70DFCBBB2D0B692D3C5917FB669BB36AB2C2C26ABF2B35C0B581F76D77
-
-64644DF89EE87862DE3D5BC1EDC74912E4F2799836023EF89E5E817DF6252B4F953DA4FD0BC02A
-
-4E22FA762048837FA8C99439BB1FCBF5E215B5B4368575E8D6769E3D01A9A252D7B20327B9B315
-
-95C01BACCB65A38FF04A5613698AF2FA63B36BC6942ED241E1ECEB7A9F2E8E381D300329CBD4E3
-
-1B19BA0AFF6415569F8774B28CF9E6D343413AA0D41DC3C3F686843BB1B7DAA242A635CF345137
-
-B3FD4B6162A9DEEA6BFF1E719DF602A8D79CD5A60BB11F26D437BE8B4A039D6C2D64ABED520C07
-
-F09E8037A8D76D7E3ABB5946D4837F1B12274D0AFAB29A44E027B2A8C81574B846A7BA94756AD8
-
-F33D2B76C79FE4D94CB3749A64ECAD8AE9D4D4EE219D5FE4524EC95CCB89BA3C73F219A88F674B
-
-2D40E2C5B4497903FAEA7BC3C7F22590F8F2D6B62151885382150E9611BBC33D9ADCE695FBF947
-
-2AF79EBEA09169FA0047E09D9499D7A977ED74E4DEE3BFEF1EFE0193AAAF9B8A2E285ACE63FCB0
-
-4DD5AA4FD311EB8005E81DF970D2C3927B9327C4093236BC98FEAC8E130001239A81C426D477C7
-
-B68AAC466820F7E655251550CC979079F3200F12B6DC35C84DC5A19EB0630BBF3CBB2539AED37F
-
-4EABC464CC5A8BFE75593C7F3AA5BEBA6CEE1AA2DC43E40AA823232D66714C058F36A012A922EB
-
-0FA0B58510C1239004B84730C1C69AEB4A38084B6E465D9EA04580B8110C9B1B023CBD1EA44753
-
-F7C87390A884BFAC825D84B93CE4AB5136264B8A1E0C3166E94E8EFA9072A10AFB760FF2265012
-
-A254F0755F81E1E42ACE3CF03D443D81F237D7DD9555F2447155DD76DC076F3BFC492392828705
-
-3EE6BE05DDFE30AF2016FEA53154ACA91A6089E9807455A536753078B7294411751450CE4ED63D
-
-0DA4C9907DA2136DE96A5289B783346CE7E6DD2C1D85395F91373C139B3CFFC5DF1A2C47F32537
-
-232691820BE497E818BCA561345707AD98249DC40062E30D647FA979EFAF4FA50AD9CC270D47ED
-
-68E1E462F54EB69E6D734C6DDB41B5C2B1D6281AD3B9F497B3B96D0C94AF938E9E785A96DE5DEE
-
-9ADFF8340600B3C173B6939B5B06B8F1341276F727EA16933151D7DA8F254786EBD6A0372B10E2
-
-79058D2327F2620B039C9453EFA9B859BB5BD459E7CCCC36B80221932668403F62BD00D1E31758
-
-E647FEC1FB816B6C52451E6FFC50EA8D52277178E3C4AF5B2A59F383B271FD132E216945B69A34
-
-B13650F5EEF129A972A695FF2BA138E10935A564AF918A66C2D51CD942DE7F843127A3DB82875F
-
-1A14662B0C3A15BE4BBE1D875F8CBE54C7488F4131074822FD47C59AA4ACF18DA9714E2619C8D1
-
-8A9EBD5098AAAA1150D83681A6E8CCB070784B128F736BFB43CAF5F239E9934878C02328BD3084
-
-CF52EEB20A26BC36E76A8DFB36C9C1397B16D16224DBB9C64ADED191E0E53C61BE7D056355F20A
-
-1AD4EE38E1EC8C1927C2CAFD36FFAC24240BF07CE01FF3B5CC5866B4A3FED0BEB8695E23C1E16D
-
-6DE2883B8A66A2400313B263EC2EE6348BE002BE0AC2B5B406E392C53FD41A144F7FF24BDE9892
-
-7AED17BDE620D5EE8F0495A9E915FC0F7FC69F8655023F3D00E3309342340AFD3F00CE76D50B48
-
-5E1AF9DCA4D3F2A40F7B02558949DDEB6DD69A5E67B8B5DAA3956EF97E710CC1BAA7476B8B534D
-
-48596240555C7A220CB029664AD274F478903E94AF66026F8562CD6C19837CE9265CB6AE578217
-
-0336FF4C7A0EA5C28E069006CC760D3B535867BD376C0E6BFA43A9DE5F6D888211DB06B6F3E5DD
-
-AA666609CA7E2291EE0596731E4CE79F34FE0559AE8E1C29E8D60015A445C34F8E643B53372EB0
-
-5331E58197096478DFC49B7F092A6209A2D209DC02EEB1B7D7B12E89A0551C06D1C3F3793D745E
-
-BC6D2D6C57628E5BDFAE09936976D7C9AFB653CE4E6E198572CE46180FF9EB009CFE450BA26BB5
-
-705525051655C355B5D61145A7EE06DFA487B311DE72A975945FBB64810434F8D739FE95632601
-
-A46C6C95C8BE365245A89CF7634735DA14CC68E23F4E9E82AC0E0F85ADE8628BA1BA4F9118F800
-
-7237990280C19061A305B87BDE6FBDABE71A72740E338925AA871C918D927F28ABB19FFD2A1261
-
-C82CD3A47B76248828300E14D71C75B777375D2970DF345C37F3BE01E56A047C99D27F41D81DF0
-
-43C1103352FBA194EAAA50055DAB070346A20F39FB007BEBA34627337C1B71465DE82D2221194D
-
-D5A61B666683F09E21F76418A8086FA4B2ADF0C94D5A702A2BE6BBA71D2A9F8767B2A390229450
-
-EB9867BEA6859EAD686C61FB52157036BA8F62468CB934E10DA07C43942B964A92C279E3DF2635
-
-541FF403CC50F7DAF1F1146783B0D2906F674273388085A1F697E6DD821649569B8CEA2920830E
-
-95A966358FC6BD7F8BA0B93495D054967B4DBF8D92EB337F50BE0DD9A03C23D2F5B5D9C73DFA4F
-
-7E01125425EE62ED9CEF7810C88553CC671A7DF9295F50DC482440E40D65D093FB5A39C4084B5A
-
-39A7C13B426BD9BA5E8DE29FEFCF03915C4DF570CFD8546B274B875FD0F80F57F1A0DA69F09DCD
-
-F98D279C0001AE6DEACE32E3B2D3443524C5FE1CD2770D7F873201442B1CC63F3CC33D2EDC0E14
-
-9327AE6C9E9720B346A3D783A0EB6D39E10C6D8C42E310C37AE06BE77056F58ED39D35BB2BE86E
-
-EC0BAABE99682DE457316B7226E0C968807D33772A20D50658353D2A6F0804E6F22584AF5887E3
-
-6AA4E7EF9D470153A11759AD42DA6EB9FC0AB5496547CAD0EB7243D0371AF330E9DEF3BBDE115B
-
-C312D0784932BE630ACF1853BC7CB9724EF91B5BBC42ED211A9FBF9105ED50DBEC61EEA28858E4
-
-B579EF2929F285ACC101311E182A27DC8F05A8BB074C559C37083D5AADA202B0BC3BEAFB7831E8
-
-79916C5FAA116BF4B4DC68DF94403DB1134D96A72A81F70D2F16FAC5768B4BB454C8DCED202A31
-
-221B25B2E3F8DC912C38FC8087F2C88B2A54F9937FD257110AB63FFED01D85D4B1161F08420F22
-
-2725FEC4B5DC4D2AF65A8EDBD3B59E4ADBFC2478E9850B6ABA868553DCB23313BBF6D03D178FF2
-
-FDCF3393B051F799D6C60AB7D57D62FD23A3F076915882B9BE1E3ED0A3DA893D6BB69A9BD15C8C
-
-607F0213D34673F8FEDA8187DF8C28E6E4A7B1FB92B11E92294203A36F95790EAD1B41CC833673
-
-3FB6A0189356C16636BE965A20E8959474834794E4D8363443CA4678901141D8BFDCC31B94BFD3
-
-CF9E54C566723BB52BFC868EC02AE2B96C657FB4FE9FBBAEAB700075588C874F559F3C85E007AD
-
-CF76B3E0372ED97E3E9775CFCE89DB79D3968DE2F396DDF4C6F2B65C909A191431F5E2134BB886
-
-3A620E2D537719D2F82FBD802C388EA66C454B8DEC27B7D6624FFAA31F85C5B13DA941EE9A7C93
-
-A5F9EE3C537B709656696929840CC05D2E60B285CE114018F19D856DE6A1408246C3A2ED085ABE
-
-E10C7B7D1A8080BDE2AAEC62F5D30C6EEDB6733EB97B626435C9CAB5FB56810E3E1924AB170102
-
-AEB24699661DB27C5A92F40E4BD4A88697EA623A3F2F80E3F217D59B50649085753E9F16C55BD1
-
-C45D2C57297689D12F55F62EA348B5FF6580B48DA85B9BA058349024D1DDC77BBA000AC0C2B635
-
-DE122E3A9EEC3434BC9B97B3546BC7850C3A472101002CF05AECED688C38D5AB82966E45AC4CF7
-
-FF266AE0F68669B5EA49C65A65ACDBF9A830988BB625A8263E570EA2C6D6A786277345EE7BD28F
-
-675AA6474ADD78E016D599B415B054F67EB1DE9BE57710DF2122405B482018D248B29619860EA3
-
-A268C586775761E62651D1BCCD3775647DFBE84A97C4EB66D204CE839B6DF81E8970834C193FAB
-
-73FD40FDAD28D249C3A086759D0F7A23457B91240AA045FB450EBF2F5DF24E5123DFFBC7A633EF
-
-723081ACBBEBD8D99C41B7ABD6C1B3CBB52ECA4976F7487AD77808052D81CE6F128109881C32F3
-
-827F5EF59022301AE7917B2D2E5C56FC82386CC1E0684FB6B43A67B51AE8B12E5B82C5214EB798
-
-38A004A4D704E03BA65038B87399EE1F93EA4CDFFD2CBFA0AE1C1E81073BD88202015EB9ED570E
-
-DB33E01777343DE3F8598EBF0CE1C79F8DBF49AC9A6E26ABE56D4E36D7452E6BF7CD81A990B6AB
-
-B05824BA2C2988D509E98E9A9ECCE3F869E1A301E7A8D69C293FC60506C762A65E66A333731BB7
-
-7886E82DFFAB187E264BB8E939125244A658DB0EF727428969C86E4240B8603F6CEF7467BA500B
-
-FB2A0461F8929E652EB7C684B6356A4F1B01317BDE4C0E278BC9C0D19D7F0F1066B7915C15482D
-
-347EA313239390884645B9D9216096257AA199425944B88B8E60D1C9D818E6C7FA57484E573FAF
-
-2681901CFFA7B03837251BDCA42963597D59F5C47CCF4FE61963D6997E88DAA6A80189F54108AD
-
-91A615519EBCAA0294CE0D2A3D6D51BA23AA538561AACB1859F9D8E7C7FBEEDFFA59FDA30C4930
-
-F3C70288AE3B7DB6835613D7975AFBF1254ED80A293C286A400E74816D07AEB927730C397EB1CF
-
-041153FC821EE357CF8D9C1C55CA1B578B603A9946E8B623AB642F227041A18A987C8A826B8E67
-
-7F8DEF5B1A7A896F2D04CA19703A9492C35748A0EB34614843CB6435E36650B1D0311D8862E78F
-
-A870CBCF6A1A6DA31FC1BCBE97B02B9F9D063975A8F4B681CEF8D7170C1D66C41BD8BBED7C4DE4
-
-5ED8EA4D5DDE0FBC9B11349AFFFABF8C7C62CF72064F93CD36EE781E45938513E6517D325137B3
-
-C8B07F6C85CEC99FEE73C19E3319C4DE54973E9F237FD4F5F522A1E247D13A5A3F76D9A223C1DC
-
-05DD98AF2F2870DDEECD1D17816F6362BA4E4C3E767823496297BD60D5AE5F3BB16C47946E1B9D
-
-599EE1945DE81896C20E0E1EE5BCCA3A817F140DAB9106C6A39396356440E28C8C37F09083C2B3
-
-8C0AF322A5A6E9911963BCB674D63BFDF08FE2A7378DFC5292CAF29E29F2C6EFF00299E23673CD
-
-BF97B919E4DEAB76A52BB588CFF489D6C984BE6945121555D2D11D5760935A18C7ED5794A8590C
-
-A9EE7CC716E12E5E50604E4DE26AE7E8198EF72323B8B449C7059831FE2B32C0B7ED4F977D455A
-
-74AC42335F92FABFC69BF798F3505987E10E6EA4B1EBA7DACDF2D8F76A14031698506F920439B5
-
-542E334FB3880BEC75609926EE99529C4E923E39369D453A4C86CAE241DAD49999819B6D3CC8ED
-
-7F99C4816DD01065DD385D47A56B3FED36E1FB26174E0428677D4BC535A2CB35646C17AC6214F9
-
-3C68C7B702D168B4439FD66A44EA76BA805180535EB32DBBFEC29D4B453317C6F35E21CB482490
-
-74F1C89B3DC6A53FE588F8DB408EBA1C60C9F2EA013F1517A8DB3CC9A097A2643C0CE53EFFE5A5
-
-E5B26CF40D3A9324F0BD35B6F526E83D2A381E976E00AF14E7F4FE22ADBB71236A5068E297C7D7
-
-0994672D86FFBDBED454659F54CAF5A364FEC8265ABA8F4F2A047D54B883E81AD48D094DE78A0A
-
-D1389F5F7BD0B36B3FA11F8864D21E57F453ACBE2A892EB6F126C9881799C021502428B0BF483D
-
-304777DC0AFB7BACCFA42AAE43121A245FAD4CE23248102CAF93C72016942B556CE59A2856BDD8
-
-7CAB9A22FC690B30ECF8926699E101D8F74D98F2759E819148E54EED6392F0B22030AFA655E07B
-
-E6B0F6A58266D5AAD8365D279FA51584ED4BDF5E981E31732868789362A13F68D7EEC3ECCF46D9
-
-1857482DCA018944AABF993F90635C6028012240D8C670BE48E4BAD29BBC118DA0B733E2019502
-
-09F2C608798E3FC6CD3699B61D207753A5C7E31D5ADB610F7A9FF36C6E73442569F025EA5E8A4D
-
-FA89E43F10B44C907024316F07B4183B202E8677F4449520CC06361F075BCC065A0C4911373281
-
-88FAC72EC24B9B52500D103737D40A311D5752EBA5F06EB593B56147F708914D474B7E67EC48C7
-
-32D40AB7C8671E0C80295DE3B2CE69C9759B536520EBDA938729214C68FFEFCA119B865C2A4BA5
-
-15986323AD149636791AD00B328E0E2D47AECF406A43D94FC87CD50AC65C5D4E55EB24F48938E2
-
-8305E1DF0C6ADA42CA47691246860F50A2A6292F0590D6F8C4076F3C6325AD25FAA56A361C03C2
-
-03694A39103DD209C04B85E5B740CEC222993C676750BF937448E4B0EFC94903FA04A658951108
-
-DDDC3DECCB7B71B544D030E6DDCDDDD5D8ABBE90862E8CB4E65C298F2AE4D6AB773091F637CF8C
-
-CA75568E46C5C3F6D837954E7C1E4AED3C449FBDC85A31C87D457485D0C1FB4C97957925EABCAF
-
-80AAB9607881FD1EE9DDB9869273A69AE28EE67E694A7AC15B38BCAE76120E84A3A570466AF88A
-
-C140243B90CE2A0A206F726ACA103D4AADEF97E5B5E4C753FB08381820EC8056288BCAF86DD714
-
-BC55BAE80E8670802A30B24361B4830E55563A74E5DB9862CE0C5AE972EF9188A9D961ECA5EFE4
-
-45DD11FF240B19766D261CAC32F2FA24B8DF95DD9A5AE6BC5ABD66E0883DE81DAC808EC9E64D82
-
-06BF34D3D418CD1502C1BF865FB89046BF228323C9B259FEDC44A24B41AFF7D4E6227F33CBC59D
-
-BB33633D31BA0F654F48762DE5D7B0A03079E67206C4661BC410F3D5F46DF102741C5949AF61C8
-
-BDB8552BA01AEEBAA183ED57681FA2FD92DD4C40E8AB10AAD4857888DDEFA5B8490191A629C0DA
-
-6F099607F85ED12417E879D770E016D297ED31E4D36082B67002F833561227A28891B6D2BDC3CA
-
-CF3F6CA3D833E8B1E587B4900F5BCDB295DD1626BFCD5D9BC31B8CA086E264F25599BE42E07D58
-
-ADA6E054970DDBEBA58D7185EB003AAA869138FB31EA477C881E556A0B35841AC095E226523B32
-
-773E128F541068A77B43F61BA7891F37781FC627C39589BA4DBCA4DD98C7BFA311A7CB6EBC7EF0
-
-A2A25393D7BD84D00D951D4CF9D9A1834038838830A50352DF68C9701D0CE7584626BA1ADF1D00
-
-B592F34897EBEC6280DA5223E46A0DB875CB10BB772B7CD16F26AE19CB1F2E554374E89CD4F7F2
-
-7485D9169FD48354317B1646578D956553430BFF2090217B15BAB550A8E0F36DFD6088A5E9D52D
-
-6B5303D9E2C0AEB607749384DF0CE76644334FF36C35387D76FF85B8064460C28FC895AA0B9994
-
-C3670EA26E8335BF331F4B406836CB7EA457258912C6DF48042050C7D333BC02FEE4748909FB45
-
-8DD5D55E7FD04497CE34DBE82E88D6AE641250863B8A57B11624E62CEDD80E05FEBADBA6466363
-
-ECECB921D11DF5939891E5B5CABB36FBDF822EBF17D950EFF3F4E850CEDC5F0FFFC97AA162BFF8
-
-A67CD77EEDDCF5D5FC48A303DEB2EE716B0C6F53469EE23B553D65FC4CDE004A2940C71E4BA72C
-
-1482B2FD2ABFC6E8A877A807486D86DA69611ADFAB9E76527E6AC15006E26DFDCC3314F24D277C
-
-53305160A9EFD4372258C69E8457EB24AE163AE997DA692DDBD6F9F6B4A0A80AC2C2AFEC71BEE1
-
-3C8EDF43F7A622B2BF0C860FCD6405704D60B6C71642F27DDFC08A8A02C6108B9036B5F7CAFBA0
-
-BC0DD2EE4AD2A3D063E2AA078FCE226B11467BAF992719B55DDF5FFCE2B34466D4CBFA8FC5647C
-
-222EBD11EE60BC567F05AA38704DDAFEC8937469A83D09643F7B798EB28E5DA823B9A06B7BC8A5
-
-C05DC705F0A1194FE17D7948940395617AC25BC922B3C838C507C1CAA95B65A2A5F41929D75D3B
-
-1EDC261930CE41163219C8827803ED5AC50BF85AF7C69D57286E5120C0F08114BDC3278FCDF774
-
-3FC7D8D5EA3B4D3F2B2F3B7B6C4D62D20A7D98AABDB9B9DD7739561B15FCEE8139B81EE60331D0
-
-939E99099F2B167A0AAA9E85D803062ECC6ED36916C75EB58243C2825BE97F3021D23D73A15615
-
-12EA904A94924AE1B66F5AA60AFE3E47E5A37E5BC53572BBD578AE923C5465F824056703DD1A1F
-
-5EFADD557CFA322C46BC944199190C9ABB2604DF2A7B55480C5D7035AFB7C7A7459A0A236573B9
-
-91F462ADEF5953AB2F45CD837DB21CADA6D39CFFDBA3554C166BA7F1FD28953FC38B853627FA21
-
-75537144A6627035A512B2D36DA71BDA234132D7C2CEC4F29750C14FB8196D256F05922F26A3DA
-
-E22E4E14B52196F8CF7261CE0CBABDAC1A2C2E0541B0ABBC8E09B1731DDEBDD541D9557AFBD90F
-
-3D84A8789EED596F6DEFD34E4651B7FF9DE1CC419FC7FAF1A3E7D7EE147D60686EFD5F55F5D911
-
-EFDD55C4E0BA647AD599E0CE1405F71669FAB6791F465E7FC1C247AB4E52C64FB2E6A18D4463B9
-
-95CF637998CB91BEB1B68A8C3E4460F8F1E35169F78FAC2D6677E243854D6F6C8685E5199D8FB7
-
-25E383CF338B276FE785954434EE8768FB95311D47FD3273751E4CDECF0CDE3F77A7513B39E319
-
-186B4495016FB97B4D996F4FB86AFD00EC9F54AC44AC519BBA5DEBFD5F39286817B25695750E1A
-
-4F210DC8C06A862F1F88CE3AD7D5764581E588D472B8B407CD074A5CCB39D6E138FC3E58C9C096
-
-4B8C0195847A7BC0E58E796EE60A10FE003F26231EA0F0EB7E100DD6890F6AFB8C2290290A97DE
-
-4EF1F5BFFC07292D2B4D2618A430FF3E115BFB35116835891EEDEF4D9456DCC8A25DF5429BDB52
-
-7151CA42570F44CF36D6FD31A10D58631F5966579495D6217A21DC436B7E26ACE1C03E62CEAEA0
-
-7C09A6711FA6B7F34504C4E0799E797D4D2775FFD0E9C2CED9DCC8F64F8639DF8B20EA979708C5
-
-81BFC54F08BABE9F5384E357885C54AC33E0FED272154843631CE03EFD93DF01D1600BE65877B1
-
-51C41219367641ED0192E12F26F871B13ECB2582F75CA7F1BAB3DF0B89942BAD036E9AC7A4C72D
-
-6EBB0BDDBAF2F6F9AD284CFDDF2934B4EB86E94999D1433EFA2E278394DDF686188AA8E6C15179
-
-AA232AAD24D5036A39A49C84BF33AC864FD76BC91D8E915F0A604B8A4AA99836DEE01D72E06596
-
-88FBD19195D92F5C7FD98C86804E7D3F7E818CC61B377ED48B5DBD744351564FD4E82B6DEB1A73
-
-B964684985FCBAB97AC903DDE810E01B27C44267B9D6C3CFDA7400CB922F6DCC6B711C045C7C1E
-
-BA276EE915936643A0A6CEB49C0DEA87B0D67B4294F21F30FFD59626D777D5E63B5400B1EB92A4
-
-03CB688B5341C40A69C4D413FF4B317750531EADD11F88851F6345669F58C53EC8B764AA666BD6
-
-E54B48E4743B2EEC13D7161C5203433FDADD9A4CB3E69641D3795A2E810A45BDAE3532B97A52C4
-
-9DB552A876C1ABAAB2E3AC102C9879D203D62B1BD4C23BC52E3F0C94A557959C6C575155F7AF65
-
-0542B5C10247CDB5409454C6BD7F56C13230C7F5395E211CF2FCD872FBBC1ACD687206EE59D6BB
-
-4EE63E2441869F875AE35680356EFE5A08AC504CBCF36F97743F06740E5137D17832DA142933F5
-
-709ADF6DF5177A84D22BEDE4CB3E6D30B11B3C91BD0D202352BDC767106C4A8719DA2C75A355C3
-
-53C67CC53775EE192E31554AE02399EC3E5CE779AED77D112F3C7059D3C6A316179EF3C3AE04F2
-
-3ACA411387E1E9D0930E9C1F3752315D631E556936CCC6EFEE77DCB7E705779F8302848EDFFE70
-
-D12A5C7BE23CB6ED65DDD47F0E0F082160A2538E1B032AAE17C97CF7F97217972F997CB20AF71B
-
-897B0CE19C8972A909EF1380692B82E9B09C257A0CA5CE07F272B56BD321D9EAEEDEEBD08634D6
-
-B9EC03320D2CE208D823C0D02D5BCB9A991AF784FD705CA331662621D3D793C8C311F7645FAC00
-
-BC8CAAF74F3FB8D3323639082601587B7816499FA4CD956628B7806CC407815BA0CB9E26145300
-
-A915F7B546222E5B4969BD44D9DF5194D7719A0A7BF72B0FA4DBA8B23BA02DC8441A9E4C57C7DC
-
-CCC2F5BE59786F3D79D070C1F2D02003160BE4B02E6767C5876973C786E10F567A1128C675DEB7
-
-46183DB34DAE298E07F0F78A48FBCBD6EDE2698639ABC2E5A1B2E467D93A69BD2D67F41F62593B
-
-8242C4A4068BEBC4FA7165B60BCD07A8752579FE46CE7D0494B06D0CC2E7568EDED60D0F9CBEC9
-
-D3D4032E650741BC21A83962700144F1CBB68AF25BE0C0D5EAA9DE8DD8A68DA7E0F6AFF1BD8FB2
-
-8278226A2EDDE7E0B33BA6D2A0514D4F90B48FD6300FFA9B7479DC934BF3AAAAB95B2AF9564E9D
-
-6EC39957E772FC5F24816637820B68B880CD84CB0C50B4DA212A20E904D37B360E29DDCA2CFB57
-
-EF239A5FAE7F964C72B1FAF64972E4969337018D26C9CB9D68B6CAC4E3CD2D3893145C9432FC6F
-
-0FF8C062C3F0F1C3AB0ED8D6B5505BD16EE6A15AAE57BCE07333465501867F2DEFBBE0274E4673
-
-8FFE8BD1B4211FEF4A8C28208E98CB4D72DEC559127AADAFEACBC0D98817239180BCB43DD239F6
-
-91A3EEDE515A3370AF5739841AB9C91DB77B91441E4A6F0FE113B4DC509E4BC951C800CE788526
-
-9E836A5AE595A7277AAC851330CD3CDAE4DD4569994E1F4CFCC75E459BC9E1BC7F215BC2D6926F
-
-5DD509A09CF22C506EBF22D2304870C3905D94609F8295D0C55B403A7572FF4C0DA600A74D3641
-
-DE4DC0CF14AE350CE94E713A2AD831422F2171777187840069F414CBD31F3648F88287C50E4277
-
-32054F5DFA1FABEA57EECB8FDC8019D37336D8D0E840FCECD0FDF19E56A386C3521E28726C3F0D
-
-B6DA49210F72C66BCC1E5CAB15FF19A8B25C5442A0F9E0D41FAF824078FC6F6EBB3778C6FFDE69
-
-8EE021C353B2A00F83903E001A1716E75308A08A8A8978CB4A99D379C76629EEFF65B926EE3338
-
-54144F43B04F838AB5003FC36505325D3E4E4B5FB75A1221B32DCAC4CFD3588FE0DA34AF3AAFAC
-
-A3955CAA04856A196ADDA16171AAB7E21C34CC447741E506F153B7F466871342AC72D798B63572
-
-3F4947AF84E679D4A9145EC26064F02388C731B2DADA26977C56FDE09BBDE051AF895A9CC4A80C
-
-E9AAE79F06BF913CBAA69D445B12023AF1A7BFD584D44CCE04F50D77E92F39294AA1BDB08FC656
-
-7218CB7FA34A09E1574F7AE40DE43FFB717625F2C5629AFD71ACD8D80B88832C24D8DF82279D88
-
-32811AFCD634C52E321A4778FF066508A0A63CFB3905EA75F5821DD568B90D1128BBBA44223C7E
-
-75DC8F780568FB2E603962125CB02C1A492FCA0A0096A5BA8B7D0CB1051A94EF617DA1E5771B0F
-
-DACDCD877D0699E01650F8CAE7027A20AC308B7B71F8D2709CED981541B50456D7D1724D28FDC7
-
-4B5FD05BF71A98DBA1B27D269436C9BC668FECBA8D660DDB7CF7F7F961BEF05FA62E49421619C4
-
-4CA720C2426A1D486C95E026416DD8534C85AA200F95B8EBD4A452541629E1FDE2FE11D84D969B
-
-2AA01A9B7F546A64F598183C23E26D38D86F47E29C8289C5ABEAF1D5ACABCE10DE46C50E3D25D9
-
-80D079E8BBA99515AFD9DB25CA8D34984D5D96ABA65E2850482F264D8316ED3868D5357AE02AE7
-
-3CD5282DC1908A666F9EAF15FBB2E19D3EA3509C5781ED0690A20621BDD31AD2D80F7787C5E678
-
-B7171B945C5AED7918DC313E011653D4AB5CA151B48144A0A6B2C2DCFF361F711811DB6F249BE7
-
-6579A43ED363306D6811D6E5801D6A84D4C892956F0D00A98CBF568A4BE481325AC9F0972FBD5B
-
-6CE323B0FC432288501276BDDA4D50505BCEA44A5C7DFFE118F1EA9FB0A01CE3B7D8D042CB8C40
-
-FA31C0C7F5D650D856C6CA864BE3BB46D88752D81EB1500923F9DB47C86B86998C8B1DA70776AF
-
-72BD3CEE2F22FF7F132DEEDF8E1FAD96D242863252F03322B458428A5D996852B1A862C57CF087
-
-C1ADE9803FAF24D25ED54C9CAE1C3175E752EBF0DFDD3DCE002BBEED1A185F2B968F1789645D13
-
-D83E3FB15F24DF44E85B303F32C681762D23ED813ABB75551A32C8D35C60FB3784E926AF187F45
-
-E98DF1FE17EA91AD0A11EBCF14BB22BFF19BB52452E8E06CE322B2959CEAAFD992054CFE95C7F2
-
-45F56ECBAC06595F4202A5272B7AFCD40C99EF3F78DC9FEBD552DD4913570438351CB76ED69147
-
-B46AF589E77DC42EF021804940ABB395F549AE7661B0E28E180C8B24B82BDB77AA17D8FBB1BFBB
-
-B16ADD5B48DA8ACA8321A66B606E67F0D64215BC3E25E74E26E6908DB19E966F94B1F3FF872642
-
-5380FD722B02C251D57E301016F29A98416D90B1945837E265A284FF2B8D655891D769DAAD74B5
-
-EB5A3274FF9140D36EBFD08A5BF579BFE5B3BA96856ABC7C4871A0A8F76D0734725F6F1D42EB9B
-
-B1EC84AE290BBC3DE601801002B8E5F075A15D81F958EA446DD2DB8F5DA10E7729AEFF94D5CDE9
-
-9E4B923722567B86EC81999EFA2F713E597AE8D971586DB1FB89AC63D3D4A6137053B4B9C9186D
-
-29994F5E4C70172153BE37E3AB1B9388A6765ACD2B02EFC8DEB50670EEF79FDBDB3494D32E9687
-
-A193AE6DB2B7B73C43876FF32D8CE6420096D9B7F8A9850812881A1E18054D57B98403A323D05D
-
-DFF6CD7AE59F4EE5FE466CD63C27D7FB6FB63885D05F4AC74951392F0BAA27B08CF886860D4484
-
-415E1DB8EDCAA39CE758F8DCB80F961BD4306E4A462AD7AA3332195002B32D53E5C212C01C9949
-
-FE30E8A3EED6747E7657A567639006F3B411985444AC3E1BD133241D58DD32A27803343E8DA969
-
-60AF85010E9B3B16AC4CFED28F3500D558CEA50C507F7A89A7F069B1FAE873584D6CFA0D4F1C29
-
-C46207EB676782B203C55279B677716D754E0C14F15711975054D94ADC8210EACD30208E0FCE47
-
-F84E120C545DC0F1A4861199D42E5A809B531D42AB092C9C42167DB6303C5A334DE18DDA7E79D8
-
-ADC546A81AF4BF03695662A9CFCFE6FA469DAC6056242A8FEB87929F978909C6D4C93DD2D60BE1
-
-60FEFDAB92638872C3E6518746C1B1DAE17AA967DE79876999615075B2FFDA67EE9B743E2CD560
-
-EBBA5608A98A05DA37D8F21C1618C02D8E978423DA80D7C38CF562610E85DD0F1775D8021C9432
-
-7CBB1F5C20EA41E8CA19A4E6D50A3BD5129E21101E312A9C8F470E1EB12D038E5AE4DE537F4327
-
-B77091667D196C3612BC6925A24E66E2BBCFBF6A4C938457FEE36DC1FF74ED7A9C8F6483C58F2F
-
-27B7065F35663227EE4492E3F06B6071CEA45739ACB943BF0EFFBCB99D03233C5312703E74CFA3
-
-5288182D9F371E3F22257964F86472AAEBA8061BF039C98C0B8DF14C70FC8A313DCDEB943E6253
-
-5234AEE628B9F97660A768CFCD04701A0F4C818BA5C0219E70B37570DB0D625E4DE3F220EEAB0F
-
-A19422A17124B098EB4C9C9E71E2AA0BF536A81161C2788973EB56CA0A8064D6025E64C5726523
-
-265C2E6AECF2E044D0969508CFD4DEA7AAFA7177FB797A5E58205C094BE985FBD4CCD2D249ECF4
-
-B2D76689EC33F64889F2AC40092F47B9BC6D5CEDD1A9F83A0832096B81BF7629E46591C109F57C
-
-4018EAAB78FE716D76EB3C35129BB163C13F3AB7651E389713513BE66A06E082E90FD2BB0C5CCC
-
-51D229B3BE5AFDD175DC9791EAC0C2BA4B32CB0427AA15BB506BD677907CE43D58F929C0E711F6
-
-FC95778515C25FE9B892BCB8448EC6EC0BE48861D1D57E0B36F62CCD687D82404CCD52A38AF266
-
-E42D201953249DD0E84308C0CE4A6056B0952F25084C684D3EF20C608FA6F4C4E3A1A274307747
-
-4E903EC46735429FCE1E1EBA363D509385AC067FEE1027282F6C735768B965F26E542C4A66A62C
-
-C134DFF94C692401FB96E63F3FDFBE3F531A26414275CAAAB1468E2B46049CB39989523D2268DA
-
-DB1B9DF4BFAE94F06F71FB2FBC496A687E62CE86572B9ACED7A6C65F9850DAA52EB296F7DE332E
-
-C44FF1E0EF2E2256A1B53BD9C55E75B81AA96830B1EDDA395C6FA74E0D2D509A5D77204BE7E17F
-
-8E4EE6CB1763728002991C68357AD3882B9C216B8A75746E29680B4A807386364E8E5CE44FD163
-
-4DC1EE5BA8F95AC20135A4344E1A9A367FD474C3572818FF643DBCE8C8D0C00DD800CA9EAC582D
-
-C5EF87C4D13408759DBAB4E8AABE8E77CDE2CA89BB581FF57D7DD284BB8297985444DB074D299B
-
-3B71A8F9B586E153A23F750B66F396B6312CD221F44172A6BA22449582A9294ECDBDFDF0917B66
-
-0A2DFA1E643188A0395C2E73B35FBF25A957A456791AABE4713C2BD33F82E0B3DA41D141FDF28B
-
-94B72AE08A0D3982864E8A565FFE5BF9DB4A49F721ED28CE94DC27DAF503154B2AEF8D4C3B52DE
-
-AFA794FBFA63941E9AA7F14D8FD4A3971D399BDA0797776D69C0F65FDEB09F54FB732C4EB24A1E
-
-74DF30F098C59BD853E4AEF3DD4719D883F38EF4131EAD84DC3E23B7A35825F39F603A1F8F10B6
-
-FB7FCAF52A1A7E315E4A8B9DB9568C2F23482E9641F80073330E8D1B0280AA09793F1D93D8B5CB
-
-7841A1EA9C923275103B63215B439F7C23C2EE2A4CE38DB0B7FBAEABB44123F0FAC8A5FF1DD555
-
-1F4CF7B3313D6A392B58BE872FCE3A867D502834B56AB141814BD0453D048D6D114F938C8514CA
-
-62060978E9B954F45FD68845DADCF5B8992BE49B25022BF659A06B65D4E7182565A3D9009B62E0
-
-D1AF3E897D35CF76F5AC69752DECC7E3AE398832F4EC4208A1249F3175E65964F4E183C8DE2F07
-
-ADF37CC73A111890AA07F12B9E5FA53CC3FEC2AFA98281D95DBBDA5AFE7709857B98F21176C381
-
-5B765AD80E38658EA89A6F88354C3B1C906749F4770F1D97C1785998D591C001C437B231508398
-
-1DD933C182F3FEFE22C6B9817715BD0B0929A1C96EC3342C31A2582B9F900CDD60F0835DB71597
-
-4DD0844893C13D12728093531390082BF3ED1D4C7FF399CAF014BF996745142BB3B49CCE64613E
-
-5274252DD36C90C714EC02E6560E0AD5EFE5412B6784421A7C12A4C0EB9B079E0A2CADB5951A92
-
-A6783053658AD4705F321A326164CFC717A214534EFD49097672A9076B3473560FC6D0BC1DE474
-
-713D41F68B804DF99ADFD2E19382305989E25FDE33356E3D8C4574BA41FE107BE34D322A1C50B7
-
-3B964707DDA438017226D5BB4E2FB498D50C9A7CE93E6D52473681008B733D494BBEC7683FED8D
-
-31F20172314B781FFB9FB79DEA628109340C92ACD967D4673126C95FA8C6E2A8035C919C3DC2CD
-
-A6787DCD041223A1F555BF011BF3A0024D8D3418B4CFA68389FBC545E1B37AA102D91EF40397F4
-
-E2C4564FBD4CC394C0A1153C3A0D51433725D358253B37567EC595609B2BC0FEA0AE65DF4E1D20
-
-73481EAB5035A7B91377E50C19A261EA0AE9BCFE4DCFC78E426646D64A546CC03A8F29B6A513F8
-
-8496EF201D7A9A3345454A497A06F57BCF060C8064472A7A6C156FFB96A9CD663C807F4DFC6B7C
-
-7DF42A95FC91FBEF4E27D1AB6010C76B016AC1EECB98184E501C7750500819FA4A36A50EAAF09C
-
-A8A0282200D23F769418E8421A940B894208860A5FF525EDB804AAA456EEBDCA2D57D5E45EDF16
-
-75B3A693F1D7A6961724420BBA61CE91F5DDC953C698ECF6CD185BB510B05E056F87E6EA729CAB
-
-38168E57A52153A5BB5938C085533E50E6FDF30AE4C5CD5F61B31BA06E5B069D76A95CDCC64E7D
-
-FCB162DFEE4836C38AB16CDCCCFECF1810EE561DAB5F5A9059D6321EF09863A1627F5C3F339A5B
-
-54CF627D5C45B794DAC46B9E57FEA489603A9D2315CB9A42CB24ABB75555BFDD2147E0DB0A7F58
-
-0BDE81C7C70C3FF6FD6CA304D719C189D0D7D991CF3E87E15240411FA94237B9FB145FDD4380FD
-
-3A5EE1843BF55C6C9F640F7B9E42AAF1D96FFC44D53719B83F9C11CFDFFE51BC454F50F20D4F62
-
-5516FE4FFB1EE798C85AFDA53319185A2CE94EB37170BD3B949582ACF20F43B0F1C4211843D50D
-
-4C0FB615107A5985F2CE49CE2F7B159C4E566E617B1C446198F48DEE3D31E9194AFCA71CE2870C
-
-6526AB1B0614C1B894FDC0DB2F2356082B8C311CBBFC4422AE45B90852326DE98A17CA8F5EB9D7
-
-492404916C61367BB9DF4FAAC2FE30C6A739CDD73E0AA1ABD14BB2D7663C86BA2598AF8B553602
-
-DF5A032CF80F79DDD04D3630DED47B48E58EE74EAC81A5BD90236954A02D98A3DB705DFBCBDBD7
-
-598D774A29200632F546A159A2656B85982FFAD6E2668069663CE017D158B7CBC1310BBB867053
-
-B300E8FF4A5BCF286D6D77CE5F5890D3E3FDA72C5DA30D7D72CA3E040DEC3792FEFDA71CEDDBF8
-
-58F17396BD5B8DC99EDC09E9A2B98877AA79665E1E43CFF02030BEFDE9E1497C822AE458BB6B15
-
-0F6AA44D7064E68294BB84CC34535060053D36A75B75B7DE664D281406FF31BFC907174B76FC51
-
-1164602EAEC09AD19A0DD24F003C17FE377B75CDA898A38A4291EE50C5D9C69F4ACDC239477849
-
-C60F0099822EDD6E3BB567ACC171F7AC87C775E56B079147BFCA802075DDD839B869C4A71F63B6
-
-B2C65E4B9EB1CB8BDF55BD6EAAE1F290B52D712C14F365D3805E29A3B5643BB90EA7E1CF8D9B42
-
-FD09FFBA06CE9941885CA6F91F0D1CFE91A94A9BC6164634FD7CA2AB88952FAA0D249FCF47ED81
-
-B9B520ED9A59CEBA8993932D67C4F9ADB27871E711B7F0F3A4845510C423845F396AC3938DE83B
-
-0304054192A788E343D51381E622E5D46FEAD67D853BF1C8C269D90D21B6267409A20E24ECEA5B
-
-1E0838A434585814C7E5128BE6D0C248CAA2014165A8B97AAA6BA8A3BD868361E8AF0C120EADBB
-
-C229EEA78227188AB22D8E85F638373E74CBEA7197BAA9847D8EBF16145726AA706C0BA81EDA7C
-
-FF7E88B39F19609165640246A4A9B7F261A5C93A5AD64D933C4A8EF9D026F2297F0EFAD595D0FC
-
-87C1393EBB9581D91814C47A0A3B06E5CC450CC22EE1B201752258453D4F145567F7D83CD99920
-
-B5C5C19B0C8BCDA6948298B6771A50CAFEC673F44A6080F89880EF0F766DFE9FE1D9C850B0CB7A
-
-6CCCA280698E832649CF604CB549CAEB31CD8356ED106F365321CE6809E2BF26C186497CDF2D18
-
-698762E4749A90F6C1D95B8EA7EC96319113C87116118100FCEA0D550F2832C57A8BF5E1E1C847
-
-F0C90EB114C7CD6C3AC2C2C5D7A7B56598739CD0CEDCF8D069EDC437C7CEAE5C0CDFD46BB57F23
-
-BD0D61B1AC0B9205FF34194628D5FBEA6CF56DDE45943EA188825138341713796874E10896757D
-
-93ED98E7B60AD890DB2AB682330AE8E15572490001C91EB2A8D7B56B33BC7E0599D4DD3A5692DC
-
-D2E05FC5DEFEB9102505392A008ACEE79CE7B2BE2A2B0AB1E783F353183BE0FC9D19C00474E0CB
-
-8817352AD755C63145D7C965C0E742F1909653FAF30C41875C6B7ED342141DB4E74512EFCC5B64
-
-A91468C89A8E692F0EBFBB4BAA6264E31702817C9AD8EB8BF75104E4D4ABDAD1FD5A81166FCB17
-
-A54E71767343F36C47D47FDE07FA3B7F943C2074622BFAFBE75603A0A117C1BD679113900992DE
-
-63C0FFAD063B669BABFF040F372B03A3030D1D1AE05188B73933127E8EE73625FC75DF1138F055
-
-C815FCA4AED0873CB6BC13414731FEFD7EFE52E3EF824C75E0A0561DD0D7BFDC5808F1B78B7D9D
-
-B562B3F0697A11379D087D49CBAEBABFFB60402E35DC6FD4D20D3C2FC88651291C379E4E8F1BC0
-
-924BA435EDE740137583CE6241C8C2FE4DCAA17103C8C8F40A37D27428E81B370788FA30C814BD
-
-1501D07654C470FD5E94CF0C0C52B5FD6E510EAB08D8869B108849B9003E7CFE8A256DF7268EB1
-
-DBF4ADE9FAFA0963B1A6A9B8AD40011E721B992A9FC9C998D26400ABA8C5B9D521C28642728063
-
-D9D0668B2B639E625D4B4F2FA3786E57E7938F995C893E7D332621716C6968004F7C302889C4BE
-
-46046983225AE2D1BC276683744800DF9683E960A8689338789ED2D2FEA1D639804EDD686295D9
-
-0128130940AF251D6B7803F0AD941F3F3D999C5459AAC5765C743BEB8CB02461B54EE0281A6006
-
-3AA762187D3B03EDD3B0B1F4EC416DA20DDD0D89CF302F6377CA73A36FD44E86C4DC6DAE2F5A64
-
-AFAC62536CDBA2C86D6AC1C6AC679E50B557045B2EB802C4C7AEBED40623B17A93ED24B65AFA01
-
-0C3FD297B52B2647355A411ACED255CD4EE2ED397B3DBBA4FC2745960491AE76F826EB9C3442A1
-
-661D656C27C486B3568A63F0D6DB571B17380652333C2D262A69FE1AC016D6D67C854A1AE0D72D
-
-ECA2AA38E6A3A3EF52B4EFA56B1913C0154BC1722016BCB3BE5B4EB5160DC9CBC068BA3EEF1F68
-
-7B663D25789E03D465A88B93A47404AB2CABB24AEA4337A79DED69CECA3E5616F3A1BC6E923B21
-
-2F58DFA41730543D0E484D43621E697DD091D3BE143A85895824C13FE5B2FC2AEC9CE8B4899197
-
-8019B6AA777AB5EB24FA352CA317C7C7F1E9549501DCE4C016AB22CF3FE5F1B911C5FFCBBC7969
-
-2D54AB0B0C92A5DC73A5BEB28FF8D2963CF66AFD981EFFC7A1246653E07A5A071442F0F5F719B8
-
-D60022D82643527C424D74F130544FC363F9D4F771B846337902AAE901C881130559CFEC5630F3
-
-767A1E1200A4DE082427A6D0DFD4CAA59DA510C73F7ED165A7FCAAAE1B541F1778A6B8FE223F28
-
-597743986FF80C2142BB9E347892AF7AEFEDD29ADCEAC1498B31F5FCEE94BB9E48750ECAF7DD52
-
-A39E793D99C03D875B9330FB1BE085B968C3B4EDFA0F050CF84405D3A42EC8732AF0DAC9C86661
-
-337B70929CB485028EEE81C0B465842EB01DF15C1EC0BBA5805FF3E900576E749187C0D94FAEC7
-
-E3F93F1F30D11242E7F65FE0EEF91676419B2E43223C0061E46C41FCF5FC82C011D2490D7A840F
-
-F0A8DD6CD0AB1CA81C273E1604A9F54AC6EA6BE04E6D14FEB14DEB14DC7CDF5878F35224C5EA7D
-
-EC76C8C5CDF816164BB47F9C6020D371F30419198AF45BAD5792D148F915BAF0DD0841169B77E4
-
-5AB50CDF50B98B4C54CD0BF91269D9FA67F74EF71BCC462AB9EC71939D361EC20AB52BD906BDA5
-
-FED00D420E32CF30AFB953C4DAAA807D5A5D3F24A353E9B0EDCACEBFC69A29E65A5CDD1B61FB66
-
-5003FCBF372FAAA06019F9945FBF32D62C461F4F4E89A400F9E0B3A46BDCA99EEA1AEAC92B3ECD
-
-C7B14616345D9A3FD1837FA24F916881004CC27351A131400D7634ECAE7DBFEE4553C86A9B1362
-
-E3BEF463D3B2923B45F5D8241F43533EC0E81168EA76DC28DC20F6A71508EF1C0EB6B946C220DE
-
-FA265F3E8F35EBA374D0865539B3857C9A21B1D43BED4EFF755B1E2C2EBDEF2A3652F19729DBE0
-
-59D94FB5448BE1F8EF205E070199F7C1D55394968A1FF745AE925EFB7237FF79FBAA77731C6C47
-
-F6866815020AA41F7F3051C7ED028518628522AE80FAD972B0A988F5793BE8D421444A2D2C0061
-
-8C6061A4CE81A807ED81987248D637B525C4E2A3D24E8AB6EB11FD36E9BCFE5432E46B89B2192B
-
-AE685D7EEF494C82A45EABA1363D2F4B7973AF5B2050B3F5471B2027511F816F1A3775861673F4
-
-B292E3425234A41A3D270A0D0C0139C105731A6F5F845685B77876B46F5ABB4DD64B669323967E
-
-D11E40E3A1837B060A6685FDCE58D2DD31D0C9A9AC68203E78A787FC6508B4604DF609D14D7AF3
-
-0E0D2CC07A4905339F7AE4522D6061FA6A7E4CB7A5A8B2B5C49D7A72DA46892AB0C82AF7D3AE1E
-
-6D882BDA8C266984230CCCB95AD2F5A0E33685BB93DFA60D8FF703C76887C32D93E53DE648C72F
-
-25128565DF4F410D1B2E8C9D569B706CB99542A27BA685DF09C752286021C18F9BD2B9C582E827
-
-745D6901DD99C4336C0268C0E8A85BE9C523DA1E4D0BA4571EADE80C88A14BF4E7450A1BCEA1BB
-
-FF95BDDF2AF1BEFEBBEE7429A4FFA5F72FD40A7AC1B70F8EDB8325AA8A611E37B0BCDC846C6C13
-
-CAA9A830E1F090059C6E3405378DF90C1AF48288481268DB2AF862AF3AF7A9C71EB60DBE819839
-
-6083CD2F545C7D78A37B90CC3B9F35B30F8D424EAC374DEB8EC893715791EE8B0CF8F899A4582D
-
-C9F2F738232B983AD8A77855D1E61065C4471EF0CDF72C0C8AC6AAAEEE1A767E8F7F0035DC77AB
-
-95BC1E2AD39914DF3E13725D8C3B5DE747B0EDF1FF3F80FD160D9A2055B4F2FF20F4626AB41979
-
-5E1FB1F382A07639342A4439A6E2F18F3832BADDE63DA1D78FB63557261C6C86C6E99FC9D252D8
-
-95A9B653782A4CAE61A6DE512CE97EC46442BE27746A90474800725E95307825739592D585054C
-
-07680680F1B60D37D64A5B0A69C84BFB05CAEFE941AFF94CD357A53C9C3E26FED2205B11F82F79
-
-64DFD8FF16D5A3CE12905945BF41C8A56A599877615B23E436DAEBC71B45BF0163A4E6D13238C0
-
-479C3DB9EC99FF0B74CD22248651F2E1BC7860ED0336E6C078D0ED4FC72F494D3F136528B25CF1
-
-53D41DEAA0761EC1E8F31F90DF1D73EB3A5BA9B52D829EDAE98000B6116072AEFEAE4D861E8928
-
-FF9DE376C856EBAB1A189F4248318A44CC3E073B855A13916073162D7A26C08BB55BB39A12033F
-
-93B55DB97CEAAAB975A7372C15D32D66578A6539ED61097D4E019CAE33119870E96C3E409E44BA
-
-E5F9C92F044BCBBD1B1041C5C68C45B766BC1FE51B57D74C11682E6FB6245DB5B24840FF1AD084
-
-4B98342B17E18B42B9FF61430B3A703D97EF8FC75B5F8462F404CACCDB2E6D947C1FCE7DBB0388
-
-DCEFF510B06216C218BE38F9460726FADC19D133E046C9057198C1C25DF85D45EAE84F3A66D339
-
-D9A1C0CD7FB6A8C706A9BA062E6415BB11BCA1923732B2A9BA984FEA53490547A03063673BB384
-
-D78CF48782AD45111EE91BAEC2128DF1A273F9143A3D28AA3E1F22DB7220092047E22268AEA219
-
-D0037677A57AA98432E3749FD577DA26285AD0E67E231F5E208385F4757D217C7070692E6AEB04
-
-EAD85FC981AD586A35293854C147A62230A8790822589C62C1BC182F9E07B7E0C5B1D02E9A73CE
-
-222AEBDB0AADAACA9685B12D914220637855F928B1C95251080DC17BFE674938D33E6C92C047F1
-
-BDC22EDE502AEEB780D6FE78304E0AEB47F39A7AA01C8B3074FA0A423B603BFB29D99F1C125E41
-
-42D310FFFA16CBF8EC7C2B09E7B088FC222706993BB4EF41C9329CF0AC1EF60DB5BCD8A7FEAC1E
-
-9DC111540A7E1633F36B0D94CB0B15A8E307CA19B3CD877BAC7AB9038CEB293CFA0EDC053AA4CC
-
-5049CF239A0841C6391A1ED537B49655EA5395477646BAAD042A98B61DD270973665497FD5CC42
-
-4B30C3911C5589231559DBD1FB713E1A384DC62A16816558A15CFCA84CF4BAA29835107C113B60
-
-04BD88E1D4B6F0EF035083AE58040791F8249B764C341064E95D788B90695E3FA9E547E456F5D4
-
-7995046BC81D5473E66C374FC360B4410670E527BC95332D6FE7DB8B8DC47AC472F37E83240AFB
-
-3800FCF5AA3279E672B3DA63FD22384CCD852C2516271892E923B9932B6DD432BE49C90DC0B554
-
-23EDEFD604A08963151679A94E3FB3E64340399F075A21DEF7843CBDC9D2D347D59CB072F12962
-
-7BE7828A6E9DF46877235D035DCB1B38BBC44BA3E7E8FCA39B5B34CC649152D23095F93B74BB7A
-
-ECD3BBD7E4087854CB47132679FB573AFE2A091FEC294B2B9E730625F68291EE7DC28C3D554037
-
-F62B30B05121A5A55D37081BA4E6DF3CD6E7347C8072E518250DC7305555487BA229F7A35CAE7A
-
-7E53417AB93E9630F6CED04F3A8C0B3B5417DB9E1D48C63EF34AF5EFD4F13AB7697F7DBB88B437
-
-A26532070E89E418AEB58759CA2EA0403C3D4EE2260F1DBB3CE9F1F06EE4B9147F9DE988324791
-
-E1C111877A6825DD08E8902A9555D2FC7B8B746C4B214AB4721F6A8251CA4D62F8E33CB4A7EB78
-
-C6C55F215314612AD89D5DBD8D5F614C8DF58AA798C7C9324FD435F059A1E94E90B2BD5EDFBDB1
-
-FDC906CEA9F5CC1204A0EE9FB244AC48B3F85593C45FBAC2DB4273AC81C68EBCD7B95E13B3D8D0
-
-87399C5EBAD86963453E54A2DD3BCD91ADEA9F0B13457B456ED9432C9EC1F4A34AB0FA8235C26F
-
-23838D53275CAC1491BD8A45026446F39EAFF0CA3CDF787D3F75EDF0D90260801639B3024B04FB
-
-4D0DA03D4FD56A2C45AA94062D92354212BDB7E62DB57BA0F08EB3727D5452E5B70B6F0FAEB0C5
-
-B8CD99011D992514D5C1D108E7E6E3DEBA9753D96DDE02BD87FCC830DF9AF89D97D6FDD9A6C77C
-
-489EE06A1B453F8A7B3776F11DCB71C9304899A22FF393F8DA55460CDD2EA1C8C70F4931FA109D
-
-5139EDD0FC9E323D0F8E323449D12470316A1D5022DD855EE9357A35C0673A093023DF988F52BD
-
-6438574B5FF0EDFAAFE12DF3747300456ECDE2814B5CB39EBBAC8198B3FD21D1FE47D7E9326A67
-
-99AB4CD5072584F774E95C55EC967AD6EBC94C45E3E2571F982379234E5FBFCAF666ADF6C64763
-
-B99496497A44A1E300928736B77011039A31CE6BA569B19AB447A6F1C95D5CB423D6A6A9FCEB77
-
-4C184F45EE6105F702B25E6586296EE177A97F5C508393206A15C40BF1EE90C1DA654EA12BB4E9
-
-C0F1D8074EBF22BC4FFE94DB00BBC01DA692DC6E72F3976C6184B7F17066B6C0B913577705EFEF
-
-F28C430A0D20E9CFBF3F1BA2F378FDD07CF7C4DAC021FF0A65E82A784F5B4DB061440032007E3C
-
-CBC4919B756235DB7988A17F76C9F16739F3202102D84484CBBFE5BC2927B020CC123121EE247A
-
-A03AC0859B54231C345116314A453E35E1C0E9FD30434915616F1B6CA42073D53EC446F4DE65A0
-
-4060367D2AE61F4B71945D3F00438E98BE840AB4254A55FF730BD897F592C5308A41351EE39650
-
-D71D24B8F2500392B68CF88C25DC357CBF0A515124336BBDFE42A9DA2AE5ADCF5F74B4B6285C0C
-
-6BF38283EC0CB48981C142E7072713506B6A38E991B507DF8F0927CB86CC86C7102446EDBB9DA4
-
-019CA4754FB67324019837E8DB09C4FC33CFE423DA1F2FF32CC343409C2DD71C814B930F59FE25
-
-E81AA8EDC97BCB05C03A51C48438020816EA31E6CEE57E394F6019945ADE3F9BBE5238F5AEE297
-
-82896EAFDB40CB42876BCAB6F37CBF8C05B9A84AE9D7215774682C0F32E23FFE0D61A04CB9E74D
-
-1D04B3AFEAAEF7B94251576B80EB8F15619B409AAD454613FD50AA7D4F3ADFFAB7332595EFACFB
-
-9655039A8D13519DF9E8B259E342F45501FD9414D9A1CE8A1DB2170C0E635497A54BDD296E4414
-
-46DFC16311669B81EAA99EF9E9F9DC6173ADECA4E9FD1D4D924A6FDF1A619D83D5AD745BE22CE0
-
-74AA80A93FB804241573C4AA99B435C0C553B6A34C1CA2420D4AD5AECF101D0C220117F52FEF1E
-
-A6A7C2E6C5ACB12F4CFE0434D38A7B80D457299CAA7BEB22401F6F41BFCFF1B73074DB204AA4F7
-
-4BF21DF02FBCFCED325450A316F3D0E19A9E578EFF6E36AE9B9FA83AC2761D9B0799760774555A
-
-CA3DC87F8FEF04FF41729AC36E78730AA4FDC9B200DD19E55A2EEB2914BC4A7AB668576E842FE2
-
-4BC3171AC6FDE3B12CA0A5CE473CA9B16AAEEF1E038F3CD0CD46FDECE92D31989529AFF640EB74
-
-4534262B1C4E74BE8E23D394A492BDEEFC7CF549C29298CCB93C99F5E7EF12F0F31F94BDD5571F
-
-A1393D675F0F7FD577F13B8A650627B83D1377E1D5BCA502A977CB56B3238D907336D392005BFF
-
-92FC98D953772DCB25A3353D07B7A21E21744A996725EBAA1C4E9359DDB16EA30F8B7B054F4338
-
-D80BC231101800CF513329DF073BEE3A9E99ACC65C4661660AAA6B2466E06BE9C9123A663F9BD0
-
-4705A874392E443C986778FDE4DBB2AB0AA855471E6D01BBE7B21F00725454FE21747084EDDA95
-
-A23AFAB912899C1155F94CDED48C003C3E06755DDDE45BC868865D5B5E6B33F441848EF915146A
-
-843A1B0F83BE8A3BCDEC8F7C33D0A6C80C17A39CFD9E466A4130862C8C9C6213593ED513B82E12
-
-7739B18A26A31884C99E43CB69082E710679FE9EFA6E57ED06B79BE2AD684EA2927843B289A1D5
-
-E54BC9B5C03EA51F5150B1B1E878D467E6062CE785053F1BC01922BFA0EF1527758F2DC5C97E84
-
-D64408424A58B069EC173390844E0DCDE2A14E874BB99D4A237BDEEF2867158C1DC360EE8D1CCA
-
-3578F9434A856C06722CF9FEA30AA6E923EB7FA1E4669732473F04A4F22282782B18B530C50616
-
-807BBB1250E64CE29BC8EAD8023A47DFD73125952ADF218E0503E6B26F09629757773511B97661
-
-28BDB57D2644C1AA9411C2BD09A1C184648ED435E61F0A8E6A3CFE2B19F7756604A32CBD27DE9E
-
-B083BEA7B9E505AB72E8A011BD3B38D71943044D552B8A2C6A9529C74C03461BA230DC1FA15BDF
-
-8EE5E8C00AA2519F2768CB41B29EE521879E4F5D33022E4F44E8BA54D9E952D730C60E283C0456
-
-9B2A7E0293E622DB7AF03759F4F6C873CE2D389C99398524E8A277E0124F42A701EB9748232621
-
-AC50CE70BAF6DEBA4CDFB47332DE090F1E6616D7457AB01CD96029F8E690231882F653F26FB2ED
-
-07DC43E96DEF70FFDDF5FF0802C87F60FDCD5C263A8AACEDD785454C63D7D1E4F0550081B30C1D
-
-460D7E7855548ACD4E31BF10893E793CA56A9E2B36E95C17E7B1ADFB825827FE2A6C00888BF692
-
-FB608A4B5B21ACB5E539667DFA247A7C108118D73E45581E53A30924061EC53D1E8C96527FD228
-
-91040578E10FA9B1B897230214B7224AA95BAFDBA6DB7DA9A65C6D19BB494D4C10E50425E88A05
-
-8DF29637BD37DE8482816F8EA5718639DD5C80671E52B9EE96470204F17C938B861718430AEC84
-
-04A67E719EDC2CFF1996B71FFEBFE745C5A3007545CB68716B04939633B6EADF766BD82AB8AA4A
-
-58917F66B20858E8B824432028EB5D44B20ECF9A394A7D2CF0C0AA6662C93442C8E081852C778C
-
-E8B3EDF6742CBB82412477FCDE7668A431F255A09D89558D6A95DB4C16E4A8EB40421FBA484DDA
-
-6371DFFA62972FEE696BC1C87CBC8A0A7854F9C53B52140C41F3E41A7CA5818821AF96C7DC4194
-
-EC0CBC08B2E7B3457FEA3E52C46467EBB84C739FB61BAFF1EA3341E1CBB563B9B8A31474AA8A0E
-
-AEC04C792AE8C1EDAB97142259FF325918D503A884CDF665D0494FDCD6E8958FA02373AC28AFA2
-
-62EC087EA4E120D22D291092834025B8D5D5B1FE22887017160C00A48BF7EABFBA436E2286EF68
-
-3FD641B1BDEA05A364B62E434B9E28A15FF9BA9EC7EE3E280FFBC79FD45A29F41B40F09CFC29B2
-
-688D662F156261913B3FA356A05EFC9D6CA122FB208B49BB38EC7543754CD60BB69C451E1CEE9C
-
-16A6C8900F6AC44EB8E8956B9E9FC43339F6AB2EFD67CC9943D3E9B957E2AC707FB9C035B89300
-
-81DB24B6A862189ED78C6B265B5BA7E0F4BE520CA0C6D0AA4E2F06F2E3CB1000B62494E924D03D
-
-081FE8FA8041E6455E0D2BE15FD5D9839F8E9D1C449EFBF81340456A7C11D3ACC1F17ECD601AD9
-
-83D228A1442FE934E61F2FEAAEB222A4DC974A49CA8AA64FA58A0E9CC64E1D19E8CBD37EA99E61
-
-CC37399CE7A4B002F36128D90D48DD0D929C150A9B791E1380494723712D4E9627689B21CACFF6
-
-535E6FFAD9CBB45FF42251DBFE4ABC9603ACC441AAA23D6D4CC515928A5B16A8E8EA265A3D50ED
-
-1570D38FA8CF1F52CED44AE32C669A6A334061D4C17EE9594B18EED1CF49C9DC20CE59CF966938
-
-3A6035B828AEDA54CF8EE35AB11ADE0CAA017103EA1A16F8289DC481FE7A027E9D56170F6AB618
-
-81FD9E6315E6F4AD853209C0720140237E3C444B714A417794975B942458C1965BF8BED420FF2E
-
-12C0BB6E977625AF3F10A16250E6033DC439D6962C59C77E5D9B99FAE6BDA21B09B82E4A832BC5
-
-04B4065400697262CD99A9C38259BC9522A66C2E2F4EDC8928CAAF77B9BF050E361DBE9D4DE7E1
-
-77F84C815F668F8BC2EFBD86E4C5C5F55CA9DC514EB07CE415BF56EE372335DE73D12DC9E67BBA
-
-6E5DFBBB7897D4AA214E51FA314E48DEADBA951330CFC54818C0205529520926A2074DF651C200
-
-BAB99792B3FB589FA7A81FBB417F94BB0478FF5A0DCB3CC649C00DF54686D76B6AE61AD0BFFA96
-
-F45EFBDB7EAF8D1CA349243B6126B26A8EFA36BF30904FDDF5D5FF102D67E5520B33989D196D70
-
-03297395971793E0C20A3C12029EB0CFC829D37D775452A9C4479BF6CE9AD9C2552530DE9628AA
-
-6EA46FC1EF19DA37F7EB79DDA088186832C8176864EC7BFC5E18E5E75C57995B77614CA213C0D9
-
-1F618C2B899E8BA93065C470475E0E914D39908C528CA0CFB179F7D88B369B0FE607020B2685FF
-
-308D779F2E22D9291A2B2BB5745E7311841F95DB8F929566A3A7FC36425891AFD5DE997A23F8B9
-
-9DECFAA1EB0A65155677B5EB5133DB8F3DDAD0745DA9BA572519C915B353985676734A828C70A4
-
-6A903A48F92C843C3C6BF42623C4281DB0B4294243A830EBCC4B4C722B9D795F875BDDA31AF7DE
-
-68640730185361F2B704F0C3ACE021A08A13393E95F0C153AC305BD3D6B1F9CD1BFD4E930AE7C6
-
-6D92DBAE21878D307C5B03AD9AC113581E5625A05D195A503F8460C00093AD8AC2155898D64D56
-
-07EF4022640582C97265A2F0D578DC7C33B2A8A28DC11DF55C90F2C39FE6BD29A5E0C2C9CD82A3
-
-136F63E603E53791354EFA93AE3A60903A3B284D0555602352199046F7E6380AD34E593A473D6D
-
-DE2B28CFAD3A75041083AEE4FB12D9EB4B069E405BCFFF5A98E3C2223CAC88F773A5C0ECBB16CF
-
-12A483641862009037D5C54A82FDD90D40D8FD663EBEC7C91B5947DB2FBF4718A627B10C078307
-
-699142374725125BE0A11DF893D8975D43BDF8AFB1476A2DFB2C8381E13CB69A8B494A6A8B0033
-
-9253323E3E285E05A9835FCF4FE2AFCD4D782A03FF8311F15A51E7F50385C4A1EFAA23950E7919
-
-D107F81C9DE9D4A10F64EAFBE8CAD85C0287CC4D4E815B561493D74FC62FEF72B5AE05812035CF
-
-4D8841974D9CE41B711DA438D00EC602C911274F7C7E0DD5F23035C5F1737EB151D12BCC736DCE
-
-4B2ACB25697D79DFD9F594B4DAF1DB7F540E11FA9D4A15C868C595BC35B4F74490624365948143
-
-51A771E4864CEBD6E92378E709463C6FE7BEEBE0F325613BD93094EFEC8BAAC89772FBFE654075
-
-351E62B844B80131E751AC4F39505DB26C8C34422C66A40316AFB198649802319D1FE4E1E66040
-
-1AB234971207ADED6B4A806F0CFE971D3577C7EC801355E5F84ACB3A33CDF296CB33CF42E74ACC
-
-003117D8F700FBD84F34EB9ADA38EE0716E1AC8ACE9882C10BB4B3633A6D877DD6578C1DB035B6
-
-DD9E4E2B2349350085E0428AAAC17759771BC4EDDA1A2D40FE0B15B65A8EBB4C28A526A49C56D0
-
-C24FD235653C78F2C40379AEE793937ED6F0BF8F4CCA825C305C0F3FDEEBDE8ABA6352F1DBF049
-
-55DF7695BFAA59E1894C1C57CBE29E48EC2F44DE77E3C449E13A25359126925E4C6C4649F0436B
-
-0188451E473513DF34C4FB2A9A37141E27811C6B33952D9C3BB0336E622DE192649C5BCB761700
-
-CE9423E9B52B20B7E29B6CA470221D593AC0C5D8951EE2A56FED99A8A3D018473C0CA28E4A4831
-
-D6A861A76C7165314BF7A299DCCB57F7D4CE2AEFD997AD21C55647DBE4F0FBBA1F413667B19604
-
-69FE97B144BF2DD823CF23E22313E8B89AB25CE9C1746F141E2046DE217ADBE18BCC3BBBE0468E
-
-03F277D3F95B56CAF8E2C51A0AAEDCDFA2294666A853088EF97BC279FB51FA78419DA0AA83BF6D
-
-8EACB8118E0462E0401EA83023DBAE6AD5420BBD25E3DEA46FB3B7C9376373C8E362E74B01AE0C
-
-E9D59C6945E108E0E92C23F62661BFA54700E203627BCAD11E7895AD59BE1859A9FFB6F7B01685
-
-23CB111552301916107D7D2A403543CB84AEFE404B8F170EE5B408981A88A65C335B3FC3454C00
-
-153FA92CC442BE0590766F765E30F82FD41499DE688DAE2748D5709BA47A89E825813BEF4DA6FA
-
-EC5D7EF6E9CB0913B5BC6A6776BF9AC7668485DE88E6265F5CDF0A854FC86DEB070E40A41A1251
-
-1291E1A6419C7694ECA5EBAC9DACEAC303C3E9FE8A62A64521E18B49B56B3ECA6EB0FFA148B2F5
-
-E558857426424288BB54DE15453E1B321D4B04C8D728B30B756B0597AE61F92447B3A757131539
-
-8701AA4F8A6B46B4283D50E26F5770EC6427592F16A66CAA8199AF84FF05A24A5FBFD1588B6114
-
-E24CDF39A99E7A6CD0BCD44E0E8776C9465D86CA3E3CDE34B33D317EC75D953411C90450003B0B
-
-941881686C9B4A3260C1DC4FE31F0A53577D4A4750AC7CDD52EB3274B61597DD5C111AF441456F
-
-E090821BC7B29806714CAC0EF5B8DE2DC813D42CDC8530F6EB1DD82657EE1B6DC39B0E2BADC17A
-
-7A13E4EDF2A893B41CDA754D6EB684D6A8D496DF331401FFAFEDAF3FD80BF1A35C2ECA54F42BA4
-
-9DB8C7CD73D81F5F1060515D47E6FC08717B9E9299B255536241DBFBC673945A38839B35D9C8EA
-
-1AA449CDA80805C4B14A54087EAE9E4EBF0E61C83A1BCC6C8243313F5C6FBFFECFC6BDC4368DEE
-
-7AFD489FD48DAFD34C59FA6D2DFAE7E2C8C95BE05D2AABA6D989D41C7F0A4307D118828963F2CF
-
-A652BCFAC33B22991E4F6D80D851C0722205702155EDB00053B5DAEC50744AE55E9184BEADA83B
-
-F76964F7D394FC27AB82DA1A65FDA56D3648D9F5AA1FEFBFA71BDC4B66E8C4A9DE4935F0FCBE47
-
-958493161696480DED3314B7079901FE5AEB10F89D9F153D654A0F0E58D70B922ACB969BD800A0
-
-F3CE421FCE37319D377D903741A60F8D83AE8FAB1C999BD8C391316A1C0CE6B3F181DEA3D2AFBF
-
-02ABE1237934194E9F42A973AB4971D3E3CB63ADDDCFE9A47BE78F24468F83E652E7E67D853F4D
-
-5020D7ACDBED250D1CDBE86D5801CD56913C20F8101F509C90F97263FAC6FFDD6C8705CBA0EFFD
-
-5EEAE1BE11841DC48401A7C41A5F0ED59FAC3CDFB8A2DFD2AC0F3C12CC0E964B25B344E1B6246A
-
-292D4E9EE6FA18BF71F1BB7A91EB5B8F0E20A4FD8593B803335980224D372417E3662D96305524
-
-F200B70168AA3B485BD83DF7A42A5771882FA599F0FAD36C9B4632E56D751FEB579F530A6A4C20
-
-A909765CADF9065E4BC80BC52FDA6A2186E22B2559017A626F230522DE708219012351E9205F6A
-
-45E968D94D4116EF55E13EF921B3740CDF45596206BDA272B14A8B2F6C6ED744BCCC8BFEAB9B50
-
-6088DBB57D8FEC837B4B00F57959EF515CE8A9802F54AF1DE01F071146D9A68BEB382FE03DD7DE
-
-AA00AA32BD552D2FD1B09E92E31E3623434A5A34E702ED0375E1A97F8B09AA52DC4FAB8A15F09F
-
-ABF0BE47AD03D997236B6B556AFA9C4A3E4135DB4956DB38F914446D7E0FC6AA21D4232B0BF5EC
-
-66F43214EEFC8CF98854BBD625668144478959A983A01DCB4FA2BC8FCDE08F3D4DAB474E05C3AA
-
-80B91FE4F53F103EFDFB1A509696E0B66830DE466CFE8243292DE34D4E9AAE50EFD539C120BB3D
-
-C0F7D3EAD1C033EF7EABBE1294276C0F78C7C089C76A1024870EBB09D493D9A4F16A3E65B5C5C9
-
-F380DBF5365BBE83AE13AD4E96C852274FA6CC8370CE8FAD45449D9050E7D2EAF352F169CC7EFA
-
-67B1BBECE485C2DCB608AA7B2B6F2762B7E4682BCC33EA0E305CC395A3D7A2C2F7E0EFCF2B1055
-
-F30E631757BB5BEA22D9074FF2D73588F9E9DD12477D44BEECB9A03DD5439C472CFEEDE2BAED9A
-
-FBD67AFF806759BA0AE34CDCB12CA52332C9328633C42F1894DE5F9EC50136AA1293C9D8937160
-
-0DFB14E2E95490853B0601AC7522BE8E519786C87AA5E1ED2B96CE221009AA9C55BC60AEA4E8CE
-
-FDB977B28F0551C306C22FF4016728BAB789B65CE07F611B9C84808837F8765E5D94B9C867C0E3
-
-AFB0EA4A21A324CC0A3BC3501C39A9BA928B09E9A87408314DE63B783392D5BD9B3ACF56CCD70B
-
-4933C1724732379A616012DFF9A9E14D5A55F50D841333958D6F36B56926228F4796421E470735
-
-4FAB7431899445114BCCE5D27117BFEA65EE1118505765132B7833FE9978899AAA1BE3E3F8AFCF
-
-0E9E1140A26FC9CA154A6BBB84C3E5FD6CD8B82732BE0179DEBACAC5340C79493A18FA2E5DF58A
-
-5F0C6546F5A5836BD61C904A8EBAF16CD933A9BC7FA72FA72F319A0A6EE86AD23C84E672D18CBB
-
-0696F22E1C69ECEFD15FA52706E5DCF3CB5311B28D9A614446CE033547EC0EF5FFAECF2A04F1A6
-
-C3DE91ED2B3FBA94DD7796E45D26AB00B99B3E295751BD6473F0BF36EBCA28FFAB2451E93DF4E0
-
-26BF0844FABC6A12EF15EBA64A5CA0E97C6DD06B94BA1CB29DFCDAD8C203C1CB6F7A1FAF4F3B58
-
-5BDD0BF922549CB45DF8F2196C709F2B9A35A43DB0043E2BD0287A3C313EE3C33F119F09A5619F
-
-B350F4011A93100CEE0847F1BDE12FEE8E323C8FAE34D535DB5A0DC8475DE8299E3C9CD6D8B0CF
-
-D6481619C68E77D92FA10D9EBCC13E474AD22B1F47D3F362FC968CFC1B5B52EC24F19BA894967E
-
-ED811F37525C260AFE0E2F9B302D6FFD019754EBCC14E053A9EED1905F402BA7BD3D8AFB09D2A8
-
-E94D0ADBC3C2ADFAFD2A4052256D58B221D0A20995F9C394F3A3AD6436CFE4F0030C7E8C2094E2
-
-092F5191C2C721CA9433369AFC221D01872BF68298677841A0656772649E7EBAAC8B1B81A38E75
-
-5B02DDA4D08B2F357C0C10E1060632FF74F7EDD5CFE7F9DBB232C3A231D128A3368C4D9872404D
-
-F45719B3EA0455836B893F07E07762F0A2FA9E011010A0872353F0CD2243E1860EC33F72E15EB2
-
-EDEE1A91397FE6D2729FED1B3A66FD009EA8DDDADD1FFDC8CD3603876F8D0C7AD60164A96A6C73
-
-B8A8B50985E1FBDA3ADC50018D341F285036B5EE255D975F6C3B5698AC4A94B2317BAC65889783
-
-4DB7BF52E9B8D20FD4981515FBEF23963A7F8636D0897E7EA88901CFAE1FDD18DA86C246507A34
-
-7672ABB116ED605AC9B4B6E899B9E8F6867140BE89DF5CD52C65C27E860170AEA6CAF303C860A6
-
-80A85394DE6896CF928BED76171F8904C5BBF4196BAD906569AC5C7057ED1201F2AE8393CBF704
-
-009124A6E5231D323C3FCE6C48CA239F169DFF496B951332DEBA5F06CEE48B6BCF824F0FB4BFE5
-
-4C1147BF208C2A9D44132D0895FA7A87F6FAD780DDCF94545F7030EF1808B30EC659FA2B6EA011
-
-A3C06070388BBAEBE45F8EAA75F72BA5B4E56380FB7FC3179BDB55A9A7CAF8D7FB60EAD6DA939B
-
-09E69159432671C88E22B34D115B6DEC54955454D622857094B70C3359D6A22C239FE03853CFD9
-
-9B7FA73D4EE3CD34124486F01F5CF05A423FFD794F577F50DE6776779107BD58808EEFA24DE1BE
-
-94BB27F82A19068D7F9DC695EC8473341F73FED626A4A6E89B58D4ED2024F78AC7678829FA40B7
-
-C8AA7400EE3CEFE125F64E1AB49CE67FA2F2D1B81FC322AA64F16463C134AF51AA9C3A154C7FD4
-
-30BCF4531EA9B6211F92006AC1C61894A7DD5C38E6CB8CC68D6A05BB95B0BDAF66971D357EFCAD
-
-89BCB8109462B796927389567F797E58823706AB224FF927A7616F0E4527D90B0DB9689D850D4B
-
-4F147080CBBF3493E564A1CC43627075E79BF3C3091E4650B8E607F4CCCBCAFCD3F778B7A1464B
-
-14A4E229FD41B5BC4A98880F008ED63FD25AE4504EE8BD38B641F65D0F3F65961AC315F4D68139
-
-7C2470E88813BCFC7E41FDA99AEFE170E274D53DD3D858D8BBDA154BFC93482C65FEAE4AD7E9A4
-
-7AC9530F0A82FF46E8BF22EC64B3A8B69527E92245B3B272C311FCF9946E93476D838EC0AE54EA
-
-8CB899087794A67E6B4E96664AFDD619FC074FA089F83A02FA4FCBB5BE698E508F87BC0F48051A
-
-8AA4DE3EBF3FD93ABCF58C1FB64257027AF8FD69B7CEF07498F48F393B4B4E9BDD6519332A780A
-
-E72152CE168E399E75DB4414618B9EFFB4986B85A94CBD0B912E3D5CDDBA6B784EAC660969A83C
-
-CF3AF928B6E84586B5F1CF353EFDF022DA5DF130E7FFD1698A9A7C26C83F135FC39E9CECB8855D
-
-9601A08D9E5ADC5397EE9E639A198A61A79B3CF5960AFC41584B56B0EF5C604E42BDD021E716B7
-
-3718AA7FA7002D329F22E3898B52F3111E975D5054C8C1BC491EDD67CAF876517901CB7805FA84
-
-4279435B26A2B54C086FE443C079A373B630528664C8F262D147F44F19B3760D4CB4D3A38B8E7B
-
-8492F3FC910E45A201FFBB8B3F06F80CD135C321EF51B7A7C30AFB5A14D5EA851E4B23232B3F0E
-
-272603125DE99C6B1755C9D3E8B9E92D33AA4EEB55D07D06158FFF93BCEE921CBE6A9B6605BE3A
-
-D1C203AB903AED90A1F735D32846EE9BF7ACBD7BC479FDAD8204F0A5601477E2CA092C7CD57671
-
-E2B179B60A72794FB3DEBEBE9E41EF333F97007BFFDC1A1C55C79EB9CF85AC2DCC23700F48D6EE
-
-621D02FAAB7D7E7C512B939362AADB1ACDB25B75FE1B935F15F922AE4E03632EC9AC1CCE112FD7
-
-CC8510B86921209CEF5E66F52CAF4EAFD83E772A653B0B10EA7DE38174A6458228F90146A1C5E5
-
-F057D384CB5CE531C02F7BF2BD20517F182597310157AED68C2325CCABC22F9D38A32AF1575707
-
-DEA5139E0363677162DB6EE9D46619DAC88D9D97902D5C58339FF9B7E3DDBDB7226DED36C1CB51
-
-B50BA744CB2DE5964126918879DBE7D2FA616FBA9D4D2965021EDDA8A88FDFC08853DC1FE99614
-
-15C741B21FA7D79A6F0281BD054E49C6F1893A2A4B3708E7272F42C6AE8A5E7C95CD6879466150
-
-CB99F4110B392DA7DF91419571EE31C926B3571DC0FD7302E271263C4AFCF7553525651D8D5587
-
-7AA4E1333092ED52A9672990BF34A1B60EC243241530E67E9F1D7CCBBA1B511A24793F2511F3E4
-
-763B02D4084CFF099BD83408FEAD0403E33A6BEFBCAD9564232FAB7BABC8BCAF785A6EA74AA882
-
-B74DE229A6C9D140E617F10E988467704D31695637106825DE0F31C3BBAD7EEC317C2CBF7CA7B2
-
-E25A5365C8234B9C57C9E3853C7A581972B3186AA87046C09DAA4429DCC56C7CF7F9750428B974
-
-49E6D9E0EE104BB2E80D05797D61C71F7751C5726E1FD7C441176ABD32613B6D7EA98B4262F9F5
-
-664AA8D4E9422AA0F44C4A1C79C32140F6F38ABD0FE9D7CD85997A357C999A37674F4603609349
-
-BEBA4F86D818290F6D1E75CC70555D68A717EC063B92931F2278E460A24A53377D85322FAC03BA
-
-D008ED6402F3768A75CEEF4EBF73852A2512C1499B3D4502E05E9C4C77D962708DE7FB406265A7
-
-A7B0AE38E879BE8922C585EF4ACDA2A4459C27DEAC5909ABCC15064EB6B974EED95702286F8C04
-
-E59187241E357BF0FA2F1B1D2576366DD96B15E40891041435D3542344DDDCEA9982E7850BCF12
-
-BF60093F0BB91279E8AC2A40DB5C7F0586422A9B7519B5A14F0E5BE49BC0818137D0D512A2BD6E
-
-475855EAFBEF470190721A6E90966CD8F47F801780B6181C92B6D401BB70A64C95B12AE7DDD980
-
-D32323EF569C05105ADC3AB5DE127B421EE1453DF7FC5BE2275E5941FC9C7FEE09F931039DA70B
-
-920604D40703369B47D8014E95F827563234D32A08FCF8B99073FBF7E87A34D7FA1AF9E6B5C5C0
-
-8802250ACB7E943DA108BB2485A41324819CE85AD51CA83FC7575FD5E8EE353AB8C6B9C2F3DB8E
-
-B3DED45F22711190321A2F6F95097DD6A0ED91E0DA54AAFD05A6B9D399239525CD833E9AA6231C
-
-D4F835B730E5459C399DF7693DC4C1CAEFAD6416BC95F8B9F0533C0A27D86B42D8480FC908AA91
-
-C0468F0BF73CC5E260E5F00D82C439E9A581B19A61B5014606D57D186D9F9469217B4472DB1609
-
-FED1949D29FF3E2E3FAAB536FF7949A26042B9FC5408B7B059EE35B0E287F4D8CEE50E540DB716
-
-6802EFBF0FB60F18E5A1FA942A4E3E66EE68EA44B8FF66B3B0669E59A81C6166312987164E6DC4
-
-DB7509B11444287A5BEC5BEA9FF656D5A42C0DCB10F83B14DF02BBFE729E9839E594895DA80448
-
-B760D7AB5E58B675ADA42098929FBED35D62A54737FE6E612569B8DE4EB603F1DD6DBFFE8F79D6
-
-AEA1B0599913AA70083EB94E251DB277BE9F492E4D13B2E42FCCF825B3589EC4F9427BA659A59B
-
-73DACC3C9D2E9CD77267DEFCFDCF2117F5207AEC4198130B1B585875A49B6E01C8A5FE5EBC4678
-
-2BDBC438BE32A1CAF134E9B53D82761E9B682E0A198A812F296E193C296412596978DD3C5EEF0F
-
-BE7B353568C5627BC6467C767F9ED8412EE405C24F6DFE95AF72437D1AD9B992FF30459D232491
-
-645E845FFF03214949D33E1A48EF2A99DB29DE6FF82E72050E0E6E08E863DB570ADF515D82931B
-
-AE70437E49C397767874E34513417A49234BBD89F19FFC3EE3CD9F5BA7112A4BEC07012C709585
-
-97ECA5A501365E3524A500FA8A43A7BA90F91E8CD5825F65940825DE80F5EF11198952A258B5BB
-
-EC5AA244F8674BE1764B526DB6B9D244C886980B25C7EE4ACFEBF79349E26F2D2D65FA2810D1CD
-
-4B39233F9638546A3FF1E8D017EF458F182CF228392AD30A6E7DF715CD0B55FA377DFA6880F554
-
-367A6E3728065DF65CAD30AD927943963973F6596C1C1DD29C2C84B224F81361D4CA2ED2CC6483
-
-A59F833CB8A964C281B0BA2C834783C5752986B8E70583E6C9AA33132BFC67998B992F249D0AD7
-
-6C02BDD2925B39501A69E4E00DD3534C474D0715C913E23660BB765C2E5FE37F445AC605F62DE9
-
-C533EE924EFE205C528C372403696885DDD6BADAF602993F3DF49957E21B2EE409AA6336A8103E
-
-BCC0B33B8FFD8C818F2D25D22E3B0E4E874CF4ADE03F69C1B017DA9CED9EAFC6CBD86780C819A9
-
-CE03C2AA203CABD299251B9090F2659C3245A845B50EB36BCBC07AD6FE0A191D3E8BD0C9B9700A
-
-706EA3028E8055B585A6D8F305C80DD5ADBE1DA433669E1D9F459EA105B5F6D756A9FF3DF71607
-
-9FDA77312E447F764C0F178B7F128DA4ACE17F8D4F213864C2AAFAB0D5BCE40A19AC92FF21D7B1
-
-F1F3CEC338951D7292147937ED0BDB0CEC2578D0BFE12F7F21B4D76ADD1F557E8A5761399591C2
-
-D4A2CB1F0D9564586567AE9165451DFF5D61E08F0421A8606E49A552E19F8CCDC90CA92C4BC2AD
-
-2FC3DC29DFF6E56BA85D8E7B0388962DB5BB107CBAB4FD4170F24C21DFE2A3EF29DDB82C02EF32
-
-4B9DB2AC09C1A5EA7C71B1547573B68FF8C3215B803CD3EDE122DE1D71492BD3B71C5A6DE52D50
-
-8E98676560ED273403B9D655F239579007706C078EA3EDC120EDFECAF4F13379A4526FB3731A08
-
-9690CF6D74F2E95E332D1DDB36DF458771F0F7BF321E524447B6E04AC33011E855A0E25582F104
-
-69F1B6C19089AF013C38F2624826A5730641
-
-0000000000000000000000000000000000000000000000000000000000000000
-
-0000000000000000000000000000000000000000000000000000000000000000
-
-0000000000000000000000000000000000000000000000000000000000000000
-
-0000000000000000000000000000000000000000000000000000000000000000
-
-0000000000000000000000000000000000000000000000000000000000000000
-
-0000000000000000000000000000000000000000000000000000000000000000
-
-0000000000000000000000000000000000000000000000000000000000000000
-
-0000000000000000000000000000000000000000000000000000000000000000
-
-cleartomark %{restore}if
-
-%%EndProcSet
-%%BeginProcSet: texps.pro
-TeXDict begin /rf{findfont dup length 1 add dict begin{1 index /FID ne 2
-index /UniqueID ne and{def}{pop pop}ifelse}forall[1 index 0 6 -1 roll
-exec 0 exch 5 -1 roll VResolution Resolution div mul neg 0 0]/Metrics
-exch def dict begin Encoding{exch dup type /integertype ne{pop pop 1 sub
-dup 0 le{pop}{[}ifelse}{FontMatrix 0 get div Metrics 0 get div def}
-ifelse}forall Metrics /Metrics currentdict end def[2 index currentdict
-end definefont 3 -1 roll makefont /setfont load]cvx def}def
-/ObliqueSlant{dup sin S cos div neg}B /SlantFont{4 index mul add}def
-/ExtendFont{3 -1 roll mul exch}def /ReEncodeFont{/Encoding exch def}def
-end
-%%EndProcSet
-%%BeginProcSet: special.pro
-TeXDict begin /SDict 200 dict N SDict begin /@SpecialDefaults{/hs 612 N
-/vs 792 N /ho 0 N /vo 0 N /hsc 1 N /vsc 1 N /ang 0 N /CLIP 0 N /rwiSeen
-false N /rhiSeen false N /letter{}N /note{}N /a4{}N /legal{}N}B
-/@scaleunit 100 N /@hscale{@scaleunit div /hsc X}B /@vscale{@scaleunit
-div /vsc X}B /@hsize{/hs X /CLIP 1 N}B /@vsize{/vs X /CLIP 1 N}B /@clip{
-/CLIP 2 N}B /@hoffset{/ho X}B /@voffset{/vo X}B /@angle{/ang X}B /@rwi{
-10 div /rwi X /rwiSeen true N}B /@rhi{10 div /rhi X /rhiSeen true N}B
-/@llx{/llx X}B /@lly{/lly X}B /@urx{/urx X}B /@ury{/ury X}B /magscale
-true def end /@MacSetUp{userdict /md known{userdict /md get type
-/dicttype eq{userdict begin md length 10 add md maxlength ge{/md md dup
-length 20 add dict copy def}if end md begin /letter{}N /note{}N /legal{}
-N /od{txpose 1 0 mtx defaultmatrix dtransform S atan/pa X newpath
-clippath mark{transform{itransform moveto}}{transform{itransform lineto}
-}{6 -2 roll transform 6 -2 roll transform 6 -2 roll transform{
-itransform 6 2 roll itransform 6 2 roll itransform 6 2 roll curveto}}{{
-closepath}}pathforall newpath counttomark array astore /gc xdf pop ct 39
-0 put 10 fz 0 fs 2 F/|______Courier fnt invertflag{PaintBlack}if}N
-/txpose{pxs pys scale ppr aload pop por{noflips{pop S neg S TR pop 1 -1
-scale}if xflip yflip and{pop S neg S TR 180 rotate 1 -1 scale ppr 3 get
-ppr 1 get neg sub neg ppr 2 get ppr 0 get neg sub neg TR}if xflip yflip
-not and{pop S neg S TR pop 180 rotate ppr 3 get ppr 1 get neg sub neg 0
-TR}if yflip xflip not and{ppr 1 get neg ppr 0 get neg TR}if}{noflips{TR
-pop pop 270 rotate 1 -1 scale}if xflip yflip and{TR pop pop 90 rotate 1
--1 scale ppr 3 get ppr 1 get neg sub neg ppr 2 get ppr 0 get neg sub neg
-TR}if xflip yflip not and{TR pop pop 90 rotate ppr 3 get ppr 1 get neg
-sub neg 0 TR}if yflip xflip not and{TR pop pop 270 rotate ppr 2 get ppr
-0 get neg sub neg 0 S TR}if}ifelse scaleby96{ppr aload pop 4 -1 roll add
-2 div 3 1 roll add 2 div 2 copy TR .96 dup scale neg S neg S TR}if}N /cp
-{pop pop showpage pm restore}N end}if}if}N /normalscale{Resolution 72
-div VResolution 72 div neg scale magscale{DVImag dup scale}if 0 setgray}
-N /psfts{S 65781.76 div N}N /startTexFig{/psf$SavedState save N userdict
-maxlength dict begin /magscale true def normalscale currentpoint TR
-/psf$ury psfts /psf$urx psfts /psf$lly psfts /psf$llx psfts /psf$y psfts
-/psf$x psfts currentpoint /psf$cy X /psf$cx X /psf$sx psf$x psf$urx
-psf$llx sub div N /psf$sy psf$y psf$ury psf$lly sub div N psf$sx psf$sy
-scale psf$cx psf$sx div psf$llx sub psf$cy psf$sy div psf$ury sub TR
-/showpage{}N /erasepage{}N /copypage{}N /p 3 def @MacSetUp}N /doclip{
-psf$llx psf$lly psf$urx psf$ury currentpoint 6 2 roll newpath 4 copy 4 2
-roll moveto 6 -1 roll S lineto S lineto S lineto closepath clip newpath
-moveto}N /endTexFig{end psf$SavedState restore}N /@beginspecial{SDict
-begin /SpecialSave save N gsave normalscale currentpoint TR
-@SpecialDefaults count /ocount X /dcount countdictstack N}N /@setspecial
-{CLIP 1 eq{newpath 0 0 moveto hs 0 rlineto 0 vs rlineto hs neg 0 rlineto
-closepath clip}if ho vo TR hsc vsc scale ang rotate rwiSeen{rwi urx llx
-sub div rhiSeen{rhi ury lly sub div}{dup}ifelse scale llx neg lly neg TR
-}{rhiSeen{rhi ury lly sub div dup scale llx neg lly neg TR}if}ifelse
-CLIP 2 eq{newpath llx lly moveto urx lly lineto urx ury lineto llx ury
-lineto closepath clip}if /showpage{}N /erasepage{}N /copypage{}N newpath
-}N /@endspecial{count ocount sub{pop}repeat countdictstack dcount sub{
-end}repeat grestore SpecialSave restore end}N /@defspecial{SDict begin}
-N /@fedspecial{end}B /li{lineto}B /rl{rlineto}B /rc{rcurveto}B /np{
-/SaveX currentpoint /SaveY X N 1 setlinecap newpath}N /st{stroke SaveX
-SaveY moveto}N /fil{fill SaveX SaveY moveto}N /ellipse{/endangle X
-/startangle X /yrad X /xrad X /savematrix matrix currentmatrix N TR xrad
-yrad scale 0 0 1 startangle endangle arc savematrix setmatrix}N end
-%%EndProcSet
-%%BeginProcSet: crop.pro
-TeXDict begin /cX 18 def /CM{gsave TR 0 cX neg moveto 0 cX lineto stroke
-cX neg 0 moveto cX 0 lineto stroke grestore}def end /bop-hook{cX dup TR
-gsave .3 setlinewidth 0 0 CM vsize cX 2 mul sub dup hsize cX 2 mul sub
-dup isls{4 2 roll}if 0 CM exch CM 0 exch CM grestore 0 cX -2 mul TR isls
-{cX -2 mul 0 TR}if}def
-%%EndProcSet
-TeXDict begin @defspecial
-
- /arrow { save 4 1 roll 14 dict begin /y exch def /x exch def /D exch
-def currentpoint /b exch def /a exch def /dx x a sub def /dy y b sub
-def /arrowlen dx dup mul dy dup mul add sqrt def /angle dy dx atan
-def 0 setgray a b translate angle rotate /xp arrowlen def /m xp D sub
-def 0.5 setlinewidth [3 1] 0 setdash 0 0 moveto m 0 lineto stroke /back
-D 8 div neg def /up D 4 div def m 0 moveto back up rlineto xp 0 lineto
-closepath fill m 0 moveto back up neg rlineto xp 0 lineto closepath
-fill end restore } def /drawtriangle { -144 72 rlineto 0 -144 rlineto
-closepath fill } def /cropmark { 2 copy moveto 0 -18 rmoveto 0 36 rlineto
-stroke moveto -18 0 rmoveto 36 0 rlineto stroke } def /fillpage { .9
-setgray 0 0 moveto 0 792 rlineto 612 0 rlineto 0 -792 rlineto fill
-0 setgray .25 setlinewidth 18 18 cropmark 18 684 cropmark 549 684 cropmark
-549 17 cropmark } def /showpart { 10 -22 translate /StoneSans-SemiboldItalic
-findfont 140 scalefont setfont dup stringwidth pop /sw exch def sw
-neg -46 moveto 0 setgray dup show sw 4 add neg -42 moveto 0.7 setgray
-show sw neg 0 translate /StoneSans-SemiboldItalic findfont 30 scalefont
-setfont dup stringwidth pop /sw exch def sw neg 0 moveto 0 setgray
-show sw 10 add neg 0 translate -600 10 moveto 12 0 10 arrow } def
- 
-@fedspecial end TeXDict begin
-37298252 46178789 1000 600 600 (book.dvi) @start /Fa
-133[33 33 33 33 33 33 33 33 33 33 33 33 33 33 33 33 33
-33 33 33 33 33 33 33 33 33 1[33 33 2[33 33 33 33 33 33
-33 33 33 33 33 33 33 33 33 33 33 33 33 33 33 33 33 33
-33 33 33 33 1[33 1[33 3[33 33 33 33 33 33 33 33 33 33
-33 33 3[33 33 3[33 36[{.82 ExtendFont TeXBase1Encoding ReEncodeFont }73
-66.666667 /PPCode rf /Fb 1 14 df<000001FFC000000000001FFFFC0000000000FF
-FFFF8000000001FF007FC000000007F00007F00000001F800000FC0000003F0000007E00
-00007C0000001F000000F000000007800001E000000003C00003C000000001E000078000
-000000F00007000000000070000F000000000078001E00000000003C001C00000000001C
-003C00000000001E003800000000000E007800000000000F007000000000000700700000
-0000000700F000000000000780E000000000000380E000000000000380E0000000000003
-80E000000000000380E000000000000380E000000000000380E000000000000380E00000
-0000000380E000000000000380F000000000000780700000000000070070000000000007
-007800000000000F003800000000000E003C00000000001E001C00000000001C001E0000
-0000003C000F000000000078000700000000007000078000000000F00003C000000001E0
-0001E000000003C00000F0000000078000007C0000001F0000003F0000007E0000001F80
-0000FC00000007F00007F000000001FF007FC000000000FFFFFF80000000001FFFFC0000
-00000001FFC000000039357CA842>13 D E /Fc 140[135 6[135
-3[135 3[135 2[135 97[{.82 ExtendFont TeXBase1Encoding ReEncodeFont }5
-274.999988 /PPCode rf /Fd 144[37 2[37 7[37 1[37 98[{
-.82 ExtendFont TeXBase1Encoding ReEncodeFont }4 75.000000
-/PPCodeBold rf /Fe 1 12 df<00003FC000000000FFF800000007E07C0000000F801F
-0000003F001F800C007E000F800C00FC0007C01C01F80007E01803F00007E01807E00003
-E0380FE00003F0300FC00003F0301FC00003F0703F800003F0603F800003F0E07F800003
-F0C07F000003F1C07F000003F1807F000003F380FF000003F300FE000003F700FE000003
-FE00FE000003FC00FE000003FC00FC000003F800FC000003F000FC000003F000FC000003
-F000FC000003F0007E000007F0007E00000FF0003E00001DF8183F000079F8181F0000E1
-F8380F8007C0F83007E03F007CF001FFF8003FC0003FC0000F802E267DA435>11
-D E /Ff 82[28 51[42 42 60 1[46 28 32 32 1[42 37 46 1[23
-37 23 23 1[42 1[32 42 34 38 37 11[65 51 4[65 2[46 5[46
-51 65 17[42 42 49[{ TeXBase1Encoding ReEncodeFont }30
-83.333337 /Palatino-Italic rf /Fg 140[61 2[61 61 61 61
-61 61 2[61 2[61 61 61 1[61 55[61 61 40[{
-.82 ExtendFont TeXBase1Encoding ReEncodeFont }14 124.999997
-/PPCode rf /Fh 134[53 1[53 53 53 53 53 53 1[53 53 53
-53 53 53 1[53 53 53 53 53 53 53 1[53 1[53 11[53 6[53
-29[53 4[53 53 40[{.82 ExtendFont TeXBase1Encoding ReEncodeFont }27
-108.333331 /PPCode rf /Fi 134[37 37 3[37 37 37 1[37 37
-37 37 37 2[37 37 37 37 37 37 37 37 37 1[37 15[37 8[37
-70[{ TeXBase1Encoding ReEncodeFont .167 SlantFont .82 ExtendFont }22
-75.000000 /PPCode rf /Fj 134[43 43 43 43 43 43 43 43
-1[43 43 43 43 43 2[43 43 43 43 43 43 43 43 43 1[43 8[43
-43 2[43 2[43 43 43 43 2[43 2[43 43 1[43 43 43 43 17[43
-6[43 39[{ TeXBase1Encoding ReEncodeFont .167 SlantFont .82 ExtendFont }
-39 87.499997 /PPCode rf /Fk 134[74 80 118 74 86 62 62
-62 88 88 84 88 132 43 84 1[43 88 88 57 76 88 69 89 79
-7[91 98 145 96 96 84 74 89 103 86 103 99 129 74 1[44
-44 101 99 69 74 101 89 89 99 6[42 84 84 84 84 84 84 84
-84 84 84 76 42 46 42 2[59 59 32 39[{ TeXBase1Encoding ReEncodeFont }66
-133.333334 /StoneSans-Bold rf /Fl 82[30 24[46 46 25[51
-47 76 52 55 30 39 36 1[55 50 53 81 27 51 1[27 53 51 30
-44 56 41 51 46 11[71 4[55 3[56 2[31 26[23 1[23 2[30 30
-37[55 2[{ TeXBase1Encoding ReEncodeFont }35 91.666666
-/Palatino-Roman rf /Fm 82[32 3[71 46[48 53 48 80 53 58
-32 42 37 58 58 53 58 85 32 58 32 32 58 53 37 48 58 42
-58 48 8[64 95 74 74 64 58 69 80 58 80 80 95 58 74 37
-37 80 80 53 58 80 69 64 74 6[24 48 48 3[48 2[48 1[28
-24 1[24 4[27 36[58 2[{ TeXBase1Encoding ReEncodeFont }62
-95.833334 /Palatino-Bold rf /Fn 134[138 149 222 139 160
-115 115 115 1[166 158 165 247 80 157 1[80 165 166 106
-142 166 129 166 147 10[180 180 157 139 166 1[161 194
-185 241 138 1[82 82 189 1[129 138 190 166 1[185 19[87
-45[{ TeXBase1Encoding ReEncodeFont }42 249.999994 /StoneSans-Bold
-rf /Fo 134[181 2[181 1[136 149 140 1[218 211 215 319
-94 2[94 1[218 1[191 218 167 217 188 12[207 194 2[207
-3[181 4[266 1[189 263 2[233 65[{ TeXBase1Encoding ReEncodeFont }25
-349.999988 /StoneSans-Semibold rf /Fp 141[25 2[37 38
-55 3[17 1[38 1[31 101[{ TeXBase1Encoding ReEncodeFont }7
-66.666667 /StoneSans-SemiboldItalic rf /Fq 129[37 37
-37 37 37 37 37 37 37 37 37 37 37 37 37 37 37 37 37 37
-37 37 37 37 37 37 37 37 37 37 37 37 37 37 37 37 37 37
-37 37 37 37 37 37 37 37 37 37 37 37 37 37 37 37 37 37
-37 37 37 37 37 37 37 37 37 37 37 37 37 37 37 37 37 37
-37 37 37 37 37 37 37 37 37 37 37 37 37 37 37 37 37 37
-37 37 33[{.82 ExtendFont TeXBase1Encoding ReEncodeFont }94
-75.000000 /PPCode rf /Fr 129[43 1[43 1[43 43 43 43 43
-43 43 43 43 43 43 43 43 43 43 43 43 43 43 43 43 43 43
-43 43 43 43 43 43 43 43 43 43 43 43 43 43 43 43 43 43
-43 43 43 43 43 43 43 43 43 43 43 43 43 43 43 43 43 43
-43 43 43 43 43 43 43 43 43 43 43 43 43 43 43 43 43 43
-43 43 43 43 43 43 43 43 43 43 43 43 43 33[{
-.82 ExtendFont TeXBase1Encoding ReEncodeFont }92 87.499997
-/PPCode rf /Fs 82[28 50[42 46 42 69 46 51 28 37 32 51
-51 46 51 74 28 51 28 28 51 46 32 42 51 37 51 42 7[55
-55 83 65 65 55 51 60 69 51 69 69 83 51 65 32 32 69 69
-46 51 69 60 55 65 1[37 4[21 42 42 42 42 42 42 42 42 42
-42 25 21 1[21 2[28 28 23 36[51 2[{ TeXBase1Encoding ReEncodeFont }71
-83.333337 /Palatino-Bold rf /Ft 134[53 57 85 53 61 44
-44 44 1[64 61 63 95 31 60 1[31 63 64 41 55 64 49 64 57
-10[69 69 60 53 64 1[62 74 71 93 53 1[32 32 72 71 50 53
-73 64 64 71 7[60 60 60 60 60 60 60 60 60 60 55 1[33 45[{
- TeXBase1Encoding ReEncodeFont }55 95.833334 /StoneSans-Bold
-rf /Fu 133[62 65 70 104 65 75 54 54 54 77 77 74 77 115
-37 73 1[37 77 77 50 66 77 60 78 69 7[80 86 127 84 84
-73 65 78 1[75 90 86 113 65 82 38 38 88 87 60 65 88 78
-78 86 6[37 73 73 73 73 73 73 73 73 73 73 67 37 41 37
-4[28 39[{ TeXBase1Encoding ReEncodeFont }65 116.666669
-/StoneSans-Bold rf /Fv 134[41 43 65 41 47 29 32 29 50
-50 48 49 74 20 40 1[20 49 49 25 42 49 40 49 42 8[54 77
-49 57 46 43 46 66 45 66 65 77 40 49 23 22 58 61 40 41
-61 57 48 51 6[24 48 48 48 48 48 48 48 48 48 48 32 24
-28 24 2[29 29 17 39[{ TeXBase1Encoding ReEncodeFont }66
-83.333337 /StoneSans rf /Fw 82[28 20[28 83 42 1[42 42
-22[50 1[42 46 43 69 47 50 27 35 33 46 50 45 48 73 24
-46 19 24 48 46 28 40 51 37 46 42 23 42 1[28 1[28 55 55
-55 83 60 65 51 44 55 65 50 65 69 79 51 60 28 28 69 63
-46 51 64 59 51 65 5[21 21 42 42 42 42 42 42 42 42 42
-42 50 21 1[21 50 32 28 28 23 5[23 29[50 50 2[{
- TeXBase1Encoding ReEncodeFont }86 83.333337 /Palatino-Roman
-rf /Fx 173[33 24[25 25 25 25 25 25 25 25 25 25 48[{
- TeXBase1Encoding ReEncodeFont }11 50.000001 /Palatino-Roman
-rf /Fy 82[32 50[42 48 48 69 48 53 32 37 37 44 48 42 53
-74 27 42 27 27 48 48 27 37 48 39 44 42 8[69 90 69 74
-58 53 64 74 58 74 74 90 53 64 1[32 74 69 53 58 74 64
-58 69 6[24 3[48 1[48 1[48 48 1[28 24 1[24 58 1[32 32
-27 74 35[50 2[{ TeXBase1Encoding ReEncodeFont }64 95.833334
-/Palatino-Italic rf /Fz 135[50 1[47 12[23 105[{
- TeXBase1Encoding ReEncodeFont }3 95.833334 /StoneSans
-rf /FA 82[32 20[32 95 48 58 48 48 24[48 53 49 80 54 58
-31 40 38 53 57 52 56 84 28 53 22 28 56 53 32 46 58 42
-53 48 1[48 1[32 58 32 64 64 64 95 69 74 59 50 64 75 58
-75 79 90 58 69 32 32 79 73 53 58 74 68 58 74 71 42 3[24
-24 48 48 48 48 48 48 48 48 48 48 58 24 1[24 1[37 32 32
-27 74 4[27 29[58 58 2[{ TeXBase1Encoding ReEncodeFont }88
-95.833334 /Palatino-Roman rf /FB 134[149 149 2[166 100
-116 116 1[149 133 166 1[83 2[83 149 149 83 116 149 122
-138 133 11[233 183 166 2[183 233 233 1[166 2[100 1[216
-2[233 199 183 216 17[88 47[{ TeXBase1Encoding ReEncodeFont }33
-300.000000 /Palatino-Italic rf /FC 141[42 2[48 2[30 2[30
-3[42 3[48 13[60 11[78 2[84 21[27 46[{ TeXBase1Encoding ReEncodeFont }10
-108.333331 /Palatino-Italic rf /FD 82[36 21[108 29[60
-56 90 61 65 35 46 43 1[65 59 63 95 31 60 1[31 63 60 36
-52 66 48 60 54 19[102 2[36 36 1[82 1[66 22[27 1[27 44[{
- .167 SlantFont TeXBase1Encoding ReEncodeFont }32 108.333331
-/Palatino-Roman rf /FE 171[112 84[{ TeXBase1Encoding ReEncodeFont }1
-183.333331 /Palatino-Italic rf /FF 139[24 32 30 1[45
-1[43 1[22 2[22 1[42 32[42 4[58 7[37 37 6[37 4[19 44[{
- .167 SlantFont TeXBase1Encoding ReEncodeFont }14 75.000000
-/Palatino-Roman rf /FG 1 14 df<00000003FFC00000000000003FFFFC0000000000
-01FFFFFF800000000007FFFFFFE0000000001FFE007FF8000000007FE00007FE00000000
-FF000000FF00000003FC0000003FC0000007F00000000FE000000FC000000003F000001F
-8000000001F800003F0000000000FC00007E00000000007E0000FC00000000003F0000F8
-00000000001F0001F000000000000F8003F000000000000FC003E0000000000007C007C0
-000000000003E00FC0000000000003F00F80000000000001F01F00000000000000F81F00
-000000000000F81E00000000000000783E000000000000007C3E000000000000007C3C00
-0000000000003C7C000000000000003E7C000000000000003E78000000000000001E7800
-0000000000001E78000000000000001EF8000000000000001FF8000000000000001FF000
-0000000000000FF0000000000000000FF0000000000000000FF0000000000000000FF000
-0000000000000FF0000000000000000FF0000000000000000FF0000000000000000FF000
-0000000000000FF0000000000000000FF8000000000000001FF8000000000000001F7800
-0000000000001E78000000000000001E78000000000000001E7C000000000000003E7C00
-0000000000003E3C000000000000003C3E000000000000007C3E000000000000007C1E00
-000000000000781F00000000000000F81F00000000000000F80F80000000000001F00FC0
-000000000003F007C0000000000003E003E0000000000007C003F000000000000FC001F0
-00000000000F8000F800000000001F0000FC00000000003F00007E00000000007E00003F
-0000000000FC00001F8000000001F800000FC000000003F0000007F00000000FE0000003
-FC0000003FC0000000FF000000FF000000007FE00007FE000000001FFE007FF800000000
-07FFFFFFE00000000001FFFFFF8000000000003FFFFC00000000000003FFC0000000484E
-7BBB53>13 D E /FH 82[25 51[37 3[42 25 29 29 2[33 42 1[21
-2[21 1[37 21 29 1[30 35 33 16[46 3[42 7[58 50 67[{
- TeXBase1Encoding ReEncodeFont }20 75.000000 /Palatino-Italic
-rf /FI 82[25 21[75 37 27[37 42 39 62 42 45 24 32 30 42
-45 41 43 66 22 42 17 22 43 42 25 36 46 33 41 37 6[50
-50 50 75 54 58 46 39 50 59 45 59 62 71 46 54 25 25 62
-57 42 46 58 53 46 58 6[19 37 37 37 37 37 37 37 37 37
-37 45 19 1[19 4[21 58 2[37 1[21 29[45 45 2[{
- TeXBase1Encoding ReEncodeFont }75 75.000000 /Palatino-Roman
-rf /FJ 147[26 108[{}1 33.333334 /ZapfDingbats rf /FK
-134[37 39 58 1[43 26 29 26 2[43 44 67 18 36 1[18 44 44
-22 38 44 36 1[37 12[42 39 42 1[40 59 1[69 4[53 2[37 55
-51 43 46 20[21 44[{ TeXBase1Encoding ReEncodeFont }33
-75.000000 /StoneSans rf /FL 134[46 50 2[53 38 38 38 1[55
-53 55 82 27 2[27 55 55 35 47 55 43 55 49 7[57 1[91 2[52
-46 2[54 65 62 1[46 2[27 1[62 43 46 63 55 55 62 7[52 52
-52 52 52 52 52 52 52 52 1[26 29 26 44[{ TeXBase1Encoding ReEncodeFont }
-49 83.333337 /StoneSans-Bold rf /FM 140[63 59 2[82 87
-1[43 83 1[43 87 2[72 1[66 1[75 9[149 2[92 6[141 1[108
-50 4[91 22[37 46[{ TeXBase1Encoding ReEncodeFont }18
-150.000000 /Palatino-Roman rf /FN 135[174 1[194 213 116
-3[213 194 213 310 116 2[116 3[174 1[155 1[174 20[213
-7[290 2[271 65[{ TeXBase1Encoding ReEncodeFont }16 349.999988
-/Palatino-Bold rf /FO 139[89 89 115[{}2 100.000003 /ZapfDingbats
-rf /FP 135[133 1[148 162 88 3[162 148 162 236 88 2[88
-3[133 1[118 1[133 20[162 7[221 2[207 65[{
- TeXBase1Encoding ReEncodeFont }16 266.666669 /Palatino-Bold
-rf /FQ 139[67 67 115[{}2 75.000000 /ZapfDingbats rf end
-%%EndProlog
-%%BeginSetup
-%%Feature: *Resolution 600dpi
-TeXDict begin
-%%PaperSize: Letter
-
-%%EndSetup
-%%Page: 445 1
-445 468 bop 0 0 a @beginspecial @setspecial
- gsave .50 setgray newpath 278 10 moveto 0 100 rlineto 132 0 rlineto
-0 -100 rlineto -132 0 rlineto closepath fill 1 setgray /StoneSans-Bold
-findfont 12 scalefont setfont 296 19 moveto 3 0 (CHAPTER 24) ashow
-grestore
- 
-@endspecial
-299 355 a Fn(Parsing)84 b(Command-)299 654 y(Line)g(Options)299
-1557 y Fm(From)21 b(the)f(forthcoming)i(book)f(entitled)f(Linux)h
-(Application)g(Development)f(by)299 1669 y(Michael)35
-b(K.)h(Johnson)h(and)e(Erik)h(W)l(.)g(T)-11 b(roan,)39
-b(copyright)d(\251)g(1998)e(by)i(Addison)299 1781 y(W)-7
-b(esley)38 b(Longman,)43 b(Inc.,)f(to)d(be)f(published)i(in)e(April,)k
-(1998.)77 b(All)38 b(rights)h(re\255)299 1893 y(served.)c(This)24
-b(material)e(is)i(made)g(available)f(with)g(the)h(permission)h(of)f
-(the)f(pub\255)299 2005 y(lisher)-5 b(.)34 b(The)21 b(publisher)5
-b(')-5 b(s)23 b(permission)g(is)g(required)f(for)h(reproduction,)g
-(storage,)299 2117 y(or)h(transmittal)f(of)h(this)g(material.)299
-2329 y(For)g(more)g(information,)g(see)f(http:/)-14 b(/www)-9
-b(.awl.com/cseng/books/lad/.)299 2541 y FA(Most)41 b(Linux)e(pr)n
-(ograms)h(allow)f(the)g(user)g(to)h(specify)h(command\255line)e
-(options.)299 2653 y(Such)23 b(options)h(perform)g(a)f(wide)g(variety)g
-(of)g(functions)g(but)g(ar)n(e)g(fairly)f(uniform)h(in)299
-2765 y(their)31 b(syntax.)60 b Fm(Short)33 b(options)g
-FA(consist)g(of)f(a)g Fr(-)h FA(character)e(followed)h(by)g(a)g(single)
-299 2877 y(alphanumeric)25 b(character)-7 b(.)43 b Fm(Long)28
-b(options)p FA(,)g(common)g(in)e(GNU)h(utilities,)g(consist)299
-2989 y(of)f(two)g Fr(-)g FA(characters)g(followed)g(by)g(a)g(string)g
-(made)g(up)g(of)g(letters,)h(numbers,)f(and)299 3101
-y(hyphens.)34 b(Either)24 b(type)g(of)g(option)g(may)h(be)e(followed)h
-(by)g(an)f(ar)n(gument.)34 b(A)24 b(space)299 3213 y(separates)19
-b(a)f(short)h(option)f(fr)n(om)h(its)g(ar)n(guments;)h(either)d(a)i
-(space)g(or)g(an)f Fr(=)g FA(separates)299 3325 y(a)23
-b(long)h(option)g(fr)n(om)g(an)f(ar)n(gument.)299 3537
-y(Ther)n(e)c(ar)n(e)h(many)g(ways)g(of)h(parsing)f(command\255line)g
-(options.)34 b(The)19 b(most)j(popular)299 3649 y(method)k(is)g
-(parsing)g(the)g Fr(argv)f FA(array)g(by)h(hand.)40 b(The)25
-b Fr(getopt\(\))g FA(and)h Fr(getopt_long\(\))299 3761
-y FA(library)40 b(functions)h(pr)n(ovide)g(some)h(assistance)g(for)f
-(option)h(parsing.)86 b Fr(getopt\(\))299 3873 y FA(is)38
-b(pr)n(ovided)h(by)f(many)f(Unix)h(implementations,)j(but)d(it)f
-(supports)j(only)d(short)299 3985 y(options.)d(The)22
-b Fr(getopt_long\(\))g FA(function)g(is)h(available)e(on)h(Linux)h(and)
-f(allows)h(auto\255)299 4097 y(mated)h(parsing)g(of)f(both)h(short)g
-(and)f(long)h(options.)299 4309 y(A)33 b(library)f(called)h(popt)h
-(exists)g(speci\002cally)f(for)g(option)g(parsing.)62
-b(It)34 b(includes)e(a)299 4421 y(number)22 b(of)i(advantages)g(over)f
-(the)g Fr(getopt\(\))g FA(functions.)3232 4699 y Ft(445)p
-eop
-%%Page: 446 2
-446 469 bop -187 -116 a Ft(446)118 b FL(Chapter)29 b(24)83
-b Fv(Parsing)23 b(Command-Line)f(Options)p -187 -76 3413
-4 v 128 83 a FA(\225)100 b(It)33 b(does)h(not)f(make)h(use)f(of)g
-(global)g(variables,)h(which)e(allows)h(it)g(to)h(be)f(used)286
-195 y(when)22 b(multiple)h(passes)j(ar)n(e)d(needed)g(to)h(parse)g
-Fr(argv)p FA(.)128 407 y(\225)100 b(It)22 b(can)h(parse)f(an)g
-(arbitrary)f(array)g(of)i Fr(argv)p FA(\255style)f(elements.)33
-b(This)22 b(allows)g(popt)286 519 y(to)i(be)f(used)h(for)g(parsing)f
-(command\255line\255style)h(strings)g(fr)n(om)g(any)f(sour)n(ce.)128
-731 y(\225)100 b(It)30 b(pr)n(ovides)h(a)f(standar)n(d)g(method)g(of)g
-(option)g(aliasing.)52 b(Pr)n(ograms)30 b(that)g(use)286
-843 y(popt)c(can)f(easily)g(allow)f(users)h(to)g(add)h(new)e
-(command\255line)h(options,)h(which)286 955 y(ar)n(e)k(de\002ned)g(as)h
-(combinations)f(of)h(alr)n(eady\255existing)e(options.)55
-b(This)30 b(allows)286 1067 y(the)h(user)h(to)h(de\002ne)e(new)-9
-b(,)33 b(complex)h(behaviors)d(or)h(change)f(the)h(default)f(be\255)286
-1179 y(haviors)23 b(of)h(existing)f(options.)111 1453
-y(Like)h Fr(getopt_long\(\))p FA(,)e(the)i(popt)h(library)d(supports)j
-(short)f(and)g(long)f(style)h(options.)111 1665 y(The)29
-b(popt)j(library)d(is)h(highly)f(portable)h(and)g(should)g(work)f(on)h
-(any)g(POSIX)g(plat\255)111 1777 y(form.)68 b(The)34
-b(latest)h(version)g(is)g(always)g(available)e(fr)n(om)i(ftp:/)-14
-b(/ftp.r)n(edhat.com/)111 1889 y(pub/r)n(edhat/code/popt/)111
-2100 y(It)33 b(may)f(be)g(r)n(edistributed)f(under)g(either)g(the)h
-(GNU)g(General)f(Public)g(License)h(or)111 2213 y(the)24
-b(GNU)g(Library)f(General)f(Public)h(License,)h(at)f(the)h(distributor)
-7 b('s)23 b(discr)n(etion.)-187 2541 y Fk(24.1)131 b(Basic)40
-b(popt)j(Usage)p -187 2626 3413 5 v 111 2888 a Fu(24.1.1)59
-b(The)39 b(Option)h(Table)111 3099 y FA(Applications)d(pr)n(ovide)f
-(popt)g(with)f(information)f(on)h(their)f(command\255line)h(op\255)111
-3211 y(tions)24 b(thr)n(ough)f(an)g(array)g(of)h Fr(struct)42
-b(poptOption)23 b FA(str)o(uctur)n(es.)111 3417 y Fq(#include)35
-b(<popt.h>)111 3633 y(struct)h(poptOption)e({)258 3741
-y(const)i(char)g(*)g(longName;)f(/*)h(may)g(be)h(NULL)e(*/)258
-3849 y(char)h(shortName;)292 b(/*)36 b(may)g(be)h('\\0')e(*/)258
-3957 y(int)h(argInfo;)258 4065 y(void)g(*)h(arg;)440
-b(/*)36 b(depends)f(on)i(argInfo)e(*/)258 4172 y(int)h(val;)551
-b(/*)36 b(0)h(means)e(do)i(not)f(return,)f(just)h(update)f(flag)h(*/)
-111 4280 y(};)p eop
-%%Page: 447 3
-447 470 bop 2237 -116 a Fv(24.1)82 b(Basic)23 b(popt)f(Usage)119
-b Ft(447)p 0 -76 3413 4 v 446 71 a FL(Table)27 b(24.1)84
-b Fv(popt)22 b(Argument)i(Types)p 446 103 2820 4 v 446
-120 4 17 v 1167 120 V 2775 120 V 3262 120 V 446 219 4
-100 v 532 190 a Fs(V)-9 b(alue)p 1167 219 V 502 w(Description)p
-2775 219 V 1160 w Fq(arg)20 b Fs(T)-7 b(ype)p 3262 219
-V 446 236 4 17 v 1167 236 V 2775 236 V 3262 236 V 446
-239 2820 4 v 446 246 4 7 v 1167 246 V 2775 246 V 3262
-246 V 446 249 2820 4 v 446 266 4 17 v 1167 266 V 2775
-266 V 3262 266 V 446 365 4 100 v 532 336 a Fq(POPT_ARG_NONE)p
-1167 365 V 240 w Fw(No)21 b(ar)o(gument)f(is)h(expected)p
-2775 365 V 688 w Fq(int)p 3262 365 V 446 465 V 532 436
-a(POPT_ARG_STRING)p 1167 465 V 166 w Fw(No)g(type)g(checking)g(should)h
-(be)e(performed)p 2775 465 V 169 w Fq(char)35 b(*)p 3262
-465 V 446 565 V 532 535 a(POPT_ARG_INT)p 1167 565 V 277
-w Fw(An)21 b(integer)f(ar)o(gument)h(is)g(expected)p
-2775 565 V 410 w Fq(int)p 3262 565 V 446 664 V 532 635
-a(POPT_ARG_LONG)p 1167 664 V 240 w Fw(A)f(long)i(integer)f(is)g
-(expected)p 2775 664 V 652 w Fq(long)p 3262 664 V 446
-681 4 17 v 1167 681 V 2775 681 V 3262 681 V 446 684 2820
-4 v 299 933 a FA(Each)34 b(member)f(of)g(the)g(table)g(de\002nes)g(a)h
-(single)f(option)g(that)g(may)h(be)f(passed)i(to)299
-1045 y(the)29 b(pr)n(ogram.)50 b(Long)30 b(and)e(short)i(options)f(ar)n
-(e)g(consider)n(ed)h(a)f(single)f(option)i(that)299 1157
-y(may)k(occur)g(in)g(two)g(dif)n(fer)n(ent)f(forms.)65
-b(The)33 b(\002rst)h(two)g(members,)i Fr(longName)e FA(and)299
-1269 y Fr(shortName)p FA(,)25 b(de\002ne)g(the)g(names)h(of)f(the)g
-(option;)i(the)e(\002rst)h(is)g(a)g(long)f(name,)g(and)h(the)299
-1381 y(latter)d(is)h(a)g(single)f(character)-7 b(.)299
-1593 y(The)21 b Fr(argInfo)g FA(member)h(tells)g(popt)h(what)e(type)h
-(of)g(ar)n(gument)g(is)g(expected)h(after)e(the)299 1705
-y(ar)n(gument.)33 b(If)23 b(no)g(option)g(is)g(expected,)h
-Fr(POPT_ARG_NONE)d FA(should)i(be)g(used.)34 b(The)22
-b(r)n(est)299 1817 y(of)i(the)f(valid)g(values)h(ar)n(e)f(summarized)g
-(in)h(T)-9 b(able)22 b(24.1.)2355 1783 y Fx(1)299 2029
-y FA(The)j(next)g(element,)g Fr(arg)p FA(,)h(allows)f(popt)i(to)f
-(automatically)f(update)h(pr)n(ogram)g(vari\255)299 2141
-y(ables)21 b(when)g(the)g(option)h(is)g(used.)34 b(If)22
-b Fr(arg)f FA(is)h Fr(NULL)p FA(,)g(it)f(is)i(ignor)n(ed)e(and)h(popt)g
-(takes)h(no)299 2253 y(special)18 b(action.)33 b(Otherwise,)18
-b(it)g(should)g(point)h(to)f(a)g(variable)f(of)h(the)g(type)g
-(indicated)299 2365 y(in)23 b(the)g(right\255most)h(column)g(of)g(T)-9
-b(able)22 b(24.1.)299 2577 y(If)42 b(the)f(option)g(takes)h(no)g(ar)n
-(gument)e(\()p Fr(argInfo)h FA(is)h Fr(POPT_ARG_NONE)p
-FA(\),)e(the)h(variable)299 2689 y(pointed)21 b(to)g(by)f
-Fr(arg)h FA(is)g(set)g(to)g(1)f(when)f(the)h(option)h(is)g(used.)34
-b(If)20 b(the)g(option)h(does)h(take)299 2801 y(an)16
-b(ar)n(gument,)i(the)f(variable)e(that)i Fr(arg)g FA(points)h(to)g(is)f
-(updated)h(to)f(r)n(e\003ect)g(the)g(value)f(of)299 2913
-y(the)23 b(ar)n(gument.)34 b(Any)24 b(string)f(is)i(acceptable)e(for)h
-Fr(POPT_ARG_STRING)e FA(ar)n(guments,)i(but)299 3025
-y Fr(POPT_ARG_INT)19 b FA(and)h Fr(POPT_ARG_LONG)e FA(ar)n(guments)i
-(ar)n(e)g(converted)g(to)g(the)g(appr)n(opriate)299 3137
-y(type,)k(and)f(an)h(err)n(or)f(is)h(r)n(eturned)f(if)g(the)g
-(conversion)h(fails.)299 3349 y(The)33 b(\002nal)g(option,)38
-b Fr(val)p FA(,)e(is)f(the)f(value)f(popt's)j(parsing)e(function)f
-(should)i(r)n(eturn)299 3461 y(when)26 b(the)h(option)h(is)g(encounter)
-n(ed.)45 b(If)27 b(it)h(is)g(0,)g(the)f(parsing)h(function)f(parses)h
-(the)299 3573 y(next)23 b(command\255line)h(ar)n(gument)f(rather)f
-(than)h(r)n(eturn.)299 3785 y(The)c(\002nal)g(str)o(uctur)n(e)h(in)f
-(the)h(table)f(should)h(have)f(all)g(the)h(pointer)g(values)f(set)h(to)
-h Fr(NULL)299 3897 y FA(and)i(all)h(the)f(arithmetic)g(values)g(set)h
-(to)g(0,)g(marking)f(the)g(end)h(of)g(the)f(table.)p
-299 4234 897 5 v 299 4315 a Fw(1.)29 b Fq(getopt\(\))g
-Fw(connoisseurs)j(will)f(note)g(that)f Fq(argInfo)f Fw(is)i(the)f(only)
-i(\002eld)e(of)h Fq(struct)46 b(poptOption)391 4407 y
-Fw(that)29 b(is)g(not)g(dir)o(ectly)f(analogous)i(to)f(a)f(\002eld)h
-(in)g(the)g Fq(getopt_long\(\))d Fw(ar)o(gument)i(table.)53
-b(The)391 4498 y(similarity)22 b(between)e(the)h(two)g(allows)h(for)e
-(easy)h(transitions)h(fr)o(om)e Fq(getopt_long\(\))e
-Fw(to)j(popt.)p eop
-%%Page: 448 4
-448 471 bop -187 -116 a Ft(448)118 b FL(Chapter)29 b(24)83
-b Fv(Parsing)23 b(Command-Line)f(Options)p -187 -76 3413
-4 v 111 85 a Fu(24.1.2)59 b(Creating)39 b(a)f(Context)111
-297 y FA(popt)31 b(can)f(interleave)e(the)h(parsing)g(of)h(multiple)g
-(command\255line)f(sets.)53 b(It)30 b(allows)111 409
-y(this)e(by)g(keeping)g(all)f(the)g(state)i(information)d(for)i(a)g
-(particular)f(set)h(of)g(command\255)111 521 y(line)22
-b(ar)n(guments)h(in)f(a)h Fr(poptContext)e FA(data)i(str)o(uctur)n(e,)g
-(an)f(opaque)h(type)g(that)g(should)111 633 y(not)h(be)f(modi\002ed)i
-(outside)f(the)f(popt)i(library)-11 b(.)111 845 y(New)24
-b(popt)h(contexts)g(ar)n(e)e(cr)n(eated)h(by)g Fr(poptGetContext\(\))p
-FA(.)111 1051 y Fq(#include)35 b(<popt.h>)111 1266 y(poptContext)g
-(poptGetContext\(char)d(*)k(name,)g(int)g(argc,)f(char)h(**)h(argv,)
-1104 1374 y(struct)e(poptOption)g(*)h(options,)f(int)h(flags\);)111
-1586 y FA(The)26 b(\002rst)h(parameter)-7 b(,)26 b Fr(name)p
-FA(,)h(is)g(used)g(only)g(for)f(alias)h(handling)e(\(discussed)j
-(later\).)111 1698 y(It)h(should)f(be)f(the)h(name)f(of)h(the)g
-(application)g(whose)f(options)i(ar)n(e)e(being)g(parsed,)111
-1810 y(or)e(should)f(be)g Fr(NULL)g FA(if)g(no)g(option)h(aliasing)e
-(is)i(desir)n(ed.)36 b(The)24 b(next)g(two)g(ar)n(guments)111
-1922 y(specify)g(the)f(command\255line)g(ar)n(guments)g(to)h(parse.)34
-b(These)22 b(ar)n(e)h(generally)f(passed)111 2034 y(to)37
-b Fr(poptGetContext\(\))e FA(exactly)i(as)g(they)f(wer)n(e)g(passed)i
-(to)f(the)f(pr)n(ogram's)h Fr(main\(\))111 2146 y FA(function.)50
-b(The)29 b Fr(options)f FA(parameter)h(points)h(to)g(the)f(table)f(of)i
-(command\255line)e(op\255)111 2259 y(tions,)33 b(which)d(was)h
-(described)h(in)e(the)h(pr)n(evious)g(section.)56 b(The)30
-b(\002nal)g(parameter)-7 b(,)111 2371 y Fr(flags)p FA(,)21
-b(is)g(not)g(curr)n(ently)e(used)i(but)g(should)f(always)g(be)h
-(speci\002ed)g(as)g(0)f(for)h(compat\255)111 2483 y(ibility)i(with)g
-(futur)n(e)g(versions)h(of)g(the)f(popt)i(library)-11
-b(.)111 2694 y(A)26 b Fr(poptContext)f FA(keeps)h(track)g(of)g(which)e
-(options)j(have)d(alr)n(eady)h(been)g(parsed)h(and)111
-2807 y(which)h(r)n(emain,)i(among)f(other)f(things.)47
-b(If)28 b(a)g(pr)n(ogram)g(wishes)g(to)h(r)n(estart)f(option)111
-2919 y(pr)n(ocessing)23 b(of)f(a)g(set)g(of)g(ar)n(guments,)g(it)f(can)
-h(r)n(eset)g(the)f Fr(poptContext)g FA(by)h(passing)g(the)111
-3031 y(context)j(as)f(the)f(sole)h(ar)n(gument)f(to)h
-Fr(poptResetContext\(\))p FA(.)111 3242 y(When)j(ar)n(gument)g(pr)n
-(ocessing)h(is)g(complete,)h(the)d(pr)n(ocess)j(should)f(fr)n(ee)e(the)
-h Fr(popt-)111 3354 y(Context)22 b FA(as)h(it)f(contains)h(dynamically)
-f(allocated)g(components.)35 b(The)21 b Fr(poptFreeCon-)111
-3467 y(text\(\))32 b FA(function)g(takes)h(a)f Fr(poptContext)g
-FA(as)h(its)g(sole)g(ar)n(gument)e(and)i(fr)n(ees)f(the)g(r)n(e\255)111
-3579 y(sour)n(ces)25 b(the)e(context)i(is)f(using.)111
-3790 y(Her)n(e)g(ar)n(e)f(the)h(pr)n(ototypes)h(of)f(both)f
-Fr(poptResetContext\(\))f FA(and)i Fr(poptFreeContext\(\))p
-FA(.)111 3996 y Fq(#include)35 b(<popt.h>)111 4212 y(void)h
-(poptFreeContext\(poptContext)31 b(con\);)111 4320 y(void)36
-b(poptResetContext\(poptContext)30 b(con\);)p eop
-%%Page: 449 5
-449 472 bop 2237 -116 a Fv(24.1)82 b(Basic)23 b(popt)f(Usage)119
-b Ft(449)p 0 -76 3413 4 v 299 85 a Fu(24.1.3)58 b(Parsing)39
-b(the)h(Command)e(Line)299 297 y FA(After)26 b(an)g(application)h(has)g
-(cr)n(eated)f(a)h Fr(poptContext)p FA(,)f(it)h(may)g(begin)e(parsing)i
-(ar)n(gu\255)299 409 y(ments.)34 b(The)23 b Fr(poptGetNextOpt\(\))f
-FA(performs)i(the)g(actual)f(ar)n(gument)g(parsing.)299
-615 y Fq(#include)35 b(<popt.h>)299 831 y(int)h
-(poptGetNextOpt\(poptContext)31 b(con\);)299 1042 y FA(T)-9
-b(aking)44 b(the)h(context)h(as)g(its)f(sole)h(ar)n(gument,)k(this)45
-b(function)g(parses)h(the)f(next)299 1154 y(command\255line)34
-b(ar)n(gument)f(found.)65 b(After)34 b(\002nding)f(the)h(next)g(ar)n
-(gument)f(in)h(the)299 1266 y(option)29 b(table,)g(the)f(function)g
-(\002lls)g(in)g(the)g(object)i(pointed)e(to)h(by)g(the)f(option)h
-(table)299 1379 y(entry's)18 b Fr(arg)g FA(pointer)h(if)f(it)h(is)g
-(not)f Fr(NULL)p FA(.)g(If)h(the)f Fr(val)h FA(entry)f(for)g(the)g
-(option)h(is)g(non\2550,)g(the)299 1491 y(function)h(then)g(r)n(eturns)
-g(that)g(value.)32 b(Otherwise,)20 b Fr(poptGetNextOpt\(\))f
-FA(continues)i(on)299 1603 y(to)j(the)f(next)h(ar)n(gument.)299
-1814 y Fr(poptGetNextOpt\(\))g FA(r)n(eturns)h(\2551)g(when)f(the)h
-(\002nal)g(ar)n(gument)g(has)h(been)e(parsed,)j(and)299
-1926 y(other)20 b(negative)f(values)h(when)f(err)n(ors)i(occur)-7
-b(.)33 b(This)20 b(makes)h(it)f(a)h(good)g(idea)f(to)h(keep)299
-2039 y(the)i Fr(val)h FA(elements)f(in)g(the)h(options)g(table)f(gr)n
-(eater)g(than)g(0.)299 2250 y(If)48 b(all)f(of)h(the)f(command\255line)
-h(options)g(ar)n(e)g(handled)f(thr)n(ough)g Fr(arg)g
-FA(pointers,)299 2362 y(command\255line)23 b(parsing)h(is)g(r)n(educed)
-g(to)g(the)f(following)g(line)g(of)g(code:)299 2568 y
-Fq(rc)36 b(=)h(poptGetNextOpt\(poptcon\);)299 2780 y
-FA(Many)21 b(applications)g(r)n(equir)n(e)g(mor)n(e)g(complex)h
-(command\255line)f(parsing)g(than)f(this,)299 2892 y(however)-7
-b(,)22 b(and)i(use)f(the)g(following)g(str)o(uctur)n(e.)299
-3097 y Fq(while)35 b(\(\(rc)h(=)h(poptGetNextOpt\(poptcon\)\))31
-b(>)36 b(0\))h({)446 3205 y(switch)e(\(rc\))h({)593 3313
-y(/*)g(specific)f(arguments)g(are)h(handled)f(here)h(*/)446
-3421 y(})299 3529 y(})299 3741 y FA(When)f(r)n(eturned)g(options)i(ar)n
-(e)f(handled,)i(the)e(application)g(needs)g(to)g(know)g(the)299
-3853 y(value)21 b(of)h(any)g(ar)n(guments)g(that)g(wer)n(e)f
-(speci\002ed)i(after)f(the)g(option.)34 b(Ther)n(e)20
-b(ar)n(e)i(two)299 3965 y(ways)d(to)g(discover)g(them.)32
-b(One)18 b(is)i(to)f(ask)g(popt)g(to)h(\002ll)e(in)g(a)g(variable)f
-(with)h(the)g(value)299 4077 y(of)28 b(the)h(option)f(thr)n(ough)g(the)
-g(option)h(table's)f Fr(arg)g FA(elements.)48 b(The)28
-b(other)g(is)h(to)f(use)299 4189 y Fr(poptGetOptArg\(\))p
-FA(.)p eop
-%%Page: 450 6
-450 473 bop -187 -116 a Ft(450)118 b FL(Chapter)29 b(24)83
-b Fv(Parsing)23 b(Command-Line)f(Options)p -187 -76 3413
-4 v 111 170 a Fq(#include)35 b(<popt.h>)111 386 y(char)h(*)h
-(poptGetOptArg\(poptContext)31 b(con\);)111 598 y FA(This)c(function)f
-(r)n(eturns)h(the)g(ar)n(gument)f(given)g(for)h(the)g(\002nal)f(option)
-i(r)n(eturned)e(by)111 710 y Fr(poptGetNextOpt\(\))p
-FA(,)c(or)i(it)g(r)n(eturns)f Fr(NULL)g FA(if)h(no)f(ar)n(gument)g(was)
-h(speci\002ed.)111 1073 y Fu(24.1.4)59 b(Leftover)38
-b(Arguments)111 1285 y FA(Many)24 b(applications)g(take)f(an)h
-(arbitrary)e(number)g(of)i(command\255line)f(ar)n(guments,)111
-1397 y(such)j(as)g(a)g(list)g(of)g(\002le)f(names.)40
-b(When)25 b(popt)i(encounters)e(an)g(ar)n(gument)g(that)g(does)111
-1509 y(not)k(begin)f(with)g(a)h Fr(-)p FA(,)h(it)f(assumes)h(it)f(is)g
-(such)g(an)f(ar)n(gument)g(and)h(adds)h(it)f(to)g(a)g(list)111
-1621 y(of)i(leftover)f(ar)n(guments.)55 b(Thr)n(ee)30
-b(functions)g(allow)g(applications)h(to)h(access)g(such)111
-1733 y(ar)n(guments:)111 2007 y Fr(char)43 b(*)g
-(poptGetArg\(poptContext)d(con\);)411 2119 y FA(This)35
-b(function)f(r)n(eturns)g(the)g(next)h(leftover)f(ar)n(gument)g(and)g
-(marks)i(it)e(as)411 2231 y(pr)n(ocessed.)111 2443 y
-Fr(char)43 b(*)g(poptPeekArg\(poptContext)d(con\);)411
-2555 y FA(The)15 b(next)h(leftover)f(ar)n(gument)g(is)i(r)n(eturned)d
-(but)i(not)g(marked)g(as)g(pr)n(ocessed.)411 2667 y(This)39
-b(allows)g(an)f(application)h(to)h(look)f(ahead)g(into)g(the)f(ar)n
-(gument)h(list,)411 2779 y(without)23 b(modifying)h(the)f(list.)111
-2991 y Fr(char)43 b(**)f(poptGetArgs\(poptContext)f(con\);)411
-3103 y FA(All)16 b(the)g(leftover)f(ar)n(guments)g(ar)n(e)h(r)n
-(eturned)e(in)i(a)f(manner)g(identical)g(to)h Fr(argv)p
-FA(.)411 3215 y(The)j(\002nal)g(element)g(in)g(the)g(r)n(eturned)g
-(array)g(points)h(to)g Fr(NULL)p FA(,)f(indicating)g(the)411
-3327 y(end)24 b(of)g(the)f(ar)n(guments.)-187 3680 y
-Fk(24.2)131 b(Error)41 b(Handling)p -187 3765 3413 5
-v 111 4027 a FA(All)29 b(of)g(the)g(popt)h(functions)e(that)h(can)g(r)n
-(eturn)e(err)n(ors)i(r)n(eturn)f(integers.)49 b(When)28
-b(an)111 4139 y(err)n(or)d(occurs,)i(a)e(negative)f(err)n(or)h(code)h
-(is)f(r)n(eturned.)38 b(T)-9 b(able)24 b(24.2)h(summarizes)g(the)111
-4251 y(err)n(or)f(codes)g(that)g(occur)-7 b(.)34 b(Her)n(e)24
-b(is)g(a)g(mor)n(e)g(detailed)f(discussion)i(of)f(each)f(err)n(or)-7
-b(.)p eop
-%%Page: 451 7
-451 474 bop 2329 -116 a Fv(24.2)82 b(Error)23 b(Handling)118
-b Ft(451)p 0 -76 3413 4 v 421 71 a FL(Table)27 b(24.2)84
-b Fv(popt)22 b(Errors)p 421 103 2870 4 v 421 120 4 17
-v 1399 120 V 3287 120 V 421 219 4 100 v 507 190 a Fs(Error)p
-1399 219 V 785 w(Description)p 3287 219 V 421 236 4 17
-v 1399 236 V 3287 236 V 421 239 2870 4 v 421 246 4 7
-v 1399 246 V 3287 246 V 421 249 2870 4 v 421 266 4 17
-v 1399 266 V 3287 266 V 421 365 4 100 v 507 336 a Fq(POPT_ERROR_NOARG)p
-1399 365 V 386 w Fw(An)f(ar)o(gument)f(is)h(missing)h(for)f(an)g
-(option.)p 3287 365 V 421 465 V 507 436 a Fq(POPT_ERROR_BADOPT)p
-1399 465 V 349 w Fw(An)g(option's)h(ar)o(gument)e(could)h(not)h(be)e
-(parsed.)p 3287 465 V 421 565 V 507 535 a Fq(POPT_ERROR_OPTSTOODEEP)p
-1399 565 V 164 w Fw(Option)i(aliasing)f(is)g(nested)g(too)g(deeply)-9
-b(.)p 3287 565 V 421 664 V 507 635 a Fq(POPT_ERROR_BADQUOTE)p
-1399 664 V 275 w Fw(Quotations)22 b(do)f(not)h(match.)p
-3287 664 V 421 764 V 507 735 a Fq(POPT_ERROR_BADNUMBER)p
-1399 764 V 238 w Fw(An)f(option)h(could)f(not)g(be)g(converted)f(to)h
-(a)f(number)-6 b(.)p 3287 764 V 421 863 V 507 834 a Fq
-(POPT_ERROR_OVERFLOW)p 1399 863 V 275 w Fw(A)21 b(given)g(number)g(was)
-f(too)i(big)f(or)g(too)g(small.)p 3287 863 V 421 880
-4 17 v 1399 880 V 3287 880 V 421 883 2870 4 v 299 1132
-a Fr(POPT_ERROR_NOARG)599 1244 y FA(An)c(option)h(that)f(r)n(equir)n
-(es)h(an)f(ar)n(gument)f(was)i(speci\002ed)g(on)f(the)g(command)599
-1357 y(line,)40 b(but)d(no)g(ar)n(gument)g(was)g(given.)75
-b(This)37 b(can)h(be)f(r)n(eturned)f(only)h(by)599 1469
-y Fr(poptGetNextOpt\(\))p FA(.)299 1680 y Fr(POPT_ERROR_BADOPT)599
-1792 y FA(An)26 b(option)g(was)h(speci\002ed)f(in)g Fr(argv)g
-FA(but)g(is)g(not)g(in)g(the)g(option)g(table.)41 b(This)599
-1905 y(err)n(or)23 b(can)h(be)f(r)n(eturned)g(only)g(fr)n(om)h
-Fr(poptGetNextOpt\(\))p FA(.)299 2116 y Fr(POPT_ERROR_OPTSTOODEEP)599
-2228 y FA(A)f(set)h(of)f(option)g(aliases)g(is)h(nested)f(too)h(deeply)
--11 b(.)34 b(Curr)n(ently)-11 b(,)22 b(popt)i(follows)599
-2340 y(options)30 b(only)f(10)g(levels)g(to)h(pr)n(event)f(in\002nite)f
-(r)n(ecursion.)50 b(Only)29 b Fr(poptGet-)599 2452 y(NextOpt\(\))23
-b FA(can)g(r)n(eturn)g(this)h(err)n(or)-7 b(.)299 2664
-y Fr(POPT_ERROR_BADQUOTE)599 2776 y FA(A)15 b(parsed)g(string)g(has)g
-(a)g(quotation)g(mismatch)g(\(such)g(as)g(a)g(single)g(quotation)599
-2888 y(mark\).)62 b Fr(poptParseArgvString\(\))p FA(,)33
-b Fr(poptReadConfigFile\(\))p FA(,)g(or)g Fr(poptReadDe-)599
-3000 y(faultConfig\(\))22 b FA(can)i(r)n(eturn)e(this)i(err)n(or)-7
-b(.)299 3212 y Fr(POPT_ERROR_BADNUMBER)599 3324 y FA(A)38
-b(conversion)g(fr)n(om)g(a)g(string)g(to)h(a)f(number)f(\()p
-Fr(int)h FA(or)g Fr(long)p FA(\))f(failed)h(due)599 3436
-y(to)28 b(the)g(string)g(containing)f(nonnumeric)f(characters.)47
-b(This)28 b(occurs)h(when)599 3548 y Fr(poptGetNextOpt\(\))c
-FA(is)j(pr)n(ocessing)g(an)f(ar)n(gument)f(of)h(type)g
-Fr(POPT_ARG_INT)f FA(or)599 3660 y Fr(POPT_ARG_LONG)p
-FA(.)299 3872 y Fr(POPT_ERROR_OVERFLOW)599 3984 y FA(A)g
-(string\255to\255number)f(conversion)g(failed)g(because)h(the)f(number)
-g(was)h(too)599 4096 y(lar)n(ge)41 b(or)h(too)g(small.)88
-b(Like)42 b Fr(POPT_ERROR_BADNUMBER)p FA(,)d(this)j(err)n(or)f(can)h
-(oc\255)599 4208 y(cur)28 b(only)h(when)e Fr(poptGetNextOpt\(\))g
-FA(is)i(pr)n(ocessing)h(an)e(ar)n(gument)g(of)h(type)599
-4320 y Fr(POPT_ARG_INT)22 b FA(or)i Fr(POPT_ARG_LONG)p
-FA(.)p eop
-%%Page: 452 8
-452 475 bop -187 -116 a Ft(452)118 b FL(Chapter)29 b(24)83
-b Fv(Parsing)23 b(Command-Line)f(Options)p -187 -76 3413
-4 v 111 83 a Fr(POPT_ERROR_ERRNO)411 195 y FA(A)36 b(system)g(call)f(r)
-n(eturned)f(with)h(an)f(err)n(or)-7 b(,)37 b(and)e Fr(errno)g
-FA(still)g(contains)g(the)411 307 y(err)n(or)23 b(fr)n(om)h(the)f
-(system)i(call.)34 b(Both)24 b Fr(poptReadConfigFile\(\))d
-FA(and)j Fr(poptRead-)411 419 y(DefaultConfig\(\))f FA(can)g(r)n(eturn)
-g(this)h(err)n(or)-7 b(.)111 656 y(T)e(wo)38 b(functions)f(ar)n(e)h
-(available)e(to)i(make)g(it)f(easy)h(for)g(applications)g(to)g(pr)n
-(ovide)111 768 y(good)25 b(err)n(or)e(messages.)111 1042
-y Fr(const)43 b(char)f(*)h(poptStrerror\(const)e(int)h(error\);)411
-1154 y FA(This)18 b(function)g(takes)h(a)f(popt)h(err)n(or)f(code)h
-(and)g(r)n(eturns)e(a)i(string)f(describing)411 1266
-y(the)24 b(err)n(or)-7 b(,)23 b(just)h(as)g(with)f(the)g(standar)n(d)i
-Fr(strerror\(\))d FA(function.)111 1478 y Fr(char)43
-b(*)g(poptBadOption\(poptContext)d(con,)i(int)h(flags\);)411
-1590 y FA(If)32 b(an)e(err)n(or)g(occurr)n(ed)i(during)e
-Fr(poptGetNextOpt\(\))p FA(,)h(this)g(function)g(r)n(eturns)411
-1702 y(the)38 b(option)g(that)g(caused)h(the)e(err)n(or)-7
-b(.)77 b(If)38 b(the)f Fr(flags)h FA(ar)n(gument)f(is)i(set)f(to)411
-1814 y Fr(POPT_BADOPTION_NOALIAS)p FA(,)e(the)i(outermost)h(option)f
-(is)h(r)n(eturned.)76 b(Other)n(\255)411 1926 y(wise,)31
-b Fr(flags)e FA(should)h(be)f(0,)i(and)e(the)g(option)h(that)f(is)h(r)n
-(eturned)f(may)h(have)411 2038 y(been)23 b(speci\002ed)i(thr)n(ough)d
-(an)i(alias.)111 2275 y(These)16 b(two)h(functions)f(make)h(popt)g(err)
-n(or)f(handling)g(trivial)f(for)i(most)h(applications.)111
-2387 y(When)26 b(an)f(err)n(or)g(is)h(detected)g(fr)n(om)g(most)h(of)f
-(the)f(functions,)h(an)f(err)n(or)g(message)h(is)111
-2499 y(printed)35 b(along)g(with)g(the)g(err)n(or)f(string)i(fr)n(om)f
-Fr(poptStrerror\(\))p FA(.)68 b(When)35 b(an)f(err)n(or)111
-2611 y(occurs)26 b(during)e(ar)n(gument)h(parsing,)g(code)g(similiar)g
-(to)g(the)g(following)f(displays)i(a)111 2723 y(useful)d(err)n(or)g
-(message.)111 2929 y Fq(fprintf\(stderr,)34 b("\045s:)h(\045s\\n",)405
-3037 y(poptBadOption\(optCon,)d(POPT_BADOPTION_NOALIAS\),)405
-3144 y(poptStrerror\(rc\)\);)-187 3475 y Fk(24.3)131
-b(Option)42 b(Aliasing)p -187 3560 3413 5 v 111 3822
-a FA(One)21 b(of)h(the)f(primary)g(bene\002ts)f(of)i(using)f(popt)h
-(over)f Fr(getopt\(\))g FA(is)h(the)f(ability)f(to)i(use)111
-3934 y(option)30 b(aliasing.)49 b(This)29 b(lets)h(the)e(user)h
-(specify)h(options)g(that)f(popt)h(expands)g(into)111
-4046 y(other)22 b(options)g(when)f(they)h(ar)n(e)f(speci\002ed.)35
-b(If)22 b(the)f(standar)n(d)i(gr)n(ep)f(pr)n(ogram)h(made)111
-4158 y(use)j(of)g(popt,)h(users)f(could)h(add)f(a)g Fr(--text)f
-FA(option)h(that)g(expanded)g(to)g Fr(-i)45 b(-n)g(-E)g(-2)111
-4270 y FA(to)25 b(let)e(them)h(mor)n(e)g(easily)f(\002nd)h(information)
-e(in)h(text)h(\002les.)p eop
-%%Page: 453 9
-453 476 bop 2298 -116 a Fv(24.3)81 b(Option)22 b(Aliasing)118
-b Ft(453)p 0 -76 3413 4 v 299 85 a Fu(24.3.1)58 b(Specifying)40
-b(Aliases)299 297 y FA(Aliases)18 b(ar)n(e)e(normally)h(speci\002ed)h
-(in)f(two)g(places:)32 b(/etc/popt)18 b(and)f(the)g(.popt)h(\002le)f
-(in)299 409 y(the)25 b(user)7 b('s)25 b(home)h(dir)n(ectory)f(\(found)g
-(thr)n(ough)g(the)g Fr(HOME)g FA(envir)n(onment)f(variable\).)299
-521 y(Both)33 b(\002les)h(have)e(the)h(same)h(format,)h(an)e(arbitrary)
-f(number)g(of)h(lines)g(formatted)299 633 y(like)23 b(this:)299
-845 y Fj(appname)42 b Fr(alias)g Fj(newoption)g(expansion)299
-1057 y FA(The)24 b Fj(appname)h FA(is)h(the)f(name)g(of)h(the)f
-(application,)h(which)e(must)j(be)e(the)g(same)h(as)g(the)299
-1169 y Fr(name)e FA(parameter)g(passed)i(to)f Fr(poptGetContext\(\))p
-FA(.)36 b(This)24 b(allows)g(each)g(\002le)g(to)i(specify)299
-1281 y(aliases)e(for)h(multiple)f(pr)n(ograms.)37 b(The)24
-b Fr(alias)g FA(keywor)n(d)g(speci\002es)i(that)e(an)g(alias)g(is)299
-1393 y(being)h(de\002ned;)i(curr)n(ently)f(popt)h(con\002guration)e
-(\002les)i(support)g(only)f(aliases,)h(but)299 1505 y(other)i
-(abilities)h(may)g(be)g(added)g(in)g(the)g(futur)n(e.)52
-b(The)29 b(next)h(option)g(is)g(the)g(option)299 1617
-y(that)d(should)h(be)g(aliased,)g(and)g(it)g(may)g(be)f(either)g(a)h
-(short)g(or)f(a)h(long)g(option.)46 b(The)299 1729 y(r)n(est)29
-b(of)h(the)e(line)h(speci\002es)h(the)e(expansion)h(for)g(the)g(alias.)
-50 b(It)30 b(is)f(parsed)h(similarly)299 1841 y(to)f(a)g(shell)f
-(command,)j(which)d(allows)h Fr(\\)p FA(,)h Fr(")p FA(,)g(and)f
-Fr(')g FA(to)g(be)g(used)g(for)g(quoting.)49 b(If)29
-b(a)299 1953 y(backslash)22 b(is)g(the)g(\002nal)f(character)g(on)g(a)h
-(line,)f(the)h(next)f(line)g(in)h(the)f(\002le)g(is)i(assumed)299
-2066 y(to)28 b(be)f(a)g(logical)g(continuation)f(of)i(the)f(line)f
-(containing)h(the)g(backslash,)h(just)g(as)g(in)299 2178
-y(shell.)299 2389 y(The)i(following)g(entry)h(would)f(add)i(a)f
-Fr(--text)g FA(option)g(to)h(the)e Fr(grep)h FA(command,)j(as)299
-2501 y(suggested)24 b(at)g(the)f(beginning)f(of)i(this)g(section.)299
-2713 y Fr(grep)42 b(alias)h(--text)f(-i)h(-n)f(-E)h(-2)299
-3068 y Fu(24.3.2)58 b(Enabling)39 b(Aliases)299 3279
-y FA(An)21 b(application)f(must)i(enable)d(alias)h(expansion)h(for)g(a)
-f Fr(poptContext)g FA(befor)n(e)g(calling)299 3391 y
-Fr(poptGetNextArg\(\))33 b FA(for)i(the)g(\002rst)g(time.)68
-b(Ther)n(e)34 b(ar)n(e)g(thr)n(ee)h(functions)f(that)h(de\002ne)299
-3503 y(aliases)23 b(for)h(a)g(context.)299 3777 y Fr(int)42
-b(poptReadDefaultConfig\(poptContext)e(con,)i(int)h(flags\);)599
-3889 y FA(This)d(function)f(r)n(eads)h(aliases)g(fr)n(om)h(/etc/popt)g
-(and)f(the)g(.popt)h(\002le)f(in)599 4002 y(the)29 b(user)7
-b('s)29 b(home)g(dir)n(ectory)-11 b(.)53 b(Curr)n(ently)-11
-b(,)29 b Fr(flags)g FA(should)h(be)f Fr(NULL)p FA(,)g(as)g(it)h(is)599
-4114 y(pr)n(ovided)24 b(only)g(for)f(futur)n(e)g(expansion.)p
-eop
-%%Page: 454 10
-454 477 bop -187 -116 a Ft(454)118 b FL(Chapter)29 b(24)83
-b Fv(Parsing)23 b(Command-Line)f(Options)p -187 -76 3413
-4 v 111 83 a Fr(int)43 b(poptReadConfigFile\(poptContext)c(con,)k(char)
-f(*)h(fn\);)411 195 y FA(The)17 b(\002le)h(speci\002ed)h(by)f
-Fr(fn)g FA(is)g(opened)g(and)g(parsed)h(as)f(a)g(popt)h
-(con\002guration)411 307 y(\002le.)68 b(This)35 b(allows)f(pr)n(ograms)
-i(to)g(use)f(pr)n(ogram\255speci\002c)h(con\002guration)411
-419 y(\002les.)111 631 y Fr(int)43 b(poptAddAlias\(poptContext)d(con,)j
-(struct)f(poptAlias)g(alias,)g(int)g(flags\);)411 743
-y FA(Occasionally)-11 b(,)37 b(pr)n(ocesses)f(want)d(to)h(specify)g
-(aliases)g(without)f(having)f(to)411 855 y(r)n(ead)24
-b(them)f(fr)n(om)h(a)f(con\002guration)f(\002le.)34 b(This)23
-b(function)f(adds)i(a)g(new)e(alias)411 967 y(to)39 b(a)f(context.)77
-b(The)38 b Fr(flags)f FA(ar)n(gument)h(should)g(be)f(0,)42
-b(as)c(it)g(is)h(curr)n(ently)411 1079 y(r)n(eserved)21
-b(for)g(futur)n(e)e(expansion.)33 b(The)20 b(new)g(alias)h(is)g
-(speci\002ed)g(as)h(a)e Fr(struct)411 1191 y(poptAlias)p
-FA(,)j(which)g(is)h(de\002ned)f(as:)411 1388 y Fq(struct)36
-b(poptAlias)e({)558 1496 y(char)i(*)h(longName;)439 b(/*)36
-b(may)g(be)g(NULL)g(*/)558 1604 y(char)g(shortName;)476
-b(/*)36 b(may)g(be)g('\\0')g(*/)558 1712 y(int)g(argc;)558
-1820 y(char)g(**)h(argv;)550 b(/*)36 b(must)g(be)g(free\(\)able)f(*/)
-411 1927 y(};)411 2139 y FA(The)d(\002rst)h(two)g(elements,)i
-Fr(longName)d FA(and)g Fr(shortName)p FA(,)j(specify)e(the)g(option)411
-2251 y(that)23 b(is)g(aliased.)33 b(The)22 b(\002nal)g(two,)h
-Fr(argc)f FA(and)g Fr(argv)p FA(,)h(de\002ne)f(the)g(expansion)g(to)411
-2363 y(use)i(when)e(the)i(aliases)f(option)h(is)g(encounter)n(ed.)-187
-2716 y Fk(24.4)131 b(Parsing)41 b(Argument)f(Strings)p
--187 2801 3413 5 v 111 3063 a FA(Although)21 b(popt)i(is)g(usually)e
-(used)h(for)f(parsing)h(ar)n(guments)g(alr)n(eady)f(divided)h(into)111
-3175 y(an)e Fr(argv)p FA(\255style)f(array)-11 b(,)20
-b(some)h(pr)n(ograms)g(need)e(to)h(parse)g(strings)h(that)e(ar)n(e)h
-(formatted)111 3287 y(identically)30 b(to)g(command)h(lines.)52
-b(T)-9 b(o)30 b(facilitate)f(this,)j(popt)f(pr)n(ovides)g(a)f(function)
-111 3399 y(that)f(parses)h(a)g(string)f(into)g(an)g(array)f(of)h
-(string,)i(using)e(r)o(ules)g(similiar)g(to)g(normal)111
-3512 y(shell)24 b(parsing.)111 3717 y Fq(#include)35
-b(<popt.h>)111 3933 y(int)h(poptParseArgvString\(char)31
-b(*)37 b(s,)f(int)g(*)h(argcPtr,)e(char)h(***)g(argvPtr\);)111
-4145 y FA(The)19 b(string)h Fr(s)g FA(is)g(parsed)h(into)f(an)f
-Fr(argv)p FA(\255style)h(array)-11 b(.)32 b(The)19 b(integer)g(pointed)
-h(to)g(by)g(the)111 4257 y(second)33 b(parameter)-7 b(,)32
-b Fr(argcPtr)p FA(,)h(contains)e(the)g(number)g(of)g(elements)g
-(parsed,)j(and)111 4369 y(the)c(pointer)h(pointed)f(to)h(by)g(the)f
-(\002nal)f(parameter)h(is)h(set)g(to)g(point)g(to)g(the)f(newly)p
-eop
-%%Page: 455 11
-455 478 bop 2154 -116 a Fv(24.6)82 b(Sample)23 b(Application)115
-b Ft(455)p 0 -76 3413 4 v 299 83 a FA(cr)n(eated)28 b(array)-11
-b(.)45 b(The)27 b(array)g(is)h(dynamically)g(allocated)f(and)h(should)f
-(be)h Fr(free\(\))p FA(ed)299 195 y(when)22 b(the)i(application)f(is)h
-(\002nished)f(with)g(it.)299 407 y(The)i Fr(argvPtr)h
-FA(cr)n(eated)h(by)f Fr(poptParseArgvString\(\))e FA(is)j(suitable)f
-(to)h(pass)g(dir)n(ectly)g(to)299 519 y Fr(poptGetContext\(\))p
-FA(.)0 838 y Fk(24.5)132 b(Handling)41 b(Extra)f(Arguments)p
-0 923 3413 5 v 299 1185 a FA(Some)33 b(applications)f(implement)h(the)f
-(equivalent)e(of)j(option)f(aliasing)g(but)g(need)299
-1297 y(to)39 b(do)h(so)g(thr)n(ough)e(special)i(logic.)80
-b(The)38 b Fr(poptStuffArgs\(\))g FA(function)g(allows)h(an)299
-1409 y(application)24 b(to)g(insert)f(new)g(ar)n(guments)g(into)h(the)f
-(curr)n(ent)g Fr(poptContext)p FA(.)299 1615 y Fq(#include)35
-b(<popt.h>)299 1831 y(int)h(poptStuffArgs\(poptContext)31
-b(con,)36 b(char)f(**)i(argv\);)299 2042 y FA(The)k(passed)j
-Fr(argv)e FA(must)h(have)f(a)h Fr(NULL)f FA(pointer)g(as)h(its)g
-(\002nal)e(element.)90 b(When)299 2154 y Fr(poptGetNextOpt\(\))39
-b FA(is)j(next)f(called,)k(the)c(\223stuf)n(fed\224)f(ar)n(guments)h
-(ar)n(e)g(the)g(\002rst)g(to)299 2266 y(be)g(parsed.)87
-b(popt)43 b(r)n(eturns)e(to)g(the)g(normal)g(ar)n(guments)g(once)g(all)
-g(the)g(stuf)n(fed)299 2378 y(ar)n(guments)23 b(have)g(been)g
-(exhausted.)0 2707 y Fk(24.6)132 b(Sample)41 b(Application)p
-0 2792 V 299 3054 a FA(Robin,)28 b(the)g(sample)g(application)g(on)g
-(pages)h(274\226281)d(of)i(Chapter)f(15,)i(uses)f(popt)299
-3166 y(for)36 b(its)i(ar)n(gument)e(parsing.)73 b(It)37
-b(pr)n(ovides)h(a)e(good)i(example)f(of)g(how)f(the)g(popt)299
-3278 y(library)22 b(is)i(generally)f(used.)299 3489 y(RPM,)31
-b(a)g(popular)f(Linux)h(package)g(management)f(pr)n(ogram,)k(makes)d
-(heavy)f(use)299 3602 y(of)23 b(popt's)g(featur)n(es.)33
-b(Many)23 b(of)g(its)g(command\255line)f(ar)n(guments)g(ar)n(e)g
-(implemented)299 3714 y(thr)n(ough)30 b(popt)i(aliases,)g(which)e
-(makes)h(RPM)g(an)f(excellent)g(example)h(of)g(how)f(to)299
-3826 y(take)36 b(advantage)g(of)h(the)f(popt)i(library)-11
-b(.)73 b(For)37 b(mor)n(e)g(information)e(on)i(RPM,)f(see)299
-3938 y(http:/)-14 b(/www)-9 b(.rpm.or)n(g)p eop
-%%Trailer
-end
-userdict /end-hook known{end-hook}if
-%%EOF
-- 
Gitee


From 7eae31d6478cb5166edc773163048d8f306b5f92 Mon Sep 17 00:00:00 2001
From: Panu Matilainen <pmatilai@redhat.com>
Date: Wed, 13 May 2020 11:40:43 +0300
Subject: [PATCH 658/667] Convert all translations to UTF-8, update for new
 source layout

---
 po/cs.po    |  66 ++++++++++++++---------------
 po/da.po    |  64 ++++++++++++++--------------
 po/de.po    |  64 ++++++++++++++--------------
 po/eo.po    |  66 ++++++++++++++---------------
 po/es.po    |  64 ++++++++++++++--------------
 po/fi.po    |  64 ++++++++++++++--------------
 po/fr.po    |  66 ++++++++++++++---------------
 po/ga.po    |  64 ++++++++++++++--------------
 po/gl.po    |  92 ++++++++++++++++++++--------------------
 po/hu.po    |  64 ++++++++++++++--------------
 po/id.po    |  66 ++++++++++++++---------------
 po/is.po    |  98 +++++++++++++++++++++---------------------
 po/it.po    |  64 ++++++++++++++--------------
 po/ja.po    |  64 ++++++++++++++--------------
 po/ko.po    | 120 ++++++++++++++++++++++++++--------------------------
 po/lv.po    |  64 ++++++++++++++--------------
 po/nb.po    |  72 +++++++++++++++----------------
 po/nl.po    |  66 ++++++++++++++---------------
 po/pl.po    |  94 ++++++++++++++++++++--------------------
 po/popt.pot |  66 ++++++++++++++---------------
 po/pt.po    |  92 ++++++++++++++++++++--------------------
 po/ro.po    |  66 ++++++++++++++---------------
 po/ru.po    |  64 ++++++++++++++--------------
 po/sk.po    |  72 +++++++++++++++----------------
 po/sl.po    |  72 +++++++++++++++----------------
 po/sv.po    | 108 +++++++++++++++++++++++-----------------------
 po/th.po    |  66 ++++++++++++++---------------
 po/tr.po    |  94 ++++++++++++++++++++--------------------
 po/uk.po    |  72 +++++++++++++++----------------
 po/vi.po    |  64 ++++++++++++++--------------
 po/wa.po    |  78 +++++++++++++++++-----------------
 po/zh_CN.po |  64 ++++++++++++++--------------
 po/zh_TW.po |  66 ++++++++++++++---------------
 33 files changed, 1213 insertions(+), 1213 deletions(-)

diff --git a/po/cs.po b/po/cs.po
index 85a48d3..f9c2418 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -8,136 +8,136 @@ msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.14\n"
 "Report-Msgid-Bugs-To: <rpm-maint@lists.rpm.org>\n"
-"POT-Creation-Date: 2020-02-12 10:47+0200\n"
+"POT-Creation-Date: 2020-05-13 11:40+0300\n"
 "PO-Revision-Date: 2008-12-08 19:55+0100\n"
 "Last-Translator: Petr Pisar <petr.pisar@atlas.cz>\n"
 "Language-Team: Czech <translation-team-cs@lists.sourceforge.net>\n"
 "Language: cs\n"
 "MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=utf-8\n"
+"Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: popt.c:47
+#: src/popt.c:37
 msgid "unknown errno"
 msgstr "neznámé číslo chyby"
 
-#: popt.c:1290
+#: src/popt.c:1196
 #, c-format
 msgid "option type (%u) not implemented in popt\n"
 msgstr "typ volby (%u) není v popt implementován\n"
 
-#: popt.c:1711
+#: src/popt.c:1607
 msgid "missing argument"
 msgstr "chybí argument"
 
-#: popt.c:1713
+#: src/popt.c:1609
 msgid "unknown option"
 msgstr "neznámá volba"
 
-#: popt.c:1715
+#: src/popt.c:1611
 msgid "mutually exclusive logical operations requested"
 msgstr "požadovány vzájemně výlučné logické operace"
 
-#: popt.c:1717
+#: src/popt.c:1613
 msgid "opt->arg should not be NULL"
 msgstr "opt->arg nesmí být NULL"
 
-#: popt.c:1719
+#: src/popt.c:1615
 msgid "aliases nested too deeply"
 msgstr "aliasy vnořené příliš hluboko"
 
-#: popt.c:1721
+#: src/popt.c:1617
 msgid "error in parameter quoting"
 msgstr "chyba v quotování parametrů"
 
-#: popt.c:1723
+#: src/popt.c:1619
 msgid "invalid numeric value"
 msgstr "chybná numerická hodnota"
 
-#: popt.c:1725
+#: src/popt.c:1621
 msgid "number too large or too small"
 msgstr "číslo je příliš velké nebo příliš malé"
 
-#: popt.c:1727
+#: src/popt.c:1623
 msgid "memory allocation failed"
 msgstr "selhala alokace paměti"
 
-#: popt.c:1729
+#: src/popt.c:1625
 msgid "config file failed sanity test"
 msgstr ""
 
-#: popt.c:1733
+#: src/popt.c:1629
 msgid "unknown error"
 msgstr "neznámá chyba"
 
-#: popthelp.c:75 popthelp.c:86
+#: src/popthelp.c:64 src/popthelp.c:72
 msgid "Show this help message"
 msgstr "Vypíše tuto nápovědu"
 
-#: popthelp.c:76 popthelp.c:87
+#: src/popthelp.c:65 src/popthelp.c:73
 msgid "Display brief usage message"
 msgstr "Vypíše krátký návod k použití"
 
-#: popthelp.c:90
+#: src/popthelp.c:76
 msgid "Display option defaults in message"
 msgstr "Zobrazit implicitní volby ve zprávě"
 
-#: popthelp.c:92
+#: src/popthelp.c:78
 msgid "Terminate options"
 msgstr "Ukončí volby"
 
-#: popthelp.c:191
+#: src/popthelp.c:170
 msgid "Help options:"
 msgstr "Volby nápovědy:"
 
-#: popthelp.c:192
+#: src/popthelp.c:171
 msgid "Options implemented via popt alias/exec:"
 msgstr "Volby implementované přes alias/exec poptu:"
 
-#: popthelp.c:200
+#: src/popthelp.c:179
 msgid "NONE"
 msgstr "NONE"
 
-#: popthelp.c:202
+#: src/popthelp.c:181
 msgid "VAL"
 msgstr "VAL"
 
-#: popthelp.c:206
+#: src/popthelp.c:185
 msgid "INT"
 msgstr "INT"
 
-#: popthelp.c:207
+#: src/popthelp.c:186
 msgid "SHORT"
 msgstr ""
 
-#: popthelp.c:208
+#: src/popthelp.c:187
 msgid "LONG"
 msgstr "LONG"
 
-#: popthelp.c:209
+#: src/popthelp.c:188
 msgid "LONGLONG"
 msgstr "LONGLONG"
 
-#: popthelp.c:210
+#: src/popthelp.c:189
 msgid "STRING"
 msgstr "STRING"
 
-#: popthelp.c:211
+#: src/popthelp.c:190
 msgid "FLOAT"
 msgstr "FLOAT"
 
-#: popthelp.c:212
+#: src/popthelp.c:191
 msgid "DOUBLE"
 msgstr "DOUBLE"
 
-#: popthelp.c:215
+#: src/popthelp.c:194
 msgid "ARG"
 msgstr "ARG"
 
-#: popthelp.c:649
+#: src/popthelp.c:608
 msgid "Usage:"
 msgstr "Použití:"
 
-#: popthelp.c:672
+#: src/popthelp.c:630
 msgid "[OPTION...]"
 msgstr "[VOLBY…]"
diff --git a/po/da.po b/po/da.po
index 997cbf4..d23aca1 100644
--- a/po/da.po
+++ b/po/da.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: popt-1.14\n"
 "Report-Msgid-Bugs-To: <rpm-maint@lists.rpm.org>\n"
-"POT-Creation-Date: 2020-02-12 10:47+0200\n"
+"POT-Creation-Date: 2020-05-13 11:40+0300\n"
 "PO-Revision-Date: 2008-09-15 00:00+0000\n"
 "Last-Translator: Joe Hansen <joedalton2@yahoo.dk>\n"
 "Language-Team: Danish <dansk@dansk-gruppen.dk>\n"
@@ -17,127 +17,127 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: popt.c:47
+#: src/popt.c:37
 msgid "unknown errno"
 msgstr "ukendt fejlnr."
 
-#: popt.c:1290
+#: src/popt.c:1196
 #, c-format
 msgid "option type (%u) not implemented in popt\n"
 msgstr "tilvalgstype (%u) er ikke implementeret i popt\n"
 
-#: popt.c:1711
+#: src/popt.c:1607
 msgid "missing argument"
 msgstr "mangler argument"
 
-#: popt.c:1713
+#: src/popt.c:1609
 msgid "unknown option"
 msgstr "ukendt tilvalg"
 
-#: popt.c:1715
+#: src/popt.c:1611
 msgid "mutually exclusive logical operations requested"
 msgstr "de ønskede handlinger udelukker hinanden"
 
-#: popt.c:1717
+#: src/popt.c:1613
 msgid "opt->arg should not be NULL"
 msgstr "opt->arg bør ikke være NULL"
 
-#: popt.c:1719
+#: src/popt.c:1615
 msgid "aliases nested too deeply"
 msgstr "aliaser er for dybt indlejret"
 
-#: popt.c:1721
+#: src/popt.c:1617
 msgid "error in parameter quoting"
 msgstr "fejl i parameter citering"
 
-#: popt.c:1723
+#: src/popt.c:1619
 msgid "invalid numeric value"
 msgstr "ugyldig numerisk værdi"
 
-#: popt.c:1725
+#: src/popt.c:1621
 msgid "number too large or too small"
 msgstr "nummer for stort, eller for lille"
 
-#: popt.c:1727
+#: src/popt.c:1623
 msgid "memory allocation failed"
 msgstr "hukommelsestildeling mislykkedes"
 
-#: popt.c:1729
+#: src/popt.c:1625
 msgid "config file failed sanity test"
 msgstr ""
 
-#: popt.c:1733
+#: src/popt.c:1629
 msgid "unknown error"
 msgstr "ukendt fejl"
 
-#: popthelp.c:75 popthelp.c:86
+#: src/popthelp.c:64 src/popthelp.c:72
 msgid "Show this help message"
 msgstr "Vis denne hjælpemeddelelse"
 
-#: popthelp.c:76 popthelp.c:87
+#: src/popthelp.c:65 src/popthelp.c:73
 msgid "Display brief usage message"
 msgstr "Vis kortfattet brugsanvisning"
 
-#: popthelp.c:90
+#: src/popthelp.c:76
 msgid "Display option defaults in message"
 msgstr "Vis instillingsstandarder i besked"
 
-#: popthelp.c:92
+#: src/popthelp.c:78
 msgid "Terminate options"
 msgstr "Indstillinger for afbrydning"
 
-#: popthelp.c:191
+#: src/popthelp.c:170
 msgid "Help options:"
 msgstr "Hjælpeindstillinger:"
 
-#: popthelp.c:192
+#: src/popthelp.c:171
 msgid "Options implemented via popt alias/exec:"
 msgstr "Indstillinger implementeret via popt alias/exec:"
 
-#: popthelp.c:200
+#: src/popthelp.c:179
 msgid "NONE"
 msgstr "INGEN"
 
-#: popthelp.c:202
+#: src/popthelp.c:181
 msgid "VAL"
 msgstr "VAL"
 
-#: popthelp.c:206
+#: src/popthelp.c:185
 msgid "INT"
 msgstr "INT"
 
-#: popthelp.c:207
+#: src/popthelp.c:186
 msgid "SHORT"
 msgstr ""
 
-#: popthelp.c:208
+#: src/popthelp.c:187
 msgid "LONG"
 msgstr "LONG"
 
-#: popthelp.c:209
+#: src/popthelp.c:188
 msgid "LONGLONG"
 msgstr "LONGLONG"
 
-#: popthelp.c:210
+#: src/popthelp.c:189
 msgid "STRING"
 msgstr "STRING"
 
-#: popthelp.c:211
+#: src/popthelp.c:190
 msgid "FLOAT"
 msgstr "FLOAT"
 
-#: popthelp.c:212
+#: src/popthelp.c:191
 msgid "DOUBLE"
 msgstr "DOUBLE"
 
-#: popthelp.c:215
+#: src/popthelp.c:194
 msgid "ARG"
 msgstr "ARG"
 
-#: popthelp.c:649
+#: src/popthelp.c:608
 msgid "Usage:"
 msgstr "Brug:"
 
-#: popthelp.c:672
+#: src/popthelp.c:630
 msgid "[OPTION...]"
 msgstr "[TILVALG...]"
diff --git a/po/de.po b/po/de.po
index e2d9aeb..918c7ab 100644
--- a/po/de.po
+++ b/po/de.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.14\n"
 "Report-Msgid-Bugs-To: <rpm-maint@lists.rpm.org>\n"
-"POT-Creation-Date: 2020-02-12 10:47+0200\n"
+"POT-Creation-Date: 2020-05-13 11:40+0300\n"
 "PO-Revision-Date: 2009-11-10 19:58+0100\n"
 "Last-Translator: Roland Illig <roland.illig@gmx.de>\n"
 "Language-Team: German <translation-team-de@lists.sourceforge.net>\n"
@@ -16,127 +16,127 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: popt.c:47
+#: src/popt.c:37
 msgid "unknown errno"
 msgstr "Unbekannte Fehler-Nummer"
 
-#: popt.c:1290
+#: src/popt.c:1196
 #, c-format
 msgid "option type (%u) not implemented in popt\n"
 msgstr "Optionstyp (%u) ist in popt nicht vorhanden\n"
 
-#: popt.c:1711
+#: src/popt.c:1607
 msgid "missing argument"
 msgstr "Fehlendes Argument"
 
-#: popt.c:1713
+#: src/popt.c:1609
 msgid "unknown option"
 msgstr "Unbekannte Option"
 
-#: popt.c:1715
+#: src/popt.c:1611
 msgid "mutually exclusive logical operations requested"
 msgstr "Gegenseitig ausschließende logische Operatoren"
 
-#: popt.c:1717
+#: src/popt.c:1613
 msgid "opt->arg should not be NULL"
 msgstr "opt->arg sollte nicht NULL sein"
 
-#: popt.c:1719
+#: src/popt.c:1615
 msgid "aliases nested too deeply"
 msgstr "Aliase zu tief verschachtelt"
 
-#: popt.c:1721
+#: src/popt.c:1617
 msgid "error in parameter quoting"
 msgstr "Fehler beim Quotieren der Parameter"
 
-#: popt.c:1723
+#: src/popt.c:1619
 msgid "invalid numeric value"
 msgstr "Ungültiger nummerischer Wert"
 
-#: popt.c:1725
+#: src/popt.c:1621
 msgid "number too large or too small"
 msgstr "Nummer zu groß oder zu klein"
 
-#: popt.c:1727
+#: src/popt.c:1623
 msgid "memory allocation failed"
 msgstr "Speicherzuordnung fehlgeschlagen"
 
-#: popt.c:1729
+#: src/popt.c:1625
 msgid "config file failed sanity test"
 msgstr ""
 
-#: popt.c:1733
+#: src/popt.c:1629
 msgid "unknown error"
 msgstr "Unbekannter Fehler"
 
-#: popthelp.c:75 popthelp.c:86
+#: src/popthelp.c:64 src/popthelp.c:72
 msgid "Show this help message"
 msgstr "Zeigt diese Hilfe an"
 
-#: popthelp.c:76 popthelp.c:87
+#: src/popthelp.c:65 src/popthelp.c:73
 msgid "Display brief usage message"
 msgstr "Zeigt eine kurze Verwendungsinformation"
 
-#: popthelp.c:90
+#: src/popthelp.c:76
 msgid "Display option defaults in message"
 msgstr "Zeigt die Standardeinstellungen an"
 
-#: popthelp.c:92
+#: src/popthelp.c:78
 msgid "Terminate options"
 msgstr "Optionen beenden"
 
-#: popthelp.c:191
+#: src/popthelp.c:170
 msgid "Help options:"
 msgstr "Hilfe-Optionen:"
 
-#: popthelp.c:192
+#: src/popthelp.c:171
 msgid "Options implemented via popt alias/exec:"
 msgstr "Optionen über popt alias/exec implementiert:"
 
-#: popthelp.c:200
+#: src/popthelp.c:179
 msgid "NONE"
 msgstr "NICHTS"
 
-#: popthelp.c:202
+#: src/popthelp.c:181
 msgid "VAL"
 msgstr "WERT"
 
-#: popthelp.c:206
+#: src/popthelp.c:185
 msgid "INT"
 msgstr "INTEGER"
 
-#: popthelp.c:207
+#: src/popthelp.c:186
 msgid "SHORT"
 msgstr ""
 
-#: popthelp.c:208
+#: src/popthelp.c:187
 msgid "LONG"
 msgstr "LONG"
 
-#: popthelp.c:209
+#: src/popthelp.c:188
 msgid "LONGLONG"
 msgstr "LONGLONG"
 
-#: popthelp.c:210
+#: src/popthelp.c:189
 msgid "STRING"
 msgstr "STRING"
 
-#: popthelp.c:211
+#: src/popthelp.c:190
 msgid "FLOAT"
 msgstr "FLOAT"
 
-#: popthelp.c:212
+#: src/popthelp.c:191
 msgid "DOUBLE"
 msgstr "DOUBLE"
 
-#: popthelp.c:215
+#: src/popthelp.c:194
 msgid "ARG"
 msgstr "ARGUMENT"
 
-#: popthelp.c:649
+#: src/popthelp.c:608
 msgid "Usage:"
 msgstr "Verwendung:"
 
-#: popthelp.c:672
+#: src/popthelp.c:630
 msgid "[OPTION...]"
 msgstr "[OPTION...]"
diff --git a/po/eo.po b/po/eo.po
index 54512f8..03c6b6e 100644
--- a/po/eo.po
+++ b/po/eo.po
@@ -6,136 +6,136 @@ msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.14\n"
 "Report-Msgid-Bugs-To: <rpm-maint@lists.rpm.org>\n"
-"POT-Creation-Date: 2020-02-12 10:47+0200\n"
+"POT-Creation-Date: 2020-05-13 11:40+0300\n"
 "PO-Revision-Date: 2008-08-03 15:50-0300\n"
 "Last-Translator: Felipe Castro <fefcas@gmail.com>\n"
 "Language-Team: Esperanto <translation-team-eo@lists.sourceforge.net>\n"
 "Language: eo\n"
 "MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=utf-8\n"
+"Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: popt.c:47
+#: src/popt.c:37
 msgid "unknown errno"
 msgstr "nekonata erarnumero"
 
-#: popt.c:1290
+#: src/popt.c:1196
 #, c-format
 msgid "option type (%u) not implemented in popt\n"
 msgstr "la opcia tipo (%u) ne estas realigita en popt\n"
 
-#: popt.c:1711
+#: src/popt.c:1607
 msgid "missing argument"
 msgstr "mankas argumento"
 
-#: popt.c:1713
+#: src/popt.c:1609
 msgid "unknown option"
 msgstr "nekonata opcio"
 
-#: popt.c:1715
+#: src/popt.c:1611
 msgid "mutually exclusive logical operations requested"
 msgstr "reciprokaj logikaj operacioj estas postulataj"
 
-#: popt.c:1717
+#: src/popt.c:1613
 msgid "opt->arg should not be NULL"
 msgstr "opt->arg ne devus esti NULL"
 
-#: popt.c:1719
+#: src/popt.c:1615
 msgid "aliases nested too deeply"
 msgstr "kromnomoj estas ingitaj tro profunde"
 
-#: popt.c:1721
+#: src/popt.c:1617
 msgid "error in parameter quoting"
 msgstr "eraro en parametra citado"
 
-#: popt.c:1723
+#: src/popt.c:1619
 msgid "invalid numeric value"
 msgstr "nevalida numera valoro"
 
-#: popt.c:1725
+#: src/popt.c:1621
 msgid "number too large or too small"
 msgstr "numero tro granda aŭ tro eta"
 
-#: popt.c:1727
+#: src/popt.c:1623
 msgid "memory allocation failed"
 msgstr "malsukceso dum okupado de memoro"
 
-#: popt.c:1729
+#: src/popt.c:1625
 msgid "config file failed sanity test"
 msgstr ""
 
-#: popt.c:1733
+#: src/popt.c:1629
 msgid "unknown error"
 msgstr "nekonata eraro"
 
-#: popthelp.c:75 popthelp.c:86
+#: src/popthelp.c:64 src/popthelp.c:72
 msgid "Show this help message"
 msgstr "Montri tiun ĉi helpmesaĝon"
 
-#: popthelp.c:76 popthelp.c:87
+#: src/popthelp.c:65 src/popthelp.c:73
 msgid "Display brief usage message"
 msgstr "Montri resumitan mesaĝon pri uzado"
 
-#: popthelp.c:90
+#: src/popthelp.c:76
 msgid "Display option defaults in message"
 msgstr "Montri la implicitajn valorojn de la opcio en la mesaĝo"
 
-#: popthelp.c:92
+#: src/popthelp.c:78
 msgid "Terminate options"
 msgstr "Opcioj pri finiĝo"
 
-#: popthelp.c:191
+#: src/popthelp.c:170
 msgid "Help options:"
 msgstr "Help-opcioj:"
 
-#: popthelp.c:192
+#: src/popthelp.c:171
 msgid "Options implemented via popt alias/exec:"
 msgstr "Opcioj realigitaj per popt alias/exec:"
 
-#: popthelp.c:200
+#: src/popthelp.c:179
 msgid "NONE"
 msgstr "NENIO"
 
-#: popthelp.c:202
+#: src/popthelp.c:181
 msgid "VAL"
 msgstr "VAL"
 
-#: popthelp.c:206
+#: src/popthelp.c:185
 msgid "INT"
 msgstr "INT"
 
-#: popthelp.c:207
+#: src/popthelp.c:186
 msgid "SHORT"
 msgstr ""
 
-#: popthelp.c:208
+#: src/popthelp.c:187
 msgid "LONG"
 msgstr "LONG"
 
-#: popthelp.c:209
+#: src/popthelp.c:188
 msgid "LONGLONG"
 msgstr "LONGLONG"
 
-#: popthelp.c:210
+#: src/popthelp.c:189
 msgid "STRING"
 msgstr "STRING"
 
-#: popthelp.c:211
+#: src/popthelp.c:190
 msgid "FLOAT"
 msgstr "FLOAT"
 
-#: popthelp.c:212
+#: src/popthelp.c:191
 msgid "DOUBLE"
 msgstr "DOUBLE"
 
-#: popthelp.c:215
+#: src/popthelp.c:194
 msgid "ARG"
 msgstr "ARG"
 
-#: popthelp.c:649
+#: src/popthelp.c:608
 msgid "Usage:"
 msgstr "Uzado:"
 
-#: popthelp.c:672
+#: src/popthelp.c:630
 msgid "[OPTION...]"
 msgstr "[OPCIO...]"
diff --git a/po/es.po b/po/es.po
index c218131..471601e 100644
--- a/po/es.po
+++ b/po/es.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.12\n"
 "Report-Msgid-Bugs-To: <rpm-maint@lists.rpm.org>\n"
-"POT-Creation-Date: 2020-02-12 10:47+0200\n"
+"POT-Creation-Date: 2020-05-13 11:40+0300\n"
 "PO-Revision-Date: 2007-12-28 12:22+0100\n"
 "Last-Translator: Leandro Lucarella <luca@linuxmendoza.org.ar>\n"
 "Language-Team: Spanish <es@li.org>\n"
@@ -15,128 +15,128 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: popt.c:47
+#: src/popt.c:37
 msgid "unknown errno"
 msgstr "errno desconocido"
 
-#: popt.c:1290
+#: src/popt.c:1196
 #, fuzzy, c-format
 msgid "option type (%u) not implemented in popt\n"
 msgstr "tipo de opción (%d) no implementada en popt\n"
 
-#: popt.c:1711
+#: src/popt.c:1607
 msgid "missing argument"
 msgstr "falta argumento"
 
-#: popt.c:1713
+#: src/popt.c:1609
 msgid "unknown option"
 msgstr "opción desconocida"
 
-#: popt.c:1715
+#: src/popt.c:1611
 msgid "mutually exclusive logical operations requested"
 msgstr "requerida operación lógica mutuamente exclusiva"
 
-#: popt.c:1717
+#: src/popt.c:1613
 msgid "opt->arg should not be NULL"
 msgstr ""
 
-#: popt.c:1719
+#: src/popt.c:1615
 msgid "aliases nested too deeply"
 msgstr "alias anidados muy profundamente"
 
-#: popt.c:1721
+#: src/popt.c:1617
 msgid "error in parameter quoting"
 msgstr "error en cita de parámetros"
 
-#: popt.c:1723
+#: src/popt.c:1619
 msgid "invalid numeric value"
 msgstr "valor numérico inválido"
 
-#: popt.c:1725
+#: src/popt.c:1621
 msgid "number too large or too small"
 msgstr "número muy largo o muy pequeño"
 
-#: popt.c:1727
+#: src/popt.c:1623
 msgid "memory allocation failed"
 msgstr ""
 
-#: popt.c:1729
+#: src/popt.c:1625
 msgid "config file failed sanity test"
 msgstr ""
 
-#: popt.c:1733
+#: src/popt.c:1629
 msgid "unknown error"
 msgstr "error desconocido"
 
-#: popthelp.c:75 popthelp.c:86
+#: src/popthelp.c:64 src/popthelp.c:72
 msgid "Show this help message"
 msgstr "Muestra este mensaje de ayuda"
 
-#: popthelp.c:76 popthelp.c:87
+#: src/popthelp.c:65 src/popthelp.c:73
 msgid "Display brief usage message"
 msgstr "Indica el modo de uso resumido"
 
-#: popthelp.c:90
+#: src/popthelp.c:76
 msgid "Display option defaults in message"
 msgstr ""
 
-#: popthelp.c:92
+#: src/popthelp.c:78
 msgid "Terminate options"
 msgstr ""
 
-#: popthelp.c:191
+#: src/popthelp.c:170
 msgid "Help options:"
 msgstr ""
 
-#: popthelp.c:192
+#: src/popthelp.c:171
 msgid "Options implemented via popt alias/exec:"
 msgstr ""
 
-#: popthelp.c:200
+#: src/popthelp.c:179
 msgid "NONE"
 msgstr "NONE"
 
-#: popthelp.c:202
+#: src/popthelp.c:181
 msgid "VAL"
 msgstr "VAL"
 
-#: popthelp.c:206
+#: src/popthelp.c:185
 msgid "INT"
 msgstr "INT"
 
-#: popthelp.c:207
+#: src/popthelp.c:186
 msgid "SHORT"
 msgstr ""
 
-#: popthelp.c:208
+#: src/popthelp.c:187
 msgid "LONG"
 msgstr "LONG"
 
-#: popthelp.c:209
+#: src/popthelp.c:188
 #, fuzzy
 msgid "LONGLONG"
 msgstr "LONG"
 
-#: popthelp.c:210
+#: src/popthelp.c:189
 msgid "STRING"
 msgstr "STRING"
 
-#: popthelp.c:211
+#: src/popthelp.c:190
 msgid "FLOAT"
 msgstr "FLOAT"
 
-#: popthelp.c:212
+#: src/popthelp.c:191
 msgid "DOUBLE"
 msgstr "DOUBLE"
 
-#: popthelp.c:215
+#: src/popthelp.c:194
 msgid "ARG"
 msgstr "ARG"
 
-#: popthelp.c:649
+#: src/popthelp.c:608
 msgid "Usage:"
 msgstr "Modo de uso:"
 
-#: popthelp.c:672
+#: src/popthelp.c:630
 msgid "[OPTION...]"
 msgstr "[OPCIÓN...]"
diff --git a/po/fi.po b/po/fi.po
index c3eb7d9..a21a049 100644
--- a/po/fi.po
+++ b/po/fi.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.14\n"
 "Report-Msgid-Bugs-To: <rpm-maint@lists.rpm.org>\n"
-"POT-Creation-Date: 2020-02-12 10:47+0200\n"
+"POT-Creation-Date: 2020-05-13 11:40+0300\n"
 "PO-Revision-Date: 2008-02-21 18:19+0200\n"
 "Last-Translator: Jorma Karvonen <karvjorm@users.sf.net>\n"
 "Language-Team: Finnish <translation-team-fi@lists.sourceforge.net>\n"
@@ -20,129 +20,129 @@ msgstr ""
 "X-Generator: KBabel 1.11.4\n"
 
 #  errno - number of last error (defined by the ISO C standard)
-#: popt.c:47
+#: src/popt.c:37
 msgid "unknown errno"
 msgstr "tuntematon errno-virhenumeroarvo"
 
-#: popt.c:1290
+#: src/popt.c:1196
 #, c-format
 msgid "option type (%u) not implemented in popt\n"
 msgstr "valitsintyyppiä (%u) ei ole toteutettu popt-ohjelmassa\n"
 
-#: popt.c:1711
+#: src/popt.c:1607
 msgid "missing argument"
 msgstr "puuttuva argumentti"
 
-#: popt.c:1713
+#: src/popt.c:1609
 msgid "unknown option"
 msgstr "tuntematon valitsin"
 
-#: popt.c:1715
+#: src/popt.c:1611
 msgid "mutually exclusive logical operations requested"
 msgstr "pyydettyjä loogisia toimintoja ei voi käyttää yhdessä"
 
-#: popt.c:1717
+#: src/popt.c:1613
 msgid "opt->arg should not be NULL"
 msgstr "”opt->arg”-valitsinargumentti ei saa olla NULL"
 
-#: popt.c:1719
+#: src/popt.c:1615
 msgid "aliases nested too deeply"
 msgstr "liian monta aliasta sisäkkäin"
 
-#: popt.c:1721
+#: src/popt.c:1617
 msgid "error in parameter quoting"
 msgstr "virhe parametrien lainauksessa"
 
-#: popt.c:1723
+#: src/popt.c:1619
 msgid "invalid numeric value"
 msgstr "virheellinen numeroarvo"
 
-#: popt.c:1725
+#: src/popt.c:1621
 msgid "number too large or too small"
 msgstr "numero on liian iso tai liian pieni"
 
-#: popt.c:1727
+#: src/popt.c:1623
 msgid "memory allocation failed"
 msgstr "muistin varaus ei onnistunut"
 
-#: popt.c:1729
+#: src/popt.c:1625
 msgid "config file failed sanity test"
 msgstr ""
 
-#: popt.c:1733
+#: src/popt.c:1629
 msgid "unknown error"
 msgstr "tuntematon virhe"
 
-#: popthelp.c:75 popthelp.c:86
+#: src/popthelp.c:64 src/popthelp.c:72
 msgid "Show this help message"
 msgstr "Näytä tämä ohje"
 
-#: popthelp.c:76 popthelp.c:87
+#: src/popthelp.c:65 src/popthelp.c:73
 msgid "Display brief usage message"
 msgstr "Näytä lyhyt käyttöohje"
 
-#: popthelp.c:90
+#: src/popthelp.c:76
 msgid "Display option defaults in message"
 msgstr "Näytä valitsinoletukset ohjeessa"
 
-#: popthelp.c:92
+#: src/popthelp.c:78
 msgid "Terminate options"
 msgstr "Lopettamisvalitsimet"
 
-#: popthelp.c:191
+#: src/popthelp.c:170
 msgid "Help options:"
 msgstr "Ohjevalitsimet:"
 
-#: popthelp.c:192
+#: src/popthelp.c:171
 msgid "Options implemented via popt alias/exec:"
 msgstr ""
 "Valitsimet toteutettu ”popt alias”-määrittelyillä tai ”popt exec”-"
 "määrittelyillä:"
 
-#: popthelp.c:200
+#: src/popthelp.c:179
 msgid "NONE"
 msgstr "EI MITÄÄN"
 
-#: popthelp.c:202
+#: src/popthelp.c:181
 msgid "VAL"
 msgstr "ARVO"
 
-#: popthelp.c:206
+#: src/popthelp.c:185
 msgid "INT"
 msgstr "INT-KOKONAISLUKU"
 
-#: popthelp.c:207
+#: src/popthelp.c:186
 msgid "SHORT"
 msgstr ""
 
-#: popthelp.c:208
+#: src/popthelp.c:187
 msgid "LONG"
 msgstr "LONG-KOKONAISLUKU"
 
-#: popthelp.c:209
+#: src/popthelp.c:188
 msgid "LONGLONG"
 msgstr "LONGLONG-KOKONAISLUKU"
 
-#: popthelp.c:210
+#: src/popthelp.c:189
 msgid "STRING"
 msgstr "MERKKIJONO"
 
-#: popthelp.c:211
+#: src/popthelp.c:190
 msgid "FLOAT"
 msgstr "FLOAT-LIUKULUKU"
 
-#: popthelp.c:212
+#: src/popthelp.c:191
 msgid "DOUBLE"
 msgstr "DOUBLE-LIUKULUKU"
 
-#: popthelp.c:215
+#: src/popthelp.c:194
 msgid "ARG"
 msgstr "ARGUMENTTI"
 
-#: popthelp.c:649
+#: src/popthelp.c:608
 msgid "Usage:"
 msgstr "Käyttö:"
 
-#: popthelp.c:672
+#: src/popthelp.c:630
 msgid "[OPTION...]"
 msgstr "[VALITSIN...]"
diff --git a/po/fr.po b/po/fr.po
index 51ffa17..b1467f7 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -12,137 +12,137 @@ msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.11\n"
 "Report-Msgid-Bugs-To: <rpm-maint@lists.rpm.org>\n"
-"POT-Creation-Date: 2020-02-12 10:47+0200\n"
+"POT-Creation-Date: 2020-05-13 11:40+0300\n"
 "PO-Revision-Date: 2003-06-22 23:43+0200\n"
 "Last-Translator: RPM French Translation <rpm-fr@livna.org>\n"
 "Language-Team: RPM French Translation <rpm-fr@livna.org>\n"
-"Language: \n"
+"Language: fr\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8-bit\n"
 
-#: popt.c:47
+#: src/popt.c:37
 msgid "unknown errno"
 msgstr "errno inconnu"
 
-#: popt.c:1290
+#: src/popt.c:1196
 #, fuzzy, c-format
 msgid "option type (%u) not implemented in popt\n"
 msgstr "type(%d) d'option non implémenté dans popt\n"
 
-#: popt.c:1711
+#: src/popt.c:1607
 msgid "missing argument"
 msgstr "argument manquant"
 
-#: popt.c:1713
+#: src/popt.c:1609
 msgid "unknown option"
 msgstr "option iconnue"
 
-#: popt.c:1715
+#: src/popt.c:1611
 msgid "mutually exclusive logical operations requested"
 msgstr "opérations logiques mutuellement exclusives requises"
 
-#: popt.c:1717
+#: src/popt.c:1613
 msgid "opt->arg should not be NULL"
 msgstr "opt->arg ne devrait pas être NULL"
 
-#: popt.c:1719
+#: src/popt.c:1615
 msgid "aliases nested too deeply"
 msgstr "les alias sont trop entremellés"
 
-#: popt.c:1721
+#: src/popt.c:1617
 msgid "error in parameter quoting"
 msgstr "erreur en citant les paramètres"
 
-#: popt.c:1723
+#: src/popt.c:1619
 msgid "invalid numeric value"
 msgstr "valeur numérique invalide"
 
-#: popt.c:1725
+#: src/popt.c:1621
 msgid "number too large or too small"
 msgstr "nombre trop grand ou trop petit"
 
-#: popt.c:1727
+#: src/popt.c:1623
 msgid "memory allocation failed"
 msgstr "échec de l'allocation de mémoire"
 
-#: popt.c:1729
+#: src/popt.c:1625
 msgid "config file failed sanity test"
 msgstr ""
 
-#: popt.c:1733
+#: src/popt.c:1629
 msgid "unknown error"
 msgstr "erreur inconnue"
 
-#: popthelp.c:75 popthelp.c:86
+#: src/popthelp.c:64 src/popthelp.c:72
 msgid "Show this help message"
 msgstr "Montre ce message d'aide"
 
-#: popthelp.c:76 popthelp.c:87
+#: src/popthelp.c:65 src/popthelp.c:73
 msgid "Display brief usage message"
 msgstr "Affiche un bref descriptif de l'utilisation"
 
-#: popthelp.c:90
+#: src/popthelp.c:76
 msgid "Display option defaults in message"
 msgstr "Afficher les valeurs par défaut des options dans le message"
 
-#: popthelp.c:92
+#: src/popthelp.c:78
 msgid "Terminate options"
 msgstr ""
 
-#: popthelp.c:191
+#: src/popthelp.c:170
 msgid "Help options:"
 msgstr ""
 
-#: popthelp.c:192
+#: src/popthelp.c:171
 msgid "Options implemented via popt alias/exec:"
 msgstr ""
 
-#: popthelp.c:200
+#: src/popthelp.c:179
 msgid "NONE"
 msgstr "RIEN"
 
-#: popthelp.c:202
+#: src/popthelp.c:181
 msgid "VAL"
 msgstr "VAL"
 
-#: popthelp.c:206
+#: src/popthelp.c:185
 msgid "INT"
 msgstr "ENTIER"
 
-#: popthelp.c:207
+#: src/popthelp.c:186
 msgid "SHORT"
 msgstr ""
 
-#: popthelp.c:208
+#: src/popthelp.c:187
 msgid "LONG"
 msgstr "LONG"
 
-#: popthelp.c:209
+#: src/popthelp.c:188
 #, fuzzy
 msgid "LONGLONG"
 msgstr "LONG"
 
-#: popthelp.c:210
+#: src/popthelp.c:189
 msgid "STRING"
 msgstr "CHAINE"
 
-#: popthelp.c:211
+#: src/popthelp.c:190
 msgid "FLOAT"
 msgstr "FLOTTANT"
 
-#: popthelp.c:212
+#: src/popthelp.c:191
 msgid "DOUBLE"
 msgstr "DOUBLE"
 
-#: popthelp.c:215
+#: src/popthelp.c:194
 msgid "ARG"
 msgstr "ARG"
 
-#: popthelp.c:649
+#: src/popthelp.c:608
 msgid "Usage:"
 msgstr "Utilisation:"
 
-#: popthelp.c:672
+#: src/popthelp.c:630
 msgid "[OPTION...]"
 msgstr "[OPTION...]"
diff --git a/po/ga.po b/po/ga.po
index 1227260..9131da9 100644
--- a/po/ga.po
+++ b/po/ga.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.14\n"
 "Report-Msgid-Bugs-To: <rpm-maint@lists.rpm.org>\n"
-"POT-Creation-Date: 2020-02-12 10:47+0200\n"
+"POT-Creation-Date: 2020-05-13 11:40+0300\n"
 "PO-Revision-Date: 2008-04-10 06:21-0500\n"
 "Last-Translator: Kevin Scannell <kscanne@gmail.com>\n"
 "Language-Team: Irish <gaeilge-gnulinux@lists.sourceforge.net>\n"
@@ -15,128 +15,128 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: popt.c:47
+#: src/popt.c:37
 msgid "unknown errno"
 msgstr "errno anaithnid"
 
-#: popt.c:1290
+#: src/popt.c:1196
 #, c-format
 msgid "option type (%u) not implemented in popt\n"
 msgstr "níl an cineál rogha seo (%u) ar fáil i popt\n"
 
-#: popt.c:1711
+#: src/popt.c:1607
 msgid "missing argument"
 msgstr "argóint ar iarraidh"
 
-#: popt.c:1713
+#: src/popt.c:1609
 msgid "unknown option"
 msgstr "rogha anaithnid"
 
-#: popt.c:1715
+#: src/popt.c:1611
 msgid "mutually exclusive logical operations requested"
 msgstr "iarradh oibríochtaí loighciúla comheisiacha"
 
-#: popt.c:1717
+#: src/popt.c:1613
 msgid "opt->arg should not be NULL"
 msgstr "níor chóir rogha->arg a bheith NULL"
 
-#: popt.c:1719
+#: src/popt.c:1615
 msgid "aliases nested too deeply"
 msgstr "ailiasanna neadaithe ródhomhain"
 
-#: popt.c:1721
+#: src/popt.c:1617
 msgid "error in parameter quoting"
 msgstr "earráid agus paraiméadar á chur faoi chomharthaí athfhriotail"
 
-#: popt.c:1723
+#: src/popt.c:1619
 msgid "invalid numeric value"
 msgstr "luach neamhbhailí uimhriúil"
 
-#: popt.c:1725
+#: src/popt.c:1621
 msgid "number too large or too small"
 msgstr "uimhir rómhór nó róbheag"
 
-#: popt.c:1727
+#: src/popt.c:1623
 msgid "memory allocation failed"
 msgstr "theip ar dháileadh na cuimhne"
 
-#: popt.c:1729
+#: src/popt.c:1625
 msgid "config file failed sanity test"
 msgstr ""
 
-#: popt.c:1733
+#: src/popt.c:1629
 msgid "unknown error"
 msgstr "earráid anaithnid"
 
-#: popthelp.c:75 popthelp.c:86
+#: src/popthelp.c:64 src/popthelp.c:72
 msgid "Show this help message"
 msgstr "Taispeáin an chabhair seo"
 
-#: popthelp.c:76 popthelp.c:87
+#: src/popthelp.c:65 src/popthelp.c:73
 msgid "Display brief usage message"
 msgstr "Taispeáin beagán eolais faoin úsáid"
 
-#: popthelp.c:90
+#: src/popthelp.c:76
 msgid "Display option defaults in message"
 msgstr "Taispeáin luachanna réamhshocraithe na roghanna sa teachtaireacht"
 
 # Terminate not a verb here
-#: popthelp.c:92
+#: src/popthelp.c:78
 msgid "Terminate options"
 msgstr "Roghanna scortha"
 
-#: popthelp.c:191
+#: src/popthelp.c:170
 msgid "Help options:"
 msgstr "Roghanna cabhracha:"
 
-#: popthelp.c:192
+#: src/popthelp.c:171
 msgid "Options implemented via popt alias/exec:"
 msgstr "Roghanna a cuireadh i bhfeidhm trí ailias/exec popt:"
 
-#: popthelp.c:200
+#: src/popthelp.c:179
 msgid "NONE"
 msgstr "NEAMHNÍ"
 
-#: popthelp.c:202
+#: src/popthelp.c:181
 msgid "VAL"
 msgstr "LUACH"
 
-#: popthelp.c:206
+#: src/popthelp.c:185
 msgid "INT"
 msgstr "INT"
 
-#: popthelp.c:207
+#: src/popthelp.c:186
 msgid "SHORT"
 msgstr ""
 
-#: popthelp.c:208
+#: src/popthelp.c:187
 msgid "LONG"
 msgstr "LONG"
 
-#: popthelp.c:209
+#: src/popthelp.c:188
 msgid "LONGLONG"
 msgstr "LONGLONG"
 
-#: popthelp.c:210
+#: src/popthelp.c:189
 msgid "STRING"
 msgstr "STRING"
 
-#: popthelp.c:211
+#: src/popthelp.c:190
 msgid "FLOAT"
 msgstr "FLOAT"
 
-#: popthelp.c:212
+#: src/popthelp.c:191
 msgid "DOUBLE"
 msgstr "DOUBLE"
 
-#: popthelp.c:215
+#: src/popthelp.c:194
 msgid "ARG"
 msgstr "ARG"
 
-#: popthelp.c:649
+#: src/popthelp.c:608
 msgid "Usage:"
 msgstr "Úsáid:"
 
-#: popthelp.c:672
+#: src/popthelp.c:630
 msgid "[OPTION...]"
 msgstr "[ROGHA...]"
diff --git a/po/gl.po b/po/gl.po
index 227ab04..b16d6d0 100644
--- a/po/gl.po
+++ b/po/gl.po
@@ -2,138 +2,138 @@ msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.11\n"
 "Report-Msgid-Bugs-To: <rpm-maint@lists.rpm.org>\n"
-"POT-Creation-Date: 2020-02-12 10:47+0200\n"
+"POT-Creation-Date: 2020-05-13 11:40+0300\n"
 "PO-Revision-Date: 2001-01-17 01:01+0100\n"
-"Last-Translator: Jes�s Bravo �lvarez <jba@pobox.com>\n"
+"Last-Translator: Jesús Bravo Álvarez <jba@pobox.com>\n"
 "Language-Team: Galician <trasno@ceu.fi.udc.es>\n"
 "Language: gl\n"
 "MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=iso-8859-1\n"
+"Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: popt.c:47
+#: src/popt.c:37
 msgid "unknown errno"
-msgstr "errno desco�ecido"
+msgstr "errno descoñecido"
 
-#: popt.c:1290
+#: src/popt.c:1196
 #, fuzzy, c-format
 msgid "option type (%u) not implemented in popt\n"
-msgstr "tipo de opci�n (%d) non implementada en popt\n"
+msgstr "tipo de opción (%d) non implementada en popt\n"
 
-#: popt.c:1711
+#: src/popt.c:1607
 msgid "missing argument"
 msgstr "falta un argumento"
 
-#: popt.c:1713
+#: src/popt.c:1609
 msgid "unknown option"
-msgstr "opci�n desco�ecida"
+msgstr "opción descoñecida"
 
-#: popt.c:1715
+#: src/popt.c:1611
 msgid "mutually exclusive logical operations requested"
-msgstr "solicit�ronse operaci�ns l�xicas mutuamente exclu�ntes"
+msgstr "solicitáronse operacións lóxicas mutuamente excluíntes"
 
-#: popt.c:1717
+#: src/popt.c:1613
 msgid "opt->arg should not be NULL"
 msgstr ""
 
-#: popt.c:1719
+#: src/popt.c:1615
 msgid "aliases nested too deeply"
-msgstr "aliases ani�ados a un nivel demasiado profundo"
+msgstr "aliases aniñados a un nivel demasiado profundo"
 
-#: popt.c:1721
+#: src/popt.c:1617
 msgid "error in parameter quoting"
-msgstr "erro nas comi�as do par�metro"
+msgstr "erro nas comiñas do parámetro"
 
-#: popt.c:1723
+#: src/popt.c:1619
 msgid "invalid numeric value"
-msgstr "valor num�rico non v�lido"
+msgstr "valor numérico non válido"
 
-#: popt.c:1725
+#: src/popt.c:1621
 msgid "number too large or too small"
-msgstr "n�mero demasiado grande ou pequeno"
+msgstr "número demasiado grande ou pequeno"
 
-#: popt.c:1727
+#: src/popt.c:1623
 msgid "memory allocation failed"
 msgstr ""
 
-#: popt.c:1729
+#: src/popt.c:1625
 msgid "config file failed sanity test"
 msgstr ""
 
-#: popt.c:1733
+#: src/popt.c:1629
 msgid "unknown error"
-msgstr "erro desco�ecido"
+msgstr "erro descoñecido"
 
-#: popthelp.c:75 popthelp.c:86
+#: src/popthelp.c:64 src/popthelp.c:72
 msgid "Show this help message"
 msgstr "Amosar esta mensaxe de axuda"
 
-#: popthelp.c:76 popthelp.c:87
+#: src/popthelp.c:65 src/popthelp.c:73
 msgid "Display brief usage message"
-msgstr "Amosar brevemente o xeito de utilizaci�n"
+msgstr "Amosar brevemente o xeito de utilización"
 
-#: popthelp.c:90
+#: src/popthelp.c:76
 #, fuzzy
 msgid "Display option defaults in message"
-msgstr "Amosar brevemente o xeito de utilizaci�n"
+msgstr "Amosar brevemente o xeito de utilización"
 
-#: popthelp.c:92
+#: src/popthelp.c:78
 msgid "Terminate options"
 msgstr ""
 
-#: popthelp.c:191
+#: src/popthelp.c:170
 msgid "Help options:"
 msgstr ""
 
-#: popthelp.c:192
+#: src/popthelp.c:171
 msgid "Options implemented via popt alias/exec:"
 msgstr ""
 
-#: popthelp.c:200
+#: src/popthelp.c:179
 msgid "NONE"
 msgstr "NADA"
 
-#: popthelp.c:202
+#: src/popthelp.c:181
 msgid "VAL"
 msgstr "VAL"
 
-#: popthelp.c:206
+#: src/popthelp.c:185
 msgid "INT"
 msgstr "INT"
 
-#: popthelp.c:207
+#: src/popthelp.c:186
 msgid "SHORT"
 msgstr ""
 
-#: popthelp.c:208
+#: src/popthelp.c:187
 msgid "LONG"
 msgstr "LONG"
 
-#: popthelp.c:209
+#: src/popthelp.c:188
 #, fuzzy
 msgid "LONGLONG"
 msgstr "LONG"
 
-#: popthelp.c:210
+#: src/popthelp.c:189
 msgid "STRING"
 msgstr "CADEA"
 
-#: popthelp.c:211
+#: src/popthelp.c:190
 msgid "FLOAT"
 msgstr "FLOAT"
 
-#: popthelp.c:212
+#: src/popthelp.c:191
 msgid "DOUBLE"
 msgstr "DOUBLE"
 
-#: popthelp.c:215
+#: src/popthelp.c:194
 msgid "ARG"
 msgstr "ARG"
 
-#: popthelp.c:649
+#: src/popthelp.c:608
 msgid "Usage:"
 msgstr "Uso:"
 
-#: popthelp.c:672
+#: src/popthelp.c:630
 msgid "[OPTION...]"
-msgstr "[OPCI�N...]"
+msgstr "[OPCIÓN...]"
diff --git a/po/hu.po b/po/hu.po
index 7fe0a45..3c1aa7d 100644
--- a/po/hu.po
+++ b/po/hu.po
@@ -5,7 +5,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.11\n"
 "Report-Msgid-Bugs-To: <rpm-maint@lists.rpm.org>\n"
-"POT-Creation-Date: 2020-02-12 10:47+0200\n"
+"POT-Creation-Date: 2020-05-13 11:40+0300\n"
 "PO-Revision-Date: 2007-06-21 00:45+0200\n"
 "Last-Translator: Gabor Kelemen <kelemeng@gnome.hu>\n"
 "Language-Team: Hungarian <translation-team-hu@lists.sourceforge.net>\n"
@@ -16,129 +16,129 @@ msgstr ""
 "X-Generator: KBabel 1.11.4\n"
 "Plural-Forms:  nplurals=2; plural=(n != 1);\n"
 
-#: popt.c:47
+#: src/popt.c:37
 msgid "unknown errno"
 msgstr "ismeretlen hibaszám"
 
-#: popt.c:1290
+#: src/popt.c:1196
 #, fuzzy, c-format
 msgid "option type (%u) not implemented in popt\n"
 msgstr "a kapcsolótípus (%d) nincs megvalósítva a popt-ban\n"
 
-#: popt.c:1711
+#: src/popt.c:1607
 msgid "missing argument"
 msgstr "hiányzó paraméter"
 
-#: popt.c:1713
+#: src/popt.c:1609
 msgid "unknown option"
 msgstr "ismeretlen kapcsoló"
 
-#: popt.c:1715
+#: src/popt.c:1611
 msgid "mutually exclusive logical operations requested"
 msgstr "kölcsönösen kizáró logikai műveleteket kért"
 
-#: popt.c:1717
+#: src/popt.c:1613
 msgid "opt->arg should not be NULL"
 msgstr "az opt->arg nem lehet NULL"
 
-#: popt.c:1719
+#: src/popt.c:1615
 msgid "aliases nested too deeply"
 msgstr "az álnevek túl mélyen vannak egymásba ágyazva"
 
-#: popt.c:1721
+#: src/popt.c:1617
 msgid "error in parameter quoting"
 msgstr "hiba a paraméter idézésében"
 
-#: popt.c:1723
+#: src/popt.c:1619
 msgid "invalid numeric value"
 msgstr "érvénytelen numerikus érték"
 
-#: popt.c:1725
+#: src/popt.c:1621
 msgid "number too large or too small"
 msgstr "a szám túl nagy vagy túl kicsi"
 
-#: popt.c:1727
+#: src/popt.c:1623
 msgid "memory allocation failed"
 msgstr "a memóriafoglalás meghiúsult"
 
-#: popt.c:1729
+#: src/popt.c:1625
 msgid "config file failed sanity test"
 msgstr ""
 
-#: popt.c:1733
+#: src/popt.c:1629
 msgid "unknown error"
 msgstr "ismeretlen hiba"
 
-#: popthelp.c:75 popthelp.c:86
+#: src/popthelp.c:64 src/popthelp.c:72
 msgid "Show this help message"
 msgstr "Ezen súgó megjelenítése"
 
-#: popthelp.c:76 popthelp.c:87
+#: src/popthelp.c:65 src/popthelp.c:73
 msgid "Display brief usage message"
 msgstr "Rövid használati utasítás megjelenítése"
 
-#: popthelp.c:90
+#: src/popthelp.c:76
 msgid "Display option defaults in message"
 msgstr "Kapcsolók alapértelmezéseinek megjelenítése"
 
-#: popthelp.c:92
+#: src/popthelp.c:78
 #, fuzzy
 msgid "Terminate options"
 msgstr "Súgólehetőségek:"
 
-#: popthelp.c:191
+#: src/popthelp.c:170
 msgid "Help options:"
 msgstr "Súgólehetőségek:"
 
-#: popthelp.c:192
+#: src/popthelp.c:171
 msgid "Options implemented via popt alias/exec:"
 msgstr "A popt alias/exec segítségével megvalósított kapcsolók:"
 
-#: popthelp.c:200
+#: src/popthelp.c:179
 msgid "NONE"
 msgstr "NINCS"
 
-#: popthelp.c:202
+#: src/popthelp.c:181
 msgid "VAL"
 msgstr "ÉRTÉK"
 
-#: popthelp.c:206
+#: src/popthelp.c:185
 msgid "INT"
 msgstr "EGÉSZ"
 
-#: popthelp.c:207
+#: src/popthelp.c:186
 msgid "SHORT"
 msgstr ""
 
-#: popthelp.c:208
+#: src/popthelp.c:187
 msgid "LONG"
 msgstr "HOSSZÚ"
 
-#: popthelp.c:209
+#: src/popthelp.c:188
 #, fuzzy
 msgid "LONGLONG"
 msgstr "HOSSZÚ"
 
-#: popthelp.c:210
+#: src/popthelp.c:189
 msgid "STRING"
 msgstr "SZÖVEG"
 
-#: popthelp.c:211
+#: src/popthelp.c:190
 msgid "FLOAT"
 msgstr "LEBEGŐ"
 
-#: popthelp.c:212
+#: src/popthelp.c:191
 msgid "DOUBLE"
 msgstr "DUPLA"
 
-#: popthelp.c:215
+#: src/popthelp.c:194
 msgid "ARG"
 msgstr "PAR"
 
-#: popthelp.c:649
+#: src/popthelp.c:608
 msgid "Usage:"
 msgstr "Használat:"
 
-#: popthelp.c:672
+#: src/popthelp.c:630
 msgid "[OPTION...]"
 msgstr "[KAPCSOLÓ...]"
diff --git a/po/id.po b/po/id.po
index 6b18c12..d71dc0c 100644
--- a/po/id.po
+++ b/po/id.po
@@ -6,136 +6,136 @@ msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.14\n"
 "Report-Msgid-Bugs-To: <rpm-maint@lists.rpm.org>\n"
-"POT-Creation-Date: 2020-02-12 10:47+0200\n"
+"POT-Creation-Date: 2020-05-13 11:40+0300\n"
 "PO-Revision-Date: 2008-08-26 14:18+0700\n"
 "Last-Translator: Andhika Padmawan <andhika.padmawan@gmail.com>\n"
 "Language-Team: Indonesian <translation-team-id@lists.sourceforge.net>\n"
 "Language: id\n"
 "MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=utf-8\n"
+"Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: popt.c:47
+#: src/popt.c:37
 msgid "unknown errno"
 msgstr "errno tak diketahui"
 
-#: popt.c:1290
+#: src/popt.c:1196
 #, c-format
 msgid "option type (%u) not implemented in popt\n"
 msgstr "tipe opsi (%u) tak diimplementasikan di popt\n"
 
-#: popt.c:1711
+#: src/popt.c:1607
 msgid "missing argument"
 msgstr "kehilangan argumen"
 
-#: popt.c:1713
+#: src/popt.c:1609
 msgid "unknown option"
 msgstr "opsi tak diketahui"
 
-#: popt.c:1715
+#: src/popt.c:1611
 msgid "mutually exclusive logical operations requested"
 msgstr "permintaan operasi logika eksklusif secara mutual"
 
-#: popt.c:1717
+#: src/popt.c:1613
 msgid "opt->arg should not be NULL"
 msgstr "opt->arg tidak boleh NULL"
 
-#: popt.c:1719
+#: src/popt.c:1615
 msgid "aliases nested too deeply"
 msgstr "alias disarangkan terlalu dalam"
 
-#: popt.c:1721
+#: src/popt.c:1617
 msgid "error in parameter quoting"
 msgstr "galat di pencantuman parameter"
 
-#: popt.c:1723
+#: src/popt.c:1619
 msgid "invalid numeric value"
 msgstr "nilai numerik tidak sah"
 
-#: popt.c:1725
+#: src/popt.c:1621
 msgid "number too large or too small"
 msgstr "nomor terlalu besar atau terlalu kecil"
 
-#: popt.c:1727
+#: src/popt.c:1623
 msgid "memory allocation failed"
 msgstr "alokasi memori gagal"
 
-#: popt.c:1729
+#: src/popt.c:1625
 msgid "config file failed sanity test"
 msgstr ""
 
-#: popt.c:1733
+#: src/popt.c:1629
 msgid "unknown error"
 msgstr "galat tak diketahui"
 
-#: popthelp.c:75 popthelp.c:86
+#: src/popthelp.c:64 src/popthelp.c:72
 msgid "Show this help message"
 msgstr "Tampilkan pesan bantuan ini"
 
-#: popthelp.c:76 popthelp.c:87
+#: src/popthelp.c:65 src/popthelp.c:73
 msgid "Display brief usage message"
 msgstr "Tampilkan pesan penggunaan singkat"
 
-#: popthelp.c:90
+#: src/popthelp.c:76
 msgid "Display option defaults in message"
 msgstr "Tampilkan opsi standar dalam pesan"
 
-#: popthelp.c:92
+#: src/popthelp.c:78
 msgid "Terminate options"
 msgstr "Matikan opsi"
 
-#: popthelp.c:191
+#: src/popthelp.c:170
 msgid "Help options:"
 msgstr "Opsi bantuan:"
 
-#: popthelp.c:192
+#: src/popthelp.c:171
 msgid "Options implemented via popt alias/exec:"
 msgstr "Opsi diimplementasikan via popt alias/exec:"
 
-#: popthelp.c:200
+#: src/popthelp.c:179
 msgid "NONE"
 msgstr "NONE"
 
-#: popthelp.c:202
+#: src/popthelp.c:181
 msgid "VAL"
 msgstr "VAL"
 
-#: popthelp.c:206
+#: src/popthelp.c:185
 msgid "INT"
 msgstr "INT"
 
-#: popthelp.c:207
+#: src/popthelp.c:186
 msgid "SHORT"
 msgstr ""
 
-#: popthelp.c:208
+#: src/popthelp.c:187
 msgid "LONG"
 msgstr "LONG"
 
-#: popthelp.c:209
+#: src/popthelp.c:188
 msgid "LONGLONG"
 msgstr "LONGLONG"
 
-#: popthelp.c:210
+#: src/popthelp.c:189
 msgid "STRING"
 msgstr "STRING"
 
-#: popthelp.c:211
+#: src/popthelp.c:190
 msgid "FLOAT"
 msgstr "FLOAT"
 
-#: popthelp.c:212
+#: src/popthelp.c:191
 msgid "DOUBLE"
 msgstr "DOUBLE"
 
-#: popthelp.c:215
+#: src/popthelp.c:194
 msgid "ARG"
 msgstr "ARG"
 
-#: popthelp.c:649
+#: src/popthelp.c:608
 msgid "Usage:"
 msgstr "Penggunaan:"
 
-#: popthelp.c:672
+#: src/popthelp.c:630
 msgid "[OPTION...]"
 msgstr "[OPSI...]"
diff --git a/po/is.po b/po/is.po
index fddbf89..fbccb47 100644
--- a/po/is.po
+++ b/po/is.po
@@ -2,137 +2,137 @@ msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.11\n"
 "Report-Msgid-Bugs-To: <rpm-maint@lists.rpm.org>\n"
-"POT-Creation-Date: 2020-02-12 10:47+0200\n"
+"POT-Creation-Date: 2020-05-13 11:40+0300\n"
 "PO-Revision-Date: 2001-06-08 01:35+0000\n"
 "Last-Translator: Richard Allen <ra@hp.is>\n"
 "Language-Team: is <kde-isl@mmedia.is>\n"
-"Language: \n"
+"Language: is\n"
 "MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=ISO-8859-1\n"
+"Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8-bit\n"
 
-#: popt.c:47
+#: src/popt.c:37
 msgid "unknown errno"
-msgstr "��ekkt villun�mer"
+msgstr "óþekkt villunúmer"
 
-#: popt.c:1290
+#: src/popt.c:1196
 #, fuzzy, c-format
 msgid "option type (%u) not implemented in popt\n"
-msgstr "rofager�in (%d) er ekki studd � popt\n"
+msgstr "rofagerðin (%d) er ekki studd í popt\n"
 
-#: popt.c:1711
+#: src/popt.c:1607
 msgid "missing argument"
-msgstr "vantar vi�fang"
+msgstr "vantar viðfang"
 
-#: popt.c:1713
+#: src/popt.c:1609
 msgid "unknown option"
-msgstr "��ekktur rofi"
+msgstr "óþekktur rofi"
 
-#: popt.c:1715
+#: src/popt.c:1611
 msgid "mutually exclusive logical operations requested"
-msgstr "be�i� um rofa sem sl�kkva hvor � ��rum"
+msgstr "beðið um rofa sem slökkva hvor á öðrum"
 
-#: popt.c:1717
+#: src/popt.c:1613
 msgid "opt->arg should not be NULL"
-msgstr "opt->arg �tti ekki a� vera NULL"
+msgstr "opt->arg ætti ekki að vera NULL"
 
-#: popt.c:1719
+#: src/popt.c:1615
 msgid "aliases nested too deeply"
-msgstr "al�asar of fl�knir"
+msgstr "alíasar of flóknir"
 
-#: popt.c:1721
+#: src/popt.c:1617
 msgid "error in parameter quoting"
-msgstr "villa � vi�f�ngum (g�salappir og svo frv.)"
+msgstr "villa í viðföngum (gæsalappir og svo frv.)"
 
-#: popt.c:1723
+#: src/popt.c:1619
 msgid "invalid numeric value"
-msgstr "�gilt t�lulegt gildi"
+msgstr "ógilt tölulegt gildi"
 
-#: popt.c:1725
+#: src/popt.c:1621
 msgid "number too large or too small"
-msgstr "talan of st�r e�a sm�"
+msgstr "talan of stór eða smá"
 
-#: popt.c:1727
+#: src/popt.c:1623
 msgid "memory allocation failed"
-msgstr "ekki t�kst a� taka fr� minni"
+msgstr "ekki tókst að taka frá minni"
 
-#: popt.c:1729
+#: src/popt.c:1625
 msgid "config file failed sanity test"
 msgstr ""
 
-#: popt.c:1733
+#: src/popt.c:1629
 msgid "unknown error"
-msgstr "��ekkt villa"
+msgstr "óþekkt villa"
 
-#: popthelp.c:75 popthelp.c:86
+#: src/popthelp.c:64 src/popthelp.c:72
 msgid "Show this help message"
-msgstr "S�na �essa hj�lp"
+msgstr "Sýna þessa hjálp"
 
-#: popthelp.c:76 popthelp.c:87
+#: src/popthelp.c:65 src/popthelp.c:73
 msgid "Display brief usage message"
-msgstr "S�na stuttar notkunarlei�beiningar"
+msgstr "Sýna stuttar notkunarleiðbeiningar"
 
-#: popthelp.c:90
+#: src/popthelp.c:76
 msgid "Display option defaults in message"
-msgstr "S�na sj�lfgefin gildi rofa � skilabo�um"
+msgstr "Sýna sjálfgefin gildi rofa í skilaboðum"
 
-#: popthelp.c:92
+#: src/popthelp.c:78
 msgid "Terminate options"
 msgstr ""
 
-#: popthelp.c:191
+#: src/popthelp.c:170
 msgid "Help options:"
 msgstr ""
 
-#: popthelp.c:192
+#: src/popthelp.c:171
 msgid "Options implemented via popt alias/exec:"
 msgstr ""
 
-#: popthelp.c:200
+#: src/popthelp.c:179
 msgid "NONE"
 msgstr "ENGIN"
 
-#: popthelp.c:202
+#: src/popthelp.c:181
 msgid "VAL"
 msgstr "VAL"
 
-#: popthelp.c:206
+#: src/popthelp.c:185
 msgid "INT"
 msgstr "INT"
 
-#: popthelp.c:207
+#: src/popthelp.c:186
 msgid "SHORT"
 msgstr ""
 
-#: popthelp.c:208
+#: src/popthelp.c:187
 msgid "LONG"
 msgstr "LONG"
 
-#: popthelp.c:209
+#: src/popthelp.c:188
 #, fuzzy
 msgid "LONGLONG"
 msgstr "LONG"
 
-#: popthelp.c:210
+#: src/popthelp.c:189
 msgid "STRING"
 msgstr "STRING"
 
-#: popthelp.c:211
+#: src/popthelp.c:190
 msgid "FLOAT"
 msgstr "FLOAT"
 
-#: popthelp.c:212
+#: src/popthelp.c:191
 msgid "DOUBLE"
 msgstr "DOUBLE"
 
-#: popthelp.c:215
+#: src/popthelp.c:194
 msgid "ARG"
 msgstr "ARG"
 
-#: popthelp.c:649
+#: src/popthelp.c:608
 msgid "Usage:"
 msgstr "Notkun:"
 
-#: popthelp.c:672
+#: src/popthelp.c:630
 msgid "[OPTION...]"
 msgstr "[ROFI...]"
diff --git a/po/it.po b/po/it.po
index 94bb612..1d42059 100644
--- a/po/it.po
+++ b/po/it.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: popt-1.14\n"
 "Report-Msgid-Bugs-To: <rpm-maint@lists.rpm.org>\n"
-"POT-Creation-Date: 2020-02-12 10:47+0200\n"
+"POT-Creation-Date: 2020-05-13 11:40+0300\n"
 "PO-Revision-Date: 2008-11-28 15:32+0100\n"
 "Last-Translator: Vincenzo Campanella <vinz65@gmail.com>\n"
 "Language-Team: Italian <tp@lists.linux.it>\n"
@@ -18,127 +18,127 @@ msgstr ""
 "First-Translator: Sandro Bonazzola <sandro.bonazzola@gmail.com>\n"
 "X-Generator: KBabel 1.11.4\n"
 
-#: popt.c:47
+#: src/popt.c:37
 msgid "unknown errno"
 msgstr "errno sconosciuto"
 
-#: popt.c:1290
+#: src/popt.c:1196
 #, c-format
 msgid "option type (%u) not implemented in popt\n"
 msgstr "tipo di opzione (%u) non implementato in popt\n"
 
-#: popt.c:1711
+#: src/popt.c:1607
 msgid "missing argument"
 msgstr "argomento mancante"
 
-#: popt.c:1713
+#: src/popt.c:1609
 msgid "unknown option"
 msgstr "opzione sconosciuta"
 
-#: popt.c:1715
+#: src/popt.c:1611
 msgid "mutually exclusive logical operations requested"
 msgstr "richieste operazioni logiche reciprocamente esclusive"
 
-#: popt.c:1717
+#: src/popt.c:1613
 msgid "opt->arg should not be NULL"
 msgstr "opt->arg non dovrebbe essere NULL"
 
-#: popt.c:1719
+#: src/popt.c:1615
 msgid "aliases nested too deeply"
 msgstr "alias nidificati troppo in profondità"
 
-#: popt.c:1721
+#: src/popt.c:1617
 msgid "error in parameter quoting"
 msgstr "errore nel quoting del parametro"
 
-#: popt.c:1723
+#: src/popt.c:1619
 msgid "invalid numeric value"
 msgstr "valore numerico non valido"
 
-#: popt.c:1725
+#: src/popt.c:1621
 msgid "number too large or too small"
 msgstr "numero troppo grande o troppo piccolo"
 
-#: popt.c:1727
+#: src/popt.c:1623
 msgid "memory allocation failed"
 msgstr "allocazione di memoria fallita"
 
-#: popt.c:1729
+#: src/popt.c:1625
 msgid "config file failed sanity test"
 msgstr ""
 
-#: popt.c:1733
+#: src/popt.c:1629
 msgid "unknown error"
 msgstr "errore sconosciuto"
 
-#: popthelp.c:75 popthelp.c:86
+#: src/popthelp.c:64 src/popthelp.c:72
 msgid "Show this help message"
 msgstr "Mostra questo messaggio di aiuto"
 
-#: popthelp.c:76 popthelp.c:87
+#: src/popthelp.c:65 src/popthelp.c:73
 msgid "Display brief usage message"
 msgstr "Mostra un breve messaggio di utilizzo"
 
-#: popthelp.c:90
+#: src/popthelp.c:76
 msgid "Display option defaults in message"
 msgstr "Mostra le opzioni predefinite nel messaggio"
 
-#: popthelp.c:92
+#: src/popthelp.c:78
 msgid "Terminate options"
 msgstr "Opzioni di terminazione"
 
-#: popthelp.c:191
+#: src/popthelp.c:170
 msgid "Help options:"
 msgstr "Opzioni di aiuto:"
 
-#: popthelp.c:192
+#: src/popthelp.c:171
 msgid "Options implemented via popt alias/exec:"
 msgstr "Opzioni implementate tramite alias/exec di popt:"
 
-#: popthelp.c:200
+#: src/popthelp.c:179
 msgid "NONE"
 msgstr "NONE"
 
-#: popthelp.c:202
+#: src/popthelp.c:181
 msgid "VAL"
 msgstr "VAL"
 
-#: popthelp.c:206
+#: src/popthelp.c:185
 msgid "INT"
 msgstr "INT"
 
-#: popthelp.c:207
+#: src/popthelp.c:186
 msgid "SHORT"
 msgstr ""
 
-#: popthelp.c:208
+#: src/popthelp.c:187
 msgid "LONG"
 msgstr "LONG"
 
-#: popthelp.c:209
+#: src/popthelp.c:188
 msgid "LONGLONG"
 msgstr "LONGLONG"
 
-#: popthelp.c:210
+#: src/popthelp.c:189
 msgid "STRING"
 msgstr "STRING"
 
-#: popthelp.c:211
+#: src/popthelp.c:190
 msgid "FLOAT"
 msgstr "FLOAT"
 
-#: popthelp.c:212
+#: src/popthelp.c:191
 msgid "DOUBLE"
 msgstr "DOUBLE"
 
-#: popthelp.c:215
+#: src/popthelp.c:194
 msgid "ARG"
 msgstr "ARG"
 
-#: popthelp.c:649
+#: src/popthelp.c:608
 msgid "Usage:"
 msgstr "Uso:"
 
-#: popthelp.c:672
+#: src/popthelp.c:630
 msgid "[OPTION...]"
 msgstr "[OPZIONE...]"
diff --git a/po/ja.po b/po/ja.po
index 4441307..fb1733b 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.11\n"
 "Report-Msgid-Bugs-To: <rpm-maint@lists.rpm.org>\n"
-"POT-Creation-Date: 2020-02-12 10:47+0200\n"
+"POT-Creation-Date: 2020-05-13 11:40+0300\n"
 "PO-Revision-Date: 2003--8-25 19:00+0900\n"
 "Last-Translator: Yukihiro Nakai <ynakai@redhat.com>\n"
 "Language-Team: Japanese <ja@li.org>\n"
@@ -15,129 +15,129 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: popt.c:47
+#: src/popt.c:37
 msgid "unknown errno"
 msgstr "不明なエラー番号"
 
-#: popt.c:1290
+#: src/popt.c:1196
 #, fuzzy, c-format
 msgid "option type (%u) not implemented in popt\n"
 msgstr "オプションタイプ (%d) はpoptには実装されていません\n"
 
-#: popt.c:1711
+#: src/popt.c:1607
 msgid "missing argument"
 msgstr "引数がありません"
 
-#: popt.c:1713
+#: src/popt.c:1609
 msgid "unknown option"
 msgstr "不明なオプション"
 
-#: popt.c:1715
+#: src/popt.c:1611
 msgid "mutually exclusive logical operations requested"
 msgstr "排他的な悪ぺーレーションが必要です"
 
-#: popt.c:1717
+#: src/popt.c:1613
 msgid "opt->arg should not be NULL"
 msgstr "opt->argはNULLではいけません"
 
-#: popt.c:1719
+#: src/popt.c:1615
 msgid "aliases nested too deeply"
 msgstr "エイリアスのネストが深すぎます"
 
-#: popt.c:1721
+#: src/popt.c:1617
 msgid "error in parameter quoting"
 msgstr "パラメータのクオート付けでエラー"
 
-#: popt.c:1723
+#: src/popt.c:1619
 msgid "invalid numeric value"
 msgstr "不正な数値"
 
-#: popt.c:1725
+#: src/popt.c:1621
 msgid "number too large or too small"
 msgstr "数値が大きすぎるか小さすぎます"
 
-#: popt.c:1727
+#: src/popt.c:1623
 msgid "memory allocation failed"
 msgstr "メモリ確保に失敗しました"
 
-#: popt.c:1729
+#: src/popt.c:1625
 msgid "config file failed sanity test"
 msgstr ""
 
-#: popt.c:1733
+#: src/popt.c:1629
 msgid "unknown error"
 msgstr "不明なエラー"
 
-#: popthelp.c:75 popthelp.c:86
+#: src/popthelp.c:64 src/popthelp.c:72
 msgid "Show this help message"
 msgstr "このヘルプメッセージを表示します"
 
-#: popthelp.c:76 popthelp.c:87
+#: src/popthelp.c:65 src/popthelp.c:73
 msgid "Display brief usage message"
 msgstr "使い方の概要を表示します"
 
-#: popthelp.c:90
+#: src/popthelp.c:76
 msgid "Display option defaults in message"
 msgstr "オプションのデフォルト値をメッセージに表示します"
 
-#: popthelp.c:92
+#: src/popthelp.c:78
 #, fuzzy
 msgid "Terminate options"
 msgstr "ヘルプオプション:"
 
-#: popthelp.c:191
+#: src/popthelp.c:170
 msgid "Help options:"
 msgstr "ヘルプオプション:"
 
-#: popthelp.c:192
+#: src/popthelp.c:171
 msgid "Options implemented via popt alias/exec:"
 msgstr "poptのalias/execで実装されているオプション:"
 
-#: popthelp.c:200
+#: src/popthelp.c:179
 msgid "NONE"
 msgstr "なし"
 
-#: popthelp.c:202
+#: src/popthelp.c:181
 msgid "VAL"
 msgstr "値"
 
-#: popthelp.c:206
+#: src/popthelp.c:185
 msgid "INT"
 msgstr "INT"
 
-#: popthelp.c:207
+#: src/popthelp.c:186
 msgid "SHORT"
 msgstr ""
 
-#: popthelp.c:208
+#: src/popthelp.c:187
 msgid "LONG"
 msgstr "LONG"
 
-#: popthelp.c:209
+#: src/popthelp.c:188
 #, fuzzy
 msgid "LONGLONG"
 msgstr "LONG"
 
-#: popthelp.c:210
+#: src/popthelp.c:189
 msgid "STRING"
 msgstr "文字列"
 
-#: popthelp.c:211
+#: src/popthelp.c:190
 msgid "FLOAT"
 msgstr "FLOAT"
 
-#: popthelp.c:212
+#: src/popthelp.c:191
 msgid "DOUBLE"
 msgstr "DOUBLE"
 
-#: popthelp.c:215
+#: src/popthelp.c:194
 msgid "ARG"
 msgstr "ARG"
 
-#: popthelp.c:649
+#: src/popthelp.c:608
 msgid "Usage:"
 msgstr "使い方:"
 
-#: popthelp.c:672
+#: src/popthelp.c:630
 msgid "[OPTION...]"
 msgstr "[オプション...]"
diff --git a/po/ko.po b/po/ko.po
index 356cb1b..6c8b454 100644
--- a/po/ko.po
+++ b/po/ko.po
@@ -2,137 +2,137 @@ msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.11\n"
 "Report-Msgid-Bugs-To: <rpm-maint@lists.rpm.org>\n"
-"POT-Creation-Date: 2020-02-12 10:47+0200\n"
+"POT-Creation-Date: 2020-05-13 11:40+0300\n"
 "PO-Revision-Date: 2001-09-06 20:06+0900\n"
 "Last-Translator: Jong-Hoon Ryu <redhat4u@netian.com>\n"
 "Language-Team: GNU Translation project <ko@li.org>\n"
-"Language: \n"
+"Language: ko\n"
 "MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=EUC-KR\n"
+"Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8-bit\n"
 
-#: popt.c:47
+#: src/popt.c:37
 msgid "unknown errno"
-msgstr "�� �� ���� �����ڵ�(errno) �Դϴ�"
+msgstr "알 수 없는 오류코드(errno) 입니다"
 
-#: popt.c:1290
+#: src/popt.c:1196
 #, fuzzy, c-format
 msgid "option type (%u) not implemented in popt\n"
-msgstr "�ɼ� ���� (%d)�� popt���� ����� �� �����ϴ�\n"
+msgstr "옵션 유형 (%d)은 popt에서 사용할 수 없습니다\n"
 
-#: popt.c:1711
+#: src/popt.c:1607
 msgid "missing argument"
-msgstr "�μ��� �������� �ʾҽ��ϴ�"
+msgstr "인수가 지정되지 않았습니다"
 
-#: popt.c:1713
+#: src/popt.c:1609
 msgid "unknown option"
-msgstr "�� �� ���� �ɼ��Դϴ�"
+msgstr "알 수 없는 옵션입니다"
 
-#: popt.c:1715
+#: src/popt.c:1611
 msgid "mutually exclusive logical operations requested"
-msgstr "���ʿ� ��Ÿ�� ���� ������ �����Ǿ����ϴ�"
+msgstr "양쪽에 배타적 논리 연산이 지정되었습니다"
 
-#: popt.c:1717
+#: src/popt.c:1613
 msgid "opt->arg should not be NULL"
-msgstr "�ɼ�->�μ��� NULL�� �Ǿ�� �ȵ˴ϴ�"
+msgstr "옵션->인수가 NULL이 되어서는 안됩니다"
 
-#: popt.c:1719
+#: src/popt.c:1615
 msgid "aliases nested too deeply"
-msgstr "��Ī(alias)�� �����ϰ� �����Ǿ����ϴ�"
+msgstr "별칭(alias)이 복잡하게 설정되었습니다"
 
-#: popt.c:1721
+#: src/popt.c:1617
 msgid "error in parameter quoting"
-msgstr "�Ű������� ������ �ֽ��ϴ�"
+msgstr "매개변수에 오류가 있습니다"
 
-#: popt.c:1723
+#: src/popt.c:1619
 msgid "invalid numeric value"
-msgstr "�߸��� ��ġ ���Դϴ�"
+msgstr "잘못된 수치 값입니다"
 
-#: popt.c:1725
+#: src/popt.c:1621
 msgid "number too large or too small"
-msgstr "���ڰ� �ʹ� ũ�ų� �ʹ� �����ϴ�"
+msgstr "숫자가 너무 크거나 너무 적습니다"
 
-#: popt.c:1727
+#: src/popt.c:1623
 msgid "memory allocation failed"
-msgstr "�޸� �Ҵ翡 �����߽��ϴ�"
+msgstr "메모리 할당에 실패했습니다"
 
-#: popt.c:1729
+#: src/popt.c:1625
 msgid "config file failed sanity test"
 msgstr ""
 
-#: popt.c:1733
+#: src/popt.c:1629
 msgid "unknown error"
-msgstr "�� �� ���� �����Դϴ�"
+msgstr "알 수 없는 오류입니다"
 
-#: popthelp.c:75 popthelp.c:86
+#: src/popthelp.c:64 src/popthelp.c:72
 msgid "Show this help message"
-msgstr "�� ������ �����ݴϴ�"
+msgstr "이 도움말을 보여줍니다"
 
-#: popthelp.c:76 popthelp.c:87
+#: src/popthelp.c:65 src/popthelp.c:73
 msgid "Display brief usage message"
-msgstr "������ ������ �����ݴϴ�"
+msgstr "간단한 사용법을 보여줍니다"
 
-#: popthelp.c:90
+#: src/popthelp.c:76
 msgid "Display option defaults in message"
-msgstr "�⺻���� �ɼ��� �����ݴϴ�"
+msgstr "기본적인 옵션을 보여줍니다"
 
-#: popthelp.c:92
+#: src/popthelp.c:78
 msgid "Terminate options"
 msgstr ""
 
-#: popthelp.c:191
+#: src/popthelp.c:170
 msgid "Help options:"
 msgstr ""
 
-#: popthelp.c:192
+#: src/popthelp.c:171
 msgid "Options implemented via popt alias/exec:"
 msgstr ""
 
-#: popthelp.c:200
+#: src/popthelp.c:179
 msgid "NONE"
-msgstr "����(NONE)"
+msgstr "없음(NONE)"
 
-#: popthelp.c:202
+#: src/popthelp.c:181
 msgid "VAL"
-msgstr "��(VAL)"
+msgstr "값(VAL)"
 
-#: popthelp.c:206
+#: src/popthelp.c:185
 msgid "INT"
-msgstr "����(INT)"
+msgstr "정수(INT)"
 
-#: popthelp.c:207
+#: src/popthelp.c:186
 msgid "SHORT"
 msgstr ""
 
-#: popthelp.c:208
+#: src/popthelp.c:187
 msgid "LONG"
-msgstr "����(LONG)"
+msgstr "정수(LONG)"
 
-#: popthelp.c:209
+#: src/popthelp.c:188
 #, fuzzy
 msgid "LONGLONG"
-msgstr "����(LONG)"
+msgstr "정수(LONG)"
 
-#: popthelp.c:210
+#: src/popthelp.c:189
 msgid "STRING"
-msgstr "���ڿ�(STRING)"
+msgstr "문자열(STRING)"
 
-#: popthelp.c:211
+#: src/popthelp.c:190
 msgid "FLOAT"
-msgstr "�Ҽ�(FLOAT)"
+msgstr "소수(FLOAT)"
 
-#: popthelp.c:212
+#: src/popthelp.c:191
 msgid "DOUBLE"
-msgstr "�Ҽ�(DOUBLE)"
+msgstr "소수(DOUBLE)"
 
-#: popthelp.c:215
+#: src/popthelp.c:194
 msgid "ARG"
-msgstr "�μ�(ARG)"
+msgstr "인수(ARG)"
 
-#: popthelp.c:649
+#: src/popthelp.c:608
 msgid "Usage:"
-msgstr "����:"
+msgstr "사용법:"
 
-#: popthelp.c:672
+#: src/popthelp.c:630
 msgid "[OPTION...]"
-msgstr "[�ɼ�...]"
+msgstr "[옵션...]"
diff --git a/po/lv.po b/po/lv.po
index e78eab0..3804983 100644
--- a/po/lv.po
+++ b/po/lv.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: popt-1.14\n"
 "Report-Msgid-Bugs-To: <rpm-maint@lists.rpm.org>\n"
-"POT-Creation-Date: 2020-02-12 10:47+0200\n"
+"POT-Creation-Date: 2020-05-13 11:40+0300\n"
 "PO-Revision-Date: 2009-04-12 16:34+0300\n"
 "Last-Translator: Rihards Prieditis <RPrieditis@inbox.lv>\n"
 "Language-Team: Latvian <translation-team-lv@lists.sourceforge.net>\n"
@@ -20,127 +20,127 @@ msgstr ""
 "Plural-Forms:  nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n != 0 ? 1 : "
 "2);\n"
 
-#: popt.c:47
+#: src/popt.c:37
 msgid "unknown errno"
 msgstr "nezināms kļūdas numurs"
 
-#: popt.c:1290
+#: src/popt.c:1196
 #, c-format
 msgid "option type (%u) not implemented in popt\n"
 msgstr "iespējas tips (%u) nav ieviests popt\n"
 
-#: popt.c:1711
+#: src/popt.c:1607
 msgid "missing argument"
 msgstr "trūkst arguments"
 
-#: popt.c:1713
+#: src/popt.c:1609
 msgid "unknown option"
 msgstr "nezināma iespēja"
 
-#: popt.c:1715
+#: src/popt.c:1611
 msgid "mutually exclusive logical operations requested"
 msgstr "pieprasītas savstarpējie izslēdzošas loģiskās operācijas"
 
-#: popt.c:1717
+#: src/popt.c:1613
 msgid "opt->arg should not be NULL"
 msgstr "opcija->arguments nevar būt NULL"
 
-#: popt.c:1719
+#: src/popt.c:1615
 msgid "aliases nested too deeply"
 msgstr "aizstājvārdi iegulti pārāk dziļi"
 
-#: popt.c:1721
+#: src/popt.c:1617
 msgid "error in parameter quoting"
 msgstr "kļuda parametru citēšanā"
 
-#: popt.c:1723
+#: src/popt.c:1619
 msgid "invalid numeric value"
 msgstr "nederīga skaitļa vērtība"
 
-#: popt.c:1725
+#: src/popt.c:1621
 msgid "number too large or too small"
 msgstr "skaitlis pārāk liels, vai pārāk mazs"
 
-#: popt.c:1727
+#: src/popt.c:1623
 msgid "memory allocation failed"
 msgstr "atmiņas iedalīšana neizdevās"
 
-#: popt.c:1729
+#: src/popt.c:1625
 msgid "config file failed sanity test"
 msgstr ""
 
-#: popt.c:1733
+#: src/popt.c:1629
 msgid "unknown error"
 msgstr "nezināma kļūda"
 
-#: popthelp.c:75 popthelp.c:86
+#: src/popthelp.c:64 src/popthelp.c:72
 msgid "Show this help message"
 msgstr "Rādīt šo palīdzības ziņu"
 
-#: popthelp.c:76 popthelp.c:87
+#: src/popthelp.c:65 src/popthelp.c:73
 msgid "Display brief usage message"
 msgstr "Attēlot īsu izmantošanas ziņu"
 
-#: popthelp.c:90
+#: src/popthelp.c:76
 msgid "Display option defaults in message"
 msgstr "Attēlot noklusētās iespējas ziņā"
 
-#: popthelp.c:92
+#: src/popthelp.c:78
 msgid "Terminate options"
 msgstr "Pārtraukt iespējas"
 
-#: popthelp.c:191
+#: src/popthelp.c:170
 msgid "Help options:"
 msgstr "Palīdzības iespējas:"
 
-#: popthelp.c:192
+#: src/popthelp.c:171
 msgid "Options implemented via popt alias/exec:"
 msgstr "Iespējas ieviestas caur popt aizstājvārda/izpildāmais:"
 
-#: popthelp.c:200
+#: src/popthelp.c:179
 msgid "NONE"
 msgstr "NEKAS"
 
-#: popthelp.c:202
+#: src/popthelp.c:181
 msgid "VAL"
 msgstr "VĒRTĪBA"
 
-#: popthelp.c:206
+#: src/popthelp.c:185
 msgid "INT"
 msgstr "INT"
 
-#: popthelp.c:207
+#: src/popthelp.c:186
 msgid "SHORT"
 msgstr ""
 
-#: popthelp.c:208
+#: src/popthelp.c:187
 msgid "LONG"
 msgstr "LONG"
 
-#: popthelp.c:209
+#: src/popthelp.c:188
 msgid "LONGLONG"
 msgstr "LONGLONG"
 
-#: popthelp.c:210
+#: src/popthelp.c:189
 msgid "STRING"
 msgstr "VIRKNE"
 
-#: popthelp.c:211
+#: src/popthelp.c:190
 msgid "FLOAT"
 msgstr "FLOAT"
 
-#: popthelp.c:212
+#: src/popthelp.c:191
 msgid "DOUBLE"
 msgstr "DOUBLE"
 
-#: popthelp.c:215
+#: src/popthelp.c:194
 msgid "ARG"
 msgstr "ARGUMENTS"
 
-#: popthelp.c:649
+#: src/popthelp.c:608
 msgid "Usage:"
 msgstr "Lietošana:"
 
-#: popthelp.c:672
+#: src/popthelp.c:630
 msgid "[OPTION...]"
 msgstr "[IESPĒJAS..]"
diff --git a/po/nb.po b/po/nb.po
index d9f134a..8bc1389 100644
--- a/po/nb.po
+++ b/po/nb.po
@@ -2,137 +2,137 @@ msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.11\n"
 "Report-Msgid-Bugs-To: <rpm-maint@lists.rpm.org>\n"
-"POT-Creation-Date: 2020-02-12 10:47+0200\n"
+"POT-Creation-Date: 2020-05-13 11:40+0300\n"
 "PO-Revision-Date: 2001-06-27 11:05+0200\n"
 "Last-Translator: Kjartan Maraas <kmaraas@online.no>\n"
 "Language-Team: Norwegian <no@li.org>\n"
-"Language: no\n"
+"Language: nb\n"
 "MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=iso-8859-1\n"
+"Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8-bit\n"
 
-#: popt.c:47
+#: src/popt.c:37
 msgid "unknown errno"
 msgstr "ukjent errno"
 
-#: popt.c:1290
+#: src/popt.c:1196
 #, fuzzy, c-format
 msgid "option type (%u) not implemented in popt\n"
 msgstr "flaggtype (%d) ikke implementert i popt\n"
 
-#: popt.c:1711
+#: src/popt.c:1607
 msgid "missing argument"
 msgstr "manglende argument"
 
-#: popt.c:1713
+#: src/popt.c:1609
 msgid "unknown option"
 msgstr "ukjent flagg"
 
-#: popt.c:1715
+#: src/popt.c:1611
 msgid "mutually exclusive logical operations requested"
 msgstr "gjensidig eksluderende logiske operasjoner forespurt"
 
-#: popt.c:1717
+#: src/popt.c:1613
 msgid "opt->arg should not be NULL"
-msgstr "opt->arg m� ikke v�re NULL"
+msgstr "opt->arg må ikke være NULL"
 
-#: popt.c:1719
+#: src/popt.c:1615
 msgid "aliases nested too deeply"
-msgstr "aliaser med for dype l�kker"
+msgstr "aliaser med for dype løkker"
 
-#: popt.c:1721
+#: src/popt.c:1617
 msgid "error in parameter quoting"
 msgstr "feil i parametersitering"
 
-#: popt.c:1723
+#: src/popt.c:1619
 msgid "invalid numeric value"
 msgstr "ugyldig numerisk verdi"
 
-#: popt.c:1725
+#: src/popt.c:1621
 msgid "number too large or too small"
 msgstr "tallet er for stort eller lite"
 
-#: popt.c:1727
+#: src/popt.c:1623
 msgid "memory allocation failed"
 msgstr "minneallokering feilet"
 
-#: popt.c:1729
+#: src/popt.c:1625
 msgid "config file failed sanity test"
 msgstr ""
 
-#: popt.c:1733
+#: src/popt.c:1629
 msgid "unknown error"
 msgstr "ukjent feil"
 
-#: popthelp.c:75 popthelp.c:86
+#: src/popthelp.c:64 src/popthelp.c:72
 msgid "Show this help message"
 msgstr "Vis denne hjelpmeldingen"
 
-#: popthelp.c:76 popthelp.c:87
+#: src/popthelp.c:65 src/popthelp.c:73
 msgid "Display brief usage message"
 msgstr "Vis kort bruksmelding"
 
-#: popthelp.c:90
+#: src/popthelp.c:76
 msgid "Display option defaults in message"
 msgstr "Vis forvalgte flagg i melding"
 
-#: popthelp.c:92
+#: src/popthelp.c:78
 msgid "Terminate options"
 msgstr ""
 
-#: popthelp.c:191
+#: src/popthelp.c:170
 msgid "Help options:"
 msgstr ""
 
-#: popthelp.c:192
+#: src/popthelp.c:171
 msgid "Options implemented via popt alias/exec:"
 msgstr ""
 
-#: popthelp.c:200
+#: src/popthelp.c:179
 msgid "NONE"
 msgstr "INGEN"
 
-#: popthelp.c:202
+#: src/popthelp.c:181
 msgid "VAL"
 msgstr "VERDI"
 
-#: popthelp.c:206
+#: src/popthelp.c:185
 msgid "INT"
 msgstr "HELTALL"
 
-#: popthelp.c:207
+#: src/popthelp.c:186
 msgid "SHORT"
 msgstr ""
 
-#: popthelp.c:208
+#: src/popthelp.c:187
 msgid "LONG"
 msgstr "LONG"
 
-#: popthelp.c:209
+#: src/popthelp.c:188
 #, fuzzy
 msgid "LONGLONG"
 msgstr "LONG"
 
-#: popthelp.c:210
+#: src/popthelp.c:189
 msgid "STRING"
 msgstr "STRENG"
 
-#: popthelp.c:211
+#: src/popthelp.c:190
 msgid "FLOAT"
 msgstr "FLYTTALL"
 
-#: popthelp.c:212
+#: src/popthelp.c:191
 msgid "DOUBLE"
 msgstr "DOUBLE"
 
-#: popthelp.c:215
+#: src/popthelp.c:194
 msgid "ARG"
 msgstr "ARG"
 
-#: popthelp.c:649
+#: src/popthelp.c:608
 msgid "Usage:"
 msgstr "Bruk:"
 
-#: popthelp.c:672
+#: src/popthelp.c:630
 msgid "[OPTION...]"
 msgstr "[FLAGG...]"
diff --git a/po/nl.po b/po/nl.po
index 7b21b2d..ef44527 100644
--- a/po/nl.po
+++ b/po/nl.po
@@ -6,140 +6,140 @@ msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.14\n"
 "Report-Msgid-Bugs-To: <rpm-maint@lists.rpm.org>\n"
-"POT-Creation-Date: 2020-02-12 10:47+0200\n"
+"POT-Creation-Date: 2020-05-13 11:40+0300\n"
 "PO-Revision-Date: 2008-02-20 19:26+0100\n"
 "Last-Translator: Tim Van Holder <tim.van.holder@telenet.be>\n"
 "Language-Team: Dutch <vertaling@vrijschrift.org>\n"
 "Language: nl\n"
 "MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=utf-8\n"
+"Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: popt.c:47
+#: src/popt.c:37
 msgid "unknown errno"
 msgstr "onbekend foutnummer (errno)"
 
-#: popt.c:1290
+#: src/popt.c:1196
 #, c-format
 msgid "option type (%u) not implemented in popt\n"
 msgstr "dit optietype (%u) is niet geïmplementeerd in popt\n"
 
-#: popt.c:1711
+#: src/popt.c:1607
 msgid "missing argument"
 msgstr "ontbrekend argument"
 
-#: popt.c:1713
+#: src/popt.c:1609
 msgid "unknown option"
 msgstr "onbekende optie"
 
-#: popt.c:1715
+#: src/popt.c:1611
 msgid "mutually exclusive logical operations requested"
 msgstr "elkaar uitsluitende logische operatoren werden gevraagd"
 
-#: popt.c:1717
+#: src/popt.c:1613
 msgid "opt->arg should not be NULL"
 msgstr "opt->arg zou niet NULL mogen zijn"
 
-#: popt.c:1719
+#: src/popt.c:1615
 msgid "aliases nested too deeply"
 msgstr "aliassen zijn te diep genest"
 
 # of toch beter "quoting" behouden?
-#: popt.c:1721
+#: src/popt.c:1617
 msgid "error in parameter quoting"
 msgstr "fout in de aanhaling van parameters"
 
-#: popt.c:1723
+#: src/popt.c:1619
 msgid "invalid numeric value"
 msgstr "ongeldige numerieke waarde"
 
-#: popt.c:1725
+#: src/popt.c:1621
 msgid "number too large or too small"
 msgstr "getal is te klein of te groot"
 
-#: popt.c:1727
+#: src/popt.c:1623
 msgid "memory allocation failed"
 msgstr "reserveren van geheugen is mislukt"
 
-#: popt.c:1729
+#: src/popt.c:1625
 msgid "config file failed sanity test"
 msgstr ""
 
-#: popt.c:1733
+#: src/popt.c:1629
 msgid "unknown error"
 msgstr "onbekende fout"
 
-#: popthelp.c:75 popthelp.c:86
+#: src/popthelp.c:64 src/popthelp.c:72
 msgid "Show this help message"
 msgstr "Deze hulptekst tonen"
 
-#: popthelp.c:76 popthelp.c:87
+#: src/popthelp.c:65 src/popthelp.c:73
 msgid "Display brief usage message"
 msgstr "Een korte gebruikssamenvatting tonen"
 
-#: popthelp.c:90
+#: src/popthelp.c:76
 msgid "Display option defaults in message"
 msgstr "De standaardwaarden van opties tonen in de tekst"
 
-#: popthelp.c:92
+#: src/popthelp.c:78
 msgid "Terminate options"
 msgstr "Opties beëindigen"
 
 # of "Help-opties:"?
-#: popthelp.c:191
+#: src/popthelp.c:170
 msgid "Help options:"
 msgstr "Hulp-opties:"
 
-#: popthelp.c:192
+#: src/popthelp.c:171
 msgid "Options implemented via popt alias/exec:"
 msgstr "Opties geïmplementeerd d.m.v. popt alias/exec:"
 
-#: popthelp.c:200
+#: src/popthelp.c:179
 msgid "NONE"
 msgstr "GEEN"
 
-#: popthelp.c:202
+#: src/popthelp.c:181
 msgid "VAL"
 msgstr "WAARDE"
 
-#: popthelp.c:206
+#: src/popthelp.c:185
 msgid "INT"
 msgstr "INT"
 
-#: popthelp.c:207
+#: src/popthelp.c:186
 msgid "SHORT"
 msgstr ""
 
-#: popthelp.c:208
+#: src/popthelp.c:187
 msgid "LONG"
 msgstr "LONG"
 
-#: popthelp.c:209
+#: src/popthelp.c:188
 msgid "LONGLONG"
 msgstr "LONGLONG"
 
 # TEKENREEKS lijkt me niet gepast; dus ofwel STRING behouden, ofwel TEKST
-#: popthelp.c:210
+#: src/popthelp.c:189
 msgid "STRING"
 msgstr "TEKST"
 
-#: popthelp.c:211
+#: src/popthelp.c:190
 msgid "FLOAT"
 msgstr "FLOAT"
 
-#: popthelp.c:212
+#: src/popthelp.c:191
 msgid "DOUBLE"
 msgstr "DOUBLE"
 
 # of hier ARGUMENT van maken?
-#: popthelp.c:215
+#: src/popthelp.c:194
 msgid "ARG"
 msgstr "ARG"
 
-#: popthelp.c:649
+#: src/popthelp.c:608
 msgid "Usage:"
 msgstr "Gebruik:"
 
-#: popthelp.c:672
+#: src/popthelp.c:630
 msgid "[OPTION...]"
 msgstr "[OPTIE...]"
diff --git a/po/pl.po b/po/pl.po
index fd3cff4..6fe894c 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -6,136 +6,136 @@ msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.14\n"
 "Report-Msgid-Bugs-To: <rpm-maint@lists.rpm.org>\n"
-"POT-Creation-Date: 2020-02-12 10:47+0200\n"
+"POT-Creation-Date: 2020-05-13 11:40+0300\n"
 "PO-Revision-Date: 2008-02-18 00:30+0100\n"
 "Last-Translator: Jakub Bogusz <qboosh@pld-linux.org>\n"
 "Language-Team: Polish <translation-team-pl@lists.sourceforge.net>\n"
 "Language: pl\n"
 "MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=iso-8859-2\n"
+"Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: popt.c:47
+#: src/popt.c:37
 msgid "unknown errno"
 msgstr "nieznane errno"
 
-#: popt.c:1290
+#: src/popt.c:1196
 #, c-format
 msgid "option type (%u) not implemented in popt\n"
 msgstr "typ opcji (%u) nie zaimplementowany w popt\n"
 
-#: popt.c:1711
+#: src/popt.c:1607
 msgid "missing argument"
 msgstr "brak parametru"
 
-#: popt.c:1713
+#: src/popt.c:1609
 msgid "unknown option"
 msgstr "nieznana opcja"
 
-#: popt.c:1715
+#: src/popt.c:1611
 msgid "mutually exclusive logical operations requested"
-msgstr "��danie wykluczaj�cych si� operacji"
+msgstr "żądanie wykluczających się operacji"
 
-#: popt.c:1717
+#: src/popt.c:1613
 msgid "opt->arg should not be NULL"
-msgstr "opt->arg nie mo�e by� NULL"
+msgstr "opt->arg nie może być NULL"
 
-#: popt.c:1719
+#: src/popt.c:1615
 msgid "aliases nested too deeply"
-msgstr "zbyt du�e zag��bienie alias�w"
+msgstr "zbyt duże zagłębienie aliasów"
 
-#: popt.c:1721
+#: src/popt.c:1617
 msgid "error in parameter quoting"
-msgstr "b��d w cytowaniu parametru"
+msgstr "błąd w cytowaniu parametru"
 
-#: popt.c:1723
+#: src/popt.c:1619
 msgid "invalid numeric value"
-msgstr "b��dna warto�� liczbowa"
+msgstr "błędna wartość liczbowa"
 
-#: popt.c:1725
+#: src/popt.c:1621
 msgid "number too large or too small"
-msgstr "liczba zbyt du�a lub zbyt ma�a"
+msgstr "liczba zbyt duża lub zbyt mała"
 
-#: popt.c:1727
+#: src/popt.c:1623
 msgid "memory allocation failed"
-msgstr "b��d alokacji pami�ci"
+msgstr "błąd alokacji pamięci"
 
-#: popt.c:1729
+#: src/popt.c:1625
 msgid "config file failed sanity test"
 msgstr ""
 
-#: popt.c:1733
+#: src/popt.c:1629
 msgid "unknown error"
-msgstr "nieznany b��d"
+msgstr "nieznany błąd"
 
-#: popthelp.c:75 popthelp.c:86
+#: src/popthelp.c:64 src/popthelp.c:72
 msgid "Show this help message"
-msgstr "Poka� t� pomoc"
+msgstr "Pokaż tę pomoc"
 
-#: popthelp.c:76 popthelp.c:87
+#: src/popthelp.c:65 src/popthelp.c:73
 msgid "Display brief usage message"
-msgstr "Wy�wietl skr�cony spos�b u�ycia"
+msgstr "Wyświetl skrócony sposób użycia"
 
-#: popthelp.c:90
+#: src/popthelp.c:76
 msgid "Display option defaults in message"
-msgstr "Wy�wietl domy�lne opcje w opisie"
+msgstr "Wyświetl domyślne opcje w opisie"
 
-#: popthelp.c:92
+#: src/popthelp.c:78
 msgid "Terminate options"
-msgstr "Opcje zako�czenia"
+msgstr "Opcje zakończenia"
 
-#: popthelp.c:191
+#: src/popthelp.c:170
 msgid "Help options:"
 msgstr "Opcje pomocy:"
 
-#: popthelp.c:192
+#: src/popthelp.c:171
 msgid "Options implemented via popt alias/exec:"
 msgstr "Opcje zaimplementowane poprzez popt alias/exec:"
 
-#: popthelp.c:200
+#: src/popthelp.c:179
 msgid "NONE"
 msgstr "BRAK"
 
-#: popthelp.c:202
+#: src/popthelp.c:181
 msgid "VAL"
 msgstr "WART"
 
-#: popthelp.c:206
+#: src/popthelp.c:185
 msgid "INT"
 msgstr "INT"
 
-#: popthelp.c:207
+#: src/popthelp.c:186
 msgid "SHORT"
 msgstr ""
 
-#: popthelp.c:208
+#: src/popthelp.c:187
 msgid "LONG"
 msgstr "LONG"
 
-#: popthelp.c:209
+#: src/popthelp.c:188
 msgid "LONGLONG"
 msgstr "LONGLONG"
 
-#: popthelp.c:210
+#: src/popthelp.c:189
 msgid "STRING"
-msgstr "�A�CUCH"
+msgstr "ŁAŃCUCH"
 
-#: popthelp.c:211
+#: src/popthelp.c:190
 msgid "FLOAT"
 msgstr "FLOAT"
 
-#: popthelp.c:212
+#: src/popthelp.c:191
 msgid "DOUBLE"
 msgstr "DOUBLE"
 
-#: popthelp.c:215
+#: src/popthelp.c:194
 msgid "ARG"
 msgstr "PARAM"
 
-#: popthelp.c:649
+#: src/popthelp.c:608
 msgid "Usage:"
-msgstr "Sk�adnia:"
+msgstr "Składnia:"
 
-#: popthelp.c:672
+#: src/popthelp.c:630
 msgid "[OPTION...]"
 msgstr "[OPCJA...]"
diff --git a/po/popt.pot b/po/popt.pot
index 28b56fe..6bc05e5 100644
--- a/po/popt.pot
+++ b/po/popt.pot
@@ -5,9 +5,9 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
+"Project-Id-Version: popt 1.16\n"
 "Report-Msgid-Bugs-To: <rpm-maint@lists.rpm.org>\n"
-"POT-Creation-Date: 2020-02-12 10:47+0200\n"
+"POT-Creation-Date: 2020-05-13 11:40+0300\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -16,127 +16,127 @@ msgstr ""
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: popt.c:47
+#: src/popt.c:37
 msgid "unknown errno"
 msgstr ""
 
-#: popt.c:1290
+#: src/popt.c:1196
 #, c-format
 msgid "option type (%u) not implemented in popt\n"
 msgstr ""
 
-#: popt.c:1711
+#: src/popt.c:1607
 msgid "missing argument"
 msgstr ""
 
-#: popt.c:1713
+#: src/popt.c:1609
 msgid "unknown option"
 msgstr ""
 
-#: popt.c:1715
+#: src/popt.c:1611
 msgid "mutually exclusive logical operations requested"
 msgstr ""
 
-#: popt.c:1717
+#: src/popt.c:1613
 msgid "opt->arg should not be NULL"
 msgstr ""
 
-#: popt.c:1719
+#: src/popt.c:1615
 msgid "aliases nested too deeply"
 msgstr ""
 
-#: popt.c:1721
+#: src/popt.c:1617
 msgid "error in parameter quoting"
 msgstr ""
 
-#: popt.c:1723
+#: src/popt.c:1619
 msgid "invalid numeric value"
 msgstr ""
 
-#: popt.c:1725
+#: src/popt.c:1621
 msgid "number too large or too small"
 msgstr ""
 
-#: popt.c:1727
+#: src/popt.c:1623
 msgid "memory allocation failed"
 msgstr ""
 
-#: popt.c:1729
+#: src/popt.c:1625
 msgid "config file failed sanity test"
 msgstr ""
 
-#: popt.c:1733
+#: src/popt.c:1629
 msgid "unknown error"
 msgstr ""
 
-#: popthelp.c:75 popthelp.c:86
+#: src/popthelp.c:64 src/popthelp.c:72
 msgid "Show this help message"
 msgstr ""
 
-#: popthelp.c:76 popthelp.c:87
+#: src/popthelp.c:65 src/popthelp.c:73
 msgid "Display brief usage message"
 msgstr ""
 
-#: popthelp.c:90
+#: src/popthelp.c:76
 msgid "Display option defaults in message"
 msgstr ""
 
-#: popthelp.c:92
+#: src/popthelp.c:78
 msgid "Terminate options"
 msgstr ""
 
-#: popthelp.c:191
+#: src/popthelp.c:170
 msgid "Help options:"
 msgstr ""
 
-#: popthelp.c:192
+#: src/popthelp.c:171
 msgid "Options implemented via popt alias/exec:"
 msgstr ""
 
-#: popthelp.c:200
+#: src/popthelp.c:179
 msgid "NONE"
 msgstr ""
 
-#: popthelp.c:202
+#: src/popthelp.c:181
 msgid "VAL"
 msgstr ""
 
-#: popthelp.c:206
+#: src/popthelp.c:185
 msgid "INT"
 msgstr ""
 
-#: popthelp.c:207
+#: src/popthelp.c:186
 msgid "SHORT"
 msgstr ""
 
-#: popthelp.c:208
+#: src/popthelp.c:187
 msgid "LONG"
 msgstr ""
 
-#: popthelp.c:209
+#: src/popthelp.c:188
 msgid "LONGLONG"
 msgstr ""
 
-#: popthelp.c:210
+#: src/popthelp.c:189
 msgid "STRING"
 msgstr ""
 
-#: popthelp.c:211
+#: src/popthelp.c:190
 msgid "FLOAT"
 msgstr ""
 
-#: popthelp.c:212
+#: src/popthelp.c:191
 msgid "DOUBLE"
 msgstr ""
 
-#: popthelp.c:215
+#: src/popthelp.c:194
 msgid "ARG"
 msgstr ""
 
-#: popthelp.c:649
+#: src/popthelp.c:608
 msgid "Usage:"
 msgstr ""
 
-#: popthelp.c:672
+#: src/popthelp.c:630
 msgid "[OPTION...]"
 msgstr ""
diff --git a/po/pt.po b/po/pt.po
index f3adcc2..45072d3 100644
--- a/po/pt.po
+++ b/po/pt.po
@@ -2,137 +2,137 @@ msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.11\n"
 "Report-Msgid-Bugs-To: <rpm-maint@lists.rpm.org>\n"
-"POT-Creation-Date: 2020-02-12 10:47+0200\n"
+"POT-Creation-Date: 2020-05-13 11:40+0300\n"
 "PO-Revision-Date: 2002-02-13 18:32+0000\n"
 "Last-Translator: Pedro Morais <morais@kde.org>\n"
 "Language-Team: pt <morais@kde.org>\n"
-"Language: \n"
+"Language: pt\n"
 "MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=iso-8859-1\n"
+"Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: popt.c:47
+#: src/popt.c:37
 msgid "unknown errno"
 msgstr "errno desconhecido"
 
-#: popt.c:1290
+#: src/popt.c:1196
 #, fuzzy, c-format
 msgid "option type (%u) not implemented in popt\n"
-msgstr "tipo de op��o (%d) n�o implementado no popt\n"
+msgstr "tipo de opção (%d) não implementado no popt\n"
 
-#: popt.c:1711
+#: src/popt.c:1607
 msgid "missing argument"
 msgstr "falta um argumento"
 
-#: popt.c:1713
+#: src/popt.c:1609
 msgid "unknown option"
-msgstr "op��o desconhecida"
+msgstr "opção desconhecida"
 
-#: popt.c:1715
+#: src/popt.c:1611
 msgid "mutually exclusive logical operations requested"
-msgstr "foram pedidas opera��es l�gicas mutuamente exclusivas"
+msgstr "foram pedidas operações lógicas mutuamente exclusivas"
 
-#: popt.c:1717
+#: src/popt.c:1613
 msgid "opt->arg should not be NULL"
-msgstr "opt->arg n�o deve ser NULL"
+msgstr "opt->arg não deve ser NULL"
 
-#: popt.c:1719
+#: src/popt.c:1615
 msgid "aliases nested too deeply"
 msgstr "'aliases' demasiado aninhados"
 
-#: popt.c:1721
+#: src/popt.c:1617
 msgid "error in parameter quoting"
-msgstr "erros no 'quoting' de par�metros"
+msgstr "erros no 'quoting' de parâmetros"
 
-#: popt.c:1723
+#: src/popt.c:1619
 msgid "invalid numeric value"
-msgstr "valor n�merico inv�lido"
+msgstr "valor númerico inválido"
 
-#: popt.c:1725
+#: src/popt.c:1621
 msgid "number too large or too small"
-msgstr "n�mero demasiado grando ou pequeno"
+msgstr "número demasiado grando ou pequeno"
 
-#: popt.c:1727
+#: src/popt.c:1623
 msgid "memory allocation failed"
-msgstr "aloca��o de mem�ria falhou"
+msgstr "alocação de memória falhou"
 
-#: popt.c:1729
+#: src/popt.c:1625
 msgid "config file failed sanity test"
 msgstr ""
 
-#: popt.c:1733
+#: src/popt.c:1629
 msgid "unknown error"
 msgstr "erro desconhecido"
 
-#: popthelp.c:75 popthelp.c:86
+#: src/popthelp.c:64 src/popthelp.c:72
 msgid "Show this help message"
 msgstr "Mostrar esta mensagem de ajuda"
 
-#: popthelp.c:76 popthelp.c:87
+#: src/popthelp.c:65 src/popthelp.c:73
 msgid "Display brief usage message"
-msgstr "Mostrar uma mensagem de utiliza��o sucinta"
+msgstr "Mostrar uma mensagem de utilização sucinta"
 
-#: popthelp.c:90
+#: src/popthelp.c:76
 msgid "Display option defaults in message"
-msgstr "Mostrar valor por omiss�o das op��es na mensagem"
+msgstr "Mostrar valor por omissão das opções na mensagem"
 
-#: popthelp.c:92
+#: src/popthelp.c:78
 msgid "Terminate options"
 msgstr ""
 
-#: popthelp.c:191
+#: src/popthelp.c:170
 msgid "Help options:"
 msgstr ""
 
-#: popthelp.c:192
+#: src/popthelp.c:171
 msgid "Options implemented via popt alias/exec:"
 msgstr ""
 
-#: popthelp.c:200
+#: src/popthelp.c:179
 msgid "NONE"
 msgstr "NONE"
 
-#: popthelp.c:202
+#: src/popthelp.c:181
 msgid "VAL"
 msgstr "VAL"
 
-#: popthelp.c:206
+#: src/popthelp.c:185
 msgid "INT"
 msgstr "INT"
 
-#: popthelp.c:207
+#: src/popthelp.c:186
 msgid "SHORT"
 msgstr ""
 
-#: popthelp.c:208
+#: src/popthelp.c:187
 msgid "LONG"
 msgstr "LONG"
 
-#: popthelp.c:209
+#: src/popthelp.c:188
 #, fuzzy
 msgid "LONGLONG"
 msgstr "LONG"
 
-#: popthelp.c:210
+#: src/popthelp.c:189
 msgid "STRING"
 msgstr "STRING"
 
-#: popthelp.c:211
+#: src/popthelp.c:190
 msgid "FLOAT"
 msgstr "FLOAT"
 
-#: popthelp.c:212
+#: src/popthelp.c:191
 msgid "DOUBLE"
 msgstr "DOUBLE"
 
-#: popthelp.c:215
+#: src/popthelp.c:194
 msgid "ARG"
 msgstr "ARG"
 
-#: popthelp.c:649
+#: src/popthelp.c:608
 msgid "Usage:"
-msgstr "Utiliza��o:"
+msgstr "Utilização:"
 
-#: popthelp.c:672
+#: src/popthelp.c:630
 msgid "[OPTION...]"
-msgstr "[OP��O...]"
+msgstr "[OPÇÃO...]"
diff --git a/po/ro.po b/po/ro.po
index ebc8619..6d6823e 100644
--- a/po/ro.po
+++ b/po/ro.po
@@ -2,138 +2,138 @@ msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.11\n"
 "Report-Msgid-Bugs-To: <rpm-maint@lists.rpm.org>\n"
-"POT-Creation-Date: 2020-02-12 10:47+0200\n"
+"POT-Creation-Date: 2020-05-13 11:40+0300\n"
 "PO-Revision-Date: 2000-06-14 23:23+EST\n"
 "Last-Translator: Cristian Gafton <gafton@redhat.com>\n"
 "Language-Team: Romanian <ro@li.org>\n"
 "Language: ro\n"
 "MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=ISO-8859-2\n"
+"Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: popt.c:47
+#: src/popt.c:37
 msgid "unknown errno"
 msgstr "eroare necunoscuta"
 
-#: popt.c:1290
+#: src/popt.c:1196
 #, fuzzy, c-format
 msgid "option type (%u) not implemented in popt\n"
 msgstr "optiunea de tipul (%d) nu este implementata in popt\n"
 
-#: popt.c:1711
+#: src/popt.c:1607
 msgid "missing argument"
 msgstr "argument lipsa"
 
-#: popt.c:1713
+#: src/popt.c:1609
 msgid "unknown option"
 msgstr "optiune necunoscuta"
 
-#: popt.c:1715
+#: src/popt.c:1611
 msgid "mutually exclusive logical operations requested"
 msgstr ""
 
-#: popt.c:1717
+#: src/popt.c:1613
 msgid "opt->arg should not be NULL"
 msgstr ""
 
-#: popt.c:1719
+#: src/popt.c:1615
 msgid "aliases nested too deeply"
 msgstr "recursivitate infinita la optiunile sinonime"
 
-#: popt.c:1721
+#: src/popt.c:1617
 #, fuzzy
 msgid "error in parameter quoting"
 msgstr "eroare la insertie parametru"
 
-#: popt.c:1723
+#: src/popt.c:1619
 msgid "invalid numeric value"
 msgstr "valoare numarica invalida"
 
-#: popt.c:1725
+#: src/popt.c:1621
 msgid "number too large or too small"
 msgstr "numar prea mare sau prea mic"
 
-#: popt.c:1727
+#: src/popt.c:1623
 msgid "memory allocation failed"
 msgstr ""
 
-#: popt.c:1729
+#: src/popt.c:1625
 msgid "config file failed sanity test"
 msgstr ""
 
-#: popt.c:1733
+#: src/popt.c:1629
 msgid "unknown error"
 msgstr "eroare necuinoscuta"
 
-#: popthelp.c:75 popthelp.c:86
+#: src/popthelp.c:64 src/popthelp.c:72
 msgid "Show this help message"
 msgstr "Afisare mesaj de help"
 
-#: popthelp.c:76 popthelp.c:87
+#: src/popthelp.c:65 src/popthelp.c:73
 msgid "Display brief usage message"
 msgstr "Afisare mesaj sintaxa sumar"
 
-#: popthelp.c:90
+#: src/popthelp.c:76
 #, fuzzy
 msgid "Display option defaults in message"
 msgstr "Afisare mesaj sintaxa sumar"
 
-#: popthelp.c:92
+#: src/popthelp.c:78
 msgid "Terminate options"
 msgstr ""
 
-#: popthelp.c:191
+#: src/popthelp.c:170
 msgid "Help options:"
 msgstr ""
 
-#: popthelp.c:192
+#: src/popthelp.c:171
 msgid "Options implemented via popt alias/exec:"
 msgstr ""
 
-#: popthelp.c:200
+#: src/popthelp.c:179
 msgid "NONE"
 msgstr ""
 
-#: popthelp.c:202
+#: src/popthelp.c:181
 msgid "VAL"
 msgstr ""
 
-#: popthelp.c:206
+#: src/popthelp.c:185
 msgid "INT"
 msgstr ""
 
-#: popthelp.c:207
+#: src/popthelp.c:186
 msgid "SHORT"
 msgstr ""
 
-#: popthelp.c:208
+#: src/popthelp.c:187
 msgid "LONG"
 msgstr ""
 
-#: popthelp.c:209
+#: src/popthelp.c:188
 msgid "LONGLONG"
 msgstr ""
 
-#: popthelp.c:210
+#: src/popthelp.c:189
 msgid "STRING"
 msgstr ""
 
-#: popthelp.c:211
+#: src/popthelp.c:190
 msgid "FLOAT"
 msgstr ""
 
-#: popthelp.c:212
+#: src/popthelp.c:191
 msgid "DOUBLE"
 msgstr ""
 
-#: popthelp.c:215
+#: src/popthelp.c:194
 msgid "ARG"
 msgstr ""
 
-#: popthelp.c:649
+#: src/popthelp.c:608
 msgid "Usage:"
 msgstr "Sintaxa:"
 
-#: popthelp.c:672
+#: src/popthelp.c:630
 msgid "[OPTION...]"
 msgstr "[OPTIUNE...]"
diff --git a/po/ru.po b/po/ru.po
index 81ffec9..22191aa 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.14\n"
 "Report-Msgid-Bugs-To: <rpm-maint@lists.rpm.org>\n"
-"POT-Creation-Date: 2020-02-12 10:47+0200\n"
+"POT-Creation-Date: 2020-05-13 11:40+0300\n"
 "PO-Revision-Date: 2009-02-01 13:30+0300\n"
 "Last-Translator: Yuri Kozlov <yuray@komyakino.ru>\n"
 "Language-Team: Russian <gnu@mx.ru>\n"
@@ -19,127 +19,127 @@ msgstr ""
 "Plural-Forms:  nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
 "%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 
-#: popt.c:47
+#: src/popt.c:37
 msgid "unknown errno"
 msgstr "неизвестный errno"
 
-#: popt.c:1290
+#: src/popt.c:1196
 #, c-format
 msgid "option type (%u) not implemented in popt\n"
 msgstr "обработка параметра (%u) в popt не предусмотрена\n"
 
-#: popt.c:1711
+#: src/popt.c:1607
 msgid "missing argument"
 msgstr "пропущен аргумент"
 
-#: popt.c:1713
+#: src/popt.c:1609
 msgid "unknown option"
 msgstr "неизвестный параметр"
 
-#: popt.c:1715
+#: src/popt.c:1611
 msgid "mutually exclusive logical operations requested"
 msgstr "запрошены взаимно исключающие логические операции"
 
-#: popt.c:1717
+#: src/popt.c:1613
 msgid "opt->arg should not be NULL"
 msgstr "opt->arg не может быть NULL"
 
-#: popt.c:1719
+#: src/popt.c:1615
 msgid "aliases nested too deeply"
 msgstr "превышен уровень допустимой рекурсии подстановок"
 
-#: popt.c:1721
+#: src/popt.c:1617
 msgid "error in parameter quoting"
 msgstr "ошибка помещения параметров в кавычки"
 
-#: popt.c:1723
+#: src/popt.c:1619
 msgid "invalid numeric value"
 msgstr "неправильное числовое значение"
 
-#: popt.c:1725
+#: src/popt.c:1621
 msgid "number too large or too small"
 msgstr "числовое значение за пределами предусмотренного"
 
-#: popt.c:1727
+#: src/popt.c:1623
 msgid "memory allocation failed"
 msgstr "не удалось выделить память"
 
-#: popt.c:1729
+#: src/popt.c:1625
 msgid "config file failed sanity test"
 msgstr ""
 
-#: popt.c:1733
+#: src/popt.c:1629
 msgid "unknown error"
 msgstr "неизвестная ошибка"
 
-#: popthelp.c:75 popthelp.c:86
+#: src/popthelp.c:64 src/popthelp.c:72
 msgid "Show this help message"
 msgstr "Показать эту справку"
 
-#: popthelp.c:76 popthelp.c:87
+#: src/popthelp.c:65 src/popthelp.c:73
 msgid "Display brief usage message"
 msgstr "Показать краткую инструкцию по использованию"
 
-#: popthelp.c:90
+#: src/popthelp.c:76
 msgid "Display option defaults in message"
 msgstr "Показать параметры по умолчанию"
 
-#: popthelp.c:92
+#: src/popthelp.c:78
 msgid "Terminate options"
 msgstr "Завершает параметры"
 
-#: popthelp.c:191
+#: src/popthelp.c:170
 msgid "Help options:"
 msgstr "Параметры вывода справки:"
 
-#: popthelp.c:192
+#: src/popthelp.c:171
 msgid "Options implemented via popt alias/exec:"
 msgstr "Параметры, реализованные через popt alias/exec:"
 
-#: popthelp.c:200
+#: src/popthelp.c:179
 msgid "NONE"
 msgstr "NONE"
 
-#: popthelp.c:202
+#: src/popthelp.c:181
 msgid "VAL"
 msgstr "VAL"
 
-#: popthelp.c:206
+#: src/popthelp.c:185
 msgid "INT"
 msgstr "INT"
 
-#: popthelp.c:207
+#: src/popthelp.c:186
 msgid "SHORT"
 msgstr ""
 
-#: popthelp.c:208
+#: src/popthelp.c:187
 msgid "LONG"
 msgstr "LONG"
 
-#: popthelp.c:209
+#: src/popthelp.c:188
 msgid "LONGLONG"
 msgstr "LONGLONG"
 
-#: popthelp.c:210
+#: src/popthelp.c:189
 msgid "STRING"
 msgstr "STRING"
 
-#: popthelp.c:211
+#: src/popthelp.c:190
 msgid "FLOAT"
 msgstr "FLOAT"
 
-#: popthelp.c:212
+#: src/popthelp.c:191
 msgid "DOUBLE"
 msgstr "DOUBLE"
 
-#: popthelp.c:215
+#: src/popthelp.c:194
 msgid "ARG"
 msgstr "ARG"
 
-#: popthelp.c:649
+#: src/popthelp.c:608
 msgid "Usage:"
 msgstr "Использование:"
 
-#: popthelp.c:672
+#: src/popthelp.c:630
 msgid "[OPTION...]"
 msgstr "[ПАРАМЕТР...]"
diff --git a/po/sk.po b/po/sk.po
index 8c65526..e165b12 100644
--- a/po/sk.po
+++ b/po/sk.po
@@ -6,137 +6,137 @@ msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.11\n"
 "Report-Msgid-Bugs-To: <rpm-maint@lists.rpm.org>\n"
-"POT-Creation-Date: 2020-02-12 10:47+0200\n"
+"POT-Creation-Date: 2020-05-13 11:40+0300\n"
 "PO-Revision-Date: 1999-08-04 21:40+0200\n"
 "Last-Translator: Stanislav Meduna <stano@eunet.sk>\n"
 "Language-Team: Slovak <sk-i18n@rak.isternet.sk>\n"
 "Language: sk\n"
 "MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=iso-8859-2\n"
+"Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: popt.c:47
+#: src/popt.c:37
 msgid "unknown errno"
 msgstr ""
 
-#: popt.c:1290
+#: src/popt.c:1196
 #, c-format
 msgid "option type (%u) not implemented in popt\n"
 msgstr ""
 
-#: popt.c:1711
+#: src/popt.c:1607
 msgid "missing argument"
 msgstr ""
 
-#: popt.c:1713
+#: src/popt.c:1609
 msgid "unknown option"
 msgstr ""
 
-#: popt.c:1715
+#: src/popt.c:1611
 msgid "mutually exclusive logical operations requested"
 msgstr ""
 
-#: popt.c:1717
+#: src/popt.c:1613
 msgid "opt->arg should not be NULL"
 msgstr ""
 
-#: popt.c:1719
+#: src/popt.c:1615
 msgid "aliases nested too deeply"
 msgstr ""
 
-#: popt.c:1721
+#: src/popt.c:1617
 msgid "error in parameter quoting"
 msgstr ""
 
-#: popt.c:1723
+#: src/popt.c:1619
 msgid "invalid numeric value"
 msgstr ""
 
-#: popt.c:1725
+#: src/popt.c:1621
 msgid "number too large or too small"
 msgstr ""
 
-#: popt.c:1727
+#: src/popt.c:1623
 msgid "memory allocation failed"
 msgstr ""
 
-#: popt.c:1729
+#: src/popt.c:1625
 msgid "config file failed sanity test"
 msgstr ""
 
-#: popt.c:1733
+#: src/popt.c:1629
 msgid "unknown error"
 msgstr ""
 
-#: popthelp.c:75 popthelp.c:86
+#: src/popthelp.c:64 src/popthelp.c:72
 msgid "Show this help message"
-msgstr "Vyp�sa� t�to spr�vu"
+msgstr "Vypísať túto správu"
 
-#: popthelp.c:76 popthelp.c:87
+#: src/popthelp.c:65 src/popthelp.c:73
 msgid "Display brief usage message"
-msgstr "Zobrazi� stru�n� n�vod na pou�itie"
+msgstr "Zobraziť stručný návod na použitie"
 
-#: popthelp.c:90
+#: src/popthelp.c:76
 #, fuzzy
 msgid "Display option defaults in message"
-msgstr "Zobrazi� stru�n� n�vod na pou�itie"
+msgstr "Zobraziť stručný návod na použitie"
 
-#: popthelp.c:92
+#: src/popthelp.c:78
 msgid "Terminate options"
 msgstr ""
 
-#: popthelp.c:191
+#: src/popthelp.c:170
 msgid "Help options:"
 msgstr ""
 
-#: popthelp.c:192
+#: src/popthelp.c:171
 msgid "Options implemented via popt alias/exec:"
 msgstr ""
 
-#: popthelp.c:200
+#: src/popthelp.c:179
 msgid "NONE"
 msgstr ""
 
-#: popthelp.c:202
+#: src/popthelp.c:181
 msgid "VAL"
 msgstr ""
 
-#: popthelp.c:206
+#: src/popthelp.c:185
 msgid "INT"
 msgstr ""
 
-#: popthelp.c:207
+#: src/popthelp.c:186
 msgid "SHORT"
 msgstr ""
 
-#: popthelp.c:208
+#: src/popthelp.c:187
 msgid "LONG"
 msgstr ""
 
-#: popthelp.c:209
+#: src/popthelp.c:188
 msgid "LONGLONG"
 msgstr ""
 
-#: popthelp.c:210
+#: src/popthelp.c:189
 msgid "STRING"
 msgstr ""
 
-#: popthelp.c:211
+#: src/popthelp.c:190
 msgid "FLOAT"
 msgstr ""
 
-#: popthelp.c:212
+#: src/popthelp.c:191
 msgid "DOUBLE"
 msgstr ""
 
-#: popthelp.c:215
+#: src/popthelp.c:194
 msgid "ARG"
 msgstr ""
 
-#: popthelp.c:649
+#: src/popthelp.c:608
 msgid "Usage:"
 msgstr ""
 
-#: popthelp.c:672
+#: src/popthelp.c:630
 msgid "[OPTION...]"
 msgstr ""
diff --git a/po/sl.po b/po/sl.po
index c6f6873..0886cb1 100644
--- a/po/sl.po
+++ b/po/sl.po
@@ -2,137 +2,137 @@ msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.11\n"
 "Report-Msgid-Bugs-To: <rpm-maint@lists.rpm.org>\n"
-"POT-Creation-Date: 2020-02-12 10:47+0200\n"
+"POT-Creation-Date: 2020-05-13 11:40+0300\n"
 "PO-Revision-Date: 2000-09-05 12:30+0200\n"
 "Last-Translator: Roman Maurer <roman.maurer@hermes.si>\n"
 "Language-Team: Slovenian <sl@li.org>\n"
 "Language: sl\n"
 "MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=iso-8859-2\n"
+"Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: popt.c:47
+#: src/popt.c:37
 msgid "unknown errno"
 msgstr ""
 
-#: popt.c:1290
+#: src/popt.c:1196
 #, c-format
 msgid "option type (%u) not implemented in popt\n"
 msgstr ""
 
-#: popt.c:1711
+#: src/popt.c:1607
 msgid "missing argument"
 msgstr ""
 
-#: popt.c:1713
+#: src/popt.c:1609
 msgid "unknown option"
 msgstr ""
 
-#: popt.c:1715
+#: src/popt.c:1611
 msgid "mutually exclusive logical operations requested"
 msgstr ""
 
-#: popt.c:1717
+#: src/popt.c:1613
 msgid "opt->arg should not be NULL"
 msgstr ""
 
-#: popt.c:1719
+#: src/popt.c:1615
 msgid "aliases nested too deeply"
 msgstr ""
 
-#: popt.c:1721
+#: src/popt.c:1617
 msgid "error in parameter quoting"
 msgstr ""
 
-#: popt.c:1723
+#: src/popt.c:1619
 msgid "invalid numeric value"
 msgstr ""
 
-#: popt.c:1725
+#: src/popt.c:1621
 msgid "number too large or too small"
 msgstr ""
 
-#: popt.c:1727
+#: src/popt.c:1623
 msgid "memory allocation failed"
 msgstr ""
 
-#: popt.c:1729
+#: src/popt.c:1625
 msgid "config file failed sanity test"
 msgstr ""
 
-#: popt.c:1733
+#: src/popt.c:1629
 msgid "unknown error"
 msgstr ""
 
-#: popthelp.c:75 popthelp.c:86
+#: src/popthelp.c:64 src/popthelp.c:72
 msgid "Show this help message"
-msgstr "Prika�i to sporo�ilo s pomo�jo"
+msgstr "Prikaži to sporočilo s pomočjo"
 
-#: popthelp.c:76 popthelp.c:87
+#: src/popthelp.c:65 src/popthelp.c:73
 msgid "Display brief usage message"
-msgstr "Prika�i kratko sporo�ilo o uporabi"
+msgstr "Prikaži kratko sporočilo o uporabi"
 
-#: popthelp.c:90
+#: src/popthelp.c:76
 #, fuzzy
 msgid "Display option defaults in message"
-msgstr "Prika�i kratko sporo�ilo o uporabi"
+msgstr "Prikaži kratko sporočilo o uporabi"
 
-#: popthelp.c:92
+#: src/popthelp.c:78
 msgid "Terminate options"
 msgstr ""
 
-#: popthelp.c:191
+#: src/popthelp.c:170
 msgid "Help options:"
 msgstr ""
 
-#: popthelp.c:192
+#: src/popthelp.c:171
 msgid "Options implemented via popt alias/exec:"
 msgstr ""
 
-#: popthelp.c:200
+#: src/popthelp.c:179
 msgid "NONE"
 msgstr ""
 
-#: popthelp.c:202
+#: src/popthelp.c:181
 msgid "VAL"
 msgstr ""
 
-#: popthelp.c:206
+#: src/popthelp.c:185
 msgid "INT"
 msgstr ""
 
-#: popthelp.c:207
+#: src/popthelp.c:186
 msgid "SHORT"
 msgstr ""
 
-#: popthelp.c:208
+#: src/popthelp.c:187
 msgid "LONG"
 msgstr ""
 
-#: popthelp.c:209
+#: src/popthelp.c:188
 msgid "LONGLONG"
 msgstr ""
 
-#: popthelp.c:210
+#: src/popthelp.c:189
 msgid "STRING"
 msgstr ""
 
-#: popthelp.c:211
+#: src/popthelp.c:190
 msgid "FLOAT"
 msgstr ""
 
-#: popthelp.c:212
+#: src/popthelp.c:191
 msgid "DOUBLE"
 msgstr ""
 
-#: popthelp.c:215
+#: src/popthelp.c:194
 msgid "ARG"
 msgstr ""
 
-#: popthelp.c:649
+#: src/popthelp.c:608
 msgid "Usage:"
 msgstr ""
 
-#: popthelp.c:672
+#: src/popthelp.c:630
 msgid "[OPTION...]"
 msgstr ""
diff --git a/po/sv.po b/po/sv.po
index af53810..21b4e5d 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -1,7 +1,7 @@
 # Swedish messages for popt.
-# Copyright � 2008 Free Software Foundation, Inc.
+# Copyright © 2008 Free Software Foundation, Inc.
 # This file is distributed under the same license as the popt package.
-# G�ran Uddeborg <goeran@uddeborg.se>, 2008.
+# Göran Uddeborg <goeran@uddeborg.se>, 2008.
 #
 # $Revision: 1.4 $
 #
@@ -9,136 +9,136 @@ msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.14\n"
 "Report-Msgid-Bugs-To: <rpm-maint@lists.rpm.org>\n"
-"POT-Creation-Date: 2020-02-12 10:47+0200\n"
+"POT-Creation-Date: 2020-05-13 11:40+0300\n"
 "PO-Revision-Date: 2008-02-23 20:15+0100\n"
-"Last-Translator: G�ran Uddeborg <goeran@uddeborg.se>\n"
+"Last-Translator: Göran Uddeborg <goeran@uddeborg.se>\n"
 "Language-Team: Swedish <tp-sv@listor.tp-sv.se>\n"
 "Language: sv\n"
 "MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=iso-8859-1\n"
+"Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: popt.c:47
+#: src/popt.c:37
 msgid "unknown errno"
-msgstr "ok�nt felnummer"
+msgstr "okänt felnummer"
 
-#: popt.c:1290
+#: src/popt.c:1196
 #, c-format
 msgid "option type (%u) not implemented in popt\n"
-msgstr "flaggtypen (%u) �r inte implementerad i popt\n"
+msgstr "flaggtypen (%u) är inte implementerad i popt\n"
 
-#: popt.c:1711
+#: src/popt.c:1607
 msgid "missing argument"
 msgstr "argument saknas"
 
-#: popt.c:1713
+#: src/popt.c:1609
 msgid "unknown option"
-msgstr "ok�nd flagga"
+msgstr "okänd flagga"
 
-#: popt.c:1715
+#: src/popt.c:1611
 msgid "mutually exclusive logical operations requested"
-msgstr "�msesidigt uteslutande logiska operationer beg�rdes"
+msgstr "ömsesidigt uteslutande logiska operationer begärdes"
 
-#: popt.c:1717
+#: src/popt.c:1613
 msgid "opt->arg should not be NULL"
-msgstr "opt->arg f�r inte vara NULL"
+msgstr "opt->arg får inte vara NULL"
 
-#: popt.c:1719
+#: src/popt.c:1615
 msgid "aliases nested too deeply"
-msgstr "alias �r n�stade f�r djupt"
+msgstr "alias är nästade för djupt"
 
-#: popt.c:1721
+#: src/popt.c:1617
 msgid "error in parameter quoting"
 msgstr "fel i parametercitering"
 
-#: popt.c:1723
+#: src/popt.c:1619
 msgid "invalid numeric value"
-msgstr "ogiltigt numeriskt v�rde"
+msgstr "ogiltigt numeriskt värde"
 
-#: popt.c:1725
+#: src/popt.c:1621
 msgid "number too large or too small"
-msgstr "talet f�r stort eller f�r litet"
+msgstr "talet för stort eller för litet"
 
-#: popt.c:1727
+#: src/popt.c:1623
 msgid "memory allocation failed"
 msgstr "minnesallokering misslyckades"
 
-#: popt.c:1729
+#: src/popt.c:1625
 msgid "config file failed sanity test"
 msgstr ""
 
-#: popt.c:1733
+#: src/popt.c:1629
 msgid "unknown error"
-msgstr "ok�nt fel"
+msgstr "okänt fel"
 
-#: popthelp.c:75 popthelp.c:86
+#: src/popthelp.c:64 src/popthelp.c:72
 msgid "Show this help message"
-msgstr "Visa denna hj�lptext"
+msgstr "Visa denna hjälptext"
 
-#: popthelp.c:76 popthelp.c:87
+#: src/popthelp.c:65 src/popthelp.c:73
 msgid "Display brief usage message"
-msgstr "Visa en kortfattad anv�ndningstext"
+msgstr "Visa en kortfattad användningstext"
 
-#: popthelp.c:90
+#: src/popthelp.c:76
 msgid "Display option defaults in message"
-msgstr "Visa standardalternativ f�r flaggor i meddelande"
+msgstr "Visa standardalternativ för flaggor i meddelande"
 
-#: popthelp.c:92
+#: src/popthelp.c:78
 msgid "Terminate options"
 msgstr "Avsluta flaggor"
 
-#: popthelp.c:191
+#: src/popthelp.c:170
 msgid "Help options:"
-msgstr "Hj�lpflaggor:"
+msgstr "Hjälpflaggor:"
 
-#: popthelp.c:192
+#: src/popthelp.c:171
 msgid "Options implemented via popt alias/exec:"
 msgstr "Flaggor implementerade via popt-alias/exec:"
 
-#: popthelp.c:200
+#: src/popthelp.c:179
 msgid "NONE"
 msgstr "INGET"
 
-#: popthelp.c:202
+#: src/popthelp.c:181
 msgid "VAL"
-msgstr "V�RDE"
+msgstr "VÄRDE"
 
-#: popthelp.c:206
+#: src/popthelp.c:185
 msgid "INT"
 msgstr "HELTAL"
 
-#: popthelp.c:207
+#: src/popthelp.c:186
 msgid "SHORT"
 msgstr ""
 
-#: popthelp.c:208
+#: src/popthelp.c:187
 msgid "LONG"
-msgstr "L�NG"
+msgstr "LÅNG"
 
-#: popthelp.c:209
+#: src/popthelp.c:188
 msgid "LONGLONG"
-msgstr "L�NGL�NG"
+msgstr "LÅNGLÅNG"
 
-#: popthelp.c:210
+#: src/popthelp.c:189
 msgid "STRING"
-msgstr "STR�NG"
+msgstr "STRÄNG"
 
-#: popthelp.c:211
+#: src/popthelp.c:190
 msgid "FLOAT"
 msgstr "FLYTTAL"
 
-#: popthelp.c:212
+#: src/popthelp.c:191
 msgid "DOUBLE"
 msgstr "DUBBEL"
 
-#: popthelp.c:215
+#: src/popthelp.c:194
 msgid "ARG"
 msgstr "ARG"
 
-#: popthelp.c:649
+#: src/popthelp.c:608
 msgid "Usage:"
-msgstr "Anv�ndning:"
+msgstr "Användning:"
 
-#: popthelp.c:672
+#: src/popthelp.c:630
 msgid "[OPTION...]"
 msgstr "[FLAGGA...]"
diff --git a/po/th.po b/po/th.po
index 143a108..50aaf38 100644
--- a/po/th.po
+++ b/po/th.po
@@ -6,138 +6,138 @@ msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.14\n"
 "Report-Msgid-Bugs-To: <rpm-maint@lists.rpm.org>\n"
-"POT-Creation-Date: 2020-02-12 10:47+0200\n"
+"POT-Creation-Date: 2020-05-13 11:40+0300\n"
 "PO-Revision-Date: 2008-02-19 15:53+0700\n"
 "Last-Translator: Seksan Poltree <seksan.poltree@gmail.com>\n"
 "Language-Team: Thai <translation-team-th@lists.sourceforge.net>\n"
 "Language: th\n"
 "MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=utf-8\n"
+"Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "X-Poedit-Language: Thai\n"
 "X-Poedit-Country: THAILAND\n"
 
-#: popt.c:47
+#: src/popt.c:37
 msgid "unknown errno"
 msgstr "เกิด errno ที่ไม่รู้จัก"
 
-#: popt.c:1290
+#: src/popt.c:1196
 #, c-format
 msgid "option type (%u) not implemented in popt\n"
 msgstr "ตัวเลือกชนิด (%u) ไม่ถูกอิมพลีเมนต์ใน popt\n"
 
-#: popt.c:1711
+#: src/popt.c:1607
 msgid "missing argument"
 msgstr "ไม่พบอาร์กิวเมนต์"
 
-#: popt.c:1713
+#: src/popt.c:1609
 msgid "unknown option"
 msgstr "ไม่รู้จักตัวเลือก"
 
-#: popt.c:1715
+#: src/popt.c:1611
 msgid "mutually exclusive logical operations requested"
 msgstr "เกิดการร้องขอร่วมกันของการดำเนินการด้านตรรกะอย่างเดียวกัน"
 
-#: popt.c:1717
+#: src/popt.c:1613
 msgid "opt->arg should not be NULL"
 msgstr "opt->arg ไม่ควรจะเป็น NULL"
 
-#: popt.c:1719
+#: src/popt.c:1615
 msgid "aliases nested too deeply"
 msgstr "นามแฝงซ้อนกันมากเกินไป"
 
-#: popt.c:1721
+#: src/popt.c:1617
 msgid "error in parameter quoting"
 msgstr "เกิดข้อผิดพลาดในการอ้างอิงพารามิเตอร์"
 
-#: popt.c:1723
+#: src/popt.c:1619
 msgid "invalid numeric value"
 msgstr "ค่าตัวเลขผิดพลาด"
 
-#: popt.c:1725
+#: src/popt.c:1621
 msgid "number too large or too small"
 msgstr "ตัวเลขมีค่ามากหรือน้อยเกินไป"
 
-#: popt.c:1727
+#: src/popt.c:1623
 msgid "memory allocation failed"
 msgstr "การจัดสรรหน่วยความจำผิดพลาด"
 
-#: popt.c:1729
+#: src/popt.c:1625
 msgid "config file failed sanity test"
 msgstr ""
 
-#: popt.c:1733
+#: src/popt.c:1629
 msgid "unknown error"
 msgstr "ความผิดพลาดที่ไม่รู้จัก"
 
-#: popthelp.c:75 popthelp.c:86
+#: src/popthelp.c:64 src/popthelp.c:72
 msgid "Show this help message"
 msgstr "แสดงข้อความช่วยเหลือนี้"
 
-#: popthelp.c:76 popthelp.c:87
+#: src/popthelp.c:65 src/popthelp.c:73
 msgid "Display brief usage message"
 msgstr "แสดงข้อความสรุปย่อการใช้งาน"
 
-#: popthelp.c:90
+#: src/popthelp.c:76
 msgid "Display option defaults in message"
 msgstr "แสดงตัวเลือกมาตรฐานในข้อความ"
 
-#: popthelp.c:92
+#: src/popthelp.c:78
 msgid "Terminate options"
 msgstr "ตัวเลือกการสิ้นสุด:"
 
-#: popthelp.c:191
+#: src/popthelp.c:170
 msgid "Help options:"
 msgstr "ตัวเลือกความช่วยเหลือ:"
 
-#: popthelp.c:192
+#: src/popthelp.c:171
 msgid "Options implemented via popt alias/exec:"
 msgstr "ตัวเลือกที่ถูกอิมพลีเมนต์ด้วย popt alias/exec:"
 
-#: popthelp.c:200
+#: src/popthelp.c:179
 msgid "NONE"
 msgstr "ไม่มี"
 
-#: popthelp.c:202
+#: src/popthelp.c:181
 msgid "VAL"
 msgstr "VAL"
 
-#: popthelp.c:206
+#: src/popthelp.c:185
 msgid "INT"
 msgstr "INT"
 
-#: popthelp.c:207
+#: src/popthelp.c:186
 msgid "SHORT"
 msgstr ""
 
-#: popthelp.c:208
+#: src/popthelp.c:187
 msgid "LONG"
 msgstr "LONG"
 
-#: popthelp.c:209
+#: src/popthelp.c:188
 msgid "LONGLONG"
 msgstr "LONGLONG"
 
-#: popthelp.c:210
+#: src/popthelp.c:189
 msgid "STRING"
 msgstr "STRING"
 
-#: popthelp.c:211
+#: src/popthelp.c:190
 msgid "FLOAT"
 msgstr "FLOAT"
 
-#: popthelp.c:212
+#: src/popthelp.c:191
 msgid "DOUBLE"
 msgstr "DOUBLE"
 
-#: popthelp.c:215
+#: src/popthelp.c:194
 msgid "ARG"
 msgstr "ARG"
 
-#: popthelp.c:649
+#: src/popthelp.c:608
 msgid "Usage:"
 msgstr "วิธีใช้:"
 
-#: popthelp.c:672
+#: src/popthelp.c:630
 msgid "[OPTION...]"
 msgstr "[ตัวเลือก...]"
diff --git a/po/tr.po b/po/tr.po
index dd5ca4b..edbbb1b 100644
--- a/po/tr.po
+++ b/po/tr.po
@@ -5,138 +5,138 @@ msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.11\n"
 "Report-Msgid-Bugs-To: <rpm-maint@lists.rpm.org>\n"
-"POT-Creation-Date: 2020-02-12 10:47+0200\n"
+"POT-Creation-Date: 2020-05-13 11:40+0300\n"
 "PO-Revision-Date: 2000-02-11 13:01+0200\n"
 "Last-Translator: Nilgun Belma Buguner <nilgun@technologist.com>\n"
 "Language-Team: Turkish <tr@li.org>\n"
 "Language: tr\n"
 "MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=iso-8859-9\n"
+"Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: popt.c:47
+#: src/popt.c:37
 msgid "unknown errno"
 msgstr "bilinmeyen hata no"
 
-#: popt.c:1290
+#: src/popt.c:1196
 #, fuzzy, c-format
 msgid "option type (%u) not implemented in popt\n"
-msgstr "se�enek t�r� (%d) popt i�in ge�ersiz\n"
+msgstr "seçenek tßrß (%d) popt için geçersiz\n"
 
-#: popt.c:1711
+#: src/popt.c:1607
 msgid "missing argument"
-msgstr "arg�man eksik"
+msgstr "argĂźman eksik"
 
-#: popt.c:1713
+#: src/popt.c:1609
 msgid "unknown option"
-msgstr "bilinmeyen se�enek"
+msgstr "bilinmeyen seçenek"
 
-#: popt.c:1715
+#: src/popt.c:1611
 msgid "mutually exclusive logical operations requested"
-msgstr "birbirini d��layan mant�ksal i�lemler istendi"
+msgstr "birbirini dışlayan mantıksal işlemler istendi"
 
-#: popt.c:1717
+#: src/popt.c:1613
 msgid "opt->arg should not be NULL"
 msgstr ""
 
-#: popt.c:1719
+#: src/popt.c:1615
 msgid "aliases nested too deeply"
-msgstr "adlarda �ok fazla i�i�elikler"
+msgstr "adlarda çok fazla içiçelikler"
 
-#: popt.c:1721
+#: src/popt.c:1617
 msgid "error in parameter quoting"
-msgstr "parametrelerde t�rnak i�aretleme hatal� "
+msgstr "parametrelerde tırnak işaretleme hatalı "
 
-#: popt.c:1723
+#: src/popt.c:1619
 msgid "invalid numeric value"
-msgstr "say�sal de�er ge�ersiz"
+msgstr "sayısal değer geçersiz"
 
-#: popt.c:1725
+#: src/popt.c:1621
 msgid "number too large or too small"
-msgstr "say� ya �ok b�y�k ya da �ok k���k"
+msgstr "sayĹ ya çok bßyßk ya da çok kßçßk"
 
-#: popt.c:1727
+#: src/popt.c:1623
 msgid "memory allocation failed"
 msgstr ""
 
-#: popt.c:1729
+#: src/popt.c:1625
 msgid "config file failed sanity test"
 msgstr ""
 
-#: popt.c:1733
+#: src/popt.c:1629
 msgid "unknown error"
 msgstr "bilinmeyen hata"
 
-#: popthelp.c:75 popthelp.c:86
+#: src/popthelp.c:64 src/popthelp.c:72
 msgid "Show this help message"
-msgstr "Bu yard�m iletisini g�sterir"
+msgstr "Bu yardÄąm iletisini gĂśsterir"
 
-#: popthelp.c:76 popthelp.c:87
+#: src/popthelp.c:65 src/popthelp.c:73
 msgid "Display brief usage message"
-msgstr "K�sa bir kullan�m iletisi g�ster"
+msgstr "KÄąsa bir kullanÄąm iletisi gĂśster"
 
-#: popthelp.c:90
+#: src/popthelp.c:76
 #, fuzzy
 msgid "Display option defaults in message"
-msgstr "K�sa bir kullan�m iletisi g�ster"
+msgstr "KÄąsa bir kullanÄąm iletisi gĂśster"
 
-#: popthelp.c:92
+#: src/popthelp.c:78
 msgid "Terminate options"
 msgstr ""
 
-#: popthelp.c:191
+#: src/popthelp.c:170
 msgid "Help options:"
 msgstr ""
 
-#: popthelp.c:192
+#: src/popthelp.c:171
 msgid "Options implemented via popt alias/exec:"
 msgstr ""
 
-#: popthelp.c:200
+#: src/popthelp.c:179
 msgid "NONE"
 msgstr "YOK"
 
-#: popthelp.c:202
+#: src/popthelp.c:181
 msgid "VAL"
-msgstr "DE�"
+msgstr "DEĞ"
 
-#: popthelp.c:206
+#: src/popthelp.c:185
 msgid "INT"
 msgstr "INT"
 
-#: popthelp.c:207
+#: src/popthelp.c:186
 msgid "SHORT"
 msgstr ""
 
-#: popthelp.c:208
+#: src/popthelp.c:187
 msgid "LONG"
 msgstr "LONG"
 
-#: popthelp.c:209
+#: src/popthelp.c:188
 #, fuzzy
 msgid "LONGLONG"
 msgstr "LONG"
 
-#: popthelp.c:210
+#: src/popthelp.c:189
 msgid "STRING"
 msgstr "STRING"
 
-#: popthelp.c:211
+#: src/popthelp.c:190
 msgid "FLOAT"
 msgstr "FLOAT"
 
-#: popthelp.c:212
+#: src/popthelp.c:191
 msgid "DOUBLE"
 msgstr "DOUBLE"
 
-#: popthelp.c:215
+#: src/popthelp.c:194
 msgid "ARG"
 msgstr "ARG"
 
-#: popthelp.c:649
+#: src/popthelp.c:608
 msgid "Usage:"
-msgstr "Kullan�m�:"
+msgstr "KullanÄąmÄą:"
 
-#: popthelp.c:672
+#: src/popthelp.c:630
 msgid "[OPTION...]"
-msgstr "[SE�ENEK...]"
+msgstr "[SEÇENEK...]"
diff --git a/po/uk.po b/po/uk.po
index 426d4b7..88e8588 100644
--- a/po/uk.po
+++ b/po/uk.po
@@ -6,137 +6,137 @@ msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.11\n"
 "Report-Msgid-Bugs-To: <rpm-maint@lists.rpm.org>\n"
-"POT-Creation-Date: 2020-02-12 10:47+0200\n"
+"POT-Creation-Date: 2020-05-13 11:40+0300\n"
 "PO-Revision-Date: 1999-09-30 16:54+0200\n"
 "Last-Translator: Yuri Syrota <rasta@renome.rovno.ua>\n"
 "Language-Team: Ukrainian <uk@li.org>\n"
 "Language: uk\n"
 "MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=koi8-u\n"
+"Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: popt.c:47
+#: src/popt.c:37
 msgid "unknown errno"
 msgstr ""
 
-#: popt.c:1290
+#: src/popt.c:1196
 #, c-format
 msgid "option type (%u) not implemented in popt\n"
 msgstr ""
 
-#: popt.c:1711
+#: src/popt.c:1607
 msgid "missing argument"
 msgstr ""
 
-#: popt.c:1713
+#: src/popt.c:1609
 msgid "unknown option"
 msgstr ""
 
-#: popt.c:1715
+#: src/popt.c:1611
 msgid "mutually exclusive logical operations requested"
 msgstr ""
 
-#: popt.c:1717
+#: src/popt.c:1613
 msgid "opt->arg should not be NULL"
 msgstr ""
 
-#: popt.c:1719
+#: src/popt.c:1615
 msgid "aliases nested too deeply"
 msgstr ""
 
-#: popt.c:1721
+#: src/popt.c:1617
 msgid "error in parameter quoting"
 msgstr ""
 
-#: popt.c:1723
+#: src/popt.c:1619
 msgid "invalid numeric value"
 msgstr ""
 
-#: popt.c:1725
+#: src/popt.c:1621
 msgid "number too large or too small"
 msgstr ""
 
-#: popt.c:1727
+#: src/popt.c:1623
 msgid "memory allocation failed"
 msgstr ""
 
-#: popt.c:1729
+#: src/popt.c:1625
 msgid "config file failed sanity test"
 msgstr ""
 
-#: popt.c:1733
+#: src/popt.c:1629
 msgid "unknown error"
 msgstr ""
 
-#: popthelp.c:75 popthelp.c:86
+#: src/popthelp.c:64 src/popthelp.c:72
 msgid "Show this help message"
-msgstr "�������� �� ��צ���"
+msgstr "Показати цю довідку"
 
-#: popthelp.c:76 popthelp.c:87
+#: src/popthelp.c:65 src/popthelp.c:73
 msgid "Display brief usage message"
-msgstr "�������� ������� ��צ��� ��� ������������"
+msgstr "Показати коротку довідку про використання"
 
-#: popthelp.c:90
+#: src/popthelp.c:76
 #, fuzzy
 msgid "Display option defaults in message"
-msgstr "�������� ������� ��צ��� ��� ������������"
+msgstr "Показати коротку довідку про використання"
 
-#: popthelp.c:92
+#: src/popthelp.c:78
 msgid "Terminate options"
 msgstr ""
 
-#: popthelp.c:191
+#: src/popthelp.c:170
 msgid "Help options:"
 msgstr ""
 
-#: popthelp.c:192
+#: src/popthelp.c:171
 msgid "Options implemented via popt alias/exec:"
 msgstr ""
 
-#: popthelp.c:200
+#: src/popthelp.c:179
 msgid "NONE"
 msgstr ""
 
-#: popthelp.c:202
+#: src/popthelp.c:181
 msgid "VAL"
 msgstr ""
 
-#: popthelp.c:206
+#: src/popthelp.c:185
 msgid "INT"
 msgstr ""
 
-#: popthelp.c:207
+#: src/popthelp.c:186
 msgid "SHORT"
 msgstr ""
 
-#: popthelp.c:208
+#: src/popthelp.c:187
 msgid "LONG"
 msgstr ""
 
-#: popthelp.c:209
+#: src/popthelp.c:188
 msgid "LONGLONG"
 msgstr ""
 
-#: popthelp.c:210
+#: src/popthelp.c:189
 msgid "STRING"
 msgstr ""
 
-#: popthelp.c:211
+#: src/popthelp.c:190
 msgid "FLOAT"
 msgstr ""
 
-#: popthelp.c:212
+#: src/popthelp.c:191
 msgid "DOUBLE"
 msgstr ""
 
-#: popthelp.c:215
+#: src/popthelp.c:194
 msgid "ARG"
 msgstr ""
 
-#: popthelp.c:649
+#: src/popthelp.c:608
 msgid "Usage:"
 msgstr ""
 
-#: popthelp.c:672
+#: src/popthelp.c:630
 msgid "[OPTION...]"
 msgstr ""
diff --git a/po/vi.po b/po/vi.po
index 71ab6d6..5f217cf 100644
--- a/po/vi.po
+++ b/po/vi.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.14\n"
 "Report-Msgid-Bugs-To: <rpm-maint@lists.rpm.org>\n"
-"POT-Creation-Date: 2020-02-12 10:47+0200\n"
+"POT-Creation-Date: 2020-05-13 11:40+0300\n"
 "PO-Revision-Date: 2008-02-18 16:20+1030\n"
 "Last-Translator: Clytie Siddall <clytie@riverland.net.au>\n"
 "Language-Team: Vietnamese <vi-VN@googlegroups.com>\n"
@@ -18,127 +18,127 @@ msgstr ""
 "Plural-Forms: nplurals=1; plural=0;\n"
 "X-Generator: LocFactoryEditor 1.7b3\n"
 
-#: popt.c:47
+#: src/popt.c:37
 msgid "unknown errno"
 msgstr "số hiệu lỗi không rõ"
 
-#: popt.c:1290
+#: src/popt.c:1196
 #, c-format
 msgid "option type (%u) not implemented in popt\n"
 msgstr "kiểu tùy chọn (%u) chưa được thực hiện trong popt\n"
 
-#: popt.c:1711
+#: src/popt.c:1607
 msgid "missing argument"
 msgstr "thiếu đối số"
 
-#: popt.c:1713
+#: src/popt.c:1609
 msgid "unknown option"
 msgstr "tùy chọn không rõ"
 
-#: popt.c:1715
+#: src/popt.c:1611
 msgid "mutually exclusive logical operations requested"
 msgstr "các thao tác hợp lý loại từ lẫn nhau được yêu cầu"
 
-#: popt.c:1717
+#: src/popt.c:1613
 msgid "opt->arg should not be NULL"
 msgstr "« tùy chọn->đối số » không thể vô giá trị"
 
-#: popt.c:1719
+#: src/popt.c:1615
 msgid "aliases nested too deeply"
 msgstr "các bí danh lồng nhau quá sâu"
 
-#: popt.c:1721
+#: src/popt.c:1617
 msgid "error in parameter quoting"
 msgstr "gặp lỗi trong lời trích dẫn tham số"
 
-#: popt.c:1723
+#: src/popt.c:1619
 msgid "invalid numeric value"
 msgstr "giá trị thuộc số không hợp lệ"
 
-#: popt.c:1725
+#: src/popt.c:1621
 msgid "number too large or too small"
 msgstr "con số quá lớn hay quá nhỏ"
 
-#: popt.c:1727
+#: src/popt.c:1623
 msgid "memory allocation failed"
 msgstr "lỗi cấp phát bộ nhớ"
 
-#: popt.c:1729
+#: src/popt.c:1625
 msgid "config file failed sanity test"
 msgstr ""
 
-#: popt.c:1733
+#: src/popt.c:1629
 msgid "unknown error"
 msgstr "lỗi không rõ"
 
-#: popthelp.c:75 popthelp.c:86
+#: src/popthelp.c:64 src/popthelp.c:72
 msgid "Show this help message"
 msgstr "Xem thông điệp trợ giúp này"
 
-#: popthelp.c:76 popthelp.c:87
+#: src/popthelp.c:65 src/popthelp.c:73
 msgid "Display brief usage message"
 msgstr "Hiển thị thông điệp cách sử dụng ngắn"
 
-#: popthelp.c:90
+#: src/popthelp.c:76
 msgid "Display option defaults in message"
 msgstr "Hiển thị các giá trị mặc định của tùy chọn trong thông điệp"
 
-#: popthelp.c:92
+#: src/popthelp.c:78
 msgid "Terminate options"
 msgstr "Tùy chọn chấm dứt"
 
-#: popthelp.c:191
+#: src/popthelp.c:170
 msgid "Help options:"
 msgstr "Tùy chọn trợ giúp:"
 
-#: popthelp.c:192
+#: src/popthelp.c:171
 msgid "Options implemented via popt alias/exec:"
 msgstr "Các tùy chọn được thực hiện thông qua popt alias/exec:"
 
-#: popthelp.c:200
+#: src/popthelp.c:179
 msgid "NONE"
 msgstr "KHÔNG CÓ"
 
-#: popthelp.c:202
+#: src/popthelp.c:181
 msgid "VAL"
 msgstr "GIÁ TRỊ"
 
-#: popthelp.c:206
+#: src/popthelp.c:185
 msgid "INT"
 msgstr "SỐ NGUYÊN"
 
-#: popthelp.c:207
+#: src/popthelp.c:186
 msgid "SHORT"
 msgstr ""
 
-#: popthelp.c:208
+#: src/popthelp.c:187
 msgid "LONG"
 msgstr "DÀI"
 
-#: popthelp.c:209
+#: src/popthelp.c:188
 msgid "LONGLONG"
 msgstr "DÀIDÀI"
 
-#: popthelp.c:210
+#: src/popthelp.c:189
 msgid "STRING"
 msgstr "CHUỖI"
 
-#: popthelp.c:211
+#: src/popthelp.c:190
 msgid "FLOAT"
 msgstr "NỔI"
 
-#: popthelp.c:212
+#: src/popthelp.c:191
 msgid "DOUBLE"
 msgstr "ĐÔI"
 
-#: popthelp.c:215
+#: src/popthelp.c:194
 msgid "ARG"
 msgstr "ĐỐI SỐ"
 
-#: popthelp.c:649
+#: src/popthelp.c:608
 msgid "Usage:"
 msgstr "Sử dụng:"
 
-#: popthelp.c:672
+#: src/popthelp.c:630
 msgid "[OPTION...]"
 msgstr "[TÙY_CHỌN...]"
diff --git a/po/wa.po b/po/wa.po
index 0640cd0..9f95b0d 100644
--- a/po/wa.po
+++ b/po/wa.po
@@ -1,8 +1,8 @@
 # Translation into the walloon language.
 #
-# Si vos voloz donner on c�p di spale pol rato�rnaedje di Gnome (ou des
-# �tes libes programes) sicrijhoz-mu a l' adresse emile
-# <linux-wa@chanae.alphanet.ch>; nos avons co br�mint di l' ovraedje a f�.
+# Si vos voloz donner on côp di spale pol ratoûrnaedje di Gnome (ou des
+# ôtes libes programes) sicrijhoz-mu a l' adresse emile
+# <linux-wa@chanae.alphanet.ch>; nos avons co bråmint di l' ovraedje a fé.
 #
 # Copyright (C) 1999 Free Software Foundation, Inc.
 #
@@ -10,137 +10,137 @@ msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.11\n"
 "Report-Msgid-Bugs-To: <rpm-maint@lists.rpm.org>\n"
-"POT-Creation-Date: 2020-02-12 10:47+0200\n"
+"POT-Creation-Date: 2020-05-13 11:40+0300\n"
 "PO-Revision-Date: 1999-03-18 23:11+0100\n"
 "Last-Translator: Nobody yet\n"
 "Language-Team: walon <linux-wa@chanae.alphanet.ch>\n"
-"Language: \n"
+"Language: wa\n"
 "MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=iso-8859-1\n"
+"Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: popt.c:47
+#: src/popt.c:37
 msgid "unknown errno"
 msgstr ""
 
-#: popt.c:1290
+#: src/popt.c:1196
 #, c-format
 msgid "option type (%u) not implemented in popt\n"
 msgstr ""
 
-#: popt.c:1711
+#: src/popt.c:1607
 msgid "missing argument"
 msgstr ""
 
-#: popt.c:1713
+#: src/popt.c:1609
 msgid "unknown option"
 msgstr ""
 
-#: popt.c:1715
+#: src/popt.c:1611
 msgid "mutually exclusive logical operations requested"
 msgstr ""
 
-#: popt.c:1717
+#: src/popt.c:1613
 msgid "opt->arg should not be NULL"
 msgstr ""
 
-#: popt.c:1719
+#: src/popt.c:1615
 msgid "aliases nested too deeply"
 msgstr ""
 
-#: popt.c:1721
+#: src/popt.c:1617
 msgid "error in parameter quoting"
 msgstr ""
 
-#: popt.c:1723
+#: src/popt.c:1619
 msgid "invalid numeric value"
 msgstr ""
 
-#: popt.c:1725
+#: src/popt.c:1621
 msgid "number too large or too small"
 msgstr ""
 
-#: popt.c:1727
+#: src/popt.c:1623
 msgid "memory allocation failed"
 msgstr ""
 
-#: popt.c:1729
+#: src/popt.c:1625
 msgid "config file failed sanity test"
 msgstr ""
 
-#: popt.c:1733
+#: src/popt.c:1629
 msgid "unknown error"
 msgstr ""
 
-#: popthelp.c:75 popthelp.c:86
+#: src/popthelp.c:64 src/popthelp.c:72
 msgid "Show this help message"
 msgstr "Mostrer ci messaedje d' aide chal"
 
-#: popthelp.c:76 popthelp.c:87
+#: src/popthelp.c:65 src/popthelp.c:73
 msgid "Display brief usage message"
-msgstr "Mostre on court messaedje so kmint vos � siervi"
+msgstr "Mostre on court messaedje so kmint vos è siervi"
 
-#: popthelp.c:90
+#: src/popthelp.c:76
 #, fuzzy
 msgid "Display option defaults in message"
-msgstr "Mostre on court messaedje so kmint vos � siervi"
+msgstr "Mostre on court messaedje so kmint vos è siervi"
 
-#: popthelp.c:92
+#: src/popthelp.c:78
 msgid "Terminate options"
 msgstr ""
 
-#: popthelp.c:191
+#: src/popthelp.c:170
 msgid "Help options:"
 msgstr ""
 
-#: popthelp.c:192
+#: src/popthelp.c:171
 msgid "Options implemented via popt alias/exec:"
 msgstr ""
 
-#: popthelp.c:200
+#: src/popthelp.c:179
 msgid "NONE"
 msgstr ""
 
-#: popthelp.c:202
+#: src/popthelp.c:181
 msgid "VAL"
 msgstr ""
 
-#: popthelp.c:206
+#: src/popthelp.c:185
 msgid "INT"
 msgstr ""
 
-#: popthelp.c:207
+#: src/popthelp.c:186
 msgid "SHORT"
 msgstr ""
 
-#: popthelp.c:208
+#: src/popthelp.c:187
 msgid "LONG"
 msgstr ""
 
-#: popthelp.c:209
+#: src/popthelp.c:188
 msgid "LONGLONG"
 msgstr ""
 
-#: popthelp.c:210
+#: src/popthelp.c:189
 msgid "STRING"
 msgstr ""
 
-#: popthelp.c:211
+#: src/popthelp.c:190
 msgid "FLOAT"
 msgstr ""
 
-#: popthelp.c:212
+#: src/popthelp.c:191
 msgid "DOUBLE"
 msgstr ""
 
-#: popthelp.c:215
+#: src/popthelp.c:194
 msgid "ARG"
 msgstr ""
 
-#: popthelp.c:649
+#: src/popthelp.c:608
 msgid "Usage:"
 msgstr ""
 
-#: popthelp.c:672
+#: src/popthelp.c:630
 msgid "[OPTION...]"
 msgstr ""
diff --git a/po/zh_CN.po b/po/zh_CN.po
index c5602fd..d2d3b3d 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.14\n"
 "Report-Msgid-Bugs-To: <rpm-maint@lists.rpm.org>\n"
-"POT-Creation-Date: 2020-02-12 10:47+0200\n"
+"POT-Creation-Date: 2020-05-13 11:40+0300\n"
 "PO-Revision-Date: 2008-02-18 20:16+0800\n"
 "Last-Translator: LI Daobing <lidaobing@gmail.com>\n"
 "Language-Team: Chinese (simplified) <i18n-zh@googlegroups.com>\n"
@@ -17,127 +17,127 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: popt.c:47
+#: src/popt.c:37
 msgid "unknown errno"
 msgstr "未知的错误"
 
-#: popt.c:1290
+#: src/popt.c:1196
 #, c-format
 msgid "option type (%u) not implemented in popt\n"
 msgstr "选项类别 (%u) 没有在 popt 中实现\n"
 
-#: popt.c:1711
+#: src/popt.c:1607
 msgid "missing argument"
 msgstr "缺少参数"
 
-#: popt.c:1713
+#: src/popt.c:1609
 msgid "unknown option"
 msgstr "未知的选项"
 
-#: popt.c:1715
+#: src/popt.c:1611
 msgid "mutually exclusive logical operations requested"
 msgstr "需要 XOR 逻辑运算"
 
-#: popt.c:1717
+#: src/popt.c:1613
 msgid "opt->arg should not be NULL"
 msgstr "opt->arg 不应该为 NULL"
 
-#: popt.c:1719
+#: src/popt.c:1615
 msgid "aliases nested too deeply"
 msgstr "别名嵌套太深"
 
-#: popt.c:1721
+#: src/popt.c:1617
 msgid "error in parameter quoting"
 msgstr "参数引号错误"
 
-#: popt.c:1723
+#: src/popt.c:1619
 msgid "invalid numeric value"
 msgstr "无效的数值"
 
-#: popt.c:1725
+#: src/popt.c:1621
 msgid "number too large or too small"
 msgstr "数值太大或太小"
 
-#: popt.c:1727
+#: src/popt.c:1623
 msgid "memory allocation failed"
 msgstr "内存分配错误"
 
-#: popt.c:1729
+#: src/popt.c:1625
 msgid "config file failed sanity test"
 msgstr ""
 
-#: popt.c:1733
+#: src/popt.c:1629
 msgid "unknown error"
 msgstr "未知的错误"
 
-#: popthelp.c:75 popthelp.c:86
+#: src/popthelp.c:64 src/popthelp.c:72
 msgid "Show this help message"
 msgstr "显示这个帮助信息"
 
-#: popthelp.c:76 popthelp.c:87
+#: src/popthelp.c:65 src/popthelp.c:73
 msgid "Display brief usage message"
 msgstr "显示简短的使用说明"
 
-#: popthelp.c:90
+#: src/popthelp.c:76
 msgid "Display option defaults in message"
 msgstr "在信息中显示默认的选项"
 
-#: popthelp.c:92
+#: src/popthelp.c:78
 msgid "Terminate options"
 msgstr "终止选项"
 
-#: popthelp.c:191
+#: src/popthelp.c:170
 msgid "Help options:"
 msgstr "帮助选项:"
 
-#: popthelp.c:192
+#: src/popthelp.c:171
 msgid "Options implemented via popt alias/exec:"
 msgstr "通过 popt alias/exec 实现的选项:"
 
-#: popthelp.c:200
+#: src/popthelp.c:179
 msgid "NONE"
 msgstr "NONE"
 
-#: popthelp.c:202
+#: src/popthelp.c:181
 msgid "VAL"
 msgstr "VAL"
 
-#: popthelp.c:206
+#: src/popthelp.c:185
 msgid "INT"
 msgstr "INT"
 
-#: popthelp.c:207
+#: src/popthelp.c:186
 msgid "SHORT"
 msgstr ""
 
-#: popthelp.c:208
+#: src/popthelp.c:187
 msgid "LONG"
 msgstr "LONG"
 
-#: popthelp.c:209
+#: src/popthelp.c:188
 msgid "LONGLONG"
 msgstr "LONGLONG"
 
-#: popthelp.c:210
+#: src/popthelp.c:189
 msgid "STRING"
 msgstr "STRING"
 
-#: popthelp.c:211
+#: src/popthelp.c:190
 msgid "FLOAT"
 msgstr "FLOAT"
 
-#: popthelp.c:212
+#: src/popthelp.c:191
 msgid "DOUBLE"
 msgstr "DOUBLE"
 
-#: popthelp.c:215
+#: src/popthelp.c:194
 msgid "ARG"
 msgstr "ARG"
 
-#: popthelp.c:649
+#: src/popthelp.c:608
 msgid "Usage:"
 msgstr "用法:"
 
-#: popthelp.c:672
+#: src/popthelp.c:630
 msgid "[OPTION...]"
 msgstr "[选项...]"
diff --git a/po/zh_TW.po b/po/zh_TW.po
index 2ce4765..6e33af3 100644
--- a/po/zh_TW.po
+++ b/po/zh_TW.po
@@ -6,137 +6,137 @@ msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.11\n"
 "Report-Msgid-Bugs-To: <rpm-maint@lists.rpm.org>\n"
-"POT-Creation-Date: 2020-02-12 10:47+0200\n"
+"POT-Creation-Date: 2020-05-13 11:40+0300\n"
 "PO-Revision-Date: 2005-04-08 17:52+0800\n"
 "Last-Translator: Wei-Lun Chao <chaoweilun@pcmail.com.tw>\n"
 "Language-Team: zh_TW <zh-l10n@linux.org.tw>\n"
-"Language: \n"
+"Language: zh_TW\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: popt.c:47
+#: src/popt.c:37
 msgid "unknown errno"
 msgstr "未知的錯誤"
 
-#: popt.c:1290
+#: src/popt.c:1196
 #, fuzzy, c-format
 msgid "option type (%u) not implemented in popt\n"
 msgstr "選項類型 (%d) 沒有在 popt 中實作\n"
 
-#: popt.c:1711
+#: src/popt.c:1607
 msgid "missing argument"
 msgstr "缺少引數"
 
-#: popt.c:1713
+#: src/popt.c:1609
 msgid "unknown option"
 msgstr "未知的選項"
 
-#: popt.c:1715
+#: src/popt.c:1611
 msgid "mutually exclusive logical operations requested"
 msgstr "需要相互獨立的邏輯運算"
 
-#: popt.c:1717
+#: src/popt.c:1613
 msgid "opt->arg should not be NULL"
 msgstr "opt->arg 不應為 NULL"
 
-#: popt.c:1719
+#: src/popt.c:1615
 msgid "aliases nested too deeply"
 msgstr "巢狀別名太深"
 
-#: popt.c:1721
+#: src/popt.c:1617
 msgid "error in parameter quoting"
 msgstr "參數引號錯誤"
 
-#: popt.c:1723
+#: src/popt.c:1619
 msgid "invalid numeric value"
 msgstr "不正確的數值"
 
-#: popt.c:1725
+#: src/popt.c:1621
 msgid "number too large or too small"
 msgstr "數字太大或太小"
 
-#: popt.c:1727
+#: src/popt.c:1623
 msgid "memory allocation failed"
 msgstr "記憶體配置錯誤"
 
-#: popt.c:1729
+#: src/popt.c:1625
 msgid "config file failed sanity test"
 msgstr ""
 
-#: popt.c:1733
+#: src/popt.c:1629
 msgid "unknown error"
 msgstr "未知的錯誤"
 
-#: popthelp.c:75 popthelp.c:86
+#: src/popthelp.c:64 src/popthelp.c:72
 msgid "Show this help message"
 msgstr "顯示本說明訊息"
 
-#: popthelp.c:76 popthelp.c:87
+#: src/popthelp.c:65 src/popthelp.c:73
 msgid "Display brief usage message"
 msgstr "顯示簡短的使用說明"
 
-#: popthelp.c:90
+#: src/popthelp.c:76
 msgid "Display option defaults in message"
 msgstr "在訊息中顯示預設選項"
 
-#: popthelp.c:92
+#: src/popthelp.c:78
 msgid "Terminate options"
 msgstr ""
 
-#: popthelp.c:191
+#: src/popthelp.c:170
 msgid "Help options:"
 msgstr ""
 
-#: popthelp.c:192
+#: src/popthelp.c:171
 msgid "Options implemented via popt alias/exec:"
 msgstr ""
 
-#: popthelp.c:200
+#: src/popthelp.c:179
 msgid "NONE"
 msgstr "NONE"
 
-#: popthelp.c:202
+#: src/popthelp.c:181
 msgid "VAL"
 msgstr "VAL"
 
-#: popthelp.c:206
+#: src/popthelp.c:185
 msgid "INT"
 msgstr "INT"
 
-#: popthelp.c:207
+#: src/popthelp.c:186
 msgid "SHORT"
 msgstr ""
 
-#: popthelp.c:208
+#: src/popthelp.c:187
 msgid "LONG"
 msgstr "LONG"
 
-#: popthelp.c:209
+#: src/popthelp.c:188
 #, fuzzy
 msgid "LONGLONG"
 msgstr "LONG"
 
-#: popthelp.c:210
+#: src/popthelp.c:189
 msgid "STRING"
 msgstr "STRING"
 
-#: popthelp.c:211
+#: src/popthelp.c:190
 msgid "FLOAT"
 msgstr "FLOAT"
 
-#: popthelp.c:212
+#: src/popthelp.c:191
 msgid "DOUBLE"
 msgstr "DOUBLE"
 
-#: popthelp.c:215
+#: src/popthelp.c:194
 msgid "ARG"
 msgstr "ARG"
 
-#: popthelp.c:649
+#: src/popthelp.c:608
 msgid "Usage:"
 msgstr "用法:"
 
-#: popthelp.c:672
+#: src/popthelp.c:630
 msgid "[OPTION...]"
 msgstr "[選項...]"
-- 
Gitee


From e55c25d2cd518b11a87cfae98348bc7606c1925e Mon Sep 17 00:00:00 2001
From: John Bradshaw <john@johnbradshaw.org>
Date: Wed, 13 May 2020 11:47:52 +0300
Subject: [PATCH 659/667] Fix various spelling mistakes in the man page

---
 popt.3 | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/popt.3 b/popt.3
index 5d5a556..2293481 100644
--- a/popt.3
+++ b/popt.3
@@ -200,7 +200,7 @@ arguments.
 .RB "This macro includes another option table (via " POPT_ARG_INCLUDE_TABLE
 ; see below) in the main one which provides the table entries for these
 .RB "arguments. When " --usage " or " --help " are passed to programs which
-use popt's automatical help, popt displays the appropriate message on 
+use popt's automatic help, popt displays the appropriate message on
 stderr as soon as it finds the option, and exits the program with a
 return code of 0. If you want to use popt's automatic help generation in
 a different way, you need to explicitly add the option entries to your programs 
@@ -210,7 +210,7 @@ If the \fIargInfo\fR value is bitwise or'd with \fBPOPT_ARGFLAG_DOC_HIDDEN\fR,
 the argument will not be shown in help output.
 .sp
 If the \fIargInfo\fR value is bitwise or'd with \fBPOPT_ARGFLAG_SHOW_DEFAULT\fR,
-the inital value of the arg will be shown in help output.
+the initial value of the arg will be shown in help output.
 .sp
 The final structure in the table should have all the pointer values set
 .RB "to " NULL " and all the arithmetic values set to 0, marking the "
@@ -233,7 +233,7 @@ automatic help generation is being used, the \fIdescrip\fR field should
 contain a overall description of the option table being included.
 .sp
 The other special option table entry type tells popt to call a function (a
-callback) when any option in that table is found. This is especially usefull
+callback) when any option in that table is found. This is especially useful
 when included option tables are being used, as the program which provides
 the top-level option table doesn't need to be aware of the other options
 which are provided by the included table. When a callback is set for
@@ -473,7 +473,7 @@ A parsed string has a quotation mismatch (such as a single quotation
 .TP
 .B POPT_ERROR_BADNUMBER
 A conversion from a string to a number (int or long) failed due
-to the string containing nonnumeric characters. This occurs when
+to the string containing non-numeric characters. This occurs when
 .BR poptGetNextOpt() " is processing an argument of type " 
 .BR POPT_ARG_INT ", " POPT_ARG_SHORT ", " POPT_ARG_LONG ", " POPT_ARG_LONGLONG ", "
 .RB POPT_ARG_FLOAT ", or " POPT_ARG_DOUBLE "."  
@@ -517,7 +517,7 @@ These two functions make popt error handling trivial for most
 applications. When an error is detected from most of the functions, 
 an error message is printed along with the error string from 
 .BR poptStrerror() ". When an error occurs during argument parsing, "
-code similiar to the following displays a useful error message:
+code similar to the following displays a useful error message:
 .sp
 .nf
 fprintf(stderr, "%s: %s\\n",
@@ -608,7 +608,7 @@ Although popt is usually used for parsing arguments already divided into
 .RI "an " argv "-style array, some programs need to parse strings that "
 are formatted identically to command lines. To facilitate this, popt 
 provides a function that parses a string into an array of strings, 
-using rules similiar to normal shell parsing.
+using rules similar to normal shell parsing.
 .sp
 .nf
 .B "#include <popt.h>"
-- 
Gitee


From f691e0c0b7126a9a47aa872628476ad237d6893d Mon Sep 17 00:00:00 2001
From: Robert Scheck <robert@fedoraproject.org>
Date: Wed, 13 May 2020 11:50:37 +0300
Subject: [PATCH 660/667] Fix pkgconfig install directory to use $(lib) over
 hardcoded "lib"

---
 Makefile.am | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Makefile.am b/Makefile.am
index 78834ed..e4fac51 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -6,7 +6,7 @@ EXTRA_DIST = autogen.sh CHANGES $(man_MANS) ci/Dockerfile build-aux popt.pdf
 
 SUBDIRS = src po auto tests
 
-pkgconfigdir = $(prefix)/lib/pkgconfig
+pkgconfigdir = $(libdir)/pkgconfig
 pkgconfig_DATA = popt.pc
 
 man_MANS = popt.3
-- 
Gitee


From c428bddb055e1981b42b2e687c8d419a4484cf24 Mon Sep 17 00:00:00 2001
From: Panu Matilainen <pmatilai@redhat.com>
Date: Wed, 13 May 2020 13:22:42 +0300
Subject: [PATCH 661/667] Use secure_getenv() for getenv() if available

glibc 2.17 renamed __secure_getenv() to secure_getenv(). So now we
need to check for both, meh.
---
 configure.ac | 2 +-
 src/system.h | 4 +++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/configure.ac b/configure.ac
index a2717bc..57a7e4b 100755
--- a/configure.ac
+++ b/configure.ac
@@ -50,7 +50,7 @@ AC_ARG_ENABLE(build-gcov,
 ])
 
 AC_SEARCH_LIBS(setreuid, [ucb])
-AC_CHECK_FUNCS(getuid geteuid iconv mtrace __secure_getenv setreuid setuid stpcpy strerror vasprintf srandom)
+AC_CHECK_FUNCS(getuid geteuid iconv mtrace secure_getenv __secure_getenv setreuid setuid stpcpy strerror vasprintf srandom)
 
 AM_GNU_GETTEXT_VERSION([0.18.2])
 AM_GNU_GETTEXT([external])
diff --git a/src/system.h b/src/system.h
index 7f8d71e..aac10b7 100644
--- a/src/system.h
+++ b/src/system.h
@@ -53,7 +53,9 @@ static inline char * stpcpy (char *dest, const char * src) {
 #define	xstrdup(_str)	strdup(_str)
 #endif  /* defined(HAVE_MCHECK_H) && defined(__GNUC__) */
 
-#if defined(HAVE___SECURE_GETENV)
+#if defined(HAVE_SECURE_GETENV)
+#define getenv(_s)	secure_getenv(_s)
+#elif defined(HAVE___SECURE_GETENV)
 #define	getenv(_s)	__secure_getenv(_s)
 #endif
 
-- 
Gitee


From 1a5d4d3a517084e68238988a84681d3f596570bb Mon Sep 17 00:00:00 2001
From: Andreas Schwab <schwab@suse.de>
Date: Wed, 13 May 2020 14:17:34 +0300
Subject: [PATCH 662/667] Fix alignment checks, use stdalign.h when available

---
 configure.ac |  2 +-
 src/popt.c   | 21 +++++++++++++--------
 2 files changed, 14 insertions(+), 9 deletions(-)

diff --git a/configure.ac b/configure.ac
index 57a7e4b..9d27fc5 100755
--- a/configure.ac
+++ b/configure.ac
@@ -18,7 +18,7 @@ AC_PROG_LIBTOOL
 
 AC_SYS_LARGEFILE
 
-AC_CHECK_HEADERS(fnmatch.h glob.h langinfo.h libintl.h mcheck.h)
+AC_CHECK_HEADERS(fnmatch.h glob.h langinfo.h libintl.h mcheck.h stdalign.h)
 
 # For some systems we know that we have ld_version scripts.
 # Use it then as default.
diff --git a/src/popt.c b/src/popt.c
index d4c357d..eee01cb 100644
--- a/src/popt.c
+++ b/src/popt.c
@@ -18,6 +18,15 @@
 
 #include "poptint.h"
 
+#ifdef HAVE_STDALIGN_H
+#include <stdalign.h>
+#define ALIGNOF(x) alignof(x)
+#elif defined __GNUC__
+#define ALIGNOF(x) __alignof__(x)
+#else
+#define ALIGNOF(x) sizeof(x)
+#endif
+
 #ifdef	MYDEBUG
 int _popt_debug = 0;
 #endif
@@ -894,12 +903,8 @@ static unsigned int seed = 0;
 
 int poptSaveLongLong(long long * arg, unsigned int argInfo, long long aLongLong)
 {
-    if (arg == NULL
-#ifdef	NOTYET
     /* XXX Check alignment, may fail on funky platforms. */
-     || (((unsigned long long)arg) & (sizeof(*arg)-1))
-#endif
-    )
+    if (arg == NULL || (((unsigned long)arg) & (ALIGNOF(*arg)-1)))
 	return POPT_ERROR_NULLARG;
 
     if (aLongLong != 0 && LF_ISSET(RANDOM)) {
@@ -940,7 +945,7 @@ int poptSaveLongLong(long long * arg, unsigned int argInfo, long long aLongLong)
 int poptSaveLong(long * arg, unsigned int argInfo, long aLong)
 {
     /* XXX Check alignment, may fail on funky platforms. */
-    if (arg == NULL || (((unsigned long)arg) & (sizeof(*arg)-1)))
+    if (arg == NULL || (((unsigned long)arg) & (ALIGNOF(*arg)-1)))
 	return POPT_ERROR_NULLARG;
 
     if (aLong != 0 && LF_ISSET(RANDOM)) {
@@ -973,7 +978,7 @@ int poptSaveLong(long * arg, unsigned int argInfo, long aLong)
 int poptSaveInt(int * arg, unsigned int argInfo, long aLong)
 {
     /* XXX Check alignment, may fail on funky platforms. */
-    if (arg == NULL || (((unsigned long)arg) & (sizeof(*arg)-1)))
+    if (arg == NULL || (((unsigned long)arg) & (ALIGNOF(*arg)-1)))
 	return POPT_ERROR_NULLARG;
 
     if (aLong != 0 && LF_ISSET(RANDOM)) {
@@ -1006,7 +1011,7 @@ int poptSaveInt(int * arg, unsigned int argInfo, long aLong)
 int poptSaveShort(short * arg, unsigned int argInfo, long aLong)
 {
     /* XXX Check alignment, may fail on funky platforms. */
-    if (arg == NULL || (((unsigned long)arg) & (sizeof(*arg)-1)))
+    if (arg == NULL || (((unsigned long)arg) & (ALIGNOF(*arg)-1)))
 	return POPT_ERROR_NULLARG;
 
     if (aLong != 0 && LF_ISSET(RANDOM)) {
-- 
Gitee


From 0b08ea5b9b669af3a57346661e61c767cf2583fc Mon Sep 17 00:00:00 2001
From: Panu Matilainen <pmatilai@redhat.com>
Date: Wed, 13 May 2020 12:39:04 +0300
Subject: [PATCH 663/667] Kludge poptBadOption() to return something
 semi-meaningful on exec alias fail

poptBadOption() is totally unaware of exec alias failures, and will return
either the first argument or last option, giving wonderfully misleading
error messages, such as

    $ rpm -q --specfile foo.spec
    rpm: foo.spec: No such file or directory

...when it's the file to be exec'ed that is actually missing. Reported
multiple times, at least
https://bugzilla.redhat.com/show_bug.cgi?id=710267 and
https://bugzilla.redhat.com/show_bug.cgi?id=697435

Remember execvp() first argument on failure and return that from
poptBadOption() if present to give the user more of a reasonable clue
what exactly went wrong.
---
 src/popt.c    | 21 +++++++++++++++++----
 src/poptint.h |  1 +
 2 files changed, 18 insertions(+), 4 deletions(-)

diff --git a/src/popt.c b/src/popt.c
index eee01cb..2db2bbd 100644
--- a/src/popt.c
+++ b/src/popt.c
@@ -174,6 +174,7 @@ poptContext poptGetContext(const char * name, int argc, const char ** argv,
     con->flags = flags;
     con->execs = NULL;
     con->numExecs = 0;
+    con->execFail = NULL;
     con->finalArgvAlloced = argc * 2;
     con->finalArgv = calloc( (size_t)con->finalArgvAlloced, sizeof(*con->finalArgv) );
     con->execAbsolute = 1;
@@ -215,6 +216,7 @@ void poptResetContext(poptContext con)
     con->nextLeftover = 0;
     con->restLeftover = 0;
     con->doExec = NULL;
+    con->execFail = _free(con->execFail);
 
     if (con->finalArgv != NULL)
     for (i = 0; i < con->finalArgvCount; i++) {
@@ -528,6 +530,9 @@ if (_popt_debug)
 
     rc = execvp(argv[0], (char *const *)argv);
 
+    /* only reached on execvp() failure */
+    con->execFail = xstrdup(argv[0]);
+
 exit:
     if (argv) {
         if (argv[0])
@@ -1598,11 +1603,19 @@ int poptAddItem(poptContext con, poptItem newItem, int flags)
 const char * poptBadOption(poptContext con, unsigned int flags)
 {
     struct optionStackEntry * os = NULL;
+    const char *badOpt = NULL;
+
+    if (con != NULL) {
+       /* Stupid hack to return something semi-meaningful from exec failure */
+       if (con->execFail) {
+           badOpt = con->execFail;
+       } else {
+           os = (flags & POPT_BADOPTION_NOALIAS) ? con->optionStack : con->os;
+           badOpt = os->argv[os->next - 1];
+       }
+    }
 
-    if (con != NULL)
-	os = (flags & POPT_BADOPTION_NOALIAS) ? con->optionStack : con->os;
-
-    return (os != NULL && os->argv != NULL ? os->argv[os->next - 1] : NULL);
+    return badOpt;
 }
 
 const char * poptStrerror(const int error)
diff --git a/src/poptint.h b/src/poptint.h
index ab5d06e..b64e123 100644
--- a/src/poptint.h
+++ b/src/poptint.h
@@ -103,6 +103,7 @@ struct poptContext_s {
     unsigned int flags;
     poptItem execs;
     int numExecs;
+    char * execFail;
     poptArgv finalArgv;
     int finalArgvCount;
     int finalArgvAlloced;
-- 
Gitee


From 83302258da3d54257dffb01297131065c683aa90 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Miloslav=20Trma=C4=8D?= <mitr@redhat.com>
Date: Wed, 13 May 2020 12:32:44 +0300
Subject: [PATCH 664/667] Fix help messages for --help and --usage not getting
 translated

There already was some i18n support for autohelp in popt.c, but not in
popthelp.c, where it actually matters.

See https://bugzilla.redhat.com/show_bug.cgi?id=734434 for further details.
Patch co-authored by Akira Tagoh.
---
 src/popthelp.c | 41 +++++++++++++++++++++++++++++------------
 1 file changed, 29 insertions(+), 12 deletions(-)

diff --git a/src/popthelp.c b/src/popthelp.c
index e5c2e30..3c05acb 100644
--- a/src/popthelp.c
+++ b/src/popthelp.c
@@ -75,7 +75,7 @@ static struct poptOption poptHelpOptions2[] = {
   { "defaults", '\0', POPT_ARG_NONE, &show_option_defaults, 0,
 	N_("Display option defaults in message"), NULL },
 #endif
-  { "", '\0',	0, NULL, 0, N_("Terminate options"), NULL },
+  { NULL, '\0',	0, NULL, 0, N_("Terminate options"), NULL },
     POPT_TABLEEND
 } ;
 
@@ -494,8 +494,12 @@ static size_t maxArgWidth(const struct poptOption * opt,
     if (opt != NULL)
     while (opt->longName || opt->shortName || opt->arg) {
 	if (poptArgType(opt) == POPT_ARG_INCLUDE_TABLE) {
-	    if (opt->arg)	/* XXX program error */
-	        len = maxArgWidth(opt->arg, translation_domain);
+	    void * arg = opt->arg;
+	    /* XXX sick hack to preserve pretense of ABI. */
+	    if (arg == poptHelpOptions)
+		arg = poptHelpOptionsI18N;
+	    if (arg)	/* XXX program error */
+		len = maxArgWidth(arg, translation_domain);
 	    if (len > max) max = len;
 	} else if (!F_ISSET(opt, DOC_HIDDEN)) {
 	    len = sizeof("  ")-1;
@@ -581,19 +585,23 @@ static void singleTableHelp(poptContext con, FILE * fp,
 
     if (table != NULL)
     for (opt = table; opt->longName || opt->shortName || opt->arg; opt++) {
+	void * arg = opt->arg;
 	if (poptArgType(opt) != POPT_ARG_INCLUDE_TABLE)
 	    continue;
-	sub_transdom = getTableTranslationDomain(opt->arg);
+	/* XXX sick hack to preserve pretense of ABI. */
+	if (arg == poptHelpOptions)
+	    arg = poptHelpOptionsI18N;
+	sub_transdom = getTableTranslationDomain(arg);
 	if (sub_transdom == NULL)
 	    sub_transdom = translation_domain;
 	    
 	/* If no popt aliases/execs, skip poptAliasOption processing. */
-	if (opt->arg == poptAliasOptions && !(con->numAliases || con->numExecs))
+	if (arg == poptAliasOptions && !(con->numAliases || con->numExecs))
 	    continue;
 	if (opt->descrip)
 	    POPT_fprintf(fp, "\n%s\n", D_(sub_transdom, opt->descrip));
 
-	singleTableHelp(con, fp, opt->arg, columns, sub_transdom);
+	singleTableHelp(con, fp, arg, columns, sub_transdom);
     }
 }
 
@@ -759,20 +767,24 @@ static size_t singleTableUsage(poptContext con, FILE * fp, columns_t columns,
 	    translation_domain = (const char *)opt->arg;
 	} else
 	if (poptArgType(opt) == POPT_ARG_INCLUDE_TABLE) {
+	    void * arg = opt->arg;
+	    /* XXX sick hack to preserve pretense of ABI. */
+	    if (arg == poptHelpOptions)
+		arg = poptHelpOptionsI18N;
 	    if (done) {
 		int i = 0;
 		if (done->opts != NULL)
 		for (i = 0; i < done->nopts; i++) {
 		    const void * that = done->opts[i];
-		    if (that == NULL || that != opt->arg)
+		    if (that == NULL || that != arg)
 			continue;
 		    break;
 		}
 		/* Skip if this table has already been processed. */
-		if (opt->arg == NULL || i < done->nopts)
+		if (arg == NULL || i < done->nopts)
 		    continue;
 		if (done->opts != NULL && done->nopts < done->maxopts)
-		    done->opts[done->nopts++] = (const void *) opt->arg;
+		    done->opts[done->nopts++] = (const void *) arg;
 	    }
 	    columns->cur = singleTableUsage(con, fp, columns, opt->arg,
 			translation_domain, done);
@@ -812,9 +824,14 @@ static size_t showShortOptions(const struct poptOption * opt, FILE * fp,
 	    if (!strchr(s, opt->shortName) && isprint((int)opt->shortName)
 	     && opt->shortName != ' ')
 		s[strlen(s)] = opt->shortName;
-	} else if (poptArgType(opt) == POPT_ARG_INCLUDE_TABLE)
-	    if (opt->arg)	/* XXX program error */
-		len = showShortOptions(opt->arg, fp, s);
+	} else if (poptArgType(opt) == POPT_ARG_INCLUDE_TABLE) {
+	    void * arg = opt->arg;
+	    /* XXX sick hack to preserve pretense of ABI. */
+	    if (arg == poptHelpOptions)
+		arg = poptHelpOptionsI18N;
+	    if (arg)	/* XXX program error */
+		len = showShortOptions(arg, fp, s);
+	}
     } 
 
     /* On return to top level, print the short options, return print length. */
-- 
Gitee


From 220530ee7e18b23a83c11f9bea57c53717e85198 Mon Sep 17 00:00:00 2001
From: Panu Matilainen <pmatilai@redhat.com>
Date: Tue, 19 May 2020 12:12:17 +0300
Subject: [PATCH 665/667] Remove defunct API checking stuff

Nothing wrong with an integrated API/ABI checker but this one calls
an uknown version of an unknown Perl script from 10+ years ago whose
upstream seems to have vanished in the meanwhile. If somebody wants
to resurrect this one day the stuff is preserved in git...
---
 Makefile.am      |   2 +-
 auto/Makefile.am |  12 ----
 auto/desc.in     |  28 ---------
 auto/types.in    | 147 -----------------------------------------------
 configure.ac     |   1 -
 5 files changed, 1 insertion(+), 189 deletions(-)
 delete mode 100644 auto/Makefile.am
 delete mode 100644 auto/desc.in
 delete mode 100644 auto/types.in

diff --git a/Makefile.am b/Makefile.am
index e4fac51..e2cbfa7 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -4,7 +4,7 @@ MCCABE =	pmccabe
 
 EXTRA_DIST = autogen.sh CHANGES $(man_MANS) ci/Dockerfile build-aux popt.pdf
 
-SUBDIRS = src po auto tests
+SUBDIRS = src po tests
 
 pkgconfigdir = $(libdir)/pkgconfig
 pkgconfig_DATA = popt.pc
diff --git a/auto/Makefile.am b/auto/Makefile.am
deleted file mode 100644
index 56bb292..0000000
--- a/auto/Makefile.am
+++ /dev/null
@@ -1,12 +0,0 @@
-AUTOMAKE_OPTIONS = 1.4 foreign
-
-AUTOTEST =      api-sanity-autotest.pl
-
-TDIRS =		descriptors_storage header_compile_errors test_results tests
-
-clean-local:
-	rm -rf $(TDIRS)
-
-check-local:
-	-[ -d tests ] && ${AUTOTEST} -l popt -d desc -clean
-	-${AUTOTEST} -l popt -d desc -st types -gen -build -run
diff --git a/auto/desc.in b/auto/desc.in
deleted file mode 100644
index 32bdc3b..0000000
--- a/auto/desc.in
+++ /dev/null
@@ -1,28 +0,0 @@
-<version>
-  1.15
-</version>
- 
-<headers>
-  popt.h
-</headers>
- 
-<libs>
-  @abs_top_builddir@/.libs/libpopt.so
-</libs>
-
-<include_paths>
-  @abs_top_srcdir@
-</include_paths>
-
-<gcc_options>
-  @CFLAGS@
-</gcc_options>
-
-<opaque_types>
-</opaque_types>
-<skip_interfaces>
-</skip_interfaces>
-<include_preamble>
-</include_preamble>
-<libs_depend>
-</libs_depend>
diff --git a/auto/types.in b/auto/types.in
deleted file mode 100644
index 74a6c33..0000000
--- a/auto/types.in
+++ /dev/null
@@ -1,147 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<collection>
-
-<spec_type>
-  <kind> common_env </kind>
-  <global_code>
-    static int aVal = 141421;
-    static unsigned int aFlag = 0x8aceU;
-
-    static short aShort = (short)4523;
-    static int aInt = 271828;
-    static long aLong = 738905609L;
-    static long long aLongLong = 738905609LL;
-    static float aFloat = 3.1415926535;
-    static double aDouble = 9.86960440108935861883;
-    static const char ** aArgv = NULL;
-
-    static struct poptOption optionsTable[] = {
-      { "val", '\0', POPT_ARG_VAL | POPT_ARGFLAG_SHOW_DEFAULT, &aVal, 125992,
-    	"POPT_ARG_VAL: 125992 141421", 0},
-      { "int", 'i', POPT_ARG_INT | POPT_ARGFLAG_SHOW_DEFAULT, &aInt, 0,
-    	"POPT_ARG_INT: 271828", NULL },
-      { "short", 's', POPT_ARG_SHORT | POPT_ARGFLAG_SHOW_DEFAULT, &aShort, 0,
-    	"POPT_ARG_SHORT: 4523", NULL },
-      { "long", 'l', POPT_ARG_LONG | POPT_ARGFLAG_SHOW_DEFAULT, &aLong, 0,
-    	"POPT_ARG_LONG: 738905609", NULL },
-      { "longlong", 'L', POPT_ARG_LONGLONG | POPT_ARGFLAG_SHOW_DEFAULT, &aLongLong, 0,
-    	"POPT_ARG_LONGLONG: 738905609", NULL },
-      { "float", 'f', POPT_ARG_FLOAT | POPT_ARGFLAG_SHOW_DEFAULT, &aFloat, 0,
-    	"POPT_ARG_FLOAT: 3.14159", NULL },
-      { "double", 'd', POPT_ARG_DOUBLE | POPT_ARGFLAG_SHOW_DEFAULT, &aDouble, 0,
-    	"POPT_ARG_DOUBLE: 9.8696", NULL },
-      { "argv", '\0', POPT_ARG_ARGV, &aArgv, 0,
-    	"POPT_ARG_ARGV: append string to argv array (can be used multiple times)","STRING"},
-      POPT_AUTOALIAS
-      POPT_AUTOHELP
-      POPT_TABLEEND
-    };
-  </global_code>
-</spec_type>
-
-<spec_type>
-  <kind> common_param </kind>
-  <data_type> poptContext </data_type>
-  <value> poptGetContext(argv[0], argc, argv, optionsTable, 0) </value>
-  <final_code>
-    $0 = poptFreeContext($0);
-  </final_code>
-  <associating>
-    <except>
-      poptAddItem	<!-- FIXME -->
-    </except>
-  </associating>
-</spec_type>
-<spec_type>
-  <kind> normal </kind>
-  <data_type> poptContext </data_type>
-  <value> poptGetContext(argv[0], argc, argv, optionsTable, 0) </value>
-  <associating>
-    <interfaces>
-      poptFreeContext
-      poptFini
-    </interfaces>
-    <links> param1 </links>
-  </associating>
-</spec_type>
-<spec_type>
-  <kind> normal </kind>
-  <data_type> poptItem </data_type>
-  <value> NULL </value>
-  <global_code>
-    #include <malloc.h>
-  </global_code>
-  <init_code>
-    $0 = calloc(1, sizeof(*$0));
-    $0->option = *poptHelpOptionsI18N;
-    $0->argc = 1;
-    $0->argv = calloc(2, sizeof(*$0->argv));
-    $0->argv[0] = strdup("arg1");
-  </init_code>
-  <associating>
-    <interfaces> poptAddItem </interfaces>
-    <links> param2 </links>
-  </associating>
-</spec_type>
-
-<spec_type>
-  <kind> common_param </kind>
-  <data_type> struct poptAlias </data_type>
-  <value> _alias </value>
-  <global_code>
-    #include <malloc.h>
-    static struct poptAlias _alias = {
-      .longName = "longName",
-      .shortName = 'l',
-      .argc = 0,
-      .argv = NULL
-    };
-  </global_code>
-  <init_code>
-    $0.argc = 1;
-    $0.argv = calloc($0.argc + 1, sizeof(*$0.argv));
-    $0.argv[0] = strdup("arg1");
-  </init_code>
-</spec_type>
-
-<spec_type>
-  <kind> common_param </kind>
-  <name> poptBits </name>
-  <data_type> poptBits </data_type>
-  <value>
-    create_poptBits()
-  </value>
-  <global_code>
-    poptBits create_poptBits()
-    {
-	poptBits a = NULL;
-	(void) poptSaveBits(&a, 0, "foo");
-	(void) poptSaveBits(&a, 0, "bar");
-	(void) poptSaveBits(&a, 0, "baz");
-	return a;
-    }
-  </global_code>
-</spec_type>
-
-<spec_type>
-  <kind> normal </kind>
-  <data_type> const char *** </data_type>
-  <value> &av </value>
-  <global_code>
-    #include <malloc.h>
-  </global_code>
-  <init_code>
-    const char ** av = NULL;
-  </init_code>
-  <final_code>
-    free(av[0]);
-    free(av);
-  </final_code>
-  <associating>
-    <interfaces> poptSaveString </interfaces>
-    <links> param1 </links>
-  </associating>
-</spec_type>
-
-</collection>
-
diff --git a/configure.ac b/configure.ac
index 9d27fc5..a521102 100755
--- a/configure.ac
+++ b/configure.ac
@@ -59,6 +59,5 @@ AM_ICONV_LINK
 AC_CONFIG_SUBDIRS()
 AC_CONFIG_FILES([ po/Makefile.in
     Doxyfile Makefile src/Makefile popt.pc tests/test-poptrc tests/Makefile
-    auto/Makefile auto/desc auto/types
 ])
 AC_OUTPUT
-- 
Gitee


From b5d8830da408fc410c729727c06179b8b6c9811a Mon Sep 17 00:00:00 2001
From: Panu Matilainen <pmatilai@redhat.com>
Date: Tue, 19 May 2020 12:27:05 +0300
Subject: [PATCH 666/667] Preparing for popt 1.18 rc1

Note that we're bumping the library revision here for the first time ever,
popt has been a bad bad boy when it comes to libtool versioning. It has
been using symbol versioning for the last few versions but it's no
excuse to totally neglet the library versions (not all platforms support
symbol versioning to begin with). OTOH this way, it serves to mark
the beginning of a new era in popt maintainership.
---
 configure.ac    |  2 +-
 po/cs.po        | 32 ++++++++++++++++----------------
 po/da.po        | 32 ++++++++++++++++----------------
 po/de.po        | 32 ++++++++++++++++----------------
 po/eo.po        | 32 ++++++++++++++++----------------
 po/es.po        | 32 ++++++++++++++++----------------
 po/fi.po        | 32 ++++++++++++++++----------------
 po/fr.po        | 32 ++++++++++++++++----------------
 po/ga.po        | 32 ++++++++++++++++----------------
 po/gl.po        | 32 ++++++++++++++++----------------
 po/hu.po        | 32 ++++++++++++++++----------------
 po/id.po        | 32 ++++++++++++++++----------------
 po/is.po        | 32 ++++++++++++++++----------------
 po/it.po        | 32 ++++++++++++++++----------------
 po/ja.po        | 32 ++++++++++++++++----------------
 po/ko.po        | 32 ++++++++++++++++----------------
 po/lv.po        | 32 ++++++++++++++++----------------
 po/nb.po        | 32 ++++++++++++++++----------------
 po/nl.po        | 32 ++++++++++++++++----------------
 po/pl.po        | 32 ++++++++++++++++----------------
 po/popt.pot     | 34 +++++++++++++++++-----------------
 po/pt.po        | 32 ++++++++++++++++----------------
 po/ro.po        | 32 ++++++++++++++++----------------
 po/ru.po        | 32 ++++++++++++++++----------------
 po/sk.po        | 32 ++++++++++++++++----------------
 po/sl.po        | 32 ++++++++++++++++----------------
 po/sv.po        | 32 ++++++++++++++++----------------
 po/th.po        | 32 ++++++++++++++++----------------
 po/tr.po        | 32 ++++++++++++++++----------------
 po/uk.po        | 32 ++++++++++++++++----------------
 po/vi.po        | 32 ++++++++++++++++----------------
 po/wa.po        | 32 ++++++++++++++++----------------
 po/zh_CN.po     | 32 ++++++++++++++++----------------
 po/zh_TW.po     | 32 ++++++++++++++++----------------
 src/Makefile.am |  2 +-
 35 files changed, 531 insertions(+), 531 deletions(-)

diff --git a/configure.ac b/configure.ac
index a521102..69e6d1a 100755
--- a/configure.ac
+++ b/configure.ac
@@ -1,5 +1,5 @@
 AC_PREREQ(2.57)
-AC_INIT(popt, 1.16, rpm-maint@lists.rpm.org)
+AC_INIT(popt, 1.18-rc1, rpm-maint@lists.rpm.org)
 AC_CONFIG_SRCDIR([src/popt.h])
 AC_CONFIG_HEADERS([config.h])
 
diff --git a/po/cs.po b/po/cs.po
index f9c2418..276fafb 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.14\n"
 "Report-Msgid-Bugs-To: <rpm-maint@lists.rpm.org>\n"
-"POT-Creation-Date: 2020-05-13 11:40+0300\n"
+"POT-Creation-Date: 2020-05-18 15:51+0300\n"
 "PO-Revision-Date: 2008-12-08 19:55+0100\n"
 "Last-Translator: Petr Pisar <petr.pisar@atlas.cz>\n"
 "Language-Team: Czech <translation-team-cs@lists.sourceforge.net>\n"
@@ -17,56 +17,56 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: src/popt.c:37
+#: src/popt.c:46
 msgid "unknown errno"
 msgstr "neznámé číslo chyby"
 
-#: src/popt.c:1196
+#: src/popt.c:1206
 #, c-format
 msgid "option type (%u) not implemented in popt\n"
 msgstr "typ volby (%u) není v popt implementován\n"
 
-#: src/popt.c:1607
+#: src/popt.c:1625
 msgid "missing argument"
 msgstr "chybí argument"
 
-#: src/popt.c:1609
+#: src/popt.c:1627
 msgid "unknown option"
 msgstr "neznámá volba"
 
-#: src/popt.c:1611
+#: src/popt.c:1629
 msgid "mutually exclusive logical operations requested"
 msgstr "požadovány vzájemně výlučné logické operace"
 
-#: src/popt.c:1613
+#: src/popt.c:1631
 msgid "opt->arg should not be NULL"
 msgstr "opt->arg nesmí být NULL"
 
-#: src/popt.c:1615
+#: src/popt.c:1633
 msgid "aliases nested too deeply"
 msgstr "aliasy vnořené příliš hluboko"
 
-#: src/popt.c:1617
+#: src/popt.c:1635
 msgid "error in parameter quoting"
 msgstr "chyba v quotování parametrů"
 
-#: src/popt.c:1619
+#: src/popt.c:1637
 msgid "invalid numeric value"
 msgstr "chybná numerická hodnota"
 
-#: src/popt.c:1621
+#: src/popt.c:1639
 msgid "number too large or too small"
 msgstr "číslo je příliš velké nebo příliš malé"
 
-#: src/popt.c:1623
+#: src/popt.c:1641
 msgid "memory allocation failed"
 msgstr "selhala alokace paměti"
 
-#: src/popt.c:1625
+#: src/popt.c:1643
 msgid "config file failed sanity test"
 msgstr ""
 
-#: src/popt.c:1629
+#: src/popt.c:1647
 msgid "unknown error"
 msgstr "neznámá chyba"
 
@@ -134,10 +134,10 @@ msgstr "DOUBLE"
 msgid "ARG"
 msgstr "ARG"
 
-#: src/popthelp.c:608
+#: src/popthelp.c:616
 msgid "Usage:"
 msgstr "Použití:"
 
-#: src/popthelp.c:630
+#: src/popthelp.c:638
 msgid "[OPTION...]"
 msgstr "[VOLBY…]"
diff --git a/po/da.po b/po/da.po
index d23aca1..ca851a3 100644
--- a/po/da.po
+++ b/po/da.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: popt-1.14\n"
 "Report-Msgid-Bugs-To: <rpm-maint@lists.rpm.org>\n"
-"POT-Creation-Date: 2020-05-13 11:40+0300\n"
+"POT-Creation-Date: 2020-05-18 15:51+0300\n"
 "PO-Revision-Date: 2008-09-15 00:00+0000\n"
 "Last-Translator: Joe Hansen <joedalton2@yahoo.dk>\n"
 "Language-Team: Danish <dansk@dansk-gruppen.dk>\n"
@@ -17,56 +17,56 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: src/popt.c:37
+#: src/popt.c:46
 msgid "unknown errno"
 msgstr "ukendt fejlnr."
 
-#: src/popt.c:1196
+#: src/popt.c:1206
 #, c-format
 msgid "option type (%u) not implemented in popt\n"
 msgstr "tilvalgstype (%u) er ikke implementeret i popt\n"
 
-#: src/popt.c:1607
+#: src/popt.c:1625
 msgid "missing argument"
 msgstr "mangler argument"
 
-#: src/popt.c:1609
+#: src/popt.c:1627
 msgid "unknown option"
 msgstr "ukendt tilvalg"
 
-#: src/popt.c:1611
+#: src/popt.c:1629
 msgid "mutually exclusive logical operations requested"
 msgstr "de ønskede handlinger udelukker hinanden"
 
-#: src/popt.c:1613
+#: src/popt.c:1631
 msgid "opt->arg should not be NULL"
 msgstr "opt->arg bør ikke være NULL"
 
-#: src/popt.c:1615
+#: src/popt.c:1633
 msgid "aliases nested too deeply"
 msgstr "aliaser er for dybt indlejret"
 
-#: src/popt.c:1617
+#: src/popt.c:1635
 msgid "error in parameter quoting"
 msgstr "fejl i parameter citering"
 
-#: src/popt.c:1619
+#: src/popt.c:1637
 msgid "invalid numeric value"
 msgstr "ugyldig numerisk værdi"
 
-#: src/popt.c:1621
+#: src/popt.c:1639
 msgid "number too large or too small"
 msgstr "nummer for stort, eller for lille"
 
-#: src/popt.c:1623
+#: src/popt.c:1641
 msgid "memory allocation failed"
 msgstr "hukommelsestildeling mislykkedes"
 
-#: src/popt.c:1625
+#: src/popt.c:1643
 msgid "config file failed sanity test"
 msgstr ""
 
-#: src/popt.c:1629
+#: src/popt.c:1647
 msgid "unknown error"
 msgstr "ukendt fejl"
 
@@ -134,10 +134,10 @@ msgstr "DOUBLE"
 msgid "ARG"
 msgstr "ARG"
 
-#: src/popthelp.c:608
+#: src/popthelp.c:616
 msgid "Usage:"
 msgstr "Brug:"
 
-#: src/popthelp.c:630
+#: src/popthelp.c:638
 msgid "[OPTION...]"
 msgstr "[TILVALG...]"
diff --git a/po/de.po b/po/de.po
index 918c7ab..1c20f37 100644
--- a/po/de.po
+++ b/po/de.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.14\n"
 "Report-Msgid-Bugs-To: <rpm-maint@lists.rpm.org>\n"
-"POT-Creation-Date: 2020-05-13 11:40+0300\n"
+"POT-Creation-Date: 2020-05-18 15:51+0300\n"
 "PO-Revision-Date: 2009-11-10 19:58+0100\n"
 "Last-Translator: Roland Illig <roland.illig@gmx.de>\n"
 "Language-Team: German <translation-team-de@lists.sourceforge.net>\n"
@@ -16,56 +16,56 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: src/popt.c:37
+#: src/popt.c:46
 msgid "unknown errno"
 msgstr "Unbekannte Fehler-Nummer"
 
-#: src/popt.c:1196
+#: src/popt.c:1206
 #, c-format
 msgid "option type (%u) not implemented in popt\n"
 msgstr "Optionstyp (%u) ist in popt nicht vorhanden\n"
 
-#: src/popt.c:1607
+#: src/popt.c:1625
 msgid "missing argument"
 msgstr "Fehlendes Argument"
 
-#: src/popt.c:1609
+#: src/popt.c:1627
 msgid "unknown option"
 msgstr "Unbekannte Option"
 
-#: src/popt.c:1611
+#: src/popt.c:1629
 msgid "mutually exclusive logical operations requested"
 msgstr "Gegenseitig ausschließende logische Operatoren"
 
-#: src/popt.c:1613
+#: src/popt.c:1631
 msgid "opt->arg should not be NULL"
 msgstr "opt->arg sollte nicht NULL sein"
 
-#: src/popt.c:1615
+#: src/popt.c:1633
 msgid "aliases nested too deeply"
 msgstr "Aliase zu tief verschachtelt"
 
-#: src/popt.c:1617
+#: src/popt.c:1635
 msgid "error in parameter quoting"
 msgstr "Fehler beim Quotieren der Parameter"
 
-#: src/popt.c:1619
+#: src/popt.c:1637
 msgid "invalid numeric value"
 msgstr "Ungültiger nummerischer Wert"
 
-#: src/popt.c:1621
+#: src/popt.c:1639
 msgid "number too large or too small"
 msgstr "Nummer zu groß oder zu klein"
 
-#: src/popt.c:1623
+#: src/popt.c:1641
 msgid "memory allocation failed"
 msgstr "Speicherzuordnung fehlgeschlagen"
 
-#: src/popt.c:1625
+#: src/popt.c:1643
 msgid "config file failed sanity test"
 msgstr ""
 
-#: src/popt.c:1629
+#: src/popt.c:1647
 msgid "unknown error"
 msgstr "Unbekannter Fehler"
 
@@ -133,10 +133,10 @@ msgstr "DOUBLE"
 msgid "ARG"
 msgstr "ARGUMENT"
 
-#: src/popthelp.c:608
+#: src/popthelp.c:616
 msgid "Usage:"
 msgstr "Verwendung:"
 
-#: src/popthelp.c:630
+#: src/popthelp.c:638
 msgid "[OPTION...]"
 msgstr "[OPTION...]"
diff --git a/po/eo.po b/po/eo.po
index 03c6b6e..6966b33 100644
--- a/po/eo.po
+++ b/po/eo.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.14\n"
 "Report-Msgid-Bugs-To: <rpm-maint@lists.rpm.org>\n"
-"POT-Creation-Date: 2020-05-13 11:40+0300\n"
+"POT-Creation-Date: 2020-05-18 15:51+0300\n"
 "PO-Revision-Date: 2008-08-03 15:50-0300\n"
 "Last-Translator: Felipe Castro <fefcas@gmail.com>\n"
 "Language-Team: Esperanto <translation-team-eo@lists.sourceforge.net>\n"
@@ -15,56 +15,56 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: src/popt.c:37
+#: src/popt.c:46
 msgid "unknown errno"
 msgstr "nekonata erarnumero"
 
-#: src/popt.c:1196
+#: src/popt.c:1206
 #, c-format
 msgid "option type (%u) not implemented in popt\n"
 msgstr "la opcia tipo (%u) ne estas realigita en popt\n"
 
-#: src/popt.c:1607
+#: src/popt.c:1625
 msgid "missing argument"
 msgstr "mankas argumento"
 
-#: src/popt.c:1609
+#: src/popt.c:1627
 msgid "unknown option"
 msgstr "nekonata opcio"
 
-#: src/popt.c:1611
+#: src/popt.c:1629
 msgid "mutually exclusive logical operations requested"
 msgstr "reciprokaj logikaj operacioj estas postulataj"
 
-#: src/popt.c:1613
+#: src/popt.c:1631
 msgid "opt->arg should not be NULL"
 msgstr "opt->arg ne devus esti NULL"
 
-#: src/popt.c:1615
+#: src/popt.c:1633
 msgid "aliases nested too deeply"
 msgstr "kromnomoj estas ingitaj tro profunde"
 
-#: src/popt.c:1617
+#: src/popt.c:1635
 msgid "error in parameter quoting"
 msgstr "eraro en parametra citado"
 
-#: src/popt.c:1619
+#: src/popt.c:1637
 msgid "invalid numeric value"
 msgstr "nevalida numera valoro"
 
-#: src/popt.c:1621
+#: src/popt.c:1639
 msgid "number too large or too small"
 msgstr "numero tro granda aŭ tro eta"
 
-#: src/popt.c:1623
+#: src/popt.c:1641
 msgid "memory allocation failed"
 msgstr "malsukceso dum okupado de memoro"
 
-#: src/popt.c:1625
+#: src/popt.c:1643
 msgid "config file failed sanity test"
 msgstr ""
 
-#: src/popt.c:1629
+#: src/popt.c:1647
 msgid "unknown error"
 msgstr "nekonata eraro"
 
@@ -132,10 +132,10 @@ msgstr "DOUBLE"
 msgid "ARG"
 msgstr "ARG"
 
-#: src/popthelp.c:608
+#: src/popthelp.c:616
 msgid "Usage:"
 msgstr "Uzado:"
 
-#: src/popthelp.c:630
+#: src/popthelp.c:638
 msgid "[OPTION...]"
 msgstr "[OPCIO...]"
diff --git a/po/es.po b/po/es.po
index 471601e..ee22d54 100644
--- a/po/es.po
+++ b/po/es.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.12\n"
 "Report-Msgid-Bugs-To: <rpm-maint@lists.rpm.org>\n"
-"POT-Creation-Date: 2020-05-13 11:40+0300\n"
+"POT-Creation-Date: 2020-05-18 15:51+0300\n"
 "PO-Revision-Date: 2007-12-28 12:22+0100\n"
 "Last-Translator: Leandro Lucarella <luca@linuxmendoza.org.ar>\n"
 "Language-Team: Spanish <es@li.org>\n"
@@ -15,56 +15,56 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: src/popt.c:37
+#: src/popt.c:46
 msgid "unknown errno"
 msgstr "errno desconocido"
 
-#: src/popt.c:1196
+#: src/popt.c:1206
 #, fuzzy, c-format
 msgid "option type (%u) not implemented in popt\n"
 msgstr "tipo de opción (%d) no implementada en popt\n"
 
-#: src/popt.c:1607
+#: src/popt.c:1625
 msgid "missing argument"
 msgstr "falta argumento"
 
-#: src/popt.c:1609
+#: src/popt.c:1627
 msgid "unknown option"
 msgstr "opción desconocida"
 
-#: src/popt.c:1611
+#: src/popt.c:1629
 msgid "mutually exclusive logical operations requested"
 msgstr "requerida operación lógica mutuamente exclusiva"
 
-#: src/popt.c:1613
+#: src/popt.c:1631
 msgid "opt->arg should not be NULL"
 msgstr ""
 
-#: src/popt.c:1615
+#: src/popt.c:1633
 msgid "aliases nested too deeply"
 msgstr "alias anidados muy profundamente"
 
-#: src/popt.c:1617
+#: src/popt.c:1635
 msgid "error in parameter quoting"
 msgstr "error en cita de parámetros"
 
-#: src/popt.c:1619
+#: src/popt.c:1637
 msgid "invalid numeric value"
 msgstr "valor numérico inválido"
 
-#: src/popt.c:1621
+#: src/popt.c:1639
 msgid "number too large or too small"
 msgstr "número muy largo o muy pequeño"
 
-#: src/popt.c:1623
+#: src/popt.c:1641
 msgid "memory allocation failed"
 msgstr ""
 
-#: src/popt.c:1625
+#: src/popt.c:1643
 msgid "config file failed sanity test"
 msgstr ""
 
-#: src/popt.c:1629
+#: src/popt.c:1647
 msgid "unknown error"
 msgstr "error desconocido"
 
@@ -133,10 +133,10 @@ msgstr "DOUBLE"
 msgid "ARG"
 msgstr "ARG"
 
-#: src/popthelp.c:608
+#: src/popthelp.c:616
 msgid "Usage:"
 msgstr "Modo de uso:"
 
-#: src/popthelp.c:630
+#: src/popthelp.c:638
 msgid "[OPTION...]"
 msgstr "[OPCIÓN...]"
diff --git a/po/fi.po b/po/fi.po
index a21a049..8a92289 100644
--- a/po/fi.po
+++ b/po/fi.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.14\n"
 "Report-Msgid-Bugs-To: <rpm-maint@lists.rpm.org>\n"
-"POT-Creation-Date: 2020-05-13 11:40+0300\n"
+"POT-Creation-Date: 2020-05-18 15:51+0300\n"
 "PO-Revision-Date: 2008-02-21 18:19+0200\n"
 "Last-Translator: Jorma Karvonen <karvjorm@users.sf.net>\n"
 "Language-Team: Finnish <translation-team-fi@lists.sourceforge.net>\n"
@@ -20,56 +20,56 @@ msgstr ""
 "X-Generator: KBabel 1.11.4\n"
 
 #  errno - number of last error (defined by the ISO C standard)
-#: src/popt.c:37
+#: src/popt.c:46
 msgid "unknown errno"
 msgstr "tuntematon errno-virhenumeroarvo"
 
-#: src/popt.c:1196
+#: src/popt.c:1206
 #, c-format
 msgid "option type (%u) not implemented in popt\n"
 msgstr "valitsintyyppiä (%u) ei ole toteutettu popt-ohjelmassa\n"
 
-#: src/popt.c:1607
+#: src/popt.c:1625
 msgid "missing argument"
 msgstr "puuttuva argumentti"
 
-#: src/popt.c:1609
+#: src/popt.c:1627
 msgid "unknown option"
 msgstr "tuntematon valitsin"
 
-#: src/popt.c:1611
+#: src/popt.c:1629
 msgid "mutually exclusive logical operations requested"
 msgstr "pyydettyjä loogisia toimintoja ei voi käyttää yhdessä"
 
-#: src/popt.c:1613
+#: src/popt.c:1631
 msgid "opt->arg should not be NULL"
 msgstr "”opt->arg”-valitsinargumentti ei saa olla NULL"
 
-#: src/popt.c:1615
+#: src/popt.c:1633
 msgid "aliases nested too deeply"
 msgstr "liian monta aliasta sisäkkäin"
 
-#: src/popt.c:1617
+#: src/popt.c:1635
 msgid "error in parameter quoting"
 msgstr "virhe parametrien lainauksessa"
 
-#: src/popt.c:1619
+#: src/popt.c:1637
 msgid "invalid numeric value"
 msgstr "virheellinen numeroarvo"
 
-#: src/popt.c:1621
+#: src/popt.c:1639
 msgid "number too large or too small"
 msgstr "numero on liian iso tai liian pieni"
 
-#: src/popt.c:1623
+#: src/popt.c:1641
 msgid "memory allocation failed"
 msgstr "muistin varaus ei onnistunut"
 
-#: src/popt.c:1625
+#: src/popt.c:1643
 msgid "config file failed sanity test"
 msgstr ""
 
-#: src/popt.c:1629
+#: src/popt.c:1647
 msgid "unknown error"
 msgstr "tuntematon virhe"
 
@@ -139,10 +139,10 @@ msgstr "DOUBLE-LIUKULUKU"
 msgid "ARG"
 msgstr "ARGUMENTTI"
 
-#: src/popthelp.c:608
+#: src/popthelp.c:616
 msgid "Usage:"
 msgstr "Käyttö:"
 
-#: src/popthelp.c:630
+#: src/popthelp.c:638
 msgid "[OPTION...]"
 msgstr "[VALITSIN...]"
diff --git a/po/fr.po b/po/fr.po
index b1467f7..f561d4b 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -12,7 +12,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.11\n"
 "Report-Msgid-Bugs-To: <rpm-maint@lists.rpm.org>\n"
-"POT-Creation-Date: 2020-05-13 11:40+0300\n"
+"POT-Creation-Date: 2020-05-18 15:51+0300\n"
 "PO-Revision-Date: 2003-06-22 23:43+0200\n"
 "Last-Translator: RPM French Translation <rpm-fr@livna.org>\n"
 "Language-Team: RPM French Translation <rpm-fr@livna.org>\n"
@@ -21,56 +21,56 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8-bit\n"
 
-#: src/popt.c:37
+#: src/popt.c:46
 msgid "unknown errno"
 msgstr "errno inconnu"
 
-#: src/popt.c:1196
+#: src/popt.c:1206
 #, fuzzy, c-format
 msgid "option type (%u) not implemented in popt\n"
 msgstr "type(%d) d'option non implémenté dans popt\n"
 
-#: src/popt.c:1607
+#: src/popt.c:1625
 msgid "missing argument"
 msgstr "argument manquant"
 
-#: src/popt.c:1609
+#: src/popt.c:1627
 msgid "unknown option"
 msgstr "option iconnue"
 
-#: src/popt.c:1611
+#: src/popt.c:1629
 msgid "mutually exclusive logical operations requested"
 msgstr "opérations logiques mutuellement exclusives requises"
 
-#: src/popt.c:1613
+#: src/popt.c:1631
 msgid "opt->arg should not be NULL"
 msgstr "opt->arg ne devrait pas être NULL"
 
-#: src/popt.c:1615
+#: src/popt.c:1633
 msgid "aliases nested too deeply"
 msgstr "les alias sont trop entremellés"
 
-#: src/popt.c:1617
+#: src/popt.c:1635
 msgid "error in parameter quoting"
 msgstr "erreur en citant les paramètres"
 
-#: src/popt.c:1619
+#: src/popt.c:1637
 msgid "invalid numeric value"
 msgstr "valeur numérique invalide"
 
-#: src/popt.c:1621
+#: src/popt.c:1639
 msgid "number too large or too small"
 msgstr "nombre trop grand ou trop petit"
 
-#: src/popt.c:1623
+#: src/popt.c:1641
 msgid "memory allocation failed"
 msgstr "échec de l'allocation de mémoire"
 
-#: src/popt.c:1625
+#: src/popt.c:1643
 msgid "config file failed sanity test"
 msgstr ""
 
-#: src/popt.c:1629
+#: src/popt.c:1647
 msgid "unknown error"
 msgstr "erreur inconnue"
 
@@ -139,10 +139,10 @@ msgstr "DOUBLE"
 msgid "ARG"
 msgstr "ARG"
 
-#: src/popthelp.c:608
+#: src/popthelp.c:616
 msgid "Usage:"
 msgstr "Utilisation:"
 
-#: src/popthelp.c:630
+#: src/popthelp.c:638
 msgid "[OPTION...]"
 msgstr "[OPTION...]"
diff --git a/po/ga.po b/po/ga.po
index 9131da9..850df76 100644
--- a/po/ga.po
+++ b/po/ga.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.14\n"
 "Report-Msgid-Bugs-To: <rpm-maint@lists.rpm.org>\n"
-"POT-Creation-Date: 2020-05-13 11:40+0300\n"
+"POT-Creation-Date: 2020-05-18 15:51+0300\n"
 "PO-Revision-Date: 2008-04-10 06:21-0500\n"
 "Last-Translator: Kevin Scannell <kscanne@gmail.com>\n"
 "Language-Team: Irish <gaeilge-gnulinux@lists.sourceforge.net>\n"
@@ -15,56 +15,56 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: src/popt.c:37
+#: src/popt.c:46
 msgid "unknown errno"
 msgstr "errno anaithnid"
 
-#: src/popt.c:1196
+#: src/popt.c:1206
 #, c-format
 msgid "option type (%u) not implemented in popt\n"
 msgstr "níl an cineál rogha seo (%u) ar fáil i popt\n"
 
-#: src/popt.c:1607
+#: src/popt.c:1625
 msgid "missing argument"
 msgstr "argóint ar iarraidh"
 
-#: src/popt.c:1609
+#: src/popt.c:1627
 msgid "unknown option"
 msgstr "rogha anaithnid"
 
-#: src/popt.c:1611
+#: src/popt.c:1629
 msgid "mutually exclusive logical operations requested"
 msgstr "iarradh oibríochtaí loighciúla comheisiacha"
 
-#: src/popt.c:1613
+#: src/popt.c:1631
 msgid "opt->arg should not be NULL"
 msgstr "níor chóir rogha->arg a bheith NULL"
 
-#: src/popt.c:1615
+#: src/popt.c:1633
 msgid "aliases nested too deeply"
 msgstr "ailiasanna neadaithe ródhomhain"
 
-#: src/popt.c:1617
+#: src/popt.c:1635
 msgid "error in parameter quoting"
 msgstr "earráid agus paraiméadar á chur faoi chomharthaí athfhriotail"
 
-#: src/popt.c:1619
+#: src/popt.c:1637
 msgid "invalid numeric value"
 msgstr "luach neamhbhailí uimhriúil"
 
-#: src/popt.c:1621
+#: src/popt.c:1639
 msgid "number too large or too small"
 msgstr "uimhir rómhór nó róbheag"
 
-#: src/popt.c:1623
+#: src/popt.c:1641
 msgid "memory allocation failed"
 msgstr "theip ar dháileadh na cuimhne"
 
-#: src/popt.c:1625
+#: src/popt.c:1643
 msgid "config file failed sanity test"
 msgstr ""
 
-#: src/popt.c:1629
+#: src/popt.c:1647
 msgid "unknown error"
 msgstr "earráid anaithnid"
 
@@ -133,10 +133,10 @@ msgstr "DOUBLE"
 msgid "ARG"
 msgstr "ARG"
 
-#: src/popthelp.c:608
+#: src/popthelp.c:616
 msgid "Usage:"
 msgstr "Úsáid:"
 
-#: src/popthelp.c:630
+#: src/popthelp.c:638
 msgid "[OPTION...]"
 msgstr "[ROGHA...]"
diff --git a/po/gl.po b/po/gl.po
index b16d6d0..7dbdf70 100644
--- a/po/gl.po
+++ b/po/gl.po
@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.11\n"
 "Report-Msgid-Bugs-To: <rpm-maint@lists.rpm.org>\n"
-"POT-Creation-Date: 2020-05-13 11:40+0300\n"
+"POT-Creation-Date: 2020-05-18 15:51+0300\n"
 "PO-Revision-Date: 2001-01-17 01:01+0100\n"
 "Last-Translator: Jesús Bravo Álvarez <jba@pobox.com>\n"
 "Language-Team: Galician <trasno@ceu.fi.udc.es>\n"
@@ -11,56 +11,56 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: src/popt.c:37
+#: src/popt.c:46
 msgid "unknown errno"
 msgstr "errno descoñecido"
 
-#: src/popt.c:1196
+#: src/popt.c:1206
 #, fuzzy, c-format
 msgid "option type (%u) not implemented in popt\n"
 msgstr "tipo de opción (%d) non implementada en popt\n"
 
-#: src/popt.c:1607
+#: src/popt.c:1625
 msgid "missing argument"
 msgstr "falta un argumento"
 
-#: src/popt.c:1609
+#: src/popt.c:1627
 msgid "unknown option"
 msgstr "opción descoñecida"
 
-#: src/popt.c:1611
+#: src/popt.c:1629
 msgid "mutually exclusive logical operations requested"
 msgstr "solicitáronse operacións lóxicas mutuamente excluíntes"
 
-#: src/popt.c:1613
+#: src/popt.c:1631
 msgid "opt->arg should not be NULL"
 msgstr ""
 
-#: src/popt.c:1615
+#: src/popt.c:1633
 msgid "aliases nested too deeply"
 msgstr "aliases aniñados a un nivel demasiado profundo"
 
-#: src/popt.c:1617
+#: src/popt.c:1635
 msgid "error in parameter quoting"
 msgstr "erro nas comiñas do parámetro"
 
-#: src/popt.c:1619
+#: src/popt.c:1637
 msgid "invalid numeric value"
 msgstr "valor numérico non válido"
 
-#: src/popt.c:1621
+#: src/popt.c:1639
 msgid "number too large or too small"
 msgstr "número demasiado grande ou pequeno"
 
-#: src/popt.c:1623
+#: src/popt.c:1641
 msgid "memory allocation failed"
 msgstr ""
 
-#: src/popt.c:1625
+#: src/popt.c:1643
 msgid "config file failed sanity test"
 msgstr ""
 
-#: src/popt.c:1629
+#: src/popt.c:1647
 msgid "unknown error"
 msgstr "erro descoñecido"
 
@@ -130,10 +130,10 @@ msgstr "DOUBLE"
 msgid "ARG"
 msgstr "ARG"
 
-#: src/popthelp.c:608
+#: src/popthelp.c:616
 msgid "Usage:"
 msgstr "Uso:"
 
-#: src/popthelp.c:630
+#: src/popthelp.c:638
 msgid "[OPTION...]"
 msgstr "[OPCIÓN...]"
diff --git a/po/hu.po b/po/hu.po
index 3c1aa7d..921a4c7 100644
--- a/po/hu.po
+++ b/po/hu.po
@@ -5,7 +5,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.11\n"
 "Report-Msgid-Bugs-To: <rpm-maint@lists.rpm.org>\n"
-"POT-Creation-Date: 2020-05-13 11:40+0300\n"
+"POT-Creation-Date: 2020-05-18 15:51+0300\n"
 "PO-Revision-Date: 2007-06-21 00:45+0200\n"
 "Last-Translator: Gabor Kelemen <kelemeng@gnome.hu>\n"
 "Language-Team: Hungarian <translation-team-hu@lists.sourceforge.net>\n"
@@ -16,56 +16,56 @@ msgstr ""
 "X-Generator: KBabel 1.11.4\n"
 "Plural-Forms:  nplurals=2; plural=(n != 1);\n"
 
-#: src/popt.c:37
+#: src/popt.c:46
 msgid "unknown errno"
 msgstr "ismeretlen hibaszám"
 
-#: src/popt.c:1196
+#: src/popt.c:1206
 #, fuzzy, c-format
 msgid "option type (%u) not implemented in popt\n"
 msgstr "a kapcsolótípus (%d) nincs megvalósítva a popt-ban\n"
 
-#: src/popt.c:1607
+#: src/popt.c:1625
 msgid "missing argument"
 msgstr "hiányzó paraméter"
 
-#: src/popt.c:1609
+#: src/popt.c:1627
 msgid "unknown option"
 msgstr "ismeretlen kapcsoló"
 
-#: src/popt.c:1611
+#: src/popt.c:1629
 msgid "mutually exclusive logical operations requested"
 msgstr "kölcsönösen kizáró logikai műveleteket kért"
 
-#: src/popt.c:1613
+#: src/popt.c:1631
 msgid "opt->arg should not be NULL"
 msgstr "az opt->arg nem lehet NULL"
 
-#: src/popt.c:1615
+#: src/popt.c:1633
 msgid "aliases nested too deeply"
 msgstr "az álnevek túl mélyen vannak egymásba ágyazva"
 
-#: src/popt.c:1617
+#: src/popt.c:1635
 msgid "error in parameter quoting"
 msgstr "hiba a paraméter idézésében"
 
-#: src/popt.c:1619
+#: src/popt.c:1637
 msgid "invalid numeric value"
 msgstr "érvénytelen numerikus érték"
 
-#: src/popt.c:1621
+#: src/popt.c:1639
 msgid "number too large or too small"
 msgstr "a szám túl nagy vagy túl kicsi"
 
-#: src/popt.c:1623
+#: src/popt.c:1641
 msgid "memory allocation failed"
 msgstr "a memóriafoglalás meghiúsult"
 
-#: src/popt.c:1625
+#: src/popt.c:1643
 msgid "config file failed sanity test"
 msgstr ""
 
-#: src/popt.c:1629
+#: src/popt.c:1647
 msgid "unknown error"
 msgstr "ismeretlen hiba"
 
@@ -135,10 +135,10 @@ msgstr "DUPLA"
 msgid "ARG"
 msgstr "PAR"
 
-#: src/popthelp.c:608
+#: src/popthelp.c:616
 msgid "Usage:"
 msgstr "Használat:"
 
-#: src/popthelp.c:630
+#: src/popthelp.c:638
 msgid "[OPTION...]"
 msgstr "[KAPCSOLÓ...]"
diff --git a/po/id.po b/po/id.po
index d71dc0c..18fa2e9 100644
--- a/po/id.po
+++ b/po/id.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.14\n"
 "Report-Msgid-Bugs-To: <rpm-maint@lists.rpm.org>\n"
-"POT-Creation-Date: 2020-05-13 11:40+0300\n"
+"POT-Creation-Date: 2020-05-18 15:51+0300\n"
 "PO-Revision-Date: 2008-08-26 14:18+0700\n"
 "Last-Translator: Andhika Padmawan <andhika.padmawan@gmail.com>\n"
 "Language-Team: Indonesian <translation-team-id@lists.sourceforge.net>\n"
@@ -15,56 +15,56 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: src/popt.c:37
+#: src/popt.c:46
 msgid "unknown errno"
 msgstr "errno tak diketahui"
 
-#: src/popt.c:1196
+#: src/popt.c:1206
 #, c-format
 msgid "option type (%u) not implemented in popt\n"
 msgstr "tipe opsi (%u) tak diimplementasikan di popt\n"
 
-#: src/popt.c:1607
+#: src/popt.c:1625
 msgid "missing argument"
 msgstr "kehilangan argumen"
 
-#: src/popt.c:1609
+#: src/popt.c:1627
 msgid "unknown option"
 msgstr "opsi tak diketahui"
 
-#: src/popt.c:1611
+#: src/popt.c:1629
 msgid "mutually exclusive logical operations requested"
 msgstr "permintaan operasi logika eksklusif secara mutual"
 
-#: src/popt.c:1613
+#: src/popt.c:1631
 msgid "opt->arg should not be NULL"
 msgstr "opt->arg tidak boleh NULL"
 
-#: src/popt.c:1615
+#: src/popt.c:1633
 msgid "aliases nested too deeply"
 msgstr "alias disarangkan terlalu dalam"
 
-#: src/popt.c:1617
+#: src/popt.c:1635
 msgid "error in parameter quoting"
 msgstr "galat di pencantuman parameter"
 
-#: src/popt.c:1619
+#: src/popt.c:1637
 msgid "invalid numeric value"
 msgstr "nilai numerik tidak sah"
 
-#: src/popt.c:1621
+#: src/popt.c:1639
 msgid "number too large or too small"
 msgstr "nomor terlalu besar atau terlalu kecil"
 
-#: src/popt.c:1623
+#: src/popt.c:1641
 msgid "memory allocation failed"
 msgstr "alokasi memori gagal"
 
-#: src/popt.c:1625
+#: src/popt.c:1643
 msgid "config file failed sanity test"
 msgstr ""
 
-#: src/popt.c:1629
+#: src/popt.c:1647
 msgid "unknown error"
 msgstr "galat tak diketahui"
 
@@ -132,10 +132,10 @@ msgstr "DOUBLE"
 msgid "ARG"
 msgstr "ARG"
 
-#: src/popthelp.c:608
+#: src/popthelp.c:616
 msgid "Usage:"
 msgstr "Penggunaan:"
 
-#: src/popthelp.c:630
+#: src/popthelp.c:638
 msgid "[OPTION...]"
 msgstr "[OPSI...]"
diff --git a/po/is.po b/po/is.po
index fbccb47..67b22f8 100644
--- a/po/is.po
+++ b/po/is.po
@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.11\n"
 "Report-Msgid-Bugs-To: <rpm-maint@lists.rpm.org>\n"
-"POT-Creation-Date: 2020-05-13 11:40+0300\n"
+"POT-Creation-Date: 2020-05-18 15:51+0300\n"
 "PO-Revision-Date: 2001-06-08 01:35+0000\n"
 "Last-Translator: Richard Allen <ra@hp.is>\n"
 "Language-Team: is <kde-isl@mmedia.is>\n"
@@ -11,56 +11,56 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8-bit\n"
 
-#: src/popt.c:37
+#: src/popt.c:46
 msgid "unknown errno"
 msgstr "óþekkt villunúmer"
 
-#: src/popt.c:1196
+#: src/popt.c:1206
 #, fuzzy, c-format
 msgid "option type (%u) not implemented in popt\n"
 msgstr "rofagerðin (%d) er ekki studd í popt\n"
 
-#: src/popt.c:1607
+#: src/popt.c:1625
 msgid "missing argument"
 msgstr "vantar viðfang"
 
-#: src/popt.c:1609
+#: src/popt.c:1627
 msgid "unknown option"
 msgstr "óþekktur rofi"
 
-#: src/popt.c:1611
+#: src/popt.c:1629
 msgid "mutually exclusive logical operations requested"
 msgstr "beðið um rofa sem slökkva hvor á öðrum"
 
-#: src/popt.c:1613
+#: src/popt.c:1631
 msgid "opt->arg should not be NULL"
 msgstr "opt->arg ætti ekki að vera NULL"
 
-#: src/popt.c:1615
+#: src/popt.c:1633
 msgid "aliases nested too deeply"
 msgstr "alíasar of flóknir"
 
-#: src/popt.c:1617
+#: src/popt.c:1635
 msgid "error in parameter quoting"
 msgstr "villa í viðföngum (gæsalappir og svo frv.)"
 
-#: src/popt.c:1619
+#: src/popt.c:1637
 msgid "invalid numeric value"
 msgstr "ógilt tölulegt gildi"
 
-#: src/popt.c:1621
+#: src/popt.c:1639
 msgid "number too large or too small"
 msgstr "talan of stór eða smá"
 
-#: src/popt.c:1623
+#: src/popt.c:1641
 msgid "memory allocation failed"
 msgstr "ekki tókst að taka frá minni"
 
-#: src/popt.c:1625
+#: src/popt.c:1643
 msgid "config file failed sanity test"
 msgstr ""
 
-#: src/popt.c:1629
+#: src/popt.c:1647
 msgid "unknown error"
 msgstr "óþekkt villa"
 
@@ -129,10 +129,10 @@ msgstr "DOUBLE"
 msgid "ARG"
 msgstr "ARG"
 
-#: src/popthelp.c:608
+#: src/popthelp.c:616
 msgid "Usage:"
 msgstr "Notkun:"
 
-#: src/popthelp.c:630
+#: src/popthelp.c:638
 msgid "[OPTION...]"
 msgstr "[ROFI...]"
diff --git a/po/it.po b/po/it.po
index 1d42059..0b8349d 100644
--- a/po/it.po
+++ b/po/it.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: popt-1.14\n"
 "Report-Msgid-Bugs-To: <rpm-maint@lists.rpm.org>\n"
-"POT-Creation-Date: 2020-05-13 11:40+0300\n"
+"POT-Creation-Date: 2020-05-18 15:51+0300\n"
 "PO-Revision-Date: 2008-11-28 15:32+0100\n"
 "Last-Translator: Vincenzo Campanella <vinz65@gmail.com>\n"
 "Language-Team: Italian <tp@lists.linux.it>\n"
@@ -18,56 +18,56 @@ msgstr ""
 "First-Translator: Sandro Bonazzola <sandro.bonazzola@gmail.com>\n"
 "X-Generator: KBabel 1.11.4\n"
 
-#: src/popt.c:37
+#: src/popt.c:46
 msgid "unknown errno"
 msgstr "errno sconosciuto"
 
-#: src/popt.c:1196
+#: src/popt.c:1206
 #, c-format
 msgid "option type (%u) not implemented in popt\n"
 msgstr "tipo di opzione (%u) non implementato in popt\n"
 
-#: src/popt.c:1607
+#: src/popt.c:1625
 msgid "missing argument"
 msgstr "argomento mancante"
 
-#: src/popt.c:1609
+#: src/popt.c:1627
 msgid "unknown option"
 msgstr "opzione sconosciuta"
 
-#: src/popt.c:1611
+#: src/popt.c:1629
 msgid "mutually exclusive logical operations requested"
 msgstr "richieste operazioni logiche reciprocamente esclusive"
 
-#: src/popt.c:1613
+#: src/popt.c:1631
 msgid "opt->arg should not be NULL"
 msgstr "opt->arg non dovrebbe essere NULL"
 
-#: src/popt.c:1615
+#: src/popt.c:1633
 msgid "aliases nested too deeply"
 msgstr "alias nidificati troppo in profondità"
 
-#: src/popt.c:1617
+#: src/popt.c:1635
 msgid "error in parameter quoting"
 msgstr "errore nel quoting del parametro"
 
-#: src/popt.c:1619
+#: src/popt.c:1637
 msgid "invalid numeric value"
 msgstr "valore numerico non valido"
 
-#: src/popt.c:1621
+#: src/popt.c:1639
 msgid "number too large or too small"
 msgstr "numero troppo grande o troppo piccolo"
 
-#: src/popt.c:1623
+#: src/popt.c:1641
 msgid "memory allocation failed"
 msgstr "allocazione di memoria fallita"
 
-#: src/popt.c:1625
+#: src/popt.c:1643
 msgid "config file failed sanity test"
 msgstr ""
 
-#: src/popt.c:1629
+#: src/popt.c:1647
 msgid "unknown error"
 msgstr "errore sconosciuto"
 
@@ -135,10 +135,10 @@ msgstr "DOUBLE"
 msgid "ARG"
 msgstr "ARG"
 
-#: src/popthelp.c:608
+#: src/popthelp.c:616
 msgid "Usage:"
 msgstr "Uso:"
 
-#: src/popthelp.c:630
+#: src/popthelp.c:638
 msgid "[OPTION...]"
 msgstr "[OPZIONE...]"
diff --git a/po/ja.po b/po/ja.po
index fb1733b..4910b1f 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.11\n"
 "Report-Msgid-Bugs-To: <rpm-maint@lists.rpm.org>\n"
-"POT-Creation-Date: 2020-05-13 11:40+0300\n"
+"POT-Creation-Date: 2020-05-18 15:51+0300\n"
 "PO-Revision-Date: 2003--8-25 19:00+0900\n"
 "Last-Translator: Yukihiro Nakai <ynakai@redhat.com>\n"
 "Language-Team: Japanese <ja@li.org>\n"
@@ -15,56 +15,56 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: src/popt.c:37
+#: src/popt.c:46
 msgid "unknown errno"
 msgstr "不明なエラー番号"
 
-#: src/popt.c:1196
+#: src/popt.c:1206
 #, fuzzy, c-format
 msgid "option type (%u) not implemented in popt\n"
 msgstr "オプションタイプ (%d) はpoptには実装されていません\n"
 
-#: src/popt.c:1607
+#: src/popt.c:1625
 msgid "missing argument"
 msgstr "引数がありません"
 
-#: src/popt.c:1609
+#: src/popt.c:1627
 msgid "unknown option"
 msgstr "不明なオプション"
 
-#: src/popt.c:1611
+#: src/popt.c:1629
 msgid "mutually exclusive logical operations requested"
 msgstr "排他的な悪ぺーレーションが必要です"
 
-#: src/popt.c:1613
+#: src/popt.c:1631
 msgid "opt->arg should not be NULL"
 msgstr "opt->argはNULLではいけません"
 
-#: src/popt.c:1615
+#: src/popt.c:1633
 msgid "aliases nested too deeply"
 msgstr "エイリアスのネストが深すぎます"
 
-#: src/popt.c:1617
+#: src/popt.c:1635
 msgid "error in parameter quoting"
 msgstr "パラメータのクオート付けでエラー"
 
-#: src/popt.c:1619
+#: src/popt.c:1637
 msgid "invalid numeric value"
 msgstr "不正な数値"
 
-#: src/popt.c:1621
+#: src/popt.c:1639
 msgid "number too large or too small"
 msgstr "数値が大きすぎるか小さすぎます"
 
-#: src/popt.c:1623
+#: src/popt.c:1641
 msgid "memory allocation failed"
 msgstr "メモリ確保に失敗しました"
 
-#: src/popt.c:1625
+#: src/popt.c:1643
 msgid "config file failed sanity test"
 msgstr ""
 
-#: src/popt.c:1629
+#: src/popt.c:1647
 msgid "unknown error"
 msgstr "不明なエラー"
 
@@ -134,10 +134,10 @@ msgstr "DOUBLE"
 msgid "ARG"
 msgstr "ARG"
 
-#: src/popthelp.c:608
+#: src/popthelp.c:616
 msgid "Usage:"
 msgstr "使い方:"
 
-#: src/popthelp.c:630
+#: src/popthelp.c:638
 msgid "[OPTION...]"
 msgstr "[オプション...]"
diff --git a/po/ko.po b/po/ko.po
index 6c8b454..9ce1bd3 100644
--- a/po/ko.po
+++ b/po/ko.po
@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.11\n"
 "Report-Msgid-Bugs-To: <rpm-maint@lists.rpm.org>\n"
-"POT-Creation-Date: 2020-05-13 11:40+0300\n"
+"POT-Creation-Date: 2020-05-18 15:51+0300\n"
 "PO-Revision-Date: 2001-09-06 20:06+0900\n"
 "Last-Translator: Jong-Hoon Ryu <redhat4u@netian.com>\n"
 "Language-Team: GNU Translation project <ko@li.org>\n"
@@ -11,56 +11,56 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8-bit\n"
 
-#: src/popt.c:37
+#: src/popt.c:46
 msgid "unknown errno"
 msgstr "알 수 없는 오류코드(errno) 입니다"
 
-#: src/popt.c:1196
+#: src/popt.c:1206
 #, fuzzy, c-format
 msgid "option type (%u) not implemented in popt\n"
 msgstr "옵션 유형 (%d)은 popt에서 사용할 수 없습니다\n"
 
-#: src/popt.c:1607
+#: src/popt.c:1625
 msgid "missing argument"
 msgstr "인수가 지정되지 않았습니다"
 
-#: src/popt.c:1609
+#: src/popt.c:1627
 msgid "unknown option"
 msgstr "알 수 없는 옵션입니다"
 
-#: src/popt.c:1611
+#: src/popt.c:1629
 msgid "mutually exclusive logical operations requested"
 msgstr "양쪽에 배타적 논리 연산이 지정되었습니다"
 
-#: src/popt.c:1613
+#: src/popt.c:1631
 msgid "opt->arg should not be NULL"
 msgstr "옵션->인수가 NULL이 되어서는 안됩니다"
 
-#: src/popt.c:1615
+#: src/popt.c:1633
 msgid "aliases nested too deeply"
 msgstr "별칭(alias)이 복잡하게 설정되었습니다"
 
-#: src/popt.c:1617
+#: src/popt.c:1635
 msgid "error in parameter quoting"
 msgstr "매개변수에 오류가 있습니다"
 
-#: src/popt.c:1619
+#: src/popt.c:1637
 msgid "invalid numeric value"
 msgstr "잘못된 수치 값입니다"
 
-#: src/popt.c:1621
+#: src/popt.c:1639
 msgid "number too large or too small"
 msgstr "숫자가 너무 크거나 너무 적습니다"
 
-#: src/popt.c:1623
+#: src/popt.c:1641
 msgid "memory allocation failed"
 msgstr "메모리 할당에 실패했습니다"
 
-#: src/popt.c:1625
+#: src/popt.c:1643
 msgid "config file failed sanity test"
 msgstr ""
 
-#: src/popt.c:1629
+#: src/popt.c:1647
 msgid "unknown error"
 msgstr "알 수 없는 오류입니다"
 
@@ -129,10 +129,10 @@ msgstr "소수(DOUBLE)"
 msgid "ARG"
 msgstr "인수(ARG)"
 
-#: src/popthelp.c:608
+#: src/popthelp.c:616
 msgid "Usage:"
 msgstr "사용법:"
 
-#: src/popthelp.c:630
+#: src/popthelp.c:638
 msgid "[OPTION...]"
 msgstr "[옵션...]"
diff --git a/po/lv.po b/po/lv.po
index 3804983..3b77629 100644
--- a/po/lv.po
+++ b/po/lv.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: popt-1.14\n"
 "Report-Msgid-Bugs-To: <rpm-maint@lists.rpm.org>\n"
-"POT-Creation-Date: 2020-05-13 11:40+0300\n"
+"POT-Creation-Date: 2020-05-18 15:51+0300\n"
 "PO-Revision-Date: 2009-04-12 16:34+0300\n"
 "Last-Translator: Rihards Prieditis <RPrieditis@inbox.lv>\n"
 "Language-Team: Latvian <translation-team-lv@lists.sourceforge.net>\n"
@@ -20,56 +20,56 @@ msgstr ""
 "Plural-Forms:  nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n != 0 ? 1 : "
 "2);\n"
 
-#: src/popt.c:37
+#: src/popt.c:46
 msgid "unknown errno"
 msgstr "nezināms kļūdas numurs"
 
-#: src/popt.c:1196
+#: src/popt.c:1206
 #, c-format
 msgid "option type (%u) not implemented in popt\n"
 msgstr "iespējas tips (%u) nav ieviests popt\n"
 
-#: src/popt.c:1607
+#: src/popt.c:1625
 msgid "missing argument"
 msgstr "trūkst arguments"
 
-#: src/popt.c:1609
+#: src/popt.c:1627
 msgid "unknown option"
 msgstr "nezināma iespēja"
 
-#: src/popt.c:1611
+#: src/popt.c:1629
 msgid "mutually exclusive logical operations requested"
 msgstr "pieprasītas savstarpējie izslēdzošas loģiskās operācijas"
 
-#: src/popt.c:1613
+#: src/popt.c:1631
 msgid "opt->arg should not be NULL"
 msgstr "opcija->arguments nevar būt NULL"
 
-#: src/popt.c:1615
+#: src/popt.c:1633
 msgid "aliases nested too deeply"
 msgstr "aizstājvārdi iegulti pārāk dziļi"
 
-#: src/popt.c:1617
+#: src/popt.c:1635
 msgid "error in parameter quoting"
 msgstr "kļuda parametru citēšanā"
 
-#: src/popt.c:1619
+#: src/popt.c:1637
 msgid "invalid numeric value"
 msgstr "nederīga skaitļa vērtība"
 
-#: src/popt.c:1621
+#: src/popt.c:1639
 msgid "number too large or too small"
 msgstr "skaitlis pārāk liels, vai pārāk mazs"
 
-#: src/popt.c:1623
+#: src/popt.c:1641
 msgid "memory allocation failed"
 msgstr "atmiņas iedalīšana neizdevās"
 
-#: src/popt.c:1625
+#: src/popt.c:1643
 msgid "config file failed sanity test"
 msgstr ""
 
-#: src/popt.c:1629
+#: src/popt.c:1647
 msgid "unknown error"
 msgstr "nezināma kļūda"
 
@@ -137,10 +137,10 @@ msgstr "DOUBLE"
 msgid "ARG"
 msgstr "ARGUMENTS"
 
-#: src/popthelp.c:608
+#: src/popthelp.c:616
 msgid "Usage:"
 msgstr "Lietošana:"
 
-#: src/popthelp.c:630
+#: src/popthelp.c:638
 msgid "[OPTION...]"
 msgstr "[IESPĒJAS..]"
diff --git a/po/nb.po b/po/nb.po
index 8bc1389..2c2f8a1 100644
--- a/po/nb.po
+++ b/po/nb.po
@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.11\n"
 "Report-Msgid-Bugs-To: <rpm-maint@lists.rpm.org>\n"
-"POT-Creation-Date: 2020-05-13 11:40+0300\n"
+"POT-Creation-Date: 2020-05-18 15:51+0300\n"
 "PO-Revision-Date: 2001-06-27 11:05+0200\n"
 "Last-Translator: Kjartan Maraas <kmaraas@online.no>\n"
 "Language-Team: Norwegian <no@li.org>\n"
@@ -11,56 +11,56 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8-bit\n"
 
-#: src/popt.c:37
+#: src/popt.c:46
 msgid "unknown errno"
 msgstr "ukjent errno"
 
-#: src/popt.c:1196
+#: src/popt.c:1206
 #, fuzzy, c-format
 msgid "option type (%u) not implemented in popt\n"
 msgstr "flaggtype (%d) ikke implementert i popt\n"
 
-#: src/popt.c:1607
+#: src/popt.c:1625
 msgid "missing argument"
 msgstr "manglende argument"
 
-#: src/popt.c:1609
+#: src/popt.c:1627
 msgid "unknown option"
 msgstr "ukjent flagg"
 
-#: src/popt.c:1611
+#: src/popt.c:1629
 msgid "mutually exclusive logical operations requested"
 msgstr "gjensidig eksluderende logiske operasjoner forespurt"
 
-#: src/popt.c:1613
+#: src/popt.c:1631
 msgid "opt->arg should not be NULL"
 msgstr "opt->arg må ikke være NULL"
 
-#: src/popt.c:1615
+#: src/popt.c:1633
 msgid "aliases nested too deeply"
 msgstr "aliaser med for dype løkker"
 
-#: src/popt.c:1617
+#: src/popt.c:1635
 msgid "error in parameter quoting"
 msgstr "feil i parametersitering"
 
-#: src/popt.c:1619
+#: src/popt.c:1637
 msgid "invalid numeric value"
 msgstr "ugyldig numerisk verdi"
 
-#: src/popt.c:1621
+#: src/popt.c:1639
 msgid "number too large or too small"
 msgstr "tallet er for stort eller lite"
 
-#: src/popt.c:1623
+#: src/popt.c:1641
 msgid "memory allocation failed"
 msgstr "minneallokering feilet"
 
-#: src/popt.c:1625
+#: src/popt.c:1643
 msgid "config file failed sanity test"
 msgstr ""
 
-#: src/popt.c:1629
+#: src/popt.c:1647
 msgid "unknown error"
 msgstr "ukjent feil"
 
@@ -129,10 +129,10 @@ msgstr "DOUBLE"
 msgid "ARG"
 msgstr "ARG"
 
-#: src/popthelp.c:608
+#: src/popthelp.c:616
 msgid "Usage:"
 msgstr "Bruk:"
 
-#: src/popthelp.c:630
+#: src/popthelp.c:638
 msgid "[OPTION...]"
 msgstr "[FLAGG...]"
diff --git a/po/nl.po b/po/nl.po
index ef44527..b0f7b91 100644
--- a/po/nl.po
+++ b/po/nl.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.14\n"
 "Report-Msgid-Bugs-To: <rpm-maint@lists.rpm.org>\n"
-"POT-Creation-Date: 2020-05-13 11:40+0300\n"
+"POT-Creation-Date: 2020-05-18 15:51+0300\n"
 "PO-Revision-Date: 2008-02-20 19:26+0100\n"
 "Last-Translator: Tim Van Holder <tim.van.holder@telenet.be>\n"
 "Language-Team: Dutch <vertaling@vrijschrift.org>\n"
@@ -15,57 +15,57 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: src/popt.c:37
+#: src/popt.c:46
 msgid "unknown errno"
 msgstr "onbekend foutnummer (errno)"
 
-#: src/popt.c:1196
+#: src/popt.c:1206
 #, c-format
 msgid "option type (%u) not implemented in popt\n"
 msgstr "dit optietype (%u) is niet geïmplementeerd in popt\n"
 
-#: src/popt.c:1607
+#: src/popt.c:1625
 msgid "missing argument"
 msgstr "ontbrekend argument"
 
-#: src/popt.c:1609
+#: src/popt.c:1627
 msgid "unknown option"
 msgstr "onbekende optie"
 
-#: src/popt.c:1611
+#: src/popt.c:1629
 msgid "mutually exclusive logical operations requested"
 msgstr "elkaar uitsluitende logische operatoren werden gevraagd"
 
-#: src/popt.c:1613
+#: src/popt.c:1631
 msgid "opt->arg should not be NULL"
 msgstr "opt->arg zou niet NULL mogen zijn"
 
-#: src/popt.c:1615
+#: src/popt.c:1633
 msgid "aliases nested too deeply"
 msgstr "aliassen zijn te diep genest"
 
 # of toch beter "quoting" behouden?
-#: src/popt.c:1617
+#: src/popt.c:1635
 msgid "error in parameter quoting"
 msgstr "fout in de aanhaling van parameters"
 
-#: src/popt.c:1619
+#: src/popt.c:1637
 msgid "invalid numeric value"
 msgstr "ongeldige numerieke waarde"
 
-#: src/popt.c:1621
+#: src/popt.c:1639
 msgid "number too large or too small"
 msgstr "getal is te klein of te groot"
 
-#: src/popt.c:1623
+#: src/popt.c:1641
 msgid "memory allocation failed"
 msgstr "reserveren van geheugen is mislukt"
 
-#: src/popt.c:1625
+#: src/popt.c:1643
 msgid "config file failed sanity test"
 msgstr ""
 
-#: src/popt.c:1629
+#: src/popt.c:1647
 msgid "unknown error"
 msgstr "onbekende fout"
 
@@ -136,10 +136,10 @@ msgstr "DOUBLE"
 msgid "ARG"
 msgstr "ARG"
 
-#: src/popthelp.c:608
+#: src/popthelp.c:616
 msgid "Usage:"
 msgstr "Gebruik:"
 
-#: src/popthelp.c:630
+#: src/popthelp.c:638
 msgid "[OPTION...]"
 msgstr "[OPTIE...]"
diff --git a/po/pl.po b/po/pl.po
index 6fe894c..f53c72e 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.14\n"
 "Report-Msgid-Bugs-To: <rpm-maint@lists.rpm.org>\n"
-"POT-Creation-Date: 2020-05-13 11:40+0300\n"
+"POT-Creation-Date: 2020-05-18 15:51+0300\n"
 "PO-Revision-Date: 2008-02-18 00:30+0100\n"
 "Last-Translator: Jakub Bogusz <qboosh@pld-linux.org>\n"
 "Language-Team: Polish <translation-team-pl@lists.sourceforge.net>\n"
@@ -15,56 +15,56 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: src/popt.c:37
+#: src/popt.c:46
 msgid "unknown errno"
 msgstr "nieznane errno"
 
-#: src/popt.c:1196
+#: src/popt.c:1206
 #, c-format
 msgid "option type (%u) not implemented in popt\n"
 msgstr "typ opcji (%u) nie zaimplementowany w popt\n"
 
-#: src/popt.c:1607
+#: src/popt.c:1625
 msgid "missing argument"
 msgstr "brak parametru"
 
-#: src/popt.c:1609
+#: src/popt.c:1627
 msgid "unknown option"
 msgstr "nieznana opcja"
 
-#: src/popt.c:1611
+#: src/popt.c:1629
 msgid "mutually exclusive logical operations requested"
 msgstr "żądanie wykluczających się operacji"
 
-#: src/popt.c:1613
+#: src/popt.c:1631
 msgid "opt->arg should not be NULL"
 msgstr "opt->arg nie może być NULL"
 
-#: src/popt.c:1615
+#: src/popt.c:1633
 msgid "aliases nested too deeply"
 msgstr "zbyt duże zagłębienie aliasów"
 
-#: src/popt.c:1617
+#: src/popt.c:1635
 msgid "error in parameter quoting"
 msgstr "błąd w cytowaniu parametru"
 
-#: src/popt.c:1619
+#: src/popt.c:1637
 msgid "invalid numeric value"
 msgstr "błędna wartość liczbowa"
 
-#: src/popt.c:1621
+#: src/popt.c:1639
 msgid "number too large or too small"
 msgstr "liczba zbyt duża lub zbyt mała"
 
-#: src/popt.c:1623
+#: src/popt.c:1641
 msgid "memory allocation failed"
 msgstr "błąd alokacji pamięci"
 
-#: src/popt.c:1625
+#: src/popt.c:1643
 msgid "config file failed sanity test"
 msgstr ""
 
-#: src/popt.c:1629
+#: src/popt.c:1647
 msgid "unknown error"
 msgstr "nieznany błąd"
 
@@ -132,10 +132,10 @@ msgstr "DOUBLE"
 msgid "ARG"
 msgstr "PARAM"
 
-#: src/popthelp.c:608
+#: src/popthelp.c:616
 msgid "Usage:"
 msgstr "Składnia:"
 
-#: src/popthelp.c:630
+#: src/popthelp.c:638
 msgid "[OPTION...]"
 msgstr "[OPCJA...]"
diff --git a/po/popt.pot b/po/popt.pot
index 6bc05e5..12c7151 100644
--- a/po/popt.pot
+++ b/po/popt.pot
@@ -5,9 +5,9 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: popt 1.16\n"
+"Project-Id-Version: popt 1.18-rc1\n"
 "Report-Msgid-Bugs-To: <rpm-maint@lists.rpm.org>\n"
-"POT-Creation-Date: 2020-05-13 11:40+0300\n"
+"POT-Creation-Date: 2020-05-18 15:51+0300\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -16,56 +16,56 @@ msgstr ""
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: src/popt.c:37
+#: src/popt.c:46
 msgid "unknown errno"
 msgstr ""
 
-#: src/popt.c:1196
+#: src/popt.c:1206
 #, c-format
 msgid "option type (%u) not implemented in popt\n"
 msgstr ""
 
-#: src/popt.c:1607
+#: src/popt.c:1625
 msgid "missing argument"
 msgstr ""
 
-#: src/popt.c:1609
+#: src/popt.c:1627
 msgid "unknown option"
 msgstr ""
 
-#: src/popt.c:1611
+#: src/popt.c:1629
 msgid "mutually exclusive logical operations requested"
 msgstr ""
 
-#: src/popt.c:1613
+#: src/popt.c:1631
 msgid "opt->arg should not be NULL"
 msgstr ""
 
-#: src/popt.c:1615
+#: src/popt.c:1633
 msgid "aliases nested too deeply"
 msgstr ""
 
-#: src/popt.c:1617
+#: src/popt.c:1635
 msgid "error in parameter quoting"
 msgstr ""
 
-#: src/popt.c:1619
+#: src/popt.c:1637
 msgid "invalid numeric value"
 msgstr ""
 
-#: src/popt.c:1621
+#: src/popt.c:1639
 msgid "number too large or too small"
 msgstr ""
 
-#: src/popt.c:1623
+#: src/popt.c:1641
 msgid "memory allocation failed"
 msgstr ""
 
-#: src/popt.c:1625
+#: src/popt.c:1643
 msgid "config file failed sanity test"
 msgstr ""
 
-#: src/popt.c:1629
+#: src/popt.c:1647
 msgid "unknown error"
 msgstr ""
 
@@ -133,10 +133,10 @@ msgstr ""
 msgid "ARG"
 msgstr ""
 
-#: src/popthelp.c:608
+#: src/popthelp.c:616
 msgid "Usage:"
 msgstr ""
 
-#: src/popthelp.c:630
+#: src/popthelp.c:638
 msgid "[OPTION...]"
 msgstr ""
diff --git a/po/pt.po b/po/pt.po
index 45072d3..cddfb5a 100644
--- a/po/pt.po
+++ b/po/pt.po
@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.11\n"
 "Report-Msgid-Bugs-To: <rpm-maint@lists.rpm.org>\n"
-"POT-Creation-Date: 2020-05-13 11:40+0300\n"
+"POT-Creation-Date: 2020-05-18 15:51+0300\n"
 "PO-Revision-Date: 2002-02-13 18:32+0000\n"
 "Last-Translator: Pedro Morais <morais@kde.org>\n"
 "Language-Team: pt <morais@kde.org>\n"
@@ -11,56 +11,56 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: src/popt.c:37
+#: src/popt.c:46
 msgid "unknown errno"
 msgstr "errno desconhecido"
 
-#: src/popt.c:1196
+#: src/popt.c:1206
 #, fuzzy, c-format
 msgid "option type (%u) not implemented in popt\n"
 msgstr "tipo de opção (%d) não implementado no popt\n"
 
-#: src/popt.c:1607
+#: src/popt.c:1625
 msgid "missing argument"
 msgstr "falta um argumento"
 
-#: src/popt.c:1609
+#: src/popt.c:1627
 msgid "unknown option"
 msgstr "opção desconhecida"
 
-#: src/popt.c:1611
+#: src/popt.c:1629
 msgid "mutually exclusive logical operations requested"
 msgstr "foram pedidas operações lógicas mutuamente exclusivas"
 
-#: src/popt.c:1613
+#: src/popt.c:1631
 msgid "opt->arg should not be NULL"
 msgstr "opt->arg não deve ser NULL"
 
-#: src/popt.c:1615
+#: src/popt.c:1633
 msgid "aliases nested too deeply"
 msgstr "'aliases' demasiado aninhados"
 
-#: src/popt.c:1617
+#: src/popt.c:1635
 msgid "error in parameter quoting"
 msgstr "erros no 'quoting' de parâmetros"
 
-#: src/popt.c:1619
+#: src/popt.c:1637
 msgid "invalid numeric value"
 msgstr "valor númerico inválido"
 
-#: src/popt.c:1621
+#: src/popt.c:1639
 msgid "number too large or too small"
 msgstr "número demasiado grando ou pequeno"
 
-#: src/popt.c:1623
+#: src/popt.c:1641
 msgid "memory allocation failed"
 msgstr "alocação de memória falhou"
 
-#: src/popt.c:1625
+#: src/popt.c:1643
 msgid "config file failed sanity test"
 msgstr ""
 
-#: src/popt.c:1629
+#: src/popt.c:1647
 msgid "unknown error"
 msgstr "erro desconhecido"
 
@@ -129,10 +129,10 @@ msgstr "DOUBLE"
 msgid "ARG"
 msgstr "ARG"
 
-#: src/popthelp.c:608
+#: src/popthelp.c:616
 msgid "Usage:"
 msgstr "Utilização:"
 
-#: src/popthelp.c:630
+#: src/popthelp.c:638
 msgid "[OPTION...]"
 msgstr "[OPÇÃO...]"
diff --git a/po/ro.po b/po/ro.po
index 6d6823e..d396bd1 100644
--- a/po/ro.po
+++ b/po/ro.po
@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.11\n"
 "Report-Msgid-Bugs-To: <rpm-maint@lists.rpm.org>\n"
-"POT-Creation-Date: 2020-05-13 11:40+0300\n"
+"POT-Creation-Date: 2020-05-18 15:51+0300\n"
 "PO-Revision-Date: 2000-06-14 23:23+EST\n"
 "Last-Translator: Cristian Gafton <gafton@redhat.com>\n"
 "Language-Team: Romanian <ro@li.org>\n"
@@ -11,57 +11,57 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: src/popt.c:37
+#: src/popt.c:46
 msgid "unknown errno"
 msgstr "eroare necunoscuta"
 
-#: src/popt.c:1196
+#: src/popt.c:1206
 #, fuzzy, c-format
 msgid "option type (%u) not implemented in popt\n"
 msgstr "optiunea de tipul (%d) nu este implementata in popt\n"
 
-#: src/popt.c:1607
+#: src/popt.c:1625
 msgid "missing argument"
 msgstr "argument lipsa"
 
-#: src/popt.c:1609
+#: src/popt.c:1627
 msgid "unknown option"
 msgstr "optiune necunoscuta"
 
-#: src/popt.c:1611
+#: src/popt.c:1629
 msgid "mutually exclusive logical operations requested"
 msgstr ""
 
-#: src/popt.c:1613
+#: src/popt.c:1631
 msgid "opt->arg should not be NULL"
 msgstr ""
 
-#: src/popt.c:1615
+#: src/popt.c:1633
 msgid "aliases nested too deeply"
 msgstr "recursivitate infinita la optiunile sinonime"
 
-#: src/popt.c:1617
+#: src/popt.c:1635
 #, fuzzy
 msgid "error in parameter quoting"
 msgstr "eroare la insertie parametru"
 
-#: src/popt.c:1619
+#: src/popt.c:1637
 msgid "invalid numeric value"
 msgstr "valoare numarica invalida"
 
-#: src/popt.c:1621
+#: src/popt.c:1639
 msgid "number too large or too small"
 msgstr "numar prea mare sau prea mic"
 
-#: src/popt.c:1623
+#: src/popt.c:1641
 msgid "memory allocation failed"
 msgstr ""
 
-#: src/popt.c:1625
+#: src/popt.c:1643
 msgid "config file failed sanity test"
 msgstr ""
 
-#: src/popt.c:1629
+#: src/popt.c:1647
 msgid "unknown error"
 msgstr "eroare necuinoscuta"
 
@@ -130,10 +130,10 @@ msgstr ""
 msgid "ARG"
 msgstr ""
 
-#: src/popthelp.c:608
+#: src/popthelp.c:616
 msgid "Usage:"
 msgstr "Sintaxa:"
 
-#: src/popthelp.c:630
+#: src/popthelp.c:638
 msgid "[OPTION...]"
 msgstr "[OPTIUNE...]"
diff --git a/po/ru.po b/po/ru.po
index 22191aa..ba7fbf2 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.14\n"
 "Report-Msgid-Bugs-To: <rpm-maint@lists.rpm.org>\n"
-"POT-Creation-Date: 2020-05-13 11:40+0300\n"
+"POT-Creation-Date: 2020-05-18 15:51+0300\n"
 "PO-Revision-Date: 2009-02-01 13:30+0300\n"
 "Last-Translator: Yuri Kozlov <yuray@komyakino.ru>\n"
 "Language-Team: Russian <gnu@mx.ru>\n"
@@ -19,56 +19,56 @@ msgstr ""
 "Plural-Forms:  nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
 "%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 
-#: src/popt.c:37
+#: src/popt.c:46
 msgid "unknown errno"
 msgstr "неизвестный errno"
 
-#: src/popt.c:1196
+#: src/popt.c:1206
 #, c-format
 msgid "option type (%u) not implemented in popt\n"
 msgstr "обработка параметра (%u) в popt не предусмотрена\n"
 
-#: src/popt.c:1607
+#: src/popt.c:1625
 msgid "missing argument"
 msgstr "пропущен аргумент"
 
-#: src/popt.c:1609
+#: src/popt.c:1627
 msgid "unknown option"
 msgstr "неизвестный параметр"
 
-#: src/popt.c:1611
+#: src/popt.c:1629
 msgid "mutually exclusive logical operations requested"
 msgstr "запрошены взаимно исключающие логические операции"
 
-#: src/popt.c:1613
+#: src/popt.c:1631
 msgid "opt->arg should not be NULL"
 msgstr "opt->arg не может быть NULL"
 
-#: src/popt.c:1615
+#: src/popt.c:1633
 msgid "aliases nested too deeply"
 msgstr "превышен уровень допустимой рекурсии подстановок"
 
-#: src/popt.c:1617
+#: src/popt.c:1635
 msgid "error in parameter quoting"
 msgstr "ошибка помещения параметров в кавычки"
 
-#: src/popt.c:1619
+#: src/popt.c:1637
 msgid "invalid numeric value"
 msgstr "неправильное числовое значение"
 
-#: src/popt.c:1621
+#: src/popt.c:1639
 msgid "number too large or too small"
 msgstr "числовое значение за пределами предусмотренного"
 
-#: src/popt.c:1623
+#: src/popt.c:1641
 msgid "memory allocation failed"
 msgstr "не удалось выделить память"
 
-#: src/popt.c:1625
+#: src/popt.c:1643
 msgid "config file failed sanity test"
 msgstr ""
 
-#: src/popt.c:1629
+#: src/popt.c:1647
 msgid "unknown error"
 msgstr "неизвестная ошибка"
 
@@ -136,10 +136,10 @@ msgstr "DOUBLE"
 msgid "ARG"
 msgstr "ARG"
 
-#: src/popthelp.c:608
+#: src/popthelp.c:616
 msgid "Usage:"
 msgstr "Использование:"
 
-#: src/popthelp.c:630
+#: src/popthelp.c:638
 msgid "[OPTION...]"
 msgstr "[ПАРАМЕТР...]"
diff --git a/po/sk.po b/po/sk.po
index e165b12..c41f823 100644
--- a/po/sk.po
+++ b/po/sk.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.11\n"
 "Report-Msgid-Bugs-To: <rpm-maint@lists.rpm.org>\n"
-"POT-Creation-Date: 2020-05-13 11:40+0300\n"
+"POT-Creation-Date: 2020-05-18 15:51+0300\n"
 "PO-Revision-Date: 1999-08-04 21:40+0200\n"
 "Last-Translator: Stanislav Meduna <stano@eunet.sk>\n"
 "Language-Team: Slovak <sk-i18n@rak.isternet.sk>\n"
@@ -15,56 +15,56 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: src/popt.c:37
+#: src/popt.c:46
 msgid "unknown errno"
 msgstr ""
 
-#: src/popt.c:1196
+#: src/popt.c:1206
 #, c-format
 msgid "option type (%u) not implemented in popt\n"
 msgstr ""
 
-#: src/popt.c:1607
+#: src/popt.c:1625
 msgid "missing argument"
 msgstr ""
 
-#: src/popt.c:1609
+#: src/popt.c:1627
 msgid "unknown option"
 msgstr ""
 
-#: src/popt.c:1611
+#: src/popt.c:1629
 msgid "mutually exclusive logical operations requested"
 msgstr ""
 
-#: src/popt.c:1613
+#: src/popt.c:1631
 msgid "opt->arg should not be NULL"
 msgstr ""
 
-#: src/popt.c:1615
+#: src/popt.c:1633
 msgid "aliases nested too deeply"
 msgstr ""
 
-#: src/popt.c:1617
+#: src/popt.c:1635
 msgid "error in parameter quoting"
 msgstr ""
 
-#: src/popt.c:1619
+#: src/popt.c:1637
 msgid "invalid numeric value"
 msgstr ""
 
-#: src/popt.c:1621
+#: src/popt.c:1639
 msgid "number too large or too small"
 msgstr ""
 
-#: src/popt.c:1623
+#: src/popt.c:1641
 msgid "memory allocation failed"
 msgstr ""
 
-#: src/popt.c:1625
+#: src/popt.c:1643
 msgid "config file failed sanity test"
 msgstr ""
 
-#: src/popt.c:1629
+#: src/popt.c:1647
 msgid "unknown error"
 msgstr ""
 
@@ -133,10 +133,10 @@ msgstr ""
 msgid "ARG"
 msgstr ""
 
-#: src/popthelp.c:608
+#: src/popthelp.c:616
 msgid "Usage:"
 msgstr ""
 
-#: src/popthelp.c:630
+#: src/popthelp.c:638
 msgid "[OPTION...]"
 msgstr ""
diff --git a/po/sl.po b/po/sl.po
index 0886cb1..3ed76a8 100644
--- a/po/sl.po
+++ b/po/sl.po
@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.11\n"
 "Report-Msgid-Bugs-To: <rpm-maint@lists.rpm.org>\n"
-"POT-Creation-Date: 2020-05-13 11:40+0300\n"
+"POT-Creation-Date: 2020-05-18 15:51+0300\n"
 "PO-Revision-Date: 2000-09-05 12:30+0200\n"
 "Last-Translator: Roman Maurer <roman.maurer@hermes.si>\n"
 "Language-Team: Slovenian <sl@li.org>\n"
@@ -11,56 +11,56 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: src/popt.c:37
+#: src/popt.c:46
 msgid "unknown errno"
 msgstr ""
 
-#: src/popt.c:1196
+#: src/popt.c:1206
 #, c-format
 msgid "option type (%u) not implemented in popt\n"
 msgstr ""
 
-#: src/popt.c:1607
+#: src/popt.c:1625
 msgid "missing argument"
 msgstr ""
 
-#: src/popt.c:1609
+#: src/popt.c:1627
 msgid "unknown option"
 msgstr ""
 
-#: src/popt.c:1611
+#: src/popt.c:1629
 msgid "mutually exclusive logical operations requested"
 msgstr ""
 
-#: src/popt.c:1613
+#: src/popt.c:1631
 msgid "opt->arg should not be NULL"
 msgstr ""
 
-#: src/popt.c:1615
+#: src/popt.c:1633
 msgid "aliases nested too deeply"
 msgstr ""
 
-#: src/popt.c:1617
+#: src/popt.c:1635
 msgid "error in parameter quoting"
 msgstr ""
 
-#: src/popt.c:1619
+#: src/popt.c:1637
 msgid "invalid numeric value"
 msgstr ""
 
-#: src/popt.c:1621
+#: src/popt.c:1639
 msgid "number too large or too small"
 msgstr ""
 
-#: src/popt.c:1623
+#: src/popt.c:1641
 msgid "memory allocation failed"
 msgstr ""
 
-#: src/popt.c:1625
+#: src/popt.c:1643
 msgid "config file failed sanity test"
 msgstr ""
 
-#: src/popt.c:1629
+#: src/popt.c:1647
 msgid "unknown error"
 msgstr ""
 
@@ -129,10 +129,10 @@ msgstr ""
 msgid "ARG"
 msgstr ""
 
-#: src/popthelp.c:608
+#: src/popthelp.c:616
 msgid "Usage:"
 msgstr ""
 
-#: src/popthelp.c:630
+#: src/popthelp.c:638
 msgid "[OPTION...]"
 msgstr ""
diff --git a/po/sv.po b/po/sv.po
index 21b4e5d..a668200 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.14\n"
 "Report-Msgid-Bugs-To: <rpm-maint@lists.rpm.org>\n"
-"POT-Creation-Date: 2020-05-13 11:40+0300\n"
+"POT-Creation-Date: 2020-05-18 15:51+0300\n"
 "PO-Revision-Date: 2008-02-23 20:15+0100\n"
 "Last-Translator: Göran Uddeborg <goeran@uddeborg.se>\n"
 "Language-Team: Swedish <tp-sv@listor.tp-sv.se>\n"
@@ -18,56 +18,56 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: src/popt.c:37
+#: src/popt.c:46
 msgid "unknown errno"
 msgstr "okänt felnummer"
 
-#: src/popt.c:1196
+#: src/popt.c:1206
 #, c-format
 msgid "option type (%u) not implemented in popt\n"
 msgstr "flaggtypen (%u) är inte implementerad i popt\n"
 
-#: src/popt.c:1607
+#: src/popt.c:1625
 msgid "missing argument"
 msgstr "argument saknas"
 
-#: src/popt.c:1609
+#: src/popt.c:1627
 msgid "unknown option"
 msgstr "okänd flagga"
 
-#: src/popt.c:1611
+#: src/popt.c:1629
 msgid "mutually exclusive logical operations requested"
 msgstr "ömsesidigt uteslutande logiska operationer begärdes"
 
-#: src/popt.c:1613
+#: src/popt.c:1631
 msgid "opt->arg should not be NULL"
 msgstr "opt->arg får inte vara NULL"
 
-#: src/popt.c:1615
+#: src/popt.c:1633
 msgid "aliases nested too deeply"
 msgstr "alias är nästade för djupt"
 
-#: src/popt.c:1617
+#: src/popt.c:1635
 msgid "error in parameter quoting"
 msgstr "fel i parametercitering"
 
-#: src/popt.c:1619
+#: src/popt.c:1637
 msgid "invalid numeric value"
 msgstr "ogiltigt numeriskt värde"
 
-#: src/popt.c:1621
+#: src/popt.c:1639
 msgid "number too large or too small"
 msgstr "talet för stort eller för litet"
 
-#: src/popt.c:1623
+#: src/popt.c:1641
 msgid "memory allocation failed"
 msgstr "minnesallokering misslyckades"
 
-#: src/popt.c:1625
+#: src/popt.c:1643
 msgid "config file failed sanity test"
 msgstr ""
 
-#: src/popt.c:1629
+#: src/popt.c:1647
 msgid "unknown error"
 msgstr "okänt fel"
 
@@ -135,10 +135,10 @@ msgstr "DUBBEL"
 msgid "ARG"
 msgstr "ARG"
 
-#: src/popthelp.c:608
+#: src/popthelp.c:616
 msgid "Usage:"
 msgstr "Användning:"
 
-#: src/popthelp.c:630
+#: src/popthelp.c:638
 msgid "[OPTION...]"
 msgstr "[FLAGGA...]"
diff --git a/po/th.po b/po/th.po
index 50aaf38..0faaf3a 100644
--- a/po/th.po
+++ b/po/th.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.14\n"
 "Report-Msgid-Bugs-To: <rpm-maint@lists.rpm.org>\n"
-"POT-Creation-Date: 2020-05-13 11:40+0300\n"
+"POT-Creation-Date: 2020-05-18 15:51+0300\n"
 "PO-Revision-Date: 2008-02-19 15:53+0700\n"
 "Last-Translator: Seksan Poltree <seksan.poltree@gmail.com>\n"
 "Language-Team: Thai <translation-team-th@lists.sourceforge.net>\n"
@@ -17,56 +17,56 @@ msgstr ""
 "X-Poedit-Language: Thai\n"
 "X-Poedit-Country: THAILAND\n"
 
-#: src/popt.c:37
+#: src/popt.c:46
 msgid "unknown errno"
 msgstr "เกิด errno ที่ไม่รู้จัก"
 
-#: src/popt.c:1196
+#: src/popt.c:1206
 #, c-format
 msgid "option type (%u) not implemented in popt\n"
 msgstr "ตัวเลือกชนิด (%u) ไม่ถูกอิมพลีเมนต์ใน popt\n"
 
-#: src/popt.c:1607
+#: src/popt.c:1625
 msgid "missing argument"
 msgstr "ไม่พบอาร์กิวเมนต์"
 
-#: src/popt.c:1609
+#: src/popt.c:1627
 msgid "unknown option"
 msgstr "ไม่รู้จักตัวเลือก"
 
-#: src/popt.c:1611
+#: src/popt.c:1629
 msgid "mutually exclusive logical operations requested"
 msgstr "เกิดการร้องขอร่วมกันของการดำเนินการด้านตรรกะอย่างเดียวกัน"
 
-#: src/popt.c:1613
+#: src/popt.c:1631
 msgid "opt->arg should not be NULL"
 msgstr "opt->arg ไม่ควรจะเป็น NULL"
 
-#: src/popt.c:1615
+#: src/popt.c:1633
 msgid "aliases nested too deeply"
 msgstr "นามแฝงซ้อนกันมากเกินไป"
 
-#: src/popt.c:1617
+#: src/popt.c:1635
 msgid "error in parameter quoting"
 msgstr "เกิดข้อผิดพลาดในการอ้างอิงพารามิเตอร์"
 
-#: src/popt.c:1619
+#: src/popt.c:1637
 msgid "invalid numeric value"
 msgstr "ค่าตัวเลขผิดพลาด"
 
-#: src/popt.c:1621
+#: src/popt.c:1639
 msgid "number too large or too small"
 msgstr "ตัวเลขมีค่ามากหรือน้อยเกินไป"
 
-#: src/popt.c:1623
+#: src/popt.c:1641
 msgid "memory allocation failed"
 msgstr "การจัดสรรหน่วยความจำผิดพลาด"
 
-#: src/popt.c:1625
+#: src/popt.c:1643
 msgid "config file failed sanity test"
 msgstr ""
 
-#: src/popt.c:1629
+#: src/popt.c:1647
 msgid "unknown error"
 msgstr "ความผิดพลาดที่ไม่รู้จัก"
 
@@ -134,10 +134,10 @@ msgstr "DOUBLE"
 msgid "ARG"
 msgstr "ARG"
 
-#: src/popthelp.c:608
+#: src/popthelp.c:616
 msgid "Usage:"
 msgstr "วิธีใช้:"
 
-#: src/popthelp.c:630
+#: src/popthelp.c:638
 msgid "[OPTION...]"
 msgstr "[ตัวเลือก...]"
diff --git a/po/tr.po b/po/tr.po
index edbbb1b..c0108c1 100644
--- a/po/tr.po
+++ b/po/tr.po
@@ -5,7 +5,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.11\n"
 "Report-Msgid-Bugs-To: <rpm-maint@lists.rpm.org>\n"
-"POT-Creation-Date: 2020-05-13 11:40+0300\n"
+"POT-Creation-Date: 2020-05-18 15:51+0300\n"
 "PO-Revision-Date: 2000-02-11 13:01+0200\n"
 "Last-Translator: Nilgun Belma Buguner <nilgun@technologist.com>\n"
 "Language-Team: Turkish <tr@li.org>\n"
@@ -14,56 +14,56 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: src/popt.c:37
+#: src/popt.c:46
 msgid "unknown errno"
 msgstr "bilinmeyen hata no"
 
-#: src/popt.c:1196
+#: src/popt.c:1206
 #, fuzzy, c-format
 msgid "option type (%u) not implemented in popt\n"
 msgstr "seçenek tßrß (%d) popt için geçersiz\n"
 
-#: src/popt.c:1607
+#: src/popt.c:1625
 msgid "missing argument"
 msgstr "argĂźman eksik"
 
-#: src/popt.c:1609
+#: src/popt.c:1627
 msgid "unknown option"
 msgstr "bilinmeyen seçenek"
 
-#: src/popt.c:1611
+#: src/popt.c:1629
 msgid "mutually exclusive logical operations requested"
 msgstr "birbirini dışlayan mantıksal işlemler istendi"
 
-#: src/popt.c:1613
+#: src/popt.c:1631
 msgid "opt->arg should not be NULL"
 msgstr ""
 
-#: src/popt.c:1615
+#: src/popt.c:1633
 msgid "aliases nested too deeply"
 msgstr "adlarda çok fazla içiçelikler"
 
-#: src/popt.c:1617
+#: src/popt.c:1635
 msgid "error in parameter quoting"
 msgstr "parametrelerde tırnak işaretleme hatalı "
 
-#: src/popt.c:1619
+#: src/popt.c:1637
 msgid "invalid numeric value"
 msgstr "sayısal değer geçersiz"
 
-#: src/popt.c:1621
+#: src/popt.c:1639
 msgid "number too large or too small"
 msgstr "sayĹ ya çok bßyßk ya da çok kßçßk"
 
-#: src/popt.c:1623
+#: src/popt.c:1641
 msgid "memory allocation failed"
 msgstr ""
 
-#: src/popt.c:1625
+#: src/popt.c:1643
 msgid "config file failed sanity test"
 msgstr ""
 
-#: src/popt.c:1629
+#: src/popt.c:1647
 msgid "unknown error"
 msgstr "bilinmeyen hata"
 
@@ -133,10 +133,10 @@ msgstr "DOUBLE"
 msgid "ARG"
 msgstr "ARG"
 
-#: src/popthelp.c:608
+#: src/popthelp.c:616
 msgid "Usage:"
 msgstr "KullanÄąmÄą:"
 
-#: src/popthelp.c:630
+#: src/popthelp.c:638
 msgid "[OPTION...]"
 msgstr "[SEÇENEK...]"
diff --git a/po/uk.po b/po/uk.po
index 88e8588..7b474a9 100644
--- a/po/uk.po
+++ b/po/uk.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.11\n"
 "Report-Msgid-Bugs-To: <rpm-maint@lists.rpm.org>\n"
-"POT-Creation-Date: 2020-05-13 11:40+0300\n"
+"POT-Creation-Date: 2020-05-18 15:51+0300\n"
 "PO-Revision-Date: 1999-09-30 16:54+0200\n"
 "Last-Translator: Yuri Syrota <rasta@renome.rovno.ua>\n"
 "Language-Team: Ukrainian <uk@li.org>\n"
@@ -15,56 +15,56 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: src/popt.c:37
+#: src/popt.c:46
 msgid "unknown errno"
 msgstr ""
 
-#: src/popt.c:1196
+#: src/popt.c:1206
 #, c-format
 msgid "option type (%u) not implemented in popt\n"
 msgstr ""
 
-#: src/popt.c:1607
+#: src/popt.c:1625
 msgid "missing argument"
 msgstr ""
 
-#: src/popt.c:1609
+#: src/popt.c:1627
 msgid "unknown option"
 msgstr ""
 
-#: src/popt.c:1611
+#: src/popt.c:1629
 msgid "mutually exclusive logical operations requested"
 msgstr ""
 
-#: src/popt.c:1613
+#: src/popt.c:1631
 msgid "opt->arg should not be NULL"
 msgstr ""
 
-#: src/popt.c:1615
+#: src/popt.c:1633
 msgid "aliases nested too deeply"
 msgstr ""
 
-#: src/popt.c:1617
+#: src/popt.c:1635
 msgid "error in parameter quoting"
 msgstr ""
 
-#: src/popt.c:1619
+#: src/popt.c:1637
 msgid "invalid numeric value"
 msgstr ""
 
-#: src/popt.c:1621
+#: src/popt.c:1639
 msgid "number too large or too small"
 msgstr ""
 
-#: src/popt.c:1623
+#: src/popt.c:1641
 msgid "memory allocation failed"
 msgstr ""
 
-#: src/popt.c:1625
+#: src/popt.c:1643
 msgid "config file failed sanity test"
 msgstr ""
 
-#: src/popt.c:1629
+#: src/popt.c:1647
 msgid "unknown error"
 msgstr ""
 
@@ -133,10 +133,10 @@ msgstr ""
 msgid "ARG"
 msgstr ""
 
-#: src/popthelp.c:608
+#: src/popthelp.c:616
 msgid "Usage:"
 msgstr ""
 
-#: src/popthelp.c:630
+#: src/popthelp.c:638
 msgid "[OPTION...]"
 msgstr ""
diff --git a/po/vi.po b/po/vi.po
index 5f217cf..ae0863b 100644
--- a/po/vi.po
+++ b/po/vi.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.14\n"
 "Report-Msgid-Bugs-To: <rpm-maint@lists.rpm.org>\n"
-"POT-Creation-Date: 2020-05-13 11:40+0300\n"
+"POT-Creation-Date: 2020-05-18 15:51+0300\n"
 "PO-Revision-Date: 2008-02-18 16:20+1030\n"
 "Last-Translator: Clytie Siddall <clytie@riverland.net.au>\n"
 "Language-Team: Vietnamese <vi-VN@googlegroups.com>\n"
@@ -18,56 +18,56 @@ msgstr ""
 "Plural-Forms: nplurals=1; plural=0;\n"
 "X-Generator: LocFactoryEditor 1.7b3\n"
 
-#: src/popt.c:37
+#: src/popt.c:46
 msgid "unknown errno"
 msgstr "số hiệu lỗi không rõ"
 
-#: src/popt.c:1196
+#: src/popt.c:1206
 #, c-format
 msgid "option type (%u) not implemented in popt\n"
 msgstr "kiểu tùy chọn (%u) chưa được thực hiện trong popt\n"
 
-#: src/popt.c:1607
+#: src/popt.c:1625
 msgid "missing argument"
 msgstr "thiếu đối số"
 
-#: src/popt.c:1609
+#: src/popt.c:1627
 msgid "unknown option"
 msgstr "tùy chọn không rõ"
 
-#: src/popt.c:1611
+#: src/popt.c:1629
 msgid "mutually exclusive logical operations requested"
 msgstr "các thao tác hợp lý loại từ lẫn nhau được yêu cầu"
 
-#: src/popt.c:1613
+#: src/popt.c:1631
 msgid "opt->arg should not be NULL"
 msgstr "« tùy chọn->đối số » không thể vô giá trị"
 
-#: src/popt.c:1615
+#: src/popt.c:1633
 msgid "aliases nested too deeply"
 msgstr "các bí danh lồng nhau quá sâu"
 
-#: src/popt.c:1617
+#: src/popt.c:1635
 msgid "error in parameter quoting"
 msgstr "gặp lỗi trong lời trích dẫn tham số"
 
-#: src/popt.c:1619
+#: src/popt.c:1637
 msgid "invalid numeric value"
 msgstr "giá trị thuộc số không hợp lệ"
 
-#: src/popt.c:1621
+#: src/popt.c:1639
 msgid "number too large or too small"
 msgstr "con số quá lớn hay quá nhỏ"
 
-#: src/popt.c:1623
+#: src/popt.c:1641
 msgid "memory allocation failed"
 msgstr "lỗi cấp phát bộ nhớ"
 
-#: src/popt.c:1625
+#: src/popt.c:1643
 msgid "config file failed sanity test"
 msgstr ""
 
-#: src/popt.c:1629
+#: src/popt.c:1647
 msgid "unknown error"
 msgstr "lỗi không rõ"
 
@@ -135,10 +135,10 @@ msgstr "ĐÔI"
 msgid "ARG"
 msgstr "ĐỐI SỐ"
 
-#: src/popthelp.c:608
+#: src/popthelp.c:616
 msgid "Usage:"
 msgstr "Sử dụng:"
 
-#: src/popthelp.c:630
+#: src/popthelp.c:638
 msgid "[OPTION...]"
 msgstr "[TÙY_CHỌN...]"
diff --git a/po/wa.po b/po/wa.po
index 9f95b0d..d880e44 100644
--- a/po/wa.po
+++ b/po/wa.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.11\n"
 "Report-Msgid-Bugs-To: <rpm-maint@lists.rpm.org>\n"
-"POT-Creation-Date: 2020-05-13 11:40+0300\n"
+"POT-Creation-Date: 2020-05-18 15:51+0300\n"
 "PO-Revision-Date: 1999-03-18 23:11+0100\n"
 "Last-Translator: Nobody yet\n"
 "Language-Team: walon <linux-wa@chanae.alphanet.ch>\n"
@@ -19,56 +19,56 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: src/popt.c:37
+#: src/popt.c:46
 msgid "unknown errno"
 msgstr ""
 
-#: src/popt.c:1196
+#: src/popt.c:1206
 #, c-format
 msgid "option type (%u) not implemented in popt\n"
 msgstr ""
 
-#: src/popt.c:1607
+#: src/popt.c:1625
 msgid "missing argument"
 msgstr ""
 
-#: src/popt.c:1609
+#: src/popt.c:1627
 msgid "unknown option"
 msgstr ""
 
-#: src/popt.c:1611
+#: src/popt.c:1629
 msgid "mutually exclusive logical operations requested"
 msgstr ""
 
-#: src/popt.c:1613
+#: src/popt.c:1631
 msgid "opt->arg should not be NULL"
 msgstr ""
 
-#: src/popt.c:1615
+#: src/popt.c:1633
 msgid "aliases nested too deeply"
 msgstr ""
 
-#: src/popt.c:1617
+#: src/popt.c:1635
 msgid "error in parameter quoting"
 msgstr ""
 
-#: src/popt.c:1619
+#: src/popt.c:1637
 msgid "invalid numeric value"
 msgstr ""
 
-#: src/popt.c:1621
+#: src/popt.c:1639
 msgid "number too large or too small"
 msgstr ""
 
-#: src/popt.c:1623
+#: src/popt.c:1641
 msgid "memory allocation failed"
 msgstr ""
 
-#: src/popt.c:1625
+#: src/popt.c:1643
 msgid "config file failed sanity test"
 msgstr ""
 
-#: src/popt.c:1629
+#: src/popt.c:1647
 msgid "unknown error"
 msgstr ""
 
@@ -137,10 +137,10 @@ msgstr ""
 msgid "ARG"
 msgstr ""
 
-#: src/popthelp.c:608
+#: src/popthelp.c:616
 msgid "Usage:"
 msgstr ""
 
-#: src/popthelp.c:630
+#: src/popthelp.c:638
 msgid "[OPTION...]"
 msgstr ""
diff --git a/po/zh_CN.po b/po/zh_CN.po
index d2d3b3d..58d1a00 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.14\n"
 "Report-Msgid-Bugs-To: <rpm-maint@lists.rpm.org>\n"
-"POT-Creation-Date: 2020-05-13 11:40+0300\n"
+"POT-Creation-Date: 2020-05-18 15:51+0300\n"
 "PO-Revision-Date: 2008-02-18 20:16+0800\n"
 "Last-Translator: LI Daobing <lidaobing@gmail.com>\n"
 "Language-Team: Chinese (simplified) <i18n-zh@googlegroups.com>\n"
@@ -17,56 +17,56 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: src/popt.c:37
+#: src/popt.c:46
 msgid "unknown errno"
 msgstr "未知的错误"
 
-#: src/popt.c:1196
+#: src/popt.c:1206
 #, c-format
 msgid "option type (%u) not implemented in popt\n"
 msgstr "选项类别 (%u) 没有在 popt 中实现\n"
 
-#: src/popt.c:1607
+#: src/popt.c:1625
 msgid "missing argument"
 msgstr "缺少参数"
 
-#: src/popt.c:1609
+#: src/popt.c:1627
 msgid "unknown option"
 msgstr "未知的选项"
 
-#: src/popt.c:1611
+#: src/popt.c:1629
 msgid "mutually exclusive logical operations requested"
 msgstr "需要 XOR 逻辑运算"
 
-#: src/popt.c:1613
+#: src/popt.c:1631
 msgid "opt->arg should not be NULL"
 msgstr "opt->arg 不应该为 NULL"
 
-#: src/popt.c:1615
+#: src/popt.c:1633
 msgid "aliases nested too deeply"
 msgstr "别名嵌套太深"
 
-#: src/popt.c:1617
+#: src/popt.c:1635
 msgid "error in parameter quoting"
 msgstr "参数引号错误"
 
-#: src/popt.c:1619
+#: src/popt.c:1637
 msgid "invalid numeric value"
 msgstr "无效的数值"
 
-#: src/popt.c:1621
+#: src/popt.c:1639
 msgid "number too large or too small"
 msgstr "数值太大或太小"
 
-#: src/popt.c:1623
+#: src/popt.c:1641
 msgid "memory allocation failed"
 msgstr "内存分配错误"
 
-#: src/popt.c:1625
+#: src/popt.c:1643
 msgid "config file failed sanity test"
 msgstr ""
 
-#: src/popt.c:1629
+#: src/popt.c:1647
 msgid "unknown error"
 msgstr "未知的错误"
 
@@ -134,10 +134,10 @@ msgstr "DOUBLE"
 msgid "ARG"
 msgstr "ARG"
 
-#: src/popthelp.c:608
+#: src/popthelp.c:616
 msgid "Usage:"
 msgstr "用法:"
 
-#: src/popthelp.c:630
+#: src/popthelp.c:638
 msgid "[OPTION...]"
 msgstr "[选项...]"
diff --git a/po/zh_TW.po b/po/zh_TW.po
index 6e33af3..a38c33b 100644
--- a/po/zh_TW.po
+++ b/po/zh_TW.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.11\n"
 "Report-Msgid-Bugs-To: <rpm-maint@lists.rpm.org>\n"
-"POT-Creation-Date: 2020-05-13 11:40+0300\n"
+"POT-Creation-Date: 2020-05-18 15:51+0300\n"
 "PO-Revision-Date: 2005-04-08 17:52+0800\n"
 "Last-Translator: Wei-Lun Chao <chaoweilun@pcmail.com.tw>\n"
 "Language-Team: zh_TW <zh-l10n@linux.org.tw>\n"
@@ -15,56 +15,56 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: src/popt.c:37
+#: src/popt.c:46
 msgid "unknown errno"
 msgstr "未知的錯誤"
 
-#: src/popt.c:1196
+#: src/popt.c:1206
 #, fuzzy, c-format
 msgid "option type (%u) not implemented in popt\n"
 msgstr "選項類型 (%d) 沒有在 popt 中實作\n"
 
-#: src/popt.c:1607
+#: src/popt.c:1625
 msgid "missing argument"
 msgstr "缺少引數"
 
-#: src/popt.c:1609
+#: src/popt.c:1627
 msgid "unknown option"
 msgstr "未知的選項"
 
-#: src/popt.c:1611
+#: src/popt.c:1629
 msgid "mutually exclusive logical operations requested"
 msgstr "需要相互獨立的邏輯運算"
 
-#: src/popt.c:1613
+#: src/popt.c:1631
 msgid "opt->arg should not be NULL"
 msgstr "opt->arg 不應為 NULL"
 
-#: src/popt.c:1615
+#: src/popt.c:1633
 msgid "aliases nested too deeply"
 msgstr "巢狀別名太深"
 
-#: src/popt.c:1617
+#: src/popt.c:1635
 msgid "error in parameter quoting"
 msgstr "參數引號錯誤"
 
-#: src/popt.c:1619
+#: src/popt.c:1637
 msgid "invalid numeric value"
 msgstr "不正確的數值"
 
-#: src/popt.c:1621
+#: src/popt.c:1639
 msgid "number too large or too small"
 msgstr "數字太大或太小"
 
-#: src/popt.c:1623
+#: src/popt.c:1641
 msgid "memory allocation failed"
 msgstr "記憶體配置錯誤"
 
-#: src/popt.c:1625
+#: src/popt.c:1643
 msgid "config file failed sanity test"
 msgstr ""
 
-#: src/popt.c:1629
+#: src/popt.c:1647
 msgid "unknown error"
 msgstr "未知的錯誤"
 
@@ -133,10 +133,10 @@ msgstr "DOUBLE"
 msgid "ARG"
 msgstr "ARG"
 
-#: src/popthelp.c:608
+#: src/popthelp.c:616
 msgid "Usage:"
 msgstr "用法:"
 
-#: src/popthelp.c:630
+#: src/popthelp.c:638
 msgid "[OPTION...]"
 msgstr "[選項...]"
diff --git a/src/Makefile.am b/src/Makefile.am
index a5d5323..c9e052a 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -14,7 +14,7 @@ libpopt_la_SOURCES = popt.c poptparse.c poptconfig.c popthelp.c poptint.c
 
 libpopt_la_LDFLAGS = -no-undefined @LTLIBINTL@ @LTLIBICONV@
 # libtool current:revision:age info
-libpopt_la_LDFLAGS += -version-info 0:0:0
+libpopt_la_LDFLAGS += -version-info 0:1:0
 
 if HAVE_LD_VERSION_SCRIPT
 libpopt_la_LDFLAGS += -Wl,--version-script=$(top_srcdir)/src/libpopt.vers
-- 
Gitee


From 7e6478831e93fda9419ef576f9819f49ba06f972 Mon Sep 17 00:00:00 2001
From: Panu Matilainen <pmatilai@redhat.com>
Date: Tue, 23 Jun 2020 13:29:53 +0300
Subject: [PATCH 667/667] Preparing for popt 1.18 final

No changes from 1.18 rc1
---
 configure.ac | 2 +-
 po/cs.po     | 2 +-
 po/da.po     | 2 +-
 po/de.po     | 2 +-
 po/eo.po     | 2 +-
 po/es.po     | 2 +-
 po/fi.po     | 2 +-
 po/fr.po     | 2 +-
 po/ga.po     | 2 +-
 po/gl.po     | 2 +-
 po/hu.po     | 2 +-
 po/id.po     | 2 +-
 po/is.po     | 2 +-
 po/it.po     | 2 +-
 po/ja.po     | 2 +-
 po/ko.po     | 2 +-
 po/lv.po     | 2 +-
 po/nb.po     | 2 +-
 po/nl.po     | 2 +-
 po/pl.po     | 2 +-
 po/popt.pot  | 4 ++--
 po/pt.po     | 2 +-
 po/ro.po     | 2 +-
 po/ru.po     | 2 +-
 po/sk.po     | 2 +-
 po/sl.po     | 2 +-
 po/sv.po     | 2 +-
 po/th.po     | 2 +-
 po/tr.po     | 2 +-
 po/uk.po     | 2 +-
 po/vi.po     | 2 +-
 po/wa.po     | 2 +-
 po/zh_CN.po  | 2 +-
 po/zh_TW.po  | 2 +-
 34 files changed, 35 insertions(+), 35 deletions(-)

diff --git a/configure.ac b/configure.ac
index 69e6d1a..a5568c4 100755
--- a/configure.ac
+++ b/configure.ac
@@ -1,5 +1,5 @@
 AC_PREREQ(2.57)
-AC_INIT(popt, 1.18-rc1, rpm-maint@lists.rpm.org)
+AC_INIT(popt, 1.18, rpm-maint@lists.rpm.org)
 AC_CONFIG_SRCDIR([src/popt.h])
 AC_CONFIG_HEADERS([config.h])
 
diff --git a/po/cs.po b/po/cs.po
index 276fafb..41e4bf1 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.14\n"
 "Report-Msgid-Bugs-To: <rpm-maint@lists.rpm.org>\n"
-"POT-Creation-Date: 2020-05-18 15:51+0300\n"
+"POT-Creation-Date: 2020-06-23 13:29+0300\n"
 "PO-Revision-Date: 2008-12-08 19:55+0100\n"
 "Last-Translator: Petr Pisar <petr.pisar@atlas.cz>\n"
 "Language-Team: Czech <translation-team-cs@lists.sourceforge.net>\n"
diff --git a/po/da.po b/po/da.po
index ca851a3..d606a30 100644
--- a/po/da.po
+++ b/po/da.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: popt-1.14\n"
 "Report-Msgid-Bugs-To: <rpm-maint@lists.rpm.org>\n"
-"POT-Creation-Date: 2020-05-18 15:51+0300\n"
+"POT-Creation-Date: 2020-06-23 13:29+0300\n"
 "PO-Revision-Date: 2008-09-15 00:00+0000\n"
 "Last-Translator: Joe Hansen <joedalton2@yahoo.dk>\n"
 "Language-Team: Danish <dansk@dansk-gruppen.dk>\n"
diff --git a/po/de.po b/po/de.po
index 1c20f37..f15c55d 100644
--- a/po/de.po
+++ b/po/de.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.14\n"
 "Report-Msgid-Bugs-To: <rpm-maint@lists.rpm.org>\n"
-"POT-Creation-Date: 2020-05-18 15:51+0300\n"
+"POT-Creation-Date: 2020-06-23 13:29+0300\n"
 "PO-Revision-Date: 2009-11-10 19:58+0100\n"
 "Last-Translator: Roland Illig <roland.illig@gmx.de>\n"
 "Language-Team: German <translation-team-de@lists.sourceforge.net>\n"
diff --git a/po/eo.po b/po/eo.po
index 6966b33..bcd95a2 100644
--- a/po/eo.po
+++ b/po/eo.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.14\n"
 "Report-Msgid-Bugs-To: <rpm-maint@lists.rpm.org>\n"
-"POT-Creation-Date: 2020-05-18 15:51+0300\n"
+"POT-Creation-Date: 2020-06-23 13:29+0300\n"
 "PO-Revision-Date: 2008-08-03 15:50-0300\n"
 "Last-Translator: Felipe Castro <fefcas@gmail.com>\n"
 "Language-Team: Esperanto <translation-team-eo@lists.sourceforge.net>\n"
diff --git a/po/es.po b/po/es.po
index ee22d54..1231244 100644
--- a/po/es.po
+++ b/po/es.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.12\n"
 "Report-Msgid-Bugs-To: <rpm-maint@lists.rpm.org>\n"
-"POT-Creation-Date: 2020-05-18 15:51+0300\n"
+"POT-Creation-Date: 2020-06-23 13:29+0300\n"
 "PO-Revision-Date: 2007-12-28 12:22+0100\n"
 "Last-Translator: Leandro Lucarella <luca@linuxmendoza.org.ar>\n"
 "Language-Team: Spanish <es@li.org>\n"
diff --git a/po/fi.po b/po/fi.po
index 8a92289..867ac86 100644
--- a/po/fi.po
+++ b/po/fi.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.14\n"
 "Report-Msgid-Bugs-To: <rpm-maint@lists.rpm.org>\n"
-"POT-Creation-Date: 2020-05-18 15:51+0300\n"
+"POT-Creation-Date: 2020-06-23 13:29+0300\n"
 "PO-Revision-Date: 2008-02-21 18:19+0200\n"
 "Last-Translator: Jorma Karvonen <karvjorm@users.sf.net>\n"
 "Language-Team: Finnish <translation-team-fi@lists.sourceforge.net>\n"
diff --git a/po/fr.po b/po/fr.po
index f561d4b..9567bbb 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -12,7 +12,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.11\n"
 "Report-Msgid-Bugs-To: <rpm-maint@lists.rpm.org>\n"
-"POT-Creation-Date: 2020-05-18 15:51+0300\n"
+"POT-Creation-Date: 2020-06-23 13:29+0300\n"
 "PO-Revision-Date: 2003-06-22 23:43+0200\n"
 "Last-Translator: RPM French Translation <rpm-fr@livna.org>\n"
 "Language-Team: RPM French Translation <rpm-fr@livna.org>\n"
diff --git a/po/ga.po b/po/ga.po
index 850df76..f524a89 100644
--- a/po/ga.po
+++ b/po/ga.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.14\n"
 "Report-Msgid-Bugs-To: <rpm-maint@lists.rpm.org>\n"
-"POT-Creation-Date: 2020-05-18 15:51+0300\n"
+"POT-Creation-Date: 2020-06-23 13:29+0300\n"
 "PO-Revision-Date: 2008-04-10 06:21-0500\n"
 "Last-Translator: Kevin Scannell <kscanne@gmail.com>\n"
 "Language-Team: Irish <gaeilge-gnulinux@lists.sourceforge.net>\n"
diff --git a/po/gl.po b/po/gl.po
index 7dbdf70..cd81245 100644
--- a/po/gl.po
+++ b/po/gl.po
@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.11\n"
 "Report-Msgid-Bugs-To: <rpm-maint@lists.rpm.org>\n"
-"POT-Creation-Date: 2020-05-18 15:51+0300\n"
+"POT-Creation-Date: 2020-06-23 13:29+0300\n"
 "PO-Revision-Date: 2001-01-17 01:01+0100\n"
 "Last-Translator: Jesús Bravo Álvarez <jba@pobox.com>\n"
 "Language-Team: Galician <trasno@ceu.fi.udc.es>\n"
diff --git a/po/hu.po b/po/hu.po
index 921a4c7..6d50957 100644
--- a/po/hu.po
+++ b/po/hu.po
@@ -5,7 +5,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.11\n"
 "Report-Msgid-Bugs-To: <rpm-maint@lists.rpm.org>\n"
-"POT-Creation-Date: 2020-05-18 15:51+0300\n"
+"POT-Creation-Date: 2020-06-23 13:29+0300\n"
 "PO-Revision-Date: 2007-06-21 00:45+0200\n"
 "Last-Translator: Gabor Kelemen <kelemeng@gnome.hu>\n"
 "Language-Team: Hungarian <translation-team-hu@lists.sourceforge.net>\n"
diff --git a/po/id.po b/po/id.po
index 18fa2e9..42186e2 100644
--- a/po/id.po
+++ b/po/id.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.14\n"
 "Report-Msgid-Bugs-To: <rpm-maint@lists.rpm.org>\n"
-"POT-Creation-Date: 2020-05-18 15:51+0300\n"
+"POT-Creation-Date: 2020-06-23 13:29+0300\n"
 "PO-Revision-Date: 2008-08-26 14:18+0700\n"
 "Last-Translator: Andhika Padmawan <andhika.padmawan@gmail.com>\n"
 "Language-Team: Indonesian <translation-team-id@lists.sourceforge.net>\n"
diff --git a/po/is.po b/po/is.po
index 67b22f8..184c30d 100644
--- a/po/is.po
+++ b/po/is.po
@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.11\n"
 "Report-Msgid-Bugs-To: <rpm-maint@lists.rpm.org>\n"
-"POT-Creation-Date: 2020-05-18 15:51+0300\n"
+"POT-Creation-Date: 2020-06-23 13:29+0300\n"
 "PO-Revision-Date: 2001-06-08 01:35+0000\n"
 "Last-Translator: Richard Allen <ra@hp.is>\n"
 "Language-Team: is <kde-isl@mmedia.is>\n"
diff --git a/po/it.po b/po/it.po
index 0b8349d..9d2d85e 100644
--- a/po/it.po
+++ b/po/it.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: popt-1.14\n"
 "Report-Msgid-Bugs-To: <rpm-maint@lists.rpm.org>\n"
-"POT-Creation-Date: 2020-05-18 15:51+0300\n"
+"POT-Creation-Date: 2020-06-23 13:29+0300\n"
 "PO-Revision-Date: 2008-11-28 15:32+0100\n"
 "Last-Translator: Vincenzo Campanella <vinz65@gmail.com>\n"
 "Language-Team: Italian <tp@lists.linux.it>\n"
diff --git a/po/ja.po b/po/ja.po
index 4910b1f..1b06ec6 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.11\n"
 "Report-Msgid-Bugs-To: <rpm-maint@lists.rpm.org>\n"
-"POT-Creation-Date: 2020-05-18 15:51+0300\n"
+"POT-Creation-Date: 2020-06-23 13:29+0300\n"
 "PO-Revision-Date: 2003--8-25 19:00+0900\n"
 "Last-Translator: Yukihiro Nakai <ynakai@redhat.com>\n"
 "Language-Team: Japanese <ja@li.org>\n"
diff --git a/po/ko.po b/po/ko.po
index 9ce1bd3..0743e12 100644
--- a/po/ko.po
+++ b/po/ko.po
@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.11\n"
 "Report-Msgid-Bugs-To: <rpm-maint@lists.rpm.org>\n"
-"POT-Creation-Date: 2020-05-18 15:51+0300\n"
+"POT-Creation-Date: 2020-06-23 13:29+0300\n"
 "PO-Revision-Date: 2001-09-06 20:06+0900\n"
 "Last-Translator: Jong-Hoon Ryu <redhat4u@netian.com>\n"
 "Language-Team: GNU Translation project <ko@li.org>\n"
diff --git a/po/lv.po b/po/lv.po
index 3b77629..0261d3d 100644
--- a/po/lv.po
+++ b/po/lv.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: popt-1.14\n"
 "Report-Msgid-Bugs-To: <rpm-maint@lists.rpm.org>\n"
-"POT-Creation-Date: 2020-05-18 15:51+0300\n"
+"POT-Creation-Date: 2020-06-23 13:29+0300\n"
 "PO-Revision-Date: 2009-04-12 16:34+0300\n"
 "Last-Translator: Rihards Prieditis <RPrieditis@inbox.lv>\n"
 "Language-Team: Latvian <translation-team-lv@lists.sourceforge.net>\n"
diff --git a/po/nb.po b/po/nb.po
index 2c2f8a1..d02fc87 100644
--- a/po/nb.po
+++ b/po/nb.po
@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.11\n"
 "Report-Msgid-Bugs-To: <rpm-maint@lists.rpm.org>\n"
-"POT-Creation-Date: 2020-05-18 15:51+0300\n"
+"POT-Creation-Date: 2020-06-23 13:29+0300\n"
 "PO-Revision-Date: 2001-06-27 11:05+0200\n"
 "Last-Translator: Kjartan Maraas <kmaraas@online.no>\n"
 "Language-Team: Norwegian <no@li.org>\n"
diff --git a/po/nl.po b/po/nl.po
index b0f7b91..3365a1d 100644
--- a/po/nl.po
+++ b/po/nl.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.14\n"
 "Report-Msgid-Bugs-To: <rpm-maint@lists.rpm.org>\n"
-"POT-Creation-Date: 2020-05-18 15:51+0300\n"
+"POT-Creation-Date: 2020-06-23 13:29+0300\n"
 "PO-Revision-Date: 2008-02-20 19:26+0100\n"
 "Last-Translator: Tim Van Holder <tim.van.holder@telenet.be>\n"
 "Language-Team: Dutch <vertaling@vrijschrift.org>\n"
diff --git a/po/pl.po b/po/pl.po
index f53c72e..bf80048 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.14\n"
 "Report-Msgid-Bugs-To: <rpm-maint@lists.rpm.org>\n"
-"POT-Creation-Date: 2020-05-18 15:51+0300\n"
+"POT-Creation-Date: 2020-06-23 13:29+0300\n"
 "PO-Revision-Date: 2008-02-18 00:30+0100\n"
 "Last-Translator: Jakub Bogusz <qboosh@pld-linux.org>\n"
 "Language-Team: Polish <translation-team-pl@lists.sourceforge.net>\n"
diff --git a/po/popt.pot b/po/popt.pot
index 12c7151..1b2b5d7 100644
--- a/po/popt.pot
+++ b/po/popt.pot
@@ -5,9 +5,9 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: popt 1.18-rc1\n"
+"Project-Id-Version: popt 1.18\n"
 "Report-Msgid-Bugs-To: <rpm-maint@lists.rpm.org>\n"
-"POT-Creation-Date: 2020-05-18 15:51+0300\n"
+"POT-Creation-Date: 2020-06-23 13:29+0300\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/po/pt.po b/po/pt.po
index cddfb5a..236ecd5 100644
--- a/po/pt.po
+++ b/po/pt.po
@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.11\n"
 "Report-Msgid-Bugs-To: <rpm-maint@lists.rpm.org>\n"
-"POT-Creation-Date: 2020-05-18 15:51+0300\n"
+"POT-Creation-Date: 2020-06-23 13:29+0300\n"
 "PO-Revision-Date: 2002-02-13 18:32+0000\n"
 "Last-Translator: Pedro Morais <morais@kde.org>\n"
 "Language-Team: pt <morais@kde.org>\n"
diff --git a/po/ro.po b/po/ro.po
index d396bd1..91abdd8 100644
--- a/po/ro.po
+++ b/po/ro.po
@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.11\n"
 "Report-Msgid-Bugs-To: <rpm-maint@lists.rpm.org>\n"
-"POT-Creation-Date: 2020-05-18 15:51+0300\n"
+"POT-Creation-Date: 2020-06-23 13:29+0300\n"
 "PO-Revision-Date: 2000-06-14 23:23+EST\n"
 "Last-Translator: Cristian Gafton <gafton@redhat.com>\n"
 "Language-Team: Romanian <ro@li.org>\n"
diff --git a/po/ru.po b/po/ru.po
index ba7fbf2..a308087 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.14\n"
 "Report-Msgid-Bugs-To: <rpm-maint@lists.rpm.org>\n"
-"POT-Creation-Date: 2020-05-18 15:51+0300\n"
+"POT-Creation-Date: 2020-06-23 13:29+0300\n"
 "PO-Revision-Date: 2009-02-01 13:30+0300\n"
 "Last-Translator: Yuri Kozlov <yuray@komyakino.ru>\n"
 "Language-Team: Russian <gnu@mx.ru>\n"
diff --git a/po/sk.po b/po/sk.po
index c41f823..412344c 100644
--- a/po/sk.po
+++ b/po/sk.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.11\n"
 "Report-Msgid-Bugs-To: <rpm-maint@lists.rpm.org>\n"
-"POT-Creation-Date: 2020-05-18 15:51+0300\n"
+"POT-Creation-Date: 2020-06-23 13:29+0300\n"
 "PO-Revision-Date: 1999-08-04 21:40+0200\n"
 "Last-Translator: Stanislav Meduna <stano@eunet.sk>\n"
 "Language-Team: Slovak <sk-i18n@rak.isternet.sk>\n"
diff --git a/po/sl.po b/po/sl.po
index 3ed76a8..ff8ca5a 100644
--- a/po/sl.po
+++ b/po/sl.po
@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.11\n"
 "Report-Msgid-Bugs-To: <rpm-maint@lists.rpm.org>\n"
-"POT-Creation-Date: 2020-05-18 15:51+0300\n"
+"POT-Creation-Date: 2020-06-23 13:29+0300\n"
 "PO-Revision-Date: 2000-09-05 12:30+0200\n"
 "Last-Translator: Roman Maurer <roman.maurer@hermes.si>\n"
 "Language-Team: Slovenian <sl@li.org>\n"
diff --git a/po/sv.po b/po/sv.po
index a668200..b5ec824 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.14\n"
 "Report-Msgid-Bugs-To: <rpm-maint@lists.rpm.org>\n"
-"POT-Creation-Date: 2020-05-18 15:51+0300\n"
+"POT-Creation-Date: 2020-06-23 13:29+0300\n"
 "PO-Revision-Date: 2008-02-23 20:15+0100\n"
 "Last-Translator: Göran Uddeborg <goeran@uddeborg.se>\n"
 "Language-Team: Swedish <tp-sv@listor.tp-sv.se>\n"
diff --git a/po/th.po b/po/th.po
index 0faaf3a..4a1433d 100644
--- a/po/th.po
+++ b/po/th.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.14\n"
 "Report-Msgid-Bugs-To: <rpm-maint@lists.rpm.org>\n"
-"POT-Creation-Date: 2020-05-18 15:51+0300\n"
+"POT-Creation-Date: 2020-06-23 13:29+0300\n"
 "PO-Revision-Date: 2008-02-19 15:53+0700\n"
 "Last-Translator: Seksan Poltree <seksan.poltree@gmail.com>\n"
 "Language-Team: Thai <translation-team-th@lists.sourceforge.net>\n"
diff --git a/po/tr.po b/po/tr.po
index c0108c1..f3b0ec6 100644
--- a/po/tr.po
+++ b/po/tr.po
@@ -5,7 +5,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.11\n"
 "Report-Msgid-Bugs-To: <rpm-maint@lists.rpm.org>\n"
-"POT-Creation-Date: 2020-05-18 15:51+0300\n"
+"POT-Creation-Date: 2020-06-23 13:29+0300\n"
 "PO-Revision-Date: 2000-02-11 13:01+0200\n"
 "Last-Translator: Nilgun Belma Buguner <nilgun@technologist.com>\n"
 "Language-Team: Turkish <tr@li.org>\n"
diff --git a/po/uk.po b/po/uk.po
index 7b474a9..3469eae 100644
--- a/po/uk.po
+++ b/po/uk.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.11\n"
 "Report-Msgid-Bugs-To: <rpm-maint@lists.rpm.org>\n"
-"POT-Creation-Date: 2020-05-18 15:51+0300\n"
+"POT-Creation-Date: 2020-06-23 13:29+0300\n"
 "PO-Revision-Date: 1999-09-30 16:54+0200\n"
 "Last-Translator: Yuri Syrota <rasta@renome.rovno.ua>\n"
 "Language-Team: Ukrainian <uk@li.org>\n"
diff --git a/po/vi.po b/po/vi.po
index ae0863b..6f32a47 100644
--- a/po/vi.po
+++ b/po/vi.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.14\n"
 "Report-Msgid-Bugs-To: <rpm-maint@lists.rpm.org>\n"
-"POT-Creation-Date: 2020-05-18 15:51+0300\n"
+"POT-Creation-Date: 2020-06-23 13:29+0300\n"
 "PO-Revision-Date: 2008-02-18 16:20+1030\n"
 "Last-Translator: Clytie Siddall <clytie@riverland.net.au>\n"
 "Language-Team: Vietnamese <vi-VN@googlegroups.com>\n"
diff --git a/po/wa.po b/po/wa.po
index d880e44..4513dc7 100644
--- a/po/wa.po
+++ b/po/wa.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.11\n"
 "Report-Msgid-Bugs-To: <rpm-maint@lists.rpm.org>\n"
-"POT-Creation-Date: 2020-05-18 15:51+0300\n"
+"POT-Creation-Date: 2020-06-23 13:29+0300\n"
 "PO-Revision-Date: 1999-03-18 23:11+0100\n"
 "Last-Translator: Nobody yet\n"
 "Language-Team: walon <linux-wa@chanae.alphanet.ch>\n"
diff --git a/po/zh_CN.po b/po/zh_CN.po
index 58d1a00..9ac3851 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.14\n"
 "Report-Msgid-Bugs-To: <rpm-maint@lists.rpm.org>\n"
-"POT-Creation-Date: 2020-05-18 15:51+0300\n"
+"POT-Creation-Date: 2020-06-23 13:29+0300\n"
 "PO-Revision-Date: 2008-02-18 20:16+0800\n"
 "Last-Translator: LI Daobing <lidaobing@gmail.com>\n"
 "Language-Team: Chinese (simplified) <i18n-zh@googlegroups.com>\n"
diff --git a/po/zh_TW.po b/po/zh_TW.po
index a38c33b..dee594f 100644
--- a/po/zh_TW.po
+++ b/po/zh_TW.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.11\n"
 "Report-Msgid-Bugs-To: <rpm-maint@lists.rpm.org>\n"
-"POT-Creation-Date: 2020-05-18 15:51+0300\n"
+"POT-Creation-Date: 2020-06-23 13:29+0300\n"
 "PO-Revision-Date: 2005-04-08 17:52+0800\n"
 "Last-Translator: Wei-Lun Chao <chaoweilun@pcmail.com.tw>\n"
 "Language-Team: zh_TW <zh-l10n@linux.org.tw>\n"
-- 
Gitee