psktool-args.c.bak   psktool-args.c.bak 
skipping to change at line 66 skipping to change at line 66
#define zLicenseDescrip (psktool_opt_strs+282) #define zLicenseDescrip (psktool_opt_strs+282)
#ifndef NULL #ifndef NULL
# define NULL 0 # define NULL 0
#endif #endif
/** /**
* static const strings for psktool options * static const strings for psktool options
*/ */
static char const psktool_opt_strs[1481] = static char const psktool_opt_strs[1481] =
/* 0 */ "psktool 3.4.4\n" /* 0 */ "psktool 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"
/* 282 */ "psktool is free software: you can redistribute it and/or modif y it under\n" /* 282 */ "psktool is free software: you can redistribute it and/or modif y 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"
"psktool is distributed in the hope that it will be useful, but WITHOUT ANY\n" "psktool is distributed in the hope that it will be useful, but 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 106 skipping to change at line 106
/* 1129 */ "more-help\0" /* 1129 */ "more-help\0"
/* 1139 */ "output version information and exit\0" /* 1139 */ "output version information and exit\0"
/* 1175 */ "version\0" /* 1175 */ "version\0"
/* 1183 */ "PSKTOOL\0" /* 1183 */ "PSKTOOL\0"
/* 1191 */ "psktool - GnuTLS PSK tool\n" /* 1191 */ "psktool - GnuTLS PSK tool\n"
"Usage: %s [ -<flag> [<val>] | --<name>[{=| }<val>] ]...\n\0" "Usage: %s [ -<flag> [<val>] | --<name>[{=| }<val>] ]...\n\0"
/* 1275 */ "bugs@gnutls.org\0" /* 1275 */ "bugs@gnutls.org\0"
/* 1291 */ "\n\0" /* 1291 */ "\n\0"
/* 1293 */ "Program that generates random keys for use with TLS-PSK. The keys are\n" /* 1293 */ "Program that generates random keys for use with TLS-PSK. The keys are\n"
"stored in hexadecimal format in a key file.\n\0" "stored in hexadecimal format in a key file.\n\0"
/* 1409 */ "psktool 3.4.4\0" /* 1409 */ "psktool 3.4.5\0"
/* 1423 */ "psktool [options]\n" /* 1423 */ "psktool [options]\n"
"psktool --help for usage instructions.\n"; "psktool --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 (psktool_opt_strs+885) #define DEBUG_DESC (psktool_opt_strs+885)
/** Upper-cased name for the debug option */ /** Upper-cased name for the debug option */
#define DEBUG_NAME (psktool_opt_strs+902) #define DEBUG_NAME (psktool_opt_strs+902)
skipping to change at line 610 skipping to change at line 610
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
psktool_opt_strs. The strings above are handed off for translation psktool_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 psktoolOptions.pzCopyright */ /* referenced via psktoolOptions.pzCopyright */
puts(_("psktool 3.4.4\n\ puts(_("psktool 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 psktoolOptions.pzCopyNotice */ /* referenced via psktoolOptions.pzCopyNotice */
puts(_("psktool is free software: you can redistribute it and/or modify i t under\n\ puts(_("psktool is free software: you can redistribute it and/or modify i t 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 661 skipping to change at line 661
Usage: %s [ -<flag> [<val>] | --<name>[{=| }<val>] ]...\n")); Usage: %s [ -<flag> [<val>] | --<name>[{=| }<val>] ]...\n"));
/* referenced via psktoolOptions.pzExplain */ /* referenced via psktoolOptions.pzExplain */
puts(_("\n")); puts(_("\n"));
/* referenced via psktoolOptions.pzDetail */ /* referenced via psktoolOptions.pzDetail */
puts(_("Program that generates random keys for use with TLS-PSK. The key s are\n\ puts(_("Program that generates random keys for use with TLS-PSK. The key s are\n\
stored in hexadecimal format in a key file.\n")); stored in hexadecimal format in a key file.\n"));
/* referenced via psktoolOptions.pzFullVersion */ /* referenced via psktoolOptions.pzFullVersion */
puts(_("psktool 3.4.4")); puts(_("psktool 3.4.5"));
/* referenced via psktoolOptions.pzFullUsage */ /* referenced via psktoolOptions.pzFullUsage */
puts(_("<<<NOT-FOUND>>>")); puts(_("<<<NOT-FOUND>>>"));
/* referenced via psktoolOptions.pzShortUsage */ /* referenced via psktoolOptions.pzShortUsage */
puts(_("psktool [options]\n\ puts(_("psktool [options]\n\
psktool --help for usage instructions.\n")); psktool --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/