| p11tool-args.c.bak | p11tool-args.c.bak | |||
|---|---|---|---|---|
| skipping to change at line 66 | skipping to change at line 66 | |||
| #define zLicenseDescrip (p11tool_opt_strs+282) | #define zLicenseDescrip (p11tool_opt_strs+282) | |||
| #ifndef NULL | #ifndef NULL | |||
| # define NULL 0 | # define NULL 0 | |||
| #endif | #endif | |||
| /** | /** | |||
| * static const strings for p11tool options | * static const strings for p11tool options | |||
| */ | */ | |||
| static char const p11tool_opt_strs[5180] = | static char const p11tool_opt_strs[5180] = | |||
| /* 0 */ "p11tool 3.4.4\n" | /* 0 */ "p11tool 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 */ "p11tool is free software: you can redistribute it and/or modif y it under\n" | /* 282 */ "p11tool 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" | |||
| "p11tool is distributed in the hope that it will be useful, but WITHOUT ANY\n" | "p11tool 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 269 | skipping to change at line 269 | |||
| /* 4558 */ "\n\0" | /* 4558 */ "\n\0" | |||
| /* 4560 */ "Program that allows operations on PKCS #11 smart cards and sec urity\n" | /* 4560 */ "Program that allows operations on PKCS #11 smart cards and sec urity\n" | |||
| "modules.\n\n" | "modules.\n\n" | |||
| "To use PKCS #11 tokens with GnuTLS the p11-kit configuration f iles need to\n" | "To use PKCS #11 tokens with GnuTLS the p11-kit configuration f iles need to\n" | |||
| "be setup. That is create a .module file in /etc/pkcs11/module s with the\n" | "be setup. That is create a .module file in /etc/pkcs11/module s with the\n" | |||
| "contents 'module: /path/to/pkcs11.so'. Alternatively the conf iguration\n" | "contents 'module: /path/to/pkcs11.so'. Alternatively the conf iguration\n" | |||
| "file /etc/gnutls/pkcs11.conf has to exist and contain a number of lines of\n" | "file /etc/gnutls/pkcs11.conf has to exist and contain a number of lines of\n" | |||
| "the form 'load=/usr/lib/opensc-pkcs11.so'.\n\n" | "the form 'load=/usr/lib/opensc-pkcs11.so'.\n\n" | |||
| "You can provide the PIN to be used for the PKCS #11 operations with the\n" | "You can provide the PIN to be used for the PKCS #11 operations with the\n" | |||
| "environment variables GNUTLS_PIN and GNUTLS_SO_PIN.\n\0" | "environment variables GNUTLS_PIN and GNUTLS_SO_PIN.\n\0" | |||
| /* 5102 */ "p11tool 3.4.4\0" | /* 5102 */ "p11tool 3.4.5\0" | |||
| /* 5116 */ "p11tool [options] [url]\n" | /* 5116 */ "p11tool [options] [url]\n" | |||
| "p11tool --help for usage instructions.\n"; | "p11tool --help for usage instructions.\n"; | |||
| /** | /** | |||
| * token_related_options option description: | * token_related_options option description: | |||
| */ | */ | |||
| /** token_related_options option separation text */ | /** token_related_options option separation text */ | |||
| #define TOKEN_RELATED_OPTIONS_DESC (p11tool_opt_strs+885) | #define TOKEN_RELATED_OPTIONS_DESC (p11tool_opt_strs+885) | |||
| #define TOKEN_RELATED_OPTIONS_FLAGS (OPTST_DOCUMENT | OPTST_NO_INIT) | #define TOKEN_RELATED_OPTIONS_FLAGS (OPTST_DOCUMENT | OPTST_NO_INIT) | |||
| skipping to change at line 2392 | skipping to change at line 2392 | |||
| 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 | |||
| p11tool_opt_strs. The strings above are handed off for translation | p11tool_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 p11toolOptions.pzCopyright */ | /* referenced via p11toolOptions.pzCopyright */ | |||
| puts(_("p11tool 3.4.4\n\ | puts(_("p11tool 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 p11toolOptions.pzCopyNotice */ | /* referenced via p11toolOptions.pzCopyNotice */ | |||
| puts(_("p11tool is free software: you can redistribute it and/or modify i t under\n\ | puts(_("p11tool 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 2624 | skipping to change at line 2624 | |||
| modules.\n\n")); | modules.\n\n")); | |||
| puts(_("To use PKCS #11 tokens with GnuTLS the p11-kit configuration file s need to\n\ | puts(_("To use PKCS #11 tokens with GnuTLS the p11-kit configuration file s need to\n\ | |||
| be setup. That is create a .module file in /etc/pkcs11/modules with the\n\ | be setup. That is create a .module file in /etc/pkcs11/modules with the\n\ | |||
| contents 'module: /path/to/pkcs11.so'. Alternatively the configuration\n\ | contents 'module: /path/to/pkcs11.so'. Alternatively the configuration\n\ | |||
| file /etc/gnutls/pkcs11.conf has to exist and contain a number of lines of\ n\ | file /etc/gnutls/pkcs11.conf has to exist and contain a number of lines of\ n\ | |||
| the form 'load=/usr/lib/opensc-pkcs11.so'.\n\n")); | the form 'load=/usr/lib/opensc-pkcs11.so'.\n\n")); | |||
| puts(_("You can provide the PIN to be used for the PKCS #11 operations wi th the\n\ | puts(_("You can provide the PIN to be used for the PKCS #11 operations wi th the\n\ | |||
| environment variables GNUTLS_PIN and GNUTLS_SO_PIN.\n")); | environment variables GNUTLS_PIN and GNUTLS_SO_PIN.\n")); | |||
| /* referenced via p11toolOptions.pzFullVersion */ | /* referenced via p11toolOptions.pzFullVersion */ | |||
| puts(_("p11tool 3.4.4")); | puts(_("p11tool 3.4.5")); | |||
| /* referenced via p11toolOptions.pzFullUsage */ | /* referenced via p11toolOptions.pzFullUsage */ | |||
| puts(_("<<<NOT-FOUND>>>")); | puts(_("<<<NOT-FOUND>>>")); | |||
| /* referenced via p11toolOptions.pzShortUsage */ | /* referenced via p11toolOptions.pzShortUsage */ | |||
| puts(_("p11tool [options] [url]\n\ | puts(_("p11tool [options] [url]\n\ | |||
| p11tool --help for usage instructions.\n")); | p11tool --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/ | ||||