| cli-args.c.bak | cli-args.c.bak | |||
|---|---|---|---|---|
| skipping to change at line 66 | skipping to change at line 66 | |||
| #define zLicenseDescrip (gnutls_cli_opt_strs+285) | #define zLicenseDescrip (gnutls_cli_opt_strs+285) | |||
| #ifndef NULL | #ifndef NULL | |||
| # define NULL 0 | # define NULL 0 | |||
| #endif | #endif | |||
| /** | /** | |||
| * static const strings for gnutls-cli options | * static const strings for gnutls-cli options | |||
| */ | */ | |||
| static char const gnutls_cli_opt_strs[4629] = | static char const gnutls_cli_opt_strs[4629] = | |||
| /* 0 */ "gnutls-cli 3.4.4\n" | /* 0 */ "gnutls-cli 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" | |||
| /* 285 */ "gnutls-cli is free software: you can redistribute it and/or mo dify it under\n" | /* 285 */ "gnutls-cli is free software: you can redistribute it and/or mo dify 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" | |||
| "gnutls-cli is distributed in the hope that it will be useful, but WITHOUT\n" | "gnutls-cli is distributed in the hope that it will be useful, but WITHOUT\n" | |||
| "ANY WARRANTY; without even the implied warranty of MERCHANTABI LITY or\n" | "ANY WARRANTY; without even the implied warranty of MERCHANTABI LITY or\n" | |||
| skipping to change at line 258 | skipping to change at line 258 | |||
| /* 4180 */ "output version information and exit\0" | /* 4180 */ "output version information and exit\0" | |||
| /* 4216 */ "version\0" | /* 4216 */ "version\0" | |||
| /* 4224 */ "GNUTLS_CLI\0" | /* 4224 */ "GNUTLS_CLI\0" | |||
| /* 4235 */ "gnutls-cli - GnuTLS client\n" | /* 4235 */ "gnutls-cli - GnuTLS client\n" | |||
| "Usage: %s [ -<flag> [<val>] | --<name>[{=| }<val>] ]... [host name]\n\0" | "Usage: %s [ -<flag> [<val>] | --<name>[{=| }<val>] ]... [host name]\n\0" | |||
| /* 4331 */ "bugs@gnutls.org\0" | /* 4331 */ "bugs@gnutls.org\0" | |||
| /* 4347 */ "\n\0" | /* 4347 */ "\n\0" | |||
| /* 4349 */ "Simple client program to set up a TLS connection to some other computer. It\n" | /* 4349 */ "Simple client program to set up a TLS connection to some other computer. It\n" | |||
| "sets up a TLS connection and forwards data from the standard i nput to the\n" | "sets up a TLS connection and forwards data from the standard i nput to the\n" | |||
| "secured socket and vice versa.\n\0" | "secured socket and vice versa.\n\0" | |||
| /* 4532 */ "gnutls-cli 3.4.4\0" | /* 4532 */ "gnutls-cli 3.4.5\0" | |||
| /* 4549 */ "Usage: gnutls-cli [options] hostname\n" | /* 4549 */ "Usage: gnutls-cli [options] hostname\n" | |||
| "gnutls-cli --help for usage instructions.\n"; | "gnutls-cli --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 (gnutls_cli_opt_strs+894) | #define DEBUG_DESC (gnutls_cli_opt_strs+894) | |||
| /** Upper-cased name for the debug option */ | /** Upper-cased name for the debug option */ | |||
| #define DEBUG_NAME (gnutls_cli_opt_strs+911) | #define DEBUG_NAME (gnutls_cli_opt_strs+911) | |||
| skipping to change at line 2196 | skipping to change at line 2196 | |||
| 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 | |||
| gnutls_cli_opt_strs. The strings above are handed off for translation | gnutls_cli_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 gnutls_cliOptions.pzCopyright */ | /* referenced via gnutls_cliOptions.pzCopyright */ | |||
| puts(_("gnutls-cli 3.4.4\n\ | puts(_("gnutls-cli 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 gnutls_cliOptions.pzCopyNotice */ | /* referenced via gnutls_cliOptions.pzCopyNotice */ | |||
| puts(_("gnutls-cli is free software: you can redistribute it and/or modif y it under\n\ | puts(_("gnutls-cli 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 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 2399 | skipping to change at line 2399 | |||
| /* referenced via gnutls_cliOptions.pzExplain */ | /* referenced via gnutls_cliOptions.pzExplain */ | |||
| puts(_("\n")); | puts(_("\n")); | |||
| /* referenced via gnutls_cliOptions.pzDetail */ | /* referenced via gnutls_cliOptions.pzDetail */ | |||
| puts(_("Simple client program to set up a TLS connection to some other co mputer. It\n\ | puts(_("Simple client program to set up a TLS connection to some other co mputer. It\n\ | |||
| sets up a TLS connection and forwards data from the standard input to the\n \ | sets up a TLS connection and forwards data from the standard input to the\n \ | |||
| secured socket and vice versa.\n")); | secured socket and vice versa.\n")); | |||
| /* referenced via gnutls_cliOptions.pzFullVersion */ | /* referenced via gnutls_cliOptions.pzFullVersion */ | |||
| puts(_("gnutls-cli 3.4.4")); | puts(_("gnutls-cli 3.4.5")); | |||
| /* referenced via gnutls_cliOptions.pzFullUsage */ | /* referenced via gnutls_cliOptions.pzFullUsage */ | |||
| puts(_("<<<NOT-FOUND>>>")); | puts(_("<<<NOT-FOUND>>>")); | |||
| /* referenced via gnutls_cliOptions.pzShortUsage */ | /* referenced via gnutls_cliOptions.pzShortUsage */ | |||
| puts(_("Usage: gnutls-cli [options] hostname\n\ | puts(_("Usage: gnutls-cli [options] hostname\n\ | |||
| gnutls-cli --help for usage instructions.\n")); | gnutls-cli --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/ | ||||