diff options
Diffstat (limited to 'g10/import.c')
| -rw-r--r-- | g10/import.c | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/g10/import.c b/g10/import.c index 4ff334cc7..80388835e 100644 --- a/g10/import.c +++ b/g10/import.c @@ -178,9 +178,15 @@ parse_import_options(char *str,unsigned int *options,int noisy) {"fast-import",IMPORT_FAST,NULL, N_("do not update the trustdb after import")}, + {"bulk-import",IMPORT_BULK, NULL, + N_("enable bulk import mode")}, + {"import-show",IMPORT_SHOW,NULL, N_("show key during import")}, + {"show-only", (IMPORT_SHOW | IMPORT_DRY_RUN), NULL, + N_("show key but do not actually import") }, + {"merge-only",IMPORT_MERGE_ONLY,NULL, N_("only accept updates to existing keys")}, @@ -206,10 +212,6 @@ parse_import_options(char *str,unsigned int *options,int noisy) {"repair-keys", IMPORT_REPAIR_KEYS, NULL, N_("repair keys on import")}, - /* No description to avoid string change: Fixme for 2.3 */ - {"show-only", (IMPORT_SHOW | IMPORT_DRY_RUN), NULL, - NULL}, - /* Hidden options which are enabled by default and are provided * in case of problems with the respective implementation. */ {"collapse-uids", IMPORT_COLLAPSE_UIDS, NULL, NULL}, |