From: Bruno Haible Date: Sat, 11 May 2019 22:21:16 +0000 (+0200) Subject: Update bug reporting instructions. X-Git-Tag: v0.20.1~4 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=dc96c48d1a7725538ca8a7d697d2b144c8e98428;p=thirdparty%2Fgettext.git Update bug reporting instructions. * README: Tell users to report bugs in the bug tracker or by email. Use the mailing list address, not the alias. * gettext-runtime/libasprintf/README: Likewise. * gettext-tools/doc/gettext.texi (Introduction): Likewise. (Plural forms): Use the mailing list address, not the alias. * configure.ac (AC_INIT): Use the mailing list address, not the alias. * gettext-runtime/configure.ac (AC_INIT): Likewise. * gettext-tools/configure.ac (AC_INIT): Likewise. * gettext-tools/examples/configure.ac (AC_INIT): Likewise. * gettext-runtime/po/Makevars (MSGID_BUGS_ADDRESS): Use the mailing list address, not the alias. * gettext-tools/po/Makevars (MSGID_BUGS_ADDRESS): Likewise. * gettext-tools/examples/po/Makefile.am (MSGID_BUGS_ADDRESS): Likewise. * gettext-tools/examples/hello-*/po/Makevars (MSGID_BUGS_ADDRESS): Likewise. * gettext-tools/examples/hello-*/po/Makefile.am (MSGID_BUGS_ADDRESS): Likewise. * gettext-tools/examples/hello-objc-gnustep/po/GNUmakefile (MSGID_BUGS_ADDRESS): Likewise. * gettext-tools/examples/hello-c++-kde/hello.cc (main): Likewise. * gettext-runtime/src/envsubst.c (main): Move URL out of translatable string. (usage): Tell users to report bugs in the bug tracker or by email. Use the mailing list address, not the alias. * gettext-runtime/src/gettext.c: Likewise. * gettext-runtime/src/ngettext.c: Likewise. * gettext-tools/src/cldr-plurals.c: Likewise. * gettext-tools/src/hostname.c: Likewise. * gettext-tools/src/msgattrib.c: Likewise. * gettext-tools/src/msgcat.c: Likewise. * gettext-tools/src/msgcmp.c: Likewise. * gettext-tools/src/msgcomm.c: Likewise. * gettext-tools/src/msgconv.c: Likewise. * gettext-tools/src/msgen.c: Likewise. * gettext-tools/src/msgexec.c: Likewise. * gettext-tools/src/msgfilter.c: Likewise. * gettext-tools/src/msgfmt.c: Likewise. * gettext-tools/src/msggrep.c: Likewise. * gettext-tools/src/msginit.c: Likewise. * gettext-tools/src/msgmerge.c: Likewise. * gettext-tools/src/msgunfmt.c: Likewise. * gettext-tools/src/msguniq.c: Likewise. * gettext-tools/src/recode-sr-latin.c: Likewise. * gettext-tools/src/urlget.c: Likewise. * gettext-tools/src/xgettext.c: Likewise. * gettext-tools/tests/tstgettext.c: Likewise. * gettext-tools/tests/tstngettext.c: Likewise. * gettext-tools/misc/autopoint.in (func_usage): Tell users to report bugs in the bug tracker or by email. Use the mailing list address, not the alias. * gettext-tools/misc/convert-archive.in (func_usage): Likewise. * gettext-tools/misc/gettextize.in (func_usage): Likewise. --- diff --git a/README b/README index dbcc930ac..166e67681 100644 --- a/README +++ b/README @@ -22,8 +22,9 @@ The primary FTP site for its distribution is https://ftp.gnu.org/pub/gnu/gettext/ -Send comments and bug reports to - bug-gnu-gettext@gnu.org +Report bugs + - in the bug tracker at + - or by email to . The configure script provides a non-standard option. It is also diff --git a/configure.ac b/configure.ac index d1f119e2c..38db6fd3f 100644 --- a/configure.ac +++ b/configure.ac @@ -19,7 +19,7 @@ dnl Process this file with autoconf to produce a configure script. AC_PREREQ([2.63]) AC_INIT([gettext], m4_esyscmd([build-aux/git-version-gen .tarball-version]), - [bug-gnu-gettext@gnu.org]) + [bug-gettext@gnu.org]) AC_CONFIG_SRCDIR([gettext-tools/src/msgfmt.c]) AC_CONFIG_AUX_DIR([build-aux]) AM_INIT_AUTOMAKE([1.13 silent-rules parallel-tests tar-ustar]) diff --git a/gettext-runtime/configure.ac b/gettext-runtime/configure.ac index 0120b8a02..de203e758 100644 --- a/gettext-runtime/configure.ac +++ b/gettext-runtime/configure.ac @@ -1,5 +1,5 @@ dnl Configuration for the gettext-runtime directory of GNU gettext -dnl Copyright (C) 1995-2010, 2012-2015, 2018 Free Software Foundation, Inc. +dnl Copyright (C) 1995-2010, 2012-2015, 2018-2019 Free Software Foundation, Inc. dnl dnl This program is free software: you can redistribute it and/or modify dnl it under the terms of the GNU General Public License as published by @@ -19,7 +19,7 @@ dnl Process this file with autoconf to produce a configure script. AC_PREREQ([2.63]) AC_INIT([gettext-runtime], m4_esyscmd([../build-aux/git-version-gen ../.tarball-version]), - [bug-gnu-gettext@gnu.org]) + [bug-gettext@gnu.org]) AC_CONFIG_SRCDIR([intl/dcigettext.c]) AC_CONFIG_AUX_DIR([../build-aux]) AM_INIT_AUTOMAKE([1.11.1 silent-rules parallel-tests]) diff --git a/gettext-runtime/libasprintf/README b/gettext-runtime/libasprintf/README index 535e4d08e..eb2b08817 100644 --- a/gettext-runtime/libasprintf/README +++ b/gettext-runtime/libasprintf/README @@ -83,15 +83,20 @@ the GNU C library function asprintf(), and the C++ autoptr programming idiom. Distribution ------------ + https://haible.de/bruno/gnu/libasprintf-1.0.tar.gz Homepage -------- + https://haible.de/bruno/packages-libasprintf.html -Bug reports to: ---------------- - +Bug reports +----------- + +Report bugs + - in the bug tracker at + - or by email to . Bruno Haible diff --git a/gettext-runtime/po/Makevars b/gettext-runtime/po/Makevars index 1ea6b49ca..0a0b133e0 100644 --- a/gettext-runtime/po/Makevars +++ b/gettext-runtime/po/Makevars @@ -49,7 +49,7 @@ PACKAGE_GNU = # 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 = bug-gnu-gettext@gnu.org +MSGID_BUGS_ADDRESS = bug-gettext@gnu.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/gettext-runtime/src/envsubst.c b/gettext-runtime/src/envsubst.c index 13a6f6568..354b22379 100644 --- a/gettext-runtime/src/envsubst.c +++ b/gettext-runtime/src/envsubst.c @@ -110,11 +110,11 @@ 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\ -License GPLv3+: GNU GPL version 3 or later \n\ +License GPLv3+: GNU GPL version 3 or later <%s>\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\ "), - "2003-2019"); + "2003-2019", "https://gnu.org/licenses/gpl.html"); printf (_("Written by %s.\n"), proper_name ("Bruno Haible")); exit (EXIT_SUCCESS); } @@ -217,11 +217,16 @@ standard input are substituted.\n")); When --variables is used, standard input is ignored, and the output consists\n\ of the environment variables that are referenced in SHELL-FORMAT, one per line.\n")); printf ("\n"); - /* TRANSLATORS: The placeholder indicates the bug-reporting address - for this package. Please add _another line_ saying + /* TRANSLATORS: The first placeholder is the web address of the Savannah + project of this package. The second placeholder is the bug-reporting + email address for this package. Please add _another line_ saying "Report translation bugs to <...>\n" with the address for translation bugs (typically your translation team's web or email address). */ - fputs (_("Report bugs to .\n"), stdout); + printf(_("\ +Report bugs in the bug tracker at <%s>\n\ +or by email to <%s>.\n"), + "https://savannah.gnu.org/projects/gettext", + "bug-gettext@gnu.org"); } exit (status); diff --git a/gettext-runtime/src/gettext.c b/gettext-runtime/src/gettext.c index b2c5a3441..e2fe24a2b 100644 --- a/gettext-runtime/src/gettext.c +++ b/gettext-runtime/src/gettext.c @@ -135,11 +135,11 @@ 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\ -License GPLv3+: GNU GPL version 3 or later \n\ +License GPLv3+: GNU GPL version 3 or later <%s>\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-2019"); + "1995-2019", "https://gnu.org/licenses/gpl.html"); printf (_("Written by %s.\n"), proper_name ("Ulrich Drepper")); exit (EXIT_SUCCESS); } @@ -293,11 +293,16 @@ found in the selected catalog are translated.\n\ Standard search directory: %s\n"), getenv ("IN_HELP2MAN") == NULL ? LOCALEDIR : "@localedir@"); printf ("\n"); - /* TRANSLATORS: The placeholder indicates the bug-reporting address - for this package. Please add _another line_ saying + /* TRANSLATORS: The first placeholder is the web address of the Savannah + project of this package. The second placeholder is the bug-reporting + email address for this package. Please add _another line_ saying "Report translation bugs to <...>\n" with the address for translation bugs (typically your translation team's web or email address). */ - fputs (_("Report bugs to .\n"), stdout); + printf(_("\ +Report bugs in the bug tracker at <%s>\n\ +or by email to <%s>.\n"), + "https://savannah.gnu.org/projects/gettext", + "bug-gettext@gnu.org"); } exit (status); diff --git a/gettext-runtime/src/ngettext.c b/gettext-runtime/src/ngettext.c index 406f41635..1e853d091 100644 --- a/gettext-runtime/src/ngettext.c +++ b/gettext-runtime/src/ngettext.c @@ -124,11 +124,11 @@ 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\ -License GPLv3+: GNU GPL version 3 or later \n\ +License GPLv3+: GNU GPL version 3 or later <%s>\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-1997, 2000-2019"); + "1995-1997, 2000-2019", "https://gnu.org/licenses/gpl.html"); printf (_("Written by %s.\n"), proper_name ("Ulrich Drepper")); exit (EXIT_SUCCESS); } @@ -256,11 +256,16 @@ variable TEXTDOMAINDIR.\n\ Standard search directory: %s\n"), getenv ("IN_HELP2MAN") == NULL ? LOCALEDIR : "@localedir@"); printf ("\n"); - /* TRANSLATORS: The placeholder indicates the bug-reporting address - for this package. Please add _another line_ saying + /* TRANSLATORS: The first placeholder is the web address of the Savannah + project of this package. The second placeholder is the bug-reporting + email address for this package. Please add _another line_ saying "Report translation bugs to <...>\n" with the address for translation bugs (typically your translation team's web or email address). */ - fputs (_("Report bugs to .\n"), stdout); + printf(_("\ +Report bugs in the bug tracker at <%s>\n\ +or by email to <%s>.\n"), + "https://savannah.gnu.org/projects/gettext", + "bug-gettext@gnu.org"); } exit (status); diff --git a/gettext-tools/configure.ac b/gettext-tools/configure.ac index 39d078437..cf1dd734d 100644 --- a/gettext-tools/configure.ac +++ b/gettext-tools/configure.ac @@ -19,7 +19,7 @@ dnl Process this file with autoconf to produce a configure script. AC_PREREQ([2.63]) AC_INIT([gettext-tools], m4_esyscmd([../build-aux/git-version-gen ../.tarball-version]), - [bug-gnu-gettext@gnu.org]) + [bug-gettext@gnu.org]) AC_CONFIG_SRCDIR([src/msgfmt.c]) AC_CONFIG_AUX_DIR([../build-aux]) AM_INIT_AUTOMAKE([1.11.1 silent-rules parallel-tests]) diff --git a/gettext-tools/doc/gettext.texi b/gettext-tools/doc/gettext.texi index 1bc1c6ad9..38c6ef1c2 100644 --- a/gettext-tools/doc/gettext.texi +++ b/gettext-tools/doc/gettext.texi @@ -549,14 +549,13 @@ is meant to be useful for people using computers, whatever their sex, race, religion or nationality! @cindex bug report address -Please send suggestions and corrections to: - -@example -@group -@r{Internet address:} - bug-gnu-gettext@@gnu.org -@end group -@end example +Please submit suggestions and corrections +@itemize @bullet +@item +either in the bug tracker at @url{https://savannah.gnu.org/projects/gettext} +@item +or by email to @code{bug-gettext@@gnu.org}. +@end itemize @noindent Please include the manual's edition number and update date in your messages. @@ -6362,7 +6361,7 @@ The following rules are known at this point. The language with families are listed. But this does not necessarily mean the information can be generalized for the whole family (as can be easily seen in the table below).@footnote{Additions are welcome. Send appropriate information to -@email{bug-gnu-gettext@@gnu.org} and @email{bug-glibc-manual@@gnu.org}. +@email{bug-gettext@@gnu.org} and @email{bug-glibc-manual@@gnu.org}. The Unicode CLDR Project (@uref{http://cldr.unicode.org}) provides a comprehensive set of plural forms in a different format. The @code{msginit} program has preliminary support for the format so you can diff --git a/gettext-tools/examples/configure.ac b/gettext-tools/examples/configure.ac index 0fccc00ce..b25e72a44 100644 --- a/gettext-tools/examples/configure.ac +++ b/gettext-tools/examples/configure.ac @@ -1,5 +1,5 @@ dnl Configuration for the gettext-tools/examples directory of GNU gettext -dnl Copyright (C) 2006, 2009, 2014 Free Software Foundation, Inc. +dnl Copyright (C) 2006, 2009, 2014, 2019 Free Software Foundation, Inc. dnl dnl This program is free software: you can redistribute it and/or modify dnl it under the terms of the GNU General Public License as published by @@ -19,7 +19,7 @@ dnl Process this file with autoconf to produce a configure script. AC_PREREQ([2.57]) AC_INIT([gettext-examples], m4_esyscmd([../../build-aux/git-version-gen ../../.tarball-version]), - [bug-gnu-gettext@gnu.org]) + [bug-gettext@gnu.org]) AC_CONFIG_SRCDIR([installpaths.in]) AC_CONFIG_AUX_DIR([../../build-aux]) AM_INIT_AUTOMAKE([silent-rules]) diff --git a/gettext-tools/examples/hello-c++-gnome/po/Makevars b/gettext-tools/examples/hello-c++-gnome/po/Makevars index 3dc1be049..035a0f6b4 100644 --- a/gettext-tools/examples/hello-c++-gnome/po/Makevars +++ b/gettext-tools/examples/hello-c++-gnome/po/Makevars @@ -59,7 +59,7 @@ PACKAGE_GNU = no # 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 = bug-gnu-gettext@gnu.org +MSGID_BUGS_ADDRESS = bug-gettext@gnu.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/gettext-tools/examples/hello-c++-kde/hello.cc b/gettext-tools/examples/hello-c++-kde/hello.cc index 5e091287d..e8fefd3f6 100644 --- a/gettext-tools/examples/hello-c++-kde/hello.cc +++ b/gettext-tools/examples/hello-c++-kde/hello.cc @@ -1,5 +1,5 @@ // Example for use of GNU gettext. -// Copyright (C) 2003 Free Software Foundation, Inc. +// Copyright (C) 2003, 2019 Free Software Foundation, Inc. // This file is published under the GNU General Public License. // Source code of the C++ program. @@ -47,10 +47,10 @@ main (int argc, char *argv[]) VERSION, I18N_NOOP ("Hello world example"), KAboutData::License_GPL, - "(C) 2003 Free Software Foundation", + "(C) 2003, 2019 Free Software Foundation", NULL, NULL, - "bug-gnu-gettext@gnu.org"); + "bug-gettext@gnu.org"); KCmdLineArgs::init (argc, argv, &aboutData); KCmdLineArgs::addCmdLineOptions (options); KApplication application; diff --git a/gettext-tools/examples/hello-c++-kde/po/Makevars b/gettext-tools/examples/hello-c++-kde/po/Makevars index 93af7cfe4..26b8ea20a 100644 --- a/gettext-tools/examples/hello-c++-kde/po/Makevars +++ b/gettext-tools/examples/hello-c++-kde/po/Makevars @@ -55,7 +55,7 @@ PACKAGE_GNU = no # 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 = bug-gnu-gettext@gnu.org +MSGID_BUGS_ADDRESS = bug-gettext@gnu.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/gettext-tools/examples/hello-c++-qt/po/Makefile.am b/gettext-tools/examples/hello-c++-qt/po/Makefile.am index e1eba009b..189035da7 100644 --- a/gettext-tools/examples/hello-c++-qt/po/Makefile.am +++ b/gettext-tools/examples/hello-c++-qt/po/Makefile.am @@ -51,7 +51,7 @@ PACKAGE_GNU = no # 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 = bug-gnu-gettext@gnu.org +MSGID_BUGS_ADDRESS = bug-gettext@gnu.org # These options get passed to msgmerge. # Useful options are in particular: diff --git a/gettext-tools/examples/hello-c++-wxwidgets/po/Makefile.am b/gettext-tools/examples/hello-c++-wxwidgets/po/Makefile.am index 22373f626..fcffc31dc 100644 --- a/gettext-tools/examples/hello-c++-wxwidgets/po/Makefile.am +++ b/gettext-tools/examples/hello-c++-wxwidgets/po/Makefile.am @@ -50,7 +50,7 @@ PACKAGE_GNU = no # 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 = bug-gnu-gettext@gnu.org +MSGID_BUGS_ADDRESS = bug-gettext@gnu.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/gettext-tools/examples/hello-c++/po/Makevars b/gettext-tools/examples/hello-c++/po/Makevars index 899909401..473376f8e 100644 --- a/gettext-tools/examples/hello-c++/po/Makevars +++ b/gettext-tools/examples/hello-c++/po/Makevars @@ -48,7 +48,7 @@ PACKAGE_GNU = no # 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 = bug-gnu-gettext@gnu.org +MSGID_BUGS_ADDRESS = bug-gettext@gnu.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/gettext-tools/examples/hello-c-gnome/po/Makevars b/gettext-tools/examples/hello-c-gnome/po/Makevars index 3dc1be049..035a0f6b4 100644 --- a/gettext-tools/examples/hello-c-gnome/po/Makevars +++ b/gettext-tools/examples/hello-c-gnome/po/Makevars @@ -59,7 +59,7 @@ PACKAGE_GNU = no # 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 = bug-gnu-gettext@gnu.org +MSGID_BUGS_ADDRESS = bug-gettext@gnu.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/gettext-tools/examples/hello-c-gnome3/po/Makevars b/gettext-tools/examples/hello-c-gnome3/po/Makevars index 3dc1be049..035a0f6b4 100644 --- a/gettext-tools/examples/hello-c-gnome3/po/Makevars +++ b/gettext-tools/examples/hello-c-gnome3/po/Makevars @@ -59,7 +59,7 @@ PACKAGE_GNU = no # 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 = bug-gnu-gettext@gnu.org +MSGID_BUGS_ADDRESS = bug-gettext@gnu.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/gettext-tools/examples/hello-c/po/Makevars b/gettext-tools/examples/hello-c/po/Makevars index 49055be36..39dba66d8 100644 --- a/gettext-tools/examples/hello-c/po/Makevars +++ b/gettext-tools/examples/hello-c/po/Makevars @@ -47,7 +47,7 @@ PACKAGE_GNU = no # 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 = bug-gnu-gettext@gnu.org +MSGID_BUGS_ADDRESS = bug-gettext@gnu.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/gettext-tools/examples/hello-clisp/po/Makefile.am b/gettext-tools/examples/hello-clisp/po/Makefile.am index eeab8354d..0b58fa7ff 100644 --- a/gettext-tools/examples/hello-clisp/po/Makefile.am +++ b/gettext-tools/examples/hello-clisp/po/Makefile.am @@ -44,7 +44,7 @@ PACKAGE_GNU = no # 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 = bug-gnu-gettext@gnu.org +MSGID_BUGS_ADDRESS = bug-gettext@gnu.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/gettext-tools/examples/hello-csharp-forms/po/Makefile.am b/gettext-tools/examples/hello-csharp-forms/po/Makefile.am index ee846dad3..061508d05 100644 --- a/gettext-tools/examples/hello-csharp-forms/po/Makefile.am +++ b/gettext-tools/examples/hello-csharp-forms/po/Makefile.am @@ -44,7 +44,7 @@ PACKAGE_GNU = no # 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 = bug-gnu-gettext@gnu.org +MSGID_BUGS_ADDRESS = bug-gettext@gnu.org # These options get passed to msgmerge. # Useful options are in particular: diff --git a/gettext-tools/examples/hello-csharp/po/Makefile.am b/gettext-tools/examples/hello-csharp/po/Makefile.am index ee846dad3..061508d05 100644 --- a/gettext-tools/examples/hello-csharp/po/Makefile.am +++ b/gettext-tools/examples/hello-csharp/po/Makefile.am @@ -44,7 +44,7 @@ PACKAGE_GNU = no # 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 = bug-gnu-gettext@gnu.org +MSGID_BUGS_ADDRESS = bug-gettext@gnu.org # These options get passed to msgmerge. # Useful options are in particular: diff --git a/gettext-tools/examples/hello-gawk/po/Makefile.am b/gettext-tools/examples/hello-gawk/po/Makefile.am index a41f4783e..a80a047c9 100644 --- a/gettext-tools/examples/hello-gawk/po/Makefile.am +++ b/gettext-tools/examples/hello-gawk/po/Makefile.am @@ -44,7 +44,7 @@ PACKAGE_GNU = no # 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 = bug-gnu-gettext@gnu.org +MSGID_BUGS_ADDRESS = bug-gettext@gnu.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/gettext-tools/examples/hello-guile/po/Makefile.am b/gettext-tools/examples/hello-guile/po/Makefile.am index 166333c9f..593a0134e 100644 --- a/gettext-tools/examples/hello-guile/po/Makefile.am +++ b/gettext-tools/examples/hello-guile/po/Makefile.am @@ -44,7 +44,7 @@ PACKAGE_GNU = no # 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 = bug-gnu-gettext@gnu.org +MSGID_BUGS_ADDRESS = bug-gettext@gnu.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/gettext-tools/examples/hello-java-awt/po/Makefile.am b/gettext-tools/examples/hello-java-awt/po/Makefile.am index 291a348be..c9b83488c 100644 --- a/gettext-tools/examples/hello-java-awt/po/Makefile.am +++ b/gettext-tools/examples/hello-java-awt/po/Makefile.am @@ -44,7 +44,7 @@ PACKAGE_GNU = no # 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 = bug-gnu-gettext@gnu.org +MSGID_BUGS_ADDRESS = bug-gettext@gnu.org # These options get passed to msgmerge. # Useful options are in particular: diff --git a/gettext-tools/examples/hello-java-qtjambi/po/Makefile.am b/gettext-tools/examples/hello-java-qtjambi/po/Makefile.am index 291a348be..c9b83488c 100644 --- a/gettext-tools/examples/hello-java-qtjambi/po/Makefile.am +++ b/gettext-tools/examples/hello-java-qtjambi/po/Makefile.am @@ -44,7 +44,7 @@ PACKAGE_GNU = no # 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 = bug-gnu-gettext@gnu.org +MSGID_BUGS_ADDRESS = bug-gettext@gnu.org # These options get passed to msgmerge. # Useful options are in particular: diff --git a/gettext-tools/examples/hello-java-swing/po/Makefile.am b/gettext-tools/examples/hello-java-swing/po/Makefile.am index 291a348be..c9b83488c 100644 --- a/gettext-tools/examples/hello-java-swing/po/Makefile.am +++ b/gettext-tools/examples/hello-java-swing/po/Makefile.am @@ -44,7 +44,7 @@ PACKAGE_GNU = no # 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 = bug-gnu-gettext@gnu.org +MSGID_BUGS_ADDRESS = bug-gettext@gnu.org # These options get passed to msgmerge. # Useful options are in particular: diff --git a/gettext-tools/examples/hello-java/po/Makefile.am b/gettext-tools/examples/hello-java/po/Makefile.am index 291a348be..c9b83488c 100644 --- a/gettext-tools/examples/hello-java/po/Makefile.am +++ b/gettext-tools/examples/hello-java/po/Makefile.am @@ -44,7 +44,7 @@ PACKAGE_GNU = no # 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 = bug-gnu-gettext@gnu.org +MSGID_BUGS_ADDRESS = bug-gettext@gnu.org # These options get passed to msgmerge. # Useful options are in particular: diff --git a/gettext-tools/examples/hello-librep/po/Makefile.am b/gettext-tools/examples/hello-librep/po/Makefile.am index 0e7c4077f..c15df8ae6 100644 --- a/gettext-tools/examples/hello-librep/po/Makefile.am +++ b/gettext-tools/examples/hello-librep/po/Makefile.am @@ -44,7 +44,7 @@ PACKAGE_GNU = no # 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 = bug-gnu-gettext@gnu.org +MSGID_BUGS_ADDRESS = bug-gettext@gnu.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/gettext-tools/examples/hello-objc-gnome/po/Makevars b/gettext-tools/examples/hello-objc-gnome/po/Makevars index 3dc1be049..035a0f6b4 100644 --- a/gettext-tools/examples/hello-objc-gnome/po/Makevars +++ b/gettext-tools/examples/hello-objc-gnome/po/Makevars @@ -59,7 +59,7 @@ PACKAGE_GNU = no # 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 = bug-gnu-gettext@gnu.org +MSGID_BUGS_ADDRESS = bug-gettext@gnu.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/gettext-tools/examples/hello-objc-gnustep/po/GNUmakefile b/gettext-tools/examples/hello-objc-gnustep/po/GNUmakefile index 2e80882e9..edabe0d4a 100644 --- a/gettext-tools/examples/hello-objc-gnustep/po/GNUmakefile +++ b/gettext-tools/examples/hello-objc-gnustep/po/GNUmakefile @@ -47,7 +47,7 @@ PACKAGE_GNU = no # 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 = bug-gnu-gettext@gnu.org +MSGID_BUGS_ADDRESS = bug-gettext@gnu.org # These options get passed to msgmerge. # Useful options are in particular: diff --git a/gettext-tools/examples/hello-objc/po/Makevars b/gettext-tools/examples/hello-objc/po/Makevars index 49055be36..39dba66d8 100644 --- a/gettext-tools/examples/hello-objc/po/Makevars +++ b/gettext-tools/examples/hello-objc/po/Makevars @@ -47,7 +47,7 @@ PACKAGE_GNU = no # 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 = bug-gnu-gettext@gnu.org +MSGID_BUGS_ADDRESS = bug-gettext@gnu.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/gettext-tools/examples/hello-pascal/po/Makefile.am b/gettext-tools/examples/hello-pascal/po/Makefile.am index 403078013..2fff820a7 100644 --- a/gettext-tools/examples/hello-pascal/po/Makefile.am +++ b/gettext-tools/examples/hello-pascal/po/Makefile.am @@ -44,7 +44,7 @@ PACKAGE_GNU = no # 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 = bug-gnu-gettext@gnu.org +MSGID_BUGS_ADDRESS = bug-gettext@gnu.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/gettext-tools/examples/hello-perl/po/Makefile.am b/gettext-tools/examples/hello-perl/po/Makefile.am index a2d5fac3d..c69f15038 100644 --- a/gettext-tools/examples/hello-perl/po/Makefile.am +++ b/gettext-tools/examples/hello-perl/po/Makefile.am @@ -54,7 +54,7 @@ PACKAGE_GNU = no # 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 = bug-gnu-gettext@gnu.org +MSGID_BUGS_ADDRESS = bug-gettext@gnu.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/gettext-tools/examples/hello-php/po/Makefile.am b/gettext-tools/examples/hello-php/po/Makefile.am index 68fc14379..7f2c93ecc 100644 --- a/gettext-tools/examples/hello-php/po/Makefile.am +++ b/gettext-tools/examples/hello-php/po/Makefile.am @@ -44,7 +44,7 @@ PACKAGE_GNU = no # 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 = bug-gnu-gettext@gnu.org +MSGID_BUGS_ADDRESS = bug-gettext@gnu.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/gettext-tools/examples/hello-python/po/Makefile.am b/gettext-tools/examples/hello-python/po/Makefile.am index 619196f06..9936c5e10 100644 --- a/gettext-tools/examples/hello-python/po/Makefile.am +++ b/gettext-tools/examples/hello-python/po/Makefile.am @@ -44,7 +44,7 @@ PACKAGE_GNU = no # 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 = bug-gnu-gettext@gnu.org +MSGID_BUGS_ADDRESS = bug-gettext@gnu.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/gettext-tools/examples/hello-sh/po/Makefile.am b/gettext-tools/examples/hello-sh/po/Makefile.am index 421ecda86..5af2b702d 100644 --- a/gettext-tools/examples/hello-sh/po/Makefile.am +++ b/gettext-tools/examples/hello-sh/po/Makefile.am @@ -44,7 +44,7 @@ PACKAGE_GNU = no # 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 = bug-gnu-gettext@gnu.org +MSGID_BUGS_ADDRESS = bug-gettext@gnu.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/gettext-tools/examples/hello-smalltalk/po/Makefile.am b/gettext-tools/examples/hello-smalltalk/po/Makefile.am index 4330f76b6..144e23f3b 100644 --- a/gettext-tools/examples/hello-smalltalk/po/Makefile.am +++ b/gettext-tools/examples/hello-smalltalk/po/Makefile.am @@ -44,7 +44,7 @@ PACKAGE_GNU = no # 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 = bug-gnu-gettext@gnu.org +MSGID_BUGS_ADDRESS = bug-gettext@gnu.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/gettext-tools/examples/hello-tcl-tk/po/Makefile.am b/gettext-tools/examples/hello-tcl-tk/po/Makefile.am index 7a06d67d8..e6cc705df 100644 --- a/gettext-tools/examples/hello-tcl-tk/po/Makefile.am +++ b/gettext-tools/examples/hello-tcl-tk/po/Makefile.am @@ -44,7 +44,7 @@ PACKAGE_GNU = no # 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 = bug-gnu-gettext@gnu.org +MSGID_BUGS_ADDRESS = bug-gettext@gnu.org # These options get passed to msgmerge. # Useful options are in particular: diff --git a/gettext-tools/examples/hello-tcl/po/Makefile.am b/gettext-tools/examples/hello-tcl/po/Makefile.am index 7a06d67d8..e6cc705df 100644 --- a/gettext-tools/examples/hello-tcl/po/Makefile.am +++ b/gettext-tools/examples/hello-tcl/po/Makefile.am @@ -44,7 +44,7 @@ PACKAGE_GNU = no # 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 = bug-gnu-gettext@gnu.org +MSGID_BUGS_ADDRESS = bug-gettext@gnu.org # These options get passed to msgmerge. # Useful options are in particular: diff --git a/gettext-tools/examples/hello-ycp/po/Makefile.am b/gettext-tools/examples/hello-ycp/po/Makefile.am index eca5b7568..b84439dfa 100644 --- a/gettext-tools/examples/hello-ycp/po/Makefile.am +++ b/gettext-tools/examples/hello-ycp/po/Makefile.am @@ -44,7 +44,7 @@ PACKAGE_GNU = no # 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 = bug-gnu-gettext@gnu.org +MSGID_BUGS_ADDRESS = bug-gettext@gnu.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/gettext-tools/examples/po/Makefile.am b/gettext-tools/examples/po/Makefile.am index 04eaff88b..d6702624d 100644 --- a/gettext-tools/examples/po/Makefile.am +++ b/gettext-tools/examples/po/Makefile.am @@ -126,7 +126,7 @@ COPYRIGHT_HOLDER = Yoyodyne, Inc. # 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 = bug-gnu-gettext@gnu.org +MSGID_BUGS_ADDRESS = bug-gettext@gnu.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/gettext-tools/misc/autopoint.in b/gettext-tools/misc/autopoint.in index 6d9922e3d..c30922e13 100644 --- a/gettext-tools/misc/autopoint.in +++ b/gettext-tools/misc/autopoint.in @@ -197,7 +197,8 @@ Options: # -V version copy the infrastructure of the specified gettext version # (dangerous)" echo " -Report bugs to ." +Report bugs in the bug tracker at +or by email to ." } # func_version diff --git a/gettext-tools/misc/convert-archive.in b/gettext-tools/misc/convert-archive.in index e73445d74..5ba1a3bf7 100644 --- a/gettext-tools/misc/convert-archive.in +++ b/gettext-tools/misc/convert-archive.in @@ -38,7 +38,8 @@ to the TO format. FROMFILE is the original file, defaulting to archive.\$FROM.tar.gz. TOFILE is the destination file, defaulting to archive.\$TO.tar.gz. -Report bugs to ." +Report bugs in the bug tracker at +or by email to ." } # func_version diff --git a/gettext-tools/misc/gettextize.in b/gettext-tools/misc/gettextize.in index 4c4aa4402..aacdc473b 100644 --- a/gettext-tools/misc/gettextize.in +++ b/gettext-tools/misc/gettextize.in @@ -197,7 +197,8 @@ Options: --symlink make symbolic links instead of copying files -n, --dry-run print modifications but don't perform them -Report bugs to ." +Report bugs in the bug tracker at +or by email to ." } # func_version diff --git a/gettext-tools/po/Makevars b/gettext-tools/po/Makevars index c26aa7f5a..945a25ffe 100644 --- a/gettext-tools/po/Makevars +++ b/gettext-tools/po/Makevars @@ -53,7 +53,7 @@ PACKAGE_GNU = # 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 = bug-gnu-gettext@gnu.org +MSGID_BUGS_ADDRESS = bug-gettext@gnu.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/gettext-tools/src/cldr-plurals.c b/gettext-tools/src/cldr-plurals.c index efc8d30f6..dbfc447fd 100644 --- a/gettext-tools/src/cldr-plurals.c +++ b/gettext-tools/src/cldr-plurals.c @@ -215,12 +215,16 @@ Similarly for optional arguments.\n\ printf (_("\ -V, --version output version information and exit\n")); printf ("\n"); - /* TRANSLATORS: The placeholder indicates the bug-reporting address - for this package. Please add _another line_ saying + /* TRANSLATORS: The first placeholder is the web address of the Savannah + project of this package. The second placeholder is the bug-reporting + email address for this package. Please add _another line_ saying "Report translation bugs to <...>\n" with the address for translation bugs (typically your translation team's web or email address). */ - fputs (_("Report bugs to .\n"), - stdout); + printf(_("\ +Report bugs in the bug tracker at <%s>\n\ +or by email to <%s>.\n"), + "https://savannah.gnu.org/projects/gettext", + "bug-gettext@gnu.org"); } exit (status); } @@ -285,11 +289,11 @@ 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\ -License GPLv3+: GNU GPL version 3 or later \n\ +License GPLv3+: GNU GPL version 3 or later <%s>\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\ "), - "2015-2019"); + "2015-2019", "https://gnu.org/licenses/gpl.html"); printf (_("Written by %s.\n"), proper_name ("Daiki Ueno")); exit (EXIT_SUCCESS); } diff --git a/gettext-tools/src/hostname.c b/gettext-tools/src/hostname.c index 55b906e06..21b541934 100644 --- a/gettext-tools/src/hostname.c +++ b/gettext-tools/src/hostname.c @@ -177,11 +177,11 @@ 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\ -License GPLv3+: GNU GPL version 3 or later \n\ +License GPLv3+: GNU GPL version 3 or later <%s>\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-2019"); + "2001-2019", "https://gnu.org/licenses/gpl.html"); printf (_("Written by %s.\n"), proper_name ("Bruno Haible")); exit (EXIT_SUCCESS); } @@ -233,12 +233,16 @@ Informative output:\n")); printf (_("\ -V, --version output version information and exit\n")); printf ("\n"); - /* TRANSLATORS: The placeholder indicates the bug-reporting address - for this package. Please add _another line_ saying + /* TRANSLATORS: The first placeholder is the web address of the Savannah + project of this package. The second placeholder is the bug-reporting + email address for this package. Please add _another line_ saying "Report translation bugs to <...>\n" with the address for translation bugs (typically your translation team's web or email address). */ - fputs (_("Report bugs to .\n"), - stdout); + printf(_("\ +Report bugs in the bug tracker at <%s>\n\ +or by email to <%s>.\n"), + "https://savannah.gnu.org/projects/gettext", + "bug-gettext@gnu.org"); } exit (status); diff --git a/gettext-tools/src/msgattrib.c b/gettext-tools/src/msgattrib.c index 583724947..e48549bb0 100644 --- a/gettext-tools/src/msgattrib.c +++ b/gettext-tools/src/msgattrib.c @@ -353,11 +353,11 @@ 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\ -License GPLv3+: GNU GPL version 3 or later \n\ +License GPLv3+: GNU GPL version 3 or later <%s>\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-2019"); + "2001-2019", "https://gnu.org/licenses/gpl.html"); printf (_("Written by %s.\n"), proper_name ("Bruno Haible")); exit (EXIT_SUCCESS); } @@ -538,12 +538,16 @@ Informative output:\n")); printf (_("\ -V, --version output version information and exit\n")); printf ("\n"); - /* TRANSLATORS: The placeholder indicates the bug-reporting address - for this package. Please add _another line_ saying + /* TRANSLATORS: The first placeholder is the web address of the Savannah + project of this package. The second placeholder is the bug-reporting + email address for this package. Please add _another line_ saying "Report translation bugs to <...>\n" with the address for translation bugs (typically your translation team's web or email address). */ - fputs (_("Report bugs to .\n"), - stdout); + printf(_("\ +Report bugs in the bug tracker at <%s>\n\ +or by email to <%s>.\n"), + "https://savannah.gnu.org/projects/gettext", + "bug-gettext@gnu.org"); } exit (status); diff --git a/gettext-tools/src/msgcat.c b/gettext-tools/src/msgcat.c index 364ec9a2d..17f6c6658 100644 --- a/gettext-tools/src/msgcat.c +++ b/gettext-tools/src/msgcat.c @@ -291,11 +291,11 @@ 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\ -License GPLv3+: GNU GPL version 3 or later \n\ +License GPLv3+: GNU GPL version 3 or later <%s>\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-2019"); + "2001-2019", "https://gnu.org/licenses/gpl.html"); printf (_("Written by %s.\n"), proper_name ("Bruno Haible")); exit (EXIT_SUCCESS); } @@ -472,12 +472,16 @@ Informative output:\n")); printf (_("\ -V, --version output version information and exit\n")); printf ("\n"); - /* TRANSLATORS: The placeholder indicates the bug-reporting address - for this package. Please add _another line_ saying + /* TRANSLATORS: The first placeholder is the web address of the Savannah + project of this package. The second placeholder is the bug-reporting + email address for this package. Please add _another line_ saying "Report translation bugs to <...>\n" with the address for translation bugs (typically your translation team's web or email address). */ - fputs (_("Report bugs to .\n"), - stdout); + printf(_("\ +Report bugs in the bug tracker at <%s>\n\ +or by email to <%s>.\n"), + "https://savannah.gnu.org/projects/gettext", + "bug-gettext@gnu.org"); } exit (status); diff --git a/gettext-tools/src/msgcmp.c b/gettext-tools/src/msgcmp.c index d52843ac5..a376e2ce2 100644 --- a/gettext-tools/src/msgcmp.c +++ b/gettext-tools/src/msgcmp.c @@ -169,11 +169,11 @@ 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\ -License GPLv3+: GNU GPL version 3 or later \n\ +License GPLv3+: GNU GPL version 3 or later <%s>\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-2019"); + "1995-2019", "https://gnu.org/licenses/gpl.html"); printf (_("Written by %s.\n"), proper_name ("Peter Miller")); exit (EXIT_SUCCESS); } @@ -261,11 +261,16 @@ Informative output:\n")); printf (_("\ -V, --version output version information and exit\n")); printf ("\n"); - /* TRANSLATORS: The placeholder indicates the bug-reporting address - for this package. Please add _another line_ saying + /* TRANSLATORS: The first placeholder is the web address of the Savannah + project of this package. The second placeholder is the bug-reporting + email address for this package. Please add _another line_ saying "Report translation bugs to <...>\n" with the address for translation bugs (typically your translation team's web or email address). */ - fputs (_("Report bugs to .\n"), stdout); + printf(_("\ +Report bugs in the bug tracker at <%s>\n\ +or by email to <%s>.\n"), + "https://savannah.gnu.org/projects/gettext", + "bug-gettext@gnu.org"); } exit (status); diff --git a/gettext-tools/src/msgcomm.c b/gettext-tools/src/msgcomm.c index 901bee707..dc97c4b6a 100644 --- a/gettext-tools/src/msgcomm.c +++ b/gettext-tools/src/msgcomm.c @@ -282,11 +282,11 @@ 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\ -License GPLv3+: GNU GPL version 3 or later \n\ +License GPLv3+: GNU GPL version 3 or later <%s>\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-2019"); + "1995-2019", "https://gnu.org/licenses/gpl.html"); printf (_("Written by %s.\n"), proper_name ("Peter Miller")); exit (EXIT_SUCCESS); } @@ -458,12 +458,16 @@ Informative output:\n")); printf (_("\ -V, --version output version information and exit\n")); printf ("\n"); - /* TRANSLATORS: The placeholder indicates the bug-reporting address - for this package. Please add _another line_ saying + /* TRANSLATORS: The first placeholder is the web address of the Savannah + project of this package. The second placeholder is the bug-reporting + email address for this package. Please add _another line_ saying "Report translation bugs to <...>\n" with the address for translation bugs (typically your translation team's web or email address). */ - fputs (_("Report bugs to .\n"), - stdout); + printf(_("\ +Report bugs in the bug tracker at <%s>\n\ +or by email to <%s>.\n"), + "https://savannah.gnu.org/projects/gettext", + "bug-gettext@gnu.org"); } exit (status); diff --git a/gettext-tools/src/msgconv.c b/gettext-tools/src/msgconv.c index 8f4dfcb65..d248090ff 100644 --- a/gettext-tools/src/msgconv.c +++ b/gettext-tools/src/msgconv.c @@ -242,11 +242,11 @@ 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\ -License GPLv3+: GNU GPL version 3 or later \n\ +License GPLv3+: GNU GPL version 3 or later <%s>\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-2019"); + "2001-2019", "https://gnu.org/licenses/gpl.html"); printf (_("Written by %s.\n"), proper_name ("Bruno Haible")); exit (EXIT_SUCCESS); } @@ -389,12 +389,16 @@ Informative output:\n")); printf (_("\ -V, --version output version information and exit\n")); printf ("\n"); - /* TRANSLATORS: The placeholder indicates the bug-reporting address - for this package. Please add _another line_ saying + /* TRANSLATORS: The first placeholder is the web address of the Savannah + project of this package. The second placeholder is the bug-reporting + email address for this package. Please add _another line_ saying "Report translation bugs to <...>\n" with the address for translation bugs (typically your translation team's web or email address). */ - fputs (_("Report bugs to .\n"), - stdout); + printf(_("\ +Report bugs in the bug tracker at <%s>\n\ +or by email to <%s>.\n"), + "https://savannah.gnu.org/projects/gettext", + "bug-gettext@gnu.org"); } exit (status); diff --git a/gettext-tools/src/msgen.c b/gettext-tools/src/msgen.c index 6d2f44c0c..897c7cafd 100644 --- a/gettext-tools/src/msgen.c +++ b/gettext-tools/src/msgen.c @@ -239,11 +239,11 @@ 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\ -License GPLv3+: GNU GPL version 3 or later \n\ +License GPLv3+: GNU GPL version 3 or later <%s>\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-2019"); + "2001-2019", "https://gnu.org/licenses/gpl.html"); printf (_("Written by %s.\n"), proper_name ("Bruno Haible")); exit (EXIT_SUCCESS); } @@ -385,12 +385,16 @@ Informative output:\n")); printf (_("\ -V, --version output version information and exit\n")); printf ("\n"); - /* TRANSLATORS: The placeholder indicates the bug-reporting address - for this package. Please add _another line_ saying + /* TRANSLATORS: The first placeholder is the web address of the Savannah + project of this package. The second placeholder is the bug-reporting + email address for this package. Please add _another line_ saying "Report translation bugs to <...>\n" with the address for translation bugs (typically your translation team's web or email address). */ - fputs (_("Report bugs to .\n"), - stdout); + printf(_("\ +Report bugs in the bug tracker at <%s>\n\ +or by email to <%s>.\n"), + "https://savannah.gnu.org/projects/gettext", + "bug-gettext@gnu.org"); } exit (status); diff --git a/gettext-tools/src/msgexec.c b/gettext-tools/src/msgexec.c index da432987e..13d11f630 100644 --- a/gettext-tools/src/msgexec.c +++ b/gettext-tools/src/msgexec.c @@ -183,11 +183,11 @@ 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\ -License GPLv3+: GNU GPL version 3 or later \n\ +License GPLv3+: GNU GPL version 3 or later <%s>\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-2019"); + "2001-2019", "https://gnu.org/licenses/gpl.html"); printf (_("Written by %s.\n"), proper_name ("Bruno Haible")); exit (EXIT_SUCCESS); } @@ -309,12 +309,16 @@ Informative output:\n")); printf (_("\ -V, --version output version information and exit\n")); printf ("\n"); - /* TRANSLATORS: The placeholder indicates the bug-reporting address - for this package. Please add _another line_ saying + /* TRANSLATORS: The first placeholder is the web address of the Savannah + project of this package. The second placeholder is the bug-reporting + email address for this package. Please add _another line_ saying "Report translation bugs to <...>\n" with the address for translation bugs (typically your translation team's web or email address). */ - fputs (_("Report bugs to .\n"), - stdout); + printf(_("\ +Report bugs in the bug tracker at <%s>\n\ +or by email to <%s>.\n"), + "https://savannah.gnu.org/projects/gettext", + "bug-gettext@gnu.org"); } exit (status); diff --git a/gettext-tools/src/msgfilter.c b/gettext-tools/src/msgfilter.c index 561a88dd3..8253dab81 100644 --- a/gettext-tools/src/msgfilter.c +++ b/gettext-tools/src/msgfilter.c @@ -286,11 +286,11 @@ 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\ -License GPLv3+: GNU GPL version 3 or later \n\ +License GPLv3+: GNU GPL version 3 or later <%s>\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-2019"); + "2001-2019", "https://gnu.org/licenses/gpl.html"); printf (_("Written by %s.\n"), proper_name ("Bruno Haible")); exit (EXIT_SUCCESS); } @@ -511,12 +511,16 @@ Informative output:\n")); printf (_("\ -V, --version output version information and exit\n")); printf ("\n"); - /* TRANSLATORS: The placeholder indicates the bug-reporting address - for this package. Please add _another line_ saying + /* TRANSLATORS: The first placeholder is the web address of the Savannah + project of this package. The second placeholder is the bug-reporting + email address for this package. Please add _another line_ saying "Report translation bugs to <...>\n" with the address for translation bugs (typically your translation team's web or email address). */ - fputs (_("Report bugs to .\n"), - stdout); + printf(_("\ +Report bugs in the bug tracker at <%s>\n\ +or by email to <%s>.\n"), + "https://savannah.gnu.org/projects/gettext", + "bug-gettext@gnu.org"); } exit (status); diff --git a/gettext-tools/src/msgfmt.c b/gettext-tools/src/msgfmt.c index 68119f1c4..9dded2462 100644 --- a/gettext-tools/src/msgfmt.c +++ b/gettext-tools/src/msgfmt.c @@ -442,11 +442,11 @@ 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\ -License GPLv3+: GNU GPL version 3 or later \n\ +License GPLv3+: GNU GPL version 3 or later <%s>\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-2019"); + "1995-2019", "https://gnu.org/licenses/gpl.html"); printf (_("Written by %s.\n"), proper_name ("Ulrich Drepper")); exit (EXIT_SUCCESS); } @@ -1074,11 +1074,16 @@ Informative output:\n")); printf (_("\ -v, --verbose increase verbosity level\n")); printf ("\n"); - /* TRANSLATORS: The placeholder indicates the bug-reporting address - for this package. Please add _another line_ saying + /* TRANSLATORS: The first placeholder is the web address of the Savannah + project of this package. The second placeholder is the bug-reporting + email address for this package. Please add _another line_ saying "Report translation bugs to <...>\n" with the address for translation bugs (typically your translation team's web or email address). */ - fputs (_("Report bugs to .\n"), stdout); + printf(_("\ +Report bugs in the bug tracker at <%s>\n\ +or by email to <%s>.\n"), + "https://savannah.gnu.org/projects/gettext", + "bug-gettext@gnu.org"); } exit (status); diff --git a/gettext-tools/src/msggrep.c b/gettext-tools/src/msggrep.c index 71db8f88e..614ebf156 100644 --- a/gettext-tools/src/msggrep.c +++ b/gettext-tools/src/msggrep.c @@ -417,11 +417,11 @@ 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\ -License GPLv3+: GNU GPL version 3 or later \n\ +License GPLv3+: GNU GPL version 3 or later <%s>\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-2019"); + "2001-2019", "https://gnu.org/licenses/gpl.html"); printf (_("Written by %s.\n"), proper_name ("Bruno Haible")); exit (EXIT_SUCCESS); } @@ -632,12 +632,16 @@ Informative output:\n")); printf (_("\ -V, --version output version information and exit\n")); printf ("\n"); - /* TRANSLATORS: The placeholder indicates the bug-reporting address - for this package. Please add _another line_ saying + /* TRANSLATORS: The first placeholder is the web address of the Savannah + project of this package. The second placeholder is the bug-reporting + email address for this package. Please add _another line_ saying "Report translation bugs to <...>\n" with the address for translation bugs (typically your translation team's web or email address). */ - fputs (_("Report bugs to .\n"), - stdout); + printf(_("\ +Report bugs in the bug tracker at <%s>\n\ +or by email to <%s>.\n"), + "https://savannah.gnu.org/projects/gettext", + "bug-gettext@gnu.org"); } exit (status); diff --git a/gettext-tools/src/msginit.c b/gettext-tools/src/msginit.c index 667efa100..0a81a42b5 100644 --- a/gettext-tools/src/msginit.c +++ b/gettext-tools/src/msginit.c @@ -269,11 +269,11 @@ 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\ -License GPLv3+: GNU GPL version 3 or later \n\ +License GPLv3+: GNU GPL version 3 or later <%s>\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-2019"); + "2001-2019", "https://gnu.org/licenses/gpl.html"); printf (_("Written by %s.\n"), proper_name ("Bruno Haible")); exit (EXIT_SUCCESS); } @@ -473,12 +473,16 @@ Informative output:\n")); printf (_("\ -V, --version output version information and exit\n")); printf ("\n"); - /* TRANSLATORS: The placeholder indicates the bug-reporting address - for this package. Please add _another line_ saying + /* TRANSLATORS: The first placeholder is the web address of the Savannah + project of this package. The second placeholder is the bug-reporting + email address for this package. Please add _another line_ saying "Report translation bugs to <...>\n" with the address for translation bugs (typically your translation team's web or email address). */ - fputs (_("Report bugs to .\n"), - stdout); + printf(_("\ +Report bugs in the bug tracker at <%s>\n\ +or by email to <%s>.\n"), + "https://savannah.gnu.org/projects/gettext", + "bug-gettext@gnu.org"); } exit (status); diff --git a/gettext-tools/src/msgmerge.c b/gettext-tools/src/msgmerge.c index 2c31282e2..cd762c029 100644 --- a/gettext-tools/src/msgmerge.c +++ b/gettext-tools/src/msgmerge.c @@ -370,11 +370,11 @@ 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\ -License GPLv3+: GNU GPL version 3 or later \n\ +License GPLv3+: GNU GPL version 3 or later <%s>\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-2019"); + "1995-2019", "https://gnu.org/licenses/gpl.html"); printf (_("Written by %s.\n"), proper_name ("Peter Miller")); exit (EXIT_SUCCESS); } @@ -672,12 +672,16 @@ Informative output:\n")); printf (_("\ -q, --quiet, --silent suppress progress indicators\n")); printf ("\n"); - /* TRANSLATORS: The placeholder indicates the bug-reporting address - for this package. Please add _another line_ saying + /* TRANSLATORS: The first placeholder is the web address of the Savannah + project of this package. The second placeholder is the bug-reporting + email address for this package. Please add _another line_ saying "Report translation bugs to <...>\n" with the address for translation bugs (typically your translation team's web or email address). */ - fputs (_("Report bugs to .\n"), - stdout); + printf(_("\ +Report bugs in the bug tracker at <%s>\n\ +or by email to <%s>.\n"), + "https://savannah.gnu.org/projects/gettext", + "bug-gettext@gnu.org"); } exit (status); diff --git a/gettext-tools/src/msgunfmt.c b/gettext-tools/src/msgunfmt.c index d1c1d8c53..9406ec8d2 100644 --- a/gettext-tools/src/msgunfmt.c +++ b/gettext-tools/src/msgunfmt.c @@ -260,11 +260,11 @@ 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\ -License GPLv3+: GNU GPL version 3 or later \n\ +License GPLv3+: GNU GPL version 3 or later <%s>\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-2019"); + "1995-2019", "https://gnu.org/licenses/gpl.html"); printf (_("Written by %s.\n"), proper_name ("Ulrich Drepper")); exit (EXIT_SUCCESS); } @@ -533,12 +533,16 @@ Informative output:\n")); printf (_("\ -v, --verbose increase verbosity level\n")); printf ("\n"); - /* TRANSLATORS: The placeholder indicates the bug-reporting address - for this package. Please add _another line_ saying + /* TRANSLATORS: The first placeholder is the web address of the Savannah + project of this package. The second placeholder is the bug-reporting + email address for this package. Please add _another line_ saying "Report translation bugs to <...>\n" with the address for translation bugs (typically your translation team's web or email address). */ - fputs (_("Report bugs to .\n"), - stdout); + printf(_("\ +Report bugs in the bug tracker at <%s>\n\ +or by email to <%s>.\n"), + "https://savannah.gnu.org/projects/gettext", + "bug-gettext@gnu.org"); } exit (status); diff --git a/gettext-tools/src/msguniq.c b/gettext-tools/src/msguniq.c index 98641c379..fb28ecfc8 100644 --- a/gettext-tools/src/msguniq.c +++ b/gettext-tools/src/msguniq.c @@ -262,11 +262,11 @@ 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\ -License GPLv3+: GNU GPL version 3 or later \n\ +License GPLv3+: GNU GPL version 3 or later <%s>\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-2019"); + "2001-2019", "https://gnu.org/licenses/gpl.html"); printf (_("Written by %s.\n"), proper_name ("Bruno Haible")); exit (EXIT_SUCCESS); } @@ -421,12 +421,16 @@ Informative output:\n")); printf (_("\ -V, --version output version information and exit\n")); printf ("\n"); - /* TRANSLATORS: The placeholder indicates the bug-reporting address - for this package. Please add _another line_ saying + /* TRANSLATORS: The first placeholder is the web address of the Savannah + project of this package. The second placeholder is the bug-reporting + email address for this package. Please add _another line_ saying "Report translation bugs to <...>\n" with the address for translation bugs (typically your translation team's web or email address). */ - fputs (_("Report bugs to .\n"), - stdout); + printf(_("\ +Report bugs in the bug tracker at <%s>\n\ +or by email to <%s>.\n"), + "https://savannah.gnu.org/projects/gettext", + "bug-gettext@gnu.org"); } exit (status); diff --git a/gettext-tools/src/recode-sr-latin.c b/gettext-tools/src/recode-sr-latin.c index 08f06b1f0..f4a22f232 100644 --- a/gettext-tools/src/recode-sr-latin.c +++ b/gettext-tools/src/recode-sr-latin.c @@ -107,11 +107,11 @@ 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\ -License GPLv3+: GNU GPL version 3 or later \n\ +License GPLv3+: GNU GPL version 3 or later <%s>\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-2019"); + "2006-2019", "https://gnu.org/licenses/gpl.html"); printf (_("Written by %s and %s.\n"), /* TRANSLATORS: This is a proper name. The last name is (with Unicode escapes) "\u0160egan" or (with HTML entities) @@ -166,11 +166,16 @@ Informative output:\n")); printf (_("\ -V, --version output version information and exit\n")); printf ("\n"); - /* TRANSLATORS: The placeholder indicates the bug-reporting address - for this package. Please add _another line_ saying + /* TRANSLATORS: The first placeholder is the web address of the Savannah + project of this package. The second placeholder is the bug-reporting + email address for this package. Please add _another line_ saying "Report translation bugs to <...>\n" with the address for translation bugs (typically your translation team's web or email address). */ - fputs (_("Report bugs to .\n"), stdout); + printf(_("\ +Report bugs in the bug tracker at <%s>\n\ +or by email to <%s>.\n"), + "https://savannah.gnu.org/projects/gettext", + "bug-gettext@gnu.org"); } exit (status); diff --git a/gettext-tools/src/urlget.c b/gettext-tools/src/urlget.c index 4dfcd904a..c47f27e12 100644 --- a/gettext-tools/src/urlget.c +++ b/gettext-tools/src/urlget.c @@ -140,11 +140,11 @@ 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\ -License GPLv3+: GNU GPL version 3 or later \n\ +License GPLv3+: GNU GPL version 3 or later <%s>\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-2019"); + "2001-2019", "https://gnu.org/licenses/gpl.html"); printf (_("Written by %s.\n"), proper_name ("Bruno Haible")); exit (EXIT_SUCCESS); } @@ -191,12 +191,16 @@ Informative output:\n")); printf (_("\ -q, --quiet, --silent suppress progress indicators\n")); printf ("\n"); - /* TRANSLATORS: The placeholder indicates the bug-reporting address - for this package. Please add _another line_ saying + /* TRANSLATORS: The first placeholder is the web address of the Savannah + project of this package. The second placeholder is the bug-reporting + email address for this package. Please add _another line_ saying "Report translation bugs to <...>\n" with the address for translation bugs (typically your translation team's web or email address). */ - fputs (_("Report bugs to .\n"), - stdout); + printf(_("\ +Report bugs in the bug tracker at <%s>\n\ +or by email to <%s>.\n"), + "https://savannah.gnu.org/projects/gettext", + "bug-gettext@gnu.org"); } exit (status); diff --git a/gettext-tools/src/xgettext.c b/gettext-tools/src/xgettext.c index b1b206ec6..b9cd243f5 100644 --- a/gettext-tools/src/xgettext.c +++ b/gettext-tools/src/xgettext.c @@ -665,11 +665,11 @@ 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\ -License GPLv3+: GNU GPL version 3 or later \n\ +License GPLv3+: GNU GPL version 3 or later <%s>\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-2019"); + "1995-2019", "https://gnu.org/licenses/gpl.html"); printf (_("Written by %s.\n"), proper_name ("Ulrich Drepper")); exit (EXIT_SUCCESS); } @@ -1209,12 +1209,16 @@ Informative output:\n")); printf (_("\ -V, --version output version information and exit\n")); printf ("\n"); - /* TRANSLATORS: The placeholder indicates the bug-reporting address - for this package. Please add _another line_ saying + /* TRANSLATORS: The first placeholder is the web address of the Savannah + project of this package. The second placeholder is the bug-reporting + email address for this package. Please add _another line_ saying "Report translation bugs to <...>\n" with the address for translation bugs (typically your translation team's web or email address). */ - fputs (_("Report bugs to .\n"), - stdout); + printf(_("\ +Report bugs in the bug tracker at <%s>\n\ +or by email to <%s>.\n"), + "https://savannah.gnu.org/projects/gettext", + "bug-gettext@gnu.org"); } exit (status); diff --git a/gettext-tools/tests/tstgettext.c b/gettext-tools/tests/tstgettext.c index d0eb19797..480dda422 100644 --- a/gettext-tools/tests/tstgettext.c +++ b/gettext-tools/tests/tstgettext.c @@ -153,11 +153,11 @@ 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\ -License GPLv3+: GNU GPL version 3 or later \n\ +License GPLv3+: GNU GPL version 3 or later <%s>\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-1997, 2000-2006"); + "1995-1997, 2000-2006", "https://gnu.org/licenses/gpl.html"); printf (_("Written by %s.\n"), proper_name ("Ulrich Drepper")); exit (EXIT_SUCCESS); } @@ -294,11 +294,16 @@ found in the selected catalog are translated.\n\ Standard search directory: %s\n"), getenv ("IN_HELP2MAN") == NULL ? LOCALEDIR : "@localedir@"); printf ("\n"); - /* TRANSLATORS: The placeholder indicates the bug-reporting address - for this package. Please add _another line_ saying + /* TRANSLATORS: The first placeholder is the web address of the Savannah + project of this package. The second placeholder is the bug-reporting + email address for this package. Please add _another line_ saying "Report translation bugs to <...>\n" with the address for translation bugs (typically your translation team's web or email address). */ - fputs (_("Report bugs to .\n"), stdout); + printf(_("\ +Report bugs in the bug tracker at <%s>\n\ +or by email to <%s>.\n"), + "https://savannah.gnu.org/projects/gettext", + "bug-gettext@gnu.org"); } exit (status); diff --git a/gettext-tools/tests/tstngettext.c b/gettext-tools/tests/tstngettext.c index 57ed439c4..aa7cf70ed 100644 --- a/gettext-tools/tests/tstngettext.c +++ b/gettext-tools/tests/tstngettext.c @@ -129,11 +129,11 @@ 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\ -License GPLv3+: GNU GPL version 3 or later \n\ +License GPLv3+: GNU GPL version 3 or later <%s>\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-1997, 2000-2006"); + "1995-1997, 2000-2006", "https://gnu.org/licenses/gpl.html"); printf (_("Written by %s.\n"), proper_name ("Ulrich Drepper")); exit (EXIT_SUCCESS); } @@ -217,11 +217,16 @@ environment variable TEXTDOMAIN. If the message catalog is not found in the\n\ regular directory, another location can be specified with the environment\n\ variable TEXTDOMAINDIR.\n\ Standard search directory: %s\n"), LOCALEDIR); - /* TRANSLATORS: The placeholder indicates the bug-reporting address - for this package. Please add _another line_ saying + /* TRANSLATORS: The first placeholder is the web address of the Savannah + project of this package. The second placeholder is the bug-reporting + email address for this package. Please add _another line_ saying "Report translation bugs to <...>\n" with the address for translation bugs (typically your translation team's web or email address). */ - fputs (_("Report bugs to .\n"), stdout); + printf(_("\ +Report bugs in the bug tracker at <%s>\n\ +or by email to <%s>.\n"), + "https://savannah.gnu.org/projects/gettext", + "bug-gettext@gnu.org"); } exit (status);