diff options
| author | Ulrich Drepper <drepper@redhat.com> | 1996-09-08 02:07:08 +0000 |
|---|---|---|
| committer | Ulrich Drepper <drepper@redhat.com> | 1996-09-08 02:07:08 +0000 |
| commit | 8ca5c11bdfa4c5cc6ef75d048340f8854c8b3eaf (patch) | |
| tree | 8de939ae8c74160e77be56346d55ea2be618c2ba | |
| parent | 499e7464ed5c42246134fe708d783bf44a472c98 (diff) | |
| download | glibc-8ca5c11bdfa4c5cc6ef75d048340f8854c8b3eaf.tar.xz glibc-8ca5c11bdfa4c5cc6ef75d048340f8854c8b3eaf.zip | |
second update 960907 from main archive
Sun Sep 8 02:36:02 1996 Ulrich Drepper <drepper@cygnus.com>
* locale/SYS_libc.c (_libc_intl_domainname): Change value to "libc".
This is consistent with all other GNU packages. We shouldn't
take care for a possible clash. Somebody will name the domain
of a package libc if it is not the libc itself.
* MakeTAGS ($P/SYS_libc.pot): Rename to $P/libc.pot.
* po/Makefile (domainname): Change to libc.
(distribute): Now ship libc.pot.
* catgets/gencat.c (usage): Use `PACKAGE' for package name in
version information banner.
Change bug report address to bug-glibc@prep not @gnu.
* db/makedb.c (PACKAGE): New macro. Set to _libc_intl_domain.
(main): Use `PACKAGE' for package name in version information
banner.
Change bug report address to bug-glibc@prep not @gnu.
* locale/programs/locale.c (main): Use `PACKAGE' for package name
in version information banner.
Change bug report address to bug-glibc@prep not @gnu.
* locale/programs/localedef.c (main): Likewise.
* version.h (VERSION): Bump to 1.94.
* libio/iofdopen: Initialize _lock field only if _IO_MTSAFE_IO.
| -rw-r--r-- | ChangeLog | 25 | ||||
| -rw-r--r-- | MakeTAGS | 2 | ||||
| -rw-r--r-- | catgets/gencat.c | 4 | ||||
| -rw-r--r-- | db/makedb.c | 5 | ||||
| -rw-r--r-- | locale/Makefile | 1 | ||||
| -rw-r--r-- | locale/SYS_libc.c | 4 | ||||
| -rw-r--r-- | locale/programs/locale.c | 4 | ||||
| -rw-r--r-- | locale/programs/localedef.c | 4 | ||||
| -rw-r--r-- | po/Makefile | 6 | ||||
| -rw-r--r-- | po/de.po | 695 | ||||
| -rw-r--r-- | po/es.po | 1324 | ||||
| -rw-r--r-- | po/ko.po | 739 | ||||
| -rw-r--r-- | po/libc.pot (renamed from po/SYS_libc.pot) | 134 | ||||
| -rw-r--r-- | po/nl.po | 1496 | ||||
| -rw-r--r-- | po/pl.po | 1496 | ||||
| -rw-r--r-- | version.h | 2 |
16 files changed, 5153 insertions, 788 deletions
@@ -1,3 +1,26 @@ +Sun Sep 8 02:36:02 1996 Ulrich Drepper <drepper@cygnus.com> + + * locale/SYS_libc.c (_libc_intl_domainname): Change value to "libc". + This is consistent with all other GNU packages. We shouldn't + take care for a possible clash. Somebody will name the domain + of a package libc if it is not the libc itself. + * MakeTAGS ($P/SYS_libc.pot): Rename to $P/libc.pot. + * po/Makefile (domainname): Change to libc. + (distribute): Now ship libc.pot. + * catgets/gencat.c (usage): Use `PACKAGE' for package name in + version information banner. + Change bug report address to bug-glibc@prep not @gnu. + * db/makedb.c (PACKAGE): New macro. Set to _libc_intl_domain. + (main): Use `PACKAGE' for package name in version information + banner. + Change bug report address to bug-glibc@prep not @gnu. + * locale/programs/locale.c (main): Use `PACKAGE' for package name + in version information banner. + Change bug report address to bug-glibc@prep not @gnu. + * locale/programs/localedef.c (main): Likewise. + + * version.h (VERSION): Bump to 1.94. + Sat Sep 7 14:00:33 1996 David Mosberger-Tang <davidm@azstarnet.com> * catgets/catgets.c (catopen): Allocate sizeof(*result) bytes @@ -19,7 +42,7 @@ Sat Sep 7 19:39:19 1996 Ulrich Drepper <drepper@cygnus.com> Sat Sep 7 05:15:45 1996 Ulrich Drepper <drepper@cygnus.com> - * libio/iofdopen: Initialize _lock field only if _IO_MTSAFE_IO. + * libio/iofdopen: Initialize _lock field only if _IO_MTSAFE_IO. * libio/iofopen: Likewise. * libio/iofopncook.c: Likewise. * libio/iopopen.c: Likewise. @@ -166,7 +166,7 @@ $P/subdirs.pot: $(subdirs:%=$P/%.pot) include $(common-objpfx)version.mk # Combine all the messages into the final sorted template translation file. -$P/SYS_libc.pot: $(all-pot) +$P/libc.pot: $(all-pot) @rm -f $@.new sed -e 's/VERSION/$(version)/' -e "s/DATE/`date +'%Y-%m-%d %k:%M'`/" \ po/header.pot > $@.new diff --git a/catgets/gencat.c b/catgets/gencat.c index 2e275fcef2..e989a0f63d 100644 --- a/catgets/gencat.c +++ b/catgets/gencat.c @@ -166,7 +166,7 @@ main (int argc, char *argv[]) if (do_version) { fprintf (stderr, "%s - GNU %s %s\n", program_invocation_name, - "libc", VERSION); + PACKAGE, VERSION); exit (EXIT_SUCCESS); } @@ -213,7 +213,7 @@ Mandatory arguments to long options are mandatory for short options too.\n\ -V, --version output version information and exit\n\ If INPUT-FILE is -, input is read from standard input. If OUTPUT-FILE\n\ is -, output is written to standard output.\n\ -Report bugs to <bug-glibc@gnu.ai.mit.edu>.\n"), +Report bugs to <bug-glibc@prep.ai.mit.edu>.\n"), program_invocation_name, program_invocation_name); exit (status); diff --git a/db/makedb.c b/db/makedb.c index d72159579d..3dc5b34cbe 100644 --- a/db/makedb.c +++ b/db/makedb.c @@ -32,6 +32,7 @@ Boston, MA 02111-1307, USA. */ /* Get libc version number. */ #include "../version.h" +#define PACKAGE _libc_intl_domainname /* Long options. */ static const struct option long_options[] = @@ -112,7 +113,7 @@ main (argc, argv) /* Version information is requested. */ if (do_version) - printf ("%s - GNU %s %s\n", program_invocation_name, "libc", VERSION); + printf ("%s - GNU %s %s\n", program_invocation_name, PACKAGE, VERSION); /* Help is requested. */ if (do_help) @@ -208,7 +209,7 @@ Mandatory arguments to long options are mandatory for short options too.\n\ -u, --undo print content of database file, one entry a line\n\ -V, --version output version information and exit\n\ If INPUT-FILE is -, input is read from standard input.\n\ -Report bugs to <bug-glibc@gnu.ai.mit.edu>.\n"), +Report bugs to <bug-glibc@prep.ai.mit.edu>.\n"), program_invocation_name, program_invocation_name, program_invocation_name); diff --git a/locale/Makefile b/locale/Makefile index fd7425e71b..c212b2e71c 100644 --- a/locale/Makefile +++ b/locale/Makefile @@ -25,6 +25,7 @@ headers = locale.h langinfo.h distribute = localeinfo.h categories.def iso-4217.def weight.h \ strlen-hash.h \ $(addprefix programs/, \ + locale.c localedef.c \ $(localedef-modules:=.c) $(locale-modules:=.c) \ $(lib-modules:=.c) config.h simple-hash.h \ charmap-kw.gperf charmap-kw.h locfile-token.h \ diff --git a/locale/SYS_libc.c b/locale/SYS_libc.c index ed34903d22..53c9a6034e 100644 --- a/locale/SYS_libc.c +++ b/locale/SYS_libc.c @@ -1,6 +1,4 @@ /* Define a constant for the dgettext domainname for libc internal messages, so the string constant is not repeated in dozens of object files. */ -#include "../version.h" - -const char _libc_intl_domainname[] = "SYS_GNU_libc-" VERSION; +const char _libc_intl_domainname[] = "libc"; diff --git a/locale/programs/locale.c b/locale/programs/locale.c index a4254e3000..a3ffd48998 100644 --- a/locale/programs/locale.c +++ b/locale/programs/locale.c @@ -183,7 +183,7 @@ main (int argc, char *argv[]) /* Version information is requested. */ if (do_version) { - fprintf (stderr, "%s - GNU %s %s\n", __progname, "libc", VERSION); + fprintf (stderr, "%s - GNU %s %s\n", __progname, PACKAGE, VERSION); exit (EXIT_SUCCESS); } @@ -245,7 +245,7 @@ Mandatory arguments to long options are mandatory for short options too.\n\ \n\ -c, --category-name write names of selected categories\n\ -k, --keyword-name write names of selected keywords\n\ -Report bugs to <bug-glibc@gnu.ai.mit.edu>."), +Report bugs to <bug-glibc@prep.ai.mit.edu>.\n"), __progname); exit (status); diff --git a/locale/programs/localedef.c b/locale/programs/localedef.c index d47983b277..8eab9c1fa9 100644 --- a/locale/programs/localedef.c +++ b/locale/programs/localedef.c @@ -174,7 +174,7 @@ main (int argc, char *argv[]) if (do_version) { fprintf (stderr, "%s - GNU %s %s\n", program_invocation_short_name, - "libc", VERSION); + PACKAGE, VERSION); exit (0); } @@ -397,7 +397,7 @@ Mandatory arguments to long options are mandatory for short options too.\n\ \n\ System's directory for character maps: %s\n\ locale files : %s\n\ -Report bugs to <bug-glibc@gnu.ai.mit.edu>."), +Report bugs to <bug-glibc@prep.ai.mit.edu>.\n"), program_invocation_name, CHARMAP_PATH, LOCALE_PATH); exit (status); diff --git a/po/Makefile b/po/Makefile index db066da9d5..30721d11a0 100644 --- a/po/Makefile +++ b/po/Makefile @@ -32,7 +32,7 @@ LINGUAS = $(ALL_LINGUAS) endif # Text domain name to install under; must match ../locale/SYS_libc.c string. -domainname = SYS_GNU_libc-$(version) +domainname = libc # Get $(version) defined. include ../Makeconfig @@ -45,7 +45,7 @@ mo-installed = $(localedir)/%/LC_MESSAGES/$(domainname).mo install-others = $(LINGUAS:%=$(mo-installed)) # Files to distribute: all the source and compiled binary translation files. -distribute = $(ALL_LINGUAS:=.po) $(ALL_LINGUAS:=.mo) SYS_libc.pot +distribute = $(ALL_LINGUAS:=.po) $(ALL_LINGUAS:=.mo) libc.pot include ../Rules @@ -58,7 +58,7 @@ include ../Rules %.mo: %.po $(MSGFMT) -o $@ $< -# Install the message object files as SYS_libc.po in the language directory. +# Install the message object files as libc.po in the language directory. $(mo-installed): %.mo; $(do-install) .PHONY: linguas linguas.mo @@ -7,26 +7,76 @@ msgid "" msgstr "" "Project-Id-Version: GNU glibc 1.10\n" "PO-Revision-Date: 1996-04-20 12:20 MET\n" +"POT-Creation-Date: 1996-05-29 14:03\n" "Last-Translator: Jochen Hein <hein@informatik.tu-clausthal.de>\n" "Language-Team: German <de@li.org>\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=ISO-8859-1\n" "Content-Transfer-Encoding: 8-bit\n" -#: sunrpc/rpc_main.c:77 +#: sunrpc/rpc_main.c:80 +#, c-format msgid " %s [-c | -h | -l | -m] [-o outfile] [infile]\n" msgstr " %s [-c | -h | -l | -m] [-o Ausgabedatei] [Eingabedatei]\n" -#: sunrpc/rpc_main.c:80 +#: sunrpc/rpc_main.c:83 +#, c-format msgid " %s [-s udp|tcp]* [-o outfile] [infile]\n" msgstr " %s [-s udp|tcp]* [-o Ausgabedatei] [Eingabedatei]\n" +#: sunrpc/rpcinfo.c:612 +msgid " rpcinfo -b prognum versnum\n" +msgstr "" + +#: sunrpc/rpcinfo.c:613 +msgid " rpcinfo -d prognum versnum\n" +msgstr "" + +#: sunrpc/rpcinfo.c:611 +msgid " rpcinfo -p [ host ]\n" +msgstr "" + +#: sunrpc/rpcinfo.c:610 +msgid " rpcinfo [ -n portnum ] -t host prognum [ versnum ]\n" +msgstr "" + +#: sunrpc/rpcinfo.c:517 +msgid " program vers proto port\n" +msgstr "" + +#: time/zic.c:423 +#, c-format +msgid " (rule from \"%s\", line %d)" +msgstr "" + +#: time/zic.c:420 +#, fuzzy, c-format +msgid "\"%s\", line %d: %s" +msgstr "%s, Zeile %d: " + +#: time/zic.c:908 +#, c-format +msgid "\"Zone %s\" line and -l option are mutually exclusive" +msgstr "" + +#: time/zic.c:916 +#, c-format +msgid "\"Zone %s\" line and -p option are mutually exclusive" +msgstr "" + +#: time/zic.c:721 +#, c-format +msgid "%s in ruleless zone" +msgstr "" + # ### Checkit! format specifiers OK? #: assert/assert.c:48 +#, c-format msgid "%s%s%s:%u: %s%sAssertion `%s' failed.\n" msgstr "%s%s%s:%u: %s%sZusicherung `%s' nicht erfüllt.\n" #: assert/assert-perr.c:46 +#, c-format msgid "%s%s%s:%u: %s%sUnexpected error: %s.\n" msgstr "%s%s%s:%u: %s%sNicht erwarteter Fehler: %s.\n" @@ -36,73 +86,193 @@ msgid "%s%sUnknown signal %d\n" msgstr "%s%sUnbekanntes Signal %d\n" #: sunrpc/rpc_util.c:258 +#, c-format msgid "%s, line %d: " msgstr "%s, Zeile %d: " -#: posix/getopt.c:673 +#: time/zic.c:2035 +#, c-format +msgid "%s: %d did not sign extend correctly\n" +msgstr "" + +#: time/zic.c:1339 +#, c-format +msgid "%s: Can't create %s: %s\n" +msgstr "" + +#: time/zic.c:2014 +#, c-format +msgid "%s: Can't create directory %s: %s\n" +msgstr "" + +#: time/zic.c:600 +#, c-format +msgid "%s: Can't link from %s to %s: %s\n" +msgstr "" + +#: time/zic.c:746 +#, c-format +msgid "%s: Can't open %s: %s\n" +msgstr "" + +#: time/zic.c:814 +#, c-format +msgid "%s: Error closing %s: %s\n" +msgstr "" + +#: time/zic.c:808 +#, c-format +msgid "%s: Error reading %s\n" +msgstr "" + +#: time/zic.c:1404 +#, c-format +msgid "%s: Error writing %s\n" +msgstr "" + +#: time/zdump.c:257 +#, c-format +msgid "%s: Error writing standard output " +msgstr "" + +#: time/zic.c:793 +#, c-format +msgid "%s: Leap line in non leap seconds file %s\n" +msgstr "" + +#: time/zic.c:360 +#, fuzzy, c-format +msgid "%s: Memory exhausted: %s\n" +msgstr "Kein Hauptspeicher mehr verfügbar" + +#: time/zic.c:515 +#, c-format +msgid "%s: More than one -L option specified\n" +msgstr "" + +#: time/zic.c:475 +#, c-format +msgid "%s: More than one -d option specified\n" +msgstr "" + +#: time/zic.c:485 +#, c-format +msgid "%s: More than one -l option specified\n" +msgstr "" + +#: time/zic.c:495 +#, c-format +msgid "%s: More than one -p option specified\n" +msgstr "" + +#: time/zic.c:505 +#, c-format +msgid "%s: More than one -y option specified\n" +msgstr "" + +#: posix/getconf.c:149 +#, fuzzy, c-format +msgid "%s: Unrecognized variable `%s'\n" +msgstr "%s: Unbekannte Option `%c%s'\n" + +#: time/zic.c:1741 +#, c-format +msgid "%s: command was '%s', result was %d\n" +msgstr "" + +#: posix/getopt.c:686 #, c-format msgid "%s: illegal option -- %c\n" msgstr "%s: Die Option ist nicht erlaubt -- %c\n" -#: posix/getopt.c:676 +#: posix/getopt.c:689 #, c-format msgid "%s: invalid option -- %c\n" msgstr "%s: Ungültige option -- %c\n" -#: posix/getopt.c:597 +#: posix/getopt.c:610 #, c-format msgid "%s: option `%c%s' doesn't allow an argument\n" msgstr "%s: Die Option `%c%s' erlaubt keine Argumente\n" -#: posix/getopt.c:568 +#: posix/getopt.c:581 #, c-format msgid "%s: option `%s' is ambiguous\n" msgstr "%s: Die Option `%s' ist nicht eindeutig\n" -#: posix/getopt.c:614 +#: posix/getopt.c:627 #, c-format msgid "%s: option `%s' requires an argument\n" msgstr "%s: Die Option `%s' erfordert ein Argument\n" -#: posix/getopt.c:592 +#: posix/getopt.c:605 #, c-format msgid "%s: option `--%s' doesn't allow an argument\n" msgstr "%s: Die Option `--%s' erlaubt kein Argument\n" -#: posix/getopt.c:712 +#: posix/getopt.c:725 #, c-format msgid "%s: option requires an argument -- %c\n" msgstr "%s: Die Option benötigt ein Argument -- %c\n" # Mit Quotes? -#: sunrpc/rpc_main.c:143 +#: sunrpc/rpc_main.c:146 +#, c-format msgid "%s: output would overwrite %s\n" msgstr "%s: Die Ausgabe würde %s überschreiben\n" +#: time/zic.c:800 zic.c:1212 zic.c:1232 +#, c-format +msgid "%s: panic: Invalid l_value %d\n" +msgstr "" + # Wenn der Doppelpunkt verwendet wird, dann müsste infinitivisch # konstruiert werden: # # "%s: nicht zu öffnen " # # Oder ohne Doppelpunkt. ke -#: sunrpc/rpc_main.c:149 +#: sunrpc/rpc_main.c:152 +#, c-format msgid "%s: unable to open " msgstr "%s: kann nicht geöffnet werden " -#: posix/getopt.c:647 +#: posix/getopt.c:660 #, c-format msgid "%s: unrecognized option `%c%s'\n" msgstr "%s: Unbekannte Option `%c%s'\n" -#: posix/getopt.c:643 +#: posix/getopt.c:656 #, c-format msgid "%s: unrecognized option `--%s'\n" msgstr "%s: Unbekannte Option `--%s'\n" +#: time/zic.c:432 +#, c-format +msgid "" +"%s: usage is %s [ -s ] [ -v ] [ -l localtime ] [ -p posixrules ] [ -d directory ]\n" +"\t[ -L leapseconds ] [ -y yearistype ] [ filename ... ]\n" +msgstr "" + +#: time/zdump.c:165 +#, c-format +msgid "%s: usage is %s [ -v ] [ -c cutoff ] zonename ...\n" +msgstr "" + #: sunrpc/clnt_perr.c:125 +#, c-format msgid "(unknown authentication error - %d)" msgstr "(unbekannter Fehler bei der Authentifizierung - %d)" +#: sunrpc/rpcinfo.c:555 +#, fuzzy +msgid "(unknown)" +msgstr "Unbekanntes Signal" + +#: catgets/gencat.c:242 +msgid "*standard input*" +msgstr "" + #: inet/rcmd.c:325 msgid ".rhosts fstat failed" msgstr "Fehler beim Holen des Status der Datei `.rhosts'" @@ -120,6 +290,7 @@ msgid ".rhosts writeable by other than owner" msgstr "`.rhosts' ist auch für andere Benutzer als den Dateieigentümer beschreibbar" #: clnt_perr.c:133 sunrpc/clnt_perr.c:112 +#, c-format msgid "; low version = %lu, high version = %lu" msgstr "; untere Version = %lu, obere Version = %lu" @@ -127,23 +298,18 @@ msgstr "; untere Version = %lu, obere Version = %lu" msgid "; why = " msgstr "; Ursache = " -#: sysdeps/mach/hurd/errlist.c:112 msgid "?" msgstr "?" -#: sysdeps/mach/hurd/errlist.c:58 msgid "Address already in use" msgstr "Die Adresse wird bereits verwendet" -#: sysdeps/mach/hurd/errlist.c:57 msgid "Address family not supported by protocol family" msgstr "Die Adress-Familie wird von der Protokoll-Familie nicht unterstützt" -#: i486-linux/siglist.c:22 msgid "Alarm clock" msgstr "Der Wecker klingelt" -#: sysdeps/mach/hurd/errlist.c:17 msgid "Argument list too long" msgstr "Die Argumentliste ist zu lang" @@ -151,19 +317,15 @@ msgstr "Die Argumentliste ist zu lang" msgid "Authentication OK" msgstr "Authentifizierung OK" -#: sysdeps/mach/hurd/errlist.c:90 msgid "Authentication error" msgstr "Fehler bei der Authentifizierung" -#: sysdeps/mach/hurd/errlist.c:24 msgid "Bad address" msgstr "Ungültige Adresse" -#: sysdeps/mach/hurd/errlist.c:19 msgid "Bad file descriptor" msgstr "Ungültiger Datei-Deskriptor" -#: sysdeps/mach/hurd/errlist.c:25 msgid "Block device required" msgstr "Es ist ein Block-Device notwendig" @@ -171,27 +333,21 @@ msgstr "Es ist ein Block-Device notwendig" msgid "Broadcast select problem" msgstr "Select-Problem beim Broadcast" -#: i486-linux/siglist.c:21 sysdeps/mach/hurd/errlist.c:42 msgid "Broken pipe" msgstr "Datenübergabe unterbrochen (broken pipe)" -#: i486-linux/siglist.c:15 msgid "Bus error" msgstr "Bus-Zugriffsfehler" -#: i486-linux/siglist.c:32 msgid "CPU time limit exceeded" msgstr "Rechenzeitbegrenzung überschritten" -#: sysdeps/mach/hurd/errlist.c:59 msgid "Can't assign requested address" msgstr "Die angeforderte Adresse kann nicht zugewiesen werden" -#: sysdeps/mach/hurd/errlist.c:68 msgid "Can't send after socket shutdown" msgstr "Ein Senden nach dem Beenden des Sockets ist nicht möglich" -#: sysdeps/mach/hurd/errlist.c:22 msgid "Cannot allocate memory" msgstr "Nicht genügend Hauptspeicher verfügbar" @@ -215,7 +371,6 @@ msgstr "Kann das Broadcast-Paket nicht senden" msgid "Cannot set socket option SO_BROADCAST" msgstr "Kann die Option SO_BROADCAST nicht beim Socket setzen" -#: i486-linux/siglist.c:25 msgid "Child exited" msgstr "Der Kind-Prozeß ist beendet" @@ -223,47 +378,38 @@ msgstr "Der Kind-Prozeß ist beendet" msgid "Client credential too weak" msgstr "Die Bestätigung des Clients ist zu unsicher" -#: sysdeps/mach/hurd/errlist.c:114 msgid "Computer bought the farm" msgstr "Der Computer hat den Bauernhof erworben" -#: sysdeps/mach/hurd/errlist.c:71 msgid "Connection refused" msgstr "Verbindungsaufbau abgelehnt" -#: sysdeps/mach/hurd/errlist.c:64 msgid "Connection reset by peer" msgstr "Die Verbindung wurde vom Kommunikationspartner zurückgesetzt" -#: sysdeps/mach/hurd/errlist.c:70 msgid "Connection timed out" msgstr "Die Wartezeit beim Verbindungsaufbau ist abgelaufen" -#: i486-linux/siglist.c:26 msgid "Continued" msgstr "Fortgesetzt" -#: sysdeps/mach/hurd/errlist.c:49 msgid "Destination address required" msgstr "Es ist eine Zieladresse notwendig" -#: sysdeps/mach/hurd/errlist.c:26 msgid "Device busy" msgstr "Das Gerät ist bereits belegt" |
