- fixed typo in unicode_stop introduced by stty-iutf8 patch

[packages/kbd.git] / kbd-missing-nls.patch

diff -Nur kbd-1.09.orig/openvt/openvt.c kbd-1.09/openvt/openvt.c
--- kbd-1.09.orig/openvt/openvt.c	2004-01-02 04:42:27.000000000 +0100
+++ kbd-1.09/openvt/openvt.c	2004-01-03 16:07:57.933400296 +0100
@@ -53,6 +53,10 @@
    char vtname[sizeof VTNAME + 2]; /* allow 999 possible VTs */
    char *cmd = NULL, *def_cmd = NULL, *username = NULL;
 
+   setlocale(LC_ALL, "");
+   bindtextdomain(PACKAGE, LOCALEDIR);
+   textdomain(PACKAGE);
+
    /*
     * I don't like using getopt for this, but otherwise this gets messy.
     * POSIX/Gnu getopt forces the use of -- to separate child/program
@@ -240,7 +244,7 @@
 
 	 if (ioctl(fd, VT_WAITACTIVE, vtno)){
             int errsv = errno;
-	    fprintf(stderr, "\nopenvt: activation interrupted? (%s)\n",
+	    fprintf(stderr, _("\nopenvt: activation interrupted? (%s)\n"),
 		    strerror(errsv));
 	    fflush(stderr);
 	    _exit (1);
@@ -264,7 +268,7 @@
    }
 
    if ( pid < 0 ) {
-      perror("openvt: fork() error");
+      perror(_("openvt: fork() error"));
       return(6);
    }
 
@@ -295,7 +299,7 @@
 void usage(int stat)
 {
    fprintf(stderr,
-     "Usage: openvt [-c vtnumber] [-l] [-u] [-s] [-v] [-w] -- command_line\n");
+     _("Usage: openvt [-c vtnumber] [-l] [-u] [-s] [-v] [-w] -- command_line\n"));
    exit (stat);
 }
 
@@ -360,7 +364,7 @@
 
 	/* get the owner of current tty */
 	if (!(pwnam = getpwuid(console_uid))) {
-		perror("can't getpwuid");
+		perror(_("can't getpwuid"));
 		exit(1);
 	}
 
@@ -375,7 +379,7 @@
 			goto got_a_process;
 	}
 
-	fprintf(stderr,"couldn't find owner of current tty!\n");
+	fprintf(stderr,_("couldn't find owner of current tty!\n"));
 	exit(1);
 
    got_a_process:
diff -Nur kbd-1.09.orig/po/POTFILES.in kbd-1.09/po/POTFILES.in
--- kbd-1.09.orig/po/POTFILES.in	2002-12-06 16:49:48.000000000 +0100
+++ kbd-1.09/po/POTFILES.in	2004-01-03 16:08:34.474845152 +0100
@@ -5,6 +5,7 @@
 openvt/getfd.c
 openvt/openvt.c
 po/cat-id-tbl.c
+src/analyze.c
 src/chvt.c
 src/clrunimap.c
 src/deallocvt.c
@@ -18,6 +19,7 @@
 src/kbdrate.c
 src/kdfontop.c
 src/ksyms.c
+src/loadkeys.c
 src/loadunimap.c
 src/mapscrn.c
 src/outpsfheader.c
diff -Nur kbd-1.09.orig/src/analyze.l kbd-1.09/src/analyze.l
--- kbd-1.09.orig/src/analyze.l	1999-10-06 04:52:48.000000000 +0200
+++ kbd-1.09/src/analyze.l	2004-01-03 16:09:07.820775800 +0100
@@ -67,7 +67,7 @@
 			 BEGIN(0);
 			}
 <INCLSTR>[^"]|\"\"|\"[^"\n]*{Eol}	{
-			  yyerror("expected filename between quotes");
+			  yyerror(_("expected filename between quotes"));
 			  BEGIN(0); }
 {Continuation}		{line_nr++;}
 {Eol}			{line_nr++;BEGIN(0);return(EOL);}
@@ -121,5 +121,5 @@
 
 void
 stringovfl(void) {
-	lkfatal("string too long");
+	lkfatal(_("string too long"));
 }
diff -Nur kbd-1.09.orig/src/loadkeys.y kbd-1.09/src/loadkeys.y
--- kbd-1.09.orig/src/loadkeys.y	2004-01-02 02:59:58.000000000 +0100
+++ kbd-1.09/src/loadkeys.y	2004-01-03 16:11:21.032524536 +0100
@@ -250,12 +250,12 @@
 "valid options are:\n"
 "\n"
 "	-c --clearcompose clear kernel compose table\n"
-"	-d --default	  load \"" DEFMAP "\"\n"
+"	-d --default	  load \"%s\"\n"
 "	-h --help	  display this help text\n"
 "	-m --mktable      output a \"defkeymap.c\" to stdout\n"
 "	-s --clearstrings clear kernel string table\n"
 "	-u --unicode      implicit conversion to Unicode\n"
-"	-v --verbose      report the changes\n"), VERSION);
+"	-v --verbose      report the changes\n"), VERSION, DEFMAP);
 	exit(1);
 }
 
@@ -286,6 +286,10 @@
 
 	set_progname(argv[0]);
 
+	setlocale(LC_ALL, "");
+	bindtextdomain(PACKAGE, LOCALEDIR);
+	textdomain(PACKAGE);
+
 	while ((c = getopt_long(argc, argv,
 		short_opts, long_opts, NULL)) != -1) {
 		switch (c) {
--- kbd-1.10/po/pl.po.orig	2004-01-03 16:03:41.000000000 +0100
+++ kbd-1.10/po/pl.po	2004-01-03 16:31:06.730271080 +0100
@@ -78,11 +79,46 @@
 "\n"