#52: translate back basic item properties, use single item.html for a…

…ll languages

iped-app/resources/localization/iped-engine-messages.properties

@@ -17,6 +17,17 @@ HTMLReportTask.FileCount=File Count
 HTMLReportTask.FirstPage=First Page
 HTMLReportTask.GalleryLink=Image Gallery
 HTMLReportTask.GalleryTitle=Thumbnails
+HTMLReportTask.ItemName=Name
+HTMLReportTask.ItemPath=Path
+HTMLReportTask.ItemType=File Type
+HTMLReportTask.ItemSize=Logical Size
+HTMLReportTask.ItemCreated=Created Date
+HTMLReportTask.ItemModified=Modified Date
+HTMLReportTask.ItemAccessed=Last Accessed Date
+HTMLReportTask.ItemDeleted=Deleted
+HTMLReportTask.ItemCarved=Carved
+HTMLReportTask.ItemHash=Hash
+HTMLReportTask.ItemIdInSource=Exported as
 HTMLReportTask.LastPage=Last Page
 HTMLReportTask.MakingHtmlReport=Creating HTML report...
 HTMLReportTask.NextPage=Next Page

iped-app/resources/localization/iped-engine-messages_de_DE.properties

@@ -17,6 +17,17 @@ HTMLReportTask.FileCount=Anzahl Dateien
 HTMLReportTask.FirstPage=Erste Seite
 HTMLReportTask.GalleryLink=Bilder-Galerie
 HTMLReportTask.GalleryTitle=Vorschau
+HTMLReportTask.ItemName=Name
+HTMLReportTask.ItemPath=Pfad
+HTMLReportTask.ItemType=Dateityp
+HTMLReportTask.ItemSize=logische Größe
+HTMLReportTask.ItemCreated=Erstelldatum
+HTMLReportTask.ItemModified=Modifikationsdatum
+HTMLReportTask.ItemAccessed=Datum letzter Zugriff
+HTMLReportTask.ItemDeleted=Gelöscht
+HTMLReportTask.ItemCarved=Wiederhergestellt
+HTMLReportTask.ItemHash=Hash
+HTMLReportTask.ItemIdInSource=Exportiert als
 HTMLReportTask.LastPage=Letzte Seite
 HTMLReportTask.MakingHtmlReport=Erstelle HTML Bericht...
 HTMLReportTask.NextPage=Nächste Seite

iped-app/resources/localization/iped-engine-messages_es_AR.properties

@@ -17,6 +17,17 @@ HTMLReportTask.FileCount=Recuento de archivos
 HTMLReportTask.FirstPage=Primera página
 HTMLReportTask.GalleryLink=Galería de imágenes
 HTMLReportTask.GalleryTitle=Miniaturas
+HTMLReportTask.ItemName=Nombre
+HTMLReportTask.ItemPath=Ubicación
+HTMLReportTask.ItemType=Tipo de Archivo
+HTMLReportTask.ItemSize=Tamaño Lógico
+HTMLReportTask.ItemCreated=Fecha Creación
+HTMLReportTask.ItemModified=Fecha Modificación
+HTMLReportTask.ItemAccessed=Fecha Último Acceso
+HTMLReportTask.ItemDeleted=Eliminado
+HTMLReportTask.ItemCarved=Carved
+HTMLReportTask.ItemHash=Hash
+HTMLReportTask.ItemIdInSource=Exportar como
 HTMLReportTask.LastPage=Última página
 HTMLReportTask.MakingHtmlReport=Creando informe HTML...
 HTMLReportTask.NextPage=Página siguiente

iped-app/resources/localization/iped-engine-messages_it_IT.properties

@@ -17,6 +17,17 @@ HTMLReportTask.FileCount=Numero file
 HTMLReportTask.FirstPage=Prima Pagina
 HTMLReportTask.GalleryLink=Galleria immagini
 HTMLReportTask.GalleryTitle=Anteprima
+HTMLReportTask.ItemName=Nome
+HTMLReportTask.ItemPath=Percorso
+HTMLReportTask.ItemType=Tipo File
+HTMLReportTask.ItemSize=Dimensione Logica
+HTMLReportTask.ItemCreated=Data Creazione
+HTMLReportTask.ItemModified=Data Modifica
+HTMLReportTask.ItemAccessed=Data Ultimo Accesso
+HTMLReportTask.ItemDeleted=Cancellato
+HTMLReportTask.ItemCarved=Recuperato
+HTMLReportTask.ItemHash=Hash
+HTMLReportTask.ItemIdInSource=Esportato come
 HTMLReportTask.LastPage=Ultima pagina
 HTMLReportTask.MakingHtmlReport=Creazione Report HTML...
 HTMLReportTask.NextPage=Pagina successiva

iped-app/resources/localization/iped-engine-messages_pt_BR.properties

@@ -17,6 +17,17 @@ HTMLReportTask.FileCount=Contagem de arquivos
 HTMLReportTask.FirstPage=Primeira Página
 HTMLReportTask.GalleryLink=Galeria de Imagens
 HTMLReportTask.GalleryTitle=Miniaturas
+HTMLReportTask.ItemName=Nome
+HTMLReportTask.ItemPath=Caminho
+HTMLReportTask.ItemType=Tipo de arquivo 
+HTMLReportTask.ItemSize=Tamanho lógico
+HTMLReportTask.ItemCreated=Data de criação
+HTMLReportTask.ItemModified=Data de modificação
+HTMLReportTask.ItemAccessed=Data de acesso
+HTMLReportTask.ItemDeleted=Excluído
+HTMLReportTask.ItemCarved=Reconstituído
+HTMLReportTask.ItemHash=Hash
+HTMLReportTask.ItemIdInSource=Exportado como
 HTMLReportTask.LastPage=Última Página
 HTMLReportTask.MakingHtmlReport=Gerando relatório HTML...
 HTMLReportTask.NextPage=Próxima página

iped-app/resources/root/htmlreport/de-DE/templates/item.html

@@ -1,12 +1 @@
-<a name="bk_obj%SEQ%"> </a>
-<div class="clrBkgrnd bkmkSeparator bkmkValue"><span class="bkmkColLeft bkmkValue labelBorderless clrBkgrnd" width="100%" border="1">Name</span><span class="bkmkColRight bkmkValue"><b>%NAME%</b></span></div>
-<div class="row"><span class="bkmkColLeft bkmkValue labelBorderless clrBkgrnd" width="100%" border="1">Pfad</span><span class="bkmkColRight bkmkValue">%PATH%</span></div>
-<div class="row"><span class="bkmkColLeft bkmkValue labelBorderless clrBkgrnd" width="100%" border="1">Dateityp</span><span class="bkmkColRight bkmkValue">%TYPE%</span></div>
-<div class="row"><span class="bkmkColLeft bkmkValue labelBorderless clrBkgrnd" width="100%" border="1">logische Gr&ouml;&szlig;e</span><span class="bkmkColRight bkmkValue">%SIZE% Bytes</span></div>
-<div class="row"><span class="bkmkColLeft bkmkValue labelBorderless clrBkgrnd" width="100%" border="1">Erstelldatum</span><span class="bkmkColRight bkmkValue">%CREATED%</span></div>
-<div class="row"><span class="bkmkColLeft bkmkValue labelBorderless clrBkgrnd" width="100%" border="1">Modifikationsdatum</span><span class="bkmkColRight bkmkValue">%MODIFIED%</span></div>
-<div class="row"><span class="bkmkColLeft bkmkValue labelBorderless clrBkgrnd" width="100%" border="1">Datum letzter Zugriff</span><span class="bkmkColRight bkmkValue">%ACCESSED%</span></div>
-<div class="row"><span class="bkmkColLeft bkmkValue labelBorderless clrBkgrnd" width="100%" border="1">Gel&ouml;scht</span><span class="bkmkColRight bkmkValue">%DELETED%</span></div>
-<div class="row"><span class="bkmkColLeft bkmkValue labelBorderless clrBkgrnd" width="100%" border="1">Wiederhergestellt</span><span class="bkmkColRight bkmkValue">%CARVED%</span></div>
-<div class="row"><span class="bkmkColLeft bkmkValue labelBorderless clrBkgrnd" width="100%" border="1">Hash</span><span class="bkmkColRight bkmkValue">%HASH%</span></div>
-<div class="row"><div class="row"><span class="bkmkColLeft bkmkValue labelBorderless clrBkgrnd" width="100%" border="1">Exportiert als</span><span class="bkmkColRight bkmkValue"><b>%EXPORTED%</b></span></div>
+<div class="row"><span class="bkmkColLeft bkmkValue labelBorderless clrBkgrnd" width="100%" border="1">%PROPERTY_NAME%</span><span class="bkmkColRight bkmkValue">%PROPERTY_VALUE%</span></div>

iped-app/resources/root/htmlreport/en/templates/item.html

@@ -1,12 +1 @@
-<a name="bk_obj%SEQ%"> </a>
-<div class="clrBkgrnd bkmkSeparator bkmkValue"><span class="bkmkColLeft bkmkValue labelBorderless clrBkgrnd" width="100%" border="1">Name</span><span class="bkmkColRight bkmkValue"><b>%NAME%</b></span></div>
-<div class="row"><span class="bkmkColLeft bkmkValue labelBorderless clrBkgrnd" width="100%" border="1">Path</span><span class="bkmkColRight bkmkValue">%PATH%</span></div>
-<div class="row"><span class="bkmkColLeft bkmkValue labelBorderless clrBkgrnd" width="100%" border="1">File Type</span><span class="bkmkColRight bkmkValue">%TYPE%</span></div>
-<div class="row"><span class="bkmkColLeft bkmkValue labelBorderless clrBkgrnd" width="100%" border="1">Logical Size</span><span class="bkmkColRight bkmkValue">%SIZE% Bytes</span></div>
-<div class="row"><span class="bkmkColLeft bkmkValue labelBorderless clrBkgrnd" width="100%" border="1">Created Date</span><span class="bkmkColRight bkmkValue">%CREATED%</span></div>
-<div class="row"><span class="bkmkColLeft bkmkValue labelBorderless clrBkgrnd" width="100%" border="1">Modified Date</span><span class="bkmkColRight bkmkValue">%MODIFIED%</span></div>
-<div class="row"><span class="bkmkColLeft bkmkValue labelBorderless clrBkgrnd" width="100%" border="1">Last Accessed Date</span><span class="bkmkColRight bkmkValue">%ACCESSED%</span></div>
-<div class="row"><span class="bkmkColLeft bkmkValue labelBorderless clrBkgrnd" width="100%" border="1">Deleted</span><span class="bkmkColRight bkmkValue">%DELETED%</span></div>
-<div class="row"><span class="bkmkColLeft bkmkValue labelBorderless clrBkgrnd" width="100%" border="1">Carved</span><span class="bkmkColRight bkmkValue">%CARVED%</span></div>
-<div class="row"><span class="bkmkColLeft bkmkValue labelBorderless clrBkgrnd" width="100%" border="1">Hash</span><span class="bkmkColRight bkmkValue">%HASH%</span></div>
-<div class="row"><div class="row"><span class="bkmkColLeft bkmkValue labelBorderless clrBkgrnd" width="100%" border="1">Exported as</span><span class="bkmkColRight bkmkValue"><b>%EXPORTED%</b></span></div>
+<div class="row"><span class="bkmkColLeft bkmkValue labelBorderless clrBkgrnd" width="100%" border="1">%PROPERTY_NAME%</span><span class="bkmkColRight bkmkValue">%PROPERTY_VALUE%</span></div>

iped-app/resources/root/htmlreport/es-AR/templates/item.html

@@ -1,12 +1 @@
-<a name="bk_obj%SEQ%"> </a>
-<div class="clrBkgrnd bkmkSeparator bkmkValue"><span class="bkmkColLeft bkmkValue labelBorderless clrBkgrnd" width="100%" border="1">Nombre</span><span class="bkmkColRight bkmkValue"><b>%NAME%</b></span></div>
-<div class="row"><span class="bkmkColLeft bkmkValue labelBorderless clrBkgrnd" width="100%" border="1">Ubicación</span><span class="bkmkColRight bkmkValue">%PATH%</span></div>
-<div class="row"><span class="bkmkColLeft bkmkValue labelBorderless clrBkgrnd" width="100%" border="1">Tipo de Archivo</span><span class="bkmkColRight bkmkValue">%TYPE%</span></div>
-<div class="row"><span class="bkmkColLeft bkmkValue labelBorderless clrBkgrnd" width="100%" border="1">Tamaño Lógico</span><span class="bkmkColRight bkmkValue">%SIZE% Bytes</span></div>
-<div class="row"><span class="bkmkColLeft bkmkValue labelBorderless clrBkgrnd" width="100%" border="1">Fecha Creación</span><span class="bkmkColRight bkmkValue">%CREATED%</span></div>
-<div class="row"><span class="bkmkColLeft bkmkValue labelBorderless clrBkgrnd" width="100%" border="1">Fecha Modificación</span><span class="bkmkColRight bkmkValue">%MODIFIED%</span></div>
-<div class="row"><span class="bkmkColLeft bkmkValue labelBorderless clrBkgrnd" width="100%" border="1">Fecha Último Acceso</span><span class="bkmkColRight bkmkValue">%ACCESSED%</span></div>
-<div class="row"><span class="bkmkColLeft bkmkValue labelBorderless clrBkgrnd" width="100%" border="1">Eliminado</span><span class="bkmkColRight bkmkValue">%DELETED%</span></div>
-<div class="row"><span class="bkmkColLeft bkmkValue labelBorderless clrBkgrnd" width="100%" border="1">Carved</span><span class="bkmkColRight bkmkValue">%CARVED%</span></div>
-<div class="row"><span class="bkmkColLeft bkmkValue labelBorderless clrBkgrnd" width="100%" border="1">Hash</span><span class="bkmkColRight bkmkValue">%HASH%</span></div>
-<div class="row"><div class="row"><span class="bkmkColLeft bkmkValue labelBorderless clrBkgrnd" width="100%" border="1">Exportar como</span><span class="bkmkColRight bkmkValue"><b>%EXPORTED%</b></span></div>
+<div class="row"><span class="bkmkColLeft bkmkValue labelBorderless clrBkgrnd" width="100%" border="1">%PROPERTY_NAME%</span><span class="bkmkColRight bkmkValue">%PROPERTY_VALUE%</span></div>

iped-app/resources/root/htmlreport/it-IT/templates/item.html

@@ -1,12 +1 @@
-<a name="bk_obj%SEQ%"> </a>
-<div class="clrBkgrnd bkmkSeparator bkmkValue"><span class="bkmkColLeft bkmkValue labelBorderless clrBkgrnd" width="100%" border="1">Nome</span><span class="bkmkColRight bkmkValue"><b>%NAME%</b></span></div>
-<div class="row"><span class="bkmkColLeft bkmkValue labelBorderless clrBkgrnd" width="100%" border="1">Percorso</span><span class="bkmkColRight bkmkValue">%PATH%</span></div>
-<div class="row"><span class="bkmkColLeft bkmkValue labelBorderless clrBkgrnd" width="100%" border="1">Tipo File</span><span class="bkmkColRight bkmkValue">%TYPE%</span></div>
-<div class="row"><span class="bkmkColLeft bkmkValue labelBorderless clrBkgrnd" width="100%" border="1">Dimensione Logica</span><span class="bkmkColRight bkmkValue">%SIZE% Bytes</span></div>
-<div class="row"><span class="bkmkColLeft bkmkValue labelBorderless clrBkgrnd" width="100%" border="1">Data Creazione</span><span class="bkmkColRight bkmkValue">%CREATED%</span></div>
-<div class="row"><span class="bkmkColLeft bkmkValue labelBorderless clrBkgrnd" width="100%" border="1">Data Modifica</span><span class="bkmkColRight bkmkValue">%MODIFIED%</span></div>
-<div class="row"><span class="bkmkColLeft bkmkValue labelBorderless clrBkgrnd" width="100%" border="1">Data Ultimo Accesso</span><span class="bkmkColRight bkmkValue">%ACCESSED%</span></div>
-<div class="row"><span class="bkmkColLeft bkmkValue labelBorderless clrBkgrnd" width="100%" border="1">Cancellato</span><span class="bkmkColRight bkmkValue">%DELETED%</span></div>
-<div class="row"><span class="bkmkColLeft bkmkValue labelBorderless clrBkgrnd" width="100%" border="1">Recuperato</span><span class="bkmkColRight bkmkValue">%CARVED%</span></div>
-<div class="row"><span class="bkmkColLeft bkmkValue labelBorderless clrBkgrnd" width="100%" border="1">Hash</span><span class="bkmkColRight bkmkValue">%HASH%</span></div>
-<div class="row"><div class="row"><span class="bkmkColLeft bkmkValue labelBorderless clrBkgrnd" width="100%" border="1">Esportato come</span><span class="bkmkColRight bkmkValue"><b>%EXPORTED%</b></span></div>
+<div class="row"><span class="bkmkColLeft bkmkValue labelBorderless clrBkgrnd" width="100%" border="1">%PROPERTY_NAME%</span><span class="bkmkColRight bkmkValue">%PROPERTY_VALUE%</span></div>

iped-app/resources/root/htmlreport/pt-BR/templates/item.html

@@ -1,12 +1 @@
-<a name="bk_obj%SEQ%"> </a>
-<div class="clrBkgrnd bkmkSeparator bkmkValue"><span class="bkmkColLeft bkmkValue labelBorderless clrBkgrnd" width="100%" border="1">Nome</span><span class="bkmkColRight bkmkValue"><b>%NAME%</b></span></div>
-<div class="row"><span class="bkmkColLeft bkmkValue labelBorderless clrBkgrnd" width="100%" border="1">Caminho</span><span class="bkmkColRight bkmkValue">%PATH%</span></div>
-<div class="row"><span class="bkmkColLeft bkmkValue labelBorderless clrBkgrnd" width="100%" border="1">Tipo de arquivo</span><span class="bkmkColRight bkmkValue">%TYPE%</span></div>
-<div class="row"><span class="bkmkColLeft bkmkValue labelBorderless clrBkgrnd" width="100%" border="1">Tamanho lógico </span><span class="bkmkColRight bkmkValue">%SIZE% Bytes</span></div>
-<div class="row"><span class="bkmkColLeft bkmkValue labelBorderless clrBkgrnd" width="100%" border="1">Data de criação</span><span class="bkmkColRight bkmkValue">%CREATED%</span></div>
-<div class="row"><span class="bkmkColLeft bkmkValue labelBorderless clrBkgrnd" width="100%" border="1">Data de modificação</span><span class="bkmkColRight bkmkValue">%MODIFIED%</span></div>
-<div class="row"><span class="bkmkColLeft bkmkValue labelBorderless clrBkgrnd" width="100%" border="1">Data de acesso</span><span class="bkmkColRight bkmkValue">%ACCESSED%</span></div>
-<div class="row"><span class="bkmkColLeft bkmkValue labelBorderless clrBkgrnd" width="100%" border="1">Excluído</span><span class="bkmkColRight bkmkValue">%DELETED%</span></div>
-<div class="row"><span class="bkmkColLeft bkmkValue labelBorderless clrBkgrnd" width="100%" border="1">Reconstituido</span><span class="bkmkColRight bkmkValue">%CARVED%</span></div>
-<div class="row"><span class="bkmkColLeft bkmkValue labelBorderless clrBkgrnd" width="100%" border="1">Hash</span><span class="bkmkColRight bkmkValue">%HASH%</span></div>
-<div class="row"><div class="row"><span class="bkmkColLeft bkmkValue labelBorderless clrBkgrnd" width="100%" border="1">Exportado como</span><span class="bkmkColRight bkmkValue"><b>%EXPORTED%</b></span></div>
+<div class="row"><span class="bkmkColLeft bkmkValue labelBorderless clrBkgrnd" width="100%" border="1">%PROPERTY_NAME%</span><span class="bkmkColRight bkmkValue">%PROPERTY_VALUE%</span></div>

iped-engine/src/main/java/iped/engine/task/HTMLReportTask.java

@@ -574,8 +574,7 @@ private void processBookmarks(File templatesFolder) throws Exception {
         sortRegs();
         StringBuilder modelo = EncodedFile.readFile(new File(templatesFolder, "arq.html"), StandardCharsets.UTF_8).content; //$NON-NLS-1$//$NON-NLS-2$
         replace(modelo, "%THUMBSIZE%", String.valueOf(htmlReportConfig.getThumbSize())); //$NON-NLS-1$
-        // StringBuilder item = EncodedFile.readFile(new File(templatesFolder, "item.html"), StandardCharsets.UTF_8).content; //$NON-NLS-1$//$NON-NLS-2$
-        StringBuilder item = EncodedFile.readFile(new File(templatesFolder, "singleitem.html"), StandardCharsets.UTF_8).content;
+        StringBuilder item = EncodedFile.readFile(new File(templatesFolder, "item.html"), StandardCharsets.UTF_8).content; //$NON-NLS-1$//$NON-NLS-2$
         int idx = 1;
         for (String marcador : entriesByLabel.keySet()) {
             String id = String.format("arq%06d", idx); //$NON-NLS-1$
@@ -768,25 +767,25 @@ private void createBookmarkPage(DateFormat dateFormat, NumberFormat longFormat,
 
             // Fill Basic Properties if present
             if (selectedProperties.contains(BasicProps.NAME))
-                fillItemProperty(it, "Name", "<b>" + reg.name + "</b>");
+                fillItemProperty(it, Messages.getString("HTMLReportTask.ItemName"), "<b>" + reg.name + "</b>");
             if (selectedProperties.contains(BasicProps.PATH))
-                fillItemProperty(it, "Path", reg.path);
+                fillItemProperty(it, Messages.getString("HTMLReportTask.ItemPath"), reg.path);
             if (selectedProperties.contains(BasicProps.TYPE))
-                fillItemProperty(it, "File Type", reg.category);
+                fillItemProperty(it, Messages.getString("HTMLReportTask.ItemType"), reg.category);
             if (selectedProperties.contains(BasicProps.LENGTH))
-                fillItemProperty(it, "Logical Size", formatNumber(reg.length, longFormat) + " Bytes");
+                fillItemProperty(it, Messages.getString("HTMLReportTask.ItemSize"), formatNumber(reg.length, longFormat) + " Bytes");
             if (selectedProperties.contains(BasicProps.CREATED))
-                fillItemProperty(it, "Created Date", formatDate(reg.created, dateFormat));
+                fillItemProperty(it, Messages.getString("HTMLReportTask.ItemCreated"), formatDate(reg.created, dateFormat));
             if (selectedProperties.contains(BasicProps.MODIFIED))
-                fillItemProperty(it, "Modified Date", formatDate(reg.modified, dateFormat));
+                fillItemProperty(it, Messages.getString("HTMLReportTask.ItemModified"), formatDate(reg.modified, dateFormat));
             if (selectedProperties.contains(BasicProps.ACCESSED))
-                fillItemProperty(it, "Last Accessed Date", formatDate(reg.accessed, dateFormat));
+                fillItemProperty(it, Messages.getString("HTMLReportTask.ItemAccessed"), formatDate(reg.accessed, dateFormat));
             if (selectedProperties.contains(BasicProps.DELETED))
-                fillItemProperty(it, "Deleted", String.valueOf(reg.deleted));
+                fillItemProperty(it, Messages.getString("HTMLReportTask.ItemDeleted"), String.valueOf(reg.deleted));
             if (selectedProperties.contains(BasicProps.CARVED))
-                fillItemProperty(it, "Carved", String.valueOf(reg.carved));
+                fillItemProperty(it, Messages.getString("HTMLReportTask.ItemCarved"), String.valueOf(reg.carved));
             if (selectedProperties.contains(BasicProps.HASH))
-                fillItemProperty(it, "Hash", reg.hash);
+                fillItemProperty(it, Messages.getString("HTMLReportTask.ItemHash"), reg.hash);
             for (String property : selectedProperties) {
                 if (!basicReportProps.contains(property)) {     // filter for additional properties selected by the user
                     String propertyValue = ipedCase.getItemProperty(reg.evidenceId, property);
@@ -795,7 +794,7 @@ private void createBookmarkPage(DateFormat dateFormat, NumberFormat longFormat,
             }
             if (selectedProperties.contains(IndexItem.ID_IN_SOURCE)) {
                 String export = reg.export == null ? "-" : "<b><a href=\"../" + reg.export + "\">" + reg.export + "</a></b>";
-                fillItemProperty(it, "Exported as", export);
+                fillItemProperty(it, Messages.getString("HTMLReportTask.ItemIdInSource"), export);
             }
             items.append(it);
         }