Changeset 2609


Ignore:
Timestamp:
3/31/2012 8:16:15 AM (14 months ago)
Author:
lowjoel
Message:

Replace all references to "Unused disk space" with "Drives" since we have generalised erasures for any drives now. Unused disk space is therefore a subset of the Drive erasure.

Location:
trunk/eraser
Files:
17 edited

Legend:

Unmodified
Added
Removed

  • trunk/eraser/Eraser.DefaultPlugins/ErasureMethods/ErasureMethodBase.cs

    r2515 r2609  
    9696    } 
    9797 
    98     abstract class UnusedSpaceErasureMethodBase : ErasureMethodBase, IUnusedSpaceErasureMethod 
    99     { 
    100         public virtual void EraseUnusedSpace(Stream stream, IPrng prng, 
     98    abstract class DriveErasureMethodBase : ErasureMethodBase, IDriveErasureMethod 
     99    { 
     100        public virtual void EraseDriveSpace(Stream stream, IPrng prng, 
    101101            ErasureMethodProgressFunction callback) 
    102102        { 
    … …  
    112112    ///  
    113113    /// Since instances of this class apply data by passes, they can by default 
    114     /// erase unused drive space as well. 
     114    /// erase drives as well. 
    115115    /// </summary> 
    116     abstract class PassBasedErasureMethod : UnusedSpaceErasureMethodBase 
     116    abstract class PassBasedErasureMethod : DriveErasureMethodBase 
    117117    { 
    118118        public override int Passes 

  • trunk/eraser/Eraser.DefaultPlugins/ErasureTargets/DriveErasureTarget.cs

    r2606 r2609  
    148148 
    149149                return Host.Instance.ErasureMethods[ 
    150                     Host.Instance.Settings.DefaultUnusedSpaceErasureMethod]; 
     150                    Host.Instance.Settings.DefaultDriveErasureMethod]; 
    151151            } 
    152152        } 
    … …  
    199199                { 
    200200                    Logger.Log(S._("The program does not have the required permissions to erase " + 
    201                         "the unused space on disk. Run the program as an administrator and retry " + 
    202                         "the operation."), LogLevel.Error); 
     201                        "the disk. Run the program as an administrator and retry the operation."), 
     202                        LogLevel.Error); 
    203203                } 
    204204                else 
    205205                { 
    206206                    Logger.Log(S._("The program does not have the required permissions to erase " + 
    207                         "the unused space on disk."), LogLevel.Error); 
     207                        "the disk."), LogLevel.Error); 
    208208                } 
    209209 

  • trunk/eraser/Eraser.DefaultPlugins/ErasureTargets/UnusedSpaceErasureTarget.cs

    r2606 r2609  
    122122 
    123123                return Host.Instance.ErasureMethods[ 
    124                     Host.Instance.Settings.DefaultUnusedSpaceErasureMethod]; 
     124                    Host.Instance.Settings.DefaultDriveErasureMethod]; 
    125125            } 
    126126        } 
    … …  
    129129        { 
    130130            return method == ErasureMethodRegistrar.Default || 
    131                 method is IUnusedSpaceErasureMethod; 
     131                method is IDriveErasureMethod; 
    132132        } 
    133133 

  • trunk/eraser/Eraser.Plugins/ExtensionPoints/IErasureMethod.cs

    r2516 r2609  
    3333    /// An interface class representing the method for erasure. If classes only 
    3434    /// inherit this class, then the method can only be used to erase abstract 
    35     /// streams, not unused drive space. 
     35    /// streams, not drive space. 
    3636    /// </summary> 
    3737    public interface IErasureMethod : IRegisterable 
    … …  
    110110    /// <summary> 
    111111    /// This class adds functionality to the ErasureMethod class to erase 
    112     /// unused drive space. 
     112    /// drives (including unused space and for drive erasures) 
    113113    /// </summary> 
    114     public interface IUnusedSpaceErasureMethod : IErasureMethod 
     114    public interface IDriveErasureMethod : IErasureMethod 
    115115    { 
    116116        /// <summary> 
    … …  
    127127        /// <param name="prng">The PRNG source for random data.</param> 
    128128        /// <param name="callback">The progress callback function.</param> 
    129         void EraseUnusedSpace(Stream stream, IPrng prng, ErasureMethodProgressFunction callback); 
     129        void EraseDriveSpace(Stream stream, IPrng prng, ErasureMethodProgressFunction callback); 
    130130    } 
    131131} 

  • trunk/eraser/Eraser.Plugins/Settings.cs

    r2513 r2609  
    6060 
    6161        /// <summary> 
    62         /// The default unused space erasure method. This is a GUID since methods 
    63         /// are implemented through plugins and plugins may not be loaded and 
    64         /// missing references may follow. 
     62        /// The default drive erasure method. This is a GUID since methods are 
     63        /// implemented through plugins and plugins may not be loaded and missing 
     64        /// references may follow. 
    6565        /// </summary> 
    66         public Guid DefaultUnusedSpaceErasureMethod 
     66        public Guid DefaultDriveErasureMethod 
    6767        { 
    6868            get 
    6969            { 
    70                 Guid result = Store.GetValue<Guid>("DefaultUnusedSpaceErasureMethod"); 
     70                Guid result = Store.GetValue<Guid>("DefaultDriveErasureMethod"); 
    7171                if (result == Guid.Empty) 
    7272                    result = new Guid("{BF8BA267-231A-4085-9BF9-204DE65A6641}"); 
    … …  
    7575            set 
    7676            { 
    77                 Store.SetValue("DefaultUnusedSpaceErasureMethod", value); 
     77                Store.SetValue("DefaultDriveErasureMethod", value); 
    7878            } 
    7979        } 

  • trunk/eraser/Eraser/Program.cs

    r2606 r2609  
    377377            foreach (IErasureMethod method in Host.Instance.ErasureTargetFactories) 
    378378            { 
    379                 methods.AppendFormat(methodFormat, (method is IUnusedSpaceErasureMethod) ? 
     379                methods.AppendFormat(methodFormat, (method is IDriveErasureMethod) ? 
    380380                    "U" : "", method.Name, method.Guid); 
    381381            } 

  • trunk/eraser/Eraser/SettingsPanel.Designer.cs

    r2516 r2609  
    5858            this.erase = new Eraser.LightGroup(); 
    5959            this.eraseFilesMethodLbl = new System.Windows.Forms.Label(); 
    60             this.eraseUnusedMethodLbl = new System.Windows.Forms.Label(); 
     60            this.eraseDriveMethodLbl = new System.Windows.Forms.Label(); 
    6161            this.eraseFilesMethod = new System.Windows.Forms.ComboBox(); 
    62             this.eraseUnusedMethod = new System.Windows.Forms.ComboBox(); 
     62            this.eraseDriveMethod = new System.Windows.Forms.ComboBox(); 
    6363            this.plugins = new Eraser.LightGroup(); 
    6464            this.pluginsManager = new System.Windows.Forms.ListView(); 
    65             this.pluginsManagerColName = new System.Windows.Forms.ColumnHeader(); 
    66             this.pluginsManagerColAuthor = new System.Windows.Forms.ColumnHeader(); 
    67             this.pluginsManagerColVersion = new System.Windows.Forms.ColumnHeader(); 
    68             this.pluginsManagerColPath = new System.Windows.Forms.ColumnHeader(); 
     65            this.pluginsManagerColName = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader())); 
     66            this.pluginsManagerColAuthor = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader())); 
     67            this.pluginsManagerColVersion = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader())); 
     68            this.pluginsManagerColPath = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader())); 
    6969            this.pluginsMenu = new System.Windows.Forms.ContextMenuStrip(this.components); 
    7070            this.settingsToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); 
    … …  
    122122            this.content.Controls.Add(this.pluginsManager); 
    123123            this.content.Controls.Add(this.plugins); 
    124             this.content.Controls.Add(this.eraseUnusedMethod); 
     124            this.content.Controls.Add(this.eraseDriveMethod); 
    125125            this.content.Controls.Add(this.eraseFilesMethod); 
    126             this.content.Controls.Add(this.eraseUnusedMethodLbl); 
     126            this.content.Controls.Add(this.eraseDriveMethodLbl); 
    127127            this.content.Controls.Add(this.eraseFilesMethodLbl); 
    128128            this.content.Controls.Add(this.erase); 
    … …  
    169169            this.eraseFilesMethodLbl.Name = "eraseFilesMethodLbl"; 
    170170            //  
    171             // eraseUnusedMethodLbl 
    172             //  
    173             resources.ApplyResources(this.eraseUnusedMethodLbl, "eraseUnusedMethodLbl"); 
    174             this.errorProvider.SetIconAlignment(this.eraseUnusedMethodLbl, ((System.Windows.Forms.ErrorIconAlignment)(resources.GetObject("eraseUnusedMethodLbl.IconAlignment")))); 
    175             this.eraseUnusedMethodLbl.Name = "eraseUnusedMethodLbl"; 
     171            // eraseDriveMethodLbl 
     172            //  
     173            resources.ApplyResources(this.eraseDriveMethodLbl, "eraseDriveMethodLbl"); 
     174            this.errorProvider.SetIconAlignment(this.eraseDriveMethodLbl, ((System.Windows.Forms.ErrorIconAlignment)(resources.GetObject("eraseDriveMethodLbl.IconAlignment")))); 
     175            this.eraseDriveMethodLbl.Name = "eraseDriveMethodLbl"; 
    176176            //  
    177177            // eraseFilesMethod 
    … …  
    182182            this.eraseFilesMethod.Name = "eraseFilesMethod"; 
    183183            //  
    184             // eraseUnusedMethod 
    185             //  
    186             this.eraseUnusedMethod.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; 
    187             this.errorProvider.SetIconAlignment(this.eraseUnusedMethod, ((System.Windows.Forms.ErrorIconAlignment)(resources.GetObject("eraseUnusedMethod.IconAlignment")))); 
    188             resources.ApplyResources(this.eraseUnusedMethod, "eraseUnusedMethod"); 
    189             this.eraseUnusedMethod.Name = "eraseUnusedMethod"; 
     184            // eraseDriveMethod 
     185            //  
     186            this.eraseDriveMethod.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; 
     187            this.errorProvider.SetIconAlignment(this.eraseDriveMethod, ((System.Windows.Forms.ErrorIconAlignment)(resources.GetObject("eraseDriveMethod.IconAlignment")))); 
     188            resources.ApplyResources(this.eraseDriveMethod, "eraseDriveMethod"); 
     189            this.eraseDriveMethod.Name = "eraseDriveMethod"; 
    190190            //  
    191191            // plugins 
    … …  
    377377            // SettingsPanel 
    378378            //  
     379            resources.ApplyResources(this, "$this"); 
    379380            this.Controls.Add(this.saveSettings); 
    380381            this.errorProvider.SetIconAlignment(this, ((System.Windows.Forms.ErrorIconAlignment)(resources.GetObject("$this.IconAlignment")))); 
    381382            this.Name = "SettingsPanel"; 
    382             resources.ApplyResources(this, "$this"); 
    383383            this.Controls.SetChildIndex(this.saveSettings, 0); 
    384384            this.Controls.SetChildIndex(this.titleLabel, 0); 
    … …  
    400400        private System.Windows.Forms.CheckBox uiContextMenu; 
    401401        private LightGroup ui; 
    402         private System.Windows.Forms.Label eraseUnusedMethodLbl; 
     402        private System.Windows.Forms.Label eraseDriveMethodLbl; 
    403403        private System.Windows.Forms.Label eraseFilesMethodLbl; 
    404404        private LightGroup erase; 
    405405        private System.Windows.Forms.ComboBox eraseFilesMethod; 
    406         private System.Windows.Forms.ComboBox eraseUnusedMethod; 
     406        private System.Windows.Forms.ComboBox eraseDriveMethod; 
    407407        private System.Windows.Forms.ListView pluginsManager; 
    408408        private System.Windows.Forms.ColumnHeader pluginsManagerColName; 

  • trunk/eraser/Eraser/SettingsPanel.cs

    r2521 r2609  
    9393            IErasureMethod method = (IErasureMethod)sender; 
    9494            eraseFilesMethod.Items.Add(method); 
    95             if (method is IUnusedSpaceErasureMethod) 
    96                 eraseUnusedMethod.Items.Add(method); 
     95            if (method is IDriveErasureMethod) 
     96                eraseDriveMethod.Items.Add(method); 
    9797        } 
    9898 
    … …  
    107107                } 
    108108 
    109             foreach (IErasureMethod obj in eraseUnusedMethod.Items) 
     109            foreach (IErasureMethod obj in eraseDriveMethod.Items) 
    110110                if (obj.Guid == method.Guid) 
    111111                { 
    112                     eraseUnusedMethod.Items.Remove(obj); 
     112                    eraseDriveMethod.Items.Remove(obj); 
    113113                    break; 
    114114                } 
    … …  
    116116            if (eraseFilesMethod.SelectedIndex == -1) 
    117117                eraseFilesMethod.SelectedIndex = 0; 
    118             if (eraseUnusedMethod.SelectedIndex == -1) 
    119                 eraseUnusedMethod.SelectedIndex = 0; 
     118            if (eraseDriveMethod.SelectedIndex == -1) 
     119                eraseDriveMethod.SelectedIndex = 0; 
    120120        } 
    121121 
    … …  
    137137            { 
    138138                eraseFilesMethod.Items.Add(method); 
    139                 if (method is IUnusedSpaceErasureMethod) 
    140                     eraseUnusedMethod.Items.Add(method); 
     139                if (method is IDriveErasureMethod) 
     140                    eraseDriveMethod.Items.Add(method); 
    141141            } 
    142142 
    … …  
    163163                } 
    164164 
    165             foreach (IErasureMethod method in eraseUnusedMethod.Items) 
    166                 if (method.Guid == Host.Instance.Settings.DefaultUnusedSpaceErasureMethod) 
    167                 { 
    168                     eraseUnusedMethod.SelectedItem = method; 
     165            foreach (IErasureMethod method in eraseDriveMethod.Items) 
     166                if (method.Guid == Host.Instance.Settings.DefaultDriveErasureMethod) 
     167                { 
     168                    eraseDriveMethod.SelectedItem = method; 
    169169                    break; 
    170170                } 
    … …  
    213213                defaultsList.Add(S._("Default file erasure method")); 
    214214            } 
    215             if (eraseUnusedMethod.SelectedIndex == -1) 
    216             { 
    217                 if (eraseUnusedMethod.Items.Count > 0) 
    218                 { 
    219                     eraseUnusedMethod.SelectedIndex = 0; 
    220                     Host.Instance.Settings.DefaultUnusedSpaceErasureMethod = 
    221                         ((IErasureMethod)eraseUnusedMethod.SelectedItem).Guid; 
    222                 } 
    223                 defaultsList.Add(S._("Default unused space erasure method")); 
     215            if (eraseDriveMethod.SelectedIndex == -1) 
     216            { 
     217                if (eraseDriveMethod.Items.Count > 0) 
     218                { 
     219                    eraseDriveMethod.SelectedIndex = 0; 
     220                    Host.Instance.Settings.DefaultDriveErasureMethod = 
     221                        ((IErasureMethod)eraseDriveMethod.SelectedItem).Guid; 
     222                } 
     223                defaultsList.Add(S._("Default drive erasure method")); 
    224224            } 
    225225            if (erasePRNG.SelectedIndex == -1) 
    … …  
    389389                return; 
    390390            } 
    391             else if (eraseUnusedMethod.SelectedIndex == -1) 
    392             { 
    393                 errorProvider.SetError(eraseUnusedMethod, S._("An invalid unused disk space " + 
    394                     "erasure method was selected.")); 
     391            else if (eraseDriveMethod.SelectedIndex == -1) 
     392            { 
     393                errorProvider.SetError(eraseDriveMethod, S._("An invalid drive erasure method " + 
     394                    "was selected.")); 
    395395                return; 
    396396            } 
    397397            else if (erasePRNG.SelectedIndex == -1) 
    398398            { 
    399                 errorProvider.SetError(erasePRNG, S._("An invalid randomness data " + 
    400                     "source was selected.")); 
     399                errorProvider.SetError(erasePRNG, S._("An invalid randomness data source was " + 
     400                    "selected.")); 
    401401                return; 
    402402            } 
    … …  
    422422            Host.Instance.Settings.DefaultFileErasureMethod = 
    423423                ((IErasureMethod)eraseFilesMethod.SelectedItem).Guid; 
    424             Host.Instance.Settings.DefaultUnusedSpaceErasureMethod = 
    425                 ((IErasureMethod)eraseUnusedMethod.SelectedItem).Guid; 
     424            Host.Instance.Settings.DefaultDriveErasureMethod = 
     425                ((IErasureMethod)eraseDriveMethod.SelectedItem).Guid; 
    426426 
    427427            IPrng newPRNG = (IPrng)erasePRNG.SelectedItem; 

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

    r2083 r2609  
    274274    <value>Estensioni</value> 
    275275  </data> 
    276   <data name="eraseUnusedMethodLbl.Size" type="System.Drawing.Size, System.Drawing"> 
     276  <data name="eraseDriveMethodLbl.Size" type="System.Drawing.Size, System.Drawing"> 
    277277    <value>196, 13</value> 
    278278  </data> 
    279   <data name="eraseUnusedMethodLbl.Text" xml:space="preserve"> 
     279  <data name="eraseDriveMethodLbl.Text" xml:space="preserve"> 
    280280    <value>Metodo di default di pulizia spazio libero:</value> 
    281281  </data> 

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

    r858 r2609  
    344344    <value>0</value> 
    345345  </data> 
    346   <data name="eraseUnusedMethod.Error" xml:space="preserve"> 
    347     <value /> 
    348   </data> 
    349   <data name="eraseUnusedMethod.IconPadding" type="System.Int32, mscorlib"> 
     346  <data name="eraseDriveMethod.Error" xml:space="preserve"> 
     347    <value /> 
     348  </data> 
     349  <data name="eraseDriveMethod.IconPadding" type="System.Int32, mscorlib"> 
    350350    <value>0</value> 
    351351  </data> 
    … …  
    356356    <value>0</value> 
    357357  </data> 
    358   <data name="eraseUnusedMethodLbl.Error" xml:space="preserve"> 
    359     <value /> 
    360   </data> 
    361   <data name="eraseUnusedMethodLbl.IconPadding" type="System.Int32, mscorlib"> 
    362     <value>0</value> 
    363   </data> 
    364   <data name="eraseUnusedMethodLbl.Size" type="System.Drawing.Size, System.Drawing"> 
     358  <data name="eraseDriveMethodLbl.Error" xml:space="preserve"> 
     359    <value /> 
     360  </data> 
     361  <data name="eraseDriveMethodLbl.IconPadding" type="System.Int32, mscorlib"> 
     362    <value>0</value> 
     363  </data> 
     364  <data name="eraseDriveMethodLbl.Size" type="System.Drawing.Size, System.Drawing"> 
    365365    <value>211, 13</value> 
    366366  </data> 
    367   <data name="eraseUnusedMethodLbl.Text" xml:space="preserve"> 
     367  <data name="eraseDriveMethodLbl.Text" xml:space="preserve"> 
    368368    <value>Standaard ongebruikte ruimte wis methode:</value> 
    369369  </data> 

  • trunk/eraser/Eraser/SettingsPanel.resx

    r2218 r2609  
    113113  </resheader> 
    114114  <resheader name="reader"> 
    115     <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value> 
     115    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value> 
    116116  </resheader> 
    117117  <resheader name="writer"> 
    118     <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value> 
     118    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value> 
    119119  </resheader> 
    120   <metadata name="errorProvider.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"> 
     120  <metadata name="errorProvider.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"> 
    121121    <value>17, 17</value> 
    122122  </metadata> 
    123   <metadata name="$this.Localizable" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> 
     123  <metadata name="$this.Localizable" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> 
    124124    <value>True</value> 
    125125  </metadata> 
    126   <assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" /> 
     126  <assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" /> 
     127  <data name="$this.AutoScaleDimensions" type="System.Drawing.SizeF, System.Drawing"> 
     128    <value>96, 96</value> 
     129  </data> 
     130  <assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" /> 
    127131  <data name="saveSettings.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms"> 
    128132    <value>Top, Right</value> 
    … …  
    131135    <value>TopLeft</value> 
    132136  </data> 
    133   <assembly alias="System.Drawing" name="System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" /> 
    134137  <data name="saveSettings.Location" type="System.Drawing.Point, System.Drawing"> 
    135138    <value>639, 27</value> 
    … …  
    138141    <value>90, 23</value> 
    139142  </data> 
    140   <assembly alias="mscorlib" name="mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" /> 
     143  <assembly alias="mscorlib" name="mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" /> 
    141144  <data name="saveSettings.TabIndex" type="System.Int32, mscorlib"> 
    142145    <value>29</value> 
    … …  
    149152  </data> 
    150153  <data name="&gt;&gt;saveSettings.Type" xml:space="preserve"> 
    151     <value>System.Windows.Forms.Button, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value> 
     154    <value>System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value> 
    152155  </data> 
    153156  <data name="&gt;&gt;saveSettings.Parent" xml:space="preserve"> 
    … …  
    167170  </data> 
    168171  <data name="&gt;&gt;pluginsManagerColName.Type" xml:space="preserve"> 
    169     <value>System.Windows.Forms.ColumnHeader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value> 
     172    <value>System.Windows.Forms.ColumnHeader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value> 
    170173  </data> 
    171174  <data name="&gt;&gt;pluginsManagerColAuthor.Name" xml:space="preserve"> 
    … …  
    173176  </data> 
    174177  <data name="&gt;&gt;pluginsManagerColAuthor.Type" xml:space="preserve"> 
    175     <value>System.Windows.Forms.ColumnHeader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value> 
     178    <value>System.Windows.Forms.ColumnHeader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value> 
    176179  </data> 
    177180  <data name="&gt;&gt;pluginsManagerColVersion.Name" xml:space="preserve"> 
    … …  
    179182  </data> 
    180183  <data name="&gt;&gt;pluginsManagerColVersion.Type" xml:space="preserve"> 
    181     <value>System.Windows.Forms.ColumnHeader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value> 
     184    <value>System.Windows.Forms.ColumnHeader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value> 
    182185  </data> 
    183186  <data name="&gt;&gt;pluginsManagerColPath.Name" xml:space="preserve"> 
    … …  
    185188  </data> 
    186189  <data name="&gt;&gt;pluginsManagerColPath.Type" xml:space="preserve"> 
    187     <value>System.Windows.Forms.ColumnHeader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value> 
     190    <value>System.Windows.Forms.ColumnHeader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value> 
    188191  </data> 
    189192  <data name="&gt;&gt;settingsToolStripMenuItem.Name" xml:space="preserve"> 
    … …  
    191194  </data> 
    192195  <data name="&gt;&gt;settingsToolStripMenuItem.Type" xml:space="preserve"> 
    193     <value>System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value> 
     196    <value>System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value> 
    194197  </data> 
    195198  <data name="&gt;&gt;pluginsManagerImageList.Name" xml:space="preserve"> 
    … …  
    197200  </data> 
    198201  <data name="&gt;&gt;pluginsManagerImageList.Type" xml:space="preserve"> 
    199     <value>System.Windows.Forms.ImageList, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value> 
     202    <value>System.Windows.Forms.ImageList, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value> 
    200203  </data> 
    201204  <data name="&gt;&gt;errorProvider.Name" xml:space="preserve"> 
    … …  
    203206  </data> 
    204207  <data name="&gt;&gt;errorProvider.Type" xml:space="preserve"> 
    205     <value>System.Windows.Forms.ErrorProvider, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value> 
     208    <value>System.Windows.Forms.ErrorProvider, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value> 
    206209  </data> 
    207210  <data name="&gt;&gt;openFileDialog.Name" xml:space="preserve"> 
    … …  
    209212  </data> 
    210213  <data name="&gt;&gt;openFileDialog.Type" xml:space="preserve"> 
    211     <value>System.Windows.Forms.OpenFileDialog, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value> 
     214    <value>System.Windows.Forms.OpenFileDialog, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value> 
    212215  </data> 
    213216  <data name="&gt;&gt;folderBrowserDialog.Name" xml:space="preserve"> 
    … …  
    215218  </data> 
    216219  <data name="&gt;&gt;folderBrowserDialog.Type" xml:space="preserve"> 
    217     <value>System.Windows.Forms.FolderBrowserDialog, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value> 
     220    <value>System.Windows.Forms.FolderBrowserDialog, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value> 
    218221  </data> 
    219222  <data name="&gt;&gt;$this.Name" xml:space="preserve"> 
    … …  
    221224  </data> 
    222225  <data name="&gt;&gt;$this.Type" xml:space="preserve"> 
    223     <value>Eraser.BasePanel, Eraser, Version=6.1.0.2112, Culture=neutral, PublicKeyToken=3ac89a0351e689b6</value> 
     226    <value>Eraser.BasePanel, Eraser, Version=6.1.0.2532, Culture=neutral, PublicKeyToken=5fdae78f3f1dcf4a</value> 
    224227  </data> 
    225228  <data name="titleIcon.IconAlignment" type="System.Windows.Forms.ErrorIconAlignment, System.Windows.Forms"> 
    … …  
    230233  </data> 
    231234  <data name="&gt;&gt;titleIcon.Type" xml:space="preserve"> 
    232     <value>System.Windows.Forms.PictureBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value> 
     235    <value>System.Windows.Forms.PictureBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value> 
    233236  </data> 
    234237  <data name="&gt;&gt;titleIcon.Parent" xml:space="preserve"> 
    … …  
    257260  </data> 
    258261  <data name="&gt;&gt;schedulerClearCompleted.Type" xml:space="preserve"> 
    259     <value>System.Windows.Forms.CheckBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value> 
     262    <value>System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value> 
    260263  </data> 
    261264  <data name="&gt;&gt;schedulerClearCompleted.Parent" xml:space="preserve"> 
    … …  
    287290  </data> 
    288291  <data name="&gt;&gt;plausibleDeniabilityFilesAddFolder.Type" xml:space="preserve"> 
    289     <value>System.Windows.Forms.Button, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value> 
     292    <value>System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value> 
    290293  </data> 
    291294  <data name="&gt;&gt;plausibleDeniabilityFilesAddFolder.Parent" xml:space="preserve"> 
    … …  
    317320  </data> 
    318321  <data name="&gt;&gt;plausibleDeniabilityFilesRemove.Type" xml:space="preserve"> 
    319     <value>System.Windows.Forms.Button, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value> 
     322    <value>System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value> 
    320323  </data> 
    321324  <data name="&gt;&gt;plausibleDeniabilityFilesRemove.Parent" xml:space="preserve"> 
    … …  
    347350  </data> 
    348351  <data name="&gt;&gt;plausibleDeniabilityFilesAddFile.Type" xml:space="preserve"> 
    349     <value>System.Windows.Forms.Button, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value> 
     352    <value>System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value> 
    350353  </data> 
    351354  <data name="&gt;&gt;plausibleDeniabilityFilesAddFile.Parent" xml:space="preserve"> 
    … …  
    374377  </data> 
    375378  <data name="&gt;&gt;plausibleDeniabilityFiles.Type" xml:space="preserve"> 
    376     <value>System.Windows.Forms.ListBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value> 
     379    <value>System.Windows.Forms.ListBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value> 
    377380  </data> 
    378381  <data name="&gt;&gt;plausibleDeniabilityFiles.Parent" xml:space="preserve"> 
    … …  
    398401  </data> 
    399402  <data name="&gt;&gt;uiLanguage.Type" xml:space="preserve"> 
    400     <value>System.Windows.Forms.ComboBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value> 
     403    <value>System.Windows.Forms.ComboBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value> 
    401404  </data> 
    402405  <data name="&gt;&gt;uiLanguage.Parent" xml:space="preserve"> 
    … …  
    428431  </data> 
    429432  <data name="&gt;&gt;uiLanguageLbl.Type" xml:space="preserve"> 
    430     <value>System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value> 
     433    <value>System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value> 
    431434  </data> 
    432435  <data name="&gt;&gt;uiLanguageLbl.Parent" xml:space="preserve"> 
    … …  
    458461  </data> 
    459462  <data name="&gt;&gt;plausibleDeniability.Type" xml:space="preserve"> 
    460     <value>System.Windows.Forms.CheckBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value> 
     463    <value>System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value> 
    461464  </data> 
    462465  <data name="&gt;&gt;plausibleDeniability.Parent" xml:space="preserve"> 
    … …  
    482485  </data> 
    483486  <data name="&gt;&gt;erasePRNG.Type" xml:space="preserve"> 
    484     <value>System.Windows.Forms.ComboBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value> 
     487    <value>System.Windows.Forms.ComboBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value> 
    485488  </data> 
    486489  <data name="&gt;&gt;erasePRNG.Parent" xml:space="preserve"> 
    … …  
    512515  </data> 
    513516  <data name="&gt;&gt;erasePRNGLbl.Type" xml:space="preserve"> 
    514     <value>System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value> 
     517    <value>System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value> 
    515518  </data> 
    516519  <data name="&gt;&gt;erasePRNGLbl.Parent" xml:space="preserve"> 
    … …  
    542545  </data> 
    543546  <data name="&gt;&gt;schedulerMissedIgnore.Type" xml:space="preserve"> 
    544     <value>System.Windows.Forms.RadioButton, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value> 
     547    <value>System.Windows.Forms.RadioButton, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value> 
    545548  </data> 
    546549  <data name="&gt;&gt;schedulerMissedIgnore.Parent" xml:space="preserve"> 
    … …  
    572575  </data> 
    573576  <data name="&gt;&gt;schedulerMissedImmediate.Type" xml:space="preserve"> 
    574     <value>System.Windows.Forms.RadioButton, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value> 
     577    <value>System.Windows.Forms.RadioButton, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value> 
    575578  </data> 
    576579  <data name="&gt;&gt;schedulerMissedImmediate.Parent" xml:space="preserve"> 
    … …  
    602605  </data> 
    603606  <data name="&gt;&gt;schedulerMissed.Type" xml:space="preserve"> 
    604     <value>System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value> 
     607    <value>System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value> 
    605608  </data> 
    606609  <data name="&gt;&gt;schedulerMissed.Parent" xml:space="preserve"> 
    … …  
    638641  </data> 
    639642  <data name="&gt;&gt;scheduler.Type" xml:space="preserve"> 
    640     <value>Eraser.LightGroup, Eraser, Version=6.1.0.2112, Culture=neutral, PublicKeyToken=3ac89a0351e689b6</value> 
     643    <value>Eraser.LightGroup, Eraser, Version=6.1.0.2532, Culture=neutral, PublicKeyToken=5fdae78f3f1dcf4a</value> 
    641644  </data> 
    642645  <data name="&gt;&gt;scheduler.Parent" xml:space="preserve"> 
    … …  
    673676    <value>180</value> 
    674677  </data> 
    675   <metadata name="pluginsMenu.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"> 
     678  <metadata name="pluginsMenu.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"> 
    676679    <value>134, 17</value> 
    677680  </metadata> 
    … …  
    692695  </data> 
    693696  <data name="&gt;&gt;pluginsMenu.Type" xml:space="preserve"> 
    694     <value>System.Windows.Forms.ContextMenuStrip, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value> 
     697    <value>System.Windows.Forms.ContextMenuStrip, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value> 
    695698  </data> 
    696699  <data name="pluginsManager.Groups" mimetype="application/x-microsoft.net.object.binary.base64"> 
    697700    <value> 
    698         AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj0yLjAuMC4w 
     701        AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj00LjAuMC4w 
    699702        LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACJTeXN0 
    700703        ZW0uV2luZG93cy5Gb3Jtcy5MaXN0Vmlld0dyb3VwBAAAAAZIZWFkZXIPSGVhZGVyQWxpZ25tZW50A1Rh 
    … …  
    706709  <data name="pluginsManager.Groups1" mimetype="application/x-microsoft.net.object.binary.base64"> 
    707710    <value> 
    708         AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj0yLjAuMC4w 
     711        AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj00LjAuMC4w 
    709712        LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACJTeXN0 
    710713        ZW0uV2luZG93cy5Gb3Jtcy5MaXN0Vmlld0dyb3VwBAAAAAZIZWFkZXIPSGVhZGVyQWxpZ25tZW50A1Rh 
    … …  
    723726    <value>689, 235</value> 
    724727  </data> 
    725   <metadata name="pluginsManagerImageList.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"> 
     728  <metadata name="pluginsManagerImageList.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"> 
    726729    <value>560, 17</value> 
    727730  </metadata> 
    728731  <data name="pluginsManagerImageList.ImageStream" mimetype="application/x-microsoft.net.object.binary.base64"> 
    729732    <value> 
    730         AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj0yLjAuMC4w 
     733        AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj00LjAuMC4w 
    731734        LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0 
    732         ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAAB4 
    733         AwAAAk1TRnQBSQFMAwEBAAE8AQABPAEAARABAAEQAQAE/wEhAQAI/wFCAU0BNgcAATYDAAEoAwABQAMA 
    734         ARADAAEBAQABIAYAARAuAAM/AW0BKgFHAXYB/wM6AWL0AAEfAXYBxwH/AUABzQH8Af8BMgFXAYcB//QA 
    735         AR8BdgHHAf8BOQGgAdIB/wNEAXn0AAEfAXYBxwH/AUIB0QH8Af8BMgFXAYcB//QAAR8BdgHHAf8BOwGh 
    736         AdEB/wNEAXn0AAEfAXYBxwH/AUwB4gH9Af8BMwFTAYEB//QAAR8BdgHHAf8BUwHXAfwB/wEzAVMBgQH/ 
    737         8AADLQFGAR8BdgHHAf8BaQHeAfwB/wEzAVMBgQH/AyQBNegAAzUBVgEsAYcBxwH/AVYBwAHwAf8BSwHL 
    738         Af4B/wFMAbMB3QH/ATcBSAFhAf8DKgFB4AADMQFNASwBhwHIAf8BTQG6AfcB/wFPAcIB+QH/AUUBtwH5 
    739         Af8BYwHWAfsB/wFAAaYB6AH/ATcBRwFfAf8DJAE23AABXAFhAWgB4QFPAcEB+QH/AUsBtwH5Af8BkwHu 
    740         Af4B/wGPAewB/gH/AU0BtAHzAf8BjQHjAf4B/wFKAboB4gH/AV4BXwFhAdrcAAE0AXcBpgH8AVQBxgH5 
    741         Af8BZAGKAawB/wFkAYoBrAH/AWQBigGsAf8BZAGKAawB/wFkAYoBrAH/AV0B1QH6Af8BMgE/AWIB/NwA 
    742         AVsBZAFuAecBVwHSAfoB/wFFAV8BhAH/DAABSAGQAcEB/wFOAbsB4QH/AloBXAHf3AADTAGSAUEBnQHQ 
    743         Af8BdQHjAfoB/wFFAYUBngH/AUwBXwGHAf8BTAFxAZwB/wFcAWgBbgHhAUMBjAGqAf8DSAGF3AADEgEY 
    744         A1QBrAFBAZoBzQH/AWkB1QH1Af8BbAHpAf4B/wFoAdQB8wH/AUUBkgGyAf8BUAJRAZwDFwEg4AADEgEY 
    745         A0cBggJZAVoBxwFFAYEBmgH7AVwBXwFkAdsDRwGCAxcBINAAAUIBTQE+BwABPgMAASgDAAFAAwABEAMA 
    746         AQEBAAEBBQABgBcAA/8BAAH+AT8GAAH+AT8GAAH+AT8GAAH+AT8GAAH+AT8GAAH+AT8GAAH+AT8GAAH8 
    747         AR8GAAH4AQ8GAAHwAQcGAAHwAQcGAAHwAQcGAAHxAccGAAHwAQcGAAHwAQcGAAH4AQ8GAAs= 
     735        ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAAB0 
     736        AwAAAk1TRnQBSQFMAwEBAAFEAQABRAEAARABAAEQAQAE/wEhAQAI/wFCAU0BNgcAATYDAAEoAwABQAMA 
     737        ARADAAEBAQABIAYAARAuAAM/AW0BKQFGAXUB/wM6AWL0AAEeAXUBxwH/AT8BzQH8Af8BMQFWAYcB//QA 
     738        AR4BdQHHAf8BOAGgAdIB/wNEAXn0AAEeAXUBxwH/AUEB0QH8Af8BMQFWAYcB//QAAR4BdQHHAf8BOgGh 
     739        AdEB/wNEAXn0AAEeAXUBxwH/AUsB4gH9Af8BMgFSAYEB//QAAR4BdQHHAf8BUgHXAfwB/wEyAVIBgQH/ 
     740        8AADLQFGAR4BdQHHAf8BaAHeAfwB/wEyAVIBgQH/AyQBNegAAzUBVgErAYcBxwH/AVUBwAHwAf8BSgHL 
     741        Af4B/wFLAbMB3QH/ATYBRwFgAf8DKgFB4AADMQFNASsBhwHIAf8BTAG6AfcB/wFOAcIB+QH/AUQBtwH5 
     742        Af8BYgHWAfsB/wE/AaYB6AH/ATYBRgFeAf8DJAE23AABXAFhAWYB4QFOAcEB+QH/AUoBtwH5Af8BkwHu 
     743        Af4B/wGPAewB/gH/AUwBtAHzAf8BjQHjAf4B/wFJAboB4gH/Al4BYQHa3AABMwF2AaMB/AFTAcYB+QH/ 
     744        AWMBigGsAf8BYwGKAawB/wFjAYoBrAH/AWMBigGsAf8BYwGKAawB/wFcAdUB+gH/ATEBPgFhAfzcAAFc 
     745        AWQBbAHnAVYB0gH6Af8BRAFeAYQB/wwAAUcBkAHBAf8BTQG7AeEB/wJbAVwB39wAA0wBkgFAAZ0B0AH/ 
     746        AXQB4wH6Af8BRAGFAZ4B/wFLAV4BhwH/AUsBcAGcAf8BXAFmAWoB4QFCAYwBqgH/A0gBhdwAAxIBGANU 
     747        AawBQAGaAc0B/wFoAdUB9QH/AWsB6QH+Af8BZwHUAfMB/wFEAZIBsgH/AVACUQGcAxcBIOAAAxIBGANH 
     748        AYIDWQHHAUUBgAGYAfsBXAFfAWMB2wNHAYIDFwEg0AABQgFNAT4HAAE+AwABKAMAAUADAAEQAwABAQEA 
     749        AQEFAAGAFwAD/wEAAf4BPwYAAf4BPwYAAf4BPwYAAf4BPwYAAf4BPwYAAf4BPwYAAf4BPwYAAfwBHwYA 
     750        AfgBDwYAAfABBwYAAfABBwYAAfABBwYAAfEBxwYAAfABBwYAAfABBwYAAfgBDwYACw== 
    748751</value> 
    749752  </data> 
    … …  
    755758  </data> 
    756759  <data name="&gt;&gt;pluginsManager.Type" xml:space="preserve"> 
    757     <value>System.Windows.Forms.ListView, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value> 
     760    <value>System.Windows.Forms.ListView, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value> 
    758761  </data> 
    759762  <data name="&gt;&gt;pluginsManager.Parent" xml:space="preserve"> 
    … …  
    791794  </data> 
    792795  <data name="&gt;&gt;plugins.Type" xml:space="preserve"> 
    793     <value>Eraser.LightGroup, Eraser, Version=6.1.0.2112, Culture=neutral, PublicKeyToken=3ac89a0351e689b6</value> 
     796    <value>Eraser.LightGroup, Eraser, Version=6.1.0.2532, Culture=neutral, PublicKeyToken=5fdae78f3f1dcf4a</value> 
    794797  </data> 
    795798  <data name="&gt;&gt;plugins.Parent" xml:space="preserve"> 
    … …  
    799802    <value>15</value> 
    800803  </data> 
    801   <data name="eraseUnusedMethod.IconAlignment" type="System.Windows.Forms.ErrorIconAlignment, System.Windows.Forms"> 
    802     <value>TopLeft</value> 
    803   </data> 
    804   <data name="eraseUnusedMethod.Location" type="System.Drawing.Point, System.Drawing"> 
     804  <data name="eraseDriveMethod.IconAlignment" type="System.Windows.Forms.ErrorIconAlignment, System.Windows.Forms"> 
     805    <value>TopLeft</value> 
     806  </data> 
     807  <data name="eraseDriveMethod.Location" type="System.Drawing.Point, System.Drawing"> 
    805808    <value>350, 138</value> 
    806809  </data> 
    807   <data name="eraseUnusedMethod.Size" type="System.Drawing.Size, System.Drawing"> 
     810  <data name="eraseDriveMethod.Size" type="System.Drawing.Size, System.Drawing"> 
    808811    <value>290, 21</value> 
    809812  </data> 
    810   <data name="eraseUnusedMethod.TabIndex" type="System.Int32, mscorlib"> 
     813  <data name="eraseDriveMethod.TabIndex" type="System.Int32, mscorlib"> 
    811814    <value>12</value> 
    812815  </data> 
    813   <data name="&gt;&gt;eraseUnusedMethod.Name" xml:space="preserve"> 
    814     <value>eraseUnusedMethod</value> 
    815   </data> 
    816   <data name="&gt;&gt;eraseUnusedMethod.Type" xml:space="preserve"> 
    817     <value>System.Windows.Forms.ComboBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value> 
    818   </data> 
    819   <data name="&gt;&gt;eraseUnusedMethod.Parent" xml:space="preserve"> 
    820     <value>content</value> 
    821   </data> 
    822   <data name="&gt;&gt;eraseUnusedMethod.ZOrder" xml:space="preserve"> 
     816  <data name="&gt;&gt;eraseDriveMethod.Name" xml:space="preserve"> 
     817    <value>eraseDriveMethod</value> 
     818  </data> 
     819  <data name="&gt;&gt;eraseDriveMethod.Type" xml:space="preserve"> 
     820    <value>System.Windows.Forms.ComboBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value> 
     821  </data> 
     822  <data name="&gt;&gt;eraseDriveMethod.Parent" xml:space="preserve"> 
     823    <value>content</value> 
     824  </data> 
     825  <data name="&gt;&gt;eraseDriveMethod.ZOrder" xml:space="preserve"> 
    823826    <value>16</value> 
    824827  </data> 
    … …  
    839842  </data> 
    840843  <data name="&gt;&gt;eraseFilesMethod.Type" xml:space="preserve"> 
    841     <value>System.Windows.Forms.ComboBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value> 
     844    <value>System.Windows.Forms.ComboBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value> 
    842845  </data> 
    843846  <data name="&gt;&gt;eraseFilesMethod.Parent" xml:space="preserve"> 
    … …  
    847850    <value>17</value> 
    848851  </data> 
    849   <data name="eraseUnusedMethodLbl.AutoSize" type="System.Boolean, mscorlib"> 
    850     <value>True</value> 
    851   </data> 
    852   <data name="eraseUnusedMethodLbl.IconAlignment" type="System.Windows.Forms.ErrorIconAlignment, System.Windows.Forms"> 
    853     <value>TopLeft</value> 
    854   </data> 
    855   <data name="eraseUnusedMethodLbl.Location" type="System.Drawing.Point, System.Drawing"> 
     852  <data name="eraseDriveMethodLbl.AutoSize" type="System.Boolean, mscorlib"> 
     853    <value>True</value> 
     854  </data> 
     855  <data name="eraseDriveMethodLbl.IconAlignment" type="System.Windows.Forms.ErrorIconAlignment, System.Windows.Forms"> 
     856    <value>TopLeft</value> 
     857  </data> 
     858  <data name="eraseDriveMethodLbl.Location" type="System.Drawing.Point, System.Drawing"> 
    856859    <value>17, 141</value> 
    857860  </data> 
    858   <data name="eraseUnusedMethodLbl.Size" type="System.Drawing.Size, System.Drawing"> 
    859     <value>190, 13</value> 
    860   </data> 
    861   <data name="eraseUnusedMethodLbl.TabIndex" type="System.Int32, mscorlib"> 
     861  <data name="eraseDriveMethodLbl.Size" type="System.Drawing.Size, System.Drawing"> 
     862    <value>146, 13</value> 
     863  </data> 
     864  <data name="eraseDriveMethodLbl.TabIndex" type="System.Int32, mscorlib"> 
    862865    <value>11</value> 
    863866  </data> 
    864   <data name="eraseUnusedMethodLbl.Text" xml:space="preserve"> 
    865     <value>Default unused space erasure method:</value> 
    866   </data> 
    867   <data name="&gt;&gt;eraseUnusedMethodLbl.Name" xml:space="preserve"> 
    868     <value>eraseUnusedMethodLbl</value> 
    869   </data> 
    870   <data name="&gt;&gt;eraseUnusedMethodLbl.Type" xml:space="preserve"> 
    871     <value>System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value> 
    872   </data> 
    873   <data name="&gt;&gt;eraseUnusedMethodLbl.Parent" xml:space="preserve"> 
    874     <value>content</value> 
    875   </data> 
    876   <data name="&gt;&gt;eraseUnusedMethodLbl.ZOrder" xml:space="preserve"> 
     867  <data name="eraseDriveMethodLbl.Text" xml:space="preserve"> 
     868    <value>Default drive erasure method:</value> 
     869  </data> 
     870  <data name="&gt;&gt;eraseDriveMethodLbl.Name" xml:space="preserve"> 
     871    <value>eraseDriveMethodLbl</value> 
     872  </data> 
     873  <data name="&gt;&gt;eraseDriveMethodLbl.Type" xml:space="preserve"> 
     874    <value>System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value> 
     875  </data> 
     876  <data name="&gt;&gt;eraseDriveMethodLbl.Parent" xml:space="preserve"> 
     877    <value>content</value> 
     878  </data> 
     879  <data name="&gt;&gt;eraseDriveMethodLbl.ZOrder" xml:space="preserve"> 
    877880    <value>18</value> 
    878881  </data> 
    … …  
    899902  </data> 
    900903  <data name="&gt;&gt;eraseFilesMethodLbl.Type" xml:space="preserve"> 
    901     <value>System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value> 
     904    <value>System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value> 
    902905  </data> 
    903906  <data name="&gt;&gt;eraseFilesMethodLbl.Parent" xml:space="preserve"> 
    … …  
    935938  </data> 
    936939  <data name="&gt;&gt;erase.Type" xml:space="preserve"> 
    937     <value>Eraser.LightGroup, Eraser, Version=6.1.0.2112, Culture=neutral, PublicKeyToken=3ac89a0351e689b6</value> 
     940    <value>Eraser.LightGroup, Eraser, Version=6.1.0.2532, Culture=neutral, PublicKeyToken=5fdae78f3f1dcf4a</value> 
    938941  </data> 
    939942  <data name="&gt;&gt;erase.Parent" xml:space="preserve"> 
    … …  
    965968  </data> 
    966969  <data name="&gt;&gt;lockedForceUnlock.Type" xml:space="preserve"> 
    967     <value>System.Windows.Forms.CheckBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value> 
     970    <value>System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value> 
    968971  </data> 
    969972  <data name="&gt;&gt;lockedForceUnlock.Parent" xml:space="preserve"> 
    … …  
    995998  </data> 
    996999  <data name="&gt;&gt;uiContextMenu.Type" xml:space="preserve"> 
    997     <value>System.Windows.Forms.CheckBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value> 
     1000    <value>System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value> 
    9981001  </data> 
    9991002  <data name="&gt;&gt;uiContextMenu.Parent" xml:space="preserve"> 
    … …  
    10311034  </data> 
    10321035  <data name="&gt;&gt;ui.Type" xml:space="preserve"> 
    1033     <value>Eraser.LightGroup, Eraser, Version=6.1.0.2112, Culture=neutral, PublicKeyToken=3ac89a0351e689b6</value> 
     1036    <value>Eraser.LightGroup, Eraser, Version=6.1.0.2532, Culture=neutral, PublicKeyToken=5fdae78f3f1dcf4a</value> 
    10341037  </data> 
    10351038  <data name="&gt;&gt;ui.Parent" xml:space="preserve"> 
    … …  
    10491052  </data> 
    10501053  <data name="&gt;&gt;content.Type" xml:space="preserve"> 
    1051     <value>System.Windows.Forms.Panel, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value> 
     1054    <value>System.Windows.Forms.Panel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value> 
    10521055  </data> 
    10531056  <data name="&gt;&gt;content.Parent" xml:space="preserve"> 
    … …  
    10701073  </data> 
    10711074  <data name="&gt;&gt;titleLabel.Type" xml:space="preserve"> 
    1072     <value>System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value> 
     1075    <value>System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value> 
    10731076  </data> 
    10741077  <data name="&gt;&gt;titleLabel.Parent" xml:space="preserve"> 
    … …  
    10781081    <value>2</value> 
    10791082  </data> 
    1080   <metadata name="openFileDialog.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"> 
     1083  <metadata name="openFileDialog.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"> 
    10811084    <value>257, 17</value> 
    10821085  </metadata> 
    … …  
    10841087    <value>All Files (*.*)|*.*</value> 
    10851088  </data> 
    1086   <metadata name="folderBrowserDialog.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"> 
     1089  <metadata name="folderBrowserDialog.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"> 
    10871090    <value>397, 17</value> 
    10881091  </metadata> 

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

    r2518 r2609  
    295295    <value>Default file erasure method</value> 
    296296  </data> 
    297   <data name="Default unused space erasure method" xml:space="preserve"> 
    298     <value>Default unused space erasure method</value> 
     297  <data name="Default drive erasure method" xml:space="preserve"> 
     298    <value>(Untranslated)</value> 
    299299  </data> 
    300300  <data name="Randomness data source" xml:space="preserve"> 
    … …  
    316316    <value>An invalid file erasure method was selected.</value> 
    317317  </data> 
    318   <data name="An invalid unused disk space erasure method was selected." xml:space="preserve"> 
    319     <value>An invalid unused disk space erasure method was selected.</value> 
     318  <data name="An invalid drive erasure method was selected." xml:space="preserve"> 
     319    <value>(Untranslated)</value> 
    320320  </data> 
    321321  <data name="An invalid randomness data source was selected." xml:space="preserve"> 
    … …  
    334334    <value>(This erasure type does not have any settings to define.)</value> 
    335335  </data> 
    336   <data name="The erasure method selected does not support unused disk space erasures." xml:space="preserve"> 
    337     <value>The erasure method selected does not support unused disk space erasures.</value> 
     336  <data name="The erasure method selected does not support erasing the erasure target." xml:space="preserve"> 
     337    <value>(Untranslated)</value> 
    338338  </data> 
    339339  <data name="{0}, " xml:space="preserve"> 

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

    r2518 r2609  
    295295    <value>Metodo di pulizia di default </value> 
    296296  </data> 
    297   <data name="Default unused space erasure method" xml:space="preserve"> 
    298     <value>Metodo di pulizia dello spazio libero di default</value> 
     297  <data name="Default drive erasure method" xml:space="preserve"> 
     298    <value>(Untranslated)</value> 
    299299  </data> 
    300300  <data name="Randomness data source" xml:space="preserve"> 
    … …  
    316316    <value>E' stato scelto un metodo di pulizia non valido.</value> 
    317317  </data> 
    318   <data name="An invalid unused disk space erasure method was selected." xml:space="preserve"> 
    319     <value>E' stato scelto un metodo di pulizia dello spazio libero non valido.</value> 
     318  <data name="An invalid drive erasure method was selected." xml:space="preserve"> 
     319    <value>(Untranslated)</value> 
    320320  </data> 
    321321  <data name="An invalid randomness data source was selected." xml:space="preserve"> 
    … …  
    334334    <value>(Questo tipo di pulizia non ha impostazioni da definire.)</value> 
    335335  </data> 
    336   <data name="The erasure method selected does not support unused disk space erasures." xml:space="preserve"> 
    337     <value>Il metodo di pulizia selezionato non consente la pulizia dello spazio libero.</value> 
     336  <data name="The erasure method selected does not support erasing the erasure target." xml:space="preserve"> 
     337    <value>(Untranslated)</value> 
    338338  </data> 
    339339  <data name="{0}, " xml:space="preserve"> 

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

    r2518 r2609  
    295295    <value>Standard bestand verwijder methode</value> 
    296296  </data> 
    297   <data name="Default unused space erasure method" xml:space="preserve"> 
    298     <value>Standaard ongebruikte ruimte verwijder methode</value> 
     297  <data name="Default drive erasure method" xml:space="preserve"> 
     298    <value>(Untranslated)</value> 
    299299  </data> 
    300300  <data name="Randomness data source" xml:space="preserve"> 
    … …  
    316316    <value>Een foutieve wis methode was geselecteerd.</value> 
    317317  </data> 
    318   <data name="An invalid unused disk space erasure method was selected." xml:space="preserve"> 
    319     <value>Een foutieve ongebruikte schijfruimte wis methode was geselecteerd.</value> 
     318  <data name="An invalid drive erasure method was selected." xml:space="preserve"> 
     319    <value>(Untranslated)</value> 
    320320  </data> 
    321321  <data name="An invalid randomness data source was selected." xml:space="preserve"> 
    … …  
    334334    <value>(Untranslated)</value> 
    335335  </data> 
    336   <data name="The erasure method selected does not support unused disk space erasures." xml:space="preserve"> 
    337     <value>Deze geselecteerde wis methode kan geen ongebruikte schijfruimte te wissen.</value> 
     336  <data name="The erasure method selected does not support erasing the erasure target." xml:space="preserve"> 
     337    <value>(Untranslated)</value> 
    338338  </data> 
    339339  <data name="{0}, " xml:space="preserve"> 

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

    r2518 r2609  
    295295    <value>Podstawowa metoda wymazywania pliku</value> 
    296296  </data> 
    297   <data name="Default unused space erasure method" xml:space="preserve"> 
    298     <value>Podstawowa metoda wymazywania nieużywanego miejsca</value> 
     297  <data name="Default drive erasure method" xml:space="preserve"> 
     298    <value>(Untranslated)</value> 
    299299  </data> 
    300300  <data name="Randomness data source" xml:space="preserve"> 
    … …  
    316316    <value>Wybrano niewłaściwą metodę wymazywania pliku.</value> 
    317317  </data> 
    318   <data name="An invalid unused disk space erasure method was selected." xml:space="preserve"> 
    319     <value>Wybrano niewłaściwą metodę wymazywania nieużywanego miejsca.</value> 
     318  <data name="An invalid drive erasure method was selected." xml:space="preserve"> 
     319    <value>(Untranslated)</value> 
    320320  </data> 
    321321  <data name="An invalid randomness data source was selected." xml:space="preserve"> 
    … …  
    334334    <value>(Untranslated)</value> 
    335335  </data> 
    336   <data name="The erasure method selected does not support unused disk space erasures." xml:space="preserve"> 
    337     <value>Wybrana metoda, nie wspiera wymazywania nieużywanego miejsca.</value> 
     336  <data name="The erasure method selected does not support erasing the erasure target." xml:space="preserve"> 
     337    <value>(Untranslated)</value> 
    338338  </data> 
    339339  <data name="{0}, " xml:space="preserve"> 

  • trunk/eraser/Eraser/Strings.resx

    r2518 r2609  
    295295    <value>Default file erasure method</value> 
    296296  </data> 
    297   <data name="Default unused space erasure method" xml:space="preserve"> 
    298     <value>Default unused space erasure method</value> 
     297  <data name="Default drive erasure method" xml:space="preserve"> 
     298    <value>Default drive erasure method</value> 
    299299  </data> 
    300300  <data name="Randomness data source" xml:space="preserve"> 
    … …  
    316316    <value>An invalid file erasure method was selected.</value> 
    317317  </data> 
    318   <data name="An invalid unused disk space erasure method was selected." xml:space="preserve"> 
    319     <value>An invalid unused disk space erasure method was selected.</value> 
     318  <data name="An invalid drive erasure method was selected." xml:space="preserve"> 
     319    <value>An invalid drive erasure method was selected.</value> 
    320320  </data> 
    321321  <data name="An invalid randomness data source was selected." xml:space="preserve"> 
    … …  
    334334    <value>(This erasure type does not have any settings to define.)</value> 
    335335  </data> 
    336   <data name="The erasure method selected does not support unused disk space erasures." xml:space="preserve"> 
    337     <value>The erasure method selected does not support unused disk space erasures.</value> 
     336  <data name="The erasure method selected does not support erasing the erasure target." xml:space="preserve"> 
     337    <value>The erasure method selected does not support erasing the erasure target.</value> 
    338338  </data> 
    339339  <data name="{0}, " xml:space="preserve"> 

  • trunk/eraser/Eraser/TaskDataSelectionForm.cs

    r2516 r2609  
    8585        /// Retrieves the settings on the property page as the Eraser Manager API equivalent. 
    8686        /// </summary> 
    87         /// <returns>An Eraser.Manager.Task.Data or Eraser.Manager.Task.UnusedSpace object 
    88         /// or any of its inherited classes, depending on the task selected</returns> 
     87        /// <returns>An Erasure Target, containing the information to be erased.</returns> 
    8988        public IErasureTarget Target 
    9089        { 
    … …  
    156155            { 
    157156                errorProvider.SetError(methodCmb, S._("The erasure method selected does " + 
    158                     "not support unused disk space erasures.")); 
     157                    "not support erasing the erasure target.")); 
    159158            } 
    160159            else if (type.Configurer == null || type.Configurer.SaveTo(type.Target)) 
Note: See TracChangeset for help on using the changeset viewer.