From d07f80fd00f2068e73838b6f662f5a8a24dd5690 Mon Sep 17 00:00:00 2001 From: Richard Cordovano Date: Mon, 28 Oct 2019 16:31:24 -0400 Subject: [PATCH] Merge in new data source deletion code from McKinnon --- .../sleuthkit/autopsy/imagegallery/Bundle.properties-MERGED | 5 ++++- .../sleuthkit/autopsy/keywordsearch/Bundle.properties-MERGED | 1 - .../core.jar/org/netbeans/core/startup/Bundle.properties | 2 +- .../org/netbeans/core/windows/view/ui/Bundle.properties | 2 +- 4 files changed, 6 insertions(+), 4 deletions(-) diff --git a/ImageGallery/src/org/sleuthkit/autopsy/imagegallery/Bundle.properties-MERGED b/ImageGallery/src/org/sleuthkit/autopsy/imagegallery/Bundle.properties-MERGED index 087afc8a83..9b75078ae8 100755 --- a/ImageGallery/src/org/sleuthkit/autopsy/imagegallery/Bundle.properties-MERGED +++ b/ImageGallery/src/org/sleuthkit/autopsy/imagegallery/Bundle.properties-MERGED @@ -26,7 +26,10 @@ ImageGalleryTopComponent.chooseDataSourceDialog.all=All ImageGalleryTopComponent.chooseDataSourceDialog.contentText=Data source: ImageGalleryTopComponent.chooseDataSourceDialog.headerText=Choose a data source to view. ImageGalleryTopComponent.chooseDataSourceDialog.titleText=Image Gallery -OpenIDE-Module-Long-Description=New image and video gallery that has been designed to make performing image-intensive investigations more efficient. This work has been funded by DHS S&T and this is a beta release. It is not available on the sleuthkit.org site and has been distributed to limited users. +OpenIDE-Module-Long-Description=\ + New image and video gallery that has been designed to make performing image-intensive investigations more efficient. \ + This work has been funded by DHS S&T and this is a beta release. \ + It is not available on the sleuthkit.org site and has been distributed to limited users. OpenIDE-Module-Name=ImageGallery OpenIDE-Module-Short-Description=Advanced image and video gallery ImageGalleryOptionsPanel.enabledForCaseBox.text=Enable Image Gallery updates for the current case. diff --git a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/Bundle.properties-MERGED b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/Bundle.properties-MERGED index d44a070c9b..d2fe0dd2db 100755 --- a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/Bundle.properties-MERGED +++ b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/Bundle.properties-MERGED @@ -348,7 +348,6 @@ SolrSearch.openCore.msg=Opening text index SolrSearch.openGiantCore.msg=Opening text index. Text index for this case is very large and may take long time to load. SolrSearch.openLargeCore.msg=Opening text index. This may take several minutes. SolrSearch.readingIndexes.msg=Reading text index metadata file -SolrSearchService.deleteDataSource.exceptionMessage.noCurrentSolrCore=DeleteDataSource did not contain a current Solr core so could not delete the Data Source # {0} - index folder path SolrSearchService.exceptionMessage.failedToDeleteIndexFiles=Failed to delete text index files at {0} SolrSearchService.exceptionMessage.noCurrentSolrCore=IndexMetadata did not contain a current Solr core so could not delete the case diff --git a/branding/core/core.jar/org/netbeans/core/startup/Bundle.properties b/branding/core/core.jar/org/netbeans/core/startup/Bundle.properties index 4fd4fb33d8..6e10156aef 100644 --- a/branding/core/core.jar/org/netbeans/core/startup/Bundle.properties +++ b/branding/core/core.jar/org/netbeans/core/startup/Bundle.properties @@ -1,5 +1,5 @@ #Updated by build script -#Fri, 04 Oct 2019 14:30:10 -0400 +#Mon, 28 Oct 2019 16:22:16 -0400 LBL_splash_window_title=Starting Autopsy SPLASH_HEIGHT=314 SPLASH_WIDTH=538 diff --git a/branding/modules/org-netbeans-core-windows.jar/org/netbeans/core/windows/view/ui/Bundle.properties b/branding/modules/org-netbeans-core-windows.jar/org/netbeans/core/windows/view/ui/Bundle.properties index 17f4cb7436..79b6f9b6fe 100644 --- a/branding/modules/org-netbeans-core-windows.jar/org/netbeans/core/windows/view/ui/Bundle.properties +++ b/branding/modules/org-netbeans-core-windows.jar/org/netbeans/core/windows/view/ui/Bundle.properties @@ -1,4 +1,4 @@ #Updated by build script -#Fri, 04 Oct 2019 14:30:10 -0400 +#Mon, 28 Oct 2019 16:22:16 -0400 CTL_MainWindow_Title=Autopsy 4.13.0 CTL_MainWindow_Title_No_Project=Autopsy 4.13.0