Changeset 2658


Ignore:
Timestamp:
5/24/2012 4:26:58 AM (12 months ago)
Author:
lowjoel
Message:

Normalised the new strings. Also standardise the log level to be informational for the "deleted before it could be erased" type messages since we can't do anything about it.

Location:
trunk/eraser/Eraser.DefaultPlugins
Files:
8 edited

Legend:

Unmodified
Added
Removed

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

    r2656 r2658  
    370370                catch (FileNotFoundException) 
    371371                { 
    372                     Logger.Log(S._("The file {0} was not securely erased because the file was " + 
    373                         "deleted before it could be erased.", info.FullName), LogLevel.Warning); 
     372                    Logger.Log(S._("The file {0} was not erased because it was " + 
     373                        "deleted before it could be erased.", info.FullName), LogLevel.Information); 
    374374                } 
    375375                catch (DirectoryNotFoundException) 
    376376                { 
    377                     Logger.Log(S._("The file {0} was not securely erased because the containing " + 
     377                    Logger.Log(S._("The file {0} was not erased because the containing " + 
    378378                        "directory was deleted before it could be erased.", info.FullName), 
    379                         LogLevel.Warning); 
     379                        LogLevel.Information); 
    380380                } 
    381381                catch (SharingViolationException) 

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

    r2656 r2658  
    163163                { 
    164164                    Logger.Log(S._("The file {0} was not erased because the containing " + 
    165                         "directory was deleted before it could be erased", file.FullName), 
     165                        "directory was deleted before it could be erased.", file.FullName), 
    166166                        LogLevel.Information); 
    167167                } 
    … …  
    288288                catch (DirectoryNotFoundException) 
    289289                { 
    290                     Logger.Log(new LogEntry(S._("The folder {0} could not be erased because " + 
     290                    Logger.Log(new LogEntry(S._("The folder {0} was not erased because " + 
    291291                        "the containing directory was deleted before it could be erased.", 
    292                         info.FullName), LogLevel.Error)); 
     292                        info.FullName), LogLevel.Information)); 
    293293                } 
    294294                catch (UnauthorizedAccessException) 

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

    r2657 r2658  
    157157                    { 
    158158                        Logger.Log(S._("The file {0} was not erased because the containing " + 
    159                             "directory was deleted before it could be erased", file.FullName), 
     159                            "directory was deleted before it could be erased.", file.FullName), 
    160160                            LogLevel.Information); 
    161161                    } 

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

    r2615 r2658  
    166166    <value>The file {0} is currently in use and cannot be removed.</value> 
    167167  </data> 
     168  <data name="(unknown)" xml:space="preserve"> 
     169    <value>(unknown)</value> 
     170  </data> 
    168171  <data name="Could not force closure of file \&quot;{0}\&quot; {1}(locked by {0})" xml:space="preserve"> 
    169172    <value>Could not force closure of file \"{0}\" {1}(locked by {0})</value> 
    … …  
    247250    <value>File</value> 
    248251  </data> 
     252  <data name="Could not list the Alternate Data Streams for file {0} because the file is being used by another process. The file will not be erased." xml:space="preserve"> 
     253    <value>Could not list the Alternate Data Streams for file {0} because the file is being used by another process. The file will not be erased.</value> 
     254  </data> 
    249255  <data name="Invalid file path" xml:space="preserve"> 
    250256    <value>Invalid file path</value> 
    … …  
    265271    <value>The file {0} is a hard link or a symbolic link thus the contents of the file was not erased.</value> 
    266272  </data> 
     273  <data name="The file {0} was not erased because it was deleted before it could be erased." xml:space="preserve"> 
     274    <value>The file {0} was not erased because it was deleted before it could be erased.</value> 
     275  </data> 
     276  <data name="The file {0} was not erased because the containing directory was deleted before it could be erased." xml:space="preserve"> 
     277    <value>The file {0} was not erased because the containing directory was deleted before it could be erased.</value> 
     278  </data> 
    267279  <data name="Files in Folder" xml:space="preserve"> 
    268280    <value>Files in Folder</value> 
    … …  
    271283    <value>Removing folders...</value> 
    272284  </data> 
     285  <data name="The folder {0} was not erased because the containing directory was deleted before it could be erased." xml:space="preserve"> 
     286    <value>The folder {0} was not erased because the containing directory was deleted before it could be erased.</value> 
     287  </data> 
    273288  <data name="The folder {0} could not be deleted because the folder's permissions prevents the deletion of the folder." xml:space="preserve"> 
    274289    <value>The folder {0} could not be deleted because the folder's permissions prevents the deletion of the folder.</value> 

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

    r2615 r2658  
    166166    <value>Il file {0} è attualmente in uso e non può essere rimosso.</value> 
    167167  </data> 
     168  <data name="(unknown)" xml:space="preserve"> 
     169    <value>(Untranslated)</value> 
     170  </data> 
    168171  <data name="Could not force closure of file \&quot;{0}\&quot; {1}(locked by {0})" xml:space="preserve"> 
    169172    <value>Impossibile forzare la chiusura del file \"{0}\" {1}(in uso da {0})</value> 
    … …  
    247250    <value>(Untranslated)</value> 
    248251  </data> 
     252  <data name="Could not list the Alternate Data Streams for file {0} because the file is being used by another process. The file will not be erased." xml:space="preserve"> 
     253    <value>(Untranslated)</value> 
     254  </data> 
    249255  <data name="Invalid file path" xml:space="preserve"> 
    250256    <value>Percorso del file non valido</value> 
    … …  
    265271    <value>(Untranslated)</value> 
    266272  </data> 
     273  <data name="The file {0} was not erased because it was deleted before it could be erased." xml:space="preserve"> 
     274    <value>(Untranslated)</value> 
     275  </data> 
     276  <data name="The file {0} was not erased because the containing directory was deleted before it could be erased." xml:space="preserve"> 
     277    <value>(Untranslated)</value> 
     278  </data> 
    267279  <data name="Files in Folder" xml:space="preserve"> 
    268280    <value>File in cartella</value> 
    … …  
    271283    <value>Pulizia cartelle...</value> 
    272284  </data> 
     285  <data name="The folder {0} was not erased because the containing directory was deleted before it could be erased." xml:space="preserve"> 
     286    <value>(Untranslated)</value> 
     287  </data> 
    273288  <data name="The folder {0} could not be deleted because the folder's permissions prevents the deletion of the folder." xml:space="preserve"> 
    274289    <value>(Untranslated)</value> 

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

    r2615 r2658  
    166166    <value>(Untranslated)</value> 
    167167  </data> 
     168  <data name="(unknown)" xml:space="preserve"> 
     169    <value>(Untranslated)</value> 
     170  </data> 
    168171  <data name="Could not force closure of file \&quot;{0}\&quot; {1}(locked by {0})" xml:space="preserve"> 
    169172    <value>(Untranslated)</value> 
    … …  
    247250    <value>(Untranslated)</value> 
    248251  </data> 
     252  <data name="Could not list the Alternate Data Streams for file {0} because the file is being used by another process. The file will not be erased." xml:space="preserve"> 
     253    <value>(Untranslated)</value> 
     254  </data> 
    249255  <data name="Invalid file path" xml:space="preserve"> 
    250256    <value>(Untranslated)</value> 
    … …  
    265271    <value>(Untranslated)</value> 
    266272  </data> 
     273  <data name="The file {0} was not erased because it was deleted before it could be erased." xml:space="preserve"> 
     274    <value>(Untranslated)</value> 
     275  </data> 
     276  <data name="The file {0} was not erased because the containing directory was deleted before it could be erased." xml:space="preserve"> 
     277    <value>(Untranslated)</value> 
     278  </data> 
    267279  <data name="Files in Folder" xml:space="preserve"> 
    268280    <value>(Untranslated)</value> 
    … …  
    271283    <value>(Untranslated)</value> 
    272284  </data> 
     285  <data name="The folder {0} was not erased because the containing directory was deleted before it could be erased." xml:space="preserve"> 
     286    <value>(Untranslated)</value> 
     287  </data> 
    273288  <data name="The folder {0} could not be deleted because the folder's permissions prevents the deletion of the folder." xml:space="preserve"> 
    274289    <value>(Untranslated)</value> 

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

    r2615 r2658  
    166166    <value>Plik {0} jest w użyciu i nie można go usunąć.</value> 
    167167  </data> 
     168  <data name="(unknown)" xml:space="preserve"> 
     169    <value>(Untranslated)</value> 
     170  </data> 
    168171  <data name="Could not force closure of file \&quot;{0}\&quot; {1}(locked by {0})" xml:space="preserve"> 
    169172    <value>Nie można wymusić zamknięcia pliku \"{0}\" {1}(zablokowany przez {0})</value> 
    … …  
    247250    <value>(Untranslated)</value> 
    248251  </data> 
     252  <data name="Could not list the Alternate Data Streams for file {0} because the file is being used by another process. The file will not be erased." xml:space="preserve"> 
     253    <value>(Untranslated)</value> 
     254  </data> 
    249255  <data name="Invalid file path" xml:space="preserve"> 
    250256    <value>(Untranslated)</value> 
    … …  
    265271    <value>(Untranslated)</value> 
    266272  </data> 
     273  <data name="The file {0} was not erased because it was deleted before it could be erased." xml:space="preserve"> 
     274    <value>(Untranslated)</value> 
     275  </data> 
     276  <data name="The file {0} was not erased because the containing directory was deleted before it could be erased." xml:space="preserve"> 
     277    <value>(Untranslated)</value> 
     278  </data> 
    267279  <data name="Files in Folder" xml:space="preserve"> 
    268280    <value>(Untranslated)</value> 
    269281  </data> 
    270282  <data name="Removing folders..." xml:space="preserve"> 
     283    <value>(Untranslated)</value> 
     284  </data> 
     285  <data name="The folder {0} was not erased because the containing directory was deleted before it could be erased." xml:space="preserve"> 
    271286    <value>(Untranslated)</value> 
    272287  </data> 

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

    r2615 r2658  
    166166    <value>The file {0} is currently in use and cannot be removed.</value> 
    167167  </data> 
     168  <data name="(unknown)" xml:space="preserve"> 
     169    <value>(unknown)</value> 
     170  </data> 
    168171  <data name="Could not force closure of file \&quot;{0}\&quot; {1}(locked by {0})" xml:space="preserve"> 
    169172    <value>Could not force closure of file \"{0}\" {1}(locked by {0})</value> 
    … …  
    247250    <value>File</value> 
    248251  </data> 
     252  <data name="Could not list the Alternate Data Streams for file {0} because the file is being used by another process. The file will not be erased." xml:space="preserve"> 
     253    <value>Could not list the Alternate Data Streams for file {0} because the file is being used by another process. The file will not be erased.</value> 
     254  </data> 
    249255  <data name="Invalid file path" xml:space="preserve"> 
    250256    <value>Invalid file path</value> 
    … …  
    265271    <value>The file {0} is a hard link or a symbolic link thus the contents of the file was not erased.</value> 
    266272  </data> 
     273  <data name="The file {0} was not erased because it was deleted before it could be erased." xml:space="preserve"> 
     274    <value>The file {0} was not erased because it was deleted before it could be erased.</value> 
     275  </data> 
     276  <data name="The file {0} was not erased because the containing directory was deleted before it could be erased." xml:space="preserve"> 
     277    <value>The file {0} was not erased because the containing directory was deleted before it could be erased.</value> 
     278  </data> 
    267279  <data name="Files in Folder" xml:space="preserve"> 
    268280    <value>Files in Folder</value> 
    … …  
    271283    <value>Removing folders...</value> 
    272284  </data> 
     285  <data name="The folder {0} was not erased because the containing directory was deleted before it could be erased." xml:space="preserve"> 
     286    <value>The folder {0} was not erased because the containing directory was deleted before it could be erased.</value> 
     287  </data> 
    273288  <data name="The folder {0} could not be deleted because the folder's permissions prevents the deletion of the folder." xml:space="preserve"> 
    274289    <value>The folder {0} could not be deleted because the folder's permissions prevents the deletion of the folder.</value> 
Note: See TracChangeset for help on using the changeset viewer.