diff options
| author | John Darrington <john@darrington.wattle.id.au> | 2019-05-12 00:42:36 +0200 |
|---|---|---|
| committer | Bruno Haible <bruno@clisp.org> | 2019-05-12 00:42:36 +0200 |
| commit | 03752516b21091cf3c4beea7e8b9bcad462d50ed (patch) | |
| tree | 58e33791f69c67ec1d8b4ca54a1d9e2c39d48954 /lib | |
| parent | d654989d8bad1a82c4dcbd80204f20147408106e (diff) | |
| download | gnulib-03752516b21091cf3c4beea7e8b9bcad462d50ed.tar.gz | |
version-etc: Ease translation.
* lib/version-etc.c (version_etc_arn, emit_bug_reporting_address): Move
URLs and formatting newlines out of translatable string.
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/version-etc.c | 24 |
1 files changed, 14 insertions, 10 deletions
diff --git a/lib/version-etc.c b/lib/version-etc.c index 9ca9a56280..f6b26ef506 100644 --- a/lib/version-etc.c +++ b/lib/version-etc.c @@ -82,14 +82,17 @@ version_etc_arn (FILE *stream, locale. Otherwise, do not translate "(C)"; leave it as-is. */ fprintf (stream, version_etc_copyright, _("(C)"), COPYRIGHT_YEAR); - fputs (_("\ -\n\ -License GPLv3+: GNU GPL version 3 or later <https://gnu.org/licenses/gpl.html>.\n\ + fputs ("\n", stream); + + /* TRANSLATORS: The %s placeholder is the web address of the GPL license. */ + fprintf (stream, _("\ +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\ -\n\ "), - stream); + "https://gnu.org/licenses/gpl.html"); + + fputs ("\n", stream); switch (n_authors) { @@ -238,11 +241,12 @@ version_etc (FILE *stream, void emit_bug_reporting_address (void) { + fputs ("\n", stdout); /* TRANSLATORS: The placeholder indicates the bug-reporting 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). */ - printf (_("\nReport bugs to: %s\n"), PACKAGE_BUGREPORT); + printf (_("Report bugs to: %s\n"), PACKAGE_BUGREPORT); #ifdef PACKAGE_PACKAGER_BUG_REPORTS printf (_("Report %s bugs to: %s\n"), PACKAGE_PACKAGER, PACKAGE_PACKAGER_BUG_REPORTS); @@ -250,9 +254,9 @@ emit_bug_reporting_address (void) #ifdef PACKAGE_URL printf (_("%s home page: <%s>\n"), PACKAGE_NAME, PACKAGE_URL); #else - printf (_("%s home page: <https://www.gnu.org/software/%s/>\n"), - PACKAGE_NAME, PACKAGE); + printf (_("%s home page: <%s>\n"), + PACKAGE_NAME, "https://www.gnu.org/software/" PACKAGE "/"); #endif - fputs (_("General help using GNU software: <https://www.gnu.org/gethelp/>\n"), - stdout); + printf (_("General help using GNU software: <%s>\n"), + "https://www.gnu.org/gethelp/"); } |