diff --git a/app/src/processing/app/Base.java b/app/src/processing/app/Base.java
index 47423e72c..f4e51f900 100644
--- a/app/src/processing/app/Base.java
+++ b/app/src/processing/app/Base.java
@@ -1126,7 +1126,7 @@ public class Base {
         // If the central menubar isn't supported on this OS X JVM,
         // we have to do the old behavior. Yuck!
         if (defaultFileMenu == null) {
-          Object[] options = { "OK", "Cancel" };
+          Object[] options = { Language.text("prompt.ok"), Language.text("prompt.cancel") };
           String prompt =
             "<html> " +
             "<head> <style type=\"text/css\">"+
diff --git a/app/src/processing/app/Editor.java b/app/src/processing/app/Editor.java
index 399ec9207..d277acae7 100644
--- a/app/src/processing/app/Editor.java
+++ b/app/src/processing/app/Editor.java
@@ -2315,7 +2315,7 @@ public abstract class Editor extends JFrame implements RunnerListener {
       final String properParent =
         file.getName().substring(0, file.getName().lastIndexOf('.'));
       
-      Object[] options = { "OK", "Cancel" };
+      Object[] options = { Language.text("prompt.ok"), Language.text("prompt.cancel") };
       String prompt =
         "The file \"" + file.getName() + "\" needs to be inside\n" +
         "a sketch folder named \"" + properParent + "\".\n" +
diff --git a/app/src/processing/app/PreferencesFrame.java b/app/src/processing/app/PreferencesFrame.java
index 9ed03a78d..bd873b1db 100644
--- a/app/src/processing/app/PreferencesFrame.java
+++ b/app/src/processing/app/PreferencesFrame.java
@@ -233,7 +233,7 @@ public class PreferencesFrame {
 
     label = new JLabel(Language.text("preferences.background_color")+": ");
     colorBox.add(label);
-    
+
     final String colorTip = "<html>" + Language.text("preferences.background_color.tip");
     label.setToolTipText(colorTip);
 
@@ -302,7 +302,7 @@ public class PreferencesFrame {
     });
 
     selector = new ColorChooser(dialog, false,
-        Preferences.getColor("run.present.bgcolor"), "OK",
+        Preferences.getColor("run.present.bgcolor"), Language.text("prompt.okay"),
         new ActionListener() {
           @Override
           public void actionPerformed(ActionEvent e) {
diff --git a/app/src/processing/app/Sketch.java b/app/src/processing/app/Sketch.java
index e9af94bcb..96c222353 100644
--- a/app/src/processing/app/Sketch.java
+++ b/app/src/processing/app/Sketch.java
@@ -633,7 +633,7 @@ public class Sketch {
     }
     
     // confirm deletion with user, yes/no
-    Object[] options = { "OK", "Cancel" };
+    Object[] options = { Language.text("prompt.ok"), Language.text("prompt.cancel") };
     String prompt = (currentIndex == 0) ?
       Language.text("warn.delete.sketch") :
       Language.interpolate("warn.delete.file", current.getPrettyName());
@@ -1103,7 +1103,7 @@ public class Sketch {
 
     // check whether this file already exists
     if (destFile.exists()) {
-      Object[] options = { "OK", "Cancel" };
+      Object[] options = { Language.text("prompt.okay"), Language.text("prompt.cancel") };
       String prompt = "Replace the existing version of " + filename + "?";
       int result = JOptionPane.showOptionDialog(editor,
                                                 prompt,
diff --git a/app/src/processing/app/tools/CreateFont.java b/app/src/processing/app/tools/CreateFont.java
index d119e76d3..7d8f0427d 100644
--- a/app/src/processing/app/tools/CreateFont.java
+++ b/app/src/processing/app/tools/CreateFont.java
@@ -251,13 +251,13 @@ public class CreateFont extends JFrame implements Tool {
     pain.add(filestuff);
 
     JPanel buttons = new JPanel();
-    JButton cancelButton = new JButton("Cancel");
+    JButton cancelButton = new JButton(Language.text("prompt.cancel"));
     cancelButton.addActionListener(new ActionListener() {
         public void actionPerformed(ActionEvent e) {
           setVisible(false);
         }
       });
-    okButton = new JButton("OK");
+    okButton = new JButton(Language.text("prompt.ok"));
     okButton.addActionListener(new ActionListener() {
         public void actionPerformed(ActionEvent e) {
           build();
@@ -587,7 +587,7 @@ class CharacterSelector extends JFrame {
     pain.add(Box.createVerticalStrut(8));
 
     JPanel buttons = new JPanel();
-    JButton okButton = new JButton("OK");
+    JButton okButton = new JButton(Language.text("prompt.ok"));
     okButton.addActionListener(new ActionListener() {
         public void actionPerformed(ActionEvent e) {
           setVisible(false);
diff --git a/app/src/processing/mode/java/JavaEditor.java b/app/src/processing/mode/java/JavaEditor.java
index aa4b50249..9bc5dec90 100644
--- a/app/src/processing/mode/java/JavaEditor.java
+++ b/app/src/processing/mode/java/JavaEditor.java
@@ -677,7 +677,7 @@ public class JavaEditor extends Editor {
    */
   protected boolean handleExportCheckModified() {
     if (sketch.isModified()) {
-      Object[] options = { "OK", "Cancel" };
+      Object[] options = { Language.text("prompt.ok"), Language.text("prompt.cancel") };
       int result = JOptionPane.showOptionDialog(this,
                                                 "Save changes before export?",
                                                 "Save",
