3 files changed, 41 insertions, 38 deletions

diff --git a/enigma-swing/src/main/java/cuchaz/enigma/gui/Gui.java b/enigma-swing/src/main/java/cuchaz/enigma/gui/Gui.java
index 2d0c30b..323d304 100644
--- a/enigma-swing/src/main/java/cuchaz/enigma/gui/Gui.java
+++ b/enigma-swing/src/main/java/cuchaz/enigma/gui/Gui.java
@@ -894,6 +894,7 @@ public class Gui implements LanguageChangeListener {
                 this.obfPanel.retranslateUi();
                 this.deobfPanel.retranslateUi();
                 this.infoPanel.retranslateUi();
+                this.editors.values().forEach(EditorPanel::retranslateUi);
         }
 
         public void setConnectionState(ConnectionState state) {
diff --git a/enigma-swing/src/main/java/cuchaz/enigma/gui/elements/EditorPopupMenu.java b/enigma-swing/src/main/java/cuchaz/enigma/gui/elements/EditorPopupMenu.java
index 86d920e..ed3a32f 100644
--- a/enigma-swing/src/main/java/cuchaz/enigma/gui/elements/EditorPopupMenu.java
+++ b/enigma-swing/src/main/java/cuchaz/enigma/gui/elements/EditorPopupMenu.java
@@ -21,19 +21,19 @@ public class EditorPopupMenu {
 
         private final JPopupMenu ui = new JPopupMenu();
 
-        private final JMenuItem renameItem = new JMenuItem(I18n.translate("popup_menu.rename"));
-        private final JMenuItem editJavadocItem = new JMenuItem(I18n.translate("popup_menu.javadoc"));
-        private final JMenuItem showInheritanceItem = new JMenuItem(I18n.translate("popup_menu.inheritance"));
-        private final JMenuItem showImplementationsItem = new JMenuItem(I18n.translate("popup_menu.implementations"));
-        private final JMenuItem showCallsItem = new JMenuItem(I18n.translate("popup_menu.calls"));
-        private final JMenuItem showCallsSpecificItem = new JMenuItem(I18n.translate("popup_menu.calls.specific"));
-        private final JMenuItem openEntryItem = new JMenuItem(I18n.translate("popup_menu.declaration"));
-        private final JMenuItem openPreviousItem = new JMenuItem(I18n.translate("popup_menu.back"));
-        private final JMenuItem openNextItem = new JMenuItem(I18n.translate("popup_menu.forward"));
-        private final JMenuItem toggleMappingItem = new JMenuItem(I18n.translate("popup_menu.mark_deobfuscated"));
-        private final JMenuItem zoomInItem = new JMenuItem(I18n.translate("popup_menu.zoom.in"));
-        private final JMenuItem zoomOutMenu = new JMenuItem(I18n.translate("popup_menu.zoom.out"));
-        private final JMenuItem resetZoomItem = new JMenuItem(I18n.translate("popup_menu.zoom.reset"));
+        private final JMenuItem renameItem = new JMenuItem();
+        private final JMenuItem editJavadocItem = new JMenuItem();
+        private final JMenuItem showInheritanceItem = new JMenuItem();
+        private final JMenuItem showImplementationsItem = new JMenuItem();
+        private final JMenuItem showCallsItem = new JMenuItem();
+        private final JMenuItem showCallsSpecificItem = new JMenuItem();
+        private final JMenuItem openEntryItem = new JMenuItem();
+        private final JMenuItem openPreviousItem = new JMenuItem();
+        private final JMenuItem openNextItem = new JMenuItem();
+        private final JMenuItem toggleMappingItem = new JMenuItem();
+        private final JMenuItem zoomInItem = new JMenuItem();
+        private final JMenuItem zoomOutMenu = new JMenuItem();
+        private final JMenuItem resetZoomItem = new JMenuItem();
 
         private final EditorPanel editor;
         private final Gui gui;
@@ -42,6 +42,8 @@ public class EditorPopupMenu {
                 this.editor = editor;
                 this.gui = gui;
 
+                this.retranslateUi();
+
                 this.ui.add(this.renameItem);
                 this.ui.add(this.editJavadocItem);
                 this.ui.add(this.showInheritanceItem);
@@ -167,6 +169,22 @@ public class EditorPopupMenu {
                 }
         }
 
+        public void retranslateUi() {
+                this.renameItem.setText(I18n.translate("popup_menu.rename"));
+                this.editJavadocItem.setText(I18n.translate("popup_menu.javadoc"));
+                this.showInheritanceItem.setText(I18n.translate("popup_menu.inheritance"));
+                this.showImplementationsItem.setText(I18n.translate("popup_menu.implementations"));
+                this.showCallsItem.setText(I18n.translate("popup_menu.calls"));
+                this.showCallsSpecificItem.setText(I18n.translate("popup_menu.calls.specific"));
+                this.openEntryItem.setText(I18n.translate("popup_menu.declaration"));
+                this.openPreviousItem.setText(I18n.translate("popup_menu.back"));
+                this.openNextItem.setText(I18n.translate("popup_menu.forward"));
+                this.toggleMappingItem.setText(I18n.translate("popup_menu.mark_deobfuscated"));
+                this.zoomInItem.setText(I18n.translate("popup_menu.zoom.in"));
+                this.zoomOutMenu.setText(I18n.translate("popup_menu.zoom.out"));
+                this.resetZoomItem.setText(I18n.translate("popup_menu.zoom.reset"));
+        }
+
         public JPopupMenu getUi() {
                 return ui;
         }
diff --git a/enigma-swing/src/main/java/cuchaz/enigma/gui/panels/EditorPanel.java b/enigma-swing/src/main/java/cuchaz/enigma/gui/panels/EditorPanel.java
index bd1fae0..f324567 100644
--- a/enigma-swing/src/main/java/cuchaz/enigma/gui/panels/EditorPanel.java
+++ b/enigma-swing/src/main/java/cuchaz/enigma/gui/panels/EditorPanel.java
@@ -1,40 +1,21 @@
 package cuchaz.enigma.gui.panels;
 
-import java.awt.Color;
-import java.awt.Component;
-import java.awt.Font;
-import java.awt.GridBagConstraints;
-import java.awt.GridBagLayout;
-import java.awt.GridLayout;
-import java.awt.Rectangle;
-import java.awt.event.ActionEvent;
-import java.awt.event.ActionListener;
-import java.awt.event.KeyAdapter;
-import java.awt.event.KeyEvent;
-import java.awt.event.MouseAdapter;
-import java.awt.event.MouseEvent;
+import java.awt.*;
+import java.awt.event.*;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.List;
 import java.util.Map;
 
 import javax.annotation.Nullable;
-import javax.swing.JButton;
-import javax.swing.JComponent;
-import javax.swing.JEditorPane;
-import javax.swing.JLabel;
-import javax.swing.JPanel;
-import javax.swing.JProgressBar;
-import javax.swing.JScrollPane;
-import javax.swing.JSeparator;
-import javax.swing.JTextArea;
-import javax.swing.SwingUtilities;
-import javax.swing.Timer;
+import javax.swing.*;
 import javax.swing.text.BadLocationException;
 import javax.swing.text.Document;
 import javax.swing.text.Highlighter;
 import javax.swing.text.Highlighter.HighlightPainter;
 
+import de.sciss.syntaxpane.DefaultSyntaxKit;
+
 import cuchaz.enigma.EnigmaProject;
 import cuchaz.enigma.analysis.EntryReference;
 import cuchaz.enigma.classhandle.ClassHandle;
@@ -63,7 +44,6 @@ import cuchaz.enigma.translation.representation.entry.ClassEntry;
 import cuchaz.enigma.translation.representation.entry.Entry;
 import cuchaz.enigma.utils.I18n;
 import cuchaz.enigma.utils.Result;
-import de.sciss.syntaxpane.DefaultSyntaxKit;
 
 public class EditorPanel {
 
@@ -624,6 +604,10 @@ public class EditorPanel {
                 return classEntry.getSimpleName();
         }
 
+        public void retranslateUi() {
+                this.popupMenu.retranslateUi();
+        }
+
         private enum DisplayMode {
                 INACTIVE,
                 IN_PROGRESS,