certtool-args.c.bak   certtool-args.c.bak 
skipping to change at line 66 skipping to change at line 66
#define zLicenseDescrip (certtool_opt_strs+283) #define zLicenseDescrip (certtool_opt_strs+283)
#ifndef NULL #ifndef NULL
# define NULL 0 # define NULL 0
#endif #endif
/** /**
* static const strings for certtool options * static const strings for certtool options
*/ */
static char const certtool_opt_strs[6283] = static char const certtool_opt_strs[6283] =
/* 0 */ "certtool 3.4.4\n" /* 0 */ "certtool 3.4.5\n"
"Copyright (C) 2000-2015 Free Software Foundation, and others, all rights reserved.\n" "Copyright (C) 2000-2015 Free Software Foundation, and others, all rights reserved.\n"
"This is free software. It is licensed for use, modification an d\n" "This is free software. It is licensed for use, modification an d\n"
"redistribution under the terms of the GNU General Public Licen se,\n" "redistribution under the terms of the GNU General Public Licen se,\n"
"version 3 or later <http://gnu.org/licenses/gpl.html>\n\0" "version 3 or later <http://gnu.org/licenses/gpl.html>\n\0"
/* 283 */ "certtool is free software: you can redistribute it and/or modi fy it under\n" /* 283 */ "certtool is free software: you can redistribute it and/or modi fy it under\n"
"the terms of the GNU General Public License as published by th e Free\n" "the terms of the GNU General Public License as published by th e Free\n"
"Software Foundation, either version 3 of the License, or (at y our option)\n" "Software Foundation, either version 3 of the License, or (at y our option)\n"
"any later version.\n\n" "any later version.\n\n"
"certtool is distributed in the hope that it will be useful, bu t WITHOUT ANY\n" "certtool is distributed in the hope that it will be useful, bu t WITHOUT ANY\n"
"WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS\n" "WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS\n"
skipping to change at line 327 skipping to change at line 327
/* 5746 */ "certtool - GnuTLS certificate tool\n" /* 5746 */ "certtool - GnuTLS certificate tool\n"
"Usage: %s [ -<flag> [<val>] | --<name>[{=| }<val>] ]...\n\0" "Usage: %s [ -<flag> [<val>] | --<name>[{=| }<val>] ]...\n\0"
/* 5839 */ "bugs@gnutls.org\0" /* 5839 */ "bugs@gnutls.org\0"
/* 5855 */ "\n\0" /* 5855 */ "\n\0"
/* 5857 */ "Tool to parse and generate X.509 certificates, requests and pr ivate keys.\n" /* 5857 */ "Tool to parse and generate X.509 certificates, requests and pr ivate keys.\n"
"It can be used interactively or non interactively by specifyin g the\n" "It can be used interactively or non interactively by specifyin g the\n"
"template command line option.\n\n" "template command line option.\n\n"
"The tool accepts files or URLs supported by GnuTLS. In case P IN is\n" "The tool accepts files or URLs supported by GnuTLS. In case P IN is\n"
"required for the URL access you can provide it using the envir onment\n" "required for the URL access you can provide it using the envir onment\n"
"variables GNUTLS_PIN and GNUTLS_SO_PIN.\n\0" "variables GNUTLS_PIN and GNUTLS_SO_PIN.\n\0"
/* 6208 */ "certtool 3.4.4\0" /* 6208 */ "certtool 3.4.5\0"
/* 6223 */ "certtool [options]\n" /* 6223 */ "certtool [options]\n"
"certtool --help for usage instructions.\n"; "certtool --help for usage instructions.\n";
/** /**
* debug option description: * debug option description:
*/ */
/** Descriptive text for the debug option */ /** Descriptive text for the debug option */
#define DEBUG_DESC (certtool_opt_strs+888) #define DEBUG_DESC (certtool_opt_strs+888)
/** Upper-cased name for the debug option */ /** Upper-cased name for the debug option */
#define DEBUG_NAME (certtool_opt_strs+905) #define DEBUG_NAME (certtool_opt_strs+905)
skipping to change at line 2662 skipping to change at line 2662
NOTE: the strings below are segmented with respect to the source strin g NOTE: the strings below are segmented with respect to the source strin g
certtool_opt_strs. The strings above are handed off for translation certtool_opt_strs. The strings above are handed off for translation
at run time a paragraph at a time. Consequently, they are presented h ere at run time a paragraph at a time. Consequently, they are presented h ere
for translation a paragraph at a time. for translation a paragraph at a time.
ALSO: often the description for an option will reference another optio n ALSO: often the description for an option will reference another optio n
by name. These are set off with apostrophe quotes (I hope). Do not by name. These are set off with apostrophe quotes (I hope). Do not
translate option names. translate option names.
*/ */
/* referenced via certtoolOptions.pzCopyright */ /* referenced via certtoolOptions.pzCopyright */
puts(_("certtool 3.4.4\n\ puts(_("certtool 3.4.5\n\
Copyright (C) 2000-2015 Free Software Foundation, and others, all rights re served.\n\ Copyright (C) 2000-2015 Free Software Foundation, and others, all rights re served.\n\
This is free software. It is licensed for use, modification and\n\ This is free software. It is licensed for use, modification and\n\
redistribution under the terms of the GNU General Public License,\n\ redistribution under the terms of the GNU General Public License,\n\
version 3 or later <http://gnu.org/licenses/gpl.html>\n")); version 3 or later <http://gnu.org/licenses/gpl.html>\n"));
/* referenced via certtoolOptions.pzCopyNotice */ /* referenced via certtoolOptions.pzCopyNotice */
puts(_("certtool is free software: you can redistribute it and/or modify it under\n\ puts(_("certtool is free software: you can redistribute it and/or modify it under\n\
the terms of the GNU General Public License as published by the Free\n\ the terms of the GNU General Public License as published by the Free\n\
Software Foundation, either version 3 of the License, or (at your option)\n \ Software Foundation, either version 3 of the License, or (at your option)\n \
any later version.\n\n")); any later version.\n\n"));
skipping to change at line 2936 skipping to change at line 2936
/* referenced via certtoolOptions.pzDetail */ /* referenced via certtoolOptions.pzDetail */
puts(_("Tool to parse and generate X.509 certificates, requests and priva te keys.\n\ puts(_("Tool to parse and generate X.509 certificates, requests and priva te keys.\n\
It can be used interactively or non interactively by specifying the\n\ It can be used interactively or non interactively by specifying the\n\
template command line option.\n\n")); template command line option.\n\n"));
puts(_("The tool accepts files or URLs supported by GnuTLS. In case PIN is\n\ puts(_("The tool accepts files or URLs supported by GnuTLS. In case PIN is\n\
required for the URL access you can provide it using the environment\n\ required for the URL access you can provide it using the environment\n\
variables GNUTLS_PIN and GNUTLS_SO_PIN.\n")); variables GNUTLS_PIN and GNUTLS_SO_PIN.\n"));
/* referenced via certtoolOptions.pzFullVersion */ /* referenced via certtoolOptions.pzFullVersion */
puts(_("certtool 3.4.4")); puts(_("certtool 3.4.5"));
/* referenced via certtoolOptions.pzFullUsage */ /* referenced via certtoolOptions.pzFullUsage */
puts(_("<<<NOT-FOUND>>>")); puts(_("<<<NOT-FOUND>>>"));
/* referenced via certtoolOptions.pzShortUsage */ /* referenced via certtoolOptions.pzShortUsage */
puts(_("certtool [options]\n\ puts(_("certtool [options]\n\
certtool --help for usage instructions.\n")); certtool --help for usage instructions.\n"));
/* LIBOPTS-MESSAGES: */ /* LIBOPTS-MESSAGES: */
#line 67 "../autoopts.c" #line 67 "../autoopts.c"
puts(_("allocation of %d bytes failed\n")); puts(_("allocation of %d bytes failed\n"));
 End of changes. 4 change blocks. 
4 lines changed or deleted 4 lines changed or added

This html diff was produced by rfcdiff 1.41. The latest version is available from http://tools.ietf.org/tools/rfcdiff/