mstoeck3/autopsy-flatpak
1
0
Fork 0
mirror of https://github.com/overcuriousity/autopsy-flatpak.git synced 2025-07-15 09:17:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

Resovle conflicts

Browse Source
This commit is contained in:
Joe Ho 2019-06-14 14:32:39 -04:00
commit 5078652f70
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Core/src/org/sleuthkit/autopsy/contentviewers/Bundle.properties-MERGED
View File

@ -128,8 +128,8 @@ SQLiteViewer.errorMessage.interrupted=The processing of the file was interrupted
SQLiteViewer.errorMessage.noCurrentCase=The case has been closed. SQLiteViewer.errorMessage.noCurrentCase=The case has been closed.
# {0} - exception message # {0} - exception message
SQLiteViewer.errorMessage.unexpectedError=An unexpected error occurred:\n{0). SQLiteViewer.errorMessage.unexpectedError=An unexpected error occurred:\n{0).
SQLiteViewer.exportTableToCsv.FileName=File name: SQLiteViewer.exportTableToCsv.FileName=File name:
SQLiteViewer.exportTableToCsv.TableName=Table name: SQLiteViewer.exportTableToCsv.TableName=Table name:
SQLiteViewer.exportTableToCsv.write.errText=Failed to export table content to csv file. SQLiteViewer.exportTableToCsv.write.errText=Failed to export table content to csv file.
SQLiteViewer.nextPageButton.text= SQLiteViewer.nextPageButton.text=
SQLiteViewer.prevPageButton.text= SQLiteViewer.prevPageButton.text=

2
Core/src/org/sleuthkit/autopsy/timeline/ui/Bundle.properties-MERGED
View File

@ -1,4 +1,4 @@
/*= /*
* Autopsy Forensic Browser * Autopsy Forensic Browser
* *
* Copyright 2013-15 Basis Technology Corp. * Copyright 2013-15 Basis Technology Corp.