Changeset 2233


Ignore:
Timestamp:
08/04/10 09:44:20 (3 years ago)
Author:
lowjoel
Message:

Allow the user to specify the Name or the GUID of the erasure method, to increase usability of the CLI. The name can be used as a convenient shorthand, the GUID must be used in the event of ambiguity.

Location:
trunk/eraser/Eraser
Files:
6 edited

Legend:

Unmodified
Added
Removed

  • trunk/eraser/Eraser/Program.cs

    r2232 r2233  
    9393            /// The erasure method which the user specified on the command line. 
    9494            /// </summary> 
    95             [Arg("method", "The erasure method to use", typeof(Guid), false, null, null)] 
    96             public Guid ErasureMethod { get; set; } 
     95            [Arg("method", "The erasure method to use", typeof(string), false, null, null)] 
     96            public string ErasureMethod { get; set; } 
    9797 
    9898            /// <summary> 
    … …  
    322322 
    323323parameters for addtask: 
    324   eraser addtask [/method=<methodGUID>] [/schedule=(now|manually|restart)] <target> [target [...]] 
     324  eraser addtask [/method=(<methodGUID>|<methodName>)] [/schedule=(now|manually|restart)] <target> [target [...]] 
    325325 
    326326  /method             The Erasure method to use. 
    … …  
    332332                      is next restarted. 
    333333 
    334   where target is: 
     334  where target is one of more of: 
    335335{0} 
    336336 
    … …  
    341341 
    342342parameters for importtasklist: 
    343   eraser importtasklist (file)[...] 
    344  
    345   [file]              A list of one or more files to import. 
     343  eraser importtasklist <file>[...] 
     344 
     345    file               A list of one or more files to import. 
    346346 
    347347All arguments are case sensitive. 
    … …  
    398398            AddTaskArguments arguments = (AddTaskArguments)arg; 
    399399 
    400             //Create the task then set the method as well as schedule 
     400            //Create the task 
    401401            Task task = new Task(); 
    402             ErasureMethod method = arguments.ErasureMethod == Guid.Empty ? 
     402 
     403            //Get the erasure method the user wants to use 
     404            ErasureMethod method = string.IsNullOrEmpty(arguments.ErasureMethod) ? 
    403405                ErasureMethodRegistrar.Default : 
    404                 ManagerLibrary.Instance.ErasureMethodRegistrar[arguments.ErasureMethod]; 
     406                ErasureMethodFromNameOrGuid(arguments.ErasureMethod); 
     407 
     408            //Define the schedule 
    405409            switch (arguments.Schedule.ToUpperInvariant()) 
    406410            { 
    … …  
    442446                        { 
    443447                            //Yes, it is an ambiguity. Throw an error. 
    444                             throw new InvalidOperationException("Ambiguous argument: {0} can be " + 
    445                                 "handled by more than one erasure target."); 
     448                            throw new ArgumentException(S._("Ambiguous argument: {0} can be " + 
     449                                "handled by more than one erasure target.", argument)); 
    446450                        } 
    447451                    } 
    … …  
    467471            using (eraserClient = CommandConnect()) 
    468472                eraserClient.Tasks.Add(task); 
     473        } 
     474 
     475        private static ErasureMethod ErasureMethodFromNameOrGuid(string param) 
     476        { 
     477            try 
     478            { 
     479                return ManagerLibrary.Instance.ErasureMethodRegistrar[new Guid(param)]; 
     480            } 
     481            catch (FormatException) 
     482            { 
     483                //Invalid GUID. Check every registered erasure method for the name 
     484                string upperParam = param.ToUpperInvariant(); 
     485                ErasureMethod result = null; 
     486                foreach (ErasureMethod method in ManagerLibrary.Instance.ErasureMethodRegistrar) 
     487                { 
     488                    if (method.Name.ToUpperInvariant() == upperParam) 
     489                        if (result == null) 
     490                            result = method; 
     491                        else 
     492                            throw new ArgumentException(S._("Ambiguous erasure method name: {0} " + 
     493                                "identifies more than one erasure method.", param)); 
     494                } 
     495            } 
     496 
     497            throw new ArgumentException(S._("The provided Erasure Method '{0}' does not exist.", 
     498                param)); 
    469499        } 
    470500 

  • trunk/eraser/Eraser/Strings.en.resx

    r2232 r2233  
    160160    <value>Another instance of Eraser is already running but it is running with higher privileges than this instance of Eraser. Tasks cannot be added in this manner.\n\nClose the running instance of Eraser and start it again without administrator privileges, or run the command again as an administrator.</value> 
    161161  </data> 
    162   <data name="usage: Eraser &lt;action&gt; &lt;arguments&gt;\r\nwhere action is\r\n  help                Show this help message.\r\n  addtask             Adds a task to the current task list.\r\n  querymethods        Lists all registered Erasure methods.\r\n  importtasklist      Imports an Eraser Task list to the current user's Task\r\n                      List.\r\n\r\nglobal parameters:\r\n  /quiet              Do not create a Console window to display progress.\r\n\r\nparameters for help:\r\n  eraser help\r\n\r\n  no parameters to set.\r\n\r\nparameters for addtask:\r\n  eraser addtask [/method=&lt;methodGUID&gt;] [/schedule=(now|manually|restart)] &lt;target&gt; [target [...]]\r\n\r\n  /method             The Erasure method to use.\r\n  /schedule           The schedule the task will follow. The value must be one\r\n                      of:\r\n      now             The task will be queued for immediate execution.\r\n      manually        The task will be created but not queued for execution.\r\n      restart         The task will be queued for execution when the computer\r\n                      is next restarted.\r\n\r\n  where target is:\r\n{0}\r\n\r\nparameters for querymethods:\r\n  eraser querymethods\r\n\r\n  no parameters to set.\r\n\r\nparameters for importtasklist:\r\n  eraser importtasklist (file)[...]\r\n\r\n  [file]              A list of one or more files to import.\r\n\r\nAll arguments are case sensitive.\r\n\r\nResponse files can be used for very long command lines (generally, anything\r\ninvolving more than 32,000 characters.) Response files are used by prepending\r\n@ to the path to the file, and passing it into the command line. The\r\ncontents of the response files' will be substituted at the same position into\r\nthe command line." xml:space="preserve"> 
    163     <value>usage: Eraser &lt;action&gt; &lt;arguments&gt;\r\nwhere action is\r\n  help                Show this help message.\r\n  addtask             Adds a task to the current task list.\r\n  querymethods        Lists all registered Erasure methods.\r\n  importtasklist      Imports an Eraser Task list to the current user's Task\r\n                      List.\r\n\r\nglobal parameters:\r\n  /quiet              Do not create a Console window to display progress.\r\n\r\nparameters for help:\r\n  eraser help\r\n\r\n  no parameters to set.\r\n\r\nparameters for addtask:\r\n  eraser addtask [/method=&lt;methodGUID&gt;] [/schedule=(now|manually|restart)] &lt;target&gt; [target [...]]\r\n\r\n  /method             The Erasure method to use.\r\n  /schedule           The schedule the task will follow. The value must be one\r\n                      of:\r\n      now             The task will be queued for immediate execution.\r\n      manually        The task will be created but not queued for execution.\r\n      restart         The task will be queued for execution when the computer\r\n                      is next restarted.\r\n\r\n  where target is:\r\n{0}\r\n\r\nparameters for querymethods:\r\n  eraser querymethods\r\n\r\n  no parameters to set.\r\n\r\nparameters for importtasklist:\r\n  eraser importtasklist (file)[...]\r\n\r\n  [file]              A list of one or more files to import.\r\n\r\nAll arguments are case sensitive.\r\n\r\nResponse files can be used for very long command lines (generally, anything\r\ninvolving more than 32,000 characters.) Response files are used by prepending\r\n@ to the path to the file, and passing it into the command line. The\r\ncontents of the response files' will be substituted at the same position into\r\nthe command line.</value> 
     162  <data name="usage: Eraser &lt;action&gt; &lt;arguments&gt;\r\nwhere action is\r\n  help                Show this help message.\r\n  addtask             Adds a task to the current task list.\r\n  querymethods        Lists all registered Erasure methods.\r\n  importtasklist      Imports an Eraser Task list to the current user's Task\r\n                      List.\r\n\r\nglobal parameters:\r\n  /quiet              Do not create a Console window to display progress.\r\n\r\nparameters for help:\r\n  eraser help\r\n\r\n  no parameters to set.\r\n\r\nparameters for addtask:\r\n  eraser addtask [/method=(&lt;methodGUID&gt;|&lt;methodName&gt;)] [/schedule=(now|manually|restart)] &lt;target&gt; [target [...]]\r\n\r\n  /method             The Erasure method to use.\r\n  /schedule           The schedule the task will follow. The value must be one\r\n                      of:\r\n      now             The task will be queued for immediate execution.\r\n      manually        The task will be created but not queued for execution.\r\n      restart         The task will be queued for execution when the computer\r\n                      is next restarted.\r\n\r\n  where target is one of more of:\r\n{0}\r\n\r\nparameters for querymethods:\r\n  eraser querymethods\r\n\r\n  no parameters to set.\r\n\r\nparameters for importtasklist:\r\n  eraser importtasklist &lt;file&gt;[...]\r\n\r\n    file               A list of one or more files to import.\r\n\r\nAll arguments are case sensitive.\r\n\r\nResponse files can be used for very long command lines (generally, anything\r\ninvolving more than 32,000 characters.) Response files are used by prepending\r\n@ to the path to the file, and passing it into the command line. The\r\ncontents of the response files' will be substituted at the same position into\r\nthe command line." xml:space="preserve"> 
     163    <value>usage: Eraser &lt;action&gt; &lt;arguments&gt;\r\nwhere action is\r\n  help                Show this help message.\r\n  addtask             Adds a task to the current task list.\r\n  querymethods        Lists all registered Erasure methods.\r\n  importtasklist      Imports an Eraser Task list to the current user's Task\r\n                      List.\r\n\r\nglobal parameters:\r\n  /quiet              Do not create a Console window to display progress.\r\n\r\nparameters for help:\r\n  eraser help\r\n\r\n  no parameters to set.\r\n\r\nparameters for addtask:\r\n  eraser addtask [/method=(&lt;methodGUID&gt;|&lt;methodName&gt;)] [/schedule=(now|manually|restart)] &lt;target&gt; [target [...]]\r\n\r\n  /method             The Erasure method to use.\r\n  /schedule           The schedule the task will follow. The value must be one\r\n                      of:\r\n      now             The task will be queued for immediate execution.\r\n      manually        The task will be created but not queued for execution.\r\n      restart         The task will be queued for execution when the computer\r\n                      is next restarted.\r\n\r\n  where target is one of more of:\r\n{0}\r\n\r\nparameters for querymethods:\r\n  eraser querymethods\r\n\r\n  no parameters to set.\r\n\r\nparameters for importtasklist:\r\n  eraser importtasklist &lt;file&gt;[...]\r\n\r\n    file               A list of one or more files to import.\r\n\r\nAll arguments are case sensitive.\r\n\r\nResponse files can be used for very long command lines (generally, anything\r\ninvolving more than 32,000 characters.) Response files are used by prepending\r\n@ to the path to the file, and passing it into the command line. The\r\ncontents of the response files' will be substituted at the same position into\r\nthe command line.</value> 
    164164  </data> 
    165165  <data name="Eraser {0}\r\n(c) 2008-2010 The Eraser Project\r\nEraser is Open-Source Software: see http://eraser.heidi.ie/ for details.\r\n" xml:space="preserve"> 
    … …  
    169169    <value>Unknown schedule type: {0}</value> 
    170170  </data> 
     171  <data name="Ambiguous argument: {0} can be handled by more than one erasure target." xml:space="preserve"> 
     172    <value>Ambiguous argument: {0} can be handled by more than one erasure target.</value> 
     173  </data> 
    171174  <data name="Unknown argument: {0}, skipped." xml:space="preserve"> 
    172175    <value>Unknown argument: {0}, skipped.</value> 
    … …  
    175178    <value>Tasks must contain at least one erasure target.</value> 
    176179  </data> 
     180  <data name="Ambiguous erasure method name: {0} identifies more than one erasure method." xml:space="preserve"> 
     181    <value>Ambiguous erasure method name: {0} identifies more than one erasure method.</value> 
     182  </data> 
     183  <data name="The provided Erasure Method '{0}' does not exist." xml:space="preserve"> 
     184    <value>The provided Erasure Method '{0}' does not exist.</value> 
     185  </data> 
    177186  <data name="Could not load task list. All task entries have been lost. The error returned was: {0}" xml:space="preserve"> 
    178187    <value>Could not load task list. All task entries have been lost. The error returned was: {0}</value> 

  • trunk/eraser/Eraser/Strings.it.resx

    r2232 r2233  
    160160    <value>(Untranslated)</value> 
    161161  </data> 
    162   <data name="usage: Eraser &lt;action&gt; &lt;arguments&gt;\r\nwhere action is\r\n  help                Show this help message.\r\n  addtask             Adds a task to the current task list.\r\n  querymethods        Lists all registered Erasure methods.\r\n  importtasklist      Imports an Eraser Task list to the current user's Task\r\n                      List.\r\n\r\nglobal parameters:\r\n  /quiet              Do not create a Console window to display progress.\r\n\r\nparameters for help:\r\n  eraser help\r\n\r\n  no parameters to set.\r\n\r\nparameters for addtask:\r\n  eraser addtask [/method=&lt;methodGUID&gt;] [/schedule=(now|manually|restart)] &lt;target&gt; [target [...]]\r\n\r\n  /method             The Erasure method to use.\r\n  /schedule           The schedule the task will follow. The value must be one\r\n                      of:\r\n      now             The task will be queued for immediate execution.\r\n      manually        The task will be created but not queued for execution.\r\n      restart         The task will be queued for execution when the computer\r\n                      is next restarted.\r\n\r\n  where target is:\r\n{0}\r\n\r\nparameters for querymethods:\r\n  eraser querymethods\r\n\r\n  no parameters to set.\r\n\r\nparameters for importtasklist:\r\n  eraser importtasklist (file)[...]\r\n\r\n  [file]              A list of one or more files to import.\r\n\r\nAll arguments are case sensitive.\r\n\r\nResponse files can be used for very long command lines (generally, anything\r\ninvolving more than 32,000 characters.) Response files are used by prepending\r\n@ to the path to the file, and passing it into the command line. The\r\ncontents of the response files' will be substituted at the same position into\r\nthe command line." xml:space="preserve"> 
     162  <data name="usage: Eraser &lt;action&gt; &lt;arguments&gt;\r\nwhere action is\r\n  help                Show this help message.\r\n  addtask             Adds a task to the current task list.\r\n  querymethods        Lists all registered Erasure methods.\r\n  importtasklist      Imports an Eraser Task list to the current user's Task\r\n                      List.\r\n\r\nglobal parameters:\r\n  /quiet              Do not create a Console window to display progress.\r\n\r\nparameters for help:\r\n  eraser help\r\n\r\n  no parameters to set.\r\n\r\nparameters for addtask:\r\n  eraser addtask [/method=(&lt;methodGUID&gt;|&lt;methodName&gt;)] [/schedule=(now|manually|restart)] &lt;target&gt; [target [...]]\r\n\r\n  /method             The Erasure method to use.\r\n  /schedule           The schedule the task will follow. The value must be one\r\n                      of:\r\n      now             The task will be queued for immediate execution.\r\n      manually        The task will be created but not queued for execution.\r\n      restart         The task will be queued for execution when the computer\r\n                      is next restarted.\r\n\r\n  where target is one of more of:\r\n{0}\r\n\r\nparameters for querymethods:\r\n  eraser querymethods\r\n\r\n  no parameters to set.\r\n\r\nparameters for importtasklist:\r\n  eraser importtasklist &lt;file&gt;[...]\r\n\r\n    file               A list of one or more files to import.\r\n\r\nAll arguments are case sensitive.\r\n\r\nResponse files can be used for very long command lines (generally, anything\r\ninvolving more than 32,000 characters.) Response files are used by prepending\r\n@ to the path to the file, and passing it into the command line. The\r\ncontents of the response files' will be substituted at the same position into\r\nthe command line." xml:space="preserve"> 
    163163    <value>(Untranslated)</value> 
    164164  </data> 
    … …  
    169169    <value>Tipo pianificazione sconosciuta: {0}</value> 
    170170  </data> 
     171  <data name="Ambiguous argument: {0} can be handled by more than one erasure target." xml:space="preserve"> 
     172    <value>(Untranslated)</value> 
     173  </data> 
    171174  <data name="Unknown argument: {0}, skipped." xml:space="preserve"> 
    172175    <value>Argomento sconosciuto: {0}, saltato.</value> 
    … …  
    175178    <value>I processi devono contenere almeno un elemento su cui eseguire l'operazione.</value> 
    176179  </data> 
     180  <data name="Ambiguous erasure method name: {0} identifies more than one erasure method." xml:space="preserve"> 
     181    <value>(Untranslated)</value> 
     182  </data> 
     183  <data name="The provided Erasure Method '{0}' does not exist." xml:space="preserve"> 
     184    <value>(Untranslated)</value> 
     185  </data> 
    177186  <data name="Could not load task list. All task entries have been lost. The error returned was: {0}" xml:space="preserve"> 
    178187    <value>Impossibile caricare la lista delle operazioni. Tutte i relativi riferimenti sono stati persi. L'errore è stato: {0}</value> 

  • trunk/eraser/Eraser/Strings.nl.resx

    r2232 r2233  
    160160    <value>(Untranslated)</value> 
    161161  </data> 
    162   <data name="usage: Eraser &lt;action&gt; &lt;arguments&gt;\r\nwhere action is\r\n  help                Show this help message.\r\n  addtask             Adds a task to the current task list.\r\n  querymethods        Lists all registered Erasure methods.\r\n  importtasklist      Imports an Eraser Task list to the current user's Task\r\n                      List.\r\n\r\nglobal parameters:\r\n  /quiet              Do not create a Console window to display progress.\r\n\r\nparameters for help:\r\n  eraser help\r\n\r\n  no parameters to set.\r\n\r\nparameters for addtask:\r\n  eraser addtask [/method=&lt;methodGUID&gt;] [/schedule=(now|manually|restart)] &lt;target&gt; [target [...]]\r\n\r\n  /method             The Erasure method to use.\r\n  /schedule           The schedule the task will follow. The value must be one\r\n                      of:\r\n      now             The task will be queued for immediate execution.\r\n      manually        The task will be created but not queued for execution.\r\n      restart         The task will be queued for execution when the computer\r\n                      is next restarted.\r\n\r\n  where target is:\r\n{0}\r\n\r\nparameters for querymethods:\r\n  eraser querymethods\r\n\r\n  no parameters to set.\r\n\r\nparameters for importtasklist:\r\n  eraser importtasklist (file)[...]\r\n\r\n  [file]              A list of one or more files to import.\r\n\r\nAll arguments are case sensitive.\r\n\r\nResponse files can be used for very long command lines (generally, anything\r\ninvolving more than 32,000 characters.) Response files are used by prepending\r\n@ to the path to the file, and passing it into the command line. The\r\ncontents of the response files' will be substituted at the same position into\r\nthe command line." xml:space="preserve"> 
     162  <data name="usage: Eraser &lt;action&gt; &lt;arguments&gt;\r\nwhere action is\r\n  help                Show this help message.\r\n  addtask             Adds a task to the current task list.\r\n  querymethods        Lists all registered Erasure methods.\r\n  importtasklist      Imports an Eraser Task list to the current user's Task\r\n                      List.\r\n\r\nglobal parameters:\r\n  /quiet              Do not create a Console window to display progress.\r\n\r\nparameters for help:\r\n  eraser help\r\n\r\n  no parameters to set.\r\n\r\nparameters for addtask:\r\n  eraser addtask [/method=(&lt;methodGUID&gt;|&lt;methodName&gt;)] [/schedule=(now|manually|restart)] &lt;target&gt; [target [...]]\r\n\r\n  /method             The Erasure method to use.\r\n  /schedule           The schedule the task will follow. The value must be one\r\n                      of:\r\n      now             The task will be queued for immediate execution.\r\n      manually        The task will be created but not queued for execution.\r\n      restart         The task will be queued for execution when the computer\r\n                      is next restarted.\r\n\r\n  where target is one of more of:\r\n{0}\r\n\r\nparameters for querymethods:\r\n  eraser querymethods\r\n\r\n  no parameters to set.\r\n\r\nparameters for importtasklist:\r\n  eraser importtasklist &lt;file&gt;[...]\r\n\r\n    file               A list of one or more files to import.\r\n\r\nAll arguments are case sensitive.\r\n\r\nResponse files can be used for very long command lines (generally, anything\r\ninvolving more than 32,000 characters.) Response files are used by prepending\r\n@ to the path to the file, and passing it into the command line. The\r\ncontents of the response files' will be substituted at the same position into\r\nthe command line." xml:space="preserve"> 
    163163    <value>(Untranslated)</value> 
    164164  </data> 
    … …  
    169169    <value>(Untranslated)</value> 
    170170  </data> 
     171  <data name="Ambiguous argument: {0} can be handled by more than one erasure target." xml:space="preserve"> 
     172    <value>(Untranslated)</value> 
     173  </data> 
    171174  <data name="Unknown argument: {0}, skipped." xml:space="preserve"> 
    172175    <value>(Untranslated)</value> 
    173176  </data> 
    174177  <data name="Tasks must contain at least one erasure target." xml:space="preserve"> 
     178    <value>(Untranslated)</value> 
     179  </data> 
     180  <data name="Ambiguous erasure method name: {0} identifies more than one erasure method." xml:space="preserve"> 
     181    <value>(Untranslated)</value> 
     182  </data> 
     183  <data name="The provided Erasure Method '{0}' does not exist." xml:space="preserve"> 
    175184    <value>(Untranslated)</value> 
    176185  </data> 

  • trunk/eraser/Eraser/Strings.pl.resx

    r2232 r2233  
    160160    <value>(Untranslated)</value> 
    161161  </data> 
    162   <data name="usage: Eraser &lt;action&gt; &lt;arguments&gt;\r\nwhere action is\r\n  help                Show this help message.\r\n  addtask             Adds a task to the current task list.\r\n  querymethods        Lists all registered Erasure methods.\r\n  importtasklist      Imports an Eraser Task list to the current user's Task\r\n                      List.\r\n\r\nglobal parameters:\r\n  /quiet              Do not create a Console window to display progress.\r\n\r\nparameters for help:\r\n  eraser help\r\n\r\n  no parameters to set.\r\n\r\nparameters for addtask:\r\n  eraser addtask [/method=&lt;methodGUID&gt;] [/schedule=(now|manually|restart)] &lt;target&gt; [target [...]]\r\n\r\n  /method             The Erasure method to use.\r\n  /schedule           The schedule the task will follow. The value must be one\r\n                      of:\r\n      now             The task will be queued for immediate execution.\r\n      manually        The task will be created but not queued for execution.\r\n      restart         The task will be queued for execution when the computer\r\n                      is next restarted.\r\n\r\n  where target is:\r\n{0}\r\n\r\nparameters for querymethods:\r\n  eraser querymethods\r\n\r\n  no parameters to set.\r\n\r\nparameters for importtasklist:\r\n  eraser importtasklist (file)[...]\r\n\r\n  [file]              A list of one or more files to import.\r\n\r\nAll arguments are case sensitive.\r\n\r\nResponse files can be used for very long command lines (generally, anything\r\ninvolving more than 32,000 characters.) Response files are used by prepending\r\n@ to the path to the file, and passing it into the command line. The\r\ncontents of the response files' will be substituted at the same position into\r\nthe command line." xml:space="preserve"> 
     162  <data name="usage: Eraser &lt;action&gt; &lt;arguments&gt;\r\nwhere action is\r\n  help                Show this help message.\r\n  addtask             Adds a task to the current task list.\r\n  querymethods        Lists all registered Erasure methods.\r\n  importtasklist      Imports an Eraser Task list to the current user's Task\r\n                      List.\r\n\r\nglobal parameters:\r\n  /quiet              Do not create a Console window to display progress.\r\n\r\nparameters for help:\r\n  eraser help\r\n\r\n  no parameters to set.\r\n\r\nparameters for addtask:\r\n  eraser addtask [/method=(&lt;methodGUID&gt;|&lt;methodName&gt;)] [/schedule=(now|manually|restart)] &lt;target&gt; [target [...]]\r\n\r\n  /method             The Erasure method to use.\r\n  /schedule           The schedule the task will follow. The value must be one\r\n                      of:\r\n      now             The task will be queued for immediate execution.\r\n      manually        The task will be created but not queued for execution.\r\n      restart         The task will be queued for execution when the computer\r\n                      is next restarted.\r\n\r\n  where target is one of more of:\r\n{0}\r\n\r\nparameters for querymethods:\r\n  eraser querymethods\r\n\r\n  no parameters to set.\r\n\r\nparameters for importtasklist:\r\n  eraser importtasklist &lt;file&gt;[...]\r\n\r\n    file               A list of one or more files to import.\r\n\r\nAll arguments are case sensitive.\r\n\r\nResponse files can be used for very long command lines (generally, anything\r\ninvolving more than 32,000 characters.) Response files are used by prepending\r\n@ to the path to the file, and passing it into the command line. The\r\ncontents of the response files' will be substituted at the same position into\r\nthe command line." xml:space="preserve"> 
    163163    <value>(Untranslated)</value> 
    164164  </data> 
    … …  
    169169    <value>(Untranslated)</value> 
    170170  </data> 
     171  <data name="Ambiguous argument: {0} can be handled by more than one erasure target." xml:space="preserve"> 
     172    <value>(Untranslated)</value> 
     173  </data> 
    171174  <data name="Unknown argument: {0}, skipped." xml:space="preserve"> 
    172175    <value>(Untranslated)</value> 
    173176  </data> 
    174177  <data name="Tasks must contain at least one erasure target." xml:space="preserve"> 
     178    <value>(Untranslated)</value> 
     179  </data> 
     180  <data name="Ambiguous erasure method name: {0} identifies more than one erasure method." xml:space="preserve"> 
     181    <value>(Untranslated)</value> 
     182  </data> 
     183  <data name="The provided Erasure Method '{0}' does not exist." xml:space="preserve"> 
    175184    <value>(Untranslated)</value> 
    176185  </data> 

  • trunk/eraser/Eraser/Strings.resx

    r2232 r2233  
    160160    <value>Another instance of Eraser is already running but it is running with higher privileges than this instance of Eraser. Tasks cannot be added in this manner.\n\nClose the running instance of Eraser and start it again without administrator privileges, or run the command again as an administrator.</value> 
    161161  </data> 
    162   <data name="usage: Eraser &lt;action&gt; &lt;arguments&gt;\r\nwhere action is\r\n  help                Show this help message.\r\n  addtask             Adds a task to the current task list.\r\n  querymethods        Lists all registered Erasure methods.\r\n  importtasklist      Imports an Eraser Task list to the current user's Task\r\n                      List.\r\n\r\nglobal parameters:\r\n  /quiet              Do not create a Console window to display progress.\r\n\r\nparameters for help:\r\n  eraser help\r\n\r\n  no parameters to set.\r\n\r\nparameters for addtask:\r\n  eraser addtask [/method=&lt;methodGUID&gt;] [/schedule=(now|manually|restart)] &lt;target&gt; [target [...]]\r\n\r\n  /method             The Erasure method to use.\r\n  /schedule           The schedule the task will follow. The value must be one\r\n                      of:\r\n      now             The task will be queued for immediate execution.\r\n      manually        The task will be created but not queued for execution.\r\n      restart         The task will be queued for execution when the computer\r\n                      is next restarted.\r\n\r\n  where target is:\r\n{0}\r\n\r\nparameters for querymethods:\r\n  eraser querymethods\r\n\r\n  no parameters to set.\r\n\r\nparameters for importtasklist:\r\n  eraser importtasklist (file)[...]\r\n\r\n  [file]              A list of one or more files to import.\r\n\r\nAll arguments are case sensitive.\r\n\r\nResponse files can be used for very long command lines (generally, anything\r\ninvolving more than 32,000 characters.) Response files are used by prepending\r\n@ to the path to the file, and passing it into the command line. The\r\ncontents of the response files' will be substituted at the same position into\r\nthe command line." xml:space="preserve"> 
    163     <value>usage: Eraser &lt;action&gt; &lt;arguments&gt;\r\nwhere action is\r\n  help                Show this help message.\r\n  addtask             Adds a task to the current task list.\r\n  querymethods        Lists all registered Erasure methods.\r\n  importtasklist      Imports an Eraser Task list to the current user's Task\r\n                      List.\r\n\r\nglobal parameters:\r\n  /quiet              Do not create a Console window to display progress.\r\n\r\nparameters for help:\r\n  eraser help\r\n\r\n  no parameters to set.\r\n\r\nparameters for addtask:\r\n  eraser addtask [/method=&lt;methodGUID&gt;] [/schedule=(now|manually|restart)] &lt;target&gt; [target [...]]\r\n\r\n  /method             The Erasure method to use.\r\n  /schedule           The schedule the task will follow. The value must be one\r\n                      of:\r\n      now             The task will be queued for immediate execution.\r\n      manually        The task will be created but not queued for execution.\r\n      restart         The task will be queued for execution when the computer\r\n                      is next restarted.\r\n\r\n  where target is:\r\n{0}\r\n\r\nparameters for querymethods:\r\n  eraser querymethods\r\n\r\n  no parameters to set.\r\n\r\nparameters for importtasklist:\r\n  eraser importtasklist (file)[...]\r\n\r\n  [file]              A list of one or more files to import.\r\n\r\nAll arguments are case sensitive.\r\n\r\nResponse files can be used for very long command lines (generally, anything\r\ninvolving more than 32,000 characters.) Response files are used by prepending\r\n@ to the path to the file, and passing it into the command line. The\r\ncontents of the response files' will be substituted at the same position into\r\nthe command line.</value> 
     162  <data name="usage: Eraser &lt;action&gt; &lt;arguments&gt;\r\nwhere action is\r\n  help                Show this help message.\r\n  addtask             Adds a task to the current task list.\r\n  querymethods        Lists all registered Erasure methods.\r\n  importtasklist      Imports an Eraser Task list to the current user's Task\r\n                      List.\r\n\r\nglobal parameters:\r\n  /quiet              Do not create a Console window to display progress.\r\n\r\nparameters for help:\r\n  eraser help\r\n\r\n  no parameters to set.\r\n\r\nparameters for addtask:\r\n  eraser addtask [/method=(&lt;methodGUID&gt;|&lt;methodName&gt;)] [/schedule=(now|manually|restart)] &lt;target&gt; [target [...]]\r\n\r\n  /method             The Erasure method to use.\r\n  /schedule           The schedule the task will follow. The value must be one\r\n                      of:\r\n      now             The task will be queued for immediate execution.\r\n      manually        The task will be created but not queued for execution.\r\n      restart         The task will be queued for execution when the computer\r\n                      is next restarted.\r\n\r\n  where target is one of more of:\r\n{0}\r\n\r\nparameters for querymethods:\r\n  eraser querymethods\r\n\r\n  no parameters to set.\r\n\r\nparameters for importtasklist:\r\n  eraser importtasklist &lt;file&gt;[...]\r\n\r\n    file               A list of one or more files to import.\r\n\r\nAll arguments are case sensitive.\r\n\r\nResponse files can be used for very long command lines (generally, anything\r\ninvolving more than 32,000 characters.) Response files are used by prepending\r\n@ to the path to the file, and passing it into the command line. The\r\ncontents of the response files' will be substituted at the same position into\r\nthe command line." xml:space="preserve"> 
     163    <value>usage: Eraser &lt;action&gt; &lt;arguments&gt;\r\nwhere action is\r\n  help                Show this help message.\r\n  addtask             Adds a task to the current task list.\r\n  querymethods        Lists all registered Erasure methods.\r\n  importtasklist      Imports an Eraser Task list to the current user's Task\r\n                      List.\r\n\r\nglobal parameters:\r\n  /quiet              Do not create a Console window to display progress.\r\n\r\nparameters for help:\r\n  eraser help\r\n\r\n  no parameters to set.\r\n\r\nparameters for addtask:\r\n  eraser addtask [/method=(&lt;methodGUID&gt;|&lt;methodName&gt;)] [/schedule=(now|manually|restart)] &lt;target&gt; [target [...]]\r\n\r\n  /method             The Erasure method to use.\r\n  /schedule           The schedule the task will follow. The value must be one\r\n                      of:\r\n      now             The task will be queued for immediate execution.\r\n      manually        The task will be created but not queued for execution.\r\n      restart         The task will be queued for execution when the computer\r\n                      is next restarted.\r\n\r\n  where target is one of more of:\r\n{0}\r\n\r\nparameters for querymethods:\r\n  eraser querymethods\r\n\r\n  no parameters to set.\r\n\r\nparameters for importtasklist:\r\n  eraser importtasklist &lt;file&gt;[...]\r\n\r\n    file               A list of one or more files to import.\r\n\r\nAll arguments are case sensitive.\r\n\r\nResponse files can be used for very long command lines (generally, anything\r\ninvolving more than 32,000 characters.) Response files are used by prepending\r\n@ to the path to the file, and passing it into the command line. The\r\ncontents of the response files' will be substituted at the same position into\r\nthe command line.</value> 
    164164  </data> 
    165165  <data name="Eraser {0}\r\n(c) 2008-2010 The Eraser Project\r\nEraser is Open-Source Software: see http://eraser.heidi.ie/ for details.\r\n" xml:space="preserve"> 
    … …  
    169169    <value>Unknown schedule type: {0}</value> 
    170170  </data> 
     171  <data name="Ambiguous argument: {0} can be handled by more than one erasure target." xml:space="preserve"> 
     172    <value>Ambiguous argument: {0} can be handled by more than one erasure target.</value> 
     173  </data> 
    171174  <data name="Unknown argument: {0}, skipped." xml:space="preserve"> 
    172175    <value>Unknown argument: {0}, skipped.</value> 
    … …  
    175178    <value>Tasks must contain at least one erasure target.</value> 
    176179  </data> 
     180  <data name="Ambiguous erasure method name: {0} identifies more than one erasure method." xml:space="preserve"> 
     181    <value>Ambiguous erasure method name: {0} identifies more than one erasure method.</value> 
     182  </data> 
     183  <data name="The provided Erasure Method '{0}' does not exist." xml:space="preserve"> 
     184    <value>The provided Erasure Method '{0}' does not exist.</value> 
     185  </data> 
    177186  <data name="Could not load task list. All task entries have been lost. The error returned was: {0}" xml:space="preserve"> 
    178187    <value>Could not load task list. All task entries have been lost. The error returned was: {0}</value> 
Note: See TracChangeset for help on using the changeset viewer.