diff --git a/Core/src/org/sleuthkit/autopsy/actions/Bundle.properties b/Core/src/org/sleuthkit/autopsy/actions/Bundle.properties
index 01d0d21b47..1cbc4b70b6 100755
--- a/Core/src/org/sleuthkit/autopsy/actions/Bundle.properties
+++ b/Core/src/org/sleuthkit/autopsy/actions/Bundle.properties
@@ -44,6 +44,4 @@ ShowIngestProgressSnapshotAction.actionName.text=Get Ingest Progress Snapshot
 OpenPythonModulesFolderAction.actionName.text=Python Plugins
 OpenPythonModulesFolderAction.errorMsg.folderNotFound=Python plugins folder not found: {0}
 CTL_OpenPythonModulesFolderAction=Python Plugins
-GetTagNameDialog.descriptionLabel.text=Description:
-GetTagNameDialog.notableCheckbox.text=Tag indicates item is notable.
 GetTagNameAndCommentDialog.tagCombo.toolTipText=Select tag to use
diff --git a/Core/src/org/sleuthkit/autopsy/actions/GetTagNameDialog.java b/Core/src/org/sleuthkit/autopsy/actions/GetTagNameDialog.java
index ec282dfa1f..515db21dab 100755
--- a/Core/src/org/sleuthkit/autopsy/actions/GetTagNameDialog.java
+++ b/Core/src/org/sleuthkit/autopsy/actions/GetTagNameDialog.java
@@ -36,6 +36,7 @@ import javax.swing.KeyStroke;
 import javax.swing.table.AbstractTableModel;
 import org.openide.util.ImageUtilities;
 import org.openide.util.NbBundle;
+import org.openide.util.NbBundle.Messages;
 import org.openide.windows.WindowManager;
 import org.sleuthkit.autopsy.casemodule.Case;
 import org.sleuthkit.autopsy.casemodule.services.TagsManager;
@@ -44,6 +45,8 @@ import org.sleuthkit.datamodel.TagName;
 import org.sleuthkit.datamodel.TskCoreException;
 import org.sleuthkit.datamodel.TskData;
 
+@Messages({"GetTagNameDialog.descriptionLabel.text=Description:",
+    "GetTagNameDialog.notableCheckbox.text=Tag indicates item is notable."})
 public class GetTagNameDialog extends JDialog {
 
     private static final long serialVersionUID = 1L;
@@ -335,7 +338,7 @@ public class GetTagNameDialog extends JDialog {
                     JOptionPane.ERROR_MESSAGE);
         } else if (userTagDescription.contains(",")
                 || userTagDescription.contains(";")) {
-              JOptionPane.showMessageDialog(null,
+            JOptionPane.showMessageDialog(null,
                     NbBundle.getMessage(this.getClass(), "GetTagNameDialog.tagDescriptionIllegalCharacters.message"),
                     NbBundle.getMessage(this.getClass(), "GetTagNameDialog.tagDescriptionIllegalCharacters.title"),
                     JOptionPane.ERROR_MESSAGE);
diff --git a/Core/src/org/sleuthkit/autopsy/casemodule/services/Bundle.properties b/Core/src/org/sleuthkit/autopsy/casemodule/services/Bundle.properties
index 95fd09a57b..e9c1b5307c 100755
--- a/Core/src/org/sleuthkit/autopsy/casemodule/services/Bundle.properties
+++ b/Core/src/org/sleuthkit/autopsy/casemodule/services/Bundle.properties
@@ -9,9 +9,7 @@ TagNameDialog.JOptionPane.tagNameEmpty.title=Empty tag name
 TagOptionsPanel.tagTypesListLabel.text=Tag Names:
 TagOptionsPanel.deleteTagNameButton.text=Delete Tag
 TagOptionsPanel.newTagNameButton.text=New Tag
-TagNameDialog.descriptionLabel.text=Description:
 TagNameDialog.okButton.text=OK
 TagNameDialog.cancelButton.text=Cancel
 TagNameDialog.tagNameTextField.text=
 TagNameDialog.newTagNameLabel.text=Name:
-TagNameDialog.notableCheckbox.text=Tag indicates item is notable.
\ No newline at end of file
diff --git a/Core/src/org/sleuthkit/autopsy/casemodule/services/TagNameDialog.java b/Core/src/org/sleuthkit/autopsy/casemodule/services/TagNameDialog.java
index e8f2275db4..4949be2507 100755
--- a/Core/src/org/sleuthkit/autopsy/casemodule/services/TagNameDialog.java
+++ b/Core/src/org/sleuthkit/autopsy/casemodule/services/TagNameDialog.java
@@ -31,6 +31,8 @@ import org.openide.util.NbBundle;
 import org.openide.util.NbBundle.Messages;
 import org.sleuthkit.datamodel.TskData;
 
+@Messages({"TagNameDialog.descriptionLabel.text=Description:",
+    "TagNameDialog.notableCheckbox.text=Tag indicates item is notable."})
 final class TagNameDialog extends javax.swing.JDialog {
 
     private static final long serialVersionUID = 1L;