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

Merge branch '5122-Hang-in-Translation-Viewer' into 5094-Limit-Translation-Request-Sizes

Browse Source
This commit is contained in:
U-BASIS\dsmyda 2019-06-07 15:23:42 -04:00
commit 14fa535210
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,6 +1,6 @@
OptionsCategory_Name_Machine_Translation=Machine Translation OptionsCategory_Name_Machine_Translation=Machine Translation
OptionsCategory_Keywords_Machine_Translation_Settings=Machine Translation Settings OptionsCategory_Keywords_Machine_Translation_Settings=Machine Translation Settings
TranslatedContentPanel.comboBoxOption.originalText=Original Text (First 50KB) TranslatedContentPanel.comboBoxOption.originalText=Original Text (Up to 25KB)
TranslatedContentPanel.comboBoxOption.translatedText=Translated Text TranslatedContentPanel.comboBoxOption.translatedText=Translated Text
TranslatedContentViewer.emptyTranslation=The resulting translation was empty. TranslatedContentViewer.emptyTranslation=The resulting translation was empty.
TranslatedContentViewer.errorExtractingText=Could not extract text from file. TranslatedContentViewer.errorExtractingText=Could not extract text from file.

2
Core/src/org/sleuthkit/autopsy/texttranslation/ui/TranslationContentPanel.java
View File

@ -250,7 +250,7 @@ public class TranslationContentPanel extends javax.swing.JPanel {
/** /**
* Selection choices to be displayed in the combobox dropdown. * Selection choices to be displayed in the combobox dropdown.
*/ */
@Messages({"TranslatedContentPanel.comboBoxOption.originalText=Original Text (First 25KB)", @Messages({"TranslatedContentPanel.comboBoxOption.originalText=Original Text (Up to 25KB)",
"TranslatedContentPanel.comboBoxOption.translatedText=Translated Text"}) "TranslatedContentPanel.comboBoxOption.translatedText=Translated Text"})
static enum DisplayDropdownOptions { static enum DisplayDropdownOptions {
ORIGINAL_TEXT(Bundle.TranslatedContentPanel_comboBoxOption_originalText()), ORIGINAL_TEXT(Bundle.TranslatedContentPanel_comboBoxOption_originalText()),