From: Bruno Haible Date: Sat, 30 Jun 2007 22:58:58 +0000 (+0000) Subject: Use the standard --version output. X-Git-Tag: v0.17~303 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3ad5aac4731a34b4c12b2cb38a07953ea8d282a2;p=thirdparty%2Fgettext.git Use the standard --version output. --- diff --git a/gettext-tools/src/ChangeLog b/gettext-tools/src/ChangeLog index 635c88ff6..74c50bd1d 100644 --- a/gettext-tools/src/ChangeLog +++ b/gettext-tools/src/ChangeLog @@ -1,3 +1,25 @@ +2007-06-30 Bruno Haible + + * hostname.c (main): Use the standard --version output, see + . + * msgattrib.c (main): Likewise. + * msgcat.c (main): Likewise. + * msgcmp.c (main): Likewise. + * msgcomm.c (main): Likewise. + * msgconv.c (main): Likewise. + * msgen.c (main): Likewise. + * msgexec.c (main): Likewise. + * msgfilter.c (main): Likewise. + * msgfmt.c (main): Likewise. + * msggrep.c (main): Likewise. + * msginit.c (main): Likewise. + * msgmerge.c (main): Likewise. + * msgunfmt.c (main): Likewise. + * msguniq.c (main): Likewise. + * recode-sr-latin.c (main): Likewise. + * urlget.c (main): Likewise. + * xgettext.c (main): Likewise. + 2007-06-30 Bruno Haible * lang-table.c (language_table): Fix entry for Javanese. diff --git a/gettext-tools/src/hostname.c b/gettext-tools/src/hostname.c index 8ea0ddabe..d897aa5b6 100644 --- a/gettext-tools/src/hostname.c +++ b/gettext-tools/src/hostname.c @@ -177,8 +177,9 @@ main (int argc, char *argv[]) printf ("%s (GNU %s) %s\n", basename (program_name), PACKAGE, VERSION); /* xgettext: no-wrap */ printf (_("Copyright (C) %s Free Software Foundation, Inc.\n\ -This is free software; see the source for copying conditions. There is NO\n\ -warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n\ +License GPLv2+: GNU GPL version 2 or later \n\ +This is free software: you are free to change and redistribute it.\n\ +There is NO WARRANTY, to the extent permitted by law.\n\ "), "2001-2003, 2006-2007"); printf (_("Written by %s.\n"), proper_name ("Bruno Haible")); diff --git a/gettext-tools/src/msgattrib.c b/gettext-tools/src/msgattrib.c index 6a8244e7c..df224886c 100644 --- a/gettext-tools/src/msgattrib.c +++ b/gettext-tools/src/msgattrib.c @@ -324,8 +324,9 @@ main (int argc, char **argv) printf ("%s (GNU %s) %s\n", basename (program_name), PACKAGE, VERSION); /* xgettext: no-wrap */ printf (_("Copyright (C) %s Free Software Foundation, Inc.\n\ -This is free software; see the source for copying conditions. There is NO\n\ -warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n\ +License GPLv2+: GNU GPL version 2 or later \n\ +This is free software: you are free to change and redistribute it.\n\ +There is NO WARRANTY, to the extent permitted by law.\n\ "), "2001-2007"); printf (_("Written by %s.\n"), proper_name ("Bruno Haible")); diff --git a/gettext-tools/src/msgcat.c b/gettext-tools/src/msgcat.c index 3456f00c9..f4f1e3cf6 100644 --- a/gettext-tools/src/msgcat.c +++ b/gettext-tools/src/msgcat.c @@ -280,8 +280,9 @@ main (int argc, char **argv) printf ("%s (GNU %s) %s\n", basename (program_name), PACKAGE, VERSION); /* xgettext: no-wrap */ printf (_("Copyright (C) %s Free Software Foundation, Inc.\n\ -This is free software; see the source for copying conditions. There is NO\n\ -warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n\ +License GPLv2+: GNU GPL version 2 or later \n\ +This is free software: you are free to change and redistribute it.\n\ +There is NO WARRANTY, to the extent permitted by law.\n\ "), "2001-2007"); printf (_("Written by %s.\n"), proper_name ("Bruno Haible")); diff --git a/gettext-tools/src/msgcmp.c b/gettext-tools/src/msgcmp.c index 400dffcce..a9096ebce 100644 --- a/gettext-tools/src/msgcmp.c +++ b/gettext-tools/src/msgcmp.c @@ -160,8 +160,9 @@ main (int argc, char *argv[]) printf ("%s (GNU %s) %s\n", basename (program_name), PACKAGE, VERSION); /* xgettext: no-wrap */ printf (_("Copyright (C) %s Free Software Foundation, Inc.\n\ -This is free software; see the source for copying conditions. There is NO\n\ -warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n\ +License GPLv2+: GNU GPL version 2 or later \n\ +This is free software: you are free to change and redistribute it.\n\ +There is NO WARRANTY, to the extent permitted by law.\n\ "), "1995-1998, 2000-2007"); printf (_("Written by %s.\n"), proper_name ("Peter Miller")); diff --git a/gettext-tools/src/msgcomm.c b/gettext-tools/src/msgcomm.c index 7f85b0785..4eed74adf 100644 --- a/gettext-tools/src/msgcomm.c +++ b/gettext-tools/src/msgcomm.c @@ -267,8 +267,9 @@ main (int argc, char *argv[]) printf ("%s (GNU %s) %s\n", basename (program_name), PACKAGE, VERSION); /* xgettext: no-wrap */ printf (_("Copyright (C) %s Free Software Foundation, Inc.\n\ -This is free software; see the source for copying conditions. There is NO\n\ -warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n\ +License GPLv2+: GNU GPL version 2 or later \n\ +This is free software: you are free to change and redistribute it.\n\ +There is NO WARRANTY, to the extent permitted by law.\n\ "), "1995-1998, 2000-2007"); printf (_("Written by %s.\n"), proper_name ("Peter Miller")); diff --git a/gettext-tools/src/msgconv.c b/gettext-tools/src/msgconv.c index 2e60c0e65..fed8ef2d0 100644 --- a/gettext-tools/src/msgconv.c +++ b/gettext-tools/src/msgconv.c @@ -222,8 +222,9 @@ main (int argc, char **argv) printf ("%s (GNU %s) %s\n", basename (program_name), PACKAGE, VERSION); /* xgettext: no-wrap */ printf (_("Copyright (C) %s Free Software Foundation, Inc.\n\ -This is free software; see the source for copying conditions. There is NO\n\ -warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n\ +License GPLv2+: GNU GPL version 2 or later \n\ +This is free software: you are free to change and redistribute it.\n\ +There is NO WARRANTY, to the extent permitted by law.\n\ "), "2001-2007"); printf (_("Written by %s.\n"), proper_name ("Bruno Haible")); diff --git a/gettext-tools/src/msgen.c b/gettext-tools/src/msgen.c index 6c649a4b9..eca591f4a 100644 --- a/gettext-tools/src/msgen.c +++ b/gettext-tools/src/msgen.c @@ -210,8 +210,9 @@ main (int argc, char **argv) printf ("%s (GNU %s) %s\n", basename (program_name), PACKAGE, VERSION); /* xgettext: no-wrap */ printf (_("Copyright (C) %s Free Software Foundation, Inc.\n\ -This is free software; see the source for copying conditions. There is NO\n\ -warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n\ +License GPLv2+: GNU GPL version 2 or later \n\ +This is free software: you are free to change and redistribute it.\n\ +There is NO WARRANTY, to the extent permitted by law.\n\ "), "2001-2007"); printf (_("Written by %s.\n"), proper_name ("Bruno Haible")); diff --git a/gettext-tools/src/msgexec.c b/gettext-tools/src/msgexec.c index f63c381f6..07bc7c859 100644 --- a/gettext-tools/src/msgexec.c +++ b/gettext-tools/src/msgexec.c @@ -177,8 +177,9 @@ main (int argc, char **argv) printf ("%s (GNU %s) %s\n", basename (program_name), PACKAGE, VERSION); /* xgettext: no-wrap */ printf (_("Copyright (C) %s Free Software Foundation, Inc.\n\ -This is free software; see the source for copying conditions. There is NO\n\ -warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n\ +License GPLv2+: GNU GPL version 2 or later \n\ +This is free software: you are free to change and redistribute it.\n\ +There is NO WARRANTY, to the extent permitted by law.\n\ "), "2001-2007"); printf (_("Written by %s.\n"), proper_name ("Bruno Haible")); diff --git a/gettext-tools/src/msgfilter.c b/gettext-tools/src/msgfilter.c index 0b64c6b25..e54438107 100644 --- a/gettext-tools/src/msgfilter.c +++ b/gettext-tools/src/msgfilter.c @@ -279,8 +279,9 @@ main (int argc, char **argv) printf ("%s (GNU %s) %s\n", basename (program_name), PACKAGE, VERSION); /* xgettext: no-wrap */ printf (_("Copyright (C) %s Free Software Foundation, Inc.\n\ -This is free software; see the source for copying conditions. There is NO\n\ -warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n\ +License GPLv2+: GNU GPL version 2 or later \n\ +This is free software: you are free to change and redistribute it.\n\ +There is NO WARRANTY, to the extent permitted by law.\n\ "), "2001-2007"); printf (_("Written by %s.\n"), proper_name ("Bruno Haible")); diff --git a/gettext-tools/src/msgfmt.c b/gettext-tools/src/msgfmt.c index 5dce0c73e..b39a02eff 100644 --- a/gettext-tools/src/msgfmt.c +++ b/gettext-tools/src/msgfmt.c @@ -363,8 +363,9 @@ main (int argc, char *argv[]) printf ("%s (GNU %s) %s\n", basename (program_name), PACKAGE, VERSION); /* xgettext: no-wrap */ printf (_("Copyright (C) %s Free Software Foundation, Inc.\n\ -This is free software; see the source for copying conditions. There is NO\n\ -warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n\ +License GPLv2+: GNU GPL version 2 or later \n\ +This is free software: you are free to change and redistribute it.\n\ +There is NO WARRANTY, to the extent permitted by law.\n\ "), "1995-1998, 2000-2007"); printf (_("Written by %s.\n"), proper_name ("Ulrich Drepper")); diff --git a/gettext-tools/src/msggrep.c b/gettext-tools/src/msggrep.c index 2405dc1f5..b52abbd6b 100644 --- a/gettext-tools/src/msggrep.c +++ b/gettext-tools/src/msggrep.c @@ -397,8 +397,9 @@ error while reading \"%s\""), optarg); printf ("%s (GNU %s) %s\n", basename (program_name), PACKAGE, VERSION); /* xgettext: no-wrap */ printf (_("Copyright (C) %s Free Software Foundation, Inc.\n\ -This is free software; see the source for copying conditions. There is NO\n\ -warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n\ +License GPLv2+: GNU GPL version 2 or later \n\ +This is free software: you are free to change and redistribute it.\n\ +There is NO WARRANTY, to the extent permitted by law.\n\ "), "2001-2007"); printf (_("Written by %s.\n"), proper_name ("Bruno Haible")); diff --git a/gettext-tools/src/msginit.c b/gettext-tools/src/msginit.c index 19bb1ec29..8d2392759 100644 --- a/gettext-tools/src/msginit.c +++ b/gettext-tools/src/msginit.c @@ -256,8 +256,9 @@ main (int argc, char **argv) printf ("%s (GNU %s) %s\n", basename (program_name), PACKAGE, VERSION); /* xgettext: no-wrap */ printf (_("Copyright (C) %s Free Software Foundation, Inc.\n\ -This is free software; see the source for copying conditions. There is NO\n\ -warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n\ +License GPLv2+: GNU GPL version 2 or later \n\ +This is free software: you are free to change and redistribute it.\n\ +There is NO WARRANTY, to the extent permitted by law.\n\ "), "2001-2007"); printf (_("Written by %s.\n"), proper_name ("Bruno Haible")); diff --git a/gettext-tools/src/msgmerge.c b/gettext-tools/src/msgmerge.c index 6e1894da6..c113dc17f 100644 --- a/gettext-tools/src/msgmerge.c +++ b/gettext-tools/src/msgmerge.c @@ -318,8 +318,9 @@ main (int argc, char **argv) printf ("%s (GNU %s) %s\n", basename (program_name), PACKAGE, VERSION); /* xgettext: no-wrap */ printf (_("Copyright (C) %s Free Software Foundation, Inc.\n\ -This is free software; see the source for copying conditions. There is NO\n\ -warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n\ +License GPLv2+: GNU GPL version 2 or later \n\ +This is free software: you are free to change and redistribute it.\n\ +There is NO WARRANTY, to the extent permitted by law.\n\ "), "1995-1998, 2000-2007"); printf (_("Written by %s.\n"), proper_name ("Peter Miller")); diff --git a/gettext-tools/src/msgunfmt.c b/gettext-tools/src/msgunfmt.c index 0437486fd..58627d9bf 100644 --- a/gettext-tools/src/msgunfmt.c +++ b/gettext-tools/src/msgunfmt.c @@ -249,8 +249,9 @@ main (int argc, char **argv) printf ("%s (GNU %s) %s\n", basename (program_name), PACKAGE, VERSION); /* xgettext: no-wrap */ printf (_("Copyright (C) %s Free Software Foundation, Inc.\n\ -This is free software; see the source for copying conditions. There is NO\n\ -warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n\ +License GPLv2+: GNU GPL version 2 or later \n\ +This is free software: you are free to change and redistribute it.\n\ +There is NO WARRANTY, to the extent permitted by law.\n\ "), "1995-1998, 2000-2007"); printf (_("Written by %s.\n"), proper_name ("Ulrich Drepper")); diff --git a/gettext-tools/src/msguniq.c b/gettext-tools/src/msguniq.c index ee4adf669..c8c01eb1c 100644 --- a/gettext-tools/src/msguniq.c +++ b/gettext-tools/src/msguniq.c @@ -246,8 +246,9 @@ main (int argc, char **argv) printf ("%s (GNU %s) %s\n", basename (program_name), PACKAGE, VERSION); /* xgettext: no-wrap */ printf (_("Copyright (C) %s Free Software Foundation, Inc.\n\ -This is free software; see the source for copying conditions. There is NO\n\ -warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n\ +License GPLv2+: GNU GPL version 2 or later \n\ +This is free software: you are free to change and redistribute it.\n\ +There is NO WARRANTY, to the extent permitted by law.\n\ "), "2001-2007"); printf (_("Written by %s.\n"), proper_name ("Bruno Haible")); diff --git a/gettext-tools/src/recode-sr-latin.c b/gettext-tools/src/recode-sr-latin.c index 1e82ba0ab..d39bc1288 100644 --- a/gettext-tools/src/recode-sr-latin.c +++ b/gettext-tools/src/recode-sr-latin.c @@ -109,8 +109,9 @@ main (int argc, char *argv[]) printf ("%s (GNU %s) %s\n", basename (program_name), PACKAGE, VERSION); /* xgettext: no-wrap */ printf (_("Copyright (C) %s Free Software Foundation, Inc.\n\ -This is free software; see the source for copying conditions. There is NO\n\ -warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n\ +License GPLv2+: GNU GPL version 2 or later \n\ +This is free software: you are free to change and redistribute it.\n\ +There is NO WARRANTY, to the extent permitted by law.\n\ "), "2006-2007"); printf (_("Written by %s and %s.\n"), diff --git a/gettext-tools/src/urlget.c b/gettext-tools/src/urlget.c index d1e8c9fde..085539f90 100644 --- a/gettext-tools/src/urlget.c +++ b/gettext-tools/src/urlget.c @@ -129,8 +129,9 @@ main (int argc, char *argv[]) printf ("%s (GNU %s) %s\n", basename (program_name), PACKAGE, VERSION); /* xgettext: no-wrap */ printf (_("Copyright (C) %s Free Software Foundation, Inc.\n\ -This is free software; see the source for copying conditions. There is NO\n\ -warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n\ +License GPLv2+: GNU GPL version 2 or later \n\ +This is free software: you are free to change and redistribute it.\n\ +There is NO WARRANTY, to the extent permitted by law.\n\ "), "2001-2003, 2005-2007"); printf (_("Written by %s.\n"), proper_name ("Bruno Haible")); diff --git a/gettext-tools/src/xgettext.c b/gettext-tools/src/xgettext.c index 6145990d7..1075d8a28 100644 --- a/gettext-tools/src/xgettext.c +++ b/gettext-tools/src/xgettext.c @@ -507,8 +507,9 @@ main (int argc, char *argv[]) printf ("%s (GNU %s) %s\n", basename (program_name), PACKAGE, VERSION); /* xgettext: no-wrap */ printf (_("Copyright (C) %s Free Software Foundation, Inc.\n\ -This is free software; see the source for copying conditions. There is NO\n\ -warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n\ +License GPLv2+: GNU GPL version 2 or later \n\ +This is free software: you are free to change and redistribute it.\n\ +There is NO WARRANTY, to the extent permitted by law.\n\ "), "1995-1998, 2000-2007"); printf (_("Written by %s.\n"), proper_name ("Ulrich Drepper"));